Remove librsvg.

	* Makefile.am:
	Remove librsvg.

	* librsvg/.cvsignore:
	* librsvg/Makefile.am:
	* librsvg/art_render.c:
	* librsvg/art_render.h:
	* librsvg/art_render_gradient.c:
	* librsvg/art_render_gradient.h:
	* librsvg/art_render_mask.c:
	* librsvg/art_render_mask.h:
	* librsvg/art_render_svp.c:
	* librsvg/art_render_svp.h:
	* librsvg/art_rgba.c:
	* librsvg/art_rgba.h:
	* librsvg/example-nested-transform.svg:
	* librsvg/makefile-simple:
	* librsvg/opacity.svg:
	* librsvg/rsvg-bpath-util.c:
	* librsvg/rsvg-bpath-util.h:
	* librsvg/rsvg-css.c:
	* librsvg/rsvg-css.h:
	* librsvg/rsvg-defs.c:
	* librsvg/rsvg-defs.h:
	* librsvg/rsvg-ft.c:
	* librsvg/rsvg-ft.h:
	* librsvg/rsvg-paint-server.c:
	* librsvg/rsvg-paint-server.h:
	* librsvg/rsvg-path.c:
	* librsvg/rsvg-path.h:
	* librsvg/rsvg.c:
	* librsvg/rsvg.h:
	* librsvg/subpixel-text-test:
	* librsvg/test-ft-gtk.c:
	* librsvg/test-ft.c:
	* librsvg/test-rsvg.c:
	* librsvg/test.svg:
	Move librsvg to its own top level GNOME CVS module.

	* configure.in:
	Add librsvg and eel dependencies.
	Remove librsvg and font entries.

	* nautilus.spec.in:
	Remove font entries.  Add librsvg and eel requirements.

	* data/Makefile.am:
	* data/fonts/.cvsignore:
	* data/fonts/Makefile.am:
	* data/fonts/urw/.cvsignore:
	* data/fonts/urw/Makefile.am:
	* data/fonts/urw/README:
	* data/fonts/urw/fonts.dir:
	* data/fonts/urw/n019003l.afm:
	* data/fonts/urw/n019003l.pfb:
	* data/fonts/urw/n019003l.pfm:
	* data/fonts/urw/n019004l.afm:
	* data/fonts/urw/n019004l.pfb:
	* data/fonts/urw/n019004l.pfm:
	* data/fonts/urw/n019023l.afm:
	* data/fonts/urw/n019023l.pfb:
	* data/fonts/urw/n019023l.pfm:
	* data/fonts/urw/n019024l.afm:
	* data/fonts/urw/n019024l.pfb:
	* data/fonts/urw/n019024l.pfm:
	Retire default fonts.  These now live in eel.

	* libnautilus/nautilus-undo-transaction.c:
	(nautilus_undo_transaction_destroy):
	* libnautilus/nautilus-view.c: (nautilus_view_destroy):
	Update for eel changes.  Use eel-gtk-macros.

	* nautilus-installer/src/nautilus-druid-page-eazel.c:
	(nautilus_druid_page_eazel_destroy),
	(nautilus_druid_page_eazel_finalize),
	(nautilus_druid_page_eazel_size_allocate),
	(nautilus_druid_page_eazel_size_request):
	Update for eel changes.  Use eel-gtk-macros.

	* libnautilus-extensions/Makefile.am:
	* libnautilus-extensions/nautilus-bonobo-extensions.c:
	* libnautilus-extensions/nautilus-bonobo-extensions.h:
	* libnautilus-extensions/nautilus-bookmark.c:
	* libnautilus-extensions/nautilus-ctree.c:
	* libnautilus-extensions/nautilus-customization-data.c:
	* libnautilus-extensions/nautilus-dateedit-extensions.c:
	* libnautilus-extensions/nautilus-dateedit-extensions.h:
	* libnautilus-extensions/nautilus-directory-async.c:
	* libnautilus-extensions/nautilus-directory-background.c:
	* libnautilus-extensions/nautilus-directory-background.h:
	* libnautilus-extensions/nautilus-directory-metafile-monitor.c:
	* libnautilus-extensions/nautilus-directory-metafile.c:
	* libnautilus-extensions/nautilus-directory.c:
	* libnautilus-extensions/nautilus-drag-window.c:
	* libnautilus-extensions/nautilus-drag.c:
	* libnautilus-extensions/nautilus-druid-page-eazel.c:
	* libnautilus-extensions/nautilus-druid.c:
	* libnautilus-extensions/nautilus-entry.c:
	* libnautilus-extensions/nautilus-file-changes-queue.c:
	* libnautilus-extensions/nautilus-file-operations-progress.c:
	* libnautilus-extensions/nautilus-file-operations.c:
	* libnautilus-extensions/nautilus-file-private.h:
	* libnautilus-extensions/nautilus-file-utilities.c:
	* libnautilus-extensions/nautilus-file.c:
	* libnautilus-extensions/nautilus-font-factory.c:
	* libnautilus-extensions/nautilus-gconf-extensions.c:
	* libnautilus-extensions/nautilus-generous-bin.c:
	* libnautilus-extensions/nautilus-global-preferences.c:
	* libnautilus-extensions/nautilus-global-preferences.h:
	* libnautilus-extensions/nautilus-horizontal-splitter.c:
	* libnautilus-extensions/nautilus-icon-canvas-item.c:
	* libnautilus-extensions/nautilus-icon-canvas-item.h:
	* libnautilus-extensions/nautilus-icon-container.c:
	* libnautilus-extensions/nautilus-icon-container.h:
	* libnautilus-extensions/nautilus-icon-dnd.c:
	* libnautilus-extensions/nautilus-icon-factory.c:
	* libnautilus-extensions/nautilus-icon-factory.h:
	* libnautilus-extensions/nautilus-icon-private.h:
	* libnautilus-extensions/nautilus-icon-text-item.c:
	* libnautilus-extensions/nautilus-keep-last-vertical-box.c:
	* libnautilus-extensions/nautilus-lib-self-check-functions.c:
	* libnautilus-extensions/nautilus-lib-self-check-functions.h:
	* libnautilus-extensions/nautilus-link-set.c:
	* libnautilus-extensions/nautilus-link.c:
	* libnautilus-extensions/nautilus-list-column-title.c:
	* libnautilus-extensions/nautilus-list.c:
	* libnautilus-extensions/nautilus-medusa-support.c:
	* libnautilus-extensions/nautilus-merged-directory.c:
	* libnautilus-extensions/nautilus-metafile-factory.c:
	* libnautilus-extensions/nautilus-metafile.c:
	* libnautilus-extensions/nautilus-mime-actions.c:
	* libnautilus-extensions/nautilus-preferences-box.c:
	* libnautilus-extensions/nautilus-preferences-dialog.c:
	* libnautilus-extensions/nautilus-preferences-group.c:
	* libnautilus-extensions/nautilus-preferences-item.c:
	* libnautilus-extensions/nautilus-preferences-pane.c:
	* libnautilus-extensions/nautilus-preferences.c:
	* libnautilus-extensions/nautilus-preferences.h:
	* libnautilus-extensions/nautilus-program-chooser.c:
	* libnautilus-extensions/nautilus-program-choosing.c:
	* libnautilus-extensions/nautilus-program-choosing.h:
	* libnautilus-extensions/nautilus-search-uri.c:
	* libnautilus-extensions/nautilus-sidebar-functions.c:
	* libnautilus-extensions/nautilus-tabs.c:
	* libnautilus-extensions/nautilus-theme.c:
	* libnautilus-extensions/nautilus-thumbnails.c:
	* libnautilus-extensions/nautilus-trash-directory.c:
	* libnautilus-extensions/nautilus-trash-file.c:
	* libnautilus-extensions/nautilus-trash-monitor.c:
	* libnautilus-extensions/nautilus-undo-context.c:
	* libnautilus-extensions/nautilus-undo-manager.c:
	* libnautilus-extensions/nautilus-undo-signal-handlers.c:
	* libnautilus-extensions/nautilus-vfs-directory.c:
	* libnautilus-extensions/nautilus-vfs-file.c:
	* libnautilus-extensions/nautilus-view-identifier.c:
	* libnautilus-extensions/nautilus-volume-monitor.c:
	Use new eel library.

	* libnautilus-extensions/nautilus-art-extensions.c:
	* libnautilus-extensions/nautilus-art-extensions.h:
	* libnautilus-extensions/nautilus-art-gtk-extensions.c:
	* libnautilus-extensions/nautilus-art-gtk-extensions.h:
	* libnautilus-extensions/nautilus-background-canvas-group.c:
	* libnautilus-extensions/nautilus-background-canvas-group.h:
	* libnautilus-extensions/nautilus-background.c:
	* libnautilus-extensions/nautilus-background.h:
	* libnautilus-extensions/nautilus-caption-table.c:
	* libnautilus-extensions/nautilus-caption-table.h:
	* libnautilus-extensions/nautilus-caption.c:
	* libnautilus-extensions/nautilus-caption.h:
	* libnautilus-extensions/nautilus-clickable-image.c:
	* libnautilus-extensions/nautilus-clickable-image.h:
	* libnautilus-extensions/nautilus-debug-drawing.c:
	* libnautilus-extensions/nautilus-debug-drawing.h:
	* libnautilus-extensions/nautilus-debug.c:
	* libnautilus-extensions/nautilus-debug.h:
	* libnautilus-extensions/nautilus-ellipsizing-label.c:
	* libnautilus-extensions/nautilus-ellipsizing-label.h:
	* libnautilus-extensions/nautilus-enumeration.c:
	* libnautilus-extensions/nautilus-enumeration.h:
	* libnautilus-extensions/nautilus-font-manager.c:
	* libnautilus-extensions/nautilus-font-manager.h:
	* libnautilus-extensions/nautilus-font-picker.c:
	* libnautilus-extensions/nautilus-font-picker.h:
	* libnautilus-extensions/nautilus-gdk-extensions.c:
	* libnautilus-extensions/nautilus-gdk-extensions.h:
	* libnautilus-extensions/nautilus-gdk-font-extensions.c:
	* libnautilus-extensions/nautilus-gdk-font-extensions.h:
	* libnautilus-extensions/nautilus-gdk-pixbuf-extensions.c:
	* libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h:
	* libnautilus-extensions/nautilus-glib-extensions.c:
	* libnautilus-extensions/nautilus-glib-extensions.h:
	* libnautilus-extensions/nautilus-glyph.c:
	* libnautilus-extensions/nautilus-glyph.h:
	* libnautilus-extensions/nautilus-gnome-extensions.c:
	* libnautilus-extensions/nautilus-gnome-extensions.h:
	* libnautilus-extensions/nautilus-graphic-effects.c:
	* libnautilus-extensions/nautilus-graphic-effects.h:
	* libnautilus-extensions/nautilus-gtk-extensions.c:
	* libnautilus-extensions/nautilus-gtk-extensions.h:
	* libnautilus-extensions/nautilus-gtk-macros.h:
	* libnautilus-extensions/nautilus-image-table.c:
	* libnautilus-extensions/nautilus-image-table.h:
	* libnautilus-extensions/nautilus-image-with-background.c:
	* libnautilus-extensions/nautilus-image-with-background.h:
	* libnautilus-extensions/nautilus-image.c:
	* libnautilus-extensions/nautilus-image.h:
	* libnautilus-extensions/nautilus-label-with-background.c:
	* libnautilus-extensions/nautilus-label-with-background.h:
	* libnautilus-extensions/nautilus-label.c:
	* libnautilus-extensions/nautilus-label.h:
	* libnautilus-extensions/nautilus-labeled-image.c:
	* libnautilus-extensions/nautilus-labeled-image.h:
	* libnautilus-extensions/nautilus-lib-self-check-functions.c:
	* libnautilus-extensions/nautilus-lib-self-check-functions.h:
	* libnautilus-extensions/nautilus-password-dialog.c:
	* libnautilus-extensions/nautilus-password-dialog.h:
	* libnautilus-extensions/nautilus-radio-button-group.c:
	* libnautilus-extensions/nautilus-radio-button-group.h:
	* libnautilus-extensions/nautilus-region.c:
	* libnautilus-extensions/nautilus-region.h:
	* libnautilus-extensions/nautilus-scalable-font-private.h:
	* libnautilus-extensions/nautilus-scalable-font.c:
	* libnautilus-extensions/nautilus-scalable-font.h:
	* libnautilus-extensions/nautilus-self-checks.c:
	* libnautilus-extensions/nautilus-self-checks.h:
	* libnautilus-extensions/nautilus-smooth-text-layout-cache.c:
	* libnautilus-extensions/nautilus-smooth-text-layout-cache.h:
	* libnautilus-extensions/nautilus-smooth-text-layout.c:
	* libnautilus-extensions/nautilus-smooth-text-layout.h:
	* libnautilus-extensions/nautilus-smooth-widget.c:
	* libnautilus-extensions/nautilus-smooth-widget.h:
	* libnautilus-extensions/nautilus-stock-dialogs.c:
	* libnautilus-extensions/nautilus-stock-dialogs.h:
	* libnautilus-extensions/nautilus-string-list.c:
	* libnautilus-extensions/nautilus-string-list.h:
	* libnautilus-extensions/nautilus-string-map.c:
	* libnautilus-extensions/nautilus-string-map.h:
	* libnautilus-extensions/nautilus-string-picker.c:
	* libnautilus-extensions/nautilus-string-picker.h:
	* libnautilus-extensions/nautilus-string.c:
	* libnautilus-extensions/nautilus-string.h:
	* libnautilus-extensions/nautilus-text-caption.c:
	* libnautilus-extensions/nautilus-text-caption.h:
	* libnautilus-extensions/nautilus-viewport.c:
	* libnautilus-extensions/nautilus-viewport.h:
	* libnautilus-extensions/nautilus-wrap-table.c:
	* libnautilus-extensions/nautilus-wrap-table.h:
	* libnautilus-extensions/nautilus-xml-extensions.c:
	* libnautilus-extensions/nautilus-xml-extensions.h:
	Remove these files.  These are all part of eel now.

	* applets/launcher/nautilus-launcher-applet.c:
	* applets/preferences-applet/nautilus-preferences-applet.c:
	* components/adapter/Makefile.am:
	* components/adapter/main.c:
	* components/adapter/nautilus-adapter-control-embed-strategy.c:
	* components/adapter/nautilus-adapter-embed-strategy.c:
	* components/adapter/nautilus-adapter-embeddable-embed-strategy.c:
	* components/adapter/nautilus-adapter-factory-server.c:
	* components/adapter/nautilus-adapter-file-load-strategy.c:
	* components/adapter/nautilus-adapter-load-strategy.c:
	* components/adapter/nautilus-adapter-progressive-load-strategy.c:
	* components/adapter/nautilus-adapter-stream-load-strategy.c:
	* components/adapter/nautilus-adapter.c:
	* components/hardware/Makefile.am:
	* components/hardware/nautilus-hardware-view.c:
	* components/help/Makefile.am:
	* components/help/help-method.c:
	* components/help/hyperbola-filefmt.c:
	* components/help/hyperbola-nav-tree.c:
	* components/history/Makefile.am:
	* components/history/nautilus-history-view.c:
	* components/image-viewer/Makefile.am:
	* components/image-viewer/nautilus-image-view.c:
	* components/loser/content/Makefile.am:
	* components/loser/content/nautilus-content-loser.c:
	* components/loser/sidebar/Makefile.am:
	* components/loser/sidebar/nautilus-sidebar-loser.c:
	* components/mozilla/Makefile.am:
	* components/mozilla/bonobo-extensions.c:
	* components/mozilla/nautilus-mozilla-content-view.c:
	* components/music/Makefile.am:
	* components/music/nautilus-music-view.c:
	* components/notes/Makefile.am:
	* components/notes/nautilus-notes.c:
	* components/rpmview/Makefile.am:
	* components/rpmview/nautilus-rpm-verify-window.c:
	* components/rpmview/nautilus-rpm-view-install.c:
	* components/rpmview/nautilus-rpm-view.c:
	* components/sample/nautilus-sample-content-view.c:
	* components/services/install-view/Makefile.am:
	* components/services/install-view/callbacks.c:
	* components/services/install-view/forms.c:
	* components/services/install-view/nautilus-service-install-view.c:
	* components/services/install/lib/eazel-install-logic2.c:
	* components/services/install/server/main.c:
	* components/services/inventory-view/Makefile.am:
	* components/services/inventory-view/nautilus-inventory-config-page
	.c:
	* components/services/inventory-view/nautilus-inventory-disable-pag
	* components/services/inventory-view/nautilus-inventory-enable-page
	* components/services/inventory-view/nautilus-inventory-view.c:
	* components/services/inventory/Makefile.am:
	* components/services/inventory/eazel-inventory-upload-callback.c:
	* components/services/inventory/eazel-inventory.c:
	* components/services/inventory/main.c:
	* components/services/login/nautilus-view/Makefile.am:
	* components/services/login/nautilus-view/nautilus-change-password-
	view.c:
	* components/services/login/nautilus-view/password-box.c:
	* components/services/nautilus-dependent-shared/Makefile.am:
	* components/services/nautilus-dependent-shared/eazel-services-exte
	nsions.c:
	* components/services/nautilus-dependent-shared/eazel-services-exte
	nsions.h:
	* components/services/nautilus-dependent-shared/eazel-services-foot
	er.c:
	* components/services/nautilus-dependent-shared/eazel-services-head
	er.c:
	* components/services/nautilus-dependent-shared/test-footer-header.
	c:
	* components/services/summary/Makefile.am:
	* components/services/summary/nautilus-summary-callbacks.c:
	* components/services/summary/nautilus-summary-dialogs.c:
	* components/services/summary/nautilus-summary-dialogs.h:
	* components/services/summary/nautilus-summary-footer.c:
	* components/services/summary/nautilus-summary-menu-items.c:
	* components/services/summary/nautilus-summary-view-private.h:
	* components/services/summary/nautilus-summary-view.c:
	* components/services/time/nautilus-view/main.c:
	* components/services/time/nautilus-view/trilobite-eazel-time-view.
	c:
	* components/services/trilobite/sample/nautilus-view/Makefile.am:
	* components/text/Makefile.am:
	* components/text/nautilus-text-view.c:
	* components/throbber/Makefile.am:
	* components/throbber/main.c:
	* components/throbber/nautilus-throbber.c:
	* components/tree/Makefile.am:
	* components/tree/nautilus-tree-change-queue.c:
	* components/tree/nautilus-tree-expansion-state.c:
	* components/tree/nautilus-tree-model.c:
	* components/tree/nautilus-tree-node.c:
	* components/tree/nautilus-tree-view-dnd.c:
	* components/tree/nautilus-tree-view.c:
	* helper-utilities/authenticate/Makefile.am:
	* helper-utilities/authenticate/nautilus-authenticate.c:
	* nautilus-installer/src/nautilus-druid.c:
	* src/Makefile.am:
	* src/file-manager/fm-desktop-icon-view.c:
	* src/file-manager/fm-directory-view.c:
	* src/file-manager/fm-directory-view.h:
	* src/file-manager/fm-error-reporting.c:
	* src/file-manager/fm-icon-text-window.c:
	* src/file-manager/fm-icon-view.c:
	* src/file-manager/fm-list-view.c:
	* src/file-manager/fm-properties-window.c:
	* src/file-manager/fm-search-list-view.c:
	* src/file-manager/nautilus-indexing-info.c:
	* src/nautilus-about.c:
	* src/nautilus-application.c:
	* src/nautilus-bookmark-list.c:
	* src/nautilus-bookmark-parsing.c:
	* src/nautilus-bookmarks-window.c:
	* src/nautilus-complex-search-bar.c:
	* src/nautilus-component-adapter-factory.c:
	* src/nautilus-desktop-window.c:
	* src/nautilus-first-time-druid.c:
	* src/nautilus-link-set-window.c:
	* src/nautilus-location-bar.c:
	* src/nautilus-main.c:
	* src/nautilus-navigation-bar.c:
	* src/nautilus-profiler.c:
	* src/nautilus-property-browser.c:
	* src/nautilus-search-bar-criterion.c:
	* src/nautilus-search-bar.c:
	* src/nautilus-shell.c:
	* src/nautilus-sidebar-tabs.c:
	* src/nautilus-sidebar-title.c:
	* src/nautilus-sidebar.c:
	* src/nautilus-signaller.c:
	* src/nautilus-simple-search-bar.c:
	* src/nautilus-switchable-navigation-bar.c:
	* src/nautilus-switchable-search-bar.c:
	* src/nautilus-theme-selector.c:
	* src/nautilus-view-frame-corba.c:
	* src/nautilus-view-frame.c:
	* src/nautilus-window-manage-views.c:
	* src/nautilus-window-menus.c:
	* src/nautilus-window-toolbars.c:
	* src/nautilus-window.c:
	* src/nautilus-window.h:
	* src/nautilus-zoom-control.c:
	Update for new eel library usage.

	* test/test-nautilus-background.c:
	* test/test-nautilus-clickable-image.c:
	* test/test-nautilus-font-manager.c:
	* test/test-nautilus-font-picker.c:
	* test/test-nautilus-font-simple.c:
	* test/test-nautilus-font.c:
	* test/test-nautilus-glyph-simple.c:
	* test/test-nautilus-glyph.c:
	* test/test-nautilus-image-background.c:
	* test/test-nautilus-image-scrolled.c:
	* test/test-nautilus-image-simple.c:
	* test/test-nautilus-image-table.c:
	* test/test-nautilus-image-tile.c:
	* test/test-nautilus-image.c:
	* test/test-nautilus-label-background.c:
	* test/test-nautilus-label-flavorful.c:
	* test/test-nautilus-label-offset.c:
	* test/test-nautilus-label-scrolled.c:
	* test/test-nautilus-label-simple.c:
	* test/test-nautilus-label-wrapped.c:
	* test/test-nautilus-label.c:
	* test/test-nautilus-labeled-image.c:
	* test/test-nautilus-password-dialog.c:
	* test/test-nautilus-pixbuf-tile.c:
	* test/test-nautilus-smooth-text-layout.c:
	* test/test-nautilus-viewport-constraint.c:
	* test/test-nautilus-widgets.c:
	Remove these.  They live in eel now.

	* test/vsignore:
	* test/kefile.am:
	* test/st-nautilus-preferences-change.c:
	* test/st-nautilus-preferences-display.c:
	* test/st-nautilus-wrap-table.c:
	* test/st.c:
	* test/st.h:
	Update for new eel library usage.

600 files changed, 101624 insertions, 146784 deletions

diff --git a/ChangeLog b/ChangeLog
index 4051cd56c..abd50cd15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,439 @@
+2001-04-03  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* Makefile.am:
+	Remove librsvg.
+
+	* librsvg/.cvsignore:
+	* librsvg/Makefile.am:
+	* librsvg/art_render.c:
+	* librsvg/art_render.h:
+	* librsvg/art_render_gradient.c:
+	* librsvg/art_render_gradient.h:
+	* librsvg/art_render_mask.c:
+	* librsvg/art_render_mask.h:
+	* librsvg/art_render_svp.c:
+	* librsvg/art_render_svp.h:
+	* librsvg/art_rgba.c:
+	* librsvg/art_rgba.h:
+	* librsvg/example-nested-transform.svg:
+	* librsvg/makefile-simple:
+	* librsvg/opacity.svg:
+	* librsvg/rsvg-bpath-util.c:
+	* librsvg/rsvg-bpath-util.h:
+	* librsvg/rsvg-css.c:
+	* librsvg/rsvg-css.h:
+	* librsvg/rsvg-defs.c:
+	* librsvg/rsvg-defs.h:
+	* librsvg/rsvg-ft.c:
+	* librsvg/rsvg-ft.h:
+	* librsvg/rsvg-paint-server.c:
+	* librsvg/rsvg-paint-server.h:
+	* librsvg/rsvg-path.c:
+	* librsvg/rsvg-path.h:
+	* librsvg/rsvg.c:
+	* librsvg/rsvg.h:
+	* librsvg/subpixel-text-test:
+	* librsvg/test-ft-gtk.c:
+	* librsvg/test-ft.c:
+	* librsvg/test-rsvg.c:
+	* librsvg/test.svg:
+	Move librsvg to its own top level GNOME CVS module.
+
+	* configure.in:
+	Add librsvg and eel dependencies.
+	Remove librsvg and font entries.
+
+	* nautilus.spec.in:
+	Remove font entries.  Add librsvg and eel requirements.
+	
+	* data/Makefile.am:
+	* data/fonts/.cvsignore:
+	* data/fonts/Makefile.am:
+	* data/fonts/urw/.cvsignore:
+	* data/fonts/urw/Makefile.am:
+	* data/fonts/urw/README:
+	* data/fonts/urw/fonts.dir:
+	* data/fonts/urw/n019003l.afm:
+	* data/fonts/urw/n019003l.pfb:
+	* data/fonts/urw/n019003l.pfm:
+	* data/fonts/urw/n019004l.afm:
+	* data/fonts/urw/n019004l.pfb:
+	* data/fonts/urw/n019004l.pfm:
+	* data/fonts/urw/n019023l.afm:
+	* data/fonts/urw/n019023l.pfb:
+	* data/fonts/urw/n019023l.pfm:
+	* data/fonts/urw/n019024l.afm:
+	* data/fonts/urw/n019024l.pfb:
+	* data/fonts/urw/n019024l.pfm:
+	Retire default fonts.  These now live in eel.
+
+	* libnautilus/nautilus-undo-transaction.c:
+	(nautilus_undo_transaction_destroy):
+	* libnautilus/nautilus-view.c: (nautilus_view_destroy):
+	Update for eel changes.  Use eel-gtk-macros.
+	
+	* nautilus-installer/src/nautilus-druid-page-eazel.c:
+	(nautilus_druid_page_eazel_destroy),
+	(nautilus_druid_page_eazel_finalize),
+	(nautilus_druid_page_eazel_size_allocate),
+	(nautilus_druid_page_eazel_size_request):
+	Update for eel changes.  Use eel-gtk-macros.
+
+	* libnautilus-extensions/Makefile.am:
+	* libnautilus-extensions/nautilus-bonobo-extensions.c:
+	* libnautilus-extensions/nautilus-bonobo-extensions.h:
+	* libnautilus-extensions/nautilus-bookmark.c:
+	* libnautilus-extensions/nautilus-ctree.c:
+	* libnautilus-extensions/nautilus-customization-data.c:
+	* libnautilus-extensions/nautilus-dateedit-extensions.c:
+	* libnautilus-extensions/nautilus-dateedit-extensions.h:
+	* libnautilus-extensions/nautilus-directory-async.c:
+	* libnautilus-extensions/nautilus-directory-background.c:
+	* libnautilus-extensions/nautilus-directory-background.h:
+	* libnautilus-extensions/nautilus-directory-metafile-monitor.c:
+	* libnautilus-extensions/nautilus-directory-metafile.c:
+	* libnautilus-extensions/nautilus-directory.c:
+	* libnautilus-extensions/nautilus-drag-window.c:
+	* libnautilus-extensions/nautilus-drag.c:
+	* libnautilus-extensions/nautilus-druid-page-eazel.c:
+	* libnautilus-extensions/nautilus-druid.c:
+	* libnautilus-extensions/nautilus-entry.c:
+	* libnautilus-extensions/nautilus-file-changes-queue.c:
+	* libnautilus-extensions/nautilus-file-operations-progress.c:
+	* libnautilus-extensions/nautilus-file-operations.c:
+	* libnautilus-extensions/nautilus-file-private.h:
+	* libnautilus-extensions/nautilus-file-utilities.c:
+	* libnautilus-extensions/nautilus-file.c:
+	* libnautilus-extensions/nautilus-font-factory.c:
+	* libnautilus-extensions/nautilus-gconf-extensions.c:
+	* libnautilus-extensions/nautilus-generous-bin.c:
+	* libnautilus-extensions/nautilus-global-preferences.c:
+	* libnautilus-extensions/nautilus-global-preferences.h:
+	* libnautilus-extensions/nautilus-horizontal-splitter.c:
+	* libnautilus-extensions/nautilus-icon-canvas-item.c:
+	* libnautilus-extensions/nautilus-icon-canvas-item.h:
+	* libnautilus-extensions/nautilus-icon-container.c:
+	* libnautilus-extensions/nautilus-icon-container.h:
+	* libnautilus-extensions/nautilus-icon-dnd.c:
+	* libnautilus-extensions/nautilus-icon-factory.c:
+	* libnautilus-extensions/nautilus-icon-factory.h:
+	* libnautilus-extensions/nautilus-icon-private.h:
+	* libnautilus-extensions/nautilus-icon-text-item.c:
+	* libnautilus-extensions/nautilus-keep-last-vertical-box.c:
+	* libnautilus-extensions/nautilus-lib-self-check-functions.c:
+	* libnautilus-extensions/nautilus-lib-self-check-functions.h:
+	* libnautilus-extensions/nautilus-link-set.c:
+	* libnautilus-extensions/nautilus-link.c:
+	* libnautilus-extensions/nautilus-list-column-title.c:
+	* libnautilus-extensions/nautilus-list.c:
+	* libnautilus-extensions/nautilus-medusa-support.c:
+	* libnautilus-extensions/nautilus-merged-directory.c:
+	* libnautilus-extensions/nautilus-metafile-factory.c:
+	* libnautilus-extensions/nautilus-metafile.c:
+	* libnautilus-extensions/nautilus-mime-actions.c:
+	* libnautilus-extensions/nautilus-preferences-box.c:
+	* libnautilus-extensions/nautilus-preferences-dialog.c:
+	* libnautilus-extensions/nautilus-preferences-group.c:
+	* libnautilus-extensions/nautilus-preferences-item.c:
+	* libnautilus-extensions/nautilus-preferences-pane.c:
+	* libnautilus-extensions/nautilus-preferences.c:
+	* libnautilus-extensions/nautilus-preferences.h:
+	* libnautilus-extensions/nautilus-program-chooser.c:
+	* libnautilus-extensions/nautilus-program-choosing.c:
+	* libnautilus-extensions/nautilus-program-choosing.h:
+	* libnautilus-extensions/nautilus-search-uri.c:
+	* libnautilus-extensions/nautilus-sidebar-functions.c:
+	* libnautilus-extensions/nautilus-tabs.c:
+	* libnautilus-extensions/nautilus-theme.c:
+	* libnautilus-extensions/nautilus-thumbnails.c:
+	* libnautilus-extensions/nautilus-trash-directory.c:
+	* libnautilus-extensions/nautilus-trash-file.c:
+	* libnautilus-extensions/nautilus-trash-monitor.c:
+	* libnautilus-extensions/nautilus-undo-context.c:
+	* libnautilus-extensions/nautilus-undo-manager.c:
+	* libnautilus-extensions/nautilus-undo-signal-handlers.c:
+	* libnautilus-extensions/nautilus-vfs-directory.c:
+	* libnautilus-extensions/nautilus-vfs-file.c:
+	* libnautilus-extensions/nautilus-view-identifier.c:
+	* libnautilus-extensions/nautilus-volume-monitor.c:
+	Use new eel library.
+
+	* libnautilus-extensions/nautilus-art-extensions.c:
+	* libnautilus-extensions/nautilus-art-extensions.h:
+	* libnautilus-extensions/nautilus-art-gtk-extensions.c:
+	* libnautilus-extensions/nautilus-art-gtk-extensions.h:
+	* libnautilus-extensions/nautilus-background-canvas-group.c:
+	* libnautilus-extensions/nautilus-background-canvas-group.h:
+	* libnautilus-extensions/nautilus-background.c:
+	* libnautilus-extensions/nautilus-background.h:
+	* libnautilus-extensions/nautilus-caption-table.c:
+	* libnautilus-extensions/nautilus-caption-table.h:
+	* libnautilus-extensions/nautilus-caption.c:
+	* libnautilus-extensions/nautilus-caption.h:
+	* libnautilus-extensions/nautilus-clickable-image.c:
+	* libnautilus-extensions/nautilus-clickable-image.h:
+	* libnautilus-extensions/nautilus-debug-drawing.c:
+	* libnautilus-extensions/nautilus-debug-drawing.h:
+	* libnautilus-extensions/nautilus-debug.c:
+	* libnautilus-extensions/nautilus-debug.h:
+	* libnautilus-extensions/nautilus-ellipsizing-label.c:
+	* libnautilus-extensions/nautilus-ellipsizing-label.h:
+	* libnautilus-extensions/nautilus-enumeration.c:
+	* libnautilus-extensions/nautilus-enumeration.h:
+	* libnautilus-extensions/nautilus-font-manager.c:
+	* libnautilus-extensions/nautilus-font-manager.h:
+	* libnautilus-extensions/nautilus-font-picker.c:
+	* libnautilus-extensions/nautilus-font-picker.h:
+	* libnautilus-extensions/nautilus-gdk-extensions.c:
+	* libnautilus-extensions/nautilus-gdk-extensions.h:
+	* libnautilus-extensions/nautilus-gdk-font-extensions.c:
+	* libnautilus-extensions/nautilus-gdk-font-extensions.h:
+	* libnautilus-extensions/nautilus-gdk-pixbuf-extensions.c:
+	* libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h:
+	* libnautilus-extensions/nautilus-glib-extensions.c:
+	* libnautilus-extensions/nautilus-glib-extensions.h:
+	* libnautilus-extensions/nautilus-glyph.c:
+	* libnautilus-extensions/nautilus-glyph.h:
+	* libnautilus-extensions/nautilus-gnome-extensions.c:
+	* libnautilus-extensions/nautilus-gnome-extensions.h:
+	* libnautilus-extensions/nautilus-graphic-effects.c:
+	* libnautilus-extensions/nautilus-graphic-effects.h:
+	* libnautilus-extensions/nautilus-gtk-extensions.c:
+	* libnautilus-extensions/nautilus-gtk-extensions.h:
+	* libnautilus-extensions/nautilus-gtk-macros.h:
+	* libnautilus-extensions/nautilus-image-table.c:
+	* libnautilus-extensions/nautilus-image-table.h:
+	* libnautilus-extensions/nautilus-image-with-background.c:
+	* libnautilus-extensions/nautilus-image-with-background.h:
+	* libnautilus-extensions/nautilus-image.c:
+	* libnautilus-extensions/nautilus-image.h:
+	* libnautilus-extensions/nautilus-label-with-background.c:
+	* libnautilus-extensions/nautilus-label-with-background.h:
+	* libnautilus-extensions/nautilus-label.c:
+	* libnautilus-extensions/nautilus-label.h:
+	* libnautilus-extensions/nautilus-labeled-image.c:
+	* libnautilus-extensions/nautilus-labeled-image.h:
+	* libnautilus-extensions/nautilus-lib-self-check-functions.c:
+	* libnautilus-extensions/nautilus-lib-self-check-functions.h:
+	* libnautilus-extensions/nautilus-password-dialog.c:
+	* libnautilus-extensions/nautilus-password-dialog.h:
+	* libnautilus-extensions/nautilus-radio-button-group.c:
+	* libnautilus-extensions/nautilus-radio-button-group.h:
+	* libnautilus-extensions/nautilus-region.c:
+	* libnautilus-extensions/nautilus-region.h:
+	* libnautilus-extensions/nautilus-scalable-font-private.h:
+	* libnautilus-extensions/nautilus-scalable-font.c:
+	* libnautilus-extensions/nautilus-scalable-font.h:
+	* libnautilus-extensions/nautilus-self-checks.c:
+	* libnautilus-extensions/nautilus-self-checks.h:
+	* libnautilus-extensions/nautilus-smooth-text-layout-cache.c:
+	* libnautilus-extensions/nautilus-smooth-text-layout-cache.h:
+	* libnautilus-extensions/nautilus-smooth-text-layout.c:
+	* libnautilus-extensions/nautilus-smooth-text-layout.h:
+	* libnautilus-extensions/nautilus-smooth-widget.c:
+	* libnautilus-extensions/nautilus-smooth-widget.h:
+	* libnautilus-extensions/nautilus-stock-dialogs.c:
+	* libnautilus-extensions/nautilus-stock-dialogs.h:
+	* libnautilus-extensions/nautilus-string-list.c:
+	* libnautilus-extensions/nautilus-string-list.h:
+	* libnautilus-extensions/nautilus-string-map.c:
+	* libnautilus-extensions/nautilus-string-map.h:
+	* libnautilus-extensions/nautilus-string-picker.c:
+	* libnautilus-extensions/nautilus-string-picker.h:
+	* libnautilus-extensions/nautilus-string.c:
+	* libnautilus-extensions/nautilus-string.h:
+	* libnautilus-extensions/nautilus-text-caption.c:
+	* libnautilus-extensions/nautilus-text-caption.h:
+	* libnautilus-extensions/nautilus-viewport.c:
+	* libnautilus-extensions/nautilus-viewport.h:
+	* libnautilus-extensions/nautilus-wrap-table.c:
+	* libnautilus-extensions/nautilus-wrap-table.h:
+	* libnautilus-extensions/nautilus-xml-extensions.c:
+	* libnautilus-extensions/nautilus-xml-extensions.h:
+	Remove these files.  These are all part of eel now.
+	
+	* applets/launcher/nautilus-launcher-applet.c:
+	* applets/preferences-applet/nautilus-preferences-applet.c:
+	* components/adapter/Makefile.am:
+	* components/adapter/main.c:
+	* components/adapter/nautilus-adapter-control-embed-strategy.c:
+	* components/adapter/nautilus-adapter-embed-strategy.c:
+	* components/adapter/nautilus-adapter-embeddable-embed-strategy.c:
+	* components/adapter/nautilus-adapter-factory-server.c:
+	* components/adapter/nautilus-adapter-file-load-strategy.c:
+	* components/adapter/nautilus-adapter-load-strategy.c:
+	* components/adapter/nautilus-adapter-progressive-load-strategy.c:
+	* components/adapter/nautilus-adapter-stream-load-strategy.c:
+	* components/adapter/nautilus-adapter.c:
+	* components/hardware/Makefile.am:
+	* components/hardware/nautilus-hardware-view.c:
+	* components/help/Makefile.am:
+	* components/help/help-method.c:
+	* components/help/hyperbola-filefmt.c:
+	* components/help/hyperbola-nav-tree.c:
+	* components/history/Makefile.am:
+	* components/history/nautilus-history-view.c:
+	* components/image-viewer/Makefile.am:
+	* components/image-viewer/nautilus-image-view.c:
+	* components/loser/content/Makefile.am:
+	* components/loser/content/nautilus-content-loser.c:
+	* components/loser/sidebar/Makefile.am:
+	* components/loser/sidebar/nautilus-sidebar-loser.c:
+	* components/mozilla/Makefile.am:
+	* components/mozilla/bonobo-extensions.c:
+	* components/mozilla/nautilus-mozilla-content-view.c:
+	* components/music/Makefile.am:
+	* components/music/nautilus-music-view.c:
+	* components/notes/Makefile.am:
+	* components/notes/nautilus-notes.c:
+	* components/rpmview/Makefile.am:
+	* components/rpmview/nautilus-rpm-verify-window.c:
+	* components/rpmview/nautilus-rpm-view-install.c:
+	* components/rpmview/nautilus-rpm-view.c:
+	* components/sample/nautilus-sample-content-view.c:
+	* components/services/install-view/Makefile.am:
+	* components/services/install-view/callbacks.c:
+	* components/services/install-view/forms.c:
+	* components/services/install-view/nautilus-service-install-view.c:
+	* components/services/install/lib/eazel-install-logic2.c:
+	* components/services/install/server/main.c:
+	* components/services/inventory-view/Makefile.am:
+	* components/services/inventory-view/nautilus-inventory-config-page
+	.c:
+	* components/services/inventory-view/nautilus-inventory-disable-pag
+	* components/services/inventory-view/nautilus-inventory-enable-page
+	* components/services/inventory-view/nautilus-inventory-view.c:
+	* components/services/inventory/Makefile.am:
+	* components/services/inventory/eazel-inventory-upload-callback.c:
+	* components/services/inventory/eazel-inventory.c:
+	* components/services/inventory/main.c:
+	* components/services/login/nautilus-view/Makefile.am:
+	* components/services/login/nautilus-view/nautilus-change-password-
+	view.c:
+	* components/services/login/nautilus-view/password-box.c:
+	* components/services/nautilus-dependent-shared/Makefile.am:
+	* components/services/nautilus-dependent-shared/eazel-services-exte
+	nsions.c:
+	* components/services/nautilus-dependent-shared/eazel-services-exte
+	nsions.h:
+	* components/services/nautilus-dependent-shared/eazel-services-foot
+	er.c:
+	* components/services/nautilus-dependent-shared/eazel-services-head
+	er.c:
+	* components/services/nautilus-dependent-shared/test-footer-header.
+	c:
+	* components/services/summary/Makefile.am:
+	* components/services/summary/nautilus-summary-callbacks.c:
+	* components/services/summary/nautilus-summary-dialogs.c:
+	* components/services/summary/nautilus-summary-dialogs.h:
+	* components/services/summary/nautilus-summary-footer.c:
+	* components/services/summary/nautilus-summary-menu-items.c:
+	* components/services/summary/nautilus-summary-view-private.h:
+	* components/services/summary/nautilus-summary-view.c:
+	* components/services/time/nautilus-view/main.c:
+	* components/services/time/nautilus-view/trilobite-eazel-time-view.
+	c:
+	* components/services/trilobite/sample/nautilus-view/Makefile.am:
+	* components/text/Makefile.am:
+	* components/text/nautilus-text-view.c:
+	* components/throbber/Makefile.am:
+	* components/throbber/main.c:
+	* components/throbber/nautilus-throbber.c:
+	* components/tree/Makefile.am:
+	* components/tree/nautilus-tree-change-queue.c:
+	* components/tree/nautilus-tree-expansion-state.c:
+	* components/tree/nautilus-tree-model.c:
+	* components/tree/nautilus-tree-node.c:
+	* components/tree/nautilus-tree-view-dnd.c:
+	* components/tree/nautilus-tree-view.c:
+	* helper-utilities/authenticate/Makefile.am:
+	* helper-utilities/authenticate/nautilus-authenticate.c:
+	* nautilus-installer/src/nautilus-druid.c:
+	* src/Makefile.am:
+	* src/file-manager/fm-desktop-icon-view.c:
+	* src/file-manager/fm-directory-view.c:
+	* src/file-manager/fm-directory-view.h:
+	* src/file-manager/fm-error-reporting.c:
+	* src/file-manager/fm-icon-text-window.c:
+	* src/file-manager/fm-icon-view.c:
+	* src/file-manager/fm-list-view.c:
+	* src/file-manager/fm-properties-window.c:
+	* src/file-manager/fm-search-list-view.c:
+	* src/file-manager/nautilus-indexing-info.c:
+	* src/nautilus-about.c:
+	* src/nautilus-application.c:
+	* src/nautilus-bookmark-list.c:
+	* src/nautilus-bookmark-parsing.c:
+	* src/nautilus-bookmarks-window.c:
+	* src/nautilus-complex-search-bar.c:
+	* src/nautilus-component-adapter-factory.c:
+	* src/nautilus-desktop-window.c:
+	* src/nautilus-first-time-druid.c:
+	* src/nautilus-link-set-window.c:
+	* src/nautilus-location-bar.c:
+	* src/nautilus-main.c:
+	* src/nautilus-navigation-bar.c:
+	* src/nautilus-profiler.c:
+	* src/nautilus-property-browser.c:
+	* src/nautilus-search-bar-criterion.c:
+	* src/nautilus-search-bar.c:
+	* src/nautilus-shell.c:
+	* src/nautilus-sidebar-tabs.c:
+	* src/nautilus-sidebar-title.c:
+	* src/nautilus-sidebar.c:
+	* src/nautilus-signaller.c:
+	* src/nautilus-simple-search-bar.c:
+	* src/nautilus-switchable-navigation-bar.c:
+	* src/nautilus-switchable-search-bar.c:
+	* src/nautilus-theme-selector.c:
+	* src/nautilus-view-frame-corba.c:
+	* src/nautilus-view-frame.c:
+	* src/nautilus-window-manage-views.c:
+	* src/nautilus-window-menus.c:
+	* src/nautilus-window-toolbars.c:
+	* src/nautilus-window.c:
+	* src/nautilus-window.h:
+	* src/nautilus-zoom-control.c:
+	Update for new eel library usage.
+
+	* test/test-nautilus-background.c:
+	* test/test-nautilus-clickable-image.c:
+	* test/test-nautilus-font-manager.c:
+	* test/test-nautilus-font-picker.c:
+	* test/test-nautilus-font-simple.c:
+	* test/test-nautilus-font.c:
+	* test/test-nautilus-glyph-simple.c:
+	* test/test-nautilus-glyph.c:
+	* test/test-nautilus-image-background.c:
+	* test/test-nautilus-image-scrolled.c:
+	* test/test-nautilus-image-simple.c:
+	* test/test-nautilus-image-table.c:
+	* test/test-nautilus-image-tile.c:
+	* test/test-nautilus-image.c:
+	* test/test-nautilus-label-background.c:
+	* test/test-nautilus-label-flavorful.c:
+	* test/test-nautilus-label-offset.c:
+	* test/test-nautilus-label-scrolled.c:
+	* test/test-nautilus-label-simple.c:
+	* test/test-nautilus-label-wrapped.c:
+	* test/test-nautilus-label.c:
+	* test/test-nautilus-labeled-image.c:
+	* test/test-nautilus-password-dialog.c:
+	* test/test-nautilus-pixbuf-tile.c:
+	* test/test-nautilus-smooth-text-layout.c:
+	* test/test-nautilus-viewport-constraint.c:
+	* test/test-nautilus-widgets.c:
+	Remove these.  They live in eel now.
+
+	* test/vsignore:
+	* test/kefile.am:
+	* test/st-nautilus-preferences-change.c:
+	* test/st-nautilus-preferences-display.c:
+	* test/st-nautilus-wrap-table.c:
+	* test/st.c:
+	* test/st.h:
+	Update for new eel library usage.
+
 2001-04-03  Darin Adler  <darin@eazel.com>
 
 	reviewed by: John Harper <jsh@eazel.com>
diff --git a/Makefile.am b/Makefile.am
index 2eb25f055..2b78f2a2a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,6 @@ SUBDIRS =			\
 	icons 			\
 	intl 			\
 	cut-n-paste-code 	\
-	librsvg 		\
 	libnautilus 		\
 	libnautilus-adapter	\
 	libnautilus-extensions 	\
diff --git a/applets/launcher/nautilus-launcher-applet.c b/applets/launcher/nautilus-launcher-applet.c
index f6f6367f2..e0457f83e 100644
--- a/applets/launcher/nautilus-launcher-applet.c
+++ b/applets/launcher/nautilus-launcher-applet.c
@@ -25,8 +25,8 @@
 
 #include <config.h>
 #include <applet-widget.h>
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-graphic-effects.h>
+#include <eel/eel-image.h>
+#include <eel/eel-graphic-effects.h>
 #include <libgnome/gnome-exec.h>
 #include <gtk/gtkobject.h>
 #include <gtk/gtkeventbox.h>
@@ -68,7 +68,7 @@ create_pixbufs ()
 		
 		g_assert (icon_pixbuf != NULL);
 
-		icon_prelight_pixbuf = nautilus_create_spotlight_pixbuf (icon_pixbuf);
+		icon_prelight_pixbuf = eel_create_spotlight_pixbuf (icon_pixbuf);
 	}
 }
 
@@ -84,10 +84,10 @@ image_enter_event (GtkWidget *event_box,
 		   gpointer client_data)
 {
 	g_return_val_if_fail (GTK_IS_EVENT_BOX (event_box), TRUE);
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (client_data), TRUE);
+	g_return_val_if_fail (EEL_IS_IMAGE (client_data), TRUE);
 
 	if (!get_is_launching ()) {
-		nautilus_image_set_pixbuf (NAUTILUS_IMAGE (client_data), icon_prelight_pixbuf);
+		eel_image_set_pixbuf (EEL_IMAGE (client_data), icon_prelight_pixbuf);
 	}
 
 	return TRUE;
@@ -99,9 +99,9 @@ image_leave_event (GtkWidget *event_box,
 		   gpointer client_data)
 {
 	g_return_val_if_fail (GTK_IS_EVENT_BOX (event_box), TRUE);
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (client_data), TRUE);
+	g_return_val_if_fail (EEL_IS_IMAGE (client_data), TRUE);
 	
-	nautilus_image_set_pixbuf (NAUTILUS_IMAGE (client_data), icon_pixbuf);
+	eel_image_set_pixbuf (EEL_IMAGE (client_data), icon_pixbuf);
 	gtk_object_set_data (GTK_OBJECT (event_box), "was-pressed", FALSE);
 
 	return TRUE;
@@ -139,7 +139,7 @@ set_is_launching (gboolean state)
 	window_set_cursor_for_state (get_root_window (), is_launching);
 	window_set_cursor_for_state (GTK_WIDGET (icon_event_box)->window, is_launching);	
 
-	nautilus_image_set_pixbuf_opacity (NAUTILUS_IMAGE (icon_image), is_launching ? 128 : 255);
+	eel_image_set_pixbuf_opacity (EEL_IMAGE (icon_image), is_launching ? 128 : 255);
 }
 
 static gboolean
@@ -156,7 +156,7 @@ image_button_press_event (GtkWidget *event_box,
 	GtkWidget *icon = GTK_WIDGET (client_data);
 
 	g_return_val_if_fail (GTK_IS_EVENT_BOX (event_box), TRUE);
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (icon), TRUE);
+	g_return_val_if_fail (EEL_IS_IMAGE (icon), TRUE);
 
 	if (!get_is_launching ()) {
 		gtk_object_set_data (GTK_OBJECT (event_box), "was-pressed", GINT_TO_POINTER (TRUE));
@@ -173,7 +173,7 @@ image_button_release_event (GtkWidget *event_box,
 	GtkWidget *icon = GTK_WIDGET (client_data);
 
 	g_return_val_if_fail (GTK_IS_EVENT_BOX (event_box), TRUE);
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (icon), TRUE);
+	g_return_val_if_fail (EEL_IS_IMAGE (icon), TRUE);
 
 	if (GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (event_box), "was-pressed"))) {
 		gtk_object_set_data (GTK_OBJECT (event_box), "was-pressed", FALSE);
@@ -278,7 +278,7 @@ main (int argc, char **argv)
 	icon_event_box = gtk_event_box_new ();
 	gtk_object_set_data (GTK_OBJECT (icon_event_box), "was-pressed", FALSE);
 
-	icon_image = nautilus_image_new (NULL);
+	icon_image = eel_image_new (NULL);
 	gtk_misc_set_padding (GTK_MISC (icon_image), 2, 2);
 
 	gtk_signal_connect (GTK_OBJECT (icon_event_box), "enter_notify_event", GTK_SIGNAL_FUNC (image_enter_event), icon_image);
@@ -286,7 +286,7 @@ main (int argc, char **argv)
 	gtk_signal_connect (GTK_OBJECT (icon_event_box), "button_press_event", GTK_SIGNAL_FUNC (image_button_press_event), icon_image);
 	gtk_signal_connect (GTK_OBJECT (icon_event_box), "button_release_event", GTK_SIGNAL_FUNC (image_button_release_event), icon_image);
 
-	nautilus_image_set_pixbuf (NAUTILUS_IMAGE (icon_image), icon_pixbuf);
+	eel_image_set_pixbuf (EEL_IMAGE (icon_image), icon_pixbuf);
 
 	gtk_container_add (GTK_CONTAINER (icon_event_box), icon_image);
 	gtk_object_set_data (GTK_OBJECT (applet), "widget", icon_event_box);
diff --git a/applets/preferences-applet/nautilus-preferences-applet.c b/applets/preferences-applet/nautilus-preferences-applet.c
index a35262668..b8d6b0168 100644
--- a/applets/preferences-applet/nautilus-preferences-applet.c
+++ b/applets/preferences-applet/nautilus-preferences-applet.c
@@ -26,10 +26,10 @@
 
 #include <config.h>
 #include <applet-widget.h>
-#include <libnautilus-extensions/nautilus-image.h>
+#include <eel/eel-image.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtktogglebutton.h>
@@ -102,7 +102,7 @@ boolean_toggle_button_new (const char *preference_name,
 
 	
 	button = gtk_toggle_button_new_with_label (button_label);
-	nautilus_gtk_label_make_smaller (GTK_LABEL (GTK_BIN (button)->child), 4);
+	eel_gtk_label_make_smaller (GTK_LABEL (GTK_BIN (button)->child), 4);
 
 	foo = g_new (Foo, 1);
 	foo->preference_name = g_strdup (preference_name);
@@ -136,7 +136,7 @@ quit_nautilus_button_clicked_callback (GtkWidget *button,
 {
 	g_return_if_fail (GTK_IS_BUTTON (button));
 	
-	nautilus_gnome_shell_execute ("nautilus --quit");
+	eel_gnome_shell_execute ("nautilus --quit");
 }
 
 static void
@@ -145,7 +145,7 @@ start_nautilus_button_clicked_callback (GtkWidget *button,
 {
 	g_return_if_fail (GTK_IS_BUTTON (button));
 	
-	nautilus_gnome_shell_execute ("nautilus");
+	eel_gnome_shell_execute ("nautilus");
 }
 
 static void
@@ -154,7 +154,7 @@ restart_nautilus_button_clicked_callback (GtkWidget *button,
 {
 	g_return_if_fail (GTK_IS_BUTTON (button));
 	
-	nautilus_gnome_shell_execute ("nautilus --restart");
+	eel_gnome_shell_execute ("nautilus --restart");
 }
 
 static void
@@ -241,7 +241,7 @@ main (int argc, char **argv)
 	user_level_changed_callback (smooth_graphics_button);
 
 	quit_button = gtk_button_new_with_label (_("Quit"));
-	nautilus_gtk_label_make_smaller (GTK_LABEL (GTK_BIN (quit_button)->child), 4);
+	eel_gtk_label_make_smaller (GTK_LABEL (GTK_BIN (quit_button)->child), 4);
 	gtk_box_pack_start (GTK_BOX (command_hbox), quit_button, TRUE, TRUE, 1);
 	gtk_signal_connect (GTK_OBJECT (quit_button),
 			    "clicked",
@@ -249,7 +249,7 @@ main (int argc, char **argv)
 			    NULL);
 
 	start_button = gtk_button_new_with_label (_("Start"));
-	nautilus_gtk_label_make_smaller (GTK_LABEL (GTK_BIN (start_button)->child), 4);
+	eel_gtk_label_make_smaller (GTK_LABEL (GTK_BIN (start_button)->child), 4);
 	gtk_box_pack_start (GTK_BOX (command_hbox), start_button, TRUE, TRUE, 1);
 	gtk_signal_connect (GTK_OBJECT (start_button),
 			    "clicked",
@@ -257,7 +257,7 @@ main (int argc, char **argv)
 			    NULL);
 
 	restart_button = gtk_button_new_with_label (_("Restart"));
-	nautilus_gtk_label_make_smaller (GTK_LABEL (GTK_BIN (restart_button)->child), 4);
+	eel_gtk_label_make_smaller (GTK_LABEL (GTK_BIN (restart_button)->child), 4);
 	gtk_box_pack_start (GTK_BOX (command_hbox), restart_button, TRUE, TRUE, 1);
 	gtk_signal_connect (GTK_OBJECT (restart_button),
 			    "clicked",
@@ -265,7 +265,7 @@ main (int argc, char **argv)
 			    NULL);
 
 	exit_button = gtk_button_new_with_label ("[x]");
-	nautilus_gtk_label_make_smaller (GTK_LABEL (GTK_BIN (exit_button)->child), 4);
+	eel_gtk_label_make_smaller (GTK_LABEL (GTK_BIN (exit_button)->child), 4);
 	gtk_box_pack_start (GTK_BOX (command_hbox), exit_button, TRUE, TRUE, 1);
 	gtk_signal_connect (GTK_OBJECT (exit_button),
 			    "clicked",
diff --git a/components/adapter/Makefile.am b/components/adapter/Makefile.am
index 46534c979..9d75b89c8 100644
--- a/components/adapter/Makefile.am
+++ b/components/adapter/Makefile.am
@@ -5,6 +5,8 @@ INCLUDES =					\
 	-DG_LOG_DOMAIN=\"Nautilus-Adapter\"	\
 	-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \
 	-I$(top_srcdir) -I$(top_builddir) -I.	\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS)			\
 	$(BONOBOX_CFLAGS)			\
 	$(OAF_CFLAGS)				\
@@ -58,6 +60,8 @@ nautilus_adapter_LDADD =							\
 	$(top_builddir)/libnautilus/libnautilus.la				\
 	$(top_builddir)/libnautilus-adapter/libnautilus-adapter.la		\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(GNOMEUI_LIBS)								\
 	$(OAF_LIBS)								\
 	$(BONOBO_PRINT_LIBS)							\
diff --git a/components/adapter/main.c b/components/adapter/main.c
index 958191d94..31153f595 100644
--- a/components/adapter/main.c
+++ b/components/adapter/main.c
@@ -35,7 +35,7 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <libgnomevfs/gnome-vfs-init.h>
-#include <libnautilus-extensions/nautilus-debug.h>
+#include <eel/eel-debug.h>
 #include <liboaf/liboaf.h>
 #include <stdlib.h>
 
@@ -93,7 +93,7 @@ main (int argc, char *argv[])
 	char *registration_id;
 
 	if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
-		nautilus_make_warnings_and_criticals_stop_in_debugger
+		eel_make_warnings_and_criticals_stop_in_debugger
 			(G_LOG_DOMAIN, g_log_domain_glib, "Gdk", "Gtk", "GnomeVFS", "GnomeUI", "Bonobo", "ORBit", NULL);
 	}
 	
diff --git a/components/adapter/nautilus-adapter-control-embed-strategy.c b/components/adapter/nautilus-adapter-control-embed-strategy.c
index d7d4c8636..97b6bf1a3 100644
--- a/components/adapter/nautilus-adapter-control-embed-strategy.c
+++ b/components/adapter/nautilus-adapter-control-embed-strategy.c
@@ -36,7 +36,7 @@
 
 #include <gtk/gtkobject.h>
 #include <gtk/gtksignal.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <bonobo/bonobo-control.h>
 
 
@@ -58,7 +58,7 @@ static GtkWidget *nautilus_adapter_control_embed_strategy_get_widget (NautilusAd
 static BonoboObject *nautilus_adapter_control_embed_strategy_get_zoomable (NautilusAdapterEmbedStrategy *strategy);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapterControlEmbedStrategy, nautilus_adapter_control_embed_strategy, NAUTILUS_TYPE_ADAPTER_EMBED_STRATEGY)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterControlEmbedStrategy, nautilus_adapter_control_embed_strategy, NAUTILUS_TYPE_ADAPTER_EMBED_STRATEGY)
 
 
 static void
@@ -98,7 +98,7 @@ nautilus_adapter_control_embed_strategy_destroy (GtkObject *object)
 
 	g_free (strategy->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void 
diff --git a/components/adapter/nautilus-adapter-control-factory-embed-strategy.c b/components/adapter/nautilus-adapter-control-factory-embed-strategy.c
index bc9d885db..6fcef3cf0 100644
--- a/components/adapter/nautilus-adapter-control-factory-embed-strategy.c
+++ b/components/adapter/nautilus-adapter-control-factory-embed-strategy.c
@@ -37,7 +37,7 @@
 #include <bonobo/bonobo-client-site.h>
 #include <bonobo/bonobo-item-container.h>
 #include <gtk/gtksignal.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus/nautilus-view.h>
 
 struct NautilusAdapterEmbeddableEmbedStrategyDetails {
@@ -61,7 +61,7 @@ static GtkWidget *nautilus_adapter_embeddable_embed_strategy_get_widget (Nautilu
 static BonoboObject *nautilus_adapter_embeddable_embed_strategy_get_zoomable (NautilusAdapterEmbedStrategy *strategy);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapterEmbeddableEmbedStrategy, nautilus_adapter_embeddable_embed_strategy, NAUTILUS_TYPE_ADAPTER_EMBED_STRATEGY)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterEmbeddableEmbedStrategy, nautilus_adapter_embeddable_embed_strategy, NAUTILUS_TYPE_ADAPTER_EMBED_STRATEGY)
 
 
 static void
@@ -107,7 +107,7 @@ nautilus_adapter_embeddable_embed_strategy_destroy (GtkObject *object)
 
 	g_free (strategy->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
diff --git a/components/adapter/nautilus-adapter-embed-strategy.c b/components/adapter/nautilus-adapter-embed-strategy.c
index f2739accc..552d3c0e9 100644
--- a/components/adapter/nautilus-adapter-embed-strategy.c
+++ b/components/adapter/nautilus-adapter-embed-strategy.c
@@ -36,7 +36,7 @@
 #include "nautilus-adapter-embeddable-embed-strategy.h"
 #include <gtk/gtkobject.h>
 #include <gtk/gtksignal.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <stdio.h>
 
 enum {
@@ -51,12 +51,12 @@ static guint signals[LAST_SIGNAL];
 static void nautilus_adapter_embed_strategy_initialize_class (NautilusAdapterEmbedStrategyClass *klass);
 static void nautilus_adapter_embed_strategy_initialize       (NautilusAdapterEmbedStrategy      *strategy);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapterEmbedStrategy,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterEmbedStrategy,
 				   nautilus_adapter_embed_strategy,
 				   GTK_TYPE_OBJECT)
 
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_embed_strategy, get_widget)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_embed_strategy, get_zoomable)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_embed_strategy, get_widget)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_embed_strategy, get_zoomable)
 
 static void
 nautilus_adapter_embed_strategy_initialize_class (NautilusAdapterEmbedStrategyClass *klass)
@@ -89,8 +89,8 @@ nautilus_adapter_embed_strategy_initialize_class (NautilusAdapterEmbedStrategyCl
 	
 	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
 	
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_embed_strategy, get_widget);
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_embed_strategy, get_zoomable);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_embed_strategy, get_widget);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_embed_strategy, get_zoomable);
 }
 
 static void
@@ -136,7 +136,7 @@ nautilus_adapter_embed_strategy_get (Bonobo_Unknown component)
 GtkWidget *
 nautilus_adapter_embed_strategy_get_widget (NautilusAdapterEmbedStrategy *strategy)
 {
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_ADAPTER_EMBED_STRATEGY_CLASS, strategy,
 		 get_widget, (strategy));
 }
@@ -144,7 +144,7 @@ nautilus_adapter_embed_strategy_get_widget (NautilusAdapterEmbedStrategy *strate
 BonoboObject *
 nautilus_adapter_embed_strategy_get_zoomable (NautilusAdapterEmbedStrategy *strategy)
 {
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_ADAPTER_EMBED_STRATEGY_CLASS, strategy,
 		 get_zoomable, (strategy));
 }
diff --git a/components/adapter/nautilus-adapter-embeddable-embed-strategy.c b/components/adapter/nautilus-adapter-embeddable-embed-strategy.c
index bc9d885db..6fcef3cf0 100644
--- a/components/adapter/nautilus-adapter-embeddable-embed-strategy.c
+++ b/components/adapter/nautilus-adapter-embeddable-embed-strategy.c
@@ -37,7 +37,7 @@
 #include <bonobo/bonobo-client-site.h>
 #include <bonobo/bonobo-item-container.h>
 #include <gtk/gtksignal.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus/nautilus-view.h>
 
 struct NautilusAdapterEmbeddableEmbedStrategyDetails {
@@ -61,7 +61,7 @@ static GtkWidget *nautilus_adapter_embeddable_embed_strategy_get_widget (Nautilu
 static BonoboObject *nautilus_adapter_embeddable_embed_strategy_get_zoomable (NautilusAdapterEmbedStrategy *strategy);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapterEmbeddableEmbedStrategy, nautilus_adapter_embeddable_embed_strategy, NAUTILUS_TYPE_ADAPTER_EMBED_STRATEGY)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterEmbeddableEmbedStrategy, nautilus_adapter_embeddable_embed_strategy, NAUTILUS_TYPE_ADAPTER_EMBED_STRATEGY)
 
 
 static void
@@ -107,7 +107,7 @@ nautilus_adapter_embeddable_embed_strategy_destroy (GtkObject *object)
 
 	g_free (strategy->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
diff --git a/components/adapter/nautilus-adapter-factory-server.c b/components/adapter/nautilus-adapter-factory-server.c
index 4c5f6119f..d1ce8a0d5 100644
--- a/components/adapter/nautilus-adapter-factory-server.c
+++ b/components/adapter/nautilus-adapter-factory-server.c
@@ -36,7 +36,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-stock.h>
 #include <libnautilus-adapter/nautilus-adapter-factory.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
 #include <libnautilus/nautilus-bonobo-workarounds.h>
 
@@ -84,7 +84,7 @@ static void nautilus_adapter_factory_server_initialize       (NautilusAdapterFac
 static void nautilus_adapter_factory_server_destroy          (GtkObject                      *object);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapterFactoryServer,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterFactoryServer,
 				   nautilus_adapter_factory_server,
 				   BONOBO_OBJECT_TYPE)
 
@@ -121,7 +121,7 @@ nautilus_adapter_factory_server_initialize (NautilusAdapterFactoryServer *server
 static void
 nautilus_adapter_factory_server_destroy (GtkObject *object)
 {
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
diff --git a/components/adapter/nautilus-adapter-file-load-strategy.c b/components/adapter/nautilus-adapter-file-load-strategy.c
index 639d97373..ba586ab2b 100644
--- a/components/adapter/nautilus-adapter-file-load-strategy.c
+++ b/components/adapter/nautilus-adapter-file-load-strategy.c
@@ -33,7 +33,7 @@
 #include "nautilus-adapter-file-load-strategy.h"
 
 #include <gtk/gtkobject.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libnautilus/nautilus-view.h>
 
@@ -53,7 +53,7 @@ static void nautilus_adapter_file_load_strategy_load_location (NautilusAdapterLo
 static void nautilus_adapter_file_load_strategy_stop_loading  (NautilusAdapterLoadStrategy *strategy);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapterFileLoadStrategy, nautilus_adapter_file_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterFileLoadStrategy, nautilus_adapter_file_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
 
 
 static void
@@ -94,7 +94,7 @@ nautilus_adapter_file_load_strategy_destroy (GtkObject *object)
 
 	g_free (strategy->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
diff --git a/components/adapter/nautilus-adapter-load-strategy.c b/components/adapter/nautilus-adapter-load-strategy.c
index 90fac934e..5a7c490af 100644
--- a/components/adapter/nautilus-adapter-load-strategy.c
+++ b/components/adapter/nautilus-adapter-load-strategy.c
@@ -36,8 +36,8 @@
 #include "nautilus-adapter-progressive-load-strategy.h"
 
 #include <gtk/gtkobject.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
 
 
 
@@ -57,10 +57,10 @@ static void nautilus_adapter_load_strategy_initialize_class (NautilusAdapterLoad
 static void nautilus_adapter_load_strategy_initialize       (NautilusAdapterLoadStrategy      *strategy);
 static void nautilus_adapter_load_strategy_destroy          (GtkObject                        *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapterLoadStrategy, nautilus_adapter_load_strategy, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterLoadStrategy, nautilus_adapter_load_strategy, GTK_TYPE_OBJECT)
 
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_load_strategy, load_location)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_load_strategy, stop_loading)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_load_strategy, load_location)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_load_strategy, stop_loading)
 
 static void
 nautilus_adapter_load_strategy_initialize_class (NautilusAdapterLoadStrategyClass *klass)
@@ -71,8 +71,8 @@ nautilus_adapter_load_strategy_initialize_class (NautilusAdapterLoadStrategyClas
 
 	object_class->destroy = nautilus_adapter_load_strategy_destroy;
 
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_load_strategy, load_location);
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_load_strategy, stop_loading);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_load_strategy, load_location);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_load_strategy, stop_loading);
 
 
 	signals[REPORT_LOAD_UNDERWAY] =
@@ -87,7 +87,7 @@ nautilus_adapter_load_strategy_initialize_class (NautilusAdapterLoadStrategyClas
 			       GTK_RUN_LAST,
 			       object_class->type,
 			       GTK_SIGNAL_OFFSET (NautilusAdapterLoadStrategyClass, report_load_progress),
-			       nautilus_gtk_marshal_NONE__DOUBLE,
+			       eel_gtk_marshal_NONE__DOUBLE,
 			       GTK_TYPE_NONE, 1, GTK_TYPE_DOUBLE);
 	signals[REPORT_LOAD_COMPLETE] =
 		gtk_signal_new ("report_load_complete",
@@ -120,7 +120,7 @@ nautilus_adapter_load_strategy_destroy (GtkObject *object)
 
 	strategy = NAUTILUS_ADAPTER_LOAD_STRATEGY (object);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
@@ -178,7 +178,7 @@ nautilus_adapter_load_strategy_load_location (NautilusAdapterLoadStrategy *strat
 {
 	g_return_if_fail (NAUTILUS_IS_ADAPTER_LOAD_STRATEGY (strategy));
 
-	NAUTILUS_CALL_METHOD (NAUTILUS_ADAPTER_LOAD_STRATEGY_CLASS, strategy,
+	EEL_CALL_METHOD (NAUTILUS_ADAPTER_LOAD_STRATEGY_CLASS, strategy,
 			      load_location, (strategy, uri));
 }
 
@@ -188,7 +188,7 @@ nautilus_adapter_load_strategy_stop_loading  (NautilusAdapterLoadStrategy *strat
 
 	g_return_if_fail (NAUTILUS_IS_ADAPTER_LOAD_STRATEGY (strategy));
 
-	NAUTILUS_CALL_METHOD (NAUTILUS_ADAPTER_LOAD_STRATEGY_CLASS, strategy,
+	EEL_CALL_METHOD (NAUTILUS_ADAPTER_LOAD_STRATEGY_CLASS, strategy,
 			      stop_loading, (strategy));
 }
 
diff --git a/components/adapter/nautilus-adapter-progressive-load-strategy.c b/components/adapter/nautilus-adapter-progressive-load-strategy.c
index 2afe5d0b2..45673322b 100644
--- a/components/adapter/nautilus-adapter-progressive-load-strategy.c
+++ b/components/adapter/nautilus-adapter-progressive-load-strategy.c
@@ -33,7 +33,7 @@
 #include "nautilus-adapter-progressive-load-strategy.h"
 
 #include <gtk/gtkobject.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <bonobo/Bonobo.h>
 
@@ -64,7 +64,7 @@ static void nautilus_adapter_progressive_load_strategy_load_location (NautilusAd
 static void nautilus_adapter_progressive_load_strategy_stop_loading  (NautilusAdapterLoadStrategy *strategy);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapterProgressiveLoadStrategy, nautilus_adapter_progressive_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterProgressiveLoadStrategy, nautilus_adapter_progressive_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
 
 
 static void
@@ -107,7 +107,7 @@ nautilus_adapter_progressive_load_strategy_destroy (GtkObject *object)
 
 	g_free (strategy->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 NautilusAdapterLoadStrategy *
diff --git a/components/adapter/nautilus-adapter-stream-load-strategy.c b/components/adapter/nautilus-adapter-stream-load-strategy.c
index 99b6adfb2..1c79c2539 100644
--- a/components/adapter/nautilus-adapter-stream-load-strategy.c
+++ b/components/adapter/nautilus-adapter-stream-load-strategy.c
@@ -34,7 +34,7 @@
 #include "bonobo-stream-vfs.h"
 
 #include <gtk/gtkobject.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus/nautilus-view.h>
 
 struct NautilusAdapterStreamLoadStrategyDetails {
@@ -52,7 +52,7 @@ static void nautilus_adapter_stream_load_strategy_load_location (NautilusAdapter
 static void nautilus_adapter_stream_load_strategy_stop_loading  (NautilusAdapterLoadStrategy *strategy);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapterStreamLoadStrategy, nautilus_adapter_stream_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterStreamLoadStrategy, nautilus_adapter_stream_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
 
 
 static void
@@ -93,7 +93,7 @@ nautilus_adapter_stream_load_strategy_destroy (GtkObject *object)
 
 	g_free (strategy->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
diff --git a/components/adapter/nautilus-adapter.c b/components/adapter/nautilus-adapter.c
index 87d1d4641..ea9696641 100644
--- a/components/adapter/nautilus-adapter.c
+++ b/components/adapter/nautilus-adapter.c
@@ -40,7 +40,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-stock.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-generous-bin.h>
 #include <libnautilus-adapter/nautilus-adapter-factory.h>
 
@@ -81,7 +81,7 @@ static void nautilus_adapter_initialize       (NautilusAdapter      *server);
 static void nautilus_adapter_destroy          (GtkObject                      *object);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapter,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapter,
 				   nautilus_adapter,
 				   GTK_TYPE_OBJECT)
 
@@ -143,7 +143,7 @@ nautilus_adapter_destroy (GtkObject *object)
 
 	g_free (adapter->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 NautilusAdapter *
diff --git a/components/hardware/Makefile.am b/components/hardware/Makefile.am
index 5cca0cf33..9149f931e 100644
--- a/components/hardware/Makefile.am
+++ b/components/hardware/Makefile.am
@@ -7,6 +7,8 @@ INCLUDES =						\
 	-DG_LOG_DOMAIN=\"Nautilus-Hardware\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GCONF_CFLAGS)					\
 	$(VFS_CFLAGS)					\
 	$(BONOBO_CFLAGS)				\
@@ -35,6 +37,8 @@ nautilus_hardware_view_SOURCES =		        \
 nautilus_hardware_view_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS)					\
 	$(GNOMEUI_LIBS)					\
 	$(GCONF_LIBS) \
diff --git a/components/hardware/nautilus-hardware-view.c b/components/hardware/nautilus-hardware-view.c
index 9240be1d7..34e848fec 100644
--- a/components/hardware/nautilus-hardware-view.c
+++ b/components/hardware/nautilus-hardware-view.c
@@ -34,17 +34,17 @@
 #include <gnome.h>
 #include <gtk/gtksignal.h>
 #include <libgnorba/gnorba.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-directory-background.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-image.h>
+#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 #include <libnautilus/libnautilus.h>
 #include <limits.h>
 #include <sys/stat.h>
@@ -77,7 +77,7 @@ static void hardware_view_load_location_callback      (NautilusView
                                                        const char                *location,
                                                        NautilusHardwareView      *hardware_view);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusHardwareView, nautilus_hardware_view, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusHardwareView, nautilus_hardware_view, GTK_TYPE_EVENT_BOX)
 
 #define HARDWARE_DEFAULT_BACKGROUND_COLOR  "rgb:DDDD/DDDD/BBBB"
 
@@ -99,7 +99,7 @@ nautilus_hardware_view_initialize_class (NautilusHardwareViewClass *klass)
 static void
 nautilus_hardware_view_initialize (NautilusHardwareView *hardware_view)
 {
-  	NautilusBackground *background;
+  	EelBackground *background;
 	hardware_view->details = g_new0 (NautilusHardwareViewDetails, 1);
 
 	hardware_view->details->nautilus_view = nautilus_view_new (GTK_WIDGET (hardware_view));
@@ -111,13 +111,13 @@ nautilus_hardware_view_initialize (NautilusHardwareView *hardware_view)
 
 	hardware_view->details->form = NULL;
 
-  	background = nautilus_get_widget_background (GTK_WIDGET (hardware_view));
-  	nautilus_background_set_color (background, HARDWARE_DEFAULT_BACKGROUND_COLOR);
+  	background = eel_get_widget_background (GTK_WIDGET (hardware_view));
+  	eel_background_set_color (background, HARDWARE_DEFAULT_BACKGROUND_COLOR);
 
 	/* prepare ourselves to receive dropped objects */
 	gtk_drag_dest_set (GTK_WIDGET (hardware_view),
 			   GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, 
-			   hardware_dnd_target_table, NAUTILUS_N_ELEMENTS (hardware_dnd_target_table), GDK_ACTION_COPY);
+			   hardware_dnd_target_table, EEL_N_ELEMENTS (hardware_dnd_target_table), GDK_ACTION_COPY);
   		
 	gtk_widget_show_all (GTK_WIDGET (hardware_view));
 }
@@ -131,7 +131,7 @@ nautilus_hardware_view_destroy (GtkObject *object)
 
 	g_free (hardware_view->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* Component embedding support */
@@ -180,7 +180,7 @@ extract_info (char* data, const char *field_name, int nth)
 		if (info_array[index] == NULL) {
 			break;
                 }
-		if (nautilus_str_has_prefix(info_array[index], field_name)) {
+		if (eel_str_has_prefix(info_array[index], field_name)) {
 			if (nth > 0) {
                                 nth--;
 			} else {
@@ -358,15 +358,15 @@ setup_form_title (NautilusHardwareView *view,
 	if (image_name != NULL) {
  		file_name = gnome_pixmap_file (image_name);
 		if (file_name != NULL) {
-			temp_widget = nautilus_image_new (file_name);
+			temp_widget = eel_image_new (file_name);
 			gtk_box_pack_start (GTK_BOX(temp_container), temp_widget, 0, 0, 8);		
 			gtk_widget_show (temp_widget);
 			g_free (file_name);
 		}
 	}
 	
- 	temp_widget = nautilus_label_new (title_text);
-	nautilus_label_make_larger (NAUTILUS_LABEL (temp_widget), 10);
+ 	temp_widget = eel_label_new (title_text);
+	eel_label_make_larger (EEL_LABEL (temp_widget), 10);
 
 	gtk_box_pack_start (GTK_BOX (temp_container), temp_widget, 0, 0, 8);			 	
 	gtk_widget_show (temp_widget);
@@ -419,13 +419,13 @@ setup_overview_form (NautilusHardwareView *view)
 		gtk_widget_show (temp_box);
 
 		file_name = nautilus_pixmap_file ("cpu.png");
-                temp_widget = nautilus_image_new (file_name);
+                temp_widget = eel_image_new (file_name);
 		gtk_box_pack_start (GTK_BOX(temp_box), temp_widget, 0, 0, 0);		
 		gtk_widget_show (temp_widget);
 		g_free (file_name);
 		
-		temp_widget = nautilus_label_new (temp_text);
-		nautilus_label_make_larger (NAUTILUS_LABEL (temp_widget), 2);
+		temp_widget = eel_label_new (temp_text);
+		eel_label_make_larger (EEL_LABEL (temp_widget), 2);
 		g_free(temp_text);
 		gtk_box_pack_start(GTK_BOX(temp_box), temp_widget, 0, 0, 0 );			
 		gtk_widget_show (temp_widget);
@@ -439,14 +439,14 @@ setup_overview_form (NautilusHardwareView *view)
 	gtk_widget_show (temp_box);
 
  	file_name = nautilus_pixmap_file ("memory_chip.gif");
-  	temp_widget = nautilus_image_new (file_name);
+  	temp_widget = eel_image_new (file_name);
 	gtk_box_pack_start(GTK_BOX(temp_box), temp_widget, 0, 0, 0);		
   	gtk_widget_show(temp_widget);
   	g_free (file_name);
 	
 	temp_text = get_RAM_description ();
-	temp_widget = nautilus_label_new (temp_text);
-	nautilus_label_make_larger (NAUTILUS_LABEL (temp_widget), 2);
+	temp_widget = eel_label_new (temp_text);
+	eel_label_make_larger (EEL_LABEL (temp_widget), 2);
 	g_free (temp_text);
 	gtk_box_pack_start (GTK_BOX(temp_box), temp_widget, 0, 0, 0 );			
  	gtk_widget_show (temp_widget);
@@ -477,16 +477,16 @@ setup_overview_form (NautilusHardwareView *view)
                                         file_name = nautilus_pixmap_file("i-harddisk.png");
                                 }
                                 
-				pixmap_widget = nautilus_image_new (file_name);
+				pixmap_widget = eel_image_new (file_name);
 				gtk_box_pack_start (GTK_BOX(temp_box), pixmap_widget, 0, 0, 0);
 				gtk_widget_show(pixmap_widget);
 				g_free(file_name);
 				g_free(ide_media);
                                 
 				temp_text = get_IDE_description (device);
-				temp_widget = nautilus_label_new (temp_text);
-				nautilus_label_make_larger (NAUTILUS_LABEL (temp_widget), 2);
-				nautilus_label_set_justify (NAUTILUS_LABEL (temp_widget), GTK_JUSTIFY_CENTER);
+				temp_widget = eel_label_new (temp_text);
+				eel_label_make_larger (EEL_LABEL (temp_widget), 2);
+				eel_label_set_justify (EEL_LABEL (temp_widget), GTK_JUSTIFY_CENTER);
 
 				g_free(temp_text);
                                 gtk_box_pack_start(GTK_BOX(temp_box), temp_widget, 0, 0, 0);
@@ -518,9 +518,9 @@ setup_CPU_form (NautilusHardwareView *view)
 	setup_form_title (view, NULL, "CPU");
 	
 	message = _("This is a placeholder for the CPU page.");
-	temp_widget = nautilus_label_new (message);
-	nautilus_label_make_larger (NAUTILUS_LABEL (temp_widget), 2);
- 	nautilus_label_set_wrap(NAUTILUS_LABEL(temp_widget), TRUE);
+	temp_widget = eel_label_new (message);
+	eel_label_make_larger (EEL_LABEL (temp_widget), 2);
+ 	eel_label_set_wrap(EEL_LABEL(temp_widget), TRUE);
 	
 	gtk_box_pack_start(GTK_BOX(view->details->form), temp_widget, 0, 0, 12);			
  	gtk_widget_show (temp_widget);
@@ -543,9 +543,9 @@ setup_RAM_form (NautilusHardwareView *view)
 	setup_form_title (view, NULL, "RAM");
 	
 	message = _("This is a placeholder for the RAM page.");
-	temp_widget = nautilus_label_new (message);
-	nautilus_label_make_larger (NAUTILUS_LABEL (temp_widget), 2);
- 	nautilus_label_set_wrap(NAUTILUS_LABEL(temp_widget), TRUE);
+	temp_widget = eel_label_new (message);
+	eel_label_make_larger (EEL_LABEL (temp_widget), 2);
+ 	eel_label_set_wrap(EEL_LABEL(temp_widget), TRUE);
 	
 	gtk_box_pack_start(GTK_BOX(view->details->form), temp_widget, 0, 0, 12);			
  	gtk_widget_show (temp_widget);
@@ -568,9 +568,9 @@ setup_IDE_form (NautilusHardwareView *view)
         setup_form_title (view, NULL, "IDE");
         
         message = _("This is a placeholder for the IDE page.");
-        temp_widget = nautilus_label_new (message);
-	nautilus_label_make_larger (NAUTILUS_LABEL (temp_widget), 2);
-        nautilus_label_set_wrap(NAUTILUS_LABEL(temp_widget), TRUE);
+        temp_widget = eel_label_new (message);
+	eel_label_make_larger (EEL_LABEL (temp_widget), 2);
+        eel_label_set_wrap(EEL_LABEL(temp_widget), TRUE);
         
         gtk_box_pack_start(GTK_BOX(view->details->form), temp_widget, 0, 0, 12);            
         gtk_widget_show (temp_widget);
@@ -645,7 +645,7 @@ nautilus_hardware_view_drag_data_received (GtkWidget *widget, GdkDragContext *co
 	switch (info) {
         case TARGET_COLOR:
                 /* Let the background change based on the dropped color. */
-                nautilus_background_receive_dropped_color (nautilus_get_widget_background (widget),
+                eel_background_receive_dropped_color (eel_get_widget_background (widget),
                                                            widget, x, y, selection_data);
                 break;
                 
diff --git a/components/help/Makefile.am b/components/help/Makefile.am
index 1daf87c6f..dee27442f 100644
--- a/components/help/Makefile.am
+++ b/components/help/Makefile.am
@@ -9,6 +9,8 @@ noinst_PROGRAMS=test-help-method
 INCLUDES = \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS) \
 	$(BONOBO_CFLAGS) \
 	$(GCONF_CFLAGS) \
@@ -19,11 +21,12 @@ INCLUDES = \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
 	-DINFODIR=\"$(infodir)\" \
 	-DENABLE_SCROLLKEEPER_SUPPORT
-	
 
 LDADD =\
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS) \
 	$(GCONF_LIBS) \
 	$(GNOMEUI_LIBS) \
diff --git a/components/help/help-method.c b/components/help/help-method.c
index c7f59ff70..9aa9faf3c 100644
--- a/components/help/help-method.c
+++ b/components/help/help-method.c
@@ -57,7 +57,7 @@ typedef struct {
 
 static gboolean file_in_info_path (const char *file);
 
-/* This is a copy of nautilus_shell_quote. The best thing to do is to
+/* This is a copy of eel_shell_quote. The best thing to do is to
  * use the one on GNOME for GNOME 2.0, but we could also move this
  * into gnome-vfs or some other library so we could share it.
  */
diff --git a/components/help/hyperbola-filefmt.c b/components/help/hyperbola-filefmt.c
index d29a1a7a8..bc034aaf9 100644
--- a/components/help/hyperbola-filefmt.c
+++ b/components/help/hyperbola-filefmt.c
@@ -25,7 +25,7 @@
 
 #include "hyperbola-filefmt.h"
 
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 
 #include <zlib.h>
 #include <dirent.h>
@@ -895,7 +895,7 @@ fmt_help_populate_tree (HyperbolaDocTree * tree)
 		fmt_help_populate_tree_from_subdir (tree, node->data, app_path);
 	}
 
-	nautilus_g_list_free_deep (help_directories);
+	eel_g_list_free_deep (help_directories);
 }
 #endif
 
diff --git a/components/help/hyperbola-nav-tree.c b/components/help/hyperbola-nav-tree.c
index ad5dbf01d..0fcc8fa80 100644
--- a/components/help/hyperbola-nav-tree.c
+++ b/components/help/hyperbola-nav-tree.c
@@ -6,7 +6,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <libnautilus-extensions/nautilus-ctree.h>
 #include <libnautilus-extensions/nautilus-theme.h>
-#include <libnautilus-extensions/nautilus-gdk-font-extensions.h>
+#include <eel/eel-gdk-font-extensions.h>
 
 #include "hyperbola-nav.h"
 
diff --git a/components/history/Makefile.am b/components/history/Makefile.am
index 6f9f061b8..da21e5c3a 100644
--- a/components/history/Makefile.am
+++ b/components/history/Makefile.am
@@ -6,6 +6,8 @@ INCLUDES=\
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS) \
 	$(GCONF_CFLAGS) \
 	$(BONOBO_CFLAGS) \
@@ -15,6 +17,8 @@ INCLUDES=\
 LDADD=\
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS) \
 	$(GCONF_LIBS) \
 	$(GNOMEUI_LIBS)
diff --git a/components/history/nautilus-history-view.c b/components/history/nautilus-history-view.c
index 8c04b96d1..3e1855dc1 100644
--- a/components/history/nautilus-history-view.c
+++ b/components/history/nautilus-history-view.c
@@ -33,8 +33,8 @@
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include <libnautilus-extensions/nautilus-bookmark.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus/nautilus-view-standard-main.h>
 
 #define NAUTILUS_TYPE_HISTORY_VIEW            (nautilus_history_view_get_type ())
@@ -64,7 +64,7 @@ static void    nautilus_history_view_initialize_class (NautilusHistoryViewClass
 static void    nautilus_history_view_initialize       (NautilusHistoryView      *view);
 static void    nautilus_history_view_destroy          (GtkObject                *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusHistoryView,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusHistoryView,
 				   nautilus_history_view,
 				   NAUTILUS_TYPE_VIEW)
 
@@ -89,7 +89,7 @@ install_icon (GtkCList *list, int row, GdkPixbuf *pixbuf)
 
 	if (pixbuf != NULL) {
 		gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, 
-						   NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
+						   EEL_STANDARD_ALPHA_THRESHHOLD);
 	} else {
 		bookmark = get_bookmark_from_row (list, row);
 		if (!nautilus_bookmark_get_pixmap_and_mask (bookmark, NAUTILUS_ICON_SIZE_SMALLER,
@@ -325,7 +325,7 @@ nautilus_history_view_destroy (GtkObject *object)
 
 	gtk_object_unref (GTK_OBJECT (view->list));
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 int
diff --git a/components/image-viewer/Makefile.am b/components/image-viewer/Makefile.am
index 2f341c703..3316cc668 100644
--- a/components/image-viewer/Makefile.am
+++ b/components/image-viewer/Makefile.am
@@ -16,6 +16,8 @@ INCLUDES =	\
 	-I$(top_builddir)	\
 	-I$(top_builddir)/libnautilus	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS)	\
 	$(GCONF_CFLAGS)		\
 	$(BONOBO_CFLAGS)	\
@@ -24,6 +26,8 @@ INCLUDES =	\
 nautilus_image_view_LDADD = 			\
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS) \
 	$(GCONF_LIBS) \
 	$(GNOMEUI_LIBS)
diff --git a/components/loser/content/Makefile.am b/components/loser/content/Makefile.am
index d705fea6d..9908ab459 100644
--- a/components/loser/content/Makefile.am
+++ b/components/loser/content/Makefile.am
@@ -7,6 +7,8 @@ INCLUDES =					\
 	-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \
 	-I$(top_srcdir)				\
 	-I$(top_builddir)			\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(OAF_CFLAGS)				\
 	$(BONOBO_CFLAGS)			\
 	$(GCONF_CFLAGS) 			\
@@ -27,6 +29,8 @@ nautilus_content_loser_SOURCES =		\
 nautilus_content_loser_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(GNOMEUI_LIBS)					\
 	$(BONOBO_LIBS)					\
 	$(GCONF_LIBS) \
diff --git a/components/loser/content/nautilus-content-loser.c b/components/loser/content/nautilus-content-loser.c
index 21f0c6c8c..9d22e1eb0 100644
--- a/components/loser/content/nautilus-content-loser.c
+++ b/components/loser/content/nautilus-content-loser.c
@@ -34,7 +34,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-stock.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -47,7 +47,7 @@ static void nautilus_content_loser_initialize_class (NautilusContentLoserClass *
 static void nautilus_content_loser_initialize       (NautilusContentLoser      *view);
 static void nautilus_content_loser_destroy          (GtkObject                 *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusContentLoser, nautilus_content_loser, GTK_TYPE_LABEL)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusContentLoser, nautilus_content_loser, GTK_TYPE_LABEL)
      
 static void loser_load_location_callback      (NautilusView         *nautilus_view,
 					       const char           *location,
@@ -104,7 +104,7 @@ nautilus_content_loser_destroy (GtkObject *object)
 	g_free (view->details->uri);
 	g_free (view->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /**
diff --git a/components/loser/sidebar/Makefile.am b/components/loser/sidebar/Makefile.am
index 3e207259a..6b9b3660d 100644
--- a/components/loser/sidebar/Makefile.am
+++ b/components/loser/sidebar/Makefile.am
@@ -7,6 +7,8 @@ INCLUDES =					\
 	-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \
 	-I$(top_srcdir)				\
 	-I$(top_builddir)			\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GCONF_CFLAGS) 			\
 	$(OAF_CFLAGS)				\
 	$(BONOBO_CFLAGS)			\
@@ -26,6 +28,8 @@ nautilus_sidebar_loser_SOURCES =		\
 nautilus_sidebar_loser_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(GNOMEUI_LIBS)					\
 	$(BONOBO_LIBS)					\
 	$(GCONF_LIBS) \
diff --git a/components/loser/sidebar/nautilus-sidebar-loser.c b/components/loser/sidebar/nautilus-sidebar-loser.c
index 50f30e332..a10d6ca21 100644
--- a/components/loser/sidebar/nautilus-sidebar-loser.c
+++ b/components/loser/sidebar/nautilus-sidebar-loser.c
@@ -34,7 +34,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-stock.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -49,7 +49,7 @@ static void nautilus_sidebar_loser_initialize_class (NautilusSidebarLoserClass *
 static void nautilus_sidebar_loser_initialize       (NautilusSidebarLoser      *view);
 static void nautilus_sidebar_loser_destroy          (GtkObject                      *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSidebarLoser, nautilus_sidebar_loser, GTK_TYPE_LABEL)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusSidebarLoser, nautilus_sidebar_loser, GTK_TYPE_LABEL)
      
 static void loser_load_location_callback      (NautilusView         *nautilus_view,
 					       const char           *location,
@@ -107,7 +107,7 @@ nautilus_sidebar_loser_destroy (GtkObject *object)
 	g_free (view->details->uri);
 	g_free (view->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /**
diff --git a/components/mozilla/Makefile.am b/components/mozilla/Makefile.am
index 7ac1fe6cd..bd6332473 100644
--- a/components/mozilla/Makefile.am
+++ b/components/mozilla/Makefile.am
@@ -9,6 +9,8 @@ INCLUDES = \
 	$(MOZILLA_PROFILES_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(BONOBO_CFLAGS) \
 	$(GCONF_CFLAGS) \
 	$(GNOMEUI_CFLAGS) \
@@ -45,6 +47,8 @@ noinst_HEADERS =\
 nautilus_mozilla_content_view_LDADD = \
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS) \
 	$(GCONF_LIBS) \
 	$(GNOMEUI_LIBS) \
diff --git a/components/mozilla/bonobo-extensions.c b/components/mozilla/bonobo-extensions.c
index 47810bd91..7d4622af0 100644
--- a/components/mozilla/bonobo-extensions.c
+++ b/components/mozilla/bonobo-extensions.c
@@ -395,7 +395,7 @@ nautilus_bonobo_remove_menu_items_and_commands (BonoboUIComponent *ui,
 }
 
 static char *
-nautilus_str_strip_chr (const char *source, char remove_this)
+eel_str_strip_chr (const char *source, char remove_this)
 {
 	char *result, *out;
 	const char *in;
@@ -429,7 +429,7 @@ nautilus_bonobo_set_label_for_menu_item_and_command (BonoboUIComponent *ui,
 {
 	char *label_no_underscore;
 
-	label_no_underscore = nautilus_str_strip_chr (label_with_underscore, '_');
+	label_no_underscore = eel_str_strip_chr (label_with_underscore, '_');
 	nautilus_bonobo_set_label (ui,
 				   menu_item_path,
 				   label_with_underscore);
diff --git a/components/mozilla/nautilus-mozilla-content-view.c b/components/mozilla/nautilus-mozilla-content-view.c
index 88b1ac3e1..53fe42be6 100644
--- a/components/mozilla/nautilus-mozilla-content-view.c
+++ b/components/mozilla/nautilus-mozilla-content-view.c
@@ -60,7 +60,7 @@
 #include <libgnomeui/gnome-dialog.h>
 #include <libgnomeui/gnome-dialog-util.h>
 
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
+#include <eel/eel-stock-dialogs.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 
 #ifdef EAZEL_SERVICES
@@ -806,7 +806,7 @@ mozilla_new_window_callback (GtkMozEmbed *mozilla)
 	g_warning ("Nautilus does not support JavaScript spawning of new windows!\n");
 #endif
 
-	dialog = nautilus_show_warning_dialog (_("A JavaScript function (small software program) on this page tried to open a new window, but nautilus does not support the opening of new windows by JavaScript.\n\nTry viewing the page in a different web browser, such as Mozilla or Netscape."),
+	dialog = eel_show_warning_dialog (_("A JavaScript function (small software program) on this page tried to open a new window, but nautilus does not support the opening of new windows by JavaScript.\n\nTry viewing the page in a different web browser, such as Mozilla or Netscape."),
 					     _("Nautilus Mozilla View Warning"),
 					     mozilla_get_containing_window (mozilla));
 
diff --git a/components/music/Makefile.am b/components/music/Makefile.am
index 292c5d815..8c7825083 100644
--- a/components/music/Makefile.am
+++ b/components/music/Makefile.am
@@ -15,6 +15,8 @@ INCLUDES =					\
 	-DG_LOG_DOMAIN=\"Nautilus-Music\"	\
 	-I$(top_srcdir)				\
 	-I$(top_builddir)			\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GCONF_CFLAGS) 			\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
 	$(GNOMEUI_CFLAGS)                       \
@@ -64,6 +66,8 @@ nautilus_music_view_SOURCES =		        \
 nautilus_music_view_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS)					\
 	$(GNOMEUI_LIBS)					\
 	$(GCONF_LIBS) \
diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c
index c3c354513..67cf39fd2 100644
--- a/components/music/nautilus-music-view.c
+++ b/components/music/nautilus-music-view.c
@@ -31,24 +31,24 @@
 #include "mpg123.h"
 #include "pixmaps.h"
 
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-directory-background.h>
 #include <libnautilus-extensions/nautilus-directory-notify.h>
 #include <libnautilus-extensions/nautilus-file-attributes.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-image.h>
+#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-sound.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-string.h>
 #include <libnautilus/libnautilus.h>
 
 #include <gnome.h>
@@ -177,7 +177,7 @@ static void nautilus_music_view_initialize_class              (NautilusMusicView
 static void nautilus_music_view_initialize                    (NautilusMusicView      *view);
 static void nautilus_music_view_destroy                       (GtkObject              *object);
 static void nautilus_music_view_update                        (NautilusMusicView      *music_view);
-static void music_view_background_appearance_changed_callback (NautilusBackground     *background,
+static void music_view_background_appearance_changed_callback (EelBackground     *background,
                                                                NautilusMusicView      *music_view);
 static void music_view_load_location_callback                 (NautilusView           *view,
                                                                const char             *location,
@@ -213,7 +213,7 @@ static void nautilus_music_view_load_uri (NautilusMusicView *view,
 
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusMusicView,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusMusicView,
                                    nautilus_music_view,
                                    NAUTILUS_TYPE_VIEW)
 
@@ -256,7 +256,7 @@ nautilus_music_view_initialize (NautilusMusicView *music_view)
 			    music_view_load_location_callback, 
 			    music_view);
 			    
-	gtk_signal_connect (GTK_OBJECT (nautilus_get_widget_background (GTK_WIDGET (music_view->details->event_box))), 
+	gtk_signal_connect (GTK_OBJECT (eel_get_widget_background (GTK_WIDGET (music_view->details->event_box))), 
 			    "appearance_changed",
 			    music_view_background_appearance_changed_callback, 
 			    music_view);
@@ -270,13 +270,13 @@ nautilus_music_view_initialize (NautilusMusicView *music_view)
 	gtk_container_add (GTK_CONTAINER (music_view->details->event_box), GTK_WIDGET (music_view->details->album_container));
 		
 	/* allocate a widget for the album title */	
-	music_view->details->album_title = nautilus_label_new ("");
-	nautilus_label_make_larger (NAUTILUS_LABEL (music_view->details->album_title), 8);
+	music_view->details->album_title = eel_label_new ("");
+	eel_label_make_larger (EEL_LABEL (music_view->details->album_title), 8);
 
 	gtk_box_pack_start (GTK_BOX (music_view->details->album_container), music_view->details->album_title, FALSE, FALSE, 0);	
 	
         /* Localize the titles */
-        for (i = 0; i < NAUTILUS_N_ELEMENTS (titles); i++) {
+        for (i = 0; i < EEL_N_ELEMENTS (titles); i++) {
 		titles[i] = _(titles[i]);
 	}
 
@@ -355,7 +355,7 @@ nautilus_music_view_initialize (NautilusMusicView *music_view)
 	/* prepare ourselves to receive dropped objects */
 	gtk_drag_dest_set (GTK_WIDGET (music_view->details->event_box),
 			   GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, 
-			   music_dnd_target_table, NAUTILUS_N_ELEMENTS (music_dnd_target_table), GDK_ACTION_COPY);
+			   music_dnd_target_table, EEL_N_ELEMENTS (music_dnd_target_table), GDK_ACTION_COPY);
 
 
 	music_view->details->player_state = PLAYER_STOPPED;
@@ -384,7 +384,7 @@ nautilus_music_view_destroy (GtkObject *object)
         detach_file (music_view);
 	g_free (music_view->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* utility to return the text describing a song */
@@ -435,7 +435,7 @@ music_view_set_selected_song_title (NautilusMusicView *music_view, int row)
 	music_view->details->selected_index = row;
 	
 	label_text = get_song_text (music_view, row);
-	nautilus_label_set_text (NAUTILUS_LABEL(music_view->details->song_label), label_text);
+	eel_label_set_text (EEL_LABEL(music_view->details->song_label), label_text);
 	g_free (label_text);
         
 	gtk_clist_get_text (GTK_CLIST(music_view->details->song_list), row, 5, &temp_str);
@@ -522,7 +522,7 @@ compare_song_titles (GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
 		return 0;
 	}
 
-	return nautilus_strcoll (info1->title, info2->title);
+	return eel_strcoll (info1->title, info2->title);
 }
 
 static int
@@ -541,7 +541,7 @@ compare_song_artists (GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
 		return 0;
 	}
 
-	return nautilus_strcoll (info1->artist, info2->artist);
+	return eel_strcoll (info1->artist, info2->artist);
 }
 
 static int
@@ -579,7 +579,7 @@ compare_song_years (GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
 		return 0;
 	}
 
-	return nautilus_strcoll (info1->year, info2->year);	
+	return eel_strcoll (info1->year, info2->year);	
 }
 
 static int
@@ -670,7 +670,7 @@ ensure_uri_is_image(const char *uri)
 		(uri, file_info,
 		 GNOME_VFS_FILE_INFO_GET_MIME_TYPE
 		 | GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
-        is_image = nautilus_istr_has_prefix (file_info->mime_type, "image/") && (nautilus_strcmp (file_info->mime_type, "image/svg") != 0);
+        is_image = eel_istr_has_prefix (file_info->mime_type, "image/") && (eel_strcmp (file_info->mime_type, "image/svg") != 0);
 	gnome_vfs_file_info_unref (file_info);
 	return is_image;
 }
@@ -693,7 +693,7 @@ set_album_cover (GtkWidget *widget, gpointer *data)
 		char *message = g_strdup_printf
 			(_("Sorry, but '%s' is not a usable image file."),
 			 path_name);
-		nautilus_show_error_dialog (message, _("Not an Image"), NULL);
+		eel_show_error_dialog (message, _("Not an Image"), NULL);
 		g_free (message);
 		
 		g_free (path_uri);
@@ -791,8 +791,8 @@ release_song_info (SongInfo *info)
 static gboolean
 is_mp3_file (GnomeVFSFileInfo *file_info)
 {
-	return nautilus_istr_has_prefix (file_info->mime_type, "audio/")
-		&& nautilus_istr_has_suffix (file_info->mime_type, "mp3");
+	return eel_istr_has_prefix (file_info->mime_type, "audio/")
+		&& eel_istr_has_suffix (file_info->mime_type, "mp3");
 }
 
 /* read the id3 tag of the file if present */
@@ -990,7 +990,7 @@ determine_attribute (GList *song_list, gboolean is_artist)
 		info = (SongInfo *) p->data;
 		this_attribute = is_artist ? info->artist : info->album;
 		
-		if (this_attribute && nautilus_strcmp (this_attribute, current_attribute)) {
+		if (this_attribute && eel_strcmp (this_attribute, current_attribute)) {
 			if (current_attribute == NULL) {
 				current_attribute = g_strdup (this_attribute);
 			} else {
@@ -1032,7 +1032,7 @@ reset_playtime (NautilusMusicView *music_view)
  	gtk_range_set_adjustment (GTK_RANGE (music_view->details->playtime_bar),
                                   GTK_ADJUSTMENT (music_view->details->playtime_adjustment));	
 	gtk_widget_set_sensitive (music_view->details->playtime_bar, FALSE);	
-	nautilus_label_set_text  (NAUTILUS_LABEL (music_view->details->playtime), "--:--");
+	eel_label_set_text  (EEL_LABEL (music_view->details->playtime), "--:--");
 }
 
 /* status display timer task */
@@ -1079,7 +1079,7 @@ play_status_display (NautilusMusicView *music_view)
                                 			  GTK_ADJUSTMENT(music_view->details->playtime_adjustment));	
 
 				if (!music_view->details->slider_dragging) {
-		 			nautilus_label_set_text (NAUTILUS_LABEL(music_view->details->playtime),
+		 			eel_label_set_text (EEL_LABEL(music_view->details->playtime),
                                                                  play_time_str);	
                         	}                             
 			}
@@ -1171,7 +1171,7 @@ play_current_file (NautilusMusicView *music_view, gboolean from_start)
 	int length;
 
 	if (esdout_playing ()) {
-		nautilus_show_error_dialog (_("Sorry, but the music view is unable to play back sound right now. "
+		eel_show_error_dialog (_("Sorry, but the music view is unable to play back sound right now. "
 					      "Either another program is using or blocking the sound card, "
 					      "or your sound card is not configured properly. Try quitting any "
 					      "applications that may be blocking use of the sound card."),
@@ -1195,7 +1195,7 @@ play_current_file (NautilusMusicView *music_view, gboolean from_start)
 
 	/* for now, we can only play local files, so apologize to the user and give up */	
 	if (song_filename == NULL) {
-                nautilus_show_error_dialog
+                eel_show_error_dialog
                         ( _("Sorry, but the music view can't play non-local files yet."),
                           _("Can't Play Remote Files"),
                           NULL);
@@ -1346,7 +1346,7 @@ slider_moved_callback (GtkWidget *bar, GdkEvent *event, NautilusMusicView *music
 		seconds = seconds % 60;
 		sprintf(temp_str, "%02d:%02d", minutes, seconds);
 
-		nautilus_label_set_text (NAUTILUS_LABEL(music_view->details->playtime), temp_str);
+		eel_label_set_text (EEL_LABEL(music_view->details->playtime), temp_str);
 	}
         return FALSE;
 }
@@ -1492,9 +1492,9 @@ add_play_controls (NautilusMusicView *music_view)
 	gtk_widget_show (music_view->details->playtime_bar);
 
 	/* playtime label */
-	music_view->details->playtime = nautilus_label_new ("--:--");
-	nautilus_label_make_larger (NAUTILUS_LABEL (music_view->details->playtime), 2);
-	nautilus_label_set_justify (NAUTILUS_LABEL (music_view->details->playtime), GTK_JUSTIFY_LEFT);	
+	music_view->details->playtime = eel_label_new ("--:--");
+	eel_label_make_larger (EEL_LABEL (music_view->details->playtime), 2);
+	eel_label_set_justify (EEL_LABEL (music_view->details->playtime), GTK_JUSTIFY_LEFT);	
 	gtk_misc_set_alignment (GTK_MISC (music_view->details->playtime), 0.0, 0.0);
 	gtk_widget_show (music_view->details->playtime);
 	gtk_box_pack_start (GTK_BOX (hbox), music_view->details->playtime, FALSE, FALSE, 0);
@@ -1576,9 +1576,9 @@ add_play_controls (NautilusMusicView *music_view)
 	gtk_widget_show (button);
 
 	/* Song title label */
-	music_view->details->song_label = nautilus_label_new ("");
-	nautilus_label_make_larger (NAUTILUS_LABEL (music_view->details->song_label), 2);
-	nautilus_label_set_justify (NAUTILUS_LABEL (music_view->details->song_label), GTK_JUSTIFY_LEFT);
+	music_view->details->song_label = eel_label_new ("");
+	eel_label_make_larger (EEL_LABEL (music_view->details->song_label), 2);
+	eel_label_set_justify (EEL_LABEL (music_view->details->song_label), GTK_JUSTIFY_LEFT);
 	gtk_box_pack_end (GTK_BOX (vbox), music_view->details->song_label, FALSE, FALSE, 2);	
 	gtk_widget_show (music_view->details->song_label);	
 }
@@ -1598,10 +1598,10 @@ nautilus_music_view_set_album_image (NautilusMusicView *music_view, const char *
   		pixbuf = gdk_pixbuf_new_from_file (image_path);
 		
 		if (pixbuf != NULL) {
-			scaled_pixbuf = nautilus_gdk_pixbuf_scale_down_to_fit (pixbuf, SCALED_IMAGE_WIDTH, SCALED_IMAGE_HEIGHT);
+			scaled_pixbuf = eel_gdk_pixbuf_scale_down_to_fit (pixbuf, SCALED_IMAGE_WIDTH, SCALED_IMAGE_HEIGHT);
 			gdk_pixbuf_unref (pixbuf);
 
-       			gdk_pixbuf_render_pixmap_and_mask (scaled_pixbuf, &pixmap, &mask, NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
+       			gdk_pixbuf_render_pixmap_and_mask (scaled_pixbuf, &pixmap, &mask, EEL_STANDARD_ALPHA_THRESHHOLD);
 			gdk_pixbuf_unref (scaled_pixbuf);
 			
 			if (music_view->details->album_image == NULL) {
@@ -1677,7 +1677,7 @@ nautilus_music_view_update (NautilusMusicView *music_view)
 	if (result != GNOME_VFS_OK) {
 		path = gnome_vfs_get_local_path_from_uri (uri);
 		message = g_strdup_printf (_("Sorry, but there was an error reading %s."), path);
-		nautilus_show_error_dialog (message, _("Can't Read Folder"), 
+		eel_show_error_dialog (message, _("Can't Read Folder"), 
 				            GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (music_view->details->event_box))));
 		g_free (path);
 		g_free (message);
@@ -1706,7 +1706,7 @@ nautilus_music_view_update (NautilusMusicView *music_view)
 		} else {
 		        /* it's not an mp3 file, so see if it's an image */
         		const char *mime_type = gnome_vfs_file_info_get_mime_type (current_file_info);		        	
-		        if (nautilus_istr_has_prefix (mime_type, "image/")) {
+		        if (eel_istr_has_prefix (mime_type, "image/")) {
 		        	/* for now, just keep the first image */
 		        	if (image_path_uri == NULL) {
 		        		image_path_uri = g_strdup (path_uri);
@@ -1794,7 +1794,7 @@ nautilus_music_view_update (NautilusMusicView *music_view)
 		} else {
 			temp_str = g_strdup (album_name);
                 }
-		nautilus_label_set_text (NAUTILUS_LABEL (music_view->details->album_title), temp_str);
+		eel_label_set_text (EEL_LABEL (music_view->details->album_title), temp_str);
 		
 		g_free (temp_str);
 		g_free (album_name);
@@ -1843,22 +1843,22 @@ nautilus_music_view_load_uri (NautilusMusicView *music_view, const char *uri)
 }
 
 static void
-music_view_background_appearance_changed_callback (NautilusBackground *background, NautilusMusicView *music_view)
+music_view_background_appearance_changed_callback (EelBackground *background, NautilusMusicView *music_view)
 {
 	guint32 text_color;
 
-	text_color = nautilus_background_is_dark (background) ? NAUTILUS_RGBA_COLOR_OPAQUE_WHITE : NAUTILUS_RGBA_COLOR_OPAQUE_BLACK;
+	text_color = eel_background_is_dark (background) ? EEL_RGBA_COLOR_OPAQUE_WHITE : EEL_RGBA_COLOR_OPAQUE_BLACK;
 
 	if (music_view->details->album_title != NULL) {
-		nautilus_label_set_text_color (NAUTILUS_LABEL (music_view->details->album_title),
+		eel_label_set_text_color (EEL_LABEL (music_view->details->album_title),
                                                text_color);
 	}
 	if (music_view->details->song_label != NULL) {
-		nautilus_label_set_text_color (NAUTILUS_LABEL (music_view->details->song_label),
+		eel_label_set_text_color (EEL_LABEL (music_view->details->song_label),
                                                text_color);
 	}
 	if (music_view->details->playtime != NULL) {
-		nautilus_label_set_text_color (NAUTILUS_LABEL (music_view->details->playtime),
+		eel_label_set_text_color (EEL_LABEL (music_view->details->playtime),
                                                text_color);
 	}
 }
@@ -1897,14 +1897,14 @@ nautilus_music_view_drag_data_received (GtkWidget *widget, GdkDragContext *conte
   		
         case TARGET_COLOR:
                 /* Let the background change based on the dropped color. */
-                nautilus_background_receive_dropped_color
-                        (nautilus_get_widget_background (widget),
+                eel_background_receive_dropped_color
+                        (eel_get_widget_background (widget),
                          widget, x, y, selection_data);
                 break;
   
   	case TARGET_BGIMAGE:
-		nautilus_background_receive_dropped_background_image
-			(nautilus_get_widget_background (widget),
+		eel_background_receive_dropped_background_image
+			(eel_get_widget_background (widget),
                          uris[0]);
   		break;              
 
diff --git a/components/notes/Makefile.am b/components/notes/Makefile.am
index 8c4bb0009..1e9a7ef21 100644
--- a/components/notes/Makefile.am
+++ b/components/notes/Makefile.am
@@ -7,6 +7,8 @@ INCLUDES=\
 	-I$(top_builddir)	\
 	-I$(top_builddir)/libnautilus	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS)	\
 	$(GCONF_CFLAGS)		\
 	$(BONOBO_CFLAGS)	\
@@ -15,6 +17,8 @@ INCLUDES=\
 LDADD=\
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS) \
 	$(GCONF_LIBS) \
 	$(GNOMEUI_LIBS)
diff --git a/components/notes/nautilus-notes.c b/components/notes/nautilus-notes.c
index 30de4e97c..beeb376d0 100644
--- a/components/notes/nautilus-notes.c
+++ b/components/notes/nautilus-notes.c
@@ -32,14 +32,14 @@
 #include <ctype.h>
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-debug.h>
+#include <eel/eel-background.h>
+#include <eel/eel-debug.h>
 #include <libnautilus-extensions/nautilus-file.h>
 #include <libnautilus-extensions/nautilus-file-attributes.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-font-factory.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-string.h>
 
 /* FIXME bugzilla.eazel.com 4436: 
  * Undo not working in notes-view.
@@ -164,7 +164,7 @@ load_note_text_from_metadata (NautilusFile *file,
 	/* This fn is called for any change signal on the file, so make sure that the
 	 * metadata has actually changed.
 	 */
-        if (nautilus_strcmp (saved_text, notes->previous_saved_text) != 0) {
+        if (eel_strcmp (saved_text, notes->previous_saved_text) != 0) {
 		notify_listeners_if_changed (notes, saved_text);
 		
 		g_free (notes->previous_saved_text);
@@ -240,7 +240,7 @@ notify_listeners_if_changed (Notes *notes, char *new_notes)
 	char *tab_image;
 	BonoboArg *tab_image_arg;
 
-	if (nautilus_strcmp (notes->previous_saved_text, new_notes) != 0) {
+	if (eel_strcmp (notes->previous_saved_text, new_notes) != 0) {
 		/* notify listeners that the notes text has changed */	
 		tab_image = notes_get_indicator_image (new_notes);	
 		
@@ -365,7 +365,7 @@ make_notes_view (BonoboGenericFactory *Factory, const char *iid, gpointer closur
 {
         GtkWidget *vbox;
         Notes *notes;
-        NautilusBackground *background;
+        EelBackground *background;
         GdkFont *font;
          
         g_return_val_if_fail (strcmp (iid, "OAFIID:nautilus_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185") == 0, NULL);
@@ -380,13 +380,13 @@ make_notes_view (BonoboGenericFactory *Factory, const char *iid, gpointer closur
         notes->note_text_field = gtk_text_new (NULL, NULL);
         
         font = nautilus_font_factory_get_font_from_preferences (14);
-        nautilus_gtk_widget_set_font (notes->note_text_field, font);
+        eel_gtk_widget_set_font (notes->note_text_field, font);
         gdk_font_unref (font);
 
         gtk_text_set_editable (GTK_TEXT (notes->note_text_field), TRUE);	
         gtk_box_pack_start (GTK_BOX (vbox), notes->note_text_field, TRUE, TRUE, 0);
-        background = nautilus_get_widget_background (notes->note_text_field);
-        nautilus_background_set_color (background, NOTES_DEFAULT_BACKGROUND_COLOR);
+        background = eel_get_widget_background (notes->note_text_field);
+        eel_background_set_color (background, NOTES_DEFAULT_BACKGROUND_COLOR);
 
 	gtk_signal_connect (GTK_OBJECT (notes->note_text_field), "focus_out_event",
       	              	    GTK_SIGNAL_FUNC (on_text_field_focus_out_event),
@@ -441,7 +441,7 @@ main(int argc, char *argv[])
 	 * Unfortunately, this has to be done explicitly for each domain.
 	 */
 	if (g_getenv("NAUTILUS_DEBUG") != NULL) {
-		nautilus_make_warnings_and_criticals_stop_in_debugger
+		eel_make_warnings_and_criticals_stop_in_debugger
 			(G_LOG_DOMAIN, g_log_domain_glib, "Gdk", "Gtk", "GnomeVFS", "GnomeUI", "Bonobo", NULL);
 	}
 	
diff --git a/components/rpmview/Makefile.am b/components/rpmview/Makefile.am
index c17c7cd1d..16c3a4671 100644
--- a/components/rpmview/Makefile.am
+++ b/components/rpmview/Makefile.am
@@ -18,6 +18,8 @@ INCLUDES = 							\
 	-I$(top_builddir)/components/services/trilobite 	\
 	-I$(top_builddir) 					\
 	-I/usr/include/rpm 					\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GCONF_CFLAGS) 					\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
 	$(GNOMEUI_CFLAGS) 					\
@@ -51,6 +53,8 @@ nautilus_rpm_view_SOURCES =		        \
 nautilus_rpm_view_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(INVENTORY_LIBS)			\
 	$(extra_libs)				\
 	$(BONOBO_LIBS) 				\
diff --git a/components/rpmview/nautilus-rpm-verify-window.c b/components/rpmview/nautilus-rpm-verify-window.c
index af0e3313d..5c3d59654 100644
--- a/components/rpmview/nautilus-rpm-verify-window.c
+++ b/components/rpmview/nautilus-rpm-verify-window.c
@@ -37,11 +37,11 @@
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-pixmap.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-theme.h>
 
@@ -67,7 +67,7 @@ static void     nautilus_rpm_verify_window_initialize_class	(NautilusRPMVerifyWi
 static void     nautilus_rpm_verify_window_initialize		(NautilusRPMVerifyWindow *rpm_verify_window);
 static void	nautilus_rpm_verify_window_destroy		(GtkObject *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusRPMVerifyWindow, nautilus_rpm_verify_window, GNOME_TYPE_DIALOG)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusRPMVerifyWindow, nautilus_rpm_verify_window, GNOME_TYPE_DIALOG)
 
 static void
 nautilus_rpm_verify_window_initialize_class (NautilusRPMVerifyWindowClass *rpm_verify_window_class)
@@ -97,7 +97,7 @@ nautilus_rpm_verify_window_destroy (GtkObject *object)
 		
 	g_free (NAUTILUS_RPM_VERIFY_WINDOW (object)->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* handle the continue button  */
@@ -133,17 +133,17 @@ nautilus_rpm_verify_window_initialize (NautilusRPMVerifyWindow *rpm_verify_windo
 	gtk_widget_show (window_contents);
 	
 	/* allocate the package title label */
-        label = nautilus_label_new ("");
+        label = eel_label_new ("");
 	gtk_widget_show (label);
-	nautilus_label_make_larger (NAUTILUS_LABEL (label), 2);
-	nautilus_label_set_justify (NAUTILUS_LABEL(label), GTK_JUSTIFY_CENTER);
+	eel_label_make_larger (EEL_LABEL (label), 2);
+	eel_label_set_justify (EEL_LABEL(label), GTK_JUSTIFY_CENTER);
 	gtk_box_pack_start (GTK_BOX (window_contents), label, FALSE, FALSE, 8);
 	rpm_verify_window->details->package_name = label;
 	
 	/* allocate the message label */
-        label = nautilus_label_new ("");
+        label = eel_label_new ("");
 	gtk_widget_show (label);
-	nautilus_label_set_justify (NAUTILUS_LABEL(label), GTK_JUSTIFY_CENTER);
+	eel_label_set_justify (EEL_LABEL(label), GTK_JUSTIFY_CENTER);
 	gtk_box_pack_start (GTK_BOX (window_contents), label, FALSE, FALSE, 8);
 	rpm_verify_window->details->file_message = label;
 	
@@ -186,7 +186,7 @@ nautilus_rpm_verify_window_new (const char *package_name)
 	gtk_window_set_title (GTK_WINDOW (rpm_verify_window), title_string);
 	
 	/* set up the package name */
-	nautilus_label_set_text (NAUTILUS_LABEL (rpm_verify_window->details->package_name), title_string);
+	eel_label_set_text (EEL_LABEL (rpm_verify_window->details->package_name), title_string);
 	g_free (title_string);
 	
 	return GTK_WIDGET (rpm_verify_window);
@@ -195,7 +195,7 @@ nautilus_rpm_verify_window_new (const char *package_name)
 void
 nautilus_rpm_verify_window_set_message (NautilusRPMVerifyWindow *window, const char *message)
 {
-	nautilus_label_set_text (NAUTILUS_LABEL (window->details->file_message), message);
+	eel_label_set_text (EEL_LABEL (window->details->file_message), message);
         while (gtk_events_pending ()) {
                 gtk_main_iteration ();
         }
diff --git a/components/rpmview/nautilus-rpm-view-install.c b/components/rpmview/nautilus-rpm-view-install.c
index 06be5685d..ef2b53a05 100644
--- a/components/rpmview/nautilus-rpm-view-install.c
+++ b/components/rpmview/nautilus-rpm-view-install.c
@@ -23,8 +23,8 @@
 #include "nautilus-rpm-view-install.h"
 #include "libtrilobite/libtrilobite.h"
 #include "libeazelinstall.h"
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-password-dialog.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-password-dialog.h>
 #include "libtrilobite/libtrilobite.h"
 #include "nautilus-rpm-view-private.h"
 #ifdef EAZEL_SERVICES
@@ -231,7 +231,7 @@ nautilus_rpm_view_install_done (EazelInstallCallback *service,
 		window = gtk_widget_get_toplevel (GTK_WIDGET (rpm_view));
 		g_assert (window);
 		g_assert (GTK_IS_WINDOW (window));
-		d = nautilus_show_error_dialog_with_details (terse, 
+		d = eel_show_error_dialog_with_details (terse, 
 							     dialog_title,
 							     detailed,
 							     GTK_WINDOW (window));
@@ -291,16 +291,16 @@ nautilus_service_need_password (GtkObject *object, const char *prompt,
 		message = _("Incorrect password.");
 	}
 
-	dialog = nautilus_password_dialog_new ("Authenticate Me", message, prompt, "", TRUE);
-	okay = nautilus_password_dialog_run_and_block (NAUTILUS_PASSWORD_DIALOG (dialog));
+	dialog = eel_password_dialog_new ("Authenticate Me", message, prompt, "", TRUE);
+	okay = eel_password_dialog_run_and_block (EEL_PASSWORD_DIALOG (dialog));
 
 	if (! okay) {
 		/* cancel */
 		view->details->password_attempts = 0;
 		out = g_strdup ("");
 	} else {
-		out = nautilus_password_dialog_get_password (NAUTILUS_PASSWORD_DIALOG (dialog));
-		if (nautilus_password_dialog_get_remember (NAUTILUS_PASSWORD_DIALOG (dialog))) {
+		out = eel_password_dialog_get_password (EEL_PASSWORD_DIALOG (dialog));
+		if (eel_password_dialog_get_remember (EEL_PASSWORD_DIALOG (dialog))) {
 			view->details->remembered_password = g_strdup (out);
 		}
 	}
diff --git a/components/rpmview/nautilus-rpm-view.c b/components/rpmview/nautilus-rpm-view.c
index 7f7a24652..00bf40cf8 100644
--- a/components/rpmview/nautilus-rpm-view.c
+++ b/components/rpmview/nautilus-rpm-view.c
@@ -34,18 +34,18 @@
 #include <gnome.h>
 #include <gtk/gtklabel.h>
 #include <libgnomevfs/gnome-vfs.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-ctree.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-image.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-image.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-theme.h>
-#include <libnautilus-extensions/nautilus-viewport.h>
+#include <eel/eel-viewport.h>
 #include <libnautilus/libnautilus.h>
 #include <limits.h>
 #include <stdio.h>
@@ -85,7 +85,7 @@ static void nautilus_rpm_view_verify_package_callback (GtkWidget *widget,
 static void file_activation_callback (NautilusCTree *ctree, NautilusCTreeNode *node, int column,
                                       NautilusRPMView *rpm_view);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusRPMView, nautilus_rpm_view, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusRPMView, nautilus_rpm_view, GTK_TYPE_EVENT_BOX)
 
 static void
 nautilus_rpm_view_initialize_class (NautilusRPMViewClass *klass)
@@ -105,7 +105,7 @@ nautilus_rpm_view_initialize_class (NautilusRPMViewClass *klass)
 static void
 nautilus_rpm_view_initialize (NautilusRPMView *rpm_view)
 {
-  	NautilusBackground *background;
+  	EelBackground *background;
 	GtkWidget *temp_box, *temp_widget;
 	GtkWidget *icon_title_box, *title_box;
 	GtkTable *table;
@@ -132,8 +132,8 @@ nautilus_rpm_view_initialize (NautilusRPMView *rpm_view)
 	rpm_view->details->selected_file = NULL;
 	
 	/* set up the default background color */
-  	background = nautilus_get_widget_background (GTK_WIDGET (rpm_view));
-  	nautilus_background_set_color (background, RPM_VIEW_DEFAULT_BACKGROUND_COLOR);
+  	background = eel_get_widget_background (GTK_WIDGET (rpm_view));
+  	eel_background_set_color (background, RPM_VIEW_DEFAULT_BACKGROUND_COLOR);
 	 
 	/* allocate a vbox to contain all of the views */
 	
@@ -148,7 +148,7 @@ nautilus_rpm_view_initialize (NautilusRPMView *rpm_view)
 	
 	/* allocate a nautilus_image to hold the icon */
 	default_icon_path = nautilus_theme_get_image_path ("gnome-pack-rpm.png");
-	rpm_view->details->package_image = nautilus_image_new (default_icon_path);
+	rpm_view->details->package_image = eel_image_new (default_icon_path);
 	g_free (default_icon_path);
 	gtk_widget_show (rpm_view->details->package_image);
 	gtk_box_pack_start (GTK_BOX (icon_title_box), rpm_view->details->package_image, FALSE, FALSE, 8);	
@@ -160,7 +160,7 @@ nautilus_rpm_view_initialize (NautilusRPMView *rpm_view)
 	
 	/* allocate the name field */
 	rpm_view->details->package_title = gtk_label_new (_("Package Title"));
-        nautilus_gtk_label_make_larger (GTK_LABEL (rpm_view->details->package_title), 4);
+        eel_gtk_label_make_larger (GTK_LABEL (rpm_view->details->package_title), 4);
 	gtk_box_pack_start (GTK_BOX (title_box), rpm_view->details->package_title, FALSE, FALSE, 1);	
 	gtk_widget_show (rpm_view->details->package_title);
 		
@@ -357,11 +357,11 @@ nautilus_rpm_view_initialize (NautilusRPMView *rpm_view)
         temp_widget = gtk_scrolled_window_new (NULL, NULL);
         gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (temp_widget),
                                         GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-        viewport = nautilus_viewport_new (NULL, NULL);
+        viewport = eel_viewport_new (NULL, NULL);
 	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
         gtk_container_add (GTK_CONTAINER (temp_widget), viewport);
-	background = nautilus_get_widget_background (viewport);
-	nautilus_background_set_color (background, RPM_VIEW_DEFAULT_BACKGROUND_COLOR);
+	background = eel_get_widget_background (viewport);
+	eel_background_set_color (background, RPM_VIEW_DEFAULT_BACKGROUND_COLOR);
         gtk_widget_show (viewport);
         gtk_box_pack_start (GTK_BOX (rpm_view->details->package_container), temp_widget, TRUE, TRUE, 8);
         gtk_widget_show (temp_widget);
@@ -375,7 +375,7 @@ nautilus_rpm_view_initialize (NautilusRPMView *rpm_view)
 	
 	gtk_drag_dest_set (GTK_WIDGET (rpm_view),
 			   GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, 
-			   rpm_dnd_target_table, NAUTILUS_N_ELEMENTS (rpm_dnd_target_table), GDK_ACTION_COPY);
+			   rpm_dnd_target_table, EEL_N_ELEMENTS (rpm_dnd_target_table), GDK_ACTION_COPY);
 
 	/* finally, show the view itself */	
 	gtk_widget_show (GTK_WIDGET (rpm_view));
@@ -416,7 +416,7 @@ nautilus_rpm_view_destroy (GtkObject *object)
 	g_free (rpm_view->details->package_name);
 	g_free (rpm_view->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* Component embedding support */
@@ -536,7 +536,7 @@ nautilus_rpm_view_update_from_uri (NautilusRPMView *rpm_view, const char *uri)
 		
 	/* load the standard icon as the default */
 	default_icon_path = nautilus_theme_get_image_path ("gnome-pack-rpm.png");
-    	nautilus_image_set_pixbuf_from_file_name (NAUTILUS_IMAGE (rpm_view->details->package_image), default_icon_path);
+    	eel_image_set_pixbuf_from_file_name (EEL_IMAGE (rpm_view->details->package_image), default_icon_path);
         g_free (default_icon_path);
 
 #ifdef EAZEL_SERVICES	       
@@ -733,7 +733,7 @@ nautilus_rpm_view_verify_files (GtkWidget *widget,
 	
 	}
 	
-	nautilus_gtk_window_present (GTK_WINDOW (rpm_view->details->verify_window));
+	eel_gtk_window_present (GTK_WINDOW (rpm_view->details->verify_window));
 
         failsignal = gtk_signal_connect (GTK_OBJECT (rpm_view->details->package_system),
                                          "failed",
@@ -781,7 +781,7 @@ nautilus_rpm_view_drag_data_received (GtkWidget *widget, GdkDragContext *context
         switch (info) {
         case TARGET_COLOR:
                 /* Let the background change based on the dropped color. */
-                nautilus_background_receive_dropped_color (nautilus_get_widget_background (widget),
+                eel_background_receive_dropped_color (eel_get_widget_background (widget),
                                                            widget, x, y, selection_data);
                 break;
                 
diff --git a/components/sample/nautilus-sample-content-view.c b/components/sample/nautilus-sample-content-view.c
index 2b37b6ac7..41b5c2bca 100644
--- a/components/sample/nautilus-sample-content-view.c
+++ b/components/sample/nautilus-sample-content-view.c
@@ -39,7 +39,7 @@
  * Nautilus. If not, you can't rely on the nautilus-gtk-macros.h header.
  */
 #if 0
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #endif
 
 #include <libnautilus/nautilus-bonobo-ui.h>
@@ -77,7 +77,7 @@ static void sample_merge_bonobo_items_callback            (BonoboControl
 
 #if 0
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSampleContentView,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusSampleContentView,
 				   nautilus_sample_content_view,
 				   NAUTILUS_TYPE_VIEW)
 #else
@@ -166,7 +166,7 @@ nautilus_sample_content_view_destroy (GtkObject *object)
 
 	/* CHANGE: Pick one. */
 #if 0 /* nautilus-specific */	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 #else /* non-nautilus-specific */
 	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 #endif
diff --git a/components/services/install-view/Makefile.am b/components/services/install-view/Makefile.am
index d6f5bc368..e7108d5ef 100644
--- a/components/services/install-view/Makefile.am
+++ b/components/services/install-view/Makefile.am
@@ -14,6 +14,8 @@ INCLUDES =								\
 	-I$(top_builddir)/components/services/install/lib		\
 	-I$(top_builddir)/components/services/inventory/		\
 	-I$(top_builddir)						\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GCONF_CFLAGS)							\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"			\
 	$(GNOMEUI_CFLAGS)						\
@@ -44,6 +46,8 @@ nautilus_service_install_view_LDADD =								\
 	$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la		\
 	$(top_builddir)/components/services/nautilus-dependent-shared/libnautilusdepshared.a	\
 	$(top_builddir)/components/services/inventory/libtrilobite-inventory-service.la		\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS)										\
 	$(GCONF_LIBS)										\
 	$(GNOMEUI_LIBS)										\
diff --git a/components/services/install-view/callbacks.c b/components/services/install-view/callbacks.c
index 7c1d901f0..9c7760e06 100644
--- a/components/services/install-view/callbacks.c
+++ b/components/services/install-view/callbacks.c
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <libeazelinstall.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
 
 #define MAX_DESCRIBE_MENUS      3
@@ -240,7 +240,7 @@ nautilus_service_install_download_progress (EazelInstallCallback *cb, const Pack
 		im = view->details->current_im = install_message_new (view, pack->name);
 		gtk_progress_set_percentage (GTK_PROGRESS (im->progress_bar), 0.0);
 		out = g_strdup_printf (_("0K of %dK"), total/1024);
-		nautilus_label_set_text (NAUTILUS_LABEL (im->progress_label), out);
+		eel_label_set_text (EEL_LABEL (im->progress_label), out);
 		g_free (out);
 		view->details->last_k = 0;
 
@@ -251,7 +251,7 @@ nautilus_service_install_download_progress (EazelInstallCallback *cb, const Pack
 		} else {
 			out = g_strdup_printf (_("Attempting to download package \"%s\"."), pack->name);
 		}
-		nautilus_label_set_text (NAUTILUS_LABEL (im->label), out);
+		eel_label_set_text (EEL_LABEL (im->label), out);
 		g_free (out);
 	} else if (amount == total) {
 		/* done! */
@@ -268,7 +268,7 @@ nautilus_service_install_download_progress (EazelInstallCallback *cb, const Pack
 		} else {
 			out = g_strdup_printf (_("The package \"%s\" has been successfully downloaded."), pack->name);
 		}
-		nautilus_label_set_text (NAUTILUS_LABEL (im->label), out);
+		eel_label_set_text (EEL_LABEL (im->label), out);
 		g_free (out);
 		g_free (view->details->current_rpm);
 		view->details->current_rpm = NULL;
@@ -285,7 +285,7 @@ nautilus_service_install_download_progress (EazelInstallCallback *cb, const Pack
 						     (float) amount / (float) total);
 			if ((amount/1024) >= view->details->last_k + 10) {
 				out = g_strdup_printf (_("%dK of %dK"), amount/1024, total/1024);
-				nautilus_label_set_text (NAUTILUS_LABEL (im->progress_label), out);
+				eel_label_set_text (EEL_LABEL (im->progress_label), out);
 				g_free (out);
 				view->details->last_k = (amount/1024);
 			}
@@ -316,7 +316,7 @@ nautilus_service_install_download_failed (EazelInstallCallback *cb, const Packag
 	out = g_strdup_printf (_("Download of package \"%s\" failed!"), tmp);
 	g_free (tmp);
 	if (view->details->current_im != NULL) {
-		nautilus_label_set_text (NAUTILUS_LABEL (view->details->current_im->label), out);
+		eel_label_set_text (EEL_LABEL (view->details->current_im->label), out);
 	}
 	g_free (out);
 }
@@ -340,7 +340,7 @@ previous_install_finished (NautilusServiceInstallView *view)
 		} else {
 			out = g_strdup_printf (_("\"%s\" has been successfully downloaded and installed."), view->details->current_rpm);
 		}
-		nautilus_label_set_text (NAUTILUS_LABEL (im->label), out);
+		eel_label_set_text (EEL_LABEL (im->label), out);
 		g_free (out);
 	}
 	g_free (view->details->current_rpm);
@@ -398,7 +398,7 @@ nautilus_service_install_progress (EazelInstallCallback *cb, const PackageData *
 		} else {
 			out = g_strdup_printf (_("Now installing package \"%s\"."), pack->name);
 		}
-		nautilus_label_set_text (NAUTILUS_LABEL (im->label), out);
+		eel_label_set_text (EEL_LABEL (im->label), out);
 		g_free (out);
 
 		view->details->current_package = current_package;
@@ -413,7 +413,7 @@ nautilus_service_install_progress (EazelInstallCallback *cb, const PackageData *
 	gtk_progress_set_percentage (GTK_PROGRESS (im->progress_bar), complete);
 	gtk_progress_set_percentage (GTK_PROGRESS (view->details->total_progress_bar), overall_complete);
 	out = g_strdup_printf (_("%d%%"), (int)(complete*100.0));
-	nautilus_label_set_text (NAUTILUS_LABEL (im->progress_label), out);
+	eel_label_set_text (EEL_LABEL (im->progress_label), out);
 	g_free (out);
 
 	if ((package_progress == package_total) && (package_total > 0)) {
diff --git a/components/services/install-view/forms.c b/components/services/install-view/forms.c
index e415f898f..1f803b78e 100644
--- a/components/services/install-view/forms.c
+++ b/components/services/install-view/forms.c
@@ -30,9 +30,9 @@
 #include "eazel-services-header.h"
 #include "eazel-services-extensions.h"
 #include <stdio.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-viewport.h>
+#include <eel/eel-background.h>
+#include <eel/eel-label.h>
+#include <eel/eel-viewport.h>
 
 
 /* gtk rulez */
@@ -65,15 +65,15 @@ static GtkWidget *
 horizontal_line_new (int height)
 {
 	GtkWidget *line;
-	NautilusBackground *background;
+	EelBackground *background;
 
 	line = gtk_drawing_area_new ();
 	gtk_drawing_area_size (GTK_DRAWING_AREA (line), 100, 1);
 	gtk_signal_connect (GTK_OBJECT (line), "expose_event", GTK_SIGNAL_FUNC (line_expose), NULL);
 	gtk_widget_set_usize (line, -2, height);
 
-	background = nautilus_get_widget_background (line);
-	nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (line);
+	eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 
 	return line;
 }
@@ -120,7 +120,7 @@ install_message_new (NautilusServiceInstallView *view, const char *package_name)
 					      EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
 					      EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
 					      NULL, -2, FALSE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (im->label), GTK_JUSTIFY_LEFT);
+	eel_label_set_justify (EEL_LABEL (im->label), GTK_JUSTIFY_LEFT);
 	gtk_widget_show (im->label);
 	im->progress_bar = gtk_progress_bar_new ();
 	gtk_progress_bar_set_bar_style (GTK_PROGRESS_BAR (im->progress_bar), GTK_PROGRESS_CONTINUOUS);
@@ -133,7 +133,7 @@ install_message_new (NautilusServiceInstallView *view, const char *package_name)
 						       EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
 						       EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
 						       NULL, -2, TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (im->progress_label), GTK_JUSTIFY_LEFT);
+	eel_label_set_justify (EEL_LABEL (im->progress_label), GTK_JUSTIFY_LEFT);
 	gtk_widget_show (im->progress_label);
 
 	bogus_label = gtk_label_new ("");
@@ -191,7 +191,7 @@ generate_install_form (NautilusServiceInstallView *view)
 	GtkWidget	*title;
 	GtkWidget	*viewport;
 	GtkWidget	*filler;
-	NautilusBackground *background;
+	EelBackground *background;
 
 	/* allocate the parent box to hold everything */
 	view->details->form = gtk_vbox_new (FALSE, 0);
@@ -214,7 +214,7 @@ generate_install_form (NautilusServiceInstallView *view)
 								EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
 								EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
 								NULL, 4, TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (view->details->package_name), GTK_JUSTIFY_LEFT);
+	eel_label_set_justify (EEL_LABEL (view->details->package_name), GTK_JUSTIFY_LEFT);
 	gtk_box_pack_start (GTK_BOX (temp_box), view->details->package_name, FALSE, FALSE, 15);
 	gtk_widget_show (view->details->package_name);
 
@@ -226,7 +226,7 @@ generate_install_form (NautilusServiceInstallView *view)
 								   EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
 								   EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
 								   NULL, -2, TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (view->details->package_version), GTK_JUSTIFY_LEFT);
+	eel_label_set_justify (EEL_LABEL (view->details->package_version), GTK_JUSTIFY_LEFT);
 	gtk_box_pack_start (GTK_BOX (temp_box), view->details->package_version, FALSE, FALSE, 15);
 	gtk_widget_show (view->details->package_version);
 
@@ -251,8 +251,8 @@ generate_install_form (NautilusServiceInstallView *view)
 									 EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
 									 EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
 									 NULL, -2, FALSE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (view->details->overall_feedback_text), GTK_JUSTIFY_LEFT);
-	nautilus_label_set_text (NAUTILUS_LABEL (view->details->overall_feedback_text), " ");
+	eel_label_set_justify (EEL_LABEL (view->details->overall_feedback_text), GTK_JUSTIFY_LEFT);
+	eel_label_set_text (EEL_LABEL (view->details->overall_feedback_text), " ");
 	gtk_widget_show (view->details->overall_feedback_text);
 	add_padding_to_box (temp_box, 30, 0);
 	gtk_box_pack_start (GTK_BOX (temp_box), view->details->overall_feedback_text, TRUE, TRUE, 0);
@@ -268,8 +268,8 @@ generate_install_form (NautilusServiceInstallView *view)
 								   EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
 								   EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
 								   NULL, -2, FALSE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (view->details->package_details), GTK_JUSTIFY_LEFT);
-	nautilus_label_set_wrap (NAUTILUS_LABEL (view->details->package_details), TRUE);
+	eel_label_set_justify (EEL_LABEL (view->details->package_details), GTK_JUSTIFY_LEFT);
+	eel_label_set_wrap (EEL_LABEL (view->details->package_details), TRUE);
 
 	gtk_box_pack_start (GTK_BOX (temp_box), view->details->package_details, FALSE, FALSE, 15);
 	gtk_widget_show (view->details->package_details);
@@ -278,12 +278,12 @@ generate_install_form (NautilusServiceInstallView *view)
 	view->details->query_pane = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (view->details->query_pane),
 					GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-	viewport = nautilus_viewport_new (NULL, NULL);
+	viewport = eel_viewport_new (NULL, NULL);
 	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
 	gtk_container_add (GTK_CONTAINER (view->details->query_pane), viewport);
 	gtk_widget_show (viewport);
-	background = nautilus_get_widget_background (viewport);
-	nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (viewport);
+	eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 	gtk_widget_hide (view->details->query_pane);
 	gtk_box_pack_start (GTK_BOX (view->details->form), view->details->query_pane, TRUE, TRUE, 0);
 
@@ -307,14 +307,14 @@ generate_install_form (NautilusServiceInstallView *view)
 	view->details->pane = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (view->details->pane),
 					GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-	viewport = nautilus_viewport_new (NULL, NULL);
+	viewport = eel_viewport_new (NULL, NULL);
 	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
 	gtk_container_add (GTK_CONTAINER (view->details->pane), viewport);
 	gtk_widget_show (viewport);
 	gtk_container_add (GTK_CONTAINER (viewport), view->details->message_box);
 	gtk_widget_show (view->details->message_box);
-	background = nautilus_get_widget_background (viewport);
-	nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (viewport);
+	eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 	gtk_widget_set_usize (view->details->pane, -2, MESSAGE_BOX_HEIGHT);
 	gtk_widget_show (view->details->pane);
 	gtk_box_pack_end (GTK_BOX (view->details->form), view->details->pane, FALSE, FALSE, 2);
@@ -335,7 +335,7 @@ generate_install_form (NautilusServiceInstallView *view)
 void
 show_overall_feedback (NautilusServiceInstallView *view, char *progress_message)
 {
-	nautilus_label_set_text (NAUTILUS_LABEL (view->details->overall_feedback_text), progress_message);
+	eel_label_set_text (EEL_LABEL (view->details->overall_feedback_text), progress_message);
 	gtk_widget_show (view->details->overall_feedback_text);
 }
 
@@ -345,18 +345,18 @@ update_package_info_display (NautilusServiceInstallView *view, const PackageData
 	char *out;
 
        out = g_strdup_printf (format, pack->name);
-       nautilus_label_set_text (NAUTILUS_LABEL (view->details->package_name), out);
+       eel_label_set_text (EEL_LABEL (view->details->package_name), out);
        g_free (out);
 
        if ((pack->description != NULL) && 
            (strchr (pack->description, '\n') != NULL)) {
-               nautilus_label_set_wrap (NAUTILUS_LABEL (view->details->package_details), FALSE);
+               eel_label_set_wrap (EEL_LABEL (view->details->package_details), FALSE);
        } else {
-               nautilus_label_set_wrap (NAUTILUS_LABEL (view->details->package_details), TRUE);
+               eel_label_set_wrap (EEL_LABEL (view->details->package_details), TRUE);
        }
-       nautilus_label_set_text (NAUTILUS_LABEL (view->details->package_details), pack->description);
+       eel_label_set_text (EEL_LABEL (view->details->package_details), pack->description);
        out = g_strdup_printf (_("Version: %s"), pack->version);
-       nautilus_label_set_text (NAUTILUS_LABEL (view->details->package_version), out);
+       eel_label_set_text (EEL_LABEL (view->details->package_version), out);
        g_free (out);
 }
 
@@ -366,7 +366,7 @@ current_progress_bar_complete (NautilusServiceInstallView *view, const char *tex
 {
 	/* can't figure out a decent way to do this yet... :( */
 	if (view->details->current_im != NULL) {
-		nautilus_label_set_text (NAUTILUS_LABEL (view->details->current_im->progress_label), text);
+		eel_label_set_text (EEL_LABEL (view->details->current_im->progress_label), text);
 		gtk_widget_queue_resize (view->details->message_box);
 	}
 }
@@ -423,16 +423,16 @@ make_query_box (NautilusServiceInstallView *view, EazelInstallCallbackOperation
 					      EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
 					      EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
 					      NULL, -1, FALSE);
-        nautilus_label_set_text (NAUTILUS_LABEL (top_label), text);
-	nautilus_label_set_justify (NAUTILUS_LABEL (top_label), GTK_JUSTIFY_LEFT);
+        eel_label_set_text (EEL_LABEL (top_label), text);
+	eel_label_set_justify (EEL_LABEL (top_label), GTK_JUSTIFY_LEFT);
         gtk_widget_show (top_label);
 
 	bottom_label_2 = eazel_services_label_new (NULL, 0, 0.0, 0.0, 0, 0,
 						   EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
 						   EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
 						   NULL, -1, FALSE);
-	nautilus_label_set_text (NAUTILUS_LABEL (bottom_label_2), text2);
-	nautilus_label_set_justify (NAUTILUS_LABEL (bottom_label_2), GTK_JUSTIFY_LEFT);
+	eel_label_set_text (EEL_LABEL (bottom_label_2), text2);
+	eel_label_set_justify (EEL_LABEL (bottom_label_2), GTK_JUSTIFY_LEFT);
 	gtk_widget_show (bottom_label_2);
 
         /* build up vbox list of packages */
@@ -444,8 +444,8 @@ make_query_box (NautilusServiceInstallView *view, EazelInstallCallbackOperation
                                                        EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
                                                        EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
                                                        NULL, -1, TRUE);
-                nautilus_label_set_text (NAUTILUS_LABEL (list_label), text);
-                nautilus_label_set_justify (NAUTILUS_LABEL (list_label), GTK_JUSTIFY_LEFT);
+                eel_label_set_text (EEL_LABEL (list_label), text);
+                eel_label_set_justify (EEL_LABEL (list_label), GTK_JUSTIFY_LEFT);
                 gtk_widget_show (list_label);
                 gtk_box_pack_start (GTK_BOX (vbox_list), list_label, FALSE, FALSE, 0);
                 g_free (text);
@@ -469,8 +469,8 @@ make_query_box (NautilusServiceInstallView *view, EazelInstallCallbackOperation
                                                  EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
                                                  EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
                                                  NULL, -1, FALSE);
-        nautilus_label_set_text (NAUTILUS_LABEL (bottom_label), text);
-	nautilus_label_set_justify (NAUTILUS_LABEL (bottom_label), GTK_JUSTIFY_LEFT);
+        eel_label_set_text (EEL_LABEL (bottom_label), text);
+	eel_label_set_justify (EEL_LABEL (bottom_label), GTK_JUSTIFY_LEFT);
         gtk_widget_show (bottom_label);
         g_free (text);
 
diff --git a/components/services/install-view/nautilus-service-install-view.c b/components/services/install-view/nautilus-service-install-view.c
index 52189a97e..7547217b8 100644
--- a/components/services/install-view/nautilus-service-install-view.c
+++ b/components/services/install-view/nautilus-service-install-view.c
@@ -36,19 +36,19 @@
 
 #include <gnome-xml/tree.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-background.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-string.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-password-dialog.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-viewport.h>
+#include <eel/eel-string.h>
+#include <eel/eel-label.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-password-dialog.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-viewport.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-clickable-image.h>
+#include <eel/eel-clickable-image.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <dirent.h>
@@ -68,7 +68,7 @@ static void       service_install_load_location_callback         (NautilusView
 static void	  service_install_stop_loading_callback		 (NautilusView				*nautilus_view,
 								  NautilusServiceInstallView		*view);
     
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusServiceInstallView, nautilus_service_install_view, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusServiceInstallView, nautilus_service_install_view, GTK_TYPE_EVENT_BOX)
 
 
 static gboolean
@@ -105,7 +105,7 @@ nautilus_service_install_view_destroy (GtkObject *object)
 		eazel_install_callback_unref (GTK_OBJECT (view->details->installer));
 	}
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -125,7 +125,7 @@ nautilus_service_install_view_finalize (GtkObject *object)
 	g_free (view->details->username);
 	g_free (view->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
 }
 
 static void
@@ -148,7 +148,7 @@ static void
 nautilus_service_install_view_initialize (NautilusServiceInstallView *view)
 {
 
-	NautilusBackground *background;
+	EelBackground *background;
 
 	view->details = g_new0 (NautilusServiceInstallViewDetails, 1);
 	view->details->nautilus_view = nautilus_view_new (GTK_WIDGET (view));
@@ -161,8 +161,8 @@ nautilus_service_install_view_initialize (NautilusServiceInstallView *view)
 			    GTK_SIGNAL_FUNC (service_install_stop_loading_callback),
 			    view);
 
-	background = nautilus_get_widget_background (GTK_WIDGET (view));
-	nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (GTK_WIDGET (view));
+	eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 
 	view->details->core_package = FALSE;
 	view->details->deps = g_hash_table_new (g_str_hash, g_str_equal);
@@ -529,7 +529,7 @@ make_dragable_icon_well (NautilusServiceInstallView *view,
 	GdkBitmap *drag_mask;
 	int width, height;
 	GdkPixbuf *scaledicon;
-	NautilusBackground *background;
+	EelBackground *background;
 	static GtkTargetEntry target_table[] = {
 		{ "text/uri-list", 0, 0 }
 	};
@@ -552,8 +552,8 @@ make_dragable_icon_well (NautilusServiceInstallView *view,
 	/* set up the "well" aspect frame */
 	aspectframe = gtk_aspect_frame_new (NULL, 0.5, 0.0, 1, TRUE);
 	gtk_frame_set_shadow_type (GTK_FRAME (aspectframe), GTK_SHADOW_IN);
-	background = nautilus_get_widget_background (GTK_WIDGET (aspectframe));
-	nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (GTK_WIDGET (aspectframe));
+	eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 
 	/* scale icon to fit in an ICON_SIZExICON_SIZE box */
 	width = gdk_pixbuf_get_width (icon);
@@ -571,13 +571,13 @@ make_dragable_icon_well (NautilusServiceInstallView *view,
 	scaledicon = gdk_pixbuf_scale_simple (icon, 
 			width, height, GDK_INTERP_BILINEAR);
 
-	image = nautilus_clickable_image_new (NULL, scaledicon);
-	nautilus_clickable_image_set_prelight (NAUTILUS_CLICKABLE_IMAGE (image),
+	image = eel_clickable_image_new (NULL, scaledicon);
+	eel_clickable_image_set_prelight (EEL_CLICKABLE_IMAGE (image),
 			TRUE);
 
 	eventbox = gtk_event_box_new ();
-	background = nautilus_get_widget_background (GTK_WIDGET (eventbox));
-	nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (GTK_WIDGET (eventbox));
+	eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 	gtk_widget_show (eventbox);
 	box = gtk_hbox_new (FALSE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (box), 3);
@@ -642,7 +642,7 @@ nautilus_install_service_add_menu_launchers (NautilusServiceInstallView *view, G
 
 	s = gnome_unconditional_pixmap_file("gnome-info.png");
 	if (s != NULL) {
-		info_icon = nautilus_image_new (s);
+		info_icon = eel_image_new (s);
 		g_free (s);
 		gtk_widget_show (info_icon);
 		gtk_table_attach (GTK_TABLE (table), info_icon,
@@ -652,10 +652,10 @@ nautilus_install_service_add_menu_launchers (NautilusServiceInstallView *view, G
 				0, 0);
 	}
 
-	label = nautilus_label_new (_("Installation Complete"));
-	nautilus_label_set_is_smooth (NAUTILUS_LABEL (label), FALSE);
-	nautilus_label_set_wrap (NAUTILUS_LABEL (label), FALSE);
-	nautilus_label_make_bold (NAUTILUS_LABEL (label));
+	label = eel_label_new (_("Installation Complete"));
+	eel_label_set_is_smooth (EEL_LABEL (label), FALSE);
+	eel_label_set_wrap (EEL_LABEL (label), FALSE);
+	eel_label_make_bold (EEL_LABEL (label));
 	gtk_widget_show (label);
 	alignment = gtk_alignment_new (0.0, 0.5, 0.0, 0.0);
 	gtk_container_add (GTK_CONTAINER (alignment), label);
@@ -720,12 +720,12 @@ nautilus_install_service_add_menu_launchers (NautilusServiceInstallView *view, G
 					menu_description, dentry->name);
 		}
 		g_free (menu_description);
-		label = nautilus_label_new (label_text);
+		label = eel_label_new (label_text);
 		gtk_widget_set_usize (label, 400, -1);
-		nautilus_label_set_is_smooth (NAUTILUS_LABEL (label), FALSE);
-		nautilus_label_set_wrap (NAUTILUS_LABEL (label), TRUE);
-		nautilus_label_set_justify (NAUTILUS_LABEL (label), GTK_JUSTIFY_LEFT);
-		nautilus_label_set_adjust_wrap_on_resize (NAUTILUS_LABEL (label), TRUE);
+		eel_label_set_is_smooth (EEL_LABEL (label), FALSE);
+		eel_label_set_wrap (EEL_LABEL (label), TRUE);
+		eel_label_set_justify (EEL_LABEL (label), GTK_JUSTIFY_LEFT);
+		eel_label_set_adjust_wrap_on_resize (EEL_LABEL (label), TRUE);
 		gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
 		gtk_widget_show (label);
 		g_free (label_text);
@@ -775,8 +775,8 @@ nautilus_service_need_password (GtkObject *object, const char *prompt, NautilusS
 		message = g_strdup (PASSWORD_PROMPT);
 	}
 
-	dialog = nautilus_password_dialog_new (_("Authenticate as root"), message, prompt, "", TRUE);
-	okay = nautilus_password_dialog_run_and_block (NAUTILUS_PASSWORD_DIALOG (dialog));
+	dialog = eel_password_dialog_new (_("Authenticate as root"), message, prompt, "", TRUE);
+	okay = eel_password_dialog_run_and_block (EEL_PASSWORD_DIALOG (dialog));
 
 	if (! okay) {
 		/* cancel */
@@ -784,8 +784,8 @@ nautilus_service_need_password (GtkObject *object, const char *prompt, NautilusS
 		view->details->cancelled = TRUE;
 		out = g_strdup ("");
 	} else {
-		out = nautilus_password_dialog_get_password (NAUTILUS_PASSWORD_DIALOG (dialog));
-		if (nautilus_password_dialog_get_remember (NAUTILUS_PASSWORD_DIALOG (dialog))) {
+		out = eel_password_dialog_get_password (EEL_PASSWORD_DIALOG (dialog));
+		if (eel_password_dialog_get_remember (EEL_PASSWORD_DIALOG (dialog))) {
 			view->details->remembered_password = g_strdup (out);
 		}
 	}
@@ -900,7 +900,7 @@ nautilus_service_install_view_update_from_uri_finish (NautilusServiceInstallView
 	} else {
 		out = g_strdup_printf (_("Installing some package"));
 	}
-	nautilus_label_set_text (NAUTILUS_LABEL (view->details->package_name), out);
+	eel_label_set_text (EEL_LABEL (view->details->package_name), out);
 	g_free (out);
 
 	CORBA_exception_init (&ev);
diff --git a/components/services/install/lib/eazel-install-logic2.c b/components/services/install/lib/eazel-install-logic2.c
index 7aaff78e7..18d792c76 100644
--- a/components/services/install/lib/eazel-install-logic2.c
+++ b/components/services/install/lib/eazel-install-logic2.c
@@ -28,7 +28,7 @@
 #include <libtrilobite/trilobite-core-utils.h>
 #include <libtrilobite/trilobite-md5-tools.h>
 
-#include <libnautilus-extensions/nautilus-debug.h>
+#include <eel/eel-debug.h>
 
 #ifndef EAZEL_INSTALL_NO_CORBA
 #include <libtrilobite/libtrilobite.h>
diff --git a/components/services/install/server/main.c b/components/services/install/server/main.c
index b02e114cb..f458252e4 100644
--- a/components/services/install/server/main.c
+++ b/components/services/install/server/main.c
@@ -37,7 +37,7 @@
 	$(top_builddir)/libnautilus-extensions/nautilus-debug.o				 	\
 to the ldadd line in Makefile.am
 */
-#include <libnautilus-extensions/nautilus-debug.h>
+#include <eel/eel-debug.h>
 #endif
 
 #include <trilobite-eazel-install.h>
@@ -156,7 +156,7 @@ int main(int argc, char *argv[]) {
 	}
 
 #ifdef STOP_IN_DEBUG
-	nautilus_make_warnings_and_criticals_stop_in_debugger ("GLib", NULL);
+	eel_make_warnings_and_criticals_stop_in_debugger ("GLib", NULL);
 #endif
 
 	do {
diff --git a/components/services/inventory-view/Makefile.am b/components/services/inventory-view/Makefile.am
index 073eeb594..3903f857b 100644
--- a/components/services/inventory-view/Makefile.am
+++ b/components/services/inventory-view/Makefile.am
@@ -10,6 +10,8 @@ INCLUDES =						\
 	-I$(top_srcdir)/components/services/inventory	\
 	-I$(top_builddir)/components/services/inventory	\
 	-I$(top_srcdir)/components/services/nautilus-dependent-shared   \
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS)				\
 	$(BONOBO_CFLAGS)				\
 	$(OAF_CFLAGS)
@@ -38,6 +40,8 @@ nautilus_inventory_view_LDADD =								\
 	$(top_builddir)/components/services/inventory/libtrilobite-inventory-service.la	\
 	$(top_builddir)/components/services/nautilus-dependent-shared/libnautilusdepshared.a \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la 		\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(GNOMEUI_LIBS)									\
 	$(BONOBO_LIBS)									\
 	$(GCONF_LIBS)									\
diff --git a/components/services/inventory-view/nautilus-inventory-config-page.c b/components/services/inventory-view/nautilus-inventory-config-page.c
index 53bdbfadc..798724983 100644
--- a/components/services/inventory-view/nautilus-inventory-config-page.c
+++ b/components/services/inventory-view/nautilus-inventory-config-page.c
@@ -32,7 +32,7 @@
 #include <gtk/gtkentry.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkcheckbutton.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus/nautilus-view.h>
 #include <eazel-inventory-service-interface.h>
 
@@ -49,7 +49,7 @@ static void     nautilus_inventory_config_page_initialize_class    (NautilusInve
 static void     nautilus_inventory_config_page_initialize          (NautilusInventoryConfigPage      *file);
 static void     nautilus_inventory_config_page_destroy             (GtkObject                        *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusInventoryConfigPage, nautilus_inventory_config_page, GTK_TYPE_VBOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusInventoryConfigPage, nautilus_inventory_config_page, GTK_TYPE_VBOX)
 
 static void
 nautilus_inventory_config_page_initialize_class (NautilusInventoryConfigPageClass *klass)
@@ -186,5 +186,5 @@ nautilus_inventory_config_page_destroy (GtkObject *object)
 	
 	g_free (page->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
diff --git a/components/services/inventory-view/nautilus-inventory-disable-page.c b/components/services/inventory-view/nautilus-inventory-disable-page.c
index a4c3aa53a..157c73d45 100644
--- a/components/services/inventory-view/nautilus-inventory-disable-page.c
+++ b/components/services/inventory-view/nautilus-inventory-disable-page.c
@@ -36,9 +36,9 @@
 #include <gtk/gtkprogressbar.h>
 #include <gtk/gtk.h>
 #include <gnome.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-label.h>
+#include <eel/eel-background.h>
 #include <libnautilus/nautilus-view.h>
 #include <eazel-inventory.h>
 
@@ -51,7 +51,7 @@ static void     nautilus_inventory_disable_page_initialize_class    (NautilusInv
 static void     nautilus_inventory_disable_page_initialize          (NautilusInventoryDisablePage      *file);
 static void     nautilus_inventory_disable_page_destroy             (GtkObject                        *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusInventoryDisablePage, nautilus_inventory_disable_page, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusInventoryDisablePage, nautilus_inventory_disable_page, GTK_TYPE_EVENT_BOX)
 
 static void
 nautilus_inventory_disable_page_initialize_class (NautilusInventoryDisablePageClass *klass)
@@ -84,7 +84,7 @@ disable_inventory_callback (gpointer data)
 static void
 nautilus_inventory_disable_page_initialize (NautilusInventoryDisablePage *disable_page)
 {
-	NautilusBackground *background;
+	EelBackground *background;
 	GtkWidget *header;
 	GtkWidget *vbox;
 	GtkWidget *label;
@@ -93,8 +93,8 @@ nautilus_inventory_disable_page_initialize (NautilusInventoryDisablePage *disabl
 	gtk_widget_show (vbox);
 	gtk_container_add (GTK_CONTAINER (disable_page), vbox);
 
-	background = nautilus_get_widget_background (GTK_WIDGET (disable_page));
-        nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (GTK_WIDGET (disable_page));
+        eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 
 	disable_page->details = g_new0 (NautilusInventoryDisablePageDetails, 1);
 
@@ -110,8 +110,8 @@ nautilus_inventory_disable_page_initialize (NautilusInventoryDisablePage *disabl
 					       0.5,
 					       0,
 					       0,
-					       NAUTILUS_RGB_COLOR_BLACK,
-					       NAUTILUS_RGB_COLOR_WHITE,
+					       EEL_RGB_COLOR_BLACK,
+					       EEL_RGB_COLOR_WHITE,
 					       NULL,
 					       4,		/*relative size*/
 					       TRUE);
@@ -147,7 +147,7 @@ nautilus_inventory_disable_page_destroy (GtkObject *object)
 	}
 	g_free (page->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 void
diff --git a/components/services/inventory-view/nautilus-inventory-enable-page.c b/components/services/inventory-view/nautilus-inventory-enable-page.c
index 5b1d972b7..dd4abc6f9 100644
--- a/components/services/inventory-view/nautilus-inventory-enable-page.c
+++ b/components/services/inventory-view/nautilus-inventory-enable-page.c
@@ -33,11 +33,11 @@
 
 #include <gnome.h>
 #include <gtk/gtkprogressbar.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-label.h>
 #include <libnautilus/nautilus-view.h>
 #include <eazel-inventory.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 
 
 #undef DEBUG_MESSAGES
@@ -61,7 +61,7 @@ static void     nautilus_inventory_enable_page_initialize_class    (NautilusInve
 static void     nautilus_inventory_enable_page_initialize          (NautilusInventoryEnablePage      *file);
 static void     nautilus_inventory_enable_page_destroy             (GtkObject                        *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusInventoryEnablePage, nautilus_inventory_enable_page, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusInventoryEnablePage, nautilus_inventory_enable_page, GTK_TYPE_EVENT_BOX)
 
 static void
 nautilus_inventory_enable_page_initialize_class (NautilusInventoryEnablePageClass *klass)
@@ -110,7 +110,7 @@ nautilus_inventory_enable_page_initialize (NautilusInventoryEnablePage *enable_p
 
 	gtk_container_add (GTK_CONTAINER (enable_page), vbox_top);
 	
-        nautilus_background_set_color (nautilus_get_widget_background (GTK_WIDGET (enable_page)), 
+        eel_background_set_color (eel_get_widget_background (GTK_WIDGET (enable_page)), 
         	EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 
 	header = eazel_services_header_title_new (_("Uploading your System Inventory..."));
@@ -130,8 +130,8 @@ nautilus_inventory_enable_page_initialize (NautilusInventoryEnablePage *enable_p
 					       0.5,
 					       0,
 					       0,
-					       NAUTILUS_RGB_COLOR_BLACK,
-					       NAUTILUS_RGB_COLOR_WHITE,
+					       EEL_RGB_COLOR_BLACK,
+					       EEL_RGB_COLOR_WHITE,
 					       NULL,
 					       4,		/*relative size*/
 					       TRUE);
@@ -203,10 +203,10 @@ callback_eazel_inventory (EazelInventory *inventory,
 		nautilus_view_open_location_in_this_window (NAUTILUS_VIEW (enable_page->details->view),
 						    enable_page->details->view->details->next_uri);
 	} else {
-		nautilus_label_set_wrap (NAUTILUS_LABEL (enable_page->details->label), TRUE);
-		nautilus_label_set_justify (NAUTILUS_LABEL (enable_page->details->label), GTK_JUSTIFY_CENTER);
+		eel_label_set_wrap (EEL_LABEL (enable_page->details->label), TRUE);
+		eel_label_set_justify (EEL_LABEL (enable_page->details->label), GTK_JUSTIFY_CENTER);
 
-		nautilus_label_set_text (NAUTILUS_LABEL (enable_page->details->label), _("I'm sorry, an error prevented your System Inventory from being uploaded\n"));
+		eel_label_set_text (EEL_LABEL (enable_page->details->label), _("I'm sorry, an error prevented your System Inventory from being uploaded\n"));
 		/* Pause for impact */
 		/* This ref is released in the callback function */
 		gtk_object_ref (GTK_OBJECT (enable_page));
@@ -260,6 +260,6 @@ nautilus_inventory_enable_page_destroy (GtkObject *object)
 	}
 	g_free (enable_page->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
diff --git a/components/services/inventory-view/nautilus-inventory-view.c b/components/services/inventory-view/nautilus-inventory-view.c
index 12026f9c1..1b1bd2b7d 100644
--- a/components/services/inventory-view/nautilus-inventory-view.c
+++ b/components/services/inventory-view/nautilus-inventory-view.c
@@ -32,9 +32,9 @@
 
 #include "eazel-services-extensions.h"
 
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-background.h>
+#include <eel/eel-string.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
 #include <bonobo/bonobo-control.h>
@@ -60,7 +60,7 @@ static void inventory_load_location_callback         (NautilusView
 						      gpointer                    user_data);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusInventoryView,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusInventoryView,
 				   nautilus_inventory_view,
 				   NAUTILUS_TYPE_VIEW)
 
@@ -118,7 +118,7 @@ nautilus_inventory_view_destroy (GtkObject *object)
 	
 	g_free (view->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
@@ -160,7 +160,7 @@ inventory_load_location_callback (NautilusView *nautilus_view,
 
 	DEBUG_MSG (("%s: load_location '%s'\n", __FUNCTION__, location));
 
-	if (nautilus_istr_has_prefix (location, "eazel-inventory:enable")) {
+	if (eel_istr_has_prefix (location, "eazel-inventory:enable")) {
 		view->details->next_uri = get_finish_uri (location, "eazel:");
 
 		DEBUG_MSG (("%s: enabling, next_uri is '%s'\n", __FUNCTION__, view->details->next_uri));
@@ -169,7 +169,7 @@ inventory_load_location_callback (NautilusView *nautilus_view,
 		nautilus_view_report_load_complete (nautilus_view);
 		nautilus_inventory_enable_page_run (
 			NAUTILUS_INVENTORY_ENABLE_PAGE (view->details->enable_page));
-	} else if (nautilus_istr_has_prefix (location, "eazel-inventory:disable")) {
+	} else if (eel_istr_has_prefix (location, "eazel-inventory:disable")) {
 		view->details->next_uri = get_finish_uri (location, "eazel:");
 
 		DEBUG_MSG (("%s: disabling, next_uri is '%s'\n", __FUNCTION__, view->details->next_uri));
diff --git a/components/services/inventory/Makefile.am b/components/services/inventory/Makefile.am
index ec7f50256..c21e5d956 100644
--- a/components/services/inventory/Makefile.am
+++ b/components/services/inventory/Makefile.am
@@ -19,6 +19,8 @@ INCLUDES =								\
 	-I$(top_builddir)/components/services/trilobite/libtrilobite	\
 	-I$(top_builddir)/libnautilus-extensions	 		\
 	-I$(top_srcdir)/libnautilus-extensions	 			\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GCONF_CFLAGS) 						\
 	$(GNOME_CFLAGS) 						\
 	$(GNOME_INCLUDEDIR) 						\
@@ -49,6 +51,8 @@ trilobite_inventory_service_LDADD =								\
 	$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite-service.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la			\
 	$(top_builddir)/libnautilus/libnautilus.la						\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS)										\
 	$(AMMONITE_LIBS)									\
 	$(GHTTP_LIBS)										\
diff --git a/components/services/inventory/eazel-inventory-upload-callback.c b/components/services/inventory/eazel-inventory-upload-callback.c
index 32d099e15..734fe38f9 100644
--- a/components/services/inventory/eazel-inventory-upload-callback.c
+++ b/components/services/inventory/eazel-inventory-upload-callback.c
@@ -30,7 +30,7 @@
 
 #include <bonobo/bonobo-main.h>
 #include <gtk/gtksignal.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 
 struct EazelInventoryUploadCallbackDetails {
 	EazelInventory *inventory;
@@ -82,7 +82,7 @@ static void eazel_inventory_upload_callback_initialize       (EazelInventoryUplo
 static void eazel_inventory_upload_callback_destroy          (GtkObject                      *object);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (EazelInventoryUploadCallback,
+EEL_DEFINE_CLASS_BOILERPLATE (EazelInventoryUploadCallback,
 				   eazel_inventory_upload_callback,
 				   BONOBO_OBJECT_TYPE)
 
@@ -122,7 +122,7 @@ eazel_inventory_upload_callback_destroy (GtkObject *object)
 	callback = EAZEL_INVENTORY_UPLOAD_CALLBACK (object);
 	g_free (callback->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
diff --git a/components/services/inventory/eazel-inventory.c b/components/services/inventory/eazel-inventory.c
index 377490e24..bfc406b13 100644
--- a/components/services/inventory/eazel-inventory.c
+++ b/components/services/inventory/eazel-inventory.c
@@ -24,7 +24,7 @@
 
 #include "eazel-inventory-upload-callback.h"
 #include "eazel-inventory-service-interface.h"
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <bonobo/bonobo-object-client.h>
 
 #define EAZEL_INVENTORY_IID "OAFIID:trilobite_inventory_service:eaae1152-1551-43d5-a764-52274131a9d5"
@@ -39,7 +39,7 @@ static void eazel_inventory_initialize       (EazelInventory      *factory);
 static void eazel_inventory_destroy          (GtkObject                            *object);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (EazelInventory, eazel_inventory, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (EazelInventory, eazel_inventory, GTK_TYPE_OBJECT)
 
 static void
 eazel_inventory_initialize_class  (EazelInventoryClass *klass)
diff --git a/components/services/inventory/main.c b/components/services/inventory/main.c
index 83cad29d6..1d93276fb 100644
--- a/components/services/inventory/main.c
+++ b/components/services/inventory/main.c
@@ -28,7 +28,7 @@
 #include <libgnomeui/gnome-init.h>
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs.h>
-#include <libnautilus-extensions/nautilus-debug.h>
+#include <eel/eel-debug.h>
 #include <liboaf/liboaf.h>
 #include <bonobo.h>
 
diff --git a/components/services/login/nautilus-view/Makefile.am b/components/services/login/nautilus-view/Makefile.am
index f2a531334..c58af344c 100644
--- a/components/services/login/nautilus-view/Makefile.am
+++ b/components/services/login/nautilus-view/Makefile.am
@@ -11,6 +11,8 @@ INCLUDES =								\
         -I$(top_builddir)/components/services/trilobite/libtrilobite 	\
 	-I$(top_srcdir)/components/services/login/lib			\
 	-I$(top_builddir)						\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS)                       			\
 	$(GCONF_CFLAGS) 						\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"			\
@@ -34,6 +36,8 @@ nautilus_change_password_view_LDADD =						\
 	$(top_builddir)/components/services/nautilus-dependent-shared/libnautilusdepshared.a \
 	$(top_builddir)/libnautilus/libnautilus.la			\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS)							\
 	$(GNOMEUI_LIBS)							\
 	$(GCONF_LIBS)							\
diff --git a/components/services/login/nautilus-view/nautilus-change-password-view.c b/components/services/login/nautilus-view/nautilus-change-password-view.c
index 82a48b1bc..818540f24 100644
--- a/components/services/login/nautilus-view/nautilus-change-password-view.c
+++ b/components/services/login/nautilus-view/nautilus-change-password-view.c
@@ -34,17 +34,17 @@
 #include <gnome.h>
 #include <gnome-xml/tree.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-background.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-string.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-viewport.h>
+#include <eel/eel-string.h>
+#include <eel/eel-label.h>
+#include <eel/eel-image.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-viewport.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <libtrilobite/eazelproxy.h>
@@ -96,7 +96,7 @@ static void       change_password_button_cb                      (GtkWidget
 static void       maintenance_button_cb                (GtkWidget                  *button,
 							NautilusChangePasswordView          *view);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusChangePasswordView, nautilus_change_password_view, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusChangePasswordView, nautilus_change_password_view, GTK_TYPE_EVENT_BOX)
 
 
 static char *
@@ -142,7 +142,7 @@ generate_change_password_form (NautilusChangePasswordView	*view)
 	GtkWidget	*pane;
 	GtkWidget	*subform;
 	char		*username;
-	NautilusBackground *background;
+	EelBackground *background;
 
 	/* allocate a box to hold everything */
 	view->details->form = gtk_vbox_new (FALSE, 0);
@@ -157,14 +157,14 @@ generate_change_password_form (NautilusChangePasswordView	*view)
 	/* make an opportunistic scrollbar panel for it all */
         pane = gtk_scrolled_window_new (NULL, NULL);
         gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pane), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-	view->details->viewport = nautilus_viewport_new (NULL, NULL);
+	view->details->viewport = eel_viewport_new (NULL, NULL);
 	gtk_viewport_set_shadow_type (GTK_VIEWPORT (view->details->viewport), GTK_SHADOW_NONE);
 	gtk_container_add (GTK_CONTAINER (pane), view->details->viewport);
 	gtk_widget_show (view->details->viewport);
 	gtk_container_add (GTK_CONTAINER (view->details->form), pane);
         gtk_widget_show (pane);
-	background = nautilus_get_widget_background (GTK_WIDGET (view->details->viewport));
-	nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (GTK_WIDGET (view->details->viewport));
+	eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 
 	subform = gtk_vbox_new (FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (view->details->viewport), subform);
@@ -509,7 +509,7 @@ nautilus_change_password_view_initialize_class (NautilusChangePasswordViewClass
 static void
 nautilus_change_password_view_initialize (NautilusChangePasswordView *view)
 {
-	NautilusBackground *background;
+	EelBackground *background;
 	CORBA_Environment ev;
 
 	view->details = g_new0 (NautilusChangePasswordViewDetails, 1);
@@ -520,8 +520,8 @@ nautilus_change_password_view_initialize (NautilusChangePasswordView *view)
 			    GTK_SIGNAL_FUNC (change_password_load_location_callback), 
 			    view);
 
-	background = nautilus_get_widget_background (GTK_WIDGET (view));
-	nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (GTK_WIDGET (view));
+	eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 
 	CORBA_exception_init (&ev);
 	view->details->user_control = (EazelProxy_UserControl) oaf_activate_from_id (IID_EAZELPROXY, 0, NULL, &ev);
@@ -556,7 +556,7 @@ nautilus_change_password_view_destroy (GtkObject *object)
 
 	CORBA_exception_free (&ev);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 NautilusView *
diff --git a/components/services/login/nautilus-view/password-box.c b/components/services/login/nautilus-view/password-box.c
index e249daed1..d8af9ee27 100644
--- a/components/services/login/nautilus-view/password-box.c
+++ b/components/services/login/nautilus-view/password-box.c
@@ -28,12 +28,12 @@
 #include "eazel-services-extensions.h"
 
 #include <gnome.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-image.h>
+#include <eel/eel-background.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-label.h>
+#include <eel/eel-image.h>
 #include <stdio.h>
 #include <unistd.h>
 
@@ -78,15 +78,15 @@ static GtkWidget *
 vertical_line_new (int width)
 {
 	GtkWidget *line;
-	NautilusBackground *background;
+	EelBackground *background;
 
 	line = gtk_drawing_area_new ();
 	gtk_drawing_area_size (GTK_DRAWING_AREA (line), 1, 10);
 	gtk_signal_connect (GTK_OBJECT (line), "expose_event", GTK_SIGNAL_FUNC (line_expose), NULL);
 	gtk_widget_set_usize (line, width, -2);
 
-	background = nautilus_get_widget_background (line);
-	nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (line);
+	eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 
 	return line;
 }
@@ -109,14 +109,14 @@ make_empty_viewport (void)
 static void
 gtk_widget_set_colors (GtkWidget *widget, int foreground, int background)
 {
-	NautilusBackground *bground;
+	EelBackground *bground;
 	GtkStyle *style;
 	GdkColor *color;
 	char *spec;
 
-	bground = nautilus_get_widget_background (widget);
+	bground = eel_get_widget_background (widget);
 	spec = g_strdup_printf ("#%06X", background);
-	nautilus_background_set_color (bground, spec);
+	eel_background_set_color (bground, spec);
 	g_free (spec);
 
 	/* foreground is much harder */
@@ -182,9 +182,9 @@ change_bubble_shell_colors (GtkWidget *table, int foreground, int background)
 
 	for (iter = gtk_container_children (GTK_CONTAINER (table)); iter != NULL; iter = iter->next) {
 		widget = (GtkWidget *)(iter->data);
-		if (NAUTILUS_IS_IMAGE (widget)) {
+		if (EEL_IS_IMAGE (widget)) {
 			/* images are the little rounded corners arlo drew */
-			nautilus_image_set_solid_background_color (NAUTILUS_IMAGE (widget), background);
+			eel_image_set_solid_background_color (EEL_IMAGE (widget), background);
 		} else {
 			gtk_widget_set_colors (widget, foreground, background);
 		}
@@ -198,18 +198,18 @@ password_box_set_colors (PasswordBox *box, int foreground, int background)
 
         /* if we don't hide/show during the color change, some widgets won't draw correctly [gtk rulez] */
         gtk_widget_hide (box->table);
-	nautilus_label_set_solid_background_color (NAUTILUS_LABEL (box->label), background);
-	nautilus_label_set_solid_background_color (NAUTILUS_LABEL (box->label_right), background);
-	nautilus_label_set_text_color (NAUTILUS_LABEL (box->label), foreground);
-	nautilus_label_set_text_color (NAUTILUS_LABEL (box->label_right), foreground);
-	nautilus_image_set_solid_background_color (NAUTILUS_IMAGE (box->bong), background);
+	eel_label_set_solid_background_color (EEL_LABEL (box->label), background);
+	eel_label_set_solid_background_color (EEL_LABEL (box->label_right), background);
+	eel_label_set_text_color (EEL_LABEL (box->label), foreground);
+	eel_label_set_text_color (EEL_LABEL (box->label_right), foreground);
+	eel_image_set_solid_background_color (EEL_IMAGE (box->bong), background);
 
         /* you DON'T want to know.
          * ... doing this pokes the label enough that it'll wake up and notice its new colors.
          */
-        text = g_strdup (nautilus_label_get_text (NAUTILUS_LABEL (box->label)));
-        nautilus_label_set_text (NAUTILUS_LABEL (box->label), "-");
-        nautilus_label_set_text (NAUTILUS_LABEL (box->label), text);
+        text = g_strdup (eel_label_get_text (EEL_LABEL (box->label)));
+        eel_label_set_text (EEL_LABEL (box->label), "-");
+        eel_label_set_text (EEL_LABEL (box->label), text);
         g_free (text);
 
 	gtk_widget_set_colors (box->line, foreground, background);
@@ -227,7 +227,7 @@ password_box_get_entry (PasswordBox *box)
 void
 password_box_set_error_text (PasswordBox *box, const char *message)
 {
-	nautilus_label_set_text (NAUTILUS_LABEL (box->label_right), message);
+	eel_label_set_text (EEL_LABEL (box->label_right), message);
 }
 
 void
@@ -254,7 +254,7 @@ password_box_new (const char *title)
 					       BUBBLE_FOREGROUND_RGB,
 					       BUBBLE_BACKGROUND_RGB,
 					       NULL, 0, TRUE);
-	nautilus_label_set_text (NAUTILUS_LABEL (box->label), title);
+	eel_label_set_text (EEL_LABEL (box->label), title);
 	gtk_widget_show (box->label);
 
 	/* text entry, offset to the right a bit */
@@ -291,8 +291,8 @@ password_box_new (const char *title)
 						     BUBBLE_FOREGROUND_RGB,
 						     BUBBLE_BACKGROUND_RGB,
 						     NULL, -2, FALSE);
-	nautilus_label_set_wrap (NAUTILUS_LABEL (box->label_right), TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (box->label_right), GTK_JUSTIFY_LEFT);
+	eel_label_set_wrap (EEL_LABEL (box->label_right), TRUE);
+	eel_label_set_justify (EEL_LABEL (box->label_right), GTK_JUSTIFY_LEFT);
 	gtk_widget_show (box->label_right);
 
 	/* hbox for all the right-side alert messages */
diff --git a/components/services/nautilus-dependent-shared/Makefile.am b/components/services/nautilus-dependent-shared/Makefile.am
index 02a4e1d29..c0046d3db 100644
--- a/components/services/nautilus-dependent-shared/Makefile.am
+++ b/components/services/nautilus-dependent-shared/Makefile.am
@@ -12,6 +12,8 @@ INCLUDES = \
         -I$(top_builddir)/components/services/trilobite		\
         -I$(top_srcdir)/components/services/trilobite/lib	\
         -I$(top_builddir)/components/services/trilobite/lib	\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOME_CFLAGS)						\
 	$(GCONF_CFLAGS)						\
 	$(XML_CFLAGS)						\
@@ -35,6 +37,8 @@ test_footer_header_LDADD = \
 	$(top_builddir)/components/services/nautilus-dependent-shared/libnautilusdepshared.a \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
 	$(top_builddir)/libnautilus/libnautilus.la \
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS) \
 	$(OAF_LIBS) \
 	$(GCONF_LIBS) \
diff --git a/components/services/nautilus-dependent-shared/eazel-services-extensions.c b/components/services/nautilus-dependent-shared/eazel-services-extensions.c
index 6a183538f..938212a70 100644
--- a/components/services/nautilus-dependent-shared/eazel-services-extensions.c
+++ b/components/services/nautilus-dependent-shared/eazel-services-extensions.c
@@ -30,8 +30,8 @@
 #include <libgnome/gnome-i18n.h>
 
 #include <libnautilus-extensions/nautilus-theme.h>
-#include <libnautilus-extensions/nautilus-string.h>
-#include <libnautilus-extensions/nautilus-clickable-image.h>
+#include <eel/eel-string.h>
+#include <eel/eel-clickable-image.h>
 
 #include <time.h>
 
@@ -70,10 +70,10 @@ eazel_services_image_new (const char *icon_name,
 		tile_pixbuf = eazel_services_pixbuf_new (tile_name);
 	}
 
-	image = nautilus_image_new_solid (pixbuf, 0.5, 0.5, 0, 0, background_color, tile_pixbuf);
+	image = eel_image_new_solid (pixbuf, 0.5, 0.5, 0, 0, background_color, tile_pixbuf);
 
-	nautilus_gdk_pixbuf_unref_if_not_null (pixbuf);
-	nautilus_gdk_pixbuf_unref_if_not_null (tile_pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (tile_pixbuf);
 
 	return image;
 }
@@ -95,7 +95,7 @@ eazel_services_image_new_clickable (const char *icon_name,
 		tile_pixbuf = eazel_services_pixbuf_new (tile_name);
 	}
 
-	image = nautilus_clickable_image_new_solid (NULL,
+	image = eel_clickable_image_new_solid (NULL,
 						    pixbuf,
 						    0,
 						    0,
@@ -107,8 +107,8 @@ eazel_services_image_new_clickable (const char *icon_name,
 						    background_color,
 						    tile_pixbuf);
 
-	nautilus_gdk_pixbuf_unref_if_not_null (pixbuf);
-	nautilus_gdk_pixbuf_unref_if_not_null (tile_pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (tile_pixbuf);
 
 	return image;
 }
@@ -127,11 +127,11 @@ eazel_services_image_new_from_uri (const char *uri,
 	g_return_val_if_fail (uri != NULL, NULL);
 
 	/* load the image - synchronously, at least at first */
-	pixbuf = nautilus_gdk_pixbuf_load (uri);
+	pixbuf = eel_gdk_pixbuf_load (uri);
 	
 	/* pin the image to the specified dimensions if necessary */
 	if (pixbuf && max_width > 0 && max_height > 0) {
-		scaled_pixbuf = nautilus_gdk_pixbuf_scale_down_to_fit (pixbuf, max_width, max_height);
+		scaled_pixbuf = eel_gdk_pixbuf_scale_down_to_fit (pixbuf, max_width, max_height);
 		gdk_pixbuf_unref (pixbuf);
 		pixbuf = scaled_pixbuf;
 	}
@@ -140,10 +140,10 @@ eazel_services_image_new_from_uri (const char *uri,
 	image = eazel_services_image_new (NULL, tile_name, background_color);
 
 	if (pixbuf != NULL) {
-		nautilus_image_set_pixbuf (NAUTILUS_IMAGE (image), pixbuf);
+		eel_image_set_pixbuf (EEL_IMAGE (image), pixbuf);
 	}
 
-	nautilus_gdk_pixbuf_unref_if_not_null (pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (pixbuf);
 
 	return image;
 }
@@ -164,11 +164,11 @@ eazel_services_clickable_image_new_from_uri (const char *uri,
 	g_return_val_if_fail (uri != NULL, NULL);
 
 	/* load the image - synchronously, at least at first */
-	pixbuf = nautilus_gdk_pixbuf_load (uri);
+	pixbuf = eel_gdk_pixbuf_load (uri);
 	
 	/* pin the image to the specified dimensions if necessary */
 	if (pixbuf && max_width > 0 && max_height > 0) {
-		scaled_pixbuf = nautilus_gdk_pixbuf_scale_down_to_fit (pixbuf, max_width, max_height);
+		scaled_pixbuf = eel_gdk_pixbuf_scale_down_to_fit (pixbuf, max_width, max_height);
 		gdk_pixbuf_unref (pixbuf);
 		pixbuf = scaled_pixbuf;
 	}
@@ -177,11 +177,11 @@ eazel_services_clickable_image_new_from_uri (const char *uri,
 	image = eazel_services_image_new_clickable (NULL, tile_name, background_color);
 
 	if (pixbuf != NULL) {
-		nautilus_labeled_image_set_pixbuf (NAUTILUS_LABELED_IMAGE (image), 
+		eel_labeled_image_set_pixbuf (EEL_LABELED_IMAGE (image), 
 						   pixbuf);
 	}
 
-	nautilus_gdk_pixbuf_unref_if_not_null (pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (pixbuf);
 
 	return image;
 }
@@ -209,7 +209,7 @@ eazel_services_label_new (const char *text,
 		tile_pixbuf = eazel_services_pixbuf_new (tile_name);
 	}
 
-	label = nautilus_label_new_solid (text,
+	label = eel_label_new_solid (text,
 					  drop_shadow_offset,
 					  EAZEL_SERVICES_DROP_SHADOW_COLOR_RGB,
 					  text_color,
@@ -222,16 +222,16 @@ eazel_services_label_new (const char *text,
 
 
 	if (num_larger_sizes < 0) {
-		nautilus_label_make_smaller (NAUTILUS_LABEL (label), ABS (num_larger_sizes));
+		eel_label_make_smaller (EEL_LABEL (label), ABS (num_larger_sizes));
 	} else if (num_larger_sizes > 0) {
-		nautilus_label_make_larger (NAUTILUS_LABEL (label), num_larger_sizes);
+		eel_label_make_larger (EEL_LABEL (label), num_larger_sizes);
 	}
 
 	if (bold) {
-		nautilus_label_make_bold (NAUTILUS_LABEL (label));
+		eel_label_make_bold (EEL_LABEL (label));
 	}
 	
-	nautilus_gdk_pixbuf_unref_if_not_null (tile_pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (tile_pixbuf);
 
 	return label;
 }
@@ -256,7 +256,7 @@ eazel_services_label_new_clickable (const char *text,
 		tile_pixbuf = eazel_services_pixbuf_new (tile_name);
 	}
 
-	label = nautilus_clickable_image_new_solid (text,
+	label = eel_clickable_image_new_solid (text,
 						    NULL,
 						    drop_shadow_offset,
 						    EAZEL_SERVICES_DROP_SHADOW_COLOR_RGB,
@@ -269,16 +269,16 @@ eazel_services_label_new_clickable (const char *text,
 						    tile_pixbuf);
 
 	if (num_larger_sizes < 0) {
-		nautilus_labeled_image_make_smaller (NAUTILUS_LABELED_IMAGE (label), ABS (num_larger_sizes));
+		eel_labeled_image_make_smaller (EEL_LABELED_IMAGE (label), ABS (num_larger_sizes));
 	} else if (num_larger_sizes > 0) {
-		nautilus_labeled_image_make_larger (NAUTILUS_LABELED_IMAGE (label), num_larger_sizes);
+		eel_labeled_image_make_larger (EEL_LABELED_IMAGE (label), num_larger_sizes);
 	}
 
 	if (bold) {
-		nautilus_labeled_image_make_bold (NAUTILUS_LABELED_IMAGE (label));
+		eel_labeled_image_make_bold (EEL_LABELED_IMAGE (label));
 	}
 	
-	nautilus_gdk_pixbuf_unref_if_not_null (tile_pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (tile_pixbuf);
 
 	return label;
 }
@@ -297,5 +297,5 @@ eazel_services_get_current_date_string (void)
 
 	my_localtime = localtime (&my_time);
 
-        return nautilus_strdup_strftime (_("%A, %B %d"), my_localtime);
+        return eel_strdup_strftime (_("%A, %B %d"), my_localtime);
 }
diff --git a/components/services/nautilus-dependent-shared/eazel-services-extensions.h b/components/services/nautilus-dependent-shared/eazel-services-extensions.h
index 818133182..962d536ea 100644
--- a/components/services/nautilus-dependent-shared/eazel-services-extensions.h
+++ b/components/services/nautilus-dependent-shared/eazel-services-extensions.h
@@ -26,16 +26,16 @@
 #define EAZEL_SERVICES_EXTENSIONS_H
 
 #include <libgnome/gnome-defs.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 
 #define EAZEL_SERVICES_BACKGROUND_COLOR_SPEC		"white"
-#define EAZEL_SERVICES_BACKGROUND_COLOR_RGB		NAUTILUS_RGB_COLOR_WHITE
-#define EAZEL_SERVICES_DROP_SHADOW_COLOR_RGB		NAUTILUS_RGB_COLOR_BLACK
-#define EAZEL_SERVICES_TITLE_TEXT_COLOR_RGB		NAUTILUS_RGB_COLOR_WHITE
-#define EAZEL_SERVICES_BODY_TEXT_COLOR_RGB		NAUTILUS_RGB_COLOR_BLACK
+#define EAZEL_SERVICES_BACKGROUND_COLOR_RGB		EEL_RGB_COLOR_WHITE
+#define EAZEL_SERVICES_DROP_SHADOW_COLOR_RGB		EEL_RGB_COLOR_BLACK
+#define EAZEL_SERVICES_TITLE_TEXT_COLOR_RGB		EEL_RGB_COLOR_WHITE
+#define EAZEL_SERVICES_BODY_TEXT_COLOR_RGB		EEL_RGB_COLOR_BLACK
 
 #define EAZEL_SERVICES_HEADER_TITLE_FILL_ICON		"eazel-logo-left-side-repeat.png"
 #define EAZEL_SERVICES_HEADER_TITLE_LOGO_ICON		"eazel-logo-right-side-logo.png"
diff --git a/components/services/nautilus-dependent-shared/eazel-services-footer.c b/components/services/nautilus-dependent-shared/eazel-services-footer.c
index fb754c276..51295b7f7 100644
--- a/components/services/nautilus-dependent-shared/eazel-services-footer.c
+++ b/components/services/nautilus-dependent-shared/eazel-services-footer.c
@@ -27,11 +27,11 @@
 #include "eazel-services-footer.h"
 #include "eazel-services-extensions.h"
 
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-image.h>
+#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-theme.h>
-#include <libnautilus-extensions/nautilus-clickable-image.h>
+#include <eel/eel-clickable-image.h>
 
 #include <gtk/gtksignal.h>
 #include <gtk/gtkeventbox.h>
@@ -64,7 +64,7 @@ static void eazel_services_footer_initialize_class (EazelServicesFooterClass *kl
 static void eazel_services_footer_initialize       (EazelServicesFooter      *footer);
 static void footer_destroy                         (GtkObject                *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (EazelServicesFooter, eazel_services_footer, GTK_TYPE_HBOX)
+EEL_DEFINE_CLASS_BOILERPLATE (EazelServicesFooter, eazel_services_footer, GTK_TYPE_HBOX)
 
 /* EazelServicesFooterClass methods */
 static void
@@ -113,24 +113,24 @@ footer_destroy (GtkObject *object)
 	
 	footer = EAZEL_SERVICES_FOOTER (object);
 	
-	nautilus_gdk_pixbuf_unref_if_not_null (footer->details->item_tile);
-	nautilus_gdk_pixbuf_unref_if_not_null (footer->details->item_prelight_tile);
-	nautilus_gdk_pixbuf_unref_if_not_null (footer->details->left_bumper_tile_pixbuf);
-	nautilus_gdk_pixbuf_unref_if_not_null (footer->details->left_bumper_tile_prelight_pixbuf);
-	nautilus_gdk_pixbuf_unref_if_not_null (footer->details->right_bumper_tile_pixbuf);
-	nautilus_gdk_pixbuf_unref_if_not_null (footer->details->right_bumper_prelight_tile_pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (footer->details->item_tile);
+	eel_gdk_pixbuf_unref_if_not_null (footer->details->item_prelight_tile);
+	eel_gdk_pixbuf_unref_if_not_null (footer->details->left_bumper_tile_pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (footer->details->left_bumper_tile_prelight_pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (footer->details->right_bumper_tile_pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (footer->details->right_bumper_prelight_tile_pixbuf);
 
 	g_free (footer->details);
 
 	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
 footer_item_clicked_callback (GtkWidget *widget,
 			      gpointer callback_data)
 {
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (widget));
+	g_return_if_fail (EEL_IS_CLICKABLE_IMAGE (widget));
 	g_return_if_fail (EAZEL_SERVICES_IS_FOOTER (callback_data));
 
 	gtk_signal_emit (GTK_OBJECT (callback_data),
@@ -143,25 +143,25 @@ footer_item_enter_callback (GtkWidget *widget,
 			     gpointer callback_data)
 {
 	EazelServicesFooter *footer;
-	NautilusLabeledImage *label;
-	NautilusLabeledImage *left_bumper;
-	NautilusLabeledImage *right_bumper;
+	EelLabeledImage *label;
+	EelLabeledImage *left_bumper;
+	EelLabeledImage *right_bumper;
 
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (widget));
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (widget));
 	g_return_if_fail (EAZEL_SERVICES_IS_FOOTER (callback_data));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "left-bumper")));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (widget));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "right-bumper")));
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "left-bumper")));
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (widget));
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "right-bumper")));
 
 	footer = EAZEL_SERVICES_FOOTER (callback_data);
 
-	left_bumper = NAUTILUS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "left-bumper"));
-	label = NAUTILUS_LABELED_IMAGE (widget);
-	right_bumper = NAUTILUS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "right-bumper"));
+	left_bumper = EEL_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "left-bumper"));
+	label = EEL_LABELED_IMAGE (widget);
+	right_bumper = EEL_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "right-bumper"));
 
-	nautilus_labeled_image_set_tile_pixbuf (label, footer->details->item_prelight_tile);
-	nautilus_labeled_image_set_pixbuf (left_bumper, footer->details->left_bumper_tile_prelight_pixbuf);
-	nautilus_labeled_image_set_pixbuf (right_bumper, footer->details->right_bumper_prelight_tile_pixbuf);
+	eel_labeled_image_set_tile_pixbuf (label, footer->details->item_prelight_tile);
+	eel_labeled_image_set_pixbuf (left_bumper, footer->details->left_bumper_tile_prelight_pixbuf);
+	eel_labeled_image_set_pixbuf (right_bumper, footer->details->right_bumper_prelight_tile_pixbuf);
 }
 
 static void
@@ -169,25 +169,25 @@ footer_item_leave_callback (GtkWidget *widget,
 			     gpointer callback_data)
 {
 	EazelServicesFooter *footer;
-	NautilusLabeledImage *label;
-	NautilusLabeledImage *left_bumper;
-	NautilusLabeledImage *right_bumper;
+	EelLabeledImage *label;
+	EelLabeledImage *left_bumper;
+	EelLabeledImage *right_bumper;
 
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (widget));
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (widget));
 	g_return_if_fail (EAZEL_SERVICES_IS_FOOTER (callback_data));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "left-bumper")));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (widget));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "right-bumper")));
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "left-bumper")));
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (widget));
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "right-bumper")));
 
 	footer = EAZEL_SERVICES_FOOTER (callback_data);
 
-	left_bumper = NAUTILUS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "left-bumper"));
-	label = NAUTILUS_LABELED_IMAGE (widget);
-	right_bumper = NAUTILUS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "right-bumper"));
+	left_bumper = EEL_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "left-bumper"));
+	label = EEL_LABELED_IMAGE (widget);
+	right_bumper = EEL_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "right-bumper"));
 
-	nautilus_labeled_image_set_tile_pixbuf (label, footer->details->item_tile);
-	nautilus_labeled_image_set_pixbuf (left_bumper, footer->details->left_bumper_tile_pixbuf);
-	nautilus_labeled_image_set_pixbuf (right_bumper, footer->details->right_bumper_tile_pixbuf);
+	eel_labeled_image_set_tile_pixbuf (label, footer->details->item_tile);
+	eel_labeled_image_set_pixbuf (left_bumper, footer->details->left_bumper_tile_pixbuf);
+	eel_labeled_image_set_pixbuf (right_bumper, footer->details->right_bumper_tile_pixbuf);
 }
 
 static GtkWidget *
@@ -213,11 +213,11 @@ footer_item_new (EazelServicesFooter *footer,
 
 	if (has_left_bumper) {
 		left = eazel_services_image_new_clickable (NULL, NULL, EAZEL_SERVICES_BACKGROUND_COLOR_RGB);
-		nautilus_labeled_image_set_fill (NAUTILUS_LABELED_IMAGE (left), TRUE);
+		eel_labeled_image_set_fill (EEL_LABELED_IMAGE (left), TRUE);
 	}
 	else {
 		left = eazel_services_image_new_clickable (NULL, NULL, EAZEL_SERVICES_BACKGROUND_COLOR_RGB);
-		nautilus_labeled_image_set_fill (NAUTILUS_LABELED_IMAGE (left), TRUE);
+		eel_labeled_image_set_fill (EEL_LABELED_IMAGE (left), TRUE);
 	}
 	
 	label = eazel_services_label_new_clickable (text,
@@ -232,15 +232,15 @@ footer_item_new (EazelServicesFooter *footer,
 						    FOOTER_TEXT_SIZE,
 						    TRUE);
 	
-	nautilus_labeled_image_set_fill (NAUTILUS_LABELED_IMAGE (label), TRUE);
+	eel_labeled_image_set_fill (EEL_LABELED_IMAGE (label), TRUE);
 	
 	if (has_right_bumper) {
 		right = eazel_services_image_new_clickable (NULL, NULL, EAZEL_SERVICES_BACKGROUND_COLOR_RGB);
-		nautilus_labeled_image_set_fill (NAUTILUS_LABELED_IMAGE (right), TRUE);
+		eel_labeled_image_set_fill (EEL_LABELED_IMAGE (right), TRUE);
 	}
 	else {
 		right = eazel_services_image_new_clickable (NULL, NULL, EAZEL_SERVICES_BACKGROUND_COLOR_RGB);
-		nautilus_labeled_image_set_fill (NAUTILUS_LABELED_IMAGE (right), TRUE);
+		eel_labeled_image_set_fill (EEL_LABELED_IMAGE (right), TRUE);
 	}
 	
 
@@ -365,7 +365,7 @@ eazel_services_footer_set_date (EazelServicesFooter *footer,
 	g_return_if_fail (date != NULL);
 	g_return_if_fail (date[0] != '\0');
 
-	g_return_if_fail (NAUTILUS_IS_LABEL (footer->details->date));
+	g_return_if_fail (EEL_IS_LABEL (footer->details->date));
 
-	nautilus_label_set_text (NAUTILUS_LABEL (footer->details->date), date);
+	eel_label_set_text (EEL_LABEL (footer->details->date), date);
 }
diff --git a/components/services/nautilus-dependent-shared/eazel-services-header.c b/components/services/nautilus-dependent-shared/eazel-services-header.c
index cca3fcb14..6683296a6 100644
--- a/components/services/nautilus-dependent-shared/eazel-services-header.c
+++ b/components/services/nautilus-dependent-shared/eazel-services-header.c
@@ -27,9 +27,9 @@
 #include "eazel-services-header.h"
 #include "eazel-services-extensions.h"
 
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-image.h>
+#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-theme.h>
 
 #include <gtk/gtksignal.h>
@@ -46,7 +46,7 @@ static void eazel_services_header_initialize_class (EazelServicesHeaderClass *kl
 static void eazel_services_header_initialize       (EazelServicesHeader      *header);
 static void header_destroy                         (GtkObject                *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (EazelServicesHeader, eazel_services_header, GTK_TYPE_HBOX)
+EEL_DEFINE_CLASS_BOILERPLATE (EazelServicesHeader, eazel_services_header, GTK_TYPE_HBOX)
 
 /* EazelServicesHeaderClass methods */
 static void
@@ -79,7 +79,7 @@ header_destroy (GtkObject *object)
 	g_free (header->details);
 	
 	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* EazelServicesHeader public methods */
@@ -145,8 +145,8 @@ eazel_services_header_middle_new (const char *left_text,
 					  0,
 					  TRUE);
 
-	nautilus_label_set_tile_height (NAUTILUS_LABEL (header->details->left_text),
-					NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP);
+	eel_label_set_tile_height (EEL_LABEL (header->details->left_text),
+					EEL_SMOOTH_TILE_EXTENT_ONE_STEP);
 
 	gtk_box_pack_start (GTK_BOX (header), header->details->left_text, FALSE, FALSE, 0);
 	gtk_widget_show (header->details->left_text);
@@ -154,8 +154,8 @@ eazel_services_header_middle_new (const char *left_text,
 	fill = eazel_services_image_new (NULL,
 					 EAZEL_SERVICES_HEADER_MIDDLE_FILL_ICON,
 					 EAZEL_SERVICES_BACKGROUND_COLOR_RGB);
-	nautilus_image_set_tile_height (NAUTILUS_IMAGE (fill),
-					NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP);
+	eel_image_set_tile_height (EEL_IMAGE (fill),
+					EEL_SMOOTH_TILE_EXTENT_ONE_STEP);
 
 	gtk_box_pack_start (GTK_BOX (header), fill, TRUE, TRUE, 0);
 	gtk_widget_show (fill);
@@ -173,8 +173,8 @@ eazel_services_header_middle_new (const char *left_text,
 					  -2,
 					  TRUE);
 
-	nautilus_label_set_tile_height (NAUTILUS_LABEL (header->details->right_text),
-					NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP);
+	eel_label_set_tile_height (EEL_LABEL (header->details->right_text),
+					EEL_SMOOTH_TILE_EXTENT_ONE_STEP);
 
 	gtk_box_pack_start (GTK_BOX (header), header->details->right_text, FALSE, FALSE, 0);
 	gtk_widget_show (header->details->right_text);
@@ -188,9 +188,9 @@ eazel_services_header_set_left_text (EazelServicesHeader *header,
 {
 	g_return_if_fail (EAZEL_SERVICES_IS_HEADER (header));
 	g_return_if_fail (text != NULL);
-	g_return_if_fail (NAUTILUS_IS_LABEL (header->details->left_text));
+	g_return_if_fail (EEL_IS_LABEL (header->details->left_text));
 	
-	nautilus_label_set_text (NAUTILUS_LABEL (header->details->left_text), text);
+	eel_label_set_text (EEL_LABEL (header->details->left_text), text);
 }
 
 void
@@ -199,7 +199,7 @@ eazel_services_header_set_right_text (EazelServicesHeader *header,
 {
 	g_return_if_fail (EAZEL_SERVICES_IS_HEADER (header));
 	g_return_if_fail (text != NULL);
-	g_return_if_fail (NAUTILUS_IS_LABEL (header->details->right_text));
+	g_return_if_fail (EEL_IS_LABEL (header->details->right_text));
 	
-	nautilus_label_set_text (NAUTILUS_LABEL (header->details->right_text), text);
+	eel_label_set_text (EEL_LABEL (header->details->right_text), text);
 }
diff --git a/components/services/nautilus-dependent-shared/test-footer-header.c b/components/services/nautilus-dependent-shared/test-footer-header.c
index b9110f588..862b07b4e 100644
--- a/components/services/nautilus-dependent-shared/test-footer-header.c
+++ b/components/services/nautilus-dependent-shared/test-footer-header.c
@@ -63,7 +63,7 @@ main (int argc, char* argv[])
 	gdk_rgb_init ();
 
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	nautilus_gtk_widget_set_background_color (window, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	eel_gtk_widget_set_background_color (window, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 	gtk_signal_connect (GTK_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC (delete_event), NULL);
 	gtk_window_set_title (GTK_WINDOW (window), "Nautilus Wrapped Label Test");
 	gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, FALSE);
@@ -84,7 +84,7 @@ main (int argc, char* argv[])
 
 	eazel_services_footer_update (EAZEL_SERVICES_FOOTER (footer),
 				      footer_items,
-				      NAUTILUS_N_ELEMENTS (footer_items));
+				      EEL_N_ELEMENTS (footer_items));
 	
 	gtk_box_pack_start (GTK_BOX (vbox), header, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), content, TRUE, TRUE, 0);
diff --git a/components/services/summary/Makefile.am b/components/services/summary/Makefile.am
index 15d1567f2..0ef27224f 100644
--- a/components/services/summary/Makefile.am
+++ b/components/services/summary/Makefile.am
@@ -16,6 +16,8 @@ INCLUDES =								\
 	-I$(top_srcdir)/components/services/nautilus-dependent-shared	\
 	-I$(top_srcdir)/components/services/trilobite			\
 	-I$(top_builddir)						\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS)                       			\
 	$(GCONF_CFLAGS) 						\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"			\
@@ -52,6 +54,8 @@ nautilus_summary_view_LDADD =									\
 	$(INVENTORY_LIBS)									\
 	$(top_builddir)/libnautilus/libnautilus.la						\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la			\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS)										\
 	$(GNOMEUI_LIBS)										\
 	$(GCONF_LIBS)										\
diff --git a/components/services/summary/nautilus-summary-callbacks.c b/components/services/summary/nautilus-summary-callbacks.c
index ac0ac6114..895843415 100644
--- a/components/services/summary/nautilus-summary-callbacks.c
+++ b/components/services/summary/nautilus-summary-callbacks.c
@@ -31,7 +31,7 @@
 #include <liboaf/liboaf.h>
 #include <bonobo/bonobo-main.h>
 
-#include <libnautilus-extensions/nautilus-caption-table.h>
+#include <eel/eel-caption-table.h>
 #include <libtrilobite/eazelproxy.h>
 #include <libtrilobite/libammonite.h>
 #include <libtrilobite/trilobite-redirect.h>
@@ -163,8 +163,8 @@ login_button_cb (GtkWidget      *button, NautilusSummaryView    *view)
 	if (CORBA_OBJECT_NIL != view->details->user_control) {
 		view->details->authn_callback = ammonite_auth_callback_wrapper_new (bonobo_poa(), &cb_funcs, view);
 
-		user_name = nautilus_caption_table_get_entry_text (NAUTILUS_CAPTION_TABLE (view->details->caption_table), 0);
-		password = nautilus_caption_table_get_entry_text (NAUTILUS_CAPTION_TABLE (view->details->caption_table), 1);
+		user_name = eel_caption_table_get_entry_text (EEL_CAPTION_TABLE (view->details->caption_table), 0);
+		password = eel_caption_table_get_entry_text (EEL_CAPTION_TABLE (view->details->caption_table), 1);
 
 		authinfo = EazelProxy_AuthnInfo__alloc ();
 		authinfo->username = CORBA_string_dup (user_name);
diff --git a/components/services/summary/nautilus-summary-dialogs.c b/components/services/summary/nautilus-summary-dialogs.c
index 4d96cd6f7..d751f5c97 100644
--- a/components/services/summary/nautilus-summary-dialogs.c
+++ b/components/services/summary/nautilus-summary-dialogs.c
@@ -23,13 +23,13 @@
 
 #include <config.h>
 
-#include <libnautilus-extensions/nautilus-caption-table.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-string.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
+#include <eel/eel-caption-table.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-background.h>
+#include <eel/eel-string.h>
+#include <eel/eel-gnome-extensions.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-image.h>
+#include <eel/eel-image.h>
 
 #include <libgnomeui/gnome-stock.h>
 #include <stdio.h>
@@ -65,7 +65,7 @@ void
 nautilus_summary_show_login_failure_dialog (NautilusSummaryView *view, 
 					    const char *message)
 {
-	nautilus_show_error_dialog (message, 
+	eel_show_error_dialog (message, 
 			            _("Eazel Service Login Error"), 
 				    get_window_from_summary_view (view));
 }
@@ -76,7 +76,7 @@ nautilus_summary_show_error_dialog (NautilusSummaryView *view,
 {
 	GnomeDialog	*dialog;
 
-	dialog = nautilus_show_error_dialog (message, 
+	dialog = eel_show_error_dialog (message, 
 				             _("Service Error"), 
 				             get_window_from_summary_view (view));
 	gtk_signal_connect (GTK_OBJECT (dialog),
@@ -123,17 +123,17 @@ nautilus_summary_show_login_dialog (NautilusSummaryView *view)
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), GNOME_PAD);
 	gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, FALSE, FALSE);
 
-	view->details->caption_table = nautilus_caption_table_new (LOGIN_DIALOG_ROW_COUNT);
+	view->details->caption_table = eel_caption_table_new (LOGIN_DIALOG_ROW_COUNT);
 	gtk_widget_show (view->details->caption_table);
 
-	nautilus_caption_table_set_row_info (NAUTILUS_CAPTION_TABLE (view->details->caption_table),
+	eel_caption_table_set_row_info (EEL_CAPTION_TABLE (view->details->caption_table),
 					     LOGIN_DIALOG_NAME_ROW,
 					     _("Username:"),
 					     "",
 					     TRUE,
 					     FALSE);
 
-	nautilus_caption_table_set_row_info (NAUTILUS_CAPTION_TABLE (view->details->caption_table),
+	eel_caption_table_set_row_info (EEL_CAPTION_TABLE (view->details->caption_table),
 					     LOGIN_DIALOG_PASSWORD_ROW,
 					     _("Password:"),
 					     "",
@@ -157,7 +157,7 @@ nautilus_summary_show_login_dialog (NautilusSummaryView *view)
 	}
 
 	image = eazel_services_image_new (image_name, NULL, 0);
-	nautilus_image_set_background_mode (NAUTILUS_IMAGE (image), NAUTILUS_SMOOTH_BACKGROUND_GTK);
+	eel_image_set_background_mode (EEL_IMAGE (image), EEL_SMOOTH_BACKGROUND_GTK);
 
 	hbox = gtk_hbox_new (FALSE, 5);
 	gtk_widget_show (hbox);
@@ -172,7 +172,7 @@ nautilus_summary_show_login_dialog (NautilusSummaryView *view)
 	message = gtk_label_new (message_text);
 	gtk_label_set_justify (GTK_LABEL (message), GTK_JUSTIFY_LEFT);
 	gtk_label_set_line_wrap (GTK_LABEL (message), TRUE);
-	nautilus_gtk_label_make_bold (GTK_LABEL (message));
+	eel_gtk_label_make_bold (GTK_LABEL (message));
 	gtk_widget_show (message);
 
 	/* right justify the caption table box */
@@ -194,8 +194,8 @@ nautilus_summary_show_login_dialog (NautilusSummaryView *view)
 	gnome_dialog_set_default (dialog, LOGIN_DIALOG_OK_BUTTON_INDEX);
 	gtk_signal_connect (GTK_OBJECT (view->details->caption_table), "activate",
 			    name_or_password_field_activated, 
-			    nautilus_gnome_dialog_get_button_by_index (dialog, LOGIN_DIALOG_OK_BUTTON_INDEX));
-	nautilus_caption_table_entry_grab_focus	(NAUTILUS_CAPTION_TABLE (view->details->caption_table), LOGIN_DIALOG_NAME_ROW);
+			    eel_gnome_dialog_get_button_by_index (dialog, LOGIN_DIALOG_OK_BUTTON_INDEX));
+	eel_caption_table_entry_grab_focus	(EEL_CAPTION_TABLE (view->details->caption_table), LOGIN_DIALOG_NAME_ROW);
 
 	if (view->details->attempt_number == 0) {
 		gnome_dialog_button_connect (dialog, LOGIN_DIALOG_REGISTER_BUTTON_INDEX, GTK_SIGNAL_FUNC (register_button_cb), view);
@@ -210,17 +210,17 @@ nautilus_summary_show_login_dialog (NautilusSummaryView *view)
 }
 
 void
-widget_set_nautilus_background_color (GtkWidget *widget, const char *color)
+widget_set_eel_background_color (GtkWidget *widget, const char *color)
 {
-	NautilusBackground      *background;
+	EelBackground      *background;
 
 	g_return_if_fail (GTK_IS_WIDGET (widget));
 	g_return_if_fail (color != NULL);
 
-	background = nautilus_get_widget_background (widget);
+	background = eel_get_widget_background (widget);
 
-	nautilus_background_reset (background);
-	nautilus_background_set_color (background, color);
+	eel_background_reset (background);
+	eel_background_set_color (background, color);
 
 }
 
@@ -290,12 +290,12 @@ set_dialog_parent (NautilusSummaryView *view, GnomeDialog *dialog)
 static void
 name_or_password_field_activated (GtkWidget *caption_table, int active_entry, gpointer user_data)
 {
-	g_assert (NAUTILUS_IS_CAPTION_TABLE (caption_table));
+	g_assert (EEL_IS_CAPTION_TABLE (caption_table));
 	g_assert (GTK_IS_BUTTON (user_data));
 
 	/* auto-click "OK" button when password activated (via Enter key) */
 	if (active_entry == LOGIN_DIALOG_OK_BUTTON_INDEX) {
-		nautilus_gtk_button_auto_click (GTK_BUTTON (user_data));
+		eel_gtk_button_auto_click (GTK_BUTTON (user_data));
 	}
 }
 
diff --git a/components/services/summary/nautilus-summary-dialogs.h b/components/services/summary/nautilus-summary-dialogs.h
index 44dfa48c2..7987c289d 100644
--- a/components/services/summary/nautilus-summary-dialogs.h
+++ b/components/services/summary/nautilus-summary-dialogs.h
@@ -29,7 +29,7 @@ void	nautilus_summary_show_login_failure_dialog (NautilusSummaryView *view,
 void	nautilus_summary_show_error_dialog         (NautilusSummaryView	*view,
 						    const char		*message);
 void	nautilus_summary_show_login_dialog         (NautilusSummaryView	*view);
-void	widget_set_nautilus_background_color	   (GtkWidget		*widget,
+void	widget_set_eel_background_color	   (GtkWidget		*widget,
 						    const char		*color);
 
 #endif /* NAUTILUS_SUMMARY_DIALOGS_H */
diff --git a/components/services/summary/nautilus-summary-footer.c b/components/services/summary/nautilus-summary-footer.c
index 98bfc1ca5..efd11b9f5 100644
--- a/components/services/summary/nautilus-summary-footer.c
+++ b/components/services/summary/nautilus-summary-footer.c
@@ -26,19 +26,19 @@
 #include <bonobo/bonobo-control.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
-#include <libnautilus-extensions/nautilus-caption-table.h>
+#include <eel/eel-caption-table.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-font-factory.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-tabs.h>
 
 #include <libgnomeui/gnome-stock.h>
diff --git a/components/services/summary/nautilus-summary-menu-items.c b/components/services/summary/nautilus-summary-menu-items.c
index 3137e59a9..53436497b 100644
--- a/components/services/summary/nautilus-summary-menu-items.c
+++ b/components/services/summary/nautilus-summary-menu-items.c
@@ -27,19 +27,19 @@
 #include <bonobo/bonobo-control.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
-#include <libnautilus-extensions/nautilus-caption-table.h>
+#include <eel/eel-caption-table.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-font-factory.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-tabs.h>
 
 #include <libgnomeui/gnome-stock.h>
diff --git a/components/services/summary/nautilus-summary-view-private.h b/components/services/summary/nautilus-summary-view-private.h
index 7e42014bd..f1ca7dfa4 100644
--- a/components/services/summary/nautilus-summary-view-private.h
+++ b/components/services/summary/nautilus-summary-view-private.h
@@ -30,8 +30,8 @@
 #include <gnome.h>
 
 #define DEFAULT_SUMMARY_BACKGROUND_COLOR_SPEC	"rgb:FFFF/FFFF/FFFF"
-#define DEFAULT_SUMMARY_BACKGROUND_COLOR_RGB	NAUTILUS_RGB_COLOR_WHITE
-#define DEFAULT_SUMMARY_TEXT_COLOR_RGB		NAUTILUS_RGB_COLOR_BLACK
+#define DEFAULT_SUMMARY_BACKGROUND_COLOR_RGB	EEL_RGB_COLOR_WHITE
+#define DEFAULT_SUMMARY_TEXT_COLOR_RGB		EEL_RGB_COLOR_BLACK
 
 #define URL_REDIRECT_TABLE_HOME			"eazel-services://anonymous/services/urls"
 #define URL_REDIRECT_TABLE_HOME_2		"eazel-services:/services/urls"
diff --git a/components/services/summary/nautilus-summary-view.c b/components/services/summary/nautilus-summary-view.c
index 0041f0989..706d77c79 100644
--- a/components/services/summary/nautilus-summary-view.c
+++ b/components/services/summary/nautilus-summary-view.c
@@ -42,21 +42,21 @@
 #include "../inventory/eazel-inventory.h"
 #endif
 
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
-#include <libnautilus-extensions/nautilus-clickable-image.h>
+#include <eel/eel-clickable-image.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-label.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-tabs.h>
-#include <libnautilus-extensions/nautilus-viewport.h>
+#include <eel/eel-viewport.h>
 
 #include <liboaf/liboaf.h>
 #include <libtrilobite/trilobite-redirect.h>
@@ -111,7 +111,7 @@ static void     summary_view_button_callback           (GtkWidget
 static void     cancel_load_in_progress                (NautilusSummaryView *view);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSummaryView, nautilus_summary_view, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusSummaryView, nautilus_summary_view, GTK_TYPE_EVENT_BOX)
 
 
 static const char goto_button_label[] = N_("Go There");
@@ -190,10 +190,10 @@ update_footer (NautilusSummaryView *view)
 	int size;
 
 	if (view->details->logged_in) {	
-		size = NAUTILUS_N_ELEMENTS (footer_online_items);
+		size = EEL_N_ELEMENTS (footer_online_items);
 		localized_items = localize_items (footer_online_items, size);
 	} else {
-		size = NAUTILUS_N_ELEMENTS (footer_offline_items);
+		size = EEL_N_ELEMENTS (footer_offline_items);
 		localized_items = localize_items (footer_offline_items, size);
 	}
 	
@@ -229,9 +229,9 @@ summary_view_button_callback (GtkWidget                  *button,
 {
 	const char *command;
 
-	if (nautilus_istr_has_prefix (cbdata->uri, NAUTILUS_COMMAND_SPECIFIER)) {
+	if (eel_istr_has_prefix (cbdata->uri, NAUTILUS_COMMAND_SPECIFIER)) {
 		command = cbdata->uri + strlen (NAUTILUS_COMMAND_SPECIFIER);
-		nautilus_gnome_shell_execute (command);
+		eel_gnome_shell_execute (command);
 	} else {
 		nautilus_view_open_location_in_this_window (cbdata->view, cbdata->uri);
 	}
@@ -286,7 +286,7 @@ summary_view_link_image_new (NautilusSummaryView *view,
 							     NULL,
 							     DEFAULT_SUMMARY_BACKGROUND_COLOR_RGB,
 							     MAX_IMAGE_WIDTH, MAX_IMAGE_HEIGHT);
-	nautilus_clickable_image_set_prelight (NAUTILUS_CLICKABLE_IMAGE (image), TRUE);
+	eel_clickable_image_set_prelight (EEL_CLICKABLE_IMAGE (image), TRUE);
 
 	goto_uri_on_clicked (image, view->details->nautilus_view, click_uri);
 	
@@ -308,10 +308,10 @@ summary_view_item_label_new (char *label_text,
 					  NULL,
 					  relative_font_size,
 					  bold);
-	nautilus_label_set_wrap (NAUTILUS_LABEL (label), TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (label), GTK_JUSTIFY_LEFT);
+	eel_label_set_wrap (EEL_LABEL (label), TRUE);
+	eel_label_set_justify (EEL_LABEL (label), GTK_JUSTIFY_LEFT);
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
-	nautilus_label_set_adjust_wrap_on_resize (NAUTILUS_LABEL (label), TRUE);
+	eel_label_set_adjust_wrap_on_resize (EEL_LABEL (label), TRUE);
 
 	return label;
 }
@@ -453,9 +453,9 @@ summary_view_create_pane (NautilusSummaryView *view,
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pane),
 			                GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 	
-	viewport = nautilus_viewport_new (NULL, NULL);
-	nautilus_viewport_set_constrain_width (NAUTILUS_VIEWPORT (viewport), TRUE);
-	widget_set_nautilus_background_color (viewport, DEFAULT_SUMMARY_BACKGROUND_COLOR_SPEC);
+	viewport = eel_viewport_new (NULL, NULL);
+	eel_viewport_set_constrain_width (EEL_VIEWPORT (viewport), TRUE);
+	widget_set_eel_background_color (viewport, DEFAULT_SUMMARY_BACKGROUND_COLOR_SPEC);
 
 	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
 	gtk_widget_show (viewport);
@@ -493,7 +493,7 @@ create_news_pane (NautilusSummaryView *view)
 static gboolean
 program_uri_for_nonexistent_program (const char *uri)
 {
-	return nautilus_istr_has_prefix (uri, NAUTILUS_COMMAND_SPECIFIER) &&
+	return eel_istr_has_prefix (uri, NAUTILUS_COMMAND_SPECIFIER) &&
 		!gnome_is_program_in_path (uri + strlen (NAUTILUS_COMMAND_SPECIFIER));
 }
 
@@ -855,7 +855,7 @@ nautilus_summary_view_destroy (GtkObject *object)
 
 	g_free (view->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 
 	CORBA_exception_free (&ev);
 
diff --git a/components/services/time/nautilus-view/main.c b/components/services/time/nautilus-view/main.c
index 0e763cab1..f473da57a 100644
--- a/components/services/time/nautilus-view/main.c
+++ b/components/services/time/nautilus-view/main.c
@@ -30,7 +30,7 @@
 
 #include <gnome.h>
 #include <liboaf/liboaf.h>
-#include <libnautilus-extensions/nautilus-debug.h>
+#include <eel/eel-debug.h>
 #include <bonobo.h>
 
 static int object_count = 0;
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
            Unfortunately, this has to be done explicitly for each domain.
         */
         if (getenv("NAUTILUS_DEBUG") != NULL)
-        	nautilus_make_warnings_and_criticals_stop_in_debugger
+        	eel_make_warnings_and_criticals_stop_in_debugger
         		(G_LOG_DOMAIN, g_log_domain_glib, "Gdk", "Gtk", "GnomeVFS", NULL);
 
 
diff --git a/components/services/time/nautilus-view/trilobite-eazel-time-view.c b/components/services/time/nautilus-view/trilobite-eazel-time-view.c
index 8b0bc1ba6..be2e11fcd 100644
--- a/components/services/time/nautilus-view/trilobite-eazel-time-view.c
+++ b/components/services/time/nautilus-view/trilobite-eazel-time-view.c
@@ -38,8 +38,8 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-stock.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-password-dialog.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-password-dialog.h>
 
 #include <libtrilobite/libtrilobite.h>
 
@@ -81,7 +81,7 @@ static void load_location_callback                     (NautilusView
 							TrilobiteEazelTimeView      *view);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (TrilobiteEazelTimeView, trilobite_eazel_time_view, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (TrilobiteEazelTimeView, trilobite_eazel_time_view, GTK_TYPE_EVENT_BOX)
    
 static void
 set_status_text (TrilobiteEazelTimeView *view, const char *status_str)
@@ -250,15 +250,15 @@ trilobite_eazel_time_view_get_password (GtkObject *object, const char *prompt, v
 		message = "Incorrect password.";
 	}
 
-	dialog = nautilus_password_dialog_new ("Authenticate Me", message, prompt, "", TRUE);
-	okay = nautilus_password_dialog_run_and_block (NAUTILUS_PASSWORD_DIALOG (dialog));
+	dialog = eel_password_dialog_new ("Authenticate Me", message, prompt, "", TRUE);
+	okay = eel_password_dialog_run_and_block (EEL_PASSWORD_DIALOG (dialog));
 
 	if (! okay) {
 		view->details->password_attempts = 0;
 		tmp = g_strdup ("");
 	} else {
-		tmp =  nautilus_password_dialog_get_password (NAUTILUS_PASSWORD_DIALOG (dialog));
-		if (nautilus_password_dialog_get_remember (NAUTILUS_PASSWORD_DIALOG (dialog))) {
+		tmp =  eel_password_dialog_get_password (EEL_PASSWORD_DIALOG (dialog));
+		if (eel_password_dialog_get_remember (EEL_PASSWORD_DIALOG (dialog))) {
 			view->details->remembered_password = g_strdup (tmp);
 		}
 	}
@@ -438,7 +438,7 @@ trilobite_eazel_time_view_destroy (GtkObject *object)
 
 	g_free (view->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 
 	CORBA_exception_free (&ev);
 
diff --git a/components/services/trilobite/sample/nautilus-view/Makefile.am b/components/services/trilobite/sample/nautilus-view/Makefile.am
index f121df1bd..421650d57 100644
--- a/components/services/trilobite/sample/nautilus-view/Makefile.am
+++ b/components/services/trilobite/sample/nautilus-view/Makefile.am
@@ -9,6 +9,8 @@ INCLUDES =								\
 	-I$(top_srcdir)/components/services/trilobite/libtrilobite	\
 	-I$(top_srcdir)/components/services/trilobite/sample/lib	\
 	-I$(top_builddir)						\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS)                       			\
 	$(GCONF_CFLAGS) 						\
 	$(NULL)
@@ -27,6 +29,8 @@ nautilus_sample_service_view_LDADD =				\
 	$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS)					\
 	$(GNOMEUI_LIBS)					\
 	$(GCONF_LIBS)					\
diff --git a/components/text/Makefile.am b/components/text/Makefile.am
index 1cca0503e..f4cc53f8b 100644
--- a/components/text/Makefile.am
+++ b/components/text/Makefile.am
@@ -10,6 +10,8 @@ INCLUDES =					\
 	-I$(top_builddir)			\
 	-I$(top_builddir)/libnautilus		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS)                       \
 	$(GCONF_CFLAGS) 			\
 	$(OAF_CFLAGS)				\
@@ -27,6 +29,8 @@ nautilus_text_view_SOURCES =		        \
 nautilus_text_view_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS)					\
 	$(GNOMEUI_LIBS)					\
 	$(GCONF_LIBS) 					\
diff --git a/components/text/nautilus-text-view.c b/components/text/nautilus-text-view.c
index b00b6a2c7..df9024c6a 100644
--- a/components/text/nautilus-text-view.c
+++ b/components/text/nautilus-text-view.c
@@ -34,19 +34,19 @@
 
 #include <libnautilus/libnautilus.h>
 #include <libnautilus/nautilus-clipboard.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-font-factory.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-xml-extensions.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-xml-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
 
 #include <gnome.h>
@@ -118,7 +118,7 @@ static void nautilus_text_view_load_uri         (NautilusTextView      *view,
 						 const char            *uri);
 static void font_changed_callback               (gpointer               callback_data);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTextView,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTextView,
                                    nautilus_text_view,
                                    NAUTILUS_TYPE_VIEW)
 
@@ -174,7 +174,7 @@ nautilus_text_view_initialize (NautilusTextView *text_view)
 	bonobo_zoomable_set_parameters_full (text_view->details->zoomable,
 					     1.0, .25, 4.0, TRUE, TRUE, FALSE,
 					     text_view_preferred_zoom_levels, NULL,
-					     NAUTILUS_N_ELEMENTS (text_view_preferred_zoom_levels));
+					     EEL_N_ELEMENTS (text_view_preferred_zoom_levels));
 	
 	bonobo_object_add_interface (BONOBO_OBJECT (text_view),
 				     BONOBO_OBJECT (text_view->details->zoomable));
@@ -261,7 +261,7 @@ nautilus_text_view_destroy (GtkObject *object)
 
 	g_free (text_view->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* here's a callback for the async close, which does nothing */
@@ -334,7 +334,7 @@ file_read_callback (GnomeVFSAsyncHandle *vfs_handle,
                         message = g_strdup_printf (_("Sorry, but %s is too large for Nautilus to load all of it."),
                                                    name);
                         
-			nautilus_show_error_dialog (message, _("File too large"), NULL);
+			eel_show_error_dialog (message, _("File too large"), NULL);
                         
 			g_free (name);
 			g_free (message);
@@ -443,7 +443,7 @@ nautilus_text_view_update_font (NautilusTextView *text_view)
 
 	g_return_if_fail (font != NULL);
 	
-	nautilus_gtk_widget_set_font (text_view->details->text_display, font);
+	eel_gtk_widget_set_font (text_view->details->text_display, font);
 	gdk_font_unref (font);
 
 	gtk_editable_changed (GTK_EDITABLE (text_view->details->text_display));
@@ -458,7 +458,7 @@ handle_ui_event (BonoboUIComponent *ui,
 		 NautilusTextView *view)
 {
 	if (type == Bonobo_UIComponent_STATE_CHANGED
-            && nautilus_str_is_equal (state, "1")) {
+            && eel_str_is_equal (state, "1")) {
                 nautilus_preferences_set (NAUTILUS_PREFERENCES_TEXT_VIEW_FONT, id);
 	}
 }
@@ -485,7 +485,7 @@ handle_service_menu_item (BonoboUIComponent *ui, gpointer user_data, const char
 	parameters = (ServiceMenuItemParameters *) user_data;
 	
 	/* determine if we should operate on the whole document or just the selection */
-	if (nautilus_strcmp (parameters->source_mode, "document") == 0) {
+	if (eel_strcmp (parameters->source_mode, "document") == 0) {
 		selected_text = gtk_editable_get_chars (GTK_EDITABLE (parameters->text_view->details->text_display), 0, -1);
 		if (selected_text && strlen (selected_text) > 0) {
 			/* formulate the url */
@@ -576,18 +576,18 @@ add_one_service (NautilusTextView *text_view, BonoboControl *control, const char
 		service_node = xmlDocGetRootElement (service_definition);
 	
 		/* extract the label and template */
-		label = nautilus_xml_get_property_translated (service_node, "label");	
-		tooltip = nautilus_xml_get_property_translated (service_node, "tooltip");	
+		label = eel_xml_get_property_translated (service_node, "label");	
+		tooltip = eel_xml_get_property_translated (service_node, "tooltip");	
 		template = xmlGetProp (service_node, "template");
 		source_mode = xmlGetProp (service_node, "source");
 		
 		if (label != NULL && template != NULL) {
 			/* allocate a structure containing the text_view and template to pass in as the user data */
-			escaped_label = nautilus_str_double_underscores (label);
+			escaped_label = eel_str_double_underscores (label);
 			parameters = service_menu_item_parameters_new (text_view, template, source_mode);
 		
 			text_view->details->service_item_uses_selection[*index] = 
-				nautilus_strcmp (source_mode, "document") != 0;
+				eel_strcmp (source_mode, "document") != 0;
 			
 			/* use bonobo to add the menu item */
 			nautilus_bonobo_add_numbered_menu_item 
@@ -615,7 +615,7 @@ add_one_service (NautilusTextView *text_view, BonoboControl *control, const char
 			
 			/* initially disable the item unless it's document-based; it will be enabled if there's a selection */
 			verb_path = g_strdup_printf ("/commands/%s", verb_name);
-			if (nautilus_strcmp (source_mode, "document") != 0) {
+			if (eel_strcmp (source_mode, "document") != 0) {
 				nautilus_bonobo_set_sensitive (ui, verb_path, FALSE);
 			}
 			g_free (verb_name);	
@@ -664,7 +664,7 @@ add_services_to_menu (NautilusTextView *text_view,
 			break;
 		}
 		
-		if (nautilus_istr_has_suffix (current_file_info->name, ".xml")) {		
+		if (eel_istr_has_suffix (current_file_info->name, ".xml")) {		
 			if (g_list_find_custom (added_services, current_file_info->name,
 						(GCompareFunc) strcmp) == NULL) {
 				service_xml_path = nautilus_make_path (services_directory, current_file_info->name);
@@ -712,7 +712,7 @@ nautilus_text_view_build_service_menu (NautilusTextView *text_view, BonoboContro
 	g_free (user_directory);
 	
 	text_view->details->service_item_count = index;	
-	nautilus_g_list_free_deep (added_services);
+	eel_g_list_free_deep (added_services);
 }
 
 /* handle updating the service menu items according to the selection state of the text display */
diff --git a/components/throbber/Makefile.am b/components/throbber/Makefile.am
index 2da02b698..70587395c 100644
--- a/components/throbber/Makefile.am
+++ b/components/throbber/Makefile.am
@@ -10,6 +10,8 @@ INCLUDES =					\
 	-I$(top_builddir)			\
 	-I$(top_builddir)/libnautilus		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS)                       \
 	$(GCONF_CFLAGS) 			\
 	$(OAF_CFLAGS)				\
@@ -27,6 +29,8 @@ nautilus_throbber_SOURCES =		        \
 nautilus_throbber_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS)					\
 	$(GNOMEUI_LIBS)					\
 	$(GCONF_LIBS) 					\
diff --git a/components/throbber/main.c b/components/throbber/main.c
index 6ed4b37b4..fba42d93f 100644
--- a/components/throbber/main.c
+++ b/components/throbber/main.c
@@ -28,7 +28,7 @@
 #include <bonobo.h>
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs.h>
-#include <libnautilus-extensions/nautilus-debug.h>
+#include <eel/eel-debug.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
 #include <liboaf/liboaf.h>
 
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
 	 * explicitly for each domain.
 	 */
 	if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
-		nautilus_make_warnings_and_criticals_stop_in_debugger
+		eel_make_warnings_and_criticals_stop_in_debugger
 			(G_LOG_DOMAIN, g_log_domain_glib,
 			 "Bonobo",
 			 "Gdk",
diff --git a/components/throbber/nautilus-throbber.c b/components/throbber/nautilus-throbber.c
index abf494526..f86d7513e 100644
--- a/components/throbber/nautilus-throbber.c
+++ b/components/throbber/nautilus-throbber.c
@@ -36,10 +36,10 @@
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-pixmap.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
 #include <libnautilus-extensions/nautilus-theme.h>
 #include <libnautilus/nautilus-bonobo-workarounds.h>
@@ -82,7 +82,7 @@ static void	nautilus_throbber_size_allocate		 (GtkWidget *widget, GtkAllocation
 static void	nautilus_throbber_size_request		 (GtkWidget *widget, GtkRequisition *requisition);
 static void     nautilus_throbber_remove_update_callback (NautilusThrobber *throbber);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusThrobber, nautilus_throbber, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusThrobber, nautilus_throbber, GTK_TYPE_EVENT_BOX)
 
 static void
 nautilus_throbber_initialize_class (NautilusThrobberClass *throbber_class)
@@ -201,7 +201,7 @@ nautilus_throbber_destroy (GtkObject *object)
 	
 	g_free (throbber->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 BonoboObject*
@@ -430,7 +430,7 @@ nautilus_throbber_map (GtkWidget *widget)
 	
 	throbber = NAUTILUS_THROBBER (widget);
 	
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, map, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, map, (widget));
 	throbber->details->ready = TRUE;
 }
 
@@ -638,7 +638,7 @@ nautilus_throbber_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 	int throbber_width, throbber_height;
 	NautilusThrobber *throbber = NAUTILUS_THROBBER (widget);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
 
 	get_throbber_dimensions (throbber, &throbber_width, &throbber_height);
 	
diff --git a/components/tree/Makefile.am b/components/tree/Makefile.am
index ead973cf7..f8d4712e7 100644
--- a/components/tree/Makefile.am
+++ b/components/tree/Makefile.am
@@ -6,6 +6,8 @@ INCLUDES =						\
 	-DG_LOG_DOMAIN=\"Nautilus-Tree\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(VFS_CFLAGS)					\
 	$(GCONF_CFLAGS)					\
 	$(GNOMEUI_CFLAGS)				\
diff --git a/components/tree/nautilus-tree-change-queue.c b/components/tree/nautilus-tree-change-queue.c
index ba0e810ec..9c7cc7d93 100644
--- a/components/tree/nautilus-tree-change-queue.c
+++ b/components/tree/nautilus-tree-change-queue.c
@@ -25,8 +25,8 @@
    them to an idle handler. */
 
 #include "nautilus-tree-change-queue.h"
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
 
 struct NautilusTreeChangeQueueDetails {
 	GSList *head;
@@ -39,7 +39,7 @@ static void nautilus_tree_change_queue_initialize       (gpointer     object,
 							 gpointer     klass);
 static void nautilus_tree_change_queue_initialize_class (gpointer     klass);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTreeChangeQueue, nautilus_tree_change_queue, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeChangeQueue, nautilus_tree_change_queue, GTK_TYPE_OBJECT)
 
 
 static NautilusTreeChange *nautilus_tree_change_new     (NautilusTreeChangeType  change_type,
@@ -76,12 +76,12 @@ nautilus_tree_change_queue_destroy (GtkObject *object)
 	NautilusTreeChangeQueue *queue;
 	
 	queue = (NautilusTreeChangeQueue *) object;
-        nautilus_g_slist_free_deep_custom (queue->details->head,
+        eel_g_slist_free_deep_custom (queue->details->head,
 					   (GFunc) nautilus_tree_change_free,
 					   NULL);
 	g_free (queue->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
diff --git a/components/tree/nautilus-tree-expansion-state.c b/components/tree/nautilus-tree-expansion-state.c
index 065d45bf1..80e3097af 100644
--- a/components/tree/nautilus-tree-expansion-state.c
+++ b/components/tree/nautilus-tree-expansion-state.c
@@ -26,8 +26,8 @@
 #include <config.h>
 #include "nautilus-tree-expansion-state.h"
 
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-preferences.h>
 
 
@@ -44,7 +44,7 @@ static void               nautilus_tree_expansion_state_initialize       (gpoint
 									  gpointer     klass);
 static void               nautilus_tree_expansion_state_initialize_class (gpointer     klass);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTreeExpansionState, nautilus_tree_expansion_state, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeExpansionState, nautilus_tree_expansion_state, GTK_TYPE_OBJECT)
 
 
 static gboolean	          expansion_table_hash_remove_func               (gpointer key,
@@ -87,7 +87,7 @@ nautilus_tree_expansion_state_load_table_from_gconf (NautilusTreeExpansionState
 
 	uris = nautilus_preferences_get_string_list (NAUTILUS_PREFERENCES_TREE_VIEW_EXPANSION_STATE);
 	g_list_foreach (uris, expansion_state_load_callback, expansion_state);
-	nautilus_g_list_free_deep (uris);
+	eel_g_list_free_deep (uris);
 }
 
 
@@ -120,7 +120,7 @@ nautilus_tree_expansion_state_save_table_to_gconf (NautilusTreeExpansionState *e
 	GList *uris;
 
 	uris = hash_table_get_keys (expansion_state->details->table);
-	uris = nautilus_g_str_list_alphabetize (uris);
+	uris = eel_g_str_list_alphabetize (uris);
 	nautilus_preferences_set_string_list (NAUTILUS_PREFERENCES_TREE_VIEW_EXPANSION_STATE, uris);
 	g_list_free (uris);
 }
@@ -160,7 +160,7 @@ nautilus_tree_expansion_state_destroy (GtkObject *object)
 
 	g_free (expansion_state->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
diff --git a/components/tree/nautilus-tree-model.c b/components/tree/nautilus-tree-model.c
index f4c2da35d..685a89a5a 100644
--- a/components/tree/nautilus-tree-model.c
+++ b/components/tree/nautilus-tree-model.c
@@ -30,8 +30,8 @@
 #include <gtk/gtksignal.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libnautilus-extensions/nautilus-file-attributes.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -92,7 +92,7 @@ static void nautilus_tree_model_directory_done_loading_callback  (NautilusDirect
 								  NautilusTreeModel *model);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTreeModel, nautilus_tree_model, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeModel, nautilus_tree_model, GTK_TYPE_OBJECT)
 
 /* infrastructure stuff */
 
@@ -159,7 +159,7 @@ destroy_file_hash (GHashTable *hash)
 	if (hash == NULL) {
 		return;
 	}
-	nautilus_g_hash_table_destroy_deep_custom
+	eel_g_hash_table_destroy_deep_custom
 		(hash,
 		 (GFunc) nautilus_file_unref, NULL,
 		 NULL, NULL);
@@ -189,7 +189,7 @@ nautilus_tree_model_destroy (GtkObject *object)
 
 	g_free (model->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
diff --git a/components/tree/nautilus-tree-node.c b/components/tree/nautilus-tree-node.c
index 80e87bbed..74ac66123 100644
--- a/components/tree/nautilus-tree-node.c
+++ b/components/tree/nautilus-tree-node.c
@@ -29,7 +29,7 @@
 #include "nautilus-tree-node-private.h"
 #include <libnautilus-extensions/nautilus-directory.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 
 
 static void               nautilus_tree_node_destroy          (GtkObject   *object);
@@ -39,7 +39,7 @@ static void               nautilus_tree_node_initialize_class (gpointer     klas
 
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTreeNode, nautilus_tree_node, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeNode, nautilus_tree_node, GTK_TYPE_OBJECT)
 
 
 static void
@@ -80,7 +80,7 @@ nautilus_tree_node_destroy (GtkObject *object)
 	g_free (node->details->uri);
 	g_free (node->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 NautilusTreeNode *
diff --git a/components/tree/nautilus-tree-view-dnd.c b/components/tree/nautilus-tree-view-dnd.c
index d22622ff1..e38968cc0 100644
--- a/components/tree/nautilus-tree-view-dnd.c
+++ b/components/tree/nautilus-tree-view-dnd.c
@@ -33,12 +33,12 @@
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-drag.h>
 #include <libnautilus-extensions/nautilus-file-operations.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 
 /* This constant is zero because right now it does not seem we need
    extra delay on horizontal-only auto-scroll. However, it's left in
@@ -168,7 +168,7 @@ tree_view_realize_callback (GtkWidget *widget, gpointer user_data)
         gtk_style_ref (new_style);
 
 	/* calculate a new prelighting color */
-	nautilus_gtk_style_shade (&style->bg[GTK_STATE_SELECTED], 
+	eel_gtk_style_shade (&style->bg[GTK_STATE_SELECTED], 
 				  &new_prelight_color, 
 				  1.35);
 	/* set the new color to our special prelighting Style. */
@@ -197,14 +197,14 @@ nautilus_tree_view_init_dnd (NautilusTreeView *view)
 	view->details->dnd->drag_info = g_new0 (NautilusDragInfo, 1);
 	nautilus_drag_init (view->details->dnd->drag_info,
 			    nautilus_tree_view_dnd_target_table,
-			    NAUTILUS_N_ELEMENTS (nautilus_tree_view_dnd_target_table),
+			    EEL_N_ELEMENTS (nautilus_tree_view_dnd_target_table),
 			    NULL);
 
 
 	gtk_drag_dest_set (GTK_WIDGET (view->details->tree), 
 			   0,
 			   nautilus_tree_view_dnd_target_table,
-			   NAUTILUS_N_ELEMENTS (nautilus_tree_view_dnd_target_table),
+			   EEL_N_ELEMENTS (nautilus_tree_view_dnd_target_table),
 			   GDK_ACTION_COPY 
 			   | GDK_ACTION_MOVE 
 			   | GDK_ACTION_LINK 
@@ -396,7 +396,7 @@ get_data_on_first_target_we_support (GtkWidget *widget, GdkDragContext *context,
 
 	if (nautilus_tree_view_dnd_target_list == NULL)
 		nautilus_tree_view_dnd_target_list = gtk_target_list_new (nautilus_tree_view_dnd_target_table,
-									  NAUTILUS_N_ELEMENTS (nautilus_tree_view_dnd_target_table));
+									  EEL_N_ELEMENTS (nautilus_tree_view_dnd_target_table));
 
 	for (target = context->targets; target != NULL; target = target->next) {
 		guint dummy_info;
@@ -801,7 +801,7 @@ nautilus_tree_view_set_dnd_icon (NautilusTreeView *tree_view, GdkDragContext *co
 				      &expanded);
 
 	/* FIXME: We can do better than 10,10 for the hot spot. */
-	nautilus_drag_set_icon_pixbuf (context, pixbuf, 10, 10);
+	eel_drag_set_icon_pixbuf (context, pixbuf, 10, 10);
 }
 
 
@@ -1031,8 +1031,8 @@ static gboolean
 ready_to_start_scrolling (NautilusDragInfo *drag_info,
 			  int y_scroll_delta)
 {
-	return (y_scroll_delta != 0 && drag_info->start_auto_scroll_in < nautilus_get_system_time ()) ||
-		drag_info->start_auto_scroll_in +  AUTOSCROLL_X_ONLY_EXTRA_DELAY < nautilus_get_system_time ();
+	return (y_scroll_delta != 0 && drag_info->start_auto_scroll_in < eel_get_system_time ()) ||
+		drag_info->start_auto_scroll_in +  AUTOSCROLL_X_ONLY_EXTRA_DELAY < eel_get_system_time ();
 }
 
 static int
@@ -1091,8 +1091,8 @@ nautilus_tree_view_real_scroll (NautilusTreeView *tree_view, float delta_x, floa
 	hadj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (tree_view->details->scrolled_window));
 	vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (tree_view->details->scrolled_window));
 
-	nautilus_gtk_adjustment_set_value (hadj, hadj->value + delta_x);
-	nautilus_gtk_adjustment_set_value (vadj, vadj->value + delta_y);
+	eel_gtk_adjustment_set_value (hadj, hadj->value + delta_x);
+	eel_gtk_adjustment_set_value (vadj, vadj->value + delta_y);
 }
 
 
@@ -1268,7 +1268,7 @@ nautilus_tree_view_drag_destroy_real (NautilusTreeView *tree_view)
 	drag_info->drop_occured = FALSE;
 
 	if (drag_info->selection_data != NULL) {
-		nautilus_gtk_selection_data_free_deep (drag_info->selection_data);
+		eel_gtk_selection_data_free_deep (drag_info->selection_data);
 		drag_info->selection_data = NULL;
 	}
 }
diff --git a/components/tree/nautilus-tree-view.c b/components/tree/nautilus-tree-view.c
index ffc47a3bb..94ffaf294 100644
--- a/components/tree/nautilus-tree-view.c
+++ b/components/tree/nautilus-tree-view.c
@@ -39,12 +39,12 @@
 #include <libnautilus-extensions/nautilus-file-attributes.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 #include <stdio.h>
 
 #define DISPLAY_TIMEOUT_INTERVAL_MSECS 500
@@ -93,7 +93,7 @@ static void     insert_unparented_nodes              (NautilusTreeView      *vie
 static void     expand_uri_sequence_and_select_end   (NautilusTreeView      *view);
 static gboolean is_anti_aliased			     (NautilusTreeView	    *view);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTreeView,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeView,
 				   nautilus_tree_view,
 				   NAUTILUS_TYPE_VIEW)
 
@@ -161,7 +161,7 @@ nautilus_tree_view_would_include_uri (NautilusTreeView *view,
 
 	/* The tree view currently only ever shows `file:' URIs */
 
-	if (!nautilus_str_has_prefix (uri, "file:")) {
+	if (!eel_str_has_prefix (uri, "file:")) {
 		return FALSE;
 	}
 
@@ -573,7 +573,7 @@ notify_node_seen (NautilusTreeView *view,
 
 	uri = nautilus_file_get_uri (nautilus_tree_node_get_file (node));
 	
-	if (nautilus_strcmp (uri, view->details->wait_uri) == 0) {
+	if (eel_strcmp (uri, view->details->wait_uri) == 0) {
 		awaited_node_or_uri_found (view);
 	}
 	
@@ -1149,14 +1149,14 @@ nautilus_tree_view_destroy (GtkObject *object)
 		gtk_object_unref (GTK_OBJECT (view->details->expansion_state));
 	}
 
-	nautilus_gtk_object_list_free (view->details->unparented_tree_nodes);
+	eel_gtk_object_list_free (view->details->unparented_tree_nodes);
 	
 	g_free (view->details->current_main_view_uri);
 	g_free (view->details->selected_uri);
 
 	g_free (view->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static NautilusCTreeNode *
@@ -1259,7 +1259,7 @@ call_when_uri_loaded_or_parent_done_loading (NautilusTreeView *view,
 static void
 cancel_selection_in_progress (NautilusTreeView *view)
 {
-	nautilus_g_list_free_deep (view->details->in_progress_select_uris);
+	eel_g_list_free_deep (view->details->in_progress_select_uris);
 	view->details->in_progress_select_uris = NULL;
 
 	g_free (view->details->wait_uri);
@@ -1348,7 +1348,7 @@ expand_uri_sequence_and_select_end (NautilusTreeView *view)
 	
 	p->prev->next = NULL;
 	p->prev = NULL;
-	nautilus_g_list_free_deep (old_sequence);
+	eel_g_list_free_deep (old_sequence);
 }
 
 static void
@@ -1360,7 +1360,7 @@ select_current_location (NautilusTreeView *view)
 	 * nautilus_uris_match or nautilus_uris_match_ignore_fragments
 	 * should be used here.
 	 */
-	if (nautilus_strcmp (view->details->current_main_view_uri,
+	if (eel_strcmp (view->details->current_main_view_uri,
 			     view->details->selected_uri) == 0) {
 		return;
 	}
diff --git a/configure.in b/configure.in
index b40c43bd3..7624b591d 100644
--- a/configure.in
+++ b/configure.in
@@ -28,6 +28,8 @@ ESOUND_REQUIRED=0.2
 LIBGHTTP_REQUIRED=1.0.9
 SCROLLKEEPER_REQUIRED=0.1.4
 AMMONITE_REQUIRED=0.8.7
+LIBRSVG_REQUIRED=0.0.1
+EEL_REQUIRED=0.0.1
 
 AC_SUBST(IMLIB_REQUIRED)
 AC_SUBST(LIBXML_REQUIRED)
@@ -39,6 +41,8 @@ AC_SUBST(MEDUSA_REQUIRED)
 AC_SUBST(ESOUND_REQUIRED)
 AC_SUBST(LIBGHTTP_REQUIRED)
 AC_SUBST(SCROLLKEEPER_REQUIRED)
+AC_SUBST(LIBRSVG_REQUIRED)
+AC_SUBST(EEL_REQUIRED)
 
 dnl ===========================================================================
 
@@ -649,7 +653,7 @@ AC_MSG_ERROR([
 
 AC_SUBST(GTK_REQUIRED)
 
-AM_PATH_GNOME($GNOME_REQUIRED,,AC_MSG_ERROR([*** GNOME $GNOME_REQUIRED or better is required.]), gnomecanvaspixbuf bonobo bonobox bonobox_print vfs idl)
+AM_PATH_GNOME($GNOME_REQUIRED,,AC_MSG_ERROR([*** GNOME $GNOME_REQUIRED or better is required.]), gnomecanvaspixbuf bonobo bonobox bonobox_print vfs idl librsvg eel)
 
 AC_SUBST(GNOME_REQUIRED)
 
@@ -682,6 +686,10 @@ AC_SUBST(BONOBO_PRINT_CFLAGS)
 AC_SUBST(BONOBO_PRINT_LIBS)
 AC_SUBST(VFS_CFLAGS)
 AC_SUBST(VFS_LIBS)
+AC_SUBST(LIBRSVG_LIBS)
+AC_SUBST(LIBRSVG_INCLUDEDIR)
+AC_SUBST(EEL_LIBS)
+AC_SUBST(EEL_INCLUDEDIR)
 
 dnl   Bug 7315: Rediscover CFLAGS for GTK, because gnome-config won't know
 dnl   all the necessary flags if GTK has been upgraded more recently than
@@ -1030,14 +1038,11 @@ data/Makefile
 data/patterns/Makefile
 data/emblems/Makefile
 data/linksets/Makefile
-data/fonts/Makefile
-data/fonts/urw/Makefile
 cut-n-paste-code/Makefile
 cut-n-paste-code/widgets/Makefile
 cut-n-paste-code/widgets/e-paned/Makefile
 cut-n-paste-code/widgets/nautilusclist/Makefile
 cut-n-paste-code/widgets/gimphwrapbox/Makefile
-librsvg/Makefile
 libnautilus/Makefile
 libnautilus-adapter/Makefile
 libnautilus-extensions/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 5776913ef..d2f55afd0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -13,7 +13,6 @@ EXTRA_DIST = $(nautilusdata_DATA)
 
 SUBDIRS = \
 	emblems \
-	fonts \
 	linksets \
 	patterns \
 	$(NULL)
diff --git a/data/fonts/.cvsignore b/data/fonts/.cvsignore
deleted file mode 100644
index 282522db0..000000000
--- a/data/fonts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am
deleted file mode 100644
index b179422ed..000000000
--- a/data/fonts/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-NULL=
-
-SUBDIRS = \
-	urw \
-	$(NULL)
diff --git a/data/fonts/urw/.cvsignore b/data/fonts/urw/.cvsignore
deleted file mode 100644
index 282522db0..000000000
--- a/data/fonts/urw/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/data/fonts/urw/Makefile.am b/data/fonts/urw/Makefile.am
deleted file mode 100644
index 10ee2a375..000000000
--- a/data/fonts/urw/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-NULL=
-
-fontsdir = $(datadir)/nautilus/fonts/urw
-
-fonts_DATA = \
-	n019003l.afm \
-	n019003l.pfb \
-	n019003l.pfm \
-	n019004l.afm \
-	n019004l.pfb \
-	n019004l.pfm \
-	n019023l.afm \
-	n019023l.pfb \
-	n019023l.pfm \
-	n019024l.afm \
-	n019024l.pfb \
-	n019024l.pfm \
-	fonts.dir \
-	$(NULL)
-
-EXTRA_DIST = $(fonts_DATA)
-
diff --git a/data/fonts/urw/README b/data/fonts/urw/README
deleted file mode 100644
index dcc1a4abf..000000000
--- a/data/fonts/urw/README
+++ /dev/null
@@ -1,14 +0,0 @@
-This is the 'Nimbus Sans L from the ghostscript-fonts-5.10a package.
-These fonts are Copyright 1994 by URW and made avaialble by URW under
-the GNU GPL.
-
-We install these for Nautilus so that we can safely do anti aliases
-test rendering even on platform that dont have Type1 fonts.
-
-Most linux distributions already have urw fonts installed.
-
-The package names for these fonts are:
-
-RedHat: urw-fonts
-Debian: ?
-Suse:   ?
diff --git a/data/fonts/urw/fonts.dir b/data/fonts/urw/fonts.dir
deleted file mode 100644
index bd923b5ff..000000000
--- a/data/fonts/urw/fonts.dir
+++ /dev/null
@@ -1,5 +0,0 @@
-4
-n019003l.pfb -URW-Helvetica Default-medium-r-normal--0-0-0-0-p-0-iso8859-1
-n019004l.pfb -URW-Helvetica Default-bold-r-normal--0-0-0-0-p-0-iso8859-1
-n019023l.pfb -URW-Helvetica Default-medium-o-normal--0-0-0-0-p-0-iso8859-1
-n019024l.pfb -URW-Helvetica Default-bold-o-normal--0-0-0-0-p-0-iso8859-1
diff --git a/data/fonts/urw/n019003l.afm b/data/fonts/urw/n019003l.afm
deleted file mode 100644
index 36133a429..000000000
--- a/data/fonts/urw/n019003l.afm
+++ /dev/null
@@ -1,1341 +0,0 @@
-StartFontMetrics 3.0
-Comment Copyright (URW)++,Copyright 1999 by (URW)++ Design & Development
-Comment Creation Date: 12/22/1999
-Comment See the file COPYING (GNU General Public License) for license conditions.
-FontName NimbusSanL-Regu
-FullName Nimbus Sans L Regular
-FamilyName Nimbus Sans L
-Weight Regular
-ItalicAngle 0.0
-IsFixedPitch false
-UnderlinePosition -151
-UnderlineThickness 50
-Version 1.05
-Notice (URW)++,Copyright 1999 by (URW)++ Design & Development
-EncodingScheme AdobeStandardEncoding
-FontBBox -174 -285 1001 953
-CapHeight 729
-XHeight 524
-Descender -218
-Ascender 729
-StartCharMetrics 316
-C 32 ; WX 278 ; N space ; B 191 0 191 0 ;
-C 33 ; WX 278 ; N exclam ; B 124 0 208 729 ;
-C 34 ; WX 355 ; N quotedbl ; B 52 464 305 709 ;
-C 35 ; WX 556 ; N numbersign ; B 14 -20 542 697 ;
-C 36 ; WX 556 ; N dollar ; B 26 -126 518 770 ;
-C 37 ; WX 889 ; N percent ; B 29 -20 859 709 ;
-C 38 ; WX 667 ; N ampersand ; B 52 -23 637 709 ;
-C 39 ; WX 221 ; N quoteright ; B 64 497 157 729 ;
-C 40 ; WX 333 ; N parenleft ; B 73 -212 291 729 ;
-C 41 ; WX 333 ; N parenright ; B 38 -212 256 729 ;
-C 42 ; WX 389 ; N asterisk ; B 40 441 343 729 ;
-C 43 ; WX 584 ; N plus ; B 50 -10 534 474 ;
-C 44 ; WX 278 ; N comma ; B 87 -147 192 104 ;
-C 45 ; WX 333 ; N hyphen ; B 46 240 284 312 ;
-C 46 ; WX 278 ; N period ; B 87 0 191 104 ;
-C 47 ; WX 278 ; N slash ; B -8 -20 284 729 ;
-C 48 ; WX 556 ; N zero ; B 43 -23 507 709 ;
-C 49 ; WX 556 ; N one ; B 102 0 347 709 ;
-C 50 ; WX 556 ; N two ; B 34 0 511 709 ;
-C 51 ; WX 556 ; N three ; B 32 -23 506 709 ;
-C 52 ; WX 556 ; N four ; B 28 0 520 709 ;
-C 53 ; WX 556 ; N five ; B 35 -23 513 709 ;
-C 54 ; WX 556 ; N six ; B 43 -23 513 709 ;
-C 55 ; WX 556 ; N seven ; B 46 0 520 709 ;
-C 56 ; WX 556 ; N eight ; B 37 -23 513 709 ;
-C 57 ; WX 556 ; N nine ; B 38 -23 509 709 ;
-C 58 ; WX 278 ; N colon ; B 110 0 214 524 ;
-C 59 ; WX 278 ; N semicolon ; B 110 -147 215 524 ;
-C 60 ; WX 584 ; N less ; B 45 -9 534 474 ;
-C 61 ; WX 584 ; N equal ; B 50 111 534 353 ;
-C 62 ; WX 584 ; N greater ; B 50 -9 539 474 ;
-C 63 ; WX 556 ; N question ; B 77 0 509 741 ;
-C 64 ; WX 1015 ; N at ; B 34 -142 951 741 ;
-C 65 ; WX 667 ; N A ; B 17 0 653 729 ;
-C 66 ; WX 667 ; N B ; B 79 0 623 729 ;
-C 67 ; WX 722 ; N C ; B 48 -23 677 741 ;
-C 68 ; WX 722 ; N D ; B 89 0 667 729 ;
-C 69 ; WX 667 ; N E ; B 90 0 613 729 ;
-C 70 ; WX 611 ; N F ; B 90 0 579 729 ;
-C 71 ; WX 778 ; N G ; B 44 -23 709 741 ;
-C 72 ; WX 722 ; N H ; B 83 0 644 729 ;
-C 73 ; WX 278 ; N I ; B 100 0 194 729 ;
-C 74 ; WX 500 ; N J ; B 17 -23 426 729 ;
-C 75 ; WX 667 ; N K ; B 79 0 658 729 ;
-C 76 ; WX 556 ; N L ; B 80 0 533 729 ;
-C 77 ; WX 833 ; N M ; B 75 0 761 729 ;
-C 78 ; WX 722 ; N N ; B 76 0 646 729 ;
-C 79 ; WX 778 ; N O ; B 38 -23 742 741 ;
-C 80 ; WX 667 ; N P ; B 91 0 617 729 ;
-C 81 ; WX 778 ; N Q ; B 38 -59 742 741 ;
-C 82 ; WX 722 ; N R ; B 93 0 679 729 ;
-C 83 ; WX 667 ; N S ; B 48 -23 621 741 ;
-C 84 ; WX 611 ; N T ; B 21 0 593 729 ;
-C 85 ; WX 722 ; N U ; B 85 -23 645 729 ;
-C 86 ; WX 667 ; N V ; B 30 0 645 729 ;
-C 87 ; WX 944 ; N W ; B 22 0 929 729 ;
-C 88 ; WX 667 ; N X ; B 22 0 649 729 ;
-C 89 ; WX 667 ; N Y ; B 13 0 661 729 ;
-C 90 ; WX 611 ; N Z ; B 28 0 583 729 ;
-C 91 ; WX 278 ; N bracketleft ; B 64 -212 250 729 ;
-C 92 ; WX 278 ; N backslash ; B -8 -20 284 729 ;
-C 93 ; WX 278 ; N bracketright ; B 23 -212 209 729 ;
-C 94 ; WX 469 ; N asciicircum ; B 44 329 425 709 ;
-C 95 ; WX 556 ; N underscore ; B -22 -176 578 -126 ;
-C 96 ; WX 222 ; N quoteleft ; B 65 477 158 709 ;
-C 97 ; WX 556 ; N a ; B 42 -23 535 539 ;
-C 98 ; WX 556 ; N b ; B 54 -23 523 729 ;
-C 99 ; WX 500 ; N c ; B 31 -23 477 539 ;
-C 100 ; WX 556 ; N d ; B 26 -23 495 729 ;
-C 101 ; WX 556 ; N e ; B 40 -23 513 539 ;
-C 102 ; WX 278 ; N f ; B 18 0 258 732 ;
-C 103 ; WX 556 ; N g ; B 29 -218 489 539 ;
-C 104 ; WX 556 ; N h ; B 70 0 486 729 ;
-C 105 ; WX 222 ; N i ; B 66 0 150 729 ;
-C 106 ; WX 222 ; N j ; B -18 -218 153 729 ;
-C 107 ; WX 500 ; N k ; B 58 0 502 729 ;
-C 108 ; WX 222 ; N l ; B 68 0 152 729 ;
-C 109 ; WX 833 ; N m ; B 70 0 762 539 ;
-C 110 ; WX 556 ; N n ; B 70 0 487 539 ;
-C 111 ; WX 556 ; N o ; B 36 -23 510 539 ;
-C 112 ; WX 556 ; N p ; B 54 -218 523 539 ;
-C 113 ; WX 556 ; N q ; B 26 -218 495 539 ;
-C 114 ; WX 333 ; N r ; B 69 0 321 539 ;
-C 115 ; WX 500 ; N s ; B 34 -23 459 539 ;
-C 116 ; WX 278 ; N t ; B 14 -23 254 668 ;
-C 117 ; WX 556 ; N u ; B 65 -23 482 524 ;
-C 118 ; WX 500 ; N v ; B 10 0 486 524 ;
-C 119 ; WX 722 ; N w ; B 6 0 708 524 ;
-C 120 ; WX 500 ; N x ; B 17 0 473 524 ;
-C 121 ; WX 500 ; N y ; B 20 -218 478 524 ;
-C 122 ; WX 500 ; N z ; B 31 0 457 524 ;
-C 123 ; WX 334 ; N braceleft ; B 43 -212 276 729 ;
-C 124 ; WX 260 ; N bar ; B 100 -212 160 729 ;
-C 125 ; WX 334 ; N braceright ; B 29 -212 262 729 ;
-C 126 ; WX 584 ; N asciitilde ; B 75 268 508 438 ;
-C 161 ; WX 333 ; N exclamdown ; B 121 -205 205 524 ;
-C 162 ; WX 556 ; N cent ; B 52 -120 510 628 ;
-C 163 ; WX 556 ; N sterling ; B 26 -23 535 729 ;
-C 164 ; WX 167 ; N fraction ; B -174 -20 336 709 ;
-C 165 ; WX 556 ; N yen ; B 11 0 545 709 ;
-C 166 ; WX 556 ; N florin ; B 11 -212 542 738 ;
-C 167 ; WX 556 ; N section ; B 43 -213 506 729 ;
-C 168 ; WX 556 ; N currency ; B 67 133 489 551 ;
-C 169 ; WX 191 ; N quotesingle ; B 48 464 142 709 ;
-C 170 ; WX 333 ; N quotedblleft ; B 48 477 299 709 ;
-C 171 ; WX 556 ; N guillemotleft ; B 98 106 455 438 ;
-C 172 ; WX 333 ; N guilsinglleft ; B 91 106 243 438 ;
-C 173 ; WX 333 ; N guilsinglright ; B 85 106 239 438 ;
-C 174 ; WX 500 ; N fi ; B 12 0 436 732 ;
-C 175 ; WX 500 ; N fl ; B 17 0 430 732 ;
-C 177 ; WX 556 ; N endash ; B -5 240 561 312 ;
-C 178 ; WX 556 ; N dagger ; B 38 -177 513 709 ;
-C 179 ; WX 556 ; N daggerdbl ; B 38 -177 513 709 ;
-C 180 ; WX 278 ; N periodcentered ; B 87 302 211 427 ;
-C 182 ; WX 537 ; N paragraph ; B 48 -177 522 729 ;
-C 183 ; WX 350 ; N bullet ; B 50 220 300 470 ;
-C 184 ; WX 222 ; N quotesinglbase ; B 64 -128 158 104 ;
-C 185 ; WX 333 ; N quotedblbase ; B 47 -128 300 104 ;
-C 186 ; WX 333 ; N quotedblright ; B 49 477 302 709 ;
-C 187 ; WX 556 ; N guillemotright ; B 98 106 451 438 ;
-C 188 ; WX 1000 ; N ellipsis ; B 115 0 885 104 ;
-C 189 ; WX 1000 ; N perthousand ; B 9 -22 993 738 ;
-C 191 ; WX 611 ; N questiondown ; B 95 -217 528 524 ;
-C 193 ; WX 333 ; N grave ; B 22 592 231 740 ;
-C 194 ; WX 333 ; N acute ; B 92 592 301 740 ;
-C 195 ; WX 333 ; N circumflex ; B 20 591 307 741 ;
-C 196 ; WX 333 ; N tilde ; B 5 613 319 717 ;
-C 197 ; WX 333 ; N macron ; B 28 631 302 701 ;
-C 198 ; WX 333 ; N breve ; B 15 597 316 732 ;
-C 199 ; WX 333 ; N dotaccent ; B 115 612 219 716 ;
-C 200 ; WX 333 ; N dieresis ; B 30 612 296 715 ;
-C 202 ; WX 333 ; N ring ; B 79 579 255 754 ;
-C 203 ; WX 333 ; N cedilla ; B 39 -214 287 0 ;
-C 205 ; WX 333 ; N hungarumlaut ; B -35 590 348 740 ;
-C 206 ; WX 333 ; N ogonek ; B 57 -205 265 0 ;
-C 207 ; WX 333 ; N caron ; B 19 591 306 741 ;
-C 208 ; WX 1000 ; N emdash ; B -9 240 1001 312 ;
-C 225 ; WX 1000 ; N AE ; B 11 0 950 729 ;
-C 227 ; WX 370 ; N ordfeminine ; B 37 303 333 742 ;
-C 232 ; WX 556 ; N Lslash ; B 0 0 552 729 ;
-C 233 ; WX 778 ; N Oslash ; B 30 -23 744 755 ;
-C 234 ; WX 1000 ; N OE ; B 43 -20 959 741 ;
-C 235 ; WX 365 ; N ordmasculine ; B 40 303 324 742 ;
-C 241 ; WX 889 ; N ae ; B 34 -23 845 539 ;
-C 245 ; WX 278 ; N dotlessi ; B 94 0 178 524 ;
-C 248 ; WX 222 ; N lslash ; B 0 0 212 729 ;
-C 249 ; WX 611 ; N oslash ; B 18 -30 529 539 ;
-C 250 ; WX 944 ; N oe ; B 40 -23 899 539 ;
-C 251 ; WX 611 ; N germandbls ; B 126 -20 566 729 ;
-C -1 ; WX 722 ; N Udieresis ; B 85 -23 645 914 ;
-C -1 ; WX 722 ; N Uacute ; B 85 -23 645 939 ;
-C -1 ; WX 667 ; N Scedilla ; B 45 -214 621 741 ;
-C -1 ; WX 611 ; N Tcaron ; B 21 0 593 940 ;
-C -1 ; WX 667 ; N Scaron ; B 48 -23 621 940 ;
-C -1 ; WX 722 ; N Rcaron ; B 93 0 679 940 ;
-C -1 ; WX 722 ; N Racute ; B 93 0 679 939 ;
-C -1 ; WX 667 ; N Sacute ; B 48 -23 621 939 ;
-C -1 ; WX 778 ; N Otilde ; B 38 -23 742 916 ;
-C -1 ; WX 556 ; N ucircumflex ; B 65 -23 482 741 ;
-C -1 ; WX 778 ; N Ohungarumlaut ; B 38 -23 742 939 ;
-C -1 ; WX 722 ; N Uhungarumlaut ; B 85 -23 645 939 ;
-C -1 ; WX 666 ; N Yacute ; B 13 0 661 939 ;
-C -1 ; WX 722 ; N Eth ; B 20 0 667 729 ;
-C -1 ; WX 722 ; N Dcroat ; B 20 0 667 729 ;
-C -1 ; WX 611 ; N Zacute ; B 28 0 583 939 ;
-C -1 ; WX 722 ; N Uring ; B 85 -23 645 953 ;
-C -1 ; WX 556 ; N gbreve ; B 29 -218 489 732 ;
-C -1 ; WX 556 ; N eogonek ; B 40 -204 514 539 ;
-C -1 ; WX 556 ; N edotaccent ; B 40 -23 513 716 ;
-C -1 ; WX 556 ; N ecaron ; B 40 -23 513 741 ;
-C -1 ; WX 722 ; N Ugrave ; B 85 -23 645 939 ;
-C -1 ; WX 666 ; N Thorn ; B 91 0 616 729 ;
-C -1 ; WX 556 ; N eacute ; B 40 -23 513 740 ;
-C -1 ; WX 556 ; N edieresis ; B 40 -23 513 715 ;
-C -1 ; WX 635 ; N dcaron ; B 26 -23 648 729 ;
-C -1 ; WX 500 ; N ccedilla ; B 31 -214 477 539 ;
-C -1 ; WX 500 ; N ccaron ; B 31 -23 477 741 ;
-C -1 ; WX 500 ; N cacute ; B 31 -23 477 740 ;
-C -1 ; WX 556 ; N aogonek ; B 43 -205 596 539 ;
-C -1 ; WX 556 ; N aring ; B 42 -23 535 754 ;
-C -1 ; WX 556 ; N atilde ; B 42 -23 535 717 ;
-C -1 ; WX 556 ; N abreve ; B 42 -23 535 732 ;
-C -1 ; WX 556 ; N egrave ; B 40 -23 513 740 ;
-C -1 ; WX 556 ; N agrave ; B 42 -23 535 740 ;
-C -1 ; WX 556 ; N aacute ; B 42 -23 535 740 ;
-C -1 ; WX 556 ; N adieresis ; B 42 -23 535 715 ;
-C -1 ; WX 722 ; N Uogonek ; B 85 -205 645 729 ;
-C -1 ; WX 556 ; N ugrave ; B 65 -23 482 740 ;
-C -1 ; WX 556 ; N uacute ; B 65 -23 482 740 ;
-C -1 ; WX 556 ; N udieresis ; B 65 -23 482 715 ;
-C -1 ; WX 308 ; N tcaron ; B 14 -23 321 800 ;
-C -1 ; WX 500 ; N scommaaccent ; B 34 -285 459 539 ;
-C -1 ; WX 611 ; N Zcaron ; B 28 0 583 940 ;
-C -1 ; WX 556 ; N ecircumflex ; B 40 -23 513 741 ;
-C -1 ; WX 722 ; N Ucircumflex ; B 85 -23 645 940 ;
-C -1 ; WX 556 ; N acircumflex ; B 42 -23 535 741 ;
-C -1 ; WX 611 ; N Zdotaccent ; B 28 0 583 915 ;
-C -1 ; WX 500 ; N scaron ; B 34 -23 459 741 ;
-C -1 ; WX 667 ; N Amacron ; B 17 0 653 900 ;
-C -1 ; WX 500 ; N sacute ; B 34 -23 459 740 ;
-C -1 ; WX 611 ; N Tcommaaccent ; B 21 -285 593 729 ;
-C -1 ; WX 667 ; N Ydieresis ; B 13 0 661 914 ;
-C -1 ; WX 555 ; N thorn ; B 54 -218 522 714 ;
-C -1 ; WX 667 ; N Emacron ; B 90 0 613 900 ;
-C -1 ; WX 778 ; N Ograve ; B 38 -23 742 939 ;
-C -1 ; WX 778 ; N Oacute ; B 38 -23 742 939 ;
-C -1 ; WX 778 ; N Odieresis ; B 38 -23 742 914 ;
-C -1 ; WX 722 ; N Ntilde ; B 76 0 646 916 ;
-C -1 ; WX 722 ; N Ncaron ; B 76 0 646 940 ;
-C -1 ; WX 722 ; N Nacute ; B 76 0 646 939 ;
-C -1 ; WX 556 ; N Lcaron ; B 80 0 533 729 ;
-C -1 ; WX 556 ; N Lacute ; B 70 0 533 939 ;
-C -1 ; WX 278 ; N Idotaccent ; B 92 0 196 915 ;
-C -1 ; WX 333 ; N racute ; B 69 0 331 740 ;
-C -1 ; WX 278 ; N Icircumflex ; B -1 0 286 940 ;
-C -1 ; WX 556 ; N ohungarumlaut ; B 36 -23 526 740 ;
-C -1 ; WX 556 ; N otilde ; B 36 -23 510 717 ;
-C -1 ; WX 556 ; N Euro ; B 2 -23 543 709 ;
-C -1 ; WX 556 ; N ocircumflex ; B 36 -23 510 741 ;
-C -1 ; WX 351 ; N onesuperior ; B 61 284 222 709 ;
-C -1 ; WX 351 ; N twosuperior ; B 19 284 326 709 ;
-C -1 ; WX 351 ; N threesuperior ; B 16 270 322 709 ;
-C -1 ; WX 278 ; N Igrave ; B 1 0 210 939 ;
-C -1 ; WX 278 ; N Iacute ; B 71 0 280 939 ;
-C -1 ; WX 278 ; N Imacron ; B 20 0 274 900 ;
-C -1 ; WX 278 ; N Iogonek ; B 66 -204 234 729 ;
-C -1 ; WX 278 ; N Idieresis ; B 9 0 275 907 ;
-C -1 ; WX 778 ; N Gbreve ; B 44 -23 709 931 ;
-C -1 ; WX 722 ; N Umacron ; B 85 -23 645 900 ;
-C -1 ; WX 667 ; N Kcommaaccent ; B 79 -285 658 729 ;
-C -1 ; WX 556 ; N ograve ; B 36 -23 510 740 ;
-C -1 ; WX 667 ; N Scommaaccent ; B 48 -285 621 741 ;
-C -1 ; WX 667 ; N Eogonek ; B 90 -205 652 729 ;
-C -1 ; WX 556 ; N oacute ; B 36 -23 510 740 ;
-C -1 ; WX 667 ; N Edotaccent ; B 90 0 613 915 ;
-C -1 ; WX 222 ; N iogonek ; B 25 -204 190 729 ;
-C -1 ; WX 556 ; N gcommaaccent ; B 29 -218 489 817 ;
-C -1 ; WX 556 ; N odieresis ; B 36 -23 510 715 ;
-C -1 ; WX 556 ; N ntilde ; B 70 0 487 717 ;
-C -1 ; WX 556 ; N ncaron ; B 70 0 487 741 ;
-C -1 ; WX 667 ; N Ecaron ; B 90 0 613 940 ;
-C -1 ; WX 667 ; N Ecircumflex ; B 90 0 613 940 ;
-C -1 ; WX 500 ; N scedilla ; B 34 -214 459 539 ;
-C -1 ; WX 333 ; N rcaron ; B 48 0 335 741 ;
-C -1 ; WX 667 ; N Egrave ; B 90 0 613 939 ;
-C -1 ; WX 667 ; N Eacute ; B 90 0 613 939 ;
-C -1 ; WX 778 ; N Gcommaaccent ; B 44 -285 709 741 ;
-C -1 ; WX 722 ; N Rcommaaccent ; B 93 -285 679 729 ;
-C -1 ; WX 667 ; N Edieresis ; B 90 0 613 914 ;
-C -1 ; WX 556 ; N nacute ; B 70 0 487 740 ;
-C -1 ; WX 556 ; N uogonek ; B 65 -204 521 524 ;
-C -1 ; WX 556 ; N umacron ; B 65 -23 482 701 ;
-C -1 ; WX 722 ; N Dcaron ; B 89 0 667 940 ;
-C -1 ; WX 292 ; N lcaron ; B 68 0 305 729 ;
-C -1 ; WX 722 ; N Ccaron ; B 48 -23 677 940 ;
-C -1 ; WX 722 ; N Cacute ; B 48 -23 677 939 ;
-C -1 ; WX 722 ; N Ccedilla ; B 48 -214 677 741 ;
-C -1 ; WX 606 ; N degree ; B 151 383 454 686 ;
-C -1 ; WX 667 ; N Aogonek ; B 17 -205 692 729 ;
-C -1 ; WX 584 ; N minus ; B 40 197 544 267 ;
-C -1 ; WX 584 ; N multiply ; B 95 34 488 427 ;
-C -1 ; WX 584 ; N divide ; B 50 0 534 472 ;
-C -1 ; WX 667 ; N Aring ; B 17 0 653 953 ;
-C -1 ; WX 1000 ; N trademark ; B 63 292 938 729 ;
-C -1 ; WX 333 ; N rcommaaccent ; B 65 -285 321 539 ;
-C -1 ; WX 222 ; N lacute ; B 63 0 272 939 ;
-C -1 ; WX 556 ; N omacron ; B 36 -23 510 701 ;
-C -1 ; WX 667 ; N Atilde ; B 17 0 653 916 ;
-C -1 ; WX 278 ; N icircumflex ; B -7 0 280 741 ;
-C -1 ; WX 278 ; N igrave ; B -5 0 204 740 ;
-C -1 ; WX 556 ; N ncommaaccent ; B 70 -285 487 539 ;
-C -1 ; WX 222 ; N lcommaaccent ; B 63 -285 163 729 ;
-C -1 ; WX 584 ; N plusminus ; B 50 -11 534 623 ;
-C -1 ; WX 869 ; N onehalf ; B 61 -20 844 709 ;
-C -1 ; WX 869 ; N onequarter ; B 61 -20 849 709 ;
-C -1 ; WX 869 ; N threequarters ; B 16 -20 849 709 ;
-C -1 ; WX 278 ; N iacute ; B 65 0 274 740 ;
-C -1 ; WX 667 ; N Abreve ; B 17 0 653 931 ;
-C -1 ; WX 500 ; N kcommaaccent ; B 58 -285 502 729 ;
-C -1 ; WX 778 ; N Omacron ; B 38 -23 742 900 ;
-C -1 ; WX 222 ; N imacron ; B -16 0 231 701 ;
-C -1 ; WX 556 ; N emacron ; B 40 -23 513 701 ;
-C -1 ; WX 556 ; N amacron ; B 42 -23 535 701 ;
-C -1 ; WX 278 ; N tcommaaccent ; B 14 -285 254 668 ;
-C -1 ; WX 500 ; N ydieresis ; B 20 -218 478 715 ;
-C -1 ; WX 500 ; N zdotaccent ; B 31 0 457 716 ;
-C -1 ; WX 500 ; N zcaron ; B 31 0 457 741 ;
-C -1 ; WX 500 ; N zacute ; B 31 0 457 740 ;
-C -1 ; WX 500 ; N yacute ; B 20 -218 478 740 ;
-C -1 ; WX 556 ; N uhungarumlaut ; B 65 -23 530 740 ;
-C -1 ; WX 556 ; N eth ; B 36 -23 510 743 ;
-C -1 ; WX 556 ; N uring ; B 65 -23 482 754 ;
-C -1 ; WX 778 ; N Ocircumflex ; B 38 -23 742 940 ;
-C -1 ; WX 333 ; N commaaccent ; B 116 -285 216 -60 ;
-C -1 ; WX 737 ; N copyright ; B -13 -22 751 742 ;
-C -1 ; WX 737 ; N registered ; B -13 -22 751 742 ;
-C -1 ; WX 667 ; N Acircumflex ; B 17 0 653 940 ;
-C -1 ; WX 278 ; N idieresis ; B 3 0 269 708 ;
-C -1 ; WX 489 ; N lozenge ; B 16 0 462 744 ;
-C -1 ; WX 711 ; N Delta ; B 10 0 701 729 ;
-C -1 ; WX 548 ; N notequal ; B 32 -25 516 486 ;
-C -1 ; WX 542 ; N radical ; B 7 -36 512 913 ;
-C -1 ; WX 667 ; N Agrave ; B 17 0 653 939 ;
-C -1 ; WX 667 ; N Aacute ; B 17 0 653 939 ;
-C -1 ; WX 584 ; N lessequal ; B 45 -11 534 639 ;
-C -1 ; WX 584 ; N greaterequal ; B 45 -11 534 639 ;
-C -1 ; WX 584 ; N logicalnot ; B 40 86 544 375 ;
-C -1 ; WX 711 ; N summation ; B 17 -97 694 760 ;
-C -1 ; WX 490 ; N partialdiff ; B 22 -15 458 750 ;
-C -1 ; WX 722 ; N Ncommaaccent ; B 76 -285 646 729 ;
-C -1 ; WX 556 ; N dcroat ; B 26 -23 557 729 ;
-C -1 ; WX 260 ; N brokenbar ; B 100 -212 160 729 ;
-C -1 ; WX 556 ; N Lcommaaccent ; B 80 -285 533 729 ;
-C -1 ; WX 667 ; N Adieresis ; B 17 0 653 914 ;
-C -1 ; WX 556 ; N mu ; B 65 -220 544 524 ;
-C -1 ; WX 278 ; N .notdef ; B 191 0 191 0 ;
-EndCharMetrics
-StartKernData
-StartKernPairs 998
-KPX A C -36
-KPX A Ccedilla -36
-KPX A G -35
-KPX A O -33
-KPX A Odieresis -33
-KPX A Q -32
-KPX A T -93
-KPX A U -37
-KPX A Uacute -37
-KPX A Ucircumflex -37
-KPX A Udieresis -37
-KPX A Ugrave -37
-KPX A V -75
-KPX A W -51
-KPX A Y -99
-KPX A a -4
-KPX A b 4
-KPX A c -11
-KPX A ccedilla -10
-KPX A comma 5
-KPX A d -8
-KPX A e -16
-KPX A g -10
-KPX A guillemotleft -44
-KPX A guilsinglleft -40
-KPX A hyphen -3
-KPX A o -13
-KPX A period 5
-KPX A q -8
-KPX A quotedblright -56
-KPX A quoteright -65
-KPX A t -16
-KPX A u -12
-KPX A v -31
-KPX A w -21
-KPX A y -34
-KPX Aacute C -36
-KPX Aacute G -35
-KPX Aacute O -33
-KPX Aacute Q -32
-KPX Aacute T -93
-KPX Aacute U -37
-KPX Aacute V -75
-KPX Aacute W -51
-KPX Aacute Y -99
-KPX Aacute a -4
-KPX Aacute b 4
-KPX Aacute c -11
-KPX Aacute comma 5
-KPX Aacute d -8
-KPX Aacute e -16
-KPX Aacute g -10
-KPX Aacute guillemotleft -44
-KPX Aacute guilsinglleft -40
-KPX Aacute hyphen -3
-KPX Aacute o -13
-KPX Aacute period 5
-KPX Aacute q -8
-KPX Aacute quoteright -65
-KPX Aacute t -16
-KPX Aacute u -12
-KPX Aacute v -31
-KPX Aacute w -21
-KPX Aacute y -34
-KPX Acircumflex C -36
-KPX Acircumflex G -35
-KPX Acircumflex O -33
-KPX Acircumflex Q -32
-KPX Acircumflex T -93
-KPX Acircumflex U -37
-KPX Acircumflex V -75
-KPX Acircumflex W -51
-KPX Acircumflex Y -99
-KPX Acircumflex comma 5
-KPX Acircumflex period 5
-KPX Adieresis C -36
-KPX Adieresis G -35
-KPX Adieresis O -33
-KPX Adieresis Q -32
-KPX Adieresis T -93
-KPX Adieresis U -37
-KPX Adieresis V -75
-KPX Adieresis W -51
-KPX Adieresis Y -99
-KPX Adieresis a -4
-KPX Adieresis b 4
-KPX Adieresis c -11
-KPX Adieresis comma 5
-KPX Adieresis d -8
-KPX Adieresis g -10
-KPX Adieresis guillemotleft -44
-KPX Adieresis guilsinglleft -40
-KPX Adieresis hyphen -3
-KPX Adieresis o -13
-KPX Adieresis period 5
-KPX Adieresis q -8
-KPX Adieresis quotedblright -56
-KPX Adieresis quoteright -65
-KPX Adieresis t -16
-KPX Adieresis u -12
-KPX Adieresis v -31
-KPX Adieresis w -21
-KPX Adieresis y -34
-KPX Agrave C -36
-KPX Agrave G -35
-KPX Agrave O -33
-KPX Agrave Q -32
-KPX Agrave T -93
-KPX Agrave U -37
-KPX Agrave V -75
-KPX Agrave W -51
-KPX Agrave Y -99
-KPX Agrave comma 5
-KPX Agrave period 5
-KPX Aring C -36
-KPX Aring G -35
-KPX Aring O -33
-KPX Aring Q -32
-KPX Aring T -93
-KPX Aring U -37
-KPX Aring V -75
-KPX Aring W -51
-KPX Aring Y -99
-KPX Aring a -4
-KPX Aring b 4
-KPX Aring c -11
-KPX Aring comma 5
-KPX Aring d -8
-KPX Aring e -16
-KPX Aring g -10
-KPX Aring guillemotleft -44
-KPX Aring guilsinglleft -40
-KPX Aring hyphen -3
-KPX Aring o -13
-KPX Aring period 5
-KPX Aring q -8
-KPX Aring quotedblright -56
-KPX Aring quoteright -65
-KPX Aring t -16
-KPX Aring u -12
-KPX Aring v -31
-KPX Aring w -21
-KPX Aring y -34
-KPX Atilde C -36
-KPX Atilde G -35
-KPX Atilde O -33
-KPX Atilde Q -32
-KPX Atilde T -93
-KPX Atilde U -37
-KPX Atilde V -75
-KPX Atilde W -51
-KPX Atilde Y -99
-KPX Atilde comma 5
-KPX Atilde period 5
-KPX B A -21
-KPX B AE -21
-KPX B Aacute -21
-KPX B Acircumflex -21
-KPX B Adieresis -21
-KPX B Aring -21
-KPX B Atilde -21
-KPX B O -7
-KPX B OE -5
-KPX B Oacute -7
-KPX B Ocircumflex -7
-KPX B Odieresis -7
-KPX B Ograve -7
-KPX B Oslash -1
-KPX B V -41
-KPX B W -25
-KPX B Y -44
-KPX C A -32
-KPX C AE -33
-KPX C Aacute -32
-KPX C Adieresis -32
-KPX C Aring -32
-KPX C H -12
-KPX C K -10
-KPX C O -8
-KPX C Oacute -8
-KPX C Odieresis -8
-KPX Ccedilla A -31
-KPX D A -42
-KPX D Aacute -42
-KPX D Acircumflex -42
-KPX D Adieresis -42
-KPX D Agrave -42
-KPX D Aring -42
-KPX D Atilde -42
-KPX D J -5
-KPX D T -45
-KPX D V -51
-KPX D W -29
-KPX D X -53
-KPX D Y -63
-KPX F A -69
-KPX F Aacute -69
-KPX F Acircumflex -69
-KPX F Adieresis -69
-KPX F Agrave -69
-KPX F Aring -69
-KPX F Atilde -69
-KPX F J -51
-KPX F O -22
-KPX F Odieresis -22
-KPX F a -33
-KPX F aacute -33
-KPX F adieresis -33
-KPX F ae -29
-KPX F aring -33
-KPX F comma -108
-KPX F e -24
-KPX F eacute -24
-KPX F hyphen -14
-KPX F i -10
-KPX F j -12
-KPX F o -21
-KPX F oacute -21
-KPX F odieresis -21
-KPX F oe -23
-KPX F oslash -21
-KPX F period -108
-KPX F r -35
-KPX F u -33
-KPX G A -6
-KPX G AE -3
-KPX G Aacute -6
-KPX G Acircumflex -6
-KPX G Adieresis -6
-KPX G Agrave -6
-KPX G Aring -6
-KPX G Atilde -6
-KPX G T -44
-KPX G V -50
-KPX G W -28
-KPX G Y -62
-KPX J A -32
-KPX J AE -31
-KPX J Adieresis -32
-KPX J Aring -32
-KPX K C -51
-KPX K G -51
-KPX K O -48
-KPX K OE -45
-KPX K Oacute -48
-KPX K Odieresis -48
-KPX K S -38
-KPX K T 20
-KPX K a -11
-KPX K adieresis -11
-KPX K ae -7
-KPX K aring -11
-KPX K e -32
-KPX K hyphen -47
-KPX K o -29
-KPX K oacute -29
-KPX K odieresis -29
-KPX K u -19
-KPX K udieresis -19
-KPX K y -62
-KPX L A 17
-KPX L AE 20
-KPX L Aacute 17
-KPX L Adieresis 17
-KPX L Aring 17
-KPX L C -41
-KPX L Ccedilla -37
-KPX L G -42
-KPX L O -41
-KPX L Oacute -41
-KPX L Ocircumflex -41
-KPX L Odieresis -41
-KPX L Ograve -41
-KPX L Otilde -41
-KPX L S -19
-KPX L T -105
-KPX L U -35
-KPX L Udieresis -35
-KPX L V -105
-KPX L W -68
-KPX L Y -121
-KPX L hyphen -125
-KPX L quotedblright -141
-KPX L quoteright -149
-KPX L u -7
-KPX L udieresis -7
-KPX L y -56
-KPX N A -9
-KPX N AE -6
-KPX N Aacute -9
-KPX N Adieresis -9
-KPX N Aring -9
-KPX N C -3
-KPX N Ccedilla -3
-KPX N G -2
-KPX N O 0
-KPX N Oacute 0
-KPX N Odieresis 0
-KPX N a -5
-KPX N aacute -5
-KPX N adieresis -5
-KPX N ae -2
-KPX N aring -5
-KPX N comma -7
-KPX N e 0
-KPX N eacute 0
-KPX N o 2
-KPX N oacute 2
-KPX N odieresis 2
-KPX N oslash 4
-KPX N period -7
-KPX N u 0
-KPX N udieresis 0
-KPX O A -35
-KPX O AE -39
-KPX O Aacute -35
-KPX O Adieresis -35
-KPX O Aring -35
-KPX O T -42
-KPX O V -45
-KPX O W -23
-KPX O X -46
-KPX O Y -59
-KPX Oacute A -35
-KPX Oacute T -42
-KPX Oacute V -45
-KPX Oacute W -23
-KPX Oacute Y -59
-KPX Ocircumflex T -42
-KPX Ocircumflex V -45
-KPX Ocircumflex Y -59
-KPX Odieresis A -35
-KPX Odieresis T -42
-KPX Odieresis V -45
-KPX Odieresis W -23
-KPX Odieresis X -46
-KPX Odieresis Y -59
-KPX Ograve T -42
-KPX Ograve V -45
-KPX Ograve Y -59
-KPX Oslash A -33
-KPX Otilde T -42
-KPX Otilde V -45
-KPX Otilde Y -59
-KPX P A -78
-KPX P AE -86
-KPX P Aacute -78
-KPX P Adieresis -78
-KPX P Aring -78
-KPX P J -78
-KPX P a -28
-KPX P aacute -28
-KPX P adieresis -28
-KPX P ae -24
-KPX P aring -28
-KPX P comma -135
-KPX P e -31
-KPX P eacute -31
-KPX P hyphen -40
-KPX P o -27
-KPX P oacute -27
-KPX P odieresis -27
-KPX P oe -28
-KPX P oslash -27
-KPX P period -135
-KPX R C -16
-KPX R Ccedilla -16
-KPX R G -15
-KPX R O -13
-KPX R OE -11
-KPX R Oacute -13
-KPX R Odieresis -13
-KPX R T -23
-KPX R U -17
-KPX R Udieresis -17
-KPX R V -39
-KPX R W -27
-KPX R Y -43
-KPX R a -15
-KPX R aacute -15
-KPX R adieresis -15
-KPX R ae -12
-KPX R aring -15
-KPX R e -12
-KPX R eacute -12
-KPX R hyphen -2
-KPX R o -9
-KPX R oacute -9
-KPX R odieresis -9
-KPX R oe -11
-KPX R u -9
-KPX R uacute -9
-KPX R udieresis -9
-KPX R y -8
-KPX S A -22
-KPX S AE -22
-KPX S Aacute -22
-KPX S Adieresis -22
-KPX S Aring -22
-KPX S T -28
-KPX S V -42
-KPX S W -28
-KPX S Y -48
-KPX S t -3
-KPX T A -95
-KPX T AE -97
-KPX T Aacute -95
-KPX T Acircumflex -95
-KPX T Adieresis -95
-KPX T Agrave -95
-KPX T Aring -95
-KPX T Atilde -95
-KPX T C -44
-KPX T G -45
-KPX T J -100
-KPX T O -42
-KPX T OE -35
-KPX T Oacute -42
-KPX T Ocircumflex -42
-KPX T Odieresis -42
-KPX T Ograve -42
-KPX T Oslash -41
-KPX T Otilde -42
-KPX T S -24
-KPX T V 12
-KPX T W 16
-KPX T Y 20
-KPX T a -100
-KPX T ae -97
-KPX T c -90
-KPX T colon -133
-KPX T comma -100
-KPX T e -95
-KPX T g -89
-KPX T guillemotleft -121
-KPX T guilsinglleft -117
-KPX T hyphen -77
-KPX T i -3
-KPX T j -5
-KPX T o -92
-KPX T oslash -87
-KPX T period -100
-KPX T r -92
-KPX T s -92
-KPX T semicolon -129
-KPX T u -91
-KPX T v -95
-KPX T w -93
-KPX T y -100
-KPX U A -36
-KPX U AE -39
-KPX U Aacute -36
-KPX U Acircumflex -36
-KPX U Adieresis -36
-KPX U Aring -36
-KPX U Atilde -36
-KPX U comma -27
-KPX U m -4
-KPX U n -4
-KPX U p 3
-KPX U period -25
-KPX U r -4
-KPX Uacute A -36
-KPX Uacute comma -27
-KPX Uacute m -4
-KPX Uacute n -4
-KPX Uacute p 3
-KPX Uacute period -25
-KPX Uacute r -4
-KPX Ucircumflex A -36
-KPX Udieresis A -36
-KPX Udieresis b 3
-KPX Udieresis comma -27
-KPX Udieresis m -4
-KPX Udieresis n -4
-KPX Udieresis p 3
-KPX Udieresis period -25
-KPX Udieresis r -4
-KPX Ugrave A -36
-KPX V A -71
-KPX V AE -78
-KPX V Aacute -71
-KPX V Acircumflex -71
-KPX V Adieresis -71
-KPX V Agrave -71
-KPX V Aring -71
-KPX V Atilde -71
-KPX V C -43
-KPX V G -42
-KPX V O -40
-KPX V Oacute -40
-KPX V Ocircumflex -40
-KPX V Odieresis -40
-KPX V Ograve -40
-KPX V Oslash -33
-KPX V Otilde -40
-KPX V S -35
-KPX V T 15
-KPX V a -59
-KPX V ae -55
-KPX V colon -66
-KPX V comma -89
-KPX V e -57
-KPX V g -50
-KPX V guillemotleft -83
-KPX V guilsinglleft -80
-KPX V hyphen -38
-KPX V i -5
-KPX V o -54
-KPX V oslash -50
-KPX V period -89
-KPX V r -42
-KPX V semicolon -66
-KPX V u -41
-KPX V y -20
-KPX W A -50
-KPX W AE -56
-KPX W Aacute -50
-KPX W Acircumflex -50
-KPX W Adieresis -50
-KPX W Agrave -50
-KPX W Aring -50
-KPX W Atilde -50
-KPX W C -23
-KPX W G -22
-KPX W O -20
-KPX W Oacute -20
-KPX W Ocircumflex -20
-KPX W Odieresis -20
-KPX W Ograve -20
-KPX W Oslash -13
-KPX W Otilde -20
-KPX W S -24
-KPX W T 19
-KPX W a -38
-KPX W ae -34
-KPX W colon -52
-KPX W comma -56
-KPX W e -32
-KPX W g -25
-KPX W guillemotleft -58
-KPX W guilsinglleft -54
-KPX W hyphen -13
-KPX W i -1
-KPX W o -29
-KPX W oslash -25
-KPX W period -56
-KPX W r -28
-KPX W semicolon -53
-KPX W u -28
-KPX W y -6
-KPX X C -48
-KPX X O -45
-KPX X Odieresis -45
-KPX X Q -44
-KPX X a -15
-KPX X e -36
-KPX X hyphen -51
-KPX X o -33
-KPX X u -24
-KPX X y -61
-KPX Y A -96
-KPX Y AE -103
-KPX Y Aacute -96
-KPX Y Acircumflex -96
-KPX Y Adieresis -96
-KPX Y Agrave -96
-KPX Y Aring -96
-KPX Y Atilde -96
-KPX Y C -58
-KPX Y G -58
-KPX Y O -56
-KPX Y Oacute -56
-KPX Y Ocircumflex -56
-KPX Y Odieresis -56
-KPX Y Ograve -56
-KPX Y Oslash -54
-KPX Y Otilde -56
-KPX Y S -41
-KPX Y T 23
-KPX Y a -88
-KPX Y ae -84
-KPX Y colon -87
-KPX Y comma -111
-KPX Y e -89
-KPX Y g -83
-KPX Y guillemotleft -123
-KPX Y guilsinglleft -119
-KPX Y hyphen -84
-KPX Y i 3
-KPX Y o -86
-KPX Y oslash -82
-KPX Y p -54
-KPX Y period -111
-KPX Y semicolon -88
-KPX Y u -63
-KPX Y v -36
-KPX Z v -33
-KPX Z y -38
-KPX a j -4
-KPX a quoteright -23
-KPX a v -21
-KPX a w -13
-KPX a y -26
-KPX aacute v -21
-KPX aacute w -13
-KPX aacute y -26
-KPX adieresis v -21
-KPX adieresis w -13
-KPX adieresis y -26
-KPX ae v -16
-KPX ae w -10
-KPX ae y -20
-KPX agrave v -21
-KPX agrave w -13
-KPX agrave y -26
-KPX aring v -21
-KPX aring w -13
-KPX aring y -26
-KPX b v -11
-KPX b w -3
-KPX b y -15
-KPX c h 1
-KPX c k 7
-KPX comma one -100
-KPX comma quotedblright -41
-KPX comma quoteright -50
-KPX e quoteright -18
-KPX e t -10
-KPX e v -15
-KPX e w -9
-KPX e x -27
-KPX e y -19
-KPX eacute v -15
-KPX eacute w -9
-KPX eacute y -19
-KPX ecircumflex v -15
-KPX ecircumflex w -9
-KPX ecircumflex y -19
-KPX eight four 1
-KPX eight one -48
-KPX eight seven -33
-KPX f a -9
-KPX f aacute -9
-KPX f adieresis -9
-KPX f ae -5
-KPX f aring -9
-KPX f e -15
-KPX f eacute -15
-KPX f f 22
-KPX f i -2
-KPX f j -4
-KPX f l -3
-KPX f o -10
-KPX f oacute -10
-KPX f odieresis -10
-KPX f oe -12
-KPX f oslash -9
-KPX f quoteright 0
-KPX f s 0
-KPX f t 24
-KPX five four 1
-KPX five one -76
-KPX five seven -26
-KPX four four 5
-KPX four one -84
-KPX four seven -56
-KPX g a -5
-KPX g adieresis -5
-KPX g ae -1
-KPX g aring -5
-KPX g e 0
-KPX g eacute 0
-KPX g l 0
-KPX g oacute 3
-KPX g odieresis 3
-KPX g r 0
-KPX guillemotright A -50
-KPX guillemotright AE -54
-KPX guillemotright Aacute -50
-KPX guillemotright Adieresis -50
-KPX guillemotright Aring -50
-KPX guillemotright T -126
-KPX guillemotright V -93
-KPX guillemotright W -66
-KPX guillemotright Y -133
-KPX guilsinglright A -44
-KPX guilsinglright AE -48
-KPX guilsinglright Aacute -44
-KPX guilsinglright Adieresis -44
-KPX guilsinglright Aring -44
-KPX guilsinglright T -121
-KPX guilsinglright V -88
-KPX guilsinglright W -60
-KPX guilsinglright Y -128
-KPX h quoteright -15
-KPX h y -18
-KPX hyphen A -7
-KPX hyphen AE -11
-KPX hyphen Aacute -7
-KPX hyphen Adieresis -7
-KPX hyphen Aring -7
-KPX hyphen T -80
-KPX hyphen V -46
-KPX hyphen W -19
-KPX hyphen Y -92
-KPX i T -7
-KPX i j -3
-KPX k a -2
-KPX k aacute -2
-KPX k adieresis -2
-KPX k ae 2
-KPX k aring -2
-KPX k comma 0
-KPX k e -21
-KPX k eacute -21
-KPX k g -16
-KPX k hyphen -41
-KPX k o -19
-KPX k oacute -19
-KPX k odieresis -19
-KPX k period 0
-KPX k s -3
-KPX k u -11
-KPX k udieresis -6
-KPX l v 0
-KPX l y -5
-KPX m p 5
-KPX m v -13
-KPX m w -7
-KPX m y -18
-KPX n T -96
-KPX n p 5
-KPX n quoteright -14
-KPX n v -13
-KPX n w -7
-KPX n y -18
-KPX nine four -3
-KPX nine one -43
-KPX nine seven -37
-KPX o T -99
-KPX o quoteright -21
-KPX o t -10
-KPX o v -18
-KPX o w -10
-KPX o x -27
-KPX o y -22
-KPX oacute v -18
-KPX oacute w -10
-KPX oacute y -22
-KPX ocircumflex t -10
-KPX odieresis t -10
-KPX odieresis v -18
-KPX odieresis w -10
-KPX odieresis x -27
-KPX odieresis y -22
-KPX ograve v -18
-KPX ograve w -10
-KPX ograve y -22
-KPX one comma -74
-KPX one eight -65
-KPX one five -67
-KPX one four -81
-KPX one nine -65
-KPX one one -118
-KPX one period -74
-KPX one seven -90
-KPX one six -62
-KPX one three -67
-KPX one two -69
-KPX one zero -62
-KPX p t -4
-KPX p y -16
-KPX period one -101
-KPX period quotedblright -41
-KPX period quoteright -51
-KPX q c 8
-KPX q u 4
-KPX quotedblbase A 30
-KPX quotedblbase AE 30
-KPX quotedblbase T -75
-KPX quotedblbase V -69
-KPX quotedblbase W -34
-KPX quotedblbase Y -91
-KPX quotedblleft A -52
-KPX quotedblleft AE -64
-KPX quotedblleft Aacute -52
-KPX quotedblleft Adieresis -52
-KPX quotedblleft Aring -52
-KPX quotedblleft T 9
-KPX quotedblleft V 15
-KPX quotedblleft W 27
-KPX quotedblleft Y 5
-KPX quotedblright A -53
-KPX quotedblright AE -66
-KPX quotedblright Aacute -53
-KPX quotedblright Adieresis -53
-KPX quotedblright Aring -53
-KPX quotedblright T 11
-KPX quotedblright V 15
-KPX quotedblright W 26
-KPX quotedblright Y 7
-KPX quoteleft A -67
-KPX quoteleft AE -79
-KPX quoteleft Aacute -67
-KPX quoteleft Adieresis -67
-KPX quoteleft Aring -67
-KPX quoteleft T -5
-KPX quoteleft V 0
-KPX quoteleft W 12
-KPX quoteleft Y -9
-KPX quoteright A -72
-KPX quoteright AE -85
-KPX quoteright Aacute -72
-KPX quoteright Adieresis -72
-KPX quoteright Aring -72
-KPX quoteright comma -60
-KPX quoteright d -20
-KPX quoteright o -26
-KPX quoteright period -60
-KPX quoteright r -18
-KPX quoteright s -18
-KPX quoteright t -7
-KPX quoteright v -2
-KPX quoteright w 2
-KPX quoteright y -6
-KPX r a -5
-KPX r aacute -5
-KPX r acircumflex -5
-KPX r adieresis -5
-KPX r ae -1
-KPX r agrave -5
-KPX r aring -5
-KPX r c -6
-KPX r ccedilla -9
-KPX r colon -22
-KPX r comma -69
-KPX r d -1
-KPX r e -11
-KPX r eacute -11
-KPX r ecircumflex -11
-KPX r egrave -11
-KPX r f 26
-KPX r g -4
-KPX r h 0
-KPX r hyphen -47
-KPX r i 1
-KPX r j 0
-KPX r k 6
-KPX r l 1
-KPX r m 0
-KPX r n 0
-KPX r o -6
-KPX r oacute -6
-KPX r ocircumflex -6
-KPX r odieresis -6
-KPX r oe -8
-KPX r ograve -6
-KPX r oslash -6
-KPX r p 8
-KPX r period -69
-KPX r q -3
-KPX r quoteright 1
-KPX r r 0
-KPX r s 4
-KPX r semicolon -22
-KPX r t 28
-KPX r u 2
-KPX r v 29
-KPX r w 31
-KPX r x 20
-KPX r y 24
-KPX r z 9
-KPX s quoteright -22
-KPX s t -3
-KPX seven colon -77
-KPX seven comma -119
-KPX seven eight -28
-KPX seven five -30
-KPX seven four -93
-KPX seven one -53
-KPX seven period -119
-KPX seven seven -4
-KPX seven six -40
-KPX seven three -23
-KPX seven two -28
-KPX six four 1
-KPX six one -43
-KPX six seven -30
-KPX t S -8
-KPX t a -1
-KPX t aacute -1
-KPX t adieresis -1
-KPX t ae 2
-KPX t aring -1
-KPX t colon -28
-KPX t e -14
-KPX t eacute -14
-KPX t h -3
-KPX t o -12
-KPX t oacute -12
-KPX t odieresis -12
-KPX t quoteright -1
-KPX t semicolon -28
-KPX three four -2
-KPX three one -49
-KPX three seven -33
-KPX two four -37
-KPX two one -36
-KPX two seven -25
-KPX u quoteright -8
-KPX v a -18
-KPX v aacute -18
-KPX v acircumflex -18
-KPX v adieresis -18
-KPX v ae -14
-KPX v agrave -18
-KPX v aring -18
-KPX v atilde -18
-KPX v c -16
-KPX v colon -23
-KPX v comma -69
-KPX v e -21
-KPX v eacute -21
-KPX v ecircumflex -21
-KPX v egrave -21
-KPX v g -14
-KPX v hyphen -12
-KPX v l 0
-KPX v o -17
-KPX v oacute -17
-KPX v odieresis -17
-KPX v ograve -17
-KPX v oslash -17
-KPX v period -69
-KPX v s -9
-KPX v semicolon -23
-KPX w a -15
-KPX w aacute -15
-KPX w acircumflex -15
-KPX w adieresis -15
-KPX w ae -11
-KPX w agrave -15
-KPX w aring -15
-KPX w atilde -15
-KPX w c -7
-KPX w colon -23
-KPX w comma -50
-KPX w e -12
-KPX w eacute -12
-KPX w ecircumflex -12
-KPX w egrave -12
-KPX w g -6
-KPX w hyphen -1
-KPX w l 0
-KPX w o -9
-KPX w oacute -9
-KPX w odieresis -9
-KPX w ograve -9
-KPX w oslash -6
-KPX w period -50
-KPX w s -5
-KPX w semicolon -23
-KPX x a -17
-KPX x c -23
-KPX x e -28
-KPX x eacute -28
-KPX x o -25
-KPX x q -20
-KPX y a -22
-KPX y aacute -22
-KPX y acircumflex -22
-KPX y adieresis -22
-KPX y ae -18
-KPX y agrave -22
-KPX y aring -22
-KPX y atilde -22
-KPX y c -19
-KPX y colon -27
-KPX y comma -70
-KPX y e -24
-KPX y eacute -24
-KPX y ecircumflex -24
-KPX y egrave -24
-KPX y g -17
-KPX y hyphen -14
-KPX y l -4
-KPX y o -20
-KPX y oacute -20
-KPX y odieresis -20
-KPX y ograve -20
-KPX y oslash -19
-KPX y period -70
-KPX y s -12
-KPX y semicolon -27
-KPX zero four -2
-KPX zero one -46
-KPX zero seven -39
-EndKernPairs
-EndKernData
-EndFontMetrics
diff --git a/data/fonts/urw/n019003l.pfb b/data/fonts/urw/n019003l.pfb
deleted file mode 100644
index ff605552c..000000000
--- a/data/fonts/urw/n019003l.pfb
+++ /dev/null
diff --git a/data/fonts/urw/n019003l.pfm b/data/fonts/urw/n019003l.pfm
deleted file mode 100644
index ec2b7fda2..000000000
--- a/data/fonts/urw/n019003l.pfm
+++ /dev/null
diff --git a/data/fonts/urw/n019004l.afm b/data/fonts/urw/n019004l.afm
deleted file mode 100644
index fe41636b6..000000000
--- a/data/fonts/urw/n019004l.afm
+++ /dev/null
@@ -1,1341 +0,0 @@
-StartFontMetrics 3.0
-Comment Copyright (URW)++,Copyright 1999 by (URW)++ Design & Development
-Comment Creation Date: 12/22/1999
-Comment See the file COPYING (GNU General Public License) for license conditions.
-FontName NimbusSanL-Bold
-FullName Nimbus Sans L Bold
-FamilyName Nimbus Sans L
-Weight Bold
-ItalicAngle 0.0
-IsFixedPitch false
-UnderlinePosition -155
-UnderlineThickness 69
-Version 1.05
-Notice (URW)++,Copyright 1999 by (URW)++ Design & Development
-EncodingScheme AdobeStandardEncoding
-FontBBox -173 -307 1003 949
-CapHeight 729
-XHeight 540
-Descender -217
-Ascender 729
-StartCharMetrics 316
-C 32 ; WX 278 ; N space ; B 214 0 214 0 ;
-C 33 ; WX 333 ; N exclam ; B 112 0 262 726 ;
-C 34 ; WX 474 ; N quotedbl ; B 50 470 424 729 ;
-C 35 ; WX 556 ; N numbersign ; B 3 -32 553 697 ;
-C 36 ; WX 556 ; N dollar ; B 22 -126 527 763 ;
-C 37 ; WX 889 ; N percent ; B 22 -20 863 709 ;
-C 38 ; WX 722 ; N ampersand ; B 55 -23 694 723 ;
-C 39 ; WX 278 ; N quoteright ; B 66 469 201 729 ;
-C 40 ; WX 333 ; N parenleft ; B 40 -200 303 729 ;
-C 41 ; WX 333 ; N parenright ; B 22 -200 285 729 ;
-C 42 ; WX 389 ; N asterisk ; B 23 407 357 729 ;
-C 43 ; WX 584 ; N plus ; B 50 -10 533 473 ;
-C 44 ; WX 278 ; N comma ; B 64 -174 214 146 ;
-C 45 ; WX 333 ; N hyphen ; B 26 207 298 342 ;
-C 46 ; WX 278 ; N period ; B 64 0 214 146 ;
-C 47 ; WX 278 ; N slash ; B 2 -14 275 714 ;
-C 48 ; WX 556 ; N zero ; B 29 -23 517 724 ;
-C 49 ; WX 556 ; N one ; B 68 0 378 709 ;
-C 50 ; WX 556 ; N two ; B 30 0 515 724 ;
-C 51 ; WX 556 ; N three ; B 29 -23 516 724 ;
-C 52 ; WX 556 ; N four ; B 24 0 522 709 ;
-C 53 ; WX 556 ; N five ; B 27 -23 517 709 ;
-C 54 ; WX 556 ; N six ; B 32 -23 519 724 ;
-C 55 ; WX 556 ; N seven ; B 29 0 528 709 ;
-C 56 ; WX 556 ; N eight ; B 22 -23 525 724 ;
-C 57 ; WX 556 ; N nine ; B 28 -24 516 724 ;
-C 58 ; WX 333 ; N colon ; B 113 0 263 520 ;
-C 59 ; WX 333 ; N semicolon ; B 113 -174 263 520 ;
-C 60 ; WX 584 ; N less ; B 40 -10 529 474 ;
-C 61 ; WX 584 ; N equal ; B 50 52 534 411 ;
-C 62 ; WX 584 ; N greater ; B 40 -10 529 474 ;
-C 63 ; WX 611 ; N question ; B 64 0 556 744 ;
-C 64 ; WX 975 ; N at ; B 27 -138 947 745 ;
-C 65 ; WX 722 ; N A ; B 26 0 703 729 ;
-C 66 ; WX 722 ; N B ; B 82 0 666 729 ;
-C 67 ; WX 722 ; N C ; B 44 -23 685 741 ;
-C 68 ; WX 722 ; N D ; B 77 0 681 729 ;
-C 69 ; WX 667 ; N E ; B 79 0 624 729 ;
-C 70 ; WX 611 ; N F ; B 74 0 586 729 ;
-C 71 ; WX 778 ; N G ; B 42 -23 711 741 ;
-C 72 ; WX 722 ; N H ; B 68 0 657 729 ;
-C 73 ; WX 278 ; N I ; B 63 0 213 729 ;
-C 74 ; WX 556 ; N J ; B 24 -23 486 729 ;
-C 75 ; WX 722 ; N K ; B 74 0 717 729 ;
-C 76 ; WX 611 ; N L ; B 80 0 579 729 ;
-C 77 ; WX 833 ; N M ; B 66 0 776 729 ;
-C 78 ; WX 722 ; N N ; B 68 0 661 729 ;
-C 79 ; WX 778 ; N O ; B 40 -23 742 741 ;
-C 80 ; WX 667 ; N P ; B 76 0 633 729 ;
-C 81 ; WX 778 ; N Q ; B 43 -54 745 741 ;
-C 82 ; WX 722 ; N R ; B 80 0 677 729 ;
-C 83 ; WX 667 ; N S ; B 32 -23 633 741 ;
-C 84 ; WX 611 ; N T ; B 14 0 598 729 ;
-C 85 ; WX 722 ; N U ; B 76 -23 654 729 ;
-C 86 ; WX 667 ; N V ; B 24 0 647 729 ;
-C 87 ; WX 944 ; N W ; B 13 0 932 729 ;
-C 88 ; WX 667 ; N X ; B 22 0 653 729 ;
-C 89 ; WX 667 ; N Y ; B 27 0 650 729 ;
-C 90 ; WX 611 ; N Z ; B 30 0 578 729 ;
-C 91 ; WX 333 ; N bracketleft ; B 66 -200 308 729 ;
-C 92 ; WX 278 ; N backslash ; B -12 -14 289 714 ;
-C 93 ; WX 333 ; N bracketright ; B 18 -200 260 729 ;
-C 94 ; WX 584 ; N asciicircum ; B 61 270 522 695 ;
-C 95 ; WX 556 ; N underscore ; B -22 -189 578 -120 ;
-C 96 ; WX 278 ; N quoteleft ; B 67 469 202 729 ;
-C 97 ; WX 556 ; N a ; B 28 -23 524 549 ;
-C 98 ; WX 611 ; N b ; B 59 -23 575 729 ;
-C 99 ; WX 556 ; N c ; B 34 -23 522 549 ;
-C 100 ; WX 611 ; N d ; B 29 -23 545 729 ;
-C 101 ; WX 556 ; N e ; B 22 -23 525 549 ;
-C 102 ; WX 333 ; N f ; B 14 0 313 729 ;
-C 103 ; WX 611 ; N g ; B 34 -218 541 549 ;
-C 104 ; WX 611 ; N h ; B 67 0 541 729 ;
-C 105 ; WX 278 ; N i ; B 67 0 207 729 ;
-C 106 ; WX 278 ; N j ; B 4 -218 210 729 ;
-C 107 ; WX 556 ; N k ; B 59 0 548 729 ;
-C 108 ; WX 278 ; N l ; B 67 0 207 729 ;
-C 109 ; WX 889 ; N m ; B 60 0 824 549 ;
-C 110 ; WX 611 ; N n ; B 63 0 546 549 ;
-C 111 ; WX 611 ; N o ; B 35 -23 569 549 ;
-C 112 ; WX 611 ; N p ; B 58 -218 574 549 ;
-C 113 ; WX 611 ; N q ; B 28 -218 544 549 ;
-C 114 ; WX 389 ; N r ; B 63 0 370 549 ;
-C 115 ; WX 556 ; N s ; B 29 -23 520 549 ;
-C 116 ; WX 333 ; N t ; B 14 -23 301 674 ;
-C 117 ; WX 611 ; N u ; B 58 -23 541 540 ;
-C 118 ; WX 556 ; N v ; B 14 0 536 540 ;
-C 119 ; WX 778 ; N w ; B 5 0 766 540 ;
-C 120 ; WX 556 ; N x ; B 16 0 535 540 ;
-C 121 ; WX 556 ; N y ; B 9 -219 538 540 ;
-C 122 ; WX 500 ; N z ; B 21 0 468 540 ;
-C 123 ; WX 389 ; N braceleft ; B 37 -200 317 729 ;
-C 124 ; WX 280 ; N bar ; B 100 -200 180 729 ;
-C 125 ; WX 389 ; N braceright ; B 72 -200 352 729 ;
-C 126 ; WX 584 ; N asciitilde ; B 60 142 519 314 ;
-C 161 ; WX 333 ; N exclamdown ; B 66 -186 216 540 ;
-C 162 ; WX 556 ; N cent ; B 36 -124 522 634 ;
-C 163 ; WX 556 ; N sterling ; B 31 -23 537 715 ;
-C 164 ; WX 167 ; N fraction ; B -173 -20 337 715 ;
-C 165 ; WX 556 ; N yen ; B 5 0 552 704 ;
-C 166 ; WX 556 ; N florin ; B 21 -220 535 744 ;
-C 167 ; WX 556 ; N section ; B 33 -201 518 723 ;
-C 168 ; WX 556 ; N currency ; B 26 100 530 604 ;
-C 169 ; WX 238 ; N quotesingle ; B 50 470 188 729 ;
-C 170 ; WX 500 ; N quotedblleft ; B 71 469 433 729 ;
-C 171 ; WX 556 ; N guillemotleft ; B 88 72 468 481 ;
-C 172 ; WX 333 ; N guilsinglleft ; B 83 72 250 481 ;
-C 173 ; WX 333 ; N guilsinglright ; B 80 72 247 481 ;
-C 174 ; WX 611 ; N fi ; B 9 0 548 729 ;
-C 175 ; WX 611 ; N fl ; B 12 0 546 729 ;
-C 177 ; WX 556 ; N endash ; B -9 207 557 311 ;
-C 178 ; WX 556 ; N dagger ; B 31 -194 523 709 ;
-C 179 ; WX 556 ; N daggerdbl ; B 28 -194 520 709 ;
-C 180 ; WX 278 ; N periodcentered ; B 64 169 188 292 ;
-C 182 ; WX 556 ; N paragraph ; B 19 -191 529 729 ;
-C 183 ; WX 350 ; N bullet ; B 50 175 300 425 ;
-C 184 ; WX 278 ; N quotesinglbase ; B 66 -135 201 125 ;
-C 185 ; WX 500 ; N quotedblbase ; B 72 -135 432 125 ;
-C 186 ; WX 500 ; N quotedblright ; B 73 469 440 729 ;
-C 187 ; WX 556 ; N guillemotright ; B 88 72 462 481 ;
-C 188 ; WX 1000 ; N ellipsis ; B 92 0 908 146 ;
-C 189 ; WX 1000 ; N perthousand ; B 11 -22 990 739 ;
-C 191 ; WX 611 ; N questiondown ; B 51 -204 544 540 ;
-C 193 ; WX 333 ; N grave ; B 17 607 213 757 ;
-C 194 ; WX 333 ; N acute ; B 121 607 317 757 ;
-C 195 ; WX 333 ; N circumflex ; B 8 607 326 757 ;
-C 196 ; WX 333 ; N tilde ; B -9 621 345 749 ;
-C 197 ; WX 333 ; N macron ; B 16 640 315 719 ;
-C 198 ; WX 333 ; N breve ; B 35 605 299 748 ;
-C 199 ; WX 333 ; N dotaccent ; B 112 621 222 743 ;
-C 200 ; WX 333 ; N dieresis ; B 18 621 314 743 ;
-C 202 ; WX 333 ; N ring ; B 77 590 257 770 ;
-C 203 ; WX 333 ; N cedilla ; B 27 -220 294 0 ;
-C 205 ; WX 333 ; N hungarumlaut ; B -44 610 340 757 ;
-C 206 ; WX 333 ; N ogonek ; B 45 -234 268 0 ;
-C 207 ; WX 333 ; N caron ; B 9 607 327 757 ;
-C 208 ; WX 1000 ; N emdash ; B -7 207 1003 311 ;
-C 225 ; WX 1000 ; N AE ; B 1 0 966 729 ;
-C 227 ; WX 370 ; N ordfeminine ; B 31 262 329 729 ;
-C 232 ; WX 611 ; N Lslash ; B 0 0 597 729 ;
-C 233 ; WX 778 ; N Oslash ; B 31 -39 755 749 ;
-C 234 ; WX 1000 ; N OE ; B 28 -23 970 741 ;
-C 235 ; WX 365 ; N ordmasculine ; B 23 262 343 729 ;
-C 241 ; WX 889 ; N ae ; B 27 -24 857 549 ;
-C 245 ; WX 278 ; N dotlessi ; B 67 0 207 540 ;
-C 248 ; WX 278 ; N lslash ; B 0 0 252 729 ;
-C 249 ; WX 611 ; N oslash ; B 11 -38 598 557 ;
-C 250 ; WX 944 ; N oe ; B 23 -23 920 549 ;
-C 251 ; WX 611 ; N germandbls ; B 67 -17 575 729 ;
-C -1 ; WX 722 ; N Udieresis ; B 76 -23 654 922 ;
-C -1 ; WX 722 ; N Uacute ; B 76 -23 654 936 ;
-C -1 ; WX 667 ; N Scedilla ; B 32 -220 633 741 ;
-C -1 ; WX 611 ; N Tcaron ; B 14 0 598 936 ;
-C -1 ; WX 667 ; N Scaron ; B 32 -23 633 936 ;
-C -1 ; WX 722 ; N Rcaron ; B 80 0 677 936 ;
-C -1 ; WX 722 ; N Racute ; B 80 0 677 936 ;
-C -1 ; WX 667 ; N Sacute ; B 32 -23 633 936 ;
-C -1 ; WX 778 ; N Otilde ; B 40 -23 742 928 ;
-C -1 ; WX 611 ; N ucircumflex ; B 58 -23 541 757 ;
-C -1 ; WX 778 ; N Ohungarumlaut ; B 40 -23 742 936 ;
-C -1 ; WX 722 ; N Uhungarumlaut ; B 76 -23 654 936 ;
-C -1 ; WX 667 ; N Yacute ; B 27 0 650 936 ;
-C -1 ; WX 722 ; N Eth ; B 0 0 681 729 ;
-C -1 ; WX 722 ; N Dcroat ; B 0 0 681 729 ;
-C -1 ; WX 611 ; N Zacute ; B 30 0 578 936 ;
-C -1 ; WX 722 ; N Uring ; B 76 -23 654 949 ;
-C -1 ; WX 611 ; N gbreve ; B 34 -218 541 748 ;
-C -1 ; WX 556 ; N eogonek ; B 21 -234 525 549 ;
-C -1 ; WX 556 ; N edotaccent ; B 22 -23 525 743 ;
-C -1 ; WX 556 ; N ecaron ; B 22 -23 525 757 ;
-C -1 ; WX 722 ; N Ugrave ; B 76 -23 654 936 ;
-C -1 ; WX 667 ; N Thorn ; B 76 0 633 729 ;
-C -1 ; WX 556 ; N eacute ; B 22 -23 525 757 ;
-C -1 ; WX 556 ; N edieresis ; B 22 -23 525 743 ;
-C -1 ; WX 707 ; N dcaron ; B 29 -23 720 729 ;
-C -1 ; WX 556 ; N ccedilla ; B 34 -220 522 549 ;
-C -1 ; WX 556 ; N ccaron ; B 34 -23 522 757 ;
-C -1 ; WX 556 ; N cacute ; B 34 -23 522 757 ;
-C -1 ; WX 556 ; N aogonek ; B 28 -233 548 549 ;
-C -1 ; WX 556 ; N aring ; B 28 -23 524 770 ;
-C -1 ; WX 556 ; N atilde ; B 28 -23 524 749 ;
-C -1 ; WX 556 ; N abreve ; B 28 -23 524 748 ;
-C -1 ; WX 556 ; N egrave ; B 22 -23 525 757 ;
-C -1 ; WX 556 ; N agrave ; B 28 -23 524 757 ;
-C -1 ; WX 556 ; N aacute ; B 28 -23 524 757 ;
-C -1 ; WX 556 ; N adieresis ; B 28 -23 524 743 ;
-C -1 ; WX 722 ; N Uogonek ; B 76 -234 654 729 ;
-C -1 ; WX 611 ; N ugrave ; B 58 -23 541 757 ;
-C -1 ; WX 611 ; N uacute ; B 58 -23 541 757 ;
-C -1 ; WX 611 ; N udieresis ; B 58 -23 541 743 ;
-C -1 ; WX 385 ; N tcaron ; B 14 -23 398 829 ;
-C -1 ; WX 556 ; N scommaaccent ; B 29 -307 520 549 ;
-C -1 ; WX 611 ; N Zcaron ; B 30 0 578 936 ;
-C -1 ; WX 556 ; N ecircumflex ; B 22 -23 525 757 ;
-C -1 ; WX 722 ; N Ucircumflex ; B 76 -23 654 936 ;
-C -1 ; WX 556 ; N acircumflex ; B 28 -23 524 757 ;
-C -1 ; WX 611 ; N Zdotaccent ; B 30 0 578 922 ;
-C -1 ; WX 556 ; N scaron ; B 29 -23 520 757 ;
-C -1 ; WX 722 ; N Amacron ; B 26 0 703 898 ;
-C -1 ; WX 556 ; N sacute ; B 29 -23 520 757 ;
-C -1 ; WX 611 ; N Tcommaaccent ; B 14 -307 598 729 ;
-C -1 ; WX 667 ; N Ydieresis ; B 27 0 650 922 ;
-C -1 ; WX 611 ; N thorn ; B 58 -218 574 729 ;
-C -1 ; WX 667 ; N Emacron ; B 79 0 624 898 ;
-C -1 ; WX 778 ; N Ograve ; B 40 -23 742 936 ;
-C -1 ; WX 778 ; N Oacute ; B 40 -23 742 936 ;
-C -1 ; WX 778 ; N Odieresis ; B 40 -23 742 922 ;
-C -1 ; WX 722 ; N Ntilde ; B 68 0 661 928 ;
-C -1 ; WX 722 ; N Ncaron ; B 68 0 661 936 ;
-C -1 ; WX 722 ; N Nacute ; B 68 0 661 936 ;
-C -1 ; WX 611 ; N Lcaron ; B 80 0 579 729 ;
-C -1 ; WX 611 ; N Lacute ; B 80 0 579 936 ;
-C -1 ; WX 278 ; N Idotaccent ; B 63 0 213 922 ;
-C -1 ; WX 389 ; N racute ; B 63 0 370 757 ;
-C -1 ; WX 278 ; N Icircumflex ; B -19 0 299 936 ;
-C -1 ; WX 611 ; N ohungarumlaut ; B 35 -23 569 757 ;
-C -1 ; WX 611 ; N otilde ; B 35 -23 569 749 ;
-C -1 ; WX 556 ; N Euro ; B 6 -23 546 724 ;
-C -1 ; WX 611 ; N ocircumflex ; B 35 -23 569 757 ;
-C -1 ; WX 351 ; N onesuperior ; B 40 284 242 709 ;
-C -1 ; WX 351 ; N twosuperior ; B 16 284 328 718 ;
-C -1 ; WX 351 ; N threesuperior ; B 15 271 329 718 ;
-C -1 ; WX 278 ; N Igrave ; B -10 0 213 936 ;
-C -1 ; WX 278 ; N Iacute ; B 63 0 290 936 ;
-C -1 ; WX 278 ; N Imacron ; B 2 0 274 898 ;
-C -1 ; WX 278 ; N Iogonek ; B 34 -233 237 729 ;
-C -1 ; WX 278 ; N Idieresis ; B -9 0 287 922 ;
-C -1 ; WX 778 ; N Gbreve ; B 42 -23 711 927 ;
-C -1 ; WX 722 ; N Umacron ; B 76 -23 654 898 ;
-C -1 ; WX 722 ; N Kcommaaccent ; B 74 -307 717 729 ;
-C -1 ; WX 611 ; N ograve ; B 35 -23 569 757 ;
-C -1 ; WX 667 ; N Scommaaccent ; B 32 -307 633 741 ;
-C -1 ; WX 667 ; N Eogonek ; B 79 -233 648 729 ;
-C -1 ; WX 611 ; N oacute ; B 35 -23 569 757 ;
-C -1 ; WX 667 ; N Edotaccent ; B 79 0 624 922 ;
-C -1 ; WX 278 ; N iogonek ; B 34 -233 231 729 ;
-C -1 ; WX 611 ; N gcommaaccent ; B 34 -218 541 853 ;
-C -1 ; WX 611 ; N odieresis ; B 35 -23 569 743 ;
-C -1 ; WX 611 ; N ntilde ; B 63 0 546 749 ;
-C -1 ; WX 611 ; N ncaron ; B 63 0 546 757 ;
-C -1 ; WX 667 ; N Ecaron ; B 79 0 624 936 ;
-C -1 ; WX 667 ; N Ecircumflex ; B 79 0 624 936 ;
-C -1 ; WX 556 ; N scedilla ; B 29 -220 520 549 ;
-C -1 ; WX 389 ; N rcaron ; B 54 0 372 757 ;
-C -1 ; WX 667 ; N Egrave ; B 79 0 624 936 ;
-C -1 ; WX 667 ; N Eacute ; B 79 0 624 936 ;
-C -1 ; WX 778 ; N Gcommaaccent ; B 42 -307 711 741 ;
-C -1 ; WX 722 ; N Rcommaaccent ; B 80 -307 677 729 ;
-C -1 ; WX 667 ; N Edieresis ; B 79 0 624 922 ;
-C -1 ; WX 611 ; N nacute ; B 63 0 546 757 ;
-C -1 ; WX 611 ; N uogonek ; B 58 -233 564 540 ;
-C -1 ; WX 611 ; N umacron ; B 58 -23 541 719 ;
-C -1 ; WX 722 ; N Dcaron ; B 77 0 681 936 ;
-C -1 ; WX 369 ; N lcaron ; B 67 0 382 729 ;
-C -1 ; WX 722 ; N Ccaron ; B 44 -23 685 936 ;
-C -1 ; WX 722 ; N Cacute ; B 44 -23 685 936 ;
-C -1 ; WX 722 ; N Ccedilla ; B 44 -220 685 741 ;
-C -1 ; WX 606 ; N degree ; B 151 383 454 686 ;
-C -1 ; WX 722 ; N Aogonek ; B 26 -233 723 729 ;
-C -1 ; WX 584 ; N minus ; B 40 172 544 291 ;
-C -1 ; WX 584 ; N multiply ; B 79 18 505 444 ;
-C -1 ; WX 584 ; N divide ; B 50 -11 534 474 ;
-C -1 ; WX 722 ; N Aring ; B 26 0 703 949 ;
-C -1 ; WX 1000 ; N trademark ; B 71 273 929 729 ;
-C -1 ; WX 389 ; N rcommaaccent ; B 63 -307 370 549 ;
-C -1 ; WX 278 ; N lacute ; B 67 0 278 936 ;
-C -1 ; WX 611 ; N omacron ; B 35 -23 569 719 ;
-C -1 ; WX 722 ; N Atilde ; B 26 0 703 928 ;
-C -1 ; WX 278 ; N icircumflex ; B -19 0 299 757 ;
-C -1 ; WX 278 ; N igrave ; B -10 0 207 757 ;
-C -1 ; WX 611 ; N ncommaaccent ; B 63 -307 546 549 ;
-C -1 ; WX 278 ; N lcommaaccent ; B 67 -307 207 729 ;
-C -1 ; WX 584 ; N plusminus ; B 56 -16 527 608 ;
-C -1 ; WX 869 ; N onehalf ; B 40 -20 846 715 ;
-C -1 ; WX 869 ; N onequarter ; B 40 -20 850 715 ;
-C -1 ; WX 869 ; N threequarters ; B 15 -20 850 718 ;
-C -1 ; WX 278 ; N iacute ; B 67 0 290 757 ;
-C -1 ; WX 722 ; N Abreve ; B 26 0 703 927 ;
-C -1 ; WX 556 ; N kcommaaccent ; B 59 -307 548 729 ;
-C -1 ; WX 778 ; N Omacron ; B 40 -23 742 898 ;
-C -1 ; WX 278 ; N imacron ; B 7 0 266 719 ;
-C -1 ; WX 556 ; N emacron ; B 22 -23 525 719 ;
-C -1 ; WX 556 ; N amacron ; B 28 -23 524 719 ;
-C -1 ; WX 333 ; N tcommaaccent ; B 14 -307 301 674 ;
-C -1 ; WX 556 ; N ydieresis ; B 9 -219 538 743 ;
-C -1 ; WX 500 ; N zdotaccent ; B 21 0 468 743 ;
-C -1 ; WX 500 ; N zcaron ; B 21 0 468 757 ;
-C -1 ; WX 500 ; N zacute ; B 21 0 468 757 ;
-C -1 ; WX 556 ; N yacute ; B 9 -219 538 757 ;
-C -1 ; WX 611 ; N uhungarumlaut ; B 58 -23 559 757 ;
-C -1 ; WX 611 ; N eth ; B 35 -23 569 744 ;
-C -1 ; WX 611 ; N uring ; B 58 -23 541 770 ;
-C -1 ; WX 778 ; N Ocircumflex ; B 40 -23 742 936 ;
-C -1 ; WX 333 ; N commaaccent ; B 112 -307 234 -60 ;
-C -1 ; WX 737 ; N copyright ; B -14 -22 751 743 ;
-C -1 ; WX 737 ; N registered ; B -14 -22 751 743 ;
-C -1 ; WX 722 ; N Acircumflex ; B 26 0 703 936 ;
-C -1 ; WX 278 ; N idieresis ; B -9 0 287 743 ;
-C -1 ; WX 489 ; N lozenge ; B 16 0 462 744 ;
-C -1 ; WX 729 ; N Delta ; B 8 0 721 729 ;
-C -1 ; WX 548 ; N notequal ; B 50 -69 534 528 ;
-C -1 ; WX 542 ; N radical ; B 7 -36 512 913 ;
-C -1 ; WX 722 ; N Agrave ; B 26 0 703 936 ;
-C -1 ; WX 722 ; N Aacute ; B 26 0 703 936 ;
-C -1 ; WX 584 ; N lessequal ; B 45 -10 534 639 ;
-C -1 ; WX 584 ; N greaterequal ; B 45 -10 534 639 ;
-C -1 ; WX 584 ; N logicalnot ; B 40 86 544 375 ;
-C -1 ; WX 711 ; N summation ; B 17 -96 694 760 ;
-C -1 ; WX 490 ; N partialdiff ; B 22 -15 458 750 ;
-C -1 ; WX 722 ; N Ncommaaccent ; B 68 -307 661 729 ;
-C -1 ; WX 611 ; N dcroat ; B 29 -23 605 729 ;
-C -1 ; WX 280 ; N brokenbar ; B 100 -200 180 729 ;
-C -1 ; WX 611 ; N Lcommaaccent ; B 80 -307 579 729 ;
-C -1 ; WX 722 ; N Adieresis ; B 26 0 703 922 ;
-C -1 ; WX 611 ; N mu ; B 58 -220 573 540 ;
-C -1 ; WX 278 ; N .notdef ; B 214 0 214 0 ;
-EndCharMetrics
-StartKernData
-StartKernPairs 998
-KPX A C -33
-KPX A Ccedilla -33
-KPX A G -35
-KPX A O -34
-KPX A Odieresis -34
-KPX A Q -35
-KPX A T -81
-KPX A U -32
-KPX A Uacute -32
-KPX A Ucircumflex -32
-KPX A Udieresis -32
-KPX A Ugrave -32
-KPX A V -66
-KPX A W -51
-KPX A Y -90
-KPX A a -1
-KPX A b -1
-KPX A c -14
-KPX A ccedilla -14
-KPX A comma 19
-KPX A d -13
-KPX A e -9
-KPX A g -14
-KPX A guillemotleft -43
-KPX A guilsinglleft -40
-KPX A hyphen 7
-KPX A o -16
-KPX A period 19
-KPX A q -12
-KPX A quotedblright -65
-KPX A quoteright -61
-KPX A t -18
-KPX A u -12
-KPX A v -37
-KPX A w -23
-KPX A y -35
-KPX Aacute C -33
-KPX Aacute G -35
-KPX Aacute O -34
-KPX Aacute Q -35
-KPX Aacute T -81
-KPX Aacute U -32
-KPX Aacute V -66
-KPX Aacute W -51
-KPX Aacute Y -90
-KPX Aacute a -1
-KPX Aacute b -1
-KPX Aacute c -14
-KPX Aacute comma 19
-KPX Aacute d -13
-KPX Aacute e -9
-KPX Aacute g -14
-KPX Aacute guillemotleft -43
-KPX Aacute guilsinglleft -40
-KPX Aacute hyphen 7
-KPX Aacute o -16
-KPX Aacute period 19
-KPX Aacute q -12
-KPX Aacute quoteright -61
-KPX Aacute t -18
-KPX Aacute u -12
-KPX Aacute v -37
-KPX Aacute w -23
-KPX Aacute y -35
-KPX Acircumflex C -33
-KPX Acircumflex G -35
-KPX Acircumflex O -34
-KPX Acircumflex Q -35
-KPX Acircumflex T -81
-KPX Acircumflex U -32
-KPX Acircumflex V -66
-KPX Acircumflex W -51
-KPX Acircumflex Y -90
-KPX Acircumflex comma 19
-KPX Acircumflex period 19
-KPX Adieresis C -33
-KPX Adieresis G -35
-KPX Adieresis O -34
-KPX Adieresis Q -35
-KPX Adieresis T -81
-KPX Adieresis U -32
-KPX Adieresis V -66
-KPX Adieresis W -51
-KPX Adieresis Y -90
-KPX Adieresis a -1
-KPX Adieresis b -1
-KPX Adieresis c -14
-KPX Adieresis comma 19
-KPX Adieresis d -13
-KPX Adieresis g -14
-KPX Adieresis guillemotleft -43
-KPX Adieresis guilsinglleft -40
-KPX Adieresis hyphen 7
-KPX Adieresis o -16
-KPX Adieresis period 19
-KPX Adieresis q -12
-KPX Adieresis quotedblright -65
-KPX Adieresis quoteright -61
-KPX Adieresis t -18
-KPX Adieresis u -12
-KPX Adieresis v -37
-KPX Adieresis w -23
-KPX Adieresis y -35
-KPX Agrave C -33
-KPX Agrave G -35
-KPX Agrave O -34
-KPX Agrave Q -35
-KPX Agrave T -81
-KPX Agrave U -32
-KPX Agrave V -66
-KPX Agrave W -51
-KPX Agrave Y -90
-KPX Agrave comma 19
-KPX Agrave period 19
-KPX Aring C -33
-KPX Aring G -35
-KPX Aring O -34
-KPX Aring Q -35
-KPX Aring T -81
-KPX Aring U -32
-KPX Aring V -66
-KPX Aring W -51
-KPX Aring Y -90
-KPX Aring a -1
-KPX Aring b -1
-KPX Aring c -14
-KPX Aring comma 19
-KPX Aring d -13
-KPX Aring e -9
-KPX Aring g -14
-KPX Aring guillemotleft -43
-KPX Aring guilsinglleft -40
-KPX Aring hyphen 7
-KPX Aring o -16
-KPX Aring period 19
-KPX Aring q -12
-KPX Aring quotedblright -65
-KPX Aring quoteright -61
-KPX Aring t -18
-KPX Aring u -12
-KPX Aring v -37
-KPX Aring w -23
-KPX Aring y -35
-KPX Atilde C -33
-KPX Atilde G -35
-KPX Atilde O -34
-KPX Atilde Q -35
-KPX Atilde T -81
-KPX Atilde U -32
-KPX Atilde V -66
-KPX Atilde W -51
-KPX Atilde Y -90
-KPX Atilde comma 19
-KPX Atilde period 19
-KPX B A -32
-KPX B AE -20
-KPX B Aacute -32
-KPX B Acircumflex -32
-KPX B Adieresis -32
-KPX B Aring -32
-KPX B Atilde -32
-KPX B O -11
-KPX B OE -2
-KPX B Oacute -11
-KPX B Ocircumflex -11
-KPX B Odieresis -11
-KPX B Ograve -11
-KPX B Oslash -5
-KPX B V -39
-KPX B W -27
-KPX B Y -51
-KPX C A -29
-KPX C AE -17
-KPX C Aacute -29
-KPX C Adieresis -29
-KPX C Aring -29
-KPX C H 5
-KPX C K 2
-KPX C O -6
-KPX C Oacute -6
-KPX C Odieresis -6
-KPX Ccedilla A -28
-KPX D A -37
-KPX D Aacute -37
-KPX D Acircumflex -37
-KPX D Adieresis -37
-KPX D Agrave -37
-KPX D Aring -37
-KPX D Atilde -37
-KPX D J 2
-KPX D T -17
-KPX D V -35
-KPX D W -20
-KPX D X -35
-KPX D Y -56
-KPX F A -63
-KPX F Aacute -63
-KPX F Acircumflex -63
-KPX F Adieresis -63
-KPX F Agrave -63
-KPX F Aring -63
-KPX F Atilde -63
-KPX F J -25
-KPX F O -16
-KPX F Odieresis -16
-KPX F a -15
-KPX F aacute -15
-KPX F adieresis -15
-KPX F ae -17
-KPX F aring -15
-KPX F comma -76
-KPX F e -7
-KPX F eacute -7
-KPX F hyphen 11
-KPX F i -7
-KPX F j -9
-KPX F o -14
-KPX F oacute -14
-KPX F odieresis -14
-KPX F oe -8
-KPX F oslash -15
-KPX F period -75
-KPX F r -27
-KPX F u -24
-KPX G A -8
-KPX G AE 4
-KPX G Aacute -8
-KPX G Acircumflex -8
-KPX G Adieresis -8
-KPX G Agrave -8
-KPX G Aring -8
-KPX G Atilde -8
-KPX G T -17
-KPX G V -36
-KPX G W -20
-KPX G Y -56
-KPX J A -32
-KPX J AE -20
-KPX J Adieresis -32
-KPX J Aring -32
-KPX K C -53
-KPX K G -55
-KPX K O -54
-KPX K OE -44
-KPX K Oacute -54
-KPX K Odieresis -54
-KPX K S -30
-KPX K T 13
-KPX K a -3
-KPX K adieresis -3
-KPX K ae 0
-KPX K aring -3
-KPX K e -25
-KPX K hyphen -44
-KPX K o -33
-KPX K oacute -33
-KPX K odieresis -33
-KPX K u -23
-KPX K udieresis -23
-KPX K y -65
-KPX L A 9
-KPX L AE 21
-KPX L Aacute 9
-KPX L Adieresis 9
-KPX L Aring 9
-KPX L C -26
-KPX L Ccedilla -26
-KPX L G -30
-KPX L O -29
-KPX L Oacute -29
-KPX L Ocircumflex -29
-KPX L Odieresis -29
-KPX L Ograve -29
-KPX L Otilde -29
-KPX L S -2
-KPX L T -95
-KPX L U -24
-KPX L Udieresis -24
-KPX L V -90
-KPX L W -68
-KPX L Y -112
-KPX L hyphen -12
-KPX L quotedblright -141
-KPX L quoteright -138
-KPX L u -7
-KPX L udieresis -7
-KPX L y -55
-KPX N A -5
-KPX N AE 7
-KPX N Aacute -5
-KPX N Adieresis -5
-KPX N Aring -5
-KPX N C 9
-KPX N Ccedilla 9
-KPX N G 8
-KPX N O 8
-KPX N Oacute 8
-KPX N Odieresis 8
-KPX N a 13
-KPX N aacute 13
-KPX N adieresis 13
-KPX N ae 13
-KPX N aring 13
-KPX N comma 15
-KPX N e 18
-KPX N eacute 18
-KPX N o 11
-KPX N oacute 11
-KPX N odieresis 11
-KPX N oslash 11
-KPX N period 16
-KPX N u 12
-KPX N udieresis 12
-KPX O A -37
-KPX O AE -26
-KPX O Aacute -37
-KPX O Adieresis -37
-KPX O Aring -37
-KPX O T -20
-KPX O V -36
-KPX O W -21
-KPX O X -36
-KPX O Y -59
-KPX Oacute A -37
-KPX Oacute T -20
-KPX Oacute V -36
-KPX Oacute W -21
-KPX Oacute Y -59
-KPX Ocircumflex T -20
-KPX Ocircumflex V -36
-KPX Ocircumflex Y -59
-KPX Odieresis A -37
-KPX Odieresis T -20
-KPX Odieresis V -36
-KPX Odieresis W -21
-KPX Odieresis X -36
-KPX Odieresis Y -59
-KPX Ograve T -20
-KPX Ograve V -36
-KPX Ograve Y -59
-KPX Oslash A -32
-KPX Otilde T -20
-KPX Otilde V -36
-KPX Otilde Y -59
-KPX P A -65
-KPX P AE -54
-KPX P Aacute -65
-KPX P Adieresis -65
-KPX P Aring -65
-KPX P J -44
-KPX P a -7
-KPX P aacute -7
-KPX P adieresis -7
-KPX P ae -8
-KPX P aring -7
-KPX P comma -94
-KPX P e -8
-KPX P eacute -8
-KPX P hyphen 0
-KPX P o -14
-KPX P oacute -14
-KPX P odieresis -14
-KPX P oe -8
-KPX P oslash -17
-KPX P period -94
-KPX R C -5
-KPX R Ccedilla -5
-KPX R G -6
-KPX R O -6
-KPX R OE 3
-KPX R Oacute -6
-KPX R Odieresis -6
-KPX R T 0
-KPX R U -4
-KPX R Udieresis -4
-KPX R V -26
-KPX R W -17
-KPX R Y -37
-KPX R a 0
-KPX R aacute 0
-KPX R adieresis 0
-KPX R ae 0
-KPX R aring 0
-KPX R e 2
-KPX R eacute 2
-KPX R hyphen 15
-KPX R o -4
-KPX R oacute -4
-KPX R odieresis -4
-KPX R oe 1
-KPX R u 0
-KPX R uacute 0
-KPX R udieresis 0
-KPX R y 5
-KPX S A -20
-KPX S AE -8
-KPX S Aacute -20
-KPX S Adieresis -20
-KPX S Aring -20
-KPX S T -5
-KPX S V -31
-KPX S W -17
-KPX S Y -43
-KPX S t 1
-KPX T A -87
-KPX T AE -75
-KPX T Aacute -87
-KPX T Acircumflex -87
-KPX T Adieresis -87
-KPX T Agrave -87
-KPX T Aring -87
-KPX T Atilde -87
-KPX T C -20
-KPX T G -22
-KPX T J -87
-KPX T O -22
-KPX T OE -11
-KPX T Oacute -22
-KPX T Ocircumflex -22
-KPX T Odieresis -22
-KPX T Ograve -22
-KPX T Oslash -23
-KPX T Otilde -22
-KPX T S 3
-KPX T V 18
-KPX T W 24
-KPX T Y 16
-KPX T a -73
-KPX T ae -73
-KPX T c -74
-KPX T colon -97
-KPX T comma -67
-KPX T e -69
-KPX T g -75
-KPX T guillemotleft -101
-KPX T guilsinglleft -98
-KPX T hyphen -48
-KPX T i -1
-KPX T j -3
-KPX T o -76
-KPX T oslash -73
-KPX T period -67
-KPX T r -71
-KPX T s -74
-KPX T semicolon -98
-KPX T u -72
-KPX T v -82
-KPX T w -77
-KPX T y -80
-KPX U A -34
-KPX U AE -22
-KPX U Aacute -34
-KPX U Acircumflex -34
-KPX U Adieresis -34
-KPX U Aring -34
-KPX U Atilde -34
-KPX U comma -7
-KPX U m 6
-KPX U n 5
-KPX U p 7
-KPX U period -4
-KPX U r 5
-KPX Uacute A -34
-KPX Uacute comma -7
-KPX Uacute m 6
-KPX Uacute n 5
-KPX Uacute p 7
-KPX Uacute period -4
-KPX Uacute r 5
-KPX Ucircumflex A -34
-KPX Udieresis A -34
-KPX Udieresis b 6
-KPX Udieresis comma -7
-KPX Udieresis m 6
-KPX Udieresis n 5
-KPX Udieresis p 7
-KPX Udieresis period -4
-KPX Udieresis r 5
-KPX Ugrave A -34
-KPX V A -71
-KPX V AE -59
-KPX V Aacute -71
-KPX V Acircumflex -71
-KPX V Adieresis -71
-KPX V Agrave -71
-KPX V Aring -71
-KPX V Atilde -71
-KPX V C -36
-KPX V G -38
-KPX V O -37
-KPX V Oacute -37
-KPX V Ocircumflex -37
-KPX V Odieresis -37
-KPX V Ograve -37
-KPX V Oslash -31
-KPX V Otilde -37
-KPX V S -21
-KPX V T 21
-KPX V a -47
-KPX V ae -48
-KPX V colon -65
-KPX V comma -69
-KPX V e -43
-KPX V g -49
-KPX V guillemotleft -74
-KPX V guilsinglleft -72
-KPX V hyphen -21
-KPX V i -5
-KPX V o -50
-KPX V oslash -48
-KPX V period -69
-KPX V r -34
-KPX V semicolon -67
-KPX V u -34
-KPX V y -10
-KPX W A -54
-KPX W AE -43
-KPX W Aacute -54
-KPX W Acircumflex -54
-KPX W Adieresis -54
-KPX W Agrave -54
-KPX W Aring -54
-KPX W Atilde -54
-KPX W C -20
-KPX W G -22
-KPX W O -21
-KPX W Oacute -21
-KPX W Ocircumflex -21
-KPX W Odieresis -21
-KPX W Ograve -21
-KPX W Oslash -15
-KPX W Otilde -21
-KPX W S -12
-KPX W T 25
-KPX W a -29
-KPX W ae -29
-KPX W colon -53
-KPX W comma -45
-KPX W e -24
-KPX W g -30
-KPX W guillemotleft -55
-KPX W guilsinglleft -53
-KPX W hyphen -3
-KPX W i -1
-KPX W o -31
-KPX W oslash -29
-KPX W period -45
-KPX W r -24
-KPX W semicolon -54
-KPX W u -23
-KPX W y 0
-KPX X C -34
-KPX X O -35
-KPX X Odieresis -35
-KPX X Q -37
-KPX X a -5
-KPX X e -25
-KPX X hyphen -27
-KPX X o -32
-KPX X u -25
-KPX X y -40
-KPX Y A -86
-KPX Y AE -74
-KPX Y Aacute -86
-KPX Y Acircumflex -86
-KPX Y Adieresis -86
-KPX Y Agrave -86
-KPX Y Aring -86
-KPX Y Atilde -86
-KPX Y C -52
-KPX Y G -54
-KPX Y O -54
-KPX Y Oacute -54
-KPX Y Ocircumflex -54
-KPX Y Odieresis -54
-KPX Y Ograve -54
-KPX Y Oslash -47
-KPX Y Otilde -54
-KPX Y S -29
-KPX Y T 22
-KPX Y a -66
-KPX Y ae -67
-KPX Y colon -81
-KPX Y comma -78
-KPX Y e -63
-KPX Y g -68
-KPX Y guillemotleft -98
-KPX Y guilsinglleft -96
-KPX Y hyphen -50
-KPX Y i -3
-KPX Y o -70
-KPX Y oslash -67
-KPX Y p -45
-KPX Y period -78
-KPX Y semicolon -83
-KPX Y u -48
-KPX Y v -27
-KPX Z v -11
-KPX Z y -9
-KPX a j -1
-KPX a quoteright -11
-KPX a v -19
-KPX a w -5
-KPX a y -17
-KPX aacute v -19
-KPX aacute w -5
-KPX aacute y -17
-KPX adieresis v -19
-KPX adieresis w -5
-KPX adieresis y -17
-KPX ae v -21
-KPX ae w -7
-KPX ae y -19
-KPX agrave v -19
-KPX agrave w -5
-KPX agrave y -17
-KPX aring v -19
-KPX aring w -5
-KPX aring y -17
-KPX b v -20
-KPX b w -7
-KPX b y -20
-KPX c h 0
-KPX c k 3
-KPX comma one -73
-KPX comma quotedblright -33
-KPX comma quoteright -30
-KPX e quoteright -12
-KPX e t -4
-KPX e v -19
-KPX e w -6
-KPX e x -21
-KPX e y -17
-KPX eacute v -19
-KPX eacute w -6
-KPX eacute y -17
-KPX ecircumflex v -19
-KPX ecircumflex w -6
-KPX ecircumflex y -17
-KPX eight four 10
-KPX eight one -23
-KPX eight seven -6
-KPX f a 1
-KPX f aacute 1
-KPX f adieresis 1
-KPX f ae 0
-KPX f aring 1
-KPX f e -3
-KPX f eacute -3
-KPX f f 21
-KPX f i -3
-KPX f j -6
-KPX f l -3
-KPX f o -9
-KPX f oacute -9
-KPX f odieresis -9
-KPX f oe -3
-KPX f oslash -9
-KPX f quoteright 10
-KPX f s -1
-KPX f t 21
-KPX five four 6
-KPX five one -29
-KPX five seven -10
-KPX four four 9
-KPX four one -50
-KPX four seven -28
-KPX g a 3
-KPX g adieresis 3
-KPX g ae 3
-KPX g aring 3
-KPX g e 8
-KPX g eacute 8
-KPX g l 0
-KPX g oacute 1
-KPX g odieresis 1
-KPX g r 1
-KPX guillemotright A -51
-KPX guillemotright AE -39
-KPX guillemotright Aacute -51
-KPX guillemotright Adieresis -51
-KPX guillemotright Aring -51
-KPX guillemotright T -108
-KPX guillemotright V -78
-KPX guillemotright W -60
-KPX guillemotright Y -111
-KPX guilsinglright A -46
-KPX guilsinglright AE -35
-KPX guilsinglright Aacute -46
-KPX guilsinglright Adieresis -46
-KPX guilsinglright Aring -46
-KPX guilsinglright T -104
-KPX guilsinglright V -74
-KPX guilsinglright W -56
-KPX guilsinglright Y -107
-KPX h quoteright -14
-KPX h y -21
-KPX hyphen A -1
-KPX hyphen AE 10
-KPX hyphen Aacute -1
-KPX hyphen Adieresis -1
-KPX hyphen Aring -1
-KPX hyphen T -57
-KPX hyphen V -27
-KPX hyphen W -9
-KPX hyphen Y -64
-KPX i T -4
-KPX i j -2
-KPX k a -2
-KPX k aacute -2
-KPX k adieresis -2
-KPX k ae 1
-KPX k aring -2
-KPX k comma 7
-KPX k e -15
-KPX k eacute -15
-KPX k g -21
-KPX k hyphen -25
-KPX k o -22
-KPX k oacute -22
-KPX k odieresis -22
-KPX k period 6
-KPX k s -10
-KPX k u -1
-KPX k udieresis -1
-KPX l v -5
-KPX l y -2
-KPX m p 6
-KPX m v -19
-KPX m w -6
-KPX m y -18
-KPX n T -80
-KPX n p 5
-KPX n quoteright -12
-KPX n v -20
-KPX n w -7
-KPX n y -19
-KPX nine four 4
-KPX nine one -21
-KPX nine seven -17
-KPX o T -84
-KPX o quoteright -17
-KPX o t -8
-KPX o v -23
-KPX o w -10
-KPX o x -25
-KPX o y -22
-KPX oacute v -23
-KPX oacute w -10
-KPX oacute y -22
-KPX ocircumflex t -8
-KPX odieresis t -8
-KPX odieresis v -23
-KPX odieresis w -10
-KPX odieresis x -25
-KPX odieresis y -22
-KPX ograve v -23
-KPX ograve w -10
-KPX ograve y -22
-KPX one comma -42
-KPX one eight -37
-KPX one five -43
-KPX one four -56
-KPX one nine -39
-KPX one one -85
-KPX one period -42
-KPX one seven -65
-KPX one six -37
-KPX one three -44
-KPX one two -47
-KPX one zero -34
-KPX p t -5
-KPX p y -20
-KPX period one -73
-KPX period quotedblright -32
-KPX period quoteright -29
-KPX q c 4
-KPX q u 4
-KPX quotedblbase A 12
-KPX quotedblbase AE 24
-KPX quotedblbase T -75
-KPX quotedblbase V -73
-KPX quotedblbase W -51
-KPX quotedblbase Y -92
-KPX quotedblleft A -68
-KPX quotedblleft AE -57
-KPX quotedblleft Aacute -68
-KPX quotedblleft Adieresis -68
-KPX quotedblleft Aring -68
-KPX quotedblleft T -2
-KPX quotedblleft V 6
-KPX quotedblleft W 16
-KPX quotedblleft Y -9
-KPX quotedblright A -69
-KPX quotedblright AE -57
-KPX quotedblright Aacute -69
-KPX quotedblright Adieresis -69
-KPX quotedblright Aring -69
-KPX quotedblright T 1
-KPX quotedblright V 7
-KPX quotedblright W 17
-KPX quotedblright Y -7
-KPX quoteleft A -73
-KPX quoteleft AE -62
-KPX quoteleft Aacute -73
-KPX quoteleft Adieresis -73
-KPX quoteleft Aring -73
-KPX quoteleft T -7
-KPX quoteleft V 2
-KPX quoteleft W 11
-KPX quoteleft Y -13
-KPX quoteright A -77
-KPX quoteright AE -66
-KPX quoteright Aacute -77
-KPX quoteright Adieresis -77
-KPX quoteright Aring -77
-KPX quoteright comma -46
-KPX quoteright d -27
-KPX quoteright o -30
-KPX quoteright period -45
-KPX quoteright r -15
-KPX quoteright s -22
-KPX quoteright t -4
-KPX quoteright v -5
-KPX quoteright w 1
-KPX quoteright y -3
-KPX r a 6
-KPX r aacute 6
-KPX r acircumflex 6
-KPX r adieresis 6
-KPX r ae 4
-KPX r agrave 6
-KPX r aring 6
-KPX r c 0
-KPX r ccedilla 0
-KPX r colon -27
-KPX r comma -57
-KPX r d 0
-KPX r e 4
-KPX r eacute 4
-KPX r ecircumflex 4
-KPX r egrave 4
-KPX r f 22
-KPX r g -2
-KPX r h -4
-KPX r hyphen -35
-KPX r i -4
-KPX r j -6
-KPX r k 0
-KPX r l -4
-KPX r m -1
-KPX r n -2
-KPX r o -1
-KPX r oacute -1
-KPX r ocircumflex -1
-KPX r odieresis -1
-KPX r oe 5
-KPX r ograve -1
-KPX r oslash -4
-KPX r p 0
-KPX r period -57
-KPX r q 1
-KPX r quoteright 14
-KPX r r -2
-KPX r s 3
-KPX r semicolon -27
-KPX r t 22
-KPX r u 0
-KPX r v 21
-KPX r w 26
-KPX r x 17
-KPX r y 23
-KPX r z 9
-KPX s quoteright -12
-KPX s t -1
-KPX seven colon -63
-KPX seven comma -88
-KPX seven eight -3
-KPX seven five -21
-KPX seven four -62
-KPX seven one -14
-KPX seven period -87
-KPX seven seven 9
-KPX seven six -13
-KPX seven three 0
-KPX seven two -4
-KPX six four 7
-KPX six one -21
-KPX six seven -3
-KPX t S 0
-KPX t a 6
-KPX t aacute 6
-KPX t adieresis 6
-KPX t ae 7
-KPX t aring 6
-KPX t colon -25
-KPX t e -3
-KPX t eacute -3
-KPX t h 2
-KPX t o -10
-KPX t oacute -10
-KPX t odieresis -10
-KPX t quoteright 4
-KPX t semicolon -25
-KPX three four 6
-KPX three one -27
-KPX three seven -10
-KPX two four -9
-KPX two one -16
-KPX two seven -3
-KPX u quoteright -2
-KPX v a -15
-KPX v aacute -15
-KPX v acircumflex -15
-KPX v adieresis -15
-KPX v ae -16
-KPX v agrave -15
-KPX v aring -15
-KPX v atilde -15
-KPX v c -20
-KPX v colon -32
-KPX v comma -51
-KPX v e -15
-KPX v eacute -15
-KPX v ecircumflex -15
-KPX v egrave -15
-KPX v g -21
-KPX v hyphen 0
-KPX v l -5
-KPX v o -22
-KPX v oacute -22
-KPX v odieresis -22
-KPX v ograve -22
-KPX v oslash -20
-KPX v period -50
-KPX v s -17
-KPX v semicolon -34
-KPX w a -7
-KPX w aacute -7
-KPX w acircumflex -7
-KPX w adieresis -7
-KPX w ae -8
-KPX w agrave -7
-KPX w aring -7
-KPX w atilde -7
-KPX w c -8
-KPX w colon -27
-KPX w comma -33
-KPX w e -3
-KPX w eacute -3
-KPX w ecircumflex -3
-KPX w egrave -3
-KPX w g -9
-KPX w hyphen 11
-KPX w l -1
-KPX w o -10
-KPX w oacute -10
-KPX w odieresis -10
-KPX w ograve -10
-KPX w oslash -8
-KPX w period -32
-KPX w s -9
-KPX w semicolon -29
-KPX x a -9
-KPX x c -22
-KPX x e -17
-KPX x eacute -17
-KPX x o -24
-KPX x q -20
-KPX y a -14
-KPX y aacute -14
-KPX y acircumflex -14
-KPX y adieresis -14
-KPX y ae -15
-KPX y agrave -14
-KPX y aring -14
-KPX y atilde -14
-KPX y c -21
-KPX y colon -31
-KPX y comma -51
-KPX y e -16
-KPX y eacute -16
-KPX y ecircumflex -16
-KPX y egrave -16
-KPX y g -21
-KPX y hyphen 0
-KPX y l -4
-KPX y o -22
-KPX y oacute -22
-KPX y odieresis -22
-KPX y ograve -22
-KPX y oslash -20
-KPX y period -50
-KPX y s -16
-KPX y semicolon -33
-KPX zero four 5
-KPX zero one -19
-KPX zero seven -10
-EndKernPairs
-EndKernData
-EndFontMetrics
diff --git a/data/fonts/urw/n019004l.pfb b/data/fonts/urw/n019004l.pfb
deleted file mode 100644
index aec380a33..000000000
--- a/data/fonts/urw/n019004l.pfb
+++ /dev/null
diff --git a/data/fonts/urw/n019004l.pfm b/data/fonts/urw/n019004l.pfm
deleted file mode 100644
index d7fea866c..000000000
--- a/data/fonts/urw/n019004l.pfm
+++ /dev/null
diff --git a/data/fonts/urw/n019023l.afm b/data/fonts/urw/n019023l.afm
deleted file mode 100644
index 0172d8082..000000000
--- a/data/fonts/urw/n019023l.afm
+++ /dev/null
@@ -1,1341 +0,0 @@
-StartFontMetrics 3.0
-Comment Copyright (URW)++,Copyright 1999 by (URW)++ Design & Development
-Comment Creation Date: 12/22/1999
-Comment See the file COPYING (GNU General Public License) for license conditions.
-FontName NimbusSanL-ReguItal
-FullName Nimbus Sans L Regular Italic
-FamilyName Nimbus Sans L
-Weight Regular
-ItalicAngle -12.0
-IsFixedPitch false
-UnderlinePosition -151
-UnderlineThickness 50
-Version 1.05
-Notice (URW)++,Copyright 1999 by (URW)++ Design & Development
-EncodingScheme AdobeStandardEncoding
-FontBBox -178 -284 1108 953
-CapHeight 729
-XHeight 524
-Descender -213
-Ascender 729
-StartCharMetrics 316
-C 32 ; WX 278 ; N space ; B 213 0 213 0 ;
-C 33 ; WX 278 ; N exclam ; B 124 0 363 729 ;
-C 34 ; WX 355 ; N quotedbl ; B 177 464 455 709 ;
-C 35 ; WX 556 ; N numbersign ; B 54 -20 649 697 ;
-C 36 ; WX 556 ; N dollar ; B 69 -126 613 770 ;
-C 37 ; WX 889 ; N percent ; B 134 -20 895 709 ;
-C 38 ; WX 667 ; N ampersand ; B 83 -23 644 709 ;
-C 39 ; WX 222 ; N quoteright ; B 166 477 309 708 ;
-C 40 ; WX 333 ; N parenleft ; B 113 -213 446 729 ;
-C 41 ; WX 333 ; N parenright ; B -7 -213 325 729 ;
-C 42 ; WX 389 ; N asterisk ; B 169 438 471 729 ;
-C 43 ; WX 584 ; N plus ; B 92 -11 591 473 ;
-C 44 ; WX 278 ; N comma ; B 55 -150 214 103 ;
-C 45 ; WX 333 ; N hyphen ; B 97 240 351 312 ;
-C 46 ; WX 278 ; N period ; B 87 0 213 103 ;
-C 47 ; WX 278 ; N slash ; B -12 -20 434 729 ;
-C 48 ; WX 556 ; N zero ; B 98 -23 598 709 ;
-C 49 ; WX 556 ; N one ; B 208 0 498 709 ;
-C 50 ; WX 556 ; N two ; B 34 0 620 709 ;
-C 51 ; WX 556 ; N three ; B 71 -23 599 709 ;
-C 52 ; WX 556 ; N four ; B 63 0 573 709 ;
-C 53 ; WX 556 ; N five ; B 70 -23 629 709 ;
-C 54 ; WX 556 ; N six ; B 93 -23 611 709 ;
-C 55 ; WX 556 ; N seven ; B 137 0 671 709 ;
-C 56 ; WX 556 ; N eight ; B 74 -23 604 709 ;
-C 57 ; WX 556 ; N nine ; B 83 -23 599 709 ;
-C 58 ; WX 278 ; N colon ; B 110 0 326 524 ;
-C 59 ; WX 278 ; N semicolon ; B 78 -150 325 524 ;
-C 60 ; WX 584 ; N less ; B 87 -9 635 474 ;
-C 61 ; WX 584 ; N equal ; B 74 111 609 355 ;
-C 62 ; WX 584 ; N greater ; B 48 -9 596 474 ;
-C 63 ; WX 556 ; N question ; B 184 0 630 741 ;
-C 64 ; WX 1015 ; N at ; B 80 -142 1036 741 ;
-C 65 ; WX 667 ; N A ; B 17 0 653 729 ;
-C 66 ; WX 667 ; N B ; B 79 0 711 729 ;
-C 67 ; WX 722 ; N C ; B 112 -23 770 741 ;
-C 68 ; WX 722 ; N D ; B 89 0 759 729 ;
-C 69 ; WX 667 ; N E ; B 90 0 751 729 ;
-C 70 ; WX 611 ; N F ; B 90 0 734 729 ;
-C 71 ; WX 778 ; N G ; B 109 -23 809 741 ;
-C 72 ; WX 722 ; N H ; B 83 0 799 729 ;
-C 73 ; WX 278 ; N I ; B 100 0 349 729 ;
-C 74 ; WX 500 ; N J ; B 47 -23 581 729 ;
-C 75 ; WX 667 ; N K ; B 79 0 813 729 ;
-C 76 ; WX 556 ; N L ; B 80 0 551 729 ;
-C 77 ; WX 833 ; N M ; B 75 0 916 729 ;
-C 78 ; WX 722 ; N N ; B 76 0 801 729 ;
-C 79 ; WX 778 ; N O ; B 104 -23 828 741 ;
-C 80 ; WX 667 ; N P ; B 91 0 733 729 ;
-C 81 ; WX 778 ; N Q ; B 104 -59 828 741 ;
-C 82 ; WX 722 ; N R ; B 93 0 770 729 ;
-C 83 ; WX 667 ; N S ; B 89 -23 714 741 ;
-C 84 ; WX 611 ; N T ; B 158 0 748 729 ;
-C 85 ; WX 722 ; N U ; B 124 -23 800 729 ;
-C 86 ; WX 667 ; N V ; B 185 0 800 729 ;
-C 87 ; WX 944 ; N W ; B 177 0 1084 729 ;
-C 88 ; WX 667 ; N X ; B 22 0 794 729 ;
-C 89 ; WX 667 ; N Y ; B 168 0 816 729 ;
-C 90 ; WX 611 ; N Z ; B 28 0 737 729 ;
-C 91 ; WX 278 ; N bracketleft ; B 19 -213 405 729 ;
-C 92 ; WX 278 ; N backslash ; B 147 -20 280 729 ;
-C 93 ; WX 278 ; N bracketright ; B -23 -213 364 729 ;
-C 94 ; WX 469 ; N asciicircum ; B 115 329 496 709 ;
-C 95 ; WX 556 ; N underscore ; B -59 -176 551 -126 ;
-C 96 ; WX 222 ; N quoteleft ; B 163 477 308 709 ;
-C 97 ; WX 556 ; N a ; B 65 -23 568 539 ;
-C 98 ; WX 556 ; N b ; B 54 -23 588 729 ;
-C 99 ; WX 500 ; N c ; B 76 -23 554 539 ;
-C 100 ; WX 556 ; N d ; B 73 -23 650 729 ;
-C 101 ; WX 556 ; N e ; B 84 -23 580 539 ;
-C 102 ; WX 278 ; N f ; B 89 0 413 732 ;
-C 103 ; WX 556 ; N g ; B 32 -218 601 539 ;
-C 104 ; WX 556 ; N h ; B 70 0 574 729 ;
-C 105 ; WX 222 ; N i ; B 66 0 305 729 ;
-C 106 ; WX 222 ; N j ; B -65 -218 308 729 ;
-C 107 ; WX 500 ; N k ; B 58 0 584 729 ;
-C 108 ; WX 222 ; N l ; B 68 0 307 729 ;
-C 109 ; WX 833 ; N m ; B 71 0 852 539 ;
-C 110 ; WX 556 ; N n ; B 70 0 574 539 ;
-C 111 ; WX 556 ; N o ; B 80 -23 576 539 ;
-C 112 ; WX 556 ; N p ; B 7 -213 586 539 ;
-C 113 ; WX 556 ; N q ; B 71 -213 607 539 ;
-C 114 ; WX 333 ; N r ; B 69 0 436 539 ;
-C 115 ; WX 500 ; N s ; B 61 -23 520 539 ;
-C 116 ; WX 278 ; N t ; B 97 -23 366 668 ;
-C 117 ; WX 556 ; N u ; B 88 -23 594 524 ;
-C 118 ; WX 500 ; N v ; B 122 0 598 524 ;
-C 119 ; WX 722 ; N w ; B 118 0 820 524 ;
-C 120 ; WX 500 ; N x ; B 17 0 583 524 ;
-C 121 ; WX 500 ; N y ; B 8 -218 590 524 ;
-C 122 ; WX 500 ; N z ; B 31 0 557 524 ;
-C 123 ; WX 334 ; N braceleft ; B 91 -213 431 729 ;
-C 124 ; WX 260 ; N bar ; B 54 -212 315 729 ;
-C 125 ; WX 334 ; N braceright ; B -16 -213 324 729 ;
-C 126 ; WX 584 ; N asciitilde ; B 137 268 594 438 ;
-C 161 ; WX 333 ; N exclamdown ; B 76 -205 317 524 ;
-C 162 ; WX 556 ; N cent ; B 96 -120 585 628 ;
-C 163 ; WX 556 ; N sterling ; B 44 -23 628 729 ;
-C 164 ; WX 167 ; N fraction ; B -178 -20 486 709 ;
-C 165 ; WX 556 ; N yen ; B 100 0 696 709 ;
-C 166 ; WX 556 ; N florin ; B -32 -212 696 738 ;
-C 167 ; WX 556 ; N section ; B 63 -213 589 729 ;
-C 168 ; WX 556 ; N currency ; B 110 133 593 556 ;
-C 169 ; WX 191 ; N quotesingle ; B 173 464 292 709 ;
-C 170 ; WX 333 ; N quotedblleft ; B 146 477 449 709 ;
-C 171 ; WX 556 ; N guillemotleft ; B 147 106 548 438 ;
-C 172 ; WX 333 ; N guilsinglleft ; B 140 106 336 438 ;
-C 173 ; WX 333 ; N guilsinglright ; B 109 106 307 438 ;
-C 174 ; WX 500 ; N fi ; B 83 0 591 732 ;
-C 175 ; WX 500 ; N fl ; B 88 0 585 732 ;
-C 177 ; WX 556 ; N endash ; B 46 240 628 312 ;
-C 178 ; WX 556 ; N dagger ; B 127 -177 620 709 ;
-C 179 ; WX 556 ; N daggerdbl ; B 51 -177 620 709 ;
-C 180 ; WX 278 ; N periodcentered ; B 166 192 293 295 ;
-C 182 ; WX 537 ; N paragraph ; B 145 -178 677 729 ;
-C 183 ; WX 350 ; N bullet ; B 120 220 376 470 ;
-C 184 ; WX 222 ; N quotesinglbase ; B 37 -128 180 103 ;
-C 185 ; WX 333 ; N quotedblbase ; B 20 -128 322 103 ;
-C 186 ; WX 333 ; N quotedblright ; B 150 477 452 708 ;
-C 187 ; WX 556 ; N guillemotright ; B 121 106 518 438 ;
-C 188 ; WX 1000 ; N ellipsis ; B 115 0 907 103 ;
-C 189 ; WX 1000 ; N perthousand ; B 93 -20 1024 738 ;
-C 191 ; WX 611 ; N questiondown ; B 86 -217 531 524 ;
-C 193 ; WX 333 ; N grave ; B 179 592 357 740 ;
-C 194 ; WX 333 ; N acute ; B 218 592 458 740 ;
-C 195 ; WX 333 ; N circumflex ; B 146 591 433 741 ;
-C 196 ; WX 333 ; N tilde ; B 130 611 471 719 ;
-C 197 ; WX 333 ; N macron ; B 160 627 450 696 ;
-C 198 ; WX 333 ; N breve ; B 165 594 471 729 ;
-C 199 ; WX 333 ; N dotaccent ; B 244 612 370 715 ;
-C 200 ; WX 333 ; N dieresis ; B 159 612 446 715 ;
-C 202 ; WX 333 ; N ring ; B 216 579 396 754 ;
-C 203 ; WX 333 ; N cedilla ; B 1 -214 264 0 ;
-C 205 ; WX 333 ; N hungarumlaut ; B 91 590 505 740 ;
-C 206 ; WX 333 ; N ogonek ; B 35 -205 246 0 ;
-C 207 ; WX 333 ; N caron ; B 176 592 463 740 ;
-C 208 ; WX 1000 ; N emdash ; B 42 240 1068 312 ;
-C 225 ; WX 1000 ; N AE ; B 11 0 1087 729 ;
-C 227 ; WX 370 ; N ordfeminine ; B 107 303 441 742 ;
-C 232 ; WX 556 ; N Lslash ; B 75 0 570 729 ;
-C 233 ; WX 778 ; N Oslash ; B 32 -24 867 741 ;
-C 234 ; WX 1000 ; N OE ; B 101 -23 1108 741 ;
-C 235 ; WX 365 ; N ordmasculine ; B 114 303 452 742 ;
-C 241 ; WX 889 ; N ae ; B 59 -23 915 539 ;
-C 245 ; WX 278 ; N dotlessi ; B 94 0 290 527 ;
-C 248 ; WX 222 ; N lslash ; B 62 0 312 729 ;
-C 249 ; WX 611 ; N oslash ; B 19 -30 639 541 ;
-C 250 ; WX 944 ; N oe ; B 85 -23 966 539 ;
-C 251 ; WX 611 ; N germandbls ; B 126 -23 655 729 ;
-C -1 ; WX 722 ; N Udieresis ; B 124 -23 800 914 ;
-C -1 ; WX 722 ; N Uacute ; B 124 -23 800 939 ;
-C -1 ; WX 667 ; N Scedilla ; B 89 -214 714 741 ;
-C -1 ; WX 611 ; N Tcaron ; B 158 0 748 939 ;
-C -1 ; WX 667 ; N Scaron ; B 89 -23 714 939 ;
-C -1 ; WX 722 ; N Rcaron ; B 93 0 770 939 ;
-C -1 ; WX 722 ; N Racute ; B 93 0 770 939 ;
-C -1 ; WX 667 ; N Sacute ; B 89 -23 714 939 ;
-C -1 ; WX 778 ; N Otilde ; B 104 -23 828 918 ;
-C -1 ; WX 556 ; N ucircumflex ; B 88 -23 594 741 ;
-C -1 ; WX 778 ; N Ohungarumlaut ; B 104 -23 841 939 ;
-C -1 ; WX 722 ; N Uhungarumlaut ; B 124 -23 806 939 ;
-C -1 ; WX 667 ; N Yacute ; B 168 0 816 939 ;
-C -1 ; WX 722 ; N Eth ; B 89 0 759 729 ;
-C -1 ; WX 722 ; N Dcroat ; B 89 0 759 729 ;
-C -1 ; WX 611 ; N Zacute ; B 28 0 737 939 ;
-C -1 ; WX 722 ; N Uring ; B 124 -23 800 953 ;
-C -1 ; WX 556 ; N gbreve ; B 32 -218 601 729 ;
-C -1 ; WX 556 ; N eogonek ; B 84 -205 580 539 ;
-C -1 ; WX 556 ; N edotaccent ; B 84 -23 580 715 ;
-C -1 ; WX 556 ; N ecaron ; B 84 -23 580 740 ;
-C -1 ; WX 722 ; N Ugrave ; B 124 -23 800 939 ;
-C -1 ; WX 667 ; N Thorn ; B 91 0 708 729 ;
-C -1 ; WX 556 ; N eacute ; B 84 -23 580 740 ;
-C -1 ; WX 556 ; N edieresis ; B 84 -23 580 715 ;
-C -1 ; WX 650 ; N dcaron ; B 73 -23 810 729 ;
-C -1 ; WX 500 ; N ccedilla ; B 76 -214 554 539 ;
-C -1 ; WX 500 ; N ccaron ; B 76 -23 563 740 ;
-C -1 ; WX 500 ; N cacute ; B 76 -23 575 740 ;
-C -1 ; WX 556 ; N aogonek ; B 65 -205 571 539 ;
-C -1 ; WX 556 ; N aring ; B 65 -23 568 754 ;
-C -1 ; WX 556 ; N atilde ; B 65 -23 583 719 ;
-C -1 ; WX 556 ; N abreve ; B 65 -23 582 729 ;
-C -1 ; WX 556 ; N egrave ; B 84 -23 580 740 ;
-C -1 ; WX 556 ; N agrave ; B 65 -23 568 740 ;
-C -1 ; WX 556 ; N aacute ; B 65 -23 570 740 ;
-C -1 ; WX 556 ; N adieresis ; B 65 -23 568 715 ;
-C -1 ; WX 722 ; N Uogonek ; B 124 -205 800 729 ;
-C -1 ; WX 556 ; N ugrave ; B 88 -23 594 740 ;
-C -1 ; WX 556 ; N uacute ; B 88 -23 594 740 ;
-C -1 ; WX 556 ; N udieresis ; B 88 -23 594 715 ;
-C -1 ; WX 319 ; N tcaron ; B 97 -23 492 801 ;
-C -1 ; WX 500 ; N scommaaccent ; B 61 -284 520 539 ;
-C -1 ; WX 611 ; N Zcaron ; B 28 0 737 939 ;
-C -1 ; WX 556 ; N ecircumflex ; B 84 -23 580 741 ;
-C -1 ; WX 722 ; N Ucircumflex ; B 124 -23 800 940 ;
-C -1 ; WX 556 ; N acircumflex ; B 65 -23 568 741 ;
-C -1 ; WX 611 ; N Zdotaccent ; B 28 0 737 914 ;
-C -1 ; WX 500 ; N scaron ; B 61 -23 547 740 ;
-C -1 ; WX 667 ; N Amacron ; B 17 0 663 895 ;
-C -1 ; WX 500 ; N sacute ; B 61 -23 545 740 ;
-C -1 ; WX 611 ; N Tcommaaccent ; B 158 -284 748 729 ;
-C -1 ; WX 667 ; N Ydieresis ; B 168 0 816 914 ;
-C -1 ; WX 556 ; N thorn ; B 7 -213 586 729 ;
-C -1 ; WX 667 ; N Emacron ; B 90 0 751 895 ;
-C -1 ; WX 778 ; N Ograve ; B 104 -23 828 939 ;
-C -1 ; WX 778 ; N Oacute ; B 104 -23 828 939 ;
-C -1 ; WX 778 ; N Odieresis ; B 104 -23 828 914 ;
-C -1 ; WX 722 ; N Ntilde ; B 76 0 801 918 ;
-C -1 ; WX 722 ; N Ncaron ; B 76 0 801 939 ;
-C -1 ; WX 722 ; N Nacute ; B 76 0 801 939 ;
-C -1 ; WX 556 ; N Lcaron ; B 80 0 551 729 ;
-C -1 ; WX 556 ; N Lacute ; B 80 0 551 939 ;
-C -1 ; WX 278 ; N Idotaccent ; B 100 0 389 914 ;
-C -1 ; WX 333 ; N racute ; B 69 0 498 740 ;
-C -1 ; WX 278 ; N Icircumflex ; B 100 0 454 940 ;
-C -1 ; WX 556 ; N ohungarumlaut ; B 80 -23 683 740 ;
-C -1 ; WX 556 ; N otilde ; B 80 -23 583 719 ;
-C -1 ; WX 556 ; N Euro ; B 12 -22 636 709 ;
-C -1 ; WX 556 ; N ocircumflex ; B 80 -23 576 741 ;
-C -1 ; WX 390 ; N onesuperior ; B 205 284 393 709 ;
-C -1 ; WX 390 ; N twosuperior ; B 100 284 468 709 ;
-C -1 ; WX 390 ; N threesuperior ; B 123 270 455 709 ;
-C -1 ; WX 278 ; N Igrave ; B 100 0 378 939 ;
-C -1 ; WX 278 ; N Iacute ; B 100 0 479 939 ;
-C -1 ; WX 278 ; N Imacron ; B 100 0 458 895 ;
-C -1 ; WX 278 ; N Iogonek ; B 28 -205 349 729 ;
-C -1 ; WX 278 ; N Idieresis ; B 100 0 467 907 ;
-C -1 ; WX 778 ; N Gbreve ; B 109 -23 809 928 ;
-C -1 ; WX 722 ; N Umacron ; B 124 -23 800 895 ;
-C -1 ; WX 667 ; N Kcommaaccent ; B 79 -284 813 729 ;
-C -1 ; WX 556 ; N ograve ; B 80 -23 576 740 ;
-C -1 ; WX 667 ; N Scommaaccent ; B 89 -284 714 741 ;
-C -1 ; WX 667 ; N Eogonek ; B 90 -205 751 729 ;
-C -1 ; WX 556 ; N oacute ; B 80 -23 576 740 ;
-C -1 ; WX 667 ; N Edotaccent ; B 90 0 751 914 ;
-C -1 ; WX 222 ; N iogonek ; B 0 -205 305 729 ;
-C -1 ; WX 527 ; N gcommaaccent ; B 3 -218 572 813 ;
-C -1 ; WX 556 ; N odieresis ; B 80 -23 576 715 ;
-C -1 ; WX 556 ; N ntilde ; B 70 0 589 719 ;
-C -1 ; WX 556 ; N ncaron ; B 70 0 578 740 ;
-C -1 ; WX 667 ; N Ecaron ; B 90 0 751 939 ;
-C -1 ; WX 667 ; N Ecircumflex ; B 90 0 751 940 ;
-C -1 ; WX 500 ; N scedilla ; B 61 -214 521 539 ;
-C -1 ; WX 333 ; N rcaron ; B 69 0 486 740 ;
-C -1 ; WX 667 ; N Egrave ; B 90 0 751 939 ;
-C -1 ; WX 667 ; N Eacute ; B 90 0 751 939 ;
-C -1 ; WX 778 ; N Gcommaaccent ; B 109 -284 809 741 ;
-C -1 ; WX 722 ; N Rcommaaccent ; B 93 -284 770 729 ;
-C -1 ; WX 667 ; N Edieresis ; B 90 0 751 914 ;
-C -1 ; WX 556 ; N nacute ; B 70 0 580 740 ;
-C -1 ; WX 556 ; N uogonek ; B 88 -205 594 524 ;
-C -1 ; WX 556 ; N umacron ; B 88 -23 594 696 ;
-C -1 ; WX 722 ; N Dcaron ; B 89 0 759 939 ;
-C -1 ; WX 307 ; N lcaron ; B 68 0 467 729 ;
-C -1 ; WX 722 ; N Ccaron ; B 112 -23 770 939 ;
-C -1 ; WX 722 ; N Cacute ; B 112 -23 770 939 ;
-C -1 ; WX 722 ; N Ccedilla ; B 112 -214 770 741 ;
-C -1 ; WX 606 ; N degree ; B 291 383 594 686 ;
-C -1 ; WX 667 ; N Aogonek ; B 17 -205 663 729 ;
-C -1 ; WX 584 ; N minus ; B 81 197 601 269 ;
-C -1 ; WX 584 ; N multiply ; B 113 34 568 427 ;
-C -1 ; WX 584 ; N divide ; B 92 0 591 462 ;
-C -1 ; WX 667 ; N Aring ; B 17 0 653 953 ;
-C -1 ; WX 1000 ; N trademark ; B 208 292 1096 729 ;
-C -1 ; WX 333 ; N rcommaaccent ; B 5 -284 436 539 ;
-C -1 ; WX 222 ; N lacute ; B 68 0 463 939 ;
-C -1 ; WX 556 ; N omacron ; B 80 -23 576 696 ;
-C -1 ; WX 667 ; N Atilde ; B 17 0 680 918 ;
-C -1 ; WX 278 ; N icircumflex ; B 94 0 406 741 ;
-C -1 ; WX 278 ; N igrave ; B 94 0 330 740 ;
-C -1 ; WX 556 ; N ncommaaccent ; B 70 -284 574 539 ;
-C -1 ; WX 222 ; N lcommaaccent ; B -1 -284 307 729 ;
-C -1 ; WX 584 ; N plusminus ; B 50 0 625 633 ;
-C -1 ; WX 947 ; N onehalf ; B 202 -20 965 709 ;
-C -1 ; WX 947 ; N onequarter ; B 205 -20 938 709 ;
-C -1 ; WX 947 ; N threequarters ; B 123 -20 938 709 ;
-C -1 ; WX 278 ; N iacute ; B 94 0 431 740 ;
-C -1 ; WX 667 ; N Abreve ; B 17 0 683 928 ;
-C -1 ; WX 500 ; N kcommaaccent ; B 58 -284 584 729 ;
-C -1 ; WX 778 ; N Omacron ; B 104 -23 828 895 ;
-C -1 ; WX 222 ; N imacron ; B 66 0 373 696 ;
-C -1 ; WX 556 ; N emacron ; B 84 -23 580 696 ;
-C -1 ; WX 556 ; N amacron ; B 65 -23 568 696 ;
-C -1 ; WX 278 ; N tcommaaccent ; B 55 -284 366 668 ;
-C -1 ; WX 500 ; N ydieresis ; B 8 -218 590 715 ;
-C -1 ; WX 500 ; N zdotaccent ; B 31 0 557 715 ;
-C -1 ; WX 500 ; N zcaron ; B 31 0 557 740 ;
-C -1 ; WX 500 ; N zacute ; B 31 0 557 740 ;
-C -1 ; WX 500 ; N yacute ; B 8 -218 590 740 ;
-C -1 ; WX 556 ; N uhungarumlaut ; B 88 -23 683 740 ;
-C -1 ; WX 556 ; N eth ; B 80 -23 576 743 ;
-C -1 ; WX 556 ; N uring ; B 88 -23 594 754 ;
-C -1 ; WX 778 ; N Ocircumflex ; B 104 -23 828 940 ;
-C -1 ; WX 333 ; N commaaccent ; B 57 -284 205 -60 ;
-C -1 ; WX 737 ; N copyright ; B 55 -22 836 742 ;
-C -1 ; WX 737 ; N registered ; B 55 -22 836 742 ;
-C -1 ; WX 667 ; N Acircumflex ; B 17 0 653 940 ;
-C -1 ; WX 278 ; N idieresis ; B 94 0 419 708 ;
-C -1 ; WX 489 ; N lozenge ; B 16 0 462 744 ;
-C -1 ; WX 712 ; N Delta ; B 10 0 701 729 ;
-C -1 ; WX 584 ; N notequal ; B 74 2 609 480 ;
-C -1 ; WX 542 ; N radical ; B 102 -36 705 913 ;
-C -1 ; WX 667 ; N Agrave ; B 17 0 653 939 ;
-C -1 ; WX 667 ; N Aacute ; B 17 0 667 939 ;
-C -1 ; WX 584 ; N lessequal ; B 45 0 659 584 ;
-C -1 ; WX 584 ; N greaterequal ; B 56 0 626 584 ;
-C -1 ; WX 584 ; N logicalnot ; B 99 86 619 377 ;
-C -1 ; WX 711 ; N summation ; B -18 -97 760 762 ;
-C -1 ; WX 490 ; N partialdiff ; B 22 -15 458 750 ;
-C -1 ; WX 722 ; N Ncommaaccent ; B 76 -284 801 729 ;
-C -1 ; WX 556 ; N dcroat ; B 73 -23 695 729 ;
-C -1 ; WX 260 ; N brokenbar ; B 54 -212 315 729 ;
-C -1 ; WX 556 ; N Lcommaaccent ; B 80 -284 551 729 ;
-C -1 ; WX 667 ; N Adieresis ; B 17 0 662 914 ;
-C -1 ; WX 556 ; N mu ; B 18 -220 593 524 ;
-C -1 ; WX 278 ; N .notdef ; B 213 0 213 0 ;
-EndCharMetrics
-StartKernData
-StartKernPairs 998
-KPX A C -41
-KPX A Ccedilla -41
-KPX A G -41
-KPX A O -37
-KPX A Odieresis -37
-KPX A Q -38
-KPX A T -103
-KPX A U -42
-KPX A Uacute -42
-KPX A Ucircumflex -42
-KPX A Udieresis -42
-KPX A Ugrave -42
-KPX A V -81
-KPX A W -57
-KPX A Y -104
-KPX A a -16
-KPX A b -5
-KPX A c -16
-KPX A ccedilla -16
-KPX A comma -4
-KPX A d -14
-KPX A e -22
-KPX A g -17
-KPX A guillemotleft -51
-KPX A guilsinglleft -47
-KPX A hyphen -8
-KPX A o -19
-KPX A period -2
-KPX A q -15
-KPX A quotedblright -60
-KPX A quoteright -68
-KPX A t -22
-KPX A u -18
-KPX A v -40
-KPX A w -29
-KPX A y -44
-KPX Aacute C -42
-KPX Aacute G -42
-KPX Aacute O -38
-KPX Aacute Q -39
-KPX Aacute T -103
-KPX Aacute U -43
-KPX Aacute V -81
-KPX Aacute W -57
-KPX Aacute Y -104
-KPX Aacute a -16
-KPX Aacute b -6
-KPX Aacute c -17
-KPX Aacute comma -4
-KPX Aacute d -15
-KPX Aacute e -23
-KPX Aacute g -17
-KPX Aacute guillemotleft -51
-KPX Aacute guilsinglleft -48
-KPX Aacute hyphen -9
-KPX Aacute o -20
-KPX Aacute period -3
-KPX Aacute q -16
-KPX Aacute quoteright -68
-KPX Aacute t -23
-KPX Aacute u -20
-KPX Aacute v -40
-KPX Aacute w -29
-KPX Aacute y -44
-KPX Acircumflex C -41
-KPX Acircumflex G -41
-KPX Acircumflex O -37
-KPX Acircumflex Q -38
-KPX Acircumflex T -103
-KPX Acircumflex U -42
-KPX Acircumflex V -81
-KPX Acircumflex W -57
-KPX Acircumflex Y -104
-KPX Acircumflex comma -4
-KPX Acircumflex period -2
-KPX Adieresis C -42
-KPX Adieresis G -41
-KPX Adieresis O -38
-KPX Adieresis Q -39
-KPX Adieresis T -103
-KPX Adieresis U -43
-KPX Adieresis V -81
-KPX Adieresis W -57
-KPX Adieresis Y -104
-KPX Adieresis a -16
-KPX Adieresis b -5
-KPX Adieresis c -17
-KPX Adieresis comma -4
-KPX Adieresis d -14
-KPX Adieresis g -17
-KPX Adieresis guillemotleft -51
-KPX Adieresis guilsinglleft -48
-KPX Adieresis hyphen -8
-KPX Adieresis o -19
-KPX Adieresis period -3
-KPX Adieresis q -15
-KPX Adieresis quotedblright -60
-KPX Adieresis quoteright -68
-KPX Adieresis t -22
-KPX Adieresis u -19
-KPX Adieresis v -40
-KPX Adieresis w -29
-KPX Adieresis y -44
-KPX Agrave C -41
-KPX Agrave G -41
-KPX Agrave O -37
-KPX Agrave Q -38
-KPX Agrave T -103
-KPX Agrave U -42
-KPX Agrave V -81
-KPX Agrave W -57
-KPX Agrave Y -104
-KPX Agrave comma -4
-KPX Agrave period -2
-KPX Aring C -41
-KPX Aring G -41
-KPX Aring O -37
-KPX Aring Q -38
-KPX Aring T -103
-KPX Aring U -42
-KPX Aring V -81
-KPX Aring W -57
-KPX Aring Y -104
-KPX Aring a -16
-KPX Aring b -5
-KPX Aring c -16
-KPX Aring comma -4
-KPX Aring d -14
-KPX Aring e -22
-KPX Aring g -17
-KPX Aring guillemotleft -51
-KPX Aring guilsinglleft -47
-KPX Aring hyphen -8
-KPX Aring o -19
-KPX Aring period -2
-KPX Aring q -15
-KPX Aring quotedblright -60
-KPX Aring quoteright -68
-KPX Aring t -22
-KPX Aring u -18
-KPX Aring v -40
-KPX Aring w -29
-KPX Aring y -44
-KPX Atilde C -43
-KPX Atilde G -42
-KPX Atilde O -39
-KPX Atilde Q -40
-KPX Atilde T -103
-KPX Atilde U -44
-KPX Atilde V -81
-KPX Atilde W -57
-KPX Atilde Y -104
-KPX Atilde comma -4
-KPX Atilde period -4
-KPX B A -28
-KPX B AE -29
-KPX B Aacute -28
-KPX B Acircumflex -28
-KPX B Adieresis -28
-KPX B Aring -28
-KPX B Atilde -28
-KPX B O -14
-KPX B OE -11
-KPX B Oacute -14
-KPX B Ocircumflex -14
-KPX B Odieresis -14
-KPX B Ograve -14
-KPX B Oslash -2
-KPX B V -49
-KPX B W -27
-KPX B Y -56
-KPX C A -43
-KPX C AE -44
-KPX C Aacute -43
-KPX C Adieresis -43
-KPX C Aring -43
-KPX C H -22
-KPX C K -20
-KPX C O -18
-KPX C Oacute -18
-KPX C Odieresis -18
-KPX Ccedilla A -44
-KPX D A -50
-KPX D Aacute -50
-KPX D Acircumflex -50
-KPX D Adieresis -50
-KPX D Agrave -50
-KPX D Aring -50
-KPX D Atilde -50
-KPX D J -13
-KPX D T -56
-KPX D V -54
-KPX D W -31
-KPX D X -58
-KPX D Y -74
-KPX F A -78
-KPX F Aacute -78
-KPX F Acircumflex -78
-KPX F Adieresis -78
-KPX F Agrave -78
-KPX F Aring -78
-KPX F Atilde -78
-KPX F J -59
-KPX F O -30
-KPX F Odieresis -30
-KPX F a -45
-KPX F aacute -45
-KPX F adieresis -45
-KPX F ae -41
-KPX F aring -45
-KPX F comma -113
-KPX F e -33
-KPX F eacute -33
-KPX F hyphen -20
-KPX F i -19
-KPX F j -19
-KPX F o -30
-KPX F oacute -30
-KPX F odieresis -30
-KPX F oe -33
-KPX F oslash -30
-KPX F period -113
-KPX F r -44
-KPX F u -42
-KPX G A -14
-KPX G AE -11
-KPX G Aacute -14
-KPX G Acircumflex -14
-KPX G Adieresis -14
-KPX G Agrave -14
-KPX G Aring -14
-KPX G Atilde -14
-KPX G T -53
-KPX G V -53
-KPX G W -31
-KPX G Y -72
-KPX J A -39
-KPX J AE -39
-KPX J Adieresis -39
-KPX J Aring -39
-KPX K C -56
-KPX K G -57
-KPX K O -53
-KPX K OE -49
-KPX K Oacute -53
-KPX K Odieresis -53
-KPX K S -48
-KPX K T 14
-KPX K a -23
-KPX K adieresis -23
-KPX K ae -20
-KPX K aring -23
-KPX K e -46
-KPX K hyphen -53
-KPX K o -42
-KPX K oacute -42
-KPX K odieresis -42
-KPX K u -32
-KPX K udieresis -32
-KPX K y -76
-KPX L A 8
-KPX L AE 11
-KPX L Aacute 8
-KPX L Adieresis 8
-KPX L Aring 8
-KPX L C -52
-KPX L Ccedilla -51
-KPX L G -53
-KPX L O -51
-KPX L Oacute -51
-KPX L Ocircumflex -51
-KPX L Odieresis -51
-KPX L Ograve -51
-KPX L Otilde -51
-KPX L S -28
-KPX L T -112
-KPX L U -46
-KPX L Udieresis -46
-KPX L V -115
-KPX L W -77
-KPX L Y -128
-KPX L hyphen -140
-KPX L quotedblright -145
-KPX L quoteright -153
-KPX L u -17
-KPX L udieresis -17
-KPX L y -68
-KPX N A -19
-KPX N AE -16
-KPX N Aacute -19
-KPX N Adieresis -19
-KPX N Aring -19
-KPX N C -15
-KPX N Ccedilla -14
-KPX N G -14
-KPX N O -11
-KPX N Oacute -11
-KPX N Odieresis -11
-KPX N a -17
-KPX N aacute -17
-KPX N adieresis -17
-KPX N ae -13
-KPX N aring -17
-KPX N comma -15
-KPX N e -11
-KPX N eacute -11
-KPX N o -8
-KPX N oacute -8
-KPX N odieresis -8
-KPX N oslash -4
-KPX N period -15
-KPX N u -8
-KPX N udieresis -9
-KPX O A -43
-KPX O AE -47
-KPX O Aacute -43
-KPX O Adieresis -43
-KPX O Aring -43
-KPX O T -54
-KPX O V -48
-KPX O W -25
-KPX O X -52
-KPX O Y -71
-KPX Oacute A -43
-KPX Oacute T -54
-KPX Oacute V -48
-KPX Oacute W -25
-KPX Oacute Y -71
-KPX Ocircumflex T -54
-KPX Ocircumflex V -48
-KPX Ocircumflex Y -71
-KPX Odieresis A -43
-KPX Odieresis T -54
-KPX Odieresis V -48
-KPX Odieresis W -25
-KPX Odieresis X -52
-KPX Odieresis Y -71
-KPX Ograve T -54
-KPX Ograve V -48
-KPX Ograve Y -71
-KPX Oslash A -47
-KPX Otilde T -54
-KPX Otilde V -48
-KPX Otilde Y -71
-KPX P A -86
-KPX P AE -93
-KPX P Aacute -86
-KPX P Adieresis -86
-KPX P Aring -86
-KPX P J -85
-KPX P a -39
-KPX P aacute -39
-KPX P adieresis -39
-KPX P ae -35
-KPX P aring -39
-KPX P comma -138
-KPX P e -38
-KPX P eacute -38
-KPX P hyphen -45
-KPX P o -34
-KPX P oacute -34
-KPX P odieresis -34
-KPX P oe -38
-KPX P oslash -35
-KPX P period -138
-KPX R C -21
-KPX R Ccedilla -21
-KPX R G -21
-KPX R O -17
-KPX R OE -14
-KPX R Oacute -17
-KPX R Odieresis -17
-KPX R T -33
-KPX R U -21
-KPX R Udieresis -21
-KPX R V -49
-KPX R W -27
-KPX R Y -54
-KPX R a -21
-KPX R aacute -21
-KPX R adieresis -21
-KPX R ae -17
-KPX R aring -21
-KPX R e -16
-KPX R eacute -16
-KPX R hyphen -4
-KPX R o -13
-KPX R oacute -13
-KPX R odieresis -13
-KPX R oe -16
-KPX R u -13
-KPX R uacute -14
-KPX R udieresis -14
-KPX R y -16
-KPX S A -31
-KPX S AE -31
-KPX S Aacute -31
-KPX S Adieresis -31
-KPX S Aring -31
-KPX S T -38
-KPX S V -52
-KPX S W -31
-KPX S Y -58
-KPX S t -11
-KPX T A -104
-KPX T AE -106
-KPX T Aacute -104
-KPX T Acircumflex -104
-KPX T Adieresis -104
-KPX T Agrave -104
-KPX T Aring -104
-KPX T Atilde -104
-KPX T C -53
-KPX T G -55
-KPX T J -108
-KPX T O -50
-KPX T OE -44
-KPX T Oacute -50
-KPX T Ocircumflex -50
-KPX T Odieresis -50
-KPX T Ograve -50
-KPX T Oslash -42
-KPX T Otilde -50
-KPX T S -32
-KPX T V 2
-KPX T W 7
-KPX T Y 10
-KPX T a -107
-KPX T ae -104
-KPX T c -96
-KPX T colon -152
-KPX T comma -105
-KPX T e -102
-KPX T g -94
-KPX T guillemotleft -126
-KPX T guilsinglleft -123
-KPX T hyphen -82
-KPX T i -12
-KPX T j -12
-KPX T o -99
-KPX T oslash -94
-KPX T period -105
-KPX T r -98
-KPX T s -98
-KPX T semicolon -140
-KPX T u -98
-KPX T v -106
-KPX T w -103
-KPX T y -110
-KPX U A -45
-KPX U AE -48
-KPX U Aacute -45
-KPX U Acircumflex -45
-KPX U Adieresis -45
-KPX U Aring -45
-KPX U Atilde -45
-KPX U comma -35
-KPX U m -17
-KPX U n -16
-KPX U p -8
-KPX U period -32
-KPX U r -16
-KPX Uacute A -45
-KPX Uacute comma -35
-KPX Uacute m -17
-KPX Uacute n -16
-KPX Uacute p -8
-KPX Uacute period -32
-KPX Uacute r -16
-KPX Ucircumflex A -45
-KPX Udieresis A -44
-KPX Udieresis b -8
-KPX Udieresis comma -35
-KPX Udieresis m -17
-KPX Udieresis n -16
-KPX Udieresis p -8
-KPX Udieresis period -32
-KPX Udieresis r -16
-KPX Ugrave A -45
-KPX V A -77
-KPX V AE -84
-KPX V Aacute -77
-KPX V Acircumflex -77
-KPX V Adieresis -77
-KPX V Agrave -77
-KPX V Aring -77
-KPX V Atilde -77
-KPX V C -50
-KPX V G -50
-KPX V O -46
-KPX V Oacute -46
-KPX V Ocircumflex -46
-KPX V Odieresis -46
-KPX V Ograve -46
-KPX V Oslash -34
-KPX V Otilde -46
-KPX V S -44
-KPX V T 7
-KPX V a -71
-KPX V ae -66
-KPX V colon -76
-KPX V comma -94
-KPX V e -64
-KPX V g -57
-KPX V guillemotleft -88
-KPX V guilsinglleft -84
-KPX V hyphen -44
-KPX V i -14
-KPX V o -61
-KPX V oslash -57
-KPX V period -94
-KPX V r -51
-KPX V semicolon -75
-KPX V u -52
-KPX V y -28
-KPX W A -56
-KPX W AE -62
-KPX W Aacute -56
-KPX W Acircumflex -56
-KPX W Adieresis -56
-KPX W Agrave -56
-KPX W Aring -56
-KPX W Atilde -56
-KPX W C -30
-KPX W G -30
-KPX W O -26
-KPX W Oacute -26
-KPX W Ocircumflex -26
-KPX W Odieresis -26
-KPX W Ograve -26
-KPX W Oslash -14
-KPX W Otilde -26
-KPX W S -31
-KPX W T 11
-KPX W a -46
-KPX W ae -42
-KPX W colon -62
-KPX W comma -62
-KPX W e -39
-KPX W g -32
-KPX W guillemotleft -63
-KPX W guilsinglleft -60
-KPX W hyphen -19
-KPX W i -10
-KPX W o -36
-KPX W oslash -32
-KPX W period -62
-KPX W r -36
-KPX W semicolon -62
-KPX W u -36
-KPX W y -15
-KPX X C -53
-KPX X O -50
-KPX X Odieresis -50
-KPX X Q -51
-KPX X a -27
-KPX X e -51
-KPX X hyphen -57
-KPX X o -46
-KPX X u -36
-KPX X y -67
-KPX Y A -102
-KPX Y AE -108
-KPX Y Aacute -102
-KPX Y Acircumflex -102
-KPX Y Adieresis -102
-KPX Y Agrave -102
-KPX Y Aring -102
-KPX Y Atilde -102
-KPX Y C -68
-KPX Y G -69
-KPX Y O -64
-KPX Y Oacute -64
-KPX Y Ocircumflex -64
-KPX Y Odieresis -64
-KPX Y Ograve -64
-KPX Y Oslash -55
-KPX Y Otilde -64
-KPX Y S -49
-KPX Y T 15
-KPX Y a -100
-KPX Y ae -95
-KPX Y colon -97
-KPX Y comma -117
-KPX Y e -97
-KPX Y g -89
-KPX Y guillemotleft -128
-KPX Y guilsinglleft -124
-KPX Y hyphen -89
-KPX Y i -6
-KPX Y o -93
-KPX Y oslash -89
-KPX Y p -63
-KPX Y period -117
-KPX Y semicolon -97
-KPX Y u -73
-KPX Y v -48
-KPX Z v -44
-KPX Z y -44
-KPX a j -10
-KPX a quoteright -23
-KPX a v -26
-KPX a w -16
-KPX a y -33
-KPX aacute v -26
-KPX aacute w -16
-KPX aacute y -33
-KPX adieresis v -26
-KPX adieresis w -16
-KPX adieresis y -33
-KPX ae v -26
-KPX ae w -15
-KPX ae y -32
-KPX agrave v -26
-KPX agrave w -16
-KPX agrave y -33
-KPX aring v -26
-KPX aring w -16
-KPX aring y -33
-KPX b v -21
-KPX b w -10
-KPX b y -28
-KPX c h -7
-KPX c k -1
-KPX comma one -105
-KPX comma quotedblright -47
-KPX comma quoteright -55
-KPX e quoteright -20
-KPX e t -16
-KPX e v -26
-KPX e w -16
-KPX e x -35
-KPX e y -33
-KPX eacute v -26
-KPX eacute w -16
-KPX eacute y -33
-KPX ecircumflex v -26
-KPX ecircumflex w -16
-KPX ecircumflex y -33
-KPX eight four -6
-KPX eight one -55
-KPX eight seven -43
-KPX f a -20
-KPX f aacute -20
-KPX f adieresis -20
-KPX f ae -15
-KPX f aring -20
-KPX f e -21
-KPX f eacute -21
-KPX f f 12
-KPX f i -10
-KPX f j -11
-KPX f l -12
-KPX f o -18
-KPX f oacute -18
-KPX f odieresis -18
-KPX f oe -20
-KPX f oslash -16
-KPX f quoteright -8
-KPX f s -8
-KPX f t 16
-KPX five four -7
-KPX five one -83
-KPX five seven -32
-KPX four four -3
-KPX four one -88
-KPX four seven -65
-KPX g a -17
-KPX g adieresis -17
-KPX g ae -13
-KPX g aring -17
-KPX g e -11
-KPX g eacute -11
-KPX g l -8
-KPX g oacute -8
-KPX g odieresis -8
-KPX g r -9
-KPX guillemotright A -58
-KPX guillemotright AE -62
-KPX guillemotright Aacute -58
-KPX guillemotright Adieresis -58
-KPX guillemotright Aring -58
-KPX guillemotright T -132
-KPX guillemotright V -96
-KPX guillemotright W -68
-KPX guillemotright Y -137
-KPX guilsinglright A -52
-KPX guilsinglright AE -56
-KPX guilsinglright Aacute -52
-KPX guilsinglright Adieresis -52
-KPX guilsinglright Aring -52
-KPX guilsinglright T -126
-KPX guilsinglright V -90
-KPX guilsinglright W -62
-KPX guilsinglright Y -131
-KPX h quoteright -19
-KPX h y -31
-KPX hyphen A -12
-KPX hyphen AE -17
-KPX hyphen Aacute -12
-KPX hyphen Adieresis -12
-KPX hyphen Aring -12
-KPX hyphen T -86
-KPX hyphen V -51
-KPX hyphen W -24
-KPX hyphen Y -97
-KPX i T -16
-KPX i j -10
-KPX k a -14
-KPX k aacute -14
-KPX k adieresis -14
-KPX k ae -12
-KPX k aring -14
-KPX k comma -13
-KPX k e -33
-KPX k eacute -33
-KPX k g -26
-KPX k hyphen -49
-KPX k o -30
-KPX k oacute -30
-KPX k odieresis -30
-KPX k period -13
-KPX k s -14
-KPX k u -22
-KPX k udieresis -16
-KPX l v -11
-KPX l y -15
-KPX m p -3
-KPX m v -24
-KPX m w -14
-KPX m y -30
-KPX n T -103
-KPX n p -3
-KPX n quoteright -19
-KPX n v -24
-KPX n w -14
-KPX n y -31
-KPX nine four -12
-KPX nine one -55
-KPX nine seven -50
-KPX o T -106
-KPX o quoteright -23
-KPX o t -17
-KPX o v -27
-KPX o w -16
-KPX o x -35
-KPX o y -34
-KPX oacute v -27
-KPX oacute w -16
-KPX oacute y -34
-KPX ocircumflex t -17
-KPX odieresis t -17
-KPX odieresis v -27
-KPX odieresis w -16
-KPX odieresis x -35
-KPX odieresis y -34
-KPX ograve v -27
-KPX ograve w -16
-KPX ograve y -34
-KPX one comma -82
-KPX one eight -73
-KPX one five -72
-KPX one four -88
-KPX one nine -71
-KPX one one -125
-KPX one period -82
-KPX one seven -98
-KPX one six -71
-KPX one three -75
-KPX one two -78
-KPX one zero -71
-KPX p t -10
-KPX p y -28
-KPX period one -106
-KPX period quotedblright -48
-KPX period quoteright -56
-KPX q c -2
-KPX q u -5
-KPX quotedblbase A 21
-KPX quotedblbase AE 21
-KPX quotedblbase T -80
-KPX quotedblbase V -74
-KPX quotedblbase W -39
-KPX quotedblbase Y -96
-KPX quotedblleft A -58
-KPX quotedblleft AE -70
-KPX quotedblleft Aacute -58
-KPX quotedblleft Adieresis -58
-KPX quotedblleft Aring -58
-KPX quotedblleft T 1
-KPX quotedblleft V 10
-KPX quotedblleft W 22
-KPX quotedblleft Y -1
-KPX quotedblright A -60
-KPX quotedblright AE -72
-KPX quotedblright Aacute -60
-KPX quotedblright Adieresis -60
-KPX quotedblright Aring -60
-KPX quotedblright T 2
-KPX quotedblright V 9
-KPX quotedblright W 21
-KPX quotedblright Y -2
-KPX quoteleft A -74
-KPX quoteleft AE -86
-KPX quoteleft Aacute -74
-KPX quoteleft Adieresis -74
-KPX quoteleft Aring -74
-KPX quoteleft T -14
-KPX quoteleft V -5
-KPX quoteleft W 6
-KPX quoteleft Y -17
-KPX quoteright A -76
-KPX quoteright AE -88
-KPX quoteright Aacute -76
-KPX quoteright Adieresis -76
-KPX quoteright Aring -76
-KPX quoteright comma -68
-KPX quoteright d -25
-KPX quoteright o -31
-KPX quoteright period -68
-KPX quoteright r -24
-KPX quoteright s -23
-KPX quoteright t -14
-KPX quoteright v -10
-KPX quoteright w -5
-KPX quoteright y -14
-KPX r a -16
-KPX r aacute -16
-KPX r acircumflex -16
-KPX r adieresis -16
-KPX r ae -11
-KPX r agrave -16
-KPX r aring -16
-KPX r c -11
-KPX r ccedilla -11
-KPX r colon -31
-KPX r comma -77
-KPX r d -8
-KPX r e -17
-KPX r eacute -17
-KPX r ecircumflex -17
-KPX r egrave -17
-KPX r f 17
-KPX r g -8
-KPX r h -8
-KPX r hyphen -54
-KPX r i -6
-KPX r j -6
-KPX r k -2
-KPX r l -7
-KPX r m -9
-KPX r n -8
-KPX r o -14
-KPX r oacute -14
-KPX r ocircumflex -14
-KPX r odieresis -14
-KPX r oe -16
-KPX r ograve -14
-KPX r oslash -14
-KPX r p 0
-KPX r period -77
-KPX r q -10
-KPX r quoteright -6
-KPX r r -8
-KPX r s -4
-KPX r semicolon -30
-KPX r t 21
-KPX r u -7
-KPX r v 18
-KPX r w 21
-KPX r x 9
-KPX r y 15
-KPX r z 0
-KPX s quoteright -24
-KPX s t -15
-KPX seven colon -84
-KPX seven comma -123
-KPX seven eight -34
-KPX seven five -37
-KPX seven four -95
-KPX seven one -58
-KPX seven period -123
-KPX seven seven -11
-KPX seven six -44
-KPX seven three -29
-KPX seven two -31
-KPX six four -7
-KPX six one -52
-KPX six seven -40
-KPX t S -17
-KPX t a -10
-KPX t aacute -10
-KPX t adieresis -10
-KPX t ae -7
-KPX t aring -10
-KPX t colon -37
-KPX t e -22
-KPX t eacute -22
-KPX t h -14
-KPX t o -19
-KPX t oacute -19
-KPX t odieresis -19
-KPX t quoteright -7
-KPX t semicolon -36
-KPX three four -9
-KPX three one -57
-KPX three seven -45
-KPX two four -43
-KPX two one -45
-KPX two seven -38
-KPX u quoteright -14
-KPX v a -30
-KPX v aacute -30
-KPX v acircumflex -30
-KPX v adieresis -30
-KPX v ae -25
-KPX v agrave -30
-KPX v aring -30
-KPX v atilde -30
-KPX v c -22
-KPX v colon -32
-KPX v comma -76
-KPX v e -29
-KPX v eacute -29
-KPX v ecircumflex -29
-KPX v egrave -29
-KPX v g -20
-KPX v hyphen -19
-KPX v l -8
-KPX v o -25
-KPX v oacute -25
-KPX v odieresis -25
-KPX v ograve -25
-KPX v oslash -25
-KPX v period -76
-KPX v s -17
-KPX v semicolon -31
-KPX w a -26
-KPX w aacute -26
-KPX w acircumflex -26
-KPX w adieresis -26
-KPX w ae -22
-KPX w agrave -26
-KPX w aring -26
-KPX w atilde -26
-KPX w c -14
-KPX w colon -32
-KPX w comma -57
-KPX w e -20
-KPX w eacute -20
-KPX w ecircumflex -20
-KPX w egrave -20
-KPX w g -13
-KPX w hyphen -8
-KPX w l -8
-KPX w o -17
-KPX w oacute -17
-KPX w odieresis -17
-KPX w ograve -17
-KPX w oslash -14
-KPX w period -57
-KPX w s -14
-KPX w semicolon -31
-KPX x a -30
-KPX x c -30
-KPX x e -36
-KPX x eacute -36
-KPX x o -33
-KPX x q -28
-KPX y a -36
-KPX y aacute -36
-KPX y acircumflex -36
-KPX y adieresis -36
-KPX y ae -31
-KPX y agrave -36
-KPX y aring -36
-KPX y atilde -36
-KPX y c -28
-KPX y colon -40
-KPX y comma -80
-KPX y e -35
-KPX y eacute -35
-KPX y ecircumflex -35
-KPX y egrave -35
-KPX y g -26
-KPX y hyphen -24
-KPX y l -14
-KPX y o -31
-KPX y oacute -31
-KPX y odieresis -31
-KPX y ograve -31
-KPX y oslash -30
-KPX y period -80
-KPX y s -23
-KPX y semicolon -40
-KPX zero four -11
-KPX zero one -56
-KPX zero seven -50
-EndKernPairs
-EndKernData
-EndFontMetrics
diff --git a/data/fonts/urw/n019023l.pfb b/data/fonts/urw/n019023l.pfb
deleted file mode 100644
index 876cda876..000000000
--- a/data/fonts/urw/n019023l.pfb
+++ /dev/null
diff --git a/data/fonts/urw/n019023l.pfm b/data/fonts/urw/n019023l.pfm
deleted file mode 100644
index eb215a507..000000000
--- a/data/fonts/urw/n019023l.pfm
+++ /dev/null
diff --git a/data/fonts/urw/n019024l.afm b/data/fonts/urw/n019024l.afm
deleted file mode 100644
index 9433a322e..000000000
--- a/data/fonts/urw/n019024l.afm
+++ /dev/null
@@ -1,1341 +0,0 @@
-StartFontMetrics 3.0
-Comment Copyright (URW)++,Copyright 1999 by (URW)++ Design & Development
-Comment Creation Date: 12/22/1999
-Comment See the file COPYING (GNU General Public License) for license conditions.
-FontName NimbusSanL-BoldItal
-FullName Nimbus Sans L Bold Italic
-FamilyName Nimbus Sans L
-Weight Bold
-ItalicAngle -12.0
-IsFixedPitch false
-UnderlinePosition -111
-UnderlineThickness 69
-Version 1.05
-Notice (URW)++,Copyright 1999 by (URW)++ Design & Development
-EncodingScheme AdobeStandardEncoding
-FontBBox -177 -309 1107 953
-CapHeight 729
-XHeight 540
-Descender -217
-Ascender 729
-StartCharMetrics 316
-C 32 ; WX 278 ; N space ; B 245 0 245 0 ;
-C 33 ; WX 333 ; N exclam ; B 112 0 417 726 ;
-C 34 ; WX 474 ; N quotedbl ; B 177 470 579 729 ;
-C 35 ; WX 556 ; N numbersign ; B 33 -32 660 697 ;
-C 36 ; WX 556 ; N dollar ; B 59 -126 628 763 ;
-C 37 ; WX 889 ; N percent ; B 129 -20 903 709 ;
-C 38 ; WX 722 ; N ampersand ; B 89 -23 720 723 ;
-C 39 ; WX 278 ; N quoteright ; B 165 469 356 729 ;
-C 40 ; WX 333 ; N parenleft ; B 84 -200 458 729 ;
-C 41 ; WX 333 ; N parenright ; B -21 -200 356 729 ;
-C 42 ; WX 389 ; N asterisk ; B 145 407 478 729 ;
-C 43 ; WX 584 ; N plus ; B 87 -10 596 473 ;
-C 44 ; WX 278 ; N comma ; B 27 -174 245 146 ;
-C 45 ; WX 333 ; N hyphen ; B 70 207 371 342 ;
-C 46 ; WX 278 ; N period ; B 64 0 245 146 ;
-C 47 ; WX 278 ; N slash ; B -1 -14 427 714 ;
-C 48 ; WX 556 ; N zero ; B 81 -23 614 724 ;
-C 49 ; WX 556 ; N one ; B 172 0 529 709 ;
-C 50 ; WX 556 ; N two ; B 30 0 628 724 ;
-C 51 ; WX 556 ; N three ; B 67 -23 613 724 ;
-C 52 ; WX 556 ; N four ; B 57 0 599 709 ;
-C 53 ; WX 556 ; N five ; B 59 -23 641 709 ;
-C 54 ; WX 556 ; N six ; B 85 -23 625 724 ;
-C 55 ; WX 556 ; N seven ; B 131 0 679 709 ;
-C 56 ; WX 556 ; N eight ; B 60 -23 620 724 ;
-C 57 ; WX 556 ; N nine ; B 68 -23 611 724 ;
-C 58 ; WX 333 ; N colon ; B 113 0 374 520 ;
-C 59 ; WX 333 ; N semicolon ; B 76 -174 374 520 ;
-C 60 ; WX 584 ; N less ; B 77 -10 630 474 ;
-C 61 ; WX 584 ; N equal ; B 61 52 622 412 ;
-C 62 ; WX 584 ; N greater ; B 38 -10 591 474 ;
-C 63 ; WX 611 ; N question ; B 168 0 672 744 ;
-C 64 ; WX 975 ; N at ; B 73 -137 1032 745 ;
-C 65 ; WX 722 ; N A ; B 26 0 703 729 ;
-C 66 ; WX 722 ; N B ; B 82 0 762 729 ;
-C 67 ; WX 722 ; N C ; B 107 -23 793 741 ;
-C 68 ; WX 722 ; N D ; B 77 0 776 729 ;
-C 69 ; WX 667 ; N E ; B 79 0 762 729 ;
-C 70 ; WX 611 ; N F ; B 74 0 741 729 ;
-C 71 ; WX 778 ; N G ; B 107 -23 819 741 ;
-C 72 ; WX 722 ; N H ; B 68 0 812 729 ;
-C 73 ; WX 278 ; N I ; B 63 0 368 729 ;
-C 74 ; WX 556 ; N J ; B 59 -23 641 729 ;
-C 75 ; WX 722 ; N K ; B 74 0 843 729 ;
-C 76 ; WX 611 ; N L ; B 80 0 606 729 ;
-C 77 ; WX 833 ; N M ; B 66 0 931 729 ;
-C 78 ; WX 722 ; N N ; B 68 0 816 729 ;
-C 79 ; WX 778 ; N O ; B 106 -23 828 741 ;
-C 80 ; WX 667 ; N P ; B 76 0 747 729 ;
-C 81 ; WX 778 ; N Q ; B 109 -54 831 741 ;
-C 82 ; WX 722 ; N R ; B 80 0 785 729 ;
-C 83 ; WX 667 ; N S ; B 76 -23 725 741 ;
-C 84 ; WX 611 ; N T ; B 142 0 753 729 ;
-C 85 ; WX 722 ; N U ; B 119 -23 809 729 ;
-C 86 ; WX 667 ; N V ; B 179 0 802 729 ;
-C 87 ; WX 944 ; N W ; B 168 0 1087 729 ;
-C 88 ; WX 667 ; N X ; B 22 0 802 729 ;
-C 89 ; WX 667 ; N Y ; B 182 0 805 729 ;
-C 90 ; WX 611 ; N Z ; B 30 0 733 729 ;
-C 91 ; WX 333 ; N bracketleft ; B 23 -200 463 729 ;
-C 92 ; WX 278 ; N backslash ; B 138 -23 285 709 ;
-C 93 ; WX 333 ; N bracketright ; B -25 -200 415 729 ;
-C 94 ; WX 584 ; N asciicircum ; B 119 270 580 695 ;
-C 95 ; WX 556 ; N underscore ; B -65 -145 550 -76 ;
-C 96 ; WX 278 ; N quoteleft ; B 167 469 357 729 ;
-C 97 ; WX 556 ; N a ; B 50 -23 578 549 ;
-C 98 ; WX 611 ; N b ; B 59 -23 640 729 ;
-C 99 ; WX 556 ; N c ; B 77 -23 597 549 ;
-C 100 ; WX 611 ; N d ; B 79 -23 700 729 ;
-C 101 ; WX 556 ; N e ; B 64 -23 591 549 ;
-C 102 ; WX 333 ; N f ; B 90 0 464 729 ;
-C 103 ; WX 611 ; N g ; B 26 -218 656 549 ;
-C 104 ; WX 611 ; N h ; B 67 0 629 729 ;
-C 105 ; WX 278 ; N i ; B 67 0 362 729 ;
-C 106 ; WX 278 ; N j ; B -43 -218 365 729 ;
-C 107 ; WX 556 ; N k ; B 59 0 651 729 ;
-C 108 ; WX 278 ; N l ; B 67 0 362 729 ;
-C 109 ; WX 889 ; N m ; B 60 0 911 549 ;
-C 110 ; WX 611 ; N n ; B 63 0 629 549 ;
-C 111 ; WX 611 ; N o ; B 82 -23 634 549 ;
-C 112 ; WX 611 ; N p ; B 11 -218 637 549 ;
-C 113 ; WX 611 ; N q ; B 72 -218 659 549 ;
-C 114 ; WX 389 ; N r ; B 63 0 487 549 ;
-C 115 ; WX 556 ; N s ; B 60 -23 589 549 ;
-C 116 ; WX 333 ; N t ; B 101 -23 414 674 ;
-C 117 ; WX 611 ; N u ; B 88 -23 656 540 ;
-C 118 ; WX 556 ; N v ; B 129 0 651 540 ;
-C 119 ; WX 778 ; N w ; B 120 0 881 540 ;
-C 120 ; WX 556 ; N x ; B 16 0 648 540 ;
-C 121 ; WX 556 ; N y ; B 37 -219 653 540 ;
-C 122 ; WX 500 ; N z ; B 21 0 575 540 ;
-C 123 ; WX 389 ; N braceleft ; B 84 -200 472 729 ;
-C 124 ; WX 280 ; N bar ; B 57 -200 335 729 ;
-C 125 ; WX 389 ; N braceright ; B 29 -200 419 729 ;
-C 126 ; WX 584 ; N asciitilde ; B 97 142 581 314 ;
-C 161 ; WX 333 ; N exclamdown ; B 26 -186 331 540 ;
-C 162 ; WX 556 ; N cent ; B 79 -124 598 634 ;
-C 163 ; WX 556 ; N sterling ; B 49 -23 629 715 ;
-C 164 ; WX 167 ; N fraction ; B -177 -20 489 715 ;
-C 165 ; WX 556 ; N yen ; B 107 0 702 704 ;
-C 166 ; WX 556 ; N florin ; B -21 -220 690 744 ;
-C 167 ; WX 556 ; N section ; B 56 -201 596 723 ;
-C 168 ; WX 556 ; N currency ; B 66 100 644 604 ;
-C 169 ; WX 238 ; N quotesingle ; B 177 470 343 729 ;
-C 170 ; WX 500 ; N quotedblleft ; B 171 469 588 729 ;
-C 171 ; WX 556 ; N guillemotleft ; B 135 72 571 481 ;
-C 172 ; WX 333 ; N guilsinglleft ; B 128 72 351 481 ;
-C 173 ; WX 333 ; N guilsinglright ; B 96 72 319 481 ;
-C 174 ; WX 611 ; N fi ; B 85 0 703 729 ;
-C 175 ; WX 611 ; N fl ; B 88 0 701 729 ;
-C 177 ; WX 556 ; N endash ; B 35 207 624 311 ;
-C 178 ; WX 556 ; N dagger ; B 109 -194 626 709 ;
-C 179 ; WX 556 ; N daggerdbl ; B 35 -194 623 709 ;
-C 180 ; WX 278 ; N periodcentered ; B 143 182 270 282 ;
-C 182 ; WX 556 ; N paragraph ; B 121 -191 684 729 ;
-C 183 ; WX 350 ; N bullet ; B 111 175 367 425 ;
-C 184 ; WX 278 ; N quotesinglbase ; B 37 -135 228 125 ;
-C 185 ; WX 500 ; N quotedblbase ; B 37 -135 462 125 ;
-C 186 ; WX 500 ; N quotedblright ; B 173 469 595 729 ;
-C 187 ; WX 556 ; N guillemotright ; B 103 72 533 481 ;
-C 188 ; WX 1000 ; N ellipsis ; B 92 0 939 146 ;
-C 189 ; WX 1000 ; N perthousand ; B 72 -21 1021 739 ;
-C 191 ; WX 611 ; N questiondown ; B 52 -204 556 540 ;
-C 193 ; WX 333 ; N grave ; B 175 607 339 757 ;
-C 194 ; WX 333 ; N acute ; B 247 607 475 757 ;
-C 195 ; WX 333 ; N circumflex ; B 135 610 453 757 ;
-C 196 ; WX 333 ; N tilde ; B 117 622 500 744 ;
-C 197 ; WX 333 ; N macron ; B 150 642 467 722 ;
-C 198 ; WX 333 ; N breve ; B 188 611 455 754 ;
-C 199 ; WX 333 ; N dotaccent ; B 241 621 377 741 ;
-C 200 ; WX 333 ; N dieresis ; B 147 621 469 741 ;
-C 202 ; WX 333 ; N ring ; B 214 593 398 773 ;
-C 203 ; WX 333 ; N cedilla ; B -13 -220 270 0 ;
-C 205 ; WX 333 ; N hungarumlaut ; B 82 610 498 757 ;
-C 206 ; WX 333 ; N ogonek ; B 23 -233 248 0 ;
-C 207 ; WX 333 ; N caron ; B 167 610 485 757 ;
-C 208 ; WX 1000 ; N emdash ; B 37 207 1070 311 ;
-C 225 ; WX 1000 ; N AE ; B 1 0 1104 729 ;
-C 227 ; WX 370 ; N ordfeminine ; B 96 262 451 729 ;
-C 232 ; WX 611 ; N Lslash ; B 54 0 624 729 ;
-C 233 ; WX 778 ; N Oslash ; B 34 -39 906 749 ;
-C 234 ; WX 1000 ; N OE ; B 90 -23 1107 741 ;
-C 235 ; WX 365 ; N ordmasculine ; B 92 262 471 729 ;
-C 241 ; WX 889 ; N ae ; B 54 -23 927 549 ;
-C 245 ; WX 278 ; N dotlessi ; B 67 0 322 540 ;
-C 248 ; WX 278 ; N lslash ; B 50 0 372 729 ;
-C 249 ; WX 611 ; N oslash ; B 12 -38 709 557 ;
-C 250 ; WX 944 ; N oe ; B 71 -23 986 549 ;
-C 251 ; WX 611 ; N germandbls ; B 67 -23 654 729 ;
-C -1 ; WX 722 ; N Udieresis ; B 119 -23 809 920 ;
-C -1 ; WX 722 ; N Uacute ; B 119 -23 809 936 ;
-C -1 ; WX 667 ; N Scedilla ; B 76 -220 725 741 ;
-C -1 ; WX 611 ; N Tcaron ; B 142 0 753 936 ;
-C -1 ; WX 667 ; N Scaron ; B 76 -23 725 936 ;
-C -1 ; WX 722 ; N Rcaron ; B 80 0 785 936 ;
-C -1 ; WX 722 ; N Racute ; B 80 0 785 936 ;
-C -1 ; WX 667 ; N Sacute ; B 76 -23 725 936 ;
-C -1 ; WX 778 ; N Otilde ; B 106 -23 828 923 ;
-C -1 ; WX 611 ; N ucircumflex ; B 88 -23 656 757 ;
-C -1 ; WX 778 ; N Ohungarumlaut ; B 106 -23 841 936 ;
-C -1 ; WX 722 ; N Uhungarumlaut ; B 119 -23 809 936 ;
-C -1 ; WX 667 ; N Yacute ; B 182 0 805 936 ;
-C -1 ; WX 722 ; N Eth ; B 73 0 776 729 ;
-C -1 ; WX 722 ; N Dcroat ; B 73 0 776 729 ;
-C -1 ; WX 611 ; N Zacute ; B 30 0 733 936 ;
-C -1 ; WX 722 ; N Uring ; B 119 -23 809 953 ;
-C -1 ; WX 611 ; N gbreve ; B 26 -218 656 754 ;
-C -1 ; WX 556 ; N eogonek ; B 64 -233 591 549 ;
-C -1 ; WX 556 ; N edotaccent ; B 64 -23 591 741 ;
-C -1 ; WX 556 ; N ecaron ; B 64 -23 593 757 ;
-C -1 ; WX 722 ; N Ugrave ; B 119 -23 809 936 ;
-C -1 ; WX 667 ; N Thorn ; B 76 0 721 729 ;
-C -1 ; WX 556 ; N eacute ; B 64 -23 591 757 ;
-C -1 ; WX 556 ; N edieresis ; B 64 -23 591 741 ;
-C -1 ; WX 722 ; N dcaron ; B 79 -23 882 729 ;
-C -1 ; WX 556 ; N ccedilla ; B 77 -220 597 549 ;
-C -1 ; WX 556 ; N ccaron ; B 77 -23 607 757 ;
-C -1 ; WX 556 ; N cacute ; B 77 -23 597 757 ;
-C -1 ; WX 556 ; N aogonek ; B 50 -233 578 549 ;
-C -1 ; WX 556 ; N aring ; B 50 -23 578 773 ;
-C -1 ; WX 556 ; N atilde ; B 50 -23 612 744 ;
-C -1 ; WX 556 ; N abreve ; B 50 -23 578 754 ;
-C -1 ; WX 556 ; N egrave ; B 64 -23 591 757 ;
-C -1 ; WX 556 ; N agrave ; B 50 -23 578 757 ;
-C -1 ; WX 556 ; N aacute ; B 50 -23 587 757 ;
-C -1 ; WX 556 ; N adieresis ; B 50 -23 581 741 ;
-C -1 ; WX 722 ; N Uogonek ; B 119 -233 809 729 ;
-C -1 ; WX 611 ; N ugrave ; B 88 -23 656 757 ;
-C -1 ; WX 611 ; N uacute ; B 88 -23 656 757 ;
-C -1 ; WX 611 ; N udieresis ; B 88 -23 656 741 ;
-C -1 ; WX 404 ; N tcaron ; B 101 -23 578 829 ;
-C -1 ; WX 556 ; N scommaaccent ; B 60 -307 589 549 ;
-C -1 ; WX 611 ; N Zcaron ; B 30 0 733 936 ;
-C -1 ; WX 556 ; N ecircumflex ; B 64 -23 591 757 ;
-C -1 ; WX 722 ; N Ucircumflex ; B 119 -23 809 936 ;
-C -1 ; WX 556 ; N acircumflex ; B 50 -23 578 757 ;
-C -1 ; WX 611 ; N Zdotaccent ; B 30 0 733 918 ;
-C -1 ; WX 556 ; N scaron ; B 60 -23 597 757 ;
-C -1 ; WX 722 ; N Amacron ; B 26 0 706 901 ;
-C -1 ; WX 556 ; N sacute ; B 60 -23 589 757 ;
-C -1 ; WX 611 ; N Tcommaaccent ; B 142 -307 753 729 ;
-C -1 ; WX 667 ; N Ydieresis ; B 182 0 805 920 ;
-C -1 ; WX 611 ; N thorn ; B 11 -218 637 729 ;
-C -1 ; WX 667 ; N Emacron ; B 79 0 762 901 ;
-C -1 ; WX 778 ; N Ograve ; B 106 -23 828 936 ;
-C -1 ; WX 778 ; N Oacute ; B 106 -23 828 936 ;
-C -1 ; WX 778 ; N Odieresis ; B 106 -23 828 920 ;
-C -1 ; WX 722 ; N Ntilde ; B 68 0 816 923 ;
-C -1 ; WX 722 ; N Ncaron ; B 68 0 816 936 ;
-C -1 ; WX 722 ; N Nacute ; B 68 0 816 936 ;
-C -1 ; WX 611 ; N Lcaron ; B 80 0 607 729 ;
-C -1 ; WX 611 ; N Lacute ; B 80 0 606 936 ;
-C -1 ; WX 278 ; N Idotaccent ; B 63 0 388 918 ;
-C -1 ; WX 389 ; N racute ; B 63 0 500 757 ;
-C -1 ; WX 278 ; N Icircumflex ; B 63 0 467 936 ;
-C -1 ; WX 611 ; N ohungarumlaut ; B 82 -23 710 757 ;
-C -1 ; WX 611 ; N otilde ; B 82 -23 639 744 ;
-C -1 ; WX 556 ; N Euro ; B 21 -23 648 724 ;
-C -1 ; WX 611 ; N ocircumflex ; B 82 -23 634 757 ;
-C -1 ; WX 444 ; N onesuperior ; B 210 284 438 709 ;
-C -1 ; WX 444 ; N twosuperior ; B 124 284 499 718 ;
-C -1 ; WX 444 ; N threesuperior ; B 147 271 490 718 ;
-C -1 ; WX 278 ; N Igrave ; B 63 0 368 936 ;
-C -1 ; WX 278 ; N Iacute ; B 63 0 489 936 ;
-C -1 ; WX 278 ; N Imacron ; B 63 0 466 901 ;
-C -1 ; WX 278 ; N Iogonek ; B 7 -233 368 729 ;
-C -1 ; WX 278 ; N Idieresis ; B 63 0 483 920 ;
-C -1 ; WX 778 ; N Gbreve ; B 107 -23 819 934 ;
-C -1 ; WX 722 ; N Umacron ; B 119 -23 809 901 ;
-C -1 ; WX 722 ; N Kcommaaccent ; B 74 -307 843 729 ;
-C -1 ; WX 611 ; N ograve ; B 82 -23 634 757 ;
-C -1 ; WX 667 ; N Scommaaccent ; B 76 -307 725 741 ;
-C -1 ; WX 667 ; N Eogonek ; B 79 -233 762 729 ;
-C -1 ; WX 611 ; N oacute ; B 82 -23 634 757 ;
-C -1 ; WX 667 ; N Edotaccent ; B 79 0 762 918 ;
-C -1 ; WX 268 ; N iogonek ; B 0 -233 351 729 ;
-C -1 ; WX 611 ; N gcommaaccent ; B 26 -218 656 854 ;
-C -1 ; WX 611 ; N odieresis ; B 82 -23 634 741 ;
-C -1 ; WX 611 ; N ntilde ; B 63 0 646 744 ;
-C -1 ; WX 611 ; N ncaron ; B 63 0 629 757 ;
-C -1 ; WX 667 ; N Ecaron ; B 79 0 762 936 ;
-C -1 ; WX 667 ; N Ecircumflex ; B 79 0 762 936 ;
-C -1 ; WX 556 ; N scedilla ; B 60 -220 589 549 ;
-C -1 ; WX 389 ; N rcaron ; B 63 0 533 757 ;
-C -1 ; WX 667 ; N Egrave ; B 79 0 762 936 ;
-C -1 ; WX 667 ; N Eacute ; B 79 0 762 936 ;
-C -1 ; WX 778 ; N Gcommaaccent ; B 107 -307 819 741 ;
-C -1 ; WX 722 ; N Rcommaaccent ; B 80 -307 785 729 ;
-C -1 ; WX 667 ; N Edieresis ; B 79 0 762 920 ;
-C -1 ; WX 611 ; N nacute ; B 63 0 629 757 ;
-C -1 ; WX 611 ; N uogonek ; B 88 -233 656 540 ;
-C -1 ; WX 611 ; N umacron ; B 88 -23 656 722 ;
-C -1 ; WX 722 ; N Dcaron ; B 77 0 776 936 ;
-C -1 ; WX 384 ; N lcaron ; B 67 0 544 729 ;
-C -1 ; WX 722 ; N Ccaron ; B 107 -23 793 936 ;
-C -1 ; WX 722 ; N Cacute ; B 107 -23 793 936 ;
-C -1 ; WX 722 ; N Ccedilla ; B 107 -220 793 741 ;
-C -1 ; WX 606 ; N degree ; B 240 383 543 686 ;
-C -1 ; WX 722 ; N Aogonek ; B 26 -233 703 729 ;
-C -1 ; WX 584 ; N minus ; B 77 172 606 292 ;
-C -1 ; WX 584 ; N multiply ; B 102 18 582 444 ;
-C -1 ; WX 584 ; N divide ; B 77 0 606 462 ;
-C -1 ; WX 722 ; N Aring ; B 26 0 703 953 ;
-C -1 ; WX 1000 ; N trademark ; B 213 273 1087 729 ;
-C -1 ; WX 389 ; N rcommaaccent ; B 8 -307 487 549 ;
-C -1 ; WX 278 ; N lacute ; B 67 0 474 936 ;
-C -1 ; WX 611 ; N omacron ; B 82 -23 634 722 ;
-C -1 ; WX 722 ; N Atilde ; B 26 0 739 923 ;
-C -1 ; WX 278 ; N icircumflex ; B 67 0 426 757 ;
-C -1 ; WX 278 ; N igrave ; B 67 0 322 757 ;
-C -1 ; WX 611 ; N ncommaaccent ; B 63 -307 629 549 ;
-C -1 ; WX 278 ; N lcommaaccent ; B 11 -307 362 729 ;
-C -1 ; WX 584 ; N plusminus ; B 50 0 630 633 ;
-C -1 ; WX 1055 ; N onehalf ; B 210 -20 1050 715 ;
-C -1 ; WX 1055 ; N onequarter ; B 210 -20 1032 715 ;
-C -1 ; WX 1055 ; N threequarters ; B 147 -20 1032 718 ;
-C -1 ; WX 278 ; N iacute ; B 67 0 448 757 ;
-C -1 ; WX 722 ; N Abreve ; B 26 0 703 934 ;
-C -1 ; WX 556 ; N kcommaaccent ; B 59 -307 651 729 ;
-C -1 ; WX 778 ; N Omacron ; B 106 -23 828 901 ;
-C -1 ; WX 278 ; N imacron ; B 67 0 424 722 ;
-C -1 ; WX 556 ; N emacron ; B 64 -23 591 722 ;
-C -1 ; WX 556 ; N amacron ; B 50 -23 579 722 ;
-C -1 ; WX 333 ; N tcommaaccent ; B 62 -307 414 674 ;
-C -1 ; WX 556 ; N ydieresis ; B 37 -219 653 741 ;
-C -1 ; WX 500 ; N zdotaccent ; B 21 0 575 741 ;
-C -1 ; WX 500 ; N zcaron ; B 21 0 575 757 ;
-C -1 ; WX 500 ; N zacute ; B 21 0 575 757 ;
-C -1 ; WX 556 ; N yacute ; B 37 -219 653 757 ;
-C -1 ; WX 611 ; N uhungarumlaut ; B 88 -23 697 757 ;
-C -1 ; WX 611 ; N eth ; B 83 -23 633 744 ;
-C -1 ; WX 611 ; N uring ; B 88 -23 656 773 ;
-C -1 ; WX 778 ; N Ocircumflex ; B 106 -23 828 936 ;
-C -1 ; WX 333 ; N commaaccent ; B 43 -307 217 -60 ;
-C -1 ; WX 737 ; N copyright ; B 54 -22 837 743 ;
-C -1 ; WX 737 ; N registered ; B 55 -22 837 743 ;
-C -1 ; WX 722 ; N Acircumflex ; B 26 0 703 936 ;
-C -1 ; WX 278 ; N idieresis ; B 67 0 442 741 ;
-C -1 ; WX 489 ; N lozenge ; B 95 0 541 744 ;
-C -1 ; WX 729 ; N Delta ; B 8 0 721 729 ;
-C -1 ; WX 584 ; N notequal ; B 61 -74 622 544 ;
-C -1 ; WX 542 ; N radical ; B 102 -36 705 913 ;
-C -1 ; WX 722 ; N Agrave ; B 26 0 703 936 ;
-C -1 ; WX 722 ; N Aacute ; B 26 0 714 936 ;
-C -1 ; WX 584 ; N lessequal ; B 35 0 657 624 ;
-C -1 ; WX 584 ; N greaterequal ; B 44 0 627 624 ;
-C -1 ; WX 584 ; N logicalnot ; B 103 86 632 376 ;
-C -1 ; WX 711 ; N summation ; B -18 -97 760 760 ;
-C -1 ; WX 490 ; N partialdiff ; B 22 -15 458 750 ;
-C -1 ; WX 722 ; N Ncommaaccent ; B 68 -307 816 729 ;
-C -1 ; WX 611 ; N dcroat ; B 79 -23 746 729 ;
-C -1 ; WX 280 ; N brokenbar ; B 57 -200 335 729 ;
-C -1 ; WX 611 ; N Lcommaaccent ; B 80 -309 606 729 ;
-C -1 ; WX 722 ; N Adieresis ; B 26 0 708 920 ;
-C -1 ; WX 611 ; N mu ; B 11 -220 655 540 ;
-C -1 ; WX 278 ; N .notdef ; B 245 0 245 0 ;
-EndCharMetrics
-StartKernData
-StartKernPairs 998
-KPX A C -36
-KPX A Ccedilla -36
-KPX A G -38
-KPX A O -37
-KPX A Odieresis -37
-KPX A Q -39
-KPX A T -91
-KPX A U -37
-KPX A Uacute -37
-KPX A Ucircumflex -37
-KPX A Udieresis -37
-KPX A Ugrave -37
-KPX A V -74
-KPX A W -57
-KPX A Y -96
-KPX A a -11
-KPX A b -10
-KPX A c -17
-KPX A ccedilla -17
-KPX A comma 9
-KPX A d -17
-KPX A e -10
-KPX A g -20
-KPX A guillemotleft -48
-KPX A guilsinglleft -44
-KPX A hyphen 2
-KPX A o -19
-KPX A period 13
-KPX A q -13
-KPX A quotedblright -71
-KPX A quoteright -67
-KPX A t -21
-KPX A u -17
-KPX A v -42
-KPX A w -28
-KPX A y -41
-KPX Aacute C -37
-KPX Aacute G -38
-KPX Aacute O -38
-KPX Aacute Q -40
-KPX Aacute T -91
-KPX Aacute U -38
-KPX Aacute V -74
-KPX Aacute W -57
-KPX Aacute Y -96
-KPX Aacute a -11
-KPX Aacute b -10
-KPX Aacute c -17
-KPX Aacute comma 9
-KPX Aacute d -17
-KPX Aacute e -11
-KPX Aacute g -20
-KPX Aacute guillemotleft -48
-KPX Aacute guilsinglleft -45
-KPX Aacute hyphen 2
-KPX Aacute o -20
-KPX Aacute period 12
-KPX Aacute q -14
-KPX Aacute quoteright -67
-KPX Aacute t -22
-KPX Aacute u -18
-KPX Aacute v -42
-KPX Aacute w -29
-KPX Aacute y -41
-KPX Acircumflex C -36
-KPX Acircumflex G -38
-KPX Acircumflex O -37
-KPX Acircumflex Q -39
-KPX Acircumflex T -91
-KPX Acircumflex U -37
-KPX Acircumflex V -74
-KPX Acircumflex W -57
-KPX Acircumflex Y -96
-KPX Acircumflex comma 9
-KPX Acircumflex period 13
-KPX Adieresis C -37
-KPX Adieresis G -38
-KPX Adieresis O -38
-KPX Adieresis Q -39
-KPX Adieresis T -91
-KPX Adieresis U -38
-KPX Adieresis V -74
-KPX Adieresis W -57
-KPX Adieresis Y -96
-KPX Adieresis a -11
-KPX Adieresis b -10
-KPX Adieresis c -17
-KPX Adieresis comma 9
-KPX Adieresis d -17
-KPX Adieresis g -20
-KPX Adieresis guillemotleft -48
-KPX Adieresis guilsinglleft -44
-KPX Adieresis hyphen 2
-KPX Adieresis o -20
-KPX Adieresis period 12
-KPX Adieresis q -13
-KPX Adieresis quotedblright -71
-KPX Adieresis quoteright -67
-KPX Adieresis t -22
-KPX Adieresis u -17
-KPX Adieresis v -42
-KPX Adieresis w -28
-KPX Adieresis y -41
-KPX Agrave C -36
-KPX Agrave G -38
-KPX Agrave O -37
-KPX Agrave Q -39
-KPX Agrave T -91
-KPX Agrave U -37
-KPX Agrave V -74
-KPX Agrave W -57
-KPX Agrave Y -96
-KPX Agrave comma 9
-KPX Agrave period 13
-KPX Aring C -36
-KPX Aring G -38
-KPX Aring O -37
-KPX Aring Q -39
-KPX Aring T -91
-KPX Aring U -37
-KPX Aring V -74
-KPX Aring W -57
-KPX Aring Y -96
-KPX Aring a -11
-KPX Aring b -10
-KPX Aring c -17
-KPX Aring comma 9
-KPX Aring d -17
-KPX Aring e -10
-KPX Aring g -20
-KPX Aring guillemotleft -48
-KPX Aring guilsinglleft -44
-KPX Aring hyphen 2
-KPX Aring o -19
-KPX Aring period 13
-KPX Aring q -13
-KPX Aring quotedblright -71
-KPX Aring quoteright -67
-KPX Aring t -21
-KPX Aring u -17
-KPX Aring v -42
-KPX Aring w -28
-KPX Aring y -41
-KPX Atilde C -38
-KPX Atilde G -40
-KPX Atilde O -39
-KPX Atilde Q -41
-KPX Atilde T -92
-KPX Atilde U -39
-KPX Atilde V -74
-KPX Atilde W -57
-KPX Atilde Y -96
-KPX Atilde comma 9
-KPX Atilde period 11
-KPX B A -41
-KPX B AE -30
-KPX B Aacute -41
-KPX B Acircumflex -41
-KPX B Adieresis -41
-KPX B Aring -41
-KPX B Atilde -41
-KPX B O -18
-KPX B OE -9
-KPX B Oacute -18
-KPX B Ocircumflex -18
-KPX B Odieresis -18
-KPX B Ograve -18
-KPX B Oslash -17
-KPX B V -46
-KPX B W -30
-KPX B Y -63
-KPX C A -34
-KPX C AE -23
-KPX C Aacute -34
-KPX C Adieresis -34
-KPX C Aring -34
-KPX C H -1
-KPX C K -4
-KPX C O -12
-KPX C Oacute -12
-KPX C Odieresis -12
-KPX Ccedilla A -34
-KPX D A -40
-KPX D Aacute -40
-KPX D Acircumflex -40
-KPX D Adieresis -40
-KPX D Agrave -40
-KPX D Aring -40
-KPX D Atilde -40
-KPX D J -4
-KPX D T -24
-KPX D V -37
-KPX D W -20
-KPX D X -40
-KPX D Y -62
-KPX F A -68
-KPX F Aacute -68
-KPX F Acircumflex -68
-KPX F Adieresis -68
-KPX F Agrave -68
-KPX F Aring -68
-KPX F Atilde -68
-KPX F J -33
-KPX F O -24
-KPX F Odieresis -24
-KPX F a -23
-KPX F aacute -23
-KPX F adieresis -23
-KPX F ae -26
-KPX F aring -23
-KPX F comma -84
-KPX F e -12
-KPX F eacute -12
-KPX F hyphen 4
-KPX F i -15
-KPX F j -17
-KPX F o -21
-KPX F oacute -21
-KPX F odieresis -21
-KPX F oe -16
-KPX F oslash -24
-KPX F period -82
-KPX F r -35
-KPX F u -32
-KPX G A -17
-KPX G AE -5
-KPX G Aacute -17
-KPX G Acircumflex -17
-KPX G Adieresis -17
-KPX G Agrave -17
-KPX G Aring -17
-KPX G Atilde -17
-KPX G T -28
-KPX G V -41
-KPX G W -25
-KPX G Y -65
-KPX J A -38
-KPX J AE -29
-KPX J Adieresis -38
-KPX J Aring -38
-KPX K C -59
-KPX K G -61
-KPX K O -60
-KPX K OE -51
-KPX K Oacute -60
-KPX K Odieresis -60
-KPX K S -45
-KPX K T 5
-KPX K a -17
-KPX K adieresis -17
-KPX K ae -17
-KPX K aring -17
-KPX K e -38
-KPX K hyphen -52
-KPX K o -45
-KPX K oacute -45
-KPX K odieresis -45
-KPX K u -35
-KPX K udieresis -35
-KPX K y -74
-KPX L A 0
-KPX L AE 12
-KPX L Aacute 0
-KPX L Adieresis 0
-KPX L Aring 0
-KPX L C -35
-KPX L Ccedilla -36
-KPX L G -40
-KPX L O -39
-KPX L Oacute -39
-KPX L Ocircumflex -39
-KPX L Odieresis -39
-KPX L Ograve -39
-KPX L Otilde -39
-KPX L S -14
-KPX L T -104
-KPX L U -35
-KPX L Udieresis -35
-KPX L V -102
-KPX L W -79
-KPX L Y -121
-KPX L hyphen -20
-KPX L quotedblright -147
-KPX L quoteright -143
-KPX L u -17
-KPX L udieresis -17
-KPX L y -64
-KPX N A -15
-KPX N AE -2
-KPX N Aacute -15
-KPX N Adieresis -15
-KPX N Aring -15
-KPX N C -1
-KPX N Ccedilla -1
-KPX N G -2
-KPX N O -2
-KPX N Oacute -2
-KPX N Odieresis -2
-KPX N a 5
-KPX N aacute 5
-KPX N adieresis 5
-KPX N ae 4
-KPX N aring 5
-KPX N comma 7
-KPX N e 10
-KPX N eacute 10
-KPX N o 1
-KPX N oacute 1
-KPX N odieresis 1
-KPX N oslash 2
-KPX N period 8
-KPX N u 4
-KPX N udieresis 4
-KPX O A -42
-KPX O AE -33
-KPX O Aacute -42
-KPX O Adieresis -42
-KPX O Aring -42
-KPX O T -32
-KPX O V -40
-KPX O W -24
-KPX O X -43
-KPX O Y -65
-KPX Oacute A -42
-KPX Oacute T -32
-KPX Oacute V -40
-KPX Oacute W -24
-KPX Oacute Y -65
-KPX Ocircumflex T -32
-KPX Ocircumflex V -40
-KPX Ocircumflex Y -65
-KPX Odieresis A -42
-KPX Odieresis T -32
-KPX Odieresis V -40
-KPX Odieresis W -24
-KPX Odieresis X -43
-KPX Odieresis Y -65
-KPX Ograve T -32
-KPX Ograve V -40
-KPX Ograve Y -65
-KPX Oslash A -34
-KPX Otilde T -32
-KPX Otilde V -40
-KPX Otilde Y -65
-KPX P A -71
-KPX P AE -62
-KPX P Aacute -71
-KPX P Adieresis -71
-KPX P Aring -71
-KPX P J -52
-KPX P a -14
-KPX P aacute -14
-KPX P adieresis -14
-KPX P ae -15
-KPX P aring -14
-KPX P comma -103
-KPX P e -13
-KPX P eacute -13
-KPX P hyphen -7
-KPX P o -22
-KPX P oacute -22
-KPX P odieresis -22
-KPX P oe -17
-KPX P oslash -26
-KPX P period -101
-KPX R C -12
-KPX R Ccedilla -12
-KPX R G -13
-KPX R O -13
-KPX R OE -3
-KPX R Oacute -13
-KPX R Odieresis -13
-KPX R T -12
-KPX R U -12
-KPX R Udieresis -12
-KPX R V -38
-KPX R W -22
-KPX R Y -50
-KPX R a -4
-KPX R aacute -4
-KPX R adieresis -4
-KPX R ae -5
-KPX R aring -4
-KPX R e 0
-KPX R eacute 0
-KPX R hyphen 10
-KPX R o -9
-KPX R oacute -9
-KPX R odieresis -9
-KPX R oe -4
-KPX R u -6
-KPX R uacute -6
-KPX R udieresis -6
-KPX R y -4
-KPX S A -26
-KPX S AE -14
-KPX S Aacute -26
-KPX S Adieresis -26
-KPX S Aring -26
-KPX S T -15
-KPX S V -36
-KPX S W -20
-KPX S Y -54
-KPX S t -4
-KPX T A -93
-KPX T AE -85
-KPX T Aacute -93
-KPX T Acircumflex -93
-KPX T Adieresis -93
-KPX T Agrave -93
-KPX T Aring -93
-KPX T Atilde -93
-KPX T C -29
-KPX T G -30
-KPX T J -95
-KPX T O -30
-KPX T OE -20
-KPX T Oacute -30
-KPX T Ocircumflex -30
-KPX T Odieresis -30
-KPX T Ograve -30
-KPX T Oslash -36
-KPX T Otilde -30
-KPX T S -7
-KPX T V 9
-KPX T W 15
-KPX T Y 7
-KPX T a -77
-KPX T ae -78
-KPX T c -79
-KPX T colon -104
-KPX T comma -75
-KPX T e -72
-KPX T g -79
-KPX T guillemotleft -107
-KPX T guilsinglleft -103
-KPX T hyphen -53
-KPX T i -9
-KPX T j -11
-KPX T o -81
-KPX T oslash -80
-KPX T period -73
-KPX T r -76
-KPX T s -81
-KPX T semicolon -105
-KPX T u -78
-KPX T v -91
-KPX T w -85
-KPX T y -89
-KPX U A -40
-KPX U AE -30
-KPX U Aacute -40
-KPX U Acircumflex -40
-KPX U Adieresis -40
-KPX U Aring -40
-KPX U Atilde -40
-KPX U comma -17
-KPX U m -3
-KPX U n -5
-KPX U p -3
-KPX U period -12
-KPX U r -5
-KPX Uacute A -40
-KPX Uacute comma -17
-KPX Uacute m -3
-KPX Uacute n -5
-KPX Uacute p -3
-KPX Uacute period -12
-KPX Uacute r -5
-KPX Ucircumflex A -40
-KPX Udieresis A -40
-KPX Udieresis b -4
-KPX Udieresis comma -17
-KPX Udieresis m -3
-KPX Udieresis n -5
-KPX Udieresis p -3
-KPX Udieresis period -12
-KPX Udieresis r -5
-KPX Ugrave A -40
-KPX V A -75
-KPX V AE -65
-KPX V Aacute -75
-KPX V Acircumflex -75
-KPX V Adieresis -75
-KPX V Agrave -75
-KPX V Aring -75
-KPX V Atilde -75
-KPX V C -43
-KPX V G -44
-KPX V O -44
-KPX V Oacute -44
-KPX V Ocircumflex -44
-KPX V Odieresis -44
-KPX V Ograve -44
-KPX V Oslash -42
-KPX V Otilde -44
-KPX V S -31
-KPX V T 12
-KPX V a -51
-KPX V ae -52
-KPX V colon -74
-KPX V comma -76
-KPX V e -46
-KPX V g -54
-KPX V guillemotleft -81
-KPX V guilsinglleft -77
-KPX V hyphen -26
-KPX V i -13
-KPX V o -56
-KPX V oslash -55
-KPX V period -74
-KPX V r -43
-KPX V semicolon -77
-KPX V u -42
-KPX V y -19
-KPX W A -59
-KPX W AE -50
-KPX W Aacute -59
-KPX W Acircumflex -59
-KPX W Adieresis -59
-KPX W Agrave -59
-KPX W Aring -59
-KPX W Atilde -59
-KPX W C -28
-KPX W G -29
-KPX W O -29
-KPX W Oacute -29
-KPX W Ocircumflex -29
-KPX W Odieresis -29
-KPX W Ograve -29
-KPX W Oslash -27
-KPX W Otilde -29
-KPX W S -22
-KPX W T 16
-KPX W a -34
-KPX W ae -34
-KPX W colon -61
-KPX W comma -53
-KPX W e -28
-KPX W g -36
-KPX W guillemotleft -63
-KPX W guilsinglleft -59
-KPX W hyphen -9
-KPX W i -9
-KPX W o -38
-KPX W oslash -37
-KPX W period -51
-KPX W r -33
-KPX W semicolon -63
-KPX W u -32
-KPX W y -9
-KPX X C -39
-KPX X O -40
-KPX X Odieresis -40
-KPX X Q -43
-KPX X a -17
-KPX X e -33
-KPX X hyphen -33
-KPX X o -43
-KPX X u -35
-KPX X y -48
-KPX Y A -91
-KPX Y AE -81
-KPX Y Aacute -91
-KPX Y Acircumflex -91
-KPX Y Adieresis -91
-KPX Y Agrave -91
-KPX Y Aring -91
-KPX Y Atilde -91
-KPX Y C -60
-KPX Y G -61
-KPX Y O -61
-KPX Y Oacute -61
-KPX Y Ocircumflex -61
-KPX Y Odieresis -61
-KPX Y Ograve -61
-KPX Y Oslash -58
-KPX Y Otilde -61
-KPX Y S -39
-KPX Y T 14
-KPX Y a -71
-KPX Y ae -71
-KPX Y colon -90
-KPX Y comma -85
-KPX Y e -66
-KPX Y g -73
-KPX Y guillemotleft -105
-KPX Y guilsinglleft -101
-KPX Y hyphen -55
-KPX Y i -11
-KPX Y o -76
-KPX Y oslash -74
-KPX Y p -53
-KPX Y period -84
-KPX Y semicolon -93
-KPX Y u -57
-KPX Y v -36
-KPX Z v -21
-KPX Z y -19
-KPX a j -7
-KPX a quoteright -14
-KPX a v -23
-KPX a w -10
-KPX a y -24
-KPX aacute v -23
-KPX aacute w -10
-KPX aacute y -24
-KPX adieresis v -23
-KPX adieresis w -10
-KPX adieresis y -24
-KPX ae v -21
-KPX ae w -7
-KPX ae y -23
-KPX agrave v -23
-KPX agrave w -10
-KPX agrave y -24
-KPX aring v -23
-KPX aring w -10
-KPX aring y -24
-KPX b v -23
-KPX b w -9
-KPX b y -25
-KPX c h -9
-KPX c k -5
-KPX comma one -79
-KPX comma quotedblright -39
-KPX comma quoteright -35
-KPX e quoteright -13
-KPX e t -9
-KPX e v -22
-KPX e w -9
-KPX e x -25
-KPX e y -25
-KPX eacute v -22
-KPX eacute w -9
-KPX eacute y -25
-KPX ecircumflex v -22
-KPX ecircumflex w -9
-KPX ecircumflex y -25
-KPX eight four 2
-KPX eight one -32
-KPX eight seven -15
-KPX f a -6
-KPX f aacute -6
-KPX f adieresis -6
-KPX f ae -6
-KPX f aring -6
-KPX f e -6
-KPX f eacute -6
-KPX f f 14
-KPX f i -13
-KPX f j -15
-KPX f l -13
-KPX f o -16
-KPX f oacute -16
-KPX f odieresis -16
-KPX f oe -11
-KPX f oslash -16
-KPX f quoteright 0
-KPX f s -10
-KPX f t 14
-KPX five four -3
-KPX five one -37
-KPX five seven -17
-KPX four four 0
-KPX four one -55
-KPX four seven -33
-KPX g a -3
-KPX g adieresis -3
-KPX g ae -4
-KPX g aring -3
-KPX g e 1
-KPX g eacute 1
-KPX g l -5
-KPX g oacute -8
-KPX g odieresis -8
-KPX g r -3
-KPX guillemotright A -56
-KPX guillemotright AE -46
-KPX guillemotright Aacute -56
-KPX guillemotright Adieresis -56
-KPX guillemotright Aring -56
-KPX guillemotright T -115
-KPX guillemotright V -84
-KPX guillemotright W -65
-KPX guillemotright Y -117
-KPX guilsinglright A -52
-KPX guilsinglright AE -42
-KPX guilsinglright Aacute -52
-KPX guilsinglright Adieresis -52
-KPX guilsinglright Aring -52
-KPX guilsinglright T -110
-KPX guilsinglright V -79
-KPX guilsinglright W -60
-KPX guilsinglright Y -113
-KPX h quoteright -15
-KPX h y -25
-KPX hyphen A -7
-KPX hyphen AE 2
-KPX hyphen Aacute -7
-KPX hyphen Adieresis -7
-KPX hyphen Aring -7
-KPX hyphen T -64
-KPX hyphen V -34
-KPX hyphen W -15
-KPX hyphen Y -71
-KPX i T -12
-KPX i j -7
-KPX k a -13
-KPX k aacute -13
-KPX k adieresis -13
-KPX k ae -15
-KPX k aring -13
-KPX k comma -3
-KPX k e -19
-KPX k eacute -19
-KPX k g -26
-KPX k hyphen -31
-KPX k o -28
-KPX k oacute -28
-KPX k odieresis -28
-KPX k period -3
-KPX k s -23
-KPX k u -8
-KPX k udieresis -8
-KPX l v -14
-KPX l y -11
-KPX m p -1
-KPX m v -23
-KPX m w -9
-KPX m y -23
-KPX n T -87
-KPX n p -2
-KPX n quoteright -15
-KPX n v -24
-KPX n w -11
-KPX n y -25
-KPX nine four -6
-KPX nine one -30
-KPX nine seven -23
-KPX o T -90
-KPX o quoteright -19
-KPX o t -13
-KPX o v -27
-KPX o w -13
-KPX o x -30
-KPX o y -29
-KPX oacute v -27
-KPX oacute w -13
-KPX oacute y -29
-KPX ocircumflex t -13
-KPX odieresis t -13
-KPX odieresis v -27
-KPX odieresis w -13
-KPX odieresis x -30
-KPX odieresis y -29
-KPX ograve v -27
-KPX ograve w -13
-KPX ograve y -29
-KPX one comma -51
-KPX one eight -47
-KPX one five -50
-KPX one four -70
-KPX one nine -47
-KPX one one -92
-KPX one period -49
-KPX one seven -72
-KPX one six -48
-KPX one three -53
-KPX one two -56
-KPX one zero -44
-KPX p t -10
-KPX p y -25
-KPX period one -80
-KPX period quotedblright -39
-KPX period quoteright -35
-KPX q c -3
-KPX q u -3
-KPX quotedblbase A 7
-KPX quotedblbase AE 19
-KPX quotedblbase T -79
-KPX quotedblbase V -77
-KPX quotedblbase W -54
-KPX quotedblbase Y -96
-KPX quotedblleft A -72
-KPX quotedblleft AE -64
-KPX quotedblleft Aacute -72
-KPX quotedblleft Adieresis -72
-KPX quotedblleft Aring -72
-KPX quotedblleft T -11
-KPX quotedblleft V 0
-KPX quotedblleft W 9
-KPX quotedblleft Y -15
-KPX quotedblright A -72
-KPX quotedblright AE -64
-KPX quotedblright Aacute -72
-KPX quotedblright Adieresis -72
-KPX quotedblright Aring -72
-KPX quotedblright T -7
-KPX quotedblright V 1
-KPX quotedblright W 11
-KPX quotedblright Y -14
-KPX quoteleft A -76
-KPX quoteleft AE -69
-KPX quoteleft Aacute -76
-KPX quoteleft Adieresis -76
-KPX quoteleft Aring -76
-KPX quoteleft T -15
-KPX quoteleft V -4
-KPX quoteleft W 5
-KPX quoteleft Y -20
-KPX quoteright A -80
-KPX quoteright AE -72
-KPX quoteright Aacute -80
-KPX quoteright Adieresis -80
-KPX quoteright Aring -80
-KPX quoteright comma -53
-KPX quoteright d -30
-KPX quoteright o -34
-KPX quoteright period -51
-KPX quoteright r -20
-KPX quoteright s -27
-KPX quoteright t -11
-KPX quoteright v -11
-KPX quoteright w -4
-KPX quoteright y -9
-KPX r a -1
-KPX r aacute -1
-KPX r acircumflex -1
-KPX r adieresis -1
-KPX r ae -2
-KPX r agrave -1
-KPX r aring -1
-KPX r c -6
-KPX r ccedilla -6
-KPX r colon -36
-KPX r comma -64
-KPX r d -5
-KPX r e 2
-KPX r eacute 2
-KPX r ecircumflex 2
-KPX r egrave 2
-KPX r f 15
-KPX r g -7
-KPX r h -12
-KPX r hyphen -40
-KPX r i -12
-KPX r j -13
-KPX r k -8
-KPX r l -12
-KPX r m -8
-KPX r n -10
-KPX r o -7
-KPX r oacute -7
-KPX r ocircumflex -7
-KPX r odieresis -7
-KPX r oe -2
-KPX r ograve -7
-KPX r oslash -12
-KPX r p -7
-KPX r period -63
-KPX r q -2
-KPX r quoteright 4
-KPX r r -10
-KPX r s -4
-KPX r semicolon -37
-KPX r t 15
-KPX r u -8
-KPX r v 12
-KPX r w 17
-KPX r x 7
-KPX r y 14
-KPX r z 2
-KPX s quoteright -12
-KPX s t -9
-KPX seven colon -71
-KPX seven comma -95
-KPX seven eight -10
-KPX seven five -28
-KPX seven four -70
-KPX seven one -21
-KPX seven period -94
-KPX seven seven 2
-KPX seven six -21
-KPX seven three -7
-KPX seven two -11
-KPX six four -1
-KPX six one -29
-KPX six seven -13
-KPX t S -9
-KPX t a -3
-KPX t aacute -3
-KPX t adieresis -3
-KPX t ae -5
-KPX t aring -3
-KPX t colon -41
-KPX t e -5
-KPX t eacute -5
-KPX t h -9
-KPX t o -15
-KPX t oacute -15
-KPX t odieresis -15
-KPX t quoteright -3
-KPX t semicolon -42
-KPX three four -2
-KPX three one -34
-KPX three seven -19
-KPX two four -16
-KPX two one -24
-KPX two seven -12
-KPX u quoteright -8
-KPX v a -21
-KPX v aacute -21
-KPX v acircumflex -21
-KPX v adieresis -21
-KPX v ae -21
-KPX v agrave -21
-KPX v aring -21
-KPX v atilde -21
-KPX v c -25
-KPX v colon -41
-KPX v comma -57
-KPX v e -18
-KPX v eacute -18
-KPX v ecircumflex -18
-KPX v egrave -18
-KPX v g -26
-KPX v hyphen -5
-KPX v l -12
-KPX v o -28
-KPX v oacute -28
-KPX v odieresis -28
-KPX v ograve -28
-KPX v oslash -28
-KPX v period -55
-KPX v s -25
-KPX v semicolon -43
-KPX w a -11
-KPX w aacute -11
-KPX w acircumflex -11
-KPX w adieresis -11
-KPX w ae -12
-KPX w agrave -11
-KPX w aring -11
-KPX w atilde -11
-KPX w c -12
-KPX w colon -36
-KPX w comma -38
-KPX w e -5
-KPX w eacute -5
-KPX w ecircumflex -5
-KPX w egrave -5
-KPX w g -13
-KPX w hyphen 7
-KPX w l -8
-KPX w o -15
-KPX w oacute -15
-KPX w odieresis -15
-KPX w ograve -15
-KPX w oslash -14
-KPX w period -36
-KPX w s -15
-KPX w semicolon -38
-KPX x a -22
-KPX x c -27
-KPX x e -20
-KPX x eacute -20
-KPX x o -30
-KPX x q -23
-KPX y a -20
-KPX y aacute -20
-KPX y acircumflex -20
-KPX y adieresis -20
-KPX y ae -20
-KPX y agrave -20
-KPX y aring -20
-KPX y atilde -20
-KPX y c -26
-KPX y colon -40
-KPX y comma -58
-KPX y e -19
-KPX y eacute -19
-KPX y ecircumflex -19
-KPX y egrave -19
-KPX y g -27
-KPX y hyphen -4
-KPX y l -11
-KPX y o -28
-KPX y oacute -28
-KPX y odieresis -28
-KPX y ograve -28
-KPX y oslash -27
-KPX y period -55
-KPX y s -24
-KPX y semicolon -43
-KPX zero four -3
-KPX zero one -29
-KPX zero seven -21
-EndKernPairs
-EndKernData
-EndFontMetrics
diff --git a/data/fonts/urw/n019024l.pfb b/data/fonts/urw/n019024l.pfb
deleted file mode 100644
index 479904083..000000000
--- a/data/fonts/urw/n019024l.pfb
+++ /dev/null
diff --git a/data/fonts/urw/n019024l.pfm b/data/fonts/urw/n019024l.pfm
deleted file mode 100644
index 318cb54fb..000000000
--- a/data/fonts/urw/n019024l.pfm
+++ /dev/null
diff --git a/helper-utilities/authenticate/Makefile.am b/helper-utilities/authenticate/Makefile.am
index f9c2851d8..9c7641a40 100644
--- a/helper-utilities/authenticate/Makefile.am
+++ b/helper-utilities/authenticate/Makefile.am
@@ -18,6 +18,8 @@ nautilus_authenticate_SOURCES =\
 
 nautilus_authenticate_LDADD =	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la  \
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(GNOMEUI_LIBS)	\
 	$(GCONF_LIBS) \
 	$(PAM_LIBS) \
diff --git a/helper-utilities/authenticate/nautilus-authenticate.c b/helper-utilities/authenticate/nautilus-authenticate.c
index 650b245c1..800051cb7 100644
--- a/helper-utilities/authenticate/nautilus-authenticate.c
+++ b/helper-utilities/authenticate/nautilus-authenticate.c
@@ -30,7 +30,7 @@
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-init.h>
-#include <libnautilus-extensions/nautilus-password-dialog.h>
+#include <eel/eel-password-dialog.h>
 #include <stdio.h>
 #include <unistd.h>
 
@@ -69,7 +69,7 @@ int main (int argc, char *argv[])
 	if (!command)
 		command = g_strdup("");
 	
-	password_dialog = nautilus_password_dialog_new (_("Privileged Command Execution"),
+	password_dialog = eel_password_dialog_new (_("Privileged Command Execution"),
 							NULL,
 							"root",
 							"",
@@ -77,12 +77,12 @@ int main (int argc, char *argv[])
 	
 	g_free (command);
 	
-	if (nautilus_password_dialog_run_and_block (NAUTILUS_PASSWORD_DIALOG (password_dialog))) {
+	if (eel_password_dialog_run_and_block (EEL_PASSWORD_DIALOG (password_dialog))) {
 		char *username;
 		char *password;
 		
-		username = nautilus_password_dialog_get_username (NAUTILUS_PASSWORD_DIALOG (password_dialog));
-		password = nautilus_password_dialog_get_password (NAUTILUS_PASSWORD_DIALOG (password_dialog));
+		username = eel_password_dialog_get_username (EEL_PASSWORD_DIALOG (password_dialog));
+		password = eel_password_dialog_get_password (EEL_PASSWORD_DIALOG (password_dialog));
 		
 		if (nautilus_authenticate_authenticate (username, password)) {
 			/* Free the password right away to blow it away from memory. */
diff --git a/libnautilus-extensions/Makefile.am b/libnautilus-extensions/Makefile.am
index 637d404d1..0b81256b3 100644
--- a/libnautilus-extensions/Makefile.am
+++ b/libnautilus-extensions/Makefile.am
@@ -8,6 +8,8 @@ INCLUDES = 						\
 	-I$(top_builddir) 				\
 	-I$(top_builddir)/libnautilus 			\
 	-I$(top_srcdir)/cut-n-paste-code 		\
+	$(LIBRSVG_INCLUDEDIR) \
+	$(EEL_INCLUDEDIR) \
 	$(BONOBO_PRINT_CFLAGS) 				\
 	$(BONOBOX_CFLAGS) 				\
 	$(ESD_CFLAGS)					\
@@ -27,7 +29,6 @@ dependency_static_libs = \
 	$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
 	$(top_builddir)/cut-n-paste-code/widgets/nautilusclist/libnautilusclist.la \
 	$(top_builddir)/cut-n-paste-code/widgets/gimphwrapbox/libgtkhwrapbox.la \
-	$(top_builddir)/librsvg/librsvg.la \
 	$(NULL)
 
 if HAVE_CDDA
@@ -54,252 +55,161 @@ libnautilus_extensions_la_LDFLAGS =	\
 	$(CDDALIBADD)			\
 	$(NULL)
 
-nautilus_metafile_server_idl_sources =		\
-	nautilus-metafile-server-stubs.c	\
-	nautilus-metafile-server-skels.c	\
-	nautilus-metafile-server.h		\
-	nautilus-metafile-server-common.c
+nautilus_metafile_server_idl_sources = \
+	nautilus-metafile-server-stubs.c \
+	nautilus-metafile-server-skels.c \
+	nautilus-metafile-server.h \
+	nautilus-metafile-server-common.c \
+	$(NULL)
 
-libnautilus_extensions_la_SOURCES = 		\
+libnautilus_extensions_la_SOURCES = \
 	$(nautilus_metafile_server_idl_sources)	\
-	nautilus-art-extensions.c		\
-	nautilus-art-gtk-extensions.c		\
-	nautilus-audio-player.c			\
-	nautilus-background-canvas-group.c	\
-	nautilus-background.c			\
-	nautilus-bonobo-extensions.c		\
-	nautilus-bookmark.c			\
-	nautilus-caption-table.c		\
-	nautilus-caption.c			\
-	nautilus-clickable-image.c		\
-	nautilus-ctree.c			\
-	nautilus-customization-data.c		\
-	nautilus-dateedit-extensions.c		\
-	nautilus-debug-drawing.c		\
-	nautilus-debug.c			\
-	nautilus-default-file-icon.c		\
-	nautilus-directory-async.c		\
-	nautilus-directory-background.c		\
-	nautilus-directory-metafile-monitor.c   \
-	nautilus-directory-metafile.c		\
-	nautilus-directory.c			\
-	nautilus-drag-window.c			\
-	nautilus-drag.c				\
-	nautilus-druid-page-eazel.c		\
-	nautilus-druid.c			\
-	nautilus-ellipsizing-label.c		\
-	nautilus-entry.c			\
-	nautilus-enumeration.c			\
-	nautilus-file-changes-queue.c		\
-	nautilus-file-operations-progress.c	\
-	nautilus-file-operations.c		\
-	nautilus-file-utilities.c		\
-	nautilus-file.c				\
-	nautilus-font-factory.c			\
-	nautilus-font-manager.c			\
-	nautilus-font-picker.c			\
-	nautilus-gconf-extensions.c		\
-	nautilus-gdk-extensions.c		\
-	nautilus-gdk-font-extensions.c		\
-	nautilus-gdk-pixbuf-extensions.c	\
-	nautilus-generous-bin.c			\
-	nautilus-glib-extensions.c		\
-	nautilus-global-preferences.c		\
-	nautilus-glyph.c			\
-	nautilus-gnome-extensions.c		\
-	nautilus-graphic-effects.c		\
-	nautilus-gtk-extensions.c		\
-	nautilus-horizontal-splitter.c		\
-	nautilus-icon-canvas-item.c       	\
-	nautilus-icon-container.c		\
-	nautilus-icon-dnd.c			\
-	nautilus-icon-factory.c			\
-	nautilus-icon-text-item.c		\
-	nautilus-image-table.c			\
-	nautilus-image-with-background.c	\
-	nautilus-image.c			\
-	nautilus-keep-last-vertical-box.c	\
-	nautilus-label-with-background.c	\
-	nautilus-label.c			\
-	nautilus-labeled-image.c		\
-	nautilus-lib-self-check-functions.c	\
-	nautilus-link-set.c			\
-	nautilus-link.c				\
-	nautilus-list-column-title.c		\
-	nautilus-list.c                         \
-	nautilus-medusa-support.c		\
-	nautilus-merged-directory.c		\
-	nautilus-metafile-factory.c             \
-	nautilus-metafile.c                     \
-	nautilus-mime-actions.c			\
-	nautilus-password-dialog.c		\
-	nautilus-preferences-box.c		\
-	nautilus-preferences-dialog.c		\
-	nautilus-preferences-group.c		\
-	nautilus-preferences-item.c		\
-	nautilus-preferences-pane.c		\
-	nautilus-preferences.c			\
-	nautilus-program-chooser.c		\
-	nautilus-program-choosing.c		\
-	nautilus-radio-button-group.c		\
-	nautilus-region.c			\
-	nautilus-scalable-font.c		\
-	nautilus-search-uri.c			\
-	nautilus-self-checks.c			\
-	nautilus-sidebar-functions.c		\
-	nautilus-smooth-text-layout-cache.c	\
-	nautilus-smooth-text-layout.c		\
-	nautilus-smooth-widget.c		\
-	nautilus-sound.c			\
-	nautilus-stock-dialogs.c		\
-	nautilus-string-list.c			\
-	nautilus-string-map.c			\
-	nautilus-string-picker.c		\
-	nautilus-string.c			\
-	nautilus-tabs.c				\
-	nautilus-text-caption.c			\
-	nautilus-theme.c			\
-	nautilus-thumbnails.c			\
-	nautilus-trash-directory.c		\
-	nautilus-trash-file.c			\
-	nautilus-trash-monitor.c		\
-	nautilus-undo-context.c			\
-	nautilus-undo-manager.c			\
-	nautilus-undo-signal-handlers.c		\
-	nautilus-vfs-directory.c		\
-	nautilus-vfs-file.c			\
-	nautilus-view-identifier.c		\
-	nautilus-viewport.c			\
-	nautilus-volume-monitor.c		\
-	nautilus-wrap-table.c			\
-	nautilus-xml-extensions.c		\
+	nautilus-audio-player.c \
+	nautilus-bonobo-extensions.c \
+	nautilus-bookmark.c \
+	nautilus-ctree.c \
+	nautilus-customization-data.c \
+	nautilus-dateedit-extensions.c \
+	nautilus-default-file-icon.c \
+	nautilus-directory-async.c \
+	nautilus-directory-background.c \
+	nautilus-directory-metafile-monitor.c \
+	nautilus-directory-metafile.c \
+	nautilus-directory.c \
+	nautilus-drag-window.c \
+	nautilus-drag.c \
+	nautilus-druid-page-eazel.c \
+	nautilus-druid.c \
+	nautilus-entry.c \
+	nautilus-file-changes-queue.c \
+	nautilus-file-operations-progress.c \
+	nautilus-file-operations.c \
+	nautilus-file-utilities.c \
+	nautilus-file.c \
+	nautilus-font-factory.c \
+	nautilus-gconf-extensions.c \
+	nautilus-generous-bin.c \
+	nautilus-global-preferences.c \
+	nautilus-horizontal-splitter.c \
+	nautilus-icon-canvas-item.c \
+	nautilus-icon-container.c \
+	nautilus-icon-dnd.c \
+	nautilus-icon-factory.c \
+	nautilus-icon-text-item.c \
+	nautilus-keep-last-vertical-box.c \
+	nautilus-lib-self-check-functions.c \
+	nautilus-link-set.c \
+	nautilus-link.c \
+	nautilus-list-column-title.c \
+	nautilus-list.c \
+	nautilus-medusa-support.c \
+	nautilus-merged-directory.c \
+	nautilus-metafile-factory.c \
+	nautilus-metafile.c \
+	nautilus-mime-actions.c \
+	nautilus-preferences-box.c \
+	nautilus-preferences-dialog.c \
+	nautilus-preferences-group.c \
+	nautilus-preferences-item.c \
+	nautilus-preferences-pane.c \
+	nautilus-preferences.c \
+	nautilus-program-chooser.c \
+	nautilus-program-choosing.c \
+	nautilus-search-uri.c \
+	nautilus-sidebar-functions.c \
+	nautilus-sound.c \
+	nautilus-tabs.c \
+	nautilus-theme.c \
+	nautilus-thumbnails.c \
+	nautilus-trash-directory.c \
+	nautilus-trash-file.c \
+	nautilus-trash-monitor.c \
+	nautilus-undo-context.c \
+	nautilus-undo-manager.c \
+	nautilus-undo-signal-handlers.c \
+	nautilus-vfs-directory.c \
+	nautilus-vfs-file.c \
+	nautilus-view-identifier.c \
+	nautilus-volume-monitor.c \
 	$(NULL)
 
 # Everything is private for now
-noinst_HEADERS =				\
-	nautilus-art-extensions.h		\
-	nautilus-art-gtk-extensions.h		\
-	nautilus-audio-player.h			\
-	nautilus-background-canvas-group.h	\
-	nautilus-background.h			\
-	nautilus-bonobo-extensions.h		\
-	nautilus-bookmark.h			\
-	nautilus-caption-table.h		\
-	nautilus-caption.h			\
-	nautilus-cdrom-extensions.h		\
-	nautilus-clickable-image.h		\
-	nautilus-ctree.h			\
-	nautilus-customization-data.h		\
-	nautilus-dateedit-extensions.h 		\
-	nautilus-debug-drawing.h		\
-	nautilus-debug.h			\
-	nautilus-default-file-icon.h		\
-	nautilus-directory-background.h		\
-	nautilus-directory-metafile-monitor.h   \
-	nautilus-directory-metafile.h		\
-	nautilus-directory-notify.h		\
-	nautilus-directory-private.h		\
-	nautilus-directory.h			\
-	nautilus-drag-window.h			\
-	nautilus-drag.h				\
-	nautilus-druid-page-eazel.h		\
-	nautilus-druid.h			\
-	nautilus-ellipsizing-label.h		\
-	nautilus-entry.h			\
-	nautilus-enumeration.h			\
-	nautilus-file-attributes.h		\
-	nautilus-file-changes-queue.h		\
-	nautilus-file-operations-progress.h 	\
-	nautilus-file-operations.h 		\
-	nautilus-file-private.h			\
-	nautilus-file-utilities.h		\
-	nautilus-file.h				\
-	nautilus-font-factory.h			\
-	nautilus-font-manager.h			\
-	nautilus-font-picker.h			\
-	nautilus-gconf-extensions.h		\
-	nautilus-gdk-extensions.h		\
-	nautilus-gdk-font-extensions.h		\
-	nautilus-gdk-pixbuf-extensions.h	\
-	nautilus-generous-bin.h			\
-	nautilus-glib-extensions.h		\
-	nautilus-global-preferences.h		\
-	nautilus-glyph.h			\
-	nautilus-gnome-extensions.h		\
-	nautilus-graphic-effects.h		\
-	nautilus-gtk-extensions.h		\
-	nautilus-gtk-macros.h			\
-	nautilus-horizontal-splitter.h		\
-	nautilus-icon-canvas-item.h		\
-	nautilus-icon-container.h		\
-	nautilus-icon-dnd.h			\
-	nautilus-icon-factory-private.h		\
-	nautilus-icon-factory.h			\
-	nautilus-icon-private.h			\
-	nautilus-icon-text-item.h		\
-	nautilus-image-table.h			\
-	nautilus-image-with-background.h	\
-	nautilus-image.h			\
-	nautilus-iso9660.h			\
-	nautilus-keep-last-vertical-box.h	\
-	nautilus-label-with-background.h	\
-	nautilus-label.h			\
-	nautilus-labeled-image.h		\
-	nautilus-lib-self-check-functions.h	\
-	nautilus-link-set.h			\
-	nautilus-link.h				\
-	nautilus-list-column-title.h		\
-	nautilus-list.h                         \
-	nautilus-medusa-support.h		\
-	nautilus-merged-directory.h		\
-	nautilus-metadata.h			\
-	nautilus-metafile-factory.h             \
-	nautilus-metafile.h                     \
-	nautilus-mime-actions.h			\
-	nautilus-password-dialog.h		\
-	nautilus-preferences-box.h		\
-	nautilus-preferences-dialog.h		\
-	nautilus-preferences-group.h		\
-	nautilus-preferences-item.h		\
-	nautilus-preferences-pane.h		\
-	nautilus-preferences-private.h		\
-	nautilus-preferences.h			\
-	nautilus-program-chooser.h		\
-	nautilus-program-choosing.h		\
-	nautilus-radio-button-group.h		\
-	nautilus-region.h			\
-	nautilus-scalable-font-private.h	\
-	nautilus-scalable-font-private.h	\
-	nautilus-scalable-font.h		\
-	nautilus-search-uri.h			\
-	nautilus-self-checks.h			\
-	nautilus-sidebar-functions.h		\
-	nautilus-smooth-text-layout-cache.h	\
-	nautilus-smooth-text-layout.h		\
-	nautilus-smooth-widget.h		\
-	nautilus-sound.h			\
-	nautilus-stock-dialogs.h		\
-	nautilus-string-list.h			\
-	nautilus-string-map.h			\
-	nautilus-string-picker.h		\
-	nautilus-string.h			\
-	nautilus-tabs.h				\
-	nautilus-text-caption.h			\
-	nautilus-theme.h			\
-	nautilus-thumbnails.h			\
-	nautilus-trash-directory.h		\
-	nautilus-trash-file.h			\
-	nautilus-trash-monitor.h		\
-	nautilus-undo-context.h			\
-	nautilus-undo-manager.h			\
-	nautilus-undo-signal-handlers.h		\
-	nautilus-vfs-directory.h		\
-	nautilus-vfs-file.h			\
-	nautilus-view-identifier.h		\
-	nautilus-viewport.h			\
-	nautilus-volume-monitor.h		\
-	nautilus-wrap-table.h			\
-	nautilus-xml-extensions.h		\
+noinst_HEADERS = \
+	nautilus-audio-player.h \
+	nautilus-bonobo-extensions.h \
+	nautilus-bookmark.h \
+	nautilus-cdrom-extensions.h \
+	nautilus-ctree.h \
+	nautilus-customization-data.h \
+	nautilus-dateedit-extensions.h \
+	nautilus-default-file-icon.h \
+	nautilus-directory-background.h \
+	nautilus-directory-metafile-monitor.h \
+	nautilus-directory-metafile.h \
+	nautilus-directory-notify.h \
+	nautilus-directory-private.h \
+	nautilus-directory.h \
+	nautilus-drag-window.h \
+	nautilus-drag.h \
+	nautilus-druid-page-eazel.h \
+	nautilus-druid.h \
+	nautilus-entry.h \
+	nautilus-file-attributes.h \
+	nautilus-file-changes-queue.h \
+	nautilus-file-operations-progress.h \
+	nautilus-file-operations.h \
+	nautilus-file-private.h \
+	nautilus-file-utilities.h \
+	nautilus-file.h \
+	nautilus-font-factory.h \
+	nautilus-gconf-extensions.h \
+	nautilus-generous-bin.h \
+	nautilus-global-preferences.h \
+	nautilus-horizontal-splitter.h \
+	nautilus-icon-canvas-item.h \
+	nautilus-icon-container.h \
+	nautilus-icon-dnd.h \
+	nautilus-icon-factory-private.h \
+	nautilus-icon-factory.h \
+	nautilus-icon-private.h \
+	nautilus-icon-text-item.h \
+	nautilus-iso9660.h \
+	nautilus-keep-last-vertical-box.h \
+	nautilus-link-set.h \
+	nautilus-link.h \
+	nautilus-list-column-title.h \
+	nautilus-list.h \
+	nautilus-medusa-support.h \
+	nautilus-merged-directory.h \
+	nautilus-metadata.h \
+	nautilus-metafile-factory.h \
+	nautilus-metafile.h \
+	nautilus-mime-actions.h \
+	nautilus-preferences-box.h \
+	nautilus-preferences-dialog.h \
+	nautilus-preferences-group.h \
+	nautilus-preferences-item.h \
+	nautilus-preferences-pane.h \
+	nautilus-preferences-private.h \
+	nautilus-preferences.h \
+	nautilus-program-chooser.h \
+	nautilus-program-choosing.h \
+	nautilus-search-uri.h \
+	nautilus-sidebar-functions.h \
+	nautilus-sound.h \
+	nautilus-tabs.h \
+	nautilus-theme.h \
+	nautilus-thumbnails.h \
+	nautilus-trash-directory.h \
+	nautilus-trash-file.h \
+	nautilus-trash-monitor.h \
+	nautilus-undo-context.h \
+	nautilus-undo-manager.h \
+	nautilus-undo-signal-handlers.h \
+	nautilus-vfs-directory.h \
+	nautilus-vfs-file.h \
+	nautilus-view-identifier.h \
+	nautilus-volume-monitor.h \
 	$(NULL)
 
 $(lib_LTLIBRARIES): $(dependency_static_libs)
diff --git a/libnautilus-extensions/nautilus-art-extensions.c b/libnautilus-extensions/nautilus-art-extensions.c
deleted file mode 100644
index 1b4550950..000000000
--- a/libnautilus-extensions/nautilus-art-extensions.c
+++ /dev/null
@@ -1,473 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-art-extensions.c - implementation of libart extension functions.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-art-extensions.h"
-#include "nautilus-lib-self-check-functions.h"
-#include <math.h>
-
-ArtIRect NAUTILUS_ART_IRECT_EMPTY = { 0, 0, 0, 0 };
-NautilusArtIPoint NAUTILUS_ART_IPOINT_ZERO = { 0, 0 };
-NautilusDimensions NAUTILUS_DIMENSIONS_EMPTY = { 0, 0 };
-
-gboolean
-nautilus_art_irect_contains_irect (const ArtIRect *outer_rect,
-				   const ArtIRect *inner_rect)
-{
-	g_return_val_if_fail (outer_rect != NULL, FALSE);
-	g_return_val_if_fail (inner_rect != NULL, FALSE);
-
-	return outer_rect->x0 <= inner_rect->x0
-		&& outer_rect->y0 <= inner_rect->y0
-		&& outer_rect->x1 >= inner_rect->x1
-		&& outer_rect->y1 >= inner_rect->y1; 
-}
-
-/**
- * nautilus_art_irect_contains_point:
- * 
- * @rectangle: An ArtIRect.
- * @x: X coordinate to test.
- * @y: Y coordinate to test.
- *
- * Returns: A boolean value indicating whether the rectangle 
- *          contains the x,y coordinate.
- * 
- */
-gboolean
-nautilus_art_irect_contains_point (const ArtIRect *rectangle,
-				   int x,
-				   int y)
-{
-	g_return_val_if_fail (rectangle != NULL, FALSE);
-
-	return x >= rectangle->x0
-		&& x <= rectangle->x1
-		&& y >= rectangle->y0
-		&& y <= rectangle->y1;
-}
-
-gboolean
-nautilus_art_irect_hits_irect (const ArtIRect *rect_a,
-			       const ArtIRect *rect_b)
-{
-	ArtIRect intersection;
-
-	g_return_val_if_fail (rect_a != NULL, FALSE);
-	g_return_val_if_fail (rect_b != NULL, FALSE);
-
-	art_irect_intersect (&intersection, rect_a, rect_b);
-	return !art_irect_empty (&intersection);
-}
-
-gboolean
-nautilus_art_irect_equal (const ArtIRect *rect_a,
-			  const ArtIRect *rect_b)
-{
-	g_return_val_if_fail (rect_a != NULL, FALSE);
-	g_return_val_if_fail (rect_b != NULL, FALSE);
-
-	return rect_a->x0 == rect_b->x0
-		&& rect_a->y0 == rect_b->y0
-		&& rect_a->x1 == rect_b->x1
-		&& rect_a->y1 == rect_b->y1;
-}
-
-gboolean
-nautilus_art_drect_equal (const ArtDRect *rect_a,
-			  const ArtDRect *rect_b)
-{
-	g_return_val_if_fail (rect_a != NULL, FALSE);
-	g_return_val_if_fail (rect_b != NULL, FALSE);
-
-	return rect_a->x0 == rect_b->x0
-		&& rect_a->y0 == rect_b->y0
-		&& rect_a->x1 == rect_b->x1
-		&& rect_a->y1 == rect_b->y1;
-}
-
-gboolean
-nautilus_art_irect_is_valid (const ArtIRect *rect)
-{
-	return rect && !art_irect_empty (rect);
-}
-
-void
-nautilus_art_irect_assign (ArtIRect *rect,
-			   int x,
-			   int y,
-			   int width,
-			   int height)
-{
-	g_return_if_fail (rect != NULL);
-
-	rect->x0 = x;
-	rect->y0 = y;
-	rect->x1 = rect->x0 + width;
-	rect->y1 = rect->y0 + height;
-}
-
-/**
- * nautilus_art_irect_get_width:
- * 
- * @rectangle: An ArtIRect.
- *
- * Returns: The width of the rectangle.
- * 
- */
-int
-nautilus_art_irect_get_width (const ArtIRect *rectangle)
-{
-	g_return_val_if_fail (rectangle != NULL, 0);
-	
-	return rectangle->x1 - rectangle->x0;
-}
-
-/**
- * nautilus_art_irect_get_height:
- * 
- * @rectangle: An ArtIRect.
- *
- * Returns: The height of the rectangle.
- * 
- */
-int
-nautilus_art_irect_get_height (const ArtIRect *rectangle)
-{
-	g_return_val_if_fail (rectangle != NULL, 0);
-	
-	return rectangle->y1 - rectangle->y0;
-}
-
-/**
- * nautilus_art_irect_align:
- * 
- * @container: The rectangle that is to contain the aligned rectangle.
- * @aligned_width: Width of rectangle being algined.
- * @aligned_height: Height of rectangle being algined.
- * @x_alignment: X alignment.
- * @y_alignment: Y alignment.
- *
- * Returns: A rectangle aligned within a container rectangle
- *          using the given alignment parameters.
- */
-ArtIRect
-nautilus_art_irect_align (const ArtIRect *container,
-			  int aligned_width,
-			  int aligned_height,
-			  float x_alignment,
-			  float y_alignment)
-{
-	ArtIRect aligned;
-	int available_width;
-	int available_height;
-
-	g_return_val_if_fail (container != NULL, NAUTILUS_ART_IRECT_EMPTY);
-
-	if (art_irect_empty (container)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	if (aligned_width == 0 || aligned_height == 0) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	/* Make sure the aligment parameters are within range */
-	x_alignment = MAX (0, x_alignment);
-	x_alignment = MIN (1.0, x_alignment);
-	y_alignment = MAX (0, y_alignment);
-	y_alignment = MIN (1.0, y_alignment);
-
-	available_width = nautilus_art_irect_get_width (container) - aligned_width;
-	available_height = nautilus_art_irect_get_height (container) - aligned_height;
-
-	aligned.x0 = floor (container->x0 + (available_width * x_alignment) + 0.5);
-	aligned.y0 = floor (container->y0 + (available_height * y_alignment) + 0.5);
-	aligned.x1 = aligned.x0 + aligned_width;
-	aligned.y1 = aligned.y0 + aligned_height;
-
-	return aligned;
-}
-
-/**
- * nautilus_dimensions_empty:
- * 
- * @dimensions: A NautilusDimensions structure.
- *
- * Returns: Whether the dimensions are empty.
- */
-gboolean
-nautilus_dimensions_empty (const NautilusDimensions *dimensions)
-{
-	g_return_val_if_fail (dimensions != NULL, TRUE);
-
-	return dimensions->width <= 0 || dimensions->height <= 0;
-}
-
-/**
- * nautilus_art_irect_assign_dimensions:
- * 
- * @x: X coodinate for resulting rectangle.
- * @y: Y coodinate for resulting rectangle.
- * @dimensions: A NautilusDimensions structure for the rect's width and height.
- *
- * Returns: An ArtIRect with the given coordinates and dimensions.
- */
-ArtIRect
-nautilus_art_irect_assign_dimensions (int x,
-				      int y,
-				      const NautilusDimensions *dimensions)
-{
-	ArtIRect rectangle;
-
-	g_return_val_if_fail (dimensions != NULL, NAUTILUS_ART_IRECT_EMPTY);
-
-	rectangle.x0 = x;
-	rectangle.y0 = y;
-	rectangle.x1 = rectangle.x0 + dimensions->width;
-	rectangle.y1 = rectangle.y0 + dimensions->height;
-
-	return rectangle;
-}
-
-ArtIRect 
-nautilus_art_irect_offset_by (ArtIRect rectangle, int x, int y)
-{
-	rectangle.x0 += x;
-	rectangle.x1 += x;
-	rectangle.y0 += y;
-	rectangle.y1 += y;
-	
-	return rectangle;
-}
-
-ArtIRect 
-nautilus_art_irect_offset_to (ArtIRect rectangle, int x, int y)
-{
-	rectangle.x1 = rectangle.x1 - rectangle.x0 + x;
-	rectangle.x0 = x;
-	rectangle.y1 = rectangle.y1 - rectangle.y0 + y;
-	rectangle.y0 = y;
-	
-	return rectangle;
-}
-
-ArtIRect 
-nautilus_art_irect_scale_by (ArtIRect rectangle, double scale)
-{
-	rectangle.x0 *= scale;
-	rectangle.x1 *= scale;
-	rectangle.y0 *= scale;
-	rectangle.y1 *= scale;
-	
-	return rectangle;
-}
-
-ArtIRect 
-nautilus_art_irect_inset (ArtIRect rectangle, int horizontal_inset, int vertical_inset)
-{
-	rectangle.x0 += horizontal_inset;
-	rectangle.x1 -= horizontal_inset;
-	rectangle.y0 += vertical_inset;
-	rectangle.y1 -= vertical_inset;
-	
-	return rectangle;
-}
-
-
-ArtDRect 
-nautilus_art_drect_offset_by (ArtDRect rectangle, double x, double y)
-{
-	rectangle.x0 += x;
-	rectangle.x1 += x;
-	rectangle.y0 += y;
-	rectangle.y1 += y;
-	
-	return rectangle;
-}
-
-ArtDRect 
-nautilus_art_drect_offset_to (ArtDRect rectangle, double x, double y)
-{
-	rectangle.x1 = rectangle.x1 - rectangle.x0 + x;
-	rectangle.x0 = x;
-	rectangle.y1 = rectangle.y1 - rectangle.y0 + y;
-	rectangle.y0 = y;
-	
-	return rectangle;
-}
-
-ArtIRect 
-nautilus_art_irect_offset_by_point (ArtIRect rectangle, NautilusArtIPoint point)
-{
-	rectangle.x0 += point.x;
-	rectangle.x1 += point.x;
-	rectangle.y0 += point.y;
-	rectangle.y1 += point.y;
-	
-	return rectangle;
-}
-
-ArtIRect 
-nautilus_art_irect_offset_to_point (ArtIRect rectangle, NautilusArtIPoint point)
-{
-	rectangle.x1 = rectangle.x1 - rectangle.x0 + point.x;
-	rectangle.x0 = point.x;
-	rectangle.y1 = rectangle.y1 - rectangle.y0 + point.y;
-	rectangle.y0 = point.y;
-	
-	return rectangle;
-}
-
-ArtDRect 
-nautilus_art_drect_scale_by (ArtDRect rectangle, double scale)
-{
-	rectangle.x0 *= scale;
-	rectangle.x1 *= scale;
-	rectangle.y0 *= scale;
-	rectangle.y1 *= scale;
-	
-	return rectangle;
-}
-
-ArtDRect 
-nautilus_art_drect_inset (ArtDRect rectangle, double horizontal_inset, double vertical_inset)
-{
-	rectangle.x0 += horizontal_inset;
-	rectangle.x1 -= horizontal_inset;
-	rectangle.y0 += vertical_inset;
-	rectangle.y1 -= vertical_inset;
-	
-	return rectangle;
-}
-
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-void
-nautilus_self_check_art_extensions (void)
-{
-	ArtIRect one;
-	ArtIRect two;
-	ArtIRect empty_rect = NAUTILUS_ART_IRECT_EMPTY;
-	ArtIRect inside;
-	ArtIRect outside;
-	ArtIRect container;
-	NautilusDimensions empty_dimensions = NAUTILUS_DIMENSIONS_EMPTY;
-	NautilusDimensions dim1;
-
-	nautilus_art_irect_assign (&one, 10, 10, 20, 20);
-	nautilus_art_irect_assign (&two, 10, 10, 20, 20);
-	nautilus_art_irect_assign (&inside, 11, 11, 18, 18);
-	nautilus_art_irect_assign (&outside, 31, 31, 10, 10);
-	nautilus_art_irect_assign (&container, 0, 0, 100, 100);
-
-	/* nautilus_art_irect_equal */
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_equal (&one, &two), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_equal (&one, &empty_rect), FALSE);
-
-	/* nautilus_art_irect_is_valid */
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_is_valid (NULL), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_is_valid (&empty_rect), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_is_valid (&one), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_is_valid (&two), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_is_valid (&inside), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_is_valid (&outside), TRUE);
-
-	/* nautilus_art_irect_hits_irect */
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_hits_irect (&one, &two), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_hits_irect (&one, &inside), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_hits_irect (&one, &outside), FALSE);
-
-	/* nautilus_art_irect_contains_point */
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 9, 9), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 9, 10), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 10, 9), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 10, 10), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 11, 10), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 10, 11), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 11, 11), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 30, 30), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 29, 30), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 30, 29), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 31, 31), FALSE);
-
-	/* nautilus_art_irect_get_width */
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_art_irect_get_width (&one), 20);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_art_irect_get_width (&empty_rect), 0);
-
-	/* nautilus_art_irect_get_height */
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_art_irect_get_height (&one), 20);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_art_irect_get_height (&empty_rect), 0);
-
-	/* nautilus_art_irect_align */
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&empty_rect, 1, 1, 0.0, 0.0), 0, 0, 0, 0);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 0, 0, 0.0, 0.0), 0, 0, 0, 0);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 9, 0, 0.0, 0.0), 0, 0, 0, 0);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 0, 9, 0.0, 0.0), 0, 0, 0, 0);
-
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 10, 10, 0.0, 0.0), 0, 0, 10, 10);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 10, 10, 1.0, 0.0), 90, 0, 100, 10);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 10, 10, 0.0, 1.0), 0, 90, 10, 100);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 10, 10, 1.0, 1.0), 90, 90, 100, 100);
-
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 9, 9, 0.0, 0.0), 0, 0, 9, 9);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 9, 9, 1.0, 0.0), 91, 0, 100, 9);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 9, 9, 0.0, 1.0), 0, 91, 9, 100);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 9, 9, 1.0, 1.0), 91, 91, 100, 100);
-
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 10, 10, 0.5, 0.0), 45, 0, 55, 10);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 10, 10, 0.5, 0.0), 45, 0, 55, 10);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 10, 10, 0.0, 0.5), 0, 45, 10, 55);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 10, 10, 0.5, 0.5), 45, 45, 55, 55);
-
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 9, 9, 0.5, 0.0), 46, 0, 55, 9);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 9, 9, 0.5, 0.0), 46, 0, 55, 9);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 9, 9, 0.0, 0.5), 0, 46, 9, 55);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 9, 9, 0.5, 0.5), 46, 46, 55, 55);
-
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 120, 120, 0.0, 0.0), 0, 0, 120, 120);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 120, 120, 0.5, 0.5), -10, -10, 110, 110);
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_dimensions_empty (&empty_dimensions), TRUE);
-
-	dim1.width = 10; dim1.height = 10;
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_dimensions_empty (&dim1), FALSE);
-
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_assign_dimensions (0, 0, &dim1), 0, 0, 10, 10);
-
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_assign_dimensions (1, 1, &dim1), 1, 1, 11, 11);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_assign_dimensions (-1, 1, &dim1), -1, 1, 9, 11);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_assign_dimensions (1, -1, &dim1), 1, -1, 11, 9);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_assign_dimensions (-1, -1, &dim1), -1, -1, 9, 9);
-
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_assign_dimensions (2, 2, &dim1), 2, 2, 12, 12);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_assign_dimensions (-2, 2, &dim1), -2, 2, 8, 12);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_assign_dimensions (2, -2, &dim1), 2, -2, 12, 8);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_assign_dimensions (-2, -2, &dim1), -2, -2, 8, 8);
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-art-extensions.h b/libnautilus-extensions/nautilus-art-extensions.h
deleted file mode 100644
index d8a5fd523..000000000
--- a/libnautilus-extensions/nautilus-art-extensions.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-art-extensions.h - interface of libart extension functions.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_ART_EXTENSIONS_H
-#define NAUTILUS_ART_EXTENSIONS_H
-
-#include <libgnome/gnome-defs.h>
-#include <libart_lgpl/art_rect.h>
-#include <glib.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct {
-	int x;
-	int y;
-} NautilusArtIPoint;
-
-typedef struct {
-	int width;
-	int height;
-} NautilusDimensions;
-
-extern ArtIRect NAUTILUS_ART_IRECT_EMPTY;
-extern NautilusArtIPoint NAUTILUS_ART_IPOINT_ZERO;
-extern NautilusDimensions NAUTILUS_DIMENSIONS_EMPTY;
-
-/* More functions for ArtIRect and ArtDRect. */
-gboolean nautilus_art_irect_equal             (const ArtIRect           *rect_a,
-					       const ArtIRect           *rect_b);
-gboolean nautilus_art_drect_equal             (const ArtDRect           *rect_a,
-					       const ArtDRect           *rect_b);
-gboolean nautilus_art_irect_hits_irect        (const ArtIRect           *rect_a,
-					       const ArtIRect           *rect_b);
-gboolean nautilus_art_irect_contains_irect    (const ArtIRect           *outer_rect,
-					       const ArtIRect           *inner_rect);
-gboolean nautilus_art_irect_contains_point    (const ArtIRect           *outer_rect,
-					       int                       x,
-					       int                       y);
-gboolean nautilus_art_irect_is_valid          (const ArtIRect           *rect);
-void     nautilus_art_irect_assign            (ArtIRect                 *rect,
-					       int                       x,
-					       int                       y,
-					       int                       width,
-					       int                       height);
-int      nautilus_art_irect_get_width         (const ArtIRect           *rect);
-int      nautilus_art_irect_get_height        (const ArtIRect           *rect);
-ArtIRect nautilus_art_irect_align             (const ArtIRect           *container,
-					       int                       aligned_width,
-					       int                       aligned_height,
-					       float                     x_alignment,
-					       float                     y_alignment);
-/* NautilusDimensions functions. */
-gboolean nautilus_dimensions_empty            (const NautilusDimensions *dimensions);
-ArtIRect nautilus_art_irect_assign_dimensions (int                       x,
-					       int                       y,
-					       const NautilusDimensions *dimensions);
-
-ArtIRect nautilus_art_irect_offset_by	      (ArtIRect			 rect,
-					       int			 x,
-					       
-					       int			 y);
-ArtIRect nautilus_art_irect_offset_to	      (ArtIRect			 rect,
-					       int			 x,
-					       int			 y);
-ArtIRect nautilus_art_irect_scale_by	      (ArtIRect			 rect,
-					       double			 scale);
-ArtIRect nautilus_art_irect_inset	      (ArtIRect			 rect,
-					       int			 horizontal_inset,
-					       int			 vertical_inset);
-ArtDRect nautilus_art_drect_offset_by	      (ArtDRect			 rect,
-					       double			 x,
-					       double			 y);
-ArtDRect nautilus_art_drect_offset_to	      (ArtDRect			 rect,
-					       double			 x,
-					       double			 y);
-ArtDRect nautilus_art_drect_scale_by	      (ArtDRect			 rect,
-					       double			 scale);
-ArtDRect nautilus_art_drect_inset	      (ArtDRect			 rect,
-					       double			 horizontal_inset,
-					       double			 vertical_inset);
-ArtIRect nautilus_art_irect_offset_by_point   (ArtIRect			 rect,
-					       NautilusArtIPoint	 point);
-ArtIRect nautilus_art_irect_offset_to_point   (ArtIRect			 rect,
-					       NautilusArtIPoint	 point);
-					      
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_ART_EXTENSIONS_H */
diff --git a/libnautilus-extensions/nautilus-art-gtk-extensions.c b/libnautilus-extensions/nautilus-art-gtk-extensions.c
deleted file mode 100644
index ce3cb2c3f..000000000
--- a/libnautilus-extensions/nautilus-art-gtk-extensions.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-art-gtk-extensions.c - Access gtk/gdk attributes as libart rectangles.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-art-gtk-extensions.h"
-
-/**
- * nautilus_gdk_rectangle_to_art_irect:
- * @gdk_rectangle: The source GdkRectangle.
- *
- * Return value: An ArtIRect representation of the GdkRectangle.
- *
- * This is a very simple conversion of rectangles from the Gdk to the Libart
- * universe.  This is useful in code that does clipping (or other operations)
- * using libart and has a GdkRectangle to work with - for example expose_event()
- * in GtkWidget's. 
- */
-ArtIRect
-nautilus_gdk_rectangle_to_art_irect (const GdkRectangle *gdk_rectangle)
-{
-	ArtIRect irect;
-
-	g_return_val_if_fail (gdk_rectangle != NULL, NAUTILUS_ART_IRECT_EMPTY);
-
-	irect.x0 = gdk_rectangle->x;
-	irect.y0 = gdk_rectangle->y;
-	irect.x1 = irect.x0 + (int) gdk_rectangle->width;
-	irect.y1 = irect.y0 + (int) gdk_rectangle->height;
-
-	return irect;
-}
-
-/**
- * nautilus_screen_get_dimensions:
- *
- * Return value: The screen dimensions.
- *
- */
-NautilusDimensions
-nautilus_screen_get_dimensions (void)
-{
-	NautilusDimensions screen_dimensions;
-
-	screen_dimensions.width = gdk_screen_width ();
-	screen_dimensions.height = gdk_screen_height ();
-	
-	g_assert (screen_dimensions.width > 0);
-	g_assert (screen_dimensions.height > 0);
-
-	return screen_dimensions;
-}
-
-/**
- * nautilus_gdk_window_get_bounds:
- * @gdk_window: The source GdkWindow.
- *
- * Return value: An ArtIRect representation of the given GdkWindow's geometry
- * relative to its parent in the Gdk window hierarchy.
- *
- */
-ArtIRect
-nautilus_gdk_window_get_bounds (const GdkWindow *gdk_window)
-{
-	ArtIRect bounds;
-	int width;
-	int height;
-
-	g_return_val_if_fail (gdk_window != NULL, NAUTILUS_ART_IRECT_EMPTY);
-
-	gdk_window_get_position ((GdkWindow *) gdk_window, &bounds.x0, &bounds.y0);
-	gdk_window_get_size ((GdkWindow *) gdk_window, &width, &height);
-
-	bounds.x1 = bounds.x0 + width;
-	bounds.y1 = bounds.y0 + height;
-
-	return bounds;
-}
-
-/**
- * nautilus_gdk_window_get_bounds:
- * @gdk_window: The source GdkWindow.
- *
- * Return value: An ArtIRect representation of the given GdkWindow's geometry
- * relative to the screen.
- *
- */
-ArtIRect
-nautilus_gdk_window_get_screen_relative_bounds (const GdkWindow *gdk_window)
-{
-	ArtIRect screen_bounds;
-	int width;
-	int height;
-	
-	g_return_val_if_fail (gdk_window != NULL, NAUTILUS_ART_IRECT_EMPTY);
-
-	if (!gdk_window_get_origin ((GdkWindow *) gdk_window,
-				    &screen_bounds.x0,
-				    &screen_bounds.y0)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-	
-	gdk_window_get_size ((GdkWindow *) gdk_window, &width, &height);
-	
-	screen_bounds.x1 = screen_bounds.x0 + width;
-	screen_bounds.y1 = screen_bounds.y0 + height;
-	
-	return screen_bounds;
-}
-
-/**
- * nautilus_gtk_widget_get_bounds:
- * @gtk_widget: The source GtkWidget.
- *
- * Return value: An ArtIRect representation of the given GtkWidget's geometry
- * relative to its parent.  In the Gtk universe this is known as "allocation."
- *
- */
-ArtIRect
-nautilus_gtk_widget_get_bounds (const GtkWidget *gtk_widget)
-{
-	ArtIRect bounds;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (gtk_widget), NAUTILUS_ART_IRECT_EMPTY);
-	
-	nautilus_art_irect_assign (&bounds, 
-				   gtk_widget->allocation.x,
-				   gtk_widget->allocation.y,
-				   (int) gtk_widget->allocation.width,
-				   (int) gtk_widget->allocation.height);
-	
-	return bounds;
-}
-
-/**
- * nautilus_gtk_widget_get_dimensions:
- * @gtk_widget: The source GtkWidget.
- *
- * Return value: The widget's dimensions.  The returned dimensions are only valid
- *               after the widget's geometry has been "allocated" by its container.
- */
-NautilusDimensions
-nautilus_gtk_widget_get_dimensions (const GtkWidget *gtk_widget)
-{
-	NautilusDimensions dimensions;
-	
-	g_return_val_if_fail (GTK_IS_WIDGET (gtk_widget), NAUTILUS_DIMENSIONS_EMPTY);
-	
-	dimensions.width = (int) gtk_widget->allocation.width;
-	dimensions.height = (int) gtk_widget->allocation.height;
-	
-	return dimensions;
-}
-
-/**
- * nautilus_gtk_widget_get_preferred_dimensions:
- * @gtk_widget: The source GtkWidget.
- *
- * Return value: The widget's preferred dimensions.  The preferred dimensions are
- *               computed by calling the widget's 'size_request' method and thus
- *               could potentially be expensive for complicated widgets.
- */
-NautilusDimensions
-nautilus_gtk_widget_get_preferred_dimensions (const GtkWidget *gtk_widget)
-{
-	GtkRequisition requisition;
-	NautilusDimensions preferred_dimensions;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (gtk_widget), NAUTILUS_DIMENSIONS_EMPTY);
-
-	gtk_widget_size_request (GTK_WIDGET (gtk_widget), &requisition);
-
-	preferred_dimensions.width = (int) requisition.width;
-	preferred_dimensions.height = (int) requisition.height;
-
-	return preferred_dimensions;
-}
-
-/**
- * nautilus_gdk_window_clip_dirty_area_to_screen:
- * @gdk_window: The GdkWindow that the damage occured on.
- * @dirty_area: The dirty area as an ArtIRect.
- *
- * Return value: An ArtIRect of the dirty area clipped to the screen.
- *
- * This function is useful to do less work in expose_event() GtkWidget methods.
- * It also ensures that any drawing that the widget does is actually onscreen.
- */
-ArtIRect
-nautilus_gdk_window_clip_dirty_area_to_screen (const GdkWindow *gdk_window,
-					       const ArtIRect *dirty_area)
-{
-	ArtIRect clipped;
-	NautilusDimensions screen_dimensions;
-	ArtIRect bounds;
-	ArtIRect screen_relative_bounds;
-	int dirty_width;
-	int dirty_height;
-
-	g_return_val_if_fail (gdk_window != NULL, NAUTILUS_ART_IRECT_EMPTY);
-	g_return_val_if_fail (dirty_area != NULL, NAUTILUS_ART_IRECT_EMPTY);
-
-	dirty_width = dirty_area->x1 - dirty_area->x0;
-	dirty_height = dirty_area->y1 - dirty_area->y0;
-
-	g_return_val_if_fail (dirty_width > 0, NAUTILUS_ART_IRECT_EMPTY);
-	g_return_val_if_fail (dirty_height > 0, NAUTILUS_ART_IRECT_EMPTY);
-
-	screen_dimensions = nautilus_screen_get_dimensions ();
-	bounds = nautilus_gdk_window_get_bounds (gdk_window);
-	screen_relative_bounds = nautilus_gdk_window_get_screen_relative_bounds (gdk_window);
-	
-	/* Window is obscured by left edge of screen */
-	if ((screen_relative_bounds.x0 + dirty_area->x0) < 0) {
-		int clipped_width = screen_relative_bounds.x0 + dirty_area->x0 + dirty_width;
-		clipped.x0 = dirty_area->x0 + dirty_width - clipped_width;
-		clipped.x1 = clipped.x0 + clipped_width;
-	} else {
-		clipped.x0 = dirty_area->x0;
-		clipped.x1 = clipped.x0 + dirty_width;
-	}
-	
-	/* Window is obscured by right edge of screen */
-	if (screen_relative_bounds.x1 > screen_dimensions.width) {
- 		int obscured_width;
-		
-		obscured_width = 
-			screen_relative_bounds.x0 + dirty_area->x0 + dirty_width - screen_dimensions.width;
-		
-		if (obscured_width > 0) {
-			clipped.x1 -= obscured_width;
-		}
-	}
-
-	/* Window is obscured by top edge of screen */
-	if ((screen_relative_bounds.y0 + dirty_area->y0) < 0) {
-		int clipped_height = screen_relative_bounds.y0 + dirty_area->y0 + dirty_height;
-		clipped.y0 = dirty_area->y0 + dirty_height - clipped_height;
-		clipped.y1 = clipped.y0 + clipped_height;
-	} else {
-		clipped.y0 = dirty_area->y0;
-		clipped.y1 = clipped.y0 + dirty_height;
-	}
-	
-	/* Window is obscured by bottom edge of screen */
-	if (screen_relative_bounds.y1 > screen_dimensions.height) {
- 		int obscured_height;
-		
-		obscured_height = 
-			screen_relative_bounds.y0 + dirty_area->y0 + dirty_height - screen_dimensions.height;
-		
-		if (obscured_height > 0) {
-			clipped.y1 -= obscured_height;
-		}
-	}
-
-	if (art_irect_empty (&clipped)) {
-		clipped = NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	return clipped;
-}
-
-GdkRectangle
-nautilus_art_irect_to_gdk_rectangle (const ArtIRect *irect)
-{
-	GdkRectangle gdk_rect;
-
-	gdk_rect.x = 0;
-	gdk_rect.y = 0;
-	gdk_rect.width = 0;
-	gdk_rect.height = 0;
-
-	g_return_val_if_fail (irect != NULL, gdk_rect);
-
-	gdk_rect.x = irect->x0;
-	gdk_rect.y = irect->y0;
-	gdk_rect.width = nautilus_art_irect_get_width (irect);
-	gdk_rect.height = nautilus_art_irect_get_height (irect);
-
-	return gdk_rect;
-}
-
-NautilusDimensions
-nautilus_gdk_window_get_dimensions (const GdkWindow *gdk_window)
-{
-	NautilusDimensions dimensions;
-	
-	g_return_val_if_fail (gdk_window != NULL, NAUTILUS_DIMENSIONS_EMPTY);
-
-	gdk_window_get_size ((GdkWindow *) gdk_window, &dimensions.width, &dimensions.height);
-
-	return dimensions;
-}
-
diff --git a/libnautilus-extensions/nautilus-art-gtk-extensions.h b/libnautilus-extensions/nautilus-art-gtk-extensions.h
deleted file mode 100644
index 4081bef7a..000000000
--- a/libnautilus-extensions/nautilus-art-gtk-extensions.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-art-gtk-extensions.h - Access gtk/gdk attributes as libart rectangles.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-/* The following functions accept gtk/gdk structures and
- * return their bounds and dimensions, where:
- *
- * bounds: The (x,y) and (width, height) of something.
- * dimensions: The (width, height) of something.
- *
- * These are very useful in code that uses libart functions
- * to do operations on ArtIRects (such as intersection)
- */
-
-#ifndef NAUTILUS_ART_GTK_EXTENSIONS_H
-#define NAUTILUS_ART_GTK_EXTENSIONS_H
-
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-art-extensions.h>
-
-BEGIN_GNOME_DECLS
-
-/* Convert between GdkRectangle and ArtIRect and back */
-GdkRectangle       nautilus_art_irect_to_gdk_rectangle            (const ArtIRect     *irect);
-ArtIRect           nautilus_gdk_rectangle_to_art_irect            (const GdkRectangle *gdk_rectangle);
-NautilusDimensions nautilus_screen_get_dimensions                 (void);
-
-/* GdkWindow parent-relative bounds */
-ArtIRect           nautilus_gdk_window_get_bounds                 (const GdkWindow    *gdk_window);
-
-/* GdkWindow dimensions */
-NautilusDimensions nautilus_gdk_window_get_dimensions             (const GdkWindow    *gdk_window);
-
-/* GdkWindow screen parent-relative bounds */
-ArtIRect           nautilus_gdk_window_get_screen_relative_bounds (const GdkWindow    *gdk_window);
-
-/* Clip a dirty area (from exposures) to the on screen parts of a GdkWindow */
-ArtIRect           nautilus_gdk_window_clip_dirty_area_to_screen  (const GdkWindow    *gdk_window,
-								   const ArtIRect     *dirty_area);
-
-/* GtkWidget bounds and dimensions */
-ArtIRect           nautilus_gtk_widget_get_bounds                 (const GtkWidget    *gtk_widget);
-NautilusDimensions nautilus_gtk_widget_get_dimensions             (const GtkWidget    *gtk_widget);
-NautilusDimensions nautilus_gtk_widget_get_preferred_dimensions   (const GtkWidget    *gtk_widget);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_ART_GTK_EXTENSIONS_H */
diff --git a/libnautilus-extensions/nautilus-background-canvas-group.c b/libnautilus-extensions/nautilus-background-canvas-group.c
deleted file mode 100644
index f0d04b0d4..000000000
--- a/libnautilus-extensions/nautilus-background-canvas-group.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-background.c: Object for the background of a widget.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Darin Adler <darin@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-background-canvas-group.h"
-
-#include <libgnomeui/gnome-canvas.h>
-#include <libgnomeui/gnome-canvas-util.h>
-#include <libart_lgpl/art_rgb_affine.h>
-#include <libart_lgpl/art_rgb_rgba_affine.h>
-
-#include "nautilus-background.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gtk-macros.h"
-
-#include <stdio.h>
-
-static void nautilus_background_canvas_group_initialize_class (gpointer	klass);
-static void nautilus_background_canvas_group_initialize       (gpointer	object,
-															   gpointer         klass);
-
-static void nautilus_background_canvas_group_update (GnomeCanvasItem	*item,
-						     double		 affine[6],
-						     ArtSVP		*clip_path,
-						     gint		 flags);
-													 
-static void nautilus_background_canvas_group_draw (GnomeCanvasItem	*item,
-						   GdkDrawable		*drawable,
-						   int			 x,
-						   int			 y,
-						   int			 width,
-						   int			 height);
-static void nautilus_background_canvas_group_render (GnomeCanvasItem	*item,
-						     GnomeCanvasBuf	*buffer);
-
-
-typedef GnomeCanvasGroup NautilusBackgroundCanvasGroup;
-typedef GnomeCanvasGroupClass NautilusBackgroundCanvasGroupClass;
-
-#define NAUTILUS_TYPE_BACKGROUND_CANVAS_GROUP \
-	(nautilus_background_canvas_group_get_type ())
-#define NAUTILUS_BACKGROUND_CANVAS_GROUP(obj) \
-	(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_BACKGROUND_CANVAS_GROUP, NautilusBackgroundCanvasGroup))
-#define NAUTILUS_BACKGROUND_CANVAS_GROUP_CLASS(klass) \
-	(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_BACKGROUND_CANVAS_GROUP, NautilusBackgroundCanvasGroupClass))
-#define NAUTILUS_IS_BACKGROUND_CANVAS_GROUP(obj) \
-	(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_BACKGROUND_CANVAS_GROUP))
-#define NAUTILUS_IS_BACKGROUND_CANVAS_GROUP_CLASS(klass) \
-	(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_BACKGROUND_CANVAS_GROUP))
-
-GtkType nautilus_background_canvas_group_get_type (void);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusBackgroundCanvasGroup, nautilus_background_canvas_group, GNOME_TYPE_CANVAS_GROUP)
-
-static void
-nautilus_background_canvas_group_initialize_class (gpointer klass)
-{
-	GNOME_CANVAS_ITEM_CLASS (klass)->draw   = nautilus_background_canvas_group_draw;
-	GNOME_CANVAS_ITEM_CLASS (klass)->render = nautilus_background_canvas_group_render;
-	GNOME_CANVAS_ITEM_CLASS (klass)->update = nautilus_background_canvas_group_update;
-}
-
-/* This function is for initialization code that's needed both when we're allocating
- * a new NautilusBackgroundCanvasGroup object as well as when we're taking over an existing
- * GnomeCanvasGroup item (replacing its klass).
- */
-static void
-nautilus_background_canvas_group_initialize_common (NautilusBackgroundCanvasGroup *canvas_group)
-{
-#ifdef HAVE_GNOME_CANVAS_SET_DITHER
-	gnome_canvas_set_dither (GNOME_CANVAS_ITEM (canvas_group)->canvas, GDK_RGB_DITHER_MAX);
-#endif
-}
-
-static void
-nautilus_background_canvas_group_initialize (gpointer object, gpointer klass)
-{
-	/* The way we currently use nautilus_background_canvas_group, assigning
-	 * it to the klass of a root canvas object, circumvents this initialze fn.
-	 */
-	nautilus_background_canvas_group_initialize_common (NAUTILUS_BACKGROUND_CANVAS_GROUP (object));
-}
-
-
-void
-nautilus_background_canvas_group_supplant_root_class (GnomeCanvas *canvas)
-{
-	/* Attach ourselves to a canvas in a way that will work.
-	   Changing the style is not sufficient.
-
-	   Since there's no signal to override in GnomeCanvas to control
-	   drawing the background, we change the class of the canvas root.
-	   This gives us a chance to draw the background before any of the
-	   objects draw themselves, and has no effect on the bounds or
-	   anything related to scrolling.
-
-	   We settled on this after less-than-thrilling results using a
-	   canvas item as the background. The canvas item contributed to
-	   the bounds of the canvas and had to constantly be resized.
-	*/
-	
-	g_assert (GNOME_IS_CANVAS (canvas));
-	
-	if (GTK_OBJECT (canvas->root)->klass != gtk_type_class (NAUTILUS_TYPE_BACKGROUND_CANVAS_GROUP)) {
-	
-		g_assert (GTK_OBJECT (canvas->root)->klass == gtk_type_class (GNOME_TYPE_CANVAS_GROUP));
-	
-		GTK_OBJECT (canvas->root)->klass =
-			gtk_type_class (NAUTILUS_TYPE_BACKGROUND_CANVAS_GROUP);
-
-		nautilus_background_canvas_group_initialize_common (NAUTILUS_BACKGROUND_CANVAS_GROUP (canvas->root));
-	}
-}
-
-static void
-nautilus_background_canvas_group_update (GnomeCanvasItem *item,
-					 double affine[6],
-					 ArtSVP *clip_path,
-					 gint flags)
-{
-	NautilusBackground *background = nautilus_get_widget_background (GTK_WIDGET (item->canvas));
-
-	nautilus_background_pre_draw (background,
-				      GTK_WIDGET (item->canvas)->allocation.width,
-				      GTK_WIDGET (item->canvas)->allocation.height);
-
-	NAUTILUS_CALL_PARENT (GNOME_CANVAS_ITEM_CLASS, update, (item, affine, clip_path, flags));				     
-}
-
-static void
-nautilus_background_canvas_group_draw (GnomeCanvasItem *item,
-				       GdkDrawable *drawable,
-				       int x,
-				       int y,
-				       int width,
-				       int height)
-{
-	NautilusBackground *background;
-	GdkGC *gc;
-
-	/* Draw the background. */
-	background = nautilus_get_widget_background (GTK_WIDGET (item->canvas));
-
-	/* If GtkStyle handled it, then we don't want to bother doing
-	 * any additional work. It would be way slow to draw again.
-	 */
-	if (nautilus_background_is_too_complex_for_gtk_style (background)) {
-		/* Create a new gc each time.
-		 * If this is a speed problem, we can create one and keep it around,
-		 * but it's a bit more complicated to ensure that it's always compatible
-		 * with whatever drawable is passed in.
-		 */
-		gc = gdk_gc_new (drawable);
-
-		/* FIXME bugzilla.eazel.com 5349:
-		 * It shouldn't be necessary to call nautilus_background_pre_draw here.
-		 * However, nautilus_background_canvas_group_update (who should be the one
-		 * spot we call nautilus_background_pre_draw from) doesn't seemed to get
-		 * called prior to all drawing.
-		 */
-		nautilus_background_pre_draw (background,
-					      GTK_WIDGET (item->canvas)->allocation.width,
-					      GTK_WIDGET (item->canvas)->allocation.height);
-
-		nautilus_background_draw (background, drawable, gc, x, y, width, height);
-
-		gdk_gc_unref (gc);
-	}
-
-	/* Call through to the GnomeCanvasGroup implementation, which
-	 * will draw all the canvas items.
-	 */
-	NAUTILUS_CALL_PARENT (GNOME_CANVAS_ITEM_CLASS, draw, (item, drawable, x, y, width, height));				     
-}
-
-
-/* draw the background for the anti-aliased canvas case */
-static void
-nautilus_background_canvas_group_render (GnomeCanvasItem *item, GnomeCanvasBuf *buffer)
-{
-	NautilusBackground *background;
-			
-	background = nautilus_get_widget_background (GTK_WIDGET (item->canvas));
-	if (background != NULL) {
-		/* FIXME bugzilla.eazel.com 5349:
-		 * It shouldn't be necessary to call nautilus_background_pre_draw here.
-		 * However, nautilus_background_canvas_group_update (who should be the one
-		 * spot we call nautilus_background_pre_draw from) doesn't seemed to get
-		 * called prior to all drawing.
-		 */
-		nautilus_background_pre_draw (background,
-					      GTK_WIDGET (item->canvas)->allocation.width,
-					      GTK_WIDGET (item->canvas)->allocation.height);
-
-		nautilus_background_draw_aa (background, buffer);
-	}
-	
-	/* Call through to the GnomeCanvasGroup implementation, which will draw all
-	 * the canvas items.
-	 */
-	NAUTILUS_CALL_PARENT (GNOME_CANVAS_ITEM_CLASS, render, (item, buffer));
-}
diff --git a/libnautilus-extensions/nautilus-background-canvas-group.h b/libnautilus-extensions/nautilus-background-canvas-group.h
deleted file mode 100644
index e22ccc471..000000000
--- a/libnautilus-extensions/nautilus-background-canvas-group.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-background-canvas-group.h: Class used internally by
-   NautilusBackground to add a background to a canvas.
-
-   Copyright (C) 2000 Eazel, Inc.
-   
-   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.
-  
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#ifndef NAUTILUS_BACKGROUND_CANVAS_GROUP_H
-#define NAUTILUS_BACKGROUND_CANVAS_GROUP_H
-
-#include <libgnomeui/gnome-canvas.h>
-
-/* nautilus_background_canvas_group_supplant_root_class is used internally by
-   NautilusBackground to change the class of a canvas in order to customize its
-   background drawing. The reason we have to change the class of a canvas group is
-   that the cleanest way to hook into the code that erases the canvas is to be the
-   root canvas group. But the canvas class creates the root object and doesn't allow
-   it to be destroyed, so we change the class of the root object in place.
-
-   A future version of GnomeCanvas may allow a nicer way of hooking in to the code
-   obviating this fn.
-
-   This fn is private to NautilusBackground.
-*/
-
-void nautilus_background_canvas_group_supplant_root_class (GnomeCanvas *canvas);
-
-#endif /* NAUTILUS_BACKGROUND_CANVAS_GROUP_H */
diff --git a/libnautilus-extensions/nautilus-background.c b/libnautilus-extensions/nautilus-background.c
deleted file mode 100644
index 4a86087e6..000000000
--- a/libnautilus-extensions/nautilus-background.c
+++ /dev/null
@@ -1,1310 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-background.c: Object for the background of a widget.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Darin Adler <darin@eazel.com>
-*/
-
-#include <config.h>
-#include <ctype.h>
-
-#include "nautilus-background.h"
-
-#include <math.h>
-
-#include <stdio.h>
-#include "nautilus-glib-extensions.h"
-
-#include <gtk/gtksignal.h>
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-gnome-extensions.h"
-#include "nautilus-background-canvas-group.h"
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-string.h"
-
-#include <libgnomeui/gnome-canvas.h>
-#include <libgnomeui/gnome-canvas-util.h>
-
-#include <libart_lgpl/art_rgb.h>
-
-static void nautilus_background_initialize_class (gpointer            klass);
-static void nautilus_background_initialize       (gpointer            object,
-						  gpointer            klass);
-static void nautilus_background_destroy          (GtkObject          *object);
-static void nautilus_background_draw_flat_box    (GtkStyle           *style,
-						  GdkWindow          *window,
-						  GtkStateType        state_type,
-						  GtkShadowType       shadow_type,
-						  GdkRectangle       *area,
-						  GtkWidget          *widget,
-						  char               *detail,
-						  int                 x,
-						  int                 y,
-						  int                 width,
-						  int                 height);
-static void nautilus_background_start_loading_image (NautilusBackground *background, gboolean emit_appearance_change);
-static gboolean nautilus_background_is_image_load_in_progress (NautilusBackground *background);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusBackground, nautilus_background, GTK_TYPE_OBJECT)
-
-enum {
-	APPEARANCE_CHANGED,
-	SETTINGS_CHANGED,
-	IMAGE_LOADING_DONE,
-	RESET,
-	LAST_SIGNAL
-};
-
-#define	RESET_BACKGROUND_MAGIC_IMAGE_NAME "reset.png"
-
-static guint signals[LAST_SIGNAL];
-
-struct NautilusBackgroundDetails {
-	char *color;
-	
-	int gradient_num_pixels;
-	guchar *gradient_buffer;
-	gboolean gradient_is_horizontal;
-
-	gboolean is_solid_color;
-	GdkColor solid_color;
-	
-	char *image_uri;
-	GdkPixbuf *image;
-	int image_width_unscaled;
-	int image_height_unscaled;
-	NautilusPixbufLoadHandle *load_image_handle;
-	gboolean emit_after_load;
-	NautilusBackgroundImagePlacement image_placement;
-
-	/* The image_rect is the area (canvas relative) the image will cover.
-	 * Note: image_rect_width/height are not always the same as the image's
-	 * width and height - e.g. if the image is tiled the image rect covers
-	 * the whole background.
-	 */
-	int image_rect_x;
-	int image_rect_y;
-	int image_rect_width;
-	int image_rect_height;
-};
-
-static void
-nautilus_background_initialize_class (gpointer klass)
-{
-	GtkObjectClass *object_class;
-	NautilusBackgroundClass *background_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	background_class = NAUTILUS_BACKGROUND_CLASS (klass);
-
-	signals[APPEARANCE_CHANGED] =
-		gtk_signal_new ("appearance_changed",
-				GTK_RUN_LAST | GTK_RUN_NO_RECURSE,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (NautilusBackgroundClass,
-						   appearance_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE,
-				0);
-	signals[SETTINGS_CHANGED] =
-		gtk_signal_new ("settings_changed",
-				GTK_RUN_LAST | GTK_RUN_NO_RECURSE,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (NautilusBackgroundClass,
-						   settings_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE,
-				0);
-	signals[IMAGE_LOADING_DONE] =
-		gtk_signal_new ("image_loading_done",
-				GTK_RUN_LAST | GTK_RUN_NO_RECURSE,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (NautilusBackgroundClass,
-						   image_loading_done),
-				gtk_marshal_NONE__BOOL,
-				GTK_TYPE_NONE,
-				1,
-				GTK_TYPE_BOOL);
-	signals[RESET] =
-		gtk_signal_new ("reset",
-				GTK_RUN_LAST | GTK_RUN_NO_RECURSE,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (NautilusBackgroundClass,
-						   reset),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE,
-				0);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	object_class->destroy = nautilus_background_destroy;
-}
-
-static void
-nautilus_background_initialize (gpointer object, gpointer klass)
-{
-	NautilusBackground *background;
-
-	background = NAUTILUS_BACKGROUND(object);
-
-	background->details = g_new0 (NautilusBackgroundDetails, 1);
-}
-
-/* The safe way to clear an image from a background is:
- * 		nautilus_background_set_image_uri (NULL);
- * This fn is a private utility - it does NOT clear
- * the details->image_uri setting.
- */
-static void
-nautilus_background_remove_current_image (NautilusBackground *background)
-{
-	if (background->details->image != NULL) {
-		gdk_pixbuf_unref (background->details->image);
-		background->details->image = NULL;
-	}
-}
-
-static void
-nautilus_background_destroy (GtkObject *object)
-{
-	NautilusBackground *background;
-
-	background = NAUTILUS_BACKGROUND (object);
-
-	nautilus_cancel_gdk_pixbuf_load (background->details->load_image_handle);
-	background->details->load_image_handle = NULL;
-
-	g_free (background->details->color);
-	g_free (background->details->gradient_buffer);
-	g_free (background->details->image_uri);
-	nautilus_background_remove_current_image (background);
-	g_free (background->details);
-
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-NautilusBackgroundImagePlacement
-nautilus_background_get_image_placement (NautilusBackground *background)
-{
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), NAUTILUS_BACKGROUND_TILED);
-
-	return background->details->image_placement;
-}
-
-static gboolean
-nautilus_background_set_image_placement_no_emit (NautilusBackground *background,
-						 NautilusBackgroundImagePlacement new_placement)
-{
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), FALSE);
-
-	if (new_placement != background->details->image_placement) {
-
-		if (nautilus_background_is_image_load_in_progress (background)) {
-			/* We try to be smart and keep using the current image for updates
-			 * while a new image is loading. However, changing the placement
-			 * foils these plans.
-			 */
-			nautilus_background_remove_current_image (background);
-		}
-
-		background->details->image_placement = new_placement;
-		return TRUE;
-	} else {
-		return FALSE;
-	}
-}
-
-void
-nautilus_background_set_image_placement (NautilusBackground *background,
-					 NautilusBackgroundImagePlacement new_placement)
-{
-	if (nautilus_background_set_image_placement_no_emit (background, new_placement)) {
-		gtk_signal_emit (GTK_OBJECT (background),
-			 signals[SETTINGS_CHANGED]);
-		gtk_signal_emit (GTK_OBJECT (background),
-			 signals[APPEARANCE_CHANGED]);
-	}
-}
-
-NautilusBackground *
-nautilus_background_new (void)
-{
-	return NAUTILUS_BACKGROUND (gtk_object_new (NAUTILUS_TYPE_BACKGROUND, NULL));
-}
- 
-static void
-reset_cached_color_info (NautilusBackground *background)
-{
-	background->details->gradient_num_pixels = 0;
-	
-	background->details->is_solid_color = !nautilus_gradient_is_gradient (background->details->color);
-	
-	if (background->details->is_solid_color) {
-		g_free (background->details->gradient_buffer);
-		background->details->gradient_buffer = NULL;
-		nautilus_gdk_color_parse_with_white_default (background->details->color, &background->details->solid_color);
-	} else {
-		/* If color is still a gradient, don't g_free the buffer, nautilus_background_ensure_gradient_buffered
-		 * uses g_realloc to try to reuse it.
-		 */
-		background->details->gradient_is_horizontal = nautilus_gradient_is_horizontal (background->details->color);
-	}
-}
-
-static void
-nautilus_background_ensure_gradient_buffered (NautilusBackground *background, int dest_width, int dest_height)
-{
-	int num_pixels;
-
-	guchar *buff_ptr;
-	guchar *buff_limit;
-
-	GdkColor cur_color;
-
-	char* color_spec;
-	const char* spec_ptr;
-
-	if (background->details->is_solid_color) {
-		return;
-	}
-
-	num_pixels = background->details->gradient_is_horizontal ? dest_width : dest_height;
-
-	if (background->details->gradient_num_pixels == num_pixels) {
-		return;
-	}
-
-	background->details->gradient_num_pixels = num_pixels;
-	background->details->gradient_buffer = g_realloc (background->details->gradient_buffer, num_pixels * 3);
-	
-	buff_ptr   = background->details->gradient_buffer;
-	buff_limit = background->details->gradient_buffer + num_pixels * 3;
-
-	spec_ptr = background->details->color;
-	
-	color_spec = nautilus_gradient_parse_one_color_spec (spec_ptr, NULL, &spec_ptr);
-	nautilus_gdk_color_parse_with_white_default (color_spec, &cur_color);
-	g_free (color_spec);
-
-	while (spec_ptr != NULL && buff_ptr < buff_limit) {
-		int percent;
-		int fill_pos;
-		int fill_width;
-		int dr, dg, db;
-		guchar *fill_limit;
-		GdkColor new_color;
-	
-		color_spec = nautilus_gradient_parse_one_color_spec (spec_ptr, &percent, &spec_ptr);
-		nautilus_gdk_color_parse_with_white_default (color_spec, &new_color);
-		g_free (color_spec);
-
-		dr = new_color.red   - cur_color.red;
-		dg = new_color.green - cur_color.green;
-		db = new_color.blue  - cur_color.blue;
-
-		fill_pos   = 1;
-		fill_limit = MIN (background->details->gradient_buffer + 3 * ((num_pixels * percent) / 100), buff_limit);
-		fill_width = (fill_limit - buff_ptr) / 3;
-		
-		while (buff_ptr < fill_limit) {
-			*buff_ptr++ = (cur_color.red   + (dr * fill_pos) / fill_width) >> 8;
-			*buff_ptr++ = (cur_color.green + (dg * fill_pos) / fill_width) >> 8;
-			*buff_ptr++ = (cur_color.blue  + (db * fill_pos) / fill_width) >> 8;
-			++fill_pos;
-		}
-		cur_color = new_color;
-	}
-
-	/* fill in the remainder */
-	art_rgb_fill_run (buff_ptr, cur_color.red, cur_color.green, cur_color.blue, (buff_limit - buff_ptr) / 3);	
-}
-
-static void
-canvas_gradient_helper_v (const GnomeCanvasBuf *buf, const art_u8 *gradient_buff)
-{
-	int width  = buf->rect.x1 - buf->rect.x0;
-	int height = buf->rect.y1 - buf->rect.y0;
-
-	art_u8 *dst       = buf->buf;
-	art_u8 *dst_limit = buf->buf + height * buf->buf_rowstride;
-
-	gradient_buff += buf->rect.y0 * 3;
-	
-	while (dst < dst_limit) {
-		art_u8 r = *gradient_buff++;
-		art_u8 g = *gradient_buff++;
-		art_u8 b = *gradient_buff++;
- 		art_rgb_fill_run (dst, r, g, b, width);
-		dst += buf->buf_rowstride;
-	}
-}
-
-static void
-canvas_gradient_helper_h (const GnomeCanvasBuf *buf, const art_u8 *gradient_buff)
-{
-	int width  = buf->rect.x1 - buf->rect.x0;
-	int height = buf->rect.y1 - buf->rect.y0;
-
-	art_u8 *dst       = buf->buf;
-	art_u8 *dst_limit = buf->buf + height * buf->buf_rowstride;
-
-	int copy_bytes_per_row = width * 3;
-
-	gradient_buff += buf->rect.x0 * 3;
-	
-	while (dst < dst_limit) {
- 		memcpy (dst, gradient_buff, copy_bytes_per_row);
-		dst += buf->buf_rowstride;
-	}
-}
-
-static void
-fill_canvas_from_gradient_buffer (const GnomeCanvasBuf *buf, const NautilusBackground *background)
-{
-	g_return_if_fail (background->details->gradient_buffer != NULL);
-
-	/* FIXME bugzilla.eazel.com 4876: This hack is needed till we fix background
-	 * scolling.
-	 *
-	 * I.e. currently you can scroll off the end of the gradient - and we
-	 * handle this by pegging it the the last rgb value.
-	 *
-	 * It might be needed permanently after depending on how this is fixed.
-	 * If we tie gradients to the boundry of icon placement (as opposed to
-	 * window size) then when dragging an icon you might scroll off the
-	 * end of the gradient - which will get recaluated after the drop.
-	 */
-	if (background->details->gradient_is_horizontal) {
-		if (buf->rect.x1 > background->details->gradient_num_pixels) {
-			art_u8 *rgb888 = background->details->gradient_buffer + (background->details->gradient_num_pixels - 1) * 3;
-			GnomeCanvasBuf gradient = *buf;
-			GnomeCanvasBuf overflow = *buf;
-			gradient.rect.x1 =  gradient.rect.x0 < background->details->gradient_num_pixels ? background->details->gradient_num_pixels : gradient.rect.x0;
-			overflow.buf += (gradient.rect.x1 - gradient.rect.x0) * 3;
-			overflow.rect.x0 = gradient.rect.x1;
-			nautilus_gnome_canvas_fill_rgb (&overflow, rgb888[0], rgb888[1], rgb888[2]);
-			canvas_gradient_helper_h (&gradient, background->details->gradient_buffer);
-			return;
-		}
-	} else {
-		if (buf->rect.y1 > background->details->gradient_num_pixels) {
-			art_u8 *rgb888 = background->details->gradient_buffer + (background->details->gradient_num_pixels - 1) * 3;
-			GnomeCanvasBuf gradient = *buf;
-			GnomeCanvasBuf overflow = *buf;
-			gradient.rect.y1 = gradient.rect.y0 < background->details->gradient_num_pixels ? background->details->gradient_num_pixels : gradient.rect.y0;
-			overflow.buf += (gradient.rect.y1 - gradient.rect.y0) * gradient.buf_rowstride;
-			overflow.rect.y0 = gradient.rect.y1;
-			nautilus_gnome_canvas_fill_rgb (&overflow, rgb888[0], rgb888[1], rgb888[2]);
-			canvas_gradient_helper_v (&gradient, background->details->gradient_buffer);
-			return;
-		}
-	}
-
-	(background->details->gradient_is_horizontal ? canvas_gradient_helper_h : canvas_gradient_helper_v) (buf, background->details->gradient_buffer);
-}
-
-/* Initializes a pseudo-canvas buf so canvas drawing routines can be used to draw into a pixbuf.
- */
-static void
-canvas_buf_from_pixbuf (GnomeCanvasBuf* buf, GdkPixbuf *pixbuf, int x, int y, int width, int height)
-{
-	buf->buf =  gdk_pixbuf_get_pixels (pixbuf);
-	buf->buf_rowstride =  gdk_pixbuf_get_rowstride (pixbuf);
-	buf->rect.x0 = x;
-	buf->rect.y0 = y;
-	buf->rect.x1 = x + width;
-	buf->rect.y1 = y + height;
-	buf->bg_color = 0xFFFFFFFF;
-	buf->is_bg = TRUE;
-	buf->is_buf = FALSE;
-}
-
-static gboolean
-nautilus_background_image_totally_obscures (NautilusBackground *background)
-{
-	if (background->details->image == NULL || gdk_pixbuf_get_has_alpha (background->details->image)) {
-		return FALSE;
-	}
-
-	switch (background->details->image_placement) {
-	case NAUTILUS_BACKGROUND_TILED:
-	case NAUTILUS_BACKGROUND_SCALED:
-		return TRUE;
-	default:
-		g_assert_not_reached ();
-		/* fall through */
-	case NAUTILUS_BACKGROUND_CENTERED:
-	case NAUTILUS_BACKGROUND_SCALED_ASPECT:
-		/* It's possible that the image totally obscures in this case, but we don't
-		 * have enough info to know. So we guess conservatively.
-		 */
-		return FALSE;
-	}
-}
-
-static void
-nautilus_background_ensure_image_scaled (NautilusBackground *background, int dest_width, int dest_height)
-{
-	if (background->details->image == NULL) {
-		background->details->image_rect_x = 0;
-		background->details->image_rect_y = 0;
-		background->details->image_rect_width = 0;
-		background->details->image_rect_height = 0;
-	} else if (!nautilus_background_is_image_load_in_progress (background)){
-		int image_width;
-		int image_height;
-		int fit_width;
-		int fit_height;
-		gboolean cur_scaled;
-		gboolean reload_image;
-		GdkPixbuf *scaled_pixbuf;
-
-		image_width = gdk_pixbuf_get_width (background->details->image);
-		image_height = gdk_pixbuf_get_height (background->details->image);
-		cur_scaled = image_width != background->details->image_width_unscaled ||
-			     image_height != background->details->image_height_unscaled;
-		reload_image = FALSE;
-		scaled_pixbuf = NULL;
-	
-		switch (background->details->image_placement) {
-		case NAUTILUS_BACKGROUND_TILED:
-		case NAUTILUS_BACKGROUND_CENTERED:
-			reload_image = cur_scaled;
-			break;
-		case NAUTILUS_BACKGROUND_SCALED:
-			if (image_width != dest_width || image_height != dest_height) {
-				if (cur_scaled) {
-					reload_image = TRUE;
-				} else {
-					scaled_pixbuf = gdk_pixbuf_scale_simple (background->details->image, dest_width, dest_height, GDK_INTERP_BILINEAR);
-					gdk_pixbuf_unref (background->details->image);
-					background->details->image = scaled_pixbuf;
-					image_width = gdk_pixbuf_get_width (scaled_pixbuf);
-					image_height = gdk_pixbuf_get_height (scaled_pixbuf);
-				}
-			}
-			break;
-		case NAUTILUS_BACKGROUND_SCALED_ASPECT:
-			nautilus_gdk_scale_to_fit_factor (background->details->image_width_unscaled,
-							  background->details->image_height_unscaled,
-							  dest_width, dest_height,
-							  &fit_width, &fit_height);
-			if (image_width != fit_width || image_height != fit_height) {
-				if (cur_scaled) {
-					reload_image = TRUE;
-				} else {
-					scaled_pixbuf = nautilus_gdk_pixbuf_scale_to_fit (background->details->image, dest_width, dest_height);
-					gdk_pixbuf_unref (background->details->image);
-					background->details->image = scaled_pixbuf;
-					image_width = gdk_pixbuf_get_width (scaled_pixbuf);
-					image_height = gdk_pixbuf_get_height (scaled_pixbuf);
-				}
-			}
-			break;
-		}
-
-		if (reload_image) {
-			gdk_pixbuf_unref (background->details->image);
-			background->details->image = NULL;
-			nautilus_background_start_loading_image (background, TRUE);
-			background->details->image_rect_x = 0;
-			background->details->image_rect_y = 0;
-			background->details->image_rect_width = 0;
-			background->details->image_rect_height = 0;
-		} else if (background->details->image_placement == NAUTILUS_BACKGROUND_TILED) {
-			background->details->image_rect_x = 0;
-			background->details->image_rect_y = 0;
-			background->details->image_rect_width = dest_width;
-			background->details->image_rect_height = dest_height;
-		} else {
-			background->details->image_rect_x = (dest_width - image_width) / 2;
-			background->details->image_rect_y = (dest_height - image_height) / 2;
-			background->details->image_rect_width = image_width;
-			background->details->image_rect_height = image_height;
-		}
-	}
-}
-
-void
-nautilus_background_pre_draw (NautilusBackground *background, int entire_width, int entire_height)
-{
-	nautilus_background_ensure_image_scaled (background, entire_width, entire_height);
-	nautilus_background_ensure_gradient_buffered (background, entire_width, entire_height);
-}
-
-void
-nautilus_background_draw (NautilusBackground *background,
-			  GdkDrawable *drawable, GdkGC *gc,
-			  int drawable_x, int drawable_y,
-			  int drawable_width, int drawable_height)
-{
-	int x, y;
-	int x_canvas, y_canvas;
-	int width, height;
-	
-	GnomeCanvasBuf buffer;
-	GdkPixbuf *pixbuf;
-
-	/* Non-aa background drawing is done by faking up a GnomeCanvasBuf
-	 * and passing it to the aa code.
-	 *
-	 * The width and height were chosen to match those used by gnome-canvas
-	 * (IMAGE_WIDTH_AA & IMAGE_HEIGHT_AA  in gnome-libs/libgnomeui/gnome-canvas.c)
-	 * They're not required to match - so this could be changed if necessary.
-	 */
-	static const int PIXBUF_WIDTH = 256;
-	static const int PIXBUF_HEIGHT = 64;
-
-	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, PIXBUF_WIDTH, PIXBUF_HEIGHT);
-
-	/* x & y are relative to the drawable
-	 */
-	for (y = 0; y < drawable_height; y += PIXBUF_HEIGHT) {
-		for (x = 0; x < drawable_width; x += PIXBUF_WIDTH) {
-
-			width = MIN (drawable_width - x, PIXBUF_WIDTH);
-			height = MIN (drawable_height - y, PIXBUF_HEIGHT);
-
-			x_canvas = drawable_x + x;
-			y_canvas = drawable_y + y;
-
-			canvas_buf_from_pixbuf (&buffer, pixbuf, x_canvas, y_canvas, width, height);
-			nautilus_background_draw_aa (background, &buffer);
-			gdk_pixbuf_render_to_drawable (pixbuf, drawable, gc,
-						       0, 0,
-						       x, y,
-						       width, height,
-						       GDK_RGB_DITHER_MAX, x_canvas, y_canvas);
-		}
-	}
-	
-	gdk_pixbuf_unref (pixbuf);
-}
-
-void
-nautilus_background_draw_to_drawable (NautilusBackground *background,
-				      GdkDrawable *drawable, GdkGC *gc,
-				      int drawable_x, int drawable_y,
-				      int drawable_width, int drawable_height,
-				      int entire_width, int entire_height)
-{
-	nautilus_background_pre_draw (background, entire_width, entire_height);
-	nautilus_background_draw (background, drawable, gc, drawable_x, drawable_y, drawable_width, drawable_height);
-}
-
-void
-nautilus_background_draw_to_pixbuf (NautilusBackground *background,
-				    GdkPixbuf *pixbuf,
-				    int pixbuf_x,
-				    int pixbuf_y,
-				    int pixbuf_width,
-				    int pixbuf_height,
-				    int entire_width,
-				    int entire_height)
-{
-	GnomeCanvasBuf fake_buffer;
-
-	g_return_if_fail (background != NULL);
-	g_return_if_fail (pixbuf != NULL);
-
-	canvas_buf_from_pixbuf (&fake_buffer, pixbuf, pixbuf_x, pixbuf_y, pixbuf_width, pixbuf_height);
-
-	nautilus_background_draw_to_canvas (background,
-					    &fake_buffer,
-					    entire_width,
-					    entire_height);
-}
-
-/* fill the canvas buffer with a tiled pixbuf */
-static void
-draw_pixbuf_tiled_aa (GdkPixbuf *pixbuf, GnomeCanvasBuf *buffer)
-{
-	int x, y;
-	int start_x, start_y;
-	int tile_width, tile_height;
-	
-	tile_width = gdk_pixbuf_get_width (pixbuf);
-	tile_height = gdk_pixbuf_get_height (pixbuf);
-	
-	start_x = buffer->rect.x0 - (buffer->rect.x0 % tile_width);
-	start_y = buffer->rect.y0 - (buffer->rect.y0 % tile_height);
-
-	for (y = start_y; y < buffer->rect.y1; y += tile_height) {
-		for (x = start_x; x < buffer->rect.x1; x += tile_width) {
-			nautilus_gnome_canvas_draw_pixbuf (buffer, pixbuf, x, y);
-		}
-	}
-}
-
-/* draw the background on the anti-aliased canvas */
-void
-nautilus_background_draw_aa (NautilusBackground *background, GnomeCanvasBuf *buffer)
-{	
-	g_return_if_fail (NAUTILUS_IS_BACKGROUND (background));
-
-	/* If the image has alpha - we always draw the gradient behind it.
-	 * In principle, we could do better by having already drawn gradient behind
-	 * the scaled image. However, this would add a significant amount of
-	 * complexity to our image scaling/caching logic. I.e. it would tie the
-	 * scaled image to a location on the screen because it holds a gradient.
-	 * This is especially problematic for tiled images with alpha.
-	 */
-	if (!background->details->image ||
-	     gdk_pixbuf_get_has_alpha (background->details->image) ||
-	     buffer->rect.x0  < background->details->image_rect_x ||
-	     buffer->rect.y0  < background->details->image_rect_y ||
-	     buffer->rect.x1  > (background->details->image_rect_x + background->details->image_rect_width) ||
-	     buffer->rect.y1  > (background->details->image_rect_y + background->details->image_rect_height)) {
-		if (background->details->is_solid_color) {
-			nautilus_gnome_canvas_fill_rgb (buffer,
-							background->details->solid_color.red >> 8,
-							background->details->solid_color.green >> 8,
-							background->details->solid_color.blue >> 8);
-		} else {
-			fill_canvas_from_gradient_buffer (buffer, background);
-		}
-	}
-
-	if (background->details->image != NULL) {
-		switch (background->details->image_placement) {
-		case NAUTILUS_BACKGROUND_TILED:
-			draw_pixbuf_tiled_aa (background->details->image, buffer);
-			break;
-		default:
-			g_assert_not_reached ();
-			/* fall through */
-		case NAUTILUS_BACKGROUND_CENTERED:
-		case NAUTILUS_BACKGROUND_SCALED:
-		case NAUTILUS_BACKGROUND_SCALED_ASPECT:
-			/* Since the image has already been scaled, all these cases
-			 * can be treated identically.
-			 */
-			nautilus_gnome_canvas_draw_pixbuf (buffer,
-							   background->details->image,
-							   background->details->image_rect_x,
-							   background->details->image_rect_y);
-			break;
-		}
-	}
-					
-	buffer->is_bg  = FALSE;
-	buffer->is_buf = TRUE;
-}
-
-void
-nautilus_background_draw_to_canvas (NautilusBackground *background,
-				    GnomeCanvasBuf *buffer,
-				    int entire_width,
-				    int entire_height)
-{
-	nautilus_background_pre_draw (background, entire_width, entire_height);
-	nautilus_background_draw_aa (background, buffer);
-}
-
-char *
-nautilus_background_get_color (NautilusBackground *background)
-{
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), NULL);
-
-	return g_strdup (background->details->color);
-}
-
-char *
-nautilus_background_get_image_uri (NautilusBackground *background)
-{
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), NULL);
-
-	return g_strdup (background->details->image_uri);
-}
-
-static gboolean
-nautilus_background_set_color_no_emit (NautilusBackground *background,
-			       const char *color)
-{
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), FALSE);
-
-	if (nautilus_strcmp (background->details->color, color) == 0) {
-		return FALSE;
-	}
-	g_free (background->details->color);
-	background->details->color = g_strdup (color);
-	reset_cached_color_info (background);
-
-	return TRUE;
-}
-
-void
-nautilus_background_set_color (NautilusBackground *background,
-			       const char *color)
-{
-	if (nautilus_background_set_color_no_emit (background, color)) {
-		gtk_signal_emit (GTK_OBJECT (background), signals[SETTINGS_CHANGED]);
-		if (!nautilus_background_image_totally_obscures (background)) {
-			gtk_signal_emit (GTK_OBJECT (background), signals[APPEARANCE_CHANGED]);
-		}
-	}
-}
-
-static void
-nautilus_background_load_image_callback (GnomeVFSResult error,
-					 GdkPixbuf *pixbuf,
-					 gpointer callback_data)
-{
-	NautilusBackground *background;
-
-	background = NAUTILUS_BACKGROUND (callback_data);
-
-	background->details->load_image_handle = NULL;
-
-	nautilus_background_remove_current_image (background);
-
-	/* Just ignore errors. */
-	if (pixbuf != NULL) {
-		gdk_pixbuf_ref (pixbuf);
-		background->details->image = pixbuf;
-		background->details->image_width_unscaled = gdk_pixbuf_get_width (pixbuf);
-		background->details->image_height_unscaled = gdk_pixbuf_get_height (pixbuf);
-	}
-
-	gtk_signal_emit (GTK_OBJECT (background), signals[IMAGE_LOADING_DONE], pixbuf != NULL || background->details->image_uri == NULL);
-
-	if (background->details->emit_after_load) {
-		gtk_signal_emit (GTK_OBJECT (background), signals[APPEARANCE_CHANGED]);
-	}
-}
-
-static gboolean
-nautilus_background_is_image_load_in_progress (NautilusBackground *background)
-{
-	return background->details->load_image_handle != NULL;
-}
-
-static void
-nautilus_background_cancel_loading_image (NautilusBackground *background)
-{
-	if (nautilus_background_is_image_load_in_progress (background)) {
-		nautilus_cancel_gdk_pixbuf_load (background->details->load_image_handle);
-		background->details->load_image_handle = NULL;
-		gtk_signal_emit (GTK_OBJECT (background), signals[IMAGE_LOADING_DONE], FALSE);
-	}
-}
-
-static void
-nautilus_background_start_loading_image (NautilusBackground *background, gboolean emit_appearance_change)
-{
-	background->details->emit_after_load = emit_appearance_change;
-
-	if (background->details->image_uri != NULL) {
-		background->details->load_image_handle = nautilus_gdk_pixbuf_load_async (background->details->image_uri,
-											 nautilus_background_load_image_callback,
-											 background);
-	} else {
-		nautilus_background_load_image_callback (0, NULL, background);
-	}
-}
-
-static gboolean
-nautilus_background_set_image_uri_helper (NautilusBackground *background,
-					const char *image_uri,
-					gboolean emit_setting_change,
-					gboolean emit_appearance_change)
-{
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), FALSE);
-
-	if (nautilus_strcmp (background->details->image_uri, image_uri) == 0) {
-		return FALSE;
-	}
-
-	nautilus_background_cancel_loading_image (background);
-	
-	g_free (background->details->image_uri);
-	background->details->image_uri = g_strdup (image_uri);
-
-	/* We do not get rid of the current image here. This gets done after the new
-	 * image loads - in nautilus_background_load_image_callback. This way the
-	 * current image can be used if an update is needed before the load completes.
-	 */
-	
-	nautilus_background_start_loading_image (background, emit_appearance_change);
-
-	if (emit_setting_change) {
-		gtk_signal_emit (GTK_OBJECT (background), signals[SETTINGS_CHANGED]);
-	}
-
-	return TRUE;
-}
-
-void
-nautilus_background_set_image_uri (NautilusBackground *background, const char *image_uri)
-{
-	nautilus_background_set_image_uri_helper (background, image_uri, TRUE, TRUE);
-}
-
-static void
-set_image_and_color_image_loading_done_callback (NautilusBackground *background, gboolean successful_load, char *color)
-{
-	gtk_signal_disconnect_by_func (GTK_OBJECT (background), GTK_SIGNAL_FUNC (set_image_and_color_image_loading_done_callback), (gpointer) color);
-
-	nautilus_background_set_color_no_emit (background, color);
-
-	g_free (color);
-	
-	/* We always emit , even if the color didn't change, because the image change
-	 * relies on us doing it here.
-	 */
-	gtk_signal_emit (GTK_OBJECT (background), signals[SETTINGS_CHANGED]);
-	gtk_signal_emit (GTK_OBJECT (background), signals[APPEARANCE_CHANGED]);
-}
-
-/* Use this fn to set both the image and color and avoid flash. The color isn't
- * changed till after the image is done loading, that way if an update occurs
- * before then, it will use the old color and image.
- */
-static void
-nautilus_background_set_image_uri_and_color (NautilusBackground *background, const char *image_uri, const char *color)
-{
-	char *color_copy;
-
-	if (nautilus_strcmp (background->details->color, color) == 0 &&
-	    nautilus_strcmp (background->details->image_uri, image_uri) == 0) {
-		return;
-	}
-
-	color_copy = g_strdup (color);
-
-	gtk_signal_connect (GTK_OBJECT (background),
-			    "image_loading_done",
-			    GTK_SIGNAL_FUNC (set_image_and_color_image_loading_done_callback),
-			    (gpointer) color_copy);
-			    
-	/* set_image_and_color_image_loading_done_callback must always be called
-	 * because we rely on it to:
-	 *  - disconnect the image_loading_done signal handler
-	 *  - emit SETTINGS_CHANGED & APPEARANCE_CHANGED
-	 *  - free color_copy
-	 *  - prevent the common cold
-	 */
-	     
-	/* We use nautilus_background_set_image_uri_helper because its
-	 * return value (if false) tells us whether or not we need to
-	 * call set_image_and_color_image_loading_done_callback ourselves.
-	 */
-	if (!nautilus_background_set_image_uri_helper (background, image_uri, FALSE, FALSE)) {
-		set_image_and_color_image_loading_done_callback (background, TRUE, color_copy);
-	}
-}
-
-void
-nautilus_background_receive_dropped_background_image (NautilusBackground *background,
-						      const char *image_uri)
-{
-	/* Special case the reset-background image by file name. */
-	if (nautilus_str_has_suffix (image_uri, "/" RESET_BACKGROUND_MAGIC_IMAGE_NAME)) {
-		nautilus_background_reset (background);
-	} else {
-		/* Currently, we only support tiled images. So we set the placement.
-		 * We rely on nautilus_background_set_image_uri_and_color to emit
-		 * the SETTINGS_CHANGED & APPEARANCE_CHANGE signals.
-		 */
-		nautilus_background_set_image_placement_no_emit (background, NAUTILUS_BACKGROUND_TILED);
-
-		nautilus_background_set_image_uri_and_color (background, image_uri, NULL);
-	}
-}
-
-static GtkStyleClass *
-nautilus_gtk_style_get_default_class (void)
-{
-	static GtkStyleClass *default_class;
-	GtkStyle *style;
-	
-	if (default_class == NULL) {
-		style = gtk_style_new ();
-		default_class = style->klass;
-		gtk_style_unref (style);
-	}
-
-	return default_class;
-}
-
-static void
-nautilus_gdk_window_update_sizes (GdkWindow *window, int *width, int *height)
-{
-	g_return_if_fail (window != NULL);
-	g_return_if_fail (width != NULL);
-	g_return_if_fail (height != NULL);
-
-	if (*width == -1 && *height == -1) {
-		gdk_window_get_size (window, width, height);
-	} else if (*width == -1) {
-		gdk_window_get_size (window, width, NULL);
-	} else if (*height == -1) {
-		gdk_window_get_size (window, NULL, height);
-	}
-}
-
-static void
-nautilus_background_draw_flat_box (GtkStyle *style,
-				   GdkWindow *window,
-				   GtkStateType state_type,
-				   GtkShadowType shadow_type,
-				   GdkRectangle *area,
-				   GtkWidget *widget,
-				   char *detail,
-				   int x,
-				   int y,
-				   int width,
-				   int height)
-{
-	gboolean call_parent;
-	NautilusBackground *background;
-	GdkGC *gc;
-
-	call_parent = TRUE;
-
-	background = NULL;
-	if (state_type == GTK_STATE_NORMAL) {
-		background = nautilus_get_widget_background (widget);
-		if (background != NULL) {
-			call_parent = FALSE;
-		}
-	}
-
-	if (call_parent) {
-		(* nautilus_gtk_style_get_default_class()->draw_flat_box)
-			(style, window, state_type, shadow_type, area, widget,
-			 detail, x, y, width, height);
-		return;
-	}
-
-    	gc = style->bg_gc[state_type];
-	if (area)
-		gdk_gc_set_clip_rectangle (gc, area);
-
-	nautilus_gdk_window_update_sizes (window, &width, &height);	
-
-	nautilus_background_draw_to_drawable (background, window, gc, 0, 0, width, height, widget->allocation.width, widget->allocation.height);
-	if (area)
-		gdk_gc_set_clip_rectangle (gc, NULL);
-}
-
-static GtkStyleClass *
-nautilus_background_get_gtk_style_class (void)
-{
-	static GtkStyleClass *klass;
-
-	if (klass == NULL) {
-		static GtkStyleClass klass_storage;
-
-		klass = &klass_storage;
-		*klass = *nautilus_gtk_style_get_default_class ();
-
-		klass->draw_flat_box = nautilus_background_draw_flat_box;
-	}
-
-	return klass;
-}
-
-static void
-nautilus_background_set_widget_style (NautilusBackground *background,
-				      GtkWidget *widget)
-{
-	GtkStyle *style;
-	char *start_color_spec;
-	GdkColor color;
-	
-	g_return_if_fail (NAUTILUS_IS_BACKGROUND (background));
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-	
-	style = gtk_widget_get_style (widget);
-	
-	/* Make a copy of the style. */
-	style = gtk_style_copy (style);
-	
-	/* Give it the special class that allows it to draw gradients. */
-	style->klass = nautilus_background_get_gtk_style_class ();
-
-	/* Set up the colors in the style. */
-	start_color_spec = nautilus_gradient_get_start_color_spec (background->details->color);
-	nautilus_gdk_color_parse_with_white_default (start_color_spec, &color);
-	g_free (start_color_spec);
-	
-	style->bg[GTK_STATE_NORMAL] = color;
-	style->base[GTK_STATE_NORMAL] = color;
-	style->bg[GTK_STATE_ACTIVE] = color;
-	style->base[GTK_STATE_ACTIVE] = color;
-	
-	/* Put the style in the widget. */
-	gtk_widget_set_style (widget, style);
-	gtk_style_unref (style);
-}
-
-/**
- * nautilus_background_is_set:
- * 
- * Check whether the background's color or image has been set.
- */
-gboolean
-nautilus_background_is_set (NautilusBackground *background)
-{
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), FALSE);
-
-	return background->details->color != NULL
-		|| background->details->image_uri != NULL;
-}
-
-/* Returns false if the image is still loading, true
- * if it's done loading or there is no image.
- */
-gboolean
-nautilus_background_is_loaded (NautilusBackground *background)
-{
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), FALSE);
-	
-	return background->details->image_uri == NULL ||
-		   (!nautilus_background_is_image_load_in_progress (background) && background->details->image != NULL);
-}
-
-/**
- * nautilus_background_reset:
- *
- * Emit the reset signal to forget any color or image that has been
- * set previously.
- */
-void
-nautilus_background_reset (NautilusBackground *background)
-{
-	g_return_if_fail (NAUTILUS_IS_BACKGROUND (background));
-
-	gtk_signal_emit (GTK_OBJECT (background), signals[RESET]);
-}
-
-static void
-nautilus_background_set_up_canvas (GtkWidget *widget)
-{
-	if (GNOME_IS_CANVAS (widget)) {
-		nautilus_background_canvas_group_supplant_root_class (GNOME_CANVAS (widget));
-	}
-}
-
-static void
-nautilus_widget_background_changed (GtkWidget *widget, NautilusBackground *background)
-{
-	nautilus_background_set_widget_style (background, widget);
-	nautilus_background_set_up_canvas (widget);
-
-	gtk_widget_queue_clear (widget);
-}
-
-/* Gets the background attached to a widget.
-
-   If the widget doesn't already have a NautilusBackground object,
-   this will create one. To change the widget's background, you can
-   just call nautilus_background methods on the widget.
-
-   Later, we might want a call to find out if we already have a background,
-   or a way to share the same background among multiple widgets; both would
-   be straightforward.
-*/
-NautilusBackground *
-nautilus_get_widget_background (GtkWidget *widget)
-{
-	gpointer data;
-	NautilusBackground *background;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
-	/* Check for an existing background. */
-	data = gtk_object_get_data (GTK_OBJECT (widget), "nautilus_background");
-	if (data != NULL) {
-		g_assert (NAUTILUS_IS_BACKGROUND (data));
-		return data;
-	}
-
-	/* Store the background in the widget's data. */
-	background = nautilus_background_new ();
-	gtk_object_ref (GTK_OBJECT (background));
-	gtk_object_sink (GTK_OBJECT (background));
-	gtk_object_set_data_full (GTK_OBJECT (widget), "nautilus_background",
-				  background, (GtkDestroyNotify) gtk_object_unref);
-
-	/* Arrange to get the signal whenever the background changes. */
-	gtk_signal_connect_object_while_alive (GTK_OBJECT (background),
-					       "appearance_changed",
-					       nautilus_widget_background_changed,
-					       GTK_OBJECT (widget));
-	nautilus_widget_background_changed (widget, background);
-
-	return background;
-}
-
-gboolean
-nautilus_widget_has_attached_background (GtkWidget *widget)
-{
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-
-	return gtk_object_get_data (GTK_OBJECT (widget), "nautilus_background") != NULL;
-}
-
-GtkWidget *
-nautilus_gtk_widget_find_background_ancestor (GtkWidget *widget)
-{
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
-	while (widget != NULL) {
-		if (nautilus_widget_has_attached_background (widget)) {
-			return widget;
-		}
-
-		widget = widget->parent;
-	}
-
-	return NULL;
-}
-
-gboolean
-nautilus_background_is_too_complex_for_gtk_style (NautilusBackground *background)
-{
-	if (background == NULL) {
-		return FALSE;
-	}
-	
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), FALSE);
-	
-	if (background->details->image_uri != NULL) {
-		return TRUE;
-	}
-	if (!background->details->is_solid_color) {
-		return TRUE;
-	}
-	
-	return FALSE;
-}
-
-/* determine if a background is darker or lighter than average, to help clients know what
-   colors to draw on top with */
-gboolean
-nautilus_background_is_dark (NautilusBackground *background)
-{
-	GdkColor color;
-	int intensity, intensity2;
-	char *start_color_spec, *end_color_spec;
-
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), FALSE);
-	
-	if (background->details->image != NULL) {
-		nautilus_gdk_pixbuf_average_value (background->details->image, &color);
-	} else if (background->details->is_solid_color) {
-		nautilus_gdk_color_parse_with_white_default (background->details->color, &color);	
-	} else {
-		start_color_spec = nautilus_gradient_get_start_color_spec (background->details->color);
-		end_color_spec = nautilus_gradient_get_end_color_spec (background->details->color);
-		
-		nautilus_gdk_color_parse_with_white_default (start_color_spec, &color);	
-		intensity = (((color.red >> 8) * 77) + ((color.green >> 8) * 150) + ((color.blue >> 8) * 28)) >> 8;		 
-		nautilus_gdk_color_parse_with_white_default (end_color_spec, &color);	
-		intensity2 = (((color.red >> 8) * 77) + ((color.green >> 8) * 150) + ((color.blue >> 8) * 28)) >> 8;		 
-		
-		g_free (start_color_spec);
-		g_free (end_color_spec);
-		
-		return (intensity + intensity2) < 320;
-	}
-	
-	intensity = (((color.red >> 8) * 77) + ((color.green >> 8) * 150) + ((color.blue >> 8) * 28)) >> 8;		 
-	return intensity < 160; /* biased slightly to be dark */
-}
-
-   
-/* handle dropped colors */
-void
-nautilus_background_receive_dropped_color (NautilusBackground *background,
-					   GtkWidget *widget,
-					   int drop_location_x,
-					   int drop_location_y,
-					   const GtkSelectionData *selection_data)
-{
-	guint16 *channels;
-	char *color_spec;
-	char *new_gradient_spec;
-	int left_border, right_border, top_border, bottom_border;
-
-	g_return_if_fail (NAUTILUS_IS_BACKGROUND (background));
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-	g_return_if_fail (selection_data != NULL);
-
-	/* Convert the selection data into a color spec. */
-	if (selection_data->length != 8 || selection_data->format != 16) {
-		g_warning ("received invalid color data");
-		return;
-	}
-	channels = (guint16 *) selection_data->data;
-	color_spec = g_strdup_printf ("rgb:%04hX/%04hX/%04hX", channels[0], channels[1], channels[2]);
-
-	/* Figure out if the color was dropped close enough to an edge to create a gradient.
-	   For the moment, this is hard-wired, but later the widget will have to have some
-	   say in where the borders are.
-	*/
-	left_border = 32;
-	right_border = widget->allocation.width - 32;
-	top_border = 32;
-	bottom_border = widget->allocation.height - 32;
-	if (drop_location_x < left_border && drop_location_x <= right_border) {
-		new_gradient_spec = nautilus_gradient_set_left_color_spec (background->details->color, color_spec);
-	} else if (drop_location_x >= left_border && drop_location_x > right_border) {
-		new_gradient_spec = nautilus_gradient_set_right_color_spec (background->details->color, color_spec);
-	} else if (drop_location_y < top_border && drop_location_y <= bottom_border) {
-		new_gradient_spec = nautilus_gradient_set_top_color_spec (background->details->color, color_spec);
-	} else if (drop_location_y >= top_border && drop_location_y > bottom_border) {
-		new_gradient_spec = nautilus_gradient_set_bottom_color_spec (background->details->color, color_spec);
-	} else {
-		new_gradient_spec = g_strdup (color_spec);
-	}
-	
-	g_free (color_spec);
-
-	nautilus_background_set_image_uri_and_color (background, NULL, new_gradient_spec);
-
-	g_free (new_gradient_spec);
-}
-
-/* self check code */
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-void
-nautilus_self_check_background (void)
-{
-	NautilusBackground *background;
-
-	background = nautilus_background_new ();
-
-	nautilus_background_set_color (background, NULL);
-	nautilus_background_set_color (background, "");
-	nautilus_background_set_color (background, "red");
-	nautilus_background_set_color (background, "red-blue");
-	nautilus_background_set_color (background, "red-blue:h");
-
-	gtk_object_unref (GTK_OBJECT (background));
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-background.h b/libnautilus-extensions/nautilus-background.h
deleted file mode 100644
index 9d5fb70e8..000000000
--- a/libnautilus-extensions/nautilus-background.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-background.h: Object for the background of a widget.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   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.
-  
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#ifndef NAUTILUS_BACKGROUND_H
-#define NAUTILUS_BACKGROUND_H
-
-/* Windows for Nautilus can contain backgrounds that are either tiled
-   with an image, a solid color, or a color gradient. This class manages
-   the process of loading the image if necessary and parsing the string
-   that specifies either a color or color gradient.
-
-   The color or gradient is always present, even if there's a tiled image
-   on top of it. This is used when the tiled image can't be loaded for
-   some reason (or just has not been loaded yet).
-
-   The NautilusBackground object is easier to modify than a GtkStyle.
-   You can just call nautilus_get_window_background and modify the
-   returned background directly, unlike a style, which must be copied,
-   modified and then set.
-*/
-
-#include <gdk/gdktypes.h>
-#include <gtk/gtkwidget.h>
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-typedef struct NautilusBackground NautilusBackground;
-typedef struct NautilusBackgroundClass NautilusBackgroundClass;
-
-#define NAUTILUS_TYPE_BACKGROUND \
-	(nautilus_background_get_type ())
-#define NAUTILUS_BACKGROUND(obj) \
-	(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_BACKGROUND, NautilusBackground))
-#define NAUTILUS_BACKGROUND_CLASS(klass) \
-	(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_BACKGROUND, NautilusBackgroundClass))
-#define NAUTILUS_IS_BACKGROUND(obj) \
-	(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_BACKGROUND))
-#define NAUTILUS_IS_BACKGROUND_CLASS(klass) \
-	(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_BACKGROUND))
-
-typedef enum {
-	NAUTILUS_BACKGROUND_TILED = 0, /* zero makes this the default placement */
-	NAUTILUS_BACKGROUND_CENTERED,
-	NAUTILUS_BACKGROUND_SCALED,
-	NAUTILUS_BACKGROUND_SCALED_ASPECT
-} NautilusBackgroundImagePlacement;
-
-GtkType                          nautilus_background_get_type                         (void);
-NautilusBackground *             nautilus_background_new                              (void);
-
-
-/* Calls to change a background. */
-void                             nautilus_background_set_color                        (NautilusBackground               *background,
-										       const char                       *color_or_gradient);
-void                             nautilus_background_set_image_uri                    (NautilusBackground               *background,
-										       const char                       *image_uri);
-void                             nautilus_background_reset                            (NautilusBackground               *background);
-void                             nautilus_background_set_image_placement              (NautilusBackground               *background,
-										       NautilusBackgroundImagePlacement  placement);
-/* Calls to interrogate the current state of a background. */
-char *                           nautilus_background_get_color                        (NautilusBackground               *background);
-char *                           nautilus_background_get_image_uri                    (NautilusBackground               *background);
-NautilusBackgroundImagePlacement nautilus_background_get_image_placement              (NautilusBackground               *background);
-gboolean                         nautilus_background_is_dark                          (NautilusBackground               *background);
-gboolean                         nautilus_background_is_set                           (NautilusBackground               *background);
-gboolean                         nautilus_background_is_loaded                        (NautilusBackground               *background);
-
-/* For preping the background to be used in one of the two calls
- * below. Only intended to be called by nautilus_background_canvas_group_update.
- */
-void                             nautilus_background_pre_draw                         (NautilusBackground               *background,
-										       int                               entire_width,
-										       int                               entire_height);
-/* For updating the canvas, non-aa case. Note: nautilus_background_pre_draw
- * must have been previously called. Only intended to be called by
- * nautilus_background_canvas_group_draw.
- */
-void                             nautilus_background_draw                             (NautilusBackground               *background,
-										       GdkDrawable                      *drawable,
-										       GdkGC                            *gc,
-										       int                               drawable_x,
-										       int                               drawable_y,
-										       int                               drawable_width,
-										       int                               drawable_height);
-/* For updating the canvas, aa case. Note: nautilus_background_pre_draw
- * must have been previously called. Only intended to be called by
- * nautilus_background_canvas_group_render.
- */
-void                             nautilus_background_draw_aa                          (NautilusBackground               *background,
-										       GnomeCanvasBuf                   *buffer);
-/* Used to fill a drawable with a background.
- *  - entire_width/height describe the total area the background covers
- *  - drawable_x/y/width/height describe the portion of that area the drawable covers
- */
-void                             nautilus_background_draw_to_drawable                 (NautilusBackground               *background,
-										       GdkDrawable                      *drawable,
-										       GdkGC                            *gc,
-										       int                               drawable_x,
-										       int                               drawable_y,
-										       int                               drawable_width,
-										       int                               drawable_height,
-										       int                               entire_width,
-										       int                               entire_height);
-
-/* Used to fill a drawable with a background.
- *  - entire_width/height describe the total area the background covers
- *  - buffer is a portion of that area
- */
-void                             nautilus_background_draw_to_canvas                   (NautilusBackground               *background,
-										       GnomeCanvasBuf                   *buffer,
-										       int                               entire_width,
-										       int                               entire_height);
-/* Used to fill a pixbuf with a background.
- *  - entire_width/height describe the total area the background covers
- *  - drawable_x/y/width/height describe the portion of that area the pixbuf covers
- */
-void                             nautilus_background_draw_to_pixbuf                   (NautilusBackground               *background,
-										       GdkPixbuf                        *pixbuf,
-										       int                               pixbuf_x,
-										       int                               pixbuf_y,
-										       int                               pixbuf_width,
-										       int                               pixbuf_height,
-										       int                               entire_width,
-										       int                               entire_height);
-							       
-/* Handles a dragged color being dropped on a widget to change the background color. */
-void                             nautilus_background_receive_dropped_color            (NautilusBackground               *background,
-										       GtkWidget                        *widget,
-										       int                               drop_location_x,
-										       int                               drop_location_y,
-										       const GtkSelectionData           *dropped_color);
-
-/* Handles a special-case image name that means "reset to default background" too. */
-void                             nautilus_background_receive_dropped_background_image (NautilusBackground               *background,
-										       const char                       *image_uri);
-
-/* Gets or creates a background so that it's attached to a widget. */
-NautilusBackground *             nautilus_get_widget_background                       (GtkWidget                        *widget);
-
-/* Return whether a background has beed attatched to the given widget. */
-gboolean                         nautilus_widget_has_attached_background              (GtkWidget                        *widget);
-
-/* Find the background ancestor for the widget. */
-GtkWidget *                      nautilus_gtk_widget_find_background_ancestor         (GtkWidget                        *widget);
-
-/* Find out if a nautilus background is too complex for GtkStyle, so that we have to draw it ourselves */
-gboolean                         nautilus_background_is_too_complex_for_gtk_style     (NautilusBackground               *background);
-
-
-typedef struct NautilusBackgroundDetails NautilusBackgroundDetails;
-
-struct NautilusBackground
-{
-	GtkObject object;
-	NautilusBackgroundDetails *details;
-};
-
-struct NautilusBackgroundClass
-{
-	GtkObjectClass parent_class;
-
-	/* This signal is emitted whenever the background settings are
-	 * changed.
-	 */
-	void (* settings_changed) (NautilusBackground *);
-
-	/* This signal is emitted whenever the appearance of the
-	 * background has changed, like when the background settings are
-	 * altered or when an image is loaded.
-	 */
-	void (* appearance_changed) (NautilusBackground *);
-
-	/* This signal is emitted when image loading is over - whether it
-	 * was successfully loaded or not.
-	 */
-	void (* image_loading_done) (NautilusBackground *background, gboolean successful_load);
-
-	/* This signal is emitted when the background is reset by receiving
-	   the reset property from a drag
-	 */
-	void (* reset) (NautilusBackground *);
-
-};
-
-#endif /* NAUTILUS_BACKGROUND_H */
diff --git a/libnautilus-extensions/nautilus-bonobo-extensions.c b/libnautilus-extensions/nautilus-bonobo-extensions.c
index 1d301d6e9..84f5c4536 100644
--- a/libnautilus-extensions/nautilus-bonobo-extensions.c
+++ b/libnautilus-extensions/nautilus-bonobo-extensions.c
@@ -28,7 +28,7 @@
 #include <config.h>
 #include "nautilus-bonobo-extensions.h"
 
-#include "nautilus-string.h"
+#include <eel/eel-string.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <gtk/gtkmain.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
@@ -403,7 +403,7 @@ nautilus_bonobo_set_label_for_menu_item_and_command (BonoboUIComponent *ui,
 {
 	char *label_no_underscore;
 
-	label_no_underscore = nautilus_str_strip_chr (label_with_underscore, '_');
+	label_no_underscore = eel_str_strip_chr (label_with_underscore, '_');
 	nautilus_bonobo_set_label (ui,
 				   menu_item_path,
 				   label_with_underscore);
diff --git a/libnautilus-extensions/nautilus-bonobo-extensions.h b/libnautilus-extensions/nautilus-bonobo-extensions.h
index 57ed6db2f..a39dc561d 100644
--- a/libnautilus-extensions/nautilus-bonobo-extensions.h
+++ b/libnautilus-extensions/nautilus-bonobo-extensions.h
@@ -97,10 +97,10 @@ void                            nautilus_bonobo_activate_cancel
 
 /* This macro is a copy of BONOBO_X_TYPE_FUNC_FULL (from bonobo-xobject.h)
  * with the addition of support for the parent_class which is defined by
- * NAUTILUS_DEFINE_CLASS_BOILERPLATE and used by NAUTILUS_CALL_PARENT.
+ * EEL_DEFINE_CLASS_BOILERPLATE and used by EEL_CALL_PARENT.
  * 
  * Note: the argument order matches BONOBO_X_TYPE_FUNC_FULL which is different
- * than NAUTILUS_DEFINE_CLASS_BOILERPLATE.
+ * than EEL_DEFINE_CLASS_BOILERPLATE.
  */
 #define NAUTILUS_BONOBO_X_BOILERPLATE(class_name, corba_name, parent, prefix) \
 static gpointer parent_class;                          /* Nautilus change */  \
diff --git a/libnautilus-extensions/nautilus-bookmark.c b/libnautilus-extensions/nautilus-bookmark.c
index e47be70f0..02d69c176 100644
--- a/libnautilus-extensions/nautilus-bookmark.c
+++ b/libnautilus-extensions/nautilus-bookmark.c
@@ -25,9 +25,9 @@
 #include <config.h>
 #include "nautilus-bookmark.h"
 
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 #include "nautilus-icon-factory.h"
-#include "nautilus-string.h"
+#include <eel/eel-string.h>
 #include <gtk/gtkaccellabel.h>
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-defs.h>
@@ -37,8 +37,8 @@
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 
 enum {
 	APPEARANCE_CHANGED,
@@ -65,7 +65,7 @@ static void       nautilus_bookmark_initialize_class      (NautilusBookmarkClass
 static void       nautilus_bookmark_initialize            (NautilusBookmark      *bookmark);
 static GtkWidget *create_pixmap_widget_for_bookmark       (NautilusBookmark 	 *bookmark);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusBookmark, nautilus_bookmark, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusBookmark, nautilus_bookmark, GTK_TYPE_OBJECT)
 
 /* GtkObject methods.  */
 
@@ -85,7 +85,7 @@ nautilus_bookmark_destroy (GtkObject *object)
 	g_free (bookmark->details);
 
 	/* Chain up */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* Initialization.  */
@@ -218,7 +218,7 @@ nautilus_bookmark_get_pixmap_and_mask (NautilusBookmark *bookmark,
 		return FALSE;
 	}
 
-	gdk_pixbuf_render_pixmap_and_mask (pixbuf, pixmap_return, mask_return, NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
+	gdk_pixbuf_render_pixmap_and_mask (pixbuf, pixmap_return, mask_return, EEL_STANDARD_ALPHA_THRESHHOLD);
 	gdk_pixbuf_unref (pixbuf);
 
 	return TRUE;
@@ -240,7 +240,7 @@ nautilus_bookmark_get_pixbuf (NautilusBookmark *bookmark,
 	
 	result = nautilus_icon_factory_get_pixbuf_for_icon
 		(icon, icon_size, icon_size, icon_size, icon_size, NULL, TRUE);
-	nautilus_scalable_icon_unref (icon);
+	eel_scalable_icon_unref (icon);
 	
 	return result;
 }
@@ -254,7 +254,7 @@ nautilus_bookmark_get_icon (NautilusBookmark *bookmark)
 	nautilus_bookmark_connect_file (bookmark);
 
 	if (bookmark->details->icon != NULL) {
-		nautilus_scalable_icon_ref (bookmark->details->icon);
+		eel_scalable_icon_ref (bookmark->details->icon);
 	}
 	return bookmark->details->icon;
 }
@@ -311,18 +311,18 @@ nautilus_bookmark_icon_is_different (NautilusBookmark *bookmark,
 	g_assert (new_icon != NULL);
 
 	/* Bookmarks only care about the uri and name. */
-	nautilus_scalable_icon_get_text_pieces 
+	eel_scalable_icon_get_text_pieces 
 		(new_icon, &new_uri, &new_name, NULL, NULL);
 
 	if (bookmark->details->icon == NULL) {
-		result = !nautilus_str_is_empty (new_uri)
-			|| !nautilus_str_is_empty (new_name);
+		result = !eel_str_is_empty (new_uri)
+			|| !eel_str_is_empty (new_name);
 	} else {
-		nautilus_scalable_icon_get_text_pieces 
+		eel_scalable_icon_get_text_pieces 
 			(bookmark->details->icon, &old_uri, &old_name, NULL, NULL);
 
-		result = nautilus_strcmp (old_uri, new_uri) != 0
-			|| nautilus_strcmp (old_name, new_name) != 0;
+		result = eel_strcmp (old_uri, new_uri) != 0
+			|| eel_strcmp (old_name, new_name) != 0;
 
 		g_free (old_uri);
 		g_free (old_name);
@@ -354,12 +354,12 @@ nautilus_bookmark_update_icon (NautilusBookmark *bookmark)
 								    NULL, FALSE);
 		if (nautilus_bookmark_icon_is_different (bookmark, new_icon)) {
 			if (bookmark->details->icon != NULL) {
-				nautilus_scalable_icon_unref (bookmark->details->icon);
+				eel_scalable_icon_unref (bookmark->details->icon);
 			}
 			bookmark->details->icon = new_icon;
 			return TRUE;
 		}
-		nautilus_scalable_icon_unref (new_icon);
+		eel_scalable_icon_unref (new_icon);
 	}
 
 	return FALSE;
@@ -426,7 +426,7 @@ nautilus_bookmark_set_icon_to_default (NautilusBookmark *bookmark)
 	const char *icon_name;
 
 	if (bookmark->details->icon != NULL) {
-		nautilus_scalable_icon_unref (bookmark->details->icon);
+		eel_scalable_icon_unref (bookmark->details->icon);
 	}
 
 	if (nautilus_bookmark_uri_known_not_to_exist (bookmark)) {
@@ -434,7 +434,7 @@ nautilus_bookmark_set_icon_to_default (NautilusBookmark *bookmark)
 	} else {
 		icon_name = GENERIC_BOOKMARK_ICON_NAME;
 	}
-	bookmark->details->icon = nautilus_scalable_icon_new_from_text_pieces 
+	bookmark->details->icon = eel_scalable_icon_new_from_text_pieces 
 		(NULL, icon_name, NULL, NULL, FALSE);
 }
 
@@ -472,7 +472,7 @@ nautilus_bookmark_disconnect_file (NautilusBookmark *bookmark)
 	}
 
 	if (bookmark->details->icon != NULL) {
-		nautilus_scalable_icon_unref (bookmark->details->icon);
+		eel_scalable_icon_unref (bookmark->details->icon);
 		bookmark->details->icon = NULL;
 	}
 }
@@ -520,7 +520,7 @@ nautilus_bookmark_new_with_icon (const char *uri, const char *name,
 	new_bookmark->details->uri = g_strdup (uri);
 
 	if (icon != NULL) {
-		nautilus_scalable_icon_ref (icon);
+		eel_scalable_icon_ref (icon);
 	}
 	new_bookmark->details->icon = icon;
 
@@ -572,7 +572,7 @@ nautilus_bookmark_menu_item_new (NautilusBookmark *bookmark)
 		gtk_widget_show (pixmap_widget);
 		gtk_pixmap_menu_item_set_pixmap (GTK_PIXMAP_MENU_ITEM (menu_item), pixmap_widget);
 	}
-	display_name = nautilus_truncate_text_for_menu_item (bookmark->details->name);
+	display_name = eel_truncate_text_for_menu_item (bookmark->details->name);
 	label = gtk_label_new (display_name);
 	g_free (display_name);
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
diff --git a/libnautilus-extensions/nautilus-caption-table.c b/libnautilus-extensions/nautilus-caption-table.c
deleted file mode 100644
index f4678b26f..000000000
--- a/libnautilus-extensions/nautilus-caption-table.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-caption-table.c - An easy way to do tables of aligned captions.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-caption-table.h"
-
-#include <gtk/gtkentry.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include "nautilus-gtk-macros.h"
-
-struct _NautilusCaptionTableDetail
-{
-	GtkWidget	**labels;
-	GtkWidget	**entries;
-	guint		num_rows;
-	guint		size;
-};
-
-enum
-{
-	ACTIVATE,
-	LAST_SIGNAL
-};
-
-/* NautilusCaptionTableClass methods */
-static void       nautilus_caption_table_initialize_class (NautilusCaptionTableClass *klass);
-static void       nautilus_caption_table_initialize       (NautilusCaptionTable      *caption_table);
-
-/* GtkObjectClass methods */
-static void       caption_table_destroy                   (GtkObject                 *object);
-
-/* Private methods */
-static GtkWidget* caption_table_find_next_sensitive_entry (NautilusCaptionTable      *caption_table,
-							   guint                      index);
-static int        caption_table_index_of_entry            (NautilusCaptionTable      *caption_table,
-							   GtkWidget                 *entry);
-
-/* Entry callbacks */
-static void       entry_activate                          (GtkWidget                 *widget,
-							   gpointer                   data);
-
-/* Boilerplate stuff */
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusCaptionTable,
-				   nautilus_caption_table,
-				   GTK_TYPE_TABLE)
-
-static int caption_table_signals[LAST_SIGNAL] = { 0 };
-
-static void
-nautilus_caption_table_initialize_class (NautilusCaptionTableClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	
-	object_class = GTK_OBJECT_CLASS (klass);
-	widget_class = GTK_WIDGET_CLASS (klass);
-
-	caption_table_signals[ACTIVATE] =
-		gtk_signal_new ("activate",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (NautilusCaptionTableClass, activate),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-	
-	gtk_object_class_add_signals (object_class, caption_table_signals, LAST_SIGNAL);
-	
-	/* GtkObjectClass */
-	object_class->destroy = caption_table_destroy;
-}
-
-#define CAPTION_TABLE_DEFAULT_ROWS 1
-
-static void
-nautilus_caption_table_initialize (NautilusCaptionTable *caption_table)
-{
-	GtkTable *table = GTK_TABLE (caption_table);
-
-	caption_table->detail = g_new (NautilusCaptionTableDetail, 1);
-
-	caption_table->detail->num_rows = 0;
-
-	caption_table->detail->size = 0;
-
-	caption_table->detail->labels = NULL;
-	caption_table->detail->entries = NULL;
-
-	table->homogeneous = FALSE;
-}
-
-/* GtkObjectClass methods */
-static void
-caption_table_destroy (GtkObject *object)
-{
-	NautilusCaptionTable *caption_table;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (NAUTILUS_IS_CAPTION_TABLE (object));
-	
-	caption_table = NAUTILUS_CAPTION_TABLE (object);
-
-	if (caption_table->detail->labels)
-		g_free(caption_table->detail->labels);
-
-	if (caption_table->detail->entries)
-		g_free(caption_table->detail->entries);
-
-	g_free (caption_table->detail);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-void
-nautilus_caption_table_resize (NautilusCaptionTable	*caption_table,
-			       guint			num_rows)
-{
-	GtkTable* table = NULL;
-
-	g_return_if_fail (caption_table != NULL);
-	g_return_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table));
-
-	/* Make sure the num_rows have changed */
-	if (caption_table->detail->num_rows == num_rows)
-		return;
-
-	caption_table->detail->num_rows = num_rows;
-
-	/* Resize the GtkTable */
-	table = GTK_TABLE (caption_table);
-	gtk_table_resize(table, caption_table->detail->num_rows, 2);
-
-	/* Create more label/entry pairs if needed */
-	if (caption_table->detail->num_rows > caption_table->detail->size)
-	{
-		guint i;
-		guint old_size = caption_table->detail->size;
-		guint new_size = caption_table->detail->num_rows;
-		guint realloc_size = sizeof(GtkWidget *) * new_size;
-		
-		/* FIXME bugzilla.eazel.com 680: Use a GList for this */
-		caption_table->detail->labels = (GtkWidget**) g_realloc (caption_table->detail->labels,
-									 realloc_size);
-
-		caption_table->detail->entries = (GtkWidget**) g_realloc (caption_table->detail->entries,
-									  realloc_size);
-		
-		for (i = old_size; i < new_size; i++)
-		{
-			caption_table->detail->labels[i] = gtk_label_new("");
-			caption_table->detail->entries[i] = gtk_entry_new();
-			
-			gtk_signal_connect(GTK_OBJECT (caption_table->detail->entries[i]),
-					   "activate",
-					   GTK_SIGNAL_FUNC (entry_activate),
-					   (gpointer) caption_table);
-
-			gtk_misc_set_alignment (GTK_MISC (caption_table->detail->labels[i]), 1.0, 0.5);
-
-			/* Column 1 */
-			gtk_table_attach (table,
-					  caption_table->detail->labels[i],	/* child */
-					  0,					/* left_attatch */
-					  1,					/* right_attatch */
-					  i,					/* top_attatch */
-					  i + 1,				/* bottom_attatch */
-					  GTK_FILL,				/* xoptions */
-					  (GTK_FILL|GTK_EXPAND),		/* yoptions */
-					  0,					/* xpadding */
-					  0);					/* ypadding */
-			
-			/* Column 2 */
-			gtk_table_attach (table, 
-					  caption_table->detail->entries[i],	/* child */
-					  1,					/* left_attatch */
-					  2,					/* right_attatch */
-					  i,					/* top_attatch */
-					  i + 1,				/* bottom_attatch */
-					  (GTK_FILL|GTK_EXPAND),		/* xoptions */
-					  (GTK_FILL|GTK_EXPAND),		/* yoptions */
-					  0,					/* xpadding */
-					  0);					/* ypadding */
-		}
-
-		caption_table->detail->size = new_size;
-	}
-
-	/* Show only the needed caption widgets */
-	if (caption_table->detail->size > 0)
-	{
-		guint i;
-
-		for(i = 0; i < caption_table->detail->size; i++)
-		{
-			if (i < caption_table->detail->num_rows)
-			{
-				gtk_widget_show (caption_table->detail->labels[i]);
-				gtk_widget_show (caption_table->detail->entries[i]);
-			}
-			else
-			{
-				gtk_widget_hide (caption_table->detail->labels[i]);
-				gtk_widget_hide (caption_table->detail->entries[i]);
-			}
-		}
-	}
-
-	/* Set inter row spacing */
-	if (caption_table->detail->num_rows > 1)
-	{
-		guint i;
-
-		for(i = 0; i < (caption_table->detail->num_rows - 1); i++)
-			gtk_table_set_row_spacing (GTK_TABLE (table), i, 10);
-	}
-}
-
-static int
-caption_table_index_of_entry (NautilusCaptionTable *caption_table,
-			      GtkWidget* entry)
-{
-	guint i;
-
-	g_return_val_if_fail (caption_table != NULL, -1);
-	g_return_val_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table), -1);
-
-	for(i = 0; i < caption_table->detail->num_rows; i++)
-		if (caption_table->detail->entries[i] == entry)
-			return i;
-
-	return -1;
-}
-
-static GtkWidget*
-caption_table_find_next_sensitive_entry (NautilusCaptionTable	*caption_table,
-					 guint			index)
-{
-	guint i;
-
-	g_return_val_if_fail (caption_table != NULL, NULL);
-	g_return_val_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table), NULL);
-
-	for(i = index; i < caption_table->detail->num_rows; i++)
-		if (GTK_WIDGET_SENSITIVE (caption_table->detail->entries[i]))
-			return caption_table->detail->entries[i];
-
-	return NULL;
-}
-
-static void
-entry_activate (GtkWidget *widget, gpointer data)
-{
-	NautilusCaptionTable *caption_table = NAUTILUS_CAPTION_TABLE (data);
-	int index;
-	
-	g_return_if_fail (caption_table != NULL);
-	g_return_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table));
-	
-	index = caption_table_index_of_entry (caption_table, widget);
-	
-	/* Check for an invalid index */
-	if (index == -1) {
-		return;
-	}
-
-	/* Check for the last index */
-	if (index < (int) caption_table->detail->num_rows) {
-		/* Look for the next sensitive entry */
-		GtkWidget *sensitive_entry = 
-			caption_table_find_next_sensitive_entry (caption_table, index + 1);
-		
-		/* Make the next sensitive entry take focus */
-		if (sensitive_entry) {
-			gtk_widget_grab_focus (sensitive_entry);
-		}
-	}
-	
-	/* Emit the activate signal */
-	gtk_signal_emit (GTK_OBJECT (caption_table), 
-			 caption_table_signals[ACTIVATE], 
-			 index);
-}
-
-/* Public methods */
-GtkWidget*
-nautilus_caption_table_new (guint num_rows)
-{
-	GtkWidget *widget;
-
-	if (num_rows == 0) {
-		num_rows = 1;
-	}
-
-	widget = gtk_widget_new (nautilus_caption_table_get_type(), NULL);
-
-	nautilus_caption_table_resize (NAUTILUS_CAPTION_TABLE (widget), num_rows);
-	gtk_table_set_col_spacing (GTK_TABLE (widget), 0, 10);
-
-	return widget;
-}
-
-void
-nautilus_caption_table_set_row_info (NautilusCaptionTable *caption_table,
-				     guint row,
-				     const char* label_text,
-				     const char* entry_text,
-				     gboolean entry_visibility,
-				     gboolean entry_readonly)
-{
-	g_return_if_fail (caption_table != NULL);
-	g_return_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table));
-	g_return_if_fail (row < caption_table->detail->num_rows);
-
-	gtk_label_set_text (GTK_LABEL (caption_table->detail->labels[row]), label_text);
-
-	gtk_entry_set_text (GTK_ENTRY (caption_table->detail->entries[row]), entry_text);
-	gtk_entry_set_visibility (GTK_ENTRY (caption_table->detail->entries[row]), entry_visibility);
-	gtk_widget_set_sensitive (caption_table->detail->entries[row], !entry_readonly);
-}
-
-void
-nautilus_caption_table_set_entry_text (NautilusCaptionTable *caption_table,
-				       guint row,
-				       const char* entry_text)
-{
-	g_return_if_fail (caption_table != NULL);
-	g_return_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table));
-	g_return_if_fail (row < caption_table->detail->num_rows);
-
-	gtk_entry_set_text (GTK_ENTRY (caption_table->detail->entries[row]), entry_text);
-}
-
-void
-nautilus_caption_table_set_entry_readonly (NautilusCaptionTable *caption_table,
-					   guint row,
-					   gboolean readonly)
-{
-	g_return_if_fail (caption_table != NULL);
-	g_return_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table));
-	g_return_if_fail (row < caption_table->detail->num_rows);
-	
-	gtk_widget_set_sensitive (caption_table->detail->entries[row], !readonly);
-}
-
-void
-nautilus_caption_table_entry_grab_focus (NautilusCaptionTable *caption_table, guint row)
-{
-	g_return_if_fail (caption_table != NULL);
-	g_return_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table));
-	g_return_if_fail (row < caption_table->detail->num_rows);
-
-	if (GTK_WIDGET_SENSITIVE (caption_table->detail->entries[row]))
-		gtk_widget_grab_focus (caption_table->detail->entries[row]);
-}
-
-char*
-nautilus_caption_table_get_entry_text (NautilusCaptionTable *caption_table, guint row)
-{
-	char *text;
-
-	g_return_val_if_fail (caption_table != NULL, NULL);
-	g_return_val_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table), NULL);
-	g_return_val_if_fail (row < caption_table->detail->num_rows, NULL);
-
-	text = gtk_entry_get_text (GTK_ENTRY (caption_table->detail->entries[row]));
-
-	return g_strdup (text);
-}
-
-guint
-nautilus_caption_table_get_num_rows (NautilusCaptionTable *caption_table)
-{
-	g_return_val_if_fail (caption_table != NULL, 0);
-	g_return_val_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table), 0);
-
-	return caption_table->detail->num_rows;
-}
diff --git a/libnautilus-extensions/nautilus-caption-table.h b/libnautilus-extensions/nautilus-caption-table.h
deleted file mode 100644
index 612fe029e..000000000
--- a/libnautilus-extensions/nautilus-caption-table.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-caption-table.h - An easy way to do tables of aligned captions.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_CAPTION_TABLE_H
-#define NAUTILUS_CAPTION_TABLE_H
-
-#include <gtk/gtktable.h>
-#include <libgnome/gnome-defs.h>
-
-/*
- * NautilusCaptionTable is a GtkTable sublass that allows you to painlessly
- * create tables of nicely aligned captions.
- */
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_CAPTION_TABLE			(nautilus_caption_table_get_type ())
-#define NAUTILUS_CAPTION_TABLE(obj)		(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_CAPTION_TABLE, NautilusCaptionTable))
-#define NAUTILUS_CAPTION_TABLE_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CAPTION_TABLE, NautilusCaptionTableClass))
-#define NAUTILUS_IS_CAPTION_TABLE(obj)		(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_CAPTION_TABLE))
-#define NAUTILUS_IS_CAPTION_TABLE_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_CAPTION_TABLE))
-
-
-typedef struct _NautilusCaptionTable		NautilusCaptionTable;
-typedef struct _NautilusCaptionTableClass	NautilusCaptionTableClass;
-typedef struct _NautilusCaptionTableDetail	NautilusCaptionTableDetail;
-
-struct _NautilusCaptionTable
-{
-	GtkTable table;
-
-	NautilusCaptionTableDetail *detail;
-};
-
-struct _NautilusCaptionTableClass
-{
-	GtkTableClass parent_class;
-
-	void (*activate) (GtkWidget *caption_table, guint active_entry);
-};
-
-GtkType    nautilus_caption_table_get_type           (void);
-GtkWidget* nautilus_caption_table_new                (guint                 num_rows);
-void       nautilus_caption_table_set_row_info       (NautilusCaptionTable *caption_table,
-						      guint                 row,
-						      const char           *label_text,
-						      const char           *entry_text,
-						      gboolean              entry_visibility,
-						      gboolean              entry_readonly);
-void       nautilus_caption_table_set_entry_text     (NautilusCaptionTable *caption_table,
-						      guint                 row,
-						      const char           *entry_text);
-void       nautilus_caption_table_set_entry_readonly (NautilusCaptionTable *caption_table,
-						      guint                 row,
-						      gboolean              readonly);
-void       nautilus_caption_table_entry_grab_focus   (NautilusCaptionTable *caption_table,
-						      guint                 row);
-char*      nautilus_caption_table_get_entry_text     (NautilusCaptionTable *caption_table,
-						      guint                 row);
-guint      nautilus_caption_table_get_num_rows       (NautilusCaptionTable *caption_table);
-void       nautilus_caption_table_resize             (NautilusCaptionTable *caption_table,
-						      guint                 num_rows);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_CAPTION_TABLE_H */
-
-
diff --git a/libnautilus-extensions/nautilus-caption.c b/libnautilus-extensions/nautilus-caption.c
deleted file mode 100644
index 141ce92ea..000000000
--- a/libnautilus-extensions/nautilus-caption.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-caption.c - A captioned text widget
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-caption.h"
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-
-static const gint CAPTION_INVALID = -1;
-static const gint CAPTION_SPACING = 10;
-
-struct _NautilusCaptionDetail
-{
-	GtkWidget *title_label;
-	GtkWidget *child;
-	gboolean show_title;
-};
-
-/* NautilusCaptionClass methods */
-static void      nautilus_caption_initialize_class (NautilusCaptionClass *klass);
-static void      nautilus_caption_initialize       (NautilusCaption      *caption);
-
-/* GtkObjectClass methods */
-static void nautilus_caption_destroy      (GtkObject       *object);
-static void nautilus_font_picker_show_all (GtkWidget       *widget);
-static void update_title                  (NautilusCaption *caption);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusCaption, nautilus_caption, GTK_TYPE_HBOX)
-
-/*
- * NautilusCaptionClass methods
- */
-static void
-nautilus_caption_initialize_class (NautilusCaptionClass *caption_class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	
-	object_class = GTK_OBJECT_CLASS (caption_class);
-	widget_class = GTK_WIDGET_CLASS (caption_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_caption_destroy;
-
-	/* GtkWidgetClass */
-	widget_class->show_all = nautilus_font_picker_show_all;
-}
-
-static void
-nautilus_caption_initialize (NautilusCaption *caption)
-{
-	caption->detail = g_new0 (NautilusCaptionDetail, 1);
-
-	gtk_box_set_homogeneous (GTK_BOX (caption), FALSE);
-	gtk_box_set_spacing (GTK_BOX (caption), CAPTION_SPACING);
-
-	caption->detail->show_title = TRUE;
-	caption->detail->title_label = gtk_label_new ("Title Label:");
-	caption->detail->child = NULL;
-
-	gtk_box_pack_start (GTK_BOX (caption),
-			    caption->detail->title_label,
-			    FALSE,	/* expand */
-			    TRUE,	/* fill */
-			    0);		/* padding */
-
-	gtk_widget_show (caption->detail->title_label);
-}
-
-/*
- * GtkObjectClass methods
- */
-static void
-nautilus_caption_destroy (GtkObject* object)
-{
-	NautilusCaption * caption;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (NAUTILUS_IS_CAPTION (object));
-	
-	caption = NAUTILUS_CAPTION (object);
-
-	g_free (caption->detail);
-
-	/* Chain */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_font_picker_show_all (GtkWidget *widget)
-{
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, show_all, (widget));
-
-	/* Now update the title visibility */
-	update_title (NAUTILUS_CAPTION (widget));
-}
-
-static void
-update_title (NautilusCaption	*caption)
-{
-	g_return_if_fail (NAUTILUS_IS_CAPTION (caption));
-
-	if (caption->detail->show_title) {
-		gtk_widget_show (caption->detail->title_label);
-	}
-	else {
-		gtk_widget_hide (caption->detail->title_label);
-	}
-}
-
-/*
- * NautilusCaption public methods
- */
-GtkWidget *
-nautilus_caption_new (void)
-{
-	return gtk_widget_new (nautilus_caption_get_type (), NULL);
-}
-
-/**
- * nautilus_caption_set_title_label:
- * @caption: A NautilusCaption
- * @title_label: The title label
- *
- */
-void
-nautilus_caption_set_title_label (NautilusCaption		*caption,
-				  const char			*title_label)
-{
-	g_return_if_fail (NAUTILUS_IS_CAPTION (caption));
-	g_return_if_fail (title_label != NULL);
-
-	gtk_label_set_text (GTK_LABEL (caption->detail->title_label), title_label);
-}
-
-/**
- * nautilus_caption_set_show_title:
- * @caption: A NautilusCaption
- * @show_title: Whether to show the title or not
- *
- */
-void
-nautilus_caption_set_show_title (NautilusCaption	*caption,
-				 gboolean		show_title)
-				 {
-	g_return_if_fail (NAUTILUS_IS_CAPTION (caption));
-
-	if (caption->detail->show_title == show_title) {
-		return;
-	}
-
-	caption->detail->show_title = show_title;
-
-	update_title (caption);
-}
-
-/**
- * nautilus_caption_get_title_label:
- * @caption: A NautilusCaption
- *
- * Returns: A newly allocated copy of the title label.
- */
-char *
-nautilus_caption_get_title_label (const NautilusCaption *caption)
-{
-	gchar *str;
-
-	g_return_val_if_fail (NAUTILUS_IS_CAPTION (caption), NULL);
-
-	/* DANGER! DANGER!
-	 * 
-	 * gtk_label_get () does not strdup the result.
-	 */
-	gtk_label_get (GTK_LABEL (caption->detail->title_label), &str);
-
-	return str ? g_strdup (str) : NULL;
-}
-
-/**
- * nautilus_caption_get_title_label_width:
- * @caption: A NautilusCaption
- *
- * Returns: A width of the title label.
- */
-int
-nautilus_caption_get_title_label_width (const NautilusCaption *caption)
-{
-	NautilusDimensions title_dimensions;
-	
-	g_return_val_if_fail (NAUTILUS_IS_CAPTION (caption), 0);
-	
-	title_dimensions = nautilus_gtk_widget_get_preferred_dimensions (caption->detail->title_label);
-	
-	return title_dimensions.width;
-}
-
-/**
- * nautilus_caption_set_child
- * @caption: A NautilusCaption
- * @child: A GtkWidget to become the caption's one and only child.
- * @expand: Same as GtkBox.
- * @fill: Same as GtkBox.
- *
- * Install a widget as the one and only child of the caption.
- */
-void
-nautilus_caption_set_child (NautilusCaption *caption,
-			    GtkWidget *child,
-			    gboolean expand,
-			    gboolean fill)
-{
-	g_return_if_fail (NAUTILUS_IS_CAPTION (caption));
-	g_return_if_fail (GTK_IS_WIDGET (child));
-	g_return_if_fail (caption->detail->child == NULL);
-
-	caption->detail->child = child;
-	
-	gtk_box_pack_start (GTK_BOX (caption),
-			    caption->detail->child,
-			    expand,	/* expand */
-			    fill,	/* fill */
-			    0);	        /* padding */
-	
-	gtk_widget_show (caption->detail->child);
-}
-
-/**
- * nautilus_caption_set_extra_spacing
- * @caption: A NautilusCaption
- * @spacing: Extra spacing in pixels between the title and the child,
- * beyond the nominal amount
- *
- * Set the amount of extra spacing between the title label and the 
- * caption's one and only child.
- */
-void
-nautilus_caption_set_extra_spacing (NautilusCaption *caption,
-			      	    int extra_spacing)
-{
-	g_return_if_fail (NAUTILUS_IS_CAPTION (caption));
-	g_return_if_fail (extra_spacing >= 0);
-
-	gtk_box_set_spacing (GTK_BOX (caption), 
-			     CAPTION_SPACING + extra_spacing);
-}
diff --git a/libnautilus-extensions/nautilus-caption.h b/libnautilus-extensions/nautilus-caption.h
deleted file mode 100644
index c30a896db..000000000
--- a/libnautilus-extensions/nautilus-caption.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-caption.h - A captioned text widget
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_CAPTION_H
-#define NAUTILUS_CAPTION_H
-
-#include <gtk/gtkhbox.h>
-#include <libgnome/gnome-defs.h>
-#include <libnautilus-extensions/nautilus-string-list.h>
-
-/*
- * NautilusCaption is made up of 2 widgets. 
- *
- * [title label] [something]
- *
- */
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_CAPTION            (nautilus_caption_get_type ())
-#define NAUTILUS_CAPTION(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_CAPTION, NautilusCaption))
-#define NAUTILUS_CAPTION_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CAPTION, NautilusCaptionClass))
-#define NAUTILUS_IS_CAPTION(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_CAPTION))
-
-typedef struct _NautilusCaption		 NautilusCaption;
-typedef struct _NautilusCaptionClass	 NautilusCaptionClass;
-typedef struct _NautilusCaptionDetail	 NautilusCaptionDetail;
-
-struct _NautilusCaption
-{
-	/* Super Class */
-	GtkHBox			hbox;
-	
-	/* Private stuff */
-	NautilusCaptionDetail	*detail;
-};
-
-struct _NautilusCaptionClass
-{
-	GtkHBoxClass		parent_class;
-};
-
-GtkType    nautilus_caption_get_type              (void);
-GtkWidget* nautilus_caption_new                   (void);
-
-
-/* Title label mutator. */
-void       nautilus_caption_set_title_label       (NautilusCaption       *caption,
-						   const char            *title_label);
-void       nautilus_caption_set_show_title        (NautilusCaption       *caption,
-						   gboolean               show_title);
-
-
-/* Title label accessor. */
-char *     nautilus_caption_get_title_label       (const NautilusCaption *caption);
-
-
-/* Set the child. */
-void       nautilus_caption_set_child             (NautilusCaption       *caption,
-						   GtkWidget             *child,
-						   gboolean               expand,
-						   gboolean               fill);
-void       nautilus_caption_set_extra_spacing     (NautilusCaption       *caption,
-						   int                    extra_spacing);
-int        nautilus_caption_get_title_label_width (const NautilusCaption *caption);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_CAPTION_H */
-
-
diff --git a/libnautilus-extensions/nautilus-clickable-image.c b/libnautilus-extensions/nautilus-clickable-image.c
deleted file mode 100644
index df6f42f9a..000000000
--- a/libnautilus-extensions/nautilus-clickable-image.c
+++ /dev/null
@@ -1,660 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-clickable-image.c - A clickable image widget.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-clickable-image.h"
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-#include "nautilus-graphic-effects.h"
-
-#include <gtk/gtkmain.h>
-
-/* Arguments */
-enum
-{
-	ARG_0,
-	ARG_POINTER_INSIDE,
-};
-
-/* Signals */
-typedef enum
-{
-	CLICKED,
-	ENTER,
-	LEAVE,
-	LAST_SIGNAL
-} ImageSignal;
-
-/* Signals */
-static guint clickable_image_signals[LAST_SIGNAL] = { 0 };
-
-/* Detail member struct */
-struct _NautilusClickableImageDetails
-{
- 	gboolean pointer_inside;
-	gboolean prelight;
-
-	GdkPixbuf *pixbuf;
-	GdkPixbuf *prelight_pixbuf;
-};
-
-/* GtkObjectClass methods */
-static void nautilus_clickable_image_initialize_class (NautilusClickableImageClass *image_class);
-static void nautilus_clickable_image_initialize       (NautilusClickableImage      *image);
-static void nautilus_clickable_image_destroy          (GtkObject                   *object);
-static void nautilus_clickable_image_get_arg          (GtkObject                   *object,
-						       GtkArg                      *arg,
-						       guint                        arg_id);
-/* GtkWidgetClass methods */
-static int  nautilus_clickable_image_expose_event     (GtkWidget                   *widget,
-						       GdkEventExpose              *event);
-static void nautilus_clickable_image_realize          (GtkWidget                   *widget);
-
-/* Ancestor callbacks */
-static int  ancestor_enter_notify_event               (GtkWidget                   *widget,
-						       GdkEventCrossing            *event,
-						       gpointer                     event_data);
-static int  ancestor_leave_notify_event               (GtkWidget                   *widget,
-						       GdkEventCrossing            *event,
-						       gpointer                     event_data);
-static int  ancestor_motion_notify_event              (GtkWidget                   *widget,
-						       GdkEventMotion              *event,
-						       gpointer                     event_data);
-static int  ancestor_button_press_event               (GtkWidget                   *widget,
-						       GdkEventButton              *event,
-						       gpointer                     event_data);
-static int  ancestor_button_release_event             (GtkWidget                   *widget,
-						       GdkEventButton              *event,
-						       gpointer                     event_data);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusClickableImage, nautilus_clickable_image, NAUTILUS_TYPE_LABELED_IMAGE)
-
-/* Class init methods */
-static void
-nautilus_clickable_image_initialize_class (NautilusClickableImageClass *image_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (image_class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (image_class);
-	
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_clickable_image_destroy;
-	object_class->get_arg = nautilus_clickable_image_get_arg;
-	
- 	/* GtkWidgetClass */
- 	widget_class->expose_event = nautilus_clickable_image_expose_event;
- 	widget_class->realize = nautilus_clickable_image_realize;
-
-	/* Signals */
-	clickable_image_signals[CLICKED] = gtk_signal_new ("clicked",
-							   GTK_RUN_LAST,
-							   object_class->type,
-							   0,
-							   gtk_marshal_NONE__NONE,
-							   GTK_TYPE_NONE, 
-							   0);
-
-	clickable_image_signals[ENTER] = gtk_signal_new ("enter",
-							 GTK_RUN_LAST,
-							 object_class->type,
-							 0,
-							 gtk_marshal_NONE__NONE,
-							 GTK_TYPE_NONE, 
-							 0);
-
-	clickable_image_signals[LEAVE] = gtk_signal_new ("leave",
-							 GTK_RUN_LAST,
-							 object_class->type,
-							 0,
-							 gtk_marshal_NONE__NONE,
-							 GTK_TYPE_NONE, 
-							 0);
-
-	gtk_object_class_add_signals (object_class, clickable_image_signals, LAST_SIGNAL);
-
-	/* Arguments */
-	gtk_object_add_arg_type ("NautilusClickableImage::pointer_inside",
-				 GTK_TYPE_BOOL,
-				 GTK_ARG_READABLE,
-				 ARG_POINTER_INSIDE);
-}
-
-void
-nautilus_clickable_image_initialize (NautilusClickableImage *image)
-{
-	image->details = g_new0 (NautilusClickableImageDetails, 1);
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_clickable_image_destroy (GtkObject *object)
-{
- 	NautilusClickableImage *clickable_image;
-	
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (object));
-
-	clickable_image = NAUTILUS_CLICKABLE_IMAGE (object);
-
-	g_free (clickable_image->details);
-
-	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-static void
-nautilus_clickable_image_get_arg (GtkObject *object,
-				  GtkArg *arg,
-				  guint arg_id)
-{
-	NautilusClickableImage *clickable_image;
-
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (object));
-	
-	clickable_image = NAUTILUS_CLICKABLE_IMAGE (object);
-
- 	switch (arg_id)
-	{
-	case ARG_POINTER_INSIDE:
-		GTK_VALUE_BOOL (*arg) = clickable_image->details->pointer_inside;
-		break;
-
- 	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* GtkWidgetClass methods */
-static void
-nautilus_clickable_image_realize (GtkWidget *widget)
-{
-	NautilusClickableImage *clickable_image;
-	GtkWidget *windowed_ancestor;
-
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (widget));
-	
-	clickable_image = NAUTILUS_CLICKABLE_IMAGE (widget);
-
-	/* Chain realize */
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
-
-	windowed_ancestor = nautilus_gtk_widget_find_windowed_ancestor (widget);
-	g_assert (GTK_IS_WIDGET (windowed_ancestor));
-	
-	gtk_widget_add_events (windowed_ancestor,
-			       GDK_BUTTON_PRESS_MASK
-			       | GDK_BUTTON_RELEASE_MASK
-			       | GDK_ENTER_NOTIFY_MASK
-			       | GDK_LEAVE_NOTIFY_MASK
-			       | GDK_POINTER_MOTION_MASK);
-
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "enter_notify_event",
-						    GTK_SIGNAL_FUNC (ancestor_enter_notify_event),
-						    widget,
-						    widget);
-	
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "leave_notify_event",
-						    GTK_SIGNAL_FUNC (ancestor_leave_notify_event),
-						    widget,
-						    widget);
-	
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "motion_notify_event",
-						    GTK_SIGNAL_FUNC (ancestor_motion_notify_event),
-						    widget,
-						    widget);
-	
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "button_press_event",
-						    GTK_SIGNAL_FUNC (ancestor_button_press_event),
-						    widget,
-						    widget);
-	
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "button_release_event",
-						    GTK_SIGNAL_FUNC (ancestor_button_release_event),
-						    widget,
-						    widget);
-}
-
-static void
-label_enter (NautilusClickableImage *clickable_image)
-{
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (clickable_image));
-	
-	clickable_image->details->pointer_inside = TRUE;
-
-	if (clickable_image->details->prelight) {
-		nautilus_labeled_image_set_pixbuf (NAUTILUS_LABELED_IMAGE (clickable_image),
-						   clickable_image->details->prelight_pixbuf);
-	}
-
-	gtk_widget_set_state (GTK_WIDGET (clickable_image), GTK_STATE_PRELIGHT);
-
-	gtk_signal_emit (GTK_OBJECT (clickable_image), 
-			 clickable_image_signals[ENTER],
-			 clickable_image);
-}
-
-static void
-label_leave (NautilusClickableImage *clickable_image)
-{
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (clickable_image));
-	
-	clickable_image->details->pointer_inside = FALSE;
-
-	if (clickable_image->details->prelight) {
-		nautilus_labeled_image_set_pixbuf (NAUTILUS_LABELED_IMAGE (clickable_image),
-						   clickable_image->details->pixbuf); 
-	}
-
-	gtk_widget_set_state (GTK_WIDGET (clickable_image), GTK_STATE_NORMAL);
-
-	gtk_signal_emit (GTK_OBJECT (clickable_image), 
-			 clickable_image_signals[LEAVE],
-			 clickable_image);
-}
-
-static void
-label_handle_motion (NautilusClickableImage *clickable_image,
-		     int x,
-		     int y)
-{
-	ArtIRect bounds;
-
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (clickable_image));
-
-	bounds = nautilus_gtk_widget_get_bounds (GTK_WIDGET (clickable_image));
-	
-	if (nautilus_art_irect_contains_point (&bounds, x, y)) {
-		/* Inside */
-		if (!clickable_image->details->pointer_inside) {
-			label_enter (clickable_image);
-		}
-	} else {
-		/* Outside */
-		if (clickable_image->details->pointer_inside) {
-			label_leave (clickable_image);
-		}
-	}
-}
-
-static void
-label_handle_button_press (NautilusClickableImage *clickable_image)
-{
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (clickable_image));
-
-	gtk_widget_set_state (GTK_WIDGET (clickable_image), GTK_STATE_ACTIVE);
-	gtk_widget_queue_draw (GTK_WIDGET (clickable_image));
-}
-
-static void
-label_handle_button_release (NautilusClickableImage *clickable_image)
-{
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (clickable_image));
-
-	gtk_widget_set_state (GTK_WIDGET (clickable_image), GTK_STATE_PRELIGHT);
-	gtk_widget_queue_draw (GTK_WIDGET (clickable_image));
-
-	gtk_signal_emit (GTK_OBJECT (clickable_image), 
-			 clickable_image_signals[CLICKED],
-			 clickable_image);
-}
-
-static void
-adjust_coordinates_for_window (GdkWindow *widget_window, 
-			       GdkWindow *event_window,
-			       int *x,
-			       int *y)
-{
-	GdkWindow *window;
-	int wx, wy;
-	
-	/* Viewports place their children in a different GdkWindow
-	 * than their own widget window (perhaps other containers do
-	 * this to). Therefore if the event we got is on a different
-	 * GdkWindow than our own, adjust the coordinates.
-	 */
-
-	window = widget_window;
-
-	while (window != event_window && window != NULL) {
-		gdk_window_get_position	 (window, &wx, &wy);
-		*x -= wx;
-		*y -= wy;
-		window = gdk_window_get_parent (window);
-	}
-}
-
-static int
-ancestor_enter_notify_event (GtkWidget *widget,
-			     GdkEventCrossing *event,
-			     gpointer event_data)
-{
-	int x, y;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	x = event->x;
-	y = event->y;
-
-	adjust_coordinates_for_window (GTK_WIDGET (event_data)->window,
-				       widget->window,
-				       &x, &y);
-
-	label_handle_motion (NAUTILUS_CLICKABLE_IMAGE (event_data), x, y);
-
-	return FALSE;
-}
-
-static int
-ancestor_leave_notify_event (GtkWidget *widget,
-			     GdkEventCrossing *event,
-			     gpointer event_data)
-{
-	int x, y;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	x = event->x;
-	y = event->y;
-
-	adjust_coordinates_for_window (GTK_WIDGET (event_data)->window,
-				       widget->window,
-				       &x, &y);
-
-	label_handle_motion (NAUTILUS_CLICKABLE_IMAGE (event_data), x, y);
-
-	return FALSE;
-}
-
-static int
-ancestor_motion_notify_event (GtkWidget *widget,
-			      GdkEventMotion *event,
-			      gpointer event_data)
-{
-	int x, y;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	x = event->x;
-	y = event->y;
-
-	adjust_coordinates_for_window (GTK_WIDGET (event_data)->window,
-				       widget->window,
-				       &x, &y);
-
-	label_handle_motion (NAUTILUS_CLICKABLE_IMAGE (event_data), x, y);
-
-	return FALSE;
-}
-
-static int
-ancestor_button_press_event (GtkWidget *widget,
-			     GdkEventButton *event,
-			     gpointer event_data)
-{
-  	NautilusClickableImage *clickable_image;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
- 	clickable_image = NAUTILUS_CLICKABLE_IMAGE (event_data);
-
-	gtk_grab_add (widget);
-
-	if (clickable_image->details->pointer_inside) {
-		label_handle_button_press (NAUTILUS_CLICKABLE_IMAGE (event_data));
-	}
-
-	return FALSE;
-}
-
-static int
-ancestor_button_release_event (GtkWidget *widget,
-			       GdkEventButton *event,
-			       gpointer event_data)
-{
-  	NautilusClickableImage *clickable_image;
-	int x, y;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
- 	clickable_image = NAUTILUS_CLICKABLE_IMAGE (event_data);
-
-	gtk_grab_remove (widget);
-
-	x = event->x;
-	y = event->y;
-
-	adjust_coordinates_for_window (GTK_WIDGET (event_data)->window,
-				       widget->window,
-				       &x, &y);
-
-	label_handle_motion (NAUTILUS_CLICKABLE_IMAGE (event_data), x, y);
-
-	if (clickable_image->details->pointer_inside) {
-		label_handle_button_release (NAUTILUS_CLICKABLE_IMAGE (event_data));
-	}
-
-	return FALSE;
-}
-
-static int
-nautilus_clickable_image_expose_event (GtkWidget *widget,
-				       GdkEventExpose *event)
-{
-  	NautilusClickableImage *clickable_image;
-
-	g_return_val_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (widget), TRUE);
-	g_return_val_if_fail (event != NULL, TRUE);
-	g_return_val_if_fail (event->window == widget->window, TRUE);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
-	
- 	clickable_image = NAUTILUS_CLICKABLE_IMAGE (widget);
-
-	/* Chain expose */
-	return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
-		(GTK_WIDGET_CLASS, expose_event, (widget, event));
-}
-
-static void 
-nautilus_clickable_image_set_up_pixbufs (NautilusClickableImage *clickable_image)
-{
-	clickable_image->details->pixbuf =
-		nautilus_labeled_image_get_pixbuf (NAUTILUS_LABELED_IMAGE (clickable_image));
-
-	if (clickable_image->details->pixbuf != NULL) {
-		clickable_image->details->prelight_pixbuf = nautilus_create_spotlight_pixbuf 
-			(clickable_image->details->pixbuf);
-	}
-} 
-
-/* Public NautilusClickableImage methods */
-
-/**
- * nautilus_clickable_image_new:
- *
- * @text: Text for label or NULL.
- * @pixbuf: A GdkPixbuf to or NULL.
-
- * Create a clickable image with a solid background.
- *
- * Return value: The newly allocated NautilusClickableImage with the
- * given text and pixbuf.  Either of these two can be NULL.
- */
-GtkWidget*
-nautilus_clickable_image_new (const char *text,
-			      GdkPixbuf *pixbuf)
-{
-	NautilusClickableImage *clickable_image;
-	
-	clickable_image = NAUTILUS_CLICKABLE_IMAGE (gtk_widget_new (nautilus_clickable_image_get_type (), NULL));
-	
-	if (pixbuf != NULL) {
-		nautilus_labeled_image_set_pixbuf (NAUTILUS_LABELED_IMAGE (clickable_image), pixbuf);
-	}
-
-	if (text != NULL) {
-		nautilus_labeled_image_set_text (NAUTILUS_LABELED_IMAGE (clickable_image), text);
-	}
-
-	return GTK_WIDGET (clickable_image);
-}
-
-GtkWidget*
-nautilus_clickable_image_new_from_file_name (const char *text,
-					     const char *pixbuf_file_name)
-{
-	NautilusClickableImage *clickable_image;
-
-	g_return_val_if_fail (pixbuf_file_name != NULL, NULL);
-	
-	clickable_image = NAUTILUS_CLICKABLE_IMAGE (nautilus_clickable_image_new (text, NULL));
-	
-	nautilus_labeled_image_set_pixbuf_from_file_name (NAUTILUS_LABELED_IMAGE (clickable_image), pixbuf_file_name);
-
-	return GTK_WIDGET (clickable_image);
-}
-
-/**
- * nautilus_clickable_image_new_solid:
- *
- * @text: Text for label or NULL.
- * @pixbuf: A GdkPixbuf to or NULL.
- * @drop_shadow_offset: Drop shadow offset.
- * @drop_shadow_color: Drop shadow color.
- * @text_color: Text color.
- * @x_alignment: Horizontal alignment.
- * @y_alignmtn: Vertical alignment.
- * @x_padding: Horizontal padding.
- * @y_padding: Vertical padding.
- * @background_color: Background color.
- * @tile_pixbuf: A GdkPixbuf or NULL.
- *
- * Create a clickable image with a solid background.
- *
- * Return value: The newly allocated NautilusClickableImage with the
- * given attributes.
- */
-GtkWidget *
-nautilus_clickable_image_new_solid (const char *text,
-				    GdkPixbuf *pixbuf,
-				    guint drop_shadow_offset,
-				    guint32 drop_shadow_color,
-				    guint32 text_color,
-				    float x_alignment,
-				    float y_alignment,
-				    int x_padding,
-				    int y_padding,
-				    guint32 background_color,
-				    GdkPixbuf *tile_pixbuf)
-{
-	NautilusClickableImage *clickable_image;
-	NautilusLabeledImage *labeled_image;
-	
-	clickable_image = NAUTILUS_CLICKABLE_IMAGE (gtk_widget_new (nautilus_clickable_image_get_type (), NULL));
-
-	labeled_image = NAUTILUS_LABELED_IMAGE (clickable_image);
-
-	if (pixbuf != NULL) {
-		nautilus_labeled_image_set_pixbuf (labeled_image, pixbuf);
-	}
-
-	if (text != NULL) {
-		nautilus_labeled_image_set_text (labeled_image, text);
-	}
-
-	nautilus_labeled_image_set_background_mode (labeled_image, NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	nautilus_labeled_image_set_solid_background_color (labeled_image, background_color);
-	nautilus_labeled_image_set_smooth_drop_shadow_color (labeled_image, drop_shadow_color);
-	nautilus_labeled_image_set_smooth_drop_shadow_offset (labeled_image, drop_shadow_offset);
-	nautilus_labeled_image_set_text_color (labeled_image, text_color);
-	
-	if (tile_pixbuf != NULL) {
-			nautilus_labeled_image_set_tile_pixbuf (labeled_image, tile_pixbuf);
-	}
-
-	nautilus_labeled_image_set_x_padding (labeled_image, x_padding);
-	nautilus_labeled_image_set_y_padding (labeled_image, y_padding);
-	nautilus_labeled_image_set_x_alignment (labeled_image, x_alignment);
-	nautilus_labeled_image_set_y_alignment (labeled_image, y_alignment);
-	
-	return GTK_WIDGET (clickable_image);
-}
-
-/**
- * nautilus_clickable_image_new:
- *
- * @clickable_image: A NautilusClickableImage
- * @prelight: a gboolean specifying wether to prelight
- *
- * Enable or disable auto-prelight mode. You can't change the pixbuf
- * while prelight mode is on; as a workaround, you can turn prelight
- * off, change the pixbuf, and then turn it back on.
- * 
- */
-
-void
-nautilus_clickable_image_set_prelight (NautilusClickableImage *clickable_image,
-				       gboolean prelight)
-{
-	/* FIXME: you can't change the pixbuf with prelight mode on */
-
-	if (!clickable_image->details->prelight && prelight) {
-		nautilus_clickable_image_set_up_pixbufs (clickable_image);
-		clickable_image->details->prelight = TRUE;
-		if (clickable_image->details->pointer_inside) {
-			nautilus_labeled_image_set_pixbuf 
-				(NAUTILUS_LABELED_IMAGE (clickable_image),
-				 clickable_image->details->prelight_pixbuf);
-		}
-	}
-
-	if (clickable_image->details->prelight && !prelight) {
-		if (clickable_image->details->pointer_inside) {
-			nautilus_labeled_image_set_pixbuf 
-				(NAUTILUS_LABELED_IMAGE (clickable_image),
-				 clickable_image->details->pixbuf);
-		}
-
-		gdk_pixbuf_unref (clickable_image->details->pixbuf);
-		clickable_image->details->pixbuf = NULL;
-		gdk_pixbuf_unref (clickable_image->details->prelight_pixbuf);
-		clickable_image->details->prelight_pixbuf = NULL;
-		clickable_image->details->prelight = FALSE;
-	}
-}
diff --git a/libnautilus-extensions/nautilus-clickable-image.h b/libnautilus-extensions/nautilus-clickable-image.h
deleted file mode 100644
index 7f1eb458d..000000000
--- a/libnautilus-extensions/nautilus-clickable-image.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-clickable-image.h - A clickable image widget.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-/* NautilusClickableImage is a NautilusLabeledImage sublclass with signals
- * usful for detecting user click and prelight events.
- *
- * The following signals are provided by NautilusClickableImage:
- *
- * "clicked" - Widget was clicked
- * "enter"   - Pointer entered widget.
- * "leave"   - Pointer left widget.
- *
- * NautilusClickableImage is a NO_WINDOW widget.  It does its event detection
- * by monitoring events on the first windowed ancestor in its widget hierarchy.
- *
- * Being a NO_WINDOW widget, it will work nicely with tile_pixbufs.
- */
-
-#ifndef NAUTILUS_CLICKABLE_IMAGE_H
-#define NAUTILUS_CLICKABLE_IMAGE_H
-
-#include <libnautilus-extensions/nautilus-labeled-image.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_CLICKABLE_IMAGE            (nautilus_clickable_image_get_type ())
-#define NAUTILUS_CLICKABLE_IMAGE(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_CLICKABLE_IMAGE, NautilusClickableImage))
-#define NAUTILUS_CLICKABLE_IMAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CLICKABLE_IMAGE, NautilusClickableImageClass))
-#define NAUTILUS_IS_CLICKABLE_IMAGE(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_CLICKABLE_IMAGE))
-#define NAUTILUS_IS_CLICKABLE_IMAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_CLICKABLE_IMAGE))
-
-typedef struct _NautilusClickableImage	        NautilusClickableImage;
-typedef struct _NautilusClickableImageClass     NautilusClickableImageClass;
-typedef struct _NautilusClickableImageDetails   NautilusClickableImageDetails;
-
-struct _NautilusClickableImage
-{
-	/* Superclass */
-	NautilusLabeledImage labeled_image;
-
-	/* Private things */
-	NautilusClickableImageDetails *details;
-};
-
-struct _NautilusClickableImageClass
-{
-	NautilusLabeledImageClass parent_class;
-	
-	void (*clicked) (NautilusClickableImage *image);
-	void (*enter) (NautilusClickableImage *image);
-	void (*leave) (NautilusClickableImage *image);
-};
-
-GtkType    nautilus_clickable_image_get_type           (void);
-GtkWidget *nautilus_clickable_image_new                (const char *text,
-							GdkPixbuf  *pixbuf);
-GtkWidget *nautilus_clickable_image_new_from_file_name (const char *text,
-							const char *pixbuf_file_name);
-GtkWidget *nautilus_clickable_image_new_solid          (const char *text,
-							GdkPixbuf  *pixbuf,
-							guint       drop_shadow_offset,
-							guint32     drop_shadow_color,
-							guint32     text_color,
-							float       x_alignment,
-							float       y_alignment,
-							int         x_padding,
-							int         y_padding,
-							guint32     background_color,
-							GdkPixbuf  *tile_pixbuf);
-
-void       nautilus_clickable_image_set_prelight       (NautilusClickableImage *clickable_image,
-							gboolean prelight);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_CLICKABLE_IMAGE_H */
-
-
diff --git a/libnautilus-extensions/nautilus-ctree.c b/libnautilus-extensions/nautilus-ctree.c
index 3c64dfef7..029f04128 100644
--- a/libnautilus-extensions/nautilus-ctree.c
+++ b/libnautilus-extensions/nautilus-ctree.c
@@ -39,9 +39,9 @@
 #include <gtk/gtkbindings.h>
 #include <gtk/gtkdnd.h>
 #include <gtk/gtkmain.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-graphic-effects.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-graphic-effects.h>
+#include <eel/eel-gtk-extensions.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -1933,7 +1933,7 @@ draw_row (NautilusCList     *clist,
 		      
 		      if (src_pixbuf != NULL) {
 			      /* Create darkened pixbuf */			
-			      dark_pixbuf = nautilus_create_darkened_pixbuf (src_pixbuf,
+			      dark_pixbuf = eel_create_darkened_pixbuf (src_pixbuf,
 									     0.8 * 255,
 									     0.8 * 255);
 			      if (dark_pixbuf != NULL) {
@@ -5939,7 +5939,7 @@ nautilus_ctree_drag_begin (GtkWidget	     *widget,
 		  (NAUTILUS_CTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf;
 	  if (pixbuf)
 	    {
-	      nautilus_drag_set_icon_pixbuf (context, pixbuf, -2, -2);
+	      eel_drag_set_icon_pixbuf (context, pixbuf, -2, -2);
 	      return;
 	    }
 	}
diff --git a/libnautilus-extensions/nautilus-customization-data.c b/libnautilus-extensions/nautilus-customization-data.c
index ce14234c2..7f203e764 100644
--- a/libnautilus-extensions/nautilus-customization-data.c
+++ b/libnautilus-extensions/nautilus-customization-data.c
@@ -39,14 +39,14 @@
 #include <libgnome/gnome-defs.h>
 
 #include "nautilus-customization-data.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include "nautilus-file-utilities.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-xml-extensions.h"
-#include "nautilus-string.h"
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-xml-extensions.h>
+#include <eel/eel-string.h>
 
 typedef enum {
 	READ_PUBLIC_CUSTOMIZATIONS,
@@ -190,8 +190,8 @@ nautilus_customization_data_get_next_element_for_display (NautilusCustomizationD
 
 	g_assert (current_file_info != NULL);
 
-	if (!nautilus_istr_has_prefix (current_file_info->mime_type, "image/") ||
-	    nautilus_istr_has_prefix (current_file_info->name, ".")) {
+	if (!eel_istr_has_prefix (current_file_info->mime_type, "image/") ||
+	    eel_istr_has_prefix (current_file_info->name, ".")) {
 		
 		return nautilus_customization_data_get_next_element_for_display (data,
 										 emblem_name,
@@ -209,7 +209,7 @@ nautilus_customization_data_get_next_element_for_display (NautilusCustomizationD
 	if (!strcmp(data->customization_name, "patterns")) {
 		pixbuf = nautilus_customization_make_pattern_chit (orig_pixbuf, data->pattern_frame, FALSE);
 	} else {
-		pixbuf = nautilus_gdk_pixbuf_scale_down_to_fit (orig_pixbuf, 
+		pixbuf = eel_gdk_pixbuf_scale_down_to_fit (orig_pixbuf, 
 								data->maximum_icon_width, 
 								data->maximum_icon_height);
 		gdk_pixbuf_unref (orig_pixbuf);
@@ -223,7 +223,7 @@ nautilus_customization_data_get_next_element_for_display (NautilusCustomizationD
 	   label because anti-aliased text doesn't look right
 	   in menus */
 	if (data->data_is_for_a_menu) {
-		*label_out = nautilus_truncate_text_for_menu_item (filtered_name);
+		*label_out = eel_truncate_text_for_menu_item (filtered_name);
 	}
 	else {
 		*label_out = g_strdup (filtered_name);
@@ -257,7 +257,7 @@ nautilus_customization_data_destroy (NautilusCustomizationData *data)
 	gnome_vfs_file_info_list_free (data->private_file_list);
 
 	if (data->name_map_hash != NULL) {
-		nautilus_g_hash_table_destroy_deep (data->name_map_hash);	
+		eel_g_hash_table_destroy_deep (data->name_map_hash);	
 	}
 	
 	g_free (data->customization_name);
@@ -373,7 +373,7 @@ format_name_for_display (NautilusCustomizationData *data, const char* name)
 
 	/* don't display a name for the "reset" property, since its name is
 	   contained in its image and also to help distinguish it */  
-	if (!nautilus_strcmp(name, RESET_IMAGE_NAME)) {
+	if (!eel_strcmp(name, RESET_IMAGE_NAME)) {
 		return g_strdup("");
 	}
 
@@ -414,12 +414,12 @@ load_name_map_hash_table (NautilusCustomizationData *data)
 
 		if (browser_data) {
 			/* get the category node */
-			category_node = nautilus_xml_get_root_child_by_name_and_property (browser_data, "category", "name", data->customization_name);
+			category_node = eel_xml_get_root_child_by_name_and_property (browser_data, "category", "name", data->customization_name);
 			current_node = category_node->childs;	
 			
 			/* loop through the entries, adding a mapping to the hash table */
 			while (current_node != NULL) {
-				display_name = nautilus_xml_get_property_translated (current_node, "display_name");
+				display_name = eel_xml_get_property_translated (current_node, "display_name");
 				filename = xmlGetProp (current_node, "filename");
 				if (display_name && filename) {
 					g_hash_table_insert (data->name_map_hash, g_strdup (filename), g_strdup (display_name));
diff --git a/libnautilus-extensions/nautilus-dateedit-extensions.c b/libnautilus-extensions/nautilus-dateedit-extensions.c
index 0b0288ffd..32080e679 100644
--- a/libnautilus-extensions/nautilus-dateedit-extensions.c
+++ b/libnautilus-extensions/nautilus-dateedit-extensions.c
@@ -31,7 +31,7 @@
 #include "nautilus-dateedit-extensions.h"
 
 char *
-nautilus_gnome_date_edit_get_date_as_string (GnomeDateEdit *dateedit)
+eel_gnome_date_edit_get_date_as_string (GnomeDateEdit *dateedit)
 {
 	struct tm *time_struct;
 	time_t selected_time;
diff --git a/libnautilus-extensions/nautilus-dateedit-extensions.h b/libnautilus-extensions/nautilus-dateedit-extensions.h
index 01bc6ef66..25176491e 100644
--- a/libnautilus-extensions/nautilus-dateedit-extensions.h
+++ b/libnautilus-extensions/nautilus-dateedit-extensions.h
@@ -28,4 +28,4 @@
 #include <time.h>
 #include <libgnomeui/gnome-dateedit.h>
 
-char *      nautilus_gnome_date_edit_get_date_as_string        (GnomeDateEdit *dateedit);
+char *      eel_gnome_date_edit_get_date_as_string        (GnomeDateEdit *dateedit);
diff --git a/libnautilus-extensions/nautilus-debug-drawing.c b/libnautilus-extensions/nautilus-debug-drawing.c
deleted file mode 100644
index dcdec1548..000000000
--- a/libnautilus-extensions/nautilus-debug-drawing.c
+++ /dev/null
@@ -1,515 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-debug-drawing.c: Nautilus drawing debugging aids.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-debug-drawing.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtksignal.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-
-/*
- * PixbufViewer is a very simple "private" widget that displays
- * a GdkPixbuf.  It is used by nautilus_debug_show_pixbuf() to
- * display a pixbuf in an in process pixbuf debugging window.
- *
- * We cant use NautilusImage for this because part of the reason
- * for pixbuf debugging is to debug NautilusImage itself.
- */
-#define DEBUG_TYPE_PIXBUF_VIEWER (debug_pixbuf_viewer_get_type ())
-#define DEBUG_PIXBUF_VIEWER(obj) (GTK_CHECK_CAST ((obj), DEBUG_TYPE_PIXBUF_VIEWER, DebugPixbufViewer))
-#define DEBUG_IS_PIXBUF_VIEWER(obj) (GTK_CHECK_TYPE ((obj), DEBUG_TYPE_PIXBUF_VIEWER))
-
-typedef struct _DebugPixbufViewer DebugPixbufViewer;
-typedef struct _DebugPixbufViewerClass DebugPixbufViewerClass;
-
-GtkType     debug_pixbuf_viewer_get_type   (void);
-static void debug_pixbuf_viewer_set_pixbuf (DebugPixbufViewer *viewer,
-					    GdkPixbuf         *pixbuf);
-
-struct _DebugPixbufViewer
-{
-	GtkWidget widget;
-	GdkPixbuf *pixbuf;
-};
-
-struct _DebugPixbufViewerClass
-{
-	GtkWidgetClass parent_class;
-};
-
-/* GtkObjectClass methods */
-static void debug_pixbuf_viewer_initialize_class (DebugPixbufViewerClass *pixbuf_viewer_class);
-static void debug_pixbuf_viewer_initialize       (DebugPixbufViewer      *pixbuf_viewer);
-static void debug_pixbuf_viewer_destroy          (GtkObject              *object);
-
-/* GtkWidgetClass methods */
-static void debug_pixbuf_viewer_size_request     (GtkWidget              *widget,
-						  GtkRequisition         *requisition);
-static int  debug_pixbuf_viewer_expose_event     (GtkWidget              *widget,
-						  GdkEventExpose         *event);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (DebugPixbufViewer, debug_pixbuf_viewer, GTK_TYPE_WIDGET)
-
-static void
-debug_pixbuf_viewer_initialize_class (DebugPixbufViewerClass *pixbuf_viewer_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (pixbuf_viewer_class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (pixbuf_viewer_class);
-
-	object_class->destroy = debug_pixbuf_viewer_destroy;
-	widget_class->size_request = debug_pixbuf_viewer_size_request;
-	widget_class->expose_event = debug_pixbuf_viewer_expose_event;
-}
-
-static void
-debug_pixbuf_viewer_initialize (DebugPixbufViewer *viewer)
-{
-	GTK_WIDGET_UNSET_FLAGS (viewer, GTK_CAN_FOCUS);
-	GTK_WIDGET_SET_FLAGS (viewer, GTK_NO_WINDOW);
-}
-
-static void
-debug_pixbuf_viewer_destroy (GtkObject *object)
-{
- 	DebugPixbufViewer *viewer;
-
-	g_return_if_fail (DEBUG_IS_PIXBUF_VIEWER (object));
-
-	viewer = DEBUG_PIXBUF_VIEWER (object);
-	nautilus_gdk_pixbuf_unref_if_not_null (viewer->pixbuf);
-	viewer->pixbuf = NULL;
-
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-static void
-debug_pixbuf_viewer_size_request (GtkWidget *widget, GtkRequisition *requisition)
-{
-	DebugPixbufViewer *viewer;
-	NautilusDimensions dimensions;
-
-	g_return_if_fail (DEBUG_IS_PIXBUF_VIEWER (widget));
-	g_return_if_fail (requisition != NULL);
-	
-	viewer = DEBUG_PIXBUF_VIEWER (widget);
-
-	dimensions = (viewer->pixbuf != NULL) ?
-		nautilus_gdk_pixbuf_get_dimensions (viewer->pixbuf) :
-		NAUTILUS_DIMENSIONS_EMPTY;
-	
-   	requisition->width = MAX (2, dimensions.width);
-   	requisition->height = MAX (2, dimensions.height);
-}
-
-static int
-debug_pixbuf_viewer_expose_event (GtkWidget *widget, GdkEventExpose *event)
-{
- 	DebugPixbufViewer *viewer;
-	ArtIRect clipped_dirty_area;
-	ArtIRect dirty_area;
-	ArtIRect bounds;
-
-	g_return_val_if_fail (DEBUG_IS_PIXBUF_VIEWER (widget), TRUE);
-	g_return_val_if_fail (event != NULL, TRUE);
-	g_return_val_if_fail (event->window == widget->window, TRUE);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
-	
- 	viewer = DEBUG_PIXBUF_VIEWER (widget);
-
-	if (viewer->pixbuf == NULL) {
-		return TRUE;
-	}
-	
-	bounds.x0 = widget->allocation.x + (widget->allocation.width - gdk_pixbuf_get_width (viewer->pixbuf)) / 2;
-	bounds.y0 = widget->allocation.y + (widget->allocation.height - gdk_pixbuf_get_height (viewer->pixbuf)) / 2;
-	bounds.x1 = bounds.x0 + gdk_pixbuf_get_width (viewer->pixbuf);
-	bounds.y1 = bounds.y0 + gdk_pixbuf_get_height (viewer->pixbuf);
-	
-	/* Clip the dirty area to the screen; bail if no work to do */
-	dirty_area = nautilus_gdk_rectangle_to_art_irect (&event->area);
-	clipped_dirty_area = nautilus_gdk_window_clip_dirty_area_to_screen (event->window,
-										  &dirty_area);
-	if (!art_irect_empty (&clipped_dirty_area)) {
-		ArtIRect clipped_bounds;
-
-		art_irect_intersect (&clipped_bounds, &bounds, &clipped_dirty_area);
-
-		if (!art_irect_empty (&clipped_bounds)) {
-			g_assert (clipped_bounds.x0 >= bounds.x0);
-			g_assert (clipped_bounds.y0 >= bounds.y0);
-			
-			nautilus_gdk_pixbuf_draw_to_drawable (viewer->pixbuf,
-							      event->window,
-							      widget->style->white_gc,
-							      clipped_bounds.x0 - bounds.x0,
-							      clipped_bounds.y0 - bounds.y0,
-							      &clipped_bounds,
-							      GDK_RGB_DITHER_NONE,
-							      GDK_PIXBUF_ALPHA_BILEVEL,
-							      NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
-		}
-	}
-
-	bounds.x0 -= 1;
-	bounds.y0 -= 1;
-	bounds.x1 += 1;
-	bounds.y1 += 1;
-
-	return TRUE;
-}
-
-static void
-debug_pixbuf_viewer_set_pixbuf (DebugPixbufViewer *viewer, GdkPixbuf *pixbuf)
-{
-	g_return_if_fail (DEBUG_IS_PIXBUF_VIEWER (viewer));
-	
-	if (pixbuf != viewer->pixbuf) {
-		nautilus_gdk_pixbuf_unref_if_not_null (viewer->pixbuf);
-		nautilus_gdk_pixbuf_ref_if_not_null (pixbuf);
-		viewer->pixbuf = pixbuf;
-		gtk_widget_queue_resize (GTK_WIDGET (viewer));
-	}
-}
-
-/**
- * nautilus_debug_draw_rectangle_and_cross:
- * @rectangle: Rectangle bounding the rectangle.
- * @color: Color to use for the rectangle and cross.
- *
- * Draw a rectangle and cross.  Useful for debugging exposure events.
- */
-void
-nautilus_debug_draw_rectangle_and_cross (GdkDrawable *drawable,
-					 const ArtIRect *rectangle,
-					 guint32 color,
-					 gboolean draw_cross)
-{
-	GdkGC *gc;
-
-	int width;
-	int height;
-
-	g_return_if_fail (drawable != NULL);
-	g_return_if_fail (rectangle != NULL);
-	g_return_if_fail (rectangle->x1 > rectangle->x0);
-	g_return_if_fail (rectangle->y1 > rectangle->y0);
-
-	width = rectangle->x1 - rectangle->x0;
-	height = rectangle->y1 - rectangle->y0;
-
- 	gc = gdk_gc_new (drawable);
- 	gdk_gc_set_function (gc, GDK_COPY);
-	gdk_rgb_gc_set_foreground (gc, color);
-	
-	gdk_draw_rectangle (drawable,
-			    gc,
-			    FALSE,
-			    rectangle->x0,
-			    rectangle->y0,
-			    width - 1,
-			    height - 1);
-
-	if (draw_cross) {
-		gdk_draw_line (drawable,
-			       gc,
-			       rectangle->x0,
-			       rectangle->y0,
-			       rectangle->x0 + width - 1,
-			       rectangle->y0 + height - 1);
-		
-		gdk_draw_line (drawable,
-			       gc,
-			       rectangle->x0 + width - 1,
-			       rectangle->y0,
-			       rectangle->x0,
-			       rectangle->y0 + height - 1);
-	}
-
-	gdk_gc_unref (gc);
-}
-
-/**
- * nautilus_debug_show_pixbuf_in_eog:
- * @pixbuf: Pixbuf to show.
- *
- * Show the given pixbuf in eog.  This is very useful for debugging pixbuf
- * stuff.  Perhaps this function should be #ifdef DEBUG or something like that.
- */
-void
-nautilus_debug_show_pixbuf_in_eog (const GdkPixbuf *pixbuf)
-{
-	char *command;
-	char *file_name;
-	gboolean save_result;
-
-	g_return_if_fail (pixbuf != NULL);
-
-	file_name = g_strdup ("/tmp/nautilus-debug-png-file-XXXXXX");
-
-	if (mktemp (file_name) != file_name) {
-		g_free (file_name);
-		file_name = g_strdup_printf ("/tmp/isis-debug-png-file.%d", getpid ());
-	}
-
-	save_result = nautilus_gdk_pixbuf_save_to_file (pixbuf, file_name);
-
-	if (save_result == FALSE) {
-		g_warning ("Failed to save '%s'", file_name);
-		g_free (file_name);
-		return;
-	}
-	
-	command = g_strdup_printf ("eog %s", file_name);
-
-	system (command);
-	g_free (command);
-	remove (file_name);
-	g_free (file_name);
-}
-
-static GtkWidget *debug_window = NULL;
-static GtkWidget *debug_image = NULL;
-
-static void
-debug_delete_event (GtkWidget *widget, GdkEvent *event, gpointer callback_data)
-{
-	gtk_widget_hide (widget);
-}
-
-static void
-destroy_debug_window (void)
-{
-	if (debug_window != NULL) {
-		gtk_widget_destroy (debug_window);
-		debug_window = NULL;
-	}
-}
-
-/**
- * nautilus_debug_show_pixbuf_in:
- * @pixbuf: Pixbuf to show.
- *
- * Show the given pixbuf in an in process window.
- */
-void
-nautilus_debug_show_pixbuf (const GdkPixbuf *pixbuf)
-{
-	if (debug_window == NULL) {
-		GtkWidget *vbox;
-		
-		debug_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-		vbox = gtk_vbox_new (FALSE, 0);
-		gtk_container_add (GTK_CONTAINER (debug_window), vbox);
-		gtk_window_set_title (GTK_WINDOW (debug_window), "Pixbuf debugging");
-		gtk_window_set_policy (GTK_WINDOW (debug_window), TRUE, TRUE, FALSE);
-		gtk_container_set_border_width (GTK_CONTAINER (debug_window), 10);
-		gtk_signal_connect (GTK_OBJECT (debug_window), "delete_event", GTK_SIGNAL_FUNC (debug_delete_event), NULL);
-		
-		debug_image = gtk_widget_new (debug_pixbuf_viewer_get_type (), NULL);
-		
-		gtk_box_pack_start (GTK_BOX (vbox), debug_image, TRUE, TRUE, 0);
-
-		nautilus_gtk_widget_set_background_color (debug_window, "white");
-
-		g_atexit (destroy_debug_window);
-		
-		gtk_widget_show (debug_image);
-		gtk_widget_show (vbox);
-	}
-
-	gtk_widget_show (debug_window);
-	debug_pixbuf_viewer_set_pixbuf (DEBUG_PIXBUF_VIEWER (debug_image), (GdkPixbuf *) pixbuf);
-
-	gdk_window_clear_area_e (debug_window->window, 0, 0, -1, -1);
-}
-
-void
-nautilus_debug_pixbuf_draw_point (GdkPixbuf *pixbuf,
-				  int x,
-				  int y,
-				  guint32 color,
-				  int opacity)
-{
-	NautilusDimensions dimensions;
-	guchar *pixels;
-	gboolean has_alpha;
-	guint pixel_offset;
-	guint rowstride;
-	guchar red;
-	guchar green;
-	guchar blue;
-	guchar alpha;
-	guchar *offset;
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	dimensions = nautilus_gdk_pixbuf_get_dimensions (pixbuf);
-
-	g_return_if_fail (x >= 0 && x < dimensions.width);
-	g_return_if_fail (y >= 0 && y < dimensions.height);
-
-	pixels = gdk_pixbuf_get_pixels (pixbuf);
-	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-	has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
-	pixel_offset = has_alpha ? 4 : 3;
-
-	red = NAUTILUS_RGBA_COLOR_GET_R (color);
-	green = NAUTILUS_RGBA_COLOR_GET_G (color);
-	blue = NAUTILUS_RGBA_COLOR_GET_B (color);
-	alpha = (guchar) opacity;
-
-	offset = pixels + y * rowstride + x * pixel_offset;
-
-	*(offset + 0) = red;
-	*(offset + 1) = green;
-	*(offset + 2) = blue;
-	
-	if (has_alpha) {
-		*(offset + 3) = alpha;
-	}
-}
-
-void
-nautilus_debug_pixbuf_draw_rectangle (GdkPixbuf *pixbuf,
-				      gboolean filled,
-				      int x0,
-				      int y0,
-				      int x1,
-				      int y1,
-				      guint32 color,
-				      int opacity)
-{
-	NautilusDimensions dimensions;
-	int x;
-	int y;
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	dimensions = nautilus_gdk_pixbuf_get_dimensions (pixbuf);
-
-	if (x0 == -1) {
-		x0 = 0;
-	}
-
-	if (y0 == -1) {
-		y0 = 0;
-	}
-
-	if (x1 == -1) {
-		x1 = dimensions.width - 1;
-	}
-
-	if (y1 == -1) {
-		y1 = dimensions.height - 1;
-	}
-
-	g_return_if_fail (x1 > x0);
-	g_return_if_fail (y1 > y0);
-	g_return_if_fail (x0 >= 0 && x0 < dimensions.width);
-	g_return_if_fail (y0 >= 0 && y0 < dimensions.height);
-	g_return_if_fail (x1 >= 0 && x1 < dimensions.width);
-	g_return_if_fail (y1 >= 0 && y1 < dimensions.height);
-
-	if (filled) {
-		for (y = y0; y <= y1; y++) {
-			for (x = x0; x <= x1; x++) {
-				nautilus_debug_pixbuf_draw_point (pixbuf, x, y, color, opacity);
-			}
-		}
-	} else {
-		/* Top / Bottom */
-		for (x = x0; x <= x1; x++) {
-			nautilus_debug_pixbuf_draw_point (pixbuf, x, y0, color, opacity);
-			nautilus_debug_pixbuf_draw_point (pixbuf, x, y1, color, opacity);
-		}
-		
-		/* Left / Right */
-		for (y = y0; y <= y1; y++) {
-			nautilus_debug_pixbuf_draw_point (pixbuf, x0, y, color, opacity);
-			nautilus_debug_pixbuf_draw_point (pixbuf, x1, y, color, opacity);
-		}
-	}
-}
-
-void
-nautilus_debug_pixbuf_draw_rectangle_inset (GdkPixbuf *pixbuf,
-					    gboolean filled,
-					    int x0,
-					    int y0,
-					    int x1,
-					    int y1,
-					    guint32 color,
-					    int opacity,
-					    int inset)
-{
-	NautilusDimensions dimensions;
-	
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	dimensions = nautilus_gdk_pixbuf_get_dimensions (pixbuf);
-
-	if (x0 == -1) {
-		x0 = 0;
-	}
-
-	if (y0 == -1) {
-		y0 = 0;
-	}
-
-	if (x1 == -1) {
-		x1 = dimensions.width - 1;
-	}
-
-	if (y1 == -1) {
-		y1 = dimensions.height - 1;
-	}
-
-	x0 += inset;
-	y0 += inset;
-	x1 -= inset;
-	y1 -= inset;
-
-	g_return_if_fail (x1 > x0);
-	g_return_if_fail (y1 > y0);
-
-	nautilus_debug_pixbuf_draw_rectangle (pixbuf, filled, x0, y0, x1, y1, color, opacity);
-}
diff --git a/libnautilus-extensions/nautilus-debug-drawing.h b/libnautilus-extensions/nautilus-debug-drawing.h
deleted file mode 100644
index 08626a21c..000000000
--- a/libnautilus-extensions/nautilus-debug-drawing.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-debug-drawing.h: Nautilus drawing debugging aids.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_DEBUG_DRAWING_H
-#define NAUTILUS_DEBUG_DRAWING_H
-
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-
-/* Draw a rectangle and cross on the given window */
-void nautilus_debug_draw_rectangle_and_cross    (GdkDrawable     *drawable,
-						 const ArtIRect  *rectangle,
-						 guint32          color,
-						 gboolean         draw_cross);
-
-/* Show the given pixbuf in eog */
-void nautilus_debug_show_pixbuf_in_eog          (const GdkPixbuf *pixbuf);
-
-/* Show the given pixbuf in an in process window */
-void nautilus_debug_show_pixbuf                 (const GdkPixbuf *pixbuf);
-
-/* Draw a point in a pixbuf */
-void nautilus_debug_pixbuf_draw_point           (GdkPixbuf       *pixbuf,
-						 int              x,
-						 int              y,
-						 guint32          color,
-						 int              opacity);
-/* Draw a rectangle in a pixbuf.  The coordinates (-1,-1( (-1,-1) will use
- * the whole pixbuf. */
-void nautilus_debug_pixbuf_draw_rectangle       (GdkPixbuf       *pixbuf,
-						 gboolean         filled,
-						 int              x0,
-						 int              y0,
-						 int              x1,
-						 int              y1,
-						 guint32          color,
-						 int              opacity);
-/* Draw an inset rectangle in a pixbuf.  Positive inset make the rectangle
- * smaller.  Negative inset makes it larger.
- */
-void nautilus_debug_pixbuf_draw_rectangle_inset (GdkPixbuf       *pixbuf,
-						 gboolean         filled,
-						 int              x0,
-						 int              y0,
-						 int              x1,
-						 int              y1,
-						 guint32          color,
-						 int              opacity,
-						 int              inset);
-
-#endif /* NAUTILUS_DEBUG_DRAWING_H */
diff --git a/libnautilus-extensions/nautilus-debug.c b/libnautilus-extensions/nautilus-debug.c
deleted file mode 100644
index dc3ca62bd..000000000
--- a/libnautilus-extensions/nautilus-debug.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-debug.c: Nautilus debugging aids.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Darin Adler <darin@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-debug.h"
-
-#include <glib.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
-
-/* Raise a SIGINT signal to get the attention of the debugger.
-   When not running under the debugger, we don't want to stop,
-   so we ignore the signal for just the moment that we raise it.
-*/
-void
-nautilus_stop_in_debugger (void)
-{
-	void (* saved_handler) (int);
-
-	saved_handler = signal (SIGINT, SIG_IGN);
-	raise (SIGINT);
-	signal (SIGINT, saved_handler);
-}
-
-/* Stop in the debugger after running the default log handler.
-   This makes certain kinds of messages stop in the debugger
-   without making them fatal.
-*/
-static void
-nautilus_stop_after_default_log_handler (const char *domain,
-					 GLogLevelFlags level,
-					 const char *message,
-					 gpointer data)
-{
-	g_log_default_handler (domain, level, message, data);
-	nautilus_stop_in_debugger ();
-}
-
-static void
-nautilus_set_stop_after_default_log_handler (const char *domain)
-{
-	g_log_set_handler (domain, G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING,
-			   nautilus_stop_after_default_log_handler, NULL);
-}
-
-void
-nautilus_make_warnings_and_criticals_stop_in_debugger (const char *first_domain, ...)
-{
-	va_list domains;
-	const char *domain;
-
-	nautilus_set_stop_after_default_log_handler (first_domain);
-
-	va_start (domains, first_domain);
-
-	for (;;) {
-		domain = va_arg (domains, const char *);
-		if (domain == NULL) {
-			break;
-		}
-		nautilus_set_stop_after_default_log_handler (domain);
-	}
-
-	va_end (domains);
-}
-
-int 
-nautilus_get_available_file_descriptor_count (void)
-{
-	int count;
-	GList *list;
-	GList *p;
-	FILE *file;
-
-	list = NULL;
-	for (count = 0; ; count++) {
-		file = fopen("/dev/null", "r");
-		if (file == NULL) {
-			break;
-		}
-		list = g_list_prepend (list, file);
-	}
-
-	for (p = list; p != NULL; p = p->next) {
-		fclose (p->data);
-	}
-	g_list_free (list);
-
-	return count;
-}
-
-gboolean
-nautilus_str_equal_with_free (char *eat_this,
-			      const char *not_this)
-{
-	gboolean equal;
-
-	/* NULL is not legal. */
-	if (eat_this == NULL) {
-		equal = FALSE;
-	} else if (not_this == NULL) {
-		equal = FALSE;
-	} else {
-		equal = strcmp (eat_this, not_this) == 0;
-	}
-
-	g_free (eat_this);
-
-	return equal;
-}
diff --git a/libnautilus-extensions/nautilus-debug.h b/libnautilus-extensions/nautilus-debug.h
deleted file mode 100644
index db2d95162..000000000
--- a/libnautilus-extensions/nautilus-debug.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-debug.h: Nautilus debugging aids.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Darin Adler <darin@eazel.com>
-*/
-
-#ifndef NAUTILUS_DEBUG_H
-#define NAUTILUS_DEBUG_H
-
-#include <glib.h>
-
-#ifdef G_DISABLE_ASSERT
-
-#define nautilus_assert_computed_str(str_expr, expected_str)
-
-#else /* !G_DISABLE_ASSERT */
-
-gboolean nautilus_str_equal_with_free                          (char       *eat_this,
-								const char *not_this);
-
-#define nautilus_assert_computed_str(str_expr, expected_str) \
-	g_assert (nautilus_str_equal_with_free ((str_expr), (expected_str)))
-
-#endif /* !G_DISABLE_ASSERT */
-
-void     nautilus_stop_in_debugger                             (void);
-void     nautilus_make_warnings_and_criticals_stop_in_debugger (const char *first_domain,
-								...);
-int      nautilus_get_available_file_descriptor_count          (void);
-
-#endif /* NAUTILUS_DEBUG_H */
diff --git a/libnautilus-extensions/nautilus-directory-async.c b/libnautilus-extensions/nautilus-directory-async.c
index 868ebc5fe..6377e80ca 100644
--- a/libnautilus-extensions/nautilus-directory-async.c
+++ b/libnautilus-extensions/nautilus-directory-async.c
@@ -30,11 +30,11 @@
 #include "nautilus-directory-private.h"
 #include "nautilus-file-attributes.h"
 #include "nautilus-file-private.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 #include "nautilus-global-preferences.h"
 #include "nautilus-link.h"
 #include "nautilus-search-uri.h"
-#include "nautilus-string.h"
+#include <eel/eel-string.h>
 #include <ctype.h>
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
@@ -173,7 +173,7 @@ istr_set_get_as_list (GHashTable *table)
 static void
 istr_set_destroy (GHashTable *table)
 {
-	nautilus_g_hash_table_destroy_deep (table);
+	eel_g_hash_table_destroy_deep (table);
 }
 
 /* Start a job. This is really just a way of limiting the number of
@@ -197,7 +197,7 @@ async_job_start (NautilusDirectory *directory,
 
 	if (async_job_count >= MAX_ASYNC_JOBS) {
 		if (waiting_directories == NULL) {
-			waiting_directories = nautilus_g_hash_table_new_free_at_exit
+			waiting_directories = eel_g_hash_table_new_free_at_exit
 				(NULL, NULL,
 				 "nautilus-directory-async.c: waiting_directories");
 		}
@@ -211,7 +211,7 @@ async_job_start (NautilusDirectory *directory,
 
 #ifdef DEBUG_ASYNC_JOBS
 	if (async_jobs == NULL) {
-		async_jobs = nautilus_g_hash_table_new_free_at_exit
+		async_jobs = eel_g_hash_table_new_free_at_exit
 			(g_str_hash, g_str_equal,
 			 "nautilus-directory-async.c: async_jobs");
 	}
@@ -339,7 +339,7 @@ deep_count_cancel (NautilusDirectory *directory)
 		directory->details->deep_count_in_progress = NULL;
 		g_free (directory->details->deep_count_uri);
 		directory->details->deep_count_uri = NULL;
-		nautilus_g_list_free_deep (directory->details->deep_count_subdirectories);
+		eel_g_list_free_deep (directory->details->deep_count_subdirectories);
 		directory->details->deep_count_subdirectories = NULL;
 
 		async_job_end (directory, "deep count");
@@ -476,42 +476,42 @@ nautilus_directory_set_up_request (Request *request,
 	request->directory_count = g_list_find_custom
 		(file_attributes,
 		 NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT,
-		 nautilus_strcmp_compare_func) != NULL;
+		 eel_strcmp_compare_func) != NULL;
 	request->deep_count = g_list_find_custom
 		(file_attributes,
 		 NAUTILUS_FILE_ATTRIBUTE_DEEP_COUNTS,
-		 nautilus_strcmp_compare_func) != NULL;
+		 eel_strcmp_compare_func) != NULL;
 	request->mime_list = g_list_find_custom
 		(file_attributes,
 		 NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_MIME_TYPES,
-		 nautilus_strcmp_compare_func) != NULL;
+		 eel_strcmp_compare_func) != NULL;
 	request->file_info = g_list_find_custom
 		(file_attributes,
 		 NAUTILUS_FILE_ATTRIBUTE_MIME_TYPE,
-		 nautilus_strcmp_compare_func) != NULL;
+		 eel_strcmp_compare_func) != NULL;
 	request->file_info |= g_list_find_custom
 		(file_attributes,
 		 NAUTILUS_FILE_ATTRIBUTE_IS_DIRECTORY,
-		 nautilus_strcmp_compare_func) != NULL;
+		 eel_strcmp_compare_func) != NULL;
 	request->file_info |= g_list_find_custom
 		(file_attributes,
 		 NAUTILUS_FILE_ATTRIBUTE_CAPABILITIES,
-		 nautilus_strcmp_compare_func) != NULL;
+		 eel_strcmp_compare_func) != NULL;
 	request->file_info |= g_list_find_custom
 		(file_attributes,
 		 NAUTILUS_FILE_ATTRIBUTE_FILE_TYPE,
-		 nautilus_strcmp_compare_func) != NULL;
+		 eel_strcmp_compare_func) != NULL;
 	
 	if (g_list_find_custom (file_attributes,
 				NAUTILUS_FILE_ATTRIBUTE_TOP_LEFT_TEXT,
-				nautilus_strcmp_compare_func) != NULL) {
+				eel_strcmp_compare_func) != NULL) {
 		request->top_left_text = TRUE;
 		request->file_info = TRUE;
 	}
 	
 	if (g_list_find_custom (file_attributes,
 				NAUTILUS_FILE_ATTRIBUTE_ACTIVATION_URI,
-				nautilus_strcmp_compare_func) != NULL) {
+				eel_strcmp_compare_func) != NULL) {
 		request->file_info = TRUE;
 		request->activation_uri = TRUE;
 	}
@@ -519,7 +519,7 @@ nautilus_directory_set_up_request (Request *request,
 	request->metafile |= g_list_find_custom
 		(file_attributes,
 		 NAUTILUS_FILE_ATTRIBUTE_METADATA,
-		 nautilus_strcmp_compare_func) != NULL;
+		 eel_strcmp_compare_func) != NULL;
 
 	/* FIXME bugzilla.eazel.com 2435:
 	 * Some file attributes are really pieces of metadata.
@@ -535,7 +535,7 @@ nautilus_directory_set_up_request (Request *request,
 	request->metafile |= g_list_find_custom
 		(file_attributes,
 		 NAUTILUS_FILE_ATTRIBUTE_CUSTOM_ICON,
-		 nautilus_strcmp_compare_func) != NULL;
+		 eel_strcmp_compare_func) != NULL;
 }
 
 static gboolean
@@ -554,7 +554,7 @@ get_non_tentative_file_list (NautilusDirectory *directory)
 {
 	GList *tentative_files, *non_tentative_files;
 
-	tentative_files = nautilus_g_list_partition
+	tentative_files = eel_g_list_partition
 		(g_list_copy (directory->details->file_list),
 		 is_tentative, NULL, &non_tentative_files);
 	g_list_free (tentative_files);
@@ -2255,7 +2255,7 @@ mime_list_callback (GnomeVFSAsyncHandle *handle,
 	file->details->mime_list_is_up_to_date = TRUE;
 
 	/* Record either a failure or success. */
-	nautilus_g_list_free_deep (file->details->mime_list);
+	eel_g_list_free_deep (file->details->mime_list);
 	if (result != GNOME_VFS_ERROR_EOF) {
 		file->details->mime_list_failed = TRUE;
 		file->details->mime_list = NULL;
@@ -2486,7 +2486,7 @@ get_info_callback (GnomeVFSAsyncHandle *handle,
 
 	directory = NAUTILUS_DIRECTORY (callback_data);
 	g_assert (handle == NULL || handle == directory->details->get_info_in_progress);
-	g_assert (nautilus_g_list_exactly_one_item (results));
+	g_assert (eel_g_list_exactly_one_item (results));
 	get_info_file = directory->details->get_info_file;
 	g_assert (NAUTILUS_IS_FILE (get_info_file));
 
@@ -2670,7 +2670,7 @@ activation_uri_gmc_link_read_callback (GnomeVFSResult result,
 	nautilus_directory_ref (directory);
 
 	/* Handle the case where we read the GMC link. */
-	if (result != GNOME_VFS_OK || !nautilus_str_has_prefix (file_contents, "URL: ")) {
+	if (result != GNOME_VFS_OK || !eel_str_has_prefix (file_contents, "URL: ")) {
 		/* FIXME bugzilla.eazel.com 2433: We should report this error to the user. */
 		uri = NULL;
 	} else {
@@ -2739,7 +2739,7 @@ activation_uri_start (NautilusDirectory *directory)
 
 	/* Figure out if it is a link. */
 	mime_type = nautilus_file_get_mime_type (file);
-	gmc_style_link = nautilus_strcasecmp (mime_type, "application/x-gmc-link") == 0;
+	gmc_style_link = eel_strcasecmp (mime_type, "application/x-gmc-link") == 0;
 	g_free (mime_type);
 	nautilus_style_link = nautilus_file_is_nautilus_link (file);
 	
diff --git a/libnautilus-extensions/nautilus-directory-background.c b/libnautilus-extensions/nautilus-directory-background.c
index 129bd19b4..e58356504 100644
--- a/libnautilus-extensions/nautilus-directory-background.c
+++ b/libnautilus-extensions/nautilus-directory-background.c
@@ -27,12 +27,12 @@
 #include <config.h>
 #include "nautilus-directory-background.h"
 
-#include "libnautilus-extensions/nautilus-gdk-extensions.h"
-#include "nautilus-background.h"
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-background.h>
 #include "nautilus-global-preferences.h"
 #include "nautilus-metadata.h"
 #include "nautilus-file-attributes.h"
-#include "nautilus-string.h"
+#include <eel/eel-string.h>
 #include "nautilus-theme.h"
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
@@ -42,31 +42,31 @@
 #include <libgnome/gnome-util.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
-static void background_changed_callback     (NautilusBackground *background, 
+static void background_changed_callback     (EelBackground *background, 
                                              NautilusFile       *file);
-static void background_reset_callback       (NautilusBackground *background, 
+static void background_reset_callback       (EelBackground *background, 
                                              NautilusFile       *file);
 
 static void saved_settings_changed_callback (NautilusFile       *file, 
-                                             NautilusBackground *background);
+                                             EelBackground *background);
                                          
-static void nautilus_file_background_receive_root_window_changes (NautilusBackground *background);
+static void nautilus_file_background_receive_root_window_changes (EelBackground *background);
 
-static void nautilus_file_update_desktop_pixmaps (NautilusBackground *background);
+static void nautilus_file_update_desktop_pixmaps (EelBackground *background);
 
 static void nautilus_file_background_write_desktop_settings (char *color,
 							     char *image,
-							     NautilusBackgroundImagePlacement placement);
+							     EelBackgroundImagePlacement placement);
 
 static gboolean nautilus_file_background_matches_default_settings (
 			const char* color, const char* default_color,
 			const char* image, const char* default_image,
-			NautilusBackgroundImagePlacement placement, NautilusBackgroundImagePlacement default_placement);
+			EelBackgroundImagePlacement placement, EelBackgroundImagePlacement default_placement);
 
 static void
 desktop_background_realized (NautilusIconContainer *icon_container, void *disconnect_signal)
 {
-	NautilusBackground *background;
+	EelBackground *background;
 
         if ((gboolean) GPOINTER_TO_INT (disconnect_signal)) {
 		gtk_signal_disconnect_by_func (GTK_OBJECT (icon_container),
@@ -74,7 +74,7 @@ desktop_background_realized (NautilusIconContainer *icon_container, void *discon
 					       disconnect_signal);
 	}
 
-	background = nautilus_get_widget_background (GTK_WIDGET (icon_container));
+	background = eel_get_widget_background (GTK_WIDGET (icon_container));
 
 	gtk_object_set_data (GTK_OBJECT (background), "icon_container", (gpointer) icon_container);
 
@@ -88,9 +88,9 @@ void
 nautilus_connect_desktop_background_to_file_metadata (NautilusIconContainer *icon_container,
                                                       NautilusFile *file)
 {
-	NautilusBackground *background;
+	EelBackground *background;
 
-	background = nautilus_get_widget_background (GTK_WIDGET (icon_container));
+	background = eel_get_widget_background (GTK_WIDGET (icon_container));
 
 	gtk_object_set_data (GTK_OBJECT (background), "theme_source", (gpointer) desktop_theme_source);
 
@@ -114,14 +114,14 @@ nautilus_connect_desktop_background_to_file_metadata (NautilusIconContainer *ico
 }
 
 static gboolean
-nautilus_background_is_desktop (NautilusBackground *background)
+eel_background_is_desktop (EelBackground *background)
 {
 	/* == works because we're carful to always use the same string.
 	 */
 	return gtk_object_get_data (GTK_OBJECT (background), "theme_source") == desktop_theme_source;
 }
 
-static const char *nautilus_file_background_peek_theme_source (NautilusBackground *background)
+static const char *nautilus_file_background_peek_theme_source (EelBackground *background)
 {
 	char *theme_source;
 
@@ -131,7 +131,7 @@ static const char *nautilus_file_background_peek_theme_source (NautilusBackgroun
 }
 
 static GdkWindow *
-nautilus_background_get_desktop_background_window (NautilusBackground *background)
+eel_background_get_desktop_background_window (EelBackground *background)
 {
 	gpointer layout;
 
@@ -146,9 +146,9 @@ theme_image_path_to_uri (char *image_file, const char *theme_name)
 	char *image_path;
 	char *image_uri;
 
-	if (image_file != NULL && !nautilus_istr_has_prefix (image_file, "file://")) {
+	if (image_file != NULL && !eel_istr_has_prefix (image_file, "file://")) {
 		
-		if (nautilus_str_has_prefix (image_file, "./")) {
+		if (eel_str_has_prefix (image_file, "./")) {
 			image_path = nautilus_theme_get_image_path_from_theme (image_file + 2, theme_name);
 		} else {
 			image_path = g_strdup_printf ("%s/%s", NAUTILUS_DATADIR, image_file);
@@ -173,12 +173,12 @@ nautilus_file_background_get_default_settings_for_theme (const char* theme_name,
 							  const char* theme_source,
 							  char **color,
 							  char **image,
-							  NautilusBackgroundImagePlacement *placement)
+							  EelBackgroundImagePlacement *placement)
 {
 	char *image_local_path;
 
 	if (placement != NULL) {
-		*placement = NAUTILUS_BACKGROUND_TILED;
+		*placement = EEL_BACKGROUND_TILED;
 	}
 
 	if (color != NULL) {
@@ -196,7 +196,7 @@ static void
 nautilus_file_background_get_default_settings (const char* theme_source,
                                                char **color,
                                                char **image,
-                                               NautilusBackgroundImagePlacement *placement)
+                                               EelBackgroundImagePlacement *placement)
 {
 	char *theme_name;
 	theme_name = nautilus_theme_get_theme ();
@@ -206,12 +206,12 @@ nautilus_file_background_get_default_settings (const char* theme_source,
 }
 
 static gboolean
-nautilus_gnome_config_string_match_no_case_with_default (const char *path, const char *test_value, gboolean *was_default)
+eel_gnome_config_string_match_no_case_with_default (const char *path, const char *test_value, gboolean *was_default)
 {
 	char *value;
 	gboolean result;
 	value = gnome_config_get_string_with_default (path, was_default);
-	result = !nautilus_strcasecmp (value, test_value);
+	result = !eel_strcasecmp (value, test_value);
 	g_free (value);
 	return result;
 }
@@ -228,14 +228,14 @@ enum {
 static void
 nautilus_file_background_read_desktop_settings (char **color,
                                                 char **image,
-                                                NautilusBackgroundImagePlacement *placement)
+                                                EelBackgroundImagePlacement *placement)
 {
 	int	 image_alignment;
 	char*	 image_local_path;
 	char*	 default_image_uri;
 	gboolean no_alignment_set;
 	gboolean no_image_set;
-	NautilusBackgroundImagePlacement default_placement;
+	EelBackgroundImagePlacement default_placement;
 	
 	char	*end_color;
 	char	*start_color;
@@ -266,7 +266,7 @@ nautilus_file_background_read_desktop_settings (char **color,
 
 	if (no_image_set) {
 		*image = g_strdup (default_image_uri);
-	} else if (nautilus_strcasecmp (image_local_path, "none") != 0) {
+	} else if (eel_strcasecmp (image_local_path, "none") != 0) {
 		*image = gnome_vfs_get_uri_from_local_path (image_local_path);
 	} else {
 		*image = NULL;
@@ -287,24 +287,24 @@ nautilus_file_background_read_desktop_settings (char **color,
 				 * Just treat it as centered - ugh.
 				 */
 			case WALLPAPER_CENTERED:
-				*placement = NAUTILUS_BACKGROUND_CENTERED;
+				*placement = EEL_BACKGROUND_CENTERED;
 				break;
 			case WALLPAPER_TILED:
-				*placement = NAUTILUS_BACKGROUND_TILED;
+				*placement = EEL_BACKGROUND_TILED;
 				break;
 			case WALLPAPER_SCALED:
-				*placement = NAUTILUS_BACKGROUND_SCALED;
+				*placement = EEL_BACKGROUND_SCALED;
 				break;
 			case WALLPAPER_SCALED_KEEP:
-				*placement = NAUTILUS_BACKGROUND_SCALED_ASPECT;
+				*placement = EEL_BACKGROUND_SCALED_ASPECT;
 				break;
 		 }
 	}
 
 	end_color     = gnome_config_get_string_with_default ("/Background/Default/color2", &no_end_color_set);
 	start_color   = gnome_config_get_string_with_default ("/Background/Default/color1", &no_start_color_set);
-	use_gradient  = !nautilus_gnome_config_string_match_no_case_with_default ("/Background/Default/simple", "solid", &no_gradient_set);
-	is_horizontal = !nautilus_gnome_config_string_match_no_case_with_default ("/Background/Default/gradient", "vertical", &no_gradient_orientation_set);
+	use_gradient  = !eel_gnome_config_string_match_no_case_with_default ("/Background/Default/simple", "solid", &no_gradient_set);
+	is_horizontal = !eel_gnome_config_string_match_no_case_with_default ("/Background/Default/gradient", "vertical", &no_gradient_orientation_set);
 
 	if (no_gradient_set || no_gradient_orientation_set || no_start_color_set) {
 		*color = g_strdup (default_color);
@@ -312,7 +312,7 @@ nautilus_file_background_read_desktop_settings (char **color,
 		if (no_end_color_set) {
 			*color = g_strdup (default_color);
 		} else {
-			*color = nautilus_gradient_new (start_color, end_color , is_horizontal);
+			*color = eel_gradient_new (start_color, end_color , is_horizontal);
 		}
 	} else {
 		*color = g_strdup (start_color);
@@ -337,7 +337,7 @@ nautilus_file_background_read_desktop_settings (char **color,
 	cur_theme_name = nautilus_theme_get_theme ();
 
 	switch_to_cur_theme_default = !no_theme_name_set &&
-				      (nautilus_strcmp (theme_name, cur_theme_name) != 0) &&
+				      (eel_strcmp (theme_name, cur_theme_name) != 0) &&
 				      nautilus_file_background_matches_default_settings
 					(*color, default_color,
 					 *image, default_image_uri,
@@ -363,7 +363,7 @@ nautilus_file_background_read_desktop_settings (char **color,
 }
 
 static void
-nautilus_file_background_write_desktop_settings (char *color, char *image, NautilusBackgroundImagePlacement placement)
+nautilus_file_background_write_desktop_settings (char *color, char *image, EelBackgroundImagePlacement placement)
 {
 	char *end_color;
 	char *start_color;
@@ -379,20 +379,20 @@ nautilus_file_background_write_desktop_settings (char *color, char *image, Nauti
 	gboolean found_wallpaper;
 
 	if (color != NULL) {
-		start_color = nautilus_gradient_get_start_color_spec (color);
+		start_color = eel_gradient_get_start_color_spec (color);
 		gnome_config_set_string ("/Background/Default/color1", start_color);		
 		g_free (start_color);
 
 		/* if color is not a gradient, this ends up writing same as start_color */
-		end_color = nautilus_gradient_get_end_color_spec (color);
+		end_color = eel_gradient_get_end_color_spec (color);
 		gnome_config_set_string ("/Background/Default/color2", end_color);		
 		g_free (end_color);
 
-		gnome_config_set_string ("/Background/Default/simple", nautilus_gradient_is_gradient (color) ? "gradient" : "solid");
-		gnome_config_set_string ("/Background/Default/gradient", nautilus_gradient_is_horizontal (color) ? "horizontal" : "vertical");
+		gnome_config_set_string ("/Background/Default/simple", eel_gradient_is_gradient (color) ? "gradient" : "solid");
+		gnome_config_set_string ("/Background/Default/gradient", eel_gradient_is_horizontal (color) ? "horizontal" : "vertical");
 	} else {
 		/* We set it to white here because that's how backgrounds with a NULL color
-		 * are drawn by Nautilus - due to usage of nautilus_gdk_color_parse_with_white_default.
+		 * are drawn by Nautilus - due to usage of eel_gdk_color_parse_with_white_default.
 		 */
 		gnome_config_set_string ("/Background/Default/color1", "rgb:FFFF/FFFF/FFFF");		
 		gnome_config_set_string ("/Background/Default/color2", "rgb:FFFF/FFFF/FFFF");		
@@ -404,16 +404,16 @@ nautilus_file_background_write_desktop_settings (char *color, char *image, Nauti
 		image_local_path = gnome_vfs_get_local_path_from_uri (image);
 		gnome_config_set_string ("/Background/Default/wallpaper", image_local_path);
 		switch (placement) {
-			case NAUTILUS_BACKGROUND_TILED:
+			case EEL_BACKGROUND_TILED:
 				wallpaper_align = WALLPAPER_TILED;
 				break;	
-			case NAUTILUS_BACKGROUND_CENTERED:
+			case EEL_BACKGROUND_CENTERED:
 				wallpaper_align = WALLPAPER_CENTERED;
 				break;	
-			case NAUTILUS_BACKGROUND_SCALED:
+			case EEL_BACKGROUND_SCALED:
 				wallpaper_align = WALLPAPER_SCALED;
 				break;	
-			case NAUTILUS_BACKGROUND_SCALED_ASPECT:
+			case EEL_BACKGROUND_SCALED_ASPECT:
 				wallpaper_align = WALLPAPER_SCALED_KEEP;
 				break;
 			default:
@@ -430,7 +430,7 @@ nautilus_file_background_write_desktop_settings (char *color, char *image, Nauti
 			wallpaper_config_path_i = g_strdup_printf ("/Background/Default/wallpaper%d", i);
 			wallpaper_path_i = gnome_config_get_string (wallpaper_config_path_i);
 			g_free (wallpaper_config_path_i);
-			if (nautilus_strcmp (wallpaper_path_i, image_local_path) == 0) {
+			if (eel_strcmp (wallpaper_path_i, image_local_path) == 0) {
 				found_wallpaper = TRUE;
 			}
 			
@@ -462,16 +462,16 @@ nautilus_file_background_write_desktop_default_settings ()
 {
 	char *color;
 	char *image;
-	NautilusBackgroundImagePlacement placement;
+	EelBackgroundImagePlacement placement;
 	nautilus_file_background_get_default_settings (desktop_theme_source, &color, &image, &placement);
 	nautilus_file_background_write_desktop_settings (color, image, placement);
 }
 
 static int
-call_settings_changed (NautilusBackground *background)
+call_settings_changed (EelBackground *background)
 {
 	NautilusFile *file;
-	file = gtk_object_get_data (GTK_OBJECT (background), "nautilus_background_file");
+	file = gtk_object_get_data (GTK_OBJECT (background), "eel_background_file");
 	if (file) {
 		saved_settings_changed_callback (file, background);
 	}
@@ -489,7 +489,7 @@ static GdkFilterReturn
 nautilus_file_background_event_filter (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
 {
 	XEvent *xevent;
-	NautilusBackground *background;
+	EelBackground *background;
 
 	xevent = (XEvent *) gdk_xevent;
 
@@ -502,7 +502,7 @@ nautilus_file_background_event_filter (GdkXEvent *gdk_xevent, GdkEvent *event, g
 			return GDK_FILTER_CONTINUE;
 		}
 		
-	    	background = NAUTILUS_BACKGROUND (data);
+	    	background = EEL_BACKGROUND (data);
 	    	/* FIXME bugzilla.eazel.com 2220:
 	    	 * We'd like to call saved_settings_changed_callback right here, directly.
 	    	 * However, the current version of the property-background capplet saves
@@ -517,13 +517,13 @@ nautilus_file_background_event_filter (GdkXEvent *gdk_xevent, GdkEvent *event, g
 }
 
 static void
-desktop_background_destroyed_callback (NautilusBackground *background, void *georgeWBush)
+desktop_background_destroyed_callback (EelBackground *background, void *georgeWBush)
 {
 	gdk_window_remove_filter (GDK_ROOT_PARENT(), nautilus_file_background_event_filter, background);
 }
 
 static void
-nautilus_file_background_receive_root_window_changes (NautilusBackground *background)
+nautilus_file_background_receive_root_window_changes (EelBackground *background)
 {
 	XWindowAttributes attribs = { 0 };
 
@@ -648,7 +648,7 @@ set_root_pixmap (GdkPixmap *pixmap)
 }
 	
 static void
-image_loading_done_callback (NautilusBackground *background, gboolean successful_load, void *disconnect_signal)
+image_loading_done_callback (EelBackground *background, gboolean successful_load, void *disconnect_signal)
 {
 	int	      width;
 	int	      height;
@@ -667,12 +667,12 @@ image_loading_done_callback (NautilusBackground *background, gboolean successful
 
 	pixmap = make_root_pixmap (width, height);
 	gc = gdk_gc_new (pixmap);
-	nautilus_background_draw_to_drawable (background, pixmap, gc, 0, 0, width, height, width, height);
+	eel_background_draw_to_drawable (background, pixmap, gc, 0, 0, width, height, width, height);
 	gdk_gc_unref (gc);
 
 	set_root_pixmap (pixmap);
 
-	background_window = nautilus_background_get_desktop_background_window (background);
+	background_window = eel_background_get_desktop_background_window (background);
 	if (background_window != NULL) {
 		gdk_window_set_back_pixmap (background_window, pixmap, FALSE);
 	}
@@ -688,9 +688,9 @@ image_loading_done_callback (NautilusBackground *background, gboolean successful
 }
 
 static void
-nautilus_file_update_desktop_pixmaps (NautilusBackground *background)
+nautilus_file_update_desktop_pixmaps (EelBackground *background)
 {	
-	if (nautilus_background_is_loaded (background)) {
+	if (eel_background_is_loaded (background)) {
 		image_loading_done_callback (background, TRUE, GINT_TO_POINTER (FALSE));
 	} else {
 		gtk_signal_connect (GTK_OBJECT (background),
@@ -704,7 +704,7 @@ static gboolean
 nautilus_file_background_matches_default_settings (
 			const char* color, const char* default_color,
 			const char* image, const char* default_image,
-			NautilusBackgroundImagePlacement placement, NautilusBackgroundImagePlacement default_placement)
+			EelBackgroundImagePlacement placement, EelBackgroundImagePlacement default_placement)
 {
 	gboolean match_color;
 	gboolean match_image;
@@ -712,16 +712,16 @@ nautilus_file_background_matches_default_settings (
 	/* A NULL default color or image is not considered when determining a match.
 	 */
 	
-	match_color = (default_color == NULL) || nautilus_strcmp (color, default_color) == 0;
+	match_color = (default_color == NULL) || eel_strcmp (color, default_color) == 0;
 	
 	match_image = (default_image == NULL) ||
-		      ((nautilus_strcmp (image, default_image) == 0) && (placement == default_placement));
+		      ((eel_strcmp (image, default_image) == 0) && (placement == default_placement));
 	return match_color && match_image;
 }
 
 /* return true if the background is not in the default state */
 gboolean
-nautilus_file_background_is_set (NautilusBackground *background)
+nautilus_file_background_is_set (EelBackground *background)
 {
 	char *color;
 	char *image;
@@ -730,12 +730,12 @@ nautilus_file_background_is_set (NautilusBackground *background)
 	
 	gboolean matches;
 	
-	NautilusBackgroundImagePlacement placement;
-	NautilusBackgroundImagePlacement default_placement;
+	EelBackgroundImagePlacement placement;
+	EelBackgroundImagePlacement default_placement;
 
-	color = nautilus_background_get_color (background);
-	image = nautilus_background_get_image_uri (background);
-	placement = nautilus_background_get_image_placement (background);
+	color = eel_background_get_color (background);
+	image = eel_background_get_image_uri (background);
+	placement = eel_background_get_image_placement (background);
 	
 	nautilus_file_background_get_default_settings (
 		nautilus_file_background_peek_theme_source (background),
@@ -755,22 +755,22 @@ nautilus_file_background_is_set (NautilusBackground *background)
 
 /* handle the background changed signal */
 static void
-background_changed_callback (NautilusBackground *background,
+background_changed_callback (EelBackground *background,
                              NautilusFile       *file)
 {
   	char *color;
   	char *image;
         
-        g_assert (NAUTILUS_IS_BACKGROUND (background));
+        g_assert (EEL_IS_BACKGROUND (background));
         g_assert (NAUTILUS_IS_FILE (file));
-        g_assert (gtk_object_get_data (GTK_OBJECT (background), "nautilus_background_file") == file);
+        g_assert (gtk_object_get_data (GTK_OBJECT (background), "eel_background_file") == file);
         
 
-	color = nautilus_background_get_color (background);
-	image = nautilus_background_get_image_uri (background);
+	color = eel_background_get_color (background);
+	image = eel_background_get_image_uri (background);
 
-	if (nautilus_background_is_desktop (background)) {
-		nautilus_file_background_write_desktop_settings (color, image, nautilus_background_get_image_placement (background));
+	if (eel_background_is_desktop (background)) {
+		nautilus_file_background_write_desktop_settings (color, image, eel_background_get_image_placement (background));
 	} else {
 	        /* Block the other handler while we are writing metadata so it doesn't
 	         * try to change the background.
@@ -798,25 +798,25 @@ background_changed_callback (NautilusBackground *background,
 	g_free (color);
 	g_free (image);
 	
-	if (nautilus_background_is_desktop (background)) {
+	if (eel_background_is_desktop (background)) {
 		nautilus_file_update_desktop_pixmaps (background);
 	}
 }
 
 static void
 initialize_background_from_settings (NautilusFile *file,
-				     NautilusBackground *background)
+				     EelBackground *background)
 {
         char *color;
         char *image;
-	NautilusBackgroundImagePlacement placement;
+	EelBackgroundImagePlacement placement;
 	
         g_assert (NAUTILUS_IS_FILE (file));
-        g_assert (NAUTILUS_IS_BACKGROUND (background));
-        g_assert (gtk_object_get_data (GTK_OBJECT (background), "nautilus_background_file")
+        g_assert (EEL_IS_BACKGROUND (background));
+        g_assert (gtk_object_get_data (GTK_OBJECT (background), "eel_background_file")
                   == file);
 
-	if (nautilus_background_is_desktop (background)) {
+	if (eel_background_is_desktop (background)) {
 		nautilus_file_background_read_desktop_settings (&color, &image, &placement);
 	} else {
 		color = nautilus_file_get_metadata (file,
@@ -825,7 +825,7 @@ initialize_background_from_settings (NautilusFile *file,
 		image = nautilus_file_get_metadata (file,
                                                     NAUTILUS_METADATA_KEY_LOCATION_BACKGROUND_IMAGE,
                                                     NULL);
-	        placement = NAUTILUS_BACKGROUND_TILED; /* non-tiled only avail for desktop, at least for now */
+	        placement = EEL_BACKGROUND_TILED; /* non-tiled only avail for desktop, at least for now */
 
 		/* if there's none, read the default from the theme */
 		if (color == NULL && image == NULL) {
@@ -842,9 +842,9 @@ initialize_background_from_settings (NautilusFile *file,
                                           background_changed_callback,
                                           file);
 
-	nautilus_background_set_color (background, color);     
-	nautilus_background_set_image_uri (background, image);
-        nautilus_background_set_image_placement (background, placement);
+	eel_background_set_color (background, color);     
+	eel_background_set_image_uri (background, image);
+        eel_background_set_image_placement (background, placement);
 	
 	/* Unblock the handler. */
 	gtk_signal_handler_unblock_by_func (GTK_OBJECT (background),
@@ -858,11 +858,11 @@ initialize_background_from_settings (NautilusFile *file,
 /* handle the file changed signal */
 static void
 saved_settings_changed_callback (NautilusFile *file,
-                                 NautilusBackground *background)
+                                 EelBackground *background)
 {
 	initialize_background_from_settings (file, background);
 	
-	if (nautilus_background_is_desktop (background)) {
+	if (eel_background_is_desktop (background)) {
 		nautilus_file_update_desktop_pixmaps (background);
 	}
 }
@@ -872,10 +872,10 @@ static void
 nautilus_file_background_theme_changed (gpointer user_data)
 {
 	NautilusFile *file;
-	NautilusBackground *background;
+	EelBackground *background;
 
-	background = NAUTILUS_BACKGROUND (user_data);
-	file = gtk_object_get_data (GTK_OBJECT (background), "nautilus_background_file");
+	background = EEL_BACKGROUND (user_data);
+	file = gtk_object_get_data (GTK_OBJECT (background), "eel_background_file");
 	if (file) {
 		saved_settings_changed_callback (file, background);
 	}
@@ -883,10 +883,10 @@ nautilus_file_background_theme_changed (gpointer user_data)
 
 /* handle the background reset signal by setting values from the current theme */
 static void
-background_reset_callback (NautilusBackground *background,
+background_reset_callback (EelBackground *background,
                            NautilusFile       *file)
 {
-	if (nautilus_background_is_desktop (background)) {
+	if (eel_background_is_desktop (background)) {
 		nautilus_file_background_write_desktop_default_settings ();
 	} else {
 	        /* Block the other handler while we are writing metadata so it doesn't
@@ -917,7 +917,7 @@ background_reset_callback (NautilusBackground *background,
 
 /* handle the background destroyed signal */
 static void
-background_destroyed_callback (NautilusBackground *background,
+background_destroyed_callback (EelBackground *background,
                                NautilusFile       *file)
 {
         gtk_signal_disconnect_by_func (GTK_OBJECT (file),
@@ -934,15 +934,15 @@ void
 nautilus_connect_background_to_file_metadata (GtkWidget    *widget,
                                               NautilusFile *file)
 {
-	NautilusBackground *background;
+	EelBackground *background;
 	gpointer old_file;
         GList *attributes;
 
 	/* Get at the background object we'll be connecting. */
-	background = nautilus_get_widget_background (widget);
+	background = eel_get_widget_background (widget);
 
 	/* Check if it is already connected. */
-	old_file = gtk_object_get_data (GTK_OBJECT (background), "nautilus_background_file");
+	old_file = gtk_object_get_data (GTK_OBJECT (background), "eel_background_file");
 	if (old_file == file) {
 		return;
 	}
@@ -972,7 +972,7 @@ nautilus_connect_background_to_file_metadata (GtkWidget    *widget,
         /* Attach the new directory. */
         nautilus_file_ref (file);
         gtk_object_set_data_full (GTK_OBJECT (background),
-                                  "nautilus_background_file",
+                                  "eel_background_file",
                                   file,
                                   (GtkDestroyNotify) nautilus_file_unref);
 
diff --git a/libnautilus-extensions/nautilus-directory-background.h b/libnautilus-extensions/nautilus-directory-background.h
index 78f1a2b07..31f376038 100644
--- a/libnautilus-extensions/nautilus-directory-background.h
+++ b/libnautilus-extensions/nautilus-directory-background.h
@@ -26,7 +26,7 @@
 
 #include <gtk/gtkwidget.h>
 #include "nautilus-file.h"
-#include "nautilus-background.h"
+#include <eel/eel-background.h>
 #include "libnautilus-extensions/nautilus-icon-container.h"
 
 void nautilus_connect_background_to_file_metadata         (GtkWidget         *widget,
@@ -35,5 +35,5 @@ void nautilus_connect_desktop_background_to_file_metadata (NautilusIconContainer
                                                            NautilusFile		 *file);
 void nautilus_connect_background_to_file_metadata_by_uri  (GtkWidget         *widget,
                                                            const char        *uri);
-gboolean nautilus_file_background_is_set		  (NautilusBackground *background);
+gboolean nautilus_file_background_is_set		  (EelBackground *background);
 
diff --git a/libnautilus-extensions/nautilus-directory-metafile-monitor.c b/libnautilus-extensions/nautilus-directory-metafile-monitor.c
index 47251d0b3..27dd58d72 100644
--- a/libnautilus-extensions/nautilus-directory-metafile-monitor.c
+++ b/libnautilus-extensions/nautilus-directory-metafile-monitor.c
@@ -26,8 +26,8 @@
 #include "nautilus-directory-private.h"
 #include "nautilus-file-private.h"
 
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
 #include <libnautilus/nautilus-bonobo-workarounds.h>
 
@@ -72,7 +72,7 @@ destroy (GtkObject *object)
 	monitor = NAUTILUS_METAFILE_MONITOR (object);
 	g_free (monitor->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 NautilusMetafileMonitor *
diff --git a/libnautilus-extensions/nautilus-directory-metafile.c b/libnautilus-extensions/nautilus-directory-metafile.c
index 8cb75bdfa..06038abd1 100644
--- a/libnautilus-extensions/nautilus-directory-metafile.c
+++ b/libnautilus-extensions/nautilus-directory-metafile.c
@@ -30,7 +30,7 @@
 #include <libnautilus-extensions/nautilus-metafile-factory.h>
 #include <libnautilus-extensions/nautilus-directory-metafile-monitor.h>
 #include <libnautilus-extensions/nautilus-metafile-server.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 #include <liboaf/liboaf.h>
 #include <stdio.h>
 
@@ -128,8 +128,8 @@ nautilus_directory_get_file_metadata (NautilusDirectory *directory,
 	CORBA_char *corba_value;
 
 	g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (file_name), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (key), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (file_name), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (key), NULL);
 	
 	/* We can't pass NULL as a CORBA_string - pass "" instead. */
 	non_null_default = default_metadata != NULL ? default_metadata : "";
@@ -143,7 +143,7 @@ nautilus_directory_get_file_metadata (NautilusDirectory *directory,
 	CORBA_exception_free (&ev);
 	bonobo_object_release_unref (metafile, NULL);
 
-	if (nautilus_str_is_empty (corba_value)) {
+	if (eel_str_is_empty (corba_value)) {
 		/* Even though in all other respects we treat "" as NULL, we want to
 		 * make sure the caller gets back the same default that was passed in.
 		 */
@@ -171,9 +171,9 @@ nautilus_directory_get_file_metadata_list (NautilusDirectory *directory,
 	CORBA_unsigned_long    buf_pos;
 
 	g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (file_name), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (list_key), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (list_subkey), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (file_name), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (list_key), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (list_subkey), NULL);
 	
 	metafile = get_metafile (directory);
 	CORBA_exception_init (&ev);
@@ -205,8 +205,8 @@ nautilus_directory_set_file_metadata (NautilusDirectory *directory,
 	Nautilus_Metafile metafile;
 
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
-	g_return_if_fail (!nautilus_str_is_empty (file_name));
-	g_return_if_fail (!nautilus_str_is_empty (key));
+	g_return_if_fail (!eel_str_is_empty (file_name));
+	g_return_if_fail (!eel_str_is_empty (key));
 	
 	/* We can't pass NULL as a CORBA_string - pass "" instead.
 	 */
@@ -243,9 +243,9 @@ nautilus_directory_set_file_metadata_list (NautilusDirectory *directory,
 	GList   *list_ptr;
 
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
-	g_return_if_fail (!nautilus_str_is_empty (file_name));
-	g_return_if_fail (!nautilus_str_is_empty (list_key));
-	g_return_if_fail (!nautilus_str_is_empty (list_subkey));
+	g_return_if_fail (!eel_str_is_empty (file_name));
+	g_return_if_fail (!eel_str_is_empty (list_key));
+	g_return_if_fail (!eel_str_is_empty (list_subkey));
 	
 	len = g_list_length (list);
 	
diff --git a/libnautilus-extensions/nautilus-directory.c b/libnautilus-extensions/nautilus-directory.c
index 1d53acf8a..fe5a3ba9a 100644
--- a/libnautilus-extensions/nautilus-directory.c
+++ b/libnautilus-extensions/nautilus-directory.c
@@ -25,20 +25,20 @@
 #include <config.h>
 #include "nautilus-directory-private.h"
 
-#include "nautilus-metafile.h"
 #include "nautilus-directory-metafile.h"
 #include "nautilus-directory-notify.h"
 #include "nautilus-file-private.h"
 #include "nautilus-file-utilities.h"
-#include "nautilus-glib-extensions.h"
 #include "nautilus-global-preferences.h"
-#include "nautilus-gtk-macros.h"
 #include "nautilus-lib-self-check-functions.h"
 #include "nautilus-metadata.h"
-#include "nautilus-string.h"
+#include "nautilus-metafile.h"
 #include "nautilus-trash-directory.h"
 #include "nautilus-vfs-directory.h"
 #include <ctype.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-string.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 
@@ -71,7 +71,7 @@ static char *             real_get_name_for_self_as_new_file  (NautilusDirectory
 static void               set_directory_uri                   (NautilusDirectory      *directory,
 							       const char             *new_uri);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusDirectory,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusDirectory,
 				   nautilus_directory,
 				   GTK_TYPE_OBJECT)
 
@@ -167,7 +167,7 @@ nautilus_directory_destroy (GtkObject *object)
 
 	if (directory->details->monitor_list != NULL) {
 		g_warning ("destroying a NautilusDirectory while it's being monitored");
-		nautilus_g_list_free_deep (directory->details->monitor_list);
+		eel_g_list_free_deep (directory->details->monitor_list);
 	}
 
 	if (directory->details->metafile_monitor != NULL) {
@@ -198,7 +198,7 @@ nautilus_directory_destroy (GtkObject *object)
 
 	g_free (directory->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -231,7 +231,7 @@ emit_change_signals_for_all_files (NautilusDirectory *directory)
 {
 	GList *files;
 
-	files = nautilus_g_list_copy (directory->details->file_list);
+	files = eel_g_list_copy (directory->details->file_list);
 	if (directory->details->as_file != NULL) {
 		files = g_list_prepend (files, directory->details->as_file);
 	}
@@ -323,7 +323,7 @@ nautilus_directory_make_uri_canonical (const char *uri)
 	 * NautilusDirectories for the same location from being
 	 * created. (See bugzilla.eazel.com 3322 for an example.)
 	 */
-	canonical = nautilus_str_strip_trailing_chr (canonical_maybe_trailing_slash, '/');
+	canonical = eel_str_strip_trailing_chr (canonical_maybe_trailing_slash, '/');
 	if (strcmp (canonical, canonical_maybe_trailing_slash) != 0) {
 		/* If some trailing '/' were stripped, there's the possibility,
 		 * that we stripped away all the '/' from a uri that has only
@@ -367,7 +367,7 @@ nautilus_directory_get_internal (const char *uri, gboolean create)
 
 	/* Create the hash table first time through. */
 	if (directories == NULL) {
-		directories = nautilus_g_hash_table_new_free_at_exit
+		directories = eel_g_hash_table_new_free_at_exit
 			(g_str_hash, g_str_equal, "nautilus-directory.c: directories");
 
 		add_preferences_callbacks ();
@@ -456,7 +456,7 @@ nautilus_directory_get_name_for_self_as_new_file (NautilusDirectory *directory)
 {
 	g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL);
 	
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_DIRECTORY_CLASS, directory,
 		 get_name_for_self_as_new_file, (directory));
 }
@@ -524,7 +524,7 @@ nautilus_directory_are_all_files_seen (NautilusDirectory *directory)
 {
 	g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), FALSE);
 	
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_DIRECTORY_CLASS, directory,
 		 are_all_files_seen, (directory));
 }
@@ -672,7 +672,7 @@ nautilus_directory_find_file_by_internal_uri (NautilusDirectory *directory,
 {
 	NautilusFile *result;
 
-	if (nautilus_strcmp (relative_uri, ".") == 0) {
+	if (eel_strcmp (relative_uri, ".") == 0) {
 		result = nautilus_directory_get_existing_corresponding_file (directory);
 		if (result != NULL) {
 			nautilus_file_unref (result);
@@ -1033,7 +1033,7 @@ collect_directories_by_prefix (gpointer key, gpointer value, gpointer callback_d
 	directory = NAUTILUS_DIRECTORY (value);
 	collect_data = (CollectData *) callback_data;
 	
-	if (nautilus_str_has_prefix (uri, collect_data->uri_prefix)) {
+	if (eel_str_has_prefix (uri, collect_data->uri_prefix)) {
 		uri_suffix = &uri[strlen (collect_data->uri_prefix)];
 		switch (uri_suffix[0]) {
 		case '\0':
@@ -1054,7 +1054,7 @@ str_replace_prefix (const char *str,
 {
 	const char *old_suffix;
 
-	g_return_val_if_fail (nautilus_str_has_prefix (str, old_prefix),
+	g_return_val_if_fail (eel_str_has_prefix (str, old_prefix),
 			      g_strdup (str));
 
 	old_suffix = &str [strlen (old_prefix)];
@@ -1365,7 +1365,7 @@ nautilus_directory_contains_file (NautilusDirectory *directory,
 		return FALSE;
 	}
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_DIRECTORY_CLASS, directory,
 		 contains_file, (directory, file));
 }
@@ -1406,7 +1406,7 @@ nautilus_directory_call_when_ready (NautilusDirectory *directory,
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (callback != NULL);
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(NAUTILUS_DIRECTORY_CLASS, directory,
 		 call_when_ready, (directory, file_attributes,
 				   callback, callback_data));
@@ -1421,7 +1421,7 @@ nautilus_directory_cancel_callback (NautilusDirectory *directory,
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (callback != NULL);
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(NAUTILUS_DIRECTORY_CLASS, directory,
 		 cancel_callback, (directory, callback, callback_data));
 }
@@ -1436,7 +1436,7 @@ nautilus_directory_file_monitor_add (NautilusDirectory *directory,
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (client != NULL);
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(NAUTILUS_DIRECTORY_CLASS, directory,
 		 file_monitor_add, (directory, client,
 				    monitor_hidden_files,
@@ -1451,7 +1451,7 @@ nautilus_directory_file_monitor_remove (NautilusDirectory *directory,
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (client != NULL);
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(NAUTILUS_DIRECTORY_CLASS, directory,
 		 file_monitor_remove, (directory, client));
 }
@@ -1461,7 +1461,7 @@ nautilus_directory_force_reload (NautilusDirectory *directory)
 {
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(NAUTILUS_DIRECTORY_CLASS, directory,
 		 force_reload, (directory));
 }
@@ -1471,14 +1471,14 @@ nautilus_directory_is_not_empty (NautilusDirectory *directory)
 {
 	g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), FALSE);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_DIRECTORY_CLASS, directory,
 		 is_not_empty, (directory));
 }
 
 #if !defined (NAUTILUS_OMIT_SELF_CHECK)
 
-#include "nautilus-debug.h"
+#include <eel/eel-debug.h>
 #include "nautilus-file-attributes.h"
 
 static int data_dummy;
@@ -1521,7 +1521,7 @@ nautilus_self_check_directory (void)
 	directory = nautilus_directory_get ("file:///etc");
 	file = nautilus_file_get ("file:///etc/passwd");
 
-	NAUTILUS_CHECK_INTEGER_RESULT (g_hash_table_size (directories), 1);
+	EEL_CHECK_INTEGER_RESULT (g_hash_table_size (directories), 1);
 
 	nautilus_directory_file_monitor_add
 		(directory, &data_dummy,
@@ -1539,30 +1539,30 @@ nautilus_self_check_directory (void)
 	}
 
 	nautilus_file_set_metadata (file, "test", "default", "value");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_file_get_metadata (file, "test", "default"), "value");
+	EEL_CHECK_STRING_RESULT (nautilus_file_get_metadata (file, "test", "default"), "value");
 
 	nautilus_file_set_boolean_metadata (file, "test_boolean", TRUE, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_get_boolean_metadata (file, "test_boolean", TRUE), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_get_boolean_metadata (file, "test_boolean", TRUE), TRUE);
 	nautilus_file_set_boolean_metadata (file, "test_boolean", TRUE, FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_get_boolean_metadata (file, "test_boolean", TRUE), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_get_boolean_metadata (NULL, "test_boolean", TRUE), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_get_boolean_metadata (file, "test_boolean", TRUE), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_get_boolean_metadata (NULL, "test_boolean", TRUE), TRUE);
 
 	nautilus_file_set_integer_metadata (file, "test_integer", 0, 17);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "test_integer", 0), 17);
+	EEL_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "test_integer", 0), 17);
 	nautilus_file_set_integer_metadata (file, "test_integer", 0, -1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "test_integer", 0), -1);
+	EEL_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "test_integer", 0), -1);
 	nautilus_file_set_integer_metadata (file, "test_integer", 42, 42);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "test_integer", 42), 42);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (NULL, "test_integer", 42), 42);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "nonexistent_key", 42), 42);
+	EEL_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "test_integer", 42), 42);
+	EEL_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (NULL, "test_integer", 42), 42);
+	EEL_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "nonexistent_key", 42), 42);
 
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_directory_get ("file:///etc") == directory, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_directory_get ("file:///etc") == directory, TRUE);
 	nautilus_directory_unref (directory);
 
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_directory_get ("file:///etc/") == directory, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_directory_get ("file:///etc/") == directory, TRUE);
 	nautilus_directory_unref (directory);
 
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_directory_get ("file:///etc////") == directory, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_directory_get ("file:///etc////") == directory, TRUE);
 	nautilus_directory_unref (directory);
 
 	nautilus_file_unref (file);
@@ -1575,7 +1575,7 @@ nautilus_self_check_directory (void)
 		gtk_main_iteration ();
 	}
 
-	NAUTILUS_CHECK_INTEGER_RESULT (g_hash_table_size (directories), 0);
+	EEL_CHECK_INTEGER_RESULT (g_hash_table_size (directories), 0);
 
 	directory = nautilus_directory_get ("file:///etc");
 
@@ -1589,7 +1589,7 @@ nautilus_self_check_directory (void)
 		gtk_main_iteration ();
 	}
 
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_directory_is_metadata_read (directory), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_directory_is_metadata_read (directory), TRUE);
 
 	got_files_flag = FALSE;
 
@@ -1603,51 +1603,51 @@ nautilus_self_check_directory (void)
 		gtk_main_iteration ();
 	}
 
-	NAUTILUS_CHECK_BOOLEAN_RESULT (directory->details->file_list == NULL, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (directory->details->file_list == NULL, TRUE);
 
-	NAUTILUS_CHECK_INTEGER_RESULT (g_hash_table_size (directories), 1);
+	EEL_CHECK_INTEGER_RESULT (g_hash_table_size (directories), 1);
 
 	file = nautilus_file_get ("file:///etc/passwd");
 
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_file_get_metadata (file, "test", "default"), "value");
+	EEL_CHECK_STRING_RESULT (nautilus_file_get_metadata (file, "test", "default"), "value");
 	
 	nautilus_file_unref (file);
 
 	nautilus_directory_unref (directory);
 
-	NAUTILUS_CHECK_INTEGER_RESULT (g_hash_table_size (directories), 0);
+	EEL_CHECK_INTEGER_RESULT (g_hash_table_size (directories), 0);
 
 	/* escape_slashes: code is now in gnome-vfs, but lets keep the tests here for now */
-	NAUTILUS_CHECK_STRING_RESULT (gnome_vfs_escape_slashes (""), "");
-	NAUTILUS_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("/"), "%2F");
-	NAUTILUS_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("%"), "%25");
-	NAUTILUS_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("a/a"), "a%2Fa");
-	NAUTILUS_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("a%a"), "a%25a");
-	NAUTILUS_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("%25"), "%2525");
-	NAUTILUS_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("%2F"), "%252F");
+	EEL_CHECK_STRING_RESULT (gnome_vfs_escape_slashes (""), "");
+	EEL_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("a"), "a");
+	EEL_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("/"), "%2F");
+	EEL_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("%"), "%25");
+	EEL_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("a/a"), "a%2Fa");
+	EEL_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("a%a"), "a%25a");
+	EEL_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("%25"), "%2525");
+	EEL_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("%2F"), "%252F");
 
 	/* nautilus_directory_make_uri_canonical */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical (""), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("file:/"), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("file:///"), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("TRASH:XXX"), NAUTILUS_TRASH_URI);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("trash:xxx"), NAUTILUS_TRASH_URI);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("GNOME-TRASH:XXX"), NAUTILUS_TRASH_URI);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("gnome-trash:xxx"), NAUTILUS_TRASH_URI);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("file:///home/mathieu/"), "file:///home/mathieu");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("file:///home/mathieu"), "file:///home/mathieu");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("ftp://mathieu:password@le-hackeur.org"), "ftp://mathieu:password@le-hackeur.org");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("ftp://mathieu:password@le-hackeur.org/"), "ftp://mathieu:password@le-hackeur.org");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org"), "http://le-hackeur.org");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org/"), "http://le-hackeur.org");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org/dir"), "http://le-hackeur.org/dir");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org/dir/"), "http://le-hackeur.org/dir");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical (""), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("file:/"), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("file:///"), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("TRASH:XXX"), NAUTILUS_TRASH_URI);
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("trash:xxx"), NAUTILUS_TRASH_URI);
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("GNOME-TRASH:XXX"), NAUTILUS_TRASH_URI);
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("gnome-trash:xxx"), NAUTILUS_TRASH_URI);
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("file:///home/mathieu/"), "file:///home/mathieu");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("file:///home/mathieu"), "file:///home/mathieu");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("ftp://mathieu:password@le-hackeur.org"), "ftp://mathieu:password@le-hackeur.org");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("ftp://mathieu:password@le-hackeur.org/"), "ftp://mathieu:password@le-hackeur.org");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org"), "http://le-hackeur.org");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org/"), "http://le-hackeur.org");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org/dir"), "http://le-hackeur.org/dir");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org/dir/"), "http://le-hackeur.org/dir");
 	/* FIXME bugzilla.eazel.com 5068: the "nested" URI loses some characters here. Maybe that's OK because we escape them in practice? */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("search://[file://]file_name contains stuff"), "search://[file/]file_name contains stuff");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("search://[file://]file_name contains stuff"), "search://[file/]file_name contains stuff");
 #ifdef EAZEL_SERVICES
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("eazel-services:/~turtle"), "eazel-services:///~turtle");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("eazel-services:///~turtle"), "eazel-services:///~turtle");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("eazel-services:/~turtle"), "eazel-services:///~turtle");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("eazel-services:///~turtle"), "eazel-services:///~turtle");
 #endif	
 }
 
diff --git a/libnautilus-extensions/nautilus-drag-window.c b/libnautilus-extensions/nautilus-drag-window.c
index 5b48855c4..0f039875e 100644
--- a/libnautilus-extensions/nautilus-drag-window.c
+++ b/libnautilus-extensions/nautilus-drag-window.c
@@ -28,7 +28,7 @@
 #include <config.h>
 #include "nautilus-drag-window.h"
 
-#include "nautilus-gdk-extensions.h"
+#include <eel/eel-gdk-extensions.h>
 #include <gtk/gtk.h>
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
@@ -103,7 +103,7 @@ execute_pending_requests (GtkWindow *window,
 {
 	if (GTK_WIDGET_REALIZED (window)) {
 		if (details->pending_focus) {
-			nautilus_gdk_window_focus (GTK_WIDGET (window)->window,
+			eel_gdk_window_focus (GTK_WIDGET (window)->window,
 						   details->focus_timestamp);
 			details->pending_focus = FALSE;
 		}
@@ -331,7 +331,7 @@ nautilus_drag_window_realize (GtkWidget *widget, gpointer data)
 	GdkAtom protocols[3];
 
 	/* Tell the window manager _not_ to focus this window by itself */
-	nautilus_gdk_window_set_wm_hints_input (widget->window, FALSE);
+	eel_gdk_window_set_wm_hints_input (widget->window, FALSE);
 
 	/* Set WM_PROTOCOLS to the usual two atoms plus something that tells
 	 * sawfish to send messages telling us when we might want to raise
@@ -341,7 +341,7 @@ nautilus_drag_window_realize (GtkWidget *widget, gpointer data)
 	protocols[0] = gdk_wm_delete_window;
 	protocols[1] = gdk_wm_take_focus;
 	protocols[2] = sawfish_wm_raise_window;
-	nautilus_gdk_window_set_wm_protocols (widget->window, protocols, 3);
+	eel_gdk_window_set_wm_protocols (widget->window, protocols, 3);
 }
 
 
diff --git a/libnautilus-extensions/nautilus-drag.c b/libnautilus-extensions/nautilus-drag.c
index ff5028baf..5735c1b44 100644
--- a/libnautilus-extensions/nautilus-drag.c
+++ b/libnautilus-extensions/nautilus-drag.c
@@ -39,10 +39,10 @@
 #include <string.h>
 #include <gtk/gtkmain.h>
 
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 #include "nautilus-link.h"
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 
 #define NAUTILUS_COMMAND_SPECIFIER "command:"
 
@@ -328,7 +328,7 @@ nautilus_drag_default_drop_action_for_icons (GdkDragContext *context,
 		*non_default_action = GDK_ACTION_MOVE;
 		return;
 
-	} else if (nautilus_str_has_prefix (target_uri_string, NAUTILUS_COMMAND_SPECIFIER)) {
+	} else if (eel_str_has_prefix (target_uri_string, NAUTILUS_COMMAND_SPECIFIER)) {
 		*default_action = GDK_ACTION_MOVE;
 		*non_default_action = GDK_ACTION_MOVE;
 		return;
@@ -635,7 +635,7 @@ nautilus_drag_autoscroll_start (NautilusDragInfo *drag_info,
 	if (nautilus_drag_autoscroll_in_scroll_region (widget)) {
 		if (drag_info->auto_scroll_timeout_id == 0) {
 			drag_info->waiting_to_autoscroll = TRUE;
-			drag_info->start_auto_scroll_in = nautilus_get_system_time() 
+			drag_info->start_auto_scroll_in = eel_get_system_time() 
 				+ AUTOSCROLL_INITIAL_DELAY;
 			
 			drag_info->auto_scroll_timeout_id = gtk_timeout_add
@@ -685,5 +685,5 @@ nautilus_drag_file_receive_dropped_keyword (NautilusFile *file, char *keyword)
 	}
 	
 	nautilus_file_set_keywords (file, keywords);
-	nautilus_g_list_free_deep (keywords);
+	eel_g_list_free_deep (keywords);
 }
diff --git a/libnautilus-extensions/nautilus-druid-page-eazel.c b/libnautilus-extensions/nautilus-druid-page-eazel.c
index ab5324daa..51b9d8a53 100644
--- a/libnautilus-extensions/nautilus-druid-page-eazel.c
+++ b/libnautilus-extensions/nautilus-druid-page-eazel.c
@@ -27,7 +27,7 @@
 
 #include "nautilus-druid-page-eazel.h"
 
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomeui/libgnomeui.h>
@@ -80,7 +80,7 @@ static void nautilus_druid_page_eazel_prepare       (GnomeDruidPage *page,
 #define DRUID_PAGE_MIN_WIDTH 516
 #define DRUID_PAGE_BORDER 24
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusDruidPageEazel, nautilus_druid_page_eazel, GNOME_TYPE_DRUID_PAGE)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusDruidPageEazel, nautilus_druid_page_eazel, GNOME_TYPE_DRUID_PAGE)
 
 static void
 nautilus_druid_page_eazel_initialize_class (NautilusDruidPageEazelClass *klass)
@@ -145,7 +145,7 @@ nautilus_druid_page_eazel_destroy(GtkObject *object)
 	druid_page_eazel->widget = NULL;
 
 	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -158,7 +158,7 @@ nautilus_druid_page_eazel_finalize (GtkObject *object)
 	druid_page_eazel->details = NULL;
 
 	/* Chain finalize */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
 }
 
 static void
@@ -418,7 +418,7 @@ static void
 nautilus_druid_page_eazel_size_allocate(GtkWidget               *widget,
 					GtkAllocation           *allocation)
 {
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate,
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate,
 			      (widget, allocation));
 
 	gnome_canvas_set_scroll_region (GNOME_CANVAS (NAUTILUS_DRUID_PAGE_EAZEL (widget)->canvas),
@@ -439,7 +439,7 @@ nautilus_druid_page_eazel_size_request(GtkWidget           *widget,
 
 	druid_page_eazel = NAUTILUS_DRUID_PAGE_EAZEL (widget);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_request,
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_request,
 			      (widget, requisition));
 
 	if (druid_page_eazel->widget) {
diff --git a/libnautilus-extensions/nautilus-druid.c b/libnautilus-extensions/nautilus-druid.c
index d3a592cc9..49eeff81d 100644
--- a/libnautilus-extensions/nautilus-druid.c
+++ b/libnautilus-extensions/nautilus-druid.c
@@ -28,7 +28,7 @@
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnome/gnome-i18n.h>
 
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 static void nautilus_druid_initialize	(NautilusDruid		 *druid);
 static void nautilus_druid_initialize_class(NautilusDruidClass	 *klass);
@@ -37,7 +37,7 @@ static void nautilus_druid_size_request (GtkWidget               *widget,
 static void nautilus_druid_size_allocate(GtkWidget               *widget,
 					 GtkAllocation           *allocation);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusDruid, nautilus_druid, GNOME_TYPE_DRUID)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusDruid, nautilus_druid, GNOME_TYPE_DRUID)
 
 static void
 nautilus_druid_initialize_class (NautilusDruidClass *klass)
diff --git a/libnautilus-extensions/nautilus-ellipsizing-label.c b/libnautilus-extensions/nautilus-ellipsizing-label.c
deleted file mode 100644
index d7eee58e2..000000000
--- a/libnautilus-extensions/nautilus-ellipsizing-label.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-ellipsizing-label.c: Subclass of GtkLabel that ellipsizes the text.
-
-   Copyright (C) 2001 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Author: John Sullivan <sullivan@eazel.com>,
- */
-
-#include <config.h>
-#include "nautilus-ellipsizing-label.h"
-
-#include "nautilus-gdk-font-extensions.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-string.h"
-
-struct NautilusEllipsizingLabelDetails
-{
-	char *full_text;
-};
-
-static void nautilus_ellipsizing_label_initialize_class  (NautilusEllipsizingLabelClass *class);
-static void nautilus_ellipsizing_label_initialize        (NautilusEllipsizingLabel      *label);
-static void real_destroy				 (GtkObject			*object);
-static void real_size_request      			 (GtkWidget                     *widget,
-						    	  GtkRequisition                *requisition);
-static void real_size_allocate 	 			 (GtkWidget 			*widget, 
-							  GtkAllocation 		*allocation);
-static void real_style_set				 (GtkWidget			*widget,
-							  GtkStyle			*previous_style);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusEllipsizingLabel, nautilus_ellipsizing_label, GTK_TYPE_LABEL)
-
-static void
-nautilus_ellipsizing_label_initialize_class (NautilusEllipsizingLabelClass *klass)
-{
-	GtkWidgetClass *widget_class;
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	widget_class = GTK_WIDGET_CLASS (klass);
-
-	object_class->destroy = real_destroy;
-
-	widget_class->size_request = real_size_request;
-	widget_class->size_allocate = real_size_allocate;
-  	widget_class->style_set = real_style_set;
-}
-
-static void
-nautilus_ellipsizing_label_initialize (NautilusEllipsizingLabel *label)
-{
-	label->details = g_new0 (NautilusEllipsizingLabelDetails, 1);
-}
-
-static void
-real_destroy (GtkObject *object)
-{
-	NautilusEllipsizingLabel *label;
-
-	g_return_if_fail (NAUTILUS_IS_ELLIPSIZING_LABEL (object));
-
-	label = NAUTILUS_ELLIPSIZING_LABEL (object);
-
-	g_free (label->details->full_text);
-	g_free (label->details);
-}
-
-GtkWidget*
-nautilus_ellipsizing_label_new (const char *string)
-{
-	NautilusEllipsizingLabel *label;
-  
-	label = gtk_type_new (NAUTILUS_TYPE_ELLIPSIZING_LABEL);
-	nautilus_ellipsizing_label_set_text (label, string);
-  
-	return GTK_WIDGET (label);
-}
-
-static void
-recompute_ellipsized_text (NautilusEllipsizingLabel *label, int width)
-{
-	char *ellipsized_text;
-
-	if (label->details->full_text == NULL) {
-		ellipsized_text = NULL;
-	} else {
-		ellipsized_text = nautilus_string_ellipsize_middle (label->details->full_text, 
-								    GTK_WIDGET (label)->style->font, 
-								    width);
-	}
-
-	gtk_label_set_text (GTK_LABEL (label), ellipsized_text);
-	g_free (ellipsized_text);
-}
-
-void
-nautilus_ellipsizing_label_set_text (NautilusEllipsizingLabel *label, 
-				     const char *string)
-{
-	g_return_if_fail (NAUTILUS_IS_ELLIPSIZING_LABEL (label));
-
-	if (nautilus_str_is_equal (string, label->details->full_text)) {
-		return;
-	}
-
-	g_free (label->details->full_text);
-	label->details->full_text = g_strdup (string);
-
-	recompute_ellipsized_text (label, GTK_WIDGET (label)->allocation.width);
-}
-
-static void
-real_size_request (GtkWidget *widget, GtkRequisition *requisition)
-{
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_request, (widget, requisition));
-
-	/* Don't demand any particular width; will draw ellipsized into whatever size we're given */
-	requisition->width = 0;
-}
-
-static void	
-real_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
-{
-	recompute_ellipsized_text (NAUTILUS_ELLIPSIZING_LABEL (widget), allocation->width);
-	
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
-}
-
-static void 
-real_style_set (GtkWidget *widget, GtkStyle  *previous_style)
-{
-	recompute_ellipsized_text (NAUTILUS_ELLIPSIZING_LABEL (widget), widget->allocation.width);
-	
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, style_set, (widget, previous_style));
-}
-       			      
diff --git a/libnautilus-extensions/nautilus-ellipsizing-label.h b/libnautilus-extensions/nautilus-ellipsizing-label.h
deleted file mode 100644
index eed0b0821..000000000
--- a/libnautilus-extensions/nautilus-ellipsizing-label.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-ellipsizing-label.h: Subclass of GtkLabel that ellipsizes the text.
-
-   Copyright (C) 2001 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Author: John Sullivan <sullivan@eazel.com>,
- */
-
-#ifndef NAUTILUS_ELLIPSIZING_LABEL_H
-#define NAUTILUS_ELLIPSIZING_LABEL_H
-
-#include <gtk/gtklabel.h>
-
-#define NAUTILUS_TYPE_ELLIPSIZING_LABEL            (nautilus_ellipsizing_label_get_type ())
-#define NAUTILUS_ELLIPSIZING_LABEL(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_ELLIPSIZING_LABEL, NautilusEllipsizingLabel))
-#define NAUTILUS_ELLIPSIZING_LABEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_ELLIPSIZING_LABEL, NautilusEllipsizingLabelClass))
-#define NAUTILUS_IS_ELLIPSIZING_LABEL(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_ELLIPSIZING_LABEL))
-#define NAUTILUS_IS_ELLIPSIZING_LABEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_ELLIPSIZING_LABEL))
-
-typedef struct NautilusEllipsizingLabel NautilusEllipsizingLabel;
-typedef struct NautilusEllipsizingLabelClass NautilusEllipsizingLabelClass;
-
-typedef struct NautilusEllipsizingLabelDetails NautilusEllipsizingLabelDetails;
-
-struct NautilusEllipsizingLabel {
-	GtkLabel parent;
-	NautilusEllipsizingLabelDetails *details;
-};
-
-struct NautilusEllipsizingLabelClass {
-	GtkLabelClass parent_class;
-};
-
-GtkType    nautilus_ellipsizing_label_get_type  (void);
-GtkWidget *nautilus_ellipsizing_label_new       (const char 		  *string);
-void	   nautilus_ellipsizing_label_set_text  (NautilusEllipsizingLabel *label,
-						 const char 		  *string);
-
-#endif /* NAUTILUS_ELLIPSIZING_LABEL_H */
diff --git a/libnautilus-extensions/nautilus-entry.c b/libnautilus-extensions/nautilus-entry.c
index 0f406709d..a465563b9 100644
--- a/libnautilus-extensions/nautilus-entry.c
+++ b/libnautilus-extensions/nautilus-entry.c
@@ -27,12 +27,12 @@
 #include <config.h>
 #include "nautilus-entry.h"
 
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
+#include <eel/eel-gdk-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
 #include <libnautilus-extensions/nautilus-undo-signal-handlers.h>
 #include <orb/orbit.h>
@@ -54,7 +54,7 @@ static guint signals[LAST_SIGNAL];
 static void nautilus_entry_initialize       (NautilusEntry      *entry);
 static void nautilus_entry_initialize_class (NautilusEntryClass *class);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusEntry,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusEntry,
 				   nautilus_entry,
 				   GTK_TYPE_ENTRY)
 
@@ -120,7 +120,7 @@ nautilus_entry_destroy (GtkObject *object)
 
 	g_free (entry->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -131,7 +131,7 @@ obscure_cursor (NautilusEntry *entry)
 	}
 	
 	entry->details->cursor_obscured = TRUE;	
-	nautilus_gdk_window_set_invisible_cursor (GTK_ENTRY (entry)->text_area);
+	eel_gdk_window_set_invisible_cursor (GTK_ENTRY (entry)->text_area);
 }
 
 static gboolean
@@ -188,7 +188,7 @@ nautilus_entry_key_press (GtkWidget *widget, GdkEventKey *event)
 	
 	obscure_cursor (entry);
 
-	result = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	result = EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, key_press_event, (widget, event));
 
 	if (result) {
@@ -219,7 +219,7 @@ nautilus_entry_motion_notify (GtkWidget *widget, GdkEventMotion *event)
 	old_start_pos = GTK_EDITABLE (widget)->selection_start_pos;
 	old_end_pos = GTK_EDITABLE (widget)->selection_end_pos;
 
-	result = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	result = EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, motion_notify_event, (widget, event));
 
 	if (result) {
@@ -310,7 +310,7 @@ nautilus_entry_set_selection (GtkEditable *editable,
 			      int start_pos,
 			      int end_pos)
 {
-	NAUTILUS_CALL_PARENT (GTK_EDITABLE_CLASS, set_selection,
+	EEL_CALL_PARENT (GTK_EDITABLE_CLASS, set_selection,
 			      (editable, start_pos, end_pos));
 
 	gtk_signal_emit (GTK_OBJECT (editable), signals[SELECTION_CHANGED]);
@@ -322,7 +322,7 @@ nautilus_entry_button_press (GtkWidget *widget,
 {
 	gboolean result;
 
-	result = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	result = EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, button_press_event, (widget, event));
 
 	if (result) {
@@ -338,7 +338,7 @@ nautilus_entry_button_release (GtkWidget *widget,
 {
 	gboolean result;
 
-	result = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	result = EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, button_release_event, (widget, event));
 
 	if (result) {
@@ -361,7 +361,7 @@ nautilus_entry_insert_text (GtkEditable *editable, const gchar *text,
 		gtk_signal_emit (GTK_OBJECT (editable), signals[USER_CHANGED]);
 	}
 
-	NAUTILUS_CALL_PARENT (GTK_EDITABLE_CLASS, insert_text, 
+	EEL_CALL_PARENT (GTK_EDITABLE_CLASS, insert_text, 
 			      (editable, text, length, position));
 
 	gtk_signal_emit (GTK_OBJECT (editable), signals[SELECTION_CHANGED]);
@@ -379,7 +379,7 @@ nautilus_entry_delete_text (GtkEditable *editable, int start_pos, int end_pos)
 		gtk_signal_emit (GTK_OBJECT (editable), signals[USER_CHANGED]);
 	}
 	
-	NAUTILUS_CALL_PARENT (GTK_EDITABLE_CLASS, delete_text, 
+	EEL_CALL_PARENT (GTK_EDITABLE_CLASS, delete_text, 
 			      (editable, start_pos, end_pos));
 
 	gtk_signal_emit (GTK_OBJECT (editable), signals[SELECTION_CHANGED]);
@@ -403,7 +403,7 @@ nautilus_entry_selection_clear (GtkWidget *widget,
 		return FALSE;
 	}
 	
-	return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	return EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, selection_clear_event, (widget, event));
 }
 
diff --git a/libnautilus-extensions/nautilus-enumeration.c b/libnautilus-extensions/nautilus-enumeration.c
deleted file mode 100644
index 3217e8c84..000000000
--- a/libnautilus-extensions/nautilus-enumeration.c
+++ /dev/null
@@ -1,337 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-enumeration.c: Enumeration data structure.
-
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-enumeration.h"
-
-#include "nautilus-glib-extensions.h"
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-string.h"
-
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-
-struct NautilusEnumeration
-{
-	NautilusStringList *entries;
-	NautilusStringList *descriptions;
-	GList *values;
-};
-
-/**
- * nautilus_enumeration_new:
- *
- * Return value: A newly constructed empty enumeration.
- */
-NautilusEnumeration *
-nautilus_enumeration_new (void)
-{
-	NautilusEnumeration *enumeration;
-	
-	enumeration = g_new0 (NautilusEnumeration, 1);
-
-	return enumeration;
-}
-
-void
-nautilus_enumeration_free (NautilusEnumeration *enumeration)
-{
-	if (enumeration == NULL) {
-		return;
-	}
-	
-	nautilus_string_list_free (enumeration->entries);
-	nautilus_string_list_free (enumeration->descriptions);
-	g_list_free (enumeration->values);
-	
-	g_free (enumeration);
-}
-
-void
-nautilus_enumeration_insert (NautilusEnumeration *enumeration,
-			     const char *entry,
-			     const char *description,
-			     int value)
-{
-	g_return_if_fail (enumeration != NULL);
-	g_return_if_fail (entry != NULL);
-
-	if (enumeration->entries == NULL) {
-		enumeration->entries =nautilus_string_list_new (TRUE);
-	}
-	
-	if (enumeration->descriptions == NULL) {
-		enumeration->descriptions = nautilus_string_list_new (TRUE);
-	}
-
-	nautilus_string_list_insert (enumeration->entries, entry);
-	nautilus_string_list_insert (enumeration->descriptions, description ? description : "");
-	enumeration->values = g_list_append (enumeration->values, GINT_TO_POINTER (value));
-}
-
-char *
-nautilus_enumeration_get_nth_entry (const NautilusEnumeration *enumeration,
-				    guint n)
-{
-	g_return_val_if_fail (enumeration != NULL, NULL);
-	g_return_val_if_fail (n < nautilus_string_list_get_length (enumeration->entries), NULL);
-
-	return nautilus_string_list_nth (enumeration->entries, n);
-}
-
-char *
-nautilus_enumeration_get_nth_description (const NautilusEnumeration *enumeration,
-					  guint n)
-{
-	g_return_val_if_fail (enumeration != NULL, NULL);
-	g_return_val_if_fail (n < nautilus_string_list_get_length (enumeration->descriptions), NULL);
-
-	return nautilus_string_list_nth (enumeration->descriptions, n);
-}
-
-int
-nautilus_enumeration_get_nth_value (const NautilusEnumeration *enumeration,
-				    guint n)
-{
-	g_return_val_if_fail (enumeration != NULL, 0);
-	g_return_val_if_fail (n < g_list_length (enumeration->values), 0);
-	
-	return GPOINTER_TO_INT (g_list_nth_data (enumeration->values, n));
-}
-
-guint
-nautilus_enumeration_get_num_entries (const NautilusEnumeration *enumeration)
-{
-	g_return_val_if_fail (enumeration != NULL, 0);
-
-	return nautilus_string_list_get_length (enumeration->entries);
-}
-
-NautilusEnumeration *
-nautilus_enumeration_new_from_tokens (const char *entries,
-				      const char *descriptions,
-				      const char *values,
-				      const char *delimiter)
-{
-	NautilusEnumeration *enumeration;
-	NautilusStringList *entry_list;
-	NautilusStringList *description_list;
-	NautilusStringList *value_list;
-	guint i;
-	int value;
-
-	g_return_val_if_fail (entries != NULL, NULL);
-	g_return_val_if_fail (entries[0] != '\0', NULL);
-	g_return_val_if_fail (values != NULL, NULL);
-	g_return_val_if_fail (values[0] != '\0', NULL);
-	g_return_val_if_fail (delimiter != NULL, NULL);
-	g_return_val_if_fail (delimiter[0] != '\0', NULL);
-
-	enumeration = nautilus_enumeration_new ();	
-
-	entry_list = nautilus_string_list_new_from_tokens (entries, delimiter, TRUE);
-	value_list = nautilus_string_list_new_from_tokens (values, delimiter, TRUE);
-
-	if (nautilus_string_list_get_length (entry_list)
-	    != nautilus_string_list_get_length (value_list)) {
-		g_warning ("entries and values have different lengths.");
-		nautilus_string_list_free (entry_list);
-		nautilus_string_list_free (value_list);
-		return NULL;
-	}
-
-	description_list = 
-		descriptions != NULL ? 
-		nautilus_string_list_new_from_tokens (descriptions, delimiter, TRUE) :
-		NULL;
-
-	if (description_list != NULL) {
-		if (nautilus_string_list_get_length (entry_list)
-		    != nautilus_string_list_get_length (description_list)) {
-			g_warning ("entries and descriptions have different lengths.");
-			nautilus_string_list_free (entry_list);
-			nautilus_string_list_free (value_list);
-			nautilus_string_list_free (description_list);
-			return NULL;
-		}
-	}
-
-	enumeration->entries = entry_list;
-
-	if (description_list == NULL) {
-		description_list = nautilus_string_list_new (TRUE);
-
-		for (i = 0; i < nautilus_string_list_get_length (entry_list); i++) {
-			nautilus_string_list_insert (description_list, "");
-		}
-	}
-	
-	enumeration->entries = entry_list;
-	enumeration->descriptions = description_list;
-
-	for (i = 0; i < nautilus_string_list_get_length (entry_list); i++) {
-		if (!nautilus_string_list_nth_as_integer (value_list, i, &value)) {
-			g_warning ("Could not convert value '%d' to an integer.  Using 0.", i);
-			value = 0;
-		}
-
-		enumeration->values = g_list_append (enumeration->values, GINT_TO_POINTER (value));
-	}
-	nautilus_string_list_free (value_list);
-	
-	return enumeration;
-}
-
-int
-nautilus_enumeration_get_entry_position (const NautilusEnumeration *enumeration,
-					 const char *entry)
-{
-	g_return_val_if_fail (enumeration != NULL, NAUTILUS_STRING_LIST_NOT_FOUND);
-	g_return_val_if_fail (entry != NULL, NAUTILUS_STRING_LIST_NOT_FOUND);
-
-	if (enumeration->entries == NULL) {
-		return NAUTILUS_STRING_LIST_NOT_FOUND;
-	}
-
-	return nautilus_string_list_get_index_for_string (enumeration->entries, entry);
-}
-
-int
-nautilus_enumeration_get_value_position (const NautilusEnumeration *enumeration,
-					 int value)
-{
-	GList *node;
-	int pos;
-
-	g_return_val_if_fail (enumeration != NULL, NAUTILUS_STRING_LIST_NOT_FOUND);
-
-	if (enumeration->values == NULL) {
-		return NAUTILUS_STRING_LIST_NOT_FOUND;
-	}
-
-	for (node = enumeration->values, pos = 0; node != NULL; node = node->next, pos++) {
-		if (GPOINTER_TO_INT (node->data) == value) {
-			return pos;
-		}
-	}
-
-	return NAUTILUS_STRING_LIST_NOT_FOUND;
-}
-
-NautilusStringList *
-nautilus_enumeration_get_entries (const NautilusEnumeration *enumeration)
-{
-	g_return_val_if_fail (enumeration != NULL, NULL);
-
-	if (enumeration->entries == NULL) {
-		return NULL;
-	}
-
-	return nautilus_string_list_new_from_string_list (enumeration->entries, TRUE);
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-#define CHECK_ENUMERATION_ENTRY(enumeration, i, entry, description, value) \
- 	NAUTILUS_CHECK_STRING_RESULT (nautilus_enumeration_get_nth_entry (enumeration, i), entry); \
- 	NAUTILUS_CHECK_STRING_RESULT (nautilus_enumeration_get_nth_description (enumeration, i), description); \
- 	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_enumeration_get_nth_value (enumeration, i), value); \
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_enumeration_get_entry_position (enumeration, entry), i); \
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_enumeration_get_value_position (enumeration, value), i);
-
-void
-nautilus_self_check_enumeration (void)
-{
-	NautilusEnumeration *e;
-	NautilusStringList *entries;
-	NautilusStringList *entries_test;
-
-	/***/
-	e = nautilus_enumeration_new ();
-	nautilus_enumeration_insert (e, "foo", NULL, 0);
-	CHECK_ENUMERATION_ENTRY (e, 0, "foo", "", 0);
- 	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_enumeration_get_num_entries (e), 1);
-
-	nautilus_enumeration_insert (e, "bar", NULL, 1);
-	CHECK_ENUMERATION_ENTRY (e, 1, "bar", "", 1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_enumeration_get_num_entries (e), 2);
-
-	nautilus_enumeration_free (e);
-
-	/***/
-	e = nautilus_enumeration_new_from_tokens ("apple,orange,banana",
-						  NULL,
-						  "1,2,3",
-						  ",");
-	
-	CHECK_ENUMERATION_ENTRY (e, 0, "apple", "", 1);
-	CHECK_ENUMERATION_ENTRY (e, 1, "orange", "", 2);
-	CHECK_ENUMERATION_ENTRY (e, 2, "banana", "", 3);
- 	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_enumeration_get_num_entries (e), 3);
-	nautilus_enumeration_free (e);
-
-	/***/
-	e = nautilus_enumeration_new_from_tokens ("foo",
-						  NULL,
-						  "666",
-						  ",");
-	CHECK_ENUMERATION_ENTRY (e, 0, "foo", "", 666);
- 	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_enumeration_get_num_entries (e), 1);
-	nautilus_enumeration_free (e);
-
-	/***/
-	e = nautilus_enumeration_new_from_tokens ("red,green,blue",
-						  "Red Desc,Green Desc,Blue Desc",
-						  "10,20,30",
-						  ",");
-
-	CHECK_ENUMERATION_ENTRY (e, 0, "red", "Red Desc", 10);
-	CHECK_ENUMERATION_ENTRY (e, 1, "green", "Green Desc", 20);
-	CHECK_ENUMERATION_ENTRY (e, 2, "blue", "Blue Desc", 30);
- 	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_enumeration_get_num_entries (e), 3);
-	nautilus_enumeration_free (e);
-
-	/***/
-	e = nautilus_enumeration_new_from_tokens ("red,foo:green,bar:blue,baz",
-						  "Red,Desc:Green,Desc:Blue,Desc",
-						  "10:20:30",
-						  ":");
-
-	CHECK_ENUMERATION_ENTRY (e, 0, "red,foo", "Red,Desc", 10);
-	CHECK_ENUMERATION_ENTRY (e, 1, "green,bar", "Green,Desc", 20);
-	CHECK_ENUMERATION_ENTRY (e, 2, "blue,baz", "Blue,Desc", 30);
- 	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_enumeration_get_num_entries (e), 3);
-
-	entries = nautilus_enumeration_get_entries (e);
-	entries_test = nautilus_string_list_new_from_tokens ("red,foo:green,bar:blue,baz", ":", TRUE);
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_equals (entries, entries_test), TRUE);
-
-	nautilus_string_list_free (entries);
-	nautilus_string_list_free (entries_test);
-	nautilus_enumeration_free (e);
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-enumeration.h b/libnautilus-extensions/nautilus-enumeration.h
deleted file mode 100644
index d2881e9b2..000000000
--- a/libnautilus-extensions/nautilus-enumeration.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-enumeration.h: Enumeration data structure.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_ENUMERATION_H
-#define NAUTILUS_ENUMERATION_H
-
-#include <libnautilus-extensions/nautilus-string-list.h>
-
-/* Opaque NautilusEnumeration declaration. */
-typedef struct NautilusEnumeration NautilusEnumeration;
-
-NautilusEnumeration *nautilus_enumeration_new                 (void);
-void                 nautilus_enumeration_free                (NautilusEnumeration       *enumeration);
-void                 nautilus_enumeration_insert              (NautilusEnumeration       *enumeration,
-							       const char                *entry,
-							       const char                *description,
-							       int                        value);
-char *               nautilus_enumeration_get_nth_entry       (const NautilusEnumeration *enumeration,
-							       guint                      n);
-char *               nautilus_enumeration_get_nth_description (const NautilusEnumeration *enumeration,
-							       guint                      n);
-int                  nautilus_enumeration_get_nth_value       (const NautilusEnumeration *enumeration,
-							       guint                      n);
-guint                nautilus_enumeration_get_num_entries     (const NautilusEnumeration *enumeration);
-NautilusEnumeration *nautilus_enumeration_new_from_tokens     (const char                *entries,
-							       const char                *descriptions,
-							       const char                *values,
-							       const char                *delimiter);
-int                  nautilus_enumeration_get_entry_position  (const NautilusEnumeration *enumeration,
-							       const char                *entry);
-int                  nautilus_enumeration_get_value_position  (const NautilusEnumeration *enumeration,
-							       int                        value);
-NautilusStringList * nautilus_enumeration_get_entries         (const NautilusEnumeration *enumeration);
-
-#endif /* NAUTILUS_ENUMERATION_H */
-
diff --git a/libnautilus-extensions/nautilus-file-changes-queue.c b/libnautilus-extensions/nautilus-file-changes-queue.c
index d1a0c27fe..27ff87146 100644
--- a/libnautilus-extensions/nautilus-file-changes-queue.c
+++ b/libnautilus-extensions/nautilus-file-changes-queue.c
@@ -24,7 +24,7 @@
 #include "nautilus-file-changes-queue.h"
 
 #include "nautilus-directory-notify.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 
 #ifdef G_THREADS_ENABLED
 #define MUTEX_LOCK(a)	if ((a) != NULL) g_mutex_lock (a)
@@ -302,7 +302,7 @@ pairs_list_free (GList *pairs)
 	}
 
 	/* delete the list and the now empty pair structs */
-	nautilus_g_list_free_deep (pairs);
+	eel_g_list_free_deep (pairs);
 }
 
 static void
@@ -316,7 +316,7 @@ position_set_list_free (GList *list)
 		g_free (item->uri);
 	}
 	/* delete the list and the now empty structs */
-	nautilus_g_list_free_deep (list);
+	eel_g_list_free_deep (list);
 }
 
 /* go through changes in the change queue, send ones with the same kind
@@ -412,7 +412,7 @@ nautilus_file_changes_consume_changes (gboolean consume_all)
 			
 			if (deletions != NULL) {
 				nautilus_directory_notify_files_removed (deletions);
-				nautilus_g_list_free_deep (deletions);
+				eel_g_list_free_deep (deletions);
 				deletions = NULL;
 			}
 			if (moves != NULL) {
@@ -422,7 +422,7 @@ nautilus_file_changes_consume_changes (gboolean consume_all)
 			}
 			if (additions != NULL) {
 				nautilus_directory_notify_files_added (additions);
-				nautilus_g_list_free_deep (additions);
+				eel_g_list_free_deep (additions);
 				additions = NULL;
 			}
 			if (metadata_copy_requests != NULL) {
@@ -437,7 +437,7 @@ nautilus_file_changes_consume_changes (gboolean consume_all)
 			}
 			if (metadata_remove_requests != NULL) {
 				nautilus_directory_schedule_metadata_remove (metadata_remove_requests);
-				nautilus_g_list_free_deep (metadata_remove_requests);
+				eel_g_list_free_deep (metadata_remove_requests);
 				metadata_remove_requests = NULL;
 			}
 			if (position_set_requests != NULL) {
diff --git a/libnautilus-extensions/nautilus-file-operations-progress.c b/libnautilus-extensions/nautilus-file-operations-progress.c
index 339950baf..fd95bab49 100644
--- a/libnautilus-extensions/nautilus-file-operations-progress.c
+++ b/libnautilus-extensions/nautilus-file-operations-progress.c
@@ -29,11 +29,11 @@
 #include <config.h>
 #include "nautilus-file-operations-progress.h"
 
-#include "nautilus-ellipsizing-label.h"
-#include "nautilus-gdk-font-extensions.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-ellipsizing-label.h>
+#include <eel/eel-gdk-font-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkprogressbar.h>
@@ -56,7 +56,7 @@
 static void nautilus_file_operations_progress_initialize_class (NautilusFileOperationsProgressClass *klass);
 static void nautilus_file_operations_progress_initialize       (NautilusFileOperationsProgress      *dialog);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusFileOperationsProgress,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusFileOperationsProgress,
 				   nautilus_file_operations_progress,
 				   GNOME_TYPE_DIALOG);
 
@@ -103,17 +103,17 @@ nautilus_file_operations_progress_update (NautilusFileOperationsProgress *progre
 }
 
 static void
-set_text_unescaped_trimmed (NautilusEllipsizingLabel *label, const char *text)
+set_text_unescaped_trimmed (EelEllipsizingLabel *label, const char *text)
 {
 	char *unescaped_text;
 	
 	if (text == NULL || text[0] == '\0') {
-		nautilus_ellipsizing_label_set_text (label, "");
+		eel_ellipsizing_label_set_text (label, "");
 		return;
 	}
 	
 	unescaped_text = gnome_vfs_unescape_string_for_display (text);
-	nautilus_ellipsizing_label_set_text (label, unescaped_text);
+	eel_ellipsizing_label_set_text (label, unescaped_text);
 	g_free (unescaped_text);
 }
 
@@ -141,7 +141,7 @@ nautilus_file_operations_progress_destroy (GtkObject *object)
 
 	g_free (progress->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* Initialization.  */
@@ -150,7 +150,7 @@ static void
 create_titled_label (GtkTable *table, int row, GtkWidget **title_widget, GtkWidget **label_text_widget)
 {
 	*title_widget = gtk_label_new ("");
-	nautilus_gtk_label_make_bold (GTK_LABEL (*title_widget));
+	eel_gtk_label_make_bold (GTK_LABEL (*title_widget));
 	gtk_misc_set_alignment (GTK_MISC (*title_widget), 1, 0);
 	gtk_table_attach (table, *title_widget,
 			  0, 1,
@@ -159,7 +159,7 @@ create_titled_label (GtkTable *table, int row, GtkWidget **title_widget, GtkWidg
 			  0, 0);
 	gtk_widget_show (*title_widget);
 
-	*label_text_widget = nautilus_ellipsizing_label_new ("");
+	*label_text_widget = eel_ellipsizing_label_new ("");
 	gtk_table_attach (table, *label_text_widget,
 			  1, 2,
 			  row, row + 1,
@@ -176,9 +176,9 @@ map_callback (GtkWidget *widget)
 
 	progress = NAUTILUS_FILE_OPERATIONS_PROGRESS (widget);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, map, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, map, (widget));
 
-	progress->details->start_time = nautilus_get_system_time ();
+	progress->details->start_time = eel_get_system_time ();
 }
 
 static gboolean
@@ -215,7 +215,7 @@ nautilus_file_operations_progress_initialize (NautilusFileOperationsProgress *pr
 	gtk_label_set_justify (GTK_LABEL (progress->details->progress_title_label), GTK_JUSTIFY_LEFT);
 	gtk_box_pack_start (GTK_BOX (hbox), progress->details->progress_title_label, FALSE, FALSE, 0);
 	gtk_widget_show (progress->details->progress_title_label);
-	nautilus_gtk_label_make_bold (GTK_LABEL (progress->details->progress_title_label));
+	eel_gtk_label_make_bold (GTK_LABEL (progress->details->progress_title_label));
 
 
 	/* label -- */
@@ -224,7 +224,7 @@ nautilus_file_operations_progress_initialize (NautilusFileOperationsProgress *pr
 	gtk_label_set_justify (GTK_LABEL (progress->details->progress_count_label), GTK_JUSTIFY_RIGHT);
 	gtk_box_pack_end (GTK_BOX (hbox), progress->details->progress_count_label, FALSE, FALSE, 0);
 	gtk_widget_show (progress->details->progress_count_label);
-	nautilus_gtk_label_make_bold (GTK_LABEL (progress->details->progress_count_label));
+	eel_gtk_label_make_bold (GTK_LABEL (progress->details->progress_count_label));
 
 	/* progress bar */
 	progress->details->progress_bar = gtk_progress_bar_new ();
@@ -356,7 +356,7 @@ nautilus_file_operations_progress_new_file (NautilusFileOperationsProgress *prog
 		gtk_label_set_text (GTK_LABEL (progress->details->operation_name_label),
 				    progress_verb);
 		set_text_unescaped_trimmed 
-			(NAUTILUS_ELLIPSIZING_LABEL (progress->details->item_name),
+			(EEL_ELLIPSIZING_LABEL (progress->details->item_name),
 			 item_name);
 
 		progress_count = g_strdup_printf (_("%ld of %ld"), file_index + 1, 
@@ -366,12 +366,12 @@ nautilus_file_operations_progress_new_file (NautilusFileOperationsProgress *prog
 
 		gtk_label_set_text (GTK_LABEL (progress->details->from_label), from_prefix);
 		set_text_unescaped_trimmed 
-			(NAUTILUS_ELLIPSIZING_LABEL (progress->details->from_path_label), from_path);
+			(EEL_ELLIPSIZING_LABEL (progress->details->from_path_label), from_path);
 	
 		if (progress->details->to_prefix != NULL && progress->details->to_path_label != NULL) {
 			gtk_label_set_text (GTK_LABEL (progress->details->to_label), to_prefix);
 			set_text_unescaped_trimmed 
-				(NAUTILUS_ELLIPSIZING_LABEL (progress->details->to_path_label), to_path);
+				(EEL_ELLIPSIZING_LABEL (progress->details->to_path_label), to_path);
 		}
 	}
 
@@ -428,7 +428,7 @@ nautilus_file_operations_progress_done (NautilusFileOperationsProgress *progress
 	g_assert (progress->details->start_time != 0);
 
 	/* compute time up in milliseconds */
-	time_up = (nautilus_get_system_time () - progress->details->start_time) / 1000;
+	time_up = (eel_get_system_time () - progress->details->start_time) / 1000;
 	if (time_up >= MINIMUM_TIME_UP) {
 		gtk_object_destroy (GTK_OBJECT (progress));
 		return;
diff --git a/libnautilus-extensions/nautilus-file-operations.c b/libnautilus-extensions/nautilus-file-operations.c
index adf50f7e8..df0b46da5 100644
--- a/libnautilus-extensions/nautilus-file-operations.c
+++ b/libnautilus-extensions/nautilus-file-operations.c
@@ -29,6 +29,11 @@
 
 #include "nautilus-file-operations-progress.h"
 #include "nautilus-lib-self-check-functions.h"
+
+#include <eel/eel-gdk-font-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-stock-dialogs.h>
 #include <gnome.h>
 #include <gtk/gtklabel.h>
 #include <libgnomevfs/gnome-vfs-async-ops.h>
@@ -39,12 +44,8 @@
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-extensions/nautilus-file-changes-queue.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-gdk-font-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
 #include <libnautilus-extensions/nautilus-link.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
 #include <libnautilus-extensions/nautilus-trash-monitor.h>
 
 typedef enum {
@@ -85,7 +86,7 @@ transfer_info_new (GtkWidget *parent_view)
 	result = g_new0 (TransferInfo, 1);
 	result->parent_view = parent_view;
 	
-	nautilus_nullify_when_destroyed (&result->parent_view);
+	eel_nullify_when_destroyed (&result->parent_view);
 	
 	return result;
 }
@@ -93,14 +94,14 @@ transfer_info_new (GtkWidget *parent_view)
 static void
 transfer_info_destroy (TransferInfo *transfer_info)
 {
-	nautilus_nullify_cancel (&transfer_info->parent_view);
+	eel_nullify_cancel (&transfer_info->parent_view);
 	
 	if (transfer_info->progress_dialog != NULL) {
 		nautilus_file_operations_progress_done (transfer_info->progress_dialog);
 	}
 	
 	if (transfer_info->debuting_uris != NULL) {
-		nautilus_g_hash_table_destroy_deep (transfer_info->debuting_uris);
+		eel_g_hash_table_destroy_deep (transfer_info->debuting_uris);
 	}
 	
 	g_free (transfer_info);
@@ -133,7 +134,7 @@ icon_position_iterator_new (GArray *icon_positions, const GList *uris)
 	}
 	result->last_icon_position_index = 0;
 
-	result->uris = nautilus_g_str_list_copy ((GList *)uris);
+	result->uris = eel_g_str_list_copy ((GList *)uris);
 	result->last_uri = result->uris;
 
 	return result;
@@ -147,7 +148,7 @@ icon_position_iterator_free (IconPositionIterator *position_iterator)
 	}
 	
 	g_free (position_iterator->icon_positions);
-	nautilus_g_list_free_deep (position_iterator->uris);
+	eel_g_list_free_deep (position_iterator->uris);
 	g_free (position_iterator);
 }
 
@@ -235,7 +236,7 @@ ellipsize_string_for_dialog (const char *str)
 	/* FIXME: John Sullivan says we should ellipsize both URIs and
 	 * file names in the middle, not the start.
 	 */
-	result = nautilus_string_ellipsize_start (str, font, maximum_width);
+	result = eel_string_ellipsize_start (str, font, maximum_width);
 	gdk_font_unref (font);
 
 	return result;
@@ -974,7 +975,7 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
 
 		if (error_location == ERROR_LOCATION_TARGET) {
 			/* We can't continue, just tell the user. */
-			nautilus_run_simple_dialog (parent_for_error_dialog (transfer_info),
+			eel_run_simple_dialog (parent_for_error_dialog (transfer_info),
 				TRUE, text, dialog_title, _("Stop"), NULL);
 			error_dialog_result = GNOME_VFS_XFER_ERROR_ACTION_ABORT;
 
@@ -987,7 +988,7 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
 			 * in the moved/copied/deleted hierarchy, we can probably
 			 * continue. Allow the user to skip.
 			 */
-			error_dialog_button_pressed = nautilus_run_simple_dialog
+			error_dialog_button_pressed = eel_run_simple_dialog
 				(parent_for_error_dialog (transfer_info), TRUE, text, 
 				dialog_title,
 				 _("Skip"), _("Stop"), NULL);
@@ -1006,7 +1007,7 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
 								
 		} else {
 			/* Generic error, offer to retry and skip. */
-			error_dialog_button_pressed = nautilus_run_simple_dialog
+			error_dialog_button_pressed = eel_run_simple_dialog
 				(parent_for_error_dialog (transfer_info), TRUE, text, 
 				 dialog_title,
 				 _("Skip"), _("Retry"), _("Stop"), NULL);
@@ -1097,7 +1098,7 @@ handle_transfer_overwrite (const GnomeVFSXferProgressInfo *progress_info,
 						formatted_name, formatted_name);
 		}
 		
-		nautilus_run_simple_dialog (parent_for_error_dialog (transfer_info), TRUE, text,
+		eel_run_simple_dialog (parent_for_error_dialog (transfer_info), TRUE, text,
 					_("Unable to replace file."), _("OK"), NULL, NULL);
 
 		g_free (text);
@@ -1117,7 +1118,7 @@ handle_transfer_overwrite (const GnomeVFSXferProgressInfo *progress_info,
 		/* we are going to only get one duplicate alert, don't offer
 		 * Replace All
 		 */
-		result = nautilus_run_simple_dialog
+		result = eel_run_simple_dialog
 			(parent_for_error_dialog (transfer_info), TRUE, text, 
 			 _("Conflict while copying"),
 			 _("Replace"), _("Skip"), NULL);
@@ -1131,7 +1132,7 @@ handle_transfer_overwrite (const GnomeVFSXferProgressInfo *progress_info,
 			return GNOME_VFS_XFER_OVERWRITE_ACTION_SKIP;
 		}
 	} else {
-		result = nautilus_run_simple_dialog
+		result = eel_run_simple_dialog
 			(parent_for_error_dialog (transfer_info), TRUE, text, 
 			 _("Conflict while copying"),
 			 _("Replace All"), _("Replace"), _("Skip"), NULL);
@@ -1884,7 +1885,7 @@ nautilus_file_operations_copy_move (const GList *item_uris,
 	if ((move_options & GNOME_VFS_XFER_REMOVESOURCE) == 0) {
 		/* don't allow copying into Trash */
 		if (check_target_directory_is_or_in_trash (trash_dir_uri, target_dir_uri)) {
-			nautilus_run_simple_dialog
+			eel_run_simple_dialog
 				(parent_view, 
 				 FALSE,
 				 _("You cannot copy items into the Trash."), 
@@ -1910,7 +1911,7 @@ nautilus_file_operations_copy_move (const GList *item_uris,
 				 */
 			    	is_desktop_trash_link = vfs_uri_is_special_link (uri);
 
-				nautilus_run_simple_dialog
+				eel_run_simple_dialog
 					(parent_view, 
 					 FALSE,
 					 ((move_options & GNOME_VFS_XFER_REMOVESOURCE) != 0) 
@@ -1941,7 +1942,7 @@ nautilus_file_operations_copy_move (const GList *item_uris,
 			if ((move_options & GNOME_VFS_XFER_LINK_ITEMS) == 0
 				&& (gnome_vfs_uri_equal (uri, target_dir_uri)
 					|| gnome_vfs_uri_is_parent (uri, target_dir_uri, TRUE))) {
-				nautilus_run_simple_dialog
+				eel_run_simple_dialog
 					(parent_view, 
 					 FALSE,
 					 ((move_options & GNOME_VFS_XFER_REMOVESOURCE) != 0) 
@@ -1958,7 +1959,7 @@ nautilus_file_operations_copy_move (const GList *item_uris,
 			if ((move_options & GNOME_VFS_XFER_REMOVESOURCE) == 0
 			        && (move_options & GNOME_VFS_XFER_USE_UNIQUE_NAMES) == 0
 				&& gnome_vfs_uri_is_parent (target_dir_uri, uri, FALSE)) {
-				nautilus_run_simple_dialog
+				eel_run_simple_dialog
 					(parent_view, 
 					 FALSE,
 					 _("You cannot copy a file over itself."), 
@@ -2023,7 +2024,7 @@ handle_new_folder_vfs_error (const GnomeVFSXferProgressInfo *progress_info, NewF
 						gnome_vfs_result_to_string(progress_info->vfs_status));
 	}
 	
-	nautilus_show_error_dialog (error_string, _("Error creating new folder"),
+	eel_show_error_dialog (error_string, _("Error creating new folder"),
 				    GTK_WINDOW (state->parent_view));
 	
 	g_free (error_string_to_free);
@@ -2044,7 +2045,7 @@ new_folder_transfer_callback (GnomeVFSAsyncHandle *handle,
 	switch (progress_info->phase) {
 
 	case GNOME_VFS_XFER_PHASE_COMPLETED:
-		nautilus_nullify_cancel (&state->parent_view);
+		eel_nullify_cancel (&state->parent_view);
 		g_free (state);
 		return 0;
 
@@ -2105,7 +2106,7 @@ nautilus_file_operations_new_folder (GtkWidget *parent_view,
 	state->done_callback = done_callback;
 	state->data = data;
 	state->parent_view = parent_view;
-	nautilus_nullify_when_destroyed (&state->parent_view);
+	eel_nullify_when_destroyed (&state->parent_view);
 
 	/* pass in the target directory and the new folder name as a destination URI */
 	parent_uri = gnome_vfs_uri_new (parent_dir);
@@ -2213,7 +2214,7 @@ confirm_empty_trash (GtkWidget *parent_view)
 	
 	parent_window = GTK_WINDOW (gtk_widget_get_toplevel (parent_view));
 
-	dialog = nautilus_show_yes_no_dialog (
+	dialog = eel_show_yes_no_dialog (
 		_("Are you sure you want to permanently delete "
 		  "all of the items in the Trash?"),
 		_("Delete Trash Contents?"),
@@ -2254,43 +2255,43 @@ void
 nautilus_self_check_file_operations (void)
 {
 	/* test the next duplicate name generator */
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_(" (copy)"), 1), _(" (another copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo"), 1), _("foo (copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_(".bashrc"), 1), _(".bashrc (copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_(".foo.txt"), 1), _(".foo (copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo"), 1), _("foo foo (copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo.txt"), 1), _("foo (copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo.txt"), 1), _("foo foo (copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo.txt txt"), 1), _("foo foo (copy).txt txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo...txt"), 1), _("foo.. (copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo..."), 1), _("foo... (copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo. (copy)"), 1), _("foo. (another copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (copy)"), 1), _("foo (another copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (copy).txt"), 1), _("foo (another copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (another copy)"), 1), _("foo (3rd copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (another copy).txt"), 1), _("foo (3rd copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (another copy).txt"), 1), _("foo foo (3rd copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (13th copy)"), 1), _("foo (14th copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (13th copy).txt"), 1), _("foo (14th copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (21st copy)"), 1), _("foo (22nd copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (21st copy).txt"), 1), _("foo (22nd copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (22nd copy)"), 1), _("foo (23rd copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (22nd copy).txt"), 1), _("foo (23rd copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (23rd copy)"), 1), _("foo (24th copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (23rd copy).txt"), 1), _("foo (24th copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (24th copy)"), 1), _("foo (25th copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (24th copy).txt"), 1), _("foo (25th copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (24th copy)"), 1), _("foo foo (25th copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (24th copy).txt"), 1), _("foo foo (25th copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (100000000000000th copy).txt"), 1), _("foo foo (copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_(" (copy)"), 1), _(" (another copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo"), 1), _("foo (copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_(".bashrc"), 1), _(".bashrc (copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_(".foo.txt"), 1), _(".foo (copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo"), 1), _("foo foo (copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo.txt"), 1), _("foo (copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo.txt"), 1), _("foo foo (copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo.txt txt"), 1), _("foo foo (copy).txt txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo...txt"), 1), _("foo.. (copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo..."), 1), _("foo... (copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo. (copy)"), 1), _("foo. (another copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (copy)"), 1), _("foo (another copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (copy).txt"), 1), _("foo (another copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (another copy)"), 1), _("foo (3rd copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (another copy).txt"), 1), _("foo (3rd copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (another copy).txt"), 1), _("foo foo (3rd copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (13th copy)"), 1), _("foo (14th copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (13th copy).txt"), 1), _("foo (14th copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (21st copy)"), 1), _("foo (22nd copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (21st copy).txt"), 1), _("foo (22nd copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (22nd copy)"), 1), _("foo (23rd copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (22nd copy).txt"), 1), _("foo (23rd copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (23rd copy)"), 1), _("foo (24th copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (23rd copy).txt"), 1), _("foo (24th copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (24th copy)"), 1), _("foo (25th copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (24th copy).txt"), 1), _("foo (25th copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (24th copy)"), 1), _("foo foo (25th copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (24th copy).txt"), 1), _("foo foo (25th copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (100000000000000th copy).txt"), 1), _("foo foo (copy).txt"));
 
 	/* FIXME bugzilla.eazel.com 7701: These are wrong. */
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (10th copy)"), 1), _("foo (11st copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (10th copy).txt"), 1), _("foo (11st copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (11th copy)"), 1), _("foo (12nd copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (11th copy).txt"), 1), _("foo (12nd copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (12th copy)"), 1), _("foo (13rd copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (12th copy).txt"), 1), _("foo (13rd copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (10th copy)"), 1), _("foo (11st copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (10th copy).txt"), 1), _("foo (11st copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (11th copy)"), 1), _("foo (12nd copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (11th copy).txt"), 1), _("foo (12nd copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (12th copy)"), 1), _("foo (13rd copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (12th copy).txt"), 1), _("foo (13rd copy).txt"));
 }
 
 #endif
diff --git a/libnautilus-extensions/nautilus-file-private.h b/libnautilus-extensions/nautilus-file-private.h
index 8cd94891f..f16ed2075 100644
--- a/libnautilus-extensions/nautilus-file-private.h
+++ b/libnautilus-extensions/nautilus-file-private.h
@@ -24,7 +24,7 @@
 
 #include "nautilus-file.h"
 #include "nautilus-directory.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 
 #define NAUTILUS_FILE_TOP_LEFT_TEXT_MAXIMUM_CHARACTERS_PER_LINE 80
 #define NAUTILUS_FILE_TOP_LEFT_TEXT_MAXIMUM_LINES               24
@@ -81,31 +81,31 @@ struct NautilusFileDetails
 	/* boolean fields: bitfield to save space, since there can be
            many NautilusFile objects. */
 
-	nautilus_boolean_bit unconfirmed                   : 1;
-	nautilus_boolean_bit is_gone                       : 1;
-	nautilus_boolean_bit loading_directory             : 1;
+	eel_boolean_bit unconfirmed                   : 1;
+	eel_boolean_bit is_gone                       : 1;
+	eel_boolean_bit loading_directory             : 1;
 	/* got_info known from info field being non-NULL */
-	nautilus_boolean_bit get_info_failed               : 1;
-	nautilus_boolean_bit file_info_is_up_to_date       : 1;
+	eel_boolean_bit get_info_failed               : 1;
+	eel_boolean_bit file_info_is_up_to_date       : 1;
 
-	nautilus_boolean_bit got_directory_count           : 1;
-	nautilus_boolean_bit directory_count_failed        : 1;
-	nautilus_boolean_bit directory_count_is_up_to_date : 1;
+	eel_boolean_bit got_directory_count           : 1;
+	eel_boolean_bit directory_count_failed        : 1;
+	eel_boolean_bit directory_count_is_up_to_date : 1;
 
 	NautilusRequestStatus deep_counts_status           : 2;
 	/* no deep_counts_are_up_to_date field; since we expose
            intermediate values for this attribute, we do actually
            forget it rather than invalidating. */
 
-	nautilus_boolean_bit got_mime_list                 : 1;
-	nautilus_boolean_bit mime_list_failed              : 1;
-	nautilus_boolean_bit mime_list_is_up_to_date       : 1;
+	eel_boolean_bit got_mime_list                 : 1;
+	eel_boolean_bit mime_list_failed              : 1;
+	eel_boolean_bit mime_list_is_up_to_date       : 1;
 
-	nautilus_boolean_bit got_top_left_text             : 1;
-	nautilus_boolean_bit top_left_text_is_up_to_date   : 1;
+	eel_boolean_bit got_top_left_text             : 1;
+	eel_boolean_bit top_left_text_is_up_to_date   : 1;
 
-	nautilus_boolean_bit got_activation_uri            : 1;
-	nautilus_boolean_bit activation_uri_is_up_to_date  : 1;
+	eel_boolean_bit got_activation_uri            : 1;
+	eel_boolean_bit activation_uri_is_up_to_date  : 1;
 };
 
 NautilusFile *nautilus_file_new_from_info                  (NautilusDirectory      *directory,
diff --git a/libnautilus-extensions/nautilus-file-utilities.c b/libnautilus-extensions/nautilus-file-utilities.c
index 7b2960067..d93f8a75a 100644
--- a/libnautilus-extensions/nautilus-file-utilities.c
+++ b/libnautilus-extensions/nautilus-file-utilities.c
@@ -26,21 +26,21 @@
 #include "nautilus-file-utilities.h"
 
 #include "nautilus-file.h"
-#include "nautilus-glib-extensions.h"
 #include "nautilus-lib-self-check-functions.h"
 #include "nautilus-link-set.h"
 #include "nautilus-metadata.h"
 #include "nautilus-metafile.h"
-#include "nautilus-string.h"
 #include <ctype.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-string.h>
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomevfs/gnome-vfs-async-ops.h>
+#include <libgnomevfs/gnome-vfs-find-directory.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomevfs/gnome-vfs-xfer.h>
-#include <libgnomevfs/gnome-vfs-find-directory.h>
 #include <pthread.h>
 #include <pwd.h>
 #include <stdlib.h>
@@ -538,8 +538,8 @@ nautilus_uri_make_full_from_relative (const char *base_uri, const char *relative
 gboolean
 nautilus_uri_is_trash (const char *uri)
 {
-	return nautilus_istr_has_prefix (uri, "trash:")
-		|| nautilus_istr_has_prefix (uri, "gnome-trash:");
+	return eel_istr_has_prefix (uri, "trash:")
+		|| eel_istr_has_prefix (uri, "gnome-trash:");
 }
 
 gboolean
@@ -624,7 +624,7 @@ nautilus_uri_is_local_scheme (const char *uri)
 
 	is_local_scheme = FALSE;
 	for (temp_scheme = *local_schemes, i = 0; temp_scheme != NULL; i++, temp_scheme = local_schemes[i]) {
-		is_local_scheme = nautilus_istr_has_prefix (uri, temp_scheme);
+		is_local_scheme = eel_istr_has_prefix (uri, temp_scheme);
 		if (is_local_scheme) {
 			break;
 		}
@@ -783,8 +783,8 @@ nautilus_make_uri_canonical (const char *uri)
 	 * typing "foo" into location bar does not crash and returns an error
 	 * rather than displaying the contents of /
 	 */
-	if (nautilus_str_has_prefix (canonical_uri, "file://")
-	    && !nautilus_str_has_prefix (canonical_uri, "file:///")) {
+	if (eel_str_has_prefix (canonical_uri, "file://")
+	    && !eel_str_has_prefix (canonical_uri, "file:///")) {
 		old_uri = canonical_uri;
 		canonical_uri = g_strconcat ("file:/", old_uri + 5, NULL);
 		g_free (old_uri);
@@ -824,7 +824,7 @@ uris_match (const char *uri_1, const char *uri_2, gboolean ignore_fragments)
 		canonical_2 = nautilus_make_uri_canonical (uri_2);
 	}
 
-	result = nautilus_str_is_equal (canonical_1, canonical_2);
+	result = eel_str_is_equal (canonical_1, canonical_2);
 
 	g_free (canonical_1);
 	g_free (canonical_2);
@@ -857,7 +857,7 @@ nautilus_file_name_matches_backup_pattern (const char *name_or_relative_uri)
 {
 	g_return_val_if_fail (name_or_relative_uri != NULL, FALSE);
 
-	return nautilus_str_has_suffix (name_or_relative_uri, "~");
+	return eel_str_has_suffix (name_or_relative_uri, "~");
 }
 
 gboolean
@@ -865,7 +865,7 @@ nautilus_file_name_matches_metafile_pattern (const char *name_or_relative_uri)
 {
 	g_return_val_if_fail (name_or_relative_uri != NULL, FALSE);
 
-	return nautilus_str_has_suffix (name_or_relative_uri, NAUTILUS_METAFILE_NAME_SUFFIX);
+	return eel_str_has_suffix (name_or_relative_uri, NAUTILUS_METAFILE_NAME_SUFFIX);
 }
 
 /**
@@ -1693,186 +1693,186 @@ nautilus_get_build_message (void)
 void
 nautilus_self_check_file_utilities (void)
 {
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input (""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" "), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" / "), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" /"), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" /home\n\n"), "file:///home");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" \n\t"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("!"), "http://!");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("#"), "http://#");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/ "), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/!"), "file:///!");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/#"), "file:///%23");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/%20"), "file:///%2520");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/%25"), "file:///%2525");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/:"), "file:///%3A");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/home"), "file:///home");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/home/darin"), "file:///home/darin");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input (":"), "http://:");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("::"), "http://::");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input (":://:://:::::::::::::::::"), "http://:://:://:::::::::::::::::");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:"), "file:");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///%20"), "file:///%20");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///%3F"), "file:///%3F");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///:"), "file:///:");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///?"), "file:///?");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///home/joe/some file"), "file:///home/joe/some file");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file://home/joe/some file"), "file://home/joe/some file");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:::::////"), "file:::::////");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("foo://foobar.txt"), "foo://foobar.txt");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("home"), "http://home");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http://null.stanford.edu"), "http://null.stanford.edu");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http://null.stanford.edu:80"), "http://null.stanford.edu:80");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http://seth@null.stanford.edu:80"), "http://seth@null.stanford.edu:80");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http:::::::::"), "http:::::::::");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("www.eazel.com"), "http://www.eazel.com");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http://null.stanford.edu/some file"), "http://null.stanford.edu/some file");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_uri_get_scheme ("file:///var/tmp"), "file");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_uri_get_scheme (""), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_uri_get_scheme ("file:///var/tmp::"), "file");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_uri_get_scheme ("man:ls"), "man");
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uri_is_local_scheme ("file:///var/tmp"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uri_is_local_scheme ("http://www.yahoo.com"), FALSE);
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file:///////"), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file://foo/"), "file://foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file://foo"), "file://foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file://"), "file://");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file:/"), "file:/");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("http://le-hacker.org"), "http://le-hacker.org");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("http://le-hacker.org/dir//////"), "http://le-hacker.org/dir/");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("http://le-hacker.org/////"), "http://le-hacker.org/");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input (""), "");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" "), "");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" / "), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" /"), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" /home\n\n"), "file:///home");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" \n\t"), "");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("!"), "http://!");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("#"), "http://#");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/ "), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/!"), "file:///!");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/#"), "file:///%23");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/%20"), "file:///%2520");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/%25"), "file:///%2525");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/:"), "file:///%3A");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/home"), "file:///home");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/home/darin"), "file:///home/darin");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input (":"), "http://:");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("::"), "http://::");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input (":://:://:::::::::::::::::"), "http://:://:://:::::::::::::::::");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:"), "file:");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///%20"), "file:///%20");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///%3F"), "file:///%3F");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///:"), "file:///:");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///?"), "file:///?");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///home/joe/some file"), "file:///home/joe/some file");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file://home/joe/some file"), "file://home/joe/some file");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:::::////"), "file:::::////");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("foo://foobar.txt"), "foo://foobar.txt");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("home"), "http://home");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http://null.stanford.edu"), "http://null.stanford.edu");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http://null.stanford.edu:80"), "http://null.stanford.edu:80");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http://seth@null.stanford.edu:80"), "http://seth@null.stanford.edu:80");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http:::::::::"), "http:::::::::");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("www.eazel.com"), "http://www.eazel.com");
+        EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http://null.stanford.edu/some file"), "http://null.stanford.edu/some file");
+
+	EEL_CHECK_STRING_RESULT (nautilus_uri_get_scheme ("file:///var/tmp"), "file");
+	EEL_CHECK_STRING_RESULT (nautilus_uri_get_scheme (""), NULL);
+	EEL_CHECK_STRING_RESULT (nautilus_uri_get_scheme ("file:///var/tmp::"), "file");
+	EEL_CHECK_STRING_RESULT (nautilus_uri_get_scheme ("man:ls"), "man");
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uri_is_local_scheme ("file:///var/tmp"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uri_is_local_scheme ("http://www.yahoo.com"), FALSE);
+
+	EEL_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file:///////"), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file://foo/"), "file://foo");
+	EEL_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file://foo"), "file://foo");
+	EEL_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file://"), "file://");
+	EEL_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file:/"), "file:/");
+	EEL_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("http://le-hacker.org"), "http://le-hacker.org");
+	EEL_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("http://le-hacker.org/dir//////"), "http://le-hacker.org/dir/");
+	EEL_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("http://le-hacker.org/////"), "http://le-hacker.org/");
 
 	/* nautilus_make_uri_canonical */
 
 	/* FIXME bugzilla.eazel.com 5072: this is a bizarre result from an empty string */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical (""), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical (""), "file:///");
 	
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:/"), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///"), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///home/mathieu/"), "file:///home/mathieu");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///home/mathieu"), "file:///home/mathieu");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("ftp://mathieu:password@le-hackeur.org"), "ftp://mathieu:password@le-hackeur.org");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("ftp://mathieu:password@le-hackeur.org/"), "ftp://mathieu:password@le-hackeur.org/");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://le-hackeur.org"), "http://le-hackeur.org");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://le-hackeur.org/"), "http://le-hackeur.org/");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://le-hackeur.org/dir"), "http://le-hackeur.org/dir");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://le-hackeur.org/dir/"), "http://le-hackeur.org/dir/");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:/"), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///"), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///home/mathieu/"), "file:///home/mathieu");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///home/mathieu"), "file:///home/mathieu");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("ftp://mathieu:password@le-hackeur.org"), "ftp://mathieu:password@le-hackeur.org");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("ftp://mathieu:password@le-hackeur.org/"), "ftp://mathieu:password@le-hackeur.org/");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://le-hackeur.org"), "http://le-hackeur.org");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://le-hackeur.org/"), "http://le-hackeur.org/");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://le-hackeur.org/dir"), "http://le-hackeur.org/dir");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://le-hackeur.org/dir/"), "http://le-hackeur.org/dir/");
 
 	/* FIXME bugzilla.eazel.com 5068: the "nested" URI loses some characters here. Maybe that's OK because we escape them in practice? */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("search://[file://]file_name contains stuff"), "search://[file/]file_name contains stuff");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("search://[file://]file_name contains stuff"), "search://[file/]file_name contains stuff");
 #ifdef EAZEL_SERVICES
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("eazel-services:/~turtle"), "eazel-services:///~turtle");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("eazel-services:///~turtle"), "eazel-services:///~turtle");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("eazel-services:/~turtle"), "eazel-services:///~turtle");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("eazel-services:///~turtle"), "eazel-services:///~turtle");
 #endif
 
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/"), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/./."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/.//."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/.///."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a"), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/b/.."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a///"), "file:///a/");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a"), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("../a"), "file:///../a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("..//a"), "file:///../a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a//."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a/."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical (".//a/."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a//."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a//.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a/.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical (".//a/.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a//.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical (".//a//.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/.."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a/b/.."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/./a/b/.."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/./b/.."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/b/./.."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/b/../."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/../.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a/b/../.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("././a/b/../.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/c/../.."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/c/../../d"), "file:///a/d");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/../../d"), "file:///d");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/../../d"), "file:///../d");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/.././.././c"), "file:///c");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/.././.././b/c"), "file:///../b/c");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com"), "http://www.eazel.com");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com/"), "http://www.eazel.com/");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com/dir"), "http://www.eazel.com/dir");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com/dir/"), "http://www.eazel.com/dir/");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://yakk:womble@www.eazel.com:42/blah/"), "http://yakk:womble@www.eazel.com:42/blah/");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("FILE:///"), "file:///");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///trash"), "file:///trash");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///Users/mikef"), "file:///Users/mikef");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/trash"), "file:///trash");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("root"), "file:///root");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/root"), "file:///root");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("//root"), "file:///root");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("///root"), "file:///root");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("////root"), "file:///root");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/"), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/./."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/.//."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/.///."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a"), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/b/.."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a///"), "file:///a/");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a"), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("../a"), "file:///../a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("..//a"), "file:///../a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a//."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a/."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical (".//a/."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a//."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a//.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a/.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical (".//a/.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a//.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical (".//a//.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/.."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a/b/.."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/./a/b/.."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/./b/.."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/b/./.."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/b/../."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/../.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a/b/../.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("././a/b/../.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/c/../.."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/c/../../d"), "file:///a/d");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/../../d"), "file:///d");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/../../d"), "file:///../d");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/.././.././c"), "file:///c");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/.././.././b/c"), "file:///../b/c");
+
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com"), "http://www.eazel.com");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com/"), "http://www.eazel.com/");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com/dir"), "http://www.eazel.com/dir");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com/dir/"), "http://www.eazel.com/dir/");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://yakk:womble@www.eazel.com:42/blah/"), "http://yakk:womble@www.eazel.com:42/blah/");
+
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("FILE:///"), "file:///");
+
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///trash"), "file:///trash");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///Users/mikef"), "file:///Users/mikef");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/trash"), "file:///trash");
+
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("root"), "file:///root");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/root"), "file:///root");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("//root"), "file:///root");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("///root"), "file:///root");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("////root"), "file:///root");
 
 	/* Test cases related to escaping. */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///%3F"), "file:///%3F");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///%78"), "file:///x");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///?"), "file:///%3F");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///x"), "file:///x");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorb:///%3F"), "glorb:///%3F");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorb:///%78"), "glorb:///x");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorb:///?"), "glorb:///%3F");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorb:///x"), "glorb:///x");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http:///%3F"), "http:///%3F");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http:///%78"), "http:///x");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http:///?"), "http:///?");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http:///x"), "http:///x");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.Eazel.Com"), "http://www.eazel.com");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.Eazel.Com/xXx"), "http://www.eazel.com/xXx");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("ftp://Darin@www.Eazel.Com/xXx"), "ftp://Darin@www.eazel.com/xXx");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.Eazel.Com:80/xXx"), "http://www.eazel.com:80/xXx");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("ftp://Darin@www.Eazel.Com:80/xXx"), "ftp://Darin@www.eazel.com:80/xXx");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///%3F"), "file:///%3F");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///%78"), "file:///x");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///?"), "file:///%3F");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///x"), "file:///x");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorb:///%3F"), "glorb:///%3F");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorb:///%78"), "glorb:///x");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorb:///?"), "glorb:///%3F");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorb:///x"), "glorb:///x");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http:///%3F"), "http:///%3F");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http:///%78"), "http:///x");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http:///?"), "http:///?");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http:///x"), "http:///x");
+
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.Eazel.Com"), "http://www.eazel.com");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.Eazel.Com/xXx"), "http://www.eazel.com/xXx");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("ftp://Darin@www.Eazel.Com/xXx"), "ftp://Darin@www.eazel.com/xXx");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.Eazel.Com:80/xXx"), "http://www.eazel.com:80/xXx");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("ftp://Darin@www.Eazel.Com:80/xXx"), "ftp://Darin@www.eazel.com:80/xXx");
 
 	/* FIXME bugzilla.eazel.com 4101: Why append a slash in this case, but not in the http://www.eazel.com case? */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com:80"), "http://www.eazel.com:80/");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com:80"), "http://www.eazel.com:80/");
 
 	/* Note: these cases behave differently here than in
 	 * gnome-vfs. In some cases because of bugs in gnome-vfs, but
 	 * in other cases because we just want them handled
 	 * differently.
 	 */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:trash"), "file:trash");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("//trash"), "file:///trash");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:"), "file:");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("trash"), "file:///trash");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorp:"), "glorp:");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("TRASH:XXX"), NAUTILUS_TRASH_URI);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("trash:xxx"), NAUTILUS_TRASH_URI);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("GNOME-TRASH:XXX"), NAUTILUS_TRASH_URI);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("gnome-trash:xxx"), NAUTILUS_TRASH_URI);
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("pipe:gnome-info2html2 as"), "pipe:gnome-info2html2 as");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_uri_make_full_from_relative (NULL, NULL), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_uri_make_full_from_relative ("http://a/b/c/d;p?q", NULL), "http://a/b/c/d;p?q");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_uri_make_full_from_relative (NULL, "http://a/b/c/d;p?q"), "http://a/b/c/d;p?q");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:trash"), "file:trash");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("//trash"), "file:///trash");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:"), "file:");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("trash"), "file:///trash");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorp:"), "glorp:");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("TRASH:XXX"), NAUTILUS_TRASH_URI);
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("trash:xxx"), NAUTILUS_TRASH_URI);
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("GNOME-TRASH:XXX"), NAUTILUS_TRASH_URI);
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("gnome-trash:xxx"), NAUTILUS_TRASH_URI);
+
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("pipe:gnome-info2html2 as"), "pipe:gnome-info2html2 as");
+
+	EEL_CHECK_STRING_RESULT (nautilus_uri_make_full_from_relative (NULL, NULL), NULL);
+	EEL_CHECK_STRING_RESULT (nautilus_uri_make_full_from_relative ("http://a/b/c/d;p?q", NULL), "http://a/b/c/d;p?q");
+	EEL_CHECK_STRING_RESULT (nautilus_uri_make_full_from_relative (NULL, "http://a/b/c/d;p?q"), "http://a/b/c/d;p?q");
 
 	/* These test cases are from RFC 2396. */
 #define TEST_PARTIAL(partial, result) \
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_uri_make_full_from_relative \
+	EEL_CHECK_STRING_RESULT (nautilus_uri_make_full_from_relative \
 		("http://a/b/c/d;p?q", partial), result)
 
 	TEST_PARTIAL ("g", "http://a/b/c/g");
@@ -1907,48 +1907,48 @@ nautilus_self_check_file_utilities (void)
 
 #undef TEST_PARTIAL
 
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display (""), "/");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display (":"), ":");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///h/user"), "/h/user");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///%68/user/foo%2ehtml"), "/h/user/foo.html");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///h/user/foo.html#fragment"), "file:///h/user/foo.html#fragment");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("http://www.eazel.com"), "http://www.eazel.com");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("http://www.eazel.com/jobs#Engineering"), "http://www.eazel.com/jobs#Engineering");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file"), "/file");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///#"), "file:///#");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///"), "/");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///%20%23"), "/ #");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///%20%23#"), "file:///%20%23#");
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match (":", ":"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("file:///h/user/file#gunzip:///", "file:///h/user/file#gunzip:///"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("file:///h/user/file#gunzip:///", "file:///h/user/file#gzip:///"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("http://www.Eazel.Com", "http://www.eazel.com"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("http://www.Eazel.Com:80", "http://www.eazel.com:80"), TRUE);
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments (":", ":"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file#gunzip:///", "file:///h/user/file#gunzip:///"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file#gunzip:///", "file:///h/user/file#gzip:///"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("http://www.Eazel.Com", "http://www.eazel.com"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("http://www.Eazel.Com:80", "http://www.eazel.com:80"), TRUE);
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user", "file:///h/user"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user#frag", "file:///h/user"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user#frag", "file:///h/user/"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user#frag", "file:///h/user%23frag"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/", "file:///h/user"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/", "http:///h/user"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/", "http://www.eazel.com"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file#gunzip:///", "file:///h/user/file"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file#gunzip:///", "file:///h/user/file"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file.html.gz#gunzip:///#fragment", "file:///h/user/file.html.gz"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/#frag", "file:///h/user/"), TRUE);
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display (""), "/");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display (":"), ":");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///h/user"), "/h/user");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///%68/user/foo%2ehtml"), "/h/user/foo.html");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///h/user/foo.html#fragment"), "file:///h/user/foo.html#fragment");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("http://www.eazel.com"), "http://www.eazel.com");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("http://www.eazel.com/jobs#Engineering"), "http://www.eazel.com/jobs#Engineering");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file"), "/file");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///#"), "file:///#");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///"), "/");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///%20%23"), "/ #");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///%20%23#"), "file:///%20%23#");
+
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("", ""), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match (":", ":"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("file:///h/user/file#gunzip:///", "file:///h/user/file#gunzip:///"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("file:///h/user/file#gunzip:///", "file:///h/user/file#gzip:///"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("http://www.Eazel.Com", "http://www.eazel.com"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("http://www.Eazel.Com:80", "http://www.eazel.com:80"), TRUE);
+
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("", ""), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments (":", ":"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file#gunzip:///", "file:///h/user/file#gunzip:///"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file#gunzip:///", "file:///h/user/file#gzip:///"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("http://www.Eazel.Com", "http://www.eazel.com"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("http://www.Eazel.Com:80", "http://www.eazel.com:80"), TRUE);
+
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user", "file:///h/user"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user#frag", "file:///h/user"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user#frag", "file:///h/user/"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user#frag", "file:///h/user%23frag"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/", "file:///h/user"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/", "http:///h/user"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/", "http://www.eazel.com"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file#gunzip:///", "file:///h/user/file"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file#gunzip:///", "file:///h/user/file"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file.html.gz#gunzip:///#fragment", "file:///h/user/file.html.gz"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/#frag", "file:///h/user/"), TRUE);
 
 	/* Since it's illegal to have a # in a scheme name, it doesn't really matter what these cases do */
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("fi#le:///h/user/file", "fi"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("fi#le:///h/user/file", "fi#le:"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("fi#le:///h/user/file", "fi"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("fi#le:///h/user/file", "fi#le:"), TRUE);
 }
 
 #endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-file.c b/libnautilus-extensions/nautilus-file.c
index 84994fd23..baadf21aa 100644
--- a/libnautilus-extensions/nautilus-file.c
+++ b/libnautilus-extensions/nautilus-file.c
@@ -30,17 +30,17 @@
 #include "nautilus-directory-private.h"
 #include "nautilus-file-attributes.h"
 #include "nautilus-file-private.h"
-#include "nautilus-glib-extensions.h"
 #include "nautilus-global-preferences.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gtk-macros.h"
 #include "nautilus-lib-self-check-functions.h"
 #include "nautilus-link.h"
-#include "nautilus-string.h"
 #include "nautilus-trash-directory.h"
 #include "nautilus-trash-file.h"
 #include "nautilus-vfs-file.h"
 #include <ctype.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-string.h>
 #include <gnome-xml/parser.h>
 #include <grp.h>
 #include <gtk/gtksignal.h>
@@ -102,7 +102,7 @@ static char *   nautilus_file_get_type_as_string  (NautilusFile      *file);
 static gboolean update_info_and_name              (NautilusFile      *file,
 						   GnomeVFSFileInfo  *info);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusFile, nautilus_file, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusFile, nautilus_file, GTK_TYPE_OBJECT)
 
 static void
 nautilus_file_initialize_class (NautilusFileClass *klass)
@@ -207,7 +207,7 @@ modify_link_hash_table (NautilusFile *file,
 
 	/* Creat the hash table first time through. */
 	if (symbolic_links == NULL) {
-		symbolic_links = nautilus_g_hash_table_new_free_at_exit
+		symbolic_links = eel_g_hash_table_new_free_at_exit
 			(g_str_hash, g_str_equal, "nautilus-file.c: symbolic_links");
 	}
 
@@ -314,7 +314,7 @@ nautilus_file_get_internal (const char *uri, gboolean create)
 		 * so we'll treat it like the case where gnome_vfs_uri couldn't
 		 * even create a URI.
 		 */
-		if (nautilus_str_is_empty (relative_uri)) {
+		if (eel_str_is_empty (relative_uri)) {
 			gnome_vfs_uri_unref (vfs_uri);
 			vfs_uri = NULL;
 			g_free (relative_uri);
@@ -435,11 +435,11 @@ destroy (GtkObject *object)
 	g_free (file->details->activation_uri);
 	g_free (file->details->compare_by_emblem_cache);
 	
-	nautilus_g_list_free_deep (file->details->mime_list);
+	eel_g_list_free_deep (file->details->mime_list);
 
 	g_free (file->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
@@ -1445,7 +1445,7 @@ compare_by_name (NautilusFile *file_1, NautilusFile *file_2)
 	} else if (!sort_last_1 && sort_last_2) {
 		compare = -1;
 	} else {
-		compare = nautilus_strcoll (name_1, name_2);
+		compare = eel_strcoll (name_1, name_2);
 	}
 
 	g_free (name_1);
@@ -1467,7 +1467,7 @@ compare_by_directory_name (NautilusFile *file_1, NautilusFile *file_2)
 	directory_1 = nautilus_file_get_parent_uri_for_display (file_1);
 	directory_2 = nautilus_file_get_parent_uri_for_display (file_2);
 
-	compare = nautilus_strcoll (directory_1, directory_2);
+	compare = eel_strcoll (directory_1, directory_2);
 
 	g_free (directory_1);
 	g_free (directory_2);
@@ -1553,7 +1553,7 @@ fill_emblem_cache_if_needed (NautilusFile *file)
 	/* Zero-terminate so we can tell where the list ends. */
 	*scanner = 0;
 
-	nautilus_g_list_free_deep (keywords);
+	eel_g_list_free_deep (keywords);
 
 	/* Chache the values of the automatic emblems. */
 	file->details->compare_by_emblem_cache->automatic_emblems_as_integer
@@ -1585,7 +1585,7 @@ compare_by_emblems (NautilusFile *file_1, NautilusFile *file_2)
 	keyword_cache_1 = file_1->details->compare_by_emblem_cache->emblem_keywords;
 	keyword_cache_2 = file_2->details->compare_by_emblem_cache->emblem_keywords;
 	for (; *keyword_cache_1 != '\0' && *keyword_cache_2 != '\0';) {
-		compare_result = nautilus_strcoll (keyword_cache_1, keyword_cache_2);
+		compare_result = eel_strcoll (keyword_cache_1, keyword_cache_2);
 		if (compare_result != 0) {
 			return compare_result;
 		}
@@ -1639,7 +1639,7 @@ compare_by_type (NautilusFile *file_1, NautilusFile *file_2)
 
 	if (file_1->details->info != NULL
 	    && file_2->details->info != NULL
-	    && nautilus_strcmp (file_1->details->info->mime_type,
+	    && eel_strcmp (file_1->details->info->mime_type,
 				file_2->details->info->mime_type) == 0) {
 		return 0;
 	}
@@ -1647,7 +1647,7 @@ compare_by_type (NautilusFile *file_1, NautilusFile *file_2)
 	type_string_1 = nautilus_file_get_type_as_string (file_1);
 	type_string_2 = nautilus_file_get_type_as_string (file_2);
 
-	result = nautilus_strcoll (type_string_1, type_string_2);
+	result = eel_strcoll (type_string_1, type_string_2);
 
 	g_free (type_string_1);
 	g_free (type_string_2);
@@ -1823,7 +1823,7 @@ nautilus_file_compare_name (NautilusFile *file,
 	g_return_val_if_fail (pattern != NULL, -1);
 
 	name = nautilus_file_get_name (file);
-	result = nautilus_strcoll (name, pattern);
+	result = eel_strcoll (name, pattern);
 	g_free (name);
 	return result;
 }
@@ -1891,7 +1891,7 @@ nautilus_file_list_filter_hidden_and_backup (GList    *files,
 	 */
 
 	filtered_files = nautilus_file_list_copy (files);
-	filtered_files = nautilus_g_list_partition (filtered_files, 
+	filtered_files = eel_g_list_partition (filtered_files, 
 						    filter_hidden_and_backup_partition_callback,
 						    GINT_TO_POINTER ((show_hidden ? SHOW_HIDDEN : 0) |
 								     (show_backup ? SHOW_BACKUP : 0)),
@@ -2103,7 +2103,7 @@ nautilus_file_monitor_add (NautilusFile *file,
 	g_return_if_fail (NAUTILUS_IS_FILE (file));
 	g_return_if_fail (client != NULL);
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(NAUTILUS_FILE_CLASS, file,
 		 monitor_add, (file, client, attributes));
 }   
@@ -2115,7 +2115,7 @@ nautilus_file_monitor_remove (NautilusFile *file,
 	g_return_if_fail (NAUTILUS_IS_FILE (file));
 	g_return_if_fail (client != NULL);
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(NAUTILUS_FILE_CLASS, file,
 		 monitor_remove, (file, client));
 }			      
@@ -2198,7 +2198,7 @@ nautilus_file_get_date (NautilusFile *file,
 
 	g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_FILE_CLASS, file,
 		 get_date, (file, date_type, date));
 }
@@ -2212,7 +2212,7 @@ nautilus_file_get_where_string (NautilusFile *file)
 
 	g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_FILE_CLASS, file,
 		 get_where_string, (file));
 }
@@ -2242,7 +2242,7 @@ nautilus_file_get_date_as_string (NautilusFile *file, NautilusDateType date_type
 	}
 
 	file_time = localtime (&file_time_raw);
-	file_date = nautilus_g_date_new_tm (file_time);
+	file_date = eel_g_date_new_tm (file_time);
 	
 	today = g_date_new ();
 	g_date_set_time (today, time (NULL));
@@ -2292,7 +2292,7 @@ nautilus_file_get_date_as_string (NautilusFile *file, NautilusDateType date_type
 		format = _("%-m/%-d/%y at %-I:%M %p");
 	}
 
-	return nautilus_strdup_strftime (format, file_time);
+	return eel_strdup_strftime (format, file_time);
 }
 
 static NautilusSpeedTradeoffValue show_directory_item_count;
@@ -2411,7 +2411,7 @@ nautilus_file_get_directory_item_count (NautilusFile *file,
 		return FALSE;
 	}
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_FILE_CLASS, file,
 		 get_item_count, (file, count, count_unreadable));
 }
@@ -2460,7 +2460,7 @@ nautilus_file_get_deep_counts (NautilusFile *file,
 		return file->details->deep_counts_status;
 	}
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_FILE_CLASS, file,
 		 get_deep_counts, (file,
 				   directory_count,
@@ -2504,7 +2504,7 @@ nautilus_file_get_directory_item_mime_types (NautilusFile *file,
 		return FALSE;
 	}
 
-	*mime_list = nautilus_g_str_list_copy (file->details->mime_list);
+	*mime_list = eel_g_str_list_copy (file->details->mime_list);
 	return TRUE;
 }
 
@@ -2688,22 +2688,22 @@ get_real_name (struct passwd *user)
 		return NULL;
 	}
 
-	part_before_comma = nautilus_str_strip_substring_and_after (user->pw_gecos, ",");
+	part_before_comma = eel_str_strip_substring_and_after (user->pw_gecos, ",");
 
-	capitalized_login_name = nautilus_str_capitalize (user->pw_name);
+	capitalized_login_name = eel_str_capitalize (user->pw_name);
 
 	if (capitalized_login_name == NULL) {
 		real_name = part_before_comma;
 	} else {
-		real_name = nautilus_str_replace_substring
+		real_name = eel_str_replace_substring
 			(part_before_comma, "&", capitalized_login_name);
 		g_free (part_before_comma);
 	}
 
 
-	if (nautilus_str_is_empty (real_name)
-	    || nautilus_strcmp (user->pw_name, real_name) == 0
-	    || nautilus_strcmp (capitalized_login_name, real_name) == 0) {
+	if (eel_str_is_empty (real_name)
+	    || eel_strcmp (user->pw_name, real_name) == 0
+	    || eel_strcmp (capitalized_login_name, real_name) == 0) {
 		g_free (real_name);
 		real_name = NULL;
 	}
@@ -3021,7 +3021,7 @@ nautilus_get_user_names (void)
 
 	endpwent ();
 
-	return nautilus_g_str_list_alphabetize (list);
+	return eel_g_str_list_alphabetize (list);
 }
 
 /**
@@ -3176,7 +3176,7 @@ nautilus_get_group_names_including (const char *username)
 
 	endgrent ();
 
-	return nautilus_g_str_list_alphabetize (list);
+	return eel_g_str_list_alphabetize (list);
 }
 
 /**
@@ -3793,7 +3793,7 @@ get_description (NautilusFile *file)
 	}
 	
 	mime_type = file->details->info->mime_type;
-	if (nautilus_str_is_empty (mime_type)) {
+	if (eel_str_is_empty (mime_type)) {
 		return NULL;
 	}
 
@@ -3803,7 +3803,7 @@ get_description (NautilusFile *file)
 	}
 
 	description = gnome_vfs_mime_get_description (mime_type);
-	if (!nautilus_str_is_empty (description)) {
+	if (!eel_str_is_empty (description)) {
 		return description;
 	}
 
@@ -3870,7 +3870,7 @@ nautilus_file_get_file_type (NautilusFile *file)
 	if (file == NULL) {
 		return GNOME_VFS_FILE_TYPE_UNKNOWN;
 	}
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_FILE_CLASS, file, get_file_type, (file));
 }
 
@@ -3916,7 +3916,7 @@ nautilus_file_is_mime_type (NautilusFile *file, const char *mime_type)
 	if (file->details->info == NULL) {
 		return FALSE;
 	}
-	return nautilus_strcasecmp (file->details->info->mime_type,
+	return eel_strcasecmp (file->details->info->mime_type,
 				    mime_type) == 0;
 }
 
@@ -3950,14 +3950,14 @@ sort_keyword_list_and_remove_duplicates (GList *keywords)
 	GList *duplicate_link;
 	
 	if (keywords != NULL) {
-		keywords = nautilus_g_str_list_alphabetize (keywords);
+		keywords = eel_g_str_list_alphabetize (keywords);
 
 		p = keywords;
 		while (p->next != NULL) {
 			if (strcmp ((const char *) p->data, (const char *) p->next->data) == 0) {
 				duplicate_link = p->next;
 				keywords = g_list_remove_link (keywords, duplicate_link);
-				nautilus_g_list_free_deep (duplicate_link);
+				eel_g_list_free_deep (duplicate_link);
 			} else {
 				p = p->next;
 			}
@@ -4157,7 +4157,7 @@ nautilus_file_contains_text (NautilusFile *file)
 	g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
 	
 	mime_type = nautilus_file_get_mime_type (file);
-	contains_text = nautilus_istr_has_prefix (mime_type, "text/");
+	contains_text = eel_istr_has_prefix (mime_type, "text/");
 	g_free (mime_type);
 	
 	return contains_text;
@@ -4393,7 +4393,7 @@ nautilus_file_check_if_ready (NautilusFile *file,
 
 	g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_FILE_CLASS, file,
 		 check_if_ready, (file, file_attributes));
 }			      
@@ -4414,7 +4414,7 @@ nautilus_file_call_when_ready (NautilusFile *file,
 
 	g_return_if_fail (NAUTILUS_IS_FILE (file));
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(NAUTILUS_FILE_CLASS, file,
 		 call_when_ready, (file, file_attributes, 
 				   callback, callback_data));
@@ -4433,7 +4433,7 @@ nautilus_file_cancel_call_when_ready (NautilusFile *file,
 
 	g_return_if_fail (NAUTILUS_IS_FILE (file));
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(NAUTILUS_FILE_CLASS, file,
 		 cancel_call_when_ready, (file, callback, callback_data));
 }
@@ -4650,7 +4650,7 @@ nautilus_file_list_ref (GList *list)
 void
 nautilus_file_list_unref (GList *list)
 {
-	nautilus_g_list_safe_for_each (list, (GFunc) nautilus_file_unref, NULL);
+	eel_g_list_safe_for_each (list, (GFunc) nautilus_file_unref, NULL);
 }
 
 /**
@@ -4771,17 +4771,17 @@ nautilus_self_check_file (void)
 
         /* refcount checks */
 
-        NAUTILUS_CHECK_INTEGER_RESULT (nautilus_directory_number_outstanding (), 0);
+        EEL_CHECK_INTEGER_RESULT (nautilus_directory_number_outstanding (), 0);
 
 	file_1 = nautilus_file_get ("file:///home/");
 
-	NAUTILUS_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 1);
-	NAUTILUS_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1->details->directory)->ref_count, 1);
-        NAUTILUS_CHECK_INTEGER_RESULT (nautilus_directory_number_outstanding (), 1);
+	EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 1);
+	EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1->details->directory)->ref_count, 1);
+        EEL_CHECK_INTEGER_RESULT (nautilus_directory_number_outstanding (), 1);
 
 	nautilus_file_unref (file_1);
 
-        NAUTILUS_CHECK_INTEGER_RESULT (nautilus_directory_number_outstanding (), 0);
+        EEL_CHECK_INTEGER_RESULT (nautilus_directory_number_outstanding (), 0);
 	
 	file_1 = nautilus_file_get ("file:///etc");
 	file_2 = nautilus_file_get ("file:///usr");
@@ -4792,61 +4792,61 @@ nautilus_self_check_file (void)
 
         nautilus_file_list_ref (list);
         
-	NAUTILUS_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 2);
-	NAUTILUS_CHECK_INTEGER_RESULT (GTK_OBJECT (file_2)->ref_count, 2);
+	EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 2);
+	EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_2)->ref_count, 2);
 
 	nautilus_file_list_unref (list);
         
-	NAUTILUS_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 1);
-	NAUTILUS_CHECK_INTEGER_RESULT (GTK_OBJECT (file_2)->ref_count, 1);
+	EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 1);
+	EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_2)->ref_count, 1);
 
 	nautilus_file_list_free (list);
 
-        NAUTILUS_CHECK_INTEGER_RESULT (nautilus_directory_number_outstanding (), 0);
+        EEL_CHECK_INTEGER_RESULT (nautilus_directory_number_outstanding (), 0);
 	
 
         /* name checks */
 	file_1 = nautilus_file_get ("file:///home/");
 
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), "home");
+	EEL_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), "home");
 
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_get ("file:///home/") == file_1, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_get ("file:///home/") == file_1, TRUE);
 	nautilus_file_unref (file_1);
 
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_get ("file:///home") == file_1, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_get ("file:///home") == file_1, TRUE);
 	nautilus_file_unref (file_1);
 
 	nautilus_file_unref (file_1);
 
 	file_1 = nautilus_file_get ("file:///home");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), "home");
+	EEL_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), "home");
 	nautilus_file_unref (file_1);
 
 	file_1 = nautilus_file_get (":");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), ":");
+	EEL_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), ":");
 	nautilus_file_unref (file_1);
 
 	file_1 = nautilus_file_get ("eazel:");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), "eazel");
+	EEL_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), "eazel");
 	nautilus_file_unref (file_1);
 
 	file_1 = nautilus_file_get (NAUTILUS_TRASH_URI);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), _("Trash"));
+	EEL_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), _("Trash"));
 	nautilus_file_unref (file_1);
 
 	/* sorting */
 	file_1 = nautilus_file_get ("file:///etc");
 	file_2 = nautilus_file_get ("file:///usr");
 
-	NAUTILUS_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 1);
-	NAUTILUS_CHECK_INTEGER_RESULT (GTK_OBJECT (file_2)->ref_count, 1);
+	EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 1);
+	EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_2)->ref_count, 1);
 
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_2, NAUTILUS_FILE_SORT_BY_NAME, FALSE, FALSE) < 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_2, NAUTILUS_FILE_SORT_BY_NAME, FALSE, TRUE) > 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_1, NAUTILUS_FILE_SORT_BY_NAME, FALSE, FALSE) == 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_1, NAUTILUS_FILE_SORT_BY_NAME, TRUE, FALSE) == 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_1, NAUTILUS_FILE_SORT_BY_NAME, FALSE, TRUE) == 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_1, NAUTILUS_FILE_SORT_BY_NAME, TRUE, TRUE) == 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_2, NAUTILUS_FILE_SORT_BY_NAME, FALSE, FALSE) < 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_2, NAUTILUS_FILE_SORT_BY_NAME, FALSE, TRUE) > 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_1, NAUTILUS_FILE_SORT_BY_NAME, FALSE, FALSE) == 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_1, NAUTILUS_FILE_SORT_BY_NAME, TRUE, FALSE) == 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_1, NAUTILUS_FILE_SORT_BY_NAME, FALSE, TRUE) == 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_1, NAUTILUS_FILE_SORT_BY_NAME, TRUE, TRUE) == 0, TRUE);
 
 	nautilus_file_unref (file_1);
 	nautilus_file_unref (file_2);
diff --git a/libnautilus-extensions/nautilus-font-factory.c b/libnautilus-extensions/nautilus-font-factory.c
index 09abdb6e6..89fed7b62 100644
--- a/libnautilus-extensions/nautilus-font-factory.c
+++ b/libnautilus-extensions/nautilus-font-factory.c
@@ -26,10 +26,10 @@
 #include "nautilus-font-factory.h"
 
 #include "nautilus-global-preferences.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-string.h"
-#include "nautilus-gdk-font-extensions.h"
-#include "nautilus-gtk-extensions.h"
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-string.h>
+#include <eel/eel-gdk-font-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 #include <pthread.h>
 #include <unistd.h>
 
@@ -70,7 +70,7 @@ static void    nautilus_font_factory_initialize_class (NautilusFontFactoryClass
 static void    nautilus_font_factory_initialize       (NautilusFontFactory      *factory);
 static void    destroy                                (GtkObject                *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusFontFactory,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusFontFactory,
 				   nautilus_font_factory,
 				   GTK_TYPE_OBJECT)
 
@@ -165,7 +165,7 @@ destroy (GtkObject *object)
 	g_hash_table_foreach (factory->fonts, free_one_hash_node, NULL);
 	g_hash_table_destroy (factory->fonts);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static FontHashNode *
@@ -222,8 +222,8 @@ nautilus_font_factory_get_font_by_family (const char *family,
 	/* FIXME bugzilla.eazel.com 7907: 
 	 * The "GTK System Font" string is hard coded in many places.
 	 */
-	if (nautilus_str_is_equal (family, "GTK System Font")) {
-		return nautilus_gtk_get_system_font ();
+	if (eel_str_is_equal (family, "GTK System Font")) {
+		return eel_gtk_get_system_font ();
 	}
 
 	fontset = g_strsplit (family, ",", 5);
@@ -235,8 +235,8 @@ nautilus_font_factory_get_font_by_family (const char *family,
 		 * Its a hack that we check for "-" prefixes in font names.
 		 * We do this in order not to break transalted font families.
 		 */
-		if (!nautilus_str_has_prefix (*iter, "-")) {
-			font_name = nautilus_gdk_font_xlfd_string_new ("*", 
+		if (!eel_str_has_prefix (*iter, "-")) {
+			font_name = eel_gdk_font_xlfd_string_new ("*", 
 								       *iter,
 								       "medium",
 								       "r",
@@ -262,7 +262,7 @@ nautilus_font_factory_get_font_by_family (const char *family,
 		font = node->font;
 		gdk_font_ref (font);
 	} else {
-		font = nautilus_gdk_font_get_fixed ();
+		font = eel_gdk_font_get_fixed ();
 	}
 
 	g_free (font_name);
diff --git a/libnautilus-extensions/nautilus-font-manager.c b/libnautilus-extensions/nautilus-font-manager.c
deleted file mode 100644
index dc6937d99..000000000
--- a/libnautilus-extensions/nautilus-font-manager.c
+++ /dev/null
@@ -1,1412 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-font-manager.c - Functions for managing fonts.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Pavel Cisler <pavel@eazel.com>,
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-font-manager.h"
-
-#include "nautilus-glib-extensions.h"
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-string-list.h"
-#include "nautilus-string.h"
-#include <libgnome/gnome-util.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <libgnomevfs/gnome-vfs.h>
-
-#define XLFD_INDEX_FOUNDRY		1
-#define XLFD_INDEX_FAMILY		2
-#define XLFD_INDEX_WEIGHT		3
-#define XLFD_INDEX_SLANT		4
-#define XLFD_INDEX_SET_WIDTH		5
-#define XLFD_INDEX_CHAR_SET_REGISTRY	13
-#define XLFD_INDEX_CHAR_SET_ENCODING	14
-#define XLFD_INDEX_MAX			XLFD_INDEX_CHAR_SET_ENCODING
-
-#define FONTS_DIR_FILE_NAME		"fonts.dir"
-#define FONTS_ALIAS_FILE_NAME		"fonts.alias"
-#define FONTS_SCALE_FILE_NAME		"fonts.scale"
-
-#define FONT_SERVER_CONFIG_FILE		"/etc/X11/fs/config"
-#define DEFAULT_FONT_DIRECTORY		NAUTILUS_DATADIR "/fonts/urw"
-#define USER_FONT_DIRECTORY_NAME	"fonts"
-
-#define NAUTILUS_FONT_UNDEFINED		((NautilusFontType) 0)
-
-#define POSTSCRIPT_FONT_MIME_TYPE	"application/x-font-type1"
-#define TRUE_TYPE_FONT_MIME_TYPE	"application/x-font-ttf"
-
-#define SOURCE_FONT_DIRECTORY		NAUTILUS_SOURCE_DIRECTORY "/data/fonts/urw"
-#define DEFAULT_FONT			"n019003l.pfb"
-#define DEFAULT_BOLD_FONT		"n019004l.pfb"
-
-/* These font families are black listed, because they 
- * arent useful at all to display "normal" text - at 
- * least in the context of Nautilus.
- */
-static const char *black_listed_font_families[] = {
-	"Bookman",
-	"Bookman L",
-	"Webdings",
-	"Wingdings",
-	"OCR",
-	"Zapf Dingbats",
-	"Dingbats",
-	"Symbol",
-	"Standard Symbols L"
-	"cursor",
-	"mincho",
-	"gothic",
-	"MS Reference 2",
-	"MS Reference 1",
-	"Marlett",
-	"cursor"
-};
-
-static const char *black_listed_font_foundries[] = {
- 	"greek",
- 	"grinet",
-	/* Abisource fonts are black listed because they
-	 * appear to simply be copies of the URW fonts,
-	 * and listing them would waste valuable font picker
-	 * space for no purpose.
-	 */
-	"Abisource"
-};
-
-static const char *ignored_font_dir_suffices[] = {
-	"unscaled",
-	"100dpi",
-	"75dpi",
-	"misc",
-	"abisource/fonts",
-	"AbiSuite/fonts",
-	"fonts/Speedo",
-	"fonts/cyrillic",
-	"ISO8859-2/Type1",
-	"ISO8859-7/Type1"
-};
-
-/*
- * FontDescription:
- *
- * A structure that describes a single font entry;
- *
- */
-typedef struct {
-	char *file_name;
-	NautilusFontType font_type;
-	char *foundry;
-	char *family;
-	char *weight;
-	char *slant;
-	char *set_width;
-	char *char_set;
-	gboolean is_ignored;
-} FontDescription;
-
-/*
- * FontDescriptionTable:
- *
- * A table of 0 or more font descriptions.
- *
- */
-typedef struct {
-	char *directory;
-	char *fonts_dir_file;
-	char *fonts_alias_file;
-	char *fonts_scale_file;
-	GList *descriptions;
-} FontDescriptionTable;
-
-static gboolean                string_is_valid                          (const char                  *string);
-static char *                  file_as_string                           (const char                  *file_name);
-static gboolean                directory_contains_file                  (const char                  *directory,
-									 const char                  *file_name);
-static FontDescription *       font_description_new                     (const char                  *font_file_name,
-									 NautilusFontType             font_type,
-									 const char                  *xlfd_string);
-static void                    font_description_free                    (FontDescription             *description);
-static gboolean                font_description_table_for_each          (const FontDescriptionTable  *description_table,
-									 NautilusFontManagerCallback  callback,
-									 gpointer                     callback_data);
-static char                   *font_description_get_file_name           (const FontDescription       *description);
-static char                   *font_description_get_foundry             (const FontDescription       *description);
-static char                   *font_description_get_family              (const FontDescription       *description);
-static char                   *font_description_get_weight              (const FontDescription       *description);
-static char                   *font_description_get_slant               (const FontDescription       *description);
-static char                   *font_description_get_set_width           (const FontDescription       *description);
-static char                   *font_description_get_char_set            (const FontDescription       *description);
-static FontDescriptionTable *  font_description_table_new               (const char                  *font_directory,
-									 const GList                 *postscript_font_list,
-									 const GList                 *true_type_font_list);
-static void                    font_description_table_add               (FontDescriptionTable        *description_table,
-									 const char                  *line,
-									 const GList                 *postscript_font_list,
-									 const GList                 *true_type_font_list);
-static NautilusFontType        font_get_font_type                       (const char                  *font_file_name,
-									 const GList                 *postscript_font_list,
-									 const GList                 *true_type_font_list);
-static guint                   font_description_table_get_length        (const FontDescriptionTable  *description_table);
-static const FontDescription * font_description_table_peek_nth          (const FontDescriptionTable  *description_table,
-									 guint                        n);
-static char *                  font_description_table_get_nth_file_name (const FontDescriptionTable  *table,
-									 guint                        n);
-static void                    font_description_table_free              (FontDescriptionTable        *table);
-static void                    font_description_table_clear             (FontDescriptionTable        *table);
-static const FontDescription * font_description_table_find              (const FontDescriptionTable  *description_table,
-									 const char                  *file_name);
-static gboolean                font_directory_is_ignored                (const char                  *font_directory);
-static gboolean                font_foundry_is_ignored                  (const char                  *foundry);
-static gboolean                font_family_is_ignored                   (const char                  *family);
-
-static gboolean
-string_is_valid (const char *string)
-{
-	return string && string[0] != '\0';
-}
-
-static char *
-file_as_string (const char *file_name)
-{
-	struct stat stat_info;
-	FILE *stream;
-	char *result;
-	size_t num_read;
-
-	g_return_val_if_fail (file_name != NULL, NULL);
-	g_return_val_if_fail (g_file_exists (file_name), NULL);
-
-	if (stat (file_name, &stat_info) != 0) {
-		return NULL;
-	}
-
-	if (stat_info.st_size == 0) {
-		return NULL;
-	}
-	
-	stream = fopen (file_name, "r");
-	
-	if (!stream) {
-		return NULL;
-	}
-
-	result = g_malloc (sizeof (char) * stat_info.st_size + 1);
-
-	num_read = fread (result, sizeof (char), stat_info.st_size, stream);
-
-	fclose (stream);
-
-	if ((ssize_t)num_read != stat_info.st_size) {
-		g_free (result);
-		return NULL;
-	}
-
-	result[stat_info.st_size] = '\0';
-
-	return result;
-}
-
-static void
-gnome_vfs_init_if_needed (void)
-{
-	/* Caching the call go gnome_vfs_initialized to make calling this
-	 * trivial. Even if this got called from multiple treads at the same time,
-	 * using the static here is not a problem because gnome_vfs_init is
-	 * atomic and idempotent.
-	 */
-	static gboolean initialized = FALSE;
-	
-	if (!initialized) {
-		initialized = gnome_vfs_initialized ();
-		if (!initialized) {
-			initialized = gnome_vfs_init();
-		}
-	}
-}
-
-
-static FontDescription *
-font_description_new (const char *font_file_name,
-		      NautilusFontType font_type,
-		      const char *xlfd_string)
-{
-	FontDescription *description = NULL;
-	NautilusStringList *tokenized_xlfd;
-	char *char_set_registry;
-	char *char_set_encoding;
-
-	g_return_val_if_fail (string_is_valid (font_file_name), NULL);
-	g_return_val_if_fail (string_is_valid (xlfd_string), NULL);
-	g_return_val_if_fail (font_type >= NAUTILUS_FONT_POSTSCRIPT, NULL);
-	g_return_val_if_fail (font_type <= NAUTILUS_FONT_TRUE_TYPE, NULL);
-
-	tokenized_xlfd = nautilus_string_list_new_from_tokens (xlfd_string, "-", FALSE);
-
-	if (nautilus_string_list_get_length (tokenized_xlfd) == (XLFD_INDEX_MAX + 1)) {
-		description = g_new0 (FontDescription, 1);
- 		description->file_name = g_strdup (font_file_name);
- 		description->font_type = font_type;
-		description->foundry = nautilus_string_list_nth (tokenized_xlfd, XLFD_INDEX_FOUNDRY);
-		description->family = nautilus_string_list_nth (tokenized_xlfd, XLFD_INDEX_FAMILY);
-		description->weight = nautilus_string_list_nth (tokenized_xlfd, XLFD_INDEX_WEIGHT);
-		description->slant = nautilus_string_list_nth (tokenized_xlfd, XLFD_INDEX_SLANT);
-		description->set_width = nautilus_string_list_nth (tokenized_xlfd, XLFD_INDEX_SET_WIDTH);
-
-		char_set_registry = nautilus_string_list_nth (tokenized_xlfd, XLFD_INDEX_CHAR_SET_REGISTRY);
-		char_set_encoding = nautilus_string_list_nth (tokenized_xlfd, XLFD_INDEX_CHAR_SET_ENCODING);
-		description->char_set = g_strdup_printf ("%s-%s", char_set_registry, char_set_encoding);
-		g_free (char_set_registry);
-		g_free (char_set_encoding);
-
-		description->is_ignored = 
-			font_foundry_is_ignored (description->foundry) || font_family_is_ignored (description->family);
-	} else {
-		g_warning ("'%s' is not a valid XLFD string", xlfd_string);
-	}
-	
-	nautilus_string_list_free (tokenized_xlfd);
-
-	return description;
-}
-
-static void
-font_description_free (FontDescription *description)
-{
-	g_return_if_fail (description != NULL);
-
-	g_free (description->file_name);
-	g_free (description->foundry);
-	g_free (description->family);
-	g_free (description->weight);
-	g_free (description->slant);
-	g_free (description->set_width);
-	g_free (description->char_set);
-	g_free (description);
-}
-
-static char *
-font_description_get_file_name (const FontDescription *description)
-{
-	g_return_val_if_fail (description != NULL, NULL);
-
-	return g_strdup (description->file_name);
-}
-
-static char *
-font_description_get_foundry (const FontDescription *description)
-{
-	g_return_val_if_fail (description != NULL, NULL);
-
-	return g_strdup (description->foundry);
-}
-
-static char *
-font_description_get_family (const FontDescription *description)
-{
-	g_return_val_if_fail (description != NULL, NULL);
-
-	return g_strdup (description->family);
-}
-
-static char *
-font_description_get_weight (const FontDescription *description)
-{
-	g_return_val_if_fail (description != NULL, NULL);
-
-	return g_strdup (description->weight);
-}
-
-static char *
-font_description_get_slant (const FontDescription *description)
-{
-	g_return_val_if_fail (description != NULL, NULL);
-
-	return g_strdup (description->slant);
-}
-
-static char *
-font_description_get_set_width (const FontDescription *description)
-{
-	g_return_val_if_fail (description != NULL, NULL);
-
-	return g_strdup (description->set_width);
-}
-
-static char *
-font_description_get_char_set (const FontDescription *description)
-{
-	g_return_val_if_fail (description != NULL, NULL);
-
-	return g_strdup (description->char_set);
-}
-
-static guint
-font_lists_total_num_fonts (const GList *postscript_font_list,
-			    const GList *true_type_font_list)
-{
-	return g_list_length ((GList *) postscript_font_list)
-		+ g_list_length ((GList *) true_type_font_list);
-}
-	
-static void
-font_description_table_add (FontDescriptionTable *table,
-			    const char *line,
-			    const GList *postscript_font_list,
-			    const GList *true_type_font_list)
-{
-	char *font_file_name = NULL;
-	FontDescription *description;
-	char *xlfd_delimeter;
-	char *font_file_full_path;
-	NautilusFontType font_type;
-	
-	g_return_if_fail (table != NULL);
-	g_return_if_fail (string_is_valid (line));
-	g_return_if_fail (font_lists_total_num_fonts (postscript_font_list, true_type_font_list) > 0);
-
-	xlfd_delimeter = strstr (line, " ");
-
-	if (xlfd_delimeter == NULL) {
-		g_warning ("'%s' is not a valid font description line", line);
-		return;
-	}
-
-	font_file_name = g_strndup (line, xlfd_delimeter - line);
-
-	while (isspace ((guchar) *xlfd_delimeter)) {
-		xlfd_delimeter++;
-	}
-
-	font_file_full_path = g_strdup_printf ("%s/%s", table->directory, font_file_name);
-	font_type = font_get_font_type (font_file_full_path,
-					postscript_font_list,
-					true_type_font_list);
-
-	if (font_type != NAUTILUS_FONT_UNDEFINED) {
-		description = font_description_new (font_file_full_path, font_type, xlfd_delimeter);
-		if (description != NULL) {
-			table->descriptions = g_list_append (table->descriptions, description);
-		}
-	}
-
-	g_free (font_file_full_path);
-	g_free (font_file_name);
-}
-
-static NautilusFontType
-font_get_font_type (const char *font_file_name,
-		    const GList *postscript_font_list,
-		    const GList *true_type_font_list)
-{
-	const GList *node;
-
-	g_return_val_if_fail (string_is_valid (font_file_name), NAUTILUS_FONT_UNDEFINED);
-	g_return_val_if_fail (font_lists_total_num_fonts (postscript_font_list, true_type_font_list) > 0,
-			      NAUTILUS_FONT_UNDEFINED);
-
-	node = postscript_font_list;
-	while (node != NULL) {
-		if (nautilus_istr_is_equal (node->data, font_file_name)) {
-			return NAUTILUS_FONT_POSTSCRIPT;
-		}
-		node = node->next;
-	}
-
-	node = true_type_font_list;
-	while (node != NULL) {
-		if (nautilus_istr_is_equal (node->data, font_file_name)) {
-			return NAUTILUS_FONT_TRUE_TYPE;
-		}
-		node = node->next;
-	}
-
-	return NAUTILUS_FONT_UNDEFINED;
-}
-
-static guint
-font_description_table_get_length (const FontDescriptionTable *table)
-{
-	g_return_val_if_fail (table != NULL, 0);
-	
-	return g_list_length (table->descriptions);
-}
-
-static const FontDescription *
-font_description_table_peek_nth (const FontDescriptionTable *table,
-				 guint n)
-{
-	g_return_val_if_fail (table != NULL, NULL);
-	g_return_val_if_fail (n < font_description_table_get_length (table), NULL);
-
-	return g_list_nth_data (table->descriptions, n);
-}
-
-static char *
-font_description_table_get_nth_file_name (const FontDescriptionTable *table,
-					  guint n)
-{
-	const FontDescription *description;
-	
-	g_return_val_if_fail (table != NULL, NULL);
-	g_return_val_if_fail (n < font_description_table_get_length (table), NULL);
-
-	description = font_description_table_peek_nth (table, n);
-	return g_strdup (description->file_name);
-}
-
-static void
-font_description_table_free (FontDescriptionTable *table)
-{
-	g_return_if_fail (table != NULL);
-
-	font_description_table_clear (table);
-	g_free (table);
-}
-
-static void
-font_description_table_clear (FontDescriptionTable *table)
-{
-	GList *node;
-		
-	g_return_if_fail (table != NULL);
-
-	node = table->descriptions;
-	while (node != NULL) {
-		font_description_free (node->data);
-		node = node->next;
-	}
-
-	g_list_free (table->descriptions);
-	table->descriptions = NULL;
-
-	g_free (table->directory);
-	table->directory = NULL;
-
-	g_free (table->fonts_dir_file);
-	table->fonts_dir_file = NULL;
-
-	g_free (table->fonts_alias_file);
-	table->fonts_alias_file = NULL;
-
-	g_free (table->fonts_scale_file);
-	table->fonts_scale_file = NULL;
-}
-
-static const FontDescription *
-font_description_table_find (const FontDescriptionTable *table,
-			     const char *file_name)
-{
-	GList *node;
-	const FontDescription *description;
-	
-	g_return_val_if_fail (table != NULL, NULL);
-	g_return_val_if_fail (nautilus_strlen (file_name) > 0, NULL);
-	
-	for (node = table->descriptions; node != NULL; node = node->next) {
-		g_assert (node->data != NULL);
-		description = node->data;
-
-		if (!description->is_ignored && nautilus_str_is_equal (file_name, description->file_name)) {
-			return description;
-		}
-	}
-
-	return NULL;
-}
-
-static gboolean
-font_description_table_for_each (const FontDescriptionTable *table,
-				 NautilusFontManagerCallback callback,
-				 gpointer callback_data)
-{
-	GList *node;
-	const FontDescription *description;
-	gboolean cont = TRUE;
-		
-	g_return_val_if_fail (table != NULL, TRUE);
-	g_return_val_if_fail (callback != NULL, TRUE);
-
-	node = table->descriptions;
-	while (node != NULL) {
-		g_assert (node->data != NULL);
-		description = node->data;
-		
-		cont = TRUE;
-
-		if (!description->is_ignored) {
-			cont = (* callback) (description->file_name,
-					     description->font_type,
-					     description->foundry,
-					     description->family,
-					     description->weight,
-					     description->slant,
-					     description->set_width,
-					     description->char_set,
-					     callback_data);
-		}
-		
-		node = cont ? node->next : NULL;
-	}
-
-	return cont;
-}
-
-static FontDescriptionTable *
-font_description_table_new (const char *font_directory,
-			    const GList *postscript_font_list,
-			    const GList *true_type_font_list)
-{
-	FontDescriptionTable *table;
-	char *description_file;
-	char *description_contents;
-	NautilusStringList *tokenized_contents;
-	int i;
-	int length;
-	gboolean got_count;
-	int count;
-	char *line;
-
-	g_return_val_if_fail (string_is_valid (font_directory), NULL);
-	g_return_val_if_fail (g_file_test (font_directory, G_FILE_TEST_ISDIR), NULL);
-
-	description_file = g_strdup_printf ("%s/%s", font_directory, FONTS_DIR_FILE_NAME);
-	description_contents = file_as_string (description_file);
-	
-	/* Error reading file, report errors by returning NULL. */
-	if (description_contents == NULL) {
-		g_free (description_file);
-		return NULL;
-	}
-
-	tokenized_contents = nautilus_string_list_new_from_tokens (description_contents, "\n", FALSE);
-
-	/* Get the first line from the file. */
-	length = nautilus_string_list_get_length (tokenized_contents);
-	if (length == 0) {
-		got_count = FALSE;
-	} else {
-		got_count = nautilus_string_list_nth_as_integer (tokenized_contents, 0, &count);
-	}
-
-	/* Find out how many font entries are described in this file */
-	if (!got_count || count + 1 > length) {
-		g_free (description_file);
-		g_free (description_contents);
-		nautilus_string_list_free (tokenized_contents);
-		return NULL;
-	}
-	    
-	/* Create a new table */
-	table = g_new0 (FontDescriptionTable, 1);
-
-	/* Assign the directory and description file */
-	table->directory = g_strdup (font_directory);
-	table->fonts_dir_file = description_file;
-
-	/* Iterate throught the description file contents */
-	for (i = 0; i < count; i++) {
-		line = nautilus_string_list_nth (tokenized_contents, i + 1);
-		if (line != NULL) {
-			font_description_table_add (table,
-						    line,
-						    postscript_font_list,
-						    true_type_font_list);
-		}
-		g_free (line);
-	}
-	nautilus_string_list_free (tokenized_contents);
-
-	/* Assign the alias file if found */
-	if (directory_contains_file (font_directory, FONTS_ALIAS_FILE_NAME)) {
-		table->fonts_alias_file = g_strdup_printf ("%s/%s", font_directory, FONTS_ALIAS_FILE_NAME);
-	}
-	
-	/* Assign the alias scale if found */
-	if (directory_contains_file (font_directory, FONTS_SCALE_FILE_NAME)) {
-		table->fonts_scale_file = g_strdup_printf ("%s/%s", font_directory, FONTS_SCALE_FILE_NAME);
-	}
-
-	g_free (description_contents);
-
-
-	return table;
-}
-
-static GnomeVFSResult
-collect_fonts_from_directory (const char *font_directory,
-			      GList **postscript_font_list,
-			      GList **true_type_font_list)
-{
-	GnomeVFSDirectoryHandle *directory;
-	GnomeVFSResult result;
-	GnomeVFSFileInfo *info;
-	char *directory_uri;
-
-	g_return_val_if_fail (string_is_valid (font_directory), GNOME_VFS_ERROR_BAD_PARAMETERS);
-	g_return_val_if_fail (postscript_font_list != NULL, GNOME_VFS_ERROR_BAD_PARAMETERS);
-	g_return_val_if_fail (true_type_font_list != NULL, GNOME_VFS_ERROR_BAD_PARAMETERS);
-	
-	directory_uri = g_strconcat ("file://", font_directory, NULL);
-
-	*postscript_font_list = NULL;
-	*true_type_font_list = NULL;
-	
-	result = gnome_vfs_directory_open (&directory,
-					   directory_uri,
-					   GNOME_VFS_FILE_INFO_GET_MIME_TYPE,
-					   NULL);
-	g_free (directory_uri);
-	
-	if (result != GNOME_VFS_OK) {
-		return result;
-	}
-	
-	
-	while (TRUE) {
-		info = gnome_vfs_file_info_new ();
-		result = gnome_vfs_directory_read_next (directory, info);
-		if (result == GNOME_VFS_OK) {
-			if (strcasecmp (info->mime_type, POSTSCRIPT_FONT_MIME_TYPE) == 0) {
-				*postscript_font_list = g_list_prepend (*postscript_font_list,
-					g_strconcat (font_directory,
-						"/", info->name, NULL));
-			} else if (strcasecmp (info->mime_type, TRUE_TYPE_FONT_MIME_TYPE) == 0) {
-				*true_type_font_list = g_list_prepend (*true_type_font_list,
-					g_strconcat (font_directory,
-						"/", info->name, NULL));
-			}
-		}
-		gnome_vfs_file_info_unref (info);
-		
-		if (result == GNOME_VFS_ERROR_EOF) {
-			break;
-		}
-	}
-	
-	gnome_vfs_directory_close (directory);
-	
-	return GNOME_VFS_OK;
-}
-
-
-static void
-chop_off_comments (char *line)
-{
-
-	/* Terminates a string right at the start of a comment, stripping it from the
-	 * string.
-	 */
-	gboolean saw_escape;
-	char *scanner;
-
-	saw_escape = FALSE;
-	for (scanner = line; *scanner != '\0'; scanner++) {
-		if (saw_escape) {
-			saw_escape = FALSE;
-			continue;
-		}		
-		if (*scanner == '\\') {
-	
-	
-			saw_escape = TRUE;
-			continue;
-		}
-		if (*scanner == '#') {
-			*scanner = '\0';
-			break;
-		}
-	}
-}
-
-static void
-next_token (const char *buffer, int from, int *token_start, int *token_end)
-{
-	gboolean saw_escape;
-	const char *scanner;
-
-	g_assert ((int) strlen (buffer) >= from);
-
-	*token_start = -1;
-	*token_end = -1;
-	
-	/* strip white space */
-	saw_escape = FALSE;
-	for (scanner = buffer + from; *scanner != '\0'; scanner++) {
-		if (saw_escape) {
-			saw_escape = FALSE;
-			continue;
-		}		
-		if (*scanner == '\\') {
-			saw_escape = TRUE;
-			continue;
-		}
-		if (!isspace ((guchar) *scanner) && *scanner != '\n') {
-			*token_start = scanner - buffer;
-			break;
-		}
-	}	
-
-	if (*scanner == ',') {
-		*token_end = *token_start + 1;
-		return;
-	}
-	
-	/* go until token end */
-	saw_escape = FALSE;
-	for (; *scanner != '\0'; scanner++) {
-		if (saw_escape) {
-			saw_escape = FALSE;
-			continue;
-		}		
-		if (*scanner == '\\') {
-			saw_escape = TRUE;
-			continue;
-		}
-		if (isspace ((guchar) *scanner) || *scanner == ',') {
-			break;
-		}
-	}	
-	
-	if (*token_start >= 0) {
-		*token_end = scanner - buffer;
-	}
-}
-
-#define READ_BUFFER_SIZE 2048
-
-static gboolean
-token_matches (const char *buffer, int start, int end, const char *pattern)
-{
-	if (start < 0) {
-		return FALSE;
-	}
-
-	return strncmp (buffer + start, pattern, end - start) == 0;
-}
-
-typedef enum {
-	EXPECT_CATALOGUE,
-	EXPECT_ASSIGNMENT,
-	EXPECT_DIRECTORY,
-	EXPECT_COMMA
-} FontConfigParseState;
-
-static void
-font_server_for_each_font_directory_internal (void (* callback) (const char *font_directory, gpointer callback_data),
-					      gpointer callback_data,
-					      char *buffer,
-					      FILE *file)
-{
-	FontConfigParseState state;
-	int token_start, token_end;
-	char *font_directory;
-
-	g_return_if_fail (callback != NULL);
-	g_return_if_fail (buffer != NULL);
-	g_return_if_fail (file != NULL);
-
-	state = EXPECT_CATALOGUE;
-	while (TRUE) {
-		fgets (buffer, READ_BUFFER_SIZE, file);
-		if (strlen (buffer) == 0) {
-			if (state != EXPECT_COMMA) {
-				g_warning ("unexpected file end.");
-			}
-			break;
-		}
-		
-		chop_off_comments (buffer);
-		
-		token_start = 0;
-		while (TRUE) {
-			next_token (buffer, token_start, &token_start, &token_end);
-	
-			if (token_start < 0) {
-				break;
-			}
-
-			switch (state) {
-			case EXPECT_CATALOGUE:
-				if (token_matches(buffer, token_start, token_end, "catalogue")) {
-					state = EXPECT_ASSIGNMENT;
-				}
-				break;
-				
-			case EXPECT_ASSIGNMENT:
-				if (!token_matches(buffer, token_start, token_end, "=")) {
-					g_warning (" expected token \"=\" .");
-					return;
-				}
-				state = EXPECT_DIRECTORY;
-				break;
-				
-			case EXPECT_DIRECTORY:
-				if (token_matches(buffer, token_start, token_end, ",")) {
-					g_warning (" expected directory name.");
-					return;
-				}
-				/* found a directory, call an each function on it */
-				font_directory = g_strndup (buffer + token_start, token_end - token_start);
-				(* callback) (font_directory, callback_data);
-				g_free (font_directory);
-				state = EXPECT_COMMA;
-				break;
-
-			case EXPECT_COMMA:
-				if (!token_matches(buffer, token_start, token_end, ",")) {
-					/* we are done, no more directories */
-					return;
-				}
-				state = EXPECT_DIRECTORY;
-				break;				
-			}
-			
-			token_start = token_end;
-		}
-	}
-}
-
-static void
-font_server_for_each_font_directory (const char *font_config_file_path,
-				     void (* callback) (const char *font_directory, gpointer callback_data),
-				     gpointer callback_data)
-{
-	/* scan the font config file, finding all the font directory paths */
-	FILE *font_config_file;
-	char *buffer;
-
-	g_return_if_fail (string_is_valid (font_config_file_path));
-	g_return_if_fail (callback != NULL);
-	g_return_if_fail (callback_data != NULL);
-	
-	font_config_file = fopen (font_config_file_path, "r");
-
-	if (font_config_file == NULL) {
-		return;
-	}
-	
-	buffer = g_malloc (READ_BUFFER_SIZE);
-	font_server_for_each_font_directory_internal (callback,
-						      callback_data,
-						      buffer,
-						      font_config_file);
-	
-	g_free (buffer);
-	fclose (font_config_file);
-}
-
-static gboolean
-directory_contains_file (const char *directory,
-			 const char *file_name)
-{
-	gboolean result;
-	char *path;
-
-	g_return_val_if_fail (string_is_valid (directory), FALSE);
-	g_return_val_if_fail (string_is_valid (file_name), FALSE);
-
-	path = g_strdup_printf ("%s/%s", directory, file_name);
-	result = g_file_exists (path);
-	g_free (path);
-
-	return result;
-}
-
-/* Iterating directories is slow cause of all the mime sniffing that
- * has to happen on each potential scalalble font.  By Ignoring
- * directories that arent interesting, we make things much faster.
- */
-static gboolean
-font_directory_is_ignored (const char *font_directory)
-{
-	guint i;
-
-	g_return_val_if_fail (string_is_valid (font_directory), TRUE);
-
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (ignored_font_dir_suffices); i++) {
-		if (nautilus_str_has_suffix (font_directory, ignored_font_dir_suffices[i])) {
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-static gboolean
-font_foundry_is_ignored (const char *foundry) 
-{
-	guint i;
-	
-	g_return_val_if_fail (foundry != NULL, TRUE);
-	
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (black_listed_font_foundries); i++) {
-		if (nautilus_istr_is_equal (foundry, black_listed_font_foundries[i])) {
-			return TRUE;
-		}
-	}
-	
-	return FALSE;
-}
-
-static gboolean
-font_family_is_ignored (const char *family) 
-{
-	guint i;
-	
-	g_return_val_if_fail (family != NULL, TRUE);
-	
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (black_listed_font_families); i++) {
-		if (nautilus_istr_is_equal (family, black_listed_font_families[i])) {
-			return TRUE;
-		}
-	}
-	
-	return FALSE;
-}
-
-static void
-font_manager_collect_font_tables (const char *font_directory,
-				  GList **collected_font_tables)
-{
-	GList *postscript_font_list = NULL;
-	GList *true_type_font_list = NULL;
-	FontDescriptionTable *table;
-
-	g_return_if_fail (string_is_valid (font_directory));
-	g_return_if_fail (collected_font_tables != NULL);
-
-	if (font_directory_is_ignored (font_directory)) {
-		return;
-	}
-	
-	/* Collect postscript and true type font in this directory */
-	collect_fonts_from_directory (font_directory, &postscript_font_list, &true_type_font_list);
-
-	/* No scalable fonts found; we're done */
-	if (g_list_length (postscript_font_list) == 0 
-	    && g_list_length (true_type_font_list) == 0) {
-		return;
-	}
-
-	/* If no "fonts.dir" exists, then the user has a missing description file (broken setup) */
-	if (!directory_contains_file (font_directory, FONTS_DIR_FILE_NAME)) {
-		nautilus_g_list_free_deep (postscript_font_list);
-		nautilus_g_list_free_deep (true_type_font_list);
-		g_warning ("Direcotry '%s' contains scalable fonts but no '%s' description file.",
-			   font_directory,
-			   FONTS_DIR_FILE_NAME);
-		return;
-	}
-	
-	table = font_description_table_new (font_directory, postscript_font_list, true_type_font_list);
-	if (table == NULL) {
-		nautilus_g_list_free_deep (postscript_font_list);
-		nautilus_g_list_free_deep (true_type_font_list);
-		g_warning ("Error trying to process font directory '%s'.", font_directory);
-		return;
-	}
-
-	*collected_font_tables = g_list_append (*collected_font_tables, table);
-
-	nautilus_g_list_free_deep (postscript_font_list);
-	nautilus_g_list_free_deep (true_type_font_list);
-}
-
-static void
-font_server_for_each_callback (const char *font_directory,
-			       gpointer callback_data)
-{
-	g_return_if_fail (string_is_valid (font_directory));
-	g_return_if_fail (callback_data != NULL);
-
-	font_manager_collect_font_tables (font_directory, callback_data);
-}
-
-static GList *global_font_table = NULL;
-
-static void
-font_table_list_free (GList *font_table_list)
-{
-	GList *node;
-
-	node = font_table_list;
-	while (node != NULL) {
-		g_assert (node->data != NULL);
-		font_description_table_free (node->data);
-		node = node->next;
-	}
-	g_list_free (font_table_list);
-}
-
-static const FontDescription *
-font_table_list_find (const GList *font_table_list,
-		      const char *file_name)
-{
-	const GList *node;
-	const FontDescription *description;
-
-	g_return_val_if_fail (file_name != NULL, NULL);
-
-	for (node = font_table_list; node != NULL; node = node->next) {
-		g_assert (node->data != NULL);
-		description = font_description_table_find (node->data, file_name);
-		if (description != NULL) {
-			return description;
-		}
-	}
-
-	return NULL;
-}
-
-static void
-free_font_tables (void)
-{
-	font_table_list_free (global_font_table);
-	global_font_table = NULL;
-}
-
-static void
-ensure_local_font_table (void)
-{
-	char *user_font_dir;
-
-	if (global_font_table != NULL) {
-		return;
-	}
-
-	/* Populate the default font table if needed.  Use the installed fonts
-	 * if available.  Otherwise use the ones in the source tree itself, so that
-	 * checks will work even if Nautilus has not undergone 'make install.'
-	 */
-	if (g_file_exists (DEFAULT_FONT_DIRECTORY "/" DEFAULT_FONT)) {
-		font_manager_collect_font_tables (DEFAULT_FONT_DIRECTORY, &global_font_table);
-	} else {
-		font_manager_collect_font_tables (SOURCE_FONT_DIRECTORY, &global_font_table);
-	}
-
-	/* Populate the user font table if needed */
-	user_font_dir = g_strdup_printf ("%s/.nautilus/%s", g_get_home_dir (), USER_FONT_DIRECTORY_NAME);
-	if (g_file_test (user_font_dir, G_FILE_TEST_ISDIR)) {
-		font_manager_collect_font_tables (user_font_dir, &global_font_table);
-	}
-	g_free (user_font_dir);
-
-	/* Populate the system font table if needed - using the font server's configuration */
-	if (g_file_exists (FONT_SERVER_CONFIG_FILE)) {
-		font_server_for_each_font_directory (FONT_SERVER_CONFIG_FILE,
-						     font_server_for_each_callback,
-						     &global_font_table);
-	}
-	
-	g_atexit (free_font_tables);
-}
-
-/* Public */
-
-/**
- * nautilus_font_manager_for_each_font:
- * @callback: A callback to be called for each scalable font in the system.
- * @callback_data: User's data.
- *
- * Iterate all the scalable fonts available in the system.  The available
- * fonts are the sum of:
- *
- * 1) Fallback fonts installed by Nautilus
- * 2) User fonts found in ~/.nautilus/fonts
- * 3) Fonts listed in the font servers config file (/etc/X11/fs/config)
- *
- */
-void
-nautilus_font_manager_for_each_font (NautilusFontManagerCallback callback,
-				     gpointer callback_data)
-{
-	GList *node;
-	gboolean cont = TRUE;
-
- 	g_return_if_fail (callback != NULL);
-
-	/* We will be making GnomeVFS calls */
-	gnome_vfs_init_if_needed ();
-	
-	/* Ensure that all the font tables exist */
-	ensure_local_font_table ();
-
-	for (node = global_font_table; node != NULL && cont; node = node->next) {
-		g_assert (node->data != NULL);
-		cont = font_description_table_for_each (node->data, callback, callback_data);
-	}
-}
-
-/* Return the default font.  It will be found either in place where nautilus
- * gets installed (via 'make install') or the source directory if nautilus
- * has not undergone 'make install'
- */
-char *
-nautilus_font_manager_get_default_font (void)
-{
-	guint i;
-
-	static const char *default_fonts[] = {
-		DEFAULT_FONT_DIRECTORY "/" DEFAULT_FONT,
-		SOURCE_FONT_DIRECTORY "/" DEFAULT_FONT
-	};
-
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (default_fonts); i++) {
-		if (g_file_exists (default_fonts[i])) {
-			return g_strdup (default_fonts[i]);
-		}
-	}
-
-	return NULL;
-}
-
-/* Return the default vold font.  It will be found either in place where nautilus
- * gets installed (via 'make install') or the source directory if nautilus
- * has not undergone 'make install'
- */
-char *
-nautilus_font_manager_get_default_bold_font (void)
-{
-	guint i;
-
-	static const char *default_bold_fonts[] = {
-		DEFAULT_FONT_DIRECTORY "/" DEFAULT_BOLD_FONT,
-		SOURCE_FONT_DIRECTORY "/" DEFAULT_BOLD_FONT
-	};
-
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (default_bold_fonts); i++) {
-		if (g_file_exists (default_bold_fonts[i])) {
-			return g_strdup (default_bold_fonts[i]);
-		}
-	}
-
-	return NULL;
-}
-
-gboolean
-nautilus_font_manager_file_is_scalable_font (const char *file_name)
-{
-	gboolean is_scalable_font = FALSE;
-	char *uri;
-	GnomeVFSFileInfo *info;
-	GnomeVFSResult result;
-	
-	g_return_val_if_fail (nautilus_strlen (file_name) > 0, FALSE);
-
-	gnome_vfs_init_if_needed ();
-
-	uri = g_strconcat ("file://", file_name, NULL);
-
-	info = gnome_vfs_file_info_new ();
-	result = gnome_vfs_get_file_info (uri, info, GNOME_VFS_FILE_INFO_GET_MIME_TYPE);
-
-	if (result == GNOME_VFS_OK) {
-		is_scalable_font = 
-			nautilus_istr_is_equal (info->mime_type, POSTSCRIPT_FONT_MIME_TYPE)
-			|| nautilus_istr_is_equal (info->mime_type, TRUE_TYPE_FONT_MIME_TYPE);
-	}
-
-	gnome_vfs_file_info_unref (info);
-	g_free (uri);
-
-	return is_scalable_font;
-}
-
-typedef struct
-{
-	const FontDescription *description;
-	char *found_file_name;
-} FindData;
-
-static gboolean
-font_list_find_bold_callback (const char *font_file_name,
-			      NautilusFontType font_type,
-			      const char *foundry,
-			      const char *family,
-			      const char *weight,
-			      const char *slant,
-			      const char *set_width,
-			      const char *char_set,
-			      gpointer callback_data)
-{
-	FindData *data;
-
-	g_return_val_if_fail (font_file_name != NULL, FALSE);
-	g_return_val_if_fail (foundry != NULL, FALSE);
-	g_return_val_if_fail (family != NULL, FALSE);
-	g_return_val_if_fail (weight != NULL, FALSE);
-	g_return_val_if_fail (slant != NULL, FALSE);
-	g_return_val_if_fail (set_width != NULL, FALSE);
-	g_return_val_if_fail (char_set != NULL, FALSE);
-	g_return_val_if_fail (callback_data != NULL, FALSE);
-
-	data = callback_data;
-
-	g_return_val_if_fail (data->description != NULL, FALSE);
-	g_return_val_if_fail (data->found_file_name == NULL, FALSE);
-	
-	if (nautilus_istr_is_equal (data->description->foundry, foundry)
-	    && nautilus_istr_is_equal (data->description->family, family)
-	    && nautilus_istr_is_equal (data->description->slant, slant)
-	    && nautilus_istr_is_equal (data->description->set_width, set_width)
-	    && nautilus_istr_is_equal (data->description->char_set, char_set)
-	    && nautilus_font_manager_weight_is_bold (weight)) {
-		data->found_file_name = g_strdup (font_file_name);
-	}
-
-	return (data->found_file_name == NULL);
-}
-
-char *
-nautilus_font_manager_get_bold (const char *plain_font)
-{
-	FindData data;
-
-	g_return_val_if_fail (nautilus_strlen (plain_font) > 0, NULL);
-	g_return_val_if_fail (nautilus_font_manager_file_is_scalable_font (plain_font), NULL);
-
-	ensure_local_font_table ();
-
- 	data.description = font_table_list_find (global_font_table, plain_font);
-
- 	if (data.description == NULL) {
- 		return g_strdup (plain_font);
- 	}
-	
- 	data.found_file_name = NULL;
- 	nautilus_font_manager_for_each_font (font_list_find_bold_callback, &data);
-	
- 	if (data.found_file_name != NULL) {
- 		return data.found_file_name;
- 	}
-	
-	return g_strdup (plain_font);
-}
-
-gboolean
-nautilus_font_manager_weight_is_bold (const char *weight)
-{
-	g_return_val_if_fail (weight != NULL, FALSE);
-
-	return (nautilus_istr_is_equal (weight, "bold")
-		|| nautilus_istr_is_equal (weight, "demibold")
-		|| nautilus_istr_is_equal (weight, "black"));
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-#define TEST_FONT1 SOURCE_FONT_DIRECTORY "/" "n019003l.pfb"
-#define TEST_FONT2 SOURCE_FONT_DIRECTORY "/" "n019004l.pfb"
-#define TEST_FONT3 SOURCE_FONT_DIRECTORY "/" "n019023l.pfb"
-#define TEST_FONT4 SOURCE_FONT_DIRECTORY "/" "n019024l.pfb"
-
-static char *
-call_chop_off_comments (const char *input)
-{
-	char *test_copy;
-	test_copy = g_strdup (input);
-	chop_off_comments (test_copy);
-	return test_copy;
-}
-
-void
-nautilus_self_check_font_manager (void)
-{
-	FontDescriptionTable *table;
-	const FontDescription *description;
-	GList *font_table_list = NULL;
-	char *original_current_dir;
-
-	/* chop_off_comments() */
-	NAUTILUS_CHECK_STRING_RESULT (call_chop_off_comments ("foo bar"), "foo bar");
-	NAUTILUS_CHECK_STRING_RESULT (call_chop_off_comments ("foo bar\n"), "foo bar\n");
-	NAUTILUS_CHECK_STRING_RESULT (call_chop_off_comments ("#foo bar"), "");
-	NAUTILUS_CHECK_STRING_RESULT (call_chop_off_comments ("foo bar#"), "foo bar");
-	NAUTILUS_CHECK_STRING_RESULT (call_chop_off_comments ("\\foo bar"), "\\foo bar");
-	NAUTILUS_CHECK_STRING_RESULT (call_chop_off_comments ("\\#foo bar"), "\\#foo bar");
-	NAUTILUS_CHECK_STRING_RESULT (call_chop_off_comments ("\\##foo bar"), "\\#");
-
-	original_current_dir = g_get_current_dir ();
-
-	g_return_if_fail (g_file_exists (SOURCE_FONT_DIRECTORY));
-
-	g_return_if_fail (g_file_exists (TEST_FONT1));
-	g_return_if_fail (g_file_exists (TEST_FONT2));
-	g_return_if_fail (g_file_exists (TEST_FONT3));
-	g_return_if_fail (g_file_exists (TEST_FONT4));
-
-	font_manager_collect_font_tables (SOURCE_FONT_DIRECTORY, &font_table_list);
-	g_return_if_fail (font_table_list != NULL);
-
-	g_return_if_fail (g_list_nth_data (font_table_list, 0) != NULL);
-	table = g_list_nth_data (font_table_list, 0);
-
- 	NAUTILUS_CHECK_INTEGER_RESULT (font_description_table_get_length (table), 4);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_table_get_nth_file_name (table, 0), TEST_FONT1);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_table_get_nth_file_name (table, 1), TEST_FONT2);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_table_get_nth_file_name (table, 2), TEST_FONT3);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_table_get_nth_file_name (table, 3), TEST_FONT4);
-
-	description = font_description_table_peek_nth (table, 0);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_file_name (description), TEST_FONT1);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_foundry (description), "URW");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_family (description), "Helvetica Default");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_weight (description), "medium");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_slant (description), "r");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_set_width (description), "normal");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_char_set (description), "iso8859-1");
-
-	description = font_description_table_peek_nth (table, 1);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_file_name (description), TEST_FONT2);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_foundry (description), "URW");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_family (description), "Helvetica Default");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_weight (description), "bold");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_slant (description), "r");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_set_width (description), "normal");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_char_set (description), "iso8859-1");
-
-	description = font_description_table_peek_nth (table, 2);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_file_name (description), TEST_FONT3);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_foundry (description), "URW");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_family (description), "Helvetica Default");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_weight (description), "medium");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_slant (description), "o");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_set_width (description), "normal");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_char_set (description), "iso8859-1");
-
-	description = font_description_table_peek_nth (table, 3);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_file_name (description), TEST_FONT4);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_foundry (description), "URW");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_family (description), "Helvetica Default");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_weight (description), "bold");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_slant (description), "o");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_set_width (description), "normal");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_char_set (description), "iso8859-1");
-
-	font_table_list_free (font_table_list);
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-font-manager.h b/libnautilus-extensions/nautilus-font-manager.h
deleted file mode 100644
index 6a9c41041..000000000
--- a/libnautilus-extensions/nautilus-font-manager.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-font-manager.h - Functions for managing fonts.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Pavel Cisler <pavel@eazel.com>,
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_FONT_MANAGER_H
-#define NAUTILUS_FONT_MANAGER_H
-
-#include <libgnome/gnome-defs.h>
-#include <glib.h>
-
-BEGIN_GNOME_DECLS
-
-typedef enum {
-	NAUTILUS_FONT_POSTSCRIPT = 1,
-	NAUTILUS_FONT_TRUE_TYPE
-} NautilusFontType;
-
-/*
- * A callback which can be invoked for each font available in the system.
- */
-typedef gboolean (*NautilusFontManagerCallback) (const char *font_file_name,
-						 NautilusFontType font_type,
-						 const char *foundry,
-						 const char *family,
-						 const char *weight,
-						 const char *slant,
-						 const char *set_width,
-						 const char *char_set,
-						 gpointer callback_data);
-
-void     nautilus_font_manager_for_each_font         (NautilusFontManagerCallback  callback,
-						      gpointer                     callback_data);
-char *   nautilus_font_manager_get_default_font      (void);
-char *   nautilus_font_manager_get_default_bold_font (void);
-gboolean nautilus_font_manager_file_is_scalable_font (const char                  *file_name);
-char *   nautilus_font_manager_get_bold              (const char                  *plain_font);
-char *   nautilus_font_manager_get_italic            (const char                  *plain_font);
-gboolean nautilus_font_manager_weight_is_bold        (const char                  *weight);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_FONT_MANAGER_H */
-
-
diff --git a/libnautilus-extensions/nautilus-font-picker.c b/libnautilus-extensions/nautilus-font-picker.c
deleted file mode 100644
index 12bb6032b..000000000
--- a/libnautilus-extensions/nautilus-font-picker.c
+++ /dev/null
@@ -1,1052 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-font-picker.c - A simple widget to select scalable fonts.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-font-picker.h"
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-#include "nautilus-string.h"
-#include "nautilus-font-manager.h"
-
-#include <libgnome/gnome-i18n.h>
-
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtksignal.h>
-
-#include <libgnome/gnome-i18n.h>
-
-typedef enum {
-	FONT_SLANT_NORMAL,
-	FONT_SLANT_OBLIQUE,
-	FONT_SLANT_ITALIC
-} FontSlant;
-
-typedef enum {
-	FONT_STRETCH_NORMAL,
-	FONT_STRETCH_CONDENSED,
-	FONT_STRETCH_SEMICONDENSED
-} FontStretch;
-
-typedef struct {
-	char *name;
-	gboolean is_bold;
-	FontSlant slant;
-	FontStretch stretch;
-	char *font_file_name;
-} FontStyleEntry;
-
-typedef struct {
-	char *name;
-	char *family;
-	char *name_for_display;
-	GList *style_list;
-} FontEntry;
-
-typedef struct
-{
-	const char *name;
-	const char *mapped;
-} StyleMap;
-
-static const char *normal_style = N_("Normal");
-static const char *unknown_style = N_("Unknown");
-
-static const StyleMap font_weight_map[] = {
-       	{ "",	      NULL },
-       	{ "medium",   NULL },
-	{ "regular",  NULL },
-	{ "bold",     N_("Bold") },
-	{ "book",     N_("Book") },
-	{ "black",    N_("Black") },
-	{ "demibold", N_("Demibold") },
-	{ "light",    N_("Light") }
-};
-
-static const StyleMap font_slant_map[] = {
-       	{ "",	      NULL },
-	{ "r",	      NULL },
-	{ "i",	      N_("Italic"), },
-	{ "o",	      N_("Oblique"), },
-	{ "ri",	      N_("Reverse Italic"), },
-	{ "ro",	      N_("Reverse Oblique"), },
-	{ "ot",	      N_("Other"), }
-};
-
-static const StyleMap font_set_width_map[] = {
-       	{ "",                 NULL },
-	{ "normal",	      NULL },
-	{ "condensed",	      N_("Condensed"), },
-	{ "semicondensed",    N_("Semicondensed"), }
-};
-
-static const gint FONT_PICKER_SPACING = 10;
-
-static GList *global_font_list = NULL;
-
-#define FONT_MENU_ITEM_DATA_KEY "font-menu-entry"
-#define FONT_MENU_STYLE_SUBMENU_DATA_KEY "font-menu-style-submenu"
-#define FONT_STYLE_MENU_ITEM_DATA_KEY "font-style-menu-entry"
-#define FONT_MENU_INDEX_DATA_KEY "font-menu-index"
-#define FONT_MENU_IS_MORE_KEY "font-menu-is-more"
-
-/* Signals */
-typedef enum
-{
-	CHANGED,
-	LAST_SIGNAL
-} FontPickerSignals;
-
-struct NautilusFontPickerDetails
-{
-	GtkWidget *option_menu;
-	GtkWidget *menu;
-	GtkWidget *current_menu;
-	char *selected_font;
-	gboolean option_menu_got_valid_selection;
-};
-
-/* GtkObjectClass methods */
-static void                  nautilus_font_picker_initialize_class (NautilusFontPickerClass   *font_picker_class);
-static void                  nautilus_font_picker_initialize       (NautilusFontPicker        *font_picker);
-static void                  nautilus_font_picker_destroy          (GtkObject                 *object);
-
-/* Private methods */
-static void                  font_picker_populate                  (NautilusFontPicker        *font_picker);
-
-/* Global font list */
-static const GList *         global_font_list_get                  (void);
-static void                  global_font_list_free                 (void);
-static gboolean              global_font_list_populate_callback    (const char                *font_file_name,
-								    NautilusFontType           font_type,
-								    const char                *foundry,
-								    const char                *family,
-								    const char                *weight,
-								    const char                *slant,
-								    const char                *set_width,
-								    const char                *char_set,
-								    gpointer                   callback_data);
-static guint                 nautilus_gtk_menu_shell_get_num_items (const GtkMenuShell        *menu_shell);
-static const FontStyleEntry *font_picker_get_selected_style_entry  (const NautilusFontPicker  *font_picker);
-static gboolean              font_picker_find_entries_for_font     (const char                *font_file_name,
-								    const FontEntry          **entry,
-								    const FontStyleEntry     **style_entry);
-static int                   font_picker_get_index_for_entry       (const NautilusFontPicker  *font_picker,
-								    const FontEntry           *entry);
-	
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusFontPicker, nautilus_font_picker, NAUTILUS_TYPE_CAPTION)
-
-static guint font_picker_signals[LAST_SIGNAL] = { 0 };
-
-/* GtkObjectClass methods */
-static void
-nautilus_font_picker_initialize_class (NautilusFontPickerClass *font_picker_class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = GTK_OBJECT_CLASS (font_picker_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_font_picker_destroy;
-
-	/* Signals */
-	font_picker_signals[CHANGED] = gtk_signal_new ("changed",
-						       GTK_RUN_LAST,
-						       object_class->type,
-						       0,
-						       gtk_marshal_NONE__NONE,
-						       GTK_TYPE_NONE, 
-						       0);
-
-	gtk_object_class_add_signals (object_class, font_picker_signals, LAST_SIGNAL);
-}
-
-/* When the option menu is clicked, we reset a 'valid_selection' flag.
- * This flag will be set to TRUE when a valid selection is made.  We
- * need to do this to workaround a bug (or feature?) in GtkOptionMenu
- * that changes the selected item even if it wasnt actually clicked - for
- * example, if you changed your mind and clicked somewhere else after almost
- * selecting an item
- */
-static int
-option_menu_button_press_event (GtkButton *button,
-				GdkEventButton *event,
-				NautilusFontPicker *font_picker)
-{
-	g_return_val_if_fail (GTK_IS_BUTTON (button), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker), FALSE);
-
-	font_picker->details->option_menu_got_valid_selection = FALSE;
-	
-	return FALSE;
-}
-
-/* If no valid selection was made, then we restore the old selected font */
-static void
-menu_deactivate (GtkMenuShell *menu_shell,
-		 NautilusFontPicker *font_picker)
-{
-	g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell));
-	g_return_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker));
-
-	if (!font_picker->details->option_menu_got_valid_selection) {
-		nautilus_font_picker_set_selected_font (font_picker,
-							font_picker->details->selected_font);
-	}
-
-	/* This is needed to workaround a very annoying painting bug in
-	 * menus.  In some themes (like the Eazel Crux theme) 'almost selected'
-	 * items will appear white for some crazy reason.
-	 */
-	gtk_widget_queue_draw (GTK_WIDGET (menu_shell));
-}
-
-static void
-nautilus_font_picker_initialize (NautilusFontPicker *font_picker)
-{
-	const FontStyleEntry *selected_style_entry;
-
-	font_picker->details = g_new0 (NautilusFontPickerDetails, 1);
-	gtk_box_set_homogeneous (GTK_BOX (font_picker), FALSE);
-	gtk_box_set_spacing (GTK_BOX (font_picker), FONT_PICKER_SPACING);
-
-	/* The font option menu */
-	font_picker->details->option_menu = gtk_option_menu_new ();
-	font_picker->details->menu = gtk_menu_new ();
-
-	gtk_signal_connect (GTK_OBJECT (font_picker->details->option_menu),
-			    "button_press_event",
-			    GTK_SIGNAL_FUNC (option_menu_button_press_event),
-			    font_picker);
-
-	gtk_signal_connect (GTK_OBJECT (font_picker->details->menu),
-			    "deactivate",
-			    GTK_SIGNAL_FUNC (menu_deactivate),
-			    font_picker);
-
-	font_picker->details->current_menu = font_picker->details->menu;
-
-	nautilus_caption_set_child (NAUTILUS_CAPTION (font_picker),
-				    font_picker->details->option_menu,
-				    FALSE,
-				    FALSE);
-
-	font_picker_populate (font_picker);
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (font_picker->details->option_menu),
-				  font_picker->details->menu);
-
-	gtk_option_menu_set_history (GTK_OPTION_MENU (font_picker->details->option_menu), 0);
-
-	selected_style_entry = font_picker_get_selected_style_entry  (font_picker);
-	
-	if (selected_style_entry != NULL) {
-		font_picker->details->selected_font = g_strdup (selected_style_entry->font_file_name);
-	}
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_font_picker_destroy (GtkObject* object)
-{
-	NautilusFontPicker *font_picker;
-
-	g_return_if_fail (NAUTILUS_IS_FONT_PICKER (object));
-	
-	font_picker = NAUTILUS_FONT_PICKER (object);
-
-	g_free (font_picker->details->selected_font);
-	g_free (font_picker->details);
-
-	/* Chain */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-static FontEntry *
-font_list_find (const GList *font_list,
-		const char *font_name)
-{
-	const GList *node;
-	FontEntry *entry;
-
-	/* First check the foundry qualified font names */
-	for (node = font_list; node != NULL; node = node->next) {
-		g_assert (node->data != NULL);
-		entry = node->data;
-
-		if (nautilus_istr_is_equal (font_name, entry->name)) {
-			return entry;
-		}
-	}
-
-	/* First check the foundry qualified font names */
-	for (node = font_list; node != NULL; node = node->next) {
-		g_assert (node->data != NULL);
-		entry = node->data;
-
-		if (nautilus_istr_is_equal (font_name, entry->family)) {
-			return entry;
-		}
-	}
-
-	return NULL;
-}
-
-static void
-style_menu_item_activate_callback (GtkWidget *menu_item,
-				   gpointer callback_data)
-{
-	const FontStyleEntry *style_entry;
-	NautilusFontPicker *font_picker;
-
-	g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
-	g_return_if_fail (NAUTILUS_IS_FONT_PICKER (callback_data));
-
-	font_picker = NAUTILUS_FONT_PICKER (callback_data);
-
-	style_entry = gtk_object_get_data (GTK_OBJECT (menu_item), FONT_STYLE_MENU_ITEM_DATA_KEY);
-
-	g_return_if_fail (style_entry != NULL);
-
-	nautilus_font_picker_set_selected_font (font_picker, style_entry->font_file_name);
-	
-	gtk_signal_emit (GTK_OBJECT (font_picker), font_picker_signals[CHANGED]);
-}
-
-/* This event indicates that a valid selection was made in one of 
- * the style menus.
- */
-static int
-style_menu_item_button_release_event (GtkMenuItem *menu_item,
-				      GdkEventButton *event,
-				      NautilusFontPicker *font_picker)
-{
- 	g_return_val_if_fail (GTK_IS_MENU_ITEM (menu_item), FALSE);
- 	g_return_val_if_fail (event != NULL, FALSE);
- 	g_return_val_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker), FALSE);
-	
-	font_picker->details->option_menu_got_valid_selection = TRUE;
-	
- 	return FALSE;
-}
-
-static GtkWidget *
-font_picker_add_item (NautilusFontPicker *font_picker,
-		      const char *label,
-		      int index,
-		      const FontEntry *font_entry,
-		      GtkWidget *style_menu)
-{
-	GtkWidget *item;
-	NautilusDimensions item_dimensions;
-	NautilusDimensions menu_dimensions;
-	NautilusDimensions screen_dimensions;
-	int available_height;
-	int new_menu_height;
-	int more_item_height_guess;
-	GtkMenu *current_menu;
-
-	g_return_val_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker), NULL);
-	g_return_val_if_fail (label != NULL, NULL);
-	g_return_val_if_fail (index >= 0, NULL);
-	g_return_val_if_fail (font_entry != NULL, NULL);
-	g_return_val_if_fail (GTK_IS_MENU (style_menu), NULL);
-	
-	current_menu = GTK_MENU (font_picker->details->current_menu);
-
-	item = gtk_menu_item_new_with_label (label);
-	
-	gtk_object_set_data (GTK_OBJECT (item),
-			     FONT_MENU_INDEX_DATA_KEY,
-			     GINT_TO_POINTER (index));
-	gtk_object_set_data (GTK_OBJECT (item),
-			     FONT_MENU_ITEM_DATA_KEY,
-			     (gpointer) font_entry);
-	gtk_object_set_data (GTK_OBJECT (item),
-			     FONT_MENU_STYLE_SUBMENU_DATA_KEY,
-			     style_menu);
-
-	screen_dimensions = nautilus_screen_get_dimensions ();
-	menu_dimensions = nautilus_gtk_widget_get_preferred_dimensions (GTK_WIDGET (current_menu));
-	item_dimensions = nautilus_gtk_widget_get_preferred_dimensions (item);
-
-	/* FIXME: It would be cool if the available height took into
-	 *        account the panel dimensions if its visible.  I have
-	 *        no clue how to do that 
-	 */
-	available_height = screen_dimensions.height;
-
-	/* We guess that the space needed by a possible "More..." item
-	 * is the average height of the current items in the menu.
-	 */
-	more_item_height_guess = menu_dimensions.height / 
-		MAX (1, nautilus_gtk_menu_shell_get_num_items (GTK_MENU_SHELL (current_menu)));
-
-	/* Compute what the new menu height will be once the item is added.
-	 * Always leave enough space to fit a "More..." menu, otherwise
-	 * the "More..." menu itself would not fit in the screen.
-	 */
-	new_menu_height = menu_dimensions.height + item_dimensions.height + more_item_height_guess;
-
-	/* If the item does not fit in the screen, create a "More..." submenu
-	 * and put it there.  When Gtk+ 2.0 comes to town it will feature
-	 * scrolling menus when needed and this hack wont be needed no more.
-	 */
-	if (new_menu_height >= available_height) {
-		GtkWidget *more_item;
-		GtkWidget *more_menu;
-
-		more_item = gtk_menu_item_new_with_label (_("More..."));
-		more_menu = gtk_menu_new ();
-
-		gtk_menu_item_set_submenu (GTK_MENU_ITEM (more_item), more_menu);
-		
-		gtk_menu_append (GTK_MENU (font_picker->details->current_menu), more_item);
-		
-		gtk_widget_show (more_item);
-
-		font_picker->details->current_menu = more_menu;
-	}
-
-	gtk_menu_append (GTK_MENU (font_picker->details->current_menu), item);
-
-	/* If the item was added to a "More..." menu, then create a hidden
-	 * duplicate item and add it to the main menu.  This is needed so that
-	 * we dont break the way GtkOptionMenu "history" works.  In order to 
-	 * be able to select menu items that exist in sub "More..." panes, the
-	 * item has to exist in the main menu as well, otherwise the GtkOptionMenu
-	 * refuses to set it as its selected item (which it calls "history")
-	 */
-	if (font_picker->details->current_menu != font_picker->details->menu) {
-		GtkWidget *duplicate_hidden_item;
-
-		duplicate_hidden_item = gtk_menu_item_new_with_label (label);
-		
-		gtk_object_set_data (GTK_OBJECT (duplicate_hidden_item),
-				     FONT_MENU_INDEX_DATA_KEY,
-				     GINT_TO_POINTER (index));
-		gtk_object_set_data (GTK_OBJECT (duplicate_hidden_item),
-				     FONT_MENU_ITEM_DATA_KEY,
-				     (gpointer) font_entry);
-		gtk_object_set_data (GTK_OBJECT (duplicate_hidden_item),
-				     FONT_MENU_STYLE_SUBMENU_DATA_KEY,
-				     style_menu);
-
-		gtk_menu_append (GTK_MENU (font_picker->details->menu), duplicate_hidden_item);
-
-		gtk_widget_hide (duplicate_hidden_item);
-	}
-
-	gtk_widget_show (item);
-
-	return item;
-}
-
-static void
-font_picker_populate (NautilusFontPicker *font_picker)
-{
- 	const GList *font_list;
- 	const GList *node;
-	const FontEntry *font_entry;
-	const FontStyleEntry *style_entry;
-	const GList *style_node;
-	GtkWidget *font_menu_item;
-	GtkWidget *style_menu_item = NULL;
-	GtkWidget *style_menu;
-	guint font_item_count;
-	guint style_item_count;
-	GSList *radio_item_group = NULL;
-
-	g_return_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker));
-
-	font_list = global_font_list_get ();
-	g_assert (font_list != NULL);
-
-	for (node = font_list, font_item_count = 0;
-	     node != NULL;
-	     node = node->next, font_item_count++) {
-		g_assert (node->data != NULL);
-		font_entry = node->data;
-		
-
-		style_menu = gtk_menu_new ();
-		font_menu_item = font_picker_add_item (font_picker,
-						       font_entry->name_for_display,
-						       font_item_count,
-						       font_entry,
-						       style_menu);
-
-		gtk_menu_item_set_submenu (GTK_MENU_ITEM (font_menu_item), style_menu);
-
-		for (style_node = font_entry->style_list, style_item_count = 0;
-		     style_node != NULL;
-		     style_node = style_node->next, style_item_count++) {
-			g_assert (style_node->data != NULL);
-			style_entry = style_node->data;
-
-			radio_item_group = style_menu_item != NULL ? 
-				gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (style_menu_item)) : 
-				NULL;
-			
-			style_menu_item = gtk_radio_menu_item_new_with_label (radio_item_group, style_entry->name);
-
-			gtk_menu_append (GTK_MENU (style_menu), style_menu_item);
-			gtk_widget_show (style_menu_item);
-			gtk_signal_connect (GTK_OBJECT (style_menu_item),
-					    "activate",
-					    GTK_SIGNAL_FUNC (style_menu_item_activate_callback),
-					    font_picker);
-			gtk_signal_connect (GTK_OBJECT (style_menu_item),
-					    "button_release_event",
-					    GTK_SIGNAL_FUNC (style_menu_item_button_release_event),
-					    font_picker);
-			gtk_object_set_data (GTK_OBJECT (style_menu_item),
-					     FONT_STYLE_MENU_ITEM_DATA_KEY,
-					     (gpointer) style_entry);
-			gtk_object_set_data (GTK_OBJECT (style_menu_item),
-					     FONT_MENU_INDEX_DATA_KEY,
-					     GINT_TO_POINTER (style_item_count));
-		}
-	}
-}
-
-static const char *
-font_find_style (const StyleMap *style_map,
-		 guint num_styles,
-		 const char *style)
-{
-	guint i;
-
-	g_return_val_if_fail (style_map != NULL, NULL);
-	g_return_val_if_fail (num_styles > 0, NULL);
-	g_return_val_if_fail (style != NULL, NULL);
-
-	for (i = 0; i < num_styles; i++) {
-		if (nautilus_istr_is_equal (style, style_map[i].name)) {
-			return _(style_map[i].mapped);
-		}
-	}
-
-	return NULL;
-}
-
-static char *
-font_make_name (const char *foundry,
-		const char *family)
-{
-	g_return_val_if_fail (foundry != NULL, NULL);
-	g_return_val_if_fail (family != NULL, NULL);
-
-	return g_strdup_printf ("%s (%s)", family, foundry);
-}
-
-static char *
-font_make_style_name (const char *weight,
-		      const char *slant,
-		      const char *set_width,
-		      const char *char_set)
-{
-	const char *mapped_weight;
-	const char *mapped_slant;
-	const char *mapped_set_width;
-
-	g_return_val_if_fail (weight != NULL, NULL);
-	g_return_val_if_fail (slant != NULL, NULL);
-	g_return_val_if_fail (set_width != NULL, NULL);
-	g_return_val_if_fail (char_set != NULL, NULL);
-
-	mapped_weight = font_find_style (font_weight_map,
-					 NAUTILUS_N_ELEMENTS (font_weight_map),
-					 weight);
-
-	mapped_slant = font_find_style (font_slant_map,
-					NAUTILUS_N_ELEMENTS (font_slant_map),
-					slant);
-
-	mapped_set_width = font_find_style (font_set_width_map,
-					    NAUTILUS_N_ELEMENTS (font_set_width_map),
-					    set_width);
-	
-	if (mapped_weight != NULL) {
-		/* "abnormal" weight */
-		if (mapped_slant == NULL && mapped_set_width == NULL) {
-			return g_strdup (mapped_weight);
-		} else if (mapped_slant != NULL && mapped_set_width != NULL) {
-			return g_strdup_printf ("%s %s %s", mapped_weight, mapped_slant, mapped_set_width);
-		} else if (mapped_slant != NULL) {
-			return g_strdup_printf ("%s %s", mapped_weight, mapped_slant);
-		}
-
-		return g_strdup_printf ("%s %s", mapped_weight, mapped_set_width);
-	} else {
-		/* normal weight */
-		if (mapped_slant == NULL && mapped_set_width == NULL) {
-			return g_strdup (_(normal_style));
-		} else if (mapped_slant != NULL && mapped_set_width != NULL) {
-			return g_strdup_printf ("%s %s", mapped_slant, mapped_set_width);
-		} else if (mapped_slant != NULL) {
-			return g_strdup_printf ("%s", mapped_slant);
-		}
-		
-		return g_strdup_printf ("%s", mapped_set_width);
-	}
-
-	return g_strdup (_(unknown_style));
-}
-
-static FontSlant
-font_slant_string_to_enum (const char *slant)
-{
-	g_return_val_if_fail (slant != NULL, 0);
-
-	if (nautilus_istr_is_equal (slant, "i")) {
-		return FONT_SLANT_ITALIC;
-	}
-
-	if (nautilus_istr_is_equal (slant, "o")) {
-		return FONT_SLANT_OBLIQUE;
-	}
-
-	return FONT_SLANT_NORMAL;
-}
-
-static FontStretch
-font_set_width_string_to_enum (const char *set_width)
-{
-	g_return_val_if_fail (set_width != NULL, 0);
-
-	if (nautilus_istr_is_equal (set_width, "condensed")) {
-		return FONT_STRETCH_CONDENSED;
-	}
-	
-	if (nautilus_istr_is_equal (set_width, "semicondensed")) {
-		return FONT_STRETCH_SEMICONDENSED;
-	}
-
-	return FONT_STRETCH_NORMAL;
-}
-
-static FontStyleEntry *
-font_style_entry_new (const char *font_file_name,
-		      const char *weight,
-		      const char *slant,
-		      const char *set_width,
-		      const char *char_set)
-{
-	FontStyleEntry *style_entry;
-
-	g_return_val_if_fail (font_file_name != NULL, NULL);
-	g_return_val_if_fail (weight != NULL, NULL);
-	g_return_val_if_fail (slant != NULL, NULL);
-	g_return_val_if_fail (set_width != NULL, NULL);
-	g_return_val_if_fail (char_set != NULL, NULL);
-
-	style_entry = g_new0 (FontStyleEntry, 1);
-	style_entry->name = font_make_style_name (weight, slant, set_width, char_set);
-	style_entry->is_bold = nautilus_font_manager_weight_is_bold (weight);
-	style_entry->slant = font_slant_string_to_enum (slant);
-	style_entry->stretch = font_set_width_string_to_enum (set_width);
-	style_entry->font_file_name = g_strdup (font_file_name);
-
-	return style_entry;
-}
-
-static void
-font_style_entry_free (FontStyleEntry *style_entry)
-{
-	if (style_entry == NULL) {
-		return;
-	}
-
-	g_free (style_entry->name);
-	g_free (style_entry->font_file_name);
-	g_free (style_entry);
-}
-
-/* Global font list */
-static void
-global_font_list_free (void)
-{
- 	GList *font_node;
-	FontEntry *font_entry;
- 	GList *style_node;
-	FontStyleEntry *style_entry;
-
-	if (global_font_list == NULL) {
-		return;
-	}
-
-	for (font_node = global_font_list; font_node != NULL; font_node = font_node->next) {
-		g_assert (font_node->data != NULL);
-		font_entry = font_node->data;
-		
-		g_free (font_entry->name);
-		g_free (font_entry->family);
-		g_free (font_entry->name_for_display);
-
-		for (style_node = font_entry->style_list; style_node != NULL; style_node = style_node->next) {
-			g_assert (style_node->data != NULL);
-			style_entry = style_node->data;
-			font_style_entry_free (style_entry);
-		}
-		g_list_free (font_entry->style_list);
-
-		g_free (font_entry);
-	}
-
-	global_font_list = NULL;
-}
-
-static guint
-font_list_count_families (const GList *font_list,
-			  const char *family)
-{
-	guint count = 0;
-	const GList *node;
-	const FontEntry *entry;
-
-	g_return_val_if_fail (font_list != NULL, 0);
-	g_return_val_if_fail (family != NULL, 0);
-	
-	for (node = font_list; node != NULL; node = node->next) {
-		g_assert (node->data != NULL);
-		entry = node->data;
-
-		if (nautilus_istr_is_equal (family, entry->family)) {
-			count++;
-		}
-	}
-
-	return count;
-}
-
-static int
-compare_font_entry (gconstpointer a,
-		    gconstpointer b)
-{
-	const FontEntry *entry_a;
-	const FontEntry *entry_b;
-
-	g_return_val_if_fail (a != NULL, -1);
-	g_return_val_if_fail (b != NULL, -1);
-
-	entry_a = a;
-	entry_b = b;
-
-	return nautilus_strcasecmp_compare_func (entry_a->name_for_display, entry_b->name_for_display);
-}
-
-static const GList *
-global_font_list_get (void)
-{
-	guint family_count = 0;
-	GList *node;
-	FontEntry *entry;
-
-	if (global_font_list != NULL) {
-		return global_font_list;
-	}
-
-	nautilus_font_manager_for_each_font (global_font_list_populate_callback,
-					     &global_font_list);
-	g_assert (global_font_list != NULL);
-
-	for (node = global_font_list; node != NULL; node = node->next) {
-		g_assert (node->data != NULL);
-		entry = node->data;
-
-		g_assert (entry->name_for_display == NULL);
-		
-		family_count = font_list_count_families (global_font_list, entry->family);
-		g_assert (family_count > 0);
-		
-		entry->name_for_display = (family_count > 1) ? g_strdup (entry->name) : g_strdup (entry->family);
-	}
-
-	global_font_list = g_list_sort (global_font_list, compare_font_entry);
-
-	g_atexit (global_font_list_free);
-
-	return global_font_list;
-}
-
-static gboolean
-list_contains_style (GList *styles, FontStyleEntry *style)
-{
-	GList *node;
-	FontStyleEntry *existing_style;
-
-	for (node = styles; node != NULL; node = node->next) {
-		existing_style = node->data;
-		/* If the files are the same, the fonts are the same font */
-		if (strcmp (existing_style->font_file_name, style->font_file_name) == 0) {
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-#define EQUAL 0
-#define LESS_THAN -1
-#define GREATER_THAN 1
-
-static int
-compare_style (gconstpointer a,
-	       gconstpointer b)
-{
-	const FontStyleEntry *style_a;
-	const FontStyleEntry *style_b;
-
-	g_return_val_if_fail (a != NULL, LESS_THAN);
-	g_return_val_if_fail (b != NULL, LESS_THAN);
-
-	style_a = a;
-	style_b = b;
-
-	/* Same weight */
-	if (style_a->is_bold == style_b->is_bold) {
-		/* Same slant */
-		if (style_a->slant == style_b->slant) {
-			return nautilus_compare_integer (GINT_TO_POINTER (style_a->stretch),
-							 GINT_TO_POINTER (style_b->stretch));
-		}
-
-		return nautilus_compare_integer (GINT_TO_POINTER (style_a->slant),
-						 GINT_TO_POINTER (style_b->slant));
-	}
-
-	/* Different weight */
-	return style_b->is_bold ? LESS_THAN : GREATER_THAN;
-}
-
-static gboolean
-global_font_list_populate_callback (const char *font_file_name,
-				    NautilusFontType font_type,
-				    const char *foundry,
-				    const char *family,
-				    const char *weight,
-				    const char *slant,
-				    const char *set_width,
-				    const char *char_set,
-				    gpointer callback_data)
-{
-	GList **font_list;
-	char *entry_name;
-	FontEntry *entry;
-	FontStyleEntry *style_entry;
-
-	g_return_val_if_fail (font_file_name != NULL, FALSE);
-	g_return_val_if_fail (foundry != NULL, FALSE);
-	g_return_val_if_fail (family != NULL, FALSE);
-	g_return_val_if_fail (weight != NULL, FALSE);
-	g_return_val_if_fail (slant != NULL, FALSE);
-	g_return_val_if_fail (set_width != NULL, FALSE);
-	g_return_val_if_fail (char_set != NULL, FALSE);
-	g_return_val_if_fail (callback_data != NULL, FALSE);
-
-	font_list = callback_data;
-
-	entry_name = font_make_name (foundry, family);
-	entry = font_list_find (*font_list, entry_name);
-
-	if (entry == NULL) {
-		entry = g_new0 (FontEntry, 1);
-		entry->name = g_strdup (entry_name);
-		entry->family = g_strdup (family);
-		*font_list = g_list_append (*font_list, entry);
-	}
-	g_assert (entry != NULL);
-	g_assert (font_list_find (*font_list, entry_name) == entry);
-	g_free (entry_name);
-	
-	style_entry = font_style_entry_new (font_file_name,
-					    weight,
-					    slant,
-					    set_width,
-					    char_set);
-	
-	if (list_contains_style (entry->style_list, style_entry)) {
-		font_style_entry_free (style_entry);
-	} else {
-		entry->style_list = g_list_insert_sorted (entry->style_list,
-							  style_entry,
-							  compare_style);
-	}
-
-	return TRUE;
-}
-
-static guint
-nautilus_gtk_menu_shell_get_num_items (const GtkMenuShell *menu_shell)
-{
-	g_return_val_if_fail (GTK_IS_MENU_SHELL (menu_shell), 0);
-
-	return g_list_length (menu_shell->children);
-}
-
-static const FontStyleEntry *
-font_picker_get_selected_style_entry (const NautilusFontPicker *font_picker)
-{
-	GtkWidget *selected_font_menu_item;
-	GtkMenu *style_submenu;
-	GtkWidget *selected_style_menu_item;
-	
-	g_return_val_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker), NULL);
-
-	selected_font_menu_item = GTK_OPTION_MENU (font_picker->details->option_menu)->menu_item;
-	
-	g_return_val_if_fail (GTK_IS_MENU_ITEM (selected_font_menu_item), NULL);
-	
-	style_submenu = gtk_object_get_data (GTK_OBJECT (selected_font_menu_item),
-					     FONT_MENU_STYLE_SUBMENU_DATA_KEY);
-	
-	g_return_val_if_fail (GTK_IS_MENU (style_submenu), NULL);
-	
-	selected_style_menu_item = gtk_menu_get_active (style_submenu);
-	g_return_val_if_fail (GTK_IS_MENU_ITEM (selected_style_menu_item), NULL);
-	
-	return gtk_object_get_data (GTK_OBJECT (selected_style_menu_item),
-				    FONT_STYLE_MENU_ITEM_DATA_KEY);
-}
-
-static gboolean
-font_picker_find_entries_for_font (const char *font_file_name,
-				   const FontEntry **entry,
-				   const FontStyleEntry **style_entry)
-{
-	const GList *font_list;
-	const GList *font_list_node;
-	const GList *style_list_node;
-
-	g_return_val_if_fail (font_file_name != NULL, FALSE);
-	g_return_val_if_fail (entry != NULL, FALSE);
-	g_return_val_if_fail (style_entry != NULL, FALSE);
-	
-	font_list = global_font_list_get ();
-	g_return_val_if_fail (font_list != NULL, FALSE);
-
-	font_list_node = font_list;
-	while (font_list_node != NULL) {
-		g_assert (font_list_node->data != NULL);
-		*entry = font_list_node->data;
-		
-		style_list_node = (*entry)->style_list;
-		while (style_list_node != NULL) {
-			g_assert (style_list_node->data != NULL);
-			*style_entry = style_list_node->data;
-			
-			if (nautilus_istr_is_equal ((*style_entry)->font_file_name, font_file_name)) {
-				return TRUE;
-			}
-			style_list_node = style_list_node->next;
-		}
-		
-		font_list_node = font_list_node->next;
-	}
-
-	*entry = NULL;
-	*style_entry = NULL;
-
-	return FALSE;
-}
-
-static int
-font_picker_get_index_for_entry (const NautilusFontPicker *font_picker,
-				 const FontEntry *entry)
-{
-	GList *font_menu_node;
- 	GtkWidget *font_menu_item;
-	int i;
-
-	g_return_val_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker), -1);
-	g_return_val_if_fail (entry != NULL, -1);
-
-	for (font_menu_node = GTK_MENU_SHELL (font_picker->details->menu)->children, i = 0;
-	     font_menu_node != NULL;
-	     font_menu_node = font_menu_node->next, i++) {
-		g_return_val_if_fail (GTK_IS_MENU_ITEM (font_menu_node->data), -1);
-		font_menu_item = font_menu_node->data;
-
-		if (entry == gtk_object_get_data (GTK_OBJECT (font_menu_item), FONT_MENU_ITEM_DATA_KEY)) {
-			return i;
-		}
-	}
-
-	return -1;
-}
-
-/* NautilusFontPicker public methods */
-GtkWidget *
-nautilus_font_picker_new (void)
-{
-	return gtk_widget_new (nautilus_font_picker_get_type (), NULL);
-}
-
-char *
-nautilus_font_picker_get_selected_font (const NautilusFontPicker *font_picker)
-{
-	g_return_val_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker), NULL);
-
-	return g_strdup (font_picker->details->selected_font);
-}
-
-void
-nautilus_font_picker_set_selected_font (NautilusFontPicker *font_picker,
-					const char *font_name)
-{
-	int font_item_index;
-	const FontEntry *entry;
-	const FontStyleEntry *style_entry;
-
-	g_return_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker));
-
-	if (!font_picker_find_entries_for_font (font_name, &entry, &style_entry)) {
-		g_warning ("Trying to select a non existant font '%s'.", font_name);
-		return;
-	}
-	
-	g_assert (entry != NULL && style_entry != NULL);
-	g_assert (nautilus_istr_is_equal (style_entry->font_file_name, font_name));
-
-	font_item_index = font_picker_get_index_for_entry (font_picker, entry);
-
-	g_return_if_fail (font_item_index != -1);
-
-	if (!nautilus_istr_is_equal (font_picker->details->selected_font, font_name)) {
-		g_free (font_picker->details->selected_font);
-		font_picker->details->selected_font = g_strdup (font_name);
-	}
-	
-	gtk_option_menu_set_history (GTK_OPTION_MENU (font_picker->details->option_menu),
-				     font_item_index);
-}
diff --git a/libnautilus-extensions/nautilus-font-picker.h b/libnautilus-extensions/nautilus-font-picker.h
deleted file mode 100644
index a396ca184..000000000
--- a/libnautilus-extensions/nautilus-font-picker.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-font-picker.h - A simple widget to select scalable fonts.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_FONT_PICKER_H
-#define NAUTILUS_FONT_PICKER_H
-
-#include <libnautilus-extensions/nautilus-scalable-font.h>
-#include <libnautilus-extensions/nautilus-caption.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_FONT_PICKER            (nautilus_font_picker_get_type ())
-#define NAUTILUS_FONT_PICKER(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_FONT_PICKER, NautilusFontPicker))
-#define NAUTILUS_FONT_PICKER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_FONT_PICKER, NautilusFontPickerClass))
-#define NAUTILUS_IS_FONT_PICKER(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_FONT_PICKER))
-
-typedef struct NautilusFontPicker	     NautilusFontPicker;
-typedef struct NautilusFontPickerClass	     NautilusFontPickerClass;
-typedef struct NautilusFontPickerDetails     NautilusFontPickerDetails;
-
-struct NautilusFontPicker
-{
-	/* Super Class */
-	NautilusCaption caption;
-	
-	/* Private stuff */
-	NautilusFontPickerDetails *details;
-};
-
-struct NautilusFontPickerClass
-{
-	NautilusCaptionClass parent_class;
-};
-
-GtkType    nautilus_font_picker_get_type                    (void);
-GtkWidget* nautilus_font_picker_new                         (void);
-char *     nautilus_font_picker_get_selected_font           (const NautilusFontPicker *font_picker);
-void       nautilus_font_picker_set_selected_font           (NautilusFontPicker       *font_picker,
-							     const char               *font);
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_FONT_PICKER_H */
-
-
diff --git a/libnautilus-extensions/nautilus-gconf-extensions.c b/libnautilus-extensions/nautilus-gconf-extensions.c
index 65ec1845d..f9931cda6 100644
--- a/libnautilus-extensions/nautilus-gconf-extensions.c
+++ b/libnautilus-extensions/nautilus-gconf-extensions.c
@@ -25,9 +25,9 @@
 #include <config.h>
 #include "nautilus-gconf-extensions.h"
 
-#include "nautilus-glib-extensions.h"
-#include "nautilus-stock-dialogs.h"
-#include "nautilus-string.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 
 #include <gconf/gconf-client.h>
 #include <gconf/gconf.h>
@@ -87,7 +87,7 @@ nautilus_gconf_handle_error (GError **error)
 						     "All further errors shown "
 						     "only on terminal"),
 						   (*error)->message);
-			nautilus_show_error_dialog (message, _("GConf Error"), NULL);
+			eel_show_error_dialog (message, _("GConf Error"), NULL);
 			g_free (message);
 		}
 		g_error_free (*error);
@@ -223,7 +223,7 @@ nautilus_gconf_set_string_list (const char *key,
 	client = nautilus_gconf_client_get_global ();
 	g_return_if_fail (client != NULL);
 
-	slist = nautilus_g_slist_from_g_list (string_list_value);
+	slist = eel_g_slist_from_g_list (string_list_value);
 
 	error = NULL;
 	gconf_client_set_list (client, key, GCONF_VALUE_STRING, slist, &error);
@@ -251,7 +251,7 @@ nautilus_gconf_get_string_list (const char *key)
 		slist = NULL;
 	}
 
-	result = nautilus_g_list_from_g_slist (slist);
+	result = eel_g_list_from_g_slist (slist);
 	g_slist_free (slist);
 	
 	return result;
@@ -363,7 +363,7 @@ nautilus_gconf_value_is_equal (const GConfValue *a,
 
 	switch (a->type) {
 	case GCONF_VALUE_STRING:
-		return nautilus_str_is_equal (a->d.string_data, b->d.string_data);
+		return eel_str_is_equal (a->d.string_data, b->d.string_data);
 		break;
 
 	case GCONF_VALUE_INT:
diff --git a/libnautilus-extensions/nautilus-gdk-extensions.c b/libnautilus-extensions/nautilus-gdk-extensions.c
deleted file mode 100644
index 85890cc25..000000000
--- a/libnautilus-extensions/nautilus-gdk-extensions.c
+++ /dev/null
@@ -1,951 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gdk-extensions.c: Graphics routines to augment what's in gdk.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>, 
-            Pavel Cisler <pavel@eazel.com>,
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <stdlib.h>
-
-#include <config.h>
-#include "nautilus-gdk-extensions.h"
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdkx.h>
-#include <gdk/gdkprivate.h>
-#include "nautilus-glib-extensions.h"
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-string.h"
-
-#define GRADIENT_BAND_SIZE 4
-
-/**
- * nautilus_fill_rectangle:
- * @drawable: Target to draw into.
- * @gc: Graphics context (mainly for clip).
- * @rectangle: Rectangle to fill.
- *
- * Fill the rectangle with the foreground color.
- * Convenient when you have a GdkRectangle structure.
- */
-void
-nautilus_fill_rectangle (GdkDrawable *drawable,
-			 GdkGC *gc,
-			 const GdkRectangle *rectangle)
-{
-	gdk_draw_rectangle (drawable, gc, TRUE,
-			    rectangle->x, rectangle->y,
-			    rectangle->width, rectangle->height);
-}
-
-/**
- * nautilus_fill_rectangle_with_color:
- * @drawable: Target to draw into.
- * @gc: Graphics context (mainly for clip).
- * @rectangle: Rectangle to fill.
- * @color: Color to fill with.
- *
- * Fill the rectangle with a color.
- * Convenient when you have a GdkRectangle structure.
- */
-void
-nautilus_fill_rectangle_with_color (GdkDrawable *drawable,
-				    GdkGC *gc,
-				    const GdkRectangle *rectangle,
-				    guint32 rgb)
-{
-	GdkGCValues saved_values;
-	
-	/* FIXME bugzilla.eazel.com 1287: Workaround for a bug in gdk_rgb. */
-	gdk_rgb_init ();
-	
-	gdk_gc_get_values (gc, &saved_values);
-	gdk_rgb_gc_set_foreground (gc, rgb);
-	nautilus_fill_rectangle (drawable, gc, rectangle);
-	gdk_gc_set_foreground (gc, &saved_values.foreground);
-}
-
-/**
- * nautilus_rectangle_contains:
- * @rectangle: Rectangle possibly containing a point.
- * @x: X coordinate of a point.
- * @y: Y coordinate of a point.
- *
- * Retun TRUE if point is contained inside a rectangle
- */
-gboolean
-nautilus_rectangle_contains (const GdkRectangle *rectangle, 
-			     int x, 
-			     int y)
-{
-	g_return_val_if_fail (rectangle != NULL, FALSE);
-	return rectangle->x <= x && rectangle->x + rectangle->width >= x
-		&& rectangle->y <= y && rectangle->y + rectangle->height >= y;
-}
-
-/**
- * nautilus_rectangle_inset:
- * @rectangle: Rectangle we are insetting.
- * @x: Horizontal ammount to inset by.
- * @y: Vertical ammount to inset by.
- *
- * Inset a rectangle by a given horizontal and vertical ammount.
- * Pass in negative inset values to grow the rectangle, positive to
- * shrink it.
- */
-void
-nautilus_rectangle_inset (GdkRectangle *rectangle, 
-			  int x, 
-			  int y)
-{
-	g_return_if_fail (rectangle != NULL);
-
-	rectangle->x += x;
-	rectangle->width -= 2 * x;
-	rectangle->y += y;
-	rectangle->height -= 2 * y;
-}
-
-/**
- * nautilus_interpolate_color:
- * @ratio: Place on line between colors to interpolate.
- * @start_color: Color for one end.
- * @end_color: Color for the other end
- * @interpolated_color: Result.
- *
- * Compute a color between @start_color and @end_color in color space.
- * Currently, the color space used is RGB, but a future version could
- * instead do the interpolation in the best color space for expressing
- * human perception.
- */
-guint32
-nautilus_interpolate_color (gdouble ratio,
-			    guint32 start_rgb,
-			    guint32 end_rgb)
-{
-	guchar red, green, blue;
-
-	g_return_val_if_fail (ratio >= 0.0, 0);
-	g_return_val_if_fail (ratio <= 1.0, 0);
-
-	red = ((start_rgb >> 16) & 0xFF) * (1.0 - ratio) + ((end_rgb >> 16) & 0xFF) * ratio;
-	green = ((start_rgb >> 8) & 0xFF) * (1.0 - ratio) + ((end_rgb >> 8) & 0xFF) * ratio;
-	blue = (start_rgb & 0xFF) * (1.0 - ratio) + (end_rgb & 0xFF) * ratio;
-	return (((red << 8) | green) << 8) | blue;
-}
-
-/**
- * nautilus_gradient_new
- * @start_color: Color for the top or left.
- * @end_color: Color for the bottom or right.
- * @is_horizontal: Direction of the gradient.
- *
- * Create a string that combines the start and end colors along
- * with the direction of the gradient in a standard format.
- */
-char *
-nautilus_gradient_new (const char *start_color,
-		       const char *end_color,
-		       gboolean is_horizontal)
-{
-	g_return_val_if_fail (is_horizontal == FALSE || is_horizontal == TRUE, NULL);
-
-	/* Handle the special case where the start and end colors are identical.
-	   Handle the special case where the end color is an empty string.
-	*/
-	if (nautilus_strcmp(start_color, end_color) == 0 || end_color == NULL || end_color[0] == '\0') {
-		return g_strdup (start_color);
-	}
-
-	/* Handle the special case where the start color is an empty string. */
-	if (start_color == NULL || start_color[0] == '\0') {
-		return g_strdup (end_color);
-	}
-	
-	/* Handle the general case. */
-	return g_strconcat (start_color, "-", end_color, is_horizontal ? ":h" : NULL, NULL);
-}
-
-/**
- * nautilus_gradient_is_gradient
- * @gradient_spec: A gradient spec. string.
- *
- * Return true if the spec. specifies a gradient instead of a solid color.
- */
-gboolean
-nautilus_gradient_is_gradient (const char *gradient_spec)
-{
-	return nautilus_strchr (gradient_spec, '-') != NULL;
-}
-
-/**
- * nautilus_gradient_is_horizontal
- * @gradient_spec: A gradient spec. string.
- *
- * Return true if the spec. specifies a horizontal gradient.
- */
-gboolean
-nautilus_gradient_is_horizontal (const char *gradient_spec)
-{
-	size_t length;
-
-	length = nautilus_strlen (gradient_spec);
-	return length >= 2 && gradient_spec[length - 2] == ':' && gradient_spec[length - 1] == 'h';
-}
-
-static char *
-nautilus_gradient_strip_trailing_direction_if_any (const char *gradient_spec)
-{
-	size_t length;
-
-	length = nautilus_strlen (gradient_spec);
-	if (length >= 2 && gradient_spec[length - 2] == ':'
-	    && (gradient_spec[length - 1] == 'v' || gradient_spec[length - 1] == 'h')) {
-		length -= 2;
-	}
-
-	return g_strndup (gradient_spec, length);
-}
-
-/* For parsing n-point gradients. Successive calls should pass the next_spec value
- * set by the previous call as their first argument - to continue parsing where the
- * previous call left off.
- */
-char *
-nautilus_gradient_parse_one_color_spec (const char *spec, int *percent, const char **next_spec)
-{
-	char *result;
-	const char *rgb_end_ptr;
-	const char *percent_ptr;
-	const char *separator_ptr;
-	
-	percent_ptr   = nautilus_strchr (spec, '%');
-	separator_ptr = nautilus_strchr (spec, '-');
-
-	if (percent_ptr != NULL && (separator_ptr == NULL || percent_ptr < separator_ptr)) {
-		if (percent != NULL) {
-			*percent = (int) strtol (percent_ptr + 1, NULL, 10);
-		}
-		rgb_end_ptr = percent_ptr;
-	} else {
-		if (percent != NULL) {
-			*percent = 100;
-		}
-		rgb_end_ptr = separator_ptr;
-	}
-		
-	if (rgb_end_ptr != NULL) {
-		result = g_strndup (spec, rgb_end_ptr - spec);
-	} else {
-		result = nautilus_gradient_strip_trailing_direction_if_any (spec);
-	}
-
-	/* It's important not to use spec after setting *next_spec because it's
-	 * likely that *next_spec == spec. 
-	 */
-	if (next_spec != NULL) {
-		*next_spec = (separator_ptr != NULL) ? separator_ptr + 1 : NULL;
-	}
-
-	return result;
-}
-
-/* FIXME bugzilla.eazel.com 5076:
- * anyone using nautilus_gradient_get_start_color_spec or
- * nautilus_gradient_get_end_color_spec is assuming the gradient
- * is 2 colors which is questionable.
- * 
- * Callers should be rewritten and these fns eliminated.
- */
- 
-/**
- * nautilus_gradient_get_start_color_spec
- * @gradient_spec: A gradient spec. string.
- *
- * Return the start color.
- * This may be the entire gradient_spec if it's a solid color.
- */
-char *
-nautilus_gradient_get_start_color_spec (const char *gradient_spec)
-{
-	return nautilus_gradient_parse_one_color_spec (gradient_spec, NULL, NULL);
-}
-
-/**
- * nautilus_gradient_get_end_color_spec
- * @gradient_spec: A gradient spec. string.
- *
- * Return the end color.
- * This may be the entire gradient_spec if it's a solid color.
- */
-char *
-nautilus_gradient_get_end_color_spec (const char *gradient_spec)
-{
-	char* color = NULL;
-
-	do {
-		g_free (color);
-		color = nautilus_gradient_parse_one_color_spec (gradient_spec, NULL, &gradient_spec);
-	} while (gradient_spec != NULL);
-
-	return color;
-}
-
-/* Do the work shared by all the set_color_spec functions below. */
-static char *
-nautilus_gradient_set_edge_color (const char *gradient_spec,
-				  const char *edge_color,
-				  gboolean is_horizontal,
-				  gboolean change_end)
-{
-	char *opposite_color;
-	char *result;
-
-	g_return_val_if_fail (edge_color != NULL, g_strdup (gradient_spec));
-
-	/* Get the color from the existing gradient spec. for the opposite
-	   edge. This will parse away all the stuff we don't want from the
-	   old gradient spec.
-	*/
-	opposite_color = change_end
-		? nautilus_gradient_get_start_color_spec (gradient_spec)
-		: nautilus_gradient_get_end_color_spec (gradient_spec);
-
-	/* Create a new gradient spec. The nautilus_gradient_new function handles
-	   some special cases, so we don't have to bother with them here.
-	*/
-	result = nautilus_gradient_new (change_end ? opposite_color : edge_color,
-					change_end ? edge_color : opposite_color,
-					is_horizontal);
-
-	g_free (opposite_color);
-
-	return result;
-}
-
-/**
- * nautilus_gradient_set_left_color_spec
- * @gradient_spec: A gradient spec. string.
- * @left_color: Color spec. to replace left color with.
- *
- * Changes the left color to what's passed in.
- * This creates a horizontal gradient.
- */
-char *
-nautilus_gradient_set_left_color_spec (const char *gradient_spec,
-				       const char *left_color)
-{
-	return nautilus_gradient_set_edge_color (gradient_spec, left_color, TRUE, FALSE);
-}
-
-/**
- * nautilus_gradient_set_top_color_spec
- * @gradient_spec: A gradient spec. string.
- * @top_color: Color spec. to replace top color with.
- *
- * Changes the top color to what's passed in.
- * This creates a vertical gradient.
- */
-char *
-nautilus_gradient_set_top_color_spec (const char *gradient_spec,
-				      const char *top_color)
-{
-	return nautilus_gradient_set_edge_color (gradient_spec, top_color, FALSE, FALSE);
-}
-
-/**
- * nautilus_gradient_set_right_color_spec
- * @gradient_spec: A gradient spec. string.
- * @right_color: Color spec. to replace right color with.
- *
- * Changes the right color to what's passed in.
- * This creates a horizontal gradient.
- */
-char *
-nautilus_gradient_set_right_color_spec (const char *gradient_spec,
-					const char *right_color)
-{
-	return nautilus_gradient_set_edge_color (gradient_spec, right_color, TRUE, TRUE);
-}
-
-/**
- * nautilus_gradient_set_bottom_color_spec
- * @gradient_spec: A gradient spec. string.
- * @bottom_color: Color spec. to replace bottom color with.
- *
- * Changes the bottom color to what's passed in.
- * This creates a vertical gradient.
- */
-char *
-nautilus_gradient_set_bottom_color_spec (const char *gradient_spec,
-					 const char *bottom_color)
-{
-	return nautilus_gradient_set_edge_color (gradient_spec, bottom_color, FALSE, TRUE);
-}
-
-/**
- * nautilus_gdk_color_parse_with_white_default
- * @color_spec: A color spec.
- * @color: Pointer to place to put resulting color.
- *
- * The same as gdk_color_parse, except sets the color to white if
- * the spec. can't be parsed instead of returning a boolean flag.
- */
-void
-nautilus_gdk_color_parse_with_white_default (const char *color_spec,
-					     GdkColor *color)
-{
-	if (color_spec == NULL || !gdk_color_parse (color_spec, color)) {
-		color->red = 0xFFFF;
-		color->green = 0xFFFF;
-		color->blue = 0xFFFF;
-	}
-}
-
-/**
- * nautilus_parse_rgb_with_white_default
- * @color_spec: A color spec.
- * Returns: An rgb value.
- *
- * The same as gdk_color_parse, except sets the color to white if
- * the spec. can't be parsed instead of returning a boolean flag
- * and returns a guint32 rgb value instead of a GdkColor.
- */
-guint32
-nautilus_parse_rgb_with_white_default (const char *color_spec)
-{
-	GdkColor color;
-
-	if (color_spec == NULL || !gdk_color_parse (color_spec, &color)) {
-		return NAUTILUS_RGB_COLOR_WHITE;
-	}
-	return ((color.red << 8) & NAUTILUS_RGB_COLOR_RED)
-		| (color.green & NAUTILUS_RGB_COLOR_GREEN)
-		| ((color.blue >> 8) & NAUTILUS_RGB_COLOR_BLUE);
-}
-
-guint32
-nautilus_rgb16_to_rgb (gushort r, gushort g, gushort b)
-{
-	guint32 result;
-
-	result = (0xff0000 | (r & 0xff00));
-	result <<= 8;
-	result |= ((g & 0xff00) | (b >> 8));
-
-	return result;
-}
-
-guint32
-nautilus_rgb8_to_rgb (guchar r, guchar g, guchar b)
-{
-	return nautilus_rgb16_to_rgb (r << 8, g << 8, b << 8);
-}
-
-/**
- * nautilus_gdk_color_to_rgb
- * @color: A GdkColor style color.
- * Returns: An rgb value.
- *
- * Converts from a GdkColor stlye color to a gdk_rgb one.
- * Alpha gets set to fully opaque
- */
-guint32
-nautilus_gdk_color_to_rgb (const GdkColor *color)
-{
-	return nautilus_rgb16_to_rgb (color->red, color->green, color->blue);
-}
-
-/**
- * nautilus_gdk_rgb_to_color
- * @color: a gdk_rgb style value.
- *
- * Converts from a gdk_rgb value style to a GdkColor one.
- * The gdk_rgb color alpha channel is ignored.
- * 
- * Return value: a newly allocated GdkColor.
- */
-GdkColor *
-nautilus_gdk_rgb_to_color (const guint32 color)
-{
-	GdkColor *result;
-	
-	result = g_new0 (GdkColor, 1);
-	 
-	result->red = (color & 0xff0000) >> 16 ;
-	result->green = (color & 0xff00);
-	result->blue = color << 8;
-
-	return result;
-}
-
-/**
- * nautilus_gdk_rgb_to_color_spec
- * @color: a gdk_rgb style value.
- *
- * Converts from a gdk_rgb value style to a string color spec.
- * The gdk_rgb color alpha channel is ignored.
- * 
- * Return value: a newly allocated color spec.
- */
-char *
-nautilus_gdk_rgb_to_color_spec (const guint32 color)
-{
-	return g_strdup_printf("rgb:%04hX/%04hX/%04hX",
-			       NAUTILUS_RGBA_COLOR_GET_R (color) * 65535,
-			       NAUTILUS_RGBA_COLOR_GET_G (color) * 65535,
-			       NAUTILUS_RGBA_COLOR_GET_B (color) * 65535);
-}
-
-static guint32
-nautilus_shift_color_component (guchar component, float shift_by)
-{
-	guint32 result;
-	if (shift_by > 1.0) {
-		result = component * (2 - shift_by);
-	} else {
-		result = 0xff - shift_by * (0xff - component);
-	}
-
-	return result & 0xff;
-}
-
-/**
- * nautilus_rgb_shift_color
- * @color: A color.
- * @shift_by: darken or lighten factor.
- * Returns: An darkened or lightened rgb value.
- *
- * Darkens (@shift_by > 1) or lightens (@shift_by < 1)
- * @color.
- */
-guint32
-nautilus_rgb_shift_color (guint32 color, float shift_by)
-{
-	guint32 result;
-
-	/* shift red by shift_by */
-	result = nautilus_shift_color_component((color & 0x00ff0000) >> 16, shift_by);
-	result <<= 8;
-	/* shift green by shift_by */
-	result |=  nautilus_shift_color_component((color & 0x0000ff00) >> 8, shift_by);
-	result <<= 8;
-	/* shift blue by shift_by */
-	result |=  nautilus_shift_color_component((color & 0x000000ff), shift_by);
-
-	/* alpha doesn't change */
-	result |= (0xff000000 & color);
-
-	return result;
-}
-
-/**
- * nautilus_gdk_color_is_dark:
- * 
- * Return true if the given color is `dark'
- */
-gboolean
-nautilus_gdk_color_is_dark (GdkColor *color)
-{
-	int intensity;
-
-	intensity = (((color->red >> 8) * 77)
-		     + ((color->green >> 8) * 150)
-		     + ((color->blue >> 8) * 28)) >> 8;
-
-	return intensity < 128;
-}
-
-/**
- * nautilus_gdk_choose_foreground_color:
- *
- * Select a foreground color given that BACKGROUND is the background
- * color. If the PREFERRED color has a high enough contrast with
- * BACKGROUND, use it, else use one of black or white, depending on
- * the darkness of BACKGROUND.
- *
- * The selected color is stored in PREFERRED.
- */
-void
-nautilus_gdk_choose_foreground_color (GdkColor *preferred,
-				      GdkColor *background)
-{
-	gboolean preferred_is_dark, background_is_dark;
-
-	preferred_is_dark = nautilus_gdk_color_is_dark (preferred);
-	background_is_dark = nautilus_gdk_color_is_dark (background);
-
-	if (preferred_is_dark == background_is_dark) {
-		/* Colors are too similar, so choose a different fg.
-		 * Currently hardcoded to use either white or black.
-		 */
-		if (preferred_is_dark) {
-			preferred->red = 65535;
-			preferred->green = 65535;
-			preferred->blue = 65535;
-		} else {
-			preferred->red = 0;
-			preferred->green = 0;
-			preferred->blue = 0;
-		}
-	}
-}
-
-/**
- * nautilus_gdk_gc_choose_foreground_color:
- *
- * Use nautilus_gdk_color_choose_foreground_color () to set the
- * foreground color of GC to something suitable, given that BACKGROUND
- * will be the background color and PREFERRED is the preferred color.
- *
- * Uses GdkRGB to install the color value.
- */
-void
-nautilus_gdk_gc_choose_foreground_color (GdkGC *gc,
-					 GdkColor *preferred,
-					 GdkColor *background)
-{
-	GdkColor temp;
-	guint32 rgb;
-
-	temp = *preferred;
-	nautilus_gdk_choose_foreground_color (&temp, background);
-	rgb = nautilus_gdk_color_to_rgb (&temp);
-
-	gdk_rgb_init ();
-	gdk_rgb_gc_set_foreground (gc, rgb);
-}
-
-/**
- * nautilus_stipple_bitmap:
- * 
- * Get pointer to singleton 50% stippled bitmap.
- * This is a global object; do not free.
- */
-GdkBitmap *
-nautilus_stipple_bitmap ()
-{
-	static GdkBitmap *stipple = NULL;
-
-	if (stipple == NULL) {
-		char stipple_bits[] = { 0x02, 0x01 };
-		stipple = gdk_bitmap_create_from_data (NULL, stipple_bits, 2, 2);	
-	}
-
-	return stipple;
-}
-
-/**
- * nautilus_gdk_window_bring_to_front:
- * 
- * Raise window and give it focus.
- */
-void 
-nautilus_gdk_window_bring_to_front (GdkWindow *window)
-{
-	/* This takes care of un-iconifying the window and
-	 * raising it if needed.
-	 */
-	gdk_window_show (window);
-
-	/* If the window was already showing, it would not have
-	 * the focus at this point. Do a little X trickery to
-	 * ensure it is focused.
-	 */
-	nautilus_gdk_window_focus (window, GDK_CURRENT_TIME);
-}
-
-void
-nautilus_gdk_window_focus (GdkWindow *window, guint32 timestamp)
-{
-	gdk_error_trap_push ();
-	XSetInputFocus (GDK_DISPLAY (),
-			GDK_WINDOW_XWINDOW (window),
-			RevertToNone,
-			timestamp);
-	gdk_flush();
-	gdk_error_trap_pop ();
-}
-
-void
-nautilus_gdk_window_set_wm_protocols (GdkWindow *window,
-				      GdkAtom *protocols,
-				      int nprotocols)
-{
-	/* This relies on the identity mapping from GdkAtoms to X Atoms */
-	XSetWMProtocols (GDK_WINDOW_XDISPLAY (window),
-			 GDK_WINDOW_XWINDOW (window),
-			 protocols, nprotocols);
-}
-
-void
-nautilus_set_mini_icon (GdkWindow *window,
-			GdkPixmap *pixmap,
-			GdkBitmap *mask)
-{
-        GdkAtom icon_atom;
-        long data[2];
- 
-        g_return_if_fail (window != NULL);
-        g_return_if_fail (pixmap != NULL);
-
-        data[0] = GDK_WINDOW_XWINDOW (pixmap);
-        if (mask) {
-                data[1] = GDK_WINDOW_XWINDOW (mask);
-        } else {
-                data[1] = 0;
-	}
-
-        icon_atom = gdk_atom_intern ("KWM_WIN_ICON", FALSE);
-        gdk_property_change (window, icon_atom, icon_atom, 
-                             32, GDK_PROP_MODE_REPLACE,
-                             (guchar *) data, 2);
-}
-
-/**
- * nautilus_gdk_window_set_wm_hints_input:
- * 
- * Set the WM_HINTS.input flag to the passed in value
- */
-void
-nautilus_gdk_window_set_wm_hints_input (GdkWindow *window, gboolean status)
-{
-	Display *dpy;
-	Window id;
-	XWMHints *wm_hints;
-
-	g_return_if_fail (window != NULL);
-
-	dpy = GDK_WINDOW_XDISPLAY (window);
-	id = GDK_WINDOW_XWINDOW (window);
-
-	wm_hints = XGetWMHints (dpy, id);
-	if (wm_hints == 0) {
-		wm_hints = XAllocWMHints ();
-	}
-
-	wm_hints->flags |= InputHint;
-	wm_hints->input = status;
-
-	XSetWMHints (dpy, id, wm_hints);
-	XFree (wm_hints);
-}
-
-void
-nautilus_gdk_window_set_invisible_cursor (GdkWindow *window)
-{
-	XColor foreColor, backColor;
-	GdkWindowPrivate *window_private;
-	Pixmap sourcePixmap, maskPixmap;
-	Cursor xcursor;
-
-	char invisible_cursor_bits[]      = {0x0};
-	char invisible_cursor_mask_bits[] = {0x0};
-
-	foreColor.pixel = 0L;
-	foreColor.red = foreColor.green = foreColor.blue = 0;
-	foreColor.flags = DoRed | DoGreen | DoBlue;
-
-	backColor.pixel = 255L;
-	backColor.red = backColor.green = backColor.blue = 65535;
-	backColor.flags = DoRed | DoGreen | DoBlue;
-
-	window_private = (GdkWindowPrivate *) window;
-  
-	sourcePixmap = XCreateBitmapFromData (window_private->xdisplay, window_private->xwindow,
-					            		  invisible_cursor_bits, 1, 1);
-	g_assert (sourcePixmap != 0);
-
-	maskPixmap = XCreateBitmapFromData (window_private->xdisplay, window_private->xwindow,
-					          			invisible_cursor_mask_bits, 1, 1);
-	g_assert (maskPixmap != 0);
-
-	xcursor = XCreatePixmapCursor (window_private->xdisplay, sourcePixmap, maskPixmap,
-					      		   &foreColor, &backColor, 0, 0);
-
-	XFreePixmap (window_private->xdisplay, sourcePixmap);
-	XFreePixmap (window_private->xdisplay, maskPixmap);
-
-	XDefineCursor (window_private->xdisplay, window_private->xwindow, xcursor);
-}
-
-NautilusGdkGeometryFlags
-nautilus_gdk_parse_geometry (const char *string, int *x_return, int *y_return,
-			     guint *width_return, guint *height_return)
-{
-	int x11_flags;
-	NautilusGdkGeometryFlags gdk_flags;
-
-	g_return_val_if_fail (string != NULL, NAUTILUS_GDK_NO_VALUE);
-	g_return_val_if_fail (x_return != NULL, NAUTILUS_GDK_NO_VALUE);
-	g_return_val_if_fail (y_return != NULL, NAUTILUS_GDK_NO_VALUE);
-	g_return_val_if_fail (width_return != NULL, NAUTILUS_GDK_NO_VALUE);
-	g_return_val_if_fail (height_return != NULL, NAUTILUS_GDK_NO_VALUE);
-
-	x11_flags = XParseGeometry (string, x_return, y_return,
-				    width_return, height_return);
-
-	gdk_flags = NAUTILUS_GDK_NO_VALUE;
-	if (x11_flags & XValue) {
-		gdk_flags |= NAUTILUS_GDK_X_VALUE;
-	}
-	if (x11_flags & YValue) {
-		gdk_flags |= NAUTILUS_GDK_Y_VALUE;
-	}
-	if (x11_flags & WidthValue) {
-		gdk_flags |= NAUTILUS_GDK_WIDTH_VALUE;
-	}
-	if (x11_flags & HeightValue) {
-		gdk_flags |= NAUTILUS_GDK_HEIGHT_VALUE;
-	}
-	if (x11_flags & XNegative) {
-		gdk_flags |= NAUTILUS_GDK_X_NEGATIVE;
-	}
-	if (x11_flags & YNegative) {
-		gdk_flags |= NAUTILUS_GDK_Y_NEGATIVE;
-	}
-
-	return gdk_flags;
-}
-
-#if ! defined (NAUTILUS_OMIT_SELF_CHECK)
-
-static char *
-nautilus_gdk_color_as_hex_string (GdkColor color)
-{
-	return g_strdup_printf("rgb:%04hX/%04hX/%04hX",
-			       color.red, color.green, color.blue);
-}
-
-static char *
-nautilus_self_check_parse (const char *color_spec)
-{
-	GdkColor color;
-
-	nautilus_gdk_color_parse_with_white_default (color_spec, &color);
-	return nautilus_gdk_color_as_hex_string (color);
-}
-
-void
-nautilus_self_check_gdk_extensions (void)
-{
-	/* nautilus_interpolate_color */
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_interpolate_color (0.0, 0, 0), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_interpolate_color (0.0, 0, 0xFFFFFF), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_interpolate_color (0.5, 0, 0xFFFFFF), 0x7F7F7F);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_interpolate_color (1.0, 0, 0xFFFFFF), 0xFFFFFF);
-
-	/* nautilus_fill_rectangle */
-	/* Make a GdkImage and fill it, maybe? */
-
-	/* nautilus_fill_rectangle_with_color */
-
-	/* nautilus_fill_rectangle_with_gradient */
-
-	/* nautilus_gradient_new */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_new ("", "", FALSE), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_new ("a", "b", FALSE), "a-b");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_new ("a", "b", TRUE), "a-b:h");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_new ("a", "a", FALSE), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_new ("a", "a", TRUE), "a");
-
-	/* nautilus_gradient_is_gradient */
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_gradient_is_gradient (""), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_gradient_is_gradient ("-"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_gradient_is_gradient ("a"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_gradient_is_gradient ("a-b"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_gradient_is_gradient ("a-b:h"), TRUE);
-
-	/* nautilus_gradient_get_start_color_spec */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec (""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("-"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("a-b"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("a-"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("-b"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("a:h"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("a:v"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("a:c"), "a:c");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("a:-b"), "a:");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("a:-b:v"), "a:");
-
-	/* nautilus_gradient_get_end_color_spec */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec (""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("-"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("a-b"), "b");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("a-"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("-b"), "b");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("a:h"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("a:v"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("a:c"), "a:c");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("a:-b"), "b");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("a:-b:v"), "b");
-
-	/* nautilus_gradient_set_left_color_spec */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_left_color_spec ("", ""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_left_color_spec ("", "a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_left_color_spec ("a", ""), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_left_color_spec ("a", "a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_left_color_spec ("a", "b"), "b-a:h");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_left_color_spec ("a-c:v", "b"), "b-c:h");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_left_color_spec ("a-c:v", "c"), "c");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_left_color_spec ("a:-b:v", "d"), "d-b:h");
-
-	/* nautilus_gradient_set_top_color_spec */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_top_color_spec ("", ""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_top_color_spec ("", "a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_top_color_spec ("a", ""), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_top_color_spec ("a", "a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_top_color_spec ("a", "b"), "b-a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_top_color_spec ("a-c:v", "b"), "b-c");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_top_color_spec ("a-c:v", "c"), "c");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_top_color_spec ("a:-b:h", "d"), "d-b");
-
-	/* nautilus_gradient_set_right_color_spec */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_right_color_spec ("", ""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_right_color_spec ("", "a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_right_color_spec ("a", ""), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_right_color_spec ("a", "a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_right_color_spec ("a", "b"), "a-b:h");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_right_color_spec ("a-c:v", "b"), "a-b:h");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_right_color_spec ("a-c:v", "c"), "a-c:h");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_right_color_spec ("a:-b:v", "d"), "a:-d:h");
-
-	/* nautilus_gradient_set_bottom_color_spec */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_bottom_color_spec ("", ""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_bottom_color_spec ("", "a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_bottom_color_spec ("a", ""), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_bottom_color_spec ("a", "a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_bottom_color_spec ("a", "b"), "a-b");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_bottom_color_spec ("a-c:v", "b"), "a-b");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_bottom_color_spec ("a-c:v", "c"), "a-c");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_bottom_color_spec ("a:-b:h", "d"), "a:-d");
-
-	/* nautilus_gdk_color_parse_with_white_default */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_parse (""), "rgb:FFFF/FFFF/FFFF");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_parse ("a"), "rgb:FFFF/FFFF/FFFF");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_parse ("white"), "rgb:FFFF/FFFF/FFFF");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_parse ("black"), "rgb:0000/0000/0000");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_parse ("rgb:0123/4567/89AB"), "rgb:0123/4567/89AB");
-}
-
-#endif /* ! NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-gdk-extensions.h b/libnautilus-extensions/nautilus-gdk-extensions.h
deleted file mode 100644
index 8dbd717ac..000000000
--- a/libnautilus-extensions/nautilus-gdk-extensions.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gdk-extensions.h: Graphics routines to augment what's in gdk.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>,
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_GDK_EXTENSIONS_H
-#define NAUTILUS_GDK_EXTENSIONS_H
-
-#include <gdk/gdktypes.h>
-
-#define NAUTILUS_RGB_COLOR_RED		0xFF0000
-#define NAUTILUS_RGB_COLOR_GREEN	0x00FF00
-#define NAUTILUS_RGB_COLOR_BLUE		0x0000FF
-#define NAUTILUS_RGB_COLOR_WHITE	0xFFFFFF
-#define NAUTILUS_RGB_COLOR_BLACK	0x000000
-
-#define NAUTILUS_RGBA_COLOR_OPAQUE_RED		0xFFFF0000
-#define NAUTILUS_RGBA_COLOR_OPAQUE_GREEN	0xFF00FF00
-#define NAUTILUS_RGBA_COLOR_OPAQUE_BLUE		0xFF0000FF
-#define NAUTILUS_RGBA_COLOR_OPAQUE_WHITE	0xFFFFFFFF
-#define NAUTILUS_RGBA_COLOR_OPAQUE_BLACK	0xFF000000
-
-/* Pack RGBA values into a 32 bits */
-#define NAUTILUS_RGBA_COLOR_PACK(r, g, b, a)	\
-( ((a) << 24) |					\
-  ((r) << 16) |					\
-  ((g) <<  8) |					\
-  ((b) <<  0) )
-
-/* Access the individual RGBA components */
-#define NAUTILUS_RGBA_COLOR_GET_R(color) (((color) >> 16) & 0xff)
-#define NAUTILUS_RGBA_COLOR_GET_G(color) (((color) >> 8) & 0xff)
-#define NAUTILUS_RGBA_COLOR_GET_B(color) (((color) >> 0) & 0xff)
-#define NAUTILUS_RGBA_COLOR_GET_A(color) (((color) >> 24) & 0xff)
-
-/* Bits returned by nautilus_gdk_parse_geometry */
-typedef enum {
-	NAUTILUS_GDK_NO_VALUE     = 0x00,
-	NAUTILUS_GDK_X_VALUE      = 0x01,
-	NAUTILUS_GDK_Y_VALUE      = 0x02,
-	NAUTILUS_GDK_WIDTH_VALUE  = 0x04,
-	NAUTILUS_GDK_HEIGHT_VALUE = 0x08,
-	NAUTILUS_GDK_ALL_VALUES   = 0x0f,
-	NAUTILUS_GDK_X_NEGATIVE   = 0x10,
-	NAUTILUS_GDK_Y_NEGATIVE   = 0x20,
-} NautilusGdkGeometryFlags;
-
-/* A gradient spec. is a string that contains a specifier for either a
-   color or a gradient. If the string has a "-" in it, then it's a gradient.
-   The gradient is vertical by default and the spec. can end with ":v" to indicate that.
-   If the gradient ends with ":h", the gradient is horizontal.
-*/
-char *                   nautilus_gradient_new                       (const char          *start_color,
-								      const char          *end_color,
-								      gboolean             is_horizontal);
-char *                   nautilus_gradient_parse_one_color_spec      (const char          *spec,
-								      int                 *percent,
-								      const char         **next_spec);
-gboolean                 nautilus_gradient_is_gradient               (const char          *gradient_spec);
-char *                   nautilus_gradient_get_start_color_spec      (const char          *gradient_spec);
-char *                   nautilus_gradient_get_end_color_spec        (const char          *gradient_spec);
-gboolean                 nautilus_gradient_is_horizontal             (const char          *gradient_spec);
-char *                   nautilus_gradient_set_left_color_spec       (const char          *gradient_spec,
-								      const char          *left_color);
-char *                   nautilus_gradient_set_top_color_spec        (const char          *gradient_spec,
-								      const char          *top_color);
-char *                   nautilus_gradient_set_right_color_spec      (const char          *gradient_spec,
-								      const char          *right_color);
-char *                   nautilus_gradient_set_bottom_color_spec     (const char          *gradient_spec,
-								      const char          *bottom_color);
-
-
-/* A version of parse_color that substitutes a default color instead of returning
-   a boolean to indicate it cannot be parsed.
-*/
-void                     nautilus_gdk_coolor_parse_with_default      (const char          *color_spec,
-								      const GdkColor      *default_color,
-								      GdkColor            *parsed_color);
-void                     nautilus_gdk_color_parse_with_white_default (const char          *color_spec,
-								      GdkColor            *parsed_color);
-guint32                  nautilus_parse_rgb_with_default             (const char          *color_spec,
-								      guint32              default_rgb);
-guint32                  nautilus_parse_rgb_with_white_default       (const char          *color_spec);
-guint32                  nautilus_rgb_shift_color                    (guint32              color,
-								      float                shift_by);
-guint32                  nautilus_rgb16_to_rgb                       (gushort              r,
-								      gushort              g,
-								      gushort              b);
-guint32                  nautilus_rgb8_to_rgb                        (guchar               r,
-								      guchar               g,
-								      guchar               b);
-guint32                  nautilus_gdk_color_to_rgb                   (const GdkColor      *color);
-GdkColor *               nautilus_gdk_rgb_to_color                   (const guint32        color);
-char *                   nautilus_gdk_rgb_to_color_spec              (guint32              color);
-
-/* Fill routines that take GdkRectangle parameters instead of four integers. */
-void                     nautilus_fill_rectangle                     (GdkDrawable         *drawable,
-								      GdkGC               *gc,
-								      const GdkRectangle  *rectangle);
-void                     nautilus_fill_rectangle_with_color          (GdkDrawable         *drawable,
-								      GdkGC               *gc,
-								      const GdkRectangle  *rectangle,
-								      guint32              rgb);
-
-gboolean		nautilus_gdk_color_is_dark		     (GdkColor		  *color);
-void			nautilus_gdk_choose_foreground_color	     (GdkColor		  *preferred,
-								      GdkColor		  *background);
-void			nautilus_gdk_gc_choose_foreground_color	     (GdkGC		  *gc,
-								      GdkColor		  *preferred,
-								      GdkColor		  *background);
-
-/* A routine to get a 50% gray stippled bitmap for use in some types of highlighting. */
-GdkBitmap *              nautilus_stipple_bitmap                     (void);
-
-
-/* Misc GdkRectangle helper functions */
-gboolean                 nautilus_rectangle_contains                 (const GdkRectangle  *rectangle,
-								      int                  x,
-								      int                  y);
-void                     nautilus_rectangle_inset                    (GdkRectangle        *rectangle,
-								      int                  x,
-								      int                  y);
-
-
-/* A basic operation we use for drawing gradients is interpolating two colors.*/
-guint32                  nautilus_interpolate_color                  (gdouble              ratio,
-								      guint32              start_rgb,
-								      guint32              end_rgb);
-
-/* Misc GdkWindow helper functions */
-void                     nautilus_gdk_window_bring_to_front          (GdkWindow           *window);
-void                     nautilus_gdk_window_set_invisible_cursor    (GdkWindow           *window);
-void			 nautilus_gdk_window_focus		     (GdkWindow          *window,
-								      guint32		  timestamp);
-void			 nautilus_gdk_window_set_wm_protocols	     (GdkWindow		 *window,
-								      GdkAtom		 *protocols,
-								      int		  nprotocols);
-
-
-/* In GNOME 2.0 this function will be in the libraries */
-void                     nautilus_set_mini_icon                      (GdkWindow           *window,
-								      GdkPixmap           *pixmap,
-								      GdkBitmap           *mask);
-void                     nautilus_gdk_window_set_wm_hints_input      (GdkWindow           *w,
-								      gboolean             status);
-
-/* Wrapper for XParseGeometry */
-NautilusGdkGeometryFlags nautilus_gdk_parse_geometry                 (const char          *string,
-								      int                 *x_return,
-								      int                 *y_return,
-								      guint               *width_return,
-								      guint               *height_return);
-
-#endif /* NAUTILUS_GDK_EXTENSIONS_H */
diff --git a/libnautilus-extensions/nautilus-gdk-font-extensions.c b/libnautilus-extensions/nautilus-gdk-font-extensions.c
deleted file mode 100644
index 8b1fcfe71..000000000
--- a/libnautilus-extensions/nautilus-gdk-font-extensions.c
+++ /dev/null
@@ -1,1657 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gdk-extensions.c: GdkFont extensions.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>, 
-            Pavel Cisler <pavel@eazel.com>,
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-gdk-font-extensions.h"
-
-#include "nautilus-glib-extensions.h"
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-string-list.h"
-#include "nautilus-string.h"
-
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-
-#include <gdk/gdkprivate.h>
-#include <gdk/gdkx.h>
-
-/* Magic constant copied from GTK+ */
-#define MAX_FONTS 32767
-
-/* These are arbitrary constants to catch insane values */
-#define MIN_NUM_STEPS 1
-#define MAX_NUM_STEPS 40
-
-/* Indeces of some xlfd string entries.  The first entry is 1 */
-#define XLFD_WEIGHT_INDEX			3
-#define XLFD_SLANT_INDEX			4
-#define XLFD_SIZE_IN_PIXELS_INDEX		7
-#define XLFD_SIZE_IN_POINTS_INDEX		8
-#define XLFD_HORIZONTAL_RESOLUTION_INDEX	9
-#define XLFD_VERTICAL_RESOLUTION_INDEX		10
-#define XLFD_MAX_INDEX				14
-
-/* Indicates an invalid xlfd string */
-#define XLFD_INVALID_VALUE			-1
-
-/* Indicates a xlfd wildcard: * */
-#define XLFD_WILDCARD_VALUE			-2
-
-#define ELLIPSIS "..."
-
-/* Font functions that could be public */
-static NautilusStringList *      font_list_fonts                          (const char               *pattern);
-static const NautilusStringList *font_list_fonts_cached                   (const char               *pattern,
-									   GCompareFunc              compare_function);
-static char *                    font_get_name                            (const GdkFont            *font);
-static guint                     font_get_size_in_pixels                  (const GdkFont            *font);
-static GdkFont *                 font_get_bold                            (GdkFont                  *font);
-
-/* XLFD string operations */
-static char *                    xlfd_string_get_nth                      (const char               *xlfd_string,
-									   guint                     n);
-static char *                    xlfd_string_replace_nth                  (const char               *xlfd_string,
-									   guint                     n,
-									   const char               *replace_string);
-static int                       xlfd_string_get_nth_as_int               (const char               *xlfd_string,
-									   guint                     n);
-static gboolean                  xlfd_string_is_scalable_non_bitmap       (const char               *xlfd_string);
-static gboolean                  xlfd_string_could_be_scalable_non_bitmap (const char               *xlfd_string);
-
-/* Test functions for searching font lists */
-static gboolean                  font_entry_has_bold_weight_test          (const NautilusStringList *string_list,
-									   const char               *string,
-									   gpointer                  callback_data);
-static gboolean                  font_entry_has_italic_slant_test         (const NautilusStringList *string_list,
-									   const char               *string,
-									   gpointer                  callback_data);
-static gboolean                  font_entry_is_scalable_non_bitmap_test   (const NautilusStringList *string_list,
-									   const char               *string,
-									   gpointer                  callback_data);
-/* Comparison functions for sorting fonts lists */
-static int                       compare_xlfd_by_size_in_points           (gconstpointer             string_a,
-									   gconstpointer             string_b);
-static int                       compare_xlfd_by_size_in_pixels           (gconstpointer             string_a,
-									   gconstpointer             string_b);
-
-/**
- * nautilus_gdk_font_get_italic
- * @plain_font: A font.
- * Returns: An italic variant of @plain_font or NULL.
- *
- * Tries to find an italic flavor of a given font.  Return the same font
- * if no italic font is found.
- */
-GdkFont *
-nautilus_gdk_font_get_italic (GdkFont *font)
-{
-	char *name;
-	char *slant_pattern;
-	GdkFont *result = NULL;
-	char *pattern_match;
-	const NautilusStringList *font_list;
-
-	/* FIXME bugzilla.eazel.com 7350:
-	 * The issue is that the the italic font matching code here 
-	 * assumes that all fonts are for the same encoding.
-	 * So we might find an italic version of a font, but but it will
-	 * be the in a wrong encoding and thus not appropiate for the current
-	 * locale.  This only happens in multi byte locales, because of the 
-	 * limited number of fonts found in these.
-	 */
-	if (nautilus_dumb_down_for_multi_byte_locale_hack ()) {
-		gdk_font_ref (font);
-		return font;
-	}
-
-	name = font_get_name (font);
-
-	/* Replace the slant with a wildard */
-	slant_pattern = xlfd_string_replace_nth (name, XLFD_SLANT_INDEX, "*");
-
-	if (slant_pattern == NULL) {
-		g_free (name);
-		gdk_font_ref (font);
-		return font;
-	}
-
-	font_list = font_list_fonts_cached (slant_pattern, NULL);
-	
- 	/* Find one with an italic slant */
- 	pattern_match = nautilus_string_list_find_by_function (font_list,
- 							       font_entry_has_italic_slant_test,
- 							       NULL);
-
-	if (pattern_match != NULL) {
-		char *slant_name;
-		char *italic_name;
-
-		/* Find out the italic slant */
-		slant_name = xlfd_string_get_nth (pattern_match, XLFD_SLANT_INDEX);
-		
-		/* Set the italic slant on the original name */
-		italic_name = xlfd_string_replace_nth (name, XLFD_SLANT_INDEX, slant_name);
-		
-		result = gdk_fontset_load (italic_name);
-		if (result == NULL) {
-			gdk_font_ref (font);
-			result = font;
-		}
-
-		g_free (italic_name);
-		g_free (slant_name);
-	} else {
-		/* If no font was found, return the source font */
-		gdk_font_ref (font);
-		result = font;
-	}
-
-	g_free (pattern_match);
-	g_free (slant_pattern);
-	g_free (name);
-
-	return result;
-}
-
-static GHashTable *bold_font_table = NULL;
-
-typedef struct {
-	char *name;
-	GdkFont *bold_font;
-} BoldFontEntry;
-
-static void
-bold_font_table_free_one_node (gpointer key,
-			       gpointer value,
-			       gpointer callback_data)
-{
-	BoldFontEntry *entry;
-
-	g_return_if_fail (key != NULL);
-	g_return_if_fail (value != NULL);
-
-	entry = value;
-	g_free (entry->name);
-	gdk_font_unref (entry->bold_font);
-	g_free (entry);
-}
-
-static void
-bold_font_table_free (void)
-{
-	if (bold_font_table != NULL) {
-		g_hash_table_foreach (bold_font_table, bold_font_table_free_one_node, NULL);
-		g_hash_table_destroy (bold_font_table);
-	}
-
-	bold_font_table = NULL;
-}
-
-/**
- * nautilus_gdk_font_get_bold
- * @plain_font: A font.
- * Returns: A bold variant of @plain_font or NULL.
- *
- * Tries to find a bold flavor of a given font.  Return the same font
- * if no bold font is found.
- */
-GdkFont *
-nautilus_gdk_font_get_bold (GdkFont *font)
-{
-	char *name;
-	BoldFontEntry *entry;
-
-	g_return_val_if_fail (font != NULL, NULL);
-
-	/* FIXME bugzilla.eazel.com 7350:
-	 * The issue is that the the bold font matching code here 
-	 * assumes that all fonts are for the same encoding.
-	 * So we might find a bold version of a font, but but it will
-	 * be the in a wrong encoding and thus not appropiate for the current
-	 * locale.  This only happens in multi byte locales, because of the 
-	 * limited number of fonts found in these.
-	 */
-	if (nautilus_dumb_down_for_multi_byte_locale_hack ()) {
-		gdk_font_ref (font);
-		return font;
-	}
-
-	if (bold_font_table == NULL) {
-		bold_font_table = g_hash_table_new (g_str_hash, g_str_equal);
-		g_atexit (bold_font_table_free);
-	}
-
-	g_assert (bold_font_table != NULL);
-
-	name = font_get_name (font);
-	entry = g_hash_table_lookup (bold_font_table, name);
-
-	if (entry != NULL) {
-		g_assert (entry->bold_font != NULL);
-		gdk_font_ref (entry->bold_font);
-		g_free (name);
-		return entry->bold_font;
-	}
-
-	entry = g_new0 (BoldFontEntry, 1);
-	entry->name = g_strdup (name);
-	entry->bold_font = font_get_bold (font);
-
-	if (entry->bold_font == NULL) {
-		g_free (entry->name);
-		g_free (entry);
-		gdk_font_ref (font);
-		return font;
-	}
-	g_free (name);
-	g_hash_table_insert (bold_font_table, entry->name, entry);
-
-	g_assert (g_hash_table_lookup (bold_font_table, entry->name) == entry);
-
-	gdk_font_ref (entry->bold_font);
-	return entry->bold_font;
-}
-
-/* Return a scalable font matching the given target size */
-static GdkFont *
-font_scalable_get_by_size (const char *xlfd_string,
-			   guint target_size,
-			   guint index)
-{
-	GdkFont *larger_font = NULL;
-	char *larger_size_string;
-	char *larger_font_name;
-	
-	g_return_val_if_fail (xlfd_string != NULL, NULL);
-	g_return_val_if_fail (target_size > 0, NULL);
-	g_return_val_if_fail (index == XLFD_SIZE_IN_POINTS_INDEX || index == XLFD_SIZE_IN_PIXELS_INDEX, NULL);
-
-	larger_size_string = g_strdup_printf ("%d", target_size);
-	
-	larger_font_name = xlfd_string_replace_nth (xlfd_string,
-						    index,
-						    larger_size_string);
-	
-	if (larger_font_name != NULL) {
-		larger_font = gdk_fontset_load (larger_font_name);
-	}
-	
-	g_free (larger_size_string);
-	g_free (larger_font_name);
-	
-	return larger_font;
-}
-
-/* Return a bitmap font matching the given target size as much as possible */
-static GdkFont *
-font_bitmap_get_by_size (const char *xlfd_string,
-			 guint target_size,
-			 guint index,
-			 GCompareFunc compare_function)
-{
-	GdkFont *larger_font = NULL;
- 	char *last_entry;
-	guint max_size;
- 	char *larger_pattern_xlfd = NULL;
-	const NautilusStringList *font_list;
-	
-	g_return_val_if_fail (xlfd_string != NULL, NULL);
-	g_return_val_if_fail (target_size > 0, NULL);
-	g_return_val_if_fail (index == XLFD_SIZE_IN_POINTS_INDEX || index == XLFD_SIZE_IN_PIXELS_INDEX, NULL);
-	g_return_val_if_fail (compare_function != NULL, NULL);
-	
- 	larger_pattern_xlfd = xlfd_string_replace_nth (xlfd_string, index, "*");
-
-	if (larger_pattern_xlfd == NULL) {
-		return NULL;
-	}
-
-	/* Make a query */
-	font_list = font_list_fonts_cached (larger_pattern_xlfd, compare_function);
-
-	last_entry = nautilus_string_list_nth (font_list, nautilus_string_list_get_length (font_list) - 1);
-	max_size = xlfd_string_get_nth_as_int (last_entry, index);
-	g_free (last_entry);
-
-	if (target_size >= max_size) {
-		/* If target font is large, then return the maximum available size */
-		char *larger_font_name;
-		char *size_string;
-		
-		size_string = g_strdup_printf ("%d", max_size);
-		larger_font_name = xlfd_string_replace_nth (xlfd_string, index, size_string);
-		g_free (size_string);
-		larger_font = gdk_fontset_load (larger_font_name);
-		g_free (larger_font_name);
-	} else {
-		/* Look for the closest matching font */
-		guint i = 0;
-		int found_size = 0;
-		char *larger_font_name;
-		char *size_string;
-
-		while ((i < nautilus_string_list_get_length (font_list)) && (found_size == 0)) {
-			char *entry;
-			guint entry_value;
-
-			entry = nautilus_string_list_nth (font_list, i);
-			entry_value = xlfd_string_get_nth_as_int (entry, index);
-
-			if (entry_value >= target_size) {
-				found_size = entry_value;
-			}
-			
-			g_free (entry);
-
-			i++;
-		}
-
-		if (found_size > 0) {
-			size_string = g_strdup_printf ("%d", found_size);
-			larger_font_name = xlfd_string_replace_nth (xlfd_string, index, size_string);
-			g_free (size_string);
-			larger_font = gdk_fontset_load (larger_font_name);
-			g_free (larger_font_name);
-		}
-	}
-	
- 	g_free (larger_pattern_xlfd);
-	
-	return larger_font;
-}
-
-/**
- * nautilus_gdk_font_get_larger
- * @font: A GdkFont.
- * Returns: A GdkFont that is num_steps larger than the given one.
- *          For scalable fonts, the resulting font is always the
- *          requested size.  For bitmap fonts, the result will be
- *          the first font equal or larger than the requested size.
- */
-GdkFont *
-nautilus_gdk_font_get_larger (GdkFont *font,
-			      int num_steps)
-{
-	GdkFont *result = NULL;
-	char *name;
-	int size_in_points;
-	int size_in_pixels;
-	int target_index = -1;
-
-	g_return_val_if_fail (font != NULL, NULL);
-	g_return_val_if_fail (ABS (num_steps) >= MIN_NUM_STEPS, NULL);
-	g_return_val_if_fail (ABS (num_steps) <= MAX_NUM_STEPS, NULL);
-
-	/* FIXME bugzilla.eazel.com 7350:
-	 * The issue is that the the larger font matching code here 
-	 * assumes that all fonts are for the same encoding.
-	 * So we might find a larger version of a font, but but it will
-	 * be the in a wrong encoding and thus not appropiate for the current
-	 * locale.  This only happens in multi byte locales, because of the 
-	 * limited number of fonts found in these.
-	 */
-	if (nautilus_dumb_down_for_multi_byte_locale_hack ()) {
-		gdk_font_ref (font);
-		return font;
-	}
-
-	name = font_get_name (font);
-
-	size_in_points = xlfd_string_get_nth_as_int (name, XLFD_SIZE_IN_POINTS_INDEX);
-	size_in_pixels = xlfd_string_get_nth_as_int (name, XLFD_SIZE_IN_PIXELS_INDEX);
-
-	if (size_in_points <= 0 && size_in_pixels <= 0) {
-		g_free (name);
-		return NULL;
-	}
-
-	/* If for some crazy reason both the "size_in_points" and
-	 * the "size_in_pixels" wildcards are on, then we pick
-	 * only one. */
-
-	/* FIXME bugzilla.eazel.com xxxx:
-	 * Choosing pixels over points here is an arbitrary 
-	 * decision.  Is there a right one ?
-	 */
-	if (size_in_points == XLFD_WILDCARD_VALUE && size_in_pixels == XLFD_WILDCARD_VALUE) {
-		size_in_pixels = 1;
-		size_in_points = 0;
-	}
-
-	/* Figure out the index of the entry we need to bump */
-	if (size_in_points > 0) {
-		target_index = XLFD_SIZE_IN_POINTS_INDEX;
-	} else {
-		target_index = XLFD_SIZE_IN_PIXELS_INDEX;
-	}
-	
-	g_assert (target_index == XLFD_SIZE_IN_POINTS_INDEX
-		  || target_index == XLFD_SIZE_IN_PIXELS_INDEX);
-
-	if (xlfd_string_could_be_scalable_non_bitmap (name)) {
-		/* If the font is scalable then we simply can add or subtract
-		 * points or pixels to get the target font.
-		 */
-		if (target_index == XLFD_SIZE_IN_PIXELS_INDEX) {
-			guint target_size_in_pixels;
-
-			target_size_in_pixels = size_in_pixels + num_steps;
-			
-			result = font_scalable_get_by_size (name, target_size_in_pixels, XLFD_SIZE_IN_PIXELS_INDEX);
-		} else {
-			guint target_size_in_points;
-
-			target_size_in_points = size_in_points + (10 * num_steps);
-
-			result = font_scalable_get_by_size (name, target_size_in_points, XLFD_SIZE_IN_POINTS_INDEX);
-		}
-	} else {
-		/* If the font is not scalable, then we have to make a query
-		 * and find the next available larger font.
-		 */
-		if (target_index == XLFD_SIZE_IN_PIXELS_INDEX) {
-			guint target_size_in_pixels;
-
-			target_size_in_pixels = size_in_pixels + num_steps;
-
-			result = font_bitmap_get_by_size (name,
-							  target_size_in_pixels,
-							  XLFD_SIZE_IN_PIXELS_INDEX,
-							  compare_xlfd_by_size_in_pixels);
-		} else {
-			guint target_size_in_points;
-
-			target_size_in_points = size_in_points + (num_steps * 10);
-			
-			result = font_bitmap_get_by_size (name,
-							  target_size_in_points,
-							  XLFD_SIZE_IN_POINTS_INDEX,
-							  compare_xlfd_by_size_in_points);
-		}
-	}
-
-	g_free (name);
-
-	/* If no font was found, return the source font */
-	if (result == NULL) {
-		gdk_font_ref (font);
-		result = font;
-	}
-
-	g_assert (result != NULL);
-
-	return result;
-}
-
-/**
- * nautilus_gdk_font_get_smaller
- * @font: A GdkFont.
- * Returns: A GdkFont that is num_steps smaller than the given one.
- *          For scalable fonts, the resulting font is always the
- *          requested size.  For bitmap fonts, the result will be
- *          the first font equal or smaller than the requested size.
- */
-GdkFont *
-nautilus_gdk_font_get_smaller (GdkFont *font, int num_steps)
-{
-	g_return_val_if_fail (font != NULL, NULL);
-	g_return_val_if_fail (ABS (num_steps) >= MIN_NUM_STEPS, NULL);
-	g_return_val_if_fail (ABS (num_steps) <= MAX_NUM_STEPS, NULL);
-
-	return nautilus_gdk_font_get_larger (font, -ABS (num_steps));
-}
-
-/**
- * nautilus_gdk_font_equal
- * @font_a_null_allowed: A font or NULL.
- * @font_b_null_allowed: A font or NULL.
- *
- * Calls gdk_font_equal, unless one of the fonts is NULL.
- */
-gboolean
-nautilus_gdk_font_equal (GdkFont *font_a_null_allowed,
-			 GdkFont *font_b_null_allowed)
-{
-	if (font_a_null_allowed == NULL) {
-		return font_b_null_allowed == NULL;
-	}
-	if (font_b_null_allowed == NULL) {
-		return FALSE;
-	}
-	return gdk_font_equal (font_a_null_allowed, font_b_null_allowed);
-}
-
-/**
- * nautilus_gdk_font_get_largest_fitting
- * @font: A GdkFont.
- * @text: Text to use for measurement.
- * @available_width: How much space is available in pixels.
- * @minimum_acceptable_font_size: The minimum acceptable font size in pixels.
- * @maximum_acceptable_font_size: The maximum acceptable font size in pixels.
- *
- * Returns: A GdkFont that when used to render &text, will fit it all in 
- *          &available_width.  The minimum and maximum acceptable dimensions
- *          control the limits on the size of the font.  The font size is
- *          guranteed to be within this range.
- *          The resulting font needs to be freed with gdk_font_unref()
- */
-GdkFont *
-nautilus_gdk_font_get_largest_fitting (GdkFont *font,
-				       const char *text,
-				       int available_width,
-				       int minimum_acceptable_font_size,
-				       int maximum_acceptable_font_size)
-{
-	GdkFont *largest_fitting_font = NULL;
-	NautilusStringList *tokenized_string;
-	char *longest_string;
-	guint longest_string_length;
-
-	g_return_val_if_fail (font != NULL, NULL);
-	g_return_val_if_fail (text != NULL, 0);
-	g_return_val_if_fail (text[0] != '\0', 0);
-	g_return_val_if_fail (available_width > 0, NULL);
-	g_return_val_if_fail (minimum_acceptable_font_size > 0, NULL);
-	g_return_val_if_fail (maximum_acceptable_font_size > 0, NULL);
-	g_return_val_if_fail (maximum_acceptable_font_size > minimum_acceptable_font_size, NULL);
-
-	/* FIXME bugzilla.eazel.com 7350:
-	 * The issue is that the the larger font matching code here 
-	 * assumes that all fonts are for the same encoding.
-	 * So we might find a larger version of a font, but but it will
-	 * be the in a wrong encoding and thus not appropiate for the current
-	 * locale.  This only happens in multi byte locales, because of the 
-	 * limited number of fonts found in these.
-	 */
-	if (nautilus_dumb_down_for_multi_byte_locale_hack ()) {
-		gdk_font_ref (font);
-		return font;
-	}
-	
-	tokenized_string = nautilus_string_list_new_from_tokens (text, "\n", FALSE);
-	longest_string = nautilus_string_list_get_longest_string (tokenized_string);
-	g_assert (longest_string != NULL);
-	nautilus_string_list_free (tokenized_string);
-	longest_string_length = strlen (longest_string);
-
-	/* Make sure the font was specified in pixels */
-	if (font_get_size_in_pixels (font) > 0) {
-		int candidate_size;
-		char *font_name;
-		gboolean done;
-		
-		font_name = font_get_name (font);
-		
-		/* Iterate through the fonts until we find one that works */
-		candidate_size = maximum_acceptable_font_size;
-		done = FALSE;
-		while (!done) {
- 			GdkFont *candidate_font;
- 			int candidate_width;
-
-			candidate_font = font_bitmap_get_by_size (font_name,
-								  candidate_size,
-								  XLFD_SIZE_IN_PIXELS_INDEX,
-								  compare_xlfd_by_size_in_pixels);
-			if (candidate_font != NULL) {
-				candidate_width = gdk_string_width (candidate_font, longest_string);
-				
-				if ((candidate_width <= available_width) 
-				    || (candidate_size <= minimum_acceptable_font_size)) {
-					done = TRUE;
-					largest_fitting_font = candidate_font;
-				} else {
-					gdk_font_unref (candidate_font);
-				}
-			}
-			
-			candidate_size--;
-		}
-
-		g_free (font_name);
-	}
-
-	g_free (longest_string);
-
-	return largest_fitting_font;
-}
-
-/**
- * nautilus_string_ellipsize_start:
- * 
- * @string: A a string to be ellipsized.
- * @font: A a font used to measure the resulting string width.
- * @width: Desired maximum width in points.
- * Returns: A truncated string at most @width points long.
- * 
- * Truncates a string, removing characters from the start and 
- * replacing them with "..." 
- * 
- */
-char *
-nautilus_string_ellipsize_start (const char *string, GdkFont *font, int width)
-{
-	int truncate_offset;
-	int resulting_width;
-
-	resulting_width = gdk_string_width (font, string);
-	if (resulting_width <= width) {
-		/* String is already short enough. */
-		return g_strdup (string);
-	}
-	
-	/* Account for the width of the ellipsis. */
-	width -= gdk_string_width (font, ELLIPSIS);
-	
-
-	if (width < 0) {
-		/* No room even for a an ellipsis. */
-		return g_strdup ("");
-	}
-	
-	g_assert (strlen (string) > 0);
-
-	/* We rely on the fact that GdkFont does not use kerning and that
-	 * gdk_string_width ("foo") + gdk_string_width ("bar") ==
-	 * gdk_string_width ("foobar")
-	 */
-        for (truncate_offset = 1; ; truncate_offset++) {
-        	if (string[truncate_offset] == '\0') {
-			break;
-        	}
-
-        	resulting_width -= gdk_char_width (font, string[truncate_offset - 1]);
-
-        	if (resulting_width <= width) {
-			break;
-        	}
-        }
-
-	return g_strconcat (ELLIPSIS, string + truncate_offset, NULL);
-}
-
-/**
- * nautilus_string_ellipsize_end:
- * 
- * @string: A a string to be ellipsized.
- * @font: A a font used to measure the resulting string width.
- * @width: Desired maximum width in points.
- * Returns: A truncated string at most @width points long.
- * 
- * Truncates a string, removing characters from the end and 
- * replacing them with "..." 
- * 
- */
-char *
-nautilus_string_ellipsize_end (const char *string, GdkFont *font, int width)
-{
-	int truncated_length;
-	char *result;
-	int resulting_width;
-
-	resulting_width = gdk_string_width (font, string);
-	if (resulting_width <= width) {
-		/* String is already short enough. */
-		return g_strdup (string);
-	}
-	
-	/* Account for the width of the ellipsis. */
-	width -= gdk_string_width (font, ELLIPSIS);
-	
-
-	if (width < 0) {
-		/* No room even for a an ellipsis. */
-		return g_strdup ("");
-	}
-	
-        for (truncated_length = strlen (string) - 1; truncated_length > 0; truncated_length--) {
-        	resulting_width -= gdk_char_width (font, string[truncated_length]);
-        	if (resulting_width <= width) {
-			break;
-        	}
-        }
-	
-	result = g_malloc (truncated_length + strlen (ELLIPSIS) + 1);
-	memcpy (result, string, truncated_length);
-	strcpy (result + truncated_length, ELLIPSIS);
-
-	return result;
-}
-
-/**
- * nautilus_string_ellipsize_middle:
- * 
- * @string: A a string to be ellipsized.
- * @font: A a font used to measure the resulting string width.
- * @width: Desired maximum width in points.
- * Returns: A truncated string at most @width points long.
- * 
- * Truncates a string, removing characters from the middle and 
- * replacing them with "..." 
- * 
- */
-char *
-nautilus_string_ellipsize_middle (const char *string, GdkFont *font, int width)
-{
-	int original_length;
-	int starting_fragment_length;
-	int ending_fragment_offset;
-	int resulting_width;
-	char *result;
-
-	resulting_width = gdk_string_width (font, string);
-	if (resulting_width <= width) {
-		/* String is already short enough. */
-		return g_strdup (string);
-	}
-	
-	/* Account for the width of the ellipsis. */
-	width -= gdk_string_width (font, ELLIPSIS);
-	
-
-	if (width < 0) {
-		/* No room even for a an ellipsis. */
-		return g_strdup ("");
-	}
-
-	/* Split the original string into two halves */
-	original_length = strlen (string);
-	
-	g_assert (original_length > 0);
-	
-	starting_fragment_length = original_length / 2;
-	ending_fragment_offset = starting_fragment_length + 1;
-	
-	/* Shave off a character at a time from the first and the second half
-	 * until we can fit
-	 */
-	resulting_width -= gdk_char_width (font, string[ending_fragment_offset - 1]);
-	
-	/* depending on whether the original string length is odd or even, start by
-	 * shaving off the characters from the starting or ending fragment
-	 */
-	switch (original_length % 2) {
-	        while (TRUE) {
-	case 0:
-			if (resulting_width <= width) {
-				break;
-			}
-			g_assert (starting_fragment_length > 0 || ending_fragment_offset < original_length);
-			if (starting_fragment_length > 0) {
-				starting_fragment_length--;
-			}
-			resulting_width -= gdk_char_width (font, string[starting_fragment_length]);
-	case 1:
-			if (resulting_width <= width) {
-				break;
-			}
-			g_assert (starting_fragment_length > 0 || ending_fragment_offset < original_length);
-			if (ending_fragment_offset < original_length) {
-				ending_fragment_offset++;
-			}
-			resulting_width -= gdk_char_width (font, string[ending_fragment_offset - 1]);
-	        }
-	}
-	
-	/* patch the two fragments together with an ellipsis */
-	result = g_malloc (starting_fragment_length + (original_length - ending_fragment_offset)
-		+ strlen (ELLIPSIS) + 1);
-	memcpy (result, string, starting_fragment_length);
-	strcpy (result + starting_fragment_length, ELLIPSIS);
-	strcpy (result + starting_fragment_length + strlen (ELLIPSIS), string + ending_fragment_offset);
-
-	return result;
-}
-
-/* Private font things */
-
-/* Find a bold flavor of a font */
-static GdkFont *
-font_get_bold (GdkFont *font)
-{
-	char *name;
-	char *weight_pattern;
-	GdkFont *result = NULL;
-	char *pattern_match;
-	const NautilusStringList *font_list;
-
-	g_return_val_if_fail (font != NULL, NULL);
-
-	name = font_get_name (font);
-
-	/* Replace the weight with a wildard */
-	weight_pattern = xlfd_string_replace_nth (name, XLFD_WEIGHT_INDEX, "*");
-
-	if (weight_pattern == NULL) {
-		g_free (name);
-		gdk_font_ref (font);
-		return font;
-	}
-
-	font_list = font_list_fonts_cached (weight_pattern, NULL);
-	
-	/* Find one with a bold weight */
-	pattern_match = nautilus_string_list_find_by_function (font_list,
-							       font_entry_has_bold_weight_test,
-							       NULL);
-
-	if (pattern_match != NULL) {
-		char *weight_name;
-		char *bold_name;
-
-		/* Find out the bold weight */
-		weight_name = xlfd_string_get_nth (pattern_match, XLFD_WEIGHT_INDEX);
-		
-		/* Set the bold weight on the original name */
-		bold_name = xlfd_string_replace_nth (name, XLFD_WEIGHT_INDEX, weight_name);
-		
-		result = gdk_fontset_load (bold_name);
-		if (result == NULL) {
-			gdk_font_ref (font);
-			result = font;
-		}
-
-		g_free (bold_name);
-		g_free (weight_name);
-	} else {
-		/* If no font was found, return the source font */
-		gdk_font_ref (font);
-		result = font;
-	}
-
-	g_free (pattern_match);
-	g_free (weight_pattern);
-	g_free (name);
-
-	return result;
-}
-
-/* A wrapper for XListFonts() */
-static NautilusStringList *
-font_list_fonts (const char *pattern)
-{
-	NautilusStringList *list;
-	char **font_names;
-	int actual_count;
-	int i;
-
-	font_names = XListFonts (GDK_DISPLAY (), pattern, MAX_FONTS, &actual_count);
-
-	if (font_names == NULL || actual_count <= 0) {
-		return NULL;
-	}
-
-	list = nautilus_string_list_new (FALSE);
-
-	for (i = 0; i < actual_count; i++) {
-		nautilus_string_list_insert (list, font_names[i]);
-	}
-
-	XFreeFontNames (font_names);
-
-	return list;
-}
-
-/* A version of list_fonts that returns a cached value.  In general
- * I dont hesitate to copy string lists around to avoid the caller
- * having to decide to free or not.  However, list_fonts is a very 
- * special case.  It is an expensive operation, and one that can
- * be liberally called from Nautilus.  For example, the sidebar title
- * results in many such queries being made.  Further, we have profiler
- * evidence to indicate that the specific operation of listing fonts
- * is responsible for a not insignificant amount of starvation of the 
- * gnome vfs working thread.  So there.
- */
-static GHashTable *font_list_table = NULL;
-
-typedef struct
-{
-	char *pattern;
-	NautilusStringList *font_list;
-} FontListEntry;
-
-static void
-font_list_table_free_one_node (gpointer key,
-			       gpointer value,
-			       gpointer callback_data)
-{
-	FontListEntry *entry;
-
-	g_return_if_fail (key != NULL);
-	g_return_if_fail (value != NULL);
-
-	entry = value;
-	g_free (entry->pattern);
-	nautilus_string_list_free (entry->font_list);
-	g_free (entry);
-}
-
-static void
-font_list_table_free (void)
-{
-	if (font_list_table != NULL) {
-		g_hash_table_foreach (font_list_table, font_list_table_free_one_node, NULL);
-		g_hash_table_destroy (font_list_table);
-	}
-
-	font_list_table = NULL;
-}
-
-/* Return a cached list of fonts.  If a compare_function is given, the
- * list will be sorted accordingly.  As such, the sorting state of the 
- * cached font list is undefined if the compare_function is NULL.
- */
-static const NautilusStringList *
-font_list_fonts_cached (const char *pattern,
-			GCompareFunc compare_function)
-{
-	FontListEntry *entry;
-
-	g_return_val_if_fail (pattern != NULL, NULL);
-
-	if (font_list_table == NULL) {
-		font_list_table = g_hash_table_new (g_str_hash, g_str_equal);
-		g_atexit (font_list_table_free);
-	}
-
-	g_assert (font_list_table != NULL);
-	entry = g_hash_table_lookup (font_list_table, pattern);
-
-	if (entry != NULL) {
-		g_assert (entry->font_list != NULL);
-		if (compare_function != NULL) {
-			nautilus_string_list_sort_by_function (entry->font_list, compare_function);
-		}
-		return entry->font_list;
-	}
-
-	entry = g_new0 (FontListEntry, 1);
-	entry->pattern = g_strdup (pattern);
-	entry->font_list = font_list_fonts (pattern);
-
-	if (entry->font_list == NULL) {
-		g_free (entry->pattern);
-		g_free (entry);
-		return NULL;
-	}
-
-	g_hash_table_insert (font_list_table, entry->pattern, entry);
-
-	g_assert (g_hash_table_lookup (font_list_table, entry->pattern) == entry);
-
-	if (compare_function != NULL) {
-		nautilus_string_list_sort_by_function (entry->font_list, compare_function);
-	}
-	return entry->font_list;
-}
-
-/* Return the font name - an xlfd string used by Gdk to allocate the font */
-static char *
-font_get_name (const GdkFont *font)
-{
-	GdkFontPrivate *font_private;
-	const char *font_name;
-
-	g_return_val_if_fail (font != NULL, NULL);
-
-	font_private = (GdkFontPrivate *)font;
-
-	if (font_private->names == NULL) {
-		return NULL;
-	}
-
-	/* FIXME bugzilla.eazel.com xxxx:
-	 * When do we need to look beyong the first entry ?
-	 */
-	font_name = g_slist_nth_data (font_private->names, 0);
-
-	return font_name ? g_strdup (font_name) : NULL;
-}
-
-/* Return the size of a font in pixels.  If the source font's
- * XLFD spec is in something other than pixels (say points)
- * then the result is 0.  If the font is scalable, then the
- * result is 0 as well.  This function is only useful with
- * bitmap fonts. 
- */
-static guint
-font_get_size_in_pixels (const GdkFont *font)
-{
-	char *name;
-	int size_in_pixels = 0;
-
-	g_return_val_if_fail (font != NULL, 0);
-
-	name = font_get_name (font);
-	size_in_pixels = xlfd_string_get_nth_as_int (name, XLFD_SIZE_IN_PIXELS_INDEX);
-	g_free (name);
-
-	return (size_in_pixels != XLFD_INVALID_VALUE) ? size_in_pixels : 0;
-}
-
-static GdkFont *fixed_font = NULL;
-
-static void
-unref_fixed_font (void)
-{
-	gdk_font_unref (fixed_font);
-}
-
-/**
- * nautilus_gdk_font_get_fixed
- *
- * Returns: A fixed GdkFont that is guranteed to exist even in the
- *          most limited user environment.  The fixed font is
- *          useful in making code that deals with fonts simple by always
- *          having the ability to fallback to this font.
- *
- *          You should free the font with gdk_font_unref() when you are
- *          done with it.
- */
-GdkFont *
-nautilus_gdk_font_get_fixed (void)
-{
-	if (fixed_font == NULL) {
-		/* Note to localizers: This is the name of the font used
-		 * when no other font can be found. It must be guaranteed
-		 * to exist, * even in the most limited user environment
-		 */
-		fixed_font = gdk_fontset_load (_("fixed"));
-		g_assert (fixed_font != NULL);
-		g_atexit (unref_fixed_font);
-	}
-
-	gdk_font_ref (fixed_font);
-	return fixed_font;
-}
-
-/* Return a new string with just the nth XLFD string entry.  */
-static char *
-xlfd_string_get_nth (const char *xlfd_string,
-		     guint n)
-{
-	NautilusStringList *list;
-	char *result;
-	
-	g_return_val_if_fail (xlfd_string != NULL, NULL);
-	g_return_val_if_fail (n <= XLFD_MAX_INDEX, NULL);
-	
-	list = nautilus_string_list_new_from_tokens (xlfd_string, "-", FALSE);
-
-	if (nautilus_string_list_get_length (list) != (XLFD_MAX_INDEX + 1)) {
-		nautilus_string_list_free (list);
-		return NULL;
-	}
-
-	result = nautilus_string_list_nth (list, n);
-
-	nautilus_string_list_free (list);
-
-	return result;
-}
-
-/* Replace the nth entry of an XLFD string.  Return the new string. */
-static char *
-xlfd_string_replace_nth (const char *xlfd_string,
-			 guint n,
-			 const char *replace_string)
-{
-	char *new_xlfd_string;
-	NautilusStringList *list;
-	
-	g_return_val_if_fail (xlfd_string != NULL, NULL);
-
-	if (n > XLFD_MAX_INDEX) {
-		return NULL;
-	}
-
-	list = nautilus_string_list_new_from_tokens (xlfd_string, "-", FALSE);
-
-	if (nautilus_string_list_get_length (list) != (XLFD_MAX_INDEX + 1)) {
-		nautilus_string_list_free (list);
-		return NULL;
-	}
-
-	nautilus_string_list_modify_nth (list, n, replace_string);
-	new_xlfd_string = nautilus_string_list_as_concatenated_string (list, "-");
-	nautilus_string_list_free (list);
-
-	return new_xlfd_string;
-}
-
-/* Return the nth entry as an integer.  Wildcards get the special
- * XLFD_WILDCARD_VALUE value. */
-static int
-xlfd_string_get_nth_as_int (const char *xlfd_string,
-			    guint n)
-{
-	char *nth;
-	int value;
-	
-	g_return_val_if_fail (xlfd_string != NULL, XLFD_INVALID_VALUE);
-
-	if (n > XLFD_MAX_INDEX) {
-		return XLFD_INVALID_VALUE;
-	}
-	
-	nth = xlfd_string_get_nth (xlfd_string, n);
-
-	if (nth == NULL) {
-		return XLFD_INVALID_VALUE;
-	}
-
-	if (nautilus_str_is_equal (nth, "*")) {
-		return XLFD_WILDCARD_VALUE;
-	}
-	
-	if (!nautilus_eat_str_to_int (nth, &value)) {
-		return XLFD_INVALID_VALUE;
-	}
-
-	return value;
-}
-
-/* Return whether the given xlfd string pattern represents a 
- * scalable non bitmap font */
-static gboolean
-xlfd_string_is_scalable_non_bitmap (const char *xlfd_string)
-{
-	int size_in_pixels;
-	int size_in_points;
-	int horizontal_resolution;
-	int vertical_resolution;
-
-	size_in_pixels = xlfd_string_get_nth_as_int (xlfd_string,
-						     XLFD_SIZE_IN_PIXELS_INDEX);
-	size_in_points = xlfd_string_get_nth_as_int (xlfd_string,
-						     XLFD_SIZE_IN_POINTS_INDEX);
-	horizontal_resolution = xlfd_string_get_nth_as_int (xlfd_string,
-							    XLFD_HORIZONTAL_RESOLUTION_INDEX);
-	vertical_resolution = xlfd_string_get_nth_as_int (xlfd_string,
-							  XLFD_VERTICAL_RESOLUTION_INDEX);
-	
-	return size_in_pixels == 0
-		&& size_in_points == 0
-		&& horizontal_resolution == 0
-		&& vertical_resolution == 0;
-}
-
-/* Return whether the given xlfd string pattern indicates a 
- * scalable non bitmap font */
-static gboolean
-xlfd_string_could_be_scalable_non_bitmap (const char *xlfd_string)
-{
-	char *temp[4];
-	gboolean is_scalable_non_bitmap;
-	const NautilusStringList *font_list;
-	char *scalable_non_bitmap_match;
-	
-	g_return_val_if_fail (xlfd_string != NULL, FALSE);
-
-	/* Replace all the size entries with wildcards */
-	temp[0] = xlfd_string_replace_nth (xlfd_string, XLFD_SIZE_IN_PIXELS_INDEX, "*");
-	temp[1] = xlfd_string_replace_nth (temp[0], XLFD_SIZE_IN_POINTS_INDEX, "*");
-	temp[2] = xlfd_string_replace_nth (temp[1], XLFD_HORIZONTAL_RESOLUTION_INDEX, "*");
-	temp[3] = xlfd_string_replace_nth (temp[2], XLFD_VERTICAL_RESOLUTION_INDEX, "*");
-	
-	font_list = font_list_fonts_cached (temp[3], NULL);
-
-	/* Look for the entry that indicate this is a scalable non bitmap font */
-	scalable_non_bitmap_match = nautilus_string_list_find_by_function (font_list,
-									   font_entry_is_scalable_non_bitmap_test,
-									   NULL);
-	
-	is_scalable_non_bitmap = scalable_non_bitmap_match != NULL;
-	g_free (scalable_non_bitmap_match);
-
-	g_free (temp[0]);
-	g_free (temp[1]);
-	g_free (temp[2]);
-	g_free (temp[3]);
-
-	return is_scalable_non_bitmap;
-}
-
-/* Allocate a new xlfd string with the given attrbitues. */
-char *
-nautilus_gdk_font_xlfd_string_new (const char *foundry,
-				   const char *family,
-				   const char *weight,
-				   const char *slant,
-				   const char *set_width,
-				   const char *add_style,
-				   guint size_in_pixels)
-{
-	char *font_name;
-
-        const char *points = "*";
-        const char *hor_res = "*";
-        const char *ver_res = "*";
-        const char *spacing = "*";
-        const char *average_width = "*";
-        const char *char_set_registry = "*";
-        const char *char_set_encoding = "*";
-
-
-	/*                             +---------------------------------------------------- foundry
-	                               |  +------------------------------------------------- family
-				       |  |  +---------------------------------------------- weight
-				       |  |  |  +------------------------------------------- slant 
-				       |  |  |  |  +---------------------------------------- sel_width
-				       |  |  |  |  |  +------------------------------------- add-style
-				       |  |  |  |  |  |  +---------------------------------- pixels   	
-				       |  |  |  |  |  |  |  +------------------------------- points  
-				       |  |  |  |  |  |  |  |  +---------------------------- hor_res        
-				       |  |  |  |  |  |  |  |  |  +------------------------- ver_res        
-				       |  |  |  |  |  |  |  |  |  |  +---------------------- spacing        
-				       |  |  |  |  |  |  |  |  |  |  |  +------------------- average_width        
-				       |  |  |  |  |  |  |  |  |  |  |  |  +---------------- char_set_registry
-				       |  |  |  |  |  |  |  |  |  |  |  |  |  +------------- char_set_encoding */
-	font_name = g_strdup_printf ("-%s-%s-%s-%s-%s-%s-%d-%s-%s-%s-%s-%s-%s-%s",
-				     foundry,
-				     family,
-				     weight,
-				     slant,
-				     set_width,
-				     add_style,
-				     size_in_pixels,
-				     points,
-				     hor_res,
-				     ver_res,
-				     spacing,
-				     average_width,
-				     char_set_registry,
-				     char_set_encoding);
-	
-	return font_name;
-}
-
-/* Test whether the given XLFD string has a bold weight */
-static gboolean
-font_entry_has_bold_weight_test (const NautilusStringList *string_list,
-				 const char *string,
-				 gpointer callback_data)
-{
- 	gboolean result;
-	char *weight;
-
-	g_return_val_if_fail (string_list != NULL, FALSE);
-	g_return_val_if_fail (string != NULL, FALSE);
-
-	weight = xlfd_string_get_nth (string, XLFD_WEIGHT_INDEX);
-
-	/* FIXME bugzilla.eazel.com xxxx:
-	 * Are there any other bold weights besides there 3 ?
-	 */
- 	result = 
- 		nautilus_str_is_equal (weight, "bold")
- 		|| nautilus_str_is_equal (weight, "demibold")
- 		|| nautilus_str_is_equal (weight, "black");
-
- 	g_free (weight);
-
- 	return result;
-}
-
-/* Test whether the given XLFD string has an italic slant */
-static gboolean
-font_entry_has_italic_slant_test (const NautilusStringList *string_list,
-				  const char *string,
-				  gpointer callback_data)
-{
- 	gboolean result;
-	char *slant;
-
-	g_return_val_if_fail (string_list != NULL, FALSE);
-	g_return_val_if_fail (string != NULL, FALSE);
-
-	slant = xlfd_string_get_nth (string, XLFD_SLANT_INDEX);
-
-	/* FIXME bugzilla.eazel.com xxxx:
-	 * Are there any other italic slants besides these 2 ?
-	 * i = italic
-	 * o = oblique
-	 */
- 	result = 
- 		nautilus_str_is_equal (slant, "i")
- 		|| nautilus_str_is_equal (slant, "o");
-
- 	g_free (slant);
-
- 	return result;
-}
-
-/* Test whether the given XLFD string indicates a scalable non bitmap font */
-static gboolean
-font_entry_is_scalable_non_bitmap_test (const NautilusStringList *string_list,
-					const char *string,
-					gpointer callback_data)
-{
-	g_return_val_if_fail (string_list != NULL, FALSE);
-	g_return_val_if_fail (string != NULL, FALSE);
-
-	return xlfd_string_is_scalable_non_bitmap (string);
-}
-
-/* Compare the "size_in_points" entry of 2 XLFD strings */
-static int
-compare_xlfd_by_size_in_points (gconstpointer string_a,
-				gconstpointer string_b)
-{
-	int a;
-	int b;
-
-	g_return_val_if_fail (string_a != NULL, 0);
-	g_return_val_if_fail (string_b != NULL, 0);
-	
-	a = xlfd_string_get_nth_as_int (string_a, XLFD_SIZE_IN_POINTS_INDEX);
-	b = xlfd_string_get_nth_as_int (string_b, XLFD_SIZE_IN_POINTS_INDEX);
-
- 	if (a < b) {
- 		return -1;
-	}
-
- 	if (a == b) {
- 		return 0;
- 	}
-
-	return 1;
-}
-
-/* Compare the "size_in_pixels" entry of 2 XLFD strings */
-static int
-compare_xlfd_by_size_in_pixels (gconstpointer string_a,
-				gconstpointer string_b)
-{
-	int a;
-	int b;
-
-	g_return_val_if_fail (string_a != NULL, 0);
-	g_return_val_if_fail (string_b != NULL, 0);
-	
-	a = xlfd_string_get_nth_as_int (string_a, XLFD_SIZE_IN_PIXELS_INDEX);
-	b = xlfd_string_get_nth_as_int (string_b, XLFD_SIZE_IN_PIXELS_INDEX);
-
- 	if (a < b) {
- 		return -1;
-	}
-
- 	if (a == b) {
- 		return 0;
- 	}
-
-	return 1;
-}
-
-#if ! defined (NAUTILUS_OMIT_SELF_CHECK)
-
-typedef enum {
-	NAUTILUS_ELLIPSIZE_START,
-	NAUTILUS_ELLIPSIZE_MIDDLE,
-	NAUTILUS_ELLIPSIZE_END
-} NautilusEllipsizeMode;
-
-/* Testing string truncation is tough because we do not know what font/
- * font metrics to expect on a given system. To work around this we use
- * a substring of the original, measure it's length using the given font, 
- * add the length of the "..." string and use that for truncation.
- * The result should then be the substring prepended with a "..."
- */
-static char *
-nautilus_self_check_ellipsize (const char *string, const char *truncate_to_length_string, NautilusEllipsizeMode mode)
-{
-	GdkFont *font;
-	int truncation_length;
-	char *result;
-
-
-	/* any old font will do */
-	font = nautilus_gdk_font_get_fixed ();
-	g_assert (font);
-
-	/* measure the length we want to truncate to */
-	truncation_length = gdk_string_width (font, truncate_to_length_string);
-	truncation_length += gdk_string_width (font, ELLIPSIS);
-
-	switch (mode) {
-		case NAUTILUS_ELLIPSIZE_START:
-			result = nautilus_string_ellipsize_start (string, font, truncation_length);
-			break;
-		case NAUTILUS_ELLIPSIZE_MIDDLE:
-			result = nautilus_string_ellipsize_middle (string, font, truncation_length);
-			break;
-		case NAUTILUS_ELLIPSIZE_END:
-			result = nautilus_string_ellipsize_end (string, font, truncation_length);
-			break;
-		default:
-			g_assert_not_reached ();
-			result = NULL;
-			break;
-	};
-	
-	gdk_font_unref (font);
-
-	return result;
-}
-
-static char *
-nautilus_self_check_ellipsize_start (const char *string, const char *truncate_to_length_string)
-{
-	return nautilus_self_check_ellipsize (string, truncate_to_length_string, NAUTILUS_ELLIPSIZE_START);
-}
-
-static char *
-nautilus_self_check_ellipsize_middle (const char *string, const char *truncate_to_length_string)
-{
-	return nautilus_self_check_ellipsize (string, truncate_to_length_string, NAUTILUS_ELLIPSIZE_MIDDLE);
-}
-
-static char *
-nautilus_self_check_ellipsize_end (const char *string, const char *truncate_to_length_string)
-{
-	return nautilus_self_check_ellipsize (string, truncate_to_length_string, NAUTILUS_ELLIPSIZE_END);
-}
-
-void
-nautilus_self_check_gdk_font_extensions (void)
-{
-	GdkFont *font;
-
-	/* used to test ellipsize routines */
-	font = nautilus_gdk_font_get_fixed ();
-	g_assert (font);
-
-	/* nautilus_string_ellipsize_start */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_start ("012345678", "0012345678"), "012345678");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_start ("012345678", "012345678"), "012345678");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_start ("012345678", "45678"), "...45678");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_start ("012345678", "5678"), "...5678");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_start ("012345678", "678"), "...678");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_start ("012345678", "78"), "...78");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_start ("012345678", "8"), "...8");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_start ("", font, 100), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_start ("test", font, 0), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_start ("test", font, gdk_string_width (font, "...") - 1), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_start ("test", font, gdk_string_width (font, "...")), "...");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("012345678", "0123456789"), "012345678");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("012345678", "012345678"), "012345678");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("012345678", "01278"), "012...78");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("012345678", "0178"), "01...78");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("012345678", "018"), "01...8");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("012345678", "08"), "0...8");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("012345678", "0"), "0...");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("0123456789", "0123456789"), "0123456789");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("0123456789", "012789"), "012...789");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("0123456789", "01289"), "012...89");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("0123456789", "0189"), "01...89");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("0123456789", "019"), "01...9");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("0123456789", "09"), "0...9");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("0123456789", "0"), "0...");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_middle ("", font, 100), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_middle ("test", font, 0), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_middle ("test", font, gdk_string_width (font, "...") - 1), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_middle ("test", font, gdk_string_width (font, "...")), "...");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_end ("012345678", "0123456789"), "012345678");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_end ("012345678", "012345678"), "012345678");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_end ("012345678", "01234"), "01234...");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_end ("012345678", "0123"), "0123...");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_end ("012345678", "012"), "012...");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_end ("012345678", "01"), "01...");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_end ("012345678", "0"), "0...");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_end ("", font, 100), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_end ("test", font, 0), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_end ("test", font, gdk_string_width (font, "...") - 1), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_end ("test", font, gdk_string_width (font, "...")), "...");
-
-	gdk_font_unref (font);
-
-	/* xlfd_string_get_nth */
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x", 1), "x");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x-", 1), "x");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", 1), "1");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", 2), "2");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", XLFD_WEIGHT_INDEX), "3");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", XLFD_SIZE_IN_PIXELS_INDEX), "7");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", XLFD_SIZE_IN_POINTS_INDEX), "8");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", XLFD_MAX_INDEX), "d");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", XLFD_MAX_INDEX - 1), "c");
-
-	/* xlfd_string_get_nth_as_int */
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-1-2-3-4-5-6-7-8-9-10-11-12-13-14", 1), 1);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-1-2-3-4-5-6-7-8-9-10-11-12-13-14", 2), 2);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-1-2-3-4-5-6-7-8-9-10-11-12-13-14", XLFD_WEIGHT_INDEX), 3);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-1-2-3-4-5-6-7-8-9-10-11-12-13-14", XLFD_SIZE_IN_PIXELS_INDEX), 7);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-1-2-3-4-5-6-7-8-9-10-11-12-13-14", XLFD_SIZE_IN_POINTS_INDEX), 8);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-1-2-3-4-5-6-7-8-9-10-11-12-13-14", XLFD_MAX_INDEX), 14);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-1-2-3-4-5-6-7-8-9-10-11-12-13-14", XLFD_MAX_INDEX - 1), 13);
-	
-	/* xlfd_string_replace_nth */
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("", 1, "X"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-", 1, "X"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b", 1, "X"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-", 1, "X"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c", 1, "X"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", 1, "X"), "-X-2-3-4-5-6-7-8-9-0-a-b-c-d");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", 2, "X"), "-1-X-3-4-5-6-7-8-9-0-a-b-c-d");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", 15, "X"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", 16, "X"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", 14, "X"), "-1-2-3-4-5-6-7-8-9-0-a-b-c-X");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", 13, "X"), "-1-2-3-4-5-6-7-8-9-0-a-b-X-d");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", 12, "X"), "-1-2-3-4-5-6-7-8-9-0-a-X-c-d");
-
-
-	/* xlfd_string_is_scalable_non_bitmap */
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap (""), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-3"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-3-4-5-6-7-8-9-0-a-b"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-3-4-5-6-7-8-9-0-a-b-"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-3-4-5-6-7-8-9-0-a-b-c"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-3-4-5-6-7-8-9-0-a-b-c-"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-*-*-*-*-*-*-*-*-*-*-*-*-*-*"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-*-*-*-*-*-*-0-0-0-0-*-*-*-*"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-*-*-*-*-*-*-0-0-0-0-*-*-*-*-"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-*-*-*-*-*-*-0-0-0-0-*-*-*-*-*"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-0-0-0-0-0-0-0-0-0-0-0-0-0-0"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-0-0-0-0-0-0-0-0-0-0-0-0-0-0-"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-0-0-0-0-0-0-0-0-0-0-0-0-0-0-0"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d-e"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d-e-"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d-e-f"), FALSE);
-}
-
-#endif /* ! NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-gdk-font-extensions.h b/libnautilus-extensions/nautilus-gdk-font-extensions.h
deleted file mode 100644
index 7eef3a114..000000000
--- a/libnautilus-extensions/nautilus-gdk-font-extensions.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gdk-extensions.h: GdkFont extensions.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>, 
-            Pavel Cisler <pavel@eazel.com>,
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_GDK_FONT_EXTENSIONS_H
-#define NAUTILUS_GDK_FONT_EXTENSIONS_H
-
-#include <gdk/gdk.h>
-
-/* Misc GdkFont helper functions */
-gboolean nautilus_gdk_font_equal               (GdkFont    *font_a_null_allowed,
-						GdkFont    *font_b_null_allowed);
-GdkFont *nautilus_gdk_font_get_largest_fitting (GdkFont    *font,
-						const char *text,
-						int         available_width,
-						int         minimum_acceptable_font_size,
-						int         maximum_acceptable_font_size);
-GdkFont *nautilus_gdk_font_get_bold            (GdkFont    *plain);
-GdkFont *nautilus_gdk_font_get_italic          (GdkFont    *plain);
-GdkFont *nautilus_gdk_font_get_larger          (GdkFont    *font,
-						int         num_sizes);
-GdkFont *nautilus_gdk_font_get_smaller         (GdkFont    *font,
-						int         num_sizes);
-GdkFont *nautilus_gdk_font_get_fixed           (void);
-char *   nautilus_string_ellipsize_start       (const char *original,
-						GdkFont    *font,
-						int         length);
-char *	 nautilus_string_ellipsize_end	       (const char *string,
-						GdkFont    *font,
-						int 	   width);
-char *	 nautilus_string_ellipsize_middle      (const char *string,
-						GdkFont    *font,
-						int 	   width);
-char *   nautilus_gdk_font_xlfd_string_new     (const char *foundry,
-						const char *family,
-						const char *weight,
-						const char *slant,
-						const char *set_width,
-						const char *add_style,
-						guint       size_in_pixels);
-
-#endif /* NAUTILUS_GDK_FONT_EXTENSIONS_H */
diff --git a/libnautilus-extensions/nautilus-gdk-pixbuf-extensions.c b/libnautilus-extensions/nautilus-gdk-pixbuf-extensions.c
deleted file mode 100644
index 8a0b81ad4..000000000
--- a/libnautilus-extensions/nautilus-gdk-pixbuf-extensions.c
+++ /dev/null
@@ -1,1572 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gdk-pixbuf-extensions.c: Routines to augment what's in gdk-pixbuf.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-gdk-pixbuf-extensions.h"
-
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-string.h"
-#include "nautilus-art-gtk-extensions.h"
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-debug-drawing.h"
-#include <gdk-pixbuf/gdk-pixbuf-loader.h>
-#include <gdk/gdkx.h>
-#include <gdk/gdkprivate.h>
-#include <libgnomevfs/gnome-vfs-async-ops.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <math.h>
-#include <png.h>
-
-#define LOAD_BUFFER_SIZE 4096
-
-struct NautilusPixbufLoadHandle {
-	GnomeVFSAsyncHandle *vfs_handle;
-	NautilusPixbufLoadCallback callback;
-	gpointer callback_data;
-	GdkPixbufLoader *loader;
-	char buffer[LOAD_BUFFER_SIZE];
-};
-
-static void file_opened_callback (GnomeVFSAsyncHandle      *vfs_handle,
-				  GnomeVFSResult            result,
-				  gpointer                  callback_data);
-static void file_read_callback   (GnomeVFSAsyncHandle      *vfs_handle,
-				  GnomeVFSResult            result,
-				  gpointer                  buffer,
-				  GnomeVFSFileSize          bytes_requested,
-				  GnomeVFSFileSize          bytes_read,
-				  gpointer                  callback_data);
-static void file_closed_callback (GnomeVFSAsyncHandle      *handle,
-				  GnomeVFSResult            result,
-				  gpointer                  callback_data);
-static void load_done            (NautilusPixbufLoadHandle *handle,
-				  GnomeVFSResult            result,
-				  gboolean		    get_pixbuf);
-
-/**
- * nautilus_gdk_pixbuf_list_ref
- * @pixbuf_list: A list of GdkPixbuf objects.
- *
- * Refs all the pixbufs.
- **/
-void
-nautilus_gdk_pixbuf_list_ref (GList *pixbuf_list)
-{
-	g_list_foreach (pixbuf_list, (GFunc) gdk_pixbuf_ref, NULL);
-}
-
-/**
- * nautilus_gdk_pixbuf_list_free
- * @pixbuf_list: A list of GdkPixbuf objects.
- *
- * Unrefs all the pixbufs, then frees the list.
- **/
-void
-nautilus_gdk_pixbuf_list_free (GList *pixbuf_list)
-{
-	nautilus_g_list_free_deep_custom (pixbuf_list, (GFunc) gdk_pixbuf_unref, NULL);
-}
-
-GdkPixbuf *
-nautilus_gdk_pixbuf_load (const char *uri)
-{
-	GnomeVFSResult result;
-	GnomeVFSHandle *handle;
-	char buffer[LOAD_BUFFER_SIZE];
-	GnomeVFSFileSize bytes_read;
-	GdkPixbufLoader *loader;
-	GdkPixbuf *pixbuf;	
-
-	g_return_val_if_fail (uri != NULL, NULL);
-
-	result = gnome_vfs_open (&handle,
-				 uri,
-				 GNOME_VFS_OPEN_READ);
-	if (result != GNOME_VFS_OK) {
-		return NULL;
-	}
-
-	loader = gdk_pixbuf_loader_new ();
-	while (1) {
-		result = gnome_vfs_read (handle,
-					 buffer,
-					 sizeof (buffer),
-					 &bytes_read);
-		if (result != GNOME_VFS_OK) {
-			break;
-		}
-		if (bytes_read == 0) {
-			break;
-		}
-		if (!gdk_pixbuf_loader_write (loader,
-					      buffer,
-					      bytes_read)) {
-			result = GNOME_VFS_ERROR_WRONG_FORMAT;
-			break;
-		}
-	}
-
-	if (result != GNOME_VFS_OK && result != GNOME_VFS_ERROR_EOF) {
-		gtk_object_unref (GTK_OBJECT (loader));
-		gnome_vfs_close (handle);
-		return NULL;
-	}
-
-	gnome_vfs_close (handle);
-	gdk_pixbuf_loader_close (loader);
-
-	pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-	if (pixbuf != NULL) {
-		gdk_pixbuf_ref (pixbuf);
-	}
-	gtk_object_unref (GTK_OBJECT (loader));
-
-	return pixbuf;
-}
-
-NautilusPixbufLoadHandle *
-nautilus_gdk_pixbuf_load_async (const char *uri,
-				NautilusPixbufLoadCallback callback,
-				gpointer callback_data)
-{
-	NautilusPixbufLoadHandle *handle;
-
-	handle = g_new0 (NautilusPixbufLoadHandle, 1);
-	handle->callback = callback;
-	handle->callback_data = callback_data;
-
-	gnome_vfs_async_open (&handle->vfs_handle,
-			      uri,
-			      GNOME_VFS_OPEN_READ,
-			      file_opened_callback,
-			      handle);
-
-	return handle;
-}
-
-static void
-file_opened_callback (GnomeVFSAsyncHandle *vfs_handle,
-		      GnomeVFSResult result,
-		      gpointer callback_data)
-{
-	NautilusPixbufLoadHandle *handle;
-
-	handle = callback_data;
-	g_assert (handle->vfs_handle == vfs_handle);
-
-	if (result != GNOME_VFS_OK) {
-		handle->vfs_handle = NULL;
-		load_done (handle, result, FALSE);
-		return;
-	}
-
-	handle->loader = gdk_pixbuf_loader_new ();
-
-	gnome_vfs_async_read (handle->vfs_handle,
-			      handle->buffer,
-			      sizeof (handle->buffer),
-			      file_read_callback,
-			      handle);
-}
-
-static void
-file_read_callback (GnomeVFSAsyncHandle *vfs_handle,
-		    GnomeVFSResult result,
-		    gpointer buffer,
-		    GnomeVFSFileSize bytes_requested,
-		    GnomeVFSFileSize bytes_read,
-		    gpointer callback_data)
-{
-	NautilusPixbufLoadHandle *handle;
-
-	handle = callback_data;
-	g_assert (handle->vfs_handle == vfs_handle);
-	g_assert (handle->buffer == buffer);
-
-	if (result == GNOME_VFS_OK && bytes_read != 0) {
-		if (!gdk_pixbuf_loader_write (handle->loader,
-					      buffer,
-					      bytes_read)) {
-			result = GNOME_VFS_ERROR_WRONG_FORMAT;
-		}
-		gnome_vfs_async_read (handle->vfs_handle,
-				      handle->buffer,
-				      sizeof (handle->buffer),
-				      file_read_callback,
-				      handle);
-		return;
-	}
-
-	load_done (handle, result, result == GNOME_VFS_OK || result == GNOME_VFS_ERROR_EOF);
-}
-
-static void
-file_closed_callback (GnomeVFSAsyncHandle *handle,
-		      GnomeVFSResult result,
-		      gpointer callback_data)
-{
-	g_assert (callback_data == NULL);
-}
-
-static void
-free_pixbuf_load_handle (NautilusPixbufLoadHandle *handle)
-{
-	if (handle->loader != NULL) {
-		gtk_object_unref (GTK_OBJECT (handle->loader));
-	}
-	g_free (handle);
-}
-
-static void
-load_done (NautilusPixbufLoadHandle *handle, GnomeVFSResult result, gboolean get_pixbuf)
-{
-	GdkPixbuf *pixbuf;
-
-	if (handle->loader != NULL) {
-		gdk_pixbuf_loader_close (handle->loader);
-	}
-
-	pixbuf = get_pixbuf ? gdk_pixbuf_loader_get_pixbuf (handle->loader) : NULL;
-	
-	if (handle->vfs_handle != NULL) {
-		gnome_vfs_async_close (handle->vfs_handle, file_closed_callback, NULL);
-	}
-
-	handle->callback (result, pixbuf, handle->callback_data);
-
-	free_pixbuf_load_handle (handle);
-}
-
-void
-nautilus_cancel_gdk_pixbuf_load (NautilusPixbufLoadHandle *handle)
-{
-	if (handle == NULL) {
-		return;
-	}
-	if (handle->vfs_handle != NULL) {
-		gnome_vfs_async_cancel (handle->vfs_handle);
-	}
-	free_pixbuf_load_handle (handle);
-}
-
-/* return the average value of each component */
-void 
-nautilus_gdk_pixbuf_average_value (GdkPixbuf *pixbuf, GdkColor *color)
-{
-	uint red_total, green_total, blue_total, count;
-	int row, column;
-	int width, height;
-	int row_stride;
-	guchar *pixsrc, *original_pixels;
-	
-	gboolean has_alpha;
-	
-	red_total = 0;
-	green_total = 0;
-	blue_total = 0;
-	count = 0;
-
-	/* iterate through the pixbuf, counting up each component */
-	has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
-	width = gdk_pixbuf_get_width (pixbuf);
-	height = gdk_pixbuf_get_height (pixbuf);
-	row_stride = gdk_pixbuf_get_rowstride (pixbuf);
-	original_pixels = gdk_pixbuf_get_pixels (pixbuf);
-
-	for (row = 0; row < height; row++) {
-		pixsrc = original_pixels + (row * row_stride);
-		for (column = 0; column < width; column++) {
-			red_total += *pixsrc++;
-			green_total += *pixsrc++;
-			blue_total += *pixsrc++;
-			count += 1;
-			if (has_alpha) {
-				pixsrc++;
-			}
-		}
-	}
-
-	color->red =   (red_total   * 256) / count;
-	color->green = (green_total * 256) / count;
-	color->blue =  (blue_total  * 256) / count;
-}
-
-double
-nautilus_gdk_scale_to_fit_factor (int width, int height,
-				  int max_width, int max_height,
-				  int *scaled_width, int *scaled_height)
-{
-	double scale_factor;
-	
-	scale_factor = MIN (max_width  / (double) width, max_height / (double) height);
-
-	*scaled_width  = floor (width * scale_factor + .5);
-	*scaled_height = floor (height * scale_factor + .5);
-
-	return scale_factor;
-}
-
-/* Returns a scaled copy of pixbuf, preserving aspect ratio. The copy will
- * be scaled as large as possible without exceeding the specified width and height.
- */
-GdkPixbuf *
-nautilus_gdk_pixbuf_scale_to_fit (GdkPixbuf *pixbuf, int max_width, int max_height)
-{
-	int scaled_width;
-	int scaled_height;
-
-	nautilus_gdk_scale_to_fit_factor (gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf),
-					  max_width, max_height,
-					  &scaled_width, &scaled_height);
-
-	return gdk_pixbuf_scale_simple (pixbuf, scaled_width, scaled_height, GDK_INTERP_BILINEAR);	
-}
-
-/* Returns a copy of pixbuf scaled down, preserving aspect ratio, to fit
- * within the specified width and height. If it already fits, a copy of
- * the original, without scaling, is returned.
- */
-GdkPixbuf *
-nautilus_gdk_pixbuf_scale_down_to_fit (GdkPixbuf *pixbuf, int max_width, int max_height)
-{
-	int scaled_width;
-	int scaled_height;
-	
-	double scale_factor;
-
-	scale_factor = nautilus_gdk_scale_to_fit_factor (gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf),
-							 max_width, max_height,
-							 &scaled_width, &scaled_height);
-
-	if (scale_factor >= 1.0) {
-		return gdk_pixbuf_copy (pixbuf);
-	} else {				
-		return gdk_pixbuf_scale_simple (pixbuf, scaled_width, scaled_height, GDK_INTERP_BILINEAR);	
-	}
-}
-
-/**
- * nautilus_gdk_pixbuf_is_valid:
- * @pixbuf: A GdkPixbuf
- *
- * Return value: A boolean indicating whether the given pixbuf is valid.
- *
- * A pixbuf is valid if:
- * 
- *   1. It is non NULL
- *   2. It is has non NULL pixel data.
- *   3. It has width and height greater than 0.
- */
-gboolean
-nautilus_gdk_pixbuf_is_valid (const GdkPixbuf *pixbuf)
-{
-	return ((pixbuf != NULL)
-		&& (gdk_pixbuf_get_pixels (pixbuf) != NULL)
-		&& (gdk_pixbuf_get_width (pixbuf) > 0)
-		&& (gdk_pixbuf_get_height (pixbuf) > 0));
-}
-
-/**
- * nautilus_gdk_pixbuf_get_dimensions:
- * @pixbuf: A GdkPixbuf
- *
- * Return value: The dimensions of the pixbuf as a NautilusDimensions.
- *
- * This function is useful in code that uses libart rect 
- * intersection routines.
- */
-NautilusDimensions
-nautilus_gdk_pixbuf_get_dimensions (const GdkPixbuf *pixbuf)
-{
-	NautilusDimensions dimensions;
-
-	g_return_val_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf), NAUTILUS_DIMENSIONS_EMPTY);
-
-	dimensions.width = gdk_pixbuf_get_width (pixbuf);
-	dimensions.height = gdk_pixbuf_get_height (pixbuf);
-
-	return dimensions;
-}
-
-/**
- * nautilus_gdk_pixbuf_fill_rectangle:
- * @pixbuf: Target pixbuf to fill into.
- * @area: Rectangle to fill.
- * @color: The color to use.
- *
- * Fill the rectangle with the the given color.
- * Use the given rectangle if not NULL.
- * If rectangle is NULL, fill the whole pixbuf.
- */
-void
-nautilus_gdk_pixbuf_fill_rectangle_with_color (GdkPixbuf *pixbuf,
-					       const ArtIRect *area,
-					       guint32 color)
-{
-	ArtIRect target;
-	guchar red;
-	guchar green;
-	guchar blue;
-	guchar alpha;
-	guchar *pixels;
-	gboolean has_alpha;
-	guint pixel_offset;
-	guint rowstride;
-	guchar *row_offset;
-	int x;
-	int y;
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-
-	target = nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, area);
-	if (art_irect_empty (&target)) {
-		return;
-	}
-
-	pixels = gdk_pixbuf_get_pixels (pixbuf);
-	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-	has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
-	pixel_offset = has_alpha ? 4 : 3;
-	red = NAUTILUS_RGBA_COLOR_GET_R (color);
-	green = NAUTILUS_RGBA_COLOR_GET_G (color);
-	blue = NAUTILUS_RGBA_COLOR_GET_B (color);
-	alpha = NAUTILUS_RGBA_COLOR_GET_A (color);
-
-	row_offset = pixels + target.y0 * rowstride;
-
-	for (y = target.y0; y < target.y1; y++) {
-		guchar *offset = row_offset + (target.x0 * pixel_offset);
-		
-		for (x = target.x0; x < target.x1; x++) {
-			*(offset++) = red;
-			*(offset++) = green;
-			*(offset++) = blue;
-			
-			if (has_alpha) {
-				*(offset++) = alpha;
-			}
-			
-		}
-
-		row_offset += rowstride;
-	}
-}
-
-/* utility routine for saving a pixbuf to a png file.
- * This was adapted from Iain Holmes' code in gnome-iconedit, and probably
- * should be in a utility library, possibly in gdk-pixbuf itself.
- */
-gboolean
-nautilus_gdk_pixbuf_save_to_file (const GdkPixbuf *pixbuf,
-				  const char *file_name)
-{
-	FILE *handle;
-  	char *buffer;
-	gboolean has_alpha;
-	int width, height, depth, rowstride;
-  	guchar *pixels;
-  	png_structp png_ptr;
-  	png_infop info_ptr;
-  	png_text text[2];
-  	int i;
-
-	g_return_val_if_fail (pixbuf != NULL, FALSE);
-	g_return_val_if_fail (file_name != NULL, FALSE);
-	g_return_val_if_fail (file_name[0] != '\0', FALSE);
-
-        handle = fopen (file_name, "wb");
-        if (handle == NULL) {
-        	return FALSE;
-	}
-
-	png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-	if (png_ptr == NULL) {
-		fclose (handle);
-		return FALSE;
-	}
-
-	info_ptr = png_create_info_struct (png_ptr);
-	if (info_ptr == NULL) {
-		png_destroy_write_struct (&png_ptr, (png_infopp)NULL);
-		fclose (handle);
-	    	return FALSE;
-	}
-
-	if (setjmp (png_ptr->jmpbuf)) {
-		png_destroy_write_struct (&png_ptr, &info_ptr);
-		fclose (handle);
-		return FALSE;
-	}
-
-	png_init_io (png_ptr, handle);
-
-        has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
-	width = gdk_pixbuf_get_width (pixbuf);
-	height = gdk_pixbuf_get_height (pixbuf);
-	depth = gdk_pixbuf_get_bits_per_sample (pixbuf);
-	pixels = gdk_pixbuf_get_pixels (pixbuf);
-	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-
-	png_set_IHDR (png_ptr, info_ptr, width, height,
-			depth, PNG_COLOR_TYPE_RGB_ALPHA,
-			PNG_INTERLACE_NONE,
-			PNG_COMPRESSION_TYPE_DEFAULT,
-			PNG_FILTER_TYPE_DEFAULT);
-
-	/* Some text to go with the png image */
-	text[0].key = "Title";
-	text[0].text = (char *) file_name;
-	text[0].compression = PNG_TEXT_COMPRESSION_NONE;
-	text[1].key = "Software";
-	text[1].text = "Nautilus Thumbnail";
-	text[1].compression = PNG_TEXT_COMPRESSION_NONE;
-	png_set_text (png_ptr, info_ptr, text, 2);
-
-	/* Write header data */
-	png_write_info (png_ptr, info_ptr);
-
-	/* if there is no alpha in the data, allocate buffer to expand into */
-	if (has_alpha) {
-		buffer = NULL;
-	} else {
-		buffer = g_malloc(4 * width);
-	}
-	
-	/* pump the raster data into libpng, one scan line at a time */	
-	for (i = 0; i < height; i++) {
-		if (has_alpha) {
-			png_bytep row_pointer = pixels;
-			png_write_row (png_ptr, row_pointer);
-		} else {
-			/* expand RGB to RGBA using an opaque alpha value */
-			int x;
-			char *buffer_ptr = buffer;
-			char *source_ptr = pixels;
-			for (x = 0; x < width; x++) {
-				*buffer_ptr++ = *source_ptr++;
-				*buffer_ptr++ = *source_ptr++;
-				*buffer_ptr++ = *source_ptr++;
-				*buffer_ptr++ = 255;
-			}
-			png_write_row (png_ptr, (png_bytep) buffer);		
-		}
-		pixels += rowstride;
-	}
-	
-	png_write_end (png_ptr, info_ptr);
-	png_destroy_write_struct (&png_ptr, &info_ptr);
-	
-	g_free (buffer);
-		
-	fclose (handle);
-	return TRUE;
-}
-
-void
-nautilus_gdk_pixbuf_ref_if_not_null (GdkPixbuf *pixbuf_or_null)
-{
-	if (pixbuf_or_null != NULL) {
-		gdk_pixbuf_ref (pixbuf_or_null);
-	}
-}
-
-void
-nautilus_gdk_pixbuf_unref_if_not_null (GdkPixbuf *pixbuf_or_null)
-{
-	if (pixbuf_or_null != NULL) {
-		gdk_pixbuf_unref (pixbuf_or_null);
-	}
-}
-
-void
-nautilus_gdk_pixbuf_draw_to_drawable (const GdkPixbuf *pixbuf,
-				      GdkDrawable *drawable,
-				      GdkGC *gc,
-				      int source_x,
-				      int source_y,
-				      const ArtIRect *destination_area,
-				      GdkRgbDither dither,
-				      GdkPixbufAlphaMode alpha_compositing_mode,
-				      int alpha_threshold)
-{
-	NautilusDimensions dimensions;
-	ArtIRect target;
-	ArtIRect source;
-	int target_width;
-	int target_height;
-	int source_width;
-	int source_height;
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (drawable != NULL);
-	g_return_if_fail (gc != NULL);
-	g_return_if_fail (destination_area != NULL);
- 	g_return_if_fail (destination_area->x1 > destination_area->x0);
- 	g_return_if_fail (destination_area->y1 > destination_area->y0);
- 	g_return_if_fail (alpha_threshold > NAUTILUS_OPACITY_FULLY_TRANSPARENT);
- 	g_return_if_fail (alpha_threshold <= NAUTILUS_OPACITY_FULLY_OPAQUE);
- 	g_return_if_fail (alpha_compositing_mode >= GDK_PIXBUF_ALPHA_BILEVEL);
- 	g_return_if_fail (alpha_compositing_mode <= GDK_PIXBUF_ALPHA_FULL);
-
-	dimensions = nautilus_gdk_pixbuf_get_dimensions (pixbuf);
-	
-	g_return_if_fail (source_x >= 0);
-	g_return_if_fail (source_y >= 0);
-	g_return_if_fail (source_x < dimensions.width);
-	g_return_if_fail (source_y < dimensions.height);
-
-	/* Clip the destination area to the pixbuf dimensions; bail if no work */
-	target = nautilus_gdk_pixbuf_intersect (pixbuf,
-						destination_area->x0,
-						destination_area->y0,
-						destination_area);
-	if (art_irect_empty (&target)) {
-		return;
-	}
-
-	/* Assign the source area */
-	nautilus_art_irect_assign (&source,
-				   source_x,
-				   source_y,
-				   dimensions.width - source_x,
-				   dimensions.height - source_y);
-
-	/* Adjust the target width if the source area is smaller than the
-	 * source pixbuf dimensions */
-	target_width = target.x1 - target.x0;
-	target_height = target.y1 - target.y0;
-	source_width = source.x1 - source.x0;
-	source_height = source.y1 - source.y0;
-
-	target.x1 = target.x0 + MIN (target_width, source_width);
-	target.y1 = target.y0 + MIN (target_height, source_height);
-
-	if (gdk_pixbuf_get_has_alpha (pixbuf)) {
-		gdk_pixbuf_render_to_drawable_alpha ((GdkPixbuf *) pixbuf,
-						     drawable,
-						     source.x0,
-						     source.y0,
-						     target.x0,
-						     target.y0,
-						     target.x1 - target.x0,
-						     target.y1 - target.y0,
-						     alpha_compositing_mode,
-						     alpha_threshold,
-						     dither,
-						     0,
-						     0);
-	} else {
-		gdk_pixbuf_render_to_drawable ((GdkPixbuf *) pixbuf,
-					       drawable,
-					       gc,
-					       source.x0,
-					       source.y0,
-					       target.x0,
-					       target.y0,
-					       target.x1 - target.x0,
-					       target.y1 - target.y0,
-					       dither,
-					       0,
-					       0);
-	}
-}
-
-/**
- * nautilus_gdk_pixbuf_draw_to_pixbuf:
- * @pixbuf: The source pixbuf to draw.
- * @destination_pixbuf: The destination pixbuf.
- * @source_x: The source pixbuf x coordiate to composite from.
- * @source_y: The source pixbuf y coordiate to composite from.
- * @destination_area: The destination area within the destination pixbuf.
- *                    This area will be clipped if invalid in any way.
- *
- * Copy one pixbuf onto another another..  This function has some advantages
- * over plain gdk_pixbuf_copy_area():
- *
- *   Composition paramters (source coordinate, destination area) are
- *   given in a way that is consistent with the rest of the extensions
- *   in this file.  That is, it matches the declaration of
- *   nautilus_gdk_pixbuf_draw_to_pixbuf_alpha() and 
- *   nautilus_gdk_pixbuf_draw_to_drawable() very closely.
- *
- *   All values are clipped to make sure they are valid.
- *
- */
-void
-nautilus_gdk_pixbuf_draw_to_pixbuf (const GdkPixbuf *pixbuf,
-				    GdkPixbuf *destination_pixbuf,
-				    int source_x,
-				    int source_y,
-				    const ArtIRect *destination_area)
-{
-	NautilusDimensions dimensions;
-	ArtIRect target;
-	ArtIRect source;
-	int target_width;
-	int target_height;
-	int source_width;
-	int source_height;
-	
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (destination_pixbuf));
-	g_return_if_fail (destination_area != NULL);
-	g_return_if_fail (destination_area->x1 > destination_area->x0);
-	g_return_if_fail (destination_area->y1 > destination_area->y0);
-	
-	dimensions = nautilus_gdk_pixbuf_get_dimensions (pixbuf);
-
-	g_return_if_fail (source_x >= 0);
-	g_return_if_fail (source_y >= 0);
-	g_return_if_fail (source_x < dimensions.width);
-	g_return_if_fail (source_y < dimensions.height);
-
-	/* Clip the destination area to the pixbuf dimensions; bail if no work */
-	target = nautilus_gdk_pixbuf_intersect (destination_pixbuf, 0, 0, destination_area);
-	if (art_irect_empty (&target)) {
- 		return;
- 	}
-
-	/* Assign the source area */
-	nautilus_art_irect_assign (&source,
-				   source_x,
-				   source_y,
-				   dimensions.width - source_x,
-				   dimensions.height - source_y);
-
-	/* Adjust the target width if the source area is smaller than the
-	 * source pixbuf dimensions */
-	target_width = target.x1 - target.x0;
-	target_height = target.y1 - target.y0;
-	source_width = source.x1 - source.x0;
-	source_height = source.y1 - source.y0;
-
-	target.x1 = target.x0 + MIN (target_width, source_width);
-	target.y1 = target.y0 + MIN (target_height, source_height);
-
-	gdk_pixbuf_copy_area (pixbuf,
-			      source.x0,
-			      source.y0,
-			      target.x1 - target.x0,
-			      target.y1 - target.y0,
-			      destination_pixbuf,
-			      target.x0,
-			      target.y0);
-}
-
-/**
- * nautilus_gdk_pixbuf_draw_to_pixbuf_alpha:
- * @pixbuf: The source pixbuf to draw.
- * @destination_pixbuf: The destination pixbuf.
- * @source_x: The source pixbuf x coordiate to composite from.
- * @source_y: The source pixbuf y coordiate to composite from.
- * @destination_area: The destination area within the destination pixbuf.
- *                    This area will be clipped if invalid in any way.
- * @opacity: The opacity of the drawn tiles where 0 <= opacity <= 255.
- * @interpolation_mode: The interpolation mode.  See <gdk-pixbuf.h>
- *
- * Composite one pixbuf over another.  This function has some advantages
- * over plain gdk_pixbuf_composite():
- *
- *   Composition paramters (source coordinate, destination area) are
- *   given in a way that is consistent with the rest of the extensions
- *   in this file.  That is, it matches the declaration of
- *   nautilus_gdk_pixbuf_draw_to_pixbuf() and 
- *   nautilus_gdk_pixbuf_draw_to_drawable() very closely.
- *
- *   All values are clipped to make sure they are valid.
- *
- *   Workaround a limitation in gdk_pixbuf_composite() that does not allow
- *   the source (x,y) to be greater than (0,0)
- * 
- */
-void
-nautilus_gdk_pixbuf_draw_to_pixbuf_alpha (const GdkPixbuf *pixbuf,
-					  GdkPixbuf *destination_pixbuf,
-					  int source_x,
-					  int source_y,
-					  const ArtIRect *destination_area,
-					  int opacity,
-					  GdkInterpType interpolation_mode)
-{
-	NautilusDimensions dimensions;
-	ArtIRect target;
-	ArtIRect source;
-	int target_width;
-	int target_height;
-	int source_width;
-	int source_height;
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (destination_pixbuf));
-	g_return_if_fail (destination_area != NULL);
-	g_return_if_fail (destination_area->x1 > destination_area->x0);
-	g_return_if_fail (destination_area->y1 > destination_area->y0);
-	g_return_if_fail (opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-	g_return_if_fail (interpolation_mode >= GDK_INTERP_NEAREST);
-	g_return_if_fail (interpolation_mode <= GDK_INTERP_HYPER);
-	
-	dimensions = nautilus_gdk_pixbuf_get_dimensions (pixbuf);
-
-	g_return_if_fail (source_x >= 0);
-	g_return_if_fail (source_y >= 0);
-	g_return_if_fail (source_x < dimensions.width);
-	g_return_if_fail (source_y < dimensions.height);
-
-	/* Clip the destination area to the pixbuf dimensions; bail if no work */
-	/* Clip the destination area to the pixbuf dimensions; bail if no work */
-	target = nautilus_gdk_pixbuf_intersect (destination_pixbuf, 0, 0, destination_area);
-	if (art_irect_empty (&target)) {
- 		return;
- 	}
-
-	/* Assign the source area */
-	nautilus_art_irect_assign (&source,
-				   source_x,
-				   source_y,
-				   dimensions.width - source_x,
-				   dimensions.height - source_y);
-	
-	/* Adjust the target width if the source area is smaller than the
-	 * source pixbuf dimensions */
-	target_width = target.x1 - target.x0;
-	target_height = target.y1 - target.y0;
-	source_width = source.x1 - source.x0;
-	source_height = source.y1 - source.y0;
-
-	target.x1 = target.x0 + MIN (target_width, source_width);
-	target.y1 = target.y0 + MIN (target_height, source_height);
-	
-	/* If the source point is not (0,0), then we need to create a sub pixbuf
-	 * with only the source area.  This is needed to work around a limitation
-	 * in gdk_pixbuf_composite() that requires the source area to be (0,0). */
-	if (source.x0 != 0 || source.y0 != 0) {
-		ArtIRect area;
-		int width;
-		int height;
-
-		width = dimensions.width - source.x0;
-		height = dimensions.height - source.y0;
-		
-		area.x0 = source.x0;
-		area.y0 = source.y0;
-		area.x1 = area.x0 + width;
-		area.y1 = area.y0 + height;
-		
-		pixbuf = nautilus_gdk_pixbuf_new_from_pixbuf_sub_area ((GdkPixbuf *) pixbuf, &area);
-	} else {
-		gdk_pixbuf_ref ((GdkPixbuf *) pixbuf);
-	}
-	
-	gdk_pixbuf_composite (pixbuf,
-			      destination_pixbuf,
-			      target.x0,
-			      target.y0,
-			      target.x1 - target.x0,
-			      target.y1 - target.y0,
-			      target.x0,
-			      target.y0,
-			      1.0,
-			      1.0,
-			      interpolation_mode,
-			      opacity);
-
-	gdk_pixbuf_unref ((GdkPixbuf *) pixbuf);
-}
-
-static void
-pixbuf_destroy_callback (guchar *pixels,
-			 gpointer callback_data)
-{
-	g_return_if_fail (pixels != NULL);
-	g_return_if_fail (callback_data != NULL);
-
-	gdk_pixbuf_unref ((GdkPixbuf *) callback_data);
-}
-
-/**
- * nautilus_gdk_pixbuf_new_from_pixbuf_sub_area:
- * @pixbuf: The source pixbuf.
- * @area: The area within the source pixbuf to use for the sub pixbuf.
- *        This area needs to be contained within the bounds of the 
- *        source pixbuf, otherwise it will be clipped to that. 
- *
- * Return value: A newly allocated pixbuf that shares the pixel data
- *               of the source pixbuf in order to represent a sub area.
- *
- * Create a pixbuf from a sub area of another pixbuf.  The resulting pixbuf
- * will share the pixel data of the source pixbuf.  Memory bookeeping is
- * all taken care for the caller.  All you need to do is gdk_pixbuf_unref()
- * the resulting pixbuf to properly free resources.
- */
-GdkPixbuf *
-nautilus_gdk_pixbuf_new_from_pixbuf_sub_area (GdkPixbuf *pixbuf,
-					      const ArtIRect *area)
-{
-	GdkPixbuf *sub_pixbuf;
-	ArtIRect target;
-	guchar *pixels;
-	
-	g_return_val_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf), NULL);
-	g_return_val_if_fail (area != NULL, NULL);
-	g_return_val_if_fail (area->x1 > area->x0, NULL);
-	g_return_val_if_fail (area->y1 > area->y0, NULL);
-	
-	/* Clip the pixbuf by the given area; bail if no work */
-	target = nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, area);
-	if (art_irect_empty (&target)) {
- 		return NULL;
- 	}
-
-	/* Since we are going to be sharing the given pixbuf's data, we need 
-	 * to ref it.  It will be unreffed in the destroy function above */
-	gdk_pixbuf_ref (pixbuf);
-
-	/* Compute the offset into the pixel data */
-	pixels = 
-		gdk_pixbuf_get_pixels (pixbuf)
-		+ (target.y0 * gdk_pixbuf_get_rowstride (pixbuf))
-		+ (target.x0 * (gdk_pixbuf_get_has_alpha (pixbuf) ? 4 : 3));
-	
-	/* Make a pixbuf pretending its real estate is the sub area */
-	sub_pixbuf = gdk_pixbuf_new_from_data (pixels,
-					       GDK_COLORSPACE_RGB,
-					       gdk_pixbuf_get_has_alpha (pixbuf),
-					       8,
-					       nautilus_art_irect_get_width (&target),
-					       nautilus_art_irect_get_height (&target),
-					       gdk_pixbuf_get_rowstride (pixbuf),
-					       pixbuf_destroy_callback,
-					       pixbuf);
-
-	return sub_pixbuf;
-}
-
-/**
- * nautilus_gdk_pixbuf_new_from_existing_buffer:
- * @buffer: The existing buffer.
- * @buffer_rowstride: The existing buffer's rowstride.
- * @buffer_has_alpha: A boolean value indicating whether the buffer has alpha.
- * @area: The area within the existing buffer to use for the pixbuf.
- *        This area needs to be contained within the bounds of the 
- *        buffer, otherwise memory will be trashed.
- *
- * Return value: A newly allocated pixbuf that uses the existing buffer
- *               for its pixel data.
- *
- * Create a pixbuf from an existing buffer.
- *
- * The resulting pixbuf is only valid for as long as &buffer is valid.  It is
- * up to the caller to make sure they both exist in the same scope.
- * Also, it is up to the caller to make sure that the given area is fully 
- * contained in the buffer, otherwise memory trashing will happen.
- */
-GdkPixbuf *
-nautilus_gdk_pixbuf_new_from_existing_buffer (guchar *buffer,
-					      int buffer_rowstride,
-					      gboolean buffer_has_alpha,
-					      const ArtIRect *area)
-{
-	GdkPixbuf *pixbuf;
-	guchar *pixels;
-	
-	g_return_val_if_fail (buffer != NULL, NULL);
-	g_return_val_if_fail (buffer_rowstride > 0, NULL);
-	g_return_val_if_fail (area != NULL, NULL);
-	g_return_val_if_fail (area->x1 > area->x0, NULL);
-	g_return_val_if_fail (area->y1 > area->y0, NULL);
-	
-	/* Compute the offset into the buffer */
-	pixels = 
-		buffer
-		+ (area->y0 * buffer_rowstride)
-		+ (area->x0 * (buffer_has_alpha ? 4 : 3));
-	
-	pixbuf = gdk_pixbuf_new_from_data (pixels,
-					   GDK_COLORSPACE_RGB,
-					   buffer_has_alpha,
-					   8,
-					   nautilus_art_irect_get_width (area),
-					   nautilus_art_irect_get_height (area),
-					   buffer_rowstride,
-					   NULL,
-					   NULL);
-
-	return pixbuf;
-}
-
-/* The tile algorithm is identical whether the destination is 
- * a pixbuf or a drawable.  So, we use a simple callback
- * mechanism to share it regardless of the destination.
- */
-typedef struct {
-	GdkPixbuf *destination_pixbuf;
-	int opacity;
-	GdkInterpType interpolation_mode;
-} PixbufTileData;
-
-typedef struct {
-	GdkDrawable *drawable;
-	GdkGC *gc;
-	GdkRgbDither dither;
-	GdkPixbufAlphaMode alpha_compositing_mode;
-	int alpha_threshold;
-} DrawableTileData;
-
-typedef void (* DrawPixbufTileCallback) (const GdkPixbuf *pixbuf,
-					 int x,
-					 int y,
-					 const ArtIRect *destination_area,
-					 gpointer callback_data);
-
-/* The shared tiliing implementation */
-static void
-pixbuf_draw_tiled (const GdkPixbuf *pixbuf,
-		   const NautilusDimensions *destination_dimensions,
-		   const ArtIRect *destination_area,
-		   int tile_width,
-		   int tile_height,
-		   int tile_origin_x,
-		   int tile_origin_y,
-		   DrawPixbufTileCallback callback,
-		   gpointer callback_data)
-{
-	ArtIRect target;
-	int x;
-	int y;
-	NautilusArtIPoint min_point;
-	NautilusArtIPoint max_point;
-	int num_left;
-	int num_above;
-
-	g_return_if_fail (pixbuf != NULL);
-	g_return_if_fail (destination_dimensions != NULL);
-	g_return_if_fail (tile_width > 0);
-	g_return_if_fail (tile_height > 0);
-	g_return_if_fail (tile_width <= gdk_pixbuf_get_width (pixbuf));
-	g_return_if_fail (tile_height <= gdk_pixbuf_get_height (pixbuf));
-	g_return_if_fail (callback != NULL);
-
-	/* FIXME: This is confusing.  Instead of passing in the destination_dimensions
-	 *        I should just pass in the destination pixbuf, so that we can use
-	 *        nautilus_gdk_pixbuf_intersect directly on that.
-	 */
-
-	/* Clip the destination area to the destination pixbuf; bail if no work */
-	if (destination_area != NULL) {
-		ArtIRect tmp;
-
-		tmp = nautilus_art_irect_assign_dimensions (0, 0, destination_dimensions);
-		art_irect_intersect (&target, destination_area, &tmp);
-		
-		if (art_irect_empty (&target)) {
-			return;
-		}
-	} else {
-		target = nautilus_art_irect_assign_dimensions (0, 0, destination_dimensions);
-	}
-
-	/* The number of tiles left and above the target area */
-	num_left = (target.x0 - tile_origin_x) / tile_width;
-	num_above = (target.y0 - tile_origin_y) / tile_height;
-	
-	min_point.x = tile_origin_x - tile_width + (num_left * tile_width);
-	min_point.y = tile_origin_y - tile_height + (num_above * tile_height);
-	
-	max_point.x = (target.x1 + 2 * tile_width);
-	max_point.y = (target.y1 + 2 * tile_height);
-	
-	for (y = min_point.y; y <= max_point.y; y += tile_height) {
-		for (x = min_point.x; x <= max_point.x; x += tile_width) {
-			ArtIRect current;
-			ArtIRect area;
-
-			nautilus_art_irect_assign (&current, x, y, tile_width, tile_height);
-
-			/* FIXME: A potential speed improvement here would be to clip only the
-			 * first and last rectangles, not the ones in between.  
-			 */
-			art_irect_intersect (&area, &target, &current);
-
-			if (!art_irect_empty (&area)) {
-				g_assert (area.x0 >= x);
-				g_assert (area.y0 >= y);
-
-				(* callback) (pixbuf,
-					      area.x0 - x,
-					      area.y0 - y,
-					      &area,
-					      callback_data);
-			}
-		}
-	}
-}
-
-static void
-draw_tile_to_pixbuf_callback (const GdkPixbuf *pixbuf,
-			      int x,
-			      int y,
-			      const ArtIRect *area,
-			      gpointer callback_data)
-{
-	PixbufTileData *pixbuf_tile_data;
-
-	g_return_if_fail (pixbuf != NULL);
-	g_return_if_fail (area != NULL);
-	g_return_if_fail (callback_data != NULL);
-
-	pixbuf_tile_data = (PixbufTileData *) callback_data;
-
-	if (pixbuf_tile_data->opacity == NAUTILUS_OPACITY_FULLY_TRANSPARENT) {
-		nautilus_gdk_pixbuf_draw_to_pixbuf (pixbuf,
-						    pixbuf_tile_data->destination_pixbuf,
-						    x,
-						    y,
-						    area);
-	} else {
-		nautilus_gdk_pixbuf_draw_to_pixbuf_alpha (pixbuf,
-							  pixbuf_tile_data->destination_pixbuf,
-							  x,
-							  y,
-							  area,
-							  pixbuf_tile_data->opacity,
-							  pixbuf_tile_data->interpolation_mode);
-	}
-}
-
-static void
-draw_tile_to_drawable_callback (const GdkPixbuf *pixbuf,
-				int x,
-				int y,
-				const ArtIRect *area,
-				gpointer callback_data)
-{
-	DrawableTileData *drawable_tile_data;
-	
-	g_return_if_fail (pixbuf != NULL);
-	g_return_if_fail (area != NULL);
-	g_return_if_fail (callback_data != NULL);
-
-	drawable_tile_data = (DrawableTileData *) callback_data;
-
-	nautilus_gdk_pixbuf_draw_to_drawable (pixbuf,
-					      drawable_tile_data->drawable,
-					      drawable_tile_data->gc,
-					      x,
-					      y,
-					      area,
-					      drawable_tile_data->dither,
-					      drawable_tile_data->alpha_compositing_mode,
-					      drawable_tile_data->alpha_threshold);
-}
-
-/**
- * nautilus_gdk_pixbuf_draw_to_pixbuf_tiled:
- * @pixbuf: Source tile pixbuf.
- * @destination_pixbuf: Destination pixbuf.
- * @destination_area: Area of the destination pixbuf to tile.
- * @tile_width: Width of the tile.  This can be less than width of the
- *              tile pixbuf, but not greater.
- * @tile_height: Height of the tile.  This can be less than width of the
- *               tile pixbuf, but not greater.
- * @tile_origin_x: The x coordinate of the tile origin.  Can be negative.
- * @tile_origin_y: The y coordinate of the tile origin.  Can be negative.
- * @opacity: The opacity of the drawn tiles where 0 <= opacity <= 255.
- * @interpolation_mode: The interpolation mode.  See <gdk-pixbuf.h>
- *
- * Fill an area of a GdkPixbuf with a tile.
- */
-void
-nautilus_gdk_pixbuf_draw_to_pixbuf_tiled (const GdkPixbuf *pixbuf,
-					  GdkPixbuf *destination_pixbuf,
-					  const ArtIRect *destination_area,
-					  int tile_width,
-					  int tile_height,
-					  int tile_origin_x,
-					  int tile_origin_y,
-					  int opacity,
-					  GdkInterpType interpolation_mode)
-{
-	PixbufTileData pixbuf_tile_data;
-	NautilusDimensions destination_dimensions;
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (destination_pixbuf));
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (tile_width > 0);
-	g_return_if_fail (tile_height > 0);
-	g_return_if_fail (tile_width <= gdk_pixbuf_get_width (pixbuf));
-	g_return_if_fail (tile_height <= gdk_pixbuf_get_height (pixbuf));
-	g_return_if_fail (opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-	g_return_if_fail (interpolation_mode >= GDK_INTERP_NEAREST);
-	g_return_if_fail (interpolation_mode <= GDK_INTERP_HYPER);
-
-	destination_dimensions = nautilus_gdk_pixbuf_get_dimensions (destination_pixbuf);
-
-	pixbuf_tile_data.destination_pixbuf = destination_pixbuf;
-	pixbuf_tile_data.opacity = opacity;
-	pixbuf_tile_data.interpolation_mode = interpolation_mode;
-
-	pixbuf_draw_tiled (pixbuf,
-			   &destination_dimensions,
-			   destination_area,
-			   tile_width,
-			   tile_height,
-			   tile_origin_x,
-			   tile_origin_y,
-			   draw_tile_to_pixbuf_callback,
-			   &pixbuf_tile_data);
-}
-
-/**
- * nautilus_gdk_pixbuf_draw_to_drawable_tiled:
- * @pixbuf: Source tile pixbuf.
- * @gc: GC for copy area operation.
- * @drawable: Destination drawable.
- * @destination_area: Area of the destination pixbuf to tile.
- * @tile_width: Width of the tile.  This can be less than width of the
- *              tile pixbuf, but not greater.
- * @tile_height: Height of the tile.  This can be less than width of the
- *               tile pixbuf, but not greater.
- * @tile_origin_x: The x coordinate of the tile origin.  Can be negative.
- * @tile_origin_y: The y coordinate of the tile origin.  Can be negative.
- * @dither: Dither type to use (see <gdkrgb.h>)
- * @dither: Dither type to use (see <gdkrgb.h>)
- * @alpha_compositing_mode: The alpha compositing mode.  See <gdk-pixbuf.h>
- *
- * Fill an area of a GdkDrawable with a tile.
- */
-void
-nautilus_gdk_pixbuf_draw_to_drawable_tiled (const GdkPixbuf *pixbuf,
-					    GdkDrawable *drawable,
-					    GdkGC *gc,
-					    const ArtIRect *destination_area,
-					    int tile_width,
-					    int tile_height,
-					    int tile_origin_x,
-					    int tile_origin_y,
-					    GdkRgbDither dither,
-					    GdkPixbufAlphaMode alpha_compositing_mode,
-					    int alpha_threshold)
-{
-	DrawableTileData drawable_tile_data;
-	NautilusDimensions destination_dimensions;
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (drawable != NULL);
-	g_return_if_fail (tile_width > 0);
-	g_return_if_fail (tile_height > 0);
-	g_return_if_fail (tile_width <= gdk_pixbuf_get_width (pixbuf));
-	g_return_if_fail (tile_height <= gdk_pixbuf_get_height (pixbuf));
- 	g_return_if_fail (alpha_threshold > NAUTILUS_OPACITY_FULLY_TRANSPARENT);
- 	g_return_if_fail (alpha_threshold <= NAUTILUS_OPACITY_FULLY_OPAQUE);
- 	g_return_if_fail (alpha_compositing_mode >= GDK_PIXBUF_ALPHA_BILEVEL);
- 	g_return_if_fail (alpha_compositing_mode <= GDK_PIXBUF_ALPHA_FULL);
-
-	destination_dimensions = nautilus_gdk_window_get_dimensions (drawable);
-	
-	drawable_tile_data.drawable = drawable;
-	drawable_tile_data.gc = gc;
-	drawable_tile_data.dither = dither;
-	drawable_tile_data.alpha_compositing_mode = alpha_compositing_mode;
-	drawable_tile_data.alpha_threshold = alpha_threshold;
-	
-	pixbuf_draw_tiled (pixbuf,
-			   &destination_dimensions,
-			   destination_area,
-			   tile_width,
-			   tile_height,
-			   tile_origin_x,
-			   tile_origin_y,
-			   draw_tile_to_drawable_callback,
-			   &drawable_tile_data);
-}
-
-/**
- * nautilus_gdk_pixbuf_get_global_buffer:
- * @minimum_width: The minimum width for the requested buffer.
- * @minimum_height: The minimum height for the requested buffer.
- *
- * Return value: A GdkPixbuf that is at least as big as the passed in 
- *               dimensions.
- *
- * Access a global buffer for temporary GdkPixbuf operations.  
- * The returned buffer will be at least as big as the passed in 
- * dimensions.  The contents are not guaranteed to be anything at
- * anytime.  Also, it is not thread safe at all. */
-
-static GdkPixbuf *global_buffer = NULL;
-
-static void
-destroy_global_buffer (void)
-{
-	if (global_buffer != NULL) {
-		gdk_pixbuf_unref (global_buffer);
-		global_buffer = NULL;
-	}
-}
-
-GdkPixbuf *
-nautilus_gdk_pixbuf_get_global_buffer (int minimum_width,
-				       int minimum_height)
-{
-	static gboolean at_exit_deallocator_installed = FALSE;
-
-	g_return_val_if_fail (minimum_width > 0, NULL);
-	g_return_val_if_fail (minimum_height > 0, NULL);
-
-	if (global_buffer != NULL) {
-		if (gdk_pixbuf_get_width (global_buffer) >= minimum_width
-		    && gdk_pixbuf_get_height (global_buffer) >= minimum_height) {
-			return global_buffer;
-		}
-
-		destroy_global_buffer ();		
-	}
-
-	g_assert (global_buffer == NULL);
-
-	global_buffer = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 
-					minimum_width, minimum_height);
-
-
-	if (at_exit_deallocator_installed == FALSE) {
-		at_exit_deallocator_installed = TRUE;
-		g_atexit (destroy_global_buffer);
-	}
-
-	return global_buffer;
-}
-
-/* Same as gdk_pixbuf_get_from_drawable() except it deals with 
- * race conditions and other evil things that can happen */
-GdkPixbuf *
-nautilus_gdk_pixbuf_get_from_window_safe (GdkWindow *window,
-					  int x,
-					  int y,
-					  int width,
-					  int height)
-{
-	GdkWindowPrivate *window_private;
-	GdkPixbuf *pixbuf;
-	int error_code;
-	GdkWindowType save_window_type;
-	GdkColormap *colormap;
-
-	g_return_val_if_fail (window != NULL, NULL);
-
-
-	/* Push an error handler so that we can catch
-	 * the very rare (but possible) case where 
-	 * the GetImage() request fails.  See HACK2 below
-	 * for a more complete excuse.
-	 */
-	gdk_error_trap_push ();
-
-	/* Save the window type and colormap.  Otherwise
-	 * GdkPixbuf will try to fetch them from a hacked
-	 * window.  See HACK1 below for reason why we
-	 * hack the private window contents.
-	 */
-	save_window_type = gdk_window_get_type (window);
-	colormap = gdk_window_get_colormap (window);
-
-	/* HACK1:
-	 *
-	 * This horrible thing we do here is needed to
-	 * prevent GdkPixbuf from doing geometry sanity
-	 * checks on the window.  By pretending it
-	 * is a Pixmap, we fool GdkPixbuf into not doing
-	 * these checks.  
-	 *
-	 * Why ? The sanity checks that GdkPixbuf does
-	 * are good most of the time, but not 100% of 
-	 * the time.  This is because there is no guarantee
-	 * that when the x server gets the GetImage request,
-	 * the geometry of that window is what GdkPixbuf
-	 * thought it was.
-	 *
-	 * For example, the window manager could have triggered
-	 * a sequence of events causing the window to resize.
-	 */
-	window_private = (GdkWindowPrivate*) window;
-	window_private->window_type = GDK_WINDOW_PIXMAP;
-
-	pixbuf = gdk_pixbuf_get_from_drawable (NULL,
-					       window,
-					       colormap,
-					       x,
-					       y,
-					       0,
-					       0,
-					       width,
-					       height);
-
-	/* Restore the window's guts */
-	window_private->window_type = save_window_type;
-		
-	/* HACK2:
-	 *
-	 * Now we pop the error handler and see whether an error
-	 * occured.
-	 * 
-	 * It is very rare that an error might occur.  The conditions
-	 * under which it might are:
-	 *
-	 * 1) Race condition as described above in HACK1
-	 *
-	 * 2) Bogus coordinates and/or dimensions given to
-	 *    the GetImage() request - which GdkPixbuf cant
-	 *    safely sanity check against.
-	 *
-	 * So, if we get an error, we simply drop this request on
-	 * the floor and return NULL.  The caller needs to deal with
-	 * the fact that their request couldnt be executed.  Most of
-	 * the time, all that is needed is to simply ignore it.
-	 */
-	error_code = gdk_error_trap_pop ();
-	
-	if (error_code != 0) {
-		/* HACK3:
-		 *
-		 * The magical number "8" is the minor x error request
-		 * code.  That is the only error we are expecting.
-		 *
-		 * Otherwise we still return NULL, but the caller
-		 * gets a critical.
-		 */
-		g_return_val_if_fail (error_code == 8, NULL);
-
-		return NULL;
-	}
-
-	return pixbuf;
-}
-
-/**
- * nautilus_gdk_pixbuf_intersect:
- * @pixbuf: A GdkPixbuf.
- * @pixbuf_x: X coordinate of pixbuf.
- * @pixbuf_y: Y coordinate of pixbuf.
- * @rectangle: An ArtIRect or NULL.
- *
- * Return value: The intersection of the pixbuf and the given rectangle.
- *
- * If &rectangle is NULL, then the resulting rectangle is a rectangle at
- * the given orign with the pixbuf's dimensions.
- *
- */
-ArtIRect
-nautilus_gdk_pixbuf_intersect (const GdkPixbuf *pixbuf,
-			       int pixbuf_x,
-			       int pixbuf_y,
-			       const ArtIRect *rectangle)
-{
-	ArtIRect intersection;
-	ArtIRect bounds;
-	NautilusDimensions dimensions;
-
-	g_return_val_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf), NAUTILUS_ART_IRECT_EMPTY);
-
-	dimensions = nautilus_gdk_pixbuf_get_dimensions (pixbuf);
-	bounds = nautilus_art_irect_assign_dimensions (pixbuf_x, pixbuf_y, &dimensions);
-
-	if (rectangle == NULL) {
-		return bounds;
-	}
-
-	art_irect_intersect (&intersection, rectangle, &bounds);
-
-	/* In theory, this is not needed because a rectangle is empty
-	 * regardless of how MUCH negative the dimensions are.  
-	 * However, to make debugging and self checks simpler, we
-	 * consistenly return a standard empty rectangle.
-	 */
-	if (art_irect_empty (&intersection)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	return intersection;
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-void
-nautilus_self_check_gdk_pixbuf_extensions (void)
-{
-	GdkPixbuf *pixbuf;
-	ArtIRect clip_area;
-
-	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 100, 100);
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_gdk_pixbuf_is_valid (pixbuf), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_gdk_pixbuf_is_valid (NULL), FALSE);
-
-	NAUTILUS_CHECK_DIMENSIONS_RESULT (nautilus_gdk_pixbuf_get_dimensions (pixbuf), 100, 100);
-
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, NULL), 0, 0, 100, 100);
-
-	nautilus_art_irect_assign (&clip_area, 0, 0, 0, 0);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 0, 0);
-
-	nautilus_art_irect_assign (&clip_area, 0, 0, 0, 0);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 0, 0);
-
-	nautilus_art_irect_assign (&clip_area, 0, 0, 100, 100);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 100, 100);
-
-	nautilus_art_irect_assign (&clip_area, -10, -10, 100, 100);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 90, 90);
-
-	nautilus_art_irect_assign (&clip_area, -10, -10, 110, 110);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 100, 100);
-
-	nautilus_art_irect_assign (&clip_area, 0, 0, 99, 99);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 99, 99);
-
-	nautilus_art_irect_assign (&clip_area, 0, 0, 1, 1);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 1, 1);
-
-	nautilus_art_irect_assign (&clip_area, -1, -1, 1, 1);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 0, 0);
-
-	nautilus_art_irect_assign (&clip_area, -1, -1, 2, 2);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 1, 1);
-
-	nautilus_art_irect_assign (&clip_area, 100, 100, 1, 1);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 0, 0);
-
-	nautilus_art_irect_assign (&clip_area, 101, 101, 1, 1);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 0, 0);
-
-	nautilus_art_irect_assign (&clip_area, 80, 0, 100, 100);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 80, 0, 100, 100);
-
-	gdk_pixbuf_unref (pixbuf);
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h b/libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h
deleted file mode 100644
index 8106c74bc..000000000
--- a/libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gdk-pixbuf-extensions.h: Routines to augment what's in gdk-pixbuf.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_GDK_PIXBUF_EXTENSIONS_H
-#define NAUTILUS_GDK_PIXBUF_EXTENSIONS_H
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnomevfs/gnome-vfs-types.h>
-#include <libnautilus-extensions/nautilus-art-extensions.h>
-
-#define NAUTILUS_STANDARD_ALPHA_THRESHHOLD 128
-#define NAUTILUS_OPACITY_FULLY_TRANSPARENT 0
-#define NAUTILUS_OPACITY_FULLY_OPAQUE	   255
-
-typedef struct NautilusPixbufLoadHandle NautilusPixbufLoadHandle;
-typedef void (* NautilusPixbufLoadCallback) (GnomeVFSResult  error,
-					     GdkPixbuf      *pixbuf,
-					     gpointer        callback_data);
-
-/* Convenience functions for lists of GdkPixbuf objects. */
-void                      nautilus_gdk_pixbuf_list_ref                  (GList                      *pixbuf_list);
-void                      nautilus_gdk_pixbuf_list_unref                (GList                      *pixbuf_list);
-void                      nautilus_gdk_pixbuf_list_free                 (GList                      *pixbuf_list);
-
-
-/* Loading a GdkPixbuf with a URI. */
-GdkPixbuf *               nautilus_gdk_pixbuf_load                      (const char                 *uri);
-
-
-/* Same thing async. */
-NautilusPixbufLoadHandle *nautilus_gdk_pixbuf_load_async                (const char                 *uri,
-									 NautilusPixbufLoadCallback  callback,
-									 gpointer                    callback_data);
-void                      nautilus_cancel_gdk_pixbuf_load               (NautilusPixbufLoadHandle   *handle);
-GdkPixbuf *               nautilus_gdk_pixbuf_scale_down_to_fit         (GdkPixbuf                  *pixbuf,
-									 int                         max_width,
-									 int                         max_height);
-GdkPixbuf *               nautilus_gdk_pixbuf_scale_to_fit              (GdkPixbuf                  *pixbuf,
-									 int                         max_width,
-									 int                         max_height);
-double                    nautilus_gdk_scale_to_fit_factor              (int                         width,
-									 int                         height,
-									 int                         max_width,
-									 int                         max_height,
-									 int                        *scaled_width,
-									 int                        *scaled_height);
-
-
-/* return average color values for each component */
-void                      nautilus_gdk_pixbuf_average_value             (GdkPixbuf                  *pixbuf,
-									 GdkColor                   *result_color);
-void                      nautilus_gdk_pixbuf_fill_rectangle_with_color (GdkPixbuf                  *pixbuf,
-									 const ArtIRect             *area,
-									 guint32                     color);
-
-
-/* Save a pixbuf to a png file.  Return value indicates succss/TRUE or failure/FALSE */
-gboolean                  nautilus_gdk_pixbuf_save_to_file              (const GdkPixbuf            *pixbuf,
-									 const char                 *file_name);
-void                      nautilus_gdk_pixbuf_ref_if_not_null           (GdkPixbuf                  *pixbuf_or_null);
-void                      nautilus_gdk_pixbuf_unref_if_not_null         (GdkPixbuf                  *pixbuf_or_null);
-
-
-/* Copy a pixbuf to an area of a GdkDrawable */
-void                      nautilus_gdk_pixbuf_draw_to_drawable          (const GdkPixbuf            *pixbuf,
-									 GdkDrawable                *drawable,
-									 GdkGC                      *gc,
-									 int                         source_x,
-									 int                         source_y,
-									 const ArtIRect             *destination_area,
-									 GdkRgbDither                dither,
-									 GdkPixbufAlphaMode          alpha_compositing_mode,
-									 int                         alpha_threshold);
-
-/* Copy a pixbuf to an area of another pixbuf */
-void                      nautilus_gdk_pixbuf_draw_to_pixbuf            (const GdkPixbuf            *pixbuf,
-									 GdkPixbuf                  *destination_pixbuf,
-									 int                         source_x,
-									 int                         source_y,
-									 const ArtIRect             *destination_area);
-
-
-/* Composite one pixbuf over another with the given opacity */
-void                      nautilus_gdk_pixbuf_draw_to_pixbuf_alpha      (const GdkPixbuf            *pixbuf,
-									 GdkPixbuf                  *destination_pixbuf,
-									 int                         source_x,
-									 int                         source_y,
-									 const ArtIRect             *destination_area,
-									 int                         opacity,
-									 GdkInterpType               interpolation_mode);
-
-
-/* Fill an area of a pixbuf with a tile. */
-void                      nautilus_gdk_pixbuf_draw_to_pixbuf_tiled      (const GdkPixbuf            *pixbuf,
-									 GdkPixbuf                  *destination_pixbuf,
-									 const ArtIRect             *destination_area,
-									 int                         tile_width,
-									 int                         tile_height,
-									 int                         tile_origin_x,
-									 int                         tile_origin_y,
-									 int                         opacity,
-									 GdkInterpType               interpolation_mode);
-
-/* Fill an area of a drawable with a tile. */
-void                      nautilus_gdk_pixbuf_draw_to_drawable_tiled    (const GdkPixbuf            *pixbuf,
-									 GdkDrawable                *drawable,
-									 GdkGC                      *gc,
-									 const ArtIRect             *destination_area,
-									 int                         tile_width,
-									 int                         tile_height,
-									 int                         tile_origin_x,
-									 int                         tile_origin_y,
-									 GdkRgbDither                dither,
-									 GdkPixbufAlphaMode          alpha_compositing_mode,
-									 int                         alpha_threshold);
-
-/* Create a pixbuf from a sub area of another pixbuf */
-GdkPixbuf *               nautilus_gdk_pixbuf_new_from_pixbuf_sub_area  (GdkPixbuf                  *pixbuf,
-									 const ArtIRect             *area);
-/* Create a pixbuf from an existing buffer. */
-GdkPixbuf *               nautilus_gdk_pixbuf_new_from_existing_buffer  (guchar                     *buffer,
-									 int                         buffer_rowstride,
-									 gboolean                    buffer_has_alpha,
-									 const ArtIRect             *area);
-
-/* Access a global buffer for temporary GdkPixbuf operations.  
- * The returned buffer will be at least as big as the passed in 
- * dimensions.  The contents are not guaranteed to be anything at
- * anytime.  Also, it is not thread safe at all.
- */
-GdkPixbuf *               nautilus_gdk_pixbuf_get_global_buffer         (int                         minimum_width,
-									 int                         minimum_height);
-
-/* Same as gdk_pixbuf_get_from_drawable() except it deals with 
- * race conditions and other evil things that can happen */
-GdkPixbuf *               nautilus_gdk_pixbuf_get_from_window_safe      (GdkWindow                  *window,
-									 int                         x,
-									 int                         y,
-									 int                         width,
-									 int                         height);
-/* Determine whether a pixbuf is valid or not */
-gboolean                  nautilus_gdk_pixbuf_is_valid                  (const GdkPixbuf            *pixbuf);
-
-/* Access the dimensions of a pixbuf. */
-NautilusDimensions        nautilus_gdk_pixbuf_get_dimensions            (const GdkPixbuf            *pixbuf);
-
-/* Return the intersection of the pixbuf with the given rectangle. */
-ArtIRect                  nautilus_gdk_pixbuf_intersect                 (const GdkPixbuf            *pixbuf,
-									 int                         pixbuf_x,
-									 int                         pixbuf_y,
-									 const ArtIRect             *rectangle);
-
-#endif /* NAUTILUS_GDK_PIXBUF_EXTENSIONS_H */
diff --git a/libnautilus-extensions/nautilus-generous-bin.c b/libnautilus-extensions/nautilus-generous-bin.c
index c7a81b48b..e845b4452 100644
--- a/libnautilus-extensions/nautilus-generous-bin.c
+++ b/libnautilus-extensions/nautilus-generous-bin.c
@@ -26,7 +26,7 @@
 #include <config.h>
 #include "nautilus-generous-bin.h"
 
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 static void nautilus_generous_bin_initialize_class (NautilusGenerousBinClass *class);
 static void nautilus_generous_bin_initialize       (NautilusGenerousBin      *box);
@@ -35,7 +35,7 @@ static void nautilus_generous_bin_size_request     (GtkWidget                *wi
 static void nautilus_generous_bin_size_allocate    (GtkWidget                *widget,
 						    GtkAllocation            *allocation);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusGenerousBin, nautilus_generous_bin, GTK_TYPE_BIN)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusGenerousBin, nautilus_generous_bin, GTK_TYPE_BIN)
 
 static void
 nautilus_generous_bin_initialize_class (NautilusGenerousBinClass *klass)
diff --git a/libnautilus-extensions/nautilus-glib-extensions.c b/libnautilus-extensions/nautilus-glib-extensions.c
deleted file mode 100644
index c096668ac..000000000
--- a/libnautilus-extensions/nautilus-glib-extensions.c
+++ /dev/null
@@ -1,1467 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-glib-extensions.c - implementation of new functions that conceptually
-                                belong in glib. Perhaps some of these will be
-                                actually rolled into glib someday.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: John Sullivan <sullivan@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-glib-extensions.h"
-
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-string.h"
-#include <ctype.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <stdlib.h>
-#include <math.h>
-#include <sys/time.h>
-
-/* Legal conversion specifiers, as specified in the C standard. */
-#define C_STANDARD_STRFTIME_CHARACTERS "aAbBcdHIjmMpSUwWxXyYZ"
-#define C_STANDARD_NUMERIC_STRFTIME_CHARACTERS "dHIjmMSUwWyY"
-
-typedef struct {
-	GHashTable *hash_table;
-	char *display_name;
-	gboolean keys_known_to_be_strings;
-} HashTableToFree;
-
-static GList *hash_tables_to_free_at_exit;
-
-/* We will need this for nautilus_unsetenv if there is no unsetenv. */
-#if !defined (HAVE_SETENV)
-extern char **environ;
-#endif
-
-/**
- * nautilus_setenv:
- * 
- * Adds "*name=*value" to the environment
- *
- * Returns: see "putenv" - 
- * 
- **/
-int
-nautilus_setenv (const char *name, const char *value, gboolean overwrite)
-{
-#if defined (HAVE_SETENV)
-	return setenv (name, value, overwrite);
-#else
-	char *string;
-	
-	if (! overwrite && g_getenv (name) != NULL) {
-		return 0;
-	}
-	
-	/* This results in a leak when you overwrite existing
-	 * settings. It would be fairly easy to fix this by keeping
-	 * our own parallel array or hash table.
-	 */
-	string = g_strconcat (name, "=", value, NULL);
-	return putenv (string);
-#endif
-}
-
-/**
- * nautilus_unsetenv:
- * 
- * Removes *name from the environment
- * 
- **/
-void
-nautilus_unsetenv (const char *name)
-{
-#if defined (HAVE_SETENV)
-	unsetenv (name);
-#else
-	int i, len;
-
-	len = strlen (name);
-	
-	/* Mess directly with the environ array.
-	 * This seems to be the only portable way to do this.
-	 */
-	for (i = 0; environ[i] != NULL; i++) {
-		if (strncmp (environ[i], name, len) == 0
-		    && environ[i][len + 1] == '=') {
-			break;
-		}
-	}
-	while (environ[i] != NULL) {
-		environ[i] = environ[i + 1];
-		i++;
-	}
-#endif
-}
-
-/**
- * nautilus_g_date_new_tm:
- * 
- * Get a new GDate * for the date represented by a tm struct. 
- * The caller is responsible for g_free-ing the result.
- * @time_pieces: Pointer to a tm struct representing the date to be converted.
- * 
- * Returns: Newly allocated date.
- * 
- **/
-GDate *
-nautilus_g_date_new_tm (struct tm *time_pieces)
-{
-	/* tm uses 0-based months; GDate uses 1-based months.
-	 * tm_year needs 1900 added to get the full year.
-	 */
-	return g_date_new_dmy (time_pieces->tm_mday,
-			       time_pieces->tm_mon + 1,
-			       time_pieces->tm_year + 1900);
-}
-
-/**
- * nautilus_strdup_strftime:
- *
- * Cover for standard date-and-time-formatting routine strftime that returns
- * a newly-allocated string of the correct size. The caller is responsible
- * for g_free-ing the returned string.
- *
- * Besides the buffer management, there are two differences between this
- * and the library strftime:
- *
- *   1) The modifiers "-" and "_" between a "%" and a numeric directive
- *      are defined as for the GNU version of strftime. "-" means "do not
- *      pad the field" and "_" means "pad with spaces instead of zeroes".
- *   2) Non-ANSI extensions to strftime are flagged at runtime with a
- *      warning, so it's easy to notice use of the extensions without
- *      testing with multiple versions of the library.
- *
- * @format: format string to pass to strftime. See strftime documentation
- * for details.
- * @time_pieces: date/time, in struct format.
- * 
- * Return value: Newly allocated string containing the formatted time.
- **/
-char *
-nautilus_strdup_strftime (const char *format, struct tm *time_pieces)
-{
-	GString *string;
-	const char *remainder, *percent;
-	char code[3], buffer[512];
-	char *piece, *result;
-	size_t string_length;
-	gboolean strip_leading_zeros, turn_leading_zeros_to_spaces;
-
-	string = g_string_new ("");
-	remainder = format;
-
-	/* Walk from % character to % character. */
-	for (;;) {
-		percent = strchr (remainder, '%');
-		if (percent == NULL) {
-			g_string_append (string, remainder);
-			break;
-		}
-		nautilus_g_string_append_len (string, remainder,
-					      percent - remainder);
-
-		/* Handle the "%" character. */
-		remainder = percent + 1;
-		switch (*remainder) {
-		case '-':
-			strip_leading_zeros = TRUE;
-			turn_leading_zeros_to_spaces = FALSE;
-			remainder++;
-			break;
-		case '_':
-			strip_leading_zeros = FALSE;
-			turn_leading_zeros_to_spaces = TRUE;
-			remainder++;
-			break;
-		case '%':
-			g_string_append_c (string, '%');
-			remainder++;
-			continue;
-		case '\0':
-			g_warning ("Trailing %% passed to nautilus_strdup_strftime");
-			g_string_append_c (string, '%');
-			continue;
-		default:
-			strip_leading_zeros = FALSE;
-			turn_leading_zeros_to_spaces = FALSE;
-			break;
-		}
-		
-		if (strchr (C_STANDARD_STRFTIME_CHARACTERS, *remainder) == NULL) {
-			g_warning ("nautilus_strdup_strftime does not support "
-				   "non-standard escape code %%%c",
-				   *remainder);
-		}
-
-		/* Convert code to strftime format. We have a fixed
-		 * limit here that each code can expand to a maximum
-		 * of 512 bytes, which is probably OK. There's no
-		 * limit on the total size of the result string.
-		 */
-		code[0] = '%';
-		code[1] = *remainder;
-		code[2] = '\0';
-		string_length = strftime (buffer, sizeof (buffer),
-					  code, time_pieces);
-		if (string_length == 0) {
-			/* We could put a warning here, but there's no
-			 * way to tell a successful conversion to
-			 * empty string from a failure.
-			 */
-			buffer[0] = '\0';
-		}
-
-		/* Strip leading zeros if requested. */
-		piece = buffer;
-		if (strip_leading_zeros || turn_leading_zeros_to_spaces) {
-			if (strchr (C_STANDARD_NUMERIC_STRFTIME_CHARACTERS, *remainder) == NULL) {
-				g_warning ("nautilus_strdup_strftime does not support "
-					   "modifier for non-numeric escape code %%%c%c",
-					   remainder[-1],
-					   *remainder);
-			}
-			if (*piece == '0') {
-				do {
-					piece++;
-				} while (*piece == '0');
-				if (!isdigit (*piece)) {
-				    piece--;
-				}
-			}
-			if (turn_leading_zeros_to_spaces) {
-				memset (buffer, ' ', piece - buffer);
-				piece = buffer;
-			}
-		}
-		remainder++;
-
-		/* Add this piece. */
-		g_string_append (string, piece);
-	}
-
-	/* Extract the string. */
-	result = string->str;
-	g_string_free (string, FALSE);
-	return result;
-}
-
-/**
- * nautilus_g_list_exactly_one_item
- *
- * Like g_list_length (list) == 1, only O(1) instead of O(n).
- * @list: List.
- *
- * Return value: TRUE if the list has exactly one item.
- **/
-gboolean
-nautilus_g_list_exactly_one_item (GList *list)
-{
-	return list != NULL && list->next == NULL;
-}
-
-/**
- * nautilus_g_list_more_than_one_item
- *
- * Like g_list_length (list) > 1, only O(1) instead of O(n).
- * @list: List.
- *
- * Return value: TRUE if the list has more than one item.
- **/
-gboolean
-nautilus_g_list_more_than_one_item (GList *list)
-{
-	return list != NULL && list->next != NULL;
-}
-
-/**
- * nautilus_g_list_equal
- *
- * Compares two lists to see if they are equal.
- * @list_a: First list.
- * @list_b: Second list.
- *
- * Return value: TRUE if the lists are the same length with the same elements.
- **/
-gboolean
-nautilus_g_list_equal (GList *list_a, GList *list_b)
-{
-	GList *p, *q;
-
-	for (p = list_a, q = list_b; p != NULL && q != NULL; p = p->next, q = q->next) {
-		if (p->data != q->data) {
-			return FALSE;
-		}
-	}
-	return p == NULL && q == NULL;
-}
-
-/**
- * nautilus_g_list_copy
- *
- * @list: List to copy.
- * Return value: Shallow copy of @list.
- **/
-GList *
-nautilus_g_list_copy (GList *list)
-{
-	GList *p, *result;
-
-	result = NULL;
-	
-	if (list == NULL) {
-		return NULL;
-	}
-
-	for (p = g_list_last (list); p != NULL; p = p->prev) {
-		result = g_list_prepend (result, p->data);
-	}
-	return result;
-}
-
-/**
- * nautilus_g_str_list_equal
- *
- * Compares two lists of C strings to see if they are equal.
- * @list_a: First list.
- * @list_b: Second list.
- *
- * Return value: TRUE if the lists contain the same strings.
- **/
-gboolean
-nautilus_g_str_list_equal (GList *list_a, GList *list_b)
-{
-	GList *p, *q;
-
-	for (p = list_a, q = list_b; p != NULL && q != NULL; p = p->next, q = q->next) {
-		if (nautilus_strcmp (p->data, q->data) != 0) {
-			return FALSE;
-		}
-	}
-	return p == NULL && q == NULL;
-}
-
-/**
- * nautilus_g_str_list_copy
- *
- * @list: List of strings and/or NULLs to copy.
- * Return value: Deep copy of @list.
- **/
-GList *
-nautilus_g_str_list_copy (GList *list)
-{
-	GList *node, *result;
-
-	result = NULL;
-	
-	for (node = g_list_last (list); node != NULL; node = node->prev) {
-		result = g_list_prepend (result, g_strdup (node->data));
-	}
-	return result;
-}
-
-/**
- * nautilus_g_str_list_alphabetize
- *
- * Sort a list of strings using locale-sensitive rules.
- *
- * @list: List of strings and/or NULLs.
- * 
- * Return value: @list, sorted.
- **/
-GList *
-nautilus_g_str_list_alphabetize (GList *list)
-{
-	return g_list_sort (list, (GCompareFunc) nautilus_strcoll);
-}
-
-/**
- * nautilus_g_list_free_deep_custom
- *
- * Frees the elements of a list and then the list, using a custom free function.
- *
- * @list: List of elements that can be freed with the provided free function.
- * @element_free_func: function to call with the data pointer and user_data to free it.
- * @user_data: User data to pass to element_free_func
- **/
-void
-nautilus_g_list_free_deep_custom (GList *list, GFunc element_free_func, gpointer user_data)
-{
-	g_list_foreach (list, element_free_func, user_data);
-	g_list_free (list);
-}
-
-/**
- * nautilus_g_list_free_deep
- *
- * Frees the elements of a list and then the list.
- * @list: List of elements that can be freed with g_free.
- **/
-void
-nautilus_g_list_free_deep (GList *list)
-{
-	nautilus_g_list_free_deep_custom (list, (GFunc) g_free, NULL);
-}
-
-/**
- * nautilus_g_list_free_deep_custom
- *
- * Frees the elements of a list and then the list, using a custom free function.
- *
- * @list: List of elements that can be freed with the provided free function.
- * @element_free_func: function to call with the data pointer and user_data to free it.
- * @user_data: User data to pass to element_free_func
- **/
-void
-nautilus_g_slist_free_deep_custom (GSList *list, GFunc element_free_func, gpointer user_data)
-{
-	g_slist_foreach (list, element_free_func, user_data);
-	g_slist_free (list);
-}
-
-/**
- * nautilus_g_slist_free_deep
- *
- * Frees the elements of a list and then the list.
- * @list: List of elements that can be freed with g_free.
- **/
-void
-nautilus_g_slist_free_deep (GSList *list)
-{
-	nautilus_g_slist_free_deep_custom (list, (GFunc) g_free, NULL);
-}
-
-
-/**
- * nautilus_g_strv_find
- * 
- * Get index of string in array of strings.
- * 
- * @strv: NULL-terminated array of strings.
- * @find_me: string to search for.
- * 
- * Return value: index of array entry in @strv that
- * matches @find_me, or -1 if no matching entry.
- */
-int
-nautilus_g_strv_find (char **strv, const char *find_me)
-{
-	int index;
-
-	g_return_val_if_fail (find_me != NULL, -1);
-	
-	for (index = 0; strv[index] != NULL; ++index) {
-		if (strcmp (strv[index], find_me) == 0) {
-			return index;
-		}
-	}
-
-	return -1;
-}
-
-/**
- * nautilus_g_list_safe_for_each
- * 
- * A version of g_list_foreach that works if the passed function
- * deletes the current element.
- * 
- * @list: List to iterate.
- * @function: Function to call on each element.
- * @user_data: Data to pass to function.
- */
-void
-nautilus_g_list_safe_for_each (GList *list, GFunc function, gpointer user_data)
-{
-	GList *p, *next;
-
-	for (p = list; p != NULL; p = next) {
-		next = p->next;
-		(* function) (p->data, user_data);
-	}
-}
-
-static GList *
-nautilus_g_list_sort_merge (GList       *list_1, 
-			    GList       *list_2,
-			    NautilusCompareFunction compare_func,
-			    gpointer user_data)
-{
-  GList list_buffer, *list, *previous_node;
-
-  list = &list_buffer; 
-  previous_node = NULL;
-
-  while (list_1 != NULL && 
-	 list_2 != NULL) {
-	  if (compare_func (list_1->data, list_2->data, user_data) < 0) {
-		  list->next = list_1;
-		  list = list->next;
-		  list->prev = previous_node; 
-		  previous_node = list;
-		  list_1 = list_1->next;
-	  } 
-	  else {
-		  list->next = list_2;
-		  list = list->next;
-		  list->prev = previous_node; 
-		  previous_node = list;
-		  list_2 = list_2->next;
-	  }
-  }
-
-  list->next = list_1 ? list_1 : list_2;
-  list->next->prev = list;
-
-  return list_buffer.next;
-}
-
-
-static gboolean
-nautilus_g_list_is_already_sorted (GList *list,
-				   NautilusCompareFunction compare_func,
-				   gpointer user_data)
-{
-	if (list == NULL) {
-		return TRUE;
-	}
-
-	while (list->next != NULL) {
-		if (compare_func (list->data, list->next->data, user_data) > 0) {
-			return FALSE;
-		}
-		list = list->next;
-		
-	}
-
-	return TRUE;
-}
-
-GList *
-nautilus_g_list_sort_custom (GList *list,
-			     NautilusCompareFunction compare_func,
-			     gpointer user_data)
-{
-	GList *list_1, *list_2;
-  
-	if (nautilus_g_list_is_already_sorted (list, compare_func, user_data)) {
-		return list;
-	}
-
-	list_1 = list; 
-	list_2 = list->next;
-
-	/* Split the two lists half way down the middle */
-	while (TRUE) {
-		list_2 = list_2->next;
-		if (list_2 == NULL) {
-			break;
-		}
-		list_2 = list_2->next;
-		if (list_2 == NULL) {
-			break;
-		}
-		list_1 = list_1->next;
-	}
-	
-	list_2 = list_1->next; 
-	list_1->next = NULL; 
-
-	return nautilus_g_list_sort_merge (nautilus_g_list_sort_custom (list, compare_func, user_data),
-					   nautilus_g_list_sort_custom (list_2, compare_func, user_data),
-					   compare_func,
-					   user_data);
-
-}
-
-static int
-compare_pointers (gconstpointer pointer_1, gconstpointer pointer_2)
-{
-	if ((const char *) pointer_1 < (const char *) pointer_2) {
-		return -1;
-	}
-	if ((const char *) pointer_1 > (const char *) pointer_2) {
-		return +1;
-	}
-	return 0;
-}
-
-
-
-gboolean
-nautilus_g_lists_sort_and_check_for_intersection (GList **list_1,
-						  GList **list_2) 
-
-{
-	GList *node_1, *node_2;
-	int compare_result;
-	
-	*list_1 = g_list_sort (*list_1, compare_pointers);
-	*list_2 = g_list_sort (*list_2, compare_pointers);
-
-	node_1 = *list_1;
-	node_2 = *list_2;
-
-	while (node_1 != NULL && node_2 != NULL) {
-		compare_result = compare_pointers (node_1->data, node_2->data);
-		if (compare_result == 0) {
-			return TRUE;
-		}
-		if (compare_result <= 0) {
-			node_1 = node_1->next;
-		}
-		if (compare_result >= 0) {
-			node_2 = node_2->next;
-		}
-	}
-
-	return FALSE;
-}
-
-
-/**
- * nautilus_g_list_partition
- * 
- * Parition a list into two parts depending on whether the data
- * elements satisfy a provided predicate. Order is preserved in both
- * of the resulting lists, and the original list is consumed. A list
- * of the items that satisfy the predicate is returned, and the list
- * of items not satisfying the predicate is returned via the failed
- * out argument.
- * 
- * @list: List to partition.
- * @predicate: Function to call on each element.
- * @user_data: Data to pass to function.  
- * @failed: The GList * variable pointed to by this argument will be
- * set to the list of elements for which the predicate returned
- * false. */
-
-GList *
-nautilus_g_list_partition (GList *list,
-			   NautilusPredicateFunction  predicate,
-			   gpointer user_data,
-			   GList **failed)
-{
-	GList *predicate_true;
-	GList *predicate_false;
-	GList *reverse;
-	GList *p;
-	GList *next;
-
-	predicate_true = NULL;
-	predicate_false = NULL;
-
-	reverse = g_list_reverse (list);
-
-	for (p = reverse; p != NULL; p = next) {
-		next = p->next;
-		
-		if (next != NULL) {
-			next->prev = NULL;
-		}
-
-		if (predicate (p->data, user_data)) {
-			p->next = predicate_true;
- 			if (predicate_true != NULL) {
-				predicate_true->prev = p;
-			}
-			predicate_true = p;
-		} else {
-			p->next = predicate_false;
- 			if (predicate_false != NULL) {
-				predicate_false->prev = p;
-			}
-			predicate_false = p;
-		}
-	}
-
-	*failed = predicate_false;
-	return predicate_true;
-}
-
-
-
-/**
- * nautilus_g_ptr_array_new_from_list
- * 
- * Copies (shallow) a list of pointers into an array of pointers.
- * 
- * @list: List to copy.
- * 
- * Return value: GPtrArray containing a copy of all the pointers
- * from @list
- */
-GPtrArray *
-nautilus_g_ptr_array_new_from_list (GList *list)
-{
-	GPtrArray *array;
-	int size;
-	int index;
-	GList *p;
-
-	array = g_ptr_array_new ();
-	size = g_list_length ((GList *)list);
-
-	g_ptr_array_set_size (array, size);
-
-	for (p = list, index = 0; p != NULL; p = p->next, index++) {
-		g_ptr_array_index (array, index) = p->data;
-	}
-
-	return array;
-}
-
-/**
- * nautilus_g_ptr_array_sort
- * 
- * Sorts @array using a qsort algorithm. Allows passing in
- * a pass-thru context that can be used by the @sort_function
- * 
- * @array: pointer array to sort
- * @sort_function: sort function
- * @context: sort context passed to the sort_function
- */
-void
-nautilus_g_ptr_array_sort (GPtrArray *array,
-			   NautilusCompareFunction sort_function,
-			   void *context)
-{
-	size_t count, r, l, j;
-	void **base, **lp, **rp, **ip, **jp, **tmpp;
-	void *tmp;
-
-	count = array->len;
-
-	if (count < 2) {
-		return;
-	}
-
-	r = count;
-	l = (r / 2) + 1;
-
-	base = (void **) array->pdata;
-	lp = base + (l - 1);
-	rp = base + (r - 1);
-
-	for (;;) {
-		if (l > 1) {
-			l--;
-			lp--;
-		} else {
-			tmp = *lp;
-			*lp = *rp;
-			*rp = tmp;
-
-			if (--r == 1) {
-				return;
-			}
-
-			rp--;
-		}
-
-		j = l;
-
-		jp = base + (j - 1);
-		
-		while (j * 2 <= r) {
-			j *= 2;
-			
-			ip = jp;
-			jp = base + (j - 1);
-			
-			if (j < r) {
-				tmpp = jp + 1;
-				if (sort_function(*jp, *tmpp, context) < 0) {
-					j++;
-					jp = tmpp;
-				}
-			}
-			
-			if (sort_function (*ip, *jp, context) >= 0) {
-				break;
-			}
-
-			tmp = *ip;
-			*ip = *jp;
-			*jp = tmp;
-		}
-	}
-}
-
-/**
- * nautilus_g_ptr_array_search
- * 
- * Does a binary search through @array looking for an item
- * that matches a predicate consisting of a @search_function and
- * @context. May be used to find an insertion point 
- * 
- * @array: pointer array to search
- * @search_function: search function called on elements
- * @context: search context passed to the @search_function containing
- * the key or other data we are matching
- * @match_only: if TRUE, only returns a match if the match is exact,
- * if FALSE, returns either an index of a match or an index of the
- * slot a new item should be inserted in
- * 
- * Return value: index of the match or -1 if not found
- */
-int
-nautilus_g_ptr_array_search (GPtrArray *array, 
-			     NautilusSearchFunction search_function,
-			     void *context,
-			     gboolean match_only)
-{
-	int r, l;
-	int resulting_index;
-	int compare_result;
-	void *item;
-
-	r = array->len - 1;
-	item = NULL;
-	resulting_index = 0;
-	compare_result = 0;
-	
-	for (l = 0; l <= r; ) {
-		resulting_index = (l + r) / 2;
-
-		item = g_ptr_array_index (array, resulting_index);
-
-		compare_result = (search_function) (item, context);
-		
-		if (compare_result > 0) {
-			r = resulting_index - 1;
-		} else if (compare_result < 0) {
-			l = resulting_index + 1;
-		} else {
-			return resulting_index;
-		}
-	}
-
-	if (compare_result < 0) {
-		resulting_index++;
-	}
-
-	if (match_only && compare_result != 0) {
-		return -1;
-	}
-
-	return resulting_index;
-}
-
-/**
- * nautilus_get_system_time
- * 
- * Return value: number of microseconds since the machine was turned on
- */
-gint64
-nautilus_get_system_time (void)
-{
-	struct timeval tmp;
-
-	gettimeofday (&tmp, NULL);
-	return (gint64)tmp.tv_usec + (gint64)tmp.tv_sec * G_GINT64_CONSTANT (1000000);
-}
-
-static void
-print_key_string (gpointer key, gpointer value, gpointer callback_data)
-{
-	g_assert (callback_data == NULL);
-
-	g_print ("--> %s\n", (char *) key);
-}
-
-static void
-free_hash_tables_at_exit (void)
-{
-	GList *p;
-	HashTableToFree *hash_table_to_free;
-	guint size;
-
-	for (p = hash_tables_to_free_at_exit; p != NULL; p = p->next) {
-		hash_table_to_free = p->data;
-
-		size = g_hash_table_size (hash_table_to_free->hash_table);
-		if (size != 0) {
-			if (hash_table_to_free->keys_known_to_be_strings) {
-				g_print ("\n--- Hash table keys for warning below:\n");
-				g_hash_table_foreach (hash_table_to_free->hash_table,
-						      print_key_string,
-						      NULL);
-			}
-			g_warning ("\"%s\" hash table still has %u element%s at quit time%s",
-				   hash_table_to_free->display_name, size,
-				   size == 1 ? "" : "s",
-				   hash_table_to_free->keys_known_to_be_strings
-				   ? " (keys above)" : "");
-		}
-
-		g_hash_table_destroy (hash_table_to_free->hash_table);
-		g_free (hash_table_to_free->display_name);
-		g_free (hash_table_to_free);
-	}
-	g_list_free (hash_tables_to_free_at_exit);
-	hash_tables_to_free_at_exit = NULL;
-}
-
-GHashTable *
-nautilus_g_hash_table_new_free_at_exit (GHashFunc hash_func,
-					GCompareFunc key_compare_func,
-					const char *display_name)
-{
-	GHashTable *hash_table;
-	HashTableToFree *hash_table_to_free;
-
-	/* FIXME: We can take out the NAUTILUS_DEBUG check once we
-	 * have fixed more of the leaks. For now, it's a bit too noisy
-	 * for the general public.
-	 */
-	if (hash_tables_to_free_at_exit == NULL
-	    && g_getenv ("NAUTILUS_DEBUG") != NULL) {
-		g_atexit (free_hash_tables_at_exit);
-	}
-
-	hash_table = g_hash_table_new (hash_func, key_compare_func);
-
-	hash_table_to_free = g_new (HashTableToFree, 1);
-	hash_table_to_free->hash_table = hash_table;
-	hash_table_to_free->display_name = g_strdup (display_name);
-	hash_table_to_free->keys_known_to_be_strings =
-		hash_func == g_str_hash;
-
-	hash_tables_to_free_at_exit = g_list_prepend
-		(hash_tables_to_free_at_exit, hash_table_to_free);
-
-	return hash_table;
-}
-
-typedef struct {
-	GList *keys;
-	GList *values;
-} FlattenedHashTable;
-
-static void
-flatten_hash_table_element (gpointer key, gpointer value, gpointer callback_data)
-{
-	FlattenedHashTable *flattened_table;
-
-	flattened_table = callback_data;
-	flattened_table->keys = g_list_prepend
-		(flattened_table->keys, key);
-	flattened_table->values = g_list_prepend
-		(flattened_table->values, value);
-}
-
-void
-nautilus_g_hash_table_safe_for_each (GHashTable *hash_table,
-				     GHFunc callback,
-				     gpointer callback_data)
-{
-	FlattenedHashTable flattened;
-	GList *p, *q;
-
-	flattened.keys = NULL;
-	flattened.values = NULL;
-
-	g_hash_table_foreach (hash_table,
-			      flatten_hash_table_element,
-			      &flattened);
-
-	for (p = flattened.keys, q = flattened.values;
-	     p != NULL;
-	     p = p->next, q = q->next) {
-		(* callback) (p->data, q->data, callback_data);
-	}
-
-	g_list_free (flattened.keys);
-	g_list_free (flattened.values);
-}
-
-gboolean
-nautilus_g_hash_table_remove_deep_custom (GHashTable *hash_table, gconstpointer key,
-					  GFunc key_free_func, gpointer key_free_data,
-					  GFunc value_free_func, gpointer value_free_data)
-{
-	gpointer key_in_table;
-	gpointer value;
-
-	/* It would sure be nice if we could do this with a single lookup.
-	 */
-	if (g_hash_table_lookup_extended (hash_table, key,
-					  &key_in_table, &value)) {
-		g_hash_table_remove (hash_table, key);
-		if (key_free_func != NULL) {
-			(* key_free_func) (key_in_table, key_free_data);
-		}
-		/* handle key == value, don't double free */
-		if (value_free_func != NULL && value != key_in_table) {
-			(* value_free_func) (value, value_free_data);
-		}
-		return TRUE;
-	} else {
-		return FALSE;
-	}
-}
-
-gboolean
-nautilus_g_hash_table_remove_deep (GHashTable *hash_table, gconstpointer key)
-{
-	return nautilus_g_hash_table_remove_deep_custom
-		(hash_table, key, (GFunc) g_free, NULL, (GFunc) g_free, NULL);
-}
-
-typedef struct {
-	GFunc	  key_free_func;
-	gpointer  key_free_data;
-	GFunc	  value_free_func;
-	gpointer  value_free_data;
-} HashTableFreeFuncs;
-
-static gboolean
-destroy_deep_helper (gpointer key, gpointer value, gpointer data)
-{
-	HashTableFreeFuncs *free_funcs;
-
-	free_funcs = (HashTableFreeFuncs *) data;
-	
-	if (free_funcs->key_free_func != NULL) {
-		(* free_funcs->key_free_func) (key, free_funcs->key_free_data);
-	}
-	/* handle key == value, don't double free */
-	if (free_funcs->value_free_func != NULL && value != key) {
-		(* free_funcs->value_free_func) (value, free_funcs->value_free_data);
-	}
-	return TRUE;
-}
-
-void
-nautilus_g_hash_table_destroy_deep_custom (GHashTable *hash_table,
-					   GFunc key_free_func, gpointer key_free_data,
-					   GFunc value_free_func, gpointer value_free_data)
-{
-	HashTableFreeFuncs free_funcs;
-	
-	g_return_if_fail (hash_table != NULL);
-
-	free_funcs.key_free_func = key_free_func;
-	free_funcs.key_free_data = key_free_data;
-	free_funcs.value_free_func = value_free_func;
-	free_funcs.value_free_data = value_free_data;
-	
-	g_hash_table_foreach_remove (hash_table, destroy_deep_helper, &free_funcs);
-
-	g_hash_table_destroy (hash_table);
-}
-
-void
-nautilus_g_hash_table_destroy_deep (GHashTable *hash_table)
-{
-	nautilus_g_hash_table_destroy_deep_custom (hash_table, (GFunc) g_free, NULL, (GFunc) g_free, NULL);
-}
-
-/* This is something like the new g_string_append_len function from
- * GLib 2.0, without the ability to deal with NUL character that the
- * GLib 2.0 function has. It's limited in other ways too, so it's
- * best to delete this when we move to GLib 2.0.
- */
-void
-nautilus_g_string_append_len (GString *string,
-			      const char *new_text,
-			      int len)
-{
-	int old_string_len, new_text_len;
-
-	old_string_len = string->len;
-	g_string_append (string, new_text);
-
-	new_text_len = strlen (new_text);
-	if (len < new_text_len) {
-		g_string_erase (string,
-				old_string_len + len,
-				new_text_len - len);
-	}
-}
-
-/* By strange parallel evolution there is actually going to be a
- * function to do this in GNOME 2.0.
- */
-char *
-nautilus_shell_quote (const char *string)
-{
-	const char *p;
-	GString *quoted_string;
-	char *quoted_str;
-
-	/* All kinds of ways to do this fancier.
-	 * - Detect when quotes aren't needed at all.
-	 * - Use double quotes when they would look nicer.
-	 * - Avoid sequences of quote/unquote in a row (like when you quote "'''").
-	 * - Do it higher speed with strchr.
-	 * - Allocate the GString with g_string_sized_new.
-	 */
-
-	g_return_val_if_fail (string != NULL, NULL);
-
-	quoted_string = g_string_new ("'");
-
-	for (p = string; *p != '\0'; p++) {
-		if (*p == '\'') {
-			/* Get out of quotes, do a quote, then back in. */
-			g_string_append (quoted_string, "'\\''");
-		} else {
-			g_string_append_c (quoted_string, *p);
-		}
-	}
-
-	g_string_append_c (quoted_string, '\'');
-
-	/* Let go of the GString. */
-	quoted_str = quoted_string->str;
-	g_string_free (quoted_string, FALSE);
-
-	return quoted_str;
-}
-
-int
-nautilus_round (double d)
-{
-	double val;
-
-	val = floor (d + .5);
-
-	/* The tests are needed because the result of floating-point to integral
-	 * conversion is undefined if the floating point value is not representable
-	 * in the new type. E.g. the magnititude is too large or a negative
-	 * floating-point value being converted to an unsigned.
-	 */
-	g_return_val_if_fail (val <= INT_MAX, INT_MAX);
-	g_return_val_if_fail (val >= INT_MIN, INT_MIN);
-
-	return val;
-}
-
-GList *
-nautilus_g_list_from_g_slist (GSList *slist)
-{
-	GList *list;
-	GSList *node;
-
-	list = NULL;
-	for (node = slist; node != NULL; node = node->next) {
-		list = g_list_prepend (list, node->data);
-	}
-	return g_list_reverse (list);
-}
-
-GSList *
-nautilus_g_slist_from_g_list (GList *list)
-{
-	GSList *slist;
-	GList *node;
-
-	slist = NULL;
-	for (node = list; node != NULL; node = node->next) {
-		slist = g_slist_prepend (slist, node->data);
-	}
-	return g_slist_reverse (slist);
-}
-
-/**
- * nautilus_dumb_down_for_multi_byte_locale_hack
- * 
- * Return value: A boolean value indicating whether the current locale
- *               is multi byte so that we can dumb down some operations.
- *               to work on those locales.  This is a temporary workaround
- *               with will be properly fixed in a future version of 
- *               nautilus.
- *
- */
-gboolean
-nautilus_dumb_down_for_multi_byte_locale_hack (void)
-{
-	static gboolean is_multi_byte_locale = FALSE;
-	static gboolean is_multi_byte_locale_known = FALSE;
-	guint i;
-	const char *variable = NULL;
-
-	/*
-	 * List of environment variables that effect the locale.
-	 * This list was provided by John Harper (out of Sawfish)
-	 * where he uses it for similar purposes.
-	 */
-	static const char *locale_variables[] ={
-		"LANGUAGE",
-		"LC_ALL",
-		"LC_MESSAGES",
-		"LANG",
-		"GDM_LANG"
-	};
-
-	/*
-	 * List of locales (prefixes) known to be multi byte.
-	 */
-	static const char *multi_byte_locales[] ={
-		"ja",
-		"ko",
-		"zh"
-	};
-
-	/* Find out if the locale is multi byte only once */
-	if (is_multi_byte_locale_known) {
-		return is_multi_byte_locale;
-	}
-	is_multi_byte_locale_known = TRUE;
-
-	/* Find the first language variable that is set */
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (locale_variables) && variable == NULL; i++) {
-		variable = g_getenv (locale_variables[i]);
-	}
-
-	/* If a language variable was found, check it agains the known multi byte locales */
-	if (variable != NULL) {
-		for (i = 0; i < NAUTILUS_N_ELEMENTS (multi_byte_locales); i++) {
-			if (nautilus_istr_has_prefix (variable, multi_byte_locales[i])) {
-				is_multi_byte_locale = TRUE;
-			}
-		}
-	}
-
-	return is_multi_byte_locale;
-}
-
-int
-nautilus_compare_integer (gconstpointer a,
-			  gconstpointer b)
-{
-	int int_a;
-	int int_b;
-
-	int_a = GPOINTER_TO_INT (a);
-	int_b = GPOINTER_TO_INT (b);
-
-	if (int_a == int_b) {
-		return 0;
-	}
-
-	return int_a < int_b ? -1 : 1;
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-static void 
-check_tm_to_g_date (time_t time)
-{
-	struct tm *before_conversion;
-	struct tm after_conversion;
-	GDate *date;
-
-	before_conversion = localtime (&time);
-	date = nautilus_g_date_new_tm (before_conversion);
-
-	g_date_to_struct_tm (date, &after_conversion);
-
-	g_date_free (date);
-
-	NAUTILUS_CHECK_INTEGER_RESULT (after_conversion.tm_mday,
-				       before_conversion->tm_mday);
-	NAUTILUS_CHECK_INTEGER_RESULT (after_conversion.tm_mon,
-				       before_conversion->tm_mon);
-	NAUTILUS_CHECK_INTEGER_RESULT (after_conversion.tm_year,
-				       before_conversion->tm_year);
-}
-
-static gboolean
-nautilus_test_predicate (gpointer data,
-			 gpointer callback_data)
-{
-	return g_strcasecmp (data, callback_data) <= 0;
-}
-
-static char *
-test_strftime (const char *format,
-	       int year,
-	       int month,
-	       int day,
-	       int hour,
-	       int minute,
-	       int second)
-{
-	struct tm time_pieces;
-
-	time_pieces.tm_sec = second;
-	time_pieces.tm_min = minute;
-	time_pieces.tm_hour = hour;
-	time_pieces.tm_mday = day;
-	time_pieces.tm_mon = month - 1;
-	time_pieces.tm_year = year - 1900;
-	time_pieces.tm_isdst = -1;
-	mktime (&time_pieces);
-
-	return nautilus_strdup_strftime (format, &time_pieces);
-}
-
-void
-nautilus_self_check_glib_extensions (void)
-{
-	char **strv;
-	GList *compare_list_1;
-	GList *compare_list_2;
-	GList *compare_list_3;
-	GList *compare_list_4;
-	GList *compare_list_5;
-	gint64 time1, time2;
-	GList *list_to_partition;
-	GList *expected_passed;
-	GList *expected_failed;
-	GList *actual_passed;
-	GList *actual_failed;
-	char *huge_string;
-	
-	check_tm_to_g_date (0);			/* lower limit */
-	check_tm_to_g_date ((time_t) -1);	/* upper limit */
-	check_tm_to_g_date (time (NULL));	/* current time */
-
-	strv = g_strsplit ("zero|one|two|three|four", "|", 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_g_strv_find (strv, "zero"), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_g_strv_find (strv, "one"), 1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_g_strv_find (strv, "four"), 4);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_g_strv_find (strv, "five"), -1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_g_strv_find (strv, ""), -1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_g_strv_find (strv, "o"), -1);
-	g_strfreev (strv);
-
-	/* nautilus_get_system_time */
-	time1 = nautilus_get_system_time ();
-	time2 = nautilus_get_system_time ();
-	NAUTILUS_CHECK_BOOLEAN_RESULT (time1 - time2 > -1000, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (time1 - time2 <= 0, TRUE);
-
-	/* nautilus_g_str_list_equal */
-
-	/* We g_strdup because identical string constants can be shared. */
-
-	compare_list_1 = NULL;
-	compare_list_1 = g_list_append (compare_list_1, g_strdup ("Apple"));
-	compare_list_1 = g_list_append (compare_list_1, g_strdup ("zebra"));
-	compare_list_1 = g_list_append (compare_list_1, g_strdup ("!@#!@$#@$!"));
-
-	compare_list_2 = NULL;
-	compare_list_2 = g_list_append (compare_list_2, g_strdup ("Apple"));
-	compare_list_2 = g_list_append (compare_list_2, g_strdup ("zebra"));
-	compare_list_2 = g_list_append (compare_list_2, g_strdup ("!@#!@$#@$!"));
-
-	compare_list_3 = NULL;
-	compare_list_3 = g_list_append (compare_list_3, g_strdup ("Apple"));
-	compare_list_3 = g_list_append (compare_list_3, g_strdup ("zebra"));
-
-	compare_list_4 = NULL;
-	compare_list_4 = g_list_append (compare_list_4, g_strdup ("Apple"));
-	compare_list_4 = g_list_append (compare_list_4, g_strdup ("zebra"));
-	compare_list_4 = g_list_append (compare_list_4, g_strdup ("!@#!@$#@$!"));
-	compare_list_4 = g_list_append (compare_list_4, g_strdup ("foobar"));
-
-	compare_list_5 = NULL;
-	compare_list_5 = g_list_append (compare_list_5, g_strdup ("Apple"));
-	compare_list_5 = g_list_append (compare_list_5, g_strdup ("zzzzzebraaaaaa"));
-	compare_list_5 = g_list_append (compare_list_5, g_strdup ("!@#!@$#@$!"));
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_g_str_list_equal (compare_list_1, compare_list_2), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_g_str_list_equal (compare_list_1, compare_list_3), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_g_str_list_equal (compare_list_1, compare_list_4), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_g_str_list_equal (compare_list_1, compare_list_5), FALSE);
-
-	nautilus_g_list_free_deep (compare_list_1);
-	nautilus_g_list_free_deep (compare_list_2);
-	nautilus_g_list_free_deep (compare_list_3);
-	nautilus_g_list_free_deep (compare_list_4);
-	nautilus_g_list_free_deep (compare_list_5);
-
-	/* nautilus_g_list_partition */
-
-	list_to_partition = NULL;
-	list_to_partition = g_list_append (list_to_partition, "Cadillac");
-	list_to_partition = g_list_append (list_to_partition, "Pontiac");
-	list_to_partition = g_list_append (list_to_partition, "Ford");
-	list_to_partition = g_list_append (list_to_partition, "Range Rover");
-	
-	expected_passed = NULL;
-	expected_passed = g_list_append (expected_passed, "Cadillac");
-	expected_passed = g_list_append (expected_passed, "Ford");
-	
-	expected_failed = NULL;
-	expected_failed = g_list_append (expected_failed, "Pontiac");
-	expected_failed = g_list_append (expected_failed, "Range Rover");
-	
-	actual_passed = nautilus_g_list_partition (list_to_partition, 
-						   nautilus_test_predicate,
-						   "m",
-						   &actual_failed);
-	
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_g_str_list_equal (expected_passed, actual_passed), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_g_str_list_equal (expected_failed, actual_failed), TRUE);
-	
-	/* Don't free "list_to_partition", since it is consumed
-	 * by nautilus_g_list_partition.
-	 */
-	
-	g_list_free (expected_passed);
-	g_list_free (actual_passed);
-	g_list_free (expected_failed);
-	g_list_free (actual_failed);
-
-	/* nautilus_strdup_strftime */
-	huge_string = g_new (char, 10000+1);
-	memset (huge_string, 'a', 10000);
-	huge_string[10000] = '\0';
-
-	NAUTILUS_CHECK_STRING_RESULT (test_strftime ("", 2000, 1, 1, 0, 0, 0), "");
-	NAUTILUS_CHECK_STRING_RESULT (test_strftime (huge_string, 2000, 1, 1, 0, 0, 0), huge_string);
-	NAUTILUS_CHECK_STRING_RESULT (test_strftime ("%%", 2000, 1, 1, 1, 0, 0), "%");
-	NAUTILUS_CHECK_STRING_RESULT (test_strftime ("%%%%", 2000, 1, 1, 1, 0, 0), "%%");
-	/* localizers: These strings are part of the strftime
-	 * self-check code and must be changed to match what strtfime
-	 * yields -- usually just omitting the AM part is all that's
-	 * needed.
-	 */
-	NAUTILUS_CHECK_STRING_RESULT (test_strftime ("%m/%d/%y, %I:%M %p", 2000, 1, 1, 1, 0, 0), _("01/01/00, 01:00 AM"));
-	NAUTILUS_CHECK_STRING_RESULT (test_strftime ("%-m/%-d/%y, %-I:%M %p", 2000, 1, 1, 1, 0, 0), _("1/1/00, 1:00 AM"));
-	NAUTILUS_CHECK_STRING_RESULT (test_strftime ("%_m/%_d/%y, %_I:%M %p", 2000, 1, 1, 1, 0, 0), _(" 1/ 1/00,  1:00 AM"));
-
-	g_free (huge_string);
-
-	/* nautilus_shell_quote */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_shell_quote (""), "''");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_shell_quote ("a"), "'a'");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_shell_quote ("'"), "''\\'''");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_shell_quote ("'a"), "''\\''a'");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_shell_quote ("a'"), "'a'\\'''");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_shell_quote ("a'a"), "'a'\\''a'");
-
-	/* nautilus_compare_integer */
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_compare_integer (GINT_TO_POINTER (0), GINT_TO_POINTER (0)), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_compare_integer (GINT_TO_POINTER (0), GINT_TO_POINTER (1)), -1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_compare_integer (GINT_TO_POINTER (1), GINT_TO_POINTER (0)), 1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_compare_integer (GINT_TO_POINTER (-1), GINT_TO_POINTER (0)), -1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_compare_integer (GINT_TO_POINTER (0), GINT_TO_POINTER (-1)), 1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_compare_integer (GINT_TO_POINTER (-1), GINT_TO_POINTER (-1)), 0);
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-glib-extensions.h b/libnautilus-extensions/nautilus-glib-extensions.h
deleted file mode 100644
index d0752ba4d..000000000
--- a/libnautilus-extensions/nautilus-glib-extensions.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-glib-extensions.h - interface for new functions that conceptually
-                                belong in glib. Perhaps some of these will be
-                                actually rolled into glib someday.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: John Sullivan <sullivan@eazel.com>
-*/
-
-#ifndef NAUTILUS_GLIB_EXTENSIONS_H
-#define NAUTILUS_GLIB_EXTENSIONS_H
-
-#include <time.h>
-#include <glib.h>
-
-/* A gboolean variant for bit fields. */
-typedef guint nautilus_boolean_bit;
-
-/* Use there to start and and end a macro */
-#define NAUTILUS_MACRO_BEGIN		G_STMT_START {
-#define NAUTILUS_MACRO_END		} G_STMT_END
-
-/* Use this until we can switch to G_N_ELEMENTS. */
-#define NAUTILUS_N_ELEMENTS(array) (sizeof (array) / sizeof ((array)[0]))
-
-/* Callback functions that have user data. */
-typedef int      (* NautilusCompareFunction)   (gconstpointer a,
-						gconstpointer b,
-						gpointer callback_data);
-typedef int      (* NautilusSearchFunction)    (gconstpointer item,
-						gpointer callback_data);
-
-/* Predicate. */
-typedef gboolean (* NautilusPredicateFunction) (gpointer data,
-						gpointer callback_data);
-
-/* Date & time functions. */
-GDate *     nautilus_g_date_new_tm                           (struct tm                  *time_pieces);
-char *      nautilus_strdup_strftime                         (const char                 *format,
-							      struct tm                  *time_pieces);
-
-/* environment manipulation functions */
-int         nautilus_setenv                                  (const char                 *name,
-							      const char                 *value,
-							      gboolean                    overwrite);
-void        nautilus_unsetenv                                (const char                 *name);
-
-/* GList functions. */
-gboolean    nautilus_g_list_exactly_one_item                 (GList                      *list);
-gboolean    nautilus_g_list_more_than_one_item               (GList                      *list);
-gboolean    nautilus_g_list_equal                            (GList                      *list_a,
-							      GList                      *list_b);
-GList *     nautilus_g_list_copy                             (GList                      *list);
-void        nautilus_g_list_safe_for_each                    (GList                      *list,
-							      GFunc                       function,
-							      gpointer                    user_data);
-GList *     nautilus_g_list_sort_custom                      (GList                      *list,
-							      NautilusCompareFunction     compare,
-							      gpointer                    user_data);
-gboolean    nautilus_g_lists_sort_and_check_for_intersection (GList                     **list_a,
-							      GList                     **list_b);
-GList *     nautilus_g_list_partition                        (GList                      *list,
-							      NautilusPredicateFunction   predicate,
-							      gpointer                    user_data,
-							      GList                     **removed);
-
-/* List functions for lists of g_free'able objects. */
-void        nautilus_g_list_free_deep                        (GList                      *list);
-void        nautilus_g_list_free_deep_custom                 (GList                      *list,
-							      GFunc                       element_free_func,
-							      gpointer                    user_data);
-
-/* GSList functions. */
-GList *     nautilus_g_list_from_g_slist                     (GSList                     *list);
-GSList *    nautilus_g_slist_from_g_list                     (GList                      *list);
-
-/* List functions for slists of g_free'able objects. */
-void        nautilus_g_slist_free_deep                       (GSList                     *list);
-void        nautilus_g_slist_free_deep_custom                (GSList                     *list,
-							      GFunc                       element_free_func,
-							      gpointer                    user_data);
-
-/* List functions for lists of C strings. */
-gboolean    nautilus_g_str_list_equal                        (GList                      *str_list_a,
-							      GList                      *str_list_b);
-GList *     nautilus_g_str_list_copy                         (GList                      *str_list);
-GList *     nautilus_g_str_list_alphabetize                  (GList                      *str_list);
-
-/* GString functions */
-void        nautilus_g_string_append_len                     (GString                    *string,
-							      const char                 *characters,
-							      int                         length);
-
-/* GHashTable functions */
-GHashTable *nautilus_g_hash_table_new_free_at_exit           (GHashFunc                   hash_function,
-							      GCompareFunc                key_compare_function,
-							      const char                 *display_name);
-void        nautilus_g_hash_table_safe_for_each              (GHashTable                 *hash_table,
-							      GHFunc                      callback,
-							      gpointer                    callback_data);
-gboolean    nautilus_g_hash_table_remove_deep_custom         (GHashTable                 *hash_table,
-							      gconstpointer               key,
-							      GFunc                       key_free_func,
-							      gpointer                    key_free_data,
-							      GFunc                       value_free_func,
-							      gpointer                    value_free_data);
-gboolean    nautilus_g_hash_table_remove_deep                (GHashTable                 *hash_table,
-							      gconstpointer               key);
-void        nautilus_g_hash_table_destroy_deep_custom        (GHashTable                 *hash_table,
-							      GFunc                       key_free_func,
-							      gpointer                    key_free_data,
-							      GFunc                       value_free_func,
-							      gpointer                    value_free_data);
-void        nautilus_g_hash_table_destroy_deep               (GHashTable                 *hash_table);
-
-/* GPtrArray functions */
-GPtrArray * nautilus_g_ptr_array_new_from_list               (GList                      *list);
-void        nautilus_g_ptr_array_sort                        (GPtrArray                  *array,
-							      NautilusCompareFunction     compare_callback,
-							      gpointer                    callback_data);
-int         nautilus_g_ptr_array_search                      (GPtrArray                  *array,
-							      NautilusSearchFunction      search_callback,
-							      gpointer                    callback_data,
-							      gboolean                    match_only);
-
-/* NULL terminated string arrays (strv). */
-int         nautilus_g_strv_find                             (char                      **strv,
-							      const char                 *find_me);
-
-/* return the time in microseconds since the machine was started */
-gint64      nautilus_get_system_time                         (void);
-
-/* shell */
-char *      nautilus_shell_quote                             (const char                 *string);
-
-/* math */
-int         nautilus_round                                   (double                      d);
-
-/* Locale */
-gboolean    nautilus_dumb_down_for_multi_byte_locale_hack    (void);
-
-/* A GCompareFunc for integers */
-int         nautilus_compare_integer                         (gconstpointer               a,
-							      gconstpointer               b);
-
-#endif /* NAUTILUS_GLIB_EXTENSIONS_H */
diff --git a/libnautilus-extensions/nautilus-global-preferences.c b/libnautilus-extensions/nautilus-global-preferences.c
index e9a7f534f..115b79e42 100644
--- a/libnautilus-extensions/nautilus-global-preferences.c
+++ b/libnautilus-extensions/nautilus-global-preferences.c
@@ -26,20 +26,20 @@
 #include "nautilus-global-preferences.h"
 
 #include "nautilus-file-utilities.h"
-#include "nautilus-font-manager.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-gtk-extensions.h"
+#include <eel/eel-font-manager.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 #include "nautilus-medusa-support.h"
 #include "nautilus-preferences-dialog.h"
 #include "nautilus-preferences-group.h"
 #include "nautilus-preferences-item.h"
-#include "nautilus-scalable-font.h"
-#include "nautilus-string.h"
+#include <eel/eel-scalable-font.h>
+#include <eel/eel-string.h>
 #include "nautilus-medusa-support.h"
-#include "nautilus-stock-dialogs.h"
+#include <eel/eel-stock-dialogs.h>
 #include "nautilus-view-identifier.h"
 #include "nautilus-sidebar-functions.h"
-#include "nautilus-smooth-widget.h"
+#include <eel/eel-smooth-widget.h>
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 #include <libgnome/gnome-i18n.h>
@@ -1156,7 +1156,7 @@ global_preferences_install_sidebar_panel_defaults (void)
 	guint i;
 	
 	/* Install the user level on/off defaults for known sidebar panels */
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (known_sidebar_panels); i++) {
+	for (i = 0; i < EEL_N_ELEMENTS (known_sidebar_panels); i++) {
 		preference_key = nautilus_sidebar_panel_make_preference_key (known_sidebar_panels[i].name);
 		
 		nautilus_preferences_default_set_boolean (preference_key,
@@ -1209,8 +1209,8 @@ global_preferences_install_font_defaults (void)
 	char *default_smooth_font;
 	const char *default_font;
 
-	default_font = nautilus_dumb_down_for_multi_byte_locale_hack () ? "fixed" : "helvetica";
-	default_smooth_font = nautilus_font_manager_get_default_font ();
+	default_font = eel_dumb_down_for_multi_byte_locale_hack () ? "fixed" : "helvetica";
+	default_smooth_font = eel_font_manager_get_default_font ();
 
 	/* Icon view fonts */
 	nautilus_preferences_default_set_string (NAUTILUS_PREFERENCES_ICON_VIEW_FONT,
@@ -1263,7 +1263,7 @@ global_preferences_use_fast_search_changed_callback (gpointer callback_data)
 			cron_status = nautilus_medusa_check_cron_is_enabled ();
 			switch (cron_status) {
 			case NAUTILUS_CRON_STATUS_OFF:
-				nautilus_show_info_dialog_with_details (_("Indexing is turned on, enabling the "
+				eel_show_info_dialog_with_details (_("Indexing is turned on, enabling the "
 									  "fast search feature. However, indexing "
 									  "currently can't be performed because "
 									  "the program crond, which does "
@@ -1280,7 +1280,7 @@ global_preferences_use_fast_search_changed_callback (gpointer callback_data)
 				
 				break;
 			case NAUTILUS_CRON_STATUS_UNKNOWN:
-				nautilus_show_info_dialog_with_details (_("Indexing is turned on, enabling the "
+				eel_show_info_dialog_with_details (_("Indexing is turned on, enabling the "
 									  "fast search feature. However, indexing "
 									  "may not be performed because the "
 									  "program crond, which does nightly "
@@ -1360,7 +1360,7 @@ global_preferences_populate_pane (NautilusPreferencesBox *preference_box,
 {
 	GtkWidget *pane;
 	GtkWidget *item;
-	NautilusStringList *group_names;
+	EelStringList *group_names;
 	guint i;
 	int group_index;
 	guint start_group_index;
@@ -1376,13 +1376,13 @@ global_preferences_populate_pane (NautilusPreferencesBox *preference_box,
 		pane = nautilus_preferences_box_add_pane (preference_box, pane_name);
 	}
 
-	group_names = nautilus_string_list_new (TRUE);
+	group_names = eel_string_list_new (TRUE);
 
 	start_group_index = nautilus_preferences_pane_get_num_groups (NAUTILUS_PREFERENCES_PANE (pane));
 
 	for (i = 0; preference_dialog_item[i].group_name != NULL; i++) {
-		if (!nautilus_string_list_contains (group_names, preference_dialog_item[i].group_name)) {
-			nautilus_string_list_insert (group_names, preference_dialog_item[i].group_name);
+		if (!eel_string_list_contains (group_names, preference_dialog_item[i].group_name)) {
+			eel_string_list_insert (group_names, preference_dialog_item[i].group_name);
 			nautilus_preferences_pane_add_group (NAUTILUS_PREFERENCES_PANE (pane),
 							     _(preference_dialog_item[i].group_name));
 		}
@@ -1390,8 +1390,7 @@ global_preferences_populate_pane (NautilusPreferencesBox *preference_box,
 
 	for (i = 0; preference_dialog_item[i].group_name != NULL; i++) {
 		group_index = start_group_index + 
-			nautilus_string_list_get_index_for_string (group_names,
-								   preference_dialog_item[i].group_name);
+			eel_string_list_get_index_for_string (group_names, preference_dialog_item[i].group_name);
 
 		nautilus_preferences_set_description (preference_dialog_item[i].preference_name,
 						      _(preference_dialog_item[i].preference_description));
@@ -1411,8 +1410,8 @@ global_preferences_populate_pane (NautilusPreferencesBox *preference_box,
 									preference_dialog_item[i].item_type);
 
 		if (preference_dialog_item[i].item_type == NAUTILUS_PREFERENCE_ITEM_CONSTRAINED_INTEGER) {
-			g_assert (nautilus_strlen (preference_dialog_item[i].constrained_integer_values) > 0);
-			g_assert (nautilus_strlen (preference_dialog_item[i].constrained_integer_labels) > 0);
+			g_assert (eel_strlen (preference_dialog_item[i].constrained_integer_values) > 0);
+			g_assert (eel_strlen (preference_dialog_item[i].constrained_integer_labels) > 0);
 			nautilus_preferences_item_set_constrained_integer_values (
 				NAUTILUS_PREFERENCES_ITEM (item),
 				preference_dialog_item[i].constrained_integer_values,
@@ -1430,7 +1429,7 @@ global_preferences_populate_pane (NautilusPreferencesBox *preference_box,
 		}
 	}
 
-	nautilus_string_list_free (group_names);
+	eel_string_list_free (group_names);
 
 	return pane;
 }
@@ -1443,7 +1442,7 @@ nautilus_global_preferences_show_dialog (void)
 {
 	GtkWidget *dialog = global_preferences_get_dialog ();
 
-	nautilus_gtk_window_present (GTK_WINDOW (dialog));
+	eel_gtk_window_present (GTK_WINDOW (dialog));
 }
 
 void
@@ -1465,29 +1464,29 @@ nautilus_global_preferences_set_dialog_title (const char *title)
 	gtk_window_set_title (GTK_WINDOW (dialog), title);
 }
 
-static NautilusScalableFont *
+static EelScalableFont *
 global_preferences_get_smooth_font (const char *smooth_font_file_name)
 {
-	NautilusScalableFont *smooth_font;
+	EelScalableFont *smooth_font;
 
 	smooth_font = (smooth_font_file_name != NULL && g_file_exists (smooth_font_file_name)) ?
-		nautilus_scalable_font_new (smooth_font_file_name) :
-		nautilus_scalable_font_get_default_font ();
+		eel_scalable_font_new (smooth_font_file_name) :
+		eel_scalable_font_get_default_font ();
 	
-	g_assert (NAUTILUS_IS_SCALABLE_FONT (smooth_font));
+	g_assert (EEL_IS_SCALABLE_FONT (smooth_font));
 	return smooth_font;
 }
 
-static NautilusScalableFont *
+static EelScalableFont *
 global_preferences_get_smooth_bold_font (const char *file_name)
 {
-	NautilusScalableFont *plain_font;
-	NautilusScalableFont *bold_font;
+	EelScalableFont *plain_font;
+	EelScalableFont *bold_font;
 
 	plain_font = global_preferences_get_smooth_font (file_name);
-	g_assert (NAUTILUS_IS_SCALABLE_FONT (plain_font));
+	g_assert (EEL_IS_SCALABLE_FONT (plain_font));
 
-	bold_font = nautilus_scalable_font_make_bold (plain_font);
+	bold_font = eel_scalable_font_make_bold (plain_font);
 
 	if (bold_font == NULL) {
 		bold_font = plain_font;
@@ -1495,7 +1494,7 @@ global_preferences_get_smooth_bold_font (const char *file_name)
 		gtk_object_unref (GTK_OBJECT (plain_font));
 	}
 
-	g_assert (NAUTILUS_IS_SCALABLE_FONT (bold_font));
+	g_assert (EEL_IS_SCALABLE_FONT (bold_font));
 	return bold_font;
 }
 
@@ -1505,7 +1504,7 @@ global_preferences_get_smooth_bold_font (const char *file_name)
  * Return value: The user's smooth font for icon file names.  Need to 
  *               unref the returned GtkObject when done with it.
  */
-NautilusScalableFont *
+EelScalableFont *
 nautilus_global_preferences_get_icon_view_smooth_font (void)
 {
 	return global_preferences_get_smooth_font (icon_view_smooth_font_auto_value);
@@ -1517,7 +1516,7 @@ nautilus_global_preferences_get_icon_view_smooth_font (void)
  * Return value: The user's smooth font for default text.
  *               Need to unref the returned GtkObject when done with it.
  */
-NautilusScalableFont *
+EelScalableFont *
 nautilus_global_preferences_get_default_smooth_font (void)
 {
 	return global_preferences_get_smooth_font (default_smooth_font_auto_value);
@@ -1531,7 +1530,7 @@ nautilus_global_preferences_get_default_smooth_font (void)
  *               used. Need to unref the returned GtkObject when done
  *               with it.
  */
-NautilusScalableFont *
+EelScalableFont *
 nautilus_global_preferences_get_default_smooth_bold_font (void)
 {
 	return global_preferences_get_smooth_bold_font (default_smooth_font_auto_value);
@@ -1545,7 +1544,7 @@ smooth_graphics_mode_changed_callback (gpointer callback_data)
 
 	is_smooth = nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE);
 	
-	nautilus_smooth_widget_global_set_is_smooth (is_smooth);
+	eel_smooth_widget_global_set_is_smooth (is_smooth);
 }
 
 void
diff --git a/libnautilus-extensions/nautilus-global-preferences.h b/libnautilus-extensions/nautilus-global-preferences.h
index 867cc6794..01faee062 100644
--- a/libnautilus-extensions/nautilus-global-preferences.h
+++ b/libnautilus-extensions/nautilus-global-preferences.h
@@ -162,9 +162,9 @@ void                         nautilus_global_preferences_hide_dialog
 void                         nautilus_global_preferences_set_dialog_title                           (const char *title);
 
 /* Sidebar */
-struct NautilusScalableFont *nautilus_global_preferences_get_icon_view_smooth_font                  (void);
-struct NautilusScalableFont *nautilus_global_preferences_get_default_smooth_font                    (void);
-struct NautilusScalableFont *nautilus_global_preferences_get_default_smooth_bold_font               (void);
+struct EelScalableFont *nautilus_global_preferences_get_icon_view_smooth_font                  (void);
+struct EelScalableFont *nautilus_global_preferences_get_default_smooth_font                    (void);
+struct EelScalableFont *nautilus_global_preferences_get_default_smooth_bold_font               (void);
 
 END_GNOME_DECLS
 
diff --git a/libnautilus-extensions/nautilus-glyph.c b/libnautilus-extensions/nautilus-glyph.c
deleted file mode 100644
index cff686df3..000000000
--- a/libnautilus-extensions/nautilus-glyph.c
+++ /dev/null
@@ -1,578 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-glyph.c - A wrapper for rsvg glyphs.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-glyph.h"
-#include "nautilus-art-extensions.h"
-#include "nautilus-scalable-font-private.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-debug-drawing.h"
-
-#include <libart_lgpl/art_misc.h>
-#include <libart_lgpl/art_affine.h>
-#include <libart_lgpl/art_rgb.h>
-#include <librsvg/art_rgba.h>
-#include <librsvg/rsvg-ft.h>
-
-static gboolean glyph_is_valid             (const NautilusGlyph *glyph);
-static int      glyph_get_width_space_safe (const NautilusGlyph *glyph);
-static int      glyph_get_height_space_safe (const NautilusGlyph *glyph);
-
-/* Detail member struct */
-struct NautilusGlyph
-{
-	RsvgFTGlyph *rsvg_glyph;
-	int glyph_xy[2];
-};
-
-/**
- * nautilus_glyph_new:
- * @font: A NautilusScalableFont.
- * @text: Text to use to construct the glyph.
- * @text_length: How much of the given text to use.
- * @font_size: Font size to use when constructing the glyph.
- *
- * Returns: The newly constructed glyph.
- */
-NautilusGlyph *
-nautilus_glyph_new (const NautilusScalableFont *font,
-		    int font_size,
-		    const char *text,
-		    int text_length)
-{
-	NautilusGlyph *glyph;
-	RsvgFTGlyph *rsvg_glyph;
-	const double affine[6] = { 1, 0, 0, 1, 0, 0 };
-	int glyph_xy[2];
-	
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), NULL);
-	g_return_val_if_fail (font_size > 0, NULL);
-	g_return_val_if_fail (text != NULL, NULL);
-	g_return_val_if_fail (text[0] != '\0', NULL);
-
-	rsvg_glyph = rsvg_ft_render_string (nautilus_scalable_font_get_rsvg_context (font),
-					    nautilus_scalable_font_get_rsvg_handle (font),
-					    text,
-					    text_length,
-					    font_size,
-					    font_size,
-					    affine,
-					    glyph_xy);
-	g_return_val_if_fail (rsvg_glyph != NULL, NULL);
-
-	glyph = g_new0 (NautilusGlyph, 1);
-	glyph->rsvg_glyph = rsvg_glyph;
-	glyph->glyph_xy[0] = glyph_xy[0];
-	glyph->glyph_xy[1] = glyph_xy[1];
-
-	return glyph;
-}
-
-/**
- * nautilus_glyph_free:
- * @glyph: A NautilusGlyph.
- *
- * Returns: Free the glyph and any resoures associate with it.
- */
-void
-nautilus_glyph_free (NautilusGlyph *glyph)
-{
-	g_return_if_fail (glyph != NULL);
-
-	rsvg_ft_glyph_unref (glyph->rsvg_glyph);
-	g_free (glyph);
-}
-
-static int
-glyph_get_width_space_safe (const NautilusGlyph *glyph)
-{
-	g_return_val_if_fail (glyph != NULL, 0);
-	g_return_val_if_fail (glyph->rsvg_glyph != NULL, 0);
-
-	/* Check for the case when we have only spaces. */
-	if (glyph->rsvg_glyph->width == 0 && glyph->rsvg_glyph->xpen > 0.0) {
-		return (int) glyph->rsvg_glyph->xpen;
-	}
-
-	return glyph->rsvg_glyph->width;
-}
-
-static int
-glyph_get_height_space_safe (const NautilusGlyph *glyph)
-{
-	g_return_val_if_fail (glyph != NULL, 0);
-	g_return_val_if_fail (glyph->rsvg_glyph != NULL, 0);
-
-	/* Check for the case when we have only spaces. */
-	if (glyph->rsvg_glyph->width == 0 && glyph->rsvg_glyph->xpen > 0.0) {
-		return 1;
-	}
-
-	return glyph->rsvg_glyph->height;
-}
-
-/**
- * nautilus_glyph_get_width:
- * @glyph: A NautilusGlyph.
- *
- * Returns: The width of the glyph.
- */
-int
-nautilus_glyph_get_width (const NautilusGlyph *glyph)
-{
-	g_return_val_if_fail (glyph_is_valid (glyph), 0);
-	
-	return glyph_get_width_space_safe (glyph);
-}
-
-/**
- * nautilus_glyph_get_height:
- * @glyph: A NautilusGlyph.
- *
- * Returns: The height of the glyph.
- */
-int
-nautilus_glyph_get_height (const NautilusGlyph *glyph)
-{
-	g_return_val_if_fail (glyph_is_valid (glyph), 0);
-
-	return glyph_get_height_space_safe (glyph);
-}
-
-/**
- * nautilus_glyph_get_dimensions:
- * @glyph: A NautilusGlyph.
- *
- * Returns: An ArtIRect representing the dimensions occupied by the glyph.
- */
-NautilusDimensions
-nautilus_glyph_get_dimensions (const NautilusGlyph *glyph)
-{
-	NautilusDimensions glyph_dimensions;
-
-	g_return_val_if_fail (glyph != NULL, NAUTILUS_DIMENSIONS_EMPTY);
-	g_return_val_if_fail (glyph_is_valid (glyph), NAUTILUS_DIMENSIONS_EMPTY);
-
-	glyph_dimensions.width = glyph_get_width_space_safe (glyph);
-	glyph_dimensions.height = glyph_get_height_space_safe (glyph);
-
-	return glyph_dimensions;
-}
-
-/**
- * nautilus_glyph_get_underline_rectangle:
- * @glyph: A NautilusGlyph.
- * @rectangle: The ArtIRect to store the underline dimensions in.
- *
- * Fills @rectangle with the dimensions of the underline rectangle suitable
- * for @glyph.
- */
-void
-nautilus_glyph_get_underline_rectangle (const NautilusGlyph *glyph,
-					ArtIRect	    *rectangle)
-{
-	g_return_if_fail (glyph != NULL);
-	g_return_if_fail (glyph_is_valid (glyph));
-
-	rectangle->x0 = 0;
-	rectangle->x1 = glyph_get_width_space_safe (glyph);
-	rectangle->y0 = glyph->rsvg_glyph->underline_position;
-	rectangle->y1 = rectangle->y0 + glyph->rsvg_glyph->underline_thickness;
-}
-
-/* A glyph is valid if IT and the RsvgGlyph it wraps area not NULL */
-static gboolean
-glyph_is_valid (const NautilusGlyph *glyph)
-{
-	return glyph != NULL
-		&& glyph->rsvg_glyph != NULL
-		&& glyph_get_width_space_safe (glyph) > 0
-		&& glyph_get_height_space_safe (glyph) > 0;
-}
-
-
-/* Color packing macros for nautilus_glyph_draw_to_pixbuf */
-#define RGBA_COLOR_PACK(r, g, b, a)	\
-( ((r) << 24) |				\
-  ((g) << 16) |				\
-  ((b) <<  8) |				\
-  ((a) <<  0) )
-
-#define RGB_COLOR_PACK(r, g, b)		\
-( ((r) << 24) |				\
-  ((g) << 16) |				\
-  ((b) <<  8) )
-
-#define RGBA_COLOR_PACK_ALPHA(a)	(a)
-#define RGBA_COLOR_GET_RED(c)		(((c) >> 24) & 0xFF)
-#define RGBA_COLOR_GET_GREEN(c)		(((c) >> 16) & 0xFF)
-#define RGBA_COLOR_GET_BLUE(c)		(((c) >> 8)  & 0xFF)
-#define RGBA_COLOR_GET_ALPHA(c)		(((c) >> 0)  & 0xFF)
-
-#define ABGR_COLOR_PACK(r, g, b, a)	\
-( ((a) << 24) |				\
-  ((b) << 16) |				\
-  ((g) <<  8) |				\
-  ((r) <<  0) )
-
-#define BGR_COLOR_PACK(r, g, b)		\
-( ((b) << 16) |				\
-  ((g) <<  8) |				\
-  ((r) <<  0) )
-
-#define ABGR_COLOR_PACK_ALPHA(a)	((a) << 24)
-#define ABGR_COLOR_GET_RED(c)		(((c) >> 0)  & 0xFF)
-#define ABGR_COLOR_GET_GREEN(c)		(((c) >> 8)  & 0xFF)
-#define ABGR_COLOR_GET_BLUE(c)		(((c) >> 16) & 0xFF)
-#define ABGR_COLOR_GET_ALPHA(c)		(((c) >> 24) & 0xFF)
-
-
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define PACK_COLOR_WITH_ALPHA(r, g, b, a)	ABGR_COLOR_PACK(r, g, b, a)
-#define PACK_COLOR(r, g, b)			BGR_COLOR_PACK(r, g, b)
-#define PACK_ALPHA(a)				ABGR_COLOR_PACK_ALPHA(a)
-#define GET_RED(c)				ABGR_COLOR_GET_RED(c)
-#define GET_GREEN(c)				ABGR_COLOR_GET_GREEN(c)
-#define GET_BLUE(c)				ABGR_COLOR_GET_BLUE(c)
-#define GET_ALPHA(c)				ABGR_COLOR_GET_ALPHA(c)
-#else
-#define PACK_COLOR_WITH_ALPHA(r, g, b, a) 	RGBA_COLOR_PACK(r, g, b, a)
-#define PACK_COLOR(r, g, b)			RGB_COLOR_PACK(r, g, b)
-#define PACK_ALPHA(a)				RGBA_COLOR_PACK_ALPHA(a)
-#define GET_RED(c)				RGBA_COLOR_GET_RED(c)
-#define GET_GREEN(c)				RGBA_COLOR_GET_GREEN(c)
-#define GET_BLUE(c)				RGBA_COLOR_GET_BLUE(c)
-#define GET_ALPHA(c)				RGBA_COLOR_GET_ALPHA(c)
-#endif
-
-/**
- * nautilus_glyph_draw_to_pixbuf:
- * @glyph: A NautilusGlyph.
- * @pixbuf: The destination GdkPixbuf.
- * @destination_x: The destination X coordinate.
- * @destination_y: The destination Y coordinate.
- * @clip_area: The clip area or NULL.
- * @color: Color to render the glyph with.
- * @opacity: Overall opacity of the rendered glyph.
- *
- * Render a glyph into a GdkPixbuf.   If &clip_area is not NULL, all
- * rendering is guaranteed to lie within &clip_area.  If &clip_are is NULL,
- * rendering will occur in the full extent of the pixbuf.
- */
-void
-nautilus_glyph_draw_to_pixbuf (const NautilusGlyph *glyph,
-			       GdkPixbuf *pixbuf,
-			       int destination_x,
-			       int destination_y,
-			       const ArtIRect *clip_area,
-			       guint32 color,
-			       int opacity)
-{
- 	int pixbuf_rowstride;
- 	guchar *pixbuf_pixels;
- 	guint pixbuf_pixel_offset;
- 	gboolean pixbuf_has_alpha;
-	ArtIRect target;
-	guchar *pixbuf_x_offset;
-	guchar *pixbuf_y_offset;
-	int glyph_rowstride;
-	const guchar *glyph_buffer;
-	NautilusDimensions glyph_dimensions;
-	ArtIRect glyph_bounds;
-	const guchar *glyph_x_offset;
-	const guchar *glyph_y_offset;
-	int glyph_left_skip;
-	int glyph_top_skip;
-	ArtIRect render_area;
-	int x;
-	int y;
-	const guchar foreground_r = NAUTILUS_RGBA_COLOR_GET_R (color);
-	const guchar foreground_g = NAUTILUS_RGBA_COLOR_GET_G (color);
-	const guchar foreground_b = NAUTILUS_RGBA_COLOR_GET_B (color);
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (glyph_is_valid (glyph));
-
-	/* FIXME bugzilla.eazel.com 7346: We currently dont handle opacities
-	 * other than 0xFF.
-	 */
-	g_return_if_fail (opacity == NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	/* Check for just spaces */
-	if (glyph->rsvg_glyph->buf == NULL || glyph->rsvg_glyph->rowstride <= 0) {
-		return;
-	}
-
-	/* Clip the pixbuf to the clip area; bail if no work  */
-	target = nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, clip_area);
-	if (art_irect_empty (&target)) {
-		return;
-	}
-
-	g_return_if_fail (glyph->rsvg_glyph->buf != NULL);
-	g_return_if_fail (glyph->rsvg_glyph->rowstride > 0);
-	
-	glyph_dimensions = nautilus_glyph_get_dimensions (glyph);
-	glyph_rowstride = glyph->rsvg_glyph->rowstride;
-	glyph_buffer = glyph->rsvg_glyph->buf;
-
-	pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-	pixbuf_pixels = gdk_pixbuf_get_pixels (pixbuf);
-	pixbuf_has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
-	pixbuf_pixel_offset = pixbuf_has_alpha ? 4 : 3;
-
-	/* Compute the whole glyph bounds */
-	nautilus_art_irect_assign (&glyph_bounds,
-				   destination_x,
-				   destination_y,
-				   glyph_dimensions.width,
-				   glyph_dimensions.height);
-
-	/*
-	 * Determine the actual render area.  The render area is 
-	 * the area of the glyph bounds that lies within the pixbuf
-	 * clip area;  bail if no work.
-	 */
-	art_irect_intersect (&render_area, &target, &glyph_bounds);
-	if (art_irect_empty (&render_area)) {
- 		return;
- 	}
-
-	/* Compute the offset into the pixbuf where we want to render. */
-	pixbuf_y_offset = 
-		pixbuf_pixels
-		+ (render_area.y0 * pixbuf_rowstride)
-		+ (render_area.x0 * pixbuf_pixel_offset);
-
-	/* Compute how much of the glyph to skip on the left */
-	g_assert (render_area.y0 >= glyph_bounds.y0);
-	glyph_left_skip = render_area.x0 - glyph_bounds.x0;
-
-	/* Compute how much of the glyph to skip above */
-	g_assert (render_area.x0 >= glyph_bounds.x0);
-	glyph_top_skip = render_area.y0 - glyph_bounds.y0;
-
-	/* The glyph buffer is an array of bytes.  Each byte
-	 * represents the opacity corresponding to the pixel
-	 * at that offset.
-	 */
-
-	/* Compute the offset into the glyph buffer from where we want to read
-	 * it contents.
-	 *
-	 * The glyph buffer is an array of bytes.  Each byte represents an 
-	 * opacity for a pixel at the corresponding offset.
-	 */
-	glyph_y_offset = 
-		glyph_buffer
-		+ (glyph_top_skip * glyph_rowstride)
-		+ glyph_left_skip;
-
-
-	/* Thanks to the careful clipping above, the iterations below
-	 * should always be within the bounds of both the pixbuf's pixels
-	 * and the glyph's buffer.
-	 */
-
-	if (pixbuf_has_alpha) {
-		/* Speed optimization -- avoid calling art_rgba_run_alpha, precompute
-		 * src_rgb outside of the loop
-		 */
-		 
-		guint32 src_color, dst_color;
-		
-		src_color = PACK_COLOR(foreground_r, foreground_g, foreground_b);
-		
-		for (y = render_area.y0 ; y < render_area.y1; y++) {
-			pixbuf_x_offset = pixbuf_y_offset;
-			glyph_x_offset = glyph_y_offset;
-			
-			/* Iterate horizontally */
-			for (x = render_area.x0 ; x < render_area.x1; x++) {
-				guchar dest_alpha;
-				const guchar source_alpha = *glyph_x_offset;
-				dst_color = *(guint32 *) pixbuf_x_offset;
-				dest_alpha = GET_ALPHA (dst_color);
-		
-				if (dest_alpha) { 
-					int dst_r, dst_g, dst_b, tmp, a, c;
-
-					tmp = (255 - source_alpha) * (255 - dest_alpha) + 0x80;
-					a = 255 - ((tmp + (tmp >> 8)) >> 8);
-					c = ((source_alpha << 16) + (a >> 1)) / a;
-
-					dst_r = GET_RED (dst_color);
-					dst_g = GET_GREEN (dst_color);
-					dst_b = GET_BLUE (dst_color);
-	
-					dst_r += (((foreground_r - dst_r) * c + 0x8000) >> 16);
-					dst_g += (((foreground_g - dst_g) * c + 0x8000) >> 16);
-					dst_b += (((foreground_b - dst_b) * c + 0x8000) >> 16);
-	
-					*(guint32 *) pixbuf_x_offset = PACK_COLOR_WITH_ALPHA (dst_r, dst_g, dst_b, a);
-				} else {
-	  				*(guint32 *) pixbuf_x_offset = PACK_ALPHA (source_alpha) | src_color;
-				}
-	
-				/* Advance to the next pixel */
-				pixbuf_x_offset += pixbuf_pixel_offset;
-	
-				/* Advance to the next opacity */
-				glyph_x_offset++;
-			}
-	
-			/* Advance to the next pixbuf pixel row */
-			pixbuf_y_offset += pixbuf_rowstride;
-	
-			/* Advance to the next glyph buffer row */
-			glyph_y_offset += glyph_rowstride;
-		}
-	} else {
-		/* Iterate vertically */
-		for (y = render_area.y0 ; y < render_area.y1; y++) {
-			pixbuf_x_offset = pixbuf_y_offset;
-			glyph_x_offset = glyph_y_offset;
-			
-			/* Iterate horizontally */
-			for (x = render_area.x0 ; x < render_area.x1; x++) {
-				const guchar point_opacity = *glyph_x_offset;
-	
-				/* Optimize the common fully opaque case */
-				if (point_opacity == NAUTILUS_OPACITY_FULLY_OPAQUE) {
-					*(pixbuf_x_offset + 0) = foreground_r;
-					*(pixbuf_x_offset + 1) = foreground_g;
-					*(pixbuf_x_offset + 2) = foreground_b;
-					if (pixbuf_has_alpha) {
-						*(pixbuf_x_offset + 3) = NAUTILUS_OPACITY_FULLY_OPAQUE;
-					}
-				/* If the opacity is not fully opaque or fully transparent,
-				 * we need to to alpha blending.
-				 */
-				} else if (point_opacity != NAUTILUS_OPACITY_FULLY_TRANSPARENT) {
-					if (pixbuf_has_alpha) {
-						art_rgba_run_alpha (pixbuf_x_offset,
-								    foreground_r,
-								    foreground_g,
-								    foreground_b,
-								    point_opacity,
-								    1);
-					} else {
-						art_rgb_run_alpha (pixbuf_x_offset,
-								   foreground_r,
-								   foreground_g,
-								   foreground_b,
-								   point_opacity,
-								   1);
-					}
-				}
-	
-				/* Advance to the next pixel */
-				pixbuf_x_offset += pixbuf_pixel_offset;
-	
-				/* Advance to the next opacity */
-				glyph_x_offset++;
-			}
-	
-			/* Advance to the next pixbuf pixel row */
-			pixbuf_y_offset += pixbuf_rowstride;
-	
-			/* Advance to the next glyph buffer row */
-			glyph_y_offset += glyph_rowstride;
-		}
-	}
-}
-
-ArtIRect
-nautilus_glyph_intersect (const NautilusGlyph *glyph,
-			  int glyph_x,
-			  int glyph_y,
-			  const ArtIRect *rectangle)
-{
-	ArtIRect intersection;
-	ArtIRect bounds;
-	NautilusDimensions dimensions;
-
-	g_return_val_if_fail (glyph_is_valid (glyph), NAUTILUS_ART_IRECT_EMPTY);
-	
-	dimensions = nautilus_glyph_get_dimensions (glyph);
-	bounds = nautilus_art_irect_assign_dimensions (glyph_x, glyph_y, &dimensions);
-
-	if (rectangle == NULL) {
-		return bounds;
-	}
-
-	art_irect_intersect (&intersection, rectangle, &bounds);
-
-	/* In theory, this is not needed because a rectangle is empty
-	 * regardless of how MUCH negative the dimensions are.  
-	 * However, to make debugging and self checks simpler, we
-	 * consistenly return a standard empty rectangle.
-	 */
-	if (art_irect_empty (&intersection)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	return intersection;
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-#include <string.h>
-#include <memory.h>
-
-gboolean
-nautilus_glyph_compare (NautilusGlyph *a, NautilusGlyph *b)
-{
-	int y;
-
-	if (a->glyph_xy[0] != b->glyph_xy[0]
-	    || a->glyph_xy[1] != b->glyph_xy[1]) {
-		return FALSE;
-	}
-
-	if (a->rsvg_glyph->width != b->rsvg_glyph->width
-	    || a->rsvg_glyph->height != b->rsvg_glyph->height
-	    || a->rsvg_glyph->underline_position != b->rsvg_glyph->underline_position
-	    || a->rsvg_glyph->underline_thickness != b->rsvg_glyph->underline_thickness
-	    || a->rsvg_glyph->xpen != b->rsvg_glyph->xpen
-	    || a->rsvg_glyph->ypen != b->rsvg_glyph->ypen
-	    || a->rsvg_glyph->rowstride != b->rsvg_glyph->rowstride) {
-		return FALSE;
-	}
-
-	for (y = 0; y < a->rsvg_glyph->height; y++) {
-		if (memcmp (a->rsvg_glyph->buf + y * a->rsvg_glyph->rowstride,
-			    b->rsvg_glyph->buf + y * b->rsvg_glyph->rowstride,
-			    a->rsvg_glyph->rowstride) != 0) {
-			return FALSE;
-		}
-	}
-
-	return TRUE;
-}
-
-#endif /* NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-glyph.h b/libnautilus-extensions/nautilus-glyph.h
deleted file mode 100644
index 01411cf78..000000000
--- a/libnautilus-extensions/nautilus-glyph.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-glyph.h - A wrapper for rsvg glyphs.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_GLYPH_H
-#define NAUTILUS_GLYPH_H
-
-#include <libgnome/gnome-defs.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libart_lgpl/art_rect.h>
-#include <libnautilus-extensions/nautilus-scalable-font.h>
-#include <libnautilus-extensions/nautilus-art-extensions.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct NautilusGlyph NautilusGlyph;
-
-NautilusGlyph *    nautilus_glyph_new            (const NautilusScalableFont *font,
-						  int                         font_size,
-						  const char                 *text,
-						  int                         text_length);
-void               nautilus_glyph_free           (NautilusGlyph              *glyph);
-int                nautilus_glyph_get_width      (const NautilusGlyph        *glyph);
-int                nautilus_glyph_get_height     (const NautilusGlyph        *glyph);
-NautilusDimensions nautilus_glyph_get_dimensions (const NautilusGlyph        *glyph);
-void		   nautilus_glyph_get_underline_rectangle (const NautilusGlyph *glyph,
-							   ArtIRect	     *rectangle);
-void               nautilus_glyph_draw_to_pixbuf (const NautilusGlyph        *glyph,
-						  GdkPixbuf                  *pixbuf,
-						  int                         destination_x,
-						  int                         destination_y,
-						  const ArtIRect             *clip_area,
-						  guint32                     color,
-						  int                         opacity);
-ArtIRect           nautilus_glyph_intersect      (const NautilusGlyph        *glyph,
-						  int                         glyph_x,
-						  int                         glyph_y,
-						  const ArtIRect             *rectangle);
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-gboolean	   nautilus_glyph_compare	 (NautilusGlyph		     *a,
-						  NautilusGlyph		     *b);
-#endif /* NAUTILUS_OMIT_SELF_CHECK */
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_GLYPH_H */
-
-
diff --git a/libnautilus-extensions/nautilus-gnome-extensions.c b/libnautilus-extensions/nautilus-gnome-extensions.c
deleted file mode 100644
index a94339426..000000000
--- a/libnautilus-extensions/nautilus-gnome-extensions.c
+++ /dev/null
@@ -1,844 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gnome-extensions.c - implementation of new functions that operate on
-                                 gnome classes. Perhaps some of these should be
-  			         rolled into gnome someday.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#include <config.h>
-
-#include <sys/stat.h>
-
-#include "nautilus-gnome-extensions.h"
-
-#include <gtk/gtkwidget.h>
-#include <libart_lgpl/art_rgb.h>
-#include <libart_lgpl/art_rect.h>
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-stock-dialogs.h"
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-file-entry.h>
-#include <libgnomeui/gnome-icon-list.h>
-#include <libgnomeui/gnome-icon-sel.h>
-#include <limits.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/wait.h>
-
-/* structure for the icon selection dialog */
-struct IconSelectionData {
-        GtkWidget *icon_selection;
-	GtkWidget *file_entry;
-	GtkWidget *top_level_window;
-	GtkWindow *owning_window;
-	gboolean dismissed;
-	NautilusIconSelectionFunction selection_function;
-	gpointer callback_data;
-};
-
-typedef struct IconSelectionData IconSelectionData;
-
-void
-nautilus_gnome_canvas_world_to_window_rectangle (GnomeCanvas *canvas,
-						 const ArtDRect *world_rect,
-						 ArtIRect *window_rect)
-{
-	double x0, y0, x1, y1;
-
-	g_return_if_fail (GNOME_IS_CANVAS (canvas));
-	g_return_if_fail (world_rect != NULL);
-	g_return_if_fail (window_rect != NULL);
-
-	gnome_canvas_world_to_window (canvas,
-				      world_rect->x0,
-				      world_rect->y0,
-				      &x0, &y0);
-	gnome_canvas_world_to_window (canvas,
-				      world_rect->x1,
-				      world_rect->y1,
-				      &x1, &y1);
-
-	window_rect->x0 = x0;
-	window_rect->y0 = y0;
-	window_rect->x1 = x1;
-	window_rect->y1 = y1;
-}
-
-void
-nautilus_gnome_canvas_world_to_canvas_rectangle (GnomeCanvas *canvas,
-						 const ArtDRect *world_rect,
-						 ArtIRect *canvas_rect)
-{
-	g_return_if_fail (GNOME_IS_CANVAS (canvas));
-	g_return_if_fail (world_rect != NULL);
-	g_return_if_fail (canvas_rect != NULL);
-
-	gnome_canvas_w2c (canvas,
-			  world_rect->x0,
-			  world_rect->y0,
-			  &canvas_rect->x0,
-			  &canvas_rect->y0);
-	gnome_canvas_w2c (canvas,
-			  world_rect->x1,
-			  world_rect->y1,
-			  &canvas_rect->x1,
-			  &canvas_rect->y1);
-}
-
-void
-nautilus_gnome_canvas_item_get_current_canvas_bounds (GnomeCanvasItem *item,
-						      ArtIRect *bounds)
-{
-	g_return_if_fail (GNOME_IS_CANVAS_ITEM (item));
-	g_return_if_fail (bounds != NULL);
-
-	bounds->x0 = item->x1;
-	bounds->y0 = item->y1;
-	bounds->x1 = item->x2;
-	bounds->y1 = item->y2;
-}
-
-void
-nautilus_gnome_canvas_item_request_redraw (GnomeCanvasItem *item)
-{
-	g_return_if_fail (GNOME_IS_CANVAS_ITEM (item));
-
-	gnome_canvas_request_redraw (item->canvas,
-				     item->x1, item->y1,
-				     item->x2, item->y2);
-}
-
-void
-nautilus_gnome_canvas_request_redraw_rectangle (GnomeCanvas *canvas,
-						const ArtIRect *canvas_rectangle)
-{
-	g_return_if_fail (GNOME_IS_CANVAS (canvas));
-
-	gnome_canvas_request_redraw (canvas,
-				     canvas_rectangle->x0, canvas_rectangle->y0,
-				     canvas_rectangle->x1, canvas_rectangle->y1);
-}
-
-void
-nautilus_gnome_canvas_item_get_world_bounds (GnomeCanvasItem *item,
-					     ArtDRect *world_bounds)
-{
-	gnome_canvas_item_get_bounds (item,
-				      &world_bounds->x0,
-				      &world_bounds->y0,
-				      &world_bounds->x1,
-				      &world_bounds->y1);
-	if (item->parent != NULL) {
-		gnome_canvas_item_i2w (item->parent,
-				       &world_bounds->x0,
-				       &world_bounds->y0);
-		gnome_canvas_item_i2w (item->parent,
-				       &world_bounds->x1,
-				       &world_bounds->y1);
-	}
-}
-
-void
-nautilus_gnome_canvas_item_get_canvas_bounds (GnomeCanvasItem *item,
-					      ArtIRect *canvas_bounds)
-{
-	ArtDRect world_bounds;
-
-	nautilus_gnome_canvas_item_get_world_bounds
-		(item, &world_bounds);
-	nautilus_gnome_canvas_world_to_canvas_rectangle
-		(item->canvas, &world_bounds, canvas_bounds);
-}
-
-static void
-nautilus_gnome_canvas_draw_pixbuf_helper (art_u8 *dst, int dst_rowstride,
-					  const art_u8 *src, int src_rowstride,
-					  int copy_width, int copy_height)
-{
-	art_u8 *dst_limit = dst + copy_height * dst_rowstride;
-	int dst_bytes_per_row = copy_width * 3;
-	
-	while (dst < dst_limit) {
- 		memcpy (dst, src, dst_bytes_per_row);
-		dst += dst_rowstride;
-		src += src_rowstride;
-	}
-}
-
-static void
-nautilus_gnome_canvas_draw_pixbuf_helper_alpha (art_u8 *dst, int dst_rowstride,
-						const art_u8 *src, int src_rowstride,
-						int copy_width, int copy_height)
-{
-	art_u8 *dst_limit = dst + copy_height * dst_rowstride;
-	int dst_bytes_per_row = copy_width * 3;
-	
-	while (dst < dst_limit) {
-	
-		art_u8 *dst_p = dst;
-		art_u8 *dst_p_limit = dst + dst_bytes_per_row;
-		
-		const art_u8 *src_p = src;
-		
-		while (dst_p < dst_p_limit) {
-			int alpha = src_p[3];
-			if (alpha) {
-				if (alpha == 255) {
-					dst_p[0] = src_p[0];
-					dst_p[1] = src_p[1];
-					dst_p[2] = src_p[2];
-				} else {
-		  			int tmp;
-					art_u8 bg_r = dst_p[0];
-					art_u8 bg_g = dst_p[1];
-					art_u8 bg_b = dst_p[2];
-
-					tmp = (src_p[0] - bg_r) * alpha;
-					dst_p[0] = bg_r + ((tmp + (tmp >> 8) + 0x80) >> 8);
-					tmp = (src_p[1] - bg_g) * alpha;
-					dst_p[1] = bg_g + ((tmp + (tmp >> 8) + 0x80) >> 8);
-					tmp = (src_p[2] - bg_b) * alpha;
-					dst_p[2] = bg_b + ((tmp + (tmp >> 8) + 0x80) >> 8);		  
-				}
-			}
-			
-			dst_p += 3;
-			src_p += 4;
-		}
-		
-		dst += dst_rowstride;
-		src += src_rowstride;
-	}
-}
-
-/* Draws a pixbuf into a canvas update buffer (unscaled). The x,y coords are the location
- * of the pixbuf in canvas space (NOT relative to the canvas buffer).
- */
-void
-nautilus_gnome_canvas_draw_pixbuf (GnomeCanvasBuf *buf, const GdkPixbuf *pixbuf, int x, int y)
-{
-	art_u8 *dst;
-	int pixbuf_width, pixbuf_height;
-
-	/* copy_left/top/right/bottom define the rect of the pixbuf (pixbuf relative)
-	 * we will copy into the canvas buffer
-	 */
-	int copy_left, copy_top, copy_right, copy_bottom;
-	
-	dst = buf->buf;
-
-	pixbuf_width = gdk_pixbuf_get_width (pixbuf);
-	pixbuf_height = gdk_pixbuf_get_height (pixbuf);
-
-	if (x > buf->rect.x0) {
-		copy_left = 0;
-		dst += (x - buf->rect.x0) * 3;
-	} else {
-		copy_left = buf->rect.x0 - x;
-	}
-	
-	if (x + pixbuf_width > buf->rect.x1) {
-		copy_right = buf->rect.x1 - x;
-	} else {
-		copy_right = pixbuf_width;		
-	}
-	
-	if (copy_left >= copy_right) {
-		return;
-	}
-	
-	if (y > buf->rect.y0) {
-		dst += (y - buf->rect.y0) * buf->buf_rowstride;
-		copy_top = 0;
-	} else {
-		copy_top = buf->rect.y0 - y;
-	}
-	
-	if (y + pixbuf_height > buf->rect.y1) {
-		copy_bottom = buf->rect.y1 - y;
-	} else {
-		copy_bottom = pixbuf_height;		
-	}
-
-	if (copy_top >= copy_bottom) {
-		return;
-	}
-
-	if (gdk_pixbuf_get_has_alpha (pixbuf)) {
-		nautilus_gnome_canvas_draw_pixbuf_helper_alpha (
-			dst,
-			buf->buf_rowstride,
-			gdk_pixbuf_get_pixels (pixbuf) + copy_left * 4 + copy_top * gdk_pixbuf_get_rowstride (pixbuf),
-			gdk_pixbuf_get_rowstride (pixbuf),
-			copy_right - copy_left,
-			copy_bottom - copy_top);
-	} else {
-		nautilus_gnome_canvas_draw_pixbuf_helper (
-			dst,
-			buf->buf_rowstride,
-			gdk_pixbuf_get_pixels (pixbuf) + copy_left * 3 + copy_top * gdk_pixbuf_get_rowstride (pixbuf),
-			gdk_pixbuf_get_rowstride (pixbuf),
-			copy_right - copy_left,
-			copy_bottom - copy_top);
-	}
-}
-
-void
-nautilus_gnome_canvas_fill_rgb (GnomeCanvasBuf *buf, art_u8 r, art_u8 g, art_u8 b)
-{
-	art_u8 *dst = buf->buf;
-	int width = buf->rect.x1 - buf->rect.x0;
-	int height = buf->rect.y1 - buf->rect.y0;
-
-	if (buf->buf_rowstride == width * 3) {
-	 	art_rgb_fill_run (dst, r, g, b, width * height);
-	} else {
-		art_u8 *dst_limit = dst + height * buf->buf_rowstride;
-		while (dst < dst_limit) {
-	 		art_rgb_fill_run (dst, r, g, b, width);
-			dst += buf->buf_rowstride;
-		}
-	}
-}
-
-GtkButton *
-nautilus_gnome_dialog_get_button_by_index (GnomeDialog *dialog, int index)
-{
-	gpointer data;
-
-	g_return_val_if_fail (GNOME_IS_DIALOG (dialog), NULL);
-	g_return_val_if_fail (index >= 0, NULL);
-
-	data = g_list_nth_data (GNOME_DIALOG (dialog)->buttons, index);
-	if (data == NULL) {
-		return NULL;
-	}
-
-	return GTK_BUTTON (data);
-}
-
-void
-nautilus_gnome_canvas_item_request_update_deep (GnomeCanvasItem *item)
-{
-	GList *p;
-
-	gnome_canvas_item_request_update (item);
-	if (GNOME_IS_CANVAS_GROUP (item)) {
-		for (p = GNOME_CANVAS_GROUP (item)->item_list; p != NULL; p = p->next) {
-			nautilus_gnome_canvas_item_request_update_deep (p->data);
-		}
-	}
-}
-
-void
-nautilus_gnome_canvas_request_update_all (GnomeCanvas *canvas)
-{
-	nautilus_gnome_canvas_item_request_update_deep (canvas->root);
-}
-
-/* The gnome_canvas_set_scroll_region function doesn't do an update,
- * even though it should. The update is in there with an #if 0 around
- * it, with no explanation of why it's commented out. For now, work
- * around this by requesting an update explicitly.
- */
-void
-nautilus_gnome_canvas_set_scroll_region (GnomeCanvas *canvas,
-					 double x1, double y1,
-					 double x2, double y2)
-{
-	double old_x1, old_y1, old_x2, old_y2;
-
-	/* Change the scroll region and do an update if it changes. */
-	gnome_canvas_get_scroll_region (canvas, &old_x1, &old_y1, &old_x2, &old_y2);
-	if (old_x1 != x1 || old_y1 != y1 || old_x2 != x2 || old_y2 != y2) {
-		gnome_canvas_set_scroll_region (canvas, x1, y1, x2, y2);
-		nautilus_gnome_canvas_request_update_all (canvas);
-		gnome_canvas_item_request_update (canvas->root);
-	}
-}
-
-/* The code in GnomeCanvas (the scroll_to function to be exact) always
- * centers the contents of the canvas if the contents are smaller than
- * the canvas, and it does some questionable math when computing
- * that. This code is working to undo that mistake.
- */
-void
-nautilus_gnome_canvas_set_scroll_region_left_justify (GnomeCanvas *canvas,
-						      double x1, double y1,
-						      double x2, double y2)
-{
-	double height, width;
-
-	/* To work around the logic in scroll_to that centers the
-	 * canvas contents if they are smaller than the canvas widget,
-	 * we must do the exact opposite of what it does. The -1 here
-	 * is due to the ill-conceived ++ in scroll_to.
-	 */
-	width = (GTK_WIDGET (canvas)->allocation.width - 1) / canvas->pixels_per_unit;
-	height = (GTK_WIDGET (canvas)->allocation.height - 1) / canvas->pixels_per_unit;
-	nautilus_gnome_canvas_set_scroll_region
-		(canvas, x1, y1,
-		 MAX (x2, x1 + width), MAX (y2, y1 + height));
-}
-
-/* Set a new scroll region without eliminating any of the currently-visible area. */
-void
-nautilus_gnome_canvas_set_scroll_region_include_visible_area (GnomeCanvas *canvas,
-						      	      double x1, double y1,
-						      	      double x2, double y2)
-{
-	double old_x1, old_y1, old_x2, old_y2;
-	double old_scroll_x, old_scroll_y;
-	double height, width;
-
-	gnome_canvas_get_scroll_region (canvas, &old_x1, &old_y1, &old_x2, &old_y2);
-
-	/* The -1 here is due to the ill-conceived ++ in scroll_to. */
-	width = (GTK_WIDGET (canvas)->allocation.width - 1) / canvas->pixels_per_unit;
-	height = (GTK_WIDGET (canvas)->allocation.height - 1) / canvas->pixels_per_unit;
-
-	old_scroll_x = gtk_layout_get_hadjustment (GTK_LAYOUT (canvas))->value;
-	old_scroll_y = gtk_layout_get_vadjustment (GTK_LAYOUT (canvas))->value;
-
-	x1 = MIN (x1, old_x1 + old_scroll_x);
-	y1 = MIN (y1, old_y1 + old_scroll_y);
-	x2 = MAX (x2, old_x1 + old_scroll_x + width);
-	y2 = MAX (y2, old_y1 + old_scroll_y + height);
-
-	nautilus_gnome_canvas_set_scroll_region
-		(canvas, x1, y1, x2, y2);
-}
-
-
-/* Code from GMC, contains all the voodoo needed to start
- * a terminal from the file manager nicely
- */
-
-static int
-max_open_files (void)
-{
-	static int files;
-
-	if (files != 0) {
-		return files;
-	}
-
-#ifdef HAVE_SYSCONF
-	files = sysconf (_SC_OPEN_MAX);
-	if (files != -1)
-		return files;
-#endif
-#ifdef OPEN_MAX
-	files = OPEN_MAX;
-#else
-	files = 256;
-#endif
-	return files;
-}
-
-int 
-nautilus_gnome_shell_execute (const char *command)
-{
-	struct sigaction ignore, save_intr, save_quit, save_stop;
-	int status, i;
-	int pid;
-	
-	ignore.sa_handler = SIG_IGN;
-	sigemptyset (&ignore.sa_mask);
-	ignore.sa_flags = 0;
-	status = 0;
-    
-	sigaction (SIGINT, &ignore, &save_intr);    
-	sigaction (SIGQUIT, &ignore, &save_quit);
-
-	pid = fork ();
-	if (pid < 0){
-		return -1;
-	}
-	
-	if (pid == 0){
-		int top;
-		struct sigaction default_pipe;
-
-		top = max_open_files ();
-		sigaction (SIGINT,  &save_intr, NULL);
-		sigaction (SIGQUIT, &save_quit, NULL);
-
-		/*
-		 * reset sigpipe
-		 */
-		default_pipe.sa_handler = SIG_DFL;
-		sigemptyset (&default_pipe.sa_mask);
-		default_pipe.sa_flags = 0;
-		
-		sigaction (SIGPIPE, &default_pipe, NULL);
-		
-		for (i = 0; i < top; i++)
-			close (i);
-
-		/* Setup the file descriptor for the child */
-		   
-		/* stdin */
-		open ("/dev/null", O_APPEND);
-
-		/* stdout */
-		open ("/dev/null", O_RDONLY);
-
-		/* stderr */
-		open ("/dev/null", O_RDONLY);
-		
-		pid = fork ();
-		if (pid == 0){
-			execl ("/bin/sh", "/bin/sh", "-c", command, (char *) 0);
-			/* See note below for why we use _exit () */
-			_exit (127);		/* Exec error */
-		}
-		/* We need to use _exit instead of exit to avoid
-		 * calling the atexit handlers (specifically the gdk atexit
-		 * handler
-		 */
-		_exit (0);
-	}
-	waitpid (pid, &status, 0);
-	sigaction (SIGINT,  &save_intr, NULL);
-	sigaction (SIGQUIT, &save_quit, NULL);
-	sigaction (SIGTSTP, &save_stop, NULL);
-
-	return WEXITSTATUS(status);
-}
-
-/* Return a command string containing the path to a terminal on this system. */
-char *
-nautilus_gnome_get_terminal_path (void)
-{
-	char *terminal_path;
-	
-	/* Look up a well-known terminal app */
-	terminal_path = gnome_is_program_in_path ("gnome-terminal");
-	
-	if (terminal_path == NULL) {
-		terminal_path = gnome_is_program_in_path ("nxterm");
-	}
-	
-	if (terminal_path == NULL) {
-		terminal_path = gnome_is_program_in_path ("color-xterm");
-	}
-	
-	if (terminal_path == NULL) {
-		terminal_path = gnome_is_program_in_path ("rxvt");
-	}
-	
-	if (terminal_path == NULL) {
-		terminal_path = gnome_is_program_in_path ("xterm");
-	}
-	
-	if (terminal_path == NULL) {
-		terminal_path = gnome_is_program_in_path ("dtterm");
-	}
-
-	
-	return terminal_path;
-}
-
-void
-nautilus_gnome_open_terminal (const char *command)
-{
-	char *terminal_path;
-	char *terminal_path_with_flags;
-	char *terminal_flags;
-	gboolean using_gnome_terminal;
-	char *command_line;
-	
-	terminal_path = nautilus_gnome_get_terminal_path ();
-	if (terminal_path == NULL){
-		g_message (" Could not start a terminal ");
-		g_free (terminal_path);
-		return;
-	}
-	
-	using_gnome_terminal = strstr (terminal_path, "gnome-terminal") != NULL;
-	
-	if (command != NULL) {
-		if (using_gnome_terminal) {
-			command_line = g_strconcat (terminal_path, " -x ", command, NULL);
-		} else {
-			command_line = g_strconcat (terminal_path, " -e ", command, NULL);
-		}
-				
-		nautilus_gnome_shell_execute (command_line);
-		g_free (command_line);
-	} else {
-	        if (using_gnome_terminal) {
-			terminal_flags = " --login";
-			terminal_path_with_flags = g_strconcat (terminal_path, terminal_flags,  NULL);
-		        nautilus_gnome_shell_execute (terminal_path_with_flags);
-		        g_free (terminal_path_with_flags);
-		} else {
-			terminal_flags = " -ls";
-			terminal_path_with_flags = g_strconcat (terminal_path, terminal_flags, NULL);
-			nautilus_gnome_shell_execute (terminal_path_with_flags);
-		}
-	}
-
-	g_free (terminal_path);
-}
-
-/* create a new icon selection dialog */
-
-
-static gboolean
-widget_destroy_callback (gpointer callback_data)
-{
-	IconSelectionData *selection_data = (IconSelectionData*) callback_data;
-	gtk_widget_destroy (selection_data->top_level_window);
-	g_free (selection_data);	
-	return FALSE;
-}
-
-/* set the image of the file object to the selected file */
-static void
-icon_selected_callback (GtkWidget *button, IconSelectionData *selection_data)
-{
-	const gchar *icon_path;
-	GtkWidget *entry;
-	struct stat buf;
-	
-	gnome_icon_selection_stop_loading ( GNOME_ICON_SELECTION (selection_data->icon_selection));
-
-	entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (selection_data->file_entry));
-	icon_path = gtk_entry_get_text (GTK_ENTRY (entry));
-
-	/* if a specific file wasn't selected, put up a dialog to tell the
-	 * user to pick something, and leave the picker up
-	 */
-	stat (icon_path, &buf);
-	if (S_ISDIR (buf.st_mode)) {
-		nautilus_show_error_dialog (_("No image was selected.  You must click on an image to select it."),
-					    _("No selection made"),
-					    selection_data->owning_window);
-	} else {	 
-		/* invoke the callback to inform it of the file path */
-		selection_data->selection_function (icon_path, selection_data->callback_data);
-	}
-		
-	/* we have to get rid of the icon selection dialog, but we can't do it now, since the
-	 * file entry might still need it.  Do it when the next idle rolls around
-	 */ 
-	selection_data->dismissed = TRUE;
-	selection_data->top_level_window = gtk_widget_get_toplevel (button);
-	gtk_idle_add ((GtkFunction) widget_destroy_callback, selection_data);
-}
-
-/* handle the cancel button being pressed */
-static void
-icon_cancel_pressed (GtkWidget *button, IconSelectionData *selection_data)
-{
-	/* nothing to do if it's already been dismissed */
-	if (selection_data->dismissed) {
-		return;
-	}
-	
-	gnome_icon_selection_stop_loading(GNOME_ICON_SELECTION (selection_data->icon_selection));	
-	/* remove pending idle routine, if necessary */
-	g_free (selection_data);
-	gtk_widget_destroy (gtk_widget_get_toplevel (button));
-}
-
-/* handle an icon being selected by updating the file entry */
-static void
-list_icon_selected_callback (GnomeIconList *gil, gint num, GdkEvent *event, IconSelectionData *selection_data)
-{
-	const gchar *icon;
-	GtkWidget *entry;
-	
-	icon = gnome_icon_selection_get_icon (GNOME_ICON_SELECTION (selection_data->icon_selection), TRUE);
-
-	if (icon != NULL) {
-		entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (selection_data->file_entry));
-		gtk_entry_set_text(GTK_ENTRY (entry), icon);
-	}
-
-	/* handle double-clicks as if the user pressed OK */
-	if(event && event->type == GDK_2BUTTON_PRESS && ((GdkEventButton *)event)->button == 1) {
-		icon_selected_callback (selection_data->file_entry, selection_data);
-	}
-}
-
-/* handle the file entry changing */
-static void
-entry_activated (GtkWidget *widget, IconSelectionData *selection_data)
-{
-	struct stat buf;
-	GtkWidget *icon_selection;
-	gchar *filename;
-
-	filename = gtk_entry_get_text (GTK_ENTRY (widget));
-	if (!filename) {
-		return;
-	}
-	
-	stat (filename, &buf);
-	if (S_ISDIR (buf.st_mode)) {
-		icon_selection = selection_data->icon_selection;
-		gnome_icon_selection_clear (GNOME_ICON_SELECTION (icon_selection), TRUE);
-		gnome_icon_selection_add_directory (GNOME_ICON_SELECTION (icon_selection), filename);
-		gnome_icon_selection_show_icons(GNOME_ICON_SELECTION (icon_selection));
-	} else {
-		/* We pretend like ok has been called */
-		icon_selected_callback (selection_data->file_entry, selection_data);
-	}
-}
-
-/* here's the actual routine that creates the icon selector */
-
-GtkWidget *
-nautilus_gnome_icon_selector_new (const char *title,
-				  const char *icon_directory,
-				  GtkWindow *owner,
-				  NautilusIconSelectionFunction selected,
-				  gpointer callback_data)
-{
-	GtkWidget *dialog, *icon_selection;
-	GtkWidget *entry, *file_entry;
-	IconSelectionData *selection_data;
-	
-	dialog = gnome_dialog_new (title,
-					GNOME_STOCK_BUTTON_OK,
-					GNOME_STOCK_BUTTON_CANCEL,
-					NULL);
-
-	gnome_dialog_close_hides (GNOME_DIALOG (dialog), TRUE);
-	gnome_dialog_set_close  (GNOME_DIALOG(dialog), TRUE);
-
-	gtk_window_set_policy (GTK_WINDOW (dialog), TRUE, TRUE, TRUE);
-
-	icon_selection = gnome_icon_selection_new();
-
-	file_entry = gnome_file_entry_new (NULL,NULL);
-	
-	selection_data = g_new0 (IconSelectionData, 1);
- 	selection_data->icon_selection = icon_selection;
- 	selection_data->file_entry = file_entry;
- 	selection_data->owning_window = owner;
-	selection_data->selection_function = selected;
- 	selection_data->callback_data = callback_data;
- 	
-	gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dialog)->vbox),
-				   file_entry, FALSE, FALSE, 0);
-
-	gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dialog)->vbox),
-				   icon_selection, TRUE, TRUE, 0);
-
-	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
-	if (owner != NULL) {
-		gtk_window_set_transient_for (GTK_WINDOW (dialog), owner);
- 	}
- 	gtk_window_set_wmclass (GTK_WINDOW (dialog), "file_selector", "Nautilus");
-	gtk_widget_show_all (dialog);
-	
-	entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (file_entry));
-	
-	if (icon_directory == NULL) {
-		gtk_entry_set_text(GTK_ENTRY (entry), DATADIR "/pixmaps");
-		gnome_icon_selection_add_directory(GNOME_ICON_SELECTION (icon_selection), DATADIR "/pixmaps");	
-	} else {
-		gtk_entry_set_text(GTK_ENTRY (entry), icon_directory);
-		gnome_icon_selection_add_directory(GNOME_ICON_SELECTION (icon_selection), icon_directory);
-	}
-	
-	gnome_icon_selection_show_icons( GNOME_ICON_SELECTION (icon_selection));	
-	gnome_dialog_button_connect(GNOME_DIALOG(dialog), 
-					    0, /* OK button */
-					    GTK_SIGNAL_FUNC (icon_selected_callback),
-					    selection_data);
-	
-	gnome_dialog_button_connect (GNOME_DIALOG(dialog), 
-					    1, /* Cancel button */
-					    GTK_SIGNAL_FUNC (icon_cancel_pressed),
-					    selection_data);
-	
-	gtk_signal_connect_after(GTK_OBJECT (GNOME_ICON_SELECTION (selection_data->icon_selection)->gil),
-					 "select_icon",
-					 GTK_SIGNAL_FUNC(list_icon_selected_callback),
-					 selection_data);
-
-	gtk_signal_connect_while_alive( GTK_OBJECT (entry), "activate",
-				       GTK_SIGNAL_FUNC(entry_activated),
-				       selection_data, GTK_OBJECT (file_entry));
-
-	return dialog;
-}
-
-
-/* Set an icon on GnomeStock widget.  If the setting fails register this
- * as a new file.  Returns FALSE if even that failed */
-gboolean
-nautilus_gnome_stock_set_icon_or_register (GnomeStock *stock, const char *icon)
-{
-	GnomeStockPixmapEntryPath *new_entry;
-
-	g_return_val_if_fail (stock != NULL, FALSE);
-	g_return_val_if_fail (GNOME_IS_STOCK (stock), FALSE);
-	g_return_val_if_fail (icon != NULL, FALSE);
-
-	/* if we can set the icon and everything goes well we have succeeded */
-	if (gnome_stock_set_icon (stock, icon)) {
-		return TRUE;
-	}
-
-	/* If the icon string is not an existing file then this is just a
-	 * bogus request and we return FALSE */
-	if ( ! g_file_exists (icon)) {
-		return FALSE;
-	}
-
-	/* If icon exists but gnome_stock_set_icon fails,
-	 * that means this file has NOT been registered with
-	 * gnome stock.  Unfortunately gnome_stock is a
-	 * worthless pile of dung and doesn't do this for us.
-	 * Do note however that it DOES register this stuff
-	 * when it first creates the toolbars from
-	 * GnomeUIInfo.  Go figure.
-	 *
-	 * Note that all this will be completely different in gnome 2.0
-	 */
-
-	new_entry = g_malloc (sizeof (GnomeStockPixmapEntryPath));
-	new_entry->type = GNOME_STOCK_PIXMAP_TYPE_PATH;
-	new_entry->label = NULL;
-	new_entry->pathname = g_strdup (icon);
-	new_entry->width = 0;
-	new_entry->height = 0;
-
-	/* Register this under the "icon" as that's what
-	 * we'll look it up under later.
-	 */
-	gnome_stock_pixmap_register (icon, GNOME_STOCK_PIXMAP_REGULAR,
-				     (GnomeStockPixmapEntry *) new_entry);
-
-	return gnome_stock_set_icon (stock, icon);
-}
diff --git a/libnautilus-extensions/nautilus-gnome-extensions.h b/libnautilus-extensions/nautilus-gnome-extensions.h
deleted file mode 100644
index 83ea0399e..000000000
--- a/libnautilus-extensions/nautilus-gnome-extensions.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gnome-extensions.h - interface for new functions that operate on
-                                 gnome classes. Perhaps some of these should be
-  			         rolled into gnome someday.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#ifndef NAUTILUS_GNOME_EXTENSIONS_H
-#define NAUTILUS_GNOME_EXTENSIONS_H
-
-#include <libgnomeui/gnome-canvas.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-stock.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkwindow.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-/* icon selection callback function. */
-typedef void (* NautilusIconSelectionFunction) (const char *icon_path, gpointer callback_data);
-
-/* Causes an update as needed. The GnomeCanvas code says it should, but it doesn't. */
-void       nautilus_gnome_canvas_set_scroll_region                      (GnomeCanvas     *canvas,
-									 double           x1,
-									 double           y1,
-									 double           x2,
-									 double           y2);
-
-/* Make the scroll region bigger so the code in GnomeCanvas won't center it. */
-void       nautilus_gnome_canvas_set_scroll_region_left_justify         (GnomeCanvas     *canvas,
-									 double           x1,
-									 double           y1,
-									 double           x2,
-									 double           y2);
-
-/* Set a new scroll region without eliminating any of the currently-visible area. */
-void       nautilus_gnome_canvas_set_scroll_region_include_visible_area (GnomeCanvas     *canvas,
-									 double           x1,
-									 double           y1,
-									 double           x2,
-									 double           y2);
-
-/* For cases where you need to get more than one item updated. */
-void       nautilus_gnome_canvas_request_update_all                     (GnomeCanvas     *canvas);
-void       nautilus_gnome_canvas_item_request_update_deep               (GnomeCanvasItem *item);
-
-/* This is more handy than gnome_canvas_item_get_bounds because it
- * always returns the bounds * in world coordinates and it returns
- * them in a single rectangle.
- */
-void       nautilus_gnome_canvas_item_get_world_bounds                  (GnomeCanvasItem *item,
-									 ArtDRect        *world_bounds);
-
-/* This returns the current canvas bounds as computed by update.
- * It's not as "up to date" as get_bounds, which is accurate even
- * before an update happens.
- */
-void       nautilus_gnome_canvas_item_get_current_canvas_bounds         (GnomeCanvasItem *item,
-									 ArtIRect        *canvas_bounds);
-
-/* This returns the canvas bounds in a slower way that's always up to
- * date, even before an update.
- */
-void       nautilus_gnome_canvas_item_get_canvas_bounds                 (GnomeCanvasItem *item,
-									 ArtIRect        *canvas_bounds);
-
-/* Convenience functions for doing things with whole rectangles. */
-void       nautilus_gnome_canvas_world_to_canvas_rectangle              (GnomeCanvas     *canvas,
-									 const ArtDRect  *world_rectangle,
-									 ArtIRect        *canvas_rectangle);
-void       nautilus_gnome_canvas_world_to_window_rectangle              (GnomeCanvas     *canvas,
-									 const ArtDRect  *world_rectangle,
-									 ArtIRect        *window_rectangle);
-void       nautilus_gnome_canvas_request_redraw_rectangle               (GnomeCanvas     *canvas,
-									 const ArtIRect  *canvas_rectangle);
-
-/* Requests the entire object be redrawn.
- * Normally, you use request_update when calling from outside the canvas item
- * code. This is for within canvas item code.
- */
-void       nautilus_gnome_canvas_item_request_redraw                    (GnomeCanvasItem *item);
-void       nautilus_gnome_canvas_draw_pixbuf                            (GnomeCanvasBuf  *buf,
-									 const GdkPixbuf *pixbuf,
-									 int              x,
-									 int              y);
-void       nautilus_gnome_canvas_fill_rgb                               (GnomeCanvasBuf  *buf,
-									 art_u8           r,
-									 art_u8           g,
-									 art_u8           b);
-
-/* More functions for GnomeDialog */
-GtkButton *nautilus_gnome_dialog_get_button_by_index                    (GnomeDialog     *dialog,
-									 int              index);
-
-/* Return a command string containing the path to a terminal on this system. */
-char 	  *nautilus_gnome_get_terminal_path 				(void);
-
-/* Open up a new terminal, optionally passing in a command to execute */
-void       nautilus_gnome_open_terminal                                 (const char      *command);
-
-/* Create an icon selection dialog */
-GtkWidget	*nautilus_gnome_icon_selector_new			(const char	 *title,
-									 const char	 *icon_directory,
-									 GtkWindow	 *owner,
-									 NautilusIconSelectionFunction selected,
-									 gpointer	 callback_data);
-									 
-/* Set an icon on GnomeStock widget. If the setting fails register this
- * as a new file.  Returns FALSE if even that failed.
- */
-gboolean   nautilus_gnome_stock_set_icon_or_register                    (GnomeStock      *stock,
-									 const char      *icon);
-
-/* Execute a command. To be used in place of the exec family commands. This function
- * protects against creating zombie processes.
-*/
-int 	   nautilus_gnome_shell_execute 				 (const char 	 *command);
-
-#endif /* NAUTILUS_GNOME_EXTENSIONS_H */
diff --git a/libnautilus-extensions/nautilus-graphic-effects.c b/libnautilus-extensions/nautilus-graphic-effects.c
deleted file mode 100644
index 2580a9d82..000000000
--- a/libnautilus-extensions/nautilus-graphic-effects.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* Nautilus - pixbuf manipulation routines for graphical effects.
- *
- * Copyright (C) 2000 Eazel, Inc
- *
- * Author: Andy Hertzfeld <andy@eazel.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* This file contains pixbuf manipulation routines used for graphical effects like pre-lighting
-   and selection hilighting */
-
-#include <config.h>
-
-#include <libart_lgpl/art_config.h>
-#include <libart_lgpl/art_rect.h>
-#include <libart_lgpl/art_rgb.h>
-
-#include "nautilus-graphic-effects.h"
-
-/* shared utility to create a new pixbuf from the passed-in one */
-
-static GdkPixbuf *
-create_new_pixbuf (GdkPixbuf *src)
-{
-	g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
-	g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
-			       && gdk_pixbuf_get_n_channels (src) == 3)
-			      || (gdk_pixbuf_get_has_alpha (src)
-				  && gdk_pixbuf_get_n_channels (src) == 4), NULL);
-
-	return gdk_pixbuf_new (gdk_pixbuf_get_colorspace (src),
-			       gdk_pixbuf_get_has_alpha (src),
-			       gdk_pixbuf_get_bits_per_sample (src),
-			       gdk_pixbuf_get_width (src),
-			       gdk_pixbuf_get_height (src));
-}
-
-static GdkPixbuf *
-create_new_pixbuf_with_alpha (GdkPixbuf *src)
-{
-	g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
-	g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
-			       && gdk_pixbuf_get_n_channels (src) == 3)
-			      || (gdk_pixbuf_get_has_alpha (src)
-				  && gdk_pixbuf_get_n_channels (src) == 4), NULL);
-
-	return gdk_pixbuf_new (gdk_pixbuf_get_colorspace (src),
-			       TRUE,
-			       gdk_pixbuf_get_bits_per_sample (src),
-			       gdk_pixbuf_get_width (src),
-			       gdk_pixbuf_get_height (src));
-}
-
-/* utility routine to bump the level of a color component with pinning */
-
-static guchar
-lighten_component (guchar cur_value)
-{
-	int new_value = cur_value;
-	new_value += 24 + (new_value >> 3);
-	if (new_value > 255) {
-		new_value = 255;
-	}
-	return (guchar) new_value;
-}
-
-GdkPixbuf *
-nautilus_create_spotlight_pixbuf (GdkPixbuf* src)
-{
-	GdkPixbuf *dest;
-	int i, j;
-	int width, height, has_alpha, src_row_stride, dst_row_stride;
-	guchar *target_pixels, *original_pixels;
-	guchar *pixsrc, *pixdest;
-
-	g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
-	g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
-			       && gdk_pixbuf_get_n_channels (src) == 3)
-			      || (gdk_pixbuf_get_has_alpha (src)
-				  && gdk_pixbuf_get_n_channels (src) == 4), NULL);
-	g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (src) == 8, NULL);
-
-	dest = create_new_pixbuf (src);
-	
-	has_alpha = gdk_pixbuf_get_has_alpha (src);
-	width = gdk_pixbuf_get_width (src);
-	height = gdk_pixbuf_get_height (src);
-	dst_row_stride = gdk_pixbuf_get_rowstride (dest);
-	src_row_stride = gdk_pixbuf_get_rowstride (src);
-	target_pixels = gdk_pixbuf_get_pixels (dest);
-	original_pixels = gdk_pixbuf_get_pixels (src);
-
-	for (i = 0; i < height; i++) {
-		pixdest = target_pixels + i * dst_row_stride;
-		pixsrc = original_pixels + i * src_row_stride;
-		for (j = 0; j < width; j++) {		
-			*pixdest++ = lighten_component (*pixsrc++);
-			*pixdest++ = lighten_component (*pixsrc++);
-			*pixdest++ = lighten_component (*pixsrc++);
-			if (has_alpha) {
-				*pixdest++ = *pixsrc++;
-			}
-		}
-	}
-	return dest;
-}
-
-
-/* the following routine was stolen from the panel to darken a pixbuf, by manipulating the saturation */
-
-/* saturation is 0-255, darken is 0-255 */
-
-GdkPixbuf *
-nautilus_create_darkened_pixbuf (GdkPixbuf *src, int saturation, int darken)
-{
-	gint i, j;
-	gint width, height, src_row_stride, dest_row_stride;
-	gboolean has_alpha;
-	guchar *target_pixels, *original_pixels;
-	guchar *pixsrc, *pixdest;
-	guchar intensity;
-	guchar alpha;
-	guchar negalpha;
-	guchar r, g, b;
-	GdkPixbuf *dest;
-
-	g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
-	g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
-			       && gdk_pixbuf_get_n_channels (src) == 3)
-			      || (gdk_pixbuf_get_has_alpha (src)
-				  && gdk_pixbuf_get_n_channels (src) == 4), NULL);
-	g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (src) == 8, NULL);
-
-	dest = create_new_pixbuf (src);
-
-	has_alpha = gdk_pixbuf_get_has_alpha (src);
-	width = gdk_pixbuf_get_width (src);
-	height = gdk_pixbuf_get_height (src);
-	dest_row_stride = gdk_pixbuf_get_rowstride (dest);
-	src_row_stride = gdk_pixbuf_get_rowstride (src);
-	target_pixels = gdk_pixbuf_get_pixels (dest);
-	original_pixels = gdk_pixbuf_get_pixels (src);
-
-	for (i = 0; i < height; i++) {
-		pixdest = target_pixels + i * dest_row_stride;
-		pixsrc = original_pixels + i * src_row_stride;
-		for (j = 0; j < width; j++) {
-			r = *pixsrc++;
-			g = *pixsrc++;
-			b = *pixsrc++;
-			intensity = (r * 77 + g * 150 + b * 28) >> 8;
-			negalpha = ((255 - saturation) * darken) >> 8;
-			alpha = (saturation * darken) >> 8;
-			*pixdest++ = (negalpha * intensity + alpha * r) >> 8;
-			*pixdest++ = (negalpha * intensity + alpha * g) >> 8;
-			*pixdest++ = (negalpha * intensity + alpha * b) >> 8;
-			if (has_alpha) {
-				*pixdest++ = *pixsrc++;
-			}
-		}
-	}
-	return dest;
-}
-
-/* this routine colorizes the passed-in pixbuf by multiplying each pixel with the passed in color */
-
-GdkPixbuf *
-nautilus_create_colorized_pixbuf (GdkPixbuf *src,
-				  int red_value,
-				  int green_value,
-				  int blue_value)
-{
-	int i, j;
-	int width, height, has_alpha, src_row_stride, dst_row_stride;
-	guchar *target_pixels;
-	guchar *original_pixels;
-	guchar *pixsrc;
-	guchar *pixdest;
-	GdkPixbuf *dest;
-	
-	g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
-	g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
-			       && gdk_pixbuf_get_n_channels (src) == 3)
-			      || (gdk_pixbuf_get_has_alpha (src)
-				  && gdk_pixbuf_get_n_channels (src) == 4), NULL);
-	g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (src) == 8, NULL);
-
-	dest = create_new_pixbuf (src);
-	
-	has_alpha = gdk_pixbuf_get_has_alpha (src);
-	width = gdk_pixbuf_get_width (src);
-	height = gdk_pixbuf_get_height (src);
-	src_row_stride = gdk_pixbuf_get_rowstride (src);
-	dst_row_stride = gdk_pixbuf_get_rowstride (dest);
-	target_pixels = gdk_pixbuf_get_pixels (dest);
-	original_pixels = gdk_pixbuf_get_pixels (src);
-
-	for (i = 0; i < height; i++) {
-		pixdest = target_pixels + i*dst_row_stride;
-		pixsrc = original_pixels + i*src_row_stride;
-		for (j = 0; j < width; j++) {		
-			*pixdest++ = (*pixsrc++ * red_value) >> 8;
-			*pixdest++ = (*pixsrc++ * green_value) >> 8;
-			*pixdest++ = (*pixsrc++ * blue_value) >> 8;
-			if (has_alpha) {
-				*pixdest++ = *pixsrc++;
-			}
-		}
-	}
-	return dest;
-}
-
-/* utility to stretch a frame to the desired size */
-
-static void
-draw_frame_row (GdkPixbuf *frame_image, int target_width, int source_width, int source_v_position, int dest_v_position, GdkPixbuf *result_pixbuf, int left_offset, int height)
-{
-	int remaining_width, h_offset, slab_width;
-	
-	remaining_width = target_width;
-	h_offset = 0;
-	while (remaining_width > 0) {	
-		slab_width = remaining_width > source_width ? source_width : remaining_width;
-		gdk_pixbuf_copy_area (frame_image, left_offset, source_v_position, slab_width, height, result_pixbuf, left_offset + h_offset, dest_v_position);
-		remaining_width -= slab_width;
-		h_offset += slab_width; 
-	}
-}
-
-/* utility to draw the middle section of the frame in a loop */
-static void
-draw_frame_column (GdkPixbuf *frame_image, int target_height, int source_height, int source_h_position, int dest_h_position, GdkPixbuf *result_pixbuf, int top_offset, int width)
-{
-	int remaining_height, v_offset, slab_height;
-	
-	remaining_height = target_height;
-	v_offset = 0;
-	while (remaining_height > 0) {	
-		slab_height = remaining_height > source_height ? source_height : remaining_height;
-		gdk_pixbuf_copy_area (frame_image, source_h_position, top_offset, width, slab_height, result_pixbuf, dest_h_position, top_offset + v_offset);
-		remaining_height -= slab_height;
-		v_offset += slab_height; 
-	}
-}
-
-GdkPixbuf *
-nautilus_stretch_frame_image (GdkPixbuf *frame_image, int left_offset, int top_offset, int right_offset, int bottom_offset,
-				int dest_width, int dest_height, gboolean fill_flag)
-{
-	GdkPixbuf *result_pixbuf;
-	guchar *pixels_ptr;
-	int frame_width, frame_height;
-	int y, row_stride;
-	int target_width, target_frame_width;
-	int target_height, target_frame_height;
-	
-	frame_width  = gdk_pixbuf_get_width  (frame_image);
-	frame_height = gdk_pixbuf_get_height (frame_image );
-	
-	if (fill_flag) {
-		result_pixbuf = gdk_pixbuf_scale_simple (frame_image, dest_width, dest_height, GDK_INTERP_NEAREST);
-	} else {
-		result_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, dest_width, dest_height);
-	}
-	row_stride = gdk_pixbuf_get_rowstride (result_pixbuf);
-	pixels_ptr = gdk_pixbuf_get_pixels (result_pixbuf);
-	
-	/* clear the new pixbuf */
-	if (!fill_flag) {
-		for (y = 0; y < dest_height; y++) {
-			art_rgb_run_alpha (pixels_ptr, 255, 255, 255, 255, dest_width);
-			pixels_ptr += row_stride; 
-		}
-	}
-	
-	target_width  = dest_width - left_offset - right_offset;
-	target_frame_width = frame_width - left_offset - right_offset;
-	
-	target_height  = dest_height - top_offset - bottom_offset;
-	target_frame_height = frame_height - top_offset - bottom_offset;
-	
-	/* draw the left top corner  and top row */
-	gdk_pixbuf_copy_area (frame_image, 0, 0, left_offset, top_offset, result_pixbuf, 0,  0);
-	draw_frame_row (frame_image, target_width, target_frame_width, 0, 0, result_pixbuf, left_offset, top_offset);
-	
-	/* draw the right top corner and left column */
-	gdk_pixbuf_copy_area (frame_image, frame_width - right_offset, 0, right_offset, top_offset, result_pixbuf, dest_width - right_offset,  0);
-	draw_frame_column (frame_image, target_height, target_frame_height, 0, 0, result_pixbuf, top_offset, left_offset);
-
-	/* draw the bottom right corner and bottom row */
-	gdk_pixbuf_copy_area (frame_image, frame_width - right_offset, frame_height - bottom_offset, right_offset, bottom_offset, result_pixbuf, dest_width - right_offset,  dest_height - bottom_offset);
-	draw_frame_row (frame_image, target_width, target_frame_width, frame_height - bottom_offset, dest_height - bottom_offset, result_pixbuf, left_offset, bottom_offset);
-		
-	/* draw the bottom left corner and the right column */
-	gdk_pixbuf_copy_area (frame_image, 0, frame_height - bottom_offset, left_offset, bottom_offset, result_pixbuf, 0,  dest_height - bottom_offset);
-	draw_frame_column (frame_image, target_height, target_frame_height, frame_width - right_offset, dest_width - right_offset, result_pixbuf, top_offset, right_offset);
-	
-	return result_pixbuf;
-}
-
-
-/* draw an arbitrary frame around an image, with the result passed back in a newly allocated pixbuf */
-GdkPixbuf *
-nautilus_embed_image_in_frame (GdkPixbuf *source_image, GdkPixbuf *frame_image, int left_offset, int top_offset, int right_offset, int bottom_offset)
-{
-	GdkPixbuf *result_pixbuf;
-	int source_width, source_height;
-	int dest_width, dest_height;
-	
-	source_width  = gdk_pixbuf_get_width  (source_image);
-	source_height = gdk_pixbuf_get_height (source_image);
-
-	dest_width  = source_width  + left_offset + right_offset;
-	dest_height = source_height + top_offset  + bottom_offset;
-	
-	result_pixbuf = nautilus_stretch_frame_image (frame_image, left_offset, top_offset, right_offset, bottom_offset, 
-						      dest_width, dest_height, FALSE);
-		
-	/* Finally, copy the source image into the framed area */
-	gdk_pixbuf_copy_area (source_image, 0, 0, source_width, source_height, result_pixbuf, left_offset,  top_offset);
-
-	return result_pixbuf;
-}
-
-
-/* this routine takes the source pixbuf and returns a new one that's semi-transparent, by
-   clearing every other pixel's alpha value in a checkerboard grip.  We have to do the
-   checkerboard instead of reducing the alpha since it will be turned into an alpha-less
-   gdkpixmap and mask for the actual dragging */
-
-GdkPixbuf *
-nautilus_make_semi_transparent (GdkPixbuf *src)
-{
-	gint i, j, temp_alpha;
-	gint width, height, has_alpha, src_row_stride, dst_row_stride;
-	guchar *target_pixels, *original_pixels;
-	guchar *pixsrc, *pixdest;
-	guchar alpha_value;
-	GdkPixbuf *dest_pixbuf;
-	guchar start_alpha_value;
-	
-	g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
-	g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
-			       && gdk_pixbuf_get_n_channels (src) == 3)
-			      || (gdk_pixbuf_get_has_alpha (src)
-				  && gdk_pixbuf_get_n_channels (src) == 4), NULL);
-	g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (src) == 8, NULL);
-
-	dest_pixbuf = create_new_pixbuf_with_alpha (src);
-
-	has_alpha = gdk_pixbuf_get_has_alpha (src);
-	width = gdk_pixbuf_get_width (src);
-	height = gdk_pixbuf_get_height (src);
-	src_row_stride = gdk_pixbuf_get_rowstride (src);
-	dst_row_stride = gdk_pixbuf_get_rowstride (dest_pixbuf);
-	
-	/* set up pointers to the actual pixels */
-	target_pixels = gdk_pixbuf_get_pixels (dest_pixbuf);
-	original_pixels = gdk_pixbuf_get_pixels (src);
-
-	/* loop through the pixels to do the actual work, copying from the source to the destination */
-	start_alpha_value = ~0;
-	for (i = 0; i < height; i++) {
-		pixdest = target_pixels + i * dst_row_stride;
-		pixsrc = original_pixels + i * src_row_stride;
-		alpha_value = start_alpha_value;
-		for (j = 0; j < width; j++) {
-			*pixdest++ = *pixsrc++; /* red */
-			*pixdest++ = *pixsrc++; /* green */
-			*pixdest++ = *pixsrc++; /* blue */
-			
-			if (has_alpha) {
-				temp_alpha = *pixsrc++;
-			} else {
-				temp_alpha = ~0;
-			}
-			*pixdest++ = temp_alpha & alpha_value;
-			
-			alpha_value = ~alpha_value;
-		}
-		
-		start_alpha_value = ~start_alpha_value;
-	}
-	
-	return dest_pixbuf;
-}
-
diff --git a/libnautilus-extensions/nautilus-graphic-effects.h b/libnautilus-extensions/nautilus-graphic-effects.h
deleted file mode 100644
index 2f9afa899..000000000
--- a/libnautilus-extensions/nautilus-graphic-effects.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-graphic-effects.h: Pixmap manipulation routines for graphical effects.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   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.
- 
-   Authors: Andy Hertzfeld <andy@eazel.com>
- */
-
-#ifndef NAUTILUS_GRAPHIC_EFFECTS_H
-#define NAUTILUS_GRAPHIC_EFFECTS_H
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-/* return a lightened pixbuf for pre-lighting */
-GdkPixbuf *nautilus_create_spotlight_pixbuf (GdkPixbuf *source_pixbuf);
-
-/* return a darkened pixbuf for selection hiliting */
-GdkPixbuf *nautilus_create_darkened_pixbuf  (GdkPixbuf *source_pixbuf,
-					     int        saturation,
-					     int        darken);
-
-/* return a pixbuf colorized with the color specified by the parameters */
-GdkPixbuf* nautilus_create_colorized_pixbuf (GdkPixbuf *source_pixbuf,
-					     int        red_value,
-					     int        green_value,
-					     int        blue_value);
-
-/* stretch a image frame */
-GdkPixbuf *nautilus_stretch_frame_image (GdkPixbuf *frame_image, int left_offset, int top_offset,
-					 int right_offset, int bottom_offset,
-					 int dest_width, int dest_height,
-					 gboolean fill_flag);
-
-/* embed in image in a frame */
-GdkPixbuf *nautilus_embed_image_in_frame (GdkPixbuf *source_image, GdkPixbuf *frame_image, int left_offset, int top_offset, int right_offset, int bottom_offset);
-
-/* return a semi-transparent pixbuf from the source pixbuf using a checkboard
-   stipple in the alpha channel (so it can be converted to an alpha-less pixmap) */
-GdkPixbuf *nautilus_make_semi_transparent   (GdkPixbuf *source_pixbuf);
-
-#endif /* NAUTILUS_GRAPHIC_EFFECTS_H */
diff --git a/libnautilus-extensions/nautilus-gtk-extensions.c b/libnautilus-extensions/nautilus-gtk-extensions.c
deleted file mode 100644
index 82018c7a8..000000000
--- a/libnautilus-extensions/nautilus-gtk-extensions.c
+++ /dev/null
@@ -1,2183 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gtk-extensions.c - implementation of new functions that operate on
-  			       gtk classes. Perhaps some of these should be
-  			       rolled into gtk someday.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: John Sullivan <sullivan@eazel.com>
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-gtk-extensions.h"
-
-#include "nautilus-gdk-font-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-string.h"
-#include <gdk/gdk.h>
-#include <gdk/gdkprivate.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkrc.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-geometry.h>
-#include <libgnomeui/gnome-winhints.h>
-
-/* This number should be large enough to be visually noticeable,
- * but small enough to not allow the user to perform other actions.
- */
-#define BUTTON_AUTO_HIGHLIGHT_MILLISECONDS	100
-
-/* This number is fairly arbitrary. Long enough to show a pretty long
- * menu title, but not so long to make a menu grotesquely wide.
- */
-#define MAXIMUM_MENU_TITLE_LENGTH	48
-
-/* Used for window position & size sanity-checking. The sizes are big enough to prevent
- * at least normal-sized gnome panels from obscuring the window at the screen edges. 
- */
-#define MINIMUM_ON_SCREEN_WIDTH		100
-#define MINIMUM_ON_SCREEN_HEIGHT	100
-
-/* GTK buttons cram the text too close to the edge of the buttons by default.
- * This is the standard padding used to make them look non-crammed.
- */
-#define NAUTILUS_STANDARD_BUTTON_PADDING 1
-
-/* How far down the window tree will we search when looking for top-level
- * windows? Some window managers doubly-reparent the client, so account
- * for that, and add some slop.
- */
-#define MAXIMUM_WM_REPARENTING_DEPTH 4
-
-static gboolean
-finish_button_activation (gpointer data)
-{
-	GtkButton *button;
-	
-	button = GTK_BUTTON (data);
-
-	if (!GTK_OBJECT_DESTROYED (button) && !button->in_button) {
-		gtk_button_clicked (button);
-	}
-
-	/* Check again--button can be destroyed during call to gtk_button_clicked */
-	if (!GTK_OBJECT_DESTROYED (button)) {
-		gtk_button_released (button);
-	}
-
-	/* This was ref'd in nautilus_gtk_button_auto_click */
-	gtk_object_unref (GTK_OBJECT (button));
-
-	return FALSE;	
-}
-
-/**
- * nautilus_gtk_button_auto_click:
- * 
- * Programatically activate a button as if the user had clicked on it,
- * including briefly drawing the button's pushed-in state.
- * @button: Any GtkButton.
- **/
-void
-nautilus_gtk_button_auto_click (GtkButton *button)
-{
-	g_return_if_fail (GTK_IS_BUTTON (button));
-
-	if (!GTK_WIDGET_IS_SENSITIVE (GTK_WIDGET (button))) {
-		return;
-	}
-
-	button->in_button = TRUE;
-	gtk_button_pressed (button);
-	button->in_button = FALSE;
-
-	/* FIXME bugzilla.eazel.com 2562:
-	 * Nothing is preventing other events from occuring between
-	 * now and when this timeout function fires, which means in
-	 * theory the user could click on a different row or otherwise
-	 * get in between the double-click and the button activation.
-	 * In practice the timeout is short enough that this probably
-	 * isn't a problem.
-	 */
-
-	/* This is unref'ed in finish_button_activation */
-	gtk_object_ref (GTK_OBJECT (button));
-
-	g_timeout_add (BUTTON_AUTO_HIGHLIGHT_MILLISECONDS, 
-		       finish_button_activation, button);
-}
-
-/**
- * nautilus_gtk_button_set_padding
- * 
- * Adds some padding around the contained widget in the button (typically the label).
- * @button: a GtkButton
- * @pad_amount: number of pixels of space to add around the button's contents.
- * GNOME_PAD_SMALL is a typical value.
- **/
-void
-nautilus_gtk_button_set_padding (GtkButton *button, int pad_amount)
-{
-	g_return_if_fail (GTK_IS_BUTTON (button));
-	g_return_if_fail (pad_amount > 0);
-
-	gtk_misc_set_padding (GTK_MISC (GTK_BIN(button)->child), 
-			      pad_amount, 
-			      pad_amount);
-}
-
-/**
- * nautilus_gtk_button_set_standard_padding
- * 
- * Adds the standard amount of padding around the contained widget in the button 
- * (typically the label). Use this rather than nautilus_gtk_button_set_padding
- * unless you have a specific reason to use a non-standard amount.
- * @button: a GtkButton
- **/
-void
-nautilus_gtk_button_set_standard_padding (GtkButton *button)
-{
-	g_return_if_fail (GTK_IS_BUTTON (button));
-
-	nautilus_gtk_button_set_padding (button, NAUTILUS_STANDARD_BUTTON_PADDING);
-}
-
-
-/**
- * nautilus_gtk_clist_get_first_selected_row:
- * 
- * Get the index of the first selected row, or -1 if no rows are selected.
- * @list: Any GtkCList
- **/
-int 
-nautilus_gtk_clist_get_first_selected_row (GtkCList *list)
-{
-	GtkCListRow *row;
-	GList *p;
-	int row_number;
-
-	g_return_val_if_fail (GTK_IS_CLIST (list), -1);
-
-	row_number = 0;
-	for (p = GTK_CLIST (list)->row_list; p != NULL; p = p->next) {
-		row = p->data;
-		if (row->state == GTK_STATE_SELECTED) {
-			return row_number;	
-		}
-
-		++row_number;
-	}
-
-	return -1;
-}
-
-/**
- * nautilus_gtk_clist_get_last_selected_row:
- * 
- * Get the index of the last selected row, or -1 if no rows are selected.
- * @list: Any GtkCList
- **/
-int 
-nautilus_gtk_clist_get_last_selected_row (GtkCList *list)
-{
-	GtkCListRow *row;
-	GList *p;
-	int row_number;
-
-	g_return_val_if_fail (GTK_IS_CLIST (list), -1);
-
-	row_number = GTK_CLIST (list)->rows - 1;
-	for (p = GTK_CLIST (list)->row_list_end; p != NULL; p = p->prev) {
-		row = p->data;
-		if (row->state == GTK_STATE_SELECTED) {
-			return row_number;	
-		}
-
-		--row_number;
-	}
-
-	return -1;
-}
-
-static gint
-activate_button_on_double_click (GtkWidget *widget,
-		     		 GdkEventButton *event,
-		     		 gpointer user_data)
-{
-	g_assert (GTK_IS_CLIST (widget));
-	g_assert (GTK_IS_BUTTON (user_data));
-
-	/* Treat double-click like single click followed by
-	 * click on specified button.
-	 */
-	if (event->type == GDK_2BUTTON_PRESS 
-	    && GTK_WIDGET_SENSITIVE (GTK_WIDGET (user_data))) {
-		nautilus_gtk_button_auto_click (GTK_BUTTON (user_data));
-	}
-	
-	return FALSE;
-}	
-
-/**
- * nautilus_gtk_clist_set_double_click_button:
- * 
- * Set a button to be auto-clicked when a clist gets a double-click.
- * @clist: Any GtkCList
- * @button: A GtkButton that will be auto-clicked when the clist gets
- * a double-click event. If the button is not sensitive, this function
- * does nothing.
- **/
-void
-nautilus_gtk_clist_set_double_click_button (GtkCList *clist, GtkButton *button)
-{
-	g_return_if_fail (GTK_IS_CLIST (clist));
-	g_return_if_fail (GTK_IS_BUTTON (button));
-
-	gtk_signal_connect (GTK_OBJECT (clist), 
-			    "button_press_event",
-			    (GtkSignalFunc) activate_button_on_double_click,
-			    button);
-
-}
-
-/**
- * nautilus_gtk_signal_connect_free_data_custom:
- * 
- * Attach a function pointer and user data to a signal, and call a
- * a destroy function on the user data when the signal is disconnected.
- * @object: the object which emits the signal. For example, a button in the button press signal.
- * @name: the name of the signal.
- * @func: function pointer to attach to the signal.
- * @data: the user data associated with the function.
- * @destroy_func: the function to call on the user data when the signal
- * is disconnected.
- **/
-guint nautilus_gtk_signal_connect_free_data_custom (GtkObject *object,
-				  	     	    const gchar *name,
-				  	     	    GtkSignalFunc func,
-				  	     	    gpointer data,
-				  	     	    GtkDestroyNotify destroy_func)
-{
-	return gtk_signal_connect_full (object, 
-					name, 
-					func, 
-					NULL, /* marshal */
-					data, 
-					destroy_func, 
-					FALSE, /* is this an object signal? */
-					FALSE); /* invoke func after signal? */
-}
-
-/**
- * nautilus_gtk_signal_connect_free_data:
- * 
- * Attach a function pointer and user data to a signal, and free
- * the user data when the signal is disconnected.
- * @object: the object which emits the signal. For example, a button in the button press signal.
- * @name: the name of the signal.
- * @func: function pointer to attach to the signal.
- * @data: the user data associated with the function. g_free() will be called on
- * this user data when the signal is disconnected.
- **/
-guint
-nautilus_gtk_signal_connect_free_data (GtkObject *object,
-				       const gchar *name,
-				       GtkSignalFunc func,
-				       gpointer data)
-{
-	return nautilus_gtk_signal_connect_free_data_custom
-		(object, name, func, data, g_free);
-}
-
-/**
- * nautilus_gtk_window_present:
- * 
- * Presents to the user a window that may be hidden, iconified, or buried.
- * @window: The GtkWindow to be presented to the user.
- **/
-void
-nautilus_gtk_window_present (GtkWindow *window)
-{
-	GdkWindow *gdk_window;
-	int current_workspace, window_workspace;
-
-	g_return_if_fail (GTK_IS_WINDOW (window));
-
-	/* Ensure that the window is on the current desktop */
-	if (GTK_WIDGET_REALIZED (GTK_WIDGET (window))) {
-		window_workspace = gnome_win_hints_get_workspace (GTK_WIDGET (window));
-		current_workspace = gnome_win_hints_get_current_workspace ();
-		if (window_workspace != current_workspace) {
-			gtk_widget_hide (GTK_WIDGET (window));
-			gnome_win_hints_set_workspace (GTK_WIDGET (window),
-						       current_workspace);
-		}
-	}
-		
-	/* If we have no gdk window, then it's OK to just show, since
-	 * the window is new and presumably will show up in front.
-	 */
-	gdk_window = GTK_WIDGET (window)->window;
-	if (gdk_window != NULL) {
-		nautilus_gdk_window_bring_to_front (gdk_window);
-	}
-
-	gtk_widget_show (GTK_WIDGET (window));
-}
-
-static int
-handle_standard_close_accelerator (GtkWindow *window, 
-				   GdkEventKey *event, 
-				   gpointer user_data)
-{
-	g_assert (GTK_IS_WINDOW (window));
-	g_assert (event != NULL);
-	g_assert (user_data == NULL);
-
-	if (nautilus_gtk_window_event_is_close_accelerator (window, event)) {
-		if (GNOME_IS_DIALOG (window)) {
-			gnome_dialog_close (GNOME_DIALOG (window));
-		} else {
-			gtk_widget_hide (GTK_WIDGET (window));
-		}
-		gtk_signal_emit_stop_by_name 
-			(GTK_OBJECT (window), "key_press_event");
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-/**
- * nautilus_gtk_window_event_is_close_accelerator:
- * 
- * Tests whether a key event is the standard window close accelerator.
- * Not needed for clients that use nautilus_gtk_window_set_up_close_accelerator;
- * use only if you must set up your own key_event handler for your own reasons.
- **/
-gboolean
-nautilus_gtk_window_event_is_close_accelerator (GtkWindow *window, GdkEventKey *event)
-{
-	g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	if (event->state & GDK_CONTROL_MASK) {
-		/* Note: menu item equivalents are case-sensitive, so we will
-		 * be case-sensitive here too.
-		 */		
-		if (event->keyval == NAUTILUS_STANDARD_CLOSE_WINDOW_CONTROL_KEY) {
-			return TRUE;
-		}
-	}
-
-	return FALSE;	
-}
-
-/**
- * nautilus_gtk_window_set_up_close_accelerator:
- * 
- * Sets up the standard keyboard equivalent to close the window.
- * Call this for windows that don't set up a keyboard equivalent to
- * close the window some other way, e.g. via a menu item accelerator.
- * 
- * @window: The GtkWindow that should be hidden when the standard
- * keyboard equivalent is typed.
- **/
-void
-nautilus_gtk_window_set_up_close_accelerator (GtkWindow *window)
-{
-	g_return_if_fail (GTK_IS_WINDOW (window));
-
-	gtk_signal_connect (GTK_OBJECT (window),
-			    "key_press_event",
-			    GTK_SIGNAL_FUNC (handle_standard_close_accelerator),
-			    NULL);
-}
-
-static void
-sanity_check_window_position (int *left, int *top)
-{
-	g_assert (left != NULL);
-	g_assert (top != NULL);
-
-	/* Make sure the top of the window is on screen, for
-	 * draggability (might not be necessary with all window managers,
-	 * but seems reasonable anyway). Make sure the top of the window
-	 * isn't off the bottom of the screen, or so close to the bottom
-	 * that it might be obscured by the panel.
-	 */
-	*top = CLAMP (*top, 0, gdk_screen_height() - MINIMUM_ON_SCREEN_HEIGHT);
-	
-	/* FIXME bugzilla.eazel.com 669: 
-	 * If window has negative left coordinate, set_uposition sends it
-	 * somewhere else entirely. Not sure what level contains this bug (XWindows?).
-	 * Hacked around by pinning the left edge to zero, which just means you
-	 * can't set a window to be partly off the left of the screen using
-	 * this routine.
-	 */
-	/* Make sure the left edge of the window isn't off the right edge of
-	 * the screen, or so close to the right edge that it might be
-	 * obscured by the panel.
-	 */
-	*left = CLAMP (*left, 0, gdk_screen_width() - MINIMUM_ON_SCREEN_WIDTH);
-}
-
-static void
-sanity_check_window_dimensions (int *width, int *height)
-{
-	g_assert (width != NULL);
-	g_assert (height != NULL);
-
-	/* Pin the size of the window to the screen, so we don't end up in
-	 * a state where the window is so big essential parts of it can't
-	 * be reached (might not be necessary with all window managers,
-	 * but seems reasonable anyway).
-	 */
-	*width = MIN (*width, gdk_screen_width());
-	*height = MIN (*height, gdk_screen_height());
-}
-
-/**
- * nautilus_gtk_window_set_initial_geometry:
- * 
- * Sets the position and size of a GtkWindow before the
- * GtkWindow is shown. It is an error to call this on a window that
- * is already on-screen. Takes into account screen size, and does
- * some sanity-checking on the passed-in values.
- * 
- * @window: A non-visible GtkWindow
- * @geometry_flags: A NautilusGdkGeometryFlags value defining which of
- * the following parameters have defined values
- * @left: pixel coordinate for left of window
- * @top: pixel coordinate for top of window
- * @width: width of window in pixels
- * @height: height of window in pixels
- */
-void
-nautilus_gtk_window_set_initial_geometry (GtkWindow *window, 
-					  NautilusGdkGeometryFlags geometry_flags,
-					  int left,
-					  int top,
-					  guint width,
-					  guint height)
-{
-	int real_left, real_top;
-
-	g_return_if_fail (GTK_IS_WINDOW (window));
-	g_return_if_fail (!(geometry_flags & NAUTILUS_GDK_WIDTH_VALUE) || width > 0);
-	g_return_if_fail (!(geometry_flags & NAUTILUS_GDK_HEIGHT_VALUE) || height > 0);
-
-	/* Setting the default size doesn't work when the window is already showing.
-	 * Someday we could make this move an already-showing window, but we don't
-	 * need that functionality yet. 
-	 */
-	g_return_if_fail (!GTK_WIDGET_VISIBLE (window));
-
-	if ((geometry_flags & NAUTILUS_GDK_X_VALUE) && (geometry_flags & NAUTILUS_GDK_Y_VALUE)) {
-		real_left = left;
-		real_top = top;
-
-		/* This is sub-optimal. GDK doesn't allow us to set win_gravity
-		 * to South/East types, which should be done if using negative
-		 * positions (so that the right or bottom edge of the window
-		 * appears at the specified position, not the left or top).
-		 * However it does seem to be consistent with other GNOME apps.
-		 */
-		if (geometry_flags & NAUTILUS_GDK_X_NEGATIVE) {
-			real_left = gdk_screen_width () - real_left;
-		}
-		if (geometry_flags & NAUTILUS_GDK_Y_NEGATIVE) {
-			real_top = gdk_screen_height () - real_top;
-		}
-
-		sanity_check_window_position (&real_left, &real_top);
-		gtk_widget_set_uposition (GTK_WIDGET (window), real_left, real_top);
-	}
-
-	if ((geometry_flags & NAUTILUS_GDK_WIDTH_VALUE) && (geometry_flags & NAUTILUS_GDK_HEIGHT_VALUE)) {
-		sanity_check_window_dimensions (&width, &height);
-		gtk_window_set_default_size (GTK_WINDOW (window), width, height);
-	}
-}
-
-/**
- * nautilus_gtk_window_set_initial_geometry_from_string:
- * 
- * Sets the position and size of a GtkWindow before the
- * GtkWindow is shown. The geometry is passed in as a string. 
- * It is an error to call this on a window that
- * is already on-screen. Takes into account screen size, and does
- * some sanity-checking on the passed-in values.
- * 
- * @window: A non-visible GtkWindow
- * @geometry_string: A string suitable for use with gnome_parse_geometry
- * @minimum_width: If the width from the string is smaller than this,
- * use this for the width.
- * @minimum_height: If the height from the string is smaller than this,
- * use this for the height.
- */
-void
-nautilus_gtk_window_set_initial_geometry_from_string (GtkWindow *window, 
-					  	      const char *geometry_string,
-					  	      guint minimum_width,
-					  	      guint minimum_height)
-{
-	int left, top;
-	guint width, height;
-	NautilusGdkGeometryFlags geometry_flags;
-
-	g_return_if_fail (GTK_IS_WINDOW (window));
-	g_return_if_fail (geometry_string != NULL);
-
-	/* Setting the default size doesn't work when the window is already showing.
-	 * Someday we could make this move an already-showing window, but we don't
-	 * need that functionality yet. 
-	 */
-	g_return_if_fail (!GTK_WIDGET_VISIBLE (window));
-
-	geometry_flags = nautilus_gdk_parse_geometry (geometry_string, &left, &top, &width, &height);
-
-	/* Make sure the window isn't smaller than makes sense for this window.
-	 * Other sanity checks are performed in set_initial_geometry.
-	 */
-	if (geometry_flags & NAUTILUS_GDK_WIDTH_VALUE) {
-		width = MAX (width, minimum_width);
-	}
-	if (geometry_flags & NAUTILUS_GDK_HEIGHT_VALUE) {
-		height = MAX (height, minimum_height);
-	}
-
-	nautilus_gtk_window_set_initial_geometry (window, geometry_flags, left, top, width, height);
-}
-
-/**
- * nautilus_gtk_selection_data_copy_deep:
- * 
- * Copies a GtkSelectionData, and copies the data too.
- * @data: The GtkSelectionData to be copied.
- **/
-GtkSelectionData *
-nautilus_gtk_selection_data_copy_deep (const GtkSelectionData *data)
-{
-	GtkSelectionData *copy;
-
-	copy = g_new0 (GtkSelectionData, 1);
-	gtk_selection_data_set (copy, data->type, data->format, data->data, data->length);
-
-	return copy;
-}
-
-/**
- * nautilus_gtk_selection_data_free_deep:
- * 
- * Frees a GtkSelectionData, and frees the data too.
- * @data: The GtkSelectionData to be freed.
- **/
-void
-nautilus_gtk_selection_data_free_deep (GtkSelectionData *data)
-{
-	g_free (data->data);
-	gtk_selection_data_free (data);
-}
-
-/**
- * nautilus_gtk_signal_connect_free_data:
- * 
- * Function to displace the popup menu some, otherwise the first item
- * gets selected right away.
- * This function gets called by gtk_menu_popup ().
- *
- * @menu: the popup menu.
- * @x: x coord where gtk want to place the menu
- * @y: y coord where gtk want to place the menu
- * @user_data: something
- **/
-static void
-nautilus_popup_menu_position_func (GtkMenu   *menu,
-				   int      *x,
-				   int      *y,
-				   gpointer  user_data)
-{
-	GdkPoint *offset;
-	GtkRequisition requisition;
-
-	g_assert (x != NULL);
-	g_assert (y != NULL);
-
-	offset = (GdkPoint*) user_data;
-
-	g_assert (offset != NULL);
-
-	/*
-	 * FIXME bugzilla.eazel.com 2561: The cast from gint16 might cause problems.  
-	 * Unfortunately, GdkPoint uses gint16.
-	 */
-	gtk_widget_size_request (GTK_WIDGET (menu), &requisition);
-	  
-	*x = CLAMP (*x + (int) offset->x, 0, MAX (0, gdk_screen_width () - requisition.width));
-	*y = CLAMP (*y + (int) offset->y, 0, MAX (0, gdk_screen_height () - requisition.height));
-}
-
-/**
- * nautilus_truncate_text_for_menu_item:
- * 
- * Given an arbitrary string, returns a newly-allocated string
- * suitable for use as a menu item label. Truncates long strings 
- * in the middle.
- */
-char *
-nautilus_truncate_text_for_menu_item (const char *text)
-{
-	return nautilus_str_middle_truncate (text, MAXIMUM_MENU_TITLE_LENGTH);
-}
-
-/**
- * nautilus_pop_up_context_menu:
- * 
- * Pop up a context menu under the mouse.
- * The menu is sunk after use, so it will be destroyed unless the 
- * caller first ref'ed it.
- * 
- * This function is more of a helper function than a gtk extension,
- * so perhaps it belongs in a different file.
- * 
- * @menu: The menu to pop up under the mouse.
- * @offset_x: Number of pixels to displace the popup menu vertically
- * @offset_y: Number of pixels to displace the popup menu horizontally
- * @event: The event that invoked this popup menu.
- **/
-void 
-nautilus_pop_up_context_menu (GtkMenu	     *menu,
-			      gint16	      offset_x,
-			      gint16	      offset_y,
-			      GdkEventButton *event)
-{
-	GdkPoint offset;
-	int button;
-
-	g_return_if_fail (GTK_IS_MENU (menu));
-
-	offset.x = offset_x;
-	offset.y = offset_y;
-
-	/* The event button needs to be 0 if we're popping up this menu from
-	 * a button release, else a 2nd click outside the menu with any button
-	 * other than the one that invoked the menu will be ignored (instead
-	 * of dismissing the menu). This is a subtle fragility of the GTK menu code.
-	 */
-	button = event->type == GDK_BUTTON_RELEASE
-		? 0
-		: event->button;
-	
-	gtk_menu_popup (menu,					/* menu */
-			NULL,					/* parent_menu_shell */
-			NULL,					/* parent_menu_item */
-			nautilus_popup_menu_position_func,	/* func */
-			&offset,			        /* data */
-			button,					/* button */
-			event->time);				/* activate_time */
-
-	gtk_object_sink (GTK_OBJECT(menu));
-}
-
-GtkMenuItem *
-nautilus_gtk_menu_append_separator (GtkMenu *menu)
-{
-	return nautilus_gtk_menu_insert_separator (menu, -1);
-}
-
-GtkMenuItem *
-nautilus_gtk_menu_insert_separator (GtkMenu *menu, int index)
-{
-	GtkWidget *menu_item;
-
-	menu_item = gtk_menu_item_new ();
-	gtk_widget_set_sensitive (menu_item, FALSE);
-	gtk_widget_show (menu_item);
-	gtk_menu_insert (menu, menu_item, index);
-
-	return GTK_MENU_ITEM (menu_item);
-}
-
-void
-nautilus_gtk_menu_set_item_visibility (GtkMenu *menu, int index, gboolean visible)
-{
-	GList *children;
-	GtkWidget *menu_item;
-
-	g_return_if_fail (GTK_IS_MENU (menu));
-
-	children = gtk_container_children (GTK_CONTAINER (menu));
-	g_return_if_fail (index >= 0 && index < (int) g_list_length (children));
-
-	menu_item = GTK_WIDGET (g_list_nth_data (children, index));
-	if (visible) {
-		gtk_widget_show (menu_item);
-	} else {
-		gtk_widget_hide (menu_item);
-	}
-
-	g_list_free (children);
-}
-
-void
-nautilus_gtk_marshal_NONE__POINTER_INT_INT_DOUBLE (GtkObject *object,
-						   GtkSignalFunc func,
-						   gpointer func_data,
-						   GtkArg *args)
-{
-	(* (void (*)(GtkObject *, gpointer, int, int, double, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_INT (args[1]),
-		 GTK_VALUE_INT (args[2]),
-		 GTK_VALUE_DOUBLE (args[3]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_NONE__INT_INT_INT (GtkObject *object,
-					GtkSignalFunc func,
-					gpointer func_data,
-					GtkArg *args)
-{
-	(* (void (*)(GtkObject *, int, int, int, gpointer)) func)
-		(object,
-		 GTK_VALUE_INT (args[0]),
-		 GTK_VALUE_INT (args[1]),
-		 GTK_VALUE_INT (args[2]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_NONE__POINTER_INT_INT_INT (GtkObject *object,
-						GtkSignalFunc func,
-						gpointer func_data,
-						GtkArg *args)
-{
-	(* (void (*)(GtkObject *, gpointer, int, int, int, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_INT (args[1]),
-		 GTK_VALUE_INT (args[2]),
-		 GTK_VALUE_INT (args[3]),
-		 func_data);
-}
-
-void 
-nautilus_gtk_marshal_NONE__POINTER_INT_POINTER_POINTER (GtkObject *object,
-							GtkSignalFunc func,
-							gpointer func_data,
-							GtkArg *args)
-{
-	(* (void (*)(GtkObject *, gpointer, int, gpointer, gpointer, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_INT (args[1]),
-		 GTK_VALUE_POINTER (args[2]),
-		 GTK_VALUE_POINTER (args[3]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_NONE__POINTER_POINTER_INT_INT_INT (GtkObject *object,
-							GtkSignalFunc func,
-							gpointer func_data,
-							GtkArg *args)
-{
-	(* (void (*)(GtkObject *, gpointer, gpointer, int, int, int, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 GTK_VALUE_INT (args[2]),
-		 GTK_VALUE_INT (args[3]),
-		 GTK_VALUE_INT (args[4]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_BOOL__INT_POINTER_INT_INT_UINT (GtkObject *object,
-						     GtkSignalFunc func,
-						     gpointer func_data,
-						     GtkArg *args)
-{
-	* GTK_RETLOC_BOOL (args[5]) = (* (gboolean (*)(GtkObject *, int, gpointer, int, int, guint, gpointer)) func)
-		(object,
-		 GTK_VALUE_INT (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 GTK_VALUE_INT (args[2]),
-		 GTK_VALUE_INT (args[3]),
-		 GTK_VALUE_UINT (args[4]),
-		 func_data);
-}
-
-
-void
-nautilus_gtk_marshal_NONE__INT_POINTER_INT_INT_UINT (GtkObject *object,
-						     GtkSignalFunc func,
-						     gpointer func_data,
-						     GtkArg *args)
-{
-	(* (void (*)(GtkObject *, int, gpointer, int, int, guint, gpointer)) func)
-		(object,
-		 GTK_VALUE_INT (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 GTK_VALUE_INT (args[2]),
-		 GTK_VALUE_INT (args[3]),
-		 GTK_VALUE_UINT (args[4]),
-		 func_data);
-
-}
-
-
-void
-nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_INT_INT_INT (GtkObject *object,
-								GtkSignalFunc func,
-								gpointer func_data,
-								GtkArg *args)
-{
-	(* (void (*)(GtkObject *, gpointer, gpointer, gpointer, int, int, int, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 GTK_VALUE_POINTER (args[2]),
-		 GTK_VALUE_INT (args[3]),
-		 GTK_VALUE_INT (args[4]),
-		 GTK_VALUE_INT (args[5]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER_INT_INT_UINT (GtkObject *object,
-									 GtkSignalFunc func,
-									 gpointer func_data,
-									 GtkArg *args)
-{
-	(* (void (*)(GtkObject *, gpointer, gpointer, gpointer, gpointer, int, int, guint, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 GTK_VALUE_POINTER (args[2]),
-		 GTK_VALUE_POINTER (args[3]),
-		 GTK_VALUE_INT (args[4]),
-		 GTK_VALUE_INT (args[5]),
-		 GTK_VALUE_INT (args[6]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_NONE__POINTER_INT_INT_DOUBLE_DOUBLE (GtkObject *object,
-							  GtkSignalFunc func,
-							  gpointer func_data,
-							  GtkArg *args)
-{
-	(* (void (*)(GtkObject *, gpointer, int, int, double, double, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_INT (args[1]), 
-		 GTK_VALUE_INT (args[2]), 
-		 GTK_VALUE_DOUBLE (args[3]), 
-		 GTK_VALUE_DOUBLE (args[4]), 
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_NONE__DOUBLE (GtkObject *object,
-				   GtkSignalFunc func,
-				   gpointer func_data,
-				   GtkArg *args)
-{
-	(* (void (*)(GtkObject *, double, gpointer)) func)
-		(object,
-		 GTK_VALUE_DOUBLE (args[0]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_NONE__DOUBLE_DOUBLE_DOUBLE (GtkObject *object,
-				   GtkSignalFunc func,
-				   gpointer func_data,
-				   GtkArg *args)
-{
-	(* (void (*)(GtkObject *, double, double, double, gpointer)) func)
-		(object,
-		 GTK_VALUE_DOUBLE (args[0]),
-		 GTK_VALUE_DOUBLE (args[1]),
-		 GTK_VALUE_DOUBLE (args[2]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_POINTER__NONE (GtkObject *object,
-				    GtkSignalFunc func,
-				    gpointer func_data,
-				    GtkArg *args)
-{
-	* GTK_RETLOC_POINTER (args[0]) =
-		(* (void * (*)(GtkObject *, gpointer)) func) 
-		 (object,
-		 func_data);
-}
-
-void 
-nautilus_gtk_marshal_INT__NONE (GtkObject *object,
-				GtkSignalFunc  func,
-				gpointer       func_data,
-				GtkArg        *args)
-{
-	* GTK_RETLOC_INT (args[0]) =
-		(* (int (*)(GtkObject *, gpointer)) func)
-		 (object,
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_POINTER__INT (GtkObject *object,
-				   GtkSignalFunc func,
-				   gpointer func_data,
-				   GtkArg *args)
-{
-	* GTK_RETLOC_POINTER (args[1]) =
-		(* (gpointer (*)(GtkObject *, int, gpointer)) func)
-		(object,
-		 GTK_VALUE_INT (args[0]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_POINTER__POINTER (GtkObject *object,
-				       GtkSignalFunc func,
-				       gpointer func_data,
-				       GtkArg *args)
-{
-	* GTK_RETLOC_POINTER (args[1]) =
-		(* (gpointer (*)(GtkObject *, gpointer, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_INT__POINTER_POINTER (GtkObject *object,
-					   GtkSignalFunc func,
-					   gpointer func_data,
-					   GtkArg *args)
-{
-	* GTK_RETLOC_INT (args[2]) =
-		(* (int (*)(GtkObject *, gpointer, gpointer, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_INT__POINTER_INT (GtkObject *object,
-					   GtkSignalFunc func,
-					   gpointer func_data,
-					   GtkArg *args)
-{
-	* GTK_RETLOC_INT (args[2]) =
-		(* (int (*)(GtkObject *, gpointer, int, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_INT (args[1]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_POINTER__POINTER_POINTER (GtkObject *object,
-					       GtkSignalFunc func,
-					       gpointer func_data,
-					       GtkArg *args)
-{
-	* GTK_RETLOC_POINTER (args[2]) =
-		(* (gpointer (*)(GtkObject *, gpointer, gpointer, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_POINTER__POINTER_POINTER_POINTER (GtkObject *object,
-						       GtkSignalFunc func,
-						       gpointer func_data,
-						       GtkArg *args)
-{
-	* GTK_RETLOC_POINTER (args[3]) =
-		(* (gpointer (*)(GtkObject *, gpointer, gpointer, gpointer, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 GTK_VALUE_POINTER (args[2]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER (GtkObject *object,
-							    GtkSignalFunc func,
-							    gpointer func_data,
-							    GtkArg *args)
-{
-	(* (void (*)(GtkObject *, gpointer, gpointer, gpointer, gpointer, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 GTK_VALUE_POINTER (args[2]),
-		 GTK_VALUE_POINTER (args[3]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_POINTER__POINTER_INT_INT_POINTER_POINTER (GtkObject *object,
-							       GtkSignalFunc func,
-							       gpointer func_data,
-							       GtkArg *args)
-{
-	* GTK_RETLOC_POINTER (args[5]) =
-		(* (gpointer (*)(GtkObject *, gpointer, int, int, gpointer, gpointer, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_INT (args[1]),
-		 GTK_VALUE_INT (args[2]),
-		 GTK_VALUE_POINTER (args[3]),
-		 GTK_VALUE_POINTER (args[4]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER_POINTER_POINTER (GtkObject *object,
-									    GtkSignalFunc func,
-									    gpointer func_data,
-									    GtkArg *args)
-{
-	(* (void (*)(GtkObject *, gpointer, gpointer, gpointer,
-		     gpointer, gpointer, gpointer, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 GTK_VALUE_POINTER (args[2]),
-		 GTK_VALUE_POINTER (args[3]),
-		 GTK_VALUE_POINTER (args[4]),
-		 GTK_VALUE_POINTER (args[5]),
-		 func_data);
-}
-
-gboolean
-nautilus_point_in_allocation (const GtkAllocation *allocation,
-			      int x, int y)
-{
-	g_return_val_if_fail (allocation != NULL, FALSE);
-	return x >= allocation->x
-		&& y >= allocation->y
-		&& x < allocation->x + allocation->width 
-		&& y < allocation->y + allocation->height;
-}
-
-gboolean
-nautilus_point_in_widget (GtkWidget *widget,
-			  int x, int y)
-{
-	if (widget == NULL) {
-		return FALSE;
-	}
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	return nautilus_point_in_allocation (&widget->allocation, x, y);
-}
-
-/**
- * nautilus_gtk_object_list_ref
- *
- * Ref all the objects in a list.
- * @list: GList of objects.
- **/
-GList *
-nautilus_gtk_object_list_ref (GList *list)
-{
-	g_list_foreach (list, (GFunc) gtk_object_ref, NULL);
-	return list;
-}
-
-/**
- * nautilus_gtk_object_list_unref
- *
- * Unref all the objects in a list.
- * @list: GList of objects.
- **/
-void
-nautilus_gtk_object_list_unref (GList *list)
-{
-	nautilus_g_list_safe_for_each (list, (GFunc) gtk_object_unref, NULL);
-}
-
-/**
- * nautilus_gtk_object_list_free
- *
- * Free a list of objects after unrefing them.
- * @list: GList of objects.
- **/
-void
-nautilus_gtk_object_list_free (GList *list)
-{
-	nautilus_gtk_object_list_unref (list);
-	g_list_free (list);
-}
-
-/**
- * nautilus_gtk_object_list_copy
- *
- * Copy the list of objects, ref'ing each one.
- * @list: GList of objects.
- **/
-GList *
-nautilus_gtk_object_list_copy (GList *list)
-{
-	return g_list_copy (nautilus_gtk_object_list_ref (list));
-}
-
-/**
- * nautilus_gtk_style_set_font
- *
- * Sets the font in a style object, managing the ref. counts.
- * @style: The style to change.
- * @font: The new font.
- **/
-void
-nautilus_gtk_style_set_font (GtkStyle *style, GdkFont *font)
-{
-	g_return_if_fail (style != NULL);
-	g_return_if_fail (font != NULL);
-	
-	gdk_font_ref (font);
-	gdk_font_unref (style->font);
-	style->font = font;
-}
-
-/**
- * nautilus_gtk_widget_set_font
- *
- * Sets the font for a widget's style, managing the style objects.
- * @widget: The widget.
- * @font: The font.
- **/
-void
-nautilus_gtk_widget_set_font (GtkWidget *widget, GdkFont *font)
-{
-	GtkStyle *new_style;
-	
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-	g_return_if_fail (font != NULL);
-	
-	new_style = gtk_style_copy (gtk_widget_get_style (widget));
-
-	nautilus_gtk_style_set_font (new_style, font);
-	
-	gtk_widget_set_style (widget, new_style);
-	gtk_style_unref (new_style);
-}
-
-/**
- * nautilus_gtk_widget_set_shown
- *
- * Show or hide a widget.
- * @widget: The widget.
- * @shown: Boolean value indicating whether the widget should be shown or hidden.
- **/
-void
-nautilus_gtk_widget_set_shown (GtkWidget *widget, gboolean shown)
-{
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-
-	if (shown) {
-		gtk_widget_show (widget);
-	} else {
-		gtk_widget_hide (widget);
-	}
-}
-
-/**
- * nautilus_gtk_widget_set_font_by_name
- *
- * Sets the font for a widget, managing the font and style objects.
- * @widget: The widget
- **/
-void
-nautilus_gtk_widget_set_font_by_name (GtkWidget *widget, const char *font_name)
-{
-	GdkFont *font;
-
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-	g_return_if_fail (font_name != NULL);
-	
-	font = gdk_fontset_load (font_name);
-	nautilus_gtk_widget_set_font (widget, font);
-	gdk_font_unref (font);
-}
-
-/* This stuff is stolen from Gtk. */
-
-typedef struct DisconnectInfo {
-	GtkObject *object1;
-	guint disconnect_handler1;
-	guint signal_handler;
-	GtkObject *object2;
-	guint disconnect_handler2;
-} DisconnectInfo;
-
-static void
-alive_disconnecter (GtkObject *object, DisconnectInfo *info)
-{
-	g_assert (info != NULL);
-	g_assert (GTK_IS_OBJECT (info->object1));
-	g_assert (info->disconnect_handler1 != 0);
-	g_assert (info->signal_handler != 0);
-	g_assert (GTK_IS_OBJECT (info->object2));
-	g_assert (info->disconnect_handler2 != 0);
-	g_assert (object == info->object1 || object == info->object2);
-	
-	gtk_signal_disconnect (info->object1, info->disconnect_handler1);
-	gtk_signal_disconnect (info->object1, info->signal_handler);
-	gtk_signal_disconnect (info->object2, info->disconnect_handler2);
-	
-	g_free (info);
-}
-
-/**
- * nautilus_gtk_signal_connect_full_while_alive
- *
- * Like gtk_signal_connect_while_alive, but works with full parameters.
- **/
-void
-nautilus_gtk_signal_connect_full_while_alive (GtkObject *object,
-					      const gchar *name,
-					      GtkSignalFunc func,
-					      GtkCallbackMarshal marshal,
-					      gpointer data,
-					      GtkDestroyNotify destroy_func,
-					      gboolean object_signal,
-					      gboolean after,
-					      GtkObject *alive_object)
-{
-	DisconnectInfo *info;
-	
-	g_return_if_fail (GTK_IS_OBJECT (object));
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (func != NULL);
-	g_return_if_fail (object_signal == FALSE || object_signal == TRUE);
-	g_return_if_fail (after == FALSE || after == TRUE);
-	g_return_if_fail (GTK_IS_OBJECT (alive_object));
-	
-	info = g_new (DisconnectInfo, 1);
-	info->object1 = object;
-	info->object2 = alive_object;
-	
-	info->signal_handler = gtk_signal_connect_full (object,
-							name,
-							func,
-							marshal,
-							data,
-							destroy_func,
-							object_signal,
-							after);
-	info->disconnect_handler1 = gtk_signal_connect (object,
-							"destroy",
-							alive_disconnecter,
-							info);
-	info->disconnect_handler2 = gtk_signal_connect (alive_object,
-							"destroy",
-							alive_disconnecter,
-							info);
-}
-
-typedef struct
-{
-	GtkObject *object;
-	guint object_destroy_handler;
-	
-	GtkWidget *realized_widget;
-	guint realized_widget_destroy_handler;
-	guint realized_widget_unrealized_handler;
-
-	guint signal_handler;
-} RealizeDisconnectInfo;
-
-static void
-while_realized_disconnecter (GtkObject *object,
-			     RealizeDisconnectInfo *info)
-{
-	g_return_if_fail (GTK_IS_OBJECT (object));
-	g_return_if_fail (info != NULL);
-	g_return_if_fail (GTK_IS_OBJECT (info->object));
-	g_return_if_fail (info->object_destroy_handler != 0);
-	g_return_if_fail (info->object_destroy_handler != 0);
-	g_return_if_fail (info->realized_widget_destroy_handler != 0);
-	g_return_if_fail (info->realized_widget_unrealized_handler != 0);
-
- 	gtk_signal_disconnect (info->object, info->object_destroy_handler);
- 	gtk_signal_disconnect (info->object, info->signal_handler);
- 	gtk_signal_disconnect (GTK_OBJECT (info->realized_widget), info->realized_widget_destroy_handler);
- 	gtk_signal_disconnect (GTK_OBJECT (info->realized_widget), info->realized_widget_unrealized_handler);
-	g_free (info);
-}
-
-/**
- * nautilus_gtk_signal_connect_while_realized:
- *
- * @object: Object to connect to.
- * @name: Name of signal to connect to.
- * @callback: Caller's callback.
- * @callback_data: Caller's callback_data.
- * @realized_widget: Widget to monitor for realized state.  Signal is connected
- *                   while this wigget is realized.
- *
- * Connect to a signal of an object while another widget is realized.  This is 
- * useful for non windowed widgets that need to monitor events in their ancestored
- * windowed widget.  The signal is automatically disconnected when &widget is
- * unrealized.  Also, the signal is automatically disconnected when either &object
- * or &widget are destroyed.
- **/
-void
-nautilus_gtk_signal_connect_while_realized (GtkObject *object,
-					    const char *name,
-					    GtkSignalFunc callback,
-					    gpointer callback_data,
-					    GtkWidget *realized_widget)
-{
-	RealizeDisconnectInfo *info;
-
-	g_return_if_fail (GTK_IS_OBJECT (object));
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (name[0] != '\0');
-	g_return_if_fail (callback != NULL);
-	g_return_if_fail (GTK_IS_WIDGET (realized_widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (realized_widget));
-
-	info = g_new0 (RealizeDisconnectInfo, 1);
-	
-	info->object = object;
-	info->object_destroy_handler = 
-		gtk_signal_connect (info->object,
-				    "destroy",
-				    while_realized_disconnecter,
-				    info);
-	
-	info->realized_widget = realized_widget;
-	info->realized_widget_destroy_handler = 
-		gtk_signal_connect (GTK_OBJECT (info->realized_widget),
-				    "destroy",
-				    while_realized_disconnecter,
-				    info);
-	info->realized_widget_unrealized_handler = 
-		gtk_signal_connect_after (GTK_OBJECT (info->realized_widget),
-					  "unrealize",
-					  while_realized_disconnecter,
-					  info);
-
-	info->signal_handler = gtk_signal_connect (info->object, name, callback, callback_data);
-}
-
-static void
-null_the_reference (GtkObject *object, gpointer callback_data)
-{
-	g_assert (* (GtkObject **) callback_data == object);
-
-	* (gpointer *) callback_data = NULL;
-}
-
-/**
- * nautilus_nullify_when_destroyed.
- *
- * Nulls out a saved reference to an object when the object gets destroyed.
- * @data: Address of the saved reference.
- **/
-
-void 
-nautilus_nullify_when_destroyed (gpointer data)
-{
-	GtkObject **object_reference;
-
-	object_reference = (GtkObject **)data;	
-	if (*object_reference == NULL) {
-		/* the reference is  NULL, nothing to do. */
-		return;
-	}
-
-	g_assert (GTK_IS_OBJECT (*object_reference));
-
-	gtk_signal_connect (*object_reference, "destroy",
-		null_the_reference, object_reference);
-}
-
-/**
- * nautilus_nullify_cancel.
- *
- * Disconnects the signal used to make nautilus_nullify_when_destroyed.
- * Used when the saved reference is no longer needed, the structure it is in is
- * being destroyed, etc. Nulls out the refernce when done.
- * @data: Address of the saved reference.
- **/
-
-void 
-nautilus_nullify_cancel (gpointer data)
-{
-	GtkObject **object_reference;
-
-	object_reference = (GtkObject **)data;	
-	if (*object_reference == NULL) {
-		/* the object was already destroyed and the reference nulled out,
-		 * nothing to do.
-		 */
-		return;
-	}
-
-	g_assert (GTK_IS_OBJECT (*object_reference));
-
-	gtk_signal_disconnect_by_func (*object_reference,
-		null_the_reference, object_reference);
-	
-	*object_reference = NULL;
-}
-
-
-/**
- * nautilus_gtk_container_get_first_child.
- *
- * Returns the first child of a container.
- * @container: The container.
- **/
-
-static void
-get_first_callback (GtkWidget *widget, gpointer callback_data)
-{
-	GtkWidget **first_child_slot;
-
-	g_assert (GTK_IS_WIDGET (widget));
-	g_assert (callback_data != NULL);
-	
-	first_child_slot = callback_data;
-
-	if (*first_child_slot == NULL) {
-		*first_child_slot = widget;
-		/* We'd stop the iterating now if we could. */
-	} else {
-		g_assert (GTK_IS_WIDGET (*first_child_slot));
-	}
-}
-
-GtkWidget *
-nautilus_gtk_container_get_first_child (GtkContainer *container)
-{
-	GtkWidget *first_child;
-
-	g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL);
-	
-	first_child = NULL;
-	gtk_container_foreach (container, get_first_callback, &first_child);
-	g_assert (first_child == NULL || GTK_IS_WIDGET (first_child));
-	return first_child;
-}
-
-typedef struct {
-	GtkCallback   callback;
-	gpointer      callback_data;
-} container_foreach_deep_callback_data;
-
-static void
-container_foreach_deep_callback (GtkWidget *child, gpointer data)
-{
-	container_foreach_deep_callback_data *deep_data;
-
-	deep_data = (container_foreach_deep_callback_data *) data;
-
-	deep_data->callback (child, deep_data->callback_data);
-
-	if (GTK_IS_CONTAINER (child)) {
-		gtk_container_foreach (GTK_CONTAINER (child), container_foreach_deep_callback, data);
-	}
-}
-
-void
-nautilus_gtk_container_foreach_deep (GtkContainer *container,
-				     GtkCallback callback,
-				     gpointer callback_data)
-{
-	container_foreach_deep_callback_data deep_data;
-	deep_data.callback = callback;
-	deep_data.callback_data = callback_data;
-	gtk_container_foreach (container, container_foreach_deep_callback, &deep_data);
-}
-
-/* We have to supply a dummy pixmap to avoid the return_if_fail in gtk_pixmap_new. */
-GtkPixmap *
-nautilus_gtk_pixmap_new_empty (void)
-{
-	GtkPixmap *pixmap;
-
-	/* Make a GtkPixmap with a dummy GdkPixmap. The
-         * gdk_pixmap_new call will fail if passed 0 for height or
-	 * width, or if passed a bad depth.
-	 */
-	pixmap = GTK_PIXMAP (gtk_pixmap_new (gdk_pixmap_new (NULL, 1, 1, gdk_visual_get_best_depth ()), NULL));
-
-	/* Clear out the dummy pixmap. */
-	gtk_pixmap_set (pixmap, NULL, NULL);
-
-	return pixmap;
-}
-
-/* The standard gtk_adjustment_set_value ignores page size, which
- * disagrees with the logic used by scroll bars, for example.
- */
-void
-nautilus_gtk_adjustment_set_value (GtkAdjustment *adjustment,
-				   float value)
-{
-	float upper_page_start, clamped_value;
-
-	g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-	
-	upper_page_start = MAX (adjustment->upper - adjustment->page_size, adjustment->lower);
-	clamped_value = CLAMP (value, adjustment->lower, upper_page_start);
-	if (clamped_value != adjustment->value) {
-		adjustment->value = clamped_value;
-		gtk_adjustment_value_changed (adjustment);
-	}
-}
-
-/* Clamp a value if the minimum or maximum has changed. */
-void
-nautilus_gtk_adjustment_clamp_value (GtkAdjustment *adjustment)
-{
-	g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-	
-	nautilus_gtk_adjustment_set_value (adjustment, adjustment->value);
-}
-
-/**
- * nautilus_gtk_label_make_bold.
- *
- * Switches the font of label to a bold equivalent.
- * @label: The label.
- **/
-void
-nautilus_gtk_label_make_bold (GtkLabel *label)
-{
-	GtkStyle *style;
-	GdkFont *bold_font;
-
-	g_return_if_fail (GTK_IS_LABEL (label));
-
-	gtk_widget_ensure_style (GTK_WIDGET (label));
-	style = gtk_widget_get_style (GTK_WIDGET (label));
-
-	bold_font = nautilus_gdk_font_get_bold (style->font);
-	if (bold_font == NULL) {
-		return;
-	}
-	nautilus_gtk_widget_set_font (GTK_WIDGET (label), bold_font);
-	gdk_font_unref (bold_font);
-}
-
-/**
- * nautilus_gtk_label_make_larger.
- *
- * Switches the font of label to a larger version of the font.
- * @label: The label.
- **/
-void
-nautilus_gtk_label_make_larger (GtkLabel *label,
-				guint num_steps)
-{
-	GtkStyle *style;
-	GdkFont *larger_font;
-
-	g_return_if_fail (GTK_IS_LABEL (label));
-
-	gtk_widget_ensure_style (GTK_WIDGET (label));
-	style = gtk_widget_get_style (GTK_WIDGET (label));
-
-	larger_font = nautilus_gdk_font_get_larger (style->font, num_steps);
-	if (larger_font == NULL) {
-		return;
-	}
-	nautilus_gtk_widget_set_font (GTK_WIDGET (label), larger_font);
-	gdk_font_unref (larger_font);
-}
-
-/**
- * nautilus_gtk_label_make_smaller.
- *
- * Switches the font of label to a smaller version of the font.
- * @label: The label.
- **/
-void
-nautilus_gtk_label_make_smaller (GtkLabel *label,
-				 guint num_steps)
-{
-	GtkStyle *style;
-	GdkFont *smaller_font;
-
-	g_return_if_fail (GTK_IS_LABEL (label));
-
-	gtk_widget_ensure_style (GTK_WIDGET (label));
-	style = gtk_widget_get_style (GTK_WIDGET (label));
-
-	smaller_font = nautilus_gdk_font_get_smaller (style->font, num_steps);
-	if (smaller_font == NULL) {
-		return;
-	}
-	nautilus_gtk_widget_set_font (GTK_WIDGET (label), smaller_font);
-	gdk_font_unref (smaller_font);
-}
-
-void
-nautilus_gtk_widget_set_background_color (GtkWidget              *widget,
-					  const char		*color_spec)
-{
-	GtkStyle	*style;
-	GdkColor	color;
-
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-
-	style = gtk_widget_get_style (widget);
-
-	/* Make a copy of the style. */
-	style = gtk_style_copy (style);
-
-	nautilus_gdk_color_parse_with_white_default (color_spec, &color);
-	style->bg[GTK_STATE_NORMAL] = color;
-	style->base[GTK_STATE_NORMAL] = color;
-	style->bg[GTK_STATE_ACTIVE] = color;
-	style->base[GTK_STATE_ACTIVE] = color;
-
-	/* Put the style in the widget. */
-	gtk_widget_set_style (widget, style);
-	gtk_style_unref (style);
-}
-
-void
-nautilus_gtk_widget_set_foreground_color (GtkWidget              *widget,
-					  const char		*color_spec)
-{
-	GtkStyle	*style;
-	GdkColor	color;
-
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-
-	style = gtk_widget_get_style (widget);
-
-	/* Make a copy of the style. */
-	style = gtk_style_copy (style);
-
-	nautilus_gdk_color_parse_with_white_default (color_spec, &color);
-	style->fg[GTK_STATE_NORMAL] = color;
-	style->fg[GTK_STATE_ACTIVE] = color;
-
-	/* Put the style in the widget. */
-	gtk_widget_set_style (widget, style);
-	gtk_style_unref (style);
-}
-
-GtkWidget *
-nautilus_gtk_widget_find_windowed_ancestor (GtkWidget *widget)
-{
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
-	while (widget && GTK_WIDGET_NO_WINDOW (widget)) {
-		widget = widget->parent;
-	}
-
-	return widget;
-}
-
-
-
-/*following code shamelessly stolen from gtk*/
-static void
-rgb_to_hls (gdouble *r,
-            gdouble *g,
-            gdouble *b)
-{
-	gdouble min;
-	gdouble max;
-	gdouble red;
-	gdouble green;
-	gdouble blue;
-	gdouble h, l, s;
-	gdouble delta;
-
-	red = *r;
-	green = *g;
-	blue = *b;
-
-	if (red > green) {
-		if (red > blue)
-			max = red;
-		else
-			max = blue;
-		
-		if (green < blue)
-			min = green;
-		else
-			min = blue;
-	} else {
-		if (green > blue)
-			max = green;
-		else
-			max = blue;
-		
-		if (red < blue)
-			min = red;
-		else
-			min = blue;
-	}
-
-	l = (max + min) / 2;
-	s = 0;
-	h = 0;
-
-	if (max != min) {
-		if (l <= 0.5)
-			s = (max - min) / (max + min);
-		else
-			s = (max - min) / (2 - max - min);
-		
-		delta = max -min;
-		if (red == max)
-			h = (green - blue) / delta;
-		else if (green == max)
-			h = 2 + (blue - red) / delta;
-		else if (blue == max)
-			h = 4 + (red - green) / delta;
-		
-		h *= 60;
-		if (h < 0.0)
-			h += 360;
-	}
-	
-	*r = h;
-	*g = l;
-	*b = s;
-}
-
-static void
-hls_to_rgb (gdouble *h,
-            gdouble *l,
-            gdouble *s)
-{
-	gdouble hue;
-	gdouble lightness;
-	gdouble saturation;
-	gdouble m1, m2;
-	gdouble r, g, b;
-	
-	lightness = *l;
-	saturation = *s;
-
-	if (lightness <= 0.5)
-		m2 = lightness * (1 + saturation);
-	else
-		m2 = lightness + saturation - lightness * saturation;
-	m1 = 2 * lightness - m2;
-
-	if (saturation == 0) {
-		*h = lightness;
-		*l = lightness;
-		*s = lightness;
-	} else {
-		hue = *h + 120;
-		while (hue > 360)
-			hue -= 360;
-		while (hue < 0)
-			hue += 360;
-		
-		if (hue < 60)
-			r = m1 + (m2 - m1) * hue / 60;
-		else if (hue < 180)
-			r = m2;
-		else if (hue < 240)
-			r = m1 + (m2 - m1) * (240 - hue) / 60;
-		else
-			r = m1;
-
-		hue = *h;
-		while (hue > 360)
-			hue -= 360;
-		while (hue < 0)
-			hue += 360;
-		
-		if (hue < 60)
-			g = m1 + (m2 - m1) * hue / 60;
-		else if (hue < 180)
-			g = m2;
-		else if (hue < 240)
-			g = m1 + (m2 - m1) * (240 - hue) / 60;
-		else
-			g = m1;
-		
-		hue = *h - 120;
-		while (hue > 360)
-			hue -= 360;
-		while (hue < 0)
-			hue += 360;
-		
-		if (hue < 60)
-			b = m1 + (m2 - m1) * hue / 60;
-		else if (hue < 180)
-			b = m2;
-		else if (hue < 240)
-			b = m1 + (m2 - m1) * (240 - hue) / 60;
-		else
-			b = m1;
-		
-		*h = r;
-		*l = g;
-		*s = b;
-	}
-}
-
-void
-nautilus_gtk_style_shade (GdkColor *a,
-			  GdkColor *b,
-			  gdouble   k)
-{
-
-	gdouble red;
-	gdouble green;
-	gdouble blue;
-	
-	red = (gdouble) a->red / 65535.0;
-	green = (gdouble) a->green / 65535.0;
-	blue = (gdouble) a->blue / 65535.0;
-	
-	rgb_to_hls (&red, &green, &blue);
-
-	green *= k;
-	if (green > 1.0)
-		green = 1.0;
-	else if (green < 0.0)
-		green = 0.0;
-
-	blue *= k;
-	if (blue > 1.0)
-		blue = 1.0;
-	else if (blue < 0.0)
-		blue = 0.0;
-
-	hls_to_rgb (&red, &green, &blue);
-
-	b->red = red * 65535.0;
-	b->green = green * 65535.0;
-	b->blue = blue * 65535.0;
-}
-
-/**
- * nautilus_gtk_class_name_make_like_existing_type:
- * @class_name: The class name for the custom widget.
- * @existing_gtk_type: The GtkType of the existing GtkWidget.
- *
- * Make the given class name act like an existing GtkType for
- * gtk theme/style purposes.  This can be used by custom 
- * widget to emulate the styles of stock Gtk widgets.  For
- * example:
- *
- * nautilus_gtk_class_name_make_like_existing ("NautilusCustomButton",
- *                                             GTK_TYPE_BUTTON);
- *
- *
- * You should call this function only once from the class_initialize()
- * method of the custom widget.
- **/
-void
-nautilus_gtk_class_name_make_like_existing_type (const char *class_name,
-						 GtkType existing_gtk_type)
-{
-	GtkWidget *temporary;
-	GtkStyle *style;
-
-	g_return_if_fail (class_name != NULL);
-
-	temporary = gtk_widget_new (existing_gtk_type, NULL);
-	gtk_widget_ensure_style (temporary);
-		
-	style = gtk_widget_get_style (temporary);
-
-	if (style->rc_style != NULL) {
-		gtk_rc_add_widget_class_style (style->rc_style, class_name);
-	}
-		
-	gtk_widget_destroy (temporary);
-}
-
-/* helper function for nautilus_get_window_list_ordered_front_to_back () */
-static GtkWidget *
-window_at_or_below (int depth, Window xid, gboolean *keep_going)
-{
-	static Atom wm_state = 0;
-
-	GtkWidget *widget;
-
-	Atom actual_type;
-	int actual_format;
-	gulong nitems, bytes_after;
-	gulong *prop;
-
-	GdkWindow *window;
-	gpointer data;
-
-	Window root, parent, *children;
-	int nchildren, i;
-
-	if (wm_state == 0) {
-		wm_state = XInternAtom (GDK_DISPLAY (), "WM_STATE", False);
-	}
-
-	/* Check if the window is a top-level client window.
-	 * Windows will have a WM_STATE property iff they're top-level.
-	 */
-	if (XGetWindowProperty (GDK_DISPLAY (), xid, wm_state, 0, 1,
-				False, AnyPropertyType, &actual_type,
-				&actual_format, &nitems, &bytes_after,
-				(guchar **) &prop) == Success
-	    && prop != NULL && actual_format == 32 && prop[0] == NormalState)
-	{
-		/* Found a top-level window */
-
-		if (prop != NULL) {
-			XFree (prop);
-		}
-
-		/* Does GDK know anything about this window? */
-		window = gdk_window_lookup (xid);
-		if (window != NULL) {
-			gdk_window_get_user_data (window, &data);
-			if (data != NULL)
-			{
-				/* Found one of the widgets we're after */
-				*keep_going = FALSE;
-				return GTK_WIDGET (data);
-			}
-		}
-
-		/* No point in searching past here. It's a top-level
-		 * window, but not from this application.
-		 */
-		*keep_going = FALSE;
-		return NULL;
-	}
-
-	/* Not found a top-level window yet, so keep recursing. */
-	if (depth < MAXIMUM_WM_REPARENTING_DEPTH) {
-		if (XQueryTree (GDK_DISPLAY (), xid, &root,
-				&parent, &children, &nchildren) != 0)
-		{
-			widget = NULL;
-
-			for (i = 0; *keep_going && i < nchildren; i++) {
-				widget = window_at_or_below (depth + 1,
-							     children[i],
-							     keep_going);
-			}
-
-			if (children != NULL) {
-				XFree (children);
-			}
-
-			if (! *keep_going) {
-				return widget;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-/* nautilus_get_window_list_ordered_front_to_back:
- *
- * Return a list of GtkWindows's, representing the stacking order (top to
- * bottom) of all windows (known to the local GDK).
- *
- * (Involves a large number of X server round trips, so call sparingly)
- */
-GList *
-nautilus_get_window_list_ordered_front_to_back (void)
-{
-	Window root, parent, *children;
-	int nchildren, i;
-	GList *windows;
-	GtkWidget *widget;
-	gboolean keep_going;
-
-	/* There's a possibility that a window will be closed in
-	 * the period between us querying the child-of-root windows
-	 * and getting round to search _their_ children. So arrange
-	 * for errors to be caught and ignored.
-	 */
-
-	gdk_error_trap_push ();
-
-	windows = NULL;
-
-	if (XQueryTree (GDK_DISPLAY (), GDK_ROOT_WINDOW (),
-			&root, &parent, &children, &nchildren) != 0)
-	{
-		for (i = 0; i < nchildren; i++) {
-			keep_going = TRUE;
-			widget = window_at_or_below (0, children[i],
-						     &keep_going);
-			if (widget != NULL) {
-				/* XQueryTree returns window in bottom ->
-				 * top order, so consing up the list in
-				 * the normal manner will reverse this
-				 * giving the desired top -> bottom order
-				 */
-				windows = g_list_prepend (windows, widget);
-			}
-		}
-		if (children != NULL) {
-			XFree (children);
-		}
-	}
-
-	gdk_flush ();
-	gdk_error_trap_pop ();
-
-	return windows;
-}
-
-/* nautilus_gtk_get_system_font:
- *
- * Return the system font as selected in the control center.  Need to 
- * gdk_font_unref() the result when done with it.
- *
- * Perhaps there is a better way to figure out what that font is, but
- * the following is simple enough and it works.
- */
-GdkFont *
-nautilus_gtk_get_system_font (void)
-{
-	GtkWidget *label;
-	GdkFont *font;
-
-	label = gtk_label_new ("");
-	
-	gtk_widget_ensure_style (label);
-
-	font = label->style->font;
-	gdk_font_ref (font);
-
- 	gtk_widget_destroy (label);
-
-	return font;
-}
-
-static guint
-event_get_time (GdkEvent *event)
-{
-	if (event != NULL) {
-		switch (event->type) {
-		case GDK_MOTION_NOTIFY:
-			return event->motion.time;
-		case GDK_BUTTON_PRESS:
-		case GDK_2BUTTON_PRESS:
-		case GDK_3BUTTON_PRESS:
-		case GDK_BUTTON_RELEASE:
-			return event->button.time;
-		case GDK_KEY_PRESS:
-		case GDK_KEY_RELEASE:
-			return event->key.time;
-		case GDK_ENTER_NOTIFY:
-		case GDK_LEAVE_NOTIFY:
-			return event->crossing.time;
-		case GDK_PROPERTY_NOTIFY:
-			return event->property.time;
-		case GDK_SELECTION_CLEAR:
-		case GDK_SELECTION_REQUEST:
-		case GDK_SELECTION_NOTIFY:
-			return event->selection.time;
-		case GDK_PROXIMITY_IN:
-		case GDK_PROXIMITY_OUT:
-			return event->proximity.time;
-		case GDK_DRAG_ENTER:
-		case GDK_DRAG_LEAVE:
-		case GDK_DRAG_MOTION:
-		case GDK_DRAG_STATUS:
-		case GDK_DROP_START:
-		case GDK_DROP_FINISHED:
-			return event->dnd.time;
-		case GDK_CLIENT_EVENT:
-		case GDK_VISIBILITY_NOTIFY:
-		case GDK_NO_EXPOSE:
-		case GDK_CONFIGURE:
-		case GDK_FOCUS_CHANGE:
-		case GDK_NOTHING:
-		case GDK_DELETE:
-		case GDK_DESTROY:
-		case GDK_EXPOSE:
-		case GDK_MAP:
-		case GDK_UNMAP:
-			/* return current time */
-			break;
-		}
-	}
-	
-	return GDK_CURRENT_TIME;
-}
-
-guint
-nautilus_get_current_event_time (void)
-{
-	GdkEvent *event;
-	guint time;
-
-	event = gtk_get_current_event ();
-	time = event_get_time (event);
-	if (event != NULL) {
-		gdk_event_free (event);
-	}
-	return time;
-}
-
-void
-nautilus_drag_set_icon_pixbuf (GdkDragContext *context,
-			       GdkPixbuf *pixbuf,
-			       int hot_x,
-			       int hot_y)
-{
-	GdkPixmap *pixmap;
-	GdkBitmap *mask;
-
-	gdk_pixbuf_render_pixmap_and_mask
-		(pixbuf, &pixmap, &mask,
-		 NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
-	gtk_drag_set_icon_pixmap
-		(context, gdk_rgb_get_cmap (), pixmap, mask, hot_x, hot_y);
-	/* FIXME: Verify that this does not leak the pixmap and mask.
-	 * We've always done it this way, but maybe we've always
-	 * leaked. Just doing the unref here definitely causes a
-	 * problem, so it's not that simple.
-	 */
-}
diff --git a/libnautilus-extensions/nautilus-gtk-extensions.h b/libnautilus-extensions/nautilus-gtk-extensions.h
deleted file mode 100644
index 4f28f34d4..000000000
--- a/libnautilus-extensions/nautilus-gtk-extensions.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gtk-extensions.h - interface for new functions that operate on
-  			       gtk classes. Perhaps some of these should be
-  			       rolled into gtk someday.
-
-   Copyright (C) 1999, 2000, 2001 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: John Sullivan <sullivan@eazel.com>
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_GTK_EXTENSIONS_H
-#define NAUTILUS_GTK_EXTENSIONS_H
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkpixmap.h>
-#include <gtk/gtkwindow.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-
-#define NAUTILUS_DEFAULT_POPUP_MENU_DISPLACEMENT 	2
-#define NAUTILUS_STANDARD_CLOSE_WINDOW_CONTROL_KEY 	'w'
-
-
-/* GtkButton */
-void              nautilus_gtk_button_auto_click                       (GtkButton                *button);
-void              nautilus_gtk_button_set_standard_padding             (GtkButton                *button);
-void              nautilus_gtk_button_set_padding                      (GtkButton                *button,
-									int                       pad_amount);
-
-/* GtkCList */
-int               nautilus_gtk_clist_get_first_selected_row            (GtkCList                 *list);
-int               nautilus_gtk_clist_get_last_selected_row             (GtkCList                 *list);
-void              nautilus_gtk_clist_set_double_click_button           (GtkCList                 *clist,
-									GtkButton                *button);
-
-/* signals */
-guint             nautilus_gtk_signal_connect_free_data                (GtkObject                *object,
-									const gchar              *name,
-									GtkSignalFunc             func,
-									gpointer                  data);
-guint             nautilus_gtk_signal_connect_free_data_custom         (GtkObject                *object,
-									const gchar              *name,
-									GtkSignalFunc             func,
-									gpointer                  data,
-									GtkDestroyNotify          destroy_func);
-void              nautilus_gtk_signal_connect_full_while_alive         (GtkObject                *object,
-									const gchar              *name,
-									GtkSignalFunc             func,
-									GtkCallbackMarshal        marshal,
-									gpointer                  data,
-									GtkDestroyNotify          destroy_func,
-									gboolean                  object_signal,
-									gboolean                  after,
-									GtkObject                *alive_object);
-void              nautilus_gtk_signal_connect_while_realized           (GtkObject                *object,
-									const char               *name,
-									GtkSignalFunc             callback,
-									gpointer                  callback_data,
-									GtkWidget                *realized_widget);
-void              nautilus_nullify_when_destroyed                      (gpointer                  object_pointer_address);
-void              nautilus_nullify_cancel                              (gpointer                  object_pointer_address);
-
-/* list of GtkObject */
-GList *           nautilus_gtk_object_list_ref                         (GList                    *list);
-void              nautilus_gtk_object_list_unref                       (GList                    *list);
-void              nautilus_gtk_object_list_free                        (GList                    *list);
-GList *           nautilus_gtk_object_list_copy                        (GList                    *list);
-
-/* GtkWidget */
-void              nautilus_gtk_widget_set_shown                        (GtkWidget                *widget,
-									gboolean                  shown);
-gboolean          nautilus_point_in_allocation                         (const GtkAllocation      *allocation,
-									int                       x,
-									int                       y);
-void              nautilus_gtk_widget_set_font                         (GtkWidget                *widget,
-									GdkFont                  *font);
-void              nautilus_gtk_widget_set_font_by_name                 (GtkWidget                *widget,
-									const char               *font_name);
-gboolean          nautilus_point_in_widget                             (GtkWidget                *widget,
-									int                       x,
-									int                       y);
-void              nautilus_gtk_widget_set_background_color             (GtkWidget                *widget,
-									const char               *color_spec);
-void              nautilus_gtk_widget_set_foreground_color             (GtkWidget                *widget,
-									const char               *color_spec);
-GtkWidget        *nautilus_gtk_widget_find_windowed_ancestor           (GtkWidget                *widget);
-guint             nautilus_get_current_event_time                      (void);
-
-GdkFont          *nautilus_gtk_get_system_font                         (void);
-
-/* GtkContainer */
-GtkWidget        *nautilus_gtk_container_get_first_child               (GtkContainer             *container);
-void              nautilus_gtk_container_foreach_deep                  (GtkContainer             *container,
-									GtkCallback               callback,
-									gpointer                  callback_data);
-
-/* GtkWindow */
-void              nautilus_gtk_window_set_initial_geometry             (GtkWindow                *window,
-									NautilusGdkGeometryFlags  geometry_flags,
-									int                       left,
-									int                       top,
-									guint                     width,
-									guint                     height);
-void              nautilus_gtk_window_set_initial_geometry_from_string (GtkWindow                *window,
-									const char               *geometry_string,
-									guint                     minimum_width,
-									guint                     minimum_height);
-void              nautilus_gtk_window_set_up_close_accelerator         (GtkWindow                *window);
-gboolean          nautilus_gtk_window_event_is_close_accelerator       (GtkWindow                *window,
-									GdkEventKey              *event);
-void              nautilus_gtk_window_present                          (GtkWindow                *window);
-
-/* selection data */
-GtkSelectionData *nautilus_gtk_selection_data_copy_deep                (const GtkSelectionData   *selection_data);
-void              nautilus_gtk_selection_data_free_deep                (GtkSelectionData         *selection_data);
-
-/* GtkMenu and GtkMenuItem */
-char             *nautilus_truncate_text_for_menu_item                 (const char               *text);
-void              nautilus_pop_up_context_menu                         (GtkMenu                  *menu,
-									gint16                    offset_x,
-									gint16                    offset_y,
-									GdkEventButton           *event);
-GtkMenuItem *     nautilus_gtk_menu_append_separator                   (GtkMenu                  *menu);
-GtkMenuItem *     nautilus_gtk_menu_insert_separator                   (GtkMenu                  *menu,
-									int                       index);
-void              nautilus_gtk_menu_set_item_visibility                (GtkMenu                  *menu,
-									int                       index,
-									gboolean                  visible);
-/* GtkStyle */
-void              nautilus_gtk_style_set_font                          (GtkStyle                 *style,
-									GdkFont                  *font);
-void              nautilus_gtk_style_set_font_by_name                  (GtkStyle                 *style,
-									const char               *font_name);
-
-/* GtkLabel */
-void              nautilus_gtk_label_make_bold                         (GtkLabel                 *label);
-void              nautilus_gtk_label_make_larger                       (GtkLabel                 *label,
-									guint                     num_steps);
-void              nautilus_gtk_label_make_smaller                      (GtkLabel                 *label,
-									guint                     num_steps);
-
-/* GtkPixmap */
-GtkPixmap        *nautilus_gtk_pixmap_new_empty                        (void);
-
-/* GtkAdjustment */
-void              nautilus_gtk_adjustment_set_value                    (GtkAdjustment            *adjustment,
-									float                     value);
-void              nautilus_gtk_adjustment_clamp_value                  (GtkAdjustment            *adjustment);
-
-/* GdkColor */
-void              nautilus_gtk_style_shade                             (GdkColor                 *a,
-									GdkColor                 *b,
-									gdouble                   k);
-
-/* Make the given class name act like an existing GtkType for
- * gtk style/theme purposes. */
-void              nautilus_gtk_class_name_make_like_existing_type      (const char               *class_name,
-									GtkType                   existing_gtk_type);
-GList *           nautilus_get_window_list_ordered_front_to_back       (void);
-
-/* dnd */
-void              nautilus_drag_set_icon_pixbuf                        (GdkDragContext           *context,
-									GdkPixbuf                *pixbuf,
-									gint                      hot_x,
-									gint                      hot_y);
-
-/* marshals */
-
-#define nautilus_gtk_marshal_BOOL__POINTER_POINTER nautilus_gtk_marshal_INT__POINTER_POINTER
-#define nautilus_gtk_marshal_INT__POINTER_STRING nautilus_gtk_marshal_INT__POINTER_POINTER
-#define nautilus_gtk_marshal_NONE__BOXED_BOXED gtk_marshal_NONE__POINTER_POINTER
-#define nautilus_gtk_marshal_NONE__POINTER_STRING_STRING gtk_marshal_NONE__POINTER_POINTER_POINTER
-#define nautilus_gtk_marshal_NONE__STRING_POINTER gtk_marshal_NONE__POINTER_POINTER
-#define nautilus_gtk_marshal_NONE__STRING_POINTER_STRING gtk_marshal_NONE__POINTER_POINTER_POINTER
-#define nautilus_gtk_marshal_NONE__STRING_STRING_POINTER_STRING nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER
-#define nautilus_gtk_marshal_POINTER__POINTER_INT_INT_STRING_POINTER nautilus_gtk_marshal_POINTER__POINTER_INT_INT_POINTER_POINTER
-#define nautilus_gtk_marshal_POINTER__POINTER_STRING_POINTER nautilus_gtk_marshal_POINTER__POINTER_POINTER_POINTER
-#define nautilus_gtk_marshal_STRING__NONE nautilus_gtk_marshal_POINTER__NONE
-#define nautilus_gtk_marshal_STRING__POINTER nautilus_gtk_marshal_POINTER__POINTER
-#define nautilus_gtk_marshal_STRING__POINTER_POINTER nautilus_gtk_marshal_POINTER__POINTER_POINTER
-#define nautilus_gtk_marshal_STRING__POINTER_POINTER_POINTER nautilus_gtk_marshal_POINTER__POINTER_POINTER_POINTER
-#define nautilus_gtk_marshal_STRING__POINTER_POINTER_STRING nautilus_gtk_marshal_POINTER__POINTER_POINTER_POINTER
-#define nautilus_gtk_marshal_STRING__POINTER_STRING nautilus_gtk_marshal_POINTER__POINTER_POINTER
-
-void nautilus_gtk_marshal_INT__NONE                                             (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__DOUBLE                                          (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__DOUBLE_DOUBLE_DOUBLE           	                (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__INT_INT_INT        		                (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__POINTER_INT_INT_DOUBLE                          (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__POINTER_POINTER_INT_INT_INT                     (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__POINTER_INT_INT_INT        	                (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_BOOL__INT_POINTER_INT_INT_UINT                        (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);     
-void nautilus_gtk_marshal_NONE__INT_POINTER_INT_INT_UINT                        (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER                 (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__POINTER_INT_POINTER_POINTER                     (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER_POINTER_POINTER (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_INT_INT_INT             (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER_INT_INT_UINT    (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__POINTER_INT_INT_DOUBLE_DOUBLE                   (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_INT__POINTER_POINTER                                  (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_INT__POINTER_INT					(GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_POINTER__NONE                                         (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_POINTER__INT                                          (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_POINTER__POINTER                                      (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_POINTER__POINTER_POINTER                              (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_POINTER__POINTER_POINTER_POINTER                      (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_POINTER__POINTER_INT_INT_POINTER_POINTER              (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-
-#endif /* NAUTILUS_GTK_EXTENSIONS_H */
diff --git a/libnautilus-extensions/nautilus-gtk-macros.h b/libnautilus-extensions/nautilus-gtk-macros.h
deleted file mode 100644
index a8d12856e..000000000
--- a/libnautilus-extensions/nautilus-gtk-macros.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-gtk-macros.h: Macros to reduce boilerplate when using GTK.
- 
-   Copyright (C) 1999, 2000, 2001 Eazel, Inc.
-  
-   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.
-  
-   Authors: Darin Adler <darin@eazel.com>
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_GTK_MACROS_H
-#define NAUTILUS_GTK_MACROS_H
-
-#include <glib.h>
-
-/* Define a parent_class global and a get_type function for a GTK class.
-   Since this is boilerplate, it's better not to repeat it over and over again.
-   Called like this:
-
-       NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusBookmark, nautilus_bookmark, GTK_TYPE_OBJECT)
-
-   The parent_class_type parameter is guaranteed to be evaluated only once
-   so it can be an expression, even an expression that contains a function call.
-*/
-#define NAUTILUS_DEFINE_CLASS_BOILERPLATE(class_name, class_name_in_function_format, parent_class_type) \
-                                                                                                        \
-static gpointer parent_class;                                                                           \
-                                                                                                        \
-GtkType                                                                                                 \
-class_name_in_function_format##_get_type (void)                                                         \
-{                                                                                                       \
-	GtkType parent_type;                                                                            \
-	static GtkType type;                                                                            \
-                                                                                                        \
-	if (type == 0) {                                                                                \
-		static GtkTypeInfo info = {                                                             \
-			#class_name,                                                                    \
-			sizeof (class_name),                                                            \
-			sizeof (class_name##Class),                                                     \
-			(GtkClassInitFunc)class_name_in_function_format##_initialize_class,             \
-			(GtkObjectInitFunc)class_name_in_function_format##_initialize,                  \
-			NULL,                                                                           \
-			NULL,                                                                           \
-			NULL                                                                            \
-		};                                                                                      \
-                                                                                           		\
-		parent_type = (parent_class_type);                                                      \
-		type = gtk_type_unique (parent_type, &info);                                            \
-		parent_class = gtk_type_class (parent_type);                                            \
-	}                                                                                               \
-                                                                                                        \
-	return type;                                                                                    \
-}
-
-/* Call a parent class version of a virtual function (or default
- * signal handler since that's the same thing). Nice because it
- * documents what it's doing and there is less chance for a
- * typo. Depends on the parent class pointer having the conventional
- * name "parent_class" as the boilerplate macro above does it.
- */
-#define NAUTILUS_CALL_PARENT(parent_class_cast_macro, signal, parameters)                    \
-                                                                                             \
-G_STMT_START {                                                                               \
-	if (parent_class_cast_macro (parent_class)->signal != NULL) {                        \
-		(* parent_class_cast_macro (parent_class)->signal) parameters;               \
-        }                                                                                    \
-} G_STMT_END
-
-/* Same thing, for functions with a return value. */
-#define NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE(parent_class_cast_macro, signal, parameters)  \
-                                                                                             \
-(parent_class_cast_macro (parent_class)->signal == NULL)                                     \
-	? 0                                                                                  \
-	: ((* parent_class_cast_macro (parent_class)->signal) parameters)
-
-/* Call a virtual function. Useful when the virtual function is not a
- * signal, otherwise you want to gtk_signal emit. Nice because it
- * documents what it's doing and there is less chance for a typo.
- */
-#define NAUTILUS_CALL_METHOD(class_cast_macro, object, signal, parameters)                   \
-                                                                                             \
-G_STMT_START {                                                                               \
-	if (class_cast_macro (GTK_OBJECT (object)->klass)->signal != NULL) {                 \
-		(* class_cast_macro (GTK_OBJECT (object)->klass)->signal) parameters;        \
-	}                                                                                    \
-} G_STMT_END
-
-/* Same thing, for functions with a return value. */
-#define NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE(class_cast_macro, object, signal, parameters) \
-                                                                                             \
-(class_cast_macro (GTK_OBJECT (object)->klass)->signal == NULL)                              \
-	? 0                                                                                  \
-	: ((* class_cast_macro (GTK_OBJECT (object)->klass)->signal) parameters)
-
-#ifndef G_DISABLE_ASSERT
-
-/* Define a signal that is not implemented by this class but must be 
- * implemented by subclasses. This macro should be used inside the
- * class initialization function. The companion macro NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL
- * must be used earlier in the file. Called like this:
- * 
- * NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass,
- *					 fm_directory_view,
- *					 clear); 
- */
-#define NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL(class_pointer, class_name_in_function_format, signal)     \
-                                                                                                       \
-* (void (**)(void)) & (class_pointer)->signal = class_name_in_function_format##_unimplemented_##signal
-
-/* Provide a debug-only implementation of a signal that must be implemented
- * by subclasses. The debug-only implementation fires a warning if it is called.
- * This macro should be placed as if it were a function, earlier in the file
- * than the class initialization function. Called like this:
- * 
- * NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, clear);
- */
-#define NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL(class_name_in_function_format, signal)        \
-                                                                                              \
-static void                                                                                   \
-class_name_in_function_format##_unimplemented_##signal (void)                                 \
-{                                                                                             \
-	g_warning ("failed to override signal " #class_name_in_function_format "->" #signal); \
-}
-
-#else /* G_DISABLE_ASSERT */
-
-#define NAUTILUS_DEFINE_MUST_OVERRIDE_SIGNAL(class_cast_macro, class_pointer, class_name_in_function_format, signal)
-#define NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL(class_name_in_function_format, signal)
-#define NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL(class_pointer, class_name_in_function_format, signal)
-
-#endif /* G_DISABLE_ASSERT */
-
-/* Access the class for a given object. */
-#define NAUTILUS_CLASS(object) (GTK_OBJECT (object)->klass)
-
-/* Access a method. */
-#define NAUTILUS_ACCESS_METHOD(class_cast_macro, object, method)			\
-(class_cast_macro (NAUTILUS_CLASS (object))->method)
-
-/* Invoke a method for a given object. */
-#define NAUTILUS_INVOKE_METHOD(class_cast_macro, object, method, parameters)		\
-((* NAUTILUS_ACCESS_METHOD (class_cast_macro, object, method)) parameters)
-
-/* Assert the non-nullness of a method for a given object. */
-#define NAUTILUS_ASSERT_METHOD(class_cast_macro, object, method)			\
-g_assert (NAUTILUS_ACCESS_METHOD (class_cast_macro, object, method) != NULL)
-
-/* Invoke a method if it ain't null. */
-#define NAUTILUS_INVOKE_METHOD_IF(class_cast_macro, object, method, parameters) 	\
-(NAUTILUS_ACCESS_METHOD (class_cast_macro, object, method) ? 0 :			\
-	NAUTILUS_INVOKE_METHOD (class_cast_macro, object, method, parameters))
-
-#endif /* NAUTILUS_GTK_MACROS_H */
diff --git a/libnautilus-extensions/nautilus-horizontal-splitter.c b/libnautilus-extensions/nautilus-horizontal-splitter.c
index 676e39a8d..615b46102 100644
--- a/libnautilus-extensions/nautilus-horizontal-splitter.c
+++ b/libnautilus-extensions/nautilus-horizontal-splitter.c
@@ -25,7 +25,7 @@
 #include <config.h>
 #include "nautilus-horizontal-splitter.h"
 
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 #include <stdlib.h>
 
@@ -60,7 +60,7 @@ static void     nautilus_horizontal_splitter_destroy          (GtkObject
 static void     nautilus_horizontal_splitter_draw             (GtkWidget                       *widget,
 							       GdkRectangle                    *area);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusHorizontalSplitter,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusHorizontalSplitter,
 				   nautilus_horizontal_splitter,
 				   E_TYPE_HPANED)
 
@@ -103,7 +103,7 @@ nautilus_horizontal_splitter_destroy (GtkObject *object)
 	g_free (horizontal_splitter->details);
 	
 	/* Chain */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -340,7 +340,7 @@ nautilus_horizontal_splitter_button_press (GtkWidget *widget, GdkEventButton *ev
 		splitter->details->down_time = event->time;
 	}
 
-	return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	return EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, button_press_event, (widget, event));
 }
 
diff --git a/libnautilus-extensions/nautilus-icon-canvas-item.c b/libnautilus-extensions/nautilus-icon-canvas-item.c
index 01a83eb7b..2e9c11bb6 100644
--- a/libnautilus-extensions/nautilus-icon-canvas-item.c
+++ b/libnautilus-extensions/nautilus-icon-canvas-item.c
@@ -38,21 +38,21 @@
 #include <libart_lgpl/art_rgb_rgba_affine.h>
 #include <libart_lgpl/art_svp_vpath.h>
 #include "nautilus-icon-private.h"
-#include "nautilus-string.h"
-#include "nautilus-art-extensions.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gdk-font-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
+#include <eel/eel-string.h>
+#include <eel/eel-art-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-font-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
 #include "nautilus-global-preferences.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gnome-extensions.h"
-#include "nautilus-graphic-effects.h"
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-graphic-effects.h>
 #include "nautilus-file-utilities.h"
 #include "nautilus-icon-factory.h"
 #include "nautilus-theme.h"
-#include "nautilus-smooth-text-layout.h"
-#include "nautilus-smooth-text-layout-cache.h"
+#include <eel/eel-smooth-text-layout.h>
+#include <eel/eel-smooth-text-layout-cache.h>
 
 /* Comment this out if the new smooth fonts code give you problems
  * This isnt meant to be permanent.  Its just a precaution.
@@ -98,7 +98,7 @@ struct NautilusIconCanvasItemDetails {
 
 	/* Font stuff whilst in smooth mode */
 	int smooth_font_size;
-	NautilusScalableFont *smooth_font;
+	EelScalableFont *smooth_font;
 	
 	/* Cached rectangle in canvas coordinates */
 	ArtIRect canvas_rect;
@@ -143,9 +143,9 @@ enum {
 
 static guint signals[LAST_SIGNAL];
 
-static	guint32 highlight_background_color = NAUTILUS_RGBA_COLOR_PACK (0x00, 0x00, 0x00, 0xFF);
-static	guint32 highlight_text_color	   = NAUTILUS_RGBA_COLOR_PACK (0xFF, 0xFF, 0xFF, 0xFF);
-static  guint32 highlight_text_info_color  = NAUTILUS_RGBA_COLOR_PACK (0xCC, 0xCC, 0xCC, 0xFF);
+static	guint32 highlight_background_color = EEL_RGBA_COLOR_PACK (0x00, 0x00, 0x00, 0xFF);
+static	guint32 highlight_text_color	   = EEL_RGBA_COLOR_PACK (0xFF, 0xFF, 0xFF, 0xFF);
+static  guint32 highlight_text_info_color  = EEL_RGBA_COLOR_PACK (0xCC, 0xCC, 0xCC, 0xFF);
 
 static int click_policy_auto_value;
 
@@ -223,9 +223,9 @@ static gboolean icon_canvas_item_is_smooth                 (const NautilusIconCa
 
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusIconCanvasItem, nautilus_icon_canvas_item, GNOME_TYPE_CANVAS_ITEM)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusIconCanvasItem, nautilus_icon_canvas_item, GNOME_TYPE_CANVAS_ITEM)
 
-static NautilusSmoothTextLayoutCache *layout_cache;
+static EelSmoothTextLayoutCache *layout_cache;
 
 static void
 free_layout_cache (void)
@@ -241,7 +241,7 @@ nautilus_icon_canvas_item_initialize_class (NautilusIconCanvasItemClass *class)
 	GnomeCanvasItemClass *item_class;
 
 	if (layout_cache == NULL) {
-		layout_cache = nautilus_smooth_text_layout_cache_new ();
+		layout_cache = eel_smooth_text_layout_cache_new ();
 		g_atexit (free_layout_cache);
 	}
 
@@ -308,7 +308,7 @@ nautilus_icon_canvas_item_initialize (NautilusIconCanvasItem *icon_item)
 	
 	/* set up the default font and size */
 	icon_item->details->smooth_font_size = 12;
-	icon_item->details->smooth_font = nautilus_scalable_font_get_default_font ();
+	icon_item->details->smooth_font = eel_scalable_font_get_default_font ();
 }
 
 /* Destroy handler for the icon canvas item. */
@@ -330,7 +330,7 @@ nautilus_icon_canvas_item_destroy (GtkObject *object)
 	if (details->pixbuf != NULL) {
 		gdk_pixbuf_unref (details->pixbuf);
 	}
-	nautilus_gdk_pixbuf_list_free (details->emblem_pixbufs);
+	eel_gdk_pixbuf_list_free (details->emblem_pixbufs);
 	g_free (details->editable_text);
 	g_free (details->additional_text);
 	g_free (details->attach_points);
@@ -344,7 +344,7 @@ nautilus_icon_canvas_item_destroy (GtkObject *object)
 	
 	g_free (details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
  
 /* Currently we require pixbufs in this format (for hit testing).
@@ -384,7 +384,7 @@ nautilus_icon_canvas_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
 	switch (arg_id) {
 
 	case ARG_EDITABLE_TEXT:
-		if (nautilus_strcmp (details->editable_text, GTK_VALUE_STRING (*arg)) == 0) {
+		if (eel_strcmp (details->editable_text, GTK_VALUE_STRING (*arg)) == 0) {
 			return;
 		}
 
@@ -395,7 +395,7 @@ nautilus_icon_canvas_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
 		break;
 
 	case ARG_ADDITIONAL_TEXT:
-		if (nautilus_strcmp (details->additional_text, GTK_VALUE_STRING (*arg)) == 0) {
+		if (eel_strcmp (details->additional_text, GTK_VALUE_STRING (*arg)) == 0) {
 			return;
 		}
 
@@ -407,7 +407,7 @@ nautilus_icon_canvas_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
 
 	case ARG_FONT:
 		font = GTK_VALUE_BOXED (*arg);
-		if (nautilus_gdk_font_equal (font, details->font)) {
+		if (eel_gdk_font_equal (font, details->font)) {
 			return;
 		}
 
@@ -445,7 +445,7 @@ nautilus_icon_canvas_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
 
         case ARG_SMOOTH_FONT:
 		nautilus_icon_canvas_item_set_smooth_font (NAUTILUS_ICON_CANVAS_ITEM (object),
-							   NAUTILUS_SCALABLE_FONT (GTK_VALUE_OBJECT (*arg)));
+							   EEL_SCALABLE_FONT (GTK_VALUE_OBJECT (*arg)));
 		nautilus_icon_canvas_item_invalidate_label_size (item);				
 		break;
 
@@ -562,7 +562,7 @@ nautilus_icon_canvas_item_set_emblems (NautilusIconCanvasItem *item,
 	/* The case where the emblems are identical is fairly common,
 	 * so lets take the time to check for it.
 	 */
-	if (nautilus_g_list_equal (item->details->emblem_pixbufs, emblem_pixbufs)) {
+	if (eel_g_list_equal (item->details->emblem_pixbufs, emblem_pixbufs)) {
 		return;
 	}
 
@@ -572,8 +572,8 @@ nautilus_icon_canvas_item_set_emblems (NautilusIconCanvasItem *item,
 	}
 	
 	/* Take in the new list of emblems. */
-	nautilus_gdk_pixbuf_list_ref (emblem_pixbufs);
-	nautilus_gdk_pixbuf_list_free (item->details->emblem_pixbufs);
+	eel_gdk_pixbuf_list_ref (emblem_pixbufs);
+	eel_gdk_pixbuf_list_free (item->details->emblem_pixbufs);
 	item->details->emblem_pixbufs = g_list_copy (emblem_pixbufs);
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (item));
 }
@@ -644,14 +644,14 @@ nautilus_icon_canvas_item_update_bounds (NautilusIconCanvasItem *item)
 	GdkPixbuf *emblem_pixbuf;
 		
 	/* Compute new bounds. */
-	nautilus_gnome_canvas_item_get_current_canvas_bounds
+	eel_gnome_canvas_item_get_current_canvas_bounds
 		(GNOME_CANVAS_ITEM (item), &before);
 	recompute_bounding_box (item);
-	nautilus_gnome_canvas_item_get_current_canvas_bounds
+	eel_gnome_canvas_item_get_current_canvas_bounds
 		(GNOME_CANVAS_ITEM (item), &after);
 
 	/* If the bounds didn't change, we are done. */
-	if (nautilus_art_irect_equal (&before, &after)) {
+	if (eel_art_irect_equal (&before, &after)) {
 		return;
 	}
 	
@@ -670,11 +670,11 @@ nautilus_icon_canvas_item_update_bounds (NautilusIconCanvasItem *item)
 	}
 
 	/* Send out the bounds_changed signal and queue a redraw. */
-	nautilus_gnome_canvas_request_redraw_rectangle
+	eel_gnome_canvas_request_redraw_rectangle
 		(GNOME_CANVAS_ITEM (item)->canvas, &before);
 	gtk_signal_emit (GTK_OBJECT (item),
 			 signals[BOUNDS_CHANGED]);
-	nautilus_gnome_canvas_item_request_redraw
+	eel_gnome_canvas_item_request_redraw
 		(GNOME_CANVAS_ITEM (item));
 }
 
@@ -686,8 +686,8 @@ nautilus_icon_canvas_item_update (GnomeCanvasItem *item,
 				      int flags)
 {
 	nautilus_icon_canvas_item_update_bounds (NAUTILUS_ICON_CANVAS_ITEM (item));
-	nautilus_gnome_canvas_item_request_redraw (item);
-	NAUTILUS_CALL_PARENT (GNOME_CANVAS_ITEM_CLASS, update,
+	eel_gnome_canvas_item_request_redraw (item);
+	EEL_CALL_PARENT (GNOME_CANVAS_ITEM_CLASS, update,
 			      (item, affine, clip_path, flags));
 }
 
@@ -910,7 +910,7 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item,
 		
 		/* indicate keyboard selection by framing the text with a gray-stippled rectangle */
 		if (details->is_highlighted_as_keyboard_focus) {
-			gdk_gc_set_stipple (gc, nautilus_stipple_bitmap ());
+			gdk_gc_set_stipple (gc, eel_stipple_bitmap ());
 			gdk_gc_set_fill (gc, GDK_STIPPLED);
 			gdk_draw_rectangle
 				(drawable, gc, FALSE,
@@ -975,7 +975,7 @@ draw_stretch_handles (NautilusIconCanvasItem *item, GdkDrawable *drawable,
 	knob_height = gdk_pixbuf_get_height (knob_pixbuf);
 	
 	/* first draw the box */		
-	gdk_gc_set_stipple (gc, nautilus_stipple_bitmap ());
+	gdk_gc_set_stipple (gc, eel_stipple_bitmap ());
 	gdk_gc_set_fill (gc, GDK_STIPPLED);
 	gdk_draw_rectangle
 		(drawable, gc, FALSE,
@@ -1080,13 +1080,13 @@ draw_stretch_handles_aa (NautilusIconCanvasItem *item, GnomeCanvasBuf *buf,
 	/* draw a box to connect the dots */
 	draw_outline_rectangle_aa (buf, rect->x0 + 1, rect->y0 + 1,
 				   rect->x1 - 1, rect->y1 - 1,
-				   NAUTILUS_RGBA_COLOR_PACK (153, 153, 153, 127));	
+				   EEL_RGBA_COLOR_PACK (153, 153, 153, 127));	
 
 	/* now draw the stretch handles themselves  */
-	nautilus_gnome_canvas_draw_pixbuf (buf, knob_pixbuf, rect->x0, rect->y0);
-	nautilus_gnome_canvas_draw_pixbuf (buf, knob_pixbuf, rect->x0, rect->y1 - knob_height);
-	nautilus_gnome_canvas_draw_pixbuf (buf, knob_pixbuf, rect->x1 - knob_width, rect->y0);
-	nautilus_gnome_canvas_draw_pixbuf (buf, knob_pixbuf, rect->x1 - knob_width, rect->y1 - knob_height);
+	eel_gnome_canvas_draw_pixbuf (buf, knob_pixbuf, rect->x0, rect->y0);
+	eel_gnome_canvas_draw_pixbuf (buf, knob_pixbuf, rect->x0, rect->y1 - knob_height);
+	eel_gnome_canvas_draw_pixbuf (buf, knob_pixbuf, rect->x1 - knob_width, rect->y0);
+	eel_gnome_canvas_draw_pixbuf (buf, knob_pixbuf, rect->x1 - knob_width, rect->y1 - knob_height);
 			
 	g_free(knob_filename);
 	gdk_pixbuf_unref(knob_pixbuf);	
@@ -1263,7 +1263,7 @@ map_pixbuf (NautilusIconCanvasItem *icon_item)
 	canvas = GNOME_CANVAS_ITEM(icon_item)->canvas;
 	
 	if (icon_item->details->is_prelit) {
-		temp_pixbuf = nautilus_create_spotlight_pixbuf (icon_item->details->pixbuf);
+		temp_pixbuf = eel_create_spotlight_pixbuf (icon_item->details->pixbuf);
 		
 		/* FIXME bugzilla.eazel.com 2471: This hard-wired image is inappropriate to
 		 * this level of code, which shouldn't know that the
@@ -1305,7 +1305,7 @@ map_pixbuf (NautilusIconCanvasItem *icon_item)
 	if (icon_item->details->is_highlighted_for_selection
 	    || icon_item->details->is_highlighted_for_drop) {
 		old_pixbuf = temp_pixbuf;
-		temp_pixbuf = nautilus_create_darkened_pixbuf (temp_pixbuf,
+		temp_pixbuf = eel_create_darkened_pixbuf (temp_pixbuf,
 							       0.8 * 255,
 							       0.8 * 255);
 		if (old_pixbuf != icon_item->details->pixbuf) {
@@ -1375,7 +1375,7 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item,
 	GnomeCanvasItem *canvas_item;
 	int max_text_width;
 	int icon_width, text_left, box_left;
-	const NautilusSmoothTextLayout *smooth_text_layout;
+	const EelSmoothTextLayout *smooth_text_layout;
 	char **pieces;
 	const char *text_piece;
 	int i;
@@ -1467,7 +1467,7 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item,
 			text_piece = " ";
 		}
 
-		smooth_text_layout = nautilus_smooth_text_layout_cache_render (layout_cache,
+		smooth_text_layout = eel_smooth_text_layout_cache_render (layout_cache,
 									       text_piece,
 									       strlen (text_piece),
 									       details->smooth_font,
@@ -1480,7 +1480,7 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item,
 			gboolean underlined;
 			ArtIRect destination_area;
 
-			text_left = icon_left + (icon_width - nautilus_smooth_text_layout_get_width (smooth_text_layout)) / 2;
+			text_left = icon_left + (icon_width - eel_smooth_text_layout_get_width (smooth_text_layout)) / 2;
 			
 			/* if it's prelit, and we're in click-to-activate mode, underline the text */
 			underlined = (details->is_prelit && in_single_click_mode ());
@@ -1492,24 +1492,24 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item,
 				
 				destination_area.x0 = text_left + 2;
 				destination_area.y0 = icon_bottom + height_so_far + 1;
-				destination_area.x1 = destination_area.x0 + nautilus_smooth_text_layout_get_width (smooth_text_layout);
-				destination_area.y1 = destination_area.y0 + nautilus_smooth_text_layout_get_height (smooth_text_layout);
-				nautilus_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
+				destination_area.x1 = destination_area.x0 + eel_smooth_text_layout_get_width (smooth_text_layout);
+				destination_area.y1 = destination_area.y0 + eel_smooth_text_layout_get_height (smooth_text_layout);
+				eel_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
 									    destination_pixbuf,
 									    0,
 									    0,
 									    &destination_area,
 									    GTK_JUSTIFY_CENTER,
 									    underlined,
-									    NAUTILUS_RGB_COLOR_BLACK,
+									    EEL_RGB_COLOR_BLACK,
 									    0xff);
 			}
 			
 			destination_area.x0 = text_left;
 			destination_area.y0 = icon_bottom + height_so_far;
-			destination_area.x1 = destination_area.x0 + nautilus_smooth_text_layout_get_width (smooth_text_layout);
-			destination_area.y1 = destination_area.y0 + nautilus_smooth_text_layout_get_height (smooth_text_layout);
-			nautilus_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
+			destination_area.x1 = destination_area.x0 + eel_smooth_text_layout_get_width (smooth_text_layout);
+			destination_area.y1 = destination_area.y0 + eel_smooth_text_layout_get_height (smooth_text_layout);
+			eel_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
 								    destination_pixbuf,
 								    0,
 								    0,
@@ -1523,9 +1523,9 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item,
 			if (needs_highlight) {
 				destination_area.x0 = text_left + 1;
 				destination_area.y0 = icon_bottom + height_so_far;
-				destination_area.x1 = destination_area.x0 + nautilus_smooth_text_layout_get_width (smooth_text_layout);
-				destination_area.y1 = destination_area.y0 + nautilus_smooth_text_layout_get_height (smooth_text_layout);
-				nautilus_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
+				destination_area.x1 = destination_area.x0 + eel_smooth_text_layout_get_width (smooth_text_layout);
+				destination_area.y1 = destination_area.y0 + eel_smooth_text_layout_get_height (smooth_text_layout);
+				eel_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
 									    destination_pixbuf,
 									    0,
 									    0,
@@ -1538,8 +1538,8 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item,
 			
 		}
 		
-		width_so_far = MAX (width_so_far, (guint) nautilus_smooth_text_layout_get_width (smooth_text_layout));
-		height_so_far += nautilus_smooth_text_layout_get_height (smooth_text_layout) + LABEL_LINE_SPACING;
+		width_so_far = MAX (width_so_far, (guint) eel_smooth_text_layout_get_width (smooth_text_layout));
+		height_so_far += eel_smooth_text_layout_get_height (smooth_text_layout) + LABEL_LINE_SPACING;
 		
 		gtk_object_unref (GTK_OBJECT (smooth_text_layout));
 	}
@@ -1659,20 +1659,20 @@ draw_label_text_aa (NautilusIconCanvasItem *icon_item, GnomeCanvasBuf *buf, int
  				      icon_item->details->text_height);
 	if (needs_highlight) {
 		container = NAUTILUS_ICON_CONTAINER (GNOME_CANVAS_ITEM (icon_item)->canvas);	
-		nautilus_gdk_pixbuf_fill_rectangle_with_color (text_pixbuf, NULL,
+		eel_gdk_pixbuf_fill_rectangle_with_color (text_pixbuf, NULL,
 							       container->details->highlight_color);
 		clear_rounded_corners (text_pixbuf, container->details->highlight_frame, 5);
 		
 	} else {
-		nautilus_gdk_pixbuf_fill_rectangle_with_color (text_pixbuf, NULL,
-							       NAUTILUS_RGBA_COLOR_PACK (0, 0, 0, 0));
+		eel_gdk_pixbuf_fill_rectangle_with_color (text_pixbuf, NULL,
+							       EEL_RGBA_COLOR_PACK (0, 0, 0, 0));
 	}
 
 	draw_or_measure_label_text_aa (icon_item, text_pixbuf, x_delta, 0);
 	
 	/* Draw the pixbuf containing the label. */
 
-	nautilus_gnome_canvas_draw_pixbuf (buf, text_pixbuf, x - x_delta, y + LABEL_OFFSET);
+	eel_gnome_canvas_draw_pixbuf (buf, text_pixbuf, x - x_delta, y + LABEL_OFFSET);
 
 	gdk_pixbuf_unref (text_pixbuf);	
 
@@ -1681,7 +1681,7 @@ draw_label_text_aa (NautilusIconCanvasItem *icon_item, GnomeCanvasBuf *buf, int
 		draw_outline_rectangle_aa (buf, x - x_delta + 1, y + 1,
 					   x - x_delta + icon_item->details->text_width,
 					   y + icon_item->details->text_height,
-					   NAUTILUS_RGBA_COLOR_PACK (153, 153, 153, 127));
+					   EEL_RGBA_COLOR_PACK (153, 153, 153, 127));
 	}
 }
 
@@ -1708,7 +1708,7 @@ nautilus_icon_canvas_item_render (GnomeCanvasItem *item, GnomeCanvasBuf *buf)
 	}
 
 	/* draw the icon */
-	nautilus_gnome_canvas_draw_pixbuf (buf, temp_pixbuf, icon_rect.x0, icon_rect.y0);
+	eel_gnome_canvas_draw_pixbuf (buf, temp_pixbuf, icon_rect.x0, icon_rect.y0);
 
 	if (temp_pixbuf != icon_item->details->pixbuf) {
 		gdk_pixbuf_unref (temp_pixbuf);
@@ -1717,7 +1717,7 @@ nautilus_icon_canvas_item_render (GnomeCanvasItem *item, GnomeCanvasBuf *buf)
 	/* draw the emblems */	
 	emblem_layout_reset (&emblem_layout, icon_item, &icon_rect);
 	while (emblem_layout_next (&emblem_layout, &emblem_pixbuf, &emblem_rect)) {
-		nautilus_gnome_canvas_draw_pixbuf (buf, emblem_pixbuf, emblem_rect.x0, emblem_rect.y0);
+		eel_gnome_canvas_draw_pixbuf (buf, emblem_pixbuf, emblem_rect.x0, emblem_rect.y0);
 	}
 
 	/* draw the stretch handles */
@@ -1849,9 +1849,9 @@ hit_test (NautilusIconCanvasItem *icon_item, const ArtIRect *canvas_rect)
 	details = icon_item->details;
 	
 	/* Quick check to see if the rect hits the icon, text or emblems at all. */
-	if (!nautilus_art_irect_hits_irect (&icon_item->details->canvas_rect, canvas_rect)
-	    && (!nautilus_art_irect_hits_irect (&details->text_rect, canvas_rect))
-	    && (!nautilus_art_irect_hits_irect (&details->emblem_rect, canvas_rect))) {
+	if (!eel_art_irect_hits_irect (&icon_item->details->canvas_rect, canvas_rect)
+	    && (!eel_art_irect_hits_irect (&details->text_rect, canvas_rect))
+	    && (!eel_art_irect_hits_irect (&details->emblem_rect, canvas_rect))) {
 		return FALSE;
 	}
 
@@ -1862,7 +1862,7 @@ hit_test (NautilusIconCanvasItem *icon_item, const ArtIRect *canvas_rect)
 	
 	/* Check for hit in the icon. If we're highlighted for dropping, anywhere in the rect is OK */
 	if (icon_item->details->is_highlighted_for_drop) {
-		if (nautilus_art_irect_hits_irect (&icon_item->details->canvas_rect, canvas_rect)) {
+		if (eel_art_irect_hits_irect (&icon_item->details->canvas_rect, canvas_rect)) {
 			return TRUE;
 		}
 	} else {
@@ -1872,7 +1872,7 @@ hit_test (NautilusIconCanvasItem *icon_item, const ArtIRect *canvas_rect)
 	}
 
 	/* Check for hit in the text. */
-	if (nautilus_art_irect_hits_irect (&details->text_rect, canvas_rect)
+	if (eel_art_irect_hits_irect (&details->text_rect, canvas_rect)
 	    && !icon_item->details->is_renaming) {
 		return TRUE;
 	}
@@ -2064,7 +2064,7 @@ hit_test_stretch_handle (NautilusIconCanvasItem *item,
 
 	/* Quick check to see if the rect hits the icon at all. */
 	icon_rect = item->details->canvas_rect;
-	if (!nautilus_art_irect_hits_irect (probe_canvas_rect, &icon_rect)) {
+	if (!eel_art_irect_hits_irect (probe_canvas_rect, &icon_rect)) {
 		return FALSE;
 	}
 
@@ -2154,10 +2154,10 @@ nautilus_icon_canvas_item_get_max_text_width (NautilusIconCanvasItem *item)
 
 void
 nautilus_icon_canvas_item_set_smooth_font (NautilusIconCanvasItem	*icon_item,
-					   NautilusScalableFont		*font)
+					   EelScalableFont		*font)
 {
 	g_return_if_fail (NAUTILUS_IS_ICON_CANVAS_ITEM (icon_item));
-	g_return_if_fail (NAUTILUS_IS_SCALABLE_FONT (font));
+	g_return_if_fail (EEL_IS_SCALABLE_FONT (font));
 
 	gtk_object_unref (GTK_OBJECT (icon_item->details->smooth_font));
 
diff --git a/libnautilus-extensions/nautilus-icon-canvas-item.h b/libnautilus-extensions/nautilus-icon-canvas-item.h
index e9f52d227..f7be68e70 100644
--- a/libnautilus-extensions/nautilus-icon-canvas-item.h
+++ b/libnautilus-extensions/nautilus-icon-canvas-item.h
@@ -29,7 +29,7 @@
 #include <libgnomeui/gnome-canvas.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include "nautilus-icon-factory.h"
-#include "nautilus-scalable-font.h"
+#include <eel/eel-scalable-font.h>
 
 BEGIN_GNOME_DECLS
 
@@ -91,7 +91,7 @@ void        nautilus_icon_canvas_item_get_icon_rectangle       (NautilusIconCanv
 								ArtDRect                   *world_rectangle);
 void        nautilus_icon_canvas_item_update_bounds            (NautilusIconCanvasItem     *item);
 void        nautilus_icon_canvas_item_set_smooth_font          (NautilusIconCanvasItem     *item,
-								NautilusScalableFont       *font);
+								EelScalableFont       *font);
 void        nautilus_icon_canvas_item_set_smooth_font_size     (NautilusIconCanvasItem     *item,
 								int                         font_size);
 
diff --git a/libnautilus-extensions/nautilus-icon-container.c b/libnautilus-extensions/nautilus-icon-container.c
index bb243de06..6243078b5 100644
--- a/libnautilus-extensions/nautilus-icon-container.c
+++ b/libnautilus-extensions/nautilus-icon-container.c
@@ -27,27 +27,27 @@
 #include <config.h>
 #include "nautilus-icon-container.h"
 
-#include "nautilus-background.h"
 #include "nautilus-font-factory.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-glib-extensions.h"
 #include "nautilus-global-preferences.h"
-#include "nautilus-gnome-extensions.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gtk-macros.h"
 #include "nautilus-icon-private.h"
 #include "nautilus-icon-text-item.h"
 #include "nautilus-lib-self-check-functions.h"
-#include "nautilus-string.h"
 #include "nautilus-theme.h"
 #include <ctype.h>
+#include <eel/eel-background.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-string.h>
 #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
 #include <gdk/gdkkeysyms.h>
+#include <gtk/gtklayout.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
-#include <gtk/gtklayout.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include <libnautilus/nautilus-clipboard.h>
 #include <math.h>
 #include <stdio.h>
@@ -136,7 +136,7 @@ static void          end_renaming_mode                        (NautilusIconConta
 							       gboolean                    commit);
 static NautilusIcon *get_icon_being_renamed 		      (NautilusIconContainer 	  *container);
 static void          finish_adding_new_icons                  (NautilusIconContainer      *container);
-static void          update_label_color                       (NautilusBackground         *background,
+static void          update_label_color                       (EelBackground         *background,
 							       NautilusIconContainer      *icon_container);
 static void	     icon_get_bounding_box 		      (NautilusIcon 		  *icon,
 							       int 			  *x1_return, 
@@ -149,7 +149,7 @@ static void	     process_pending_icon_to_rename	      (NautilusIconContainer	  *
 
 static int click_policy_auto_value;
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusIconContainer,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusIconContainer,
 				   nautilus_icon_container,
 				   GNOME_TYPE_CANVAS)
 
@@ -405,8 +405,8 @@ nautilus_icon_container_scroll (NautilusIconContainer *container,
 	old_h_value = hadj->value;
 	old_v_value = vadj->value;
 	
-	nautilus_gtk_adjustment_set_value (hadj, hadj->value + delta_x);
-	nautilus_gtk_adjustment_set_value (vadj, vadj->value + delta_y);
+	eel_gtk_adjustment_set_value (hadj, hadj->value + delta_x);
+	eel_gtk_adjustment_set_value (vadj, vadj->value + delta_y);
 
 	/* return TRUE if we did scroll */
 	return hadj->value != old_h_value || vadj->value != old_v_value;
@@ -476,20 +476,20 @@ reveal_icon (NautilusIconContainer *container,
 	hadj = gtk_layout_get_hadjustment (GTK_LAYOUT (container));
 	vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (container));
 
-	nautilus_gnome_canvas_item_get_canvas_bounds
+	eel_gnome_canvas_item_get_canvas_bounds
 		(GNOME_CANVAS_ITEM (icon->item), &bounds);
 
 	if (bounds.y0 < vadj->value) {
-		nautilus_gtk_adjustment_set_value (vadj, bounds.y0);
+		eel_gtk_adjustment_set_value (vadj, bounds.y0);
 	} else if (bounds.y1 > vadj->value + allocation->height) {
-		nautilus_gtk_adjustment_set_value
+		eel_gtk_adjustment_set_value
 			(vadj, bounds.y1 - allocation->height);
 	}
 
 	if (bounds.x0 < hadj->value) {
-		nautilus_gtk_adjustment_set_value (hadj, bounds.x0);
+		eel_gtk_adjustment_set_value (hadj, bounds.x0);
 	} else if (bounds.x1 > hadj->value + allocation->width) {
-		nautilus_gtk_adjustment_set_value
+		eel_gtk_adjustment_set_value
 			(hadj, bounds.x1 - allocation->width);
 	}
 }
@@ -627,7 +627,7 @@ nautilus_icon_container_update_scroll_region (NautilusIconContainer *container)
 	if (nautilus_icon_container_get_is_fixed_size (container)) {
 		/* Set the scroll region to the size of the container allocation */
 		allocation = &GTK_WIDGET (container)->allocation;			
-		nautilus_gnome_canvas_set_scroll_region_left_justify
+		eel_gnome_canvas_set_scroll_region_left_justify
 			(GNOME_CANVAS (container),
 			 (double) - container->details->left_margin,
 			 (double) - container->details->top_margin,
@@ -656,14 +656,14 @@ nautilus_icon_container_update_scroll_region (NautilusIconContainer *container)
 	}
 
 	if (reset_scroll_region) {
-		nautilus_gnome_canvas_set_scroll_region_left_justify
+		eel_gnome_canvas_set_scroll_region_left_justify
 			(GNOME_CANVAS (container),
 			 x1 - CONTAINER_PAD_LEFT,
 			 y1 - CONTAINER_PAD_TOP,
 			 x2 + CONTAINER_PAD_RIGHT,
 			 y2 + CONTAINER_PAD_BOTTOM);
 	} else {
-		nautilus_gnome_canvas_set_scroll_region_include_visible_area
+		eel_gnome_canvas_set_scroll_region_include_visible_area
 			(GNOME_CANVAS (container),
 			 x1 - CONTAINER_PAD_LEFT,
 			 y1 - CONTAINER_PAD_TOP,
@@ -689,8 +689,8 @@ nautilus_icon_container_update_scroll_region (NautilusIconContainer *container)
 	/* Now that we have a new scroll region, clamp the
          * adjustments so we are within the valid scroll area.
 	 */
-	nautilus_gtk_adjustment_clamp_value (hadj);
-	nautilus_gtk_adjustment_clamp_value (vadj);
+	eel_gtk_adjustment_clamp_value (hadj);
+	eel_gtk_adjustment_clamp_value (vadj);
 }
 
 static NautilusIconContainer *sort_hack_container;
@@ -795,7 +795,7 @@ lay_down_one_line (NautilusIconContainer *container,
 	for (p = line_start; p != line_end; p = p->next) {
 		icon = p->data;
 
-		nautilus_gnome_canvas_item_get_world_bounds
+		eel_gnome_canvas_item_get_world_bounds
 			(GNOME_CANVAS_ITEM (icon->item), &bounds);
 		nautilus_icon_canvas_item_get_icon_rectangle (icon->item, &icon_bounds);
 		height_above = icon_bounds.y1 - bounds.y0;
@@ -817,7 +817,7 @@ lay_down_one_line (NautilusIconContainer *container,
 	for (p = line_start; p != line_end; p = p->next) {
 		icon = p->data;
 
-		nautilus_gnome_canvas_item_get_world_bounds
+		eel_gnome_canvas_item_get_world_bounds
 			(GNOME_CANVAS_ITEM (icon->item), &bounds);
 		nautilus_icon_canvas_item_get_icon_rectangle (icon->item, &icon_bounds);		
 		width = get_icon_space_width (container, &bounds);
@@ -857,7 +857,7 @@ lay_down_icons_horizontal (NautilusIconContainer *container,
 		icon = p->data;
 
 		/* Get the width of the icon. */
-		nautilus_gnome_canvas_item_get_world_bounds
+		eel_gnome_canvas_item_get_world_bounds
 			(GNOME_CANVAS_ITEM (icon->item), &bounds);
 		space_width = get_icon_space_width (container, &bounds);
 		
@@ -1249,7 +1249,7 @@ reload_icon_positions (NautilusIconContainer *container)
 				 &have_stored_position);
 		if (have_stored_position) {
 			icon_set_position (icon, position.x, position.y);
-			nautilus_gnome_canvas_item_get_world_bounds
+			eel_gnome_canvas_item_get_world_bounds
 				(GNOME_CANVAS_ITEM (icon->item), &bounds);
 			if (bounds.y1 > bottom) {
 				bottom = bounds.y1;
@@ -1395,7 +1395,7 @@ rubberband_select (NautilusIconContainer *container,
 			/* Only do this calculation once, since all the canvas items
 			 * we are interating are in the same coordinate space
 			 */
-			nautilus_gnome_canvas_world_to_canvas_rectangle
+			eel_gnome_canvas_world_to_canvas_rectangle
 				(GNOME_CANVAS_ITEM (icon->item)->canvas, current_rect, &canvas_rect);
 			canvas_rect_calculated = TRUE;
 		}
@@ -1784,7 +1784,7 @@ compare_with_start_row (NautilusIconContainer *container,
 {
 	ArtIRect bounds;
 
-	nautilus_gnome_canvas_item_get_current_canvas_bounds (GNOME_CANVAS_ITEM (icon->item),
+	eel_gnome_canvas_item_get_current_canvas_bounds (GNOME_CANVAS_ITEM (icon->item),
 							      &bounds);
 	if (container->details->arrow_key_start < bounds.y0) {
 		return -1;
@@ -1801,7 +1801,7 @@ compare_with_start_column (NautilusIconContainer *container,
 {
 	ArtIRect bounds;
 	
-	nautilus_gnome_canvas_item_get_current_canvas_bounds (GNOME_CANVAS_ITEM (icon->item),
+	eel_gnome_canvas_item_get_current_canvas_bounds (GNOME_CANVAS_ITEM (icon->item),
 							      &bounds);
 	if (container->details->arrow_key_start < bounds.x0) {
 		return -1;
@@ -2237,7 +2237,7 @@ build_icon_list_sorted_by_name (NautilusIconContainer *container)
 		return NULL;
 	}
 
-	result = nautilus_g_list_copy (container->details->icons);
+	result = eel_g_list_copy (container->details->icons);
 	sort_icons_by_name (container, &result);
 
 	return result;
@@ -2316,7 +2316,7 @@ destroy (GtkObject *object)
 		gtk_idle_remove (container->details->stretch_idle_id);
 	}
        
-        for (i = 0; i < NAUTILUS_N_ELEMENTS (container->details->label_font); i++) {
+        for (i = 0; i < EEL_N_ELEMENTS (container->details->label_font); i++) {
        		if (container->details->label_font[i] != NULL)
         		gdk_font_unref (container->details->label_font[i]);
 	}
@@ -2344,7 +2344,7 @@ destroy (GtkObject *object)
 	
 	g_free (container->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* GtkWidget methods.  */
@@ -2382,7 +2382,7 @@ size_allocate (GtkWidget *widget,
 		need_layout_redone = TRUE;
 	}
 	
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
 
 	container->details->has_been_allocated = TRUE;
 
@@ -2397,7 +2397,7 @@ realize (GtkWidget *widget)
 	GtkStyle *style;
 	GtkWindow *window;
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
 
 	style = gtk_style_copy (gtk_widget_get_style (widget));
 	style->bg[GTK_STATE_NORMAL] = style->base[GTK_STATE_NORMAL];
@@ -2425,7 +2425,7 @@ unrealize (GtkWidget *widget)
         window = GTK_WINDOW (gtk_widget_get_toplevel (widget));
 	gtk_window_set_focus (window, NULL);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget));
 }
 
 static gboolean
@@ -2441,7 +2441,7 @@ button_press_event (GtkWidget *widget,
 	static gint click_count = 0;
 	
 	/* Determine click count */
-	current_time = nautilus_get_system_time ();
+	current_time = eel_get_system_time ();
 	if (current_time - last_click_time < DOUBLE_CLICK_TIME) {
 		click_count++;
 	} else {
@@ -2469,7 +2469,7 @@ button_press_event (GtkWidget *widget,
 	nautilus_icon_container_flush_typeselect_state (container);
 	
 	/* Invoke the canvas event handler and see if an item picks up the event. */
-	clicked_on_icon = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	clicked_on_icon = EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, button_press_event, (widget, event));
 	
 	/* Move focus to icon container, unless we're still renaming (to avoid exiting
@@ -2623,7 +2623,7 @@ start_stretching (NautilusIconContainer *container)
 	/* Ensure the window itself is focused.. */
 	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (container));
 	if (toplevel != NULL && GTK_WIDGET_REALIZED (toplevel)) {
-		nautilus_gdk_window_focus (toplevel->window, GDK_CURRENT_TIME);
+		eel_gdk_window_focus (toplevel->window, GDK_CURRENT_TIME);
 	}
 
 	return TRUE;
@@ -2794,7 +2794,7 @@ button_release_event (GtkWidget *widget,
 		return TRUE;
 	}
 
-	return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	return EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, button_release_event, (widget, event));
 }
 
@@ -2860,7 +2860,7 @@ motion_notify_event (GtkWidget *widget,
 		}
 	}
 
-	return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	return EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, motion_notify_event, (widget, event));
 }
 
@@ -2908,7 +2908,7 @@ handle_typeahead (NautilusIconContainer *container, const char *key_string)
 	}
 
 	/* find out how long since last character was typed */
-	now = nautilus_get_system_time ();
+	now = eel_get_system_time ();
 	time_delta = now - container->details->type_select_state->last_typeselect_time;
 	if (time_delta < 0 || time_delta > NAUTILUS_TYPESELECT_FLUSH_DELAY) {
 		/* the typeselect state is too old, start with a fresh one */
@@ -3021,7 +3021,7 @@ key_press_event (GtkWidget *widget,
 	}
 
 	if (!handled) {
-		handled = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+		handled = EEL_CALL_PARENT_WITH_RETURN_VALUE
 			(GTK_WIDGET_CLASS, key_press_event, (widget, event));
 	}
 
@@ -3153,7 +3153,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
 						     get_icon_images),
-				  nautilus_gtk_marshal_POINTER__POINTER_STRING_POINTER,
+				  eel_gtk_marshal_POINTER__POINTER_STRING_POINTER,
 				  GTK_TYPE_POINTER, 3,
 				  GTK_TYPE_POINTER,
 				  GTK_TYPE_STRING,
@@ -3164,7 +3164,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
 						     get_icon_text),
-				  nautilus_gtk_marshal_NONE__POINTER_STRING_STRING,
+				  eel_gtk_marshal_NONE__POINTER_STRING_STRING,
 				  GTK_TYPE_NONE, 3,
 				  GTK_TYPE_POINTER,
 				  GTK_TYPE_STRING,
@@ -3175,7 +3175,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
 						     get_icon_uri),
-				  nautilus_gtk_marshal_STRING__POINTER,
+				  eel_gtk_marshal_STRING__POINTER,
 				  GTK_TYPE_STRING, 1,
 				  GTK_TYPE_POINTER);
 	signals[GET_ICON_DROP_TARGET_URI]
@@ -3184,7 +3184,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
 						     get_icon_drop_target_uri),
-				  nautilus_gtk_marshal_STRING__POINTER,
+				  eel_gtk_marshal_STRING__POINTER,
 				  GTK_TYPE_STRING, 1,
 				  GTK_TYPE_POINTER);
 	signals[COMPARE_ICONS]
@@ -3193,7 +3193,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
 						     compare_icons),
-				  nautilus_gtk_marshal_INT__POINTER_POINTER,
+				  eel_gtk_marshal_INT__POINTER_POINTER,
 				  GTK_TYPE_INT, 2,
 				  GTK_TYPE_POINTER,
 				  GTK_TYPE_POINTER);
@@ -3203,7 +3203,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
 						     compare_icons_by_name),
-				  nautilus_gtk_marshal_INT__POINTER_POINTER,
+				  eel_gtk_marshal_INT__POINTER_POINTER,
 				  GTK_TYPE_INT, 2,
 				  GTK_TYPE_POINTER,
 				  GTK_TYPE_POINTER);
@@ -3213,7 +3213,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass, 
 						     move_copy_items),
-				  nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_INT_INT_INT,
+				  eel_gtk_marshal_NONE__POINTER_POINTER_POINTER_INT_INT_INT,
 				  GTK_TYPE_NONE, 6,
 				  GTK_TYPE_POINTER,
 				  GTK_TYPE_POINTER,
@@ -3239,7 +3239,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass, 
 						     get_container_uri),
-				  nautilus_gtk_marshal_STRING__NONE,
+				  eel_gtk_marshal_STRING__NONE,
 				  GTK_TYPE_STRING, 0);
 	signals[CAN_ACCEPT_ITEM] 
 		= gtk_signal_new ("can_accept_item",
@@ -3247,7 +3247,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass, 
 						     can_accept_item),
-				  nautilus_gtk_marshal_INT__POINTER_STRING,
+				  eel_gtk_marshal_INT__POINTER_STRING,
 				  GTK_TYPE_INT, 2,
 				  GTK_TYPE_POINTER,
 				  GTK_TYPE_STRING);
@@ -3257,7 +3257,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
 						     get_stored_icon_position),
-				  nautilus_gtk_marshal_BOOL__POINTER_POINTER,
+				  eel_gtk_marshal_BOOL__POINTER_POINTER,
 				  GTK_TYPE_BOOL, 2,
 				  GTK_TYPE_POINTER,
 				  GTK_TYPE_POINTER);
@@ -3275,7 +3275,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
 						     preview),
-				  nautilus_gtk_marshal_INT__POINTER_INT,
+				  eel_gtk_marshal_INT__POINTER_INT,
 				  GTK_TYPE_INT, 2,
 				  GTK_TYPE_POINTER,
 				  GTK_TYPE_BOOL);
@@ -3329,7 +3329,7 @@ static void
 nautilus_icon_container_initialize (NautilusIconContainer *container)
 {
 	NautilusIconContainerDetails *details;
-	NautilusBackground *background;
+	EelBackground *background;
 	
 	details = g_new0 (NautilusIconContainerDetails, 1);
 
@@ -3347,7 +3347,7 @@ nautilus_icon_container_initialize (NautilusIconContainer *container)
         details->label_font[NAUTILUS_ZOOM_LEVEL_LARGER] = nautilus_font_factory_get_font_by_family ("helvetica", 18);
         details->label_font[NAUTILUS_ZOOM_LEVEL_LARGEST] = nautilus_font_factory_get_font_by_family ("helvetica", 18);
 
-        details->smooth_label_font = nautilus_scalable_font_get_default_font ();
+        details->smooth_label_font = eel_scalable_font_get_default_font ();
 	
 	/* These are the default font sizes.  The font sizes are configurable via
 	 * nautilus_icon_container_set_font_size_table() 
@@ -3373,7 +3373,7 @@ nautilus_icon_container_initialize (NautilusIconContainer *container)
 		 GTK_OBJECT (container));	
 
 	/* when the background changes, we must set up the label text color */
-	background = nautilus_get_widget_background (GTK_WIDGET (container));
+	background = eel_get_widget_background (GTK_WIDGET (container));
 	
 	gtk_signal_connect
 		(GTK_OBJECT(background),
@@ -3752,7 +3752,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
 		 &attach_points,
 		 TRUE);
 	
-	nautilus_scalable_icon_unref (scalable_icon);
+	eel_scalable_icon_unref (scalable_icon);
 
 	/*  in the rare case an image is too small, scale it up */
 	
@@ -3792,7 +3792,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
 		}
 	}
 	emblem_pixbufs = g_list_reverse (emblem_pixbufs);
-	nautilus_scalable_icon_list_free (emblem_scalable_icons);
+	eel_scalable_icon_list_free (emblem_scalable_icons);
 
 	/* Get both editable and non-editable icon text */
 	gtk_signal_emit (GTK_OBJECT (container),
@@ -3807,7 +3807,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
 	 * happened to be typing at that moment.
 	 */
 	if (icon == get_icon_being_renamed (container) &&
-	    nautilus_strcmp (editable_text, 
+	    eel_strcmp (editable_text, 
 	    		     nautilus_icon_canvas_item_get_editable_text (icon->item)) != 0) {
 		end_renaming_mode (container, FALSE);
 	}
@@ -3831,7 +3831,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
 
 	/* Let the pixbufs go. */
 	gdk_pixbuf_unref (pixbuf);
-	nautilus_gdk_pixbuf_list_free (emblem_pixbufs);
+	eel_gdk_pixbuf_list_free (emblem_pixbufs);
 
 	g_free (editable_text);
 	g_free (additional_text);
@@ -4997,10 +4997,10 @@ nautilus_icon_container_set_label_font_for_zoom_level (NautilusIconContainer *co
 
 void
 nautilus_icon_container_set_smooth_label_font (NautilusIconContainer *container,
-					       NautilusScalableFont *font)
+					       EelScalableFont *font)
 {
 	g_return_if_fail (NAUTILUS_IS_ICON_CONTAINER (container));
-	g_return_if_fail (NAUTILUS_IS_SCALABLE_FONT (font));
+	g_return_if_fail (EEL_IS_SCALABLE_FONT (font));
 
 	gtk_object_ref (GTK_OBJECT (font));
 	gtk_object_unref (GTK_OBJECT (container->details->smooth_label_font));
@@ -5035,13 +5035,13 @@ nautilus_icon_container_get_label_color (NautilusIconContainer *container,
 }
 
 static void
-update_label_color (NautilusBackground *background,
+update_label_color (EelBackground *background,
 		    NautilusIconContainer *container)
 {
 	char *light_info_color, *dark_info_color;
 	uint light_info_value, dark_info_value;
 	
-	g_assert (NAUTILUS_IS_BACKGROUND (background));
+	g_assert (EEL_IS_BACKGROUND (background));
 	g_assert (NAUTILUS_IS_ICON_CONTAINER (container));
 	
 	/* FIXME: The code to extract colors from the theme should be in FMDirectoryView, not here.
@@ -5064,7 +5064,7 @@ update_label_color (NautilusBackground *background,
 		g_free (dark_info_color);
 	}
 	
-	if (nautilus_background_is_dark (background)) {
+	if (eel_background_is_dark (background)) {
 		container->details->label_color = 0xEFEFEF;
 		container->details->label_info_color = light_info_value;
 	} else {
@@ -5137,7 +5137,7 @@ nautilus_icon_container_theme_changed (gpointer user_data)
 	highlight_color_str = nautilus_theme_get_theme_data ("directory", "highlight_color_rgba");
 	
 	if (highlight_color_str == NULL) {
-			container->details->highlight_color = NAUTILUS_RGBA_COLOR_PACK (0, 0, 0, 102);
+			container->details->highlight_color = EEL_RGBA_COLOR_PACK (0, 0, 0, 102);
 		} else {
 			container->details->highlight_color = strtoul (highlight_color_str, NULL, 0);
 			g_free (highlight_color_str);
@@ -5186,10 +5186,10 @@ check_compute_stretch (int icon_x, int icon_y, int icon_size,
 void
 nautilus_self_check_icon_container (void)
 {
-	NAUTILUS_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 12, 0, 0, 0, 0), "0,0:12");
-	NAUTILUS_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 12, 12, 12, 13, 13), "0,0:13");
-	NAUTILUS_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 12, 12, 12, 13, 12), "0,0:12");
-	NAUTILUS_CHECK_STRING_RESULT (check_compute_stretch (100, 100, 64, 105, 105, 40, 40), "35,35:129");
+	EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 12, 0, 0, 0, 0), "0,0:12");
+	EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 12, 12, 12, 13, 13), "0,0:13");
+	EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 12, 12, 12, 13, 12), "0,0:12");
+	EEL_CHECK_STRING_RESULT (check_compute_stretch (100, 100, 64, 105, 105, 40, 40), "35,35:129");
 }
 
 #endif /* ! NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-icon-container.h b/libnautilus-extensions/nautilus-icon-container.h
index c1744c9e1..30382a19e 100644
--- a/libnautilus-extensions/nautilus-icon-container.h
+++ b/libnautilus-extensions/nautilus-icon-container.h
@@ -28,7 +28,7 @@
 
 #include <libgnomeui/gnome-canvas.h>
 #include "nautilus-icon-factory.h"
-#include "nautilus-scalable-font.h"
+#include <eel/eel-scalable-font.h>
 
 #define NAUTILUS_ICON_CONTAINER(obj) \
 	GTK_CHECK_CAST (obj, nautilus_icon_container_get_type (), NautilusIconContainer)
@@ -216,7 +216,7 @@ void              nautilus_icon_container_set_label_font_for_zoom_level (Nautilu
 									 int                     zoom_level,
 									 GdkFont                *font);
 void              nautilus_icon_container_set_smooth_label_font         (NautilusIconContainer  *container,
-									 NautilusScalableFont   *font);
+									 EelScalableFont   *font);
 gboolean          nautilus_icon_container_get_is_fixed_size             (NautilusIconContainer  *container);
 void              nautilus_icon_container_set_is_fixed_size             (NautilusIconContainer  *container,
 									 gboolean                is_fixed_size);
diff --git a/libnautilus-extensions/nautilus-icon-dnd.c b/libnautilus-extensions/nautilus-icon-dnd.c
index 0c79d354c..e09d50a31 100644
--- a/libnautilus-extensions/nautilus-icon-dnd.c
+++ b/libnautilus-extensions/nautilus-icon-dnd.c
@@ -30,18 +30,18 @@
 #include <config.h>
 #include "nautilus-icon-dnd.h"
 
-#include "nautilus-background.h"
+#include <eel/eel-background.h>
 #include "nautilus-file-utilities.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-gnome-extensions.h"
-#include "nautilus-graphic-effects.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-graphic-effects.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include "nautilus-icon-private.h"
 #include "nautilus-link.h"
-#include "nautilus-stock-dialogs.h"
-#include "nautilus-string.h"
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtkmain.h>
@@ -229,7 +229,7 @@ icon_get_data_binder (NautilusIcon *icon, gpointer data)
 
 	nautilus_icon_canvas_item_get_icon_rectangle
 		(icon->item, &world_rect);
-	nautilus_gnome_canvas_world_to_window_rectangle
+	eel_gnome_canvas_world_to_window_rectangle
 		(GNOME_CANVAS (container), &world_rect, &window_rect);
 
 	uri = nautilus_icon_container_get_icon_uri (container, icon);
@@ -238,11 +238,11 @@ icon_get_data_binder (NautilusIcon *icon, gpointer data)
 		return TRUE;
 	}
 
-	window_rect = nautilus_art_irect_offset_by (window_rect, 
+	window_rect = eel_art_irect_offset_by (window_rect, 
 		- container->details->dnd_info->drag_info.start_x,
 		- container->details->dnd_info->drag_info.start_y);
 
-	window_rect = nautilus_art_irect_scale_by (window_rect, 
+	window_rect = eel_art_irect_scale_by (window_rect, 
 		1 / GNOME_CANVAS (container)->pixels_per_unit);
 	
 	/* pass the uri, mouse-relative x/y and icon width/height */
@@ -404,14 +404,14 @@ drag_data_received_callback (GtkWidget *widget,
 	case NAUTILUS_ICON_DND_URI_LIST:
 		/* Save the data so we can do the actual work on drop. */
 		g_assert (drag_info->selection_data == NULL);
-		drag_info->selection_data = nautilus_gtk_selection_data_copy_deep (data);
+		drag_info->selection_data = eel_gtk_selection_data_copy_deep (data);
 		break;
 		
 	/* Netscape keeps sending us the data, even though we accept the first drag */
 	case NAUTILUS_ICON_DND_URL:
 		if (drag_info->selection_data != NULL) {
-			nautilus_gtk_selection_data_free_deep (drag_info->selection_data);
-			drag_info->selection_data = nautilus_gtk_selection_data_copy_deep (data);
+			eel_gtk_selection_data_free_deep (drag_info->selection_data);
+			drag_info->selection_data = eel_gtk_selection_data_copy_deep (data);
 		}
 		break;
 
@@ -434,8 +434,8 @@ drag_data_received_callback (GtkWidget *widget,
 			gtk_drag_finish (context, TRUE, FALSE, time);
 			break;
 		case NAUTILUS_ICON_DND_COLOR:
-			nautilus_background_receive_dropped_color
-				(nautilus_get_widget_background (widget),
+			eel_background_receive_dropped_color
+				(eel_get_widget_background (widget),
 				 widget, x, y, data);
 			gtk_drag_finish (context, TRUE, FALSE, time);
 			break;
@@ -481,7 +481,7 @@ get_data_on_first_target_we_support (GtkWidget *widget, GdkDragContext *context,
 
 	if (drop_types_list == NULL)
 		drop_types_list = gtk_target_list_new (drop_types,
-						       NAUTILUS_N_ELEMENTS (drop_types));
+						       EEL_N_ELEMENTS (drop_types));
 
 	for (target = context->targets; target != NULL; target = target->next) {
 		guint dummy_info;
@@ -550,7 +550,7 @@ nautilus_icon_container_item_at (NautilusIconContainer *container,
 		NautilusIcon *icon;
 		icon = p->data;
 		
-		nautilus_gnome_canvas_world_to_canvas_rectangle (GNOME_CANVAS_ITEM (icon->item)->canvas, &point, &canvas_point);
+		eel_gnome_canvas_world_to_canvas_rectangle (GNOME_CANVAS_ITEM (icon->item)->canvas, &point, &canvas_point);
 		
 		if (nautilus_icon_canvas_item_hit_test_rectangle (icon->item, &canvas_point)) {
 			return icon;
@@ -604,8 +604,8 @@ static void
 receive_dropped_tile_image (NautilusIconContainer *container, GtkSelectionData *data)
 {
 	g_assert (data != NULL);
-	nautilus_background_receive_dropped_background_image
-		(nautilus_get_widget_background (GTK_WIDGET (container)), data->data);
+	eel_background_receive_dropped_background_image
+		(eel_get_widget_background (GTK_WIDGET (container)), data->data);
 }
 
 /* handle dropped keywords */
@@ -670,7 +670,7 @@ auto_scroll_timeout_callback (gpointer data)
 	container = NAUTILUS_ICON_CONTAINER (widget);
 
 	if (container->details->dnd_info->drag_info.waiting_to_autoscroll
-	    && container->details->dnd_info->drag_info.start_auto_scroll_in > nautilus_get_system_time()) {
+	    && container->details->dnd_info->drag_info.start_auto_scroll_in > eel_get_system_time()) {
 		/* not yet */
 		return TRUE;
 	}
@@ -751,7 +751,7 @@ confirm_switch_to_manual_layout (NautilusIconContainer *container)
 	 * that are not directories?
 	 */
 	if (nautilus_icon_container_has_stored_icon_positions (container)) {
-		if (nautilus_g_list_exactly_one_item (container->details->dnd_info->drag_info.selection_list)) {
+		if (eel_g_list_exactly_one_item (container->details->dnd_info->drag_info.selection_list)) {
 			message = _("This folder uses automatic layout. "
 			"Do you want to switch to manual layout and leave this item where you dropped it? "
 			"This will clobber the stored manual layout.");
@@ -761,7 +761,7 @@ confirm_switch_to_manual_layout (NautilusIconContainer *container)
 			"This will clobber the stored manual layout.");
 		}
 	} else {
-		if (nautilus_g_list_exactly_one_item (container->details->dnd_info->drag_info.selection_list)) {
+		if (eel_g_list_exactly_one_item (container->details->dnd_info->drag_info.selection_list)) {
 			message = _("This folder uses automatic layout. "
 			"Do you want to switch to manual layout and leave this item where you dropped it?");
 		} else {
@@ -770,7 +770,7 @@ confirm_switch_to_manual_layout (NautilusIconContainer *container)
 		}
 	}
 
-	dialog = nautilus_show_yes_no_dialog (message, _("Switch to Manual Layout?"),
+	dialog = eel_show_yes_no_dialog (message, _("Switch to Manual Layout?"),
 					      _("Switch"), GNOME_STOCK_BUTTON_CANCEL,
 					      GTK_WINDOW (gtk_widget_get_ancestor 
 					 	    (GTK_WIDGET (container), GTK_TYPE_WINDOW)));
@@ -1162,7 +1162,7 @@ nautilus_icon_container_free_drag_data (NautilusIconContainer *container)
 	}
 
 	if (dnd_info->drag_info.selection_data != NULL) {
-		nautilus_gtk_selection_data_free_deep (dnd_info->drag_info.selection_data);
+		eel_gtk_selection_data_free_deep (dnd_info->drag_info.selection_data);
 		dnd_info->drag_info.selection_data = NULL;
 	}
 }
@@ -1194,7 +1194,7 @@ nautilus_icon_dnd_init (NautilusIconContainer *container,
 
 	container->details->dnd_info = g_new0 (NautilusIconDndInfo, 1);
 	nautilus_drag_init (&container->details->dnd_info->drag_info,
-		drag_types, NAUTILUS_N_ELEMENTS (drag_types), stipple);
+		drag_types, EEL_N_ELEMENTS (drag_types), stipple);
 
 	/* Set up the widget as a drag destination.
 	 * (But not a source, as drags starting from this widget will be
@@ -1202,7 +1202,7 @@ nautilus_icon_dnd_init (NautilusIconContainer *container,
 	 */
 	gtk_drag_dest_set  (GTK_WIDGET (container),
 			    0,
-			    drop_types, NAUTILUS_N_ELEMENTS (drop_types),
+			    drop_types, EEL_N_ELEMENTS (drop_types),
 			    GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK
 			    | GDK_ACTION_ASK);
 
@@ -1287,13 +1287,13 @@ nautilus_icon_dnd_begin_drag (NautilusIconContainer *container,
         /* compute the image's offset */
 	nautilus_icon_canvas_item_get_icon_rectangle
 		(container->details->drag_icon->item, &world_rect);
-	nautilus_gnome_canvas_world_to_window_rectangle
+	eel_gnome_canvas_world_to_window_rectangle
 		(canvas, &world_rect, &window_rect);
         x_offset = dnd_info->drag_info.start_x - window_rect.x0;
         y_offset = dnd_info->drag_info.start_y - window_rect.y0;
         
         /* set the icon for dragging */
-        nautilus_drag_set_icon_pixbuf (context, pixbuf, x_offset, y_offset);
+        eel_drag_set_icon_pixbuf (context, pixbuf, x_offset, y_offset);
 }
 
 static gboolean
diff --git a/libnautilus-extensions/nautilus-icon-factory.c b/libnautilus-extensions/nautilus-icon-factory.c
index 009ec9f51..38ce60f79 100644
--- a/libnautilus-extensions/nautilus-icon-factory.c
+++ b/libnautilus-extensions/nautilus-icon-factory.c
@@ -31,33 +31,33 @@
 #include "nautilus-default-file-icon.h"
 #include "nautilus-file-attributes.h"
 #include "nautilus-file-utilities.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-glib-extensions.h"
 #include "nautilus-global-preferences.h"
-#include "nautilus-gtk-macros.h"
 #include "nautilus-icon-factory-private.h"
 #include "nautilus-lib-self-check-functions.h"
 #include "nautilus-link.h"
 #include "nautilus-metadata.h"
-#include "nautilus-scalable-font.h"
-#include "nautilus-smooth-text-layout.h"
-#include "nautilus-string.h"
 #include "nautilus-theme.h"
 #include "nautilus-thumbnails.h"
 #include "nautilus-trash-monitor.h"
-#include "nautilus-xml-extensions.h"
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-scalable-font.h>
+#include <eel/eel-smooth-text-layout.h>
+#include <eel/eel-string.h>
+#include <eel/eel-xml-extensions.h>
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomevfs/gnome-vfs-file-info.h>
-#include <libgnomevfs/gnome-vfs-mime-info.h>
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
+#include <libgnomevfs/gnome-vfs-mime-info.h>
 #include <libgnomevfs/gnome-vfs-mime-monitor.h>
 #include <libgnomevfs/gnome-vfs-types.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
 #include <librsvg/rsvg.h>
 #include <stdio.h>
 #include <string.h>
@@ -257,8 +257,8 @@ static void       icon_theme_changed_callback            (gpointer
 static void       thumbnail_limit_changed_callback       (gpointer                  user_data);
 static void       mime_type_data_changed_callback        (GnomeVFSMIMEMonitor	   *monitor,
 							  gpointer                  user_data);
-static guint      nautilus_scalable_icon_hash            (gconstpointer             p);
-static gboolean   nautilus_scalable_icon_equal           (gconstpointer             a,
+static guint      eel_scalable_icon_hash            (gconstpointer             p);
+static gboolean   eel_scalable_icon_equal           (gconstpointer             a,
 							  gconstpointer             b);
 static guint      cache_key_hash                         (gconstpointer             p);
 static gboolean   cache_key_equal                        (gconstpointer             a,
@@ -270,7 +270,7 @@ static CacheIcon *get_icon_from_cache                    (NautilusScalableIcon
 static CacheIcon *load_icon_with_embedded_text           (NautilusScalableIcon     *scalable_icon,
 							  const IconSizeRequest    *size);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusIconFactory,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusIconFactory,
 				   nautilus_icon_factory,
 				   GTK_TYPE_OBJECT)
 
@@ -358,8 +358,8 @@ check_recently_used_list (void)
 static void
 nautilus_icon_factory_initialize (NautilusIconFactory *factory)
 {
-	factory->scalable_icons = g_hash_table_new (nautilus_scalable_icon_hash,
-						    nautilus_scalable_icon_equal);
+	factory->scalable_icons = g_hash_table_new (eel_scalable_icon_hash,
+						    eel_scalable_icon_equal);
 	factory->cache_icons = g_hash_table_new (NULL, NULL);
         factory->icon_cache = g_hash_table_new (cache_key_hash,
 						cache_key_equal);
@@ -392,7 +392,7 @@ nautilus_icon_factory_initialize_class (NautilusIconFactoryClass *class)
 static void
 cache_key_destroy (CacheKey *key)
 {
-	nautilus_scalable_icon_unref (key->scalable_icon);
+	eel_scalable_icon_unref (key->scalable_icon);
 	g_free (key);
 }
 
@@ -583,7 +583,7 @@ nautilus_icon_factory_destroy (GtkObject *object)
         g_free (factory->theme_name);
         g_free (factory->default_theme_name);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static gboolean
@@ -715,7 +715,7 @@ set_theme (const char *theme_name)
 
 	factory = get_icon_factory ();
 
-	if (nautilus_strcmp (theme_name, factory->theme_name) == 0) {
+	if (eel_strcmp (theme_name, factory->theme_name) == 0) {
 		return;
 	}
 
@@ -759,14 +759,14 @@ nautilus_icon_factory_get_icon_name_for_regular_file (NautilusFile *file)
 	 * should generalize this or at least have a way for others to
 	 * extend it.
 	 */
-	if (nautilus_istr_has_prefix (uri, "http:")
-	    && nautilus_strcmp (mime_type, "text/html") == 0) {
+	if (eel_istr_has_prefix (uri, "http:")
+	    && eel_strcmp (mime_type, "text/html") == 0) {
 		icon_name = ICON_NAME_WEB;
-	} else if (nautilus_istr_has_prefix (uri, "eazel-install:")) {
+	} else if (eel_istr_has_prefix (uri, "eazel-install:")) {
 		icon_name = ICON_NAME_INSTALL;
 	} else {
 		if (nautilus_file_is_executable (file)
-		    && nautilus_strcasecmp (mime_type, "text/plain") != 0) {
+		    && eel_strcasecmp (mime_type, "text/plain") != 0) {
 			icon_name = ICON_NAME_EXECUTABLE;
 		} else {
 			icon_name = ICON_NAME_REGULAR;
@@ -788,7 +788,7 @@ nautilus_icon_factory_get_icon_name_for_directory (NautilusFile *file)
 
 	mime_type = nautilus_file_get_mime_type (file);
 	
-	if (nautilus_strcasecmp (mime_type, "x-directory/search") == 0) {
+	if (eel_strcasecmp (mime_type, "x-directory/search") == 0) {
 		icon_name = ICON_NAME_SEARCH_RESULTS;
 	} else {
 		icon_name = ICON_NAME_DIRECTORY;
@@ -927,7 +927,7 @@ get_themed_icon_file_path (const char *theme_name,
 	factory = get_icon_factory ();
 	
 	/* Try each suffix. */
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (icon_file_name_suffixes); i++) {
+	for (i = 0; i < EEL_N_ELEMENTS (icon_file_name_suffixes); i++) {
 		if (include_size && strcasecmp(icon_file_name_suffixes[i], ".svg")) {
 			/* Build a path for this icon. */
 			partial_path = g_strdup_printf ("%s-%u",
@@ -979,7 +979,7 @@ get_themed_icon_file_path (const char *theme_name,
 		g_free (xml_path);
 		
 		size_as_string = g_strdup_printf ("%u", icon_size);
-		node = nautilus_xml_get_root_child_by_name_and_property
+		node = eel_xml_get_root_child_by_name_and_property
 			(doc, "icon", "size", size_as_string);
 		g_free (size_as_string);
 		
@@ -1024,8 +1024,8 @@ get_themed_icon_file_path (const char *theme_name,
 	 */
 	if (path == NULL
 	    && icon_size == NAUTILUS_ICON_SIZE_STANDARD
-	    && nautilus_str_has_prefix (icon_name, EMBLEM_NAME_PREFIX)) {
-		for (i = 0; i < NAUTILUS_N_ELEMENTS (icon_file_name_suffixes); i++) {
+	    && eel_str_has_prefix (icon_name, EMBLEM_NAME_PREFIX)) {
+		for (i = 0; i < EEL_N_ELEMENTS (icon_file_name_suffixes); i++) {
 			user_directory = nautilus_get_user_directory ();
 			path = g_strdup_printf ("%s/emblems/%s%s", 
 						user_directory,
@@ -1176,7 +1176,7 @@ mime_type_data_changed_callback (GnomeVFSMIMEMonitor *monitor, gpointer user_dat
 
 /* Decompose a scalable icon into its text pieces. */
 void
-nautilus_scalable_icon_get_text_pieces (NautilusScalableIcon *icon,
+eel_scalable_icon_get_text_pieces (NautilusScalableIcon *icon,
 				 	char **uri_return,
 				 	char **name_return,
 				 	char **modifier_return,
@@ -1200,7 +1200,7 @@ nautilus_scalable_icon_get_text_pieces (NautilusScalableIcon *icon,
 
 /* Get or create a scalable icon from text pieces. */
 NautilusScalableIcon *
-nautilus_scalable_icon_new_from_text_pieces (const char *uri,
+eel_scalable_icon_new_from_text_pieces (const char *uri,
 			    	      	     const char *name,
 			    	      	     const char *modifier,
 			    	      	     const char *embedded_text,
@@ -1248,12 +1248,12 @@ nautilus_scalable_icon_new_from_text_pieces (const char *uri,
 	}
 
 	/* Grab a reference and return it. */
-	nautilus_scalable_icon_ref (icon);
+	eel_scalable_icon_ref (icon);
 	return icon;
 }
 
 void
-nautilus_scalable_icon_ref (NautilusScalableIcon *icon)
+eel_scalable_icon_ref (NautilusScalableIcon *icon)
 {
 	g_return_if_fail (icon != NULL);
 
@@ -1261,7 +1261,7 @@ nautilus_scalable_icon_ref (NautilusScalableIcon *icon)
 }
 
 void
-nautilus_scalable_icon_unref (NautilusScalableIcon *icon)
+eel_scalable_icon_unref (NautilusScalableIcon *icon)
 {
 	GHashTable *hash_table;
 
@@ -1283,7 +1283,7 @@ nautilus_scalable_icon_unref (NautilusScalableIcon *icon)
 }
 
 static guint
-nautilus_scalable_icon_hash (gconstpointer p)
+eel_scalable_icon_hash (gconstpointer p)
 {
 	const NautilusScalableIcon *icon;
 	guint hash;
@@ -1318,7 +1318,7 @@ nautilus_scalable_icon_hash (gconstpointer p)
 }
 
 static gboolean
-nautilus_scalable_icon_equal (gconstpointer a,
+eel_scalable_icon_equal (gconstpointer a,
 			      gconstpointer b)
 {
 	const NautilusScalableIcon *icon_a, *icon_b;
@@ -1326,10 +1326,10 @@ nautilus_scalable_icon_equal (gconstpointer a,
 	icon_a = a;
 	icon_b = b;
 
-	return nautilus_strcmp (icon_a->uri, icon_b->uri) == 0
-		&& nautilus_strcmp (icon_a->name, icon_b->name) == 0 
-		&& nautilus_strcmp (icon_a->modifier, icon_b->modifier) == 0
-		&& nautilus_strcmp (icon_a->embedded_text, icon_b->embedded_text) == 0
+	return eel_strcmp (icon_a->uri, icon_b->uri) == 0
+		&& eel_strcmp (icon_a->name, icon_b->name) == 0 
+		&& eel_strcmp (icon_a->modifier, icon_b->modifier) == 0
+		&& eel_strcmp (icon_a->embedded_text, icon_b->embedded_text) == 0
 		&& icon_a->aa_mode == icon_b->aa_mode;
 }
 
@@ -1376,7 +1376,7 @@ static gboolean
 is_supported_mime_type (const char *mime_type)
 {
 	/* exclude xfig images, since we can't handle them */
-	if (nautilus_strcmp (mime_type, "image/x-xfig") == 0) {
+	if (eel_strcmp (mime_type, "image/x-xfig") == 0) {
 		return FALSE;
 	}	
 	return TRUE;
@@ -1410,7 +1410,7 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, const char *modifie
 		mime_type = nautilus_file_get_mime_type (file);
 		file_size = nautilus_file_get_size (file);
 		
-		if (nautilus_istr_has_prefix (mime_type, "image/")
+		if (eel_istr_has_prefix (mime_type, "image/")
 		    && is_supported_mime_type (mime_type)
 		    && should_display_image_file_as_itself (file, anti_aliased)) {
 			if (file_size < SELF_THUMBNAIL_SIZE_THRESHOLD && is_local) {
@@ -1439,7 +1439,7 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, const char *modifie
 			image_uri = nautilus_link_local_get_image_uri (file_path);
 			if (image_uri != NULL) {
 				/* FIXME bugzilla.eazel.com 2564: Lame hack. We only support file:// URIs? */
-				if (nautilus_istr_has_prefix (image_uri, "file://")) {
+				if (eel_istr_has_prefix (image_uri, "file://")) {
 					if (uri == NULL) {
 						uri = image_uri;
 					} else {
@@ -1467,7 +1467,7 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, const char *modifie
 	top_left_text = nautilus_file_get_top_left_text (file);
 	
 	/* Create the icon or find it in the cache if it's already there. */
-	scalable_icon = nautilus_scalable_icon_new_from_text_pieces 
+	scalable_icon = eel_scalable_icon_new_from_text_pieces 
 		(uri, icon_name, modifier, top_left_text, anti_aliased);
 
 	g_free (uri);
@@ -1525,7 +1525,7 @@ nautilus_icon_factory_get_emblem_icon_by_name (const char *emblem_name, gboolean
 	char *name_with_prefix;
 
 	name_with_prefix = g_strconcat (EMBLEM_NAME_PREFIX, emblem_name, NULL);
-	scalable_icon = nautilus_scalable_icon_new_from_text_pieces 
+	scalable_icon = eel_scalable_icon_new_from_text_pieces 
 		(NULL, name_with_prefix, NULL, NULL, anti_aliased);
 	g_free (name_with_prefix);	
 
@@ -1535,7 +1535,7 @@ nautilus_icon_factory_get_emblem_icon_by_name (const char *emblem_name, gboolean
 GList *
 nautilus_icon_factory_get_emblem_icons_for_file (NautilusFile *file,
 						 gboolean anti_aliased,
-						 NautilusStringList *exclude)
+						 EelStringList *exclude)
 {
 	GList *icons, *emblem_names, *node;
 	char *uri, *name;
@@ -1558,13 +1558,13 @@ nautilus_icon_factory_get_emblem_icons_for_file (NautilusFile *file,
 		if (file_is_trash && strcmp (name, NAUTILUS_FILE_EMBLEM_NAME_TRASH) == 0) {
 			continue;
 		}
-		if (nautilus_string_list_contains (exclude, name)) {
+		if (eel_string_list_contains (exclude, name)) {
 			continue;
 		}
 		icon = nautilus_icon_factory_get_emblem_icon_by_name (name, anti_aliased);
 		icons = g_list_prepend (icons, icon);
 	}
-	nautilus_g_list_free_deep (emblem_names);
+	eel_g_list_free_deep (emblem_names);
 
 	return g_list_reverse (icons);
 }
@@ -1671,7 +1671,7 @@ load_pixbuf_svg (const char *path, const char *name, guint size_in_pixels)
 	 * down here if the file is an emblem.  This code should be removed
 	 * eventually when we scale all the emblems properly.
 	 */
-	if (nautilus_str_has_prefix (name, EMBLEM_NAME_PREFIX)) {
+	if (eel_str_has_prefix (name, EMBLEM_NAME_PREFIX)) {
 		actual_size_in_pixels = size_in_pixels * EMBLEM_SCALE_FACTOR;
 	} else {
 		actual_size_in_pixels = size_in_pixels;
@@ -1699,7 +1699,7 @@ path_represents_svg_image (const char *path)
 	file_info = gnome_vfs_file_info_new ();
 	gnome_vfs_get_file_info (uri, file_info, GNOME_VFS_FILE_INFO_GET_MIME_TYPE);
 	g_free (uri);
-	is_svg = nautilus_strcmp (file_info->mime_type, "image/svg") == 0;
+	is_svg = eel_strcmp (file_info->mime_type, "image/svg") == 0;
 	gnome_vfs_file_info_unref (file_info);
 
 	return is_svg;
@@ -2178,7 +2178,7 @@ get_icon_from_cache (NautilusScalableIcon *scalable_icon,
 
 		/* Create the key and icon for the hash table. */
 		key = g_new (CacheKey, 1);
-		nautilus_scalable_icon_ref (scalable_icon);
+		eel_scalable_icon_ref (scalable_icon);
 		key->scalable_icon = scalable_icon;
 		key->size = *size;
 		
@@ -2322,7 +2322,7 @@ nautilus_icon_factory_get_pixbuf_for_file (NautilusFile *file,
 		 size_in_pixels, size_in_pixels,
 		 size_in_pixels, size_in_pixels,
 		 NULL, TRUE);
-	nautilus_scalable_icon_unref (icon);
+	eel_scalable_icon_unref (icon);
 
 	return pixbuf;
 }
@@ -2350,7 +2350,7 @@ nautilus_icon_factory_get_pixmap_and_mask_for_file (NautilusFile *file,
 	if (pixbuf == NULL) {
 		return;
 	}
-	gdk_pixbuf_render_pixmap_and_mask (pixbuf, pixmap, mask, NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
+	gdk_pixbuf_render_pixmap_and_mask (pixbuf, pixmap, mask, EEL_STANDARD_ALPHA_THRESHHOLD);
 	gdk_pixbuf_unref (pixbuf);
 }
 
@@ -2364,10 +2364,10 @@ GdkPixbuf * nautilus_icon_factory_get_pixbuf_from_name (const char *icon_name,
 	GdkPixbuf *pixbuf;
 	NautilusScalableIcon *icon;
 	
-	icon = nautilus_scalable_icon_new_from_text_pieces (NULL, icon_name, modifier, NULL, anti_aliased);
+	icon = eel_scalable_icon_new_from_text_pieces (NULL, icon_name, modifier, NULL, anti_aliased);
 	pixbuf = nautilus_icon_factory_get_pixbuf_for_icon (icon, size_in_pixels, size_in_pixels,
 							    size_in_pixels, size_in_pixels, NULL, TRUE); 	
-	nautilus_scalable_icon_unref (icon);	
+	eel_scalable_icon_unref (icon);	
 	return pixbuf;
 }
 									  
@@ -2390,7 +2390,7 @@ embedded_text_rect_usable (const ArtIRect *embedded_text_rect)
 }
 
 static gboolean embedded_text_preferences_callbacks_added = FALSE;
-static NautilusScalableFont *embedded_text_font = NULL;
+static EelScalableFont *embedded_text_font = NULL;
 
 static void
 embedded_text_font_changed_callback (gpointer callback_data)
@@ -2420,7 +2420,7 @@ embed_text (GdkPixbuf *pixbuf_without_text,
 	    const ArtIRect *embedded_text_rect,
 	    const char *text)
 {
-	NautilusSmoothTextLayout *smooth_text_layout;
+	EelSmoothTextLayout *smooth_text_layout;
 	GdkPixbuf *pixbuf_with_text;
 	
 	g_return_val_if_fail (pixbuf_without_text != NULL, NULL);
@@ -2429,7 +2429,7 @@ embed_text (GdkPixbuf *pixbuf_without_text,
 	/* Quick out for the case where there's no place to embed the
 	 * text or the place is too small or there's no text.
 	 */
-	if (!embedded_text_rect_usable (embedded_text_rect) || nautilus_strlen (text) == 0) {
+	if (!embedded_text_rect_usable (embedded_text_rect) || eel_strlen (text) == 0) {
 		return NULL;
 	}
 
@@ -2445,28 +2445,28 @@ embed_text (GdkPixbuf *pixbuf_without_text,
 		g_atexit (embedded_text_font_free);
 	}
 
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (embedded_text_font), NULL);
+	g_return_val_if_fail (EEL_IS_SCALABLE_FONT (embedded_text_font), NULL);
 	
-	smooth_text_layout = nautilus_smooth_text_layout_new (text,
-							      nautilus_strlen (text),
+	smooth_text_layout = eel_smooth_text_layout_new (text,
+							      eel_strlen (text),
 							      embedded_text_font,
 							      EMBEDDED_TEXT_FONT_SIZE,
 							      FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), NULL);
-	nautilus_smooth_text_layout_set_line_spacing (smooth_text_layout, EMBEDDED_TEXT_LINE_SPACING);
-	nautilus_smooth_text_layout_set_empty_line_height (smooth_text_layout, EMBEDDED_TEXT_EMPTY_LINE_HEIGHT);
+	g_return_val_if_fail (EEL_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), NULL);
+	eel_smooth_text_layout_set_line_spacing (smooth_text_layout, EMBEDDED_TEXT_LINE_SPACING);
+	eel_smooth_text_layout_set_empty_line_height (smooth_text_layout, EMBEDDED_TEXT_EMPTY_LINE_HEIGHT);
 	
 	pixbuf_with_text = gdk_pixbuf_copy (pixbuf_without_text);
 	
-	nautilus_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
+	eel_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
 						    pixbuf_with_text,
 						    0,
 						    0,
 						    embedded_text_rect,
 						    GTK_JUSTIFY_LEFT,
 						    FALSE,
-						    NAUTILUS_RGB_COLOR_BLACK,
-						    NAUTILUS_OPACITY_FULLY_OPAQUE);
+						    EEL_RGB_COLOR_BLACK,
+						    EEL_OPACITY_FULLY_OPAQUE);
 	
 	gtk_object_unref (GTK_OBJECT (smooth_text_layout));
 
@@ -2485,7 +2485,7 @@ load_icon_with_embedded_text (NautilusScalableIcon *scalable_icon,
 	g_assert (scalable_icon->embedded_text != NULL);
 	
 	/* Get the icon without text. */
-	scalable_icon_without_text = nautilus_scalable_icon_new_from_text_pieces
+	scalable_icon_without_text = eel_scalable_icon_new_from_text_pieces
 		(scalable_icon->uri,
 		 scalable_icon->name,
 		 scalable_icon->modifier,
@@ -2494,7 +2494,7 @@ load_icon_with_embedded_text (NautilusScalableIcon *scalable_icon,
 	icon_without_text = get_icon_from_cache
 		(scalable_icon_without_text, size,
 		 FALSE, FALSE);
-	nautilus_scalable_icon_unref (scalable_icon_without_text);
+	eel_scalable_icon_unref (scalable_icon_without_text);
 	
 	/* Create a pixbuf with the text in it. */
 	pixbuf_with_text = embed_text (icon_without_text->pixbuf,
@@ -2520,10 +2520,10 @@ load_icon_with_embedded_text (NautilusScalableIcon *scalable_icon,
 
 /* Convenience function for unrefing and then freeing an entire list. */
 void
-nautilus_scalable_icon_list_free (GList *icon_list)
+eel_scalable_icon_list_free (GList *icon_list)
 {
-	nautilus_g_list_free_deep_custom
-		(icon_list, (GFunc) nautilus_scalable_icon_unref, NULL);
+	eel_g_list_free_deep_custom
+		(icon_list, (GFunc) eel_scalable_icon_unref, NULL);
 }
 
 #if ! defined (NAUTILUS_OMIT_SELF_CHECK)
@@ -2540,93 +2540,93 @@ self_test_next_icon_size_to_try (guint start_size, guint current_size)
 void
 nautilus_self_check_icon_factory (void)
 {
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (0), 12);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (1), 24);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (2), 36);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (3), 48);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (4), 72);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (5), 96);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (6), 192);
-
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (0), 12);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (1), 12);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (11), 12);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (12), 20);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (19), 20);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (20), 24);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (23), 24);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (24), 36);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (35), 36);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (36), 48);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (47), 48);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (48), 72);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (71), 72);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (72), 96);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (95), 96);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (96), 192);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (191), 192);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (192), 192);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (0xFFFFFFFF), 192);
-
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (0), 12);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (1), 12);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (11), 12);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (12), 12);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (20), 12);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (21), 20);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (24), 20);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (25), 24);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (36), 24);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (37), 36);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (48), 36);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (49), 48);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (72), 48);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (73), 72);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (96), 72);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (97), 96);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (192), 96);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (193), 192);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (0xFFFFFFFF), 192);
-
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 0), "TRUE,12");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 12), "TRUE,20");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 20), "TRUE,24");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 24), "TRUE,36");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 36), "TRUE,48");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 48), "TRUE,72");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 72), "TRUE,96");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 96), "TRUE,192");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 192), "FALSE,192");
-
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 0), "TRUE,36");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 36), "TRUE,48");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 48), "TRUE,72");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 72), "TRUE,96");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 96), "TRUE,192");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 192), "TRUE,24");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 24), "TRUE,20");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 20), "TRUE,12");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 12), "FALSE,12");
-
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 0), "TRUE,48");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 48), "TRUE,72");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 72), "TRUE,96");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 96), "TRUE,192");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 192), "TRUE,36");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 36), "TRUE,24");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 24), "TRUE,20");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 20), "TRUE,12");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 12), "FALSE,12");
-
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 0), "TRUE,192");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 192), "TRUE,96");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 96), "TRUE,72");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 72), "TRUE,48");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 48), "TRUE,36");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 36), "TRUE,24");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 24), "TRUE,20");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 20), "TRUE,12");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 12), "FALSE,12");
+	EEL_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (0), 12);
+	EEL_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (1), 24);
+	EEL_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (2), 36);
+	EEL_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (3), 48);
+	EEL_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (4), 72);
+	EEL_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (5), 96);
+	EEL_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (6), 192);
+
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (0), 12);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (1), 12);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (11), 12);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (12), 20);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (19), 20);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (20), 24);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (23), 24);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (24), 36);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (35), 36);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (36), 48);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (47), 48);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (48), 72);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (71), 72);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (72), 96);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (95), 96);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (96), 192);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (191), 192);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (192), 192);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (0xFFFFFFFF), 192);
+
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (0), 12);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (1), 12);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (11), 12);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (12), 12);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (20), 12);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (21), 20);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (24), 20);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (25), 24);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (36), 24);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (37), 36);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (48), 36);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (49), 48);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (72), 48);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (73), 72);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (96), 72);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (97), 96);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (192), 96);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (193), 192);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (0xFFFFFFFF), 192);
+
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 0), "TRUE,12");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 12), "TRUE,20");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 20), "TRUE,24");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 24), "TRUE,36");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 36), "TRUE,48");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 48), "TRUE,72");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 72), "TRUE,96");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 96), "TRUE,192");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 192), "FALSE,192");
+
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 0), "TRUE,36");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 36), "TRUE,48");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 48), "TRUE,72");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 72), "TRUE,96");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 96), "TRUE,192");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 192), "TRUE,24");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 24), "TRUE,20");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 20), "TRUE,12");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 12), "FALSE,12");
+
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 0), "TRUE,48");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 48), "TRUE,72");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 72), "TRUE,96");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 96), "TRUE,192");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 192), "TRUE,36");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 36), "TRUE,24");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 24), "TRUE,20");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 20), "TRUE,12");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 12), "FALSE,12");
+
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 0), "TRUE,192");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 192), "TRUE,96");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 96), "TRUE,72");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 72), "TRUE,48");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 48), "TRUE,36");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 36), "TRUE,24");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 24), "TRUE,20");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 20), "TRUE,12");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 12), "FALSE,12");
 }
 
 #endif /* ! NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-icon-factory.h b/libnautilus-extensions/nautilus-icon-factory.h
index 172e6a8bd..c52e0b41c 100644
--- a/libnautilus-extensions/nautilus-icon-factory.h
+++ b/libnautilus-extensions/nautilus-icon-factory.h
@@ -28,7 +28,7 @@
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-string-list.h>
+#include <eel/eel-string-list.h>
 #include <gtk/gtkobject.h>
 
 /* NautilusIconFactory is a class that knows how to hand out icons to be
@@ -108,7 +108,7 @@ gboolean              nautilus_icon_factory_is_icon_ready_for_file       (Nautil
 GList *               nautilus_icon_factory_get_required_file_attributes (void);
 GList *               nautilus_icon_factory_get_emblem_icons_for_file    (NautilusFile                *file,
 									  gboolean                     anti_aliased,
-									  NautilusStringList          *exclude);
+									  EelStringList          *exclude);
 NautilusScalableIcon *nautilus_icon_factory_get_emblem_icon_by_name      (const char                  *emblem_name,
 									  gboolean                     anti_aliased);
 
@@ -155,22 +155,22 @@ GdkPixbuf *	      nautilus_icon_factory_get_pixbuf_from_name	 (const char
  * icon, you can compare two scalable icons to see if they are the same
  * with ==.
  */
-void                  nautilus_scalable_icon_ref                         (NautilusScalableIcon        *scalable_icon);
-void                  nautilus_scalable_icon_unref                       (NautilusScalableIcon        *scalable_icon);
+void                  eel_scalable_icon_ref                         (NautilusScalableIcon        *scalable_icon);
+void                  eel_scalable_icon_unref                       (NautilusScalableIcon        *scalable_icon);
 
 /* A scalable icon can be decomposed into text and reconstituted later
- * using nautilus_scalable_icon_new_from_text_pieces. This is the way 
+ * using eel_scalable_icon_new_from_text_pieces. This is the way 
  * to store scalable icons in metadata or other files.
  */
-void                  nautilus_scalable_icon_get_text_pieces             (NautilusScalableIcon        *scalable_icon,
+void                  eel_scalable_icon_get_text_pieces             (NautilusScalableIcon        *scalable_icon,
 									  char                       **uri_return,
 									  char                       **name_return,
 									  char                       **modifier_return,
 									  char                       **embedded_text_return);
 /* Get a scalable icon using the earlier results of
- * nautilus_scalable_icon_get_text_pieces.
+ * eel_scalable_icon_get_text_pieces.
  */
-NautilusScalableIcon *nautilus_scalable_icon_new_from_text_pieces        (const char                  *uri,
+NautilusScalableIcon *eel_scalable_icon_new_from_text_pieces        (const char                  *uri,
 									  const char                  *name,
 									  const char                  *modifier,
 									  const char                  *embedded_text,
@@ -179,6 +179,6 @@ NautilusScalableIcon *nautilus_scalable_icon_new_from_text_pieces        (const
 /* Convenience function for freeing a list of scalable icons.
  * Unrefs all the icons before freeing the list.
  */
-void                  nautilus_scalable_icon_list_free                   (GList                       *scalable_icon_list);
+void                  eel_scalable_icon_list_free                   (GList                       *scalable_icon_list);
 
 #endif /* NAUTILUS_ICON_FACTORY_H */
diff --git a/libnautilus-extensions/nautilus-icon-private.h b/libnautilus-extensions/nautilus-icon-private.h
index 9c426eeca..b1b73c147 100644
--- a/libnautilus-extensions/nautilus-icon-private.h
+++ b/libnautilus-extensions/nautilus-icon-private.h
@@ -26,7 +26,7 @@
 #define NAUTILUS_ICON_CONTAINER_PRIVATE_H
 
 #include "nautilus-entry.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 #include "nautilus-icon-container.h"
 #include "nautilus-icon-dnd.h"
 #include "nautilus-icon-factory.h"
@@ -49,10 +49,10 @@ typedef struct {
 	double scale_x, scale_y;
 
 	/* Whether this item is selected. */
-	nautilus_boolean_bit is_selected : 1;
+	eel_boolean_bit is_selected : 1;
 
 	/* Whether this item was selected before rubberbanding. */
-	nautilus_boolean_bit was_selected_before_rubberband : 1;
+	eel_boolean_bit was_selected_before_rubberband : 1;
 } NautilusIcon;
 
 
@@ -176,7 +176,7 @@ struct NautilusIconContainerDetails {
 	GdkFont *label_font[NAUTILUS_ZOOM_LEVEL_LARGEST + 1];
 
 	/* font used to draw labels in smooth mode */
-	NautilusScalableFont *smooth_label_font;
+	EelScalableFont *smooth_label_font;
 	int font_size_table[NAUTILUS_ZOOM_LEVEL_LARGEST + 1];
 
 	/* pixbuf and color for label highlighting */
diff --git a/libnautilus-extensions/nautilus-icon-text-item.c b/libnautilus-extensions/nautilus-icon-text-item.c
index d1cf5388e..af72de11d 100644
--- a/libnautilus-extensions/nautilus-icon-text-item.c
+++ b/libnautilus-extensions/nautilus-icon-text-item.c
@@ -17,8 +17,8 @@
 #include "nautilus-theme.h"
 
 #include <libnautilus/nautilus-undo.h>
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-glib-extensions.h>
 
 #include <math.h>
 #include <stdio.h>
@@ -305,10 +305,10 @@ iti_destroy (GtkObject *object)
 
 	/* Queue redraw of bounding box */
 	gnome_canvas_request_redraw (item->canvas,
-				     nautilus_round (item->x1),
-				     nautilus_round (item->y1),
-				     nautilus_round (item->x2),
-				     nautilus_round (item->y2));
+				     eel_round (item->x1),
+				     eel_round (item->y1),
+				     eel_round (item->x2),
+				     eel_round (item->y2));
 
 	/* Free everything */
 	if (iti->font)
@@ -411,16 +411,16 @@ iti_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
 		(* parent_class->update) (item, affine, clip_path, flags);
 
 	gnome_canvas_request_redraw (item->canvas,
-				     nautilus_round (item->x1),
-				     nautilus_round (item->y1),
-				     nautilus_round (item->x2),
-				     nautilus_round (item->y2));
+				     eel_round (item->x1),
+				     eel_round (item->y1),
+				     eel_round (item->x2),
+				     eel_round (item->y2));
 	recompute_bounding_box (iti);
 	gnome_canvas_request_redraw (item->canvas,
-				     nautilus_round (item->x1),
-				     nautilus_round (item->y1),
-				     nautilus_round (item->x2),
-				     nautilus_round (item->y2));
+				     eel_round (item->x1),
+				     eel_round (item->y1),
+				     eel_round (item->x2),
+				     eel_round (item->y2));
 }
 
 /* utility to fetch a color from a theme */
@@ -607,11 +607,11 @@ iti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int update
 
 	iti = ITI (item);
 
-	width  = nautilus_round (item->x2 - item->x1);
-	height = nautilus_round (item->y2 - item->y1);
+	width  = eel_round (item->x2 - item->x1);
+	height = eel_round (item->y2 - item->y1);
 	
-	xofs = nautilus_round (item->x1) - x;
-	yofs = nautilus_round (item->y1) - y;
+	xofs = eel_round (item->x1) - x;
+	yofs = eel_round (item->y1) - y;
 
 	style = GTK_WIDGET (item->canvas)->style;
 
@@ -693,15 +693,15 @@ iti_render (GnomeCanvasItem *item, GnomeCanvasBuf *buffer)
 
 	visual = gdk_visual_get_system ();
 	art_affine_identity(affine);
-	width  = nautilus_round (item->x2 - item->x1);
-	height = nautilus_round (item->y2 - item->y1);
+	width  = eel_round (item->x2 - item->x1);
+	height = eel_round (item->y2 - item->y1);
 	
 	/* allocate a pixmap to draw the text into, and clear it to white */
 	pixmap = gdk_pixmap_new (NULL, width, height, visual->depth);
 
 	gc = gdk_gc_new (pixmap);
 
-	gdk_rgb_gc_set_foreground (gc, NAUTILUS_RGB_COLOR_WHITE);
+	gdk_rgb_gc_set_foreground (gc, EEL_RGB_COLOR_WHITE);
 	gdk_draw_rectangle (pixmap, gc, TRUE,
 			    0, 0,
 			    width,
@@ -709,7 +709,7 @@ iti_render (GnomeCanvasItem *item, GnomeCanvasBuf *buffer)
 	gdk_gc_unref (gc);
 	
 	/* use a common routine to draw the label into the pixmap */
-	iti_draw (item, pixmap, nautilus_round (item->x1), nautilus_round (item->y1), width, height);
+	iti_draw (item, pixmap, eel_round (item->x1), eel_round (item->y1), width, height);
 	
 	/* turn it into a pixbuf */
 	colormap = gdk_colormap_new (visual, FALSE);
@@ -724,7 +724,7 @@ iti_render (GnomeCanvasItem *item, GnomeCanvasBuf *buffer)
 	gdk_pixmap_unref (pixmap);
 		
 	/* draw the pixbuf containing the label */
-	draw_pixbuf_aa (text_pixbuf, buffer, affine, nautilus_round (item->x1), nautilus_round (item->y1));
+	draw_pixbuf_aa (text_pixbuf, buffer, affine, eel_round (item->x1), eel_round (item->y1));
 	gdk_pixbuf_unref (text_pixbuf);
 
 	buffer->is_bg = FALSE;
@@ -915,7 +915,7 @@ iti_ensure_focus (GnomeCanvasItem *item)
 
 	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (item->canvas));
 	if (toplevel != NULL && GTK_WIDGET_REALIZED (toplevel)) {
-		nautilus_gdk_window_focus (toplevel->window, GDK_CURRENT_TIME);
+		eel_gdk_window_focus (toplevel->window, GDK_CURRENT_TIME);
 	}
 }
 
@@ -1063,8 +1063,8 @@ iti_event (GnomeCanvasItem *item, GdkEvent *event)
 		if (event->button.button == 1) {
 			gnome_canvas_w2c_d (item->canvas, event->button.x, event->button.y, &cx, &cy);						
 			idx = iti_idx_from_x_y (iti,
-						nautilus_round (cx - (item->x1 + MARGIN_X)),
-						nautilus_round (cy - (item->y1 + MARGIN_Y)));
+						eel_round (cx - (item->x1 + MARGIN_X)),
+						eel_round (cy - (item->y1 + MARGIN_Y)));
 			iti_start_selecting (iti, idx, event->button.time);
 		}
 		return TRUE;
@@ -1076,8 +1076,8 @@ iti_event (GnomeCanvasItem *item, GdkEvent *event)
 		gtk_widget_event (GTK_WIDGET (priv->entry), event);
 		gnome_canvas_w2c_d (item->canvas, event->button.x, event->button.y, &cx, &cy);			
 		idx = iti_idx_from_x_y (iti,
-					nautilus_round (cx - (item->x1 + MARGIN_X)),
-					nautilus_round (cy - (item->y1 + MARGIN_Y)));
+					eel_round (cx - (item->x1 + MARGIN_X)),
+					eel_round (cy - (item->y1 + MARGIN_Y)));
 		iti_selection_motion (iti, idx);
 		return TRUE;
 
diff --git a/libnautilus-extensions/nautilus-image-table.c b/libnautilus-extensions/nautilus-image-table.c
deleted file mode 100644
index 0e1f1f3f8..000000000
--- a/libnautilus-extensions/nautilus-image-table.c
+++ /dev/null
@@ -1,759 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-image-table.c - An image table.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-image-table.h"
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-art-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-#include "nautilus-region.h"
-#include "nautilus-debug-drawing.h"
-
-#include <gtk/gtkmain.h>
-
-/* Arguments */
-enum
-{
-	ARG_0,
-	ARG_CHILD_UNDER_POINTER
-};
-
-/* Detail member struct */
-struct NautilusImageTableDetails
-{
-	GtkWidget *child_under_pointer;
-	GtkWidget *child_being_pressed;
-	GdkGC *clear_gc;
-	guint32 smooth_background_color;
-	gboolean is_smooth;
-};
-
-/* Signals */
-typedef enum
-{
-	CHILD_ENTER,
-	CHILD_LEAVE,
-	CHILD_PRESSED,
-	CHILD_RELEASED,
-	CHILD_CLICKED,
-	SET_IS_SMOOTH,
-	LAST_SIGNAL
-} ImageTableSignals;
-
-/* Signals */
-static guint image_table_signals[LAST_SIGNAL] = { 0 };
-
-/* GtkObjectClass methods */
-static void    nautilus_image_table_initialize_class     (NautilusImageTableClass *image_table_class);
-static void    nautilus_image_table_initialize           (NautilusImageTable      *image);
-static void    nautilus_image_table_destroy              (GtkObject               *object);
-
-/* GtkWidgetClass methods */
-static int     nautilus_image_table_expose_event         (GtkWidget               *widget,
-							  GdkEventExpose          *event);
-static void    nautilus_image_table_realize              (GtkWidget               *widget);
-static void    nautilus_image_table_unrealize            (GtkWidget               *widget);
-
-/* GtkContainerClass methods */
-static void    nautilus_image_table_remove               (GtkContainer            *container,
-							  GtkWidget               *widget);
-static GtkType nautilus_image_table_child_type           (GtkContainer            *container);
-
-/* Private NautilusImageTable methods */
-static void    image_table_clear_dirty_areas             (NautilusImageTable      *image_table);
-static GdkGC * image_table_peek_clear_gc                 (NautilusImageTable      *image_table);
-static void    image_table_emit_signal                   (NautilusImageTable      *image_table,
-							  GtkWidget               *child,
-							  guint                    signal_index,
-							  int                      x,
-							  int                      y,
-							  int                      button,
-							  guint                    state);
-
-/* Ancestor callbacks */
-static int     ancestor_enter_notify_event               (GtkWidget               *widget,
-							  GdkEventCrossing        *event,
-							  gpointer                 event_data);
-static int     ancestor_leave_notify_event               (GtkWidget               *widget,
-							  GdkEventCrossing        *event,
-							  gpointer                 event_data);
-static int     ancestor_motion_notify_event              (GtkWidget               *widget,
-							  GdkEventMotion          *event,
-							  gpointer                 event_data);
-static int     ancestor_button_press_event               (GtkWidget               *widget,
-							  GdkEventButton          *event,
-							  gpointer                 event_data);
-static int     ancestor_button_release_event             (GtkWidget               *widget,
-							  GdkEventButton          *event,
-							  gpointer                 event_data);
-
-/* NautilusImageTable signals */
-static void    nautilus_image_table_set_is_smooth_signal (GtkWidget               *widget,
-							  gboolean                 is_smooth);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusImageTable, nautilus_image_table, NAUTILUS_TYPE_WRAP_TABLE)
-
-/* Class init methods */
-static void
-nautilus_image_table_initialize_class (NautilusImageTableClass *image_table_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (image_table_class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (image_table_class);
-	GtkContainerClass *container_class = GTK_CONTAINER_CLASS (image_table_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_image_table_destroy;
-	
- 	/* GtkWidgetClass */
- 	widget_class->expose_event = nautilus_image_table_expose_event;
- 	widget_class->realize = nautilus_image_table_realize;
- 	widget_class->unrealize = nautilus_image_table_unrealize;
-
- 	/* GtkContainerClass */
-	container_class->remove = nautilus_image_table_remove;
-	container_class->child_type = nautilus_image_table_child_type;
-
-	/* NautilusImageTableClass */
-	image_table_class->set_is_smooth = nautilus_image_table_set_is_smooth_signal;
-	
-	/* Signals */
-	image_table_signals[CHILD_ENTER] = gtk_signal_new ("child_enter",
-							   GTK_RUN_LAST,
-							   object_class->type,
-							   0,
-							   gtk_marshal_NONE__POINTER_POINTER,
-							   GTK_TYPE_NONE,
-							   2,
-							   GTK_TYPE_POINTER,
-							   GTK_TYPE_POINTER);
-	image_table_signals[CHILD_LEAVE] = gtk_signal_new ("child_leave",
-							   GTK_RUN_LAST,
-							   object_class->type,
-							   0,
-							   gtk_marshal_NONE__POINTER_POINTER,
-							   GTK_TYPE_NONE,
-							   2,
-							   GTK_TYPE_POINTER,
-							   GTK_TYPE_POINTER);
-	image_table_signals[CHILD_PRESSED] = gtk_signal_new ("child_pressed",
-							     GTK_RUN_LAST,
-							     object_class->type,
-							     0,
-							     gtk_marshal_NONE__POINTER_POINTER,
-							     GTK_TYPE_NONE,
-							     2,
-							     GTK_TYPE_POINTER,
-							     GTK_TYPE_POINTER);
-	image_table_signals[CHILD_RELEASED] = gtk_signal_new ("child_released",
-							      GTK_RUN_LAST,
-							      object_class->type,
-							      0,
-							      gtk_marshal_NONE__POINTER_POINTER,
-							      GTK_TYPE_NONE,
-							      2,
-							      GTK_TYPE_POINTER,
-							      GTK_TYPE_POINTER);
-	image_table_signals[CHILD_CLICKED] = gtk_signal_new ("child_clicked",
-							     GTK_RUN_LAST,
-							     object_class->type,
-							     0,
-							     gtk_marshal_NONE__POINTER_POINTER,
-							     GTK_TYPE_NONE,
-							     2,
-							     GTK_TYPE_POINTER,
-							     GTK_TYPE_POINTER);
-	
-	image_table_signals[SET_IS_SMOOTH] = gtk_signal_new ("set_is_smooth",
-							     GTK_RUN_LAST,
-							     object_class->type,
-							     GTK_SIGNAL_OFFSET (NautilusImageTableClass, set_is_smooth),
-							     gtk_marshal_NONE__BOOL,
-							     GTK_TYPE_NONE, 
-							     1,
-							     GTK_TYPE_BOOL);
-
-	gtk_object_class_add_signals (object_class, image_table_signals, LAST_SIGNAL);
-
-	/* Let the smooth widget machinery know that our class can be smooth */
-	nautilus_smooth_widget_register_type (NAUTILUS_TYPE_IMAGE_TABLE);
-}
-
-void
-nautilus_image_table_initialize (NautilusImageTable *image_table)
-{
-	GTK_WIDGET_SET_FLAGS (image_table, GTK_NO_WINDOW);
-
-	image_table->details = g_new0 (NautilusImageTableDetails, 1);
-	image_table->details->smooth_background_color = NAUTILUS_RGB_COLOR_WHITE;
-
-	nautilus_smooth_widget_register (GTK_WIDGET (image_table));
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_image_table_destroy (GtkObject *object)
-{
- 	NautilusImageTable *image_table;
-	
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (object));
-
-	image_table = NAUTILUS_IMAGE_TABLE (object);
-
-	g_free (image_table->details);
-
-	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-/* GtkWidgetClass methods */
-static int
-nautilus_image_table_expose_event (GtkWidget *widget,
-				   GdkEventExpose *event)
-{
-	NautilusImageTable *image_table;
-
-	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (widget), TRUE);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
-	g_return_val_if_fail (event != NULL, TRUE);
-
-	image_table = NAUTILUS_IMAGE_TABLE (widget);
-
-	/* In smooth mode we clear dirty areas, since our background wont be
-	 * force clear and thus avoid flicker.
-	 */
-	if (image_table->details->is_smooth) {
-		image_table_clear_dirty_areas (image_table);
-	}
-	
-	return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
-		(GTK_WIDGET_CLASS, expose_event, (widget, event));
-}
-
-static void
-nautilus_image_table_realize (GtkWidget *widget)
-{
-	NautilusImageTable *image_table;
-	GtkWidget *windowed_ancestor;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (widget));
-	
-	image_table = NAUTILUS_IMAGE_TABLE (widget);
-
-	/* Chain realize */
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
-
-	windowed_ancestor = nautilus_gtk_widget_find_windowed_ancestor (widget);
-	g_assert (GTK_IS_WIDGET (windowed_ancestor));
-	
-	gtk_widget_add_events (windowed_ancestor,
-			       GDK_BUTTON_PRESS_MASK
-			       | GDK_BUTTON_RELEASE_MASK
-			       | GDK_BUTTON_MOTION_MASK
-			       | GDK_ENTER_NOTIFY_MASK
-			       | GDK_LEAVE_NOTIFY_MASK
-			       | GDK_POINTER_MOTION_MASK);
-
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "enter_notify_event",
-						    GTK_SIGNAL_FUNC (ancestor_enter_notify_event),
-						    widget,
-						    widget);
-	
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "leave_notify_event",
-						    GTK_SIGNAL_FUNC (ancestor_leave_notify_event),
-						    widget,
-						    widget);
-	
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "motion_notify_event",
-						    GTK_SIGNAL_FUNC (ancestor_motion_notify_event),
-						    widget,
-						    widget);
-	
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "button_press_event",
-						    GTK_SIGNAL_FUNC (ancestor_button_press_event),
-						    widget,
-						    widget);
-	
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "button_release_event",
-						    GTK_SIGNAL_FUNC (ancestor_button_release_event),
-						    widget,
-						    widget);
-}
-
-static void
-nautilus_image_table_unrealize (GtkWidget *widget)
-{
-	NautilusImageTable *image_table;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (widget));
-
-	image_table = NAUTILUS_IMAGE_TABLE (widget);
-
-	if (image_table->details->clear_gc != NULL) {
-		gdk_gc_unref (image_table->details->clear_gc);
-		image_table->details->clear_gc = NULL;
-	}
-
-	/* Chain unrealize */
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget));
-}
-
-/* GtkContainerClass methods */
-static void
-nautilus_image_table_remove (GtkContainer *container,
-			     GtkWidget *child)
-{
-	NautilusImageTable *image_table;
-	
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (container));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (child));
-	
-	image_table = NAUTILUS_IMAGE_TABLE (container);
-
-	if (child == image_table->details->child_under_pointer) {
-		image_table->details->child_under_pointer = NULL;
-	}
-
-	if (child == image_table->details->child_being_pressed) {
-		image_table->details->child_being_pressed = NULL;
-	}
-
-	NAUTILUS_CALL_PARENT (GTK_CONTAINER_CLASS, remove, (container, child));
-}
-
-static GtkType
-nautilus_image_table_child_type (GtkContainer *container)
-{
-	return NAUTILUS_TYPE_LABELED_IMAGE;
-}
-
-/* NautilusImageTable signals */
-static void
-nautilus_image_table_set_is_smooth_signal (GtkWidget *widget,
-					   gboolean is_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (widget));
-	
-	nautilus_image_table_set_is_smooth (NAUTILUS_IMAGE_TABLE (widget), is_smooth);
-}
-
-/* Private NautilusImageTable methods */
-
-/* For each of the image table children, subtract their content from a region */
-static void
-image_table_foreach_child_subtract_content (GtkWidget *child,
-					    gpointer callback_data)
-{
-	NautilusRegion *region;
-	ArtIRect label_bounds;
-	ArtIRect image_bounds;
-
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (child));
-	g_return_if_fail (callback_data != NULL);
-
-	if (!GTK_WIDGET_VISIBLE (child)) {
-		return;
-	}
-
-	region = callback_data;
-
-	image_bounds = nautilus_labeled_image_get_image_bounds (NAUTILUS_LABELED_IMAGE (child));
-	if (!art_irect_empty (&image_bounds)) {
-		nautilus_region_subtract_rectangle (region, &image_bounds);
-	}
-	
-	label_bounds = nautilus_labeled_image_get_label_bounds (NAUTILUS_LABELED_IMAGE (child));
-	if (!art_irect_empty (&label_bounds)) {
-					nautilus_region_subtract_rectangle (region, &label_bounds);
-	}
-}
-
-/* Clear the dirty areas around the children's content */
-static void
-image_table_clear_dirty_areas (NautilusImageTable *image_table)
-{
-	GtkWidget *widget;
-	NautilusRegion *region;
-	NautilusDimensions dimensions;
-	ArtIRect whole_region;
-	GdkGC *gc;
-	
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (image_table));
-	g_return_if_fail (GTK_WIDGET_REALIZED (image_table));
-
-	widget = GTK_WIDGET (image_table);
-	
-	dimensions = nautilus_gtk_widget_get_dimensions (widget->parent);
-	whole_region = nautilus_art_irect_assign_dimensions (0, 0, &dimensions);
-	region = nautilus_region_new ();
-	
-	nautilus_region_add_rectangle (region, &whole_region);
-
-	gc = image_table_peek_clear_gc (image_table);
-	
-	gtk_container_foreach (GTK_CONTAINER (image_table), image_table_foreach_child_subtract_content, region);
-	
-	nautilus_region_set_gc_clip_region (region, gc);
-	
-	gdk_draw_rectangle (widget->window,
-			    gc,
-			    TRUE,
-			    0,
-			    0,
-			    dimensions.width,
-			    dimensions.height);
-	
-	nautilus_region_free (region);
-}
-
-static GdkGC *
-image_table_peek_clear_gc (NautilusImageTable *image_table)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table), NULL);
-
-	if (image_table->details->clear_gc == NULL) {
-		image_table->details->clear_gc = gdk_gc_new (GTK_WIDGET (image_table)->window);
-		gdk_gc_set_function (image_table->details->clear_gc, GDK_COPY);
-	}
-
-	gdk_rgb_gc_set_foreground (image_table->details->clear_gc, image_table->details->smooth_background_color);
-
-	return image_table->details->clear_gc;
-}
-
-static void
-image_table_emit_signal (NautilusImageTable *image_table,
-			 GtkWidget *child,
-			 guint signal_index,
-			 int x,
-			 int y,
-			 int button,
-			 guint state)
-{
-	NautilusImageTableEvent event;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table));
-	g_return_if_fail (GTK_IS_WIDGET (child));
-	g_return_if_fail (signal_index >= 0);
-	g_return_if_fail (signal_index < LAST_SIGNAL);
-
-	event.x = x;
-	event.y = y;
-	event.button = button;
-	event.state = state;
-	
-	gtk_signal_emit (GTK_OBJECT (image_table), 
-			 image_table_signals[signal_index],
-			 child,
-			 &event);
-}
-
-static void
-image_table_handle_motion (NautilusImageTable *image_table,
-			   int x,
-			   int y,
-			   GdkEvent *event)
-{
-	GtkWidget *child;
-	GtkWidget *leave_emit_child = NULL;
-	GtkWidget *enter_emit_child = NULL;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table));
-
-	child = nautilus_wrap_table_find_child_at_event_point (NAUTILUS_WRAP_TABLE (image_table), x, y);
-
-	if (child && !GTK_WIDGET_SENSITIVE (child)) {
-		return;
-	}
-
-	if (child == image_table->details->child_under_pointer) {
-		return;
-	}
-
-	if (child != NULL) {
-		if (image_table->details->child_under_pointer != NULL) {
-			leave_emit_child = image_table->details->child_under_pointer;
-		}
-
-		image_table->details->child_under_pointer = child;
-		enter_emit_child = image_table->details->child_under_pointer;
-	} else {
-		if (image_table->details->child_under_pointer != NULL) {
-			leave_emit_child = image_table->details->child_under_pointer;
-		}
-
-		image_table->details->child_under_pointer = NULL;
-	}
-
-	if (leave_emit_child != NULL) {
-		image_table_emit_signal (image_table,
-					 leave_emit_child,
-					 CHILD_LEAVE,
-					 x,
-					 y,
-					 0,
-					 0);
-	}
-
-	if (enter_emit_child != NULL) {
-		image_table_emit_signal (image_table,
-					 enter_emit_child,
-					 CHILD_ENTER,
-					 x,
-					 y,
-					 0,
-					 0);
-	}
-}
-
-static int
-ancestor_enter_notify_event (GtkWidget *widget,
-			     GdkEventCrossing *event,
-			     gpointer event_data)
-{
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE_TABLE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	image_table_handle_motion (NAUTILUS_IMAGE_TABLE (event_data), event->x, event->y, (GdkEvent *) event);
-
-	return FALSE;
-}
-
-static int
-ancestor_leave_notify_event (GtkWidget *widget,
-			     GdkEventCrossing *event,
-			     gpointer event_data)
-{
-	ArtIRect bounds;
-	int x = -1;
-	int y = -1;
-	
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE_TABLE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	bounds = nautilus_gtk_widget_get_bounds (GTK_WIDGET (event_data));
-	
-	if (nautilus_art_irect_contains_point (&bounds, event->x, event->y)) {
-		x = event->x;
-		y = event->y;
-	}
-
-	image_table_handle_motion (NAUTILUS_IMAGE_TABLE (event_data), x, y, (GdkEvent *) event);
-	
-	return FALSE;
-}
-
-static int
-ancestor_motion_notify_event (GtkWidget *widget,
-			      GdkEventMotion *event,
-			      gpointer event_data)
-{
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE_TABLE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	image_table_handle_motion (NAUTILUS_IMAGE_TABLE (event_data), (int) event->x, (int) event->y, (GdkEvent *) event);
-
-	return FALSE;
-}
-
-static int
-ancestor_button_press_event (GtkWidget *widget,
-			     GdkEventButton *event,
-			     gpointer event_data)
-{
-  	NautilusImageTable *image_table;
-	GtkWidget *child;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE_TABLE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
- 	image_table = NAUTILUS_IMAGE_TABLE (event_data);
-
-	child = nautilus_wrap_table_find_child_at_event_point (NAUTILUS_WRAP_TABLE (image_table), event->x, event->y);
-
-	if (child && !GTK_WIDGET_SENSITIVE (child)) {
-		return FALSE;
-	}
-
-	if (child != NULL) {
-		if (child == image_table->details->child_under_pointer) {
-			image_table->details->child_being_pressed = child;
-			image_table_emit_signal (image_table,
-						 child,
-						 CHILD_PRESSED,
-						 event->x,
-						 event->y,
-						 event->button,
-						 event->state);
-		}
-	}
-
-	return FALSE;
-}
-
-static int
-ancestor_button_release_event (GtkWidget *widget,
-			       GdkEventButton *event,
-			       gpointer event_data)
-{
-  	NautilusImageTable *image_table;
-	GtkWidget *child;
-	GtkWidget *released_emit_child = NULL;
-	GtkWidget *clicked_emit_child = NULL;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE_TABLE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
- 	image_table = NAUTILUS_IMAGE_TABLE (event_data);
-
-	child = nautilus_wrap_table_find_child_at_event_point (NAUTILUS_WRAP_TABLE (image_table), event->x, event->y);
-
-	if (child && !GTK_WIDGET_SENSITIVE (child)) {
-		return FALSE;
-	}
-
-	if (image_table->details->child_being_pressed != NULL) {
-		released_emit_child = image_table->details->child_being_pressed;
-	}
-
-	if (child != NULL) {
-		if (child == image_table->details->child_being_pressed) {
-			clicked_emit_child = child;
-		}
-	}
-	
-	image_table->details->child_being_pressed = NULL;
-
-	if (released_emit_child != NULL) {
-		image_table_emit_signal (image_table,
-					 released_emit_child,
-					 CHILD_RELEASED,
-					 event->x,
-					 event->y,
-					 event->button,
-					 event->state);
-	}
-	
-	if (clicked_emit_child != NULL) {
-
-		image_table_emit_signal (image_table,
-					 clicked_emit_child,
-					 CHILD_CLICKED,
-					 event->x,
-					 event->y,
-					 event->button,
-					 event->state);
-	}
-	
-	return FALSE;
-}
-
-/**
- * nautilus_image_table_new:
- */
-GtkWidget*
-nautilus_image_table_new (gboolean homogeneous)
-{
-	NautilusImageTable *image_table;
-
-	image_table = NAUTILUS_IMAGE_TABLE (gtk_widget_new (nautilus_image_table_get_type (), NULL));
-
-	nautilus_wrap_table_set_homogeneous (NAUTILUS_WRAP_TABLE (image_table), homogeneous);
-	
-	return GTK_WIDGET (image_table);
-}
-
-/**
- * nautilus_image_table_set_is_smooth:
- * @image_table: A NautilusImageTable.
- * @is_smooth: Boolean value indicating whether the image table is smooth.
- *
- */
-void
-nautilus_image_table_set_is_smooth (NautilusImageTable *image_table,
-				    gboolean is_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table));
-	
-	if (image_table->details->is_smooth == is_smooth) {
-		return;
-	}
-	
-	image_table->details->is_smooth = is_smooth;
-}
-
-/**
- * nautilus_image_table_set_smooth_background_color:
- * @image_table: A NautilusImageTable.
- * @smooth_background_color: The color to use for background in smooth mode.
- *
- */
-void
-nautilus_image_table_set_smooth_background_color (NautilusImageTable *image_table,
-						  guint32 smooth_background_color)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table));
-	
-	if (image_table->details->smooth_background_color == smooth_background_color) {
-		return;
-	}
-	
-	image_table->details->smooth_background_color = smooth_background_color;
-}
-
-/**
- * nautilus_image_table_add_empty_child:
- * @image_table: A NautilusImageTable.
- *
- * Add a "empty" child to the table.  Useful when you want to have
- * empty space between 2 children.
- *
- * Returns: The empty child - A NautilusLabeledImage widget with no label
- *          or pixbuf.
- */
-GtkWidget *
-nautilus_image_table_add_empty_image (NautilusImageTable *image_table)
-{
-	GtkWidget *empty;
-
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table), NULL);
-
-	empty = nautilus_labeled_image_new (NULL, NULL);
-	gtk_container_add (GTK_CONTAINER (image_table), empty);
-	gtk_widget_set_sensitive (empty, FALSE);
-
-	return empty;
-}
diff --git a/libnautilus-extensions/nautilus-image-table.h b/libnautilus-extensions/nautilus-image-table.h
deleted file mode 100644
index c8e682b08..000000000
--- a/libnautilus-extensions/nautilus-image-table.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-image-table.h - An image table.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_IMAGE_TABLE_H
-#define NAUTILUS_IMAGE_TABLE_H
-
-#include <libnautilus-extensions/nautilus-wrap-table.h>
-#include <libnautilus-extensions/nautilus-labeled-image.h>
-#include <libnautilus-extensions/nautilus-smooth-widget.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_IMAGE_TABLE            (nautilus_image_table_get_type ())
-#define NAUTILUS_IMAGE_TABLE(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_IMAGE_TABLE, NautilusImageTable))
-#define NAUTILUS_IMAGE_TABLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_IMAGE_TABLE, NautilusImageTableClass))
-#define NAUTILUS_IS_IMAGE_TABLE(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_IMAGE_TABLE))
-#define NAUTILUS_IS_IMAGE_TABLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_IMAGE_TABLE))
-
-typedef struct NautilusImageTable	   NautilusImageTable;
-typedef struct NautilusImageTableClass     NautilusImageTableClass;
-typedef struct NautilusImageTableDetails   NautilusImageTableDetails;
-
-struct NautilusImageTable
-{
-	/* Superclass */
-	NautilusWrapTable wrap_table;
-
-	/* Private things */
-	NautilusImageTableDetails *details;
-};
-
-struct NautilusImageTableClass
-{
-	NautilusWrapTableClass parent_class;
-	NautilusSmoothWidgetSetIsSmooth set_is_smooth;
-};
-
-typedef struct
-{
-	int x;
-	int y;
-	int button;
-	guint state;
-} NautilusImageTableEvent;
-
-/* Public GtkImageTable methods */
-GtkType    nautilus_image_table_get_type                    (void);
-GtkWidget *nautilus_image_table_new                         (gboolean            homogeneous);
-void       nautilus_image_table_set_smooth_background_color (NautilusImageTable *image_table,
-							     guint32             smooth_background_color);
-void       nautilus_image_table_set_is_smooth               (NautilusImageTable *image_table,
-							     gboolean            is_smooth);
-GtkWidget *nautilus_image_table_add_empty_image             (NautilusImageTable *image_table);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_IMAGE_TABLE_H */
-
-
diff --git a/libnautilus-extensions/nautilus-image-with-background.c b/libnautilus-extensions/nautilus-image-with-background.c
deleted file mode 100644
index 95eade586..000000000
--- a/libnautilus-extensions/nautilus-image-with-background.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-image-with-background.c - A NautilusImage that uses NautilusBackground.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include <gtk/gtksignal.h>
-
-#include "nautilus-image-with-background.h"
-#include "nautilus-background.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-
-static void
-draw_background_callback (GtkWidget *widget,
-			  GdkPixbuf *buffer,
-			  const ArtIRect *area,
-			  gpointer callback_data)
-{
-	GtkWidget *background_ancestor;
-	NautilusBackground *background;
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (buffer));
-	g_return_if_fail (area != NULL);
-
-	background_ancestor = nautilus_gtk_widget_find_background_ancestor (widget);
-	g_return_if_fail (GTK_IS_WIDGET (background_ancestor));
-
-	background = nautilus_get_widget_background (background_ancestor);
-	g_return_if_fail (NAUTILUS_IS_BACKGROUND (background));
-	
-	nautilus_background_draw_to_pixbuf (background,
-					    buffer,
-					    area->x0,
-					    area->y0,
-					    area->x1 - area->x0,
-					    area->y1 - area->y0,
-					    background_ancestor->allocation.width,
-					    background_ancestor->allocation.height);
-}
-
-GtkWidget *
-nautilus_image_new_with_background (const char *file_name)
-{
-	GtkWidget *image;
-	
-	image = nautilus_image_new (file_name);
-
-	nautilus_image_set_background_mode (NAUTILUS_IMAGE (image),
-					    NAUTILUS_SMOOTH_BACKGROUND_CALLBACK);
-	
-	gtk_signal_connect_while_alive (GTK_OBJECT (image),
-					"draw_background",
-					GTK_SIGNAL_FUNC (draw_background_callback),
-					NULL,
-					GTK_OBJECT (image));
-
-	return image;
-}
diff --git a/libnautilus-extensions/nautilus-image-with-background.h b/libnautilus-extensions/nautilus-image-with-background.h
deleted file mode 100644
index 8e0e0a4eb..000000000
--- a/libnautilus-extensions/nautilus-image-with-background.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-image-with-background.h - A NautilusImage that uses NautilusBackground.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_IMAGE_BACKGROUND_H
-#define NAUTILUS_IMAGE_BACKGROUND_H
-
-#include <libnautilus-extensions/nautilus-image.h>
-
-BEGIN_GNOME_DECLS
-
-GtkWidget *nautilus_image_new_with_background (const char *file_name);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_IMAGE_BACKGROUND_H */
-
-
diff --git a/libnautilus-extensions/nautilus-image.c b/libnautilus-extensions/nautilus-image.c
deleted file mode 100644
index d1922d59d..000000000
--- a/libnautilus-extensions/nautilus-image.c
+++ /dev/null
@@ -1,1009 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-image.c - A widget to smoothly display images.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-image.h"
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-#include "nautilus-string.h"
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-debug-drawing.h"
-
-/* Arguments */
-enum
-{
-	ARG_0,
-	ARG_BACKGROUND_MODE,
-	ARG_IS_SMOOTH,
-	ARG_PIXBUF,
-	ARG_PIXBUF_OPACITY,
-	ARG_TILE_HEIGHT,
-	ARG_TILE_MODE_HORIZONTAL,
-	ARG_TILE_MODE_VERTICAL,
-	ARG_TILE_OPACITY,
-	ARG_TILE_PIXBUF,
-	ARG_TILE_WIDTH
-};
-
-/* Signals */
-typedef enum
-{
-	DRAW_BACKGROUND,
-	SET_IS_SMOOTH,
-	LAST_SIGNAL
-} ImageSignal;
-
-/* Signals */
-static guint image_signals[LAST_SIGNAL] = { 0 };
-
-/* Detail member struct */
-struct _NautilusImageDetails
-{
-	gboolean is_smooth;
-
-	/* Tile attributes */
-	GdkPixbuf *tile_pixbuf;
-	int tile_opacity;
-	int tile_width;
-	int tile_height;
-	NautilusSmoothTileMode tile_mode_vertical;
-	NautilusSmoothTileMode tile_mode_horizontal;
-
-	/* Pixbuf */
-	GdkPixbuf *pixbuf;
-	int pixbuf_opacity;
-
-	/* Background */
-	NautilusSmoothBackgroundMode background_mode;
-	guint32 solid_background_color;
-	gboolean never_smooth;
-};
-
-/* GtkObjectClass methods */
-static void               nautilus_image_initialize_class     (NautilusImageClass  *image_class);
-static void               nautilus_image_initialize           (NautilusImage       *image);
-static void               nautilus_image_destroy              (GtkObject           *object);
-static void               nautilus_image_set_arg              (GtkObject           *object,
-							       GtkArg              *arg,
-							       guint                arg_id);
-static void               nautilus_image_get_arg              (GtkObject           *object,
-							       GtkArg              *arg,
-							       guint                arg_id);
-/* GtkWidgetClass methods */
-static void               nautilus_image_size_request         (GtkWidget           *widget,
-							       GtkRequisition      *requisition);
-static int                nautilus_image_expose_event         (GtkWidget           *widget,
-							       GdkEventExpose      *event);
-
-/* NautilusImage signals */
-static void               nautilus_image_set_is_smooth_signal (GtkWidget           *widget,
-							       gboolean             is_smooth);
-
-/* Private NautilusImage methods */
-static NautilusDimensions image_get_pixbuf_dimensions         (const NautilusImage *image);
-static ArtIRect           image_get_pixbuf_bounds             (const NautilusImage *image);
-static NautilusDimensions image_get_tile_dimensions           (const NautilusImage *image);
-static gboolean           image_is_smooth                     (const NautilusImage *image);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusImage, nautilus_image, GTK_TYPE_MISC)
-
-/* Class init methods */
-static void
-nautilus_image_initialize_class (NautilusImageClass *image_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (image_class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (image_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_image_destroy;
-	object_class->set_arg = nautilus_image_set_arg;
-	object_class->get_arg = nautilus_image_get_arg;
-	
-	/* GtkWidgetClass */
-	widget_class->size_request = nautilus_image_size_request;
-	widget_class->expose_event = nautilus_image_expose_event;
-
-	/* NautilusImageClass */
-	image_class->set_is_smooth = nautilus_image_set_is_smooth_signal;
-	
-	/* Signals */
-	image_signals[DRAW_BACKGROUND] = gtk_signal_new ("draw_background",
-							 GTK_RUN_LAST,
-							 object_class->type,
-							 0,
-							 gtk_marshal_NONE__POINTER_POINTER,
-							 GTK_TYPE_NONE, 
-							 2,
-							 GTK_TYPE_POINTER,
-							 GTK_TYPE_POINTER);
-
-	image_signals[SET_IS_SMOOTH] = gtk_signal_new ("set_is_smooth",
-						       GTK_RUN_LAST,
-						       object_class->type,
-						       GTK_SIGNAL_OFFSET (NautilusImageClass, set_is_smooth),
-						       gtk_marshal_NONE__BOOL,
-						       GTK_TYPE_NONE, 
-						       1,
-						       GTK_TYPE_BOOL);
-	
-	gtk_object_class_add_signals (object_class, image_signals, LAST_SIGNAL);
-
-	/* Arguments */
-	gtk_object_add_arg_type ("NautilusImage::is_smooth",
-				 GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE,
-				 ARG_IS_SMOOTH);
-	gtk_object_add_arg_type ("NautilusImage::pixbuf",
-				 GTK_TYPE_POINTER,
-				 GTK_ARG_READWRITE,
-				 ARG_PIXBUF);
-	gtk_object_add_arg_type ("NautilusImage::pixbuf_opacity",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_PIXBUF_OPACITY);
-	gtk_object_add_arg_type ("NautilusImage::background_mode",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_BACKGROUND_MODE);
-	gtk_object_add_arg_type ("NautilusImage::tile_pixbuf",
-				 GTK_TYPE_POINTER,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_PIXBUF);
-	gtk_object_add_arg_type ("NautilusImage::tile_opacity",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_OPACITY);
-	gtk_object_add_arg_type ("NautilusImage::tile_width",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_WIDTH);
-	gtk_object_add_arg_type ("NautilusImage::tile_height",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_HEIGHT);
-	gtk_object_add_arg_type ("NautilusImage::tile_mode_vertical",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_MODE_VERTICAL);
-	gtk_object_add_arg_type ("NautilusImage::tile_mode_horizontal",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_MODE_HORIZONTAL);
-
-	/* Make this class inherit the same kind of theme stuff as GtkPixmap */
-	nautilus_gtk_class_name_make_like_existing_type ("NautilusImage", GTK_TYPE_PIXMAP);
-
-	/* Let the smooth widget machinery know that our class can be smooth */
-	nautilus_smooth_widget_register_type (NAUTILUS_TYPE_IMAGE);
-}
-
-void
-nautilus_image_initialize (NautilusImage *image)
-{
-	GTK_WIDGET_UNSET_FLAGS (image, GTK_CAN_FOCUS);
-	GTK_WIDGET_SET_FLAGS (image, GTK_NO_WINDOW);
-
-	image->details = g_new0 (NautilusImageDetails, 1);
-
-	image->details->pixbuf_opacity = NAUTILUS_OPACITY_FULLY_OPAQUE;
-	image->details->tile_opacity = NAUTILUS_OPACITY_FULLY_OPAQUE;
- 	image->details->tile_width = NAUTILUS_SMOOTH_TILE_EXTENT_FULL;
- 	image->details->tile_height = NAUTILUS_SMOOTH_TILE_EXTENT_FULL;
-	image->details->tile_mode_vertical = NAUTILUS_SMOOTH_TILE_SELF;
-	image->details->tile_mode_horizontal = NAUTILUS_SMOOTH_TILE_SELF;
-	image->details->background_mode = NAUTILUS_SMOOTH_BACKGROUND_GTK;
-
-	nautilus_smooth_widget_register (GTK_WIDGET (image));
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_image_destroy (GtkObject *object)
-{
- 	NautilusImage *image;
-	
-	g_return_if_fail (NAUTILUS_IS_IMAGE (object));
-
-	image = NAUTILUS_IMAGE (object);
-
-	nautilus_gdk_pixbuf_unref_if_not_null (image->details->tile_pixbuf);
-	image->details->tile_pixbuf = NULL;
-
-	g_free (image->details);
-
-	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-static void
-nautilus_image_set_arg (GtkObject *object,
-			GtkArg *arg,
-			guint arg_id)
-{
-	NautilusImage *image;
-	
-	g_return_if_fail (NAUTILUS_IS_IMAGE (object));
-
- 	image = NAUTILUS_IMAGE (object);
-
- 	switch (arg_id)
-	{
-	case ARG_IS_SMOOTH:
-		nautilus_image_set_is_smooth (image, GTK_VALUE_BOOL (*arg));
-		break;
-
-	case ARG_PIXBUF_OPACITY:
-		nautilus_image_set_pixbuf_opacity (image, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_BACKGROUND_MODE:
-		nautilus_image_set_background_mode (image, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_PIXBUF:
-		nautilus_image_set_pixbuf (image, (GdkPixbuf *) GTK_VALUE_POINTER (*arg));
-		break;
-
-	case ARG_TILE_OPACITY:
-		nautilus_image_set_tile_opacity (image, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_TILE_PIXBUF:
-		nautilus_image_set_tile_pixbuf (image, (GdkPixbuf *) GTK_VALUE_POINTER (*arg));
-		break;
-		
-	case ARG_TILE_WIDTH:
-		nautilus_image_set_tile_width (image, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_TILE_HEIGHT:
-		nautilus_image_set_tile_height (image, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_TILE_MODE_VERTICAL:
-		nautilus_image_set_tile_mode_vertical (image, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_TILE_MODE_HORIZONTAL:
-		nautilus_image_set_tile_mode_horizontal (image, GTK_VALUE_UINT (*arg));
-		break;
-
- 	default:
-		g_assert_not_reached ();
-	}
-}
-
-static void
-nautilus_image_get_arg (GtkObject *object,
-			GtkArg *arg,
-			guint arg_id)
-{
-	NautilusImage *image;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE (object));
-	
-	image = NAUTILUS_IMAGE (object);
-
- 	switch (arg_id)
-	{
-	case ARG_IS_SMOOTH:
-		GTK_VALUE_BOOL (*arg) = nautilus_image_get_is_smooth (image);
-		break;
-		
-	case ARG_PIXBUF_OPACITY:
-		GTK_VALUE_INT (*arg) = nautilus_image_get_pixbuf_opacity (image);
-		break;
-		
-	case ARG_BACKGROUND_MODE:
-		GTK_VALUE_UINT (*arg) = nautilus_image_get_background_mode (image);
-		break;
-		
-	case ARG_PIXBUF:
-		GTK_VALUE_POINTER (*arg) = nautilus_image_get_pixbuf (image);
-		break;
-
-	case ARG_TILE_OPACITY:
-		GTK_VALUE_INT (*arg) = nautilus_image_get_tile_opacity (image);
-		break;
-		
-	case ARG_TILE_PIXBUF:
-		GTK_VALUE_POINTER (*arg) = nautilus_image_get_tile_pixbuf (image);
-		break;
-
-	case ARG_TILE_WIDTH:
-		GTK_VALUE_INT (*arg) = nautilus_image_get_tile_width (image);
-		break;
-
-	case ARG_TILE_HEIGHT:
-		GTK_VALUE_INT (*arg) = nautilus_image_get_tile_height (image);
-		break;
-
-	case ARG_TILE_MODE_VERTICAL:
-		GTK_VALUE_UINT (*arg) = nautilus_image_get_tile_mode_vertical (image);
-		break;
-
-	case ARG_TILE_MODE_HORIZONTAL:
-		GTK_VALUE_UINT (*arg) = nautilus_image_get_tile_mode_horizontal (image);
-		break;
-
- 	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* GtkWidgetClass methods */
-static void
-nautilus_image_size_request (GtkWidget *widget,
-			     GtkRequisition *requisition)
-{
-	NautilusImage *image;
-
-	NautilusDimensions pixbuf_dimensions;
-	NautilusDimensions tile_dimensions;
-	NautilusDimensions preferred_dimensions;
-	
-	g_return_if_fail (NAUTILUS_IS_IMAGE (widget));
-	g_return_if_fail (requisition != NULL);
-	
- 	image = NAUTILUS_IMAGE (widget);
-	
-	pixbuf_dimensions = image_get_pixbuf_dimensions (image);
-	tile_dimensions = image_get_tile_dimensions (image);
-	preferred_dimensions = nautilus_smooth_widget_get_preferred_dimensions (widget,
-										&pixbuf_dimensions,
-										&tile_dimensions,
-										image->details->tile_width,
-										image->details->tile_height);
-   	requisition->width = preferred_dimensions.width;
-   	requisition->height = preferred_dimensions.height;
-}
-
-static void
-image_paint_pixbuf_callback (GtkWidget *widget,
-			     GdkDrawable *destination_drawable,
-			     GdkGC *gc,
-			     int source_x,
-			     int source_y,
-			     const ArtIRect *area,
-			     gpointer callback_data)
-{
-	NautilusImage *image;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (destination_drawable != NULL);
-	g_return_if_fail (gc != NULL);
-	g_return_if_fail (area != NULL && !art_irect_empty (area));
-
-	image = NAUTILUS_IMAGE (widget);
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (image->details->pixbuf));
-	
-	nautilus_gdk_pixbuf_draw_to_drawable (image->details->pixbuf,
-					      destination_drawable,
-					      gc,
-					      source_x,
-					      source_y,
-					      area,
-					      GDK_RGB_DITHER_NONE,
-					      GDK_PIXBUF_ALPHA_BILEVEL,
-					      NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
-}
-
-static void
-image_composite_pixbuf_callback (GtkWidget *widget,
-				 GdkPixbuf *destination_pixbuf,
-				 int source_x,
-				 int source_y,
-				 const ArtIRect *area,
-				 int opacity,
-				 gpointer callback_data)
-{
-	NautilusImage *image;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (destination_pixbuf != NULL);
-	g_return_if_fail (area != NULL && !art_irect_empty (area));
-
-	image = NAUTILUS_IMAGE (widget);
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (image->details->pixbuf));
-
-	nautilus_gdk_pixbuf_draw_to_pixbuf_alpha (image->details->pixbuf,
-						  destination_pixbuf,
-						  source_x,
-						  source_y,
-						  area,
-						  opacity,
-						  GDK_INTERP_BILINEAR);
-}	
-
-static int
-nautilus_image_expose_event (GtkWidget *widget,
-			     GdkEventExpose *event)
-{
- 	NautilusImage *image;
-	ArtIRect dirty_area;
-	ArtIRect screen_dirty_area;
-
-	ArtIRect pixbuf_bounds;
-	ArtIRect tile_bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (widget), TRUE);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
-	g_return_val_if_fail (event != NULL, TRUE);
-	g_return_val_if_fail (event->window == widget->window, TRUE);
-	
- 	image = NAUTILUS_IMAGE (widget);
-
-	pixbuf_bounds = image_get_pixbuf_bounds (image);
-	tile_bounds = nautilus_smooth_widget_get_tile_bounds (widget,
-							      image->details->tile_pixbuf,
-							      image->details->tile_width,
-							      image->details->tile_height);
-	
-	/* Check for the dumb case when theres nothing to do */
-	if (image->details->pixbuf == NULL && image->details->tile_pixbuf == NULL) {
-		return TRUE;
-	}
-
-	/* Clip the dirty area to the screen */
-	dirty_area = nautilus_gdk_rectangle_to_art_irect (&event->area);
-	screen_dirty_area = nautilus_gdk_window_clip_dirty_area_to_screen (event->window,
-										 &dirty_area);
-	/* Nothing to do */
-	if (art_irect_empty (&screen_dirty_area)) {
-		return TRUE;
-	}
-
-	/* Paint ourselves */
-	nautilus_smooth_widget_paint (widget,
-				      widget->style->white_gc,
-				      image_is_smooth (image),
-				      image->details->background_mode,
-				      image->details->solid_background_color,
-				      image->details->tile_pixbuf,
-				      &tile_bounds,
-				      image->details->tile_opacity,
-				      image->details->tile_mode_vertical,
-				      image->details->tile_mode_horizontal,
-				      &pixbuf_bounds,
-				      image->details->pixbuf_opacity,
-				      &screen_dirty_area,
-				      image_paint_pixbuf_callback,
-				      image_composite_pixbuf_callback,
-				      NULL);
-
-	return TRUE;
-}
-
-/* NautilusImage signals */
-static void
-nautilus_image_set_is_smooth_signal (GtkWidget *widget,
-				     gboolean is_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (widget));
-
-	nautilus_image_set_is_smooth (NAUTILUS_IMAGE (widget), is_smooth);
-}
-
-/* Private NautilusImage methods */
-static NautilusDimensions
-image_get_pixbuf_dimensions (const NautilusImage *image)
-{
-	NautilusDimensions pixbuf_dimensions;
-
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), NAUTILUS_DIMENSIONS_EMPTY);
-
-	if (!image->details->pixbuf) {
-		return NAUTILUS_DIMENSIONS_EMPTY;
-	}
-
-	pixbuf_dimensions.width = gdk_pixbuf_get_width (image->details->pixbuf);
-	pixbuf_dimensions.height = gdk_pixbuf_get_height (image->details->pixbuf);
-
-	return pixbuf_dimensions;
-}
-
-static ArtIRect
-image_get_pixbuf_bounds (const NautilusImage *image)
-{
-	NautilusDimensions pixbuf_dimensions;
-	ArtIRect pixbuf_bounds;
-	ArtIRect bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), NAUTILUS_ART_IRECT_EMPTY);
-
-	pixbuf_dimensions = image_get_pixbuf_dimensions (image);
-
-	if (nautilus_dimensions_empty (&pixbuf_dimensions)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-	
-	bounds = nautilus_gtk_widget_get_bounds (GTK_WIDGET (image));
-	
-	pixbuf_bounds = nautilus_art_irect_align (&bounds,
-						  pixbuf_dimensions.width,
-						  pixbuf_dimensions.height,
-						  GTK_MISC (image)->xalign,
-						  GTK_MISC (image)->yalign);
-
-	return pixbuf_bounds;
-}
-
-static NautilusDimensions
-image_get_tile_dimensions (const NautilusImage *image)
-{
-	NautilusDimensions tile_dimensions;
-
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), NAUTILUS_DIMENSIONS_EMPTY);
-
-	if (!image->details->tile_pixbuf) {
-		return NAUTILUS_DIMENSIONS_EMPTY;
-	}
-	
-	tile_dimensions.width = gdk_pixbuf_get_width (image->details->tile_pixbuf);
-	tile_dimensions.height = gdk_pixbuf_get_height (image->details->tile_pixbuf);
-
-	return tile_dimensions;
-}
-
-gboolean
-image_is_smooth (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), FALSE);
-
-	return !image->details->never_smooth && image->details->is_smooth;
-}
-
-/* Public NautilusImage methods */
-GtkWidget*
-nautilus_image_new (const char *file_name)
-{
-	NautilusImage *image;
-
-	image = NAUTILUS_IMAGE (gtk_widget_new (nautilus_image_get_type (), NULL));
-	
-	if (file_name != NULL) {
-		nautilus_image_set_pixbuf_from_file_name (image, file_name);
-	}
-
-	return GTK_WIDGET (image);
-}
-
-void
-nautilus_image_set_is_smooth (NautilusImage *image,
-			      gboolean is_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-
-	if (image->details->never_smooth) {
-		return;
-	}
-
-	if (image->details->is_smooth == is_smooth) {
-		return;
-	}
-
-	image->details->is_smooth = is_smooth;
-
-	/* We call queue_resize() instead queue_draw() because
-	 * we want the widget's background to be cleared of 
-	 * the previous pixbuf, even though the geometry of 
-	 * the image does not change.
-	 */ 
-	gtk_widget_queue_resize (GTK_WIDGET (image));
-}
-
-gboolean
-nautilus_image_get_is_smooth (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), FALSE);
-
-	return image_is_smooth (image);
-}
-
-/**
- * nautilus_image_set_tile_pixbuf:
- *
- * @image: A NautilusImage
- * @pixbuf:          The new tile pixbuf
- *
- * Change the tile pixbuf.  A 'pixbuf' value of NULL, means dont use a
- * tile pixbuf - this is the default behavior for the widget.
- */
-void
-nautilus_image_set_tile_pixbuf (NautilusImage *image,
-				GdkPixbuf *pixbuf)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	
-	if (pixbuf != image->details->tile_pixbuf) {
-		nautilus_gdk_pixbuf_unref_if_not_null (image->details->tile_pixbuf);
-		nautilus_gdk_pixbuf_ref_if_not_null (pixbuf);
-		
-		image->details->tile_pixbuf = pixbuf;
-
-		gtk_widget_queue_draw (GTK_WIDGET (image));
-	}
-}
-
-/**
- * nautilus_image_get_tile_pixbuf:
- *
- * @image: A NautilusImage
- *
- * Return value: A reference to the tile_pixbuf.  Needs to be unreferenced with 
- * gdk_pixbuf_unref()
- */
-GdkPixbuf*
-nautilus_image_get_tile_pixbuf (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), NULL);
-
-	nautilus_gdk_pixbuf_ref_if_not_null (image->details->tile_pixbuf);
-	
-	return image->details->tile_pixbuf;
-}
-
-void
-nautilus_image_set_pixbuf (NautilusImage *image,
-			   GdkPixbuf *pixbuf)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-
-	if (pixbuf != image->details->pixbuf) {
-		nautilus_gdk_pixbuf_unref_if_not_null (image->details->pixbuf);
-		nautilus_gdk_pixbuf_ref_if_not_null (pixbuf);
-		image->details->pixbuf = pixbuf;
-		gtk_widget_queue_resize (GTK_WIDGET (image));
-	}
-}
-
-void
-nautilus_image_set_pixbuf_from_file_name (NautilusImage *image,
-					  const char *file_name)
-{
-	GdkPixbuf *pixbuf;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	g_return_if_fail (file_name != NULL);
-
-	pixbuf = gdk_pixbuf_new_from_file (file_name);			
-	
-	if (pixbuf != NULL) {
-		nautilus_image_set_pixbuf (image, pixbuf);	
-		gdk_pixbuf_unref (pixbuf);
-	}
-}
-
-GdkPixbuf*
-nautilus_image_get_pixbuf (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), NULL);
-	
-	nautilus_gdk_pixbuf_ref_if_not_null (image->details->pixbuf);
-	
-	return image->details->pixbuf;
-}
-
-void
-nautilus_image_set_pixbuf_opacity (NautilusImage *image,
-				   int pixbuf_opacity)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	g_return_if_fail (pixbuf_opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (pixbuf_opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	if (image->details->pixbuf_opacity == pixbuf_opacity) {
-		return;
-	}
-
-	image->details->pixbuf_opacity = pixbuf_opacity;
-
-	gtk_widget_queue_draw (GTK_WIDGET (image));
-}
-
-int
-nautilus_image_get_pixbuf_opacity (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	return image->details->pixbuf_opacity;
-}
-
-void
-nautilus_image_set_tile_opacity (NautilusImage *image,
-				 int tile_opacity)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	g_return_if_fail (tile_opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (tile_opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	if (image->details->tile_opacity == tile_opacity) {
-		return;
-	}
-
-	image->details->tile_opacity = tile_opacity;
-
-	gtk_widget_queue_draw (GTK_WIDGET (image));
-}
-
-int
-nautilus_image_get_tile_opacity (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	return image->details->tile_opacity;
-}
-
-void
-nautilus_image_set_tile_width (NautilusImage *image,
-			       int tile_width)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	g_return_if_fail (tile_width >= NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP);
-	
-	if (image->details->tile_width == tile_width) {
-		return;
-	}
-
-	image->details->tile_width = tile_width;
-
-	gtk_widget_queue_resize (GTK_WIDGET (image));
-}
-
-/**
- * nautilus_image_get_tile_width:
- *
- * @image: A NautilusImage
- *
- * Return value: The tile width.
- */
-int
-nautilus_image_get_tile_width (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), 0);
-
-	return image->details->tile_width;
-}
-
-void
-nautilus_image_set_tile_height (NautilusImage *image,
-				int tile_height)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	g_return_if_fail (tile_height >= NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP);
-	
-	if (image->details->tile_height == tile_height) {
-		return;
-	}
-
-	image->details->tile_height = tile_height;
-
-	gtk_widget_queue_resize (GTK_WIDGET (image));
-}
-
-/**
- * nautilus_image_get_tile_height:
- *
- * @image: A NautilusImage
- *
- * Return value: The tile height.
- */
-int
-nautilus_image_get_tile_height (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), 0);
-
-	return image->details->tile_height;
-}
-
-void
-nautilus_image_set_tile_mode_vertical (NautilusImage *image,
-				       NautilusSmoothTileMode tile_mode_vertical)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	g_return_if_fail (tile_mode_vertical >= NAUTILUS_SMOOTH_TILE_SELF);
-	g_return_if_fail (tile_mode_vertical <= NAUTILUS_SMOOTH_TILE_ANCESTOR);
-
-	if (image->details->tile_mode_vertical == tile_mode_vertical) {
-		return;
-	}
-
-	image->details->tile_mode_vertical = tile_mode_vertical;
-
-	gtk_widget_queue_draw (GTK_WIDGET (image));
-}
-
-NautilusSmoothTileMode
-nautilus_image_get_tile_mode_vertical (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), 0);
-	
-	return image->details->tile_mode_vertical;
-}
-
-void
-nautilus_image_set_tile_mode_horizontal (NautilusImage *image,
-					 NautilusSmoothTileMode tile_mode_horizontal)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	g_return_if_fail (tile_mode_horizontal >= NAUTILUS_SMOOTH_TILE_SELF);
-	g_return_if_fail (tile_mode_horizontal <= NAUTILUS_SMOOTH_TILE_ANCESTOR);
-
-	if (image->details->tile_mode_horizontal == tile_mode_horizontal) {
-		return;
-	}
-
-	image->details->tile_mode_horizontal = tile_mode_horizontal;
-
-	gtk_widget_queue_draw (GTK_WIDGET (image));
-}
-
-NautilusSmoothTileMode
-nautilus_image_get_tile_mode_horizontal (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), 0);
-	
-	return image->details->tile_mode_horizontal;
-}
-
-void
-nautilus_image_set_tile_pixbuf_from_file_name (NautilusImage *image,
-					       const char *tile_file_name)
-{
-	GdkPixbuf *tile_pixbuf;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	g_return_if_fail (tile_file_name != NULL);
-
-	tile_pixbuf = gdk_pixbuf_new_from_file (tile_file_name);
-	
-	if (tile_pixbuf != NULL) {
-		nautilus_image_set_tile_pixbuf (image, tile_pixbuf);
-		gdk_pixbuf_unref (tile_pixbuf);
-	}
-}
-
-void
-nautilus_image_set_background_mode (NautilusImage *image,
-				    NautilusSmoothBackgroundMode background_mode)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	g_return_if_fail (background_mode >= NAUTILUS_SMOOTH_BACKGROUND_GTK);
-	g_return_if_fail (background_mode <= NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-
-	if (image->details->background_mode == background_mode) {
-		return;
-	}
-
-	image->details->background_mode = background_mode;
-
-	gtk_widget_queue_draw (GTK_WIDGET (image));
-}
-
-NautilusSmoothBackgroundMode
-nautilus_image_get_background_mode (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), 0);
-	
-	return image->details->background_mode;
-}
-
-void
-nautilus_image_set_solid_background_color (NautilusImage *image,
-					   guint32 solid_background_color)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	
-	if (image->details->solid_background_color == solid_background_color) {
-		return;
-	}
-
-	image->details->solid_background_color = solid_background_color;
-	
-	gtk_widget_queue_draw (GTK_WIDGET (image));
-}
-
-guint32
-nautilus_image_get_solid_background_color (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), 0);
-	
-	return image->details->solid_background_color;
-}
-
-/**
- * nautilus_image_new_solid:
- *
- * @pixbuf: A GdkPixbuf or NULL.
- * @x_alignment: Horizontal alignment.
- * @y_alignment: Vertical alignment.
- * @x_padding: Horizontal padding.
- * @y_padding: Vertical padding.
- * @background_color: Background color.
- * @tile_pixbuf: A GdkPixbuf or NULL.
- *
- * Create an image with a solid background.
- *
- * Return value: The newly allocated NautilusImage with the
- * given attributes.
- */
-GtkWidget *
-nautilus_image_new_solid (GdkPixbuf *pixbuf,
-			  float x_alignment,
-			  float y_alignment,
-			  int x_padding,
-			  int y_padding,
-			  guint32 background_color,
-			  GdkPixbuf *tile_pixbuf)
-{
-	NautilusImage *image;
-
- 	image = NAUTILUS_IMAGE (nautilus_image_new (NULL));
-	
-	if (pixbuf != NULL) {
-		nautilus_image_set_pixbuf (image, pixbuf);
-	}
-
-	nautilus_image_set_background_mode (image, NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	nautilus_image_set_solid_background_color (image, background_color);
-
-	gtk_misc_set_padding (GTK_MISC (image), x_padding, y_padding);
-	gtk_misc_set_alignment (GTK_MISC (image), x_alignment, y_alignment);
-	
-	if (tile_pixbuf != NULL) {
-		nautilus_image_set_tile_pixbuf (image, tile_pixbuf);
-	}
-	
-	return GTK_WIDGET (image);
-}
-
-
-/**
- * nautilus_image_set_never_smooth
- *
- * @image: A NautilusImage.
- * @never_smooth: A boolean value indicating whether the image can NEVER be smooth.
- *
- * Force an image to never be smooth.  Calls to nautilus_image_set_is_smooth () will
- * thus be ignored.  This is useful if you want to use a NautilusImage in a situation.
- */
-void
-nautilus_image_set_never_smooth (NautilusImage *image,
-				 gboolean never_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-
-	image->details->never_smooth = never_smooth;
-	gtk_widget_queue_resize (GTK_WIDGET (image));
-}
-
diff --git a/libnautilus-extensions/nautilus-image.h b/libnautilus-extensions/nautilus-image.h
deleted file mode 100644
index c5ffca43c..000000000
--- a/libnautilus-extensions/nautilus-image.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-image.h - A widget to smoothly display images.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_IMAGE_H
-#define NAUTILUS_IMAGE_H
-
-#include <gtk/gtkmisc.h>
-#include <libgnome/gnome-defs.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libart_lgpl/art_rect.h>
-#include <libnautilus-extensions/nautilus-smooth-widget.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_IMAGE            (nautilus_image_get_type ())
-#define NAUTILUS_IMAGE(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_IMAGE, NautilusImage))
-#define NAUTILUS_IMAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_IMAGE, NautilusImageClass))
-#define NAUTILUS_IS_IMAGE(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_IMAGE))
-#define NAUTILUS_IS_IMAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_IMAGE))
-
-typedef struct _NautilusImage	       NautilusImage;
-typedef struct _NautilusImageClass     NautilusImageClass;
-typedef struct _NautilusImageDetails   NautilusImageDetails;
-
-struct _NautilusImage
-{
-	/* Superclass */
-	GtkMisc misc;
-
-	/* Private things */
-	NautilusImageDetails *details;
-};
-
-struct _NautilusImageClass
-{
-	GtkMiscClass parent_class;
-
-	NautilusSmoothWidgetDrawBackground draw_background;
-	NautilusSmoothWidgetSetIsSmooth set_is_smooth;
-};
-
-GtkType                      nautilus_image_get_type                       (void);
-GtkWidget *                  nautilus_image_new                            (const char                   *file_name);
-GtkWidget *                  nautilus_image_new_solid                      (GdkPixbuf                    *pixbuf,
-									    float                         xalign,
-									    float                         yalign,
-									    int                           xpadding,
-									    int                           ypadding,
-									    guint32                       background_color,
-									    GdkPixbuf                    *tile_pixbuf);
-void                         nautilus_image_set_is_smooth                  (NautilusImage                *image,
-									    gboolean                      is_smooth);
-gboolean                     nautilus_image_get_is_smooth                  (const NautilusImage          *image);
-void                         nautilus_image_set_tile_pixbuf                (NautilusImage                *image,
-									    GdkPixbuf                    *pixbuf);
-void                         nautilus_image_set_tile_width                 (NautilusImage                *image,
-									    int                           tile_width);
-int                          nautilus_image_get_tile_width                 (const NautilusImage          *image);
-void                         nautilus_image_set_tile_height                (NautilusImage                *image,
-									    int                           tile_height);
-int                          nautilus_image_get_tile_height                (const NautilusImage          *image);
-void                         nautilus_image_set_tile_pixbuf_from_file_name (NautilusImage                *image,
-									    const char                   *tile_file_name);
-GdkPixbuf*                   nautilus_image_get_tile_pixbuf                (const NautilusImage          *image);
-void                         nautilus_image_set_tile_opacity               (NautilusImage                *image,
-									    int                           tile_opacity);
-int                          nautilus_image_get_tile_opacity               (const NautilusImage          *image);
-void                         nautilus_image_set_tile_mode_vertical         (NautilusImage                *image,
-									    NautilusSmoothTileMode        horizontal_tile_mode);
-NautilusSmoothTileMode       nautilus_image_get_tile_mode_vertical         (const NautilusImage          *image);
-void                         nautilus_image_set_tile_mode_horizontal       (NautilusImage                *image,
-									    NautilusSmoothTileMode        horizontal_tile_mode);
-NautilusSmoothTileMode       nautilus_image_get_tile_mode_horizontal       (const NautilusImage          *image);
-void                         nautilus_image_set_pixbuf                     (NautilusImage                *image,
-									    GdkPixbuf                    *pixbuf);
-void                         nautilus_image_set_pixbuf_from_file_name      (NautilusImage                *image,
-									    const char                   *file_name);
-GdkPixbuf*                   nautilus_image_get_pixbuf                     (const NautilusImage          *image);
-void                         nautilus_image_set_pixbuf_opacity             (NautilusImage                *image,
-									    int                           pixbuf_opacity);
-int                          nautilus_image_get_pixbuf_opacity             (const NautilusImage          *image);
-void                         nautilus_image_set_background_mode            (NautilusImage                *image,
-									    NautilusSmoothBackgroundMode  background_mode);
-NautilusSmoothBackgroundMode nautilus_image_get_background_mode            (const NautilusImage          *image);
-void                         nautilus_image_set_solid_background_color     (NautilusImage                *image,
-									    guint32                       solid_background_color);
-guint32                      nautilus_image_get_solid_background_color     (const NautilusImage          *image);
-void                         nautilus_image_set_never_smooth               (NautilusImage                *image,
-									    gboolean                      never_smooth);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_IMAGE_H */
-
-
diff --git a/libnautilus-extensions/nautilus-keep-last-vertical-box.c b/libnautilus-extensions/nautilus-keep-last-vertical-box.c
index c773fc1c8..a9036895b 100644
--- a/libnautilus-extensions/nautilus-keep-last-vertical-box.c
+++ b/libnautilus-extensions/nautilus-keep-last-vertical-box.c
@@ -26,14 +26,14 @@
 #include <config.h>
 #include "nautilus-keep-last-vertical-box.h"
 
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 static void     nautilus_keep_last_vertical_box_initialize_class  (NautilusKeepLastVerticalBoxClass *class);
 static void     nautilus_keep_last_vertical_box_initialize        (NautilusKeepLastVerticalBox      *box);
 static void	nautilus_keep_last_vertical_box_size_allocate 	  (GtkWidget 			    *widget, 
 								   GtkAllocation 		    *allocation);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusKeepLastVerticalBox, nautilus_keep_last_vertical_box, GTK_TYPE_VBOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusKeepLastVerticalBox, nautilus_keep_last_vertical_box, GTK_TYPE_VBOX)
 
 /* Standard class initialization function */
 static void
@@ -96,7 +96,7 @@ nautilus_keep_last_vertical_box_size_allocate (GtkWidget *widget,
 	g_return_if_fail (NAUTILUS_IS_KEEP_LAST_VERTICAL_BOX (widget));
 	g_return_if_fail (allocation != NULL);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
 
 	box = GTK_BOX (widget);
 	children = g_list_last (box->children);
diff --git a/libnautilus-extensions/nautilus-label-with-background.c b/libnautilus-extensions/nautilus-label-with-background.c
deleted file mode 100644
index 2e4820c76..000000000
--- a/libnautilus-extensions/nautilus-label-with-background.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-label-with-background.c - A NautilusLabel that uses NautilusBackground.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include <gtk/gtksignal.h>
-
-#include "nautilus-label-with-background.h"
-#include "nautilus-background.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-
-static void
-draw_background_callback (GtkWidget *widget,
-			  GdkPixbuf *buffer,
-			  const ArtIRect *area,
-			  gpointer callback_data)
-{
-	GtkWidget *background_ancestor;
-	NautilusBackground *background;
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (buffer));
-	g_return_if_fail (area != NULL);
-
-	background_ancestor = nautilus_gtk_widget_find_background_ancestor (widget);
-	g_return_if_fail (GTK_IS_WIDGET (background_ancestor));
-
-	background = nautilus_get_widget_background (background_ancestor);
-	g_return_if_fail (NAUTILUS_IS_BACKGROUND (background));
-	
-	nautilus_background_draw_to_pixbuf (background,
-					    buffer,
-					    area->x0,
-					    area->y0,
-					    area->x1 - area->x0,
-					    area->y1 - area->y0,
-					    background_ancestor->allocation.width,
-					    background_ancestor->allocation.height);
-}
-
-GtkWidget *
-nautilus_label_new_with_background (const char *text)
-{
-	GtkWidget *label;
-	
-	label = nautilus_label_new (text);
-
-	nautilus_label_set_background_mode (NAUTILUS_LABEL (label),
-					    NAUTILUS_SMOOTH_BACKGROUND_CALLBACK);
-	
-	gtk_signal_connect_while_alive (GTK_OBJECT (label),
-					"draw_background",
-					GTK_SIGNAL_FUNC (draw_background_callback),
-					NULL,
-					GTK_OBJECT (label));
-
-	return label;
-}
diff --git a/libnautilus-extensions/nautilus-label-with-background.h b/libnautilus-extensions/nautilus-label-with-background.h
deleted file mode 100644
index ac273a574..000000000
--- a/libnautilus-extensions/nautilus-label-with-background.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-label-with-background.h - A NautilusLabel that uses NautilusBackground.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_LABEL_BACKGROUND_H
-#define NAUTILUS_LABEL_BACKGROUND_H
-
-#include <libnautilus-extensions/nautilus-label.h>
-
-BEGIN_GNOME_DECLS
-
-GtkWidget *nautilus_label_new_with_background (const char *text);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_LABEL_BACKGROUND_H */
-
-
diff --git a/libnautilus-extensions/nautilus-label.c b/libnautilus-extensions/nautilus-label.c
deleted file mode 100644
index a5f5575ea..000000000
--- a/libnautilus-extensions/nautilus-label.c
+++ /dev/null
@@ -1,1971 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-label.c - A widget to display a anti aliased text.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-label.h"
-
-#include <libgnome/gnome-i18n.h>
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-#include "nautilus-string.h"
-#include "nautilus-smooth-text-layout.h"
-#include "nautilus-scalable-font-private.h"
-#include "nautilus-debug-drawing.h"
-#include <stdlib.h>
-
-/* These are arbitrary constants to catch insane values */
-#define MIN_SMOOTH_FONT_SIZE 5
-#define MAX_SMOOTH_FONT_SIZE 64
-
-#define DEFAULT_FONT_SIZE 14
-#define LINE_WRAP_SEPARATORS _(" -_,;.?/&")
-#define LINE_OFFSET 2
-
-#define SMOOTH_FONT_MULTIPLIER 1.3
-
-/* This magic string is copied from GtkLabel.  It lives there unlocalized as well. */
-#define DEFAULT_LINE_WRAP_WIDTH_TEXT "This is a good enough length for any line to have."
-
-/* Arguments */
-enum
-{
-	ARG_0,
-	
-	/* Deal with the GtkLabel arguments as well */
-	ARG_LABEL,
-	ARG_WRAP,
-	ARG_JUSTIFY,
-
-	ARG_BACKGROUND_MODE,
-	ARG_IS_SMOOTH,
-	ARG_TEXT_OPACITY,
-	ARG_SMOOTH_FONT,
-	ARG_SMOOTH_FONT_SIZE,
-	ARG_SMOOTH_TEXT_COLOR,
-	ARG_SMOOTH_DROP_SHADOW_OFFSET,
-	ARG_SMOOTH_DROP_SHADOW_COLOR,
-	ARG_SMOOTH_LINE_WRAP_WIDTH,
-	ARG_ADJUST_WRAP_ON_RESIZE,
-
-	ARG_TILE_HEIGHT,
-	ARG_TILE_MODE_HORIZONTAL,
-	ARG_TILE_MODE_VERTICAL,
-	ARG_TILE_OPACITY,
-	ARG_TILE_PIXBUF,
-	ARG_TILE_WIDTH
-};
-
-/* Signals */
-typedef enum
-{
-	DRAW_BACKGROUND,
-	SET_IS_SMOOTH,
-	LAST_SIGNAL
-} LabelSignal;
-
-/* Signals */
-static guint label_signals[LAST_SIGNAL] = { 0 };
-
-/* Detail member struct */
-struct _NautilusLabelDetails
-{
-	gboolean is_smooth;
-
-	/* Tile attributes */
-	GdkPixbuf *tile_pixbuf;
-	int tile_opacity;
-	int tile_width;
-	int tile_height;
-	NautilusSmoothTileMode tile_mode_vertical;
-	NautilusSmoothTileMode tile_mode_horizontal;
-
- 	/* Smooth attributes */
- 	NautilusScalableFont *smooth_font;
- 	int smooth_font_size;
-	guint32 smooth_text_color;
-	gint smooth_drop_shadow_offset;
-	guint32 smooth_drop_shadow_color;
- 	int smooth_line_wrap_width;
-	gboolean adjust_wrap_on_resize;
-
-	/* Text */
-  	int text_opacity;
-
-	/* Background */
-	NautilusSmoothBackgroundMode background_mode;
-	guint32 solid_background_color;
-
-	GdkPixbuf *solid_cache_pixbuf;
-	gboolean never_smooth;
-
-	NautilusSmoothTextLayout *smooth_text_layout;
-};
-
-/* GtkObjectClass methods */
-static void               nautilus_label_initialize_class     (NautilusLabelClass  *label_class);
-static void               nautilus_label_initialize           (NautilusLabel       *label);
-static void               nautilus_label_destroy              (GtkObject           *object);
-static void               nautilus_label_set_arg              (GtkObject           *object,
-							       GtkArg              *arg,
-							       guint                arg_id);
-static void               nautilus_label_get_arg              (GtkObject           *object,
-							       GtkArg              *arg,
-							       guint                arg_id);
-
-/* GtkWidgetClass methods */
-static void               nautilus_label_size_request         (GtkWidget           *widget,
-							       GtkRequisition      *requisition);
-static void               nautilus_label_size_allocate        (GtkWidget           *widget,
-							       GtkAllocation       *allocation);
-static int                nautilus_label_expose_event         (GtkWidget           *widget,
-							       GdkEventExpose      *event);
-
-/* NautilusLabel signals */
-static void               nautilus_label_set_is_smooth_signal (GtkWidget           *widget,
-							       gboolean             is_smooth);
-
-/* Private NautilusLabel things */
-const char *              label_peek_text                     (const NautilusLabel *label);
-static ArtIRect           label_get_text_bounds               (const NautilusLabel *label);
-static NautilusDimensions label_get_text_dimensions           (const NautilusLabel *label);
-static NautilusDimensions label_get_tile_dimensions           (const NautilusLabel *label);
-static int                label_get_default_line_wrap_width   (const NautilusLabel *label);
-static void               label_solid_cache_pixbuf_clear      (NautilusLabel       *label);
-static gboolean           label_can_cache_contents            (const NautilusLabel *label);
-static gboolean           label_is_smooth                     (const NautilusLabel *label);
-static void               label_smooth_text_ensure            (const NautilusLabel *label);
-static void               label_smooth_text_clear             (NautilusLabel       *label);
-static NautilusDimensions label_get_content_dimensions        (const NautilusLabel *label);
-static ArtIRect           label_get_content_bounds            (const NautilusLabel *label);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusLabel, nautilus_label, GTK_TYPE_LABEL)
-
-/* Class init methods */
-static void
-nautilus_label_initialize_class (NautilusLabelClass *label_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (label_class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (label_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_label_destroy;
-	object_class->set_arg = nautilus_label_set_arg;
-	object_class->get_arg = nautilus_label_get_arg;
-	
-	/* GtkWidgetClass */
-	widget_class->size_request = nautilus_label_size_request;
-	widget_class->size_allocate = nautilus_label_size_allocate;
-	widget_class->expose_event = nautilus_label_expose_event;
-
-	/* NautilusLabelClass */
-	label_class->set_is_smooth = nautilus_label_set_is_smooth_signal;
-
-	/* Signals */
-	label_signals[DRAW_BACKGROUND] = gtk_signal_new ("draw_background",
-							 GTK_RUN_LAST,
-							 object_class->type,
-							 0,
-							 gtk_marshal_NONE__POINTER_POINTER,
-							 GTK_TYPE_NONE, 
-							 2,
-							 GTK_TYPE_POINTER,
-							 GTK_TYPE_POINTER);
-
-	label_signals[SET_IS_SMOOTH] = gtk_signal_new ("set_is_smooth",
-						       GTK_RUN_LAST,
-						       object_class->type,
-						       GTK_SIGNAL_OFFSET (NautilusLabelClass, set_is_smooth),
-						       gtk_marshal_NONE__BOOL,
-						       GTK_TYPE_NONE, 
-						       1,
-						       GTK_TYPE_BOOL);
-
-	gtk_object_class_add_signals (object_class, label_signals, LAST_SIGNAL);
-
-	/* Arguments */
-	gtk_object_add_arg_type ("NautilusLabel::tile_pixbuf",
-				 GTK_TYPE_POINTER,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_PIXBUF);
-	gtk_object_add_arg_type ("NautilusLabel::tile_opacity",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_OPACITY);
-	gtk_object_add_arg_type ("NautilusLabel::tile_width",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_WIDTH);
-	gtk_object_add_arg_type ("NautilusLabel::tile_height",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_HEIGHT);
-	gtk_object_add_arg_type ("NautilusLabel::tile_mode_vertical",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_MODE_VERTICAL);
-	gtk_object_add_arg_type ("NautilusLabel::tile_mode_horizontal",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_MODE_HORIZONTAL);
-	gtk_object_add_arg_type ("NautilusLabel::label",
-				 GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE,
-				 ARG_LABEL);
-	gtk_object_add_arg_type ("NautilusLabel::wrap",
-				 GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE,
-				 ARG_WRAP);
-	gtk_object_add_arg_type ("NautilusLabel::justify",
-				 GTK_TYPE_JUSTIFICATION,
-				 GTK_ARG_READWRITE,
-				 ARG_JUSTIFY);
-	gtk_object_add_arg_type ("NautilusLabel::is_smooth",
-				 GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE,
-				 ARG_IS_SMOOTH);
-	gtk_object_add_arg_type ("NautilusLabel::text_opacity",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_TEXT_OPACITY);
-	gtk_object_add_arg_type ("NautilusLabel::background_mode",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_BACKGROUND_MODE);
-	gtk_object_add_arg_type ("NautilusLabel::smooth_font",
-				 GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE,
-				 ARG_SMOOTH_FONT);
-	gtk_object_add_arg_type ("NautilusLabel::smooth_font_size",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_SMOOTH_FONT_SIZE);
-	gtk_object_add_arg_type ("NautilusLabel::smooth_text_color",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_SMOOTH_TEXT_COLOR);
-	gtk_object_add_arg_type ("NautilusLabel::smooth_drop_shadow_offset",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_SMOOTH_DROP_SHADOW_OFFSET);
-	gtk_object_add_arg_type ("NautilusLabel::smooth_drop_shadow_color",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_SMOOTH_DROP_SHADOW_COLOR);
-	gtk_object_add_arg_type ("NautilusLabel::smooth_line_wrap_width",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_SMOOTH_LINE_WRAP_WIDTH);
-	gtk_object_add_arg_type ("NautilusLabel::adjust_wrap_on_resize",
-				 GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE,
-				 ARG_ADJUST_WRAP_ON_RESIZE);
-
-	/* Make this class inherit the same kind of theme stuff as GtkLabel */
-	nautilus_gtk_class_name_make_like_existing_type ("NautilusLabel", GTK_TYPE_LABEL);
-
-	/* Let the smooth widget machinery know that our class can be smooth */
-	nautilus_smooth_widget_register_type (NAUTILUS_TYPE_LABEL);
-}
-
-void
-nautilus_label_initialize (NautilusLabel *label)
-{
-	GTK_WIDGET_UNSET_FLAGS (label, GTK_CAN_FOCUS);
-	GTK_WIDGET_SET_FLAGS (label, GTK_NO_WINDOW);
-
-	label->details = g_new0 (NautilusLabelDetails, 1);
-
-	label->details->text_opacity = NAUTILUS_OPACITY_FULLY_OPAQUE;
-	label->details->smooth_font = nautilus_scalable_font_get_default_font ();
- 	label->details->smooth_font_size = DEFAULT_FONT_SIZE;
-	label->details->smooth_text_color = NAUTILUS_RGBA_COLOR_PACK (0, 0, 0, 255);
-	label->details->smooth_drop_shadow_color = NAUTILUS_RGBA_COLOR_PACK (255, 255, 255, 255);
-	label->details->smooth_line_wrap_width = label_get_default_line_wrap_width (label);
-
-	label->details->tile_opacity = NAUTILUS_OPACITY_FULLY_OPAQUE;
- 	label->details->tile_width = NAUTILUS_SMOOTH_TILE_EXTENT_FULL;
- 	label->details->tile_height = NAUTILUS_SMOOTH_TILE_EXTENT_FULL;
-	label->details->tile_mode_vertical = NAUTILUS_SMOOTH_TILE_SELF;
-	label->details->tile_mode_horizontal = NAUTILUS_SMOOTH_TILE_SELF;
-	label->details->background_mode = NAUTILUS_SMOOTH_BACKGROUND_GTK;
-
-	nautilus_smooth_widget_register (GTK_WIDGET (label));
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_label_destroy (GtkObject *object)
-{
- 	NautilusLabel *label;
-	
-	g_return_if_fail (NAUTILUS_IS_LABEL (object));
-
-	label = NAUTILUS_LABEL (object);
-
-	nautilus_gdk_pixbuf_unref_if_not_null (label->details->tile_pixbuf);
-	label->details->tile_pixbuf = NULL;
-	label_solid_cache_pixbuf_clear (label);
-	label_smooth_text_clear (label);
-	g_free (label->details);
-
-	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-static void
-nautilus_label_set_arg (GtkObject *object,
-			GtkArg *arg,
-			guint arg_id)
-{
-	NautilusLabel *label;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (object));
-
- 	label = NAUTILUS_LABEL (object);
-
- 	switch (arg_id)
-	{
-
-	case ARG_TILE_OPACITY:
-		nautilus_label_set_tile_opacity (label, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_TILE_PIXBUF:
-		nautilus_label_set_tile_pixbuf (label, (GdkPixbuf *) GTK_VALUE_POINTER (*arg));
-		break;
-		
-	case ARG_TILE_WIDTH:
-		nautilus_label_set_tile_width (label, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_TILE_HEIGHT:
-		nautilus_label_set_tile_height (label, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_TILE_MODE_VERTICAL:
-		nautilus_label_set_tile_mode_vertical (label, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_TILE_MODE_HORIZONTAL:
-		nautilus_label_set_tile_mode_horizontal (label, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_LABEL:
-		nautilus_label_set_text (label, GTK_VALUE_STRING (*arg));
-		break;
-		
-	case ARG_WRAP:
-		nautilus_label_set_wrap (label, GTK_VALUE_BOOL (*arg));
-		break;
-		
-	case ARG_JUSTIFY:
-		nautilus_label_set_justify (label, GTK_VALUE_ENUM (*arg));
-		break;
-		
-	case ARG_IS_SMOOTH:
-		nautilus_label_set_is_smooth (label, GTK_VALUE_BOOL (*arg));
-		break;
-
-	case ARG_TEXT_OPACITY:
-		nautilus_label_set_text_opacity (label, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_BACKGROUND_MODE:
-		nautilus_label_set_background_mode (label, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_SMOOTH_FONT:
-		nautilus_label_set_smooth_font (label, (NautilusScalableFont *) GTK_VALUE_OBJECT (*arg));
-		break;
-
-	case ARG_SMOOTH_FONT_SIZE:
-		nautilus_label_set_smooth_font_size (label, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_SMOOTH_TEXT_COLOR:
-		nautilus_label_set_text_color (label, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_SMOOTH_DROP_SHADOW_OFFSET:
-		nautilus_label_set_smooth_drop_shadow_offset (label, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_SMOOTH_DROP_SHADOW_COLOR:
-		nautilus_label_set_smooth_drop_shadow_color (label, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_SMOOTH_LINE_WRAP_WIDTH:
-		nautilus_label_set_smooth_line_wrap_width (label, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_ADJUST_WRAP_ON_RESIZE:
-		nautilus_label_set_adjust_wrap_on_resize (label, GTK_VALUE_BOOL (*arg));
-		break;
-
- 	default:
-		g_assert_not_reached ();
-	}
-}
-
-static void
-nautilus_label_get_arg (GtkObject *object,
-			GtkArg *arg,
-			guint arg_id)
-{
-	NautilusLabel	*label;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (object));
-	
-	label = NAUTILUS_LABEL (object);
-
- 	switch (arg_id)
-	{
-	case ARG_TILE_OPACITY:
-		GTK_VALUE_INT (*arg) = nautilus_label_get_tile_opacity (label);
-		break;
-		
-	case ARG_TILE_PIXBUF:
-		GTK_VALUE_POINTER (*arg) = nautilus_label_get_tile_pixbuf (label);
-		break;
-
-	case ARG_TILE_WIDTH:
-		GTK_VALUE_INT (*arg) = nautilus_label_get_tile_width (label);
-		break;
-
-	case ARG_TILE_HEIGHT:
-		GTK_VALUE_INT (*arg) = nautilus_label_get_tile_height (label);
-		break;
-
-	case ARG_TILE_MODE_VERTICAL:
-		GTK_VALUE_UINT (*arg) = nautilus_label_get_tile_mode_vertical (label);
-		break;
-
-	case ARG_TILE_MODE_HORIZONTAL:
-		GTK_VALUE_UINT (*arg) = nautilus_label_get_tile_mode_horizontal (label);
-		break;
-
-	case ARG_LABEL:
-		GTK_VALUE_STRING (*arg) = nautilus_label_get_text (label);
-		break;
-
-	case ARG_WRAP:
-		GTK_VALUE_BOOL (*arg) = nautilus_label_get_wrap (label);
-		break;
-
-	case ARG_JUSTIFY:
-		GTK_VALUE_ENUM (*arg) = nautilus_label_get_text_justify (label);
-		break;
-
-	case ARG_IS_SMOOTH:
-		GTK_VALUE_BOOL (*arg) = nautilus_label_get_is_smooth (label);
-		break;
-		
-	case ARG_TEXT_OPACITY:
-		GTK_VALUE_INT (*arg) = nautilus_label_get_text_opacity (label);
-		break;
-		
-	case ARG_BACKGROUND_MODE:
-		GTK_VALUE_UINT (*arg) = nautilus_label_get_background_mode (label);
-		break;
-
-	case ARG_SMOOTH_FONT:
-		GTK_VALUE_OBJECT (*arg) = (GtkObject *) nautilus_label_get_smooth_font (label);
-		break;
-
-	case ARG_SMOOTH_FONT_SIZE:
-		GTK_VALUE_INT (*arg) = nautilus_label_get_smooth_font_size (label);
-		break;
-
-	case ARG_SMOOTH_TEXT_COLOR:
-		GTK_VALUE_UINT (*arg) = nautilus_label_get_text_color (label);
-		break;
-
-	case ARG_SMOOTH_DROP_SHADOW_OFFSET:
-		GTK_VALUE_INT (*arg) = nautilus_label_get_smooth_drop_shadow_offset (label);
-		break;
-
-	case ARG_SMOOTH_DROP_SHADOW_COLOR:
-		GTK_VALUE_UINT (*arg) = nautilus_label_get_smooth_drop_shadow_color (label);
-		break;
-
-	case ARG_SMOOTH_LINE_WRAP_WIDTH:
-		GTK_VALUE_INT (*arg) = nautilus_label_get_smooth_line_wrap_width (label);
-		break;
-
-	case ARG_ADJUST_WRAP_ON_RESIZE:
-		GTK_VALUE_BOOL (*arg) = nautilus_label_get_adjust_wrap_on_resize (label);
-		break;
-
- 	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* GtkWidgetClass methods */
-static void
-nautilus_label_size_request (GtkWidget *widget,
-			     GtkRequisition *requisition)
-{
-	NautilusLabel *label;
-
-	NautilusDimensions content_dimensions;
-	NautilusDimensions tile_dimensions;
-	NautilusDimensions preferred_dimensions;
-	
-	g_return_if_fail (NAUTILUS_IS_LABEL (widget));
-	g_return_if_fail (requisition != NULL);
-
- 	label = NAUTILUS_LABEL (widget);
-
-	if (!label_is_smooth (label)) {
-		NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_request, (widget, requisition));
-		return;
-	}
-	
-	content_dimensions = label_get_content_dimensions (label);
-	tile_dimensions = label_get_tile_dimensions (label);
-
-	preferred_dimensions = nautilus_smooth_widget_get_preferred_dimensions (widget,
-										&content_dimensions,
-										&tile_dimensions,
-										label->details->tile_width,
-										label->details->tile_height);
-   	requisition->width = preferred_dimensions.width;
-   	requisition->height = preferred_dimensions.height;
-}
-
-static void
-nautilus_label_size_allocate (GtkWidget *widget,
-			      GtkAllocation *allocation)
-{
-	NautilusLabel *label;
-	
- 	g_return_if_fail (NAUTILUS_IS_LABEL (widget));
- 	g_return_if_fail (allocation != NULL);
-	
-  	label = NAUTILUS_LABEL (widget);
-	
-	/* Pre chain size_allocate */
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
-
-	/* Update the wrap width if needed */
-	if (label->details->adjust_wrap_on_resize) {
-		label->details->smooth_line_wrap_width = (int) allocation->width;
- 		if (label->details->smooth_text_layout != NULL) {
- 			nautilus_smooth_text_layout_set_line_wrap_width (label->details->smooth_text_layout,
- 									 label->details->smooth_line_wrap_width);
- 		}
-		label_solid_cache_pixbuf_clear (label);
-	}
-}
-
-/* Painting callback for non smooth case */
-static void
-label_paint_pixbuf_callback (GtkWidget *widget,
-			     GdkDrawable *destination_drawable,
-			     GdkGC *gc,
-			     int source_x,
-			     int source_y,
-			     const ArtIRect *area,
-			     gpointer callback_data)
-{
-	NautilusLabel *label;
-	const ArtIRect *screen_dirty_area;
-	GdkEventExpose event;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (destination_drawable != NULL);
-	g_return_if_fail (gc != NULL);
-	g_return_if_fail (area != NULL && !art_irect_empty (area));
-
-	label = NAUTILUS_LABEL (widget);
-
-	screen_dirty_area = callback_data;
-
-	event.type = GDK_EXPOSE;
-	event.send_event = TRUE;
-	event.window = widget->window;
-	event.area = nautilus_art_irect_to_gdk_rectangle (screen_dirty_area);
-	event.count = 0;
-
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, expose_event, (widget, &event));
-}
-
-/* Compositing callback for smooth case */
-static void
-label_composite_text_callback_cached (GtkWidget *widget,
-				      GdkPixbuf *destination_pixbuf,
-				      int source_x,
-				      int source_y,
-				      const ArtIRect *area,
-				      int opacity,
-				      gpointer callback_data)
-{
-	NautilusLabel *label;
-	NautilusDimensions content_dimensions;
-	ArtIRect cache_pixbuf_area;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (destination_pixbuf != NULL);
-	g_return_if_fail (area != NULL && !art_irect_empty (area));
-	
-	label = NAUTILUS_LABEL (widget);
-
-	g_return_if_fail (label_can_cache_contents (label));
-
-	content_dimensions = label_get_content_dimensions (label);
-
-	g_return_if_fail (!nautilus_dimensions_empty (&content_dimensions));
-
-	if (label->details->solid_cache_pixbuf == NULL) {
-		label->details->solid_cache_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
-								     FALSE,
-								     8,
-								     content_dimensions.width,
-								     content_dimensions.height);
-		
-		nautilus_gdk_pixbuf_fill_rectangle_with_color (label->details->solid_cache_pixbuf,
-							       NULL,
-							       label->details->solid_background_color);
-		
-		cache_pixbuf_area = nautilus_gdk_pixbuf_intersect (label->details->solid_cache_pixbuf,
-								   0,
-								   0,
-								   NULL);
-		g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (label->details->smooth_text_layout));
-			
-		if (label->details->smooth_drop_shadow_offset > 0) {
-			cache_pixbuf_area.x0 += label->details->smooth_drop_shadow_offset;
-			cache_pixbuf_area.y0 += label->details->smooth_drop_shadow_offset;
-			nautilus_smooth_text_layout_draw_to_pixbuf (label->details->smooth_text_layout,
-								    label->details->solid_cache_pixbuf,
-								    0,
-								    0,
-								    &cache_pixbuf_area,
-								    nautilus_label_get_text_justify (label),
-								    FALSE,
-								    label->details->smooth_drop_shadow_color,
-								    label->details->text_opacity);
-			cache_pixbuf_area.x0 -= label->details->smooth_drop_shadow_offset;
-			cache_pixbuf_area.y0 -= label->details->smooth_drop_shadow_offset;
-		}
-		
-		nautilus_smooth_text_layout_draw_to_pixbuf (label->details->smooth_text_layout,
-							    label->details->solid_cache_pixbuf,
-							    0,
-							    0,
-							    &cache_pixbuf_area,
-							    nautilus_label_get_text_justify (label),
-							    FALSE,
-							    label->details->smooth_text_color,
-							    label->details->text_opacity);
-	}
-
-	g_return_if_fail (label->details->solid_cache_pixbuf != NULL);
-	
-	nautilus_gdk_pixbuf_draw_to_pixbuf (label->details->solid_cache_pixbuf,
-					    destination_pixbuf,
-					    source_x,
-					    source_y,
-					    area);
-}
-
-static void
-label_composite_text_callback (GtkWidget *widget,
-			       GdkPixbuf *destination_pixbuf,
-			       int source_x,
-			       int source_y,
-			       const ArtIRect *area,
-			       int opacity,
-			       gpointer callback_data)
-{
-	NautilusLabel *label;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (destination_pixbuf != NULL);
-	g_return_if_fail (area != NULL && !art_irect_empty (area));
-
-	label = NAUTILUS_LABEL (widget);
-
-	g_return_if_fail (!label_can_cache_contents (label));
-
-	nautilus_smooth_text_layout_draw_to_pixbuf (label->details->smooth_text_layout,
-						    destination_pixbuf,
-						    source_x,
-						    source_y,
-						    area,
-						    nautilus_label_get_text_justify (label),
-						    FALSE,
-						    label->details->smooth_text_color,
-						    label->details->text_opacity);
-}
-
-static void
-label_composite_text_and_shadow_callback (GtkWidget *widget,
-					  GdkPixbuf *destination_pixbuf,
-					  int source_x,
-					  int source_y,
-					  const ArtIRect *area,
-					  int opacity,
-					  gpointer callback_data)
-{
-	NautilusLabel *label;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (destination_pixbuf != NULL);
-	g_return_if_fail (area != NULL && !art_irect_empty (area));
-
-	label = NAUTILUS_LABEL (widget);
-
-	g_return_if_fail (!label_can_cache_contents (label));
-
-	nautilus_smooth_text_layout_draw_to_pixbuf_shadow (label->details->smooth_text_layout,
-							   destination_pixbuf,
-							   source_x,
-							   source_y,
-							   area,
-							   label->details->smooth_drop_shadow_offset,
-							   nautilus_label_get_text_justify (label),
-							   FALSE,
-							   label->details->smooth_text_color,
-							   label->details->smooth_drop_shadow_color,
-							   label->details->text_opacity);
-}
-
-static void
-label_paint (NautilusLabel *label,
-	     const ArtIRect *screen_dirty_area,
-	     const ArtIRect *tile_bounds)
-{
-	ArtIRect widget_bounds;
-	
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (GTK_WIDGET_REALIZED (label));
-	g_return_if_fail (screen_dirty_area != NULL);
-	g_return_if_fail (tile_bounds != NULL);
-	
-	/* The smooth and non smooth bounds are different.  We have
-	 * no way to have GtkLabel tell us what its bounds are.
-	 * So, we cheat and pretend that for the non smooth case,
-	 * the text bounds are the whole widget.
-	 *
-	 * This works because the smooth widget paint handler will
-	 * properly intersect these bounds and call the paint 
-	 * callback.  We feed the paint callback the actual gdk
-	 * expose event so that we feed the exact exposure area
-	 * to GtkLabel's expose_event.
-	 */
-	widget_bounds = nautilus_gtk_widget_get_bounds (GTK_WIDGET (label));
-
-	/* Make sure the area is screen visible before painting */
-	nautilus_smooth_widget_paint (GTK_WIDGET (label),
-				      GTK_WIDGET (label)->style->white_gc,
-				      FALSE,
-				      label->details->background_mode,
-				      label->details->solid_background_color,
-				      label->details->tile_pixbuf,
-				      tile_bounds,
-				      label->details->tile_opacity,
-				      label->details->tile_mode_vertical,
-				      label->details->tile_mode_horizontal,
-				      &widget_bounds,
-				      label->details->text_opacity,
-				      screen_dirty_area,
-				      label_paint_pixbuf_callback,
-				      label_composite_text_callback,
-				      (gpointer) screen_dirty_area);
-}
-
-static void
-paint_label_smooth (NautilusLabel *label,
-		    const ArtIRect *screen_dirty_area,
-		    const ArtIRect *tile_bounds)
-{
-	ArtIRect text_bounds;
-	ArtIRect content_bounds;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (GTK_WIDGET_REALIZED (label));
-	g_return_if_fail (screen_dirty_area != NULL);
-	g_return_if_fail (tile_bounds != NULL);
-
-	if (label->details->smooth_drop_shadow_offset > 0) {
-		/* Paint the text and shadow if needed */
-		content_bounds = label_get_content_bounds (label);
-		if (!art_irect_empty (&content_bounds)) {
-			nautilus_smooth_widget_paint (GTK_WIDGET (label),
-						      GTK_WIDGET (label)->style->white_gc,
-						      TRUE,
-						      label->details->background_mode,
-						      label->details->solid_background_color,
-						      label->details->tile_pixbuf,
-						      tile_bounds,
-						      label->details->tile_opacity,
-						      label->details->tile_mode_vertical,
-						      label->details->tile_mode_horizontal,
-						      &content_bounds,
-						      label->details->text_opacity,
-						      screen_dirty_area,
-						      label_paint_pixbuf_callback,
-						      label_composite_text_and_shadow_callback,
-						      NULL);
-		}
-	} else {
-		/* Paint the text if needed */
-		text_bounds = label_get_text_bounds (label);
-		nautilus_smooth_widget_paint (GTK_WIDGET (label),
-					      GTK_WIDGET (label)->style->white_gc,
-					      TRUE,
-					      label->details->background_mode,
-					      label->details->solid_background_color,
-					      label->details->tile_pixbuf,
-					      tile_bounds,
-					      label->details->tile_opacity,
-					      label->details->tile_mode_vertical,
-					      label->details->tile_mode_horizontal,
-					      &text_bounds,
-					      label->details->text_opacity,
-					      screen_dirty_area,
-					      label_paint_pixbuf_callback,
-					      label_composite_text_callback,
-					      NULL);
-	}
-}
-
-static void
-paint_label_smooth_cached (NautilusLabel *label,
-			   const ArtIRect *screen_dirty_area,
-			   const ArtIRect *tile_bounds)
-{
-	ArtIRect content_bounds;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (GTK_WIDGET_REALIZED (label));
-	g_return_if_fail (screen_dirty_area != NULL);
-	g_return_if_fail (tile_bounds != NULL);
-	g_return_if_fail (label_can_cache_contents (label));
-
-	content_bounds = label_get_content_bounds (label);
-
-	nautilus_smooth_widget_paint (GTK_WIDGET (label),
-				      GTK_WIDGET (label)->style->white_gc,
-				      TRUE,
-				      label->details->background_mode,
-				      label->details->solid_background_color,
-				      label->details->tile_pixbuf,
-				      tile_bounds,
-				      label->details->tile_opacity,
-				      label->details->tile_mode_vertical,
-				      label->details->tile_mode_horizontal,
-				      &content_bounds,
-				      label->details->text_opacity,
-				      screen_dirty_area,
-				      label_paint_pixbuf_callback,
-				      label_composite_text_callback_cached,
-				      NULL);
-}
-
-static int
-nautilus_label_expose_event (GtkWidget *widget,
-			     GdkEventExpose *event)
-{
- 	NautilusLabel *label;
-	ArtIRect dirty_area;
-	ArtIRect screen_dirty_area;
-	ArtIRect tile_bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (widget), TRUE);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
-	g_return_val_if_fail (event != NULL, TRUE);
-	g_return_val_if_fail (event->window == widget->window, TRUE);
-	
- 	label = NAUTILUS_LABEL (widget);
-
-	/* Check for the dumb case when theres nothing to do */
-	if (nautilus_strlen (label_peek_text (label)) == 0 && label->details->tile_pixbuf == NULL) {
-		return TRUE;
-	}
-
-	/* Clip the dirty area to the screen */
-	dirty_area = nautilus_gdk_rectangle_to_art_irect (&event->area);
-	screen_dirty_area = nautilus_gdk_window_clip_dirty_area_to_screen (event->window,
-									   &dirty_area);
-
-	/* Bail if no work */
-	if (art_irect_empty (&screen_dirty_area)) {
-		return TRUE;
-	}
-
-	/* Fetch the tile bounds */
-	tile_bounds = nautilus_smooth_widget_get_tile_bounds (widget,
-							      label->details->tile_pixbuf,
-							      label->details->tile_width,
-							      label->details->tile_height);
-
-	/* Paint GtkLabel */
-	if (!label_is_smooth (label)) {
-		label_paint (label, &screen_dirty_area, &tile_bounds);
-		return TRUE;
-	}
-
-	/* Paint smooth */
-	if (label_can_cache_contents (label)) {
-		paint_label_smooth_cached (label, &screen_dirty_area, &tile_bounds);
-	} else {
-		paint_label_smooth (label, &screen_dirty_area, &tile_bounds);	
-	}
-
-	return TRUE;
-}
-
-/* NautilusLabel signals */
-static void
-nautilus_label_set_is_smooth_signal (GtkWidget *widget,
-				     gboolean is_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (widget));
-
-	nautilus_label_set_is_smooth (NAUTILUS_LABEL (widget), is_smooth);
-}
-
-/* Private NautilusLabel things */
-static int
-label_get_default_line_wrap_width (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-	
-	return nautilus_scalable_font_text_width (label->details->smooth_font,
-						  label->details->smooth_font_size,
-						  DEFAULT_LINE_WRAP_WIDTH_TEXT,
-						  strlen (DEFAULT_LINE_WRAP_WIDTH_TEXT));
-}
-
-static NautilusDimensions
-label_get_text_dimensions (const NautilusLabel *label)
-{
-	NautilusDimensions text_dimensions;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NAUTILUS_DIMENSIONS_EMPTY);
-	label_smooth_text_ensure (label);
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (label->details->smooth_text_layout), NAUTILUS_DIMENSIONS_EMPTY);
-
-	text_dimensions = nautilus_smooth_text_layout_get_dimensions (label->details->smooth_text_layout);
-
-	return text_dimensions;
-}
-
-static ArtIRect
-label_get_text_bounds (const NautilusLabel *label)
-{
-	ArtIRect content_bounds;
-	NautilusDimensions text_dimensions;
-	ArtIRect text_bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NAUTILUS_ART_IRECT_EMPTY);
-	
-	content_bounds = label_get_content_bounds (label);
-	text_dimensions = label_get_text_dimensions (label);
-
-	if (nautilus_dimensions_empty (&text_dimensions)
-	    || art_irect_empty (&content_bounds)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-	
-	nautilus_art_irect_assign (&text_bounds,
-				   content_bounds.x0,
-				   content_bounds.y0,
-				   text_dimensions.width,
-				   text_dimensions.height);
-
-	return text_bounds;
-}
-
-static NautilusDimensions
-label_get_content_dimensions (const NautilusLabel *label)
-{
-	NautilusDimensions text_dimensions;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NAUTILUS_DIMENSIONS_EMPTY);
-
-	text_dimensions = label_get_text_dimensions (label);
-	text_dimensions.width += label->details->smooth_drop_shadow_offset;
-	text_dimensions.height += label->details->smooth_drop_shadow_offset;
-
-	return text_dimensions;
-}
-
-static ArtIRect
-label_get_content_bounds (const NautilusLabel *label)
-{
-	NautilusDimensions content_dimensions;
-	ArtIRect text_bounds;
-	ArtIRect bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NAUTILUS_ART_IRECT_EMPTY);
-
-	content_dimensions = label_get_content_dimensions (label);
-
-	if (nautilus_dimensions_empty (&content_dimensions)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-	
-	bounds = nautilus_gtk_widget_get_bounds (GTK_WIDGET (label));
-	
-	text_bounds = nautilus_art_irect_align (&bounds,
-						content_dimensions.width,
-						content_dimensions.height,
-						GTK_MISC (label)->xalign,
-						GTK_MISC (label)->yalign);
-		
-
-	return text_bounds;
-}
-
-static NautilusDimensions
-label_get_tile_dimensions (const NautilusLabel *label)
-{
-	NautilusDimensions tile_dimensions;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NAUTILUS_DIMENSIONS_EMPTY);
-
-	if (!label->details->tile_pixbuf) {
-		return NAUTILUS_DIMENSIONS_EMPTY;
-	}
-	
-	tile_dimensions.width = gdk_pixbuf_get_width (label->details->tile_pixbuf);
-	tile_dimensions.height = gdk_pixbuf_get_height (label->details->tile_pixbuf);
-
-	return tile_dimensions;
-}
-
-static void
-label_solid_cache_pixbuf_clear (NautilusLabel *label)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	nautilus_gdk_pixbuf_unref_if_not_null (label->details->solid_cache_pixbuf);
-	label->details->solid_cache_pixbuf = NULL;
-}
-
-static gboolean
-label_can_cache_contents (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), FALSE);
-
-	return (label->details->background_mode == NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR)
-		&& !label->details->tile_pixbuf;
-}
-
-const char *
-label_peek_text (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NULL);
-
-	return GTK_LABEL (label)->label;
-}
-
-static void
-label_smooth_text_ensure (const NautilusLabel *label)
-{
-	const char *text;
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	if (label->details->smooth_text_layout != NULL) {
-		return;
-	}
-
-	text = label_peek_text (label);
-	label->details->smooth_text_layout = nautilus_smooth_text_layout_new (text,
-									      nautilus_strlen (text),
-									      label->details->smooth_font,
-									      label->details->smooth_font_size,
-									      nautilus_label_get_wrap (label));
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (label->details->smooth_text_layout));
-	nautilus_smooth_text_layout_set_line_wrap_width (label->details->smooth_text_layout,
-							 label->details->smooth_line_wrap_width);
-}
-
-static void
-label_smooth_text_clear (NautilusLabel *label)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	if (label->details->smooth_text_layout != NULL) {
-		gtk_object_unref (GTK_OBJECT (label->details->smooth_text_layout));
-	}
-	label->details->smooth_text_layout = NULL;
-
-	/* We also need to clear the cache pixbuf */
-	label_solid_cache_pixbuf_clear (label);
-}
-
-gboolean
-label_is_smooth (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), FALSE);
-
-	return !label->details->never_smooth && label->details->is_smooth;
-}
-
-/* Public NautilusLabel methods */
-GtkWidget *
-nautilus_label_new (const char *text)
-{
-	NautilusLabel *label;
-	
-	label = NAUTILUS_LABEL (gtk_widget_new (nautilus_label_get_type (), NULL));
-	
-	nautilus_label_set_text (label, text);
-	
-	return GTK_WIDGET (label);
-}
-
-void
-nautilus_label_set_smooth_font (NautilusLabel *label,
-				NautilusScalableFont *smooth_font)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (NAUTILUS_IS_SCALABLE_FONT (smooth_font));
-	
-	if (label->details->smooth_font == smooth_font) {
-		return;
-	}
-	
-	if (label->details->smooth_font != NULL) {
-		gtk_object_unref (GTK_OBJECT (label->details->smooth_font));
-	}
-
-	gtk_object_ref (GTK_OBJECT (smooth_font));
-	label->details->smooth_font = smooth_font;
-
-	label_smooth_text_clear (label);	
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-NautilusScalableFont *
-nautilus_label_get_smooth_font (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NULL);
-	
-	if (label->details->smooth_font != NULL) {
-		gtk_object_ref (GTK_OBJECT (label->details->smooth_font));
-	}
-
-	return label->details->smooth_font;
-}
-
-void
-nautilus_label_set_smooth_font_size (NautilusLabel *label,
-				     int smooth_font_size)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (smooth_font_size > MIN_SMOOTH_FONT_SIZE);
-
-	if (label->details->smooth_font_size == smooth_font_size) {
-		return;
-	}
-
-	label->details->smooth_font_size = smooth_font_size;
-
-	label_smooth_text_clear (label);
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-int
-nautilus_label_get_smooth_font_size (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-
-	return label->details->smooth_font_size;
-}
-
-/* This function is an ugly hack.  The issue is that we want
- * GtkLabel to flush its cached requisition dimensions.  GtkLabel
- * caches these for efficiency.  Unfortunately, there is no public
- * way to do this for GtkLabel.  So, instead we trick the GtkLabel
- * into thinking that its 'pattern' has changed.  As a result
- * of this phony change, GtkLabel will flush the requisition cache.
- * Of course, we don't really change the pattern, we just set the
- * old one.
- */
-static void
-label_force_cached_requisition_flush (NautilusLabel *label)
-{
-	char *same_pattern;
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	same_pattern = g_strdup (GTK_LABEL (label)->pattern);
-	gtk_label_set_pattern (GTK_LABEL (label), same_pattern);
-	g_free (same_pattern);
-}
-
-void
-nautilus_label_set_is_smooth (NautilusLabel *label,
-			      gboolean is_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	if (label->details->never_smooth) {
-		return;
-	}
-
-	if (label->details->is_smooth == is_smooth) {
-		return;
-	}
-
-	label->details->is_smooth = is_smooth;
-
-	label_smooth_text_clear (label);
-
-	/* Force GtkLabel to flush its cached requisition dimensions.
-	 * GtkLabel caches its requisition for efficiency.  We need this
-	 * dimensions to be flushed when our is_smooth attribute changes.
-	 * The reason is that the geometry of the widget is dependent on
-	 * whether it is_smooth or not.
-	 */
-	label_force_cached_requisition_flush (label);
-
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-gboolean
-nautilus_label_get_is_smooth (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), FALSE);
-
-	return label_is_smooth (label);
-}
-
-/**
- * nautilus_label_set_tile_pixbuf:
- *
- * @label: A NautilusLabel
- * @pixbuf:          The new tile pixbuf
- *
- * Change the tile pixbuf.  A 'pixbuf' value of NULL, means dont use a
- * tile pixbuf - this is the default behavior for the widget.
- */
-void
-nautilus_label_set_tile_pixbuf (NautilusLabel *label,
-				GdkPixbuf *pixbuf)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	
-	if (pixbuf != label->details->tile_pixbuf) {
-		nautilus_gdk_pixbuf_unref_if_not_null (label->details->tile_pixbuf);
-		nautilus_gdk_pixbuf_ref_if_not_null (pixbuf);
-		
-		label->details->tile_pixbuf = pixbuf;
-
-		gtk_widget_queue_resize (GTK_WIDGET (label));
-	}
-}
-
-/**
- * nautilus_label_get_tile_pixbuf:
- *
- * @label: A NautilusLabel
- *
- * Return value: A reference to the tile_pixbuf.  Needs to be unreferenced with 
- * gdk_pixbuf_unref()
- */
-GdkPixbuf*
-nautilus_label_get_tile_pixbuf (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NULL);
-
-	nautilus_gdk_pixbuf_ref_if_not_null (label->details->tile_pixbuf);
-	
-	return label->details->tile_pixbuf;
-}
-
-void
-nautilus_label_set_text_opacity (NautilusLabel *label,
-				 int opacity)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	label->details->text_opacity = opacity;
-
-	gtk_widget_queue_draw (GTK_WIDGET (label));
-}
-
-int
-nautilus_label_get_text_opacity (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	return label->details->text_opacity;
-}
-
-void
-nautilus_label_set_tile_opacity (NautilusLabel *label,
-				 int tile_opacity)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (tile_opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (tile_opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	if (label->details->tile_opacity == tile_opacity) {
-		return;
-	}
-
-	label->details->tile_opacity = tile_opacity;
-
-	gtk_widget_queue_draw (GTK_WIDGET (label));
-}
-
-int
-nautilus_label_get_tile_opacity (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	return label->details->tile_opacity;
-}
-
-void
-nautilus_label_set_tile_width (NautilusLabel *label,
-			       int tile_width)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (tile_width >= NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP);
-	
-	if (label->details->tile_width == tile_width) {
-		return;
-	}
-
-	label->details->tile_width = tile_width;
-
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_label_get_tile_width:
- *
- * @label: A NautilusLabel
- *
- * Return value: The tile width.
- */
-int
-nautilus_label_get_tile_width (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-
-	return label->details->tile_width;
-}
-
-void
-nautilus_label_set_tile_height (NautilusLabel *label,
-				int tile_height)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (tile_height >= NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP);
-	
-	if (label->details->tile_height == tile_height) {
-		return;
-	}
-
-	label->details->tile_height = tile_height;
-
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_label_get_tile_height:
- *
- * @label: A NautilusLabel
- *
- * Return value: The tile height.
- */
-int
-nautilus_label_get_tile_height (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-
-	return label->details->tile_height;
-}
-
-void
-nautilus_label_set_tile_mode_vertical (NautilusLabel *label,
-				       NautilusSmoothTileMode tile_mode_vertical)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (tile_mode_vertical >= NAUTILUS_SMOOTH_TILE_SELF);
-	g_return_if_fail (tile_mode_vertical <= NAUTILUS_SMOOTH_TILE_ANCESTOR);
-
-	if (label->details->tile_mode_vertical == tile_mode_vertical) {
-		return;
-	}
-
-	label->details->tile_mode_vertical = tile_mode_vertical;
-
-	gtk_widget_queue_draw (GTK_WIDGET (label));
-}
-
-NautilusSmoothTileMode
-nautilus_label_get_tile_mode_vertical (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-	
-	return label->details->tile_mode_vertical;
-}
-
-void
-nautilus_label_set_tile_mode_horizontal (NautilusLabel *label,
-					 NautilusSmoothTileMode tile_mode_horizontal)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (tile_mode_horizontal >= NAUTILUS_SMOOTH_TILE_SELF);
-	g_return_if_fail (tile_mode_horizontal <= NAUTILUS_SMOOTH_TILE_ANCESTOR);
-
-	if (label->details->tile_mode_horizontal == tile_mode_horizontal) {
-		return;
-	}
-
-	label->details->tile_mode_horizontal = tile_mode_horizontal;
-
-	gtk_widget_queue_draw (GTK_WIDGET (label));
-}
-
-NautilusSmoothTileMode
-nautilus_label_get_tile_mode_horizontal (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-	
-	return label->details->tile_mode_horizontal;
-}
-
-void
-nautilus_label_set_tile_pixbuf_from_file_name (NautilusLabel *label,
-					       const char *tile_file_name)
-{
-	GdkPixbuf *tile_pixbuf;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (tile_file_name != NULL);
-
-	tile_pixbuf = gdk_pixbuf_new_from_file (tile_file_name);
-	
-	if (tile_pixbuf != NULL) {
-		nautilus_label_set_tile_pixbuf (label, tile_pixbuf);
-		gdk_pixbuf_unref (tile_pixbuf);
-	}
-}
-
-void
-nautilus_label_set_background_mode (NautilusLabel *label,
-				    NautilusSmoothBackgroundMode background_mode)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (background_mode >= NAUTILUS_SMOOTH_BACKGROUND_GTK);
-	g_return_if_fail (background_mode <= NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-
-	if (label->details->background_mode == background_mode) {
-		return;
-	}
-
-	label->details->background_mode = background_mode;
-
-	gtk_widget_queue_draw (GTK_WIDGET (label));
-}
-
-NautilusSmoothBackgroundMode
-nautilus_label_get_background_mode (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-	
-	return label->details->background_mode;
-}
-
-void
-nautilus_label_set_solid_background_color (NautilusLabel *label,
-					   guint32 solid_background_color)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	
-	if (label->details->solid_background_color == solid_background_color) {
-		return;
-	}
-
-	label->details->solid_background_color = solid_background_color;
-	
-	gtk_widget_queue_draw (GTK_WIDGET (label));
-}
-
-guint32
-nautilus_label_get_solid_background_color (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-	
-	return label->details->solid_background_color;
-}
-
-/**
- * nautilus_label_set_wrap_width:
- *
- * @label: A NautilusLabel
- * @line_wrap_width: The new line wrap width.
- *
- * The line wrap width is something.
- * 
- */
-void
-nautilus_label_set_smooth_line_wrap_width (NautilusLabel *label,
-					   int line_wrap_width)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	
-	if (label->details->smooth_line_wrap_width == line_wrap_width) {
-		return;
-	}
-	
-	label->details->smooth_line_wrap_width = line_wrap_width;
-	
-	label_smooth_text_clear (label);
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_label_get_smooth_line_wrap_width:
- *
- * @label: A NautilusLabel
- *
- * Return value: A boolean value indicating whether the label
- * is currently line wrapping text.
- */
-int
-nautilus_label_get_smooth_line_wrap_width (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), FALSE);
-
-	return label->details->smooth_line_wrap_width;
-}
-
-void
-nautilus_label_set_text_color (NautilusLabel *label,
-			       guint32 text_color)
-{
-	char *color_spec;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	if (label->details->smooth_text_color == text_color) {
-		return;
-	}
-	
-	label->details->smooth_text_color = text_color;
-
-	color_spec = nautilus_gdk_rgb_to_color_spec (text_color);
-
-	nautilus_gtk_widget_set_foreground_color (GTK_WIDGET (label), color_spec);
-	
-	g_free (color_spec);
-	
-	gtk_widget_queue_draw (GTK_WIDGET (label));
-}
-
-guint32
-nautilus_label_get_text_color (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-	
-	return label->details->smooth_text_color;
-}
-
-/**
- * nautilus_label_set_smooth_drop_shadow_offset:
- *
- * @label: A NautilusLabel
- * @smooth_drop_shadow_offset: The new drop shadow offset.  
-
- * The drop shadow offset is specified in pixels.  If greater than zero,
- * the label will render on top of a nice shadow.  The shadow will be
- * offset from the label text by 'smooth_drop_shadow_offset' pixels.
- */
-void
-nautilus_label_set_smooth_drop_shadow_offset (NautilusLabel *label,
-					      int drop_shadow_offset)
- {
-	 g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	 g_return_if_fail (drop_shadow_offset >= 0);
-	 
-	 if (label->details->smooth_drop_shadow_offset == drop_shadow_offset) {
-		 return;
-	 }
-	 
-	 label->details->smooth_drop_shadow_offset = drop_shadow_offset;
-	 label_solid_cache_pixbuf_clear (label);
-	 gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_label_get_smooth_drop_shadow_offset:
- *
- * @label: A NautilusLabel
- *
- * Return value: The line offset in pixels.
- */
-int
-nautilus_label_get_smooth_drop_shadow_offset (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-
-	return label->details->smooth_drop_shadow_offset;
-}
-
-/**
- * nautilus_label_set_smooth_drop_shadow_color:
- *
- * @label: A NautilusLabel
- * @smooth_drop_shadow_color: The new drop shadow color.
- *
- * Return value: The drop shadow color.
- */
-void
-nautilus_label_set_smooth_drop_shadow_color (NautilusLabel *label,
-					     guint32 drop_shadow_color)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	if (label->details->smooth_drop_shadow_color == drop_shadow_color) {
-		return;
-	}
-	
-	label->details->smooth_drop_shadow_color = drop_shadow_color;
-	label_solid_cache_pixbuf_clear (label);	
-	gtk_widget_queue_draw (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_label_get_smooth_drop_shadow_color:
- *
- * @label: A NautilusLabel
- *
- * Return value: The drop shadow color.
- */
-guint32
-nautilus_label_get_smooth_drop_shadow_color (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-	
-	return label->details->smooth_drop_shadow_color;
-}
-
-void
-nautilus_label_set_justify (NautilusLabel *label,
-			    GtkJustification justification)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (justification >= GTK_JUSTIFY_LEFT);
-	g_return_if_fail (justification <= GTK_JUSTIFY_FILL);
-
-	if (nautilus_label_get_text_justify (label) == justification) {
-		return;
-	}
-
-	gtk_label_set_justify (GTK_LABEL (label), justification);
-	
-	gtk_widget_queue_draw (GTK_WIDGET (label));
-}
-
-GtkJustification
-nautilus_label_get_text_justify (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-
-	return GTK_LABEL (label)->jtype;
-}
-
-gboolean
-nautilus_label_set_text (NautilusLabel *label,
-			 const char *text)
-{
-	GtkLabel *gtk_label;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), FALSE);
-
-	gtk_label = GTK_LABEL (label);
-
-	if (nautilus_str_is_equal (text, gtk_label->label)) {
-		return FALSE;
-	}
-
-	gtk_label_set_text (gtk_label, text);
-	
-	label_smooth_text_clear (label);
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-
-	return TRUE;
-}
-
-char*
-nautilus_label_get_text (const NautilusLabel *label)
-{
-	GtkLabel *gtk_label;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NULL);
-
-	gtk_label = GTK_LABEL (label);
-
-	return gtk_label->label ? g_strdup (gtk_label->label) : NULL;
-}
-
-/**
- * nautilus_label_set_wrap:
- *
- * @label: A NautilusLabel
- * @line_wrap: A boolean value indicating whether the label should
- * line wrap words if they dont fit in the horizontally allocated
- * space.
- *
- */
-void
-nautilus_label_set_wrap (NautilusLabel *label,
-			 gboolean line_wrap)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	if (nautilus_label_get_wrap (label) == line_wrap) {
-		return;
-	}
-
-	gtk_label_set_line_wrap (GTK_LABEL (label), line_wrap);
-	
-	label_smooth_text_clear (label);	
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_label_get_wrap:
- *
- * @label: A NautilusLabel
- *
- * Return value: A boolean value indicating whether the label
- * is currently line wrapping text.
- */
-gboolean
-nautilus_label_get_wrap (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), FALSE);
-
-	return GTK_LABEL (label)->wrap;
-}
-
-/**
- * nautilus_label_new_solid:
- *
- * @text: Text or NULL
- * @drop_shadow_offset: Drop shadow offset.
- * @drop_shadow_color: Drop shadow color.
- * @text_color: Text color.
- * @x_alignment: Horizontal alignment.
- * @y_alignment: Vertical alignment.
- * @x_padding: Amount to pad label in the x direction.
- * @y_padding: Amount to pad label in the y direction.
- * @background_color: Background color.
- * @tile_pixbuf: Pixbuf to use for tile or NULL.
- *
- * Create a label with a solid background.
- *
- * Return value: Newly created label with all the given values.
- */
-GtkWidget *
-nautilus_label_new_solid (const char *text,
-			  int drop_shadow_offset,
-			  guint32 drop_shadow_color,
-			  guint32 text_color,
-			  float x_alignment,
-			  float y_alignment,
-			  int x_padding,
-			  int y_padding,
-			  guint32 background_color,
-			  GdkPixbuf *tile_pixbuf)
-{
-	NautilusLabel *label;
-
- 	label = NAUTILUS_LABEL (nautilus_label_new (text ? text : ""));
-
- 	nautilus_label_set_background_mode (NAUTILUS_LABEL (label), NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	nautilus_label_set_smooth_drop_shadow_color (label, drop_shadow_color);
-	nautilus_label_set_smooth_drop_shadow_offset (label, drop_shadow_offset);
-	nautilus_label_set_text_color (label, text_color);
- 	nautilus_label_set_solid_background_color (NAUTILUS_LABEL (label), background_color);
-
- 	gtk_misc_set_padding (GTK_MISC (label), x_padding, y_padding);
- 	gtk_misc_set_alignment (GTK_MISC (label), x_alignment, y_alignment);
-	
-	if (tile_pixbuf != NULL) {
-		nautilus_label_set_tile_pixbuf (NAUTILUS_LABEL (label), tile_pixbuf);
-	}
-	
-	return GTK_WIDGET (label);
-}
-
-/**
- * nautilus_gtk_label_make_bold.
- *
- * Switches the font of label to a bold equivalent.
- * @label: The label.
- **/
-void
-nautilus_label_make_bold (NautilusLabel *label)
-{
-	NautilusScalableFont *bold_font;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	nautilus_gtk_label_make_bold (GTK_LABEL (label));
-
-	bold_font = nautilus_scalable_font_make_bold (label->details->smooth_font);
-	g_assert (NAUTILUS_IS_SCALABLE_FONT (bold_font));
-
-	if (bold_font != NULL) {
-		nautilus_label_set_smooth_font (label, bold_font);
-		gtk_object_unref (GTK_OBJECT (bold_font));
-	}
-
-	
-	label_smooth_text_clear (label);
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_gtk_label_make_larger.
- *
- * Switches the font of label to a larger version of the font.
- * @label: The label.
- **/
-void
-nautilus_label_make_larger (NautilusLabel *label,
-			    guint num_steps)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	label->details->smooth_font_size += num_steps;
-
-	nautilus_gtk_label_make_larger (GTK_LABEL (label), num_steps);
-
-	label_smooth_text_clear (label);
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_gtk_label_make_smaller.
- *
- * Switches the font of label to a smaller version of the font.
- * @label: The label.
- **/
-void
-nautilus_label_make_smaller (NautilusLabel *label,
-			     guint num_steps)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	label->details->smooth_font_size -= num_steps;
-	
-	nautilus_gtk_label_make_smaller (GTK_LABEL (label), num_steps);
-
-	label_smooth_text_clear (label);
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_label_set_never_smooth
- *
- * @label: A NautilusLabel.
- * @never_smooth: A boolean value indicating whether the label can NEVER be smooth.
- *
- * Force an label to never be smooth.  Calls to nautilus_label_set_is_smooth () will
- * thus be ignored.  This is useful if you want to use a NautilusLabel in a situation
- * wherre smoothness does not make sense - for example, in a dialog with other "normal"
- * GtkLabel widgets for consistency.
- */
-void
-nautilus_label_set_never_smooth (NautilusLabel *label,
-				 gboolean never_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	
-	label->details->never_smooth = never_smooth;
-
-	label_smooth_text_clear (label);
-
-	/* Force GtkLabel to flush its cached requisition dimensions.
-	 * GtkLabel caches its requisition for efficiency.  We need this
-	 * dimensions to be flushed when our is_smooth attribute changes.
-	 * The reason is that the geometry of the widget is dependent on
-	 * whether it is_smooth or not.
-	 */
-	label_force_cached_requisition_flush (label);
-
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_label_set_adjust_wrap_on_resize:
- *
- * @label: A NautilusLabel
- * @adjust_wrap_on_resize: A boolean value indicating whether the label should
- * automatically update the line_wrap_width when its resized.
- */
-void
-nautilus_label_set_adjust_wrap_on_resize (NautilusLabel *label,
-					  gboolean adjust_wrap_on_resize)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	if (label->details->adjust_wrap_on_resize == adjust_wrap_on_resize) {
-		return;
-	}
-
-	label->details->adjust_wrap_on_resize = adjust_wrap_on_resize;
-	
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_label_get_wrap:
- *
- * @label: A NautilusLabel
- *
- * Return value: A boolean value indicating whether the label
- * automatically updates the line_wrap_width when its resized.
- */
-gboolean
-nautilus_label_get_adjust_wrap_on_resize (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), FALSE);
-
-	return label->details->adjust_wrap_on_resize;
-}
diff --git a/libnautilus-extensions/nautilus-label.h b/libnautilus-extensions/nautilus-label.h
deleted file mode 100644
index aacb0bd7a..000000000
--- a/libnautilus-extensions/nautilus-label.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-label.h - A widget to display a anti aliased text.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_LABEL_H
-#define NAUTILUS_LABEL_H
-
-#include <gtk/gtklabel.h>
-#include <libnautilus-extensions/nautilus-scalable-font.h>
-#include <libnautilus-extensions/nautilus-smooth-widget.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_LABEL            (nautilus_label_get_type ())
-#define NAUTILUS_LABEL(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_LABEL, NautilusLabel))
-#define NAUTILUS_LABEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_LABEL, NautilusLabelClass))
-#define NAUTILUS_IS_LABEL(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_LABEL))
-#define NAUTILUS_IS_LABEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_LABEL))
-
-typedef struct _NautilusLabel	       NautilusLabel;
-typedef struct _NautilusLabelClass     NautilusLabelClass;
-typedef struct _NautilusLabelDetails   NautilusLabelDetails;
-
-struct _NautilusLabel
-{
-	/* Superclass */
-	GtkLabel gtk_label;
-
-	/* Private things */
-	NautilusLabelDetails *details;
-};
-
-struct _NautilusLabelClass
-{
-	GtkLabelClass parent_class;
-
-	NautilusSmoothWidgetDrawBackground draw_background;
-	NautilusSmoothWidgetSetIsSmooth set_is_smooth;
-};
-
-GtkType                      nautilus_label_get_type                       (void);
-GtkWidget *                  nautilus_label_new                            (const char                   *text);
-void                         nautilus_label_set_is_smooth                  (NautilusLabel                *label,
-									    gboolean                      is_smooth);
-gboolean                     nautilus_label_get_is_smooth                  (const NautilusLabel          *label);
-void                         nautilus_label_set_smooth_font                (NautilusLabel                *label,
-									    NautilusScalableFont         *font);
-NautilusScalableFont *       nautilus_label_get_smooth_font                (const NautilusLabel          *label);
-void                         nautilus_label_set_smooth_font_size           (NautilusLabel                *label,
-									    int                           font_size);
-int                          nautilus_label_get_smooth_font_size           (const NautilusLabel          *label);
-void                         nautilus_label_set_text_opacity               (NautilusLabel                *label,
-									    int                           opacity);
-int                          nautilus_label_get_text_opacity               (const NautilusLabel          *label);
-void                         nautilus_label_set_background_mode            (NautilusLabel                *label,
-									    NautilusSmoothBackgroundMode  background_mode);
-NautilusSmoothBackgroundMode nautilus_label_get_background_mode            (const NautilusLabel          *label);
-void                         nautilus_label_set_solid_background_color     (NautilusLabel                *label,
-									    guint32                       solid_background_color);
-guint32                      nautilus_label_get_solid_background_color     (const NautilusLabel          *label);
-void                         nautilus_label_set_text_color                 (NautilusLabel                *label,
-									    guint32                       color);
-guint32                      nautilus_label_get_text_color                 (const NautilusLabel          *label);
-void                         nautilus_label_set_smooth_drop_shadow_offset  (NautilusLabel                *label,
-									    int                           offset);
-int                          nautilus_label_get_smooth_drop_shadow_offset  (const NautilusLabel          *label);
-void                         nautilus_label_set_smooth_drop_shadow_color   (NautilusLabel                *label,
-									    guint32                       color);
-guint32                      nautilus_label_get_smooth_drop_shadow_color   (const NautilusLabel          *label);
-void                         nautilus_label_set_smooth_line_wrap_width     (NautilusLabel                *label,
-									    int                           line_wrap_width);
-int                          nautilus_label_get_smooth_line_wrap_width     (const NautilusLabel          *label);
-gboolean                     nautilus_label_set_text                       (NautilusLabel                *label,
-									    const char                   *text);
-char*                        nautilus_label_get_text                       (const NautilusLabel          *label);
-void                         nautilus_label_set_justify                    (NautilusLabel                *label,
-									    GtkJustification              justification);
-GtkJustification             nautilus_label_get_text_justify               (const NautilusLabel          *label);
-void                         nautilus_label_set_wrap                       (NautilusLabel                *label,
-									    gboolean                      line_wrap);
-gboolean                     nautilus_label_get_wrap                       (const NautilusLabel          *label);
-GtkWidget *                  nautilus_label_new_solid                      (const char                   *text,
-									    int                           drop_shadow_offset,
-									    guint32                       drop_shadow_color,
-									    guint32                       text_color,
-									    float                         xalign,
-									    float                         yalign,
-									    int                           xpadding,
-									    int                           ypadding,
-									    guint32                       background_color,
-									    GdkPixbuf                    *tile_pixbuf);
-void                         nautilus_label_make_bold                      (NautilusLabel                *label);
-void                         nautilus_label_make_larger                    (NautilusLabel                *label,
-									    guint                         num_sizes);
-void                         nautilus_label_make_smaller                   (NautilusLabel                *label,
-									    guint                         num_sizes);
-void                         nautilus_label_set_tile_pixbuf                (NautilusLabel                *label,
-									    GdkPixbuf                    *pixbuf);
-void                         nautilus_label_set_tile_width                 (NautilusLabel                *label,
-									    int                           tile_width);
-int                          nautilus_label_get_tile_width                 (const NautilusLabel          *label);
-void                         nautilus_label_set_tile_height                (NautilusLabel                *label,
-									    int                           tile_height);
-int                          nautilus_label_get_tile_height                (const NautilusLabel          *label);
-void                         nautilus_label_set_tile_pixbuf_from_file_name (NautilusLabel                *label,
-									    const char                   *tile_file_name);
-GdkPixbuf*                   nautilus_label_get_tile_pixbuf                (const NautilusLabel          *label);
-void                         nautilus_label_set_tile_opacity               (NautilusLabel                *label,
-									    int                           tile_opacity);
-int                          nautilus_label_get_tile_opacity               (const NautilusLabel          *label);
-void                         nautilus_label_set_tile_mode_vertical         (NautilusLabel                *label,
-									    NautilusSmoothTileMode        horizontal_tile_mode);
-NautilusSmoothTileMode       nautilus_label_get_tile_mode_vertical         (const NautilusLabel          *label);
-void                         nautilus_label_set_tile_mode_horizontal       (NautilusLabel                *label,
-									    NautilusSmoothTileMode        horizontal_tile_mode);
-NautilusSmoothTileMode       nautilus_label_get_tile_mode_horizontal       (const NautilusLabel          *label);
-void                         nautilus_label_set_never_smooth               (NautilusLabel                *label,
-									    gboolean                      never_smooth);
-void                         nautilus_label_set_adjust_wrap_on_resize      (NautilusLabel                *label,
-									    gboolean                      adjust_wrap_on_resize);
-gboolean                     nautilus_label_get_adjust_wrap_on_resize      (const NautilusLabel          *label);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_LABEL_H */
-
-
diff --git a/libnautilus-extensions/nautilus-labeled-image.c b/libnautilus-extensions/nautilus-labeled-image.c
deleted file mode 100644
index f7cfeb44c..000000000
--- a/libnautilus-extensions/nautilus-labeled-image.c
+++ /dev/null
@@ -1,2106 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-labeled-image.c - A labeled image.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-labeled-image.h"
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-art-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-#include "nautilus-label.h"
-#include "nautilus-image.h"
-#include "nautilus-debug-drawing.h"
-
-#include <gtk/gtkbutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcheckbutton.h>
-
-#define DEFAULT_SPACING 0
-#define DEFAULT_X_PADDING 0
-#define DEFAULT_Y_PADDING 0
-#define DEFAULT_X_ALIGNMENT 0.5
-#define DEFAULT_Y_ALIGNMENT 0.5
-
-/* Arguments */
-enum
-{
-	ARG_0,
-	ARG_FILL,
-	ARG_LABEL,
-	ARG_LABEL_POSITION,
-	ARG_PIXBUF,
-	ARG_SHOW_IMAGE,
-	ARG_SHOW_LABEL,
-	ARG_SPACING,
-	ARG_X_ALIGNMENT,
-	ARG_X_PADDING,
-	ARG_Y_ALIGNMENT,
-	ARG_Y_PADDING,
-};
-
-/* Detail member struct */
-struct _NautilusLabeledImageDetails
-{
-	GtkWidget *image;
-	GtkWidget *label;
-	GtkPositionType label_position;
-	gboolean show_label;
-	gboolean show_image;
-	guint spacing;
-	float x_alignment;
-	float y_alignment;
-	int x_padding;
-	int y_padding;
-	int fixed_image_height;
-	gboolean fill;
-};
-
-/* GtkObjectClass methods */
-static void               nautilus_labeled_image_initialize_class (NautilusLabeledImageClass  *labeled_image_class);
-static void               nautilus_labeled_image_initialize       (NautilusLabeledImage       *image);
-static void               nautilus_labeled_image_destroy          (GtkObject                  *object);
-static void               nautilus_labeled_image_set_arg          (GtkObject                  *object,
-								   GtkArg                     *arg,
-								   guint                       arg_id);
-static void               nautilus_labeled_image_get_arg          (GtkObject                  *object,
-								   GtkArg                     *arg,
-								   guint                       arg_id);
-/* GtkWidgetClass methods */
-static void               nautilus_labeled_image_size_request     (GtkWidget                  *widget,
-								   GtkRequisition             *requisition);
-static int                nautilus_labeled_image_expose_event     (GtkWidget                  *widget,
-								   GdkEventExpose             *event);
-static void               nautilus_labeled_image_size_allocate    (GtkWidget                  *widget,
-								   GtkAllocation              *allocation);
-static void               nautilus_labeled_image_map              (GtkWidget                  *widget);
-static void               nautilus_labeled_image_unmap            (GtkWidget                  *widget);
-
-/* GtkContainerClass methods */
-static void               nautilus_labeled_image_add              (GtkContainer               *container,
-								   GtkWidget                  *widget);
-static void               nautilus_labeled_image_remove           (GtkContainer               *container,
-								   GtkWidget                  *widget);
-static void               nautilus_labeled_image_forall           (GtkContainer               *container,
-								   gboolean                    include_internals,
-								   GtkCallback                 callback,
-								   gpointer                    callback_data);
-
-/* Private NautilusLabeledImage methods */
-static NautilusDimensions labeled_image_get_image_dimensions      (const NautilusLabeledImage *labeled_image);
-static NautilusDimensions labeled_image_get_label_dimensions      (const NautilusLabeledImage *labeled_image);
-static void               labeled_image_ensure_label              (NautilusLabeledImage       *labeled_image);
-static void               labeled_image_ensure_image              (NautilusLabeledImage       *labeled_image);
-static ArtIRect           labeled_image_get_content_bounds        (const NautilusLabeledImage *labeled_image);
-static NautilusDimensions labeled_image_get_content_dimensions    (const NautilusLabeledImage *labeled_image);
-static void               labeled_image_update_alignments         (NautilusLabeledImage       *labeled_image);
-static gboolean           labeled_image_show_label                (const NautilusLabeledImage *labeled_image);
-static gboolean           labeled_image_show_image                (const NautilusLabeledImage *labeled_image);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusLabeledImage, nautilus_labeled_image, GTK_TYPE_CONTAINER)
-
-/* Class init methods */
-static void
-nautilus_labeled_image_initialize_class (NautilusLabeledImageClass *labeled_image_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (labeled_image_class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (labeled_image_class);
-	GtkContainerClass *container_class = GTK_CONTAINER_CLASS (labeled_image_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_labeled_image_destroy;
-	object_class->set_arg = nautilus_labeled_image_set_arg;
-	object_class->get_arg = nautilus_labeled_image_get_arg;
-	
- 	/* GtkWidgetClass */
- 	widget_class->size_request = nautilus_labeled_image_size_request;
-	widget_class->size_allocate = nautilus_labeled_image_size_allocate;
- 	widget_class->expose_event = nautilus_labeled_image_expose_event;
-	widget_class->map = nautilus_labeled_image_map;
-	widget_class->unmap = nautilus_labeled_image_unmap;
-
- 	/* GtkContainerClass */
-	container_class->add = nautilus_labeled_image_add;
-	container_class->remove = nautilus_labeled_image_remove;
-	container_class->forall = nautilus_labeled_image_forall;
-  
-	/* Arguments */
-	gtk_object_add_arg_type ("NautilusLabeledImage::pixbuf",
-				 GTK_TYPE_POINTER,
-				 GTK_ARG_READWRITE,
-				 ARG_PIXBUF);
-	gtk_object_add_arg_type ("NautilusLabeledImage::label",
-				 GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE,
-				 ARG_LABEL);
-	gtk_object_add_arg_type ("NautilusLabeledImage::label_position",
-				 GTK_TYPE_POSITION_TYPE,
-				 GTK_ARG_READWRITE,
-				 ARG_LABEL_POSITION);
-	gtk_object_add_arg_type ("NautilusLabeledImage::show_label",
-				 GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE,
-				 ARG_SHOW_LABEL);
-	gtk_object_add_arg_type ("NautilusLabeledImage::show_image",
-				 GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE,
-				 ARG_SHOW_IMAGE);
-	gtk_object_add_arg_type ("NautilusLabeledImage::spacing",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_SPACING);
-	gtk_object_add_arg_type ("NautilusLabeledImage::x_padding",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_X_PADDING);
-	gtk_object_add_arg_type ("NautilusLabeledImage::y_padding",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_Y_PADDING);
-	gtk_object_add_arg_type ("NautilusLabeledImage::x_alignment",
-				 GTK_TYPE_FLOAT,
-				 GTK_ARG_READWRITE,
-				 ARG_X_ALIGNMENT);
-	gtk_object_add_arg_type ("NautilusLabeledImage::y_alignment",
-				 GTK_TYPE_FLOAT,
-				 GTK_ARG_READWRITE,
-				 ARG_Y_ALIGNMENT);
-	gtk_object_add_arg_type ("NautilusLabeledImage::fill",
-				 GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE,
-				 ARG_FILL);
-}
-
-void
-nautilus_labeled_image_initialize (NautilusLabeledImage *labeled_image)
-{
-	GTK_WIDGET_SET_FLAGS (labeled_image, GTK_NO_WINDOW);
-
-	labeled_image->details = g_new0 (NautilusLabeledImageDetails, 1);
-	labeled_image->details->show_label = TRUE;
-	labeled_image->details->show_image = TRUE;
-	labeled_image->details->label_position = GTK_POS_BOTTOM;
-	labeled_image->details->spacing = DEFAULT_SPACING;
-	labeled_image->details->x_padding = DEFAULT_X_PADDING;
-	labeled_image->details->y_padding = DEFAULT_Y_PADDING;
-	labeled_image->details->x_alignment = DEFAULT_X_ALIGNMENT;
-	labeled_image->details->y_alignment = DEFAULT_Y_ALIGNMENT;
-	labeled_image->details->fixed_image_height = 0;
-
-	nautilus_labeled_image_set_fill (labeled_image, FALSE);
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_labeled_image_destroy (GtkObject *object)
-{
- 	NautilusLabeledImage *labeled_image;
-	
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (object));
-
-	labeled_image = NAUTILUS_LABELED_IMAGE (object);
-
-	if (labeled_image->details->image != NULL) {
-		gtk_widget_destroy (labeled_image->details->image);
-		labeled_image->details->image = NULL;
-	}
-
-	if (labeled_image->details->label != NULL) {
-		gtk_widget_destroy (labeled_image->details->label);
-		labeled_image->details->label = NULL;
-	}
-
-	g_free (labeled_image->details);
-
-	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-static void
-nautilus_labeled_image_set_arg (GtkObject *object,
-				GtkArg *arg,
-				guint arg_id)
-{
-	NautilusLabeledImage *labeled_image;
-	
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (object));
-
- 	labeled_image = NAUTILUS_LABELED_IMAGE (object);
-
- 	switch (arg_id)
-	{
-	case ARG_PIXBUF:
-		nautilus_labeled_image_set_pixbuf (labeled_image, (GdkPixbuf *) GTK_VALUE_POINTER (*arg));
-		break;
-
-	case ARG_LABEL:
-		nautilus_labeled_image_set_text (labeled_image, GTK_VALUE_STRING (*arg));
-		break;
-
-	case ARG_LABEL_POSITION:
-		nautilus_labeled_image_set_label_position (labeled_image, GTK_VALUE_ENUM (*arg));
-		break;
-
-	case ARG_SHOW_LABEL:
-		nautilus_labeled_image_set_show_label (labeled_image, GTK_VALUE_BOOL (*arg));
-		break;
-
-	case ARG_SHOW_IMAGE:
-		nautilus_labeled_image_set_show_image (labeled_image, GTK_VALUE_BOOL (*arg));
-		break;
-
-	case ARG_SPACING:
-		nautilus_labeled_image_set_spacing (labeled_image, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_X_PADDING:
-		nautilus_labeled_image_set_x_padding (labeled_image, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_Y_PADDING:
-		nautilus_labeled_image_set_y_padding (labeled_image, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_X_ALIGNMENT:
-		nautilus_labeled_image_set_x_alignment (labeled_image, GTK_VALUE_FLOAT (*arg));
-		break;
-
-	case ARG_Y_ALIGNMENT:
-		nautilus_labeled_image_set_y_alignment (labeled_image, GTK_VALUE_FLOAT (*arg));
-		break;
-
-	case ARG_FILL:
-		nautilus_labeled_image_set_fill (labeled_image, GTK_VALUE_BOOL (*arg));
-		break;
- 	default:
-		g_assert_not_reached ();
-	}
-}
-
-static void
-nautilus_labeled_image_get_arg (GtkObject *object,
-				GtkArg *arg,
-				guint arg_id)
-{
-	NautilusLabeledImage *labeled_image;
-
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (object));
-	
-	labeled_image = NAUTILUS_LABELED_IMAGE (object);
-
- 	switch (arg_id)
-	{
-	case ARG_PIXBUF:
-		GTK_VALUE_POINTER (*arg) = nautilus_labeled_image_get_pixbuf (labeled_image);
-		break;
-
-	case ARG_LABEL:
-		GTK_VALUE_STRING (*arg) = nautilus_labeled_image_get_text (labeled_image);
-		break;
-
-	case ARG_LABEL_POSITION:
-		GTK_VALUE_ENUM (*arg) = nautilus_labeled_image_get_label_position (labeled_image);
-		break;
-
-	case ARG_SHOW_LABEL:
-		GTK_VALUE_BOOL (*arg) = nautilus_labeled_image_get_show_label (labeled_image);
-		break;
-
-	case ARG_SHOW_IMAGE:
-		GTK_VALUE_BOOL (*arg) = nautilus_labeled_image_get_show_image (labeled_image);
-		break;
-
-	case ARG_SPACING:
-		GTK_VALUE_UINT (*arg) = nautilus_labeled_image_get_spacing (labeled_image);
-		break;
-
-	case ARG_X_PADDING:
-		GTK_VALUE_INT (*arg) = nautilus_labeled_image_get_x_padding (labeled_image);
-		break;
-
-	case ARG_Y_PADDING:
-		GTK_VALUE_INT (*arg) = nautilus_labeled_image_get_y_padding (labeled_image);
-		break;
-
-	case ARG_X_ALIGNMENT:
-		GTK_VALUE_FLOAT (*arg) = nautilus_labeled_image_get_x_alignment (labeled_image);
-		break;
-
-	case ARG_Y_ALIGNMENT:
-		GTK_VALUE_FLOAT (*arg) = nautilus_labeled_image_get_y_alignment (labeled_image);
-		break;
-
-	case ARG_FILL:
-		GTK_VALUE_BOOL (*arg) = nautilus_labeled_image_get_fill (labeled_image);
-		break;
-
- 	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* GtkWidgetClass methods */
-static void
-nautilus_labeled_image_size_request (GtkWidget *widget,
-				     GtkRequisition *requisition)
-{
-	NautilusLabeledImage *labeled_image;
- 	NautilusDimensions content_dimensions;
-
- 	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (widget));
- 	g_return_if_fail (requisition != NULL);
-
-  	labeled_image = NAUTILUS_LABELED_IMAGE (widget);
-	
- 	content_dimensions = labeled_image_get_content_dimensions (labeled_image);
-
-	requisition->width = 
-		MAX (1, content_dimensions.width) +
-		2 * labeled_image->details->x_padding;
-
-	requisition->height = 
-		MAX (1, content_dimensions.height) +
-		2 * labeled_image->details->y_padding;
-}
-
-static void
-nautilus_labeled_image_size_allocate (GtkWidget *widget,
-				      GtkAllocation *allocation)
-{
-	NautilusLabeledImage *labeled_image;
- 	ArtIRect image_bounds;
-	ArtIRect label_bounds;
-
- 	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (widget));
- 	g_return_if_fail (allocation != NULL);
-
-  	labeled_image = NAUTILUS_LABELED_IMAGE (widget);
-
-	widget->allocation = *allocation;
-	
- 	label_bounds = nautilus_labeled_image_get_label_bounds (labeled_image);
-	if (!art_irect_empty (&label_bounds)) {
-		GtkAllocation label_allocation;
-
-		label_allocation.x = label_bounds.x0;
-		label_allocation.y = label_bounds.y0;
-		label_allocation.width = nautilus_art_irect_get_width (&label_bounds);
-		label_allocation.height = nautilus_art_irect_get_height (&label_bounds);
-
-		gtk_widget_size_allocate (labeled_image->details->label, &label_allocation);
-	}
-
- 	image_bounds = nautilus_labeled_image_get_image_bounds (labeled_image);
-	if (!art_irect_empty (&image_bounds)) {
-		GtkAllocation image_allocation;
-		
-		image_allocation.x = image_bounds.x0;
-		image_allocation.y = image_bounds.y0;
-		image_allocation.width = nautilus_art_irect_get_width (&image_bounds);
-		image_allocation.height = nautilus_art_irect_get_height (&image_bounds);
-
-		gtk_widget_size_allocate (labeled_image->details->image, &image_allocation);
-	}
-}
-
-static int
-nautilus_labeled_image_expose_event (GtkWidget *widget,
-				     GdkEventExpose *event)
-{
-	NautilusLabeledImage *labeled_image;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (widget), TRUE);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
-	g_return_val_if_fail (event != NULL, TRUE);
-
-  	labeled_image = NAUTILUS_LABELED_IMAGE (widget);
-
-	if (labeled_image_show_label (labeled_image)) {
-		GdkEventExpose label_event;
-		
-		label_event = *event;
-
-		if (GTK_WIDGET_DRAWABLE (labeled_image->details->label) &&
-		    GTK_WIDGET_NO_WINDOW (labeled_image->details->label) &&
-		    gtk_widget_intersect (labeled_image->details->label, &event->area, &label_event.area)) {
-			gtk_widget_event (labeled_image->details->label, (GdkEvent *) &label_event);
-		}
-	}
-	
-	if (labeled_image_show_image (labeled_image)) {
-		GdkEventExpose image_event;
-
-		image_event = *event;
-
-		if (GTK_WIDGET_DRAWABLE (labeled_image->details->image) &&
-		    GTK_WIDGET_NO_WINDOW (labeled_image->details->image) &&
-		    gtk_widget_intersect (labeled_image->details->image, &event->area, &image_event.area)) {
-			gtk_widget_event (labeled_image->details->image, (GdkEvent *) &image_event);
-		}
-	}
-
-	return FALSE;
-}
-
-static void
-nautilus_labeled_image_map (GtkWidget *widget)
-{
-	NautilusLabeledImage *labeled_image;
-
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (widget));
-	
-	labeled_image = NAUTILUS_LABELED_IMAGE (widget);
-
- 	GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
-	
-	if (labeled_image_show_label (labeled_image)) {
-		if (GTK_WIDGET_VISIBLE (labeled_image->details->label) &&
-		    !GTK_WIDGET_MAPPED (labeled_image->details->label)) {
-			gtk_widget_map (labeled_image->details->label);
-		}
-	}
-
-	if (labeled_image_show_image (labeled_image)) {
-		if (GTK_WIDGET_VISIBLE (labeled_image->details->image) &&
-		    !GTK_WIDGET_MAPPED (labeled_image->details->image)) {
-			gtk_widget_map (labeled_image->details->image);
-		}
-	}
-}
-
-static void
-nautilus_labeled_image_unmap (GtkWidget *widget)
-{
-	NautilusLabeledImage *labeled_image;
-
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (widget));
-	
-	labeled_image = NAUTILUS_LABELED_IMAGE (widget);
-
-	GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
-	
-	if (labeled_image->details->label != NULL) {
-		if (GTK_WIDGET_VISIBLE (labeled_image->details->label) &&
-		    GTK_WIDGET_MAPPED (labeled_image->details->label)) {
-			gtk_widget_unmap (labeled_image->details->label);
-		}
-	}
-
-	if (labeled_image->details->image != NULL) {
-		if (GTK_WIDGET_VISIBLE (labeled_image->details->image) &&
-		    GTK_WIDGET_MAPPED (labeled_image->details->image)) {
-			gtk_widget_unmap (labeled_image->details->image);
-		}
-	}
-}
-
-/* GtkContainerClass methods */
-static void
-nautilus_labeled_image_add (GtkContainer *container,
-			    GtkWidget *child)
-{
-	g_return_if_fail (container != NULL);
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (container));
-	g_return_if_fail (NAUTILUS_IS_LABEL (child) || NAUTILUS_IS_IMAGE (child));
-
-	gtk_widget_set_parent (child, GTK_WIDGET (container));
-
-	if (GTK_WIDGET_REALIZED (container)) {
-		gtk_widget_realize (child);
-	}
-	
-	if (GTK_WIDGET_VISIBLE (container) && GTK_WIDGET_VISIBLE (child)) {
-		if (GTK_WIDGET_MAPPED (container)) {
-			gtk_widget_map (child);
-		}
-		
-		gtk_widget_queue_resize (child);
-	}
-}
-
-static void
-nautilus_labeled_image_remove (GtkContainer *container,
-			       GtkWidget *child)
-{
-	NautilusLabeledImage *labeled_image;
-	gboolean child_was_visible;
-	
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (container));
-	g_return_if_fail (NAUTILUS_IS_LABEL (child) || NAUTILUS_IS_IMAGE (child));
-	
-	labeled_image = NAUTILUS_LABELED_IMAGE (container);;
-
-	g_return_if_fail (child == labeled_image->details->image || child == labeled_image->details->label);
-
-	child_was_visible = GTK_WIDGET_VISIBLE (child);
-
-	gtk_widget_unparent (child);
-
-	if (child_was_visible) {
-		gtk_widget_queue_resize (GTK_WIDGET (container));
-	}
-
-	if (labeled_image->details->image == child) {
-		labeled_image->details->image = NULL;
-	}
-
-	if (labeled_image->details->label == child) {
-		labeled_image->details->label = NULL;
-	}
-}
-
-static void
-nautilus_labeled_image_forall (GtkContainer *container,
-			       gboolean include_internals,
-			       GtkCallback callback,
-			       gpointer callback_data)
-{
-	NautilusLabeledImage *labeled_image;
-	
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (container));
-	g_return_if_fail (callback != NULL);
-	
-	labeled_image = NAUTILUS_LABELED_IMAGE (container);;
-	
-	if (include_internals) {
-		if (labeled_image->details->image != NULL) {
-			(* callback) (labeled_image->details->image, callback_data);
-		}
-
-		if (labeled_image->details->label != NULL) {
-			(* callback) (labeled_image->details->label, callback_data);
-		}
-	}
-}
-
-/* Private NautilusLabeledImage methods */
-static gboolean
-is_fixed_height (const NautilusLabeledImage *labeled_image)
-{
-	return labeled_image->details->fixed_image_height > 0;
-}
-
-static NautilusDimensions
-labeled_image_get_image_dimensions (const NautilusLabeledImage *labeled_image)
-{
-	NautilusDimensions image_dimensions;
-	GtkRequisition image_requisition;	
-
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NAUTILUS_DIMENSIONS_EMPTY);
-
-	if (!labeled_image_show_image (labeled_image)) {
-		return NAUTILUS_DIMENSIONS_EMPTY;
-	}
-	
-	gtk_widget_size_request (labeled_image->details->image, &image_requisition);
-
-	image_dimensions.width = (int) image_requisition.width;
-	image_dimensions.height = (int) image_requisition.height;
-
-	if (is_fixed_height (labeled_image)) {
-		image_dimensions.height = labeled_image->details->fixed_image_height;
-	}
-
-	return image_dimensions;
-}
-
-static NautilusDimensions
-labeled_image_get_label_dimensions (const NautilusLabeledImage *labeled_image)
-{
-	NautilusDimensions label_dimensions;
-	GtkRequisition label_requisition;	
-
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NAUTILUS_DIMENSIONS_EMPTY);
-
-	if (!labeled_image_show_label (labeled_image)) {
-		return NAUTILUS_DIMENSIONS_EMPTY;
-	}
-	
-	gtk_widget_size_request (labeled_image->details->label, &label_requisition);
-	
-	label_dimensions.width = (int) label_requisition.width;
-	label_dimensions.height = (int) label_requisition.height;
-
-	return label_dimensions;
-}
-
-static ArtIRect
-labeled_image_get_image_bounds_fill (const NautilusLabeledImage *labeled_image)
-{
-	ArtIRect image_bounds;
-	NautilusDimensions image_dimensions;
-	ArtIRect content_bounds;
-	ArtIRect bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NAUTILUS_ART_IRECT_EMPTY);
-
-	image_dimensions = labeled_image_get_image_dimensions (labeled_image);
-
-	if (nautilus_dimensions_empty (&image_dimensions)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	content_bounds = labeled_image_get_content_bounds (labeled_image);
-	bounds = nautilus_gtk_widget_get_bounds (GTK_WIDGET (labeled_image));
-	
-	if (!labeled_image_show_label (labeled_image)) {
-		image_bounds = bounds;
-	} else {
-		switch (labeled_image->details->label_position) {
-		case GTK_POS_LEFT:
-			image_bounds.y0 = bounds.y0;
-			image_bounds.x0 = content_bounds.x1 - image_dimensions.width;
-			image_bounds.y1 = bounds.y1;
-			image_bounds.x1 = bounds.x1;
-			break;
-
-		case GTK_POS_RIGHT:
-			image_bounds.y0 = bounds.y0;
-			image_bounds.x0 = bounds.x0;
-			image_bounds.y1 = bounds.y1;
-			image_bounds.x1 = content_bounds.x0 + image_dimensions.width;
-			break;
-
-		case GTK_POS_TOP:
-			image_bounds.x0 = bounds.x0;
-			image_bounds.y0 = content_bounds.y1 - image_dimensions.height;
-			image_bounds.x1 = bounds.x1;
-			image_bounds.y1 = bounds.y1;
-			break;
-
-		case GTK_POS_BOTTOM:
-			image_bounds.x0 = bounds.x0;
-			image_bounds.y0 = bounds.y0;
-			image_bounds.x1 = bounds.x1;
-			image_bounds.y1 = content_bounds.y0 + image_dimensions.height;
-			break;
-		}
-	}
-
-	return image_bounds;
-}
-
-ArtIRect
-nautilus_labeled_image_get_image_bounds (const NautilusLabeledImage *labeled_image)
-{
-	NautilusDimensions image_dimensions;
-	NautilusDimensions label_dimensions;
-	GtkRequisition image_requisition;
-	ArtIRect image_bounds;
-	ArtIRect content_bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NAUTILUS_ART_IRECT_EMPTY);
-
-	if (labeled_image->details->fill) {
-		return labeled_image_get_image_bounds_fill (labeled_image);
-	}
-
-	/* get true real dimensions if we're in fixed height mode */
-	if (is_fixed_height (labeled_image) && labeled_image_show_image (labeled_image)) {
-		gtk_widget_size_request (labeled_image->details->image, &image_requisition);
-		image_dimensions.width = (int) image_requisition.width;
-		image_dimensions.height = (int) image_requisition.height;
-	} else {
-		image_dimensions = labeled_image_get_image_dimensions (labeled_image);
-	}
-	
-	label_dimensions = labeled_image_get_label_dimensions (labeled_image);
-
-	if (nautilus_dimensions_empty (&image_dimensions)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	content_bounds = labeled_image_get_content_bounds (labeled_image);
-	
-	if (!labeled_image_show_label (labeled_image)) {
-		image_bounds.x0 = 
-			content_bounds.x0 +
-			(nautilus_art_irect_get_width (&content_bounds) - image_dimensions.width) / 2;
-		image_bounds.y0 = 
-			content_bounds.y0 +
-			(nautilus_art_irect_get_height (&content_bounds) - image_dimensions.height) / 2;
-	} else {
-		switch (labeled_image->details->label_position) {
-		case GTK_POS_LEFT:
-			image_bounds.x0 = content_bounds.x1 - image_dimensions.width;
-			image_bounds.y0 = 
-				content_bounds.y0 +
-				(nautilus_art_irect_get_height (&content_bounds) - image_dimensions.height) / 2;
-			break;
-
-		case GTK_POS_RIGHT:
-			image_bounds.x0 = content_bounds.x0;
-			image_bounds.y0 = 
-				content_bounds.y0 +
-				(nautilus_art_irect_get_height (&content_bounds) - image_dimensions.height) / 2;
-			break;
-
-		case GTK_POS_TOP:
-			image_bounds.x0 = 
-				content_bounds.x0 +
-				(nautilus_art_irect_get_width (&content_bounds) - image_dimensions.width) / 2;
-			image_bounds.y0 = content_bounds.y1 - image_dimensions.height;
-			break;
-
-		case GTK_POS_BOTTOM:
-			image_bounds.x0 = 
-				content_bounds.x0 +
-				(nautilus_art_irect_get_width (&content_bounds) - image_dimensions.width) / 2;
-				
-			if (is_fixed_height (labeled_image)) {	
-				image_bounds.y0 = content_bounds.y0 + nautilus_art_irect_get_height (&content_bounds)
-						  - image_dimensions.height
-						  - label_dimensions.height
-						  - labeled_image->details->spacing;
-			} else {
-				image_bounds.y0 = content_bounds.y0;
-			}	
-
-			break;
-		}
-	}
-	
-	image_bounds.x1 = image_bounds.x0 + image_dimensions.width;
-	image_bounds.y1 = image_bounds.y0 + image_dimensions.height;
-
-	return image_bounds;
-}
-
-static ArtIRect
-labeled_image_get_label_bounds_fill (const NautilusLabeledImage *labeled_image)
-{
-	ArtIRect label_bounds;
-	NautilusDimensions label_dimensions;
-	ArtIRect content_bounds;
-	ArtIRect bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NAUTILUS_ART_IRECT_EMPTY);
-
-	label_dimensions = labeled_image_get_label_dimensions (labeled_image);
-
-	if (nautilus_dimensions_empty (&label_dimensions)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	content_bounds = labeled_image_get_content_bounds (labeled_image);
-	bounds = nautilus_gtk_widget_get_bounds (GTK_WIDGET (labeled_image));
-
-	/* Only the label is shown */
-	if (!labeled_image_show_image (labeled_image)) {
-		label_bounds = bounds;
-	/* Both label and image are shown */
-	} else {
-		switch (labeled_image->details->label_position) {
-		case GTK_POS_LEFT:
-			label_bounds.y0 = bounds.y0;
-			label_bounds.x0 = bounds.x0;
-			label_bounds.y1 = bounds.y1;
-			label_bounds.x1 = content_bounds.x0 + label_dimensions.width;
-			break;
-
-		case GTK_POS_RIGHT:
-			label_bounds.y0 = bounds.y0;
-			label_bounds.x0 = content_bounds.x1 - label_dimensions.width;
-			label_bounds.y1 = bounds.y1;
-			label_bounds.x1 = bounds.x1;
-			break;
-
-		case GTK_POS_TOP:
-			label_bounds.x0 = bounds.x0;
-			label_bounds.y0 = bounds.y0;
-			label_bounds.x1 = bounds.x1;
-			label_bounds.y1 = content_bounds.y0 + label_dimensions.height;
-			break;
-
-		case GTK_POS_BOTTOM:
-			label_bounds.x0 = bounds.x0;
-			label_bounds.y0 = content_bounds.y1 - label_dimensions.height;
-			label_bounds.x1 = bounds.x1;
-			label_bounds.y1 = bounds.y1;
-			break;
-		}
-	}
-
-	return label_bounds;
-}
-
-ArtIRect
-nautilus_labeled_image_get_label_bounds (const NautilusLabeledImage *labeled_image)
-{
-	ArtIRect label_bounds;
-	NautilusDimensions label_dimensions;
-	ArtIRect content_bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NAUTILUS_ART_IRECT_EMPTY);
-
-	if (labeled_image->details->fill) {
-		return labeled_image_get_label_bounds_fill (labeled_image);
-	}
-
-	label_dimensions = labeled_image_get_label_dimensions (labeled_image);
-
-	if (nautilus_dimensions_empty (&label_dimensions)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	content_bounds = labeled_image_get_content_bounds (labeled_image);
-
-	/* Only the label is shown */
-	if (!labeled_image_show_image (labeled_image)) {
-		label_bounds.x0 = 
-			content_bounds.x0 +
-			(nautilus_art_irect_get_width (&content_bounds) - label_dimensions.width) / 2;
-		label_bounds.y0 = 
-			content_bounds.y0 +
-			(nautilus_art_irect_get_height (&content_bounds) - label_dimensions.height) / 2;
-	/* Both label and image are shown */
-	} else {
-		switch (labeled_image->details->label_position) {
-		case GTK_POS_LEFT:
-			label_bounds.x0 = content_bounds.x0;
-			label_bounds.y0 = 
-				content_bounds.y0 +
-				(nautilus_art_irect_get_height (&content_bounds) - label_dimensions.height) / 2;
-			break;
-
-		case GTK_POS_RIGHT:
-			label_bounds.x0 = content_bounds.x1 - label_dimensions.width;
-			label_bounds.y0 = 
-				content_bounds.y0 +
-				(nautilus_art_irect_get_height (&content_bounds) - label_dimensions.height) / 2;
-			break;
-
-		case GTK_POS_TOP:
-			label_bounds.x0 = 
-				content_bounds.x0 +
-				(nautilus_art_irect_get_width (&content_bounds) - label_dimensions.width) / 2;
-			label_bounds.y0 = content_bounds.y0;
-			break;
-
-		case GTK_POS_BOTTOM:
-			label_bounds.x0 = 
-				content_bounds.x0 +
-				(nautilus_art_irect_get_width (&content_bounds) - label_dimensions.width) / 2;
-			label_bounds.y0 = content_bounds.y1 - label_dimensions.height;
-			break;
-		}
-	}
-	
-	label_bounds.x1 = label_bounds.x0 + label_dimensions.width;
-	label_bounds.y1 = label_bounds.y0 + label_dimensions.height;
-
-	return label_bounds;
-}
-
-static void
-labeled_image_update_alignments (NautilusLabeledImage *labeled_image)
-{
-
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	if (labeled_image->details->label != NULL) {
-		float x_alignment;
-		float y_alignment;
-		
-		if (labeled_image->details->fill) {	
-			x_alignment = GTK_MISC (labeled_image->details->label)->xalign;
-			y_alignment = GTK_MISC (labeled_image->details->label)->yalign;
-			
-			/* Only the label is shown */
-			if (!labeled_image_show_image (labeled_image)) {
-				x_alignment = 0.5;
-				y_alignment = 0.5;
-			/* Both label and image are shown */
-			} else {
-				switch (labeled_image->details->label_position) {
-				case GTK_POS_LEFT:
-					x_alignment = 1.0;
-					y_alignment = 0.5;
-					break;
-					
-				case GTK_POS_RIGHT:
-					x_alignment = 0.0;
-					y_alignment = 0.5;
-					break;
-					
-				case GTK_POS_TOP:
-					x_alignment = 0.5;
-					y_alignment = 1.0;
-					break;
-					
-				case GTK_POS_BOTTOM:
-					x_alignment = 0.5;
-					y_alignment = 0.0;
-					break;
-				}
-				
-			}
-
-			gtk_misc_set_alignment (GTK_MISC (labeled_image->details->label),
-						x_alignment,
-						y_alignment);
-		}
-	}
-
-	if (labeled_image->details->image != NULL) {
-		float x_alignment;
-		float y_alignment;
-		
-		if (labeled_image->details->fill) {	
-			x_alignment = GTK_MISC (labeled_image->details->image)->xalign;
-			y_alignment = GTK_MISC (labeled_image->details->image)->yalign;
-			
-			/* Only the image is shown */
-			if (!labeled_image_show_label (labeled_image)) {
-				x_alignment = 0.5;
-				y_alignment = 0.5;
-			/* Both label and image are shown */
-			} else {
-				switch (labeled_image->details->label_position) {
-				case GTK_POS_LEFT:
-					x_alignment = 0.0;
-					y_alignment = 0.5;
-					break;
-
-				case GTK_POS_RIGHT:
-					x_alignment = 1.0;
-					y_alignment = 0.5;
-					break;
-					
-				case GTK_POS_TOP:
-					x_alignment = 0.5;
-					y_alignment = 0.0;
-					break;
-					
-				case GTK_POS_BOTTOM:
-					x_alignment = 0.5;
-					y_alignment = 1.0;
-					break;
-				}
-			}
-			
-			gtk_misc_set_alignment (GTK_MISC (labeled_image->details->image),
-						x_alignment,
-						y_alignment);
-		}
-	}
-}
-
-static NautilusDimensions
-labeled_image_get_content_dimensions (const NautilusLabeledImage *labeled_image)
-{
-	NautilusDimensions image_dimensions;
-	NautilusDimensions label_dimensions;
-	NautilusDimensions content_dimensions;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NAUTILUS_DIMENSIONS_EMPTY);
-
-	image_dimensions = labeled_image_get_image_dimensions (labeled_image);
-	label_dimensions = labeled_image_get_label_dimensions (labeled_image);
-
-	content_dimensions = NAUTILUS_DIMENSIONS_EMPTY;
-
-	/* Both shown */
-	if (!nautilus_dimensions_empty (&image_dimensions) && !nautilus_dimensions_empty (&label_dimensions)) {
-		content_dimensions.width = 
-			image_dimensions.width + labeled_image->details->spacing + label_dimensions.width;
-		switch (labeled_image->details->label_position) {
-		case GTK_POS_LEFT:
-		case GTK_POS_RIGHT:
-			content_dimensions.width = 
-				image_dimensions.width + labeled_image->details->spacing + label_dimensions.width;
-			content_dimensions.height = MAX (image_dimensions.height, label_dimensions.height);
-			break;
-
-		case GTK_POS_TOP:
-		case GTK_POS_BOTTOM:
-			content_dimensions.width = MAX (image_dimensions.width, label_dimensions.width);
-			content_dimensions.height = 
-				image_dimensions.height + labeled_image->details->spacing + label_dimensions.height;
-			break;
-		}
-	/* Only image shown */
-	} else if (!nautilus_dimensions_empty (&image_dimensions)) {
-		content_dimensions.width = image_dimensions.width;
-		content_dimensions.height = image_dimensions.height;
-	/* Only label shown */
-	} else {
-		content_dimensions.width = label_dimensions.width;
-		content_dimensions.height = label_dimensions.height;
-	}
-
-	return content_dimensions;
-}
-
-static ArtIRect
-labeled_image_get_content_bounds (const NautilusLabeledImage *labeled_image)
-{
-	NautilusDimensions content_dimensions;
-	ArtIRect content_bounds;
-	ArtIRect bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NAUTILUS_ART_IRECT_EMPTY);
-
-	bounds = nautilus_gtk_widget_get_bounds (GTK_WIDGET (labeled_image));
-
-	content_dimensions = labeled_image_get_content_dimensions (labeled_image);
-	content_bounds = nautilus_art_irect_align (&bounds,
-						   content_dimensions.width,
-						   content_dimensions.height,
-						   labeled_image->details->x_alignment,
-						   labeled_image->details->y_alignment);
-
-	return content_bounds;
-}
-
-static void
-labeled_image_ensure_label (NautilusLabeledImage *labeled_image)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->label != NULL) {
-		return;
-	}
-
- 	labeled_image->details->label = nautilus_label_new (NULL);
-	gtk_container_add (GTK_CONTAINER (labeled_image), labeled_image->details->label);
-	gtk_widget_show (labeled_image->details->label);
-}
-
-static void
-labeled_image_ensure_image (NautilusLabeledImage *labeled_image)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->image != NULL) {
-		return;
-	}
-
- 	labeled_image->details->image = nautilus_image_new (NULL);
-	gtk_container_add (GTK_CONTAINER (labeled_image), labeled_image->details->image);
-	gtk_widget_show (labeled_image->details->image);
-}
-
-static gboolean
-labeled_image_show_image (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), FALSE);
-	
-	return labeled_image->details->image != NULL && labeled_image->details->show_image;
-}
-
-static gboolean
-labeled_image_show_label (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), FALSE);
-
-	return labeled_image->details->label != NULL && labeled_image->details->show_label;
-}
-
-/**
- * nautilus_labeled_image_new:
- * @text: Text to use for label or NULL.
- * @pixbuf: Pixbuf to use for image or NULL.
- *
- * Returns A newly allocated NautilusLabeledImage.  If the &text parameter is not
- * NULL then the LabeledImage will show a label.  If the &pixbuf parameter is not
- * NULL then the LabeledImage will show a pixbuf.  Either of these can be NULL at
- * creation time.  
- *
- * Later in the lifetime of the widget you can invoke methods that affect the 
- * label and/or the image.  If at creation time these were NULL, then they will
- * be created as neeeded.
- *
- * Thus, using this widget in place of NautilusImage or NautilusLabel is "free" with
- * only the GtkObject and function call overhead.
- *
- */
-GtkWidget*
-nautilus_labeled_image_new (const char *text,
-			    GdkPixbuf *pixbuf)
-{
-	NautilusLabeledImage *labeled_image;
-
-	labeled_image = NAUTILUS_LABELED_IMAGE (gtk_widget_new (nautilus_labeled_image_get_type (), NULL));
-	
-	if (text != NULL) {
-		nautilus_labeled_image_set_text (labeled_image, text);
-	}
-
-	if (pixbuf != NULL) {
-		nautilus_labeled_image_set_pixbuf (labeled_image, pixbuf);
-	}
-
-	labeled_image_update_alignments (labeled_image);
-
-	return GTK_WIDGET (labeled_image);
-}
-
-/**
- * nautilus_labeled_image_new_from_file_name:
- * @text: Text to use for label or NULL.
- * @file_name: File name of picture to use for pixbuf.  Cannot be NULL.
- *
- * Returns A newly allocated NautilusLabeledImage.  If the &text parameter is not
- * NULL then the LabeledImage will show a label.
- *
- */
-GtkWidget*
-nautilus_labeled_image_new_from_file_name (const char *text,
-					   const char *pixbuf_file_name)
-{
-	NautilusLabeledImage *labeled_image;
-
-	g_return_val_if_fail (pixbuf_file_name != NULL, NULL);
-
-	labeled_image = NAUTILUS_LABELED_IMAGE (nautilus_labeled_image_new (text, NULL));
-	nautilus_labeled_image_set_pixbuf_from_file_name (labeled_image, pixbuf_file_name);
-	return GTK_WIDGET (labeled_image);
-}
-
-/**
- * nautilus_labeled_image_set_label_position:
- * @labeled_image: A NautilusLabeledImage.
- * @label_position: The position of the label with respect to the image.
- *
- * Set the position of the label with respect to the image as follows:
- *
- * GTK_POS_LEFT:
- *   [ <label> <image> ]
- *
- * GTK_POS_RIGHT:
- *   [ <image> <label> ]
- *
- * GTK_POS_TOP:
- *   [ <label> ]
- *   [ <image> ]
- *
- * GTK_POS_BOTTOM:
- *   [ <image> ]
- *   [ <label> ]
- *
- */
-void
-nautilus_labeled_image_set_label_position (NautilusLabeledImage *labeled_image,
-					   GtkPositionType label_position)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	g_return_if_fail (label_position >= GTK_POS_LEFT);
-	g_return_if_fail (label_position <= GTK_POS_BOTTOM);
-	
-	if (labeled_image->details->label_position == label_position) {
-		return;
-	}
-
-	labeled_image->details->label_position = label_position;
-
-	labeled_image_update_alignments (labeled_image);
-
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_get_label_postiion:
- * @labeled_image: A NautilusLabeledImage.
- *
- * Returns an enumeration indicating the position of the label with respect to the image.
- */
-GtkPositionType
-nautilus_labeled_image_get_label_position (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), 0);
-	
-	return labeled_image->details->label_position;
-}
-
-/**
- * nautilus_labeled_image_set_show_label:
- * @labeled_image: A NautilusLabeledImage.
- * @show_image: A boolean value indicating whether the label should be shown.
- *
- * Update the labeled image to either show or hide the internal label widget.
- * This function doesnt have any effect if the LabeledImage doesnt already
- * contain an label.
- */
-void
-nautilus_labeled_image_set_show_label (NautilusLabeledImage *labeled_image,
-				       gboolean show_label)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->show_label == show_label) {
-		return;
-	}
-
-	labeled_image->details->show_label = show_label;
-
-	if (labeled_image->details->label != NULL) {
-		if (labeled_image->details->show_label) {
-			gtk_widget_show (labeled_image->details->label);
-		} else {
-			gtk_widget_hide (labeled_image->details->label);
-		}
-	}
-
-	labeled_image_update_alignments (labeled_image);
-
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_get_show_label:
- * @labeled_image: A NautilusLabeledImage.
- *
- * Returns a boolean value indicating whether the internal label is shown.
- */
-gboolean
-nautilus_labeled_image_get_show_label (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), 0);
-	
-	return labeled_image->details->show_label;
-}
-
-/**
- * nautilus_labeled_image_set_show_image:
- * @labeled_image: A NautilusLabeledImage.
- * @show_image: A boolean value indicating whether the image should be shown.
- *
- * Update the labeled image to either show or hide the internal image widget.
- * This function doesnt have any effect if the LabeledImage doesnt already
- * contain an image.
- */
-void
-nautilus_labeled_image_set_show_image (NautilusLabeledImage *labeled_image,
-				       gboolean show_image)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->show_image == show_image) {
-		return;
-	}
-
-	labeled_image->details->show_image = show_image;
-
-	if (labeled_image->details->image != NULL) {
-		if (labeled_image->details->show_image) {
-			gtk_widget_show (labeled_image->details->image);
-		} else {
-			gtk_widget_hide (labeled_image->details->image);
-		}
-	}
-
-	labeled_image_update_alignments (labeled_image);
-
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_get_show_image:
- * @labeled_image: A NautilusLabeledImage.
- *
- * Returns a boolean value indicating whether the internal image is shown.
- */
-gboolean
-nautilus_labeled_image_get_show_image (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), 0);
-	
-	return labeled_image->details->show_image;
-}
-
-
-/**
- * nautilus_labeled_image_set_fixed_image_height:
- * @labeled_image: A NautilusLabeledImage.
- * @fixed_image_height: The new fixed image height.
- *
- * Normally, we measure the height of images, but it's sometimes useful
- * to use a fixed height for all the images.  This routine sets the
- * image height to the passed in value
- *
- */
-void
-nautilus_labeled_image_set_fixed_image_height (NautilusLabeledImage *labeled_image,
-						int new_height)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->fixed_image_height == new_height) {
-		return;
-	}
-	
-	labeled_image->details->fixed_image_height = new_height;
-
-	labeled_image_update_alignments (labeled_image);
-	
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_set_spacing:
- * @labeled_image: A NautilusLabeledImage.
- * @spacing: The new spacing between label and image.
- *
- * Set the spacing between label and image.  This will only affect
- * the geometry of the widget if both a label and image are currently
- * visible.
- *
- */
-void
-nautilus_labeled_image_set_spacing (NautilusLabeledImage *labeled_image,
-				    guint spacing)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->spacing == spacing) {
-		return;
-	}
-	
-	labeled_image->details->spacing = spacing;
-
-	labeled_image_update_alignments (labeled_image);
-	
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_get_spacing:
- * @labeled_image: A NautilusLabeledImage.
- *
- * Returns: The spacing between the label and image.
- */
-guint
-nautilus_labeled_image_get_spacing (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), 0);
-	
-	return labeled_image->details->spacing;
-}
-
-/**
- * nautilus_labeled_image_set_x_padding:
- * @labeled_image: A NautilusLabeledImage.
- * @x_padding: The new horizontal padding.
- *
- * Set horizontal padding for the NautilusLabeledImage.  The padding
- * attribute work just like that in GtkMisc.
- */
-void
-nautilus_labeled_image_set_x_padding (NautilusLabeledImage *labeled_image,
-				      int x_padding)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	x_padding = MAX (0, x_padding);
-	
-	if (labeled_image->details->x_padding == x_padding) {
-		return;
-	}
-	
-	labeled_image->details->x_padding = x_padding;
-	labeled_image_update_alignments (labeled_image);
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_get_x_padding:
- * @labeled_image: A NautilusLabeledImage.
- *
- * Returns: The horizontal padding for the LabeledImage's content.
- */
-int
-nautilus_labeled_image_get_x_padding (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), 0);
-
-	return labeled_image->details->x_padding;
-}
-
-/**
- * nautilus_labeled_image_set_y_padding:
- * @labeled_image: A NautilusLabeledImage.
- * @x_padding: The new vertical padding.
- *
- * Set vertical padding for the NautilusLabeledImage.  The padding
- * attribute work just like that in GtkMisc.
- */
-void
-nautilus_labeled_image_set_y_padding (NautilusLabeledImage *labeled_image,
-				      int y_padding)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	y_padding = MAX (0, y_padding);
-	
-	if (labeled_image->details->y_padding == y_padding) {
-		return;
-	}
-	
-	labeled_image->details->y_padding = y_padding;
-	labeled_image_update_alignments (labeled_image);
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_get_x_padding:
- * @labeled_image: A NautilusLabeledImage.
- *
- * Returns: The vertical padding for the LabeledImage's content.
- */
-int
-nautilus_labeled_image_get_y_padding (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), 0);
-
-	return labeled_image->details->y_padding;
-}
-
-/**
- * nautilus_labeled_image_set_x_alignment:
- * @labeled_image: A NautilusLabeledImage.
- * @x_alignment: The new horizontal alignment.
- *
- * Set horizontal alignment for the NautilusLabeledImage's content.
- * The 'content' is the union of the image and label.  The alignment
- * attribute work just like that in GtkMisc.
- */
-void
-nautilus_labeled_image_set_x_alignment (NautilusLabeledImage *labeled_image,
-				      float x_alignment)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	x_alignment = MAX (0, x_alignment);
-	x_alignment = MIN (1.0, x_alignment);
-	
-	if (labeled_image->details->x_alignment == x_alignment) {
-		return;
-	}
-	
-	labeled_image->details->x_alignment = x_alignment;
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_get_x_alignment:
- * @labeled_image: A NautilusLabeledImage.
- *
- * Returns: The horizontal alignment for the LabeledImage's content.
- */
-float
-nautilus_labeled_image_get_x_alignment (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), 0);
-
-	return labeled_image->details->x_alignment;
-}
-
-/**
- * nautilus_labeled_image_set_y_alignment:
- * @labeled_image: A NautilusLabeledImage.
- * @y_alignment: The new vertical alignment.
- *
- * Set vertical alignment for the NautilusLabeledImage's content.
- * The 'content' is the union of the image and label.  The alignment
- * attribute work just like that in GtkMisc.
- */
-void
-nautilus_labeled_image_set_y_alignment (NautilusLabeledImage *labeled_image,
-					float y_alignment)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	y_alignment = MAX (0, y_alignment);
-	y_alignment = MIN (1.0, y_alignment);
-	
-	if (labeled_image->details->y_alignment == y_alignment) {
-		return;
-	}
-	
-	labeled_image->details->y_alignment = y_alignment;
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_get_y_alignment:
- * @labeled_image: A NautilusLabeledImage.
- *
- * Returns: The vertical alignment for the LabeledImage's content.
- */
-float
-nautilus_labeled_image_get_y_alignment (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), 0);
-
-	return labeled_image->details->y_alignment;
-}
-
-/**
- * nautilus_labeled_image_set_fill:
- * @labeled_image: A NautilusLabeledImage.
- * @fill: A boolean value indicating whether the internal image and label
- * widgets should fill all the available allocation.
- *
- * By default the internal image and label wigets are sized to their natural
- * preferred geometry.  You can use the 'fill' attribute of LabeledImage
- * to have the internal widgets fill as much of the LabeledImage allocation
- * as is available.  This is useful if you install a tile_pixbuf and want it
- * to cover the whole widget, and not just the areas occupied by the internal
- * widgets.
- */
-void
-nautilus_labeled_image_set_fill (NautilusLabeledImage *labeled_image,
-				 gboolean fill)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->fill == fill) {
-		return;
-	}
-
-	labeled_image->details->fill = fill;
-
-	labeled_image_update_alignments (labeled_image);
-	
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_get_fill:
- * @labeled_image: A NautilusLabeledImage.
- *
- * Retruns a boolean value indicating whether the internal widgets fill
- * all the available allocation.
- */
-gboolean
-nautilus_labeled_image_get_fill (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), 0);
-	
-	return labeled_image->details->fill;
-}
-
-/**
- * nautilus_labeled_image_button_new:
- * @text: Text to use for label or NULL.
- * @pixbuf: Pixbuf to use for image or NULL.
- *
- * Create a stock GtkButton with a NautilusLabeledImage child.
- *
- */
-GtkWidget *
-nautilus_labeled_image_button_new (const char *text,
-				   GdkPixbuf *pixbuf)
-{
-	GtkWidget *button;
-	GtkWidget *labeled_image;
-	
-	button = gtk_button_new ();
-	labeled_image = nautilus_labeled_image_new (text, pixbuf);
-	gtk_container_add (GTK_CONTAINER (button), labeled_image);
-	gtk_widget_show (labeled_image);
-	
-	return button;
-}
-
-/**
- * nautilus_labeled_image_button_new_from_file_name:
- * @text: Text to use for label or NULL.
- * @pixbuf_file_name: Name of pixbuf to use for image.  Cannot be NULL.
- *
- * Create a stock GtkToggleButton with a NautilusLabeledImage child.
- *
- */
-GtkWidget *
-nautilus_labeled_image_button_new_from_file_name (const char *text,
-							 const char *pixbuf_file_name)
-{
-	GtkWidget *button;
-	GtkWidget *labeled_image;
-
-	g_return_val_if_fail (pixbuf_file_name != NULL, NULL);
-	
-	button = gtk_button_new ();
-	labeled_image = nautilus_labeled_image_new_from_file_name (text, pixbuf_file_name);
-	gtk_container_add (GTK_CONTAINER (button), labeled_image);
-	gtk_widget_show (labeled_image);
-	
-	return button;
-}
-
-/**
- * nautilus_labeled_image_toggle_button_new:
- * @text: Text to use for label or NULL.
- * @pixbuf: Pixbuf to use for image or NULL.
- *
- * Create a stock GtkToggleButton with a NautilusLabeledImage child.
- *
- */
-GtkWidget *
-nautilus_labeled_image_toggle_button_new (const char *text,
-					  GdkPixbuf *pixbuf)
-{
-	GtkWidget *toggle_button;
-	GtkWidget *labeled_image;
-	
-	toggle_button = gtk_toggle_button_new ();
-	labeled_image = nautilus_labeled_image_new (text, pixbuf);
-	gtk_container_add (GTK_CONTAINER (toggle_button), labeled_image);
-	gtk_widget_show (labeled_image);
-	
-	return toggle_button;
-}
-
-/**
- * nautilus_labeled_image_toggle_button_new_from_file_name:
- * @text: Text to use for label or NULL.
- * @pixbuf_file_name: Name of pixbuf to use for image.  Cannot be NULL.
- *
- * Create a stock GtkToggleButton with a NautilusLabeledImage child.
- *
- */
-GtkWidget *
-nautilus_labeled_image_toggle_button_new_from_file_name (const char *text,
-							 const char *pixbuf_file_name)
-{
-	GtkWidget *toggle_button;
-	GtkWidget *labeled_image;
-
-	g_return_val_if_fail (pixbuf_file_name != NULL, NULL);
-	
-	toggle_button = gtk_toggle_button_new ();
-	labeled_image = nautilus_labeled_image_new_from_file_name (text, pixbuf_file_name);
-	gtk_container_add (GTK_CONTAINER (toggle_button), labeled_image);
-	gtk_widget_show (labeled_image);
-	
-	return toggle_button;
-}
-
-/*
- * Workaround some bugs in GtkCheckButton where the widget 
- * does not redraw properly after leave or focus out events
- * 
- * The workaround is to draw a little bit more than the 
- * widget itself - 4 pixels worth.  For some reason the
- * widget does not properly redraw its edges.
- */
-static void
-button_leave_callback (GtkWidget *widget,
-		       gpointer callback_data)
-{
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-
-	if (GTK_WIDGET_DRAWABLE (widget)) {
-		const int fudge = 4;
-		ArtIRect bounds;
-
-		bounds = nautilus_gtk_widget_get_bounds (widget);
-		
-		bounds.x0 -= fudge;
-		bounds.y0 -= fudge;
-		bounds.x1 += fudge;
-		bounds.y1 += fudge;
-		
-		gtk_widget_queue_draw_area (widget->parent,
-					    bounds.x0,
-					    bounds.y0,
-					    nautilus_art_irect_get_width (&bounds),
-					    nautilus_art_irect_get_height (&bounds));
-	}
-}
-
-static gint
-button_focus_out_event_callback (GtkWidget *widget,
-				 GdkEventFocus *event,
-				 gpointer callback_data)
-{
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-
-	button_leave_callback (widget, callback_data);
-
-	return FALSE;
-}
-
-/**
- * nautilus_labeled_image_check_button_new:
- * @text: Text to use for label or NULL.
- * @pixbuf: Pixbuf to use for image or NULL.
- *
- * Create a stock GtkCheckButton with a NautilusLabeledImage child.
- *
- */
-GtkWidget *
-nautilus_labeled_image_check_button_new (const char *text,
-					 GdkPixbuf *pixbuf)
-{
-	GtkWidget *check_button;
-	GtkWidget *labeled_image;
-	
-	check_button = gtk_check_button_new ();
-	labeled_image = nautilus_labeled_image_new (text, pixbuf);
-	gtk_container_add (GTK_CONTAINER (check_button), labeled_image);
-	gtk_widget_show (labeled_image);
-	
-	/*
-	 * Workaround some bugs in GtkCheckButton where the widget 
-	 * does not redraw properly after leave or focus out events
-	 */
-	gtk_signal_connect_while_alive (GTK_OBJECT (check_button),
-					"leave",
-					GTK_SIGNAL_FUNC (button_leave_callback),
-					NULL,
-					GTK_OBJECT (check_button));
-	gtk_signal_connect_while_alive (GTK_OBJECT (check_button),
-					"focus_out_event",
-					GTK_SIGNAL_FUNC (button_focus_out_event_callback),
-					NULL,
-					GTK_OBJECT (check_button));
-	
-	return check_button;
-}
-
-/**
- * nautilus_labeled_image_check_button_new_from_file_name:
- * @text: Text to use for label or NULL.
- * @pixbuf_file_name: Name of pixbuf to use for image.  Cannot be NULL.
- *
- * Create a stock GtkCheckButton with a NautilusLabeledImage child.
- *
- */
-GtkWidget *
-nautilus_labeled_image_check_button_new_from_file_name (const char *text,
-							const char *pixbuf_file_name)
-{
-	GtkWidget *check_button;
-	GtkWidget *labeled_image;
-
-	g_return_val_if_fail (pixbuf_file_name != NULL, NULL);
-	
-	check_button = gtk_check_button_new ();
-	labeled_image = nautilus_labeled_image_new_from_file_name (text, pixbuf_file_name);
-	gtk_container_add (GTK_CONTAINER (check_button), labeled_image);
-	gtk_widget_show (labeled_image);
-	
-	return check_button;
-}
-
-/*
- * The rest of the methods are proxies for those in NautilusImage and 
- * NautilusLabel.  We have all these so that we dont have to expose 
- * our internal widgets at all.  Probably more of these will be added
- * as they are needed.
- */
-
-/**
- * nautilus_labeled_image_set_pixbuf:
- * @labaled_image: A NautilusLabeledImage.
- * @pixbuf: New pixbuf to use or NULL.
- *
- * Change the pixbuf displayed by the LabeledImage.  Note that the widget display
- * is only updated if the show_image attribute is TRUE.
- *
- * If no internal image widget exists as of yet, a new one will be created.
- *
- * A NULL &pixbuf will cause the internal image widget (if alive) to be destroyed.
- */
-void
-nautilus_labeled_image_set_pixbuf (NautilusLabeledImage *labeled_image,
-				   GdkPixbuf *pixbuf)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	if (pixbuf == NULL) {
-		if (labeled_image->details->image != NULL) {
-			gtk_widget_destroy (labeled_image->details->image);
-			labeled_image->details->image = NULL;
-		}
-		
-		gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-	} else {
-		labeled_image_ensure_image (labeled_image);
-		nautilus_image_set_pixbuf (NAUTILUS_IMAGE (labeled_image->details->image), pixbuf);
-	}
-}
-
-void
-nautilus_labeled_image_set_pixbuf_from_file_name (NautilusLabeledImage *labeled_image,
-						  const char *pixbuf_file_name)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	labeled_image_ensure_image (labeled_image);
-	nautilus_image_set_pixbuf_from_file_name (NAUTILUS_IMAGE (labeled_image->details->image), pixbuf_file_name);
-}
-
-void
-nautilus_labeled_image_set_tile_pixbuf (NautilusLabeledImage *labeled_image,
-					GdkPixbuf *tile_pixbuf)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	if (labeled_image->details->image != NULL) {
-		nautilus_image_set_tile_pixbuf (NAUTILUS_IMAGE (labeled_image->details->image), tile_pixbuf);
-		nautilus_image_set_tile_mode_horizontal (NAUTILUS_IMAGE (labeled_image->details->image),
-							 NAUTILUS_SMOOTH_TILE_ANCESTOR);
-		nautilus_image_set_tile_mode_vertical (NAUTILUS_IMAGE (labeled_image->details->image),
-						       NAUTILUS_SMOOTH_TILE_ANCESTOR);
-	}
-
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_tile_pixbuf (NAUTILUS_LABEL (labeled_image->details->label), tile_pixbuf);
-		nautilus_label_set_tile_mode_horizontal (NAUTILUS_LABEL (labeled_image->details->label),
-							 NAUTILUS_SMOOTH_TILE_ANCESTOR);
-		nautilus_label_set_tile_mode_vertical (NAUTILUS_LABEL (labeled_image->details->label),
-						       NAUTILUS_SMOOTH_TILE_ANCESTOR);
-	}
-}
-
-void
-nautilus_labeled_image_set_tile_pixbuf_from_file_name (NautilusLabeledImage *labeled_image,
-						       const char *pixbuf_file_name)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->image != NULL) {
-		nautilus_image_set_tile_pixbuf_from_file_name (NAUTILUS_IMAGE (labeled_image->details->image),
-							       pixbuf_file_name);
-		nautilus_image_set_tile_mode_horizontal (NAUTILUS_IMAGE (labeled_image->details->image),
-							 NAUTILUS_SMOOTH_TILE_ANCESTOR);
-		nautilus_image_set_tile_mode_vertical (NAUTILUS_IMAGE (labeled_image->details->image),
-						       NAUTILUS_SMOOTH_TILE_ANCESTOR);
-	}
-
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_tile_pixbuf_from_file_name (NAUTILUS_LABEL (labeled_image->details->label),
-							       pixbuf_file_name);
-		nautilus_label_set_tile_mode_horizontal (NAUTILUS_LABEL (labeled_image->details->label),
-							 NAUTILUS_SMOOTH_TILE_ANCESTOR);
-		nautilus_label_set_tile_mode_vertical (NAUTILUS_LABEL (labeled_image->details->label),
-						       NAUTILUS_SMOOTH_TILE_ANCESTOR);
-	}
-}
-
-GdkPixbuf*
-nautilus_labeled_image_get_pixbuf (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NULL);
-
-	if (labeled_image->details->image == NULL) {
-		return NULL;
-	}
-	
-	return nautilus_image_get_pixbuf (NAUTILUS_IMAGE (labeled_image->details->image));
-}
-
-/**
- * nautilus_labeled_image_set_text:
- * @labaled_image: A NautilusLabeledImage.
- * @text: New text to use or NULL.
- *
- * Change the text displayed by the LabeledImage.  Note that the widget display
- * is only updated if the show_label attribute is TRUE.
- *
- * If no internal label widget exists as of yet, a new one will be created.
- *
- * A NULL &text will cause the internal label widget (if alive) to be destroyed.
- */
-void
-nautilus_labeled_image_set_text (NautilusLabeledImage *labeled_image,
-				const char *text)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	if (text == NULL) {
-		if (labeled_image->details->label) {
-			gtk_widget_destroy (labeled_image->details->label);
-			labeled_image->details->label = NULL;
-		}
-		
-		gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-	} else {
-		labeled_image_ensure_label (labeled_image);
-		nautilus_label_set_text (NAUTILUS_LABEL (labeled_image->details->label), text);
-	}
-}
-
-char *
-nautilus_labeled_image_get_text (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NULL);
-	
-	if (labeled_image->details->label == NULL) {
-		return NULL;
-	}
-
-	return nautilus_label_get_text (NAUTILUS_LABEL (labeled_image->details->label));
-}
-
-void
-nautilus_labeled_image_make_bold (NautilusLabeledImage *labeled_image)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	labeled_image_ensure_label (labeled_image);
-	nautilus_label_make_bold (NAUTILUS_LABEL (labeled_image->details->label));
-}
-
-void
-nautilus_labeled_image_make_larger (NautilusLabeledImage *labeled_image,
-				    guint num_sizes)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	labeled_image_ensure_label (labeled_image);
-	nautilus_label_make_larger (NAUTILUS_LABEL (labeled_image->details->label), num_sizes);
-}
-
-void
-nautilus_labeled_image_make_smaller (NautilusLabeledImage *labeled_image,
-				    guint num_sizes)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	labeled_image_ensure_label (labeled_image);
-	nautilus_label_make_smaller (NAUTILUS_LABEL (labeled_image->details->label), num_sizes);
-}
-
-void
-nautilus_labeled_image_set_tile_width (NautilusLabeledImage *labeled_image,
-				       int tile_width)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	if (labeled_image->details->image != NULL) {
-		nautilus_image_set_tile_width (NAUTILUS_IMAGE (labeled_image->details->image),
-					       tile_width);
-	}
-
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_tile_width (NAUTILUS_LABEL (labeled_image->details->label),
-					       tile_width);
-	}
-}
-
-void
-nautilus_labeled_image_set_tile_height (NautilusLabeledImage *labeled_image,
-					int tile_height)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	if (labeled_image->details->image != NULL) {
-		nautilus_image_set_tile_height (NAUTILUS_IMAGE (labeled_image->details->image),
-						tile_height);
-	}
-
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_tile_height (NAUTILUS_LABEL (labeled_image->details->label),
-						tile_height);
-	}
-}
-
-void
-nautilus_labeled_image_set_background_mode (NautilusLabeledImage *labeled_image,
-					    NautilusSmoothBackgroundMode background_mode)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	g_return_if_fail (background_mode >= NAUTILUS_SMOOTH_BACKGROUND_GTK);
-	g_return_if_fail (background_mode <= NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-
-	if (labeled_image->details->image != NULL) {
-		nautilus_image_set_background_mode (NAUTILUS_IMAGE (labeled_image->details->image),
-						    background_mode);
-	}
-
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_background_mode (NAUTILUS_LABEL (labeled_image->details->label),
-						    background_mode);
-	}
-}
-
-void
-nautilus_labeled_image_set_solid_background_color (NautilusLabeledImage *labeled_image,
-						   guint32 solid_background_color)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->image != NULL) {
-		nautilus_image_set_solid_background_color (NAUTILUS_IMAGE (labeled_image->details->image),
-						    solid_background_color);
-	}
-
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_solid_background_color (NAUTILUS_LABEL (labeled_image->details->label),
-						    solid_background_color);
-	}
-}
-
-void
-nautilus_labeled_image_set_smooth_drop_shadow_offset (NautilusLabeledImage *labeled_image,
-						      guint drop_shadow_offset)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_smooth_drop_shadow_offset (NAUTILUS_LABEL (labeled_image->details->label),
-							      drop_shadow_offset);
-	}
-}
-
-void
-nautilus_labeled_image_set_smooth_drop_shadow_color (NautilusLabeledImage *labeled_image,
-						     guint32 drop_shadow_color)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_smooth_drop_shadow_color (NAUTILUS_LABEL (labeled_image->details->label),
-							     drop_shadow_color);
-	}
-}
-
-void
-nautilus_labeled_image_set_text_color (NautilusLabeledImage *labeled_image,
-				       guint32 text_color)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_text_color (NAUTILUS_LABEL (labeled_image->details->label),
-					       text_color);
-	}
-}
-
-void
-nautilus_labeled_image_set_label_never_smooth (NautilusLabeledImage *labeled_image,
-					       gboolean never_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_never_smooth (NAUTILUS_LABEL (labeled_image->details->label),
-						 never_smooth);
-	}
-}
diff --git a/libnautilus-extensions/nautilus-labeled-image.h b/libnautilus-extensions/nautilus-labeled-image.h
deleted file mode 100644
index 12faf364c..000000000
--- a/libnautilus-extensions/nautilus-labeled-image.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-labeled-image.h - A labeled image.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-/* NautilusLabeledImage is a container widget.  It can only contain internal 
- * widgets.  These internal widgets are can be a NautilusLabel and/or a 
- * NautilusImage.  These internal widgets are created as needed.  That means
- * that NautilusLabeledImage can always be used for "free" instead of a 
- * NautilusLabel or NautilusImage.  The only overhead is that of the GtkObject
- * machinery.
- *
- * The position of the label with respect to the image is controlled by the
- * 'label_positon' attribute.
- *
- * By default the internal image and label widgets are sized to their natural
- * preferred geometry.  You can use the 'fill' attribute of LabeledImage
- * to have the internal widgets fill as much of the LabeledImage allocation
- * as is available.  This is useful if you install a tile_pixbuf and want it
- * to cover the whole widget, and not just the areas occupied by the internal
- * widgets.
- *
- * LabeledImage also has x_padding/y_padding and x_alignment/y_alignment 
- * attributes that behave exaclty as those in the GtkMisc class.
- *
- * Note that the alignments are ignored if the fill attribute is TRUE.
- */
-
-#ifndef NAUTILUS_LABELED_IMAGE_H
-#define NAUTILUS_LABELED_IMAGE_H
-
-#include <gtk/gtkcontainer.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-image.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_LABELED_IMAGE            (nautilus_labeled_image_get_type ())
-#define NAUTILUS_LABELED_IMAGE(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_LABELED_IMAGE, NautilusLabeledImage))
-#define NAUTILUS_LABELED_IMAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_LABELED_IMAGE, NautilusLabeledImageClass))
-#define NAUTILUS_IS_LABELED_IMAGE(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_LABELED_IMAGE))
-#define NAUTILUS_IS_LABELED_IMAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_LABELED_IMAGE))
-
-typedef struct _NautilusLabeledImage	      NautilusLabeledImage;
-typedef struct _NautilusLabeledImageClass     NautilusLabeledImageClass;
-typedef struct _NautilusLabeledImageDetails   NautilusLabeledImageDetails;
-
-struct _NautilusLabeledImage
-{
-	/* Superclass */
-	GtkContainer container;
-
-	/* Private things */
-	NautilusLabeledImageDetails *details;
-};
-
-struct _NautilusLabeledImageClass
-{
-	GtkContainerClass parent_class;
-};
-
-/* Public GtkLabeledImage methods */
-GtkType         nautilus_labeled_image_get_type                         (void);
-GtkWidget *     nautilus_labeled_image_new                              (const char                   *text,
-									 GdkPixbuf                    *pixbuf);
-GtkWidget *     nautilus_labeled_image_new_from_file_name               (const char                   *text,
-									 const char                   *pixbuf_file_name);
-void            nautilus_labeled_image_set_label_position               (NautilusLabeledImage         *labeled_image,
-									 GtkPositionType               label_position);
-GtkPositionType nautilus_labeled_image_get_label_position               (const NautilusLabeledImage   *labeled_image);
-void            nautilus_labeled_image_set_show_label                   (NautilusLabeledImage         *labeled_image,
-									 gboolean                      show_label);
-gboolean        nautilus_labeled_image_get_show_label                   (const NautilusLabeledImage   *labeled_image);
-void            nautilus_labeled_image_set_show_image                   (NautilusLabeledImage         *labeled_image,
-									 gboolean                      show_image);
-gboolean        nautilus_labeled_image_get_show_image                   (const NautilusLabeledImage   *labeled_image);
-void            nautilus_labeled_image_set_spacing                      (NautilusLabeledImage         *labeled_image,
-									 guint                         spacing);
-guint           nautilus_labeled_image_get_spacing                      (const NautilusLabeledImage   *labeled_image);
-int             nautilus_labeled_image_get_x_padding                    (const NautilusLabeledImage   *labeled_image);
-void            nautilus_labeled_image_set_x_padding                    (NautilusLabeledImage         *labeled_image,
-									 int                           x_padding);
-int             nautilus_labeled_image_get_y_padding                    (const NautilusLabeledImage   *labeled_image);
-void            nautilus_labeled_image_set_y_padding                    (NautilusLabeledImage         *labeled_image,
-									 int                           y_padding);
-float           nautilus_labeled_image_get_x_alignment                  (const NautilusLabeledImage   *labeled_image);
-void            nautilus_labeled_image_set_x_alignment                  (NautilusLabeledImage         *labeled_image,
-									 float                         x_alignment);
-float           nautilus_labeled_image_get_y_alignment                  (const NautilusLabeledImage   *labeled_image);
-void            nautilus_labeled_image_set_y_alignment                  (NautilusLabeledImage         *labeled_image,
-									 float                         y_alignment);
-void            nautilus_labeled_image_set_fill                         (NautilusLabeledImage         *labeled_image,
-									 gboolean                      fill);
-gboolean        nautilus_labeled_image_get_fill                         (const NautilusLabeledImage   *labeled_image);
-
-void		nautilus_labeled_image_set_fixed_image_height		(NautilusLabeledImage	      *labeled_image,
-									 int			       fixed_image_height);
-									 
-/* Functions for creating stock GtkButtons with a labeled image child */
-GtkWidget *     nautilus_labeled_image_button_new                       (const char                   *text,
-									 GdkPixbuf                    *pixbuf);
-GtkWidget *     nautilus_labeled_image_button_new_from_file_name        (const char                   *text,
-									 const char                   *pixbuf_file_name);
-GtkWidget *     nautilus_labeled_image_toggle_button_new                (const char                   *text,
-									 GdkPixbuf                    *pixbuf);
-GtkWidget *     nautilus_labeled_image_toggle_button_new_from_file_name (const char                   *text,
-									 const char                   *pixbuf_file_name);
-GtkWidget *     nautilus_labeled_image_check_button_new                 (const char                   *text,
-									 GdkPixbuf                    *pixbuf);
-GtkWidget *     nautilus_labeled_image_check_button_new_from_file_name  (const char                   *text,
-									 const char                   *pixbuf_file_name);
-
-/* These are proxies for methods in NautilusImage and NautilusLabel */
-void            nautilus_labeled_image_set_pixbuf                       (NautilusLabeledImage         *labeled_image,
-									 GdkPixbuf                    *pixbuf);
-void            nautilus_labeled_image_set_pixbuf_from_file_name        (NautilusLabeledImage         *labeled_image,
-									 const char                   *pixbuf_file_name);
-GdkPixbuf*      nautilus_labeled_image_get_pixbuf                       (const NautilusLabeledImage   *labeled_image);
-void            nautilus_labeled_image_set_text                         (NautilusLabeledImage         *labeled_image,
-									 const char                   *text);
-char*           nautilus_labeled_image_get_text                         (const NautilusLabeledImage   *labeled_image);
-void            nautilus_labeled_image_set_tile_pixbuf                  (NautilusLabeledImage         *image,
-									 GdkPixbuf                    *pixbuf);
-void            nautilus_labeled_image_set_tile_pixbuf_from_file_name   (NautilusLabeledImage         *image,
-									 const char                   *tile_file_name);
-void            nautilus_labeled_image_make_bold                        (NautilusLabeledImage         *labeled_image);
-void            nautilus_labeled_image_make_larger                      (NautilusLabeledImage         *labeled_image,
-									 guint                         num_sizes);
-void            nautilus_labeled_image_make_smaller                     (NautilusLabeledImage         *labeled_image,
-									 guint                         num_sizes);
-void            nautilus_labeled_image_set_tile_width                   (NautilusLabeledImage         *labeled_image,
-									 int                           tile_width);
-void            nautilus_labeled_image_set_tile_height                  (NautilusLabeledImage         *labeled_image,
-									 int                           tile_height);
-void            nautilus_labeled_image_set_background_mode              (NautilusLabeledImage         *labeled_image,
-									 NautilusSmoothBackgroundMode  background_mode);
-void            nautilus_labeled_image_set_solid_background_color       (NautilusLabeledImage         *labeled_image,
-									 guint32                       solid_background_color);
-void            nautilus_labeled_image_set_smooth_drop_shadow_offset    (NautilusLabeledImage         *labeled_image,
-									 guint                         drop_shadow_offset);
-void            nautilus_labeled_image_set_smooth_drop_shadow_color     (NautilusLabeledImage         *labeled_image,
-									 guint32                       drop_shadow_color);
-void            nautilus_labeled_image_set_text_color                   (NautilusLabeledImage         *labeled_image,
-									 guint32                       text_color);
-void            nautilus_labeled_image_set_label_never_smooth           (NautilusLabeledImage         *labeled_image,
-									 gboolean                      never_smooth);
-ArtIRect        nautilus_labeled_image_get_image_bounds                 (const NautilusLabeledImage   *labeled_image);
-ArtIRect        nautilus_labeled_image_get_label_bounds                 (const NautilusLabeledImage   *labeled_image);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_LABELED_IMAGE_H */
-
-
diff --git a/libnautilus-extensions/nautilus-lib-self-check-functions.c b/libnautilus-extensions/nautilus-lib-self-check-functions.c
index 70c70b364..50156c1c0 100644
--- a/libnautilus-extensions/nautilus-lib-self-check-functions.c
+++ b/libnautilus-extensions/nautilus-lib-self-check-functions.c
@@ -32,7 +32,7 @@
 void
 nautilus_run_lib_self_checks (void)
 {
-	NAUTILUS_LIB_FOR_EACH_SELF_CHECK_FUNCTION (NAUTILUS_CALL_SELF_CHECK_FUNCTION)
+	NAUTILUS_LIB_FOR_EACH_SELF_CHECK_FUNCTION (EEL_CALL_SELF_CHECK_FUNCTION)
 }
 
 #endif /* ! NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-lib-self-check-functions.h b/libnautilus-extensions/nautilus-lib-self-check-functions.h
index 34d5453f8..fcc53e5df 100644
--- a/libnautilus-extensions/nautilus-lib-self-check-functions.h
+++ b/libnautilus-extensions/nautilus-lib-self-check-functions.h
@@ -23,7 +23,7 @@
    Author: Darin Adler <darin@eazel.com>
 */
 
-#include "nautilus-self-checks.h"
+#include <eel/eel-self-checks.h>
 
 void nautilus_run_lib_self_checks (void);
 
@@ -39,28 +39,15 @@ void nautilus_run_lib_self_checks (void);
 */
 
 #define NAUTILUS_LIB_FOR_EACH_SELF_CHECK_FUNCTION(macro) \
-	macro (nautilus_self_check_string) \
-	macro (nautilus_self_check_string_list) \
-	macro (nautilus_self_check_enumeration) \
 	macro (nautilus_self_check_preferences) \
-	macro (nautilus_self_check_scalable_font) \
-	macro (nautilus_self_check_font_manager) \
-	macro (nautilus_self_check_string_map) \
-	macro (nautilus_self_check_art_extensions) \
-	macro (nautilus_self_check_gdk_pixbuf_extensions) \
-	macro (nautilus_self_check_glib_extensions) \
-	macro (nautilus_self_check_gdk_extensions) \
-	macro (nautilus_self_check_gdk_font_extensions) \
 	macro (nautilus_self_check_search_uri) \
 	macro (nautilus_self_check_file_utilities) \
 	macro (nautilus_self_check_file_operations) \
-	macro (nautilus_self_check_background) \
 	macro (nautilus_self_check_directory) \
 	macro (nautilus_self_check_file) \
 	macro (nautilus_self_check_icon_container) \
 	macro (nautilus_self_check_icon_factory) \
-	macro (nautilus_self_check_smooth_text_layout_cache) \
 /* Add new self-check functions to the list above this line. */
 
 /* Generate prototypes for all the functions. */
-NAUTILUS_LIB_FOR_EACH_SELF_CHECK_FUNCTION (NAUTILUS_SELF_CHECK_FUNCTION_PROTOTYPE)
+NAUTILUS_LIB_FOR_EACH_SELF_CHECK_FUNCTION (EEL_SELF_CHECK_FUNCTION_PROTOTYPE)
diff --git a/libnautilus-extensions/nautilus-link-set.c b/libnautilus-extensions/nautilus-link-set.c
index 05383e8a8..1edb038af 100644
--- a/libnautilus-extensions/nautilus-link-set.c
+++ b/libnautilus-extensions/nautilus-link-set.c
@@ -27,13 +27,13 @@
 
 #include "nautilus-file-utilities.h"
 #include "nautilus-file.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 #include "nautilus-global-preferences.h"
 #include "nautilus-link.h"
 #include "nautilus-metadata.h"
 #include "nautilus-preferences.h"
-#include "nautilus-string.h"
-#include "nautilus-xml-extensions.h"
+#include <eel/eel-string.h>
+#include <eel/eel-xml-extensions.h>
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
 #include <gtk/gtktogglebutton.h>
@@ -112,10 +112,10 @@ nautilus_link_set_install (const char *directory_path, const char *link_set_name
 	}
 	
 	/* loop through the entries, generating link files */
-	for (node = nautilus_xml_get_children (xmlDocGetRootElement (document));
+	for (node = eel_xml_get_children (xmlDocGetRootElement (document));
 	     node != NULL; node = node->next) {
 		if (strcmp (node->name, "link") == 0) {
-			link_name = nautilus_xml_get_property_translated (node, "name");
+			link_name = eel_xml_get_property_translated (node, "name");
 			image_name = xmlGetProp (node, "image");
 			uri = xmlGetProp (node, "uri");
 
@@ -159,10 +159,10 @@ nautilus_link_set_is_installed (const char *directory_path, const char *link_set
 	}
 	
 	/* loop through the entries, testing to see if any are present */
-	for (node = nautilus_xml_get_children (xmlDocGetRootElement (document));
+	for (node = eel_xml_get_children (xmlDocGetRootElement (document));
 	     node != NULL; node = node->next) {
 		if (strcmp (node->name, "link") == 0) {
-			link_name = nautilus_xml_get_property_translated (node, "name");
+			link_name = eel_xml_get_property_translated (node, "name");
 			file_name = nautilus_make_path (directory_path, link_name);
 			xmlFree (link_name);
 
@@ -195,11 +195,11 @@ nautilus_link_set_remove (const char *directory_path, const char *link_set_name)
 	
 	/* loop through the entries in the xml file, formulating the names of the link files and
 	   deleting them or decrementing their reference count */
-	for (node = nautilus_xml_get_children (xmlDocGetRootElement (document));
+	for (node = eel_xml_get_children (xmlDocGetRootElement (document));
 	     node != NULL; node = node->next) {
 		if (strcmp (node->name, "link") == 0) {
 			/* formulate the link file path name */
-			link_name = nautilus_xml_get_property_translated (node, "name");
+			link_name = eel_xml_get_property_translated (node, "name");
 			file_name = nautilus_make_path (directory_path, link_name);
 			xmlFree (link_name);
 			
diff --git a/libnautilus-extensions/nautilus-link.c b/libnautilus-extensions/nautilus-link.c
index f445c8ceb..5dfb1278f 100644
--- a/libnautilus-extensions/nautilus-link.c
+++ b/libnautilus-extensions/nautilus-link.c
@@ -31,12 +31,12 @@
 #include "nautilus-file.h"
 #include "nautilus-file-attributes.h"
 #include "nautilus-global-preferences.h"
-#include "nautilus-gnome-extensions.h"
+#include <eel/eel-gnome-extensions.h>
 #include "nautilus-metadata.h"
 #include "nautilus-preferences.h"
-#include "nautilus-stock-dialogs.h"
-#include "nautilus-string.h"
-#include "nautilus-xml-extensions.h"
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-xml-extensions.h>
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
 #include <libgnome/gnome-i18n.h>
@@ -507,7 +507,7 @@ nautilus_link_local_create_from_gnome_entry (GnomeDesktopEntry *entry, const cha
 		return;
 	}
 	
-	terminal_path = nautilus_gnome_get_terminal_path ();
+	terminal_path = eel_gnome_get_terminal_path ();
 	if (terminal_path == NULL) {
 		return;
 	}
diff --git a/libnautilus-extensions/nautilus-list-column-title.c b/libnautilus-extensions/nautilus-list-column-title.c
index e6414c447..26fff3a31 100644
--- a/libnautilus-extensions/nautilus-list-column-title.c
+++ b/libnautilus-extensions/nautilus-list-column-title.c
@@ -26,8 +26,8 @@
 #include <config.h>
 #include "nautilus-list-column-title.h"
 
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gdk-extensions.h"
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-gdk-extensions.h>
 
 #include "nautilus-list.h"
 
@@ -37,7 +37,7 @@
 
 #include <libgnomeui/gnome-pixmap.h>
 
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
 
 #include <string.h>
 
@@ -128,7 +128,7 @@ static gboolean nautilus_list_column_title_button_press	(GtkWidget *widget, GdkE
 static gboolean nautilus_list_column_title_button_release (GtkWidget *widget, GdkEventButton *event);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusListColumnTitle, nautilus_list_column_title, GTK_TYPE_BIN)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusListColumnTitle, nautilus_list_column_title, GTK_TYPE_BIN)
 /* generates nautilus_list_column_title_get_type */
 
 static void
@@ -259,7 +259,7 @@ nautilus_list_column_title_finalize (GtkObject *object)
 
 	g_free (column_title->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
 }
 
 static void
@@ -330,7 +330,7 @@ load_up_indicator (const char **xpm_data,
 		return;
 	}
 
-	gdk_pixbuf_render_pixmap_and_mask (pixbuf, indicator_pixmap, indicator_mask, NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
+	gdk_pixbuf_render_pixmap_and_mask (pixbuf, indicator_pixmap, indicator_mask, EEL_STANDARD_ALPHA_THRESHHOLD);
 
 	gdk_pixbuf_unref (pixbuf);
 }
@@ -549,7 +549,7 @@ nautilus_list_column_title_paint (GtkWidget *widget, GtkWidget *draw_target,
 			 */
 			temporary = cell_rectangle;
 			/* Eeeek: magic numbers */
-			nautilus_rectangle_inset (&temporary, 2, 2);
+			eel_rectangle_inset (&temporary, 2, 2);
 			gdk_rectangle_intersect (&cell_redraw_area, &temporary, &cell_redraw_area);
 
 			truncated_label = truncate_string (cell_label, widget->style->font, 
@@ -708,10 +708,10 @@ in_column_rect (GtkWidget *widget, int x, int y)
 		 * to be considered inside the rect
 		 * nautilus_list_column_title_leave depends on this 
 		 */
-		nautilus_rectangle_inset (&cell_rectangle, 1, 0);
+		eel_rectangle_inset (&cell_rectangle, 1, 0);
 
 		
-		if (nautilus_rectangle_contains (&cell_rectangle, x, y))
+		if (eel_rectangle_contains (&cell_rectangle, x, y))
 			return index;
 	}
 
@@ -734,12 +734,12 @@ in_resize_rect (GtkWidget *widget, int x, int y)
 		
 		get_column_frame_at (widget, index, &resize_rectangle);
 
-		nautilus_rectangle_inset (&resize_rectangle, 1, 0);
+		eel_rectangle_inset (&resize_rectangle, 1, 0);
 
 		resize_rectangle.x = resize_rectangle.x + resize_rectangle.width - DRAG_WIDTH / 2;
 		resize_rectangle.width = DRAG_WIDTH;
 
-		if (nautilus_rectangle_contains (&resize_rectangle, x, y))
+		if (eel_rectangle_contains (&resize_rectangle, x, y))
 			return index;
 	}
 
@@ -825,7 +825,7 @@ nautilus_list_column_title_motion (GtkWidget *widget, GdkEventMotion *event)
 		if (column_title->details->last_tracking_x != mouse_x) {
 			/* mouse did move horizontally since last time */
 			column_title->details->last_tracking_x = mouse_x;
-			NAUTILUS_INVOKE_METHOD
+			EEL_INVOKE_METHOD
 				(NAUTILUS_LIST_CLASS, parent_list,
 				 column_resize_track,
 				 (parent_list, column_title->details->tracking_column_resize));
@@ -927,7 +927,7 @@ nautilus_list_column_title_button_press (GtkWidget *widget, GdkEventButton *even
 			gtk_widget_set_state (widget, GTK_STATE_NORMAL);
 
 			/* start column resize tracking */
-			NAUTILUS_INVOKE_METHOD
+			EEL_INVOKE_METHOD
 				(NAUTILUS_LIST_CLASS, parent_list,
 				 column_resize_track_start,
 				 (parent_list, resized_column));
@@ -984,7 +984,7 @@ nautilus_list_column_title_button_release (GtkWidget *widget, GdkEventButton *ev
 	if (column_title->details->tracking_column_resize != -1) {
 			
 		/* end column resize tracking */
-		NAUTILUS_INVOKE_METHOD
+		EEL_INVOKE_METHOD
 			(NAUTILUS_LIST_CLASS, parent_list,
 			 column_resize_track_end,
 			 (parent_list, column_title->details->tracking_column_resize));
diff --git a/libnautilus-extensions/nautilus-list.c b/libnautilus-extensions/nautilus-list.c
index 34df7aa95..abb14a5ee 100644
--- a/libnautilus-extensions/nautilus-list.c
+++ b/libnautilus-extensions/nautilus-list.c
@@ -38,15 +38,15 @@
 #include <gtk/gtkenums.h>
 #include <gtk/gtkmain.h>
 #include <glib.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-graphic-effects.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-background.h>
+#include <eel/eel-graphic-effects.h>
 #include <libnautilus-extensions/nautilus-drag.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-list-column-title.h>
 
 /* Timeout for making the row currently selected for keyboard operation visible.
@@ -314,7 +314,7 @@ static void     nautilus_list_stop_auto_scroll          (NautilusList         *l
 static void	unref_gcs				(NautilusList *list);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusList, nautilus_list, NAUTILUS_TYPE_CLIST)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusList, nautilus_list, NAUTILUS_TYPE_CLIST)
 
 static guint list_signals[LAST_SIGNAL];
 
@@ -399,7 +399,7 @@ nautilus_list_initialize_class (NautilusListClass *klass)
 				GTK_RUN_LAST,
 				object_class->type,
 				GTK_SIGNAL_OFFSET (NautilusListClass, handle_dragged_items),
-				nautilus_gtk_marshal_BOOL__INT_POINTER_INT_INT_UINT,
+				eel_gtk_marshal_BOOL__INT_POINTER_INT_INT_UINT,
 				GTK_TYPE_BOOL, 
 				5,
 				GTK_TYPE_INT,
@@ -412,7 +412,7 @@ nautilus_list_initialize_class (NautilusListClass *klass)
 				GTK_RUN_LAST,
 				object_class->type,
 				GTK_SIGNAL_OFFSET (NautilusListClass, handle_dropped_items),
-				nautilus_gtk_marshal_NONE__INT_POINTER_INT_INT_UINT,
+				eel_gtk_marshal_NONE__INT_POINTER_INT_INT_UINT,
 				GTK_TYPE_NONE, 5,
 				GTK_TYPE_INT,
 				GTK_TYPE_POINTER,
@@ -424,7 +424,7 @@ nautilus_list_initialize_class (NautilusListClass *klass)
 				GTK_RUN_LAST,
 				object_class->type,
 				GTK_SIGNAL_OFFSET (NautilusListClass, get_default_action),
-				nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER_INT_INT_UINT,
+				eel_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER_INT_INT_UINT,
 				GTK_TYPE_NONE, 7,
 				GTK_TYPE_POINTER,
 				GTK_TYPE_POINTER,
@@ -438,7 +438,7 @@ nautilus_list_initialize_class (NautilusListClass *klass)
 				GTK_RUN_LAST,
 				object_class->type,
 				GTK_SIGNAL_OFFSET (NautilusListClass, get_drag_pixbuf),
-				nautilus_gtk_marshal_POINTER__INT,
+				eel_gtk_marshal_POINTER__INT,
 				GTK_TYPE_POINTER, 1,
 				GTK_TYPE_INT);
 	list_signals[GET_SORT_COLUMN_INDEX] =
@@ -446,7 +446,7 @@ nautilus_list_initialize_class (NautilusListClass *klass)
 				GTK_RUN_LAST,
 				object_class->type,
 				GTK_SIGNAL_OFFSET (NautilusListClass, get_sort_column_index),
-				nautilus_gtk_marshal_INT__NONE,
+				eel_gtk_marshal_INT__NONE,
 				GTK_TYPE_INT, 0);
 
 	gtk_object_class_add_signals (object_class, list_signals, LAST_SIGNAL);
@@ -553,7 +553,7 @@ nautilus_list_initialize_dnd (NautilusList *list)
 	list->details->drag_info = g_new0 (NautilusDragInfo, 1);
 
 	nautilus_drag_init (list->details->drag_info, drag_types,
-			    NAUTILUS_N_ELEMENTS (drag_types), NULL);
+			    EEL_N_ELEMENTS (drag_types), NULL);
 	
 	gtk_signal_connect (GTK_OBJECT (list), 
 			    "drag_end", 
@@ -585,7 +585,7 @@ nautilus_list_initialize_dnd (NautilusList *list)
 	gtk_drag_dest_set (GTK_WIDGET (list),
 			   0,
 			   nautilus_list_dnd_target_table,
-			   NAUTILUS_N_ELEMENTS (nautilus_list_dnd_target_table),
+			   EEL_N_ELEMENTS (nautilus_list_dnd_target_table),
 			   GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK
 			   | GDK_ACTION_ASK);
 
@@ -638,7 +638,7 @@ nautilus_list_destroy (GtkObject *object)
 
 	unschedule_keyboard_row_reveal (list);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 
 	unref_gcs (list);
 
@@ -951,7 +951,7 @@ nautilus_list_button_press (GtkWidget *widget, GdkEventButton *event)
 	nautilus_list_flush_typeselect_state (list);
 
 	if (event->window != clist->clist_window)
-		return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+		return EEL_CALL_PARENT_WITH_RETURN_VALUE
 			(GTK_WIDGET_CLASS, button_press_event, (widget, event));
 
 	on_row = nautilus_clist_get_selection_info (clist, event->x, event->y, &row_index, &column_index);
@@ -1061,7 +1061,7 @@ nautilus_list_button_release (GtkWidget *widget, GdkEventButton *event)
 	retval = FALSE;
 
 	if (event->window != clist->clist_window)
-		return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+		return EEL_CALL_PARENT_WITH_RETURN_VALUE
 			(GTK_WIDGET_CLASS, button_release_event, (widget, event));
 
 	on_row = nautilus_clist_get_selection_info (clist, event->x, event->y, &row_index, &column_index);
@@ -1450,7 +1450,7 @@ nautilus_list_handle_typeahead (NautilusList *list, const char *key_string)
 	}
 
 	/* find out how long since last character was typed */
-	now = nautilus_get_system_time();
+	now = eel_get_system_time();
 	time_delta = now - list->details->last_typeselect_time;
 	if (time_delta < 0 || time_delta > NAUTILUS_TYPESELECT_FLUSH_DELAY) {
 		/* the typeselect state is too old, start with a fresh one */
@@ -1525,7 +1525,7 @@ nautilus_list_key_press (GtkWidget *widget,
 			return TRUE;
 		}
 
-		return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+		return EEL_CALL_PARENT_WITH_RETURN_VALUE
 			(GTK_WIDGET_CLASS, key_press_event, (widget, event));
 	}
 
@@ -1533,18 +1533,18 @@ nautilus_list_key_press (GtkWidget *widget,
 }
 
 static guint32
-nautilus_gdk_set_shifted_foreground_gc_color (GdkGC *gc, guint32 color, float shift_by)
+eel_gdk_set_shifted_foreground_gc_color (GdkGC *gc, guint32 color, float shift_by)
 {
 	guint32 shifted_color;
 
-	shifted_color = nautilus_rgb_shift_color (color, shift_by);
+	shifted_color = eel_rgb_shift_color (color, shift_by);
 	gdk_rgb_gc_set_foreground (gc, shifted_color);
 
 	return shifted_color;
 }
 
 static GdkGC *
-nautilus_gdk_gc_copy (GdkGC *source, GdkWindow *window)
+eel_gdk_gc_copy (GdkGC *source, GdkWindow *window)
 {
 	GdkGC *result;
 
@@ -1569,56 +1569,56 @@ nautilus_list_setup_style_colors (NautilusList *list)
 
 	gdk_rgb_init();
 
-	style_background_color = nautilus_gdk_color_to_rgb
+	style_background_color = eel_gdk_color_to_rgb
 		(G_STRUCT_MEMBER_P (GTK_WIDGET (list)->style,
 				    list->details->background_color_offset));
-	selection_background_color = nautilus_gdk_color_to_rgb
+	selection_background_color = eel_gdk_color_to_rgb
 		(G_STRUCT_MEMBER_P (GTK_WIDGET (list)->style,
 				    list->details->selection_color_offset));
 
 	list->details->cell_lighter_background_rgb
-	    = nautilus_gdk_set_shifted_foreground_gc_color (list->details->cell_lighter_background, 
+	    = eel_gdk_set_shifted_foreground_gc_color (list->details->cell_lighter_background, 
 							    style_background_color, 1);
 
 	list->details->cell_darker_background_rgb
-	    = nautilus_gdk_set_shifted_foreground_gc_color (list->details->cell_darker_background, 
+	    = eel_gdk_set_shifted_foreground_gc_color (list->details->cell_darker_background, 
 							    style_background_color, 1.03);
 
 	list->details->cell_selected_lighter_background_rgb
-	    = nautilus_gdk_set_shifted_foreground_gc_color (list->details->cell_selected_lighter_background, 
+	    = eel_gdk_set_shifted_foreground_gc_color (list->details->cell_selected_lighter_background, 
 							    style_background_color, 1.04);
 
 	list->details->cell_selected_darker_background_rgb
-	    = nautilus_gdk_set_shifted_foreground_gc_color (list->details->cell_selected_darker_background, 
+	    = eel_gdk_set_shifted_foreground_gc_color (list->details->cell_selected_darker_background, 
 							    style_background_color, 1.06);
 
-	nautilus_gdk_set_shifted_foreground_gc_color (list->details->cell_divider_color, 
+	eel_gdk_set_shifted_foreground_gc_color (list->details->cell_divider_color, 
 						      style_background_color, 0.8);
 
 	list->details->selection_main_color_rgb
-	    = nautilus_gdk_set_shifted_foreground_gc_color (list->details->selection_main_color, 
+	    = eel_gdk_set_shifted_foreground_gc_color (list->details->selection_main_color, 
 							    selection_background_color, 1);
 		
 	list->details->selection_medium_color_rgb
-	    = nautilus_gdk_set_shifted_foreground_gc_color (list->details->selection_medium_color, 
+	    = eel_gdk_set_shifted_foreground_gc_color (list->details->selection_medium_color, 
 							    selection_background_color, 0.7);
 
 	list->details->selection_light_color_rgb
-	    = nautilus_gdk_set_shifted_foreground_gc_color (list->details->selection_light_color, 
+	    = eel_gdk_set_shifted_foreground_gc_color (list->details->selection_light_color, 
 							    selection_background_color, 0.5);
 
 	text_color = GTK_WIDGET (list)->style->fg[GTK_STATE_NORMAL];
-	nautilus_gdk_gc_choose_foreground_color (list->details->text_color, &text_color,
+	eel_gdk_gc_choose_foreground_color (list->details->text_color, &text_color,
 						 &GTK_WIDGET (list)->style->bg[GTK_STATE_NORMAL]);
 
 	text_color = GTK_WIDGET (list)->style->fg[GTK_STATE_SELECTED];
-	nautilus_gdk_gc_choose_foreground_color (list->details->selected_text_color, &text_color,
+	eel_gdk_gc_choose_foreground_color (list->details->selected_text_color, &text_color,
 						 &GTK_WIDGET (list)->style->bg[GTK_STATE_SELECTED]);
 
 	text_color.red = 0;
 	text_color.green = 0;
 	text_color.blue = 65535;
-	nautilus_gdk_gc_choose_foreground_color (list->details->link_text_color, &text_color,
+	eel_gdk_gc_choose_foreground_color (list->details->link_text_color, &text_color,
 						 &GTK_WIDGET (list)->style->bg[GTK_STATE_NORMAL]);
 }
 
@@ -1663,28 +1663,28 @@ make_gcs_and_colors (NautilusList *list)
 	unref_gcs (list);
 
 	/* now setup new ones */
-	list->details->cell_lighter_background = nautilus_gdk_gc_copy (
+	list->details->cell_lighter_background = eel_gdk_gc_copy (
 		widget->style->bg_gc[GTK_STATE_NORMAL], widget->window);
-	list->details->cell_darker_background = nautilus_gdk_gc_copy (
+	list->details->cell_darker_background = eel_gdk_gc_copy (
 		widget->style->bg_gc[GTK_STATE_NORMAL], widget->window);
-	list->details->cell_selected_lighter_background = nautilus_gdk_gc_copy (
+	list->details->cell_selected_lighter_background = eel_gdk_gc_copy (
 		widget->style->bg_gc[GTK_STATE_NORMAL], widget->window);
-	list->details->cell_selected_darker_background = nautilus_gdk_gc_copy (
+	list->details->cell_selected_darker_background = eel_gdk_gc_copy (
 		widget->style->bg_gc[GTK_STATE_NORMAL], widget->window);
-	list->details->cell_divider_color = nautilus_gdk_gc_copy (
+	list->details->cell_divider_color = eel_gdk_gc_copy (
 		widget->style->bg_gc[GTK_STATE_NORMAL], widget->window);
-	list->details->selection_light_color = nautilus_gdk_gc_copy (
+	list->details->selection_light_color = eel_gdk_gc_copy (
 		widget->style->bg_gc[GTK_STATE_SELECTED], widget->window);
-	list->details->selection_medium_color = nautilus_gdk_gc_copy (
+	list->details->selection_medium_color = eel_gdk_gc_copy (
 		widget->style->bg_gc[GTK_STATE_SELECTED], widget->window);
-	list->details->selection_main_color = nautilus_gdk_gc_copy (
+	list->details->selection_main_color = eel_gdk_gc_copy (
 		widget->style->bg_gc[GTK_STATE_SELECTED], widget->window);
 
-	list->details->text_color = nautilus_gdk_gc_copy (
+	list->details->text_color = eel_gdk_gc_copy (
 		widget->style->fg_gc[GTK_STATE_NORMAL], widget->window);
-	list->details->selected_text_color = nautilus_gdk_gc_copy (
+	list->details->selected_text_color = eel_gdk_gc_copy (
 		widget->style->fg_gc[GTK_STATE_SELECTED], widget->window);
-	list->details->link_text_color = nautilus_gdk_gc_copy (
+	list->details->link_text_color = eel_gdk_gc_copy (
 		widget->style->fg_gc[GTK_STATE_NORMAL], widget->window);
 
 	nautilus_list_setup_style_colors (list);
@@ -1699,7 +1699,7 @@ nautilus_list_style_set (GtkWidget *widget, GtkStyle *previous_style)
 
 	list = NAUTILUS_LIST (widget);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, style_set, (widget, previous_style));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, style_set, (widget, previous_style));
 
 	if (GTK_WIDGET_REALIZED (widget)) {
 		make_gcs_and_colors (list);
@@ -1720,7 +1720,7 @@ nautilus_list_realize (GtkWidget *widget)
 
 	clist->column[0].button = list->details->title;
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
 
 	make_gcs_and_colors (list);
 
@@ -1746,7 +1746,7 @@ nautilus_list_unrealize (GtkWidget *widget)
 	/* unref all the gcs we've created */
 	unref_gcs (NAUTILUS_LIST (widget));
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget));
 }
 
 /* this is here just temporarily */
@@ -1969,7 +1969,7 @@ nautilus_list_draw_focus (GtkWidget *widget)
 
   	gdk_gc_get_values (clist->xor_gc, &saved_values);
 
-  	gdk_gc_set_stipple (clist->xor_gc, nautilus_stipple_bitmap ());
+  	gdk_gc_set_stipple (clist->xor_gc, eel_stipple_bitmap ());
   	gdk_gc_set_fill (clist->xor_gc, GDK_STIPPLED);
 
     	gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE,
@@ -2148,7 +2148,7 @@ nautilus_list_draw_cell_pixbuf (NautilusList *list, GdkWindow *window,
 						     intersect_rectangle.width,
 						     intersect_rectangle.height,
 						     GDK_PIXBUF_ALPHA_BILEVEL,
-						     NAUTILUS_STANDARD_ALPHA_THRESHHOLD,
+						     EEL_STANDARD_ALPHA_THRESHHOLD,
 						     GDK_RGB_DITHER_MAX, 0, 0);
 	}
 
@@ -2317,7 +2317,7 @@ draw_cell (NautilusCList *clist, GdkRectangle *area, int row_index, int column_i
 			
 			if (src_pixbuf != NULL) {
 				/* Create darkened pixbuf */
-				dark_pixbuf = nautilus_create_darkened_pixbuf (src_pixbuf,
+				dark_pixbuf = eel_create_darkened_pixbuf (src_pixbuf,
 									       0.8 * 255,
 									       0.8 * 255);
 				if (dark_pixbuf != NULL) {
@@ -2641,7 +2641,7 @@ draw_rows (NautilusCList *clist, GdkRectangle *area)
 			break;
 		}
 
-		NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, 
+		EEL_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, 
 				      draw_row, (clist, area, row_index, list->data));
 		list = list->next;
 	}
@@ -2658,7 +2658,7 @@ draw_all (NautilusCList *clist)
 	area.y = 0;
 	area.width = clist->clist_window_width;
 	area.height = clist->clist_window_height;
-	NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, (clist, &area));
+	EEL_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, (clist, &area));
 }
 
 static void
@@ -2692,7 +2692,7 @@ nautilus_list_draw (GtkWidget *widget, GdkRectangle *area)
 					(2 * widget->style->klass->ythickness) +
 				clist->column_title_area.height);
 
-		NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, (clist, area));
+		EEL_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, (clist, area));
 
 		/* Draw the title if it exists */
 		if (list->details->title) {
@@ -2728,7 +2728,7 @@ nautilus_list_expose (GtkWidget *widget, GdkEventExpose *event)
 					(2 * widget->style->klass->ythickness) +
 				clist->column_title_area.height);
 
-		NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, 
+		EEL_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, 
 				      (clist, &event->area));
 	}
 
@@ -2745,7 +2745,7 @@ nautilus_list_resize_column (NautilusCList *clist, int column_index, int width)
 
 	gtk_widget_queue_draw (list->details->title);
 		
-	NAUTILUS_CALL_PARENT (NAUTILUS_CLIST_CLASS, resize_column, (clist, column_index, width));
+	EEL_CALL_PARENT (NAUTILUS_CLIST_CLASS, resize_column, (clist, column_index, width));
 }
 
 
@@ -2807,10 +2807,10 @@ nautilus_list_set_cell_contents (NautilusCList    *clist,
 
 	/* Clean up old data, which parent class doesn't know about. */
 	if ((NautilusCellType)row->cell[column_index].type == NAUTILUS_CELL_PIXBUF_LIST) {
-		nautilus_gdk_pixbuf_list_free (NAUTILUS_CELL_PIXBUF_LIST (row->cell[column_index])->pixbufs);
+		eel_gdk_pixbuf_list_free (NAUTILUS_CELL_PIXBUF_LIST (row->cell[column_index])->pixbufs);
 	}
 
-	result = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	result = EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(NAUTILUS_CLIST_CLASS, set_cell_contents,
 		 (clist, row, column_index, type, text, spacing, pixbuf));
 
@@ -2852,13 +2852,13 @@ set_list_cell (NautilusList *list,
 	 * expected parameter type, we have to sneak it in by casting it into
 	 * one of the expected parameters.
 	 */
-	if (NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	if (EEL_CALL_METHOD_WITH_RETURN_VALUE
 	    (NAUTILUS_CLIST_CLASS, clist, set_cell_contents, 
 	     (clist, row, column_index, type, NULL, 0, data))) {
 		/* redraw the list if it's not frozen */
 		if (CLIST_UNFROZEN (clist) 
 		    && nautilus_clist_row_is_visible (clist, row_index) != GTK_VISIBILITY_NONE) {
-			NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_row, 
+			EEL_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_row, 
 					      (clist, NULL, row_index, row));
 		}
 	}
@@ -2984,7 +2984,7 @@ nautilus_list_track_new_column_width (NautilusCList *clist, int column_index, in
 		area.x = clist->column[column_index].area.x;
 		area.height += clist->clist_window_height;
 
-		NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, (clist, &area));
+		EEL_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, (clist, &area));
 	}
 }
 
@@ -3022,7 +3022,7 @@ nautilus_list_drag_start (GtkWidget *widget, GdkEventMotion *event)
 
 	if (pixbuf != NULL) {
 		/* FIXME: We can do better than 10,10. */
-		nautilus_drag_set_icon_pixbuf (context, pixbuf, 10, 10);
+		eel_drag_set_icon_pixbuf (context, pixbuf, 10, 10);
 		
 		gdk_pixbuf_unref (pixbuf);
 	}
@@ -3044,7 +3044,7 @@ nautilus_list_motion (GtkWidget *widget, GdkEventMotion *event)
 	clist = NAUTILUS_CLIST (widget);
 
 	if (event->window != clist->clist_window) {
-		return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+		return EEL_CALL_PARENT_WITH_RETURN_VALUE
 			(GTK_WIDGET_CLASS, motion_notify_event, (widget, event));
 	}
 	
@@ -3121,7 +3121,7 @@ get_data_on_first_target_we_support (GtkWidget *widget, GdkDragContext *context,
 
 	if (nautilus_list_dnd_target_list == NULL)
 		nautilus_list_dnd_target_list = gtk_target_list_new (nautilus_list_dnd_target_table,
-								     NAUTILUS_N_ELEMENTS (nautilus_list_dnd_target_table));
+								     EEL_N_ELEMENTS (nautilus_list_dnd_target_table));
 
 	for (target = context->targets; target != NULL; target = target->next) {
 		guint dummy_info;
@@ -3231,8 +3231,8 @@ nautilus_list_real_scroll (NautilusList *list, float delta_x, float delta_y)
 	hadj = nautilus_clist_get_hadjustment (NAUTILUS_CLIST (list));
 	vadj = nautilus_clist_get_vadjustment (NAUTILUS_CLIST (list));
 
-	nautilus_gtk_adjustment_set_value (hadj, hadj->value + (int)delta_x);
-	nautilus_gtk_adjustment_set_value (vadj, vadj->value + (int)delta_y);
+	eel_gtk_adjustment_set_value (hadj, hadj->value + (int)delta_x);
+	eel_gtk_adjustment_set_value (vadj, vadj->value + (int)delta_y);
 
 }
 
@@ -3250,7 +3250,7 @@ auto_scroll_timeout_callback (gpointer data)
 	drag_info = list->details->drag_info;
 
 	if (drag_info->waiting_to_autoscroll
-	    && drag_info->start_auto_scroll_in > nautilus_get_system_time()) {
+	    && drag_info->start_auto_scroll_in > eel_get_system_time()) {
 		/* not yet */
 		return TRUE;
 	}
@@ -3444,15 +3444,15 @@ nautilus_list_drag_data_received (GtkWidget *widget, GdkDragContext *context,
 			gtk_drag_finish (context, TRUE, FALSE, time);
 			break;
 		case NAUTILUS_ICON_DND_COLOR:
-			nautilus_background_receive_dropped_color
-				(nautilus_get_widget_background (widget),
+			eel_background_receive_dropped_color
+				(eel_get_widget_background (widget),
 				 widget, x, y, data);
 			nautilus_list_setup_style_colors (NAUTILUS_LIST (list));
 			gtk_drag_finish (context, TRUE, FALSE, time);
 			break;
 		case NAUTILUS_ICON_DND_BGIMAGE:
-			nautilus_background_receive_dropped_background_image
-				(nautilus_get_widget_background (widget),
+			eel_background_receive_dropped_background_image
+				(eel_get_widget_background (widget),
 				 (char *)data->data);
 			gtk_drag_finish (context, TRUE, FALSE, time);
 			break;
@@ -3488,7 +3488,7 @@ nautilus_list_clear (NautilusCList *clist)
 	list = NAUTILUS_LIST (clist);
 	list->details->anchor_row = -1;
 
-	NAUTILUS_CALL_PARENT (NAUTILUS_CLIST_CLASS, clear, (clist));
+	EEL_CALL_PARENT (NAUTILUS_CLIST_CLASS, clear, (clist));
 }
 
 
@@ -3676,7 +3676,7 @@ insert_row (NautilusCList *list, int row_index, char *text[])
 
 	had_focus = list->focus_row != -1;
 
-	result = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	result = EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(NAUTILUS_CLIST_CLASS, insert_row, (list, row_index, text));
 
 	if (!had_focus) {
diff --git a/libnautilus-extensions/nautilus-medusa-support.c b/libnautilus-extensions/nautilus-medusa-support.c
index 2d61f7742..a4e1dc2a5 100644
--- a/libnautilus-extensions/nautilus-medusa-support.c
+++ b/libnautilus-extensions/nautilus-medusa-support.c
@@ -27,8 +27,8 @@
 #include <config.h>
 #include "nautilus-medusa-support.h"
 
-#include "nautilus-glib-extensions.h"
-#include "nautilus-string.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-string.h>
 #include <dirent.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -104,7 +104,7 @@ nautilus_medusa_check_cron_is_enabled (void)
 
 	while ((file = readdir (proc_directory)) != NULL) {
 		/* Process files have numbers */
-		if (!nautilus_str_to_int (file->d_name, &process_number)) {
+		if (!eel_str_to_int (file->d_name, &process_number)) {
 			continue;
 		}
 
@@ -127,8 +127,8 @@ nautilus_medusa_check_cron_is_enabled (void)
 		
 		stat_file_process_name = strchr (stat_file_data, ' ');
 		
-		if (nautilus_str_has_prefix (stat_file_process_name, " (crond)") ||
-		    nautilus_str_has_prefix (stat_file_process_name, " (cron)")) {
+		if (eel_str_has_prefix (stat_file_process_name, " (crond)") ||
+		    eel_str_has_prefix (stat_file_process_name, " (cron)")) {
 			status = NAUTILUS_CRON_STATUS_ON;
 			break;
 		}
diff --git a/libnautilus-extensions/nautilus-merged-directory.c b/libnautilus-extensions/nautilus-merged-directory.c
index 2f4ef5e70..0101938ab 100644
--- a/libnautilus-extensions/nautilus-merged-directory.c
+++ b/libnautilus-extensions/nautilus-merged-directory.c
@@ -28,8 +28,8 @@
 
 #include "nautilus-directory-private.h"
 #include "nautilus-file.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <gtk/gtksignal.h>
 
 struct NautilusMergedDirectoryDetails {
@@ -75,7 +75,7 @@ static guint    merged_callback_hash                       (gconstpointer
 static gboolean merged_callback_equal                      (gconstpointer            merged_callback,
 							    gconstpointer            merged_callback_2);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusMergedDirectory,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusMergedDirectory,
 				   nautilus_merged_directory,
 				   NAUTILUS_TYPE_DIRECTORY)
 
@@ -112,7 +112,7 @@ merged_destroy (GtkObject *object)
 	g_hash_table_destroy (merged->details->monitors);
 	g_free (merged->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static guint
@@ -144,7 +144,7 @@ merged_callback_destroy (MergedCallback *merged_callback)
 	g_assert (merged_callback != NULL);
 	g_assert (NAUTILUS_IS_MERGED_DIRECTORY (merged_callback->merged));
 
-	nautilus_g_list_free_deep (merged_callback->wait_for_attributes);
+	eel_g_list_free_deep (merged_callback->wait_for_attributes);
 	g_list_free (merged_callback->non_ready_directories);
 	nautilus_file_list_free (merged_callback->merged_file_list);
 	g_free (merged_callback);
@@ -227,7 +227,7 @@ merged_call_when_ready (NautilusDirectory *directory,
 	merged_callback->merged = merged;
 	merged_callback->callback = callback;
 	merged_callback->callback_data = callback_data;
-	merged_callback->wait_for_attributes = nautilus_g_str_list_copy (file_attributes);
+	merged_callback->wait_for_attributes = eel_g_str_list_copy (file_attributes);
 	for (node = merged->details->directories; node != NULL; node = node->next) {
 		merged_callback->non_ready_directories = g_list_prepend
 			(merged_callback->non_ready_directories, node->data);
@@ -302,7 +302,7 @@ merged_file_monitor_add (NautilusDirectory *directory,
 	monitor = g_hash_table_lookup (merged->details->monitors, client);
 	if (monitor != NULL) {
 		g_assert (monitor->merged == merged);
-		nautilus_g_list_free_deep (monitor->monitor_attributes);
+		eel_g_list_free_deep (monitor->monitor_attributes);
 	} else {
 		monitor = g_new0 (MergedMonitor, 1);
 		monitor->merged = merged;
@@ -311,7 +311,7 @@ merged_file_monitor_add (NautilusDirectory *directory,
 	}
 	monitor->monitor_hidden_files = monitor_hidden_files;
 	monitor->monitor_backup_files = monitor_backup_files;
-	monitor->monitor_attributes = nautilus_g_str_list_copy (file_attributes);
+	monitor->monitor_attributes = eel_g_str_list_copy (file_attributes);
 	
 	/* Call through to the real directory add calls. */
 	for (node = merged->details->directories; node != NULL; node = node->next) {
@@ -346,7 +346,7 @@ merged_file_monitor_remove (NautilusDirectory *directory,
 			(node->data, monitor);
 	}
 
-	nautilus_g_list_free_deep (monitor->monitor_attributes);
+	eel_g_list_free_deep (monitor->monitor_attributes);
 	g_free (monitor);
 }
 
@@ -550,7 +550,7 @@ merged_remove_real_directory (NautilusMergedDirectory *merged,
 	g_return_if_fail (g_list_find (merged->details->directories, real_directory) != NULL);
 
 	/* Remove this directory from callbacks and monitors. */
-	nautilus_g_hash_table_safe_for_each
+	eel_g_hash_table_safe_for_each
 		(merged->details->callbacks,
 		 merged_callback_remove_directory_cover,
 		 real_directory);
diff --git a/libnautilus-extensions/nautilus-metafile-factory.c b/libnautilus-extensions/nautilus-metafile-factory.c
index 2686f278c..046b167b9 100644
--- a/libnautilus-extensions/nautilus-metafile-factory.c
+++ b/libnautilus-extensions/nautilus-metafile-factory.c
@@ -24,7 +24,7 @@
 #include "nautilus-metafile-factory.h"
 #include "nautilus-metafile.h"
 
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
 #include <libnautilus/nautilus-bonobo-workarounds.h>
 
@@ -64,7 +64,7 @@ destroy (GtkObject *object)
 	factory = NAUTILUS_METAFILE_FACTORY (object);
 	g_free (factory->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static NautilusMetafileFactory *
diff --git a/libnautilus-extensions/nautilus-metafile.c b/libnautilus-extensions/nautilus-metafile.c
index 939f0c82b..c16926d43 100644
--- a/libnautilus-extensions/nautilus-metafile.c
+++ b/libnautilus-extensions/nautilus-metafile.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #include "nautilus-metafile.h"
 
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-directory.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
 #include <libnautilus/nautilus-bonobo-workarounds.h>
@@ -32,11 +32,11 @@
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-file-info.h>
 
-#include "nautilus-string.h"
+#include <eel/eel-string.h>
 #include "nautilus-metadata.h"
 #include "nautilus-thumbnails.h"
-#include "nautilus-xml-extensions.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-xml-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include "nautilus-directory.h"
 #include "nautilus-global-preferences.h"
 #include "nautilus-file-private.h"
@@ -251,7 +251,7 @@ destroy (GtkObject *object)
 
 	g_free (metafile->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static GnomeVFSURI *
@@ -295,7 +295,7 @@ nautilus_metafile_set_directory_uri (NautilusMetafile *metafile, const char *dir
 {
 	GnomeVFSURI *new_vfs_uri;
 
-	if (nautilus_strcmp (metafile->details->directory_uri, directory_uri) == 0) {
+	if (eel_strcmp (metafile->details->directory_uri, directory_uri) == 0) {
 		return;
 	}
 
@@ -344,7 +344,7 @@ nautilus_metafile_get (const char *directory_uri)
 	g_return_val_if_fail (directory_uri != NULL, NULL);
 	
 	if (metafiles == NULL) {
-		metafiles = nautilus_g_hash_table_new_free_at_exit
+		metafiles = eel_g_hash_table_new_free_at_exit
 			(g_str_hash, g_str_equal, __FILE__ ": metafiles");
 	}
 	
@@ -522,7 +522,7 @@ corba_get_list (PortableServer_Servant  servant,
 		++buf_pos;
 	}
 
-	nautilus_g_list_free_deep (metadata_list);
+	eel_g_list_free_deep (metadata_list);
 
 	return result;
 }
@@ -537,10 +537,10 @@ corba_set (PortableServer_Servant  servant,
 {
 	NautilusMetafile  *metafile;
 
-	if (nautilus_str_is_empty (default_value)) {
+	if (eel_str_is_empty (default_value)) {
 		default_value = NULL;
 	}
-	if (nautilus_str_is_empty (metadata)) {
+	if (eel_str_is_empty (metadata)) {
 		metadata = NULL;
 	}
 
@@ -820,7 +820,7 @@ get_metadata_list_from_node (xmlNode *node,
 			     const char *list_key,
 			     const char *list_subkey)
 {
-	return nautilus_xml_get_property_for_children
+	return eel_xml_get_property_for_children
 		(node, list_key, list_subkey);
 }
 
@@ -909,7 +909,7 @@ set_metadata_string_in_metafile (NautilusMetafile *metafile,
 	old_metadata = get_file_metadata
 		(metafile, file_name, key, default_metadata);
 
-	old_metadata_matches = nautilus_strcmp (old_metadata, metadata) == 0;
+	old_metadata_matches = eel_strcmp (old_metadata, metadata) == 0;
 	g_free (old_metadata);
 	if (old_metadata_matches) {
 		return FALSE;
@@ -918,7 +918,7 @@ set_metadata_string_in_metafile (NautilusMetafile *metafile,
 	/* Data that matches the default is represented in the tree by
 	 * the lack of an attribute.
 	 */
-	if (nautilus_strcmp (default_metadata, metadata) == 0) {
+	if (eel_strcmp (default_metadata, metadata) == 0) {
 		value = NULL;
 	} else {
 		value = metadata;
@@ -963,7 +963,7 @@ set_metadata_list_in_metafile (NautilusMetafile *metafile,
 		p = list;
 
 		/* Remove any nodes except the ones we expect. */
-		for (child = nautilus_xml_get_children (node);
+		for (child = eel_xml_get_children (node);
 		     child != NULL;
 		     child = next) {
 
@@ -1019,7 +1019,7 @@ metadata_value_new_list (GList *metadata)
 	value = g_new0 (MetadataValue, 1);
 
 	value->is_list = TRUE;
-	value->value.string_list = nautilus_g_str_list_copy (metadata);
+	value->value.string_list = eel_g_str_list_copy (metadata);
 
 	return value;
 }
@@ -1034,7 +1034,7 @@ metadata_value_destroy (MetadataValue *value)
 	if (!value->is_list) {
 		g_free (value->value.string);
 	} else {
-		nautilus_g_list_free_deep (value->value.string_list);
+		eel_g_list_free_deep (value->value.string_list);
 	}
 	g_free (value->default_value);
 	g_free (value);
@@ -1049,15 +1049,15 @@ metadata_value_equal (const MetadataValue *value_a,
 	}
 
 	if (!value_a->is_list) {
-		return nautilus_strcmp (value_a->value.string,
+		return eel_strcmp (value_a->value.string,
 					value_b->value.string) == 0
-			&& nautilus_strcmp (value_a->default_value,
+			&& eel_strcmp (value_a->default_value,
 					    value_b->default_value) == 0;
 	} else {
 		g_assert (value_a->default_value == NULL);
 		g_assert (value_b->default_value == NULL);
 
-		return nautilus_g_str_list_equal
+		return eel_g_str_list_equal
 			(value_a->value.string_list,
 			 value_b->value.string_list);
 	}
@@ -1109,7 +1109,7 @@ get_metadata_string_from_table (NautilusMetafile *metafile,
 	
 	/* Convert it to a string. */
 	g_assert (!value->is_list);
-	if (nautilus_strcmp (value->value.string, value->default_value) == 0) {
+	if (eel_strcmp (value->value.string, value->default_value) == 0) {
 		return g_strdup (default_metadata);
 	}
 	return g_strdup (value->value.string);
@@ -1141,7 +1141,7 @@ get_metadata_list_from_table (NautilusMetafile *metafile,
 
 	/* Copy the list and return it. */
 	g_assert (value->is_list);
-	return nautilus_g_str_list_copy (value->value.string_list);
+	return eel_g_str_list_copy (value->value.string_list);
 }
 
 static guint
@@ -1279,8 +1279,8 @@ get_file_metadata (NautilusMetafile *metafile,
 		   const char *default_metadata)
 {
 	g_return_val_if_fail (NAUTILUS_IS_METAFILE (metafile), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (file_name), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (key), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (file_name), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (key), NULL);
 
 	if (metafile->details->is_read) {
 		return get_metadata_string_from_metafile
@@ -1298,9 +1298,9 @@ get_file_metadata_list (NautilusMetafile *metafile,
 			const char *list_subkey)
 {
 	g_return_val_if_fail (NAUTILUS_IS_METAFILE (metafile), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (file_name), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (list_key), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (list_subkey), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (file_name), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (list_key), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (list_subkey), NULL);
 
 	if (metafile->details->is_read) {
 		return get_metadata_list_from_metafile
@@ -1321,8 +1321,8 @@ set_file_metadata (NautilusMetafile *metafile,
 	MetadataValue *value;
 
 	g_return_val_if_fail (NAUTILUS_IS_METAFILE (metafile), FALSE);
-	g_return_val_if_fail (!nautilus_str_is_empty (file_name), FALSE);
-	g_return_val_if_fail (!nautilus_str_is_empty (key), FALSE);
+	g_return_val_if_fail (!eel_str_is_empty (file_name), FALSE);
+	g_return_val_if_fail (!eel_str_is_empty (key), FALSE);
 
 	if (metafile->details->is_read) {
 		return set_metadata_string_in_metafile (metafile, file_name, key,
@@ -1344,9 +1344,9 @@ set_file_metadata_list (NautilusMetafile *metafile,
 	MetadataValue *value;
 
 	g_return_val_if_fail (NAUTILUS_IS_METAFILE (metafile), FALSE);
-	g_return_val_if_fail (!nautilus_str_is_empty (file_name), FALSE);
-	g_return_val_if_fail (!nautilus_str_is_empty (list_key), FALSE);
-	g_return_val_if_fail (!nautilus_str_is_empty (list_subkey), FALSE);
+	g_return_val_if_fail (!eel_str_is_empty (file_name), FALSE);
+	g_return_val_if_fail (!eel_str_is_empty (list_key), FALSE);
+	g_return_val_if_fail (!eel_str_is_empty (list_subkey), FALSE);
 
 	if (metafile->details->is_read) {
 		return set_metadata_list_in_metafile (metafile, file_name,
@@ -1591,7 +1591,7 @@ remove_file_metadata (NautilusMetafile *metafile,
 			g_hash_table_remove (hash,
 					     file_name);
 			xmlFree (key);
-			nautilus_xml_remove_node (file_node);
+			eel_xml_remove_node (file_node);
 			xmlFreeNode (file_node);
 			directory_request_write_metafile (metafile);
 		}
@@ -1638,7 +1638,7 @@ nautilus_metafile_set_metafile_contents (NautilusMetafile *metafile,
 	
 	/* Populate the node hash table. */
 	hash = metafile->details->node_hash;
-	for (node = nautilus_xml_get_root_children (metafile_contents);
+	for (node = eel_xml_get_root_children (metafile_contents);
 	     node != NULL; node = node->next) {
 		if (strcmp (node->name, "file") == 0) {
 			name = xmlGetProp (node, "name");
@@ -1736,7 +1736,7 @@ metafile_read_check_for_directory_callback (GnomeVFSAsyncHandle *handle,
 	metafile = NAUTILUS_METAFILE (callback_data);
 
 	g_assert (metafile->details->read_state->get_file_info_handle == handle);
-	g_assert (nautilus_g_list_exactly_one_item (results));
+	g_assert (eel_g_list_exactly_one_item (results));
 
 	metafile->details->read_state->get_file_info_handle = NULL;
 
@@ -1899,12 +1899,12 @@ allow_metafile (NautilusMetafile *metafile)
 	 */
 	uri = metafile->details->directory_uri;
 	if (nautilus_is_search_uri (uri)
-	    || nautilus_istr_has_prefix (uri, "ghelp:")
-	    || nautilus_istr_has_prefix (uri, "gnome-help:")
-	    || nautilus_istr_has_prefix (uri, "help:")
-	    || nautilus_istr_has_prefix (uri, "info:")
-	    || nautilus_istr_has_prefix (uri, "man:")
-	    || nautilus_istr_has_prefix (uri, "pipe:")
+	    || eel_istr_has_prefix (uri, "ghelp:")
+	    || eel_istr_has_prefix (uri, "gnome-help:")
+	    || eel_istr_has_prefix (uri, "help:")
+	    || eel_istr_has_prefix (uri, "info:")
+	    || eel_istr_has_prefix (uri, "man:")
+	    || eel_istr_has_prefix (uri, "pipe:")
 	    ) {
 		return FALSE;
 	}
diff --git a/libnautilus-extensions/nautilus-mime-actions.c b/libnautilus-extensions/nautilus-mime-actions.c
index b1af50c6f..bfbd46ee5 100644
--- a/libnautilus-extensions/nautilus-mime-actions.c
+++ b/libnautilus-extensions/nautilus-mime-actions.c
@@ -27,10 +27,10 @@
 
 #include "nautilus-file-attributes.h"
 #include "nautilus-file.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-lib-self-check-functions.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-lib-self-check-functions.h>
 #include "nautilus-metadata.h"
-#include "nautilus-string.h"
+#include <eel/eel-string.h>
 #include <libgnomevfs/gnome-vfs-application-registry.h>
 #include <libgnomevfs/gnome-vfs-mime-info.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
@@ -423,7 +423,7 @@ nautilus_mime_get_default_component_for_file_internal (NautilusFile *file,
 		server = NULL;		
 	}
 	
-	nautilus_g_list_free_deep (item_mime_types);
+	eel_g_list_free_deep (item_mime_types);
 	g_strfreev (sort_conditions);
 
 	g_free (uri_scheme);
@@ -491,7 +491,7 @@ nautilus_mime_get_short_list_applications_for_file (NautilusFile      *file)
 	/* First remove applications that cannot support this location */
 	uri_scheme = nautilus_file_get_uri_scheme (file);
 	g_assert (uri_scheme != NULL);
-	result = nautilus_g_list_partition (result, application_supports_uri_scheme,
+	result = eel_g_list_partition (result, application_supports_uri_scheme,
 					    uri_scheme, &removed);
 	gnome_vfs_mime_application_list_free (removed);
 
@@ -507,7 +507,7 @@ nautilus_mime_get_short_list_applications_for_file (NautilusFile      *file)
 		 NAUTILUS_METADATA_SUBKEY_APPLICATION_ID);
 
 
-	result = nautilus_g_list_partition (result, (NautilusPredicateFunction) gnome_vfs_mime_application_has_id_not_in_list, 
+	result = eel_g_list_partition (result, (EelPredicateFunction) gnome_vfs_mime_application_has_id_not_in_list, 
 					    metadata_application_remove_ids, &removed);
 	
 	gnome_vfs_mime_application_list_free (removed);
@@ -585,8 +585,8 @@ nautilus_mime_get_short_list_components_for_file (NautilusFile      *file)
 		iids = g_list_prepend (iids, component->iid);
 	}
 
-	iids = nautilus_g_list_partition
-		(iids, (NautilusPredicateFunction) string_not_in_list, 
+	iids = eel_g_list_partition
+		(iids, (EelPredicateFunction) string_not_in_list, 
 		 metadata_component_remove_ids, &removed);
 
 	g_list_free (removed);
@@ -626,7 +626,7 @@ nautilus_mime_get_short_list_components_for_file (NautilusFile      *file)
 		g_free (extra_requirements);
 	}
 
-	nautilus_g_list_free_deep (item_mime_types);
+	eel_g_list_free_deep (item_mime_types);
 	gnome_vfs_mime_component_list_free (servers);
 	g_list_free (iids);
 	g_free (uri_scheme);
@@ -754,7 +754,7 @@ nautilus_mime_actions_file_needs_full_file_attributes (NautilusFile *file)
 	}
 	
 	gnome_vfs_mime_component_list_free (info_list);
-	nautilus_g_list_free_deep (explicit_iids);
+	eel_g_list_free_deep (explicit_iids);
 	g_free (uri_scheme);
 	g_free (mime_type);
 	CORBA_exception_free (&ev);
@@ -792,8 +792,8 @@ nautilus_mime_get_all_components_for_file (NautilusFile *file)
 	info_list = nautilus_do_component_query (mime_type, uri_scheme, item_mime_types, FALSE,
 						 explicit_iids, NULL, NULL, &ev);
 	
-	nautilus_g_list_free_deep (explicit_iids);
-	nautilus_g_list_free_deep (item_mime_types);
+	eel_g_list_free_deep (explicit_iids);
+	eel_g_list_free_deep (item_mime_types);
 
 	g_free (uri_scheme);
 	g_free (mime_type);
@@ -990,7 +990,7 @@ nautilus_mime_add_application_to_short_list_for_file (NautilusFile      *file,
 		new_list = g_list_append (gnome_vfs_mime_id_list_from_application_list (old_list), 
 					  g_strdup (application_id));
 		result = nautilus_mime_set_short_list_applications_for_file (file, new_list);
-		nautilus_g_list_free_deep (new_list);
+		eel_g_list_free_deep (new_list);
 	}
 
 	gnome_vfs_mime_application_list_free (old_list);
@@ -1018,7 +1018,7 @@ nautilus_mime_remove_application_from_short_list_for_file (NautilusFile      *fi
 	} else {
 		new_list = gnome_vfs_mime_id_list_from_application_list (old_list);
 		result = nautilus_mime_set_short_list_applications_for_file (file, new_list);
-		nautilus_g_list_free_deep (new_list);
+		eel_g_list_free_deep (new_list);
 	}
 
 	gnome_vfs_mime_application_list_free (old_list);
@@ -1044,7 +1044,7 @@ nautilus_mime_add_component_to_short_list_for_file (NautilusFile      *file,
 		new_list = g_list_append (gnome_vfs_mime_id_list_from_component_list (old_list), 
 					  g_strdup (iid));
 		result = nautilus_mime_set_short_list_components_for_file (file, new_list);
-		nautilus_g_list_free_deep (new_list);
+		eel_g_list_free_deep (new_list);
 	}
 
 	gnome_vfs_mime_component_list_free (old_list);
@@ -1072,7 +1072,7 @@ nautilus_mime_remove_component_from_short_list_for_file (NautilusFile *file,
 	} else {
 		new_list = gnome_vfs_mime_id_list_from_component_list (old_list);
 		result = nautilus_mime_set_short_list_components_for_file (file, new_list);
-		nautilus_g_list_free_deep (new_list);
+		eel_g_list_free_deep (new_list);
 	}
 
 	gnome_vfs_mime_component_list_free (old_list);
@@ -1677,5 +1677,5 @@ application_supports_uri_scheme (gpointer data,
 	}
 	return g_list_find_custom (application->supported_uri_schemes,
 				   uri_scheme,
-				   nautilus_strcasecmp_compare_func) != NULL;
+				   eel_strcasecmp_compare_func) != NULL;
 }
diff --git a/libnautilus-extensions/nautilus-password-dialog.c b/libnautilus-extensions/nautilus-password-dialog.c
deleted file mode 100644
index c2fef9b5a..000000000
--- a/libnautilus-extensions/nautilus-password-dialog.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-password-dialog.c - A use password prompting dialog widget.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-password-dialog.h"
-
-#include "nautilus-caption-table.h"
-#include "nautilus-gtk-macros.h"
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-stock.h>
-
-struct _NautilusPasswordDialogDetails
-{
-	/* Attributes */
-	char		*username;
-	char		*password;
-	gboolean	readonly_username;
-	gboolean	remember;
-	char		*remember_label_text;
-
-	/* Internal widgetry and flags */
-	GtkWidget	*table;
-	GtkWidget	*remember_button;
-	GtkLabel	*message;
-};
-
-static const char * stock_buttons[] =
-{
-	GNOME_STOCK_BUTTON_OK,
-	GNOME_STOCK_BUTTON_CANCEL,
-	NULL
-};
-
-/* Dialog button indeces */
-static const gint  DIALOG_OK_BUTTON = 0;
-
-/* Caption table rows indeces */
-static const guint CAPTION_TABLE_USERNAME_ROW = 0;
-static const guint CAPTION_TABLE_PASSWORD_ROW = 1;
-
-/* Layout constants */
-static const guint DIALOG_BORDER_WIDTH = 0;
-static const guint CAPTION_TABLE_BORDER_WIDTH = 4;
-
-/* NautilusPasswordDialogClass methods */
-static void nautilus_password_dialog_initialize_class (NautilusPasswordDialogClass *password_dialog_class);
-static void nautilus_password_dialog_initialize       (NautilusPasswordDialog      *password_dialog);
-
-
-
-/* GtkObjectClass methods */
-static void nautilus_password_dialog_destroy          (GtkObject                   *object);
-
-
-/* GtkDialog callbacks */
-static void dialog_show_callback                      (GtkWidget                   *widget,
-						       gpointer                     callback_data);
-static void dialog_close_callback                     (GtkWidget                   *widget,
-						       gpointer                     callback_data);
-/* Caption table callbacks */
-static void caption_table_activate_callback           (GtkWidget                   *widget,
-						       guint                         entry,
-						       gpointer                     callback_data);
-
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusPasswordDialog,
-				   nautilus_password_dialog,
-				   gnome_dialog_get_type ());
-
-
-static void
-nautilus_password_dialog_initialize_class (NautilusPasswordDialogClass * klass)
-{
-	GtkObjectClass * object_class;
-	GtkWidgetClass * widget_class;
-	
-	object_class = GTK_OBJECT_CLASS(klass);
-	widget_class = GTK_WIDGET_CLASS(klass);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_password_dialog_destroy;
-}
-
-static void
-nautilus_password_dialog_initialize (NautilusPasswordDialog *password_dialog)
-{
-	password_dialog->details = g_new (NautilusPasswordDialogDetails, 1);
-
-	password_dialog->details->username = NULL;
-	password_dialog->details->password = NULL;
-	password_dialog->details->readonly_username = FALSE;
-
-	password_dialog->details->remember_label_text = NULL;
-	password_dialog->details->remember = FALSE;
-
-	password_dialog->details->table = NULL;
-	password_dialog->details->remember_button = NULL;
-	password_dialog->details->message = NULL;
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_password_dialog_destroy (GtkObject* object)
-{
-	NautilusPasswordDialog *password_dialog;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (object));
-	
-	password_dialog = NAUTILUS_PASSWORD_DIALOG (object);
-	
-	if (password_dialog->details->username) {
-		g_free (password_dialog->details->username);
-	}
-
-	if (password_dialog->details->password) {
-		g_free (password_dialog->details->password);
-	}
-
-	if (password_dialog->details->remember_label_text) {
-		g_free (password_dialog->details->remember_label_text);
-	}
-
-	if (password_dialog->details->message) {
-		gtk_widget_destroy (GTK_WIDGET (password_dialog->details->message));
-	}
-
-	g_free (password_dialog->details);
-}
-
-/* GtkDialog callbacks */
-static void
-dialog_show_callback (GtkWidget *widget, gpointer callback_data)
-{
-	NautilusPasswordDialog *password_dialog;
-
-	g_return_if_fail (callback_data != NULL);
-	g_return_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (callback_data));
-
-	password_dialog = NAUTILUS_PASSWORD_DIALOG (callback_data);
-
-	/* Move the focus to the password entry */
-	nautilus_caption_table_entry_grab_focus (NAUTILUS_CAPTION_TABLE (password_dialog->details->table), 
-						 CAPTION_TABLE_PASSWORD_ROW);
-}
-
-static void
-dialog_close_callback (GtkWidget *widget, gpointer callback_data)
-{
-	NautilusPasswordDialog *password_dialog;
-
-	g_return_if_fail (callback_data != NULL);
-	g_return_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (callback_data));
-
-	password_dialog = NAUTILUS_PASSWORD_DIALOG (callback_data);
-
-	gtk_widget_hide (widget);
-}
-
-/* Caption table callbacks */
-static void
-caption_table_activate_callback (GtkWidget *widget, guint entry, gpointer callback_data)
-{
-	NautilusPasswordDialog *password_dialog;
-
-	g_return_if_fail (callback_data != NULL);
-	g_return_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (callback_data));
-
-	password_dialog = NAUTILUS_PASSWORD_DIALOG (callback_data);
-
-	/* If the username entry was activated, simply advance the focus to the password entry */
-	if (entry == CAPTION_TABLE_USERNAME_ROW) {
-		nautilus_caption_table_entry_grab_focus (NAUTILUS_CAPTION_TABLE (password_dialog->details->table), 
-							 CAPTION_TABLE_PASSWORD_ROW);
-	}
-	/* If the password entry was activated, then simulate and OK button press to continue to hide process */
-	else if (entry == CAPTION_TABLE_PASSWORD_ROW) {
-		GtkWidget *button;
-		
-		button = g_list_nth_data (GNOME_DIALOG (password_dialog)->buttons, DIALOG_OK_BUTTON);
-		
-		g_assert (button != NULL);
-		g_assert (GTK_IS_BUTTON (button));
-
-		gtk_button_clicked (GTK_BUTTON (button));
-	}
-}
-
-/* Public NautilusPasswordDialog methods */
-GtkWidget *
-nautilus_password_dialog_new (const char	*dialog_title,
-			      const char	*message,
-			      const char	*username,
-			      const char	*password,
-			      gboolean		readonly_username)
-{
-	NautilusPasswordDialog *password_dialog;
-
-	password_dialog = NAUTILUS_PASSWORD_DIALOG (gtk_widget_new (nautilus_password_dialog_get_type (), NULL));
-
-	gnome_dialog_constructv (GNOME_DIALOG (password_dialog), dialog_title, stock_buttons);
-
-	/* Setup the dialog */
-	gtk_window_set_policy (GTK_WINDOW (password_dialog), 
-			      FALSE,	/* allow_shrink */
-			      TRUE,	/* allow_grow */
-			      FALSE);	/* auto_shrink */
-
- 	gtk_window_set_position (GTK_WINDOW (password_dialog), GTK_WIN_POS_CENTER);
-	gtk_window_set_modal (GTK_WINDOW (password_dialog), TRUE);
-
- 	gtk_container_set_border_width (GTK_CONTAINER (password_dialog), DIALOG_BORDER_WIDTH);
-
-	gnome_dialog_set_default (GNOME_DIALOG (password_dialog), DIALOG_OK_BUTTON);
-
-	/* Dont close the dialog on click.  We'll mange the destruction our selves */
-	gnome_dialog_set_close (GNOME_DIALOG (password_dialog), FALSE);
-
-	/* Make the close operation 'just_hide' the dialog - not nuke it */
-	gnome_dialog_close_hides (GNOME_DIALOG (password_dialog), TRUE);
-	
-	gtk_signal_connect_while_alive (GTK_OBJECT (password_dialog),
-					"show",
-					GTK_SIGNAL_FUNC (dialog_show_callback),
-					(gpointer) password_dialog,
-					GTK_OBJECT (password_dialog));
-	
-	gtk_signal_connect_while_alive (GTK_OBJECT (password_dialog),
-					"close",
-					GTK_SIGNAL_FUNC (dialog_close_callback),
-					(gpointer) password_dialog,
-					GTK_OBJECT (password_dialog));
-
-	/* The table that holds the captions */
-	password_dialog->details->table = nautilus_caption_table_new (2);
-	
-	gtk_signal_connect (GTK_OBJECT (password_dialog->details->table),
-			    "activate",
-			    GTK_SIGNAL_FUNC (caption_table_activate_callback),
-			    password_dialog);
-
-	nautilus_caption_table_set_row_info (NAUTILUS_CAPTION_TABLE (password_dialog->details->table),
-					     CAPTION_TABLE_USERNAME_ROW,
-					     _("Username:"),
-					     "",
-					     TRUE,
-					     TRUE);
-
-	nautilus_caption_table_set_row_info (NAUTILUS_CAPTION_TABLE (password_dialog->details->table),
-					     CAPTION_TABLE_PASSWORD_ROW,
-					     _("Password:"),
-					     "",
-					     FALSE,
-					     FALSE);
-	
-	/* Configure the GNOME_DIALOG's vbox */
- 	g_assert (GNOME_DIALOG (password_dialog)->vbox != NULL);
-
-	gtk_box_set_spacing (GTK_BOX (GNOME_DIALOG (password_dialog)->vbox), 10);
-	
-	if (message) {
-		password_dialog->details->message =
-			GTK_LABEL (gtk_label_new (message));
-		gtk_label_set_justify (password_dialog->details->message, GTK_JUSTIFY_LEFT);
-		gtk_label_set_line_wrap (password_dialog->details->message, TRUE);
-
-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (password_dialog)->vbox),
-				    GTK_WIDGET (password_dialog->details->message),
-				    TRUE,	/* expand */
-				    TRUE,	/* fill */
-				    0);		/* padding */
-	}
-
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (password_dialog)->vbox),
-			    password_dialog->details->table,
-			    TRUE,	/* expand */
-			    TRUE,	/* fill */
-			    0);		/* padding */
-#if 0 /* FIXME: disabled for PR2 originally, when will we re-enable */
-	password_dialog->details->remember_button = 
-		gtk_check_button_new_with_label (_("Remember this password"));
-
-	gtk_box_pack_end (GTK_BOX (GNOME_DIALOG (password_dialog)->vbox),
-			  password_dialog->details->remember_button,
-			  TRUE,	/* expand */
-			  TRUE,	/* fill */
-			  4);		/* padding */
-#else
-	password_dialog->details->remember_button = NULL;
-#endif	
-	/* Configure the table */
- 	gtk_container_set_border_width (GTK_CONTAINER(password_dialog->details->table), CAPTION_TABLE_BORDER_WIDTH);
-	
-	gtk_widget_show_all (GNOME_DIALOG (password_dialog)->vbox);
-	
-	nautilus_password_dialog_set_username (password_dialog, username);
-	nautilus_password_dialog_set_password (password_dialog, password);
-	nautilus_password_dialog_set_readonly_username (password_dialog, readonly_username);
-	
-	return GTK_WIDGET (password_dialog);
-}
-
-gboolean
-nautilus_password_dialog_run_and_block (NautilusPasswordDialog *password_dialog)
-{
-	gint button_clicked;
-
-	g_return_val_if_fail (password_dialog != NULL, FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (password_dialog), FALSE);
-	
-	button_clicked = gnome_dialog_run_and_close (GNOME_DIALOG (password_dialog));
-
-	return (button_clicked == DIALOG_OK_BUTTON);
-}
-
-void
-nautilus_password_dialog_set_username (NautilusPasswordDialog	*password_dialog,
-				       const char		*username)
-{
-	g_return_if_fail (password_dialog != NULL);
-	g_return_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (password_dialog));
-
-	nautilus_caption_table_set_entry_text (NAUTILUS_CAPTION_TABLE (password_dialog->details->table),
-					       CAPTION_TABLE_USERNAME_ROW,
-					       username);
-}
-
-void
-nautilus_password_dialog_set_password (NautilusPasswordDialog	*password_dialog,
-				       const char		*password)
-{
-	g_return_if_fail (password_dialog != NULL);
-	g_return_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (password_dialog));
-	
-	nautilus_caption_table_set_entry_text (NAUTILUS_CAPTION_TABLE (password_dialog->details->table),
-					       CAPTION_TABLE_PASSWORD_ROW,
-					       password);
-}
-
-void
-nautilus_password_dialog_set_readonly_username (NautilusPasswordDialog	*password_dialog,
-						gboolean		readonly)
-{
-	g_return_if_fail (password_dialog != NULL);
-	g_return_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (password_dialog));
-	
-	nautilus_caption_table_set_entry_readonly (NAUTILUS_CAPTION_TABLE (password_dialog->details->table),
-						   CAPTION_TABLE_USERNAME_ROW,
-						   readonly);
-}
-
-char *
-nautilus_password_dialog_get_username (NautilusPasswordDialog *password_dialog)
-{
-	g_return_val_if_fail (password_dialog != NULL, NULL);
-	g_return_val_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (password_dialog), NULL);
-
-	return nautilus_caption_table_get_entry_text (NAUTILUS_CAPTION_TABLE (password_dialog->details->table),
-						      CAPTION_TABLE_USERNAME_ROW);
-}
-
-char *
-nautilus_password_dialog_get_password (NautilusPasswordDialog *password_dialog)
-{
-	g_return_val_if_fail (password_dialog != NULL, NULL);
-	g_return_val_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (password_dialog), NULL);
-
-	return nautilus_caption_table_get_entry_text (NAUTILUS_CAPTION_TABLE (password_dialog->details->table),
-						      CAPTION_TABLE_PASSWORD_ROW);
-}
-
-gboolean
-nautilus_password_dialog_get_remember (NautilusPasswordDialog *password_dialog)
-{
-	g_return_val_if_fail (password_dialog != NULL, FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (password_dialog), FALSE);
-
-#if 0	/* remove for PR2 */
-	return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_button));
-#else
-	return FALSE;
-#endif
-}
-
-void
-nautilus_password_dialog_set_remember (NautilusPasswordDialog *password_dialog,
-				       gboolean                remember)
-{
-	g_return_if_fail (password_dialog != NULL);
-	g_return_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (password_dialog));
-
-#if 0	/* remove for PR2 */
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_button),
-				      remember);
-#endif
-}
-
-void
-nautilus_password_dialog_set_remember_label_text (NautilusPasswordDialog *password_dialog,
-						  const char             *remember_label_text)
-{
-#if 0	/* remove for PR2 */
-	GtkWidget *label;
-
-	g_return_if_fail (password_dialog != NULL);
-	g_return_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (password_dialog));
-
-	label = GTK_BIN (password_dialog->details->remember_button)->child;
-
-	g_assert (label != NULL);
-	g_assert (GTK_IS_LABEL (label));
-
-	gtk_label_set_text (GTK_LABEL (label), remember_label_text);
-#endif
-}
diff --git a/libnautilus-extensions/nautilus-password-dialog.h b/libnautilus-extensions/nautilus-password-dialog.h
deleted file mode 100644
index 52363e497..000000000
--- a/libnautilus-extensions/nautilus-password-dialog.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-password-dialog.h - A use password prompting dialog widget.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_PASSWORD_DIALOG_H
-#define NAUTILUS_PASSWORD_DIALOG_H
-
-#include <libgnomeui/gnome-dialog.h>
-
-BEGIN_GNOME_DECLS
-
-#define GTK_TYPE_AUTH_DIALOG            (nautilus_password_dialog_get_type ())
-#define NAUTILUS_PASSWORD_DIALOG(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_AUTH_DIALOG, NautilusPasswordDialog))
-#define NAUTILUS_PASSWORD_DIALOG_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_AUTH_DIALOG, NautilusPasswordDialogClass))
-#define NAUTILUS_IS_PASSWORD_DIALOG(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_AUTH_DIALOG))
-#define NAUTILUS_IS_PASSWORD_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_AUTH_DIALOG))
-
-typedef struct _NautilusPasswordDialog       NautilusPasswordDialog;
-typedef struct _NautilusPasswordDialogClass  NautilusPasswordDialogClass;
-typedef struct _NautilusPasswordDialogDetails NautilusPasswordDialogDetails;
-
-struct _NautilusPasswordDialog
-{
-	GnomeDialog gnome_dialog;
-
-	NautilusPasswordDialogDetails *details;
-};
-
-struct _NautilusPasswordDialogClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkType    nautilus_password_dialog_get_type                (void);
-GtkWidget* nautilus_password_dialog_new                     (const char             *dialog_title,
-							     const char		    *message,
-							     const char             *username,
-							     const char             *password,
-							     gboolean                readonly_username);
-gboolean   nautilus_password_dialog_run_and_block           (NautilusPasswordDialog *password_dialog);
-
-/* Attribute mutators */
-void     nautilus_password_dialog_set_username            (NautilusPasswordDialog *password_dialog,
-							   const char             *username);
-void     nautilus_password_dialog_set_password            (NautilusPasswordDialog *password_dialog,
-							   const char             *password);
-void     nautilus_password_dialog_set_readonly_username   (NautilusPasswordDialog *password_dialog,
-							   gboolean                readonly);
-void     nautilus_password_dialog_set_remember            (NautilusPasswordDialog *password_dialog,
-							   gboolean                remember);
-void     nautilus_password_dialog_set_remember_label_text (NautilusPasswordDialog *password_dialog,
-							   const char             *remember_label_text);
-
-/* Attribute accessors */
-char *   nautilus_password_dialog_get_username            (NautilusPasswordDialog *password_dialog);
-char *   nautilus_password_dialog_get_password            (NautilusPasswordDialog *password_dialog);
-gboolean nautilus_password_dialog_get_remember            (NautilusPasswordDialog *password_dialog);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_PASSWORD_DIALOG_H */
diff --git a/libnautilus-extensions/nautilus-preferences-box.c b/libnautilus-extensions/nautilus-preferences-box.c
index e5be90420..10e519e5e 100644
--- a/libnautilus-extensions/nautilus-preferences-box.c
+++ b/libnautilus-extensions/nautilus-preferences-box.c
@@ -25,8 +25,8 @@
 
 #include <config.h>
 #include "nautilus-preferences-box.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-string.h"
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-string.h>
 
 #include <gtk/gtkclist.h>
 #include <gtk/gtknotebook.h>
@@ -79,7 +79,7 @@ static void      category_list_select_row_callback         (GtkCList
 int              preferences_box_find_row                  (GtkCList                    *clist,
 							    char                        *pane_name);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesBox, nautilus_preferences_box, GTK_TYPE_HBOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesBox, nautilus_preferences_box, GTK_TYPE_HBOX)
 
 /*
  * NautilusPreferencesBoxClass methods
@@ -133,7 +133,7 @@ nautilus_preferences_box_destroy (GtkObject *object)
 	g_free (preferences_box->details);
 	
 	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /*
@@ -158,7 +158,7 @@ preferences_box_select_pane (NautilusPreferencesBox *preferences_box,
 
 		g_assert (info != NULL);
 		
-		if (nautilus_str_is_equal (pane_name, info->pane_name)) {
+		if (eel_str_is_equal (pane_name, info->pane_name)) {
  			gtk_widget_show (info->pane_widget);
  			gtk_notebook_set_page (GTK_NOTEBOOK (preferences_box->details->pane_notebook), 
  					       g_list_position (preferences_box->details->panes, pane_iterator));
@@ -183,7 +183,7 @@ preferences_box_find_row (GtkCList *clist, char *pane_name)
 	for (i=0; i < GTK_CLIST (clist)->rows; i++) {
 		gtk_clist_get_text (GTK_CLIST (clist), i, 0, &pane);
 		
-		if (nautilus_str_is_equal (pane, pane_name)) {
+		if (eel_str_is_equal (pane, pane_name)) {
 			return i;
 		}
 	}
@@ -221,7 +221,7 @@ preferences_box_category_list_recreate (NautilusPreferencesBox *preferences_box)
 			text_array[CATEGORY_COLUMN] = info->pane_name;
 			gtk_clist_append (GTK_CLIST (preferences_box->details->category_list), text_array);
 
-			if (nautilus_str_is_equal (info->pane_name, preferences_box->details->selected_pane)) {
+			if (eel_str_is_equal (info->pane_name, preferences_box->details->selected_pane)) {
 				row = preferences_box_find_row (GTK_CLIST (preferences_box->details->category_list),
 								info->pane_name);
 				
@@ -402,7 +402,7 @@ nautilus_preferences_box_find_pane (const NautilusPreferencesBox *preferences_bo
 	for (node = preferences_box->details->panes; node != NULL; node = node->next) {
 		g_assert (node->data != NULL);
 		info = node->data;
-		if (nautilus_str_is_equal (info->pane_name, pane_name)) {
+		if (eel_str_is_equal (info->pane_name, pane_name)) {
 			return info->pane_widget;
 		}
 	}
diff --git a/libnautilus-extensions/nautilus-preferences-dialog.c b/libnautilus-extensions/nautilus-preferences-dialog.c
index 14c770909..b7ff3d336 100644
--- a/libnautilus-extensions/nautilus-preferences-dialog.c
+++ b/libnautilus-extensions/nautilus-preferences-dialog.c
@@ -25,8 +25,8 @@
 #include <config.h>
 #include "nautilus-preferences-dialog.h"
 
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
@@ -84,7 +84,7 @@ static void nautilus_preferences_dialog_construct        (NautilusPreferencesDia
 static void user_level_changed_callback (gpointer callback_data);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesDialog, 
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesDialog, 
 				   nautilus_preferences_dialog, 
 				   gnome_dialog_get_type ())
 
@@ -180,7 +180,7 @@ nautilus_preferences_dialog_construct (NautilusPreferencesDialog *prefs_dialog,
 	gnome_dialog_set_default (GNOME_DIALOG(prefs_dialog), 
 				  DEFAULT_BUTTON);
 
-	nautilus_gtk_window_set_up_close_accelerator (GTK_WINDOW (prefs_dialog));
+	eel_gtk_window_set_up_close_accelerator (GTK_WINDOW (prefs_dialog));
 
 	gtk_signal_connect (GTK_OBJECT (prefs_dialog),
 			    "clicked",
@@ -240,7 +240,7 @@ nautilus_preferences_dialog_destroy(GtkObject* object)
 	g_free (prefs_dialog->details);
 
 	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 GtkWidget*
diff --git a/libnautilus-extensions/nautilus-preferences-group.c b/libnautilus-extensions/nautilus-preferences-group.c
index 46ebf9474..1a1853419 100644
--- a/libnautilus-extensions/nautilus-preferences-group.c
+++ b/libnautilus-extensions/nautilus-preferences-group.c
@@ -24,12 +24,12 @@
 
 #include <config.h>
 #include "nautilus-preferences-group.h"
-#include "nautilus-gtk-extensions.h"
+#include <eel/eel-gtk-extensions.h>
 
 #include <gnome.h>
 #include <gtk/gtkradiobutton.h>
 #include <gtk/gtksignal.h>
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 /* Signals */
 typedef enum
@@ -69,7 +69,7 @@ static void preferences_group_construct                 (NautilusPreferencesGrou
 							 const gchar                   *title);
 static void preferences_group_align_captions            (NautilusPreferencesGroup      *group);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesGroup,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesGroup,
 				   nautilus_preferences_group,
 				   GTK_TYPE_FRAME);
 
diff --git a/libnautilus-extensions/nautilus-preferences-item.c b/libnautilus-extensions/nautilus-preferences-item.c
index acfa2784a..725da2853 100644
--- a/libnautilus-extensions/nautilus-preferences-item.c
+++ b/libnautilus-extensions/nautilus-preferences-item.c
@@ -25,18 +25,18 @@
 #include <config.h>
 #include "nautilus-preferences-item.h"
 
-#include "nautilus-enumeration.h"
+#include <eel/eel-enumeration.h>
 #include "nautilus-file-utilities.h"
-#include "nautilus-font-picker.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-font-picker.h>
+#include <eel/eel-glib-extensions.h>
 #include "nautilus-global-preferences.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include "nautilus-preferences.h"
-#include "nautilus-radio-button-group.h"
-#include "nautilus-string-picker.h"
-#include "nautilus-string.h"
-#include "nautilus-text-caption.h"
+#include <eel/eel-radio-button-group.h>
+#include <eel/eel-string-picker.h>
+#include <eel/eel-string.h>
+#include <eel/eel-text-caption.h>
 
 #include <libgnomevfs/gnome-vfs.h>
 
@@ -64,7 +64,7 @@ struct _NautilusPreferencesItemDetails
 	guint change_signal_ID;
 	char *control_preference_name;
 	NautilusPreferencesItemControlAction control_action;
-	NautilusEnumeration *constrained_integer_values;
+	EelEnumeration *constrained_integer_values;
 };
 
 /* GtkObjectClass methods */
@@ -104,12 +104,12 @@ static void editable_string_changed_callback                          (GtkWidget
 								       gpointer                      user_data);
 static void editable_integer_changed_callback                         (GtkWidget                    *caption,
 								       gpointer                      user_data);
-static void constrained_integer_changed_callback                      (NautilusStringPicker         *string_picker,
+static void constrained_integer_changed_callback                      (EelStringPicker         *string_picker,
 								       NautilusPreferencesItem      *item);
 static void font_item_changed_callback                                (GtkWidget                    *caption,
 								       gpointer                      user_data);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesItem, nautilus_preferences_item, GTK_TYPE_VBOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesItem, nautilus_preferences_item, GTK_TYPE_VBOX)
 
 /* NautilusPreferencesItemClass methods */
 static void
@@ -146,11 +146,11 @@ preferences_item_destroy (GtkObject *object)
 
 	g_free (item->details->preference_name);
 	g_free (item->details->control_preference_name);
-	nautilus_enumeration_free (item->details->constrained_integer_values);
+	eel_enumeration_free (item->details->constrained_integer_values);
 	g_free (item->details);
 	
 	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /*
@@ -163,7 +163,7 @@ preferences_item_construct (NautilusPreferencesItem *item,
 {
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
 
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 	g_assert (item_type != PREFERENCES_ITEM_UNDEFINED_ITEM);
 
 	g_assert (item->details->child == NULL);
@@ -238,7 +238,7 @@ preferences_item_update_enum (NautilusPreferencesItem *item)
 
 	for (i = 0; i < nautilus_preferences_enumeration_get_num_entries (preference_name); i++) {
 		if (value == nautilus_preferences_enumeration_get_nth_value (preference_name, i)) {
-			nautilus_radio_button_group_set_active_index (NAUTILUS_RADIO_BUTTON_GROUP (item->details->child), i);
+			eel_radio_button_group_set_active_index (EEL_RADIO_BUTTON_GROUP (item->details->child), i);
 		}
 	}
 }
@@ -261,11 +261,11 @@ preferences_item_create_enum (NautilusPreferencesItem *item,
 	guint	i;
 
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	g_assert (item->details->preference_name != NULL);
 
-	item->details->child = nautilus_radio_button_group_new (FALSE);
+	item->details->child = eel_radio_button_group_new (FALSE);
 		
 	for (i = 0; i < nautilus_preferences_enumeration_get_num_entries (preference_name); i++) {
 		char *description;
@@ -274,7 +274,7 @@ preferences_item_create_enum (NautilusPreferencesItem *item,
 		
 		g_assert (description != NULL);
 		
-		nautilus_radio_button_group_insert (NAUTILUS_RADIO_BUTTON_GROUP (item->details->child),
+		eel_radio_button_group_insert (EEL_RADIO_BUTTON_GROUP (item->details->child),
 						    description);
 		
 		g_free (description);
@@ -307,7 +307,7 @@ preferences_item_update_short_enum (NautilusPreferencesItem *item)
 
 	for (i = 0; i < nautilus_preferences_enumeration_get_num_entries (preference_name); i++) {
 		if (value == nautilus_preferences_enumeration_get_nth_value (preference_name, i)) {
-			nautilus_radio_button_group_set_active_index (NAUTILUS_RADIO_BUTTON_GROUP (item->details->child), i);
+			eel_radio_button_group_set_active_index (EEL_RADIO_BUTTON_GROUP (item->details->child), i);
 		}
 	}
 }
@@ -323,11 +323,11 @@ preferences_item_create_short_enum (NautilusPreferencesItem *item,
 	guint	i;
 
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	g_assert (item->details->preference_name != NULL);
 
-	item->details->child = nautilus_radio_button_group_new (TRUE);
+	item->details->child = eel_radio_button_group_new (TRUE);
 		
 	for (i = 0; i < nautilus_preferences_enumeration_get_num_entries (preference_name); i++) {
 		char *description;
@@ -336,7 +336,7 @@ preferences_item_create_short_enum (NautilusPreferencesItem *item,
 
 		g_assert (description != NULL);
 
-		nautilus_radio_button_group_insert (NAUTILUS_RADIO_BUTTON_GROUP (item->details->child),
+		eel_radio_button_group_insert (EEL_RADIO_BUTTON_GROUP (item->details->child),
 						    description);
 
 		g_free (description);
@@ -373,7 +373,7 @@ preferences_item_create_boolean (NautilusPreferencesItem *item,
 	char *description;
 
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	g_assert (item->details->preference_name != NULL);
 	description = nautilus_preferences_get_description (preference_name);
@@ -408,7 +408,7 @@ preferences_item_update_editable_string (NautilusPreferencesItem *item)
 	current_value = nautilus_preferences_get (item->details->preference_name);
 
 	g_assert (current_value != NULL);
-	nautilus_text_caption_set_text (NAUTILUS_TEXT_CAPTION (item->details->child), current_value);
+	eel_text_caption_set_text (EEL_TEXT_CAPTION (item->details->child), current_value);
 	g_free (current_value);
 }
 
@@ -419,21 +419,21 @@ preferences_item_create_editable_string (NautilusPreferencesItem *item,
 	char	*description;
 	
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	description = nautilus_preferences_get_description (preference_name);
 	g_assert (description != NULL);
 	
-	item->details->child = nautilus_text_caption_new ();
+	item->details->child = eel_text_caption_new ();
 
 	/* FIXME This is a special case for the home uri preference,
 	   in the future this should be generalized. */
 	if (g_strcasecmp (preference_name, NAUTILUS_PREFERENCES_HOME_URI) == 0)
 	{
-		nautilus_text_caption_set_expand_tilde (NAUTILUS_TEXT_CAPTION (item->details->child), TRUE);
+		eel_text_caption_set_expand_tilde (EEL_TEXT_CAPTION (item->details->child), TRUE);
 	}
 
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (item->details->child), description);
+	eel_caption_set_title_label (EEL_CAPTION (item->details->child), description);
 
 	g_free (description);
 	
@@ -460,7 +460,7 @@ preferences_item_update_editable_integer (NautilusPreferencesItem *item)
 	current_value = g_strdup_printf ("%d", nautilus_preferences_get_integer (item->details->preference_name));
 
 	g_assert (current_value != NULL);
-	nautilus_text_caption_set_text (NAUTILUS_TEXT_CAPTION (item->details->child), current_value);
+	eel_text_caption_set_text (EEL_TEXT_CAPTION (item->details->child), current_value);
 	g_free (current_value);
 }
 
@@ -471,15 +471,15 @@ preferences_item_create_editable_integer (NautilusPreferencesItem *item,
 	char *description;
 	
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	description = nautilus_preferences_get_description (preference_name);
 	
 	g_assert (description != NULL);
 	
-	item->details->child = nautilus_text_caption_new ();
+	item->details->child = eel_text_caption_new ();
 
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (item->details->child), description);
+	eel_caption_set_title_label (EEL_CAPTION (item->details->child), description);
 
 	g_free (description);
 
@@ -512,15 +512,15 @@ preferences_item_update_constrained_integer (NautilusPreferencesItem *item)
 
 	current_value = nautilus_preferences_get_integer (item->details->preference_name);
 	
-	position = nautilus_enumeration_get_value_position (item->details->constrained_integer_values,
+	position = eel_enumeration_get_value_position (item->details->constrained_integer_values,
 							    current_value);
-	g_return_if_fail (position != NAUTILUS_STRING_LIST_NOT_FOUND);
+	g_return_if_fail (position != EEL_STRING_LIST_NOT_FOUND);
 
-	current_label = nautilus_enumeration_get_nth_entry (item->details->constrained_integer_values,
+	current_label = eel_enumeration_get_nth_entry (item->details->constrained_integer_values,
 							    position);
 
-	if (nautilus_string_picker_contains (NAUTILUS_STRING_PICKER (item->details->child), current_label)) {
-		nautilus_string_picker_set_selected_string (NAUTILUS_STRING_PICKER (item->details->child),
+	if (eel_string_picker_contains (EEL_STRING_PICKER (item->details->child), current_label)) {
+		eel_string_picker_set_selected_string (EEL_STRING_PICKER (item->details->child),
 							    current_label);
 	} else {
 		g_warning ("Value string for %s is %s, which isn't in the expected set of values",
@@ -538,13 +538,13 @@ preferences_item_create_constrained_integer (NautilusPreferencesItem *item,
 	char *description;
 	
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	description = nautilus_preferences_get_description (preference_name);
 	g_return_if_fail (description != NULL);
 	
-	item->details->child = nautilus_string_picker_new ();
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (item->details->child), description);
+	item->details->child = eel_string_picker_new ();
+	eel_caption_set_title_label (EEL_CAPTION (item->details->child), description);
 	g_free (description);
 
 	item->details->change_signal_ID = gtk_signal_connect (GTK_OBJECT (item->details->child),
@@ -574,8 +574,8 @@ preferences_item_update_font (NautilusPreferencesItem *item)
 	 * it is one of the choice before trying to select it, otherwise we would get
 	 * assertions.
 	 */
-	if (nautilus_string_picker_contains (NAUTILUS_STRING_PICKER (item->details->child), current_value)) {
-		nautilus_string_picker_set_selected_string (NAUTILUS_STRING_PICKER (item->details->child),
+	if (eel_string_picker_contains (EEL_STRING_PICKER (item->details->child), current_value)) {
+		eel_string_picker_set_selected_string (EEL_STRING_PICKER (item->details->child),
 							    current_value);
 	}
 
@@ -587,21 +587,21 @@ preferences_item_create_font (NautilusPreferencesItem *item,
 			      const char *preference_name)
 {
 	char *description;
-	NautilusStringList *font_list;
+	EelStringList *font_list;
 
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	description = nautilus_preferences_get_description (preference_name);
 	g_return_if_fail (description != NULL);
 	
-	item->details->child = nautilus_string_picker_new ();
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (item->details->child), description);
+	item->details->child = eel_string_picker_new ();
+	eel_caption_set_title_label (EEL_CAPTION (item->details->child), description);
 	
 	g_free (description);
 
 	/* FIXME bugzilla.eazel.com 1274: Need to query system for available fonts */
-	font_list = nautilus_string_list_new (TRUE);
+	font_list = eel_string_list_new (TRUE);
 
 	/* Once upon a time we had a bug in Nautilus that caused crashes with the "fixed" 
 	 * font.  That bug (2256) was fixed by removing the "fixed" choice from this menu
@@ -617,15 +617,15 @@ preferences_item_create_font (NautilusPreferencesItem *item,
 	/* FIXME bugzilla.eazel.com 7907: 
 	 * The "GTK System Font" string is hard coded in many places.
 	 */
-	nautilus_string_list_insert (font_list, "GTK System Font");
-	nautilus_string_list_insert (font_list, "fixed");
-	nautilus_string_list_insert (font_list, "helvetica");
-	nautilus_string_list_insert (font_list, "times");
-	nautilus_string_list_insert (font_list, "courier");
-	nautilus_string_list_insert (font_list, "lucida");
+	eel_string_list_insert (font_list, "GTK System Font");
+	eel_string_list_insert (font_list, "fixed");
+	eel_string_list_insert (font_list, "helvetica");
+	eel_string_list_insert (font_list, "times");
+	eel_string_list_insert (font_list, "courier");
+	eel_string_list_insert (font_list, "lucida");
 
-	nautilus_string_picker_set_string_list (NAUTILUS_STRING_PICKER (item->details->child), font_list);
-	nautilus_string_list_free (font_list);
+	eel_string_picker_set_string_list (EEL_STRING_PICKER (item->details->child), font_list);
+	eel_string_list_free (font_list);
 
 	item->details->change_signal_ID = gtk_signal_connect (GTK_OBJECT (item->details->child),
 							      "changed",
@@ -649,23 +649,23 @@ preferences_item_update_smooth_font (NautilusPreferencesItem *item)
  	current_value = nautilus_preferences_get (item->details->preference_name);
  	g_assert (current_value != NULL);
 
- 	nautilus_font_picker_set_selected_font (NAUTILUS_FONT_PICKER (item->details->child),
+ 	eel_font_picker_set_selected_font (EEL_FONT_PICKER (item->details->child),
 						current_value);
  	g_free (current_value);
 }
 
 static void
-preferences_smooth_font_changed_callback (NautilusFontPicker *font_picker,
+preferences_smooth_font_changed_callback (EelFontPicker *font_picker,
 					  gpointer callback_data)
 {
 	NautilusPreferencesItem *item;
  	char *new_value;
 
-	g_return_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker));
+	g_return_if_fail (EEL_IS_FONT_PICKER (font_picker));
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (callback_data));
 
 	item = NAUTILUS_PREFERENCES_ITEM (callback_data);
- 	new_value = nautilus_font_picker_get_selected_font (NAUTILUS_FONT_PICKER (item->details->child));
+ 	new_value = eel_font_picker_get_selected_font (EEL_FONT_PICKER (item->details->child));
  	g_assert (new_value != NULL);
 	nautilus_preferences_set (item->details->preference_name, new_value);
  	g_free (new_value);
@@ -678,13 +678,13 @@ preferences_item_create_smooth_font (NautilusPreferencesItem *item,
 	char *description = NULL;
 
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	description = nautilus_preferences_get_description (preference_name);
 	g_return_if_fail (description != NULL);
 	
-	item->details->child = nautilus_font_picker_new ();
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (item->details->child),
+	item->details->child = eel_font_picker_new ();
+	eel_caption_set_title_label (EEL_CAPTION (item->details->child),
 					  description);
 	
 	g_free (description);
@@ -732,7 +732,7 @@ enum_radio_group_changed_callback (GtkWidget *buttons, GtkWidget * button, gpoin
 
 	g_assert (item->details->preference_name != NULL);
 
-	i = nautilus_radio_button_group_get_active_index (NAUTILUS_RADIO_BUTTON_GROUP (buttons));
+	i = eel_radio_button_group_get_active_index (EEL_RADIO_BUTTON_GROUP (buttons));
 	
 	nautilus_preferences_set_integer (item->details->preference_name,
 					  nautilus_preferences_enumeration_get_nth_value (item->details->preference_name, i));
@@ -760,14 +760,14 @@ font_item_changed_callback (GtkWidget *string_picker, gpointer user_data)
 	NautilusPreferencesItem *item;
 	char *selected_string;
 
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
+	g_return_if_fail (EEL_IS_STRING_PICKER (string_picker));
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (user_data));
 
 	item = NAUTILUS_PREFERENCES_ITEM (user_data);
 
 	g_return_if_fail (item->details->preference_name != NULL);
 
-	selected_string = nautilus_string_picker_get_selected_string (NAUTILUS_STRING_PICKER (string_picker));
+	selected_string = eel_string_picker_get_selected_string (EEL_STRING_PICKER (string_picker));
 	g_return_if_fail (selected_string != NULL);
 
 	nautilus_preferences_set (item->details->preference_name, selected_string);
@@ -786,7 +786,7 @@ editable_string_changed_callback (GtkWidget *button, gpointer user_data)
 	item = NAUTILUS_PREFERENCES_ITEM (user_data);
 
 	g_assert (item->details->child != NULL);
-	g_assert (NAUTILUS_IS_TEXT_CAPTION (item->details->child));
+	g_assert (EEL_IS_TEXT_CAPTION (item->details->child));
 
 	preferences_item_update_text_settings_at_idle (item);
 }
@@ -802,33 +802,33 @@ editable_integer_changed_callback (GtkWidget *button, gpointer user_data)
 	item = NAUTILUS_PREFERENCES_ITEM (user_data);
 
 	g_assert (item->details->child != NULL);
-	g_assert (NAUTILUS_IS_TEXT_CAPTION (item->details->child));
+	g_assert (EEL_IS_TEXT_CAPTION (item->details->child));
 
 	preferences_item_update_editable_integer_settings_at_idle (item);
 }
 
 static void
-constrained_integer_changed_callback (NautilusStringPicker *string_picker,
+constrained_integer_changed_callback (EelStringPicker *string_picker,
 				      NautilusPreferencesItem *item)
 {
  	char *selected_label;
 	int position;
 	int new_value;
 
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
+	g_return_if_fail (EEL_IS_STRING_PICKER (string_picker));
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
 	g_return_if_fail (item->details->constrained_integer_values != NULL);
-	g_return_if_fail (nautilus_enumeration_get_num_entries (item->details->constrained_integer_values) > 0);
+	g_return_if_fail (eel_enumeration_get_num_entries (item->details->constrained_integer_values) > 0);
 	
- 	selected_label = nautilus_string_picker_get_selected_string (string_picker);
+ 	selected_label = eel_string_picker_get_selected_string (string_picker);
 	g_return_if_fail (selected_label != NULL);
 
-	position = nautilus_enumeration_get_entry_position (item->details->constrained_integer_values,
+	position = eel_enumeration_get_entry_position (item->details->constrained_integer_values,
 							    selected_label);
 	g_free (selected_label);
-	g_return_if_fail (position != NAUTILUS_STRING_LIST_NOT_FOUND);
+	g_return_if_fail (position != EEL_STRING_LIST_NOT_FOUND);
 
-	new_value = nautilus_enumeration_get_nth_value (item->details->constrained_integer_values,
+	new_value = eel_enumeration_get_nth_value (item->details->constrained_integer_values,
 							position);
 	
 	nautilus_preferences_set_integer (item->details->preference_name, new_value);
@@ -906,7 +906,7 @@ update_text_settings_at_idle (NautilusPreferencesItem *preferences_item)
 {
 	char *text;
 
-	text = nautilus_text_caption_get_text (NAUTILUS_TEXT_CAPTION (preferences_item->details->child));
+	text = eel_text_caption_get_text (EEL_TEXT_CAPTION (preferences_item->details->child));
 
 	if (text != NULL) {
 		nautilus_preferences_set (preferences_item->details->preference_name, text);
@@ -935,10 +935,10 @@ update_integer_settings_at_idle (NautilusPreferencesItem *preferences_item)
 	int value = 0;
 	char *text;
 
-	text = nautilus_text_caption_get_text (NAUTILUS_TEXT_CAPTION (preferences_item->details->child));
+	text = eel_text_caption_get_text (EEL_TEXT_CAPTION (preferences_item->details->child));
 
 	if (text != NULL) {
-		nautilus_eat_str_to_int (text, &value);
+		eel_eat_str_to_int (text, &value);
 	}
 	
 	nautilus_preferences_set_integer (preferences_item->details->preference_name, value);
@@ -965,7 +965,7 @@ nautilus_preferences_item_set_control_preference (NautilusPreferencesItem *prefe
 {
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (preferences_item));
 
-	if (nautilus_str_is_equal (preferences_item->details->control_preference_name,
+	if (eel_str_is_equal (preferences_item->details->control_preference_name,
 				   control_preference_name)) {
 		return;
 	}
@@ -1025,32 +1025,32 @@ nautilus_preferences_item_set_constrained_integer_values (NautilusPreferencesIte
 							  const char *values,
 							  const char *labels)
 {
-	NautilusStringList *entry_list;
+	EelStringList *entry_list;
 
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
 	g_return_if_fail (item->details->item_type == NAUTILUS_PREFERENCE_ITEM_CONSTRAINED_INTEGER);
-	g_return_if_fail (nautilus_strlen (labels) > 0);
-	g_return_if_fail (nautilus_strlen (values) > 0);
-	g_return_if_fail (nautilus_str_count_characters (labels, ',')
-			  == nautilus_str_count_characters (values, ','));
+	g_return_if_fail (eel_strlen (labels) > 0);
+	g_return_if_fail (eel_strlen (values) > 0);
+	g_return_if_fail (eel_str_count_characters (labels, ',')
+			  == eel_str_count_characters (values, ','));
 
-	nautilus_enumeration_free (item->details->constrained_integer_values);
+	eel_enumeration_free (item->details->constrained_integer_values);
 	
-	item->details->constrained_integer_values = nautilus_enumeration_new_from_tokens (labels,
+	item->details->constrained_integer_values = eel_enumeration_new_from_tokens (labels,
 											  NULL,
 											  values,
 											  ",");
 
- 	g_return_if_fail (nautilus_enumeration_get_num_entries (item->details->constrained_integer_values) > 0);
+ 	g_return_if_fail (eel_enumeration_get_num_entries (item->details->constrained_integer_values) > 0);
 
-	entry_list = nautilus_enumeration_get_entries (item->details->constrained_integer_values);
+	entry_list = eel_enumeration_get_entries (item->details->constrained_integer_values);
 
  	g_return_if_fail (entry_list != NULL);
 
-	nautilus_string_picker_set_string_list (NAUTILUS_STRING_PICKER (item->details->child),
+	eel_string_picker_set_string_list (EEL_STRING_PICKER (item->details->child),
 						entry_list);
 
-	nautilus_string_list_free (entry_list);
+	eel_string_list_free (entry_list);
 
 	preferences_item_update_displayed_value (item);
 }
@@ -1060,7 +1060,7 @@ nautilus_preferences_item_child_is_caption (const NautilusPreferencesItem *item)
 {
 	g_return_val_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item), FALSE);
 
-	return NAUTILUS_IS_CAPTION (item->details->child);
+	return EEL_IS_CAPTION (item->details->child);
 }
 
 int
@@ -1072,7 +1072,7 @@ nautilus_preferences_item_get_caption_title_label_width (const NautilusPreferenc
 		return 0;
 	}
 
-	return nautilus_caption_get_title_label_width (NAUTILUS_CAPTION (item->details->child));
+	return eel_caption_get_title_label_width (EEL_CAPTION (item->details->child));
 }
 
 void
@@ -1086,7 +1086,7 @@ nautilus_preferences_item_set_caption_extra_spacing (NautilusPreferencesItem *it
 		return;
 	}
 
-	nautilus_caption_set_extra_spacing (NAUTILUS_CAPTION (item->details->child), 
+	eel_caption_set_extra_spacing (EEL_CAPTION (item->details->child), 
 					    extra_spacing);
 }
 
@@ -1101,5 +1101,5 @@ nautilus_preferences_item_update_showing (NautilusPreferencesItem *item)
 		shown = nautilus_preferences_item_get_control_showing (item);
 	}
 
-	nautilus_gtk_widget_set_shown (GTK_WIDGET (item), shown);
+	eel_gtk_widget_set_shown (GTK_WIDGET (item), shown);
 }
diff --git a/libnautilus-extensions/nautilus-preferences-pane.c b/libnautilus-extensions/nautilus-preferences-pane.c
index 676c75369..1b28a8b00 100644
--- a/libnautilus-extensions/nautilus-preferences-pane.c
+++ b/libnautilus-extensions/nautilus-preferences-pane.c
@@ -25,10 +25,10 @@
 
 #include <config.h>
 #include "nautilus-preferences-pane.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-string.h"
-#include "nautilus-string-list.h"
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-string.h>
+#include <eel/eel-string-list.h>
 
 #include <gtk/gtkhbox.h>
 
@@ -39,7 +39,7 @@ struct _NautilusPreferencesPaneDetails
 {
 	GtkWidget *groups_box;
 	GList *groups;
-	NautilusStringList *control_preference_list;
+	EelStringList *control_preference_list;
 };
 
 /* NautilusPreferencesPaneClass methods */
@@ -49,7 +49,7 @@ static void nautilus_preferences_pane_initialize       (NautilusPreferencesPane
 /* GtkObjectClass methods */
 static void nautilus_preferences_pane_destroy          (GtkObject                    *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesPane, nautilus_preferences_pane, GTK_TYPE_VBOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesPane, nautilus_preferences_pane, GTK_TYPE_VBOX)
 
 /*
  * NautilusPreferencesPaneClass methods
@@ -84,11 +84,11 @@ nautilus_preferences_pane_destroy (GtkObject* object)
 	preferences_pane = NAUTILUS_PREFERENCES_PANE (object);
 
 	g_list_free (preferences_pane->details->groups);
-	nautilus_string_list_free (preferences_pane->details->control_preference_list);
+	eel_string_list_free (preferences_pane->details->control_preference_list);
 	g_free (preferences_pane->details);
 
 	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /*
@@ -187,7 +187,7 @@ nautilus_preferences_pane_update (NautilusPreferencesPane *preferences_pane)
 	for (iterator = preferences_pane->details->groups; iterator != NULL; iterator = iterator->next) {
 		NautilusPreferencesGroup *group = NAUTILUS_PREFERENCES_GROUP (iterator->data);
 		nautilus_preferences_group_update (group);
-		nautilus_gtk_widget_set_shown (GTK_WIDGET (group),
+		eel_gtk_widget_set_shown (GTK_WIDGET (group),
 					       nautilus_preferences_group_get_num_visible_items (group) > 0);
 	}
 }
@@ -232,7 +232,7 @@ nautilus_preferences_pane_find_group (const NautilusPreferencesPane *pane,
 		g_assert (NAUTILUS_IS_PREFERENCES_GROUP (node->data));
 
 		title = nautilus_preferences_group_get_title_label (NAUTILUS_PREFERENCES_GROUP (node->data));
-		if (nautilus_str_is_equal (title, group_title)) {
+		if (eel_str_is_equal (title, group_title)) {
 			g_free (title);
 			return node->data;
 		}
@@ -260,16 +260,16 @@ nautilus_preferences_pane_add_control_preference (NautilusPreferencesPane *pane,
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_PANE (pane));
 	g_return_if_fail (control_preference_name != NULL);
 
-	if (nautilus_string_list_contains (pane->details->control_preference_list,
+	if (eel_string_list_contains (pane->details->control_preference_list,
 					   control_preference_name)) {
 		return;
 	}
 
 	if (pane->details->control_preference_list == NULL) {
-		pane->details->control_preference_list = nautilus_string_list_new (TRUE);
+		pane->details->control_preference_list = eel_string_list_new (TRUE);
 	}
 
-	nautilus_string_list_insert (pane->details->control_preference_list,
+	eel_string_list_insert (pane->details->control_preference_list,
 				     control_preference_name);
 
  	nautilus_preferences_add_callback_while_alive (control_preference_name,
diff --git a/libnautilus-extensions/nautilus-preferences.c b/libnautilus-extensions/nautilus-preferences.c
index 5957ed4c3..adc2a65d5 100644
--- a/libnautilus-extensions/nautilus-preferences.c
+++ b/libnautilus-extensions/nautilus-preferences.c
@@ -26,19 +26,20 @@
 #include "nautilus-preferences.h"
 
 #include "nautilus-gconf-extensions.h"
-#include "nautilus-string-list.h"
-#include "nautilus-string.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-enumeration.h"
 #include "nautilus-lib-self-check-functions.h"
 
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
+#include <eel/eel-enumeration.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-string-list.h>
+#include <eel/eel-string.h>
 
+#include <gconf/gconf-client.h>
+#include <gconf/gconf.h>
 #include <gtk/gtksignal.h>
 
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
+
 #include <libgnomeui/gnome-dialog.h>
 #include <libgnomeui/gnome-dialog-util.h>
 
@@ -69,7 +70,7 @@ typedef struct {
 	GList *callback_list;
 	GList *auto_storage_list;
 	int gconf_connection_id;
-	NautilusEnumeration *enumeration;
+	EelEnumeration *enumeration;
 	GConfValue *cached_value;
 } PreferencesEntry;
 
@@ -186,7 +187,7 @@ preferences_preference_is_internal (const char *name)
 {
 	g_return_val_if_fail (name != NULL, FALSE);
 	
-	if (nautilus_str_has_prefix (name, "/")) {
+	if (eel_str_has_prefix (name, "/")) {
 		return FALSE;
 	}
 	
@@ -203,8 +204,8 @@ preferences_preference_is_user_level (const char *name)
 
 	user_level_key = preferences_get_user_level_key ();
 
-	result = nautilus_str_is_equal (name, user_level_key)
-		|| nautilus_str_is_equal (name, "user_level");
+	result = eel_str_is_equal (name, user_level_key)
+		|| eel_str_is_equal (name, "user_level");
 
 	g_free (user_level_key);
 
@@ -591,11 +592,11 @@ nautilus_preferences_get_user_level (void)
 	user_level = nautilus_gconf_get_string (key);
 	g_free (key);
 
-	if (nautilus_str_is_equal (user_level, "advanced")) {
+	if (eel_str_is_equal (user_level, "advanced")) {
 		result = NAUTILUS_USER_LEVEL_ADVANCED;
-	} else if (nautilus_str_is_equal (user_level, "intermediate")) {
+	} else if (eel_str_is_equal (user_level, "intermediate")) {
 		result = NAUTILUS_USER_LEVEL_INTERMEDIATE;
-	} else if (nautilus_str_is_equal (user_level, "novice")) {
+	} else if (eel_str_is_equal (user_level, "novice")) {
 		result = NAUTILUS_USER_LEVEL_NOVICE;
 	} else {
 		result = DEFAULT_USER_LEVEL;
@@ -923,7 +924,7 @@ preferences_user_level_changed_notice (GConfClient *client,
 {
 	g_return_if_fail (gconf_entry != NULL);
 	g_return_if_fail (gconf_entry->key != NULL);
-	g_return_if_fail (nautilus_str_has_suffix (gconf_entry->key, "user_level"));
+	g_return_if_fail (eel_str_has_suffix (gconf_entry->key, "user_level"));
 	
 	g_hash_table_foreach (preferences_global_table_get_global (),
 			      preferences_global_table_check_changes_function,
@@ -1203,7 +1204,7 @@ preferences_entry_free (PreferencesEntry *entry)
 	}
 
 	g_list_free (entry->auto_storage_list);
-	nautilus_g_list_free_deep_custom (entry->callback_list,
+	eel_g_list_free_deep_custom (entry->callback_list,
 					  preferences_callback_entry_free_func,
 					  NULL);
 	
@@ -1214,7 +1215,7 @@ preferences_entry_free (PreferencesEntry *entry)
 	g_free (entry->description);
 
 	nautilus_gconf_value_free (entry->cached_value);
-	nautilus_enumeration_free (entry->enumeration);
+	eel_enumeration_free (entry->enumeration);
 
 	g_free (entry);
 }
@@ -1533,10 +1534,10 @@ nautilus_preferences_enumeration_insert (const char *name,
 	g_assert (preferences_entry != NULL);
 
 	if (preferences_entry->enumeration == NULL) {
-		preferences_entry->enumeration = nautilus_enumeration_new ();
+		preferences_entry->enumeration = eel_enumeration_new ();
 	}
 
-	nautilus_enumeration_insert (preferences_entry->enumeration, entry, description, value);
+	eel_enumeration_insert (preferences_entry->enumeration, entry, description, value);
 }
 
 char *
@@ -1550,7 +1551,7 @@ nautilus_preferences_enumeration_get_nth_entry (const char *name,
 	preferences_entry = preferences_global_table_lookup_or_insert (name);
 	g_assert (preferences_entry != NULL);
 
-	return nautilus_enumeration_get_nth_entry (preferences_entry->enumeration, n);
+	return eel_enumeration_get_nth_entry (preferences_entry->enumeration, n);
 }
 
 char *
@@ -1564,7 +1565,7 @@ nautilus_preferences_enumeration_get_nth_description (const char *name,
 	preferences_entry = preferences_global_table_lookup_or_insert (name);
 	g_assert (preferences_entry != NULL);
 
-	return nautilus_enumeration_get_nth_description (preferences_entry->enumeration, n);
+	return eel_enumeration_get_nth_description (preferences_entry->enumeration, n);
 }
 
 int
@@ -1578,7 +1579,7 @@ nautilus_preferences_enumeration_get_nth_value (const char *name,
 	preferences_entry = preferences_global_table_lookup_or_insert (name);
 	g_assert (preferences_entry != NULL);
 
-	return nautilus_enumeration_get_nth_value (preferences_entry->enumeration, n);
+	return eel_enumeration_get_nth_value (preferences_entry->enumeration, n);
 }
 
 guint
@@ -1591,7 +1592,7 @@ nautilus_preferences_enumeration_get_num_entries (const char *name)
 	preferences_entry = preferences_global_table_lookup_or_insert (name);
 	g_assert (preferences_entry != NULL);
 
-	return nautilus_enumeration_get_num_entries (preferences_entry->enumeration);
+	return eel_enumeration_get_num_entries (preferences_entry->enumeration);
 }
 
 void
diff --git a/libnautilus-extensions/nautilus-preferences.h b/libnautilus-extensions/nautilus-preferences.h
index 7f6554d8c..e7cfe0094 100644
--- a/libnautilus-extensions/nautilus-preferences.h
+++ b/libnautilus-extensions/nautilus-preferences.h
@@ -27,7 +27,7 @@
 
 #include <gtk/gtkobject.h>
 #include <libgnome/gnome-defs.h>
-#include <libnautilus-extensions/nautilus-string-list.h>
+#include <eel/eel-string-list.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/libnautilus-extensions/nautilus-program-chooser.c b/libnautilus-extensions/nautilus-program-chooser.c
index 35e69efe0..fd317e998 100644
--- a/libnautilus-extensions/nautilus-program-chooser.c
+++ b/libnautilus-extensions/nautilus-program-chooser.c
@@ -26,12 +26,12 @@
 #include <config.h>
 #include "nautilus-program-chooser.h"
 
-#include "nautilus-gnome-extensions.h"
-#include "nautilus-gtk-extensions.h"
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 #include "nautilus-mime-actions.h"
 #include "nautilus-program-choosing.h"
-#include "nautilus-stock-dialogs.h"
-#include "nautilus-string.h"
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include "nautilus-view-identifier.h"
 #include <gtk/gtkclist.h>
 #include <gtk/gtkframe.h>
@@ -260,7 +260,7 @@ get_file_name_for_display (NautilusFile *file)
 	g_assert (NAUTILUS_IS_FILE (file));
 
 	full_name = nautilus_file_get_name (file);
-	truncated_name = nautilus_str_middle_truncate
+	truncated_name = eel_str_middle_truncate
 		(full_name, MAX_DISPLAYED_FILE_NAME_LENGTH);
 	g_free (full_name);
 
@@ -418,9 +418,9 @@ nautilus_program_chooser_set_is_cancellable (GnomeDialog *chooser, gboolean canc
 {
 	GtkButton *done_button, *cancel_button;
 
-	cancel_button = nautilus_gnome_dialog_get_button_by_index 
+	cancel_button = eel_gnome_dialog_get_button_by_index 
 		(chooser, GNOME_CANCEL);
-	done_button = nautilus_gnome_dialog_get_button_by_index 
+	done_button = eel_gnome_dialog_get_button_by_index 
 		(chooser, GNOME_CANCEL+1);
 
 	if (cancellable) {
@@ -702,7 +702,7 @@ get_selected_program_file_pair (GnomeDialog *dialog)
 	int selected_row;
 
 	clist = nautilus_program_chooser_get_clist (dialog);
-	selected_row = nautilus_gtk_clist_get_first_selected_row (clist);
+	selected_row = eel_gtk_clist_get_first_selected_row (clist);
 	
 	if (selected_row < 0) {
 		return NULL;
@@ -926,7 +926,7 @@ launch_mime_capplet (GtkWidget *button, gpointer callback_data)
 	
 	command = g_strdup_printf ("%s %s", FILE_TYPES_CAPPLET_NAME, (char *)callback_data);
 		
-	nautilus_launch_application_from_command (command, NULL, FALSE);
+	eel_launch_application_from_command (command, NULL, FALSE);
 	
 	g_free (command);
 }
@@ -1308,9 +1308,9 @@ nautilus_program_chooser_new (GnomeVFSMimeActionType action_type,
 	clist = create_program_clist ();
 
 	gtk_container_add (GTK_CONTAINER (list_scroller), clist);	  
-	nautilus_gtk_clist_set_double_click_button 
+	eel_gtk_clist_set_double_click_button 
 		(GTK_CLIST (clist), 
-		 nautilus_gnome_dialog_get_button_by_index 
+		 eel_gnome_dialog_get_button_by_index 
 			(GNOME_DIALOG (window), GNOME_OK));
 	gtk_object_set_data (GTK_OBJECT (window), "list", clist);
 
@@ -1336,7 +1336,7 @@ nautilus_program_chooser_new (GnomeVFSMimeActionType action_type,
   	gtk_box_pack_end (GTK_BOX (framed_hbox), change_button_holder, FALSE, FALSE, 0);
 
   	change_button = gtk_button_new_with_label(_("Modify..."));
-	nautilus_gtk_button_set_standard_padding (GTK_BUTTON (change_button));
+	eel_gtk_button_set_standard_padding (GTK_BUTTON (change_button));
   	gtk_widget_show (change_button);
   	gtk_box_pack_end (GTK_BOX (change_button_holder), change_button, TRUE, FALSE, 0);
 
@@ -1359,7 +1359,7 @@ nautilus_program_chooser_new (GnomeVFSMimeActionType action_type,
 	gtk_widget_show (capplet_button_vbox);
 	gtk_box_pack_end (GTK_BOX (capplet_hbox), capplet_button_vbox, FALSE, FALSE, 0);
 	capplet_button = gtk_button_new_with_label (_("Go There"));	 
-	nautilus_gtk_button_set_standard_padding (GTK_BUTTON (capplet_button));
+	eel_gtk_button_set_standard_padding (GTK_BUTTON (capplet_button));
 	gtk_signal_connect (GTK_OBJECT (capplet_button),
 			    "clicked",
 			    launch_mime_capplet_and_close_dialog,
@@ -1500,7 +1500,7 @@ nautilus_program_chooser_show_no_choices_message (GnomeVFSMimeActionType action_
 				    "Programs\" part of the GNOME Control Center. Do "
 				    "you want to go there now?"),
 				  unavailable_message);
-	dialog = nautilus_show_yes_no_dialog 
+	dialog = eel_show_yes_no_dialog 
 		(prompt, dialog_title, GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, parent_window);
 
 	gnome_dialog_button_connect (dialog, GNOME_OK, launch_mime_capplet, nautilus_file_get_mime_type (file));
diff --git a/libnautilus-extensions/nautilus-program-choosing.c b/libnautilus-extensions/nautilus-program-choosing.c
index f0f2cd8b1..d47f7a5ab 100644
--- a/libnautilus-extensions/nautilus-program-choosing.c
+++ b/libnautilus-extensions/nautilus-program-choosing.c
@@ -26,12 +26,12 @@
 #include <config.h>
 #include "nautilus-program-choosing.h"
 
-#include "nautilus-glib-extensions.h"
-#include "nautilus-gnome-extensions.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gnome-extensions.h>
 #include "nautilus-mime-actions.h"
 #include "nautilus-program-chooser.h"
-#include "nautilus-stock-dialogs.h"
-#include "nautilus-string.h"
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <gtk/gtk.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-uidefs.h>
@@ -250,7 +250,7 @@ nautilus_choose_component_for_file (NautilusFile *file,
 
 	/* Put pending entry into choose hash table. */
 	if (choose_component_hash_table == NULL) {
-		choose_component_hash_table = nautilus_g_hash_table_new_free_at_exit
+		choose_component_hash_table = eel_g_hash_table_new_free_at_exit
 			(choose_component_hash,
 			 choose_component_equal,
 			 "choose component");
@@ -390,7 +390,7 @@ nautilus_choose_application_for_file (NautilusFile *file,
 
 	/* Put pending entry into choose hash table. */
 	if (choose_application_hash_table == NULL) {
-		choose_application_hash_table = nautilus_g_hash_table_new_free_at_exit
+		choose_application_hash_table = eel_g_hash_table_new_free_at_exit
 			(choose_application_hash,
 			 choose_application_equal,
 			 "choose application");
@@ -493,7 +493,7 @@ application_cannot_open_location (GnomeVFSMimeApplication *application,
 					     "locations.  Would you like to choose another application?"),
 					   application->name, file_name, 
 					   application->name, uri_scheme);
-		message_dialog = nautilus_show_yes_no_dialog (message, 
+		message_dialog = eel_show_yes_no_dialog (message, 
 							       _("Can't Open Location"), 
 							       GNOME_STOCK_BUTTON_OK, 
 							       GNOME_STOCK_BUTTON_CANCEL,
@@ -515,7 +515,7 @@ application_cannot_open_location (GnomeVFSMimeApplication *application,
 					     "If you copy this file onto your computer, you may be able to open "
 					     "it."), application->name, file_name, 
 					   application->name, uri_scheme);
-		nautilus_show_info_dialog (message, _("Can't Open Location"), parent_window);
+		eel_show_info_dialog (message, _("Can't Open Location"), parent_window);
 	}
 
 	g_free (file_name);
@@ -548,11 +548,11 @@ nautilus_launch_application (GnomeVFSMimeApplication *application,
 	 */
 	if (application->expects_uris == GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_URIS ||
 	    ((application->expects_uris == GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_URIS_FOR_NON_FILES) &&
-	     nautilus_strcasecmp (uri_scheme, "file") != 0)) {
+	     eel_strcasecmp (uri_scheme, "file") != 0)) {
 		/* Check to be sure that the application also supports this particular URI scheme */
 		if (g_list_find_custom (application->supported_uri_schemes,
 					uri_scheme,
-					nautilus_strcmp_compare_func) == NULL) {
+					eel_strcmp_compare_func) == NULL) {
 			application_cannot_open_location (application,
 							  file,
 							  uri_scheme,
@@ -584,7 +584,7 @@ nautilus_launch_application (GnomeVFSMimeApplication *application,
 	}
 	g_free (uri_scheme);
 
-	nautilus_launch_application_from_command (application->command,
+	eel_launch_application_from_command (application->command,
 						  parameter, 
 						  application->requires_terminal);
 
@@ -592,7 +592,7 @@ nautilus_launch_application (GnomeVFSMimeApplication *application,
 }
 
 /**
- * nautilus_launch_application_from_command:
+ * eel_launch_application_from_command:
  * 
  * Fork off a process to launch an application with a given uri as
  * a parameter.
@@ -602,7 +602,7 @@ nautilus_launch_application (GnomeVFSMimeApplication *application,
  * @parameter: Passed as a parameter to the application as is.
  */
 void
-nautilus_launch_application_from_command (const char *command_string, 
+eel_launch_application_from_command (const char *command_string, 
 					  const char *parameter, 
 					  gboolean    use_terminal)
 {
@@ -614,11 +614,11 @@ nautilus_launch_application_from_command (const char *command_string,
 	/* FIXME bugzilla.eazel.com 7830: This needs to support things
 	 * like the "xalf" hack. Perhaps the best way to do that is
 	 * to use gnome_desktop_entry_launch_with_args instead of
-	 * calling system or nautilus_gnome_open_terminal.
+	 * calling system or eel_gnome_open_terminal.
 	 */
 
 	if (parameter != NULL) {
-		quoted_parameter = nautilus_shell_quote (parameter);
+		quoted_parameter = eel_shell_quote (parameter);
 		full_command = g_strconcat (command_string, " ", quoted_parameter, NULL);
 		g_free (quoted_parameter);
 	} else {
@@ -626,9 +626,9 @@ nautilus_launch_application_from_command (const char *command_string,
 	}
 
 	if (use_terminal) {
-		quoted_full_command = nautilus_shell_quote (full_command);
+		quoted_full_command = eel_shell_quote (full_command);
 		final_command = g_strconcat ("/bin/sh -c ", quoted_full_command, NULL);
-		nautilus_gnome_open_terminal (final_command);
+		eel_gnome_open_terminal (final_command);
 		g_free (quoted_full_command);
 	} else {
 		final_command = g_strconcat (full_command, " &", NULL);
diff --git a/libnautilus-extensions/nautilus-program-choosing.h b/libnautilus-extensions/nautilus-program-choosing.h
index 8d7c07904..bfbeddd63 100644
--- a/libnautilus-extensions/nautilus-program-choosing.h
+++ b/libnautilus-extensions/nautilus-program-choosing.h
@@ -53,7 +53,7 @@ void nautilus_cancel_choose_component_for_file   (NautilusFile
 void nautilus_launch_application                 (GnomeVFSMimeApplication           *application,
 						  NautilusFile                      *file,
 						  GtkWindow                         *parent_window);
-void nautilus_launch_application_from_command    (const char                        *command_string,
+void eel_launch_application_from_command    (const char                        *command_string,
 						  const char                        *parameter,
 						  gboolean                           use_terminal);
 
diff --git a/libnautilus-extensions/nautilus-radio-button-group.c b/libnautilus-extensions/nautilus-radio-button-group.c
deleted file mode 100644
index 201a7ad99..000000000
--- a/libnautilus-extensions/nautilus-radio-button-group.c
+++ /dev/null
@@ -1,430 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-radio-button-group.c - A radio button group container.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-radio-button-group.h"
-#include "nautilus-image.h"
-
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtksignal.h>
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-glib-extensions.h"
-
-static const gint RADIO_BUTTON_GROUP_INVALID = -1;
-
-/* Signals */
-typedef enum
-{
-	CHANGED,
-	LAST_SIGNAL
-} RadioGroupSignals;
-
-struct _NautilusRadioButtonGroupDetails
-{
-	GList		*rows;
-	GSList		*group;
-	guint		num_items;
-	gboolean	horizontal;
-};
-
-typedef struct
-{
-	GtkWidget	*button;
-	GtkWidget	*image;
-	GtkWidget	*description;
-} TableRow;
-
-/* NautilusRadioButtonGroupClass methods */
-static void nautilus_radio_button_group_initialize_class (NautilusRadioButtonGroupClass *klass);
-static void nautilus_radio_button_group_initialize       (NautilusRadioButtonGroup      *button_group);
-
-
-
-
-/* GtkObjectClass methods */
-static void nautilus_radio_button_group_destroy          (GtkObject                     *object);
-
-
-/* Private stuff */
-static void radio_button_group_free_button_group         (NautilusRadioButtonGroup      *button_group);
-static void radio_button_group_emit_changed_signal       (NautilusRadioButtonGroup      *button_group,
-							  GtkWidget                     *button);
-
-/* Radio button callbacks */
-static void button_toggled                               (GtkWidget                     *button,
-							  gpointer                       user_data);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusRadioButtonGroup,
-				   nautilus_radio_button_group,
-				   GTK_TYPE_TABLE)
-
-static guint radio_group_signals[LAST_SIGNAL] = { 0 };
-
-/*
- * NautilusRadioButtonGroupClass methods
- */
-static void
-nautilus_radio_button_group_initialize_class (NautilusRadioButtonGroupClass *radio_button_group_class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	
-	object_class = GTK_OBJECT_CLASS (radio_button_group_class);
-	widget_class = GTK_WIDGET_CLASS (radio_button_group_class);
-
- 	parent_class = gtk_type_class (gtk_table_get_type ());
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_radio_button_group_destroy;
-
-	/* Signals */
-	radio_group_signals[CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				0,
-				gtk_marshal_NONE__OBJECT,
-				GTK_TYPE_NONE, 
-				1,
-				GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, radio_group_signals, LAST_SIGNAL);
-}
-
-static void
-nautilus_radio_button_group_initialize (NautilusRadioButtonGroup *button_group)
-{
-	button_group->details = g_new (NautilusRadioButtonGroupDetails, 1);
-
-	button_group->details->rows = NULL;
-	button_group->details->group = NULL;
-	button_group->details->num_items = 0;
-	button_group->details->horizontal = FALSE;
-}
-
-/*
- * GtkObjectClass methods
- */
-static void
-nautilus_radio_button_group_destroy (GtkObject *object)
-{
-	NautilusRadioButtonGroup * button_group;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (NAUTILUS_IS_RADIO_BUTTON_GROUP (object));
-	
-	button_group = NAUTILUS_RADIO_BUTTON_GROUP (object);
-
-	radio_button_group_free_button_group (button_group);
-
-	g_free (button_group->details);
-	
-	/* Chain */
-	if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/*
- * Private stuff
- */
-static void
-radio_button_group_emit_changed_signal (NautilusRadioButtonGroup *button_group,
-				       GtkWidget *button)
-{
-	g_assert (button_group != NULL);
-	g_assert (button_group->details != NULL);
-	g_assert (button != NULL);
-
-	gtk_signal_emit (GTK_OBJECT (button_group), 
-			 radio_group_signals[CHANGED],
-			 button);
-}
-
-static void
-radio_button_group_free_button_group (NautilusRadioButtonGroup *button_group)
-{
-	g_assert (button_group != NULL);
-	g_assert (button_group->details != NULL);
-
-	if (button_group->details->rows) {
-		nautilus_g_list_free_deep (button_group->details->rows);
-		button_group->details->rows = NULL;
-	}
-
-	button_group->details->group = NULL;
-}
-
-/*
- * Radio button callbacks
- */
-static void
-button_toggled (GtkWidget *button, gpointer user_data)
-{
-	NautilusRadioButtonGroup *button_group = (NautilusRadioButtonGroup *) user_data;
-	
-	g_assert (button_group != NULL);
-	g_assert (button_group->details != NULL);
-
-	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) {
-		radio_button_group_emit_changed_signal (button_group, button);
-	}
-}
-
-/*
- * NautilusRadioButtonGroup public methods
- */
-GtkWidget*
-nautilus_radio_button_group_new (gboolean is_horizontal)
-{
-	NautilusRadioButtonGroup *button_group;
-
-	button_group = NAUTILUS_RADIO_BUTTON_GROUP
-		(gtk_widget_new (nautilus_radio_button_group_get_type (), NULL));
-	button_group->details->horizontal = is_horizontal;
-	
-	return GTK_WIDGET (button_group);
-}
- 
-/**
- * nautilus_radio_button_group_insert:
- * @button_group: The button group
- * @label: Label to use for the new button
- *
- * Create and insert a new radio button to the collection.
- *
- * Returns: The index of the new button.
- */
-guint
-nautilus_radio_button_group_insert (NautilusRadioButtonGroup	*button_group,
-				    const gchar			*label)
-{
-	GtkTable	*table;
-	TableRow	*row;
-
-	g_return_val_if_fail (button_group != NULL, 0);
-	g_return_val_if_fail (NAUTILUS_IS_RADIO_BUTTON_GROUP (button_group), 0);
-	g_return_val_if_fail (label != NULL, 0);
-
-	table = GTK_TABLE (button_group);
-
-	row = g_new (TableRow, 1);
-
-	row->button = gtk_radio_button_new_with_label (button_group->details->group, label);
-	row->image = NULL;
-	row->description = NULL;
-
-	/*
-	 * For some crazy reason I dont grok, the group has to be fetched each
-	 * time from the previous button
-	 */
-	button_group->details->group = gtk_radio_button_group (GTK_RADIO_BUTTON (row->button));
-
-	gtk_signal_connect (GTK_OBJECT (row->button),
-			    "toggled",
-			    GTK_SIGNAL_FUNC (button_toggled),
-			    (gpointer) button_group);
-
-	button_group->details->num_items++;
-
-	if (button_group->details->horizontal) {
-		/* Resize the table to fit all items in one row. */
-		gtk_table_resize (table, 1, button_group->details->num_items);
-		/* Place the radio button in the last (so far) column of the only row */
-		gtk_table_attach (table, 
-				  row->button,				/* child */
-				  button_group->details->num_items - 1, /* left_attach */
-				  button_group->details->num_items,	/* right_attach */
-				  0,					/* top_attach */
-				  1,					/* bottom_attach */
-				  (GTK_FILL|GTK_EXPAND),		/* xoptions */
-				  (GTK_FILL|GTK_EXPAND),		/* yoptions */
-				  0,					/* xpadding */
-				  0);					/* ypadding */
-	} else {
-		/* Resize the table to put each item on separate row. */
-		gtk_table_resize (table, button_group->details->num_items, 3);
-		/* Place the radio button in column 2 of the last (so far) row */
-		gtk_table_attach (table, 
-				  row->button,				/* child */
-				  1,					/* left_attach */
-				  2,					/* right_attach */
-				  button_group->details->num_items - 1,	/* top_attach */
-				  button_group->details->num_items,	/* bottom_attach */
-				  (GTK_FILL|GTK_EXPAND),		/* xoptions */
-				  (GTK_FILL|GTK_EXPAND),		/* yoptions */
-				  0,					/* xpadding */
-				  0);					/* ypadding */
-	}
-
-
-	gtk_widget_show (row->button);
-	
-	button_group->details->rows = g_list_append (button_group->details->rows, row);
-	
-	return g_list_length (button_group->details->rows) - 1;
-}
-
-/**
- * nautilus_radio_button_group_get_active_index:
- * @button_group: The button group
- *
- * Returns: The index of the active button.  There is always one active by law.
- */
-guint
-nautilus_radio_button_group_get_active_index (NautilusRadioButtonGroup *button_group)
-{
-	GList	*button_iterator;
-	gint	i = 0;
-
- 	g_return_val_if_fail (button_group != NULL, 0);
-	g_return_val_if_fail (NAUTILUS_IS_RADIO_BUTTON_GROUP (button_group), 0);
-	
-	g_assert (button_group != NULL);
-
-	button_iterator = button_group->details->rows;
-
-	while (button_iterator) {
-		TableRow *row;
-
-		row = button_iterator->data;
-		g_assert (row != NULL);
-		g_assert (row->button != NULL);
-		g_assert (GTK_TOGGLE_BUTTON (row->button));
-
-		if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (row->button))) {
-			return i;
-		}
-		
-		button_iterator = button_iterator->next;
-
-		i++;
-	}
-
-	g_assert_not_reached ();
-
-	return 0;
-}
-
-void
-nautilus_radio_button_group_set_active_index (NautilusRadioButtonGroup *button_group,
-					      guint active_index)
-{
-	TableRow *row;
-
- 	g_return_if_fail (button_group != NULL);
-	g_return_if_fail (NAUTILUS_IS_RADIO_BUTTON_GROUP (button_group));
-
-	row = g_list_nth_data (button_group->details->rows, active_index);
-	g_assert (row != NULL);
-	g_assert (row->button != NULL);
-	g_assert (GTK_TOGGLE_BUTTON (row->button));
-
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (row->button), TRUE);
-}
-
-/* Set an item's pixbuf. */
-void
-nautilus_radio_button_group_set_entry_pixbuf (NautilusRadioButtonGroup *button_group,
-					      guint                     entry_index,
-					      GdkPixbuf                *pixbuf)
-{
-	GtkTable	*table;
-	TableRow	*row;
-
- 	g_return_if_fail (button_group != NULL);
-	g_return_if_fail (NAUTILUS_IS_RADIO_BUTTON_GROUP (button_group));
-	g_return_if_fail (entry_index < g_list_length (button_group->details->rows));
-	g_return_if_fail (button_group->details->horizontal == FALSE);
-
-	table = GTK_TABLE (button_group);
-
-	row = g_list_nth_data (button_group->details->rows, entry_index);
-	g_assert (row != NULL);
-
-	if (row->image == NULL) {
-		row->image = nautilus_image_new (NULL);
-		
-		gtk_table_attach (table,
-				  row->image,			/* child */
-				  0,				/* left_attach */
-				  1,				/* right_attach */
-				  entry_index,			/* top_attach */
-				  entry_index + 1,		/* bottom_attach */
-				  GTK_FILL,			/* xoptions */
-				  (GTK_FILL|GTK_EXPAND),	/* yoptions */
-				  0,				/* xpadding */
-				  0);				/* ypadding */
-		
-		gtk_widget_show (row->image);
-	}
-
-	g_assert (row->image != NULL);
-	
-	nautilus_image_set_pixbuf (NAUTILUS_IMAGE (row->image), pixbuf);
-}
-
-/* Set an item's description. */
-void
-nautilus_radio_button_group_set_entry_description_text (NautilusRadioButtonGroup *button_group,
-							guint                     entry_index,
-							const char               *description_text)
-{
-	GtkTable	*table;
-	TableRow	*row;
-
- 	g_return_if_fail (button_group != NULL);
-	g_return_if_fail (NAUTILUS_IS_RADIO_BUTTON_GROUP (button_group));
-	g_return_if_fail (entry_index < g_list_length (button_group->details->rows));
-	g_return_if_fail (button_group->details->horizontal == FALSE);
-
-	table = GTK_TABLE (button_group);
-
-	row = g_list_nth_data (button_group->details->rows, entry_index);
-	g_assert (row != NULL);
-	
-	if (row->description == NULL) {
-		row->description = gtk_label_new (description_text);
-
-		gtk_misc_set_alignment (GTK_MISC (row->description), 0, 0.5);
-		
-		gtk_table_attach (table,
-				  row->description,		/* child */
-				  2,				/* left_attach */
-				  3,				/* right_attach */
-				  entry_index,			/* top_attach */
-				  entry_index + 1,		/* bottom_attach */
-				  (GTK_FILL|GTK_EXPAND),	/* xoptions */
-				  (GTK_FILL|GTK_EXPAND),	/* yoptions */
-				  0,				/* xpadding */
-				  0);				/* ypadding */
-		
-		gtk_widget_show (row->description);
-	}
-	else {
-		gtk_label_set_text (GTK_LABEL (row->description), description_text);
-	}
-}
-
diff --git a/libnautilus-extensions/nautilus-radio-button-group.h b/libnautilus-extensions/nautilus-radio-button-group.h
deleted file mode 100644
index ec2864736..000000000
--- a/libnautilus-extensions/nautilus-radio-button-group.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-radio-button-group.h - A radio button group container.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_RADIO_BUTTON_GROUP_H
-#define NAUTILUS_RADIO_BUTTON_GROUP_H
-
-#include <gtk/gtktable.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome/gnome-defs.h>
-
-/*
- * NautilusRadioButtonGroup is a collection of radio buttons
- * arranged into rows.  An optional icon and description can 
- * can be displayed with each radio button entry:
- * 
- * Icon1 < > Item one           Item 1 description
- * Icon2 < > Item two           Item 2 description
- * Icon3 <x> Item three         Item 3 description
- * Icon4 < > Item four          Item 4 description
- * 
- */
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_RADIO_BUTTON_GROUP            (nautilus_radio_button_group_get_type ())
-#define NAUTILUS_RADIO_BUTTON_GROUP(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_RADIO_BUTTON_GROUP, NautilusRadioButtonGroup))
-#define NAUTILUS_RADIO_BUTTON_GROUP_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_RADIO_BUTTON_GROUP, NautilusRadioButtonGroupClass))
-#define NAUTILUS_IS_RADIO_BUTTON_GROUP(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_RADIO_BUTTON_GROUP))
-
-typedef struct _NautilusRadioButtonGroup	   NautilusRadioButtonGroup;
-typedef struct _NautilusRadioButtonGroupClass      NautilusRadioButtonGroupClass;
-typedef struct _NautilusRadioButtonGroupDetails    NautilusRadioButtonGroupDetails;
-
-struct _NautilusRadioButtonGroup
-{
-	/* Super Class */
-	GtkTable			table;
-	
-	/* Private stuff */
-	NautilusRadioButtonGroupDetails	*details;
-};
-
-struct _NautilusRadioButtonGroupClass
-{
-	GtkTableClass			parent_class;
-};
-
-typedef struct
-{
-	guint active_button_index;
-} NautilusRadioButtonGroupSignalData;
-
-GtkType    nautilus_radio_button_group_get_type                   (void);
-GtkWidget* nautilus_radio_button_group_new	                  (gboolean is_horizontal);
-
-
-/* Insert a new item to the group.  Returns the new item's index */
-guint      nautilus_radio_button_group_insert                     (NautilusRadioButtonGroup *button_group,
-								   const gchar              *label);
-
-/* Get the active item index. By law there always is an active item */
-guint      nautilus_radio_button_group_get_active_index           (NautilusRadioButtonGroup *button_group);
-
-/* Set the active item index. */
-void       nautilus_radio_button_group_set_active_index           (NautilusRadioButtonGroup *button_group,
-								   guint                     active_index);
-
-/* Set an item's pixbuf. */
-void       nautilus_radio_button_group_set_entry_pixbuf           (NautilusRadioButtonGroup *button_group,
-								   guint                     entry_index,
-								   GdkPixbuf                *pixbuf);
-/* Set an item's description. */
-void       nautilus_radio_button_group_set_entry_description_text (NautilusRadioButtonGroup *button_group,
-								   guint                     entry_index,
-								   const char               *description);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_RADIO_BUTTON_GROUP_H */
-
-
diff --git a/libnautilus-extensions/nautilus-region.c b/libnautilus-extensions/nautilus-region.c
deleted file mode 100644
index 0ff4f044b..000000000
--- a/libnautilus-extensions/nautilus-region.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-region.c: A simple wrapper on GdkRegion with rectangle operations.
-
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-region.h"
-
-#include "nautilus-glib-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-
-struct NautilusRegion
-{
-	GdkRegion *gdk_region;
-};
-
-NautilusRegion *
-nautilus_region_new (void)
-{
-	NautilusRegion *region;
-	
-	region = g_new0 (NautilusRegion, 1);
-
-	region->gdk_region = gdk_region_new ();
-
-	return region;
-}
-
-void
-nautilus_region_free (NautilusRegion *region)
-{
-	if (region == NULL) {
-		return;
-	}
-
-	g_assert (region->gdk_region != NULL);
-	gdk_region_destroy (region->gdk_region);
-	
-	g_free (region);
-}
-
-static GdkRegion *
-gdk_region_new_from_irect (const ArtIRect *art_rect)
-{
-	GdkRegion *region;
- 	GdkRegion *empty_region;
-	GdkRectangle gdk_rect;
-
-	g_return_val_if_fail (art_rect != NULL, NULL);
-	
-	gdk_rect = nautilus_art_irect_to_gdk_rectangle (art_rect);
-	empty_region = gdk_region_new ();
-	region = gdk_region_union_with_rect (empty_region, &gdk_rect);
-	gdk_region_destroy (empty_region);
-
-	return region;
-}
-
-void
-nautilus_region_add_rectangle (NautilusRegion *region,
-			       const ArtIRect *rectangle)
-{
-	GdkRegion *add_region;
-	GdkRegion *new_region;
-
-	g_return_if_fail (region != NULL);
-	g_return_if_fail (rectangle != NULL);
-	g_return_if_fail (!art_irect_empty (rectangle));
-
-	add_region = gdk_region_new_from_irect (rectangle);
-	new_region = gdk_regions_union (region->gdk_region, add_region);
-	gdk_region_destroy (add_region);
-	gdk_region_destroy (region->gdk_region);
-	region->gdk_region = new_region;
-}
-
-void
-nautilus_region_subtract_rectangle (NautilusRegion *region,
-				    const ArtIRect *rectangle)
-{
-	GdkRegion *subtract_region;
-	GdkRegion *new_region;
-
-	g_return_if_fail (region != NULL);
-	g_return_if_fail (rectangle != NULL);
-	g_return_if_fail (!art_irect_empty (rectangle));
-
-	subtract_region = gdk_region_new_from_irect (rectangle);
-	new_region = gdk_regions_subtract (region->gdk_region, subtract_region);
-	gdk_region_destroy (subtract_region);
-	gdk_region_destroy (region->gdk_region);
-	region->gdk_region = new_region;
-}
-
-void
-nautilus_region_set_gc_clip_region (const NautilusRegion *region,
-				    GdkGC *gc)
-{
-	g_return_if_fail (region != NULL);
-	g_return_if_fail (gc != NULL);
-
-	gdk_gc_set_clip_region (gc, region->gdk_region);
-}
diff --git a/libnautilus-extensions/nautilus-region.h b/libnautilus-extensions/nautilus-region.h
deleted file mode 100644
index 1727469ad..000000000
--- a/libnautilus-extensions/nautilus-region.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-region.h: A simple wrapper on GdkRegion with rectangle operations.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_REGION_H
-#define NAUTILUS_REGION_H
-
-#include <libgnome/gnome-defs.h>
-#include <libart_lgpl/art_rect.h>
-#include <glib.h>
-#include <gdk/gdk.h>
-
-/* Opaque NautilusRegion declaration. */
-typedef struct NautilusRegion NautilusRegion;
-
-NautilusRegion *nautilus_region_new                (void);
-void            nautilus_region_free               (NautilusRegion       *region);
-void            nautilus_region_add_rectangle      (NautilusRegion       *region,
-						    const ArtIRect       *rectangle);
-void            nautilus_region_subtract_rectangle (NautilusRegion       *region,
-						    const ArtIRect       *rectangle);
-void            nautilus_region_set_gc_clip_region (const NautilusRegion       *region,
-						    GdkGC *gc);
-
-#endif /* NAUTILUS_REGION_H */
-
diff --git a/libnautilus-extensions/nautilus-scalable-font-private.h b/libnautilus-extensions/nautilus-scalable-font-private.h
deleted file mode 100644
index e65454e0f..000000000
--- a/libnautilus-extensions/nautilus-scalable-font-private.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-scalable-font-private.h - Private scalable font things.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_SCALABLE_FONT_PRIVATE_H
-#define NAUTILUS_SCALABLE_FONT_PRIVATE_H
-
-#include <libnautilus-extensions/nautilus-scalable-font.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_SCALABLE_FONT_UNDEFINED_HANDLE -1
-
-struct _RsvgFTCtx;
-
-int                nautilus_scalable_font_get_rsvg_handle  (const NautilusScalableFont *font);
-struct _RsvgFTCtx *nautilus_scalable_font_get_rsvg_context (const NautilusScalableFont *font);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_SCALABLE_FONT_PRIVATE_H */
-
-
diff --git a/libnautilus-extensions/nautilus-scalable-font.c b/libnautilus-extensions/nautilus-scalable-font.c
deleted file mode 100644
index 9cf671595..000000000
--- a/libnautilus-extensions/nautilus-scalable-font.c
+++ /dev/null
@@ -1,383 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-scalable-font.c - A GtkObject subclass for access to scalable fonts.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-scalable-font-private.h"
-
-#include "nautilus-background.h"
-#include "nautilus-font-manager.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-glyph.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-string.h"
-#include <librsvg/rsvg-ft.h>
-#include <libgnome/gnome-util.h>
-
-/* Detail member struct */
-struct NautilusScalableFontDetails
-{
-	RsvgFTFontHandle font_handle;
-	char *font_file_name;
-};
-
-/* Global things */
-static RsvgFTCtx		*global_rsvg_ft_context = NULL;
-static GHashTable		*global_font_handle_table = NULL;
-
-/* GtkObjectClass methods */
-static void nautilus_scalable_font_initialize_class (NautilusScalableFontClass *font_class);
-static void nautilus_scalable_font_initialize       (NautilusScalableFont      *font);
-static void nautilus_scalable_font_destroy          (GtkObject                 *object);
-static void initialize_global_stuff_if_needed       (void);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusScalableFont, nautilus_scalable_font, GTK_TYPE_OBJECT)
-
-/* Class init methods */
-static void
-nautilus_scalable_font_initialize_class (NautilusScalableFontClass *font_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (font_class);
-
-	initialize_global_stuff_if_needed ();
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_scalable_font_destroy;
-}
-
-void
-nautilus_scalable_font_initialize (NautilusScalableFont *font)
-{
-	font->details = g_new0 (NautilusScalableFontDetails, 1);
-
-	font->details->font_handle = NAUTILUS_SCALABLE_FONT_UNDEFINED_HANDLE;
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_scalable_font_destroy (GtkObject *object)
-{
- 	NautilusScalableFont *font;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (NAUTILUS_IS_SCALABLE_FONT (object));
-
-	font = NAUTILUS_SCALABLE_FONT (object);
-
-	g_free (font->details->font_file_name);
-	g_free (font->details);
-	
-	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-/* Public NautilusScalableFont methods */
-
-/**
- * nautilus_scalable_font_new:
- * @file_name: Postscript or TrueType font file name.
- *
- * Returns a font for the given font file name.
- *
- */
-NautilusScalableFont *
-nautilus_scalable_font_new (const char *file_name)
-{
-	NautilusScalableFont *font;
-	RsvgFTFontHandle font_handle = -1;
-
-	g_return_val_if_fail (nautilus_strlen (file_name) > 0, NULL);
-	g_return_val_if_fail (nautilus_font_manager_file_is_scalable_font (file_name), NULL);
-
-	initialize_global_stuff_if_needed ();
-
-	font = NAUTILUS_SCALABLE_FONT (gtk_object_new (nautilus_scalable_font_get_type (), NULL));
-	gtk_object_ref (GTK_OBJECT (font));
-	gtk_object_sink (GTK_OBJECT (font));
-	
-	font->details->font_file_name = g_strdup (file_name);
-
-	if (!g_hash_table_lookup_extended (global_font_handle_table,
-					   font->details->font_file_name,
-					   NULL,
-					   (gpointer *) &font_handle)) {
-		font_handle = rsvg_ft_intern (global_rsvg_ft_context, font->details->font_file_name);
-		g_hash_table_insert (global_font_handle_table,
-				     font->details->font_file_name,
-				     GINT_TO_POINTER (font_handle));
-	}
-	g_assert (font_handle >= 0);
-
-	font->details->font_handle = font_handle;
-
-	return font;
-}
-
-NautilusScalableFont *
-nautilus_scalable_font_make_bold (NautilusScalableFont *font)
-{
-	char *bold_font_file_name;
-	NautilusScalableFont *bold_font;
-
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), NULL);
-
-	bold_font_file_name = nautilus_font_manager_get_bold (font->details->font_file_name);
-	bold_font = nautilus_scalable_font_new (bold_font_file_name);
-	g_free (bold_font_file_name);
-
-	return bold_font;
-}
-
-NautilusDimensions
-nautilus_scalable_font_measure_text (const NautilusScalableFont *font,
-				     int font_size,
-				     const char *text,
-				     guint text_length)
-{
-	NautilusDimensions dimensions;
-	NautilusGlyph *glyph;
-
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), NAUTILUS_DIMENSIONS_EMPTY);
-	g_return_val_if_fail (font_size > 0, NAUTILUS_DIMENSIONS_EMPTY);
-
-	if (text == NULL || text[0] == '\0' || text_length == 0) {
-		return NAUTILUS_DIMENSIONS_EMPTY;
-	}
-
-	g_return_val_if_fail (text_length <= strlen (text), NAUTILUS_DIMENSIONS_EMPTY);
-
-	glyph = nautilus_glyph_new (font, font_size, text, text_length);
-	dimensions = nautilus_glyph_get_dimensions (glyph);
-	nautilus_glyph_free (glyph);
-
-	return dimensions;
-}
-
-int
-nautilus_scalable_font_text_width (const NautilusScalableFont *font,
-				   int font_size,
-				   const char *text,
-				   guint text_length)
-{
-	NautilusDimensions dimensions;
-
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), 0);
-	g_return_val_if_fail (font_size > 0, 0);
-
-	if (text == NULL || text[0] == '\0' || text_length == 0) {
-		return 0;
-	}
-
-	g_return_val_if_fail (text_length <= strlen (text), 0);
-
-	dimensions = nautilus_scalable_font_measure_text (font, font_size, text, text_length);
-
-	return dimensions.width;
-}
-
-void
-nautilus_scalable_font_draw_text (const NautilusScalableFont *font,
-				  GdkPixbuf *destination_pixbuf,
-				  int x,
-				  int y,
-				  const ArtIRect *clip_area,
-				  int font_size,
-				  const char *text,
-				  guint text_length,
-				  guint32 color,
-				  int opacity)
-{
-	NautilusGlyph *glyph;
-
-	g_return_if_fail (NAUTILUS_IS_SCALABLE_FONT (font));
-	g_return_if_fail (destination_pixbuf != NULL);
-	g_return_if_fail (font_size > 0);
-	g_return_if_fail (opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	if (text == NULL || text[0] == '\0' || text_length == 0) {
-		return;
-	}
-
-	g_return_if_fail (text_length <= strlen (text));
-
-	glyph = nautilus_glyph_new (font, font_size, text, text_length);
-
-	nautilus_glyph_draw_to_pixbuf (glyph,
-				       destination_pixbuf,
-				       x,
-				       y,
-				       clip_area,
-				       color,
-				       opacity);
-
-	nautilus_glyph_free (glyph);
-}
-
-/**
- * nautilus_scalable_font_largest_fitting_font_size
- * @font: A NautilusScalableFont
- * @text: Text to use for measurement.
- * @available_width: How much space is available in pixels.
- * @minimum_acceptable_font_size: The minimum acceptable font size in pixels.
- * @maximum_acceptable_font_size: The maximum acceptable font size in pixels.
- *
- * Returns: A font size than when used to render &text, will fit it all in 
- *          &available_width.  The minimum and maximum acceptable dimensions
- *          control the limits on the size of the font.  The font size is
- *          guranteed to be within this range.
- */
-int
-nautilus_scalable_font_largest_fitting_font_size (const NautilusScalableFont *font,
-						  const char *text,
-						  int available_width,
-						  int minimum_acceptable_font_size,
-						  int maximum_acceptable_font_size)
-{
-	NautilusStringList *tokenized_string;
-	int i;
-	char *longest_string;
-	int longest_string_length;
-
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), 0);
-	g_return_val_if_fail (text != NULL, 0);
-	g_return_val_if_fail (text[0] != '\0', 0);
-	g_return_val_if_fail (available_width > 0, 0);
-	g_return_val_if_fail (minimum_acceptable_font_size > 0, 0);
-	g_return_val_if_fail (maximum_acceptable_font_size > 0, 0);
-	g_return_val_if_fail (maximum_acceptable_font_size > minimum_acceptable_font_size, 0);
-
-	tokenized_string = nautilus_string_list_new_from_tokens (text, "\n", FALSE);
-	longest_string = nautilus_string_list_get_longest_string (tokenized_string);
-	g_assert (longest_string != NULL);
-	nautilus_string_list_free (tokenized_string);
-	longest_string_length = strlen (longest_string);
-	
-	for (i = maximum_acceptable_font_size; i >= minimum_acceptable_font_size; i--) {
-		int width;
-
-		width = nautilus_scalable_font_text_width (font,
-							   i,
-							   longest_string,
-							   longest_string_length);
-		
-		if (width <= available_width) {
-			g_free (longest_string);
-			return i;
-		}
-	}
-
-	g_free (longest_string);
-
-	return minimum_acceptable_font_size;
-}
-
-NautilusScalableFont *
-nautilus_scalable_font_get_default_font (void)
-{
-	char *default_font_file_name;
-	NautilusScalableFont *default_font;
-
-	default_font_file_name = nautilus_font_manager_get_default_font ();
-	g_assert (default_font_file_name != NULL);
-	default_font = nautilus_scalable_font_new (default_font_file_name);
-	g_free (default_font_file_name);
-	g_assert (NAUTILUS_IS_SCALABLE_FONT (default_font));
-	return default_font;
-}
-
-NautilusScalableFont *
-nautilus_scalable_font_get_default_bold_font (void)
-{
-	char *default_bold_font_file_name;
-	NautilusScalableFont *default_bold_font;
-
-	default_bold_font_file_name = nautilus_font_manager_get_default_bold_font ();
-	g_assert (default_bold_font_file_name != NULL);
-	default_bold_font = nautilus_scalable_font_new (default_bold_font_file_name);
-	g_free (default_bold_font_file_name);
-	g_assert (NAUTILUS_IS_SCALABLE_FONT (default_bold_font));
-	return default_bold_font;
-}
-
-/* 'atexit' destructor for rsvg context */
-static void
-destroy_global_rsvg_ft_context (void)
-{
-	rsvg_ft_ctx_done (global_rsvg_ft_context);
-}
-
-static void
-free_global_font_handle_table (void)
-{
-	if (global_font_handle_table != NULL) {
-		g_hash_table_destroy (global_font_handle_table);
-	}
-
-	global_font_handle_table = NULL;
-}
-
-static void
-initialize_global_stuff_if_needed (void)
-{
-	/* Initialize the rsvg font context shared by all fonts */
-	if (global_rsvg_ft_context == NULL) {
-		global_rsvg_ft_context = rsvg_ft_ctx_new ();
-		g_atexit (destroy_global_rsvg_ft_context);
-	}
-
-	if (global_font_handle_table == NULL) {
-		global_font_handle_table = g_hash_table_new (g_str_hash, g_str_equal);
-		g_atexit (free_global_font_handle_table);
-	}
-}
-
-/* Private NautilusScalableFont things */
-int
-nautilus_scalable_font_get_rsvg_handle (const NautilusScalableFont *font)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), NAUTILUS_SCALABLE_FONT_UNDEFINED_HANDLE);
-
-	return font->details->font_handle;
-}
-
-struct _RsvgFTCtx *
-nautilus_scalable_font_get_rsvg_context (const NautilusScalableFont *font)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), NULL);
-
-	initialize_global_stuff_if_needed ();
-
-	return global_rsvg_ft_context;
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-void
-nautilus_self_check_scalable_font (void)
-{
-	/* const char *fonts_place = NAUTILUS_DATADIR "/fonts/urw"; */
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-scalable-font.h b/libnautilus-extensions/nautilus-scalable-font.h
deleted file mode 100644
index c8add6e4b..000000000
--- a/libnautilus-extensions/nautilus-scalable-font.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-scalable-font.h - A GtkObject subclass for access to scalable fonts.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-/* NautilusScalableFont is a GtkObject that provdes a simple
- * interface to Raph Levien's librsvg FreeType2 based anti aliased
- * text rendering.
- *
- * Currently, only Type1 fonts are supported.
- *
- * Fonts are automatically queried and used if available.  Right
- * now this is fairly simple code which does not handle all the 
- * complexities of the hell that is unix fonts.
- *
- * In the Star Trek future, we will use gnome-print (gnome-font?).
- * However, we will keep the interface to scalable font usage simple
- * and hidden behind this interface.
- */
-
-#ifndef NAUTILUS_SCALABLE_FONT_H
-#define NAUTILUS_SCALABLE_FONT_H
-
-#include <gtk/gtkobject.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome/gnome-defs.h>
-#include <libnautilus-extensions/nautilus-string-list.h>
-#include <libnautilus-extensions/nautilus-art-extensions.h>
-#include <libart_lgpl/art_rect.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_SCALABLE_FONT		(nautilus_scalable_font_get_type ())
-#define NAUTILUS_SCALABLE_FONT(obj)		(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_SCALABLE_FONT, NautilusScalableFont))
-#define NAUTILUS_SCALABLE_FONT_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_SCALABLE_FONT, NautilusScalableFontClass))
-#define NAUTILUS_IS_SCALABLE_FONT(obj)		(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_SCALABLE_FONT))
-#define NAUTILUS_IS_SCALABLE_FONT_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_SCALABLE_FONT))
-
-typedef struct NautilusScalableFont	      NautilusScalableFont;
-typedef struct NautilusScalableFontClass      NautilusScalableFontClass;
-typedef struct NautilusScalableFontDetails    NautilusScalableFontDetails;
-
-struct NautilusScalableFont
-{
-	/* Superclass */
-	GtkObject object;
-
-	/* Private things */
-	NautilusScalableFontDetails *details;
-};
-
-struct NautilusScalableFontClass
-{
-	GtkObjectClass parent_class;
-};
-
-GtkType                nautilus_scalable_font_get_type                  (void);
-NautilusScalableFont * nautilus_scalable_font_new                       (const char                  *file_name);
-NautilusDimensions     nautilus_scalable_font_measure_text              (const NautilusScalableFont  *font,
-									 int                          font_size,
-									 const char                  *text,
-									 guint                        text_length);
-int                    nautilus_scalable_font_text_width                (const NautilusScalableFont  *font,
-									 int                          font_size,
-									 const char                  *text,
-									 guint                        text_length);
-void                   nautilus_scalable_font_draw_text                 (const NautilusScalableFont  *font,
-									 GdkPixbuf                   *destination_pixbuf,
-									 int                          x,
-									 int                          y,
-									 const ArtIRect              *clip_area,
-									 int                          font_size,
-									 const char                  *text,
-									 guint                        text_length,
-									 guint32                      color,
-									 int                          opacity);
-int                    nautilus_scalable_font_largest_fitting_font_size (const NautilusScalableFont  *font,
-									 const char                  *text,
-									 int                          available_width,
-									 int                          minimum_acceptable_font_size,
-									 int                          maximum_acceptable_font_size);
-NautilusScalableFont  *nautilus_scalable_font_get_default_font          (void);
-NautilusScalableFont  *nautilus_scalable_font_get_default_bold_font     (void);
-NautilusScalableFont  *nautilus_scalable_font_make_bold                 (NautilusScalableFont        *font);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_SCALABLE_FONT_H */
-
-
diff --git a/libnautilus-extensions/nautilus-search-uri.c b/libnautilus-extensions/nautilus-search-uri.c
index c71a22cd8..8f452a685 100644
--- a/libnautilus-extensions/nautilus-search-uri.c
+++ b/libnautilus-extensions/nautilus-search-uri.c
@@ -27,9 +27,9 @@
 /* Must be included before other libgnome headers. */
 #include <libgnome/gnome-defs.h>
 
-#include "nautilus-glib-extensions.h"
 #include "nautilus-lib-self-check-functions.h"
-#include "nautilus-string.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-string.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
@@ -85,7 +85,7 @@ free_tokenized_uri (GList *list)
         GList *node;
 
         for (node = list; node != NULL; node = node->next) {
-                nautilus_g_list_free_deep (node->data);
+                eel_g_list_free_deep (node->data);
         }
         g_list_free (list);
 }
@@ -503,7 +503,7 @@ get_translated_criterion (GList *criterion)
                    we output a concat of the translation and the 
                    last part of the uri.
                 */
-                context_stripped_operand = nautilus_str_remove_bracketed_text (_(operand_table[item_number].translation));
+                context_stripped_operand = eel_str_remove_bracketed_text (_(operand_table[item_number].translation));
                 ret_val = g_strdup_printf (context_stripped_operand,
 					   (char *) criterion->data);
                 g_free (context_stripped_operand);
@@ -519,11 +519,11 @@ get_translated_criterion (GList *criterion)
 
                 if (operand_table[item_number].translation == NULL) {
                         /* if we had no translation in operand criterion table */
-                        ret_val = nautilus_str_remove_bracketed_text (_(value_table[value_item_number].translation));
+                        ret_val = eel_str_remove_bracketed_text (_(value_table[value_item_number].translation));
                 } else {
                         /* if we have both some translation in level 2 and level 3 */
-                        context_stripped_operand = nautilus_str_remove_bracketed_text (_(operand_table[item_number].translation));
-                        context_stripped_value = nautilus_str_remove_bracketed_text (_(value_table[value_item_number].translation));
+                        context_stripped_operand = eel_str_remove_bracketed_text (_(operand_table[item_number].translation));
+                        context_stripped_value = eel_str_remove_bracketed_text (_(value_table[value_item_number].translation));
                         ret_val = g_strdup_printf (context_stripped_operand, context_stripped_value);
                         g_free (context_stripped_operand);
                         g_free (context_stripped_value);
@@ -553,12 +553,12 @@ get_nth_criterion_prefix (GList *criterion)
             strings elsewhere.  Translate only the words "and" here. */
         if (criterion->next == NULL) {
                 
-                return nautilus_str_remove_bracketed_text (_("[Items larger than 400K] and [without all the words \"apple orange\"]"));
+                return eel_str_remove_bracketed_text (_("[Items larger than 400K] and [without all the words \"apple orange\"]"));
         }
         /* Human readable description for a criterion in a search for
            files. Bracketed items are context, and are message
            strings elsewhere.  Translate only the words "and" here. */
-        return nautilus_str_remove_bracketed_text (_("[Items larger than 400K], [owned by root and without all the words \"apple orange\"]"));
+        return eel_str_remove_bracketed_text (_("[Items larger than 400K], [owned by root and without all the words \"apple orange\"]"));
 }
 
 /**
@@ -650,8 +650,8 @@ nautilus_is_search_uri (const char *uri)
 {
         g_return_val_if_fail (uri != NULL, FALSE);
 
-        return nautilus_istr_has_prefix (uri, "search:")
-                || nautilus_istr_has_prefix (uri, "gnome-search:");
+        return eel_istr_has_prefix (uri, "search:")
+                || eel_istr_has_prefix (uri, "gnome-search:");
 }
 
 #if !defined (NAUTILUS_OMIT_SELF_CHECK)
@@ -662,66 +662,66 @@ nautilus_self_check_search_uri (void)
 	/* search_uri_to_human */
 
         /* make sure that it does not accept non-supported uris.*/
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human (""), ""); 
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("s"), "s");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human (" "), " ");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("  "), "  ");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human (" s"), " s");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human (" s "), " s ");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("xxx:yyy"), "xxx:yyy");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]"), "search:[][]");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]fi"), "search:[][]fi");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human (""), ""); 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("s"), "s");
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human (" "), " ");
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("  "), "  ");
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human (" s"), " s");
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human (" s "), " s ");
+	EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("xxx:yyy"), "xxx:yyy");
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]"), "search:[][]");
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]fi"), "search:[][]fi");
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name"), 
                                       "search:[][]file_name");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name cont"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name cont"), 
                                       "search:[][]file_name cont");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains"), 
                                       "search:[][]file_name contains");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name c stuff"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name c stuff"), 
                                       "search:[][]file_name c stuff");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]&"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]&"), 
                                       "search:[][]&");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]f & s"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]f & s"), 
                                       "search:[][]f & s");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & f"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & f"), 
                                       "search:[][]file_name contains stuff & f");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & file_type i"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & file_type i"), 
                                       "search:[][]file_name contains stuff & file_type i");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & file_type is f"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & file_type is f"), 
                                       "search:[][]file_name contains stuff & file_type is f");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stu)ff & file_type is file"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stu)ff & file_type is file"), 
                                       "search:[][]file_name contains stu)ff & file_type is file");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stu(ff & file_type is file"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stu(ff & file_type is file"), 
                                       "search:[][]file_name contains stu(ff & file_type is file");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stu|ff & file_type is file"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stu|ff & file_type is file"), 
                                       "search:[][]file_name contains stu|ff & file_type is file");
 
         /* make sure all the code paths work */
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff"), 
                                       _("Items containing \"stuff\" in their names"));
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_type is file"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_type is file"), 
                                       _("Items that are regular files"));
         /* FIXME bugzilla.eazel.com 5088: This may be what the function calls "human", but it's bad grammar. */
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & file_type is file"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & file_type is file"), 
                                       _("Items containing \"stuff\" in their names and that are regular files"));
         /* FIXME bugzilla.eazel.com 5088: This may be what the function calls "human", but it's bad grammar. */
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & file_type is file"
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & file_type is file"
                                                                     " & size smaller_than 2000"), 
                                       _("Items containing \"stuff\" in their names, that are regular files and "
                                         "smaller than 2000 bytes"));
         /* FIXME bugzilla.eazel.com 5088: This may be what the function calls "human", but it's bad grammar. */
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains medusa & file_type is directory"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains medusa & file_type is directory"), 
                                       _("Items containing \"medusa\" in their names and that are "
                                         "folders"));
         
         /* is_search_uri */
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri (""), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("search:"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("gnome-search:"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("xxx-search:"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("search:xxx"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("gnome-search:xxx"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("xxx-search:xxx"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri (""), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("search:"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("gnome-search:"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("xxx-search:"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("search:xxx"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("gnome-search:xxx"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("xxx-search:xxx"), FALSE);
 }
 
 #endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-self-checks.c b/libnautilus-extensions/nautilus-self-checks.c
deleted file mode 100644
index 4adb11d05..000000000
--- a/libnautilus-extensions/nautilus-self-checks.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-   
-   nautilus-self-checks.c: The self-check framework.
- 
-   Copyright (C) 1999 Eazel, Inc.
-  
-   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.
-  
-   Author: Darin Adler <darin@eazel.com>
-*/
-
-#include <config.h>
-
-#if ! defined (NAUTILUS_OMIT_SELF_CHECK)
-
-#include "nautilus-self-checks.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-static gboolean failed;
-
-static const char *current_expression;
-static const char *current_file_name;
-static int current_line_number;
-
-void nautilus_exit_if_self_checks_failed (void)
-{
-	if (!failed) {
-		return;
-	}
-
-	printf ("\n");
-
-	exit (EXIT_FAILURE);
-}
-
-static void
-nautilus_report_check_failure (char *result, char *expected)
-{
-	if (!failed) {
-		fprintf (stderr, "\n");
-	}
-
-	fprintf (stderr, "FAIL: check failed in %s, line %d\n", current_file_name, current_line_number);
-	fprintf (stderr, "      evaluated: %s\n", current_expression);
-	fprintf (stderr, "       expected: %s\n", expected == NULL ? "NULL" : expected);
-	fprintf (stderr, "            got: %s\n", result == NULL ? "NULL" : result);
-	
-	failed = TRUE;
-
-	g_free (result);
-	g_free (expected);
-}
-
-static char *
-nautilus_strdup_boolean (gboolean boolean)
-{
-	if (boolean == FALSE) {
-		return g_strdup ("FALSE");
-	}
-	if (boolean == TRUE) {
-		return g_strdup ("TRUE");
-	}
-	return g_strdup_printf ("gboolean(%d)", boolean);
-}
-
-void
-nautilus_before_check (const char *expression,
-		       const char *file_name,
-		       int line_number)
-{
-	current_expression = expression;
-	current_file_name = file_name;
-	current_line_number = line_number;
-}
-
-static void
-nautilus_after_check (void)
-{
-	/* It would be good to check here if there was a memory leak. */
-}
-
-void
-nautilus_check_boolean_result (gboolean result, gboolean expected)
-{
-	if (result != expected) {
-		nautilus_report_check_failure (nautilus_strdup_boolean (result),
-					       nautilus_strdup_boolean (expected));
-	}
-	nautilus_after_check ();
-}
-
-void
-nautilus_check_rectangle_result (ArtIRect result,
-				 int expected_x0,
-				 int expected_y0,
-				 int expected_x1,
-				 int expected_y1)
-{
-	if (result.x0 != expected_x0
-	    || result.y0 != expected_y0
-	    || result.x1 != expected_x1
-	    || result.y1 != expected_y1) {
-		nautilus_report_check_failure (g_strdup_printf ("x0=%d, y0=%d, x1=%d, y1=%d",
-								result.x0,
-								result.y0,
-								result.x1,
-								result.y1),
-					       g_strdup_printf ("x0=%d, y0=%d, x1=%d, y1=%d",
-								expected_x0,
-								expected_y0,
-								expected_x1,
-								expected_y1));
-	}
-	nautilus_after_check ();
-}
-
-void
-nautilus_check_dimensions_result (NautilusDimensions result,
-				  int expected_width,
-				  int expected_height)
-{
-	if (result.width != expected_width
-	    || result.height != expected_height) {
-		nautilus_report_check_failure (g_strdup_printf ("width=%d, height=%d",
-								result.width,
-								result.height),
-					       g_strdup_printf ("width=%d, height=%d",
-								expected_width,
-								expected_height));
-	}
-	nautilus_after_check ();
-}
-
-void
-nautilus_check_integer_result (long result, long expected)
-{
-	if (result != expected) {
-		nautilus_report_check_failure (g_strdup_printf ("%ld", result),
-					       g_strdup_printf ("%ld", expected));
-	}
-	nautilus_after_check ();
-}
-
-void
-nautilus_check_string_result (char *result, const char *expected)
-{
-	gboolean match;
-	
-	/* Stricter than nautilus_strcmp.
-	 * NULL does not match "" in this test.
-	 */
-	if (expected == NULL) {
-		match = result == NULL;
-	} else {
-		match = result != NULL && strcmp (result, expected) == 0;
-	}
-
-	if (!match) {
-		nautilus_report_check_failure (result, g_strdup (expected));
-	} else {
-		g_free (result);
-	}
-	nautilus_after_check ();
-}
-
-void
-nautilus_before_check_function (const char *name)
-{
-	fprintf (stderr, "running %s\n", name);
-}
-
-void
-nautilus_after_check_function (void)
-{
-}
-
-#endif /* ! NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-self-checks.h b/libnautilus-extensions/nautilus-self-checks.h
deleted file mode 100644
index 73ff7e5c3..000000000
--- a/libnautilus-extensions/nautilus-self-checks.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-   
-   nautilus-self-checks.h: The self-check framework.
- 
-   Copyright (C) 1999 Eazel, Inc.
-  
-   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.
-  
-   Author: Darin Adler <darin@eazel.com>
-*/
-
-#ifndef NAUTILUS_SELF_CHECKS_H
-#define NAUTILUS_SELF_CHECKS_H
-
-#include <glib.h>
-#include <libnautilus-extensions/nautilus-art-extensions.h>
-
-#define NAUTILUS_CHECK_RESULT(type, expression, expected_value) \
-G_STMT_START { \
-	nautilus_before_check (#expression, __FILE__, __LINE__); \
-	nautilus_check_##type##_result (expression, expected_value); \
-} G_STMT_END
-
-#define NAUTILUS_CHECK_BOOLEAN_RESULT(expression, expected_value) \
-	NAUTILUS_CHECK_RESULT(boolean, expression, expected_value)
-#define NAUTILUS_CHECK_INTEGER_RESULT(expression, expected_value) \
-	NAUTILUS_CHECK_RESULT(integer, expression, expected_value)
-#define NAUTILUS_CHECK_STRING_RESULT(expression, expected_value) \
-	NAUTILUS_CHECK_RESULT(string, expression, expected_value)
-#define NAUTILUS_CHECK_RECTANGLE_RESULT(expression, expected_x0, expected_y0, expected_x1, expected_y1) \
-G_STMT_START { \
-	nautilus_before_check (#expression, __FILE__, __LINE__); \
-	nautilus_check_rectangle_result (expression, expected_x0, expected_y0, expected_x1, expected_y1); \
-} G_STMT_END
-#define NAUTILUS_CHECK_DIMENSIONS_RESULT(expression, expected_width, expected_height) \
-G_STMT_START { \
-	nautilus_before_check (#expression, __FILE__, __LINE__); \
-	nautilus_check_dimensions_result (expression, expected_width, expected_height); \
-} G_STMT_END
-
-void nautilus_exit_if_self_checks_failed (void);
-void nautilus_before_check_function      (const char         *name);
-void nautilus_after_check_function       (void);
-void nautilus_before_check               (const char         *expression,
-					  const char         *file_name,
-					  int                 line_number);
-void nautilus_check_boolean_result       (gboolean            result,
-					  gboolean            expected_value);
-void nautilus_check_integer_result       (long                result,
-					  long                expected_value);
-void nautilus_check_rectangle_result     (ArtIRect            result,
-					  int                 expected_x0,
-					  int                 expected_y0,
-					  int                 expected_x1,
-					  int                 expected_y1);
-void nautilus_check_dimensions_result    (NautilusDimensions  result,
-					  int                 expected_width,
-					  int                 expected_height);
-void nautilus_check_string_result        (char               *result,
-					  const char         *expected_value);
-
-#define NAUTILUS_SELF_CHECK_FUNCTION_PROTOTYPE(function) \
-	void function (void);
-
-#define NAUTILUS_CALL_SELF_CHECK_FUNCTION(function) \
-	nautilus_before_check_function (#function); \
-	function (); \
-	nautilus_after_check_function ();
-
-#endif /* NAUTILUS_SELF_CHECKS_H */
diff --git a/libnautilus-extensions/nautilus-sidebar-functions.c b/libnautilus-extensions/nautilus-sidebar-functions.c
index 1a64c67b8..e8ada756e 100644
--- a/libnautilus-extensions/nautilus-sidebar-functions.c
+++ b/libnautilus-extensions/nautilus-sidebar-functions.c
@@ -25,9 +25,9 @@
 #include <config.h>
 #include "nautilus-sidebar-functions.h"
 
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 #include "nautilus-preferences.h"
-#include "nautilus-string.h"
+#include <eel/eel-string.h>
 #include "nautilus-view-identifier.h"
 
 #include <liboaf/liboaf.h>
@@ -46,7 +46,7 @@ compare_view_identifiers (gconstpointer a, gconstpointer b)
  	idenfifier_a = (NautilusViewIdentifier*) a;
  	idenfifier_b = (NautilusViewIdentifier*) b;
 	
-	return nautilus_strcmp (idenfifier_a->name, idenfifier_b->name);
+	return eel_strcmp (idenfifier_a->name, idenfifier_b->name);
 }
 
 static gboolean
@@ -119,7 +119,7 @@ nautilus_sidebar_get_enabled_sidebar_panel_view_identifiers (void)
         
 	enabled_view_identifiers = sidebar_get_sidebar_panel_view_identifiers ();
 
-	enabled_view_identifiers = nautilus_g_list_partition (enabled_view_identifiers,
+	enabled_view_identifiers = eel_g_list_partition (enabled_view_identifiers,
 							      sidebar_is_sidebar_panel_enabled_cover,
 							      NULL,
 							      &disabled_view_identifiers);
diff --git a/libnautilus-extensions/nautilus-smooth-text-layout-cache.c b/libnautilus-extensions/nautilus-smooth-text-layout-cache.c
deleted file mode 100644
index b006334ed..000000000
--- a/libnautilus-extensions/nautilus-smooth-text-layout-cache.c
+++ /dev/null
@@ -1,767 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-smooth-text-layout-cache.c - A GtkObject subclass for efficiently rendering smooth text.
-
-   Copyright (C) 2001 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: John Harper <jsh@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-smooth-text-layout-cache.h"
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-smooth-text-layout.h"
-#include <gtk/gtkmain.h>
-#include <string.h>
-#include <memory.h>
-
-typedef struct CacheIndex CacheIndex;
-
-/* Define this to get some cache statistics printed */
-#undef TEST
-
-/* Detail member struct */
-struct NautilusSmoothTextLayoutCacheDetails
-{
-	/* Hash table mapping from CacheIndex* -> NautilusSmoothTextLayout* */
-	GHashTable *table;
-
-	/* Linked list containing all cached items, in MRU order */
-	CacheIndex *head, *tail;
-
-	/* Current total size of the cache. */
-	int total_size;
-
-	/* Maximum size of the cache */
-	int maximum_size;
-
-#ifdef TEST
-	int misses, hits;
-#endif
-};
-
-/* Structure used to index cached layouts */
-struct CacheIndex
-{
-	/* These two fields are used to chain the linked list whose
-	 * header is `head' and `tail' in the details structure.
-	 */
-	CacheIndex *next, *previous;
-
-	/* These are the keyed values */
-	NautilusScalableFont *font;
-	int font_size;
-	char *text;
-	int text_length;
-	gboolean wrap;
-	int line_spacing;
-	int max_text_width;
-};
-
-/* FIXME: Make this return the actual memory size, then change maximum_size */
-#define LAYOUT_SIZE(l) 1
-
-#define DEFAULT_MAXIMUM_SIZE 200
-
-/* GtkObjectClass methods */
-static void   nautilus_smooth_text_layout_cache_initialize_class (NautilusSmoothTextLayoutCacheClass  *smooth_text_layout_cache_class);
-static void   nautilus_smooth_text_layout_cache_initialize       (NautilusSmoothTextLayoutCache       *smooth_text_layout_cache);
-static void   nautilus_smooth_text_layout_cache_destroy          (GtkObject                           *object);
-
-
-/* Cache index handling */
-
-/* Allocate a new index structure. TEXT is copied, FONT is ref'd. */
-static CacheIndex *
-cache_index_new (NautilusScalableFont *font, int font_size,
-		 const char *text, int text_length,
-		 gboolean wrap, int line_spacing, int max_text_width)
-{
-	CacheIndex *index;
-
-	index = g_new (CacheIndex, 1);
-	gtk_object_ref (GTK_OBJECT (font));
-	index->font = font;
-	index->font_size = font_size;
-	index->text = g_memdup (text, text_length);
-	index->text_length = text_length;
-	index->wrap = wrap;
-	index->line_spacing = line_spacing;
-	index->max_text_width = max_text_width;
-
-	return index;
-}
-
-static void
-cache_index_free (CacheIndex *index)
-{
-	gtk_object_unref (GTK_OBJECT (index->font));
-	g_free (index->text);
-	g_free (index);
-}
-
-/* Compare two indices */
-static gint
-cache_index_equal (gconstpointer x, gconstpointer y)
-{
-	const CacheIndex *cx, *cy;
-
-	cx = x;
-	cy = y;
-
-	return (cx->font == cy->font
-		&& cx->font_size == cy->font_size
-		&& cx->wrap == cy->wrap
-		&& cx->line_spacing == cy->line_spacing
-		&& cx->max_text_width == cy->max_text_width
-		&& cx->text_length == cy->text_length
-		&& memcmp (cx->text, cy->text, cx->text_length) == 0);
-}
-
-static inline guint
-hash_string (const char *text, int length)
-{
-    guint value;
-    int index;
-
-    /* Use the classic K=33 hash function */
-    value = 0;
-    for (index = 0; index < length; index++) {
-	    value = (value * 33) + *text++;
-    }
-
-    return value;
-}
-
-/* Returns a hash value for the given index */
-static guint
-cache_index_hash (gconstpointer x)
-{
-	const CacheIndex *cx;
-
-	cx = x;
-
-	/* Is this a good hash function? */
-	return cx->font_size + hash_string (cx->text, cx->text_length);
-}
-
-
-/* Cache management */
-
-/* Insert INDEX as the MRU item in CACHE */
-static void
-cache_insert (NautilusSmoothTextLayoutCache *cache, CacheIndex *index)
-{
-	index->next = cache->details->head;
-	index->previous = NULL;
-	if (cache->details->head != NULL) {
-		cache->details->head->previous = index;
-	}
-	cache->details->head = index;
-	if (cache->details->tail == NULL) {
-		cache->details->tail = index;
-	}
-}
-
-/* Unlink INDEX from the list of items in CACHE */
-static void
-cache_remove (NautilusSmoothTextLayoutCache *cache, CacheIndex *index)
-{
-	if (index->next != NULL) {
-		index->next->previous = index->previous;
-	}
-	if (index->previous != NULL) {
-		index->previous->next = index->next;
-	}
-
-	if (cache->details->head == index) {
-		cache->details->head = index->next;
-	}
-	if (cache->details->tail == index) {
-		cache->details->tail = index->previous;
-	}
-
-	index->next = index->previous = NULL;
-}
-
-/* Add the mapping INDEX->LAYOUT into CACHE. Assumes ownership of LAYOUT. */
-static void
-cache_enter (NautilusSmoothTextLayoutCache *cache, CacheIndex *index,
-	     NautilusSmoothTextLayout *layout)
-{
-	g_hash_table_insert (cache->details->table, index, layout);
-	cache_insert (cache, index);
-	cache->details->total_size += LAYOUT_SIZE (layout);
-}
-
-/* Remove the mapping from INDEX from CACHE */
-static void
-cache_evict (NautilusSmoothTextLayoutCache *cache, CacheIndex *index)
-{
-	CacheIndex *key;
-	NautilusSmoothTextLayout *layout;
-
-	if (g_hash_table_lookup_extended (cache->details->table, index, (gpointer) &key, (gpointer) &layout)) {
-		g_hash_table_remove (cache->details->table, key);
-		cache_remove (cache, index);
-		cache_index_free (index);
-		cache->details->total_size -= LAYOUT_SIZE (layout);
-		gtk_object_unref (GTK_OBJECT (layout));
-	} else {
-		g_warning ("index not in layout cache!");
-	}
-}
-
-/* Return the layout associated with the given parameters, or null */
-static NautilusSmoothTextLayout *
-cache_lookup (NautilusSmoothTextLayoutCache *cache,
-	      NautilusScalableFont *font, int font_size,
-	      const char *text, int text_length,
-	      gboolean wrap, int line_spacing, int max_text_width,
-	      CacheIndex **index_ptr)
-{
-	CacheIndex index, *key;
-	NautilusSmoothTextLayout *layout;
-
-	index.font = font;
-	index.font_size = font_size;
-	index.text = (char *) text;
-	index.text_length = text_length;
-	index.wrap = wrap;
-	index.line_spacing = line_spacing;
-	index.max_text_width = max_text_width;
-
-	if (g_hash_table_lookup_extended (cache->details->table, &index, (gpointer) &key, (gpointer) &layout)) {
-		if (index_ptr != NULL) {
-			*index_ptr = key;
-		}
-		return layout;
-	} else {
-		return NULL;
-	}
-}
-
-/* Remove the oldest items from CACHE until it's less than its maximum size */
-static inline void
-cache_trim (NautilusSmoothTextLayoutCache *cache)
-{
-#ifdef TEST
-	int old_size;
-	old_size = cache->details->total_size;
-#endif
-
-	while (cache->details->total_size > cache->details->maximum_size) {
-		g_assert (cache->details->tail != NULL);
-		cache_evict (cache, cache->details->tail);
-	}
-
-#ifdef TEST
-	if (old_size != cache->details->total_size) {
-		g_message ("cache %p: evicted %d entries (%d left)", cache,
-			   old_size - cache->details->total_size,
-			   cache->details->total_size);
-	}
-#endif
-}
-
-
-/* Public entrypoints */
-
-/**
- * nautilus_smooth_text_layout_cache_render:
- * @cache: The layout cache being queried
- * @text: The string to be rendered
- * @text_length: The number of bytes to draw
- * @font: The desired smooth font.
- * @font_size: The pixel size of the font
- * @wrap:
- * @line_spacing:
- * @max_text_width: Requested parameters of the Layout
- *
- * Returns a NautilusSmoothTextLayout. It should be unref'd when
- * finished with; none of the fields may be modified by the caller.
- *
- */
-NautilusSmoothTextLayout *
-nautilus_smooth_text_layout_cache_render (NautilusSmoothTextLayoutCache *cache,
-					  const char *text, int text_length,
-					  NautilusScalableFont *font, int font_size,
-					  gboolean wrap, int line_spacing, int max_text_width)
-{
-	NautilusSmoothTextLayout *layout;
-	CacheIndex *index;
-
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT_CACHE (cache), NULL);
-	g_return_val_if_fail (text != NULL, NULL);
-	g_return_val_if_fail (font != NULL, NULL);
-
-	layout = cache_lookup (cache,
-			       font, font_size,
-			       text, text_length,
-			       wrap, line_spacing, max_text_width,
-			       &index);
-
-	if (layout != NULL) {
-		if (cache->details->head != index) {
-			cache_remove (cache, index);
-			cache_insert (cache, index);
-		}
-#ifdef TEST
-		cache->details->hits++;
-#endif
-	} else {
-		layout = nautilus_smooth_text_layout_new (text, text_length,
-							  font, font_size,
-							  wrap);
-		if (layout == NULL) {
-			return NULL;
-		}
-
-		nautilus_smooth_text_layout_set_line_spacing (layout, line_spacing);
-		nautilus_smooth_text_layout_set_line_wrap_width (layout, max_text_width);
-		cache_trim (cache);
-		
-		index = cache_index_new (font, font_size,
-					 text, text_length,
-					 wrap, line_spacing, max_text_width);
-		cache_enter (cache, index, layout);
-
-#ifdef TEST
-		cache->details->misses++;
-#endif
-	}
-
-	gtk_object_ref (GTK_OBJECT (layout));
-	return layout;
-}
-
-
-/* GtkObject stuff */
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSmoothTextLayoutCache, nautilus_smooth_text_layout_cache, GTK_TYPE_OBJECT)
-
-NautilusSmoothTextLayoutCache *
-nautilus_smooth_text_layout_cache_new (void)
-{
-	NautilusSmoothTextLayoutCache *cache;
-
-	cache = NAUTILUS_SMOOTH_TEXT_LAYOUT_CACHE (gtk_object_new (nautilus_smooth_text_layout_cache_get_type (), NULL));
-	gtk_object_ref (GTK_OBJECT (cache));
-	gtk_object_sink (GTK_OBJECT (cache));
-
-	cache->details->maximum_size = DEFAULT_MAXIMUM_SIZE;
-
-	return cache;
-}
-
-static void
-nautilus_smooth_text_layout_cache_initialize_class (NautilusSmoothTextLayoutCacheClass *smooth_text_layout_cache_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (smooth_text_layout_cache_class);
-	
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_smooth_text_layout_cache_destroy;
-}
-
-static void
-nautilus_smooth_text_layout_cache_initialize (NautilusSmoothTextLayoutCache *smooth_text_layout_cache)
-{
-	smooth_text_layout_cache->details = g_new0 (NautilusSmoothTextLayoutCacheDetails, 1);
-	smooth_text_layout_cache->details->table = g_hash_table_new (cache_index_hash, cache_index_equal);
-}
-
-static void
-free_one_cache_entry (gpointer key, gpointer value, gpointer data)
-{
-	CacheIndex *index;
-	NautilusSmoothTextLayout *layout;
-
-	index = key;
-	layout = value;
-
-	cache_index_free (key);
-	gtk_object_unref (GTK_OBJECT (layout));
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_smooth_text_layout_cache_destroy (GtkObject *object)
-{
- 	NautilusSmoothTextLayoutCache *cache;
-
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT_CACHE (object));
-
-	cache = NAUTILUS_SMOOTH_TEXT_LAYOUT_CACHE (object);
-
-	g_hash_table_foreach (cache->details->table, free_one_cache_entry, NULL);
-	g_hash_table_destroy (cache->details->table);
-
-	g_free (cache->details);
-
-	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-
-/* Test harness
- *
- * The test works as follows:
- *
- * 0. Seed the random number generator with a constant value
- *
- * 1. Construct TOTAL_CASES/2 random test cases. Each has a random
- *    number of lines and a random number of words in each line. All
- *    the other parameters are also generated randomly.
- *
- * 2. In the second half of the test case array, randomly pick an entry
- *    from the first half and randomly change some parameters
- *
- * 3. Iterate TOTAL_TESTS times picking a random string, fetching its
- *    SmoothTextLayout object using both uncaching and caching
- *    functions, comparing the results (compares all fields in the
- *    structures, and their image buffers)
- */
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-#include "nautilus-debug.h"
-#include "nautilus-self-checks.h"
-#include <stdlib.h>
-#include <stdio.h>
-
-static NautilusSmoothTextLayoutCache *test_cache;
-static NautilusScalableFont *test_font;
-
-/* This is every 100th word from my /usr/share/dict/words file */
-static char *test_words[] = {
-	"abler", "absolve", "acceptances", "acculturating",
-	"acquisitions", "adaptors", "adjure", "adrenaline", "Aeolus",
-	"aforesaid", "agitations", "airplane", "Alexandre",
-	"Allentown", "alphabetize", "Amazon", "amortize", "anaphora",
-	"Angles", "annual", "anticipated", "apex", "appertain",
-	"approbation", "archaicness", "aristocracy", "arrests",
-	"ascensions", "assaults", "assurances", "Atlantis", "attire",
-	"aura", "automation", "avouch", "babyhood", "Baffin", "balled",
-	"bankrupting", "Barney", "basket", "Baylor", "beaver",
-	"beforehand", "belies", "beneficiaries", "berths",
-	"bewilderingly", "bilingual", "birdbath", "Blackfoot",
-	"bleacher", "Blomquist", "blushes", "boilerplate",
-	"bookkeeper", "bossed", "bowing", "branching", "breaks",
-	"Bridgewater", "broadcastings", "browsing", "Buenos", "bumps",
-	"Burmese", "butterball", "cabs", "callable", "cancel",
-	"capability", "carbonizes", "carriages", "casts", "cautioner",
-	"centaur", "chalices", "chargeable", "checkbook", "Chicanos",
-	"choir", "chuckles", "circuses", "classes", "cliches",
-	"closing", "coating", "cogitated", "colleges", "comedic",
-	"commonalities", "compensatory", "comprehensibility",
-	"conceptualized", "confectionery", "confusion", "Conrail",
-	"constant", "contemplative", "contribute", "convinces",
-	"coquette", "correspond", "councilwoman", "courtrooms",
-	"cramps", "creditor", "croaks", "crumpled", "cultivable",
-	"curtly", "cytoplasm", "dangle", "Davy", "debtor", "declarer",
-	"deep", "defy", "delirious", "Denebola", "deploy",
-	"descriptively", "destructiveness", "deviation", "diarrhea",
-	"diggings", "Diogenes", "disapprove", "discovery", "disk",
-	"displeasing", "distastes", "diverting", "doghouse", "dopers",
-	"downstairs", "dreamers", "drudgery", "dungeons", "dynamism",
-	"eaves", "educating", "ejecting", "elevation", "emancipate",
-	"emphasizing", "encounter", "Engels", "enriches", "enumerated",
-	"equates", "errs", "Ethernets", "Everglades", "exceeded",
-	"executional", "expect", "explosive", "extract", "facsimile",
-	"Falmouth", "Farrell", "Fayette", "feminism", "fibrously",
-	"filthy", "firming", "flamer", "flew", "floweriness", "folksy",
-	"forefathers", "formatively", "founds", "fray", "Freudianism",
-	"Fruehauf", "furlong", "galaxy", "garlanded", "gearing",
-	"geological", "giggle", "glazed", "Glynn", "Goodyear",
-	"gradual", "grassiest", "greeter", "grooved", "gubernatorial",
-	"guts", "hallmark", "handy", "harmfulness", "Hattie", "Healy",
-	"heights", "heralds", "Heuser", "hindered", "hobby", "homing",
-	"Horace", "housetop", "humorers", "Hyde", "identify",
-	"imagine", "impenetrable", "impotence", "inane",
-	"incompletely", "indescribable", "inductances", "inferior",
-	"ingeniousness", "injured", "insertion", "institutes",
-	"intensification", "interleaved", "interstate", "intubation",
-	"invoked", "irreversibility", "itemizations", "Janus",
-	"Jesuitizing", "Jordan", "Julie", "Kant", "keypad",
-	"Kinnickinnic", "knots", "labyrinths", "landings", "later",
-	"layers", "lectures", "leniency", "Lexington", "lighthearted",
-	"lingerie", "littering", "Lockwood", "looms", "loves",
-	"luring", "Mackey", "maids", "Malone", "Mann", "maritime",
-	"maskable", "matrix", "McDonnell", "medal", "melodies",
-	"mercenariness", "meteoritic", "microprocessing", "milk",
-	"minima", "miserably", "MITREs", "module", "monkeyed", "moped",
-	"motherland", "muck", "mumbles", "mutability", "names",
-	"naughtiness", "negatives", "Neva", "nihilism",
-	"nondeterminism", "north", "novices", "oases", "obstruction",
-	"odious", "oleomargarine", "operate", "orbital", "Orleans",
-	"outburst", "overboard", "oversized", "packaged", "palliative",
-	"parades", "pares", "partitioned", "patients", "payoffs",
-	"Peking", "perceived", "permeating", "perspiration", "phaser",
-	"phyla", "piggybacked", "pipelining", "Plainfield", "playing",
-	"plundered", "police", "pop", "position", "pottery",
-	"preallocated", "predictive", "preposterously", "pretexts",
-	"prior", "procurer", "projections", "properly", "protecting",
-	"proximal", "puffed", "purges", "Pythagoreanizes",
-	"quartering", "quince", "radiography", "rams", "rasping",
-	"reacted", "reasonings", "receives", "recommend", "recursing",
-	"reelects", "reformulated", "regrettable", "rejoiced",
-	"reloader", "rendezvous", "repetitious", "reproducibilities",
-	"resentment", "responded", "retailing", "retype", "revoked",
-	"Richmond", "Riordan", "Roberta", "roofing", "rounding",
-	"ruggedness", "ruthlessness", "sails", "sanatorium", "satires",
-	"Scala", "schemers", "scorner", "scripts", "seat", "seeming",
-	"semipermanently", "sequentially", "severance", "Shanghaied",
-	"Shelley", "shiver", "showed", "sicken", "silent", "sinews",
-	"sixties", "sky", "sleighs", "sluggishness", "smoothing",
-	"snorkel", "sofas", "Somerset", "soured", "sparsely",
-	"speculates", "spirituals", "sportswriter", "squadrons",
-	"stagers", "star", "steadier", "sterilizer", "stirrer",
-	"stouter", "streetcar", "strontium", "Styx", "subprogram",
-	"subtleness", "suffocated", "Sumter", "suppers", "surround",
-	"swat", "swivel", "synonymously", "Taipei", "tapestry",
-	"teaches", "televise", "tenure", "Thailand", "Thessaly",
-	"threatens", "tickles", "tingling", "tolerable", "torrent",
-	"tracked", "transferal", "trapezoidal", "tribunals", "Trotsky",
-	"tuft", "twenty", "umbrage", "unconditional", "undertakings",
-	"ungratefully", "unkindness", "unraveling", "unused", "urge",
-	"vacuumed", "variably", "Venetian", "vested", "vignettes",
-	"visited", "vouching", "Walgreen", "warning", "wavelength",
-	"Weidman", "wharves", "whitens", "wile", "Winsett",
-	"womanhood", "worldliness", "writ", "yelped", "Zionism",
-};
-
-struct test_case {
-	char *string;
-	int font_size;
-	gboolean wrap;
-	int line_spacing;
-	int max_text_width;
-};
-
-#define N_TEST_WORDS (sizeof (test_words) / sizeof (char *))
-
-#define MIN_WORDS_PER_LINE 1
-#define MAX_WORDS_PER_LINE 8
-
-#define MIN_LINES 1
-#define MAX_LINES 10
-
-#define MIN_FONT_SIZE 8
-#define MAX_FONT_SIZE 48
-
-#define MIN_LINE_SPACING 0
-#define MAX_LINE_SPACING 24
-
-#define MIN_MAX_TEXT_WIDTH 50
-#define MAX_MAX_TEXT_WIDTH 512
-
-/* I chose 1 1/2 here so that we get both cache reuse and ejection */
-#define TOTAL_CASES ((DEFAULT_MAXIMUM_SIZE * 3) / 2)
-
-/* I'd prefer to do more than 2, here. But it takes too long */
-#define DEFAULT_TOTAL_TESTS (TOTAL_CASES * 2)
-
-static int
-random_integer (int min, int max)
-{
-	int divisor, limit, value;
-	
-	limit = max - min;
-	divisor = RAND_MAX / limit;
-
-	do {
-		value = random () / divisor;
-	} while (value >= limit);
-
-	return min + value;
-}
-
-static gboolean
-random_boolean (void)
-{
-	return random () > (RAND_MAX / 2);
-}
-
-static inline const char *
-random_word (void)
-{
-	return test_words [random_integer (0, N_TEST_WORDS)];
-}
-
-static char *
-local_stpcpy (char *dst, const char *src)
-{
-	while ((*dst++ = *src++) != 0) {
-	}
-	return dst - 1;
-}
-
-static char *
-make_random_string (void)
-{
-	char *string, *ptr;
-	int x, y;
-	int width, height;
-	const char *words[MAX_LINES][MAX_WORDS_PER_LINE+1];
-        int string_length;
-
-	height = random_integer (MIN_LINES, MAX_LINES);
-	string_length = height;	/* newlines */
-	for (y = 0; y < height; y++) {
-		width = random_integer (MIN_WORDS_PER_LINE,
-					MAX_WORDS_PER_LINE);
-		string_length += width - 1;	/* spaces */
-		for (x = 0; x < width; x++) {
-			words[y][x] = random_word ();
-			string_length += strlen (words[y][x]);
-		}
-		words[y][x] = NULL;
-	}
-
-	string = g_new (gchar, string_length + 1);
-	ptr = string;
-	for (y = 0; y < height; y++) {
-		for (x = 0; words[y][x] != NULL; x++) {
-			if (x != 0) {
-				*ptr++ = ' ';
-			}
-			ptr = local_stpcpy (ptr, words[y][x]);
-		}
-		*ptr++ = '\n';
-	}
-	*ptr = '\0';
-
-	return string;
-}
-
-static void
-make_random_test_case (struct test_case *test)
-{
-	test->string = make_random_string ();
-	test->font_size = random_integer (MIN_FONT_SIZE, MAX_FONT_SIZE);
-	test->wrap = random_boolean ();
-	test->line_spacing = random_integer (MIN_LINE_SPACING,
-					     MAX_LINE_SPACING);
-	test->max_text_width = random_integer (MIN_MAX_TEXT_WIDTH,
-					       MAX_MAX_TEXT_WIDTH);
-}
-
-static void
-randomize_test_case (struct test_case *dest, struct test_case *src)
-{
-	dest->string =  random_boolean () ? g_strdup (src->string) : make_random_string ();
-	dest->font_size = (random_boolean () ? src->font_size
-			   : random_integer (MIN_FONT_SIZE, MAX_FONT_SIZE));
-	dest->wrap = random_boolean ();
-	dest->line_spacing = (random_boolean () ? src->line_spacing
-			      : random_integer (MIN_LINE_SPACING, MAX_LINE_SPACING));
-	dest->max_text_width = (random_boolean () ? src->max_text_width
-				: random_integer (MIN_MAX_TEXT_WIDTH, MAX_MAX_TEXT_WIDTH));
-}
-
-static void
-free_test_case (struct test_case *test)
-{
-	g_free (test->string);
-}
-
-static gboolean
-check_one (struct test_case *test)
-{
-	NautilusSmoothTextLayout *a, *b;
-	gboolean result;
-
-	g_assert (test_cache != NULL);
-	g_assert (test->string != NULL);
-
-	a = nautilus_smooth_text_layout_cache_render (test_cache,
-						      test->string,
-						      strlen (test->string),
-						      test_font,
-						      test->font_size,
-						      test->wrap,
-						      test->line_spacing,
-						      test->max_text_width);
-	g_assert (a != NULL);
-
-	b = nautilus_smooth_text_layout_new (test->string,
-					     strlen (test->string),
-					     test_font,
-					     test->font_size,
-					     test->wrap);
-	g_assert (b != NULL);
-	nautilus_smooth_text_layout_set_line_spacing (b, test->line_spacing);
-	nautilus_smooth_text_layout_set_line_wrap_width (b, test->max_text_width);
-
-	result = nautilus_smooth_text_layout_compare (a, b);
-
-	gtk_object_unref (GTK_OBJECT (a));
-	gtk_object_unref (GTK_OBJECT (b));
-
-	return result;
-}
-
-void
-nautilus_self_check_smooth_text_layout_cache (void)
-{
-	struct test_case cases[TOTAL_CASES];
-	int i, index;
-	int total_tests;
-	char *tem;
-
-	test_cache = nautilus_smooth_text_layout_cache_new ();
-	test_font = nautilus_scalable_font_get_default_font ();
-
-	/* decide how many tests we're going to do.. */
-	tem = getenv ("NAUTILUS_LAYOUT_CACHE_TESTS");
-	if (tem != NULL) {
-		total_tests = strtol (tem, 0, 0);
-		total_tests = MAX (total_tests, DEFAULT_TOTAL_TESTS);
-	} else {
-		total_tests = DEFAULT_TOTAL_TESTS;
-	}
-
-	/* initialize the random number generator to a known state */
-	srandom (1);
-
-	for (i = 0; i < TOTAL_CASES/2; i++) {
-		make_random_test_case (cases + i);
-	}
-	for (; i < TOTAL_CASES; i++) {
-		randomize_test_case (cases + i, cases + (i - TOTAL_CASES / 2));
-	}
-
-	for (i = 0; i < total_tests; i++) {
-		index = random_integer (0, TOTAL_CASES);
-		if (!check_one (cases + index)) {
-			/* hmm.. */
-			fprintf (stderr, "\nNautilusSmoothTextLayoutCache test %d failed\n", i);
-			NAUTILUS_CHECK_BOOLEAN_RESULT (FALSE, TRUE);
-		}
-	}
-
-	for (i = 0; i < TOTAL_CASES; i++) {
-		free_test_case (cases + i);
-	}
-
-	gtk_object_unref (GTK_OBJECT (test_font));
-	gtk_object_unref (GTK_OBJECT (test_cache));
-}
-
-#endif /* NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-smooth-text-layout-cache.h b/libnautilus-extensions/nautilus-smooth-text-layout-cache.h
deleted file mode 100644
index c9a1c6059..000000000
--- a/libnautilus-extensions/nautilus-smooth-text-layout-cache.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-smooth-text-layout-cache.h - A GtkObject subclass for efficiently rendering smooth text.
-
-   Copyright (C) 2001 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: John Harper <jsh@eazel.com>
-*/
-
-#ifndef NAUTILUS_SMOOTH_TEXT_LAYOUT_CACHE_H
-#define NAUTILUS_SMOOTH_TEXT_LAYOUT_CACHE_H
-
-#include <gtk/gtkobject.h>
-#include <libgnome/gnome-defs.h>
-#include <libnautilus-extensions/nautilus-smooth-text-layout.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT_CACHE		  (nautilus_smooth_text_layout_cache_get_type ())
-#define NAUTILUS_SMOOTH_TEXT_LAYOUT_CACHE(obj)		  (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT_CACHE, NautilusSmoothTextLayoutCache))
-#define NAUTILUS_SMOOTH_TEXT_LAYOUT_CACHE_CLASS(klass)	  (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT_CACHE, NautilusSmoothTextLayoutCacheClass))
-#define NAUTILUS_IS_SMOOTH_TEXT_LAYOUT_CACHE(obj)	  (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT_CACHE))
-#define NAUTILUS_IS_SMOOTH_TEXT_LAYOUT_CACHE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT_CACHE))
-
-typedef struct NautilusSmoothTextLayoutCache        NautilusSmoothTextLayoutCache;
-typedef struct NautilusSmoothTextLayoutCacheClass   NautilusSmoothTextLayoutCacheClass;
-typedef struct NautilusSmoothTextLayoutCacheDetails NautilusSmoothTextLayoutCacheDetails;
-
-struct NautilusSmoothTextLayoutCache
-{
-	/* Superclass */
-	GtkObject object;
-
-	/* Private things */
-	NautilusSmoothTextLayoutCacheDetails *details;
-};
-
-struct NautilusSmoothTextLayoutCacheClass
-{
-	GtkObjectClass parent_class;
-};
-
-GtkType                           nautilus_smooth_text_layout_cache_get_type (void);
-NautilusSmoothTextLayoutCache    *nautilus_smooth_text_layout_cache_new      (void);
-NautilusSmoothTextLayout	 *nautilus_smooth_text_layout_cache_render   (NautilusSmoothTextLayoutCache *cache,
-									      const char		    *text,
-									      int			     text_length,
-									      NautilusScalableFont	    *font,
-									      int			     font_size,
-									      gboolean			     wrap,
-									      int			     line_spacing,
-									      int			     max_text_width);
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-void				  nautilus_self_check_smooth_text_layout_cache (void);
-#endif /* NAUTILUS_OMIT_SELF_CHECK */
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_SMOOTH_TEXT_LAYOUT_CACHE_H */
diff --git a/libnautilus-extensions/nautilus-smooth-text-layout.c b/libnautilus-extensions/nautilus-smooth-text-layout.c
deleted file mode 100644
index 52fcb3dd2..000000000
--- a/libnautilus-extensions/nautilus-smooth-text-layout.c
+++ /dev/null
@@ -1,1289 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-smooth-text-layout.c - A GtkObject subclass for dealing with smooth text.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-smooth-text-layout.h"
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-string.h"
-#include "nautilus-glyph.h"
-#include "nautilus-debug-drawing.h"
-
-#include <libgnome/gnome-i18n.h>
-
-#define MIN_FONT_SIZE 5
-#define DEFAULT_LINE_SPACING 0
-#define DEFAULT_FONT_SIZE 14
-
-#define UNDEFINED_DIMENSION -1
-
-/* This magic string is copied from GtkLabel.  It lives there unlocalized as well. */
-#define DEFAULT_LINE_WRAP_WIDTH_TEXT "This is a good enough length for any line to have."
-
-#define DEFAULT_LINE_BREAK_CHARACTERS _(" -_,;.?/&")
-
-/* Detail member struct */
-struct NautilusSmoothTextLayoutDetails
-{
-	NautilusDimensions dimensions;
-
-	char *text;
-	int text_length;
-
- 	/* Smooth attributes */
- 	NautilusScalableFont *font;
- 	int font_size;
- 	int line_spacing;
- 	int empty_line_height;
-
-	/* Text lines */
-	GList *text_line_list;
-	int max_line_width;
-	int num_empty_lines;
-	int line_wrap_width;
-	int total_line_height;
-	
-	gboolean wrap;
-	char *line_break_characters;
-};
-
-/* GtkObjectClass methods */
-static void   nautilus_smooth_text_layout_initialize_class (NautilusSmoothTextLayoutClass  *smooth_text_layout_class);
-static void   nautilus_smooth_text_layout_initialize       (NautilusSmoothTextLayout       *smooth_text_layout);
-static void   nautilus_smooth_text_layout_destroy          (GtkObject                      *object);
-
-/* Private functions */
-static void   smooth_text_layout_set_text                  (NautilusSmoothTextLayout       *smooth_text_layout,
-							    const char                     *text,
-							    int                             text_length);
-static void   smooth_text_layout_clear_lines               (NautilusSmoothTextLayout       *smooth_text_layout);
-static void   smooth_text_layout_ensure_lines              (const NautilusSmoothTextLayout *smooth_text_layout);
-static int    smooth_text_layout_get_num_empty_lines       (const NautilusSmoothTextLayout *smooth_text_layout);
-static int    smooth_text_layout_get_empty_line_height     (const NautilusSmoothTextLayout *smooth_text_layout);
-static int    smooth_text_layout_get_max_line_width        (const NautilusSmoothTextLayout *smooth_text_layout);
-static int    smooth_text_layout_get_total_line_height     (const NautilusSmoothTextLayout *smooth_text_layout);
-static int    smooth_text_layout_get_line_wrap_width       (const NautilusSmoothTextLayout *smooth_text_layout);
-static GList *smooth_text_layout_line_list_new             (const char                     *text,
-							    int                             text_length,
-							    NautilusScalableFont           *font,
-							    int                             font_size);
-static void   smooth_text_layout_line_list_free            (GList                          *smooth_line_list);
-void          smooth_text_layout_line_list_draw_to_pixbuf  (GList                          *smooth_line_list,
-							    GdkPixbuf                      *pixbuf,
-							    int                             x,
-							    int                             y,
-							    GtkJustification                justification,
-							    gboolean                        underlined,
-							    int                             empty_line_height,
-							    int                             max_line_width,
-							    int                             line_spacing,
-							    guint32                         color,
-							    int                             opacity);
-static GList *smooth_text_layout_line_list_new_wrapped     (const char                     *text,
-							    int                             text_length,
-							    NautilusScalableFont           *font,
-							    int                             font_size,
-							    int                             max_width,
-							    const char                     *line_break_characters);
-
-/*
- * The following text_layout stuff was shamelessly plundered
- * from libgnomeui/gnome-icon-text.[ch] by Federico Mena.
- *
- * It was hacked to use NautilusScalableFont and GdkPixbuf
- * instead of GdkFont and GdkDrawable.  We want to use the
- * same layout algorithm in Nautilus so that both the smooth
- * and not smooth text rendering cases have predictably 
- * similar result.
- *
- * I also made some minor Nautilus-like style changes. -re
-
- */
-typedef struct
-{
-	char *text;
-	int width;
-	guint text_length;
-} NautilusTextLayoutRow;
-
-typedef struct
-{
-	GList *rows;
-	const NautilusScalableFont *font;
-	int font_size;
-	int width;
-	int height;
-	int baseline_skip;
-} NautilusTextLayout;
-
-NautilusTextLayout *nautilus_text_layout_new   (const NautilusScalableFont *font,
-						int                         font_size,
-						const char                 *text,
-						const char                 *separators,
-						int                         max_width,
-						gboolean                    confine);
-void                nautilus_text_layout_free  (NautilusTextLayout         *text_info);
-					    
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSmoothTextLayout, nautilus_smooth_text_layout, GTK_TYPE_OBJECT)
-
-/* Class init methods */
-static void
-nautilus_smooth_text_layout_initialize_class (NautilusSmoothTextLayoutClass *smooth_text_layout_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (smooth_text_layout_class);
-	
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_smooth_text_layout_destroy;
-}
-
-void
-nautilus_smooth_text_layout_initialize (NautilusSmoothTextLayout *smooth_text_layout)
-{
-	smooth_text_layout->details = g_new0 (NautilusSmoothTextLayoutDetails, 1);
-	smooth_text_layout->details->line_break_characters = g_strdup (DEFAULT_LINE_BREAK_CHARACTERS);
-	smooth_text_layout->details->font = nautilus_scalable_font_get_default_font ();
-	smooth_text_layout->details->font_size = DEFAULT_FONT_SIZE;
-	smooth_text_layout->details->line_spacing = DEFAULT_LINE_SPACING;
-	smooth_text_layout_clear_lines (smooth_text_layout);
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_smooth_text_layout_destroy (GtkObject *object)
-{
- 	NautilusSmoothTextLayout *smooth_text_layout;
-
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (object));
-
-	smooth_text_layout = NAUTILUS_SMOOTH_TEXT_LAYOUT (object);
-
-	smooth_text_layout_clear_lines (smooth_text_layout);
-	/* FIXME: it seems like we should unref the font here. */
-	g_free (smooth_text_layout->details->line_break_characters);
-	g_free (smooth_text_layout->details->text);
-
-	g_free (smooth_text_layout->details);
-
-	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-/* Private NautilusSmoothTextLayout functions */
-static void
-smooth_text_layout_clear_lines (NautilusSmoothTextLayout *smooth_text_layout)
-{
-
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-
-	smooth_text_layout_line_list_free (smooth_text_layout->details->text_line_list);
-	smooth_text_layout->details->text_line_list = NULL;
-	smooth_text_layout->details->dimensions.width = UNDEFINED_DIMENSION;
-	smooth_text_layout->details->dimensions.height = UNDEFINED_DIMENSION;
-	smooth_text_layout->details->max_line_width = UNDEFINED_DIMENSION;
-	smooth_text_layout->details->num_empty_lines = UNDEFINED_DIMENSION;
-	smooth_text_layout->details->empty_line_height = UNDEFINED_DIMENSION;
-	smooth_text_layout->details->line_wrap_width = UNDEFINED_DIMENSION;
-	smooth_text_layout->details->total_line_height = UNDEFINED_DIMENSION;
-
-}
-
-static void
-smooth_text_layout_ensure_lines (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-
-	if (smooth_text_layout->details->text_line_list != NULL) {
-		return;
-	}
-	
-	/* We cheat a little here.  Pretend text_line_list or wrap_text_layouts are mutable */
-	if (smooth_text_layout->details->wrap) {
-		smooth_text_layout->details->text_line_list = 
-			smooth_text_layout_line_list_new_wrapped (smooth_text_layout->details->text,
-								  smooth_text_layout->details->text_length,
-								  smooth_text_layout->details->font,
-								  smooth_text_layout->details->font_size,
-								  smooth_text_layout_get_line_wrap_width (smooth_text_layout),
-								  smooth_text_layout->details->line_break_characters);
-	} else {
-		smooth_text_layout->details->text_line_list = 
-			smooth_text_layout_line_list_new (smooth_text_layout->details->text,
-							  smooth_text_layout->details->text_length,
-							  smooth_text_layout->details->font,
-							  smooth_text_layout->details->font_size);
-	}
-}
-
-static GList *
-smooth_text_layout_line_list_new (const char *text,
-				  int text_length,
-				  NautilusScalableFont *font,
-				  int font_size)
-{
-	GList *line_list = NULL;
-	const char *line;
-	const char *end;
-
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), NULL);
-	g_return_val_if_fail (text_length >= 0, NULL);
-	g_return_val_if_fail (font_size >= MIN_FONT_SIZE, NULL);
-
-	end = text + text_length;
-	
-	line = text;
-
-	while (line != NULL && line <= end) {
-		const char *next_line;
-		int length;
-		NautilusGlyph *glyph = NULL;
-
-		next_line = strchr (line, '\n');
-
-		if (next_line != NULL) {
-			length = next_line - line;
-		} else {
-			length = end - line;
-		}
-
-		g_assert (length >= 0);
-
-		if (length > 0) {
-			glyph = nautilus_glyph_new (font, font_size, line, length);
-		}
-
-		line_list = g_list_append (line_list, glyph);
-
-		if (next_line != NULL) {
-			line = next_line + 1;
-		}
-		else {
-			line = NULL;
-		}
-	}
-
-	return line_list;
-}
-
-static void
-smooth_text_layout_line_list_free (GList *smooth_line_list)
-{
-	GList *node;
-
-	node = smooth_line_list;
-	while (node) {
-		if (node->data != NULL) {
-			nautilus_glyph_free (node->data);
-		}
-		node = node->next;
-	}
-
-	g_list_free (smooth_line_list);
-}
-
-void
-smooth_text_layout_line_list_draw_to_pixbuf (GList *text_line_list,
-					     GdkPixbuf *pixbuf,
-					     int x,
-					     int y,
-					     GtkJustification justification,
-					     gboolean underlined,
-					     int empty_line_height,
-					     int max_line_width,
-					     int line_spacing,
-					     guint32 color,
-					     int opacity)
-{
- 	GList *node;
-
-	g_return_if_fail (text_line_list != NULL);
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (justification >= GTK_JUSTIFY_LEFT && justification <= GTK_JUSTIFY_FILL);
-	g_return_if_fail (empty_line_height > 0);
-	g_return_if_fail (max_line_width > 0);
-	g_return_if_fail (line_spacing >= 0);
-
-	/* FIXME bugzilla.eazel.com 5087: Make sure the color we are fed is opaque.  The real solution is 
-	 * to fix the callers.
-	 */
-	color = color | 0xFF000000;
-
- 	node = text_line_list;
- 	while (node) {
- 		if (node->data != NULL) {
-			NautilusGlyph *glyph;
-			int text_x = 0;
-			int text_y = 0;
-
-			glyph = node->data;
-
-			g_assert (max_line_width >= nautilus_glyph_get_width (glyph));
-
-			switch (justification) {
-			case GTK_JUSTIFY_LEFT:
-				text_x = x;
-				break;
-				
-			case GTK_JUSTIFY_CENTER:
-			case GTK_JUSTIFY_FILL:
-				text_x = x + (max_line_width - nautilus_glyph_get_width (glyph)) / 2;
-				break;
-
-			case GTK_JUSTIFY_RIGHT:
-				text_x = x + (max_line_width - nautilus_glyph_get_width (glyph));
-				break;
-				
-			default:
-				g_assert_not_reached ();
-				text_x = x;
-			}
-			
-			text_y = y;
-			
-			nautilus_glyph_draw_to_pixbuf (glyph, pixbuf, text_x, text_y, NULL, color, opacity);
-
-			/* Underline the text if needed */
-			if (underlined) {
-				ArtIRect underline_rect;
-
-				nautilus_glyph_get_underline_rectangle (glyph, &underline_rect);
-				underline_rect.y0 += text_y;
-				underline_rect.y1 += text_y;
-				underline_rect.x0 += text_x;
-				underline_rect.x1 += text_x;
-				nautilus_gdk_pixbuf_fill_rectangle_with_color (pixbuf,
-									       &underline_rect,
-									       color);
-			}
-			
-			y += nautilus_glyph_get_height (glyph) + line_spacing;
- 		} else {
-			y += empty_line_height;
-		}
- 		node = node->next;
- 	}
-}
-
-static GList *
-smooth_text_layout_line_list_new_wrapped (const char *text,
-					  int text_length,
-					  NautilusScalableFont *font,
-					  int font_size,
-					  int max_width,
-					  const char *line_break_characters)
-{
-	GList *line_list = NULL;
-	GList *layout_list = NULL;
-	GList *layout_node;
-	const char *line;
-	const char *end;
-
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), NULL);
-	g_return_val_if_fail (text_length >= 0, NULL);
-	g_return_val_if_fail (font_size >= MIN_FONT_SIZE, NULL);
-	g_return_val_if_fail (max_width > 0, NULL);
-	g_return_val_if_fail (line_break_characters != NULL, NULL);
-	g_return_val_if_fail (line_break_characters[0] != '\0', NULL);
-
-	end = text + text_length;
-	line = text;
-
-	while (line != NULL && line <= end) {
-		/* NULL layout means empty line */
-		NautilusTextLayout *layout = NULL;
-		const char *next_line;
-		int length;
-		next_line = strchr (line, '\n');
-
-		if (next_line != NULL) {
-			length = next_line - line;
-		} else {
-			length = end - line;
-		}
-
-		g_assert (length >= 0);
-
-		if (length > 0) {
-			char *null_terminated_line;
-			null_terminated_line = g_strndup (line, length);
-			layout = nautilus_text_layout_new (font,
-							   font_size,
-							   null_terminated_line,
-							   line_break_characters,
-							   max_width,
-							   TRUE);
-			g_free (null_terminated_line);
-		}
-
-		layout_list = g_list_append (layout_list, layout);
-
-		if (next_line != NULL) {
-			line = next_line + 1;
-		}
-		else {
-			line = NULL;
-		}
-	}
-
-	layout_node = layout_list;
-	while (layout_node != NULL) {
-		if (layout_node->data != NULL) {
-			NautilusTextLayout *layout;
-			GList *layout_row_node;
-			g_assert (layout_node->data != NULL);
-			layout = layout_node->data;
-			
-			layout_row_node = layout->rows;
-			while (layout_row_node != NULL) {
-				/* NULL glyph means empty line */				
-				NautilusGlyph *glyph = NULL;
-				
-				if (layout_row_node->data != NULL) {
-					const NautilusTextLayoutRow *row;
-					row = layout_row_node->data;
-					
-					glyph = nautilus_glyph_new (font, font_size, row->text, row->text_length);
-				} else {
-				}
-				
-				line_list = g_list_append (line_list, glyph);
-				
-				layout_row_node = layout_row_node->next;
-			}
-			
-			nautilus_text_layout_free (layout);
-		} else {
-			line_list = g_list_append (line_list, NULL);
-		}
-		layout_node = layout_node->next;
-	}
-	
-	g_list_free (layout_list);
-
-	return line_list;
-}
-
-static int
-smooth_text_layout_get_empty_line_height (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-
-	if (smooth_text_layout->details->empty_line_height == UNDEFINED_DIMENSION) {
-		smooth_text_layout->details->empty_line_height = smooth_text_layout->details->font_size / 2;
-	}
-
-	return smooth_text_layout->details->empty_line_height;
-}
-
-static int
-smooth_text_layout_get_num_empty_lines (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-	
-	if (smooth_text_layout->details->num_empty_lines == UNDEFINED_DIMENSION) {
-		GList *node;
-
-		smooth_text_layout->details->num_empty_lines = 0;
-		node = smooth_text_layout->details->text_line_list;
-		while (node) {
-			if (node->data == NULL) {
-				smooth_text_layout->details->num_empty_lines++;
-			}
-			node = node->next;
-		}
-	}
-
-	return smooth_text_layout->details->num_empty_lines;
-}
-
-static int
-smooth_text_layout_get_max_line_width (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-	
-	if (smooth_text_layout->details->max_line_width == UNDEFINED_DIMENSION) {
-		GList *node;
-
-		smooth_text_layout->details->max_line_width = 0;
-		node = smooth_text_layout->details->text_line_list;
-		while (node) {
-			if (node->data != NULL) {
-				smooth_text_layout->details->max_line_width = MAX (smooth_text_layout->details->max_line_width,
-										   nautilus_glyph_get_width (node->data));
-			}
-			node = node->next;
-		}
-	}
-
-	return smooth_text_layout->details->max_line_width;
-}
-
-static int
-smooth_text_layout_get_total_line_height (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-	
-	if (smooth_text_layout->details->total_line_height == UNDEFINED_DIMENSION) {
-		GList *node;
-
-		smooth_text_layout->details->total_line_height = 0;
-		node = smooth_text_layout->details->text_line_list;
-		while (node) {
-			if (node->data != NULL) {
-				smooth_text_layout->details->total_line_height += 
-					nautilus_glyph_get_height (node->data);
-			} else {
-				smooth_text_layout->details->total_line_height += 
-					smooth_text_layout_get_empty_line_height (smooth_text_layout);
-			}
-
-			node = node->next;
-		}
-	}
-
-	return smooth_text_layout->details->total_line_height;
-}
-
-static int
-smooth_text_layout_get_line_wrap_width (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-	
-	if (smooth_text_layout->details->line_wrap_width == UNDEFINED_DIMENSION) {
-		smooth_text_layout->details->line_wrap_width = 
-			nautilus_scalable_font_text_width (smooth_text_layout->details->font,
-							   smooth_text_layout->details->font_size,
-							   DEFAULT_LINE_WRAP_WIDTH_TEXT,
-							   strlen (DEFAULT_LINE_WRAP_WIDTH_TEXT));
-		
-	}
-
-	return smooth_text_layout->details->line_wrap_width;
-}
-
-/* Public NautilusSmoothTextLayout methods */
-
-/**
- * nautilus_smooth_text_layout_new:
- * @family: The desired smooth_text_layout family.
- * @weight: The desired smooth_text_layout weight.
- * @slant: The desired smooth_text_layout slant.
- * @set_width: The desired smooth_text_layout set_width.
- *
- * Returns a new smooth_text_layout.
- *
- */
-NautilusSmoothTextLayout *
-nautilus_smooth_text_layout_new (const char *text,
-				 int text_length,
-				 NautilusScalableFont *font,
-				 int font_size,
-				 gboolean wrap)
-{
-	NautilusSmoothTextLayout *smooth_text_layout;
-
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), NULL);
-	g_return_val_if_fail (font_size >= MIN_FONT_SIZE, NULL);
-
-	smooth_text_layout = NAUTILUS_SMOOTH_TEXT_LAYOUT (gtk_object_new (nautilus_smooth_text_layout_get_type (), NULL));
-	gtk_object_ref (GTK_OBJECT (smooth_text_layout));
-	gtk_object_sink (GTK_OBJECT (smooth_text_layout));
-
-	smooth_text_layout_set_text (smooth_text_layout, text, text_length);
-	nautilus_smooth_text_layout_set_font (smooth_text_layout, font);
-	nautilus_smooth_text_layout_set_font_size (smooth_text_layout, font_size);
-	nautilus_smooth_text_layout_set_wrap (smooth_text_layout, wrap);
-	
-	return smooth_text_layout;
-}
-
-void
-nautilus_smooth_text_layout_draw_to_pixbuf (const NautilusSmoothTextLayout *smooth_text_layout,
-					    GdkPixbuf *destination_pixbuf,
-					    int source_x,
-					    int source_y,
-					    const ArtIRect *destination_area,
-					    GtkJustification justification,
-					    gboolean underlined,
-					    guint32 color,
-					    int opacity)
-{
-	NautilusDimensions dimensions;
-	ArtIRect target;
-	ArtIRect source;
-	int target_width;
-	int target_height;
-	int source_width;
-	int source_height;
-	GdkPixbuf *sub_pixbuf;
-
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (destination_pixbuf));
-	g_return_if_fail (destination_area != NULL);
-	g_return_if_fail (justification >= GTK_JUSTIFY_LEFT && justification <= GTK_JUSTIFY_FILL);
-	g_return_if_fail (!art_irect_empty (destination_area));
-
-	smooth_text_layout_ensure_lines (smooth_text_layout);
-	
-	dimensions = nautilus_smooth_text_layout_get_dimensions (smooth_text_layout);
-
-	g_return_if_fail (source_x >= 0);
-	g_return_if_fail (source_y >= 0);
-	g_return_if_fail (source_x < dimensions.width);
-	g_return_if_fail (source_y < dimensions.height);
-
-	/* Clip the destination area to the pixbuf dimensions; bail if no work */
-	target = nautilus_gdk_pixbuf_intersect (destination_pixbuf, 0, 0, destination_area);
-	if (art_irect_empty (&target)) {
- 		return;
- 	}
-
-	/* Assign the source area */
-	nautilus_art_irect_assign (&source,
-				   source_x,
-				   source_y,
-				   dimensions.width - source_x,
-				   dimensions.height - source_y);
-
-	/* Adjust the target width if the source area is smaller than the
-	 * source pixbuf dimensions */
-	target_width = target.x1 - target.x0;
-	target_height = target.y1 - target.y0;
-	source_width = source.x1 - source.x0;
-	source_height = source.y1 - source.y0;
-
-	target.x1 = target.x0 + MIN (target_width, source_width);
-	target.y1 = target.y0 + MIN (target_height, source_height);
-
-	/* Use a sub area pixbuf for simplicity */
-	sub_pixbuf = nautilus_gdk_pixbuf_new_from_pixbuf_sub_area (destination_pixbuf, &target);
-
-	smooth_text_layout_line_list_draw_to_pixbuf (smooth_text_layout->details->text_line_list,
-						     sub_pixbuf,
-						     -source_x,
-						     -source_y,
-						     justification,
-						     underlined,
-						     smooth_text_layout_get_empty_line_height (smooth_text_layout),
-						     smooth_text_layout_get_max_line_width (smooth_text_layout),
-						     smooth_text_layout->details->line_spacing,
-						     color,
-						     opacity);
-
-	gdk_pixbuf_unref (sub_pixbuf);
-}
-
-void
-nautilus_smooth_text_layout_draw_to_pixbuf_shadow (const NautilusSmoothTextLayout *smooth_text_layout,
-						   GdkPixbuf *destination_pixbuf,
-						   int source_x,
-						   int source_y,
-						   const ArtIRect *destination_area,
-						   int shadow_offset,
-						   GtkJustification justification,
-						   gboolean underlined,
-						   guint32 color,
-						   guint32 shadow_color,
-						   int opacity)
-{
-	NautilusDimensions dimensions;
-	ArtIRect target;
-	ArtIRect source;
-	int target_width;
-	int target_height;
-	int source_width;
-	int source_height;
-	GdkPixbuf *sub_pixbuf;
-
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (destination_pixbuf));
-	g_return_if_fail (destination_area != NULL);
-	g_return_if_fail (shadow_offset > 0);
-	g_return_if_fail (justification >= GTK_JUSTIFY_LEFT && justification <= GTK_JUSTIFY_FILL);
-	g_return_if_fail (!art_irect_empty (destination_area));
-
-	smooth_text_layout_ensure_lines (smooth_text_layout);
-	
-	dimensions = nautilus_smooth_text_layout_get_dimensions (smooth_text_layout);
-	dimensions.width += shadow_offset;
-	dimensions.height += shadow_offset;
-
-	g_return_if_fail (source_x >= 0);
-	g_return_if_fail (source_y >= 0);
-	g_return_if_fail (source_x < dimensions.width);
-	g_return_if_fail (source_y < dimensions.height);
-
-	/* Clip the destination area to the pixbuf dimensions; bail if no work */
-	target = nautilus_gdk_pixbuf_intersect (destination_pixbuf, 0, 0, destination_area);
-	if (art_irect_empty (&target)) {
- 		return;
- 	}
-
-	/* Assign the source area */
-	nautilus_art_irect_assign (&source,
-				   source_x,
-				   source_y,
-				   dimensions.width - source_x,
-				   dimensions.height - source_y);
-
-	/* Adjust the target width if the source area is smaller than the
-	 * source pixbuf dimensions */
-	target_width = target.x1 - target.x0;
-	target_height = target.y1 - target.y0;
-	source_width = source.x1 - source.x0;
-	source_height = source.y1 - source.y0;
-
-	target.x1 = target.x0 + MIN (target_width, source_width);
-	target.y1 = target.y0 + MIN (target_height, source_height);
-
-	/* Use a sub area pixbuf for simplicity */
-	sub_pixbuf = nautilus_gdk_pixbuf_new_from_pixbuf_sub_area (destination_pixbuf, &target);
-
-	/* Draw the shadow text */
-	smooth_text_layout_line_list_draw_to_pixbuf (smooth_text_layout->details->text_line_list,
-						     sub_pixbuf,
-						     -source_x + shadow_offset,
-						     -source_y + shadow_offset,
-						     justification,
-						     underlined,
-						     smooth_text_layout_get_empty_line_height (smooth_text_layout),
-						     smooth_text_layout_get_max_line_width (smooth_text_layout),
-						     smooth_text_layout->details->line_spacing,
-						     shadow_color,
-						     opacity);
-
-	/* Draw the text */
-	smooth_text_layout_line_list_draw_to_pixbuf (smooth_text_layout->details->text_line_list,
-						     sub_pixbuf,
-						     -source_x,
-						     -source_y,
-						     justification,
-						     underlined,
-						     smooth_text_layout_get_empty_line_height (smooth_text_layout),
-						     smooth_text_layout_get_max_line_width (smooth_text_layout),
-						     smooth_text_layout->details->line_spacing,
-						     color,
-						     opacity);
-
-	gdk_pixbuf_unref (sub_pixbuf);
-}
-
-NautilusDimensions
-nautilus_smooth_text_layout_get_dimensions (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), NAUTILUS_DIMENSIONS_EMPTY);
-
-	smooth_text_layout_ensure_lines (smooth_text_layout);
-
-	if (smooth_text_layout->details->dimensions.width == UNDEFINED_DIMENSION) {
-		const int max_line_width = smooth_text_layout_get_max_line_width (smooth_text_layout);
-		const int num_lines = g_list_length (smooth_text_layout->details->text_line_list);
-		const int num_empty_lines = smooth_text_layout_get_num_empty_lines (smooth_text_layout);
-		const int total_line_height = smooth_text_layout_get_total_line_height (smooth_text_layout);
-
-		g_assert (num_lines >= 0);
-		g_assert (num_empty_lines >= 0);
-		g_assert (num_lines >= num_empty_lines);
-		
-		smooth_text_layout->details->dimensions.width = max_line_width;
-		smooth_text_layout->details->dimensions.height = total_line_height;
-		
-		if (num_lines > 1) {
-			smooth_text_layout->details->dimensions.height += 
-				(num_lines - 1) * smooth_text_layout->details->line_spacing;
-		}
-	}
-
-	return smooth_text_layout->details->dimensions;
-}
-
-int
-nautilus_smooth_text_layout_get_width (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	NautilusDimensions dimensions;
-
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-
-	dimensions = nautilus_smooth_text_layout_get_dimensions (smooth_text_layout);
-
-	return dimensions.width;
-}
-
-int
-nautilus_smooth_text_layout_get_height (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	NautilusDimensions dimensions;
-
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-
-	dimensions = nautilus_smooth_text_layout_get_dimensions (smooth_text_layout);
-
-	return dimensions.height;
-}
-
-void
-nautilus_smooth_text_layout_set_wrap (NautilusSmoothTextLayout *smooth_text_layout,
-				      gboolean wrap)
-{
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-
-	if (smooth_text_layout->details->wrap == wrap) {
-		return;
-	}
-
-	smooth_text_layout_clear_lines (smooth_text_layout);
-	smooth_text_layout->details->wrap = wrap;
-}
-
-gboolean
-nautilus_smooth_text_layout_get_wrap (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), FALSE);
-
-	return smooth_text_layout->details->wrap;
-}
-
-void
-nautilus_smooth_text_layout_set_font (NautilusSmoothTextLayout *smooth_text_layout,
-				      NautilusScalableFont *font)
-{
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-	g_return_if_fail (NAUTILUS_IS_SCALABLE_FONT (font));
-
-	if (smooth_text_layout->details->font == font) {
-		return;
-	}
-
-	smooth_text_layout_clear_lines (smooth_text_layout);
-	gtk_object_unref (GTK_OBJECT (smooth_text_layout->details->font));
-	gtk_object_ref (GTK_OBJECT (font));
-	smooth_text_layout->details->font = font;
-}
-
-NautilusScalableFont *
-nautilus_smooth_text_layout_get_font (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), NULL);
-
-	gtk_object_ref (GTK_OBJECT (smooth_text_layout->details->font));
-	return smooth_text_layout->details->font;
-}
-
-void
-nautilus_smooth_text_layout_set_font_size (NautilusSmoothTextLayout *smooth_text_layout,
-					   int font_size)
-{
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-	g_return_if_fail (font_size >= MIN_FONT_SIZE);
-
-	if (smooth_text_layout->details->font_size == font_size) {
-		return;
-	}
-	
-	smooth_text_layout_clear_lines (smooth_text_layout);
-	smooth_text_layout->details->font_size = font_size;
-}
-
-int
-nautilus_smooth_text_layout_get_font_size (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-
-	return smooth_text_layout->details->font_size;
-}
-
-void
-nautilus_smooth_text_layout_set_line_spacing (NautilusSmoothTextLayout *smooth_text_layout,
-					      int line_spacing)
-{
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-	
-	if (smooth_text_layout->details->line_spacing == line_spacing) {
-		return;
-	}
-	
-	smooth_text_layout_clear_lines (smooth_text_layout);
-	smooth_text_layout->details->line_spacing = line_spacing;
-}
-
-int
-nautilus_smooth_text_layout_get_line_spacing (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-
-	return smooth_text_layout->details->line_spacing;
-}
-
-void
-nautilus_smooth_text_layout_set_empty_line_height (NautilusSmoothTextLayout *smooth_text_layout,
-						   int empty_line_height)
-{
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-	
-	if (smooth_text_layout->details->empty_line_height == empty_line_height) {
-		return;
-	}
-	
-	smooth_text_layout_clear_lines (smooth_text_layout);
-	smooth_text_layout->details->empty_line_height = empty_line_height;
-}
-
-int
-nautilus_smooth_text_layout_get_empty_line_height (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-
-	return smooth_text_layout->details->empty_line_height;
-}
-
-static void
-smooth_text_layout_set_text (NautilusSmoothTextLayout *smooth_text_layout,
-			     const char *text,
-			     int text_length)
-{
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-
-	if (smooth_text_layout->details->text == text
-	    && smooth_text_layout->details->text_length == text_length) {
-		return;
-	}
-	
-	smooth_text_layout_clear_lines (smooth_text_layout);
-	g_free (smooth_text_layout->details->text);
-	smooth_text_layout->details->text = g_strdup (text);
-	smooth_text_layout->details->text_length = text_length;
-}
-
-void
-nautilus_smooth_text_layout_set_line_break_characters (NautilusSmoothTextLayout *smooth_text_layout,
-						       const char *line_break_characters)
-{
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-	g_return_if_fail (nautilus_strlen (line_break_characters) > 0);
-
-	if (nautilus_str_is_equal (smooth_text_layout->details->line_break_characters, line_break_characters)) {
-		return;
-	}
-
-	smooth_text_layout_clear_lines (smooth_text_layout);
-	g_free (smooth_text_layout->details->line_break_characters);
-	smooth_text_layout->details->line_break_characters = g_strdup (line_break_characters);
-}
-
-char *
-nautilus_smooth_text_layout_get_line_break_characters (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), FALSE);
-
-	return g_strdup (smooth_text_layout->details->text);
-}
-
-void
-nautilus_smooth_text_layout_set_line_wrap_width (NautilusSmoothTextLayout *smooth_text_layout,
-						 int line_wrap_width)
-{
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-
-	if (smooth_text_layout->details->line_wrap_width == line_wrap_width) {
-		return;
-	}
-
-	smooth_text_layout_clear_lines (smooth_text_layout);
-	smooth_text_layout->details->line_wrap_width = line_wrap_width;
-}
-
-/*
- * The following text_layout stuff was shamelessly plundered
- * from libgnomeui/gnome-icon-text.[ch] by Federico Mena.
- *
- * It was hacked to use NautilusScalableFont and GdkPixbuf
- * instead of GdkFont and GdkDrawable.  We want to use the
- * same layout algorithm in Nautilus so that both the smooth
- * and not smooth text rendering cases have predictably 
- * similar result.
- *
- * I also made some minor Nautilus-like style changes. -re
- *
- */
-static void
-text_layout_free_row (gpointer data,
-		      gpointer user_data)
-{
-	NautilusTextLayoutRow *row;
-
-	if (data) {
-		row = data;
-		g_free (row->text);
-		g_free (row);
-	}
-}
-
-/**
- * nautilus_text_layout_free:
- * @ti: An icon text info structure.
- *
- * Frees a &NautilusTextLayout structure.  You should call this instead of
- * freeing the structure yourself.
- */
-void
-nautilus_text_layout_free (NautilusTextLayout *text_layout)
-{
-	g_list_foreach (text_layout->rows, text_layout_free_row, NULL);
-	g_list_free (text_layout->rows);
-	g_free (text_layout);
-}
-
-/**
- * nautilus_text_layout_new:
- * @font:       Name of the font that will be used to render the text.
- * @text:       Text to be formatted.
- * @separators: Separators used for word wrapping, can be NULL.
- * @max_width:  Width in pixels to be used for word wrapping.
- * @confine:    Whether it is mandatory to wrap at @max_width.
- *
- * Creates a new &NautilusTextLayout structure by wrapping the specified
- * text.  If non-NULL, the @separators argument defines a set of characters
- * to be used as word delimiters for performing word wrapping.  If it is
- * NULL, then only spaces will be used as word delimiters.
- *
- * The @max_width argument is used to specify the width at which word
- * wrapping will be performed.  If there is a very long word that does not
- * fit in a single line, the @confine argument can be used to specify
- * whether the word should be unconditionally split to fit or whether
- * the maximum width should be increased as necessary.
- *
- * Return value: A newly-created &NautilusTextLayout structure.
- */
-NautilusTextLayout *
-nautilus_text_layout_new (const NautilusScalableFont *font,
-			  int font_size,
-			  const char *text,
-			  const char *separators,
-			  int max_width,
-			  gboolean confine)
-{
-	NautilusTextLayout *text_layout;
-	NautilusTextLayoutRow *row;
-	const char *row_end;
-	const char *s, *word_start, *word_end, *old_word_end;
-	char *sub_text;
-	int i, w_len;
-	int w;
-	const char *text_iter;
-	int text_len, separators_len;
-
-	g_return_val_if_fail (font != NULL, NULL);
-	g_return_val_if_fail (font_size > 0, NULL);
-	g_return_val_if_fail (text != NULL, NULL);
-	g_return_val_if_fail (nautilus_strlen (text) > 0, NULL);
-
-	if (!separators)
-		separators = " ";
-
-	text_len = strlen (text);
-
-	separators_len = strlen (separators);
-
-	text_layout = g_new0 (NautilusTextLayout, 1);
-
-	text_layout->rows = NULL;
-	text_layout->font = font;
-	text_layout->font_size = font_size;
-	text_layout->width = 0;
-	text_layout->height = 0;
-	text_layout->baseline_skip = font_size;
-
-	word_end = NULL;
-
-	text_iter = text;
-	while (*text_iter) {
-		for (row_end = text_iter; *row_end != 0 && *row_end != '\n'; row_end++);
-
-		/* Accumulate words from this row until they don't fit in the max_width */
-
-		s = text_iter;
-
-		while (s < row_end) {
-			word_start = s;
-			old_word_end = word_end;
-			for (word_end = word_start; *word_end; word_end++) {
-				const char *p;
-				for (p = separators; *p; p++) {
-					if (*word_end == *p)
-						goto found;
-				}
-			}
-		found:
-			if (word_end < row_end)
-				word_end++;
-
-			if (nautilus_scalable_font_text_width (font, font_size, text_iter, word_end - text_iter) > max_width) {
-				if (word_start == text_iter) {
-					if (confine) {
-						/* We must force-split the word.  Look for a proper
-                                                 * place to do it.
-						 */
-
-						w_len = word_end - word_start;
-						
-						for (i = 1; i < w_len; i++) {
-							w = nautilus_scalable_font_text_width (font, font_size, word_start, i);
-							if (w > max_width) {
-								if (i == 1)
-									/* Shit, not even a single character fits */
-									max_width = w;
-								else
-									break;
-							}
-						}
-
-						/* Create sub-row with the chars that fit */
-
-						sub_text = g_strndup (word_start, i - 1);
-						
-						row = g_new0 (NautilusTextLayoutRow, 1);
-						row->text = sub_text;
-						row->text_length = i - 1;
-						row->width = nautilus_scalable_font_text_width (font, font_size, 
-												sub_text, 
-												strlen (sub_text));
-
-						text_layout->rows = g_list_append (text_layout->rows, row);
-
-						if (row->width > text_layout->width)
-							text_layout->width = row->width;
-
-						text_layout->height += text_layout->baseline_skip;
-
-						/* Bump the text pointer */
-
-						text_iter += i - 1;
-						s = text_iter;
-
-						continue;
-					} else
-						max_width = nautilus_scalable_font_text_width (font, font_size, word_start, word_end - word_start);
-
-					continue; /* Retry split */
-				} else {
-					word_end = old_word_end; /* Restore to region that does fit */
-					break; /* Stop the loop because we found something that doesn't fit */
-				}
-			}
-
-			s = word_end;
-		}
-
-		/* Append row */
-
-		if (text_iter == row_end) {
-			/* We are on a newline, so append an empty row */
-
-			text_layout->rows = g_list_append (text_layout->rows, NULL);
-			text_layout->height += text_layout->baseline_skip / 2;
-
-			/* Next! */
-
-			text_iter = row_end + 1;
-		} else {
-			/* Create subrow and append it to the list */
-
-			int sub_len;
-			sub_len = word_end - text_iter;
-
-			sub_text = g_strndup (text_iter, sub_len);
-
-			row = g_new0 (NautilusTextLayoutRow, 1);
-			row->text = sub_text;
-			row->text_length = sub_len;
-			row->width = nautilus_scalable_font_text_width (font, font_size, sub_text, sub_len);
-
-			text_layout->rows = g_list_append (text_layout->rows, row);
-
-			if (row->width > text_layout->width)
-				text_layout->width = row->width;
-
-			text_layout->height += text_layout->baseline_skip;
-
-			/* Next! */
-
-			text_iter = word_end;
-		}
-	}
-
-	return text_layout;
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-gboolean
-nautilus_smooth_text_layout_compare (NautilusSmoothTextLayout *x,
-				     NautilusSmoothTextLayout *y)
-{
-	GList *xp, *yp;
-
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (x), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (y), FALSE);
-
-	/* Compare simple things */
-	if (x->details->dimensions.width != y->details->dimensions.width
-	    || x->details->dimensions.height != y->details->dimensions.height
-	    || x->details->text_length != y->details->text_length
-	    || memcmp (x->details->text, y->details->text, x->details->text_length) != 0
-	    || x->details->font != y->details->font
-	    || x->details->font_size != y->details->font_size
-	    || x->details->line_spacing != y->details->line_spacing
-	    || x->details->empty_line_height != y->details->empty_line_height
-	    || x->details->max_line_width != y->details->max_line_width
-	    || x->details->num_empty_lines != y->details->num_empty_lines
-	    || x->details->line_wrap_width != y->details->line_wrap_width
-	    || x->details->total_line_height != y->details->total_line_height
-	    || x->details->wrap != y->details->wrap
-	    || strcmp (x->details->line_break_characters, y->details->line_break_characters) != 0) {
-		return FALSE;
-	}
-
-	/* Compare glyphs */
-	smooth_text_layout_ensure_lines (x);
-	smooth_text_layout_ensure_lines (y);
-	for (xp = x->details->text_line_list, yp = y->details->text_line_list;
-	     xp != NULL && yp != NULL;
-	     xp = xp->next, yp = yp->next) {
-		if ((xp->data == NULL) != (yp->data == NULL)) {
-			return FALSE;
-		}
-		if (xp->data != NULL
-		    && !nautilus_glyph_compare (xp->data, yp->data)) {
-			return FALSE;
-		}
-	}
-	if (xp != NULL || yp != NULL) {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-#endif /* NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-smooth-text-layout.h b/libnautilus-extensions/nautilus-smooth-text-layout.h
deleted file mode 100644
index 147f5398d..000000000
--- a/libnautilus-extensions/nautilus-smooth-text-layout.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-smooth-text-layout.h - A GtkObject subclass for dealing with smooth text.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_SMOOTH_TEXT_LAYOUT_H
-#define NAUTILUS_SMOOTH_TEXT_LAYOUT_H
-
-#include <gtk/gtkobject.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome/gnome-defs.h>
-#include <libnautilus-extensions/nautilus-art-extensions.h>
-#include <libnautilus-extensions/nautilus-scalable-font.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT		(nautilus_smooth_text_layout_get_type ())
-#define NAUTILUS_SMOOTH_TEXT_LAYOUT(obj)		(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT, NautilusSmoothTextLayout))
-#define NAUTILUS_SMOOTH_TEXT_LAYOUT_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT, NautilusSmoothTextLayoutClass))
-#define NAUTILUS_IS_SMOOTH_TEXT_LAYOUT(obj)		(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT))
-#define NAUTILUS_IS_SMOOTH_TEXT_LAYOUT_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT))
-
-typedef struct NautilusSmoothTextLayout        NautilusSmoothTextLayout;
-typedef struct NautilusSmoothTextLayoutClass   NautilusSmoothTextLayoutClass;
-typedef struct NautilusSmoothTextLayoutDetails NautilusSmoothTextLayoutDetails;
-
-struct NautilusSmoothTextLayout
-{
-	/* Superclass */
-	GtkObject object;
-
-	/* Private things */
-	NautilusSmoothTextLayoutDetails *details;
-};
-
-struct NautilusSmoothTextLayoutClass
-{
-	GtkObjectClass parent_class;
-};
-
-GtkType                           nautilus_smooth_text_layout_get_type                  (void);
-NautilusSmoothTextLayout  *       nautilus_smooth_text_layout_new                       (const char                     *text,
-											 int                             text_length,
-											 NautilusScalableFont           *font,
-											 int                             font_size,
-											 gboolean                        wrap);
-NautilusDimensions                nautilus_smooth_text_layout_get_dimensions            (const NautilusSmoothTextLayout *smooth_text_layout);
-void                              nautilus_smooth_text_layout_set_line_wrap_width       (NautilusSmoothTextLayout       *smooth_text_layout,
-											 int                             line_wrap_width);
-int                               nautilus_smooth_text_layout_get_width                 (const NautilusSmoothTextLayout *smooth_text_layout);
-int                               nautilus_smooth_text_layout_get_height                (const NautilusSmoothTextLayout *smooth_text_layout);
-void                              nautilus_smooth_text_layout_set_wrap                  (NautilusSmoothTextLayout       *smooth_text_layout,
-											 gboolean                        wrap);
-gboolean                          nautilus_smooth_text_layout_get_wrap                  (const NautilusSmoothTextLayout *smooth_text_layout);
-void                              nautilus_smooth_text_layout_set_line_break_characters (NautilusSmoothTextLayout       *smooth_text_layout,
-											 const char                     *line_break_characters);
-char *                            nautilus_smooth_text_layout_get_line_break_characters (const NautilusSmoothTextLayout *smooth_text_layout);
-void                              nautilus_smooth_text_layout_set_font                  (NautilusSmoothTextLayout       *smooth_text_layout,
-											 NautilusScalableFont           *font);
-NautilusScalableFont             *nautilus_smooth_text_layout_get_font                  (const NautilusSmoothTextLayout *smooth_text_layout);
-void                              nautilus_smooth_text_layout_set_font_size             (NautilusSmoothTextLayout       *smooth_text_layout,
-											 int                             font_size);
-int                               nautilus_smooth_text_layout_get_font_size             (const NautilusSmoothTextLayout *smooth_text_layout);
-void                              nautilus_smooth_text_layout_set_line_spacing          (NautilusSmoothTextLayout       *smooth_text_layout,
-											 int                             line_spacing);
-int                               nautilus_smooth_text_layout_get_line_spacing          (const NautilusSmoothTextLayout *smooth_text_layout);
-void                              nautilus_smooth_text_layout_set_empty_line_height     (NautilusSmoothTextLayout       *smooth_text_layout,
-											 int                             empty_line_height);
-int                               nautilus_smooth_text_layout_get_empty_line_height     (const NautilusSmoothTextLayout *smooth_text_layout);
-void                              nautilus_smooth_text_layout_draw_to_pixbuf            (const NautilusSmoothTextLayout *smooth_text_layout,
-											 GdkPixbuf                      *destination_pixbuf,
-											 int                             source_x,
-											 int                             source_y,
-											 const ArtIRect                 *destination_area,
-											 GtkJustification                justification,
-											 gboolean                        underlined,
-											 guint32                         color,
-											 int                             opacity);
-void                              nautilus_smooth_text_layout_draw_to_pixbuf_shadow     (const NautilusSmoothTextLayout *smooth_text_layout,
-											 GdkPixbuf                      *destination_pixbuf,
-											 int                             source_x,
-											 int                             source_y,
-											 const ArtIRect                 *destination_area,
-											 int                             shadow_offset,
-											 GtkJustification                justification,
-											 gboolean                        underlined,
-											 guint32                         color,
-											 guint32                         shadow_color,
-											 int                             opacity);
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-gboolean 			  nautilus_smooth_text_layout_compare			(NautilusSmoothTextLayout	*x,
-											 NautilusSmoothTextLayout	*y);
-#endif /* NAUTILUS_OMIT_SELF_CHECK */
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_SMOOTH_TEXT_LAYOUT_H */
-
-
diff --git a/libnautilus-extensions/nautilus-smooth-widget.c b/libnautilus-extensions/nautilus-smooth-widget.c
deleted file mode 100644
index 75ba2c20b..000000000
--- a/libnautilus-extensions/nautilus-smooth-widget.c
+++ /dev/null
@@ -1,983 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-smooth-widget.c - Functions and types shared by smooth widgets.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-smooth-widget.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-
-#include <gtk/gtksignal.h>
-
-static NautilusArtIPoint smooth_widget_get_tile_origin_point              (const GtkWidget                   *widget,
-									   NautilusSmoothTileMode             tile_mode_vertical,
-									   NautilusSmoothTileMode             tile_mode_horizontal);
-static void              smooth_widget_paint_tile_opaque                  (GtkWidget                         *widget,
-									   GdkGC                             *gc,
-									   const GdkPixbuf                   *tile_pixbuf,
-									   const ArtIRect                    *tile_bounds,
-									   const NautilusArtIPoint           *tile_origin,
-									   const ArtIRect                    *dirty_area);
-static void              smooth_widget_paint_tile_transparent             (GtkWidget                         *widget,
-									   GdkGC                             *gc,
-									   NautilusSmoothBackgroundMode       background_mode,
-									   guint32                            solid_background_color,
-									   const GdkPixbuf                   *tile_pixbuf,
-									   const ArtIRect                    *tile_bounds,
-									   int                                tile_opacity,
-									   const NautilusArtIPoint           *tile_origin,
-									   const ArtIRect                    *dirty_area);
-static void              smooth_widget_paint_content_opaque               (GtkWidget                         *widget,
-									   GdkGC                             *gc,
-									   const ArtIRect                    *content_bounds,
-									   const ArtIRect                    *dirty_area,
-									   NautilusSmoothPaintOpaqueCallback  paint_callback,
-									   gpointer                           callback_data);
-static void              smooth_widget_paint_content_transparent          (GtkWidget                         *widget,
-									   GdkGC                             *gc,
-									   NautilusSmoothBackgroundMode       background_mode,
-									   guint32                            solid_background_color,
-									   const ArtIRect                    *content_bounds,
-									   int                                content_opacity,
-									   const ArtIRect                    *dirty_area,
-									   NautilusSmoothCompositeCallback    composite_callback,
-									   gpointer                           callback_data);
-static void              smooth_widget_paint_tile_and_content_transparent (GtkWidget                         *widget,
-									   GdkGC                             *gc,
-									   NautilusSmoothBackgroundMode       background_mode,
-									   guint32                            solid_background_color,
-									   const GdkPixbuf                   *tile_pixbuf,
-									   const ArtIRect                    *tile_bounds,
-									   int                                tile_opacity,
-									   const NautilusArtIPoint           *tile_origin,
-									   const ArtIRect                    *content_bounds,
-									   int                                content_opacity,
-									   const ArtIRect                    *dirty_area,
-									   NautilusSmoothCompositeCallback    composite_callback,
-									   gpointer                           callback_data);
-
-/* We maintain a global list of smooth widgets.  The smoothness of all these
- * widgets can then be changed with nautilus_smooth_widget_global_set_is_smooth().
- *
- * We do this so that labels and images will repect the "smooth_graphics"
- * automatically without any intervention from the users of these two widgets.
- */
-static GList *smooth_widget_list = NULL;
-
-/* We maintain a global list of types that can be smooth widgets.
- * We do this mostly for type safety - to make sure smooth operations only
- * happen on smooth widgets.
- */
-static GList *smooth_widget_type_list = NULL;
-
-static void
-smooth_widget_type_list_free (void)
-{
-	g_list_free (smooth_widget_type_list);
-	smooth_widget_type_list = NULL;
-}
-
-static void
-smooth_widget_list_free (void)
-{
-	g_list_free (smooth_widget_list);
-	smooth_widget_list = NULL;
-}
-
-static gboolean
-widget_is_smooth (const GtkWidget *widget)
-{
-	GList *node;
-
-	for (node = smooth_widget_type_list; node ; node = node->next) {
-		GtkType type;
-
-		type = GPOINTER_TO_INT (node->data);
-
-		if (GTK_CHECK_TYPE ((widget), type)) {
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-static void
-smooth_widget_set_is_smooth (GtkWidget *widget, gboolean is_smooth)
-{
-	g_return_if_fail (widget_is_smooth (widget));
-
-	gtk_signal_emit_by_name (GTK_OBJECT (widget), "set_is_smooth", is_smooth);
-}
-
-static void
-smooth_widget_destroy (GtkWidget *widget, gpointer callback_data)
-{
-	g_return_if_fail (widget_is_smooth (widget));
-
-	smooth_widget_list = g_list_remove (smooth_widget_list, widget);
-}
-
-static gboolean global_is_smooth = TRUE;
-
-void
-nautilus_smooth_widget_global_set_is_smooth (gboolean is_smooth)
-{
-	GList *node;
-
-	global_is_smooth = is_smooth;
-
-	for (node = smooth_widget_list; node != NULL; node = node->next) {
-		smooth_widget_set_is_smooth (GTK_WIDGET (node->data), global_is_smooth);
-	}
-}
-
-/**
- * nautilus_smooth_widget_register:
- * @widget: A smooth widget.
- *
- * Register a smooth widget.  For the life time of the widget, its 
- * 'is_smooth' attribute will be toggled when 
- * nautilus_smooth_widget_global_set_is_smooth() is called.
- */
-void
-nautilus_smooth_widget_register (GtkWidget *widget)
-{
-	g_return_if_fail (widget_is_smooth (widget));
-
-	smooth_widget_set_is_smooth (widget, global_is_smooth);
-
-	if (smooth_widget_list == NULL) {
-		g_atexit (smooth_widget_list_free);
-	}
-
-	smooth_widget_list = g_list_prepend (smooth_widget_list, widget);
-
-	/* Keep track of the widget's destruction so we can purge it */
-	gtk_signal_connect (GTK_OBJECT (widget),
-			    "destroy",
-			    GTK_SIGNAL_FUNC (smooth_widget_destroy),
-			    NULL);
-}
-
-/* Return the origin point for the widget given vertical
- * and horizontal tile modes.
- */
-static NautilusArtIPoint
-smooth_widget_get_tile_origin_point (const GtkWidget *widget,
-				     NautilusSmoothTileMode tile_mode_vertical,
-				     NautilusSmoothTileMode tile_mode_horizontal)
-
-{
-	NautilusArtIPoint origin_point;
-
-	g_return_val_if_fail (widget_is_smooth (widget), NAUTILUS_ART_IPOINT_ZERO);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NAUTILUS_ART_IPOINT_ZERO);
-	g_return_val_if_fail (tile_mode_vertical >= NAUTILUS_SMOOTH_TILE_SELF, NAUTILUS_ART_IPOINT_ZERO);
-	g_return_val_if_fail (tile_mode_vertical <= NAUTILUS_SMOOTH_TILE_ANCESTOR, NAUTILUS_ART_IPOINT_ZERO);
-	g_return_val_if_fail (tile_mode_horizontal >= NAUTILUS_SMOOTH_TILE_SELF, NAUTILUS_ART_IPOINT_ZERO);
-	g_return_val_if_fail (tile_mode_horizontal <= NAUTILUS_SMOOTH_TILE_ANCESTOR, NAUTILUS_ART_IPOINT_ZERO);
-
-	origin_point = NAUTILUS_ART_IPOINT_ZERO;
-
-	/* Using '0' for the ancestor origin works because our buddy GTK+ 
-	 * already makes our allocation.{x,y} the collected offsets of all
-	 * our ancestors.
-	 *
-	 * It might be more correct to make this the allocation.{x,y} of the
-	 * ancestor windowed widget - maybe.
-	 */
-	switch (tile_mode_vertical) {
-	case NAUTILUS_SMOOTH_TILE_SELF:
-		origin_point.y = widget->allocation.y;
-		break;
-
-	case NAUTILUS_SMOOTH_TILE_ANCESTOR:
-		origin_point.y = 0;
-		break;
-	}
-
-	switch (tile_mode_horizontal) {
-	case NAUTILUS_SMOOTH_TILE_SELF:
-		origin_point.x = widget->allocation.x;
-		break;
-
-	case NAUTILUS_SMOOTH_TILE_ANCESTOR:
-		origin_point.x = 0;
-		break;
-	}
-
-	return origin_point;
-}
-
-/* Return an area of the smooth widget's Gtk background as a pixbuf.
- * The resulting pixbuf needs to be unrefed when done using it.
- */
-static GdkPixbuf *
-smooth_widget_get_gtk_background (GtkWidget *widget, 
-				  const ArtIRect *area)
-{
-	GdkPixbuf *background;
-	int width;
-	int height;
-	
-	g_return_val_if_fail (widget_is_smooth (widget), NULL);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
-	g_return_val_if_fail (area != NULL && !art_irect_empty (area), NULL);
-
-	width = nautilus_art_irect_get_width (area);
-	height = nautilus_art_irect_get_height (area);
-	
-	background = nautilus_gdk_pixbuf_get_from_window_safe (widget->window,
-							       area->x0,
-							       area->y0,
-							       width,
-							       height);
-	if (background == NULL) {
-		ArtIRect fill_area;
-
-		background = nautilus_gdk_pixbuf_get_global_buffer (width, height);
-		nautilus_art_irect_assign (&fill_area, 0, 0, width, height);
-		nautilus_gdk_pixbuf_fill_rectangle_with_color (background,
-							       &fill_area,
-							       NAUTILUS_RGB_COLOR_WHITE);
-		gdk_pixbuf_ref (background);
-	} else {
-		g_assert (gdk_pixbuf_get_width (background) == width);
-		g_assert (gdk_pixbuf_get_height (background) == height);
-	}
-
-	return background;
-}
-
-/* Return an area of the smooth widget's background as a pixbuf.
- * The resulting pixbuf needs to be unrefed when done using it.
- */
-static GdkPixbuf *
-smooth_widget_get_background (GtkWidget *widget,
-			      const ArtIRect *area,
-			      NautilusSmoothBackgroundMode background_mode,
-			      guint32 solid_background_color)
-{
-	GdkPixbuf *buffer;
-	
-	g_return_val_if_fail (widget_is_smooth (widget), NULL);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
-	g_return_val_if_fail (area != NULL && !art_irect_empty (area), NULL);
-	g_return_val_if_fail (background_mode >= NAUTILUS_SMOOTH_BACKGROUND_GTK, NULL);
-	g_return_val_if_fail (background_mode <= NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR, NULL);
-
-	if (background_mode == NAUTILUS_SMOOTH_BACKGROUND_GTK) {
-		buffer = smooth_widget_get_gtk_background (widget, area);
-	} else {
-		buffer = nautilus_gdk_pixbuf_get_global_buffer (nautilus_art_irect_get_width (area),
-								nautilus_art_irect_get_height (area));
-
-		if (background_mode == NAUTILUS_SMOOTH_BACKGROUND_CALLBACK) {
-			gtk_signal_emit_by_name (GTK_OBJECT (widget),
-						 "draw_background",
-						 buffer,
-						 area);
-		} else {
-			nautilus_gdk_pixbuf_fill_rectangle_with_color (buffer,
-								       NULL,
-								       solid_background_color);
-		}
-
-		gdk_pixbuf_ref (buffer);
-	}
- 	g_return_val_if_fail (nautilus_gdk_pixbuf_is_valid (buffer), NULL);
-
-	return buffer;
-}
-
-/* Paint the smooth widget's tile in opaque mode */
-static void
-smooth_widget_paint_tile_opaque (GtkWidget *widget,
-				 GdkGC *gc,
-				 const GdkPixbuf *tile_pixbuf,
-				 const ArtIRect *tile_bounds,
-				 const NautilusArtIPoint *tile_origin,
-				 const ArtIRect *dirty_area)
-{
- 	ArtIRect tile_dirty_area;
-	
-	g_return_if_fail (widget_is_smooth (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (widget->window != NULL);
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (tile_pixbuf));
-	g_return_if_fail (tile_bounds != NULL && !art_irect_empty (tile_bounds));
-	g_return_if_fail (tile_origin != NULL);
-	g_return_if_fail (dirty_area != NULL && !art_irect_empty (dirty_area));
-	
-	/* Clip the tile to the dirty area */
-	art_irect_intersect (&tile_dirty_area, tile_bounds, dirty_area);
-	
-	/* Nothing to do */
- 	if (art_irect_empty (&tile_dirty_area)) {
- 		return;
- 	}
-
-	/* Tile the drawable. */
-	nautilus_gdk_pixbuf_draw_to_drawable_tiled (tile_pixbuf,
-						    widget->window,
-						    gc,
-						    &tile_dirty_area,
-						    gdk_pixbuf_get_width (tile_pixbuf),
-						    gdk_pixbuf_get_height (tile_pixbuf),
-						    tile_origin->x,
-						    tile_origin->y,
-						    GDK_RGB_DITHER_NONE,
-						    GDK_PIXBUF_ALPHA_BILEVEL,
-						    NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
-}
-
-/* Paint the smooth widget's tile in transparent alpha composited mode */
-static void
-smooth_widget_paint_tile_transparent (GtkWidget *widget,
-				      GdkGC *gc,
-				      NautilusSmoothBackgroundMode background_mode,
-				      guint32 solid_background_color,
-				      const GdkPixbuf *tile_pixbuf,
-				      const ArtIRect *tile_bounds,
-				      int tile_opacity,
-				      const NautilusArtIPoint *tile_origin,
-				      const ArtIRect *dirty_area)
-{
-	NautilusDimensions buffer_dimensions;
- 	ArtIRect tile_dirty_area;
-	ArtIRect tile_area;
-	GdkPixbuf *buffer;
-
-	g_return_if_fail (widget_is_smooth (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (gc != NULL);
-	g_return_if_fail (background_mode >= NAUTILUS_SMOOTH_BACKGROUND_GTK);
-	g_return_if_fail (background_mode <= NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	g_return_if_fail (tile_opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (tile_opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (tile_pixbuf));
-	g_return_if_fail (tile_bounds != NULL && !art_irect_empty (tile_bounds));
-	g_return_if_fail (tile_origin != NULL);
-	g_return_if_fail (dirty_area != NULL && !art_irect_empty (dirty_area));
-	
-	art_irect_intersect (&tile_dirty_area, tile_bounds, dirty_area);
-	
-	/* Nothing to do */
- 	if (art_irect_empty (&tile_dirty_area)) {
- 		return;
- 	}
-
-	buffer = smooth_widget_get_background (widget,
-					       &tile_dirty_area,
-					       background_mode,
-					       solid_background_color);
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (buffer));
-	
-	buffer_dimensions = nautilus_gdk_pixbuf_get_dimensions (buffer);
-	
-	nautilus_art_irect_assign (&tile_area, 0, 0, buffer_dimensions.width, buffer_dimensions.height);
-
-	/* Composite the tile into the buffer */	
-	nautilus_gdk_pixbuf_draw_to_pixbuf_tiled (tile_pixbuf,
-						  buffer,
-						  &tile_area,
-						  gdk_pixbuf_get_width (tile_pixbuf),
-						  gdk_pixbuf_get_height (tile_pixbuf),
-						  tile_origin->x - tile_dirty_area.x0,
-						  tile_origin->y - tile_dirty_area.y0,
-						  tile_opacity,
-						  GDK_INTERP_NEAREST);
-	
-	nautilus_gdk_pixbuf_draw_to_drawable (buffer,
-					      widget->window,
-					      gc,
-					      0,
-					      0,
-					      &tile_dirty_area,
-					      GDK_RGB_DITHER_NONE,
-					      GDK_PIXBUF_ALPHA_BILEVEL,
-					      NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
-	
-	gdk_pixbuf_unref (buffer);
-}
-
-/* Paint the smooth widget's content in opaque mode */
-static void
-smooth_widget_paint_content_opaque (GtkWidget *widget,
-				    GdkGC *gc,
-				    const ArtIRect *content_bounds,
-				    const ArtIRect *dirty_area,
-				    NautilusSmoothPaintOpaqueCallback paint_callback,
-				    gpointer callback_data)
-{
-	ArtIRect content_dirty_area;
-
-	g_return_if_fail (widget_is_smooth (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (gc != NULL);
-	g_return_if_fail (content_bounds != NULL && !art_irect_empty (content_bounds));
-	g_return_if_fail (dirty_area != NULL && !art_irect_empty (dirty_area));
-	g_return_if_fail (paint_callback != NULL);
-
-	/* Clip the content to the dirty area */
-	art_irect_intersect (&content_dirty_area, content_bounds, dirty_area);
-	
-	/* No work to do */
-	if (art_irect_empty (&content_dirty_area)) {
-		return;
-	}
-
-	/* Draw content to screen */
-	(* paint_callback) (widget,
-			    widget->window,
-			    gc,
-			    content_dirty_area.x0 - content_bounds->x0,
-			    content_dirty_area.y0 - content_bounds->y0,
-			    &content_dirty_area,
-			    callback_data);
-}
-
-/* Paint the smooth widget's content in transparent alpha composited mode */
-static void
-smooth_widget_paint_content_transparent (GtkWidget *widget,
-					 GdkGC *gc,
-					 NautilusSmoothBackgroundMode background_mode,
-					 guint32 solid_background_color,
-					 const ArtIRect *content_bounds,
-					 int content_opacity,
-					 const ArtIRect *dirty_area,
-					 NautilusSmoothCompositeCallback composite_callback,
-					 gpointer callback_data)
-{
-	ArtIRect content_dirty_area;
-	ArtIRect composite_area;
-	GdkPixbuf *buffer;
-
-	g_return_if_fail (widget_is_smooth (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (gc != NULL);
-	g_return_if_fail (background_mode >= NAUTILUS_SMOOTH_BACKGROUND_GTK);
-	g_return_if_fail (background_mode <= NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	g_return_if_fail (content_opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (content_opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-	g_return_if_fail (content_bounds != NULL && !art_irect_empty (content_bounds));
-	g_return_if_fail (dirty_area != NULL && !art_irect_empty (dirty_area));
-	g_return_if_fail (composite_callback != NULL);
-
-	art_irect_intersect (&content_dirty_area, content_bounds, dirty_area);
-
-	if (art_irect_empty (&content_dirty_area)) {
-		return;
-	}
-
-	buffer = smooth_widget_get_background (widget,
-					       &content_dirty_area,
-					       background_mode,
-					       solid_background_color);
-
- 	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (buffer));
-
-	nautilus_art_irect_assign (&composite_area,
-				   0,
-				   0,
-				   nautilus_art_irect_get_width (&content_dirty_area),
-				   nautilus_art_irect_get_height (&content_dirty_area));
-
-	/* Composite the content into the buffer */
-	(* composite_callback) (widget,
-				buffer,
-				content_dirty_area.x0 - content_bounds->x0,
-				content_dirty_area.y0 - content_bounds->y0,
-				&composite_area,
-				content_opacity,
-				callback_data);
-	
-	/* Draw the composited buffer to the screen */
-	nautilus_gdk_pixbuf_draw_to_drawable (buffer,
-					      widget->window,
-					      gc,
-					      0,
-					      0,
-					      &content_dirty_area,
-					      GDK_RGB_DITHER_NONE,
-					      GDK_PIXBUF_ALPHA_BILEVEL,
-					      NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
-
-	gdk_pixbuf_unref (buffer);
-}
-
-/* Paint both the smooth widget's tile and content in transparent alpha
- * composited mode. */
-static void
-smooth_widget_paint_tile_and_content_transparent (GtkWidget *widget,
-						  GdkGC *gc,
-						  NautilusSmoothBackgroundMode background_mode,
-						  guint32 solid_background_color,
-						  const GdkPixbuf *tile_pixbuf,
-						  const ArtIRect *tile_bounds,
-						  int tile_opacity,
-						  const NautilusArtIPoint *tile_origin,
-						  const ArtIRect *content_bounds,
-						  int content_opacity,
-						  const ArtIRect *dirty_area,
-						  NautilusSmoothCompositeCallback composite_callback,
-						  gpointer callback_data)
-{
- 	ArtIRect tile_dirty_area;
- 	ArtIRect content_dirty_area;
- 	ArtIRect tile_and_content_intersection;
- 	ArtIRect tile_and_content_union;
-
-	g_return_if_fail (widget_is_smooth (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (gc != NULL);
-	g_return_if_fail (background_mode >= NAUTILUS_SMOOTH_BACKGROUND_GTK);
-	g_return_if_fail (background_mode <= NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	g_return_if_fail (tile_opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (tile_opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (tile_pixbuf));
-	g_return_if_fail (tile_bounds != NULL && !art_irect_empty (tile_bounds));
-	g_return_if_fail (tile_origin != NULL);
-	g_return_if_fail (content_opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (content_opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-	g_return_if_fail (content_bounds != NULL && !art_irect_empty (content_bounds));
-	g_return_if_fail (dirty_area != NULL && !art_irect_empty (dirty_area));
-	g_return_if_fail (composite_callback != NULL);
-
-	art_irect_intersect (&tile_dirty_area, tile_bounds, dirty_area);
-	art_irect_intersect (&content_dirty_area, content_bounds, dirty_area);
-
-	/* Both empty, do nothing */
- 	if (art_irect_empty (&tile_dirty_area) && art_irect_empty (&content_dirty_area)) {
- 		return;
- 	}
-
-	/* Only the pixbuf is dirty */
- 	if (art_irect_empty (&tile_dirty_area) && !art_irect_empty (&content_dirty_area)) {
-		smooth_widget_paint_content_transparent (widget,
-							 gc,
-							 background_mode,
-							 solid_background_color,
-							 content_bounds,
-							 content_opacity,
-							 &content_dirty_area,
-							 composite_callback,
-							 NULL);
- 		return;
- 	}
-
-	/* Only the tile is dirty */
- 	if (!art_irect_empty (&tile_dirty_area) && art_irect_empty (&content_dirty_area)) {
-		smooth_widget_paint_tile_transparent (widget,
-						      gc,
-						      background_mode,
-						      solid_background_color,
-						      tile_pixbuf,
-						      tile_bounds,
-						      tile_opacity,
-						      tile_origin,
-						      &tile_dirty_area);
-		return;
- 	}
-
-	art_irect_intersect (&tile_and_content_intersection, &tile_dirty_area, &content_dirty_area);
-
-	/* Both dirty without overlaping each other */
-	if (art_irect_empty (&tile_and_content_intersection)) {
-		smooth_widget_paint_tile_transparent (widget,
-						      gc,
-						      background_mode,
-						      solid_background_color,
-						      tile_pixbuf,
-						      tile_bounds,
-						      tile_opacity,
-						      tile_origin,
-						      &tile_dirty_area);
-		
-		smooth_widget_paint_content_transparent (widget,
-							 gc,
-							 background_mode,
-							 solid_background_color,
-							 content_bounds,
-							 content_opacity,
-							 &content_dirty_area,
-							 composite_callback,
-							 NULL);
-		return;
-	}
-
-	/* Both dirty overlaping each other.  We use the union of the
-	 * two rectangles even though its not the most efficient way.
-	 */
-	art_irect_union (&tile_and_content_union, &tile_dirty_area, &content_dirty_area);
-	
-	if (!art_irect_empty (&tile_and_content_union)) {
-		GdkPixbuf *buffer;
-		ArtIRect tile_area;
-		ArtIRect composite_area;
-		
-		buffer = smooth_widget_get_background (widget,
-						       &tile_and_content_union,
-						       background_mode,
-						       solid_background_color);
-		g_return_if_fail (nautilus_gdk_pixbuf_is_valid (buffer));
-		
-		nautilus_art_irect_assign (&tile_area,
-					   tile_dirty_area.x0 - tile_and_content_union.x0,
-					   tile_dirty_area.y0 - tile_and_content_union.y0,
-					   nautilus_art_irect_get_width (&tile_dirty_area),
-					   nautilus_art_irect_get_height (&tile_dirty_area));
-		
-		/* Composite the tile into the buffer */
-		nautilus_gdk_pixbuf_draw_to_pixbuf_tiled (tile_pixbuf,
-							  buffer,
-							  &tile_area,
-							  gdk_pixbuf_get_width (tile_pixbuf),
-							  gdk_pixbuf_get_height (tile_pixbuf),
- 							  tile_origin->x - tile_and_content_union.x0,
- 							  tile_origin->y - tile_and_content_union.y0,
-							  tile_opacity,
-							  GDK_INTERP_NEAREST);
-
-		nautilus_art_irect_assign (&composite_area,
-					   content_dirty_area.x0 - tile_dirty_area.x0,
-					   content_dirty_area.y0 - tile_dirty_area.y0,
-					   nautilus_art_irect_get_width (&content_dirty_area),
-					   nautilus_art_irect_get_height (&content_dirty_area));
-
-		/* Composite the content into the buffer */
-		(* composite_callback) (widget,
-					buffer,
-					content_dirty_area.x0 - content_bounds->x0,
-					content_dirty_area.y0 - content_bounds->y0,
-					&composite_area,
-					content_opacity,
-					callback_data);
-
-		/* Draw the composited buffer to the screen */
-		nautilus_gdk_pixbuf_draw_to_drawable (buffer,
-						      widget->window,
-						      gc,
-						      0,
-						      0,
-						      &tile_and_content_union,
-						      GDK_RGB_DITHER_NONE,
-						      GDK_PIXBUF_ALPHA_BILEVEL,
-						      NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
-
-		gdk_pixbuf_unref (buffer);
-	}
-}
-
-/**
- * nautilus_smooth_widget_paint:
- * @widget: A smooth widget.
- * @gc: GdkGC to use for copy area.
- * @is_smooth: Is the widget smooth ?
- * @background_mode: Background mode.
- * @solid_background_color: Background color for the case when
- * background_mode is NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR.
- * @tile_pixbuf: Pixbuf to use for tiling or NULL.
- * @tile_bounds: The bounds of the tile or NAUTILUS_ART_IRECT_EMPTY.
- * @tile_opacity: The opacity for the tile when is_smooth is TRUE.
- * @tile_mode_vertical: The vertical tiliing mode.
- * @tile_mode_horizontal: The horizontal tiliing mode.
- * @content_bounds: The bounds of the content or NAUTILUS_ART_IRECT_EMPTY.
- * @content_opacity: The opacity for the content when is_smooth is TRUE.
- * @dirty_area: The dirty area, usually from expose_event().
- * @paint_callback: Content painting callback for when is_smooth is FALSE.
- * @composite_callback: Content compositing callback for when is_smooth is TRUE.
- * @callback_data: Data passed to the callbacks.
- *
- * Paint a smooth widget.  If the 'is_smooth' flag is TRUE, then all painting
- * will be done using alpha compositions.  In this mode the tile_opacity
- * and pixbuf_opacity are honored.  This mode is significantly slower.
- *
- * If the 'is_smooth' flag is FALSE, then all painting will be done
- * using simple copy_area operations.  This is mode is very fast
- * but doesnt look as good.  In this mode, the tile_opacity and
- * pixbuf_opacity are ignored.
- *
- * Also, when 'is_smooth' is TRUE, the 'background_mode' has a huge effect
- * on the performance of this function.  Here we list the 3 background modes
- * in order of SLOWEST to FASTEST:
- *
- * NAUTILUS_SMOOTH_BACKGROUND_GTK:
- *   Use the background as painted by Gtk.  This includes arbitrarily complex
- *   gradients, images and solid colors.  Using this mode will ensure that
- *   the content you are painting is smoothly displayed on top of anything
- *   that is rendered by Gtk.  Unfortunately, for this mode to work a lot
- *   of information needs to be transfered back and forth to the X server.
- *   That means it is very slow.  If you "know" what the contents of the 
- *   surface you are painting on, use on of the other two modes.
- *
- * NAUTILUS_SMOOTH_BACKGROUND_CALLBACK:
- *   Use a callback to draw the background.  This makes is possible to use 
- *   already existing background rendering code.  For example, Nautilus 
- *   uses a NautilusBackground object that can be used as a callback client
- *   for this mode.  The callback is implemented as a widget signal.  The
- *   signature of the callback is 'NautilusSmoothWidgetDrawBackground'.
- *
- * NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR:
- *   Use a solid color for the background.  This is the fastest mode.  It also
- *   has the benefit that since the background is always known, the content
- *   you are rendering can be cached.
- *
- * If a tile_pixbuf is given, then it is rendered according to the value of
- * 'tile_mode_vertical' and 'tile_mode_horizontal'   Here we list the 2
- * valid tiling modes:
- *
- * The 'paint_callback' is invoked when not it smooth mode.
- * The 'composite_callback' is invoked when in smooth mode.
- */
-void
-nautilus_smooth_widget_paint (GtkWidget *widget,
-			      GdkGC *gc,
-			      gboolean is_smooth,
-			      NautilusSmoothBackgroundMode background_mode,
-			      guint32 solid_background_color,
-			      const GdkPixbuf *tile_pixbuf,
-			      const ArtIRect *tile_bounds,
-			      int tile_opacity,
-			      NautilusSmoothTileMode tile_mode_vertical,
-			      NautilusSmoothTileMode tile_mode_horizontal,
-			      const ArtIRect *content_bounds,
-			      int content_opacity,
-			      const ArtIRect *dirty_area,
-			      NautilusSmoothPaintOpaqueCallback paint_callback,
-			      NautilusSmoothCompositeCallback composite_callback,
-			      gpointer callback_data)
-{
-	gboolean tile_empty;
-	gboolean content_empty;
-	NautilusArtIPoint tile_origin;
-
-	g_return_if_fail (widget_is_smooth (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (gc != NULL);
-	g_return_if_fail (background_mode >= NAUTILUS_SMOOTH_BACKGROUND_GTK);
-	g_return_if_fail (background_mode <= NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	g_return_if_fail (tile_opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (tile_opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-	g_return_if_fail (tile_bounds != NULL);
-	g_return_if_fail (tile_mode_vertical >= NAUTILUS_SMOOTH_TILE_SELF);
-	g_return_if_fail (tile_mode_vertical <= NAUTILUS_SMOOTH_TILE_ANCESTOR);
-	g_return_if_fail (tile_mode_horizontal >= NAUTILUS_SMOOTH_TILE_SELF);
-	g_return_if_fail (tile_mode_horizontal <= NAUTILUS_SMOOTH_TILE_ANCESTOR);
-	g_return_if_fail (content_opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (content_opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-	g_return_if_fail (content_bounds != NULL);
-	g_return_if_fail (dirty_area != NULL && !art_irect_empty (dirty_area));
-	g_return_if_fail (paint_callback != NULL);
-	g_return_if_fail (composite_callback != NULL);
-	
-	tile_empty = art_irect_empty (tile_bounds);
-	content_empty = art_irect_empty (content_bounds);
-
-	tile_origin = smooth_widget_get_tile_origin_point (widget,
-							   tile_mode_vertical,
-							   tile_mode_horizontal);
-
-	/* Smooth */
-	if (is_smooth) {
-		if (!content_empty && !tile_empty) {
-			smooth_widget_paint_tile_and_content_transparent (widget,
-									  gc,
-									  background_mode,
-									  solid_background_color,
-									  tile_pixbuf,
-									  tile_bounds,
-									  tile_opacity,
-									  &tile_origin,
-									  content_bounds,
-									  content_opacity,
-									  dirty_area,
-									  composite_callback,
-									  callback_data);
-			
-		} else if (!content_empty) {
-			smooth_widget_paint_content_transparent (widget,
-								 gc,
-								 background_mode,
-								 solid_background_color,
-								 content_bounds,
-								 content_opacity,
-								 dirty_area,
-								 composite_callback,
-								 callback_data);
-		} else {
-			smooth_widget_paint_tile_transparent (widget,
-							      gc,
-							      background_mode,
-							      solid_background_color,
-							      tile_pixbuf,
-							      tile_bounds,
-							      tile_opacity,
-							      &tile_origin,
-							      dirty_area);
-		}
-	/* Not smooth */
-	} else {
-		/* Draw the tile if needed */
-		if (!tile_empty) {
-			smooth_widget_paint_tile_opaque (widget,
-							 gc,
-							 tile_pixbuf,
-							 tile_bounds,
-							 &tile_origin,
-							 dirty_area);
-		}
-		
-		/* Drae the content if needed */
-		if (!content_empty) {
-			smooth_widget_paint_content_opaque (widget,
-							    gc,
-							    content_bounds,
-							    dirty_area,
-							    paint_callback,
-							    callback_data);
-		}
-	}
-}
-
-/**
- * nautilus_smooth_widget_get_tile_bounds:
- * @widget: A smooth widget.
- * @tile_pixbuf: The tile pixbuf.
- * @tile_width: The tile width.
- * @tile_height: The tile height.
- *
- * Return the bounds for the smooth widget's tile.  
- *
- * tile_width controls the horizontal extent of the tile.
- *
- * tile_height controls the vertical extent of the tile.
- *
- * tile_width/tile_height can be integer values greater than
- * zero.  We also allow two special values:
- *
- * NAUTILUS_SMOOTH_TILE_EXTENT_FULL:
- *   Tile occupies the full extent available either horizontall (tile_width)
- *   or vertically (tile_height).  This basically mean that the tile occupies
- *   the full 'GtkWidget allocation'
- *
- * NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP:
- *   Tile occupies a single tile step.  A tile step is equal to the width and
- *   height of the tile pixbuf for the horizontal and veritcal cases 
- *   respectively.
- *
- */
-ArtIRect
-nautilus_smooth_widget_get_tile_bounds (const GtkWidget *widget,
-					const GdkPixbuf *tile_pixbuf,
-					int tile_width,
-					int tile_height)
-{
-	ArtIRect bounds;
-	ArtIRect tile_bounds;
-	ArtIRect clipped_tile_bounds;
-
-	g_return_val_if_fail (widget_is_smooth (widget), NAUTILUS_ART_IRECT_EMPTY);
-	g_return_val_if_fail (tile_width >= NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP, NAUTILUS_ART_IRECT_EMPTY);
-	g_return_val_if_fail (tile_height >= NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP, NAUTILUS_ART_IRECT_EMPTY);
-
-	if (tile_pixbuf == NULL) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	tile_bounds.x0 = widget->allocation.x;
-	tile_bounds.y0 = widget->allocation.y;
-	
-	if (tile_width == NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP) {
-		tile_bounds.x1 = tile_bounds.x0 + gdk_pixbuf_get_width (tile_pixbuf);
-	} else if (tile_width == NAUTILUS_SMOOTH_TILE_EXTENT_FULL) {
-		tile_bounds.x1 = tile_bounds.x0 + widget->allocation.width;
-	} else {
-		tile_bounds.x1 = tile_bounds.x0 + tile_width;
-	}
-
-	if (tile_height == NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP) {
-		tile_bounds.y1 = tile_bounds.y0 + gdk_pixbuf_get_height (tile_pixbuf);
-	} else if (tile_height == NAUTILUS_SMOOTH_TILE_EXTENT_FULL) {
-		tile_bounds.y1 = tile_bounds.y0 + widget->allocation.height;
-	} else {
-		tile_bounds.y1 = tile_bounds.y0 + tile_height;
-	}
-
-	/* Clip the tile bounds to the widget bounds */
-	bounds = nautilus_gtk_widget_get_bounds (widget);
-	art_irect_intersect (&clipped_tile_bounds, &tile_bounds, &bounds);
-
-	return tile_bounds;
-}
-
-NautilusDimensions
-nautilus_smooth_widget_get_preferred_dimensions (const GtkWidget *widget,
-						 const NautilusDimensions *content_dimensions,
-						 const NautilusDimensions *tile_dimensions,
-						 int tile_width,
-						 int tile_height)
-{
-	NautilusDimensions preferred_dimensions;
-
-	g_return_val_if_fail (widget_is_smooth (widget), NAUTILUS_DIMENSIONS_EMPTY);
-	g_return_val_if_fail (content_dimensions != NULL, NAUTILUS_DIMENSIONS_EMPTY);
-	g_return_val_if_fail (tile_dimensions != NULL, NAUTILUS_DIMENSIONS_EMPTY);
-	g_return_val_if_fail (tile_width >= NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP, NAUTILUS_DIMENSIONS_EMPTY);
-	g_return_val_if_fail (tile_height >= NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP, NAUTILUS_DIMENSIONS_EMPTY);
-	
-	if (tile_width == NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP) {
-		tile_width = tile_dimensions->width;
-	} else {
-		tile_width = 0;
-	}
-
-	if (tile_height == NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP) {
-		tile_height = tile_dimensions->height;
-	} else {
-		tile_height = 0;
-	}
-	
-	preferred_dimensions.width = MAX (content_dimensions->width, tile_width) + (2 * GTK_MISC (widget)->xpad);
-	preferred_dimensions.height = MAX (content_dimensions->height, tile_height) + (2 * GTK_MISC (widget)->ypad);
-
-	/* Make sure the dimensions is not zero.  Gtk goes berserk with zero size widget */
-	preferred_dimensions.width = MAX (preferred_dimensions.width, 2);
-	preferred_dimensions.height = MAX (preferred_dimensions.height, 2);
-
-	return preferred_dimensions;
-}
-
-void
-nautilus_smooth_widget_register_type (GtkType type)
-{
-	if (smooth_widget_type_list == NULL) {
-		g_atexit (smooth_widget_type_list_free);
-	}
-
-	smooth_widget_type_list = g_list_append (smooth_widget_type_list, GINT_TO_POINTER (type));
-}
-
diff --git a/libnautilus-extensions/nautilus-smooth-widget.h b/libnautilus-extensions/nautilus-smooth-widget.h
deleted file mode 100644
index d92fc0515..000000000
--- a/libnautilus-extensions/nautilus-smooth-widget.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-smooth-widget.h - Functions and types shared by smooth widgets.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_SMOOTH_WIDGET_H
-#define NAUTILUS_SMOOTH_WIDGET_H
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkwidget.h>
-#include <libnautilus-extensions/nautilus-art-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-
-BEGIN_GNOME_DECLS
-
-/* See nautilus_smooth_widget_get_tile_bounds() */
-#define NAUTILUS_SMOOTH_TILE_EXTENT_FULL	-1
-#define NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP	-2
-
-/* See nautilus_smooth_widget_paint() */
-typedef enum
-{
-	NAUTILUS_SMOOTH_BACKGROUND_GTK,
-	NAUTILUS_SMOOTH_BACKGROUND_CALLBACK,
-	NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR
-} NautilusSmoothBackgroundMode;
-
-/* See nautilus_smooth_widget_paint() */
-typedef enum
-{
-	NAUTILUS_SMOOTH_TILE_SELF,
-	NAUTILUS_SMOOTH_TILE_ANCESTOR
-} NautilusSmoothTileMode;
-
-/* Prototypes for shared methods.  We declare these here so that
- * the signatures in the smooth widget's class struture dont
- * get out of whack.
- */
-typedef void (* NautilusSmoothWidgetDrawBackground) (GtkWidget *widget,
-						     GdkPixbuf *buffer,
-						     const ArtIRect *area);
-typedef void (* NautilusSmoothWidgetSetIsSmooth) (GtkWidget *widget,
-						  gboolean is_smooth);
-
-
-/* Callback for nautilus_smooth_widget_paint() used to render the
- * smooth widget's content when not in smooth mode.
- */
-typedef void (* NautilusSmoothPaintOpaqueCallback) (GtkWidget *widget,
-						    GdkDrawable *destination_drawable,
-						    GdkGC *gc,
-						    int source_x,
-						    int source_y,
-						    const ArtIRect *area,
-						    gpointer callback_data);
-
-/* Callback for nautilus_smooth_widget_paint() used to composite the
- * smooth widget's content when in smooth mode.
- */
-typedef void (* NautilusSmoothCompositeCallback) (GtkWidget *widget,
-						  GdkPixbuf *destination_pixbuf,
-						  int source_x,
-						  int source_y,
-						  const ArtIRect *area,
-						  int opacity,
-						  gpointer callback_data);
-
-void               nautilus_smooth_widget_register                 (GtkWidget                         *widget);
-void               nautilus_smooth_widget_paint                    (GtkWidget                         *widget,
-								    GdkGC                             *gc,
-								    gboolean                           is_smooth,
-								    NautilusSmoothBackgroundMode       background_mode,
-								    guint32                            solid_background_color,
-								    const GdkPixbuf                   *tile_pixbuf,
-								    const ArtIRect                    *tile_bounds,
-								    int                                tile_opacity,
-								    NautilusSmoothTileMode             tile_mode_vertical,
-								    NautilusSmoothTileMode             tile_mode_horizontal,
-								    const ArtIRect                    *content_bounds,
-								    int                                content_opacity,
-								    const ArtIRect                    *dirty_area,
-								    NautilusSmoothPaintOpaqueCallback  paint_callback,
-								    NautilusSmoothCompositeCallback    composite_callback,
-								    gpointer                           callback_data);
-ArtIRect           nautilus_smooth_widget_get_tile_bounds          (const GtkWidget                   *widget,
-								    const GdkPixbuf                   *tile_pixbuf,
-								    int                                tile_width,
-								    int                                tile_height);
-NautilusDimensions nautilus_smooth_widget_get_preferred_dimensions (const GtkWidget                   *widget,
-								    const NautilusDimensions          *content_dimensions,
-								    const NautilusDimensions          *tile_dimensions,
-								    int                                tile_width,
-								    int                                tile_height);
-void               nautilus_smooth_widget_register_type            (GtkType                            type);
-
-void               nautilus_smooth_widget_global_set_is_smooth     (gboolean                           is_smooth);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_SMOOTH_WIDGET_H */
-
-
diff --git a/libnautilus-extensions/nautilus-stock-dialogs.c b/libnautilus-extensions/nautilus-stock-dialogs.c
deleted file mode 100644
index d95f58706..000000000
--- a/libnautilus-extensions/nautilus-stock-dialogs.c
+++ /dev/null
@@ -1,668 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-stock-dialogs.c: Various standard dialogs for Nautilus.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-stock-dialogs.h"
-
-#include "nautilus-glib-extensions.h"
-#include "nautilus-gnome-extensions.h"
-#include "nautilus-string.h"
-#include <gtk/gtkbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnomeui/gnome-uidefs.h>
-
-#define TIMED_WAIT_STANDARD_DURATION 2000
-#define TIMED_WAIT_MIN_TIME_UP 3000
-
-#define TIMED_WAIT_MINIMUM_DIALOG_WIDTH 300
-
-typedef struct {
-	NautilusCancelCallback cancel_callback;
-	gpointer callback_data;
-
-	/* Parameters for creation of the window. */
-	char *window_title;
-	char *wait_message;
-	GtkWindow *parent_window;
-
-	/* Timer to determine when we need to create the window. */
-	guint timeout_handler_id;
-	
-	/* Window, once it's created. */
-	GnomeDialog *dialog;
-	
-	/* system time (microseconds) when dialog was created */
-	gint64 dialog_creation_time;
-
-} TimedWait;
-
-static GHashTable *timed_wait_hash_table;
-
-static void find_message_label_callback (GtkWidget *widget,
-					 gpointer   callback_data);
-
-static void timed_wait_dialog_destroy_callback (GtkObject *object, gpointer callback_data);
-
-
-static guint
-timed_wait_hash (gconstpointer value)
-{
-	const TimedWait *wait;
-
-	wait = value;
-
-	return GPOINTER_TO_UINT (wait->cancel_callback)
-		^ GPOINTER_TO_UINT (wait->callback_data);
-}
-
-static gboolean
-timed_wait_hash_equal (gconstpointer value1, gconstpointer value2)
-{
-	const TimedWait *wait1, *wait2;
-
-	wait1 = value1;
-	wait2 = value2;
-
-	return wait1->cancel_callback == wait2->cancel_callback
-		&& wait1->callback_data == wait2->callback_data;
-}
-
-static void
-add_label_to_dialog (GnomeDialog *dialog, const char *message)
-{
-	GtkLabel *message_widget;
-
-	if (message == NULL) {
-		return;
-	}
-	
-	message_widget = GTK_LABEL (gtk_label_new (message));
-	gtk_label_set_line_wrap (message_widget, TRUE);
-	gtk_label_set_justify (message_widget,
-			       GTK_JUSTIFY_LEFT);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox),
-			    GTK_WIDGET (message_widget),
-			    TRUE, TRUE, GNOME_PAD);
-}
-
-static void
-timed_wait_delayed_close_destroy_dialog_callback (GtkObject *object, gpointer callback_data)
-{
-	gtk_timeout_remove (GPOINTER_TO_UINT (callback_data));
-}
-
-static gboolean
-timed_wait_delayed_close_timeout_callback (gpointer callback_data)
-{
-	guint handler_id;
-
-	handler_id = GPOINTER_TO_UINT (gtk_object_get_data (GTK_OBJECT (callback_data),
-							    "nautilus-stock-dialogs/delayed_close_handler_timeout_id"));
-	
-	gtk_signal_disconnect_by_func (GTK_OBJECT (callback_data),
-			    	       timed_wait_delayed_close_destroy_dialog_callback,
-			    	       GUINT_TO_POINTER (handler_id));
-	
-	gtk_object_destroy (GTK_OBJECT (callback_data));
-
-	return FALSE;
-}
-
-static void
-timed_wait_free (TimedWait *wait)
-{
-	guint delayed_close_handler_id;
-	guint32 time_up;
-
-	g_assert (g_hash_table_lookup (timed_wait_hash_table, wait) != NULL);
-
-	g_hash_table_remove (timed_wait_hash_table, wait);
-
-	g_free (wait->window_title);
-	g_free (wait->wait_message);
-	if (wait->parent_window != NULL) {
-		gtk_widget_unref (GTK_WIDGET (wait->parent_window));
-	}
-	if (wait->timeout_handler_id != 0) {
-		gtk_timeout_remove (wait->timeout_handler_id);
-	}
-	if (wait->dialog != NULL) {
-		/* Make sure to detach from the "destroy" signal, or we'll
-		 * double-free.
-		 */
-		gtk_signal_disconnect_by_func (GTK_OBJECT (wait->dialog),
-					       timed_wait_dialog_destroy_callback,
-					       wait);
-
-		/* compute time up in milliseconds */
-		time_up = (nautilus_get_system_time () - wait->dialog_creation_time) / 1000;
-		
-		if (time_up < TIMED_WAIT_MIN_TIME_UP) {
-			delayed_close_handler_id = gtk_timeout_add (TIMED_WAIT_MIN_TIME_UP - time_up,
-			                                            timed_wait_delayed_close_timeout_callback,
-			                                            wait->dialog);
-			gtk_object_set_data (GTK_OBJECT (wait->dialog),
-					     "nautilus-stock-dialogs/delayed_close_handler_timeout_id",
-					     GUINT_TO_POINTER (delayed_close_handler_id));
-			gtk_signal_connect (GTK_OBJECT (wait->dialog), "destroy",
-					    timed_wait_delayed_close_destroy_dialog_callback,
-					    GUINT_TO_POINTER (delayed_close_handler_id));
-		} else {
-			gtk_object_destroy (GTK_OBJECT (wait->dialog));
-		}
-	}
-
-	/* And the wait object itself. */
-	g_free (wait);
-}
-
-static void
-timed_wait_dialog_destroy_callback (GtkObject *object, gpointer callback_data)
-{
-	TimedWait *wait;
-
-	wait = callback_data;
-
-	g_assert (GNOME_DIALOG (object) == wait->dialog);
-
-	wait->dialog = NULL;
-	
-	/* When there's no cancel_callback, the originator will/must
-	 * call nautilus_timed_wait_stop which will call timed_wait_free.
-	 */
-
-	if (wait->cancel_callback != NULL) {
-		(* wait->cancel_callback) (wait->callback_data);
-		timed_wait_free (wait);
-	}
-}
-
-static gboolean
-timed_wait_callback (gpointer callback_data)
-{
-	TimedWait *wait;
-	GnomeDialog *dialog;
-	const char *button;
-
-	wait = callback_data;
-
-	/* Put up the timed wait window. */
-	button = wait->cancel_callback != NULL ? GNOME_STOCK_BUTTON_CANCEL : GNOME_STOCK_BUTTON_OK;
-	dialog = GNOME_DIALOG (gnome_dialog_new (wait->window_title, button, NULL));
-
-	/* The contents are often very small, causing tiny little
-	 * dialogs with their titles clipped if you just let gtk
-	 * sizing do its thing. This enforces a minimum width to
-	 * make it more likely that the title won't be clipped.
-	 */
-	gtk_widget_set_usize (GTK_WIDGET (dialog),
-			      TIMED_WAIT_MINIMUM_DIALOG_WIDTH,
-			      -1);
-	gtk_window_set_wmclass (GTK_WINDOW (dialog), "dialog", "Nautilus");
-	add_label_to_dialog (dialog, wait->wait_message);
-	gnome_dialog_set_close (dialog, TRUE);
-	wait->dialog_creation_time = nautilus_get_system_time ();
-	gtk_widget_show_all (GTK_WIDGET (dialog));
-
-	/* FIXME bugzilla.eazel.com 2441: 
-	 * Could parent here, but it's complicated because we
-	 * don't want this window to go away just because the parent
-	 * would go away first.
-	 */
-
-	/* Make the dialog cancel the timed wait when it goes away.
-	 * Connect to "destroy" instead of "clicked" since we want
-	 * to be called no matter how the dialog goes away.
-	 */
-	gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
-			    timed_wait_dialog_destroy_callback, wait);
-
-	wait->timeout_handler_id = 0;
-	wait->dialog = dialog;
-	
-	return FALSE;
-}
-
-void
-nautilus_timed_wait_start_with_duration (int duration,
-					 NautilusCancelCallback cancel_callback,
-					 gpointer callback_data,
-					 const char *window_title,
-					 const char *wait_message,
-					 GtkWindow *parent_window)
-{
-	TimedWait *wait;
-	
-	g_return_if_fail (callback_data != NULL);
-	g_return_if_fail (window_title != NULL);
-	g_return_if_fail (wait_message != NULL);
-	g_return_if_fail (parent_window == NULL || GTK_IS_WINDOW (parent_window));
-
-	/* Create the timed wait record. */
-	wait = g_new0 (TimedWait, 1);
-	wait->window_title = g_strdup (window_title);
-	wait->wait_message = g_strdup (wait_message);
-	wait->cancel_callback = cancel_callback;
-	wait->callback_data = callback_data;
-	wait->parent_window = parent_window;
-	
-	if (parent_window != NULL) {
-		gtk_widget_ref (GTK_WIDGET (parent_window));
-	}
-
-	/* Start the timer. */
-	wait->timeout_handler_id = gtk_timeout_add (duration, timed_wait_callback, wait);
-
-	/* Put in the hash table so we can find it later. */
-	if (timed_wait_hash_table == NULL) {
-		timed_wait_hash_table = nautilus_g_hash_table_new_free_at_exit
-			(timed_wait_hash, timed_wait_hash_equal, __FILE__ ": timed wait");
-	}
-	g_assert (g_hash_table_lookup (timed_wait_hash_table, wait) == NULL);
-	g_hash_table_insert (timed_wait_hash_table, wait, wait);
-	g_assert (g_hash_table_lookup (timed_wait_hash_table, wait) == wait);
-}
-
-void
-nautilus_timed_wait_start (NautilusCancelCallback cancel_callback,
-			   gpointer callback_data,
-			   const char *window_title,
-			   const char *wait_message,
-			   GtkWindow *parent_window)
-{
-	nautilus_timed_wait_start_with_duration
-		(TIMED_WAIT_STANDARD_DURATION,
-		 cancel_callback, callback_data,
-		 window_title, wait_message, parent_window);
-}
-
-void
-nautilus_timed_wait_stop (NautilusCancelCallback cancel_callback,
-			  gpointer callback_data)
-{
-	TimedWait key;
-	TimedWait *wait;
-
-	g_return_if_fail (callback_data != NULL);
-	
-	key.cancel_callback = cancel_callback;
-	key.callback_data = callback_data;
-	wait = g_hash_table_lookup (timed_wait_hash_table, &key);
-
-	g_return_if_fail (wait != NULL);
-
-	timed_wait_free (wait);
-}
-
-static const char **
-convert_varargs_to_name_array (va_list args)
-{
-	GPtrArray *resizeable_array;
-	const char *name;
-	const char **plain_ole_array;
-	
-	resizeable_array = g_ptr_array_new ();
-
-	do {
-		name = va_arg (args, const char *);
-		g_ptr_array_add (resizeable_array, (gpointer) name);
-	} while (name != NULL);
-
-	plain_ole_array = (const char **) resizeable_array->pdata;
-	
-	g_ptr_array_free (resizeable_array, FALSE);
-
-	return plain_ole_array;
-}
-
-static gboolean
-delete_event_callback (gpointer data,
-		       gpointer user_data)
-{
-	g_return_val_if_fail (GNOME_IS_DIALOG (data), FALSE);
-	gtk_signal_emit_stop_by_name (GTK_OBJECT (data),
-				      "delete_event");
-	return TRUE;
-}
-
-int
-nautilus_run_simple_dialog (GtkWidget *parent, gboolean ignore_close_box,
-			const char *text, const char *title, ...)
-{
-	va_list button_title_args;
-	const char **button_titles;
-        GtkWidget *dialog;
-        GtkWidget *top_widget;
-	int result;
-
-	
-	/* Create the dialog. */
-	va_start (button_title_args, title);
-	button_titles = convert_varargs_to_name_array (button_title_args);
-	va_end (button_title_args);
-        dialog = gnome_dialog_newv (title, button_titles);
-	g_free (button_titles);
-	
-	/* Allow close. */
-	if (ignore_close_box) {
-		gtk_signal_connect (GTK_OBJECT (dialog),
-				    "delete_event",
-				    GTK_SIGNAL_FUNC (delete_event_callback),
-				    NULL);
-
-	}
-	
-        gnome_dialog_set_close (GNOME_DIALOG (dialog), TRUE);
-
-	gtk_window_set_wmclass (GTK_WINDOW (dialog), "dialog", "Nautilus");
-
-	/* Parent it if asked to. */
-        if (parent != NULL) {
-		top_widget = gtk_widget_get_toplevel (parent);
-		if (GTK_IS_WINDOW (top_widget) && !GTK_OBJECT_DESTROYED (top_widget)) {
-			gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (top_widget));
-		}
-	}
-	
-	/* Title it if asked to. */
-	add_label_to_dialog (GNOME_DIALOG (dialog), text);
-
-	/* Run it. */
-        gtk_widget_show_all (dialog);
-        result = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-	while (result == -1 && ignore_close_box) {
-		gtk_widget_show (GTK_WIDGET (dialog));
-		result = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-	}
-
-	return result;
-}
-
-static void
-find_message_label (GtkWidget *widget, const char *message)
-{
-	char *text;
-
-	/* Turn on the flag if we find a label with the message
-	 * in it.
-	 */
-	if (GTK_IS_LABEL (widget)) {
-		gtk_label_get (GTK_LABEL (widget), &text);
-		if (nautilus_strcmp (text, message) == 0) {
-			gtk_object_set_data (GTK_OBJECT (gtk_widget_get_toplevel (widget)),
-					     "message label", widget);
-		}
-	}
-
-	/* Recurse for children. */
-	if (GTK_IS_CONTAINER (widget)) {
-		gtk_container_foreach (GTK_CONTAINER (widget),
-				       find_message_label_callback,
-				       (char *) message);
-	}
-}
-
-static void
-find_message_label_callback (GtkWidget *widget, gpointer callback_data)
-{
-	find_message_label (widget, callback_data);
-}
-
-static GnomeDialog *
-create_message_box (const char *message,
-		  const char *dialog_title,
-		  const char *type,
-		  const char *button_0,
-		  const char *button_1,
-		  GtkWindow *parent)
-{  
-	GtkWidget *box;
-	GtkLabel *message_label;
-
-	g_assert (dialog_title != NULL);
-
-	box = gnome_message_box_new (message, type, button_0, button_1, NULL);
-	gtk_window_set_title (GTK_WINDOW (box), dialog_title);
-	gtk_window_set_wmclass (GTK_WINDOW (box), "stock_dialog", "Nautilus");
-	
-	/* A bit of a hack. We want to use gnome_message_box_new,
-	 * but we want the message to be wrapped. So, we search
-	 * for the label with this message so we can mark it.
-	 */
-	find_message_label (box, message);
-	message_label = GTK_LABEL (gtk_object_get_data (GTK_OBJECT (box), "message label"));
-	gtk_label_set_line_wrap (message_label, TRUE);
-
-	if (parent != NULL && !GTK_OBJECT_DESTROYED (parent)) {
-		gnome_dialog_set_parent (GNOME_DIALOG (box), parent);
-	}
-	return GNOME_DIALOG (box);
-}
-
-static GnomeDialog *
-show_message_box (const char *message,
-		  const char *dialog_title,
-		  const char *type,
-		  const char *button_0,
-		  const char *button_1,
-		  GtkWindow *parent)
-{
-	GnomeDialog *dialog;
-
-	dialog = create_message_box (message, dialog_title, type, 
-				     button_0, button_1, parent);  
-	gtk_widget_show (GTK_WIDGET (dialog));
-
-	return dialog;
-}
-
-static GnomeDialog *
-show_ok_box (const char *message,
-	     const char *dialog_title,
-	     const char *type,
-	     GtkWindow *parent)
-{  
-	return show_message_box	(message, dialog_title, type, GNOME_STOCK_BUTTON_OK, NULL, parent);
-}
-
-GnomeDialog *
-nautilus_create_info_dialog (const char *info,
-			     const char *dialog_title,
-			     GtkWindow *parent)
-{
-	return create_message_box (info, dialog_title, 
-				   GNOME_MESSAGE_BOX_INFO,
-				   GNOME_STOCK_BUTTON_OK, NULL, parent);
-				     
-}
-
-GnomeDialog *
-nautilus_show_info_dialog (const char *info,
-	 	      	   const char *dialog_title,
-		      	   GtkWindow *parent)
-{
-	return show_ok_box (info, 
-			    dialog_title == NULL ? _("Info") : dialog_title, 
-			    GNOME_MESSAGE_BOX_INFO, parent);
-}
-
-static void
-details_dialog_clicked_callback (GnomeDialog *dialog,
-				 int button_number,
-				 const char *detailed_message)
-{
-	GtkLabel *label;
-
-	switch (button_number) {
-	case 0: /* Details */
-		label = GTK_LABEL (gtk_object_get_data (GTK_OBJECT (dialog), "message label"));
-		gtk_label_set_text (label, detailed_message);
-		gtk_widget_hide (GTK_WIDGET (nautilus_gnome_dialog_get_button_by_index (dialog, 0)));
-		break;
-	case 1: /* OK */
-		gnome_dialog_close (dialog);
-		break;
-	}
-}
-
-
-GnomeDialog *
-nautilus_show_info_dialog_with_details (const char *info,
-					const char *dialog_title,
-					const char *detailed_info,
-					GtkWindow *parent)
-{
-	GnomeDialog *dialog;
-
-	if (detailed_info == NULL
-	    || strcmp (info, detailed_info) == 0) {
-		return nautilus_show_info_dialog (info, dialog_title, parent);
-	}
-
-	dialog = show_message_box (info, 
-				   dialog_title == NULL ? _("Info") : dialog_title, 
-				   GNOME_MESSAGE_BOX_INFO, 
-				   _("Details"), GNOME_STOCK_BUTTON_OK, parent);
-
-	gnome_dialog_set_close (dialog, FALSE);
-	gtk_signal_connect_full (GTK_OBJECT (dialog), "clicked",
-				 details_dialog_clicked_callback, NULL, g_strdup (detailed_info),
-				 g_free, FALSE, FALSE);
-
-	return dialog;
-
-}
-
-
-GnomeDialog *
-nautilus_show_warning_dialog (const char *warning,
-	 	      	      const char *dialog_title,
-			      GtkWindow *parent)
-{
-	return show_ok_box (warning, 
-			    dialog_title == NULL ? _("Warning") : dialog_title, 
-			    GNOME_MESSAGE_BOX_WARNING, parent);
-}
-
-
-GnomeDialog *
-nautilus_show_error_dialog (const char *error,
-	 	       	    const char *dialog_title,
-		       	    GtkWindow *parent)
-{
-	return show_ok_box (error,
-			    dialog_title == NULL ? _("Error") : dialog_title, 
-			    GNOME_MESSAGE_BOX_ERROR, parent);
-}
-
-
-GnomeDialog *
-nautilus_show_error_dialog_with_details (const char *error_message,
-				    	 const char *dialog_title,
-				    	 const char *detailed_error_message,
-				    	 GtkWindow *parent)
-{
-	GnomeDialog *dialog;
-
-	g_return_val_if_fail (error_message != NULL, NULL);
-	g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL);
-
-	if (detailed_error_message == NULL
-	    || strcmp (error_message, detailed_error_message) == 0) {
-		return nautilus_show_error_dialog (error_message, dialog_title, parent);
-	}
-
-	dialog = show_message_box (error_message, 
-				   dialog_title == NULL ? _("Error") : dialog_title,
-				   GNOME_MESSAGE_BOX_ERROR,
-				   _("Details"), GNOME_STOCK_BUTTON_OK, parent);
-
-	/* Show the details when you click on the details button. */
-	gnome_dialog_set_close (dialog, FALSE);
-	gtk_signal_connect_full (GTK_OBJECT (dialog), "clicked",
-				 details_dialog_clicked_callback, NULL, g_strdup (detailed_error_message),
-				 g_free, FALSE, FALSE);
-
-	return dialog;
-}
-
-/**
- * nautilus_show_yes_no_dialog:
- * 
- * Create and show a dialog asking a question with two choices.
- * The caller needs to set up any necessary callbacks 
- * for the buttons. Use nautilus_create_question_dialog instead
- * if any visual changes need to be made, to avoid flashiness.
- * @question: The text of the question.
- * @yes_label: The label of the "yes" button.
- * @no_label: The label of the "no" button.
- * @parent: The parent window for this dialog.
- */
-GnomeDialog *
-nautilus_show_yes_no_dialog (const char *question, 
-		    	     const char *dialog_title,
-			     const char *yes_label,
-			     const char *no_label,
-			     GtkWindow *parent)
-{
-	return show_message_box (question,
-				 dialog_title == NULL ? _("Question") : dialog_title, 
-				 GNOME_MESSAGE_BOX_QUESTION,
-				 yes_label,
-				 no_label,
-				 parent);
-}
-
-/**
- * nautilus_create_question_dialog:
- * 
- * Create a dialog asking a question with at least two choices.
- * The caller needs to set up any necessary callbacks 
- * for the buttons. The dialog is not yet shown, so that the
- * caller can add additional buttons or make other visual changes
- * without causing flashiness.
- * @question: The text of the question.
- * @answer_0: The label of the leftmost button (index 0)
- * @answer_1: The label of the 2nd-to-leftmost button (index 1)
- * @parent: The parent window for this dialog.
- */
-GnomeDialog *
-nautilus_create_question_dialog (const char *question,
-				 const char *dialog_title,
-				 const char *answer_0,
-				 const char *answer_1,
-				 GtkWindow *parent)
-{
-	return create_message_box (question,
-				   dialog_title == NULL ? _("Question") : dialog_title, 
-				   GNOME_MESSAGE_BOX_QUESTION,
-				   answer_0,
-				   answer_1,
-				   parent);
-}				 
diff --git a/libnautilus-extensions/nautilus-stock-dialogs.h b/libnautilus-extensions/nautilus-stock-dialogs.h
deleted file mode 100644
index c5980c2f0..000000000
--- a/libnautilus-extensions/nautilus-stock-dialogs.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-stock-dialogs.h: Various standard dialogs for Nautilus.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#ifndef NAUTILUS_STOCK_DIALOGS_H
-#define NAUTILUS_STOCK_DIALOGS_H
-
-#include <libgnomeui/gnome-dialog.h>
-
-typedef void (* NautilusCancelCallback) (gpointer callback_data);
-
-/* Dialog for cancelling something that normally is fast enough not to need a dialog. */
-void         nautilus_timed_wait_start          (NautilusCancelCallback  cancel_callback,
-						 gpointer                callback_data,
-						 const char             *window_title,
-						 const char             *wait_message,
-						 GtkWindow              *parent_window);
-void	     nautilus_timed_wait_start_with_duration (
-						 int			 duration,
-						 NautilusCancelCallback  cancel_callback,
-						 gpointer                callback_data,
-						 const char             *window_title,
-						 const char             *wait_message,
-						 GtkWindow              *parent_window);
-void         nautilus_timed_wait_stop           (NautilusCancelCallback  cancel_callback,
-						 gpointer                callback_data);
-
-/* Basic dialog with buttons. */
-int          nautilus_run_simple_dialog         (GtkWidget              *parent,
-						 gboolean               ignore_close_box,
-						 const char             *text,
-						 const char             *title,
-						 ...);
-
-/* Variations on gnome stock dialogs; these do line wrapping, we don't
- * bother with non-parented versions, we allow setting the title,
- * and we return GnomeDialog pointers instead of GtkWidget pointers.
- */
-
-GnomeDialog *nautilus_show_info_dialog               (const char             *informative_message,
-						      const char	     *dialog_title,
-						      GtkWindow              *parent);
-GnomeDialog *nautilus_show_info_dialog_with_details  (const char             *informative_message,
-						      const char             *dialog_title,
-						      const char             *detailed_informative_message,
-						      GtkWindow              *parent);
-GnomeDialog *nautilus_show_warning_dialog            (const char             *warning_message,
-						      const char	     *dialog_title,
-						      GtkWindow              *parent);
-GnomeDialog *nautilus_show_error_dialog              (const char             *error_message,
-						      const char	     *dialog_title,
-						      GtkWindow              *parent);
-GnomeDialog *nautilus_show_error_dialog_with_details (const char             *error_message,
-						      const char	     *dialog_title,
-						      const char             *detailed_error_message,
-						      GtkWindow              *parent);
-GnomeDialog *nautilus_show_yes_no_dialog             (const char             *question,
-						      const char	     *dialog_title,
-						      const char             *yes_label,
-						      const char             *no_label,
-						      GtkWindow              *parent);
-
-GnomeDialog *nautilus_create_question_dialog         (const char             *question,
-						      const char	     *dialog_title,
-						      const char             *answer_zero,
-						      const char             *answer_one,
-						      GtkWindow              *parent);
-GnomeDialog *nautilus_create_info_dialog             (const char             *informative_message,
-						      const char             *dialog_title,
-						      GtkWindow              *parent);
-
-#endif /* NAUTILUS_STOCK_DIALOGS_H */
diff --git a/libnautilus-extensions/nautilus-string-list.c b/libnautilus-extensions/nautilus-string-list.c
deleted file mode 100644
index 196c501f5..000000000
--- a/libnautilus-extensions/nautilus-string-list.c
+++ /dev/null
@@ -1,1223 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-string-list.h: A collection of strings.
- 
-   Copyright (C) 1999, 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-string-list.h"
-
-#include <string.h>
-#include "nautilus-glib-extensions.h"
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-string.h"
-
-static gboolean suppress_out_of_bounds_warning;
-
-struct _NautilusStringList
-{
-	GList		*strings;
-	GCompareFunc	compare_function;
-};
-
-static gboolean str_is_equal (const char *a,
-			      const char *b,
-			      gboolean    case_sensitive);
-
-/**
- * nautilus_string_list_new:
- *
- * @case_sensitive: Flag indicating whether the new string list is case sensitive.
- *
- * Return value: A newly constructed string list.
- */
-NautilusStringList *
-nautilus_string_list_new (gboolean case_sensitive)
-{
-	NautilusStringList * string_list;
-
-	string_list = g_new (NautilusStringList, 1);
-
-	string_list->strings = NULL;
-	string_list->compare_function = case_sensitive
-		? nautilus_strcmp_compare_func
-		: nautilus_strcasecmp_compare_func;
-	/* FIXME: If these lists are seen by users, we want to use
-	 * strcoll, not strcasecmp.
-	 */
-
-	return string_list;
-}
-
-/**
- * nautilus_string_list_new_from_string:
- *
- * @other_or_null: A NautilusStringList or NULL
- * @case_sensitive: Flag indicating whether the new string list is case sensitive.
- *
- * Return value: A newly constructed string list with one entry 'string'.
- */
-NautilusStringList *
-nautilus_string_list_new_from_string (const char	*string,
-				      gboolean          case_sensitive)
-{
-	NautilusStringList * string_list;
-
-	g_return_val_if_fail (string != NULL, NULL);
-
-	string_list = nautilus_string_list_new (case_sensitive);
-
-	nautilus_string_list_insert (string_list, string);
-
-	return string_list;
-}
-
-/**
- * nautilus_string_list_new_from_string_list:
- *
- * @other_or_null: A NautilusStringList or NULL
- * @case_sensitive: Flag indicating whether the new string list is case sensitive.
- *
- * Return value: A newly allocated string list that is equal to other.
- */
-NautilusStringList *
-nautilus_string_list_new_from_string_list (const NautilusStringList	*other_or_null,
-					   gboolean			case_sensitive)
-{
-	NautilusStringList *string_list;
-
-	if (other_or_null == NULL) {
-		return NULL;
-	}
-
-	string_list = nautilus_string_list_new (case_sensitive);
-
-	nautilus_string_list_assign_from_string_list (string_list, other_or_null);
-
-	return string_list;
-}
-
-/* Construct a string list from tokens delimited by the given string and delimiter */
-NautilusStringList *
-nautilus_string_list_new_from_tokens (const char	*string,
-				      const char	*delimiter,
-				      gboolean          case_sensitive)
-{
-	NautilusStringList *string_list;
-
-	g_return_val_if_fail (delimiter != NULL, NULL);
-
-	string_list = nautilus_string_list_new (case_sensitive);
-
-	if (string != NULL) {
-		char  **string_array;
-		int i;
-
-		string_array = g_strsplit (string, delimiter, -1);
-		
-		if (string_array) {
-			for (i = 0; string_array[i]; i++) {
-				nautilus_string_list_insert (string_list, string_array[i]);
-			}
-			
-			g_strfreev (string_array);
-		}
-	}
-
-	return string_list;
-}
-
-void
-nautilus_string_list_assign_from_string_list (NautilusStringList       *string_list,
-					      const NautilusStringList *other_or_null)
-{
-	GList		*other_iterator;
-	const char	*other_string;
-
-	g_return_if_fail (string_list != NULL);
-
-	nautilus_string_list_clear (string_list);
-
-	if (other_or_null == NULL) {
-		return;
-	}
-
-	for (other_iterator = other_or_null->strings; 
-	     other_iterator != NULL; 
-	     other_iterator = other_iterator->next) {
-		
-		other_string = (const char *) other_iterator->data;
-
-		nautilus_string_list_insert (string_list, other_string);
-	}
-}
-
-void
-nautilus_string_list_free (NautilusStringList *string_list_or_null)
-{
-	if (string_list_or_null == NULL) {
-		return;
-	}
-	
-	nautilus_string_list_clear (string_list_or_null);
-	g_free (string_list_or_null);
-}
-
-void
-nautilus_string_list_insert (NautilusStringList *string_list,
-			     const char	 *string)
-{
-	g_return_if_fail (string_list != NULL);
-	g_return_if_fail (string != NULL);
-
-	string_list->strings = g_list_append (string_list->strings,
-					      (gpointer) g_strdup (string));
-}
-
-char *
-nautilus_string_list_nth (const NautilusStringList *string_list, guint n)
-{
-	g_return_val_if_fail (string_list != NULL, NULL);
-
-	if (n  < g_list_length (string_list->strings)) {
-		const char * s = (const char *) g_list_nth_data (string_list->strings, n);
-		
-		g_assert (s != NULL);
-		
-		return g_strdup (s);
-	} else if (!suppress_out_of_bounds_warning) {
-		g_warning ("nautilus_string_list_nth (n = %d) is out of bounds.", n);
-	}
-	
-	return NULL;
-}
-
-/**
- * nautilus_string_list_nth_as_integer
- *
- * @string_list: A NautilusStringList
- * @n: Index of string to convert.
- * @integer_result: Where to store the conversion result.
- *
- * Convert the nth string to an integer and store the result in &integer_result.
- *
- * Return value: Returns TRUE if the string to integer conversion was successful,
- * FALSE otherwise.
- */
-gboolean
-nautilus_string_list_nth_as_integer (const NautilusStringList *string_list,
-				     guint n,
-				     int *integer_result)
-{
-	const char *string;
-
-	g_return_val_if_fail (string_list != NULL, FALSE);
-	g_return_val_if_fail (integer_result != NULL, FALSE);
-
-	if (n >= g_list_length (string_list->strings)) {
-		if (!suppress_out_of_bounds_warning) {
-			g_warning ("(n = %d) is out of bounds.", n);
-		}
-		return FALSE;
-	}
-
-	string = g_list_nth_data (string_list->strings, n);
-	return nautilus_str_to_int (string, integer_result);
-}
-
-/**
- * nautilus_string_list_modify_nth
- *
- * @string_list: A NautilusStringList
- * @n: Index of string to modify.
- * @string: New value for the string.
- *
- * Modify the nth value of a string in the collection.
- */
-void
-nautilus_string_list_modify_nth (NautilusStringList *string_list,
-				 guint n,
-				 const char *string)
-{
-	GList* nth;
-
-	g_return_if_fail (string_list != NULL);
-	g_return_if_fail (string != NULL);
-
-	if (n >= g_list_length (string_list->strings)) {
-		if (!suppress_out_of_bounds_warning) {
-			g_warning ("nautilus_string_list_nth (n = %d) is out of bounds.", n);
-		}
-
-		return;
-	}
-
-	nth = g_list_nth (string_list->strings, n);
-	g_assert (nth != NULL);
-
-	g_free (nth->data);
-	nth->data = g_strdup (string);
-}
-
-/**
- * nautilus_string_list_remove_nth
- *
- * @string_list: A NautilusStringList
- * @n: Index of string to modify.
- *
- * Remove the nth string in the collection.
- */
-void
-nautilus_string_list_remove_nth (NautilusStringList *string_list,
-				 guint n)
-{
-	GList* nth;
-
-	g_return_if_fail (string_list != NULL);
-
-	if (n >= g_list_length (string_list->strings)) {
-		if (!suppress_out_of_bounds_warning) {
-			g_warning ("nautilus_string_list_nth (n = %d) is out of bounds.", n);
-		}
-
-		return;
-	}
-
-	nth = g_list_nth (string_list->strings, n);
-	g_assert (nth != NULL);
-	g_free (nth->data);
-	string_list->strings = g_list_remove_link (string_list->strings, nth);
-}
-
-gboolean
-nautilus_string_list_contains (const NautilusStringList	*string_list,
-			       const char		*string)
-{
-	GList *find;
-
-	if (string_list == NULL) {
-		return FALSE;
-	}
-
-	g_return_val_if_fail (string != NULL, FALSE);
-
-	find = g_list_find_custom (string_list->strings, (gpointer) string,
-				   string_list->compare_function);
-
-	return find == NULL ? FALSE : TRUE;
-}
-
-/**
- * nautilus_string_list_get_longest_string:
- *
- * @string_list: A NautilusStringList
- * @test_function: Function to use for testing the strings.
- * @callback_data: Data to pass to test function.
- *
- * Return value: Returns the first string in the collection for 
- * which the test function returns TRUE.  If the no string matches, the 
- * result is NULL.
- */
-char *
-nautilus_string_list_find_by_function (const NautilusStringList *string_list,
-				       NautilusStringListTestFunction test_function,
-				       gpointer callback_data)
-{
-	GList *iterator;
-
-	if (string_list == NULL) {
-		return NULL;
-	}
-
-	g_return_val_if_fail (test_function != NULL, FALSE);
-	
-	for (iterator = string_list->strings; iterator; iterator = iterator->next) {
-		if ((* test_function) (string_list, iterator->data, callback_data)) {
-			return g_strdup (iterator->data);
-		}
-	}
-
-	return NULL;
-}
-
-guint
-nautilus_string_list_get_length (const NautilusStringList *string_list)
-{
-	if (string_list == NULL) {
-		return 0;
-	}
-
-	return g_list_length (string_list->strings);
-}
-
-void
-nautilus_string_list_clear (NautilusStringList *string_list)
-{
-	g_return_if_fail (string_list != NULL);
-
-	nautilus_g_list_free_deep (string_list->strings);
-	string_list->strings = NULL;
-}
-
-gboolean
-nautilus_string_list_equals (const NautilusStringList *a,
-			     const NautilusStringList *b)
-{
-	GList *a_iterator;
-	GList *b_iterator;
-
-	g_return_val_if_fail (a != NULL, FALSE);
-	g_return_val_if_fail (b != NULL, FALSE);
-
-	for (a_iterator = a->strings, b_iterator = b->strings; 
-	     a_iterator != NULL && b_iterator != NULL;
-	     a_iterator = a_iterator->next, b_iterator = b_iterator->next) {
-		if (!str_is_equal ((const char *) a_iterator->data, (const char *) b_iterator->data,
-				   a->compare_function == b->compare_function)) {
-			return FALSE;
-		}
-	}
-	
-	return a_iterator == NULL && b_iterator == NULL;
-}
-
-/**
- * nautilus_string_list_as_g_list:
- *
- * @string_list: A NautilusStringList
- *
- * Return value: A GList of strings that must deep free the result with
- * nautilus_g_list_free_deep()
- */
-GList *
-nautilus_string_list_as_g_list (const NautilusStringList *string_list)
-{
-	guint i;
-	GList *copy = NULL;
-
-	g_return_val_if_fail (string_list != NULL, NULL);
-
-	for (i = 0; i < nautilus_string_list_get_length (string_list); i++) {
-		copy = g_list_append (copy, nautilus_string_list_nth (string_list, i));
-	}
-
-	return copy;
-}
-
-/**
- * nautilus_string_list_get_index_for_string:
- *
- * @string_list: A NautilusStringList
- * @string: The string to look for
- *
- * Return value: An int with the index of the given string or 
- * NAUTILUS_STRING_LIST_NOT_FOUND if the string aint found.
- */
-int
-nautilus_string_list_get_index_for_string (const NautilusStringList	*string_list,
-					   const char			*string)
-{
-	int	n = 0;
-	GList	*iterator;
-
-	g_return_val_if_fail (string_list != NULL, NAUTILUS_STRING_LIST_NOT_FOUND);
-	g_return_val_if_fail (string != NULL, NAUTILUS_STRING_LIST_NOT_FOUND);
-
-	for (iterator = string_list->strings; iterator != NULL; iterator = iterator->next) {
-		if (str_is_equal ((const char *) iterator->data, string,
-				  string_list->compare_function == nautilus_strcmp_compare_func)) {
-			return n;
-		}
-		
-		n++;
-	}
-
-	return NAUTILUS_STRING_LIST_NOT_FOUND;
-}
-
-/**
- * nautilus_string_list_as_tokens
- *
- * @string_list: A NautilusStringList
- * @delimiter: The string to use a delimeter, can be NULL.
- *
- * Return value: An newly allocated string concatenation of all the items in the list.
- * The string is delimited by 'delimiter'.
- */
-char *
-nautilus_string_list_as_concatenated_string (const NautilusStringList *string_list,
-					     const char               *delimiter)
-{
-	char *result = NULL;
-	int length;
-	
-	g_return_val_if_fail (string_list != NULL, NULL);
-	
-	length = nautilus_string_list_get_length (string_list);
-	
-	if (length > 0) {
-		int	n;
-		GList	*iterator;
-		GString	*tokens;
-
-		n = 0;
-		
-		tokens = g_string_new (NULL);
-		
-		for (iterator = string_list->strings; iterator != NULL; iterator = iterator->next) {
-			const char *current = (const char *) iterator->data;
-			
-			g_string_append (tokens, current);
-
-			
-			n++;
-
-			if (delimiter && (n != length)) {
-				g_string_append (tokens, delimiter);
-			}
-		}
-
-		result = tokens->str;
-
-		g_string_free (tokens, FALSE);
-	}
-
-	return result;
-}
-
-void
-nautilus_string_list_sort (NautilusStringList *string_list)
-{
-	g_return_if_fail (string_list != NULL);
-
-	string_list->strings = g_list_sort (string_list->strings, string_list->compare_function);
-}
-
-/**
- * nautilus_string_list_sort_by_function
- *
- * @string_list: A NautilusStringList
- * @compare_function: Function to use for comparing the strings.
- *
- * Sort the strings using the given compare function.
- */
-void
-nautilus_string_list_sort_by_function (NautilusStringList *string_list,
-				       GCompareFunc compare_function)
-{
-	g_return_if_fail (string_list != NULL);
-
-	string_list->strings = g_list_sort (string_list->strings, compare_function);
-}
-
-void
-nautilus_string_list_remove_duplicates (NautilusStringList *string_list)
-{
-	GList	*new_strings = NULL;
-	GList	*iterator;
-
-	g_return_if_fail (string_list != NULL);
-	
-	for (iterator = string_list->strings; iterator != NULL; iterator = iterator->next) {
-		const char *string = (const char *) iterator->data;
-		g_assert (string != NULL);
-
-		if (g_list_find_custom (new_strings, (gpointer) string, string_list->compare_function) == NULL) {
-			new_strings = g_list_append (new_strings, g_strdup (string));
-		}
-	}
-
-	nautilus_string_list_clear (string_list);
-
-	string_list->strings = new_strings;
-}
-
-void
-nautilus_string_list_for_each (const NautilusStringList *string_list,
-			       GFunc                     function,
-			       gpointer                  user_data)
-{
-	g_return_if_fail (string_list != NULL);
-
-	g_list_foreach (string_list->strings, function, user_data);
-}
-
-/**
- * nautilus_string_list_get_longest_string:
- *
- * @string_list: A NautilusStringList
- *
- * Return value: A copy of the longest string in the collection.  Need to g_free() it.
- */
-char *
-nautilus_string_list_get_longest_string (const NautilusStringList *string_list)
-{
-	int	longest_length = 0;
-	int	longest_index = 0;
-	GList	*iterator;
-	int	i;
-
-	g_return_val_if_fail (string_list != NULL, NULL);
-
-	if (string_list->strings == NULL) {
-		return NULL;
-	}
-	
-	for (iterator = string_list->strings, i = 0; iterator != NULL; iterator = iterator->next, i++) {
-		int current_length = nautilus_strlen ((const char *) iterator->data);
-		
-		if (current_length > longest_length) {
-			longest_index = i;
-			longest_length = current_length;
-		}
-	}
-
-	return nautilus_string_list_nth (string_list, longest_index);
-}
-
-/**
- * nautilus_string_list_get_longest_string_length:
- *
- * @string_list: A NautilusStringList
- *
- * Return value: The length of the longest string in the collection.
- */
-int
-nautilus_string_list_get_longest_string_length (const NautilusStringList *string_list)
-{
-	int	longest_length = 0;
-	GList	*iterator;
-	int	i;
-
-	g_return_val_if_fail (string_list != NULL, 0);
-
-	if (string_list->strings == NULL) {
-		return 0;
-	}
-	
-	for (iterator = string_list->strings, i = 0; iterator != NULL; iterator = iterator->next, i++) {
-		int current_length = nautilus_strlen ((const char *) iterator->data);
-		
-		if (current_length > longest_length) {
-			longest_length = current_length;
-		}
-	}
-
-	return longest_length;
-}
-
-static gboolean
-str_is_equal (const char	*a,
-	      const char	*b,
-	      gboolean		case_sensitive)
-{
-	return case_sensitive ? nautilus_str_is_equal (a, b) : nautilus_istr_is_equal (a, b);
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-static gboolean
-test_dog (const NautilusStringList *string_list,
-	     const char *string,
-	     gpointer callback_data)
-{
-	return nautilus_str_is_equal (string, "dog");
-}
-
-static gboolean
-test_data (const NautilusStringList *string_list,
-	   const char *string,
-	   gpointer callback_data)
-{
-	return nautilus_str_is_equal (string, callback_data);
-}
-
-static gboolean
-test_true (const NautilusStringList *string_list,
-	   const char *string,
-	   gpointer callback_data)
-{
-	return TRUE;
-}
-
-static gboolean
-test_false (const NautilusStringList *string_list,
-	    const char *string,
-	    gpointer callback_data)
-{
-	return FALSE;
-}
-
-static int
-compare_number (gconstpointer string_a,
-		gconstpointer string_b)
-{
-	int a;
-	int b;
-	
-	g_return_val_if_fail (string_a != NULL, 0);
-	g_return_val_if_fail (string_b != NULL, 0);
-
-	g_return_val_if_fail (nautilus_str_to_int (string_a, &a), 0);
-	g_return_val_if_fail (nautilus_str_to_int (string_b, &b), 0);
-
- 	if (a < b) {
- 		return -1;
-	}
-
- 	if (a == b) {
- 		return 0;
- 	}
-
-	return 1;
-}
-
-void
-nautilus_self_check_string_list (void)
-{
-	NautilusStringList *fruits;
-	NautilusStringList *cities;
-	NautilusStringList *cities_copy;
-	NautilusStringList *empty;
-	NautilusStringList *single;
-
-	/*
-	 * nautilus_string_list_contains
-	 */
-	empty = nautilus_string_list_new (TRUE);
-
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (empty), 0);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (empty, "something"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (NULL, "something"), FALSE);
-
-	/*
-	 * nautilus_string_list_new
-	 */
-	cities = nautilus_string_list_new (TRUE);
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_equals (cities, empty), TRUE);
-	
-	nautilus_string_list_insert (cities, "london");
-	nautilus_string_list_insert (cities, "paris");
-	nautilus_string_list_insert (cities, "rome");
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_equals (cities, empty), FALSE);
-
-	/*
-	 * nautilus_string_list_new_from_string_list
-	 */
-	cities_copy = nautilus_string_list_new_from_string_list (cities, TRUE);
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_equals (cities, cities_copy), TRUE);
-
-	nautilus_string_list_free (cities_copy);
-	nautilus_string_list_free (cities);
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_new_from_string_list (NULL, TRUE) == NULL, TRUE);
-
-	/*
-	 * nautilus_string_list_insert,
-	 * nautilus_string_list_nth,
-	 * nautilus_string_list_contains,
-	 * nautilus_string_list_get_length
-	 */
-	fruits = nautilus_string_list_new (TRUE);
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_equals (fruits, empty), TRUE);
-
-	nautilus_string_list_insert (fruits, "orange");
-	nautilus_string_list_insert (fruits, "apple");
-	nautilus_string_list_insert (fruits, "strawberry");
-	nautilus_string_list_insert (fruits, "cherry");
-	nautilus_string_list_insert (fruits, "bananna");
-	nautilus_string_list_insert (fruits, "watermelon");
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_equals (fruits, empty), FALSE);
-
- 	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (fruits, 0), "orange");
- 	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (fruits, 2), "strawberry");
- 	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (fruits, 3), "cherry");
- 	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (fruits, 5), "watermelon");
-	suppress_out_of_bounds_warning = TRUE;
- 	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (fruits, 6), NULL);
-	suppress_out_of_bounds_warning = FALSE;
-
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (fruits), 6);
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (fruits, "orange"), TRUE);
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (fruits, "apple"), TRUE);
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (fruits, "watermelon"), TRUE);
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (fruits, "pineapple"), FALSE);
-
- 	nautilus_string_list_clear (fruits);
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (fruits, "orange"), FALSE);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (fruits), 0);
-	
-	nautilus_string_list_free (fruits);
-	nautilus_string_list_free (empty);
-
-	/*
-	 * nautilus_string_list_new_from_string
-	 */
-	single = nautilus_string_list_new_from_string ("something", TRUE);
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (single, "something"), TRUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (single), 1);
-
-	nautilus_string_list_free (single);
-
-
-	/*
-	 * nautilus_string_list_as_g_list
-	 */
-	{
-		guint			i;
-		GList			*glist;
-		GList			*glist_iterator;
-		NautilusStringList	*string_list;
-
-		string_list = nautilus_string_list_new (TRUE);
-		
-		nautilus_string_list_insert (string_list, "orange");
-		nautilus_string_list_insert (string_list, "apple");
-		nautilus_string_list_insert (string_list, "strawberry");
-		nautilus_string_list_insert (string_list, "cherry");
-		nautilus_string_list_insert (string_list, "bananna");
-		nautilus_string_list_insert (string_list, "watermelon");
-		
-		glist = nautilus_string_list_as_g_list (string_list);
-
-		NAUTILUS_CHECK_BOOLEAN_RESULT (g_list_length (glist) == nautilus_string_list_get_length (string_list),
-					       TRUE);
-
-		for (i = 0, glist_iterator = glist;
-		     i < nautilus_string_list_get_length (string_list); 
-		     i++, glist_iterator = glist_iterator->next) {
-			char *s1 = nautilus_string_list_nth (string_list, i);
-			const char *s2 = (const char *) glist_iterator->data;
-
-			NAUTILUS_CHECK_INTEGER_RESULT (nautilus_strcmp (s1, s2), 0);
-
-			g_free (s1);
-		}
-
-		nautilus_string_list_free (string_list);
-
-		nautilus_g_list_free_deep (glist);
-	}
-	
-	/*
-	 * nautilus_string_list_get_index_for_string
-	 *
-	 */
-
-	{
-		NautilusStringList *fruits;
-
-		fruits = nautilus_string_list_new (TRUE);
-		
-		nautilus_string_list_insert (fruits, "orange");
-		nautilus_string_list_insert (fruits, "apple");
-		nautilus_string_list_insert (fruits, "strawberry");
-		nautilus_string_list_insert (fruits, "cherry");
-		nautilus_string_list_insert (fruits, "bananna");
-		nautilus_string_list_insert (fruits, "watermelon");
-
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_index_for_string (fruits, "orange"), 0);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_index_for_string (fruits, "apple"), 1);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_index_for_string (fruits, "strawberry"), 2);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_index_for_string (fruits, "cherry"), 3);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_index_for_string (fruits, "bananna"), 4);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_index_for_string (fruits, "watermelon"), 5);
-
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_index_for_string (fruits, "papaya"), NAUTILUS_STRING_LIST_NOT_FOUND);
-
-		nautilus_string_list_free (fruits);
-	}
-
-	/*
-	 * nautilus_string_list_as_concatenated_string
-	 *
-	 */
-	{
-		NautilusStringList *l;
-
-		l = nautilus_string_list_new (TRUE);
-		
-		nautilus_string_list_insert (l, "x");
-
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_as_concatenated_string (l, NULL), "x");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_as_concatenated_string (l, ":"), "x");
-
-		nautilus_string_list_insert (l, "y");
-		nautilus_string_list_insert (l, "z");
-
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_as_concatenated_string (l, NULL), "xyz");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_as_concatenated_string (l, ""), "xyz");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_as_concatenated_string (l, ":"), "x:y:z");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_as_concatenated_string (l, "abc"), "xabcyabcz");
-
-		nautilus_string_list_free (l);
-	}
-
-
-	/*
-	 * nautilus_string_list_sort
-	 *
-	 */
-	{
-		NautilusStringList *l;
-
-		l = nautilus_string_list_new (TRUE);
-		
-		nautilus_string_list_insert (l, "dog");
-		nautilus_string_list_insert (l, "cat");
-		nautilus_string_list_insert (l, "bird");
-
-		nautilus_string_list_sort (l);
-
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 0), "bird");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 1), "cat");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 2), "dog");
-
-		nautilus_string_list_free (l);
-	}
-
-	/*
-	 * nautilus_string_list_remove_duplicates
-	 *
-	 */
-	{
-		NautilusStringList *l;
-
-		l = nautilus_string_list_new (TRUE);
-
-		nautilus_string_list_remove_duplicates (l);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (l), 0);
-		
-		nautilus_string_list_insert (l, "foo");
-		nautilus_string_list_insert (l, "bar");
-		nautilus_string_list_insert (l, "bar");
-		nautilus_string_list_insert (l, "foo");
-		nautilus_string_list_insert (l, "foo");
-
-		nautilus_string_list_remove_duplicates (l);
-
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (l), 2);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 0), "foo");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 1), "bar");
-
-		nautilus_string_list_clear (l);
-
-		nautilus_string_list_remove_duplicates (l);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (l), 0);
-
-		nautilus_string_list_insert (l, "single");
-		nautilus_string_list_remove_duplicates (l);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (l), 1);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 0), "single");
-
-		nautilus_string_list_clear (l);
-
-		nautilus_string_list_free (l);
-	}
-
-	/*
-	 * nautilus_string_list_assign_from_string_list
-	 *
-	 */
-	{
-		NautilusStringList *l;
-		NautilusStringList *other;
-
-		l = nautilus_string_list_new (TRUE);
-		other = nautilus_string_list_new (TRUE);
-
-		/* assign an other with some items */
-		nautilus_string_list_insert (other, "dog");
-		nautilus_string_list_insert (other, "cat");
-		nautilus_string_list_insert (other, "mouse");
-		nautilus_string_list_assign_from_string_list (l, other);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (l), 3);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 0), "dog");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 1), "cat");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 2), "mouse");
-
-		/* assign an other with 1 item */
-		nautilus_string_list_clear (other);
-		nautilus_string_list_insert (other, "something");
-		nautilus_string_list_assign_from_string_list (l, other);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (l), 1);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 0), "something");
-		
-		/* assign an empty other */
-		nautilus_string_list_clear (other);
-		nautilus_string_list_assign_from_string_list (l, other);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (l), 0);
-
-		nautilus_string_list_free (l);
-		nautilus_string_list_free (other);
-	}
-
-
-	/*
-	 * nautilus_string_list_get_longest_string
-	 *
-	 */
-	{
-		NautilusStringList *l;
-
-		l = nautilus_string_list_new (TRUE);
-
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_get_longest_string (l), NULL);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_longest_string_length (l), 0);
-
-		nautilus_string_list_insert (l, "a");
-		nautilus_string_list_insert (l, "bb");
-		nautilus_string_list_insert (l, "ccc");
-		nautilus_string_list_insert (l, "dddd");
-
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_get_longest_string (l), "dddd");
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_longest_string_length (l), strlen ("dddd"));
-
-		nautilus_string_list_clear (l);
-
-		nautilus_string_list_insert (l, "foo");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_get_longest_string (l), "foo");
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_longest_string_length (l), strlen ("foo"));
-
-		nautilus_string_list_free (l);
-
-	}
-
-	/*
-	 * case insensitive tests
-	 *
-	 */
-	{
-		NautilusStringList *l;
-
-		l = nautilus_string_list_new (FALSE);
-
-		nautilus_string_list_insert (l, "foo");
-		nautilus_string_list_insert (l, "bar");
-
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (l, "Foo"), TRUE);
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (l, "foO"), TRUE);
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (l, "fOo"), TRUE);
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (l, "foo"), TRUE);
-
-		nautilus_string_list_clear (l);
-
-		nautilus_string_list_insert (l, "Foo");
-		nautilus_string_list_insert (l, "Foo");
-		nautilus_string_list_insert (l, "fOo");
-		nautilus_string_list_insert (l, "foO");
-		nautilus_string_list_remove_duplicates (l);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (l), 1);
-
-		nautilus_string_list_free (l);
-	}
-
-	/*
-	 * nautilus_string_list_new_from_tokens
-	 */
-	{
-		NautilusStringList *lines;
-		NautilusStringList *thick_lines;
-
-		const char lines_string[] = "This\nAre\nSome\n\nLines";
-		const char thick_lines_string[] = "This####Are####Some########Lines";
-		const int num_lines = nautilus_str_count_characters (lines_string, '\n') + 1;
-
-		lines = nautilus_string_list_new_from_tokens (lines_string, "\n", TRUE);
-		thick_lines = nautilus_string_list_new_from_tokens (thick_lines_string, "####", TRUE);
-
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_equals (lines, thick_lines), TRUE);
-
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (lines), num_lines);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (lines, 0), "This");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (lines, 1), "Are");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (lines, 2), "Some");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (lines, 3), "");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (lines, 4), "Lines");
-		
-		nautilus_string_list_free (lines);
-		nautilus_string_list_free (thick_lines);
-	}
-
-	/*
-	 * nautilus_string_list_modify_nth
-	 */
-	{
-		NautilusStringList *list;
-
-		list = nautilus_string_list_new (TRUE);
-		nautilus_string_list_insert (list, "dog");
-		nautilus_string_list_insert (list, "cat");
-		nautilus_string_list_insert (list, "mouse");
-
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 0), "dog");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 2), "mouse");
-		nautilus_string_list_modify_nth (list, 2, "rat");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 2), "rat");
-		nautilus_string_list_modify_nth (list, 0, "pig");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 0), "pig");
-		
-		nautilus_string_list_free (list);
-	}
-
-	/*
-	 * nautilus_string_list_remove_nth
-	 */
-	{
-		NautilusStringList *list;
-
-		list = nautilus_string_list_new (TRUE);
-		nautilus_string_list_insert (list, "dog");
-		nautilus_string_list_insert (list, "cat");
-		nautilus_string_list_insert (list, "mouse");
-		nautilus_string_list_insert (list, "bird");
-		nautilus_string_list_insert (list, "pig");
-		
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (list), 5);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 0), "dog");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 4), "pig");
-
-		nautilus_string_list_remove_nth (list, 2);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (list), 4);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 2), "bird");
-
-		nautilus_string_list_remove_nth (list, 3);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (list), 3);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 0), "dog");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 2), "bird");
-
-		nautilus_string_list_remove_nth (list, 0);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (list), 2);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 0), "cat");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 1), "bird");
-		
-		nautilus_string_list_free (list);
-	}
-
-	/*
-	 * nautilus_string_list_find_by_function
-	 */
-	{
-		NautilusStringList *list;
-
-		list = nautilus_string_list_new (TRUE);
-		nautilus_string_list_insert (list, "house");
-		nautilus_string_list_insert (list, "street");
-		nautilus_string_list_insert (list, "car");
-		nautilus_string_list_insert (list, "dog");
-		
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_find_by_function (NULL, test_dog, NULL), NULL);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_find_by_function (list, test_dog, NULL), "dog");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_find_by_function (list, test_false, NULL), NULL);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_find_by_function (list, test_true, NULL), "house");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_find_by_function (list, test_data, "car"), "car");
-
-		nautilus_string_list_free (list);
-	}
-
-	/*
-	 * nautilus_string_list_sort_by_function
-	 */
-	{
-		NautilusStringList *sorted_list;
-		NautilusStringList *list;
-
-		sorted_list = nautilus_string_list_new (TRUE);
-		nautilus_string_list_insert (sorted_list, "0");
-		nautilus_string_list_insert (sorted_list, "1");
-		nautilus_string_list_insert (sorted_list, "2");
-		nautilus_string_list_insert (sorted_list, "3");
-		nautilus_string_list_insert (sorted_list, "4");
-
-		list = nautilus_string_list_new (TRUE);
-		nautilus_string_list_insert (list, "4");
-		nautilus_string_list_insert (list, "2");
-		nautilus_string_list_insert (list, "1");
-		nautilus_string_list_insert (list, "0");
-		nautilus_string_list_insert (list, "3");
-
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_equals (list, sorted_list), FALSE);
-
-		nautilus_string_list_sort_by_function (list, compare_number);
-		
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_equals (list, sorted_list), TRUE);
-
-		nautilus_string_list_free (list);
-		nautilus_string_list_free (sorted_list);
-	}
-
-	/*
-	 * nautilus_string_list_nth_as_integer
-	 */
-	{
-		NautilusStringList *list;
-		const int untouched = 666;
-		int result;
-
-		list = nautilus_string_list_new_from_tokens ("word,c,0,1,20,xxx,foo,bar,-1", ",", TRUE);
-		
-		result = untouched;
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_nth_as_integer (list, 0, &result), FALSE);
-		NAUTILUS_CHECK_INTEGER_RESULT (result, untouched);
-
-		result = untouched;
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_nth_as_integer (list, 1, &result), FALSE);
-		NAUTILUS_CHECK_INTEGER_RESULT (result, untouched);
-
-		result = untouched;
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_nth_as_integer (list, 5, &result), FALSE);
-		NAUTILUS_CHECK_INTEGER_RESULT (result, untouched);
-
-		result = untouched;
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_nth_as_integer (list, 6, &result), FALSE);
-		NAUTILUS_CHECK_INTEGER_RESULT (result, untouched);
-
-		result = untouched;
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_nth_as_integer (list, 7, &result), FALSE);
-		NAUTILUS_CHECK_INTEGER_RESULT (result, untouched);
-		
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_nth_as_integer (list, 2, &result), TRUE);
-		NAUTILUS_CHECK_INTEGER_RESULT (result, 0);
-		
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_nth_as_integer (list, 3, &result), TRUE);
-		NAUTILUS_CHECK_INTEGER_RESULT (result, 1);
-
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_nth_as_integer (list, 4, &result), TRUE);
-		NAUTILUS_CHECK_INTEGER_RESULT (result, 20);
-		
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_nth_as_integer (list, 8, &result), TRUE);
-		NAUTILUS_CHECK_INTEGER_RESULT (result, -1);
-		
-		nautilus_string_list_free (list);
-	}
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-string-list.h b/libnautilus-extensions/nautilus-string-list.h
deleted file mode 100644
index 3bfd14a8c..000000000
--- a/libnautilus-extensions/nautilus-string-list.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-string-list.h: A collection of strings.
- 
-   Copyright (C) 1999, 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_STRING_LIST_H
-#define NAUTILUS_STRING_LIST_H
-
-#include <glib.h>
-
-#define NAUTILUS_STRING_LIST_NOT_FOUND -1
-
-/* Opaque type declaration. */
-typedef struct _NautilusStringList NautilusStringList;
-
-/* Test function for finding strings in the list */
-typedef gboolean (*NautilusStringListTestFunction) (const NautilusStringList *string_list,
-						    const char *string,
-						    gpointer callback_data);
-
-/* Construct an empty string list. */
-NautilusStringList *nautilus_string_list_new                       (gboolean                        case_sensitive);
-
-/* Construct a string list with a single element */
-NautilusStringList *nautilus_string_list_new_from_string           (const char                     *string,
-								    gboolean                        case_sensitive);
-
-/* Construct a string list that is a copy of another string list */
-NautilusStringList *nautilus_string_list_new_from_string_list      (const NautilusStringList       *other_or_null,
-								    gboolean                        case_sensitive);
-
-/* Construct a string list from tokens delimited by the given string and delimeter */
-NautilusStringList *nautilus_string_list_new_from_tokens           (const char                     *string,
-								    const char                     *delimiter,
-								    gboolean                        case_sensitive);
-
-/* Assign the contents another string list.  The other string list can be null. */
-void                nautilus_string_list_assign_from_string_list   (NautilusStringList             *string_list,
-								    const NautilusStringList       *other_or_null);
-/* Free a string list */
-void                nautilus_string_list_free                      (NautilusStringList             *string_list_or_null);
-
-/* Insert a string into the collection. */
-void                nautilus_string_list_insert                    (NautilusStringList             *string_list,
-								    const char                     *string);
-/* Clear the collection. */
-void                nautilus_string_list_clear                     (NautilusStringList             *string_list);
-
-/* Access the nth string in the collection.  Returns an strduped string. */
-char *              nautilus_string_list_nth                       (const NautilusStringList       *string_list,
-								    guint                           n);
-/* Access the nth string as an integer.  Return TRUE if the conversion was successful.  */
-gboolean            nautilus_string_list_nth_as_integer            (const NautilusStringList       *string_list,
-								    guint                           n,
-								    int *integer_result);
-/* Modify the nth string in the collection. */
-void                nautilus_string_list_modify_nth                (NautilusStringList             *string_list,
-								    guint                           n,
-								    const char                     *string);
-/* Remove the nth string in the collection. */
-void                nautilus_string_list_remove_nth                (NautilusStringList             *string_list,
-								    guint                           n);
-/* Does the string list contain the given string ? */
-gboolean            nautilus_string_list_contains                  (const NautilusStringList       *string_list,
-								    const char                     *string);
-/* Find a string using the given test function ? */
-char *              nautilus_string_list_find_by_function          (const NautilusStringList       *string_list,
-								    NautilusStringListTestFunction  test_function,
-								    gpointer                        callback_data);
-/* How many strings are currently in the collection ? */
-guint               nautilus_string_list_get_length                (const NautilusStringList       *string_list);
-
-/* Get the index for the given string.  Return NAUTILUS_STRING_LIST_NOT_FOUND if not found. */
-int                 nautilus_string_list_get_index_for_string      (const NautilusStringList       *string_list,
-								    const char                     *string);
-/* Does the string list a equal string list b ? */
-gboolean            nautilus_string_list_equals                    (const NautilusStringList       *a,
-								    const NautilusStringList       *b);
-/* Return the string list in a GList.  Must deep free the result with nautilus_g_list_free_deep() */
-GList *             nautilus_string_list_as_g_list                 (const NautilusStringList       *string_list);
-
-/* Return the string list as a concatenation of all the items delimeted by delimeter. */
-char *              nautilus_string_list_as_concatenated_string    (const NautilusStringList       *string_list,
-								    const char                     *delimiter);
-/* Sort the string collection. */
-void                nautilus_string_list_sort                      (NautilusStringList             *string_list);
-
-/* Sort the string collection using a comparison function. */
-void                nautilus_string_list_sort_by_function          (NautilusStringList             *string_list,
-								    GCompareFunc                    compare_function);
-/* Remove duplicate strings from the collection. */
-void                nautilus_string_list_remove_duplicates         (NautilusStringList             *string_list);
-
-/* Invoke the given function for each string in the collection. */
-void                nautilus_string_list_for_each                  (const NautilusStringList       *string_list,
-								    GFunc                           function,
-								    gpointer                        user_data);
-
-/* Return the longest string in the collection. */
-char *              nautilus_string_list_get_longest_string        (const NautilusStringList       *string_list);
-
-/* Return the length of the longest string in the collection. */
-int                 nautilus_string_list_get_longest_string_length (const NautilusStringList       *string_list);
-
-#endif /* NAUTILUS_STRING_LIST_H */
-
diff --git a/libnautilus-extensions/nautilus-string-map.c b/libnautilus-extensions/nautilus-string-map.c
deleted file mode 100644
index 19c0c9d5a..000000000
--- a/libnautilus-extensions/nautilus-string-map.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-string-map.c: A many-to-one string mapping data structure.
- 
-   Copyright (C) 1999, 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-string-map.h"
-#include "nautilus-string-list.h"
-#include "nautilus-string.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-lib-self-check-functions.h"
-#include <string.h>
-
-struct _NautilusStringMap
-{
-	GList		*map;
-	gboolean	case_sensitive;
-};
-
-typedef struct 
-{
-	char			*string;
-	NautilusStringList	*map_list;
-} MapEntry;
-
-/* MapEntry things */
-static MapEntry *map_entry_new                       (const char *string,
-						      gboolean    case_sensitive);
-static void      map_entry_free                      (MapEntry   *map_entry);
-static MapEntry *map_entry_list_lookup_mapped_string (GList      *entry_list,
-						      const char *mapped_string,
-						      gboolean    case_sensitive);
-static MapEntry *map_entry_list_lookup               (GList      *entry_list,
-						      const char *string);
-static gboolean  str_is_equal                        (const char *a,
-						      const char *b,
-						      gboolean    case_sensitive);
-
-/**
- * nautilus_string_map_new:
- *
- * @case_sensitive: Boolean flag indicating whether the string map is case sensitive.
- *
- * Allocate an empty string map.
- *
- * Return value: A newly allocated string map.
- */
-NautilusStringMap *
-nautilus_string_map_new (gboolean case_sensitive)
-{
-	NautilusStringMap * string_map;
-
-	string_map = g_new (NautilusStringMap, 1);
-
-	string_map->map = NULL;
-	string_map->case_sensitive = case_sensitive;
-
-	return string_map;
-}
-
-/**
- * nautilus_string_map_free:
- *
- * @string_map: A NautilusStringMap
- *
- * Free the string map.
- */
-void
-nautilus_string_map_free (NautilusStringMap *string_map)
-{
-	if (string_map == NULL) {
-		return;
-	}
-	
-	nautilus_string_map_clear (string_map);
-
-	g_free (string_map);
-}
-
-static void
-map_for_each_node_free (gpointer	data,
-			gpointer	user_data)
-{
-	MapEntry *map_entry = (MapEntry *) data;
-	g_assert (map_entry != NULL);
-
-	map_entry_free (map_entry);
-}
-
-/**
- * nautilus_string_map_clear:
- *
- * @string_map: A NautilusStringMap
- *
- * Clear the string map.
- */
-void
-nautilus_string_map_clear (NautilusStringMap *string_map)
-{
-	if (string_map == NULL) {
-		return;
-	}
-
-	g_return_if_fail (string_map != NULL);
-
-	nautilus_g_list_free_deep_custom (string_map->map, map_for_each_node_free, NULL);
-
-	string_map->map = NULL;
-}
-
-/**
- * nautilus_string_map_lookup:
- *
- * @string_map: A NautilusStringMap
- * @string: The mapped string to lookup
- *
- * Lookup the mapping for 'string'
- *
- * Return value: A copy of the mapped_to_string or NULL if no mapping exists.
- */
-char *
-nautilus_string_map_lookup (const NautilusStringMap	*string_map,
-			    const char			*string)
-{
-	MapEntry *map_entry;
-
-	if (string_map == NULL || string == NULL) {
-		return NULL;
-	}
-
-	map_entry = map_entry_list_lookup (string_map->map, string);
-
-	return map_entry ? g_strdup (map_entry->string) : NULL;
-}
-
-/**
- * nautilus_string_map_add:
- *
- * @string_map: A NautilusStringMap
- *
- * Add a mapping from 'string' to 'strings_maps_to'
- */
-void
-nautilus_string_map_add (NautilusStringMap	*string_map,
-			 const char		*string_maps_to,
-			 const char		*string)
-{
-	MapEntry *map_entry;
-
-	g_return_if_fail (string_map != NULL);
-	g_return_if_fail (string_maps_to != NULL);
-	g_return_if_fail (string != NULL);
-
-	map_entry = map_entry_list_lookup_mapped_string (string_map->map, string_maps_to, string_map->case_sensitive);
-
-	if (map_entry == NULL) {
-		map_entry = map_entry_new (string_maps_to, string_map->case_sensitive);
-
-		/* Add a mapping for the string_maps_to to simplify things */
-		nautilus_string_list_insert (map_entry->map_list, string_maps_to);
-
-		string_map->map = g_list_append (string_map->map, map_entry);
-	}
-
-	nautilus_string_list_insert (map_entry->map_list, string);
-}
-
-/* MapEntry things */
-static MapEntry *
-map_entry_new (const char	*string,
-	       gboolean		case_sensitive)
-{
-	MapEntry *map_entry;
-
-	g_return_val_if_fail (string != NULL, NULL);
-
-	map_entry = g_new (MapEntry, 1);
-	map_entry->map_list = nautilus_string_list_new (case_sensitive);
-	map_entry->string = g_strdup (string);
-
-	return map_entry;
-}
-
-static void
-map_entry_free (MapEntry *map_entry)
-{
-	g_return_if_fail (map_entry);
-
-	nautilus_string_list_free (map_entry->map_list);
-	map_entry->map_list = NULL;
-	g_free (map_entry->string);
-	g_free (map_entry);
-}
-
-static MapEntry *
-map_entry_list_lookup_mapped_string (GList	*entry_list,
-				     const char	*mapped_string,
-				     gboolean	case_sensitive)
-{
-	GList *iterator;
-
-	g_return_val_if_fail (mapped_string != NULL, NULL);
-
-	if (entry_list == NULL) {
-		return NULL;
-	}
-
-	for (iterator = entry_list; iterator != NULL; iterator = iterator->next) {
-		MapEntry *map_entry = (MapEntry *) iterator->data;
-		g_assert (map_entry != NULL);
-
-		if (str_is_equal (map_entry->string, mapped_string, case_sensitive)) {
-			return map_entry;
-		}
-	}
-
-	return NULL;
-}
-
-static MapEntry *
-map_entry_list_lookup (GList		*entry_list,
-		       const char	*string)
-{
-	GList *iterator;
-
-	g_return_val_if_fail (string != NULL, NULL);
-
-	if (entry_list == NULL) {
-		return NULL;
-	}
-
-	for (iterator = entry_list; iterator != NULL; iterator = iterator->next) {
-		MapEntry *map_entry = (MapEntry *) iterator->data;
-		g_assert (map_entry != NULL);
-
-		if (nautilus_string_list_contains (map_entry->map_list, string)) {
-			return map_entry;
-		}
-	}
-
-	return NULL;
-}
-
-static gboolean
-str_is_equal (const char	*a,
-	      const char	*b,
-	      gboolean		case_sensitive)
-{
-	return case_sensitive ? nautilus_str_is_equal (a, b) : nautilus_istr_is_equal (a, b);
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-void
-nautilus_self_check_string_map (void)
-{
-	NautilusStringMap *map;
-
-	map = nautilus_string_map_new (TRUE);
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "foo"), NULL);
-	
-	nautilus_string_map_clear (map);
-	
-	nautilus_string_map_add (map, "animal", "dog");
-	nautilus_string_map_add (map, "animal", "cat");
-	nautilus_string_map_add (map, "animal", "mouse");
-	nautilus_string_map_add (map, "human", "geek");
-	nautilus_string_map_add (map, "human", "nerd");
-	nautilus_string_map_add (map, "human", "lozer");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "animal"), "animal");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "cat"), "animal");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "dog"), "animal");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "mouse"), "animal");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "human"), "human");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "geek"), "human");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "nerd"), "human");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "lozer"), "human");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "Lozer"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "HuMaN"), NULL);
-
-	nautilus_string_map_free (map);
-
-	/*
-	 * case insensitive tests
-	 *
-	 */
-	map = nautilus_string_map_new (FALSE);
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "foo"), NULL);
-	
-	nautilus_string_map_clear (map);
-	
-	nautilus_string_map_add (map, "animal", "dog");
-	nautilus_string_map_add (map, "animal", "cat");
-	nautilus_string_map_add (map, "animal", "mouse");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "animal"), "animal");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "Animal"), "animal");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "cat"), "animal");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "CAT"), "animal");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "dog"), "animal");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "DoG"), "animal");
-
-	nautilus_string_map_free (map);
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-string-map.h b/libnautilus-extensions/nautilus-string-map.h
deleted file mode 100644
index 22ff5ae0a..000000000
--- a/libnautilus-extensions/nautilus-string-map.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-string-map.h: A many-to-one string mapping data structure.
- 
-   Copyright (C) 1999, 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-/* NautilusStringMap is a simple data structure to manage many-to-one 
- * mappings of string.  For example:
- * 
- * map = map_new (TRUE);
- * map_add (map, "animal", "dog");
- * map_add (map, "animal", "cat");
- * map_add (map, "animal", "mouse");
- * 
- * map_lookup (map, "dog") => "animal"
- * map_lookup (map, "cat") => "animal"
- * map_lookup (map, "animal") => "animal"
- *
- */
-
-#ifndef NAUTILUS_STRING_MAP_H
-#define NAUTILUS_STRING_MAP_H
-
-#include <glib.h>
-
-/* Opaque type declaration. */
-typedef struct _NautilusStringMap NautilusStringMap;
-
-/* Construct an empty string map. */
-NautilusStringMap *nautilus_string_map_new    (gboolean                 case_sensitive);
-
-/* Add a mapping from 'string' to 'strings_maps_to' */
-void               nautilus_string_map_add    (NautilusStringMap       *string_map,
-					       const char              *string_maps_to,
-					       const char              *string);
-
-/* Free the string map */
-void               nautilus_string_map_free   (NautilusStringMap       *string_map);
-
-
-/* Clear the string map */
-void               nautilus_string_map_clear  (NautilusStringMap       *string_map);
-
-
-/* Lookup the string in the map.  Returns the string 'string' maps to or NULL of not found. */
-char *             nautilus_string_map_lookup (const NautilusStringMap *string_map,
-					       const char              *string);
-
-
-#endif /* NAUTILUS_STRING_MAP_H */
-
diff --git a/libnautilus-extensions/nautilus-string-picker.c b/libnautilus-extensions/nautilus-string-picker.c
deleted file mode 100644
index 8b1043e43..000000000
--- a/libnautilus-extensions/nautilus-string-picker.c
+++ /dev/null
@@ -1,382 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-string-picker.c - A widget to pick a string from a list.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-string-picker.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-glib-extensions.h"
-
-#include <gtk/gtklabel.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-
-#include <gtk/gtksignal.h>
-
-static const gint STRING_PICKER_SPACING = 10;
-
-/* Signals */
-typedef enum
-{
-	CHANGED,
-	LAST_SIGNAL
-} NautilusStringPickerSignals;
-
-struct _NautilusStringPickerDetail
-{
-	GtkWidget		*option_menu;
-	GtkWidget		*menu;
-	NautilusStringList	*string_list;
-};
-
-/* NautilusStringPickerClass methods */
-static void nautilus_string_picker_initialize_class (NautilusStringPickerClass *klass);
-static void nautilus_string_picker_initialize       (NautilusStringPicker      *string_picker);
-
-
-/* GtkObjectClass methods */
-static void nautilus_string_picker_destroy          (GtkObject                 *object);
-
-
-/* Option menu item callbacks */
-static void option_menu_activate_callback           (GtkWidget                 *menu_item,
-						     gpointer                   callback_data);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusStringPicker, nautilus_string_picker, NAUTILUS_TYPE_CAPTION)
-
-static guint string_picker_signals[LAST_SIGNAL] = { 0 };
-
-/*
- * NautilusStringPickerClass methods
- */
-static void
-nautilus_string_picker_initialize_class (NautilusStringPickerClass *string_picker_class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	
-	object_class = GTK_OBJECT_CLASS (string_picker_class);
-	widget_class = GTK_WIDGET_CLASS (string_picker_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_string_picker_destroy;
-	
-	/* Signals */
-	string_picker_signals[CHANGED] = gtk_signal_new ("changed",
-							 GTK_RUN_LAST,
-							 object_class->type,
-							 0,
-							 gtk_marshal_NONE__NONE,
-							 GTK_TYPE_NONE, 
-							 0);
-
-	gtk_object_class_add_signals (object_class, string_picker_signals, LAST_SIGNAL);
-}
-
-static void
-nautilus_string_picker_initialize (NautilusStringPicker *string_picker)
-{
-	string_picker->detail = g_new (NautilusStringPickerDetail, 1);
-
-	gtk_box_set_homogeneous (GTK_BOX (string_picker), FALSE);
-	gtk_box_set_spacing (GTK_BOX (string_picker), STRING_PICKER_SPACING);
-
-	string_picker->detail->string_list = nautilus_string_list_new (TRUE);
-	string_picker->detail->menu = NULL;
-
-	string_picker->detail->option_menu = gtk_option_menu_new ();
-
-	nautilus_caption_set_child (NAUTILUS_CAPTION (string_picker),
-				    string_picker->detail->option_menu,
-				    FALSE,
-				    FALSE);
-
-	gtk_widget_show (string_picker->detail->option_menu);
-}
-
-/*
- * GtkObjectClass methods
- */
-static void
-nautilus_string_picker_destroy (GtkObject* object)
-{
-	NautilusStringPicker * string_picker;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (object));
-	
-	string_picker = NAUTILUS_STRING_PICKER (object);
-
-	nautilus_string_list_free (string_picker->detail->string_list);
-
-	g_free (string_picker->detail);
-
-	/* Chain */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-/* Option menu item callbacks */
-static void
-option_menu_activate_callback (GtkWidget *menu_item, gpointer callback_data)
-{
-	NautilusStringPicker *string_picker;
-
-	g_return_if_fail (menu_item != NULL);
-	g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
-	
-	g_return_if_fail (callback_data != NULL);
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (callback_data));
-
-	string_picker = NAUTILUS_STRING_PICKER (callback_data);
-
-	gtk_signal_emit (GTK_OBJECT (string_picker), string_picker_signals[CHANGED]);
-}
-
-/*
- * NautilusStringPicker public methods
- */
-GtkWidget *
-nautilus_string_picker_new (void)
-{
-	return gtk_widget_new (nautilus_string_picker_get_type (), NULL);
-}
-
-/**
- * nautilus_string_picker_set_string_list:
- * @string_picker: A NautilusStringPicker
- * @string_list: A list of strings
- *
- * Returns: nope
- */
-void
-nautilus_string_picker_set_string_list (NautilusStringPicker		*string_picker,
-					const NautilusStringList	*string_list)
-{
-	guint i;
-
- 	g_return_if_fail (string_picker != NULL);
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
-
-	nautilus_string_list_assign_from_string_list (string_picker->detail->string_list, string_list);
-	
-	/* Kill the old menu if alive */
-	if (string_picker->detail->menu != NULL) {
-		gtk_option_menu_remove_menu (GTK_OPTION_MENU (string_picker->detail->option_menu));
-
-		/* The widget gets unrefed in the above call */
-		string_picker->detail->menu = NULL;
-	}
-
-	/* Make a new menu */
-	string_picker->detail->menu = gtk_menu_new ();
-	
-	if (nautilus_string_list_get_length (string_picker->detail->string_list) > 0) {
-		for (i = 0; i < nautilus_string_list_get_length (string_picker->detail->string_list); i++) {
-			GtkWidget *menu_item;
-			char *item_label = nautilus_string_list_nth (string_picker->detail->string_list, i);
-			g_assert (item_label != NULL);
-			
-			menu_item = gtk_menu_item_new_with_label (item_label);
-			g_free (item_label);
-
-			/* Save the index so we can later use it to retrieve the nth label from the list */
-			gtk_object_set_data (GTK_OBJECT (menu_item), "index", GINT_TO_POINTER (i));
-			
-			gtk_signal_connect (GTK_OBJECT (menu_item),
-					    "activate",
-					    GTK_SIGNAL_FUNC (option_menu_activate_callback),
-					    string_picker);
-			
-			gtk_widget_show (menu_item);
-			
-			gtk_menu_append (GTK_MENU (string_picker->detail->menu), menu_item);
-		}
-
-	}
-
-	/* Attatch the menu to the option button */
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (string_picker->detail->option_menu), string_picker->detail->menu);
-}
-
-/**
- * nautilus_string_picker_get_string_list:
- * @string_picker: A NautilusStringPicker
- *
- * Returns: A copy of the list of strings for the string picker.  Need to free it.
- */
-NautilusStringList*
-nautilus_string_picker_get_string_list (const NautilusStringPicker *string_picker)
-{
-
- 	g_return_val_if_fail (string_picker != NULL, NULL);
-	g_return_val_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker), NULL);
-
-	return nautilus_string_list_new_from_string_list (string_picker->detail->string_list, TRUE);
-}
-
-/* FIXME bugzilla.eazel.com 1556: 
- * Rename confusing string picker get/set functions
- */
-
-/**
- * nautilus_string_picker_get_selected_string
- * @string_picker: A NautilusStringPicker
- *
- * Returns: A copy of the currently selected text.  Need to g_free() it.
- */
-char *
-nautilus_string_picker_get_selected_string (NautilusStringPicker *string_picker)
-{
-	gint		item_index;
-	GtkWidget	*option_menu;
-	GtkWidget	*menu_item;
-
- 	g_return_val_if_fail (string_picker != NULL, NULL);
-	g_return_val_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker), NULL);
-
-	option_menu = string_picker->detail->option_menu;
-	
-	menu_item = GTK_OPTION_MENU (option_menu)->menu_item;
-
-	item_index = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (menu_item), "index"));
-
-	return (item_index != -1) ? nautilus_string_list_nth (string_picker->detail->string_list, item_index) : NULL;
-}
-
-/**
- * nautilus_string_picker_set_selected_string
- * @string_picker: A NautilusStringPicker
- *
- * Set the active item corresponding to the given text.
- */
-void
-nautilus_string_picker_set_selected_string (NautilusStringPicker	*string_picker,
-					    const char			*text)
-{
-	gint item_index;
-
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
-	g_return_if_fail (nautilus_string_list_contains (string_picker->detail->string_list, text));
-
-	item_index = nautilus_string_list_get_index_for_string (string_picker->detail->string_list, text);
-	g_assert (item_index != NAUTILUS_STRING_LIST_NOT_FOUND);
-
-	gtk_option_menu_set_history (GTK_OPTION_MENU (string_picker->detail->option_menu), item_index);
-}
-
-/**
- * nautilus_string_picker_set_selected_string_index
- * @string_picker: A NautilusStringPicker
- * @index: Index of selected string.
- *
- * Set the selected entry corresponding to the given index.
- */
-void
-nautilus_string_picker_set_selected_string_index (NautilusStringPicker *string_picker,
-						  guint index)
-{
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
-	g_return_if_fail (index < nautilus_string_list_get_length (string_picker->detail->string_list));
-	
-	gtk_option_menu_set_history (GTK_OPTION_MENU (string_picker->detail->option_menu), index);
-}
-
-/**
- * nautilus_string_picker_insert_string
- * @string_picker: A NautilusStringPicker
- * @string: The string to insert.
- *
- * Insert a new string into the string picker.
- */
-void
-nautilus_string_picker_insert_string (NautilusStringPicker       *string_picker,
-				      const char                 *string)
-{
-	NautilusStringList *new_string_list;
-
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
-
-	new_string_list = nautilus_string_list_new_from_string_list (string_picker->detail->string_list, TRUE);
-	nautilus_string_list_insert (new_string_list, string);
-	nautilus_string_picker_set_string_list (string_picker, new_string_list);
-	nautilus_string_list_free (new_string_list);
-}
-
-/**
- * nautilus_string_picker_insert_string
- * @string_picker: A NautilusStringPicker
- * @string: The string to insert.
- *
- * Insert a new string into the string picker.
- */
-gboolean
-nautilus_string_picker_contains (const NautilusStringPicker       *string_picker,
-				 const char			  *string)
-{
-	g_return_val_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker), FALSE);
-
-	return nautilus_string_list_contains (string_picker->detail->string_list, string);
-}
-
-/**
- * nautilus_string_picker_get_index_for_string
- * @string_picker: A NautilusStringPicker
- * @string: String to find.
- *
- * Return the index for the given string.  
- * Return NAUTILUS_STRING_LIST_NOT_FOUND if the string is not found.
- */
-int 
-nautilus_string_picker_get_index_for_string (const NautilusStringPicker *string_picker,
-					     const char *string)
-{
-	g_return_val_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker), NAUTILUS_STRING_LIST_NOT_FOUND);
-
-	return nautilus_string_list_get_index_for_string (string_picker->detail->string_list, string);
-}
-
-/**
- * nautilus_string_picker_clear:
-
- * @string_picker: A NautilusStringPicker
- *
- * Remove all entries from the string picker.
- */
-void
-nautilus_string_picker_clear (NautilusStringPicker *string_picker)
-{
-	NautilusStringList *empty_list;
-
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
-
-	/* Already empty */
-	if (nautilus_string_list_get_length (string_picker->detail->string_list) == 0) {
-		return;
-	}
-
-	empty_list = nautilus_string_list_new (TRUE);
-	nautilus_string_picker_set_string_list (string_picker, empty_list);
-	nautilus_string_list_free (empty_list);
-}
diff --git a/libnautilus-extensions/nautilus-string-picker.h b/libnautilus-extensions/nautilus-string-picker.h
deleted file mode 100644
index 9ce803b67..000000000
--- a/libnautilus-extensions/nautilus-string-picker.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-string-picker.h - A widget to pick a string from a list.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_STRING_PICKER_H
-#define NAUTILUS_STRING_PICKER_H
-
-#include <libnautilus-extensions/nautilus-caption.h>
-#include <libnautilus-extensions/nautilus-string-list.h>
-
-/*
- * NautilusStringPicker is made up of 2 widgets. 
- *
- * [title label] [string list]
- *
- * The user can select a string from the list.
- */
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_STRING_PICKER            (nautilus_string_picker_get_type ())
-#define NAUTILUS_STRING_PICKER(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_STRING_PICKER, NautilusStringPicker))
-#define NAUTILUS_STRING_PICKER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_STRING_PICKER, NautilusStringPickerClass))
-#define NAUTILUS_IS_STRING_PICKER(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_STRING_PICKER))
-
-typedef struct _NautilusStringPicker	       NautilusStringPicker;
-typedef struct _NautilusStringPickerClass      NautilusStringPickerClass;
-typedef struct _NautilusStringPickerDetail     NautilusStringPickerDetail;
-
-struct _NautilusStringPicker
-{
-	/* Super Class */
-	NautilusCaption			caption;
-	
-	/* Private stuff */
-	NautilusStringPickerDetail	*detail;
-};
-
-struct _NautilusStringPickerClass
-{
-	NautilusCaptionClass		parent_class;
-};
-
-GtkType             nautilus_string_picker_get_type                  (void);
-GtkWidget*          nautilus_string_picker_new                       (void);
-
-
-/* Set the list of strings. */
-void                nautilus_string_picker_set_string_list           (NautilusStringPicker       *string_picker,
-								      const NautilusStringList   *string_list);
-
-/* Access a copy of the list of strings. */
-NautilusStringList *nautilus_string_picker_get_string_list           (const NautilusStringPicker *string_picker);
-
-
-/* Get the selected string.  Resulting string needs to be freed with g_free(). */
-char *              nautilus_string_picker_get_selected_string       (NautilusStringPicker       *string_picker);
-
-
-/* Set the selected string.  The internal string list needs to contain the 'string'. */
-void                nautilus_string_picker_set_selected_string       (NautilusStringPicker       *string_picker,
-								      const char                 *string);
-void                nautilus_string_picker_set_selected_string_index (NautilusStringPicker       *string_picker,
-								      guint                       index);
-
-/* Add a new string to the picker. */
-void                nautilus_string_picker_insert_string             (NautilusStringPicker       *string_picker,
-								      const char                 *string);
-
-/* Does the string picker contain the given string ? */
-gboolean            nautilus_string_picker_contains                  (const NautilusStringPicker *string_picker,
-								      const char                 *string);
-
-/* Return the index of the given string */
-int                 nautilus_string_picker_get_index_for_string      (const NautilusStringPicker *string_picker,
-								      const char                 *string);
-
-/* Remove all entries from the string picker. */
-void                nautilus_string_picker_clear                     (NautilusStringPicker       *string_picker);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_STRING_PICKER_H */
-
-
diff --git a/libnautilus-extensions/nautilus-string.c b/libnautilus-extensions/nautilus-string.c
deleted file mode 100644
index 18f30bf07..000000000
--- a/libnautilus-extensions/nautilus-string.c
+++ /dev/null
@@ -1,1025 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-string.c: String routines to augment <string.h>.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-string.h"
-
-#include <ctype.h>
-#include <errno.h>
-#include <locale.h>
-#include <stdlib.h>
-
-#include "nautilus-lib-self-check-functions.h"
-
-size_t
-nautilus_strlen (const char *string)
-{
-	return string == NULL ? 0 : strlen (string);
-}
-
-char *
-nautilus_strchr (const char *haystack, char needle)
-{
-	return haystack == NULL ? NULL : strchr (haystack, needle);
-}
-
-int
-nautilus_strcmp (const char *string_a, const char *string_b)
-{
-	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
-	 * treat 'NULL < ""', or have a flavor that does that. If we
-	 * didn't have code that already relies on 'NULL == ""', I
-	 * would change it right now.
-	 */
-	return strcmp (string_a == NULL ? "" : string_a,
-		       string_b == NULL ? "" : string_b);
-}
-
-int
-nautilus_strcasecmp (const char *string_a, const char *string_b)
-{
-	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
-	 * treat 'NULL < ""', or have a flavor that does that. If we
-	 * didn't have code that already relies on 'NULL == ""', I
-	 * would change it right now.
-	 */
-	return g_strcasecmp (string_a == NULL ? "" : string_a,
-		             string_b == NULL ? "" : string_b);
-}
-
-int
-nautilus_strcmp_case_breaks_ties (const char *string_a, const char *string_b)
-{
-	int casecmp_result;
-
-	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
-	 * treat 'NULL < ""', or have a flavor that does that. If we
-	 * didn't have code that already relies on 'NULL == ""', I
-	 * would change it right now.
-	 */
-	casecmp_result = nautilus_strcasecmp (string_a, string_b);
-	if (casecmp_result != 0) {
-		return casecmp_result;
-	}
-	return nautilus_strcmp (string_a, string_b);
-}
-
-int
-nautilus_strcoll (const char *string_a, const char *string_b)
-{
-	const char *locale;
-	int result;
-	
-	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
-	 * treat 'NULL < ""', or have a flavor that does that. If we
-	 * didn't have code that already relies on 'NULL == ""', I
-	 * would change it right now.
-	 */
-
-	locale = setlocale (LC_COLLATE, NULL);
-	
-	if (locale == NULL || strcmp (locale, "C") == 0 || strcmp (locale, "POSIX") == 0) {
-		/* If locale is NULL or default "C" or "POSIX" use nautilus sorting */
-		return nautilus_strcmp_case_breaks_ties (string_a, string_b);
-	} else {
-		/* Use locale-specific collated sorting */
-		result = strcoll (string_a == NULL ? "" : string_a,
-				  string_b == NULL ? "" : string_b);
-		if (result != 0) {
-			return result;
-		}
-		return nautilus_strcmp (string_a, string_b);
-	}
-}
-
-gboolean
-nautilus_str_is_empty (const char *string_or_null)
-{
-	return nautilus_strcmp (string_or_null, NULL) == 0;
-}
-
-gboolean
-nautilus_str_is_equal (const char *string_a, const char *string_b)
-{
-	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
-	 * treat 'NULL != ""', or have a flavor that does that. If we
-	 * didn't have code that already relies on 'NULL == ""', I
-	 * would change it right now.
-	 */
-	return nautilus_strcmp (string_a, string_b) == 0;
-}
-
-gboolean
-nautilus_istr_is_equal (const char *string_a, const char *string_b)
-{
-	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
-	 * treat 'NULL != ""', or have a flavor that does that. If we
-	 * didn't have code that already relies on 'NULL == ""', I
-	 * would change it right now.
-	 */
-	return nautilus_strcasecmp (string_a, string_b) == 0;
-}
-
-int
-nautilus_strcmp_compare_func (gconstpointer string_a, gconstpointer string_b)
-{
-	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
-	 * treat 'NULL < ""', or have a flavor that does that. If we
-	 * didn't have code that already relies on 'NULL == ""', I
-	 * would change it right now.
-	 */
-	return nautilus_strcmp ((const char *) string_a,
-				(const char *) string_b);
-}
-
-int
-nautilus_strcoll_compare_func (gconstpointer string_a, gconstpointer string_b)
-{
-	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
-	 * treat 'NULL < ""', or have a flavor that does that. If we
-	 * didn't have code that already relies on 'NULL == ""', I
-	 * would change it right now.
-	 */
-	return nautilus_strcoll ((const char *) string_a,
-				 (const char *) string_b);
-}
-
-int
-nautilus_strcasecmp_compare_func (gconstpointer string_a, gconstpointer string_b)
-{
-	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
-	 * treat 'NULL < ""', or have a flavor that does that. If we
-	 * didn't have code that already relies on 'NULL == ""', I
-	 * would change it right now.
-	 */
-	return nautilus_strcasecmp ((const char *) string_a,
-				    (const char *) string_b);
-}
-
-gboolean
-nautilus_str_has_prefix (const char *haystack, const char *needle)
-{
-	const char *h, *n;
-
-	/* Eat one character at a time. */
-	h = haystack == NULL ? "" : haystack;
-	n = needle == NULL ? "" : needle;
-	do {
-		if (*n == '\0') {
-			return TRUE;
-		}
-		if (*h == '\0') {
-			return FALSE;
-		}
-	} while (*h++ == *n++);
-	return FALSE;
-}
-
-gboolean
-nautilus_str_has_suffix (const char *haystack, const char *needle)
-{
-	const char *h, *n;
-
-	if (needle == NULL) {
-		return TRUE;
-	}
-	if (haystack == NULL) {
-		return needle[0] == '\0';
-	}
-		
-	/* Eat one character at a time. */
-	h = haystack + strlen(haystack);
-	n = needle + strlen(needle);
-	do {
-		if (n == needle) {
-			return TRUE;
-		}
-		if (h == haystack) {
-			return FALSE;
-		}
-	} while (*--h == *--n);
-	return FALSE;
-}
-
-gboolean
-nautilus_istr_has_prefix (const char *haystack, const char *needle)
-{
-	const char *h, *n;
-	char hc, nc;
-
-	/* Eat one character at a time. */
-	h = haystack == NULL ? "" : haystack;
-	n = needle == NULL ? "" : needle;
-	do {
-		if (*n == '\0') {
-			return TRUE;
-		}
-		if (*h == '\0') {
-			return FALSE;
-		}
-		hc = *h++;
-		nc = *n++;
-		hc = tolower ((guchar) hc);
-		nc = tolower ((guchar) nc);
-	} while (hc == nc);
-	return FALSE;
-}
-
-gboolean
-nautilus_istr_has_suffix (const char *haystack, const char *needle)
-{
-	const char *h, *n;
-	char hc, nc;
-
-	if (needle == NULL) {
-		return TRUE;
-	}
-	if (haystack == NULL) {
-		return needle[0] == '\0';
-	}
-		
-	/* Eat one character at a time. */
-	h = haystack + strlen (haystack);
-	n = needle + strlen (needle);
-	do {
-		if (n == needle) {
-			return TRUE;
-		}
-		if (h == haystack) {
-			return FALSE;
-		}
-		hc = *--h;
-		nc = *--n;
-		hc = tolower ((guchar) hc);
-		nc = tolower ((guchar) nc);
-	} while (hc == nc);
-	return FALSE;
-}
-
-/**
- * nautilus_str_get_prefix:
- * Get a new string containing the first part of an existing string.
- * 
- * @source: The string whose prefix should be extracted.
- * @delimiter: The string that marks the end of the prefix.
- * 
- * Return value: A newly-allocated string that that matches the first part
- * of @source, up to but not including the first occurrence of
- * @delimiter. If @source is NULL, returns NULL. If 
- * @delimiter is NULL, returns a copy of @source.
- * If @delimiter does not occur in @source, returns
- * a copy of @source.
- **/
-char *
-nautilus_str_get_prefix (const char *source, 
-			 const char *delimiter)
-{
-	char *prefix_start;
-
-	if (source == NULL) {
-		return NULL;
-	}
-
-	if (delimiter == NULL) {
-		return g_strdup (source);
-	}
-
-	prefix_start = strstr (source, delimiter);
-
-	if (prefix_start == NULL) {
-		return g_strdup ("");
-	}
-
-	return g_strndup (source, prefix_start - source);
-}
-
-
-/**
- * nautilus_str_get_after_prefix:
- * Get a new string containing the part of the string
- * after the prefix
- * @source: The string whose prefix should be extracted.
- * @delimiter: The string that marks the end of the prefix.
- * 
- * Return value: A newly-allocated string that that matches the end
- * of @source, starting right after the first occurr
- * @delimiter. If @source is NULL, returns NULL. If 
- * @delimiter is NULL, returns a copy of @source.
- * If @delimiter does not occur in @source, returns
- * NULL
- **/
-char *
-nautilus_str_get_after_prefix (const char *source,
-			       const char *delimiter)
-{
-	char *prefix_start;
-	
-	if (source == NULL) {
-		return NULL;
-	}
-	
-	if (delimiter == NULL) {
-		return g_strdup (source);
-	}
-	
-	prefix_start = strstr (source, delimiter);
-	
-	if (prefix_start == NULL) {
-		return NULL;
-	}
-	
-	return g_strdup (prefix_start);
-}
-
-gboolean
-nautilus_str_to_int (const char *string, int *integer)
-{
-	long result;
-	char *parse_end;
-
-	/* Check for the case of an empty string. */
-	if (string == NULL || *string == '\0') {
-		return FALSE;
-	}
-	
-	/* Call the standard library routine to do the conversion. */
-	errno = 0;
-	result = strtol (string, &parse_end, 0);
-
-	/* Check that the result is in range. */
-	if ((result == G_MINLONG || result == G_MAXLONG) && errno == ERANGE) {
-		return FALSE;
-	}
-	if (result < G_MININT || result > G_MAXINT) {
-		return FALSE;
-	}
-
-	/* Check that all the trailing characters are spaces. */
-	while (*parse_end != '\0') {
-		if (!isspace (*parse_end++)) {
-			return FALSE;
-		}
-	}
-
-	/* Return the result. */
-	*integer = result;
-	return TRUE;
-}
-
-/**
- * nautilus_str_strip_chr:
- * Remove all occurrences of a character from a string.
- * 
- * @source: The string to be stripped.
- * @remove_this: The char to remove from @source
- * 
- * Return value: A copy of @source, after removing all occurrences
- * of @remove_this.
- */
-char *
-nautilus_str_strip_chr (const char *source, char remove_this)
-{
-	char *result, *out;
-	const char *in;
-	
-        if (source == NULL) {
-		return NULL;
-	}
-	
-	result = g_new (char, strlen (source) + 1);
-	in = source;
-	out = result;
-	do {
-		if (*in != remove_this) {
-			*out++ = *in;
-		}
-	} while (*in++ != '\0');
-
-        return result;
-}
-
-/**
- * nautilus_str_strip_trailing_chr:
- * Remove trailing occurrences of a character from a string.
- * 
- * @source: The string to be stripped.
- * @remove_this: The char to remove from @source
- * 
- * Return value: @source, after removing trailing occurrences
- * of @remove_this.
- */
-char *
-nautilus_str_strip_trailing_chr (const char *source, char remove_this)
-{
-	const char *end;
-	
-        if (source == NULL) {
-		return NULL;
-	}
-
-	for (end = source + strlen (source); end != source; end--) {
-		if (end[-1] != remove_this) {
-			break;
-		}
-	}
-	
-        return g_strndup (source, end - source);
-}
-
-char *   
-nautilus_str_strip_trailing_str (const char *source, const char *remove_this)
-{
-	const char *end;
-	if (source == NULL) {
-		return NULL;
-	}
-	if (remove_this == NULL) {
-		return g_strdup (source);
-	}
-	end = source + strlen (source);
-	if (strcmp (end - strlen (remove_this), remove_this) != 0) {
-		return g_strdup (source);
-	}
-	else {
-		return g_strndup (source, strlen (source) - strlen(remove_this));
-	}
-	
-}
-
-gboolean
-nautilus_eat_str_to_int (char *source, int *integer)
-{
-	gboolean result;
-
-	result = nautilus_str_to_int (source, integer);
-	g_free (source);
-	return result;
-}
-
-char *
-nautilus_str_double_underscores (const char *string)
-{
-	int underscores;
-	const char *p;
-	char *q;
-	char *escaped;
-	
-	if (string == NULL) {
-		return NULL;
-	}
-	
-	underscores = 0;
-	for (p = string; *p != '\0'; p++) {
-		underscores += (*p == '_');
-	}
-	
-	if (underscores == 0) {
-		return g_strdup (string);
-	}
-
-	escaped = g_new (char, strlen (string) + underscores + 1);
-	for (p = string, q = escaped; *p != '\0'; p++, q++) {
-		/* Add an extra underscore. */
-		if (*p == '_') {
-			*q++ = '_';
-		}
-		*q = *p;
-	}
-	*q = '\0';
-	
-	return escaped;
-}
-
-char *
-nautilus_str_capitalize (const char *string)
-{
-	char *capitalized;
-
-	if (string == NULL) {
-		return NULL;
-	}
-
-	capitalized = g_strdup (string);
-
-	capitalized[0] = toupper ((guchar) capitalized[0]);
-
-	return capitalized;
-}
-
-/* Note: nautilus_string_ellipsize_* that use a length in pixels
- * rather than characters can be found in nautilus_gdk_extensions.h
- * 
- * FIXME bugzilla.eazel.com 5089: 
- * we should coordinate the names of nautilus_string_ellipsize_*
- * and nautilus_str_*_truncate so that they match better and reflect
- * their different behavior.
- */
-char *
-nautilus_str_middle_truncate (const char *string,
-			      guint truncate_length)
-{
-	char *truncated;
-	guint length;
-	guint num_left_chars;
-	guint num_right_chars;
-
-	const char delimter[] = "...";
-	const guint delimter_length = strlen (delimter);
-	const guint min_truncate_length = delimter_length + 2;
-
-	if (string == NULL) {
-		return NULL;
-	}
-
-	/* It doesnt make sense to truncate strings to less than
-	 * the size of the delimiter plus 2 characters (one on each
-	 * side)
-	 */
-	if (truncate_length < min_truncate_length) {
-		return g_strdup (string);
-	}
-
-	length = strlen (string);
-
-	/* Make sure the string is not already small enough. */
-	if (length <= truncate_length) {
-		return g_strdup (string);
-	}
-
-	/* Find the 'middle' where the truncation will occur. */
-	num_left_chars = (truncate_length - delimter_length) / 2;
-	num_right_chars = truncate_length - num_left_chars - delimter_length + 1;
-
-	truncated = g_new (char, truncate_length + 1);
-
-	strncpy (truncated, string, num_left_chars);
-	strncpy (truncated + num_left_chars, delimter, delimter_length);
-	strncpy (truncated + num_left_chars + delimter_length, string + length - num_right_chars + 1, num_right_chars);
-	
-	return truncated;
-}
-
-/**
- * nautilus_str_count_characters:
- * Count the number of 'c' characters that occur in 'string.
- * 
- * @string: The string to be scanned.
- * @c: The char to count.
- * 
- * Return value: @count, the 'c' occurance count.
- */
-guint
-nautilus_str_count_characters (const char	*string,
-			       char		c)
-{
-	guint count = 0;
-
-	while (string && *string != '\0') {
-		if (*string == c) {
-			count++;
-		}
-
-		string++;
-	}
-
-	return count;
-}
-
-char *
-nautilus_str_strip_substring_and_after (const char *string,
-					const char *substring)
-{
-	const char *substring_position;
-
-	g_return_val_if_fail (substring != NULL, g_strdup (string));
-	g_return_val_if_fail (substring[0] != '\0', g_strdup (string));
-
-	if (string == NULL) {
-		return NULL;
-	}
-
-	substring_position = strstr (string, substring);
-	if (substring_position == NULL) {
-		return g_strdup (string);
-	}
-
-	return g_strndup (string,
-			  substring_position - string);
-}
-
-char *
-nautilus_str_replace_substring (const char *string,
-				const char *substring,
-				const char *replacement)
-{
-	int substring_length, replacement_length, result_length, remaining_length;
-	const char *p, *substring_position;
-	char *result, *result_position;
-
-	g_return_val_if_fail (substring != NULL, g_strdup (string));
-	g_return_val_if_fail (substring[0] != '\0', g_strdup (string));
-
-	if (string == NULL) {
-		return NULL;
-	}
-
-	substring_length = strlen (substring);
-	replacement_length = nautilus_strlen (replacement);
-
-	result_length = strlen (string);
-	for (p = string; ; p = substring_position + substring_length) {
-		substring_position = strstr (p, substring);
-		if (substring_position == NULL) {
-			break;
-		}
-		result_length += replacement_length - substring_length;
-	}
-
-	result = g_malloc (result_length + 1);
-
-	result_position = result;
-	for (p = string; ; p = substring_position + substring_length) {
-		substring_position = strstr (p, substring);
-		if (substring_position == NULL) {
-			remaining_length = strlen (p);
-			memcpy (result_position, p, remaining_length);
-			result_position += remaining_length;
-			break;
-		}
-		memcpy (result_position, p, substring_position - p);
-		result_position += substring_position - p;
-		memcpy (result_position, replacement, replacement_length);
-		result_position += replacement_length;
-	}
-	g_assert (result_position - result == result_length);
-	result_position[0] = '\0';
-
-	return result;
-}
-
-
-/* Removes strings enclosed by the '[' and ']' characters.  Strings
-   that have unbalanced open and closed brackets will return the
-   string itself. */
-char *
-nautilus_str_remove_bracketed_text (const char *text)
-{
-	char *unbracketed_text;
-	char *unbracketed_segment, *new_unbracketed_text;
-	const char *current_text_location;
-	const char *next_open_bracket, *next_close_bracket;
-	int bracket_depth;
-	
-
-	g_return_val_if_fail (text != NULL, NULL);
-
-	current_text_location = text;
-	bracket_depth = 0;
-	unbracketed_text = g_strdup ("");
-	while (TRUE) {
-		next_open_bracket = strchr (current_text_location, '[');
-		next_close_bracket = strchr (current_text_location, ']');
-		/* No more brackets */
-		if (next_open_bracket == NULL &&
-		    next_close_bracket == NULL) {
-			if (bracket_depth == 0) {
-				new_unbracketed_text = g_strconcat (unbracketed_text, 
-								    current_text_location, NULL);
-				g_free (unbracketed_text);
-				return new_unbracketed_text;
-			}
-			else {
-				g_free (unbracketed_text);
-				return g_strdup (text);
-			}
-		}
-		/* Close bracket but no open bracket */
-		else if (next_open_bracket == NULL) {
-			if (bracket_depth == 0) {
-				g_free (unbracketed_text);
-				return g_strdup (text);
-			}
-			else {
-				current_text_location = next_close_bracket + 1;
-				bracket_depth--;
-			}
-		}
-		/* Open bracket but no close bracket */
-		else if (next_close_bracket == NULL) {
-			g_free (unbracketed_text);
-			return g_strdup (text);
-		}
-		/* Deal with the open bracket, that's first */
-		else if (next_open_bracket < next_close_bracket) {
-			if (bracket_depth == 0) {
-				/* We're out of brackets. Copy until the next bracket */
-				unbracketed_segment = g_strndup (current_text_location,
-								 next_open_bracket - current_text_location);
-				new_unbracketed_text = g_strconcat (unbracketed_text, unbracketed_segment, NULL);
-				g_free (unbracketed_text);
-				g_free (unbracketed_segment);
-				unbracketed_text = new_unbracketed_text;
-			}
-			current_text_location = next_open_bracket + 1;
-			bracket_depth++;
-		}
-		/* Deal with the close bracket, that's first */
-		else {
-			if (bracket_depth > 0) {
-				bracket_depth--;
-				current_text_location = next_close_bracket + 1;
-			}
-			else {
-				g_free (unbracketed_text);
-				return g_strdup (text);
-			}
-		}
-	}
-	
-	     
-
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-static int
-call_str_to_int (const char *string)
-{
-	int integer;
-
-	integer = 9999;
-	nautilus_str_to_int (string, &integer);
-	return integer;
-}
-
-static int
-call_eat_str_to_int (char *string)
-{
-	int integer;
-
-	integer = 9999;
-	nautilus_eat_str_to_int (string, &integer);
-	return integer;
-}
-
-void
-nautilus_self_check_string (void)
-{
-	int integer;
-
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_strlen (NULL), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_strlen (""), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_strlen ("abc"), 3);
-
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_strcmp (NULL, NULL), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_strcmp (NULL, ""), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_strcmp ("", NULL), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_strcmp ("a", "a"), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_strcmp ("aaab", "aaab"), 0);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_strcmp (NULL, "a") < 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_strcmp ("a", NULL) > 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_strcmp ("", "a") < 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_strcmp ("a", "") > 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_strcmp ("a", "b") < 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_strcmp ("a", "ab") < 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_strcmp ("ab", "a") > 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_strcmp ("aaa", "aaab") < 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_strcmp ("aaab", "aaa") > 0, TRUE);
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix (NULL, NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix (NULL, ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("", NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("a", "a"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("aaab", "aaab"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix (NULL, "a"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("a", NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("", "a"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("a", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("a", "b"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("a", "ab"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("ab", "a"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("aaa", "aaab"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("aaab", "aaa"), TRUE);
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix (NULL, NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix (NULL, ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("", NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("a", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("", "a"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("a", "a"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("aaab", "aaab"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix (NULL, "a"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("a", NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("", "a"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("a", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("a", "b"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("a", "ab"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("ab", "a"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("ab", "b"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("aaa", "baaa"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("baaa", "aaa"), TRUE);
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix (NULL, NULL), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix (NULL, "foo"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix ("foo", NULL), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix ("", ""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix ("", "foo"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix ("foo", ""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix ("foo", "foo"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix ("foo:", ":"), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix ("foo:bar", ":"), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix ("footle:bar", "tle:"), "foo");	
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix (NULL, NULL), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix (NULL, "foo"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix ("foo", NULL), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix ("", ""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix ("", "foo"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix ("foo", ""), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix ("foo", "foo"), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix ("foo:", ":"), ":");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix ("foo:bar", ":"), ":bar");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix ("footle:bar", "tle:"), "tle:bar");	
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_chr (NULL, '_'), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_chr ("", '_'), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_chr ("foo", '_'), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_chr ("_foo", '_'), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_chr ("foo_", '_'), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_chr ("_foo__", '_'), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_chr ("_f_o__o_", '_'), "foo");
-        
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_chr (NULL, '_'), NULL);	
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_chr ("", '_'), "");	
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_chr ("foo", '_'), "foo");	
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_chr ("_foo", '_'), "_foo");	
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_chr ("foo_", '_'), "foo");	
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_chr ("_foo__", '_'), "_foo");	
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_chr ("_f_o__o_", '_'), "_f_o__o");	
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_str (NULL, NULL), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_str (NULL, "bar"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_str ("bar", NULL), "bar");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_str ("", ""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_str ("", "bar"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_str ("bar", ""), "bar");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_str ("foo", "bar"), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_str ("foo bar", "bar"), "foo ");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_str ("bar", "bar"), "");
-	
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_double_underscores (NULL), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_double_underscores (""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_double_underscores ("_"), "__");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_double_underscores ("foo"), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_double_underscores ("foo_bar"), "foo__bar");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_double_underscores ("foo_bar_2"), "foo__bar__2");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_double_underscores ("_foo"), "__foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_double_underscores ("foo_"), "foo__");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_capitalize (NULL), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_capitalize (""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_capitalize ("foo"), "Foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_capitalize ("Foo"), "Foo");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("foo", 0), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("foo", 1), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("foo", 3), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("foo", 4), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("foo", 5), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("foo", 6), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("foo", 7), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 0), "a_much_longer_foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 1), "a_much_longer_foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 2), "a_much_longer_foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 3), "a_much_longer_foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 4), "a_much_longer_foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 5), "a...o");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 6), "a...oo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 7), "a_...oo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 8), "a_...foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 9), "a_m...foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_even", 8), "so...ven");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_odd", 8), "so...odd");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_even", 9), "som...ven");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_odd", 9), "som...odd");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_even", 10), "som...even");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_odd", 10), "som..._odd");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_even", 11), "some...even");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_odd", 11), "some..._odd");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_even", 12), "some..._even");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_odd", 12), "some...g_odd");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_even", 13), "somet..._even");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_odd", 13), "something_odd");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_even", 14), "something_even");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_odd", 13), "something_odd");
-
-	#define TEST_INTEGER_CONVERSION_FUNCTIONS(string, boolean_result, integer_result) \
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_to_int (string, &integer), boolean_result); \
-		NAUTILUS_CHECK_INTEGER_RESULT (call_str_to_int (string), integer_result); \
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_eat_str_to_int (g_strdup (string), &integer), boolean_result); \
-		NAUTILUS_CHECK_INTEGER_RESULT (call_eat_str_to_int (g_strdup (string)), integer_result);
-
-	TEST_INTEGER_CONVERSION_FUNCTIONS (NULL, FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("a", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS (".", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("0", TRUE, 0)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("1", TRUE, 1)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("+1", TRUE, 1)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("-1", TRUE, -1)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("2147483647", TRUE, 2147483647)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("2147483648", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("+2147483647", TRUE, 2147483647)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("+2147483648", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("-2147483648", TRUE, INT_MIN)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("-2147483649", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("1a", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("0.0", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("1e1", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("21474836470", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("+21474836470", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("-21474836480", FALSE, 9999)
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_is_equal (NULL, NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_is_equal (NULL, ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_is_equal ("", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_is_equal ("", NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_is_equal ("", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_is_equal ("foo", "foo"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_is_equal ("foo", "bar"), FALSE);
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal (NULL, NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal (NULL, ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("", NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("foo", "foo"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("foo", "bar"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("Foo", "foo"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("foo", "Foo"), TRUE);
-
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters (NULL, 'x'), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters ("", 'x'), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters (NULL, '\0'), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters ("", '\0'), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters ("foo", 'x'), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters ("foo", 'f'), 1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters ("foo", 'o'), 2);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters ("xxxx", 'x'), 4);
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_substring_and_after (NULL, "bar"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_substring_and_after ("", "bar"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_substring_and_after ("foo", "bar"), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_substring_and_after ("foo bar", "bar"), "foo ");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_substring_and_after ("foo bar xxx", "bar"), "foo ");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_substring_and_after ("bar", "bar"), "");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring (NULL, "foo", NULL), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring (NULL, "foo", "bar"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring ("bar", "foo", NULL), "bar");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring ("", "foo", ""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring ("", "foo", "bar"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring ("bar", "foo", ""), "bar");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring ("xxx", "x", "foo"), "foofoofoo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring ("fff", "f", "foo"), "foofoofoo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring ("foofoofoo", "foo", "f"), "fff");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring ("foofoofoo", "f", ""), "oooooo");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text (""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("[]"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("["), "[");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("]"), "]");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("[[]"), "[[]");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("foo"), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("foo [bar]"), "foo ");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("foo[ bar]"), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("foo[ bar] baz"), "foo baz");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("foo[ [b]ar] baz"), "foo baz");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("foo[ bar] baz[ bat]"), "foo baz");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("foo[ bar[ baz] bat]"), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("foo[ bar] baz] bat]"), "foo[ bar] baz] bat]");
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-extensions/nautilus-string.h b/libnautilus-extensions/nautilus-string.h
deleted file mode 100644
index d4e128bae..000000000
--- a/libnautilus-extensions/nautilus-string.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-string.h: String routines to augment <string.h>.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#ifndef NAUTILUS_STRING_H
-#define NAUTILUS_STRING_H
-
-#include <glib.h>
-#include <string.h>
-
-/* We use the "str" abbrevation to mean char * string, since
- * "string" usually means g_string instead. We use the "istr"
- * abbreviation to mean a case-insensitive char *.
- */
-
-/* NULL is allowed for all the str parameters to these functions. */
-
-/* Versions of basic string functions that allow NULL, and handle
- * cases that the standard ones get a bit wrong for our purposes.
- */
-size_t   nautilus_strlen                        (const char    *str);
-char *   nautilus_strchr                        (const char    *haystack,
-						 char           needle);
-int      nautilus_strcmp                        (const char    *str_a,
-						 const char    *str_b);
-int      nautilus_strcoll                       (const char    *str_a,
-						 const char    *str_b);
-int      nautilus_strcasecmp                    (const char    *str_a,
-						 const char    *str_b);
-int      nautilus_strcmp_case_breaks_ties       (const char    *str_a,
-						 const char    *str_b);
-
-/* GCompareFunc versions. */
-int      nautilus_strcmp_compare_func           (gconstpointer  str_a,
-						 gconstpointer  str_b);
-int      nautilus_strcoll_compare_func          (gconstpointer  str_a,
-						 gconstpointer  str_b);
-int      nautilus_strcasecmp_compare_func       (gconstpointer  str_a,
-						 gconstpointer  str_b);
-
-/* Other basic string operations. */
-gboolean nautilus_str_is_empty                  (const char    *str_or_null);
-gboolean nautilus_str_is_equal                  (const char    *str_a,
-						 const char    *str_b);
-gboolean nautilus_istr_is_equal                 (const char    *str_a,
-						 const char    *str_b);
-gboolean nautilus_str_has_prefix                (const char    *target,
-						 const char    *prefix);
-char *   nautilus_str_get_prefix                (const char    *source,
-						 const char    *delimiter);
-char *   nautilus_str_get_after_prefix          (const char    *source,
-						 const char    *delimiter);
-gboolean nautilus_istr_has_prefix               (const char    *target,
-						 const char    *prefix);
-gboolean nautilus_str_has_suffix                (const char    *target,
-						 const char    *suffix);
-gboolean nautilus_istr_has_suffix               (const char    *target,
-						 const char    *suffix);
-char *   nautilus_str_strip_chr                 (const char    *str,
-						 char           remove_this);
-char *   nautilus_str_strip_trailing_chr        (const char    *str,
-						 char           remove_this);
-char *   nautilus_str_strip_trailing_str        (const char    *str,
-						 const char    *remove_this);
-
-/* Conversions to and from strings. */
-gboolean nautilus_str_to_int                    (const char    *str,
-						 int           *integer);
-gboolean nautilus_eat_str_to_int                (char          *str_gets_freed,
-						 int           *integer);
-/* Escape function for '_' character. */
-char *   nautilus_str_double_underscores        (const char    *str);
-
-/* Capitalize a string */
-char *   nautilus_str_capitalize                (const char    *str);
-
-/* Middle truncate a string to a maximum of truncate_length characters.
- * The resulting string will be truncated in the middle with a "..."
- * delimeter.
- */
-char *   nautilus_str_middle_truncate           (const char    *str,
-						 guint          truncate_length);
-
-
-/* Count the number of 'c' characters that occur in 'string'. */
-guint    nautilus_str_count_characters          (const char    *str,
-						 char           c);
-
-/* Remove all characters after the passed-in substring. */
-char *   nautilus_str_strip_substring_and_after (const char    *str,
-						 const char    *substring);
-
-/* Replace all occurrences of substring with replacement. */
-char *   nautilus_str_replace_substring         (const char    *str,
-						 const char    *substring,
-						 const char    *replacement);
-
-/* Remove all text in brackets.  Used where context is included in strings to 
- * be internationalized, to help translators, and to make sure that strings
- * that may be used in different places with a different meaning may be 
- * translated separately.  If brackets are not even, it will just return a 
- * copy of the original string. 
- */
-char *   nautilus_str_remove_bracketed_text     (const char    *text);
-
-#endif /* NAUTILUS_STRING_H */
diff --git a/libnautilus-extensions/nautilus-tabs.c b/libnautilus-extensions/nautilus-tabs.c
index bc718847f..a1a16b3f7 100644
--- a/libnautilus-extensions/nautilus-tabs.c
+++ b/libnautilus-extensions/nautilus-tabs.c
@@ -30,14 +30,14 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-scalable-font.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-scalable-font.h>
 #include <libnautilus-extensions/nautilus-theme.h>
 #include <math.h>
 #include <stdio.h>
@@ -80,7 +80,7 @@ struct NautilusTabsDetails {
 	int total_height;
 	
 	GdkRectangle title_rect;
-	NautilusScalableFont *tab_font;	
+	EelScalableFont *tab_font;	
 	int font_size;
 	int selected_tab;
 	
@@ -128,7 +128,7 @@ static void     draw_all_tabs		        (NautilusTabs *tabs);
 static TabItem* tab_item_find_by_name		(NautilusTabs	*tabs,
 						 const char		*name);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTabs, nautilus_tabs, GTK_TYPE_DRAWING_AREA)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTabs, nautilus_tabs, GTK_TYPE_DRAWING_AREA)
 
 static void
 nautilus_tabs_initialize_class (NautilusTabsClass *class)
@@ -181,7 +181,7 @@ nautilus_tabs_initialize (NautilusTabs *tabs)
 	/* FIXME bugzilla.eazel.com 5456: 
 	 * Hard coded font size.
 	 */
-	tabs->details->tab_font = nautilus_scalable_font_get_default_bold_font ();
+	tabs->details->tab_font = eel_scalable_font_get_default_bold_font ();
 	tabs->details->font_size = 14;
 	
 	gray_tab_directory_path = nautilus_theme_get_image_path ("gray_tab_pieces");
@@ -228,12 +228,12 @@ nautilus_tabs_destroy (GtkObject *object)
 	}
 	
 	/* release the tab list, if any */
-	nautilus_g_list_free_deep_custom (tabs->details->tab_items,
+	eel_g_list_free_deep_custom (tabs->details->tab_items,
 					  tab_item_destroy_cover,
 					  NULL);
 	g_free (tabs->details);
   	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* unload the tab piece images, if any */
@@ -481,7 +481,7 @@ allocate_cleared_pixbuf (int width, int height)
 static int
 measure_tab_name (NautilusTabs *tabs, const char *tab_name)
 {
-	return nautilus_scalable_font_text_width (tabs->details->tab_font,
+	return eel_scalable_font_text_width (tabs->details->tab_font,
 						  tabs->details->font_size,
 						  tab_name,
 						  strlen (tab_name));
@@ -499,32 +499,32 @@ draw_tab_label (NautilusTabs *tabs, GdkPixbuf *tab_pixbuf, int x_pos, const char
 	
 	/* make sure we can draw at least some of it */
 	if (text_x < gdk_pixbuf_get_width (tab_pixbuf)) {	
-		nautilus_scalable_font_draw_text (tabs->details->tab_font, tab_pixbuf, 
+		eel_scalable_font_draw_text (tabs->details->tab_font, tab_pixbuf, 
 					  text_x, text_y,
 					  NULL,
 					  tabs->details->font_size,
 					  label, strlen (label),
-					  NAUTILUS_RGB_COLOR_BLACK, NAUTILUS_OPACITY_FULLY_OPAQUE);
+					  EEL_RGB_COLOR_BLACK, EEL_OPACITY_FULLY_OPAQUE);
 		text_x -= 1;
 		text_y -= 1;
 
 		if (is_active) {
-			text_color = NAUTILUS_RGB_COLOR_WHITE;
+			text_color = EEL_RGB_COLOR_WHITE;
 		} else {
 			if (is_prelit) {
-				text_color = NAUTILUS_RGBA_COLOR_PACK (241, 241, 241, 255);		
+				text_color = EEL_RGBA_COLOR_PACK (241, 241, 241, 255);		
 			} else {
-				text_color = NAUTILUS_RGBA_COLOR_PACK (223, 223, 223, 255);		
+				text_color = EEL_RGBA_COLOR_PACK (223, 223, 223, 255);		
 			}
 		}
 	
-		nautilus_scalable_font_draw_text (tabs->details->tab_font, tab_pixbuf,
+		eel_scalable_font_draw_text (tabs->details->tab_font, tab_pixbuf,
 					  text_x, text_y,
 					  NULL,
 					  tabs->details->font_size,
 					  label, strlen (label),
 					  text_color,
-					  NAUTILUS_OPACITY_FULLY_OPAQUE);
+					  EEL_OPACITY_FULLY_OPAQUE);
 	}
 }
 
diff --git a/libnautilus-extensions/nautilus-text-caption.c b/libnautilus-extensions/nautilus-text-caption.c
deleted file mode 100644
index d98156684..000000000
--- a/libnautilus-extensions/nautilus-text-caption.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-text-caption.c - A text caption widget.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-text-caption.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-glib-extensions.h"
-
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-
-#include <libgnomevfs/gnome-vfs-utils.h>
-
-#include <string.h>
- 
-static const gint TEXT_CAPTION_INVALID = -1;
-static const gint TEXT_CAPTION_SPACING = 10;
-
-/* Signals */
-typedef enum
-{
-	CHANGED,
-	LAST_SIGNAL
-} NautilusTextCaptionSignals;
-
-struct _NautilusTextCaptionDetail
-{
-	GtkWidget		*text;
-
-	gboolean                expand_tilde;
-};
-
-/* NautilusTextCaptionClass methods */
-static void      nautilus_text_caption_initialize_class (NautilusTextCaptionClass *klass);
-static void      nautilus_text_caption_initialize       (NautilusTextCaption      *text_caption);
-
-/* GtkObjectClass methods */
-static void      nautilus_text_caption_destroy          (GtkObject                 *object);
-
-/* Editable (entry) callbacks */
-static void      entry_changed_callback                  (GtkWidget                 *entry,
-							  gpointer                   user_data);
-static void      entry_key_press_callback                (GtkWidget                 *widget,
-							  GdkEventKey               *event,
-							  gpointer                  user_data);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTextCaption, nautilus_text_caption, NAUTILUS_TYPE_CAPTION)
-
-static guint text_caption_signals[LAST_SIGNAL] = { 0 };
-
-/*
- * NautilusTextCaptionClass methods
- */
-static void
-nautilus_text_caption_initialize_class (NautilusTextCaptionClass *text_caption_class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	
-	object_class = GTK_OBJECT_CLASS (text_caption_class);
-	widget_class = GTK_WIDGET_CLASS (text_caption_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_text_caption_destroy;
-	
-	/* Signals */
-	text_caption_signals[CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				0,
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 
-				0);
-
-	gtk_object_class_add_signals (object_class, text_caption_signals, LAST_SIGNAL);
-}
-
-static void
-nautilus_text_caption_initialize (NautilusTextCaption *text_caption)
-{
-	text_caption->detail = g_new (NautilusTextCaptionDetail, 1);
-
-	gtk_box_set_homogeneous (GTK_BOX (text_caption), FALSE);
-	gtk_box_set_spacing (GTK_BOX (text_caption), TEXT_CAPTION_SPACING);
-
-	text_caption->detail->text = gtk_entry_new ();
-	
-	gtk_entry_set_editable (GTK_ENTRY (text_caption->detail->text), TRUE);
-	
-	nautilus_caption_set_child (NAUTILUS_CAPTION (text_caption),
-				    text_caption->detail->text,
-				    TRUE,
-				    TRUE);
-
-	gtk_signal_connect (GTK_OBJECT (text_caption->detail->text),
-			    "changed",
-			    GTK_SIGNAL_FUNC (entry_changed_callback),
-			    (gpointer) text_caption);
-	gtk_signal_connect_after (GTK_OBJECT (text_caption->detail->text),
-				  "key_press_event",
-				  GTK_SIGNAL_FUNC (entry_key_press_callback),
-				  (gpointer) text_caption);
-
-	gtk_widget_show (text_caption->detail->text);
-}
-
-/*
- * GtkObjectClass methods
- */
-static void
-nautilus_text_caption_destroy (GtkObject* object)
-{
-	NautilusTextCaption * text_caption;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (NAUTILUS_IS_TEXT_CAPTION (object));
-	
-	text_caption = NAUTILUS_TEXT_CAPTION (object);
-
-	g_free (text_caption->detail);
-
-	/* Chain */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-/*
- * Editable (entry) callbacks
- */
-static void
-entry_changed_callback (GtkWidget *entry, gpointer user_data)
-{
-	NautilusTextCaption *text_caption;
-
-	g_assert (user_data != NULL);
-	g_assert (NAUTILUS_IS_TEXT_CAPTION (user_data));
-
-	text_caption = NAUTILUS_TEXT_CAPTION (user_data);
-
-	gtk_signal_emit (GTK_OBJECT (text_caption), text_caption_signals[CHANGED]);
-}
-
-static void
-entry_key_press_callback (GtkWidget *widget, GdkEventKey *event, gpointer user_data)
-{
-	NautilusTextCaption *text_caption;
-	char *expanded_text;
-	
-	text_caption = NAUTILUS_TEXT_CAPTION (user_data);
-	
-	if (event->keyval == GDK_asciitilde) {
-		if (text_caption->detail->expand_tilde) {
-			expanded_text = gnome_vfs_expand_initial_tilde (gtk_entry_get_text (GTK_ENTRY (widget)));
-			
-			gtk_entry_set_text (GTK_ENTRY (widget), expanded_text);
-			g_free (expanded_text);
-		}
-	}
-}
-
-/*
- * NautilusTextCaption public methods
- */
-GtkWidget *
-nautilus_text_caption_new (void)
-{
-	return gtk_widget_new (nautilus_text_caption_get_type (), NULL);
-}
-
-/**
- * nautilus_text_caption_get_text
- * @text_caption: A NautilusTextCaption
- *
- * Returns: A copy of the currently selected text.  Need to g_free() it.
- */
-char *
-nautilus_text_caption_get_text (const NautilusTextCaption *text_caption)
-{
-	const char *entry_text;
-
- 	g_return_val_if_fail (text_caption != NULL, NULL);
-	g_return_val_if_fail (NAUTILUS_IS_TEXT_CAPTION (text_caption), NULL);
-
-	/* WATCHOUT: 
-	 * As of gtk1.2, gtk_entry_get_text() returns a non const reference to
-	 * the internal string.
-	 */
-	entry_text = (const char *) gtk_entry_get_text (GTK_ENTRY (text_caption->detail->text));
-
-	return g_strdup (entry_text);
-}
-
-void
-nautilus_text_caption_set_text (NautilusTextCaption	*text_caption,
-				 const char		*text)
-{
- 	g_return_if_fail (text_caption != NULL);
-	g_return_if_fail (NAUTILUS_IS_TEXT_CAPTION (text_caption));
-
-	gtk_entry_set_text (GTK_ENTRY (text_caption->detail->text), text);
-}
-
-void
-nautilus_text_caption_set_editable (NautilusTextCaption *text_caption,
-				    gboolean editable)
-{
-	g_return_if_fail (NAUTILUS_IS_TEXT_CAPTION (text_caption));
-
-	gtk_entry_set_editable (GTK_ENTRY (text_caption->detail->text), editable);
-}
-
-void
-nautilus_text_caption_set_expand_tilde (NautilusTextCaption *text_caption,
-					gboolean expand_tilde)
-{
-	g_return_if_fail (NAUTILUS_IS_TEXT_CAPTION (text_caption));
-
-	text_caption->detail->expand_tilde = expand_tilde;
-}
diff --git a/libnautilus-extensions/nautilus-text-caption.h b/libnautilus-extensions/nautilus-text-caption.h
deleted file mode 100644
index eda774889..000000000
--- a/libnautilus-extensions/nautilus-text-caption.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-text-caption.c - A text caption widget.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_TEXT_CAPTION_H
-#define NAUTILUS_TEXT_CAPTION_H
-
-#include <libnautilus-extensions/nautilus-caption.h>
-
-/*
- * NautilusTextCaption is made up of 2 widgets. 
- *
- * [title label] [string combo box]
- *
- * The user can select a string from the list.
- */
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_TEXT_CAPTION            (nautilus_text_caption_get_type ())
-#define NAUTILUS_TEXT_CAPTION(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_TEXT_CAPTION, NautilusTextCaption))
-#define NAUTILUS_TEXT_CAPTION_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_TEXT_CAPTION, NautilusTextCaptionClass))
-#define NAUTILUS_IS_TEXT_CAPTION(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_TEXT_CAPTION))
-
-typedef struct _NautilusTextCaption	       NautilusTextCaption;
-typedef struct _NautilusTextCaptionClass      NautilusTextCaptionClass;
-typedef struct _NautilusTextCaptionDetail     NautilusTextCaptionDetail;
-
-struct _NautilusTextCaption
-{
-	/* Super Class */
-	NautilusCaption caption;
-	
-	/* Private stuff */
-	NautilusTextCaptionDetail *detail;
-};
-
-struct _NautilusTextCaptionClass
-{
-	NautilusCaptionClass parent_class;
-};
-
-GtkType    nautilus_text_caption_get_type        (void);
-GtkWidget* nautilus_text_caption_new             (void);
-
-/* Entry text accesor. */
-char *nautilus_text_caption_get_text         (const NautilusTextCaption *text_caption);
-
-/* Entry text mutator. */
-void  nautilus_text_caption_set_text         (NautilusTextCaption       *text_caption,
-					      const char                *text);
-void  nautilus_text_caption_set_editable     (NautilusTextCaption       *text_caption,
-					      gboolean                   editable);
-void  nautilus_text_caption_set_expand_tilde (NautilusTextCaption       *text_caption,
-					      gboolean                   expand_tilde);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_TEXT_CAPTION_H */
-
-
diff --git a/libnautilus-extensions/nautilus-theme.c b/libnautilus-extensions/nautilus-theme.c
index fbf8ef060..0fb37d839 100644
--- a/libnautilus-extensions/nautilus-theme.c
+++ b/libnautilus-extensions/nautilus-theme.c
@@ -30,8 +30,8 @@
 #include "nautilus-global-preferences.h"
 #include "nautilus-metadata.h"
 #include "nautilus-preferences.h"
-#include "nautilus-string.h"
-#include "nautilus-xml-extensions.h"
+#include <eel/eel-string.h>
+#include <eel/eel-xml-extensions.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
@@ -84,7 +84,7 @@ nautilus_theme_set_theme (const char *new_theme)
 	char *old_theme;
 	
 	old_theme = nautilus_theme_get_theme ();
-	if (nautilus_strcmp (old_theme, new_theme)) {
+	if (eel_strcmp (old_theme, new_theme)) {
 		nautilus_preferences_set (NAUTILUS_PREFERENCES_THEME, new_theme);
 	}
 	g_free (old_theme);
@@ -165,7 +165,7 @@ nautilus_theme_get_theme_data_from_theme (const char *resource_name, const char
 	/* fetch the current theme name */
 	theme_data = NULL;
 	
-	if (nautilus_strcmp (theme_name, last_theme_name) == 0) {
+	if (eel_strcmp (theme_name, last_theme_name) == 0) {
 		theme_document = last_theme_document;
 	} else {
 		/* release the old saved data, since the theme changed */
@@ -182,7 +182,7 @@ nautilus_theme_get_theme_data_from_theme (const char *resource_name, const char
 	
 	if (theme_document != NULL) {
 		/* fetch the resource node */			
-		resource_node = nautilus_xml_get_child_by_name (xmlDocGetRootElement (theme_document), resource_name);
+		resource_node = eel_xml_get_child_by_name (xmlDocGetRootElement (theme_document), resource_name);
 		if (resource_node) {		
 			temp_str = xmlGetProp(resource_node, property_name);
 			if (temp_str) {
@@ -199,7 +199,7 @@ nautilus_theme_get_theme_data_from_theme (const char *resource_name, const char
 			g_atexit (free_default_theme);
 		}
 
-		resource_node = nautilus_xml_get_child_by_name (xmlDocGetRootElement (default_theme_document), resource_name);
+		resource_node = eel_xml_get_child_by_name (xmlDocGetRootElement (default_theme_document), resource_name);
 		if (resource_node) {		
 			temp_str = xmlGetProp (resource_node, property_name);
 			if (temp_str) {
@@ -259,7 +259,7 @@ nautilus_theme_get_image_path_from_theme (const char *image_name, const char* th
 {
 	char *image_path, *png_string, *temp_str;
 	
-	if (nautilus_strcmp (theme_name, "default") != 0) {
+	if (eel_strcmp (theme_name, "default") != 0) {
 		temp_str = g_strdup_printf ("%s/%s", theme_name, image_name);
 		image_path = nautilus_pixmap_file_may_be_local (temp_str);
 		
@@ -270,7 +270,7 @@ nautilus_theme_get_image_path_from_theme (const char *image_name, const char* th
 		}
 		
 		/* try if with a .png extension if it doesn't already have one */
-		if (!nautilus_istr_has_suffix (image_name, ".png")) {
+		if (!eel_istr_has_suffix (image_name, ".png")) {
 			png_string = g_strconcat (temp_str, ".png", NULL);
 			image_path = nautilus_pixmap_file_may_be_local (png_string);
 			g_free (png_string);
@@ -291,7 +291,7 @@ nautilus_theme_get_image_path_from_theme (const char *image_name, const char* th
 	}
 	
 	/* if it doesn't have a .png extension, try it with that */
-	if (!nautilus_istr_has_suffix (image_name, ".png")) {
+	if (!eel_istr_has_suffix (image_name, ".png")) {
 		png_string = g_strconcat (image_name, ".png", NULL);
 		image_path = nautilus_pixmap_file (png_string);
 		g_free (png_string);
@@ -329,7 +329,7 @@ nautilus_theme_make_selector (const char *theme_name)
 	GdkPixbuf *pixbuf;
 	
 	/* first, see if we can find an explicit preview */
-	if (!nautilus_strcmp (theme_name, "default")) {
+	if (!eel_strcmp (theme_name, "default")) {
 		theme_preview_name = g_strdup ("theme_preview.png");
 	} else {
 		theme_preview_name = g_strdup_printf ("%s/%s", theme_name, "theme_preview.png");
@@ -402,7 +402,7 @@ nautilus_theme_make_selector (const char *theme_name)
 	pixbuf = NULL;
 	
 	/* load the icon that we found and return it */
-	if (nautilus_istr_has_suffix (pixbuf_file, ".svg")) {
+	if (eel_istr_has_suffix (pixbuf_file, ".svg")) {
 		FILE *f = fopen (pixbuf_file, "rb");
 		if (f != NULL) {
 			pixbuf = rsvg_render_file (f, 1.0);
diff --git a/libnautilus-extensions/nautilus-thumbnails.c b/libnautilus-extensions/nautilus-thumbnails.c
index b76901c01..00b464a51 100644
--- a/libnautilus-extensions/nautilus-thumbnails.c
+++ b/libnautilus-extensions/nautilus-thumbnails.c
@@ -28,17 +28,17 @@
 #include <libgnomevfs/gnome-vfs-file-info.h>
 #include <string.h>
 #include "nautilus-file-utilities.h"
-#include "nautilus-string.h"
+#include <eel/eel-string.h>
 #include <gtk/gtkmain.h>
 #include "nautilus-icon-factory-private.h"
 #include "nautilus-directory-notify.h"
 #include "nautilus-theme.h"
 #include <stdio.h>
-#include "nautilus-gdk-pixbuf-extensions.h"
+#include <eel/eel-gdk-pixbuf-extensions.h>
 #include <unistd.h>
 #include <sys/wait.h>
 #include <librsvg/rsvg.h>
-#include "nautilus-graphic-effects.h"
+#include <eel/eel-graphic-effects.h>
 
 /* permissions for thumbnail directory */
 #define THUMBNAIL_DIR_PERMISSIONS (GNOME_VFS_PERM_USER_ALL \
@@ -153,7 +153,7 @@ make_thumbnail_uri (const char *image_uri, gboolean directory_only, gboolean use
 		}
 		
 		/* append an image suffix if the correct one isn't already present */
-		if (!nautilus_istr_has_suffix (image_uri, ".png")) {		
+		if (!eel_istr_has_suffix (image_uri, ".png")) {		
 			char *old_uri = thumbnail_uri;
 			thumbnail_uri = g_strdup_printf ("%s.png", thumbnail_uri);
 			g_free(old_uri);			
@@ -595,7 +595,7 @@ make_thumbnails (gpointer data)
 				}
 			} else {
 				if (info->thumbnail_uri != NULL)
-					full_size_image = nautilus_gdk_pixbuf_load (info->thumbnail_uri);						
+					full_size_image = eel_gdk_pixbuf_load (info->thumbnail_uri);						
 			}
 			nautilus_file_unref (file);
 			
@@ -603,7 +603,7 @@ make_thumbnails (gpointer data)
 				thumbnail_image_frame = load_thumbnail_frame (info->anti_aliased);
 									
 				/* scale the content image as necessary */	
-				scaled_image = nautilus_gdk_pixbuf_scale_down_to_fit(full_size_image, 96, 96);	
+				scaled_image = eel_gdk_pixbuf_scale_down_to_fit(full_size_image, 96, 96);	
 				gdk_pixbuf_unref (full_size_image);
 				
 				/* embed the content image in the frame, if necessary  */
@@ -618,7 +618,7 @@ make_thumbnails (gpointer data)
 						right_offset = 6; bottom_offset = 6;
 					}
 				
-					framed_image = nautilus_embed_image_in_frame (scaled_image, thumbnail_image_frame,
+					framed_image = eel_embed_image_in_frame (scaled_image, thumbnail_image_frame,
 									      left_offset, top_offset, right_offset, bottom_offset);
 					g_free (frame_offset_str);
 				
@@ -630,7 +630,7 @@ make_thumbnails (gpointer data)
 				
 				thumbnail_path = gnome_vfs_get_local_path_from_uri (new_thumbnail_uri);
 				if (thumbnail_path == NULL
-				    || !nautilus_gdk_pixbuf_save_to_file (framed_image, thumbnail_path)) {
+				    || !eel_gdk_pixbuf_save_to_file (framed_image, thumbnail_path)) {
 					g_warning ("error saving thumbnail %s", thumbnail_path);
 				}
 				g_free (thumbnail_path);
diff --git a/libnautilus-extensions/nautilus-trash-directory.c b/libnautilus-extensions/nautilus-trash-directory.c
index 8a1bc706e..6a149130f 100644
--- a/libnautilus-extensions/nautilus-trash-directory.c
+++ b/libnautilus-extensions/nautilus-trash-directory.c
@@ -28,9 +28,9 @@
 
 #include "nautilus-directory-private.h"
 #include "nautilus-file.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-stock-dialogs.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-gtk-macros.h>
 #include "nautilus-volume-monitor.h"
 #include <gtk/gtksignal.h>
 #include <gtk/gtkmain.h>
@@ -55,7 +55,7 @@ static void     nautilus_trash_directory_initialize_class (gpointer
 static void	add_volume				  (NautilusTrashDirectory *trash,
 							   NautilusVolume	  *volume);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTrashDirectory,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTrashDirectory,
 				   nautilus_trash_directory,
 				   NAUTILUS_TYPE_MERGED_DIRECTORY)
 
@@ -67,7 +67,7 @@ static void
 find_directory_start (void)
 {
 	if (pending_find_directory_count == 0) {
-		nautilus_timed_wait_start_with_duration (TRASH_SEARCH_TIMED_WAIT_DELAY,
+		eel_timed_wait_start_with_duration (TRASH_SEARCH_TIMED_WAIT_DELAY,
 							 NULL,
 							 add_volume,
 							 _("Searching Disks"),
@@ -84,7 +84,7 @@ find_directory_end (void)
 	--pending_find_directory_count;
 
 	if (pending_find_directory_count == 0) {
-		nautilus_timed_wait_stop (NULL, add_volume);
+		eel_timed_wait_stop (NULL, add_volume);
 	}
 }
 
@@ -100,7 +100,7 @@ find_directory_callback (GnomeVFSAsyncHandle *handle,
 
 	trash_volume = callback_data;
 
-	g_assert (nautilus_g_list_exactly_one_item (results));
+	g_assert (eel_g_list_exactly_one_item (results));
 	g_assert (trash_volume != NULL);
 	g_assert (NAUTILUS_IS_TRASH_DIRECTORY (trash_volume->trash));
 	g_assert (trash_volume->real_directory == NULL);
@@ -284,14 +284,14 @@ trash_destroy (GtkObject *object)
 	gtk_signal_disconnect_by_data
 		(GTK_OBJECT (nautilus_volume_monitor_get ()), trash);
 
-	nautilus_g_hash_table_safe_for_each
+	eel_g_hash_table_safe_for_each
 		(trash->details->volumes,
 		 remove_trash_volume_cover,
 		 NULL);
 	g_hash_table_destroy (trash->details->volumes);
 	g_free (trash->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static char *
diff --git a/libnautilus-extensions/nautilus-trash-file.c b/libnautilus-extensions/nautilus-trash-file.c
index 417d14a19..12aa4fcb6 100644
--- a/libnautilus-extensions/nautilus-trash-file.c
+++ b/libnautilus-extensions/nautilus-trash-file.c
@@ -31,8 +31,8 @@
 #include "nautilus-file-attributes.h"
 #include "nautilus-file-private.h"
 #include "nautilus-file-utilities.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include "nautilus-trash-directory.h"
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-defs.h>
@@ -81,7 +81,7 @@ static void nautilus_trash_file_initialize       (gpointer   object,
 						  gpointer   klass);
 static void nautilus_trash_file_initialize_class (gpointer   klass);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTrashFile,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTrashFile,
 				   nautilus_trash_file,
 				   NAUTILUS_TYPE_FILE)
 
@@ -92,7 +92,7 @@ is_delegated_attribute (const char *attribute)
 
 	g_return_val_if_fail (attribute != NULL, FALSE);
 
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (delegated_attributes); i++) {
+	for (i = 0; i < EEL_N_ELEMENTS (delegated_attributes); i++) {
 		if (strcmp (attribute, delegated_attributes[i]) == 0) {
 			return TRUE;
 		}
@@ -112,7 +112,7 @@ partition_attributes (GList *attributes,
 		      GList **delegated_attributes,
 		      GList **non_delegated_attributes)
 {
-	*delegated_attributes = nautilus_g_list_partition
+	*delegated_attributes = eel_g_list_partition
 		(attributes,
 		 is_delegated_attribute_predicate,
 		 NULL,
@@ -198,8 +198,8 @@ trash_callback_destroy (TrashCallback *trash_callback)
 	g_assert (NAUTILUS_IS_TRASH_FILE (trash_callback->trash));
 
 	nautilus_file_unref (NAUTILUS_FILE (trash_callback->trash));
-	nautilus_g_list_free_deep (trash_callback->delegated_attributes);
-	nautilus_g_list_free_deep (trash_callback->non_delegated_attributes);
+	eel_g_list_free_deep (trash_callback->delegated_attributes);
+	eel_g_list_free_deep (trash_callback->non_delegated_attributes);
 	g_list_free (trash_callback->non_ready_files);
 	g_free (trash_callback);
 }
@@ -322,7 +322,7 @@ remove_real_file (NautilusTrashFile *trash,
 	g_return_if_fail (NAUTILUS_IS_FILE (real_file));
 	g_return_if_fail (g_list_find (trash->details->files, real_file) != NULL);
 
-	nautilus_g_hash_table_safe_for_each
+	eel_g_hash_table_safe_for_each
 		(trash->details->callbacks,
 		 trash_callback_remove_file_cover,
 		 real_file);
@@ -416,7 +416,7 @@ trash_file_call_when_ready (NautilusFile *file,
 	trash_callback->callback_data = callback_data;
 	trash_callback->initializing = TRUE;
 
-	partition_attributes (nautilus_g_str_list_copy (attributes),
+	partition_attributes (eel_g_str_list_copy (attributes),
 			      &trash_callback->delegated_attributes,
 			      &trash_callback->non_delegated_attributes);
 
@@ -531,8 +531,8 @@ trash_file_monitor_add (NautilusFile *file,
 	monitor = g_hash_table_lookup (trash->details->monitors, client);
 	if (monitor != NULL) {
 		g_assert (monitor->trash == trash);
-		nautilus_g_list_free_deep (monitor->delegated_attributes);
-		nautilus_g_list_free_deep (monitor->non_delegated_attributes);
+		eel_g_list_free_deep (monitor->delegated_attributes);
+		eel_g_list_free_deep (monitor->non_delegated_attributes);
 	} else {
 		monitor = g_new0 (TrashMonitor, 1);
 		monitor->trash = trash;
@@ -540,7 +540,7 @@ trash_file_monitor_add (NautilusFile *file,
 				     (gpointer) client, monitor);
 	}
 
-	partition_attributes (nautilus_g_str_list_copy (attributes),
+	partition_attributes (eel_g_str_list_copy (attributes),
 			      &monitor->delegated_attributes,
 			      &monitor->non_delegated_attributes);
 
@@ -575,8 +575,8 @@ trash_file_monitor_remove (NautilusFile *file,
 		nautilus_file_monitor_remove (node->data, monitor);
 	}
 
-	nautilus_g_list_free_deep (monitor->delegated_attributes);
-	nautilus_g_list_free_deep (monitor->non_delegated_attributes);
+	eel_g_list_free_deep (monitor->delegated_attributes);
+	eel_g_list_free_deep (monitor->non_delegated_attributes);
 	g_free (monitor);
 }
 
@@ -801,7 +801,7 @@ trash_destroy (GtkObject *object)
 
 	nautilus_directory_unref (NAUTILUS_DIRECTORY (trash_directory));
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
diff --git a/libnautilus-extensions/nautilus-trash-monitor.c b/libnautilus-extensions/nautilus-trash-monitor.c
index 60c521364..6b6a54abb 100644
--- a/libnautilus-extensions/nautilus-trash-monitor.c
+++ b/libnautilus-extensions/nautilus-trash-monitor.c
@@ -30,7 +30,7 @@
 #include "nautilus-directory-notify.h"
 #include "nautilus-file-attributes.h"
 #include "nautilus-file-utilities.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 #include "nautilus-volume-monitor.h"
 #include <gtk/gtksignal.h>
 #include <libgnomevfs/gnome-vfs-find-directory.h>
@@ -55,7 +55,7 @@ static void nautilus_trash_monitor_initialize       (gpointer
 						     gpointer                   klass);
 static void destroy                                 (GtkObject                 *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTrashMonitor, nautilus_trash_monitor, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTrashMonitor, nautilus_trash_monitor, GTK_TYPE_OBJECT)
 
 static void
 nautilus_trash_monitor_initialize_class (NautilusTrashMonitorClass *klass)
diff --git a/libnautilus-extensions/nautilus-undo-context.c b/libnautilus-extensions/nautilus-undo-context.c
index d3f88f51b..279d010b9 100644
--- a/libnautilus-extensions/nautilus-undo-context.c
+++ b/libnautilus-extensions/nautilus-undo-context.c
@@ -26,7 +26,7 @@
 #include <config.h>
 #include "nautilus-undo-context.h"
 
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 #include <bonobo/bonobo-main.h>
 #include <gtk/gtksignal.h>
 #include <libnautilus/nautilus-bonobo-workarounds.h>
@@ -45,7 +45,7 @@ static void                  destroy                                      (GtkOb
 static Nautilus_Undo_Manager impl_Nautilus_Undo_Context__get_undo_manager (PortableServer_Servant    servant,
 									   CORBA_Environment        *ev);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusUndoContext, nautilus_undo_context, BONOBO_OBJECT_TYPE)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusUndoContext, nautilus_undo_context, BONOBO_OBJECT_TYPE)
 
 POA_Nautilus_Undo_Context__epv libnautilus_Nautilus_Undo_Context_epv =
 {
@@ -153,7 +153,7 @@ destroy (GtkObject *object)
 	
  	CORBA_exception_free (&ev);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
diff --git a/libnautilus-extensions/nautilus-undo-manager.c b/libnautilus-extensions/nautilus-undo-manager.c
index c1dd68d25..ea92de5e0 100644
--- a/libnautilus-extensions/nautilus-undo-manager.c
+++ b/libnautilus-extensions/nautilus-undo-manager.c
@@ -25,8 +25,8 @@
 #include <config.h>
 #include "nautilus-undo-manager.h"
 
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gtk-extensions.h"
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
 #include <gtk/gtksignal.h>
 #include <bonobo/bonobo-main.h>
 #include <libnautilus/nautilus-bonobo-workarounds.h>
@@ -82,7 +82,7 @@ static void corba_forget                           (PortableServer_Servant     s
 static void corba_undo                             (PortableServer_Servant     servant,
 						    CORBA_Environment         *ev);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusUndoManager, nautilus_undo_manager, BONOBO_OBJECT_TYPE)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusUndoManager, nautilus_undo_manager, BONOBO_OBJECT_TYPE)
 
 static PortableServer_ServantBase__epv base_epv;
 static POA_Nautilus_Undo_Manager__epv epv = {
@@ -320,7 +320,7 @@ destroy (GtkObject *object)
 
 	release_transaction (manager);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 void
@@ -434,7 +434,7 @@ nautilus_undo_manager_set_up_bonobo_ui_handler_undo_item (NautilusUndoManager *m
 	update_undo_menu_item (manager, connection);
 
 	/* Update it again whenever the changed signal is emitted. */
-	nautilus_gtk_signal_connect_full_while_alive
+	eel_gtk_signal_connect_full_while_alive
 		(GTK_OBJECT (manager), "changed",
 		 GTK_SIGNAL_FUNC (update_undo_menu_item), NULL,
 		 connection, undo_menu_handler_connection_free_cover,
diff --git a/libnautilus-extensions/nautilus-undo-signal-handlers.c b/libnautilus-extensions/nautilus-undo-signal-handlers.c
index 0cdcd2f27..2d55ae555 100644
--- a/libnautilus-extensions/nautilus-undo-signal-handlers.c
+++ b/libnautilus-extensions/nautilus-undo-signal-handlers.c
@@ -30,7 +30,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <libnautilus/nautilus-undo.h>
 
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 #include "nautilus-undo-signal-handlers.h"
 
diff --git a/libnautilus-extensions/nautilus-vfs-directory.c b/libnautilus-extensions/nautilus-vfs-directory.c
index 27678d939..946315aca 100644
--- a/libnautilus-extensions/nautilus-vfs-directory.c
+++ b/libnautilus-extensions/nautilus-vfs-directory.c
@@ -27,7 +27,7 @@
 #include "nautilus-vfs-directory.h"
 
 #include "nautilus-directory-private.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 #include "nautilus-file-private.h"
 
 struct NautilusVFSDirectoryDetails {
@@ -37,7 +37,7 @@ static void nautilus_vfs_directory_initialize       (gpointer   object,
 						     gpointer   klass);
 static void nautilus_vfs_directory_initialize_class (gpointer   klass);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusVFSDirectory,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusVFSDirectory,
 				   nautilus_vfs_directory,
 				   NAUTILUS_TYPE_DIRECTORY)
 
@@ -54,7 +54,7 @@ nautilus_vfs_directory_initialize (gpointer object, gpointer klass)
 static void
 vfs_destroy (GtkObject *object)
 {
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static gboolean
diff --git a/libnautilus-extensions/nautilus-vfs-file.c b/libnautilus-extensions/nautilus-vfs-file.c
index 86bc4b265..b02b90159 100644
--- a/libnautilus-extensions/nautilus-vfs-file.c
+++ b/libnautilus-extensions/nautilus-vfs-file.c
@@ -28,7 +28,7 @@
 
 #include "nautilus-directory-private.h"
 #include "nautilus-file-private.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 struct NautilusVFSFileDetails {
 };
@@ -37,7 +37,7 @@ static void nautilus_vfs_file_initialize       (gpointer   object,
 						gpointer   klass);
 static void nautilus_vfs_file_initialize_class (gpointer   klass);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusVFSFile,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusVFSFile,
 				   nautilus_vfs_file,
 				   NAUTILUS_TYPE_FILE)
 
@@ -244,7 +244,7 @@ nautilus_vfs_file_initialize (gpointer object, gpointer klass)
 static void
 vfs_destroy (GtkObject *object)
 {
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
diff --git a/libnautilus-extensions/nautilus-view-identifier.c b/libnautilus-extensions/nautilus-view-identifier.c
index a8652f4c4..7dbff08a8 100644
--- a/libnautilus-extensions/nautilus-view-identifier.c
+++ b/libnautilus-extensions/nautilus-view-identifier.c
@@ -29,8 +29,8 @@
 #include <libgnome/gnome-i18n.h>
 
 
-#include "nautilus-glib-extensions.h"
-#include "nautilus-string.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-string.h>
 #include <glib.h>
 #include <stdlib.h>
 
@@ -118,12 +118,12 @@ get_lang_list (void)
 
 		/* Make sure we don't give oaf an empty
 		   lang string */
-		if (!nautilus_str_is_empty (lang_with_locale)) {
+		if (!eel_str_is_empty (lang_with_locale)) {
 			retval = g_slist_prepend (retval, 
 						  g_strdup (lang_with_locale));
 		}
 		g_free (lang_with_locale);
-		if (!nautilus_str_is_empty (lang)) {
+		if (!eel_str_is_empty (lang)) {
 			retval = g_slist_prepend (retval, g_strdup (lang));
 		}
         }
@@ -153,10 +153,10 @@ nautilus_view_identifier_new_from_oaf_server_info (OAF_ServerInfo *server, char
                 view_as_name = server->iid;
         }
 
-	nautilus_g_slist_free_deep (langs);
+	eel_g_slist_free_deep (langs);
 
 	/* if the name is an OAFIID, clean it up for display */
-	if (nautilus_str_has_prefix (view_as_name, "OAFIID:")) {
+	if (eel_str_has_prefix (view_as_name, "OAFIID:")) {
 		char *display_name, *colon_ptr;
 		NautilusViewIdentifier *new_identifier;
 		
@@ -225,7 +225,7 @@ nautilus_view_identifier_free_callback (gpointer identifier, gpointer ignore)
 void
 nautilus_view_identifier_list_free (GList *list)
 {
-	nautilus_g_list_free_deep_custom
+	eel_g_list_free_deep_custom
 		(list, nautilus_view_identifier_free_callback, NULL);
 }
 
diff --git a/libnautilus-extensions/nautilus-viewport.c b/libnautilus-extensions/nautilus-viewport.c
deleted file mode 100644
index 5ea54c17a..000000000
--- a/libnautilus-extensions/nautilus-viewport.c
+++ /dev/null
@@ -1,512 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-viewport.c - A subclass of GtkViewport with non broken drawing.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-viewport.h"
-
-#include "nautilus-gtk-macros.h"
-
-#include <gtk/gtksignal.h>
-
-/* Detail member struct */
-struct NautilusViewportDetails
-{
-	gboolean is_smooth;
-	gboolean never_smooth;
-       
-	gboolean constrain_width;
-	gboolean constrain_height;
-};
-
-/* GtkObjectClass methods */
-static void nautilus_viewport_initialize_class     (NautilusViewportClass *viewport_class);
-static void nautilus_viewport_initialize           (NautilusViewport      *viewport);
-static void nautilus_viewport_destroy              (GtkObject             *object);
-
-/* GtkWidgetClass methods */
-static void nautilus_viewport_realize              (GtkWidget             *widget);
-static void nautilus_viewport_draw                 (GtkWidget             *widget,
-						    GdkRectangle          *area);
-static void nautilus_viewport_size_allocate        (GtkWidget             *widget,
-						    GtkAllocation         *allocation);
-static gint nautilus_viewport_expose_event         (GtkWidget             *widget,
-						    GdkEventExpose        *event);
-static void nautilus_viewport_paint                (GtkWidget             *widget,
-						    GdkRectangle          *area);
-
-/* NautilusViewport signals */
-static void nautilus_viewport_set_is_smooth_signal (GtkWidget             *widget,
-						    gboolean               is_smooth);
-
-/* Signals */
-typedef enum
-{
-	SET_IS_SMOOTH,
-	LAST_SIGNAL
-} NautilusViewportSignal;
-
-/* Signals */
-static guint nautilus_viewport_signals[LAST_SIGNAL] = { 0 };
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusViewport, nautilus_viewport, GTK_TYPE_VIEWPORT)
-
-/* GtkObjectClass methods */
-static void
-nautilus_viewport_initialize_class (NautilusViewportClass *nautilus_viewport_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (nautilus_viewport_class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (nautilus_viewport_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_viewport_destroy;
-	
-	/* GtkWidgetClass */
-	widget_class->realize = nautilus_viewport_realize;
-	widget_class->expose_event = nautilus_viewport_expose_event;
-	widget_class->draw = nautilus_viewport_draw;
-	widget_class->size_allocate = nautilus_viewport_size_allocate;
-	
-	/* NautilusViewportClass */
-	nautilus_viewport_class->set_is_smooth = nautilus_viewport_set_is_smooth_signal;
-	
-	nautilus_viewport_signals[SET_IS_SMOOTH] = 
-		gtk_signal_new ("set_is_smooth",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (NautilusViewportClass, set_is_smooth),
-				gtk_marshal_NONE__BOOL,
-				GTK_TYPE_NONE, 
-				1,
-				GTK_TYPE_BOOL);
-	
-	gtk_object_class_add_signals (object_class, nautilus_viewport_signals, LAST_SIGNAL);
-
-	/* Let the smooth widget machinery know that our class can be smooth */
-	nautilus_smooth_widget_register_type (NAUTILUS_TYPE_VIEWPORT);
-}
-
-void
-nautilus_viewport_initialize (NautilusViewport *nautilus_viewport)
-{
-	nautilus_viewport->details = g_new0 (NautilusViewportDetails, 1);
-	
-	nautilus_smooth_widget_register (GTK_WIDGET (nautilus_viewport));
-	nautilus_viewport->details->never_smooth = TRUE;
-}
-
-void
-nautilus_viewport_destroy (GtkObject *object)
-{
-	NautilusViewport *viewport;
-
-	g_return_if_fail (NAUTILUS_IS_VIEWPORT (object));
-
-	viewport = NAUTILUS_VIEWPORT (object);
-	
-	g_free (viewport->details);
-
-	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-/* GtkWidgetClass methods */
-static void
-nautilus_viewport_draw (GtkWidget *widget,
-			GdkRectangle *area)
-{
-	NautilusViewport *nautilus_viewport;
-	GtkViewport *viewport;
-	GtkBin *bin;
-	GdkRectangle tmp_area;
-	GdkRectangle child_area;
-	gint border_width;
-	
-	g_return_if_fail (NAUTILUS_IS_VIEWPORT (widget));
-	g_return_if_fail (area != NULL);
-	
-	if (!GTK_WIDGET_DRAWABLE (widget)) {
-		return;
-	}
-
-	nautilus_viewport = NAUTILUS_VIEWPORT (widget);
-	viewport = GTK_VIEWPORT (widget);
-	bin = GTK_BIN (widget);
-	
-	border_width = GTK_CONTAINER (widget)->border_width;
-	
-	tmp_area = *area;
-	tmp_area.x -= border_width;
-	tmp_area.y -= border_width;
-	
-	nautilus_viewport_paint (widget, &tmp_area);
-	
-	tmp_area.x += viewport->hadjustment->value - widget->style->klass->xthickness;
-	tmp_area.y += viewport->vadjustment->value - widget->style->klass->ythickness;
-	
-	/* The gtk_viewport_draw() version does not adjust the width
-	 * and height of the tmp_area for the class x/y thickness.  This
-	 * causes some drawing to be clipped on the bottom.  This is a bug
-	 * in GTK+.
-	 */
-	
-	/* FIXME bugzilla.eazel.com xxxx: 
-	 * Remove this widget once the fix makes it to GTK+.
-	 */
-	tmp_area.width += 2 * widget->style->klass->xthickness;
-	tmp_area.height += 2 * widget->style->klass->ythickness;
-	
-	if (!nautilus_viewport_get_is_smooth (nautilus_viewport)) {
-		gtk_paint_flat_box (widget->style, viewport->bin_window, 
-				    GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-				    &tmp_area, widget, "viewportbin",
-				    0, 0, -1, -1);
-	}
-	
-	if (bin->child) {
-		if (gtk_widget_intersect (bin->child, &tmp_area, &child_area)) {
-			gtk_widget_draw (bin->child, &child_area);
-		}
-	}
-}
-
-static void
-nautilus_viewport_size_allocate (GtkWidget *widget,
-				 GtkAllocation *allocation)
-{
-	NautilusViewport *nautilus_viewport;
-	GtkViewport *viewport;
-	GtkBin *bin;
-	GtkAllocation child_allocation;
-	gint hval, vval;
-	gint border_width;
-	
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GTK_IS_VIEWPORT (widget));
-	g_return_if_fail (allocation != NULL);
-	
-	widget->allocation = *allocation;
-	nautilus_viewport = NAUTILUS_VIEWPORT (widget);
-	viewport = GTK_VIEWPORT (widget);
-	bin = GTK_BIN (widget);
-	  
-	border_width = GTK_CONTAINER (widget)->border_width;
-	
-	child_allocation.x = 0;
-	child_allocation.y = 0;
-	
-	if (viewport->shadow_type != GTK_SHADOW_NONE)
-	{
-		child_allocation.x = GTK_WIDGET (viewport)->style->klass->xthickness;
-		child_allocation.y = GTK_WIDGET (viewport)->style->klass->ythickness;
-	}
-	
-	child_allocation.width = MAX (1, allocation->width - child_allocation.x * 2 - border_width * 2);
-	child_allocation.height = MAX (1, allocation->height - child_allocation.y * 2 - border_width * 2);
-	  
-	if (GTK_WIDGET_REALIZED (widget))
-	{
-		gdk_window_move_resize (widget->window,
-					allocation->x + border_width,
-					allocation->y + border_width,
-					allocation->width - border_width * 2,
-					allocation->height - border_width * 2);
-		
-		gdk_window_move_resize (viewport->view_window,
-					child_allocation.x,
-					child_allocation.y,
-					child_allocation.width,
-					child_allocation.height);
-	}
-	
-	viewport->hadjustment->page_size = child_allocation.width;
-	viewport->hadjustment->page_increment = viewport->hadjustment->page_size / 2;
-	viewport->hadjustment->step_increment = 10;
-	
-	viewport->vadjustment->page_size = child_allocation.height;
-	viewport->vadjustment->page_increment = viewport->vadjustment->page_size / 2;
-	viewport->vadjustment->step_increment = 10;
-	
-	hval = viewport->hadjustment->value;
-	vval = viewport->vadjustment->value;
-	
-	if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
-	{
-		GtkRequisition child_requisition;
-		gtk_widget_get_child_requisition (bin->child, &child_requisition);
-		
-		viewport->hadjustment->lower = 0;
-		viewport->hadjustment->upper = MAX (child_requisition.width,
-						    child_allocation.width);
-		
-		hval = CLAMP (hval, 0,
-			      viewport->hadjustment->upper -
-			      viewport->hadjustment->page_size);
-		
-		viewport->vadjustment->lower = 0;
-		viewport->vadjustment->upper = MAX (child_requisition.height,
-						    child_allocation.height);
-		
-		vval = CLAMP (vval, 0,
-			      viewport->vadjustment->upper -
-			      viewport->vadjustment->page_size);
-	}
-	
-	if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
-	{
-		child_allocation.x = 0;
-		child_allocation.y = 0;
-		
-		child_allocation.width = viewport->hadjustment->upper;
-		child_allocation.height = viewport->vadjustment->upper;
-		
-		if (nautilus_viewport_get_constrain_width (nautilus_viewport)) {
-			child_allocation.width = widget->allocation.width;
-		}
-		if (nautilus_viewport_get_constrain_height (nautilus_viewport)) {
-			child_allocation.height = widget->allocation.height;
-		}
-		
-		if (GTK_WIDGET_REALIZED (widget))
-			gdk_window_resize (viewport->bin_window,
-					   child_allocation.width,
-					   child_allocation.height);
-		
-		child_allocation.x = 0;
-		child_allocation.y = 0;
-		gtk_widget_size_allocate (bin->child, &child_allocation);
-	}
-	
-	gtk_signal_emit_by_name (GTK_OBJECT (viewport->hadjustment), "changed");
-	gtk_signal_emit_by_name (GTK_OBJECT (viewport->vadjustment), "changed");
-	if (viewport->hadjustment->value != hval)
-	{
-		viewport->hadjustment->value = hval;
-		gtk_signal_emit_by_name (GTK_OBJECT (viewport->hadjustment), "value_changed");
-	}
-	if (viewport->vadjustment->value != vval)
-	{
-		viewport->vadjustment->value = vval;
-		gtk_signal_emit_by_name (GTK_OBJECT (viewport->vadjustment), "value_changed");
-	}
-}
-
-static gint
-nautilus_viewport_expose_event (GtkWidget *widget,
-				GdkEventExpose *event)
-{
-	NautilusViewport *nautilus_viewport;
-	GtkViewport *viewport;
-	GtkBin *bin;
-	
-	g_return_val_if_fail (NAUTILUS_IS_VIEWPORT (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	if (!GTK_WIDGET_DRAWABLE (widget)) {
-		return FALSE;
-	}
-
-	nautilus_viewport = NAUTILUS_VIEWPORT (widget);
-	viewport = GTK_VIEWPORT (widget);
-	bin = GTK_BIN (widget);
-	
-	if (event->window == widget->window) {
-		nautilus_viewport_paint (widget, &event->area);
-	} else if (event->window == viewport->bin_window) {
-		GdkEventExpose child_event;
-
-		child_event = *event;
-		
-		if (!nautilus_viewport_get_is_smooth (nautilus_viewport)) {
-			gtk_paint_flat_box (widget->style, viewport->bin_window, 
-					    GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-					    &event->area, widget, "viewportbin",
-					    0, 0, -1, -1);
-		}
-		
-		if ((bin->child != NULL) &&
-		    GTK_WIDGET_NO_WINDOW (bin->child) &&
-		    gtk_widget_intersect (bin->child, &event->area, &child_event.area))
-			gtk_widget_event (bin->child, (GdkEvent*) &child_event);
-	}
-	
-	return FALSE;
-}
-
-static void
-nautilus_viewport_realize (GtkWidget *widget)
-{
-	NautilusViewport *nautilus_viewport;
-	
-	g_return_if_fail (NAUTILUS_IS_VIEWPORT (widget));
-	
-	nautilus_viewport = NAUTILUS_VIEWPORT (widget);
-
-	/* GtkViewport does the actual realization */
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
-
- 	gdk_window_set_static_gravities (GTK_VIEWPORT (nautilus_viewport)->bin_window,
-					 nautilus_viewport_get_is_smooth (nautilus_viewport));
-}
-
-static void
-nautilus_viewport_paint (GtkWidget *widget,
-			 GdkRectangle *area)
-{
-	GtkViewport *viewport;
-	
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GTK_IS_VIEWPORT (widget));
-	g_return_if_fail (area != NULL);
-	
-	if (!GTK_WIDGET_DRAWABLE (widget)) {
-		return;
-	}
-
-	viewport = GTK_VIEWPORT (widget);
-	
-	gtk_draw_shadow (widget->style, widget->window,
-			 GTK_STATE_NORMAL, viewport->shadow_type,
-			 0, 0, -1, -1);
-}
-
-/* NautilusViewport signals */
-static void
-nautilus_viewport_set_is_smooth_signal (GtkWidget *widget,
-					gboolean is_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_VIEWPORT (widget));
-	
-	nautilus_viewport_set_is_smooth (NAUTILUS_VIEWPORT (widget), is_smooth);
-}
-
-/* Public NautilusViewport methods */
-GtkWidget*
-nautilus_viewport_new (GtkAdjustment *hadjustment,
-		       GtkAdjustment *vadjustment)
-{
-	NautilusViewport *nautilus_viewport;
-
-	nautilus_viewport = NAUTILUS_VIEWPORT (gtk_widget_new (nautilus_viewport_get_type (), NULL));
-	
-	gtk_viewport_set_hadjustment (GTK_VIEWPORT (nautilus_viewport), hadjustment);
-	gtk_viewport_set_vadjustment (GTK_VIEWPORT (nautilus_viewport), vadjustment);
-
-	return GTK_WIDGET (nautilus_viewport);
-}
-
-void
-nautilus_viewport_set_is_smooth (NautilusViewport *nautilus_viewport,
-				 gboolean is_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_VIEWPORT (nautilus_viewport));
-
-	if (nautilus_viewport->details->is_smooth == is_smooth) {
-		return;
-	}
-
-	nautilus_viewport->details->is_smooth = is_smooth;
-	
-	if (!GTK_WIDGET_REALIZED (nautilus_viewport)) {
-		return;
-	}
-	
- 	gdk_window_set_static_gravities (GTK_VIEWPORT (nautilus_viewport)->bin_window,
-					 nautilus_viewport->details->is_smooth);
-}
-
-gboolean
-nautilus_viewport_get_is_smooth (const NautilusViewport *nautilus_viewport)
-{
-	g_return_val_if_fail (NAUTILUS_IS_VIEWPORT (nautilus_viewport), FALSE);
-	
-	return !nautilus_viewport->details->never_smooth && nautilus_viewport->details->is_smooth;
-}
-
-void
-nautilus_viewport_set_constrain_width (NautilusViewport *nautilus_viewport,
-				       gboolean constrain_width)
-{
-	g_return_if_fail (NAUTILUS_IS_VIEWPORT (nautilus_viewport));
-
-	nautilus_viewport->details->constrain_width = constrain_width;
-}
-
-gboolean
-nautilus_viewport_get_constrain_width (const NautilusViewport *nautilus_viewport)
-{
-	g_return_val_if_fail (NAUTILUS_IS_VIEWPORT (nautilus_viewport), FALSE);
-
-	return nautilus_viewport->details->constrain_width;
-}
-
-void nautilus_viewport_set_constrain_height (NautilusViewport *nautilus_viewport,
-					     gboolean constrain_height)
-{
-	g_return_if_fail (NAUTILUS_IS_VIEWPORT (nautilus_viewport));
-	
-	nautilus_viewport->details->constrain_height = constrain_height;
-}
-
-gboolean
-nautilus_viewport_get_constrain_height (const NautilusViewport *nautilus_viewport)
-{
-	g_return_val_if_fail (NAUTILUS_IS_VIEWPORT (nautilus_viewport), FALSE);
-
-	return nautilus_viewport->details->constrain_height;
-}
-
-void
-nautilus_viewport_set_never_smooth (NautilusViewport *nautilus_viewport,
-				    gboolean never_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_VIEWPORT (nautilus_viewport));
-
-	nautilus_viewport->details->never_smooth = never_smooth;
-
-	if (!GTK_WIDGET_REALIZED (nautilus_viewport)) {
-		return;
-	}
-
- 	gdk_window_set_static_gravities (GTK_VIEWPORT (nautilus_viewport)->bin_window,
-					 nautilus_viewport_get_is_smooth (nautilus_viewport));
-}
-
-NautilusArtIPoint
-nautilus_viewport_get_scroll_offset (const NautilusViewport *nautilus_viewport)
-{
-	NautilusArtIPoint scroll_offset;
-	
-	g_return_val_if_fail (NAUTILUS_IS_VIEWPORT (nautilus_viewport), NAUTILUS_ART_IPOINT_ZERO);
-
-	if (!GTK_WIDGET_REALIZED (nautilus_viewport)) {
-		return NAUTILUS_ART_IPOINT_ZERO;
-	}
-
-	gdk_window_get_position (GTK_VIEWPORT (nautilus_viewport)->bin_window,
-				 &scroll_offset.x,
-				 &scroll_offset.y);
-
-	return scroll_offset;
-}
diff --git a/libnautilus-extensions/nautilus-viewport.h b/libnautilus-extensions/nautilus-viewport.h
deleted file mode 100644
index 633348f36..000000000
--- a/libnautilus-extensions/nautilus-viewport.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-viewport.h - A subclass of GtkViewport with non broken drawing.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_VIEWPORT_H
-#define NAUTILUS_VIEWPORT_H
-
-#include <gtk/gtkviewport.h>
-#include <libgnome/gnome-defs.h>
-#include <libnautilus-extensions/nautilus-smooth-widget.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_VIEWPORT            (nautilus_viewport_get_type ())
-#define NAUTILUS_VIEWPORT(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEWPORT, NautilusViewport))
-#define NAUTILUS_VIEWPORT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEWPORT, NautilusViewportClass))
-#define NAUTILUS_IS_VIEWPORT(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEWPORT))
-#define NAUTILUS_IS_VIEWPORT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_VIEWPORT))
-
-typedef struct NautilusViewport	         NautilusViewport;
-typedef struct NautilusViewportClass     NautilusViewportClass;
-typedef struct NautilusViewportDetails   NautilusViewportDetails;
-
-struct NautilusViewport
-{
-	/* Superclass */
-	GtkViewport viewport;
-
-	/* Private things */
-	NautilusViewportDetails *details;
-};
-
-struct NautilusViewportClass
-{
-	GtkViewportClass parent_class;
-	NautilusSmoothWidgetSetIsSmooth set_is_smooth;
-};
-
-GtkType           nautilus_viewport_get_type              (void);
-GtkWidget *       nautilus_viewport_new                   (GtkAdjustment          *hadjustment,
-						          GtkAdjustment           *vadjustment);
-
-void              nautilus_viewport_set_is_smooth         (NautilusViewport       *nautilus_viewport,
-						          gboolean                is_smooth);
-gboolean          nautilus_viewport_get_is_smooth         (const NautilusViewport *nautilus_viewport);
-void              nautilus_viewport_set_never_smooth      (NautilusViewport       *nautilus_viewport,
-						          gboolean                never_smooth);
-
-NautilusArtIPoint nautilus_viewport_get_scroll_offset     (const NautilusViewport *nautilus_viewport);
-
-void              nautilus_viewport_set_constrain_width   (NautilusViewport       *nautilus_viewport,
-							  gboolean                constrain_width);
-gboolean          nautilus_viewport_get_constrain_width   (const NautilusViewport *nautilus_viewport);
-
-void              nautilus_viewport_set_constrain_height  (NautilusViewport       *nautilus_viewport,
-							   gboolean               constrain_height);
-gboolean          nautilus_viewport_get_constrain_height  (const NautilusViewport *nautilus_viewport);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_VIEWPORT_H */
-
-
diff --git a/libnautilus-extensions/nautilus-volume-monitor.c b/libnautilus-extensions/nautilus-volume-monitor.c
index ae7d329c9..b301497de 100644
--- a/libnautilus-extensions/nautilus-volume-monitor.c
+++ b/libnautilus-extensions/nautilus-volume-monitor.c
@@ -28,13 +28,13 @@
 #include "nautilus-cdrom-extensions.h"
 #include "nautilus-directory-notify.h"
 #include "nautilus-file-utilities.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gnome-extensions.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include "nautilus-iso9660.h"
-#include "nautilus-stock-dialogs.h"
-#include "nautilus-string.h"
-#include "nautilus-string-list.h"
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-string-list.h>
 #include "nautilus-volume-monitor.h"
 #include <errno.h>
 #include <fcntl.h>
@@ -182,7 +182,7 @@ static int              get_cdrom_type_solaris                          (const c
 									 int                            *fd);
 #endif
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusVolumeMonitor,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusVolumeMonitor,
 				   nautilus_volume_monitor,
 				   GTK_TYPE_OBJECT)
 
@@ -264,7 +264,7 @@ nautilus_volume_monitor_destroy (GtkObject *object)
 
 	global_volume_monitor = NULL;
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -338,7 +338,7 @@ has_removable_mntent_options (MountTableEntry *ent)
 	}
 
 #ifdef SOLARIS_MNT
-	if (nautilus_str_has_prefix (ent->mnt_special, "/vol/")) {
+	if (eel_str_has_prefix (ent->mnt_special, "/vol/")) {
 		return TRUE;
 	}
 #endif
@@ -375,7 +375,7 @@ get_removable_volumes (void)
         ent = &ent_storage;
 	while (! getmntent (file, ent)) {
 		/* On Solaris look for /vol/ for determining a removable volume */
-		if (nautilus_str_has_prefix (ent->mnt_special, noauto_string)) {
+		if (eel_str_has_prefix (ent->mnt_special, noauto_string)) {
 			volume = create_volume (ent->mnt_special, ent->mnt_mountp, ent->mnt_fstype);
 			volume->is_removable = TRUE;
 			volume->is_read_only = hasmntopt (ent, MNTOPT_RO) != NULL;
@@ -426,7 +426,7 @@ volume_is_removable (const NautilusVolume *volume)
 		if (strcmp (volume->device_path, ent->mnt_special) == 0) {
   			/* On Solaris look for /vol/ for determining
 			a removable volume */
-   		 	if (nautilus_str_has_prefix (ent->mnt_special, noauto_string)) {
+   		 	if (eel_str_has_prefix (ent->mnt_special, noauto_string)) {
 				fclose (file);
 				return TRUE;
 			}
@@ -850,7 +850,7 @@ eject_device (void *arg)
 
 	if (path != NULL) {		
 		command = g_strdup_printf ("eject %s", path);	
-		nautilus_gnome_shell_execute (command);
+		eel_gnome_shell_execute (command);
 		g_free (command);
 		g_free (path);
 	}
@@ -956,7 +956,7 @@ get_current_mount_list (void)
 #else
 	char line[PATH_MAX * 3];
 	char device_name[sizeof (line)];
-	NautilusStringList *list;
+	EelStringList *list;
 	char *device_path, *mount_path, *filesystem;
 	const char *separator;
 
@@ -973,22 +973,22 @@ get_current_mount_list (void)
 
 	while (fgets (line, sizeof(line), fh)) {
 		if (sscanf (line, "%s", device_name) == 1) {
-			list = nautilus_string_list_new_from_tokens (line, separator, FALSE);
+			list = eel_string_list_new_from_tokens (line, separator, FALSE);
 			if (list != NULL) {
 				/* The string list needs to have at least 3 items per line.
 				 * We need to find at least device path, mount path and file system type.
 				 */
-				if (nautilus_string_list_get_length (list) >= 3) {
-					device_path = nautilus_string_list_nth (list, 0);
-					mount_path = nautilus_string_list_nth (list, 1);
-					filesystem = nautilus_string_list_nth (list, 2);
+				if (eel_string_list_get_length (list) >= 3) {
+					device_path = eel_string_list_nth (list, 0);
+					mount_path = eel_string_list_nth (list, 1);
+					filesystem = eel_string_list_nth (list, 2);
 					volume = create_volume (device_path, mount_path, filesystem);
 					g_free (device_path);
 					g_free (mount_path);
 					g_free (filesystem);
 					current_mounts = mount_volume_add_filesystem (volume, current_mounts);
 				}				
-				nautilus_string_list_free (list);
+				eel_string_list_free (list);
 			}			
 		}
   	}
@@ -1463,7 +1463,7 @@ display_mount_status (gpointer callback_data)
 {
 	MountStatusInfo *info = callback_data;
 		
-	nautilus_show_error_dialog_with_details 
+	eel_show_error_dialog_with_details 
 		(info->message, info->title, info->detailed_message, NULL);
 
 	g_free (info->message);
@@ -1830,7 +1830,7 @@ mount_volume_add_filesystem (NautilusVolume *volume, GList *volume_list)
 {
 	gboolean mounted = FALSE;
 			
-	if (nautilus_str_has_prefix (volume->device_path, floppy_device_path_prefix)) {		
+	if (eel_str_has_prefix (volume->device_path, floppy_device_path_prefix)) {		
 		mounted = mount_volume_floppy_add (volume);
 	} else if (strcmp (volume->filesystem, "affs") == 0) {		
 		mounted = mount_volume_affs_add (volume);
diff --git a/libnautilus-extensions/nautilus-wrap-table.c b/libnautilus-extensions/nautilus-wrap-table.c
deleted file mode 100644
index 260f0feb3..000000000
--- a/libnautilus-extensions/nautilus-wrap-table.c
+++ /dev/null
@@ -1,996 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-wrap-box.c - A table that can wrap its contents as needed.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-wrap-table.h"
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-art-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-
-#include <gtk/gtkmain.h>
-#include <gtk/gtkviewport.h>
-
-/* Arguments */
-enum
-{
-	ARG_0,
-	ARG_X_SPACING,
-	ARG_Y_SPACING,
-	ARG_X_JUSTIFICATION,
-	ARG_Y_JUSTIFICATION,
-	ARG_HOMOGENEOUS,
-};
-
-/* Detail member struct */
-struct NautilusWrapTableDetails
-{
-	guint x_spacing;
-	guint y_spacing;
-	NautilusJustification x_justification;
-	NautilusJustification y_justification;
-	gboolean homogeneous;
-	GList *children;
-};
-
-/* GtkObjectClass methods */
-static void               nautilus_wrap_table_initialize_class (NautilusWrapTableClass   *wrap_table_class);
-static void               nautilus_wrap_table_initialize       (NautilusWrapTable        *wrap);
-static void               nautilus_wrap_table_destroy          (GtkObject                *object);
-static void               nautilus_wrap_table_set_arg          (GtkObject                *object,
-								GtkArg                   *arg,
-								guint                     arg_id);
-static void               nautilus_wrap_table_get_arg          (GtkObject                *object,
-								GtkArg                   *arg,
-								guint                     arg_id);
-/* GtkWidgetClass methods */
-static void               nautilus_wrap_table_size_request     (GtkWidget                *widget,
-								GtkRequisition           *requisition);
-static int                nautilus_wrap_table_expose_event     (GtkWidget                *widget,
-								GdkEventExpose           *event);
-static void               nautilus_wrap_table_size_allocate    (GtkWidget                *widget,
-								GtkAllocation            *allocation);
-static void               nautilus_wrap_table_map              (GtkWidget                *widget);
-static void               nautilus_wrap_table_unmap            (GtkWidget                *widget);
-
-/* GtkContainerClass methods */
-static void               nautilus_wrap_table_add              (GtkContainer             *container,
-								GtkWidget                *widget);
-static void               nautilus_wrap_table_remove           (GtkContainer             *container,
-								GtkWidget                *widget);
-static void               nautilus_wrap_table_forall           (GtkContainer             *container,
-								gboolean                  include_internals,
-								GtkCallback               callback,
-								gpointer                  callback_data);
-static GtkType            nautilus_wrap_table_child_type       (GtkContainer             *container);
-
-
-/* Private NautilusWrapTable methods */
-static NautilusDimensions wrap_table_art_irect_max_dimensions  (const NautilusDimensions *one,
-								const NautilusDimensions *two);
-static NautilusDimensions wrap_table_get_max_child_dimensions  (const NautilusWrapTable  *wrap_table);
-static NautilusDimensions wrap_table_get_content_dimensions    (const NautilusWrapTable  *wrap_table);
-static ArtIRect           wrap_table_get_content_bounds        (const NautilusWrapTable  *wrap_table);
-static NautilusArtIPoint  wrap_table_get_scroll_offset         (const NautilusWrapTable  *wrap_table);
-static GtkWidget *        wrap_table_find_child_at_point       (const NautilusWrapTable  *wrap_table,
-								int                       x,
-								int                       y);
-static void               wrap_table_layout                    (NautilusWrapTable        *wrap_table);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusWrapTable, nautilus_wrap_table, GTK_TYPE_CONTAINER)
-
-/* Class init methods */
-static void
-nautilus_wrap_table_initialize_class (NautilusWrapTableClass *wrap_table_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (wrap_table_class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (wrap_table_class);
-	GtkContainerClass *container_class = GTK_CONTAINER_CLASS (wrap_table_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_wrap_table_destroy;
-	object_class->set_arg = nautilus_wrap_table_set_arg;
-	object_class->get_arg = nautilus_wrap_table_get_arg;
-	
- 	/* GtkWidgetClass */
- 	widget_class->size_request = nautilus_wrap_table_size_request;
-	widget_class->size_allocate = nautilus_wrap_table_size_allocate;
- 	widget_class->expose_event = nautilus_wrap_table_expose_event;
-	widget_class->map = nautilus_wrap_table_map;
-	widget_class->unmap = nautilus_wrap_table_unmap;
-
- 	/* GtkContainerClass */
-	container_class->add = nautilus_wrap_table_add;
-	container_class->remove = nautilus_wrap_table_remove;
-	container_class->forall = nautilus_wrap_table_forall;
-	container_class->child_type = nautilus_wrap_table_child_type;
-  
-	/* Arguments */
-	gtk_object_add_arg_type ("NautilusWrapTable::x_spacing",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_X_SPACING);
-	gtk_object_add_arg_type ("NautilusWrapTable::y_spacing",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_Y_SPACING);
-	gtk_object_add_arg_type ("NautilusWrapTable::x_justification",
-				 GTK_TYPE_ENUM,
-				 GTK_ARG_READWRITE,
-				 ARG_X_JUSTIFICATION);
-	gtk_object_add_arg_type ("NautilusWrapTable::y_justification",
-				 GTK_TYPE_ENUM,
-				 GTK_ARG_READWRITE,
-				 ARG_Y_JUSTIFICATION);
-	gtk_object_add_arg_type ("NautilusWrapTable::homogeneous",
-				 GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE,
-				 ARG_HOMOGENEOUS);
-}
-
-void
-nautilus_wrap_table_initialize (NautilusWrapTable *wrap_table)
-{
-	GTK_WIDGET_SET_FLAGS (wrap_table, GTK_NO_WINDOW);
-
-	wrap_table->details = g_new0 (NautilusWrapTableDetails, 1);
-	wrap_table->details->x_justification = NAUTILUS_JUSTIFICATION_BEGINNING;
-	wrap_table->details->y_justification = NAUTILUS_JUSTIFICATION_END;
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_wrap_table_destroy (GtkObject *object)
-{
- 	NautilusWrapTable *wrap_table;
-	
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (object));
-
-	wrap_table = NAUTILUS_WRAP_TABLE (object);
-
-	/*
-	 * Chain destroy before freeing our details.
-	 * The details will be used in the nautilus_wrap_box_remove () 
-	 * method as a result of the children being killed.
-	 */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-
-	g_list_free (wrap_table->details->children);
-
-	g_free (wrap_table->details);
-}
-
-static void
-nautilus_wrap_table_set_arg (GtkObject *object,
-			     GtkArg *arg,
-			     guint arg_id)
-{
-	NautilusWrapTable *wrap_table;
-	
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (object));
-
- 	wrap_table = NAUTILUS_WRAP_TABLE (object);
-
- 	switch (arg_id)
-	{
-	case ARG_X_SPACING:
-		nautilus_wrap_table_set_x_spacing (wrap_table, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_Y_SPACING:
-		nautilus_wrap_table_set_y_spacing (wrap_table, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_X_JUSTIFICATION:
-		nautilus_wrap_table_set_x_justification (wrap_table, GTK_VALUE_ENUM (*arg));
-		break;
-
-	case ARG_Y_JUSTIFICATION:
-		nautilus_wrap_table_set_y_justification (wrap_table, GTK_VALUE_ENUM (*arg));
-		break;
-
-	case ARG_HOMOGENEOUS:
-		nautilus_wrap_table_set_homogeneous (wrap_table, GTK_VALUE_BOOL (*arg));
-		break;
-
- 	default:
-		g_assert_not_reached ();
-	}
-}
-
-static void
-nautilus_wrap_table_get_arg (GtkObject *object,
-			    GtkArg *arg,
-			    guint arg_id)
-{
-	NautilusWrapTable *wrap_table;
-
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (object));
-	
-	wrap_table = NAUTILUS_WRAP_TABLE (object);
-
- 	switch (arg_id)
-	{
-	case ARG_X_SPACING:
-		GTK_VALUE_UINT (*arg) = nautilus_wrap_table_get_x_spacing (wrap_table);
-		break;
-
-	case ARG_Y_SPACING:
-		GTK_VALUE_UINT (*arg) = nautilus_wrap_table_get_y_spacing (wrap_table);
-		break;
-
-	case ARG_X_JUSTIFICATION:
-		GTK_VALUE_ENUM (*arg) = nautilus_wrap_table_get_x_justification (wrap_table);
-		break;
-
-	case ARG_Y_JUSTIFICATION:
-		GTK_VALUE_ENUM (*arg) = nautilus_wrap_table_get_y_justification (wrap_table);
-		break;
-
-	case ARG_HOMOGENEOUS:
-		GTK_VALUE_BOOL (*arg) = nautilus_wrap_table_get_homogeneous (wrap_table);
-		break;
-
- 	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* GtkWidgetClass methods */
-static void
-nautilus_wrap_table_size_request (GtkWidget *widget,
-				  GtkRequisition *requisition)
-{
-	NautilusWrapTable *wrap_table;
-	NautilusDimensions content_dimensions;
-
- 	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (widget));
- 	g_return_if_fail (requisition != NULL);
-
-  	wrap_table = NAUTILUS_WRAP_TABLE (widget);
-
-	content_dimensions = wrap_table_get_content_dimensions (wrap_table);
-
-	/* The -1 tells Satan to use as much space as is available */
-	requisition->width = -1;
-	requisition->height = content_dimensions.height + GTK_CONTAINER (widget)->border_width * 2;
-}
-
-static void
-nautilus_wrap_table_size_allocate (GtkWidget *widget,
-				   GtkAllocation *allocation)
-{
-	NautilusWrapTable *wrap_table;
-
- 	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (widget));
- 	g_return_if_fail (allocation != NULL);
-	
-  	wrap_table = NAUTILUS_WRAP_TABLE (widget);
-	
-	widget->allocation = *allocation;
-
-	wrap_table_layout (wrap_table);
-}
-
-static int
-nautilus_wrap_table_expose_event (GtkWidget *widget,
-				 GdkEventExpose *event)
-{
-	NautilusWrapTable *wrap_table;
-	GList *iterator;
-	
-	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (widget), TRUE);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
-	g_return_val_if_fail (event != NULL, TRUE);
-
-  	wrap_table = NAUTILUS_WRAP_TABLE (widget);
-
-	for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) {
-		GtkWidget *item;
-		GdkEventExpose item_event;
-
-		item = iterator->data;
-		item_event = *event;
-
-		if (GTK_WIDGET_DRAWABLE (item) &&
-		    GTK_WIDGET_NO_WINDOW (item) &&
-		    gtk_widget_intersect (item, &event->area, &item_event.area)) {
-			gtk_widget_event (item, (GdkEvent *) &item_event);
-		}
-	}
-
-	return FALSE;
-}
-
-static void
-nautilus_wrap_table_map (GtkWidget *widget)
-{
-	NautilusWrapTable *wrap_table;
-	GList *iterator;
-
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (widget));
-	
-	wrap_table = NAUTILUS_WRAP_TABLE (widget);
-
- 	GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
-	
-	for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) {
-		GtkWidget *item;
-
-		item = iterator->data;
-
-		if (GTK_WIDGET_VISIBLE (item) && !GTK_WIDGET_MAPPED (item)) {
-			gtk_widget_map (item);
-		}
-	}
-}
-
-static void
-nautilus_wrap_table_unmap (GtkWidget *widget)
-{
-	NautilusWrapTable *wrap_table;
-	GList *iterator;
-
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (widget));
-	
-	wrap_table = NAUTILUS_WRAP_TABLE (widget);
-
-	GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
-
-	for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) {
-		GtkWidget *item;
-
-		item = iterator->data;
-
-		if (GTK_WIDGET_VISIBLE (item) && GTK_WIDGET_MAPPED (item)) {
-			gtk_widget_unmap (item);
-		}
-	}
-}
-
-/* GtkContainerClass methods */
-static void
-nautilus_wrap_table_add (GtkContainer *container,
-			GtkWidget *child)
-{
-	NautilusWrapTable *wrap_table;
-
-	g_return_if_fail (container != NULL);
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (container));
-	g_return_if_fail (GTK_IS_WIDGET (child));
-
-	wrap_table = NAUTILUS_WRAP_TABLE (container);
-
-	gtk_widget_set_parent (child, GTK_WIDGET (container));
-
-	wrap_table->details->children = g_list_append (wrap_table->details->children, child);
-
-	if (GTK_WIDGET_REALIZED (container)) {
-		gtk_widget_realize (child);
-	}
-
-	if (GTK_WIDGET_VISIBLE (container) && GTK_WIDGET_VISIBLE (child)) {
-		if (GTK_WIDGET_MAPPED (container)) {
-			gtk_widget_map (child);
-		}
-		
-		gtk_widget_queue_resize (child);
-	}
-}
-
-static void
-nautilus_wrap_table_remove (GtkContainer *container,
-			    GtkWidget *child)
-{
-	NautilusWrapTable *wrap_table;
-	gboolean child_was_visible;
-	
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (container));
-	g_return_if_fail (GTK_IS_WIDGET (child));
-	
-	wrap_table = NAUTILUS_WRAP_TABLE (container);;
-
-	child_was_visible = GTK_WIDGET_VISIBLE (child);
-	gtk_widget_unparent (child);
-	wrap_table->details->children = g_list_remove (wrap_table->details->children, child);
-
-	if (child_was_visible) {
-		gtk_widget_queue_resize (GTK_WIDGET (container));
-	}
-}
-
-static void
-nautilus_wrap_table_forall (GtkContainer *container,
-			    gboolean include_internals,
-			    GtkCallback callback,
-			    gpointer callback_data)
-{
-	NautilusWrapTable *wrap_table;
-	GList *node;
-	GList *next;
-	
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (container));
-	g_return_if_fail (callback != NULL);
-	
-	wrap_table = NAUTILUS_WRAP_TABLE (container);;
-	
-	for (node = wrap_table->details->children; node != NULL; node = next) {
-		g_assert (GTK_IS_WIDGET (node->data));
-		next = node->next;
-		(* callback) (GTK_WIDGET (node->data), callback_data);	
-	}
-}
-
-static GtkType
-nautilus_wrap_table_child_type (GtkContainer   *container)
-{
-	return GTK_TYPE_WIDGET;
-}
-
-/* Private NautilusWrapTable methods */
-static void
-wrap_table_layout (NautilusWrapTable *wrap_table)
-{
-	GList *iterator;
-	NautilusArtIPoint pos;
-	NautilusDimensions max_child_dimensions;
-	ArtIRect content_bounds;
-
- 	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table));
-
-	max_child_dimensions = wrap_table_get_max_child_dimensions (wrap_table);
-	content_bounds = wrap_table_get_content_bounds (wrap_table);
-	pos.x = content_bounds.x0;
-	pos.y = content_bounds.y0;
-
-	for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) {
-		GtkWidget *item;
-
-		item = iterator->data;
-		
-		if (GTK_WIDGET_VISIBLE (item)) {
-			GtkAllocation item_allocation;
-
-			if (wrap_table->details->homogeneous) {
-				item_allocation.x = pos.x;
-				item_allocation.y = pos.y;
-				item_allocation.width = max_child_dimensions.width;
-				item_allocation.height = max_child_dimensions.height;
-				
-				if ((pos.x + max_child_dimensions.width) > content_bounds.x1) {
-					pos.x = content_bounds.x0 + wrap_table->details->x_spacing + max_child_dimensions.width;
-					pos.y += (max_child_dimensions.height + wrap_table->details->y_spacing);
-					item_allocation.x = content_bounds.x0;
-					item_allocation.y = pos.y;
-				} else {
-					pos.x += (wrap_table->details->x_spacing + max_child_dimensions.width);
-				}
-			} else {
-				GtkRequisition item_requisition;
-				
-				gtk_widget_size_request (item, &item_requisition);
-				
-				item_allocation.x = pos.x;
-				item_allocation.y = pos.y;
-				item_allocation.width = item_requisition.width;
-				item_allocation.height = item_requisition.height;
-				
-				g_assert (item_allocation.width <= max_child_dimensions.width);
-				g_assert (item_allocation.height <= max_child_dimensions.height);
-				
-				if ((pos.x + max_child_dimensions.width) > content_bounds.x1) {
-					pos.x = content_bounds.x0 + wrap_table->details->x_spacing + max_child_dimensions.width;
-					pos.y += (max_child_dimensions.height + wrap_table->details->y_spacing);
-					item_allocation.x = content_bounds.x0;
-					item_allocation.y = pos.y;
-				} else {
-					pos.x += (wrap_table->details->x_spacing + max_child_dimensions.width);
-				}
-				
-				switch (wrap_table->details->x_justification) {
-				case NAUTILUS_JUSTIFICATION_MIDDLE:
-					item_allocation.x += (max_child_dimensions.width - (int) item_allocation.width) / 2;
-					break;
-				case NAUTILUS_JUSTIFICATION_END:
-					item_allocation.x += (max_child_dimensions.width - (int) item_allocation.width);
-					break;
-				default:
-				}
-				
-				switch (wrap_table->details->y_justification) {
-				case NAUTILUS_JUSTIFICATION_MIDDLE:
-					item_allocation.y += (max_child_dimensions.height - (int) item_allocation.height) / 2;
-					break;
-				case NAUTILUS_JUSTIFICATION_END:
-					item_allocation.y += (max_child_dimensions.height - (int) item_allocation.height);
-					break;
-				default:
-				}
-			}
-			
-			gtk_widget_size_allocate (item, &item_allocation);
-		}
-	}
-}
-
-static NautilusDimensions
-wrap_table_art_irect_max_dimensions (const NautilusDimensions *one,
-				     const NautilusDimensions *two)
-{
-	NautilusDimensions max_dimensions;
-
-	g_return_val_if_fail (one != NULL, NAUTILUS_DIMENSIONS_EMPTY);
-	g_return_val_if_fail (two != NULL, NAUTILUS_DIMENSIONS_EMPTY);
-
-	max_dimensions.width = MAX (one->width, two->width);
-	max_dimensions.height = MAX (one->height, two->height);
-
-	return max_dimensions;
-}
-
-static NautilusDimensions
-wrap_table_get_max_child_dimensions (const NautilusWrapTable *wrap_table)
-{
-	NautilusDimensions max_dimensions;
-	GList *iterator;
-
-  	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), NAUTILUS_DIMENSIONS_EMPTY);
-
-	max_dimensions = NAUTILUS_DIMENSIONS_EMPTY;
-
-	for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) {
-		GtkWidget *child;
-		
-		child = iterator->data;
-		
-		if (GTK_WIDGET_VISIBLE (child)) {
- 			GtkRequisition child_requisition;
-			NautilusDimensions child_dimensions;
-
- 			gtk_widget_size_request (child, &child_requisition);
-
-			child_dimensions.width = (int) child_requisition.width;
-			child_dimensions.height = (int) child_requisition.height;
-
-			max_dimensions = wrap_table_art_irect_max_dimensions (&child_dimensions, &max_dimensions);
-		}
-	}
-
-	return max_dimensions;
-}
-
-static int
-wrap_table_get_num_fitting (int available,
-			    int spacing,
-			    int max_child_size)
-{
-	int num;
-
-  	g_return_val_if_fail (available >= 0, 0);
-  	g_return_val_if_fail (max_child_size > 0, 0);
-  	g_return_val_if_fail (spacing >= 0, 0);
-	
-	num = (available + spacing) / (max_child_size + spacing);
-	num = MAX (num, 1);
-
-	return num;
-}
-
-static NautilusDimensions
-wrap_table_get_content_dimensions (const NautilusWrapTable *wrap_table)
-{
-	NautilusDimensions content_dimensions;
-	guint num_children;
-
-  	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), NAUTILUS_DIMENSIONS_EMPTY);
-
-	content_dimensions = NAUTILUS_DIMENSIONS_EMPTY;
-	
-	num_children = g_list_length (wrap_table->details->children);
-
-	if (num_children > 0) {
-		NautilusDimensions max_child_dimensions;
-		NautilusDimensions dimensions;
-		int num_cols;
-		int num_rows;
-
-		dimensions = nautilus_gtk_widget_get_dimensions (GTK_WIDGET (wrap_table));
-		max_child_dimensions = wrap_table_get_max_child_dimensions (wrap_table);
-
-		max_child_dimensions.width = MAX (max_child_dimensions.width, 1);
-		max_child_dimensions.height = MAX (max_child_dimensions.height, 1);
-
-		num_cols = wrap_table_get_num_fitting (dimensions.width,
-						       wrap_table->details->x_spacing,
-						       max_child_dimensions.width);
-		num_rows = num_children / num_cols;
-		num_rows = MAX (num_rows, 1);
-		
-		if ((num_children % num_rows) > 0) {
-			num_rows++;
-		}
-		
-		content_dimensions.width = dimensions.width;
-		content_dimensions.height = num_rows * max_child_dimensions.height;
-
-		content_dimensions.width += (num_cols - 1) * wrap_table->details->x_spacing;
-		content_dimensions.height += (num_rows - 1) * wrap_table->details->y_spacing;
-	}
-
-	return content_dimensions;
-}
-
-static ArtIRect
-wrap_table_get_content_bounds (const NautilusWrapTable *wrap_table)
-{
-	ArtIRect content_bounds;
-
-  	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), NAUTILUS_ART_IRECT_EMPTY);
-
-	content_bounds = nautilus_gtk_widget_get_bounds (GTK_WIDGET (wrap_table));
-
-	content_bounds.x0 += GTK_CONTAINER (wrap_table)->border_width;
-	content_bounds.y0 += GTK_CONTAINER (wrap_table)->border_width;
-	content_bounds.x1 -= GTK_CONTAINER (wrap_table)->border_width;
-	content_bounds.y1 -= GTK_CONTAINER (wrap_table)->border_width;
-
-	return content_bounds;
-}
-
-static NautilusArtIPoint
-wrap_table_get_scroll_offset (const NautilusWrapTable *wrap_table)
-{
-	NautilusArtIPoint scroll_offset;
-	GtkWidget *parent;
-
-  	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), NAUTILUS_ART_IPOINT_ZERO);
-
-	scroll_offset = NAUTILUS_ART_IPOINT_ZERO;
-
-	parent = GTK_WIDGET (wrap_table)->parent;
-
-	/*
-	 * FIXME: It lame we have to hardcode for a possible viewport 
-	 * parent here.  Theres probably a better way to do this
-	 */
-	if (GTK_IS_VIEWPORT (parent)) {
-		gdk_window_get_position (GTK_VIEWPORT (parent)->bin_window,
-					 &scroll_offset.x,
-					 &scroll_offset.y);
-	}
-
-	return scroll_offset;
-}
-
-static GtkWidget *
-wrap_table_find_child_at_point (const NautilusWrapTable *wrap_table,
-			       int x,
-			       int y)
-{
-	GList *iterator;
-	
-  	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), NULL);
-
-	for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) {
-		GtkWidget *child;
-		
-		child = iterator->data;
-		
-		if (GTK_WIDGET_VISIBLE (child)) {
-			ArtIRect child_bounds;
-
-			child_bounds = nautilus_gtk_widget_get_bounds (child);
- 			
-			if (nautilus_art_irect_contains_point (&child_bounds, x, y)) {
-				return child;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-/**
- * nautilus_wrap_table_new:
- *
- */
-GtkWidget*
-nautilus_wrap_table_new (gboolean homogeneous)
-{
-	NautilusWrapTable *wrap_table;
-
-	wrap_table = NAUTILUS_WRAP_TABLE (gtk_widget_new (nautilus_wrap_table_get_type (), NULL));
-
-	nautilus_wrap_table_set_homogeneous (wrap_table, homogeneous);
-	
-	return GTK_WIDGET (wrap_table);
-}
-
-/**
- * nautilus_wrap_table_set_x_spacing:
- * @wrap_table: A NautilusWrapTable.
- * @x_spacing: The new horizontal spacing between wraps.
- *
- */
-void
-nautilus_wrap_table_set_x_spacing (NautilusWrapTable *wrap_table,
-				   guint x_spacing)
-{
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table));
-	
-	if (wrap_table->details->x_spacing == x_spacing) {
-		return;
-	}
-	
-	wrap_table->details->x_spacing = x_spacing;
-
-	gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
-}
-
-/**
- * nautilus_wrap_table_get_item_spacing:
- * @wrap_table: A NautilusWrapTable.
- *
- * Returns: The horizontal spacing between wraps.
- */
-guint
-nautilus_wrap_table_get_x_spacing (const NautilusWrapTable *wrap_table)
-{
-	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), 0);
-	
-	return wrap_table->details->x_spacing;
-}
-
-/**
- * nautilus_wrap_table_set_y_spacing:
- * @wrap_table: A NautilusWrapTable.
- * @y_spacing: The new horizontal spacing between wraps.
- *
- */
-void
-nautilus_wrap_table_set_y_spacing (NautilusWrapTable *wrap_table,
-				   guint y_spacing)
-{
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table));
-	
-	if (wrap_table->details->y_spacing == y_spacing) {
-		return;
-	}
-	
-	wrap_table->details->y_spacing = y_spacing;
-
-	gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
-}
-
-/**
- * nautilus_wrap_table_get_item_spacing:
- * @wrap_table: A NautilusWrapTable.
- *
- * Returns: The horizontal spacing between wraps.
- */
-guint
-nautilus_wrap_table_get_y_spacing (const NautilusWrapTable *wrap_table)
-{
-	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), 0);
-	
-	return wrap_table->details->y_spacing;
-}
-
-/**
- * nautilus_wrap_table_find_child_at_event_point:
- * @wrap_table: A NautilusWrapTable.
- * @x: Event x;
- * @y: Event y;
- *
- * Returns: Child found at given coordinates or NULL of no child is found.
- */
-GtkWidget *
-nautilus_wrap_table_find_child_at_event_point (const NautilusWrapTable *wrap_table,
-					       int x,
-					       int y)
-{
-	NautilusArtIPoint scroll_offset;
-
-	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), NULL);
-
-	scroll_offset = wrap_table_get_scroll_offset (wrap_table);
-	
-	return wrap_table_find_child_at_point (wrap_table,
-					      x + ABS (scroll_offset.x),
-					      y + ABS (scroll_offset.y));
-}
-
-/**
- * nautilus_wrap_table_set_x_justification:
- * @wrap_table: A NautilusWrapTable.
- * @x_justification: The new horizontal justification between wraps.
- *
- */
-void
-nautilus_wrap_table_set_x_justification (NautilusWrapTable *wrap_table,
-					 NautilusJustification x_justification)
-{
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table));
-	g_return_if_fail (x_justification >= NAUTILUS_JUSTIFICATION_BEGINNING);
-	g_return_if_fail (x_justification <= NAUTILUS_JUSTIFICATION_END);
-	
-	if (wrap_table->details->x_justification == x_justification) {
-		return;
-	}
-	
-	wrap_table->details->x_justification = x_justification;
-	gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
-}
-
-/**
- * nautilus_wrap_table_get_item_justification:
- * @wrap_table: A NautilusWrapTable.
- *
- * Returns: The horizontal justification between wraps.
- */
-NautilusJustification 
-nautilus_wrap_table_get_x_justification (const NautilusWrapTable *wrap_table)
-{
-	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), 0);
-	
-	return wrap_table->details->x_justification;
-}
-
-/**
- * nautilus_wrap_table_set_y_justification:
- * @wrap_table: A NautilusWrapTable.
- * @y_justification: The new horizontal justification between wraps.
- *
- */
-void
-nautilus_wrap_table_set_y_justification (NautilusWrapTable *wrap_table,
-					 NautilusJustification y_justification)
-{
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table));
-	g_return_if_fail (y_justification >= NAUTILUS_JUSTIFICATION_BEGINNING);
-	g_return_if_fail (y_justification <= NAUTILUS_JUSTIFICATION_END);
-	
-	if (wrap_table->details->y_justification == y_justification) {
-		return;
-	}
-	
-	wrap_table->details->y_justification = y_justification;
-	gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
-}
-
-/**
- * nautilus_wrap_table_get_item_justification:
- * @wrap_table: A NautilusWrapTable.
- *
- * Returns: The horizontal justification between wraps.
- */
-NautilusJustification 
-nautilus_wrap_table_get_y_justification (const NautilusWrapTable *wrap_table)
-{
-	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), 0);
-	
-	return wrap_table->details->y_justification;
-}
-
-/**
- * nautilus_wrap_table_set_homogeneous:
- * @wrap_table: A NautilusWrapTable.
- * @homogeneous: The new horizontal spacing between wraps.
- *
- */
-void
-nautilus_wrap_table_set_homogeneous (NautilusWrapTable *wrap_table,
-				     gboolean homogeneous)
-{
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table));
-	
-	if (wrap_table->details->homogeneous == homogeneous) {
-		return;
-	}
-	
-	wrap_table->details->homogeneous = homogeneous;
-
-	gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
-}
-
-/**
- * nautilus_wrap_table_get_item_spacing:
- * @wrap_table: A NautilusWrapTable.
- *
- * Returns: The horizontal spacing between wraps.
- */
-gboolean
-nautilus_wrap_table_get_homogeneous (const NautilusWrapTable *wrap_table)
-{
-	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), FALSE);
-	
-	return wrap_table->details->homogeneous;
-}
-
-/**
- * nautilus_wrap_table_reorder_child:
- * @wrap_table: A NautilusWrapTable.
- * @child: Child to reorder.
- * @position: New position to put child at.
- *
- * Reorder the given chilren into the given position.
- *
- * Position is interpreted as follows:
- *
- *  0 - Place child at start of table.
- * -1 - Place child at end of table.
- *  n - Place child at nth position.  Count starts at 0.
- */
-void
-nautilus_wrap_table_reorder_child (NautilusWrapTable *wrap_table,
-				   GtkWidget *child,
-				   int position)
-{
-	GList *node;
-	gboolean found_child = FALSE;
-
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table));
-	g_return_if_fail (g_list_length (wrap_table->details->children) > 0);
-
-	if (position == -1) {
-		position = g_list_length (wrap_table->details->children) - 1;
-	}
-
-	g_return_if_fail (position >= 0);
-	g_return_if_fail ((guint) position < g_list_length (wrap_table->details->children));
-
-	for (node = wrap_table->details->children; node != NULL; node = node->next) {
-		GtkWidget *next_child;
-		next_child = node->data;
-		
-		if (next_child == child) {
-			g_assert (found_child == FALSE);
-			found_child = TRUE;
-		}
-	}
-
-	g_return_if_fail (found_child);
-
-	wrap_table->details->children = g_list_remove (wrap_table->details->children, child);
-	wrap_table->details->children = g_list_insert (wrap_table->details->children, child, position);
-
-	gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
-}
-
-/**
- * nautilus_wrap_table_get_num_children:
- * @wrap_table: A NautilusWrapTable.
- *
- * Returns: The number of children being managed by the wrap table.
- */
-guint
-nautilus_wrap_table_get_num_children (const NautilusWrapTable *wrap_table)
-{
-	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), 0);
-	
-	return g_list_length (wrap_table->details->children);
-}
-
diff --git a/libnautilus-extensions/nautilus-wrap-table.h b/libnautilus-extensions/nautilus-wrap-table.h
deleted file mode 100644
index 8ce6116c1..000000000
--- a/libnautilus-extensions/nautilus-wrap-table.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-wrap-table.h - A table that can wrap its contents as needed.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_WRAP_TABLE_H
-#define NAUTILUS_WRAP_TABLE_H
-
-#include <gtk/gtkcontainer.h>
-#include <libgnome/gnome-defs.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_WRAP_TABLE            (nautilus_wrap_table_get_type ())
-#define NAUTILUS_WRAP_TABLE(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_WRAP_TABLE, NautilusWrapTable))
-#define NAUTILUS_WRAP_TABLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_WRAP_TABLE, NautilusWrapTableClass))
-#define NAUTILUS_IS_WRAP_TABLE(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_WRAP_TABLE))
-#define NAUTILUS_IS_WRAP_TABLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_WRAP_TABLE))
-
-typedef struct NautilusWrapTable	  NautilusWrapTable;
-typedef struct NautilusWrapTableClass     NautilusWrapTableClass;
-typedef struct NautilusWrapTableDetails   NautilusWrapTableDetails;
-
-struct NautilusWrapTable
-{
-	/* Superclass */
-	GtkContainer container;
-
-	/* Private things */
-	NautilusWrapTableDetails *details;
-};
-
-struct NautilusWrapTableClass
-{
-	GtkContainerClass parent_class;
-};
-
-typedef enum
-{
-	NAUTILUS_JUSTIFICATION_BEGINNING,
-	NAUTILUS_JUSTIFICATION_MIDDLE,
-	NAUTILUS_JUSTIFICATION_END
-} NautilusJustification;
-
-/* Public GtkWrapTable methods */
-GtkType               nautilus_wrap_table_get_type                  (void);
-GtkWidget *           nautilus_wrap_table_new                       (gboolean                 homogeneous);
-void                  nautilus_wrap_table_set_x_spacing             (NautilusWrapTable       *wrap_table,
-								     guint                    x_spacing);
-guint                 nautilus_wrap_table_get_x_spacing             (const NautilusWrapTable *wrap_table);
-void                  nautilus_wrap_table_set_y_spacing             (NautilusWrapTable       *wrap_table,
-								     guint                    y_spacing);
-guint                 nautilus_wrap_table_get_y_spacing             (const NautilusWrapTable *wrap_table);
-GtkWidget *           nautilus_wrap_table_find_child_at_event_point (const NautilusWrapTable *wrap_table,
-								     int                      x,
-								     int                      y);
-void                  nautilus_wrap_table_set_x_justification       (NautilusWrapTable       *wrap_table,
-								     GtkJustification         justification);
-NautilusJustification nautilus_wrap_table_get_x_justification       (const NautilusWrapTable *wrap_table);
-void                  nautilus_wrap_table_set_y_justification       (NautilusWrapTable       *wrap_table,
-								     NautilusJustification    justification);
-NautilusJustification nautilus_wrap_table_get_y_justification       (const NautilusWrapTable *wrap_table);
-void                  nautilus_wrap_table_set_homogeneous           (NautilusWrapTable       *wrap_table,
-								     gboolean                 homogeneous);
-gboolean              nautilus_wrap_table_get_homogeneous           (const NautilusWrapTable *wrap_table);
-void                  nautilus_wrap_table_reorder_child             (NautilusWrapTable       *wrap_table,
-								     GtkWidget               *child,
-								     int                      position);
-guint                 nautilus_wrap_table_get_num_children          (const NautilusWrapTable *wrap_table);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_WRAP_TABLE_H */
-
-
diff --git a/libnautilus-extensions/nautilus-xml-extensions.c b/libnautilus-extensions/nautilus-xml-extensions.c
deleted file mode 100644
index 652b99b23..000000000
--- a/libnautilus-extensions/nautilus-xml-extensions.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-xml-extensions.c - functions that extend gnome-xml
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-xml-extensions.h"
-
-#include "nautilus-string.h"
-#include <glib.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <stdlib.h>
-
-xmlNodePtr
-nautilus_xml_get_children (xmlNodePtr parent)
-{
-	if (parent == NULL) {
-		return NULL;
-	}
-	return parent->xmlChildrenNode;
-}
-
-xmlNodePtr
-nautilus_xml_get_root_children (xmlDocPtr document)
-{
-	return nautilus_xml_get_children (xmlDocGetRootElement (document));
-}
-
-xmlNodePtr
-nautilus_xml_get_child_by_name_and_property (xmlNodePtr parent,
-					     const char *child_name,
-					     const char *property_name,
-					     const char *property_value)
-{
-	xmlNodePtr child;
-	xmlChar *property;
-	gboolean match;
-
-	if (parent == NULL) {
-		return NULL;
-	}
-	for (child = nautilus_xml_get_children (parent); child != NULL; child = child->next) {
-		if (strcmp (child->name, child_name) == 0) {
-			property = xmlGetProp (child, property_name);
-			match = nautilus_strcmp (property, property_value) == 0;
-			xmlFree (property);
-			if (match) {
-				return child;
-			}
-		}
-	}
-	return NULL;
-}
-
-/* return a child of the passed-in node with a matching name */
-
-xmlNodePtr
-nautilus_xml_get_child_by_name (xmlNodePtr parent,
-					     const char *child_name)
-{
-	xmlNodePtr child;
-
-	if (parent == NULL) {
-		return NULL;
-	}
-	for (child = nautilus_xml_get_children (parent); child != NULL; child = child->next) {
-		if (strcmp (child->name, child_name) == 0) {
-			return child;
-		}
-	}
-	return NULL;
-}
-
-
-xmlNodePtr
-nautilus_xml_get_root_child_by_name_and_property (xmlDocPtr document,
-						  const char *child_name,
-						  const char *property_name,
-						  const char *property_value)
-{
-	return nautilus_xml_get_child_by_name_and_property
-		(xmlDocGetRootElement (document),
-		 child_name,
-		 property_name,
-		 property_value);
-}
-
-/**
- * nautilus_xml_get_property_for_children
- * 
- * Returns a list of the values for the specified property for all
- * children of the node that have the specified name.
- *
- * @parent:     xmlNodePtr representing the node in question.
- * @child_name: child element name to look for
- * @property:   name of propety to reutnr for matching children that have the property
- * 
- * Returns: A list of keywords.
- * 
- **/
-GList *
-nautilus_xml_get_property_for_children (xmlNodePtr parent,
-					const char *child_name,
-					const char *property_name)
-{
-	GList *properties;
-	xmlNode *child;
-	xmlChar *property;
-	
-	properties = NULL;
-	
-	for (child = nautilus_xml_get_children (parent);
-	     child != NULL;
-	     child = child->next) {
-		if (strcmp (child->name, child_name) == 0) {
-			property = xmlGetProp (child, property_name);
-			if (property != NULL) {
-				properties = g_list_prepend (properties,
-							     g_strdup (property));
-				xmlFree (property);
-			}
-		}
-	}
-
-	/* Reverse so you get them in the same order as the XML file. */
-	return g_list_reverse (properties);
-}
-
-xmlChar *
-nautilus_xml_get_property_translated (xmlNodePtr parent,
-				      const char *property_name)
-{
-	xmlChar *property, *untranslated_property;
-	char *untranslated_property_name;
-	const char *translated_property;
-
-	/* Try for the already-translated version. */
-	property = xmlGetProp (parent, property_name);
-	if (property != NULL) {
-		return property;
-	}
-
-	/* Try for the untranslated version. */
-	untranslated_property_name = g_strconcat ("_", property_name, NULL);
-	untranslated_property = xmlGetProp (parent, untranslated_property_name);
-	g_free (untranslated_property_name);
-	if (untranslated_property == NULL) {
-		return NULL;
-	}
-
-	/* Try to translate. */
-	translated_property = _(untranslated_property);
-
-	/* If not translation is found, return untranslated property as-is. */
-	if (translated_property == (char *) untranslated_property) {
-		return untranslated_property;
-	}
-	
-	/* If a translation happened, make a copy to match the normal
-	 * behavior of this function (returning a string you xmlFree).
-	 */
-	xmlFree (untranslated_property);
-	return xmlStrdup (translated_property);
-}
-
-void
-nautilus_xml_remove_node (xmlNodePtr node)
-{
-	g_return_if_fail (node != NULL);
-	g_return_if_fail (node->doc != NULL);
-	g_return_if_fail (node->parent != NULL);
-	g_return_if_fail (node->doc->xmlRootNode != node);
-
-	if (node->prev == NULL) {
-		g_assert (node->parent->xmlChildrenNode == node);
-		node->parent->xmlChildrenNode = node->next;
-	} else {
-		g_assert (node->parent->xmlChildrenNode != node);
-		node->prev->next = node->next;
-	}
-
-	if (node->next == NULL) {
-		g_assert (node->parent->last == node);
-		node->parent->last = node->prev;
-	} else {
-		g_assert (node->parent->last != node);
-		node->next->prev = node->prev;
-	}
-
-	node->doc = NULL;
-	node->parent = NULL;
-	node->next = NULL;
-	node->prev = NULL;
-}
diff --git a/libnautilus-extensions/nautilus-xml-extensions.h b/libnautilus-extensions/nautilus-xml-extensions.h
deleted file mode 100644
index c0d528aa6..000000000
--- a/libnautilus-extensions/nautilus-xml-extensions.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-xml-extensions.h - functions that extend gnome-xml
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#ifndef NAUTILUS_XML_EXTENSIONS_H
-#define NAUTILUS_XML_EXTENSIONS_H
-
-#include <gnome-xml/tree.h>
-#include <glib.h>
-
-xmlNodePtr nautilus_xml_get_children                        (xmlNodePtr  parent);
-xmlNodePtr nautilus_xml_get_root_children                   (xmlDocPtr   document);
-xmlNodePtr nautilus_xml_get_child_by_name                   (xmlNodePtr  parent,
-							     const char *child_name);
-xmlNodePtr nautilus_xml_get_child_by_name_and_property      (xmlNodePtr  parent,
-							     const char *child_name,
-							     const char *property_name,
-							     const char *property_value);
-xmlNodePtr nautilus_xml_get_root_child_by_name_and_property (xmlDocPtr   document,
-							     const char *child_name,
-							     const char *property_name,
-							     const char *property_value);
-GList     *nautilus_xml_get_property_for_children           (xmlNodePtr  parent,
-							     const char *child_name,
-							     const char *property_name);
-xmlChar   *nautilus_xml_get_property_translated             (xmlNodePtr  parent,
-							     const char *property_name);
-void       nautilus_xml_remove_node                         (xmlNodePtr  node);
-
-#endif /* NAUTILUS_XML_EXTENSIONS_H */
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 637d404d1..0b81256b3 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -8,6 +8,8 @@ INCLUDES = 						\
 	-I$(top_builddir) 				\
 	-I$(top_builddir)/libnautilus 			\
 	-I$(top_srcdir)/cut-n-paste-code 		\
+	$(LIBRSVG_INCLUDEDIR) \
+	$(EEL_INCLUDEDIR) \
 	$(BONOBO_PRINT_CFLAGS) 				\
 	$(BONOBOX_CFLAGS) 				\
 	$(ESD_CFLAGS)					\
@@ -27,7 +29,6 @@ dependency_static_libs = \
 	$(top_builddir)/cut-n-paste-code/widgets/e-paned/libe-paned.la \
 	$(top_builddir)/cut-n-paste-code/widgets/nautilusclist/libnautilusclist.la \
 	$(top_builddir)/cut-n-paste-code/widgets/gimphwrapbox/libgtkhwrapbox.la \
-	$(top_builddir)/librsvg/librsvg.la \
 	$(NULL)
 
 if HAVE_CDDA
@@ -54,252 +55,161 @@ libnautilus_extensions_la_LDFLAGS =	\
 	$(CDDALIBADD)			\
 	$(NULL)
 
-nautilus_metafile_server_idl_sources =		\
-	nautilus-metafile-server-stubs.c	\
-	nautilus-metafile-server-skels.c	\
-	nautilus-metafile-server.h		\
-	nautilus-metafile-server-common.c
+nautilus_metafile_server_idl_sources = \
+	nautilus-metafile-server-stubs.c \
+	nautilus-metafile-server-skels.c \
+	nautilus-metafile-server.h \
+	nautilus-metafile-server-common.c \
+	$(NULL)
 
-libnautilus_extensions_la_SOURCES = 		\
+libnautilus_extensions_la_SOURCES = \
 	$(nautilus_metafile_server_idl_sources)	\
-	nautilus-art-extensions.c		\
-	nautilus-art-gtk-extensions.c		\
-	nautilus-audio-player.c			\
-	nautilus-background-canvas-group.c	\
-	nautilus-background.c			\
-	nautilus-bonobo-extensions.c		\
-	nautilus-bookmark.c			\
-	nautilus-caption-table.c		\
-	nautilus-caption.c			\
-	nautilus-clickable-image.c		\
-	nautilus-ctree.c			\
-	nautilus-customization-data.c		\
-	nautilus-dateedit-extensions.c		\
-	nautilus-debug-drawing.c		\
-	nautilus-debug.c			\
-	nautilus-default-file-icon.c		\
-	nautilus-directory-async.c		\
-	nautilus-directory-background.c		\
-	nautilus-directory-metafile-monitor.c   \
-	nautilus-directory-metafile.c		\
-	nautilus-directory.c			\
-	nautilus-drag-window.c			\
-	nautilus-drag.c				\
-	nautilus-druid-page-eazel.c		\
-	nautilus-druid.c			\
-	nautilus-ellipsizing-label.c		\
-	nautilus-entry.c			\
-	nautilus-enumeration.c			\
-	nautilus-file-changes-queue.c		\
-	nautilus-file-operations-progress.c	\
-	nautilus-file-operations.c		\
-	nautilus-file-utilities.c		\
-	nautilus-file.c				\
-	nautilus-font-factory.c			\
-	nautilus-font-manager.c			\
-	nautilus-font-picker.c			\
-	nautilus-gconf-extensions.c		\
-	nautilus-gdk-extensions.c		\
-	nautilus-gdk-font-extensions.c		\
-	nautilus-gdk-pixbuf-extensions.c	\
-	nautilus-generous-bin.c			\
-	nautilus-glib-extensions.c		\
-	nautilus-global-preferences.c		\
-	nautilus-glyph.c			\
-	nautilus-gnome-extensions.c		\
-	nautilus-graphic-effects.c		\
-	nautilus-gtk-extensions.c		\
-	nautilus-horizontal-splitter.c		\
-	nautilus-icon-canvas-item.c       	\
-	nautilus-icon-container.c		\
-	nautilus-icon-dnd.c			\
-	nautilus-icon-factory.c			\
-	nautilus-icon-text-item.c		\
-	nautilus-image-table.c			\
-	nautilus-image-with-background.c	\
-	nautilus-image.c			\
-	nautilus-keep-last-vertical-box.c	\
-	nautilus-label-with-background.c	\
-	nautilus-label.c			\
-	nautilus-labeled-image.c		\
-	nautilus-lib-self-check-functions.c	\
-	nautilus-link-set.c			\
-	nautilus-link.c				\
-	nautilus-list-column-title.c		\
-	nautilus-list.c                         \
-	nautilus-medusa-support.c		\
-	nautilus-merged-directory.c		\
-	nautilus-metafile-factory.c             \
-	nautilus-metafile.c                     \
-	nautilus-mime-actions.c			\
-	nautilus-password-dialog.c		\
-	nautilus-preferences-box.c		\
-	nautilus-preferences-dialog.c		\
-	nautilus-preferences-group.c		\
-	nautilus-preferences-item.c		\
-	nautilus-preferences-pane.c		\
-	nautilus-preferences.c			\
-	nautilus-program-chooser.c		\
-	nautilus-program-choosing.c		\
-	nautilus-radio-button-group.c		\
-	nautilus-region.c			\
-	nautilus-scalable-font.c		\
-	nautilus-search-uri.c			\
-	nautilus-self-checks.c			\
-	nautilus-sidebar-functions.c		\
-	nautilus-smooth-text-layout-cache.c	\
-	nautilus-smooth-text-layout.c		\
-	nautilus-smooth-widget.c		\
-	nautilus-sound.c			\
-	nautilus-stock-dialogs.c		\
-	nautilus-string-list.c			\
-	nautilus-string-map.c			\
-	nautilus-string-picker.c		\
-	nautilus-string.c			\
-	nautilus-tabs.c				\
-	nautilus-text-caption.c			\
-	nautilus-theme.c			\
-	nautilus-thumbnails.c			\
-	nautilus-trash-directory.c		\
-	nautilus-trash-file.c			\
-	nautilus-trash-monitor.c		\
-	nautilus-undo-context.c			\
-	nautilus-undo-manager.c			\
-	nautilus-undo-signal-handlers.c		\
-	nautilus-vfs-directory.c		\
-	nautilus-vfs-file.c			\
-	nautilus-view-identifier.c		\
-	nautilus-viewport.c			\
-	nautilus-volume-monitor.c		\
-	nautilus-wrap-table.c			\
-	nautilus-xml-extensions.c		\
+	nautilus-audio-player.c \
+	nautilus-bonobo-extensions.c \
+	nautilus-bookmark.c \
+	nautilus-ctree.c \
+	nautilus-customization-data.c \
+	nautilus-dateedit-extensions.c \
+	nautilus-default-file-icon.c \
+	nautilus-directory-async.c \
+	nautilus-directory-background.c \
+	nautilus-directory-metafile-monitor.c \
+	nautilus-directory-metafile.c \
+	nautilus-directory.c \
+	nautilus-drag-window.c \
+	nautilus-drag.c \
+	nautilus-druid-page-eazel.c \
+	nautilus-druid.c \
+	nautilus-entry.c \
+	nautilus-file-changes-queue.c \
+	nautilus-file-operations-progress.c \
+	nautilus-file-operations.c \
+	nautilus-file-utilities.c \
+	nautilus-file.c \
+	nautilus-font-factory.c \
+	nautilus-gconf-extensions.c \
+	nautilus-generous-bin.c \
+	nautilus-global-preferences.c \
+	nautilus-horizontal-splitter.c \
+	nautilus-icon-canvas-item.c \
+	nautilus-icon-container.c \
+	nautilus-icon-dnd.c \
+	nautilus-icon-factory.c \
+	nautilus-icon-text-item.c \
+	nautilus-keep-last-vertical-box.c \
+	nautilus-lib-self-check-functions.c \
+	nautilus-link-set.c \
+	nautilus-link.c \
+	nautilus-list-column-title.c \
+	nautilus-list.c \
+	nautilus-medusa-support.c \
+	nautilus-merged-directory.c \
+	nautilus-metafile-factory.c \
+	nautilus-metafile.c \
+	nautilus-mime-actions.c \
+	nautilus-preferences-box.c \
+	nautilus-preferences-dialog.c \
+	nautilus-preferences-group.c \
+	nautilus-preferences-item.c \
+	nautilus-preferences-pane.c \
+	nautilus-preferences.c \
+	nautilus-program-chooser.c \
+	nautilus-program-choosing.c \
+	nautilus-search-uri.c \
+	nautilus-sidebar-functions.c \
+	nautilus-sound.c \
+	nautilus-tabs.c \
+	nautilus-theme.c \
+	nautilus-thumbnails.c \
+	nautilus-trash-directory.c \
+	nautilus-trash-file.c \
+	nautilus-trash-monitor.c \
+	nautilus-undo-context.c \
+	nautilus-undo-manager.c \
+	nautilus-undo-signal-handlers.c \
+	nautilus-vfs-directory.c \
+	nautilus-vfs-file.c \
+	nautilus-view-identifier.c \
+	nautilus-volume-monitor.c \
 	$(NULL)
 
 # Everything is private for now
-noinst_HEADERS =				\
-	nautilus-art-extensions.h		\
-	nautilus-art-gtk-extensions.h		\
-	nautilus-audio-player.h			\
-	nautilus-background-canvas-group.h	\
-	nautilus-background.h			\
-	nautilus-bonobo-extensions.h		\
-	nautilus-bookmark.h			\
-	nautilus-caption-table.h		\
-	nautilus-caption.h			\
-	nautilus-cdrom-extensions.h		\
-	nautilus-clickable-image.h		\
-	nautilus-ctree.h			\
-	nautilus-customization-data.h		\
-	nautilus-dateedit-extensions.h 		\
-	nautilus-debug-drawing.h		\
-	nautilus-debug.h			\
-	nautilus-default-file-icon.h		\
-	nautilus-directory-background.h		\
-	nautilus-directory-metafile-monitor.h   \
-	nautilus-directory-metafile.h		\
-	nautilus-directory-notify.h		\
-	nautilus-directory-private.h		\
-	nautilus-directory.h			\
-	nautilus-drag-window.h			\
-	nautilus-drag.h				\
-	nautilus-druid-page-eazel.h		\
-	nautilus-druid.h			\
-	nautilus-ellipsizing-label.h		\
-	nautilus-entry.h			\
-	nautilus-enumeration.h			\
-	nautilus-file-attributes.h		\
-	nautilus-file-changes-queue.h		\
-	nautilus-file-operations-progress.h 	\
-	nautilus-file-operations.h 		\
-	nautilus-file-private.h			\
-	nautilus-file-utilities.h		\
-	nautilus-file.h				\
-	nautilus-font-factory.h			\
-	nautilus-font-manager.h			\
-	nautilus-font-picker.h			\
-	nautilus-gconf-extensions.h		\
-	nautilus-gdk-extensions.h		\
-	nautilus-gdk-font-extensions.h		\
-	nautilus-gdk-pixbuf-extensions.h	\
-	nautilus-generous-bin.h			\
-	nautilus-glib-extensions.h		\
-	nautilus-global-preferences.h		\
-	nautilus-glyph.h			\
-	nautilus-gnome-extensions.h		\
-	nautilus-graphic-effects.h		\
-	nautilus-gtk-extensions.h		\
-	nautilus-gtk-macros.h			\
-	nautilus-horizontal-splitter.h		\
-	nautilus-icon-canvas-item.h		\
-	nautilus-icon-container.h		\
-	nautilus-icon-dnd.h			\
-	nautilus-icon-factory-private.h		\
-	nautilus-icon-factory.h			\
-	nautilus-icon-private.h			\
-	nautilus-icon-text-item.h		\
-	nautilus-image-table.h			\
-	nautilus-image-with-background.h	\
-	nautilus-image.h			\
-	nautilus-iso9660.h			\
-	nautilus-keep-last-vertical-box.h	\
-	nautilus-label-with-background.h	\
-	nautilus-label.h			\
-	nautilus-labeled-image.h		\
-	nautilus-lib-self-check-functions.h	\
-	nautilus-link-set.h			\
-	nautilus-link.h				\
-	nautilus-list-column-title.h		\
-	nautilus-list.h                         \
-	nautilus-medusa-support.h		\
-	nautilus-merged-directory.h		\
-	nautilus-metadata.h			\
-	nautilus-metafile-factory.h             \
-	nautilus-metafile.h                     \
-	nautilus-mime-actions.h			\
-	nautilus-password-dialog.h		\
-	nautilus-preferences-box.h		\
-	nautilus-preferences-dialog.h		\
-	nautilus-preferences-group.h		\
-	nautilus-preferences-item.h		\
-	nautilus-preferences-pane.h		\
-	nautilus-preferences-private.h		\
-	nautilus-preferences.h			\
-	nautilus-program-chooser.h		\
-	nautilus-program-choosing.h		\
-	nautilus-radio-button-group.h		\
-	nautilus-region.h			\
-	nautilus-scalable-font-private.h	\
-	nautilus-scalable-font-private.h	\
-	nautilus-scalable-font.h		\
-	nautilus-search-uri.h			\
-	nautilus-self-checks.h			\
-	nautilus-sidebar-functions.h		\
-	nautilus-smooth-text-layout-cache.h	\
-	nautilus-smooth-text-layout.h		\
-	nautilus-smooth-widget.h		\
-	nautilus-sound.h			\
-	nautilus-stock-dialogs.h		\
-	nautilus-string-list.h			\
-	nautilus-string-map.h			\
-	nautilus-string-picker.h		\
-	nautilus-string.h			\
-	nautilus-tabs.h				\
-	nautilus-text-caption.h			\
-	nautilus-theme.h			\
-	nautilus-thumbnails.h			\
-	nautilus-trash-directory.h		\
-	nautilus-trash-file.h			\
-	nautilus-trash-monitor.h		\
-	nautilus-undo-context.h			\
-	nautilus-undo-manager.h			\
-	nautilus-undo-signal-handlers.h		\
-	nautilus-vfs-directory.h		\
-	nautilus-vfs-file.h			\
-	nautilus-view-identifier.h		\
-	nautilus-viewport.h			\
-	nautilus-volume-monitor.h		\
-	nautilus-wrap-table.h			\
-	nautilus-xml-extensions.h		\
+noinst_HEADERS = \
+	nautilus-audio-player.h \
+	nautilus-bonobo-extensions.h \
+	nautilus-bookmark.h \
+	nautilus-cdrom-extensions.h \
+	nautilus-ctree.h \
+	nautilus-customization-data.h \
+	nautilus-dateedit-extensions.h \
+	nautilus-default-file-icon.h \
+	nautilus-directory-background.h \
+	nautilus-directory-metafile-monitor.h \
+	nautilus-directory-metafile.h \
+	nautilus-directory-notify.h \
+	nautilus-directory-private.h \
+	nautilus-directory.h \
+	nautilus-drag-window.h \
+	nautilus-drag.h \
+	nautilus-druid-page-eazel.h \
+	nautilus-druid.h \
+	nautilus-entry.h \
+	nautilus-file-attributes.h \
+	nautilus-file-changes-queue.h \
+	nautilus-file-operations-progress.h \
+	nautilus-file-operations.h \
+	nautilus-file-private.h \
+	nautilus-file-utilities.h \
+	nautilus-file.h \
+	nautilus-font-factory.h \
+	nautilus-gconf-extensions.h \
+	nautilus-generous-bin.h \
+	nautilus-global-preferences.h \
+	nautilus-horizontal-splitter.h \
+	nautilus-icon-canvas-item.h \
+	nautilus-icon-container.h \
+	nautilus-icon-dnd.h \
+	nautilus-icon-factory-private.h \
+	nautilus-icon-factory.h \
+	nautilus-icon-private.h \
+	nautilus-icon-text-item.h \
+	nautilus-iso9660.h \
+	nautilus-keep-last-vertical-box.h \
+	nautilus-link-set.h \
+	nautilus-link.h \
+	nautilus-list-column-title.h \
+	nautilus-list.h \
+	nautilus-medusa-support.h \
+	nautilus-merged-directory.h \
+	nautilus-metadata.h \
+	nautilus-metafile-factory.h \
+	nautilus-metafile.h \
+	nautilus-mime-actions.h \
+	nautilus-preferences-box.h \
+	nautilus-preferences-dialog.h \
+	nautilus-preferences-group.h \
+	nautilus-preferences-item.h \
+	nautilus-preferences-pane.h \
+	nautilus-preferences-private.h \
+	nautilus-preferences.h \
+	nautilus-program-chooser.h \
+	nautilus-program-choosing.h \
+	nautilus-search-uri.h \
+	nautilus-sidebar-functions.h \
+	nautilus-sound.h \
+	nautilus-tabs.h \
+	nautilus-theme.h \
+	nautilus-thumbnails.h \
+	nautilus-trash-directory.h \
+	nautilus-trash-file.h \
+	nautilus-trash-monitor.h \
+	nautilus-undo-context.h \
+	nautilus-undo-manager.h \
+	nautilus-undo-signal-handlers.h \
+	nautilus-vfs-directory.h \
+	nautilus-vfs-file.h \
+	nautilus-view-identifier.h \
+	nautilus-volume-monitor.h \
 	$(NULL)
 
 $(lib_LTLIBRARIES): $(dependency_static_libs)
diff --git a/libnautilus-private/nautilus-art-extensions.c b/libnautilus-private/nautilus-art-extensions.c
deleted file mode 100644
index 1b4550950..000000000
--- a/libnautilus-private/nautilus-art-extensions.c
+++ /dev/null
@@ -1,473 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-art-extensions.c - implementation of libart extension functions.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-art-extensions.h"
-#include "nautilus-lib-self-check-functions.h"
-#include <math.h>
-
-ArtIRect NAUTILUS_ART_IRECT_EMPTY = { 0, 0, 0, 0 };
-NautilusArtIPoint NAUTILUS_ART_IPOINT_ZERO = { 0, 0 };
-NautilusDimensions NAUTILUS_DIMENSIONS_EMPTY = { 0, 0 };
-
-gboolean
-nautilus_art_irect_contains_irect (const ArtIRect *outer_rect,
-				   const ArtIRect *inner_rect)
-{
-	g_return_val_if_fail (outer_rect != NULL, FALSE);
-	g_return_val_if_fail (inner_rect != NULL, FALSE);
-
-	return outer_rect->x0 <= inner_rect->x0
-		&& outer_rect->y0 <= inner_rect->y0
-		&& outer_rect->x1 >= inner_rect->x1
-		&& outer_rect->y1 >= inner_rect->y1; 
-}
-
-/**
- * nautilus_art_irect_contains_point:
- * 
- * @rectangle: An ArtIRect.
- * @x: X coordinate to test.
- * @y: Y coordinate to test.
- *
- * Returns: A boolean value indicating whether the rectangle 
- *          contains the x,y coordinate.
- * 
- */
-gboolean
-nautilus_art_irect_contains_point (const ArtIRect *rectangle,
-				   int x,
-				   int y)
-{
-	g_return_val_if_fail (rectangle != NULL, FALSE);
-
-	return x >= rectangle->x0
-		&& x <= rectangle->x1
-		&& y >= rectangle->y0
-		&& y <= rectangle->y1;
-}
-
-gboolean
-nautilus_art_irect_hits_irect (const ArtIRect *rect_a,
-			       const ArtIRect *rect_b)
-{
-	ArtIRect intersection;
-
-	g_return_val_if_fail (rect_a != NULL, FALSE);
-	g_return_val_if_fail (rect_b != NULL, FALSE);
-
-	art_irect_intersect (&intersection, rect_a, rect_b);
-	return !art_irect_empty (&intersection);
-}
-
-gboolean
-nautilus_art_irect_equal (const ArtIRect *rect_a,
-			  const ArtIRect *rect_b)
-{
-	g_return_val_if_fail (rect_a != NULL, FALSE);
-	g_return_val_if_fail (rect_b != NULL, FALSE);
-
-	return rect_a->x0 == rect_b->x0
-		&& rect_a->y0 == rect_b->y0
-		&& rect_a->x1 == rect_b->x1
-		&& rect_a->y1 == rect_b->y1;
-}
-
-gboolean
-nautilus_art_drect_equal (const ArtDRect *rect_a,
-			  const ArtDRect *rect_b)
-{
-	g_return_val_if_fail (rect_a != NULL, FALSE);
-	g_return_val_if_fail (rect_b != NULL, FALSE);
-
-	return rect_a->x0 == rect_b->x0
-		&& rect_a->y0 == rect_b->y0
-		&& rect_a->x1 == rect_b->x1
-		&& rect_a->y1 == rect_b->y1;
-}
-
-gboolean
-nautilus_art_irect_is_valid (const ArtIRect *rect)
-{
-	return rect && !art_irect_empty (rect);
-}
-
-void
-nautilus_art_irect_assign (ArtIRect *rect,
-			   int x,
-			   int y,
-			   int width,
-			   int height)
-{
-	g_return_if_fail (rect != NULL);
-
-	rect->x0 = x;
-	rect->y0 = y;
-	rect->x1 = rect->x0 + width;
-	rect->y1 = rect->y0 + height;
-}
-
-/**
- * nautilus_art_irect_get_width:
- * 
- * @rectangle: An ArtIRect.
- *
- * Returns: The width of the rectangle.
- * 
- */
-int
-nautilus_art_irect_get_width (const ArtIRect *rectangle)
-{
-	g_return_val_if_fail (rectangle != NULL, 0);
-	
-	return rectangle->x1 - rectangle->x0;
-}
-
-/**
- * nautilus_art_irect_get_height:
- * 
- * @rectangle: An ArtIRect.
- *
- * Returns: The height of the rectangle.
- * 
- */
-int
-nautilus_art_irect_get_height (const ArtIRect *rectangle)
-{
-	g_return_val_if_fail (rectangle != NULL, 0);
-	
-	return rectangle->y1 - rectangle->y0;
-}
-
-/**
- * nautilus_art_irect_align:
- * 
- * @container: The rectangle that is to contain the aligned rectangle.
- * @aligned_width: Width of rectangle being algined.
- * @aligned_height: Height of rectangle being algined.
- * @x_alignment: X alignment.
- * @y_alignment: Y alignment.
- *
- * Returns: A rectangle aligned within a container rectangle
- *          using the given alignment parameters.
- */
-ArtIRect
-nautilus_art_irect_align (const ArtIRect *container,
-			  int aligned_width,
-			  int aligned_height,
-			  float x_alignment,
-			  float y_alignment)
-{
-	ArtIRect aligned;
-	int available_width;
-	int available_height;
-
-	g_return_val_if_fail (container != NULL, NAUTILUS_ART_IRECT_EMPTY);
-
-	if (art_irect_empty (container)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	if (aligned_width == 0 || aligned_height == 0) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	/* Make sure the aligment parameters are within range */
-	x_alignment = MAX (0, x_alignment);
-	x_alignment = MIN (1.0, x_alignment);
-	y_alignment = MAX (0, y_alignment);
-	y_alignment = MIN (1.0, y_alignment);
-
-	available_width = nautilus_art_irect_get_width (container) - aligned_width;
-	available_height = nautilus_art_irect_get_height (container) - aligned_height;
-
-	aligned.x0 = floor (container->x0 + (available_width * x_alignment) + 0.5);
-	aligned.y0 = floor (container->y0 + (available_height * y_alignment) + 0.5);
-	aligned.x1 = aligned.x0 + aligned_width;
-	aligned.y1 = aligned.y0 + aligned_height;
-
-	return aligned;
-}
-
-/**
- * nautilus_dimensions_empty:
- * 
- * @dimensions: A NautilusDimensions structure.
- *
- * Returns: Whether the dimensions are empty.
- */
-gboolean
-nautilus_dimensions_empty (const NautilusDimensions *dimensions)
-{
-	g_return_val_if_fail (dimensions != NULL, TRUE);
-
-	return dimensions->width <= 0 || dimensions->height <= 0;
-}
-
-/**
- * nautilus_art_irect_assign_dimensions:
- * 
- * @x: X coodinate for resulting rectangle.
- * @y: Y coodinate for resulting rectangle.
- * @dimensions: A NautilusDimensions structure for the rect's width and height.
- *
- * Returns: An ArtIRect with the given coordinates and dimensions.
- */
-ArtIRect
-nautilus_art_irect_assign_dimensions (int x,
-				      int y,
-				      const NautilusDimensions *dimensions)
-{
-	ArtIRect rectangle;
-
-	g_return_val_if_fail (dimensions != NULL, NAUTILUS_ART_IRECT_EMPTY);
-
-	rectangle.x0 = x;
-	rectangle.y0 = y;
-	rectangle.x1 = rectangle.x0 + dimensions->width;
-	rectangle.y1 = rectangle.y0 + dimensions->height;
-
-	return rectangle;
-}
-
-ArtIRect 
-nautilus_art_irect_offset_by (ArtIRect rectangle, int x, int y)
-{
-	rectangle.x0 += x;
-	rectangle.x1 += x;
-	rectangle.y0 += y;
-	rectangle.y1 += y;
-	
-	return rectangle;
-}
-
-ArtIRect 
-nautilus_art_irect_offset_to (ArtIRect rectangle, int x, int y)
-{
-	rectangle.x1 = rectangle.x1 - rectangle.x0 + x;
-	rectangle.x0 = x;
-	rectangle.y1 = rectangle.y1 - rectangle.y0 + y;
-	rectangle.y0 = y;
-	
-	return rectangle;
-}
-
-ArtIRect 
-nautilus_art_irect_scale_by (ArtIRect rectangle, double scale)
-{
-	rectangle.x0 *= scale;
-	rectangle.x1 *= scale;
-	rectangle.y0 *= scale;
-	rectangle.y1 *= scale;
-	
-	return rectangle;
-}
-
-ArtIRect 
-nautilus_art_irect_inset (ArtIRect rectangle, int horizontal_inset, int vertical_inset)
-{
-	rectangle.x0 += horizontal_inset;
-	rectangle.x1 -= horizontal_inset;
-	rectangle.y0 += vertical_inset;
-	rectangle.y1 -= vertical_inset;
-	
-	return rectangle;
-}
-
-
-ArtDRect 
-nautilus_art_drect_offset_by (ArtDRect rectangle, double x, double y)
-{
-	rectangle.x0 += x;
-	rectangle.x1 += x;
-	rectangle.y0 += y;
-	rectangle.y1 += y;
-	
-	return rectangle;
-}
-
-ArtDRect 
-nautilus_art_drect_offset_to (ArtDRect rectangle, double x, double y)
-{
-	rectangle.x1 = rectangle.x1 - rectangle.x0 + x;
-	rectangle.x0 = x;
-	rectangle.y1 = rectangle.y1 - rectangle.y0 + y;
-	rectangle.y0 = y;
-	
-	return rectangle;
-}
-
-ArtIRect 
-nautilus_art_irect_offset_by_point (ArtIRect rectangle, NautilusArtIPoint point)
-{
-	rectangle.x0 += point.x;
-	rectangle.x1 += point.x;
-	rectangle.y0 += point.y;
-	rectangle.y1 += point.y;
-	
-	return rectangle;
-}
-
-ArtIRect 
-nautilus_art_irect_offset_to_point (ArtIRect rectangle, NautilusArtIPoint point)
-{
-	rectangle.x1 = rectangle.x1 - rectangle.x0 + point.x;
-	rectangle.x0 = point.x;
-	rectangle.y1 = rectangle.y1 - rectangle.y0 + point.y;
-	rectangle.y0 = point.y;
-	
-	return rectangle;
-}
-
-ArtDRect 
-nautilus_art_drect_scale_by (ArtDRect rectangle, double scale)
-{
-	rectangle.x0 *= scale;
-	rectangle.x1 *= scale;
-	rectangle.y0 *= scale;
-	rectangle.y1 *= scale;
-	
-	return rectangle;
-}
-
-ArtDRect 
-nautilus_art_drect_inset (ArtDRect rectangle, double horizontal_inset, double vertical_inset)
-{
-	rectangle.x0 += horizontal_inset;
-	rectangle.x1 -= horizontal_inset;
-	rectangle.y0 += vertical_inset;
-	rectangle.y1 -= vertical_inset;
-	
-	return rectangle;
-}
-
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-void
-nautilus_self_check_art_extensions (void)
-{
-	ArtIRect one;
-	ArtIRect two;
-	ArtIRect empty_rect = NAUTILUS_ART_IRECT_EMPTY;
-	ArtIRect inside;
-	ArtIRect outside;
-	ArtIRect container;
-	NautilusDimensions empty_dimensions = NAUTILUS_DIMENSIONS_EMPTY;
-	NautilusDimensions dim1;
-
-	nautilus_art_irect_assign (&one, 10, 10, 20, 20);
-	nautilus_art_irect_assign (&two, 10, 10, 20, 20);
-	nautilus_art_irect_assign (&inside, 11, 11, 18, 18);
-	nautilus_art_irect_assign (&outside, 31, 31, 10, 10);
-	nautilus_art_irect_assign (&container, 0, 0, 100, 100);
-
-	/* nautilus_art_irect_equal */
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_equal (&one, &two), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_equal (&one, &empty_rect), FALSE);
-
-	/* nautilus_art_irect_is_valid */
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_is_valid (NULL), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_is_valid (&empty_rect), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_is_valid (&one), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_is_valid (&two), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_is_valid (&inside), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_is_valid (&outside), TRUE);
-
-	/* nautilus_art_irect_hits_irect */
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_hits_irect (&one, &two), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_hits_irect (&one, &inside), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_hits_irect (&one, &outside), FALSE);
-
-	/* nautilus_art_irect_contains_point */
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 9, 9), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 9, 10), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 10, 9), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 10, 10), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 11, 10), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 10, 11), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 11, 11), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 30, 30), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 29, 30), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 30, 29), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_art_irect_contains_point (&one, 31, 31), FALSE);
-
-	/* nautilus_art_irect_get_width */
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_art_irect_get_width (&one), 20);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_art_irect_get_width (&empty_rect), 0);
-
-	/* nautilus_art_irect_get_height */
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_art_irect_get_height (&one), 20);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_art_irect_get_height (&empty_rect), 0);
-
-	/* nautilus_art_irect_align */
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&empty_rect, 1, 1, 0.0, 0.0), 0, 0, 0, 0);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 0, 0, 0.0, 0.0), 0, 0, 0, 0);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 9, 0, 0.0, 0.0), 0, 0, 0, 0);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 0, 9, 0.0, 0.0), 0, 0, 0, 0);
-
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 10, 10, 0.0, 0.0), 0, 0, 10, 10);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 10, 10, 1.0, 0.0), 90, 0, 100, 10);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 10, 10, 0.0, 1.0), 0, 90, 10, 100);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 10, 10, 1.0, 1.0), 90, 90, 100, 100);
-
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 9, 9, 0.0, 0.0), 0, 0, 9, 9);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 9, 9, 1.0, 0.0), 91, 0, 100, 9);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 9, 9, 0.0, 1.0), 0, 91, 9, 100);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 9, 9, 1.0, 1.0), 91, 91, 100, 100);
-
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 10, 10, 0.5, 0.0), 45, 0, 55, 10);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 10, 10, 0.5, 0.0), 45, 0, 55, 10);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 10, 10, 0.0, 0.5), 0, 45, 10, 55);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 10, 10, 0.5, 0.5), 45, 45, 55, 55);
-
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 9, 9, 0.5, 0.0), 46, 0, 55, 9);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 9, 9, 0.5, 0.0), 46, 0, 55, 9);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 9, 9, 0.0, 0.5), 0, 46, 9, 55);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 9, 9, 0.5, 0.5), 46, 46, 55, 55);
-
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 120, 120, 0.0, 0.0), 0, 0, 120, 120);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_align (&container, 120, 120, 0.5, 0.5), -10, -10, 110, 110);
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_dimensions_empty (&empty_dimensions), TRUE);
-
-	dim1.width = 10; dim1.height = 10;
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_dimensions_empty (&dim1), FALSE);
-
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_assign_dimensions (0, 0, &dim1), 0, 0, 10, 10);
-
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_assign_dimensions (1, 1, &dim1), 1, 1, 11, 11);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_assign_dimensions (-1, 1, &dim1), -1, 1, 9, 11);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_assign_dimensions (1, -1, &dim1), 1, -1, 11, 9);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_assign_dimensions (-1, -1, &dim1), -1, -1, 9, 9);
-
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_assign_dimensions (2, 2, &dim1), 2, 2, 12, 12);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_assign_dimensions (-2, 2, &dim1), -2, 2, 8, 12);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_assign_dimensions (2, -2, &dim1), 2, -2, 12, 8);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_art_irect_assign_dimensions (-2, -2, &dim1), -2, -2, 8, 8);
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-art-extensions.h b/libnautilus-private/nautilus-art-extensions.h
deleted file mode 100644
index d8a5fd523..000000000
--- a/libnautilus-private/nautilus-art-extensions.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-art-extensions.h - interface of libart extension functions.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_ART_EXTENSIONS_H
-#define NAUTILUS_ART_EXTENSIONS_H
-
-#include <libgnome/gnome-defs.h>
-#include <libart_lgpl/art_rect.h>
-#include <glib.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct {
-	int x;
-	int y;
-} NautilusArtIPoint;
-
-typedef struct {
-	int width;
-	int height;
-} NautilusDimensions;
-
-extern ArtIRect NAUTILUS_ART_IRECT_EMPTY;
-extern NautilusArtIPoint NAUTILUS_ART_IPOINT_ZERO;
-extern NautilusDimensions NAUTILUS_DIMENSIONS_EMPTY;
-
-/* More functions for ArtIRect and ArtDRect. */
-gboolean nautilus_art_irect_equal             (const ArtIRect           *rect_a,
-					       const ArtIRect           *rect_b);
-gboolean nautilus_art_drect_equal             (const ArtDRect           *rect_a,
-					       const ArtDRect           *rect_b);
-gboolean nautilus_art_irect_hits_irect        (const ArtIRect           *rect_a,
-					       const ArtIRect           *rect_b);
-gboolean nautilus_art_irect_contains_irect    (const ArtIRect           *outer_rect,
-					       const ArtIRect           *inner_rect);
-gboolean nautilus_art_irect_contains_point    (const ArtIRect           *outer_rect,
-					       int                       x,
-					       int                       y);
-gboolean nautilus_art_irect_is_valid          (const ArtIRect           *rect);
-void     nautilus_art_irect_assign            (ArtIRect                 *rect,
-					       int                       x,
-					       int                       y,
-					       int                       width,
-					       int                       height);
-int      nautilus_art_irect_get_width         (const ArtIRect           *rect);
-int      nautilus_art_irect_get_height        (const ArtIRect           *rect);
-ArtIRect nautilus_art_irect_align             (const ArtIRect           *container,
-					       int                       aligned_width,
-					       int                       aligned_height,
-					       float                     x_alignment,
-					       float                     y_alignment);
-/* NautilusDimensions functions. */
-gboolean nautilus_dimensions_empty            (const NautilusDimensions *dimensions);
-ArtIRect nautilus_art_irect_assign_dimensions (int                       x,
-					       int                       y,
-					       const NautilusDimensions *dimensions);
-
-ArtIRect nautilus_art_irect_offset_by	      (ArtIRect			 rect,
-					       int			 x,
-					       
-					       int			 y);
-ArtIRect nautilus_art_irect_offset_to	      (ArtIRect			 rect,
-					       int			 x,
-					       int			 y);
-ArtIRect nautilus_art_irect_scale_by	      (ArtIRect			 rect,
-					       double			 scale);
-ArtIRect nautilus_art_irect_inset	      (ArtIRect			 rect,
-					       int			 horizontal_inset,
-					       int			 vertical_inset);
-ArtDRect nautilus_art_drect_offset_by	      (ArtDRect			 rect,
-					       double			 x,
-					       double			 y);
-ArtDRect nautilus_art_drect_offset_to	      (ArtDRect			 rect,
-					       double			 x,
-					       double			 y);
-ArtDRect nautilus_art_drect_scale_by	      (ArtDRect			 rect,
-					       double			 scale);
-ArtDRect nautilus_art_drect_inset	      (ArtDRect			 rect,
-					       double			 horizontal_inset,
-					       double			 vertical_inset);
-ArtIRect nautilus_art_irect_offset_by_point   (ArtIRect			 rect,
-					       NautilusArtIPoint	 point);
-ArtIRect nautilus_art_irect_offset_to_point   (ArtIRect			 rect,
-					       NautilusArtIPoint	 point);
-					      
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_ART_EXTENSIONS_H */
diff --git a/libnautilus-private/nautilus-art-gtk-extensions.c b/libnautilus-private/nautilus-art-gtk-extensions.c
deleted file mode 100644
index ce3cb2c3f..000000000
--- a/libnautilus-private/nautilus-art-gtk-extensions.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-art-gtk-extensions.c - Access gtk/gdk attributes as libart rectangles.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-art-gtk-extensions.h"
-
-/**
- * nautilus_gdk_rectangle_to_art_irect:
- * @gdk_rectangle: The source GdkRectangle.
- *
- * Return value: An ArtIRect representation of the GdkRectangle.
- *
- * This is a very simple conversion of rectangles from the Gdk to the Libart
- * universe.  This is useful in code that does clipping (or other operations)
- * using libart and has a GdkRectangle to work with - for example expose_event()
- * in GtkWidget's. 
- */
-ArtIRect
-nautilus_gdk_rectangle_to_art_irect (const GdkRectangle *gdk_rectangle)
-{
-	ArtIRect irect;
-
-	g_return_val_if_fail (gdk_rectangle != NULL, NAUTILUS_ART_IRECT_EMPTY);
-
-	irect.x0 = gdk_rectangle->x;
-	irect.y0 = gdk_rectangle->y;
-	irect.x1 = irect.x0 + (int) gdk_rectangle->width;
-	irect.y1 = irect.y0 + (int) gdk_rectangle->height;
-
-	return irect;
-}
-
-/**
- * nautilus_screen_get_dimensions:
- *
- * Return value: The screen dimensions.
- *
- */
-NautilusDimensions
-nautilus_screen_get_dimensions (void)
-{
-	NautilusDimensions screen_dimensions;
-
-	screen_dimensions.width = gdk_screen_width ();
-	screen_dimensions.height = gdk_screen_height ();
-	
-	g_assert (screen_dimensions.width > 0);
-	g_assert (screen_dimensions.height > 0);
-
-	return screen_dimensions;
-}
-
-/**
- * nautilus_gdk_window_get_bounds:
- * @gdk_window: The source GdkWindow.
- *
- * Return value: An ArtIRect representation of the given GdkWindow's geometry
- * relative to its parent in the Gdk window hierarchy.
- *
- */
-ArtIRect
-nautilus_gdk_window_get_bounds (const GdkWindow *gdk_window)
-{
-	ArtIRect bounds;
-	int width;
-	int height;
-
-	g_return_val_if_fail (gdk_window != NULL, NAUTILUS_ART_IRECT_EMPTY);
-
-	gdk_window_get_position ((GdkWindow *) gdk_window, &bounds.x0, &bounds.y0);
-	gdk_window_get_size ((GdkWindow *) gdk_window, &width, &height);
-
-	bounds.x1 = bounds.x0 + width;
-	bounds.y1 = bounds.y0 + height;
-
-	return bounds;
-}
-
-/**
- * nautilus_gdk_window_get_bounds:
- * @gdk_window: The source GdkWindow.
- *
- * Return value: An ArtIRect representation of the given GdkWindow's geometry
- * relative to the screen.
- *
- */
-ArtIRect
-nautilus_gdk_window_get_screen_relative_bounds (const GdkWindow *gdk_window)
-{
-	ArtIRect screen_bounds;
-	int width;
-	int height;
-	
-	g_return_val_if_fail (gdk_window != NULL, NAUTILUS_ART_IRECT_EMPTY);
-
-	if (!gdk_window_get_origin ((GdkWindow *) gdk_window,
-				    &screen_bounds.x0,
-				    &screen_bounds.y0)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-	
-	gdk_window_get_size ((GdkWindow *) gdk_window, &width, &height);
-	
-	screen_bounds.x1 = screen_bounds.x0 + width;
-	screen_bounds.y1 = screen_bounds.y0 + height;
-	
-	return screen_bounds;
-}
-
-/**
- * nautilus_gtk_widget_get_bounds:
- * @gtk_widget: The source GtkWidget.
- *
- * Return value: An ArtIRect representation of the given GtkWidget's geometry
- * relative to its parent.  In the Gtk universe this is known as "allocation."
- *
- */
-ArtIRect
-nautilus_gtk_widget_get_bounds (const GtkWidget *gtk_widget)
-{
-	ArtIRect bounds;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (gtk_widget), NAUTILUS_ART_IRECT_EMPTY);
-	
-	nautilus_art_irect_assign (&bounds, 
-				   gtk_widget->allocation.x,
-				   gtk_widget->allocation.y,
-				   (int) gtk_widget->allocation.width,
-				   (int) gtk_widget->allocation.height);
-	
-	return bounds;
-}
-
-/**
- * nautilus_gtk_widget_get_dimensions:
- * @gtk_widget: The source GtkWidget.
- *
- * Return value: The widget's dimensions.  The returned dimensions are only valid
- *               after the widget's geometry has been "allocated" by its container.
- */
-NautilusDimensions
-nautilus_gtk_widget_get_dimensions (const GtkWidget *gtk_widget)
-{
-	NautilusDimensions dimensions;
-	
-	g_return_val_if_fail (GTK_IS_WIDGET (gtk_widget), NAUTILUS_DIMENSIONS_EMPTY);
-	
-	dimensions.width = (int) gtk_widget->allocation.width;
-	dimensions.height = (int) gtk_widget->allocation.height;
-	
-	return dimensions;
-}
-
-/**
- * nautilus_gtk_widget_get_preferred_dimensions:
- * @gtk_widget: The source GtkWidget.
- *
- * Return value: The widget's preferred dimensions.  The preferred dimensions are
- *               computed by calling the widget's 'size_request' method and thus
- *               could potentially be expensive for complicated widgets.
- */
-NautilusDimensions
-nautilus_gtk_widget_get_preferred_dimensions (const GtkWidget *gtk_widget)
-{
-	GtkRequisition requisition;
-	NautilusDimensions preferred_dimensions;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (gtk_widget), NAUTILUS_DIMENSIONS_EMPTY);
-
-	gtk_widget_size_request (GTK_WIDGET (gtk_widget), &requisition);
-
-	preferred_dimensions.width = (int) requisition.width;
-	preferred_dimensions.height = (int) requisition.height;
-
-	return preferred_dimensions;
-}
-
-/**
- * nautilus_gdk_window_clip_dirty_area_to_screen:
- * @gdk_window: The GdkWindow that the damage occured on.
- * @dirty_area: The dirty area as an ArtIRect.
- *
- * Return value: An ArtIRect of the dirty area clipped to the screen.
- *
- * This function is useful to do less work in expose_event() GtkWidget methods.
- * It also ensures that any drawing that the widget does is actually onscreen.
- */
-ArtIRect
-nautilus_gdk_window_clip_dirty_area_to_screen (const GdkWindow *gdk_window,
-					       const ArtIRect *dirty_area)
-{
-	ArtIRect clipped;
-	NautilusDimensions screen_dimensions;
-	ArtIRect bounds;
-	ArtIRect screen_relative_bounds;
-	int dirty_width;
-	int dirty_height;
-
-	g_return_val_if_fail (gdk_window != NULL, NAUTILUS_ART_IRECT_EMPTY);
-	g_return_val_if_fail (dirty_area != NULL, NAUTILUS_ART_IRECT_EMPTY);
-
-	dirty_width = dirty_area->x1 - dirty_area->x0;
-	dirty_height = dirty_area->y1 - dirty_area->y0;
-
-	g_return_val_if_fail (dirty_width > 0, NAUTILUS_ART_IRECT_EMPTY);
-	g_return_val_if_fail (dirty_height > 0, NAUTILUS_ART_IRECT_EMPTY);
-
-	screen_dimensions = nautilus_screen_get_dimensions ();
-	bounds = nautilus_gdk_window_get_bounds (gdk_window);
-	screen_relative_bounds = nautilus_gdk_window_get_screen_relative_bounds (gdk_window);
-	
-	/* Window is obscured by left edge of screen */
-	if ((screen_relative_bounds.x0 + dirty_area->x0) < 0) {
-		int clipped_width = screen_relative_bounds.x0 + dirty_area->x0 + dirty_width;
-		clipped.x0 = dirty_area->x0 + dirty_width - clipped_width;
-		clipped.x1 = clipped.x0 + clipped_width;
-	} else {
-		clipped.x0 = dirty_area->x0;
-		clipped.x1 = clipped.x0 + dirty_width;
-	}
-	
-	/* Window is obscured by right edge of screen */
-	if (screen_relative_bounds.x1 > screen_dimensions.width) {
- 		int obscured_width;
-		
-		obscured_width = 
-			screen_relative_bounds.x0 + dirty_area->x0 + dirty_width - screen_dimensions.width;
-		
-		if (obscured_width > 0) {
-			clipped.x1 -= obscured_width;
-		}
-	}
-
-	/* Window is obscured by top edge of screen */
-	if ((screen_relative_bounds.y0 + dirty_area->y0) < 0) {
-		int clipped_height = screen_relative_bounds.y0 + dirty_area->y0 + dirty_height;
-		clipped.y0 = dirty_area->y0 + dirty_height - clipped_height;
-		clipped.y1 = clipped.y0 + clipped_height;
-	} else {
-		clipped.y0 = dirty_area->y0;
-		clipped.y1 = clipped.y0 + dirty_height;
-	}
-	
-	/* Window is obscured by bottom edge of screen */
-	if (screen_relative_bounds.y1 > screen_dimensions.height) {
- 		int obscured_height;
-		
-		obscured_height = 
-			screen_relative_bounds.y0 + dirty_area->y0 + dirty_height - screen_dimensions.height;
-		
-		if (obscured_height > 0) {
-			clipped.y1 -= obscured_height;
-		}
-	}
-
-	if (art_irect_empty (&clipped)) {
-		clipped = NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	return clipped;
-}
-
-GdkRectangle
-nautilus_art_irect_to_gdk_rectangle (const ArtIRect *irect)
-{
-	GdkRectangle gdk_rect;
-
-	gdk_rect.x = 0;
-	gdk_rect.y = 0;
-	gdk_rect.width = 0;
-	gdk_rect.height = 0;
-
-	g_return_val_if_fail (irect != NULL, gdk_rect);
-
-	gdk_rect.x = irect->x0;
-	gdk_rect.y = irect->y0;
-	gdk_rect.width = nautilus_art_irect_get_width (irect);
-	gdk_rect.height = nautilus_art_irect_get_height (irect);
-
-	return gdk_rect;
-}
-
-NautilusDimensions
-nautilus_gdk_window_get_dimensions (const GdkWindow *gdk_window)
-{
-	NautilusDimensions dimensions;
-	
-	g_return_val_if_fail (gdk_window != NULL, NAUTILUS_DIMENSIONS_EMPTY);
-
-	gdk_window_get_size ((GdkWindow *) gdk_window, &dimensions.width, &dimensions.height);
-
-	return dimensions;
-}
-
diff --git a/libnautilus-private/nautilus-art-gtk-extensions.h b/libnautilus-private/nautilus-art-gtk-extensions.h
deleted file mode 100644
index 4081bef7a..000000000
--- a/libnautilus-private/nautilus-art-gtk-extensions.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-art-gtk-extensions.h - Access gtk/gdk attributes as libart rectangles.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-/* The following functions accept gtk/gdk structures and
- * return their bounds and dimensions, where:
- *
- * bounds: The (x,y) and (width, height) of something.
- * dimensions: The (width, height) of something.
- *
- * These are very useful in code that uses libart functions
- * to do operations on ArtIRects (such as intersection)
- */
-
-#ifndef NAUTILUS_ART_GTK_EXTENSIONS_H
-#define NAUTILUS_ART_GTK_EXTENSIONS_H
-
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-art-extensions.h>
-
-BEGIN_GNOME_DECLS
-
-/* Convert between GdkRectangle and ArtIRect and back */
-GdkRectangle       nautilus_art_irect_to_gdk_rectangle            (const ArtIRect     *irect);
-ArtIRect           nautilus_gdk_rectangle_to_art_irect            (const GdkRectangle *gdk_rectangle);
-NautilusDimensions nautilus_screen_get_dimensions                 (void);
-
-/* GdkWindow parent-relative bounds */
-ArtIRect           nautilus_gdk_window_get_bounds                 (const GdkWindow    *gdk_window);
-
-/* GdkWindow dimensions */
-NautilusDimensions nautilus_gdk_window_get_dimensions             (const GdkWindow    *gdk_window);
-
-/* GdkWindow screen parent-relative bounds */
-ArtIRect           nautilus_gdk_window_get_screen_relative_bounds (const GdkWindow    *gdk_window);
-
-/* Clip a dirty area (from exposures) to the on screen parts of a GdkWindow */
-ArtIRect           nautilus_gdk_window_clip_dirty_area_to_screen  (const GdkWindow    *gdk_window,
-								   const ArtIRect     *dirty_area);
-
-/* GtkWidget bounds and dimensions */
-ArtIRect           nautilus_gtk_widget_get_bounds                 (const GtkWidget    *gtk_widget);
-NautilusDimensions nautilus_gtk_widget_get_dimensions             (const GtkWidget    *gtk_widget);
-NautilusDimensions nautilus_gtk_widget_get_preferred_dimensions   (const GtkWidget    *gtk_widget);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_ART_GTK_EXTENSIONS_H */
diff --git a/libnautilus-private/nautilus-background-canvas-group.c b/libnautilus-private/nautilus-background-canvas-group.c
deleted file mode 100644
index f0d04b0d4..000000000
--- a/libnautilus-private/nautilus-background-canvas-group.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-background.c: Object for the background of a widget.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Darin Adler <darin@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-background-canvas-group.h"
-
-#include <libgnomeui/gnome-canvas.h>
-#include <libgnomeui/gnome-canvas-util.h>
-#include <libart_lgpl/art_rgb_affine.h>
-#include <libart_lgpl/art_rgb_rgba_affine.h>
-
-#include "nautilus-background.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gtk-macros.h"
-
-#include <stdio.h>
-
-static void nautilus_background_canvas_group_initialize_class (gpointer	klass);
-static void nautilus_background_canvas_group_initialize       (gpointer	object,
-															   gpointer         klass);
-
-static void nautilus_background_canvas_group_update (GnomeCanvasItem	*item,
-						     double		 affine[6],
-						     ArtSVP		*clip_path,
-						     gint		 flags);
-													 
-static void nautilus_background_canvas_group_draw (GnomeCanvasItem	*item,
-						   GdkDrawable		*drawable,
-						   int			 x,
-						   int			 y,
-						   int			 width,
-						   int			 height);
-static void nautilus_background_canvas_group_render (GnomeCanvasItem	*item,
-						     GnomeCanvasBuf	*buffer);
-
-
-typedef GnomeCanvasGroup NautilusBackgroundCanvasGroup;
-typedef GnomeCanvasGroupClass NautilusBackgroundCanvasGroupClass;
-
-#define NAUTILUS_TYPE_BACKGROUND_CANVAS_GROUP \
-	(nautilus_background_canvas_group_get_type ())
-#define NAUTILUS_BACKGROUND_CANVAS_GROUP(obj) \
-	(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_BACKGROUND_CANVAS_GROUP, NautilusBackgroundCanvasGroup))
-#define NAUTILUS_BACKGROUND_CANVAS_GROUP_CLASS(klass) \
-	(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_BACKGROUND_CANVAS_GROUP, NautilusBackgroundCanvasGroupClass))
-#define NAUTILUS_IS_BACKGROUND_CANVAS_GROUP(obj) \
-	(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_BACKGROUND_CANVAS_GROUP))
-#define NAUTILUS_IS_BACKGROUND_CANVAS_GROUP_CLASS(klass) \
-	(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_BACKGROUND_CANVAS_GROUP))
-
-GtkType nautilus_background_canvas_group_get_type (void);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusBackgroundCanvasGroup, nautilus_background_canvas_group, GNOME_TYPE_CANVAS_GROUP)
-
-static void
-nautilus_background_canvas_group_initialize_class (gpointer klass)
-{
-	GNOME_CANVAS_ITEM_CLASS (klass)->draw   = nautilus_background_canvas_group_draw;
-	GNOME_CANVAS_ITEM_CLASS (klass)->render = nautilus_background_canvas_group_render;
-	GNOME_CANVAS_ITEM_CLASS (klass)->update = nautilus_background_canvas_group_update;
-}
-
-/* This function is for initialization code that's needed both when we're allocating
- * a new NautilusBackgroundCanvasGroup object as well as when we're taking over an existing
- * GnomeCanvasGroup item (replacing its klass).
- */
-static void
-nautilus_background_canvas_group_initialize_common (NautilusBackgroundCanvasGroup *canvas_group)
-{
-#ifdef HAVE_GNOME_CANVAS_SET_DITHER
-	gnome_canvas_set_dither (GNOME_CANVAS_ITEM (canvas_group)->canvas, GDK_RGB_DITHER_MAX);
-#endif
-}
-
-static void
-nautilus_background_canvas_group_initialize (gpointer object, gpointer klass)
-{
-	/* The way we currently use nautilus_background_canvas_group, assigning
-	 * it to the klass of a root canvas object, circumvents this initialze fn.
-	 */
-	nautilus_background_canvas_group_initialize_common (NAUTILUS_BACKGROUND_CANVAS_GROUP (object));
-}
-
-
-void
-nautilus_background_canvas_group_supplant_root_class (GnomeCanvas *canvas)
-{
-	/* Attach ourselves to a canvas in a way that will work.
-	   Changing the style is not sufficient.
-
-	   Since there's no signal to override in GnomeCanvas to control
-	   drawing the background, we change the class of the canvas root.
-	   This gives us a chance to draw the background before any of the
-	   objects draw themselves, and has no effect on the bounds or
-	   anything related to scrolling.
-
-	   We settled on this after less-than-thrilling results using a
-	   canvas item as the background. The canvas item contributed to
-	   the bounds of the canvas and had to constantly be resized.
-	*/
-	
-	g_assert (GNOME_IS_CANVAS (canvas));
-	
-	if (GTK_OBJECT (canvas->root)->klass != gtk_type_class (NAUTILUS_TYPE_BACKGROUND_CANVAS_GROUP)) {
-	
-		g_assert (GTK_OBJECT (canvas->root)->klass == gtk_type_class (GNOME_TYPE_CANVAS_GROUP));
-	
-		GTK_OBJECT (canvas->root)->klass =
-			gtk_type_class (NAUTILUS_TYPE_BACKGROUND_CANVAS_GROUP);
-
-		nautilus_background_canvas_group_initialize_common (NAUTILUS_BACKGROUND_CANVAS_GROUP (canvas->root));
-	}
-}
-
-static void
-nautilus_background_canvas_group_update (GnomeCanvasItem *item,
-					 double affine[6],
-					 ArtSVP *clip_path,
-					 gint flags)
-{
-	NautilusBackground *background = nautilus_get_widget_background (GTK_WIDGET (item->canvas));
-
-	nautilus_background_pre_draw (background,
-				      GTK_WIDGET (item->canvas)->allocation.width,
-				      GTK_WIDGET (item->canvas)->allocation.height);
-
-	NAUTILUS_CALL_PARENT (GNOME_CANVAS_ITEM_CLASS, update, (item, affine, clip_path, flags));				     
-}
-
-static void
-nautilus_background_canvas_group_draw (GnomeCanvasItem *item,
-				       GdkDrawable *drawable,
-				       int x,
-				       int y,
-				       int width,
-				       int height)
-{
-	NautilusBackground *background;
-	GdkGC *gc;
-
-	/* Draw the background. */
-	background = nautilus_get_widget_background (GTK_WIDGET (item->canvas));
-
-	/* If GtkStyle handled it, then we don't want to bother doing
-	 * any additional work. It would be way slow to draw again.
-	 */
-	if (nautilus_background_is_too_complex_for_gtk_style (background)) {
-		/* Create a new gc each time.
-		 * If this is a speed problem, we can create one and keep it around,
-		 * but it's a bit more complicated to ensure that it's always compatible
-		 * with whatever drawable is passed in.
-		 */
-		gc = gdk_gc_new (drawable);
-
-		/* FIXME bugzilla.eazel.com 5349:
-		 * It shouldn't be necessary to call nautilus_background_pre_draw here.
-		 * However, nautilus_background_canvas_group_update (who should be the one
-		 * spot we call nautilus_background_pre_draw from) doesn't seemed to get
-		 * called prior to all drawing.
-		 */
-		nautilus_background_pre_draw (background,
-					      GTK_WIDGET (item->canvas)->allocation.width,
-					      GTK_WIDGET (item->canvas)->allocation.height);
-
-		nautilus_background_draw (background, drawable, gc, x, y, width, height);
-
-		gdk_gc_unref (gc);
-	}
-
-	/* Call through to the GnomeCanvasGroup implementation, which
-	 * will draw all the canvas items.
-	 */
-	NAUTILUS_CALL_PARENT (GNOME_CANVAS_ITEM_CLASS, draw, (item, drawable, x, y, width, height));				     
-}
-
-
-/* draw the background for the anti-aliased canvas case */
-static void
-nautilus_background_canvas_group_render (GnomeCanvasItem *item, GnomeCanvasBuf *buffer)
-{
-	NautilusBackground *background;
-			
-	background = nautilus_get_widget_background (GTK_WIDGET (item->canvas));
-	if (background != NULL) {
-		/* FIXME bugzilla.eazel.com 5349:
-		 * It shouldn't be necessary to call nautilus_background_pre_draw here.
-		 * However, nautilus_background_canvas_group_update (who should be the one
-		 * spot we call nautilus_background_pre_draw from) doesn't seemed to get
-		 * called prior to all drawing.
-		 */
-		nautilus_background_pre_draw (background,
-					      GTK_WIDGET (item->canvas)->allocation.width,
-					      GTK_WIDGET (item->canvas)->allocation.height);
-
-		nautilus_background_draw_aa (background, buffer);
-	}
-	
-	/* Call through to the GnomeCanvasGroup implementation, which will draw all
-	 * the canvas items.
-	 */
-	NAUTILUS_CALL_PARENT (GNOME_CANVAS_ITEM_CLASS, render, (item, buffer));
-}
diff --git a/libnautilus-private/nautilus-background-canvas-group.h b/libnautilus-private/nautilus-background-canvas-group.h
deleted file mode 100644
index e22ccc471..000000000
--- a/libnautilus-private/nautilus-background-canvas-group.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-background-canvas-group.h: Class used internally by
-   NautilusBackground to add a background to a canvas.
-
-   Copyright (C) 2000 Eazel, Inc.
-   
-   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.
-  
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#ifndef NAUTILUS_BACKGROUND_CANVAS_GROUP_H
-#define NAUTILUS_BACKGROUND_CANVAS_GROUP_H
-
-#include <libgnomeui/gnome-canvas.h>
-
-/* nautilus_background_canvas_group_supplant_root_class is used internally by
-   NautilusBackground to change the class of a canvas in order to customize its
-   background drawing. The reason we have to change the class of a canvas group is
-   that the cleanest way to hook into the code that erases the canvas is to be the
-   root canvas group. But the canvas class creates the root object and doesn't allow
-   it to be destroyed, so we change the class of the root object in place.
-
-   A future version of GnomeCanvas may allow a nicer way of hooking in to the code
-   obviating this fn.
-
-   This fn is private to NautilusBackground.
-*/
-
-void nautilus_background_canvas_group_supplant_root_class (GnomeCanvas *canvas);
-
-#endif /* NAUTILUS_BACKGROUND_CANVAS_GROUP_H */
diff --git a/libnautilus-private/nautilus-background.c b/libnautilus-private/nautilus-background.c
deleted file mode 100644
index 4a86087e6..000000000
--- a/libnautilus-private/nautilus-background.c
+++ /dev/null
@@ -1,1310 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-background.c: Object for the background of a widget.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Darin Adler <darin@eazel.com>
-*/
-
-#include <config.h>
-#include <ctype.h>
-
-#include "nautilus-background.h"
-
-#include <math.h>
-
-#include <stdio.h>
-#include "nautilus-glib-extensions.h"
-
-#include <gtk/gtksignal.h>
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-gnome-extensions.h"
-#include "nautilus-background-canvas-group.h"
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-string.h"
-
-#include <libgnomeui/gnome-canvas.h>
-#include <libgnomeui/gnome-canvas-util.h>
-
-#include <libart_lgpl/art_rgb.h>
-
-static void nautilus_background_initialize_class (gpointer            klass);
-static void nautilus_background_initialize       (gpointer            object,
-						  gpointer            klass);
-static void nautilus_background_destroy          (GtkObject          *object);
-static void nautilus_background_draw_flat_box    (GtkStyle           *style,
-						  GdkWindow          *window,
-						  GtkStateType        state_type,
-						  GtkShadowType       shadow_type,
-						  GdkRectangle       *area,
-						  GtkWidget          *widget,
-						  char               *detail,
-						  int                 x,
-						  int                 y,
-						  int                 width,
-						  int                 height);
-static void nautilus_background_start_loading_image (NautilusBackground *background, gboolean emit_appearance_change);
-static gboolean nautilus_background_is_image_load_in_progress (NautilusBackground *background);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusBackground, nautilus_background, GTK_TYPE_OBJECT)
-
-enum {
-	APPEARANCE_CHANGED,
-	SETTINGS_CHANGED,
-	IMAGE_LOADING_DONE,
-	RESET,
-	LAST_SIGNAL
-};
-
-#define	RESET_BACKGROUND_MAGIC_IMAGE_NAME "reset.png"
-
-static guint signals[LAST_SIGNAL];
-
-struct NautilusBackgroundDetails {
-	char *color;
-	
-	int gradient_num_pixels;
-	guchar *gradient_buffer;
-	gboolean gradient_is_horizontal;
-
-	gboolean is_solid_color;
-	GdkColor solid_color;
-	
-	char *image_uri;
-	GdkPixbuf *image;
-	int image_width_unscaled;
-	int image_height_unscaled;
-	NautilusPixbufLoadHandle *load_image_handle;
-	gboolean emit_after_load;
-	NautilusBackgroundImagePlacement image_placement;
-
-	/* The image_rect is the area (canvas relative) the image will cover.
-	 * Note: image_rect_width/height are not always the same as the image's
-	 * width and height - e.g. if the image is tiled the image rect covers
-	 * the whole background.
-	 */
-	int image_rect_x;
-	int image_rect_y;
-	int image_rect_width;
-	int image_rect_height;
-};
-
-static void
-nautilus_background_initialize_class (gpointer klass)
-{
-	GtkObjectClass *object_class;
-	NautilusBackgroundClass *background_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	background_class = NAUTILUS_BACKGROUND_CLASS (klass);
-
-	signals[APPEARANCE_CHANGED] =
-		gtk_signal_new ("appearance_changed",
-				GTK_RUN_LAST | GTK_RUN_NO_RECURSE,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (NautilusBackgroundClass,
-						   appearance_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE,
-				0);
-	signals[SETTINGS_CHANGED] =
-		gtk_signal_new ("settings_changed",
-				GTK_RUN_LAST | GTK_RUN_NO_RECURSE,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (NautilusBackgroundClass,
-						   settings_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE,
-				0);
-	signals[IMAGE_LOADING_DONE] =
-		gtk_signal_new ("image_loading_done",
-				GTK_RUN_LAST | GTK_RUN_NO_RECURSE,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (NautilusBackgroundClass,
-						   image_loading_done),
-				gtk_marshal_NONE__BOOL,
-				GTK_TYPE_NONE,
-				1,
-				GTK_TYPE_BOOL);
-	signals[RESET] =
-		gtk_signal_new ("reset",
-				GTK_RUN_LAST | GTK_RUN_NO_RECURSE,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (NautilusBackgroundClass,
-						   reset),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE,
-				0);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	object_class->destroy = nautilus_background_destroy;
-}
-
-static void
-nautilus_background_initialize (gpointer object, gpointer klass)
-{
-	NautilusBackground *background;
-
-	background = NAUTILUS_BACKGROUND(object);
-
-	background->details = g_new0 (NautilusBackgroundDetails, 1);
-}
-
-/* The safe way to clear an image from a background is:
- * 		nautilus_background_set_image_uri (NULL);
- * This fn is a private utility - it does NOT clear
- * the details->image_uri setting.
- */
-static void
-nautilus_background_remove_current_image (NautilusBackground *background)
-{
-	if (background->details->image != NULL) {
-		gdk_pixbuf_unref (background->details->image);
-		background->details->image = NULL;
-	}
-}
-
-static void
-nautilus_background_destroy (GtkObject *object)
-{
-	NautilusBackground *background;
-
-	background = NAUTILUS_BACKGROUND (object);
-
-	nautilus_cancel_gdk_pixbuf_load (background->details->load_image_handle);
-	background->details->load_image_handle = NULL;
-
-	g_free (background->details->color);
-	g_free (background->details->gradient_buffer);
-	g_free (background->details->image_uri);
-	nautilus_background_remove_current_image (background);
-	g_free (background->details);
-
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-NautilusBackgroundImagePlacement
-nautilus_background_get_image_placement (NautilusBackground *background)
-{
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), NAUTILUS_BACKGROUND_TILED);
-
-	return background->details->image_placement;
-}
-
-static gboolean
-nautilus_background_set_image_placement_no_emit (NautilusBackground *background,
-						 NautilusBackgroundImagePlacement new_placement)
-{
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), FALSE);
-
-	if (new_placement != background->details->image_placement) {
-
-		if (nautilus_background_is_image_load_in_progress (background)) {
-			/* We try to be smart and keep using the current image for updates
-			 * while a new image is loading. However, changing the placement
-			 * foils these plans.
-			 */
-			nautilus_background_remove_current_image (background);
-		}
-
-		background->details->image_placement = new_placement;
-		return TRUE;
-	} else {
-		return FALSE;
-	}
-}
-
-void
-nautilus_background_set_image_placement (NautilusBackground *background,
-					 NautilusBackgroundImagePlacement new_placement)
-{
-	if (nautilus_background_set_image_placement_no_emit (background, new_placement)) {
-		gtk_signal_emit (GTK_OBJECT (background),
-			 signals[SETTINGS_CHANGED]);
-		gtk_signal_emit (GTK_OBJECT (background),
-			 signals[APPEARANCE_CHANGED]);
-	}
-}
-
-NautilusBackground *
-nautilus_background_new (void)
-{
-	return NAUTILUS_BACKGROUND (gtk_object_new (NAUTILUS_TYPE_BACKGROUND, NULL));
-}
- 
-static void
-reset_cached_color_info (NautilusBackground *background)
-{
-	background->details->gradient_num_pixels = 0;
-	
-	background->details->is_solid_color = !nautilus_gradient_is_gradient (background->details->color);
-	
-	if (background->details->is_solid_color) {
-		g_free (background->details->gradient_buffer);
-		background->details->gradient_buffer = NULL;
-		nautilus_gdk_color_parse_with_white_default (background->details->color, &background->details->solid_color);
-	} else {
-		/* If color is still a gradient, don't g_free the buffer, nautilus_background_ensure_gradient_buffered
-		 * uses g_realloc to try to reuse it.
-		 */
-		background->details->gradient_is_horizontal = nautilus_gradient_is_horizontal (background->details->color);
-	}
-}
-
-static void
-nautilus_background_ensure_gradient_buffered (NautilusBackground *background, int dest_width, int dest_height)
-{
-	int num_pixels;
-
-	guchar *buff_ptr;
-	guchar *buff_limit;
-
-	GdkColor cur_color;
-
-	char* color_spec;
-	const char* spec_ptr;
-
-	if (background->details->is_solid_color) {
-		return;
-	}
-
-	num_pixels = background->details->gradient_is_horizontal ? dest_width : dest_height;
-
-	if (background->details->gradient_num_pixels == num_pixels) {
-		return;
-	}
-
-	background->details->gradient_num_pixels = num_pixels;
-	background->details->gradient_buffer = g_realloc (background->details->gradient_buffer, num_pixels * 3);
-	
-	buff_ptr   = background->details->gradient_buffer;
-	buff_limit = background->details->gradient_buffer + num_pixels * 3;
-
-	spec_ptr = background->details->color;
-	
-	color_spec = nautilus_gradient_parse_one_color_spec (spec_ptr, NULL, &spec_ptr);
-	nautilus_gdk_color_parse_with_white_default (color_spec, &cur_color);
-	g_free (color_spec);
-
-	while (spec_ptr != NULL && buff_ptr < buff_limit) {
-		int percent;
-		int fill_pos;
-		int fill_width;
-		int dr, dg, db;
-		guchar *fill_limit;
-		GdkColor new_color;
-	
-		color_spec = nautilus_gradient_parse_one_color_spec (spec_ptr, &percent, &spec_ptr);
-		nautilus_gdk_color_parse_with_white_default (color_spec, &new_color);
-		g_free (color_spec);
-
-		dr = new_color.red   - cur_color.red;
-		dg = new_color.green - cur_color.green;
-		db = new_color.blue  - cur_color.blue;
-
-		fill_pos   = 1;
-		fill_limit = MIN (background->details->gradient_buffer + 3 * ((num_pixels * percent) / 100), buff_limit);
-		fill_width = (fill_limit - buff_ptr) / 3;
-		
-		while (buff_ptr < fill_limit) {
-			*buff_ptr++ = (cur_color.red   + (dr * fill_pos) / fill_width) >> 8;
-			*buff_ptr++ = (cur_color.green + (dg * fill_pos) / fill_width) >> 8;
-			*buff_ptr++ = (cur_color.blue  + (db * fill_pos) / fill_width) >> 8;
-			++fill_pos;
-		}
-		cur_color = new_color;
-	}
-
-	/* fill in the remainder */
-	art_rgb_fill_run (buff_ptr, cur_color.red, cur_color.green, cur_color.blue, (buff_limit - buff_ptr) / 3);	
-}
-
-static void
-canvas_gradient_helper_v (const GnomeCanvasBuf *buf, const art_u8 *gradient_buff)
-{
-	int width  = buf->rect.x1 - buf->rect.x0;
-	int height = buf->rect.y1 - buf->rect.y0;
-
-	art_u8 *dst       = buf->buf;
-	art_u8 *dst_limit = buf->buf + height * buf->buf_rowstride;
-
-	gradient_buff += buf->rect.y0 * 3;
-	
-	while (dst < dst_limit) {
-		art_u8 r = *gradient_buff++;
-		art_u8 g = *gradient_buff++;
-		art_u8 b = *gradient_buff++;
- 		art_rgb_fill_run (dst, r, g, b, width);
-		dst += buf->buf_rowstride;
-	}
-}
-
-static void
-canvas_gradient_helper_h (const GnomeCanvasBuf *buf, const art_u8 *gradient_buff)
-{
-	int width  = buf->rect.x1 - buf->rect.x0;
-	int height = buf->rect.y1 - buf->rect.y0;
-
-	art_u8 *dst       = buf->buf;
-	art_u8 *dst_limit = buf->buf + height * buf->buf_rowstride;
-
-	int copy_bytes_per_row = width * 3;
-
-	gradient_buff += buf->rect.x0 * 3;
-	
-	while (dst < dst_limit) {
- 		memcpy (dst, gradient_buff, copy_bytes_per_row);
-		dst += buf->buf_rowstride;
-	}
-}
-
-static void
-fill_canvas_from_gradient_buffer (const GnomeCanvasBuf *buf, const NautilusBackground *background)
-{
-	g_return_if_fail (background->details->gradient_buffer != NULL);
-
-	/* FIXME bugzilla.eazel.com 4876: This hack is needed till we fix background
-	 * scolling.
-	 *
-	 * I.e. currently you can scroll off the end of the gradient - and we
-	 * handle this by pegging it the the last rgb value.
-	 *
-	 * It might be needed permanently after depending on how this is fixed.
-	 * If we tie gradients to the boundry of icon placement (as opposed to
-	 * window size) then when dragging an icon you might scroll off the
-	 * end of the gradient - which will get recaluated after the drop.
-	 */
-	if (background->details->gradient_is_horizontal) {
-		if (buf->rect.x1 > background->details->gradient_num_pixels) {
-			art_u8 *rgb888 = background->details->gradient_buffer + (background->details->gradient_num_pixels - 1) * 3;
-			GnomeCanvasBuf gradient = *buf;
-			GnomeCanvasBuf overflow = *buf;
-			gradient.rect.x1 =  gradient.rect.x0 < background->details->gradient_num_pixels ? background->details->gradient_num_pixels : gradient.rect.x0;
-			overflow.buf += (gradient.rect.x1 - gradient.rect.x0) * 3;
-			overflow.rect.x0 = gradient.rect.x1;
-			nautilus_gnome_canvas_fill_rgb (&overflow, rgb888[0], rgb888[1], rgb888[2]);
-			canvas_gradient_helper_h (&gradient, background->details->gradient_buffer);
-			return;
-		}
-	} else {
-		if (buf->rect.y1 > background->details->gradient_num_pixels) {
-			art_u8 *rgb888 = background->details->gradient_buffer + (background->details->gradient_num_pixels - 1) * 3;
-			GnomeCanvasBuf gradient = *buf;
-			GnomeCanvasBuf overflow = *buf;
-			gradient.rect.y1 = gradient.rect.y0 < background->details->gradient_num_pixels ? background->details->gradient_num_pixels : gradient.rect.y0;
-			overflow.buf += (gradient.rect.y1 - gradient.rect.y0) * gradient.buf_rowstride;
-			overflow.rect.y0 = gradient.rect.y1;
-			nautilus_gnome_canvas_fill_rgb (&overflow, rgb888[0], rgb888[1], rgb888[2]);
-			canvas_gradient_helper_v (&gradient, background->details->gradient_buffer);
-			return;
-		}
-	}
-
-	(background->details->gradient_is_horizontal ? canvas_gradient_helper_h : canvas_gradient_helper_v) (buf, background->details->gradient_buffer);
-}
-
-/* Initializes a pseudo-canvas buf so canvas drawing routines can be used to draw into a pixbuf.
- */
-static void
-canvas_buf_from_pixbuf (GnomeCanvasBuf* buf, GdkPixbuf *pixbuf, int x, int y, int width, int height)
-{
-	buf->buf =  gdk_pixbuf_get_pixels (pixbuf);
-	buf->buf_rowstride =  gdk_pixbuf_get_rowstride (pixbuf);
-	buf->rect.x0 = x;
-	buf->rect.y0 = y;
-	buf->rect.x1 = x + width;
-	buf->rect.y1 = y + height;
-	buf->bg_color = 0xFFFFFFFF;
-	buf->is_bg = TRUE;
-	buf->is_buf = FALSE;
-}
-
-static gboolean
-nautilus_background_image_totally_obscures (NautilusBackground *background)
-{
-	if (background->details->image == NULL || gdk_pixbuf_get_has_alpha (background->details->image)) {
-		return FALSE;
-	}
-
-	switch (background->details->image_placement) {
-	case NAUTILUS_BACKGROUND_TILED:
-	case NAUTILUS_BACKGROUND_SCALED:
-		return TRUE;
-	default:
-		g_assert_not_reached ();
-		/* fall through */
-	case NAUTILUS_BACKGROUND_CENTERED:
-	case NAUTILUS_BACKGROUND_SCALED_ASPECT:
-		/* It's possible that the image totally obscures in this case, but we don't
-		 * have enough info to know. So we guess conservatively.
-		 */
-		return FALSE;
-	}
-}
-
-static void
-nautilus_background_ensure_image_scaled (NautilusBackground *background, int dest_width, int dest_height)
-{
-	if (background->details->image == NULL) {
-		background->details->image_rect_x = 0;
-		background->details->image_rect_y = 0;
-		background->details->image_rect_width = 0;
-		background->details->image_rect_height = 0;
-	} else if (!nautilus_background_is_image_load_in_progress (background)){
-		int image_width;
-		int image_height;
-		int fit_width;
-		int fit_height;
-		gboolean cur_scaled;
-		gboolean reload_image;
-		GdkPixbuf *scaled_pixbuf;
-
-		image_width = gdk_pixbuf_get_width (background->details->image);
-		image_height = gdk_pixbuf_get_height (background->details->image);
-		cur_scaled = image_width != background->details->image_width_unscaled ||
-			     image_height != background->details->image_height_unscaled;
-		reload_image = FALSE;
-		scaled_pixbuf = NULL;
-	
-		switch (background->details->image_placement) {
-		case NAUTILUS_BACKGROUND_TILED:
-		case NAUTILUS_BACKGROUND_CENTERED:
-			reload_image = cur_scaled;
-			break;
-		case NAUTILUS_BACKGROUND_SCALED:
-			if (image_width != dest_width || image_height != dest_height) {
-				if (cur_scaled) {
-					reload_image = TRUE;
-				} else {
-					scaled_pixbuf = gdk_pixbuf_scale_simple (background->details->image, dest_width, dest_height, GDK_INTERP_BILINEAR);
-					gdk_pixbuf_unref (background->details->image);
-					background->details->image = scaled_pixbuf;
-					image_width = gdk_pixbuf_get_width (scaled_pixbuf);
-					image_height = gdk_pixbuf_get_height (scaled_pixbuf);
-				}
-			}
-			break;
-		case NAUTILUS_BACKGROUND_SCALED_ASPECT:
-			nautilus_gdk_scale_to_fit_factor (background->details->image_width_unscaled,
-							  background->details->image_height_unscaled,
-							  dest_width, dest_height,
-							  &fit_width, &fit_height);
-			if (image_width != fit_width || image_height != fit_height) {
-				if (cur_scaled) {
-					reload_image = TRUE;
-				} else {
-					scaled_pixbuf = nautilus_gdk_pixbuf_scale_to_fit (background->details->image, dest_width, dest_height);
-					gdk_pixbuf_unref (background->details->image);
-					background->details->image = scaled_pixbuf;
-					image_width = gdk_pixbuf_get_width (scaled_pixbuf);
-					image_height = gdk_pixbuf_get_height (scaled_pixbuf);
-				}
-			}
-			break;
-		}
-
-		if (reload_image) {
-			gdk_pixbuf_unref (background->details->image);
-			background->details->image = NULL;
-			nautilus_background_start_loading_image (background, TRUE);
-			background->details->image_rect_x = 0;
-			background->details->image_rect_y = 0;
-			background->details->image_rect_width = 0;
-			background->details->image_rect_height = 0;
-		} else if (background->details->image_placement == NAUTILUS_BACKGROUND_TILED) {
-			background->details->image_rect_x = 0;
-			background->details->image_rect_y = 0;
-			background->details->image_rect_width = dest_width;
-			background->details->image_rect_height = dest_height;
-		} else {
-			background->details->image_rect_x = (dest_width - image_width) / 2;
-			background->details->image_rect_y = (dest_height - image_height) / 2;
-			background->details->image_rect_width = image_width;
-			background->details->image_rect_height = image_height;
-		}
-	}
-}
-
-void
-nautilus_background_pre_draw (NautilusBackground *background, int entire_width, int entire_height)
-{
-	nautilus_background_ensure_image_scaled (background, entire_width, entire_height);
-	nautilus_background_ensure_gradient_buffered (background, entire_width, entire_height);
-}
-
-void
-nautilus_background_draw (NautilusBackground *background,
-			  GdkDrawable *drawable, GdkGC *gc,
-			  int drawable_x, int drawable_y,
-			  int drawable_width, int drawable_height)
-{
-	int x, y;
-	int x_canvas, y_canvas;
-	int width, height;
-	
-	GnomeCanvasBuf buffer;
-	GdkPixbuf *pixbuf;
-
-	/* Non-aa background drawing is done by faking up a GnomeCanvasBuf
-	 * and passing it to the aa code.
-	 *
-	 * The width and height were chosen to match those used by gnome-canvas
-	 * (IMAGE_WIDTH_AA & IMAGE_HEIGHT_AA  in gnome-libs/libgnomeui/gnome-canvas.c)
-	 * They're not required to match - so this could be changed if necessary.
-	 */
-	static const int PIXBUF_WIDTH = 256;
-	static const int PIXBUF_HEIGHT = 64;
-
-	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, PIXBUF_WIDTH, PIXBUF_HEIGHT);
-
-	/* x & y are relative to the drawable
-	 */
-	for (y = 0; y < drawable_height; y += PIXBUF_HEIGHT) {
-		for (x = 0; x < drawable_width; x += PIXBUF_WIDTH) {
-
-			width = MIN (drawable_width - x, PIXBUF_WIDTH);
-			height = MIN (drawable_height - y, PIXBUF_HEIGHT);
-
-			x_canvas = drawable_x + x;
-			y_canvas = drawable_y + y;
-
-			canvas_buf_from_pixbuf (&buffer, pixbuf, x_canvas, y_canvas, width, height);
-			nautilus_background_draw_aa (background, &buffer);
-			gdk_pixbuf_render_to_drawable (pixbuf, drawable, gc,
-						       0, 0,
-						       x, y,
-						       width, height,
-						       GDK_RGB_DITHER_MAX, x_canvas, y_canvas);
-		}
-	}
-	
-	gdk_pixbuf_unref (pixbuf);
-}
-
-void
-nautilus_background_draw_to_drawable (NautilusBackground *background,
-				      GdkDrawable *drawable, GdkGC *gc,
-				      int drawable_x, int drawable_y,
-				      int drawable_width, int drawable_height,
-				      int entire_width, int entire_height)
-{
-	nautilus_background_pre_draw (background, entire_width, entire_height);
-	nautilus_background_draw (background, drawable, gc, drawable_x, drawable_y, drawable_width, drawable_height);
-}
-
-void
-nautilus_background_draw_to_pixbuf (NautilusBackground *background,
-				    GdkPixbuf *pixbuf,
-				    int pixbuf_x,
-				    int pixbuf_y,
-				    int pixbuf_width,
-				    int pixbuf_height,
-				    int entire_width,
-				    int entire_height)
-{
-	GnomeCanvasBuf fake_buffer;
-
-	g_return_if_fail (background != NULL);
-	g_return_if_fail (pixbuf != NULL);
-
-	canvas_buf_from_pixbuf (&fake_buffer, pixbuf, pixbuf_x, pixbuf_y, pixbuf_width, pixbuf_height);
-
-	nautilus_background_draw_to_canvas (background,
-					    &fake_buffer,
-					    entire_width,
-					    entire_height);
-}
-
-/* fill the canvas buffer with a tiled pixbuf */
-static void
-draw_pixbuf_tiled_aa (GdkPixbuf *pixbuf, GnomeCanvasBuf *buffer)
-{
-	int x, y;
-	int start_x, start_y;
-	int tile_width, tile_height;
-	
-	tile_width = gdk_pixbuf_get_width (pixbuf);
-	tile_height = gdk_pixbuf_get_height (pixbuf);
-	
-	start_x = buffer->rect.x0 - (buffer->rect.x0 % tile_width);
-	start_y = buffer->rect.y0 - (buffer->rect.y0 % tile_height);
-
-	for (y = start_y; y < buffer->rect.y1; y += tile_height) {
-		for (x = start_x; x < buffer->rect.x1; x += tile_width) {
-			nautilus_gnome_canvas_draw_pixbuf (buffer, pixbuf, x, y);
-		}
-	}
-}
-
-/* draw the background on the anti-aliased canvas */
-void
-nautilus_background_draw_aa (NautilusBackground *background, GnomeCanvasBuf *buffer)
-{	
-	g_return_if_fail (NAUTILUS_IS_BACKGROUND (background));
-
-	/* If the image has alpha - we always draw the gradient behind it.
-	 * In principle, we could do better by having already drawn gradient behind
-	 * the scaled image. However, this would add a significant amount of
-	 * complexity to our image scaling/caching logic. I.e. it would tie the
-	 * scaled image to a location on the screen because it holds a gradient.
-	 * This is especially problematic for tiled images with alpha.
-	 */
-	if (!background->details->image ||
-	     gdk_pixbuf_get_has_alpha (background->details->image) ||
-	     buffer->rect.x0  < background->details->image_rect_x ||
-	     buffer->rect.y0  < background->details->image_rect_y ||
-	     buffer->rect.x1  > (background->details->image_rect_x + background->details->image_rect_width) ||
-	     buffer->rect.y1  > (background->details->image_rect_y + background->details->image_rect_height)) {
-		if (background->details->is_solid_color) {
-			nautilus_gnome_canvas_fill_rgb (buffer,
-							background->details->solid_color.red >> 8,
-							background->details->solid_color.green >> 8,
-							background->details->solid_color.blue >> 8);
-		} else {
-			fill_canvas_from_gradient_buffer (buffer, background);
-		}
-	}
-
-	if (background->details->image != NULL) {
-		switch (background->details->image_placement) {
-		case NAUTILUS_BACKGROUND_TILED:
-			draw_pixbuf_tiled_aa (background->details->image, buffer);
-			break;
-		default:
-			g_assert_not_reached ();
-			/* fall through */
-		case NAUTILUS_BACKGROUND_CENTERED:
-		case NAUTILUS_BACKGROUND_SCALED:
-		case NAUTILUS_BACKGROUND_SCALED_ASPECT:
-			/* Since the image has already been scaled, all these cases
-			 * can be treated identically.
-			 */
-			nautilus_gnome_canvas_draw_pixbuf (buffer,
-							   background->details->image,
-							   background->details->image_rect_x,
-							   background->details->image_rect_y);
-			break;
-		}
-	}
-					
-	buffer->is_bg  = FALSE;
-	buffer->is_buf = TRUE;
-}
-
-void
-nautilus_background_draw_to_canvas (NautilusBackground *background,
-				    GnomeCanvasBuf *buffer,
-				    int entire_width,
-				    int entire_height)
-{
-	nautilus_background_pre_draw (background, entire_width, entire_height);
-	nautilus_background_draw_aa (background, buffer);
-}
-
-char *
-nautilus_background_get_color (NautilusBackground *background)
-{
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), NULL);
-
-	return g_strdup (background->details->color);
-}
-
-char *
-nautilus_background_get_image_uri (NautilusBackground *background)
-{
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), NULL);
-
-	return g_strdup (background->details->image_uri);
-}
-
-static gboolean
-nautilus_background_set_color_no_emit (NautilusBackground *background,
-			       const char *color)
-{
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), FALSE);
-
-	if (nautilus_strcmp (background->details->color, color) == 0) {
-		return FALSE;
-	}
-	g_free (background->details->color);
-	background->details->color = g_strdup (color);
-	reset_cached_color_info (background);
-
-	return TRUE;
-}
-
-void
-nautilus_background_set_color (NautilusBackground *background,
-			       const char *color)
-{
-	if (nautilus_background_set_color_no_emit (background, color)) {
-		gtk_signal_emit (GTK_OBJECT (background), signals[SETTINGS_CHANGED]);
-		if (!nautilus_background_image_totally_obscures (background)) {
-			gtk_signal_emit (GTK_OBJECT (background), signals[APPEARANCE_CHANGED]);
-		}
-	}
-}
-
-static void
-nautilus_background_load_image_callback (GnomeVFSResult error,
-					 GdkPixbuf *pixbuf,
-					 gpointer callback_data)
-{
-	NautilusBackground *background;
-
-	background = NAUTILUS_BACKGROUND (callback_data);
-
-	background->details->load_image_handle = NULL;
-
-	nautilus_background_remove_current_image (background);
-
-	/* Just ignore errors. */
-	if (pixbuf != NULL) {
-		gdk_pixbuf_ref (pixbuf);
-		background->details->image = pixbuf;
-		background->details->image_width_unscaled = gdk_pixbuf_get_width (pixbuf);
-		background->details->image_height_unscaled = gdk_pixbuf_get_height (pixbuf);
-	}
-
-	gtk_signal_emit (GTK_OBJECT (background), signals[IMAGE_LOADING_DONE], pixbuf != NULL || background->details->image_uri == NULL);
-
-	if (background->details->emit_after_load) {
-		gtk_signal_emit (GTK_OBJECT (background), signals[APPEARANCE_CHANGED]);
-	}
-}
-
-static gboolean
-nautilus_background_is_image_load_in_progress (NautilusBackground *background)
-{
-	return background->details->load_image_handle != NULL;
-}
-
-static void
-nautilus_background_cancel_loading_image (NautilusBackground *background)
-{
-	if (nautilus_background_is_image_load_in_progress (background)) {
-		nautilus_cancel_gdk_pixbuf_load (background->details->load_image_handle);
-		background->details->load_image_handle = NULL;
-		gtk_signal_emit (GTK_OBJECT (background), signals[IMAGE_LOADING_DONE], FALSE);
-	}
-}
-
-static void
-nautilus_background_start_loading_image (NautilusBackground *background, gboolean emit_appearance_change)
-{
-	background->details->emit_after_load = emit_appearance_change;
-
-	if (background->details->image_uri != NULL) {
-		background->details->load_image_handle = nautilus_gdk_pixbuf_load_async (background->details->image_uri,
-											 nautilus_background_load_image_callback,
-											 background);
-	} else {
-		nautilus_background_load_image_callback (0, NULL, background);
-	}
-}
-
-static gboolean
-nautilus_background_set_image_uri_helper (NautilusBackground *background,
-					const char *image_uri,
-					gboolean emit_setting_change,
-					gboolean emit_appearance_change)
-{
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), FALSE);
-
-	if (nautilus_strcmp (background->details->image_uri, image_uri) == 0) {
-		return FALSE;
-	}
-
-	nautilus_background_cancel_loading_image (background);
-	
-	g_free (background->details->image_uri);
-	background->details->image_uri = g_strdup (image_uri);
-
-	/* We do not get rid of the current image here. This gets done after the new
-	 * image loads - in nautilus_background_load_image_callback. This way the
-	 * current image can be used if an update is needed before the load completes.
-	 */
-	
-	nautilus_background_start_loading_image (background, emit_appearance_change);
-
-	if (emit_setting_change) {
-		gtk_signal_emit (GTK_OBJECT (background), signals[SETTINGS_CHANGED]);
-	}
-
-	return TRUE;
-}
-
-void
-nautilus_background_set_image_uri (NautilusBackground *background, const char *image_uri)
-{
-	nautilus_background_set_image_uri_helper (background, image_uri, TRUE, TRUE);
-}
-
-static void
-set_image_and_color_image_loading_done_callback (NautilusBackground *background, gboolean successful_load, char *color)
-{
-	gtk_signal_disconnect_by_func (GTK_OBJECT (background), GTK_SIGNAL_FUNC (set_image_and_color_image_loading_done_callback), (gpointer) color);
-
-	nautilus_background_set_color_no_emit (background, color);
-
-	g_free (color);
-	
-	/* We always emit , even if the color didn't change, because the image change
-	 * relies on us doing it here.
-	 */
-	gtk_signal_emit (GTK_OBJECT (background), signals[SETTINGS_CHANGED]);
-	gtk_signal_emit (GTK_OBJECT (background), signals[APPEARANCE_CHANGED]);
-}
-
-/* Use this fn to set both the image and color and avoid flash. The color isn't
- * changed till after the image is done loading, that way if an update occurs
- * before then, it will use the old color and image.
- */
-static void
-nautilus_background_set_image_uri_and_color (NautilusBackground *background, const char *image_uri, const char *color)
-{
-	char *color_copy;
-
-	if (nautilus_strcmp (background->details->color, color) == 0 &&
-	    nautilus_strcmp (background->details->image_uri, image_uri) == 0) {
-		return;
-	}
-
-	color_copy = g_strdup (color);
-
-	gtk_signal_connect (GTK_OBJECT (background),
-			    "image_loading_done",
-			    GTK_SIGNAL_FUNC (set_image_and_color_image_loading_done_callback),
-			    (gpointer) color_copy);
-			    
-	/* set_image_and_color_image_loading_done_callback must always be called
-	 * because we rely on it to:
-	 *  - disconnect the image_loading_done signal handler
-	 *  - emit SETTINGS_CHANGED & APPEARANCE_CHANGED
-	 *  - free color_copy
-	 *  - prevent the common cold
-	 */
-	     
-	/* We use nautilus_background_set_image_uri_helper because its
-	 * return value (if false) tells us whether or not we need to
-	 * call set_image_and_color_image_loading_done_callback ourselves.
-	 */
-	if (!nautilus_background_set_image_uri_helper (background, image_uri, FALSE, FALSE)) {
-		set_image_and_color_image_loading_done_callback (background, TRUE, color_copy);
-	}
-}
-
-void
-nautilus_background_receive_dropped_background_image (NautilusBackground *background,
-						      const char *image_uri)
-{
-	/* Special case the reset-background image by file name. */
-	if (nautilus_str_has_suffix (image_uri, "/" RESET_BACKGROUND_MAGIC_IMAGE_NAME)) {
-		nautilus_background_reset (background);
-	} else {
-		/* Currently, we only support tiled images. So we set the placement.
-		 * We rely on nautilus_background_set_image_uri_and_color to emit
-		 * the SETTINGS_CHANGED & APPEARANCE_CHANGE signals.
-		 */
-		nautilus_background_set_image_placement_no_emit (background, NAUTILUS_BACKGROUND_TILED);
-
-		nautilus_background_set_image_uri_and_color (background, image_uri, NULL);
-	}
-}
-
-static GtkStyleClass *
-nautilus_gtk_style_get_default_class (void)
-{
-	static GtkStyleClass *default_class;
-	GtkStyle *style;
-	
-	if (default_class == NULL) {
-		style = gtk_style_new ();
-		default_class = style->klass;
-		gtk_style_unref (style);
-	}
-
-	return default_class;
-}
-
-static void
-nautilus_gdk_window_update_sizes (GdkWindow *window, int *width, int *height)
-{
-	g_return_if_fail (window != NULL);
-	g_return_if_fail (width != NULL);
-	g_return_if_fail (height != NULL);
-
-	if (*width == -1 && *height == -1) {
-		gdk_window_get_size (window, width, height);
-	} else if (*width == -1) {
-		gdk_window_get_size (window, width, NULL);
-	} else if (*height == -1) {
-		gdk_window_get_size (window, NULL, height);
-	}
-}
-
-static void
-nautilus_background_draw_flat_box (GtkStyle *style,
-				   GdkWindow *window,
-				   GtkStateType state_type,
-				   GtkShadowType shadow_type,
-				   GdkRectangle *area,
-				   GtkWidget *widget,
-				   char *detail,
-				   int x,
-				   int y,
-				   int width,
-				   int height)
-{
-	gboolean call_parent;
-	NautilusBackground *background;
-	GdkGC *gc;
-
-	call_parent = TRUE;
-
-	background = NULL;
-	if (state_type == GTK_STATE_NORMAL) {
-		background = nautilus_get_widget_background (widget);
-		if (background != NULL) {
-			call_parent = FALSE;
-		}
-	}
-
-	if (call_parent) {
-		(* nautilus_gtk_style_get_default_class()->draw_flat_box)
-			(style, window, state_type, shadow_type, area, widget,
-			 detail, x, y, width, height);
-		return;
-	}
-
-    	gc = style->bg_gc[state_type];
-	if (area)
-		gdk_gc_set_clip_rectangle (gc, area);
-
-	nautilus_gdk_window_update_sizes (window, &width, &height);	
-
-	nautilus_background_draw_to_drawable (background, window, gc, 0, 0, width, height, widget->allocation.width, widget->allocation.height);
-	if (area)
-		gdk_gc_set_clip_rectangle (gc, NULL);
-}
-
-static GtkStyleClass *
-nautilus_background_get_gtk_style_class (void)
-{
-	static GtkStyleClass *klass;
-
-	if (klass == NULL) {
-		static GtkStyleClass klass_storage;
-
-		klass = &klass_storage;
-		*klass = *nautilus_gtk_style_get_default_class ();
-
-		klass->draw_flat_box = nautilus_background_draw_flat_box;
-	}
-
-	return klass;
-}
-
-static void
-nautilus_background_set_widget_style (NautilusBackground *background,
-				      GtkWidget *widget)
-{
-	GtkStyle *style;
-	char *start_color_spec;
-	GdkColor color;
-	
-	g_return_if_fail (NAUTILUS_IS_BACKGROUND (background));
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-	
-	style = gtk_widget_get_style (widget);
-	
-	/* Make a copy of the style. */
-	style = gtk_style_copy (style);
-	
-	/* Give it the special class that allows it to draw gradients. */
-	style->klass = nautilus_background_get_gtk_style_class ();
-
-	/* Set up the colors in the style. */
-	start_color_spec = nautilus_gradient_get_start_color_spec (background->details->color);
-	nautilus_gdk_color_parse_with_white_default (start_color_spec, &color);
-	g_free (start_color_spec);
-	
-	style->bg[GTK_STATE_NORMAL] = color;
-	style->base[GTK_STATE_NORMAL] = color;
-	style->bg[GTK_STATE_ACTIVE] = color;
-	style->base[GTK_STATE_ACTIVE] = color;
-	
-	/* Put the style in the widget. */
-	gtk_widget_set_style (widget, style);
-	gtk_style_unref (style);
-}
-
-/**
- * nautilus_background_is_set:
- * 
- * Check whether the background's color or image has been set.
- */
-gboolean
-nautilus_background_is_set (NautilusBackground *background)
-{
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), FALSE);
-
-	return background->details->color != NULL
-		|| background->details->image_uri != NULL;
-}
-
-/* Returns false if the image is still loading, true
- * if it's done loading or there is no image.
- */
-gboolean
-nautilus_background_is_loaded (NautilusBackground *background)
-{
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), FALSE);
-	
-	return background->details->image_uri == NULL ||
-		   (!nautilus_background_is_image_load_in_progress (background) && background->details->image != NULL);
-}
-
-/**
- * nautilus_background_reset:
- *
- * Emit the reset signal to forget any color or image that has been
- * set previously.
- */
-void
-nautilus_background_reset (NautilusBackground *background)
-{
-	g_return_if_fail (NAUTILUS_IS_BACKGROUND (background));
-
-	gtk_signal_emit (GTK_OBJECT (background), signals[RESET]);
-}
-
-static void
-nautilus_background_set_up_canvas (GtkWidget *widget)
-{
-	if (GNOME_IS_CANVAS (widget)) {
-		nautilus_background_canvas_group_supplant_root_class (GNOME_CANVAS (widget));
-	}
-}
-
-static void
-nautilus_widget_background_changed (GtkWidget *widget, NautilusBackground *background)
-{
-	nautilus_background_set_widget_style (background, widget);
-	nautilus_background_set_up_canvas (widget);
-
-	gtk_widget_queue_clear (widget);
-}
-
-/* Gets the background attached to a widget.
-
-   If the widget doesn't already have a NautilusBackground object,
-   this will create one. To change the widget's background, you can
-   just call nautilus_background methods on the widget.
-
-   Later, we might want a call to find out if we already have a background,
-   or a way to share the same background among multiple widgets; both would
-   be straightforward.
-*/
-NautilusBackground *
-nautilus_get_widget_background (GtkWidget *widget)
-{
-	gpointer data;
-	NautilusBackground *background;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
-	/* Check for an existing background. */
-	data = gtk_object_get_data (GTK_OBJECT (widget), "nautilus_background");
-	if (data != NULL) {
-		g_assert (NAUTILUS_IS_BACKGROUND (data));
-		return data;
-	}
-
-	/* Store the background in the widget's data. */
-	background = nautilus_background_new ();
-	gtk_object_ref (GTK_OBJECT (background));
-	gtk_object_sink (GTK_OBJECT (background));
-	gtk_object_set_data_full (GTK_OBJECT (widget), "nautilus_background",
-				  background, (GtkDestroyNotify) gtk_object_unref);
-
-	/* Arrange to get the signal whenever the background changes. */
-	gtk_signal_connect_object_while_alive (GTK_OBJECT (background),
-					       "appearance_changed",
-					       nautilus_widget_background_changed,
-					       GTK_OBJECT (widget));
-	nautilus_widget_background_changed (widget, background);
-
-	return background;
-}
-
-gboolean
-nautilus_widget_has_attached_background (GtkWidget *widget)
-{
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-
-	return gtk_object_get_data (GTK_OBJECT (widget), "nautilus_background") != NULL;
-}
-
-GtkWidget *
-nautilus_gtk_widget_find_background_ancestor (GtkWidget *widget)
-{
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
-	while (widget != NULL) {
-		if (nautilus_widget_has_attached_background (widget)) {
-			return widget;
-		}
-
-		widget = widget->parent;
-	}
-
-	return NULL;
-}
-
-gboolean
-nautilus_background_is_too_complex_for_gtk_style (NautilusBackground *background)
-{
-	if (background == NULL) {
-		return FALSE;
-	}
-	
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), FALSE);
-	
-	if (background->details->image_uri != NULL) {
-		return TRUE;
-	}
-	if (!background->details->is_solid_color) {
-		return TRUE;
-	}
-	
-	return FALSE;
-}
-
-/* determine if a background is darker or lighter than average, to help clients know what
-   colors to draw on top with */
-gboolean
-nautilus_background_is_dark (NautilusBackground *background)
-{
-	GdkColor color;
-	int intensity, intensity2;
-	char *start_color_spec, *end_color_spec;
-
-	g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), FALSE);
-	
-	if (background->details->image != NULL) {
-		nautilus_gdk_pixbuf_average_value (background->details->image, &color);
-	} else if (background->details->is_solid_color) {
-		nautilus_gdk_color_parse_with_white_default (background->details->color, &color);	
-	} else {
-		start_color_spec = nautilus_gradient_get_start_color_spec (background->details->color);
-		end_color_spec = nautilus_gradient_get_end_color_spec (background->details->color);
-		
-		nautilus_gdk_color_parse_with_white_default (start_color_spec, &color);	
-		intensity = (((color.red >> 8) * 77) + ((color.green >> 8) * 150) + ((color.blue >> 8) * 28)) >> 8;		 
-		nautilus_gdk_color_parse_with_white_default (end_color_spec, &color);	
-		intensity2 = (((color.red >> 8) * 77) + ((color.green >> 8) * 150) + ((color.blue >> 8) * 28)) >> 8;		 
-		
-		g_free (start_color_spec);
-		g_free (end_color_spec);
-		
-		return (intensity + intensity2) < 320;
-	}
-	
-	intensity = (((color.red >> 8) * 77) + ((color.green >> 8) * 150) + ((color.blue >> 8) * 28)) >> 8;		 
-	return intensity < 160; /* biased slightly to be dark */
-}
-
-   
-/* handle dropped colors */
-void
-nautilus_background_receive_dropped_color (NautilusBackground *background,
-					   GtkWidget *widget,
-					   int drop_location_x,
-					   int drop_location_y,
-					   const GtkSelectionData *selection_data)
-{
-	guint16 *channels;
-	char *color_spec;
-	char *new_gradient_spec;
-	int left_border, right_border, top_border, bottom_border;
-
-	g_return_if_fail (NAUTILUS_IS_BACKGROUND (background));
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-	g_return_if_fail (selection_data != NULL);
-
-	/* Convert the selection data into a color spec. */
-	if (selection_data->length != 8 || selection_data->format != 16) {
-		g_warning ("received invalid color data");
-		return;
-	}
-	channels = (guint16 *) selection_data->data;
-	color_spec = g_strdup_printf ("rgb:%04hX/%04hX/%04hX", channels[0], channels[1], channels[2]);
-
-	/* Figure out if the color was dropped close enough to an edge to create a gradient.
-	   For the moment, this is hard-wired, but later the widget will have to have some
-	   say in where the borders are.
-	*/
-	left_border = 32;
-	right_border = widget->allocation.width - 32;
-	top_border = 32;
-	bottom_border = widget->allocation.height - 32;
-	if (drop_location_x < left_border && drop_location_x <= right_border) {
-		new_gradient_spec = nautilus_gradient_set_left_color_spec (background->details->color, color_spec);
-	} else if (drop_location_x >= left_border && drop_location_x > right_border) {
-		new_gradient_spec = nautilus_gradient_set_right_color_spec (background->details->color, color_spec);
-	} else if (drop_location_y < top_border && drop_location_y <= bottom_border) {
-		new_gradient_spec = nautilus_gradient_set_top_color_spec (background->details->color, color_spec);
-	} else if (drop_location_y >= top_border && drop_location_y > bottom_border) {
-		new_gradient_spec = nautilus_gradient_set_bottom_color_spec (background->details->color, color_spec);
-	} else {
-		new_gradient_spec = g_strdup (color_spec);
-	}
-	
-	g_free (color_spec);
-
-	nautilus_background_set_image_uri_and_color (background, NULL, new_gradient_spec);
-
-	g_free (new_gradient_spec);
-}
-
-/* self check code */
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-void
-nautilus_self_check_background (void)
-{
-	NautilusBackground *background;
-
-	background = nautilus_background_new ();
-
-	nautilus_background_set_color (background, NULL);
-	nautilus_background_set_color (background, "");
-	nautilus_background_set_color (background, "red");
-	nautilus_background_set_color (background, "red-blue");
-	nautilus_background_set_color (background, "red-blue:h");
-
-	gtk_object_unref (GTK_OBJECT (background));
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-background.h b/libnautilus-private/nautilus-background.h
deleted file mode 100644
index 9d5fb70e8..000000000
--- a/libnautilus-private/nautilus-background.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-background.h: Object for the background of a widget.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   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.
-  
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#ifndef NAUTILUS_BACKGROUND_H
-#define NAUTILUS_BACKGROUND_H
-
-/* Windows for Nautilus can contain backgrounds that are either tiled
-   with an image, a solid color, or a color gradient. This class manages
-   the process of loading the image if necessary and parsing the string
-   that specifies either a color or color gradient.
-
-   The color or gradient is always present, even if there's a tiled image
-   on top of it. This is used when the tiled image can't be loaded for
-   some reason (or just has not been loaded yet).
-
-   The NautilusBackground object is easier to modify than a GtkStyle.
-   You can just call nautilus_get_window_background and modify the
-   returned background directly, unlike a style, which must be copied,
-   modified and then set.
-*/
-
-#include <gdk/gdktypes.h>
-#include <gtk/gtkwidget.h>
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-typedef struct NautilusBackground NautilusBackground;
-typedef struct NautilusBackgroundClass NautilusBackgroundClass;
-
-#define NAUTILUS_TYPE_BACKGROUND \
-	(nautilus_background_get_type ())
-#define NAUTILUS_BACKGROUND(obj) \
-	(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_BACKGROUND, NautilusBackground))
-#define NAUTILUS_BACKGROUND_CLASS(klass) \
-	(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_BACKGROUND, NautilusBackgroundClass))
-#define NAUTILUS_IS_BACKGROUND(obj) \
-	(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_BACKGROUND))
-#define NAUTILUS_IS_BACKGROUND_CLASS(klass) \
-	(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_BACKGROUND))
-
-typedef enum {
-	NAUTILUS_BACKGROUND_TILED = 0, /* zero makes this the default placement */
-	NAUTILUS_BACKGROUND_CENTERED,
-	NAUTILUS_BACKGROUND_SCALED,
-	NAUTILUS_BACKGROUND_SCALED_ASPECT
-} NautilusBackgroundImagePlacement;
-
-GtkType                          nautilus_background_get_type                         (void);
-NautilusBackground *             nautilus_background_new                              (void);
-
-
-/* Calls to change a background. */
-void                             nautilus_background_set_color                        (NautilusBackground               *background,
-										       const char                       *color_or_gradient);
-void                             nautilus_background_set_image_uri                    (NautilusBackground               *background,
-										       const char                       *image_uri);
-void                             nautilus_background_reset                            (NautilusBackground               *background);
-void                             nautilus_background_set_image_placement              (NautilusBackground               *background,
-										       NautilusBackgroundImagePlacement  placement);
-/* Calls to interrogate the current state of a background. */
-char *                           nautilus_background_get_color                        (NautilusBackground               *background);
-char *                           nautilus_background_get_image_uri                    (NautilusBackground               *background);
-NautilusBackgroundImagePlacement nautilus_background_get_image_placement              (NautilusBackground               *background);
-gboolean                         nautilus_background_is_dark                          (NautilusBackground               *background);
-gboolean                         nautilus_background_is_set                           (NautilusBackground               *background);
-gboolean                         nautilus_background_is_loaded                        (NautilusBackground               *background);
-
-/* For preping the background to be used in one of the two calls
- * below. Only intended to be called by nautilus_background_canvas_group_update.
- */
-void                             nautilus_background_pre_draw                         (NautilusBackground               *background,
-										       int                               entire_width,
-										       int                               entire_height);
-/* For updating the canvas, non-aa case. Note: nautilus_background_pre_draw
- * must have been previously called. Only intended to be called by
- * nautilus_background_canvas_group_draw.
- */
-void                             nautilus_background_draw                             (NautilusBackground               *background,
-										       GdkDrawable                      *drawable,
-										       GdkGC                            *gc,
-										       int                               drawable_x,
-										       int                               drawable_y,
-										       int                               drawable_width,
-										       int                               drawable_height);
-/* For updating the canvas, aa case. Note: nautilus_background_pre_draw
- * must have been previously called. Only intended to be called by
- * nautilus_background_canvas_group_render.
- */
-void                             nautilus_background_draw_aa                          (NautilusBackground               *background,
-										       GnomeCanvasBuf                   *buffer);
-/* Used to fill a drawable with a background.
- *  - entire_width/height describe the total area the background covers
- *  - drawable_x/y/width/height describe the portion of that area the drawable covers
- */
-void                             nautilus_background_draw_to_drawable                 (NautilusBackground               *background,
-										       GdkDrawable                      *drawable,
-										       GdkGC                            *gc,
-										       int                               drawable_x,
-										       int                               drawable_y,
-										       int                               drawable_width,
-										       int                               drawable_height,
-										       int                               entire_width,
-										       int                               entire_height);
-
-/* Used to fill a drawable with a background.
- *  - entire_width/height describe the total area the background covers
- *  - buffer is a portion of that area
- */
-void                             nautilus_background_draw_to_canvas                   (NautilusBackground               *background,
-										       GnomeCanvasBuf                   *buffer,
-										       int                               entire_width,
-										       int                               entire_height);
-/* Used to fill a pixbuf with a background.
- *  - entire_width/height describe the total area the background covers
- *  - drawable_x/y/width/height describe the portion of that area the pixbuf covers
- */
-void                             nautilus_background_draw_to_pixbuf                   (NautilusBackground               *background,
-										       GdkPixbuf                        *pixbuf,
-										       int                               pixbuf_x,
-										       int                               pixbuf_y,
-										       int                               pixbuf_width,
-										       int                               pixbuf_height,
-										       int                               entire_width,
-										       int                               entire_height);
-							       
-/* Handles a dragged color being dropped on a widget to change the background color. */
-void                             nautilus_background_receive_dropped_color            (NautilusBackground               *background,
-										       GtkWidget                        *widget,
-										       int                               drop_location_x,
-										       int                               drop_location_y,
-										       const GtkSelectionData           *dropped_color);
-
-/* Handles a special-case image name that means "reset to default background" too. */
-void                             nautilus_background_receive_dropped_background_image (NautilusBackground               *background,
-										       const char                       *image_uri);
-
-/* Gets or creates a background so that it's attached to a widget. */
-NautilusBackground *             nautilus_get_widget_background                       (GtkWidget                        *widget);
-
-/* Return whether a background has beed attatched to the given widget. */
-gboolean                         nautilus_widget_has_attached_background              (GtkWidget                        *widget);
-
-/* Find the background ancestor for the widget. */
-GtkWidget *                      nautilus_gtk_widget_find_background_ancestor         (GtkWidget                        *widget);
-
-/* Find out if a nautilus background is too complex for GtkStyle, so that we have to draw it ourselves */
-gboolean                         nautilus_background_is_too_complex_for_gtk_style     (NautilusBackground               *background);
-
-
-typedef struct NautilusBackgroundDetails NautilusBackgroundDetails;
-
-struct NautilusBackground
-{
-	GtkObject object;
-	NautilusBackgroundDetails *details;
-};
-
-struct NautilusBackgroundClass
-{
-	GtkObjectClass parent_class;
-
-	/* This signal is emitted whenever the background settings are
-	 * changed.
-	 */
-	void (* settings_changed) (NautilusBackground *);
-
-	/* This signal is emitted whenever the appearance of the
-	 * background has changed, like when the background settings are
-	 * altered or when an image is loaded.
-	 */
-	void (* appearance_changed) (NautilusBackground *);
-
-	/* This signal is emitted when image loading is over - whether it
-	 * was successfully loaded or not.
-	 */
-	void (* image_loading_done) (NautilusBackground *background, gboolean successful_load);
-
-	/* This signal is emitted when the background is reset by receiving
-	   the reset property from a drag
-	 */
-	void (* reset) (NautilusBackground *);
-
-};
-
-#endif /* NAUTILUS_BACKGROUND_H */
diff --git a/libnautilus-private/nautilus-bonobo-extensions.c b/libnautilus-private/nautilus-bonobo-extensions.c
index 1d301d6e9..84f5c4536 100644
--- a/libnautilus-private/nautilus-bonobo-extensions.c
+++ b/libnautilus-private/nautilus-bonobo-extensions.c
@@ -28,7 +28,7 @@
 #include <config.h>
 #include "nautilus-bonobo-extensions.h"
 
-#include "nautilus-string.h"
+#include <eel/eel-string.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <gtk/gtkmain.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
@@ -403,7 +403,7 @@ nautilus_bonobo_set_label_for_menu_item_and_command (BonoboUIComponent *ui,
 {
 	char *label_no_underscore;
 
-	label_no_underscore = nautilus_str_strip_chr (label_with_underscore, '_');
+	label_no_underscore = eel_str_strip_chr (label_with_underscore, '_');
 	nautilus_bonobo_set_label (ui,
 				   menu_item_path,
 				   label_with_underscore);
diff --git a/libnautilus-private/nautilus-bonobo-extensions.h b/libnautilus-private/nautilus-bonobo-extensions.h
index 57ed6db2f..a39dc561d 100644
--- a/libnautilus-private/nautilus-bonobo-extensions.h
+++ b/libnautilus-private/nautilus-bonobo-extensions.h
@@ -97,10 +97,10 @@ void                            nautilus_bonobo_activate_cancel
 
 /* This macro is a copy of BONOBO_X_TYPE_FUNC_FULL (from bonobo-xobject.h)
  * with the addition of support for the parent_class which is defined by
- * NAUTILUS_DEFINE_CLASS_BOILERPLATE and used by NAUTILUS_CALL_PARENT.
+ * EEL_DEFINE_CLASS_BOILERPLATE and used by EEL_CALL_PARENT.
  * 
  * Note: the argument order matches BONOBO_X_TYPE_FUNC_FULL which is different
- * than NAUTILUS_DEFINE_CLASS_BOILERPLATE.
+ * than EEL_DEFINE_CLASS_BOILERPLATE.
  */
 #define NAUTILUS_BONOBO_X_BOILERPLATE(class_name, corba_name, parent, prefix) \
 static gpointer parent_class;                          /* Nautilus change */  \
diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c
index e47be70f0..02d69c176 100644
--- a/libnautilus-private/nautilus-bookmark.c
+++ b/libnautilus-private/nautilus-bookmark.c
@@ -25,9 +25,9 @@
 #include <config.h>
 #include "nautilus-bookmark.h"
 
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 #include "nautilus-icon-factory.h"
-#include "nautilus-string.h"
+#include <eel/eel-string.h>
 #include <gtk/gtkaccellabel.h>
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-defs.h>
@@ -37,8 +37,8 @@
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 
 enum {
 	APPEARANCE_CHANGED,
@@ -65,7 +65,7 @@ static void       nautilus_bookmark_initialize_class      (NautilusBookmarkClass
 static void       nautilus_bookmark_initialize            (NautilusBookmark      *bookmark);
 static GtkWidget *create_pixmap_widget_for_bookmark       (NautilusBookmark 	 *bookmark);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusBookmark, nautilus_bookmark, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusBookmark, nautilus_bookmark, GTK_TYPE_OBJECT)
 
 /* GtkObject methods.  */
 
@@ -85,7 +85,7 @@ nautilus_bookmark_destroy (GtkObject *object)
 	g_free (bookmark->details);
 
 	/* Chain up */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* Initialization.  */
@@ -218,7 +218,7 @@ nautilus_bookmark_get_pixmap_and_mask (NautilusBookmark *bookmark,
 		return FALSE;
 	}
 
-	gdk_pixbuf_render_pixmap_and_mask (pixbuf, pixmap_return, mask_return, NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
+	gdk_pixbuf_render_pixmap_and_mask (pixbuf, pixmap_return, mask_return, EEL_STANDARD_ALPHA_THRESHHOLD);
 	gdk_pixbuf_unref (pixbuf);
 
 	return TRUE;
@@ -240,7 +240,7 @@ nautilus_bookmark_get_pixbuf (NautilusBookmark *bookmark,
 	
 	result = nautilus_icon_factory_get_pixbuf_for_icon
 		(icon, icon_size, icon_size, icon_size, icon_size, NULL, TRUE);
-	nautilus_scalable_icon_unref (icon);
+	eel_scalable_icon_unref (icon);
 	
 	return result;
 }
@@ -254,7 +254,7 @@ nautilus_bookmark_get_icon (NautilusBookmark *bookmark)
 	nautilus_bookmark_connect_file (bookmark);
 
 	if (bookmark->details->icon != NULL) {
-		nautilus_scalable_icon_ref (bookmark->details->icon);
+		eel_scalable_icon_ref (bookmark->details->icon);
 	}
 	return bookmark->details->icon;
 }
@@ -311,18 +311,18 @@ nautilus_bookmark_icon_is_different (NautilusBookmark *bookmark,
 	g_assert (new_icon != NULL);
 
 	/* Bookmarks only care about the uri and name. */
-	nautilus_scalable_icon_get_text_pieces 
+	eel_scalable_icon_get_text_pieces 
 		(new_icon, &new_uri, &new_name, NULL, NULL);
 
 	if (bookmark->details->icon == NULL) {
-		result = !nautilus_str_is_empty (new_uri)
-			|| !nautilus_str_is_empty (new_name);
+		result = !eel_str_is_empty (new_uri)
+			|| !eel_str_is_empty (new_name);
 	} else {
-		nautilus_scalable_icon_get_text_pieces 
+		eel_scalable_icon_get_text_pieces 
 			(bookmark->details->icon, &old_uri, &old_name, NULL, NULL);
 
-		result = nautilus_strcmp (old_uri, new_uri) != 0
-			|| nautilus_strcmp (old_name, new_name) != 0;
+		result = eel_strcmp (old_uri, new_uri) != 0
+			|| eel_strcmp (old_name, new_name) != 0;
 
 		g_free (old_uri);
 		g_free (old_name);
@@ -354,12 +354,12 @@ nautilus_bookmark_update_icon (NautilusBookmark *bookmark)
 								    NULL, FALSE);
 		if (nautilus_bookmark_icon_is_different (bookmark, new_icon)) {
 			if (bookmark->details->icon != NULL) {
-				nautilus_scalable_icon_unref (bookmark->details->icon);
+				eel_scalable_icon_unref (bookmark->details->icon);
 			}
 			bookmark->details->icon = new_icon;
 			return TRUE;
 		}
-		nautilus_scalable_icon_unref (new_icon);
+		eel_scalable_icon_unref (new_icon);
 	}
 
 	return FALSE;
@@ -426,7 +426,7 @@ nautilus_bookmark_set_icon_to_default (NautilusBookmark *bookmark)
 	const char *icon_name;
 
 	if (bookmark->details->icon != NULL) {
-		nautilus_scalable_icon_unref (bookmark->details->icon);
+		eel_scalable_icon_unref (bookmark->details->icon);
 	}
 
 	if (nautilus_bookmark_uri_known_not_to_exist (bookmark)) {
@@ -434,7 +434,7 @@ nautilus_bookmark_set_icon_to_default (NautilusBookmark *bookmark)
 	} else {
 		icon_name = GENERIC_BOOKMARK_ICON_NAME;
 	}
-	bookmark->details->icon = nautilus_scalable_icon_new_from_text_pieces 
+	bookmark->details->icon = eel_scalable_icon_new_from_text_pieces 
 		(NULL, icon_name, NULL, NULL, FALSE);
 }
 
@@ -472,7 +472,7 @@ nautilus_bookmark_disconnect_file (NautilusBookmark *bookmark)
 	}
 
 	if (bookmark->details->icon != NULL) {
-		nautilus_scalable_icon_unref (bookmark->details->icon);
+		eel_scalable_icon_unref (bookmark->details->icon);
 		bookmark->details->icon = NULL;
 	}
 }
@@ -520,7 +520,7 @@ nautilus_bookmark_new_with_icon (const char *uri, const char *name,
 	new_bookmark->details->uri = g_strdup (uri);
 
 	if (icon != NULL) {
-		nautilus_scalable_icon_ref (icon);
+		eel_scalable_icon_ref (icon);
 	}
 	new_bookmark->details->icon = icon;
 
@@ -572,7 +572,7 @@ nautilus_bookmark_menu_item_new (NautilusBookmark *bookmark)
 		gtk_widget_show (pixmap_widget);
 		gtk_pixmap_menu_item_set_pixmap (GTK_PIXMAP_MENU_ITEM (menu_item), pixmap_widget);
 	}
-	display_name = nautilus_truncate_text_for_menu_item (bookmark->details->name);
+	display_name = eel_truncate_text_for_menu_item (bookmark->details->name);
 	label = gtk_label_new (display_name);
 	g_free (display_name);
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
diff --git a/libnautilus-private/nautilus-caption-table.c b/libnautilus-private/nautilus-caption-table.c
deleted file mode 100644
index f4678b26f..000000000
--- a/libnautilus-private/nautilus-caption-table.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-caption-table.c - An easy way to do tables of aligned captions.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-caption-table.h"
-
-#include <gtk/gtkentry.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include "nautilus-gtk-macros.h"
-
-struct _NautilusCaptionTableDetail
-{
-	GtkWidget	**labels;
-	GtkWidget	**entries;
-	guint		num_rows;
-	guint		size;
-};
-
-enum
-{
-	ACTIVATE,
-	LAST_SIGNAL
-};
-
-/* NautilusCaptionTableClass methods */
-static void       nautilus_caption_table_initialize_class (NautilusCaptionTableClass *klass);
-static void       nautilus_caption_table_initialize       (NautilusCaptionTable      *caption_table);
-
-/* GtkObjectClass methods */
-static void       caption_table_destroy                   (GtkObject                 *object);
-
-/* Private methods */
-static GtkWidget* caption_table_find_next_sensitive_entry (NautilusCaptionTable      *caption_table,
-							   guint                      index);
-static int        caption_table_index_of_entry            (NautilusCaptionTable      *caption_table,
-							   GtkWidget                 *entry);
-
-/* Entry callbacks */
-static void       entry_activate                          (GtkWidget                 *widget,
-							   gpointer                   data);
-
-/* Boilerplate stuff */
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusCaptionTable,
-				   nautilus_caption_table,
-				   GTK_TYPE_TABLE)
-
-static int caption_table_signals[LAST_SIGNAL] = { 0 };
-
-static void
-nautilus_caption_table_initialize_class (NautilusCaptionTableClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	
-	object_class = GTK_OBJECT_CLASS (klass);
-	widget_class = GTK_WIDGET_CLASS (klass);
-
-	caption_table_signals[ACTIVATE] =
-		gtk_signal_new ("activate",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (NautilusCaptionTableClass, activate),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-	
-	gtk_object_class_add_signals (object_class, caption_table_signals, LAST_SIGNAL);
-	
-	/* GtkObjectClass */
-	object_class->destroy = caption_table_destroy;
-}
-
-#define CAPTION_TABLE_DEFAULT_ROWS 1
-
-static void
-nautilus_caption_table_initialize (NautilusCaptionTable *caption_table)
-{
-	GtkTable *table = GTK_TABLE (caption_table);
-
-	caption_table->detail = g_new (NautilusCaptionTableDetail, 1);
-
-	caption_table->detail->num_rows = 0;
-
-	caption_table->detail->size = 0;
-
-	caption_table->detail->labels = NULL;
-	caption_table->detail->entries = NULL;
-
-	table->homogeneous = FALSE;
-}
-
-/* GtkObjectClass methods */
-static void
-caption_table_destroy (GtkObject *object)
-{
-	NautilusCaptionTable *caption_table;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (NAUTILUS_IS_CAPTION_TABLE (object));
-	
-	caption_table = NAUTILUS_CAPTION_TABLE (object);
-
-	if (caption_table->detail->labels)
-		g_free(caption_table->detail->labels);
-
-	if (caption_table->detail->entries)
-		g_free(caption_table->detail->entries);
-
-	g_free (caption_table->detail);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-void
-nautilus_caption_table_resize (NautilusCaptionTable	*caption_table,
-			       guint			num_rows)
-{
-	GtkTable* table = NULL;
-
-	g_return_if_fail (caption_table != NULL);
-	g_return_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table));
-
-	/* Make sure the num_rows have changed */
-	if (caption_table->detail->num_rows == num_rows)
-		return;
-
-	caption_table->detail->num_rows = num_rows;
-
-	/* Resize the GtkTable */
-	table = GTK_TABLE (caption_table);
-	gtk_table_resize(table, caption_table->detail->num_rows, 2);
-
-	/* Create more label/entry pairs if needed */
-	if (caption_table->detail->num_rows > caption_table->detail->size)
-	{
-		guint i;
-		guint old_size = caption_table->detail->size;
-		guint new_size = caption_table->detail->num_rows;
-		guint realloc_size = sizeof(GtkWidget *) * new_size;
-		
-		/* FIXME bugzilla.eazel.com 680: Use a GList for this */
-		caption_table->detail->labels = (GtkWidget**) g_realloc (caption_table->detail->labels,
-									 realloc_size);
-
-		caption_table->detail->entries = (GtkWidget**) g_realloc (caption_table->detail->entries,
-									  realloc_size);
-		
-		for (i = old_size; i < new_size; i++)
-		{
-			caption_table->detail->labels[i] = gtk_label_new("");
-			caption_table->detail->entries[i] = gtk_entry_new();
-			
-			gtk_signal_connect(GTK_OBJECT (caption_table->detail->entries[i]),
-					   "activate",
-					   GTK_SIGNAL_FUNC (entry_activate),
-					   (gpointer) caption_table);
-
-			gtk_misc_set_alignment (GTK_MISC (caption_table->detail->labels[i]), 1.0, 0.5);
-
-			/* Column 1 */
-			gtk_table_attach (table,
-					  caption_table->detail->labels[i],	/* child */
-					  0,					/* left_attatch */
-					  1,					/* right_attatch */
-					  i,					/* top_attatch */
-					  i + 1,				/* bottom_attatch */
-					  GTK_FILL,				/* xoptions */
-					  (GTK_FILL|GTK_EXPAND),		/* yoptions */
-					  0,					/* xpadding */
-					  0);					/* ypadding */
-			
-			/* Column 2 */
-			gtk_table_attach (table, 
-					  caption_table->detail->entries[i],	/* child */
-					  1,					/* left_attatch */
-					  2,					/* right_attatch */
-					  i,					/* top_attatch */
-					  i + 1,				/* bottom_attatch */
-					  (GTK_FILL|GTK_EXPAND),		/* xoptions */
-					  (GTK_FILL|GTK_EXPAND),		/* yoptions */
-					  0,					/* xpadding */
-					  0);					/* ypadding */
-		}
-
-		caption_table->detail->size = new_size;
-	}
-
-	/* Show only the needed caption widgets */
-	if (caption_table->detail->size > 0)
-	{
-		guint i;
-
-		for(i = 0; i < caption_table->detail->size; i++)
-		{
-			if (i < caption_table->detail->num_rows)
-			{
-				gtk_widget_show (caption_table->detail->labels[i]);
-				gtk_widget_show (caption_table->detail->entries[i]);
-			}
-			else
-			{
-				gtk_widget_hide (caption_table->detail->labels[i]);
-				gtk_widget_hide (caption_table->detail->entries[i]);
-			}
-		}
-	}
-
-	/* Set inter row spacing */
-	if (caption_table->detail->num_rows > 1)
-	{
-		guint i;
-
-		for(i = 0; i < (caption_table->detail->num_rows - 1); i++)
-			gtk_table_set_row_spacing (GTK_TABLE (table), i, 10);
-	}
-}
-
-static int
-caption_table_index_of_entry (NautilusCaptionTable *caption_table,
-			      GtkWidget* entry)
-{
-	guint i;
-
-	g_return_val_if_fail (caption_table != NULL, -1);
-	g_return_val_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table), -1);
-
-	for(i = 0; i < caption_table->detail->num_rows; i++)
-		if (caption_table->detail->entries[i] == entry)
-			return i;
-
-	return -1;
-}
-
-static GtkWidget*
-caption_table_find_next_sensitive_entry (NautilusCaptionTable	*caption_table,
-					 guint			index)
-{
-	guint i;
-
-	g_return_val_if_fail (caption_table != NULL, NULL);
-	g_return_val_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table), NULL);
-
-	for(i = index; i < caption_table->detail->num_rows; i++)
-		if (GTK_WIDGET_SENSITIVE (caption_table->detail->entries[i]))
-			return caption_table->detail->entries[i];
-
-	return NULL;
-}
-
-static void
-entry_activate (GtkWidget *widget, gpointer data)
-{
-	NautilusCaptionTable *caption_table = NAUTILUS_CAPTION_TABLE (data);
-	int index;
-	
-	g_return_if_fail (caption_table != NULL);
-	g_return_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table));
-	
-	index = caption_table_index_of_entry (caption_table, widget);
-	
-	/* Check for an invalid index */
-	if (index == -1) {
-		return;
-	}
-
-	/* Check for the last index */
-	if (index < (int) caption_table->detail->num_rows) {
-		/* Look for the next sensitive entry */
-		GtkWidget *sensitive_entry = 
-			caption_table_find_next_sensitive_entry (caption_table, index + 1);
-		
-		/* Make the next sensitive entry take focus */
-		if (sensitive_entry) {
-			gtk_widget_grab_focus (sensitive_entry);
-		}
-	}
-	
-	/* Emit the activate signal */
-	gtk_signal_emit (GTK_OBJECT (caption_table), 
-			 caption_table_signals[ACTIVATE], 
-			 index);
-}
-
-/* Public methods */
-GtkWidget*
-nautilus_caption_table_new (guint num_rows)
-{
-	GtkWidget *widget;
-
-	if (num_rows == 0) {
-		num_rows = 1;
-	}
-
-	widget = gtk_widget_new (nautilus_caption_table_get_type(), NULL);
-
-	nautilus_caption_table_resize (NAUTILUS_CAPTION_TABLE (widget), num_rows);
-	gtk_table_set_col_spacing (GTK_TABLE (widget), 0, 10);
-
-	return widget;
-}
-
-void
-nautilus_caption_table_set_row_info (NautilusCaptionTable *caption_table,
-				     guint row,
-				     const char* label_text,
-				     const char* entry_text,
-				     gboolean entry_visibility,
-				     gboolean entry_readonly)
-{
-	g_return_if_fail (caption_table != NULL);
-	g_return_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table));
-	g_return_if_fail (row < caption_table->detail->num_rows);
-
-	gtk_label_set_text (GTK_LABEL (caption_table->detail->labels[row]), label_text);
-
-	gtk_entry_set_text (GTK_ENTRY (caption_table->detail->entries[row]), entry_text);
-	gtk_entry_set_visibility (GTK_ENTRY (caption_table->detail->entries[row]), entry_visibility);
-	gtk_widget_set_sensitive (caption_table->detail->entries[row], !entry_readonly);
-}
-
-void
-nautilus_caption_table_set_entry_text (NautilusCaptionTable *caption_table,
-				       guint row,
-				       const char* entry_text)
-{
-	g_return_if_fail (caption_table != NULL);
-	g_return_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table));
-	g_return_if_fail (row < caption_table->detail->num_rows);
-
-	gtk_entry_set_text (GTK_ENTRY (caption_table->detail->entries[row]), entry_text);
-}
-
-void
-nautilus_caption_table_set_entry_readonly (NautilusCaptionTable *caption_table,
-					   guint row,
-					   gboolean readonly)
-{
-	g_return_if_fail (caption_table != NULL);
-	g_return_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table));
-	g_return_if_fail (row < caption_table->detail->num_rows);
-	
-	gtk_widget_set_sensitive (caption_table->detail->entries[row], !readonly);
-}
-
-void
-nautilus_caption_table_entry_grab_focus (NautilusCaptionTable *caption_table, guint row)
-{
-	g_return_if_fail (caption_table != NULL);
-	g_return_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table));
-	g_return_if_fail (row < caption_table->detail->num_rows);
-
-	if (GTK_WIDGET_SENSITIVE (caption_table->detail->entries[row]))
-		gtk_widget_grab_focus (caption_table->detail->entries[row]);
-}
-
-char*
-nautilus_caption_table_get_entry_text (NautilusCaptionTable *caption_table, guint row)
-{
-	char *text;
-
-	g_return_val_if_fail (caption_table != NULL, NULL);
-	g_return_val_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table), NULL);
-	g_return_val_if_fail (row < caption_table->detail->num_rows, NULL);
-
-	text = gtk_entry_get_text (GTK_ENTRY (caption_table->detail->entries[row]));
-
-	return g_strdup (text);
-}
-
-guint
-nautilus_caption_table_get_num_rows (NautilusCaptionTable *caption_table)
-{
-	g_return_val_if_fail (caption_table != NULL, 0);
-	g_return_val_if_fail (NAUTILUS_IS_CAPTION_TABLE (caption_table), 0);
-
-	return caption_table->detail->num_rows;
-}
diff --git a/libnautilus-private/nautilus-caption-table.h b/libnautilus-private/nautilus-caption-table.h
deleted file mode 100644
index 612fe029e..000000000
--- a/libnautilus-private/nautilus-caption-table.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-caption-table.h - An easy way to do tables of aligned captions.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_CAPTION_TABLE_H
-#define NAUTILUS_CAPTION_TABLE_H
-
-#include <gtk/gtktable.h>
-#include <libgnome/gnome-defs.h>
-
-/*
- * NautilusCaptionTable is a GtkTable sublass that allows you to painlessly
- * create tables of nicely aligned captions.
- */
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_CAPTION_TABLE			(nautilus_caption_table_get_type ())
-#define NAUTILUS_CAPTION_TABLE(obj)		(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_CAPTION_TABLE, NautilusCaptionTable))
-#define NAUTILUS_CAPTION_TABLE_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CAPTION_TABLE, NautilusCaptionTableClass))
-#define NAUTILUS_IS_CAPTION_TABLE(obj)		(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_CAPTION_TABLE))
-#define NAUTILUS_IS_CAPTION_TABLE_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_CAPTION_TABLE))
-
-
-typedef struct _NautilusCaptionTable		NautilusCaptionTable;
-typedef struct _NautilusCaptionTableClass	NautilusCaptionTableClass;
-typedef struct _NautilusCaptionTableDetail	NautilusCaptionTableDetail;
-
-struct _NautilusCaptionTable
-{
-	GtkTable table;
-
-	NautilusCaptionTableDetail *detail;
-};
-
-struct _NautilusCaptionTableClass
-{
-	GtkTableClass parent_class;
-
-	void (*activate) (GtkWidget *caption_table, guint active_entry);
-};
-
-GtkType    nautilus_caption_table_get_type           (void);
-GtkWidget* nautilus_caption_table_new                (guint                 num_rows);
-void       nautilus_caption_table_set_row_info       (NautilusCaptionTable *caption_table,
-						      guint                 row,
-						      const char           *label_text,
-						      const char           *entry_text,
-						      gboolean              entry_visibility,
-						      gboolean              entry_readonly);
-void       nautilus_caption_table_set_entry_text     (NautilusCaptionTable *caption_table,
-						      guint                 row,
-						      const char           *entry_text);
-void       nautilus_caption_table_set_entry_readonly (NautilusCaptionTable *caption_table,
-						      guint                 row,
-						      gboolean              readonly);
-void       nautilus_caption_table_entry_grab_focus   (NautilusCaptionTable *caption_table,
-						      guint                 row);
-char*      nautilus_caption_table_get_entry_text     (NautilusCaptionTable *caption_table,
-						      guint                 row);
-guint      nautilus_caption_table_get_num_rows       (NautilusCaptionTable *caption_table);
-void       nautilus_caption_table_resize             (NautilusCaptionTable *caption_table,
-						      guint                 num_rows);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_CAPTION_TABLE_H */
-
-
diff --git a/libnautilus-private/nautilus-caption.c b/libnautilus-private/nautilus-caption.c
deleted file mode 100644
index 141ce92ea..000000000
--- a/libnautilus-private/nautilus-caption.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-caption.c - A captioned text widget
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-caption.h"
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-
-static const gint CAPTION_INVALID = -1;
-static const gint CAPTION_SPACING = 10;
-
-struct _NautilusCaptionDetail
-{
-	GtkWidget *title_label;
-	GtkWidget *child;
-	gboolean show_title;
-};
-
-/* NautilusCaptionClass methods */
-static void      nautilus_caption_initialize_class (NautilusCaptionClass *klass);
-static void      nautilus_caption_initialize       (NautilusCaption      *caption);
-
-/* GtkObjectClass methods */
-static void nautilus_caption_destroy      (GtkObject       *object);
-static void nautilus_font_picker_show_all (GtkWidget       *widget);
-static void update_title                  (NautilusCaption *caption);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusCaption, nautilus_caption, GTK_TYPE_HBOX)
-
-/*
- * NautilusCaptionClass methods
- */
-static void
-nautilus_caption_initialize_class (NautilusCaptionClass *caption_class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	
-	object_class = GTK_OBJECT_CLASS (caption_class);
-	widget_class = GTK_WIDGET_CLASS (caption_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_caption_destroy;
-
-	/* GtkWidgetClass */
-	widget_class->show_all = nautilus_font_picker_show_all;
-}
-
-static void
-nautilus_caption_initialize (NautilusCaption *caption)
-{
-	caption->detail = g_new0 (NautilusCaptionDetail, 1);
-
-	gtk_box_set_homogeneous (GTK_BOX (caption), FALSE);
-	gtk_box_set_spacing (GTK_BOX (caption), CAPTION_SPACING);
-
-	caption->detail->show_title = TRUE;
-	caption->detail->title_label = gtk_label_new ("Title Label:");
-	caption->detail->child = NULL;
-
-	gtk_box_pack_start (GTK_BOX (caption),
-			    caption->detail->title_label,
-			    FALSE,	/* expand */
-			    TRUE,	/* fill */
-			    0);		/* padding */
-
-	gtk_widget_show (caption->detail->title_label);
-}
-
-/*
- * GtkObjectClass methods
- */
-static void
-nautilus_caption_destroy (GtkObject* object)
-{
-	NautilusCaption * caption;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (NAUTILUS_IS_CAPTION (object));
-	
-	caption = NAUTILUS_CAPTION (object);
-
-	g_free (caption->detail);
-
-	/* Chain */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_font_picker_show_all (GtkWidget *widget)
-{
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, show_all, (widget));
-
-	/* Now update the title visibility */
-	update_title (NAUTILUS_CAPTION (widget));
-}
-
-static void
-update_title (NautilusCaption	*caption)
-{
-	g_return_if_fail (NAUTILUS_IS_CAPTION (caption));
-
-	if (caption->detail->show_title) {
-		gtk_widget_show (caption->detail->title_label);
-	}
-	else {
-		gtk_widget_hide (caption->detail->title_label);
-	}
-}
-
-/*
- * NautilusCaption public methods
- */
-GtkWidget *
-nautilus_caption_new (void)
-{
-	return gtk_widget_new (nautilus_caption_get_type (), NULL);
-}
-
-/**
- * nautilus_caption_set_title_label:
- * @caption: A NautilusCaption
- * @title_label: The title label
- *
- */
-void
-nautilus_caption_set_title_label (NautilusCaption		*caption,
-				  const char			*title_label)
-{
-	g_return_if_fail (NAUTILUS_IS_CAPTION (caption));
-	g_return_if_fail (title_label != NULL);
-
-	gtk_label_set_text (GTK_LABEL (caption->detail->title_label), title_label);
-}
-
-/**
- * nautilus_caption_set_show_title:
- * @caption: A NautilusCaption
- * @show_title: Whether to show the title or not
- *
- */
-void
-nautilus_caption_set_show_title (NautilusCaption	*caption,
-				 gboolean		show_title)
-				 {
-	g_return_if_fail (NAUTILUS_IS_CAPTION (caption));
-
-	if (caption->detail->show_title == show_title) {
-		return;
-	}
-
-	caption->detail->show_title = show_title;
-
-	update_title (caption);
-}
-
-/**
- * nautilus_caption_get_title_label:
- * @caption: A NautilusCaption
- *
- * Returns: A newly allocated copy of the title label.
- */
-char *
-nautilus_caption_get_title_label (const NautilusCaption *caption)
-{
-	gchar *str;
-
-	g_return_val_if_fail (NAUTILUS_IS_CAPTION (caption), NULL);
-
-	/* DANGER! DANGER!
-	 * 
-	 * gtk_label_get () does not strdup the result.
-	 */
-	gtk_label_get (GTK_LABEL (caption->detail->title_label), &str);
-
-	return str ? g_strdup (str) : NULL;
-}
-
-/**
- * nautilus_caption_get_title_label_width:
- * @caption: A NautilusCaption
- *
- * Returns: A width of the title label.
- */
-int
-nautilus_caption_get_title_label_width (const NautilusCaption *caption)
-{
-	NautilusDimensions title_dimensions;
-	
-	g_return_val_if_fail (NAUTILUS_IS_CAPTION (caption), 0);
-	
-	title_dimensions = nautilus_gtk_widget_get_preferred_dimensions (caption->detail->title_label);
-	
-	return title_dimensions.width;
-}
-
-/**
- * nautilus_caption_set_child
- * @caption: A NautilusCaption
- * @child: A GtkWidget to become the caption's one and only child.
- * @expand: Same as GtkBox.
- * @fill: Same as GtkBox.
- *
- * Install a widget as the one and only child of the caption.
- */
-void
-nautilus_caption_set_child (NautilusCaption *caption,
-			    GtkWidget *child,
-			    gboolean expand,
-			    gboolean fill)
-{
-	g_return_if_fail (NAUTILUS_IS_CAPTION (caption));
-	g_return_if_fail (GTK_IS_WIDGET (child));
-	g_return_if_fail (caption->detail->child == NULL);
-
-	caption->detail->child = child;
-	
-	gtk_box_pack_start (GTK_BOX (caption),
-			    caption->detail->child,
-			    expand,	/* expand */
-			    fill,	/* fill */
-			    0);	        /* padding */
-	
-	gtk_widget_show (caption->detail->child);
-}
-
-/**
- * nautilus_caption_set_extra_spacing
- * @caption: A NautilusCaption
- * @spacing: Extra spacing in pixels between the title and the child,
- * beyond the nominal amount
- *
- * Set the amount of extra spacing between the title label and the 
- * caption's one and only child.
- */
-void
-nautilus_caption_set_extra_spacing (NautilusCaption *caption,
-			      	    int extra_spacing)
-{
-	g_return_if_fail (NAUTILUS_IS_CAPTION (caption));
-	g_return_if_fail (extra_spacing >= 0);
-
-	gtk_box_set_spacing (GTK_BOX (caption), 
-			     CAPTION_SPACING + extra_spacing);
-}
diff --git a/libnautilus-private/nautilus-caption.h b/libnautilus-private/nautilus-caption.h
deleted file mode 100644
index c30a896db..000000000
--- a/libnautilus-private/nautilus-caption.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-caption.h - A captioned text widget
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_CAPTION_H
-#define NAUTILUS_CAPTION_H
-
-#include <gtk/gtkhbox.h>
-#include <libgnome/gnome-defs.h>
-#include <libnautilus-extensions/nautilus-string-list.h>
-
-/*
- * NautilusCaption is made up of 2 widgets. 
- *
- * [title label] [something]
- *
- */
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_CAPTION            (nautilus_caption_get_type ())
-#define NAUTILUS_CAPTION(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_CAPTION, NautilusCaption))
-#define NAUTILUS_CAPTION_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CAPTION, NautilusCaptionClass))
-#define NAUTILUS_IS_CAPTION(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_CAPTION))
-
-typedef struct _NautilusCaption		 NautilusCaption;
-typedef struct _NautilusCaptionClass	 NautilusCaptionClass;
-typedef struct _NautilusCaptionDetail	 NautilusCaptionDetail;
-
-struct _NautilusCaption
-{
-	/* Super Class */
-	GtkHBox			hbox;
-	
-	/* Private stuff */
-	NautilusCaptionDetail	*detail;
-};
-
-struct _NautilusCaptionClass
-{
-	GtkHBoxClass		parent_class;
-};
-
-GtkType    nautilus_caption_get_type              (void);
-GtkWidget* nautilus_caption_new                   (void);
-
-
-/* Title label mutator. */
-void       nautilus_caption_set_title_label       (NautilusCaption       *caption,
-						   const char            *title_label);
-void       nautilus_caption_set_show_title        (NautilusCaption       *caption,
-						   gboolean               show_title);
-
-
-/* Title label accessor. */
-char *     nautilus_caption_get_title_label       (const NautilusCaption *caption);
-
-
-/* Set the child. */
-void       nautilus_caption_set_child             (NautilusCaption       *caption,
-						   GtkWidget             *child,
-						   gboolean               expand,
-						   gboolean               fill);
-void       nautilus_caption_set_extra_spacing     (NautilusCaption       *caption,
-						   int                    extra_spacing);
-int        nautilus_caption_get_title_label_width (const NautilusCaption *caption);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_CAPTION_H */
-
-
diff --git a/libnautilus-private/nautilus-clickable-image.c b/libnautilus-private/nautilus-clickable-image.c
deleted file mode 100644
index df6f42f9a..000000000
--- a/libnautilus-private/nautilus-clickable-image.c
+++ /dev/null
@@ -1,660 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-clickable-image.c - A clickable image widget.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-clickable-image.h"
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-#include "nautilus-graphic-effects.h"
-
-#include <gtk/gtkmain.h>
-
-/* Arguments */
-enum
-{
-	ARG_0,
-	ARG_POINTER_INSIDE,
-};
-
-/* Signals */
-typedef enum
-{
-	CLICKED,
-	ENTER,
-	LEAVE,
-	LAST_SIGNAL
-} ImageSignal;
-
-/* Signals */
-static guint clickable_image_signals[LAST_SIGNAL] = { 0 };
-
-/* Detail member struct */
-struct _NautilusClickableImageDetails
-{
- 	gboolean pointer_inside;
-	gboolean prelight;
-
-	GdkPixbuf *pixbuf;
-	GdkPixbuf *prelight_pixbuf;
-};
-
-/* GtkObjectClass methods */
-static void nautilus_clickable_image_initialize_class (NautilusClickableImageClass *image_class);
-static void nautilus_clickable_image_initialize       (NautilusClickableImage      *image);
-static void nautilus_clickable_image_destroy          (GtkObject                   *object);
-static void nautilus_clickable_image_get_arg          (GtkObject                   *object,
-						       GtkArg                      *arg,
-						       guint                        arg_id);
-/* GtkWidgetClass methods */
-static int  nautilus_clickable_image_expose_event     (GtkWidget                   *widget,
-						       GdkEventExpose              *event);
-static void nautilus_clickable_image_realize          (GtkWidget                   *widget);
-
-/* Ancestor callbacks */
-static int  ancestor_enter_notify_event               (GtkWidget                   *widget,
-						       GdkEventCrossing            *event,
-						       gpointer                     event_data);
-static int  ancestor_leave_notify_event               (GtkWidget                   *widget,
-						       GdkEventCrossing            *event,
-						       gpointer                     event_data);
-static int  ancestor_motion_notify_event              (GtkWidget                   *widget,
-						       GdkEventMotion              *event,
-						       gpointer                     event_data);
-static int  ancestor_button_press_event               (GtkWidget                   *widget,
-						       GdkEventButton              *event,
-						       gpointer                     event_data);
-static int  ancestor_button_release_event             (GtkWidget                   *widget,
-						       GdkEventButton              *event,
-						       gpointer                     event_data);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusClickableImage, nautilus_clickable_image, NAUTILUS_TYPE_LABELED_IMAGE)
-
-/* Class init methods */
-static void
-nautilus_clickable_image_initialize_class (NautilusClickableImageClass *image_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (image_class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (image_class);
-	
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_clickable_image_destroy;
-	object_class->get_arg = nautilus_clickable_image_get_arg;
-	
- 	/* GtkWidgetClass */
- 	widget_class->expose_event = nautilus_clickable_image_expose_event;
- 	widget_class->realize = nautilus_clickable_image_realize;
-
-	/* Signals */
-	clickable_image_signals[CLICKED] = gtk_signal_new ("clicked",
-							   GTK_RUN_LAST,
-							   object_class->type,
-							   0,
-							   gtk_marshal_NONE__NONE,
-							   GTK_TYPE_NONE, 
-							   0);
-
-	clickable_image_signals[ENTER] = gtk_signal_new ("enter",
-							 GTK_RUN_LAST,
-							 object_class->type,
-							 0,
-							 gtk_marshal_NONE__NONE,
-							 GTK_TYPE_NONE, 
-							 0);
-
-	clickable_image_signals[LEAVE] = gtk_signal_new ("leave",
-							 GTK_RUN_LAST,
-							 object_class->type,
-							 0,
-							 gtk_marshal_NONE__NONE,
-							 GTK_TYPE_NONE, 
-							 0);
-
-	gtk_object_class_add_signals (object_class, clickable_image_signals, LAST_SIGNAL);
-
-	/* Arguments */
-	gtk_object_add_arg_type ("NautilusClickableImage::pointer_inside",
-				 GTK_TYPE_BOOL,
-				 GTK_ARG_READABLE,
-				 ARG_POINTER_INSIDE);
-}
-
-void
-nautilus_clickable_image_initialize (NautilusClickableImage *image)
-{
-	image->details = g_new0 (NautilusClickableImageDetails, 1);
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_clickable_image_destroy (GtkObject *object)
-{
- 	NautilusClickableImage *clickable_image;
-	
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (object));
-
-	clickable_image = NAUTILUS_CLICKABLE_IMAGE (object);
-
-	g_free (clickable_image->details);
-
-	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-static void
-nautilus_clickable_image_get_arg (GtkObject *object,
-				  GtkArg *arg,
-				  guint arg_id)
-{
-	NautilusClickableImage *clickable_image;
-
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (object));
-	
-	clickable_image = NAUTILUS_CLICKABLE_IMAGE (object);
-
- 	switch (arg_id)
-	{
-	case ARG_POINTER_INSIDE:
-		GTK_VALUE_BOOL (*arg) = clickable_image->details->pointer_inside;
-		break;
-
- 	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* GtkWidgetClass methods */
-static void
-nautilus_clickable_image_realize (GtkWidget *widget)
-{
-	NautilusClickableImage *clickable_image;
-	GtkWidget *windowed_ancestor;
-
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (widget));
-	
-	clickable_image = NAUTILUS_CLICKABLE_IMAGE (widget);
-
-	/* Chain realize */
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
-
-	windowed_ancestor = nautilus_gtk_widget_find_windowed_ancestor (widget);
-	g_assert (GTK_IS_WIDGET (windowed_ancestor));
-	
-	gtk_widget_add_events (windowed_ancestor,
-			       GDK_BUTTON_PRESS_MASK
-			       | GDK_BUTTON_RELEASE_MASK
-			       | GDK_ENTER_NOTIFY_MASK
-			       | GDK_LEAVE_NOTIFY_MASK
-			       | GDK_POINTER_MOTION_MASK);
-
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "enter_notify_event",
-						    GTK_SIGNAL_FUNC (ancestor_enter_notify_event),
-						    widget,
-						    widget);
-	
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "leave_notify_event",
-						    GTK_SIGNAL_FUNC (ancestor_leave_notify_event),
-						    widget,
-						    widget);
-	
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "motion_notify_event",
-						    GTK_SIGNAL_FUNC (ancestor_motion_notify_event),
-						    widget,
-						    widget);
-	
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "button_press_event",
-						    GTK_SIGNAL_FUNC (ancestor_button_press_event),
-						    widget,
-						    widget);
-	
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "button_release_event",
-						    GTK_SIGNAL_FUNC (ancestor_button_release_event),
-						    widget,
-						    widget);
-}
-
-static void
-label_enter (NautilusClickableImage *clickable_image)
-{
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (clickable_image));
-	
-	clickable_image->details->pointer_inside = TRUE;
-
-	if (clickable_image->details->prelight) {
-		nautilus_labeled_image_set_pixbuf (NAUTILUS_LABELED_IMAGE (clickable_image),
-						   clickable_image->details->prelight_pixbuf);
-	}
-
-	gtk_widget_set_state (GTK_WIDGET (clickable_image), GTK_STATE_PRELIGHT);
-
-	gtk_signal_emit (GTK_OBJECT (clickable_image), 
-			 clickable_image_signals[ENTER],
-			 clickable_image);
-}
-
-static void
-label_leave (NautilusClickableImage *clickable_image)
-{
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (clickable_image));
-	
-	clickable_image->details->pointer_inside = FALSE;
-
-	if (clickable_image->details->prelight) {
-		nautilus_labeled_image_set_pixbuf (NAUTILUS_LABELED_IMAGE (clickable_image),
-						   clickable_image->details->pixbuf); 
-	}
-
-	gtk_widget_set_state (GTK_WIDGET (clickable_image), GTK_STATE_NORMAL);
-
-	gtk_signal_emit (GTK_OBJECT (clickable_image), 
-			 clickable_image_signals[LEAVE],
-			 clickable_image);
-}
-
-static void
-label_handle_motion (NautilusClickableImage *clickable_image,
-		     int x,
-		     int y)
-{
-	ArtIRect bounds;
-
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (clickable_image));
-
-	bounds = nautilus_gtk_widget_get_bounds (GTK_WIDGET (clickable_image));
-	
-	if (nautilus_art_irect_contains_point (&bounds, x, y)) {
-		/* Inside */
-		if (!clickable_image->details->pointer_inside) {
-			label_enter (clickable_image);
-		}
-	} else {
-		/* Outside */
-		if (clickable_image->details->pointer_inside) {
-			label_leave (clickable_image);
-		}
-	}
-}
-
-static void
-label_handle_button_press (NautilusClickableImage *clickable_image)
-{
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (clickable_image));
-
-	gtk_widget_set_state (GTK_WIDGET (clickable_image), GTK_STATE_ACTIVE);
-	gtk_widget_queue_draw (GTK_WIDGET (clickable_image));
-}
-
-static void
-label_handle_button_release (NautilusClickableImage *clickable_image)
-{
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (clickable_image));
-
-	gtk_widget_set_state (GTK_WIDGET (clickable_image), GTK_STATE_PRELIGHT);
-	gtk_widget_queue_draw (GTK_WIDGET (clickable_image));
-
-	gtk_signal_emit (GTK_OBJECT (clickable_image), 
-			 clickable_image_signals[CLICKED],
-			 clickable_image);
-}
-
-static void
-adjust_coordinates_for_window (GdkWindow *widget_window, 
-			       GdkWindow *event_window,
-			       int *x,
-			       int *y)
-{
-	GdkWindow *window;
-	int wx, wy;
-	
-	/* Viewports place their children in a different GdkWindow
-	 * than their own widget window (perhaps other containers do
-	 * this to). Therefore if the event we got is on a different
-	 * GdkWindow than our own, adjust the coordinates.
-	 */
-
-	window = widget_window;
-
-	while (window != event_window && window != NULL) {
-		gdk_window_get_position	 (window, &wx, &wy);
-		*x -= wx;
-		*y -= wy;
-		window = gdk_window_get_parent (window);
-	}
-}
-
-static int
-ancestor_enter_notify_event (GtkWidget *widget,
-			     GdkEventCrossing *event,
-			     gpointer event_data)
-{
-	int x, y;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	x = event->x;
-	y = event->y;
-
-	adjust_coordinates_for_window (GTK_WIDGET (event_data)->window,
-				       widget->window,
-				       &x, &y);
-
-	label_handle_motion (NAUTILUS_CLICKABLE_IMAGE (event_data), x, y);
-
-	return FALSE;
-}
-
-static int
-ancestor_leave_notify_event (GtkWidget *widget,
-			     GdkEventCrossing *event,
-			     gpointer event_data)
-{
-	int x, y;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	x = event->x;
-	y = event->y;
-
-	adjust_coordinates_for_window (GTK_WIDGET (event_data)->window,
-				       widget->window,
-				       &x, &y);
-
-	label_handle_motion (NAUTILUS_CLICKABLE_IMAGE (event_data), x, y);
-
-	return FALSE;
-}
-
-static int
-ancestor_motion_notify_event (GtkWidget *widget,
-			      GdkEventMotion *event,
-			      gpointer event_data)
-{
-	int x, y;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	x = event->x;
-	y = event->y;
-
-	adjust_coordinates_for_window (GTK_WIDGET (event_data)->window,
-				       widget->window,
-				       &x, &y);
-
-	label_handle_motion (NAUTILUS_CLICKABLE_IMAGE (event_data), x, y);
-
-	return FALSE;
-}
-
-static int
-ancestor_button_press_event (GtkWidget *widget,
-			     GdkEventButton *event,
-			     gpointer event_data)
-{
-  	NautilusClickableImage *clickable_image;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
- 	clickable_image = NAUTILUS_CLICKABLE_IMAGE (event_data);
-
-	gtk_grab_add (widget);
-
-	if (clickable_image->details->pointer_inside) {
-		label_handle_button_press (NAUTILUS_CLICKABLE_IMAGE (event_data));
-	}
-
-	return FALSE;
-}
-
-static int
-ancestor_button_release_event (GtkWidget *widget,
-			       GdkEventButton *event,
-			       gpointer event_data)
-{
-  	NautilusClickableImage *clickable_image;
-	int x, y;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
- 	clickable_image = NAUTILUS_CLICKABLE_IMAGE (event_data);
-
-	gtk_grab_remove (widget);
-
-	x = event->x;
-	y = event->y;
-
-	adjust_coordinates_for_window (GTK_WIDGET (event_data)->window,
-				       widget->window,
-				       &x, &y);
-
-	label_handle_motion (NAUTILUS_CLICKABLE_IMAGE (event_data), x, y);
-
-	if (clickable_image->details->pointer_inside) {
-		label_handle_button_release (NAUTILUS_CLICKABLE_IMAGE (event_data));
-	}
-
-	return FALSE;
-}
-
-static int
-nautilus_clickable_image_expose_event (GtkWidget *widget,
-				       GdkEventExpose *event)
-{
-  	NautilusClickableImage *clickable_image;
-
-	g_return_val_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (widget), TRUE);
-	g_return_val_if_fail (event != NULL, TRUE);
-	g_return_val_if_fail (event->window == widget->window, TRUE);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
-	
- 	clickable_image = NAUTILUS_CLICKABLE_IMAGE (widget);
-
-	/* Chain expose */
-	return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
-		(GTK_WIDGET_CLASS, expose_event, (widget, event));
-}
-
-static void 
-nautilus_clickable_image_set_up_pixbufs (NautilusClickableImage *clickable_image)
-{
-	clickable_image->details->pixbuf =
-		nautilus_labeled_image_get_pixbuf (NAUTILUS_LABELED_IMAGE (clickable_image));
-
-	if (clickable_image->details->pixbuf != NULL) {
-		clickable_image->details->prelight_pixbuf = nautilus_create_spotlight_pixbuf 
-			(clickable_image->details->pixbuf);
-	}
-} 
-
-/* Public NautilusClickableImage methods */
-
-/**
- * nautilus_clickable_image_new:
- *
- * @text: Text for label or NULL.
- * @pixbuf: A GdkPixbuf to or NULL.
-
- * Create a clickable image with a solid background.
- *
- * Return value: The newly allocated NautilusClickableImage with the
- * given text and pixbuf.  Either of these two can be NULL.
- */
-GtkWidget*
-nautilus_clickable_image_new (const char *text,
-			      GdkPixbuf *pixbuf)
-{
-	NautilusClickableImage *clickable_image;
-	
-	clickable_image = NAUTILUS_CLICKABLE_IMAGE (gtk_widget_new (nautilus_clickable_image_get_type (), NULL));
-	
-	if (pixbuf != NULL) {
-		nautilus_labeled_image_set_pixbuf (NAUTILUS_LABELED_IMAGE (clickable_image), pixbuf);
-	}
-
-	if (text != NULL) {
-		nautilus_labeled_image_set_text (NAUTILUS_LABELED_IMAGE (clickable_image), text);
-	}
-
-	return GTK_WIDGET (clickable_image);
-}
-
-GtkWidget*
-nautilus_clickable_image_new_from_file_name (const char *text,
-					     const char *pixbuf_file_name)
-{
-	NautilusClickableImage *clickable_image;
-
-	g_return_val_if_fail (pixbuf_file_name != NULL, NULL);
-	
-	clickable_image = NAUTILUS_CLICKABLE_IMAGE (nautilus_clickable_image_new (text, NULL));
-	
-	nautilus_labeled_image_set_pixbuf_from_file_name (NAUTILUS_LABELED_IMAGE (clickable_image), pixbuf_file_name);
-
-	return GTK_WIDGET (clickable_image);
-}
-
-/**
- * nautilus_clickable_image_new_solid:
- *
- * @text: Text for label or NULL.
- * @pixbuf: A GdkPixbuf to or NULL.
- * @drop_shadow_offset: Drop shadow offset.
- * @drop_shadow_color: Drop shadow color.
- * @text_color: Text color.
- * @x_alignment: Horizontal alignment.
- * @y_alignmtn: Vertical alignment.
- * @x_padding: Horizontal padding.
- * @y_padding: Vertical padding.
- * @background_color: Background color.
- * @tile_pixbuf: A GdkPixbuf or NULL.
- *
- * Create a clickable image with a solid background.
- *
- * Return value: The newly allocated NautilusClickableImage with the
- * given attributes.
- */
-GtkWidget *
-nautilus_clickable_image_new_solid (const char *text,
-				    GdkPixbuf *pixbuf,
-				    guint drop_shadow_offset,
-				    guint32 drop_shadow_color,
-				    guint32 text_color,
-				    float x_alignment,
-				    float y_alignment,
-				    int x_padding,
-				    int y_padding,
-				    guint32 background_color,
-				    GdkPixbuf *tile_pixbuf)
-{
-	NautilusClickableImage *clickable_image;
-	NautilusLabeledImage *labeled_image;
-	
-	clickable_image = NAUTILUS_CLICKABLE_IMAGE (gtk_widget_new (nautilus_clickable_image_get_type (), NULL));
-
-	labeled_image = NAUTILUS_LABELED_IMAGE (clickable_image);
-
-	if (pixbuf != NULL) {
-		nautilus_labeled_image_set_pixbuf (labeled_image, pixbuf);
-	}
-
-	if (text != NULL) {
-		nautilus_labeled_image_set_text (labeled_image, text);
-	}
-
-	nautilus_labeled_image_set_background_mode (labeled_image, NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	nautilus_labeled_image_set_solid_background_color (labeled_image, background_color);
-	nautilus_labeled_image_set_smooth_drop_shadow_color (labeled_image, drop_shadow_color);
-	nautilus_labeled_image_set_smooth_drop_shadow_offset (labeled_image, drop_shadow_offset);
-	nautilus_labeled_image_set_text_color (labeled_image, text_color);
-	
-	if (tile_pixbuf != NULL) {
-			nautilus_labeled_image_set_tile_pixbuf (labeled_image, tile_pixbuf);
-	}
-
-	nautilus_labeled_image_set_x_padding (labeled_image, x_padding);
-	nautilus_labeled_image_set_y_padding (labeled_image, y_padding);
-	nautilus_labeled_image_set_x_alignment (labeled_image, x_alignment);
-	nautilus_labeled_image_set_y_alignment (labeled_image, y_alignment);
-	
-	return GTK_WIDGET (clickable_image);
-}
-
-/**
- * nautilus_clickable_image_new:
- *
- * @clickable_image: A NautilusClickableImage
- * @prelight: a gboolean specifying wether to prelight
- *
- * Enable or disable auto-prelight mode. You can't change the pixbuf
- * while prelight mode is on; as a workaround, you can turn prelight
- * off, change the pixbuf, and then turn it back on.
- * 
- */
-
-void
-nautilus_clickable_image_set_prelight (NautilusClickableImage *clickable_image,
-				       gboolean prelight)
-{
-	/* FIXME: you can't change the pixbuf with prelight mode on */
-
-	if (!clickable_image->details->prelight && prelight) {
-		nautilus_clickable_image_set_up_pixbufs (clickable_image);
-		clickable_image->details->prelight = TRUE;
-		if (clickable_image->details->pointer_inside) {
-			nautilus_labeled_image_set_pixbuf 
-				(NAUTILUS_LABELED_IMAGE (clickable_image),
-				 clickable_image->details->prelight_pixbuf);
-		}
-	}
-
-	if (clickable_image->details->prelight && !prelight) {
-		if (clickable_image->details->pointer_inside) {
-			nautilus_labeled_image_set_pixbuf 
-				(NAUTILUS_LABELED_IMAGE (clickable_image),
-				 clickable_image->details->pixbuf);
-		}
-
-		gdk_pixbuf_unref (clickable_image->details->pixbuf);
-		clickable_image->details->pixbuf = NULL;
-		gdk_pixbuf_unref (clickable_image->details->prelight_pixbuf);
-		clickable_image->details->prelight_pixbuf = NULL;
-		clickable_image->details->prelight = FALSE;
-	}
-}
diff --git a/libnautilus-private/nautilus-clickable-image.h b/libnautilus-private/nautilus-clickable-image.h
deleted file mode 100644
index 7f1eb458d..000000000
--- a/libnautilus-private/nautilus-clickable-image.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-clickable-image.h - A clickable image widget.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-/* NautilusClickableImage is a NautilusLabeledImage sublclass with signals
- * usful for detecting user click and prelight events.
- *
- * The following signals are provided by NautilusClickableImage:
- *
- * "clicked" - Widget was clicked
- * "enter"   - Pointer entered widget.
- * "leave"   - Pointer left widget.
- *
- * NautilusClickableImage is a NO_WINDOW widget.  It does its event detection
- * by monitoring events on the first windowed ancestor in its widget hierarchy.
- *
- * Being a NO_WINDOW widget, it will work nicely with tile_pixbufs.
- */
-
-#ifndef NAUTILUS_CLICKABLE_IMAGE_H
-#define NAUTILUS_CLICKABLE_IMAGE_H
-
-#include <libnautilus-extensions/nautilus-labeled-image.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_CLICKABLE_IMAGE            (nautilus_clickable_image_get_type ())
-#define NAUTILUS_CLICKABLE_IMAGE(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_CLICKABLE_IMAGE, NautilusClickableImage))
-#define NAUTILUS_CLICKABLE_IMAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CLICKABLE_IMAGE, NautilusClickableImageClass))
-#define NAUTILUS_IS_CLICKABLE_IMAGE(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_CLICKABLE_IMAGE))
-#define NAUTILUS_IS_CLICKABLE_IMAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_CLICKABLE_IMAGE))
-
-typedef struct _NautilusClickableImage	        NautilusClickableImage;
-typedef struct _NautilusClickableImageClass     NautilusClickableImageClass;
-typedef struct _NautilusClickableImageDetails   NautilusClickableImageDetails;
-
-struct _NautilusClickableImage
-{
-	/* Superclass */
-	NautilusLabeledImage labeled_image;
-
-	/* Private things */
-	NautilusClickableImageDetails *details;
-};
-
-struct _NautilusClickableImageClass
-{
-	NautilusLabeledImageClass parent_class;
-	
-	void (*clicked) (NautilusClickableImage *image);
-	void (*enter) (NautilusClickableImage *image);
-	void (*leave) (NautilusClickableImage *image);
-};
-
-GtkType    nautilus_clickable_image_get_type           (void);
-GtkWidget *nautilus_clickable_image_new                (const char *text,
-							GdkPixbuf  *pixbuf);
-GtkWidget *nautilus_clickable_image_new_from_file_name (const char *text,
-							const char *pixbuf_file_name);
-GtkWidget *nautilus_clickable_image_new_solid          (const char *text,
-							GdkPixbuf  *pixbuf,
-							guint       drop_shadow_offset,
-							guint32     drop_shadow_color,
-							guint32     text_color,
-							float       x_alignment,
-							float       y_alignment,
-							int         x_padding,
-							int         y_padding,
-							guint32     background_color,
-							GdkPixbuf  *tile_pixbuf);
-
-void       nautilus_clickable_image_set_prelight       (NautilusClickableImage *clickable_image,
-							gboolean prelight);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_CLICKABLE_IMAGE_H */
-
-
diff --git a/libnautilus-private/nautilus-ctree.c b/libnautilus-private/nautilus-ctree.c
index 3c64dfef7..029f04128 100644
--- a/libnautilus-private/nautilus-ctree.c
+++ b/libnautilus-private/nautilus-ctree.c
@@ -39,9 +39,9 @@
 #include <gtk/gtkbindings.h>
 #include <gtk/gtkdnd.h>
 #include <gtk/gtkmain.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-graphic-effects.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-graphic-effects.h>
+#include <eel/eel-gtk-extensions.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -1933,7 +1933,7 @@ draw_row (NautilusCList     *clist,
 		      
 		      if (src_pixbuf != NULL) {
 			      /* Create darkened pixbuf */			
-			      dark_pixbuf = nautilus_create_darkened_pixbuf (src_pixbuf,
+			      dark_pixbuf = eel_create_darkened_pixbuf (src_pixbuf,
 									     0.8 * 255,
 									     0.8 * 255);
 			      if (dark_pixbuf != NULL) {
@@ -5939,7 +5939,7 @@ nautilus_ctree_drag_begin (GtkWidget	     *widget,
 		  (NAUTILUS_CTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf;
 	  if (pixbuf)
 	    {
-	      nautilus_drag_set_icon_pixbuf (context, pixbuf, -2, -2);
+	      eel_drag_set_icon_pixbuf (context, pixbuf, -2, -2);
 	      return;
 	    }
 	}
diff --git a/libnautilus-private/nautilus-customization-data.c b/libnautilus-private/nautilus-customization-data.c
index ce14234c2..7f203e764 100644
--- a/libnautilus-private/nautilus-customization-data.c
+++ b/libnautilus-private/nautilus-customization-data.c
@@ -39,14 +39,14 @@
 #include <libgnome/gnome-defs.h>
 
 #include "nautilus-customization-data.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include "nautilus-file-utilities.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-xml-extensions.h"
-#include "nautilus-string.h"
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-xml-extensions.h>
+#include <eel/eel-string.h>
 
 typedef enum {
 	READ_PUBLIC_CUSTOMIZATIONS,
@@ -190,8 +190,8 @@ nautilus_customization_data_get_next_element_for_display (NautilusCustomizationD
 
 	g_assert (current_file_info != NULL);
 
-	if (!nautilus_istr_has_prefix (current_file_info->mime_type, "image/") ||
-	    nautilus_istr_has_prefix (current_file_info->name, ".")) {
+	if (!eel_istr_has_prefix (current_file_info->mime_type, "image/") ||
+	    eel_istr_has_prefix (current_file_info->name, ".")) {
 		
 		return nautilus_customization_data_get_next_element_for_display (data,
 										 emblem_name,
@@ -209,7 +209,7 @@ nautilus_customization_data_get_next_element_for_display (NautilusCustomizationD
 	if (!strcmp(data->customization_name, "patterns")) {
 		pixbuf = nautilus_customization_make_pattern_chit (orig_pixbuf, data->pattern_frame, FALSE);
 	} else {
-		pixbuf = nautilus_gdk_pixbuf_scale_down_to_fit (orig_pixbuf, 
+		pixbuf = eel_gdk_pixbuf_scale_down_to_fit (orig_pixbuf, 
 								data->maximum_icon_width, 
 								data->maximum_icon_height);
 		gdk_pixbuf_unref (orig_pixbuf);
@@ -223,7 +223,7 @@ nautilus_customization_data_get_next_element_for_display (NautilusCustomizationD
 	   label because anti-aliased text doesn't look right
 	   in menus */
 	if (data->data_is_for_a_menu) {
-		*label_out = nautilus_truncate_text_for_menu_item (filtered_name);
+		*label_out = eel_truncate_text_for_menu_item (filtered_name);
 	}
 	else {
 		*label_out = g_strdup (filtered_name);
@@ -257,7 +257,7 @@ nautilus_customization_data_destroy (NautilusCustomizationData *data)
 	gnome_vfs_file_info_list_free (data->private_file_list);
 
 	if (data->name_map_hash != NULL) {
-		nautilus_g_hash_table_destroy_deep (data->name_map_hash);	
+		eel_g_hash_table_destroy_deep (data->name_map_hash);	
 	}
 	
 	g_free (data->customization_name);
@@ -373,7 +373,7 @@ format_name_for_display (NautilusCustomizationData *data, const char* name)
 
 	/* don't display a name for the "reset" property, since its name is
 	   contained in its image and also to help distinguish it */  
-	if (!nautilus_strcmp(name, RESET_IMAGE_NAME)) {
+	if (!eel_strcmp(name, RESET_IMAGE_NAME)) {
 		return g_strdup("");
 	}
 
@@ -414,12 +414,12 @@ load_name_map_hash_table (NautilusCustomizationData *data)
 
 		if (browser_data) {
 			/* get the category node */
-			category_node = nautilus_xml_get_root_child_by_name_and_property (browser_data, "category", "name", data->customization_name);
+			category_node = eel_xml_get_root_child_by_name_and_property (browser_data, "category", "name", data->customization_name);
 			current_node = category_node->childs;	
 			
 			/* loop through the entries, adding a mapping to the hash table */
 			while (current_node != NULL) {
-				display_name = nautilus_xml_get_property_translated (current_node, "display_name");
+				display_name = eel_xml_get_property_translated (current_node, "display_name");
 				filename = xmlGetProp (current_node, "filename");
 				if (display_name && filename) {
 					g_hash_table_insert (data->name_map_hash, g_strdup (filename), g_strdup (display_name));
diff --git a/libnautilus-private/nautilus-dateedit-extensions.c b/libnautilus-private/nautilus-dateedit-extensions.c
index 0b0288ffd..32080e679 100644
--- a/libnautilus-private/nautilus-dateedit-extensions.c
+++ b/libnautilus-private/nautilus-dateedit-extensions.c
@@ -31,7 +31,7 @@
 #include "nautilus-dateedit-extensions.h"
 
 char *
-nautilus_gnome_date_edit_get_date_as_string (GnomeDateEdit *dateedit)
+eel_gnome_date_edit_get_date_as_string (GnomeDateEdit *dateedit)
 {
 	struct tm *time_struct;
 	time_t selected_time;
diff --git a/libnautilus-private/nautilus-dateedit-extensions.h b/libnautilus-private/nautilus-dateedit-extensions.h
index 01bc6ef66..25176491e 100644
--- a/libnautilus-private/nautilus-dateedit-extensions.h
+++ b/libnautilus-private/nautilus-dateedit-extensions.h
@@ -28,4 +28,4 @@
 #include <time.h>
 #include <libgnomeui/gnome-dateedit.h>
 
-char *      nautilus_gnome_date_edit_get_date_as_string        (GnomeDateEdit *dateedit);
+char *      eel_gnome_date_edit_get_date_as_string        (GnomeDateEdit *dateedit);
diff --git a/libnautilus-private/nautilus-debug-drawing.c b/libnautilus-private/nautilus-debug-drawing.c
deleted file mode 100644
index dcdec1548..000000000
--- a/libnautilus-private/nautilus-debug-drawing.c
+++ /dev/null
@@ -1,515 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-debug-drawing.c: Nautilus drawing debugging aids.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-debug-drawing.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtksignal.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-
-/*
- * PixbufViewer is a very simple "private" widget that displays
- * a GdkPixbuf.  It is used by nautilus_debug_show_pixbuf() to
- * display a pixbuf in an in process pixbuf debugging window.
- *
- * We cant use NautilusImage for this because part of the reason
- * for pixbuf debugging is to debug NautilusImage itself.
- */
-#define DEBUG_TYPE_PIXBUF_VIEWER (debug_pixbuf_viewer_get_type ())
-#define DEBUG_PIXBUF_VIEWER(obj) (GTK_CHECK_CAST ((obj), DEBUG_TYPE_PIXBUF_VIEWER, DebugPixbufViewer))
-#define DEBUG_IS_PIXBUF_VIEWER(obj) (GTK_CHECK_TYPE ((obj), DEBUG_TYPE_PIXBUF_VIEWER))
-
-typedef struct _DebugPixbufViewer DebugPixbufViewer;
-typedef struct _DebugPixbufViewerClass DebugPixbufViewerClass;
-
-GtkType     debug_pixbuf_viewer_get_type   (void);
-static void debug_pixbuf_viewer_set_pixbuf (DebugPixbufViewer *viewer,
-					    GdkPixbuf         *pixbuf);
-
-struct _DebugPixbufViewer
-{
-	GtkWidget widget;
-	GdkPixbuf *pixbuf;
-};
-
-struct _DebugPixbufViewerClass
-{
-	GtkWidgetClass parent_class;
-};
-
-/* GtkObjectClass methods */
-static void debug_pixbuf_viewer_initialize_class (DebugPixbufViewerClass *pixbuf_viewer_class);
-static void debug_pixbuf_viewer_initialize       (DebugPixbufViewer      *pixbuf_viewer);
-static void debug_pixbuf_viewer_destroy          (GtkObject              *object);
-
-/* GtkWidgetClass methods */
-static void debug_pixbuf_viewer_size_request     (GtkWidget              *widget,
-						  GtkRequisition         *requisition);
-static int  debug_pixbuf_viewer_expose_event     (GtkWidget              *widget,
-						  GdkEventExpose         *event);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (DebugPixbufViewer, debug_pixbuf_viewer, GTK_TYPE_WIDGET)
-
-static void
-debug_pixbuf_viewer_initialize_class (DebugPixbufViewerClass *pixbuf_viewer_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (pixbuf_viewer_class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (pixbuf_viewer_class);
-
-	object_class->destroy = debug_pixbuf_viewer_destroy;
-	widget_class->size_request = debug_pixbuf_viewer_size_request;
-	widget_class->expose_event = debug_pixbuf_viewer_expose_event;
-}
-
-static void
-debug_pixbuf_viewer_initialize (DebugPixbufViewer *viewer)
-{
-	GTK_WIDGET_UNSET_FLAGS (viewer, GTK_CAN_FOCUS);
-	GTK_WIDGET_SET_FLAGS (viewer, GTK_NO_WINDOW);
-}
-
-static void
-debug_pixbuf_viewer_destroy (GtkObject *object)
-{
- 	DebugPixbufViewer *viewer;
-
-	g_return_if_fail (DEBUG_IS_PIXBUF_VIEWER (object));
-
-	viewer = DEBUG_PIXBUF_VIEWER (object);
-	nautilus_gdk_pixbuf_unref_if_not_null (viewer->pixbuf);
-	viewer->pixbuf = NULL;
-
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-static void
-debug_pixbuf_viewer_size_request (GtkWidget *widget, GtkRequisition *requisition)
-{
-	DebugPixbufViewer *viewer;
-	NautilusDimensions dimensions;
-
-	g_return_if_fail (DEBUG_IS_PIXBUF_VIEWER (widget));
-	g_return_if_fail (requisition != NULL);
-	
-	viewer = DEBUG_PIXBUF_VIEWER (widget);
-
-	dimensions = (viewer->pixbuf != NULL) ?
-		nautilus_gdk_pixbuf_get_dimensions (viewer->pixbuf) :
-		NAUTILUS_DIMENSIONS_EMPTY;
-	
-   	requisition->width = MAX (2, dimensions.width);
-   	requisition->height = MAX (2, dimensions.height);
-}
-
-static int
-debug_pixbuf_viewer_expose_event (GtkWidget *widget, GdkEventExpose *event)
-{
- 	DebugPixbufViewer *viewer;
-	ArtIRect clipped_dirty_area;
-	ArtIRect dirty_area;
-	ArtIRect bounds;
-
-	g_return_val_if_fail (DEBUG_IS_PIXBUF_VIEWER (widget), TRUE);
-	g_return_val_if_fail (event != NULL, TRUE);
-	g_return_val_if_fail (event->window == widget->window, TRUE);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
-	
- 	viewer = DEBUG_PIXBUF_VIEWER (widget);
-
-	if (viewer->pixbuf == NULL) {
-		return TRUE;
-	}
-	
-	bounds.x0 = widget->allocation.x + (widget->allocation.width - gdk_pixbuf_get_width (viewer->pixbuf)) / 2;
-	bounds.y0 = widget->allocation.y + (widget->allocation.height - gdk_pixbuf_get_height (viewer->pixbuf)) / 2;
-	bounds.x1 = bounds.x0 + gdk_pixbuf_get_width (viewer->pixbuf);
-	bounds.y1 = bounds.y0 + gdk_pixbuf_get_height (viewer->pixbuf);
-	
-	/* Clip the dirty area to the screen; bail if no work to do */
-	dirty_area = nautilus_gdk_rectangle_to_art_irect (&event->area);
-	clipped_dirty_area = nautilus_gdk_window_clip_dirty_area_to_screen (event->window,
-										  &dirty_area);
-	if (!art_irect_empty (&clipped_dirty_area)) {
-		ArtIRect clipped_bounds;
-
-		art_irect_intersect (&clipped_bounds, &bounds, &clipped_dirty_area);
-
-		if (!art_irect_empty (&clipped_bounds)) {
-			g_assert (clipped_bounds.x0 >= bounds.x0);
-			g_assert (clipped_bounds.y0 >= bounds.y0);
-			
-			nautilus_gdk_pixbuf_draw_to_drawable (viewer->pixbuf,
-							      event->window,
-							      widget->style->white_gc,
-							      clipped_bounds.x0 - bounds.x0,
-							      clipped_bounds.y0 - bounds.y0,
-							      &clipped_bounds,
-							      GDK_RGB_DITHER_NONE,
-							      GDK_PIXBUF_ALPHA_BILEVEL,
-							      NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
-		}
-	}
-
-	bounds.x0 -= 1;
-	bounds.y0 -= 1;
-	bounds.x1 += 1;
-	bounds.y1 += 1;
-
-	return TRUE;
-}
-
-static void
-debug_pixbuf_viewer_set_pixbuf (DebugPixbufViewer *viewer, GdkPixbuf *pixbuf)
-{
-	g_return_if_fail (DEBUG_IS_PIXBUF_VIEWER (viewer));
-	
-	if (pixbuf != viewer->pixbuf) {
-		nautilus_gdk_pixbuf_unref_if_not_null (viewer->pixbuf);
-		nautilus_gdk_pixbuf_ref_if_not_null (pixbuf);
-		viewer->pixbuf = pixbuf;
-		gtk_widget_queue_resize (GTK_WIDGET (viewer));
-	}
-}
-
-/**
- * nautilus_debug_draw_rectangle_and_cross:
- * @rectangle: Rectangle bounding the rectangle.
- * @color: Color to use for the rectangle and cross.
- *
- * Draw a rectangle and cross.  Useful for debugging exposure events.
- */
-void
-nautilus_debug_draw_rectangle_and_cross (GdkDrawable *drawable,
-					 const ArtIRect *rectangle,
-					 guint32 color,
-					 gboolean draw_cross)
-{
-	GdkGC *gc;
-
-	int width;
-	int height;
-
-	g_return_if_fail (drawable != NULL);
-	g_return_if_fail (rectangle != NULL);
-	g_return_if_fail (rectangle->x1 > rectangle->x0);
-	g_return_if_fail (rectangle->y1 > rectangle->y0);
-
-	width = rectangle->x1 - rectangle->x0;
-	height = rectangle->y1 - rectangle->y0;
-
- 	gc = gdk_gc_new (drawable);
- 	gdk_gc_set_function (gc, GDK_COPY);
-	gdk_rgb_gc_set_foreground (gc, color);
-	
-	gdk_draw_rectangle (drawable,
-			    gc,
-			    FALSE,
-			    rectangle->x0,
-			    rectangle->y0,
-			    width - 1,
-			    height - 1);
-
-	if (draw_cross) {
-		gdk_draw_line (drawable,
-			       gc,
-			       rectangle->x0,
-			       rectangle->y0,
-			       rectangle->x0 + width - 1,
-			       rectangle->y0 + height - 1);
-		
-		gdk_draw_line (drawable,
-			       gc,
-			       rectangle->x0 + width - 1,
-			       rectangle->y0,
-			       rectangle->x0,
-			       rectangle->y0 + height - 1);
-	}
-
-	gdk_gc_unref (gc);
-}
-
-/**
- * nautilus_debug_show_pixbuf_in_eog:
- * @pixbuf: Pixbuf to show.
- *
- * Show the given pixbuf in eog.  This is very useful for debugging pixbuf
- * stuff.  Perhaps this function should be #ifdef DEBUG or something like that.
- */
-void
-nautilus_debug_show_pixbuf_in_eog (const GdkPixbuf *pixbuf)
-{
-	char *command;
-	char *file_name;
-	gboolean save_result;
-
-	g_return_if_fail (pixbuf != NULL);
-
-	file_name = g_strdup ("/tmp/nautilus-debug-png-file-XXXXXX");
-
-	if (mktemp (file_name) != file_name) {
-		g_free (file_name);
-		file_name = g_strdup_printf ("/tmp/isis-debug-png-file.%d", getpid ());
-	}
-
-	save_result = nautilus_gdk_pixbuf_save_to_file (pixbuf, file_name);
-
-	if (save_result == FALSE) {
-		g_warning ("Failed to save '%s'", file_name);
-		g_free (file_name);
-		return;
-	}
-	
-	command = g_strdup_printf ("eog %s", file_name);
-
-	system (command);
-	g_free (command);
-	remove (file_name);
-	g_free (file_name);
-}
-
-static GtkWidget *debug_window = NULL;
-static GtkWidget *debug_image = NULL;
-
-static void
-debug_delete_event (GtkWidget *widget, GdkEvent *event, gpointer callback_data)
-{
-	gtk_widget_hide (widget);
-}
-
-static void
-destroy_debug_window (void)
-{
-	if (debug_window != NULL) {
-		gtk_widget_destroy (debug_window);
-		debug_window = NULL;
-	}
-}
-
-/**
- * nautilus_debug_show_pixbuf_in:
- * @pixbuf: Pixbuf to show.
- *
- * Show the given pixbuf in an in process window.
- */
-void
-nautilus_debug_show_pixbuf (const GdkPixbuf *pixbuf)
-{
-	if (debug_window == NULL) {
-		GtkWidget *vbox;
-		
-		debug_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-		vbox = gtk_vbox_new (FALSE, 0);
-		gtk_container_add (GTK_CONTAINER (debug_window), vbox);
-		gtk_window_set_title (GTK_WINDOW (debug_window), "Pixbuf debugging");
-		gtk_window_set_policy (GTK_WINDOW (debug_window), TRUE, TRUE, FALSE);
-		gtk_container_set_border_width (GTK_CONTAINER (debug_window), 10);
-		gtk_signal_connect (GTK_OBJECT (debug_window), "delete_event", GTK_SIGNAL_FUNC (debug_delete_event), NULL);
-		
-		debug_image = gtk_widget_new (debug_pixbuf_viewer_get_type (), NULL);
-		
-		gtk_box_pack_start (GTK_BOX (vbox), debug_image, TRUE, TRUE, 0);
-
-		nautilus_gtk_widget_set_background_color (debug_window, "white");
-
-		g_atexit (destroy_debug_window);
-		
-		gtk_widget_show (debug_image);
-		gtk_widget_show (vbox);
-	}
-
-	gtk_widget_show (debug_window);
-	debug_pixbuf_viewer_set_pixbuf (DEBUG_PIXBUF_VIEWER (debug_image), (GdkPixbuf *) pixbuf);
-
-	gdk_window_clear_area_e (debug_window->window, 0, 0, -1, -1);
-}
-
-void
-nautilus_debug_pixbuf_draw_point (GdkPixbuf *pixbuf,
-				  int x,
-				  int y,
-				  guint32 color,
-				  int opacity)
-{
-	NautilusDimensions dimensions;
-	guchar *pixels;
-	gboolean has_alpha;
-	guint pixel_offset;
-	guint rowstride;
-	guchar red;
-	guchar green;
-	guchar blue;
-	guchar alpha;
-	guchar *offset;
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	dimensions = nautilus_gdk_pixbuf_get_dimensions (pixbuf);
-
-	g_return_if_fail (x >= 0 && x < dimensions.width);
-	g_return_if_fail (y >= 0 && y < dimensions.height);
-
-	pixels = gdk_pixbuf_get_pixels (pixbuf);
-	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-	has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
-	pixel_offset = has_alpha ? 4 : 3;
-
-	red = NAUTILUS_RGBA_COLOR_GET_R (color);
-	green = NAUTILUS_RGBA_COLOR_GET_G (color);
-	blue = NAUTILUS_RGBA_COLOR_GET_B (color);
-	alpha = (guchar) opacity;
-
-	offset = pixels + y * rowstride + x * pixel_offset;
-
-	*(offset + 0) = red;
-	*(offset + 1) = green;
-	*(offset + 2) = blue;
-	
-	if (has_alpha) {
-		*(offset + 3) = alpha;
-	}
-}
-
-void
-nautilus_debug_pixbuf_draw_rectangle (GdkPixbuf *pixbuf,
-				      gboolean filled,
-				      int x0,
-				      int y0,
-				      int x1,
-				      int y1,
-				      guint32 color,
-				      int opacity)
-{
-	NautilusDimensions dimensions;
-	int x;
-	int y;
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	dimensions = nautilus_gdk_pixbuf_get_dimensions (pixbuf);
-
-	if (x0 == -1) {
-		x0 = 0;
-	}
-
-	if (y0 == -1) {
-		y0 = 0;
-	}
-
-	if (x1 == -1) {
-		x1 = dimensions.width - 1;
-	}
-
-	if (y1 == -1) {
-		y1 = dimensions.height - 1;
-	}
-
-	g_return_if_fail (x1 > x0);
-	g_return_if_fail (y1 > y0);
-	g_return_if_fail (x0 >= 0 && x0 < dimensions.width);
-	g_return_if_fail (y0 >= 0 && y0 < dimensions.height);
-	g_return_if_fail (x1 >= 0 && x1 < dimensions.width);
-	g_return_if_fail (y1 >= 0 && y1 < dimensions.height);
-
-	if (filled) {
-		for (y = y0; y <= y1; y++) {
-			for (x = x0; x <= x1; x++) {
-				nautilus_debug_pixbuf_draw_point (pixbuf, x, y, color, opacity);
-			}
-		}
-	} else {
-		/* Top / Bottom */
-		for (x = x0; x <= x1; x++) {
-			nautilus_debug_pixbuf_draw_point (pixbuf, x, y0, color, opacity);
-			nautilus_debug_pixbuf_draw_point (pixbuf, x, y1, color, opacity);
-		}
-		
-		/* Left / Right */
-		for (y = y0; y <= y1; y++) {
-			nautilus_debug_pixbuf_draw_point (pixbuf, x0, y, color, opacity);
-			nautilus_debug_pixbuf_draw_point (pixbuf, x1, y, color, opacity);
-		}
-	}
-}
-
-void
-nautilus_debug_pixbuf_draw_rectangle_inset (GdkPixbuf *pixbuf,
-					    gboolean filled,
-					    int x0,
-					    int y0,
-					    int x1,
-					    int y1,
-					    guint32 color,
-					    int opacity,
-					    int inset)
-{
-	NautilusDimensions dimensions;
-	
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	dimensions = nautilus_gdk_pixbuf_get_dimensions (pixbuf);
-
-	if (x0 == -1) {
-		x0 = 0;
-	}
-
-	if (y0 == -1) {
-		y0 = 0;
-	}
-
-	if (x1 == -1) {
-		x1 = dimensions.width - 1;
-	}
-
-	if (y1 == -1) {
-		y1 = dimensions.height - 1;
-	}
-
-	x0 += inset;
-	y0 += inset;
-	x1 -= inset;
-	y1 -= inset;
-
-	g_return_if_fail (x1 > x0);
-	g_return_if_fail (y1 > y0);
-
-	nautilus_debug_pixbuf_draw_rectangle (pixbuf, filled, x0, y0, x1, y1, color, opacity);
-}
diff --git a/libnautilus-private/nautilus-debug-drawing.h b/libnautilus-private/nautilus-debug-drawing.h
deleted file mode 100644
index 08626a21c..000000000
--- a/libnautilus-private/nautilus-debug-drawing.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-debug-drawing.h: Nautilus drawing debugging aids.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_DEBUG_DRAWING_H
-#define NAUTILUS_DEBUG_DRAWING_H
-
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-
-/* Draw a rectangle and cross on the given window */
-void nautilus_debug_draw_rectangle_and_cross    (GdkDrawable     *drawable,
-						 const ArtIRect  *rectangle,
-						 guint32          color,
-						 gboolean         draw_cross);
-
-/* Show the given pixbuf in eog */
-void nautilus_debug_show_pixbuf_in_eog          (const GdkPixbuf *pixbuf);
-
-/* Show the given pixbuf in an in process window */
-void nautilus_debug_show_pixbuf                 (const GdkPixbuf *pixbuf);
-
-/* Draw a point in a pixbuf */
-void nautilus_debug_pixbuf_draw_point           (GdkPixbuf       *pixbuf,
-						 int              x,
-						 int              y,
-						 guint32          color,
-						 int              opacity);
-/* Draw a rectangle in a pixbuf.  The coordinates (-1,-1( (-1,-1) will use
- * the whole pixbuf. */
-void nautilus_debug_pixbuf_draw_rectangle       (GdkPixbuf       *pixbuf,
-						 gboolean         filled,
-						 int              x0,
-						 int              y0,
-						 int              x1,
-						 int              y1,
-						 guint32          color,
-						 int              opacity);
-/* Draw an inset rectangle in a pixbuf.  Positive inset make the rectangle
- * smaller.  Negative inset makes it larger.
- */
-void nautilus_debug_pixbuf_draw_rectangle_inset (GdkPixbuf       *pixbuf,
-						 gboolean         filled,
-						 int              x0,
-						 int              y0,
-						 int              x1,
-						 int              y1,
-						 guint32          color,
-						 int              opacity,
-						 int              inset);
-
-#endif /* NAUTILUS_DEBUG_DRAWING_H */
diff --git a/libnautilus-private/nautilus-debug.c b/libnautilus-private/nautilus-debug.c
deleted file mode 100644
index dc3ca62bd..000000000
--- a/libnautilus-private/nautilus-debug.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-debug.c: Nautilus debugging aids.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Darin Adler <darin@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-debug.h"
-
-#include <glib.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
-
-/* Raise a SIGINT signal to get the attention of the debugger.
-   When not running under the debugger, we don't want to stop,
-   so we ignore the signal for just the moment that we raise it.
-*/
-void
-nautilus_stop_in_debugger (void)
-{
-	void (* saved_handler) (int);
-
-	saved_handler = signal (SIGINT, SIG_IGN);
-	raise (SIGINT);
-	signal (SIGINT, saved_handler);
-}
-
-/* Stop in the debugger after running the default log handler.
-   This makes certain kinds of messages stop in the debugger
-   without making them fatal.
-*/
-static void
-nautilus_stop_after_default_log_handler (const char *domain,
-					 GLogLevelFlags level,
-					 const char *message,
-					 gpointer data)
-{
-	g_log_default_handler (domain, level, message, data);
-	nautilus_stop_in_debugger ();
-}
-
-static void
-nautilus_set_stop_after_default_log_handler (const char *domain)
-{
-	g_log_set_handler (domain, G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING,
-			   nautilus_stop_after_default_log_handler, NULL);
-}
-
-void
-nautilus_make_warnings_and_criticals_stop_in_debugger (const char *first_domain, ...)
-{
-	va_list domains;
-	const char *domain;
-
-	nautilus_set_stop_after_default_log_handler (first_domain);
-
-	va_start (domains, first_domain);
-
-	for (;;) {
-		domain = va_arg (domains, const char *);
-		if (domain == NULL) {
-			break;
-		}
-		nautilus_set_stop_after_default_log_handler (domain);
-	}
-
-	va_end (domains);
-}
-
-int 
-nautilus_get_available_file_descriptor_count (void)
-{
-	int count;
-	GList *list;
-	GList *p;
-	FILE *file;
-
-	list = NULL;
-	for (count = 0; ; count++) {
-		file = fopen("/dev/null", "r");
-		if (file == NULL) {
-			break;
-		}
-		list = g_list_prepend (list, file);
-	}
-
-	for (p = list; p != NULL; p = p->next) {
-		fclose (p->data);
-	}
-	g_list_free (list);
-
-	return count;
-}
-
-gboolean
-nautilus_str_equal_with_free (char *eat_this,
-			      const char *not_this)
-{
-	gboolean equal;
-
-	/* NULL is not legal. */
-	if (eat_this == NULL) {
-		equal = FALSE;
-	} else if (not_this == NULL) {
-		equal = FALSE;
-	} else {
-		equal = strcmp (eat_this, not_this) == 0;
-	}
-
-	g_free (eat_this);
-
-	return equal;
-}
diff --git a/libnautilus-private/nautilus-debug.h b/libnautilus-private/nautilus-debug.h
deleted file mode 100644
index db2d95162..000000000
--- a/libnautilus-private/nautilus-debug.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-debug.h: Nautilus debugging aids.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Darin Adler <darin@eazel.com>
-*/
-
-#ifndef NAUTILUS_DEBUG_H
-#define NAUTILUS_DEBUG_H
-
-#include <glib.h>
-
-#ifdef G_DISABLE_ASSERT
-
-#define nautilus_assert_computed_str(str_expr, expected_str)
-
-#else /* !G_DISABLE_ASSERT */
-
-gboolean nautilus_str_equal_with_free                          (char       *eat_this,
-								const char *not_this);
-
-#define nautilus_assert_computed_str(str_expr, expected_str) \
-	g_assert (nautilus_str_equal_with_free ((str_expr), (expected_str)))
-
-#endif /* !G_DISABLE_ASSERT */
-
-void     nautilus_stop_in_debugger                             (void);
-void     nautilus_make_warnings_and_criticals_stop_in_debugger (const char *first_domain,
-								...);
-int      nautilus_get_available_file_descriptor_count          (void);
-
-#endif /* NAUTILUS_DEBUG_H */
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index 868ebc5fe..6377e80ca 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -30,11 +30,11 @@
 #include "nautilus-directory-private.h"
 #include "nautilus-file-attributes.h"
 #include "nautilus-file-private.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 #include "nautilus-global-preferences.h"
 #include "nautilus-link.h"
 #include "nautilus-search-uri.h"
-#include "nautilus-string.h"
+#include <eel/eel-string.h>
 #include <ctype.h>
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
@@ -173,7 +173,7 @@ istr_set_get_as_list (GHashTable *table)
 static void
 istr_set_destroy (GHashTable *table)
 {
-	nautilus_g_hash_table_destroy_deep (table);
+	eel_g_hash_table_destroy_deep (table);
 }
 
 /* Start a job. This is really just a way of limiting the number of
@@ -197,7 +197,7 @@ async_job_start (NautilusDirectory *directory,
 
 	if (async_job_count >= MAX_ASYNC_JOBS) {
 		if (waiting_directories == NULL) {
-			waiting_directories = nautilus_g_hash_table_new_free_at_exit
+			waiting_directories = eel_g_hash_table_new_free_at_exit
 				(NULL, NULL,
 				 "nautilus-directory-async.c: waiting_directories");
 		}
@@ -211,7 +211,7 @@ async_job_start (NautilusDirectory *directory,
 
 #ifdef DEBUG_ASYNC_JOBS
 	if (async_jobs == NULL) {
-		async_jobs = nautilus_g_hash_table_new_free_at_exit
+		async_jobs = eel_g_hash_table_new_free_at_exit
 			(g_str_hash, g_str_equal,
 			 "nautilus-directory-async.c: async_jobs");
 	}
@@ -339,7 +339,7 @@ deep_count_cancel (NautilusDirectory *directory)
 		directory->details->deep_count_in_progress = NULL;
 		g_free (directory->details->deep_count_uri);
 		directory->details->deep_count_uri = NULL;
-		nautilus_g_list_free_deep (directory->details->deep_count_subdirectories);
+		eel_g_list_free_deep (directory->details->deep_count_subdirectories);
 		directory->details->deep_count_subdirectories = NULL;
 
 		async_job_end (directory, "deep count");
@@ -476,42 +476,42 @@ nautilus_directory_set_up_request (Request *request,
 	request->directory_count = g_list_find_custom
 		(file_attributes,
 		 NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT,
-		 nautilus_strcmp_compare_func) != NULL;
+		 eel_strcmp_compare_func) != NULL;
 	request->deep_count = g_list_find_custom
 		(file_attributes,
 		 NAUTILUS_FILE_ATTRIBUTE_DEEP_COUNTS,
-		 nautilus_strcmp_compare_func) != NULL;
+		 eel_strcmp_compare_func) != NULL;
 	request->mime_list = g_list_find_custom
 		(file_attributes,
 		 NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_MIME_TYPES,
-		 nautilus_strcmp_compare_func) != NULL;
+		 eel_strcmp_compare_func) != NULL;
 	request->file_info = g_list_find_custom
 		(file_attributes,
 		 NAUTILUS_FILE_ATTRIBUTE_MIME_TYPE,
-		 nautilus_strcmp_compare_func) != NULL;
+		 eel_strcmp_compare_func) != NULL;
 	request->file_info |= g_list_find_custom
 		(file_attributes,
 		 NAUTILUS_FILE_ATTRIBUTE_IS_DIRECTORY,
-		 nautilus_strcmp_compare_func) != NULL;
+		 eel_strcmp_compare_func) != NULL;
 	request->file_info |= g_list_find_custom
 		(file_attributes,
 		 NAUTILUS_FILE_ATTRIBUTE_CAPABILITIES,
-		 nautilus_strcmp_compare_func) != NULL;
+		 eel_strcmp_compare_func) != NULL;
 	request->file_info |= g_list_find_custom
 		(file_attributes,
 		 NAUTILUS_FILE_ATTRIBUTE_FILE_TYPE,
-		 nautilus_strcmp_compare_func) != NULL;
+		 eel_strcmp_compare_func) != NULL;
 	
 	if (g_list_find_custom (file_attributes,
 				NAUTILUS_FILE_ATTRIBUTE_TOP_LEFT_TEXT,
-				nautilus_strcmp_compare_func) != NULL) {
+				eel_strcmp_compare_func) != NULL) {
 		request->top_left_text = TRUE;
 		request->file_info = TRUE;
 	}
 	
 	if (g_list_find_custom (file_attributes,
 				NAUTILUS_FILE_ATTRIBUTE_ACTIVATION_URI,
-				nautilus_strcmp_compare_func) != NULL) {
+				eel_strcmp_compare_func) != NULL) {
 		request->file_info = TRUE;
 		request->activation_uri = TRUE;
 	}
@@ -519,7 +519,7 @@ nautilus_directory_set_up_request (Request *request,
 	request->metafile |= g_list_find_custom
 		(file_attributes,
 		 NAUTILUS_FILE_ATTRIBUTE_METADATA,
-		 nautilus_strcmp_compare_func) != NULL;
+		 eel_strcmp_compare_func) != NULL;
 
 	/* FIXME bugzilla.eazel.com 2435:
 	 * Some file attributes are really pieces of metadata.
@@ -535,7 +535,7 @@ nautilus_directory_set_up_request (Request *request,
 	request->metafile |= g_list_find_custom
 		(file_attributes,
 		 NAUTILUS_FILE_ATTRIBUTE_CUSTOM_ICON,
-		 nautilus_strcmp_compare_func) != NULL;
+		 eel_strcmp_compare_func) != NULL;
 }
 
 static gboolean
@@ -554,7 +554,7 @@ get_non_tentative_file_list (NautilusDirectory *directory)
 {
 	GList *tentative_files, *non_tentative_files;
 
-	tentative_files = nautilus_g_list_partition
+	tentative_files = eel_g_list_partition
 		(g_list_copy (directory->details->file_list),
 		 is_tentative, NULL, &non_tentative_files);
 	g_list_free (tentative_files);
@@ -2255,7 +2255,7 @@ mime_list_callback (GnomeVFSAsyncHandle *handle,
 	file->details->mime_list_is_up_to_date = TRUE;
 
 	/* Record either a failure or success. */
-	nautilus_g_list_free_deep (file->details->mime_list);
+	eel_g_list_free_deep (file->details->mime_list);
 	if (result != GNOME_VFS_ERROR_EOF) {
 		file->details->mime_list_failed = TRUE;
 		file->details->mime_list = NULL;
@@ -2486,7 +2486,7 @@ get_info_callback (GnomeVFSAsyncHandle *handle,
 
 	directory = NAUTILUS_DIRECTORY (callback_data);
 	g_assert (handle == NULL || handle == directory->details->get_info_in_progress);
-	g_assert (nautilus_g_list_exactly_one_item (results));
+	g_assert (eel_g_list_exactly_one_item (results));
 	get_info_file = directory->details->get_info_file;
 	g_assert (NAUTILUS_IS_FILE (get_info_file));
 
@@ -2670,7 +2670,7 @@ activation_uri_gmc_link_read_callback (GnomeVFSResult result,
 	nautilus_directory_ref (directory);
 
 	/* Handle the case where we read the GMC link. */
-	if (result != GNOME_VFS_OK || !nautilus_str_has_prefix (file_contents, "URL: ")) {
+	if (result != GNOME_VFS_OK || !eel_str_has_prefix (file_contents, "URL: ")) {
 		/* FIXME bugzilla.eazel.com 2433: We should report this error to the user. */
 		uri = NULL;
 	} else {
@@ -2739,7 +2739,7 @@ activation_uri_start (NautilusDirectory *directory)
 
 	/* Figure out if it is a link. */
 	mime_type = nautilus_file_get_mime_type (file);
-	gmc_style_link = nautilus_strcasecmp (mime_type, "application/x-gmc-link") == 0;
+	gmc_style_link = eel_strcasecmp (mime_type, "application/x-gmc-link") == 0;
 	g_free (mime_type);
 	nautilus_style_link = nautilus_file_is_nautilus_link (file);
 	
diff --git a/libnautilus-private/nautilus-directory-background.c b/libnautilus-private/nautilus-directory-background.c
index 129bd19b4..e58356504 100644
--- a/libnautilus-private/nautilus-directory-background.c
+++ b/libnautilus-private/nautilus-directory-background.c
@@ -27,12 +27,12 @@
 #include <config.h>
 #include "nautilus-directory-background.h"
 
-#include "libnautilus-extensions/nautilus-gdk-extensions.h"
-#include "nautilus-background.h"
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-background.h>
 #include "nautilus-global-preferences.h"
 #include "nautilus-metadata.h"
 #include "nautilus-file-attributes.h"
-#include "nautilus-string.h"
+#include <eel/eel-string.h>
 #include "nautilus-theme.h"
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
@@ -42,31 +42,31 @@
 #include <libgnome/gnome-util.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
-static void background_changed_callback     (NautilusBackground *background, 
+static void background_changed_callback     (EelBackground *background, 
                                              NautilusFile       *file);
-static void background_reset_callback       (NautilusBackground *background, 
+static void background_reset_callback       (EelBackground *background, 
                                              NautilusFile       *file);
 
 static void saved_settings_changed_callback (NautilusFile       *file, 
-                                             NautilusBackground *background);
+                                             EelBackground *background);
                                          
-static void nautilus_file_background_receive_root_window_changes (NautilusBackground *background);
+static void nautilus_file_background_receive_root_window_changes (EelBackground *background);
 
-static void nautilus_file_update_desktop_pixmaps (NautilusBackground *background);
+static void nautilus_file_update_desktop_pixmaps (EelBackground *background);
 
 static void nautilus_file_background_write_desktop_settings (char *color,
 							     char *image,
-							     NautilusBackgroundImagePlacement placement);
+							     EelBackgroundImagePlacement placement);
 
 static gboolean nautilus_file_background_matches_default_settings (
 			const char* color, const char* default_color,
 			const char* image, const char* default_image,
-			NautilusBackgroundImagePlacement placement, NautilusBackgroundImagePlacement default_placement);
+			EelBackgroundImagePlacement placement, EelBackgroundImagePlacement default_placement);
 
 static void
 desktop_background_realized (NautilusIconContainer *icon_container, void *disconnect_signal)
 {
-	NautilusBackground *background;
+	EelBackground *background;
 
         if ((gboolean) GPOINTER_TO_INT (disconnect_signal)) {
 		gtk_signal_disconnect_by_func (GTK_OBJECT (icon_container),
@@ -74,7 +74,7 @@ desktop_background_realized (NautilusIconContainer *icon_container, void *discon
 					       disconnect_signal);
 	}
 
-	background = nautilus_get_widget_background (GTK_WIDGET (icon_container));
+	background = eel_get_widget_background (GTK_WIDGET (icon_container));
 
 	gtk_object_set_data (GTK_OBJECT (background), "icon_container", (gpointer) icon_container);
 
@@ -88,9 +88,9 @@ void
 nautilus_connect_desktop_background_to_file_metadata (NautilusIconContainer *icon_container,
                                                       NautilusFile *file)
 {
-	NautilusBackground *background;
+	EelBackground *background;
 
-	background = nautilus_get_widget_background (GTK_WIDGET (icon_container));
+	background = eel_get_widget_background (GTK_WIDGET (icon_container));
 
 	gtk_object_set_data (GTK_OBJECT (background), "theme_source", (gpointer) desktop_theme_source);
 
@@ -114,14 +114,14 @@ nautilus_connect_desktop_background_to_file_metadata (NautilusIconContainer *ico
 }
 
 static gboolean
-nautilus_background_is_desktop (NautilusBackground *background)
+eel_background_is_desktop (EelBackground *background)
 {
 	/* == works because we're carful to always use the same string.
 	 */
 	return gtk_object_get_data (GTK_OBJECT (background), "theme_source") == desktop_theme_source;
 }
 
-static const char *nautilus_file_background_peek_theme_source (NautilusBackground *background)
+static const char *nautilus_file_background_peek_theme_source (EelBackground *background)
 {
 	char *theme_source;
 
@@ -131,7 +131,7 @@ static const char *nautilus_file_background_peek_theme_source (NautilusBackgroun
 }
 
 static GdkWindow *
-nautilus_background_get_desktop_background_window (NautilusBackground *background)
+eel_background_get_desktop_background_window (EelBackground *background)
 {
 	gpointer layout;
 
@@ -146,9 +146,9 @@ theme_image_path_to_uri (char *image_file, const char *theme_name)
 	char *image_path;
 	char *image_uri;
 
-	if (image_file != NULL && !nautilus_istr_has_prefix (image_file, "file://")) {
+	if (image_file != NULL && !eel_istr_has_prefix (image_file, "file://")) {
 		
-		if (nautilus_str_has_prefix (image_file, "./")) {
+		if (eel_str_has_prefix (image_file, "./")) {
 			image_path = nautilus_theme_get_image_path_from_theme (image_file + 2, theme_name);
 		} else {
 			image_path = g_strdup_printf ("%s/%s", NAUTILUS_DATADIR, image_file);
@@ -173,12 +173,12 @@ nautilus_file_background_get_default_settings_for_theme (const char* theme_name,
 							  const char* theme_source,
 							  char **color,
 							  char **image,
-							  NautilusBackgroundImagePlacement *placement)
+							  EelBackgroundImagePlacement *placement)
 {
 	char *image_local_path;
 
 	if (placement != NULL) {
-		*placement = NAUTILUS_BACKGROUND_TILED;
+		*placement = EEL_BACKGROUND_TILED;
 	}
 
 	if (color != NULL) {
@@ -196,7 +196,7 @@ static void
 nautilus_file_background_get_default_settings (const char* theme_source,
                                                char **color,
                                                char **image,
-                                               NautilusBackgroundImagePlacement *placement)
+                                               EelBackgroundImagePlacement *placement)
 {
 	char *theme_name;
 	theme_name = nautilus_theme_get_theme ();
@@ -206,12 +206,12 @@ nautilus_file_background_get_default_settings (const char* theme_source,
 }
 
 static gboolean
-nautilus_gnome_config_string_match_no_case_with_default (const char *path, const char *test_value, gboolean *was_default)
+eel_gnome_config_string_match_no_case_with_default (const char *path, const char *test_value, gboolean *was_default)
 {
 	char *value;
 	gboolean result;
 	value = gnome_config_get_string_with_default (path, was_default);
-	result = !nautilus_strcasecmp (value, test_value);
+	result = !eel_strcasecmp (value, test_value);
 	g_free (value);
 	return result;
 }
@@ -228,14 +228,14 @@ enum {
 static void
 nautilus_file_background_read_desktop_settings (char **color,
                                                 char **image,
-                                                NautilusBackgroundImagePlacement *placement)
+                                                EelBackgroundImagePlacement *placement)
 {
 	int	 image_alignment;
 	char*	 image_local_path;
 	char*	 default_image_uri;
 	gboolean no_alignment_set;
 	gboolean no_image_set;
-	NautilusBackgroundImagePlacement default_placement;
+	EelBackgroundImagePlacement default_placement;
 	
 	char	*end_color;
 	char	*start_color;
@@ -266,7 +266,7 @@ nautilus_file_background_read_desktop_settings (char **color,
 
 	if (no_image_set) {
 		*image = g_strdup (default_image_uri);
-	} else if (nautilus_strcasecmp (image_local_path, "none") != 0) {
+	} else if (eel_strcasecmp (image_local_path, "none") != 0) {
 		*image = gnome_vfs_get_uri_from_local_path (image_local_path);
 	} else {
 		*image = NULL;
@@ -287,24 +287,24 @@ nautilus_file_background_read_desktop_settings (char **color,
 				 * Just treat it as centered - ugh.
 				 */
 			case WALLPAPER_CENTERED:
-				*placement = NAUTILUS_BACKGROUND_CENTERED;
+				*placement = EEL_BACKGROUND_CENTERED;
 				break;
 			case WALLPAPER_TILED:
-				*placement = NAUTILUS_BACKGROUND_TILED;
+				*placement = EEL_BACKGROUND_TILED;
 				break;
 			case WALLPAPER_SCALED:
-				*placement = NAUTILUS_BACKGROUND_SCALED;
+				*placement = EEL_BACKGROUND_SCALED;
 				break;
 			case WALLPAPER_SCALED_KEEP:
-				*placement = NAUTILUS_BACKGROUND_SCALED_ASPECT;
+				*placement = EEL_BACKGROUND_SCALED_ASPECT;
 				break;
 		 }
 	}
 
 	end_color     = gnome_config_get_string_with_default ("/Background/Default/color2", &no_end_color_set);
 	start_color   = gnome_config_get_string_with_default ("/Background/Default/color1", &no_start_color_set);
-	use_gradient  = !nautilus_gnome_config_string_match_no_case_with_default ("/Background/Default/simple", "solid", &no_gradient_set);
-	is_horizontal = !nautilus_gnome_config_string_match_no_case_with_default ("/Background/Default/gradient", "vertical", &no_gradient_orientation_set);
+	use_gradient  = !eel_gnome_config_string_match_no_case_with_default ("/Background/Default/simple", "solid", &no_gradient_set);
+	is_horizontal = !eel_gnome_config_string_match_no_case_with_default ("/Background/Default/gradient", "vertical", &no_gradient_orientation_set);
 
 	if (no_gradient_set || no_gradient_orientation_set || no_start_color_set) {
 		*color = g_strdup (default_color);
@@ -312,7 +312,7 @@ nautilus_file_background_read_desktop_settings (char **color,
 		if (no_end_color_set) {
 			*color = g_strdup (default_color);
 		} else {
-			*color = nautilus_gradient_new (start_color, end_color , is_horizontal);
+			*color = eel_gradient_new (start_color, end_color , is_horizontal);
 		}
 	} else {
 		*color = g_strdup (start_color);
@@ -337,7 +337,7 @@ nautilus_file_background_read_desktop_settings (char **color,
 	cur_theme_name = nautilus_theme_get_theme ();
 
 	switch_to_cur_theme_default = !no_theme_name_set &&
-				      (nautilus_strcmp (theme_name, cur_theme_name) != 0) &&
+				      (eel_strcmp (theme_name, cur_theme_name) != 0) &&
 				      nautilus_file_background_matches_default_settings
 					(*color, default_color,
 					 *image, default_image_uri,
@@ -363,7 +363,7 @@ nautilus_file_background_read_desktop_settings (char **color,
 }
 
 static void
-nautilus_file_background_write_desktop_settings (char *color, char *image, NautilusBackgroundImagePlacement placement)
+nautilus_file_background_write_desktop_settings (char *color, char *image, EelBackgroundImagePlacement placement)
 {
 	char *end_color;
 	char *start_color;
@@ -379,20 +379,20 @@ nautilus_file_background_write_desktop_settings (char *color, char *image, Nauti
 	gboolean found_wallpaper;
 
 	if (color != NULL) {
-		start_color = nautilus_gradient_get_start_color_spec (color);
+		start_color = eel_gradient_get_start_color_spec (color);
 		gnome_config_set_string ("/Background/Default/color1", start_color);		
 		g_free (start_color);
 
 		/* if color is not a gradient, this ends up writing same as start_color */
-		end_color = nautilus_gradient_get_end_color_spec (color);
+		end_color = eel_gradient_get_end_color_spec (color);
 		gnome_config_set_string ("/Background/Default/color2", end_color);		
 		g_free (end_color);
 
-		gnome_config_set_string ("/Background/Default/simple", nautilus_gradient_is_gradient (color) ? "gradient" : "solid");
-		gnome_config_set_string ("/Background/Default/gradient", nautilus_gradient_is_horizontal (color) ? "horizontal" : "vertical");
+		gnome_config_set_string ("/Background/Default/simple", eel_gradient_is_gradient (color) ? "gradient" : "solid");
+		gnome_config_set_string ("/Background/Default/gradient", eel_gradient_is_horizontal (color) ? "horizontal" : "vertical");
 	} else {
 		/* We set it to white here because that's how backgrounds with a NULL color
-		 * are drawn by Nautilus - due to usage of nautilus_gdk_color_parse_with_white_default.
+		 * are drawn by Nautilus - due to usage of eel_gdk_color_parse_with_white_default.
 		 */
 		gnome_config_set_string ("/Background/Default/color1", "rgb:FFFF/FFFF/FFFF");		
 		gnome_config_set_string ("/Background/Default/color2", "rgb:FFFF/FFFF/FFFF");		
@@ -404,16 +404,16 @@ nautilus_file_background_write_desktop_settings (char *color, char *image, Nauti
 		image_local_path = gnome_vfs_get_local_path_from_uri (image);
 		gnome_config_set_string ("/Background/Default/wallpaper", image_local_path);
 		switch (placement) {
-			case NAUTILUS_BACKGROUND_TILED:
+			case EEL_BACKGROUND_TILED:
 				wallpaper_align = WALLPAPER_TILED;
 				break;	
-			case NAUTILUS_BACKGROUND_CENTERED:
+			case EEL_BACKGROUND_CENTERED:
 				wallpaper_align = WALLPAPER_CENTERED;
 				break;	
-			case NAUTILUS_BACKGROUND_SCALED:
+			case EEL_BACKGROUND_SCALED:
 				wallpaper_align = WALLPAPER_SCALED;
 				break;	
-			case NAUTILUS_BACKGROUND_SCALED_ASPECT:
+			case EEL_BACKGROUND_SCALED_ASPECT:
 				wallpaper_align = WALLPAPER_SCALED_KEEP;
 				break;
 			default:
@@ -430,7 +430,7 @@ nautilus_file_background_write_desktop_settings (char *color, char *image, Nauti
 			wallpaper_config_path_i = g_strdup_printf ("/Background/Default/wallpaper%d", i);
 			wallpaper_path_i = gnome_config_get_string (wallpaper_config_path_i);
 			g_free (wallpaper_config_path_i);
-			if (nautilus_strcmp (wallpaper_path_i, image_local_path) == 0) {
+			if (eel_strcmp (wallpaper_path_i, image_local_path) == 0) {
 				found_wallpaper = TRUE;
 			}
 			
@@ -462,16 +462,16 @@ nautilus_file_background_write_desktop_default_settings ()
 {
 	char *color;
 	char *image;
-	NautilusBackgroundImagePlacement placement;
+	EelBackgroundImagePlacement placement;
 	nautilus_file_background_get_default_settings (desktop_theme_source, &color, &image, &placement);
 	nautilus_file_background_write_desktop_settings (color, image, placement);
 }
 
 static int
-call_settings_changed (NautilusBackground *background)
+call_settings_changed (EelBackground *background)
 {
 	NautilusFile *file;
-	file = gtk_object_get_data (GTK_OBJECT (background), "nautilus_background_file");
+	file = gtk_object_get_data (GTK_OBJECT (background), "eel_background_file");
 	if (file) {
 		saved_settings_changed_callback (file, background);
 	}
@@ -489,7 +489,7 @@ static GdkFilterReturn
 nautilus_file_background_event_filter (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
 {
 	XEvent *xevent;
-	NautilusBackground *background;
+	EelBackground *background;
 
 	xevent = (XEvent *) gdk_xevent;
 
@@ -502,7 +502,7 @@ nautilus_file_background_event_filter (GdkXEvent *gdk_xevent, GdkEvent *event, g
 			return GDK_FILTER_CONTINUE;
 		}
 		
-	    	background = NAUTILUS_BACKGROUND (data);
+	    	background = EEL_BACKGROUND (data);
 	    	/* FIXME bugzilla.eazel.com 2220:
 	    	 * We'd like to call saved_settings_changed_callback right here, directly.
 	    	 * However, the current version of the property-background capplet saves
@@ -517,13 +517,13 @@ nautilus_file_background_event_filter (GdkXEvent *gdk_xevent, GdkEvent *event, g
 }
 
 static void
-desktop_background_destroyed_callback (NautilusBackground *background, void *georgeWBush)
+desktop_background_destroyed_callback (EelBackground *background, void *georgeWBush)
 {
 	gdk_window_remove_filter (GDK_ROOT_PARENT(), nautilus_file_background_event_filter, background);
 }
 
 static void
-nautilus_file_background_receive_root_window_changes (NautilusBackground *background)
+nautilus_file_background_receive_root_window_changes (EelBackground *background)
 {
 	XWindowAttributes attribs = { 0 };
 
@@ -648,7 +648,7 @@ set_root_pixmap (GdkPixmap *pixmap)
 }
 	
 static void
-image_loading_done_callback (NautilusBackground *background, gboolean successful_load, void *disconnect_signal)
+image_loading_done_callback (EelBackground *background, gboolean successful_load, void *disconnect_signal)
 {
 	int	      width;
 	int	      height;
@@ -667,12 +667,12 @@ image_loading_done_callback (NautilusBackground *background, gboolean successful
 
 	pixmap = make_root_pixmap (width, height);
 	gc = gdk_gc_new (pixmap);
-	nautilus_background_draw_to_drawable (background, pixmap, gc, 0, 0, width, height, width, height);
+	eel_background_draw_to_drawable (background, pixmap, gc, 0, 0, width, height, width, height);
 	gdk_gc_unref (gc);
 
 	set_root_pixmap (pixmap);
 
-	background_window = nautilus_background_get_desktop_background_window (background);
+	background_window = eel_background_get_desktop_background_window (background);
 	if (background_window != NULL) {
 		gdk_window_set_back_pixmap (background_window, pixmap, FALSE);
 	}
@@ -688,9 +688,9 @@ image_loading_done_callback (NautilusBackground *background, gboolean successful
 }
 
 static void
-nautilus_file_update_desktop_pixmaps (NautilusBackground *background)
+nautilus_file_update_desktop_pixmaps (EelBackground *background)
 {	
-	if (nautilus_background_is_loaded (background)) {
+	if (eel_background_is_loaded (background)) {
 		image_loading_done_callback (background, TRUE, GINT_TO_POINTER (FALSE));
 	} else {
 		gtk_signal_connect (GTK_OBJECT (background),
@@ -704,7 +704,7 @@ static gboolean
 nautilus_file_background_matches_default_settings (
 			const char* color, const char* default_color,
 			const char* image, const char* default_image,
-			NautilusBackgroundImagePlacement placement, NautilusBackgroundImagePlacement default_placement)
+			EelBackgroundImagePlacement placement, EelBackgroundImagePlacement default_placement)
 {
 	gboolean match_color;
 	gboolean match_image;
@@ -712,16 +712,16 @@ nautilus_file_background_matches_default_settings (
 	/* A NULL default color or image is not considered when determining a match.
 	 */
 	
-	match_color = (default_color == NULL) || nautilus_strcmp (color, default_color) == 0;
+	match_color = (default_color == NULL) || eel_strcmp (color, default_color) == 0;
 	
 	match_image = (default_image == NULL) ||
-		      ((nautilus_strcmp (image, default_image) == 0) && (placement == default_placement));
+		      ((eel_strcmp (image, default_image) == 0) && (placement == default_placement));
 	return match_color && match_image;
 }
 
 /* return true if the background is not in the default state */
 gboolean
-nautilus_file_background_is_set (NautilusBackground *background)
+nautilus_file_background_is_set (EelBackground *background)
 {
 	char *color;
 	char *image;
@@ -730,12 +730,12 @@ nautilus_file_background_is_set (NautilusBackground *background)
 	
 	gboolean matches;
 	
-	NautilusBackgroundImagePlacement placement;
-	NautilusBackgroundImagePlacement default_placement;
+	EelBackgroundImagePlacement placement;
+	EelBackgroundImagePlacement default_placement;
 
-	color = nautilus_background_get_color (background);
-	image = nautilus_background_get_image_uri (background);
-	placement = nautilus_background_get_image_placement (background);
+	color = eel_background_get_color (background);
+	image = eel_background_get_image_uri (background);
+	placement = eel_background_get_image_placement (background);
 	
 	nautilus_file_background_get_default_settings (
 		nautilus_file_background_peek_theme_source (background),
@@ -755,22 +755,22 @@ nautilus_file_background_is_set (NautilusBackground *background)
 
 /* handle the background changed signal */
 static void
-background_changed_callback (NautilusBackground *background,
+background_changed_callback (EelBackground *background,
                              NautilusFile       *file)
 {
   	char *color;
   	char *image;
         
-        g_assert (NAUTILUS_IS_BACKGROUND (background));
+        g_assert (EEL_IS_BACKGROUND (background));
         g_assert (NAUTILUS_IS_FILE (file));
-        g_assert (gtk_object_get_data (GTK_OBJECT (background), "nautilus_background_file") == file);
+        g_assert (gtk_object_get_data (GTK_OBJECT (background), "eel_background_file") == file);
         
 
-	color = nautilus_background_get_color (background);
-	image = nautilus_background_get_image_uri (background);
+	color = eel_background_get_color (background);
+	image = eel_background_get_image_uri (background);
 
-	if (nautilus_background_is_desktop (background)) {
-		nautilus_file_background_write_desktop_settings (color, image, nautilus_background_get_image_placement (background));
+	if (eel_background_is_desktop (background)) {
+		nautilus_file_background_write_desktop_settings (color, image, eel_background_get_image_placement (background));
 	} else {
 	        /* Block the other handler while we are writing metadata so it doesn't
 	         * try to change the background.
@@ -798,25 +798,25 @@ background_changed_callback (NautilusBackground *background,
 	g_free (color);
 	g_free (image);
 	
-	if (nautilus_background_is_desktop (background)) {
+	if (eel_background_is_desktop (background)) {
 		nautilus_file_update_desktop_pixmaps (background);
 	}
 }
 
 static void
 initialize_background_from_settings (NautilusFile *file,
-				     NautilusBackground *background)
+				     EelBackground *background)
 {
         char *color;
         char *image;
-	NautilusBackgroundImagePlacement placement;
+	EelBackgroundImagePlacement placement;
 	
         g_assert (NAUTILUS_IS_FILE (file));
-        g_assert (NAUTILUS_IS_BACKGROUND (background));
-        g_assert (gtk_object_get_data (GTK_OBJECT (background), "nautilus_background_file")
+        g_assert (EEL_IS_BACKGROUND (background));
+        g_assert (gtk_object_get_data (GTK_OBJECT (background), "eel_background_file")
                   == file);
 
-	if (nautilus_background_is_desktop (background)) {
+	if (eel_background_is_desktop (background)) {
 		nautilus_file_background_read_desktop_settings (&color, &image, &placement);
 	} else {
 		color = nautilus_file_get_metadata (file,
@@ -825,7 +825,7 @@ initialize_background_from_settings (NautilusFile *file,
 		image = nautilus_file_get_metadata (file,
                                                     NAUTILUS_METADATA_KEY_LOCATION_BACKGROUND_IMAGE,
                                                     NULL);
-	        placement = NAUTILUS_BACKGROUND_TILED; /* non-tiled only avail for desktop, at least for now */
+	        placement = EEL_BACKGROUND_TILED; /* non-tiled only avail for desktop, at least for now */
 
 		/* if there's none, read the default from the theme */
 		if (color == NULL && image == NULL) {
@@ -842,9 +842,9 @@ initialize_background_from_settings (NautilusFile *file,
                                           background_changed_callback,
                                           file);
 
-	nautilus_background_set_color (background, color);     
-	nautilus_background_set_image_uri (background, image);
-        nautilus_background_set_image_placement (background, placement);
+	eel_background_set_color (background, color);     
+	eel_background_set_image_uri (background, image);
+        eel_background_set_image_placement (background, placement);
 	
 	/* Unblock the handler. */
 	gtk_signal_handler_unblock_by_func (GTK_OBJECT (background),
@@ -858,11 +858,11 @@ initialize_background_from_settings (NautilusFile *file,
 /* handle the file changed signal */
 static void
 saved_settings_changed_callback (NautilusFile *file,
-                                 NautilusBackground *background)
+                                 EelBackground *background)
 {
 	initialize_background_from_settings (file, background);
 	
-	if (nautilus_background_is_desktop (background)) {
+	if (eel_background_is_desktop (background)) {
 		nautilus_file_update_desktop_pixmaps (background);
 	}
 }
@@ -872,10 +872,10 @@ static void
 nautilus_file_background_theme_changed (gpointer user_data)
 {
 	NautilusFile *file;
-	NautilusBackground *background;
+	EelBackground *background;
 
-	background = NAUTILUS_BACKGROUND (user_data);
-	file = gtk_object_get_data (GTK_OBJECT (background), "nautilus_background_file");
+	background = EEL_BACKGROUND (user_data);
+	file = gtk_object_get_data (GTK_OBJECT (background), "eel_background_file");
 	if (file) {
 		saved_settings_changed_callback (file, background);
 	}
@@ -883,10 +883,10 @@ nautilus_file_background_theme_changed (gpointer user_data)
 
 /* handle the background reset signal by setting values from the current theme */
 static void
-background_reset_callback (NautilusBackground *background,
+background_reset_callback (EelBackground *background,
                            NautilusFile       *file)
 {
-	if (nautilus_background_is_desktop (background)) {
+	if (eel_background_is_desktop (background)) {
 		nautilus_file_background_write_desktop_default_settings ();
 	} else {
 	        /* Block the other handler while we are writing metadata so it doesn't
@@ -917,7 +917,7 @@ background_reset_callback (NautilusBackground *background,
 
 /* handle the background destroyed signal */
 static void
-background_destroyed_callback (NautilusBackground *background,
+background_destroyed_callback (EelBackground *background,
                                NautilusFile       *file)
 {
         gtk_signal_disconnect_by_func (GTK_OBJECT (file),
@@ -934,15 +934,15 @@ void
 nautilus_connect_background_to_file_metadata (GtkWidget    *widget,
                                               NautilusFile *file)
 {
-	NautilusBackground *background;
+	EelBackground *background;
 	gpointer old_file;
         GList *attributes;
 
 	/* Get at the background object we'll be connecting. */
-	background = nautilus_get_widget_background (widget);
+	background = eel_get_widget_background (widget);
 
 	/* Check if it is already connected. */
-	old_file = gtk_object_get_data (GTK_OBJECT (background), "nautilus_background_file");
+	old_file = gtk_object_get_data (GTK_OBJECT (background), "eel_background_file");
 	if (old_file == file) {
 		return;
 	}
@@ -972,7 +972,7 @@ nautilus_connect_background_to_file_metadata (GtkWidget    *widget,
         /* Attach the new directory. */
         nautilus_file_ref (file);
         gtk_object_set_data_full (GTK_OBJECT (background),
-                                  "nautilus_background_file",
+                                  "eel_background_file",
                                   file,
                                   (GtkDestroyNotify) nautilus_file_unref);
 
diff --git a/libnautilus-private/nautilus-directory-background.h b/libnautilus-private/nautilus-directory-background.h
index 78f1a2b07..31f376038 100644
--- a/libnautilus-private/nautilus-directory-background.h
+++ b/libnautilus-private/nautilus-directory-background.h
@@ -26,7 +26,7 @@
 
 #include <gtk/gtkwidget.h>
 #include "nautilus-file.h"
-#include "nautilus-background.h"
+#include <eel/eel-background.h>
 #include "libnautilus-extensions/nautilus-icon-container.h"
 
 void nautilus_connect_background_to_file_metadata         (GtkWidget         *widget,
@@ -35,5 +35,5 @@ void nautilus_connect_desktop_background_to_file_metadata (NautilusIconContainer
                                                            NautilusFile		 *file);
 void nautilus_connect_background_to_file_metadata_by_uri  (GtkWidget         *widget,
                                                            const char        *uri);
-gboolean nautilus_file_background_is_set		  (NautilusBackground *background);
+gboolean nautilus_file_background_is_set		  (EelBackground *background);
 
diff --git a/libnautilus-private/nautilus-directory-metafile-monitor.c b/libnautilus-private/nautilus-directory-metafile-monitor.c
index 47251d0b3..27dd58d72 100644
--- a/libnautilus-private/nautilus-directory-metafile-monitor.c
+++ b/libnautilus-private/nautilus-directory-metafile-monitor.c
@@ -26,8 +26,8 @@
 #include "nautilus-directory-private.h"
 #include "nautilus-file-private.h"
 
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
 #include <libnautilus/nautilus-bonobo-workarounds.h>
 
@@ -72,7 +72,7 @@ destroy (GtkObject *object)
 	monitor = NAUTILUS_METAFILE_MONITOR (object);
 	g_free (monitor->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 NautilusMetafileMonitor *
diff --git a/libnautilus-private/nautilus-directory-metafile.c b/libnautilus-private/nautilus-directory-metafile.c
index 8cb75bdfa..06038abd1 100644
--- a/libnautilus-private/nautilus-directory-metafile.c
+++ b/libnautilus-private/nautilus-directory-metafile.c
@@ -30,7 +30,7 @@
 #include <libnautilus-extensions/nautilus-metafile-factory.h>
 #include <libnautilus-extensions/nautilus-directory-metafile-monitor.h>
 #include <libnautilus-extensions/nautilus-metafile-server.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 #include <liboaf/liboaf.h>
 #include <stdio.h>
 
@@ -128,8 +128,8 @@ nautilus_directory_get_file_metadata (NautilusDirectory *directory,
 	CORBA_char *corba_value;
 
 	g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (file_name), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (key), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (file_name), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (key), NULL);
 	
 	/* We can't pass NULL as a CORBA_string - pass "" instead. */
 	non_null_default = default_metadata != NULL ? default_metadata : "";
@@ -143,7 +143,7 @@ nautilus_directory_get_file_metadata (NautilusDirectory *directory,
 	CORBA_exception_free (&ev);
 	bonobo_object_release_unref (metafile, NULL);
 
-	if (nautilus_str_is_empty (corba_value)) {
+	if (eel_str_is_empty (corba_value)) {
 		/* Even though in all other respects we treat "" as NULL, we want to
 		 * make sure the caller gets back the same default that was passed in.
 		 */
@@ -171,9 +171,9 @@ nautilus_directory_get_file_metadata_list (NautilusDirectory *directory,
 	CORBA_unsigned_long    buf_pos;
 
 	g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (file_name), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (list_key), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (list_subkey), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (file_name), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (list_key), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (list_subkey), NULL);
 	
 	metafile = get_metafile (directory);
 	CORBA_exception_init (&ev);
@@ -205,8 +205,8 @@ nautilus_directory_set_file_metadata (NautilusDirectory *directory,
 	Nautilus_Metafile metafile;
 
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
-	g_return_if_fail (!nautilus_str_is_empty (file_name));
-	g_return_if_fail (!nautilus_str_is_empty (key));
+	g_return_if_fail (!eel_str_is_empty (file_name));
+	g_return_if_fail (!eel_str_is_empty (key));
 	
 	/* We can't pass NULL as a CORBA_string - pass "" instead.
 	 */
@@ -243,9 +243,9 @@ nautilus_directory_set_file_metadata_list (NautilusDirectory *directory,
 	GList   *list_ptr;
 
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
-	g_return_if_fail (!nautilus_str_is_empty (file_name));
-	g_return_if_fail (!nautilus_str_is_empty (list_key));
-	g_return_if_fail (!nautilus_str_is_empty (list_subkey));
+	g_return_if_fail (!eel_str_is_empty (file_name));
+	g_return_if_fail (!eel_str_is_empty (list_key));
+	g_return_if_fail (!eel_str_is_empty (list_subkey));
 	
 	len = g_list_length (list);
 	
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index 1d53acf8a..fe5a3ba9a 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -25,20 +25,20 @@
 #include <config.h>
 #include "nautilus-directory-private.h"
 
-#include "nautilus-metafile.h"
 #include "nautilus-directory-metafile.h"
 #include "nautilus-directory-notify.h"
 #include "nautilus-file-private.h"
 #include "nautilus-file-utilities.h"
-#include "nautilus-glib-extensions.h"
 #include "nautilus-global-preferences.h"
-#include "nautilus-gtk-macros.h"
 #include "nautilus-lib-self-check-functions.h"
 #include "nautilus-metadata.h"
-#include "nautilus-string.h"
+#include "nautilus-metafile.h"
 #include "nautilus-trash-directory.h"
 #include "nautilus-vfs-directory.h"
 #include <ctype.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-string.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 
@@ -71,7 +71,7 @@ static char *             real_get_name_for_self_as_new_file  (NautilusDirectory
 static void               set_directory_uri                   (NautilusDirectory      *directory,
 							       const char             *new_uri);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusDirectory,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusDirectory,
 				   nautilus_directory,
 				   GTK_TYPE_OBJECT)
 
@@ -167,7 +167,7 @@ nautilus_directory_destroy (GtkObject *object)
 
 	if (directory->details->monitor_list != NULL) {
 		g_warning ("destroying a NautilusDirectory while it's being monitored");
-		nautilus_g_list_free_deep (directory->details->monitor_list);
+		eel_g_list_free_deep (directory->details->monitor_list);
 	}
 
 	if (directory->details->metafile_monitor != NULL) {
@@ -198,7 +198,7 @@ nautilus_directory_destroy (GtkObject *object)
 
 	g_free (directory->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -231,7 +231,7 @@ emit_change_signals_for_all_files (NautilusDirectory *directory)
 {
 	GList *files;
 
-	files = nautilus_g_list_copy (directory->details->file_list);
+	files = eel_g_list_copy (directory->details->file_list);
 	if (directory->details->as_file != NULL) {
 		files = g_list_prepend (files, directory->details->as_file);
 	}
@@ -323,7 +323,7 @@ nautilus_directory_make_uri_canonical (const char *uri)
 	 * NautilusDirectories for the same location from being
 	 * created. (See bugzilla.eazel.com 3322 for an example.)
 	 */
-	canonical = nautilus_str_strip_trailing_chr (canonical_maybe_trailing_slash, '/');
+	canonical = eel_str_strip_trailing_chr (canonical_maybe_trailing_slash, '/');
 	if (strcmp (canonical, canonical_maybe_trailing_slash) != 0) {
 		/* If some trailing '/' were stripped, there's the possibility,
 		 * that we stripped away all the '/' from a uri that has only
@@ -367,7 +367,7 @@ nautilus_directory_get_internal (const char *uri, gboolean create)
 
 	/* Create the hash table first time through. */
 	if (directories == NULL) {
-		directories = nautilus_g_hash_table_new_free_at_exit
+		directories = eel_g_hash_table_new_free_at_exit
 			(g_str_hash, g_str_equal, "nautilus-directory.c: directories");
 
 		add_preferences_callbacks ();
@@ -456,7 +456,7 @@ nautilus_directory_get_name_for_self_as_new_file (NautilusDirectory *directory)
 {
 	g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL);
 	
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_DIRECTORY_CLASS, directory,
 		 get_name_for_self_as_new_file, (directory));
 }
@@ -524,7 +524,7 @@ nautilus_directory_are_all_files_seen (NautilusDirectory *directory)
 {
 	g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), FALSE);
 	
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_DIRECTORY_CLASS, directory,
 		 are_all_files_seen, (directory));
 }
@@ -672,7 +672,7 @@ nautilus_directory_find_file_by_internal_uri (NautilusDirectory *directory,
 {
 	NautilusFile *result;
 
-	if (nautilus_strcmp (relative_uri, ".") == 0) {
+	if (eel_strcmp (relative_uri, ".") == 0) {
 		result = nautilus_directory_get_existing_corresponding_file (directory);
 		if (result != NULL) {
 			nautilus_file_unref (result);
@@ -1033,7 +1033,7 @@ collect_directories_by_prefix (gpointer key, gpointer value, gpointer callback_d
 	directory = NAUTILUS_DIRECTORY (value);
 	collect_data = (CollectData *) callback_data;
 	
-	if (nautilus_str_has_prefix (uri, collect_data->uri_prefix)) {
+	if (eel_str_has_prefix (uri, collect_data->uri_prefix)) {
 		uri_suffix = &uri[strlen (collect_data->uri_prefix)];
 		switch (uri_suffix[0]) {
 		case '\0':
@@ -1054,7 +1054,7 @@ str_replace_prefix (const char *str,
 {
 	const char *old_suffix;
 
-	g_return_val_if_fail (nautilus_str_has_prefix (str, old_prefix),
+	g_return_val_if_fail (eel_str_has_prefix (str, old_prefix),
 			      g_strdup (str));
 
 	old_suffix = &str [strlen (old_prefix)];
@@ -1365,7 +1365,7 @@ nautilus_directory_contains_file (NautilusDirectory *directory,
 		return FALSE;
 	}
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_DIRECTORY_CLASS, directory,
 		 contains_file, (directory, file));
 }
@@ -1406,7 +1406,7 @@ nautilus_directory_call_when_ready (NautilusDirectory *directory,
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (callback != NULL);
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(NAUTILUS_DIRECTORY_CLASS, directory,
 		 call_when_ready, (directory, file_attributes,
 				   callback, callback_data));
@@ -1421,7 +1421,7 @@ nautilus_directory_cancel_callback (NautilusDirectory *directory,
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (callback != NULL);
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(NAUTILUS_DIRECTORY_CLASS, directory,
 		 cancel_callback, (directory, callback, callback_data));
 }
@@ -1436,7 +1436,7 @@ nautilus_directory_file_monitor_add (NautilusDirectory *directory,
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (client != NULL);
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(NAUTILUS_DIRECTORY_CLASS, directory,
 		 file_monitor_add, (directory, client,
 				    monitor_hidden_files,
@@ -1451,7 +1451,7 @@ nautilus_directory_file_monitor_remove (NautilusDirectory *directory,
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (client != NULL);
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(NAUTILUS_DIRECTORY_CLASS, directory,
 		 file_monitor_remove, (directory, client));
 }
@@ -1461,7 +1461,7 @@ nautilus_directory_force_reload (NautilusDirectory *directory)
 {
 	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(NAUTILUS_DIRECTORY_CLASS, directory,
 		 force_reload, (directory));
 }
@@ -1471,14 +1471,14 @@ nautilus_directory_is_not_empty (NautilusDirectory *directory)
 {
 	g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), FALSE);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_DIRECTORY_CLASS, directory,
 		 is_not_empty, (directory));
 }
 
 #if !defined (NAUTILUS_OMIT_SELF_CHECK)
 
-#include "nautilus-debug.h"
+#include <eel/eel-debug.h>
 #include "nautilus-file-attributes.h"
 
 static int data_dummy;
@@ -1521,7 +1521,7 @@ nautilus_self_check_directory (void)
 	directory = nautilus_directory_get ("file:///etc");
 	file = nautilus_file_get ("file:///etc/passwd");
 
-	NAUTILUS_CHECK_INTEGER_RESULT (g_hash_table_size (directories), 1);
+	EEL_CHECK_INTEGER_RESULT (g_hash_table_size (directories), 1);
 
 	nautilus_directory_file_monitor_add
 		(directory, &data_dummy,
@@ -1539,30 +1539,30 @@ nautilus_self_check_directory (void)
 	}
 
 	nautilus_file_set_metadata (file, "test", "default", "value");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_file_get_metadata (file, "test", "default"), "value");
+	EEL_CHECK_STRING_RESULT (nautilus_file_get_metadata (file, "test", "default"), "value");
 
 	nautilus_file_set_boolean_metadata (file, "test_boolean", TRUE, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_get_boolean_metadata (file, "test_boolean", TRUE), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_get_boolean_metadata (file, "test_boolean", TRUE), TRUE);
 	nautilus_file_set_boolean_metadata (file, "test_boolean", TRUE, FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_get_boolean_metadata (file, "test_boolean", TRUE), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_get_boolean_metadata (NULL, "test_boolean", TRUE), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_get_boolean_metadata (file, "test_boolean", TRUE), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_get_boolean_metadata (NULL, "test_boolean", TRUE), TRUE);
 
 	nautilus_file_set_integer_metadata (file, "test_integer", 0, 17);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "test_integer", 0), 17);
+	EEL_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "test_integer", 0), 17);
 	nautilus_file_set_integer_metadata (file, "test_integer", 0, -1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "test_integer", 0), -1);
+	EEL_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "test_integer", 0), -1);
 	nautilus_file_set_integer_metadata (file, "test_integer", 42, 42);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "test_integer", 42), 42);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (NULL, "test_integer", 42), 42);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "nonexistent_key", 42), 42);
+	EEL_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "test_integer", 42), 42);
+	EEL_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (NULL, "test_integer", 42), 42);
+	EEL_CHECK_INTEGER_RESULT (nautilus_file_get_integer_metadata (file, "nonexistent_key", 42), 42);
 
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_directory_get ("file:///etc") == directory, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_directory_get ("file:///etc") == directory, TRUE);
 	nautilus_directory_unref (directory);
 
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_directory_get ("file:///etc/") == directory, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_directory_get ("file:///etc/") == directory, TRUE);
 	nautilus_directory_unref (directory);
 
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_directory_get ("file:///etc////") == directory, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_directory_get ("file:///etc////") == directory, TRUE);
 	nautilus_directory_unref (directory);
 
 	nautilus_file_unref (file);
@@ -1575,7 +1575,7 @@ nautilus_self_check_directory (void)
 		gtk_main_iteration ();
 	}
 
-	NAUTILUS_CHECK_INTEGER_RESULT (g_hash_table_size (directories), 0);
+	EEL_CHECK_INTEGER_RESULT (g_hash_table_size (directories), 0);
 
 	directory = nautilus_directory_get ("file:///etc");
 
@@ -1589,7 +1589,7 @@ nautilus_self_check_directory (void)
 		gtk_main_iteration ();
 	}
 
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_directory_is_metadata_read (directory), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_directory_is_metadata_read (directory), TRUE);
 
 	got_files_flag = FALSE;
 
@@ -1603,51 +1603,51 @@ nautilus_self_check_directory (void)
 		gtk_main_iteration ();
 	}
 
-	NAUTILUS_CHECK_BOOLEAN_RESULT (directory->details->file_list == NULL, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (directory->details->file_list == NULL, TRUE);
 
-	NAUTILUS_CHECK_INTEGER_RESULT (g_hash_table_size (directories), 1);
+	EEL_CHECK_INTEGER_RESULT (g_hash_table_size (directories), 1);
 
 	file = nautilus_file_get ("file:///etc/passwd");
 
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_file_get_metadata (file, "test", "default"), "value");
+	EEL_CHECK_STRING_RESULT (nautilus_file_get_metadata (file, "test", "default"), "value");
 	
 	nautilus_file_unref (file);
 
 	nautilus_directory_unref (directory);
 
-	NAUTILUS_CHECK_INTEGER_RESULT (g_hash_table_size (directories), 0);
+	EEL_CHECK_INTEGER_RESULT (g_hash_table_size (directories), 0);
 
 	/* escape_slashes: code is now in gnome-vfs, but lets keep the tests here for now */
-	NAUTILUS_CHECK_STRING_RESULT (gnome_vfs_escape_slashes (""), "");
-	NAUTILUS_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("/"), "%2F");
-	NAUTILUS_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("%"), "%25");
-	NAUTILUS_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("a/a"), "a%2Fa");
-	NAUTILUS_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("a%a"), "a%25a");
-	NAUTILUS_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("%25"), "%2525");
-	NAUTILUS_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("%2F"), "%252F");
+	EEL_CHECK_STRING_RESULT (gnome_vfs_escape_slashes (""), "");
+	EEL_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("a"), "a");
+	EEL_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("/"), "%2F");
+	EEL_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("%"), "%25");
+	EEL_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("a/a"), "a%2Fa");
+	EEL_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("a%a"), "a%25a");
+	EEL_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("%25"), "%2525");
+	EEL_CHECK_STRING_RESULT (gnome_vfs_escape_slashes ("%2F"), "%252F");
 
 	/* nautilus_directory_make_uri_canonical */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical (""), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("file:/"), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("file:///"), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("TRASH:XXX"), NAUTILUS_TRASH_URI);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("trash:xxx"), NAUTILUS_TRASH_URI);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("GNOME-TRASH:XXX"), NAUTILUS_TRASH_URI);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("gnome-trash:xxx"), NAUTILUS_TRASH_URI);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("file:///home/mathieu/"), "file:///home/mathieu");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("file:///home/mathieu"), "file:///home/mathieu");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("ftp://mathieu:password@le-hackeur.org"), "ftp://mathieu:password@le-hackeur.org");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("ftp://mathieu:password@le-hackeur.org/"), "ftp://mathieu:password@le-hackeur.org");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org"), "http://le-hackeur.org");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org/"), "http://le-hackeur.org");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org/dir"), "http://le-hackeur.org/dir");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org/dir/"), "http://le-hackeur.org/dir");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical (""), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("file:/"), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("file:///"), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("TRASH:XXX"), NAUTILUS_TRASH_URI);
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("trash:xxx"), NAUTILUS_TRASH_URI);
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("GNOME-TRASH:XXX"), NAUTILUS_TRASH_URI);
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("gnome-trash:xxx"), NAUTILUS_TRASH_URI);
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("file:///home/mathieu/"), "file:///home/mathieu");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("file:///home/mathieu"), "file:///home/mathieu");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("ftp://mathieu:password@le-hackeur.org"), "ftp://mathieu:password@le-hackeur.org");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("ftp://mathieu:password@le-hackeur.org/"), "ftp://mathieu:password@le-hackeur.org");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org"), "http://le-hackeur.org");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org/"), "http://le-hackeur.org");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org/dir"), "http://le-hackeur.org/dir");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org/dir/"), "http://le-hackeur.org/dir");
 	/* FIXME bugzilla.eazel.com 5068: the "nested" URI loses some characters here. Maybe that's OK because we escape them in practice? */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("search://[file://]file_name contains stuff"), "search://[file/]file_name contains stuff");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("search://[file://]file_name contains stuff"), "search://[file/]file_name contains stuff");
 #ifdef EAZEL_SERVICES
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("eazel-services:/~turtle"), "eazel-services:///~turtle");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("eazel-services:///~turtle"), "eazel-services:///~turtle");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("eazel-services:/~turtle"), "eazel-services:///~turtle");
+	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("eazel-services:///~turtle"), "eazel-services:///~turtle");
 #endif	
 }
 
diff --git a/libnautilus-private/nautilus-drag-window.c b/libnautilus-private/nautilus-drag-window.c
index 5b48855c4..0f039875e 100644
--- a/libnautilus-private/nautilus-drag-window.c
+++ b/libnautilus-private/nautilus-drag-window.c
@@ -28,7 +28,7 @@
 #include <config.h>
 #include "nautilus-drag-window.h"
 
-#include "nautilus-gdk-extensions.h"
+#include <eel/eel-gdk-extensions.h>
 #include <gtk/gtk.h>
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
@@ -103,7 +103,7 @@ execute_pending_requests (GtkWindow *window,
 {
 	if (GTK_WIDGET_REALIZED (window)) {
 		if (details->pending_focus) {
-			nautilus_gdk_window_focus (GTK_WIDGET (window)->window,
+			eel_gdk_window_focus (GTK_WIDGET (window)->window,
 						   details->focus_timestamp);
 			details->pending_focus = FALSE;
 		}
@@ -331,7 +331,7 @@ nautilus_drag_window_realize (GtkWidget *widget, gpointer data)
 	GdkAtom protocols[3];
 
 	/* Tell the window manager _not_ to focus this window by itself */
-	nautilus_gdk_window_set_wm_hints_input (widget->window, FALSE);
+	eel_gdk_window_set_wm_hints_input (widget->window, FALSE);
 
 	/* Set WM_PROTOCOLS to the usual two atoms plus something that tells
 	 * sawfish to send messages telling us when we might want to raise
@@ -341,7 +341,7 @@ nautilus_drag_window_realize (GtkWidget *widget, gpointer data)
 	protocols[0] = gdk_wm_delete_window;
 	protocols[1] = gdk_wm_take_focus;
 	protocols[2] = sawfish_wm_raise_window;
-	nautilus_gdk_window_set_wm_protocols (widget->window, protocols, 3);
+	eel_gdk_window_set_wm_protocols (widget->window, protocols, 3);
 }
 
 
diff --git a/libnautilus-private/nautilus-drag.c b/libnautilus-private/nautilus-drag.c
index ff5028baf..5735c1b44 100644
--- a/libnautilus-private/nautilus-drag.c
+++ b/libnautilus-private/nautilus-drag.c
@@ -39,10 +39,10 @@
 #include <string.h>
 #include <gtk/gtkmain.h>
 
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 #include "nautilus-link.h"
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 
 #define NAUTILUS_COMMAND_SPECIFIER "command:"
 
@@ -328,7 +328,7 @@ nautilus_drag_default_drop_action_for_icons (GdkDragContext *context,
 		*non_default_action = GDK_ACTION_MOVE;
 		return;
 
-	} else if (nautilus_str_has_prefix (target_uri_string, NAUTILUS_COMMAND_SPECIFIER)) {
+	} else if (eel_str_has_prefix (target_uri_string, NAUTILUS_COMMAND_SPECIFIER)) {
 		*default_action = GDK_ACTION_MOVE;
 		*non_default_action = GDK_ACTION_MOVE;
 		return;
@@ -635,7 +635,7 @@ nautilus_drag_autoscroll_start (NautilusDragInfo *drag_info,
 	if (nautilus_drag_autoscroll_in_scroll_region (widget)) {
 		if (drag_info->auto_scroll_timeout_id == 0) {
 			drag_info->waiting_to_autoscroll = TRUE;
-			drag_info->start_auto_scroll_in = nautilus_get_system_time() 
+			drag_info->start_auto_scroll_in = eel_get_system_time() 
 				+ AUTOSCROLL_INITIAL_DELAY;
 			
 			drag_info->auto_scroll_timeout_id = gtk_timeout_add
@@ -685,5 +685,5 @@ nautilus_drag_file_receive_dropped_keyword (NautilusFile *file, char *keyword)
 	}
 	
 	nautilus_file_set_keywords (file, keywords);
-	nautilus_g_list_free_deep (keywords);
+	eel_g_list_free_deep (keywords);
 }
diff --git a/libnautilus-private/nautilus-druid-page-eazel.c b/libnautilus-private/nautilus-druid-page-eazel.c
index ab5324daa..51b9d8a53 100644
--- a/libnautilus-private/nautilus-druid-page-eazel.c
+++ b/libnautilus-private/nautilus-druid-page-eazel.c
@@ -27,7 +27,7 @@
 
 #include "nautilus-druid-page-eazel.h"
 
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomeui/libgnomeui.h>
@@ -80,7 +80,7 @@ static void nautilus_druid_page_eazel_prepare       (GnomeDruidPage *page,
 #define DRUID_PAGE_MIN_WIDTH 516
 #define DRUID_PAGE_BORDER 24
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusDruidPageEazel, nautilus_druid_page_eazel, GNOME_TYPE_DRUID_PAGE)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusDruidPageEazel, nautilus_druid_page_eazel, GNOME_TYPE_DRUID_PAGE)
 
 static void
 nautilus_druid_page_eazel_initialize_class (NautilusDruidPageEazelClass *klass)
@@ -145,7 +145,7 @@ nautilus_druid_page_eazel_destroy(GtkObject *object)
 	druid_page_eazel->widget = NULL;
 
 	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -158,7 +158,7 @@ nautilus_druid_page_eazel_finalize (GtkObject *object)
 	druid_page_eazel->details = NULL;
 
 	/* Chain finalize */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
 }
 
 static void
@@ -418,7 +418,7 @@ static void
 nautilus_druid_page_eazel_size_allocate(GtkWidget               *widget,
 					GtkAllocation           *allocation)
 {
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate,
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate,
 			      (widget, allocation));
 
 	gnome_canvas_set_scroll_region (GNOME_CANVAS (NAUTILUS_DRUID_PAGE_EAZEL (widget)->canvas),
@@ -439,7 +439,7 @@ nautilus_druid_page_eazel_size_request(GtkWidget           *widget,
 
 	druid_page_eazel = NAUTILUS_DRUID_PAGE_EAZEL (widget);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_request,
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_request,
 			      (widget, requisition));
 
 	if (druid_page_eazel->widget) {
diff --git a/libnautilus-private/nautilus-druid.c b/libnautilus-private/nautilus-druid.c
index d3a592cc9..49eeff81d 100644
--- a/libnautilus-private/nautilus-druid.c
+++ b/libnautilus-private/nautilus-druid.c
@@ -28,7 +28,7 @@
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnome/gnome-i18n.h>
 
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 static void nautilus_druid_initialize	(NautilusDruid		 *druid);
 static void nautilus_druid_initialize_class(NautilusDruidClass	 *klass);
@@ -37,7 +37,7 @@ static void nautilus_druid_size_request (GtkWidget               *widget,
 static void nautilus_druid_size_allocate(GtkWidget               *widget,
 					 GtkAllocation           *allocation);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusDruid, nautilus_druid, GNOME_TYPE_DRUID)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusDruid, nautilus_druid, GNOME_TYPE_DRUID)
 
 static void
 nautilus_druid_initialize_class (NautilusDruidClass *klass)
diff --git a/libnautilus-private/nautilus-ellipsizing-label.c b/libnautilus-private/nautilus-ellipsizing-label.c
deleted file mode 100644
index d7eee58e2..000000000
--- a/libnautilus-private/nautilus-ellipsizing-label.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-ellipsizing-label.c: Subclass of GtkLabel that ellipsizes the text.
-
-   Copyright (C) 2001 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Author: John Sullivan <sullivan@eazel.com>,
- */
-
-#include <config.h>
-#include "nautilus-ellipsizing-label.h"
-
-#include "nautilus-gdk-font-extensions.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-string.h"
-
-struct NautilusEllipsizingLabelDetails
-{
-	char *full_text;
-};
-
-static void nautilus_ellipsizing_label_initialize_class  (NautilusEllipsizingLabelClass *class);
-static void nautilus_ellipsizing_label_initialize        (NautilusEllipsizingLabel      *label);
-static void real_destroy				 (GtkObject			*object);
-static void real_size_request      			 (GtkWidget                     *widget,
-						    	  GtkRequisition                *requisition);
-static void real_size_allocate 	 			 (GtkWidget 			*widget, 
-							  GtkAllocation 		*allocation);
-static void real_style_set				 (GtkWidget			*widget,
-							  GtkStyle			*previous_style);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusEllipsizingLabel, nautilus_ellipsizing_label, GTK_TYPE_LABEL)
-
-static void
-nautilus_ellipsizing_label_initialize_class (NautilusEllipsizingLabelClass *klass)
-{
-	GtkWidgetClass *widget_class;
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	widget_class = GTK_WIDGET_CLASS (klass);
-
-	object_class->destroy = real_destroy;
-
-	widget_class->size_request = real_size_request;
-	widget_class->size_allocate = real_size_allocate;
-  	widget_class->style_set = real_style_set;
-}
-
-static void
-nautilus_ellipsizing_label_initialize (NautilusEllipsizingLabel *label)
-{
-	label->details = g_new0 (NautilusEllipsizingLabelDetails, 1);
-}
-
-static void
-real_destroy (GtkObject *object)
-{
-	NautilusEllipsizingLabel *label;
-
-	g_return_if_fail (NAUTILUS_IS_ELLIPSIZING_LABEL (object));
-
-	label = NAUTILUS_ELLIPSIZING_LABEL (object);
-
-	g_free (label->details->full_text);
-	g_free (label->details);
-}
-
-GtkWidget*
-nautilus_ellipsizing_label_new (const char *string)
-{
-	NautilusEllipsizingLabel *label;
-  
-	label = gtk_type_new (NAUTILUS_TYPE_ELLIPSIZING_LABEL);
-	nautilus_ellipsizing_label_set_text (label, string);
-  
-	return GTK_WIDGET (label);
-}
-
-static void
-recompute_ellipsized_text (NautilusEllipsizingLabel *label, int width)
-{
-	char *ellipsized_text;
-
-	if (label->details->full_text == NULL) {
-		ellipsized_text = NULL;
-	} else {
-		ellipsized_text = nautilus_string_ellipsize_middle (label->details->full_text, 
-								    GTK_WIDGET (label)->style->font, 
-								    width);
-	}
-
-	gtk_label_set_text (GTK_LABEL (label), ellipsized_text);
-	g_free (ellipsized_text);
-}
-
-void
-nautilus_ellipsizing_label_set_text (NautilusEllipsizingLabel *label, 
-				     const char *string)
-{
-	g_return_if_fail (NAUTILUS_IS_ELLIPSIZING_LABEL (label));
-
-	if (nautilus_str_is_equal (string, label->details->full_text)) {
-		return;
-	}
-
-	g_free (label->details->full_text);
-	label->details->full_text = g_strdup (string);
-
-	recompute_ellipsized_text (label, GTK_WIDGET (label)->allocation.width);
-}
-
-static void
-real_size_request (GtkWidget *widget, GtkRequisition *requisition)
-{
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_request, (widget, requisition));
-
-	/* Don't demand any particular width; will draw ellipsized into whatever size we're given */
-	requisition->width = 0;
-}
-
-static void	
-real_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
-{
-	recompute_ellipsized_text (NAUTILUS_ELLIPSIZING_LABEL (widget), allocation->width);
-	
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
-}
-
-static void 
-real_style_set (GtkWidget *widget, GtkStyle  *previous_style)
-{
-	recompute_ellipsized_text (NAUTILUS_ELLIPSIZING_LABEL (widget), widget->allocation.width);
-	
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, style_set, (widget, previous_style));
-}
-       			      
diff --git a/libnautilus-private/nautilus-ellipsizing-label.h b/libnautilus-private/nautilus-ellipsizing-label.h
deleted file mode 100644
index eed0b0821..000000000
--- a/libnautilus-private/nautilus-ellipsizing-label.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-ellipsizing-label.h: Subclass of GtkLabel that ellipsizes the text.
-
-   Copyright (C) 2001 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Author: John Sullivan <sullivan@eazel.com>,
- */
-
-#ifndef NAUTILUS_ELLIPSIZING_LABEL_H
-#define NAUTILUS_ELLIPSIZING_LABEL_H
-
-#include <gtk/gtklabel.h>
-
-#define NAUTILUS_TYPE_ELLIPSIZING_LABEL            (nautilus_ellipsizing_label_get_type ())
-#define NAUTILUS_ELLIPSIZING_LABEL(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_ELLIPSIZING_LABEL, NautilusEllipsizingLabel))
-#define NAUTILUS_ELLIPSIZING_LABEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_ELLIPSIZING_LABEL, NautilusEllipsizingLabelClass))
-#define NAUTILUS_IS_ELLIPSIZING_LABEL(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_ELLIPSIZING_LABEL))
-#define NAUTILUS_IS_ELLIPSIZING_LABEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_ELLIPSIZING_LABEL))
-
-typedef struct NautilusEllipsizingLabel NautilusEllipsizingLabel;
-typedef struct NautilusEllipsizingLabelClass NautilusEllipsizingLabelClass;
-
-typedef struct NautilusEllipsizingLabelDetails NautilusEllipsizingLabelDetails;
-
-struct NautilusEllipsizingLabel {
-	GtkLabel parent;
-	NautilusEllipsizingLabelDetails *details;
-};
-
-struct NautilusEllipsizingLabelClass {
-	GtkLabelClass parent_class;
-};
-
-GtkType    nautilus_ellipsizing_label_get_type  (void);
-GtkWidget *nautilus_ellipsizing_label_new       (const char 		  *string);
-void	   nautilus_ellipsizing_label_set_text  (NautilusEllipsizingLabel *label,
-						 const char 		  *string);
-
-#endif /* NAUTILUS_ELLIPSIZING_LABEL_H */
diff --git a/libnautilus-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c
index 0f406709d..a465563b9 100644
--- a/libnautilus-private/nautilus-entry.c
+++ b/libnautilus-private/nautilus-entry.c
@@ -27,12 +27,12 @@
 #include <config.h>
 #include "nautilus-entry.h"
 
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
+#include <eel/eel-gdk-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
 #include <libnautilus-extensions/nautilus-undo-signal-handlers.h>
 #include <orb/orbit.h>
@@ -54,7 +54,7 @@ static guint signals[LAST_SIGNAL];
 static void nautilus_entry_initialize       (NautilusEntry      *entry);
 static void nautilus_entry_initialize_class (NautilusEntryClass *class);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusEntry,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusEntry,
 				   nautilus_entry,
 				   GTK_TYPE_ENTRY)
 
@@ -120,7 +120,7 @@ nautilus_entry_destroy (GtkObject *object)
 
 	g_free (entry->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -131,7 +131,7 @@ obscure_cursor (NautilusEntry *entry)
 	}
 	
 	entry->details->cursor_obscured = TRUE;	
-	nautilus_gdk_window_set_invisible_cursor (GTK_ENTRY (entry)->text_area);
+	eel_gdk_window_set_invisible_cursor (GTK_ENTRY (entry)->text_area);
 }
 
 static gboolean
@@ -188,7 +188,7 @@ nautilus_entry_key_press (GtkWidget *widget, GdkEventKey *event)
 	
 	obscure_cursor (entry);
 
-	result = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	result = EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, key_press_event, (widget, event));
 
 	if (result) {
@@ -219,7 +219,7 @@ nautilus_entry_motion_notify (GtkWidget *widget, GdkEventMotion *event)
 	old_start_pos = GTK_EDITABLE (widget)->selection_start_pos;
 	old_end_pos = GTK_EDITABLE (widget)->selection_end_pos;
 
-	result = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	result = EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, motion_notify_event, (widget, event));
 
 	if (result) {
@@ -310,7 +310,7 @@ nautilus_entry_set_selection (GtkEditable *editable,
 			      int start_pos,
 			      int end_pos)
 {
-	NAUTILUS_CALL_PARENT (GTK_EDITABLE_CLASS, set_selection,
+	EEL_CALL_PARENT (GTK_EDITABLE_CLASS, set_selection,
 			      (editable, start_pos, end_pos));
 
 	gtk_signal_emit (GTK_OBJECT (editable), signals[SELECTION_CHANGED]);
@@ -322,7 +322,7 @@ nautilus_entry_button_press (GtkWidget *widget,
 {
 	gboolean result;
 
-	result = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	result = EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, button_press_event, (widget, event));
 
 	if (result) {
@@ -338,7 +338,7 @@ nautilus_entry_button_release (GtkWidget *widget,
 {
 	gboolean result;
 
-	result = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	result = EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, button_release_event, (widget, event));
 
 	if (result) {
@@ -361,7 +361,7 @@ nautilus_entry_insert_text (GtkEditable *editable, const gchar *text,
 		gtk_signal_emit (GTK_OBJECT (editable), signals[USER_CHANGED]);
 	}
 
-	NAUTILUS_CALL_PARENT (GTK_EDITABLE_CLASS, insert_text, 
+	EEL_CALL_PARENT (GTK_EDITABLE_CLASS, insert_text, 
 			      (editable, text, length, position));
 
 	gtk_signal_emit (GTK_OBJECT (editable), signals[SELECTION_CHANGED]);
@@ -379,7 +379,7 @@ nautilus_entry_delete_text (GtkEditable *editable, int start_pos, int end_pos)
 		gtk_signal_emit (GTK_OBJECT (editable), signals[USER_CHANGED]);
 	}
 	
-	NAUTILUS_CALL_PARENT (GTK_EDITABLE_CLASS, delete_text, 
+	EEL_CALL_PARENT (GTK_EDITABLE_CLASS, delete_text, 
 			      (editable, start_pos, end_pos));
 
 	gtk_signal_emit (GTK_OBJECT (editable), signals[SELECTION_CHANGED]);
@@ -403,7 +403,7 @@ nautilus_entry_selection_clear (GtkWidget *widget,
 		return FALSE;
 	}
 	
-	return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	return EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, selection_clear_event, (widget, event));
 }
 
diff --git a/libnautilus-private/nautilus-enumeration.c b/libnautilus-private/nautilus-enumeration.c
deleted file mode 100644
index 3217e8c84..000000000
--- a/libnautilus-private/nautilus-enumeration.c
+++ /dev/null
@@ -1,337 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-enumeration.c: Enumeration data structure.
-
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-enumeration.h"
-
-#include "nautilus-glib-extensions.h"
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-string.h"
-
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-
-struct NautilusEnumeration
-{
-	NautilusStringList *entries;
-	NautilusStringList *descriptions;
-	GList *values;
-};
-
-/**
- * nautilus_enumeration_new:
- *
- * Return value: A newly constructed empty enumeration.
- */
-NautilusEnumeration *
-nautilus_enumeration_new (void)
-{
-	NautilusEnumeration *enumeration;
-	
-	enumeration = g_new0 (NautilusEnumeration, 1);
-
-	return enumeration;
-}
-
-void
-nautilus_enumeration_free (NautilusEnumeration *enumeration)
-{
-	if (enumeration == NULL) {
-		return;
-	}
-	
-	nautilus_string_list_free (enumeration->entries);
-	nautilus_string_list_free (enumeration->descriptions);
-	g_list_free (enumeration->values);
-	
-	g_free (enumeration);
-}
-
-void
-nautilus_enumeration_insert (NautilusEnumeration *enumeration,
-			     const char *entry,
-			     const char *description,
-			     int value)
-{
-	g_return_if_fail (enumeration != NULL);
-	g_return_if_fail (entry != NULL);
-
-	if (enumeration->entries == NULL) {
-		enumeration->entries =nautilus_string_list_new (TRUE);
-	}
-	
-	if (enumeration->descriptions == NULL) {
-		enumeration->descriptions = nautilus_string_list_new (TRUE);
-	}
-
-	nautilus_string_list_insert (enumeration->entries, entry);
-	nautilus_string_list_insert (enumeration->descriptions, description ? description : "");
-	enumeration->values = g_list_append (enumeration->values, GINT_TO_POINTER (value));
-}
-
-char *
-nautilus_enumeration_get_nth_entry (const NautilusEnumeration *enumeration,
-				    guint n)
-{
-	g_return_val_if_fail (enumeration != NULL, NULL);
-	g_return_val_if_fail (n < nautilus_string_list_get_length (enumeration->entries), NULL);
-
-	return nautilus_string_list_nth (enumeration->entries, n);
-}
-
-char *
-nautilus_enumeration_get_nth_description (const NautilusEnumeration *enumeration,
-					  guint n)
-{
-	g_return_val_if_fail (enumeration != NULL, NULL);
-	g_return_val_if_fail (n < nautilus_string_list_get_length (enumeration->descriptions), NULL);
-
-	return nautilus_string_list_nth (enumeration->descriptions, n);
-}
-
-int
-nautilus_enumeration_get_nth_value (const NautilusEnumeration *enumeration,
-				    guint n)
-{
-	g_return_val_if_fail (enumeration != NULL, 0);
-	g_return_val_if_fail (n < g_list_length (enumeration->values), 0);
-	
-	return GPOINTER_TO_INT (g_list_nth_data (enumeration->values, n));
-}
-
-guint
-nautilus_enumeration_get_num_entries (const NautilusEnumeration *enumeration)
-{
-	g_return_val_if_fail (enumeration != NULL, 0);
-
-	return nautilus_string_list_get_length (enumeration->entries);
-}
-
-NautilusEnumeration *
-nautilus_enumeration_new_from_tokens (const char *entries,
-				      const char *descriptions,
-				      const char *values,
-				      const char *delimiter)
-{
-	NautilusEnumeration *enumeration;
-	NautilusStringList *entry_list;
-	NautilusStringList *description_list;
-	NautilusStringList *value_list;
-	guint i;
-	int value;
-
-	g_return_val_if_fail (entries != NULL, NULL);
-	g_return_val_if_fail (entries[0] != '\0', NULL);
-	g_return_val_if_fail (values != NULL, NULL);
-	g_return_val_if_fail (values[0] != '\0', NULL);
-	g_return_val_if_fail (delimiter != NULL, NULL);
-	g_return_val_if_fail (delimiter[0] != '\0', NULL);
-
-	enumeration = nautilus_enumeration_new ();	
-
-	entry_list = nautilus_string_list_new_from_tokens (entries, delimiter, TRUE);
-	value_list = nautilus_string_list_new_from_tokens (values, delimiter, TRUE);
-
-	if (nautilus_string_list_get_length (entry_list)
-	    != nautilus_string_list_get_length (value_list)) {
-		g_warning ("entries and values have different lengths.");
-		nautilus_string_list_free (entry_list);
-		nautilus_string_list_free (value_list);
-		return NULL;
-	}
-
-	description_list = 
-		descriptions != NULL ? 
-		nautilus_string_list_new_from_tokens (descriptions, delimiter, TRUE) :
-		NULL;
-
-	if (description_list != NULL) {
-		if (nautilus_string_list_get_length (entry_list)
-		    != nautilus_string_list_get_length (description_list)) {
-			g_warning ("entries and descriptions have different lengths.");
-			nautilus_string_list_free (entry_list);
-			nautilus_string_list_free (value_list);
-			nautilus_string_list_free (description_list);
-			return NULL;
-		}
-	}
-
-	enumeration->entries = entry_list;
-
-	if (description_list == NULL) {
-		description_list = nautilus_string_list_new (TRUE);
-
-		for (i = 0; i < nautilus_string_list_get_length (entry_list); i++) {
-			nautilus_string_list_insert (description_list, "");
-		}
-	}
-	
-	enumeration->entries = entry_list;
-	enumeration->descriptions = description_list;
-
-	for (i = 0; i < nautilus_string_list_get_length (entry_list); i++) {
-		if (!nautilus_string_list_nth_as_integer (value_list, i, &value)) {
-			g_warning ("Could not convert value '%d' to an integer.  Using 0.", i);
-			value = 0;
-		}
-
-		enumeration->values = g_list_append (enumeration->values, GINT_TO_POINTER (value));
-	}
-	nautilus_string_list_free (value_list);
-	
-	return enumeration;
-}
-
-int
-nautilus_enumeration_get_entry_position (const NautilusEnumeration *enumeration,
-					 const char *entry)
-{
-	g_return_val_if_fail (enumeration != NULL, NAUTILUS_STRING_LIST_NOT_FOUND);
-	g_return_val_if_fail (entry != NULL, NAUTILUS_STRING_LIST_NOT_FOUND);
-
-	if (enumeration->entries == NULL) {
-		return NAUTILUS_STRING_LIST_NOT_FOUND;
-	}
-
-	return nautilus_string_list_get_index_for_string (enumeration->entries, entry);
-}
-
-int
-nautilus_enumeration_get_value_position (const NautilusEnumeration *enumeration,
-					 int value)
-{
-	GList *node;
-	int pos;
-
-	g_return_val_if_fail (enumeration != NULL, NAUTILUS_STRING_LIST_NOT_FOUND);
-
-	if (enumeration->values == NULL) {
-		return NAUTILUS_STRING_LIST_NOT_FOUND;
-	}
-
-	for (node = enumeration->values, pos = 0; node != NULL; node = node->next, pos++) {
-		if (GPOINTER_TO_INT (node->data) == value) {
-			return pos;
-		}
-	}
-
-	return NAUTILUS_STRING_LIST_NOT_FOUND;
-}
-
-NautilusStringList *
-nautilus_enumeration_get_entries (const NautilusEnumeration *enumeration)
-{
-	g_return_val_if_fail (enumeration != NULL, NULL);
-
-	if (enumeration->entries == NULL) {
-		return NULL;
-	}
-
-	return nautilus_string_list_new_from_string_list (enumeration->entries, TRUE);
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-#define CHECK_ENUMERATION_ENTRY(enumeration, i, entry, description, value) \
- 	NAUTILUS_CHECK_STRING_RESULT (nautilus_enumeration_get_nth_entry (enumeration, i), entry); \
- 	NAUTILUS_CHECK_STRING_RESULT (nautilus_enumeration_get_nth_description (enumeration, i), description); \
- 	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_enumeration_get_nth_value (enumeration, i), value); \
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_enumeration_get_entry_position (enumeration, entry), i); \
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_enumeration_get_value_position (enumeration, value), i);
-
-void
-nautilus_self_check_enumeration (void)
-{
-	NautilusEnumeration *e;
-	NautilusStringList *entries;
-	NautilusStringList *entries_test;
-
-	/***/
-	e = nautilus_enumeration_new ();
-	nautilus_enumeration_insert (e, "foo", NULL, 0);
-	CHECK_ENUMERATION_ENTRY (e, 0, "foo", "", 0);
- 	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_enumeration_get_num_entries (e), 1);
-
-	nautilus_enumeration_insert (e, "bar", NULL, 1);
-	CHECK_ENUMERATION_ENTRY (e, 1, "bar", "", 1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_enumeration_get_num_entries (e), 2);
-
-	nautilus_enumeration_free (e);
-
-	/***/
-	e = nautilus_enumeration_new_from_tokens ("apple,orange,banana",
-						  NULL,
-						  "1,2,3",
-						  ",");
-	
-	CHECK_ENUMERATION_ENTRY (e, 0, "apple", "", 1);
-	CHECK_ENUMERATION_ENTRY (e, 1, "orange", "", 2);
-	CHECK_ENUMERATION_ENTRY (e, 2, "banana", "", 3);
- 	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_enumeration_get_num_entries (e), 3);
-	nautilus_enumeration_free (e);
-
-	/***/
-	e = nautilus_enumeration_new_from_tokens ("foo",
-						  NULL,
-						  "666",
-						  ",");
-	CHECK_ENUMERATION_ENTRY (e, 0, "foo", "", 666);
- 	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_enumeration_get_num_entries (e), 1);
-	nautilus_enumeration_free (e);
-
-	/***/
-	e = nautilus_enumeration_new_from_tokens ("red,green,blue",
-						  "Red Desc,Green Desc,Blue Desc",
-						  "10,20,30",
-						  ",");
-
-	CHECK_ENUMERATION_ENTRY (e, 0, "red", "Red Desc", 10);
-	CHECK_ENUMERATION_ENTRY (e, 1, "green", "Green Desc", 20);
-	CHECK_ENUMERATION_ENTRY (e, 2, "blue", "Blue Desc", 30);
- 	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_enumeration_get_num_entries (e), 3);
-	nautilus_enumeration_free (e);
-
-	/***/
-	e = nautilus_enumeration_new_from_tokens ("red,foo:green,bar:blue,baz",
-						  "Red,Desc:Green,Desc:Blue,Desc",
-						  "10:20:30",
-						  ":");
-
-	CHECK_ENUMERATION_ENTRY (e, 0, "red,foo", "Red,Desc", 10);
-	CHECK_ENUMERATION_ENTRY (e, 1, "green,bar", "Green,Desc", 20);
-	CHECK_ENUMERATION_ENTRY (e, 2, "blue,baz", "Blue,Desc", 30);
- 	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_enumeration_get_num_entries (e), 3);
-
-	entries = nautilus_enumeration_get_entries (e);
-	entries_test = nautilus_string_list_new_from_tokens ("red,foo:green,bar:blue,baz", ":", TRUE);
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_equals (entries, entries_test), TRUE);
-
-	nautilus_string_list_free (entries);
-	nautilus_string_list_free (entries_test);
-	nautilus_enumeration_free (e);
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-enumeration.h b/libnautilus-private/nautilus-enumeration.h
deleted file mode 100644
index d2881e9b2..000000000
--- a/libnautilus-private/nautilus-enumeration.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-enumeration.h: Enumeration data structure.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_ENUMERATION_H
-#define NAUTILUS_ENUMERATION_H
-
-#include <libnautilus-extensions/nautilus-string-list.h>
-
-/* Opaque NautilusEnumeration declaration. */
-typedef struct NautilusEnumeration NautilusEnumeration;
-
-NautilusEnumeration *nautilus_enumeration_new                 (void);
-void                 nautilus_enumeration_free                (NautilusEnumeration       *enumeration);
-void                 nautilus_enumeration_insert              (NautilusEnumeration       *enumeration,
-							       const char                *entry,
-							       const char                *description,
-							       int                        value);
-char *               nautilus_enumeration_get_nth_entry       (const NautilusEnumeration *enumeration,
-							       guint                      n);
-char *               nautilus_enumeration_get_nth_description (const NautilusEnumeration *enumeration,
-							       guint                      n);
-int                  nautilus_enumeration_get_nth_value       (const NautilusEnumeration *enumeration,
-							       guint                      n);
-guint                nautilus_enumeration_get_num_entries     (const NautilusEnumeration *enumeration);
-NautilusEnumeration *nautilus_enumeration_new_from_tokens     (const char                *entries,
-							       const char                *descriptions,
-							       const char                *values,
-							       const char                *delimiter);
-int                  nautilus_enumeration_get_entry_position  (const NautilusEnumeration *enumeration,
-							       const char                *entry);
-int                  nautilus_enumeration_get_value_position  (const NautilusEnumeration *enumeration,
-							       int                        value);
-NautilusStringList * nautilus_enumeration_get_entries         (const NautilusEnumeration *enumeration);
-
-#endif /* NAUTILUS_ENUMERATION_H */
-
diff --git a/libnautilus-private/nautilus-file-changes-queue.c b/libnautilus-private/nautilus-file-changes-queue.c
index d1a0c27fe..27ff87146 100644
--- a/libnautilus-private/nautilus-file-changes-queue.c
+++ b/libnautilus-private/nautilus-file-changes-queue.c
@@ -24,7 +24,7 @@
 #include "nautilus-file-changes-queue.h"
 
 #include "nautilus-directory-notify.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 
 #ifdef G_THREADS_ENABLED
 #define MUTEX_LOCK(a)	if ((a) != NULL) g_mutex_lock (a)
@@ -302,7 +302,7 @@ pairs_list_free (GList *pairs)
 	}
 
 	/* delete the list and the now empty pair structs */
-	nautilus_g_list_free_deep (pairs);
+	eel_g_list_free_deep (pairs);
 }
 
 static void
@@ -316,7 +316,7 @@ position_set_list_free (GList *list)
 		g_free (item->uri);
 	}
 	/* delete the list and the now empty structs */
-	nautilus_g_list_free_deep (list);
+	eel_g_list_free_deep (list);
 }
 
 /* go through changes in the change queue, send ones with the same kind
@@ -412,7 +412,7 @@ nautilus_file_changes_consume_changes (gboolean consume_all)
 			
 			if (deletions != NULL) {
 				nautilus_directory_notify_files_removed (deletions);
-				nautilus_g_list_free_deep (deletions);
+				eel_g_list_free_deep (deletions);
 				deletions = NULL;
 			}
 			if (moves != NULL) {
@@ -422,7 +422,7 @@ nautilus_file_changes_consume_changes (gboolean consume_all)
 			}
 			if (additions != NULL) {
 				nautilus_directory_notify_files_added (additions);
-				nautilus_g_list_free_deep (additions);
+				eel_g_list_free_deep (additions);
 				additions = NULL;
 			}
 			if (metadata_copy_requests != NULL) {
@@ -437,7 +437,7 @@ nautilus_file_changes_consume_changes (gboolean consume_all)
 			}
 			if (metadata_remove_requests != NULL) {
 				nautilus_directory_schedule_metadata_remove (metadata_remove_requests);
-				nautilus_g_list_free_deep (metadata_remove_requests);
+				eel_g_list_free_deep (metadata_remove_requests);
 				metadata_remove_requests = NULL;
 			}
 			if (position_set_requests != NULL) {
diff --git a/libnautilus-private/nautilus-file-operations-progress.c b/libnautilus-private/nautilus-file-operations-progress.c
index 339950baf..fd95bab49 100644
--- a/libnautilus-private/nautilus-file-operations-progress.c
+++ b/libnautilus-private/nautilus-file-operations-progress.c
@@ -29,11 +29,11 @@
 #include <config.h>
 #include "nautilus-file-operations-progress.h"
 
-#include "nautilus-ellipsizing-label.h"
-#include "nautilus-gdk-font-extensions.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-ellipsizing-label.h>
+#include <eel/eel-gdk-font-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkprogressbar.h>
@@ -56,7 +56,7 @@
 static void nautilus_file_operations_progress_initialize_class (NautilusFileOperationsProgressClass *klass);
 static void nautilus_file_operations_progress_initialize       (NautilusFileOperationsProgress      *dialog);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusFileOperationsProgress,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusFileOperationsProgress,
 				   nautilus_file_operations_progress,
 				   GNOME_TYPE_DIALOG);
 
@@ -103,17 +103,17 @@ nautilus_file_operations_progress_update (NautilusFileOperationsProgress *progre
 }
 
 static void
-set_text_unescaped_trimmed (NautilusEllipsizingLabel *label, const char *text)
+set_text_unescaped_trimmed (EelEllipsizingLabel *label, const char *text)
 {
 	char *unescaped_text;
 	
 	if (text == NULL || text[0] == '\0') {
-		nautilus_ellipsizing_label_set_text (label, "");
+		eel_ellipsizing_label_set_text (label, "");
 		return;
 	}
 	
 	unescaped_text = gnome_vfs_unescape_string_for_display (text);
-	nautilus_ellipsizing_label_set_text (label, unescaped_text);
+	eel_ellipsizing_label_set_text (label, unescaped_text);
 	g_free (unescaped_text);
 }
 
@@ -141,7 +141,7 @@ nautilus_file_operations_progress_destroy (GtkObject *object)
 
 	g_free (progress->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* Initialization.  */
@@ -150,7 +150,7 @@ static void
 create_titled_label (GtkTable *table, int row, GtkWidget **title_widget, GtkWidget **label_text_widget)
 {
 	*title_widget = gtk_label_new ("");
-	nautilus_gtk_label_make_bold (GTK_LABEL (*title_widget));
+	eel_gtk_label_make_bold (GTK_LABEL (*title_widget));
 	gtk_misc_set_alignment (GTK_MISC (*title_widget), 1, 0);
 	gtk_table_attach (table, *title_widget,
 			  0, 1,
@@ -159,7 +159,7 @@ create_titled_label (GtkTable *table, int row, GtkWidget **title_widget, GtkWidg
 			  0, 0);
 	gtk_widget_show (*title_widget);
 
-	*label_text_widget = nautilus_ellipsizing_label_new ("");
+	*label_text_widget = eel_ellipsizing_label_new ("");
 	gtk_table_attach (table, *label_text_widget,
 			  1, 2,
 			  row, row + 1,
@@ -176,9 +176,9 @@ map_callback (GtkWidget *widget)
 
 	progress = NAUTILUS_FILE_OPERATIONS_PROGRESS (widget);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, map, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, map, (widget));
 
-	progress->details->start_time = nautilus_get_system_time ();
+	progress->details->start_time = eel_get_system_time ();
 }
 
 static gboolean
@@ -215,7 +215,7 @@ nautilus_file_operations_progress_initialize (NautilusFileOperationsProgress *pr
 	gtk_label_set_justify (GTK_LABEL (progress->details->progress_title_label), GTK_JUSTIFY_LEFT);
 	gtk_box_pack_start (GTK_BOX (hbox), progress->details->progress_title_label, FALSE, FALSE, 0);
 	gtk_widget_show (progress->details->progress_title_label);
-	nautilus_gtk_label_make_bold (GTK_LABEL (progress->details->progress_title_label));
+	eel_gtk_label_make_bold (GTK_LABEL (progress->details->progress_title_label));
 
 
 	/* label -- */
@@ -224,7 +224,7 @@ nautilus_file_operations_progress_initialize (NautilusFileOperationsProgress *pr
 	gtk_label_set_justify (GTK_LABEL (progress->details->progress_count_label), GTK_JUSTIFY_RIGHT);
 	gtk_box_pack_end (GTK_BOX (hbox), progress->details->progress_count_label, FALSE, FALSE, 0);
 	gtk_widget_show (progress->details->progress_count_label);
-	nautilus_gtk_label_make_bold (GTK_LABEL (progress->details->progress_count_label));
+	eel_gtk_label_make_bold (GTK_LABEL (progress->details->progress_count_label));
 
 	/* progress bar */
 	progress->details->progress_bar = gtk_progress_bar_new ();
@@ -356,7 +356,7 @@ nautilus_file_operations_progress_new_file (NautilusFileOperationsProgress *prog
 		gtk_label_set_text (GTK_LABEL (progress->details->operation_name_label),
 				    progress_verb);
 		set_text_unescaped_trimmed 
-			(NAUTILUS_ELLIPSIZING_LABEL (progress->details->item_name),
+			(EEL_ELLIPSIZING_LABEL (progress->details->item_name),
 			 item_name);
 
 		progress_count = g_strdup_printf (_("%ld of %ld"), file_index + 1, 
@@ -366,12 +366,12 @@ nautilus_file_operations_progress_new_file (NautilusFileOperationsProgress *prog
 
 		gtk_label_set_text (GTK_LABEL (progress->details->from_label), from_prefix);
 		set_text_unescaped_trimmed 
-			(NAUTILUS_ELLIPSIZING_LABEL (progress->details->from_path_label), from_path);
+			(EEL_ELLIPSIZING_LABEL (progress->details->from_path_label), from_path);
 	
 		if (progress->details->to_prefix != NULL && progress->details->to_path_label != NULL) {
 			gtk_label_set_text (GTK_LABEL (progress->details->to_label), to_prefix);
 			set_text_unescaped_trimmed 
-				(NAUTILUS_ELLIPSIZING_LABEL (progress->details->to_path_label), to_path);
+				(EEL_ELLIPSIZING_LABEL (progress->details->to_path_label), to_path);
 		}
 	}
 
@@ -428,7 +428,7 @@ nautilus_file_operations_progress_done (NautilusFileOperationsProgress *progress
 	g_assert (progress->details->start_time != 0);
 
 	/* compute time up in milliseconds */
-	time_up = (nautilus_get_system_time () - progress->details->start_time) / 1000;
+	time_up = (eel_get_system_time () - progress->details->start_time) / 1000;
 	if (time_up >= MINIMUM_TIME_UP) {
 		gtk_object_destroy (GTK_OBJECT (progress));
 		return;
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index adf50f7e8..df0b46da5 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -29,6 +29,11 @@
 
 #include "nautilus-file-operations-progress.h"
 #include "nautilus-lib-self-check-functions.h"
+
+#include <eel/eel-gdk-font-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-stock-dialogs.h>
 #include <gnome.h>
 #include <gtk/gtklabel.h>
 #include <libgnomevfs/gnome-vfs-async-ops.h>
@@ -39,12 +44,8 @@
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-extensions/nautilus-file-changes-queue.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-gdk-font-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
 #include <libnautilus-extensions/nautilus-link.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
 #include <libnautilus-extensions/nautilus-trash-monitor.h>
 
 typedef enum {
@@ -85,7 +86,7 @@ transfer_info_new (GtkWidget *parent_view)
 	result = g_new0 (TransferInfo, 1);
 	result->parent_view = parent_view;
 	
-	nautilus_nullify_when_destroyed (&result->parent_view);
+	eel_nullify_when_destroyed (&result->parent_view);
 	
 	return result;
 }
@@ -93,14 +94,14 @@ transfer_info_new (GtkWidget *parent_view)
 static void
 transfer_info_destroy (TransferInfo *transfer_info)
 {
-	nautilus_nullify_cancel (&transfer_info->parent_view);
+	eel_nullify_cancel (&transfer_info->parent_view);
 	
 	if (transfer_info->progress_dialog != NULL) {
 		nautilus_file_operations_progress_done (transfer_info->progress_dialog);
 	}
 	
 	if (transfer_info->debuting_uris != NULL) {
-		nautilus_g_hash_table_destroy_deep (transfer_info->debuting_uris);
+		eel_g_hash_table_destroy_deep (transfer_info->debuting_uris);
 	}
 	
 	g_free (transfer_info);
@@ -133,7 +134,7 @@ icon_position_iterator_new (GArray *icon_positions, const GList *uris)
 	}
 	result->last_icon_position_index = 0;
 
-	result->uris = nautilus_g_str_list_copy ((GList *)uris);
+	result->uris = eel_g_str_list_copy ((GList *)uris);
 	result->last_uri = result->uris;
 
 	return result;
@@ -147,7 +148,7 @@ icon_position_iterator_free (IconPositionIterator *position_iterator)
 	}
 	
 	g_free (position_iterator->icon_positions);
-	nautilus_g_list_free_deep (position_iterator->uris);
+	eel_g_list_free_deep (position_iterator->uris);
 	g_free (position_iterator);
 }
 
@@ -235,7 +236,7 @@ ellipsize_string_for_dialog (const char *str)
 	/* FIXME: John Sullivan says we should ellipsize both URIs and
 	 * file names in the middle, not the start.
 	 */
-	result = nautilus_string_ellipsize_start (str, font, maximum_width);
+	result = eel_string_ellipsize_start (str, font, maximum_width);
 	gdk_font_unref (font);
 
 	return result;
@@ -974,7 +975,7 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
 
 		if (error_location == ERROR_LOCATION_TARGET) {
 			/* We can't continue, just tell the user. */
-			nautilus_run_simple_dialog (parent_for_error_dialog (transfer_info),
+			eel_run_simple_dialog (parent_for_error_dialog (transfer_info),
 				TRUE, text, dialog_title, _("Stop"), NULL);
 			error_dialog_result = GNOME_VFS_XFER_ERROR_ACTION_ABORT;
 
@@ -987,7 +988,7 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
 			 * in the moved/copied/deleted hierarchy, we can probably
 			 * continue. Allow the user to skip.
 			 */
-			error_dialog_button_pressed = nautilus_run_simple_dialog
+			error_dialog_button_pressed = eel_run_simple_dialog
 				(parent_for_error_dialog (transfer_info), TRUE, text, 
 				dialog_title,
 				 _("Skip"), _("Stop"), NULL);
@@ -1006,7 +1007,7 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
 								
 		} else {
 			/* Generic error, offer to retry and skip. */
-			error_dialog_button_pressed = nautilus_run_simple_dialog
+			error_dialog_button_pressed = eel_run_simple_dialog
 				(parent_for_error_dialog (transfer_info), TRUE, text, 
 				 dialog_title,
 				 _("Skip"), _("Retry"), _("Stop"), NULL);
@@ -1097,7 +1098,7 @@ handle_transfer_overwrite (const GnomeVFSXferProgressInfo *progress_info,
 						formatted_name, formatted_name);
 		}
 		
-		nautilus_run_simple_dialog (parent_for_error_dialog (transfer_info), TRUE, text,
+		eel_run_simple_dialog (parent_for_error_dialog (transfer_info), TRUE, text,
 					_("Unable to replace file."), _("OK"), NULL, NULL);
 
 		g_free (text);
@@ -1117,7 +1118,7 @@ handle_transfer_overwrite (const GnomeVFSXferProgressInfo *progress_info,
 		/* we are going to only get one duplicate alert, don't offer
 		 * Replace All
 		 */
-		result = nautilus_run_simple_dialog
+		result = eel_run_simple_dialog
 			(parent_for_error_dialog (transfer_info), TRUE, text, 
 			 _("Conflict while copying"),
 			 _("Replace"), _("Skip"), NULL);
@@ -1131,7 +1132,7 @@ handle_transfer_overwrite (const GnomeVFSXferProgressInfo *progress_info,
 			return GNOME_VFS_XFER_OVERWRITE_ACTION_SKIP;
 		}
 	} else {
-		result = nautilus_run_simple_dialog
+		result = eel_run_simple_dialog
 			(parent_for_error_dialog (transfer_info), TRUE, text, 
 			 _("Conflict while copying"),
 			 _("Replace All"), _("Replace"), _("Skip"), NULL);
@@ -1884,7 +1885,7 @@ nautilus_file_operations_copy_move (const GList *item_uris,
 	if ((move_options & GNOME_VFS_XFER_REMOVESOURCE) == 0) {
 		/* don't allow copying into Trash */
 		if (check_target_directory_is_or_in_trash (trash_dir_uri, target_dir_uri)) {
-			nautilus_run_simple_dialog
+			eel_run_simple_dialog
 				(parent_view, 
 				 FALSE,
 				 _("You cannot copy items into the Trash."), 
@@ -1910,7 +1911,7 @@ nautilus_file_operations_copy_move (const GList *item_uris,
 				 */
 			    	is_desktop_trash_link = vfs_uri_is_special_link (uri);
 
-				nautilus_run_simple_dialog
+				eel_run_simple_dialog
 					(parent_view, 
 					 FALSE,
 					 ((move_options & GNOME_VFS_XFER_REMOVESOURCE) != 0) 
@@ -1941,7 +1942,7 @@ nautilus_file_operations_copy_move (const GList *item_uris,
 			if ((move_options & GNOME_VFS_XFER_LINK_ITEMS) == 0
 				&& (gnome_vfs_uri_equal (uri, target_dir_uri)
 					|| gnome_vfs_uri_is_parent (uri, target_dir_uri, TRUE))) {
-				nautilus_run_simple_dialog
+				eel_run_simple_dialog
 					(parent_view, 
 					 FALSE,
 					 ((move_options & GNOME_VFS_XFER_REMOVESOURCE) != 0) 
@@ -1958,7 +1959,7 @@ nautilus_file_operations_copy_move (const GList *item_uris,
 			if ((move_options & GNOME_VFS_XFER_REMOVESOURCE) == 0
 			        && (move_options & GNOME_VFS_XFER_USE_UNIQUE_NAMES) == 0
 				&& gnome_vfs_uri_is_parent (target_dir_uri, uri, FALSE)) {
-				nautilus_run_simple_dialog
+				eel_run_simple_dialog
 					(parent_view, 
 					 FALSE,
 					 _("You cannot copy a file over itself."), 
@@ -2023,7 +2024,7 @@ handle_new_folder_vfs_error (const GnomeVFSXferProgressInfo *progress_info, NewF
 						gnome_vfs_result_to_string(progress_info->vfs_status));
 	}
 	
-	nautilus_show_error_dialog (error_string, _("Error creating new folder"),
+	eel_show_error_dialog (error_string, _("Error creating new folder"),
 				    GTK_WINDOW (state->parent_view));
 	
 	g_free (error_string_to_free);
@@ -2044,7 +2045,7 @@ new_folder_transfer_callback (GnomeVFSAsyncHandle *handle,
 	switch (progress_info->phase) {
 
 	case GNOME_VFS_XFER_PHASE_COMPLETED:
-		nautilus_nullify_cancel (&state->parent_view);
+		eel_nullify_cancel (&state->parent_view);
 		g_free (state);
 		return 0;
 
@@ -2105,7 +2106,7 @@ nautilus_file_operations_new_folder (GtkWidget *parent_view,
 	state->done_callback = done_callback;
 	state->data = data;
 	state->parent_view = parent_view;
-	nautilus_nullify_when_destroyed (&state->parent_view);
+	eel_nullify_when_destroyed (&state->parent_view);
 
 	/* pass in the target directory and the new folder name as a destination URI */
 	parent_uri = gnome_vfs_uri_new (parent_dir);
@@ -2213,7 +2214,7 @@ confirm_empty_trash (GtkWidget *parent_view)
 	
 	parent_window = GTK_WINDOW (gtk_widget_get_toplevel (parent_view));
 
-	dialog = nautilus_show_yes_no_dialog (
+	dialog = eel_show_yes_no_dialog (
 		_("Are you sure you want to permanently delete "
 		  "all of the items in the Trash?"),
 		_("Delete Trash Contents?"),
@@ -2254,43 +2255,43 @@ void
 nautilus_self_check_file_operations (void)
 {
 	/* test the next duplicate name generator */
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_(" (copy)"), 1), _(" (another copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo"), 1), _("foo (copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_(".bashrc"), 1), _(".bashrc (copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_(".foo.txt"), 1), _(".foo (copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo"), 1), _("foo foo (copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo.txt"), 1), _("foo (copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo.txt"), 1), _("foo foo (copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo.txt txt"), 1), _("foo foo (copy).txt txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo...txt"), 1), _("foo.. (copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo..."), 1), _("foo... (copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo. (copy)"), 1), _("foo. (another copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (copy)"), 1), _("foo (another copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (copy).txt"), 1), _("foo (another copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (another copy)"), 1), _("foo (3rd copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (another copy).txt"), 1), _("foo (3rd copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (another copy).txt"), 1), _("foo foo (3rd copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (13th copy)"), 1), _("foo (14th copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (13th copy).txt"), 1), _("foo (14th copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (21st copy)"), 1), _("foo (22nd copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (21st copy).txt"), 1), _("foo (22nd copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (22nd copy)"), 1), _("foo (23rd copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (22nd copy).txt"), 1), _("foo (23rd copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (23rd copy)"), 1), _("foo (24th copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (23rd copy).txt"), 1), _("foo (24th copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (24th copy)"), 1), _("foo (25th copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (24th copy).txt"), 1), _("foo (25th copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (24th copy)"), 1), _("foo foo (25th copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (24th copy).txt"), 1), _("foo foo (25th copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (100000000000000th copy).txt"), 1), _("foo foo (copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_(" (copy)"), 1), _(" (another copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo"), 1), _("foo (copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_(".bashrc"), 1), _(".bashrc (copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_(".foo.txt"), 1), _(".foo (copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo"), 1), _("foo foo (copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo.txt"), 1), _("foo (copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo.txt"), 1), _("foo foo (copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo.txt txt"), 1), _("foo foo (copy).txt txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo...txt"), 1), _("foo.. (copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo..."), 1), _("foo... (copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo. (copy)"), 1), _("foo. (another copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (copy)"), 1), _("foo (another copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (copy).txt"), 1), _("foo (another copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (another copy)"), 1), _("foo (3rd copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (another copy).txt"), 1), _("foo (3rd copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (another copy).txt"), 1), _("foo foo (3rd copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (13th copy)"), 1), _("foo (14th copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (13th copy).txt"), 1), _("foo (14th copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (21st copy)"), 1), _("foo (22nd copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (21st copy).txt"), 1), _("foo (22nd copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (22nd copy)"), 1), _("foo (23rd copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (22nd copy).txt"), 1), _("foo (23rd copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (23rd copy)"), 1), _("foo (24th copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (23rd copy).txt"), 1), _("foo (24th copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (24th copy)"), 1), _("foo (25th copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (24th copy).txt"), 1), _("foo (25th copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (24th copy)"), 1), _("foo foo (25th copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (24th copy).txt"), 1), _("foo foo (25th copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (100000000000000th copy).txt"), 1), _("foo foo (copy).txt"));
 
 	/* FIXME bugzilla.eazel.com 7701: These are wrong. */
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (10th copy)"), 1), _("foo (11st copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (10th copy).txt"), 1), _("foo (11st copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (11th copy)"), 1), _("foo (12nd copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (11th copy).txt"), 1), _("foo (12nd copy).txt"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (12th copy)"), 1), _("foo (13rd copy)"));
-	NAUTILUS_CHECK_STRING_RESULT (get_duplicate_name (_("foo (12th copy).txt"), 1), _("foo (13rd copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (10th copy)"), 1), _("foo (11st copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (10th copy).txt"), 1), _("foo (11st copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (11th copy)"), 1), _("foo (12nd copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (11th copy).txt"), 1), _("foo (12nd copy).txt"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (12th copy)"), 1), _("foo (13rd copy)"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (12th copy).txt"), 1), _("foo (13rd copy).txt"));
 }
 
 #endif
diff --git a/libnautilus-private/nautilus-file-private.h b/libnautilus-private/nautilus-file-private.h
index 8cd94891f..f16ed2075 100644
--- a/libnautilus-private/nautilus-file-private.h
+++ b/libnautilus-private/nautilus-file-private.h
@@ -24,7 +24,7 @@
 
 #include "nautilus-file.h"
 #include "nautilus-directory.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 
 #define NAUTILUS_FILE_TOP_LEFT_TEXT_MAXIMUM_CHARACTERS_PER_LINE 80
 #define NAUTILUS_FILE_TOP_LEFT_TEXT_MAXIMUM_LINES               24
@@ -81,31 +81,31 @@ struct NautilusFileDetails
 	/* boolean fields: bitfield to save space, since there can be
            many NautilusFile objects. */
 
-	nautilus_boolean_bit unconfirmed                   : 1;
-	nautilus_boolean_bit is_gone                       : 1;
-	nautilus_boolean_bit loading_directory             : 1;
+	eel_boolean_bit unconfirmed                   : 1;
+	eel_boolean_bit is_gone                       : 1;
+	eel_boolean_bit loading_directory             : 1;
 	/* got_info known from info field being non-NULL */
-	nautilus_boolean_bit get_info_failed               : 1;
-	nautilus_boolean_bit file_info_is_up_to_date       : 1;
+	eel_boolean_bit get_info_failed               : 1;
+	eel_boolean_bit file_info_is_up_to_date       : 1;
 
-	nautilus_boolean_bit got_directory_count           : 1;
-	nautilus_boolean_bit directory_count_failed        : 1;
-	nautilus_boolean_bit directory_count_is_up_to_date : 1;
+	eel_boolean_bit got_directory_count           : 1;
+	eel_boolean_bit directory_count_failed        : 1;
+	eel_boolean_bit directory_count_is_up_to_date : 1;
 
 	NautilusRequestStatus deep_counts_status           : 2;
 	/* no deep_counts_are_up_to_date field; since we expose
            intermediate values for this attribute, we do actually
            forget it rather than invalidating. */
 
-	nautilus_boolean_bit got_mime_list                 : 1;
-	nautilus_boolean_bit mime_list_failed              : 1;
-	nautilus_boolean_bit mime_list_is_up_to_date       : 1;
+	eel_boolean_bit got_mime_list                 : 1;
+	eel_boolean_bit mime_list_failed              : 1;
+	eel_boolean_bit mime_list_is_up_to_date       : 1;
 
-	nautilus_boolean_bit got_top_left_text             : 1;
-	nautilus_boolean_bit top_left_text_is_up_to_date   : 1;
+	eel_boolean_bit got_top_left_text             : 1;
+	eel_boolean_bit top_left_text_is_up_to_date   : 1;
 
-	nautilus_boolean_bit got_activation_uri            : 1;
-	nautilus_boolean_bit activation_uri_is_up_to_date  : 1;
+	eel_boolean_bit got_activation_uri            : 1;
+	eel_boolean_bit activation_uri_is_up_to_date  : 1;
 };
 
 NautilusFile *nautilus_file_new_from_info                  (NautilusDirectory      *directory,
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index 7b2960067..d93f8a75a 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -26,21 +26,21 @@
 #include "nautilus-file-utilities.h"
 
 #include "nautilus-file.h"
-#include "nautilus-glib-extensions.h"
 #include "nautilus-lib-self-check-functions.h"
 #include "nautilus-link-set.h"
 #include "nautilus-metadata.h"
 #include "nautilus-metafile.h"
-#include "nautilus-string.h"
 #include <ctype.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-string.h>
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomevfs/gnome-vfs-async-ops.h>
+#include <libgnomevfs/gnome-vfs-find-directory.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomevfs/gnome-vfs-xfer.h>
-#include <libgnomevfs/gnome-vfs-find-directory.h>
 #include <pthread.h>
 #include <pwd.h>
 #include <stdlib.h>
@@ -538,8 +538,8 @@ nautilus_uri_make_full_from_relative (const char *base_uri, const char *relative
 gboolean
 nautilus_uri_is_trash (const char *uri)
 {
-	return nautilus_istr_has_prefix (uri, "trash:")
-		|| nautilus_istr_has_prefix (uri, "gnome-trash:");
+	return eel_istr_has_prefix (uri, "trash:")
+		|| eel_istr_has_prefix (uri, "gnome-trash:");
 }
 
 gboolean
@@ -624,7 +624,7 @@ nautilus_uri_is_local_scheme (const char *uri)
 
 	is_local_scheme = FALSE;
 	for (temp_scheme = *local_schemes, i = 0; temp_scheme != NULL; i++, temp_scheme = local_schemes[i]) {
-		is_local_scheme = nautilus_istr_has_prefix (uri, temp_scheme);
+		is_local_scheme = eel_istr_has_prefix (uri, temp_scheme);
 		if (is_local_scheme) {
 			break;
 		}
@@ -783,8 +783,8 @@ nautilus_make_uri_canonical (const char *uri)
 	 * typing "foo" into location bar does not crash and returns an error
 	 * rather than displaying the contents of /
 	 */
-	if (nautilus_str_has_prefix (canonical_uri, "file://")
-	    && !nautilus_str_has_prefix (canonical_uri, "file:///")) {
+	if (eel_str_has_prefix (canonical_uri, "file://")
+	    && !eel_str_has_prefix (canonical_uri, "file:///")) {
 		old_uri = canonical_uri;
 		canonical_uri = g_strconcat ("file:/", old_uri + 5, NULL);
 		g_free (old_uri);
@@ -824,7 +824,7 @@ uris_match (const char *uri_1, const char *uri_2, gboolean ignore_fragments)
 		canonical_2 = nautilus_make_uri_canonical (uri_2);
 	}
 
-	result = nautilus_str_is_equal (canonical_1, canonical_2);
+	result = eel_str_is_equal (canonical_1, canonical_2);
 
 	g_free (canonical_1);
 	g_free (canonical_2);
@@ -857,7 +857,7 @@ nautilus_file_name_matches_backup_pattern (const char *name_or_relative_uri)
 {
 	g_return_val_if_fail (name_or_relative_uri != NULL, FALSE);
 
-	return nautilus_str_has_suffix (name_or_relative_uri, "~");
+	return eel_str_has_suffix (name_or_relative_uri, "~");
 }
 
 gboolean
@@ -865,7 +865,7 @@ nautilus_file_name_matches_metafile_pattern (const char *name_or_relative_uri)
 {
 	g_return_val_if_fail (name_or_relative_uri != NULL, FALSE);
 
-	return nautilus_str_has_suffix (name_or_relative_uri, NAUTILUS_METAFILE_NAME_SUFFIX);
+	return eel_str_has_suffix (name_or_relative_uri, NAUTILUS_METAFILE_NAME_SUFFIX);
 }
 
 /**
@@ -1693,186 +1693,186 @@ nautilus_get_build_message (void)
 void
 nautilus_self_check_file_utilities (void)
 {
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input (""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" "), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" / "), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" /"), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" /home\n\n"), "file:///home");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" \n\t"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("!"), "http://!");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("#"), "http://#");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/ "), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/!"), "file:///!");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/#"), "file:///%23");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/%20"), "file:///%2520");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/%25"), "file:///%2525");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/:"), "file:///%3A");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/home"), "file:///home");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/home/darin"), "file:///home/darin");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input (":"), "http://:");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("::"), "http://::");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input (":://:://:::::::::::::::::"), "http://:://:://:::::::::::::::::");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:"), "file:");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///%20"), "file:///%20");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///%3F"), "file:///%3F");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///:"), "file:///:");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///?"), "file:///?");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///home/joe/some file"), "file:///home/joe/some file");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file://home/joe/some file"), "file://home/joe/some file");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:::::////"), "file:::::////");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("foo://foobar.txt"), "foo://foobar.txt");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("home"), "http://home");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http://null.stanford.edu"), "http://null.stanford.edu");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http://null.stanford.edu:80"), "http://null.stanford.edu:80");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http://seth@null.stanford.edu:80"), "http://seth@null.stanford.edu:80");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http:::::::::"), "http:::::::::");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("www.eazel.com"), "http://www.eazel.com");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http://null.stanford.edu/some file"), "http://null.stanford.edu/some file");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_uri_get_scheme ("file:///var/tmp"), "file");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_uri_get_scheme (""), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_uri_get_scheme ("file:///var/tmp::"), "file");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_uri_get_scheme ("man:ls"), "man");
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uri_is_local_scheme ("file:///var/tmp"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uri_is_local_scheme ("http://www.yahoo.com"), FALSE);
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file:///////"), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file://foo/"), "file://foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file://foo"), "file://foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file://"), "file://");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file:/"), "file:/");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("http://le-hacker.org"), "http://le-hacker.org");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("http://le-hacker.org/dir//////"), "http://le-hacker.org/dir/");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("http://le-hacker.org/////"), "http://le-hacker.org/");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input (""), "");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" "), "");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" / "), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" /"), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" /home\n\n"), "file:///home");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input (" \n\t"), "");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("!"), "http://!");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("#"), "http://#");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/ "), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/!"), "file:///!");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/#"), "file:///%23");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/%20"), "file:///%2520");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/%25"), "file:///%2525");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/:"), "file:///%3A");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/home"), "file:///home");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("/home/darin"), "file:///home/darin");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input (":"), "http://:");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("::"), "http://::");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input (":://:://:::::::::::::::::"), "http://:://:://:::::::::::::::::");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:"), "file:");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///%20"), "file:///%20");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///%3F"), "file:///%3F");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///:"), "file:///:");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///?"), "file:///?");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:///home/joe/some file"), "file:///home/joe/some file");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file://home/joe/some file"), "file://home/joe/some file");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("file:::::////"), "file:::::////");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("foo://foobar.txt"), "foo://foobar.txt");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("home"), "http://home");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http://null.stanford.edu"), "http://null.stanford.edu");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http://null.stanford.edu:80"), "http://null.stanford.edu:80");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http://seth@null.stanford.edu:80"), "http://seth@null.stanford.edu:80");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http:::::::::"), "http:::::::::");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("www.eazel.com"), "http://www.eazel.com");
+        EEL_CHECK_STRING_RESULT (nautilus_make_uri_from_input ("http://null.stanford.edu/some file"), "http://null.stanford.edu/some file");
+
+	EEL_CHECK_STRING_RESULT (nautilus_uri_get_scheme ("file:///var/tmp"), "file");
+	EEL_CHECK_STRING_RESULT (nautilus_uri_get_scheme (""), NULL);
+	EEL_CHECK_STRING_RESULT (nautilus_uri_get_scheme ("file:///var/tmp::"), "file");
+	EEL_CHECK_STRING_RESULT (nautilus_uri_get_scheme ("man:ls"), "man");
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uri_is_local_scheme ("file:///var/tmp"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uri_is_local_scheme ("http://www.yahoo.com"), FALSE);
+
+	EEL_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file:///////"), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file://foo/"), "file://foo");
+	EEL_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file://foo"), "file://foo");
+	EEL_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file://"), "file://");
+	EEL_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("file:/"), "file:/");
+	EEL_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("http://le-hacker.org"), "http://le-hacker.org");
+	EEL_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("http://le-hacker.org/dir//////"), "http://le-hacker.org/dir/");
+	EEL_CHECK_STRING_RESULT (nautilus_handle_trailing_slashes ("http://le-hacker.org/////"), "http://le-hacker.org/");
 
 	/* nautilus_make_uri_canonical */
 
 	/* FIXME bugzilla.eazel.com 5072: this is a bizarre result from an empty string */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical (""), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical (""), "file:///");
 	
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:/"), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///"), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///home/mathieu/"), "file:///home/mathieu");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///home/mathieu"), "file:///home/mathieu");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("ftp://mathieu:password@le-hackeur.org"), "ftp://mathieu:password@le-hackeur.org");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("ftp://mathieu:password@le-hackeur.org/"), "ftp://mathieu:password@le-hackeur.org/");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://le-hackeur.org"), "http://le-hackeur.org");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://le-hackeur.org/"), "http://le-hackeur.org/");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://le-hackeur.org/dir"), "http://le-hackeur.org/dir");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://le-hackeur.org/dir/"), "http://le-hackeur.org/dir/");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:/"), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///"), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///home/mathieu/"), "file:///home/mathieu");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///home/mathieu"), "file:///home/mathieu");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("ftp://mathieu:password@le-hackeur.org"), "ftp://mathieu:password@le-hackeur.org");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("ftp://mathieu:password@le-hackeur.org/"), "ftp://mathieu:password@le-hackeur.org/");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://le-hackeur.org"), "http://le-hackeur.org");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://le-hackeur.org/"), "http://le-hackeur.org/");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://le-hackeur.org/dir"), "http://le-hackeur.org/dir");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://le-hackeur.org/dir/"), "http://le-hackeur.org/dir/");
 
 	/* FIXME bugzilla.eazel.com 5068: the "nested" URI loses some characters here. Maybe that's OK because we escape them in practice? */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("search://[file://]file_name contains stuff"), "search://[file/]file_name contains stuff");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("search://[file://]file_name contains stuff"), "search://[file/]file_name contains stuff");
 #ifdef EAZEL_SERVICES
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("eazel-services:/~turtle"), "eazel-services:///~turtle");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("eazel-services:///~turtle"), "eazel-services:///~turtle");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("eazel-services:/~turtle"), "eazel-services:///~turtle");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("eazel-services:///~turtle"), "eazel-services:///~turtle");
 #endif
 
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/"), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/./."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/.//."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/.///."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a"), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/b/.."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a///"), "file:///a/");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a"), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("../a"), "file:///../a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("..//a"), "file:///../a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a//."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a/."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical (".//a/."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a//."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a//.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a/.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical (".//a/.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a//.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical (".//a//.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/.."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a/b/.."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/./a/b/.."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/./b/.."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/b/./.."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/b/../."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/../.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a/b/../.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("././a/b/../.."), "file:///");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/c/../.."), "file:///a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/c/../../d"), "file:///a/d");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/../../d"), "file:///d");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/../../d"), "file:///../d");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/.././.././c"), "file:///c");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/.././.././b/c"), "file:///../b/c");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com"), "http://www.eazel.com");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com/"), "http://www.eazel.com/");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com/dir"), "http://www.eazel.com/dir");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com/dir/"), "http://www.eazel.com/dir/");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://yakk:womble@www.eazel.com:42/blah/"), "http://yakk:womble@www.eazel.com:42/blah/");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("FILE:///"), "file:///");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///trash"), "file:///trash");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///Users/mikef"), "file:///Users/mikef");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/trash"), "file:///trash");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("root"), "file:///root");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/root"), "file:///root");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("//root"), "file:///root");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("///root"), "file:///root");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("////root"), "file:///root");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/"), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/./."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/.//."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/.///."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a"), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/b/.."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a///"), "file:///a/");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a"), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("../a"), "file:///../a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("..//a"), "file:///../a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a//."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a/."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical (".//a/."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a//."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a//.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a/.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical (".//a/.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a//.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical (".//a//.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/.."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a/b/.."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/./a/b/.."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/./b/.."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/b/./.."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/a/b/../."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/../.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("./a/b/../.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("././a/b/../.."), "file:///");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/c/../.."), "file:///a");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/c/../../d"), "file:///a/d");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/../../d"), "file:///d");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/../../d"), "file:///../d");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/b/.././.././c"), "file:///c");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("a/.././.././b/c"), "file:///../b/c");
+
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com"), "http://www.eazel.com");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com/"), "http://www.eazel.com/");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com/dir"), "http://www.eazel.com/dir");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com/dir/"), "http://www.eazel.com/dir/");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://yakk:womble@www.eazel.com:42/blah/"), "http://yakk:womble@www.eazel.com:42/blah/");
+
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("FILE:///"), "file:///");
+
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///trash"), "file:///trash");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///Users/mikef"), "file:///Users/mikef");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/trash"), "file:///trash");
+
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("root"), "file:///root");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("/root"), "file:///root");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("//root"), "file:///root");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("///root"), "file:///root");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("////root"), "file:///root");
 
 	/* Test cases related to escaping. */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///%3F"), "file:///%3F");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///%78"), "file:///x");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///?"), "file:///%3F");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///x"), "file:///x");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorb:///%3F"), "glorb:///%3F");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorb:///%78"), "glorb:///x");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorb:///?"), "glorb:///%3F");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorb:///x"), "glorb:///x");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http:///%3F"), "http:///%3F");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http:///%78"), "http:///x");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http:///?"), "http:///?");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http:///x"), "http:///x");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.Eazel.Com"), "http://www.eazel.com");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.Eazel.Com/xXx"), "http://www.eazel.com/xXx");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("ftp://Darin@www.Eazel.Com/xXx"), "ftp://Darin@www.eazel.com/xXx");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.Eazel.Com:80/xXx"), "http://www.eazel.com:80/xXx");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("ftp://Darin@www.Eazel.Com:80/xXx"), "ftp://Darin@www.eazel.com:80/xXx");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///%3F"), "file:///%3F");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///%78"), "file:///x");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///?"), "file:///%3F");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:///x"), "file:///x");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorb:///%3F"), "glorb:///%3F");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorb:///%78"), "glorb:///x");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorb:///?"), "glorb:///%3F");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorb:///x"), "glorb:///x");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http:///%3F"), "http:///%3F");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http:///%78"), "http:///x");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http:///?"), "http:///?");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http:///x"), "http:///x");
+
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.Eazel.Com"), "http://www.eazel.com");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.Eazel.Com/xXx"), "http://www.eazel.com/xXx");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("ftp://Darin@www.Eazel.Com/xXx"), "ftp://Darin@www.eazel.com/xXx");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.Eazel.Com:80/xXx"), "http://www.eazel.com:80/xXx");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("ftp://Darin@www.Eazel.Com:80/xXx"), "ftp://Darin@www.eazel.com:80/xXx");
 
 	/* FIXME bugzilla.eazel.com 4101: Why append a slash in this case, but not in the http://www.eazel.com case? */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com:80"), "http://www.eazel.com:80/");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("http://www.eazel.com:80"), "http://www.eazel.com:80/");
 
 	/* Note: these cases behave differently here than in
 	 * gnome-vfs. In some cases because of bugs in gnome-vfs, but
 	 * in other cases because we just want them handled
 	 * differently.
 	 */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:trash"), "file:trash");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("//trash"), "file:///trash");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:"), "file:");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("trash"), "file:///trash");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorp:"), "glorp:");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("TRASH:XXX"), NAUTILUS_TRASH_URI);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("trash:xxx"), NAUTILUS_TRASH_URI);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("GNOME-TRASH:XXX"), NAUTILUS_TRASH_URI);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("gnome-trash:xxx"), NAUTILUS_TRASH_URI);
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("pipe:gnome-info2html2 as"), "pipe:gnome-info2html2 as");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_uri_make_full_from_relative (NULL, NULL), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_uri_make_full_from_relative ("http://a/b/c/d;p?q", NULL), "http://a/b/c/d;p?q");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_uri_make_full_from_relative (NULL, "http://a/b/c/d;p?q"), "http://a/b/c/d;p?q");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:trash"), "file:trash");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("//trash"), "file:///trash");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:"), "file:");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("trash"), "file:///trash");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorp:"), "glorp:");
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("TRASH:XXX"), NAUTILUS_TRASH_URI);
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("trash:xxx"), NAUTILUS_TRASH_URI);
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("GNOME-TRASH:XXX"), NAUTILUS_TRASH_URI);
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("gnome-trash:xxx"), NAUTILUS_TRASH_URI);
+
+	EEL_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("pipe:gnome-info2html2 as"), "pipe:gnome-info2html2 as");
+
+	EEL_CHECK_STRING_RESULT (nautilus_uri_make_full_from_relative (NULL, NULL), NULL);
+	EEL_CHECK_STRING_RESULT (nautilus_uri_make_full_from_relative ("http://a/b/c/d;p?q", NULL), "http://a/b/c/d;p?q");
+	EEL_CHECK_STRING_RESULT (nautilus_uri_make_full_from_relative (NULL, "http://a/b/c/d;p?q"), "http://a/b/c/d;p?q");
 
 	/* These test cases are from RFC 2396. */
 #define TEST_PARTIAL(partial, result) \
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_uri_make_full_from_relative \
+	EEL_CHECK_STRING_RESULT (nautilus_uri_make_full_from_relative \
 		("http://a/b/c/d;p?q", partial), result)
 
 	TEST_PARTIAL ("g", "http://a/b/c/g");
@@ -1907,48 +1907,48 @@ nautilus_self_check_file_utilities (void)
 
 #undef TEST_PARTIAL
 
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display (""), "/");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display (":"), ":");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///h/user"), "/h/user");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///%68/user/foo%2ehtml"), "/h/user/foo.html");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///h/user/foo.html#fragment"), "file:///h/user/foo.html#fragment");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("http://www.eazel.com"), "http://www.eazel.com");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("http://www.eazel.com/jobs#Engineering"), "http://www.eazel.com/jobs#Engineering");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file"), "/file");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///#"), "file:///#");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///"), "/");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///%20%23"), "/ #");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///%20%23#"), "file:///%20%23#");
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match (":", ":"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("file:///h/user/file#gunzip:///", "file:///h/user/file#gunzip:///"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("file:///h/user/file#gunzip:///", "file:///h/user/file#gzip:///"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("http://www.Eazel.Com", "http://www.eazel.com"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("http://www.Eazel.Com:80", "http://www.eazel.com:80"), TRUE);
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments (":", ":"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file#gunzip:///", "file:///h/user/file#gunzip:///"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file#gunzip:///", "file:///h/user/file#gzip:///"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("http://www.Eazel.Com", "http://www.eazel.com"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("http://www.Eazel.Com:80", "http://www.eazel.com:80"), TRUE);
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user", "file:///h/user"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user#frag", "file:///h/user"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user#frag", "file:///h/user/"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user#frag", "file:///h/user%23frag"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/", "file:///h/user"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/", "http:///h/user"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/", "http://www.eazel.com"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file#gunzip:///", "file:///h/user/file"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file#gunzip:///", "file:///h/user/file"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file.html.gz#gunzip:///#fragment", "file:///h/user/file.html.gz"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/#frag", "file:///h/user/"), TRUE);
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display (""), "/");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display (":"), ":");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///h/user"), "/h/user");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///%68/user/foo%2ehtml"), "/h/user/foo.html");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///h/user/foo.html#fragment"), "file:///h/user/foo.html#fragment");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("http://www.eazel.com"), "http://www.eazel.com");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("http://www.eazel.com/jobs#Engineering"), "http://www.eazel.com/jobs#Engineering");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file"), "/file");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///#"), "file:///#");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///"), "/");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///%20%23"), "/ #");
+	EEL_CHECK_STRING_RESULT (nautilus_format_uri_for_display ("file:///%20%23#"), "file:///%20%23#");
+
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("", ""), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match (":", ":"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("file:///h/user/file#gunzip:///", "file:///h/user/file#gunzip:///"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("file:///h/user/file#gunzip:///", "file:///h/user/file#gzip:///"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("http://www.Eazel.Com", "http://www.eazel.com"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match ("http://www.Eazel.Com:80", "http://www.eazel.com:80"), TRUE);
+
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("", ""), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments (":", ":"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file#gunzip:///", "file:///h/user/file#gunzip:///"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file#gunzip:///", "file:///h/user/file#gzip:///"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("http://www.Eazel.Com", "http://www.eazel.com"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("http://www.Eazel.Com:80", "http://www.eazel.com:80"), TRUE);
+
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user", "file:///h/user"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user#frag", "file:///h/user"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user#frag", "file:///h/user/"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user#frag", "file:///h/user%23frag"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/", "file:///h/user"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/", "http:///h/user"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/", "http://www.eazel.com"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file#gunzip:///", "file:///h/user/file"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file#gunzip:///", "file:///h/user/file"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/file.html.gz#gunzip:///#fragment", "file:///h/user/file.html.gz"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("file:///h/user/#frag", "file:///h/user/"), TRUE);
 
 	/* Since it's illegal to have a # in a scheme name, it doesn't really matter what these cases do */
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("fi#le:///h/user/file", "fi"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("fi#le:///h/user/file", "fi#le:"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("fi#le:///h/user/file", "fi"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_uris_match_ignore_fragments ("fi#le:///h/user/file", "fi#le:"), TRUE);
 }
 
 #endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 84994fd23..baadf21aa 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -30,17 +30,17 @@
 #include "nautilus-directory-private.h"
 #include "nautilus-file-attributes.h"
 #include "nautilus-file-private.h"
-#include "nautilus-glib-extensions.h"
 #include "nautilus-global-preferences.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gtk-macros.h"
 #include "nautilus-lib-self-check-functions.h"
 #include "nautilus-link.h"
-#include "nautilus-string.h"
 #include "nautilus-trash-directory.h"
 #include "nautilus-trash-file.h"
 #include "nautilus-vfs-file.h"
 #include <ctype.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-string.h>
 #include <gnome-xml/parser.h>
 #include <grp.h>
 #include <gtk/gtksignal.h>
@@ -102,7 +102,7 @@ static char *   nautilus_file_get_type_as_string  (NautilusFile      *file);
 static gboolean update_info_and_name              (NautilusFile      *file,
 						   GnomeVFSFileInfo  *info);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusFile, nautilus_file, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusFile, nautilus_file, GTK_TYPE_OBJECT)
 
 static void
 nautilus_file_initialize_class (NautilusFileClass *klass)
@@ -207,7 +207,7 @@ modify_link_hash_table (NautilusFile *file,
 
 	/* Creat the hash table first time through. */
 	if (symbolic_links == NULL) {
-		symbolic_links = nautilus_g_hash_table_new_free_at_exit
+		symbolic_links = eel_g_hash_table_new_free_at_exit
 			(g_str_hash, g_str_equal, "nautilus-file.c: symbolic_links");
 	}
 
@@ -314,7 +314,7 @@ nautilus_file_get_internal (const char *uri, gboolean create)
 		 * so we'll treat it like the case where gnome_vfs_uri couldn't
 		 * even create a URI.
 		 */
-		if (nautilus_str_is_empty (relative_uri)) {
+		if (eel_str_is_empty (relative_uri)) {
 			gnome_vfs_uri_unref (vfs_uri);
 			vfs_uri = NULL;
 			g_free (relative_uri);
@@ -435,11 +435,11 @@ destroy (GtkObject *object)
 	g_free (file->details->activation_uri);
 	g_free (file->details->compare_by_emblem_cache);
 	
-	nautilus_g_list_free_deep (file->details->mime_list);
+	eel_g_list_free_deep (file->details->mime_list);
 
 	g_free (file->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
@@ -1445,7 +1445,7 @@ compare_by_name (NautilusFile *file_1, NautilusFile *file_2)
 	} else if (!sort_last_1 && sort_last_2) {
 		compare = -1;
 	} else {
-		compare = nautilus_strcoll (name_1, name_2);
+		compare = eel_strcoll (name_1, name_2);
 	}
 
 	g_free (name_1);
@@ -1467,7 +1467,7 @@ compare_by_directory_name (NautilusFile *file_1, NautilusFile *file_2)
 	directory_1 = nautilus_file_get_parent_uri_for_display (file_1);
 	directory_2 = nautilus_file_get_parent_uri_for_display (file_2);
 
-	compare = nautilus_strcoll (directory_1, directory_2);
+	compare = eel_strcoll (directory_1, directory_2);
 
 	g_free (directory_1);
 	g_free (directory_2);
@@ -1553,7 +1553,7 @@ fill_emblem_cache_if_needed (NautilusFile *file)
 	/* Zero-terminate so we can tell where the list ends. */
 	*scanner = 0;
 
-	nautilus_g_list_free_deep (keywords);
+	eel_g_list_free_deep (keywords);
 
 	/* Chache the values of the automatic emblems. */
 	file->details->compare_by_emblem_cache->automatic_emblems_as_integer
@@ -1585,7 +1585,7 @@ compare_by_emblems (NautilusFile *file_1, NautilusFile *file_2)
 	keyword_cache_1 = file_1->details->compare_by_emblem_cache->emblem_keywords;
 	keyword_cache_2 = file_2->details->compare_by_emblem_cache->emblem_keywords;
 	for (; *keyword_cache_1 != '\0' && *keyword_cache_2 != '\0';) {
-		compare_result = nautilus_strcoll (keyword_cache_1, keyword_cache_2);
+		compare_result = eel_strcoll (keyword_cache_1, keyword_cache_2);
 		if (compare_result != 0) {
 			return compare_result;
 		}
@@ -1639,7 +1639,7 @@ compare_by_type (NautilusFile *file_1, NautilusFile *file_2)
 
 	if (file_1->details->info != NULL
 	    && file_2->details->info != NULL
-	    && nautilus_strcmp (file_1->details->info->mime_type,
+	    && eel_strcmp (file_1->details->info->mime_type,
 				file_2->details->info->mime_type) == 0) {
 		return 0;
 	}
@@ -1647,7 +1647,7 @@ compare_by_type (NautilusFile *file_1, NautilusFile *file_2)
 	type_string_1 = nautilus_file_get_type_as_string (file_1);
 	type_string_2 = nautilus_file_get_type_as_string (file_2);
 
-	result = nautilus_strcoll (type_string_1, type_string_2);
+	result = eel_strcoll (type_string_1, type_string_2);
 
 	g_free (type_string_1);
 	g_free (type_string_2);
@@ -1823,7 +1823,7 @@ nautilus_file_compare_name (NautilusFile *file,
 	g_return_val_if_fail (pattern != NULL, -1);
 
 	name = nautilus_file_get_name (file);
-	result = nautilus_strcoll (name, pattern);
+	result = eel_strcoll (name, pattern);
 	g_free (name);
 	return result;
 }
@@ -1891,7 +1891,7 @@ nautilus_file_list_filter_hidden_and_backup (GList    *files,
 	 */
 
 	filtered_files = nautilus_file_list_copy (files);
-	filtered_files = nautilus_g_list_partition (filtered_files, 
+	filtered_files = eel_g_list_partition (filtered_files, 
 						    filter_hidden_and_backup_partition_callback,
 						    GINT_TO_POINTER ((show_hidden ? SHOW_HIDDEN : 0) |
 								     (show_backup ? SHOW_BACKUP : 0)),
@@ -2103,7 +2103,7 @@ nautilus_file_monitor_add (NautilusFile *file,
 	g_return_if_fail (NAUTILUS_IS_FILE (file));
 	g_return_if_fail (client != NULL);
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(NAUTILUS_FILE_CLASS, file,
 		 monitor_add, (file, client, attributes));
 }   
@@ -2115,7 +2115,7 @@ nautilus_file_monitor_remove (NautilusFile *file,
 	g_return_if_fail (NAUTILUS_IS_FILE (file));
 	g_return_if_fail (client != NULL);
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(NAUTILUS_FILE_CLASS, file,
 		 monitor_remove, (file, client));
 }			      
@@ -2198,7 +2198,7 @@ nautilus_file_get_date (NautilusFile *file,
 
 	g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_FILE_CLASS, file,
 		 get_date, (file, date_type, date));
 }
@@ -2212,7 +2212,7 @@ nautilus_file_get_where_string (NautilusFile *file)
 
 	g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_FILE_CLASS, file,
 		 get_where_string, (file));
 }
@@ -2242,7 +2242,7 @@ nautilus_file_get_date_as_string (NautilusFile *file, NautilusDateType date_type
 	}
 
 	file_time = localtime (&file_time_raw);
-	file_date = nautilus_g_date_new_tm (file_time);
+	file_date = eel_g_date_new_tm (file_time);
 	
 	today = g_date_new ();
 	g_date_set_time (today, time (NULL));
@@ -2292,7 +2292,7 @@ nautilus_file_get_date_as_string (NautilusFile *file, NautilusDateType date_type
 		format = _("%-m/%-d/%y at %-I:%M %p");
 	}
 
-	return nautilus_strdup_strftime (format, file_time);
+	return eel_strdup_strftime (format, file_time);
 }
 
 static NautilusSpeedTradeoffValue show_directory_item_count;
@@ -2411,7 +2411,7 @@ nautilus_file_get_directory_item_count (NautilusFile *file,
 		return FALSE;
 	}
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_FILE_CLASS, file,
 		 get_item_count, (file, count, count_unreadable));
 }
@@ -2460,7 +2460,7 @@ nautilus_file_get_deep_counts (NautilusFile *file,
 		return file->details->deep_counts_status;
 	}
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_FILE_CLASS, file,
 		 get_deep_counts, (file,
 				   directory_count,
@@ -2504,7 +2504,7 @@ nautilus_file_get_directory_item_mime_types (NautilusFile *file,
 		return FALSE;
 	}
 
-	*mime_list = nautilus_g_str_list_copy (file->details->mime_list);
+	*mime_list = eel_g_str_list_copy (file->details->mime_list);
 	return TRUE;
 }
 
@@ -2688,22 +2688,22 @@ get_real_name (struct passwd *user)
 		return NULL;
 	}
 
-	part_before_comma = nautilus_str_strip_substring_and_after (user->pw_gecos, ",");
+	part_before_comma = eel_str_strip_substring_and_after (user->pw_gecos, ",");
 
-	capitalized_login_name = nautilus_str_capitalize (user->pw_name);
+	capitalized_login_name = eel_str_capitalize (user->pw_name);
 
 	if (capitalized_login_name == NULL) {
 		real_name = part_before_comma;
 	} else {
-		real_name = nautilus_str_replace_substring
+		real_name = eel_str_replace_substring
 			(part_before_comma, "&", capitalized_login_name);
 		g_free (part_before_comma);
 	}
 
 
-	if (nautilus_str_is_empty (real_name)
-	    || nautilus_strcmp (user->pw_name, real_name) == 0
-	    || nautilus_strcmp (capitalized_login_name, real_name) == 0) {
+	if (eel_str_is_empty (real_name)
+	    || eel_strcmp (user->pw_name, real_name) == 0
+	    || eel_strcmp (capitalized_login_name, real_name) == 0) {
 		g_free (real_name);
 		real_name = NULL;
 	}
@@ -3021,7 +3021,7 @@ nautilus_get_user_names (void)
 
 	endpwent ();
 
-	return nautilus_g_str_list_alphabetize (list);
+	return eel_g_str_list_alphabetize (list);
 }
 
 /**
@@ -3176,7 +3176,7 @@ nautilus_get_group_names_including (const char *username)
 
 	endgrent ();
 
-	return nautilus_g_str_list_alphabetize (list);
+	return eel_g_str_list_alphabetize (list);
 }
 
 /**
@@ -3793,7 +3793,7 @@ get_description (NautilusFile *file)
 	}
 	
 	mime_type = file->details->info->mime_type;
-	if (nautilus_str_is_empty (mime_type)) {
+	if (eel_str_is_empty (mime_type)) {
 		return NULL;
 	}
 
@@ -3803,7 +3803,7 @@ get_description (NautilusFile *file)
 	}
 
 	description = gnome_vfs_mime_get_description (mime_type);
-	if (!nautilus_str_is_empty (description)) {
+	if (!eel_str_is_empty (description)) {
 		return description;
 	}
 
@@ -3870,7 +3870,7 @@ nautilus_file_get_file_type (NautilusFile *file)
 	if (file == NULL) {
 		return GNOME_VFS_FILE_TYPE_UNKNOWN;
 	}
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_FILE_CLASS, file, get_file_type, (file));
 }
 
@@ -3916,7 +3916,7 @@ nautilus_file_is_mime_type (NautilusFile *file, const char *mime_type)
 	if (file->details->info == NULL) {
 		return FALSE;
 	}
-	return nautilus_strcasecmp (file->details->info->mime_type,
+	return eel_strcasecmp (file->details->info->mime_type,
 				    mime_type) == 0;
 }
 
@@ -3950,14 +3950,14 @@ sort_keyword_list_and_remove_duplicates (GList *keywords)
 	GList *duplicate_link;
 	
 	if (keywords != NULL) {
-		keywords = nautilus_g_str_list_alphabetize (keywords);
+		keywords = eel_g_str_list_alphabetize (keywords);
 
 		p = keywords;
 		while (p->next != NULL) {
 			if (strcmp ((const char *) p->data, (const char *) p->next->data) == 0) {
 				duplicate_link = p->next;
 				keywords = g_list_remove_link (keywords, duplicate_link);
-				nautilus_g_list_free_deep (duplicate_link);
+				eel_g_list_free_deep (duplicate_link);
 			} else {
 				p = p->next;
 			}
@@ -4157,7 +4157,7 @@ nautilus_file_contains_text (NautilusFile *file)
 	g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
 	
 	mime_type = nautilus_file_get_mime_type (file);
-	contains_text = nautilus_istr_has_prefix (mime_type, "text/");
+	contains_text = eel_istr_has_prefix (mime_type, "text/");
 	g_free (mime_type);
 	
 	return contains_text;
@@ -4393,7 +4393,7 @@ nautilus_file_check_if_ready (NautilusFile *file,
 
 	g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_FILE_CLASS, file,
 		 check_if_ready, (file, file_attributes));
 }			      
@@ -4414,7 +4414,7 @@ nautilus_file_call_when_ready (NautilusFile *file,
 
 	g_return_if_fail (NAUTILUS_IS_FILE (file));
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(NAUTILUS_FILE_CLASS, file,
 		 call_when_ready, (file, file_attributes, 
 				   callback, callback_data));
@@ -4433,7 +4433,7 @@ nautilus_file_cancel_call_when_ready (NautilusFile *file,
 
 	g_return_if_fail (NAUTILUS_IS_FILE (file));
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(NAUTILUS_FILE_CLASS, file,
 		 cancel_call_when_ready, (file, callback, callback_data));
 }
@@ -4650,7 +4650,7 @@ nautilus_file_list_ref (GList *list)
 void
 nautilus_file_list_unref (GList *list)
 {
-	nautilus_g_list_safe_for_each (list, (GFunc) nautilus_file_unref, NULL);
+	eel_g_list_safe_for_each (list, (GFunc) nautilus_file_unref, NULL);
 }
 
 /**
@@ -4771,17 +4771,17 @@ nautilus_self_check_file (void)
 
         /* refcount checks */
 
-        NAUTILUS_CHECK_INTEGER_RESULT (nautilus_directory_number_outstanding (), 0);
+        EEL_CHECK_INTEGER_RESULT (nautilus_directory_number_outstanding (), 0);
 
 	file_1 = nautilus_file_get ("file:///home/");
 
-	NAUTILUS_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 1);
-	NAUTILUS_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1->details->directory)->ref_count, 1);
-        NAUTILUS_CHECK_INTEGER_RESULT (nautilus_directory_number_outstanding (), 1);
+	EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 1);
+	EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1->details->directory)->ref_count, 1);
+        EEL_CHECK_INTEGER_RESULT (nautilus_directory_number_outstanding (), 1);
 
 	nautilus_file_unref (file_1);
 
-        NAUTILUS_CHECK_INTEGER_RESULT (nautilus_directory_number_outstanding (), 0);
+        EEL_CHECK_INTEGER_RESULT (nautilus_directory_number_outstanding (), 0);
 	
 	file_1 = nautilus_file_get ("file:///etc");
 	file_2 = nautilus_file_get ("file:///usr");
@@ -4792,61 +4792,61 @@ nautilus_self_check_file (void)
 
         nautilus_file_list_ref (list);
         
-	NAUTILUS_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 2);
-	NAUTILUS_CHECK_INTEGER_RESULT (GTK_OBJECT (file_2)->ref_count, 2);
+	EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 2);
+	EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_2)->ref_count, 2);
 
 	nautilus_file_list_unref (list);
         
-	NAUTILUS_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 1);
-	NAUTILUS_CHECK_INTEGER_RESULT (GTK_OBJECT (file_2)->ref_count, 1);
+	EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 1);
+	EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_2)->ref_count, 1);
 
 	nautilus_file_list_free (list);
 
-        NAUTILUS_CHECK_INTEGER_RESULT (nautilus_directory_number_outstanding (), 0);
+        EEL_CHECK_INTEGER_RESULT (nautilus_directory_number_outstanding (), 0);
 	
 
         /* name checks */
 	file_1 = nautilus_file_get ("file:///home/");
 
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), "home");
+	EEL_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), "home");
 
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_get ("file:///home/") == file_1, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_get ("file:///home/") == file_1, TRUE);
 	nautilus_file_unref (file_1);
 
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_get ("file:///home") == file_1, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_get ("file:///home") == file_1, TRUE);
 	nautilus_file_unref (file_1);
 
 	nautilus_file_unref (file_1);
 
 	file_1 = nautilus_file_get ("file:///home");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), "home");
+	EEL_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), "home");
 	nautilus_file_unref (file_1);
 
 	file_1 = nautilus_file_get (":");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), ":");
+	EEL_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), ":");
 	nautilus_file_unref (file_1);
 
 	file_1 = nautilus_file_get ("eazel:");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), "eazel");
+	EEL_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), "eazel");
 	nautilus_file_unref (file_1);
 
 	file_1 = nautilus_file_get (NAUTILUS_TRASH_URI);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), _("Trash"));
+	EEL_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), _("Trash"));
 	nautilus_file_unref (file_1);
 
 	/* sorting */
 	file_1 = nautilus_file_get ("file:///etc");
 	file_2 = nautilus_file_get ("file:///usr");
 
-	NAUTILUS_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 1);
-	NAUTILUS_CHECK_INTEGER_RESULT (GTK_OBJECT (file_2)->ref_count, 1);
+	EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_1)->ref_count, 1);
+	EEL_CHECK_INTEGER_RESULT (GTK_OBJECT (file_2)->ref_count, 1);
 
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_2, NAUTILUS_FILE_SORT_BY_NAME, FALSE, FALSE) < 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_2, NAUTILUS_FILE_SORT_BY_NAME, FALSE, TRUE) > 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_1, NAUTILUS_FILE_SORT_BY_NAME, FALSE, FALSE) == 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_1, NAUTILUS_FILE_SORT_BY_NAME, TRUE, FALSE) == 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_1, NAUTILUS_FILE_SORT_BY_NAME, FALSE, TRUE) == 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_1, NAUTILUS_FILE_SORT_BY_NAME, TRUE, TRUE) == 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_2, NAUTILUS_FILE_SORT_BY_NAME, FALSE, FALSE) < 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_2, NAUTILUS_FILE_SORT_BY_NAME, FALSE, TRUE) > 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_1, NAUTILUS_FILE_SORT_BY_NAME, FALSE, FALSE) == 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_1, NAUTILUS_FILE_SORT_BY_NAME, TRUE, FALSE) == 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_1, NAUTILUS_FILE_SORT_BY_NAME, FALSE, TRUE) == 0, TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_file_compare_for_sort (file_1, file_1, NAUTILUS_FILE_SORT_BY_NAME, TRUE, TRUE) == 0, TRUE);
 
 	nautilus_file_unref (file_1);
 	nautilus_file_unref (file_2);
diff --git a/libnautilus-private/nautilus-font-factory.c b/libnautilus-private/nautilus-font-factory.c
index 09abdb6e6..89fed7b62 100644
--- a/libnautilus-private/nautilus-font-factory.c
+++ b/libnautilus-private/nautilus-font-factory.c
@@ -26,10 +26,10 @@
 #include "nautilus-font-factory.h"
 
 #include "nautilus-global-preferences.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-string.h"
-#include "nautilus-gdk-font-extensions.h"
-#include "nautilus-gtk-extensions.h"
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-string.h>
+#include <eel/eel-gdk-font-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 #include <pthread.h>
 #include <unistd.h>
 
@@ -70,7 +70,7 @@ static void    nautilus_font_factory_initialize_class (NautilusFontFactoryClass
 static void    nautilus_font_factory_initialize       (NautilusFontFactory      *factory);
 static void    destroy                                (GtkObject                *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusFontFactory,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusFontFactory,
 				   nautilus_font_factory,
 				   GTK_TYPE_OBJECT)
 
@@ -165,7 +165,7 @@ destroy (GtkObject *object)
 	g_hash_table_foreach (factory->fonts, free_one_hash_node, NULL);
 	g_hash_table_destroy (factory->fonts);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static FontHashNode *
@@ -222,8 +222,8 @@ nautilus_font_factory_get_font_by_family (const char *family,
 	/* FIXME bugzilla.eazel.com 7907: 
 	 * The "GTK System Font" string is hard coded in many places.
 	 */
-	if (nautilus_str_is_equal (family, "GTK System Font")) {
-		return nautilus_gtk_get_system_font ();
+	if (eel_str_is_equal (family, "GTK System Font")) {
+		return eel_gtk_get_system_font ();
 	}
 
 	fontset = g_strsplit (family, ",", 5);
@@ -235,8 +235,8 @@ nautilus_font_factory_get_font_by_family (const char *family,
 		 * Its a hack that we check for "-" prefixes in font names.
 		 * We do this in order not to break transalted font families.
 		 */
-		if (!nautilus_str_has_prefix (*iter, "-")) {
-			font_name = nautilus_gdk_font_xlfd_string_new ("*", 
+		if (!eel_str_has_prefix (*iter, "-")) {
+			font_name = eel_gdk_font_xlfd_string_new ("*", 
 								       *iter,
 								       "medium",
 								       "r",
@@ -262,7 +262,7 @@ nautilus_font_factory_get_font_by_family (const char *family,
 		font = node->font;
 		gdk_font_ref (font);
 	} else {
-		font = nautilus_gdk_font_get_fixed ();
+		font = eel_gdk_font_get_fixed ();
 	}
 
 	g_free (font_name);
diff --git a/libnautilus-private/nautilus-font-manager.c b/libnautilus-private/nautilus-font-manager.c
deleted file mode 100644
index dc6937d99..000000000
--- a/libnautilus-private/nautilus-font-manager.c
+++ /dev/null
@@ -1,1412 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-font-manager.c - Functions for managing fonts.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Pavel Cisler <pavel@eazel.com>,
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-font-manager.h"
-
-#include "nautilus-glib-extensions.h"
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-string-list.h"
-#include "nautilus-string.h"
-#include <libgnome/gnome-util.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <libgnomevfs/gnome-vfs.h>
-
-#define XLFD_INDEX_FOUNDRY		1
-#define XLFD_INDEX_FAMILY		2
-#define XLFD_INDEX_WEIGHT		3
-#define XLFD_INDEX_SLANT		4
-#define XLFD_INDEX_SET_WIDTH		5
-#define XLFD_INDEX_CHAR_SET_REGISTRY	13
-#define XLFD_INDEX_CHAR_SET_ENCODING	14
-#define XLFD_INDEX_MAX			XLFD_INDEX_CHAR_SET_ENCODING
-
-#define FONTS_DIR_FILE_NAME		"fonts.dir"
-#define FONTS_ALIAS_FILE_NAME		"fonts.alias"
-#define FONTS_SCALE_FILE_NAME		"fonts.scale"
-
-#define FONT_SERVER_CONFIG_FILE		"/etc/X11/fs/config"
-#define DEFAULT_FONT_DIRECTORY		NAUTILUS_DATADIR "/fonts/urw"
-#define USER_FONT_DIRECTORY_NAME	"fonts"
-
-#define NAUTILUS_FONT_UNDEFINED		((NautilusFontType) 0)
-
-#define POSTSCRIPT_FONT_MIME_TYPE	"application/x-font-type1"
-#define TRUE_TYPE_FONT_MIME_TYPE	"application/x-font-ttf"
-
-#define SOURCE_FONT_DIRECTORY		NAUTILUS_SOURCE_DIRECTORY "/data/fonts/urw"
-#define DEFAULT_FONT			"n019003l.pfb"
-#define DEFAULT_BOLD_FONT		"n019004l.pfb"
-
-/* These font families are black listed, because they 
- * arent useful at all to display "normal" text - at 
- * least in the context of Nautilus.
- */
-static const char *black_listed_font_families[] = {
-	"Bookman",
-	"Bookman L",
-	"Webdings",
-	"Wingdings",
-	"OCR",
-	"Zapf Dingbats",
-	"Dingbats",
-	"Symbol",
-	"Standard Symbols L"
-	"cursor",
-	"mincho",
-	"gothic",
-	"MS Reference 2",
-	"MS Reference 1",
-	"Marlett",
-	"cursor"
-};
-
-static const char *black_listed_font_foundries[] = {
- 	"greek",
- 	"grinet",
-	/* Abisource fonts are black listed because they
-	 * appear to simply be copies of the URW fonts,
-	 * and listing them would waste valuable font picker
-	 * space for no purpose.
-	 */
-	"Abisource"
-};
-
-static const char *ignored_font_dir_suffices[] = {
-	"unscaled",
-	"100dpi",
-	"75dpi",
-	"misc",
-	"abisource/fonts",
-	"AbiSuite/fonts",
-	"fonts/Speedo",
-	"fonts/cyrillic",
-	"ISO8859-2/Type1",
-	"ISO8859-7/Type1"
-};
-
-/*
- * FontDescription:
- *
- * A structure that describes a single font entry;
- *
- */
-typedef struct {
-	char *file_name;
-	NautilusFontType font_type;
-	char *foundry;
-	char *family;
-	char *weight;
-	char *slant;
-	char *set_width;
-	char *char_set;
-	gboolean is_ignored;
-} FontDescription;
-
-/*
- * FontDescriptionTable:
- *
- * A table of 0 or more font descriptions.
- *
- */
-typedef struct {
-	char *directory;
-	char *fonts_dir_file;
-	char *fonts_alias_file;
-	char *fonts_scale_file;
-	GList *descriptions;
-} FontDescriptionTable;
-
-static gboolean                string_is_valid                          (const char                  *string);
-static char *                  file_as_string                           (const char                  *file_name);
-static gboolean                directory_contains_file                  (const char                  *directory,
-									 const char                  *file_name);
-static FontDescription *       font_description_new                     (const char                  *font_file_name,
-									 NautilusFontType             font_type,
-									 const char                  *xlfd_string);
-static void                    font_description_free                    (FontDescription             *description);
-static gboolean                font_description_table_for_each          (const FontDescriptionTable  *description_table,
-									 NautilusFontManagerCallback  callback,
-									 gpointer                     callback_data);
-static char                   *font_description_get_file_name           (const FontDescription       *description);
-static char                   *font_description_get_foundry             (const FontDescription       *description);
-static char                   *font_description_get_family              (const FontDescription       *description);
-static char                   *font_description_get_weight              (const FontDescription       *description);
-static char                   *font_description_get_slant               (const FontDescription       *description);
-static char                   *font_description_get_set_width           (const FontDescription       *description);
-static char                   *font_description_get_char_set            (const FontDescription       *description);
-static FontDescriptionTable *  font_description_table_new               (const char                  *font_directory,
-									 const GList                 *postscript_font_list,
-									 const GList                 *true_type_font_list);
-static void                    font_description_table_add               (FontDescriptionTable        *description_table,
-									 const char                  *line,
-									 const GList                 *postscript_font_list,
-									 const GList                 *true_type_font_list);
-static NautilusFontType        font_get_font_type                       (const char                  *font_file_name,
-									 const GList                 *postscript_font_list,
-									 const GList                 *true_type_font_list);
-static guint                   font_description_table_get_length        (const FontDescriptionTable  *description_table);
-static const FontDescription * font_description_table_peek_nth          (const FontDescriptionTable  *description_table,
-									 guint                        n);
-static char *                  font_description_table_get_nth_file_name (const FontDescriptionTable  *table,
-									 guint                        n);
-static void                    font_description_table_free              (FontDescriptionTable        *table);
-static void                    font_description_table_clear             (FontDescriptionTable        *table);
-static const FontDescription * font_description_table_find              (const FontDescriptionTable  *description_table,
-									 const char                  *file_name);
-static gboolean                font_directory_is_ignored                (const char                  *font_directory);
-static gboolean                font_foundry_is_ignored                  (const char                  *foundry);
-static gboolean                font_family_is_ignored                   (const char                  *family);
-
-static gboolean
-string_is_valid (const char *string)
-{
-	return string && string[0] != '\0';
-}
-
-static char *
-file_as_string (const char *file_name)
-{
-	struct stat stat_info;
-	FILE *stream;
-	char *result;
-	size_t num_read;
-
-	g_return_val_if_fail (file_name != NULL, NULL);
-	g_return_val_if_fail (g_file_exists (file_name), NULL);
-
-	if (stat (file_name, &stat_info) != 0) {
-		return NULL;
-	}
-
-	if (stat_info.st_size == 0) {
-		return NULL;
-	}
-	
-	stream = fopen (file_name, "r");
-	
-	if (!stream) {
-		return NULL;
-	}
-
-	result = g_malloc (sizeof (char) * stat_info.st_size + 1);
-
-	num_read = fread (result, sizeof (char), stat_info.st_size, stream);
-
-	fclose (stream);
-
-	if ((ssize_t)num_read != stat_info.st_size) {
-		g_free (result);
-		return NULL;
-	}
-
-	result[stat_info.st_size] = '\0';
-
-	return result;
-}
-
-static void
-gnome_vfs_init_if_needed (void)
-{
-	/* Caching the call go gnome_vfs_initialized to make calling this
-	 * trivial. Even if this got called from multiple treads at the same time,
-	 * using the static here is not a problem because gnome_vfs_init is
-	 * atomic and idempotent.
-	 */
-	static gboolean initialized = FALSE;
-	
-	if (!initialized) {
-		initialized = gnome_vfs_initialized ();
-		if (!initialized) {
-			initialized = gnome_vfs_init();
-		}
-	}
-}
-
-
-static FontDescription *
-font_description_new (const char *font_file_name,
-		      NautilusFontType font_type,
-		      const char *xlfd_string)
-{
-	FontDescription *description = NULL;
-	NautilusStringList *tokenized_xlfd;
-	char *char_set_registry;
-	char *char_set_encoding;
-
-	g_return_val_if_fail (string_is_valid (font_file_name), NULL);
-	g_return_val_if_fail (string_is_valid (xlfd_string), NULL);
-	g_return_val_if_fail (font_type >= NAUTILUS_FONT_POSTSCRIPT, NULL);
-	g_return_val_if_fail (font_type <= NAUTILUS_FONT_TRUE_TYPE, NULL);
-
-	tokenized_xlfd = nautilus_string_list_new_from_tokens (xlfd_string, "-", FALSE);
-
-	if (nautilus_string_list_get_length (tokenized_xlfd) == (XLFD_INDEX_MAX + 1)) {
-		description = g_new0 (FontDescription, 1);
- 		description->file_name = g_strdup (font_file_name);
- 		description->font_type = font_type;
-		description->foundry = nautilus_string_list_nth (tokenized_xlfd, XLFD_INDEX_FOUNDRY);
-		description->family = nautilus_string_list_nth (tokenized_xlfd, XLFD_INDEX_FAMILY);
-		description->weight = nautilus_string_list_nth (tokenized_xlfd, XLFD_INDEX_WEIGHT);
-		description->slant = nautilus_string_list_nth (tokenized_xlfd, XLFD_INDEX_SLANT);
-		description->set_width = nautilus_string_list_nth (tokenized_xlfd, XLFD_INDEX_SET_WIDTH);
-
-		char_set_registry = nautilus_string_list_nth (tokenized_xlfd, XLFD_INDEX_CHAR_SET_REGISTRY);
-		char_set_encoding = nautilus_string_list_nth (tokenized_xlfd, XLFD_INDEX_CHAR_SET_ENCODING);
-		description->char_set = g_strdup_printf ("%s-%s", char_set_registry, char_set_encoding);
-		g_free (char_set_registry);
-		g_free (char_set_encoding);
-
-		description->is_ignored = 
-			font_foundry_is_ignored (description->foundry) || font_family_is_ignored (description->family);
-	} else {
-		g_warning ("'%s' is not a valid XLFD string", xlfd_string);
-	}
-	
-	nautilus_string_list_free (tokenized_xlfd);
-
-	return description;
-}
-
-static void
-font_description_free (FontDescription *description)
-{
-	g_return_if_fail (description != NULL);
-
-	g_free (description->file_name);
-	g_free (description->foundry);
-	g_free (description->family);
-	g_free (description->weight);
-	g_free (description->slant);
-	g_free (description->set_width);
-	g_free (description->char_set);
-	g_free (description);
-}
-
-static char *
-font_description_get_file_name (const FontDescription *description)
-{
-	g_return_val_if_fail (description != NULL, NULL);
-
-	return g_strdup (description->file_name);
-}
-
-static char *
-font_description_get_foundry (const FontDescription *description)
-{
-	g_return_val_if_fail (description != NULL, NULL);
-
-	return g_strdup (description->foundry);
-}
-
-static char *
-font_description_get_family (const FontDescription *description)
-{
-	g_return_val_if_fail (description != NULL, NULL);
-
-	return g_strdup (description->family);
-}
-
-static char *
-font_description_get_weight (const FontDescription *description)
-{
-	g_return_val_if_fail (description != NULL, NULL);
-
-	return g_strdup (description->weight);
-}
-
-static char *
-font_description_get_slant (const FontDescription *description)
-{
-	g_return_val_if_fail (description != NULL, NULL);
-
-	return g_strdup (description->slant);
-}
-
-static char *
-font_description_get_set_width (const FontDescription *description)
-{
-	g_return_val_if_fail (description != NULL, NULL);
-
-	return g_strdup (description->set_width);
-}
-
-static char *
-font_description_get_char_set (const FontDescription *description)
-{
-	g_return_val_if_fail (description != NULL, NULL);
-
-	return g_strdup (description->char_set);
-}
-
-static guint
-font_lists_total_num_fonts (const GList *postscript_font_list,
-			    const GList *true_type_font_list)
-{
-	return g_list_length ((GList *) postscript_font_list)
-		+ g_list_length ((GList *) true_type_font_list);
-}
-	
-static void
-font_description_table_add (FontDescriptionTable *table,
-			    const char *line,
-			    const GList *postscript_font_list,
-			    const GList *true_type_font_list)
-{
-	char *font_file_name = NULL;
-	FontDescription *description;
-	char *xlfd_delimeter;
-	char *font_file_full_path;
-	NautilusFontType font_type;
-	
-	g_return_if_fail (table != NULL);
-	g_return_if_fail (string_is_valid (line));
-	g_return_if_fail (font_lists_total_num_fonts (postscript_font_list, true_type_font_list) > 0);
-
-	xlfd_delimeter = strstr (line, " ");
-
-	if (xlfd_delimeter == NULL) {
-		g_warning ("'%s' is not a valid font description line", line);
-		return;
-	}
-
-	font_file_name = g_strndup (line, xlfd_delimeter - line);
-
-	while (isspace ((guchar) *xlfd_delimeter)) {
-		xlfd_delimeter++;
-	}
-
-	font_file_full_path = g_strdup_printf ("%s/%s", table->directory, font_file_name);
-	font_type = font_get_font_type (font_file_full_path,
-					postscript_font_list,
-					true_type_font_list);
-
-	if (font_type != NAUTILUS_FONT_UNDEFINED) {
-		description = font_description_new (font_file_full_path, font_type, xlfd_delimeter);
-		if (description != NULL) {
-			table->descriptions = g_list_append (table->descriptions, description);
-		}
-	}
-
-	g_free (font_file_full_path);
-	g_free (font_file_name);
-}
-
-static NautilusFontType
-font_get_font_type (const char *font_file_name,
-		    const GList *postscript_font_list,
-		    const GList *true_type_font_list)
-{
-	const GList *node;
-
-	g_return_val_if_fail (string_is_valid (font_file_name), NAUTILUS_FONT_UNDEFINED);
-	g_return_val_if_fail (font_lists_total_num_fonts (postscript_font_list, true_type_font_list) > 0,
-			      NAUTILUS_FONT_UNDEFINED);
-
-	node = postscript_font_list;
-	while (node != NULL) {
-		if (nautilus_istr_is_equal (node->data, font_file_name)) {
-			return NAUTILUS_FONT_POSTSCRIPT;
-		}
-		node = node->next;
-	}
-
-	node = true_type_font_list;
-	while (node != NULL) {
-		if (nautilus_istr_is_equal (node->data, font_file_name)) {
-			return NAUTILUS_FONT_TRUE_TYPE;
-		}
-		node = node->next;
-	}
-
-	return NAUTILUS_FONT_UNDEFINED;
-}
-
-static guint
-font_description_table_get_length (const FontDescriptionTable *table)
-{
-	g_return_val_if_fail (table != NULL, 0);
-	
-	return g_list_length (table->descriptions);
-}
-
-static const FontDescription *
-font_description_table_peek_nth (const FontDescriptionTable *table,
-				 guint n)
-{
-	g_return_val_if_fail (table != NULL, NULL);
-	g_return_val_if_fail (n < font_description_table_get_length (table), NULL);
-
-	return g_list_nth_data (table->descriptions, n);
-}
-
-static char *
-font_description_table_get_nth_file_name (const FontDescriptionTable *table,
-					  guint n)
-{
-	const FontDescription *description;
-	
-	g_return_val_if_fail (table != NULL, NULL);
-	g_return_val_if_fail (n < font_description_table_get_length (table), NULL);
-
-	description = font_description_table_peek_nth (table, n);
-	return g_strdup (description->file_name);
-}
-
-static void
-font_description_table_free (FontDescriptionTable *table)
-{
-	g_return_if_fail (table != NULL);
-
-	font_description_table_clear (table);
-	g_free (table);
-}
-
-static void
-font_description_table_clear (FontDescriptionTable *table)
-{
-	GList *node;
-		
-	g_return_if_fail (table != NULL);
-
-	node = table->descriptions;
-	while (node != NULL) {
-		font_description_free (node->data);
-		node = node->next;
-	}
-
-	g_list_free (table->descriptions);
-	table->descriptions = NULL;
-
-	g_free (table->directory);
-	table->directory = NULL;
-
-	g_free (table->fonts_dir_file);
-	table->fonts_dir_file = NULL;
-
-	g_free (table->fonts_alias_file);
-	table->fonts_alias_file = NULL;
-
-	g_free (table->fonts_scale_file);
-	table->fonts_scale_file = NULL;
-}
-
-static const FontDescription *
-font_description_table_find (const FontDescriptionTable *table,
-			     const char *file_name)
-{
-	GList *node;
-	const FontDescription *description;
-	
-	g_return_val_if_fail (table != NULL, NULL);
-	g_return_val_if_fail (nautilus_strlen (file_name) > 0, NULL);
-	
-	for (node = table->descriptions; node != NULL; node = node->next) {
-		g_assert (node->data != NULL);
-		description = node->data;
-
-		if (!description->is_ignored && nautilus_str_is_equal (file_name, description->file_name)) {
-			return description;
-		}
-	}
-
-	return NULL;
-}
-
-static gboolean
-font_description_table_for_each (const FontDescriptionTable *table,
-				 NautilusFontManagerCallback callback,
-				 gpointer callback_data)
-{
-	GList *node;
-	const FontDescription *description;
-	gboolean cont = TRUE;
-		
-	g_return_val_if_fail (table != NULL, TRUE);
-	g_return_val_if_fail (callback != NULL, TRUE);
-
-	node = table->descriptions;
-	while (node != NULL) {
-		g_assert (node->data != NULL);
-		description = node->data;
-		
-		cont = TRUE;
-
-		if (!description->is_ignored) {
-			cont = (* callback) (description->file_name,
-					     description->font_type,
-					     description->foundry,
-					     description->family,
-					     description->weight,
-					     description->slant,
-					     description->set_width,
-					     description->char_set,
-					     callback_data);
-		}
-		
-		node = cont ? node->next : NULL;
-	}
-
-	return cont;
-}
-
-static FontDescriptionTable *
-font_description_table_new (const char *font_directory,
-			    const GList *postscript_font_list,
-			    const GList *true_type_font_list)
-{
-	FontDescriptionTable *table;
-	char *description_file;
-	char *description_contents;
-	NautilusStringList *tokenized_contents;
-	int i;
-	int length;
-	gboolean got_count;
-	int count;
-	char *line;
-
-	g_return_val_if_fail (string_is_valid (font_directory), NULL);
-	g_return_val_if_fail (g_file_test (font_directory, G_FILE_TEST_ISDIR), NULL);
-
-	description_file = g_strdup_printf ("%s/%s", font_directory, FONTS_DIR_FILE_NAME);
-	description_contents = file_as_string (description_file);
-	
-	/* Error reading file, report errors by returning NULL. */
-	if (description_contents == NULL) {
-		g_free (description_file);
-		return NULL;
-	}
-
-	tokenized_contents = nautilus_string_list_new_from_tokens (description_contents, "\n", FALSE);
-
-	/* Get the first line from the file. */
-	length = nautilus_string_list_get_length (tokenized_contents);
-	if (length == 0) {
-		got_count = FALSE;
-	} else {
-		got_count = nautilus_string_list_nth_as_integer (tokenized_contents, 0, &count);
-	}
-
-	/* Find out how many font entries are described in this file */
-	if (!got_count || count + 1 > length) {
-		g_free (description_file);
-		g_free (description_contents);
-		nautilus_string_list_free (tokenized_contents);
-		return NULL;
-	}
-	    
-	/* Create a new table */
-	table = g_new0 (FontDescriptionTable, 1);
-
-	/* Assign the directory and description file */
-	table->directory = g_strdup (font_directory);
-	table->fonts_dir_file = description_file;
-
-	/* Iterate throught the description file contents */
-	for (i = 0; i < count; i++) {
-		line = nautilus_string_list_nth (tokenized_contents, i + 1);
-		if (line != NULL) {
-			font_description_table_add (table,
-						    line,
-						    postscript_font_list,
-						    true_type_font_list);
-		}
-		g_free (line);
-	}
-	nautilus_string_list_free (tokenized_contents);
-
-	/* Assign the alias file if found */
-	if (directory_contains_file (font_directory, FONTS_ALIAS_FILE_NAME)) {
-		table->fonts_alias_file = g_strdup_printf ("%s/%s", font_directory, FONTS_ALIAS_FILE_NAME);
-	}
-	
-	/* Assign the alias scale if found */
-	if (directory_contains_file (font_directory, FONTS_SCALE_FILE_NAME)) {
-		table->fonts_scale_file = g_strdup_printf ("%s/%s", font_directory, FONTS_SCALE_FILE_NAME);
-	}
-
-	g_free (description_contents);
-
-
-	return table;
-}
-
-static GnomeVFSResult
-collect_fonts_from_directory (const char *font_directory,
-			      GList **postscript_font_list,
-			      GList **true_type_font_list)
-{
-	GnomeVFSDirectoryHandle *directory;
-	GnomeVFSResult result;
-	GnomeVFSFileInfo *info;
-	char *directory_uri;
-
-	g_return_val_if_fail (string_is_valid (font_directory), GNOME_VFS_ERROR_BAD_PARAMETERS);
-	g_return_val_if_fail (postscript_font_list != NULL, GNOME_VFS_ERROR_BAD_PARAMETERS);
-	g_return_val_if_fail (true_type_font_list != NULL, GNOME_VFS_ERROR_BAD_PARAMETERS);
-	
-	directory_uri = g_strconcat ("file://", font_directory, NULL);
-
-	*postscript_font_list = NULL;
-	*true_type_font_list = NULL;
-	
-	result = gnome_vfs_directory_open (&directory,
-					   directory_uri,
-					   GNOME_VFS_FILE_INFO_GET_MIME_TYPE,
-					   NULL);
-	g_free (directory_uri);
-	
-	if (result != GNOME_VFS_OK) {
-		return result;
-	}
-	
-	
-	while (TRUE) {
-		info = gnome_vfs_file_info_new ();
-		result = gnome_vfs_directory_read_next (directory, info);
-		if (result == GNOME_VFS_OK) {
-			if (strcasecmp (info->mime_type, POSTSCRIPT_FONT_MIME_TYPE) == 0) {
-				*postscript_font_list = g_list_prepend (*postscript_font_list,
-					g_strconcat (font_directory,
-						"/", info->name, NULL));
-			} else if (strcasecmp (info->mime_type, TRUE_TYPE_FONT_MIME_TYPE) == 0) {
-				*true_type_font_list = g_list_prepend (*true_type_font_list,
-					g_strconcat (font_directory,
-						"/", info->name, NULL));
-			}
-		}
-		gnome_vfs_file_info_unref (info);
-		
-		if (result == GNOME_VFS_ERROR_EOF) {
-			break;
-		}
-	}
-	
-	gnome_vfs_directory_close (directory);
-	
-	return GNOME_VFS_OK;
-}
-
-
-static void
-chop_off_comments (char *line)
-{
-
-	/* Terminates a string right at the start of a comment, stripping it from the
-	 * string.
-	 */
-	gboolean saw_escape;
-	char *scanner;
-
-	saw_escape = FALSE;
-	for (scanner = line; *scanner != '\0'; scanner++) {
-		if (saw_escape) {
-			saw_escape = FALSE;
-			continue;
-		}		
-		if (*scanner == '\\') {
-	
-	
-			saw_escape = TRUE;
-			continue;
-		}
-		if (*scanner == '#') {
-			*scanner = '\0';
-			break;
-		}
-	}
-}
-
-static void
-next_token (const char *buffer, int from, int *token_start, int *token_end)
-{
-	gboolean saw_escape;
-	const char *scanner;
-
-	g_assert ((int) strlen (buffer) >= from);
-
-	*token_start = -1;
-	*token_end = -1;
-	
-	/* strip white space */
-	saw_escape = FALSE;
-	for (scanner = buffer + from; *scanner != '\0'; scanner++) {
-		if (saw_escape) {
-			saw_escape = FALSE;
-			continue;
-		}		
-		if (*scanner == '\\') {
-			saw_escape = TRUE;
-			continue;
-		}
-		if (!isspace ((guchar) *scanner) && *scanner != '\n') {
-			*token_start = scanner - buffer;
-			break;
-		}
-	}	
-
-	if (*scanner == ',') {
-		*token_end = *token_start + 1;
-		return;
-	}
-	
-	/* go until token end */
-	saw_escape = FALSE;
-	for (; *scanner != '\0'; scanner++) {
-		if (saw_escape) {
-			saw_escape = FALSE;
-			continue;
-		}		
-		if (*scanner == '\\') {
-			saw_escape = TRUE;
-			continue;
-		}
-		if (isspace ((guchar) *scanner) || *scanner == ',') {
-			break;
-		}
-	}	
-	
-	if (*token_start >= 0) {
-		*token_end = scanner - buffer;
-	}
-}
-
-#define READ_BUFFER_SIZE 2048
-
-static gboolean
-token_matches (const char *buffer, int start, int end, const char *pattern)
-{
-	if (start < 0) {
-		return FALSE;
-	}
-
-	return strncmp (buffer + start, pattern, end - start) == 0;
-}
-
-typedef enum {
-	EXPECT_CATALOGUE,
-	EXPECT_ASSIGNMENT,
-	EXPECT_DIRECTORY,
-	EXPECT_COMMA
-} FontConfigParseState;
-
-static void
-font_server_for_each_font_directory_internal (void (* callback) (const char *font_directory, gpointer callback_data),
-					      gpointer callback_data,
-					      char *buffer,
-					      FILE *file)
-{
-	FontConfigParseState state;
-	int token_start, token_end;
-	char *font_directory;
-
-	g_return_if_fail (callback != NULL);
-	g_return_if_fail (buffer != NULL);
-	g_return_if_fail (file != NULL);
-
-	state = EXPECT_CATALOGUE;
-	while (TRUE) {
-		fgets (buffer, READ_BUFFER_SIZE, file);
-		if (strlen (buffer) == 0) {
-			if (state != EXPECT_COMMA) {
-				g_warning ("unexpected file end.");
-			}
-			break;
-		}
-		
-		chop_off_comments (buffer);
-		
-		token_start = 0;
-		while (TRUE) {
-			next_token (buffer, token_start, &token_start, &token_end);
-	
-			if (token_start < 0) {
-				break;
-			}
-
-			switch (state) {
-			case EXPECT_CATALOGUE:
-				if (token_matches(buffer, token_start, token_end, "catalogue")) {
-					state = EXPECT_ASSIGNMENT;
-				}
-				break;
-				
-			case EXPECT_ASSIGNMENT:
-				if (!token_matches(buffer, token_start, token_end, "=")) {
-					g_warning (" expected token \"=\" .");
-					return;
-				}
-				state = EXPECT_DIRECTORY;
-				break;
-				
-			case EXPECT_DIRECTORY:
-				if (token_matches(buffer, token_start, token_end, ",")) {
-					g_warning (" expected directory name.");
-					return;
-				}
-				/* found a directory, call an each function on it */
-				font_directory = g_strndup (buffer + token_start, token_end - token_start);
-				(* callback) (font_directory, callback_data);
-				g_free (font_directory);
-				state = EXPECT_COMMA;
-				break;
-
-			case EXPECT_COMMA:
-				if (!token_matches(buffer, token_start, token_end, ",")) {
-					/* we are done, no more directories */
-					return;
-				}
-				state = EXPECT_DIRECTORY;
-				break;				
-			}
-			
-			token_start = token_end;
-		}
-	}
-}
-
-static void
-font_server_for_each_font_directory (const char *font_config_file_path,
-				     void (* callback) (const char *font_directory, gpointer callback_data),
-				     gpointer callback_data)
-{
-	/* scan the font config file, finding all the font directory paths */
-	FILE *font_config_file;
-	char *buffer;
-
-	g_return_if_fail (string_is_valid (font_config_file_path));
-	g_return_if_fail (callback != NULL);
-	g_return_if_fail (callback_data != NULL);
-	
-	font_config_file = fopen (font_config_file_path, "r");
-
-	if (font_config_file == NULL) {
-		return;
-	}
-	
-	buffer = g_malloc (READ_BUFFER_SIZE);
-	font_server_for_each_font_directory_internal (callback,
-						      callback_data,
-						      buffer,
-						      font_config_file);
-	
-	g_free (buffer);
-	fclose (font_config_file);
-}
-
-static gboolean
-directory_contains_file (const char *directory,
-			 const char *file_name)
-{
-	gboolean result;
-	char *path;
-
-	g_return_val_if_fail (string_is_valid (directory), FALSE);
-	g_return_val_if_fail (string_is_valid (file_name), FALSE);
-
-	path = g_strdup_printf ("%s/%s", directory, file_name);
-	result = g_file_exists (path);
-	g_free (path);
-
-	return result;
-}
-
-/* Iterating directories is slow cause of all the mime sniffing that
- * has to happen on each potential scalalble font.  By Ignoring
- * directories that arent interesting, we make things much faster.
- */
-static gboolean
-font_directory_is_ignored (const char *font_directory)
-{
-	guint i;
-
-	g_return_val_if_fail (string_is_valid (font_directory), TRUE);
-
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (ignored_font_dir_suffices); i++) {
-		if (nautilus_str_has_suffix (font_directory, ignored_font_dir_suffices[i])) {
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-static gboolean
-font_foundry_is_ignored (const char *foundry) 
-{
-	guint i;
-	
-	g_return_val_if_fail (foundry != NULL, TRUE);
-	
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (black_listed_font_foundries); i++) {
-		if (nautilus_istr_is_equal (foundry, black_listed_font_foundries[i])) {
-			return TRUE;
-		}
-	}
-	
-	return FALSE;
-}
-
-static gboolean
-font_family_is_ignored (const char *family) 
-{
-	guint i;
-	
-	g_return_val_if_fail (family != NULL, TRUE);
-	
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (black_listed_font_families); i++) {
-		if (nautilus_istr_is_equal (family, black_listed_font_families[i])) {
-			return TRUE;
-		}
-	}
-	
-	return FALSE;
-}
-
-static void
-font_manager_collect_font_tables (const char *font_directory,
-				  GList **collected_font_tables)
-{
-	GList *postscript_font_list = NULL;
-	GList *true_type_font_list = NULL;
-	FontDescriptionTable *table;
-
-	g_return_if_fail (string_is_valid (font_directory));
-	g_return_if_fail (collected_font_tables != NULL);
-
-	if (font_directory_is_ignored (font_directory)) {
-		return;
-	}
-	
-	/* Collect postscript and true type font in this directory */
-	collect_fonts_from_directory (font_directory, &postscript_font_list, &true_type_font_list);
-
-	/* No scalable fonts found; we're done */
-	if (g_list_length (postscript_font_list) == 0 
-	    && g_list_length (true_type_font_list) == 0) {
-		return;
-	}
-
-	/* If no "fonts.dir" exists, then the user has a missing description file (broken setup) */
-	if (!directory_contains_file (font_directory, FONTS_DIR_FILE_NAME)) {
-		nautilus_g_list_free_deep (postscript_font_list);
-		nautilus_g_list_free_deep (true_type_font_list);
-		g_warning ("Direcotry '%s' contains scalable fonts but no '%s' description file.",
-			   font_directory,
-			   FONTS_DIR_FILE_NAME);
-		return;
-	}
-	
-	table = font_description_table_new (font_directory, postscript_font_list, true_type_font_list);
-	if (table == NULL) {
-		nautilus_g_list_free_deep (postscript_font_list);
-		nautilus_g_list_free_deep (true_type_font_list);
-		g_warning ("Error trying to process font directory '%s'.", font_directory);
-		return;
-	}
-
-	*collected_font_tables = g_list_append (*collected_font_tables, table);
-
-	nautilus_g_list_free_deep (postscript_font_list);
-	nautilus_g_list_free_deep (true_type_font_list);
-}
-
-static void
-font_server_for_each_callback (const char *font_directory,
-			       gpointer callback_data)
-{
-	g_return_if_fail (string_is_valid (font_directory));
-	g_return_if_fail (callback_data != NULL);
-
-	font_manager_collect_font_tables (font_directory, callback_data);
-}
-
-static GList *global_font_table = NULL;
-
-static void
-font_table_list_free (GList *font_table_list)
-{
-	GList *node;
-
-	node = font_table_list;
-	while (node != NULL) {
-		g_assert (node->data != NULL);
-		font_description_table_free (node->data);
-		node = node->next;
-	}
-	g_list_free (font_table_list);
-}
-
-static const FontDescription *
-font_table_list_find (const GList *font_table_list,
-		      const char *file_name)
-{
-	const GList *node;
-	const FontDescription *description;
-
-	g_return_val_if_fail (file_name != NULL, NULL);
-
-	for (node = font_table_list; node != NULL; node = node->next) {
-		g_assert (node->data != NULL);
-		description = font_description_table_find (node->data, file_name);
-		if (description != NULL) {
-			return description;
-		}
-	}
-
-	return NULL;
-}
-
-static void
-free_font_tables (void)
-{
-	font_table_list_free (global_font_table);
-	global_font_table = NULL;
-}
-
-static void
-ensure_local_font_table (void)
-{
-	char *user_font_dir;
-
-	if (global_font_table != NULL) {
-		return;
-	}
-
-	/* Populate the default font table if needed.  Use the installed fonts
-	 * if available.  Otherwise use the ones in the source tree itself, so that
-	 * checks will work even if Nautilus has not undergone 'make install.'
-	 */
-	if (g_file_exists (DEFAULT_FONT_DIRECTORY "/" DEFAULT_FONT)) {
-		font_manager_collect_font_tables (DEFAULT_FONT_DIRECTORY, &global_font_table);
-	} else {
-		font_manager_collect_font_tables (SOURCE_FONT_DIRECTORY, &global_font_table);
-	}
-
-	/* Populate the user font table if needed */
-	user_font_dir = g_strdup_printf ("%s/.nautilus/%s", g_get_home_dir (), USER_FONT_DIRECTORY_NAME);
-	if (g_file_test (user_font_dir, G_FILE_TEST_ISDIR)) {
-		font_manager_collect_font_tables (user_font_dir, &global_font_table);
-	}
-	g_free (user_font_dir);
-
-	/* Populate the system font table if needed - using the font server's configuration */
-	if (g_file_exists (FONT_SERVER_CONFIG_FILE)) {
-		font_server_for_each_font_directory (FONT_SERVER_CONFIG_FILE,
-						     font_server_for_each_callback,
-						     &global_font_table);
-	}
-	
-	g_atexit (free_font_tables);
-}
-
-/* Public */
-
-/**
- * nautilus_font_manager_for_each_font:
- * @callback: A callback to be called for each scalable font in the system.
- * @callback_data: User's data.
- *
- * Iterate all the scalable fonts available in the system.  The available
- * fonts are the sum of:
- *
- * 1) Fallback fonts installed by Nautilus
- * 2) User fonts found in ~/.nautilus/fonts
- * 3) Fonts listed in the font servers config file (/etc/X11/fs/config)
- *
- */
-void
-nautilus_font_manager_for_each_font (NautilusFontManagerCallback callback,
-				     gpointer callback_data)
-{
-	GList *node;
-	gboolean cont = TRUE;
-
- 	g_return_if_fail (callback != NULL);
-
-	/* We will be making GnomeVFS calls */
-	gnome_vfs_init_if_needed ();
-	
-	/* Ensure that all the font tables exist */
-	ensure_local_font_table ();
-
-	for (node = global_font_table; node != NULL && cont; node = node->next) {
-		g_assert (node->data != NULL);
-		cont = font_description_table_for_each (node->data, callback, callback_data);
-	}
-}
-
-/* Return the default font.  It will be found either in place where nautilus
- * gets installed (via 'make install') or the source directory if nautilus
- * has not undergone 'make install'
- */
-char *
-nautilus_font_manager_get_default_font (void)
-{
-	guint i;
-
-	static const char *default_fonts[] = {
-		DEFAULT_FONT_DIRECTORY "/" DEFAULT_FONT,
-		SOURCE_FONT_DIRECTORY "/" DEFAULT_FONT
-	};
-
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (default_fonts); i++) {
-		if (g_file_exists (default_fonts[i])) {
-			return g_strdup (default_fonts[i]);
-		}
-	}
-
-	return NULL;
-}
-
-/* Return the default vold font.  It will be found either in place where nautilus
- * gets installed (via 'make install') or the source directory if nautilus
- * has not undergone 'make install'
- */
-char *
-nautilus_font_manager_get_default_bold_font (void)
-{
-	guint i;
-
-	static const char *default_bold_fonts[] = {
-		DEFAULT_FONT_DIRECTORY "/" DEFAULT_BOLD_FONT,
-		SOURCE_FONT_DIRECTORY "/" DEFAULT_BOLD_FONT
-	};
-
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (default_bold_fonts); i++) {
-		if (g_file_exists (default_bold_fonts[i])) {
-			return g_strdup (default_bold_fonts[i]);
-		}
-	}
-
-	return NULL;
-}
-
-gboolean
-nautilus_font_manager_file_is_scalable_font (const char *file_name)
-{
-	gboolean is_scalable_font = FALSE;
-	char *uri;
-	GnomeVFSFileInfo *info;
-	GnomeVFSResult result;
-	
-	g_return_val_if_fail (nautilus_strlen (file_name) > 0, FALSE);
-
-	gnome_vfs_init_if_needed ();
-
-	uri = g_strconcat ("file://", file_name, NULL);
-
-	info = gnome_vfs_file_info_new ();
-	result = gnome_vfs_get_file_info (uri, info, GNOME_VFS_FILE_INFO_GET_MIME_TYPE);
-
-	if (result == GNOME_VFS_OK) {
-		is_scalable_font = 
-			nautilus_istr_is_equal (info->mime_type, POSTSCRIPT_FONT_MIME_TYPE)
-			|| nautilus_istr_is_equal (info->mime_type, TRUE_TYPE_FONT_MIME_TYPE);
-	}
-
-	gnome_vfs_file_info_unref (info);
-	g_free (uri);
-
-	return is_scalable_font;
-}
-
-typedef struct
-{
-	const FontDescription *description;
-	char *found_file_name;
-} FindData;
-
-static gboolean
-font_list_find_bold_callback (const char *font_file_name,
-			      NautilusFontType font_type,
-			      const char *foundry,
-			      const char *family,
-			      const char *weight,
-			      const char *slant,
-			      const char *set_width,
-			      const char *char_set,
-			      gpointer callback_data)
-{
-	FindData *data;
-
-	g_return_val_if_fail (font_file_name != NULL, FALSE);
-	g_return_val_if_fail (foundry != NULL, FALSE);
-	g_return_val_if_fail (family != NULL, FALSE);
-	g_return_val_if_fail (weight != NULL, FALSE);
-	g_return_val_if_fail (slant != NULL, FALSE);
-	g_return_val_if_fail (set_width != NULL, FALSE);
-	g_return_val_if_fail (char_set != NULL, FALSE);
-	g_return_val_if_fail (callback_data != NULL, FALSE);
-
-	data = callback_data;
-
-	g_return_val_if_fail (data->description != NULL, FALSE);
-	g_return_val_if_fail (data->found_file_name == NULL, FALSE);
-	
-	if (nautilus_istr_is_equal (data->description->foundry, foundry)
-	    && nautilus_istr_is_equal (data->description->family, family)
-	    && nautilus_istr_is_equal (data->description->slant, slant)
-	    && nautilus_istr_is_equal (data->description->set_width, set_width)
-	    && nautilus_istr_is_equal (data->description->char_set, char_set)
-	    && nautilus_font_manager_weight_is_bold (weight)) {
-		data->found_file_name = g_strdup (font_file_name);
-	}
-
-	return (data->found_file_name == NULL);
-}
-
-char *
-nautilus_font_manager_get_bold (const char *plain_font)
-{
-	FindData data;
-
-	g_return_val_if_fail (nautilus_strlen (plain_font) > 0, NULL);
-	g_return_val_if_fail (nautilus_font_manager_file_is_scalable_font (plain_font), NULL);
-
-	ensure_local_font_table ();
-
- 	data.description = font_table_list_find (global_font_table, plain_font);
-
- 	if (data.description == NULL) {
- 		return g_strdup (plain_font);
- 	}
-	
- 	data.found_file_name = NULL;
- 	nautilus_font_manager_for_each_font (font_list_find_bold_callback, &data);
-	
- 	if (data.found_file_name != NULL) {
- 		return data.found_file_name;
- 	}
-	
-	return g_strdup (plain_font);
-}
-
-gboolean
-nautilus_font_manager_weight_is_bold (const char *weight)
-{
-	g_return_val_if_fail (weight != NULL, FALSE);
-
-	return (nautilus_istr_is_equal (weight, "bold")
-		|| nautilus_istr_is_equal (weight, "demibold")
-		|| nautilus_istr_is_equal (weight, "black"));
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-#define TEST_FONT1 SOURCE_FONT_DIRECTORY "/" "n019003l.pfb"
-#define TEST_FONT2 SOURCE_FONT_DIRECTORY "/" "n019004l.pfb"
-#define TEST_FONT3 SOURCE_FONT_DIRECTORY "/" "n019023l.pfb"
-#define TEST_FONT4 SOURCE_FONT_DIRECTORY "/" "n019024l.pfb"
-
-static char *
-call_chop_off_comments (const char *input)
-{
-	char *test_copy;
-	test_copy = g_strdup (input);
-	chop_off_comments (test_copy);
-	return test_copy;
-}
-
-void
-nautilus_self_check_font_manager (void)
-{
-	FontDescriptionTable *table;
-	const FontDescription *description;
-	GList *font_table_list = NULL;
-	char *original_current_dir;
-
-	/* chop_off_comments() */
-	NAUTILUS_CHECK_STRING_RESULT (call_chop_off_comments ("foo bar"), "foo bar");
-	NAUTILUS_CHECK_STRING_RESULT (call_chop_off_comments ("foo bar\n"), "foo bar\n");
-	NAUTILUS_CHECK_STRING_RESULT (call_chop_off_comments ("#foo bar"), "");
-	NAUTILUS_CHECK_STRING_RESULT (call_chop_off_comments ("foo bar#"), "foo bar");
-	NAUTILUS_CHECK_STRING_RESULT (call_chop_off_comments ("\\foo bar"), "\\foo bar");
-	NAUTILUS_CHECK_STRING_RESULT (call_chop_off_comments ("\\#foo bar"), "\\#foo bar");
-	NAUTILUS_CHECK_STRING_RESULT (call_chop_off_comments ("\\##foo bar"), "\\#");
-
-	original_current_dir = g_get_current_dir ();
-
-	g_return_if_fail (g_file_exists (SOURCE_FONT_DIRECTORY));
-
-	g_return_if_fail (g_file_exists (TEST_FONT1));
-	g_return_if_fail (g_file_exists (TEST_FONT2));
-	g_return_if_fail (g_file_exists (TEST_FONT3));
-	g_return_if_fail (g_file_exists (TEST_FONT4));
-
-	font_manager_collect_font_tables (SOURCE_FONT_DIRECTORY, &font_table_list);
-	g_return_if_fail (font_table_list != NULL);
-
-	g_return_if_fail (g_list_nth_data (font_table_list, 0) != NULL);
-	table = g_list_nth_data (font_table_list, 0);
-
- 	NAUTILUS_CHECK_INTEGER_RESULT (font_description_table_get_length (table), 4);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_table_get_nth_file_name (table, 0), TEST_FONT1);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_table_get_nth_file_name (table, 1), TEST_FONT2);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_table_get_nth_file_name (table, 2), TEST_FONT3);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_table_get_nth_file_name (table, 3), TEST_FONT4);
-
-	description = font_description_table_peek_nth (table, 0);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_file_name (description), TEST_FONT1);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_foundry (description), "URW");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_family (description), "Helvetica Default");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_weight (description), "medium");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_slant (description), "r");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_set_width (description), "normal");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_char_set (description), "iso8859-1");
-
-	description = font_description_table_peek_nth (table, 1);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_file_name (description), TEST_FONT2);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_foundry (description), "URW");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_family (description), "Helvetica Default");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_weight (description), "bold");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_slant (description), "r");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_set_width (description), "normal");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_char_set (description), "iso8859-1");
-
-	description = font_description_table_peek_nth (table, 2);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_file_name (description), TEST_FONT3);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_foundry (description), "URW");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_family (description), "Helvetica Default");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_weight (description), "medium");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_slant (description), "o");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_set_width (description), "normal");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_char_set (description), "iso8859-1");
-
-	description = font_description_table_peek_nth (table, 3);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_file_name (description), TEST_FONT4);
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_foundry (description), "URW");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_family (description), "Helvetica Default");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_weight (description), "bold");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_slant (description), "o");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_set_width (description), "normal");
- 	NAUTILUS_CHECK_STRING_RESULT (font_description_get_char_set (description), "iso8859-1");
-
-	font_table_list_free (font_table_list);
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-font-manager.h b/libnautilus-private/nautilus-font-manager.h
deleted file mode 100644
index 6a9c41041..000000000
--- a/libnautilus-private/nautilus-font-manager.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-font-manager.h - Functions for managing fonts.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Pavel Cisler <pavel@eazel.com>,
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_FONT_MANAGER_H
-#define NAUTILUS_FONT_MANAGER_H
-
-#include <libgnome/gnome-defs.h>
-#include <glib.h>
-
-BEGIN_GNOME_DECLS
-
-typedef enum {
-	NAUTILUS_FONT_POSTSCRIPT = 1,
-	NAUTILUS_FONT_TRUE_TYPE
-} NautilusFontType;
-
-/*
- * A callback which can be invoked for each font available in the system.
- */
-typedef gboolean (*NautilusFontManagerCallback) (const char *font_file_name,
-						 NautilusFontType font_type,
-						 const char *foundry,
-						 const char *family,
-						 const char *weight,
-						 const char *slant,
-						 const char *set_width,
-						 const char *char_set,
-						 gpointer callback_data);
-
-void     nautilus_font_manager_for_each_font         (NautilusFontManagerCallback  callback,
-						      gpointer                     callback_data);
-char *   nautilus_font_manager_get_default_font      (void);
-char *   nautilus_font_manager_get_default_bold_font (void);
-gboolean nautilus_font_manager_file_is_scalable_font (const char                  *file_name);
-char *   nautilus_font_manager_get_bold              (const char                  *plain_font);
-char *   nautilus_font_manager_get_italic            (const char                  *plain_font);
-gboolean nautilus_font_manager_weight_is_bold        (const char                  *weight);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_FONT_MANAGER_H */
-
-
diff --git a/libnautilus-private/nautilus-font-picker.c b/libnautilus-private/nautilus-font-picker.c
deleted file mode 100644
index 12bb6032b..000000000
--- a/libnautilus-private/nautilus-font-picker.c
+++ /dev/null
@@ -1,1052 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-font-picker.c - A simple widget to select scalable fonts.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-font-picker.h"
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-#include "nautilus-string.h"
-#include "nautilus-font-manager.h"
-
-#include <libgnome/gnome-i18n.h>
-
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtksignal.h>
-
-#include <libgnome/gnome-i18n.h>
-
-typedef enum {
-	FONT_SLANT_NORMAL,
-	FONT_SLANT_OBLIQUE,
-	FONT_SLANT_ITALIC
-} FontSlant;
-
-typedef enum {
-	FONT_STRETCH_NORMAL,
-	FONT_STRETCH_CONDENSED,
-	FONT_STRETCH_SEMICONDENSED
-} FontStretch;
-
-typedef struct {
-	char *name;
-	gboolean is_bold;
-	FontSlant slant;
-	FontStretch stretch;
-	char *font_file_name;
-} FontStyleEntry;
-
-typedef struct {
-	char *name;
-	char *family;
-	char *name_for_display;
-	GList *style_list;
-} FontEntry;
-
-typedef struct
-{
-	const char *name;
-	const char *mapped;
-} StyleMap;
-
-static const char *normal_style = N_("Normal");
-static const char *unknown_style = N_("Unknown");
-
-static const StyleMap font_weight_map[] = {
-       	{ "",	      NULL },
-       	{ "medium",   NULL },
-	{ "regular",  NULL },
-	{ "bold",     N_("Bold") },
-	{ "book",     N_("Book") },
-	{ "black",    N_("Black") },
-	{ "demibold", N_("Demibold") },
-	{ "light",    N_("Light") }
-};
-
-static const StyleMap font_slant_map[] = {
-       	{ "",	      NULL },
-	{ "r",	      NULL },
-	{ "i",	      N_("Italic"), },
-	{ "o",	      N_("Oblique"), },
-	{ "ri",	      N_("Reverse Italic"), },
-	{ "ro",	      N_("Reverse Oblique"), },
-	{ "ot",	      N_("Other"), }
-};
-
-static const StyleMap font_set_width_map[] = {
-       	{ "",                 NULL },
-	{ "normal",	      NULL },
-	{ "condensed",	      N_("Condensed"), },
-	{ "semicondensed",    N_("Semicondensed"), }
-};
-
-static const gint FONT_PICKER_SPACING = 10;
-
-static GList *global_font_list = NULL;
-
-#define FONT_MENU_ITEM_DATA_KEY "font-menu-entry"
-#define FONT_MENU_STYLE_SUBMENU_DATA_KEY "font-menu-style-submenu"
-#define FONT_STYLE_MENU_ITEM_DATA_KEY "font-style-menu-entry"
-#define FONT_MENU_INDEX_DATA_KEY "font-menu-index"
-#define FONT_MENU_IS_MORE_KEY "font-menu-is-more"
-
-/* Signals */
-typedef enum
-{
-	CHANGED,
-	LAST_SIGNAL
-} FontPickerSignals;
-
-struct NautilusFontPickerDetails
-{
-	GtkWidget *option_menu;
-	GtkWidget *menu;
-	GtkWidget *current_menu;
-	char *selected_font;
-	gboolean option_menu_got_valid_selection;
-};
-
-/* GtkObjectClass methods */
-static void                  nautilus_font_picker_initialize_class (NautilusFontPickerClass   *font_picker_class);
-static void                  nautilus_font_picker_initialize       (NautilusFontPicker        *font_picker);
-static void                  nautilus_font_picker_destroy          (GtkObject                 *object);
-
-/* Private methods */
-static void                  font_picker_populate                  (NautilusFontPicker        *font_picker);
-
-/* Global font list */
-static const GList *         global_font_list_get                  (void);
-static void                  global_font_list_free                 (void);
-static gboolean              global_font_list_populate_callback    (const char                *font_file_name,
-								    NautilusFontType           font_type,
-								    const char                *foundry,
-								    const char                *family,
-								    const char                *weight,
-								    const char                *slant,
-								    const char                *set_width,
-								    const char                *char_set,
-								    gpointer                   callback_data);
-static guint                 nautilus_gtk_menu_shell_get_num_items (const GtkMenuShell        *menu_shell);
-static const FontStyleEntry *font_picker_get_selected_style_entry  (const NautilusFontPicker  *font_picker);
-static gboolean              font_picker_find_entries_for_font     (const char                *font_file_name,
-								    const FontEntry          **entry,
-								    const FontStyleEntry     **style_entry);
-static int                   font_picker_get_index_for_entry       (const NautilusFontPicker  *font_picker,
-								    const FontEntry           *entry);
-	
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusFontPicker, nautilus_font_picker, NAUTILUS_TYPE_CAPTION)
-
-static guint font_picker_signals[LAST_SIGNAL] = { 0 };
-
-/* GtkObjectClass methods */
-static void
-nautilus_font_picker_initialize_class (NautilusFontPickerClass *font_picker_class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = GTK_OBJECT_CLASS (font_picker_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_font_picker_destroy;
-
-	/* Signals */
-	font_picker_signals[CHANGED] = gtk_signal_new ("changed",
-						       GTK_RUN_LAST,
-						       object_class->type,
-						       0,
-						       gtk_marshal_NONE__NONE,
-						       GTK_TYPE_NONE, 
-						       0);
-
-	gtk_object_class_add_signals (object_class, font_picker_signals, LAST_SIGNAL);
-}
-
-/* When the option menu is clicked, we reset a 'valid_selection' flag.
- * This flag will be set to TRUE when a valid selection is made.  We
- * need to do this to workaround a bug (or feature?) in GtkOptionMenu
- * that changes the selected item even if it wasnt actually clicked - for
- * example, if you changed your mind and clicked somewhere else after almost
- * selecting an item
- */
-static int
-option_menu_button_press_event (GtkButton *button,
-				GdkEventButton *event,
-				NautilusFontPicker *font_picker)
-{
-	g_return_val_if_fail (GTK_IS_BUTTON (button), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker), FALSE);
-
-	font_picker->details->option_menu_got_valid_selection = FALSE;
-	
-	return FALSE;
-}
-
-/* If no valid selection was made, then we restore the old selected font */
-static void
-menu_deactivate (GtkMenuShell *menu_shell,
-		 NautilusFontPicker *font_picker)
-{
-	g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell));
-	g_return_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker));
-
-	if (!font_picker->details->option_menu_got_valid_selection) {
-		nautilus_font_picker_set_selected_font (font_picker,
-							font_picker->details->selected_font);
-	}
-
-	/* This is needed to workaround a very annoying painting bug in
-	 * menus.  In some themes (like the Eazel Crux theme) 'almost selected'
-	 * items will appear white for some crazy reason.
-	 */
-	gtk_widget_queue_draw (GTK_WIDGET (menu_shell));
-}
-
-static void
-nautilus_font_picker_initialize (NautilusFontPicker *font_picker)
-{
-	const FontStyleEntry *selected_style_entry;
-
-	font_picker->details = g_new0 (NautilusFontPickerDetails, 1);
-	gtk_box_set_homogeneous (GTK_BOX (font_picker), FALSE);
-	gtk_box_set_spacing (GTK_BOX (font_picker), FONT_PICKER_SPACING);
-
-	/* The font option menu */
-	font_picker->details->option_menu = gtk_option_menu_new ();
-	font_picker->details->menu = gtk_menu_new ();
-
-	gtk_signal_connect (GTK_OBJECT (font_picker->details->option_menu),
-			    "button_press_event",
-			    GTK_SIGNAL_FUNC (option_menu_button_press_event),
-			    font_picker);
-
-	gtk_signal_connect (GTK_OBJECT (font_picker->details->menu),
-			    "deactivate",
-			    GTK_SIGNAL_FUNC (menu_deactivate),
-			    font_picker);
-
-	font_picker->details->current_menu = font_picker->details->menu;
-
-	nautilus_caption_set_child (NAUTILUS_CAPTION (font_picker),
-				    font_picker->details->option_menu,
-				    FALSE,
-				    FALSE);
-
-	font_picker_populate (font_picker);
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (font_picker->details->option_menu),
-				  font_picker->details->menu);
-
-	gtk_option_menu_set_history (GTK_OPTION_MENU (font_picker->details->option_menu), 0);
-
-	selected_style_entry = font_picker_get_selected_style_entry  (font_picker);
-	
-	if (selected_style_entry != NULL) {
-		font_picker->details->selected_font = g_strdup (selected_style_entry->font_file_name);
-	}
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_font_picker_destroy (GtkObject* object)
-{
-	NautilusFontPicker *font_picker;
-
-	g_return_if_fail (NAUTILUS_IS_FONT_PICKER (object));
-	
-	font_picker = NAUTILUS_FONT_PICKER (object);
-
-	g_free (font_picker->details->selected_font);
-	g_free (font_picker->details);
-
-	/* Chain */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-static FontEntry *
-font_list_find (const GList *font_list,
-		const char *font_name)
-{
-	const GList *node;
-	FontEntry *entry;
-
-	/* First check the foundry qualified font names */
-	for (node = font_list; node != NULL; node = node->next) {
-		g_assert (node->data != NULL);
-		entry = node->data;
-
-		if (nautilus_istr_is_equal (font_name, entry->name)) {
-			return entry;
-		}
-	}
-
-	/* First check the foundry qualified font names */
-	for (node = font_list; node != NULL; node = node->next) {
-		g_assert (node->data != NULL);
-		entry = node->data;
-
-		if (nautilus_istr_is_equal (font_name, entry->family)) {
-			return entry;
-		}
-	}
-
-	return NULL;
-}
-
-static void
-style_menu_item_activate_callback (GtkWidget *menu_item,
-				   gpointer callback_data)
-{
-	const FontStyleEntry *style_entry;
-	NautilusFontPicker *font_picker;
-
-	g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
-	g_return_if_fail (NAUTILUS_IS_FONT_PICKER (callback_data));
-
-	font_picker = NAUTILUS_FONT_PICKER (callback_data);
-
-	style_entry = gtk_object_get_data (GTK_OBJECT (menu_item), FONT_STYLE_MENU_ITEM_DATA_KEY);
-
-	g_return_if_fail (style_entry != NULL);
-
-	nautilus_font_picker_set_selected_font (font_picker, style_entry->font_file_name);
-	
-	gtk_signal_emit (GTK_OBJECT (font_picker), font_picker_signals[CHANGED]);
-}
-
-/* This event indicates that a valid selection was made in one of 
- * the style menus.
- */
-static int
-style_menu_item_button_release_event (GtkMenuItem *menu_item,
-				      GdkEventButton *event,
-				      NautilusFontPicker *font_picker)
-{
- 	g_return_val_if_fail (GTK_IS_MENU_ITEM (menu_item), FALSE);
- 	g_return_val_if_fail (event != NULL, FALSE);
- 	g_return_val_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker), FALSE);
-	
-	font_picker->details->option_menu_got_valid_selection = TRUE;
-	
- 	return FALSE;
-}
-
-static GtkWidget *
-font_picker_add_item (NautilusFontPicker *font_picker,
-		      const char *label,
-		      int index,
-		      const FontEntry *font_entry,
-		      GtkWidget *style_menu)
-{
-	GtkWidget *item;
-	NautilusDimensions item_dimensions;
-	NautilusDimensions menu_dimensions;
-	NautilusDimensions screen_dimensions;
-	int available_height;
-	int new_menu_height;
-	int more_item_height_guess;
-	GtkMenu *current_menu;
-
-	g_return_val_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker), NULL);
-	g_return_val_if_fail (label != NULL, NULL);
-	g_return_val_if_fail (index >= 0, NULL);
-	g_return_val_if_fail (font_entry != NULL, NULL);
-	g_return_val_if_fail (GTK_IS_MENU (style_menu), NULL);
-	
-	current_menu = GTK_MENU (font_picker->details->current_menu);
-
-	item = gtk_menu_item_new_with_label (label);
-	
-	gtk_object_set_data (GTK_OBJECT (item),
-			     FONT_MENU_INDEX_DATA_KEY,
-			     GINT_TO_POINTER (index));
-	gtk_object_set_data (GTK_OBJECT (item),
-			     FONT_MENU_ITEM_DATA_KEY,
-			     (gpointer) font_entry);
-	gtk_object_set_data (GTK_OBJECT (item),
-			     FONT_MENU_STYLE_SUBMENU_DATA_KEY,
-			     style_menu);
-
-	screen_dimensions = nautilus_screen_get_dimensions ();
-	menu_dimensions = nautilus_gtk_widget_get_preferred_dimensions (GTK_WIDGET (current_menu));
-	item_dimensions = nautilus_gtk_widget_get_preferred_dimensions (item);
-
-	/* FIXME: It would be cool if the available height took into
-	 *        account the panel dimensions if its visible.  I have
-	 *        no clue how to do that 
-	 */
-	available_height = screen_dimensions.height;
-
-	/* We guess that the space needed by a possible "More..." item
-	 * is the average height of the current items in the menu.
-	 */
-	more_item_height_guess = menu_dimensions.height / 
-		MAX (1, nautilus_gtk_menu_shell_get_num_items (GTK_MENU_SHELL (current_menu)));
-
-	/* Compute what the new menu height will be once the item is added.
-	 * Always leave enough space to fit a "More..." menu, otherwise
-	 * the "More..." menu itself would not fit in the screen.
-	 */
-	new_menu_height = menu_dimensions.height + item_dimensions.height + more_item_height_guess;
-
-	/* If the item does not fit in the screen, create a "More..." submenu
-	 * and put it there.  When Gtk+ 2.0 comes to town it will feature
-	 * scrolling menus when needed and this hack wont be needed no more.
-	 */
-	if (new_menu_height >= available_height) {
-		GtkWidget *more_item;
-		GtkWidget *more_menu;
-
-		more_item = gtk_menu_item_new_with_label (_("More..."));
-		more_menu = gtk_menu_new ();
-
-		gtk_menu_item_set_submenu (GTK_MENU_ITEM (more_item), more_menu);
-		
-		gtk_menu_append (GTK_MENU (font_picker->details->current_menu), more_item);
-		
-		gtk_widget_show (more_item);
-
-		font_picker->details->current_menu = more_menu;
-	}
-
-	gtk_menu_append (GTK_MENU (font_picker->details->current_menu), item);
-
-	/* If the item was added to a "More..." menu, then create a hidden
-	 * duplicate item and add it to the main menu.  This is needed so that
-	 * we dont break the way GtkOptionMenu "history" works.  In order to 
-	 * be able to select menu items that exist in sub "More..." panes, the
-	 * item has to exist in the main menu as well, otherwise the GtkOptionMenu
-	 * refuses to set it as its selected item (which it calls "history")
-	 */
-	if (font_picker->details->current_menu != font_picker->details->menu) {
-		GtkWidget *duplicate_hidden_item;
-
-		duplicate_hidden_item = gtk_menu_item_new_with_label (label);
-		
-		gtk_object_set_data (GTK_OBJECT (duplicate_hidden_item),
-				     FONT_MENU_INDEX_DATA_KEY,
-				     GINT_TO_POINTER (index));
-		gtk_object_set_data (GTK_OBJECT (duplicate_hidden_item),
-				     FONT_MENU_ITEM_DATA_KEY,
-				     (gpointer) font_entry);
-		gtk_object_set_data (GTK_OBJECT (duplicate_hidden_item),
-				     FONT_MENU_STYLE_SUBMENU_DATA_KEY,
-				     style_menu);
-
-		gtk_menu_append (GTK_MENU (font_picker->details->menu), duplicate_hidden_item);
-
-		gtk_widget_hide (duplicate_hidden_item);
-	}
-
-	gtk_widget_show (item);
-
-	return item;
-}
-
-static void
-font_picker_populate (NautilusFontPicker *font_picker)
-{
- 	const GList *font_list;
- 	const GList *node;
-	const FontEntry *font_entry;
-	const FontStyleEntry *style_entry;
-	const GList *style_node;
-	GtkWidget *font_menu_item;
-	GtkWidget *style_menu_item = NULL;
-	GtkWidget *style_menu;
-	guint font_item_count;
-	guint style_item_count;
-	GSList *radio_item_group = NULL;
-
-	g_return_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker));
-
-	font_list = global_font_list_get ();
-	g_assert (font_list != NULL);
-
-	for (node = font_list, font_item_count = 0;
-	     node != NULL;
-	     node = node->next, font_item_count++) {
-		g_assert (node->data != NULL);
-		font_entry = node->data;
-		
-
-		style_menu = gtk_menu_new ();
-		font_menu_item = font_picker_add_item (font_picker,
-						       font_entry->name_for_display,
-						       font_item_count,
-						       font_entry,
-						       style_menu);
-
-		gtk_menu_item_set_submenu (GTK_MENU_ITEM (font_menu_item), style_menu);
-
-		for (style_node = font_entry->style_list, style_item_count = 0;
-		     style_node != NULL;
-		     style_node = style_node->next, style_item_count++) {
-			g_assert (style_node->data != NULL);
-			style_entry = style_node->data;
-
-			radio_item_group = style_menu_item != NULL ? 
-				gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (style_menu_item)) : 
-				NULL;
-			
-			style_menu_item = gtk_radio_menu_item_new_with_label (radio_item_group, style_entry->name);
-
-			gtk_menu_append (GTK_MENU (style_menu), style_menu_item);
-			gtk_widget_show (style_menu_item);
-			gtk_signal_connect (GTK_OBJECT (style_menu_item),
-					    "activate",
-					    GTK_SIGNAL_FUNC (style_menu_item_activate_callback),
-					    font_picker);
-			gtk_signal_connect (GTK_OBJECT (style_menu_item),
-					    "button_release_event",
-					    GTK_SIGNAL_FUNC (style_menu_item_button_release_event),
-					    font_picker);
-			gtk_object_set_data (GTK_OBJECT (style_menu_item),
-					     FONT_STYLE_MENU_ITEM_DATA_KEY,
-					     (gpointer) style_entry);
-			gtk_object_set_data (GTK_OBJECT (style_menu_item),
-					     FONT_MENU_INDEX_DATA_KEY,
-					     GINT_TO_POINTER (style_item_count));
-		}
-	}
-}
-
-static const char *
-font_find_style (const StyleMap *style_map,
-		 guint num_styles,
-		 const char *style)
-{
-	guint i;
-
-	g_return_val_if_fail (style_map != NULL, NULL);
-	g_return_val_if_fail (num_styles > 0, NULL);
-	g_return_val_if_fail (style != NULL, NULL);
-
-	for (i = 0; i < num_styles; i++) {
-		if (nautilus_istr_is_equal (style, style_map[i].name)) {
-			return _(style_map[i].mapped);
-		}
-	}
-
-	return NULL;
-}
-
-static char *
-font_make_name (const char *foundry,
-		const char *family)
-{
-	g_return_val_if_fail (foundry != NULL, NULL);
-	g_return_val_if_fail (family != NULL, NULL);
-
-	return g_strdup_printf ("%s (%s)", family, foundry);
-}
-
-static char *
-font_make_style_name (const char *weight,
-		      const char *slant,
-		      const char *set_width,
-		      const char *char_set)
-{
-	const char *mapped_weight;
-	const char *mapped_slant;
-	const char *mapped_set_width;
-
-	g_return_val_if_fail (weight != NULL, NULL);
-	g_return_val_if_fail (slant != NULL, NULL);
-	g_return_val_if_fail (set_width != NULL, NULL);
-	g_return_val_if_fail (char_set != NULL, NULL);
-
-	mapped_weight = font_find_style (font_weight_map,
-					 NAUTILUS_N_ELEMENTS (font_weight_map),
-					 weight);
-
-	mapped_slant = font_find_style (font_slant_map,
-					NAUTILUS_N_ELEMENTS (font_slant_map),
-					slant);
-
-	mapped_set_width = font_find_style (font_set_width_map,
-					    NAUTILUS_N_ELEMENTS (font_set_width_map),
-					    set_width);
-	
-	if (mapped_weight != NULL) {
-		/* "abnormal" weight */
-		if (mapped_slant == NULL && mapped_set_width == NULL) {
-			return g_strdup (mapped_weight);
-		} else if (mapped_slant != NULL && mapped_set_width != NULL) {
-			return g_strdup_printf ("%s %s %s", mapped_weight, mapped_slant, mapped_set_width);
-		} else if (mapped_slant != NULL) {
-			return g_strdup_printf ("%s %s", mapped_weight, mapped_slant);
-		}
-
-		return g_strdup_printf ("%s %s", mapped_weight, mapped_set_width);
-	} else {
-		/* normal weight */
-		if (mapped_slant == NULL && mapped_set_width == NULL) {
-			return g_strdup (_(normal_style));
-		} else if (mapped_slant != NULL && mapped_set_width != NULL) {
-			return g_strdup_printf ("%s %s", mapped_slant, mapped_set_width);
-		} else if (mapped_slant != NULL) {
-			return g_strdup_printf ("%s", mapped_slant);
-		}
-		
-		return g_strdup_printf ("%s", mapped_set_width);
-	}
-
-	return g_strdup (_(unknown_style));
-}
-
-static FontSlant
-font_slant_string_to_enum (const char *slant)
-{
-	g_return_val_if_fail (slant != NULL, 0);
-
-	if (nautilus_istr_is_equal (slant, "i")) {
-		return FONT_SLANT_ITALIC;
-	}
-
-	if (nautilus_istr_is_equal (slant, "o")) {
-		return FONT_SLANT_OBLIQUE;
-	}
-
-	return FONT_SLANT_NORMAL;
-}
-
-static FontStretch
-font_set_width_string_to_enum (const char *set_width)
-{
-	g_return_val_if_fail (set_width != NULL, 0);
-
-	if (nautilus_istr_is_equal (set_width, "condensed")) {
-		return FONT_STRETCH_CONDENSED;
-	}
-	
-	if (nautilus_istr_is_equal (set_width, "semicondensed")) {
-		return FONT_STRETCH_SEMICONDENSED;
-	}
-
-	return FONT_STRETCH_NORMAL;
-}
-
-static FontStyleEntry *
-font_style_entry_new (const char *font_file_name,
-		      const char *weight,
-		      const char *slant,
-		      const char *set_width,
-		      const char *char_set)
-{
-	FontStyleEntry *style_entry;
-
-	g_return_val_if_fail (font_file_name != NULL, NULL);
-	g_return_val_if_fail (weight != NULL, NULL);
-	g_return_val_if_fail (slant != NULL, NULL);
-	g_return_val_if_fail (set_width != NULL, NULL);
-	g_return_val_if_fail (char_set != NULL, NULL);
-
-	style_entry = g_new0 (FontStyleEntry, 1);
-	style_entry->name = font_make_style_name (weight, slant, set_width, char_set);
-	style_entry->is_bold = nautilus_font_manager_weight_is_bold (weight);
-	style_entry->slant = font_slant_string_to_enum (slant);
-	style_entry->stretch = font_set_width_string_to_enum (set_width);
-	style_entry->font_file_name = g_strdup (font_file_name);
-
-	return style_entry;
-}
-
-static void
-font_style_entry_free (FontStyleEntry *style_entry)
-{
-	if (style_entry == NULL) {
-		return;
-	}
-
-	g_free (style_entry->name);
-	g_free (style_entry->font_file_name);
-	g_free (style_entry);
-}
-
-/* Global font list */
-static void
-global_font_list_free (void)
-{
- 	GList *font_node;
-	FontEntry *font_entry;
- 	GList *style_node;
-	FontStyleEntry *style_entry;
-
-	if (global_font_list == NULL) {
-		return;
-	}
-
-	for (font_node = global_font_list; font_node != NULL; font_node = font_node->next) {
-		g_assert (font_node->data != NULL);
-		font_entry = font_node->data;
-		
-		g_free (font_entry->name);
-		g_free (font_entry->family);
-		g_free (font_entry->name_for_display);
-
-		for (style_node = font_entry->style_list; style_node != NULL; style_node = style_node->next) {
-			g_assert (style_node->data != NULL);
-			style_entry = style_node->data;
-			font_style_entry_free (style_entry);
-		}
-		g_list_free (font_entry->style_list);
-
-		g_free (font_entry);
-	}
-
-	global_font_list = NULL;
-}
-
-static guint
-font_list_count_families (const GList *font_list,
-			  const char *family)
-{
-	guint count = 0;
-	const GList *node;
-	const FontEntry *entry;
-
-	g_return_val_if_fail (font_list != NULL, 0);
-	g_return_val_if_fail (family != NULL, 0);
-	
-	for (node = font_list; node != NULL; node = node->next) {
-		g_assert (node->data != NULL);
-		entry = node->data;
-
-		if (nautilus_istr_is_equal (family, entry->family)) {
-			count++;
-		}
-	}
-
-	return count;
-}
-
-static int
-compare_font_entry (gconstpointer a,
-		    gconstpointer b)
-{
-	const FontEntry *entry_a;
-	const FontEntry *entry_b;
-
-	g_return_val_if_fail (a != NULL, -1);
-	g_return_val_if_fail (b != NULL, -1);
-
-	entry_a = a;
-	entry_b = b;
-
-	return nautilus_strcasecmp_compare_func (entry_a->name_for_display, entry_b->name_for_display);
-}
-
-static const GList *
-global_font_list_get (void)
-{
-	guint family_count = 0;
-	GList *node;
-	FontEntry *entry;
-
-	if (global_font_list != NULL) {
-		return global_font_list;
-	}
-
-	nautilus_font_manager_for_each_font (global_font_list_populate_callback,
-					     &global_font_list);
-	g_assert (global_font_list != NULL);
-
-	for (node = global_font_list; node != NULL; node = node->next) {
-		g_assert (node->data != NULL);
-		entry = node->data;
-
-		g_assert (entry->name_for_display == NULL);
-		
-		family_count = font_list_count_families (global_font_list, entry->family);
-		g_assert (family_count > 0);
-		
-		entry->name_for_display = (family_count > 1) ? g_strdup (entry->name) : g_strdup (entry->family);
-	}
-
-	global_font_list = g_list_sort (global_font_list, compare_font_entry);
-
-	g_atexit (global_font_list_free);
-
-	return global_font_list;
-}
-
-static gboolean
-list_contains_style (GList *styles, FontStyleEntry *style)
-{
-	GList *node;
-	FontStyleEntry *existing_style;
-
-	for (node = styles; node != NULL; node = node->next) {
-		existing_style = node->data;
-		/* If the files are the same, the fonts are the same font */
-		if (strcmp (existing_style->font_file_name, style->font_file_name) == 0) {
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-#define EQUAL 0
-#define LESS_THAN -1
-#define GREATER_THAN 1
-
-static int
-compare_style (gconstpointer a,
-	       gconstpointer b)
-{
-	const FontStyleEntry *style_a;
-	const FontStyleEntry *style_b;
-
-	g_return_val_if_fail (a != NULL, LESS_THAN);
-	g_return_val_if_fail (b != NULL, LESS_THAN);
-
-	style_a = a;
-	style_b = b;
-
-	/* Same weight */
-	if (style_a->is_bold == style_b->is_bold) {
-		/* Same slant */
-		if (style_a->slant == style_b->slant) {
-			return nautilus_compare_integer (GINT_TO_POINTER (style_a->stretch),
-							 GINT_TO_POINTER (style_b->stretch));
-		}
-
-		return nautilus_compare_integer (GINT_TO_POINTER (style_a->slant),
-						 GINT_TO_POINTER (style_b->slant));
-	}
-
-	/* Different weight */
-	return style_b->is_bold ? LESS_THAN : GREATER_THAN;
-}
-
-static gboolean
-global_font_list_populate_callback (const char *font_file_name,
-				    NautilusFontType font_type,
-				    const char *foundry,
-				    const char *family,
-				    const char *weight,
-				    const char *slant,
-				    const char *set_width,
-				    const char *char_set,
-				    gpointer callback_data)
-{
-	GList **font_list;
-	char *entry_name;
-	FontEntry *entry;
-	FontStyleEntry *style_entry;
-
-	g_return_val_if_fail (font_file_name != NULL, FALSE);
-	g_return_val_if_fail (foundry != NULL, FALSE);
-	g_return_val_if_fail (family != NULL, FALSE);
-	g_return_val_if_fail (weight != NULL, FALSE);
-	g_return_val_if_fail (slant != NULL, FALSE);
-	g_return_val_if_fail (set_width != NULL, FALSE);
-	g_return_val_if_fail (char_set != NULL, FALSE);
-	g_return_val_if_fail (callback_data != NULL, FALSE);
-
-	font_list = callback_data;
-
-	entry_name = font_make_name (foundry, family);
-	entry = font_list_find (*font_list, entry_name);
-
-	if (entry == NULL) {
-		entry = g_new0 (FontEntry, 1);
-		entry->name = g_strdup (entry_name);
-		entry->family = g_strdup (family);
-		*font_list = g_list_append (*font_list, entry);
-	}
-	g_assert (entry != NULL);
-	g_assert (font_list_find (*font_list, entry_name) == entry);
-	g_free (entry_name);
-	
-	style_entry = font_style_entry_new (font_file_name,
-					    weight,
-					    slant,
-					    set_width,
-					    char_set);
-	
-	if (list_contains_style (entry->style_list, style_entry)) {
-		font_style_entry_free (style_entry);
-	} else {
-		entry->style_list = g_list_insert_sorted (entry->style_list,
-							  style_entry,
-							  compare_style);
-	}
-
-	return TRUE;
-}
-
-static guint
-nautilus_gtk_menu_shell_get_num_items (const GtkMenuShell *menu_shell)
-{
-	g_return_val_if_fail (GTK_IS_MENU_SHELL (menu_shell), 0);
-
-	return g_list_length (menu_shell->children);
-}
-
-static const FontStyleEntry *
-font_picker_get_selected_style_entry (const NautilusFontPicker *font_picker)
-{
-	GtkWidget *selected_font_menu_item;
-	GtkMenu *style_submenu;
-	GtkWidget *selected_style_menu_item;
-	
-	g_return_val_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker), NULL);
-
-	selected_font_menu_item = GTK_OPTION_MENU (font_picker->details->option_menu)->menu_item;
-	
-	g_return_val_if_fail (GTK_IS_MENU_ITEM (selected_font_menu_item), NULL);
-	
-	style_submenu = gtk_object_get_data (GTK_OBJECT (selected_font_menu_item),
-					     FONT_MENU_STYLE_SUBMENU_DATA_KEY);
-	
-	g_return_val_if_fail (GTK_IS_MENU (style_submenu), NULL);
-	
-	selected_style_menu_item = gtk_menu_get_active (style_submenu);
-	g_return_val_if_fail (GTK_IS_MENU_ITEM (selected_style_menu_item), NULL);
-	
-	return gtk_object_get_data (GTK_OBJECT (selected_style_menu_item),
-				    FONT_STYLE_MENU_ITEM_DATA_KEY);
-}
-
-static gboolean
-font_picker_find_entries_for_font (const char *font_file_name,
-				   const FontEntry **entry,
-				   const FontStyleEntry **style_entry)
-{
-	const GList *font_list;
-	const GList *font_list_node;
-	const GList *style_list_node;
-
-	g_return_val_if_fail (font_file_name != NULL, FALSE);
-	g_return_val_if_fail (entry != NULL, FALSE);
-	g_return_val_if_fail (style_entry != NULL, FALSE);
-	
-	font_list = global_font_list_get ();
-	g_return_val_if_fail (font_list != NULL, FALSE);
-
-	font_list_node = font_list;
-	while (font_list_node != NULL) {
-		g_assert (font_list_node->data != NULL);
-		*entry = font_list_node->data;
-		
-		style_list_node = (*entry)->style_list;
-		while (style_list_node != NULL) {
-			g_assert (style_list_node->data != NULL);
-			*style_entry = style_list_node->data;
-			
-			if (nautilus_istr_is_equal ((*style_entry)->font_file_name, font_file_name)) {
-				return TRUE;
-			}
-			style_list_node = style_list_node->next;
-		}
-		
-		font_list_node = font_list_node->next;
-	}
-
-	*entry = NULL;
-	*style_entry = NULL;
-
-	return FALSE;
-}
-
-static int
-font_picker_get_index_for_entry (const NautilusFontPicker *font_picker,
-				 const FontEntry *entry)
-{
-	GList *font_menu_node;
- 	GtkWidget *font_menu_item;
-	int i;
-
-	g_return_val_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker), -1);
-	g_return_val_if_fail (entry != NULL, -1);
-
-	for (font_menu_node = GTK_MENU_SHELL (font_picker->details->menu)->children, i = 0;
-	     font_menu_node != NULL;
-	     font_menu_node = font_menu_node->next, i++) {
-		g_return_val_if_fail (GTK_IS_MENU_ITEM (font_menu_node->data), -1);
-		font_menu_item = font_menu_node->data;
-
-		if (entry == gtk_object_get_data (GTK_OBJECT (font_menu_item), FONT_MENU_ITEM_DATA_KEY)) {
-			return i;
-		}
-	}
-
-	return -1;
-}
-
-/* NautilusFontPicker public methods */
-GtkWidget *
-nautilus_font_picker_new (void)
-{
-	return gtk_widget_new (nautilus_font_picker_get_type (), NULL);
-}
-
-char *
-nautilus_font_picker_get_selected_font (const NautilusFontPicker *font_picker)
-{
-	g_return_val_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker), NULL);
-
-	return g_strdup (font_picker->details->selected_font);
-}
-
-void
-nautilus_font_picker_set_selected_font (NautilusFontPicker *font_picker,
-					const char *font_name)
-{
-	int font_item_index;
-	const FontEntry *entry;
-	const FontStyleEntry *style_entry;
-
-	g_return_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker));
-
-	if (!font_picker_find_entries_for_font (font_name, &entry, &style_entry)) {
-		g_warning ("Trying to select a non existant font '%s'.", font_name);
-		return;
-	}
-	
-	g_assert (entry != NULL && style_entry != NULL);
-	g_assert (nautilus_istr_is_equal (style_entry->font_file_name, font_name));
-
-	font_item_index = font_picker_get_index_for_entry (font_picker, entry);
-
-	g_return_if_fail (font_item_index != -1);
-
-	if (!nautilus_istr_is_equal (font_picker->details->selected_font, font_name)) {
-		g_free (font_picker->details->selected_font);
-		font_picker->details->selected_font = g_strdup (font_name);
-	}
-	
-	gtk_option_menu_set_history (GTK_OPTION_MENU (font_picker->details->option_menu),
-				     font_item_index);
-}
diff --git a/libnautilus-private/nautilus-font-picker.h b/libnautilus-private/nautilus-font-picker.h
deleted file mode 100644
index a396ca184..000000000
--- a/libnautilus-private/nautilus-font-picker.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-font-picker.h - A simple widget to select scalable fonts.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_FONT_PICKER_H
-#define NAUTILUS_FONT_PICKER_H
-
-#include <libnautilus-extensions/nautilus-scalable-font.h>
-#include <libnautilus-extensions/nautilus-caption.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_FONT_PICKER            (nautilus_font_picker_get_type ())
-#define NAUTILUS_FONT_PICKER(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_FONT_PICKER, NautilusFontPicker))
-#define NAUTILUS_FONT_PICKER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_FONT_PICKER, NautilusFontPickerClass))
-#define NAUTILUS_IS_FONT_PICKER(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_FONT_PICKER))
-
-typedef struct NautilusFontPicker	     NautilusFontPicker;
-typedef struct NautilusFontPickerClass	     NautilusFontPickerClass;
-typedef struct NautilusFontPickerDetails     NautilusFontPickerDetails;
-
-struct NautilusFontPicker
-{
-	/* Super Class */
-	NautilusCaption caption;
-	
-	/* Private stuff */
-	NautilusFontPickerDetails *details;
-};
-
-struct NautilusFontPickerClass
-{
-	NautilusCaptionClass parent_class;
-};
-
-GtkType    nautilus_font_picker_get_type                    (void);
-GtkWidget* nautilus_font_picker_new                         (void);
-char *     nautilus_font_picker_get_selected_font           (const NautilusFontPicker *font_picker);
-void       nautilus_font_picker_set_selected_font           (NautilusFontPicker       *font_picker,
-							     const char               *font);
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_FONT_PICKER_H */
-
-
diff --git a/libnautilus-private/nautilus-gconf-extensions.c b/libnautilus-private/nautilus-gconf-extensions.c
index 65ec1845d..f9931cda6 100644
--- a/libnautilus-private/nautilus-gconf-extensions.c
+++ b/libnautilus-private/nautilus-gconf-extensions.c
@@ -25,9 +25,9 @@
 #include <config.h>
 #include "nautilus-gconf-extensions.h"
 
-#include "nautilus-glib-extensions.h"
-#include "nautilus-stock-dialogs.h"
-#include "nautilus-string.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 
 #include <gconf/gconf-client.h>
 #include <gconf/gconf.h>
@@ -87,7 +87,7 @@ nautilus_gconf_handle_error (GError **error)
 						     "All further errors shown "
 						     "only on terminal"),
 						   (*error)->message);
-			nautilus_show_error_dialog (message, _("GConf Error"), NULL);
+			eel_show_error_dialog (message, _("GConf Error"), NULL);
 			g_free (message);
 		}
 		g_error_free (*error);
@@ -223,7 +223,7 @@ nautilus_gconf_set_string_list (const char *key,
 	client = nautilus_gconf_client_get_global ();
 	g_return_if_fail (client != NULL);
 
-	slist = nautilus_g_slist_from_g_list (string_list_value);
+	slist = eel_g_slist_from_g_list (string_list_value);
 
 	error = NULL;
 	gconf_client_set_list (client, key, GCONF_VALUE_STRING, slist, &error);
@@ -251,7 +251,7 @@ nautilus_gconf_get_string_list (const char *key)
 		slist = NULL;
 	}
 
-	result = nautilus_g_list_from_g_slist (slist);
+	result = eel_g_list_from_g_slist (slist);
 	g_slist_free (slist);
 	
 	return result;
@@ -363,7 +363,7 @@ nautilus_gconf_value_is_equal (const GConfValue *a,
 
 	switch (a->type) {
 	case GCONF_VALUE_STRING:
-		return nautilus_str_is_equal (a->d.string_data, b->d.string_data);
+		return eel_str_is_equal (a->d.string_data, b->d.string_data);
 		break;
 
 	case GCONF_VALUE_INT:
diff --git a/libnautilus-private/nautilus-gdk-extensions.c b/libnautilus-private/nautilus-gdk-extensions.c
deleted file mode 100644
index 85890cc25..000000000
--- a/libnautilus-private/nautilus-gdk-extensions.c
+++ /dev/null
@@ -1,951 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gdk-extensions.c: Graphics routines to augment what's in gdk.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>, 
-            Pavel Cisler <pavel@eazel.com>,
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <stdlib.h>
-
-#include <config.h>
-#include "nautilus-gdk-extensions.h"
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdkx.h>
-#include <gdk/gdkprivate.h>
-#include "nautilus-glib-extensions.h"
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-string.h"
-
-#define GRADIENT_BAND_SIZE 4
-
-/**
- * nautilus_fill_rectangle:
- * @drawable: Target to draw into.
- * @gc: Graphics context (mainly for clip).
- * @rectangle: Rectangle to fill.
- *
- * Fill the rectangle with the foreground color.
- * Convenient when you have a GdkRectangle structure.
- */
-void
-nautilus_fill_rectangle (GdkDrawable *drawable,
-			 GdkGC *gc,
-			 const GdkRectangle *rectangle)
-{
-	gdk_draw_rectangle (drawable, gc, TRUE,
-			    rectangle->x, rectangle->y,
-			    rectangle->width, rectangle->height);
-}
-
-/**
- * nautilus_fill_rectangle_with_color:
- * @drawable: Target to draw into.
- * @gc: Graphics context (mainly for clip).
- * @rectangle: Rectangle to fill.
- * @color: Color to fill with.
- *
- * Fill the rectangle with a color.
- * Convenient when you have a GdkRectangle structure.
- */
-void
-nautilus_fill_rectangle_with_color (GdkDrawable *drawable,
-				    GdkGC *gc,
-				    const GdkRectangle *rectangle,
-				    guint32 rgb)
-{
-	GdkGCValues saved_values;
-	
-	/* FIXME bugzilla.eazel.com 1287: Workaround for a bug in gdk_rgb. */
-	gdk_rgb_init ();
-	
-	gdk_gc_get_values (gc, &saved_values);
-	gdk_rgb_gc_set_foreground (gc, rgb);
-	nautilus_fill_rectangle (drawable, gc, rectangle);
-	gdk_gc_set_foreground (gc, &saved_values.foreground);
-}
-
-/**
- * nautilus_rectangle_contains:
- * @rectangle: Rectangle possibly containing a point.
- * @x: X coordinate of a point.
- * @y: Y coordinate of a point.
- *
- * Retun TRUE if point is contained inside a rectangle
- */
-gboolean
-nautilus_rectangle_contains (const GdkRectangle *rectangle, 
-			     int x, 
-			     int y)
-{
-	g_return_val_if_fail (rectangle != NULL, FALSE);
-	return rectangle->x <= x && rectangle->x + rectangle->width >= x
-		&& rectangle->y <= y && rectangle->y + rectangle->height >= y;
-}
-
-/**
- * nautilus_rectangle_inset:
- * @rectangle: Rectangle we are insetting.
- * @x: Horizontal ammount to inset by.
- * @y: Vertical ammount to inset by.
- *
- * Inset a rectangle by a given horizontal and vertical ammount.
- * Pass in negative inset values to grow the rectangle, positive to
- * shrink it.
- */
-void
-nautilus_rectangle_inset (GdkRectangle *rectangle, 
-			  int x, 
-			  int y)
-{
-	g_return_if_fail (rectangle != NULL);
-
-	rectangle->x += x;
-	rectangle->width -= 2 * x;
-	rectangle->y += y;
-	rectangle->height -= 2 * y;
-}
-
-/**
- * nautilus_interpolate_color:
- * @ratio: Place on line between colors to interpolate.
- * @start_color: Color for one end.
- * @end_color: Color for the other end
- * @interpolated_color: Result.
- *
- * Compute a color between @start_color and @end_color in color space.
- * Currently, the color space used is RGB, but a future version could
- * instead do the interpolation in the best color space for expressing
- * human perception.
- */
-guint32
-nautilus_interpolate_color (gdouble ratio,
-			    guint32 start_rgb,
-			    guint32 end_rgb)
-{
-	guchar red, green, blue;
-
-	g_return_val_if_fail (ratio >= 0.0, 0);
-	g_return_val_if_fail (ratio <= 1.0, 0);
-
-	red = ((start_rgb >> 16) & 0xFF) * (1.0 - ratio) + ((end_rgb >> 16) & 0xFF) * ratio;
-	green = ((start_rgb >> 8) & 0xFF) * (1.0 - ratio) + ((end_rgb >> 8) & 0xFF) * ratio;
-	blue = (start_rgb & 0xFF) * (1.0 - ratio) + (end_rgb & 0xFF) * ratio;
-	return (((red << 8) | green) << 8) | blue;
-}
-
-/**
- * nautilus_gradient_new
- * @start_color: Color for the top or left.
- * @end_color: Color for the bottom or right.
- * @is_horizontal: Direction of the gradient.
- *
- * Create a string that combines the start and end colors along
- * with the direction of the gradient in a standard format.
- */
-char *
-nautilus_gradient_new (const char *start_color,
-		       const char *end_color,
-		       gboolean is_horizontal)
-{
-	g_return_val_if_fail (is_horizontal == FALSE || is_horizontal == TRUE, NULL);
-
-	/* Handle the special case where the start and end colors are identical.
-	   Handle the special case where the end color is an empty string.
-	*/
-	if (nautilus_strcmp(start_color, end_color) == 0 || end_color == NULL || end_color[0] == '\0') {
-		return g_strdup (start_color);
-	}
-
-	/* Handle the special case where the start color is an empty string. */
-	if (start_color == NULL || start_color[0] == '\0') {
-		return g_strdup (end_color);
-	}
-	
-	/* Handle the general case. */
-	return g_strconcat (start_color, "-", end_color, is_horizontal ? ":h" : NULL, NULL);
-}
-
-/**
- * nautilus_gradient_is_gradient
- * @gradient_spec: A gradient spec. string.
- *
- * Return true if the spec. specifies a gradient instead of a solid color.
- */
-gboolean
-nautilus_gradient_is_gradient (const char *gradient_spec)
-{
-	return nautilus_strchr (gradient_spec, '-') != NULL;
-}
-
-/**
- * nautilus_gradient_is_horizontal
- * @gradient_spec: A gradient spec. string.
- *
- * Return true if the spec. specifies a horizontal gradient.
- */
-gboolean
-nautilus_gradient_is_horizontal (const char *gradient_spec)
-{
-	size_t length;
-
-	length = nautilus_strlen (gradient_spec);
-	return length >= 2 && gradient_spec[length - 2] == ':' && gradient_spec[length - 1] == 'h';
-}
-
-static char *
-nautilus_gradient_strip_trailing_direction_if_any (const char *gradient_spec)
-{
-	size_t length;
-
-	length = nautilus_strlen (gradient_spec);
-	if (length >= 2 && gradient_spec[length - 2] == ':'
-	    && (gradient_spec[length - 1] == 'v' || gradient_spec[length - 1] == 'h')) {
-		length -= 2;
-	}
-
-	return g_strndup (gradient_spec, length);
-}
-
-/* For parsing n-point gradients. Successive calls should pass the next_spec value
- * set by the previous call as their first argument - to continue parsing where the
- * previous call left off.
- */
-char *
-nautilus_gradient_parse_one_color_spec (const char *spec, int *percent, const char **next_spec)
-{
-	char *result;
-	const char *rgb_end_ptr;
-	const char *percent_ptr;
-	const char *separator_ptr;
-	
-	percent_ptr   = nautilus_strchr (spec, '%');
-	separator_ptr = nautilus_strchr (spec, '-');
-
-	if (percent_ptr != NULL && (separator_ptr == NULL || percent_ptr < separator_ptr)) {
-		if (percent != NULL) {
-			*percent = (int) strtol (percent_ptr + 1, NULL, 10);
-		}
-		rgb_end_ptr = percent_ptr;
-	} else {
-		if (percent != NULL) {
-			*percent = 100;
-		}
-		rgb_end_ptr = separator_ptr;
-	}
-		
-	if (rgb_end_ptr != NULL) {
-		result = g_strndup (spec, rgb_end_ptr - spec);
-	} else {
-		result = nautilus_gradient_strip_trailing_direction_if_any (spec);
-	}
-
-	/* It's important not to use spec after setting *next_spec because it's
-	 * likely that *next_spec == spec. 
-	 */
-	if (next_spec != NULL) {
-		*next_spec = (separator_ptr != NULL) ? separator_ptr + 1 : NULL;
-	}
-
-	return result;
-}
-
-/* FIXME bugzilla.eazel.com 5076:
- * anyone using nautilus_gradient_get_start_color_spec or
- * nautilus_gradient_get_end_color_spec is assuming the gradient
- * is 2 colors which is questionable.
- * 
- * Callers should be rewritten and these fns eliminated.
- */
- 
-/**
- * nautilus_gradient_get_start_color_spec
- * @gradient_spec: A gradient spec. string.
- *
- * Return the start color.
- * This may be the entire gradient_spec if it's a solid color.
- */
-char *
-nautilus_gradient_get_start_color_spec (const char *gradient_spec)
-{
-	return nautilus_gradient_parse_one_color_spec (gradient_spec, NULL, NULL);
-}
-
-/**
- * nautilus_gradient_get_end_color_spec
- * @gradient_spec: A gradient spec. string.
- *
- * Return the end color.
- * This may be the entire gradient_spec if it's a solid color.
- */
-char *
-nautilus_gradient_get_end_color_spec (const char *gradient_spec)
-{
-	char* color = NULL;
-
-	do {
-		g_free (color);
-		color = nautilus_gradient_parse_one_color_spec (gradient_spec, NULL, &gradient_spec);
-	} while (gradient_spec != NULL);
-
-	return color;
-}
-
-/* Do the work shared by all the set_color_spec functions below. */
-static char *
-nautilus_gradient_set_edge_color (const char *gradient_spec,
-				  const char *edge_color,
-				  gboolean is_horizontal,
-				  gboolean change_end)
-{
-	char *opposite_color;
-	char *result;
-
-	g_return_val_if_fail (edge_color != NULL, g_strdup (gradient_spec));
-
-	/* Get the color from the existing gradient spec. for the opposite
-	   edge. This will parse away all the stuff we don't want from the
-	   old gradient spec.
-	*/
-	opposite_color = change_end
-		? nautilus_gradient_get_start_color_spec (gradient_spec)
-		: nautilus_gradient_get_end_color_spec (gradient_spec);
-
-	/* Create a new gradient spec. The nautilus_gradient_new function handles
-	   some special cases, so we don't have to bother with them here.
-	*/
-	result = nautilus_gradient_new (change_end ? opposite_color : edge_color,
-					change_end ? edge_color : opposite_color,
-					is_horizontal);
-
-	g_free (opposite_color);
-
-	return result;
-}
-
-/**
- * nautilus_gradient_set_left_color_spec
- * @gradient_spec: A gradient spec. string.
- * @left_color: Color spec. to replace left color with.
- *
- * Changes the left color to what's passed in.
- * This creates a horizontal gradient.
- */
-char *
-nautilus_gradient_set_left_color_spec (const char *gradient_spec,
-				       const char *left_color)
-{
-	return nautilus_gradient_set_edge_color (gradient_spec, left_color, TRUE, FALSE);
-}
-
-/**
- * nautilus_gradient_set_top_color_spec
- * @gradient_spec: A gradient spec. string.
- * @top_color: Color spec. to replace top color with.
- *
- * Changes the top color to what's passed in.
- * This creates a vertical gradient.
- */
-char *
-nautilus_gradient_set_top_color_spec (const char *gradient_spec,
-				      const char *top_color)
-{
-	return nautilus_gradient_set_edge_color (gradient_spec, top_color, FALSE, FALSE);
-}
-
-/**
- * nautilus_gradient_set_right_color_spec
- * @gradient_spec: A gradient spec. string.
- * @right_color: Color spec. to replace right color with.
- *
- * Changes the right color to what's passed in.
- * This creates a horizontal gradient.
- */
-char *
-nautilus_gradient_set_right_color_spec (const char *gradient_spec,
-					const char *right_color)
-{
-	return nautilus_gradient_set_edge_color (gradient_spec, right_color, TRUE, TRUE);
-}
-
-/**
- * nautilus_gradient_set_bottom_color_spec
- * @gradient_spec: A gradient spec. string.
- * @bottom_color: Color spec. to replace bottom color with.
- *
- * Changes the bottom color to what's passed in.
- * This creates a vertical gradient.
- */
-char *
-nautilus_gradient_set_bottom_color_spec (const char *gradient_spec,
-					 const char *bottom_color)
-{
-	return nautilus_gradient_set_edge_color (gradient_spec, bottom_color, FALSE, TRUE);
-}
-
-/**
- * nautilus_gdk_color_parse_with_white_default
- * @color_spec: A color spec.
- * @color: Pointer to place to put resulting color.
- *
- * The same as gdk_color_parse, except sets the color to white if
- * the spec. can't be parsed instead of returning a boolean flag.
- */
-void
-nautilus_gdk_color_parse_with_white_default (const char *color_spec,
-					     GdkColor *color)
-{
-	if (color_spec == NULL || !gdk_color_parse (color_spec, color)) {
-		color->red = 0xFFFF;
-		color->green = 0xFFFF;
-		color->blue = 0xFFFF;
-	}
-}
-
-/**
- * nautilus_parse_rgb_with_white_default
- * @color_spec: A color spec.
- * Returns: An rgb value.
- *
- * The same as gdk_color_parse, except sets the color to white if
- * the spec. can't be parsed instead of returning a boolean flag
- * and returns a guint32 rgb value instead of a GdkColor.
- */
-guint32
-nautilus_parse_rgb_with_white_default (const char *color_spec)
-{
-	GdkColor color;
-
-	if (color_spec == NULL || !gdk_color_parse (color_spec, &color)) {
-		return NAUTILUS_RGB_COLOR_WHITE;
-	}
-	return ((color.red << 8) & NAUTILUS_RGB_COLOR_RED)
-		| (color.green & NAUTILUS_RGB_COLOR_GREEN)
-		| ((color.blue >> 8) & NAUTILUS_RGB_COLOR_BLUE);
-}
-
-guint32
-nautilus_rgb16_to_rgb (gushort r, gushort g, gushort b)
-{
-	guint32 result;
-
-	result = (0xff0000 | (r & 0xff00));
-	result <<= 8;
-	result |= ((g & 0xff00) | (b >> 8));
-
-	return result;
-}
-
-guint32
-nautilus_rgb8_to_rgb (guchar r, guchar g, guchar b)
-{
-	return nautilus_rgb16_to_rgb (r << 8, g << 8, b << 8);
-}
-
-/**
- * nautilus_gdk_color_to_rgb
- * @color: A GdkColor style color.
- * Returns: An rgb value.
- *
- * Converts from a GdkColor stlye color to a gdk_rgb one.
- * Alpha gets set to fully opaque
- */
-guint32
-nautilus_gdk_color_to_rgb (const GdkColor *color)
-{
-	return nautilus_rgb16_to_rgb (color->red, color->green, color->blue);
-}
-
-/**
- * nautilus_gdk_rgb_to_color
- * @color: a gdk_rgb style value.
- *
- * Converts from a gdk_rgb value style to a GdkColor one.
- * The gdk_rgb color alpha channel is ignored.
- * 
- * Return value: a newly allocated GdkColor.
- */
-GdkColor *
-nautilus_gdk_rgb_to_color (const guint32 color)
-{
-	GdkColor *result;
-	
-	result = g_new0 (GdkColor, 1);
-	 
-	result->red = (color & 0xff0000) >> 16 ;
-	result->green = (color & 0xff00);
-	result->blue = color << 8;
-
-	return result;
-}
-
-/**
- * nautilus_gdk_rgb_to_color_spec
- * @color: a gdk_rgb style value.
- *
- * Converts from a gdk_rgb value style to a string color spec.
- * The gdk_rgb color alpha channel is ignored.
- * 
- * Return value: a newly allocated color spec.
- */
-char *
-nautilus_gdk_rgb_to_color_spec (const guint32 color)
-{
-	return g_strdup_printf("rgb:%04hX/%04hX/%04hX",
-			       NAUTILUS_RGBA_COLOR_GET_R (color) * 65535,
-			       NAUTILUS_RGBA_COLOR_GET_G (color) * 65535,
-			       NAUTILUS_RGBA_COLOR_GET_B (color) * 65535);
-}
-
-static guint32
-nautilus_shift_color_component (guchar component, float shift_by)
-{
-	guint32 result;
-	if (shift_by > 1.0) {
-		result = component * (2 - shift_by);
-	} else {
-		result = 0xff - shift_by * (0xff - component);
-	}
-
-	return result & 0xff;
-}
-
-/**
- * nautilus_rgb_shift_color
- * @color: A color.
- * @shift_by: darken or lighten factor.
- * Returns: An darkened or lightened rgb value.
- *
- * Darkens (@shift_by > 1) or lightens (@shift_by < 1)
- * @color.
- */
-guint32
-nautilus_rgb_shift_color (guint32 color, float shift_by)
-{
-	guint32 result;
-
-	/* shift red by shift_by */
-	result = nautilus_shift_color_component((color & 0x00ff0000) >> 16, shift_by);
-	result <<= 8;
-	/* shift green by shift_by */
-	result |=  nautilus_shift_color_component((color & 0x0000ff00) >> 8, shift_by);
-	result <<= 8;
-	/* shift blue by shift_by */
-	result |=  nautilus_shift_color_component((color & 0x000000ff), shift_by);
-
-	/* alpha doesn't change */
-	result |= (0xff000000 & color);
-
-	return result;
-}
-
-/**
- * nautilus_gdk_color_is_dark:
- * 
- * Return true if the given color is `dark'
- */
-gboolean
-nautilus_gdk_color_is_dark (GdkColor *color)
-{
-	int intensity;
-
-	intensity = (((color->red >> 8) * 77)
-		     + ((color->green >> 8) * 150)
-		     + ((color->blue >> 8) * 28)) >> 8;
-
-	return intensity < 128;
-}
-
-/**
- * nautilus_gdk_choose_foreground_color:
- *
- * Select a foreground color given that BACKGROUND is the background
- * color. If the PREFERRED color has a high enough contrast with
- * BACKGROUND, use it, else use one of black or white, depending on
- * the darkness of BACKGROUND.
- *
- * The selected color is stored in PREFERRED.
- */
-void
-nautilus_gdk_choose_foreground_color (GdkColor *preferred,
-				      GdkColor *background)
-{
-	gboolean preferred_is_dark, background_is_dark;
-
-	preferred_is_dark = nautilus_gdk_color_is_dark (preferred);
-	background_is_dark = nautilus_gdk_color_is_dark (background);
-
-	if (preferred_is_dark == background_is_dark) {
-		/* Colors are too similar, so choose a different fg.
-		 * Currently hardcoded to use either white or black.
-		 */
-		if (preferred_is_dark) {
-			preferred->red = 65535;
-			preferred->green = 65535;
-			preferred->blue = 65535;
-		} else {
-			preferred->red = 0;
-			preferred->green = 0;
-			preferred->blue = 0;
-		}
-	}
-}
-
-/**
- * nautilus_gdk_gc_choose_foreground_color:
- *
- * Use nautilus_gdk_color_choose_foreground_color () to set the
- * foreground color of GC to something suitable, given that BACKGROUND
- * will be the background color and PREFERRED is the preferred color.
- *
- * Uses GdkRGB to install the color value.
- */
-void
-nautilus_gdk_gc_choose_foreground_color (GdkGC *gc,
-					 GdkColor *preferred,
-					 GdkColor *background)
-{
-	GdkColor temp;
-	guint32 rgb;
-
-	temp = *preferred;
-	nautilus_gdk_choose_foreground_color (&temp, background);
-	rgb = nautilus_gdk_color_to_rgb (&temp);
-
-	gdk_rgb_init ();
-	gdk_rgb_gc_set_foreground (gc, rgb);
-}
-
-/**
- * nautilus_stipple_bitmap:
- * 
- * Get pointer to singleton 50% stippled bitmap.
- * This is a global object; do not free.
- */
-GdkBitmap *
-nautilus_stipple_bitmap ()
-{
-	static GdkBitmap *stipple = NULL;
-
-	if (stipple == NULL) {
-		char stipple_bits[] = { 0x02, 0x01 };
-		stipple = gdk_bitmap_create_from_data (NULL, stipple_bits, 2, 2);	
-	}
-
-	return stipple;
-}
-
-/**
- * nautilus_gdk_window_bring_to_front:
- * 
- * Raise window and give it focus.
- */
-void 
-nautilus_gdk_window_bring_to_front (GdkWindow *window)
-{
-	/* This takes care of un-iconifying the window and
-	 * raising it if needed.
-	 */
-	gdk_window_show (window);
-
-	/* If the window was already showing, it would not have
-	 * the focus at this point. Do a little X trickery to
-	 * ensure it is focused.
-	 */
-	nautilus_gdk_window_focus (window, GDK_CURRENT_TIME);
-}
-
-void
-nautilus_gdk_window_focus (GdkWindow *window, guint32 timestamp)
-{
-	gdk_error_trap_push ();
-	XSetInputFocus (GDK_DISPLAY (),
-			GDK_WINDOW_XWINDOW (window),
-			RevertToNone,
-			timestamp);
-	gdk_flush();
-	gdk_error_trap_pop ();
-}
-
-void
-nautilus_gdk_window_set_wm_protocols (GdkWindow *window,
-				      GdkAtom *protocols,
-				      int nprotocols)
-{
-	/* This relies on the identity mapping from GdkAtoms to X Atoms */
-	XSetWMProtocols (GDK_WINDOW_XDISPLAY (window),
-			 GDK_WINDOW_XWINDOW (window),
-			 protocols, nprotocols);
-}
-
-void
-nautilus_set_mini_icon (GdkWindow *window,
-			GdkPixmap *pixmap,
-			GdkBitmap *mask)
-{
-        GdkAtom icon_atom;
-        long data[2];
- 
-        g_return_if_fail (window != NULL);
-        g_return_if_fail (pixmap != NULL);
-
-        data[0] = GDK_WINDOW_XWINDOW (pixmap);
-        if (mask) {
-                data[1] = GDK_WINDOW_XWINDOW (mask);
-        } else {
-                data[1] = 0;
-	}
-
-        icon_atom = gdk_atom_intern ("KWM_WIN_ICON", FALSE);
-        gdk_property_change (window, icon_atom, icon_atom, 
-                             32, GDK_PROP_MODE_REPLACE,
-                             (guchar *) data, 2);
-}
-
-/**
- * nautilus_gdk_window_set_wm_hints_input:
- * 
- * Set the WM_HINTS.input flag to the passed in value
- */
-void
-nautilus_gdk_window_set_wm_hints_input (GdkWindow *window, gboolean status)
-{
-	Display *dpy;
-	Window id;
-	XWMHints *wm_hints;
-
-	g_return_if_fail (window != NULL);
-
-	dpy = GDK_WINDOW_XDISPLAY (window);
-	id = GDK_WINDOW_XWINDOW (window);
-
-	wm_hints = XGetWMHints (dpy, id);
-	if (wm_hints == 0) {
-		wm_hints = XAllocWMHints ();
-	}
-
-	wm_hints->flags |= InputHint;
-	wm_hints->input = status;
-
-	XSetWMHints (dpy, id, wm_hints);
-	XFree (wm_hints);
-}
-
-void
-nautilus_gdk_window_set_invisible_cursor (GdkWindow *window)
-{
-	XColor foreColor, backColor;
-	GdkWindowPrivate *window_private;
-	Pixmap sourcePixmap, maskPixmap;
-	Cursor xcursor;
-
-	char invisible_cursor_bits[]      = {0x0};
-	char invisible_cursor_mask_bits[] = {0x0};
-
-	foreColor.pixel = 0L;
-	foreColor.red = foreColor.green = foreColor.blue = 0;
-	foreColor.flags = DoRed | DoGreen | DoBlue;
-
-	backColor.pixel = 255L;
-	backColor.red = backColor.green = backColor.blue = 65535;
-	backColor.flags = DoRed | DoGreen | DoBlue;
-
-	window_private = (GdkWindowPrivate *) window;
-  
-	sourcePixmap = XCreateBitmapFromData (window_private->xdisplay, window_private->xwindow,
-					            		  invisible_cursor_bits, 1, 1);
-	g_assert (sourcePixmap != 0);
-
-	maskPixmap = XCreateBitmapFromData (window_private->xdisplay, window_private->xwindow,
-					          			invisible_cursor_mask_bits, 1, 1);
-	g_assert (maskPixmap != 0);
-
-	xcursor = XCreatePixmapCursor (window_private->xdisplay, sourcePixmap, maskPixmap,
-					      		   &foreColor, &backColor, 0, 0);
-
-	XFreePixmap (window_private->xdisplay, sourcePixmap);
-	XFreePixmap (window_private->xdisplay, maskPixmap);
-
-	XDefineCursor (window_private->xdisplay, window_private->xwindow, xcursor);
-}
-
-NautilusGdkGeometryFlags
-nautilus_gdk_parse_geometry (const char *string, int *x_return, int *y_return,
-			     guint *width_return, guint *height_return)
-{
-	int x11_flags;
-	NautilusGdkGeometryFlags gdk_flags;
-
-	g_return_val_if_fail (string != NULL, NAUTILUS_GDK_NO_VALUE);
-	g_return_val_if_fail (x_return != NULL, NAUTILUS_GDK_NO_VALUE);
-	g_return_val_if_fail (y_return != NULL, NAUTILUS_GDK_NO_VALUE);
-	g_return_val_if_fail (width_return != NULL, NAUTILUS_GDK_NO_VALUE);
-	g_return_val_if_fail (height_return != NULL, NAUTILUS_GDK_NO_VALUE);
-
-	x11_flags = XParseGeometry (string, x_return, y_return,
-				    width_return, height_return);
-
-	gdk_flags = NAUTILUS_GDK_NO_VALUE;
-	if (x11_flags & XValue) {
-		gdk_flags |= NAUTILUS_GDK_X_VALUE;
-	}
-	if (x11_flags & YValue) {
-		gdk_flags |= NAUTILUS_GDK_Y_VALUE;
-	}
-	if (x11_flags & WidthValue) {
-		gdk_flags |= NAUTILUS_GDK_WIDTH_VALUE;
-	}
-	if (x11_flags & HeightValue) {
-		gdk_flags |= NAUTILUS_GDK_HEIGHT_VALUE;
-	}
-	if (x11_flags & XNegative) {
-		gdk_flags |= NAUTILUS_GDK_X_NEGATIVE;
-	}
-	if (x11_flags & YNegative) {
-		gdk_flags |= NAUTILUS_GDK_Y_NEGATIVE;
-	}
-
-	return gdk_flags;
-}
-
-#if ! defined (NAUTILUS_OMIT_SELF_CHECK)
-
-static char *
-nautilus_gdk_color_as_hex_string (GdkColor color)
-{
-	return g_strdup_printf("rgb:%04hX/%04hX/%04hX",
-			       color.red, color.green, color.blue);
-}
-
-static char *
-nautilus_self_check_parse (const char *color_spec)
-{
-	GdkColor color;
-
-	nautilus_gdk_color_parse_with_white_default (color_spec, &color);
-	return nautilus_gdk_color_as_hex_string (color);
-}
-
-void
-nautilus_self_check_gdk_extensions (void)
-{
-	/* nautilus_interpolate_color */
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_interpolate_color (0.0, 0, 0), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_interpolate_color (0.0, 0, 0xFFFFFF), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_interpolate_color (0.5, 0, 0xFFFFFF), 0x7F7F7F);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_interpolate_color (1.0, 0, 0xFFFFFF), 0xFFFFFF);
-
-	/* nautilus_fill_rectangle */
-	/* Make a GdkImage and fill it, maybe? */
-
-	/* nautilus_fill_rectangle_with_color */
-
-	/* nautilus_fill_rectangle_with_gradient */
-
-	/* nautilus_gradient_new */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_new ("", "", FALSE), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_new ("a", "b", FALSE), "a-b");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_new ("a", "b", TRUE), "a-b:h");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_new ("a", "a", FALSE), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_new ("a", "a", TRUE), "a");
-
-	/* nautilus_gradient_is_gradient */
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_gradient_is_gradient (""), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_gradient_is_gradient ("-"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_gradient_is_gradient ("a"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_gradient_is_gradient ("a-b"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_gradient_is_gradient ("a-b:h"), TRUE);
-
-	/* nautilus_gradient_get_start_color_spec */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec (""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("-"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("a-b"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("a-"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("-b"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("a:h"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("a:v"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("a:c"), "a:c");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("a:-b"), "a:");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_start_color_spec ("a:-b:v"), "a:");
-
-	/* nautilus_gradient_get_end_color_spec */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec (""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("-"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("a-b"), "b");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("a-"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("-b"), "b");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("a:h"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("a:v"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("a:c"), "a:c");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("a:-b"), "b");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_get_end_color_spec ("a:-b:v"), "b");
-
-	/* nautilus_gradient_set_left_color_spec */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_left_color_spec ("", ""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_left_color_spec ("", "a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_left_color_spec ("a", ""), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_left_color_spec ("a", "a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_left_color_spec ("a", "b"), "b-a:h");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_left_color_spec ("a-c:v", "b"), "b-c:h");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_left_color_spec ("a-c:v", "c"), "c");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_left_color_spec ("a:-b:v", "d"), "d-b:h");
-
-	/* nautilus_gradient_set_top_color_spec */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_top_color_spec ("", ""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_top_color_spec ("", "a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_top_color_spec ("a", ""), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_top_color_spec ("a", "a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_top_color_spec ("a", "b"), "b-a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_top_color_spec ("a-c:v", "b"), "b-c");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_top_color_spec ("a-c:v", "c"), "c");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_top_color_spec ("a:-b:h", "d"), "d-b");
-
-	/* nautilus_gradient_set_right_color_spec */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_right_color_spec ("", ""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_right_color_spec ("", "a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_right_color_spec ("a", ""), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_right_color_spec ("a", "a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_right_color_spec ("a", "b"), "a-b:h");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_right_color_spec ("a-c:v", "b"), "a-b:h");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_right_color_spec ("a-c:v", "c"), "a-c:h");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_right_color_spec ("a:-b:v", "d"), "a:-d:h");
-
-	/* nautilus_gradient_set_bottom_color_spec */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_bottom_color_spec ("", ""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_bottom_color_spec ("", "a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_bottom_color_spec ("a", ""), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_bottom_color_spec ("a", "a"), "a");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_bottom_color_spec ("a", "b"), "a-b");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_bottom_color_spec ("a-c:v", "b"), "a-b");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_bottom_color_spec ("a-c:v", "c"), "a-c");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_gradient_set_bottom_color_spec ("a:-b:h", "d"), "a:-d");
-
-	/* nautilus_gdk_color_parse_with_white_default */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_parse (""), "rgb:FFFF/FFFF/FFFF");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_parse ("a"), "rgb:FFFF/FFFF/FFFF");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_parse ("white"), "rgb:FFFF/FFFF/FFFF");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_parse ("black"), "rgb:0000/0000/0000");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_parse ("rgb:0123/4567/89AB"), "rgb:0123/4567/89AB");
-}
-
-#endif /* ! NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-gdk-extensions.h b/libnautilus-private/nautilus-gdk-extensions.h
deleted file mode 100644
index 8dbd717ac..000000000
--- a/libnautilus-private/nautilus-gdk-extensions.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gdk-extensions.h: Graphics routines to augment what's in gdk.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>,
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_GDK_EXTENSIONS_H
-#define NAUTILUS_GDK_EXTENSIONS_H
-
-#include <gdk/gdktypes.h>
-
-#define NAUTILUS_RGB_COLOR_RED		0xFF0000
-#define NAUTILUS_RGB_COLOR_GREEN	0x00FF00
-#define NAUTILUS_RGB_COLOR_BLUE		0x0000FF
-#define NAUTILUS_RGB_COLOR_WHITE	0xFFFFFF
-#define NAUTILUS_RGB_COLOR_BLACK	0x000000
-
-#define NAUTILUS_RGBA_COLOR_OPAQUE_RED		0xFFFF0000
-#define NAUTILUS_RGBA_COLOR_OPAQUE_GREEN	0xFF00FF00
-#define NAUTILUS_RGBA_COLOR_OPAQUE_BLUE		0xFF0000FF
-#define NAUTILUS_RGBA_COLOR_OPAQUE_WHITE	0xFFFFFFFF
-#define NAUTILUS_RGBA_COLOR_OPAQUE_BLACK	0xFF000000
-
-/* Pack RGBA values into a 32 bits */
-#define NAUTILUS_RGBA_COLOR_PACK(r, g, b, a)	\
-( ((a) << 24) |					\
-  ((r) << 16) |					\
-  ((g) <<  8) |					\
-  ((b) <<  0) )
-
-/* Access the individual RGBA components */
-#define NAUTILUS_RGBA_COLOR_GET_R(color) (((color) >> 16) & 0xff)
-#define NAUTILUS_RGBA_COLOR_GET_G(color) (((color) >> 8) & 0xff)
-#define NAUTILUS_RGBA_COLOR_GET_B(color) (((color) >> 0) & 0xff)
-#define NAUTILUS_RGBA_COLOR_GET_A(color) (((color) >> 24) & 0xff)
-
-/* Bits returned by nautilus_gdk_parse_geometry */
-typedef enum {
-	NAUTILUS_GDK_NO_VALUE     = 0x00,
-	NAUTILUS_GDK_X_VALUE      = 0x01,
-	NAUTILUS_GDK_Y_VALUE      = 0x02,
-	NAUTILUS_GDK_WIDTH_VALUE  = 0x04,
-	NAUTILUS_GDK_HEIGHT_VALUE = 0x08,
-	NAUTILUS_GDK_ALL_VALUES   = 0x0f,
-	NAUTILUS_GDK_X_NEGATIVE   = 0x10,
-	NAUTILUS_GDK_Y_NEGATIVE   = 0x20,
-} NautilusGdkGeometryFlags;
-
-/* A gradient spec. is a string that contains a specifier for either a
-   color or a gradient. If the string has a "-" in it, then it's a gradient.
-   The gradient is vertical by default and the spec. can end with ":v" to indicate that.
-   If the gradient ends with ":h", the gradient is horizontal.
-*/
-char *                   nautilus_gradient_new                       (const char          *start_color,
-								      const char          *end_color,
-								      gboolean             is_horizontal);
-char *                   nautilus_gradient_parse_one_color_spec      (const char          *spec,
-								      int                 *percent,
-								      const char         **next_spec);
-gboolean                 nautilus_gradient_is_gradient               (const char          *gradient_spec);
-char *                   nautilus_gradient_get_start_color_spec      (const char          *gradient_spec);
-char *                   nautilus_gradient_get_end_color_spec        (const char          *gradient_spec);
-gboolean                 nautilus_gradient_is_horizontal             (const char          *gradient_spec);
-char *                   nautilus_gradient_set_left_color_spec       (const char          *gradient_spec,
-								      const char          *left_color);
-char *                   nautilus_gradient_set_top_color_spec        (const char          *gradient_spec,
-								      const char          *top_color);
-char *                   nautilus_gradient_set_right_color_spec      (const char          *gradient_spec,
-								      const char          *right_color);
-char *                   nautilus_gradient_set_bottom_color_spec     (const char          *gradient_spec,
-								      const char          *bottom_color);
-
-
-/* A version of parse_color that substitutes a default color instead of returning
-   a boolean to indicate it cannot be parsed.
-*/
-void                     nautilus_gdk_coolor_parse_with_default      (const char          *color_spec,
-								      const GdkColor      *default_color,
-								      GdkColor            *parsed_color);
-void                     nautilus_gdk_color_parse_with_white_default (const char          *color_spec,
-								      GdkColor            *parsed_color);
-guint32                  nautilus_parse_rgb_with_default             (const char          *color_spec,
-								      guint32              default_rgb);
-guint32                  nautilus_parse_rgb_with_white_default       (const char          *color_spec);
-guint32                  nautilus_rgb_shift_color                    (guint32              color,
-								      float                shift_by);
-guint32                  nautilus_rgb16_to_rgb                       (gushort              r,
-								      gushort              g,
-								      gushort              b);
-guint32                  nautilus_rgb8_to_rgb                        (guchar               r,
-								      guchar               g,
-								      guchar               b);
-guint32                  nautilus_gdk_color_to_rgb                   (const GdkColor      *color);
-GdkColor *               nautilus_gdk_rgb_to_color                   (const guint32        color);
-char *                   nautilus_gdk_rgb_to_color_spec              (guint32              color);
-
-/* Fill routines that take GdkRectangle parameters instead of four integers. */
-void                     nautilus_fill_rectangle                     (GdkDrawable         *drawable,
-								      GdkGC               *gc,
-								      const GdkRectangle  *rectangle);
-void                     nautilus_fill_rectangle_with_color          (GdkDrawable         *drawable,
-								      GdkGC               *gc,
-								      const GdkRectangle  *rectangle,
-								      guint32              rgb);
-
-gboolean		nautilus_gdk_color_is_dark		     (GdkColor		  *color);
-void			nautilus_gdk_choose_foreground_color	     (GdkColor		  *preferred,
-								      GdkColor		  *background);
-void			nautilus_gdk_gc_choose_foreground_color	     (GdkGC		  *gc,
-								      GdkColor		  *preferred,
-								      GdkColor		  *background);
-
-/* A routine to get a 50% gray stippled bitmap for use in some types of highlighting. */
-GdkBitmap *              nautilus_stipple_bitmap                     (void);
-
-
-/* Misc GdkRectangle helper functions */
-gboolean                 nautilus_rectangle_contains                 (const GdkRectangle  *rectangle,
-								      int                  x,
-								      int                  y);
-void                     nautilus_rectangle_inset                    (GdkRectangle        *rectangle,
-								      int                  x,
-								      int                  y);
-
-
-/* A basic operation we use for drawing gradients is interpolating two colors.*/
-guint32                  nautilus_interpolate_color                  (gdouble              ratio,
-								      guint32              start_rgb,
-								      guint32              end_rgb);
-
-/* Misc GdkWindow helper functions */
-void                     nautilus_gdk_window_bring_to_front          (GdkWindow           *window);
-void                     nautilus_gdk_window_set_invisible_cursor    (GdkWindow           *window);
-void			 nautilus_gdk_window_focus		     (GdkWindow          *window,
-								      guint32		  timestamp);
-void			 nautilus_gdk_window_set_wm_protocols	     (GdkWindow		 *window,
-								      GdkAtom		 *protocols,
-								      int		  nprotocols);
-
-
-/* In GNOME 2.0 this function will be in the libraries */
-void                     nautilus_set_mini_icon                      (GdkWindow           *window,
-								      GdkPixmap           *pixmap,
-								      GdkBitmap           *mask);
-void                     nautilus_gdk_window_set_wm_hints_input      (GdkWindow           *w,
-								      gboolean             status);
-
-/* Wrapper for XParseGeometry */
-NautilusGdkGeometryFlags nautilus_gdk_parse_geometry                 (const char          *string,
-								      int                 *x_return,
-								      int                 *y_return,
-								      guint               *width_return,
-								      guint               *height_return);
-
-#endif /* NAUTILUS_GDK_EXTENSIONS_H */
diff --git a/libnautilus-private/nautilus-gdk-font-extensions.c b/libnautilus-private/nautilus-gdk-font-extensions.c
deleted file mode 100644
index 8b1fcfe71..000000000
--- a/libnautilus-private/nautilus-gdk-font-extensions.c
+++ /dev/null
@@ -1,1657 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gdk-extensions.c: GdkFont extensions.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>, 
-            Pavel Cisler <pavel@eazel.com>,
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-gdk-font-extensions.h"
-
-#include "nautilus-glib-extensions.h"
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-string-list.h"
-#include "nautilus-string.h"
-
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-
-#include <gdk/gdkprivate.h>
-#include <gdk/gdkx.h>
-
-/* Magic constant copied from GTK+ */
-#define MAX_FONTS 32767
-
-/* These are arbitrary constants to catch insane values */
-#define MIN_NUM_STEPS 1
-#define MAX_NUM_STEPS 40
-
-/* Indeces of some xlfd string entries.  The first entry is 1 */
-#define XLFD_WEIGHT_INDEX			3
-#define XLFD_SLANT_INDEX			4
-#define XLFD_SIZE_IN_PIXELS_INDEX		7
-#define XLFD_SIZE_IN_POINTS_INDEX		8
-#define XLFD_HORIZONTAL_RESOLUTION_INDEX	9
-#define XLFD_VERTICAL_RESOLUTION_INDEX		10
-#define XLFD_MAX_INDEX				14
-
-/* Indicates an invalid xlfd string */
-#define XLFD_INVALID_VALUE			-1
-
-/* Indicates a xlfd wildcard: * */
-#define XLFD_WILDCARD_VALUE			-2
-
-#define ELLIPSIS "..."
-
-/* Font functions that could be public */
-static NautilusStringList *      font_list_fonts                          (const char               *pattern);
-static const NautilusStringList *font_list_fonts_cached                   (const char               *pattern,
-									   GCompareFunc              compare_function);
-static char *                    font_get_name                            (const GdkFont            *font);
-static guint                     font_get_size_in_pixels                  (const GdkFont            *font);
-static GdkFont *                 font_get_bold                            (GdkFont                  *font);
-
-/* XLFD string operations */
-static char *                    xlfd_string_get_nth                      (const char               *xlfd_string,
-									   guint                     n);
-static char *                    xlfd_string_replace_nth                  (const char               *xlfd_string,
-									   guint                     n,
-									   const char               *replace_string);
-static int                       xlfd_string_get_nth_as_int               (const char               *xlfd_string,
-									   guint                     n);
-static gboolean                  xlfd_string_is_scalable_non_bitmap       (const char               *xlfd_string);
-static gboolean                  xlfd_string_could_be_scalable_non_bitmap (const char               *xlfd_string);
-
-/* Test functions for searching font lists */
-static gboolean                  font_entry_has_bold_weight_test          (const NautilusStringList *string_list,
-									   const char               *string,
-									   gpointer                  callback_data);
-static gboolean                  font_entry_has_italic_slant_test         (const NautilusStringList *string_list,
-									   const char               *string,
-									   gpointer                  callback_data);
-static gboolean                  font_entry_is_scalable_non_bitmap_test   (const NautilusStringList *string_list,
-									   const char               *string,
-									   gpointer                  callback_data);
-/* Comparison functions for sorting fonts lists */
-static int                       compare_xlfd_by_size_in_points           (gconstpointer             string_a,
-									   gconstpointer             string_b);
-static int                       compare_xlfd_by_size_in_pixels           (gconstpointer             string_a,
-									   gconstpointer             string_b);
-
-/**
- * nautilus_gdk_font_get_italic
- * @plain_font: A font.
- * Returns: An italic variant of @plain_font or NULL.
- *
- * Tries to find an italic flavor of a given font.  Return the same font
- * if no italic font is found.
- */
-GdkFont *
-nautilus_gdk_font_get_italic (GdkFont *font)
-{
-	char *name;
-	char *slant_pattern;
-	GdkFont *result = NULL;
-	char *pattern_match;
-	const NautilusStringList *font_list;
-
-	/* FIXME bugzilla.eazel.com 7350:
-	 * The issue is that the the italic font matching code here 
-	 * assumes that all fonts are for the same encoding.
-	 * So we might find an italic version of a font, but but it will
-	 * be the in a wrong encoding and thus not appropiate for the current
-	 * locale.  This only happens in multi byte locales, because of the 
-	 * limited number of fonts found in these.
-	 */
-	if (nautilus_dumb_down_for_multi_byte_locale_hack ()) {
-		gdk_font_ref (font);
-		return font;
-	}
-
-	name = font_get_name (font);
-
-	/* Replace the slant with a wildard */
-	slant_pattern = xlfd_string_replace_nth (name, XLFD_SLANT_INDEX, "*");
-
-	if (slant_pattern == NULL) {
-		g_free (name);
-		gdk_font_ref (font);
-		return font;
-	}
-
-	font_list = font_list_fonts_cached (slant_pattern, NULL);
-	
- 	/* Find one with an italic slant */
- 	pattern_match = nautilus_string_list_find_by_function (font_list,
- 							       font_entry_has_italic_slant_test,
- 							       NULL);
-
-	if (pattern_match != NULL) {
-		char *slant_name;
-		char *italic_name;
-
-		/* Find out the italic slant */
-		slant_name = xlfd_string_get_nth (pattern_match, XLFD_SLANT_INDEX);
-		
-		/* Set the italic slant on the original name */
-		italic_name = xlfd_string_replace_nth (name, XLFD_SLANT_INDEX, slant_name);
-		
-		result = gdk_fontset_load (italic_name);
-		if (result == NULL) {
-			gdk_font_ref (font);
-			result = font;
-		}
-
-		g_free (italic_name);
-		g_free (slant_name);
-	} else {
-		/* If no font was found, return the source font */
-		gdk_font_ref (font);
-		result = font;
-	}
-
-	g_free (pattern_match);
-	g_free (slant_pattern);
-	g_free (name);
-
-	return result;
-}
-
-static GHashTable *bold_font_table = NULL;
-
-typedef struct {
-	char *name;
-	GdkFont *bold_font;
-} BoldFontEntry;
-
-static void
-bold_font_table_free_one_node (gpointer key,
-			       gpointer value,
-			       gpointer callback_data)
-{
-	BoldFontEntry *entry;
-
-	g_return_if_fail (key != NULL);
-	g_return_if_fail (value != NULL);
-
-	entry = value;
-	g_free (entry->name);
-	gdk_font_unref (entry->bold_font);
-	g_free (entry);
-}
-
-static void
-bold_font_table_free (void)
-{
-	if (bold_font_table != NULL) {
-		g_hash_table_foreach (bold_font_table, bold_font_table_free_one_node, NULL);
-		g_hash_table_destroy (bold_font_table);
-	}
-
-	bold_font_table = NULL;
-}
-
-/**
- * nautilus_gdk_font_get_bold
- * @plain_font: A font.
- * Returns: A bold variant of @plain_font or NULL.
- *
- * Tries to find a bold flavor of a given font.  Return the same font
- * if no bold font is found.
- */
-GdkFont *
-nautilus_gdk_font_get_bold (GdkFont *font)
-{
-	char *name;
-	BoldFontEntry *entry;
-
-	g_return_val_if_fail (font != NULL, NULL);
-
-	/* FIXME bugzilla.eazel.com 7350:
-	 * The issue is that the the bold font matching code here 
-	 * assumes that all fonts are for the same encoding.
-	 * So we might find a bold version of a font, but but it will
-	 * be the in a wrong encoding and thus not appropiate for the current
-	 * locale.  This only happens in multi byte locales, because of the 
-	 * limited number of fonts found in these.
-	 */
-	if (nautilus_dumb_down_for_multi_byte_locale_hack ()) {
-		gdk_font_ref (font);
-		return font;
-	}
-
-	if (bold_font_table == NULL) {
-		bold_font_table = g_hash_table_new (g_str_hash, g_str_equal);
-		g_atexit (bold_font_table_free);
-	}
-
-	g_assert (bold_font_table != NULL);
-
-	name = font_get_name (font);
-	entry = g_hash_table_lookup (bold_font_table, name);
-
-	if (entry != NULL) {
-		g_assert (entry->bold_font != NULL);
-		gdk_font_ref (entry->bold_font);
-		g_free (name);
-		return entry->bold_font;
-	}
-
-	entry = g_new0 (BoldFontEntry, 1);
-	entry->name = g_strdup (name);
-	entry->bold_font = font_get_bold (font);
-
-	if (entry->bold_font == NULL) {
-		g_free (entry->name);
-		g_free (entry);
-		gdk_font_ref (font);
-		return font;
-	}
-	g_free (name);
-	g_hash_table_insert (bold_font_table, entry->name, entry);
-
-	g_assert (g_hash_table_lookup (bold_font_table, entry->name) == entry);
-
-	gdk_font_ref (entry->bold_font);
-	return entry->bold_font;
-}
-
-/* Return a scalable font matching the given target size */
-static GdkFont *
-font_scalable_get_by_size (const char *xlfd_string,
-			   guint target_size,
-			   guint index)
-{
-	GdkFont *larger_font = NULL;
-	char *larger_size_string;
-	char *larger_font_name;
-	
-	g_return_val_if_fail (xlfd_string != NULL, NULL);
-	g_return_val_if_fail (target_size > 0, NULL);
-	g_return_val_if_fail (index == XLFD_SIZE_IN_POINTS_INDEX || index == XLFD_SIZE_IN_PIXELS_INDEX, NULL);
-
-	larger_size_string = g_strdup_printf ("%d", target_size);
-	
-	larger_font_name = xlfd_string_replace_nth (xlfd_string,
-						    index,
-						    larger_size_string);
-	
-	if (larger_font_name != NULL) {
-		larger_font = gdk_fontset_load (larger_font_name);
-	}
-	
-	g_free (larger_size_string);
-	g_free (larger_font_name);
-	
-	return larger_font;
-}
-
-/* Return a bitmap font matching the given target size as much as possible */
-static GdkFont *
-font_bitmap_get_by_size (const char *xlfd_string,
-			 guint target_size,
-			 guint index,
-			 GCompareFunc compare_function)
-{
-	GdkFont *larger_font = NULL;
- 	char *last_entry;
-	guint max_size;
- 	char *larger_pattern_xlfd = NULL;
-	const NautilusStringList *font_list;
-	
-	g_return_val_if_fail (xlfd_string != NULL, NULL);
-	g_return_val_if_fail (target_size > 0, NULL);
-	g_return_val_if_fail (index == XLFD_SIZE_IN_POINTS_INDEX || index == XLFD_SIZE_IN_PIXELS_INDEX, NULL);
-	g_return_val_if_fail (compare_function != NULL, NULL);
-	
- 	larger_pattern_xlfd = xlfd_string_replace_nth (xlfd_string, index, "*");
-
-	if (larger_pattern_xlfd == NULL) {
-		return NULL;
-	}
-
-	/* Make a query */
-	font_list = font_list_fonts_cached (larger_pattern_xlfd, compare_function);
-
-	last_entry = nautilus_string_list_nth (font_list, nautilus_string_list_get_length (font_list) - 1);
-	max_size = xlfd_string_get_nth_as_int (last_entry, index);
-	g_free (last_entry);
-
-	if (target_size >= max_size) {
-		/* If target font is large, then return the maximum available size */
-		char *larger_font_name;
-		char *size_string;
-		
-		size_string = g_strdup_printf ("%d", max_size);
-		larger_font_name = xlfd_string_replace_nth (xlfd_string, index, size_string);
-		g_free (size_string);
-		larger_font = gdk_fontset_load (larger_font_name);
-		g_free (larger_font_name);
-	} else {
-		/* Look for the closest matching font */
-		guint i = 0;
-		int found_size = 0;
-		char *larger_font_name;
-		char *size_string;
-
-		while ((i < nautilus_string_list_get_length (font_list)) && (found_size == 0)) {
-			char *entry;
-			guint entry_value;
-
-			entry = nautilus_string_list_nth (font_list, i);
-			entry_value = xlfd_string_get_nth_as_int (entry, index);
-
-			if (entry_value >= target_size) {
-				found_size = entry_value;
-			}
-			
-			g_free (entry);
-
-			i++;
-		}
-
-		if (found_size > 0) {
-			size_string = g_strdup_printf ("%d", found_size);
-			larger_font_name = xlfd_string_replace_nth (xlfd_string, index, size_string);
-			g_free (size_string);
-			larger_font = gdk_fontset_load (larger_font_name);
-			g_free (larger_font_name);
-		}
-	}
-	
- 	g_free (larger_pattern_xlfd);
-	
-	return larger_font;
-}
-
-/**
- * nautilus_gdk_font_get_larger
- * @font: A GdkFont.
- * Returns: A GdkFont that is num_steps larger than the given one.
- *          For scalable fonts, the resulting font is always the
- *          requested size.  For bitmap fonts, the result will be
- *          the first font equal or larger than the requested size.
- */
-GdkFont *
-nautilus_gdk_font_get_larger (GdkFont *font,
-			      int num_steps)
-{
-	GdkFont *result = NULL;
-	char *name;
-	int size_in_points;
-	int size_in_pixels;
-	int target_index = -1;
-
-	g_return_val_if_fail (font != NULL, NULL);
-	g_return_val_if_fail (ABS (num_steps) >= MIN_NUM_STEPS, NULL);
-	g_return_val_if_fail (ABS (num_steps) <= MAX_NUM_STEPS, NULL);
-
-	/* FIXME bugzilla.eazel.com 7350:
-	 * The issue is that the the larger font matching code here 
-	 * assumes that all fonts are for the same encoding.
-	 * So we might find a larger version of a font, but but it will
-	 * be the in a wrong encoding and thus not appropiate for the current
-	 * locale.  This only happens in multi byte locales, because of the 
-	 * limited number of fonts found in these.
-	 */
-	if (nautilus_dumb_down_for_multi_byte_locale_hack ()) {
-		gdk_font_ref (font);
-		return font;
-	}
-
-	name = font_get_name (font);
-
-	size_in_points = xlfd_string_get_nth_as_int (name, XLFD_SIZE_IN_POINTS_INDEX);
-	size_in_pixels = xlfd_string_get_nth_as_int (name, XLFD_SIZE_IN_PIXELS_INDEX);
-
-	if (size_in_points <= 0 && size_in_pixels <= 0) {
-		g_free (name);
-		return NULL;
-	}
-
-	/* If for some crazy reason both the "size_in_points" and
-	 * the "size_in_pixels" wildcards are on, then we pick
-	 * only one. */
-
-	/* FIXME bugzilla.eazel.com xxxx:
-	 * Choosing pixels over points here is an arbitrary 
-	 * decision.  Is there a right one ?
-	 */
-	if (size_in_points == XLFD_WILDCARD_VALUE && size_in_pixels == XLFD_WILDCARD_VALUE) {
-		size_in_pixels = 1;
-		size_in_points = 0;
-	}
-
-	/* Figure out the index of the entry we need to bump */
-	if (size_in_points > 0) {
-		target_index = XLFD_SIZE_IN_POINTS_INDEX;
-	} else {
-		target_index = XLFD_SIZE_IN_PIXELS_INDEX;
-	}
-	
-	g_assert (target_index == XLFD_SIZE_IN_POINTS_INDEX
-		  || target_index == XLFD_SIZE_IN_PIXELS_INDEX);
-
-	if (xlfd_string_could_be_scalable_non_bitmap (name)) {
-		/* If the font is scalable then we simply can add or subtract
-		 * points or pixels to get the target font.
-		 */
-		if (target_index == XLFD_SIZE_IN_PIXELS_INDEX) {
-			guint target_size_in_pixels;
-
-			target_size_in_pixels = size_in_pixels + num_steps;
-			
-			result = font_scalable_get_by_size (name, target_size_in_pixels, XLFD_SIZE_IN_PIXELS_INDEX);
-		} else {
-			guint target_size_in_points;
-
-			target_size_in_points = size_in_points + (10 * num_steps);
-
-			result = font_scalable_get_by_size (name, target_size_in_points, XLFD_SIZE_IN_POINTS_INDEX);
-		}
-	} else {
-		/* If the font is not scalable, then we have to make a query
-		 * and find the next available larger font.
-		 */
-		if (target_index == XLFD_SIZE_IN_PIXELS_INDEX) {
-			guint target_size_in_pixels;
-
-			target_size_in_pixels = size_in_pixels + num_steps;
-
-			result = font_bitmap_get_by_size (name,
-							  target_size_in_pixels,
-							  XLFD_SIZE_IN_PIXELS_INDEX,
-							  compare_xlfd_by_size_in_pixels);
-		} else {
-			guint target_size_in_points;
-
-			target_size_in_points = size_in_points + (num_steps * 10);
-			
-			result = font_bitmap_get_by_size (name,
-							  target_size_in_points,
-							  XLFD_SIZE_IN_POINTS_INDEX,
-							  compare_xlfd_by_size_in_points);
-		}
-	}
-
-	g_free (name);
-
-	/* If no font was found, return the source font */
-	if (result == NULL) {
-		gdk_font_ref (font);
-		result = font;
-	}
-
-	g_assert (result != NULL);
-
-	return result;
-}
-
-/**
- * nautilus_gdk_font_get_smaller
- * @font: A GdkFont.
- * Returns: A GdkFont that is num_steps smaller than the given one.
- *          For scalable fonts, the resulting font is always the
- *          requested size.  For bitmap fonts, the result will be
- *          the first font equal or smaller than the requested size.
- */
-GdkFont *
-nautilus_gdk_font_get_smaller (GdkFont *font, int num_steps)
-{
-	g_return_val_if_fail (font != NULL, NULL);
-	g_return_val_if_fail (ABS (num_steps) >= MIN_NUM_STEPS, NULL);
-	g_return_val_if_fail (ABS (num_steps) <= MAX_NUM_STEPS, NULL);
-
-	return nautilus_gdk_font_get_larger (font, -ABS (num_steps));
-}
-
-/**
- * nautilus_gdk_font_equal
- * @font_a_null_allowed: A font or NULL.
- * @font_b_null_allowed: A font or NULL.
- *
- * Calls gdk_font_equal, unless one of the fonts is NULL.
- */
-gboolean
-nautilus_gdk_font_equal (GdkFont *font_a_null_allowed,
-			 GdkFont *font_b_null_allowed)
-{
-	if (font_a_null_allowed == NULL) {
-		return font_b_null_allowed == NULL;
-	}
-	if (font_b_null_allowed == NULL) {
-		return FALSE;
-	}
-	return gdk_font_equal (font_a_null_allowed, font_b_null_allowed);
-}
-
-/**
- * nautilus_gdk_font_get_largest_fitting
- * @font: A GdkFont.
- * @text: Text to use for measurement.
- * @available_width: How much space is available in pixels.
- * @minimum_acceptable_font_size: The minimum acceptable font size in pixels.
- * @maximum_acceptable_font_size: The maximum acceptable font size in pixels.
- *
- * Returns: A GdkFont that when used to render &text, will fit it all in 
- *          &available_width.  The minimum and maximum acceptable dimensions
- *          control the limits on the size of the font.  The font size is
- *          guranteed to be within this range.
- *          The resulting font needs to be freed with gdk_font_unref()
- */
-GdkFont *
-nautilus_gdk_font_get_largest_fitting (GdkFont *font,
-				       const char *text,
-				       int available_width,
-				       int minimum_acceptable_font_size,
-				       int maximum_acceptable_font_size)
-{
-	GdkFont *largest_fitting_font = NULL;
-	NautilusStringList *tokenized_string;
-	char *longest_string;
-	guint longest_string_length;
-
-	g_return_val_if_fail (font != NULL, NULL);
-	g_return_val_if_fail (text != NULL, 0);
-	g_return_val_if_fail (text[0] != '\0', 0);
-	g_return_val_if_fail (available_width > 0, NULL);
-	g_return_val_if_fail (minimum_acceptable_font_size > 0, NULL);
-	g_return_val_if_fail (maximum_acceptable_font_size > 0, NULL);
-	g_return_val_if_fail (maximum_acceptable_font_size > minimum_acceptable_font_size, NULL);
-
-	/* FIXME bugzilla.eazel.com 7350:
-	 * The issue is that the the larger font matching code here 
-	 * assumes that all fonts are for the same encoding.
-	 * So we might find a larger version of a font, but but it will
-	 * be the in a wrong encoding and thus not appropiate for the current
-	 * locale.  This only happens in multi byte locales, because of the 
-	 * limited number of fonts found in these.
-	 */
-	if (nautilus_dumb_down_for_multi_byte_locale_hack ()) {
-		gdk_font_ref (font);
-		return font;
-	}
-	
-	tokenized_string = nautilus_string_list_new_from_tokens (text, "\n", FALSE);
-	longest_string = nautilus_string_list_get_longest_string (tokenized_string);
-	g_assert (longest_string != NULL);
-	nautilus_string_list_free (tokenized_string);
-	longest_string_length = strlen (longest_string);
-
-	/* Make sure the font was specified in pixels */
-	if (font_get_size_in_pixels (font) > 0) {
-		int candidate_size;
-		char *font_name;
-		gboolean done;
-		
-		font_name = font_get_name (font);
-		
-		/* Iterate through the fonts until we find one that works */
-		candidate_size = maximum_acceptable_font_size;
-		done = FALSE;
-		while (!done) {
- 			GdkFont *candidate_font;
- 			int candidate_width;
-
-			candidate_font = font_bitmap_get_by_size (font_name,
-								  candidate_size,
-								  XLFD_SIZE_IN_PIXELS_INDEX,
-								  compare_xlfd_by_size_in_pixels);
-			if (candidate_font != NULL) {
-				candidate_width = gdk_string_width (candidate_font, longest_string);
-				
-				if ((candidate_width <= available_width) 
-				    || (candidate_size <= minimum_acceptable_font_size)) {
-					done = TRUE;
-					largest_fitting_font = candidate_font;
-				} else {
-					gdk_font_unref (candidate_font);
-				}
-			}
-			
-			candidate_size--;
-		}
-
-		g_free (font_name);
-	}
-
-	g_free (longest_string);
-
-	return largest_fitting_font;
-}
-
-/**
- * nautilus_string_ellipsize_start:
- * 
- * @string: A a string to be ellipsized.
- * @font: A a font used to measure the resulting string width.
- * @width: Desired maximum width in points.
- * Returns: A truncated string at most @width points long.
- * 
- * Truncates a string, removing characters from the start and 
- * replacing them with "..." 
- * 
- */
-char *
-nautilus_string_ellipsize_start (const char *string, GdkFont *font, int width)
-{
-	int truncate_offset;
-	int resulting_width;
-
-	resulting_width = gdk_string_width (font, string);
-	if (resulting_width <= width) {
-		/* String is already short enough. */
-		return g_strdup (string);
-	}
-	
-	/* Account for the width of the ellipsis. */
-	width -= gdk_string_width (font, ELLIPSIS);
-	
-
-	if (width < 0) {
-		/* No room even for a an ellipsis. */
-		return g_strdup ("");
-	}
-	
-	g_assert (strlen (string) > 0);
-
-	/* We rely on the fact that GdkFont does not use kerning and that
-	 * gdk_string_width ("foo") + gdk_string_width ("bar") ==
-	 * gdk_string_width ("foobar")
-	 */
-        for (truncate_offset = 1; ; truncate_offset++) {
-        	if (string[truncate_offset] == '\0') {
-			break;
-        	}
-
-        	resulting_width -= gdk_char_width (font, string[truncate_offset - 1]);
-
-        	if (resulting_width <= width) {
-			break;
-        	}
-        }
-
-	return g_strconcat (ELLIPSIS, string + truncate_offset, NULL);
-}
-
-/**
- * nautilus_string_ellipsize_end:
- * 
- * @string: A a string to be ellipsized.
- * @font: A a font used to measure the resulting string width.
- * @width: Desired maximum width in points.
- * Returns: A truncated string at most @width points long.
- * 
- * Truncates a string, removing characters from the end and 
- * replacing them with "..." 
- * 
- */
-char *
-nautilus_string_ellipsize_end (const char *string, GdkFont *font, int width)
-{
-	int truncated_length;
-	char *result;
-	int resulting_width;
-
-	resulting_width = gdk_string_width (font, string);
-	if (resulting_width <= width) {
-		/* String is already short enough. */
-		return g_strdup (string);
-	}
-	
-	/* Account for the width of the ellipsis. */
-	width -= gdk_string_width (font, ELLIPSIS);
-	
-
-	if (width < 0) {
-		/* No room even for a an ellipsis. */
-		return g_strdup ("");
-	}
-	
-        for (truncated_length = strlen (string) - 1; truncated_length > 0; truncated_length--) {
-        	resulting_width -= gdk_char_width (font, string[truncated_length]);
-        	if (resulting_width <= width) {
-			break;
-        	}
-        }
-	
-	result = g_malloc (truncated_length + strlen (ELLIPSIS) + 1);
-	memcpy (result, string, truncated_length);
-	strcpy (result + truncated_length, ELLIPSIS);
-
-	return result;
-}
-
-/**
- * nautilus_string_ellipsize_middle:
- * 
- * @string: A a string to be ellipsized.
- * @font: A a font used to measure the resulting string width.
- * @width: Desired maximum width in points.
- * Returns: A truncated string at most @width points long.
- * 
- * Truncates a string, removing characters from the middle and 
- * replacing them with "..." 
- * 
- */
-char *
-nautilus_string_ellipsize_middle (const char *string, GdkFont *font, int width)
-{
-	int original_length;
-	int starting_fragment_length;
-	int ending_fragment_offset;
-	int resulting_width;
-	char *result;
-
-	resulting_width = gdk_string_width (font, string);
-	if (resulting_width <= width) {
-		/* String is already short enough. */
-		return g_strdup (string);
-	}
-	
-	/* Account for the width of the ellipsis. */
-	width -= gdk_string_width (font, ELLIPSIS);
-	
-
-	if (width < 0) {
-		/* No room even for a an ellipsis. */
-		return g_strdup ("");
-	}
-
-	/* Split the original string into two halves */
-	original_length = strlen (string);
-	
-	g_assert (original_length > 0);
-	
-	starting_fragment_length = original_length / 2;
-	ending_fragment_offset = starting_fragment_length + 1;
-	
-	/* Shave off a character at a time from the first and the second half
-	 * until we can fit
-	 */
-	resulting_width -= gdk_char_width (font, string[ending_fragment_offset - 1]);
-	
-	/* depending on whether the original string length is odd or even, start by
-	 * shaving off the characters from the starting or ending fragment
-	 */
-	switch (original_length % 2) {
-	        while (TRUE) {
-	case 0:
-			if (resulting_width <= width) {
-				break;
-			}
-			g_assert (starting_fragment_length > 0 || ending_fragment_offset < original_length);
-			if (starting_fragment_length > 0) {
-				starting_fragment_length--;
-			}
-			resulting_width -= gdk_char_width (font, string[starting_fragment_length]);
-	case 1:
-			if (resulting_width <= width) {
-				break;
-			}
-			g_assert (starting_fragment_length > 0 || ending_fragment_offset < original_length);
-			if (ending_fragment_offset < original_length) {
-				ending_fragment_offset++;
-			}
-			resulting_width -= gdk_char_width (font, string[ending_fragment_offset - 1]);
-	        }
-	}
-	
-	/* patch the two fragments together with an ellipsis */
-	result = g_malloc (starting_fragment_length + (original_length - ending_fragment_offset)
-		+ strlen (ELLIPSIS) + 1);
-	memcpy (result, string, starting_fragment_length);
-	strcpy (result + starting_fragment_length, ELLIPSIS);
-	strcpy (result + starting_fragment_length + strlen (ELLIPSIS), string + ending_fragment_offset);
-
-	return result;
-}
-
-/* Private font things */
-
-/* Find a bold flavor of a font */
-static GdkFont *
-font_get_bold (GdkFont *font)
-{
-	char *name;
-	char *weight_pattern;
-	GdkFont *result = NULL;
-	char *pattern_match;
-	const NautilusStringList *font_list;
-
-	g_return_val_if_fail (font != NULL, NULL);
-
-	name = font_get_name (font);
-
-	/* Replace the weight with a wildard */
-	weight_pattern = xlfd_string_replace_nth (name, XLFD_WEIGHT_INDEX, "*");
-
-	if (weight_pattern == NULL) {
-		g_free (name);
-		gdk_font_ref (font);
-		return font;
-	}
-
-	font_list = font_list_fonts_cached (weight_pattern, NULL);
-	
-	/* Find one with a bold weight */
-	pattern_match = nautilus_string_list_find_by_function (font_list,
-							       font_entry_has_bold_weight_test,
-							       NULL);
-
-	if (pattern_match != NULL) {
-		char *weight_name;
-		char *bold_name;
-
-		/* Find out the bold weight */
-		weight_name = xlfd_string_get_nth (pattern_match, XLFD_WEIGHT_INDEX);
-		
-		/* Set the bold weight on the original name */
-		bold_name = xlfd_string_replace_nth (name, XLFD_WEIGHT_INDEX, weight_name);
-		
-		result = gdk_fontset_load (bold_name);
-		if (result == NULL) {
-			gdk_font_ref (font);
-			result = font;
-		}
-
-		g_free (bold_name);
-		g_free (weight_name);
-	} else {
-		/* If no font was found, return the source font */
-		gdk_font_ref (font);
-		result = font;
-	}
-
-	g_free (pattern_match);
-	g_free (weight_pattern);
-	g_free (name);
-
-	return result;
-}
-
-/* A wrapper for XListFonts() */
-static NautilusStringList *
-font_list_fonts (const char *pattern)
-{
-	NautilusStringList *list;
-	char **font_names;
-	int actual_count;
-	int i;
-
-	font_names = XListFonts (GDK_DISPLAY (), pattern, MAX_FONTS, &actual_count);
-
-	if (font_names == NULL || actual_count <= 0) {
-		return NULL;
-	}
-
-	list = nautilus_string_list_new (FALSE);
-
-	for (i = 0; i < actual_count; i++) {
-		nautilus_string_list_insert (list, font_names[i]);
-	}
-
-	XFreeFontNames (font_names);
-
-	return list;
-}
-
-/* A version of list_fonts that returns a cached value.  In general
- * I dont hesitate to copy string lists around to avoid the caller
- * having to decide to free or not.  However, list_fonts is a very 
- * special case.  It is an expensive operation, and one that can
- * be liberally called from Nautilus.  For example, the sidebar title
- * results in many such queries being made.  Further, we have profiler
- * evidence to indicate that the specific operation of listing fonts
- * is responsible for a not insignificant amount of starvation of the 
- * gnome vfs working thread.  So there.
- */
-static GHashTable *font_list_table = NULL;
-
-typedef struct
-{
-	char *pattern;
-	NautilusStringList *font_list;
-} FontListEntry;
-
-static void
-font_list_table_free_one_node (gpointer key,
-			       gpointer value,
-			       gpointer callback_data)
-{
-	FontListEntry *entry;
-
-	g_return_if_fail (key != NULL);
-	g_return_if_fail (value != NULL);
-
-	entry = value;
-	g_free (entry->pattern);
-	nautilus_string_list_free (entry->font_list);
-	g_free (entry);
-}
-
-static void
-font_list_table_free (void)
-{
-	if (font_list_table != NULL) {
-		g_hash_table_foreach (font_list_table, font_list_table_free_one_node, NULL);
-		g_hash_table_destroy (font_list_table);
-	}
-
-	font_list_table = NULL;
-}
-
-/* Return a cached list of fonts.  If a compare_function is given, the
- * list will be sorted accordingly.  As such, the sorting state of the 
- * cached font list is undefined if the compare_function is NULL.
- */
-static const NautilusStringList *
-font_list_fonts_cached (const char *pattern,
-			GCompareFunc compare_function)
-{
-	FontListEntry *entry;
-
-	g_return_val_if_fail (pattern != NULL, NULL);
-
-	if (font_list_table == NULL) {
-		font_list_table = g_hash_table_new (g_str_hash, g_str_equal);
-		g_atexit (font_list_table_free);
-	}
-
-	g_assert (font_list_table != NULL);
-	entry = g_hash_table_lookup (font_list_table, pattern);
-
-	if (entry != NULL) {
-		g_assert (entry->font_list != NULL);
-		if (compare_function != NULL) {
-			nautilus_string_list_sort_by_function (entry->font_list, compare_function);
-		}
-		return entry->font_list;
-	}
-
-	entry = g_new0 (FontListEntry, 1);
-	entry->pattern = g_strdup (pattern);
-	entry->font_list = font_list_fonts (pattern);
-
-	if (entry->font_list == NULL) {
-		g_free (entry->pattern);
-		g_free (entry);
-		return NULL;
-	}
-
-	g_hash_table_insert (font_list_table, entry->pattern, entry);
-
-	g_assert (g_hash_table_lookup (font_list_table, entry->pattern) == entry);
-
-	if (compare_function != NULL) {
-		nautilus_string_list_sort_by_function (entry->font_list, compare_function);
-	}
-	return entry->font_list;
-}
-
-/* Return the font name - an xlfd string used by Gdk to allocate the font */
-static char *
-font_get_name (const GdkFont *font)
-{
-	GdkFontPrivate *font_private;
-	const char *font_name;
-
-	g_return_val_if_fail (font != NULL, NULL);
-
-	font_private = (GdkFontPrivate *)font;
-
-	if (font_private->names == NULL) {
-		return NULL;
-	}
-
-	/* FIXME bugzilla.eazel.com xxxx:
-	 * When do we need to look beyong the first entry ?
-	 */
-	font_name = g_slist_nth_data (font_private->names, 0);
-
-	return font_name ? g_strdup (font_name) : NULL;
-}
-
-/* Return the size of a font in pixels.  If the source font's
- * XLFD spec is in something other than pixels (say points)
- * then the result is 0.  If the font is scalable, then the
- * result is 0 as well.  This function is only useful with
- * bitmap fonts. 
- */
-static guint
-font_get_size_in_pixels (const GdkFont *font)
-{
-	char *name;
-	int size_in_pixels = 0;
-
-	g_return_val_if_fail (font != NULL, 0);
-
-	name = font_get_name (font);
-	size_in_pixels = xlfd_string_get_nth_as_int (name, XLFD_SIZE_IN_PIXELS_INDEX);
-	g_free (name);
-
-	return (size_in_pixels != XLFD_INVALID_VALUE) ? size_in_pixels : 0;
-}
-
-static GdkFont *fixed_font = NULL;
-
-static void
-unref_fixed_font (void)
-{
-	gdk_font_unref (fixed_font);
-}
-
-/**
- * nautilus_gdk_font_get_fixed
- *
- * Returns: A fixed GdkFont that is guranteed to exist even in the
- *          most limited user environment.  The fixed font is
- *          useful in making code that deals with fonts simple by always
- *          having the ability to fallback to this font.
- *
- *          You should free the font with gdk_font_unref() when you are
- *          done with it.
- */
-GdkFont *
-nautilus_gdk_font_get_fixed (void)
-{
-	if (fixed_font == NULL) {
-		/* Note to localizers: This is the name of the font used
-		 * when no other font can be found. It must be guaranteed
-		 * to exist, * even in the most limited user environment
-		 */
-		fixed_font = gdk_fontset_load (_("fixed"));
-		g_assert (fixed_font != NULL);
-		g_atexit (unref_fixed_font);
-	}
-
-	gdk_font_ref (fixed_font);
-	return fixed_font;
-}
-
-/* Return a new string with just the nth XLFD string entry.  */
-static char *
-xlfd_string_get_nth (const char *xlfd_string,
-		     guint n)
-{
-	NautilusStringList *list;
-	char *result;
-	
-	g_return_val_if_fail (xlfd_string != NULL, NULL);
-	g_return_val_if_fail (n <= XLFD_MAX_INDEX, NULL);
-	
-	list = nautilus_string_list_new_from_tokens (xlfd_string, "-", FALSE);
-
-	if (nautilus_string_list_get_length (list) != (XLFD_MAX_INDEX + 1)) {
-		nautilus_string_list_free (list);
-		return NULL;
-	}
-
-	result = nautilus_string_list_nth (list, n);
-
-	nautilus_string_list_free (list);
-
-	return result;
-}
-
-/* Replace the nth entry of an XLFD string.  Return the new string. */
-static char *
-xlfd_string_replace_nth (const char *xlfd_string,
-			 guint n,
-			 const char *replace_string)
-{
-	char *new_xlfd_string;
-	NautilusStringList *list;
-	
-	g_return_val_if_fail (xlfd_string != NULL, NULL);
-
-	if (n > XLFD_MAX_INDEX) {
-		return NULL;
-	}
-
-	list = nautilus_string_list_new_from_tokens (xlfd_string, "-", FALSE);
-
-	if (nautilus_string_list_get_length (list) != (XLFD_MAX_INDEX + 1)) {
-		nautilus_string_list_free (list);
-		return NULL;
-	}
-
-	nautilus_string_list_modify_nth (list, n, replace_string);
-	new_xlfd_string = nautilus_string_list_as_concatenated_string (list, "-");
-	nautilus_string_list_free (list);
-
-	return new_xlfd_string;
-}
-
-/* Return the nth entry as an integer.  Wildcards get the special
- * XLFD_WILDCARD_VALUE value. */
-static int
-xlfd_string_get_nth_as_int (const char *xlfd_string,
-			    guint n)
-{
-	char *nth;
-	int value;
-	
-	g_return_val_if_fail (xlfd_string != NULL, XLFD_INVALID_VALUE);
-
-	if (n > XLFD_MAX_INDEX) {
-		return XLFD_INVALID_VALUE;
-	}
-	
-	nth = xlfd_string_get_nth (xlfd_string, n);
-
-	if (nth == NULL) {
-		return XLFD_INVALID_VALUE;
-	}
-
-	if (nautilus_str_is_equal (nth, "*")) {
-		return XLFD_WILDCARD_VALUE;
-	}
-	
-	if (!nautilus_eat_str_to_int (nth, &value)) {
-		return XLFD_INVALID_VALUE;
-	}
-
-	return value;
-}
-
-/* Return whether the given xlfd string pattern represents a 
- * scalable non bitmap font */
-static gboolean
-xlfd_string_is_scalable_non_bitmap (const char *xlfd_string)
-{
-	int size_in_pixels;
-	int size_in_points;
-	int horizontal_resolution;
-	int vertical_resolution;
-
-	size_in_pixels = xlfd_string_get_nth_as_int (xlfd_string,
-						     XLFD_SIZE_IN_PIXELS_INDEX);
-	size_in_points = xlfd_string_get_nth_as_int (xlfd_string,
-						     XLFD_SIZE_IN_POINTS_INDEX);
-	horizontal_resolution = xlfd_string_get_nth_as_int (xlfd_string,
-							    XLFD_HORIZONTAL_RESOLUTION_INDEX);
-	vertical_resolution = xlfd_string_get_nth_as_int (xlfd_string,
-							  XLFD_VERTICAL_RESOLUTION_INDEX);
-	
-	return size_in_pixels == 0
-		&& size_in_points == 0
-		&& horizontal_resolution == 0
-		&& vertical_resolution == 0;
-}
-
-/* Return whether the given xlfd string pattern indicates a 
- * scalable non bitmap font */
-static gboolean
-xlfd_string_could_be_scalable_non_bitmap (const char *xlfd_string)
-{
-	char *temp[4];
-	gboolean is_scalable_non_bitmap;
-	const NautilusStringList *font_list;
-	char *scalable_non_bitmap_match;
-	
-	g_return_val_if_fail (xlfd_string != NULL, FALSE);
-
-	/* Replace all the size entries with wildcards */
-	temp[0] = xlfd_string_replace_nth (xlfd_string, XLFD_SIZE_IN_PIXELS_INDEX, "*");
-	temp[1] = xlfd_string_replace_nth (temp[0], XLFD_SIZE_IN_POINTS_INDEX, "*");
-	temp[2] = xlfd_string_replace_nth (temp[1], XLFD_HORIZONTAL_RESOLUTION_INDEX, "*");
-	temp[3] = xlfd_string_replace_nth (temp[2], XLFD_VERTICAL_RESOLUTION_INDEX, "*");
-	
-	font_list = font_list_fonts_cached (temp[3], NULL);
-
-	/* Look for the entry that indicate this is a scalable non bitmap font */
-	scalable_non_bitmap_match = nautilus_string_list_find_by_function (font_list,
-									   font_entry_is_scalable_non_bitmap_test,
-									   NULL);
-	
-	is_scalable_non_bitmap = scalable_non_bitmap_match != NULL;
-	g_free (scalable_non_bitmap_match);
-
-	g_free (temp[0]);
-	g_free (temp[1]);
-	g_free (temp[2]);
-	g_free (temp[3]);
-
-	return is_scalable_non_bitmap;
-}
-
-/* Allocate a new xlfd string with the given attrbitues. */
-char *
-nautilus_gdk_font_xlfd_string_new (const char *foundry,
-				   const char *family,
-				   const char *weight,
-				   const char *slant,
-				   const char *set_width,
-				   const char *add_style,
-				   guint size_in_pixels)
-{
-	char *font_name;
-
-        const char *points = "*";
-        const char *hor_res = "*";
-        const char *ver_res = "*";
-        const char *spacing = "*";
-        const char *average_width = "*";
-        const char *char_set_registry = "*";
-        const char *char_set_encoding = "*";
-
-
-	/*                             +---------------------------------------------------- foundry
-	                               |  +------------------------------------------------- family
-				       |  |  +---------------------------------------------- weight
-				       |  |  |  +------------------------------------------- slant 
-				       |  |  |  |  +---------------------------------------- sel_width
-				       |  |  |  |  |  +------------------------------------- add-style
-				       |  |  |  |  |  |  +---------------------------------- pixels   	
-				       |  |  |  |  |  |  |  +------------------------------- points  
-				       |  |  |  |  |  |  |  |  +---------------------------- hor_res        
-				       |  |  |  |  |  |  |  |  |  +------------------------- ver_res        
-				       |  |  |  |  |  |  |  |  |  |  +---------------------- spacing        
-				       |  |  |  |  |  |  |  |  |  |  |  +------------------- average_width        
-				       |  |  |  |  |  |  |  |  |  |  |  |  +---------------- char_set_registry
-				       |  |  |  |  |  |  |  |  |  |  |  |  |  +------------- char_set_encoding */
-	font_name = g_strdup_printf ("-%s-%s-%s-%s-%s-%s-%d-%s-%s-%s-%s-%s-%s-%s",
-				     foundry,
-				     family,
-				     weight,
-				     slant,
-				     set_width,
-				     add_style,
-				     size_in_pixels,
-				     points,
-				     hor_res,
-				     ver_res,
-				     spacing,
-				     average_width,
-				     char_set_registry,
-				     char_set_encoding);
-	
-	return font_name;
-}
-
-/* Test whether the given XLFD string has a bold weight */
-static gboolean
-font_entry_has_bold_weight_test (const NautilusStringList *string_list,
-				 const char *string,
-				 gpointer callback_data)
-{
- 	gboolean result;
-	char *weight;
-
-	g_return_val_if_fail (string_list != NULL, FALSE);
-	g_return_val_if_fail (string != NULL, FALSE);
-
-	weight = xlfd_string_get_nth (string, XLFD_WEIGHT_INDEX);
-
-	/* FIXME bugzilla.eazel.com xxxx:
-	 * Are there any other bold weights besides there 3 ?
-	 */
- 	result = 
- 		nautilus_str_is_equal (weight, "bold")
- 		|| nautilus_str_is_equal (weight, "demibold")
- 		|| nautilus_str_is_equal (weight, "black");
-
- 	g_free (weight);
-
- 	return result;
-}
-
-/* Test whether the given XLFD string has an italic slant */
-static gboolean
-font_entry_has_italic_slant_test (const NautilusStringList *string_list,
-				  const char *string,
-				  gpointer callback_data)
-{
- 	gboolean result;
-	char *slant;
-
-	g_return_val_if_fail (string_list != NULL, FALSE);
-	g_return_val_if_fail (string != NULL, FALSE);
-
-	slant = xlfd_string_get_nth (string, XLFD_SLANT_INDEX);
-
-	/* FIXME bugzilla.eazel.com xxxx:
-	 * Are there any other italic slants besides these 2 ?
-	 * i = italic
-	 * o = oblique
-	 */
- 	result = 
- 		nautilus_str_is_equal (slant, "i")
- 		|| nautilus_str_is_equal (slant, "o");
-
- 	g_free (slant);
-
- 	return result;
-}
-
-/* Test whether the given XLFD string indicates a scalable non bitmap font */
-static gboolean
-font_entry_is_scalable_non_bitmap_test (const NautilusStringList *string_list,
-					const char *string,
-					gpointer callback_data)
-{
-	g_return_val_if_fail (string_list != NULL, FALSE);
-	g_return_val_if_fail (string != NULL, FALSE);
-
-	return xlfd_string_is_scalable_non_bitmap (string);
-}
-
-/* Compare the "size_in_points" entry of 2 XLFD strings */
-static int
-compare_xlfd_by_size_in_points (gconstpointer string_a,
-				gconstpointer string_b)
-{
-	int a;
-	int b;
-
-	g_return_val_if_fail (string_a != NULL, 0);
-	g_return_val_if_fail (string_b != NULL, 0);
-	
-	a = xlfd_string_get_nth_as_int (string_a, XLFD_SIZE_IN_POINTS_INDEX);
-	b = xlfd_string_get_nth_as_int (string_b, XLFD_SIZE_IN_POINTS_INDEX);
-
- 	if (a < b) {
- 		return -1;
-	}
-
- 	if (a == b) {
- 		return 0;
- 	}
-
-	return 1;
-}
-
-/* Compare the "size_in_pixels" entry of 2 XLFD strings */
-static int
-compare_xlfd_by_size_in_pixels (gconstpointer string_a,
-				gconstpointer string_b)
-{
-	int a;
-	int b;
-
-	g_return_val_if_fail (string_a != NULL, 0);
-	g_return_val_if_fail (string_b != NULL, 0);
-	
-	a = xlfd_string_get_nth_as_int (string_a, XLFD_SIZE_IN_PIXELS_INDEX);
-	b = xlfd_string_get_nth_as_int (string_b, XLFD_SIZE_IN_PIXELS_INDEX);
-
- 	if (a < b) {
- 		return -1;
-	}
-
- 	if (a == b) {
- 		return 0;
- 	}
-
-	return 1;
-}
-
-#if ! defined (NAUTILUS_OMIT_SELF_CHECK)
-
-typedef enum {
-	NAUTILUS_ELLIPSIZE_START,
-	NAUTILUS_ELLIPSIZE_MIDDLE,
-	NAUTILUS_ELLIPSIZE_END
-} NautilusEllipsizeMode;
-
-/* Testing string truncation is tough because we do not know what font/
- * font metrics to expect on a given system. To work around this we use
- * a substring of the original, measure it's length using the given font, 
- * add the length of the "..." string and use that for truncation.
- * The result should then be the substring prepended with a "..."
- */
-static char *
-nautilus_self_check_ellipsize (const char *string, const char *truncate_to_length_string, NautilusEllipsizeMode mode)
-{
-	GdkFont *font;
-	int truncation_length;
-	char *result;
-
-
-	/* any old font will do */
-	font = nautilus_gdk_font_get_fixed ();
-	g_assert (font);
-
-	/* measure the length we want to truncate to */
-	truncation_length = gdk_string_width (font, truncate_to_length_string);
-	truncation_length += gdk_string_width (font, ELLIPSIS);
-
-	switch (mode) {
-		case NAUTILUS_ELLIPSIZE_START:
-			result = nautilus_string_ellipsize_start (string, font, truncation_length);
-			break;
-		case NAUTILUS_ELLIPSIZE_MIDDLE:
-			result = nautilus_string_ellipsize_middle (string, font, truncation_length);
-			break;
-		case NAUTILUS_ELLIPSIZE_END:
-			result = nautilus_string_ellipsize_end (string, font, truncation_length);
-			break;
-		default:
-			g_assert_not_reached ();
-			result = NULL;
-			break;
-	};
-	
-	gdk_font_unref (font);
-
-	return result;
-}
-
-static char *
-nautilus_self_check_ellipsize_start (const char *string, const char *truncate_to_length_string)
-{
-	return nautilus_self_check_ellipsize (string, truncate_to_length_string, NAUTILUS_ELLIPSIZE_START);
-}
-
-static char *
-nautilus_self_check_ellipsize_middle (const char *string, const char *truncate_to_length_string)
-{
-	return nautilus_self_check_ellipsize (string, truncate_to_length_string, NAUTILUS_ELLIPSIZE_MIDDLE);
-}
-
-static char *
-nautilus_self_check_ellipsize_end (const char *string, const char *truncate_to_length_string)
-{
-	return nautilus_self_check_ellipsize (string, truncate_to_length_string, NAUTILUS_ELLIPSIZE_END);
-}
-
-void
-nautilus_self_check_gdk_font_extensions (void)
-{
-	GdkFont *font;
-
-	/* used to test ellipsize routines */
-	font = nautilus_gdk_font_get_fixed ();
-	g_assert (font);
-
-	/* nautilus_string_ellipsize_start */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_start ("012345678", "0012345678"), "012345678");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_start ("012345678", "012345678"), "012345678");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_start ("012345678", "45678"), "...45678");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_start ("012345678", "5678"), "...5678");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_start ("012345678", "678"), "...678");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_start ("012345678", "78"), "...78");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_start ("012345678", "8"), "...8");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_start ("", font, 100), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_start ("test", font, 0), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_start ("test", font, gdk_string_width (font, "...") - 1), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_start ("test", font, gdk_string_width (font, "...")), "...");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("012345678", "0123456789"), "012345678");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("012345678", "012345678"), "012345678");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("012345678", "01278"), "012...78");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("012345678", "0178"), "01...78");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("012345678", "018"), "01...8");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("012345678", "08"), "0...8");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("012345678", "0"), "0...");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("0123456789", "0123456789"), "0123456789");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("0123456789", "012789"), "012...789");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("0123456789", "01289"), "012...89");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("0123456789", "0189"), "01...89");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("0123456789", "019"), "01...9");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("0123456789", "09"), "0...9");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_middle ("0123456789", "0"), "0...");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_middle ("", font, 100), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_middle ("test", font, 0), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_middle ("test", font, gdk_string_width (font, "...") - 1), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_middle ("test", font, gdk_string_width (font, "...")), "...");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_end ("012345678", "0123456789"), "012345678");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_end ("012345678", "012345678"), "012345678");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_end ("012345678", "01234"), "01234...");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_end ("012345678", "0123"), "0123...");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_end ("012345678", "012"), "012...");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_end ("012345678", "01"), "01...");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_self_check_ellipsize_end ("012345678", "0"), "0...");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_end ("", font, 100), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_end ("test", font, 0), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_end ("test", font, gdk_string_width (font, "...") - 1), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_ellipsize_end ("test", font, gdk_string_width (font, "...")), "...");
-
-	gdk_font_unref (font);
-
-	/* xlfd_string_get_nth */
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x", 1), "x");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x-", 1), "x");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x", 1), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", 1), "1");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", 2), "2");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", XLFD_WEIGHT_INDEX), "3");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", XLFD_SIZE_IN_PIXELS_INDEX), "7");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", XLFD_SIZE_IN_POINTS_INDEX), "8");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", XLFD_MAX_INDEX), "d");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_get_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", XLFD_MAX_INDEX - 1), "c");
-
-	/* xlfd_string_get_nth_as_int */
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x", 1), XLFD_INVALID_VALUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-1-2-3-4-5-6-7-8-9-10-11-12-13-14", 1), 1);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-1-2-3-4-5-6-7-8-9-10-11-12-13-14", 2), 2);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-1-2-3-4-5-6-7-8-9-10-11-12-13-14", XLFD_WEIGHT_INDEX), 3);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-1-2-3-4-5-6-7-8-9-10-11-12-13-14", XLFD_SIZE_IN_PIXELS_INDEX), 7);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-1-2-3-4-5-6-7-8-9-10-11-12-13-14", XLFD_SIZE_IN_POINTS_INDEX), 8);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-1-2-3-4-5-6-7-8-9-10-11-12-13-14", XLFD_MAX_INDEX), 14);
-	NAUTILUS_CHECK_INTEGER_RESULT (xlfd_string_get_nth_as_int ("-1-2-3-4-5-6-7-8-9-10-11-12-13-14", XLFD_MAX_INDEX - 1), 13);
-	
-	/* xlfd_string_replace_nth */
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("", 1, "X"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-", 1, "X"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b", 1, "X"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-", 1, "X"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c", 1, "X"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", 1, "X"), "-X-2-3-4-5-6-7-8-9-0-a-b-c-d");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", 2, "X"), "-1-X-3-4-5-6-7-8-9-0-a-b-c-d");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", 15, "X"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", 16, "X"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", 14, "X"), "-1-2-3-4-5-6-7-8-9-0-a-b-c-X");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", 13, "X"), "-1-2-3-4-5-6-7-8-9-0-a-b-X-d");
-	NAUTILUS_CHECK_STRING_RESULT (xlfd_string_replace_nth ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d", 12, "X"), "-1-2-3-4-5-6-7-8-9-0-a-X-c-d");
-
-
-	/* xlfd_string_is_scalable_non_bitmap */
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap (""), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-3"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-3-4-5-6-7-8-9-0-a-b"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-3-4-5-6-7-8-9-0-a-b-"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-3-4-5-6-7-8-9-0-a-b-c"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-3-4-5-6-7-8-9-0-a-b-c-"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-*-*-*-*-*-*-*-*-*-*-*-*-*-*"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-*-*-*-*-*-*-0-0-0-0-*-*-*-*"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-*-*-*-*-*-*-0-0-0-0-*-*-*-*-"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-*-*-*-*-*-*-0-0-0-0-*-*-*-*-*"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-0-0-0-0-0-0-0-0-0-0-0-0-0-0"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-0-0-0-0-0-0-0-0-0-0-0-0-0-0-"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-0-0-0-0-0-0-0-0-0-0-0-0-0-0-0"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d-e"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d-e-"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (xlfd_string_is_scalable_non_bitmap ("-1-2-3-4-5-6-7-8-9-0-a-b-c-d-e-f"), FALSE);
-}
-
-#endif /* ! NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-gdk-font-extensions.h b/libnautilus-private/nautilus-gdk-font-extensions.h
deleted file mode 100644
index 7eef3a114..000000000
--- a/libnautilus-private/nautilus-gdk-font-extensions.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gdk-extensions.h: GdkFont extensions.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>, 
-            Pavel Cisler <pavel@eazel.com>,
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_GDK_FONT_EXTENSIONS_H
-#define NAUTILUS_GDK_FONT_EXTENSIONS_H
-
-#include <gdk/gdk.h>
-
-/* Misc GdkFont helper functions */
-gboolean nautilus_gdk_font_equal               (GdkFont    *font_a_null_allowed,
-						GdkFont    *font_b_null_allowed);
-GdkFont *nautilus_gdk_font_get_largest_fitting (GdkFont    *font,
-						const char *text,
-						int         available_width,
-						int         minimum_acceptable_font_size,
-						int         maximum_acceptable_font_size);
-GdkFont *nautilus_gdk_font_get_bold            (GdkFont    *plain);
-GdkFont *nautilus_gdk_font_get_italic          (GdkFont    *plain);
-GdkFont *nautilus_gdk_font_get_larger          (GdkFont    *font,
-						int         num_sizes);
-GdkFont *nautilus_gdk_font_get_smaller         (GdkFont    *font,
-						int         num_sizes);
-GdkFont *nautilus_gdk_font_get_fixed           (void);
-char *   nautilus_string_ellipsize_start       (const char *original,
-						GdkFont    *font,
-						int         length);
-char *	 nautilus_string_ellipsize_end	       (const char *string,
-						GdkFont    *font,
-						int 	   width);
-char *	 nautilus_string_ellipsize_middle      (const char *string,
-						GdkFont    *font,
-						int 	   width);
-char *   nautilus_gdk_font_xlfd_string_new     (const char *foundry,
-						const char *family,
-						const char *weight,
-						const char *slant,
-						const char *set_width,
-						const char *add_style,
-						guint       size_in_pixels);
-
-#endif /* NAUTILUS_GDK_FONT_EXTENSIONS_H */
diff --git a/libnautilus-private/nautilus-gdk-pixbuf-extensions.c b/libnautilus-private/nautilus-gdk-pixbuf-extensions.c
deleted file mode 100644
index 8a0b81ad4..000000000
--- a/libnautilus-private/nautilus-gdk-pixbuf-extensions.c
+++ /dev/null
@@ -1,1572 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gdk-pixbuf-extensions.c: Routines to augment what's in gdk-pixbuf.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-gdk-pixbuf-extensions.h"
-
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-string.h"
-#include "nautilus-art-gtk-extensions.h"
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-debug-drawing.h"
-#include <gdk-pixbuf/gdk-pixbuf-loader.h>
-#include <gdk/gdkx.h>
-#include <gdk/gdkprivate.h>
-#include <libgnomevfs/gnome-vfs-async-ops.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <math.h>
-#include <png.h>
-
-#define LOAD_BUFFER_SIZE 4096
-
-struct NautilusPixbufLoadHandle {
-	GnomeVFSAsyncHandle *vfs_handle;
-	NautilusPixbufLoadCallback callback;
-	gpointer callback_data;
-	GdkPixbufLoader *loader;
-	char buffer[LOAD_BUFFER_SIZE];
-};
-
-static void file_opened_callback (GnomeVFSAsyncHandle      *vfs_handle,
-				  GnomeVFSResult            result,
-				  gpointer                  callback_data);
-static void file_read_callback   (GnomeVFSAsyncHandle      *vfs_handle,
-				  GnomeVFSResult            result,
-				  gpointer                  buffer,
-				  GnomeVFSFileSize          bytes_requested,
-				  GnomeVFSFileSize          bytes_read,
-				  gpointer                  callback_data);
-static void file_closed_callback (GnomeVFSAsyncHandle      *handle,
-				  GnomeVFSResult            result,
-				  gpointer                  callback_data);
-static void load_done            (NautilusPixbufLoadHandle *handle,
-				  GnomeVFSResult            result,
-				  gboolean		    get_pixbuf);
-
-/**
- * nautilus_gdk_pixbuf_list_ref
- * @pixbuf_list: A list of GdkPixbuf objects.
- *
- * Refs all the pixbufs.
- **/
-void
-nautilus_gdk_pixbuf_list_ref (GList *pixbuf_list)
-{
-	g_list_foreach (pixbuf_list, (GFunc) gdk_pixbuf_ref, NULL);
-}
-
-/**
- * nautilus_gdk_pixbuf_list_free
- * @pixbuf_list: A list of GdkPixbuf objects.
- *
- * Unrefs all the pixbufs, then frees the list.
- **/
-void
-nautilus_gdk_pixbuf_list_free (GList *pixbuf_list)
-{
-	nautilus_g_list_free_deep_custom (pixbuf_list, (GFunc) gdk_pixbuf_unref, NULL);
-}
-
-GdkPixbuf *
-nautilus_gdk_pixbuf_load (const char *uri)
-{
-	GnomeVFSResult result;
-	GnomeVFSHandle *handle;
-	char buffer[LOAD_BUFFER_SIZE];
-	GnomeVFSFileSize bytes_read;
-	GdkPixbufLoader *loader;
-	GdkPixbuf *pixbuf;	
-
-	g_return_val_if_fail (uri != NULL, NULL);
-
-	result = gnome_vfs_open (&handle,
-				 uri,
-				 GNOME_VFS_OPEN_READ);
-	if (result != GNOME_VFS_OK) {
-		return NULL;
-	}
-
-	loader = gdk_pixbuf_loader_new ();
-	while (1) {
-		result = gnome_vfs_read (handle,
-					 buffer,
-					 sizeof (buffer),
-					 &bytes_read);
-		if (result != GNOME_VFS_OK) {
-			break;
-		}
-		if (bytes_read == 0) {
-			break;
-		}
-		if (!gdk_pixbuf_loader_write (loader,
-					      buffer,
-					      bytes_read)) {
-			result = GNOME_VFS_ERROR_WRONG_FORMAT;
-			break;
-		}
-	}
-
-	if (result != GNOME_VFS_OK && result != GNOME_VFS_ERROR_EOF) {
-		gtk_object_unref (GTK_OBJECT (loader));
-		gnome_vfs_close (handle);
-		return NULL;
-	}
-
-	gnome_vfs_close (handle);
-	gdk_pixbuf_loader_close (loader);
-
-	pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-	if (pixbuf != NULL) {
-		gdk_pixbuf_ref (pixbuf);
-	}
-	gtk_object_unref (GTK_OBJECT (loader));
-
-	return pixbuf;
-}
-
-NautilusPixbufLoadHandle *
-nautilus_gdk_pixbuf_load_async (const char *uri,
-				NautilusPixbufLoadCallback callback,
-				gpointer callback_data)
-{
-	NautilusPixbufLoadHandle *handle;
-
-	handle = g_new0 (NautilusPixbufLoadHandle, 1);
-	handle->callback = callback;
-	handle->callback_data = callback_data;
-
-	gnome_vfs_async_open (&handle->vfs_handle,
-			      uri,
-			      GNOME_VFS_OPEN_READ,
-			      file_opened_callback,
-			      handle);
-
-	return handle;
-}
-
-static void
-file_opened_callback (GnomeVFSAsyncHandle *vfs_handle,
-		      GnomeVFSResult result,
-		      gpointer callback_data)
-{
-	NautilusPixbufLoadHandle *handle;
-
-	handle = callback_data;
-	g_assert (handle->vfs_handle == vfs_handle);
-
-	if (result != GNOME_VFS_OK) {
-		handle->vfs_handle = NULL;
-		load_done (handle, result, FALSE);
-		return;
-	}
-
-	handle->loader = gdk_pixbuf_loader_new ();
-
-	gnome_vfs_async_read (handle->vfs_handle,
-			      handle->buffer,
-			      sizeof (handle->buffer),
-			      file_read_callback,
-			      handle);
-}
-
-static void
-file_read_callback (GnomeVFSAsyncHandle *vfs_handle,
-		    GnomeVFSResult result,
-		    gpointer buffer,
-		    GnomeVFSFileSize bytes_requested,
-		    GnomeVFSFileSize bytes_read,
-		    gpointer callback_data)
-{
-	NautilusPixbufLoadHandle *handle;
-
-	handle = callback_data;
-	g_assert (handle->vfs_handle == vfs_handle);
-	g_assert (handle->buffer == buffer);
-
-	if (result == GNOME_VFS_OK && bytes_read != 0) {
-		if (!gdk_pixbuf_loader_write (handle->loader,
-					      buffer,
-					      bytes_read)) {
-			result = GNOME_VFS_ERROR_WRONG_FORMAT;
-		}
-		gnome_vfs_async_read (handle->vfs_handle,
-				      handle->buffer,
-				      sizeof (handle->buffer),
-				      file_read_callback,
-				      handle);
-		return;
-	}
-
-	load_done (handle, result, result == GNOME_VFS_OK || result == GNOME_VFS_ERROR_EOF);
-}
-
-static void
-file_closed_callback (GnomeVFSAsyncHandle *handle,
-		      GnomeVFSResult result,
-		      gpointer callback_data)
-{
-	g_assert (callback_data == NULL);
-}
-
-static void
-free_pixbuf_load_handle (NautilusPixbufLoadHandle *handle)
-{
-	if (handle->loader != NULL) {
-		gtk_object_unref (GTK_OBJECT (handle->loader));
-	}
-	g_free (handle);
-}
-
-static void
-load_done (NautilusPixbufLoadHandle *handle, GnomeVFSResult result, gboolean get_pixbuf)
-{
-	GdkPixbuf *pixbuf;
-
-	if (handle->loader != NULL) {
-		gdk_pixbuf_loader_close (handle->loader);
-	}
-
-	pixbuf = get_pixbuf ? gdk_pixbuf_loader_get_pixbuf (handle->loader) : NULL;
-	
-	if (handle->vfs_handle != NULL) {
-		gnome_vfs_async_close (handle->vfs_handle, file_closed_callback, NULL);
-	}
-
-	handle->callback (result, pixbuf, handle->callback_data);
-
-	free_pixbuf_load_handle (handle);
-}
-
-void
-nautilus_cancel_gdk_pixbuf_load (NautilusPixbufLoadHandle *handle)
-{
-	if (handle == NULL) {
-		return;
-	}
-	if (handle->vfs_handle != NULL) {
-		gnome_vfs_async_cancel (handle->vfs_handle);
-	}
-	free_pixbuf_load_handle (handle);
-}
-
-/* return the average value of each component */
-void 
-nautilus_gdk_pixbuf_average_value (GdkPixbuf *pixbuf, GdkColor *color)
-{
-	uint red_total, green_total, blue_total, count;
-	int row, column;
-	int width, height;
-	int row_stride;
-	guchar *pixsrc, *original_pixels;
-	
-	gboolean has_alpha;
-	
-	red_total = 0;
-	green_total = 0;
-	blue_total = 0;
-	count = 0;
-
-	/* iterate through the pixbuf, counting up each component */
-	has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
-	width = gdk_pixbuf_get_width (pixbuf);
-	height = gdk_pixbuf_get_height (pixbuf);
-	row_stride = gdk_pixbuf_get_rowstride (pixbuf);
-	original_pixels = gdk_pixbuf_get_pixels (pixbuf);
-
-	for (row = 0; row < height; row++) {
-		pixsrc = original_pixels + (row * row_stride);
-		for (column = 0; column < width; column++) {
-			red_total += *pixsrc++;
-			green_total += *pixsrc++;
-			blue_total += *pixsrc++;
-			count += 1;
-			if (has_alpha) {
-				pixsrc++;
-			}
-		}
-	}
-
-	color->red =   (red_total   * 256) / count;
-	color->green = (green_total * 256) / count;
-	color->blue =  (blue_total  * 256) / count;
-}
-
-double
-nautilus_gdk_scale_to_fit_factor (int width, int height,
-				  int max_width, int max_height,
-				  int *scaled_width, int *scaled_height)
-{
-	double scale_factor;
-	
-	scale_factor = MIN (max_width  / (double) width, max_height / (double) height);
-
-	*scaled_width  = floor (width * scale_factor + .5);
-	*scaled_height = floor (height * scale_factor + .5);
-
-	return scale_factor;
-}
-
-/* Returns a scaled copy of pixbuf, preserving aspect ratio. The copy will
- * be scaled as large as possible without exceeding the specified width and height.
- */
-GdkPixbuf *
-nautilus_gdk_pixbuf_scale_to_fit (GdkPixbuf *pixbuf, int max_width, int max_height)
-{
-	int scaled_width;
-	int scaled_height;
-
-	nautilus_gdk_scale_to_fit_factor (gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf),
-					  max_width, max_height,
-					  &scaled_width, &scaled_height);
-
-	return gdk_pixbuf_scale_simple (pixbuf, scaled_width, scaled_height, GDK_INTERP_BILINEAR);	
-}
-
-/* Returns a copy of pixbuf scaled down, preserving aspect ratio, to fit
- * within the specified width and height. If it already fits, a copy of
- * the original, without scaling, is returned.
- */
-GdkPixbuf *
-nautilus_gdk_pixbuf_scale_down_to_fit (GdkPixbuf *pixbuf, int max_width, int max_height)
-{
-	int scaled_width;
-	int scaled_height;
-	
-	double scale_factor;
-
-	scale_factor = nautilus_gdk_scale_to_fit_factor (gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf),
-							 max_width, max_height,
-							 &scaled_width, &scaled_height);
-
-	if (scale_factor >= 1.0) {
-		return gdk_pixbuf_copy (pixbuf);
-	} else {				
-		return gdk_pixbuf_scale_simple (pixbuf, scaled_width, scaled_height, GDK_INTERP_BILINEAR);	
-	}
-}
-
-/**
- * nautilus_gdk_pixbuf_is_valid:
- * @pixbuf: A GdkPixbuf
- *
- * Return value: A boolean indicating whether the given pixbuf is valid.
- *
- * A pixbuf is valid if:
- * 
- *   1. It is non NULL
- *   2. It is has non NULL pixel data.
- *   3. It has width and height greater than 0.
- */
-gboolean
-nautilus_gdk_pixbuf_is_valid (const GdkPixbuf *pixbuf)
-{
-	return ((pixbuf != NULL)
-		&& (gdk_pixbuf_get_pixels (pixbuf) != NULL)
-		&& (gdk_pixbuf_get_width (pixbuf) > 0)
-		&& (gdk_pixbuf_get_height (pixbuf) > 0));
-}
-
-/**
- * nautilus_gdk_pixbuf_get_dimensions:
- * @pixbuf: A GdkPixbuf
- *
- * Return value: The dimensions of the pixbuf as a NautilusDimensions.
- *
- * This function is useful in code that uses libart rect 
- * intersection routines.
- */
-NautilusDimensions
-nautilus_gdk_pixbuf_get_dimensions (const GdkPixbuf *pixbuf)
-{
-	NautilusDimensions dimensions;
-
-	g_return_val_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf), NAUTILUS_DIMENSIONS_EMPTY);
-
-	dimensions.width = gdk_pixbuf_get_width (pixbuf);
-	dimensions.height = gdk_pixbuf_get_height (pixbuf);
-
-	return dimensions;
-}
-
-/**
- * nautilus_gdk_pixbuf_fill_rectangle:
- * @pixbuf: Target pixbuf to fill into.
- * @area: Rectangle to fill.
- * @color: The color to use.
- *
- * Fill the rectangle with the the given color.
- * Use the given rectangle if not NULL.
- * If rectangle is NULL, fill the whole pixbuf.
- */
-void
-nautilus_gdk_pixbuf_fill_rectangle_with_color (GdkPixbuf *pixbuf,
-					       const ArtIRect *area,
-					       guint32 color)
-{
-	ArtIRect target;
-	guchar red;
-	guchar green;
-	guchar blue;
-	guchar alpha;
-	guchar *pixels;
-	gboolean has_alpha;
-	guint pixel_offset;
-	guint rowstride;
-	guchar *row_offset;
-	int x;
-	int y;
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-
-	target = nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, area);
-	if (art_irect_empty (&target)) {
-		return;
-	}
-
-	pixels = gdk_pixbuf_get_pixels (pixbuf);
-	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-	has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
-	pixel_offset = has_alpha ? 4 : 3;
-	red = NAUTILUS_RGBA_COLOR_GET_R (color);
-	green = NAUTILUS_RGBA_COLOR_GET_G (color);
-	blue = NAUTILUS_RGBA_COLOR_GET_B (color);
-	alpha = NAUTILUS_RGBA_COLOR_GET_A (color);
-
-	row_offset = pixels + target.y0 * rowstride;
-
-	for (y = target.y0; y < target.y1; y++) {
-		guchar *offset = row_offset + (target.x0 * pixel_offset);
-		
-		for (x = target.x0; x < target.x1; x++) {
-			*(offset++) = red;
-			*(offset++) = green;
-			*(offset++) = blue;
-			
-			if (has_alpha) {
-				*(offset++) = alpha;
-			}
-			
-		}
-
-		row_offset += rowstride;
-	}
-}
-
-/* utility routine for saving a pixbuf to a png file.
- * This was adapted from Iain Holmes' code in gnome-iconedit, and probably
- * should be in a utility library, possibly in gdk-pixbuf itself.
- */
-gboolean
-nautilus_gdk_pixbuf_save_to_file (const GdkPixbuf *pixbuf,
-				  const char *file_name)
-{
-	FILE *handle;
-  	char *buffer;
-	gboolean has_alpha;
-	int width, height, depth, rowstride;
-  	guchar *pixels;
-  	png_structp png_ptr;
-  	png_infop info_ptr;
-  	png_text text[2];
-  	int i;
-
-	g_return_val_if_fail (pixbuf != NULL, FALSE);
-	g_return_val_if_fail (file_name != NULL, FALSE);
-	g_return_val_if_fail (file_name[0] != '\0', FALSE);
-
-        handle = fopen (file_name, "wb");
-        if (handle == NULL) {
-        	return FALSE;
-	}
-
-	png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-	if (png_ptr == NULL) {
-		fclose (handle);
-		return FALSE;
-	}
-
-	info_ptr = png_create_info_struct (png_ptr);
-	if (info_ptr == NULL) {
-		png_destroy_write_struct (&png_ptr, (png_infopp)NULL);
-		fclose (handle);
-	    	return FALSE;
-	}
-
-	if (setjmp (png_ptr->jmpbuf)) {
-		png_destroy_write_struct (&png_ptr, &info_ptr);
-		fclose (handle);
-		return FALSE;
-	}
-
-	png_init_io (png_ptr, handle);
-
-        has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
-	width = gdk_pixbuf_get_width (pixbuf);
-	height = gdk_pixbuf_get_height (pixbuf);
-	depth = gdk_pixbuf_get_bits_per_sample (pixbuf);
-	pixels = gdk_pixbuf_get_pixels (pixbuf);
-	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-
-	png_set_IHDR (png_ptr, info_ptr, width, height,
-			depth, PNG_COLOR_TYPE_RGB_ALPHA,
-			PNG_INTERLACE_NONE,
-			PNG_COMPRESSION_TYPE_DEFAULT,
-			PNG_FILTER_TYPE_DEFAULT);
-
-	/* Some text to go with the png image */
-	text[0].key = "Title";
-	text[0].text = (char *) file_name;
-	text[0].compression = PNG_TEXT_COMPRESSION_NONE;
-	text[1].key = "Software";
-	text[1].text = "Nautilus Thumbnail";
-	text[1].compression = PNG_TEXT_COMPRESSION_NONE;
-	png_set_text (png_ptr, info_ptr, text, 2);
-
-	/* Write header data */
-	png_write_info (png_ptr, info_ptr);
-
-	/* if there is no alpha in the data, allocate buffer to expand into */
-	if (has_alpha) {
-		buffer = NULL;
-	} else {
-		buffer = g_malloc(4 * width);
-	}
-	
-	/* pump the raster data into libpng, one scan line at a time */	
-	for (i = 0; i < height; i++) {
-		if (has_alpha) {
-			png_bytep row_pointer = pixels;
-			png_write_row (png_ptr, row_pointer);
-		} else {
-			/* expand RGB to RGBA using an opaque alpha value */
-			int x;
-			char *buffer_ptr = buffer;
-			char *source_ptr = pixels;
-			for (x = 0; x < width; x++) {
-				*buffer_ptr++ = *source_ptr++;
-				*buffer_ptr++ = *source_ptr++;
-				*buffer_ptr++ = *source_ptr++;
-				*buffer_ptr++ = 255;
-			}
-			png_write_row (png_ptr, (png_bytep) buffer);		
-		}
-		pixels += rowstride;
-	}
-	
-	png_write_end (png_ptr, info_ptr);
-	png_destroy_write_struct (&png_ptr, &info_ptr);
-	
-	g_free (buffer);
-		
-	fclose (handle);
-	return TRUE;
-}
-
-void
-nautilus_gdk_pixbuf_ref_if_not_null (GdkPixbuf *pixbuf_or_null)
-{
-	if (pixbuf_or_null != NULL) {
-		gdk_pixbuf_ref (pixbuf_or_null);
-	}
-}
-
-void
-nautilus_gdk_pixbuf_unref_if_not_null (GdkPixbuf *pixbuf_or_null)
-{
-	if (pixbuf_or_null != NULL) {
-		gdk_pixbuf_unref (pixbuf_or_null);
-	}
-}
-
-void
-nautilus_gdk_pixbuf_draw_to_drawable (const GdkPixbuf *pixbuf,
-				      GdkDrawable *drawable,
-				      GdkGC *gc,
-				      int source_x,
-				      int source_y,
-				      const ArtIRect *destination_area,
-				      GdkRgbDither dither,
-				      GdkPixbufAlphaMode alpha_compositing_mode,
-				      int alpha_threshold)
-{
-	NautilusDimensions dimensions;
-	ArtIRect target;
-	ArtIRect source;
-	int target_width;
-	int target_height;
-	int source_width;
-	int source_height;
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (drawable != NULL);
-	g_return_if_fail (gc != NULL);
-	g_return_if_fail (destination_area != NULL);
- 	g_return_if_fail (destination_area->x1 > destination_area->x0);
- 	g_return_if_fail (destination_area->y1 > destination_area->y0);
- 	g_return_if_fail (alpha_threshold > NAUTILUS_OPACITY_FULLY_TRANSPARENT);
- 	g_return_if_fail (alpha_threshold <= NAUTILUS_OPACITY_FULLY_OPAQUE);
- 	g_return_if_fail (alpha_compositing_mode >= GDK_PIXBUF_ALPHA_BILEVEL);
- 	g_return_if_fail (alpha_compositing_mode <= GDK_PIXBUF_ALPHA_FULL);
-
-	dimensions = nautilus_gdk_pixbuf_get_dimensions (pixbuf);
-	
-	g_return_if_fail (source_x >= 0);
-	g_return_if_fail (source_y >= 0);
-	g_return_if_fail (source_x < dimensions.width);
-	g_return_if_fail (source_y < dimensions.height);
-
-	/* Clip the destination area to the pixbuf dimensions; bail if no work */
-	target = nautilus_gdk_pixbuf_intersect (pixbuf,
-						destination_area->x0,
-						destination_area->y0,
-						destination_area);
-	if (art_irect_empty (&target)) {
-		return;
-	}
-
-	/* Assign the source area */
-	nautilus_art_irect_assign (&source,
-				   source_x,
-				   source_y,
-				   dimensions.width - source_x,
-				   dimensions.height - source_y);
-
-	/* Adjust the target width if the source area is smaller than the
-	 * source pixbuf dimensions */
-	target_width = target.x1 - target.x0;
-	target_height = target.y1 - target.y0;
-	source_width = source.x1 - source.x0;
-	source_height = source.y1 - source.y0;
-
-	target.x1 = target.x0 + MIN (target_width, source_width);
-	target.y1 = target.y0 + MIN (target_height, source_height);
-
-	if (gdk_pixbuf_get_has_alpha (pixbuf)) {
-		gdk_pixbuf_render_to_drawable_alpha ((GdkPixbuf *) pixbuf,
-						     drawable,
-						     source.x0,
-						     source.y0,
-						     target.x0,
-						     target.y0,
-						     target.x1 - target.x0,
-						     target.y1 - target.y0,
-						     alpha_compositing_mode,
-						     alpha_threshold,
-						     dither,
-						     0,
-						     0);
-	} else {
-		gdk_pixbuf_render_to_drawable ((GdkPixbuf *) pixbuf,
-					       drawable,
-					       gc,
-					       source.x0,
-					       source.y0,
-					       target.x0,
-					       target.y0,
-					       target.x1 - target.x0,
-					       target.y1 - target.y0,
-					       dither,
-					       0,
-					       0);
-	}
-}
-
-/**
- * nautilus_gdk_pixbuf_draw_to_pixbuf:
- * @pixbuf: The source pixbuf to draw.
- * @destination_pixbuf: The destination pixbuf.
- * @source_x: The source pixbuf x coordiate to composite from.
- * @source_y: The source pixbuf y coordiate to composite from.
- * @destination_area: The destination area within the destination pixbuf.
- *                    This area will be clipped if invalid in any way.
- *
- * Copy one pixbuf onto another another..  This function has some advantages
- * over plain gdk_pixbuf_copy_area():
- *
- *   Composition paramters (source coordinate, destination area) are
- *   given in a way that is consistent with the rest of the extensions
- *   in this file.  That is, it matches the declaration of
- *   nautilus_gdk_pixbuf_draw_to_pixbuf_alpha() and 
- *   nautilus_gdk_pixbuf_draw_to_drawable() very closely.
- *
- *   All values are clipped to make sure they are valid.
- *
- */
-void
-nautilus_gdk_pixbuf_draw_to_pixbuf (const GdkPixbuf *pixbuf,
-				    GdkPixbuf *destination_pixbuf,
-				    int source_x,
-				    int source_y,
-				    const ArtIRect *destination_area)
-{
-	NautilusDimensions dimensions;
-	ArtIRect target;
-	ArtIRect source;
-	int target_width;
-	int target_height;
-	int source_width;
-	int source_height;
-	
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (destination_pixbuf));
-	g_return_if_fail (destination_area != NULL);
-	g_return_if_fail (destination_area->x1 > destination_area->x0);
-	g_return_if_fail (destination_area->y1 > destination_area->y0);
-	
-	dimensions = nautilus_gdk_pixbuf_get_dimensions (pixbuf);
-
-	g_return_if_fail (source_x >= 0);
-	g_return_if_fail (source_y >= 0);
-	g_return_if_fail (source_x < dimensions.width);
-	g_return_if_fail (source_y < dimensions.height);
-
-	/* Clip the destination area to the pixbuf dimensions; bail if no work */
-	target = nautilus_gdk_pixbuf_intersect (destination_pixbuf, 0, 0, destination_area);
-	if (art_irect_empty (&target)) {
- 		return;
- 	}
-
-	/* Assign the source area */
-	nautilus_art_irect_assign (&source,
-				   source_x,
-				   source_y,
-				   dimensions.width - source_x,
-				   dimensions.height - source_y);
-
-	/* Adjust the target width if the source area is smaller than the
-	 * source pixbuf dimensions */
-	target_width = target.x1 - target.x0;
-	target_height = target.y1 - target.y0;
-	source_width = source.x1 - source.x0;
-	source_height = source.y1 - source.y0;
-
-	target.x1 = target.x0 + MIN (target_width, source_width);
-	target.y1 = target.y0 + MIN (target_height, source_height);
-
-	gdk_pixbuf_copy_area (pixbuf,
-			      source.x0,
-			      source.y0,
-			      target.x1 - target.x0,
-			      target.y1 - target.y0,
-			      destination_pixbuf,
-			      target.x0,
-			      target.y0);
-}
-
-/**
- * nautilus_gdk_pixbuf_draw_to_pixbuf_alpha:
- * @pixbuf: The source pixbuf to draw.
- * @destination_pixbuf: The destination pixbuf.
- * @source_x: The source pixbuf x coordiate to composite from.
- * @source_y: The source pixbuf y coordiate to composite from.
- * @destination_area: The destination area within the destination pixbuf.
- *                    This area will be clipped if invalid in any way.
- * @opacity: The opacity of the drawn tiles where 0 <= opacity <= 255.
- * @interpolation_mode: The interpolation mode.  See <gdk-pixbuf.h>
- *
- * Composite one pixbuf over another.  This function has some advantages
- * over plain gdk_pixbuf_composite():
- *
- *   Composition paramters (source coordinate, destination area) are
- *   given in a way that is consistent with the rest of the extensions
- *   in this file.  That is, it matches the declaration of
- *   nautilus_gdk_pixbuf_draw_to_pixbuf() and 
- *   nautilus_gdk_pixbuf_draw_to_drawable() very closely.
- *
- *   All values are clipped to make sure they are valid.
- *
- *   Workaround a limitation in gdk_pixbuf_composite() that does not allow
- *   the source (x,y) to be greater than (0,0)
- * 
- */
-void
-nautilus_gdk_pixbuf_draw_to_pixbuf_alpha (const GdkPixbuf *pixbuf,
-					  GdkPixbuf *destination_pixbuf,
-					  int source_x,
-					  int source_y,
-					  const ArtIRect *destination_area,
-					  int opacity,
-					  GdkInterpType interpolation_mode)
-{
-	NautilusDimensions dimensions;
-	ArtIRect target;
-	ArtIRect source;
-	int target_width;
-	int target_height;
-	int source_width;
-	int source_height;
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (destination_pixbuf));
-	g_return_if_fail (destination_area != NULL);
-	g_return_if_fail (destination_area->x1 > destination_area->x0);
-	g_return_if_fail (destination_area->y1 > destination_area->y0);
-	g_return_if_fail (opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-	g_return_if_fail (interpolation_mode >= GDK_INTERP_NEAREST);
-	g_return_if_fail (interpolation_mode <= GDK_INTERP_HYPER);
-	
-	dimensions = nautilus_gdk_pixbuf_get_dimensions (pixbuf);
-
-	g_return_if_fail (source_x >= 0);
-	g_return_if_fail (source_y >= 0);
-	g_return_if_fail (source_x < dimensions.width);
-	g_return_if_fail (source_y < dimensions.height);
-
-	/* Clip the destination area to the pixbuf dimensions; bail if no work */
-	/* Clip the destination area to the pixbuf dimensions; bail if no work */
-	target = nautilus_gdk_pixbuf_intersect (destination_pixbuf, 0, 0, destination_area);
-	if (art_irect_empty (&target)) {
- 		return;
- 	}
-
-	/* Assign the source area */
-	nautilus_art_irect_assign (&source,
-				   source_x,
-				   source_y,
-				   dimensions.width - source_x,
-				   dimensions.height - source_y);
-	
-	/* Adjust the target width if the source area is smaller than the
-	 * source pixbuf dimensions */
-	target_width = target.x1 - target.x0;
-	target_height = target.y1 - target.y0;
-	source_width = source.x1 - source.x0;
-	source_height = source.y1 - source.y0;
-
-	target.x1 = target.x0 + MIN (target_width, source_width);
-	target.y1 = target.y0 + MIN (target_height, source_height);
-	
-	/* If the source point is not (0,0), then we need to create a sub pixbuf
-	 * with only the source area.  This is needed to work around a limitation
-	 * in gdk_pixbuf_composite() that requires the source area to be (0,0). */
-	if (source.x0 != 0 || source.y0 != 0) {
-		ArtIRect area;
-		int width;
-		int height;
-
-		width = dimensions.width - source.x0;
-		height = dimensions.height - source.y0;
-		
-		area.x0 = source.x0;
-		area.y0 = source.y0;
-		area.x1 = area.x0 + width;
-		area.y1 = area.y0 + height;
-		
-		pixbuf = nautilus_gdk_pixbuf_new_from_pixbuf_sub_area ((GdkPixbuf *) pixbuf, &area);
-	} else {
-		gdk_pixbuf_ref ((GdkPixbuf *) pixbuf);
-	}
-	
-	gdk_pixbuf_composite (pixbuf,
-			      destination_pixbuf,
-			      target.x0,
-			      target.y0,
-			      target.x1 - target.x0,
-			      target.y1 - target.y0,
-			      target.x0,
-			      target.y0,
-			      1.0,
-			      1.0,
-			      interpolation_mode,
-			      opacity);
-
-	gdk_pixbuf_unref ((GdkPixbuf *) pixbuf);
-}
-
-static void
-pixbuf_destroy_callback (guchar *pixels,
-			 gpointer callback_data)
-{
-	g_return_if_fail (pixels != NULL);
-	g_return_if_fail (callback_data != NULL);
-
-	gdk_pixbuf_unref ((GdkPixbuf *) callback_data);
-}
-
-/**
- * nautilus_gdk_pixbuf_new_from_pixbuf_sub_area:
- * @pixbuf: The source pixbuf.
- * @area: The area within the source pixbuf to use for the sub pixbuf.
- *        This area needs to be contained within the bounds of the 
- *        source pixbuf, otherwise it will be clipped to that. 
- *
- * Return value: A newly allocated pixbuf that shares the pixel data
- *               of the source pixbuf in order to represent a sub area.
- *
- * Create a pixbuf from a sub area of another pixbuf.  The resulting pixbuf
- * will share the pixel data of the source pixbuf.  Memory bookeeping is
- * all taken care for the caller.  All you need to do is gdk_pixbuf_unref()
- * the resulting pixbuf to properly free resources.
- */
-GdkPixbuf *
-nautilus_gdk_pixbuf_new_from_pixbuf_sub_area (GdkPixbuf *pixbuf,
-					      const ArtIRect *area)
-{
-	GdkPixbuf *sub_pixbuf;
-	ArtIRect target;
-	guchar *pixels;
-	
-	g_return_val_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf), NULL);
-	g_return_val_if_fail (area != NULL, NULL);
-	g_return_val_if_fail (area->x1 > area->x0, NULL);
-	g_return_val_if_fail (area->y1 > area->y0, NULL);
-	
-	/* Clip the pixbuf by the given area; bail if no work */
-	target = nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, area);
-	if (art_irect_empty (&target)) {
- 		return NULL;
- 	}
-
-	/* Since we are going to be sharing the given pixbuf's data, we need 
-	 * to ref it.  It will be unreffed in the destroy function above */
-	gdk_pixbuf_ref (pixbuf);
-
-	/* Compute the offset into the pixel data */
-	pixels = 
-		gdk_pixbuf_get_pixels (pixbuf)
-		+ (target.y0 * gdk_pixbuf_get_rowstride (pixbuf))
-		+ (target.x0 * (gdk_pixbuf_get_has_alpha (pixbuf) ? 4 : 3));
-	
-	/* Make a pixbuf pretending its real estate is the sub area */
-	sub_pixbuf = gdk_pixbuf_new_from_data (pixels,
-					       GDK_COLORSPACE_RGB,
-					       gdk_pixbuf_get_has_alpha (pixbuf),
-					       8,
-					       nautilus_art_irect_get_width (&target),
-					       nautilus_art_irect_get_height (&target),
-					       gdk_pixbuf_get_rowstride (pixbuf),
-					       pixbuf_destroy_callback,
-					       pixbuf);
-
-	return sub_pixbuf;
-}
-
-/**
- * nautilus_gdk_pixbuf_new_from_existing_buffer:
- * @buffer: The existing buffer.
- * @buffer_rowstride: The existing buffer's rowstride.
- * @buffer_has_alpha: A boolean value indicating whether the buffer has alpha.
- * @area: The area within the existing buffer to use for the pixbuf.
- *        This area needs to be contained within the bounds of the 
- *        buffer, otherwise memory will be trashed.
- *
- * Return value: A newly allocated pixbuf that uses the existing buffer
- *               for its pixel data.
- *
- * Create a pixbuf from an existing buffer.
- *
- * The resulting pixbuf is only valid for as long as &buffer is valid.  It is
- * up to the caller to make sure they both exist in the same scope.
- * Also, it is up to the caller to make sure that the given area is fully 
- * contained in the buffer, otherwise memory trashing will happen.
- */
-GdkPixbuf *
-nautilus_gdk_pixbuf_new_from_existing_buffer (guchar *buffer,
-					      int buffer_rowstride,
-					      gboolean buffer_has_alpha,
-					      const ArtIRect *area)
-{
-	GdkPixbuf *pixbuf;
-	guchar *pixels;
-	
-	g_return_val_if_fail (buffer != NULL, NULL);
-	g_return_val_if_fail (buffer_rowstride > 0, NULL);
-	g_return_val_if_fail (area != NULL, NULL);
-	g_return_val_if_fail (area->x1 > area->x0, NULL);
-	g_return_val_if_fail (area->y1 > area->y0, NULL);
-	
-	/* Compute the offset into the buffer */
-	pixels = 
-		buffer
-		+ (area->y0 * buffer_rowstride)
-		+ (area->x0 * (buffer_has_alpha ? 4 : 3));
-	
-	pixbuf = gdk_pixbuf_new_from_data (pixels,
-					   GDK_COLORSPACE_RGB,
-					   buffer_has_alpha,
-					   8,
-					   nautilus_art_irect_get_width (area),
-					   nautilus_art_irect_get_height (area),
-					   buffer_rowstride,
-					   NULL,
-					   NULL);
-
-	return pixbuf;
-}
-
-/* The tile algorithm is identical whether the destination is 
- * a pixbuf or a drawable.  So, we use a simple callback
- * mechanism to share it regardless of the destination.
- */
-typedef struct {
-	GdkPixbuf *destination_pixbuf;
-	int opacity;
-	GdkInterpType interpolation_mode;
-} PixbufTileData;
-
-typedef struct {
-	GdkDrawable *drawable;
-	GdkGC *gc;
-	GdkRgbDither dither;
-	GdkPixbufAlphaMode alpha_compositing_mode;
-	int alpha_threshold;
-} DrawableTileData;
-
-typedef void (* DrawPixbufTileCallback) (const GdkPixbuf *pixbuf,
-					 int x,
-					 int y,
-					 const ArtIRect *destination_area,
-					 gpointer callback_data);
-
-/* The shared tiliing implementation */
-static void
-pixbuf_draw_tiled (const GdkPixbuf *pixbuf,
-		   const NautilusDimensions *destination_dimensions,
-		   const ArtIRect *destination_area,
-		   int tile_width,
-		   int tile_height,
-		   int tile_origin_x,
-		   int tile_origin_y,
-		   DrawPixbufTileCallback callback,
-		   gpointer callback_data)
-{
-	ArtIRect target;
-	int x;
-	int y;
-	NautilusArtIPoint min_point;
-	NautilusArtIPoint max_point;
-	int num_left;
-	int num_above;
-
-	g_return_if_fail (pixbuf != NULL);
-	g_return_if_fail (destination_dimensions != NULL);
-	g_return_if_fail (tile_width > 0);
-	g_return_if_fail (tile_height > 0);
-	g_return_if_fail (tile_width <= gdk_pixbuf_get_width (pixbuf));
-	g_return_if_fail (tile_height <= gdk_pixbuf_get_height (pixbuf));
-	g_return_if_fail (callback != NULL);
-
-	/* FIXME: This is confusing.  Instead of passing in the destination_dimensions
-	 *        I should just pass in the destination pixbuf, so that we can use
-	 *        nautilus_gdk_pixbuf_intersect directly on that.
-	 */
-
-	/* Clip the destination area to the destination pixbuf; bail if no work */
-	if (destination_area != NULL) {
-		ArtIRect tmp;
-
-		tmp = nautilus_art_irect_assign_dimensions (0, 0, destination_dimensions);
-		art_irect_intersect (&target, destination_area, &tmp);
-		
-		if (art_irect_empty (&target)) {
-			return;
-		}
-	} else {
-		target = nautilus_art_irect_assign_dimensions (0, 0, destination_dimensions);
-	}
-
-	/* The number of tiles left and above the target area */
-	num_left = (target.x0 - tile_origin_x) / tile_width;
-	num_above = (target.y0 - tile_origin_y) / tile_height;
-	
-	min_point.x = tile_origin_x - tile_width + (num_left * tile_width);
-	min_point.y = tile_origin_y - tile_height + (num_above * tile_height);
-	
-	max_point.x = (target.x1 + 2 * tile_width);
-	max_point.y = (target.y1 + 2 * tile_height);
-	
-	for (y = min_point.y; y <= max_point.y; y += tile_height) {
-		for (x = min_point.x; x <= max_point.x; x += tile_width) {
-			ArtIRect current;
-			ArtIRect area;
-
-			nautilus_art_irect_assign (&current, x, y, tile_width, tile_height);
-
-			/* FIXME: A potential speed improvement here would be to clip only the
-			 * first and last rectangles, not the ones in between.  
-			 */
-			art_irect_intersect (&area, &target, &current);
-
-			if (!art_irect_empty (&area)) {
-				g_assert (area.x0 >= x);
-				g_assert (area.y0 >= y);
-
-				(* callback) (pixbuf,
-					      area.x0 - x,
-					      area.y0 - y,
-					      &area,
-					      callback_data);
-			}
-		}
-	}
-}
-
-static void
-draw_tile_to_pixbuf_callback (const GdkPixbuf *pixbuf,
-			      int x,
-			      int y,
-			      const ArtIRect *area,
-			      gpointer callback_data)
-{
-	PixbufTileData *pixbuf_tile_data;
-
-	g_return_if_fail (pixbuf != NULL);
-	g_return_if_fail (area != NULL);
-	g_return_if_fail (callback_data != NULL);
-
-	pixbuf_tile_data = (PixbufTileData *) callback_data;
-
-	if (pixbuf_tile_data->opacity == NAUTILUS_OPACITY_FULLY_TRANSPARENT) {
-		nautilus_gdk_pixbuf_draw_to_pixbuf (pixbuf,
-						    pixbuf_tile_data->destination_pixbuf,
-						    x,
-						    y,
-						    area);
-	} else {
-		nautilus_gdk_pixbuf_draw_to_pixbuf_alpha (pixbuf,
-							  pixbuf_tile_data->destination_pixbuf,
-							  x,
-							  y,
-							  area,
-							  pixbuf_tile_data->opacity,
-							  pixbuf_tile_data->interpolation_mode);
-	}
-}
-
-static void
-draw_tile_to_drawable_callback (const GdkPixbuf *pixbuf,
-				int x,
-				int y,
-				const ArtIRect *area,
-				gpointer callback_data)
-{
-	DrawableTileData *drawable_tile_data;
-	
-	g_return_if_fail (pixbuf != NULL);
-	g_return_if_fail (area != NULL);
-	g_return_if_fail (callback_data != NULL);
-
-	drawable_tile_data = (DrawableTileData *) callback_data;
-
-	nautilus_gdk_pixbuf_draw_to_drawable (pixbuf,
-					      drawable_tile_data->drawable,
-					      drawable_tile_data->gc,
-					      x,
-					      y,
-					      area,
-					      drawable_tile_data->dither,
-					      drawable_tile_data->alpha_compositing_mode,
-					      drawable_tile_data->alpha_threshold);
-}
-
-/**
- * nautilus_gdk_pixbuf_draw_to_pixbuf_tiled:
- * @pixbuf: Source tile pixbuf.
- * @destination_pixbuf: Destination pixbuf.
- * @destination_area: Area of the destination pixbuf to tile.
- * @tile_width: Width of the tile.  This can be less than width of the
- *              tile pixbuf, but not greater.
- * @tile_height: Height of the tile.  This can be less than width of the
- *               tile pixbuf, but not greater.
- * @tile_origin_x: The x coordinate of the tile origin.  Can be negative.
- * @tile_origin_y: The y coordinate of the tile origin.  Can be negative.
- * @opacity: The opacity of the drawn tiles where 0 <= opacity <= 255.
- * @interpolation_mode: The interpolation mode.  See <gdk-pixbuf.h>
- *
- * Fill an area of a GdkPixbuf with a tile.
- */
-void
-nautilus_gdk_pixbuf_draw_to_pixbuf_tiled (const GdkPixbuf *pixbuf,
-					  GdkPixbuf *destination_pixbuf,
-					  const ArtIRect *destination_area,
-					  int tile_width,
-					  int tile_height,
-					  int tile_origin_x,
-					  int tile_origin_y,
-					  int opacity,
-					  GdkInterpType interpolation_mode)
-{
-	PixbufTileData pixbuf_tile_data;
-	NautilusDimensions destination_dimensions;
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (destination_pixbuf));
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (tile_width > 0);
-	g_return_if_fail (tile_height > 0);
-	g_return_if_fail (tile_width <= gdk_pixbuf_get_width (pixbuf));
-	g_return_if_fail (tile_height <= gdk_pixbuf_get_height (pixbuf));
-	g_return_if_fail (opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-	g_return_if_fail (interpolation_mode >= GDK_INTERP_NEAREST);
-	g_return_if_fail (interpolation_mode <= GDK_INTERP_HYPER);
-
-	destination_dimensions = nautilus_gdk_pixbuf_get_dimensions (destination_pixbuf);
-
-	pixbuf_tile_data.destination_pixbuf = destination_pixbuf;
-	pixbuf_tile_data.opacity = opacity;
-	pixbuf_tile_data.interpolation_mode = interpolation_mode;
-
-	pixbuf_draw_tiled (pixbuf,
-			   &destination_dimensions,
-			   destination_area,
-			   tile_width,
-			   tile_height,
-			   tile_origin_x,
-			   tile_origin_y,
-			   draw_tile_to_pixbuf_callback,
-			   &pixbuf_tile_data);
-}
-
-/**
- * nautilus_gdk_pixbuf_draw_to_drawable_tiled:
- * @pixbuf: Source tile pixbuf.
- * @gc: GC for copy area operation.
- * @drawable: Destination drawable.
- * @destination_area: Area of the destination pixbuf to tile.
- * @tile_width: Width of the tile.  This can be less than width of the
- *              tile pixbuf, but not greater.
- * @tile_height: Height of the tile.  This can be less than width of the
- *               tile pixbuf, but not greater.
- * @tile_origin_x: The x coordinate of the tile origin.  Can be negative.
- * @tile_origin_y: The y coordinate of the tile origin.  Can be negative.
- * @dither: Dither type to use (see <gdkrgb.h>)
- * @dither: Dither type to use (see <gdkrgb.h>)
- * @alpha_compositing_mode: The alpha compositing mode.  See <gdk-pixbuf.h>
- *
- * Fill an area of a GdkDrawable with a tile.
- */
-void
-nautilus_gdk_pixbuf_draw_to_drawable_tiled (const GdkPixbuf *pixbuf,
-					    GdkDrawable *drawable,
-					    GdkGC *gc,
-					    const ArtIRect *destination_area,
-					    int tile_width,
-					    int tile_height,
-					    int tile_origin_x,
-					    int tile_origin_y,
-					    GdkRgbDither dither,
-					    GdkPixbufAlphaMode alpha_compositing_mode,
-					    int alpha_threshold)
-{
-	DrawableTileData drawable_tile_data;
-	NautilusDimensions destination_dimensions;
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (drawable != NULL);
-	g_return_if_fail (tile_width > 0);
-	g_return_if_fail (tile_height > 0);
-	g_return_if_fail (tile_width <= gdk_pixbuf_get_width (pixbuf));
-	g_return_if_fail (tile_height <= gdk_pixbuf_get_height (pixbuf));
- 	g_return_if_fail (alpha_threshold > NAUTILUS_OPACITY_FULLY_TRANSPARENT);
- 	g_return_if_fail (alpha_threshold <= NAUTILUS_OPACITY_FULLY_OPAQUE);
- 	g_return_if_fail (alpha_compositing_mode >= GDK_PIXBUF_ALPHA_BILEVEL);
- 	g_return_if_fail (alpha_compositing_mode <= GDK_PIXBUF_ALPHA_FULL);
-
-	destination_dimensions = nautilus_gdk_window_get_dimensions (drawable);
-	
-	drawable_tile_data.drawable = drawable;
-	drawable_tile_data.gc = gc;
-	drawable_tile_data.dither = dither;
-	drawable_tile_data.alpha_compositing_mode = alpha_compositing_mode;
-	drawable_tile_data.alpha_threshold = alpha_threshold;
-	
-	pixbuf_draw_tiled (pixbuf,
-			   &destination_dimensions,
-			   destination_area,
-			   tile_width,
-			   tile_height,
-			   tile_origin_x,
-			   tile_origin_y,
-			   draw_tile_to_drawable_callback,
-			   &drawable_tile_data);
-}
-
-/**
- * nautilus_gdk_pixbuf_get_global_buffer:
- * @minimum_width: The minimum width for the requested buffer.
- * @minimum_height: The minimum height for the requested buffer.
- *
- * Return value: A GdkPixbuf that is at least as big as the passed in 
- *               dimensions.
- *
- * Access a global buffer for temporary GdkPixbuf operations.  
- * The returned buffer will be at least as big as the passed in 
- * dimensions.  The contents are not guaranteed to be anything at
- * anytime.  Also, it is not thread safe at all. */
-
-static GdkPixbuf *global_buffer = NULL;
-
-static void
-destroy_global_buffer (void)
-{
-	if (global_buffer != NULL) {
-		gdk_pixbuf_unref (global_buffer);
-		global_buffer = NULL;
-	}
-}
-
-GdkPixbuf *
-nautilus_gdk_pixbuf_get_global_buffer (int minimum_width,
-				       int minimum_height)
-{
-	static gboolean at_exit_deallocator_installed = FALSE;
-
-	g_return_val_if_fail (minimum_width > 0, NULL);
-	g_return_val_if_fail (minimum_height > 0, NULL);
-
-	if (global_buffer != NULL) {
-		if (gdk_pixbuf_get_width (global_buffer) >= minimum_width
-		    && gdk_pixbuf_get_height (global_buffer) >= minimum_height) {
-			return global_buffer;
-		}
-
-		destroy_global_buffer ();		
-	}
-
-	g_assert (global_buffer == NULL);
-
-	global_buffer = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 
-					minimum_width, minimum_height);
-
-
-	if (at_exit_deallocator_installed == FALSE) {
-		at_exit_deallocator_installed = TRUE;
-		g_atexit (destroy_global_buffer);
-	}
-
-	return global_buffer;
-}
-
-/* Same as gdk_pixbuf_get_from_drawable() except it deals with 
- * race conditions and other evil things that can happen */
-GdkPixbuf *
-nautilus_gdk_pixbuf_get_from_window_safe (GdkWindow *window,
-					  int x,
-					  int y,
-					  int width,
-					  int height)
-{
-	GdkWindowPrivate *window_private;
-	GdkPixbuf *pixbuf;
-	int error_code;
-	GdkWindowType save_window_type;
-	GdkColormap *colormap;
-
-	g_return_val_if_fail (window != NULL, NULL);
-
-
-	/* Push an error handler so that we can catch
-	 * the very rare (but possible) case where 
-	 * the GetImage() request fails.  See HACK2 below
-	 * for a more complete excuse.
-	 */
-	gdk_error_trap_push ();
-
-	/* Save the window type and colormap.  Otherwise
-	 * GdkPixbuf will try to fetch them from a hacked
-	 * window.  See HACK1 below for reason why we
-	 * hack the private window contents.
-	 */
-	save_window_type = gdk_window_get_type (window);
-	colormap = gdk_window_get_colormap (window);
-
-	/* HACK1:
-	 *
-	 * This horrible thing we do here is needed to
-	 * prevent GdkPixbuf from doing geometry sanity
-	 * checks on the window.  By pretending it
-	 * is a Pixmap, we fool GdkPixbuf into not doing
-	 * these checks.  
-	 *
-	 * Why ? The sanity checks that GdkPixbuf does
-	 * are good most of the time, but not 100% of 
-	 * the time.  This is because there is no guarantee
-	 * that when the x server gets the GetImage request,
-	 * the geometry of that window is what GdkPixbuf
-	 * thought it was.
-	 *
-	 * For example, the window manager could have triggered
-	 * a sequence of events causing the window to resize.
-	 */
-	window_private = (GdkWindowPrivate*) window;
-	window_private->window_type = GDK_WINDOW_PIXMAP;
-
-	pixbuf = gdk_pixbuf_get_from_drawable (NULL,
-					       window,
-					       colormap,
-					       x,
-					       y,
-					       0,
-					       0,
-					       width,
-					       height);
-
-	/* Restore the window's guts */
-	window_private->window_type = save_window_type;
-		
-	/* HACK2:
-	 *
-	 * Now we pop the error handler and see whether an error
-	 * occured.
-	 * 
-	 * It is very rare that an error might occur.  The conditions
-	 * under which it might are:
-	 *
-	 * 1) Race condition as described above in HACK1
-	 *
-	 * 2) Bogus coordinates and/or dimensions given to
-	 *    the GetImage() request - which GdkPixbuf cant
-	 *    safely sanity check against.
-	 *
-	 * So, if we get an error, we simply drop this request on
-	 * the floor and return NULL.  The caller needs to deal with
-	 * the fact that their request couldnt be executed.  Most of
-	 * the time, all that is needed is to simply ignore it.
-	 */
-	error_code = gdk_error_trap_pop ();
-	
-	if (error_code != 0) {
-		/* HACK3:
-		 *
-		 * The magical number "8" is the minor x error request
-		 * code.  That is the only error we are expecting.
-		 *
-		 * Otherwise we still return NULL, but the caller
-		 * gets a critical.
-		 */
-		g_return_val_if_fail (error_code == 8, NULL);
-
-		return NULL;
-	}
-
-	return pixbuf;
-}
-
-/**
- * nautilus_gdk_pixbuf_intersect:
- * @pixbuf: A GdkPixbuf.
- * @pixbuf_x: X coordinate of pixbuf.
- * @pixbuf_y: Y coordinate of pixbuf.
- * @rectangle: An ArtIRect or NULL.
- *
- * Return value: The intersection of the pixbuf and the given rectangle.
- *
- * If &rectangle is NULL, then the resulting rectangle is a rectangle at
- * the given orign with the pixbuf's dimensions.
- *
- */
-ArtIRect
-nautilus_gdk_pixbuf_intersect (const GdkPixbuf *pixbuf,
-			       int pixbuf_x,
-			       int pixbuf_y,
-			       const ArtIRect *rectangle)
-{
-	ArtIRect intersection;
-	ArtIRect bounds;
-	NautilusDimensions dimensions;
-
-	g_return_val_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf), NAUTILUS_ART_IRECT_EMPTY);
-
-	dimensions = nautilus_gdk_pixbuf_get_dimensions (pixbuf);
-	bounds = nautilus_art_irect_assign_dimensions (pixbuf_x, pixbuf_y, &dimensions);
-
-	if (rectangle == NULL) {
-		return bounds;
-	}
-
-	art_irect_intersect (&intersection, rectangle, &bounds);
-
-	/* In theory, this is not needed because a rectangle is empty
-	 * regardless of how MUCH negative the dimensions are.  
-	 * However, to make debugging and self checks simpler, we
-	 * consistenly return a standard empty rectangle.
-	 */
-	if (art_irect_empty (&intersection)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	return intersection;
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-void
-nautilus_self_check_gdk_pixbuf_extensions (void)
-{
-	GdkPixbuf *pixbuf;
-	ArtIRect clip_area;
-
-	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 100, 100);
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_gdk_pixbuf_is_valid (pixbuf), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_gdk_pixbuf_is_valid (NULL), FALSE);
-
-	NAUTILUS_CHECK_DIMENSIONS_RESULT (nautilus_gdk_pixbuf_get_dimensions (pixbuf), 100, 100);
-
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, NULL), 0, 0, 100, 100);
-
-	nautilus_art_irect_assign (&clip_area, 0, 0, 0, 0);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 0, 0);
-
-	nautilus_art_irect_assign (&clip_area, 0, 0, 0, 0);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 0, 0);
-
-	nautilus_art_irect_assign (&clip_area, 0, 0, 100, 100);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 100, 100);
-
-	nautilus_art_irect_assign (&clip_area, -10, -10, 100, 100);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 90, 90);
-
-	nautilus_art_irect_assign (&clip_area, -10, -10, 110, 110);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 100, 100);
-
-	nautilus_art_irect_assign (&clip_area, 0, 0, 99, 99);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 99, 99);
-
-	nautilus_art_irect_assign (&clip_area, 0, 0, 1, 1);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 1, 1);
-
-	nautilus_art_irect_assign (&clip_area, -1, -1, 1, 1);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 0, 0);
-
-	nautilus_art_irect_assign (&clip_area, -1, -1, 2, 2);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 1, 1);
-
-	nautilus_art_irect_assign (&clip_area, 100, 100, 1, 1);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 0, 0);
-
-	nautilus_art_irect_assign (&clip_area, 101, 101, 1, 1);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 0, 0, 0, 0);
-
-	nautilus_art_irect_assign (&clip_area, 80, 0, 100, 100);
-	NAUTILUS_CHECK_RECTANGLE_RESULT (nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, &clip_area), 80, 0, 100, 100);
-
-	gdk_pixbuf_unref (pixbuf);
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-gdk-pixbuf-extensions.h b/libnautilus-private/nautilus-gdk-pixbuf-extensions.h
deleted file mode 100644
index 8106c74bc..000000000
--- a/libnautilus-private/nautilus-gdk-pixbuf-extensions.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gdk-pixbuf-extensions.h: Routines to augment what's in gdk-pixbuf.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_GDK_PIXBUF_EXTENSIONS_H
-#define NAUTILUS_GDK_PIXBUF_EXTENSIONS_H
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnomevfs/gnome-vfs-types.h>
-#include <libnautilus-extensions/nautilus-art-extensions.h>
-
-#define NAUTILUS_STANDARD_ALPHA_THRESHHOLD 128
-#define NAUTILUS_OPACITY_FULLY_TRANSPARENT 0
-#define NAUTILUS_OPACITY_FULLY_OPAQUE	   255
-
-typedef struct NautilusPixbufLoadHandle NautilusPixbufLoadHandle;
-typedef void (* NautilusPixbufLoadCallback) (GnomeVFSResult  error,
-					     GdkPixbuf      *pixbuf,
-					     gpointer        callback_data);
-
-/* Convenience functions for lists of GdkPixbuf objects. */
-void                      nautilus_gdk_pixbuf_list_ref                  (GList                      *pixbuf_list);
-void                      nautilus_gdk_pixbuf_list_unref                (GList                      *pixbuf_list);
-void                      nautilus_gdk_pixbuf_list_free                 (GList                      *pixbuf_list);
-
-
-/* Loading a GdkPixbuf with a URI. */
-GdkPixbuf *               nautilus_gdk_pixbuf_load                      (const char                 *uri);
-
-
-/* Same thing async. */
-NautilusPixbufLoadHandle *nautilus_gdk_pixbuf_load_async                (const char                 *uri,
-									 NautilusPixbufLoadCallback  callback,
-									 gpointer                    callback_data);
-void                      nautilus_cancel_gdk_pixbuf_load               (NautilusPixbufLoadHandle   *handle);
-GdkPixbuf *               nautilus_gdk_pixbuf_scale_down_to_fit         (GdkPixbuf                  *pixbuf,
-									 int                         max_width,
-									 int                         max_height);
-GdkPixbuf *               nautilus_gdk_pixbuf_scale_to_fit              (GdkPixbuf                  *pixbuf,
-									 int                         max_width,
-									 int                         max_height);
-double                    nautilus_gdk_scale_to_fit_factor              (int                         width,
-									 int                         height,
-									 int                         max_width,
-									 int                         max_height,
-									 int                        *scaled_width,
-									 int                        *scaled_height);
-
-
-/* return average color values for each component */
-void                      nautilus_gdk_pixbuf_average_value             (GdkPixbuf                  *pixbuf,
-									 GdkColor                   *result_color);
-void                      nautilus_gdk_pixbuf_fill_rectangle_with_color (GdkPixbuf                  *pixbuf,
-									 const ArtIRect             *area,
-									 guint32                     color);
-
-
-/* Save a pixbuf to a png file.  Return value indicates succss/TRUE or failure/FALSE */
-gboolean                  nautilus_gdk_pixbuf_save_to_file              (const GdkPixbuf            *pixbuf,
-									 const char                 *file_name);
-void                      nautilus_gdk_pixbuf_ref_if_not_null           (GdkPixbuf                  *pixbuf_or_null);
-void                      nautilus_gdk_pixbuf_unref_if_not_null         (GdkPixbuf                  *pixbuf_or_null);
-
-
-/* Copy a pixbuf to an area of a GdkDrawable */
-void                      nautilus_gdk_pixbuf_draw_to_drawable          (const GdkPixbuf            *pixbuf,
-									 GdkDrawable                *drawable,
-									 GdkGC                      *gc,
-									 int                         source_x,
-									 int                         source_y,
-									 const ArtIRect             *destination_area,
-									 GdkRgbDither                dither,
-									 GdkPixbufAlphaMode          alpha_compositing_mode,
-									 int                         alpha_threshold);
-
-/* Copy a pixbuf to an area of another pixbuf */
-void                      nautilus_gdk_pixbuf_draw_to_pixbuf            (const GdkPixbuf            *pixbuf,
-									 GdkPixbuf                  *destination_pixbuf,
-									 int                         source_x,
-									 int                         source_y,
-									 const ArtIRect             *destination_area);
-
-
-/* Composite one pixbuf over another with the given opacity */
-void                      nautilus_gdk_pixbuf_draw_to_pixbuf_alpha      (const GdkPixbuf            *pixbuf,
-									 GdkPixbuf                  *destination_pixbuf,
-									 int                         source_x,
-									 int                         source_y,
-									 const ArtIRect             *destination_area,
-									 int                         opacity,
-									 GdkInterpType               interpolation_mode);
-
-
-/* Fill an area of a pixbuf with a tile. */
-void                      nautilus_gdk_pixbuf_draw_to_pixbuf_tiled      (const GdkPixbuf            *pixbuf,
-									 GdkPixbuf                  *destination_pixbuf,
-									 const ArtIRect             *destination_area,
-									 int                         tile_width,
-									 int                         tile_height,
-									 int                         tile_origin_x,
-									 int                         tile_origin_y,
-									 int                         opacity,
-									 GdkInterpType               interpolation_mode);
-
-/* Fill an area of a drawable with a tile. */
-void                      nautilus_gdk_pixbuf_draw_to_drawable_tiled    (const GdkPixbuf            *pixbuf,
-									 GdkDrawable                *drawable,
-									 GdkGC                      *gc,
-									 const ArtIRect             *destination_area,
-									 int                         tile_width,
-									 int                         tile_height,
-									 int                         tile_origin_x,
-									 int                         tile_origin_y,
-									 GdkRgbDither                dither,
-									 GdkPixbufAlphaMode          alpha_compositing_mode,
-									 int                         alpha_threshold);
-
-/* Create a pixbuf from a sub area of another pixbuf */
-GdkPixbuf *               nautilus_gdk_pixbuf_new_from_pixbuf_sub_area  (GdkPixbuf                  *pixbuf,
-									 const ArtIRect             *area);
-/* Create a pixbuf from an existing buffer. */
-GdkPixbuf *               nautilus_gdk_pixbuf_new_from_existing_buffer  (guchar                     *buffer,
-									 int                         buffer_rowstride,
-									 gboolean                    buffer_has_alpha,
-									 const ArtIRect             *area);
-
-/* Access a global buffer for temporary GdkPixbuf operations.  
- * The returned buffer will be at least as big as the passed in 
- * dimensions.  The contents are not guaranteed to be anything at
- * anytime.  Also, it is not thread safe at all.
- */
-GdkPixbuf *               nautilus_gdk_pixbuf_get_global_buffer         (int                         minimum_width,
-									 int                         minimum_height);
-
-/* Same as gdk_pixbuf_get_from_drawable() except it deals with 
- * race conditions and other evil things that can happen */
-GdkPixbuf *               nautilus_gdk_pixbuf_get_from_window_safe      (GdkWindow                  *window,
-									 int                         x,
-									 int                         y,
-									 int                         width,
-									 int                         height);
-/* Determine whether a pixbuf is valid or not */
-gboolean                  nautilus_gdk_pixbuf_is_valid                  (const GdkPixbuf            *pixbuf);
-
-/* Access the dimensions of a pixbuf. */
-NautilusDimensions        nautilus_gdk_pixbuf_get_dimensions            (const GdkPixbuf            *pixbuf);
-
-/* Return the intersection of the pixbuf with the given rectangle. */
-ArtIRect                  nautilus_gdk_pixbuf_intersect                 (const GdkPixbuf            *pixbuf,
-									 int                         pixbuf_x,
-									 int                         pixbuf_y,
-									 const ArtIRect             *rectangle);
-
-#endif /* NAUTILUS_GDK_PIXBUF_EXTENSIONS_H */
diff --git a/libnautilus-private/nautilus-generous-bin.c b/libnautilus-private/nautilus-generous-bin.c
index c7a81b48b..e845b4452 100644
--- a/libnautilus-private/nautilus-generous-bin.c
+++ b/libnautilus-private/nautilus-generous-bin.c
@@ -26,7 +26,7 @@
 #include <config.h>
 #include "nautilus-generous-bin.h"
 
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 static void nautilus_generous_bin_initialize_class (NautilusGenerousBinClass *class);
 static void nautilus_generous_bin_initialize       (NautilusGenerousBin      *box);
@@ -35,7 +35,7 @@ static void nautilus_generous_bin_size_request     (GtkWidget                *wi
 static void nautilus_generous_bin_size_allocate    (GtkWidget                *widget,
 						    GtkAllocation            *allocation);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusGenerousBin, nautilus_generous_bin, GTK_TYPE_BIN)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusGenerousBin, nautilus_generous_bin, GTK_TYPE_BIN)
 
 static void
 nautilus_generous_bin_initialize_class (NautilusGenerousBinClass *klass)
diff --git a/libnautilus-private/nautilus-glib-extensions.c b/libnautilus-private/nautilus-glib-extensions.c
deleted file mode 100644
index c096668ac..000000000
--- a/libnautilus-private/nautilus-glib-extensions.c
+++ /dev/null
@@ -1,1467 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-glib-extensions.c - implementation of new functions that conceptually
-                                belong in glib. Perhaps some of these will be
-                                actually rolled into glib someday.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: John Sullivan <sullivan@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-glib-extensions.h"
-
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-string.h"
-#include <ctype.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <stdlib.h>
-#include <math.h>
-#include <sys/time.h>
-
-/* Legal conversion specifiers, as specified in the C standard. */
-#define C_STANDARD_STRFTIME_CHARACTERS "aAbBcdHIjmMpSUwWxXyYZ"
-#define C_STANDARD_NUMERIC_STRFTIME_CHARACTERS "dHIjmMSUwWyY"
-
-typedef struct {
-	GHashTable *hash_table;
-	char *display_name;
-	gboolean keys_known_to_be_strings;
-} HashTableToFree;
-
-static GList *hash_tables_to_free_at_exit;
-
-/* We will need this for nautilus_unsetenv if there is no unsetenv. */
-#if !defined (HAVE_SETENV)
-extern char **environ;
-#endif
-
-/**
- * nautilus_setenv:
- * 
- * Adds "*name=*value" to the environment
- *
- * Returns: see "putenv" - 
- * 
- **/
-int
-nautilus_setenv (const char *name, const char *value, gboolean overwrite)
-{
-#if defined (HAVE_SETENV)
-	return setenv (name, value, overwrite);
-#else
-	char *string;
-	
-	if (! overwrite && g_getenv (name) != NULL) {
-		return 0;
-	}
-	
-	/* This results in a leak when you overwrite existing
-	 * settings. It would be fairly easy to fix this by keeping
-	 * our own parallel array or hash table.
-	 */
-	string = g_strconcat (name, "=", value, NULL);
-	return putenv (string);
-#endif
-}
-
-/**
- * nautilus_unsetenv:
- * 
- * Removes *name from the environment
- * 
- **/
-void
-nautilus_unsetenv (const char *name)
-{
-#if defined (HAVE_SETENV)
-	unsetenv (name);
-#else
-	int i, len;
-
-	len = strlen (name);
-	
-	/* Mess directly with the environ array.
-	 * This seems to be the only portable way to do this.
-	 */
-	for (i = 0; environ[i] != NULL; i++) {
-		if (strncmp (environ[i], name, len) == 0
-		    && environ[i][len + 1] == '=') {
-			break;
-		}
-	}
-	while (environ[i] != NULL) {
-		environ[i] = environ[i + 1];
-		i++;
-	}
-#endif
-}
-
-/**
- * nautilus_g_date_new_tm:
- * 
- * Get a new GDate * for the date represented by a tm struct. 
- * The caller is responsible for g_free-ing the result.
- * @time_pieces: Pointer to a tm struct representing the date to be converted.
- * 
- * Returns: Newly allocated date.
- * 
- **/
-GDate *
-nautilus_g_date_new_tm (struct tm *time_pieces)
-{
-	/* tm uses 0-based months; GDate uses 1-based months.
-	 * tm_year needs 1900 added to get the full year.
-	 */
-	return g_date_new_dmy (time_pieces->tm_mday,
-			       time_pieces->tm_mon + 1,
-			       time_pieces->tm_year + 1900);
-}
-
-/**
- * nautilus_strdup_strftime:
- *
- * Cover for standard date-and-time-formatting routine strftime that returns
- * a newly-allocated string of the correct size. The caller is responsible
- * for g_free-ing the returned string.
- *
- * Besides the buffer management, there are two differences between this
- * and the library strftime:
- *
- *   1) The modifiers "-" and "_" between a "%" and a numeric directive
- *      are defined as for the GNU version of strftime. "-" means "do not
- *      pad the field" and "_" means "pad with spaces instead of zeroes".
- *   2) Non-ANSI extensions to strftime are flagged at runtime with a
- *      warning, so it's easy to notice use of the extensions without
- *      testing with multiple versions of the library.
- *
- * @format: format string to pass to strftime. See strftime documentation
- * for details.
- * @time_pieces: date/time, in struct format.
- * 
- * Return value: Newly allocated string containing the formatted time.
- **/
-char *
-nautilus_strdup_strftime (const char *format, struct tm *time_pieces)
-{
-	GString *string;
-	const char *remainder, *percent;
-	char code[3], buffer[512];
-	char *piece, *result;
-	size_t string_length;
-	gboolean strip_leading_zeros, turn_leading_zeros_to_spaces;
-
-	string = g_string_new ("");
-	remainder = format;
-
-	/* Walk from % character to % character. */
-	for (;;) {
-		percent = strchr (remainder, '%');
-		if (percent == NULL) {
-			g_string_append (string, remainder);
-			break;
-		}
-		nautilus_g_string_append_len (string, remainder,
-					      percent - remainder);
-
-		/* Handle the "%" character. */
-		remainder = percent + 1;
-		switch (*remainder) {
-		case '-':
-			strip_leading_zeros = TRUE;
-			turn_leading_zeros_to_spaces = FALSE;
-			remainder++;
-			break;
-		case '_':
-			strip_leading_zeros = FALSE;
-			turn_leading_zeros_to_spaces = TRUE;
-			remainder++;
-			break;
-		case '%':
-			g_string_append_c (string, '%');
-			remainder++;
-			continue;
-		case '\0':
-			g_warning ("Trailing %% passed to nautilus_strdup_strftime");
-			g_string_append_c (string, '%');
-			continue;
-		default:
-			strip_leading_zeros = FALSE;
-			turn_leading_zeros_to_spaces = FALSE;
-			break;
-		}
-		
-		if (strchr (C_STANDARD_STRFTIME_CHARACTERS, *remainder) == NULL) {
-			g_warning ("nautilus_strdup_strftime does not support "
-				   "non-standard escape code %%%c",
-				   *remainder);
-		}
-
-		/* Convert code to strftime format. We have a fixed
-		 * limit here that each code can expand to a maximum
-		 * of 512 bytes, which is probably OK. There's no
-		 * limit on the total size of the result string.
-		 */
-		code[0] = '%';
-		code[1] = *remainder;
-		code[2] = '\0';
-		string_length = strftime (buffer, sizeof (buffer),
-					  code, time_pieces);
-		if (string_length == 0) {
-			/* We could put a warning here, but there's no
-			 * way to tell a successful conversion to
-			 * empty string from a failure.
-			 */
-			buffer[0] = '\0';
-		}
-
-		/* Strip leading zeros if requested. */
-		piece = buffer;
-		if (strip_leading_zeros || turn_leading_zeros_to_spaces) {
-			if (strchr (C_STANDARD_NUMERIC_STRFTIME_CHARACTERS, *remainder) == NULL) {
-				g_warning ("nautilus_strdup_strftime does not support "
-					   "modifier for non-numeric escape code %%%c%c",
-					   remainder[-1],
-					   *remainder);
-			}
-			if (*piece == '0') {
-				do {
-					piece++;
-				} while (*piece == '0');
-				if (!isdigit (*piece)) {
-				    piece--;
-				}
-			}
-			if (turn_leading_zeros_to_spaces) {
-				memset (buffer, ' ', piece - buffer);
-				piece = buffer;
-			}
-		}
-		remainder++;
-
-		/* Add this piece. */
-		g_string_append (string, piece);
-	}
-
-	/* Extract the string. */
-	result = string->str;
-	g_string_free (string, FALSE);
-	return result;
-}
-
-/**
- * nautilus_g_list_exactly_one_item
- *
- * Like g_list_length (list) == 1, only O(1) instead of O(n).
- * @list: List.
- *
- * Return value: TRUE if the list has exactly one item.
- **/
-gboolean
-nautilus_g_list_exactly_one_item (GList *list)
-{
-	return list != NULL && list->next == NULL;
-}
-
-/**
- * nautilus_g_list_more_than_one_item
- *
- * Like g_list_length (list) > 1, only O(1) instead of O(n).
- * @list: List.
- *
- * Return value: TRUE if the list has more than one item.
- **/
-gboolean
-nautilus_g_list_more_than_one_item (GList *list)
-{
-	return list != NULL && list->next != NULL;
-}
-
-/**
- * nautilus_g_list_equal
- *
- * Compares two lists to see if they are equal.
- * @list_a: First list.
- * @list_b: Second list.
- *
- * Return value: TRUE if the lists are the same length with the same elements.
- **/
-gboolean
-nautilus_g_list_equal (GList *list_a, GList *list_b)
-{
-	GList *p, *q;
-
-	for (p = list_a, q = list_b; p != NULL && q != NULL; p = p->next, q = q->next) {
-		if (p->data != q->data) {
-			return FALSE;
-		}
-	}
-	return p == NULL && q == NULL;
-}
-
-/**
- * nautilus_g_list_copy
- *
- * @list: List to copy.
- * Return value: Shallow copy of @list.
- **/
-GList *
-nautilus_g_list_copy (GList *list)
-{
-	GList *p, *result;
-
-	result = NULL;
-	
-	if (list == NULL) {
-		return NULL;
-	}
-
-	for (p = g_list_last (list); p != NULL; p = p->prev) {
-		result = g_list_prepend (result, p->data);
-	}
-	return result;
-}
-
-/**
- * nautilus_g_str_list_equal
- *
- * Compares two lists of C strings to see if they are equal.
- * @list_a: First list.
- * @list_b: Second list.
- *
- * Return value: TRUE if the lists contain the same strings.
- **/
-gboolean
-nautilus_g_str_list_equal (GList *list_a, GList *list_b)
-{
-	GList *p, *q;
-
-	for (p = list_a, q = list_b; p != NULL && q != NULL; p = p->next, q = q->next) {
-		if (nautilus_strcmp (p->data, q->data) != 0) {
-			return FALSE;
-		}
-	}
-	return p == NULL && q == NULL;
-}
-
-/**
- * nautilus_g_str_list_copy
- *
- * @list: List of strings and/or NULLs to copy.
- * Return value: Deep copy of @list.
- **/
-GList *
-nautilus_g_str_list_copy (GList *list)
-{
-	GList *node, *result;
-
-	result = NULL;
-	
-	for (node = g_list_last (list); node != NULL; node = node->prev) {
-		result = g_list_prepend (result, g_strdup (node->data));
-	}
-	return result;
-}
-
-/**
- * nautilus_g_str_list_alphabetize
- *
- * Sort a list of strings using locale-sensitive rules.
- *
- * @list: List of strings and/or NULLs.
- * 
- * Return value: @list, sorted.
- **/
-GList *
-nautilus_g_str_list_alphabetize (GList *list)
-{
-	return g_list_sort (list, (GCompareFunc) nautilus_strcoll);
-}
-
-/**
- * nautilus_g_list_free_deep_custom
- *
- * Frees the elements of a list and then the list, using a custom free function.
- *
- * @list: List of elements that can be freed with the provided free function.
- * @element_free_func: function to call with the data pointer and user_data to free it.
- * @user_data: User data to pass to element_free_func
- **/
-void
-nautilus_g_list_free_deep_custom (GList *list, GFunc element_free_func, gpointer user_data)
-{
-	g_list_foreach (list, element_free_func, user_data);
-	g_list_free (list);
-}
-
-/**
- * nautilus_g_list_free_deep
- *
- * Frees the elements of a list and then the list.
- * @list: List of elements that can be freed with g_free.
- **/
-void
-nautilus_g_list_free_deep (GList *list)
-{
-	nautilus_g_list_free_deep_custom (list, (GFunc) g_free, NULL);
-}
-
-/**
- * nautilus_g_list_free_deep_custom
- *
- * Frees the elements of a list and then the list, using a custom free function.
- *
- * @list: List of elements that can be freed with the provided free function.
- * @element_free_func: function to call with the data pointer and user_data to free it.
- * @user_data: User data to pass to element_free_func
- **/
-void
-nautilus_g_slist_free_deep_custom (GSList *list, GFunc element_free_func, gpointer user_data)
-{
-	g_slist_foreach (list, element_free_func, user_data);
-	g_slist_free (list);
-}
-
-/**
- * nautilus_g_slist_free_deep
- *
- * Frees the elements of a list and then the list.
- * @list: List of elements that can be freed with g_free.
- **/
-void
-nautilus_g_slist_free_deep (GSList *list)
-{
-	nautilus_g_slist_free_deep_custom (list, (GFunc) g_free, NULL);
-}
-
-
-/**
- * nautilus_g_strv_find
- * 
- * Get index of string in array of strings.
- * 
- * @strv: NULL-terminated array of strings.
- * @find_me: string to search for.
- * 
- * Return value: index of array entry in @strv that
- * matches @find_me, or -1 if no matching entry.
- */
-int
-nautilus_g_strv_find (char **strv, const char *find_me)
-{
-	int index;
-
-	g_return_val_if_fail (find_me != NULL, -1);
-	
-	for (index = 0; strv[index] != NULL; ++index) {
-		if (strcmp (strv[index], find_me) == 0) {
-			return index;
-		}
-	}
-
-	return -1;
-}
-
-/**
- * nautilus_g_list_safe_for_each
- * 
- * A version of g_list_foreach that works if the passed function
- * deletes the current element.
- * 
- * @list: List to iterate.
- * @function: Function to call on each element.
- * @user_data: Data to pass to function.
- */
-void
-nautilus_g_list_safe_for_each (GList *list, GFunc function, gpointer user_data)
-{
-	GList *p, *next;
-
-	for (p = list; p != NULL; p = next) {
-		next = p->next;
-		(* function) (p->data, user_data);
-	}
-}
-
-static GList *
-nautilus_g_list_sort_merge (GList       *list_1, 
-			    GList       *list_2,
-			    NautilusCompareFunction compare_func,
-			    gpointer user_data)
-{
-  GList list_buffer, *list, *previous_node;
-
-  list = &list_buffer; 
-  previous_node = NULL;
-
-  while (list_1 != NULL && 
-	 list_2 != NULL) {
-	  if (compare_func (list_1->data, list_2->data, user_data) < 0) {
-		  list->next = list_1;
-		  list = list->next;
-		  list->prev = previous_node; 
-		  previous_node = list;
-		  list_1 = list_1->next;
-	  } 
-	  else {
-		  list->next = list_2;
-		  list = list->next;
-		  list->prev = previous_node; 
-		  previous_node = list;
-		  list_2 = list_2->next;
-	  }
-  }
-
-  list->next = list_1 ? list_1 : list_2;
-  list->next->prev = list;
-
-  return list_buffer.next;
-}
-
-
-static gboolean
-nautilus_g_list_is_already_sorted (GList *list,
-				   NautilusCompareFunction compare_func,
-				   gpointer user_data)
-{
-	if (list == NULL) {
-		return TRUE;
-	}
-
-	while (list->next != NULL) {
-		if (compare_func (list->data, list->next->data, user_data) > 0) {
-			return FALSE;
-		}
-		list = list->next;
-		
-	}
-
-	return TRUE;
-}
-
-GList *
-nautilus_g_list_sort_custom (GList *list,
-			     NautilusCompareFunction compare_func,
-			     gpointer user_data)
-{
-	GList *list_1, *list_2;
-  
-	if (nautilus_g_list_is_already_sorted (list, compare_func, user_data)) {
-		return list;
-	}
-
-	list_1 = list; 
-	list_2 = list->next;
-
-	/* Split the two lists half way down the middle */
-	while (TRUE) {
-		list_2 = list_2->next;
-		if (list_2 == NULL) {
-			break;
-		}
-		list_2 = list_2->next;
-		if (list_2 == NULL) {
-			break;
-		}
-		list_1 = list_1->next;
-	}
-	
-	list_2 = list_1->next; 
-	list_1->next = NULL; 
-
-	return nautilus_g_list_sort_merge (nautilus_g_list_sort_custom (list, compare_func, user_data),
-					   nautilus_g_list_sort_custom (list_2, compare_func, user_data),
-					   compare_func,
-					   user_data);
-
-}
-
-static int
-compare_pointers (gconstpointer pointer_1, gconstpointer pointer_2)
-{
-	if ((const char *) pointer_1 < (const char *) pointer_2) {
-		return -1;
-	}
-	if ((const char *) pointer_1 > (const char *) pointer_2) {
-		return +1;
-	}
-	return 0;
-}
-
-
-
-gboolean
-nautilus_g_lists_sort_and_check_for_intersection (GList **list_1,
-						  GList **list_2) 
-
-{
-	GList *node_1, *node_2;
-	int compare_result;
-	
-	*list_1 = g_list_sort (*list_1, compare_pointers);
-	*list_2 = g_list_sort (*list_2, compare_pointers);
-
-	node_1 = *list_1;
-	node_2 = *list_2;
-
-	while (node_1 != NULL && node_2 != NULL) {
-		compare_result = compare_pointers (node_1->data, node_2->data);
-		if (compare_result == 0) {
-			return TRUE;
-		}
-		if (compare_result <= 0) {
-			node_1 = node_1->next;
-		}
-		if (compare_result >= 0) {
-			node_2 = node_2->next;
-		}
-	}
-
-	return FALSE;
-}
-
-
-/**
- * nautilus_g_list_partition
- * 
- * Parition a list into two parts depending on whether the data
- * elements satisfy a provided predicate. Order is preserved in both
- * of the resulting lists, and the original list is consumed. A list
- * of the items that satisfy the predicate is returned, and the list
- * of items not satisfying the predicate is returned via the failed
- * out argument.
- * 
- * @list: List to partition.
- * @predicate: Function to call on each element.
- * @user_data: Data to pass to function.  
- * @failed: The GList * variable pointed to by this argument will be
- * set to the list of elements for which the predicate returned
- * false. */
-
-GList *
-nautilus_g_list_partition (GList *list,
-			   NautilusPredicateFunction  predicate,
-			   gpointer user_data,
-			   GList **failed)
-{
-	GList *predicate_true;
-	GList *predicate_false;
-	GList *reverse;
-	GList *p;
-	GList *next;
-
-	predicate_true = NULL;
-	predicate_false = NULL;
-
-	reverse = g_list_reverse (list);
-
-	for (p = reverse; p != NULL; p = next) {
-		next = p->next;
-		
-		if (next != NULL) {
-			next->prev = NULL;
-		}
-
-		if (predicate (p->data, user_data)) {
-			p->next = predicate_true;
- 			if (predicate_true != NULL) {
-				predicate_true->prev = p;
-			}
-			predicate_true = p;
-		} else {
-			p->next = predicate_false;
- 			if (predicate_false != NULL) {
-				predicate_false->prev = p;
-			}
-			predicate_false = p;
-		}
-	}
-
-	*failed = predicate_false;
-	return predicate_true;
-}
-
-
-
-/**
- * nautilus_g_ptr_array_new_from_list
- * 
- * Copies (shallow) a list of pointers into an array of pointers.
- * 
- * @list: List to copy.
- * 
- * Return value: GPtrArray containing a copy of all the pointers
- * from @list
- */
-GPtrArray *
-nautilus_g_ptr_array_new_from_list (GList *list)
-{
-	GPtrArray *array;
-	int size;
-	int index;
-	GList *p;
-
-	array = g_ptr_array_new ();
-	size = g_list_length ((GList *)list);
-
-	g_ptr_array_set_size (array, size);
-
-	for (p = list, index = 0; p != NULL; p = p->next, index++) {
-		g_ptr_array_index (array, index) = p->data;
-	}
-
-	return array;
-}
-
-/**
- * nautilus_g_ptr_array_sort
- * 
- * Sorts @array using a qsort algorithm. Allows passing in
- * a pass-thru context that can be used by the @sort_function
- * 
- * @array: pointer array to sort
- * @sort_function: sort function
- * @context: sort context passed to the sort_function
- */
-void
-nautilus_g_ptr_array_sort (GPtrArray *array,
-			   NautilusCompareFunction sort_function,
-			   void *context)
-{
-	size_t count, r, l, j;
-	void **base, **lp, **rp, **ip, **jp, **tmpp;
-	void *tmp;
-
-	count = array->len;
-
-	if (count < 2) {
-		return;
-	}
-
-	r = count;
-	l = (r / 2) + 1;
-
-	base = (void **) array->pdata;
-	lp = base + (l - 1);
-	rp = base + (r - 1);
-
-	for (;;) {
-		if (l > 1) {
-			l--;
-			lp--;
-		} else {
-			tmp = *lp;
-			*lp = *rp;
-			*rp = tmp;
-
-			if (--r == 1) {
-				return;
-			}
-
-			rp--;
-		}
-
-		j = l;
-
-		jp = base + (j - 1);
-		
-		while (j * 2 <= r) {
-			j *= 2;
-			
-			ip = jp;
-			jp = base + (j - 1);
-			
-			if (j < r) {
-				tmpp = jp + 1;
-				if (sort_function(*jp, *tmpp, context) < 0) {
-					j++;
-					jp = tmpp;
-				}
-			}
-			
-			if (sort_function (*ip, *jp, context) >= 0) {
-				break;
-			}
-
-			tmp = *ip;
-			*ip = *jp;
-			*jp = tmp;
-		}
-	}
-}
-
-/**
- * nautilus_g_ptr_array_search
- * 
- * Does a binary search through @array looking for an item
- * that matches a predicate consisting of a @search_function and
- * @context. May be used to find an insertion point 
- * 
- * @array: pointer array to search
- * @search_function: search function called on elements
- * @context: search context passed to the @search_function containing
- * the key or other data we are matching
- * @match_only: if TRUE, only returns a match if the match is exact,
- * if FALSE, returns either an index of a match or an index of the
- * slot a new item should be inserted in
- * 
- * Return value: index of the match or -1 if not found
- */
-int
-nautilus_g_ptr_array_search (GPtrArray *array, 
-			     NautilusSearchFunction search_function,
-			     void *context,
-			     gboolean match_only)
-{
-	int r, l;
-	int resulting_index;
-	int compare_result;
-	void *item;
-
-	r = array->len - 1;
-	item = NULL;
-	resulting_index = 0;
-	compare_result = 0;
-	
-	for (l = 0; l <= r; ) {
-		resulting_index = (l + r) / 2;
-
-		item = g_ptr_array_index (array, resulting_index);
-
-		compare_result = (search_function) (item, context);
-		
-		if (compare_result > 0) {
-			r = resulting_index - 1;
-		} else if (compare_result < 0) {
-			l = resulting_index + 1;
-		} else {
-			return resulting_index;
-		}
-	}
-
-	if (compare_result < 0) {
-		resulting_index++;
-	}
-
-	if (match_only && compare_result != 0) {
-		return -1;
-	}
-
-	return resulting_index;
-}
-
-/**
- * nautilus_get_system_time
- * 
- * Return value: number of microseconds since the machine was turned on
- */
-gint64
-nautilus_get_system_time (void)
-{
-	struct timeval tmp;
-
-	gettimeofday (&tmp, NULL);
-	return (gint64)tmp.tv_usec + (gint64)tmp.tv_sec * G_GINT64_CONSTANT (1000000);
-}
-
-static void
-print_key_string (gpointer key, gpointer value, gpointer callback_data)
-{
-	g_assert (callback_data == NULL);
-
-	g_print ("--> %s\n", (char *) key);
-}
-
-static void
-free_hash_tables_at_exit (void)
-{
-	GList *p;
-	HashTableToFree *hash_table_to_free;
-	guint size;
-
-	for (p = hash_tables_to_free_at_exit; p != NULL; p = p->next) {
-		hash_table_to_free = p->data;
-
-		size = g_hash_table_size (hash_table_to_free->hash_table);
-		if (size != 0) {
-			if (hash_table_to_free->keys_known_to_be_strings) {
-				g_print ("\n--- Hash table keys for warning below:\n");
-				g_hash_table_foreach (hash_table_to_free->hash_table,
-						      print_key_string,
-						      NULL);
-			}
-			g_warning ("\"%s\" hash table still has %u element%s at quit time%s",
-				   hash_table_to_free->display_name, size,
-				   size == 1 ? "" : "s",
-				   hash_table_to_free->keys_known_to_be_strings
-				   ? " (keys above)" : "");
-		}
-
-		g_hash_table_destroy (hash_table_to_free->hash_table);
-		g_free (hash_table_to_free->display_name);
-		g_free (hash_table_to_free);
-	}
-	g_list_free (hash_tables_to_free_at_exit);
-	hash_tables_to_free_at_exit = NULL;
-}
-
-GHashTable *
-nautilus_g_hash_table_new_free_at_exit (GHashFunc hash_func,
-					GCompareFunc key_compare_func,
-					const char *display_name)
-{
-	GHashTable *hash_table;
-	HashTableToFree *hash_table_to_free;
-
-	/* FIXME: We can take out the NAUTILUS_DEBUG check once we
-	 * have fixed more of the leaks. For now, it's a bit too noisy
-	 * for the general public.
-	 */
-	if (hash_tables_to_free_at_exit == NULL
-	    && g_getenv ("NAUTILUS_DEBUG") != NULL) {
-		g_atexit (free_hash_tables_at_exit);
-	}
-
-	hash_table = g_hash_table_new (hash_func, key_compare_func);
-
-	hash_table_to_free = g_new (HashTableToFree, 1);
-	hash_table_to_free->hash_table = hash_table;
-	hash_table_to_free->display_name = g_strdup (display_name);
-	hash_table_to_free->keys_known_to_be_strings =
-		hash_func == g_str_hash;
-
-	hash_tables_to_free_at_exit = g_list_prepend
-		(hash_tables_to_free_at_exit, hash_table_to_free);
-
-	return hash_table;
-}
-
-typedef struct {
-	GList *keys;
-	GList *values;
-} FlattenedHashTable;
-
-static void
-flatten_hash_table_element (gpointer key, gpointer value, gpointer callback_data)
-{
-	FlattenedHashTable *flattened_table;
-
-	flattened_table = callback_data;
-	flattened_table->keys = g_list_prepend
-		(flattened_table->keys, key);
-	flattened_table->values = g_list_prepend
-		(flattened_table->values, value);
-}
-
-void
-nautilus_g_hash_table_safe_for_each (GHashTable *hash_table,
-				     GHFunc callback,
-				     gpointer callback_data)
-{
-	FlattenedHashTable flattened;
-	GList *p, *q;
-
-	flattened.keys = NULL;
-	flattened.values = NULL;
-
-	g_hash_table_foreach (hash_table,
-			      flatten_hash_table_element,
-			      &flattened);
-
-	for (p = flattened.keys, q = flattened.values;
-	     p != NULL;
-	     p = p->next, q = q->next) {
-		(* callback) (p->data, q->data, callback_data);
-	}
-
-	g_list_free (flattened.keys);
-	g_list_free (flattened.values);
-}
-
-gboolean
-nautilus_g_hash_table_remove_deep_custom (GHashTable *hash_table, gconstpointer key,
-					  GFunc key_free_func, gpointer key_free_data,
-					  GFunc value_free_func, gpointer value_free_data)
-{
-	gpointer key_in_table;
-	gpointer value;
-
-	/* It would sure be nice if we could do this with a single lookup.
-	 */
-	if (g_hash_table_lookup_extended (hash_table, key,
-					  &key_in_table, &value)) {
-		g_hash_table_remove (hash_table, key);
-		if (key_free_func != NULL) {
-			(* key_free_func) (key_in_table, key_free_data);
-		}
-		/* handle key == value, don't double free */
-		if (value_free_func != NULL && value != key_in_table) {
-			(* value_free_func) (value, value_free_data);
-		}
-		return TRUE;
-	} else {
-		return FALSE;
-	}
-}
-
-gboolean
-nautilus_g_hash_table_remove_deep (GHashTable *hash_table, gconstpointer key)
-{
-	return nautilus_g_hash_table_remove_deep_custom
-		(hash_table, key, (GFunc) g_free, NULL, (GFunc) g_free, NULL);
-}
-
-typedef struct {
-	GFunc	  key_free_func;
-	gpointer  key_free_data;
-	GFunc	  value_free_func;
-	gpointer  value_free_data;
-} HashTableFreeFuncs;
-
-static gboolean
-destroy_deep_helper (gpointer key, gpointer value, gpointer data)
-{
-	HashTableFreeFuncs *free_funcs;
-
-	free_funcs = (HashTableFreeFuncs *) data;
-	
-	if (free_funcs->key_free_func != NULL) {
-		(* free_funcs->key_free_func) (key, free_funcs->key_free_data);
-	}
-	/* handle key == value, don't double free */
-	if (free_funcs->value_free_func != NULL && value != key) {
-		(* free_funcs->value_free_func) (value, free_funcs->value_free_data);
-	}
-	return TRUE;
-}
-
-void
-nautilus_g_hash_table_destroy_deep_custom (GHashTable *hash_table,
-					   GFunc key_free_func, gpointer key_free_data,
-					   GFunc value_free_func, gpointer value_free_data)
-{
-	HashTableFreeFuncs free_funcs;
-	
-	g_return_if_fail (hash_table != NULL);
-
-	free_funcs.key_free_func = key_free_func;
-	free_funcs.key_free_data = key_free_data;
-	free_funcs.value_free_func = value_free_func;
-	free_funcs.value_free_data = value_free_data;
-	
-	g_hash_table_foreach_remove (hash_table, destroy_deep_helper, &free_funcs);
-
-	g_hash_table_destroy (hash_table);
-}
-
-void
-nautilus_g_hash_table_destroy_deep (GHashTable *hash_table)
-{
-	nautilus_g_hash_table_destroy_deep_custom (hash_table, (GFunc) g_free, NULL, (GFunc) g_free, NULL);
-}
-
-/* This is something like the new g_string_append_len function from
- * GLib 2.0, without the ability to deal with NUL character that the
- * GLib 2.0 function has. It's limited in other ways too, so it's
- * best to delete this when we move to GLib 2.0.
- */
-void
-nautilus_g_string_append_len (GString *string,
-			      const char *new_text,
-			      int len)
-{
-	int old_string_len, new_text_len;
-
-	old_string_len = string->len;
-	g_string_append (string, new_text);
-
-	new_text_len = strlen (new_text);
-	if (len < new_text_len) {
-		g_string_erase (string,
-				old_string_len + len,
-				new_text_len - len);
-	}
-}
-
-/* By strange parallel evolution there is actually going to be a
- * function to do this in GNOME 2.0.
- */
-char *
-nautilus_shell_quote (const char *string)
-{
-	const char *p;
-	GString *quoted_string;
-	char *quoted_str;
-
-	/* All kinds of ways to do this fancier.
-	 * - Detect when quotes aren't needed at all.
-	 * - Use double quotes when they would look nicer.
-	 * - Avoid sequences of quote/unquote in a row (like when you quote "'''").
-	 * - Do it higher speed with strchr.
-	 * - Allocate the GString with g_string_sized_new.
-	 */
-
-	g_return_val_if_fail (string != NULL, NULL);
-
-	quoted_string = g_string_new ("'");
-
-	for (p = string; *p != '\0'; p++) {
-		if (*p == '\'') {
-			/* Get out of quotes, do a quote, then back in. */
-			g_string_append (quoted_string, "'\\''");
-		} else {
-			g_string_append_c (quoted_string, *p);
-		}
-	}
-
-	g_string_append_c (quoted_string, '\'');
-
-	/* Let go of the GString. */
-	quoted_str = quoted_string->str;
-	g_string_free (quoted_string, FALSE);
-
-	return quoted_str;
-}
-
-int
-nautilus_round (double d)
-{
-	double val;
-
-	val = floor (d + .5);
-
-	/* The tests are needed because the result of floating-point to integral
-	 * conversion is undefined if the floating point value is not representable
-	 * in the new type. E.g. the magnititude is too large or a negative
-	 * floating-point value being converted to an unsigned.
-	 */
-	g_return_val_if_fail (val <= INT_MAX, INT_MAX);
-	g_return_val_if_fail (val >= INT_MIN, INT_MIN);
-
-	return val;
-}
-
-GList *
-nautilus_g_list_from_g_slist (GSList *slist)
-{
-	GList *list;
-	GSList *node;
-
-	list = NULL;
-	for (node = slist; node != NULL; node = node->next) {
-		list = g_list_prepend (list, node->data);
-	}
-	return g_list_reverse (list);
-}
-
-GSList *
-nautilus_g_slist_from_g_list (GList *list)
-{
-	GSList *slist;
-	GList *node;
-
-	slist = NULL;
-	for (node = list; node != NULL; node = node->next) {
-		slist = g_slist_prepend (slist, node->data);
-	}
-	return g_slist_reverse (slist);
-}
-
-/**
- * nautilus_dumb_down_for_multi_byte_locale_hack
- * 
- * Return value: A boolean value indicating whether the current locale
- *               is multi byte so that we can dumb down some operations.
- *               to work on those locales.  This is a temporary workaround
- *               with will be properly fixed in a future version of 
- *               nautilus.
- *
- */
-gboolean
-nautilus_dumb_down_for_multi_byte_locale_hack (void)
-{
-	static gboolean is_multi_byte_locale = FALSE;
-	static gboolean is_multi_byte_locale_known = FALSE;
-	guint i;
-	const char *variable = NULL;
-
-	/*
-	 * List of environment variables that effect the locale.
-	 * This list was provided by John Harper (out of Sawfish)
-	 * where he uses it for similar purposes.
-	 */
-	static const char *locale_variables[] ={
-		"LANGUAGE",
-		"LC_ALL",
-		"LC_MESSAGES",
-		"LANG",
-		"GDM_LANG"
-	};
-
-	/*
-	 * List of locales (prefixes) known to be multi byte.
-	 */
-	static const char *multi_byte_locales[] ={
-		"ja",
-		"ko",
-		"zh"
-	};
-
-	/* Find out if the locale is multi byte only once */
-	if (is_multi_byte_locale_known) {
-		return is_multi_byte_locale;
-	}
-	is_multi_byte_locale_known = TRUE;
-
-	/* Find the first language variable that is set */
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (locale_variables) && variable == NULL; i++) {
-		variable = g_getenv (locale_variables[i]);
-	}
-
-	/* If a language variable was found, check it agains the known multi byte locales */
-	if (variable != NULL) {
-		for (i = 0; i < NAUTILUS_N_ELEMENTS (multi_byte_locales); i++) {
-			if (nautilus_istr_has_prefix (variable, multi_byte_locales[i])) {
-				is_multi_byte_locale = TRUE;
-			}
-		}
-	}
-
-	return is_multi_byte_locale;
-}
-
-int
-nautilus_compare_integer (gconstpointer a,
-			  gconstpointer b)
-{
-	int int_a;
-	int int_b;
-
-	int_a = GPOINTER_TO_INT (a);
-	int_b = GPOINTER_TO_INT (b);
-
-	if (int_a == int_b) {
-		return 0;
-	}
-
-	return int_a < int_b ? -1 : 1;
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-static void 
-check_tm_to_g_date (time_t time)
-{
-	struct tm *before_conversion;
-	struct tm after_conversion;
-	GDate *date;
-
-	before_conversion = localtime (&time);
-	date = nautilus_g_date_new_tm (before_conversion);
-
-	g_date_to_struct_tm (date, &after_conversion);
-
-	g_date_free (date);
-
-	NAUTILUS_CHECK_INTEGER_RESULT (after_conversion.tm_mday,
-				       before_conversion->tm_mday);
-	NAUTILUS_CHECK_INTEGER_RESULT (after_conversion.tm_mon,
-				       before_conversion->tm_mon);
-	NAUTILUS_CHECK_INTEGER_RESULT (after_conversion.tm_year,
-				       before_conversion->tm_year);
-}
-
-static gboolean
-nautilus_test_predicate (gpointer data,
-			 gpointer callback_data)
-{
-	return g_strcasecmp (data, callback_data) <= 0;
-}
-
-static char *
-test_strftime (const char *format,
-	       int year,
-	       int month,
-	       int day,
-	       int hour,
-	       int minute,
-	       int second)
-{
-	struct tm time_pieces;
-
-	time_pieces.tm_sec = second;
-	time_pieces.tm_min = minute;
-	time_pieces.tm_hour = hour;
-	time_pieces.tm_mday = day;
-	time_pieces.tm_mon = month - 1;
-	time_pieces.tm_year = year - 1900;
-	time_pieces.tm_isdst = -1;
-	mktime (&time_pieces);
-
-	return nautilus_strdup_strftime (format, &time_pieces);
-}
-
-void
-nautilus_self_check_glib_extensions (void)
-{
-	char **strv;
-	GList *compare_list_1;
-	GList *compare_list_2;
-	GList *compare_list_3;
-	GList *compare_list_4;
-	GList *compare_list_5;
-	gint64 time1, time2;
-	GList *list_to_partition;
-	GList *expected_passed;
-	GList *expected_failed;
-	GList *actual_passed;
-	GList *actual_failed;
-	char *huge_string;
-	
-	check_tm_to_g_date (0);			/* lower limit */
-	check_tm_to_g_date ((time_t) -1);	/* upper limit */
-	check_tm_to_g_date (time (NULL));	/* current time */
-
-	strv = g_strsplit ("zero|one|two|three|four", "|", 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_g_strv_find (strv, "zero"), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_g_strv_find (strv, "one"), 1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_g_strv_find (strv, "four"), 4);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_g_strv_find (strv, "five"), -1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_g_strv_find (strv, ""), -1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_g_strv_find (strv, "o"), -1);
-	g_strfreev (strv);
-
-	/* nautilus_get_system_time */
-	time1 = nautilus_get_system_time ();
-	time2 = nautilus_get_system_time ();
-	NAUTILUS_CHECK_BOOLEAN_RESULT (time1 - time2 > -1000, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (time1 - time2 <= 0, TRUE);
-
-	/* nautilus_g_str_list_equal */
-
-	/* We g_strdup because identical string constants can be shared. */
-
-	compare_list_1 = NULL;
-	compare_list_1 = g_list_append (compare_list_1, g_strdup ("Apple"));
-	compare_list_1 = g_list_append (compare_list_1, g_strdup ("zebra"));
-	compare_list_1 = g_list_append (compare_list_1, g_strdup ("!@#!@$#@$!"));
-
-	compare_list_2 = NULL;
-	compare_list_2 = g_list_append (compare_list_2, g_strdup ("Apple"));
-	compare_list_2 = g_list_append (compare_list_2, g_strdup ("zebra"));
-	compare_list_2 = g_list_append (compare_list_2, g_strdup ("!@#!@$#@$!"));
-
-	compare_list_3 = NULL;
-	compare_list_3 = g_list_append (compare_list_3, g_strdup ("Apple"));
-	compare_list_3 = g_list_append (compare_list_3, g_strdup ("zebra"));
-
-	compare_list_4 = NULL;
-	compare_list_4 = g_list_append (compare_list_4, g_strdup ("Apple"));
-	compare_list_4 = g_list_append (compare_list_4, g_strdup ("zebra"));
-	compare_list_4 = g_list_append (compare_list_4, g_strdup ("!@#!@$#@$!"));
-	compare_list_4 = g_list_append (compare_list_4, g_strdup ("foobar"));
-
-	compare_list_5 = NULL;
-	compare_list_5 = g_list_append (compare_list_5, g_strdup ("Apple"));
-	compare_list_5 = g_list_append (compare_list_5, g_strdup ("zzzzzebraaaaaa"));
-	compare_list_5 = g_list_append (compare_list_5, g_strdup ("!@#!@$#@$!"));
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_g_str_list_equal (compare_list_1, compare_list_2), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_g_str_list_equal (compare_list_1, compare_list_3), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_g_str_list_equal (compare_list_1, compare_list_4), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_g_str_list_equal (compare_list_1, compare_list_5), FALSE);
-
-	nautilus_g_list_free_deep (compare_list_1);
-	nautilus_g_list_free_deep (compare_list_2);
-	nautilus_g_list_free_deep (compare_list_3);
-	nautilus_g_list_free_deep (compare_list_4);
-	nautilus_g_list_free_deep (compare_list_5);
-
-	/* nautilus_g_list_partition */
-
-	list_to_partition = NULL;
-	list_to_partition = g_list_append (list_to_partition, "Cadillac");
-	list_to_partition = g_list_append (list_to_partition, "Pontiac");
-	list_to_partition = g_list_append (list_to_partition, "Ford");
-	list_to_partition = g_list_append (list_to_partition, "Range Rover");
-	
-	expected_passed = NULL;
-	expected_passed = g_list_append (expected_passed, "Cadillac");
-	expected_passed = g_list_append (expected_passed, "Ford");
-	
-	expected_failed = NULL;
-	expected_failed = g_list_append (expected_failed, "Pontiac");
-	expected_failed = g_list_append (expected_failed, "Range Rover");
-	
-	actual_passed = nautilus_g_list_partition (list_to_partition, 
-						   nautilus_test_predicate,
-						   "m",
-						   &actual_failed);
-	
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_g_str_list_equal (expected_passed, actual_passed), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_g_str_list_equal (expected_failed, actual_failed), TRUE);
-	
-	/* Don't free "list_to_partition", since it is consumed
-	 * by nautilus_g_list_partition.
-	 */
-	
-	g_list_free (expected_passed);
-	g_list_free (actual_passed);
-	g_list_free (expected_failed);
-	g_list_free (actual_failed);
-
-	/* nautilus_strdup_strftime */
-	huge_string = g_new (char, 10000+1);
-	memset (huge_string, 'a', 10000);
-	huge_string[10000] = '\0';
-
-	NAUTILUS_CHECK_STRING_RESULT (test_strftime ("", 2000, 1, 1, 0, 0, 0), "");
-	NAUTILUS_CHECK_STRING_RESULT (test_strftime (huge_string, 2000, 1, 1, 0, 0, 0), huge_string);
-	NAUTILUS_CHECK_STRING_RESULT (test_strftime ("%%", 2000, 1, 1, 1, 0, 0), "%");
-	NAUTILUS_CHECK_STRING_RESULT (test_strftime ("%%%%", 2000, 1, 1, 1, 0, 0), "%%");
-	/* localizers: These strings are part of the strftime
-	 * self-check code and must be changed to match what strtfime
-	 * yields -- usually just omitting the AM part is all that's
-	 * needed.
-	 */
-	NAUTILUS_CHECK_STRING_RESULT (test_strftime ("%m/%d/%y, %I:%M %p", 2000, 1, 1, 1, 0, 0), _("01/01/00, 01:00 AM"));
-	NAUTILUS_CHECK_STRING_RESULT (test_strftime ("%-m/%-d/%y, %-I:%M %p", 2000, 1, 1, 1, 0, 0), _("1/1/00, 1:00 AM"));
-	NAUTILUS_CHECK_STRING_RESULT (test_strftime ("%_m/%_d/%y, %_I:%M %p", 2000, 1, 1, 1, 0, 0), _(" 1/ 1/00,  1:00 AM"));
-
-	g_free (huge_string);
-
-	/* nautilus_shell_quote */
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_shell_quote (""), "''");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_shell_quote ("a"), "'a'");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_shell_quote ("'"), "''\\'''");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_shell_quote ("'a"), "''\\''a'");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_shell_quote ("a'"), "'a'\\'''");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_shell_quote ("a'a"), "'a'\\''a'");
-
-	/* nautilus_compare_integer */
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_compare_integer (GINT_TO_POINTER (0), GINT_TO_POINTER (0)), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_compare_integer (GINT_TO_POINTER (0), GINT_TO_POINTER (1)), -1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_compare_integer (GINT_TO_POINTER (1), GINT_TO_POINTER (0)), 1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_compare_integer (GINT_TO_POINTER (-1), GINT_TO_POINTER (0)), -1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_compare_integer (GINT_TO_POINTER (0), GINT_TO_POINTER (-1)), 1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_compare_integer (GINT_TO_POINTER (-1), GINT_TO_POINTER (-1)), 0);
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-glib-extensions.h b/libnautilus-private/nautilus-glib-extensions.h
deleted file mode 100644
index d0752ba4d..000000000
--- a/libnautilus-private/nautilus-glib-extensions.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-glib-extensions.h - interface for new functions that conceptually
-                                belong in glib. Perhaps some of these will be
-                                actually rolled into glib someday.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: John Sullivan <sullivan@eazel.com>
-*/
-
-#ifndef NAUTILUS_GLIB_EXTENSIONS_H
-#define NAUTILUS_GLIB_EXTENSIONS_H
-
-#include <time.h>
-#include <glib.h>
-
-/* A gboolean variant for bit fields. */
-typedef guint nautilus_boolean_bit;
-
-/* Use there to start and and end a macro */
-#define NAUTILUS_MACRO_BEGIN		G_STMT_START {
-#define NAUTILUS_MACRO_END		} G_STMT_END
-
-/* Use this until we can switch to G_N_ELEMENTS. */
-#define NAUTILUS_N_ELEMENTS(array) (sizeof (array) / sizeof ((array)[0]))
-
-/* Callback functions that have user data. */
-typedef int      (* NautilusCompareFunction)   (gconstpointer a,
-						gconstpointer b,
-						gpointer callback_data);
-typedef int      (* NautilusSearchFunction)    (gconstpointer item,
-						gpointer callback_data);
-
-/* Predicate. */
-typedef gboolean (* NautilusPredicateFunction) (gpointer data,
-						gpointer callback_data);
-
-/* Date & time functions. */
-GDate *     nautilus_g_date_new_tm                           (struct tm                  *time_pieces);
-char *      nautilus_strdup_strftime                         (const char                 *format,
-							      struct tm                  *time_pieces);
-
-/* environment manipulation functions */
-int         nautilus_setenv                                  (const char                 *name,
-							      const char                 *value,
-							      gboolean                    overwrite);
-void        nautilus_unsetenv                                (const char                 *name);
-
-/* GList functions. */
-gboolean    nautilus_g_list_exactly_one_item                 (GList                      *list);
-gboolean    nautilus_g_list_more_than_one_item               (GList                      *list);
-gboolean    nautilus_g_list_equal                            (GList                      *list_a,
-							      GList                      *list_b);
-GList *     nautilus_g_list_copy                             (GList                      *list);
-void        nautilus_g_list_safe_for_each                    (GList                      *list,
-							      GFunc                       function,
-							      gpointer                    user_data);
-GList *     nautilus_g_list_sort_custom                      (GList                      *list,
-							      NautilusCompareFunction     compare,
-							      gpointer                    user_data);
-gboolean    nautilus_g_lists_sort_and_check_for_intersection (GList                     **list_a,
-							      GList                     **list_b);
-GList *     nautilus_g_list_partition                        (GList                      *list,
-							      NautilusPredicateFunction   predicate,
-							      gpointer                    user_data,
-							      GList                     **removed);
-
-/* List functions for lists of g_free'able objects. */
-void        nautilus_g_list_free_deep                        (GList                      *list);
-void        nautilus_g_list_free_deep_custom                 (GList                      *list,
-							      GFunc                       element_free_func,
-							      gpointer                    user_data);
-
-/* GSList functions. */
-GList *     nautilus_g_list_from_g_slist                     (GSList                     *list);
-GSList *    nautilus_g_slist_from_g_list                     (GList                      *list);
-
-/* List functions for slists of g_free'able objects. */
-void        nautilus_g_slist_free_deep                       (GSList                     *list);
-void        nautilus_g_slist_free_deep_custom                (GSList                     *list,
-							      GFunc                       element_free_func,
-							      gpointer                    user_data);
-
-/* List functions for lists of C strings. */
-gboolean    nautilus_g_str_list_equal                        (GList                      *str_list_a,
-							      GList                      *str_list_b);
-GList *     nautilus_g_str_list_copy                         (GList                      *str_list);
-GList *     nautilus_g_str_list_alphabetize                  (GList                      *str_list);
-
-/* GString functions */
-void        nautilus_g_string_append_len                     (GString                    *string,
-							      const char                 *characters,
-							      int                         length);
-
-/* GHashTable functions */
-GHashTable *nautilus_g_hash_table_new_free_at_exit           (GHashFunc                   hash_function,
-							      GCompareFunc                key_compare_function,
-							      const char                 *display_name);
-void        nautilus_g_hash_table_safe_for_each              (GHashTable                 *hash_table,
-							      GHFunc                      callback,
-							      gpointer                    callback_data);
-gboolean    nautilus_g_hash_table_remove_deep_custom         (GHashTable                 *hash_table,
-							      gconstpointer               key,
-							      GFunc                       key_free_func,
-							      gpointer                    key_free_data,
-							      GFunc                       value_free_func,
-							      gpointer                    value_free_data);
-gboolean    nautilus_g_hash_table_remove_deep                (GHashTable                 *hash_table,
-							      gconstpointer               key);
-void        nautilus_g_hash_table_destroy_deep_custom        (GHashTable                 *hash_table,
-							      GFunc                       key_free_func,
-							      gpointer                    key_free_data,
-							      GFunc                       value_free_func,
-							      gpointer                    value_free_data);
-void        nautilus_g_hash_table_destroy_deep               (GHashTable                 *hash_table);
-
-/* GPtrArray functions */
-GPtrArray * nautilus_g_ptr_array_new_from_list               (GList                      *list);
-void        nautilus_g_ptr_array_sort                        (GPtrArray                  *array,
-							      NautilusCompareFunction     compare_callback,
-							      gpointer                    callback_data);
-int         nautilus_g_ptr_array_search                      (GPtrArray                  *array,
-							      NautilusSearchFunction      search_callback,
-							      gpointer                    callback_data,
-							      gboolean                    match_only);
-
-/* NULL terminated string arrays (strv). */
-int         nautilus_g_strv_find                             (char                      **strv,
-							      const char                 *find_me);
-
-/* return the time in microseconds since the machine was started */
-gint64      nautilus_get_system_time                         (void);
-
-/* shell */
-char *      nautilus_shell_quote                             (const char                 *string);
-
-/* math */
-int         nautilus_round                                   (double                      d);
-
-/* Locale */
-gboolean    nautilus_dumb_down_for_multi_byte_locale_hack    (void);
-
-/* A GCompareFunc for integers */
-int         nautilus_compare_integer                         (gconstpointer               a,
-							      gconstpointer               b);
-
-#endif /* NAUTILUS_GLIB_EXTENSIONS_H */
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index e9a7f534f..115b79e42 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -26,20 +26,20 @@
 #include "nautilus-global-preferences.h"
 
 #include "nautilus-file-utilities.h"
-#include "nautilus-font-manager.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-gtk-extensions.h"
+#include <eel/eel-font-manager.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 #include "nautilus-medusa-support.h"
 #include "nautilus-preferences-dialog.h"
 #include "nautilus-preferences-group.h"
 #include "nautilus-preferences-item.h"
-#include "nautilus-scalable-font.h"
-#include "nautilus-string.h"
+#include <eel/eel-scalable-font.h>
+#include <eel/eel-string.h>
 #include "nautilus-medusa-support.h"
-#include "nautilus-stock-dialogs.h"
+#include <eel/eel-stock-dialogs.h>
 #include "nautilus-view-identifier.h"
 #include "nautilus-sidebar-functions.h"
-#include "nautilus-smooth-widget.h"
+#include <eel/eel-smooth-widget.h>
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 #include <libgnome/gnome-i18n.h>
@@ -1156,7 +1156,7 @@ global_preferences_install_sidebar_panel_defaults (void)
 	guint i;
 	
 	/* Install the user level on/off defaults for known sidebar panels */
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (known_sidebar_panels); i++) {
+	for (i = 0; i < EEL_N_ELEMENTS (known_sidebar_panels); i++) {
 		preference_key = nautilus_sidebar_panel_make_preference_key (known_sidebar_panels[i].name);
 		
 		nautilus_preferences_default_set_boolean (preference_key,
@@ -1209,8 +1209,8 @@ global_preferences_install_font_defaults (void)
 	char *default_smooth_font;
 	const char *default_font;
 
-	default_font = nautilus_dumb_down_for_multi_byte_locale_hack () ? "fixed" : "helvetica";
-	default_smooth_font = nautilus_font_manager_get_default_font ();
+	default_font = eel_dumb_down_for_multi_byte_locale_hack () ? "fixed" : "helvetica";
+	default_smooth_font = eel_font_manager_get_default_font ();
 
 	/* Icon view fonts */
 	nautilus_preferences_default_set_string (NAUTILUS_PREFERENCES_ICON_VIEW_FONT,
@@ -1263,7 +1263,7 @@ global_preferences_use_fast_search_changed_callback (gpointer callback_data)
 			cron_status = nautilus_medusa_check_cron_is_enabled ();
 			switch (cron_status) {
 			case NAUTILUS_CRON_STATUS_OFF:
-				nautilus_show_info_dialog_with_details (_("Indexing is turned on, enabling the "
+				eel_show_info_dialog_with_details (_("Indexing is turned on, enabling the "
 									  "fast search feature. However, indexing "
 									  "currently can't be performed because "
 									  "the program crond, which does "
@@ -1280,7 +1280,7 @@ global_preferences_use_fast_search_changed_callback (gpointer callback_data)
 				
 				break;
 			case NAUTILUS_CRON_STATUS_UNKNOWN:
-				nautilus_show_info_dialog_with_details (_("Indexing is turned on, enabling the "
+				eel_show_info_dialog_with_details (_("Indexing is turned on, enabling the "
 									  "fast search feature. However, indexing "
 									  "may not be performed because the "
 									  "program crond, which does nightly "
@@ -1360,7 +1360,7 @@ global_preferences_populate_pane (NautilusPreferencesBox *preference_box,
 {
 	GtkWidget *pane;
 	GtkWidget *item;
-	NautilusStringList *group_names;
+	EelStringList *group_names;
 	guint i;
 	int group_index;
 	guint start_group_index;
@@ -1376,13 +1376,13 @@ global_preferences_populate_pane (NautilusPreferencesBox *preference_box,
 		pane = nautilus_preferences_box_add_pane (preference_box, pane_name);
 	}
 
-	group_names = nautilus_string_list_new (TRUE);
+	group_names = eel_string_list_new (TRUE);
 
 	start_group_index = nautilus_preferences_pane_get_num_groups (NAUTILUS_PREFERENCES_PANE (pane));
 
 	for (i = 0; preference_dialog_item[i].group_name != NULL; i++) {
-		if (!nautilus_string_list_contains (group_names, preference_dialog_item[i].group_name)) {
-			nautilus_string_list_insert (group_names, preference_dialog_item[i].group_name);
+		if (!eel_string_list_contains (group_names, preference_dialog_item[i].group_name)) {
+			eel_string_list_insert (group_names, preference_dialog_item[i].group_name);
 			nautilus_preferences_pane_add_group (NAUTILUS_PREFERENCES_PANE (pane),
 							     _(preference_dialog_item[i].group_name));
 		}
@@ -1390,8 +1390,7 @@ global_preferences_populate_pane (NautilusPreferencesBox *preference_box,
 
 	for (i = 0; preference_dialog_item[i].group_name != NULL; i++) {
 		group_index = start_group_index + 
-			nautilus_string_list_get_index_for_string (group_names,
-								   preference_dialog_item[i].group_name);
+			eel_string_list_get_index_for_string (group_names, preference_dialog_item[i].group_name);
 
 		nautilus_preferences_set_description (preference_dialog_item[i].preference_name,
 						      _(preference_dialog_item[i].preference_description));
@@ -1411,8 +1410,8 @@ global_preferences_populate_pane (NautilusPreferencesBox *preference_box,
 									preference_dialog_item[i].item_type);
 
 		if (preference_dialog_item[i].item_type == NAUTILUS_PREFERENCE_ITEM_CONSTRAINED_INTEGER) {
-			g_assert (nautilus_strlen (preference_dialog_item[i].constrained_integer_values) > 0);
-			g_assert (nautilus_strlen (preference_dialog_item[i].constrained_integer_labels) > 0);
+			g_assert (eel_strlen (preference_dialog_item[i].constrained_integer_values) > 0);
+			g_assert (eel_strlen (preference_dialog_item[i].constrained_integer_labels) > 0);
 			nautilus_preferences_item_set_constrained_integer_values (
 				NAUTILUS_PREFERENCES_ITEM (item),
 				preference_dialog_item[i].constrained_integer_values,
@@ -1430,7 +1429,7 @@ global_preferences_populate_pane (NautilusPreferencesBox *preference_box,
 		}
 	}
 
-	nautilus_string_list_free (group_names);
+	eel_string_list_free (group_names);
 
 	return pane;
 }
@@ -1443,7 +1442,7 @@ nautilus_global_preferences_show_dialog (void)
 {
 	GtkWidget *dialog = global_preferences_get_dialog ();
 
-	nautilus_gtk_window_present (GTK_WINDOW (dialog));
+	eel_gtk_window_present (GTK_WINDOW (dialog));
 }
 
 void
@@ -1465,29 +1464,29 @@ nautilus_global_preferences_set_dialog_title (const char *title)
 	gtk_window_set_title (GTK_WINDOW (dialog), title);
 }
 
-static NautilusScalableFont *
+static EelScalableFont *
 global_preferences_get_smooth_font (const char *smooth_font_file_name)
 {
-	NautilusScalableFont *smooth_font;
+	EelScalableFont *smooth_font;
 
 	smooth_font = (smooth_font_file_name != NULL && g_file_exists (smooth_font_file_name)) ?
-		nautilus_scalable_font_new (smooth_font_file_name) :
-		nautilus_scalable_font_get_default_font ();
+		eel_scalable_font_new (smooth_font_file_name) :
+		eel_scalable_font_get_default_font ();
 	
-	g_assert (NAUTILUS_IS_SCALABLE_FONT (smooth_font));
+	g_assert (EEL_IS_SCALABLE_FONT (smooth_font));
 	return smooth_font;
 }
 
-static NautilusScalableFont *
+static EelScalableFont *
 global_preferences_get_smooth_bold_font (const char *file_name)
 {
-	NautilusScalableFont *plain_font;
-	NautilusScalableFont *bold_font;
+	EelScalableFont *plain_font;
+	EelScalableFont *bold_font;
 
 	plain_font = global_preferences_get_smooth_font (file_name);
-	g_assert (NAUTILUS_IS_SCALABLE_FONT (plain_font));
+	g_assert (EEL_IS_SCALABLE_FONT (plain_font));
 
-	bold_font = nautilus_scalable_font_make_bold (plain_font);
+	bold_font = eel_scalable_font_make_bold (plain_font);
 
 	if (bold_font == NULL) {
 		bold_font = plain_font;
@@ -1495,7 +1494,7 @@ global_preferences_get_smooth_bold_font (const char *file_name)
 		gtk_object_unref (GTK_OBJECT (plain_font));
 	}
 
-	g_assert (NAUTILUS_IS_SCALABLE_FONT (bold_font));
+	g_assert (EEL_IS_SCALABLE_FONT (bold_font));
 	return bold_font;
 }
 
@@ -1505,7 +1504,7 @@ global_preferences_get_smooth_bold_font (const char *file_name)
  * Return value: The user's smooth font for icon file names.  Need to 
  *               unref the returned GtkObject when done with it.
  */
-NautilusScalableFont *
+EelScalableFont *
 nautilus_global_preferences_get_icon_view_smooth_font (void)
 {
 	return global_preferences_get_smooth_font (icon_view_smooth_font_auto_value);
@@ -1517,7 +1516,7 @@ nautilus_global_preferences_get_icon_view_smooth_font (void)
  * Return value: The user's smooth font for default text.
  *               Need to unref the returned GtkObject when done with it.
  */
-NautilusScalableFont *
+EelScalableFont *
 nautilus_global_preferences_get_default_smooth_font (void)
 {
 	return global_preferences_get_smooth_font (default_smooth_font_auto_value);
@@ -1531,7 +1530,7 @@ nautilus_global_preferences_get_default_smooth_font (void)
  *               used. Need to unref the returned GtkObject when done
  *               with it.
  */
-NautilusScalableFont *
+EelScalableFont *
 nautilus_global_preferences_get_default_smooth_bold_font (void)
 {
 	return global_preferences_get_smooth_bold_font (default_smooth_font_auto_value);
@@ -1545,7 +1544,7 @@ smooth_graphics_mode_changed_callback (gpointer callback_data)
 
 	is_smooth = nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE);
 	
-	nautilus_smooth_widget_global_set_is_smooth (is_smooth);
+	eel_smooth_widget_global_set_is_smooth (is_smooth);
 }
 
 void
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index 867cc6794..01faee062 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -162,9 +162,9 @@ void                         nautilus_global_preferences_hide_dialog
 void                         nautilus_global_preferences_set_dialog_title                           (const char *title);
 
 /* Sidebar */
-struct NautilusScalableFont *nautilus_global_preferences_get_icon_view_smooth_font                  (void);
-struct NautilusScalableFont *nautilus_global_preferences_get_default_smooth_font                    (void);
-struct NautilusScalableFont *nautilus_global_preferences_get_default_smooth_bold_font               (void);
+struct EelScalableFont *nautilus_global_preferences_get_icon_view_smooth_font                  (void);
+struct EelScalableFont *nautilus_global_preferences_get_default_smooth_font                    (void);
+struct EelScalableFont *nautilus_global_preferences_get_default_smooth_bold_font               (void);
 
 END_GNOME_DECLS
 
diff --git a/libnautilus-private/nautilus-glyph.c b/libnautilus-private/nautilus-glyph.c
deleted file mode 100644
index cff686df3..000000000
--- a/libnautilus-private/nautilus-glyph.c
+++ /dev/null
@@ -1,578 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-glyph.c - A wrapper for rsvg glyphs.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-glyph.h"
-#include "nautilus-art-extensions.h"
-#include "nautilus-scalable-font-private.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-debug-drawing.h"
-
-#include <libart_lgpl/art_misc.h>
-#include <libart_lgpl/art_affine.h>
-#include <libart_lgpl/art_rgb.h>
-#include <librsvg/art_rgba.h>
-#include <librsvg/rsvg-ft.h>
-
-static gboolean glyph_is_valid             (const NautilusGlyph *glyph);
-static int      glyph_get_width_space_safe (const NautilusGlyph *glyph);
-static int      glyph_get_height_space_safe (const NautilusGlyph *glyph);
-
-/* Detail member struct */
-struct NautilusGlyph
-{
-	RsvgFTGlyph *rsvg_glyph;
-	int glyph_xy[2];
-};
-
-/**
- * nautilus_glyph_new:
- * @font: A NautilusScalableFont.
- * @text: Text to use to construct the glyph.
- * @text_length: How much of the given text to use.
- * @font_size: Font size to use when constructing the glyph.
- *
- * Returns: The newly constructed glyph.
- */
-NautilusGlyph *
-nautilus_glyph_new (const NautilusScalableFont *font,
-		    int font_size,
-		    const char *text,
-		    int text_length)
-{
-	NautilusGlyph *glyph;
-	RsvgFTGlyph *rsvg_glyph;
-	const double affine[6] = { 1, 0, 0, 1, 0, 0 };
-	int glyph_xy[2];
-	
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), NULL);
-	g_return_val_if_fail (font_size > 0, NULL);
-	g_return_val_if_fail (text != NULL, NULL);
-	g_return_val_if_fail (text[0] != '\0', NULL);
-
-	rsvg_glyph = rsvg_ft_render_string (nautilus_scalable_font_get_rsvg_context (font),
-					    nautilus_scalable_font_get_rsvg_handle (font),
-					    text,
-					    text_length,
-					    font_size,
-					    font_size,
-					    affine,
-					    glyph_xy);
-	g_return_val_if_fail (rsvg_glyph != NULL, NULL);
-
-	glyph = g_new0 (NautilusGlyph, 1);
-	glyph->rsvg_glyph = rsvg_glyph;
-	glyph->glyph_xy[0] = glyph_xy[0];
-	glyph->glyph_xy[1] = glyph_xy[1];
-
-	return glyph;
-}
-
-/**
- * nautilus_glyph_free:
- * @glyph: A NautilusGlyph.
- *
- * Returns: Free the glyph and any resoures associate with it.
- */
-void
-nautilus_glyph_free (NautilusGlyph *glyph)
-{
-	g_return_if_fail (glyph != NULL);
-
-	rsvg_ft_glyph_unref (glyph->rsvg_glyph);
-	g_free (glyph);
-}
-
-static int
-glyph_get_width_space_safe (const NautilusGlyph *glyph)
-{
-	g_return_val_if_fail (glyph != NULL, 0);
-	g_return_val_if_fail (glyph->rsvg_glyph != NULL, 0);
-
-	/* Check for the case when we have only spaces. */
-	if (glyph->rsvg_glyph->width == 0 && glyph->rsvg_glyph->xpen > 0.0) {
-		return (int) glyph->rsvg_glyph->xpen;
-	}
-
-	return glyph->rsvg_glyph->width;
-}
-
-static int
-glyph_get_height_space_safe (const NautilusGlyph *glyph)
-{
-	g_return_val_if_fail (glyph != NULL, 0);
-	g_return_val_if_fail (glyph->rsvg_glyph != NULL, 0);
-
-	/* Check for the case when we have only spaces. */
-	if (glyph->rsvg_glyph->width == 0 && glyph->rsvg_glyph->xpen > 0.0) {
-		return 1;
-	}
-
-	return glyph->rsvg_glyph->height;
-}
-
-/**
- * nautilus_glyph_get_width:
- * @glyph: A NautilusGlyph.
- *
- * Returns: The width of the glyph.
- */
-int
-nautilus_glyph_get_width (const NautilusGlyph *glyph)
-{
-	g_return_val_if_fail (glyph_is_valid (glyph), 0);
-	
-	return glyph_get_width_space_safe (glyph);
-}
-
-/**
- * nautilus_glyph_get_height:
- * @glyph: A NautilusGlyph.
- *
- * Returns: The height of the glyph.
- */
-int
-nautilus_glyph_get_height (const NautilusGlyph *glyph)
-{
-	g_return_val_if_fail (glyph_is_valid (glyph), 0);
-
-	return glyph_get_height_space_safe (glyph);
-}
-
-/**
- * nautilus_glyph_get_dimensions:
- * @glyph: A NautilusGlyph.
- *
- * Returns: An ArtIRect representing the dimensions occupied by the glyph.
- */
-NautilusDimensions
-nautilus_glyph_get_dimensions (const NautilusGlyph *glyph)
-{
-	NautilusDimensions glyph_dimensions;
-
-	g_return_val_if_fail (glyph != NULL, NAUTILUS_DIMENSIONS_EMPTY);
-	g_return_val_if_fail (glyph_is_valid (glyph), NAUTILUS_DIMENSIONS_EMPTY);
-
-	glyph_dimensions.width = glyph_get_width_space_safe (glyph);
-	glyph_dimensions.height = glyph_get_height_space_safe (glyph);
-
-	return glyph_dimensions;
-}
-
-/**
- * nautilus_glyph_get_underline_rectangle:
- * @glyph: A NautilusGlyph.
- * @rectangle: The ArtIRect to store the underline dimensions in.
- *
- * Fills @rectangle with the dimensions of the underline rectangle suitable
- * for @glyph.
- */
-void
-nautilus_glyph_get_underline_rectangle (const NautilusGlyph *glyph,
-					ArtIRect	    *rectangle)
-{
-	g_return_if_fail (glyph != NULL);
-	g_return_if_fail (glyph_is_valid (glyph));
-
-	rectangle->x0 = 0;
-	rectangle->x1 = glyph_get_width_space_safe (glyph);
-	rectangle->y0 = glyph->rsvg_glyph->underline_position;
-	rectangle->y1 = rectangle->y0 + glyph->rsvg_glyph->underline_thickness;
-}
-
-/* A glyph is valid if IT and the RsvgGlyph it wraps area not NULL */
-static gboolean
-glyph_is_valid (const NautilusGlyph *glyph)
-{
-	return glyph != NULL
-		&& glyph->rsvg_glyph != NULL
-		&& glyph_get_width_space_safe (glyph) > 0
-		&& glyph_get_height_space_safe (glyph) > 0;
-}
-
-
-/* Color packing macros for nautilus_glyph_draw_to_pixbuf */
-#define RGBA_COLOR_PACK(r, g, b, a)	\
-( ((r) << 24) |				\
-  ((g) << 16) |				\
-  ((b) <<  8) |				\
-  ((a) <<  0) )
-
-#define RGB_COLOR_PACK(r, g, b)		\
-( ((r) << 24) |				\
-  ((g) << 16) |				\
-  ((b) <<  8) )
-
-#define RGBA_COLOR_PACK_ALPHA(a)	(a)
-#define RGBA_COLOR_GET_RED(c)		(((c) >> 24) & 0xFF)
-#define RGBA_COLOR_GET_GREEN(c)		(((c) >> 16) & 0xFF)
-#define RGBA_COLOR_GET_BLUE(c)		(((c) >> 8)  & 0xFF)
-#define RGBA_COLOR_GET_ALPHA(c)		(((c) >> 0)  & 0xFF)
-
-#define ABGR_COLOR_PACK(r, g, b, a)	\
-( ((a) << 24) |				\
-  ((b) << 16) |				\
-  ((g) <<  8) |				\
-  ((r) <<  0) )
-
-#define BGR_COLOR_PACK(r, g, b)		\
-( ((b) << 16) |				\
-  ((g) <<  8) |				\
-  ((r) <<  0) )
-
-#define ABGR_COLOR_PACK_ALPHA(a)	((a) << 24)
-#define ABGR_COLOR_GET_RED(c)		(((c) >> 0)  & 0xFF)
-#define ABGR_COLOR_GET_GREEN(c)		(((c) >> 8)  & 0xFF)
-#define ABGR_COLOR_GET_BLUE(c)		(((c) >> 16) & 0xFF)
-#define ABGR_COLOR_GET_ALPHA(c)		(((c) >> 24) & 0xFF)
-
-
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define PACK_COLOR_WITH_ALPHA(r, g, b, a)	ABGR_COLOR_PACK(r, g, b, a)
-#define PACK_COLOR(r, g, b)			BGR_COLOR_PACK(r, g, b)
-#define PACK_ALPHA(a)				ABGR_COLOR_PACK_ALPHA(a)
-#define GET_RED(c)				ABGR_COLOR_GET_RED(c)
-#define GET_GREEN(c)				ABGR_COLOR_GET_GREEN(c)
-#define GET_BLUE(c)				ABGR_COLOR_GET_BLUE(c)
-#define GET_ALPHA(c)				ABGR_COLOR_GET_ALPHA(c)
-#else
-#define PACK_COLOR_WITH_ALPHA(r, g, b, a) 	RGBA_COLOR_PACK(r, g, b, a)
-#define PACK_COLOR(r, g, b)			RGB_COLOR_PACK(r, g, b)
-#define PACK_ALPHA(a)				RGBA_COLOR_PACK_ALPHA(a)
-#define GET_RED(c)				RGBA_COLOR_GET_RED(c)
-#define GET_GREEN(c)				RGBA_COLOR_GET_GREEN(c)
-#define GET_BLUE(c)				RGBA_COLOR_GET_BLUE(c)
-#define GET_ALPHA(c)				RGBA_COLOR_GET_ALPHA(c)
-#endif
-
-/**
- * nautilus_glyph_draw_to_pixbuf:
- * @glyph: A NautilusGlyph.
- * @pixbuf: The destination GdkPixbuf.
- * @destination_x: The destination X coordinate.
- * @destination_y: The destination Y coordinate.
- * @clip_area: The clip area or NULL.
- * @color: Color to render the glyph with.
- * @opacity: Overall opacity of the rendered glyph.
- *
- * Render a glyph into a GdkPixbuf.   If &clip_area is not NULL, all
- * rendering is guaranteed to lie within &clip_area.  If &clip_are is NULL,
- * rendering will occur in the full extent of the pixbuf.
- */
-void
-nautilus_glyph_draw_to_pixbuf (const NautilusGlyph *glyph,
-			       GdkPixbuf *pixbuf,
-			       int destination_x,
-			       int destination_y,
-			       const ArtIRect *clip_area,
-			       guint32 color,
-			       int opacity)
-{
- 	int pixbuf_rowstride;
- 	guchar *pixbuf_pixels;
- 	guint pixbuf_pixel_offset;
- 	gboolean pixbuf_has_alpha;
-	ArtIRect target;
-	guchar *pixbuf_x_offset;
-	guchar *pixbuf_y_offset;
-	int glyph_rowstride;
-	const guchar *glyph_buffer;
-	NautilusDimensions glyph_dimensions;
-	ArtIRect glyph_bounds;
-	const guchar *glyph_x_offset;
-	const guchar *glyph_y_offset;
-	int glyph_left_skip;
-	int glyph_top_skip;
-	ArtIRect render_area;
-	int x;
-	int y;
-	const guchar foreground_r = NAUTILUS_RGBA_COLOR_GET_R (color);
-	const guchar foreground_g = NAUTILUS_RGBA_COLOR_GET_G (color);
-	const guchar foreground_b = NAUTILUS_RGBA_COLOR_GET_B (color);
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (glyph_is_valid (glyph));
-
-	/* FIXME bugzilla.eazel.com 7346: We currently dont handle opacities
-	 * other than 0xFF.
-	 */
-	g_return_if_fail (opacity == NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	/* Check for just spaces */
-	if (glyph->rsvg_glyph->buf == NULL || glyph->rsvg_glyph->rowstride <= 0) {
-		return;
-	}
-
-	/* Clip the pixbuf to the clip area; bail if no work  */
-	target = nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, clip_area);
-	if (art_irect_empty (&target)) {
-		return;
-	}
-
-	g_return_if_fail (glyph->rsvg_glyph->buf != NULL);
-	g_return_if_fail (glyph->rsvg_glyph->rowstride > 0);
-	
-	glyph_dimensions = nautilus_glyph_get_dimensions (glyph);
-	glyph_rowstride = glyph->rsvg_glyph->rowstride;
-	glyph_buffer = glyph->rsvg_glyph->buf;
-
-	pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-	pixbuf_pixels = gdk_pixbuf_get_pixels (pixbuf);
-	pixbuf_has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
-	pixbuf_pixel_offset = pixbuf_has_alpha ? 4 : 3;
-
-	/* Compute the whole glyph bounds */
-	nautilus_art_irect_assign (&glyph_bounds,
-				   destination_x,
-				   destination_y,
-				   glyph_dimensions.width,
-				   glyph_dimensions.height);
-
-	/*
-	 * Determine the actual render area.  The render area is 
-	 * the area of the glyph bounds that lies within the pixbuf
-	 * clip area;  bail if no work.
-	 */
-	art_irect_intersect (&render_area, &target, &glyph_bounds);
-	if (art_irect_empty (&render_area)) {
- 		return;
- 	}
-
-	/* Compute the offset into the pixbuf where we want to render. */
-	pixbuf_y_offset = 
-		pixbuf_pixels
-		+ (render_area.y0 * pixbuf_rowstride)
-		+ (render_area.x0 * pixbuf_pixel_offset);
-
-	/* Compute how much of the glyph to skip on the left */
-	g_assert (render_area.y0 >= glyph_bounds.y0);
-	glyph_left_skip = render_area.x0 - glyph_bounds.x0;
-
-	/* Compute how much of the glyph to skip above */
-	g_assert (render_area.x0 >= glyph_bounds.x0);
-	glyph_top_skip = render_area.y0 - glyph_bounds.y0;
-
-	/* The glyph buffer is an array of bytes.  Each byte
-	 * represents the opacity corresponding to the pixel
-	 * at that offset.
-	 */
-
-	/* Compute the offset into the glyph buffer from where we want to read
-	 * it contents.
-	 *
-	 * The glyph buffer is an array of bytes.  Each byte represents an 
-	 * opacity for a pixel at the corresponding offset.
-	 */
-	glyph_y_offset = 
-		glyph_buffer
-		+ (glyph_top_skip * glyph_rowstride)
-		+ glyph_left_skip;
-
-
-	/* Thanks to the careful clipping above, the iterations below
-	 * should always be within the bounds of both the pixbuf's pixels
-	 * and the glyph's buffer.
-	 */
-
-	if (pixbuf_has_alpha) {
-		/* Speed optimization -- avoid calling art_rgba_run_alpha, precompute
-		 * src_rgb outside of the loop
-		 */
-		 
-		guint32 src_color, dst_color;
-		
-		src_color = PACK_COLOR(foreground_r, foreground_g, foreground_b);
-		
-		for (y = render_area.y0 ; y < render_area.y1; y++) {
-			pixbuf_x_offset = pixbuf_y_offset;
-			glyph_x_offset = glyph_y_offset;
-			
-			/* Iterate horizontally */
-			for (x = render_area.x0 ; x < render_area.x1; x++) {
-				guchar dest_alpha;
-				const guchar source_alpha = *glyph_x_offset;
-				dst_color = *(guint32 *) pixbuf_x_offset;
-				dest_alpha = GET_ALPHA (dst_color);
-		
-				if (dest_alpha) { 
-					int dst_r, dst_g, dst_b, tmp, a, c;
-
-					tmp = (255 - source_alpha) * (255 - dest_alpha) + 0x80;
-					a = 255 - ((tmp + (tmp >> 8)) >> 8);
-					c = ((source_alpha << 16) + (a >> 1)) / a;
-
-					dst_r = GET_RED (dst_color);
-					dst_g = GET_GREEN (dst_color);
-					dst_b = GET_BLUE (dst_color);
-	
-					dst_r += (((foreground_r - dst_r) * c + 0x8000) >> 16);
-					dst_g += (((foreground_g - dst_g) * c + 0x8000) >> 16);
-					dst_b += (((foreground_b - dst_b) * c + 0x8000) >> 16);
-	
-					*(guint32 *) pixbuf_x_offset = PACK_COLOR_WITH_ALPHA (dst_r, dst_g, dst_b, a);
-				} else {
-	  				*(guint32 *) pixbuf_x_offset = PACK_ALPHA (source_alpha) | src_color;
-				}
-	
-				/* Advance to the next pixel */
-				pixbuf_x_offset += pixbuf_pixel_offset;
-	
-				/* Advance to the next opacity */
-				glyph_x_offset++;
-			}
-	
-			/* Advance to the next pixbuf pixel row */
-			pixbuf_y_offset += pixbuf_rowstride;
-	
-			/* Advance to the next glyph buffer row */
-			glyph_y_offset += glyph_rowstride;
-		}
-	} else {
-		/* Iterate vertically */
-		for (y = render_area.y0 ; y < render_area.y1; y++) {
-			pixbuf_x_offset = pixbuf_y_offset;
-			glyph_x_offset = glyph_y_offset;
-			
-			/* Iterate horizontally */
-			for (x = render_area.x0 ; x < render_area.x1; x++) {
-				const guchar point_opacity = *glyph_x_offset;
-	
-				/* Optimize the common fully opaque case */
-				if (point_opacity == NAUTILUS_OPACITY_FULLY_OPAQUE) {
-					*(pixbuf_x_offset + 0) = foreground_r;
-					*(pixbuf_x_offset + 1) = foreground_g;
-					*(pixbuf_x_offset + 2) = foreground_b;
-					if (pixbuf_has_alpha) {
-						*(pixbuf_x_offset + 3) = NAUTILUS_OPACITY_FULLY_OPAQUE;
-					}
-				/* If the opacity is not fully opaque or fully transparent,
-				 * we need to to alpha blending.
-				 */
-				} else if (point_opacity != NAUTILUS_OPACITY_FULLY_TRANSPARENT) {
-					if (pixbuf_has_alpha) {
-						art_rgba_run_alpha (pixbuf_x_offset,
-								    foreground_r,
-								    foreground_g,
-								    foreground_b,
-								    point_opacity,
-								    1);
-					} else {
-						art_rgb_run_alpha (pixbuf_x_offset,
-								   foreground_r,
-								   foreground_g,
-								   foreground_b,
-								   point_opacity,
-								   1);
-					}
-				}
-	
-				/* Advance to the next pixel */
-				pixbuf_x_offset += pixbuf_pixel_offset;
-	
-				/* Advance to the next opacity */
-				glyph_x_offset++;
-			}
-	
-			/* Advance to the next pixbuf pixel row */
-			pixbuf_y_offset += pixbuf_rowstride;
-	
-			/* Advance to the next glyph buffer row */
-			glyph_y_offset += glyph_rowstride;
-		}
-	}
-}
-
-ArtIRect
-nautilus_glyph_intersect (const NautilusGlyph *glyph,
-			  int glyph_x,
-			  int glyph_y,
-			  const ArtIRect *rectangle)
-{
-	ArtIRect intersection;
-	ArtIRect bounds;
-	NautilusDimensions dimensions;
-
-	g_return_val_if_fail (glyph_is_valid (glyph), NAUTILUS_ART_IRECT_EMPTY);
-	
-	dimensions = nautilus_glyph_get_dimensions (glyph);
-	bounds = nautilus_art_irect_assign_dimensions (glyph_x, glyph_y, &dimensions);
-
-	if (rectangle == NULL) {
-		return bounds;
-	}
-
-	art_irect_intersect (&intersection, rectangle, &bounds);
-
-	/* In theory, this is not needed because a rectangle is empty
-	 * regardless of how MUCH negative the dimensions are.  
-	 * However, to make debugging and self checks simpler, we
-	 * consistenly return a standard empty rectangle.
-	 */
-	if (art_irect_empty (&intersection)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	return intersection;
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-#include <string.h>
-#include <memory.h>
-
-gboolean
-nautilus_glyph_compare (NautilusGlyph *a, NautilusGlyph *b)
-{
-	int y;
-
-	if (a->glyph_xy[0] != b->glyph_xy[0]
-	    || a->glyph_xy[1] != b->glyph_xy[1]) {
-		return FALSE;
-	}
-
-	if (a->rsvg_glyph->width != b->rsvg_glyph->width
-	    || a->rsvg_glyph->height != b->rsvg_glyph->height
-	    || a->rsvg_glyph->underline_position != b->rsvg_glyph->underline_position
-	    || a->rsvg_glyph->underline_thickness != b->rsvg_glyph->underline_thickness
-	    || a->rsvg_glyph->xpen != b->rsvg_glyph->xpen
-	    || a->rsvg_glyph->ypen != b->rsvg_glyph->ypen
-	    || a->rsvg_glyph->rowstride != b->rsvg_glyph->rowstride) {
-		return FALSE;
-	}
-
-	for (y = 0; y < a->rsvg_glyph->height; y++) {
-		if (memcmp (a->rsvg_glyph->buf + y * a->rsvg_glyph->rowstride,
-			    b->rsvg_glyph->buf + y * b->rsvg_glyph->rowstride,
-			    a->rsvg_glyph->rowstride) != 0) {
-			return FALSE;
-		}
-	}
-
-	return TRUE;
-}
-
-#endif /* NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-glyph.h b/libnautilus-private/nautilus-glyph.h
deleted file mode 100644
index 01411cf78..000000000
--- a/libnautilus-private/nautilus-glyph.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-glyph.h - A wrapper for rsvg glyphs.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_GLYPH_H
-#define NAUTILUS_GLYPH_H
-
-#include <libgnome/gnome-defs.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libart_lgpl/art_rect.h>
-#include <libnautilus-extensions/nautilus-scalable-font.h>
-#include <libnautilus-extensions/nautilus-art-extensions.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct NautilusGlyph NautilusGlyph;
-
-NautilusGlyph *    nautilus_glyph_new            (const NautilusScalableFont *font,
-						  int                         font_size,
-						  const char                 *text,
-						  int                         text_length);
-void               nautilus_glyph_free           (NautilusGlyph              *glyph);
-int                nautilus_glyph_get_width      (const NautilusGlyph        *glyph);
-int                nautilus_glyph_get_height     (const NautilusGlyph        *glyph);
-NautilusDimensions nautilus_glyph_get_dimensions (const NautilusGlyph        *glyph);
-void		   nautilus_glyph_get_underline_rectangle (const NautilusGlyph *glyph,
-							   ArtIRect	     *rectangle);
-void               nautilus_glyph_draw_to_pixbuf (const NautilusGlyph        *glyph,
-						  GdkPixbuf                  *pixbuf,
-						  int                         destination_x,
-						  int                         destination_y,
-						  const ArtIRect             *clip_area,
-						  guint32                     color,
-						  int                         opacity);
-ArtIRect           nautilus_glyph_intersect      (const NautilusGlyph        *glyph,
-						  int                         glyph_x,
-						  int                         glyph_y,
-						  const ArtIRect             *rectangle);
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-gboolean	   nautilus_glyph_compare	 (NautilusGlyph		     *a,
-						  NautilusGlyph		     *b);
-#endif /* NAUTILUS_OMIT_SELF_CHECK */
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_GLYPH_H */
-
-
diff --git a/libnautilus-private/nautilus-gnome-extensions.c b/libnautilus-private/nautilus-gnome-extensions.c
deleted file mode 100644
index a94339426..000000000
--- a/libnautilus-private/nautilus-gnome-extensions.c
+++ /dev/null
@@ -1,844 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gnome-extensions.c - implementation of new functions that operate on
-                                 gnome classes. Perhaps some of these should be
-  			         rolled into gnome someday.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#include <config.h>
-
-#include <sys/stat.h>
-
-#include "nautilus-gnome-extensions.h"
-
-#include <gtk/gtkwidget.h>
-#include <libart_lgpl/art_rgb.h>
-#include <libart_lgpl/art_rect.h>
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-stock-dialogs.h"
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-file-entry.h>
-#include <libgnomeui/gnome-icon-list.h>
-#include <libgnomeui/gnome-icon-sel.h>
-#include <limits.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/wait.h>
-
-/* structure for the icon selection dialog */
-struct IconSelectionData {
-        GtkWidget *icon_selection;
-	GtkWidget *file_entry;
-	GtkWidget *top_level_window;
-	GtkWindow *owning_window;
-	gboolean dismissed;
-	NautilusIconSelectionFunction selection_function;
-	gpointer callback_data;
-};
-
-typedef struct IconSelectionData IconSelectionData;
-
-void
-nautilus_gnome_canvas_world_to_window_rectangle (GnomeCanvas *canvas,
-						 const ArtDRect *world_rect,
-						 ArtIRect *window_rect)
-{
-	double x0, y0, x1, y1;
-
-	g_return_if_fail (GNOME_IS_CANVAS (canvas));
-	g_return_if_fail (world_rect != NULL);
-	g_return_if_fail (window_rect != NULL);
-
-	gnome_canvas_world_to_window (canvas,
-				      world_rect->x0,
-				      world_rect->y0,
-				      &x0, &y0);
-	gnome_canvas_world_to_window (canvas,
-				      world_rect->x1,
-				      world_rect->y1,
-				      &x1, &y1);
-
-	window_rect->x0 = x0;
-	window_rect->y0 = y0;
-	window_rect->x1 = x1;
-	window_rect->y1 = y1;
-}
-
-void
-nautilus_gnome_canvas_world_to_canvas_rectangle (GnomeCanvas *canvas,
-						 const ArtDRect *world_rect,
-						 ArtIRect *canvas_rect)
-{
-	g_return_if_fail (GNOME_IS_CANVAS (canvas));
-	g_return_if_fail (world_rect != NULL);
-	g_return_if_fail (canvas_rect != NULL);
-
-	gnome_canvas_w2c (canvas,
-			  world_rect->x0,
-			  world_rect->y0,
-			  &canvas_rect->x0,
-			  &canvas_rect->y0);
-	gnome_canvas_w2c (canvas,
-			  world_rect->x1,
-			  world_rect->y1,
-			  &canvas_rect->x1,
-			  &canvas_rect->y1);
-}
-
-void
-nautilus_gnome_canvas_item_get_current_canvas_bounds (GnomeCanvasItem *item,
-						      ArtIRect *bounds)
-{
-	g_return_if_fail (GNOME_IS_CANVAS_ITEM (item));
-	g_return_if_fail (bounds != NULL);
-
-	bounds->x0 = item->x1;
-	bounds->y0 = item->y1;
-	bounds->x1 = item->x2;
-	bounds->y1 = item->y2;
-}
-
-void
-nautilus_gnome_canvas_item_request_redraw (GnomeCanvasItem *item)
-{
-	g_return_if_fail (GNOME_IS_CANVAS_ITEM (item));
-
-	gnome_canvas_request_redraw (item->canvas,
-				     item->x1, item->y1,
-				     item->x2, item->y2);
-}
-
-void
-nautilus_gnome_canvas_request_redraw_rectangle (GnomeCanvas *canvas,
-						const ArtIRect *canvas_rectangle)
-{
-	g_return_if_fail (GNOME_IS_CANVAS (canvas));
-
-	gnome_canvas_request_redraw (canvas,
-				     canvas_rectangle->x0, canvas_rectangle->y0,
-				     canvas_rectangle->x1, canvas_rectangle->y1);
-}
-
-void
-nautilus_gnome_canvas_item_get_world_bounds (GnomeCanvasItem *item,
-					     ArtDRect *world_bounds)
-{
-	gnome_canvas_item_get_bounds (item,
-				      &world_bounds->x0,
-				      &world_bounds->y0,
-				      &world_bounds->x1,
-				      &world_bounds->y1);
-	if (item->parent != NULL) {
-		gnome_canvas_item_i2w (item->parent,
-				       &world_bounds->x0,
-				       &world_bounds->y0);
-		gnome_canvas_item_i2w (item->parent,
-				       &world_bounds->x1,
-				       &world_bounds->y1);
-	}
-}
-
-void
-nautilus_gnome_canvas_item_get_canvas_bounds (GnomeCanvasItem *item,
-					      ArtIRect *canvas_bounds)
-{
-	ArtDRect world_bounds;
-
-	nautilus_gnome_canvas_item_get_world_bounds
-		(item, &world_bounds);
-	nautilus_gnome_canvas_world_to_canvas_rectangle
-		(item->canvas, &world_bounds, canvas_bounds);
-}
-
-static void
-nautilus_gnome_canvas_draw_pixbuf_helper (art_u8 *dst, int dst_rowstride,
-					  const art_u8 *src, int src_rowstride,
-					  int copy_width, int copy_height)
-{
-	art_u8 *dst_limit = dst + copy_height * dst_rowstride;
-	int dst_bytes_per_row = copy_width * 3;
-	
-	while (dst < dst_limit) {
- 		memcpy (dst, src, dst_bytes_per_row);
-		dst += dst_rowstride;
-		src += src_rowstride;
-	}
-}
-
-static void
-nautilus_gnome_canvas_draw_pixbuf_helper_alpha (art_u8 *dst, int dst_rowstride,
-						const art_u8 *src, int src_rowstride,
-						int copy_width, int copy_height)
-{
-	art_u8 *dst_limit = dst + copy_height * dst_rowstride;
-	int dst_bytes_per_row = copy_width * 3;
-	
-	while (dst < dst_limit) {
-	
-		art_u8 *dst_p = dst;
-		art_u8 *dst_p_limit = dst + dst_bytes_per_row;
-		
-		const art_u8 *src_p = src;
-		
-		while (dst_p < dst_p_limit) {
-			int alpha = src_p[3];
-			if (alpha) {
-				if (alpha == 255) {
-					dst_p[0] = src_p[0];
-					dst_p[1] = src_p[1];
-					dst_p[2] = src_p[2];
-				} else {
-		  			int tmp;
-					art_u8 bg_r = dst_p[0];
-					art_u8 bg_g = dst_p[1];
-					art_u8 bg_b = dst_p[2];
-
-					tmp = (src_p[0] - bg_r) * alpha;
-					dst_p[0] = bg_r + ((tmp + (tmp >> 8) + 0x80) >> 8);
-					tmp = (src_p[1] - bg_g) * alpha;
-					dst_p[1] = bg_g + ((tmp + (tmp >> 8) + 0x80) >> 8);
-					tmp = (src_p[2] - bg_b) * alpha;
-					dst_p[2] = bg_b + ((tmp + (tmp >> 8) + 0x80) >> 8);		  
-				}
-			}
-			
-			dst_p += 3;
-			src_p += 4;
-		}
-		
-		dst += dst_rowstride;
-		src += src_rowstride;
-	}
-}
-
-/* Draws a pixbuf into a canvas update buffer (unscaled). The x,y coords are the location
- * of the pixbuf in canvas space (NOT relative to the canvas buffer).
- */
-void
-nautilus_gnome_canvas_draw_pixbuf (GnomeCanvasBuf *buf, const GdkPixbuf *pixbuf, int x, int y)
-{
-	art_u8 *dst;
-	int pixbuf_width, pixbuf_height;
-
-	/* copy_left/top/right/bottom define the rect of the pixbuf (pixbuf relative)
-	 * we will copy into the canvas buffer
-	 */
-	int copy_left, copy_top, copy_right, copy_bottom;
-	
-	dst = buf->buf;
-
-	pixbuf_width = gdk_pixbuf_get_width (pixbuf);
-	pixbuf_height = gdk_pixbuf_get_height (pixbuf);
-
-	if (x > buf->rect.x0) {
-		copy_left = 0;
-		dst += (x - buf->rect.x0) * 3;
-	} else {
-		copy_left = buf->rect.x0 - x;
-	}
-	
-	if (x + pixbuf_width > buf->rect.x1) {
-		copy_right = buf->rect.x1 - x;
-	} else {
-		copy_right = pixbuf_width;		
-	}
-	
-	if (copy_left >= copy_right) {
-		return;
-	}
-	
-	if (y > buf->rect.y0) {
-		dst += (y - buf->rect.y0) * buf->buf_rowstride;
-		copy_top = 0;
-	} else {
-		copy_top = buf->rect.y0 - y;
-	}
-	
-	if (y + pixbuf_height > buf->rect.y1) {
-		copy_bottom = buf->rect.y1 - y;
-	} else {
-		copy_bottom = pixbuf_height;		
-	}
-
-	if (copy_top >= copy_bottom) {
-		return;
-	}
-
-	if (gdk_pixbuf_get_has_alpha (pixbuf)) {
-		nautilus_gnome_canvas_draw_pixbuf_helper_alpha (
-			dst,
-			buf->buf_rowstride,
-			gdk_pixbuf_get_pixels (pixbuf) + copy_left * 4 + copy_top * gdk_pixbuf_get_rowstride (pixbuf),
-			gdk_pixbuf_get_rowstride (pixbuf),
-			copy_right - copy_left,
-			copy_bottom - copy_top);
-	} else {
-		nautilus_gnome_canvas_draw_pixbuf_helper (
-			dst,
-			buf->buf_rowstride,
-			gdk_pixbuf_get_pixels (pixbuf) + copy_left * 3 + copy_top * gdk_pixbuf_get_rowstride (pixbuf),
-			gdk_pixbuf_get_rowstride (pixbuf),
-			copy_right - copy_left,
-			copy_bottom - copy_top);
-	}
-}
-
-void
-nautilus_gnome_canvas_fill_rgb (GnomeCanvasBuf *buf, art_u8 r, art_u8 g, art_u8 b)
-{
-	art_u8 *dst = buf->buf;
-	int width = buf->rect.x1 - buf->rect.x0;
-	int height = buf->rect.y1 - buf->rect.y0;
-
-	if (buf->buf_rowstride == width * 3) {
-	 	art_rgb_fill_run (dst, r, g, b, width * height);
-	} else {
-		art_u8 *dst_limit = dst + height * buf->buf_rowstride;
-		while (dst < dst_limit) {
-	 		art_rgb_fill_run (dst, r, g, b, width);
-			dst += buf->buf_rowstride;
-		}
-	}
-}
-
-GtkButton *
-nautilus_gnome_dialog_get_button_by_index (GnomeDialog *dialog, int index)
-{
-	gpointer data;
-
-	g_return_val_if_fail (GNOME_IS_DIALOG (dialog), NULL);
-	g_return_val_if_fail (index >= 0, NULL);
-
-	data = g_list_nth_data (GNOME_DIALOG (dialog)->buttons, index);
-	if (data == NULL) {
-		return NULL;
-	}
-
-	return GTK_BUTTON (data);
-}
-
-void
-nautilus_gnome_canvas_item_request_update_deep (GnomeCanvasItem *item)
-{
-	GList *p;
-
-	gnome_canvas_item_request_update (item);
-	if (GNOME_IS_CANVAS_GROUP (item)) {
-		for (p = GNOME_CANVAS_GROUP (item)->item_list; p != NULL; p = p->next) {
-			nautilus_gnome_canvas_item_request_update_deep (p->data);
-		}
-	}
-}
-
-void
-nautilus_gnome_canvas_request_update_all (GnomeCanvas *canvas)
-{
-	nautilus_gnome_canvas_item_request_update_deep (canvas->root);
-}
-
-/* The gnome_canvas_set_scroll_region function doesn't do an update,
- * even though it should. The update is in there with an #if 0 around
- * it, with no explanation of why it's commented out. For now, work
- * around this by requesting an update explicitly.
- */
-void
-nautilus_gnome_canvas_set_scroll_region (GnomeCanvas *canvas,
-					 double x1, double y1,
-					 double x2, double y2)
-{
-	double old_x1, old_y1, old_x2, old_y2;
-
-	/* Change the scroll region and do an update if it changes. */
-	gnome_canvas_get_scroll_region (canvas, &old_x1, &old_y1, &old_x2, &old_y2);
-	if (old_x1 != x1 || old_y1 != y1 || old_x2 != x2 || old_y2 != y2) {
-		gnome_canvas_set_scroll_region (canvas, x1, y1, x2, y2);
-		nautilus_gnome_canvas_request_update_all (canvas);
-		gnome_canvas_item_request_update (canvas->root);
-	}
-}
-
-/* The code in GnomeCanvas (the scroll_to function to be exact) always
- * centers the contents of the canvas if the contents are smaller than
- * the canvas, and it does some questionable math when computing
- * that. This code is working to undo that mistake.
- */
-void
-nautilus_gnome_canvas_set_scroll_region_left_justify (GnomeCanvas *canvas,
-						      double x1, double y1,
-						      double x2, double y2)
-{
-	double height, width;
-
-	/* To work around the logic in scroll_to that centers the
-	 * canvas contents if they are smaller than the canvas widget,
-	 * we must do the exact opposite of what it does. The -1 here
-	 * is due to the ill-conceived ++ in scroll_to.
-	 */
-	width = (GTK_WIDGET (canvas)->allocation.width - 1) / canvas->pixels_per_unit;
-	height = (GTK_WIDGET (canvas)->allocation.height - 1) / canvas->pixels_per_unit;
-	nautilus_gnome_canvas_set_scroll_region
-		(canvas, x1, y1,
-		 MAX (x2, x1 + width), MAX (y2, y1 + height));
-}
-
-/* Set a new scroll region without eliminating any of the currently-visible area. */
-void
-nautilus_gnome_canvas_set_scroll_region_include_visible_area (GnomeCanvas *canvas,
-						      	      double x1, double y1,
-						      	      double x2, double y2)
-{
-	double old_x1, old_y1, old_x2, old_y2;
-	double old_scroll_x, old_scroll_y;
-	double height, width;
-
-	gnome_canvas_get_scroll_region (canvas, &old_x1, &old_y1, &old_x2, &old_y2);
-
-	/* The -1 here is due to the ill-conceived ++ in scroll_to. */
-	width = (GTK_WIDGET (canvas)->allocation.width - 1) / canvas->pixels_per_unit;
-	height = (GTK_WIDGET (canvas)->allocation.height - 1) / canvas->pixels_per_unit;
-
-	old_scroll_x = gtk_layout_get_hadjustment (GTK_LAYOUT (canvas))->value;
-	old_scroll_y = gtk_layout_get_vadjustment (GTK_LAYOUT (canvas))->value;
-
-	x1 = MIN (x1, old_x1 + old_scroll_x);
-	y1 = MIN (y1, old_y1 + old_scroll_y);
-	x2 = MAX (x2, old_x1 + old_scroll_x + width);
-	y2 = MAX (y2, old_y1 + old_scroll_y + height);
-
-	nautilus_gnome_canvas_set_scroll_region
-		(canvas, x1, y1, x2, y2);
-}
-
-
-/* Code from GMC, contains all the voodoo needed to start
- * a terminal from the file manager nicely
- */
-
-static int
-max_open_files (void)
-{
-	static int files;
-
-	if (files != 0) {
-		return files;
-	}
-
-#ifdef HAVE_SYSCONF
-	files = sysconf (_SC_OPEN_MAX);
-	if (files != -1)
-		return files;
-#endif
-#ifdef OPEN_MAX
-	files = OPEN_MAX;
-#else
-	files = 256;
-#endif
-	return files;
-}
-
-int 
-nautilus_gnome_shell_execute (const char *command)
-{
-	struct sigaction ignore, save_intr, save_quit, save_stop;
-	int status, i;
-	int pid;
-	
-	ignore.sa_handler = SIG_IGN;
-	sigemptyset (&ignore.sa_mask);
-	ignore.sa_flags = 0;
-	status = 0;
-    
-	sigaction (SIGINT, &ignore, &save_intr);    
-	sigaction (SIGQUIT, &ignore, &save_quit);
-
-	pid = fork ();
-	if (pid < 0){
-		return -1;
-	}
-	
-	if (pid == 0){
-		int top;
-		struct sigaction default_pipe;
-
-		top = max_open_files ();
-		sigaction (SIGINT,  &save_intr, NULL);
-		sigaction (SIGQUIT, &save_quit, NULL);
-
-		/*
-		 * reset sigpipe
-		 */
-		default_pipe.sa_handler = SIG_DFL;
-		sigemptyset (&default_pipe.sa_mask);
-		default_pipe.sa_flags = 0;
-		
-		sigaction (SIGPIPE, &default_pipe, NULL);
-		
-		for (i = 0; i < top; i++)
-			close (i);
-
-		/* Setup the file descriptor for the child */
-		   
-		/* stdin */
-		open ("/dev/null", O_APPEND);
-
-		/* stdout */
-		open ("/dev/null", O_RDONLY);
-
-		/* stderr */
-		open ("/dev/null", O_RDONLY);
-		
-		pid = fork ();
-		if (pid == 0){
-			execl ("/bin/sh", "/bin/sh", "-c", command, (char *) 0);
-			/* See note below for why we use _exit () */
-			_exit (127);		/* Exec error */
-		}
-		/* We need to use _exit instead of exit to avoid
-		 * calling the atexit handlers (specifically the gdk atexit
-		 * handler
-		 */
-		_exit (0);
-	}
-	waitpid (pid, &status, 0);
-	sigaction (SIGINT,  &save_intr, NULL);
-	sigaction (SIGQUIT, &save_quit, NULL);
-	sigaction (SIGTSTP, &save_stop, NULL);
-
-	return WEXITSTATUS(status);
-}
-
-/* Return a command string containing the path to a terminal on this system. */
-char *
-nautilus_gnome_get_terminal_path (void)
-{
-	char *terminal_path;
-	
-	/* Look up a well-known terminal app */
-	terminal_path = gnome_is_program_in_path ("gnome-terminal");
-	
-	if (terminal_path == NULL) {
-		terminal_path = gnome_is_program_in_path ("nxterm");
-	}
-	
-	if (terminal_path == NULL) {
-		terminal_path = gnome_is_program_in_path ("color-xterm");
-	}
-	
-	if (terminal_path == NULL) {
-		terminal_path = gnome_is_program_in_path ("rxvt");
-	}
-	
-	if (terminal_path == NULL) {
-		terminal_path = gnome_is_program_in_path ("xterm");
-	}
-	
-	if (terminal_path == NULL) {
-		terminal_path = gnome_is_program_in_path ("dtterm");
-	}
-
-	
-	return terminal_path;
-}
-
-void
-nautilus_gnome_open_terminal (const char *command)
-{
-	char *terminal_path;
-	char *terminal_path_with_flags;
-	char *terminal_flags;
-	gboolean using_gnome_terminal;
-	char *command_line;
-	
-	terminal_path = nautilus_gnome_get_terminal_path ();
-	if (terminal_path == NULL){
-		g_message (" Could not start a terminal ");
-		g_free (terminal_path);
-		return;
-	}
-	
-	using_gnome_terminal = strstr (terminal_path, "gnome-terminal") != NULL;
-	
-	if (command != NULL) {
-		if (using_gnome_terminal) {
-			command_line = g_strconcat (terminal_path, " -x ", command, NULL);
-		} else {
-			command_line = g_strconcat (terminal_path, " -e ", command, NULL);
-		}
-				
-		nautilus_gnome_shell_execute (command_line);
-		g_free (command_line);
-	} else {
-	        if (using_gnome_terminal) {
-			terminal_flags = " --login";
-			terminal_path_with_flags = g_strconcat (terminal_path, terminal_flags,  NULL);
-		        nautilus_gnome_shell_execute (terminal_path_with_flags);
-		        g_free (terminal_path_with_flags);
-		} else {
-			terminal_flags = " -ls";
-			terminal_path_with_flags = g_strconcat (terminal_path, terminal_flags, NULL);
-			nautilus_gnome_shell_execute (terminal_path_with_flags);
-		}
-	}
-
-	g_free (terminal_path);
-}
-
-/* create a new icon selection dialog */
-
-
-static gboolean
-widget_destroy_callback (gpointer callback_data)
-{
-	IconSelectionData *selection_data = (IconSelectionData*) callback_data;
-	gtk_widget_destroy (selection_data->top_level_window);
-	g_free (selection_data);	
-	return FALSE;
-}
-
-/* set the image of the file object to the selected file */
-static void
-icon_selected_callback (GtkWidget *button, IconSelectionData *selection_data)
-{
-	const gchar *icon_path;
-	GtkWidget *entry;
-	struct stat buf;
-	
-	gnome_icon_selection_stop_loading ( GNOME_ICON_SELECTION (selection_data->icon_selection));
-
-	entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (selection_data->file_entry));
-	icon_path = gtk_entry_get_text (GTK_ENTRY (entry));
-
-	/* if a specific file wasn't selected, put up a dialog to tell the
-	 * user to pick something, and leave the picker up
-	 */
-	stat (icon_path, &buf);
-	if (S_ISDIR (buf.st_mode)) {
-		nautilus_show_error_dialog (_("No image was selected.  You must click on an image to select it."),
-					    _("No selection made"),
-					    selection_data->owning_window);
-	} else {	 
-		/* invoke the callback to inform it of the file path */
-		selection_data->selection_function (icon_path, selection_data->callback_data);
-	}
-		
-	/* we have to get rid of the icon selection dialog, but we can't do it now, since the
-	 * file entry might still need it.  Do it when the next idle rolls around
-	 */ 
-	selection_data->dismissed = TRUE;
-	selection_data->top_level_window = gtk_widget_get_toplevel (button);
-	gtk_idle_add ((GtkFunction) widget_destroy_callback, selection_data);
-}
-
-/* handle the cancel button being pressed */
-static void
-icon_cancel_pressed (GtkWidget *button, IconSelectionData *selection_data)
-{
-	/* nothing to do if it's already been dismissed */
-	if (selection_data->dismissed) {
-		return;
-	}
-	
-	gnome_icon_selection_stop_loading(GNOME_ICON_SELECTION (selection_data->icon_selection));	
-	/* remove pending idle routine, if necessary */
-	g_free (selection_data);
-	gtk_widget_destroy (gtk_widget_get_toplevel (button));
-}
-
-/* handle an icon being selected by updating the file entry */
-static void
-list_icon_selected_callback (GnomeIconList *gil, gint num, GdkEvent *event, IconSelectionData *selection_data)
-{
-	const gchar *icon;
-	GtkWidget *entry;
-	
-	icon = gnome_icon_selection_get_icon (GNOME_ICON_SELECTION (selection_data->icon_selection), TRUE);
-
-	if (icon != NULL) {
-		entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (selection_data->file_entry));
-		gtk_entry_set_text(GTK_ENTRY (entry), icon);
-	}
-
-	/* handle double-clicks as if the user pressed OK */
-	if(event && event->type == GDK_2BUTTON_PRESS && ((GdkEventButton *)event)->button == 1) {
-		icon_selected_callback (selection_data->file_entry, selection_data);
-	}
-}
-
-/* handle the file entry changing */
-static void
-entry_activated (GtkWidget *widget, IconSelectionData *selection_data)
-{
-	struct stat buf;
-	GtkWidget *icon_selection;
-	gchar *filename;
-
-	filename = gtk_entry_get_text (GTK_ENTRY (widget));
-	if (!filename) {
-		return;
-	}
-	
-	stat (filename, &buf);
-	if (S_ISDIR (buf.st_mode)) {
-		icon_selection = selection_data->icon_selection;
-		gnome_icon_selection_clear (GNOME_ICON_SELECTION (icon_selection), TRUE);
-		gnome_icon_selection_add_directory (GNOME_ICON_SELECTION (icon_selection), filename);
-		gnome_icon_selection_show_icons(GNOME_ICON_SELECTION (icon_selection));
-	} else {
-		/* We pretend like ok has been called */
-		icon_selected_callback (selection_data->file_entry, selection_data);
-	}
-}
-
-/* here's the actual routine that creates the icon selector */
-
-GtkWidget *
-nautilus_gnome_icon_selector_new (const char *title,
-				  const char *icon_directory,
-				  GtkWindow *owner,
-				  NautilusIconSelectionFunction selected,
-				  gpointer callback_data)
-{
-	GtkWidget *dialog, *icon_selection;
-	GtkWidget *entry, *file_entry;
-	IconSelectionData *selection_data;
-	
-	dialog = gnome_dialog_new (title,
-					GNOME_STOCK_BUTTON_OK,
-					GNOME_STOCK_BUTTON_CANCEL,
-					NULL);
-
-	gnome_dialog_close_hides (GNOME_DIALOG (dialog), TRUE);
-	gnome_dialog_set_close  (GNOME_DIALOG(dialog), TRUE);
-
-	gtk_window_set_policy (GTK_WINDOW (dialog), TRUE, TRUE, TRUE);
-
-	icon_selection = gnome_icon_selection_new();
-
-	file_entry = gnome_file_entry_new (NULL,NULL);
-	
-	selection_data = g_new0 (IconSelectionData, 1);
- 	selection_data->icon_selection = icon_selection;
- 	selection_data->file_entry = file_entry;
- 	selection_data->owning_window = owner;
-	selection_data->selection_function = selected;
- 	selection_data->callback_data = callback_data;
- 	
-	gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dialog)->vbox),
-				   file_entry, FALSE, FALSE, 0);
-
-	gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dialog)->vbox),
-				   icon_selection, TRUE, TRUE, 0);
-
-	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
-	if (owner != NULL) {
-		gtk_window_set_transient_for (GTK_WINDOW (dialog), owner);
- 	}
- 	gtk_window_set_wmclass (GTK_WINDOW (dialog), "file_selector", "Nautilus");
-	gtk_widget_show_all (dialog);
-	
-	entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (file_entry));
-	
-	if (icon_directory == NULL) {
-		gtk_entry_set_text(GTK_ENTRY (entry), DATADIR "/pixmaps");
-		gnome_icon_selection_add_directory(GNOME_ICON_SELECTION (icon_selection), DATADIR "/pixmaps");	
-	} else {
-		gtk_entry_set_text(GTK_ENTRY (entry), icon_directory);
-		gnome_icon_selection_add_directory(GNOME_ICON_SELECTION (icon_selection), icon_directory);
-	}
-	
-	gnome_icon_selection_show_icons( GNOME_ICON_SELECTION (icon_selection));	
-	gnome_dialog_button_connect(GNOME_DIALOG(dialog), 
-					    0, /* OK button */
-					    GTK_SIGNAL_FUNC (icon_selected_callback),
-					    selection_data);
-	
-	gnome_dialog_button_connect (GNOME_DIALOG(dialog), 
-					    1, /* Cancel button */
-					    GTK_SIGNAL_FUNC (icon_cancel_pressed),
-					    selection_data);
-	
-	gtk_signal_connect_after(GTK_OBJECT (GNOME_ICON_SELECTION (selection_data->icon_selection)->gil),
-					 "select_icon",
-					 GTK_SIGNAL_FUNC(list_icon_selected_callback),
-					 selection_data);
-
-	gtk_signal_connect_while_alive( GTK_OBJECT (entry), "activate",
-				       GTK_SIGNAL_FUNC(entry_activated),
-				       selection_data, GTK_OBJECT (file_entry));
-
-	return dialog;
-}
-
-
-/* Set an icon on GnomeStock widget.  If the setting fails register this
- * as a new file.  Returns FALSE if even that failed */
-gboolean
-nautilus_gnome_stock_set_icon_or_register (GnomeStock *stock, const char *icon)
-{
-	GnomeStockPixmapEntryPath *new_entry;
-
-	g_return_val_if_fail (stock != NULL, FALSE);
-	g_return_val_if_fail (GNOME_IS_STOCK (stock), FALSE);
-	g_return_val_if_fail (icon != NULL, FALSE);
-
-	/* if we can set the icon and everything goes well we have succeeded */
-	if (gnome_stock_set_icon (stock, icon)) {
-		return TRUE;
-	}
-
-	/* If the icon string is not an existing file then this is just a
-	 * bogus request and we return FALSE */
-	if ( ! g_file_exists (icon)) {
-		return FALSE;
-	}
-
-	/* If icon exists but gnome_stock_set_icon fails,
-	 * that means this file has NOT been registered with
-	 * gnome stock.  Unfortunately gnome_stock is a
-	 * worthless pile of dung and doesn't do this for us.
-	 * Do note however that it DOES register this stuff
-	 * when it first creates the toolbars from
-	 * GnomeUIInfo.  Go figure.
-	 *
-	 * Note that all this will be completely different in gnome 2.0
-	 */
-
-	new_entry = g_malloc (sizeof (GnomeStockPixmapEntryPath));
-	new_entry->type = GNOME_STOCK_PIXMAP_TYPE_PATH;
-	new_entry->label = NULL;
-	new_entry->pathname = g_strdup (icon);
-	new_entry->width = 0;
-	new_entry->height = 0;
-
-	/* Register this under the "icon" as that's what
-	 * we'll look it up under later.
-	 */
-	gnome_stock_pixmap_register (icon, GNOME_STOCK_PIXMAP_REGULAR,
-				     (GnomeStockPixmapEntry *) new_entry);
-
-	return gnome_stock_set_icon (stock, icon);
-}
diff --git a/libnautilus-private/nautilus-gnome-extensions.h b/libnautilus-private/nautilus-gnome-extensions.h
deleted file mode 100644
index 83ea0399e..000000000
--- a/libnautilus-private/nautilus-gnome-extensions.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gnome-extensions.h - interface for new functions that operate on
-                                 gnome classes. Perhaps some of these should be
-  			         rolled into gnome someday.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#ifndef NAUTILUS_GNOME_EXTENSIONS_H
-#define NAUTILUS_GNOME_EXTENSIONS_H
-
-#include <libgnomeui/gnome-canvas.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-stock.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkwindow.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-/* icon selection callback function. */
-typedef void (* NautilusIconSelectionFunction) (const char *icon_path, gpointer callback_data);
-
-/* Causes an update as needed. The GnomeCanvas code says it should, but it doesn't. */
-void       nautilus_gnome_canvas_set_scroll_region                      (GnomeCanvas     *canvas,
-									 double           x1,
-									 double           y1,
-									 double           x2,
-									 double           y2);
-
-/* Make the scroll region bigger so the code in GnomeCanvas won't center it. */
-void       nautilus_gnome_canvas_set_scroll_region_left_justify         (GnomeCanvas     *canvas,
-									 double           x1,
-									 double           y1,
-									 double           x2,
-									 double           y2);
-
-/* Set a new scroll region without eliminating any of the currently-visible area. */
-void       nautilus_gnome_canvas_set_scroll_region_include_visible_area (GnomeCanvas     *canvas,
-									 double           x1,
-									 double           y1,
-									 double           x2,
-									 double           y2);
-
-/* For cases where you need to get more than one item updated. */
-void       nautilus_gnome_canvas_request_update_all                     (GnomeCanvas     *canvas);
-void       nautilus_gnome_canvas_item_request_update_deep               (GnomeCanvasItem *item);
-
-/* This is more handy than gnome_canvas_item_get_bounds because it
- * always returns the bounds * in world coordinates and it returns
- * them in a single rectangle.
- */
-void       nautilus_gnome_canvas_item_get_world_bounds                  (GnomeCanvasItem *item,
-									 ArtDRect        *world_bounds);
-
-/* This returns the current canvas bounds as computed by update.
- * It's not as "up to date" as get_bounds, which is accurate even
- * before an update happens.
- */
-void       nautilus_gnome_canvas_item_get_current_canvas_bounds         (GnomeCanvasItem *item,
-									 ArtIRect        *canvas_bounds);
-
-/* This returns the canvas bounds in a slower way that's always up to
- * date, even before an update.
- */
-void       nautilus_gnome_canvas_item_get_canvas_bounds                 (GnomeCanvasItem *item,
-									 ArtIRect        *canvas_bounds);
-
-/* Convenience functions for doing things with whole rectangles. */
-void       nautilus_gnome_canvas_world_to_canvas_rectangle              (GnomeCanvas     *canvas,
-									 const ArtDRect  *world_rectangle,
-									 ArtIRect        *canvas_rectangle);
-void       nautilus_gnome_canvas_world_to_window_rectangle              (GnomeCanvas     *canvas,
-									 const ArtDRect  *world_rectangle,
-									 ArtIRect        *window_rectangle);
-void       nautilus_gnome_canvas_request_redraw_rectangle               (GnomeCanvas     *canvas,
-									 const ArtIRect  *canvas_rectangle);
-
-/* Requests the entire object be redrawn.
- * Normally, you use request_update when calling from outside the canvas item
- * code. This is for within canvas item code.
- */
-void       nautilus_gnome_canvas_item_request_redraw                    (GnomeCanvasItem *item);
-void       nautilus_gnome_canvas_draw_pixbuf                            (GnomeCanvasBuf  *buf,
-									 const GdkPixbuf *pixbuf,
-									 int              x,
-									 int              y);
-void       nautilus_gnome_canvas_fill_rgb                               (GnomeCanvasBuf  *buf,
-									 art_u8           r,
-									 art_u8           g,
-									 art_u8           b);
-
-/* More functions for GnomeDialog */
-GtkButton *nautilus_gnome_dialog_get_button_by_index                    (GnomeDialog     *dialog,
-									 int              index);
-
-/* Return a command string containing the path to a terminal on this system. */
-char 	  *nautilus_gnome_get_terminal_path 				(void);
-
-/* Open up a new terminal, optionally passing in a command to execute */
-void       nautilus_gnome_open_terminal                                 (const char      *command);
-
-/* Create an icon selection dialog */
-GtkWidget	*nautilus_gnome_icon_selector_new			(const char	 *title,
-									 const char	 *icon_directory,
-									 GtkWindow	 *owner,
-									 NautilusIconSelectionFunction selected,
-									 gpointer	 callback_data);
-									 
-/* Set an icon on GnomeStock widget. If the setting fails register this
- * as a new file.  Returns FALSE if even that failed.
- */
-gboolean   nautilus_gnome_stock_set_icon_or_register                    (GnomeStock      *stock,
-									 const char      *icon);
-
-/* Execute a command. To be used in place of the exec family commands. This function
- * protects against creating zombie processes.
-*/
-int 	   nautilus_gnome_shell_execute 				 (const char 	 *command);
-
-#endif /* NAUTILUS_GNOME_EXTENSIONS_H */
diff --git a/libnautilus-private/nautilus-graphic-effects.c b/libnautilus-private/nautilus-graphic-effects.c
deleted file mode 100644
index 2580a9d82..000000000
--- a/libnautilus-private/nautilus-graphic-effects.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* Nautilus - pixbuf manipulation routines for graphical effects.
- *
- * Copyright (C) 2000 Eazel, Inc
- *
- * Author: Andy Hertzfeld <andy@eazel.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* This file contains pixbuf manipulation routines used for graphical effects like pre-lighting
-   and selection hilighting */
-
-#include <config.h>
-
-#include <libart_lgpl/art_config.h>
-#include <libart_lgpl/art_rect.h>
-#include <libart_lgpl/art_rgb.h>
-
-#include "nautilus-graphic-effects.h"
-
-/* shared utility to create a new pixbuf from the passed-in one */
-
-static GdkPixbuf *
-create_new_pixbuf (GdkPixbuf *src)
-{
-	g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
-	g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
-			       && gdk_pixbuf_get_n_channels (src) == 3)
-			      || (gdk_pixbuf_get_has_alpha (src)
-				  && gdk_pixbuf_get_n_channels (src) == 4), NULL);
-
-	return gdk_pixbuf_new (gdk_pixbuf_get_colorspace (src),
-			       gdk_pixbuf_get_has_alpha (src),
-			       gdk_pixbuf_get_bits_per_sample (src),
-			       gdk_pixbuf_get_width (src),
-			       gdk_pixbuf_get_height (src));
-}
-
-static GdkPixbuf *
-create_new_pixbuf_with_alpha (GdkPixbuf *src)
-{
-	g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
-	g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
-			       && gdk_pixbuf_get_n_channels (src) == 3)
-			      || (gdk_pixbuf_get_has_alpha (src)
-				  && gdk_pixbuf_get_n_channels (src) == 4), NULL);
-
-	return gdk_pixbuf_new (gdk_pixbuf_get_colorspace (src),
-			       TRUE,
-			       gdk_pixbuf_get_bits_per_sample (src),
-			       gdk_pixbuf_get_width (src),
-			       gdk_pixbuf_get_height (src));
-}
-
-/* utility routine to bump the level of a color component with pinning */
-
-static guchar
-lighten_component (guchar cur_value)
-{
-	int new_value = cur_value;
-	new_value += 24 + (new_value >> 3);
-	if (new_value > 255) {
-		new_value = 255;
-	}
-	return (guchar) new_value;
-}
-
-GdkPixbuf *
-nautilus_create_spotlight_pixbuf (GdkPixbuf* src)
-{
-	GdkPixbuf *dest;
-	int i, j;
-	int width, height, has_alpha, src_row_stride, dst_row_stride;
-	guchar *target_pixels, *original_pixels;
-	guchar *pixsrc, *pixdest;
-
-	g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
-	g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
-			       && gdk_pixbuf_get_n_channels (src) == 3)
-			      || (gdk_pixbuf_get_has_alpha (src)
-				  && gdk_pixbuf_get_n_channels (src) == 4), NULL);
-	g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (src) == 8, NULL);
-
-	dest = create_new_pixbuf (src);
-	
-	has_alpha = gdk_pixbuf_get_has_alpha (src);
-	width = gdk_pixbuf_get_width (src);
-	height = gdk_pixbuf_get_height (src);
-	dst_row_stride = gdk_pixbuf_get_rowstride (dest);
-	src_row_stride = gdk_pixbuf_get_rowstride (src);
-	target_pixels = gdk_pixbuf_get_pixels (dest);
-	original_pixels = gdk_pixbuf_get_pixels (src);
-
-	for (i = 0; i < height; i++) {
-		pixdest = target_pixels + i * dst_row_stride;
-		pixsrc = original_pixels + i * src_row_stride;
-		for (j = 0; j < width; j++) {		
-			*pixdest++ = lighten_component (*pixsrc++);
-			*pixdest++ = lighten_component (*pixsrc++);
-			*pixdest++ = lighten_component (*pixsrc++);
-			if (has_alpha) {
-				*pixdest++ = *pixsrc++;
-			}
-		}
-	}
-	return dest;
-}
-
-
-/* the following routine was stolen from the panel to darken a pixbuf, by manipulating the saturation */
-
-/* saturation is 0-255, darken is 0-255 */
-
-GdkPixbuf *
-nautilus_create_darkened_pixbuf (GdkPixbuf *src, int saturation, int darken)
-{
-	gint i, j;
-	gint width, height, src_row_stride, dest_row_stride;
-	gboolean has_alpha;
-	guchar *target_pixels, *original_pixels;
-	guchar *pixsrc, *pixdest;
-	guchar intensity;
-	guchar alpha;
-	guchar negalpha;
-	guchar r, g, b;
-	GdkPixbuf *dest;
-
-	g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
-	g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
-			       && gdk_pixbuf_get_n_channels (src) == 3)
-			      || (gdk_pixbuf_get_has_alpha (src)
-				  && gdk_pixbuf_get_n_channels (src) == 4), NULL);
-	g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (src) == 8, NULL);
-
-	dest = create_new_pixbuf (src);
-
-	has_alpha = gdk_pixbuf_get_has_alpha (src);
-	width = gdk_pixbuf_get_width (src);
-	height = gdk_pixbuf_get_height (src);
-	dest_row_stride = gdk_pixbuf_get_rowstride (dest);
-	src_row_stride = gdk_pixbuf_get_rowstride (src);
-	target_pixels = gdk_pixbuf_get_pixels (dest);
-	original_pixels = gdk_pixbuf_get_pixels (src);
-
-	for (i = 0; i < height; i++) {
-		pixdest = target_pixels + i * dest_row_stride;
-		pixsrc = original_pixels + i * src_row_stride;
-		for (j = 0; j < width; j++) {
-			r = *pixsrc++;
-			g = *pixsrc++;
-			b = *pixsrc++;
-			intensity = (r * 77 + g * 150 + b * 28) >> 8;
-			negalpha = ((255 - saturation) * darken) >> 8;
-			alpha = (saturation * darken) >> 8;
-			*pixdest++ = (negalpha * intensity + alpha * r) >> 8;
-			*pixdest++ = (negalpha * intensity + alpha * g) >> 8;
-			*pixdest++ = (negalpha * intensity + alpha * b) >> 8;
-			if (has_alpha) {
-				*pixdest++ = *pixsrc++;
-			}
-		}
-	}
-	return dest;
-}
-
-/* this routine colorizes the passed-in pixbuf by multiplying each pixel with the passed in color */
-
-GdkPixbuf *
-nautilus_create_colorized_pixbuf (GdkPixbuf *src,
-				  int red_value,
-				  int green_value,
-				  int blue_value)
-{
-	int i, j;
-	int width, height, has_alpha, src_row_stride, dst_row_stride;
-	guchar *target_pixels;
-	guchar *original_pixels;
-	guchar *pixsrc;
-	guchar *pixdest;
-	GdkPixbuf *dest;
-	
-	g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
-	g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
-			       && gdk_pixbuf_get_n_channels (src) == 3)
-			      || (gdk_pixbuf_get_has_alpha (src)
-				  && gdk_pixbuf_get_n_channels (src) == 4), NULL);
-	g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (src) == 8, NULL);
-
-	dest = create_new_pixbuf (src);
-	
-	has_alpha = gdk_pixbuf_get_has_alpha (src);
-	width = gdk_pixbuf_get_width (src);
-	height = gdk_pixbuf_get_height (src);
-	src_row_stride = gdk_pixbuf_get_rowstride (src);
-	dst_row_stride = gdk_pixbuf_get_rowstride (dest);
-	target_pixels = gdk_pixbuf_get_pixels (dest);
-	original_pixels = gdk_pixbuf_get_pixels (src);
-
-	for (i = 0; i < height; i++) {
-		pixdest = target_pixels + i*dst_row_stride;
-		pixsrc = original_pixels + i*src_row_stride;
-		for (j = 0; j < width; j++) {		
-			*pixdest++ = (*pixsrc++ * red_value) >> 8;
-			*pixdest++ = (*pixsrc++ * green_value) >> 8;
-			*pixdest++ = (*pixsrc++ * blue_value) >> 8;
-			if (has_alpha) {
-				*pixdest++ = *pixsrc++;
-			}
-		}
-	}
-	return dest;
-}
-
-/* utility to stretch a frame to the desired size */
-
-static void
-draw_frame_row (GdkPixbuf *frame_image, int target_width, int source_width, int source_v_position, int dest_v_position, GdkPixbuf *result_pixbuf, int left_offset, int height)
-{
-	int remaining_width, h_offset, slab_width;
-	
-	remaining_width = target_width;
-	h_offset = 0;
-	while (remaining_width > 0) {	
-		slab_width = remaining_width > source_width ? source_width : remaining_width;
-		gdk_pixbuf_copy_area (frame_image, left_offset, source_v_position, slab_width, height, result_pixbuf, left_offset + h_offset, dest_v_position);
-		remaining_width -= slab_width;
-		h_offset += slab_width; 
-	}
-}
-
-/* utility to draw the middle section of the frame in a loop */
-static void
-draw_frame_column (GdkPixbuf *frame_image, int target_height, int source_height, int source_h_position, int dest_h_position, GdkPixbuf *result_pixbuf, int top_offset, int width)
-{
-	int remaining_height, v_offset, slab_height;
-	
-	remaining_height = target_height;
-	v_offset = 0;
-	while (remaining_height > 0) {	
-		slab_height = remaining_height > source_height ? source_height : remaining_height;
-		gdk_pixbuf_copy_area (frame_image, source_h_position, top_offset, width, slab_height, result_pixbuf, dest_h_position, top_offset + v_offset);
-		remaining_height -= slab_height;
-		v_offset += slab_height; 
-	}
-}
-
-GdkPixbuf *
-nautilus_stretch_frame_image (GdkPixbuf *frame_image, int left_offset, int top_offset, int right_offset, int bottom_offset,
-				int dest_width, int dest_height, gboolean fill_flag)
-{
-	GdkPixbuf *result_pixbuf;
-	guchar *pixels_ptr;
-	int frame_width, frame_height;
-	int y, row_stride;
-	int target_width, target_frame_width;
-	int target_height, target_frame_height;
-	
-	frame_width  = gdk_pixbuf_get_width  (frame_image);
-	frame_height = gdk_pixbuf_get_height (frame_image );
-	
-	if (fill_flag) {
-		result_pixbuf = gdk_pixbuf_scale_simple (frame_image, dest_width, dest_height, GDK_INTERP_NEAREST);
-	} else {
-		result_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, dest_width, dest_height);
-	}
-	row_stride = gdk_pixbuf_get_rowstride (result_pixbuf);
-	pixels_ptr = gdk_pixbuf_get_pixels (result_pixbuf);
-	
-	/* clear the new pixbuf */
-	if (!fill_flag) {
-		for (y = 0; y < dest_height; y++) {
-			art_rgb_run_alpha (pixels_ptr, 255, 255, 255, 255, dest_width);
-			pixels_ptr += row_stride; 
-		}
-	}
-	
-	target_width  = dest_width - left_offset - right_offset;
-	target_frame_width = frame_width - left_offset - right_offset;
-	
-	target_height  = dest_height - top_offset - bottom_offset;
-	target_frame_height = frame_height - top_offset - bottom_offset;
-	
-	/* draw the left top corner  and top row */
-	gdk_pixbuf_copy_area (frame_image, 0, 0, left_offset, top_offset, result_pixbuf, 0,  0);
-	draw_frame_row (frame_image, target_width, target_frame_width, 0, 0, result_pixbuf, left_offset, top_offset);
-	
-	/* draw the right top corner and left column */
-	gdk_pixbuf_copy_area (frame_image, frame_width - right_offset, 0, right_offset, top_offset, result_pixbuf, dest_width - right_offset,  0);
-	draw_frame_column (frame_image, target_height, target_frame_height, 0, 0, result_pixbuf, top_offset, left_offset);
-
-	/* draw the bottom right corner and bottom row */
-	gdk_pixbuf_copy_area (frame_image, frame_width - right_offset, frame_height - bottom_offset, right_offset, bottom_offset, result_pixbuf, dest_width - right_offset,  dest_height - bottom_offset);
-	draw_frame_row (frame_image, target_width, target_frame_width, frame_height - bottom_offset, dest_height - bottom_offset, result_pixbuf, left_offset, bottom_offset);
-		
-	/* draw the bottom left corner and the right column */
-	gdk_pixbuf_copy_area (frame_image, 0, frame_height - bottom_offset, left_offset, bottom_offset, result_pixbuf, 0,  dest_height - bottom_offset);
-	draw_frame_column (frame_image, target_height, target_frame_height, frame_width - right_offset, dest_width - right_offset, result_pixbuf, top_offset, right_offset);
-	
-	return result_pixbuf;
-}
-
-
-/* draw an arbitrary frame around an image, with the result passed back in a newly allocated pixbuf */
-GdkPixbuf *
-nautilus_embed_image_in_frame (GdkPixbuf *source_image, GdkPixbuf *frame_image, int left_offset, int top_offset, int right_offset, int bottom_offset)
-{
-	GdkPixbuf *result_pixbuf;
-	int source_width, source_height;
-	int dest_width, dest_height;
-	
-	source_width  = gdk_pixbuf_get_width  (source_image);
-	source_height = gdk_pixbuf_get_height (source_image);
-
-	dest_width  = source_width  + left_offset + right_offset;
-	dest_height = source_height + top_offset  + bottom_offset;
-	
-	result_pixbuf = nautilus_stretch_frame_image (frame_image, left_offset, top_offset, right_offset, bottom_offset, 
-						      dest_width, dest_height, FALSE);
-		
-	/* Finally, copy the source image into the framed area */
-	gdk_pixbuf_copy_area (source_image, 0, 0, source_width, source_height, result_pixbuf, left_offset,  top_offset);
-
-	return result_pixbuf;
-}
-
-
-/* this routine takes the source pixbuf and returns a new one that's semi-transparent, by
-   clearing every other pixel's alpha value in a checkerboard grip.  We have to do the
-   checkerboard instead of reducing the alpha since it will be turned into an alpha-less
-   gdkpixmap and mask for the actual dragging */
-
-GdkPixbuf *
-nautilus_make_semi_transparent (GdkPixbuf *src)
-{
-	gint i, j, temp_alpha;
-	gint width, height, has_alpha, src_row_stride, dst_row_stride;
-	guchar *target_pixels, *original_pixels;
-	guchar *pixsrc, *pixdest;
-	guchar alpha_value;
-	GdkPixbuf *dest_pixbuf;
-	guchar start_alpha_value;
-	
-	g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
-	g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
-			       && gdk_pixbuf_get_n_channels (src) == 3)
-			      || (gdk_pixbuf_get_has_alpha (src)
-				  && gdk_pixbuf_get_n_channels (src) == 4), NULL);
-	g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (src) == 8, NULL);
-
-	dest_pixbuf = create_new_pixbuf_with_alpha (src);
-
-	has_alpha = gdk_pixbuf_get_has_alpha (src);
-	width = gdk_pixbuf_get_width (src);
-	height = gdk_pixbuf_get_height (src);
-	src_row_stride = gdk_pixbuf_get_rowstride (src);
-	dst_row_stride = gdk_pixbuf_get_rowstride (dest_pixbuf);
-	
-	/* set up pointers to the actual pixels */
-	target_pixels = gdk_pixbuf_get_pixels (dest_pixbuf);
-	original_pixels = gdk_pixbuf_get_pixels (src);
-
-	/* loop through the pixels to do the actual work, copying from the source to the destination */
-	start_alpha_value = ~0;
-	for (i = 0; i < height; i++) {
-		pixdest = target_pixels + i * dst_row_stride;
-		pixsrc = original_pixels + i * src_row_stride;
-		alpha_value = start_alpha_value;
-		for (j = 0; j < width; j++) {
-			*pixdest++ = *pixsrc++; /* red */
-			*pixdest++ = *pixsrc++; /* green */
-			*pixdest++ = *pixsrc++; /* blue */
-			
-			if (has_alpha) {
-				temp_alpha = *pixsrc++;
-			} else {
-				temp_alpha = ~0;
-			}
-			*pixdest++ = temp_alpha & alpha_value;
-			
-			alpha_value = ~alpha_value;
-		}
-		
-		start_alpha_value = ~start_alpha_value;
-	}
-	
-	return dest_pixbuf;
-}
-
diff --git a/libnautilus-private/nautilus-graphic-effects.h b/libnautilus-private/nautilus-graphic-effects.h
deleted file mode 100644
index 2f9afa899..000000000
--- a/libnautilus-private/nautilus-graphic-effects.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-graphic-effects.h: Pixmap manipulation routines for graphical effects.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   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.
- 
-   Authors: Andy Hertzfeld <andy@eazel.com>
- */
-
-#ifndef NAUTILUS_GRAPHIC_EFFECTS_H
-#define NAUTILUS_GRAPHIC_EFFECTS_H
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-/* return a lightened pixbuf for pre-lighting */
-GdkPixbuf *nautilus_create_spotlight_pixbuf (GdkPixbuf *source_pixbuf);
-
-/* return a darkened pixbuf for selection hiliting */
-GdkPixbuf *nautilus_create_darkened_pixbuf  (GdkPixbuf *source_pixbuf,
-					     int        saturation,
-					     int        darken);
-
-/* return a pixbuf colorized with the color specified by the parameters */
-GdkPixbuf* nautilus_create_colorized_pixbuf (GdkPixbuf *source_pixbuf,
-					     int        red_value,
-					     int        green_value,
-					     int        blue_value);
-
-/* stretch a image frame */
-GdkPixbuf *nautilus_stretch_frame_image (GdkPixbuf *frame_image, int left_offset, int top_offset,
-					 int right_offset, int bottom_offset,
-					 int dest_width, int dest_height,
-					 gboolean fill_flag);
-
-/* embed in image in a frame */
-GdkPixbuf *nautilus_embed_image_in_frame (GdkPixbuf *source_image, GdkPixbuf *frame_image, int left_offset, int top_offset, int right_offset, int bottom_offset);
-
-/* return a semi-transparent pixbuf from the source pixbuf using a checkboard
-   stipple in the alpha channel (so it can be converted to an alpha-less pixmap) */
-GdkPixbuf *nautilus_make_semi_transparent   (GdkPixbuf *source_pixbuf);
-
-#endif /* NAUTILUS_GRAPHIC_EFFECTS_H */
diff --git a/libnautilus-private/nautilus-gtk-extensions.c b/libnautilus-private/nautilus-gtk-extensions.c
deleted file mode 100644
index 82018c7a8..000000000
--- a/libnautilus-private/nautilus-gtk-extensions.c
+++ /dev/null
@@ -1,2183 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gtk-extensions.c - implementation of new functions that operate on
-  			       gtk classes. Perhaps some of these should be
-  			       rolled into gtk someday.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: John Sullivan <sullivan@eazel.com>
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-gtk-extensions.h"
-
-#include "nautilus-gdk-font-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-string.h"
-#include <gdk/gdk.h>
-#include <gdk/gdkprivate.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkrc.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-geometry.h>
-#include <libgnomeui/gnome-winhints.h>
-
-/* This number should be large enough to be visually noticeable,
- * but small enough to not allow the user to perform other actions.
- */
-#define BUTTON_AUTO_HIGHLIGHT_MILLISECONDS	100
-
-/* This number is fairly arbitrary. Long enough to show a pretty long
- * menu title, but not so long to make a menu grotesquely wide.
- */
-#define MAXIMUM_MENU_TITLE_LENGTH	48
-
-/* Used for window position & size sanity-checking. The sizes are big enough to prevent
- * at least normal-sized gnome panels from obscuring the window at the screen edges. 
- */
-#define MINIMUM_ON_SCREEN_WIDTH		100
-#define MINIMUM_ON_SCREEN_HEIGHT	100
-
-/* GTK buttons cram the text too close to the edge of the buttons by default.
- * This is the standard padding used to make them look non-crammed.
- */
-#define NAUTILUS_STANDARD_BUTTON_PADDING 1
-
-/* How far down the window tree will we search when looking for top-level
- * windows? Some window managers doubly-reparent the client, so account
- * for that, and add some slop.
- */
-#define MAXIMUM_WM_REPARENTING_DEPTH 4
-
-static gboolean
-finish_button_activation (gpointer data)
-{
-	GtkButton *button;
-	
-	button = GTK_BUTTON (data);
-
-	if (!GTK_OBJECT_DESTROYED (button) && !button->in_button) {
-		gtk_button_clicked (button);
-	}
-
-	/* Check again--button can be destroyed during call to gtk_button_clicked */
-	if (!GTK_OBJECT_DESTROYED (button)) {
-		gtk_button_released (button);
-	}
-
-	/* This was ref'd in nautilus_gtk_button_auto_click */
-	gtk_object_unref (GTK_OBJECT (button));
-
-	return FALSE;	
-}
-
-/**
- * nautilus_gtk_button_auto_click:
- * 
- * Programatically activate a button as if the user had clicked on it,
- * including briefly drawing the button's pushed-in state.
- * @button: Any GtkButton.
- **/
-void
-nautilus_gtk_button_auto_click (GtkButton *button)
-{
-	g_return_if_fail (GTK_IS_BUTTON (button));
-
-	if (!GTK_WIDGET_IS_SENSITIVE (GTK_WIDGET (button))) {
-		return;
-	}
-
-	button->in_button = TRUE;
-	gtk_button_pressed (button);
-	button->in_button = FALSE;
-
-	/* FIXME bugzilla.eazel.com 2562:
-	 * Nothing is preventing other events from occuring between
-	 * now and when this timeout function fires, which means in
-	 * theory the user could click on a different row or otherwise
-	 * get in between the double-click and the button activation.
-	 * In practice the timeout is short enough that this probably
-	 * isn't a problem.
-	 */
-
-	/* This is unref'ed in finish_button_activation */
-	gtk_object_ref (GTK_OBJECT (button));
-
-	g_timeout_add (BUTTON_AUTO_HIGHLIGHT_MILLISECONDS, 
-		       finish_button_activation, button);
-}
-
-/**
- * nautilus_gtk_button_set_padding
- * 
- * Adds some padding around the contained widget in the button (typically the label).
- * @button: a GtkButton
- * @pad_amount: number of pixels of space to add around the button's contents.
- * GNOME_PAD_SMALL is a typical value.
- **/
-void
-nautilus_gtk_button_set_padding (GtkButton *button, int pad_amount)
-{
-	g_return_if_fail (GTK_IS_BUTTON (button));
-	g_return_if_fail (pad_amount > 0);
-
-	gtk_misc_set_padding (GTK_MISC (GTK_BIN(button)->child), 
-			      pad_amount, 
-			      pad_amount);
-}
-
-/**
- * nautilus_gtk_button_set_standard_padding
- * 
- * Adds the standard amount of padding around the contained widget in the button 
- * (typically the label). Use this rather than nautilus_gtk_button_set_padding
- * unless you have a specific reason to use a non-standard amount.
- * @button: a GtkButton
- **/
-void
-nautilus_gtk_button_set_standard_padding (GtkButton *button)
-{
-	g_return_if_fail (GTK_IS_BUTTON (button));
-
-	nautilus_gtk_button_set_padding (button, NAUTILUS_STANDARD_BUTTON_PADDING);
-}
-
-
-/**
- * nautilus_gtk_clist_get_first_selected_row:
- * 
- * Get the index of the first selected row, or -1 if no rows are selected.
- * @list: Any GtkCList
- **/
-int 
-nautilus_gtk_clist_get_first_selected_row (GtkCList *list)
-{
-	GtkCListRow *row;
-	GList *p;
-	int row_number;
-
-	g_return_val_if_fail (GTK_IS_CLIST (list), -1);
-
-	row_number = 0;
-	for (p = GTK_CLIST (list)->row_list; p != NULL; p = p->next) {
-		row = p->data;
-		if (row->state == GTK_STATE_SELECTED) {
-			return row_number;	
-		}
-
-		++row_number;
-	}
-
-	return -1;
-}
-
-/**
- * nautilus_gtk_clist_get_last_selected_row:
- * 
- * Get the index of the last selected row, or -1 if no rows are selected.
- * @list: Any GtkCList
- **/
-int 
-nautilus_gtk_clist_get_last_selected_row (GtkCList *list)
-{
-	GtkCListRow *row;
-	GList *p;
-	int row_number;
-
-	g_return_val_if_fail (GTK_IS_CLIST (list), -1);
-
-	row_number = GTK_CLIST (list)->rows - 1;
-	for (p = GTK_CLIST (list)->row_list_end; p != NULL; p = p->prev) {
-		row = p->data;
-		if (row->state == GTK_STATE_SELECTED) {
-			return row_number;	
-		}
-
-		--row_number;
-	}
-
-	return -1;
-}
-
-static gint
-activate_button_on_double_click (GtkWidget *widget,
-		     		 GdkEventButton *event,
-		     		 gpointer user_data)
-{
-	g_assert (GTK_IS_CLIST (widget));
-	g_assert (GTK_IS_BUTTON (user_data));
-
-	/* Treat double-click like single click followed by
-	 * click on specified button.
-	 */
-	if (event->type == GDK_2BUTTON_PRESS 
-	    && GTK_WIDGET_SENSITIVE (GTK_WIDGET (user_data))) {
-		nautilus_gtk_button_auto_click (GTK_BUTTON (user_data));
-	}
-	
-	return FALSE;
-}	
-
-/**
- * nautilus_gtk_clist_set_double_click_button:
- * 
- * Set a button to be auto-clicked when a clist gets a double-click.
- * @clist: Any GtkCList
- * @button: A GtkButton that will be auto-clicked when the clist gets
- * a double-click event. If the button is not sensitive, this function
- * does nothing.
- **/
-void
-nautilus_gtk_clist_set_double_click_button (GtkCList *clist, GtkButton *button)
-{
-	g_return_if_fail (GTK_IS_CLIST (clist));
-	g_return_if_fail (GTK_IS_BUTTON (button));
-
-	gtk_signal_connect (GTK_OBJECT (clist), 
-			    "button_press_event",
-			    (GtkSignalFunc) activate_button_on_double_click,
-			    button);
-
-}
-
-/**
- * nautilus_gtk_signal_connect_free_data_custom:
- * 
- * Attach a function pointer and user data to a signal, and call a
- * a destroy function on the user data when the signal is disconnected.
- * @object: the object which emits the signal. For example, a button in the button press signal.
- * @name: the name of the signal.
- * @func: function pointer to attach to the signal.
- * @data: the user data associated with the function.
- * @destroy_func: the function to call on the user data when the signal
- * is disconnected.
- **/
-guint nautilus_gtk_signal_connect_free_data_custom (GtkObject *object,
-				  	     	    const gchar *name,
-				  	     	    GtkSignalFunc func,
-				  	     	    gpointer data,
-				  	     	    GtkDestroyNotify destroy_func)
-{
-	return gtk_signal_connect_full (object, 
-					name, 
-					func, 
-					NULL, /* marshal */
-					data, 
-					destroy_func, 
-					FALSE, /* is this an object signal? */
-					FALSE); /* invoke func after signal? */
-}
-
-/**
- * nautilus_gtk_signal_connect_free_data:
- * 
- * Attach a function pointer and user data to a signal, and free
- * the user data when the signal is disconnected.
- * @object: the object which emits the signal. For example, a button in the button press signal.
- * @name: the name of the signal.
- * @func: function pointer to attach to the signal.
- * @data: the user data associated with the function. g_free() will be called on
- * this user data when the signal is disconnected.
- **/
-guint
-nautilus_gtk_signal_connect_free_data (GtkObject *object,
-				       const gchar *name,
-				       GtkSignalFunc func,
-				       gpointer data)
-{
-	return nautilus_gtk_signal_connect_free_data_custom
-		(object, name, func, data, g_free);
-}
-
-/**
- * nautilus_gtk_window_present:
- * 
- * Presents to the user a window that may be hidden, iconified, or buried.
- * @window: The GtkWindow to be presented to the user.
- **/
-void
-nautilus_gtk_window_present (GtkWindow *window)
-{
-	GdkWindow *gdk_window;
-	int current_workspace, window_workspace;
-
-	g_return_if_fail (GTK_IS_WINDOW (window));
-
-	/* Ensure that the window is on the current desktop */
-	if (GTK_WIDGET_REALIZED (GTK_WIDGET (window))) {
-		window_workspace = gnome_win_hints_get_workspace (GTK_WIDGET (window));
-		current_workspace = gnome_win_hints_get_current_workspace ();
-		if (window_workspace != current_workspace) {
-			gtk_widget_hide (GTK_WIDGET (window));
-			gnome_win_hints_set_workspace (GTK_WIDGET (window),
-						       current_workspace);
-		}
-	}
-		
-	/* If we have no gdk window, then it's OK to just show, since
-	 * the window is new and presumably will show up in front.
-	 */
-	gdk_window = GTK_WIDGET (window)->window;
-	if (gdk_window != NULL) {
-		nautilus_gdk_window_bring_to_front (gdk_window);
-	}
-
-	gtk_widget_show (GTK_WIDGET (window));
-}
-
-static int
-handle_standard_close_accelerator (GtkWindow *window, 
-				   GdkEventKey *event, 
-				   gpointer user_data)
-{
-	g_assert (GTK_IS_WINDOW (window));
-	g_assert (event != NULL);
-	g_assert (user_data == NULL);
-
-	if (nautilus_gtk_window_event_is_close_accelerator (window, event)) {
-		if (GNOME_IS_DIALOG (window)) {
-			gnome_dialog_close (GNOME_DIALOG (window));
-		} else {
-			gtk_widget_hide (GTK_WIDGET (window));
-		}
-		gtk_signal_emit_stop_by_name 
-			(GTK_OBJECT (window), "key_press_event");
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-/**
- * nautilus_gtk_window_event_is_close_accelerator:
- * 
- * Tests whether a key event is the standard window close accelerator.
- * Not needed for clients that use nautilus_gtk_window_set_up_close_accelerator;
- * use only if you must set up your own key_event handler for your own reasons.
- **/
-gboolean
-nautilus_gtk_window_event_is_close_accelerator (GtkWindow *window, GdkEventKey *event)
-{
-	g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	if (event->state & GDK_CONTROL_MASK) {
-		/* Note: menu item equivalents are case-sensitive, so we will
-		 * be case-sensitive here too.
-		 */		
-		if (event->keyval == NAUTILUS_STANDARD_CLOSE_WINDOW_CONTROL_KEY) {
-			return TRUE;
-		}
-	}
-
-	return FALSE;	
-}
-
-/**
- * nautilus_gtk_window_set_up_close_accelerator:
- * 
- * Sets up the standard keyboard equivalent to close the window.
- * Call this for windows that don't set up a keyboard equivalent to
- * close the window some other way, e.g. via a menu item accelerator.
- * 
- * @window: The GtkWindow that should be hidden when the standard
- * keyboard equivalent is typed.
- **/
-void
-nautilus_gtk_window_set_up_close_accelerator (GtkWindow *window)
-{
-	g_return_if_fail (GTK_IS_WINDOW (window));
-
-	gtk_signal_connect (GTK_OBJECT (window),
-			    "key_press_event",
-			    GTK_SIGNAL_FUNC (handle_standard_close_accelerator),
-			    NULL);
-}
-
-static void
-sanity_check_window_position (int *left, int *top)
-{
-	g_assert (left != NULL);
-	g_assert (top != NULL);
-
-	/* Make sure the top of the window is on screen, for
-	 * draggability (might not be necessary with all window managers,
-	 * but seems reasonable anyway). Make sure the top of the window
-	 * isn't off the bottom of the screen, or so close to the bottom
-	 * that it might be obscured by the panel.
-	 */
-	*top = CLAMP (*top, 0, gdk_screen_height() - MINIMUM_ON_SCREEN_HEIGHT);
-	
-	/* FIXME bugzilla.eazel.com 669: 
-	 * If window has negative left coordinate, set_uposition sends it
-	 * somewhere else entirely. Not sure what level contains this bug (XWindows?).
-	 * Hacked around by pinning the left edge to zero, which just means you
-	 * can't set a window to be partly off the left of the screen using
-	 * this routine.
-	 */
-	/* Make sure the left edge of the window isn't off the right edge of
-	 * the screen, or so close to the right edge that it might be
-	 * obscured by the panel.
-	 */
-	*left = CLAMP (*left, 0, gdk_screen_width() - MINIMUM_ON_SCREEN_WIDTH);
-}
-
-static void
-sanity_check_window_dimensions (int *width, int *height)
-{
-	g_assert (width != NULL);
-	g_assert (height != NULL);
-
-	/* Pin the size of the window to the screen, so we don't end up in
-	 * a state where the window is so big essential parts of it can't
-	 * be reached (might not be necessary with all window managers,
-	 * but seems reasonable anyway).
-	 */
-	*width = MIN (*width, gdk_screen_width());
-	*height = MIN (*height, gdk_screen_height());
-}
-
-/**
- * nautilus_gtk_window_set_initial_geometry:
- * 
- * Sets the position and size of a GtkWindow before the
- * GtkWindow is shown. It is an error to call this on a window that
- * is already on-screen. Takes into account screen size, and does
- * some sanity-checking on the passed-in values.
- * 
- * @window: A non-visible GtkWindow
- * @geometry_flags: A NautilusGdkGeometryFlags value defining which of
- * the following parameters have defined values
- * @left: pixel coordinate for left of window
- * @top: pixel coordinate for top of window
- * @width: width of window in pixels
- * @height: height of window in pixels
- */
-void
-nautilus_gtk_window_set_initial_geometry (GtkWindow *window, 
-					  NautilusGdkGeometryFlags geometry_flags,
-					  int left,
-					  int top,
-					  guint width,
-					  guint height)
-{
-	int real_left, real_top;
-
-	g_return_if_fail (GTK_IS_WINDOW (window));
-	g_return_if_fail (!(geometry_flags & NAUTILUS_GDK_WIDTH_VALUE) || width > 0);
-	g_return_if_fail (!(geometry_flags & NAUTILUS_GDK_HEIGHT_VALUE) || height > 0);
-
-	/* Setting the default size doesn't work when the window is already showing.
-	 * Someday we could make this move an already-showing window, but we don't
-	 * need that functionality yet. 
-	 */
-	g_return_if_fail (!GTK_WIDGET_VISIBLE (window));
-
-	if ((geometry_flags & NAUTILUS_GDK_X_VALUE) && (geometry_flags & NAUTILUS_GDK_Y_VALUE)) {
-		real_left = left;
-		real_top = top;
-
-		/* This is sub-optimal. GDK doesn't allow us to set win_gravity
-		 * to South/East types, which should be done if using negative
-		 * positions (so that the right or bottom edge of the window
-		 * appears at the specified position, not the left or top).
-		 * However it does seem to be consistent with other GNOME apps.
-		 */
-		if (geometry_flags & NAUTILUS_GDK_X_NEGATIVE) {
-			real_left = gdk_screen_width () - real_left;
-		}
-		if (geometry_flags & NAUTILUS_GDK_Y_NEGATIVE) {
-			real_top = gdk_screen_height () - real_top;
-		}
-
-		sanity_check_window_position (&real_left, &real_top);
-		gtk_widget_set_uposition (GTK_WIDGET (window), real_left, real_top);
-	}
-
-	if ((geometry_flags & NAUTILUS_GDK_WIDTH_VALUE) && (geometry_flags & NAUTILUS_GDK_HEIGHT_VALUE)) {
-		sanity_check_window_dimensions (&width, &height);
-		gtk_window_set_default_size (GTK_WINDOW (window), width, height);
-	}
-}
-
-/**
- * nautilus_gtk_window_set_initial_geometry_from_string:
- * 
- * Sets the position and size of a GtkWindow before the
- * GtkWindow is shown. The geometry is passed in as a string. 
- * It is an error to call this on a window that
- * is already on-screen. Takes into account screen size, and does
- * some sanity-checking on the passed-in values.
- * 
- * @window: A non-visible GtkWindow
- * @geometry_string: A string suitable for use with gnome_parse_geometry
- * @minimum_width: If the width from the string is smaller than this,
- * use this for the width.
- * @minimum_height: If the height from the string is smaller than this,
- * use this for the height.
- */
-void
-nautilus_gtk_window_set_initial_geometry_from_string (GtkWindow *window, 
-					  	      const char *geometry_string,
-					  	      guint minimum_width,
-					  	      guint minimum_height)
-{
-	int left, top;
-	guint width, height;
-	NautilusGdkGeometryFlags geometry_flags;
-
-	g_return_if_fail (GTK_IS_WINDOW (window));
-	g_return_if_fail (geometry_string != NULL);
-
-	/* Setting the default size doesn't work when the window is already showing.
-	 * Someday we could make this move an already-showing window, but we don't
-	 * need that functionality yet. 
-	 */
-	g_return_if_fail (!GTK_WIDGET_VISIBLE (window));
-
-	geometry_flags = nautilus_gdk_parse_geometry (geometry_string, &left, &top, &width, &height);
-
-	/* Make sure the window isn't smaller than makes sense for this window.
-	 * Other sanity checks are performed in set_initial_geometry.
-	 */
-	if (geometry_flags & NAUTILUS_GDK_WIDTH_VALUE) {
-		width = MAX (width, minimum_width);
-	}
-	if (geometry_flags & NAUTILUS_GDK_HEIGHT_VALUE) {
-		height = MAX (height, minimum_height);
-	}
-
-	nautilus_gtk_window_set_initial_geometry (window, geometry_flags, left, top, width, height);
-}
-
-/**
- * nautilus_gtk_selection_data_copy_deep:
- * 
- * Copies a GtkSelectionData, and copies the data too.
- * @data: The GtkSelectionData to be copied.
- **/
-GtkSelectionData *
-nautilus_gtk_selection_data_copy_deep (const GtkSelectionData *data)
-{
-	GtkSelectionData *copy;
-
-	copy = g_new0 (GtkSelectionData, 1);
-	gtk_selection_data_set (copy, data->type, data->format, data->data, data->length);
-
-	return copy;
-}
-
-/**
- * nautilus_gtk_selection_data_free_deep:
- * 
- * Frees a GtkSelectionData, and frees the data too.
- * @data: The GtkSelectionData to be freed.
- **/
-void
-nautilus_gtk_selection_data_free_deep (GtkSelectionData *data)
-{
-	g_free (data->data);
-	gtk_selection_data_free (data);
-}
-
-/**
- * nautilus_gtk_signal_connect_free_data:
- * 
- * Function to displace the popup menu some, otherwise the first item
- * gets selected right away.
- * This function gets called by gtk_menu_popup ().
- *
- * @menu: the popup menu.
- * @x: x coord where gtk want to place the menu
- * @y: y coord where gtk want to place the menu
- * @user_data: something
- **/
-static void
-nautilus_popup_menu_position_func (GtkMenu   *menu,
-				   int      *x,
-				   int      *y,
-				   gpointer  user_data)
-{
-	GdkPoint *offset;
-	GtkRequisition requisition;
-
-	g_assert (x != NULL);
-	g_assert (y != NULL);
-
-	offset = (GdkPoint*) user_data;
-
-	g_assert (offset != NULL);
-
-	/*
-	 * FIXME bugzilla.eazel.com 2561: The cast from gint16 might cause problems.  
-	 * Unfortunately, GdkPoint uses gint16.
-	 */
-	gtk_widget_size_request (GTK_WIDGET (menu), &requisition);
-	  
-	*x = CLAMP (*x + (int) offset->x, 0, MAX (0, gdk_screen_width () - requisition.width));
-	*y = CLAMP (*y + (int) offset->y, 0, MAX (0, gdk_screen_height () - requisition.height));
-}
-
-/**
- * nautilus_truncate_text_for_menu_item:
- * 
- * Given an arbitrary string, returns a newly-allocated string
- * suitable for use as a menu item label. Truncates long strings 
- * in the middle.
- */
-char *
-nautilus_truncate_text_for_menu_item (const char *text)
-{
-	return nautilus_str_middle_truncate (text, MAXIMUM_MENU_TITLE_LENGTH);
-}
-
-/**
- * nautilus_pop_up_context_menu:
- * 
- * Pop up a context menu under the mouse.
- * The menu is sunk after use, so it will be destroyed unless the 
- * caller first ref'ed it.
- * 
- * This function is more of a helper function than a gtk extension,
- * so perhaps it belongs in a different file.
- * 
- * @menu: The menu to pop up under the mouse.
- * @offset_x: Number of pixels to displace the popup menu vertically
- * @offset_y: Number of pixels to displace the popup menu horizontally
- * @event: The event that invoked this popup menu.
- **/
-void 
-nautilus_pop_up_context_menu (GtkMenu	     *menu,
-			      gint16	      offset_x,
-			      gint16	      offset_y,
-			      GdkEventButton *event)
-{
-	GdkPoint offset;
-	int button;
-
-	g_return_if_fail (GTK_IS_MENU (menu));
-
-	offset.x = offset_x;
-	offset.y = offset_y;
-
-	/* The event button needs to be 0 if we're popping up this menu from
-	 * a button release, else a 2nd click outside the menu with any button
-	 * other than the one that invoked the menu will be ignored (instead
-	 * of dismissing the menu). This is a subtle fragility of the GTK menu code.
-	 */
-	button = event->type == GDK_BUTTON_RELEASE
-		? 0
-		: event->button;
-	
-	gtk_menu_popup (menu,					/* menu */
-			NULL,					/* parent_menu_shell */
-			NULL,					/* parent_menu_item */
-			nautilus_popup_menu_position_func,	/* func */
-			&offset,			        /* data */
-			button,					/* button */
-			event->time);				/* activate_time */
-
-	gtk_object_sink (GTK_OBJECT(menu));
-}
-
-GtkMenuItem *
-nautilus_gtk_menu_append_separator (GtkMenu *menu)
-{
-	return nautilus_gtk_menu_insert_separator (menu, -1);
-}
-
-GtkMenuItem *
-nautilus_gtk_menu_insert_separator (GtkMenu *menu, int index)
-{
-	GtkWidget *menu_item;
-
-	menu_item = gtk_menu_item_new ();
-	gtk_widget_set_sensitive (menu_item, FALSE);
-	gtk_widget_show (menu_item);
-	gtk_menu_insert (menu, menu_item, index);
-
-	return GTK_MENU_ITEM (menu_item);
-}
-
-void
-nautilus_gtk_menu_set_item_visibility (GtkMenu *menu, int index, gboolean visible)
-{
-	GList *children;
-	GtkWidget *menu_item;
-
-	g_return_if_fail (GTK_IS_MENU (menu));
-
-	children = gtk_container_children (GTK_CONTAINER (menu));
-	g_return_if_fail (index >= 0 && index < (int) g_list_length (children));
-
-	menu_item = GTK_WIDGET (g_list_nth_data (children, index));
-	if (visible) {
-		gtk_widget_show (menu_item);
-	} else {
-		gtk_widget_hide (menu_item);
-	}
-
-	g_list_free (children);
-}
-
-void
-nautilus_gtk_marshal_NONE__POINTER_INT_INT_DOUBLE (GtkObject *object,
-						   GtkSignalFunc func,
-						   gpointer func_data,
-						   GtkArg *args)
-{
-	(* (void (*)(GtkObject *, gpointer, int, int, double, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_INT (args[1]),
-		 GTK_VALUE_INT (args[2]),
-		 GTK_VALUE_DOUBLE (args[3]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_NONE__INT_INT_INT (GtkObject *object,
-					GtkSignalFunc func,
-					gpointer func_data,
-					GtkArg *args)
-{
-	(* (void (*)(GtkObject *, int, int, int, gpointer)) func)
-		(object,
-		 GTK_VALUE_INT (args[0]),
-		 GTK_VALUE_INT (args[1]),
-		 GTK_VALUE_INT (args[2]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_NONE__POINTER_INT_INT_INT (GtkObject *object,
-						GtkSignalFunc func,
-						gpointer func_data,
-						GtkArg *args)
-{
-	(* (void (*)(GtkObject *, gpointer, int, int, int, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_INT (args[1]),
-		 GTK_VALUE_INT (args[2]),
-		 GTK_VALUE_INT (args[3]),
-		 func_data);
-}
-
-void 
-nautilus_gtk_marshal_NONE__POINTER_INT_POINTER_POINTER (GtkObject *object,
-							GtkSignalFunc func,
-							gpointer func_data,
-							GtkArg *args)
-{
-	(* (void (*)(GtkObject *, gpointer, int, gpointer, gpointer, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_INT (args[1]),
-		 GTK_VALUE_POINTER (args[2]),
-		 GTK_VALUE_POINTER (args[3]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_NONE__POINTER_POINTER_INT_INT_INT (GtkObject *object,
-							GtkSignalFunc func,
-							gpointer func_data,
-							GtkArg *args)
-{
-	(* (void (*)(GtkObject *, gpointer, gpointer, int, int, int, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 GTK_VALUE_INT (args[2]),
-		 GTK_VALUE_INT (args[3]),
-		 GTK_VALUE_INT (args[4]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_BOOL__INT_POINTER_INT_INT_UINT (GtkObject *object,
-						     GtkSignalFunc func,
-						     gpointer func_data,
-						     GtkArg *args)
-{
-	* GTK_RETLOC_BOOL (args[5]) = (* (gboolean (*)(GtkObject *, int, gpointer, int, int, guint, gpointer)) func)
-		(object,
-		 GTK_VALUE_INT (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 GTK_VALUE_INT (args[2]),
-		 GTK_VALUE_INT (args[3]),
-		 GTK_VALUE_UINT (args[4]),
-		 func_data);
-}
-
-
-void
-nautilus_gtk_marshal_NONE__INT_POINTER_INT_INT_UINT (GtkObject *object,
-						     GtkSignalFunc func,
-						     gpointer func_data,
-						     GtkArg *args)
-{
-	(* (void (*)(GtkObject *, int, gpointer, int, int, guint, gpointer)) func)
-		(object,
-		 GTK_VALUE_INT (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 GTK_VALUE_INT (args[2]),
-		 GTK_VALUE_INT (args[3]),
-		 GTK_VALUE_UINT (args[4]),
-		 func_data);
-
-}
-
-
-void
-nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_INT_INT_INT (GtkObject *object,
-								GtkSignalFunc func,
-								gpointer func_data,
-								GtkArg *args)
-{
-	(* (void (*)(GtkObject *, gpointer, gpointer, gpointer, int, int, int, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 GTK_VALUE_POINTER (args[2]),
-		 GTK_VALUE_INT (args[3]),
-		 GTK_VALUE_INT (args[4]),
-		 GTK_VALUE_INT (args[5]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER_INT_INT_UINT (GtkObject *object,
-									 GtkSignalFunc func,
-									 gpointer func_data,
-									 GtkArg *args)
-{
-	(* (void (*)(GtkObject *, gpointer, gpointer, gpointer, gpointer, int, int, guint, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 GTK_VALUE_POINTER (args[2]),
-		 GTK_VALUE_POINTER (args[3]),
-		 GTK_VALUE_INT (args[4]),
-		 GTK_VALUE_INT (args[5]),
-		 GTK_VALUE_INT (args[6]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_NONE__POINTER_INT_INT_DOUBLE_DOUBLE (GtkObject *object,
-							  GtkSignalFunc func,
-							  gpointer func_data,
-							  GtkArg *args)
-{
-	(* (void (*)(GtkObject *, gpointer, int, int, double, double, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_INT (args[1]), 
-		 GTK_VALUE_INT (args[2]), 
-		 GTK_VALUE_DOUBLE (args[3]), 
-		 GTK_VALUE_DOUBLE (args[4]), 
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_NONE__DOUBLE (GtkObject *object,
-				   GtkSignalFunc func,
-				   gpointer func_data,
-				   GtkArg *args)
-{
-	(* (void (*)(GtkObject *, double, gpointer)) func)
-		(object,
-		 GTK_VALUE_DOUBLE (args[0]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_NONE__DOUBLE_DOUBLE_DOUBLE (GtkObject *object,
-				   GtkSignalFunc func,
-				   gpointer func_data,
-				   GtkArg *args)
-{
-	(* (void (*)(GtkObject *, double, double, double, gpointer)) func)
-		(object,
-		 GTK_VALUE_DOUBLE (args[0]),
-		 GTK_VALUE_DOUBLE (args[1]),
-		 GTK_VALUE_DOUBLE (args[2]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_POINTER__NONE (GtkObject *object,
-				    GtkSignalFunc func,
-				    gpointer func_data,
-				    GtkArg *args)
-{
-	* GTK_RETLOC_POINTER (args[0]) =
-		(* (void * (*)(GtkObject *, gpointer)) func) 
-		 (object,
-		 func_data);
-}
-
-void 
-nautilus_gtk_marshal_INT__NONE (GtkObject *object,
-				GtkSignalFunc  func,
-				gpointer       func_data,
-				GtkArg        *args)
-{
-	* GTK_RETLOC_INT (args[0]) =
-		(* (int (*)(GtkObject *, gpointer)) func)
-		 (object,
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_POINTER__INT (GtkObject *object,
-				   GtkSignalFunc func,
-				   gpointer func_data,
-				   GtkArg *args)
-{
-	* GTK_RETLOC_POINTER (args[1]) =
-		(* (gpointer (*)(GtkObject *, int, gpointer)) func)
-		(object,
-		 GTK_VALUE_INT (args[0]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_POINTER__POINTER (GtkObject *object,
-				       GtkSignalFunc func,
-				       gpointer func_data,
-				       GtkArg *args)
-{
-	* GTK_RETLOC_POINTER (args[1]) =
-		(* (gpointer (*)(GtkObject *, gpointer, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_INT__POINTER_POINTER (GtkObject *object,
-					   GtkSignalFunc func,
-					   gpointer func_data,
-					   GtkArg *args)
-{
-	* GTK_RETLOC_INT (args[2]) =
-		(* (int (*)(GtkObject *, gpointer, gpointer, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_INT__POINTER_INT (GtkObject *object,
-					   GtkSignalFunc func,
-					   gpointer func_data,
-					   GtkArg *args)
-{
-	* GTK_RETLOC_INT (args[2]) =
-		(* (int (*)(GtkObject *, gpointer, int, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_INT (args[1]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_POINTER__POINTER_POINTER (GtkObject *object,
-					       GtkSignalFunc func,
-					       gpointer func_data,
-					       GtkArg *args)
-{
-	* GTK_RETLOC_POINTER (args[2]) =
-		(* (gpointer (*)(GtkObject *, gpointer, gpointer, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_POINTER__POINTER_POINTER_POINTER (GtkObject *object,
-						       GtkSignalFunc func,
-						       gpointer func_data,
-						       GtkArg *args)
-{
-	* GTK_RETLOC_POINTER (args[3]) =
-		(* (gpointer (*)(GtkObject *, gpointer, gpointer, gpointer, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 GTK_VALUE_POINTER (args[2]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER (GtkObject *object,
-							    GtkSignalFunc func,
-							    gpointer func_data,
-							    GtkArg *args)
-{
-	(* (void (*)(GtkObject *, gpointer, gpointer, gpointer, gpointer, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 GTK_VALUE_POINTER (args[2]),
-		 GTK_VALUE_POINTER (args[3]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_POINTER__POINTER_INT_INT_POINTER_POINTER (GtkObject *object,
-							       GtkSignalFunc func,
-							       gpointer func_data,
-							       GtkArg *args)
-{
-	* GTK_RETLOC_POINTER (args[5]) =
-		(* (gpointer (*)(GtkObject *, gpointer, int, int, gpointer, gpointer, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_INT (args[1]),
-		 GTK_VALUE_INT (args[2]),
-		 GTK_VALUE_POINTER (args[3]),
-		 GTK_VALUE_POINTER (args[4]),
-		 func_data);
-}
-
-void
-nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER_POINTER_POINTER (GtkObject *object,
-									    GtkSignalFunc func,
-									    gpointer func_data,
-									    GtkArg *args)
-{
-	(* (void (*)(GtkObject *, gpointer, gpointer, gpointer,
-		     gpointer, gpointer, gpointer, gpointer)) func)
-		(object,
-		 GTK_VALUE_POINTER (args[0]),
-		 GTK_VALUE_POINTER (args[1]),
-		 GTK_VALUE_POINTER (args[2]),
-		 GTK_VALUE_POINTER (args[3]),
-		 GTK_VALUE_POINTER (args[4]),
-		 GTK_VALUE_POINTER (args[5]),
-		 func_data);
-}
-
-gboolean
-nautilus_point_in_allocation (const GtkAllocation *allocation,
-			      int x, int y)
-{
-	g_return_val_if_fail (allocation != NULL, FALSE);
-	return x >= allocation->x
-		&& y >= allocation->y
-		&& x < allocation->x + allocation->width 
-		&& y < allocation->y + allocation->height;
-}
-
-gboolean
-nautilus_point_in_widget (GtkWidget *widget,
-			  int x, int y)
-{
-	if (widget == NULL) {
-		return FALSE;
-	}
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	return nautilus_point_in_allocation (&widget->allocation, x, y);
-}
-
-/**
- * nautilus_gtk_object_list_ref
- *
- * Ref all the objects in a list.
- * @list: GList of objects.
- **/
-GList *
-nautilus_gtk_object_list_ref (GList *list)
-{
-	g_list_foreach (list, (GFunc) gtk_object_ref, NULL);
-	return list;
-}
-
-/**
- * nautilus_gtk_object_list_unref
- *
- * Unref all the objects in a list.
- * @list: GList of objects.
- **/
-void
-nautilus_gtk_object_list_unref (GList *list)
-{
-	nautilus_g_list_safe_for_each (list, (GFunc) gtk_object_unref, NULL);
-}
-
-/**
- * nautilus_gtk_object_list_free
- *
- * Free a list of objects after unrefing them.
- * @list: GList of objects.
- **/
-void
-nautilus_gtk_object_list_free (GList *list)
-{
-	nautilus_gtk_object_list_unref (list);
-	g_list_free (list);
-}
-
-/**
- * nautilus_gtk_object_list_copy
- *
- * Copy the list of objects, ref'ing each one.
- * @list: GList of objects.
- **/
-GList *
-nautilus_gtk_object_list_copy (GList *list)
-{
-	return g_list_copy (nautilus_gtk_object_list_ref (list));
-}
-
-/**
- * nautilus_gtk_style_set_font
- *
- * Sets the font in a style object, managing the ref. counts.
- * @style: The style to change.
- * @font: The new font.
- **/
-void
-nautilus_gtk_style_set_font (GtkStyle *style, GdkFont *font)
-{
-	g_return_if_fail (style != NULL);
-	g_return_if_fail (font != NULL);
-	
-	gdk_font_ref (font);
-	gdk_font_unref (style->font);
-	style->font = font;
-}
-
-/**
- * nautilus_gtk_widget_set_font
- *
- * Sets the font for a widget's style, managing the style objects.
- * @widget: The widget.
- * @font: The font.
- **/
-void
-nautilus_gtk_widget_set_font (GtkWidget *widget, GdkFont *font)
-{
-	GtkStyle *new_style;
-	
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-	g_return_if_fail (font != NULL);
-	
-	new_style = gtk_style_copy (gtk_widget_get_style (widget));
-
-	nautilus_gtk_style_set_font (new_style, font);
-	
-	gtk_widget_set_style (widget, new_style);
-	gtk_style_unref (new_style);
-}
-
-/**
- * nautilus_gtk_widget_set_shown
- *
- * Show or hide a widget.
- * @widget: The widget.
- * @shown: Boolean value indicating whether the widget should be shown or hidden.
- **/
-void
-nautilus_gtk_widget_set_shown (GtkWidget *widget, gboolean shown)
-{
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-
-	if (shown) {
-		gtk_widget_show (widget);
-	} else {
-		gtk_widget_hide (widget);
-	}
-}
-
-/**
- * nautilus_gtk_widget_set_font_by_name
- *
- * Sets the font for a widget, managing the font and style objects.
- * @widget: The widget
- **/
-void
-nautilus_gtk_widget_set_font_by_name (GtkWidget *widget, const char *font_name)
-{
-	GdkFont *font;
-
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-	g_return_if_fail (font_name != NULL);
-	
-	font = gdk_fontset_load (font_name);
-	nautilus_gtk_widget_set_font (widget, font);
-	gdk_font_unref (font);
-}
-
-/* This stuff is stolen from Gtk. */
-
-typedef struct DisconnectInfo {
-	GtkObject *object1;
-	guint disconnect_handler1;
-	guint signal_handler;
-	GtkObject *object2;
-	guint disconnect_handler2;
-} DisconnectInfo;
-
-static void
-alive_disconnecter (GtkObject *object, DisconnectInfo *info)
-{
-	g_assert (info != NULL);
-	g_assert (GTK_IS_OBJECT (info->object1));
-	g_assert (info->disconnect_handler1 != 0);
-	g_assert (info->signal_handler != 0);
-	g_assert (GTK_IS_OBJECT (info->object2));
-	g_assert (info->disconnect_handler2 != 0);
-	g_assert (object == info->object1 || object == info->object2);
-	
-	gtk_signal_disconnect (info->object1, info->disconnect_handler1);
-	gtk_signal_disconnect (info->object1, info->signal_handler);
-	gtk_signal_disconnect (info->object2, info->disconnect_handler2);
-	
-	g_free (info);
-}
-
-/**
- * nautilus_gtk_signal_connect_full_while_alive
- *
- * Like gtk_signal_connect_while_alive, but works with full parameters.
- **/
-void
-nautilus_gtk_signal_connect_full_while_alive (GtkObject *object,
-					      const gchar *name,
-					      GtkSignalFunc func,
-					      GtkCallbackMarshal marshal,
-					      gpointer data,
-					      GtkDestroyNotify destroy_func,
-					      gboolean object_signal,
-					      gboolean after,
-					      GtkObject *alive_object)
-{
-	DisconnectInfo *info;
-	
-	g_return_if_fail (GTK_IS_OBJECT (object));
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (func != NULL);
-	g_return_if_fail (object_signal == FALSE || object_signal == TRUE);
-	g_return_if_fail (after == FALSE || after == TRUE);
-	g_return_if_fail (GTK_IS_OBJECT (alive_object));
-	
-	info = g_new (DisconnectInfo, 1);
-	info->object1 = object;
-	info->object2 = alive_object;
-	
-	info->signal_handler = gtk_signal_connect_full (object,
-							name,
-							func,
-							marshal,
-							data,
-							destroy_func,
-							object_signal,
-							after);
-	info->disconnect_handler1 = gtk_signal_connect (object,
-							"destroy",
-							alive_disconnecter,
-							info);
-	info->disconnect_handler2 = gtk_signal_connect (alive_object,
-							"destroy",
-							alive_disconnecter,
-							info);
-}
-
-typedef struct
-{
-	GtkObject *object;
-	guint object_destroy_handler;
-	
-	GtkWidget *realized_widget;
-	guint realized_widget_destroy_handler;
-	guint realized_widget_unrealized_handler;
-
-	guint signal_handler;
-} RealizeDisconnectInfo;
-
-static void
-while_realized_disconnecter (GtkObject *object,
-			     RealizeDisconnectInfo *info)
-{
-	g_return_if_fail (GTK_IS_OBJECT (object));
-	g_return_if_fail (info != NULL);
-	g_return_if_fail (GTK_IS_OBJECT (info->object));
-	g_return_if_fail (info->object_destroy_handler != 0);
-	g_return_if_fail (info->object_destroy_handler != 0);
-	g_return_if_fail (info->realized_widget_destroy_handler != 0);
-	g_return_if_fail (info->realized_widget_unrealized_handler != 0);
-
- 	gtk_signal_disconnect (info->object, info->object_destroy_handler);
- 	gtk_signal_disconnect (info->object, info->signal_handler);
- 	gtk_signal_disconnect (GTK_OBJECT (info->realized_widget), info->realized_widget_destroy_handler);
- 	gtk_signal_disconnect (GTK_OBJECT (info->realized_widget), info->realized_widget_unrealized_handler);
-	g_free (info);
-}
-
-/**
- * nautilus_gtk_signal_connect_while_realized:
- *
- * @object: Object to connect to.
- * @name: Name of signal to connect to.
- * @callback: Caller's callback.
- * @callback_data: Caller's callback_data.
- * @realized_widget: Widget to monitor for realized state.  Signal is connected
- *                   while this wigget is realized.
- *
- * Connect to a signal of an object while another widget is realized.  This is 
- * useful for non windowed widgets that need to monitor events in their ancestored
- * windowed widget.  The signal is automatically disconnected when &widget is
- * unrealized.  Also, the signal is automatically disconnected when either &object
- * or &widget are destroyed.
- **/
-void
-nautilus_gtk_signal_connect_while_realized (GtkObject *object,
-					    const char *name,
-					    GtkSignalFunc callback,
-					    gpointer callback_data,
-					    GtkWidget *realized_widget)
-{
-	RealizeDisconnectInfo *info;
-
-	g_return_if_fail (GTK_IS_OBJECT (object));
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (name[0] != '\0');
-	g_return_if_fail (callback != NULL);
-	g_return_if_fail (GTK_IS_WIDGET (realized_widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (realized_widget));
-
-	info = g_new0 (RealizeDisconnectInfo, 1);
-	
-	info->object = object;
-	info->object_destroy_handler = 
-		gtk_signal_connect (info->object,
-				    "destroy",
-				    while_realized_disconnecter,
-				    info);
-	
-	info->realized_widget = realized_widget;
-	info->realized_widget_destroy_handler = 
-		gtk_signal_connect (GTK_OBJECT (info->realized_widget),
-				    "destroy",
-				    while_realized_disconnecter,
-				    info);
-	info->realized_widget_unrealized_handler = 
-		gtk_signal_connect_after (GTK_OBJECT (info->realized_widget),
-					  "unrealize",
-					  while_realized_disconnecter,
-					  info);
-
-	info->signal_handler = gtk_signal_connect (info->object, name, callback, callback_data);
-}
-
-static void
-null_the_reference (GtkObject *object, gpointer callback_data)
-{
-	g_assert (* (GtkObject **) callback_data == object);
-
-	* (gpointer *) callback_data = NULL;
-}
-
-/**
- * nautilus_nullify_when_destroyed.
- *
- * Nulls out a saved reference to an object when the object gets destroyed.
- * @data: Address of the saved reference.
- **/
-
-void 
-nautilus_nullify_when_destroyed (gpointer data)
-{
-	GtkObject **object_reference;
-
-	object_reference = (GtkObject **)data;	
-	if (*object_reference == NULL) {
-		/* the reference is  NULL, nothing to do. */
-		return;
-	}
-
-	g_assert (GTK_IS_OBJECT (*object_reference));
-
-	gtk_signal_connect (*object_reference, "destroy",
-		null_the_reference, object_reference);
-}
-
-/**
- * nautilus_nullify_cancel.
- *
- * Disconnects the signal used to make nautilus_nullify_when_destroyed.
- * Used when the saved reference is no longer needed, the structure it is in is
- * being destroyed, etc. Nulls out the refernce when done.
- * @data: Address of the saved reference.
- **/
-
-void 
-nautilus_nullify_cancel (gpointer data)
-{
-	GtkObject **object_reference;
-
-	object_reference = (GtkObject **)data;	
-	if (*object_reference == NULL) {
-		/* the object was already destroyed and the reference nulled out,
-		 * nothing to do.
-		 */
-		return;
-	}
-
-	g_assert (GTK_IS_OBJECT (*object_reference));
-
-	gtk_signal_disconnect_by_func (*object_reference,
-		null_the_reference, object_reference);
-	
-	*object_reference = NULL;
-}
-
-
-/**
- * nautilus_gtk_container_get_first_child.
- *
- * Returns the first child of a container.
- * @container: The container.
- **/
-
-static void
-get_first_callback (GtkWidget *widget, gpointer callback_data)
-{
-	GtkWidget **first_child_slot;
-
-	g_assert (GTK_IS_WIDGET (widget));
-	g_assert (callback_data != NULL);
-	
-	first_child_slot = callback_data;
-
-	if (*first_child_slot == NULL) {
-		*first_child_slot = widget;
-		/* We'd stop the iterating now if we could. */
-	} else {
-		g_assert (GTK_IS_WIDGET (*first_child_slot));
-	}
-}
-
-GtkWidget *
-nautilus_gtk_container_get_first_child (GtkContainer *container)
-{
-	GtkWidget *first_child;
-
-	g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL);
-	
-	first_child = NULL;
-	gtk_container_foreach (container, get_first_callback, &first_child);
-	g_assert (first_child == NULL || GTK_IS_WIDGET (first_child));
-	return first_child;
-}
-
-typedef struct {
-	GtkCallback   callback;
-	gpointer      callback_data;
-} container_foreach_deep_callback_data;
-
-static void
-container_foreach_deep_callback (GtkWidget *child, gpointer data)
-{
-	container_foreach_deep_callback_data *deep_data;
-
-	deep_data = (container_foreach_deep_callback_data *) data;
-
-	deep_data->callback (child, deep_data->callback_data);
-
-	if (GTK_IS_CONTAINER (child)) {
-		gtk_container_foreach (GTK_CONTAINER (child), container_foreach_deep_callback, data);
-	}
-}
-
-void
-nautilus_gtk_container_foreach_deep (GtkContainer *container,
-				     GtkCallback callback,
-				     gpointer callback_data)
-{
-	container_foreach_deep_callback_data deep_data;
-	deep_data.callback = callback;
-	deep_data.callback_data = callback_data;
-	gtk_container_foreach (container, container_foreach_deep_callback, &deep_data);
-}
-
-/* We have to supply a dummy pixmap to avoid the return_if_fail in gtk_pixmap_new. */
-GtkPixmap *
-nautilus_gtk_pixmap_new_empty (void)
-{
-	GtkPixmap *pixmap;
-
-	/* Make a GtkPixmap with a dummy GdkPixmap. The
-         * gdk_pixmap_new call will fail if passed 0 for height or
-	 * width, or if passed a bad depth.
-	 */
-	pixmap = GTK_PIXMAP (gtk_pixmap_new (gdk_pixmap_new (NULL, 1, 1, gdk_visual_get_best_depth ()), NULL));
-
-	/* Clear out the dummy pixmap. */
-	gtk_pixmap_set (pixmap, NULL, NULL);
-
-	return pixmap;
-}
-
-/* The standard gtk_adjustment_set_value ignores page size, which
- * disagrees with the logic used by scroll bars, for example.
- */
-void
-nautilus_gtk_adjustment_set_value (GtkAdjustment *adjustment,
-				   float value)
-{
-	float upper_page_start, clamped_value;
-
-	g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-	
-	upper_page_start = MAX (adjustment->upper - adjustment->page_size, adjustment->lower);
-	clamped_value = CLAMP (value, adjustment->lower, upper_page_start);
-	if (clamped_value != adjustment->value) {
-		adjustment->value = clamped_value;
-		gtk_adjustment_value_changed (adjustment);
-	}
-}
-
-/* Clamp a value if the minimum or maximum has changed. */
-void
-nautilus_gtk_adjustment_clamp_value (GtkAdjustment *adjustment)
-{
-	g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-	
-	nautilus_gtk_adjustment_set_value (adjustment, adjustment->value);
-}
-
-/**
- * nautilus_gtk_label_make_bold.
- *
- * Switches the font of label to a bold equivalent.
- * @label: The label.
- **/
-void
-nautilus_gtk_label_make_bold (GtkLabel *label)
-{
-	GtkStyle *style;
-	GdkFont *bold_font;
-
-	g_return_if_fail (GTK_IS_LABEL (label));
-
-	gtk_widget_ensure_style (GTK_WIDGET (label));
-	style = gtk_widget_get_style (GTK_WIDGET (label));
-
-	bold_font = nautilus_gdk_font_get_bold (style->font);
-	if (bold_font == NULL) {
-		return;
-	}
-	nautilus_gtk_widget_set_font (GTK_WIDGET (label), bold_font);
-	gdk_font_unref (bold_font);
-}
-
-/**
- * nautilus_gtk_label_make_larger.
- *
- * Switches the font of label to a larger version of the font.
- * @label: The label.
- **/
-void
-nautilus_gtk_label_make_larger (GtkLabel *label,
-				guint num_steps)
-{
-	GtkStyle *style;
-	GdkFont *larger_font;
-
-	g_return_if_fail (GTK_IS_LABEL (label));
-
-	gtk_widget_ensure_style (GTK_WIDGET (label));
-	style = gtk_widget_get_style (GTK_WIDGET (label));
-
-	larger_font = nautilus_gdk_font_get_larger (style->font, num_steps);
-	if (larger_font == NULL) {
-		return;
-	}
-	nautilus_gtk_widget_set_font (GTK_WIDGET (label), larger_font);
-	gdk_font_unref (larger_font);
-}
-
-/**
- * nautilus_gtk_label_make_smaller.
- *
- * Switches the font of label to a smaller version of the font.
- * @label: The label.
- **/
-void
-nautilus_gtk_label_make_smaller (GtkLabel *label,
-				 guint num_steps)
-{
-	GtkStyle *style;
-	GdkFont *smaller_font;
-
-	g_return_if_fail (GTK_IS_LABEL (label));
-
-	gtk_widget_ensure_style (GTK_WIDGET (label));
-	style = gtk_widget_get_style (GTK_WIDGET (label));
-
-	smaller_font = nautilus_gdk_font_get_smaller (style->font, num_steps);
-	if (smaller_font == NULL) {
-		return;
-	}
-	nautilus_gtk_widget_set_font (GTK_WIDGET (label), smaller_font);
-	gdk_font_unref (smaller_font);
-}
-
-void
-nautilus_gtk_widget_set_background_color (GtkWidget              *widget,
-					  const char		*color_spec)
-{
-	GtkStyle	*style;
-	GdkColor	color;
-
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-
-	style = gtk_widget_get_style (widget);
-
-	/* Make a copy of the style. */
-	style = gtk_style_copy (style);
-
-	nautilus_gdk_color_parse_with_white_default (color_spec, &color);
-	style->bg[GTK_STATE_NORMAL] = color;
-	style->base[GTK_STATE_NORMAL] = color;
-	style->bg[GTK_STATE_ACTIVE] = color;
-	style->base[GTK_STATE_ACTIVE] = color;
-
-	/* Put the style in the widget. */
-	gtk_widget_set_style (widget, style);
-	gtk_style_unref (style);
-}
-
-void
-nautilus_gtk_widget_set_foreground_color (GtkWidget              *widget,
-					  const char		*color_spec)
-{
-	GtkStyle	*style;
-	GdkColor	color;
-
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-
-	style = gtk_widget_get_style (widget);
-
-	/* Make a copy of the style. */
-	style = gtk_style_copy (style);
-
-	nautilus_gdk_color_parse_with_white_default (color_spec, &color);
-	style->fg[GTK_STATE_NORMAL] = color;
-	style->fg[GTK_STATE_ACTIVE] = color;
-
-	/* Put the style in the widget. */
-	gtk_widget_set_style (widget, style);
-	gtk_style_unref (style);
-}
-
-GtkWidget *
-nautilus_gtk_widget_find_windowed_ancestor (GtkWidget *widget)
-{
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
-	while (widget && GTK_WIDGET_NO_WINDOW (widget)) {
-		widget = widget->parent;
-	}
-
-	return widget;
-}
-
-
-
-/*following code shamelessly stolen from gtk*/
-static void
-rgb_to_hls (gdouble *r,
-            gdouble *g,
-            gdouble *b)
-{
-	gdouble min;
-	gdouble max;
-	gdouble red;
-	gdouble green;
-	gdouble blue;
-	gdouble h, l, s;
-	gdouble delta;
-
-	red = *r;
-	green = *g;
-	blue = *b;
-
-	if (red > green) {
-		if (red > blue)
-			max = red;
-		else
-			max = blue;
-		
-		if (green < blue)
-			min = green;
-		else
-			min = blue;
-	} else {
-		if (green > blue)
-			max = green;
-		else
-			max = blue;
-		
-		if (red < blue)
-			min = red;
-		else
-			min = blue;
-	}
-
-	l = (max + min) / 2;
-	s = 0;
-	h = 0;
-
-	if (max != min) {
-		if (l <= 0.5)
-			s = (max - min) / (max + min);
-		else
-			s = (max - min) / (2 - max - min);
-		
-		delta = max -min;
-		if (red == max)
-			h = (green - blue) / delta;
-		else if (green == max)
-			h = 2 + (blue - red) / delta;
-		else if (blue == max)
-			h = 4 + (red - green) / delta;
-		
-		h *= 60;
-		if (h < 0.0)
-			h += 360;
-	}
-	
-	*r = h;
-	*g = l;
-	*b = s;
-}
-
-static void
-hls_to_rgb (gdouble *h,
-            gdouble *l,
-            gdouble *s)
-{
-	gdouble hue;
-	gdouble lightness;
-	gdouble saturation;
-	gdouble m1, m2;
-	gdouble r, g, b;
-	
-	lightness = *l;
-	saturation = *s;
-
-	if (lightness <= 0.5)
-		m2 = lightness * (1 + saturation);
-	else
-		m2 = lightness + saturation - lightness * saturation;
-	m1 = 2 * lightness - m2;
-
-	if (saturation == 0) {
-		*h = lightness;
-		*l = lightness;
-		*s = lightness;
-	} else {
-		hue = *h + 120;
-		while (hue > 360)
-			hue -= 360;
-		while (hue < 0)
-			hue += 360;
-		
-		if (hue < 60)
-			r = m1 + (m2 - m1) * hue / 60;
-		else if (hue < 180)
-			r = m2;
-		else if (hue < 240)
-			r = m1 + (m2 - m1) * (240 - hue) / 60;
-		else
-			r = m1;
-
-		hue = *h;
-		while (hue > 360)
-			hue -= 360;
-		while (hue < 0)
-			hue += 360;
-		
-		if (hue < 60)
-			g = m1 + (m2 - m1) * hue / 60;
-		else if (hue < 180)
-			g = m2;
-		else if (hue < 240)
-			g = m1 + (m2 - m1) * (240 - hue) / 60;
-		else
-			g = m1;
-		
-		hue = *h - 120;
-		while (hue > 360)
-			hue -= 360;
-		while (hue < 0)
-			hue += 360;
-		
-		if (hue < 60)
-			b = m1 + (m2 - m1) * hue / 60;
-		else if (hue < 180)
-			b = m2;
-		else if (hue < 240)
-			b = m1 + (m2 - m1) * (240 - hue) / 60;
-		else
-			b = m1;
-		
-		*h = r;
-		*l = g;
-		*s = b;
-	}
-}
-
-void
-nautilus_gtk_style_shade (GdkColor *a,
-			  GdkColor *b,
-			  gdouble   k)
-{
-
-	gdouble red;
-	gdouble green;
-	gdouble blue;
-	
-	red = (gdouble) a->red / 65535.0;
-	green = (gdouble) a->green / 65535.0;
-	blue = (gdouble) a->blue / 65535.0;
-	
-	rgb_to_hls (&red, &green, &blue);
-
-	green *= k;
-	if (green > 1.0)
-		green = 1.0;
-	else if (green < 0.0)
-		green = 0.0;
-
-	blue *= k;
-	if (blue > 1.0)
-		blue = 1.0;
-	else if (blue < 0.0)
-		blue = 0.0;
-
-	hls_to_rgb (&red, &green, &blue);
-
-	b->red = red * 65535.0;
-	b->green = green * 65535.0;
-	b->blue = blue * 65535.0;
-}
-
-/**
- * nautilus_gtk_class_name_make_like_existing_type:
- * @class_name: The class name for the custom widget.
- * @existing_gtk_type: The GtkType of the existing GtkWidget.
- *
- * Make the given class name act like an existing GtkType for
- * gtk theme/style purposes.  This can be used by custom 
- * widget to emulate the styles of stock Gtk widgets.  For
- * example:
- *
- * nautilus_gtk_class_name_make_like_existing ("NautilusCustomButton",
- *                                             GTK_TYPE_BUTTON);
- *
- *
- * You should call this function only once from the class_initialize()
- * method of the custom widget.
- **/
-void
-nautilus_gtk_class_name_make_like_existing_type (const char *class_name,
-						 GtkType existing_gtk_type)
-{
-	GtkWidget *temporary;
-	GtkStyle *style;
-
-	g_return_if_fail (class_name != NULL);
-
-	temporary = gtk_widget_new (existing_gtk_type, NULL);
-	gtk_widget_ensure_style (temporary);
-		
-	style = gtk_widget_get_style (temporary);
-
-	if (style->rc_style != NULL) {
-		gtk_rc_add_widget_class_style (style->rc_style, class_name);
-	}
-		
-	gtk_widget_destroy (temporary);
-}
-
-/* helper function for nautilus_get_window_list_ordered_front_to_back () */
-static GtkWidget *
-window_at_or_below (int depth, Window xid, gboolean *keep_going)
-{
-	static Atom wm_state = 0;
-
-	GtkWidget *widget;
-
-	Atom actual_type;
-	int actual_format;
-	gulong nitems, bytes_after;
-	gulong *prop;
-
-	GdkWindow *window;
-	gpointer data;
-
-	Window root, parent, *children;
-	int nchildren, i;
-
-	if (wm_state == 0) {
-		wm_state = XInternAtom (GDK_DISPLAY (), "WM_STATE", False);
-	}
-
-	/* Check if the window is a top-level client window.
-	 * Windows will have a WM_STATE property iff they're top-level.
-	 */
-	if (XGetWindowProperty (GDK_DISPLAY (), xid, wm_state, 0, 1,
-				False, AnyPropertyType, &actual_type,
-				&actual_format, &nitems, &bytes_after,
-				(guchar **) &prop) == Success
-	    && prop != NULL && actual_format == 32 && prop[0] == NormalState)
-	{
-		/* Found a top-level window */
-
-		if (prop != NULL) {
-			XFree (prop);
-		}
-
-		/* Does GDK know anything about this window? */
-		window = gdk_window_lookup (xid);
-		if (window != NULL) {
-			gdk_window_get_user_data (window, &data);
-			if (data != NULL)
-			{
-				/* Found one of the widgets we're after */
-				*keep_going = FALSE;
-				return GTK_WIDGET (data);
-			}
-		}
-
-		/* No point in searching past here. It's a top-level
-		 * window, but not from this application.
-		 */
-		*keep_going = FALSE;
-		return NULL;
-	}
-
-	/* Not found a top-level window yet, so keep recursing. */
-	if (depth < MAXIMUM_WM_REPARENTING_DEPTH) {
-		if (XQueryTree (GDK_DISPLAY (), xid, &root,
-				&parent, &children, &nchildren) != 0)
-		{
-			widget = NULL;
-
-			for (i = 0; *keep_going && i < nchildren; i++) {
-				widget = window_at_or_below (depth + 1,
-							     children[i],
-							     keep_going);
-			}
-
-			if (children != NULL) {
-				XFree (children);
-			}
-
-			if (! *keep_going) {
-				return widget;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-/* nautilus_get_window_list_ordered_front_to_back:
- *
- * Return a list of GtkWindows's, representing the stacking order (top to
- * bottom) of all windows (known to the local GDK).
- *
- * (Involves a large number of X server round trips, so call sparingly)
- */
-GList *
-nautilus_get_window_list_ordered_front_to_back (void)
-{
-	Window root, parent, *children;
-	int nchildren, i;
-	GList *windows;
-	GtkWidget *widget;
-	gboolean keep_going;
-
-	/* There's a possibility that a window will be closed in
-	 * the period between us querying the child-of-root windows
-	 * and getting round to search _their_ children. So arrange
-	 * for errors to be caught and ignored.
-	 */
-
-	gdk_error_trap_push ();
-
-	windows = NULL;
-
-	if (XQueryTree (GDK_DISPLAY (), GDK_ROOT_WINDOW (),
-			&root, &parent, &children, &nchildren) != 0)
-	{
-		for (i = 0; i < nchildren; i++) {
-			keep_going = TRUE;
-			widget = window_at_or_below (0, children[i],
-						     &keep_going);
-			if (widget != NULL) {
-				/* XQueryTree returns window in bottom ->
-				 * top order, so consing up the list in
-				 * the normal manner will reverse this
-				 * giving the desired top -> bottom order
-				 */
-				windows = g_list_prepend (windows, widget);
-			}
-		}
-		if (children != NULL) {
-			XFree (children);
-		}
-	}
-
-	gdk_flush ();
-	gdk_error_trap_pop ();
-
-	return windows;
-}
-
-/* nautilus_gtk_get_system_font:
- *
- * Return the system font as selected in the control center.  Need to 
- * gdk_font_unref() the result when done with it.
- *
- * Perhaps there is a better way to figure out what that font is, but
- * the following is simple enough and it works.
- */
-GdkFont *
-nautilus_gtk_get_system_font (void)
-{
-	GtkWidget *label;
-	GdkFont *font;
-
-	label = gtk_label_new ("");
-	
-	gtk_widget_ensure_style (label);
-
-	font = label->style->font;
-	gdk_font_ref (font);
-
- 	gtk_widget_destroy (label);
-
-	return font;
-}
-
-static guint
-event_get_time (GdkEvent *event)
-{
-	if (event != NULL) {
-		switch (event->type) {
-		case GDK_MOTION_NOTIFY:
-			return event->motion.time;
-		case GDK_BUTTON_PRESS:
-		case GDK_2BUTTON_PRESS:
-		case GDK_3BUTTON_PRESS:
-		case GDK_BUTTON_RELEASE:
-			return event->button.time;
-		case GDK_KEY_PRESS:
-		case GDK_KEY_RELEASE:
-			return event->key.time;
-		case GDK_ENTER_NOTIFY:
-		case GDK_LEAVE_NOTIFY:
-			return event->crossing.time;
-		case GDK_PROPERTY_NOTIFY:
-			return event->property.time;
-		case GDK_SELECTION_CLEAR:
-		case GDK_SELECTION_REQUEST:
-		case GDK_SELECTION_NOTIFY:
-			return event->selection.time;
-		case GDK_PROXIMITY_IN:
-		case GDK_PROXIMITY_OUT:
-			return event->proximity.time;
-		case GDK_DRAG_ENTER:
-		case GDK_DRAG_LEAVE:
-		case GDK_DRAG_MOTION:
-		case GDK_DRAG_STATUS:
-		case GDK_DROP_START:
-		case GDK_DROP_FINISHED:
-			return event->dnd.time;
-		case GDK_CLIENT_EVENT:
-		case GDK_VISIBILITY_NOTIFY:
-		case GDK_NO_EXPOSE:
-		case GDK_CONFIGURE:
-		case GDK_FOCUS_CHANGE:
-		case GDK_NOTHING:
-		case GDK_DELETE:
-		case GDK_DESTROY:
-		case GDK_EXPOSE:
-		case GDK_MAP:
-		case GDK_UNMAP:
-			/* return current time */
-			break;
-		}
-	}
-	
-	return GDK_CURRENT_TIME;
-}
-
-guint
-nautilus_get_current_event_time (void)
-{
-	GdkEvent *event;
-	guint time;
-
-	event = gtk_get_current_event ();
-	time = event_get_time (event);
-	if (event != NULL) {
-		gdk_event_free (event);
-	}
-	return time;
-}
-
-void
-nautilus_drag_set_icon_pixbuf (GdkDragContext *context,
-			       GdkPixbuf *pixbuf,
-			       int hot_x,
-			       int hot_y)
-{
-	GdkPixmap *pixmap;
-	GdkBitmap *mask;
-
-	gdk_pixbuf_render_pixmap_and_mask
-		(pixbuf, &pixmap, &mask,
-		 NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
-	gtk_drag_set_icon_pixmap
-		(context, gdk_rgb_get_cmap (), pixmap, mask, hot_x, hot_y);
-	/* FIXME: Verify that this does not leak the pixmap and mask.
-	 * We've always done it this way, but maybe we've always
-	 * leaked. Just doing the unref here definitely causes a
-	 * problem, so it's not that simple.
-	 */
-}
diff --git a/libnautilus-private/nautilus-gtk-extensions.h b/libnautilus-private/nautilus-gtk-extensions.h
deleted file mode 100644
index 4f28f34d4..000000000
--- a/libnautilus-private/nautilus-gtk-extensions.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-gtk-extensions.h - interface for new functions that operate on
-  			       gtk classes. Perhaps some of these should be
-  			       rolled into gtk someday.
-
-   Copyright (C) 1999, 2000, 2001 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: John Sullivan <sullivan@eazel.com>
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_GTK_EXTENSIONS_H
-#define NAUTILUS_GTK_EXTENSIONS_H
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkpixmap.h>
-#include <gtk/gtkwindow.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-
-#define NAUTILUS_DEFAULT_POPUP_MENU_DISPLACEMENT 	2
-#define NAUTILUS_STANDARD_CLOSE_WINDOW_CONTROL_KEY 	'w'
-
-
-/* GtkButton */
-void              nautilus_gtk_button_auto_click                       (GtkButton                *button);
-void              nautilus_gtk_button_set_standard_padding             (GtkButton                *button);
-void              nautilus_gtk_button_set_padding                      (GtkButton                *button,
-									int                       pad_amount);
-
-/* GtkCList */
-int               nautilus_gtk_clist_get_first_selected_row            (GtkCList                 *list);
-int               nautilus_gtk_clist_get_last_selected_row             (GtkCList                 *list);
-void              nautilus_gtk_clist_set_double_click_button           (GtkCList                 *clist,
-									GtkButton                *button);
-
-/* signals */
-guint             nautilus_gtk_signal_connect_free_data                (GtkObject                *object,
-									const gchar              *name,
-									GtkSignalFunc             func,
-									gpointer                  data);
-guint             nautilus_gtk_signal_connect_free_data_custom         (GtkObject                *object,
-									const gchar              *name,
-									GtkSignalFunc             func,
-									gpointer                  data,
-									GtkDestroyNotify          destroy_func);
-void              nautilus_gtk_signal_connect_full_while_alive         (GtkObject                *object,
-									const gchar              *name,
-									GtkSignalFunc             func,
-									GtkCallbackMarshal        marshal,
-									gpointer                  data,
-									GtkDestroyNotify          destroy_func,
-									gboolean                  object_signal,
-									gboolean                  after,
-									GtkObject                *alive_object);
-void              nautilus_gtk_signal_connect_while_realized           (GtkObject                *object,
-									const char               *name,
-									GtkSignalFunc             callback,
-									gpointer                  callback_data,
-									GtkWidget                *realized_widget);
-void              nautilus_nullify_when_destroyed                      (gpointer                  object_pointer_address);
-void              nautilus_nullify_cancel                              (gpointer                  object_pointer_address);
-
-/* list of GtkObject */
-GList *           nautilus_gtk_object_list_ref                         (GList                    *list);
-void              nautilus_gtk_object_list_unref                       (GList                    *list);
-void              nautilus_gtk_object_list_free                        (GList                    *list);
-GList *           nautilus_gtk_object_list_copy                        (GList                    *list);
-
-/* GtkWidget */
-void              nautilus_gtk_widget_set_shown                        (GtkWidget                *widget,
-									gboolean                  shown);
-gboolean          nautilus_point_in_allocation                         (const GtkAllocation      *allocation,
-									int                       x,
-									int                       y);
-void              nautilus_gtk_widget_set_font                         (GtkWidget                *widget,
-									GdkFont                  *font);
-void              nautilus_gtk_widget_set_font_by_name                 (GtkWidget                *widget,
-									const char               *font_name);
-gboolean          nautilus_point_in_widget                             (GtkWidget                *widget,
-									int                       x,
-									int                       y);
-void              nautilus_gtk_widget_set_background_color             (GtkWidget                *widget,
-									const char               *color_spec);
-void              nautilus_gtk_widget_set_foreground_color             (GtkWidget                *widget,
-									const char               *color_spec);
-GtkWidget        *nautilus_gtk_widget_find_windowed_ancestor           (GtkWidget                *widget);
-guint             nautilus_get_current_event_time                      (void);
-
-GdkFont          *nautilus_gtk_get_system_font                         (void);
-
-/* GtkContainer */
-GtkWidget        *nautilus_gtk_container_get_first_child               (GtkContainer             *container);
-void              nautilus_gtk_container_foreach_deep                  (GtkContainer             *container,
-									GtkCallback               callback,
-									gpointer                  callback_data);
-
-/* GtkWindow */
-void              nautilus_gtk_window_set_initial_geometry             (GtkWindow                *window,
-									NautilusGdkGeometryFlags  geometry_flags,
-									int                       left,
-									int                       top,
-									guint                     width,
-									guint                     height);
-void              nautilus_gtk_window_set_initial_geometry_from_string (GtkWindow                *window,
-									const char               *geometry_string,
-									guint                     minimum_width,
-									guint                     minimum_height);
-void              nautilus_gtk_window_set_up_close_accelerator         (GtkWindow                *window);
-gboolean          nautilus_gtk_window_event_is_close_accelerator       (GtkWindow                *window,
-									GdkEventKey              *event);
-void              nautilus_gtk_window_present                          (GtkWindow                *window);
-
-/* selection data */
-GtkSelectionData *nautilus_gtk_selection_data_copy_deep                (const GtkSelectionData   *selection_data);
-void              nautilus_gtk_selection_data_free_deep                (GtkSelectionData         *selection_data);
-
-/* GtkMenu and GtkMenuItem */
-char             *nautilus_truncate_text_for_menu_item                 (const char               *text);
-void              nautilus_pop_up_context_menu                         (GtkMenu                  *menu,
-									gint16                    offset_x,
-									gint16                    offset_y,
-									GdkEventButton           *event);
-GtkMenuItem *     nautilus_gtk_menu_append_separator                   (GtkMenu                  *menu);
-GtkMenuItem *     nautilus_gtk_menu_insert_separator                   (GtkMenu                  *menu,
-									int                       index);
-void              nautilus_gtk_menu_set_item_visibility                (GtkMenu                  *menu,
-									int                       index,
-									gboolean                  visible);
-/* GtkStyle */
-void              nautilus_gtk_style_set_font                          (GtkStyle                 *style,
-									GdkFont                  *font);
-void              nautilus_gtk_style_set_font_by_name                  (GtkStyle                 *style,
-									const char               *font_name);
-
-/* GtkLabel */
-void              nautilus_gtk_label_make_bold                         (GtkLabel                 *label);
-void              nautilus_gtk_label_make_larger                       (GtkLabel                 *label,
-									guint                     num_steps);
-void              nautilus_gtk_label_make_smaller                      (GtkLabel                 *label,
-									guint                     num_steps);
-
-/* GtkPixmap */
-GtkPixmap        *nautilus_gtk_pixmap_new_empty                        (void);
-
-/* GtkAdjustment */
-void              nautilus_gtk_adjustment_set_value                    (GtkAdjustment            *adjustment,
-									float                     value);
-void              nautilus_gtk_adjustment_clamp_value                  (GtkAdjustment            *adjustment);
-
-/* GdkColor */
-void              nautilus_gtk_style_shade                             (GdkColor                 *a,
-									GdkColor                 *b,
-									gdouble                   k);
-
-/* Make the given class name act like an existing GtkType for
- * gtk style/theme purposes. */
-void              nautilus_gtk_class_name_make_like_existing_type      (const char               *class_name,
-									GtkType                   existing_gtk_type);
-GList *           nautilus_get_window_list_ordered_front_to_back       (void);
-
-/* dnd */
-void              nautilus_drag_set_icon_pixbuf                        (GdkDragContext           *context,
-									GdkPixbuf                *pixbuf,
-									gint                      hot_x,
-									gint                      hot_y);
-
-/* marshals */
-
-#define nautilus_gtk_marshal_BOOL__POINTER_POINTER nautilus_gtk_marshal_INT__POINTER_POINTER
-#define nautilus_gtk_marshal_INT__POINTER_STRING nautilus_gtk_marshal_INT__POINTER_POINTER
-#define nautilus_gtk_marshal_NONE__BOXED_BOXED gtk_marshal_NONE__POINTER_POINTER
-#define nautilus_gtk_marshal_NONE__POINTER_STRING_STRING gtk_marshal_NONE__POINTER_POINTER_POINTER
-#define nautilus_gtk_marshal_NONE__STRING_POINTER gtk_marshal_NONE__POINTER_POINTER
-#define nautilus_gtk_marshal_NONE__STRING_POINTER_STRING gtk_marshal_NONE__POINTER_POINTER_POINTER
-#define nautilus_gtk_marshal_NONE__STRING_STRING_POINTER_STRING nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER
-#define nautilus_gtk_marshal_POINTER__POINTER_INT_INT_STRING_POINTER nautilus_gtk_marshal_POINTER__POINTER_INT_INT_POINTER_POINTER
-#define nautilus_gtk_marshal_POINTER__POINTER_STRING_POINTER nautilus_gtk_marshal_POINTER__POINTER_POINTER_POINTER
-#define nautilus_gtk_marshal_STRING__NONE nautilus_gtk_marshal_POINTER__NONE
-#define nautilus_gtk_marshal_STRING__POINTER nautilus_gtk_marshal_POINTER__POINTER
-#define nautilus_gtk_marshal_STRING__POINTER_POINTER nautilus_gtk_marshal_POINTER__POINTER_POINTER
-#define nautilus_gtk_marshal_STRING__POINTER_POINTER_POINTER nautilus_gtk_marshal_POINTER__POINTER_POINTER_POINTER
-#define nautilus_gtk_marshal_STRING__POINTER_POINTER_STRING nautilus_gtk_marshal_POINTER__POINTER_POINTER_POINTER
-#define nautilus_gtk_marshal_STRING__POINTER_STRING nautilus_gtk_marshal_POINTER__POINTER_POINTER
-
-void nautilus_gtk_marshal_INT__NONE                                             (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__DOUBLE                                          (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__DOUBLE_DOUBLE_DOUBLE           	                (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__INT_INT_INT        		                (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__POINTER_INT_INT_DOUBLE                          (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__POINTER_POINTER_INT_INT_INT                     (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__POINTER_INT_INT_INT        	                (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_BOOL__INT_POINTER_INT_INT_UINT                        (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);     
-void nautilus_gtk_marshal_NONE__INT_POINTER_INT_INT_UINT                        (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER                 (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__POINTER_INT_POINTER_POINTER                     (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER_POINTER_POINTER (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_INT_INT_INT             (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER_INT_INT_UINT    (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_NONE__POINTER_INT_INT_DOUBLE_DOUBLE                   (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_INT__POINTER_POINTER                                  (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_INT__POINTER_INT					(GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_POINTER__NONE                                         (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_POINTER__INT                                          (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_POINTER__POINTER                                      (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_POINTER__POINTER_POINTER                              (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_POINTER__POINTER_POINTER_POINTER                      (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-void nautilus_gtk_marshal_POINTER__POINTER_INT_INT_POINTER_POINTER              (GtkObject     *object,
-										 GtkSignalFunc  func,
-										 gpointer       func_data,
-										 GtkArg        *args);
-
-#endif /* NAUTILUS_GTK_EXTENSIONS_H */
diff --git a/libnautilus-private/nautilus-gtk-macros.h b/libnautilus-private/nautilus-gtk-macros.h
deleted file mode 100644
index a8d12856e..000000000
--- a/libnautilus-private/nautilus-gtk-macros.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-gtk-macros.h: Macros to reduce boilerplate when using GTK.
- 
-   Copyright (C) 1999, 2000, 2001 Eazel, Inc.
-  
-   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.
-  
-   Authors: Darin Adler <darin@eazel.com>
-            Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_GTK_MACROS_H
-#define NAUTILUS_GTK_MACROS_H
-
-#include <glib.h>
-
-/* Define a parent_class global and a get_type function for a GTK class.
-   Since this is boilerplate, it's better not to repeat it over and over again.
-   Called like this:
-
-       NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusBookmark, nautilus_bookmark, GTK_TYPE_OBJECT)
-
-   The parent_class_type parameter is guaranteed to be evaluated only once
-   so it can be an expression, even an expression that contains a function call.
-*/
-#define NAUTILUS_DEFINE_CLASS_BOILERPLATE(class_name, class_name_in_function_format, parent_class_type) \
-                                                                                                        \
-static gpointer parent_class;                                                                           \
-                                                                                                        \
-GtkType                                                                                                 \
-class_name_in_function_format##_get_type (void)                                                         \
-{                                                                                                       \
-	GtkType parent_type;                                                                            \
-	static GtkType type;                                                                            \
-                                                                                                        \
-	if (type == 0) {                                                                                \
-		static GtkTypeInfo info = {                                                             \
-			#class_name,                                                                    \
-			sizeof (class_name),                                                            \
-			sizeof (class_name##Class),                                                     \
-			(GtkClassInitFunc)class_name_in_function_format##_initialize_class,             \
-			(GtkObjectInitFunc)class_name_in_function_format##_initialize,                  \
-			NULL,                                                                           \
-			NULL,                                                                           \
-			NULL                                                                            \
-		};                                                                                      \
-                                                                                           		\
-		parent_type = (parent_class_type);                                                      \
-		type = gtk_type_unique (parent_type, &info);                                            \
-		parent_class = gtk_type_class (parent_type);                                            \
-	}                                                                                               \
-                                                                                                        \
-	return type;                                                                                    \
-}
-
-/* Call a parent class version of a virtual function (or default
- * signal handler since that's the same thing). Nice because it
- * documents what it's doing and there is less chance for a
- * typo. Depends on the parent class pointer having the conventional
- * name "parent_class" as the boilerplate macro above does it.
- */
-#define NAUTILUS_CALL_PARENT(parent_class_cast_macro, signal, parameters)                    \
-                                                                                             \
-G_STMT_START {                                                                               \
-	if (parent_class_cast_macro (parent_class)->signal != NULL) {                        \
-		(* parent_class_cast_macro (parent_class)->signal) parameters;               \
-        }                                                                                    \
-} G_STMT_END
-
-/* Same thing, for functions with a return value. */
-#define NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE(parent_class_cast_macro, signal, parameters)  \
-                                                                                             \
-(parent_class_cast_macro (parent_class)->signal == NULL)                                     \
-	? 0                                                                                  \
-	: ((* parent_class_cast_macro (parent_class)->signal) parameters)
-
-/* Call a virtual function. Useful when the virtual function is not a
- * signal, otherwise you want to gtk_signal emit. Nice because it
- * documents what it's doing and there is less chance for a typo.
- */
-#define NAUTILUS_CALL_METHOD(class_cast_macro, object, signal, parameters)                   \
-                                                                                             \
-G_STMT_START {                                                                               \
-	if (class_cast_macro (GTK_OBJECT (object)->klass)->signal != NULL) {                 \
-		(* class_cast_macro (GTK_OBJECT (object)->klass)->signal) parameters;        \
-	}                                                                                    \
-} G_STMT_END
-
-/* Same thing, for functions with a return value. */
-#define NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE(class_cast_macro, object, signal, parameters) \
-                                                                                             \
-(class_cast_macro (GTK_OBJECT (object)->klass)->signal == NULL)                              \
-	? 0                                                                                  \
-	: ((* class_cast_macro (GTK_OBJECT (object)->klass)->signal) parameters)
-
-#ifndef G_DISABLE_ASSERT
-
-/* Define a signal that is not implemented by this class but must be 
- * implemented by subclasses. This macro should be used inside the
- * class initialization function. The companion macro NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL
- * must be used earlier in the file. Called like this:
- * 
- * NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass,
- *					 fm_directory_view,
- *					 clear); 
- */
-#define NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL(class_pointer, class_name_in_function_format, signal)     \
-                                                                                                       \
-* (void (**)(void)) & (class_pointer)->signal = class_name_in_function_format##_unimplemented_##signal
-
-/* Provide a debug-only implementation of a signal that must be implemented
- * by subclasses. The debug-only implementation fires a warning if it is called.
- * This macro should be placed as if it were a function, earlier in the file
- * than the class initialization function. Called like this:
- * 
- * NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, clear);
- */
-#define NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL(class_name_in_function_format, signal)        \
-                                                                                              \
-static void                                                                                   \
-class_name_in_function_format##_unimplemented_##signal (void)                                 \
-{                                                                                             \
-	g_warning ("failed to override signal " #class_name_in_function_format "->" #signal); \
-}
-
-#else /* G_DISABLE_ASSERT */
-
-#define NAUTILUS_DEFINE_MUST_OVERRIDE_SIGNAL(class_cast_macro, class_pointer, class_name_in_function_format, signal)
-#define NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL(class_name_in_function_format, signal)
-#define NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL(class_pointer, class_name_in_function_format, signal)
-
-#endif /* G_DISABLE_ASSERT */
-
-/* Access the class for a given object. */
-#define NAUTILUS_CLASS(object) (GTK_OBJECT (object)->klass)
-
-/* Access a method. */
-#define NAUTILUS_ACCESS_METHOD(class_cast_macro, object, method)			\
-(class_cast_macro (NAUTILUS_CLASS (object))->method)
-
-/* Invoke a method for a given object. */
-#define NAUTILUS_INVOKE_METHOD(class_cast_macro, object, method, parameters)		\
-((* NAUTILUS_ACCESS_METHOD (class_cast_macro, object, method)) parameters)
-
-/* Assert the non-nullness of a method for a given object. */
-#define NAUTILUS_ASSERT_METHOD(class_cast_macro, object, method)			\
-g_assert (NAUTILUS_ACCESS_METHOD (class_cast_macro, object, method) != NULL)
-
-/* Invoke a method if it ain't null. */
-#define NAUTILUS_INVOKE_METHOD_IF(class_cast_macro, object, method, parameters) 	\
-(NAUTILUS_ACCESS_METHOD (class_cast_macro, object, method) ? 0 :			\
-	NAUTILUS_INVOKE_METHOD (class_cast_macro, object, method, parameters))
-
-#endif /* NAUTILUS_GTK_MACROS_H */
diff --git a/libnautilus-private/nautilus-horizontal-splitter.c b/libnautilus-private/nautilus-horizontal-splitter.c
index 676e39a8d..615b46102 100644
--- a/libnautilus-private/nautilus-horizontal-splitter.c
+++ b/libnautilus-private/nautilus-horizontal-splitter.c
@@ -25,7 +25,7 @@
 #include <config.h>
 #include "nautilus-horizontal-splitter.h"
 
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 #include <stdlib.h>
 
@@ -60,7 +60,7 @@ static void     nautilus_horizontal_splitter_destroy          (GtkObject
 static void     nautilus_horizontal_splitter_draw             (GtkWidget                       *widget,
 							       GdkRectangle                    *area);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusHorizontalSplitter,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusHorizontalSplitter,
 				   nautilus_horizontal_splitter,
 				   E_TYPE_HPANED)
 
@@ -103,7 +103,7 @@ nautilus_horizontal_splitter_destroy (GtkObject *object)
 	g_free (horizontal_splitter->details);
 	
 	/* Chain */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -340,7 +340,7 @@ nautilus_horizontal_splitter_button_press (GtkWidget *widget, GdkEventButton *ev
 		splitter->details->down_time = event->time;
 	}
 
-	return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	return EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, button_press_event, (widget, event));
 }
 
diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c
index 01a83eb7b..2e9c11bb6 100644
--- a/libnautilus-private/nautilus-icon-canvas-item.c
+++ b/libnautilus-private/nautilus-icon-canvas-item.c
@@ -38,21 +38,21 @@
 #include <libart_lgpl/art_rgb_rgba_affine.h>
 #include <libart_lgpl/art_svp_vpath.h>
 #include "nautilus-icon-private.h"
-#include "nautilus-string.h"
-#include "nautilus-art-extensions.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gdk-font-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
+#include <eel/eel-string.h>
+#include <eel/eel-art-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-font-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
 #include "nautilus-global-preferences.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gnome-extensions.h"
-#include "nautilus-graphic-effects.h"
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-graphic-effects.h>
 #include "nautilus-file-utilities.h"
 #include "nautilus-icon-factory.h"
 #include "nautilus-theme.h"
-#include "nautilus-smooth-text-layout.h"
-#include "nautilus-smooth-text-layout-cache.h"
+#include <eel/eel-smooth-text-layout.h>
+#include <eel/eel-smooth-text-layout-cache.h>
 
 /* Comment this out if the new smooth fonts code give you problems
  * This isnt meant to be permanent.  Its just a precaution.
@@ -98,7 +98,7 @@ struct NautilusIconCanvasItemDetails {
 
 	/* Font stuff whilst in smooth mode */
 	int smooth_font_size;
-	NautilusScalableFont *smooth_font;
+	EelScalableFont *smooth_font;
 	
 	/* Cached rectangle in canvas coordinates */
 	ArtIRect canvas_rect;
@@ -143,9 +143,9 @@ enum {
 
 static guint signals[LAST_SIGNAL];
 
-static	guint32 highlight_background_color = NAUTILUS_RGBA_COLOR_PACK (0x00, 0x00, 0x00, 0xFF);
-static	guint32 highlight_text_color	   = NAUTILUS_RGBA_COLOR_PACK (0xFF, 0xFF, 0xFF, 0xFF);
-static  guint32 highlight_text_info_color  = NAUTILUS_RGBA_COLOR_PACK (0xCC, 0xCC, 0xCC, 0xFF);
+static	guint32 highlight_background_color = EEL_RGBA_COLOR_PACK (0x00, 0x00, 0x00, 0xFF);
+static	guint32 highlight_text_color	   = EEL_RGBA_COLOR_PACK (0xFF, 0xFF, 0xFF, 0xFF);
+static  guint32 highlight_text_info_color  = EEL_RGBA_COLOR_PACK (0xCC, 0xCC, 0xCC, 0xFF);
 
 static int click_policy_auto_value;
 
@@ -223,9 +223,9 @@ static gboolean icon_canvas_item_is_smooth                 (const NautilusIconCa
 
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusIconCanvasItem, nautilus_icon_canvas_item, GNOME_TYPE_CANVAS_ITEM)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusIconCanvasItem, nautilus_icon_canvas_item, GNOME_TYPE_CANVAS_ITEM)
 
-static NautilusSmoothTextLayoutCache *layout_cache;
+static EelSmoothTextLayoutCache *layout_cache;
 
 static void
 free_layout_cache (void)
@@ -241,7 +241,7 @@ nautilus_icon_canvas_item_initialize_class (NautilusIconCanvasItemClass *class)
 	GnomeCanvasItemClass *item_class;
 
 	if (layout_cache == NULL) {
-		layout_cache = nautilus_smooth_text_layout_cache_new ();
+		layout_cache = eel_smooth_text_layout_cache_new ();
 		g_atexit (free_layout_cache);
 	}
 
@@ -308,7 +308,7 @@ nautilus_icon_canvas_item_initialize (NautilusIconCanvasItem *icon_item)
 	
 	/* set up the default font and size */
 	icon_item->details->smooth_font_size = 12;
-	icon_item->details->smooth_font = nautilus_scalable_font_get_default_font ();
+	icon_item->details->smooth_font = eel_scalable_font_get_default_font ();
 }
 
 /* Destroy handler for the icon canvas item. */
@@ -330,7 +330,7 @@ nautilus_icon_canvas_item_destroy (GtkObject *object)
 	if (details->pixbuf != NULL) {
 		gdk_pixbuf_unref (details->pixbuf);
 	}
-	nautilus_gdk_pixbuf_list_free (details->emblem_pixbufs);
+	eel_gdk_pixbuf_list_free (details->emblem_pixbufs);
 	g_free (details->editable_text);
 	g_free (details->additional_text);
 	g_free (details->attach_points);
@@ -344,7 +344,7 @@ nautilus_icon_canvas_item_destroy (GtkObject *object)
 	
 	g_free (details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
  
 /* Currently we require pixbufs in this format (for hit testing).
@@ -384,7 +384,7 @@ nautilus_icon_canvas_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
 	switch (arg_id) {
 
 	case ARG_EDITABLE_TEXT:
-		if (nautilus_strcmp (details->editable_text, GTK_VALUE_STRING (*arg)) == 0) {
+		if (eel_strcmp (details->editable_text, GTK_VALUE_STRING (*arg)) == 0) {
 			return;
 		}
 
@@ -395,7 +395,7 @@ nautilus_icon_canvas_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
 		break;
 
 	case ARG_ADDITIONAL_TEXT:
-		if (nautilus_strcmp (details->additional_text, GTK_VALUE_STRING (*arg)) == 0) {
+		if (eel_strcmp (details->additional_text, GTK_VALUE_STRING (*arg)) == 0) {
 			return;
 		}
 
@@ -407,7 +407,7 @@ nautilus_icon_canvas_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
 
 	case ARG_FONT:
 		font = GTK_VALUE_BOXED (*arg);
-		if (nautilus_gdk_font_equal (font, details->font)) {
+		if (eel_gdk_font_equal (font, details->font)) {
 			return;
 		}
 
@@ -445,7 +445,7 @@ nautilus_icon_canvas_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
 
         case ARG_SMOOTH_FONT:
 		nautilus_icon_canvas_item_set_smooth_font (NAUTILUS_ICON_CANVAS_ITEM (object),
-							   NAUTILUS_SCALABLE_FONT (GTK_VALUE_OBJECT (*arg)));
+							   EEL_SCALABLE_FONT (GTK_VALUE_OBJECT (*arg)));
 		nautilus_icon_canvas_item_invalidate_label_size (item);				
 		break;
 
@@ -562,7 +562,7 @@ nautilus_icon_canvas_item_set_emblems (NautilusIconCanvasItem *item,
 	/* The case where the emblems are identical is fairly common,
 	 * so lets take the time to check for it.
 	 */
-	if (nautilus_g_list_equal (item->details->emblem_pixbufs, emblem_pixbufs)) {
+	if (eel_g_list_equal (item->details->emblem_pixbufs, emblem_pixbufs)) {
 		return;
 	}
 
@@ -572,8 +572,8 @@ nautilus_icon_canvas_item_set_emblems (NautilusIconCanvasItem *item,
 	}
 	
 	/* Take in the new list of emblems. */
-	nautilus_gdk_pixbuf_list_ref (emblem_pixbufs);
-	nautilus_gdk_pixbuf_list_free (item->details->emblem_pixbufs);
+	eel_gdk_pixbuf_list_ref (emblem_pixbufs);
+	eel_gdk_pixbuf_list_free (item->details->emblem_pixbufs);
 	item->details->emblem_pixbufs = g_list_copy (emblem_pixbufs);
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (item));
 }
@@ -644,14 +644,14 @@ nautilus_icon_canvas_item_update_bounds (NautilusIconCanvasItem *item)
 	GdkPixbuf *emblem_pixbuf;
 		
 	/* Compute new bounds. */
-	nautilus_gnome_canvas_item_get_current_canvas_bounds
+	eel_gnome_canvas_item_get_current_canvas_bounds
 		(GNOME_CANVAS_ITEM (item), &before);
 	recompute_bounding_box (item);
-	nautilus_gnome_canvas_item_get_current_canvas_bounds
+	eel_gnome_canvas_item_get_current_canvas_bounds
 		(GNOME_CANVAS_ITEM (item), &after);
 
 	/* If the bounds didn't change, we are done. */
-	if (nautilus_art_irect_equal (&before, &after)) {
+	if (eel_art_irect_equal (&before, &after)) {
 		return;
 	}
 	
@@ -670,11 +670,11 @@ nautilus_icon_canvas_item_update_bounds (NautilusIconCanvasItem *item)
 	}
 
 	/* Send out the bounds_changed signal and queue a redraw. */
-	nautilus_gnome_canvas_request_redraw_rectangle
+	eel_gnome_canvas_request_redraw_rectangle
 		(GNOME_CANVAS_ITEM (item)->canvas, &before);
 	gtk_signal_emit (GTK_OBJECT (item),
 			 signals[BOUNDS_CHANGED]);
-	nautilus_gnome_canvas_item_request_redraw
+	eel_gnome_canvas_item_request_redraw
 		(GNOME_CANVAS_ITEM (item));
 }
 
@@ -686,8 +686,8 @@ nautilus_icon_canvas_item_update (GnomeCanvasItem *item,
 				      int flags)
 {
 	nautilus_icon_canvas_item_update_bounds (NAUTILUS_ICON_CANVAS_ITEM (item));
-	nautilus_gnome_canvas_item_request_redraw (item);
-	NAUTILUS_CALL_PARENT (GNOME_CANVAS_ITEM_CLASS, update,
+	eel_gnome_canvas_item_request_redraw (item);
+	EEL_CALL_PARENT (GNOME_CANVAS_ITEM_CLASS, update,
 			      (item, affine, clip_path, flags));
 }
 
@@ -910,7 +910,7 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item,
 		
 		/* indicate keyboard selection by framing the text with a gray-stippled rectangle */
 		if (details->is_highlighted_as_keyboard_focus) {
-			gdk_gc_set_stipple (gc, nautilus_stipple_bitmap ());
+			gdk_gc_set_stipple (gc, eel_stipple_bitmap ());
 			gdk_gc_set_fill (gc, GDK_STIPPLED);
 			gdk_draw_rectangle
 				(drawable, gc, FALSE,
@@ -975,7 +975,7 @@ draw_stretch_handles (NautilusIconCanvasItem *item, GdkDrawable *drawable,
 	knob_height = gdk_pixbuf_get_height (knob_pixbuf);
 	
 	/* first draw the box */		
-	gdk_gc_set_stipple (gc, nautilus_stipple_bitmap ());
+	gdk_gc_set_stipple (gc, eel_stipple_bitmap ());
 	gdk_gc_set_fill (gc, GDK_STIPPLED);
 	gdk_draw_rectangle
 		(drawable, gc, FALSE,
@@ -1080,13 +1080,13 @@ draw_stretch_handles_aa (NautilusIconCanvasItem *item, GnomeCanvasBuf *buf,
 	/* draw a box to connect the dots */
 	draw_outline_rectangle_aa (buf, rect->x0 + 1, rect->y0 + 1,
 				   rect->x1 - 1, rect->y1 - 1,
-				   NAUTILUS_RGBA_COLOR_PACK (153, 153, 153, 127));	
+				   EEL_RGBA_COLOR_PACK (153, 153, 153, 127));	
 
 	/* now draw the stretch handles themselves  */
-	nautilus_gnome_canvas_draw_pixbuf (buf, knob_pixbuf, rect->x0, rect->y0);
-	nautilus_gnome_canvas_draw_pixbuf (buf, knob_pixbuf, rect->x0, rect->y1 - knob_height);
-	nautilus_gnome_canvas_draw_pixbuf (buf, knob_pixbuf, rect->x1 - knob_width, rect->y0);
-	nautilus_gnome_canvas_draw_pixbuf (buf, knob_pixbuf, rect->x1 - knob_width, rect->y1 - knob_height);
+	eel_gnome_canvas_draw_pixbuf (buf, knob_pixbuf, rect->x0, rect->y0);
+	eel_gnome_canvas_draw_pixbuf (buf, knob_pixbuf, rect->x0, rect->y1 - knob_height);
+	eel_gnome_canvas_draw_pixbuf (buf, knob_pixbuf, rect->x1 - knob_width, rect->y0);
+	eel_gnome_canvas_draw_pixbuf (buf, knob_pixbuf, rect->x1 - knob_width, rect->y1 - knob_height);
 			
 	g_free(knob_filename);
 	gdk_pixbuf_unref(knob_pixbuf);	
@@ -1263,7 +1263,7 @@ map_pixbuf (NautilusIconCanvasItem *icon_item)
 	canvas = GNOME_CANVAS_ITEM(icon_item)->canvas;
 	
 	if (icon_item->details->is_prelit) {
-		temp_pixbuf = nautilus_create_spotlight_pixbuf (icon_item->details->pixbuf);
+		temp_pixbuf = eel_create_spotlight_pixbuf (icon_item->details->pixbuf);
 		
 		/* FIXME bugzilla.eazel.com 2471: This hard-wired image is inappropriate to
 		 * this level of code, which shouldn't know that the
@@ -1305,7 +1305,7 @@ map_pixbuf (NautilusIconCanvasItem *icon_item)
 	if (icon_item->details->is_highlighted_for_selection
 	    || icon_item->details->is_highlighted_for_drop) {
 		old_pixbuf = temp_pixbuf;
-		temp_pixbuf = nautilus_create_darkened_pixbuf (temp_pixbuf,
+		temp_pixbuf = eel_create_darkened_pixbuf (temp_pixbuf,
 							       0.8 * 255,
 							       0.8 * 255);
 		if (old_pixbuf != icon_item->details->pixbuf) {
@@ -1375,7 +1375,7 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item,
 	GnomeCanvasItem *canvas_item;
 	int max_text_width;
 	int icon_width, text_left, box_left;
-	const NautilusSmoothTextLayout *smooth_text_layout;
+	const EelSmoothTextLayout *smooth_text_layout;
 	char **pieces;
 	const char *text_piece;
 	int i;
@@ -1467,7 +1467,7 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item,
 			text_piece = " ";
 		}
 
-		smooth_text_layout = nautilus_smooth_text_layout_cache_render (layout_cache,
+		smooth_text_layout = eel_smooth_text_layout_cache_render (layout_cache,
 									       text_piece,
 									       strlen (text_piece),
 									       details->smooth_font,
@@ -1480,7 +1480,7 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item,
 			gboolean underlined;
 			ArtIRect destination_area;
 
-			text_left = icon_left + (icon_width - nautilus_smooth_text_layout_get_width (smooth_text_layout)) / 2;
+			text_left = icon_left + (icon_width - eel_smooth_text_layout_get_width (smooth_text_layout)) / 2;
 			
 			/* if it's prelit, and we're in click-to-activate mode, underline the text */
 			underlined = (details->is_prelit && in_single_click_mode ());
@@ -1492,24 +1492,24 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item,
 				
 				destination_area.x0 = text_left + 2;
 				destination_area.y0 = icon_bottom + height_so_far + 1;
-				destination_area.x1 = destination_area.x0 + nautilus_smooth_text_layout_get_width (smooth_text_layout);
-				destination_area.y1 = destination_area.y0 + nautilus_smooth_text_layout_get_height (smooth_text_layout);
-				nautilus_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
+				destination_area.x1 = destination_area.x0 + eel_smooth_text_layout_get_width (smooth_text_layout);
+				destination_area.y1 = destination_area.y0 + eel_smooth_text_layout_get_height (smooth_text_layout);
+				eel_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
 									    destination_pixbuf,
 									    0,
 									    0,
 									    &destination_area,
 									    GTK_JUSTIFY_CENTER,
 									    underlined,
-									    NAUTILUS_RGB_COLOR_BLACK,
+									    EEL_RGB_COLOR_BLACK,
 									    0xff);
 			}
 			
 			destination_area.x0 = text_left;
 			destination_area.y0 = icon_bottom + height_so_far;
-			destination_area.x1 = destination_area.x0 + nautilus_smooth_text_layout_get_width (smooth_text_layout);
-			destination_area.y1 = destination_area.y0 + nautilus_smooth_text_layout_get_height (smooth_text_layout);
-			nautilus_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
+			destination_area.x1 = destination_area.x0 + eel_smooth_text_layout_get_width (smooth_text_layout);
+			destination_area.y1 = destination_area.y0 + eel_smooth_text_layout_get_height (smooth_text_layout);
+			eel_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
 								    destination_pixbuf,
 								    0,
 								    0,
@@ -1523,9 +1523,9 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item,
 			if (needs_highlight) {
 				destination_area.x0 = text_left + 1;
 				destination_area.y0 = icon_bottom + height_so_far;
-				destination_area.x1 = destination_area.x0 + nautilus_smooth_text_layout_get_width (smooth_text_layout);
-				destination_area.y1 = destination_area.y0 + nautilus_smooth_text_layout_get_height (smooth_text_layout);
-				nautilus_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
+				destination_area.x1 = destination_area.x0 + eel_smooth_text_layout_get_width (smooth_text_layout);
+				destination_area.y1 = destination_area.y0 + eel_smooth_text_layout_get_height (smooth_text_layout);
+				eel_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
 									    destination_pixbuf,
 									    0,
 									    0,
@@ -1538,8 +1538,8 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item,
 			
 		}
 		
-		width_so_far = MAX (width_so_far, (guint) nautilus_smooth_text_layout_get_width (smooth_text_layout));
-		height_so_far += nautilus_smooth_text_layout_get_height (smooth_text_layout) + LABEL_LINE_SPACING;
+		width_so_far = MAX (width_so_far, (guint) eel_smooth_text_layout_get_width (smooth_text_layout));
+		height_so_far += eel_smooth_text_layout_get_height (smooth_text_layout) + LABEL_LINE_SPACING;
 		
 		gtk_object_unref (GTK_OBJECT (smooth_text_layout));
 	}
@@ -1659,20 +1659,20 @@ draw_label_text_aa (NautilusIconCanvasItem *icon_item, GnomeCanvasBuf *buf, int
  				      icon_item->details->text_height);
 	if (needs_highlight) {
 		container = NAUTILUS_ICON_CONTAINER (GNOME_CANVAS_ITEM (icon_item)->canvas);	
-		nautilus_gdk_pixbuf_fill_rectangle_with_color (text_pixbuf, NULL,
+		eel_gdk_pixbuf_fill_rectangle_with_color (text_pixbuf, NULL,
 							       container->details->highlight_color);
 		clear_rounded_corners (text_pixbuf, container->details->highlight_frame, 5);
 		
 	} else {
-		nautilus_gdk_pixbuf_fill_rectangle_with_color (text_pixbuf, NULL,
-							       NAUTILUS_RGBA_COLOR_PACK (0, 0, 0, 0));
+		eel_gdk_pixbuf_fill_rectangle_with_color (text_pixbuf, NULL,
+							       EEL_RGBA_COLOR_PACK (0, 0, 0, 0));
 	}
 
 	draw_or_measure_label_text_aa (icon_item, text_pixbuf, x_delta, 0);
 	
 	/* Draw the pixbuf containing the label. */
 
-	nautilus_gnome_canvas_draw_pixbuf (buf, text_pixbuf, x - x_delta, y + LABEL_OFFSET);
+	eel_gnome_canvas_draw_pixbuf (buf, text_pixbuf, x - x_delta, y + LABEL_OFFSET);
 
 	gdk_pixbuf_unref (text_pixbuf);	
 
@@ -1681,7 +1681,7 @@ draw_label_text_aa (NautilusIconCanvasItem *icon_item, GnomeCanvasBuf *buf, int
 		draw_outline_rectangle_aa (buf, x - x_delta + 1, y + 1,
 					   x - x_delta + icon_item->details->text_width,
 					   y + icon_item->details->text_height,
-					   NAUTILUS_RGBA_COLOR_PACK (153, 153, 153, 127));
+					   EEL_RGBA_COLOR_PACK (153, 153, 153, 127));
 	}
 }
 
@@ -1708,7 +1708,7 @@ nautilus_icon_canvas_item_render (GnomeCanvasItem *item, GnomeCanvasBuf *buf)
 	}
 
 	/* draw the icon */
-	nautilus_gnome_canvas_draw_pixbuf (buf, temp_pixbuf, icon_rect.x0, icon_rect.y0);
+	eel_gnome_canvas_draw_pixbuf (buf, temp_pixbuf, icon_rect.x0, icon_rect.y0);
 
 	if (temp_pixbuf != icon_item->details->pixbuf) {
 		gdk_pixbuf_unref (temp_pixbuf);
@@ -1717,7 +1717,7 @@ nautilus_icon_canvas_item_render (GnomeCanvasItem *item, GnomeCanvasBuf *buf)
 	/* draw the emblems */	
 	emblem_layout_reset (&emblem_layout, icon_item, &icon_rect);
 	while (emblem_layout_next (&emblem_layout, &emblem_pixbuf, &emblem_rect)) {
-		nautilus_gnome_canvas_draw_pixbuf (buf, emblem_pixbuf, emblem_rect.x0, emblem_rect.y0);
+		eel_gnome_canvas_draw_pixbuf (buf, emblem_pixbuf, emblem_rect.x0, emblem_rect.y0);
 	}
 
 	/* draw the stretch handles */
@@ -1849,9 +1849,9 @@ hit_test (NautilusIconCanvasItem *icon_item, const ArtIRect *canvas_rect)
 	details = icon_item->details;
 	
 	/* Quick check to see if the rect hits the icon, text or emblems at all. */
-	if (!nautilus_art_irect_hits_irect (&icon_item->details->canvas_rect, canvas_rect)
-	    && (!nautilus_art_irect_hits_irect (&details->text_rect, canvas_rect))
-	    && (!nautilus_art_irect_hits_irect (&details->emblem_rect, canvas_rect))) {
+	if (!eel_art_irect_hits_irect (&icon_item->details->canvas_rect, canvas_rect)
+	    && (!eel_art_irect_hits_irect (&details->text_rect, canvas_rect))
+	    && (!eel_art_irect_hits_irect (&details->emblem_rect, canvas_rect))) {
 		return FALSE;
 	}
 
@@ -1862,7 +1862,7 @@ hit_test (NautilusIconCanvasItem *icon_item, const ArtIRect *canvas_rect)
 	
 	/* Check for hit in the icon. If we're highlighted for dropping, anywhere in the rect is OK */
 	if (icon_item->details->is_highlighted_for_drop) {
-		if (nautilus_art_irect_hits_irect (&icon_item->details->canvas_rect, canvas_rect)) {
+		if (eel_art_irect_hits_irect (&icon_item->details->canvas_rect, canvas_rect)) {
 			return TRUE;
 		}
 	} else {
@@ -1872,7 +1872,7 @@ hit_test (NautilusIconCanvasItem *icon_item, const ArtIRect *canvas_rect)
 	}
 
 	/* Check for hit in the text. */
-	if (nautilus_art_irect_hits_irect (&details->text_rect, canvas_rect)
+	if (eel_art_irect_hits_irect (&details->text_rect, canvas_rect)
 	    && !icon_item->details->is_renaming) {
 		return TRUE;
 	}
@@ -2064,7 +2064,7 @@ hit_test_stretch_handle (NautilusIconCanvasItem *item,
 
 	/* Quick check to see if the rect hits the icon at all. */
 	icon_rect = item->details->canvas_rect;
-	if (!nautilus_art_irect_hits_irect (probe_canvas_rect, &icon_rect)) {
+	if (!eel_art_irect_hits_irect (probe_canvas_rect, &icon_rect)) {
 		return FALSE;
 	}
 
@@ -2154,10 +2154,10 @@ nautilus_icon_canvas_item_get_max_text_width (NautilusIconCanvasItem *item)
 
 void
 nautilus_icon_canvas_item_set_smooth_font (NautilusIconCanvasItem	*icon_item,
-					   NautilusScalableFont		*font)
+					   EelScalableFont		*font)
 {
 	g_return_if_fail (NAUTILUS_IS_ICON_CANVAS_ITEM (icon_item));
-	g_return_if_fail (NAUTILUS_IS_SCALABLE_FONT (font));
+	g_return_if_fail (EEL_IS_SCALABLE_FONT (font));
 
 	gtk_object_unref (GTK_OBJECT (icon_item->details->smooth_font));
 
diff --git a/libnautilus-private/nautilus-icon-canvas-item.h b/libnautilus-private/nautilus-icon-canvas-item.h
index e9f52d227..f7be68e70 100644
--- a/libnautilus-private/nautilus-icon-canvas-item.h
+++ b/libnautilus-private/nautilus-icon-canvas-item.h
@@ -29,7 +29,7 @@
 #include <libgnomeui/gnome-canvas.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include "nautilus-icon-factory.h"
-#include "nautilus-scalable-font.h"
+#include <eel/eel-scalable-font.h>
 
 BEGIN_GNOME_DECLS
 
@@ -91,7 +91,7 @@ void        nautilus_icon_canvas_item_get_icon_rectangle       (NautilusIconCanv
 								ArtDRect                   *world_rectangle);
 void        nautilus_icon_canvas_item_update_bounds            (NautilusIconCanvasItem     *item);
 void        nautilus_icon_canvas_item_set_smooth_font          (NautilusIconCanvasItem     *item,
-								NautilusScalableFont       *font);
+								EelScalableFont       *font);
 void        nautilus_icon_canvas_item_set_smooth_font_size     (NautilusIconCanvasItem     *item,
 								int                         font_size);
 
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index bb243de06..6243078b5 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -27,27 +27,27 @@
 #include <config.h>
 #include "nautilus-icon-container.h"
 
-#include "nautilus-background.h"
 #include "nautilus-font-factory.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-glib-extensions.h"
 #include "nautilus-global-preferences.h"
-#include "nautilus-gnome-extensions.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gtk-macros.h"
 #include "nautilus-icon-private.h"
 #include "nautilus-icon-text-item.h"
 #include "nautilus-lib-self-check-functions.h"
-#include "nautilus-string.h"
 #include "nautilus-theme.h"
 #include <ctype.h>
+#include <eel/eel-background.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-string.h>
 #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
 #include <gdk/gdkkeysyms.h>
+#include <gtk/gtklayout.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
-#include <gtk/gtklayout.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include <libnautilus/nautilus-clipboard.h>
 #include <math.h>
 #include <stdio.h>
@@ -136,7 +136,7 @@ static void          end_renaming_mode                        (NautilusIconConta
 							       gboolean                    commit);
 static NautilusIcon *get_icon_being_renamed 		      (NautilusIconContainer 	  *container);
 static void          finish_adding_new_icons                  (NautilusIconContainer      *container);
-static void          update_label_color                       (NautilusBackground         *background,
+static void          update_label_color                       (EelBackground         *background,
 							       NautilusIconContainer      *icon_container);
 static void	     icon_get_bounding_box 		      (NautilusIcon 		  *icon,
 							       int 			  *x1_return, 
@@ -149,7 +149,7 @@ static void	     process_pending_icon_to_rename	      (NautilusIconContainer	  *
 
 static int click_policy_auto_value;
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusIconContainer,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusIconContainer,
 				   nautilus_icon_container,
 				   GNOME_TYPE_CANVAS)
 
@@ -405,8 +405,8 @@ nautilus_icon_container_scroll (NautilusIconContainer *container,
 	old_h_value = hadj->value;
 	old_v_value = vadj->value;
 	
-	nautilus_gtk_adjustment_set_value (hadj, hadj->value + delta_x);
-	nautilus_gtk_adjustment_set_value (vadj, vadj->value + delta_y);
+	eel_gtk_adjustment_set_value (hadj, hadj->value + delta_x);
+	eel_gtk_adjustment_set_value (vadj, vadj->value + delta_y);
 
 	/* return TRUE if we did scroll */
 	return hadj->value != old_h_value || vadj->value != old_v_value;
@@ -476,20 +476,20 @@ reveal_icon (NautilusIconContainer *container,
 	hadj = gtk_layout_get_hadjustment (GTK_LAYOUT (container));
 	vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (container));
 
-	nautilus_gnome_canvas_item_get_canvas_bounds
+	eel_gnome_canvas_item_get_canvas_bounds
 		(GNOME_CANVAS_ITEM (icon->item), &bounds);
 
 	if (bounds.y0 < vadj->value) {
-		nautilus_gtk_adjustment_set_value (vadj, bounds.y0);
+		eel_gtk_adjustment_set_value (vadj, bounds.y0);
 	} else if (bounds.y1 > vadj->value + allocation->height) {
-		nautilus_gtk_adjustment_set_value
+		eel_gtk_adjustment_set_value
 			(vadj, bounds.y1 - allocation->height);
 	}
 
 	if (bounds.x0 < hadj->value) {
-		nautilus_gtk_adjustment_set_value (hadj, bounds.x0);
+		eel_gtk_adjustment_set_value (hadj, bounds.x0);
 	} else if (bounds.x1 > hadj->value + allocation->width) {
-		nautilus_gtk_adjustment_set_value
+		eel_gtk_adjustment_set_value
 			(hadj, bounds.x1 - allocation->width);
 	}
 }
@@ -627,7 +627,7 @@ nautilus_icon_container_update_scroll_region (NautilusIconContainer *container)
 	if (nautilus_icon_container_get_is_fixed_size (container)) {
 		/* Set the scroll region to the size of the container allocation */
 		allocation = &GTK_WIDGET (container)->allocation;			
-		nautilus_gnome_canvas_set_scroll_region_left_justify
+		eel_gnome_canvas_set_scroll_region_left_justify
 			(GNOME_CANVAS (container),
 			 (double) - container->details->left_margin,
 			 (double) - container->details->top_margin,
@@ -656,14 +656,14 @@ nautilus_icon_container_update_scroll_region (NautilusIconContainer *container)
 	}
 
 	if (reset_scroll_region) {
-		nautilus_gnome_canvas_set_scroll_region_left_justify
+		eel_gnome_canvas_set_scroll_region_left_justify
 			(GNOME_CANVAS (container),
 			 x1 - CONTAINER_PAD_LEFT,
 			 y1 - CONTAINER_PAD_TOP,
 			 x2 + CONTAINER_PAD_RIGHT,
 			 y2 + CONTAINER_PAD_BOTTOM);
 	} else {
-		nautilus_gnome_canvas_set_scroll_region_include_visible_area
+		eel_gnome_canvas_set_scroll_region_include_visible_area
 			(GNOME_CANVAS (container),
 			 x1 - CONTAINER_PAD_LEFT,
 			 y1 - CONTAINER_PAD_TOP,
@@ -689,8 +689,8 @@ nautilus_icon_container_update_scroll_region (NautilusIconContainer *container)
 	/* Now that we have a new scroll region, clamp the
          * adjustments so we are within the valid scroll area.
 	 */
-	nautilus_gtk_adjustment_clamp_value (hadj);
-	nautilus_gtk_adjustment_clamp_value (vadj);
+	eel_gtk_adjustment_clamp_value (hadj);
+	eel_gtk_adjustment_clamp_value (vadj);
 }
 
 static NautilusIconContainer *sort_hack_container;
@@ -795,7 +795,7 @@ lay_down_one_line (NautilusIconContainer *container,
 	for (p = line_start; p != line_end; p = p->next) {
 		icon = p->data;
 
-		nautilus_gnome_canvas_item_get_world_bounds
+		eel_gnome_canvas_item_get_world_bounds
 			(GNOME_CANVAS_ITEM (icon->item), &bounds);
 		nautilus_icon_canvas_item_get_icon_rectangle (icon->item, &icon_bounds);
 		height_above = icon_bounds.y1 - bounds.y0;
@@ -817,7 +817,7 @@ lay_down_one_line (NautilusIconContainer *container,
 	for (p = line_start; p != line_end; p = p->next) {
 		icon = p->data;
 
-		nautilus_gnome_canvas_item_get_world_bounds
+		eel_gnome_canvas_item_get_world_bounds
 			(GNOME_CANVAS_ITEM (icon->item), &bounds);
 		nautilus_icon_canvas_item_get_icon_rectangle (icon->item, &icon_bounds);		
 		width = get_icon_space_width (container, &bounds);
@@ -857,7 +857,7 @@ lay_down_icons_horizontal (NautilusIconContainer *container,
 		icon = p->data;
 
 		/* Get the width of the icon. */
-		nautilus_gnome_canvas_item_get_world_bounds
+		eel_gnome_canvas_item_get_world_bounds
 			(GNOME_CANVAS_ITEM (icon->item), &bounds);
 		space_width = get_icon_space_width (container, &bounds);
 		
@@ -1249,7 +1249,7 @@ reload_icon_positions (NautilusIconContainer *container)
 				 &have_stored_position);
 		if (have_stored_position) {
 			icon_set_position (icon, position.x, position.y);
-			nautilus_gnome_canvas_item_get_world_bounds
+			eel_gnome_canvas_item_get_world_bounds
 				(GNOME_CANVAS_ITEM (icon->item), &bounds);
 			if (bounds.y1 > bottom) {
 				bottom = bounds.y1;
@@ -1395,7 +1395,7 @@ rubberband_select (NautilusIconContainer *container,
 			/* Only do this calculation once, since all the canvas items
 			 * we are interating are in the same coordinate space
 			 */
-			nautilus_gnome_canvas_world_to_canvas_rectangle
+			eel_gnome_canvas_world_to_canvas_rectangle
 				(GNOME_CANVAS_ITEM (icon->item)->canvas, current_rect, &canvas_rect);
 			canvas_rect_calculated = TRUE;
 		}
@@ -1784,7 +1784,7 @@ compare_with_start_row (NautilusIconContainer *container,
 {
 	ArtIRect bounds;
 
-	nautilus_gnome_canvas_item_get_current_canvas_bounds (GNOME_CANVAS_ITEM (icon->item),
+	eel_gnome_canvas_item_get_current_canvas_bounds (GNOME_CANVAS_ITEM (icon->item),
 							      &bounds);
 	if (container->details->arrow_key_start < bounds.y0) {
 		return -1;
@@ -1801,7 +1801,7 @@ compare_with_start_column (NautilusIconContainer *container,
 {
 	ArtIRect bounds;
 	
-	nautilus_gnome_canvas_item_get_current_canvas_bounds (GNOME_CANVAS_ITEM (icon->item),
+	eel_gnome_canvas_item_get_current_canvas_bounds (GNOME_CANVAS_ITEM (icon->item),
 							      &bounds);
 	if (container->details->arrow_key_start < bounds.x0) {
 		return -1;
@@ -2237,7 +2237,7 @@ build_icon_list_sorted_by_name (NautilusIconContainer *container)
 		return NULL;
 	}
 
-	result = nautilus_g_list_copy (container->details->icons);
+	result = eel_g_list_copy (container->details->icons);
 	sort_icons_by_name (container, &result);
 
 	return result;
@@ -2316,7 +2316,7 @@ destroy (GtkObject *object)
 		gtk_idle_remove (container->details->stretch_idle_id);
 	}
        
-        for (i = 0; i < NAUTILUS_N_ELEMENTS (container->details->label_font); i++) {
+        for (i = 0; i < EEL_N_ELEMENTS (container->details->label_font); i++) {
        		if (container->details->label_font[i] != NULL)
         		gdk_font_unref (container->details->label_font[i]);
 	}
@@ -2344,7 +2344,7 @@ destroy (GtkObject *object)
 	
 	g_free (container->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* GtkWidget methods.  */
@@ -2382,7 +2382,7 @@ size_allocate (GtkWidget *widget,
 		need_layout_redone = TRUE;
 	}
 	
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
 
 	container->details->has_been_allocated = TRUE;
 
@@ -2397,7 +2397,7 @@ realize (GtkWidget *widget)
 	GtkStyle *style;
 	GtkWindow *window;
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
 
 	style = gtk_style_copy (gtk_widget_get_style (widget));
 	style->bg[GTK_STATE_NORMAL] = style->base[GTK_STATE_NORMAL];
@@ -2425,7 +2425,7 @@ unrealize (GtkWidget *widget)
         window = GTK_WINDOW (gtk_widget_get_toplevel (widget));
 	gtk_window_set_focus (window, NULL);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget));
 }
 
 static gboolean
@@ -2441,7 +2441,7 @@ button_press_event (GtkWidget *widget,
 	static gint click_count = 0;
 	
 	/* Determine click count */
-	current_time = nautilus_get_system_time ();
+	current_time = eel_get_system_time ();
 	if (current_time - last_click_time < DOUBLE_CLICK_TIME) {
 		click_count++;
 	} else {
@@ -2469,7 +2469,7 @@ button_press_event (GtkWidget *widget,
 	nautilus_icon_container_flush_typeselect_state (container);
 	
 	/* Invoke the canvas event handler and see if an item picks up the event. */
-	clicked_on_icon = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	clicked_on_icon = EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, button_press_event, (widget, event));
 	
 	/* Move focus to icon container, unless we're still renaming (to avoid exiting
@@ -2623,7 +2623,7 @@ start_stretching (NautilusIconContainer *container)
 	/* Ensure the window itself is focused.. */
 	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (container));
 	if (toplevel != NULL && GTK_WIDGET_REALIZED (toplevel)) {
-		nautilus_gdk_window_focus (toplevel->window, GDK_CURRENT_TIME);
+		eel_gdk_window_focus (toplevel->window, GDK_CURRENT_TIME);
 	}
 
 	return TRUE;
@@ -2794,7 +2794,7 @@ button_release_event (GtkWidget *widget,
 		return TRUE;
 	}
 
-	return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	return EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, button_release_event, (widget, event));
 }
 
@@ -2860,7 +2860,7 @@ motion_notify_event (GtkWidget *widget,
 		}
 	}
 
-	return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	return EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, motion_notify_event, (widget, event));
 }
 
@@ -2908,7 +2908,7 @@ handle_typeahead (NautilusIconContainer *container, const char *key_string)
 	}
 
 	/* find out how long since last character was typed */
-	now = nautilus_get_system_time ();
+	now = eel_get_system_time ();
 	time_delta = now - container->details->type_select_state->last_typeselect_time;
 	if (time_delta < 0 || time_delta > NAUTILUS_TYPESELECT_FLUSH_DELAY) {
 		/* the typeselect state is too old, start with a fresh one */
@@ -3021,7 +3021,7 @@ key_press_event (GtkWidget *widget,
 	}
 
 	if (!handled) {
-		handled = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+		handled = EEL_CALL_PARENT_WITH_RETURN_VALUE
 			(GTK_WIDGET_CLASS, key_press_event, (widget, event));
 	}
 
@@ -3153,7 +3153,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
 						     get_icon_images),
-				  nautilus_gtk_marshal_POINTER__POINTER_STRING_POINTER,
+				  eel_gtk_marshal_POINTER__POINTER_STRING_POINTER,
 				  GTK_TYPE_POINTER, 3,
 				  GTK_TYPE_POINTER,
 				  GTK_TYPE_STRING,
@@ -3164,7 +3164,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
 						     get_icon_text),
-				  nautilus_gtk_marshal_NONE__POINTER_STRING_STRING,
+				  eel_gtk_marshal_NONE__POINTER_STRING_STRING,
 				  GTK_TYPE_NONE, 3,
 				  GTK_TYPE_POINTER,
 				  GTK_TYPE_STRING,
@@ -3175,7 +3175,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
 						     get_icon_uri),
-				  nautilus_gtk_marshal_STRING__POINTER,
+				  eel_gtk_marshal_STRING__POINTER,
 				  GTK_TYPE_STRING, 1,
 				  GTK_TYPE_POINTER);
 	signals[GET_ICON_DROP_TARGET_URI]
@@ -3184,7 +3184,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
 						     get_icon_drop_target_uri),
-				  nautilus_gtk_marshal_STRING__POINTER,
+				  eel_gtk_marshal_STRING__POINTER,
 				  GTK_TYPE_STRING, 1,
 				  GTK_TYPE_POINTER);
 	signals[COMPARE_ICONS]
@@ -3193,7 +3193,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
 						     compare_icons),
-				  nautilus_gtk_marshal_INT__POINTER_POINTER,
+				  eel_gtk_marshal_INT__POINTER_POINTER,
 				  GTK_TYPE_INT, 2,
 				  GTK_TYPE_POINTER,
 				  GTK_TYPE_POINTER);
@@ -3203,7 +3203,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
 						     compare_icons_by_name),
-				  nautilus_gtk_marshal_INT__POINTER_POINTER,
+				  eel_gtk_marshal_INT__POINTER_POINTER,
 				  GTK_TYPE_INT, 2,
 				  GTK_TYPE_POINTER,
 				  GTK_TYPE_POINTER);
@@ -3213,7 +3213,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass, 
 						     move_copy_items),
-				  nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_INT_INT_INT,
+				  eel_gtk_marshal_NONE__POINTER_POINTER_POINTER_INT_INT_INT,
 				  GTK_TYPE_NONE, 6,
 				  GTK_TYPE_POINTER,
 				  GTK_TYPE_POINTER,
@@ -3239,7 +3239,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass, 
 						     get_container_uri),
-				  nautilus_gtk_marshal_STRING__NONE,
+				  eel_gtk_marshal_STRING__NONE,
 				  GTK_TYPE_STRING, 0);
 	signals[CAN_ACCEPT_ITEM] 
 		= gtk_signal_new ("can_accept_item",
@@ -3247,7 +3247,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass, 
 						     can_accept_item),
-				  nautilus_gtk_marshal_INT__POINTER_STRING,
+				  eel_gtk_marshal_INT__POINTER_STRING,
 				  GTK_TYPE_INT, 2,
 				  GTK_TYPE_POINTER,
 				  GTK_TYPE_STRING);
@@ -3257,7 +3257,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
 						     get_stored_icon_position),
-				  nautilus_gtk_marshal_BOOL__POINTER_POINTER,
+				  eel_gtk_marshal_BOOL__POINTER_POINTER,
 				  GTK_TYPE_BOOL, 2,
 				  GTK_TYPE_POINTER,
 				  GTK_TYPE_POINTER);
@@ -3275,7 +3275,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class)
 				  object_class->type,
 				  GTK_SIGNAL_OFFSET (NautilusIconContainerClass,
 						     preview),
-				  nautilus_gtk_marshal_INT__POINTER_INT,
+				  eel_gtk_marshal_INT__POINTER_INT,
 				  GTK_TYPE_INT, 2,
 				  GTK_TYPE_POINTER,
 				  GTK_TYPE_BOOL);
@@ -3329,7 +3329,7 @@ static void
 nautilus_icon_container_initialize (NautilusIconContainer *container)
 {
 	NautilusIconContainerDetails *details;
-	NautilusBackground *background;
+	EelBackground *background;
 	
 	details = g_new0 (NautilusIconContainerDetails, 1);
 
@@ -3347,7 +3347,7 @@ nautilus_icon_container_initialize (NautilusIconContainer *container)
         details->label_font[NAUTILUS_ZOOM_LEVEL_LARGER] = nautilus_font_factory_get_font_by_family ("helvetica", 18);
         details->label_font[NAUTILUS_ZOOM_LEVEL_LARGEST] = nautilus_font_factory_get_font_by_family ("helvetica", 18);
 
-        details->smooth_label_font = nautilus_scalable_font_get_default_font ();
+        details->smooth_label_font = eel_scalable_font_get_default_font ();
 	
 	/* These are the default font sizes.  The font sizes are configurable via
 	 * nautilus_icon_container_set_font_size_table() 
@@ -3373,7 +3373,7 @@ nautilus_icon_container_initialize (NautilusIconContainer *container)
 		 GTK_OBJECT (container));	
 
 	/* when the background changes, we must set up the label text color */
-	background = nautilus_get_widget_background (GTK_WIDGET (container));
+	background = eel_get_widget_background (GTK_WIDGET (container));
 	
 	gtk_signal_connect
 		(GTK_OBJECT(background),
@@ -3752,7 +3752,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
 		 &attach_points,
 		 TRUE);
 	
-	nautilus_scalable_icon_unref (scalable_icon);
+	eel_scalable_icon_unref (scalable_icon);
 
 	/*  in the rare case an image is too small, scale it up */
 	
@@ -3792,7 +3792,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
 		}
 	}
 	emblem_pixbufs = g_list_reverse (emblem_pixbufs);
-	nautilus_scalable_icon_list_free (emblem_scalable_icons);
+	eel_scalable_icon_list_free (emblem_scalable_icons);
 
 	/* Get both editable and non-editable icon text */
 	gtk_signal_emit (GTK_OBJECT (container),
@@ -3807,7 +3807,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
 	 * happened to be typing at that moment.
 	 */
 	if (icon == get_icon_being_renamed (container) &&
-	    nautilus_strcmp (editable_text, 
+	    eel_strcmp (editable_text, 
 	    		     nautilus_icon_canvas_item_get_editable_text (icon->item)) != 0) {
 		end_renaming_mode (container, FALSE);
 	}
@@ -3831,7 +3831,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
 
 	/* Let the pixbufs go. */
 	gdk_pixbuf_unref (pixbuf);
-	nautilus_gdk_pixbuf_list_free (emblem_pixbufs);
+	eel_gdk_pixbuf_list_free (emblem_pixbufs);
 
 	g_free (editable_text);
 	g_free (additional_text);
@@ -4997,10 +4997,10 @@ nautilus_icon_container_set_label_font_for_zoom_level (NautilusIconContainer *co
 
 void
 nautilus_icon_container_set_smooth_label_font (NautilusIconContainer *container,
-					       NautilusScalableFont *font)
+					       EelScalableFont *font)
 {
 	g_return_if_fail (NAUTILUS_IS_ICON_CONTAINER (container));
-	g_return_if_fail (NAUTILUS_IS_SCALABLE_FONT (font));
+	g_return_if_fail (EEL_IS_SCALABLE_FONT (font));
 
 	gtk_object_ref (GTK_OBJECT (font));
 	gtk_object_unref (GTK_OBJECT (container->details->smooth_label_font));
@@ -5035,13 +5035,13 @@ nautilus_icon_container_get_label_color (NautilusIconContainer *container,
 }
 
 static void
-update_label_color (NautilusBackground *background,
+update_label_color (EelBackground *background,
 		    NautilusIconContainer *container)
 {
 	char *light_info_color, *dark_info_color;
 	uint light_info_value, dark_info_value;
 	
-	g_assert (NAUTILUS_IS_BACKGROUND (background));
+	g_assert (EEL_IS_BACKGROUND (background));
 	g_assert (NAUTILUS_IS_ICON_CONTAINER (container));
 	
 	/* FIXME: The code to extract colors from the theme should be in FMDirectoryView, not here.
@@ -5064,7 +5064,7 @@ update_label_color (NautilusBackground *background,
 		g_free (dark_info_color);
 	}
 	
-	if (nautilus_background_is_dark (background)) {
+	if (eel_background_is_dark (background)) {
 		container->details->label_color = 0xEFEFEF;
 		container->details->label_info_color = light_info_value;
 	} else {
@@ -5137,7 +5137,7 @@ nautilus_icon_container_theme_changed (gpointer user_data)
 	highlight_color_str = nautilus_theme_get_theme_data ("directory", "highlight_color_rgba");
 	
 	if (highlight_color_str == NULL) {
-			container->details->highlight_color = NAUTILUS_RGBA_COLOR_PACK (0, 0, 0, 102);
+			container->details->highlight_color = EEL_RGBA_COLOR_PACK (0, 0, 0, 102);
 		} else {
 			container->details->highlight_color = strtoul (highlight_color_str, NULL, 0);
 			g_free (highlight_color_str);
@@ -5186,10 +5186,10 @@ check_compute_stretch (int icon_x, int icon_y, int icon_size,
 void
 nautilus_self_check_icon_container (void)
 {
-	NAUTILUS_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 12, 0, 0, 0, 0), "0,0:12");
-	NAUTILUS_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 12, 12, 12, 13, 13), "0,0:13");
-	NAUTILUS_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 12, 12, 12, 13, 12), "0,0:12");
-	NAUTILUS_CHECK_STRING_RESULT (check_compute_stretch (100, 100, 64, 105, 105, 40, 40), "35,35:129");
+	EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 12, 0, 0, 0, 0), "0,0:12");
+	EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 12, 12, 12, 13, 13), "0,0:13");
+	EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 12, 12, 12, 13, 12), "0,0:12");
+	EEL_CHECK_STRING_RESULT (check_compute_stretch (100, 100, 64, 105, 105, 40, 40), "35,35:129");
 }
 
 #endif /* ! NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-icon-container.h b/libnautilus-private/nautilus-icon-container.h
index c1744c9e1..30382a19e 100644
--- a/libnautilus-private/nautilus-icon-container.h
+++ b/libnautilus-private/nautilus-icon-container.h
@@ -28,7 +28,7 @@
 
 #include <libgnomeui/gnome-canvas.h>
 #include "nautilus-icon-factory.h"
-#include "nautilus-scalable-font.h"
+#include <eel/eel-scalable-font.h>
 
 #define NAUTILUS_ICON_CONTAINER(obj) \
 	GTK_CHECK_CAST (obj, nautilus_icon_container_get_type (), NautilusIconContainer)
@@ -216,7 +216,7 @@ void              nautilus_icon_container_set_label_font_for_zoom_level (Nautilu
 									 int                     zoom_level,
 									 GdkFont                *font);
 void              nautilus_icon_container_set_smooth_label_font         (NautilusIconContainer  *container,
-									 NautilusScalableFont   *font);
+									 EelScalableFont   *font);
 gboolean          nautilus_icon_container_get_is_fixed_size             (NautilusIconContainer  *container);
 void              nautilus_icon_container_set_is_fixed_size             (NautilusIconContainer  *container,
 									 gboolean                is_fixed_size);
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c
index 0c79d354c..e09d50a31 100644
--- a/libnautilus-private/nautilus-icon-dnd.c
+++ b/libnautilus-private/nautilus-icon-dnd.c
@@ -30,18 +30,18 @@
 #include <config.h>
 #include "nautilus-icon-dnd.h"
 
-#include "nautilus-background.h"
+#include <eel/eel-background.h>
 #include "nautilus-file-utilities.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-gnome-extensions.h"
-#include "nautilus-graphic-effects.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-graphic-effects.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include "nautilus-icon-private.h"
 #include "nautilus-link.h"
-#include "nautilus-stock-dialogs.h"
-#include "nautilus-string.h"
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtkmain.h>
@@ -229,7 +229,7 @@ icon_get_data_binder (NautilusIcon *icon, gpointer data)
 
 	nautilus_icon_canvas_item_get_icon_rectangle
 		(icon->item, &world_rect);
-	nautilus_gnome_canvas_world_to_window_rectangle
+	eel_gnome_canvas_world_to_window_rectangle
 		(GNOME_CANVAS (container), &world_rect, &window_rect);
 
 	uri = nautilus_icon_container_get_icon_uri (container, icon);
@@ -238,11 +238,11 @@ icon_get_data_binder (NautilusIcon *icon, gpointer data)
 		return TRUE;
 	}
 
-	window_rect = nautilus_art_irect_offset_by (window_rect, 
+	window_rect = eel_art_irect_offset_by (window_rect, 
 		- container->details->dnd_info->drag_info.start_x,
 		- container->details->dnd_info->drag_info.start_y);
 
-	window_rect = nautilus_art_irect_scale_by (window_rect, 
+	window_rect = eel_art_irect_scale_by (window_rect, 
 		1 / GNOME_CANVAS (container)->pixels_per_unit);
 	
 	/* pass the uri, mouse-relative x/y and icon width/height */
@@ -404,14 +404,14 @@ drag_data_received_callback (GtkWidget *widget,
 	case NAUTILUS_ICON_DND_URI_LIST:
 		/* Save the data so we can do the actual work on drop. */
 		g_assert (drag_info->selection_data == NULL);
-		drag_info->selection_data = nautilus_gtk_selection_data_copy_deep (data);
+		drag_info->selection_data = eel_gtk_selection_data_copy_deep (data);
 		break;
 		
 	/* Netscape keeps sending us the data, even though we accept the first drag */
 	case NAUTILUS_ICON_DND_URL:
 		if (drag_info->selection_data != NULL) {
-			nautilus_gtk_selection_data_free_deep (drag_info->selection_data);
-			drag_info->selection_data = nautilus_gtk_selection_data_copy_deep (data);
+			eel_gtk_selection_data_free_deep (drag_info->selection_data);
+			drag_info->selection_data = eel_gtk_selection_data_copy_deep (data);
 		}
 		break;
 
@@ -434,8 +434,8 @@ drag_data_received_callback (GtkWidget *widget,
 			gtk_drag_finish (context, TRUE, FALSE, time);
 			break;
 		case NAUTILUS_ICON_DND_COLOR:
-			nautilus_background_receive_dropped_color
-				(nautilus_get_widget_background (widget),
+			eel_background_receive_dropped_color
+				(eel_get_widget_background (widget),
 				 widget, x, y, data);
 			gtk_drag_finish (context, TRUE, FALSE, time);
 			break;
@@ -481,7 +481,7 @@ get_data_on_first_target_we_support (GtkWidget *widget, GdkDragContext *context,
 
 	if (drop_types_list == NULL)
 		drop_types_list = gtk_target_list_new (drop_types,
-						       NAUTILUS_N_ELEMENTS (drop_types));
+						       EEL_N_ELEMENTS (drop_types));
 
 	for (target = context->targets; target != NULL; target = target->next) {
 		guint dummy_info;
@@ -550,7 +550,7 @@ nautilus_icon_container_item_at (NautilusIconContainer *container,
 		NautilusIcon *icon;
 		icon = p->data;
 		
-		nautilus_gnome_canvas_world_to_canvas_rectangle (GNOME_CANVAS_ITEM (icon->item)->canvas, &point, &canvas_point);
+		eel_gnome_canvas_world_to_canvas_rectangle (GNOME_CANVAS_ITEM (icon->item)->canvas, &point, &canvas_point);
 		
 		if (nautilus_icon_canvas_item_hit_test_rectangle (icon->item, &canvas_point)) {
 			return icon;
@@ -604,8 +604,8 @@ static void
 receive_dropped_tile_image (NautilusIconContainer *container, GtkSelectionData *data)
 {
 	g_assert (data != NULL);
-	nautilus_background_receive_dropped_background_image
-		(nautilus_get_widget_background (GTK_WIDGET (container)), data->data);
+	eel_background_receive_dropped_background_image
+		(eel_get_widget_background (GTK_WIDGET (container)), data->data);
 }
 
 /* handle dropped keywords */
@@ -670,7 +670,7 @@ auto_scroll_timeout_callback (gpointer data)
 	container = NAUTILUS_ICON_CONTAINER (widget);
 
 	if (container->details->dnd_info->drag_info.waiting_to_autoscroll
-	    && container->details->dnd_info->drag_info.start_auto_scroll_in > nautilus_get_system_time()) {
+	    && container->details->dnd_info->drag_info.start_auto_scroll_in > eel_get_system_time()) {
 		/* not yet */
 		return TRUE;
 	}
@@ -751,7 +751,7 @@ confirm_switch_to_manual_layout (NautilusIconContainer *container)
 	 * that are not directories?
 	 */
 	if (nautilus_icon_container_has_stored_icon_positions (container)) {
-		if (nautilus_g_list_exactly_one_item (container->details->dnd_info->drag_info.selection_list)) {
+		if (eel_g_list_exactly_one_item (container->details->dnd_info->drag_info.selection_list)) {
 			message = _("This folder uses automatic layout. "
 			"Do you want to switch to manual layout and leave this item where you dropped it? "
 			"This will clobber the stored manual layout.");
@@ -761,7 +761,7 @@ confirm_switch_to_manual_layout (NautilusIconContainer *container)
 			"This will clobber the stored manual layout.");
 		}
 	} else {
-		if (nautilus_g_list_exactly_one_item (container->details->dnd_info->drag_info.selection_list)) {
+		if (eel_g_list_exactly_one_item (container->details->dnd_info->drag_info.selection_list)) {
 			message = _("This folder uses automatic layout. "
 			"Do you want to switch to manual layout and leave this item where you dropped it?");
 		} else {
@@ -770,7 +770,7 @@ confirm_switch_to_manual_layout (NautilusIconContainer *container)
 		}
 	}
 
-	dialog = nautilus_show_yes_no_dialog (message, _("Switch to Manual Layout?"),
+	dialog = eel_show_yes_no_dialog (message, _("Switch to Manual Layout?"),
 					      _("Switch"), GNOME_STOCK_BUTTON_CANCEL,
 					      GTK_WINDOW (gtk_widget_get_ancestor 
 					 	    (GTK_WIDGET (container), GTK_TYPE_WINDOW)));
@@ -1162,7 +1162,7 @@ nautilus_icon_container_free_drag_data (NautilusIconContainer *container)
 	}
 
 	if (dnd_info->drag_info.selection_data != NULL) {
-		nautilus_gtk_selection_data_free_deep (dnd_info->drag_info.selection_data);
+		eel_gtk_selection_data_free_deep (dnd_info->drag_info.selection_data);
 		dnd_info->drag_info.selection_data = NULL;
 	}
 }
@@ -1194,7 +1194,7 @@ nautilus_icon_dnd_init (NautilusIconContainer *container,
 
 	container->details->dnd_info = g_new0 (NautilusIconDndInfo, 1);
 	nautilus_drag_init (&container->details->dnd_info->drag_info,
-		drag_types, NAUTILUS_N_ELEMENTS (drag_types), stipple);
+		drag_types, EEL_N_ELEMENTS (drag_types), stipple);
 
 	/* Set up the widget as a drag destination.
 	 * (But not a source, as drags starting from this widget will be
@@ -1202,7 +1202,7 @@ nautilus_icon_dnd_init (NautilusIconContainer *container,
 	 */
 	gtk_drag_dest_set  (GTK_WIDGET (container),
 			    0,
-			    drop_types, NAUTILUS_N_ELEMENTS (drop_types),
+			    drop_types, EEL_N_ELEMENTS (drop_types),
 			    GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK
 			    | GDK_ACTION_ASK);
 
@@ -1287,13 +1287,13 @@ nautilus_icon_dnd_begin_drag (NautilusIconContainer *container,
         /* compute the image's offset */
 	nautilus_icon_canvas_item_get_icon_rectangle
 		(container->details->drag_icon->item, &world_rect);
-	nautilus_gnome_canvas_world_to_window_rectangle
+	eel_gnome_canvas_world_to_window_rectangle
 		(canvas, &world_rect, &window_rect);
         x_offset = dnd_info->drag_info.start_x - window_rect.x0;
         y_offset = dnd_info->drag_info.start_y - window_rect.y0;
         
         /* set the icon for dragging */
-        nautilus_drag_set_icon_pixbuf (context, pixbuf, x_offset, y_offset);
+        eel_drag_set_icon_pixbuf (context, pixbuf, x_offset, y_offset);
 }
 
 static gboolean
diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c
index 009ec9f51..38ce60f79 100644
--- a/libnautilus-private/nautilus-icon-factory.c
+++ b/libnautilus-private/nautilus-icon-factory.c
@@ -31,33 +31,33 @@
 #include "nautilus-default-file-icon.h"
 #include "nautilus-file-attributes.h"
 #include "nautilus-file-utilities.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-glib-extensions.h"
 #include "nautilus-global-preferences.h"
-#include "nautilus-gtk-macros.h"
 #include "nautilus-icon-factory-private.h"
 #include "nautilus-lib-self-check-functions.h"
 #include "nautilus-link.h"
 #include "nautilus-metadata.h"
-#include "nautilus-scalable-font.h"
-#include "nautilus-smooth-text-layout.h"
-#include "nautilus-string.h"
 #include "nautilus-theme.h"
 #include "nautilus-thumbnails.h"
 #include "nautilus-trash-monitor.h"
-#include "nautilus-xml-extensions.h"
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-scalable-font.h>
+#include <eel/eel-smooth-text-layout.h>
+#include <eel/eel-string.h>
+#include <eel/eel-xml-extensions.h>
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomevfs/gnome-vfs-file-info.h>
-#include <libgnomevfs/gnome-vfs-mime-info.h>
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
+#include <libgnomevfs/gnome-vfs-mime-info.h>
 #include <libgnomevfs/gnome-vfs-mime-monitor.h>
 #include <libgnomevfs/gnome-vfs-types.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
 #include <librsvg/rsvg.h>
 #include <stdio.h>
 #include <string.h>
@@ -257,8 +257,8 @@ static void       icon_theme_changed_callback            (gpointer
 static void       thumbnail_limit_changed_callback       (gpointer                  user_data);
 static void       mime_type_data_changed_callback        (GnomeVFSMIMEMonitor	   *monitor,
 							  gpointer                  user_data);
-static guint      nautilus_scalable_icon_hash            (gconstpointer             p);
-static gboolean   nautilus_scalable_icon_equal           (gconstpointer             a,
+static guint      eel_scalable_icon_hash            (gconstpointer             p);
+static gboolean   eel_scalable_icon_equal           (gconstpointer             a,
 							  gconstpointer             b);
 static guint      cache_key_hash                         (gconstpointer             p);
 static gboolean   cache_key_equal                        (gconstpointer             a,
@@ -270,7 +270,7 @@ static CacheIcon *get_icon_from_cache                    (NautilusScalableIcon
 static CacheIcon *load_icon_with_embedded_text           (NautilusScalableIcon     *scalable_icon,
 							  const IconSizeRequest    *size);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusIconFactory,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusIconFactory,
 				   nautilus_icon_factory,
 				   GTK_TYPE_OBJECT)
 
@@ -358,8 +358,8 @@ check_recently_used_list (void)
 static void
 nautilus_icon_factory_initialize (NautilusIconFactory *factory)
 {
-	factory->scalable_icons = g_hash_table_new (nautilus_scalable_icon_hash,
-						    nautilus_scalable_icon_equal);
+	factory->scalable_icons = g_hash_table_new (eel_scalable_icon_hash,
+						    eel_scalable_icon_equal);
 	factory->cache_icons = g_hash_table_new (NULL, NULL);
         factory->icon_cache = g_hash_table_new (cache_key_hash,
 						cache_key_equal);
@@ -392,7 +392,7 @@ nautilus_icon_factory_initialize_class (NautilusIconFactoryClass *class)
 static void
 cache_key_destroy (CacheKey *key)
 {
-	nautilus_scalable_icon_unref (key->scalable_icon);
+	eel_scalable_icon_unref (key->scalable_icon);
 	g_free (key);
 }
 
@@ -583,7 +583,7 @@ nautilus_icon_factory_destroy (GtkObject *object)
         g_free (factory->theme_name);
         g_free (factory->default_theme_name);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static gboolean
@@ -715,7 +715,7 @@ set_theme (const char *theme_name)
 
 	factory = get_icon_factory ();
 
-	if (nautilus_strcmp (theme_name, factory->theme_name) == 0) {
+	if (eel_strcmp (theme_name, factory->theme_name) == 0) {
 		return;
 	}
 
@@ -759,14 +759,14 @@ nautilus_icon_factory_get_icon_name_for_regular_file (NautilusFile *file)
 	 * should generalize this or at least have a way for others to
 	 * extend it.
 	 */
-	if (nautilus_istr_has_prefix (uri, "http:")
-	    && nautilus_strcmp (mime_type, "text/html") == 0) {
+	if (eel_istr_has_prefix (uri, "http:")
+	    && eel_strcmp (mime_type, "text/html") == 0) {
 		icon_name = ICON_NAME_WEB;
-	} else if (nautilus_istr_has_prefix (uri, "eazel-install:")) {
+	} else if (eel_istr_has_prefix (uri, "eazel-install:")) {
 		icon_name = ICON_NAME_INSTALL;
 	} else {
 		if (nautilus_file_is_executable (file)
-		    && nautilus_strcasecmp (mime_type, "text/plain") != 0) {
+		    && eel_strcasecmp (mime_type, "text/plain") != 0) {
 			icon_name = ICON_NAME_EXECUTABLE;
 		} else {
 			icon_name = ICON_NAME_REGULAR;
@@ -788,7 +788,7 @@ nautilus_icon_factory_get_icon_name_for_directory (NautilusFile *file)
 
 	mime_type = nautilus_file_get_mime_type (file);
 	
-	if (nautilus_strcasecmp (mime_type, "x-directory/search") == 0) {
+	if (eel_strcasecmp (mime_type, "x-directory/search") == 0) {
 		icon_name = ICON_NAME_SEARCH_RESULTS;
 	} else {
 		icon_name = ICON_NAME_DIRECTORY;
@@ -927,7 +927,7 @@ get_themed_icon_file_path (const char *theme_name,
 	factory = get_icon_factory ();
 	
 	/* Try each suffix. */
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (icon_file_name_suffixes); i++) {
+	for (i = 0; i < EEL_N_ELEMENTS (icon_file_name_suffixes); i++) {
 		if (include_size && strcasecmp(icon_file_name_suffixes[i], ".svg")) {
 			/* Build a path for this icon. */
 			partial_path = g_strdup_printf ("%s-%u",
@@ -979,7 +979,7 @@ get_themed_icon_file_path (const char *theme_name,
 		g_free (xml_path);
 		
 		size_as_string = g_strdup_printf ("%u", icon_size);
-		node = nautilus_xml_get_root_child_by_name_and_property
+		node = eel_xml_get_root_child_by_name_and_property
 			(doc, "icon", "size", size_as_string);
 		g_free (size_as_string);
 		
@@ -1024,8 +1024,8 @@ get_themed_icon_file_path (const char *theme_name,
 	 */
 	if (path == NULL
 	    && icon_size == NAUTILUS_ICON_SIZE_STANDARD
-	    && nautilus_str_has_prefix (icon_name, EMBLEM_NAME_PREFIX)) {
-		for (i = 0; i < NAUTILUS_N_ELEMENTS (icon_file_name_suffixes); i++) {
+	    && eel_str_has_prefix (icon_name, EMBLEM_NAME_PREFIX)) {
+		for (i = 0; i < EEL_N_ELEMENTS (icon_file_name_suffixes); i++) {
 			user_directory = nautilus_get_user_directory ();
 			path = g_strdup_printf ("%s/emblems/%s%s", 
 						user_directory,
@@ -1176,7 +1176,7 @@ mime_type_data_changed_callback (GnomeVFSMIMEMonitor *monitor, gpointer user_dat
 
 /* Decompose a scalable icon into its text pieces. */
 void
-nautilus_scalable_icon_get_text_pieces (NautilusScalableIcon *icon,
+eel_scalable_icon_get_text_pieces (NautilusScalableIcon *icon,
 				 	char **uri_return,
 				 	char **name_return,
 				 	char **modifier_return,
@@ -1200,7 +1200,7 @@ nautilus_scalable_icon_get_text_pieces (NautilusScalableIcon *icon,
 
 /* Get or create a scalable icon from text pieces. */
 NautilusScalableIcon *
-nautilus_scalable_icon_new_from_text_pieces (const char *uri,
+eel_scalable_icon_new_from_text_pieces (const char *uri,
 			    	      	     const char *name,
 			    	      	     const char *modifier,
 			    	      	     const char *embedded_text,
@@ -1248,12 +1248,12 @@ nautilus_scalable_icon_new_from_text_pieces (const char *uri,
 	}
 
 	/* Grab a reference and return it. */
-	nautilus_scalable_icon_ref (icon);
+	eel_scalable_icon_ref (icon);
 	return icon;
 }
 
 void
-nautilus_scalable_icon_ref (NautilusScalableIcon *icon)
+eel_scalable_icon_ref (NautilusScalableIcon *icon)
 {
 	g_return_if_fail (icon != NULL);
 
@@ -1261,7 +1261,7 @@ nautilus_scalable_icon_ref (NautilusScalableIcon *icon)
 }
 
 void
-nautilus_scalable_icon_unref (NautilusScalableIcon *icon)
+eel_scalable_icon_unref (NautilusScalableIcon *icon)
 {
 	GHashTable *hash_table;
 
@@ -1283,7 +1283,7 @@ nautilus_scalable_icon_unref (NautilusScalableIcon *icon)
 }
 
 static guint
-nautilus_scalable_icon_hash (gconstpointer p)
+eel_scalable_icon_hash (gconstpointer p)
 {
 	const NautilusScalableIcon *icon;
 	guint hash;
@@ -1318,7 +1318,7 @@ nautilus_scalable_icon_hash (gconstpointer p)
 }
 
 static gboolean
-nautilus_scalable_icon_equal (gconstpointer a,
+eel_scalable_icon_equal (gconstpointer a,
 			      gconstpointer b)
 {
 	const NautilusScalableIcon *icon_a, *icon_b;
@@ -1326,10 +1326,10 @@ nautilus_scalable_icon_equal (gconstpointer a,
 	icon_a = a;
 	icon_b = b;
 
-	return nautilus_strcmp (icon_a->uri, icon_b->uri) == 0
-		&& nautilus_strcmp (icon_a->name, icon_b->name) == 0 
-		&& nautilus_strcmp (icon_a->modifier, icon_b->modifier) == 0
-		&& nautilus_strcmp (icon_a->embedded_text, icon_b->embedded_text) == 0
+	return eel_strcmp (icon_a->uri, icon_b->uri) == 0
+		&& eel_strcmp (icon_a->name, icon_b->name) == 0 
+		&& eel_strcmp (icon_a->modifier, icon_b->modifier) == 0
+		&& eel_strcmp (icon_a->embedded_text, icon_b->embedded_text) == 0
 		&& icon_a->aa_mode == icon_b->aa_mode;
 }
 
@@ -1376,7 +1376,7 @@ static gboolean
 is_supported_mime_type (const char *mime_type)
 {
 	/* exclude xfig images, since we can't handle them */
-	if (nautilus_strcmp (mime_type, "image/x-xfig") == 0) {
+	if (eel_strcmp (mime_type, "image/x-xfig") == 0) {
 		return FALSE;
 	}	
 	return TRUE;
@@ -1410,7 +1410,7 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, const char *modifie
 		mime_type = nautilus_file_get_mime_type (file);
 		file_size = nautilus_file_get_size (file);
 		
-		if (nautilus_istr_has_prefix (mime_type, "image/")
+		if (eel_istr_has_prefix (mime_type, "image/")
 		    && is_supported_mime_type (mime_type)
 		    && should_display_image_file_as_itself (file, anti_aliased)) {
 			if (file_size < SELF_THUMBNAIL_SIZE_THRESHOLD && is_local) {
@@ -1439,7 +1439,7 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, const char *modifie
 			image_uri = nautilus_link_local_get_image_uri (file_path);
 			if (image_uri != NULL) {
 				/* FIXME bugzilla.eazel.com 2564: Lame hack. We only support file:// URIs? */
-				if (nautilus_istr_has_prefix (image_uri, "file://")) {
+				if (eel_istr_has_prefix (image_uri, "file://")) {
 					if (uri == NULL) {
 						uri = image_uri;
 					} else {
@@ -1467,7 +1467,7 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, const char *modifie
 	top_left_text = nautilus_file_get_top_left_text (file);
 	
 	/* Create the icon or find it in the cache if it's already there. */
-	scalable_icon = nautilus_scalable_icon_new_from_text_pieces 
+	scalable_icon = eel_scalable_icon_new_from_text_pieces 
 		(uri, icon_name, modifier, top_left_text, anti_aliased);
 
 	g_free (uri);
@@ -1525,7 +1525,7 @@ nautilus_icon_factory_get_emblem_icon_by_name (const char *emblem_name, gboolean
 	char *name_with_prefix;
 
 	name_with_prefix = g_strconcat (EMBLEM_NAME_PREFIX, emblem_name, NULL);
-	scalable_icon = nautilus_scalable_icon_new_from_text_pieces 
+	scalable_icon = eel_scalable_icon_new_from_text_pieces 
 		(NULL, name_with_prefix, NULL, NULL, anti_aliased);
 	g_free (name_with_prefix);	
 
@@ -1535,7 +1535,7 @@ nautilus_icon_factory_get_emblem_icon_by_name (const char *emblem_name, gboolean
 GList *
 nautilus_icon_factory_get_emblem_icons_for_file (NautilusFile *file,
 						 gboolean anti_aliased,
-						 NautilusStringList *exclude)
+						 EelStringList *exclude)
 {
 	GList *icons, *emblem_names, *node;
 	char *uri, *name;
@@ -1558,13 +1558,13 @@ nautilus_icon_factory_get_emblem_icons_for_file (NautilusFile *file,
 		if (file_is_trash && strcmp (name, NAUTILUS_FILE_EMBLEM_NAME_TRASH) == 0) {
 			continue;
 		}
-		if (nautilus_string_list_contains (exclude, name)) {
+		if (eel_string_list_contains (exclude, name)) {
 			continue;
 		}
 		icon = nautilus_icon_factory_get_emblem_icon_by_name (name, anti_aliased);
 		icons = g_list_prepend (icons, icon);
 	}
-	nautilus_g_list_free_deep (emblem_names);
+	eel_g_list_free_deep (emblem_names);
 
 	return g_list_reverse (icons);
 }
@@ -1671,7 +1671,7 @@ load_pixbuf_svg (const char *path, const char *name, guint size_in_pixels)
 	 * down here if the file is an emblem.  This code should be removed
 	 * eventually when we scale all the emblems properly.
 	 */
-	if (nautilus_str_has_prefix (name, EMBLEM_NAME_PREFIX)) {
+	if (eel_str_has_prefix (name, EMBLEM_NAME_PREFIX)) {
 		actual_size_in_pixels = size_in_pixels * EMBLEM_SCALE_FACTOR;
 	} else {
 		actual_size_in_pixels = size_in_pixels;
@@ -1699,7 +1699,7 @@ path_represents_svg_image (const char *path)
 	file_info = gnome_vfs_file_info_new ();
 	gnome_vfs_get_file_info (uri, file_info, GNOME_VFS_FILE_INFO_GET_MIME_TYPE);
 	g_free (uri);
-	is_svg = nautilus_strcmp (file_info->mime_type, "image/svg") == 0;
+	is_svg = eel_strcmp (file_info->mime_type, "image/svg") == 0;
 	gnome_vfs_file_info_unref (file_info);
 
 	return is_svg;
@@ -2178,7 +2178,7 @@ get_icon_from_cache (NautilusScalableIcon *scalable_icon,
 
 		/* Create the key and icon for the hash table. */
 		key = g_new (CacheKey, 1);
-		nautilus_scalable_icon_ref (scalable_icon);
+		eel_scalable_icon_ref (scalable_icon);
 		key->scalable_icon = scalable_icon;
 		key->size = *size;
 		
@@ -2322,7 +2322,7 @@ nautilus_icon_factory_get_pixbuf_for_file (NautilusFile *file,
 		 size_in_pixels, size_in_pixels,
 		 size_in_pixels, size_in_pixels,
 		 NULL, TRUE);
-	nautilus_scalable_icon_unref (icon);
+	eel_scalable_icon_unref (icon);
 
 	return pixbuf;
 }
@@ -2350,7 +2350,7 @@ nautilus_icon_factory_get_pixmap_and_mask_for_file (NautilusFile *file,
 	if (pixbuf == NULL) {
 		return;
 	}
-	gdk_pixbuf_render_pixmap_and_mask (pixbuf, pixmap, mask, NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
+	gdk_pixbuf_render_pixmap_and_mask (pixbuf, pixmap, mask, EEL_STANDARD_ALPHA_THRESHHOLD);
 	gdk_pixbuf_unref (pixbuf);
 }
 
@@ -2364,10 +2364,10 @@ GdkPixbuf * nautilus_icon_factory_get_pixbuf_from_name (const char *icon_name,
 	GdkPixbuf *pixbuf;
 	NautilusScalableIcon *icon;
 	
-	icon = nautilus_scalable_icon_new_from_text_pieces (NULL, icon_name, modifier, NULL, anti_aliased);
+	icon = eel_scalable_icon_new_from_text_pieces (NULL, icon_name, modifier, NULL, anti_aliased);
 	pixbuf = nautilus_icon_factory_get_pixbuf_for_icon (icon, size_in_pixels, size_in_pixels,
 							    size_in_pixels, size_in_pixels, NULL, TRUE); 	
-	nautilus_scalable_icon_unref (icon);	
+	eel_scalable_icon_unref (icon);	
 	return pixbuf;
 }
 									  
@@ -2390,7 +2390,7 @@ embedded_text_rect_usable (const ArtIRect *embedded_text_rect)
 }
 
 static gboolean embedded_text_preferences_callbacks_added = FALSE;
-static NautilusScalableFont *embedded_text_font = NULL;
+static EelScalableFont *embedded_text_font = NULL;
 
 static void
 embedded_text_font_changed_callback (gpointer callback_data)
@@ -2420,7 +2420,7 @@ embed_text (GdkPixbuf *pixbuf_without_text,
 	    const ArtIRect *embedded_text_rect,
 	    const char *text)
 {
-	NautilusSmoothTextLayout *smooth_text_layout;
+	EelSmoothTextLayout *smooth_text_layout;
 	GdkPixbuf *pixbuf_with_text;
 	
 	g_return_val_if_fail (pixbuf_without_text != NULL, NULL);
@@ -2429,7 +2429,7 @@ embed_text (GdkPixbuf *pixbuf_without_text,
 	/* Quick out for the case where there's no place to embed the
 	 * text or the place is too small or there's no text.
 	 */
-	if (!embedded_text_rect_usable (embedded_text_rect) || nautilus_strlen (text) == 0) {
+	if (!embedded_text_rect_usable (embedded_text_rect) || eel_strlen (text) == 0) {
 		return NULL;
 	}
 
@@ -2445,28 +2445,28 @@ embed_text (GdkPixbuf *pixbuf_without_text,
 		g_atexit (embedded_text_font_free);
 	}
 
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (embedded_text_font), NULL);
+	g_return_val_if_fail (EEL_IS_SCALABLE_FONT (embedded_text_font), NULL);
 	
-	smooth_text_layout = nautilus_smooth_text_layout_new (text,
-							      nautilus_strlen (text),
+	smooth_text_layout = eel_smooth_text_layout_new (text,
+							      eel_strlen (text),
 							      embedded_text_font,
 							      EMBEDDED_TEXT_FONT_SIZE,
 							      FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), NULL);
-	nautilus_smooth_text_layout_set_line_spacing (smooth_text_layout, EMBEDDED_TEXT_LINE_SPACING);
-	nautilus_smooth_text_layout_set_empty_line_height (smooth_text_layout, EMBEDDED_TEXT_EMPTY_LINE_HEIGHT);
+	g_return_val_if_fail (EEL_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), NULL);
+	eel_smooth_text_layout_set_line_spacing (smooth_text_layout, EMBEDDED_TEXT_LINE_SPACING);
+	eel_smooth_text_layout_set_empty_line_height (smooth_text_layout, EMBEDDED_TEXT_EMPTY_LINE_HEIGHT);
 	
 	pixbuf_with_text = gdk_pixbuf_copy (pixbuf_without_text);
 	
-	nautilus_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
+	eel_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
 						    pixbuf_with_text,
 						    0,
 						    0,
 						    embedded_text_rect,
 						    GTK_JUSTIFY_LEFT,
 						    FALSE,
-						    NAUTILUS_RGB_COLOR_BLACK,
-						    NAUTILUS_OPACITY_FULLY_OPAQUE);
+						    EEL_RGB_COLOR_BLACK,
+						    EEL_OPACITY_FULLY_OPAQUE);
 	
 	gtk_object_unref (GTK_OBJECT (smooth_text_layout));
 
@@ -2485,7 +2485,7 @@ load_icon_with_embedded_text (NautilusScalableIcon *scalable_icon,
 	g_assert (scalable_icon->embedded_text != NULL);
 	
 	/* Get the icon without text. */
-	scalable_icon_without_text = nautilus_scalable_icon_new_from_text_pieces
+	scalable_icon_without_text = eel_scalable_icon_new_from_text_pieces
 		(scalable_icon->uri,
 		 scalable_icon->name,
 		 scalable_icon->modifier,
@@ -2494,7 +2494,7 @@ load_icon_with_embedded_text (NautilusScalableIcon *scalable_icon,
 	icon_without_text = get_icon_from_cache
 		(scalable_icon_without_text, size,
 		 FALSE, FALSE);
-	nautilus_scalable_icon_unref (scalable_icon_without_text);
+	eel_scalable_icon_unref (scalable_icon_without_text);
 	
 	/* Create a pixbuf with the text in it. */
 	pixbuf_with_text = embed_text (icon_without_text->pixbuf,
@@ -2520,10 +2520,10 @@ load_icon_with_embedded_text (NautilusScalableIcon *scalable_icon,
 
 /* Convenience function for unrefing and then freeing an entire list. */
 void
-nautilus_scalable_icon_list_free (GList *icon_list)
+eel_scalable_icon_list_free (GList *icon_list)
 {
-	nautilus_g_list_free_deep_custom
-		(icon_list, (GFunc) nautilus_scalable_icon_unref, NULL);
+	eel_g_list_free_deep_custom
+		(icon_list, (GFunc) eel_scalable_icon_unref, NULL);
 }
 
 #if ! defined (NAUTILUS_OMIT_SELF_CHECK)
@@ -2540,93 +2540,93 @@ self_test_next_icon_size_to_try (guint start_size, guint current_size)
 void
 nautilus_self_check_icon_factory (void)
 {
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (0), 12);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (1), 24);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (2), 36);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (3), 48);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (4), 72);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (5), 96);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (6), 192);
-
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (0), 12);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (1), 12);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (11), 12);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (12), 20);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (19), 20);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (20), 24);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (23), 24);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (24), 36);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (35), 36);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (36), 48);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (47), 48);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (48), 72);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (71), 72);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (72), 96);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (95), 96);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (96), 192);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (191), 192);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (192), 192);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_larger_icon_size (0xFFFFFFFF), 192);
-
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (0), 12);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (1), 12);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (11), 12);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (12), 12);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (20), 12);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (21), 20);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (24), 20);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (25), 24);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (36), 24);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (37), 36);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (48), 36);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (49), 48);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (72), 48);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (73), 72);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (96), 72);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (97), 96);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (192), 96);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (193), 192);
-	NAUTILUS_CHECK_INTEGER_RESULT (get_smaller_icon_size (0xFFFFFFFF), 192);
-
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 0), "TRUE,12");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 12), "TRUE,20");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 20), "TRUE,24");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 24), "TRUE,36");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 36), "TRUE,48");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 48), "TRUE,72");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 72), "TRUE,96");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 96), "TRUE,192");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 192), "FALSE,192");
-
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 0), "TRUE,36");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 36), "TRUE,48");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 48), "TRUE,72");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 72), "TRUE,96");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 96), "TRUE,192");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 192), "TRUE,24");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 24), "TRUE,20");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 20), "TRUE,12");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 12), "FALSE,12");
-
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 0), "TRUE,48");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 48), "TRUE,72");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 72), "TRUE,96");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 96), "TRUE,192");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 192), "TRUE,36");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 36), "TRUE,24");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 24), "TRUE,20");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 20), "TRUE,12");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 12), "FALSE,12");
-
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 0), "TRUE,192");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 192), "TRUE,96");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 96), "TRUE,72");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 72), "TRUE,48");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 48), "TRUE,36");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 36), "TRUE,24");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 24), "TRUE,20");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 20), "TRUE,12");
-	NAUTILUS_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 12), "FALSE,12");
+	EEL_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (0), 12);
+	EEL_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (1), 24);
+	EEL_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (2), 36);
+	EEL_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (3), 48);
+	EEL_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (4), 72);
+	EEL_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (5), 96);
+	EEL_CHECK_INTEGER_RESULT (nautilus_get_icon_size_for_zoom_level (6), 192);
+
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (0), 12);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (1), 12);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (11), 12);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (12), 20);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (19), 20);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (20), 24);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (23), 24);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (24), 36);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (35), 36);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (36), 48);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (47), 48);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (48), 72);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (71), 72);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (72), 96);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (95), 96);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (96), 192);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (191), 192);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (192), 192);
+	EEL_CHECK_INTEGER_RESULT (get_larger_icon_size (0xFFFFFFFF), 192);
+
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (0), 12);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (1), 12);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (11), 12);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (12), 12);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (20), 12);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (21), 20);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (24), 20);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (25), 24);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (36), 24);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (37), 36);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (48), 36);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (49), 48);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (72), 48);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (73), 72);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (96), 72);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (97), 96);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (192), 96);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (193), 192);
+	EEL_CHECK_INTEGER_RESULT (get_smaller_icon_size (0xFFFFFFFF), 192);
+
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 0), "TRUE,12");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 12), "TRUE,20");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 20), "TRUE,24");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 24), "TRUE,36");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 36), "TRUE,48");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 48), "TRUE,72");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 72), "TRUE,96");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 96), "TRUE,192");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0, 192), "FALSE,192");
+
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 0), "TRUE,36");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 36), "TRUE,48");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 48), "TRUE,72");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 72), "TRUE,96");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 96), "TRUE,192");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 192), "TRUE,24");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 24), "TRUE,20");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 20), "TRUE,12");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (36, 12), "FALSE,12");
+
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 0), "TRUE,48");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 48), "TRUE,72");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 72), "TRUE,96");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 96), "TRUE,192");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 192), "TRUE,36");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 36), "TRUE,24");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 24), "TRUE,20");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 20), "TRUE,12");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (37, 12), "FALSE,12");
+
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 0), "TRUE,192");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 192), "TRUE,96");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 96), "TRUE,72");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 72), "TRUE,48");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 48), "TRUE,36");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 36), "TRUE,24");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 24), "TRUE,20");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 20), "TRUE,12");
+	EEL_CHECK_STRING_RESULT (self_test_next_icon_size_to_try (0xFFFFFFFF, 12), "FALSE,12");
 }
 
 #endif /* ! NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-icon-factory.h b/libnautilus-private/nautilus-icon-factory.h
index 172e6a8bd..c52e0b41c 100644
--- a/libnautilus-private/nautilus-icon-factory.h
+++ b/libnautilus-private/nautilus-icon-factory.h
@@ -28,7 +28,7 @@
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-string-list.h>
+#include <eel/eel-string-list.h>
 #include <gtk/gtkobject.h>
 
 /* NautilusIconFactory is a class that knows how to hand out icons to be
@@ -108,7 +108,7 @@ gboolean              nautilus_icon_factory_is_icon_ready_for_file       (Nautil
 GList *               nautilus_icon_factory_get_required_file_attributes (void);
 GList *               nautilus_icon_factory_get_emblem_icons_for_file    (NautilusFile                *file,
 									  gboolean                     anti_aliased,
-									  NautilusStringList          *exclude);
+									  EelStringList          *exclude);
 NautilusScalableIcon *nautilus_icon_factory_get_emblem_icon_by_name      (const char                  *emblem_name,
 									  gboolean                     anti_aliased);
 
@@ -155,22 +155,22 @@ GdkPixbuf *	      nautilus_icon_factory_get_pixbuf_from_name	 (const char
  * icon, you can compare two scalable icons to see if they are the same
  * with ==.
  */
-void                  nautilus_scalable_icon_ref                         (NautilusScalableIcon        *scalable_icon);
-void                  nautilus_scalable_icon_unref                       (NautilusScalableIcon        *scalable_icon);
+void                  eel_scalable_icon_ref                         (NautilusScalableIcon        *scalable_icon);
+void                  eel_scalable_icon_unref                       (NautilusScalableIcon        *scalable_icon);
 
 /* A scalable icon can be decomposed into text and reconstituted later
- * using nautilus_scalable_icon_new_from_text_pieces. This is the way 
+ * using eel_scalable_icon_new_from_text_pieces. This is the way 
  * to store scalable icons in metadata or other files.
  */
-void                  nautilus_scalable_icon_get_text_pieces             (NautilusScalableIcon        *scalable_icon,
+void                  eel_scalable_icon_get_text_pieces             (NautilusScalableIcon        *scalable_icon,
 									  char                       **uri_return,
 									  char                       **name_return,
 									  char                       **modifier_return,
 									  char                       **embedded_text_return);
 /* Get a scalable icon using the earlier results of
- * nautilus_scalable_icon_get_text_pieces.
+ * eel_scalable_icon_get_text_pieces.
  */
-NautilusScalableIcon *nautilus_scalable_icon_new_from_text_pieces        (const char                  *uri,
+NautilusScalableIcon *eel_scalable_icon_new_from_text_pieces        (const char                  *uri,
 									  const char                  *name,
 									  const char                  *modifier,
 									  const char                  *embedded_text,
@@ -179,6 +179,6 @@ NautilusScalableIcon *nautilus_scalable_icon_new_from_text_pieces        (const
 /* Convenience function for freeing a list of scalable icons.
  * Unrefs all the icons before freeing the list.
  */
-void                  nautilus_scalable_icon_list_free                   (GList                       *scalable_icon_list);
+void                  eel_scalable_icon_list_free                   (GList                       *scalable_icon_list);
 
 #endif /* NAUTILUS_ICON_FACTORY_H */
diff --git a/libnautilus-private/nautilus-icon-private.h b/libnautilus-private/nautilus-icon-private.h
index 9c426eeca..b1b73c147 100644
--- a/libnautilus-private/nautilus-icon-private.h
+++ b/libnautilus-private/nautilus-icon-private.h
@@ -26,7 +26,7 @@
 #define NAUTILUS_ICON_CONTAINER_PRIVATE_H
 
 #include "nautilus-entry.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 #include "nautilus-icon-container.h"
 #include "nautilus-icon-dnd.h"
 #include "nautilus-icon-factory.h"
@@ -49,10 +49,10 @@ typedef struct {
 	double scale_x, scale_y;
 
 	/* Whether this item is selected. */
-	nautilus_boolean_bit is_selected : 1;
+	eel_boolean_bit is_selected : 1;
 
 	/* Whether this item was selected before rubberbanding. */
-	nautilus_boolean_bit was_selected_before_rubberband : 1;
+	eel_boolean_bit was_selected_before_rubberband : 1;
 } NautilusIcon;
 
 
@@ -176,7 +176,7 @@ struct NautilusIconContainerDetails {
 	GdkFont *label_font[NAUTILUS_ZOOM_LEVEL_LARGEST + 1];
 
 	/* font used to draw labels in smooth mode */
-	NautilusScalableFont *smooth_label_font;
+	EelScalableFont *smooth_label_font;
 	int font_size_table[NAUTILUS_ZOOM_LEVEL_LARGEST + 1];
 
 	/* pixbuf and color for label highlighting */
diff --git a/libnautilus-private/nautilus-icon-text-item.c b/libnautilus-private/nautilus-icon-text-item.c
index d1cf5388e..af72de11d 100644
--- a/libnautilus-private/nautilus-icon-text-item.c
+++ b/libnautilus-private/nautilus-icon-text-item.c
@@ -17,8 +17,8 @@
 #include "nautilus-theme.h"
 
 #include <libnautilus/nautilus-undo.h>
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-glib-extensions.h>
 
 #include <math.h>
 #include <stdio.h>
@@ -305,10 +305,10 @@ iti_destroy (GtkObject *object)
 
 	/* Queue redraw of bounding box */
 	gnome_canvas_request_redraw (item->canvas,
-				     nautilus_round (item->x1),
-				     nautilus_round (item->y1),
-				     nautilus_round (item->x2),
-				     nautilus_round (item->y2));
+				     eel_round (item->x1),
+				     eel_round (item->y1),
+				     eel_round (item->x2),
+				     eel_round (item->y2));
 
 	/* Free everything */
 	if (iti->font)
@@ -411,16 +411,16 @@ iti_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
 		(* parent_class->update) (item, affine, clip_path, flags);
 
 	gnome_canvas_request_redraw (item->canvas,
-				     nautilus_round (item->x1),
-				     nautilus_round (item->y1),
-				     nautilus_round (item->x2),
-				     nautilus_round (item->y2));
+				     eel_round (item->x1),
+				     eel_round (item->y1),
+				     eel_round (item->x2),
+				     eel_round (item->y2));
 	recompute_bounding_box (iti);
 	gnome_canvas_request_redraw (item->canvas,
-				     nautilus_round (item->x1),
-				     nautilus_round (item->y1),
-				     nautilus_round (item->x2),
-				     nautilus_round (item->y2));
+				     eel_round (item->x1),
+				     eel_round (item->y1),
+				     eel_round (item->x2),
+				     eel_round (item->y2));
 }
 
 /* utility to fetch a color from a theme */
@@ -607,11 +607,11 @@ iti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int update
 
 	iti = ITI (item);
 
-	width  = nautilus_round (item->x2 - item->x1);
-	height = nautilus_round (item->y2 - item->y1);
+	width  = eel_round (item->x2 - item->x1);
+	height = eel_round (item->y2 - item->y1);
 	
-	xofs = nautilus_round (item->x1) - x;
-	yofs = nautilus_round (item->y1) - y;
+	xofs = eel_round (item->x1) - x;
+	yofs = eel_round (item->y1) - y;
 
 	style = GTK_WIDGET (item->canvas)->style;
 
@@ -693,15 +693,15 @@ iti_render (GnomeCanvasItem *item, GnomeCanvasBuf *buffer)
 
 	visual = gdk_visual_get_system ();
 	art_affine_identity(affine);
-	width  = nautilus_round (item->x2 - item->x1);
-	height = nautilus_round (item->y2 - item->y1);
+	width  = eel_round (item->x2 - item->x1);
+	height = eel_round (item->y2 - item->y1);
 	
 	/* allocate a pixmap to draw the text into, and clear it to white */
 	pixmap = gdk_pixmap_new (NULL, width, height, visual->depth);
 
 	gc = gdk_gc_new (pixmap);
 
-	gdk_rgb_gc_set_foreground (gc, NAUTILUS_RGB_COLOR_WHITE);
+	gdk_rgb_gc_set_foreground (gc, EEL_RGB_COLOR_WHITE);
 	gdk_draw_rectangle (pixmap, gc, TRUE,
 			    0, 0,
 			    width,
@@ -709,7 +709,7 @@ iti_render (GnomeCanvasItem *item, GnomeCanvasBuf *buffer)
 	gdk_gc_unref (gc);
 	
 	/* use a common routine to draw the label into the pixmap */
-	iti_draw (item, pixmap, nautilus_round (item->x1), nautilus_round (item->y1), width, height);
+	iti_draw (item, pixmap, eel_round (item->x1), eel_round (item->y1), width, height);
 	
 	/* turn it into a pixbuf */
 	colormap = gdk_colormap_new (visual, FALSE);
@@ -724,7 +724,7 @@ iti_render (GnomeCanvasItem *item, GnomeCanvasBuf *buffer)
 	gdk_pixmap_unref (pixmap);
 		
 	/* draw the pixbuf containing the label */
-	draw_pixbuf_aa (text_pixbuf, buffer, affine, nautilus_round (item->x1), nautilus_round (item->y1));
+	draw_pixbuf_aa (text_pixbuf, buffer, affine, eel_round (item->x1), eel_round (item->y1));
 	gdk_pixbuf_unref (text_pixbuf);
 
 	buffer->is_bg = FALSE;
@@ -915,7 +915,7 @@ iti_ensure_focus (GnomeCanvasItem *item)
 
 	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (item->canvas));
 	if (toplevel != NULL && GTK_WIDGET_REALIZED (toplevel)) {
-		nautilus_gdk_window_focus (toplevel->window, GDK_CURRENT_TIME);
+		eel_gdk_window_focus (toplevel->window, GDK_CURRENT_TIME);
 	}
 }
 
@@ -1063,8 +1063,8 @@ iti_event (GnomeCanvasItem *item, GdkEvent *event)
 		if (event->button.button == 1) {
 			gnome_canvas_w2c_d (item->canvas, event->button.x, event->button.y, &cx, &cy);						
 			idx = iti_idx_from_x_y (iti,
-						nautilus_round (cx - (item->x1 + MARGIN_X)),
-						nautilus_round (cy - (item->y1 + MARGIN_Y)));
+						eel_round (cx - (item->x1 + MARGIN_X)),
+						eel_round (cy - (item->y1 + MARGIN_Y)));
 			iti_start_selecting (iti, idx, event->button.time);
 		}
 		return TRUE;
@@ -1076,8 +1076,8 @@ iti_event (GnomeCanvasItem *item, GdkEvent *event)
 		gtk_widget_event (GTK_WIDGET (priv->entry), event);
 		gnome_canvas_w2c_d (item->canvas, event->button.x, event->button.y, &cx, &cy);			
 		idx = iti_idx_from_x_y (iti,
-					nautilus_round (cx - (item->x1 + MARGIN_X)),
-					nautilus_round (cy - (item->y1 + MARGIN_Y)));
+					eel_round (cx - (item->x1 + MARGIN_X)),
+					eel_round (cy - (item->y1 + MARGIN_Y)));
 		iti_selection_motion (iti, idx);
 		return TRUE;
 
diff --git a/libnautilus-private/nautilus-image-table.c b/libnautilus-private/nautilus-image-table.c
deleted file mode 100644
index 0e1f1f3f8..000000000
--- a/libnautilus-private/nautilus-image-table.c
+++ /dev/null
@@ -1,759 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-image-table.c - An image table.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-image-table.h"
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-art-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-#include "nautilus-region.h"
-#include "nautilus-debug-drawing.h"
-
-#include <gtk/gtkmain.h>
-
-/* Arguments */
-enum
-{
-	ARG_0,
-	ARG_CHILD_UNDER_POINTER
-};
-
-/* Detail member struct */
-struct NautilusImageTableDetails
-{
-	GtkWidget *child_under_pointer;
-	GtkWidget *child_being_pressed;
-	GdkGC *clear_gc;
-	guint32 smooth_background_color;
-	gboolean is_smooth;
-};
-
-/* Signals */
-typedef enum
-{
-	CHILD_ENTER,
-	CHILD_LEAVE,
-	CHILD_PRESSED,
-	CHILD_RELEASED,
-	CHILD_CLICKED,
-	SET_IS_SMOOTH,
-	LAST_SIGNAL
-} ImageTableSignals;
-
-/* Signals */
-static guint image_table_signals[LAST_SIGNAL] = { 0 };
-
-/* GtkObjectClass methods */
-static void    nautilus_image_table_initialize_class     (NautilusImageTableClass *image_table_class);
-static void    nautilus_image_table_initialize           (NautilusImageTable      *image);
-static void    nautilus_image_table_destroy              (GtkObject               *object);
-
-/* GtkWidgetClass methods */
-static int     nautilus_image_table_expose_event         (GtkWidget               *widget,
-							  GdkEventExpose          *event);
-static void    nautilus_image_table_realize              (GtkWidget               *widget);
-static void    nautilus_image_table_unrealize            (GtkWidget               *widget);
-
-/* GtkContainerClass methods */
-static void    nautilus_image_table_remove               (GtkContainer            *container,
-							  GtkWidget               *widget);
-static GtkType nautilus_image_table_child_type           (GtkContainer            *container);
-
-/* Private NautilusImageTable methods */
-static void    image_table_clear_dirty_areas             (NautilusImageTable      *image_table);
-static GdkGC * image_table_peek_clear_gc                 (NautilusImageTable      *image_table);
-static void    image_table_emit_signal                   (NautilusImageTable      *image_table,
-							  GtkWidget               *child,
-							  guint                    signal_index,
-							  int                      x,
-							  int                      y,
-							  int                      button,
-							  guint                    state);
-
-/* Ancestor callbacks */
-static int     ancestor_enter_notify_event               (GtkWidget               *widget,
-							  GdkEventCrossing        *event,
-							  gpointer                 event_data);
-static int     ancestor_leave_notify_event               (GtkWidget               *widget,
-							  GdkEventCrossing        *event,
-							  gpointer                 event_data);
-static int     ancestor_motion_notify_event              (GtkWidget               *widget,
-							  GdkEventMotion          *event,
-							  gpointer                 event_data);
-static int     ancestor_button_press_event               (GtkWidget               *widget,
-							  GdkEventButton          *event,
-							  gpointer                 event_data);
-static int     ancestor_button_release_event             (GtkWidget               *widget,
-							  GdkEventButton          *event,
-							  gpointer                 event_data);
-
-/* NautilusImageTable signals */
-static void    nautilus_image_table_set_is_smooth_signal (GtkWidget               *widget,
-							  gboolean                 is_smooth);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusImageTable, nautilus_image_table, NAUTILUS_TYPE_WRAP_TABLE)
-
-/* Class init methods */
-static void
-nautilus_image_table_initialize_class (NautilusImageTableClass *image_table_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (image_table_class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (image_table_class);
-	GtkContainerClass *container_class = GTK_CONTAINER_CLASS (image_table_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_image_table_destroy;
-	
- 	/* GtkWidgetClass */
- 	widget_class->expose_event = nautilus_image_table_expose_event;
- 	widget_class->realize = nautilus_image_table_realize;
- 	widget_class->unrealize = nautilus_image_table_unrealize;
-
- 	/* GtkContainerClass */
-	container_class->remove = nautilus_image_table_remove;
-	container_class->child_type = nautilus_image_table_child_type;
-
-	/* NautilusImageTableClass */
-	image_table_class->set_is_smooth = nautilus_image_table_set_is_smooth_signal;
-	
-	/* Signals */
-	image_table_signals[CHILD_ENTER] = gtk_signal_new ("child_enter",
-							   GTK_RUN_LAST,
-							   object_class->type,
-							   0,
-							   gtk_marshal_NONE__POINTER_POINTER,
-							   GTK_TYPE_NONE,
-							   2,
-							   GTK_TYPE_POINTER,
-							   GTK_TYPE_POINTER);
-	image_table_signals[CHILD_LEAVE] = gtk_signal_new ("child_leave",
-							   GTK_RUN_LAST,
-							   object_class->type,
-							   0,
-							   gtk_marshal_NONE__POINTER_POINTER,
-							   GTK_TYPE_NONE,
-							   2,
-							   GTK_TYPE_POINTER,
-							   GTK_TYPE_POINTER);
-	image_table_signals[CHILD_PRESSED] = gtk_signal_new ("child_pressed",
-							     GTK_RUN_LAST,
-							     object_class->type,
-							     0,
-							     gtk_marshal_NONE__POINTER_POINTER,
-							     GTK_TYPE_NONE,
-							     2,
-							     GTK_TYPE_POINTER,
-							     GTK_TYPE_POINTER);
-	image_table_signals[CHILD_RELEASED] = gtk_signal_new ("child_released",
-							      GTK_RUN_LAST,
-							      object_class->type,
-							      0,
-							      gtk_marshal_NONE__POINTER_POINTER,
-							      GTK_TYPE_NONE,
-							      2,
-							      GTK_TYPE_POINTER,
-							      GTK_TYPE_POINTER);
-	image_table_signals[CHILD_CLICKED] = gtk_signal_new ("child_clicked",
-							     GTK_RUN_LAST,
-							     object_class->type,
-							     0,
-							     gtk_marshal_NONE__POINTER_POINTER,
-							     GTK_TYPE_NONE,
-							     2,
-							     GTK_TYPE_POINTER,
-							     GTK_TYPE_POINTER);
-	
-	image_table_signals[SET_IS_SMOOTH] = gtk_signal_new ("set_is_smooth",
-							     GTK_RUN_LAST,
-							     object_class->type,
-							     GTK_SIGNAL_OFFSET (NautilusImageTableClass, set_is_smooth),
-							     gtk_marshal_NONE__BOOL,
-							     GTK_TYPE_NONE, 
-							     1,
-							     GTK_TYPE_BOOL);
-
-	gtk_object_class_add_signals (object_class, image_table_signals, LAST_SIGNAL);
-
-	/* Let the smooth widget machinery know that our class can be smooth */
-	nautilus_smooth_widget_register_type (NAUTILUS_TYPE_IMAGE_TABLE);
-}
-
-void
-nautilus_image_table_initialize (NautilusImageTable *image_table)
-{
-	GTK_WIDGET_SET_FLAGS (image_table, GTK_NO_WINDOW);
-
-	image_table->details = g_new0 (NautilusImageTableDetails, 1);
-	image_table->details->smooth_background_color = NAUTILUS_RGB_COLOR_WHITE;
-
-	nautilus_smooth_widget_register (GTK_WIDGET (image_table));
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_image_table_destroy (GtkObject *object)
-{
- 	NautilusImageTable *image_table;
-	
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (object));
-
-	image_table = NAUTILUS_IMAGE_TABLE (object);
-
-	g_free (image_table->details);
-
-	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-/* GtkWidgetClass methods */
-static int
-nautilus_image_table_expose_event (GtkWidget *widget,
-				   GdkEventExpose *event)
-{
-	NautilusImageTable *image_table;
-
-	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (widget), TRUE);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
-	g_return_val_if_fail (event != NULL, TRUE);
-
-	image_table = NAUTILUS_IMAGE_TABLE (widget);
-
-	/* In smooth mode we clear dirty areas, since our background wont be
-	 * force clear and thus avoid flicker.
-	 */
-	if (image_table->details->is_smooth) {
-		image_table_clear_dirty_areas (image_table);
-	}
-	
-	return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
-		(GTK_WIDGET_CLASS, expose_event, (widget, event));
-}
-
-static void
-nautilus_image_table_realize (GtkWidget *widget)
-{
-	NautilusImageTable *image_table;
-	GtkWidget *windowed_ancestor;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (widget));
-	
-	image_table = NAUTILUS_IMAGE_TABLE (widget);
-
-	/* Chain realize */
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
-
-	windowed_ancestor = nautilus_gtk_widget_find_windowed_ancestor (widget);
-	g_assert (GTK_IS_WIDGET (windowed_ancestor));
-	
-	gtk_widget_add_events (windowed_ancestor,
-			       GDK_BUTTON_PRESS_MASK
-			       | GDK_BUTTON_RELEASE_MASK
-			       | GDK_BUTTON_MOTION_MASK
-			       | GDK_ENTER_NOTIFY_MASK
-			       | GDK_LEAVE_NOTIFY_MASK
-			       | GDK_POINTER_MOTION_MASK);
-
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "enter_notify_event",
-						    GTK_SIGNAL_FUNC (ancestor_enter_notify_event),
-						    widget,
-						    widget);
-	
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "leave_notify_event",
-						    GTK_SIGNAL_FUNC (ancestor_leave_notify_event),
-						    widget,
-						    widget);
-	
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "motion_notify_event",
-						    GTK_SIGNAL_FUNC (ancestor_motion_notify_event),
-						    widget,
-						    widget);
-	
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "button_press_event",
-						    GTK_SIGNAL_FUNC (ancestor_button_press_event),
-						    widget,
-						    widget);
-	
-	nautilus_gtk_signal_connect_while_realized (GTK_OBJECT (windowed_ancestor),
-						    "button_release_event",
-						    GTK_SIGNAL_FUNC (ancestor_button_release_event),
-						    widget,
-						    widget);
-}
-
-static void
-nautilus_image_table_unrealize (GtkWidget *widget)
-{
-	NautilusImageTable *image_table;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (widget));
-
-	image_table = NAUTILUS_IMAGE_TABLE (widget);
-
-	if (image_table->details->clear_gc != NULL) {
-		gdk_gc_unref (image_table->details->clear_gc);
-		image_table->details->clear_gc = NULL;
-	}
-
-	/* Chain unrealize */
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget));
-}
-
-/* GtkContainerClass methods */
-static void
-nautilus_image_table_remove (GtkContainer *container,
-			     GtkWidget *child)
-{
-	NautilusImageTable *image_table;
-	
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (container));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (child));
-	
-	image_table = NAUTILUS_IMAGE_TABLE (container);
-
-	if (child == image_table->details->child_under_pointer) {
-		image_table->details->child_under_pointer = NULL;
-	}
-
-	if (child == image_table->details->child_being_pressed) {
-		image_table->details->child_being_pressed = NULL;
-	}
-
-	NAUTILUS_CALL_PARENT (GTK_CONTAINER_CLASS, remove, (container, child));
-}
-
-static GtkType
-nautilus_image_table_child_type (GtkContainer *container)
-{
-	return NAUTILUS_TYPE_LABELED_IMAGE;
-}
-
-/* NautilusImageTable signals */
-static void
-nautilus_image_table_set_is_smooth_signal (GtkWidget *widget,
-					   gboolean is_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (widget));
-	
-	nautilus_image_table_set_is_smooth (NAUTILUS_IMAGE_TABLE (widget), is_smooth);
-}
-
-/* Private NautilusImageTable methods */
-
-/* For each of the image table children, subtract their content from a region */
-static void
-image_table_foreach_child_subtract_content (GtkWidget *child,
-					    gpointer callback_data)
-{
-	NautilusRegion *region;
-	ArtIRect label_bounds;
-	ArtIRect image_bounds;
-
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (child));
-	g_return_if_fail (callback_data != NULL);
-
-	if (!GTK_WIDGET_VISIBLE (child)) {
-		return;
-	}
-
-	region = callback_data;
-
-	image_bounds = nautilus_labeled_image_get_image_bounds (NAUTILUS_LABELED_IMAGE (child));
-	if (!art_irect_empty (&image_bounds)) {
-		nautilus_region_subtract_rectangle (region, &image_bounds);
-	}
-	
-	label_bounds = nautilus_labeled_image_get_label_bounds (NAUTILUS_LABELED_IMAGE (child));
-	if (!art_irect_empty (&label_bounds)) {
-					nautilus_region_subtract_rectangle (region, &label_bounds);
-	}
-}
-
-/* Clear the dirty areas around the children's content */
-static void
-image_table_clear_dirty_areas (NautilusImageTable *image_table)
-{
-	GtkWidget *widget;
-	NautilusRegion *region;
-	NautilusDimensions dimensions;
-	ArtIRect whole_region;
-	GdkGC *gc;
-	
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (image_table));
-	g_return_if_fail (GTK_WIDGET_REALIZED (image_table));
-
-	widget = GTK_WIDGET (image_table);
-	
-	dimensions = nautilus_gtk_widget_get_dimensions (widget->parent);
-	whole_region = nautilus_art_irect_assign_dimensions (0, 0, &dimensions);
-	region = nautilus_region_new ();
-	
-	nautilus_region_add_rectangle (region, &whole_region);
-
-	gc = image_table_peek_clear_gc (image_table);
-	
-	gtk_container_foreach (GTK_CONTAINER (image_table), image_table_foreach_child_subtract_content, region);
-	
-	nautilus_region_set_gc_clip_region (region, gc);
-	
-	gdk_draw_rectangle (widget->window,
-			    gc,
-			    TRUE,
-			    0,
-			    0,
-			    dimensions.width,
-			    dimensions.height);
-	
-	nautilus_region_free (region);
-}
-
-static GdkGC *
-image_table_peek_clear_gc (NautilusImageTable *image_table)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table), NULL);
-
-	if (image_table->details->clear_gc == NULL) {
-		image_table->details->clear_gc = gdk_gc_new (GTK_WIDGET (image_table)->window);
-		gdk_gc_set_function (image_table->details->clear_gc, GDK_COPY);
-	}
-
-	gdk_rgb_gc_set_foreground (image_table->details->clear_gc, image_table->details->smooth_background_color);
-
-	return image_table->details->clear_gc;
-}
-
-static void
-image_table_emit_signal (NautilusImageTable *image_table,
-			 GtkWidget *child,
-			 guint signal_index,
-			 int x,
-			 int y,
-			 int button,
-			 guint state)
-{
-	NautilusImageTableEvent event;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table));
-	g_return_if_fail (GTK_IS_WIDGET (child));
-	g_return_if_fail (signal_index >= 0);
-	g_return_if_fail (signal_index < LAST_SIGNAL);
-
-	event.x = x;
-	event.y = y;
-	event.button = button;
-	event.state = state;
-	
-	gtk_signal_emit (GTK_OBJECT (image_table), 
-			 image_table_signals[signal_index],
-			 child,
-			 &event);
-}
-
-static void
-image_table_handle_motion (NautilusImageTable *image_table,
-			   int x,
-			   int y,
-			   GdkEvent *event)
-{
-	GtkWidget *child;
-	GtkWidget *leave_emit_child = NULL;
-	GtkWidget *enter_emit_child = NULL;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table));
-
-	child = nautilus_wrap_table_find_child_at_event_point (NAUTILUS_WRAP_TABLE (image_table), x, y);
-
-	if (child && !GTK_WIDGET_SENSITIVE (child)) {
-		return;
-	}
-
-	if (child == image_table->details->child_under_pointer) {
-		return;
-	}
-
-	if (child != NULL) {
-		if (image_table->details->child_under_pointer != NULL) {
-			leave_emit_child = image_table->details->child_under_pointer;
-		}
-
-		image_table->details->child_under_pointer = child;
-		enter_emit_child = image_table->details->child_under_pointer;
-	} else {
-		if (image_table->details->child_under_pointer != NULL) {
-			leave_emit_child = image_table->details->child_under_pointer;
-		}
-
-		image_table->details->child_under_pointer = NULL;
-	}
-
-	if (leave_emit_child != NULL) {
-		image_table_emit_signal (image_table,
-					 leave_emit_child,
-					 CHILD_LEAVE,
-					 x,
-					 y,
-					 0,
-					 0);
-	}
-
-	if (enter_emit_child != NULL) {
-		image_table_emit_signal (image_table,
-					 enter_emit_child,
-					 CHILD_ENTER,
-					 x,
-					 y,
-					 0,
-					 0);
-	}
-}
-
-static int
-ancestor_enter_notify_event (GtkWidget *widget,
-			     GdkEventCrossing *event,
-			     gpointer event_data)
-{
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE_TABLE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	image_table_handle_motion (NAUTILUS_IMAGE_TABLE (event_data), event->x, event->y, (GdkEvent *) event);
-
-	return FALSE;
-}
-
-static int
-ancestor_leave_notify_event (GtkWidget *widget,
-			     GdkEventCrossing *event,
-			     gpointer event_data)
-{
-	ArtIRect bounds;
-	int x = -1;
-	int y = -1;
-	
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE_TABLE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	bounds = nautilus_gtk_widget_get_bounds (GTK_WIDGET (event_data));
-	
-	if (nautilus_art_irect_contains_point (&bounds, event->x, event->y)) {
-		x = event->x;
-		y = event->y;
-	}
-
-	image_table_handle_motion (NAUTILUS_IMAGE_TABLE (event_data), x, y, (GdkEvent *) event);
-	
-	return FALSE;
-}
-
-static int
-ancestor_motion_notify_event (GtkWidget *widget,
-			      GdkEventMotion *event,
-			      gpointer event_data)
-{
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE_TABLE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	image_table_handle_motion (NAUTILUS_IMAGE_TABLE (event_data), (int) event->x, (int) event->y, (GdkEvent *) event);
-
-	return FALSE;
-}
-
-static int
-ancestor_button_press_event (GtkWidget *widget,
-			     GdkEventButton *event,
-			     gpointer event_data)
-{
-  	NautilusImageTable *image_table;
-	GtkWidget *child;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE_TABLE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
- 	image_table = NAUTILUS_IMAGE_TABLE (event_data);
-
-	child = nautilus_wrap_table_find_child_at_event_point (NAUTILUS_WRAP_TABLE (image_table), event->x, event->y);
-
-	if (child && !GTK_WIDGET_SENSITIVE (child)) {
-		return FALSE;
-	}
-
-	if (child != NULL) {
-		if (child == image_table->details->child_under_pointer) {
-			image_table->details->child_being_pressed = child;
-			image_table_emit_signal (image_table,
-						 child,
-						 CHILD_PRESSED,
-						 event->x,
-						 event->y,
-						 event->button,
-						 event->state);
-		}
-	}
-
-	return FALSE;
-}
-
-static int
-ancestor_button_release_event (GtkWidget *widget,
-			       GdkEventButton *event,
-			       gpointer event_data)
-{
-  	NautilusImageTable *image_table;
-	GtkWidget *child;
-	GtkWidget *released_emit_child = NULL;
-	GtkWidget *clicked_emit_child = NULL;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE_TABLE (event_data), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
- 	image_table = NAUTILUS_IMAGE_TABLE (event_data);
-
-	child = nautilus_wrap_table_find_child_at_event_point (NAUTILUS_WRAP_TABLE (image_table), event->x, event->y);
-
-	if (child && !GTK_WIDGET_SENSITIVE (child)) {
-		return FALSE;
-	}
-
-	if (image_table->details->child_being_pressed != NULL) {
-		released_emit_child = image_table->details->child_being_pressed;
-	}
-
-	if (child != NULL) {
-		if (child == image_table->details->child_being_pressed) {
-			clicked_emit_child = child;
-		}
-	}
-	
-	image_table->details->child_being_pressed = NULL;
-
-	if (released_emit_child != NULL) {
-		image_table_emit_signal (image_table,
-					 released_emit_child,
-					 CHILD_RELEASED,
-					 event->x,
-					 event->y,
-					 event->button,
-					 event->state);
-	}
-	
-	if (clicked_emit_child != NULL) {
-
-		image_table_emit_signal (image_table,
-					 clicked_emit_child,
-					 CHILD_CLICKED,
-					 event->x,
-					 event->y,
-					 event->button,
-					 event->state);
-	}
-	
-	return FALSE;
-}
-
-/**
- * nautilus_image_table_new:
- */
-GtkWidget*
-nautilus_image_table_new (gboolean homogeneous)
-{
-	NautilusImageTable *image_table;
-
-	image_table = NAUTILUS_IMAGE_TABLE (gtk_widget_new (nautilus_image_table_get_type (), NULL));
-
-	nautilus_wrap_table_set_homogeneous (NAUTILUS_WRAP_TABLE (image_table), homogeneous);
-	
-	return GTK_WIDGET (image_table);
-}
-
-/**
- * nautilus_image_table_set_is_smooth:
- * @image_table: A NautilusImageTable.
- * @is_smooth: Boolean value indicating whether the image table is smooth.
- *
- */
-void
-nautilus_image_table_set_is_smooth (NautilusImageTable *image_table,
-				    gboolean is_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table));
-	
-	if (image_table->details->is_smooth == is_smooth) {
-		return;
-	}
-	
-	image_table->details->is_smooth = is_smooth;
-}
-
-/**
- * nautilus_image_table_set_smooth_background_color:
- * @image_table: A NautilusImageTable.
- * @smooth_background_color: The color to use for background in smooth mode.
- *
- */
-void
-nautilus_image_table_set_smooth_background_color (NautilusImageTable *image_table,
-						  guint32 smooth_background_color)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table));
-	
-	if (image_table->details->smooth_background_color == smooth_background_color) {
-		return;
-	}
-	
-	image_table->details->smooth_background_color = smooth_background_color;
-}
-
-/**
- * nautilus_image_table_add_empty_child:
- * @image_table: A NautilusImageTable.
- *
- * Add a "empty" child to the table.  Useful when you want to have
- * empty space between 2 children.
- *
- * Returns: The empty child - A NautilusLabeledImage widget with no label
- *          or pixbuf.
- */
-GtkWidget *
-nautilus_image_table_add_empty_image (NautilusImageTable *image_table)
-{
-	GtkWidget *empty;
-
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table), NULL);
-
-	empty = nautilus_labeled_image_new (NULL, NULL);
-	gtk_container_add (GTK_CONTAINER (image_table), empty);
-	gtk_widget_set_sensitive (empty, FALSE);
-
-	return empty;
-}
diff --git a/libnautilus-private/nautilus-image-table.h b/libnautilus-private/nautilus-image-table.h
deleted file mode 100644
index c8e682b08..000000000
--- a/libnautilus-private/nautilus-image-table.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-image-table.h - An image table.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_IMAGE_TABLE_H
-#define NAUTILUS_IMAGE_TABLE_H
-
-#include <libnautilus-extensions/nautilus-wrap-table.h>
-#include <libnautilus-extensions/nautilus-labeled-image.h>
-#include <libnautilus-extensions/nautilus-smooth-widget.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_IMAGE_TABLE            (nautilus_image_table_get_type ())
-#define NAUTILUS_IMAGE_TABLE(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_IMAGE_TABLE, NautilusImageTable))
-#define NAUTILUS_IMAGE_TABLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_IMAGE_TABLE, NautilusImageTableClass))
-#define NAUTILUS_IS_IMAGE_TABLE(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_IMAGE_TABLE))
-#define NAUTILUS_IS_IMAGE_TABLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_IMAGE_TABLE))
-
-typedef struct NautilusImageTable	   NautilusImageTable;
-typedef struct NautilusImageTableClass     NautilusImageTableClass;
-typedef struct NautilusImageTableDetails   NautilusImageTableDetails;
-
-struct NautilusImageTable
-{
-	/* Superclass */
-	NautilusWrapTable wrap_table;
-
-	/* Private things */
-	NautilusImageTableDetails *details;
-};
-
-struct NautilusImageTableClass
-{
-	NautilusWrapTableClass parent_class;
-	NautilusSmoothWidgetSetIsSmooth set_is_smooth;
-};
-
-typedef struct
-{
-	int x;
-	int y;
-	int button;
-	guint state;
-} NautilusImageTableEvent;
-
-/* Public GtkImageTable methods */
-GtkType    nautilus_image_table_get_type                    (void);
-GtkWidget *nautilus_image_table_new                         (gboolean            homogeneous);
-void       nautilus_image_table_set_smooth_background_color (NautilusImageTable *image_table,
-							     guint32             smooth_background_color);
-void       nautilus_image_table_set_is_smooth               (NautilusImageTable *image_table,
-							     gboolean            is_smooth);
-GtkWidget *nautilus_image_table_add_empty_image             (NautilusImageTable *image_table);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_IMAGE_TABLE_H */
-
-
diff --git a/libnautilus-private/nautilus-image-with-background.c b/libnautilus-private/nautilus-image-with-background.c
deleted file mode 100644
index 95eade586..000000000
--- a/libnautilus-private/nautilus-image-with-background.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-image-with-background.c - A NautilusImage that uses NautilusBackground.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include <gtk/gtksignal.h>
-
-#include "nautilus-image-with-background.h"
-#include "nautilus-background.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-
-static void
-draw_background_callback (GtkWidget *widget,
-			  GdkPixbuf *buffer,
-			  const ArtIRect *area,
-			  gpointer callback_data)
-{
-	GtkWidget *background_ancestor;
-	NautilusBackground *background;
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (buffer));
-	g_return_if_fail (area != NULL);
-
-	background_ancestor = nautilus_gtk_widget_find_background_ancestor (widget);
-	g_return_if_fail (GTK_IS_WIDGET (background_ancestor));
-
-	background = nautilus_get_widget_background (background_ancestor);
-	g_return_if_fail (NAUTILUS_IS_BACKGROUND (background));
-	
-	nautilus_background_draw_to_pixbuf (background,
-					    buffer,
-					    area->x0,
-					    area->y0,
-					    area->x1 - area->x0,
-					    area->y1 - area->y0,
-					    background_ancestor->allocation.width,
-					    background_ancestor->allocation.height);
-}
-
-GtkWidget *
-nautilus_image_new_with_background (const char *file_name)
-{
-	GtkWidget *image;
-	
-	image = nautilus_image_new (file_name);
-
-	nautilus_image_set_background_mode (NAUTILUS_IMAGE (image),
-					    NAUTILUS_SMOOTH_BACKGROUND_CALLBACK);
-	
-	gtk_signal_connect_while_alive (GTK_OBJECT (image),
-					"draw_background",
-					GTK_SIGNAL_FUNC (draw_background_callback),
-					NULL,
-					GTK_OBJECT (image));
-
-	return image;
-}
diff --git a/libnautilus-private/nautilus-image-with-background.h b/libnautilus-private/nautilus-image-with-background.h
deleted file mode 100644
index 8e0e0a4eb..000000000
--- a/libnautilus-private/nautilus-image-with-background.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-image-with-background.h - A NautilusImage that uses NautilusBackground.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_IMAGE_BACKGROUND_H
-#define NAUTILUS_IMAGE_BACKGROUND_H
-
-#include <libnautilus-extensions/nautilus-image.h>
-
-BEGIN_GNOME_DECLS
-
-GtkWidget *nautilus_image_new_with_background (const char *file_name);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_IMAGE_BACKGROUND_H */
-
-
diff --git a/libnautilus-private/nautilus-image.c b/libnautilus-private/nautilus-image.c
deleted file mode 100644
index d1922d59d..000000000
--- a/libnautilus-private/nautilus-image.c
+++ /dev/null
@@ -1,1009 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-image.c - A widget to smoothly display images.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-image.h"
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-#include "nautilus-string.h"
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-debug-drawing.h"
-
-/* Arguments */
-enum
-{
-	ARG_0,
-	ARG_BACKGROUND_MODE,
-	ARG_IS_SMOOTH,
-	ARG_PIXBUF,
-	ARG_PIXBUF_OPACITY,
-	ARG_TILE_HEIGHT,
-	ARG_TILE_MODE_HORIZONTAL,
-	ARG_TILE_MODE_VERTICAL,
-	ARG_TILE_OPACITY,
-	ARG_TILE_PIXBUF,
-	ARG_TILE_WIDTH
-};
-
-/* Signals */
-typedef enum
-{
-	DRAW_BACKGROUND,
-	SET_IS_SMOOTH,
-	LAST_SIGNAL
-} ImageSignal;
-
-/* Signals */
-static guint image_signals[LAST_SIGNAL] = { 0 };
-
-/* Detail member struct */
-struct _NautilusImageDetails
-{
-	gboolean is_smooth;
-
-	/* Tile attributes */
-	GdkPixbuf *tile_pixbuf;
-	int tile_opacity;
-	int tile_width;
-	int tile_height;
-	NautilusSmoothTileMode tile_mode_vertical;
-	NautilusSmoothTileMode tile_mode_horizontal;
-
-	/* Pixbuf */
-	GdkPixbuf *pixbuf;
-	int pixbuf_opacity;
-
-	/* Background */
-	NautilusSmoothBackgroundMode background_mode;
-	guint32 solid_background_color;
-	gboolean never_smooth;
-};
-
-/* GtkObjectClass methods */
-static void               nautilus_image_initialize_class     (NautilusImageClass  *image_class);
-static void               nautilus_image_initialize           (NautilusImage       *image);
-static void               nautilus_image_destroy              (GtkObject           *object);
-static void               nautilus_image_set_arg              (GtkObject           *object,
-							       GtkArg              *arg,
-							       guint                arg_id);
-static void               nautilus_image_get_arg              (GtkObject           *object,
-							       GtkArg              *arg,
-							       guint                arg_id);
-/* GtkWidgetClass methods */
-static void               nautilus_image_size_request         (GtkWidget           *widget,
-							       GtkRequisition      *requisition);
-static int                nautilus_image_expose_event         (GtkWidget           *widget,
-							       GdkEventExpose      *event);
-
-/* NautilusImage signals */
-static void               nautilus_image_set_is_smooth_signal (GtkWidget           *widget,
-							       gboolean             is_smooth);
-
-/* Private NautilusImage methods */
-static NautilusDimensions image_get_pixbuf_dimensions         (const NautilusImage *image);
-static ArtIRect           image_get_pixbuf_bounds             (const NautilusImage *image);
-static NautilusDimensions image_get_tile_dimensions           (const NautilusImage *image);
-static gboolean           image_is_smooth                     (const NautilusImage *image);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusImage, nautilus_image, GTK_TYPE_MISC)
-
-/* Class init methods */
-static void
-nautilus_image_initialize_class (NautilusImageClass *image_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (image_class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (image_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_image_destroy;
-	object_class->set_arg = nautilus_image_set_arg;
-	object_class->get_arg = nautilus_image_get_arg;
-	
-	/* GtkWidgetClass */
-	widget_class->size_request = nautilus_image_size_request;
-	widget_class->expose_event = nautilus_image_expose_event;
-
-	/* NautilusImageClass */
-	image_class->set_is_smooth = nautilus_image_set_is_smooth_signal;
-	
-	/* Signals */
-	image_signals[DRAW_BACKGROUND] = gtk_signal_new ("draw_background",
-							 GTK_RUN_LAST,
-							 object_class->type,
-							 0,
-							 gtk_marshal_NONE__POINTER_POINTER,
-							 GTK_TYPE_NONE, 
-							 2,
-							 GTK_TYPE_POINTER,
-							 GTK_TYPE_POINTER);
-
-	image_signals[SET_IS_SMOOTH] = gtk_signal_new ("set_is_smooth",
-						       GTK_RUN_LAST,
-						       object_class->type,
-						       GTK_SIGNAL_OFFSET (NautilusImageClass, set_is_smooth),
-						       gtk_marshal_NONE__BOOL,
-						       GTK_TYPE_NONE, 
-						       1,
-						       GTK_TYPE_BOOL);
-	
-	gtk_object_class_add_signals (object_class, image_signals, LAST_SIGNAL);
-
-	/* Arguments */
-	gtk_object_add_arg_type ("NautilusImage::is_smooth",
-				 GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE,
-				 ARG_IS_SMOOTH);
-	gtk_object_add_arg_type ("NautilusImage::pixbuf",
-				 GTK_TYPE_POINTER,
-				 GTK_ARG_READWRITE,
-				 ARG_PIXBUF);
-	gtk_object_add_arg_type ("NautilusImage::pixbuf_opacity",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_PIXBUF_OPACITY);
-	gtk_object_add_arg_type ("NautilusImage::background_mode",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_BACKGROUND_MODE);
-	gtk_object_add_arg_type ("NautilusImage::tile_pixbuf",
-				 GTK_TYPE_POINTER,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_PIXBUF);
-	gtk_object_add_arg_type ("NautilusImage::tile_opacity",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_OPACITY);
-	gtk_object_add_arg_type ("NautilusImage::tile_width",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_WIDTH);
-	gtk_object_add_arg_type ("NautilusImage::tile_height",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_HEIGHT);
-	gtk_object_add_arg_type ("NautilusImage::tile_mode_vertical",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_MODE_VERTICAL);
-	gtk_object_add_arg_type ("NautilusImage::tile_mode_horizontal",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_MODE_HORIZONTAL);
-
-	/* Make this class inherit the same kind of theme stuff as GtkPixmap */
-	nautilus_gtk_class_name_make_like_existing_type ("NautilusImage", GTK_TYPE_PIXMAP);
-
-	/* Let the smooth widget machinery know that our class can be smooth */
-	nautilus_smooth_widget_register_type (NAUTILUS_TYPE_IMAGE);
-}
-
-void
-nautilus_image_initialize (NautilusImage *image)
-{
-	GTK_WIDGET_UNSET_FLAGS (image, GTK_CAN_FOCUS);
-	GTK_WIDGET_SET_FLAGS (image, GTK_NO_WINDOW);
-
-	image->details = g_new0 (NautilusImageDetails, 1);
-
-	image->details->pixbuf_opacity = NAUTILUS_OPACITY_FULLY_OPAQUE;
-	image->details->tile_opacity = NAUTILUS_OPACITY_FULLY_OPAQUE;
- 	image->details->tile_width = NAUTILUS_SMOOTH_TILE_EXTENT_FULL;
- 	image->details->tile_height = NAUTILUS_SMOOTH_TILE_EXTENT_FULL;
-	image->details->tile_mode_vertical = NAUTILUS_SMOOTH_TILE_SELF;
-	image->details->tile_mode_horizontal = NAUTILUS_SMOOTH_TILE_SELF;
-	image->details->background_mode = NAUTILUS_SMOOTH_BACKGROUND_GTK;
-
-	nautilus_smooth_widget_register (GTK_WIDGET (image));
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_image_destroy (GtkObject *object)
-{
- 	NautilusImage *image;
-	
-	g_return_if_fail (NAUTILUS_IS_IMAGE (object));
-
-	image = NAUTILUS_IMAGE (object);
-
-	nautilus_gdk_pixbuf_unref_if_not_null (image->details->tile_pixbuf);
-	image->details->tile_pixbuf = NULL;
-
-	g_free (image->details);
-
-	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-static void
-nautilus_image_set_arg (GtkObject *object,
-			GtkArg *arg,
-			guint arg_id)
-{
-	NautilusImage *image;
-	
-	g_return_if_fail (NAUTILUS_IS_IMAGE (object));
-
- 	image = NAUTILUS_IMAGE (object);
-
- 	switch (arg_id)
-	{
-	case ARG_IS_SMOOTH:
-		nautilus_image_set_is_smooth (image, GTK_VALUE_BOOL (*arg));
-		break;
-
-	case ARG_PIXBUF_OPACITY:
-		nautilus_image_set_pixbuf_opacity (image, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_BACKGROUND_MODE:
-		nautilus_image_set_background_mode (image, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_PIXBUF:
-		nautilus_image_set_pixbuf (image, (GdkPixbuf *) GTK_VALUE_POINTER (*arg));
-		break;
-
-	case ARG_TILE_OPACITY:
-		nautilus_image_set_tile_opacity (image, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_TILE_PIXBUF:
-		nautilus_image_set_tile_pixbuf (image, (GdkPixbuf *) GTK_VALUE_POINTER (*arg));
-		break;
-		
-	case ARG_TILE_WIDTH:
-		nautilus_image_set_tile_width (image, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_TILE_HEIGHT:
-		nautilus_image_set_tile_height (image, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_TILE_MODE_VERTICAL:
-		nautilus_image_set_tile_mode_vertical (image, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_TILE_MODE_HORIZONTAL:
-		nautilus_image_set_tile_mode_horizontal (image, GTK_VALUE_UINT (*arg));
-		break;
-
- 	default:
-		g_assert_not_reached ();
-	}
-}
-
-static void
-nautilus_image_get_arg (GtkObject *object,
-			GtkArg *arg,
-			guint arg_id)
-{
-	NautilusImage *image;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE (object));
-	
-	image = NAUTILUS_IMAGE (object);
-
- 	switch (arg_id)
-	{
-	case ARG_IS_SMOOTH:
-		GTK_VALUE_BOOL (*arg) = nautilus_image_get_is_smooth (image);
-		break;
-		
-	case ARG_PIXBUF_OPACITY:
-		GTK_VALUE_INT (*arg) = nautilus_image_get_pixbuf_opacity (image);
-		break;
-		
-	case ARG_BACKGROUND_MODE:
-		GTK_VALUE_UINT (*arg) = nautilus_image_get_background_mode (image);
-		break;
-		
-	case ARG_PIXBUF:
-		GTK_VALUE_POINTER (*arg) = nautilus_image_get_pixbuf (image);
-		break;
-
-	case ARG_TILE_OPACITY:
-		GTK_VALUE_INT (*arg) = nautilus_image_get_tile_opacity (image);
-		break;
-		
-	case ARG_TILE_PIXBUF:
-		GTK_VALUE_POINTER (*arg) = nautilus_image_get_tile_pixbuf (image);
-		break;
-
-	case ARG_TILE_WIDTH:
-		GTK_VALUE_INT (*arg) = nautilus_image_get_tile_width (image);
-		break;
-
-	case ARG_TILE_HEIGHT:
-		GTK_VALUE_INT (*arg) = nautilus_image_get_tile_height (image);
-		break;
-
-	case ARG_TILE_MODE_VERTICAL:
-		GTK_VALUE_UINT (*arg) = nautilus_image_get_tile_mode_vertical (image);
-		break;
-
-	case ARG_TILE_MODE_HORIZONTAL:
-		GTK_VALUE_UINT (*arg) = nautilus_image_get_tile_mode_horizontal (image);
-		break;
-
- 	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* GtkWidgetClass methods */
-static void
-nautilus_image_size_request (GtkWidget *widget,
-			     GtkRequisition *requisition)
-{
-	NautilusImage *image;
-
-	NautilusDimensions pixbuf_dimensions;
-	NautilusDimensions tile_dimensions;
-	NautilusDimensions preferred_dimensions;
-	
-	g_return_if_fail (NAUTILUS_IS_IMAGE (widget));
-	g_return_if_fail (requisition != NULL);
-	
- 	image = NAUTILUS_IMAGE (widget);
-	
-	pixbuf_dimensions = image_get_pixbuf_dimensions (image);
-	tile_dimensions = image_get_tile_dimensions (image);
-	preferred_dimensions = nautilus_smooth_widget_get_preferred_dimensions (widget,
-										&pixbuf_dimensions,
-										&tile_dimensions,
-										image->details->tile_width,
-										image->details->tile_height);
-   	requisition->width = preferred_dimensions.width;
-   	requisition->height = preferred_dimensions.height;
-}
-
-static void
-image_paint_pixbuf_callback (GtkWidget *widget,
-			     GdkDrawable *destination_drawable,
-			     GdkGC *gc,
-			     int source_x,
-			     int source_y,
-			     const ArtIRect *area,
-			     gpointer callback_data)
-{
-	NautilusImage *image;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (destination_drawable != NULL);
-	g_return_if_fail (gc != NULL);
-	g_return_if_fail (area != NULL && !art_irect_empty (area));
-
-	image = NAUTILUS_IMAGE (widget);
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (image->details->pixbuf));
-	
-	nautilus_gdk_pixbuf_draw_to_drawable (image->details->pixbuf,
-					      destination_drawable,
-					      gc,
-					      source_x,
-					      source_y,
-					      area,
-					      GDK_RGB_DITHER_NONE,
-					      GDK_PIXBUF_ALPHA_BILEVEL,
-					      NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
-}
-
-static void
-image_composite_pixbuf_callback (GtkWidget *widget,
-				 GdkPixbuf *destination_pixbuf,
-				 int source_x,
-				 int source_y,
-				 const ArtIRect *area,
-				 int opacity,
-				 gpointer callback_data)
-{
-	NautilusImage *image;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (destination_pixbuf != NULL);
-	g_return_if_fail (area != NULL && !art_irect_empty (area));
-
-	image = NAUTILUS_IMAGE (widget);
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (image->details->pixbuf));
-
-	nautilus_gdk_pixbuf_draw_to_pixbuf_alpha (image->details->pixbuf,
-						  destination_pixbuf,
-						  source_x,
-						  source_y,
-						  area,
-						  opacity,
-						  GDK_INTERP_BILINEAR);
-}	
-
-static int
-nautilus_image_expose_event (GtkWidget *widget,
-			     GdkEventExpose *event)
-{
- 	NautilusImage *image;
-	ArtIRect dirty_area;
-	ArtIRect screen_dirty_area;
-
-	ArtIRect pixbuf_bounds;
-	ArtIRect tile_bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (widget), TRUE);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
-	g_return_val_if_fail (event != NULL, TRUE);
-	g_return_val_if_fail (event->window == widget->window, TRUE);
-	
- 	image = NAUTILUS_IMAGE (widget);
-
-	pixbuf_bounds = image_get_pixbuf_bounds (image);
-	tile_bounds = nautilus_smooth_widget_get_tile_bounds (widget,
-							      image->details->tile_pixbuf,
-							      image->details->tile_width,
-							      image->details->tile_height);
-	
-	/* Check for the dumb case when theres nothing to do */
-	if (image->details->pixbuf == NULL && image->details->tile_pixbuf == NULL) {
-		return TRUE;
-	}
-
-	/* Clip the dirty area to the screen */
-	dirty_area = nautilus_gdk_rectangle_to_art_irect (&event->area);
-	screen_dirty_area = nautilus_gdk_window_clip_dirty_area_to_screen (event->window,
-										 &dirty_area);
-	/* Nothing to do */
-	if (art_irect_empty (&screen_dirty_area)) {
-		return TRUE;
-	}
-
-	/* Paint ourselves */
-	nautilus_smooth_widget_paint (widget,
-				      widget->style->white_gc,
-				      image_is_smooth (image),
-				      image->details->background_mode,
-				      image->details->solid_background_color,
-				      image->details->tile_pixbuf,
-				      &tile_bounds,
-				      image->details->tile_opacity,
-				      image->details->tile_mode_vertical,
-				      image->details->tile_mode_horizontal,
-				      &pixbuf_bounds,
-				      image->details->pixbuf_opacity,
-				      &screen_dirty_area,
-				      image_paint_pixbuf_callback,
-				      image_composite_pixbuf_callback,
-				      NULL);
-
-	return TRUE;
-}
-
-/* NautilusImage signals */
-static void
-nautilus_image_set_is_smooth_signal (GtkWidget *widget,
-				     gboolean is_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (widget));
-
-	nautilus_image_set_is_smooth (NAUTILUS_IMAGE (widget), is_smooth);
-}
-
-/* Private NautilusImage methods */
-static NautilusDimensions
-image_get_pixbuf_dimensions (const NautilusImage *image)
-{
-	NautilusDimensions pixbuf_dimensions;
-
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), NAUTILUS_DIMENSIONS_EMPTY);
-
-	if (!image->details->pixbuf) {
-		return NAUTILUS_DIMENSIONS_EMPTY;
-	}
-
-	pixbuf_dimensions.width = gdk_pixbuf_get_width (image->details->pixbuf);
-	pixbuf_dimensions.height = gdk_pixbuf_get_height (image->details->pixbuf);
-
-	return pixbuf_dimensions;
-}
-
-static ArtIRect
-image_get_pixbuf_bounds (const NautilusImage *image)
-{
-	NautilusDimensions pixbuf_dimensions;
-	ArtIRect pixbuf_bounds;
-	ArtIRect bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), NAUTILUS_ART_IRECT_EMPTY);
-
-	pixbuf_dimensions = image_get_pixbuf_dimensions (image);
-
-	if (nautilus_dimensions_empty (&pixbuf_dimensions)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-	
-	bounds = nautilus_gtk_widget_get_bounds (GTK_WIDGET (image));
-	
-	pixbuf_bounds = nautilus_art_irect_align (&bounds,
-						  pixbuf_dimensions.width,
-						  pixbuf_dimensions.height,
-						  GTK_MISC (image)->xalign,
-						  GTK_MISC (image)->yalign);
-
-	return pixbuf_bounds;
-}
-
-static NautilusDimensions
-image_get_tile_dimensions (const NautilusImage *image)
-{
-	NautilusDimensions tile_dimensions;
-
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), NAUTILUS_DIMENSIONS_EMPTY);
-
-	if (!image->details->tile_pixbuf) {
-		return NAUTILUS_DIMENSIONS_EMPTY;
-	}
-	
-	tile_dimensions.width = gdk_pixbuf_get_width (image->details->tile_pixbuf);
-	tile_dimensions.height = gdk_pixbuf_get_height (image->details->tile_pixbuf);
-
-	return tile_dimensions;
-}
-
-gboolean
-image_is_smooth (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), FALSE);
-
-	return !image->details->never_smooth && image->details->is_smooth;
-}
-
-/* Public NautilusImage methods */
-GtkWidget*
-nautilus_image_new (const char *file_name)
-{
-	NautilusImage *image;
-
-	image = NAUTILUS_IMAGE (gtk_widget_new (nautilus_image_get_type (), NULL));
-	
-	if (file_name != NULL) {
-		nautilus_image_set_pixbuf_from_file_name (image, file_name);
-	}
-
-	return GTK_WIDGET (image);
-}
-
-void
-nautilus_image_set_is_smooth (NautilusImage *image,
-			      gboolean is_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-
-	if (image->details->never_smooth) {
-		return;
-	}
-
-	if (image->details->is_smooth == is_smooth) {
-		return;
-	}
-
-	image->details->is_smooth = is_smooth;
-
-	/* We call queue_resize() instead queue_draw() because
-	 * we want the widget's background to be cleared of 
-	 * the previous pixbuf, even though the geometry of 
-	 * the image does not change.
-	 */ 
-	gtk_widget_queue_resize (GTK_WIDGET (image));
-}
-
-gboolean
-nautilus_image_get_is_smooth (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), FALSE);
-
-	return image_is_smooth (image);
-}
-
-/**
- * nautilus_image_set_tile_pixbuf:
- *
- * @image: A NautilusImage
- * @pixbuf:          The new tile pixbuf
- *
- * Change the tile pixbuf.  A 'pixbuf' value of NULL, means dont use a
- * tile pixbuf - this is the default behavior for the widget.
- */
-void
-nautilus_image_set_tile_pixbuf (NautilusImage *image,
-				GdkPixbuf *pixbuf)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	
-	if (pixbuf != image->details->tile_pixbuf) {
-		nautilus_gdk_pixbuf_unref_if_not_null (image->details->tile_pixbuf);
-		nautilus_gdk_pixbuf_ref_if_not_null (pixbuf);
-		
-		image->details->tile_pixbuf = pixbuf;
-
-		gtk_widget_queue_draw (GTK_WIDGET (image));
-	}
-}
-
-/**
- * nautilus_image_get_tile_pixbuf:
- *
- * @image: A NautilusImage
- *
- * Return value: A reference to the tile_pixbuf.  Needs to be unreferenced with 
- * gdk_pixbuf_unref()
- */
-GdkPixbuf*
-nautilus_image_get_tile_pixbuf (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), NULL);
-
-	nautilus_gdk_pixbuf_ref_if_not_null (image->details->tile_pixbuf);
-	
-	return image->details->tile_pixbuf;
-}
-
-void
-nautilus_image_set_pixbuf (NautilusImage *image,
-			   GdkPixbuf *pixbuf)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-
-	if (pixbuf != image->details->pixbuf) {
-		nautilus_gdk_pixbuf_unref_if_not_null (image->details->pixbuf);
-		nautilus_gdk_pixbuf_ref_if_not_null (pixbuf);
-		image->details->pixbuf = pixbuf;
-		gtk_widget_queue_resize (GTK_WIDGET (image));
-	}
-}
-
-void
-nautilus_image_set_pixbuf_from_file_name (NautilusImage *image,
-					  const char *file_name)
-{
-	GdkPixbuf *pixbuf;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	g_return_if_fail (file_name != NULL);
-
-	pixbuf = gdk_pixbuf_new_from_file (file_name);			
-	
-	if (pixbuf != NULL) {
-		nautilus_image_set_pixbuf (image, pixbuf);	
-		gdk_pixbuf_unref (pixbuf);
-	}
-}
-
-GdkPixbuf*
-nautilus_image_get_pixbuf (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), NULL);
-	
-	nautilus_gdk_pixbuf_ref_if_not_null (image->details->pixbuf);
-	
-	return image->details->pixbuf;
-}
-
-void
-nautilus_image_set_pixbuf_opacity (NautilusImage *image,
-				   int pixbuf_opacity)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	g_return_if_fail (pixbuf_opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (pixbuf_opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	if (image->details->pixbuf_opacity == pixbuf_opacity) {
-		return;
-	}
-
-	image->details->pixbuf_opacity = pixbuf_opacity;
-
-	gtk_widget_queue_draw (GTK_WIDGET (image));
-}
-
-int
-nautilus_image_get_pixbuf_opacity (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	return image->details->pixbuf_opacity;
-}
-
-void
-nautilus_image_set_tile_opacity (NautilusImage *image,
-				 int tile_opacity)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	g_return_if_fail (tile_opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (tile_opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	if (image->details->tile_opacity == tile_opacity) {
-		return;
-	}
-
-	image->details->tile_opacity = tile_opacity;
-
-	gtk_widget_queue_draw (GTK_WIDGET (image));
-}
-
-int
-nautilus_image_get_tile_opacity (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	return image->details->tile_opacity;
-}
-
-void
-nautilus_image_set_tile_width (NautilusImage *image,
-			       int tile_width)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	g_return_if_fail (tile_width >= NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP);
-	
-	if (image->details->tile_width == tile_width) {
-		return;
-	}
-
-	image->details->tile_width = tile_width;
-
-	gtk_widget_queue_resize (GTK_WIDGET (image));
-}
-
-/**
- * nautilus_image_get_tile_width:
- *
- * @image: A NautilusImage
- *
- * Return value: The tile width.
- */
-int
-nautilus_image_get_tile_width (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), 0);
-
-	return image->details->tile_width;
-}
-
-void
-nautilus_image_set_tile_height (NautilusImage *image,
-				int tile_height)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	g_return_if_fail (tile_height >= NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP);
-	
-	if (image->details->tile_height == tile_height) {
-		return;
-	}
-
-	image->details->tile_height = tile_height;
-
-	gtk_widget_queue_resize (GTK_WIDGET (image));
-}
-
-/**
- * nautilus_image_get_tile_height:
- *
- * @image: A NautilusImage
- *
- * Return value: The tile height.
- */
-int
-nautilus_image_get_tile_height (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), 0);
-
-	return image->details->tile_height;
-}
-
-void
-nautilus_image_set_tile_mode_vertical (NautilusImage *image,
-				       NautilusSmoothTileMode tile_mode_vertical)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	g_return_if_fail (tile_mode_vertical >= NAUTILUS_SMOOTH_TILE_SELF);
-	g_return_if_fail (tile_mode_vertical <= NAUTILUS_SMOOTH_TILE_ANCESTOR);
-
-	if (image->details->tile_mode_vertical == tile_mode_vertical) {
-		return;
-	}
-
-	image->details->tile_mode_vertical = tile_mode_vertical;
-
-	gtk_widget_queue_draw (GTK_WIDGET (image));
-}
-
-NautilusSmoothTileMode
-nautilus_image_get_tile_mode_vertical (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), 0);
-	
-	return image->details->tile_mode_vertical;
-}
-
-void
-nautilus_image_set_tile_mode_horizontal (NautilusImage *image,
-					 NautilusSmoothTileMode tile_mode_horizontal)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	g_return_if_fail (tile_mode_horizontal >= NAUTILUS_SMOOTH_TILE_SELF);
-	g_return_if_fail (tile_mode_horizontal <= NAUTILUS_SMOOTH_TILE_ANCESTOR);
-
-	if (image->details->tile_mode_horizontal == tile_mode_horizontal) {
-		return;
-	}
-
-	image->details->tile_mode_horizontal = tile_mode_horizontal;
-
-	gtk_widget_queue_draw (GTK_WIDGET (image));
-}
-
-NautilusSmoothTileMode
-nautilus_image_get_tile_mode_horizontal (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), 0);
-	
-	return image->details->tile_mode_horizontal;
-}
-
-void
-nautilus_image_set_tile_pixbuf_from_file_name (NautilusImage *image,
-					       const char *tile_file_name)
-{
-	GdkPixbuf *tile_pixbuf;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	g_return_if_fail (tile_file_name != NULL);
-
-	tile_pixbuf = gdk_pixbuf_new_from_file (tile_file_name);
-	
-	if (tile_pixbuf != NULL) {
-		nautilus_image_set_tile_pixbuf (image, tile_pixbuf);
-		gdk_pixbuf_unref (tile_pixbuf);
-	}
-}
-
-void
-nautilus_image_set_background_mode (NautilusImage *image,
-				    NautilusSmoothBackgroundMode background_mode)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	g_return_if_fail (background_mode >= NAUTILUS_SMOOTH_BACKGROUND_GTK);
-	g_return_if_fail (background_mode <= NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-
-	if (image->details->background_mode == background_mode) {
-		return;
-	}
-
-	image->details->background_mode = background_mode;
-
-	gtk_widget_queue_draw (GTK_WIDGET (image));
-}
-
-NautilusSmoothBackgroundMode
-nautilus_image_get_background_mode (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), 0);
-	
-	return image->details->background_mode;
-}
-
-void
-nautilus_image_set_solid_background_color (NautilusImage *image,
-					   guint32 solid_background_color)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-	
-	if (image->details->solid_background_color == solid_background_color) {
-		return;
-	}
-
-	image->details->solid_background_color = solid_background_color;
-	
-	gtk_widget_queue_draw (GTK_WIDGET (image));
-}
-
-guint32
-nautilus_image_get_solid_background_color (const NautilusImage *image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_IMAGE (image), 0);
-	
-	return image->details->solid_background_color;
-}
-
-/**
- * nautilus_image_new_solid:
- *
- * @pixbuf: A GdkPixbuf or NULL.
- * @x_alignment: Horizontal alignment.
- * @y_alignment: Vertical alignment.
- * @x_padding: Horizontal padding.
- * @y_padding: Vertical padding.
- * @background_color: Background color.
- * @tile_pixbuf: A GdkPixbuf or NULL.
- *
- * Create an image with a solid background.
- *
- * Return value: The newly allocated NautilusImage with the
- * given attributes.
- */
-GtkWidget *
-nautilus_image_new_solid (GdkPixbuf *pixbuf,
-			  float x_alignment,
-			  float y_alignment,
-			  int x_padding,
-			  int y_padding,
-			  guint32 background_color,
-			  GdkPixbuf *tile_pixbuf)
-{
-	NautilusImage *image;
-
- 	image = NAUTILUS_IMAGE (nautilus_image_new (NULL));
-	
-	if (pixbuf != NULL) {
-		nautilus_image_set_pixbuf (image, pixbuf);
-	}
-
-	nautilus_image_set_background_mode (image, NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	nautilus_image_set_solid_background_color (image, background_color);
-
-	gtk_misc_set_padding (GTK_MISC (image), x_padding, y_padding);
-	gtk_misc_set_alignment (GTK_MISC (image), x_alignment, y_alignment);
-	
-	if (tile_pixbuf != NULL) {
-		nautilus_image_set_tile_pixbuf (image, tile_pixbuf);
-	}
-	
-	return GTK_WIDGET (image);
-}
-
-
-/**
- * nautilus_image_set_never_smooth
- *
- * @image: A NautilusImage.
- * @never_smooth: A boolean value indicating whether the image can NEVER be smooth.
- *
- * Force an image to never be smooth.  Calls to nautilus_image_set_is_smooth () will
- * thus be ignored.  This is useful if you want to use a NautilusImage in a situation.
- */
-void
-nautilus_image_set_never_smooth (NautilusImage *image,
-				 gboolean never_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_IMAGE (image));
-
-	image->details->never_smooth = never_smooth;
-	gtk_widget_queue_resize (GTK_WIDGET (image));
-}
-
diff --git a/libnautilus-private/nautilus-image.h b/libnautilus-private/nautilus-image.h
deleted file mode 100644
index c5ffca43c..000000000
--- a/libnautilus-private/nautilus-image.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-image.h - A widget to smoothly display images.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_IMAGE_H
-#define NAUTILUS_IMAGE_H
-
-#include <gtk/gtkmisc.h>
-#include <libgnome/gnome-defs.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libart_lgpl/art_rect.h>
-#include <libnautilus-extensions/nautilus-smooth-widget.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_IMAGE            (nautilus_image_get_type ())
-#define NAUTILUS_IMAGE(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_IMAGE, NautilusImage))
-#define NAUTILUS_IMAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_IMAGE, NautilusImageClass))
-#define NAUTILUS_IS_IMAGE(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_IMAGE))
-#define NAUTILUS_IS_IMAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_IMAGE))
-
-typedef struct _NautilusImage	       NautilusImage;
-typedef struct _NautilusImageClass     NautilusImageClass;
-typedef struct _NautilusImageDetails   NautilusImageDetails;
-
-struct _NautilusImage
-{
-	/* Superclass */
-	GtkMisc misc;
-
-	/* Private things */
-	NautilusImageDetails *details;
-};
-
-struct _NautilusImageClass
-{
-	GtkMiscClass parent_class;
-
-	NautilusSmoothWidgetDrawBackground draw_background;
-	NautilusSmoothWidgetSetIsSmooth set_is_smooth;
-};
-
-GtkType                      nautilus_image_get_type                       (void);
-GtkWidget *                  nautilus_image_new                            (const char                   *file_name);
-GtkWidget *                  nautilus_image_new_solid                      (GdkPixbuf                    *pixbuf,
-									    float                         xalign,
-									    float                         yalign,
-									    int                           xpadding,
-									    int                           ypadding,
-									    guint32                       background_color,
-									    GdkPixbuf                    *tile_pixbuf);
-void                         nautilus_image_set_is_smooth                  (NautilusImage                *image,
-									    gboolean                      is_smooth);
-gboolean                     nautilus_image_get_is_smooth                  (const NautilusImage          *image);
-void                         nautilus_image_set_tile_pixbuf                (NautilusImage                *image,
-									    GdkPixbuf                    *pixbuf);
-void                         nautilus_image_set_tile_width                 (NautilusImage                *image,
-									    int                           tile_width);
-int                          nautilus_image_get_tile_width                 (const NautilusImage          *image);
-void                         nautilus_image_set_tile_height                (NautilusImage                *image,
-									    int                           tile_height);
-int                          nautilus_image_get_tile_height                (const NautilusImage          *image);
-void                         nautilus_image_set_tile_pixbuf_from_file_name (NautilusImage                *image,
-									    const char                   *tile_file_name);
-GdkPixbuf*                   nautilus_image_get_tile_pixbuf                (const NautilusImage          *image);
-void                         nautilus_image_set_tile_opacity               (NautilusImage                *image,
-									    int                           tile_opacity);
-int                          nautilus_image_get_tile_opacity               (const NautilusImage          *image);
-void                         nautilus_image_set_tile_mode_vertical         (NautilusImage                *image,
-									    NautilusSmoothTileMode        horizontal_tile_mode);
-NautilusSmoothTileMode       nautilus_image_get_tile_mode_vertical         (const NautilusImage          *image);
-void                         nautilus_image_set_tile_mode_horizontal       (NautilusImage                *image,
-									    NautilusSmoothTileMode        horizontal_tile_mode);
-NautilusSmoothTileMode       nautilus_image_get_tile_mode_horizontal       (const NautilusImage          *image);
-void                         nautilus_image_set_pixbuf                     (NautilusImage                *image,
-									    GdkPixbuf                    *pixbuf);
-void                         nautilus_image_set_pixbuf_from_file_name      (NautilusImage                *image,
-									    const char                   *file_name);
-GdkPixbuf*                   nautilus_image_get_pixbuf                     (const NautilusImage          *image);
-void                         nautilus_image_set_pixbuf_opacity             (NautilusImage                *image,
-									    int                           pixbuf_opacity);
-int                          nautilus_image_get_pixbuf_opacity             (const NautilusImage          *image);
-void                         nautilus_image_set_background_mode            (NautilusImage                *image,
-									    NautilusSmoothBackgroundMode  background_mode);
-NautilusSmoothBackgroundMode nautilus_image_get_background_mode            (const NautilusImage          *image);
-void                         nautilus_image_set_solid_background_color     (NautilusImage                *image,
-									    guint32                       solid_background_color);
-guint32                      nautilus_image_get_solid_background_color     (const NautilusImage          *image);
-void                         nautilus_image_set_never_smooth               (NautilusImage                *image,
-									    gboolean                      never_smooth);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_IMAGE_H */
-
-
diff --git a/libnautilus-private/nautilus-keep-last-vertical-box.c b/libnautilus-private/nautilus-keep-last-vertical-box.c
index c773fc1c8..a9036895b 100644
--- a/libnautilus-private/nautilus-keep-last-vertical-box.c
+++ b/libnautilus-private/nautilus-keep-last-vertical-box.c
@@ -26,14 +26,14 @@
 #include <config.h>
 #include "nautilus-keep-last-vertical-box.h"
 
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 static void     nautilus_keep_last_vertical_box_initialize_class  (NautilusKeepLastVerticalBoxClass *class);
 static void     nautilus_keep_last_vertical_box_initialize        (NautilusKeepLastVerticalBox      *box);
 static void	nautilus_keep_last_vertical_box_size_allocate 	  (GtkWidget 			    *widget, 
 								   GtkAllocation 		    *allocation);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusKeepLastVerticalBox, nautilus_keep_last_vertical_box, GTK_TYPE_VBOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusKeepLastVerticalBox, nautilus_keep_last_vertical_box, GTK_TYPE_VBOX)
 
 /* Standard class initialization function */
 static void
@@ -96,7 +96,7 @@ nautilus_keep_last_vertical_box_size_allocate (GtkWidget *widget,
 	g_return_if_fail (NAUTILUS_IS_KEEP_LAST_VERTICAL_BOX (widget));
 	g_return_if_fail (allocation != NULL);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
 
 	box = GTK_BOX (widget);
 	children = g_list_last (box->children);
diff --git a/libnautilus-private/nautilus-label-with-background.c b/libnautilus-private/nautilus-label-with-background.c
deleted file mode 100644
index 2e4820c76..000000000
--- a/libnautilus-private/nautilus-label-with-background.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-label-with-background.c - A NautilusLabel that uses NautilusBackground.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include <gtk/gtksignal.h>
-
-#include "nautilus-label-with-background.h"
-#include "nautilus-background.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-
-static void
-draw_background_callback (GtkWidget *widget,
-			  GdkPixbuf *buffer,
-			  const ArtIRect *area,
-			  gpointer callback_data)
-{
-	GtkWidget *background_ancestor;
-	NautilusBackground *background;
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (buffer));
-	g_return_if_fail (area != NULL);
-
-	background_ancestor = nautilus_gtk_widget_find_background_ancestor (widget);
-	g_return_if_fail (GTK_IS_WIDGET (background_ancestor));
-
-	background = nautilus_get_widget_background (background_ancestor);
-	g_return_if_fail (NAUTILUS_IS_BACKGROUND (background));
-	
-	nautilus_background_draw_to_pixbuf (background,
-					    buffer,
-					    area->x0,
-					    area->y0,
-					    area->x1 - area->x0,
-					    area->y1 - area->y0,
-					    background_ancestor->allocation.width,
-					    background_ancestor->allocation.height);
-}
-
-GtkWidget *
-nautilus_label_new_with_background (const char *text)
-{
-	GtkWidget *label;
-	
-	label = nautilus_label_new (text);
-
-	nautilus_label_set_background_mode (NAUTILUS_LABEL (label),
-					    NAUTILUS_SMOOTH_BACKGROUND_CALLBACK);
-	
-	gtk_signal_connect_while_alive (GTK_OBJECT (label),
-					"draw_background",
-					GTK_SIGNAL_FUNC (draw_background_callback),
-					NULL,
-					GTK_OBJECT (label));
-
-	return label;
-}
diff --git a/libnautilus-private/nautilus-label-with-background.h b/libnautilus-private/nautilus-label-with-background.h
deleted file mode 100644
index ac273a574..000000000
--- a/libnautilus-private/nautilus-label-with-background.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-label-with-background.h - A NautilusLabel that uses NautilusBackground.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_LABEL_BACKGROUND_H
-#define NAUTILUS_LABEL_BACKGROUND_H
-
-#include <libnautilus-extensions/nautilus-label.h>
-
-BEGIN_GNOME_DECLS
-
-GtkWidget *nautilus_label_new_with_background (const char *text);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_LABEL_BACKGROUND_H */
-
-
diff --git a/libnautilus-private/nautilus-label.c b/libnautilus-private/nautilus-label.c
deleted file mode 100644
index a5f5575ea..000000000
--- a/libnautilus-private/nautilus-label.c
+++ /dev/null
@@ -1,1971 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-label.c - A widget to display a anti aliased text.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-label.h"
-
-#include <libgnome/gnome-i18n.h>
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-#include "nautilus-string.h"
-#include "nautilus-smooth-text-layout.h"
-#include "nautilus-scalable-font-private.h"
-#include "nautilus-debug-drawing.h"
-#include <stdlib.h>
-
-/* These are arbitrary constants to catch insane values */
-#define MIN_SMOOTH_FONT_SIZE 5
-#define MAX_SMOOTH_FONT_SIZE 64
-
-#define DEFAULT_FONT_SIZE 14
-#define LINE_WRAP_SEPARATORS _(" -_,;.?/&")
-#define LINE_OFFSET 2
-
-#define SMOOTH_FONT_MULTIPLIER 1.3
-
-/* This magic string is copied from GtkLabel.  It lives there unlocalized as well. */
-#define DEFAULT_LINE_WRAP_WIDTH_TEXT "This is a good enough length for any line to have."
-
-/* Arguments */
-enum
-{
-	ARG_0,
-	
-	/* Deal with the GtkLabel arguments as well */
-	ARG_LABEL,
-	ARG_WRAP,
-	ARG_JUSTIFY,
-
-	ARG_BACKGROUND_MODE,
-	ARG_IS_SMOOTH,
-	ARG_TEXT_OPACITY,
-	ARG_SMOOTH_FONT,
-	ARG_SMOOTH_FONT_SIZE,
-	ARG_SMOOTH_TEXT_COLOR,
-	ARG_SMOOTH_DROP_SHADOW_OFFSET,
-	ARG_SMOOTH_DROP_SHADOW_COLOR,
-	ARG_SMOOTH_LINE_WRAP_WIDTH,
-	ARG_ADJUST_WRAP_ON_RESIZE,
-
-	ARG_TILE_HEIGHT,
-	ARG_TILE_MODE_HORIZONTAL,
-	ARG_TILE_MODE_VERTICAL,
-	ARG_TILE_OPACITY,
-	ARG_TILE_PIXBUF,
-	ARG_TILE_WIDTH
-};
-
-/* Signals */
-typedef enum
-{
-	DRAW_BACKGROUND,
-	SET_IS_SMOOTH,
-	LAST_SIGNAL
-} LabelSignal;
-
-/* Signals */
-static guint label_signals[LAST_SIGNAL] = { 0 };
-
-/* Detail member struct */
-struct _NautilusLabelDetails
-{
-	gboolean is_smooth;
-
-	/* Tile attributes */
-	GdkPixbuf *tile_pixbuf;
-	int tile_opacity;
-	int tile_width;
-	int tile_height;
-	NautilusSmoothTileMode tile_mode_vertical;
-	NautilusSmoothTileMode tile_mode_horizontal;
-
- 	/* Smooth attributes */
- 	NautilusScalableFont *smooth_font;
- 	int smooth_font_size;
-	guint32 smooth_text_color;
-	gint smooth_drop_shadow_offset;
-	guint32 smooth_drop_shadow_color;
- 	int smooth_line_wrap_width;
-	gboolean adjust_wrap_on_resize;
-
-	/* Text */
-  	int text_opacity;
-
-	/* Background */
-	NautilusSmoothBackgroundMode background_mode;
-	guint32 solid_background_color;
-
-	GdkPixbuf *solid_cache_pixbuf;
-	gboolean never_smooth;
-
-	NautilusSmoothTextLayout *smooth_text_layout;
-};
-
-/* GtkObjectClass methods */
-static void               nautilus_label_initialize_class     (NautilusLabelClass  *label_class);
-static void               nautilus_label_initialize           (NautilusLabel       *label);
-static void               nautilus_label_destroy              (GtkObject           *object);
-static void               nautilus_label_set_arg              (GtkObject           *object,
-							       GtkArg              *arg,
-							       guint                arg_id);
-static void               nautilus_label_get_arg              (GtkObject           *object,
-							       GtkArg              *arg,
-							       guint                arg_id);
-
-/* GtkWidgetClass methods */
-static void               nautilus_label_size_request         (GtkWidget           *widget,
-							       GtkRequisition      *requisition);
-static void               nautilus_label_size_allocate        (GtkWidget           *widget,
-							       GtkAllocation       *allocation);
-static int                nautilus_label_expose_event         (GtkWidget           *widget,
-							       GdkEventExpose      *event);
-
-/* NautilusLabel signals */
-static void               nautilus_label_set_is_smooth_signal (GtkWidget           *widget,
-							       gboolean             is_smooth);
-
-/* Private NautilusLabel things */
-const char *              label_peek_text                     (const NautilusLabel *label);
-static ArtIRect           label_get_text_bounds               (const NautilusLabel *label);
-static NautilusDimensions label_get_text_dimensions           (const NautilusLabel *label);
-static NautilusDimensions label_get_tile_dimensions           (const NautilusLabel *label);
-static int                label_get_default_line_wrap_width   (const NautilusLabel *label);
-static void               label_solid_cache_pixbuf_clear      (NautilusLabel       *label);
-static gboolean           label_can_cache_contents            (const NautilusLabel *label);
-static gboolean           label_is_smooth                     (const NautilusLabel *label);
-static void               label_smooth_text_ensure            (const NautilusLabel *label);
-static void               label_smooth_text_clear             (NautilusLabel       *label);
-static NautilusDimensions label_get_content_dimensions        (const NautilusLabel *label);
-static ArtIRect           label_get_content_bounds            (const NautilusLabel *label);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusLabel, nautilus_label, GTK_TYPE_LABEL)
-
-/* Class init methods */
-static void
-nautilus_label_initialize_class (NautilusLabelClass *label_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (label_class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (label_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_label_destroy;
-	object_class->set_arg = nautilus_label_set_arg;
-	object_class->get_arg = nautilus_label_get_arg;
-	
-	/* GtkWidgetClass */
-	widget_class->size_request = nautilus_label_size_request;
-	widget_class->size_allocate = nautilus_label_size_allocate;
-	widget_class->expose_event = nautilus_label_expose_event;
-
-	/* NautilusLabelClass */
-	label_class->set_is_smooth = nautilus_label_set_is_smooth_signal;
-
-	/* Signals */
-	label_signals[DRAW_BACKGROUND] = gtk_signal_new ("draw_background",
-							 GTK_RUN_LAST,
-							 object_class->type,
-							 0,
-							 gtk_marshal_NONE__POINTER_POINTER,
-							 GTK_TYPE_NONE, 
-							 2,
-							 GTK_TYPE_POINTER,
-							 GTK_TYPE_POINTER);
-
-	label_signals[SET_IS_SMOOTH] = gtk_signal_new ("set_is_smooth",
-						       GTK_RUN_LAST,
-						       object_class->type,
-						       GTK_SIGNAL_OFFSET (NautilusLabelClass, set_is_smooth),
-						       gtk_marshal_NONE__BOOL,
-						       GTK_TYPE_NONE, 
-						       1,
-						       GTK_TYPE_BOOL);
-
-	gtk_object_class_add_signals (object_class, label_signals, LAST_SIGNAL);
-
-	/* Arguments */
-	gtk_object_add_arg_type ("NautilusLabel::tile_pixbuf",
-				 GTK_TYPE_POINTER,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_PIXBUF);
-	gtk_object_add_arg_type ("NautilusLabel::tile_opacity",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_OPACITY);
-	gtk_object_add_arg_type ("NautilusLabel::tile_width",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_WIDTH);
-	gtk_object_add_arg_type ("NautilusLabel::tile_height",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_HEIGHT);
-	gtk_object_add_arg_type ("NautilusLabel::tile_mode_vertical",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_MODE_VERTICAL);
-	gtk_object_add_arg_type ("NautilusLabel::tile_mode_horizontal",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_TILE_MODE_HORIZONTAL);
-	gtk_object_add_arg_type ("NautilusLabel::label",
-				 GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE,
-				 ARG_LABEL);
-	gtk_object_add_arg_type ("NautilusLabel::wrap",
-				 GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE,
-				 ARG_WRAP);
-	gtk_object_add_arg_type ("NautilusLabel::justify",
-				 GTK_TYPE_JUSTIFICATION,
-				 GTK_ARG_READWRITE,
-				 ARG_JUSTIFY);
-	gtk_object_add_arg_type ("NautilusLabel::is_smooth",
-				 GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE,
-				 ARG_IS_SMOOTH);
-	gtk_object_add_arg_type ("NautilusLabel::text_opacity",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_TEXT_OPACITY);
-	gtk_object_add_arg_type ("NautilusLabel::background_mode",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_BACKGROUND_MODE);
-	gtk_object_add_arg_type ("NautilusLabel::smooth_font",
-				 GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE,
-				 ARG_SMOOTH_FONT);
-	gtk_object_add_arg_type ("NautilusLabel::smooth_font_size",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_SMOOTH_FONT_SIZE);
-	gtk_object_add_arg_type ("NautilusLabel::smooth_text_color",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_SMOOTH_TEXT_COLOR);
-	gtk_object_add_arg_type ("NautilusLabel::smooth_drop_shadow_offset",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_SMOOTH_DROP_SHADOW_OFFSET);
-	gtk_object_add_arg_type ("NautilusLabel::smooth_drop_shadow_color",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_SMOOTH_DROP_SHADOW_COLOR);
-	gtk_object_add_arg_type ("NautilusLabel::smooth_line_wrap_width",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_SMOOTH_LINE_WRAP_WIDTH);
-	gtk_object_add_arg_type ("NautilusLabel::adjust_wrap_on_resize",
-				 GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE,
-				 ARG_ADJUST_WRAP_ON_RESIZE);
-
-	/* Make this class inherit the same kind of theme stuff as GtkLabel */
-	nautilus_gtk_class_name_make_like_existing_type ("NautilusLabel", GTK_TYPE_LABEL);
-
-	/* Let the smooth widget machinery know that our class can be smooth */
-	nautilus_smooth_widget_register_type (NAUTILUS_TYPE_LABEL);
-}
-
-void
-nautilus_label_initialize (NautilusLabel *label)
-{
-	GTK_WIDGET_UNSET_FLAGS (label, GTK_CAN_FOCUS);
-	GTK_WIDGET_SET_FLAGS (label, GTK_NO_WINDOW);
-
-	label->details = g_new0 (NautilusLabelDetails, 1);
-
-	label->details->text_opacity = NAUTILUS_OPACITY_FULLY_OPAQUE;
-	label->details->smooth_font = nautilus_scalable_font_get_default_font ();
- 	label->details->smooth_font_size = DEFAULT_FONT_SIZE;
-	label->details->smooth_text_color = NAUTILUS_RGBA_COLOR_PACK (0, 0, 0, 255);
-	label->details->smooth_drop_shadow_color = NAUTILUS_RGBA_COLOR_PACK (255, 255, 255, 255);
-	label->details->smooth_line_wrap_width = label_get_default_line_wrap_width (label);
-
-	label->details->tile_opacity = NAUTILUS_OPACITY_FULLY_OPAQUE;
- 	label->details->tile_width = NAUTILUS_SMOOTH_TILE_EXTENT_FULL;
- 	label->details->tile_height = NAUTILUS_SMOOTH_TILE_EXTENT_FULL;
-	label->details->tile_mode_vertical = NAUTILUS_SMOOTH_TILE_SELF;
-	label->details->tile_mode_horizontal = NAUTILUS_SMOOTH_TILE_SELF;
-	label->details->background_mode = NAUTILUS_SMOOTH_BACKGROUND_GTK;
-
-	nautilus_smooth_widget_register (GTK_WIDGET (label));
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_label_destroy (GtkObject *object)
-{
- 	NautilusLabel *label;
-	
-	g_return_if_fail (NAUTILUS_IS_LABEL (object));
-
-	label = NAUTILUS_LABEL (object);
-
-	nautilus_gdk_pixbuf_unref_if_not_null (label->details->tile_pixbuf);
-	label->details->tile_pixbuf = NULL;
-	label_solid_cache_pixbuf_clear (label);
-	label_smooth_text_clear (label);
-	g_free (label->details);
-
-	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-static void
-nautilus_label_set_arg (GtkObject *object,
-			GtkArg *arg,
-			guint arg_id)
-{
-	NautilusLabel *label;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (object));
-
- 	label = NAUTILUS_LABEL (object);
-
- 	switch (arg_id)
-	{
-
-	case ARG_TILE_OPACITY:
-		nautilus_label_set_tile_opacity (label, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_TILE_PIXBUF:
-		nautilus_label_set_tile_pixbuf (label, (GdkPixbuf *) GTK_VALUE_POINTER (*arg));
-		break;
-		
-	case ARG_TILE_WIDTH:
-		nautilus_label_set_tile_width (label, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_TILE_HEIGHT:
-		nautilus_label_set_tile_height (label, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_TILE_MODE_VERTICAL:
-		nautilus_label_set_tile_mode_vertical (label, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_TILE_MODE_HORIZONTAL:
-		nautilus_label_set_tile_mode_horizontal (label, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_LABEL:
-		nautilus_label_set_text (label, GTK_VALUE_STRING (*arg));
-		break;
-		
-	case ARG_WRAP:
-		nautilus_label_set_wrap (label, GTK_VALUE_BOOL (*arg));
-		break;
-		
-	case ARG_JUSTIFY:
-		nautilus_label_set_justify (label, GTK_VALUE_ENUM (*arg));
-		break;
-		
-	case ARG_IS_SMOOTH:
-		nautilus_label_set_is_smooth (label, GTK_VALUE_BOOL (*arg));
-		break;
-
-	case ARG_TEXT_OPACITY:
-		nautilus_label_set_text_opacity (label, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_BACKGROUND_MODE:
-		nautilus_label_set_background_mode (label, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_SMOOTH_FONT:
-		nautilus_label_set_smooth_font (label, (NautilusScalableFont *) GTK_VALUE_OBJECT (*arg));
-		break;
-
-	case ARG_SMOOTH_FONT_SIZE:
-		nautilus_label_set_smooth_font_size (label, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_SMOOTH_TEXT_COLOR:
-		nautilus_label_set_text_color (label, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_SMOOTH_DROP_SHADOW_OFFSET:
-		nautilus_label_set_smooth_drop_shadow_offset (label, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_SMOOTH_DROP_SHADOW_COLOR:
-		nautilus_label_set_smooth_drop_shadow_color (label, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_SMOOTH_LINE_WRAP_WIDTH:
-		nautilus_label_set_smooth_line_wrap_width (label, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_ADJUST_WRAP_ON_RESIZE:
-		nautilus_label_set_adjust_wrap_on_resize (label, GTK_VALUE_BOOL (*arg));
-		break;
-
- 	default:
-		g_assert_not_reached ();
-	}
-}
-
-static void
-nautilus_label_get_arg (GtkObject *object,
-			GtkArg *arg,
-			guint arg_id)
-{
-	NautilusLabel	*label;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (object));
-	
-	label = NAUTILUS_LABEL (object);
-
- 	switch (arg_id)
-	{
-	case ARG_TILE_OPACITY:
-		GTK_VALUE_INT (*arg) = nautilus_label_get_tile_opacity (label);
-		break;
-		
-	case ARG_TILE_PIXBUF:
-		GTK_VALUE_POINTER (*arg) = nautilus_label_get_tile_pixbuf (label);
-		break;
-
-	case ARG_TILE_WIDTH:
-		GTK_VALUE_INT (*arg) = nautilus_label_get_tile_width (label);
-		break;
-
-	case ARG_TILE_HEIGHT:
-		GTK_VALUE_INT (*arg) = nautilus_label_get_tile_height (label);
-		break;
-
-	case ARG_TILE_MODE_VERTICAL:
-		GTK_VALUE_UINT (*arg) = nautilus_label_get_tile_mode_vertical (label);
-		break;
-
-	case ARG_TILE_MODE_HORIZONTAL:
-		GTK_VALUE_UINT (*arg) = nautilus_label_get_tile_mode_horizontal (label);
-		break;
-
-	case ARG_LABEL:
-		GTK_VALUE_STRING (*arg) = nautilus_label_get_text (label);
-		break;
-
-	case ARG_WRAP:
-		GTK_VALUE_BOOL (*arg) = nautilus_label_get_wrap (label);
-		break;
-
-	case ARG_JUSTIFY:
-		GTK_VALUE_ENUM (*arg) = nautilus_label_get_text_justify (label);
-		break;
-
-	case ARG_IS_SMOOTH:
-		GTK_VALUE_BOOL (*arg) = nautilus_label_get_is_smooth (label);
-		break;
-		
-	case ARG_TEXT_OPACITY:
-		GTK_VALUE_INT (*arg) = nautilus_label_get_text_opacity (label);
-		break;
-		
-	case ARG_BACKGROUND_MODE:
-		GTK_VALUE_UINT (*arg) = nautilus_label_get_background_mode (label);
-		break;
-
-	case ARG_SMOOTH_FONT:
-		GTK_VALUE_OBJECT (*arg) = (GtkObject *) nautilus_label_get_smooth_font (label);
-		break;
-
-	case ARG_SMOOTH_FONT_SIZE:
-		GTK_VALUE_INT (*arg) = nautilus_label_get_smooth_font_size (label);
-		break;
-
-	case ARG_SMOOTH_TEXT_COLOR:
-		GTK_VALUE_UINT (*arg) = nautilus_label_get_text_color (label);
-		break;
-
-	case ARG_SMOOTH_DROP_SHADOW_OFFSET:
-		GTK_VALUE_INT (*arg) = nautilus_label_get_smooth_drop_shadow_offset (label);
-		break;
-
-	case ARG_SMOOTH_DROP_SHADOW_COLOR:
-		GTK_VALUE_UINT (*arg) = nautilus_label_get_smooth_drop_shadow_color (label);
-		break;
-
-	case ARG_SMOOTH_LINE_WRAP_WIDTH:
-		GTK_VALUE_INT (*arg) = nautilus_label_get_smooth_line_wrap_width (label);
-		break;
-
-	case ARG_ADJUST_WRAP_ON_RESIZE:
-		GTK_VALUE_BOOL (*arg) = nautilus_label_get_adjust_wrap_on_resize (label);
-		break;
-
- 	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* GtkWidgetClass methods */
-static void
-nautilus_label_size_request (GtkWidget *widget,
-			     GtkRequisition *requisition)
-{
-	NautilusLabel *label;
-
-	NautilusDimensions content_dimensions;
-	NautilusDimensions tile_dimensions;
-	NautilusDimensions preferred_dimensions;
-	
-	g_return_if_fail (NAUTILUS_IS_LABEL (widget));
-	g_return_if_fail (requisition != NULL);
-
- 	label = NAUTILUS_LABEL (widget);
-
-	if (!label_is_smooth (label)) {
-		NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_request, (widget, requisition));
-		return;
-	}
-	
-	content_dimensions = label_get_content_dimensions (label);
-	tile_dimensions = label_get_tile_dimensions (label);
-
-	preferred_dimensions = nautilus_smooth_widget_get_preferred_dimensions (widget,
-										&content_dimensions,
-										&tile_dimensions,
-										label->details->tile_width,
-										label->details->tile_height);
-   	requisition->width = preferred_dimensions.width;
-   	requisition->height = preferred_dimensions.height;
-}
-
-static void
-nautilus_label_size_allocate (GtkWidget *widget,
-			      GtkAllocation *allocation)
-{
-	NautilusLabel *label;
-	
- 	g_return_if_fail (NAUTILUS_IS_LABEL (widget));
- 	g_return_if_fail (allocation != NULL);
-	
-  	label = NAUTILUS_LABEL (widget);
-	
-	/* Pre chain size_allocate */
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
-
-	/* Update the wrap width if needed */
-	if (label->details->adjust_wrap_on_resize) {
-		label->details->smooth_line_wrap_width = (int) allocation->width;
- 		if (label->details->smooth_text_layout != NULL) {
- 			nautilus_smooth_text_layout_set_line_wrap_width (label->details->smooth_text_layout,
- 									 label->details->smooth_line_wrap_width);
- 		}
-		label_solid_cache_pixbuf_clear (label);
-	}
-}
-
-/* Painting callback for non smooth case */
-static void
-label_paint_pixbuf_callback (GtkWidget *widget,
-			     GdkDrawable *destination_drawable,
-			     GdkGC *gc,
-			     int source_x,
-			     int source_y,
-			     const ArtIRect *area,
-			     gpointer callback_data)
-{
-	NautilusLabel *label;
-	const ArtIRect *screen_dirty_area;
-	GdkEventExpose event;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (destination_drawable != NULL);
-	g_return_if_fail (gc != NULL);
-	g_return_if_fail (area != NULL && !art_irect_empty (area));
-
-	label = NAUTILUS_LABEL (widget);
-
-	screen_dirty_area = callback_data;
-
-	event.type = GDK_EXPOSE;
-	event.send_event = TRUE;
-	event.window = widget->window;
-	event.area = nautilus_art_irect_to_gdk_rectangle (screen_dirty_area);
-	event.count = 0;
-
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, expose_event, (widget, &event));
-}
-
-/* Compositing callback for smooth case */
-static void
-label_composite_text_callback_cached (GtkWidget *widget,
-				      GdkPixbuf *destination_pixbuf,
-				      int source_x,
-				      int source_y,
-				      const ArtIRect *area,
-				      int opacity,
-				      gpointer callback_data)
-{
-	NautilusLabel *label;
-	NautilusDimensions content_dimensions;
-	ArtIRect cache_pixbuf_area;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (destination_pixbuf != NULL);
-	g_return_if_fail (area != NULL && !art_irect_empty (area));
-	
-	label = NAUTILUS_LABEL (widget);
-
-	g_return_if_fail (label_can_cache_contents (label));
-
-	content_dimensions = label_get_content_dimensions (label);
-
-	g_return_if_fail (!nautilus_dimensions_empty (&content_dimensions));
-
-	if (label->details->solid_cache_pixbuf == NULL) {
-		label->details->solid_cache_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
-								     FALSE,
-								     8,
-								     content_dimensions.width,
-								     content_dimensions.height);
-		
-		nautilus_gdk_pixbuf_fill_rectangle_with_color (label->details->solid_cache_pixbuf,
-							       NULL,
-							       label->details->solid_background_color);
-		
-		cache_pixbuf_area = nautilus_gdk_pixbuf_intersect (label->details->solid_cache_pixbuf,
-								   0,
-								   0,
-								   NULL);
-		g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (label->details->smooth_text_layout));
-			
-		if (label->details->smooth_drop_shadow_offset > 0) {
-			cache_pixbuf_area.x0 += label->details->smooth_drop_shadow_offset;
-			cache_pixbuf_area.y0 += label->details->smooth_drop_shadow_offset;
-			nautilus_smooth_text_layout_draw_to_pixbuf (label->details->smooth_text_layout,
-								    label->details->solid_cache_pixbuf,
-								    0,
-								    0,
-								    &cache_pixbuf_area,
-								    nautilus_label_get_text_justify (label),
-								    FALSE,
-								    label->details->smooth_drop_shadow_color,
-								    label->details->text_opacity);
-			cache_pixbuf_area.x0 -= label->details->smooth_drop_shadow_offset;
-			cache_pixbuf_area.y0 -= label->details->smooth_drop_shadow_offset;
-		}
-		
-		nautilus_smooth_text_layout_draw_to_pixbuf (label->details->smooth_text_layout,
-							    label->details->solid_cache_pixbuf,
-							    0,
-							    0,
-							    &cache_pixbuf_area,
-							    nautilus_label_get_text_justify (label),
-							    FALSE,
-							    label->details->smooth_text_color,
-							    label->details->text_opacity);
-	}
-
-	g_return_if_fail (label->details->solid_cache_pixbuf != NULL);
-	
-	nautilus_gdk_pixbuf_draw_to_pixbuf (label->details->solid_cache_pixbuf,
-					    destination_pixbuf,
-					    source_x,
-					    source_y,
-					    area);
-}
-
-static void
-label_composite_text_callback (GtkWidget *widget,
-			       GdkPixbuf *destination_pixbuf,
-			       int source_x,
-			       int source_y,
-			       const ArtIRect *area,
-			       int opacity,
-			       gpointer callback_data)
-{
-	NautilusLabel *label;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (destination_pixbuf != NULL);
-	g_return_if_fail (area != NULL && !art_irect_empty (area));
-
-	label = NAUTILUS_LABEL (widget);
-
-	g_return_if_fail (!label_can_cache_contents (label));
-
-	nautilus_smooth_text_layout_draw_to_pixbuf (label->details->smooth_text_layout,
-						    destination_pixbuf,
-						    source_x,
-						    source_y,
-						    area,
-						    nautilus_label_get_text_justify (label),
-						    FALSE,
-						    label->details->smooth_text_color,
-						    label->details->text_opacity);
-}
-
-static void
-label_composite_text_and_shadow_callback (GtkWidget *widget,
-					  GdkPixbuf *destination_pixbuf,
-					  int source_x,
-					  int source_y,
-					  const ArtIRect *area,
-					  int opacity,
-					  gpointer callback_data)
-{
-	NautilusLabel *label;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (destination_pixbuf != NULL);
-	g_return_if_fail (area != NULL && !art_irect_empty (area));
-
-	label = NAUTILUS_LABEL (widget);
-
-	g_return_if_fail (!label_can_cache_contents (label));
-
-	nautilus_smooth_text_layout_draw_to_pixbuf_shadow (label->details->smooth_text_layout,
-							   destination_pixbuf,
-							   source_x,
-							   source_y,
-							   area,
-							   label->details->smooth_drop_shadow_offset,
-							   nautilus_label_get_text_justify (label),
-							   FALSE,
-							   label->details->smooth_text_color,
-							   label->details->smooth_drop_shadow_color,
-							   label->details->text_opacity);
-}
-
-static void
-label_paint (NautilusLabel *label,
-	     const ArtIRect *screen_dirty_area,
-	     const ArtIRect *tile_bounds)
-{
-	ArtIRect widget_bounds;
-	
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (GTK_WIDGET_REALIZED (label));
-	g_return_if_fail (screen_dirty_area != NULL);
-	g_return_if_fail (tile_bounds != NULL);
-	
-	/* The smooth and non smooth bounds are different.  We have
-	 * no way to have GtkLabel tell us what its bounds are.
-	 * So, we cheat and pretend that for the non smooth case,
-	 * the text bounds are the whole widget.
-	 *
-	 * This works because the smooth widget paint handler will
-	 * properly intersect these bounds and call the paint 
-	 * callback.  We feed the paint callback the actual gdk
-	 * expose event so that we feed the exact exposure area
-	 * to GtkLabel's expose_event.
-	 */
-	widget_bounds = nautilus_gtk_widget_get_bounds (GTK_WIDGET (label));
-
-	/* Make sure the area is screen visible before painting */
-	nautilus_smooth_widget_paint (GTK_WIDGET (label),
-				      GTK_WIDGET (label)->style->white_gc,
-				      FALSE,
-				      label->details->background_mode,
-				      label->details->solid_background_color,
-				      label->details->tile_pixbuf,
-				      tile_bounds,
-				      label->details->tile_opacity,
-				      label->details->tile_mode_vertical,
-				      label->details->tile_mode_horizontal,
-				      &widget_bounds,
-				      label->details->text_opacity,
-				      screen_dirty_area,
-				      label_paint_pixbuf_callback,
-				      label_composite_text_callback,
-				      (gpointer) screen_dirty_area);
-}
-
-static void
-paint_label_smooth (NautilusLabel *label,
-		    const ArtIRect *screen_dirty_area,
-		    const ArtIRect *tile_bounds)
-{
-	ArtIRect text_bounds;
-	ArtIRect content_bounds;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (GTK_WIDGET_REALIZED (label));
-	g_return_if_fail (screen_dirty_area != NULL);
-	g_return_if_fail (tile_bounds != NULL);
-
-	if (label->details->smooth_drop_shadow_offset > 0) {
-		/* Paint the text and shadow if needed */
-		content_bounds = label_get_content_bounds (label);
-		if (!art_irect_empty (&content_bounds)) {
-			nautilus_smooth_widget_paint (GTK_WIDGET (label),
-						      GTK_WIDGET (label)->style->white_gc,
-						      TRUE,
-						      label->details->background_mode,
-						      label->details->solid_background_color,
-						      label->details->tile_pixbuf,
-						      tile_bounds,
-						      label->details->tile_opacity,
-						      label->details->tile_mode_vertical,
-						      label->details->tile_mode_horizontal,
-						      &content_bounds,
-						      label->details->text_opacity,
-						      screen_dirty_area,
-						      label_paint_pixbuf_callback,
-						      label_composite_text_and_shadow_callback,
-						      NULL);
-		}
-	} else {
-		/* Paint the text if needed */
-		text_bounds = label_get_text_bounds (label);
-		nautilus_smooth_widget_paint (GTK_WIDGET (label),
-					      GTK_WIDGET (label)->style->white_gc,
-					      TRUE,
-					      label->details->background_mode,
-					      label->details->solid_background_color,
-					      label->details->tile_pixbuf,
-					      tile_bounds,
-					      label->details->tile_opacity,
-					      label->details->tile_mode_vertical,
-					      label->details->tile_mode_horizontal,
-					      &text_bounds,
-					      label->details->text_opacity,
-					      screen_dirty_area,
-					      label_paint_pixbuf_callback,
-					      label_composite_text_callback,
-					      NULL);
-	}
-}
-
-static void
-paint_label_smooth_cached (NautilusLabel *label,
-			   const ArtIRect *screen_dirty_area,
-			   const ArtIRect *tile_bounds)
-{
-	ArtIRect content_bounds;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (GTK_WIDGET_REALIZED (label));
-	g_return_if_fail (screen_dirty_area != NULL);
-	g_return_if_fail (tile_bounds != NULL);
-	g_return_if_fail (label_can_cache_contents (label));
-
-	content_bounds = label_get_content_bounds (label);
-
-	nautilus_smooth_widget_paint (GTK_WIDGET (label),
-				      GTK_WIDGET (label)->style->white_gc,
-				      TRUE,
-				      label->details->background_mode,
-				      label->details->solid_background_color,
-				      label->details->tile_pixbuf,
-				      tile_bounds,
-				      label->details->tile_opacity,
-				      label->details->tile_mode_vertical,
-				      label->details->tile_mode_horizontal,
-				      &content_bounds,
-				      label->details->text_opacity,
-				      screen_dirty_area,
-				      label_paint_pixbuf_callback,
-				      label_composite_text_callback_cached,
-				      NULL);
-}
-
-static int
-nautilus_label_expose_event (GtkWidget *widget,
-			     GdkEventExpose *event)
-{
- 	NautilusLabel *label;
-	ArtIRect dirty_area;
-	ArtIRect screen_dirty_area;
-	ArtIRect tile_bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (widget), TRUE);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
-	g_return_val_if_fail (event != NULL, TRUE);
-	g_return_val_if_fail (event->window == widget->window, TRUE);
-	
- 	label = NAUTILUS_LABEL (widget);
-
-	/* Check for the dumb case when theres nothing to do */
-	if (nautilus_strlen (label_peek_text (label)) == 0 && label->details->tile_pixbuf == NULL) {
-		return TRUE;
-	}
-
-	/* Clip the dirty area to the screen */
-	dirty_area = nautilus_gdk_rectangle_to_art_irect (&event->area);
-	screen_dirty_area = nautilus_gdk_window_clip_dirty_area_to_screen (event->window,
-									   &dirty_area);
-
-	/* Bail if no work */
-	if (art_irect_empty (&screen_dirty_area)) {
-		return TRUE;
-	}
-
-	/* Fetch the tile bounds */
-	tile_bounds = nautilus_smooth_widget_get_tile_bounds (widget,
-							      label->details->tile_pixbuf,
-							      label->details->tile_width,
-							      label->details->tile_height);
-
-	/* Paint GtkLabel */
-	if (!label_is_smooth (label)) {
-		label_paint (label, &screen_dirty_area, &tile_bounds);
-		return TRUE;
-	}
-
-	/* Paint smooth */
-	if (label_can_cache_contents (label)) {
-		paint_label_smooth_cached (label, &screen_dirty_area, &tile_bounds);
-	} else {
-		paint_label_smooth (label, &screen_dirty_area, &tile_bounds);	
-	}
-
-	return TRUE;
-}
-
-/* NautilusLabel signals */
-static void
-nautilus_label_set_is_smooth_signal (GtkWidget *widget,
-				     gboolean is_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (widget));
-
-	nautilus_label_set_is_smooth (NAUTILUS_LABEL (widget), is_smooth);
-}
-
-/* Private NautilusLabel things */
-static int
-label_get_default_line_wrap_width (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-	
-	return nautilus_scalable_font_text_width (label->details->smooth_font,
-						  label->details->smooth_font_size,
-						  DEFAULT_LINE_WRAP_WIDTH_TEXT,
-						  strlen (DEFAULT_LINE_WRAP_WIDTH_TEXT));
-}
-
-static NautilusDimensions
-label_get_text_dimensions (const NautilusLabel *label)
-{
-	NautilusDimensions text_dimensions;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NAUTILUS_DIMENSIONS_EMPTY);
-	label_smooth_text_ensure (label);
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (label->details->smooth_text_layout), NAUTILUS_DIMENSIONS_EMPTY);
-
-	text_dimensions = nautilus_smooth_text_layout_get_dimensions (label->details->smooth_text_layout);
-
-	return text_dimensions;
-}
-
-static ArtIRect
-label_get_text_bounds (const NautilusLabel *label)
-{
-	ArtIRect content_bounds;
-	NautilusDimensions text_dimensions;
-	ArtIRect text_bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NAUTILUS_ART_IRECT_EMPTY);
-	
-	content_bounds = label_get_content_bounds (label);
-	text_dimensions = label_get_text_dimensions (label);
-
-	if (nautilus_dimensions_empty (&text_dimensions)
-	    || art_irect_empty (&content_bounds)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-	
-	nautilus_art_irect_assign (&text_bounds,
-				   content_bounds.x0,
-				   content_bounds.y0,
-				   text_dimensions.width,
-				   text_dimensions.height);
-
-	return text_bounds;
-}
-
-static NautilusDimensions
-label_get_content_dimensions (const NautilusLabel *label)
-{
-	NautilusDimensions text_dimensions;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NAUTILUS_DIMENSIONS_EMPTY);
-
-	text_dimensions = label_get_text_dimensions (label);
-	text_dimensions.width += label->details->smooth_drop_shadow_offset;
-	text_dimensions.height += label->details->smooth_drop_shadow_offset;
-
-	return text_dimensions;
-}
-
-static ArtIRect
-label_get_content_bounds (const NautilusLabel *label)
-{
-	NautilusDimensions content_dimensions;
-	ArtIRect text_bounds;
-	ArtIRect bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NAUTILUS_ART_IRECT_EMPTY);
-
-	content_dimensions = label_get_content_dimensions (label);
-
-	if (nautilus_dimensions_empty (&content_dimensions)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-	
-	bounds = nautilus_gtk_widget_get_bounds (GTK_WIDGET (label));
-	
-	text_bounds = nautilus_art_irect_align (&bounds,
-						content_dimensions.width,
-						content_dimensions.height,
-						GTK_MISC (label)->xalign,
-						GTK_MISC (label)->yalign);
-		
-
-	return text_bounds;
-}
-
-static NautilusDimensions
-label_get_tile_dimensions (const NautilusLabel *label)
-{
-	NautilusDimensions tile_dimensions;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NAUTILUS_DIMENSIONS_EMPTY);
-
-	if (!label->details->tile_pixbuf) {
-		return NAUTILUS_DIMENSIONS_EMPTY;
-	}
-	
-	tile_dimensions.width = gdk_pixbuf_get_width (label->details->tile_pixbuf);
-	tile_dimensions.height = gdk_pixbuf_get_height (label->details->tile_pixbuf);
-
-	return tile_dimensions;
-}
-
-static void
-label_solid_cache_pixbuf_clear (NautilusLabel *label)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	nautilus_gdk_pixbuf_unref_if_not_null (label->details->solid_cache_pixbuf);
-	label->details->solid_cache_pixbuf = NULL;
-}
-
-static gboolean
-label_can_cache_contents (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), FALSE);
-
-	return (label->details->background_mode == NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR)
-		&& !label->details->tile_pixbuf;
-}
-
-const char *
-label_peek_text (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NULL);
-
-	return GTK_LABEL (label)->label;
-}
-
-static void
-label_smooth_text_ensure (const NautilusLabel *label)
-{
-	const char *text;
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	if (label->details->smooth_text_layout != NULL) {
-		return;
-	}
-
-	text = label_peek_text (label);
-	label->details->smooth_text_layout = nautilus_smooth_text_layout_new (text,
-									      nautilus_strlen (text),
-									      label->details->smooth_font,
-									      label->details->smooth_font_size,
-									      nautilus_label_get_wrap (label));
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (label->details->smooth_text_layout));
-	nautilus_smooth_text_layout_set_line_wrap_width (label->details->smooth_text_layout,
-							 label->details->smooth_line_wrap_width);
-}
-
-static void
-label_smooth_text_clear (NautilusLabel *label)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	if (label->details->smooth_text_layout != NULL) {
-		gtk_object_unref (GTK_OBJECT (label->details->smooth_text_layout));
-	}
-	label->details->smooth_text_layout = NULL;
-
-	/* We also need to clear the cache pixbuf */
-	label_solid_cache_pixbuf_clear (label);
-}
-
-gboolean
-label_is_smooth (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), FALSE);
-
-	return !label->details->never_smooth && label->details->is_smooth;
-}
-
-/* Public NautilusLabel methods */
-GtkWidget *
-nautilus_label_new (const char *text)
-{
-	NautilusLabel *label;
-	
-	label = NAUTILUS_LABEL (gtk_widget_new (nautilus_label_get_type (), NULL));
-	
-	nautilus_label_set_text (label, text);
-	
-	return GTK_WIDGET (label);
-}
-
-void
-nautilus_label_set_smooth_font (NautilusLabel *label,
-				NautilusScalableFont *smooth_font)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (NAUTILUS_IS_SCALABLE_FONT (smooth_font));
-	
-	if (label->details->smooth_font == smooth_font) {
-		return;
-	}
-	
-	if (label->details->smooth_font != NULL) {
-		gtk_object_unref (GTK_OBJECT (label->details->smooth_font));
-	}
-
-	gtk_object_ref (GTK_OBJECT (smooth_font));
-	label->details->smooth_font = smooth_font;
-
-	label_smooth_text_clear (label);	
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-NautilusScalableFont *
-nautilus_label_get_smooth_font (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NULL);
-	
-	if (label->details->smooth_font != NULL) {
-		gtk_object_ref (GTK_OBJECT (label->details->smooth_font));
-	}
-
-	return label->details->smooth_font;
-}
-
-void
-nautilus_label_set_smooth_font_size (NautilusLabel *label,
-				     int smooth_font_size)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (smooth_font_size > MIN_SMOOTH_FONT_SIZE);
-
-	if (label->details->smooth_font_size == smooth_font_size) {
-		return;
-	}
-
-	label->details->smooth_font_size = smooth_font_size;
-
-	label_smooth_text_clear (label);
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-int
-nautilus_label_get_smooth_font_size (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-
-	return label->details->smooth_font_size;
-}
-
-/* This function is an ugly hack.  The issue is that we want
- * GtkLabel to flush its cached requisition dimensions.  GtkLabel
- * caches these for efficiency.  Unfortunately, there is no public
- * way to do this for GtkLabel.  So, instead we trick the GtkLabel
- * into thinking that its 'pattern' has changed.  As a result
- * of this phony change, GtkLabel will flush the requisition cache.
- * Of course, we don't really change the pattern, we just set the
- * old one.
- */
-static void
-label_force_cached_requisition_flush (NautilusLabel *label)
-{
-	char *same_pattern;
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	same_pattern = g_strdup (GTK_LABEL (label)->pattern);
-	gtk_label_set_pattern (GTK_LABEL (label), same_pattern);
-	g_free (same_pattern);
-}
-
-void
-nautilus_label_set_is_smooth (NautilusLabel *label,
-			      gboolean is_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	if (label->details->never_smooth) {
-		return;
-	}
-
-	if (label->details->is_smooth == is_smooth) {
-		return;
-	}
-
-	label->details->is_smooth = is_smooth;
-
-	label_smooth_text_clear (label);
-
-	/* Force GtkLabel to flush its cached requisition dimensions.
-	 * GtkLabel caches its requisition for efficiency.  We need this
-	 * dimensions to be flushed when our is_smooth attribute changes.
-	 * The reason is that the geometry of the widget is dependent on
-	 * whether it is_smooth or not.
-	 */
-	label_force_cached_requisition_flush (label);
-
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-gboolean
-nautilus_label_get_is_smooth (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), FALSE);
-
-	return label_is_smooth (label);
-}
-
-/**
- * nautilus_label_set_tile_pixbuf:
- *
- * @label: A NautilusLabel
- * @pixbuf:          The new tile pixbuf
- *
- * Change the tile pixbuf.  A 'pixbuf' value of NULL, means dont use a
- * tile pixbuf - this is the default behavior for the widget.
- */
-void
-nautilus_label_set_tile_pixbuf (NautilusLabel *label,
-				GdkPixbuf *pixbuf)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	
-	if (pixbuf != label->details->tile_pixbuf) {
-		nautilus_gdk_pixbuf_unref_if_not_null (label->details->tile_pixbuf);
-		nautilus_gdk_pixbuf_ref_if_not_null (pixbuf);
-		
-		label->details->tile_pixbuf = pixbuf;
-
-		gtk_widget_queue_resize (GTK_WIDGET (label));
-	}
-}
-
-/**
- * nautilus_label_get_tile_pixbuf:
- *
- * @label: A NautilusLabel
- *
- * Return value: A reference to the tile_pixbuf.  Needs to be unreferenced with 
- * gdk_pixbuf_unref()
- */
-GdkPixbuf*
-nautilus_label_get_tile_pixbuf (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NULL);
-
-	nautilus_gdk_pixbuf_ref_if_not_null (label->details->tile_pixbuf);
-	
-	return label->details->tile_pixbuf;
-}
-
-void
-nautilus_label_set_text_opacity (NautilusLabel *label,
-				 int opacity)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	label->details->text_opacity = opacity;
-
-	gtk_widget_queue_draw (GTK_WIDGET (label));
-}
-
-int
-nautilus_label_get_text_opacity (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	return label->details->text_opacity;
-}
-
-void
-nautilus_label_set_tile_opacity (NautilusLabel *label,
-				 int tile_opacity)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (tile_opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (tile_opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	if (label->details->tile_opacity == tile_opacity) {
-		return;
-	}
-
-	label->details->tile_opacity = tile_opacity;
-
-	gtk_widget_queue_draw (GTK_WIDGET (label));
-}
-
-int
-nautilus_label_get_tile_opacity (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	return label->details->tile_opacity;
-}
-
-void
-nautilus_label_set_tile_width (NautilusLabel *label,
-			       int tile_width)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (tile_width >= NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP);
-	
-	if (label->details->tile_width == tile_width) {
-		return;
-	}
-
-	label->details->tile_width = tile_width;
-
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_label_get_tile_width:
- *
- * @label: A NautilusLabel
- *
- * Return value: The tile width.
- */
-int
-nautilus_label_get_tile_width (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-
-	return label->details->tile_width;
-}
-
-void
-nautilus_label_set_tile_height (NautilusLabel *label,
-				int tile_height)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (tile_height >= NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP);
-	
-	if (label->details->tile_height == tile_height) {
-		return;
-	}
-
-	label->details->tile_height = tile_height;
-
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_label_get_tile_height:
- *
- * @label: A NautilusLabel
- *
- * Return value: The tile height.
- */
-int
-nautilus_label_get_tile_height (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-
-	return label->details->tile_height;
-}
-
-void
-nautilus_label_set_tile_mode_vertical (NautilusLabel *label,
-				       NautilusSmoothTileMode tile_mode_vertical)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (tile_mode_vertical >= NAUTILUS_SMOOTH_TILE_SELF);
-	g_return_if_fail (tile_mode_vertical <= NAUTILUS_SMOOTH_TILE_ANCESTOR);
-
-	if (label->details->tile_mode_vertical == tile_mode_vertical) {
-		return;
-	}
-
-	label->details->tile_mode_vertical = tile_mode_vertical;
-
-	gtk_widget_queue_draw (GTK_WIDGET (label));
-}
-
-NautilusSmoothTileMode
-nautilus_label_get_tile_mode_vertical (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-	
-	return label->details->tile_mode_vertical;
-}
-
-void
-nautilus_label_set_tile_mode_horizontal (NautilusLabel *label,
-					 NautilusSmoothTileMode tile_mode_horizontal)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (tile_mode_horizontal >= NAUTILUS_SMOOTH_TILE_SELF);
-	g_return_if_fail (tile_mode_horizontal <= NAUTILUS_SMOOTH_TILE_ANCESTOR);
-
-	if (label->details->tile_mode_horizontal == tile_mode_horizontal) {
-		return;
-	}
-
-	label->details->tile_mode_horizontal = tile_mode_horizontal;
-
-	gtk_widget_queue_draw (GTK_WIDGET (label));
-}
-
-NautilusSmoothTileMode
-nautilus_label_get_tile_mode_horizontal (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-	
-	return label->details->tile_mode_horizontal;
-}
-
-void
-nautilus_label_set_tile_pixbuf_from_file_name (NautilusLabel *label,
-					       const char *tile_file_name)
-{
-	GdkPixbuf *tile_pixbuf;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (tile_file_name != NULL);
-
-	tile_pixbuf = gdk_pixbuf_new_from_file (tile_file_name);
-	
-	if (tile_pixbuf != NULL) {
-		nautilus_label_set_tile_pixbuf (label, tile_pixbuf);
-		gdk_pixbuf_unref (tile_pixbuf);
-	}
-}
-
-void
-nautilus_label_set_background_mode (NautilusLabel *label,
-				    NautilusSmoothBackgroundMode background_mode)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (background_mode >= NAUTILUS_SMOOTH_BACKGROUND_GTK);
-	g_return_if_fail (background_mode <= NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-
-	if (label->details->background_mode == background_mode) {
-		return;
-	}
-
-	label->details->background_mode = background_mode;
-
-	gtk_widget_queue_draw (GTK_WIDGET (label));
-}
-
-NautilusSmoothBackgroundMode
-nautilus_label_get_background_mode (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-	
-	return label->details->background_mode;
-}
-
-void
-nautilus_label_set_solid_background_color (NautilusLabel *label,
-					   guint32 solid_background_color)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	
-	if (label->details->solid_background_color == solid_background_color) {
-		return;
-	}
-
-	label->details->solid_background_color = solid_background_color;
-	
-	gtk_widget_queue_draw (GTK_WIDGET (label));
-}
-
-guint32
-nautilus_label_get_solid_background_color (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-	
-	return label->details->solid_background_color;
-}
-
-/**
- * nautilus_label_set_wrap_width:
- *
- * @label: A NautilusLabel
- * @line_wrap_width: The new line wrap width.
- *
- * The line wrap width is something.
- * 
- */
-void
-nautilus_label_set_smooth_line_wrap_width (NautilusLabel *label,
-					   int line_wrap_width)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	
-	if (label->details->smooth_line_wrap_width == line_wrap_width) {
-		return;
-	}
-	
-	label->details->smooth_line_wrap_width = line_wrap_width;
-	
-	label_smooth_text_clear (label);
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_label_get_smooth_line_wrap_width:
- *
- * @label: A NautilusLabel
- *
- * Return value: A boolean value indicating whether the label
- * is currently line wrapping text.
- */
-int
-nautilus_label_get_smooth_line_wrap_width (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), FALSE);
-
-	return label->details->smooth_line_wrap_width;
-}
-
-void
-nautilus_label_set_text_color (NautilusLabel *label,
-			       guint32 text_color)
-{
-	char *color_spec;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	if (label->details->smooth_text_color == text_color) {
-		return;
-	}
-	
-	label->details->smooth_text_color = text_color;
-
-	color_spec = nautilus_gdk_rgb_to_color_spec (text_color);
-
-	nautilus_gtk_widget_set_foreground_color (GTK_WIDGET (label), color_spec);
-	
-	g_free (color_spec);
-	
-	gtk_widget_queue_draw (GTK_WIDGET (label));
-}
-
-guint32
-nautilus_label_get_text_color (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-	
-	return label->details->smooth_text_color;
-}
-
-/**
- * nautilus_label_set_smooth_drop_shadow_offset:
- *
- * @label: A NautilusLabel
- * @smooth_drop_shadow_offset: The new drop shadow offset.  
-
- * The drop shadow offset is specified in pixels.  If greater than zero,
- * the label will render on top of a nice shadow.  The shadow will be
- * offset from the label text by 'smooth_drop_shadow_offset' pixels.
- */
-void
-nautilus_label_set_smooth_drop_shadow_offset (NautilusLabel *label,
-					      int drop_shadow_offset)
- {
-	 g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	 g_return_if_fail (drop_shadow_offset >= 0);
-	 
-	 if (label->details->smooth_drop_shadow_offset == drop_shadow_offset) {
-		 return;
-	 }
-	 
-	 label->details->smooth_drop_shadow_offset = drop_shadow_offset;
-	 label_solid_cache_pixbuf_clear (label);
-	 gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_label_get_smooth_drop_shadow_offset:
- *
- * @label: A NautilusLabel
- *
- * Return value: The line offset in pixels.
- */
-int
-nautilus_label_get_smooth_drop_shadow_offset (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-
-	return label->details->smooth_drop_shadow_offset;
-}
-
-/**
- * nautilus_label_set_smooth_drop_shadow_color:
- *
- * @label: A NautilusLabel
- * @smooth_drop_shadow_color: The new drop shadow color.
- *
- * Return value: The drop shadow color.
- */
-void
-nautilus_label_set_smooth_drop_shadow_color (NautilusLabel *label,
-					     guint32 drop_shadow_color)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	if (label->details->smooth_drop_shadow_color == drop_shadow_color) {
-		return;
-	}
-	
-	label->details->smooth_drop_shadow_color = drop_shadow_color;
-	label_solid_cache_pixbuf_clear (label);	
-	gtk_widget_queue_draw (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_label_get_smooth_drop_shadow_color:
- *
- * @label: A NautilusLabel
- *
- * Return value: The drop shadow color.
- */
-guint32
-nautilus_label_get_smooth_drop_shadow_color (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-	
-	return label->details->smooth_drop_shadow_color;
-}
-
-void
-nautilus_label_set_justify (NautilusLabel *label,
-			    GtkJustification justification)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (justification >= GTK_JUSTIFY_LEFT);
-	g_return_if_fail (justification <= GTK_JUSTIFY_FILL);
-
-	if (nautilus_label_get_text_justify (label) == justification) {
-		return;
-	}
-
-	gtk_label_set_justify (GTK_LABEL (label), justification);
-	
-	gtk_widget_queue_draw (GTK_WIDGET (label));
-}
-
-GtkJustification
-nautilus_label_get_text_justify (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), 0);
-
-	return GTK_LABEL (label)->jtype;
-}
-
-gboolean
-nautilus_label_set_text (NautilusLabel *label,
-			 const char *text)
-{
-	GtkLabel *gtk_label;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), FALSE);
-
-	gtk_label = GTK_LABEL (label);
-
-	if (nautilus_str_is_equal (text, gtk_label->label)) {
-		return FALSE;
-	}
-
-	gtk_label_set_text (gtk_label, text);
-	
-	label_smooth_text_clear (label);
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-
-	return TRUE;
-}
-
-char*
-nautilus_label_get_text (const NautilusLabel *label)
-{
-	GtkLabel *gtk_label;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), NULL);
-
-	gtk_label = GTK_LABEL (label);
-
-	return gtk_label->label ? g_strdup (gtk_label->label) : NULL;
-}
-
-/**
- * nautilus_label_set_wrap:
- *
- * @label: A NautilusLabel
- * @line_wrap: A boolean value indicating whether the label should
- * line wrap words if they dont fit in the horizontally allocated
- * space.
- *
- */
-void
-nautilus_label_set_wrap (NautilusLabel *label,
-			 gboolean line_wrap)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	if (nautilus_label_get_wrap (label) == line_wrap) {
-		return;
-	}
-
-	gtk_label_set_line_wrap (GTK_LABEL (label), line_wrap);
-	
-	label_smooth_text_clear (label);	
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_label_get_wrap:
- *
- * @label: A NautilusLabel
- *
- * Return value: A boolean value indicating whether the label
- * is currently line wrapping text.
- */
-gboolean
-nautilus_label_get_wrap (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), FALSE);
-
-	return GTK_LABEL (label)->wrap;
-}
-
-/**
- * nautilus_label_new_solid:
- *
- * @text: Text or NULL
- * @drop_shadow_offset: Drop shadow offset.
- * @drop_shadow_color: Drop shadow color.
- * @text_color: Text color.
- * @x_alignment: Horizontal alignment.
- * @y_alignment: Vertical alignment.
- * @x_padding: Amount to pad label in the x direction.
- * @y_padding: Amount to pad label in the y direction.
- * @background_color: Background color.
- * @tile_pixbuf: Pixbuf to use for tile or NULL.
- *
- * Create a label with a solid background.
- *
- * Return value: Newly created label with all the given values.
- */
-GtkWidget *
-nautilus_label_new_solid (const char *text,
-			  int drop_shadow_offset,
-			  guint32 drop_shadow_color,
-			  guint32 text_color,
-			  float x_alignment,
-			  float y_alignment,
-			  int x_padding,
-			  int y_padding,
-			  guint32 background_color,
-			  GdkPixbuf *tile_pixbuf)
-{
-	NautilusLabel *label;
-
- 	label = NAUTILUS_LABEL (nautilus_label_new (text ? text : ""));
-
- 	nautilus_label_set_background_mode (NAUTILUS_LABEL (label), NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	nautilus_label_set_smooth_drop_shadow_color (label, drop_shadow_color);
-	nautilus_label_set_smooth_drop_shadow_offset (label, drop_shadow_offset);
-	nautilus_label_set_text_color (label, text_color);
- 	nautilus_label_set_solid_background_color (NAUTILUS_LABEL (label), background_color);
-
- 	gtk_misc_set_padding (GTK_MISC (label), x_padding, y_padding);
- 	gtk_misc_set_alignment (GTK_MISC (label), x_alignment, y_alignment);
-	
-	if (tile_pixbuf != NULL) {
-		nautilus_label_set_tile_pixbuf (NAUTILUS_LABEL (label), tile_pixbuf);
-	}
-	
-	return GTK_WIDGET (label);
-}
-
-/**
- * nautilus_gtk_label_make_bold.
- *
- * Switches the font of label to a bold equivalent.
- * @label: The label.
- **/
-void
-nautilus_label_make_bold (NautilusLabel *label)
-{
-	NautilusScalableFont *bold_font;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	nautilus_gtk_label_make_bold (GTK_LABEL (label));
-
-	bold_font = nautilus_scalable_font_make_bold (label->details->smooth_font);
-	g_assert (NAUTILUS_IS_SCALABLE_FONT (bold_font));
-
-	if (bold_font != NULL) {
-		nautilus_label_set_smooth_font (label, bold_font);
-		gtk_object_unref (GTK_OBJECT (bold_font));
-	}
-
-	
-	label_smooth_text_clear (label);
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_gtk_label_make_larger.
- *
- * Switches the font of label to a larger version of the font.
- * @label: The label.
- **/
-void
-nautilus_label_make_larger (NautilusLabel *label,
-			    guint num_steps)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	label->details->smooth_font_size += num_steps;
-
-	nautilus_gtk_label_make_larger (GTK_LABEL (label), num_steps);
-
-	label_smooth_text_clear (label);
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_gtk_label_make_smaller.
- *
- * Switches the font of label to a smaller version of the font.
- * @label: The label.
- **/
-void
-nautilus_label_make_smaller (NautilusLabel *label,
-			     guint num_steps)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	label->details->smooth_font_size -= num_steps;
-	
-	nautilus_gtk_label_make_smaller (GTK_LABEL (label), num_steps);
-
-	label_smooth_text_clear (label);
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_label_set_never_smooth
- *
- * @label: A NautilusLabel.
- * @never_smooth: A boolean value indicating whether the label can NEVER be smooth.
- *
- * Force an label to never be smooth.  Calls to nautilus_label_set_is_smooth () will
- * thus be ignored.  This is useful if you want to use a NautilusLabel in a situation
- * wherre smoothness does not make sense - for example, in a dialog with other "normal"
- * GtkLabel widgets for consistency.
- */
-void
-nautilus_label_set_never_smooth (NautilusLabel *label,
-				 gboolean never_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	
-	label->details->never_smooth = never_smooth;
-
-	label_smooth_text_clear (label);
-
-	/* Force GtkLabel to flush its cached requisition dimensions.
-	 * GtkLabel caches its requisition for efficiency.  We need this
-	 * dimensions to be flushed when our is_smooth attribute changes.
-	 * The reason is that the geometry of the widget is dependent on
-	 * whether it is_smooth or not.
-	 */
-	label_force_cached_requisition_flush (label);
-
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_label_set_adjust_wrap_on_resize:
- *
- * @label: A NautilusLabel
- * @adjust_wrap_on_resize: A boolean value indicating whether the label should
- * automatically update the line_wrap_width when its resized.
- */
-void
-nautilus_label_set_adjust_wrap_on_resize (NautilusLabel *label,
-					  gboolean adjust_wrap_on_resize)
-{
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-
-	if (label->details->adjust_wrap_on_resize == adjust_wrap_on_resize) {
-		return;
-	}
-
-	label->details->adjust_wrap_on_resize = adjust_wrap_on_resize;
-	
-	gtk_widget_queue_resize (GTK_WIDGET (label));
-}
-
-/**
- * nautilus_label_get_wrap:
- *
- * @label: A NautilusLabel
- *
- * Return value: A boolean value indicating whether the label
- * automatically updates the line_wrap_width when its resized.
- */
-gboolean
-nautilus_label_get_adjust_wrap_on_resize (const NautilusLabel *label)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (label), FALSE);
-
-	return label->details->adjust_wrap_on_resize;
-}
diff --git a/libnautilus-private/nautilus-label.h b/libnautilus-private/nautilus-label.h
deleted file mode 100644
index aacb0bd7a..000000000
--- a/libnautilus-private/nautilus-label.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-label.h - A widget to display a anti aliased text.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_LABEL_H
-#define NAUTILUS_LABEL_H
-
-#include <gtk/gtklabel.h>
-#include <libnautilus-extensions/nautilus-scalable-font.h>
-#include <libnautilus-extensions/nautilus-smooth-widget.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_LABEL            (nautilus_label_get_type ())
-#define NAUTILUS_LABEL(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_LABEL, NautilusLabel))
-#define NAUTILUS_LABEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_LABEL, NautilusLabelClass))
-#define NAUTILUS_IS_LABEL(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_LABEL))
-#define NAUTILUS_IS_LABEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_LABEL))
-
-typedef struct _NautilusLabel	       NautilusLabel;
-typedef struct _NautilusLabelClass     NautilusLabelClass;
-typedef struct _NautilusLabelDetails   NautilusLabelDetails;
-
-struct _NautilusLabel
-{
-	/* Superclass */
-	GtkLabel gtk_label;
-
-	/* Private things */
-	NautilusLabelDetails *details;
-};
-
-struct _NautilusLabelClass
-{
-	GtkLabelClass parent_class;
-
-	NautilusSmoothWidgetDrawBackground draw_background;
-	NautilusSmoothWidgetSetIsSmooth set_is_smooth;
-};
-
-GtkType                      nautilus_label_get_type                       (void);
-GtkWidget *                  nautilus_label_new                            (const char                   *text);
-void                         nautilus_label_set_is_smooth                  (NautilusLabel                *label,
-									    gboolean                      is_smooth);
-gboolean                     nautilus_label_get_is_smooth                  (const NautilusLabel          *label);
-void                         nautilus_label_set_smooth_font                (NautilusLabel                *label,
-									    NautilusScalableFont         *font);
-NautilusScalableFont *       nautilus_label_get_smooth_font                (const NautilusLabel          *label);
-void                         nautilus_label_set_smooth_font_size           (NautilusLabel                *label,
-									    int                           font_size);
-int                          nautilus_label_get_smooth_font_size           (const NautilusLabel          *label);
-void                         nautilus_label_set_text_opacity               (NautilusLabel                *label,
-									    int                           opacity);
-int                          nautilus_label_get_text_opacity               (const NautilusLabel          *label);
-void                         nautilus_label_set_background_mode            (NautilusLabel                *label,
-									    NautilusSmoothBackgroundMode  background_mode);
-NautilusSmoothBackgroundMode nautilus_label_get_background_mode            (const NautilusLabel          *label);
-void                         nautilus_label_set_solid_background_color     (NautilusLabel                *label,
-									    guint32                       solid_background_color);
-guint32                      nautilus_label_get_solid_background_color     (const NautilusLabel          *label);
-void                         nautilus_label_set_text_color                 (NautilusLabel                *label,
-									    guint32                       color);
-guint32                      nautilus_label_get_text_color                 (const NautilusLabel          *label);
-void                         nautilus_label_set_smooth_drop_shadow_offset  (NautilusLabel                *label,
-									    int                           offset);
-int                          nautilus_label_get_smooth_drop_shadow_offset  (const NautilusLabel          *label);
-void                         nautilus_label_set_smooth_drop_shadow_color   (NautilusLabel                *label,
-									    guint32                       color);
-guint32                      nautilus_label_get_smooth_drop_shadow_color   (const NautilusLabel          *label);
-void                         nautilus_label_set_smooth_line_wrap_width     (NautilusLabel                *label,
-									    int                           line_wrap_width);
-int                          nautilus_label_get_smooth_line_wrap_width     (const NautilusLabel          *label);
-gboolean                     nautilus_label_set_text                       (NautilusLabel                *label,
-									    const char                   *text);
-char*                        nautilus_label_get_text                       (const NautilusLabel          *label);
-void                         nautilus_label_set_justify                    (NautilusLabel                *label,
-									    GtkJustification              justification);
-GtkJustification             nautilus_label_get_text_justify               (const NautilusLabel          *label);
-void                         nautilus_label_set_wrap                       (NautilusLabel                *label,
-									    gboolean                      line_wrap);
-gboolean                     nautilus_label_get_wrap                       (const NautilusLabel          *label);
-GtkWidget *                  nautilus_label_new_solid                      (const char                   *text,
-									    int                           drop_shadow_offset,
-									    guint32                       drop_shadow_color,
-									    guint32                       text_color,
-									    float                         xalign,
-									    float                         yalign,
-									    int                           xpadding,
-									    int                           ypadding,
-									    guint32                       background_color,
-									    GdkPixbuf                    *tile_pixbuf);
-void                         nautilus_label_make_bold                      (NautilusLabel                *label);
-void                         nautilus_label_make_larger                    (NautilusLabel                *label,
-									    guint                         num_sizes);
-void                         nautilus_label_make_smaller                   (NautilusLabel                *label,
-									    guint                         num_sizes);
-void                         nautilus_label_set_tile_pixbuf                (NautilusLabel                *label,
-									    GdkPixbuf                    *pixbuf);
-void                         nautilus_label_set_tile_width                 (NautilusLabel                *label,
-									    int                           tile_width);
-int                          nautilus_label_get_tile_width                 (const NautilusLabel          *label);
-void                         nautilus_label_set_tile_height                (NautilusLabel                *label,
-									    int                           tile_height);
-int                          nautilus_label_get_tile_height                (const NautilusLabel          *label);
-void                         nautilus_label_set_tile_pixbuf_from_file_name (NautilusLabel                *label,
-									    const char                   *tile_file_name);
-GdkPixbuf*                   nautilus_label_get_tile_pixbuf                (const NautilusLabel          *label);
-void                         nautilus_label_set_tile_opacity               (NautilusLabel                *label,
-									    int                           tile_opacity);
-int                          nautilus_label_get_tile_opacity               (const NautilusLabel          *label);
-void                         nautilus_label_set_tile_mode_vertical         (NautilusLabel                *label,
-									    NautilusSmoothTileMode        horizontal_tile_mode);
-NautilusSmoothTileMode       nautilus_label_get_tile_mode_vertical         (const NautilusLabel          *label);
-void                         nautilus_label_set_tile_mode_horizontal       (NautilusLabel                *label,
-									    NautilusSmoothTileMode        horizontal_tile_mode);
-NautilusSmoothTileMode       nautilus_label_get_tile_mode_horizontal       (const NautilusLabel          *label);
-void                         nautilus_label_set_never_smooth               (NautilusLabel                *label,
-									    gboolean                      never_smooth);
-void                         nautilus_label_set_adjust_wrap_on_resize      (NautilusLabel                *label,
-									    gboolean                      adjust_wrap_on_resize);
-gboolean                     nautilus_label_get_adjust_wrap_on_resize      (const NautilusLabel          *label);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_LABEL_H */
-
-
diff --git a/libnautilus-private/nautilus-labeled-image.c b/libnautilus-private/nautilus-labeled-image.c
deleted file mode 100644
index f7cfeb44c..000000000
--- a/libnautilus-private/nautilus-labeled-image.c
+++ /dev/null
@@ -1,2106 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-labeled-image.c - A labeled image.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-labeled-image.h"
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-art-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-#include "nautilus-label.h"
-#include "nautilus-image.h"
-#include "nautilus-debug-drawing.h"
-
-#include <gtk/gtkbutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcheckbutton.h>
-
-#define DEFAULT_SPACING 0
-#define DEFAULT_X_PADDING 0
-#define DEFAULT_Y_PADDING 0
-#define DEFAULT_X_ALIGNMENT 0.5
-#define DEFAULT_Y_ALIGNMENT 0.5
-
-/* Arguments */
-enum
-{
-	ARG_0,
-	ARG_FILL,
-	ARG_LABEL,
-	ARG_LABEL_POSITION,
-	ARG_PIXBUF,
-	ARG_SHOW_IMAGE,
-	ARG_SHOW_LABEL,
-	ARG_SPACING,
-	ARG_X_ALIGNMENT,
-	ARG_X_PADDING,
-	ARG_Y_ALIGNMENT,
-	ARG_Y_PADDING,
-};
-
-/* Detail member struct */
-struct _NautilusLabeledImageDetails
-{
-	GtkWidget *image;
-	GtkWidget *label;
-	GtkPositionType label_position;
-	gboolean show_label;
-	gboolean show_image;
-	guint spacing;
-	float x_alignment;
-	float y_alignment;
-	int x_padding;
-	int y_padding;
-	int fixed_image_height;
-	gboolean fill;
-};
-
-/* GtkObjectClass methods */
-static void               nautilus_labeled_image_initialize_class (NautilusLabeledImageClass  *labeled_image_class);
-static void               nautilus_labeled_image_initialize       (NautilusLabeledImage       *image);
-static void               nautilus_labeled_image_destroy          (GtkObject                  *object);
-static void               nautilus_labeled_image_set_arg          (GtkObject                  *object,
-								   GtkArg                     *arg,
-								   guint                       arg_id);
-static void               nautilus_labeled_image_get_arg          (GtkObject                  *object,
-								   GtkArg                     *arg,
-								   guint                       arg_id);
-/* GtkWidgetClass methods */
-static void               nautilus_labeled_image_size_request     (GtkWidget                  *widget,
-								   GtkRequisition             *requisition);
-static int                nautilus_labeled_image_expose_event     (GtkWidget                  *widget,
-								   GdkEventExpose             *event);
-static void               nautilus_labeled_image_size_allocate    (GtkWidget                  *widget,
-								   GtkAllocation              *allocation);
-static void               nautilus_labeled_image_map              (GtkWidget                  *widget);
-static void               nautilus_labeled_image_unmap            (GtkWidget                  *widget);
-
-/* GtkContainerClass methods */
-static void               nautilus_labeled_image_add              (GtkContainer               *container,
-								   GtkWidget                  *widget);
-static void               nautilus_labeled_image_remove           (GtkContainer               *container,
-								   GtkWidget                  *widget);
-static void               nautilus_labeled_image_forall           (GtkContainer               *container,
-								   gboolean                    include_internals,
-								   GtkCallback                 callback,
-								   gpointer                    callback_data);
-
-/* Private NautilusLabeledImage methods */
-static NautilusDimensions labeled_image_get_image_dimensions      (const NautilusLabeledImage *labeled_image);
-static NautilusDimensions labeled_image_get_label_dimensions      (const NautilusLabeledImage *labeled_image);
-static void               labeled_image_ensure_label              (NautilusLabeledImage       *labeled_image);
-static void               labeled_image_ensure_image              (NautilusLabeledImage       *labeled_image);
-static ArtIRect           labeled_image_get_content_bounds        (const NautilusLabeledImage *labeled_image);
-static NautilusDimensions labeled_image_get_content_dimensions    (const NautilusLabeledImage *labeled_image);
-static void               labeled_image_update_alignments         (NautilusLabeledImage       *labeled_image);
-static gboolean           labeled_image_show_label                (const NautilusLabeledImage *labeled_image);
-static gboolean           labeled_image_show_image                (const NautilusLabeledImage *labeled_image);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusLabeledImage, nautilus_labeled_image, GTK_TYPE_CONTAINER)
-
-/* Class init methods */
-static void
-nautilus_labeled_image_initialize_class (NautilusLabeledImageClass *labeled_image_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (labeled_image_class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (labeled_image_class);
-	GtkContainerClass *container_class = GTK_CONTAINER_CLASS (labeled_image_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_labeled_image_destroy;
-	object_class->set_arg = nautilus_labeled_image_set_arg;
-	object_class->get_arg = nautilus_labeled_image_get_arg;
-	
- 	/* GtkWidgetClass */
- 	widget_class->size_request = nautilus_labeled_image_size_request;
-	widget_class->size_allocate = nautilus_labeled_image_size_allocate;
- 	widget_class->expose_event = nautilus_labeled_image_expose_event;
-	widget_class->map = nautilus_labeled_image_map;
-	widget_class->unmap = nautilus_labeled_image_unmap;
-
- 	/* GtkContainerClass */
-	container_class->add = nautilus_labeled_image_add;
-	container_class->remove = nautilus_labeled_image_remove;
-	container_class->forall = nautilus_labeled_image_forall;
-  
-	/* Arguments */
-	gtk_object_add_arg_type ("NautilusLabeledImage::pixbuf",
-				 GTK_TYPE_POINTER,
-				 GTK_ARG_READWRITE,
-				 ARG_PIXBUF);
-	gtk_object_add_arg_type ("NautilusLabeledImage::label",
-				 GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE,
-				 ARG_LABEL);
-	gtk_object_add_arg_type ("NautilusLabeledImage::label_position",
-				 GTK_TYPE_POSITION_TYPE,
-				 GTK_ARG_READWRITE,
-				 ARG_LABEL_POSITION);
-	gtk_object_add_arg_type ("NautilusLabeledImage::show_label",
-				 GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE,
-				 ARG_SHOW_LABEL);
-	gtk_object_add_arg_type ("NautilusLabeledImage::show_image",
-				 GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE,
-				 ARG_SHOW_IMAGE);
-	gtk_object_add_arg_type ("NautilusLabeledImage::spacing",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_SPACING);
-	gtk_object_add_arg_type ("NautilusLabeledImage::x_padding",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_X_PADDING);
-	gtk_object_add_arg_type ("NautilusLabeledImage::y_padding",
-				 GTK_TYPE_INT,
-				 GTK_ARG_READWRITE,
-				 ARG_Y_PADDING);
-	gtk_object_add_arg_type ("NautilusLabeledImage::x_alignment",
-				 GTK_TYPE_FLOAT,
-				 GTK_ARG_READWRITE,
-				 ARG_X_ALIGNMENT);
-	gtk_object_add_arg_type ("NautilusLabeledImage::y_alignment",
-				 GTK_TYPE_FLOAT,
-				 GTK_ARG_READWRITE,
-				 ARG_Y_ALIGNMENT);
-	gtk_object_add_arg_type ("NautilusLabeledImage::fill",
-				 GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE,
-				 ARG_FILL);
-}
-
-void
-nautilus_labeled_image_initialize (NautilusLabeledImage *labeled_image)
-{
-	GTK_WIDGET_SET_FLAGS (labeled_image, GTK_NO_WINDOW);
-
-	labeled_image->details = g_new0 (NautilusLabeledImageDetails, 1);
-	labeled_image->details->show_label = TRUE;
-	labeled_image->details->show_image = TRUE;
-	labeled_image->details->label_position = GTK_POS_BOTTOM;
-	labeled_image->details->spacing = DEFAULT_SPACING;
-	labeled_image->details->x_padding = DEFAULT_X_PADDING;
-	labeled_image->details->y_padding = DEFAULT_Y_PADDING;
-	labeled_image->details->x_alignment = DEFAULT_X_ALIGNMENT;
-	labeled_image->details->y_alignment = DEFAULT_Y_ALIGNMENT;
-	labeled_image->details->fixed_image_height = 0;
-
-	nautilus_labeled_image_set_fill (labeled_image, FALSE);
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_labeled_image_destroy (GtkObject *object)
-{
- 	NautilusLabeledImage *labeled_image;
-	
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (object));
-
-	labeled_image = NAUTILUS_LABELED_IMAGE (object);
-
-	if (labeled_image->details->image != NULL) {
-		gtk_widget_destroy (labeled_image->details->image);
-		labeled_image->details->image = NULL;
-	}
-
-	if (labeled_image->details->label != NULL) {
-		gtk_widget_destroy (labeled_image->details->label);
-		labeled_image->details->label = NULL;
-	}
-
-	g_free (labeled_image->details);
-
-	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-static void
-nautilus_labeled_image_set_arg (GtkObject *object,
-				GtkArg *arg,
-				guint arg_id)
-{
-	NautilusLabeledImage *labeled_image;
-	
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (object));
-
- 	labeled_image = NAUTILUS_LABELED_IMAGE (object);
-
- 	switch (arg_id)
-	{
-	case ARG_PIXBUF:
-		nautilus_labeled_image_set_pixbuf (labeled_image, (GdkPixbuf *) GTK_VALUE_POINTER (*arg));
-		break;
-
-	case ARG_LABEL:
-		nautilus_labeled_image_set_text (labeled_image, GTK_VALUE_STRING (*arg));
-		break;
-
-	case ARG_LABEL_POSITION:
-		nautilus_labeled_image_set_label_position (labeled_image, GTK_VALUE_ENUM (*arg));
-		break;
-
-	case ARG_SHOW_LABEL:
-		nautilus_labeled_image_set_show_label (labeled_image, GTK_VALUE_BOOL (*arg));
-		break;
-
-	case ARG_SHOW_IMAGE:
-		nautilus_labeled_image_set_show_image (labeled_image, GTK_VALUE_BOOL (*arg));
-		break;
-
-	case ARG_SPACING:
-		nautilus_labeled_image_set_spacing (labeled_image, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_X_PADDING:
-		nautilus_labeled_image_set_x_padding (labeled_image, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_Y_PADDING:
-		nautilus_labeled_image_set_y_padding (labeled_image, GTK_VALUE_INT (*arg));
-		break;
-
-	case ARG_X_ALIGNMENT:
-		nautilus_labeled_image_set_x_alignment (labeled_image, GTK_VALUE_FLOAT (*arg));
-		break;
-
-	case ARG_Y_ALIGNMENT:
-		nautilus_labeled_image_set_y_alignment (labeled_image, GTK_VALUE_FLOAT (*arg));
-		break;
-
-	case ARG_FILL:
-		nautilus_labeled_image_set_fill (labeled_image, GTK_VALUE_BOOL (*arg));
-		break;
- 	default:
-		g_assert_not_reached ();
-	}
-}
-
-static void
-nautilus_labeled_image_get_arg (GtkObject *object,
-				GtkArg *arg,
-				guint arg_id)
-{
-	NautilusLabeledImage *labeled_image;
-
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (object));
-	
-	labeled_image = NAUTILUS_LABELED_IMAGE (object);
-
- 	switch (arg_id)
-	{
-	case ARG_PIXBUF:
-		GTK_VALUE_POINTER (*arg) = nautilus_labeled_image_get_pixbuf (labeled_image);
-		break;
-
-	case ARG_LABEL:
-		GTK_VALUE_STRING (*arg) = nautilus_labeled_image_get_text (labeled_image);
-		break;
-
-	case ARG_LABEL_POSITION:
-		GTK_VALUE_ENUM (*arg) = nautilus_labeled_image_get_label_position (labeled_image);
-		break;
-
-	case ARG_SHOW_LABEL:
-		GTK_VALUE_BOOL (*arg) = nautilus_labeled_image_get_show_label (labeled_image);
-		break;
-
-	case ARG_SHOW_IMAGE:
-		GTK_VALUE_BOOL (*arg) = nautilus_labeled_image_get_show_image (labeled_image);
-		break;
-
-	case ARG_SPACING:
-		GTK_VALUE_UINT (*arg) = nautilus_labeled_image_get_spacing (labeled_image);
-		break;
-
-	case ARG_X_PADDING:
-		GTK_VALUE_INT (*arg) = nautilus_labeled_image_get_x_padding (labeled_image);
-		break;
-
-	case ARG_Y_PADDING:
-		GTK_VALUE_INT (*arg) = nautilus_labeled_image_get_y_padding (labeled_image);
-		break;
-
-	case ARG_X_ALIGNMENT:
-		GTK_VALUE_FLOAT (*arg) = nautilus_labeled_image_get_x_alignment (labeled_image);
-		break;
-
-	case ARG_Y_ALIGNMENT:
-		GTK_VALUE_FLOAT (*arg) = nautilus_labeled_image_get_y_alignment (labeled_image);
-		break;
-
-	case ARG_FILL:
-		GTK_VALUE_BOOL (*arg) = nautilus_labeled_image_get_fill (labeled_image);
-		break;
-
- 	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* GtkWidgetClass methods */
-static void
-nautilus_labeled_image_size_request (GtkWidget *widget,
-				     GtkRequisition *requisition)
-{
-	NautilusLabeledImage *labeled_image;
- 	NautilusDimensions content_dimensions;
-
- 	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (widget));
- 	g_return_if_fail (requisition != NULL);
-
-  	labeled_image = NAUTILUS_LABELED_IMAGE (widget);
-	
- 	content_dimensions = labeled_image_get_content_dimensions (labeled_image);
-
-	requisition->width = 
-		MAX (1, content_dimensions.width) +
-		2 * labeled_image->details->x_padding;
-
-	requisition->height = 
-		MAX (1, content_dimensions.height) +
-		2 * labeled_image->details->y_padding;
-}
-
-static void
-nautilus_labeled_image_size_allocate (GtkWidget *widget,
-				      GtkAllocation *allocation)
-{
-	NautilusLabeledImage *labeled_image;
- 	ArtIRect image_bounds;
-	ArtIRect label_bounds;
-
- 	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (widget));
- 	g_return_if_fail (allocation != NULL);
-
-  	labeled_image = NAUTILUS_LABELED_IMAGE (widget);
-
-	widget->allocation = *allocation;
-	
- 	label_bounds = nautilus_labeled_image_get_label_bounds (labeled_image);
-	if (!art_irect_empty (&label_bounds)) {
-		GtkAllocation label_allocation;
-
-		label_allocation.x = label_bounds.x0;
-		label_allocation.y = label_bounds.y0;
-		label_allocation.width = nautilus_art_irect_get_width (&label_bounds);
-		label_allocation.height = nautilus_art_irect_get_height (&label_bounds);
-
-		gtk_widget_size_allocate (labeled_image->details->label, &label_allocation);
-	}
-
- 	image_bounds = nautilus_labeled_image_get_image_bounds (labeled_image);
-	if (!art_irect_empty (&image_bounds)) {
-		GtkAllocation image_allocation;
-		
-		image_allocation.x = image_bounds.x0;
-		image_allocation.y = image_bounds.y0;
-		image_allocation.width = nautilus_art_irect_get_width (&image_bounds);
-		image_allocation.height = nautilus_art_irect_get_height (&image_bounds);
-
-		gtk_widget_size_allocate (labeled_image->details->image, &image_allocation);
-	}
-}
-
-static int
-nautilus_labeled_image_expose_event (GtkWidget *widget,
-				     GdkEventExpose *event)
-{
-	NautilusLabeledImage *labeled_image;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (widget), TRUE);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
-	g_return_val_if_fail (event != NULL, TRUE);
-
-  	labeled_image = NAUTILUS_LABELED_IMAGE (widget);
-
-	if (labeled_image_show_label (labeled_image)) {
-		GdkEventExpose label_event;
-		
-		label_event = *event;
-
-		if (GTK_WIDGET_DRAWABLE (labeled_image->details->label) &&
-		    GTK_WIDGET_NO_WINDOW (labeled_image->details->label) &&
-		    gtk_widget_intersect (labeled_image->details->label, &event->area, &label_event.area)) {
-			gtk_widget_event (labeled_image->details->label, (GdkEvent *) &label_event);
-		}
-	}
-	
-	if (labeled_image_show_image (labeled_image)) {
-		GdkEventExpose image_event;
-
-		image_event = *event;
-
-		if (GTK_WIDGET_DRAWABLE (labeled_image->details->image) &&
-		    GTK_WIDGET_NO_WINDOW (labeled_image->details->image) &&
-		    gtk_widget_intersect (labeled_image->details->image, &event->area, &image_event.area)) {
-			gtk_widget_event (labeled_image->details->image, (GdkEvent *) &image_event);
-		}
-	}
-
-	return FALSE;
-}
-
-static void
-nautilus_labeled_image_map (GtkWidget *widget)
-{
-	NautilusLabeledImage *labeled_image;
-
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (widget));
-	
-	labeled_image = NAUTILUS_LABELED_IMAGE (widget);
-
- 	GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
-	
-	if (labeled_image_show_label (labeled_image)) {
-		if (GTK_WIDGET_VISIBLE (labeled_image->details->label) &&
-		    !GTK_WIDGET_MAPPED (labeled_image->details->label)) {
-			gtk_widget_map (labeled_image->details->label);
-		}
-	}
-
-	if (labeled_image_show_image (labeled_image)) {
-		if (GTK_WIDGET_VISIBLE (labeled_image->details->image) &&
-		    !GTK_WIDGET_MAPPED (labeled_image->details->image)) {
-			gtk_widget_map (labeled_image->details->image);
-		}
-	}
-}
-
-static void
-nautilus_labeled_image_unmap (GtkWidget *widget)
-{
-	NautilusLabeledImage *labeled_image;
-
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (widget));
-	
-	labeled_image = NAUTILUS_LABELED_IMAGE (widget);
-
-	GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
-	
-	if (labeled_image->details->label != NULL) {
-		if (GTK_WIDGET_VISIBLE (labeled_image->details->label) &&
-		    GTK_WIDGET_MAPPED (labeled_image->details->label)) {
-			gtk_widget_unmap (labeled_image->details->label);
-		}
-	}
-
-	if (labeled_image->details->image != NULL) {
-		if (GTK_WIDGET_VISIBLE (labeled_image->details->image) &&
-		    GTK_WIDGET_MAPPED (labeled_image->details->image)) {
-			gtk_widget_unmap (labeled_image->details->image);
-		}
-	}
-}
-
-/* GtkContainerClass methods */
-static void
-nautilus_labeled_image_add (GtkContainer *container,
-			    GtkWidget *child)
-{
-	g_return_if_fail (container != NULL);
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (container));
-	g_return_if_fail (NAUTILUS_IS_LABEL (child) || NAUTILUS_IS_IMAGE (child));
-
-	gtk_widget_set_parent (child, GTK_WIDGET (container));
-
-	if (GTK_WIDGET_REALIZED (container)) {
-		gtk_widget_realize (child);
-	}
-	
-	if (GTK_WIDGET_VISIBLE (container) && GTK_WIDGET_VISIBLE (child)) {
-		if (GTK_WIDGET_MAPPED (container)) {
-			gtk_widget_map (child);
-		}
-		
-		gtk_widget_queue_resize (child);
-	}
-}
-
-static void
-nautilus_labeled_image_remove (GtkContainer *container,
-			       GtkWidget *child)
-{
-	NautilusLabeledImage *labeled_image;
-	gboolean child_was_visible;
-	
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (container));
-	g_return_if_fail (NAUTILUS_IS_LABEL (child) || NAUTILUS_IS_IMAGE (child));
-	
-	labeled_image = NAUTILUS_LABELED_IMAGE (container);;
-
-	g_return_if_fail (child == labeled_image->details->image || child == labeled_image->details->label);
-
-	child_was_visible = GTK_WIDGET_VISIBLE (child);
-
-	gtk_widget_unparent (child);
-
-	if (child_was_visible) {
-		gtk_widget_queue_resize (GTK_WIDGET (container));
-	}
-
-	if (labeled_image->details->image == child) {
-		labeled_image->details->image = NULL;
-	}
-
-	if (labeled_image->details->label == child) {
-		labeled_image->details->label = NULL;
-	}
-}
-
-static void
-nautilus_labeled_image_forall (GtkContainer *container,
-			       gboolean include_internals,
-			       GtkCallback callback,
-			       gpointer callback_data)
-{
-	NautilusLabeledImage *labeled_image;
-	
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (container));
-	g_return_if_fail (callback != NULL);
-	
-	labeled_image = NAUTILUS_LABELED_IMAGE (container);;
-	
-	if (include_internals) {
-		if (labeled_image->details->image != NULL) {
-			(* callback) (labeled_image->details->image, callback_data);
-		}
-
-		if (labeled_image->details->label != NULL) {
-			(* callback) (labeled_image->details->label, callback_data);
-		}
-	}
-}
-
-/* Private NautilusLabeledImage methods */
-static gboolean
-is_fixed_height (const NautilusLabeledImage *labeled_image)
-{
-	return labeled_image->details->fixed_image_height > 0;
-}
-
-static NautilusDimensions
-labeled_image_get_image_dimensions (const NautilusLabeledImage *labeled_image)
-{
-	NautilusDimensions image_dimensions;
-	GtkRequisition image_requisition;	
-
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NAUTILUS_DIMENSIONS_EMPTY);
-
-	if (!labeled_image_show_image (labeled_image)) {
-		return NAUTILUS_DIMENSIONS_EMPTY;
-	}
-	
-	gtk_widget_size_request (labeled_image->details->image, &image_requisition);
-
-	image_dimensions.width = (int) image_requisition.width;
-	image_dimensions.height = (int) image_requisition.height;
-
-	if (is_fixed_height (labeled_image)) {
-		image_dimensions.height = labeled_image->details->fixed_image_height;
-	}
-
-	return image_dimensions;
-}
-
-static NautilusDimensions
-labeled_image_get_label_dimensions (const NautilusLabeledImage *labeled_image)
-{
-	NautilusDimensions label_dimensions;
-	GtkRequisition label_requisition;	
-
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NAUTILUS_DIMENSIONS_EMPTY);
-
-	if (!labeled_image_show_label (labeled_image)) {
-		return NAUTILUS_DIMENSIONS_EMPTY;
-	}
-	
-	gtk_widget_size_request (labeled_image->details->label, &label_requisition);
-	
-	label_dimensions.width = (int) label_requisition.width;
-	label_dimensions.height = (int) label_requisition.height;
-
-	return label_dimensions;
-}
-
-static ArtIRect
-labeled_image_get_image_bounds_fill (const NautilusLabeledImage *labeled_image)
-{
-	ArtIRect image_bounds;
-	NautilusDimensions image_dimensions;
-	ArtIRect content_bounds;
-	ArtIRect bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NAUTILUS_ART_IRECT_EMPTY);
-
-	image_dimensions = labeled_image_get_image_dimensions (labeled_image);
-
-	if (nautilus_dimensions_empty (&image_dimensions)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	content_bounds = labeled_image_get_content_bounds (labeled_image);
-	bounds = nautilus_gtk_widget_get_bounds (GTK_WIDGET (labeled_image));
-	
-	if (!labeled_image_show_label (labeled_image)) {
-		image_bounds = bounds;
-	} else {
-		switch (labeled_image->details->label_position) {
-		case GTK_POS_LEFT:
-			image_bounds.y0 = bounds.y0;
-			image_bounds.x0 = content_bounds.x1 - image_dimensions.width;
-			image_bounds.y1 = bounds.y1;
-			image_bounds.x1 = bounds.x1;
-			break;
-
-		case GTK_POS_RIGHT:
-			image_bounds.y0 = bounds.y0;
-			image_bounds.x0 = bounds.x0;
-			image_bounds.y1 = bounds.y1;
-			image_bounds.x1 = content_bounds.x0 + image_dimensions.width;
-			break;
-
-		case GTK_POS_TOP:
-			image_bounds.x0 = bounds.x0;
-			image_bounds.y0 = content_bounds.y1 - image_dimensions.height;
-			image_bounds.x1 = bounds.x1;
-			image_bounds.y1 = bounds.y1;
-			break;
-
-		case GTK_POS_BOTTOM:
-			image_bounds.x0 = bounds.x0;
-			image_bounds.y0 = bounds.y0;
-			image_bounds.x1 = bounds.x1;
-			image_bounds.y1 = content_bounds.y0 + image_dimensions.height;
-			break;
-		}
-	}
-
-	return image_bounds;
-}
-
-ArtIRect
-nautilus_labeled_image_get_image_bounds (const NautilusLabeledImage *labeled_image)
-{
-	NautilusDimensions image_dimensions;
-	NautilusDimensions label_dimensions;
-	GtkRequisition image_requisition;
-	ArtIRect image_bounds;
-	ArtIRect content_bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NAUTILUS_ART_IRECT_EMPTY);
-
-	if (labeled_image->details->fill) {
-		return labeled_image_get_image_bounds_fill (labeled_image);
-	}
-
-	/* get true real dimensions if we're in fixed height mode */
-	if (is_fixed_height (labeled_image) && labeled_image_show_image (labeled_image)) {
-		gtk_widget_size_request (labeled_image->details->image, &image_requisition);
-		image_dimensions.width = (int) image_requisition.width;
-		image_dimensions.height = (int) image_requisition.height;
-	} else {
-		image_dimensions = labeled_image_get_image_dimensions (labeled_image);
-	}
-	
-	label_dimensions = labeled_image_get_label_dimensions (labeled_image);
-
-	if (nautilus_dimensions_empty (&image_dimensions)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	content_bounds = labeled_image_get_content_bounds (labeled_image);
-	
-	if (!labeled_image_show_label (labeled_image)) {
-		image_bounds.x0 = 
-			content_bounds.x0 +
-			(nautilus_art_irect_get_width (&content_bounds) - image_dimensions.width) / 2;
-		image_bounds.y0 = 
-			content_bounds.y0 +
-			(nautilus_art_irect_get_height (&content_bounds) - image_dimensions.height) / 2;
-	} else {
-		switch (labeled_image->details->label_position) {
-		case GTK_POS_LEFT:
-			image_bounds.x0 = content_bounds.x1 - image_dimensions.width;
-			image_bounds.y0 = 
-				content_bounds.y0 +
-				(nautilus_art_irect_get_height (&content_bounds) - image_dimensions.height) / 2;
-			break;
-
-		case GTK_POS_RIGHT:
-			image_bounds.x0 = content_bounds.x0;
-			image_bounds.y0 = 
-				content_bounds.y0 +
-				(nautilus_art_irect_get_height (&content_bounds) - image_dimensions.height) / 2;
-			break;
-
-		case GTK_POS_TOP:
-			image_bounds.x0 = 
-				content_bounds.x0 +
-				(nautilus_art_irect_get_width (&content_bounds) - image_dimensions.width) / 2;
-			image_bounds.y0 = content_bounds.y1 - image_dimensions.height;
-			break;
-
-		case GTK_POS_BOTTOM:
-			image_bounds.x0 = 
-				content_bounds.x0 +
-				(nautilus_art_irect_get_width (&content_bounds) - image_dimensions.width) / 2;
-				
-			if (is_fixed_height (labeled_image)) {	
-				image_bounds.y0 = content_bounds.y0 + nautilus_art_irect_get_height (&content_bounds)
-						  - image_dimensions.height
-						  - label_dimensions.height
-						  - labeled_image->details->spacing;
-			} else {
-				image_bounds.y0 = content_bounds.y0;
-			}	
-
-			break;
-		}
-	}
-	
-	image_bounds.x1 = image_bounds.x0 + image_dimensions.width;
-	image_bounds.y1 = image_bounds.y0 + image_dimensions.height;
-
-	return image_bounds;
-}
-
-static ArtIRect
-labeled_image_get_label_bounds_fill (const NautilusLabeledImage *labeled_image)
-{
-	ArtIRect label_bounds;
-	NautilusDimensions label_dimensions;
-	ArtIRect content_bounds;
-	ArtIRect bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NAUTILUS_ART_IRECT_EMPTY);
-
-	label_dimensions = labeled_image_get_label_dimensions (labeled_image);
-
-	if (nautilus_dimensions_empty (&label_dimensions)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	content_bounds = labeled_image_get_content_bounds (labeled_image);
-	bounds = nautilus_gtk_widget_get_bounds (GTK_WIDGET (labeled_image));
-
-	/* Only the label is shown */
-	if (!labeled_image_show_image (labeled_image)) {
-		label_bounds = bounds;
-	/* Both label and image are shown */
-	} else {
-		switch (labeled_image->details->label_position) {
-		case GTK_POS_LEFT:
-			label_bounds.y0 = bounds.y0;
-			label_bounds.x0 = bounds.x0;
-			label_bounds.y1 = bounds.y1;
-			label_bounds.x1 = content_bounds.x0 + label_dimensions.width;
-			break;
-
-		case GTK_POS_RIGHT:
-			label_bounds.y0 = bounds.y0;
-			label_bounds.x0 = content_bounds.x1 - label_dimensions.width;
-			label_bounds.y1 = bounds.y1;
-			label_bounds.x1 = bounds.x1;
-			break;
-
-		case GTK_POS_TOP:
-			label_bounds.x0 = bounds.x0;
-			label_bounds.y0 = bounds.y0;
-			label_bounds.x1 = bounds.x1;
-			label_bounds.y1 = content_bounds.y0 + label_dimensions.height;
-			break;
-
-		case GTK_POS_BOTTOM:
-			label_bounds.x0 = bounds.x0;
-			label_bounds.y0 = content_bounds.y1 - label_dimensions.height;
-			label_bounds.x1 = bounds.x1;
-			label_bounds.y1 = bounds.y1;
-			break;
-		}
-	}
-
-	return label_bounds;
-}
-
-ArtIRect
-nautilus_labeled_image_get_label_bounds (const NautilusLabeledImage *labeled_image)
-{
-	ArtIRect label_bounds;
-	NautilusDimensions label_dimensions;
-	ArtIRect content_bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NAUTILUS_ART_IRECT_EMPTY);
-
-	if (labeled_image->details->fill) {
-		return labeled_image_get_label_bounds_fill (labeled_image);
-	}
-
-	label_dimensions = labeled_image_get_label_dimensions (labeled_image);
-
-	if (nautilus_dimensions_empty (&label_dimensions)) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	content_bounds = labeled_image_get_content_bounds (labeled_image);
-
-	/* Only the label is shown */
-	if (!labeled_image_show_image (labeled_image)) {
-		label_bounds.x0 = 
-			content_bounds.x0 +
-			(nautilus_art_irect_get_width (&content_bounds) - label_dimensions.width) / 2;
-		label_bounds.y0 = 
-			content_bounds.y0 +
-			(nautilus_art_irect_get_height (&content_bounds) - label_dimensions.height) / 2;
-	/* Both label and image are shown */
-	} else {
-		switch (labeled_image->details->label_position) {
-		case GTK_POS_LEFT:
-			label_bounds.x0 = content_bounds.x0;
-			label_bounds.y0 = 
-				content_bounds.y0 +
-				(nautilus_art_irect_get_height (&content_bounds) - label_dimensions.height) / 2;
-			break;
-
-		case GTK_POS_RIGHT:
-			label_bounds.x0 = content_bounds.x1 - label_dimensions.width;
-			label_bounds.y0 = 
-				content_bounds.y0 +
-				(nautilus_art_irect_get_height (&content_bounds) - label_dimensions.height) / 2;
-			break;
-
-		case GTK_POS_TOP:
-			label_bounds.x0 = 
-				content_bounds.x0 +
-				(nautilus_art_irect_get_width (&content_bounds) - label_dimensions.width) / 2;
-			label_bounds.y0 = content_bounds.y0;
-			break;
-
-		case GTK_POS_BOTTOM:
-			label_bounds.x0 = 
-				content_bounds.x0 +
-				(nautilus_art_irect_get_width (&content_bounds) - label_dimensions.width) / 2;
-			label_bounds.y0 = content_bounds.y1 - label_dimensions.height;
-			break;
-		}
-	}
-	
-	label_bounds.x1 = label_bounds.x0 + label_dimensions.width;
-	label_bounds.y1 = label_bounds.y0 + label_dimensions.height;
-
-	return label_bounds;
-}
-
-static void
-labeled_image_update_alignments (NautilusLabeledImage *labeled_image)
-{
-
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	if (labeled_image->details->label != NULL) {
-		float x_alignment;
-		float y_alignment;
-		
-		if (labeled_image->details->fill) {	
-			x_alignment = GTK_MISC (labeled_image->details->label)->xalign;
-			y_alignment = GTK_MISC (labeled_image->details->label)->yalign;
-			
-			/* Only the label is shown */
-			if (!labeled_image_show_image (labeled_image)) {
-				x_alignment = 0.5;
-				y_alignment = 0.5;
-			/* Both label and image are shown */
-			} else {
-				switch (labeled_image->details->label_position) {
-				case GTK_POS_LEFT:
-					x_alignment = 1.0;
-					y_alignment = 0.5;
-					break;
-					
-				case GTK_POS_RIGHT:
-					x_alignment = 0.0;
-					y_alignment = 0.5;
-					break;
-					
-				case GTK_POS_TOP:
-					x_alignment = 0.5;
-					y_alignment = 1.0;
-					break;
-					
-				case GTK_POS_BOTTOM:
-					x_alignment = 0.5;
-					y_alignment = 0.0;
-					break;
-				}
-				
-			}
-
-			gtk_misc_set_alignment (GTK_MISC (labeled_image->details->label),
-						x_alignment,
-						y_alignment);
-		}
-	}
-
-	if (labeled_image->details->image != NULL) {
-		float x_alignment;
-		float y_alignment;
-		
-		if (labeled_image->details->fill) {	
-			x_alignment = GTK_MISC (labeled_image->details->image)->xalign;
-			y_alignment = GTK_MISC (labeled_image->details->image)->yalign;
-			
-			/* Only the image is shown */
-			if (!labeled_image_show_label (labeled_image)) {
-				x_alignment = 0.5;
-				y_alignment = 0.5;
-			/* Both label and image are shown */
-			} else {
-				switch (labeled_image->details->label_position) {
-				case GTK_POS_LEFT:
-					x_alignment = 0.0;
-					y_alignment = 0.5;
-					break;
-
-				case GTK_POS_RIGHT:
-					x_alignment = 1.0;
-					y_alignment = 0.5;
-					break;
-					
-				case GTK_POS_TOP:
-					x_alignment = 0.5;
-					y_alignment = 0.0;
-					break;
-					
-				case GTK_POS_BOTTOM:
-					x_alignment = 0.5;
-					y_alignment = 1.0;
-					break;
-				}
-			}
-			
-			gtk_misc_set_alignment (GTK_MISC (labeled_image->details->image),
-						x_alignment,
-						y_alignment);
-		}
-	}
-}
-
-static NautilusDimensions
-labeled_image_get_content_dimensions (const NautilusLabeledImage *labeled_image)
-{
-	NautilusDimensions image_dimensions;
-	NautilusDimensions label_dimensions;
-	NautilusDimensions content_dimensions;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NAUTILUS_DIMENSIONS_EMPTY);
-
-	image_dimensions = labeled_image_get_image_dimensions (labeled_image);
-	label_dimensions = labeled_image_get_label_dimensions (labeled_image);
-
-	content_dimensions = NAUTILUS_DIMENSIONS_EMPTY;
-
-	/* Both shown */
-	if (!nautilus_dimensions_empty (&image_dimensions) && !nautilus_dimensions_empty (&label_dimensions)) {
-		content_dimensions.width = 
-			image_dimensions.width + labeled_image->details->spacing + label_dimensions.width;
-		switch (labeled_image->details->label_position) {
-		case GTK_POS_LEFT:
-		case GTK_POS_RIGHT:
-			content_dimensions.width = 
-				image_dimensions.width + labeled_image->details->spacing + label_dimensions.width;
-			content_dimensions.height = MAX (image_dimensions.height, label_dimensions.height);
-			break;
-
-		case GTK_POS_TOP:
-		case GTK_POS_BOTTOM:
-			content_dimensions.width = MAX (image_dimensions.width, label_dimensions.width);
-			content_dimensions.height = 
-				image_dimensions.height + labeled_image->details->spacing + label_dimensions.height;
-			break;
-		}
-	/* Only image shown */
-	} else if (!nautilus_dimensions_empty (&image_dimensions)) {
-		content_dimensions.width = image_dimensions.width;
-		content_dimensions.height = image_dimensions.height;
-	/* Only label shown */
-	} else {
-		content_dimensions.width = label_dimensions.width;
-		content_dimensions.height = label_dimensions.height;
-	}
-
-	return content_dimensions;
-}
-
-static ArtIRect
-labeled_image_get_content_bounds (const NautilusLabeledImage *labeled_image)
-{
-	NautilusDimensions content_dimensions;
-	ArtIRect content_bounds;
-	ArtIRect bounds;
-
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NAUTILUS_ART_IRECT_EMPTY);
-
-	bounds = nautilus_gtk_widget_get_bounds (GTK_WIDGET (labeled_image));
-
-	content_dimensions = labeled_image_get_content_dimensions (labeled_image);
-	content_bounds = nautilus_art_irect_align (&bounds,
-						   content_dimensions.width,
-						   content_dimensions.height,
-						   labeled_image->details->x_alignment,
-						   labeled_image->details->y_alignment);
-
-	return content_bounds;
-}
-
-static void
-labeled_image_ensure_label (NautilusLabeledImage *labeled_image)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->label != NULL) {
-		return;
-	}
-
- 	labeled_image->details->label = nautilus_label_new (NULL);
-	gtk_container_add (GTK_CONTAINER (labeled_image), labeled_image->details->label);
-	gtk_widget_show (labeled_image->details->label);
-}
-
-static void
-labeled_image_ensure_image (NautilusLabeledImage *labeled_image)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->image != NULL) {
-		return;
-	}
-
- 	labeled_image->details->image = nautilus_image_new (NULL);
-	gtk_container_add (GTK_CONTAINER (labeled_image), labeled_image->details->image);
-	gtk_widget_show (labeled_image->details->image);
-}
-
-static gboolean
-labeled_image_show_image (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), FALSE);
-	
-	return labeled_image->details->image != NULL && labeled_image->details->show_image;
-}
-
-static gboolean
-labeled_image_show_label (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), FALSE);
-
-	return labeled_image->details->label != NULL && labeled_image->details->show_label;
-}
-
-/**
- * nautilus_labeled_image_new:
- * @text: Text to use for label or NULL.
- * @pixbuf: Pixbuf to use for image or NULL.
- *
- * Returns A newly allocated NautilusLabeledImage.  If the &text parameter is not
- * NULL then the LabeledImage will show a label.  If the &pixbuf parameter is not
- * NULL then the LabeledImage will show a pixbuf.  Either of these can be NULL at
- * creation time.  
- *
- * Later in the lifetime of the widget you can invoke methods that affect the 
- * label and/or the image.  If at creation time these were NULL, then they will
- * be created as neeeded.
- *
- * Thus, using this widget in place of NautilusImage or NautilusLabel is "free" with
- * only the GtkObject and function call overhead.
- *
- */
-GtkWidget*
-nautilus_labeled_image_new (const char *text,
-			    GdkPixbuf *pixbuf)
-{
-	NautilusLabeledImage *labeled_image;
-
-	labeled_image = NAUTILUS_LABELED_IMAGE (gtk_widget_new (nautilus_labeled_image_get_type (), NULL));
-	
-	if (text != NULL) {
-		nautilus_labeled_image_set_text (labeled_image, text);
-	}
-
-	if (pixbuf != NULL) {
-		nautilus_labeled_image_set_pixbuf (labeled_image, pixbuf);
-	}
-
-	labeled_image_update_alignments (labeled_image);
-
-	return GTK_WIDGET (labeled_image);
-}
-
-/**
- * nautilus_labeled_image_new_from_file_name:
- * @text: Text to use for label or NULL.
- * @file_name: File name of picture to use for pixbuf.  Cannot be NULL.
- *
- * Returns A newly allocated NautilusLabeledImage.  If the &text parameter is not
- * NULL then the LabeledImage will show a label.
- *
- */
-GtkWidget*
-nautilus_labeled_image_new_from_file_name (const char *text,
-					   const char *pixbuf_file_name)
-{
-	NautilusLabeledImage *labeled_image;
-
-	g_return_val_if_fail (pixbuf_file_name != NULL, NULL);
-
-	labeled_image = NAUTILUS_LABELED_IMAGE (nautilus_labeled_image_new (text, NULL));
-	nautilus_labeled_image_set_pixbuf_from_file_name (labeled_image, pixbuf_file_name);
-	return GTK_WIDGET (labeled_image);
-}
-
-/**
- * nautilus_labeled_image_set_label_position:
- * @labeled_image: A NautilusLabeledImage.
- * @label_position: The position of the label with respect to the image.
- *
- * Set the position of the label with respect to the image as follows:
- *
- * GTK_POS_LEFT:
- *   [ <label> <image> ]
- *
- * GTK_POS_RIGHT:
- *   [ <image> <label> ]
- *
- * GTK_POS_TOP:
- *   [ <label> ]
- *   [ <image> ]
- *
- * GTK_POS_BOTTOM:
- *   [ <image> ]
- *   [ <label> ]
- *
- */
-void
-nautilus_labeled_image_set_label_position (NautilusLabeledImage *labeled_image,
-					   GtkPositionType label_position)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	g_return_if_fail (label_position >= GTK_POS_LEFT);
-	g_return_if_fail (label_position <= GTK_POS_BOTTOM);
-	
-	if (labeled_image->details->label_position == label_position) {
-		return;
-	}
-
-	labeled_image->details->label_position = label_position;
-
-	labeled_image_update_alignments (labeled_image);
-
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_get_label_postiion:
- * @labeled_image: A NautilusLabeledImage.
- *
- * Returns an enumeration indicating the position of the label with respect to the image.
- */
-GtkPositionType
-nautilus_labeled_image_get_label_position (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), 0);
-	
-	return labeled_image->details->label_position;
-}
-
-/**
- * nautilus_labeled_image_set_show_label:
- * @labeled_image: A NautilusLabeledImage.
- * @show_image: A boolean value indicating whether the label should be shown.
- *
- * Update the labeled image to either show or hide the internal label widget.
- * This function doesnt have any effect if the LabeledImage doesnt already
- * contain an label.
- */
-void
-nautilus_labeled_image_set_show_label (NautilusLabeledImage *labeled_image,
-				       gboolean show_label)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->show_label == show_label) {
-		return;
-	}
-
-	labeled_image->details->show_label = show_label;
-
-	if (labeled_image->details->label != NULL) {
-		if (labeled_image->details->show_label) {
-			gtk_widget_show (labeled_image->details->label);
-		} else {
-			gtk_widget_hide (labeled_image->details->label);
-		}
-	}
-
-	labeled_image_update_alignments (labeled_image);
-
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_get_show_label:
- * @labeled_image: A NautilusLabeledImage.
- *
- * Returns a boolean value indicating whether the internal label is shown.
- */
-gboolean
-nautilus_labeled_image_get_show_label (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), 0);
-	
-	return labeled_image->details->show_label;
-}
-
-/**
- * nautilus_labeled_image_set_show_image:
- * @labeled_image: A NautilusLabeledImage.
- * @show_image: A boolean value indicating whether the image should be shown.
- *
- * Update the labeled image to either show or hide the internal image widget.
- * This function doesnt have any effect if the LabeledImage doesnt already
- * contain an image.
- */
-void
-nautilus_labeled_image_set_show_image (NautilusLabeledImage *labeled_image,
-				       gboolean show_image)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->show_image == show_image) {
-		return;
-	}
-
-	labeled_image->details->show_image = show_image;
-
-	if (labeled_image->details->image != NULL) {
-		if (labeled_image->details->show_image) {
-			gtk_widget_show (labeled_image->details->image);
-		} else {
-			gtk_widget_hide (labeled_image->details->image);
-		}
-	}
-
-	labeled_image_update_alignments (labeled_image);
-
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_get_show_image:
- * @labeled_image: A NautilusLabeledImage.
- *
- * Returns a boolean value indicating whether the internal image is shown.
- */
-gboolean
-nautilus_labeled_image_get_show_image (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), 0);
-	
-	return labeled_image->details->show_image;
-}
-
-
-/**
- * nautilus_labeled_image_set_fixed_image_height:
- * @labeled_image: A NautilusLabeledImage.
- * @fixed_image_height: The new fixed image height.
- *
- * Normally, we measure the height of images, but it's sometimes useful
- * to use a fixed height for all the images.  This routine sets the
- * image height to the passed in value
- *
- */
-void
-nautilus_labeled_image_set_fixed_image_height (NautilusLabeledImage *labeled_image,
-						int new_height)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->fixed_image_height == new_height) {
-		return;
-	}
-	
-	labeled_image->details->fixed_image_height = new_height;
-
-	labeled_image_update_alignments (labeled_image);
-	
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_set_spacing:
- * @labeled_image: A NautilusLabeledImage.
- * @spacing: The new spacing between label and image.
- *
- * Set the spacing between label and image.  This will only affect
- * the geometry of the widget if both a label and image are currently
- * visible.
- *
- */
-void
-nautilus_labeled_image_set_spacing (NautilusLabeledImage *labeled_image,
-				    guint spacing)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->spacing == spacing) {
-		return;
-	}
-	
-	labeled_image->details->spacing = spacing;
-
-	labeled_image_update_alignments (labeled_image);
-	
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_get_spacing:
- * @labeled_image: A NautilusLabeledImage.
- *
- * Returns: The spacing between the label and image.
- */
-guint
-nautilus_labeled_image_get_spacing (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), 0);
-	
-	return labeled_image->details->spacing;
-}
-
-/**
- * nautilus_labeled_image_set_x_padding:
- * @labeled_image: A NautilusLabeledImage.
- * @x_padding: The new horizontal padding.
- *
- * Set horizontal padding for the NautilusLabeledImage.  The padding
- * attribute work just like that in GtkMisc.
- */
-void
-nautilus_labeled_image_set_x_padding (NautilusLabeledImage *labeled_image,
-				      int x_padding)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	x_padding = MAX (0, x_padding);
-	
-	if (labeled_image->details->x_padding == x_padding) {
-		return;
-	}
-	
-	labeled_image->details->x_padding = x_padding;
-	labeled_image_update_alignments (labeled_image);
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_get_x_padding:
- * @labeled_image: A NautilusLabeledImage.
- *
- * Returns: The horizontal padding for the LabeledImage's content.
- */
-int
-nautilus_labeled_image_get_x_padding (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), 0);
-
-	return labeled_image->details->x_padding;
-}
-
-/**
- * nautilus_labeled_image_set_y_padding:
- * @labeled_image: A NautilusLabeledImage.
- * @x_padding: The new vertical padding.
- *
- * Set vertical padding for the NautilusLabeledImage.  The padding
- * attribute work just like that in GtkMisc.
- */
-void
-nautilus_labeled_image_set_y_padding (NautilusLabeledImage *labeled_image,
-				      int y_padding)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	y_padding = MAX (0, y_padding);
-	
-	if (labeled_image->details->y_padding == y_padding) {
-		return;
-	}
-	
-	labeled_image->details->y_padding = y_padding;
-	labeled_image_update_alignments (labeled_image);
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_get_x_padding:
- * @labeled_image: A NautilusLabeledImage.
- *
- * Returns: The vertical padding for the LabeledImage's content.
- */
-int
-nautilus_labeled_image_get_y_padding (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), 0);
-
-	return labeled_image->details->y_padding;
-}
-
-/**
- * nautilus_labeled_image_set_x_alignment:
- * @labeled_image: A NautilusLabeledImage.
- * @x_alignment: The new horizontal alignment.
- *
- * Set horizontal alignment for the NautilusLabeledImage's content.
- * The 'content' is the union of the image and label.  The alignment
- * attribute work just like that in GtkMisc.
- */
-void
-nautilus_labeled_image_set_x_alignment (NautilusLabeledImage *labeled_image,
-				      float x_alignment)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	x_alignment = MAX (0, x_alignment);
-	x_alignment = MIN (1.0, x_alignment);
-	
-	if (labeled_image->details->x_alignment == x_alignment) {
-		return;
-	}
-	
-	labeled_image->details->x_alignment = x_alignment;
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_get_x_alignment:
- * @labeled_image: A NautilusLabeledImage.
- *
- * Returns: The horizontal alignment for the LabeledImage's content.
- */
-float
-nautilus_labeled_image_get_x_alignment (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), 0);
-
-	return labeled_image->details->x_alignment;
-}
-
-/**
- * nautilus_labeled_image_set_y_alignment:
- * @labeled_image: A NautilusLabeledImage.
- * @y_alignment: The new vertical alignment.
- *
- * Set vertical alignment for the NautilusLabeledImage's content.
- * The 'content' is the union of the image and label.  The alignment
- * attribute work just like that in GtkMisc.
- */
-void
-nautilus_labeled_image_set_y_alignment (NautilusLabeledImage *labeled_image,
-					float y_alignment)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	y_alignment = MAX (0, y_alignment);
-	y_alignment = MIN (1.0, y_alignment);
-	
-	if (labeled_image->details->y_alignment == y_alignment) {
-		return;
-	}
-	
-	labeled_image->details->y_alignment = y_alignment;
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_get_y_alignment:
- * @labeled_image: A NautilusLabeledImage.
- *
- * Returns: The vertical alignment for the LabeledImage's content.
- */
-float
-nautilus_labeled_image_get_y_alignment (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), 0);
-
-	return labeled_image->details->y_alignment;
-}
-
-/**
- * nautilus_labeled_image_set_fill:
- * @labeled_image: A NautilusLabeledImage.
- * @fill: A boolean value indicating whether the internal image and label
- * widgets should fill all the available allocation.
- *
- * By default the internal image and label wigets are sized to their natural
- * preferred geometry.  You can use the 'fill' attribute of LabeledImage
- * to have the internal widgets fill as much of the LabeledImage allocation
- * as is available.  This is useful if you install a tile_pixbuf and want it
- * to cover the whole widget, and not just the areas occupied by the internal
- * widgets.
- */
-void
-nautilus_labeled_image_set_fill (NautilusLabeledImage *labeled_image,
-				 gboolean fill)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->fill == fill) {
-		return;
-	}
-
-	labeled_image->details->fill = fill;
-
-	labeled_image_update_alignments (labeled_image);
-	
-	gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-}
-
-/**
- * nautilus_labeled_image_get_fill:
- * @labeled_image: A NautilusLabeledImage.
- *
- * Retruns a boolean value indicating whether the internal widgets fill
- * all the available allocation.
- */
-gboolean
-nautilus_labeled_image_get_fill (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), 0);
-	
-	return labeled_image->details->fill;
-}
-
-/**
- * nautilus_labeled_image_button_new:
- * @text: Text to use for label or NULL.
- * @pixbuf: Pixbuf to use for image or NULL.
- *
- * Create a stock GtkButton with a NautilusLabeledImage child.
- *
- */
-GtkWidget *
-nautilus_labeled_image_button_new (const char *text,
-				   GdkPixbuf *pixbuf)
-{
-	GtkWidget *button;
-	GtkWidget *labeled_image;
-	
-	button = gtk_button_new ();
-	labeled_image = nautilus_labeled_image_new (text, pixbuf);
-	gtk_container_add (GTK_CONTAINER (button), labeled_image);
-	gtk_widget_show (labeled_image);
-	
-	return button;
-}
-
-/**
- * nautilus_labeled_image_button_new_from_file_name:
- * @text: Text to use for label or NULL.
- * @pixbuf_file_name: Name of pixbuf to use for image.  Cannot be NULL.
- *
- * Create a stock GtkToggleButton with a NautilusLabeledImage child.
- *
- */
-GtkWidget *
-nautilus_labeled_image_button_new_from_file_name (const char *text,
-							 const char *pixbuf_file_name)
-{
-	GtkWidget *button;
-	GtkWidget *labeled_image;
-
-	g_return_val_if_fail (pixbuf_file_name != NULL, NULL);
-	
-	button = gtk_button_new ();
-	labeled_image = nautilus_labeled_image_new_from_file_name (text, pixbuf_file_name);
-	gtk_container_add (GTK_CONTAINER (button), labeled_image);
-	gtk_widget_show (labeled_image);
-	
-	return button;
-}
-
-/**
- * nautilus_labeled_image_toggle_button_new:
- * @text: Text to use for label or NULL.
- * @pixbuf: Pixbuf to use for image or NULL.
- *
- * Create a stock GtkToggleButton with a NautilusLabeledImage child.
- *
- */
-GtkWidget *
-nautilus_labeled_image_toggle_button_new (const char *text,
-					  GdkPixbuf *pixbuf)
-{
-	GtkWidget *toggle_button;
-	GtkWidget *labeled_image;
-	
-	toggle_button = gtk_toggle_button_new ();
-	labeled_image = nautilus_labeled_image_new (text, pixbuf);
-	gtk_container_add (GTK_CONTAINER (toggle_button), labeled_image);
-	gtk_widget_show (labeled_image);
-	
-	return toggle_button;
-}
-
-/**
- * nautilus_labeled_image_toggle_button_new_from_file_name:
- * @text: Text to use for label or NULL.
- * @pixbuf_file_name: Name of pixbuf to use for image.  Cannot be NULL.
- *
- * Create a stock GtkToggleButton with a NautilusLabeledImage child.
- *
- */
-GtkWidget *
-nautilus_labeled_image_toggle_button_new_from_file_name (const char *text,
-							 const char *pixbuf_file_name)
-{
-	GtkWidget *toggle_button;
-	GtkWidget *labeled_image;
-
-	g_return_val_if_fail (pixbuf_file_name != NULL, NULL);
-	
-	toggle_button = gtk_toggle_button_new ();
-	labeled_image = nautilus_labeled_image_new_from_file_name (text, pixbuf_file_name);
-	gtk_container_add (GTK_CONTAINER (toggle_button), labeled_image);
-	gtk_widget_show (labeled_image);
-	
-	return toggle_button;
-}
-
-/*
- * Workaround some bugs in GtkCheckButton where the widget 
- * does not redraw properly after leave or focus out events
- * 
- * The workaround is to draw a little bit more than the 
- * widget itself - 4 pixels worth.  For some reason the
- * widget does not properly redraw its edges.
- */
-static void
-button_leave_callback (GtkWidget *widget,
-		       gpointer callback_data)
-{
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-
-	if (GTK_WIDGET_DRAWABLE (widget)) {
-		const int fudge = 4;
-		ArtIRect bounds;
-
-		bounds = nautilus_gtk_widget_get_bounds (widget);
-		
-		bounds.x0 -= fudge;
-		bounds.y0 -= fudge;
-		bounds.x1 += fudge;
-		bounds.y1 += fudge;
-		
-		gtk_widget_queue_draw_area (widget->parent,
-					    bounds.x0,
-					    bounds.y0,
-					    nautilus_art_irect_get_width (&bounds),
-					    nautilus_art_irect_get_height (&bounds));
-	}
-}
-
-static gint
-button_focus_out_event_callback (GtkWidget *widget,
-				 GdkEventFocus *event,
-				 gpointer callback_data)
-{
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-
-	button_leave_callback (widget, callback_data);
-
-	return FALSE;
-}
-
-/**
- * nautilus_labeled_image_check_button_new:
- * @text: Text to use for label or NULL.
- * @pixbuf: Pixbuf to use for image or NULL.
- *
- * Create a stock GtkCheckButton with a NautilusLabeledImage child.
- *
- */
-GtkWidget *
-nautilus_labeled_image_check_button_new (const char *text,
-					 GdkPixbuf *pixbuf)
-{
-	GtkWidget *check_button;
-	GtkWidget *labeled_image;
-	
-	check_button = gtk_check_button_new ();
-	labeled_image = nautilus_labeled_image_new (text, pixbuf);
-	gtk_container_add (GTK_CONTAINER (check_button), labeled_image);
-	gtk_widget_show (labeled_image);
-	
-	/*
-	 * Workaround some bugs in GtkCheckButton where the widget 
-	 * does not redraw properly after leave or focus out events
-	 */
-	gtk_signal_connect_while_alive (GTK_OBJECT (check_button),
-					"leave",
-					GTK_SIGNAL_FUNC (button_leave_callback),
-					NULL,
-					GTK_OBJECT (check_button));
-	gtk_signal_connect_while_alive (GTK_OBJECT (check_button),
-					"focus_out_event",
-					GTK_SIGNAL_FUNC (button_focus_out_event_callback),
-					NULL,
-					GTK_OBJECT (check_button));
-	
-	return check_button;
-}
-
-/**
- * nautilus_labeled_image_check_button_new_from_file_name:
- * @text: Text to use for label or NULL.
- * @pixbuf_file_name: Name of pixbuf to use for image.  Cannot be NULL.
- *
- * Create a stock GtkCheckButton with a NautilusLabeledImage child.
- *
- */
-GtkWidget *
-nautilus_labeled_image_check_button_new_from_file_name (const char *text,
-							const char *pixbuf_file_name)
-{
-	GtkWidget *check_button;
-	GtkWidget *labeled_image;
-
-	g_return_val_if_fail (pixbuf_file_name != NULL, NULL);
-	
-	check_button = gtk_check_button_new ();
-	labeled_image = nautilus_labeled_image_new_from_file_name (text, pixbuf_file_name);
-	gtk_container_add (GTK_CONTAINER (check_button), labeled_image);
-	gtk_widget_show (labeled_image);
-	
-	return check_button;
-}
-
-/*
- * The rest of the methods are proxies for those in NautilusImage and 
- * NautilusLabel.  We have all these so that we dont have to expose 
- * our internal widgets at all.  Probably more of these will be added
- * as they are needed.
- */
-
-/**
- * nautilus_labeled_image_set_pixbuf:
- * @labaled_image: A NautilusLabeledImage.
- * @pixbuf: New pixbuf to use or NULL.
- *
- * Change the pixbuf displayed by the LabeledImage.  Note that the widget display
- * is only updated if the show_image attribute is TRUE.
- *
- * If no internal image widget exists as of yet, a new one will be created.
- *
- * A NULL &pixbuf will cause the internal image widget (if alive) to be destroyed.
- */
-void
-nautilus_labeled_image_set_pixbuf (NautilusLabeledImage *labeled_image,
-				   GdkPixbuf *pixbuf)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	if (pixbuf == NULL) {
-		if (labeled_image->details->image != NULL) {
-			gtk_widget_destroy (labeled_image->details->image);
-			labeled_image->details->image = NULL;
-		}
-		
-		gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-	} else {
-		labeled_image_ensure_image (labeled_image);
-		nautilus_image_set_pixbuf (NAUTILUS_IMAGE (labeled_image->details->image), pixbuf);
-	}
-}
-
-void
-nautilus_labeled_image_set_pixbuf_from_file_name (NautilusLabeledImage *labeled_image,
-						  const char *pixbuf_file_name)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	labeled_image_ensure_image (labeled_image);
-	nautilus_image_set_pixbuf_from_file_name (NAUTILUS_IMAGE (labeled_image->details->image), pixbuf_file_name);
-}
-
-void
-nautilus_labeled_image_set_tile_pixbuf (NautilusLabeledImage *labeled_image,
-					GdkPixbuf *tile_pixbuf)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	if (labeled_image->details->image != NULL) {
-		nautilus_image_set_tile_pixbuf (NAUTILUS_IMAGE (labeled_image->details->image), tile_pixbuf);
-		nautilus_image_set_tile_mode_horizontal (NAUTILUS_IMAGE (labeled_image->details->image),
-							 NAUTILUS_SMOOTH_TILE_ANCESTOR);
-		nautilus_image_set_tile_mode_vertical (NAUTILUS_IMAGE (labeled_image->details->image),
-						       NAUTILUS_SMOOTH_TILE_ANCESTOR);
-	}
-
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_tile_pixbuf (NAUTILUS_LABEL (labeled_image->details->label), tile_pixbuf);
-		nautilus_label_set_tile_mode_horizontal (NAUTILUS_LABEL (labeled_image->details->label),
-							 NAUTILUS_SMOOTH_TILE_ANCESTOR);
-		nautilus_label_set_tile_mode_vertical (NAUTILUS_LABEL (labeled_image->details->label),
-						       NAUTILUS_SMOOTH_TILE_ANCESTOR);
-	}
-}
-
-void
-nautilus_labeled_image_set_tile_pixbuf_from_file_name (NautilusLabeledImage *labeled_image,
-						       const char *pixbuf_file_name)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->image != NULL) {
-		nautilus_image_set_tile_pixbuf_from_file_name (NAUTILUS_IMAGE (labeled_image->details->image),
-							       pixbuf_file_name);
-		nautilus_image_set_tile_mode_horizontal (NAUTILUS_IMAGE (labeled_image->details->image),
-							 NAUTILUS_SMOOTH_TILE_ANCESTOR);
-		nautilus_image_set_tile_mode_vertical (NAUTILUS_IMAGE (labeled_image->details->image),
-						       NAUTILUS_SMOOTH_TILE_ANCESTOR);
-	}
-
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_tile_pixbuf_from_file_name (NAUTILUS_LABEL (labeled_image->details->label),
-							       pixbuf_file_name);
-		nautilus_label_set_tile_mode_horizontal (NAUTILUS_LABEL (labeled_image->details->label),
-							 NAUTILUS_SMOOTH_TILE_ANCESTOR);
-		nautilus_label_set_tile_mode_vertical (NAUTILUS_LABEL (labeled_image->details->label),
-						       NAUTILUS_SMOOTH_TILE_ANCESTOR);
-	}
-}
-
-GdkPixbuf*
-nautilus_labeled_image_get_pixbuf (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NULL);
-
-	if (labeled_image->details->image == NULL) {
-		return NULL;
-	}
-	
-	return nautilus_image_get_pixbuf (NAUTILUS_IMAGE (labeled_image->details->image));
-}
-
-/**
- * nautilus_labeled_image_set_text:
- * @labaled_image: A NautilusLabeledImage.
- * @text: New text to use or NULL.
- *
- * Change the text displayed by the LabeledImage.  Note that the widget display
- * is only updated if the show_label attribute is TRUE.
- *
- * If no internal label widget exists as of yet, a new one will be created.
- *
- * A NULL &text will cause the internal label widget (if alive) to be destroyed.
- */
-void
-nautilus_labeled_image_set_text (NautilusLabeledImage *labeled_image,
-				const char *text)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	if (text == NULL) {
-		if (labeled_image->details->label) {
-			gtk_widget_destroy (labeled_image->details->label);
-			labeled_image->details->label = NULL;
-		}
-		
-		gtk_widget_queue_resize (GTK_WIDGET (labeled_image));
-	} else {
-		labeled_image_ensure_label (labeled_image);
-		nautilus_label_set_text (NAUTILUS_LABEL (labeled_image->details->label), text);
-	}
-}
-
-char *
-nautilus_labeled_image_get_text (const NautilusLabeledImage *labeled_image)
-{
-	g_return_val_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image), NULL);
-	
-	if (labeled_image->details->label == NULL) {
-		return NULL;
-	}
-
-	return nautilus_label_get_text (NAUTILUS_LABEL (labeled_image->details->label));
-}
-
-void
-nautilus_labeled_image_make_bold (NautilusLabeledImage *labeled_image)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	labeled_image_ensure_label (labeled_image);
-	nautilus_label_make_bold (NAUTILUS_LABEL (labeled_image->details->label));
-}
-
-void
-nautilus_labeled_image_make_larger (NautilusLabeledImage *labeled_image,
-				    guint num_sizes)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	labeled_image_ensure_label (labeled_image);
-	nautilus_label_make_larger (NAUTILUS_LABEL (labeled_image->details->label), num_sizes);
-}
-
-void
-nautilus_labeled_image_make_smaller (NautilusLabeledImage *labeled_image,
-				    guint num_sizes)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	labeled_image_ensure_label (labeled_image);
-	nautilus_label_make_smaller (NAUTILUS_LABEL (labeled_image->details->label), num_sizes);
-}
-
-void
-nautilus_labeled_image_set_tile_width (NautilusLabeledImage *labeled_image,
-				       int tile_width)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	if (labeled_image->details->image != NULL) {
-		nautilus_image_set_tile_width (NAUTILUS_IMAGE (labeled_image->details->image),
-					       tile_width);
-	}
-
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_tile_width (NAUTILUS_LABEL (labeled_image->details->label),
-					       tile_width);
-	}
-}
-
-void
-nautilus_labeled_image_set_tile_height (NautilusLabeledImage *labeled_image,
-					int tile_height)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	if (labeled_image->details->image != NULL) {
-		nautilus_image_set_tile_height (NAUTILUS_IMAGE (labeled_image->details->image),
-						tile_height);
-	}
-
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_tile_height (NAUTILUS_LABEL (labeled_image->details->label),
-						tile_height);
-	}
-}
-
-void
-nautilus_labeled_image_set_background_mode (NautilusLabeledImage *labeled_image,
-					    NautilusSmoothBackgroundMode background_mode)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	g_return_if_fail (background_mode >= NAUTILUS_SMOOTH_BACKGROUND_GTK);
-	g_return_if_fail (background_mode <= NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-
-	if (labeled_image->details->image != NULL) {
-		nautilus_image_set_background_mode (NAUTILUS_IMAGE (labeled_image->details->image),
-						    background_mode);
-	}
-
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_background_mode (NAUTILUS_LABEL (labeled_image->details->label),
-						    background_mode);
-	}
-}
-
-void
-nautilus_labeled_image_set_solid_background_color (NautilusLabeledImage *labeled_image,
-						   guint32 solid_background_color)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->image != NULL) {
-		nautilus_image_set_solid_background_color (NAUTILUS_IMAGE (labeled_image->details->image),
-						    solid_background_color);
-	}
-
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_solid_background_color (NAUTILUS_LABEL (labeled_image->details->label),
-						    solid_background_color);
-	}
-}
-
-void
-nautilus_labeled_image_set_smooth_drop_shadow_offset (NautilusLabeledImage *labeled_image,
-						      guint drop_shadow_offset)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_smooth_drop_shadow_offset (NAUTILUS_LABEL (labeled_image->details->label),
-							      drop_shadow_offset);
-	}
-}
-
-void
-nautilus_labeled_image_set_smooth_drop_shadow_color (NautilusLabeledImage *labeled_image,
-						     guint32 drop_shadow_color)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-	
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_smooth_drop_shadow_color (NAUTILUS_LABEL (labeled_image->details->label),
-							     drop_shadow_color);
-	}
-}
-
-void
-nautilus_labeled_image_set_text_color (NautilusLabeledImage *labeled_image,
-				       guint32 text_color)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_text_color (NAUTILUS_LABEL (labeled_image->details->label),
-					       text_color);
-	}
-}
-
-void
-nautilus_labeled_image_set_label_never_smooth (NautilusLabeledImage *labeled_image,
-					       gboolean never_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
-
-	if (labeled_image->details->label != NULL) {
-		nautilus_label_set_never_smooth (NAUTILUS_LABEL (labeled_image->details->label),
-						 never_smooth);
-	}
-}
diff --git a/libnautilus-private/nautilus-labeled-image.h b/libnautilus-private/nautilus-labeled-image.h
deleted file mode 100644
index 12faf364c..000000000
--- a/libnautilus-private/nautilus-labeled-image.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-labeled-image.h - A labeled image.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-/* NautilusLabeledImage is a container widget.  It can only contain internal 
- * widgets.  These internal widgets are can be a NautilusLabel and/or a 
- * NautilusImage.  These internal widgets are created as needed.  That means
- * that NautilusLabeledImage can always be used for "free" instead of a 
- * NautilusLabel or NautilusImage.  The only overhead is that of the GtkObject
- * machinery.
- *
- * The position of the label with respect to the image is controlled by the
- * 'label_positon' attribute.
- *
- * By default the internal image and label widgets are sized to their natural
- * preferred geometry.  You can use the 'fill' attribute of LabeledImage
- * to have the internal widgets fill as much of the LabeledImage allocation
- * as is available.  This is useful if you install a tile_pixbuf and want it
- * to cover the whole widget, and not just the areas occupied by the internal
- * widgets.
- *
- * LabeledImage also has x_padding/y_padding and x_alignment/y_alignment 
- * attributes that behave exaclty as those in the GtkMisc class.
- *
- * Note that the alignments are ignored if the fill attribute is TRUE.
- */
-
-#ifndef NAUTILUS_LABELED_IMAGE_H
-#define NAUTILUS_LABELED_IMAGE_H
-
-#include <gtk/gtkcontainer.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-image.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_LABELED_IMAGE            (nautilus_labeled_image_get_type ())
-#define NAUTILUS_LABELED_IMAGE(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_LABELED_IMAGE, NautilusLabeledImage))
-#define NAUTILUS_LABELED_IMAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_LABELED_IMAGE, NautilusLabeledImageClass))
-#define NAUTILUS_IS_LABELED_IMAGE(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_LABELED_IMAGE))
-#define NAUTILUS_IS_LABELED_IMAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_LABELED_IMAGE))
-
-typedef struct _NautilusLabeledImage	      NautilusLabeledImage;
-typedef struct _NautilusLabeledImageClass     NautilusLabeledImageClass;
-typedef struct _NautilusLabeledImageDetails   NautilusLabeledImageDetails;
-
-struct _NautilusLabeledImage
-{
-	/* Superclass */
-	GtkContainer container;
-
-	/* Private things */
-	NautilusLabeledImageDetails *details;
-};
-
-struct _NautilusLabeledImageClass
-{
-	GtkContainerClass parent_class;
-};
-
-/* Public GtkLabeledImage methods */
-GtkType         nautilus_labeled_image_get_type                         (void);
-GtkWidget *     nautilus_labeled_image_new                              (const char                   *text,
-									 GdkPixbuf                    *pixbuf);
-GtkWidget *     nautilus_labeled_image_new_from_file_name               (const char                   *text,
-									 const char                   *pixbuf_file_name);
-void            nautilus_labeled_image_set_label_position               (NautilusLabeledImage         *labeled_image,
-									 GtkPositionType               label_position);
-GtkPositionType nautilus_labeled_image_get_label_position               (const NautilusLabeledImage   *labeled_image);
-void            nautilus_labeled_image_set_show_label                   (NautilusLabeledImage         *labeled_image,
-									 gboolean                      show_label);
-gboolean        nautilus_labeled_image_get_show_label                   (const NautilusLabeledImage   *labeled_image);
-void            nautilus_labeled_image_set_show_image                   (NautilusLabeledImage         *labeled_image,
-									 gboolean                      show_image);
-gboolean        nautilus_labeled_image_get_show_image                   (const NautilusLabeledImage   *labeled_image);
-void            nautilus_labeled_image_set_spacing                      (NautilusLabeledImage         *labeled_image,
-									 guint                         spacing);
-guint           nautilus_labeled_image_get_spacing                      (const NautilusLabeledImage   *labeled_image);
-int             nautilus_labeled_image_get_x_padding                    (const NautilusLabeledImage   *labeled_image);
-void            nautilus_labeled_image_set_x_padding                    (NautilusLabeledImage         *labeled_image,
-									 int                           x_padding);
-int             nautilus_labeled_image_get_y_padding                    (const NautilusLabeledImage   *labeled_image);
-void            nautilus_labeled_image_set_y_padding                    (NautilusLabeledImage         *labeled_image,
-									 int                           y_padding);
-float           nautilus_labeled_image_get_x_alignment                  (const NautilusLabeledImage   *labeled_image);
-void            nautilus_labeled_image_set_x_alignment                  (NautilusLabeledImage         *labeled_image,
-									 float                         x_alignment);
-float           nautilus_labeled_image_get_y_alignment                  (const NautilusLabeledImage   *labeled_image);
-void            nautilus_labeled_image_set_y_alignment                  (NautilusLabeledImage         *labeled_image,
-									 float                         y_alignment);
-void            nautilus_labeled_image_set_fill                         (NautilusLabeledImage         *labeled_image,
-									 gboolean                      fill);
-gboolean        nautilus_labeled_image_get_fill                         (const NautilusLabeledImage   *labeled_image);
-
-void		nautilus_labeled_image_set_fixed_image_height		(NautilusLabeledImage	      *labeled_image,
-									 int			       fixed_image_height);
-									 
-/* Functions for creating stock GtkButtons with a labeled image child */
-GtkWidget *     nautilus_labeled_image_button_new                       (const char                   *text,
-									 GdkPixbuf                    *pixbuf);
-GtkWidget *     nautilus_labeled_image_button_new_from_file_name        (const char                   *text,
-									 const char                   *pixbuf_file_name);
-GtkWidget *     nautilus_labeled_image_toggle_button_new                (const char                   *text,
-									 GdkPixbuf                    *pixbuf);
-GtkWidget *     nautilus_labeled_image_toggle_button_new_from_file_name (const char                   *text,
-									 const char                   *pixbuf_file_name);
-GtkWidget *     nautilus_labeled_image_check_button_new                 (const char                   *text,
-									 GdkPixbuf                    *pixbuf);
-GtkWidget *     nautilus_labeled_image_check_button_new_from_file_name  (const char                   *text,
-									 const char                   *pixbuf_file_name);
-
-/* These are proxies for methods in NautilusImage and NautilusLabel */
-void            nautilus_labeled_image_set_pixbuf                       (NautilusLabeledImage         *labeled_image,
-									 GdkPixbuf                    *pixbuf);
-void            nautilus_labeled_image_set_pixbuf_from_file_name        (NautilusLabeledImage         *labeled_image,
-									 const char                   *pixbuf_file_name);
-GdkPixbuf*      nautilus_labeled_image_get_pixbuf                       (const NautilusLabeledImage   *labeled_image);
-void            nautilus_labeled_image_set_text                         (NautilusLabeledImage         *labeled_image,
-									 const char                   *text);
-char*           nautilus_labeled_image_get_text                         (const NautilusLabeledImage   *labeled_image);
-void            nautilus_labeled_image_set_tile_pixbuf                  (NautilusLabeledImage         *image,
-									 GdkPixbuf                    *pixbuf);
-void            nautilus_labeled_image_set_tile_pixbuf_from_file_name   (NautilusLabeledImage         *image,
-									 const char                   *tile_file_name);
-void            nautilus_labeled_image_make_bold                        (NautilusLabeledImage         *labeled_image);
-void            nautilus_labeled_image_make_larger                      (NautilusLabeledImage         *labeled_image,
-									 guint                         num_sizes);
-void            nautilus_labeled_image_make_smaller                     (NautilusLabeledImage         *labeled_image,
-									 guint                         num_sizes);
-void            nautilus_labeled_image_set_tile_width                   (NautilusLabeledImage         *labeled_image,
-									 int                           tile_width);
-void            nautilus_labeled_image_set_tile_height                  (NautilusLabeledImage         *labeled_image,
-									 int                           tile_height);
-void            nautilus_labeled_image_set_background_mode              (NautilusLabeledImage         *labeled_image,
-									 NautilusSmoothBackgroundMode  background_mode);
-void            nautilus_labeled_image_set_solid_background_color       (NautilusLabeledImage         *labeled_image,
-									 guint32                       solid_background_color);
-void            nautilus_labeled_image_set_smooth_drop_shadow_offset    (NautilusLabeledImage         *labeled_image,
-									 guint                         drop_shadow_offset);
-void            nautilus_labeled_image_set_smooth_drop_shadow_color     (NautilusLabeledImage         *labeled_image,
-									 guint32                       drop_shadow_color);
-void            nautilus_labeled_image_set_text_color                   (NautilusLabeledImage         *labeled_image,
-									 guint32                       text_color);
-void            nautilus_labeled_image_set_label_never_smooth           (NautilusLabeledImage         *labeled_image,
-									 gboolean                      never_smooth);
-ArtIRect        nautilus_labeled_image_get_image_bounds                 (const NautilusLabeledImage   *labeled_image);
-ArtIRect        nautilus_labeled_image_get_label_bounds                 (const NautilusLabeledImage   *labeled_image);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_LABELED_IMAGE_H */
-
-
diff --git a/libnautilus-private/nautilus-lib-self-check-functions.c b/libnautilus-private/nautilus-lib-self-check-functions.c
index 70c70b364..50156c1c0 100644
--- a/libnautilus-private/nautilus-lib-self-check-functions.c
+++ b/libnautilus-private/nautilus-lib-self-check-functions.c
@@ -32,7 +32,7 @@
 void
 nautilus_run_lib_self_checks (void)
 {
-	NAUTILUS_LIB_FOR_EACH_SELF_CHECK_FUNCTION (NAUTILUS_CALL_SELF_CHECK_FUNCTION)
+	NAUTILUS_LIB_FOR_EACH_SELF_CHECK_FUNCTION (EEL_CALL_SELF_CHECK_FUNCTION)
 }
 
 #endif /* ! NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-lib-self-check-functions.h b/libnautilus-private/nautilus-lib-self-check-functions.h
index 34d5453f8..fcc53e5df 100644
--- a/libnautilus-private/nautilus-lib-self-check-functions.h
+++ b/libnautilus-private/nautilus-lib-self-check-functions.h
@@ -23,7 +23,7 @@
    Author: Darin Adler <darin@eazel.com>
 */
 
-#include "nautilus-self-checks.h"
+#include <eel/eel-self-checks.h>
 
 void nautilus_run_lib_self_checks (void);
 
@@ -39,28 +39,15 @@ void nautilus_run_lib_self_checks (void);
 */
 
 #define NAUTILUS_LIB_FOR_EACH_SELF_CHECK_FUNCTION(macro) \
-	macro (nautilus_self_check_string) \
-	macro (nautilus_self_check_string_list) \
-	macro (nautilus_self_check_enumeration) \
 	macro (nautilus_self_check_preferences) \
-	macro (nautilus_self_check_scalable_font) \
-	macro (nautilus_self_check_font_manager) \
-	macro (nautilus_self_check_string_map) \
-	macro (nautilus_self_check_art_extensions) \
-	macro (nautilus_self_check_gdk_pixbuf_extensions) \
-	macro (nautilus_self_check_glib_extensions) \
-	macro (nautilus_self_check_gdk_extensions) \
-	macro (nautilus_self_check_gdk_font_extensions) \
 	macro (nautilus_self_check_search_uri) \
 	macro (nautilus_self_check_file_utilities) \
 	macro (nautilus_self_check_file_operations) \
-	macro (nautilus_self_check_background) \
 	macro (nautilus_self_check_directory) \
 	macro (nautilus_self_check_file) \
 	macro (nautilus_self_check_icon_container) \
 	macro (nautilus_self_check_icon_factory) \
-	macro (nautilus_self_check_smooth_text_layout_cache) \
 /* Add new self-check functions to the list above this line. */
 
 /* Generate prototypes for all the functions. */
-NAUTILUS_LIB_FOR_EACH_SELF_CHECK_FUNCTION (NAUTILUS_SELF_CHECK_FUNCTION_PROTOTYPE)
+NAUTILUS_LIB_FOR_EACH_SELF_CHECK_FUNCTION (EEL_SELF_CHECK_FUNCTION_PROTOTYPE)
diff --git a/libnautilus-private/nautilus-link-set.c b/libnautilus-private/nautilus-link-set.c
index 05383e8a8..1edb038af 100644
--- a/libnautilus-private/nautilus-link-set.c
+++ b/libnautilus-private/nautilus-link-set.c
@@ -27,13 +27,13 @@
 
 #include "nautilus-file-utilities.h"
 #include "nautilus-file.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 #include "nautilus-global-preferences.h"
 #include "nautilus-link.h"
 #include "nautilus-metadata.h"
 #include "nautilus-preferences.h"
-#include "nautilus-string.h"
-#include "nautilus-xml-extensions.h"
+#include <eel/eel-string.h>
+#include <eel/eel-xml-extensions.h>
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
 #include <gtk/gtktogglebutton.h>
@@ -112,10 +112,10 @@ nautilus_link_set_install (const char *directory_path, const char *link_set_name
 	}
 	
 	/* loop through the entries, generating link files */
-	for (node = nautilus_xml_get_children (xmlDocGetRootElement (document));
+	for (node = eel_xml_get_children (xmlDocGetRootElement (document));
 	     node != NULL; node = node->next) {
 		if (strcmp (node->name, "link") == 0) {
-			link_name = nautilus_xml_get_property_translated (node, "name");
+			link_name = eel_xml_get_property_translated (node, "name");
 			image_name = xmlGetProp (node, "image");
 			uri = xmlGetProp (node, "uri");
 
@@ -159,10 +159,10 @@ nautilus_link_set_is_installed (const char *directory_path, const char *link_set
 	}
 	
 	/* loop through the entries, testing to see if any are present */
-	for (node = nautilus_xml_get_children (xmlDocGetRootElement (document));
+	for (node = eel_xml_get_children (xmlDocGetRootElement (document));
 	     node != NULL; node = node->next) {
 		if (strcmp (node->name, "link") == 0) {
-			link_name = nautilus_xml_get_property_translated (node, "name");
+			link_name = eel_xml_get_property_translated (node, "name");
 			file_name = nautilus_make_path (directory_path, link_name);
 			xmlFree (link_name);
 
@@ -195,11 +195,11 @@ nautilus_link_set_remove (const char *directory_path, const char *link_set_name)
 	
 	/* loop through the entries in the xml file, formulating the names of the link files and
 	   deleting them or decrementing their reference count */
-	for (node = nautilus_xml_get_children (xmlDocGetRootElement (document));
+	for (node = eel_xml_get_children (xmlDocGetRootElement (document));
 	     node != NULL; node = node->next) {
 		if (strcmp (node->name, "link") == 0) {
 			/* formulate the link file path name */
-			link_name = nautilus_xml_get_property_translated (node, "name");
+			link_name = eel_xml_get_property_translated (node, "name");
 			file_name = nautilus_make_path (directory_path, link_name);
 			xmlFree (link_name);
 			
diff --git a/libnautilus-private/nautilus-link.c b/libnautilus-private/nautilus-link.c
index f445c8ceb..5dfb1278f 100644
--- a/libnautilus-private/nautilus-link.c
+++ b/libnautilus-private/nautilus-link.c
@@ -31,12 +31,12 @@
 #include "nautilus-file.h"
 #include "nautilus-file-attributes.h"
 #include "nautilus-global-preferences.h"
-#include "nautilus-gnome-extensions.h"
+#include <eel/eel-gnome-extensions.h>
 #include "nautilus-metadata.h"
 #include "nautilus-preferences.h"
-#include "nautilus-stock-dialogs.h"
-#include "nautilus-string.h"
-#include "nautilus-xml-extensions.h"
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-xml-extensions.h>
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
 #include <libgnome/gnome-i18n.h>
@@ -507,7 +507,7 @@ nautilus_link_local_create_from_gnome_entry (GnomeDesktopEntry *entry, const cha
 		return;
 	}
 	
-	terminal_path = nautilus_gnome_get_terminal_path ();
+	terminal_path = eel_gnome_get_terminal_path ();
 	if (terminal_path == NULL) {
 		return;
 	}
diff --git a/libnautilus-private/nautilus-list-column-title.c b/libnautilus-private/nautilus-list-column-title.c
index e6414c447..26fff3a31 100644
--- a/libnautilus-private/nautilus-list-column-title.c
+++ b/libnautilus-private/nautilus-list-column-title.c
@@ -26,8 +26,8 @@
 #include <config.h>
 #include "nautilus-list-column-title.h"
 
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gdk-extensions.h"
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-gdk-extensions.h>
 
 #include "nautilus-list.h"
 
@@ -37,7 +37,7 @@
 
 #include <libgnomeui/gnome-pixmap.h>
 
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
 
 #include <string.h>
 
@@ -128,7 +128,7 @@ static gboolean nautilus_list_column_title_button_press	(GtkWidget *widget, GdkE
 static gboolean nautilus_list_column_title_button_release (GtkWidget *widget, GdkEventButton *event);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusListColumnTitle, nautilus_list_column_title, GTK_TYPE_BIN)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusListColumnTitle, nautilus_list_column_title, GTK_TYPE_BIN)
 /* generates nautilus_list_column_title_get_type */
 
 static void
@@ -259,7 +259,7 @@ nautilus_list_column_title_finalize (GtkObject *object)
 
 	g_free (column_title->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
 }
 
 static void
@@ -330,7 +330,7 @@ load_up_indicator (const char **xpm_data,
 		return;
 	}
 
-	gdk_pixbuf_render_pixmap_and_mask (pixbuf, indicator_pixmap, indicator_mask, NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
+	gdk_pixbuf_render_pixmap_and_mask (pixbuf, indicator_pixmap, indicator_mask, EEL_STANDARD_ALPHA_THRESHHOLD);
 
 	gdk_pixbuf_unref (pixbuf);
 }
@@ -549,7 +549,7 @@ nautilus_list_column_title_paint (GtkWidget *widget, GtkWidget *draw_target,
 			 */
 			temporary = cell_rectangle;
 			/* Eeeek: magic numbers */
-			nautilus_rectangle_inset (&temporary, 2, 2);
+			eel_rectangle_inset (&temporary, 2, 2);
 			gdk_rectangle_intersect (&cell_redraw_area, &temporary, &cell_redraw_area);
 
 			truncated_label = truncate_string (cell_label, widget->style->font, 
@@ -708,10 +708,10 @@ in_column_rect (GtkWidget *widget, int x, int y)
 		 * to be considered inside the rect
 		 * nautilus_list_column_title_leave depends on this 
 		 */
-		nautilus_rectangle_inset (&cell_rectangle, 1, 0);
+		eel_rectangle_inset (&cell_rectangle, 1, 0);
 
 		
-		if (nautilus_rectangle_contains (&cell_rectangle, x, y))
+		if (eel_rectangle_contains (&cell_rectangle, x, y))
 			return index;
 	}
 
@@ -734,12 +734,12 @@ in_resize_rect (GtkWidget *widget, int x, int y)
 		
 		get_column_frame_at (widget, index, &resize_rectangle);
 
-		nautilus_rectangle_inset (&resize_rectangle, 1, 0);
+		eel_rectangle_inset (&resize_rectangle, 1, 0);
 
 		resize_rectangle.x = resize_rectangle.x + resize_rectangle.width - DRAG_WIDTH / 2;
 		resize_rectangle.width = DRAG_WIDTH;
 
-		if (nautilus_rectangle_contains (&resize_rectangle, x, y))
+		if (eel_rectangle_contains (&resize_rectangle, x, y))
 			return index;
 	}
 
@@ -825,7 +825,7 @@ nautilus_list_column_title_motion (GtkWidget *widget, GdkEventMotion *event)
 		if (column_title->details->last_tracking_x != mouse_x) {
 			/* mouse did move horizontally since last time */
 			column_title->details->last_tracking_x = mouse_x;
-			NAUTILUS_INVOKE_METHOD
+			EEL_INVOKE_METHOD
 				(NAUTILUS_LIST_CLASS, parent_list,
 				 column_resize_track,
 				 (parent_list, column_title->details->tracking_column_resize));
@@ -927,7 +927,7 @@ nautilus_list_column_title_button_press (GtkWidget *widget, GdkEventButton *even
 			gtk_widget_set_state (widget, GTK_STATE_NORMAL);
 
 			/* start column resize tracking */
-			NAUTILUS_INVOKE_METHOD
+			EEL_INVOKE_METHOD
 				(NAUTILUS_LIST_CLASS, parent_list,
 				 column_resize_track_start,
 				 (parent_list, resized_column));
@@ -984,7 +984,7 @@ nautilus_list_column_title_button_release (GtkWidget *widget, GdkEventButton *ev
 	if (column_title->details->tracking_column_resize != -1) {
 			
 		/* end column resize tracking */
-		NAUTILUS_INVOKE_METHOD
+		EEL_INVOKE_METHOD
 			(NAUTILUS_LIST_CLASS, parent_list,
 			 column_resize_track_end,
 			 (parent_list, column_title->details->tracking_column_resize));
diff --git a/libnautilus-private/nautilus-list.c b/libnautilus-private/nautilus-list.c
index 34df7aa95..abb14a5ee 100644
--- a/libnautilus-private/nautilus-list.c
+++ b/libnautilus-private/nautilus-list.c
@@ -38,15 +38,15 @@
 #include <gtk/gtkenums.h>
 #include <gtk/gtkmain.h>
 #include <glib.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-graphic-effects.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-background.h>
+#include <eel/eel-graphic-effects.h>
 #include <libnautilus-extensions/nautilus-drag.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-list-column-title.h>
 
 /* Timeout for making the row currently selected for keyboard operation visible.
@@ -314,7 +314,7 @@ static void     nautilus_list_stop_auto_scroll          (NautilusList         *l
 static void	unref_gcs				(NautilusList *list);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusList, nautilus_list, NAUTILUS_TYPE_CLIST)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusList, nautilus_list, NAUTILUS_TYPE_CLIST)
 
 static guint list_signals[LAST_SIGNAL];
 
@@ -399,7 +399,7 @@ nautilus_list_initialize_class (NautilusListClass *klass)
 				GTK_RUN_LAST,
 				object_class->type,
 				GTK_SIGNAL_OFFSET (NautilusListClass, handle_dragged_items),
-				nautilus_gtk_marshal_BOOL__INT_POINTER_INT_INT_UINT,
+				eel_gtk_marshal_BOOL__INT_POINTER_INT_INT_UINT,
 				GTK_TYPE_BOOL, 
 				5,
 				GTK_TYPE_INT,
@@ -412,7 +412,7 @@ nautilus_list_initialize_class (NautilusListClass *klass)
 				GTK_RUN_LAST,
 				object_class->type,
 				GTK_SIGNAL_OFFSET (NautilusListClass, handle_dropped_items),
-				nautilus_gtk_marshal_NONE__INT_POINTER_INT_INT_UINT,
+				eel_gtk_marshal_NONE__INT_POINTER_INT_INT_UINT,
 				GTK_TYPE_NONE, 5,
 				GTK_TYPE_INT,
 				GTK_TYPE_POINTER,
@@ -424,7 +424,7 @@ nautilus_list_initialize_class (NautilusListClass *klass)
 				GTK_RUN_LAST,
 				object_class->type,
 				GTK_SIGNAL_OFFSET (NautilusListClass, get_default_action),
-				nautilus_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER_INT_INT_UINT,
+				eel_gtk_marshal_NONE__POINTER_POINTER_POINTER_POINTER_INT_INT_UINT,
 				GTK_TYPE_NONE, 7,
 				GTK_TYPE_POINTER,
 				GTK_TYPE_POINTER,
@@ -438,7 +438,7 @@ nautilus_list_initialize_class (NautilusListClass *klass)
 				GTK_RUN_LAST,
 				object_class->type,
 				GTK_SIGNAL_OFFSET (NautilusListClass, get_drag_pixbuf),
-				nautilus_gtk_marshal_POINTER__INT,
+				eel_gtk_marshal_POINTER__INT,
 				GTK_TYPE_POINTER, 1,
 				GTK_TYPE_INT);
 	list_signals[GET_SORT_COLUMN_INDEX] =
@@ -446,7 +446,7 @@ nautilus_list_initialize_class (NautilusListClass *klass)
 				GTK_RUN_LAST,
 				object_class->type,
 				GTK_SIGNAL_OFFSET (NautilusListClass, get_sort_column_index),
-				nautilus_gtk_marshal_INT__NONE,
+				eel_gtk_marshal_INT__NONE,
 				GTK_TYPE_INT, 0);
 
 	gtk_object_class_add_signals (object_class, list_signals, LAST_SIGNAL);
@@ -553,7 +553,7 @@ nautilus_list_initialize_dnd (NautilusList *list)
 	list->details->drag_info = g_new0 (NautilusDragInfo, 1);
 
 	nautilus_drag_init (list->details->drag_info, drag_types,
-			    NAUTILUS_N_ELEMENTS (drag_types), NULL);
+			    EEL_N_ELEMENTS (drag_types), NULL);
 	
 	gtk_signal_connect (GTK_OBJECT (list), 
 			    "drag_end", 
@@ -585,7 +585,7 @@ nautilus_list_initialize_dnd (NautilusList *list)
 	gtk_drag_dest_set (GTK_WIDGET (list),
 			   0,
 			   nautilus_list_dnd_target_table,
-			   NAUTILUS_N_ELEMENTS (nautilus_list_dnd_target_table),
+			   EEL_N_ELEMENTS (nautilus_list_dnd_target_table),
 			   GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK
 			   | GDK_ACTION_ASK);
 
@@ -638,7 +638,7 @@ nautilus_list_destroy (GtkObject *object)
 
 	unschedule_keyboard_row_reveal (list);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 
 	unref_gcs (list);
 
@@ -951,7 +951,7 @@ nautilus_list_button_press (GtkWidget *widget, GdkEventButton *event)
 	nautilus_list_flush_typeselect_state (list);
 
 	if (event->window != clist->clist_window)
-		return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+		return EEL_CALL_PARENT_WITH_RETURN_VALUE
 			(GTK_WIDGET_CLASS, button_press_event, (widget, event));
 
 	on_row = nautilus_clist_get_selection_info (clist, event->x, event->y, &row_index, &column_index);
@@ -1061,7 +1061,7 @@ nautilus_list_button_release (GtkWidget *widget, GdkEventButton *event)
 	retval = FALSE;
 
 	if (event->window != clist->clist_window)
-		return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+		return EEL_CALL_PARENT_WITH_RETURN_VALUE
 			(GTK_WIDGET_CLASS, button_release_event, (widget, event));
 
 	on_row = nautilus_clist_get_selection_info (clist, event->x, event->y, &row_index, &column_index);
@@ -1450,7 +1450,7 @@ nautilus_list_handle_typeahead (NautilusList *list, const char *key_string)
 	}
 
 	/* find out how long since last character was typed */
-	now = nautilus_get_system_time();
+	now = eel_get_system_time();
 	time_delta = now - list->details->last_typeselect_time;
 	if (time_delta < 0 || time_delta > NAUTILUS_TYPESELECT_FLUSH_DELAY) {
 		/* the typeselect state is too old, start with a fresh one */
@@ -1525,7 +1525,7 @@ nautilus_list_key_press (GtkWidget *widget,
 			return TRUE;
 		}
 
-		return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+		return EEL_CALL_PARENT_WITH_RETURN_VALUE
 			(GTK_WIDGET_CLASS, key_press_event, (widget, event));
 	}
 
@@ -1533,18 +1533,18 @@ nautilus_list_key_press (GtkWidget *widget,
 }
 
 static guint32
-nautilus_gdk_set_shifted_foreground_gc_color (GdkGC *gc, guint32 color, float shift_by)
+eel_gdk_set_shifted_foreground_gc_color (GdkGC *gc, guint32 color, float shift_by)
 {
 	guint32 shifted_color;
 
-	shifted_color = nautilus_rgb_shift_color (color, shift_by);
+	shifted_color = eel_rgb_shift_color (color, shift_by);
 	gdk_rgb_gc_set_foreground (gc, shifted_color);
 
 	return shifted_color;
 }
 
 static GdkGC *
-nautilus_gdk_gc_copy (GdkGC *source, GdkWindow *window)
+eel_gdk_gc_copy (GdkGC *source, GdkWindow *window)
 {
 	GdkGC *result;
 
@@ -1569,56 +1569,56 @@ nautilus_list_setup_style_colors (NautilusList *list)
 
 	gdk_rgb_init();
 
-	style_background_color = nautilus_gdk_color_to_rgb
+	style_background_color = eel_gdk_color_to_rgb
 		(G_STRUCT_MEMBER_P (GTK_WIDGET (list)->style,
 				    list->details->background_color_offset));
-	selection_background_color = nautilus_gdk_color_to_rgb
+	selection_background_color = eel_gdk_color_to_rgb
 		(G_STRUCT_MEMBER_P (GTK_WIDGET (list)->style,
 				    list->details->selection_color_offset));
 
 	list->details->cell_lighter_background_rgb
-	    = nautilus_gdk_set_shifted_foreground_gc_color (list->details->cell_lighter_background, 
+	    = eel_gdk_set_shifted_foreground_gc_color (list->details->cell_lighter_background, 
 							    style_background_color, 1);
 
 	list->details->cell_darker_background_rgb
-	    = nautilus_gdk_set_shifted_foreground_gc_color (list->details->cell_darker_background, 
+	    = eel_gdk_set_shifted_foreground_gc_color (list->details->cell_darker_background, 
 							    style_background_color, 1.03);
 
 	list->details->cell_selected_lighter_background_rgb
-	    = nautilus_gdk_set_shifted_foreground_gc_color (list->details->cell_selected_lighter_background, 
+	    = eel_gdk_set_shifted_foreground_gc_color (list->details->cell_selected_lighter_background, 
 							    style_background_color, 1.04);
 
 	list->details->cell_selected_darker_background_rgb
-	    = nautilus_gdk_set_shifted_foreground_gc_color (list->details->cell_selected_darker_background, 
+	    = eel_gdk_set_shifted_foreground_gc_color (list->details->cell_selected_darker_background, 
 							    style_background_color, 1.06);
 
-	nautilus_gdk_set_shifted_foreground_gc_color (list->details->cell_divider_color, 
+	eel_gdk_set_shifted_foreground_gc_color (list->details->cell_divider_color, 
 						      style_background_color, 0.8);
 
 	list->details->selection_main_color_rgb
-	    = nautilus_gdk_set_shifted_foreground_gc_color (list->details->selection_main_color, 
+	    = eel_gdk_set_shifted_foreground_gc_color (list->details->selection_main_color, 
 							    selection_background_color, 1);
 		
 	list->details->selection_medium_color_rgb
-	    = nautilus_gdk_set_shifted_foreground_gc_color (list->details->selection_medium_color, 
+	    = eel_gdk_set_shifted_foreground_gc_color (list->details->selection_medium_color, 
 							    selection_background_color, 0.7);
 
 	list->details->selection_light_color_rgb
-	    = nautilus_gdk_set_shifted_foreground_gc_color (list->details->selection_light_color, 
+	    = eel_gdk_set_shifted_foreground_gc_color (list->details->selection_light_color, 
 							    selection_background_color, 0.5);
 
 	text_color = GTK_WIDGET (list)->style->fg[GTK_STATE_NORMAL];
-	nautilus_gdk_gc_choose_foreground_color (list->details->text_color, &text_color,
+	eel_gdk_gc_choose_foreground_color (list->details->text_color, &text_color,
 						 &GTK_WIDGET (list)->style->bg[GTK_STATE_NORMAL]);
 
 	text_color = GTK_WIDGET (list)->style->fg[GTK_STATE_SELECTED];
-	nautilus_gdk_gc_choose_foreground_color (list->details->selected_text_color, &text_color,
+	eel_gdk_gc_choose_foreground_color (list->details->selected_text_color, &text_color,
 						 &GTK_WIDGET (list)->style->bg[GTK_STATE_SELECTED]);
 
 	text_color.red = 0;
 	text_color.green = 0;
 	text_color.blue = 65535;
-	nautilus_gdk_gc_choose_foreground_color (list->details->link_text_color, &text_color,
+	eel_gdk_gc_choose_foreground_color (list->details->link_text_color, &text_color,
 						 &GTK_WIDGET (list)->style->bg[GTK_STATE_NORMAL]);
 }
 
@@ -1663,28 +1663,28 @@ make_gcs_and_colors (NautilusList *list)
 	unref_gcs (list);
 
 	/* now setup new ones */
-	list->details->cell_lighter_background = nautilus_gdk_gc_copy (
+	list->details->cell_lighter_background = eel_gdk_gc_copy (
 		widget->style->bg_gc[GTK_STATE_NORMAL], widget->window);
-	list->details->cell_darker_background = nautilus_gdk_gc_copy (
+	list->details->cell_darker_background = eel_gdk_gc_copy (
 		widget->style->bg_gc[GTK_STATE_NORMAL], widget->window);
-	list->details->cell_selected_lighter_background = nautilus_gdk_gc_copy (
+	list->details->cell_selected_lighter_background = eel_gdk_gc_copy (
 		widget->style->bg_gc[GTK_STATE_NORMAL], widget->window);
-	list->details->cell_selected_darker_background = nautilus_gdk_gc_copy (
+	list->details->cell_selected_darker_background = eel_gdk_gc_copy (
 		widget->style->bg_gc[GTK_STATE_NORMAL], widget->window);
-	list->details->cell_divider_color = nautilus_gdk_gc_copy (
+	list->details->cell_divider_color = eel_gdk_gc_copy (
 		widget->style->bg_gc[GTK_STATE_NORMAL], widget->window);
-	list->details->selection_light_color = nautilus_gdk_gc_copy (
+	list->details->selection_light_color = eel_gdk_gc_copy (
 		widget->style->bg_gc[GTK_STATE_SELECTED], widget->window);
-	list->details->selection_medium_color = nautilus_gdk_gc_copy (
+	list->details->selection_medium_color = eel_gdk_gc_copy (
 		widget->style->bg_gc[GTK_STATE_SELECTED], widget->window);
-	list->details->selection_main_color = nautilus_gdk_gc_copy (
+	list->details->selection_main_color = eel_gdk_gc_copy (
 		widget->style->bg_gc[GTK_STATE_SELECTED], widget->window);
 
-	list->details->text_color = nautilus_gdk_gc_copy (
+	list->details->text_color = eel_gdk_gc_copy (
 		widget->style->fg_gc[GTK_STATE_NORMAL], widget->window);
-	list->details->selected_text_color = nautilus_gdk_gc_copy (
+	list->details->selected_text_color = eel_gdk_gc_copy (
 		widget->style->fg_gc[GTK_STATE_SELECTED], widget->window);
-	list->details->link_text_color = nautilus_gdk_gc_copy (
+	list->details->link_text_color = eel_gdk_gc_copy (
 		widget->style->fg_gc[GTK_STATE_NORMAL], widget->window);
 
 	nautilus_list_setup_style_colors (list);
@@ -1699,7 +1699,7 @@ nautilus_list_style_set (GtkWidget *widget, GtkStyle *previous_style)
 
 	list = NAUTILUS_LIST (widget);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, style_set, (widget, previous_style));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, style_set, (widget, previous_style));
 
 	if (GTK_WIDGET_REALIZED (widget)) {
 		make_gcs_and_colors (list);
@@ -1720,7 +1720,7 @@ nautilus_list_realize (GtkWidget *widget)
 
 	clist->column[0].button = list->details->title;
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
 
 	make_gcs_and_colors (list);
 
@@ -1746,7 +1746,7 @@ nautilus_list_unrealize (GtkWidget *widget)
 	/* unref all the gcs we've created */
 	unref_gcs (NAUTILUS_LIST (widget));
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget));
 }
 
 /* this is here just temporarily */
@@ -1969,7 +1969,7 @@ nautilus_list_draw_focus (GtkWidget *widget)
 
   	gdk_gc_get_values (clist->xor_gc, &saved_values);
 
-  	gdk_gc_set_stipple (clist->xor_gc, nautilus_stipple_bitmap ());
+  	gdk_gc_set_stipple (clist->xor_gc, eel_stipple_bitmap ());
   	gdk_gc_set_fill (clist->xor_gc, GDK_STIPPLED);
 
     	gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE,
@@ -2148,7 +2148,7 @@ nautilus_list_draw_cell_pixbuf (NautilusList *list, GdkWindow *window,
 						     intersect_rectangle.width,
 						     intersect_rectangle.height,
 						     GDK_PIXBUF_ALPHA_BILEVEL,
-						     NAUTILUS_STANDARD_ALPHA_THRESHHOLD,
+						     EEL_STANDARD_ALPHA_THRESHHOLD,
 						     GDK_RGB_DITHER_MAX, 0, 0);
 	}
 
@@ -2317,7 +2317,7 @@ draw_cell (NautilusCList *clist, GdkRectangle *area, int row_index, int column_i
 			
 			if (src_pixbuf != NULL) {
 				/* Create darkened pixbuf */
-				dark_pixbuf = nautilus_create_darkened_pixbuf (src_pixbuf,
+				dark_pixbuf = eel_create_darkened_pixbuf (src_pixbuf,
 									       0.8 * 255,
 									       0.8 * 255);
 				if (dark_pixbuf != NULL) {
@@ -2641,7 +2641,7 @@ draw_rows (NautilusCList *clist, GdkRectangle *area)
 			break;
 		}
 
-		NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, 
+		EEL_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, 
 				      draw_row, (clist, area, row_index, list->data));
 		list = list->next;
 	}
@@ -2658,7 +2658,7 @@ draw_all (NautilusCList *clist)
 	area.y = 0;
 	area.width = clist->clist_window_width;
 	area.height = clist->clist_window_height;
-	NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, (clist, &area));
+	EEL_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, (clist, &area));
 }
 
 static void
@@ -2692,7 +2692,7 @@ nautilus_list_draw (GtkWidget *widget, GdkRectangle *area)
 					(2 * widget->style->klass->ythickness) +
 				clist->column_title_area.height);
 
-		NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, (clist, area));
+		EEL_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, (clist, area));
 
 		/* Draw the title if it exists */
 		if (list->details->title) {
@@ -2728,7 +2728,7 @@ nautilus_list_expose (GtkWidget *widget, GdkEventExpose *event)
 					(2 * widget->style->klass->ythickness) +
 				clist->column_title_area.height);
 
-		NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, 
+		EEL_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, 
 				      (clist, &event->area));
 	}
 
@@ -2745,7 +2745,7 @@ nautilus_list_resize_column (NautilusCList *clist, int column_index, int width)
 
 	gtk_widget_queue_draw (list->details->title);
 		
-	NAUTILUS_CALL_PARENT (NAUTILUS_CLIST_CLASS, resize_column, (clist, column_index, width));
+	EEL_CALL_PARENT (NAUTILUS_CLIST_CLASS, resize_column, (clist, column_index, width));
 }
 
 
@@ -2807,10 +2807,10 @@ nautilus_list_set_cell_contents (NautilusCList    *clist,
 
 	/* Clean up old data, which parent class doesn't know about. */
 	if ((NautilusCellType)row->cell[column_index].type == NAUTILUS_CELL_PIXBUF_LIST) {
-		nautilus_gdk_pixbuf_list_free (NAUTILUS_CELL_PIXBUF_LIST (row->cell[column_index])->pixbufs);
+		eel_gdk_pixbuf_list_free (NAUTILUS_CELL_PIXBUF_LIST (row->cell[column_index])->pixbufs);
 	}
 
-	result = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	result = EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(NAUTILUS_CLIST_CLASS, set_cell_contents,
 		 (clist, row, column_index, type, text, spacing, pixbuf));
 
@@ -2852,13 +2852,13 @@ set_list_cell (NautilusList *list,
 	 * expected parameter type, we have to sneak it in by casting it into
 	 * one of the expected parameters.
 	 */
-	if (NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	if (EEL_CALL_METHOD_WITH_RETURN_VALUE
 	    (NAUTILUS_CLIST_CLASS, clist, set_cell_contents, 
 	     (clist, row, column_index, type, NULL, 0, data))) {
 		/* redraw the list if it's not frozen */
 		if (CLIST_UNFROZEN (clist) 
 		    && nautilus_clist_row_is_visible (clist, row_index) != GTK_VISIBILITY_NONE) {
-			NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_row, 
+			EEL_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_row, 
 					      (clist, NULL, row_index, row));
 		}
 	}
@@ -2984,7 +2984,7 @@ nautilus_list_track_new_column_width (NautilusCList *clist, int column_index, in
 		area.x = clist->column[column_index].area.x;
 		area.height += clist->clist_window_height;
 
-		NAUTILUS_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, (clist, &area));
+		EEL_CALL_METHOD (NAUTILUS_CLIST_CLASS, clist, draw_rows, (clist, &area));
 	}
 }
 
@@ -3022,7 +3022,7 @@ nautilus_list_drag_start (GtkWidget *widget, GdkEventMotion *event)
 
 	if (pixbuf != NULL) {
 		/* FIXME: We can do better than 10,10. */
-		nautilus_drag_set_icon_pixbuf (context, pixbuf, 10, 10);
+		eel_drag_set_icon_pixbuf (context, pixbuf, 10, 10);
 		
 		gdk_pixbuf_unref (pixbuf);
 	}
@@ -3044,7 +3044,7 @@ nautilus_list_motion (GtkWidget *widget, GdkEventMotion *event)
 	clist = NAUTILUS_CLIST (widget);
 
 	if (event->window != clist->clist_window) {
-		return NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+		return EEL_CALL_PARENT_WITH_RETURN_VALUE
 			(GTK_WIDGET_CLASS, motion_notify_event, (widget, event));
 	}
 	
@@ -3121,7 +3121,7 @@ get_data_on_first_target_we_support (GtkWidget *widget, GdkDragContext *context,
 
 	if (nautilus_list_dnd_target_list == NULL)
 		nautilus_list_dnd_target_list = gtk_target_list_new (nautilus_list_dnd_target_table,
-								     NAUTILUS_N_ELEMENTS (nautilus_list_dnd_target_table));
+								     EEL_N_ELEMENTS (nautilus_list_dnd_target_table));
 
 	for (target = context->targets; target != NULL; target = target->next) {
 		guint dummy_info;
@@ -3231,8 +3231,8 @@ nautilus_list_real_scroll (NautilusList *list, float delta_x, float delta_y)
 	hadj = nautilus_clist_get_hadjustment (NAUTILUS_CLIST (list));
 	vadj = nautilus_clist_get_vadjustment (NAUTILUS_CLIST (list));
 
-	nautilus_gtk_adjustment_set_value (hadj, hadj->value + (int)delta_x);
-	nautilus_gtk_adjustment_set_value (vadj, vadj->value + (int)delta_y);
+	eel_gtk_adjustment_set_value (hadj, hadj->value + (int)delta_x);
+	eel_gtk_adjustment_set_value (vadj, vadj->value + (int)delta_y);
 
 }
 
@@ -3250,7 +3250,7 @@ auto_scroll_timeout_callback (gpointer data)
 	drag_info = list->details->drag_info;
 
 	if (drag_info->waiting_to_autoscroll
-	    && drag_info->start_auto_scroll_in > nautilus_get_system_time()) {
+	    && drag_info->start_auto_scroll_in > eel_get_system_time()) {
 		/* not yet */
 		return TRUE;
 	}
@@ -3444,15 +3444,15 @@ nautilus_list_drag_data_received (GtkWidget *widget, GdkDragContext *context,
 			gtk_drag_finish (context, TRUE, FALSE, time);
 			break;
 		case NAUTILUS_ICON_DND_COLOR:
-			nautilus_background_receive_dropped_color
-				(nautilus_get_widget_background (widget),
+			eel_background_receive_dropped_color
+				(eel_get_widget_background (widget),
 				 widget, x, y, data);
 			nautilus_list_setup_style_colors (NAUTILUS_LIST (list));
 			gtk_drag_finish (context, TRUE, FALSE, time);
 			break;
 		case NAUTILUS_ICON_DND_BGIMAGE:
-			nautilus_background_receive_dropped_background_image
-				(nautilus_get_widget_background (widget),
+			eel_background_receive_dropped_background_image
+				(eel_get_widget_background (widget),
 				 (char *)data->data);
 			gtk_drag_finish (context, TRUE, FALSE, time);
 			break;
@@ -3488,7 +3488,7 @@ nautilus_list_clear (NautilusCList *clist)
 	list = NAUTILUS_LIST (clist);
 	list->details->anchor_row = -1;
 
-	NAUTILUS_CALL_PARENT (NAUTILUS_CLIST_CLASS, clear, (clist));
+	EEL_CALL_PARENT (NAUTILUS_CLIST_CLASS, clear, (clist));
 }
 
 
@@ -3676,7 +3676,7 @@ insert_row (NautilusCList *list, int row_index, char *text[])
 
 	had_focus = list->focus_row != -1;
 
-	result = NAUTILUS_CALL_PARENT_WITH_RETURN_VALUE
+	result = EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(NAUTILUS_CLIST_CLASS, insert_row, (list, row_index, text));
 
 	if (!had_focus) {
diff --git a/libnautilus-private/nautilus-medusa-support.c b/libnautilus-private/nautilus-medusa-support.c
index 2d61f7742..a4e1dc2a5 100644
--- a/libnautilus-private/nautilus-medusa-support.c
+++ b/libnautilus-private/nautilus-medusa-support.c
@@ -27,8 +27,8 @@
 #include <config.h>
 #include "nautilus-medusa-support.h"
 
-#include "nautilus-glib-extensions.h"
-#include "nautilus-string.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-string.h>
 #include <dirent.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -104,7 +104,7 @@ nautilus_medusa_check_cron_is_enabled (void)
 
 	while ((file = readdir (proc_directory)) != NULL) {
 		/* Process files have numbers */
-		if (!nautilus_str_to_int (file->d_name, &process_number)) {
+		if (!eel_str_to_int (file->d_name, &process_number)) {
 			continue;
 		}
 
@@ -127,8 +127,8 @@ nautilus_medusa_check_cron_is_enabled (void)
 		
 		stat_file_process_name = strchr (stat_file_data, ' ');
 		
-		if (nautilus_str_has_prefix (stat_file_process_name, " (crond)") ||
-		    nautilus_str_has_prefix (stat_file_process_name, " (cron)")) {
+		if (eel_str_has_prefix (stat_file_process_name, " (crond)") ||
+		    eel_str_has_prefix (stat_file_process_name, " (cron)")) {
 			status = NAUTILUS_CRON_STATUS_ON;
 			break;
 		}
diff --git a/libnautilus-private/nautilus-merged-directory.c b/libnautilus-private/nautilus-merged-directory.c
index 2f4ef5e70..0101938ab 100644
--- a/libnautilus-private/nautilus-merged-directory.c
+++ b/libnautilus-private/nautilus-merged-directory.c
@@ -28,8 +28,8 @@
 
 #include "nautilus-directory-private.h"
 #include "nautilus-file.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <gtk/gtksignal.h>
 
 struct NautilusMergedDirectoryDetails {
@@ -75,7 +75,7 @@ static guint    merged_callback_hash                       (gconstpointer
 static gboolean merged_callback_equal                      (gconstpointer            merged_callback,
 							    gconstpointer            merged_callback_2);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusMergedDirectory,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusMergedDirectory,
 				   nautilus_merged_directory,
 				   NAUTILUS_TYPE_DIRECTORY)
 
@@ -112,7 +112,7 @@ merged_destroy (GtkObject *object)
 	g_hash_table_destroy (merged->details->monitors);
 	g_free (merged->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static guint
@@ -144,7 +144,7 @@ merged_callback_destroy (MergedCallback *merged_callback)
 	g_assert (merged_callback != NULL);
 	g_assert (NAUTILUS_IS_MERGED_DIRECTORY (merged_callback->merged));
 
-	nautilus_g_list_free_deep (merged_callback->wait_for_attributes);
+	eel_g_list_free_deep (merged_callback->wait_for_attributes);
 	g_list_free (merged_callback->non_ready_directories);
 	nautilus_file_list_free (merged_callback->merged_file_list);
 	g_free (merged_callback);
@@ -227,7 +227,7 @@ merged_call_when_ready (NautilusDirectory *directory,
 	merged_callback->merged = merged;
 	merged_callback->callback = callback;
 	merged_callback->callback_data = callback_data;
-	merged_callback->wait_for_attributes = nautilus_g_str_list_copy (file_attributes);
+	merged_callback->wait_for_attributes = eel_g_str_list_copy (file_attributes);
 	for (node = merged->details->directories; node != NULL; node = node->next) {
 		merged_callback->non_ready_directories = g_list_prepend
 			(merged_callback->non_ready_directories, node->data);
@@ -302,7 +302,7 @@ merged_file_monitor_add (NautilusDirectory *directory,
 	monitor = g_hash_table_lookup (merged->details->monitors, client);
 	if (monitor != NULL) {
 		g_assert (monitor->merged == merged);
-		nautilus_g_list_free_deep (monitor->monitor_attributes);
+		eel_g_list_free_deep (monitor->monitor_attributes);
 	} else {
 		monitor = g_new0 (MergedMonitor, 1);
 		monitor->merged = merged;
@@ -311,7 +311,7 @@ merged_file_monitor_add (NautilusDirectory *directory,
 	}
 	monitor->monitor_hidden_files = monitor_hidden_files;
 	monitor->monitor_backup_files = monitor_backup_files;
-	monitor->monitor_attributes = nautilus_g_str_list_copy (file_attributes);
+	monitor->monitor_attributes = eel_g_str_list_copy (file_attributes);
 	
 	/* Call through to the real directory add calls. */
 	for (node = merged->details->directories; node != NULL; node = node->next) {
@@ -346,7 +346,7 @@ merged_file_monitor_remove (NautilusDirectory *directory,
 			(node->data, monitor);
 	}
 
-	nautilus_g_list_free_deep (monitor->monitor_attributes);
+	eel_g_list_free_deep (monitor->monitor_attributes);
 	g_free (monitor);
 }
 
@@ -550,7 +550,7 @@ merged_remove_real_directory (NautilusMergedDirectory *merged,
 	g_return_if_fail (g_list_find (merged->details->directories, real_directory) != NULL);
 
 	/* Remove this directory from callbacks and monitors. */
-	nautilus_g_hash_table_safe_for_each
+	eel_g_hash_table_safe_for_each
 		(merged->details->callbacks,
 		 merged_callback_remove_directory_cover,
 		 real_directory);
diff --git a/libnautilus-private/nautilus-metafile-factory.c b/libnautilus-private/nautilus-metafile-factory.c
index 2686f278c..046b167b9 100644
--- a/libnautilus-private/nautilus-metafile-factory.c
+++ b/libnautilus-private/nautilus-metafile-factory.c
@@ -24,7 +24,7 @@
 #include "nautilus-metafile-factory.h"
 #include "nautilus-metafile.h"
 
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
 #include <libnautilus/nautilus-bonobo-workarounds.h>
 
@@ -64,7 +64,7 @@ destroy (GtkObject *object)
 	factory = NAUTILUS_METAFILE_FACTORY (object);
 	g_free (factory->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static NautilusMetafileFactory *
diff --git a/libnautilus-private/nautilus-metafile.c b/libnautilus-private/nautilus-metafile.c
index 939f0c82b..c16926d43 100644
--- a/libnautilus-private/nautilus-metafile.c
+++ b/libnautilus-private/nautilus-metafile.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #include "nautilus-metafile.h"
 
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-directory.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
 #include <libnautilus/nautilus-bonobo-workarounds.h>
@@ -32,11 +32,11 @@
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-file-info.h>
 
-#include "nautilus-string.h"
+#include <eel/eel-string.h>
 #include "nautilus-metadata.h"
 #include "nautilus-thumbnails.h"
-#include "nautilus-xml-extensions.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-xml-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include "nautilus-directory.h"
 #include "nautilus-global-preferences.h"
 #include "nautilus-file-private.h"
@@ -251,7 +251,7 @@ destroy (GtkObject *object)
 
 	g_free (metafile->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static GnomeVFSURI *
@@ -295,7 +295,7 @@ nautilus_metafile_set_directory_uri (NautilusMetafile *metafile, const char *dir
 {
 	GnomeVFSURI *new_vfs_uri;
 
-	if (nautilus_strcmp (metafile->details->directory_uri, directory_uri) == 0) {
+	if (eel_strcmp (metafile->details->directory_uri, directory_uri) == 0) {
 		return;
 	}
 
@@ -344,7 +344,7 @@ nautilus_metafile_get (const char *directory_uri)
 	g_return_val_if_fail (directory_uri != NULL, NULL);
 	
 	if (metafiles == NULL) {
-		metafiles = nautilus_g_hash_table_new_free_at_exit
+		metafiles = eel_g_hash_table_new_free_at_exit
 			(g_str_hash, g_str_equal, __FILE__ ": metafiles");
 	}
 	
@@ -522,7 +522,7 @@ corba_get_list (PortableServer_Servant  servant,
 		++buf_pos;
 	}
 
-	nautilus_g_list_free_deep (metadata_list);
+	eel_g_list_free_deep (metadata_list);
 
 	return result;
 }
@@ -537,10 +537,10 @@ corba_set (PortableServer_Servant  servant,
 {
 	NautilusMetafile  *metafile;
 
-	if (nautilus_str_is_empty (default_value)) {
+	if (eel_str_is_empty (default_value)) {
 		default_value = NULL;
 	}
-	if (nautilus_str_is_empty (metadata)) {
+	if (eel_str_is_empty (metadata)) {
 		metadata = NULL;
 	}
 
@@ -820,7 +820,7 @@ get_metadata_list_from_node (xmlNode *node,
 			     const char *list_key,
 			     const char *list_subkey)
 {
-	return nautilus_xml_get_property_for_children
+	return eel_xml_get_property_for_children
 		(node, list_key, list_subkey);
 }
 
@@ -909,7 +909,7 @@ set_metadata_string_in_metafile (NautilusMetafile *metafile,
 	old_metadata = get_file_metadata
 		(metafile, file_name, key, default_metadata);
 
-	old_metadata_matches = nautilus_strcmp (old_metadata, metadata) == 0;
+	old_metadata_matches = eel_strcmp (old_metadata, metadata) == 0;
 	g_free (old_metadata);
 	if (old_metadata_matches) {
 		return FALSE;
@@ -918,7 +918,7 @@ set_metadata_string_in_metafile (NautilusMetafile *metafile,
 	/* Data that matches the default is represented in the tree by
 	 * the lack of an attribute.
 	 */
-	if (nautilus_strcmp (default_metadata, metadata) == 0) {
+	if (eel_strcmp (default_metadata, metadata) == 0) {
 		value = NULL;
 	} else {
 		value = metadata;
@@ -963,7 +963,7 @@ set_metadata_list_in_metafile (NautilusMetafile *metafile,
 		p = list;
 
 		/* Remove any nodes except the ones we expect. */
-		for (child = nautilus_xml_get_children (node);
+		for (child = eel_xml_get_children (node);
 		     child != NULL;
 		     child = next) {
 
@@ -1019,7 +1019,7 @@ metadata_value_new_list (GList *metadata)
 	value = g_new0 (MetadataValue, 1);
 
 	value->is_list = TRUE;
-	value->value.string_list = nautilus_g_str_list_copy (metadata);
+	value->value.string_list = eel_g_str_list_copy (metadata);
 
 	return value;
 }
@@ -1034,7 +1034,7 @@ metadata_value_destroy (MetadataValue *value)
 	if (!value->is_list) {
 		g_free (value->value.string);
 	} else {
-		nautilus_g_list_free_deep (value->value.string_list);
+		eel_g_list_free_deep (value->value.string_list);
 	}
 	g_free (value->default_value);
 	g_free (value);
@@ -1049,15 +1049,15 @@ metadata_value_equal (const MetadataValue *value_a,
 	}
 
 	if (!value_a->is_list) {
-		return nautilus_strcmp (value_a->value.string,
+		return eel_strcmp (value_a->value.string,
 					value_b->value.string) == 0
-			&& nautilus_strcmp (value_a->default_value,
+			&& eel_strcmp (value_a->default_value,
 					    value_b->default_value) == 0;
 	} else {
 		g_assert (value_a->default_value == NULL);
 		g_assert (value_b->default_value == NULL);
 
-		return nautilus_g_str_list_equal
+		return eel_g_str_list_equal
 			(value_a->value.string_list,
 			 value_b->value.string_list);
 	}
@@ -1109,7 +1109,7 @@ get_metadata_string_from_table (NautilusMetafile *metafile,
 	
 	/* Convert it to a string. */
 	g_assert (!value->is_list);
-	if (nautilus_strcmp (value->value.string, value->default_value) == 0) {
+	if (eel_strcmp (value->value.string, value->default_value) == 0) {
 		return g_strdup (default_metadata);
 	}
 	return g_strdup (value->value.string);
@@ -1141,7 +1141,7 @@ get_metadata_list_from_table (NautilusMetafile *metafile,
 
 	/* Copy the list and return it. */
 	g_assert (value->is_list);
-	return nautilus_g_str_list_copy (value->value.string_list);
+	return eel_g_str_list_copy (value->value.string_list);
 }
 
 static guint
@@ -1279,8 +1279,8 @@ get_file_metadata (NautilusMetafile *metafile,
 		   const char *default_metadata)
 {
 	g_return_val_if_fail (NAUTILUS_IS_METAFILE (metafile), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (file_name), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (key), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (file_name), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (key), NULL);
 
 	if (metafile->details->is_read) {
 		return get_metadata_string_from_metafile
@@ -1298,9 +1298,9 @@ get_file_metadata_list (NautilusMetafile *metafile,
 			const char *list_subkey)
 {
 	g_return_val_if_fail (NAUTILUS_IS_METAFILE (metafile), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (file_name), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (list_key), NULL);
-	g_return_val_if_fail (!nautilus_str_is_empty (list_subkey), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (file_name), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (list_key), NULL);
+	g_return_val_if_fail (!eel_str_is_empty (list_subkey), NULL);
 
 	if (metafile->details->is_read) {
 		return get_metadata_list_from_metafile
@@ -1321,8 +1321,8 @@ set_file_metadata (NautilusMetafile *metafile,
 	MetadataValue *value;
 
 	g_return_val_if_fail (NAUTILUS_IS_METAFILE (metafile), FALSE);
-	g_return_val_if_fail (!nautilus_str_is_empty (file_name), FALSE);
-	g_return_val_if_fail (!nautilus_str_is_empty (key), FALSE);
+	g_return_val_if_fail (!eel_str_is_empty (file_name), FALSE);
+	g_return_val_if_fail (!eel_str_is_empty (key), FALSE);
 
 	if (metafile->details->is_read) {
 		return set_metadata_string_in_metafile (metafile, file_name, key,
@@ -1344,9 +1344,9 @@ set_file_metadata_list (NautilusMetafile *metafile,
 	MetadataValue *value;
 
 	g_return_val_if_fail (NAUTILUS_IS_METAFILE (metafile), FALSE);
-	g_return_val_if_fail (!nautilus_str_is_empty (file_name), FALSE);
-	g_return_val_if_fail (!nautilus_str_is_empty (list_key), FALSE);
-	g_return_val_if_fail (!nautilus_str_is_empty (list_subkey), FALSE);
+	g_return_val_if_fail (!eel_str_is_empty (file_name), FALSE);
+	g_return_val_if_fail (!eel_str_is_empty (list_key), FALSE);
+	g_return_val_if_fail (!eel_str_is_empty (list_subkey), FALSE);
 
 	if (metafile->details->is_read) {
 		return set_metadata_list_in_metafile (metafile, file_name,
@@ -1591,7 +1591,7 @@ remove_file_metadata (NautilusMetafile *metafile,
 			g_hash_table_remove (hash,
 					     file_name);
 			xmlFree (key);
-			nautilus_xml_remove_node (file_node);
+			eel_xml_remove_node (file_node);
 			xmlFreeNode (file_node);
 			directory_request_write_metafile (metafile);
 		}
@@ -1638,7 +1638,7 @@ nautilus_metafile_set_metafile_contents (NautilusMetafile *metafile,
 	
 	/* Populate the node hash table. */
 	hash = metafile->details->node_hash;
-	for (node = nautilus_xml_get_root_children (metafile_contents);
+	for (node = eel_xml_get_root_children (metafile_contents);
 	     node != NULL; node = node->next) {
 		if (strcmp (node->name, "file") == 0) {
 			name = xmlGetProp (node, "name");
@@ -1736,7 +1736,7 @@ metafile_read_check_for_directory_callback (GnomeVFSAsyncHandle *handle,
 	metafile = NAUTILUS_METAFILE (callback_data);
 
 	g_assert (metafile->details->read_state->get_file_info_handle == handle);
-	g_assert (nautilus_g_list_exactly_one_item (results));
+	g_assert (eel_g_list_exactly_one_item (results));
 
 	metafile->details->read_state->get_file_info_handle = NULL;
 
@@ -1899,12 +1899,12 @@ allow_metafile (NautilusMetafile *metafile)
 	 */
 	uri = metafile->details->directory_uri;
 	if (nautilus_is_search_uri (uri)
-	    || nautilus_istr_has_prefix (uri, "ghelp:")
-	    || nautilus_istr_has_prefix (uri, "gnome-help:")
-	    || nautilus_istr_has_prefix (uri, "help:")
-	    || nautilus_istr_has_prefix (uri, "info:")
-	    || nautilus_istr_has_prefix (uri, "man:")
-	    || nautilus_istr_has_prefix (uri, "pipe:")
+	    || eel_istr_has_prefix (uri, "ghelp:")
+	    || eel_istr_has_prefix (uri, "gnome-help:")
+	    || eel_istr_has_prefix (uri, "help:")
+	    || eel_istr_has_prefix (uri, "info:")
+	    || eel_istr_has_prefix (uri, "man:")
+	    || eel_istr_has_prefix (uri, "pipe:")
 	    ) {
 		return FALSE;
 	}
diff --git a/libnautilus-private/nautilus-mime-actions.c b/libnautilus-private/nautilus-mime-actions.c
index b1af50c6f..bfbd46ee5 100644
--- a/libnautilus-private/nautilus-mime-actions.c
+++ b/libnautilus-private/nautilus-mime-actions.c
@@ -27,10 +27,10 @@
 
 #include "nautilus-file-attributes.h"
 #include "nautilus-file.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-lib-self-check-functions.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-lib-self-check-functions.h>
 #include "nautilus-metadata.h"
-#include "nautilus-string.h"
+#include <eel/eel-string.h>
 #include <libgnomevfs/gnome-vfs-application-registry.h>
 #include <libgnomevfs/gnome-vfs-mime-info.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
@@ -423,7 +423,7 @@ nautilus_mime_get_default_component_for_file_internal (NautilusFile *file,
 		server = NULL;		
 	}
 	
-	nautilus_g_list_free_deep (item_mime_types);
+	eel_g_list_free_deep (item_mime_types);
 	g_strfreev (sort_conditions);
 
 	g_free (uri_scheme);
@@ -491,7 +491,7 @@ nautilus_mime_get_short_list_applications_for_file (NautilusFile      *file)
 	/* First remove applications that cannot support this location */
 	uri_scheme = nautilus_file_get_uri_scheme (file);
 	g_assert (uri_scheme != NULL);
-	result = nautilus_g_list_partition (result, application_supports_uri_scheme,
+	result = eel_g_list_partition (result, application_supports_uri_scheme,
 					    uri_scheme, &removed);
 	gnome_vfs_mime_application_list_free (removed);
 
@@ -507,7 +507,7 @@ nautilus_mime_get_short_list_applications_for_file (NautilusFile      *file)
 		 NAUTILUS_METADATA_SUBKEY_APPLICATION_ID);
 
 
-	result = nautilus_g_list_partition (result, (NautilusPredicateFunction) gnome_vfs_mime_application_has_id_not_in_list, 
+	result = eel_g_list_partition (result, (EelPredicateFunction) gnome_vfs_mime_application_has_id_not_in_list, 
 					    metadata_application_remove_ids, &removed);
 	
 	gnome_vfs_mime_application_list_free (removed);
@@ -585,8 +585,8 @@ nautilus_mime_get_short_list_components_for_file (NautilusFile      *file)
 		iids = g_list_prepend (iids, component->iid);
 	}
 
-	iids = nautilus_g_list_partition
-		(iids, (NautilusPredicateFunction) string_not_in_list, 
+	iids = eel_g_list_partition
+		(iids, (EelPredicateFunction) string_not_in_list, 
 		 metadata_component_remove_ids, &removed);
 
 	g_list_free (removed);
@@ -626,7 +626,7 @@ nautilus_mime_get_short_list_components_for_file (NautilusFile      *file)
 		g_free (extra_requirements);
 	}
 
-	nautilus_g_list_free_deep (item_mime_types);
+	eel_g_list_free_deep (item_mime_types);
 	gnome_vfs_mime_component_list_free (servers);
 	g_list_free (iids);
 	g_free (uri_scheme);
@@ -754,7 +754,7 @@ nautilus_mime_actions_file_needs_full_file_attributes (NautilusFile *file)
 	}
 	
 	gnome_vfs_mime_component_list_free (info_list);
-	nautilus_g_list_free_deep (explicit_iids);
+	eel_g_list_free_deep (explicit_iids);
 	g_free (uri_scheme);
 	g_free (mime_type);
 	CORBA_exception_free (&ev);
@@ -792,8 +792,8 @@ nautilus_mime_get_all_components_for_file (NautilusFile *file)
 	info_list = nautilus_do_component_query (mime_type, uri_scheme, item_mime_types, FALSE,
 						 explicit_iids, NULL, NULL, &ev);
 	
-	nautilus_g_list_free_deep (explicit_iids);
-	nautilus_g_list_free_deep (item_mime_types);
+	eel_g_list_free_deep (explicit_iids);
+	eel_g_list_free_deep (item_mime_types);
 
 	g_free (uri_scheme);
 	g_free (mime_type);
@@ -990,7 +990,7 @@ nautilus_mime_add_application_to_short_list_for_file (NautilusFile      *file,
 		new_list = g_list_append (gnome_vfs_mime_id_list_from_application_list (old_list), 
 					  g_strdup (application_id));
 		result = nautilus_mime_set_short_list_applications_for_file (file, new_list);
-		nautilus_g_list_free_deep (new_list);
+		eel_g_list_free_deep (new_list);
 	}
 
 	gnome_vfs_mime_application_list_free (old_list);
@@ -1018,7 +1018,7 @@ nautilus_mime_remove_application_from_short_list_for_file (NautilusFile      *fi
 	} else {
 		new_list = gnome_vfs_mime_id_list_from_application_list (old_list);
 		result = nautilus_mime_set_short_list_applications_for_file (file, new_list);
-		nautilus_g_list_free_deep (new_list);
+		eel_g_list_free_deep (new_list);
 	}
 
 	gnome_vfs_mime_application_list_free (old_list);
@@ -1044,7 +1044,7 @@ nautilus_mime_add_component_to_short_list_for_file (NautilusFile      *file,
 		new_list = g_list_append (gnome_vfs_mime_id_list_from_component_list (old_list), 
 					  g_strdup (iid));
 		result = nautilus_mime_set_short_list_components_for_file (file, new_list);
-		nautilus_g_list_free_deep (new_list);
+		eel_g_list_free_deep (new_list);
 	}
 
 	gnome_vfs_mime_component_list_free (old_list);
@@ -1072,7 +1072,7 @@ nautilus_mime_remove_component_from_short_list_for_file (NautilusFile *file,
 	} else {
 		new_list = gnome_vfs_mime_id_list_from_component_list (old_list);
 		result = nautilus_mime_set_short_list_components_for_file (file, new_list);
-		nautilus_g_list_free_deep (new_list);
+		eel_g_list_free_deep (new_list);
 	}
 
 	gnome_vfs_mime_component_list_free (old_list);
@@ -1677,5 +1677,5 @@ application_supports_uri_scheme (gpointer data,
 	}
 	return g_list_find_custom (application->supported_uri_schemes,
 				   uri_scheme,
-				   nautilus_strcasecmp_compare_func) != NULL;
+				   eel_strcasecmp_compare_func) != NULL;
 }
diff --git a/libnautilus-private/nautilus-password-dialog.c b/libnautilus-private/nautilus-password-dialog.c
deleted file mode 100644
index c2fef9b5a..000000000
--- a/libnautilus-private/nautilus-password-dialog.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-password-dialog.c - A use password prompting dialog widget.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-password-dialog.h"
-
-#include "nautilus-caption-table.h"
-#include "nautilus-gtk-macros.h"
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-stock.h>
-
-struct _NautilusPasswordDialogDetails
-{
-	/* Attributes */
-	char		*username;
-	char		*password;
-	gboolean	readonly_username;
-	gboolean	remember;
-	char		*remember_label_text;
-
-	/* Internal widgetry and flags */
-	GtkWidget	*table;
-	GtkWidget	*remember_button;
-	GtkLabel	*message;
-};
-
-static const char * stock_buttons[] =
-{
-	GNOME_STOCK_BUTTON_OK,
-	GNOME_STOCK_BUTTON_CANCEL,
-	NULL
-};
-
-/* Dialog button indeces */
-static const gint  DIALOG_OK_BUTTON = 0;
-
-/* Caption table rows indeces */
-static const guint CAPTION_TABLE_USERNAME_ROW = 0;
-static const guint CAPTION_TABLE_PASSWORD_ROW = 1;
-
-/* Layout constants */
-static const guint DIALOG_BORDER_WIDTH = 0;
-static const guint CAPTION_TABLE_BORDER_WIDTH = 4;
-
-/* NautilusPasswordDialogClass methods */
-static void nautilus_password_dialog_initialize_class (NautilusPasswordDialogClass *password_dialog_class);
-static void nautilus_password_dialog_initialize       (NautilusPasswordDialog      *password_dialog);
-
-
-
-/* GtkObjectClass methods */
-static void nautilus_password_dialog_destroy          (GtkObject                   *object);
-
-
-/* GtkDialog callbacks */
-static void dialog_show_callback                      (GtkWidget                   *widget,
-						       gpointer                     callback_data);
-static void dialog_close_callback                     (GtkWidget                   *widget,
-						       gpointer                     callback_data);
-/* Caption table callbacks */
-static void caption_table_activate_callback           (GtkWidget                   *widget,
-						       guint                         entry,
-						       gpointer                     callback_data);
-
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusPasswordDialog,
-				   nautilus_password_dialog,
-				   gnome_dialog_get_type ());
-
-
-static void
-nautilus_password_dialog_initialize_class (NautilusPasswordDialogClass * klass)
-{
-	GtkObjectClass * object_class;
-	GtkWidgetClass * widget_class;
-	
-	object_class = GTK_OBJECT_CLASS(klass);
-	widget_class = GTK_WIDGET_CLASS(klass);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_password_dialog_destroy;
-}
-
-static void
-nautilus_password_dialog_initialize (NautilusPasswordDialog *password_dialog)
-{
-	password_dialog->details = g_new (NautilusPasswordDialogDetails, 1);
-
-	password_dialog->details->username = NULL;
-	password_dialog->details->password = NULL;
-	password_dialog->details->readonly_username = FALSE;
-
-	password_dialog->details->remember_label_text = NULL;
-	password_dialog->details->remember = FALSE;
-
-	password_dialog->details->table = NULL;
-	password_dialog->details->remember_button = NULL;
-	password_dialog->details->message = NULL;
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_password_dialog_destroy (GtkObject* object)
-{
-	NautilusPasswordDialog *password_dialog;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (object));
-	
-	password_dialog = NAUTILUS_PASSWORD_DIALOG (object);
-	
-	if (password_dialog->details->username) {
-		g_free (password_dialog->details->username);
-	}
-
-	if (password_dialog->details->password) {
-		g_free (password_dialog->details->password);
-	}
-
-	if (password_dialog->details->remember_label_text) {
-		g_free (password_dialog->details->remember_label_text);
-	}
-
-	if (password_dialog->details->message) {
-		gtk_widget_destroy (GTK_WIDGET (password_dialog->details->message));
-	}
-
-	g_free (password_dialog->details);
-}
-
-/* GtkDialog callbacks */
-static void
-dialog_show_callback (GtkWidget *widget, gpointer callback_data)
-{
-	NautilusPasswordDialog *password_dialog;
-
-	g_return_if_fail (callback_data != NULL);
-	g_return_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (callback_data));
-
-	password_dialog = NAUTILUS_PASSWORD_DIALOG (callback_data);
-
-	/* Move the focus to the password entry */
-	nautilus_caption_table_entry_grab_focus (NAUTILUS_CAPTION_TABLE (password_dialog->details->table), 
-						 CAPTION_TABLE_PASSWORD_ROW);
-}
-
-static void
-dialog_close_callback (GtkWidget *widget, gpointer callback_data)
-{
-	NautilusPasswordDialog *password_dialog;
-
-	g_return_if_fail (callback_data != NULL);
-	g_return_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (callback_data));
-
-	password_dialog = NAUTILUS_PASSWORD_DIALOG (callback_data);
-
-	gtk_widget_hide (widget);
-}
-
-/* Caption table callbacks */
-static void
-caption_table_activate_callback (GtkWidget *widget, guint entry, gpointer callback_data)
-{
-	NautilusPasswordDialog *password_dialog;
-
-	g_return_if_fail (callback_data != NULL);
-	g_return_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (callback_data));
-
-	password_dialog = NAUTILUS_PASSWORD_DIALOG (callback_data);
-
-	/* If the username entry was activated, simply advance the focus to the password entry */
-	if (entry == CAPTION_TABLE_USERNAME_ROW) {
-		nautilus_caption_table_entry_grab_focus (NAUTILUS_CAPTION_TABLE (password_dialog->details->table), 
-							 CAPTION_TABLE_PASSWORD_ROW);
-	}
-	/* If the password entry was activated, then simulate and OK button press to continue to hide process */
-	else if (entry == CAPTION_TABLE_PASSWORD_ROW) {
-		GtkWidget *button;
-		
-		button = g_list_nth_data (GNOME_DIALOG (password_dialog)->buttons, DIALOG_OK_BUTTON);
-		
-		g_assert (button != NULL);
-		g_assert (GTK_IS_BUTTON (button));
-
-		gtk_button_clicked (GTK_BUTTON (button));
-	}
-}
-
-/* Public NautilusPasswordDialog methods */
-GtkWidget *
-nautilus_password_dialog_new (const char	*dialog_title,
-			      const char	*message,
-			      const char	*username,
-			      const char	*password,
-			      gboolean		readonly_username)
-{
-	NautilusPasswordDialog *password_dialog;
-
-	password_dialog = NAUTILUS_PASSWORD_DIALOG (gtk_widget_new (nautilus_password_dialog_get_type (), NULL));
-
-	gnome_dialog_constructv (GNOME_DIALOG (password_dialog), dialog_title, stock_buttons);
-
-	/* Setup the dialog */
-	gtk_window_set_policy (GTK_WINDOW (password_dialog), 
-			      FALSE,	/* allow_shrink */
-			      TRUE,	/* allow_grow */
-			      FALSE);	/* auto_shrink */
-
- 	gtk_window_set_position (GTK_WINDOW (password_dialog), GTK_WIN_POS_CENTER);
-	gtk_window_set_modal (GTK_WINDOW (password_dialog), TRUE);
-
- 	gtk_container_set_border_width (GTK_CONTAINER (password_dialog), DIALOG_BORDER_WIDTH);
-
-	gnome_dialog_set_default (GNOME_DIALOG (password_dialog), DIALOG_OK_BUTTON);
-
-	/* Dont close the dialog on click.  We'll mange the destruction our selves */
-	gnome_dialog_set_close (GNOME_DIALOG (password_dialog), FALSE);
-
-	/* Make the close operation 'just_hide' the dialog - not nuke it */
-	gnome_dialog_close_hides (GNOME_DIALOG (password_dialog), TRUE);
-	
-	gtk_signal_connect_while_alive (GTK_OBJECT (password_dialog),
-					"show",
-					GTK_SIGNAL_FUNC (dialog_show_callback),
-					(gpointer) password_dialog,
-					GTK_OBJECT (password_dialog));
-	
-	gtk_signal_connect_while_alive (GTK_OBJECT (password_dialog),
-					"close",
-					GTK_SIGNAL_FUNC (dialog_close_callback),
-					(gpointer) password_dialog,
-					GTK_OBJECT (password_dialog));
-
-	/* The table that holds the captions */
-	password_dialog->details->table = nautilus_caption_table_new (2);
-	
-	gtk_signal_connect (GTK_OBJECT (password_dialog->details->table),
-			    "activate",
-			    GTK_SIGNAL_FUNC (caption_table_activate_callback),
-			    password_dialog);
-
-	nautilus_caption_table_set_row_info (NAUTILUS_CAPTION_TABLE (password_dialog->details->table),
-					     CAPTION_TABLE_USERNAME_ROW,
-					     _("Username:"),
-					     "",
-					     TRUE,
-					     TRUE);
-
-	nautilus_caption_table_set_row_info (NAUTILUS_CAPTION_TABLE (password_dialog->details->table),
-					     CAPTION_TABLE_PASSWORD_ROW,
-					     _("Password:"),
-					     "",
-					     FALSE,
-					     FALSE);
-	
-	/* Configure the GNOME_DIALOG's vbox */
- 	g_assert (GNOME_DIALOG (password_dialog)->vbox != NULL);
-
-	gtk_box_set_spacing (GTK_BOX (GNOME_DIALOG (password_dialog)->vbox), 10);
-	
-	if (message) {
-		password_dialog->details->message =
-			GTK_LABEL (gtk_label_new (message));
-		gtk_label_set_justify (password_dialog->details->message, GTK_JUSTIFY_LEFT);
-		gtk_label_set_line_wrap (password_dialog->details->message, TRUE);
-
-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (password_dialog)->vbox),
-				    GTK_WIDGET (password_dialog->details->message),
-				    TRUE,	/* expand */
-				    TRUE,	/* fill */
-				    0);		/* padding */
-	}
-
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (password_dialog)->vbox),
-			    password_dialog->details->table,
-			    TRUE,	/* expand */
-			    TRUE,	/* fill */
-			    0);		/* padding */
-#if 0 /* FIXME: disabled for PR2 originally, when will we re-enable */
-	password_dialog->details->remember_button = 
-		gtk_check_button_new_with_label (_("Remember this password"));
-
-	gtk_box_pack_end (GTK_BOX (GNOME_DIALOG (password_dialog)->vbox),
-			  password_dialog->details->remember_button,
-			  TRUE,	/* expand */
-			  TRUE,	/* fill */
-			  4);		/* padding */
-#else
-	password_dialog->details->remember_button = NULL;
-#endif	
-	/* Configure the table */
- 	gtk_container_set_border_width (GTK_CONTAINER(password_dialog->details->table), CAPTION_TABLE_BORDER_WIDTH);
-	
-	gtk_widget_show_all (GNOME_DIALOG (password_dialog)->vbox);
-	
-	nautilus_password_dialog_set_username (password_dialog, username);
-	nautilus_password_dialog_set_password (password_dialog, password);
-	nautilus_password_dialog_set_readonly_username (password_dialog, readonly_username);
-	
-	return GTK_WIDGET (password_dialog);
-}
-
-gboolean
-nautilus_password_dialog_run_and_block (NautilusPasswordDialog *password_dialog)
-{
-	gint button_clicked;
-
-	g_return_val_if_fail (password_dialog != NULL, FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (password_dialog), FALSE);
-	
-	button_clicked = gnome_dialog_run_and_close (GNOME_DIALOG (password_dialog));
-
-	return (button_clicked == DIALOG_OK_BUTTON);
-}
-
-void
-nautilus_password_dialog_set_username (NautilusPasswordDialog	*password_dialog,
-				       const char		*username)
-{
-	g_return_if_fail (password_dialog != NULL);
-	g_return_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (password_dialog));
-
-	nautilus_caption_table_set_entry_text (NAUTILUS_CAPTION_TABLE (password_dialog->details->table),
-					       CAPTION_TABLE_USERNAME_ROW,
-					       username);
-}
-
-void
-nautilus_password_dialog_set_password (NautilusPasswordDialog	*password_dialog,
-				       const char		*password)
-{
-	g_return_if_fail (password_dialog != NULL);
-	g_return_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (password_dialog));
-	
-	nautilus_caption_table_set_entry_text (NAUTILUS_CAPTION_TABLE (password_dialog->details->table),
-					       CAPTION_TABLE_PASSWORD_ROW,
-					       password);
-}
-
-void
-nautilus_password_dialog_set_readonly_username (NautilusPasswordDialog	*password_dialog,
-						gboolean		readonly)
-{
-	g_return_if_fail (password_dialog != NULL);
-	g_return_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (password_dialog));
-	
-	nautilus_caption_table_set_entry_readonly (NAUTILUS_CAPTION_TABLE (password_dialog->details->table),
-						   CAPTION_TABLE_USERNAME_ROW,
-						   readonly);
-}
-
-char *
-nautilus_password_dialog_get_username (NautilusPasswordDialog *password_dialog)
-{
-	g_return_val_if_fail (password_dialog != NULL, NULL);
-	g_return_val_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (password_dialog), NULL);
-
-	return nautilus_caption_table_get_entry_text (NAUTILUS_CAPTION_TABLE (password_dialog->details->table),
-						      CAPTION_TABLE_USERNAME_ROW);
-}
-
-char *
-nautilus_password_dialog_get_password (NautilusPasswordDialog *password_dialog)
-{
-	g_return_val_if_fail (password_dialog != NULL, NULL);
-	g_return_val_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (password_dialog), NULL);
-
-	return nautilus_caption_table_get_entry_text (NAUTILUS_CAPTION_TABLE (password_dialog->details->table),
-						      CAPTION_TABLE_PASSWORD_ROW);
-}
-
-gboolean
-nautilus_password_dialog_get_remember (NautilusPasswordDialog *password_dialog)
-{
-	g_return_val_if_fail (password_dialog != NULL, FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (password_dialog), FALSE);
-
-#if 0	/* remove for PR2 */
-	return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_button));
-#else
-	return FALSE;
-#endif
-}
-
-void
-nautilus_password_dialog_set_remember (NautilusPasswordDialog *password_dialog,
-				       gboolean                remember)
-{
-	g_return_if_fail (password_dialog != NULL);
-	g_return_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (password_dialog));
-
-#if 0	/* remove for PR2 */
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_button),
-				      remember);
-#endif
-}
-
-void
-nautilus_password_dialog_set_remember_label_text (NautilusPasswordDialog *password_dialog,
-						  const char             *remember_label_text)
-{
-#if 0	/* remove for PR2 */
-	GtkWidget *label;
-
-	g_return_if_fail (password_dialog != NULL);
-	g_return_if_fail (NAUTILUS_IS_PASSWORD_DIALOG (password_dialog));
-
-	label = GTK_BIN (password_dialog->details->remember_button)->child;
-
-	g_assert (label != NULL);
-	g_assert (GTK_IS_LABEL (label));
-
-	gtk_label_set_text (GTK_LABEL (label), remember_label_text);
-#endif
-}
diff --git a/libnautilus-private/nautilus-password-dialog.h b/libnautilus-private/nautilus-password-dialog.h
deleted file mode 100644
index 52363e497..000000000
--- a/libnautilus-private/nautilus-password-dialog.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-password-dialog.h - A use password prompting dialog widget.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_PASSWORD_DIALOG_H
-#define NAUTILUS_PASSWORD_DIALOG_H
-
-#include <libgnomeui/gnome-dialog.h>
-
-BEGIN_GNOME_DECLS
-
-#define GTK_TYPE_AUTH_DIALOG            (nautilus_password_dialog_get_type ())
-#define NAUTILUS_PASSWORD_DIALOG(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_AUTH_DIALOG, NautilusPasswordDialog))
-#define NAUTILUS_PASSWORD_DIALOG_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_AUTH_DIALOG, NautilusPasswordDialogClass))
-#define NAUTILUS_IS_PASSWORD_DIALOG(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_AUTH_DIALOG))
-#define NAUTILUS_IS_PASSWORD_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_AUTH_DIALOG))
-
-typedef struct _NautilusPasswordDialog       NautilusPasswordDialog;
-typedef struct _NautilusPasswordDialogClass  NautilusPasswordDialogClass;
-typedef struct _NautilusPasswordDialogDetails NautilusPasswordDialogDetails;
-
-struct _NautilusPasswordDialog
-{
-	GnomeDialog gnome_dialog;
-
-	NautilusPasswordDialogDetails *details;
-};
-
-struct _NautilusPasswordDialogClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkType    nautilus_password_dialog_get_type                (void);
-GtkWidget* nautilus_password_dialog_new                     (const char             *dialog_title,
-							     const char		    *message,
-							     const char             *username,
-							     const char             *password,
-							     gboolean                readonly_username);
-gboolean   nautilus_password_dialog_run_and_block           (NautilusPasswordDialog *password_dialog);
-
-/* Attribute mutators */
-void     nautilus_password_dialog_set_username            (NautilusPasswordDialog *password_dialog,
-							   const char             *username);
-void     nautilus_password_dialog_set_password            (NautilusPasswordDialog *password_dialog,
-							   const char             *password);
-void     nautilus_password_dialog_set_readonly_username   (NautilusPasswordDialog *password_dialog,
-							   gboolean                readonly);
-void     nautilus_password_dialog_set_remember            (NautilusPasswordDialog *password_dialog,
-							   gboolean                remember);
-void     nautilus_password_dialog_set_remember_label_text (NautilusPasswordDialog *password_dialog,
-							   const char             *remember_label_text);
-
-/* Attribute accessors */
-char *   nautilus_password_dialog_get_username            (NautilusPasswordDialog *password_dialog);
-char *   nautilus_password_dialog_get_password            (NautilusPasswordDialog *password_dialog);
-gboolean nautilus_password_dialog_get_remember            (NautilusPasswordDialog *password_dialog);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_PASSWORD_DIALOG_H */
diff --git a/libnautilus-private/nautilus-preferences-box.c b/libnautilus-private/nautilus-preferences-box.c
index e5be90420..10e519e5e 100644
--- a/libnautilus-private/nautilus-preferences-box.c
+++ b/libnautilus-private/nautilus-preferences-box.c
@@ -25,8 +25,8 @@
 
 #include <config.h>
 #include "nautilus-preferences-box.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-string.h"
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-string.h>
 
 #include <gtk/gtkclist.h>
 #include <gtk/gtknotebook.h>
@@ -79,7 +79,7 @@ static void      category_list_select_row_callback         (GtkCList
 int              preferences_box_find_row                  (GtkCList                    *clist,
 							    char                        *pane_name);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesBox, nautilus_preferences_box, GTK_TYPE_HBOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesBox, nautilus_preferences_box, GTK_TYPE_HBOX)
 
 /*
  * NautilusPreferencesBoxClass methods
@@ -133,7 +133,7 @@ nautilus_preferences_box_destroy (GtkObject *object)
 	g_free (preferences_box->details);
 	
 	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /*
@@ -158,7 +158,7 @@ preferences_box_select_pane (NautilusPreferencesBox *preferences_box,
 
 		g_assert (info != NULL);
 		
-		if (nautilus_str_is_equal (pane_name, info->pane_name)) {
+		if (eel_str_is_equal (pane_name, info->pane_name)) {
  			gtk_widget_show (info->pane_widget);
  			gtk_notebook_set_page (GTK_NOTEBOOK (preferences_box->details->pane_notebook), 
  					       g_list_position (preferences_box->details->panes, pane_iterator));
@@ -183,7 +183,7 @@ preferences_box_find_row (GtkCList *clist, char *pane_name)
 	for (i=0; i < GTK_CLIST (clist)->rows; i++) {
 		gtk_clist_get_text (GTK_CLIST (clist), i, 0, &pane);
 		
-		if (nautilus_str_is_equal (pane, pane_name)) {
+		if (eel_str_is_equal (pane, pane_name)) {
 			return i;
 		}
 	}
@@ -221,7 +221,7 @@ preferences_box_category_list_recreate (NautilusPreferencesBox *preferences_box)
 			text_array[CATEGORY_COLUMN] = info->pane_name;
 			gtk_clist_append (GTK_CLIST (preferences_box->details->category_list), text_array);
 
-			if (nautilus_str_is_equal (info->pane_name, preferences_box->details->selected_pane)) {
+			if (eel_str_is_equal (info->pane_name, preferences_box->details->selected_pane)) {
 				row = preferences_box_find_row (GTK_CLIST (preferences_box->details->category_list),
 								info->pane_name);
 				
@@ -402,7 +402,7 @@ nautilus_preferences_box_find_pane (const NautilusPreferencesBox *preferences_bo
 	for (node = preferences_box->details->panes; node != NULL; node = node->next) {
 		g_assert (node->data != NULL);
 		info = node->data;
-		if (nautilus_str_is_equal (info->pane_name, pane_name)) {
+		if (eel_str_is_equal (info->pane_name, pane_name)) {
 			return info->pane_widget;
 		}
 	}
diff --git a/libnautilus-private/nautilus-preferences-dialog.c b/libnautilus-private/nautilus-preferences-dialog.c
index 14c770909..b7ff3d336 100644
--- a/libnautilus-private/nautilus-preferences-dialog.c
+++ b/libnautilus-private/nautilus-preferences-dialog.c
@@ -25,8 +25,8 @@
 #include <config.h>
 #include "nautilus-preferences-dialog.h"
 
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
@@ -84,7 +84,7 @@ static void nautilus_preferences_dialog_construct        (NautilusPreferencesDia
 static void user_level_changed_callback (gpointer callback_data);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesDialog, 
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesDialog, 
 				   nautilus_preferences_dialog, 
 				   gnome_dialog_get_type ())
 
@@ -180,7 +180,7 @@ nautilus_preferences_dialog_construct (NautilusPreferencesDialog *prefs_dialog,
 	gnome_dialog_set_default (GNOME_DIALOG(prefs_dialog), 
 				  DEFAULT_BUTTON);
 
-	nautilus_gtk_window_set_up_close_accelerator (GTK_WINDOW (prefs_dialog));
+	eel_gtk_window_set_up_close_accelerator (GTK_WINDOW (prefs_dialog));
 
 	gtk_signal_connect (GTK_OBJECT (prefs_dialog),
 			    "clicked",
@@ -240,7 +240,7 @@ nautilus_preferences_dialog_destroy(GtkObject* object)
 	g_free (prefs_dialog->details);
 
 	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 GtkWidget*
diff --git a/libnautilus-private/nautilus-preferences-group.c b/libnautilus-private/nautilus-preferences-group.c
index 46ebf9474..1a1853419 100644
--- a/libnautilus-private/nautilus-preferences-group.c
+++ b/libnautilus-private/nautilus-preferences-group.c
@@ -24,12 +24,12 @@
 
 #include <config.h>
 #include "nautilus-preferences-group.h"
-#include "nautilus-gtk-extensions.h"
+#include <eel/eel-gtk-extensions.h>
 
 #include <gnome.h>
 #include <gtk/gtkradiobutton.h>
 #include <gtk/gtksignal.h>
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 /* Signals */
 typedef enum
@@ -69,7 +69,7 @@ static void preferences_group_construct                 (NautilusPreferencesGrou
 							 const gchar                   *title);
 static void preferences_group_align_captions            (NautilusPreferencesGroup      *group);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesGroup,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesGroup,
 				   nautilus_preferences_group,
 				   GTK_TYPE_FRAME);
 
diff --git a/libnautilus-private/nautilus-preferences-item.c b/libnautilus-private/nautilus-preferences-item.c
index acfa2784a..725da2853 100644
--- a/libnautilus-private/nautilus-preferences-item.c
+++ b/libnautilus-private/nautilus-preferences-item.c
@@ -25,18 +25,18 @@
 #include <config.h>
 #include "nautilus-preferences-item.h"
 
-#include "nautilus-enumeration.h"
+#include <eel/eel-enumeration.h>
 #include "nautilus-file-utilities.h"
-#include "nautilus-font-picker.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-font-picker.h>
+#include <eel/eel-glib-extensions.h>
 #include "nautilus-global-preferences.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include "nautilus-preferences.h"
-#include "nautilus-radio-button-group.h"
-#include "nautilus-string-picker.h"
-#include "nautilus-string.h"
-#include "nautilus-text-caption.h"
+#include <eel/eel-radio-button-group.h>
+#include <eel/eel-string-picker.h>
+#include <eel/eel-string.h>
+#include <eel/eel-text-caption.h>
 
 #include <libgnomevfs/gnome-vfs.h>
 
@@ -64,7 +64,7 @@ struct _NautilusPreferencesItemDetails
 	guint change_signal_ID;
 	char *control_preference_name;
 	NautilusPreferencesItemControlAction control_action;
-	NautilusEnumeration *constrained_integer_values;
+	EelEnumeration *constrained_integer_values;
 };
 
 /* GtkObjectClass methods */
@@ -104,12 +104,12 @@ static void editable_string_changed_callback                          (GtkWidget
 								       gpointer                      user_data);
 static void editable_integer_changed_callback                         (GtkWidget                    *caption,
 								       gpointer                      user_data);
-static void constrained_integer_changed_callback                      (NautilusStringPicker         *string_picker,
+static void constrained_integer_changed_callback                      (EelStringPicker         *string_picker,
 								       NautilusPreferencesItem      *item);
 static void font_item_changed_callback                                (GtkWidget                    *caption,
 								       gpointer                      user_data);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesItem, nautilus_preferences_item, GTK_TYPE_VBOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesItem, nautilus_preferences_item, GTK_TYPE_VBOX)
 
 /* NautilusPreferencesItemClass methods */
 static void
@@ -146,11 +146,11 @@ preferences_item_destroy (GtkObject *object)
 
 	g_free (item->details->preference_name);
 	g_free (item->details->control_preference_name);
-	nautilus_enumeration_free (item->details->constrained_integer_values);
+	eel_enumeration_free (item->details->constrained_integer_values);
 	g_free (item->details);
 	
 	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /*
@@ -163,7 +163,7 @@ preferences_item_construct (NautilusPreferencesItem *item,
 {
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
 
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 	g_assert (item_type != PREFERENCES_ITEM_UNDEFINED_ITEM);
 
 	g_assert (item->details->child == NULL);
@@ -238,7 +238,7 @@ preferences_item_update_enum (NautilusPreferencesItem *item)
 
 	for (i = 0; i < nautilus_preferences_enumeration_get_num_entries (preference_name); i++) {
 		if (value == nautilus_preferences_enumeration_get_nth_value (preference_name, i)) {
-			nautilus_radio_button_group_set_active_index (NAUTILUS_RADIO_BUTTON_GROUP (item->details->child), i);
+			eel_radio_button_group_set_active_index (EEL_RADIO_BUTTON_GROUP (item->details->child), i);
 		}
 	}
 }
@@ -261,11 +261,11 @@ preferences_item_create_enum (NautilusPreferencesItem *item,
 	guint	i;
 
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	g_assert (item->details->preference_name != NULL);
 
-	item->details->child = nautilus_radio_button_group_new (FALSE);
+	item->details->child = eel_radio_button_group_new (FALSE);
 		
 	for (i = 0; i < nautilus_preferences_enumeration_get_num_entries (preference_name); i++) {
 		char *description;
@@ -274,7 +274,7 @@ preferences_item_create_enum (NautilusPreferencesItem *item,
 		
 		g_assert (description != NULL);
 		
-		nautilus_radio_button_group_insert (NAUTILUS_RADIO_BUTTON_GROUP (item->details->child),
+		eel_radio_button_group_insert (EEL_RADIO_BUTTON_GROUP (item->details->child),
 						    description);
 		
 		g_free (description);
@@ -307,7 +307,7 @@ preferences_item_update_short_enum (NautilusPreferencesItem *item)
 
 	for (i = 0; i < nautilus_preferences_enumeration_get_num_entries (preference_name); i++) {
 		if (value == nautilus_preferences_enumeration_get_nth_value (preference_name, i)) {
-			nautilus_radio_button_group_set_active_index (NAUTILUS_RADIO_BUTTON_GROUP (item->details->child), i);
+			eel_radio_button_group_set_active_index (EEL_RADIO_BUTTON_GROUP (item->details->child), i);
 		}
 	}
 }
@@ -323,11 +323,11 @@ preferences_item_create_short_enum (NautilusPreferencesItem *item,
 	guint	i;
 
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	g_assert (item->details->preference_name != NULL);
 
-	item->details->child = nautilus_radio_button_group_new (TRUE);
+	item->details->child = eel_radio_button_group_new (TRUE);
 		
 	for (i = 0; i < nautilus_preferences_enumeration_get_num_entries (preference_name); i++) {
 		char *description;
@@ -336,7 +336,7 @@ preferences_item_create_short_enum (NautilusPreferencesItem *item,
 
 		g_assert (description != NULL);
 
-		nautilus_radio_button_group_insert (NAUTILUS_RADIO_BUTTON_GROUP (item->details->child),
+		eel_radio_button_group_insert (EEL_RADIO_BUTTON_GROUP (item->details->child),
 						    description);
 
 		g_free (description);
@@ -373,7 +373,7 @@ preferences_item_create_boolean (NautilusPreferencesItem *item,
 	char *description;
 
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	g_assert (item->details->preference_name != NULL);
 	description = nautilus_preferences_get_description (preference_name);
@@ -408,7 +408,7 @@ preferences_item_update_editable_string (NautilusPreferencesItem *item)
 	current_value = nautilus_preferences_get (item->details->preference_name);
 
 	g_assert (current_value != NULL);
-	nautilus_text_caption_set_text (NAUTILUS_TEXT_CAPTION (item->details->child), current_value);
+	eel_text_caption_set_text (EEL_TEXT_CAPTION (item->details->child), current_value);
 	g_free (current_value);
 }
 
@@ -419,21 +419,21 @@ preferences_item_create_editable_string (NautilusPreferencesItem *item,
 	char	*description;
 	
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	description = nautilus_preferences_get_description (preference_name);
 	g_assert (description != NULL);
 	
-	item->details->child = nautilus_text_caption_new ();
+	item->details->child = eel_text_caption_new ();
 
 	/* FIXME This is a special case for the home uri preference,
 	   in the future this should be generalized. */
 	if (g_strcasecmp (preference_name, NAUTILUS_PREFERENCES_HOME_URI) == 0)
 	{
-		nautilus_text_caption_set_expand_tilde (NAUTILUS_TEXT_CAPTION (item->details->child), TRUE);
+		eel_text_caption_set_expand_tilde (EEL_TEXT_CAPTION (item->details->child), TRUE);
 	}
 
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (item->details->child), description);
+	eel_caption_set_title_label (EEL_CAPTION (item->details->child), description);
 
 	g_free (description);
 	
@@ -460,7 +460,7 @@ preferences_item_update_editable_integer (NautilusPreferencesItem *item)
 	current_value = g_strdup_printf ("%d", nautilus_preferences_get_integer (item->details->preference_name));
 
 	g_assert (current_value != NULL);
-	nautilus_text_caption_set_text (NAUTILUS_TEXT_CAPTION (item->details->child), current_value);
+	eel_text_caption_set_text (EEL_TEXT_CAPTION (item->details->child), current_value);
 	g_free (current_value);
 }
 
@@ -471,15 +471,15 @@ preferences_item_create_editable_integer (NautilusPreferencesItem *item,
 	char *description;
 	
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	description = nautilus_preferences_get_description (preference_name);
 	
 	g_assert (description != NULL);
 	
-	item->details->child = nautilus_text_caption_new ();
+	item->details->child = eel_text_caption_new ();
 
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (item->details->child), description);
+	eel_caption_set_title_label (EEL_CAPTION (item->details->child), description);
 
 	g_free (description);
 
@@ -512,15 +512,15 @@ preferences_item_update_constrained_integer (NautilusPreferencesItem *item)
 
 	current_value = nautilus_preferences_get_integer (item->details->preference_name);
 	
-	position = nautilus_enumeration_get_value_position (item->details->constrained_integer_values,
+	position = eel_enumeration_get_value_position (item->details->constrained_integer_values,
 							    current_value);
-	g_return_if_fail (position != NAUTILUS_STRING_LIST_NOT_FOUND);
+	g_return_if_fail (position != EEL_STRING_LIST_NOT_FOUND);
 
-	current_label = nautilus_enumeration_get_nth_entry (item->details->constrained_integer_values,
+	current_label = eel_enumeration_get_nth_entry (item->details->constrained_integer_values,
 							    position);
 
-	if (nautilus_string_picker_contains (NAUTILUS_STRING_PICKER (item->details->child), current_label)) {
-		nautilus_string_picker_set_selected_string (NAUTILUS_STRING_PICKER (item->details->child),
+	if (eel_string_picker_contains (EEL_STRING_PICKER (item->details->child), current_label)) {
+		eel_string_picker_set_selected_string (EEL_STRING_PICKER (item->details->child),
 							    current_label);
 	} else {
 		g_warning ("Value string for %s is %s, which isn't in the expected set of values",
@@ -538,13 +538,13 @@ preferences_item_create_constrained_integer (NautilusPreferencesItem *item,
 	char *description;
 	
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	description = nautilus_preferences_get_description (preference_name);
 	g_return_if_fail (description != NULL);
 	
-	item->details->child = nautilus_string_picker_new ();
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (item->details->child), description);
+	item->details->child = eel_string_picker_new ();
+	eel_caption_set_title_label (EEL_CAPTION (item->details->child), description);
 	g_free (description);
 
 	item->details->change_signal_ID = gtk_signal_connect (GTK_OBJECT (item->details->child),
@@ -574,8 +574,8 @@ preferences_item_update_font (NautilusPreferencesItem *item)
 	 * it is one of the choice before trying to select it, otherwise we would get
 	 * assertions.
 	 */
-	if (nautilus_string_picker_contains (NAUTILUS_STRING_PICKER (item->details->child), current_value)) {
-		nautilus_string_picker_set_selected_string (NAUTILUS_STRING_PICKER (item->details->child),
+	if (eel_string_picker_contains (EEL_STRING_PICKER (item->details->child), current_value)) {
+		eel_string_picker_set_selected_string (EEL_STRING_PICKER (item->details->child),
 							    current_value);
 	}
 
@@ -587,21 +587,21 @@ preferences_item_create_font (NautilusPreferencesItem *item,
 			      const char *preference_name)
 {
 	char *description;
-	NautilusStringList *font_list;
+	EelStringList *font_list;
 
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	description = nautilus_preferences_get_description (preference_name);
 	g_return_if_fail (description != NULL);
 	
-	item->details->child = nautilus_string_picker_new ();
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (item->details->child), description);
+	item->details->child = eel_string_picker_new ();
+	eel_caption_set_title_label (EEL_CAPTION (item->details->child), description);
 	
 	g_free (description);
 
 	/* FIXME bugzilla.eazel.com 1274: Need to query system for available fonts */
-	font_list = nautilus_string_list_new (TRUE);
+	font_list = eel_string_list_new (TRUE);
 
 	/* Once upon a time we had a bug in Nautilus that caused crashes with the "fixed" 
 	 * font.  That bug (2256) was fixed by removing the "fixed" choice from this menu
@@ -617,15 +617,15 @@ preferences_item_create_font (NautilusPreferencesItem *item,
 	/* FIXME bugzilla.eazel.com 7907: 
 	 * The "GTK System Font" string is hard coded in many places.
 	 */
-	nautilus_string_list_insert (font_list, "GTK System Font");
-	nautilus_string_list_insert (font_list, "fixed");
-	nautilus_string_list_insert (font_list, "helvetica");
-	nautilus_string_list_insert (font_list, "times");
-	nautilus_string_list_insert (font_list, "courier");
-	nautilus_string_list_insert (font_list, "lucida");
+	eel_string_list_insert (font_list, "GTK System Font");
+	eel_string_list_insert (font_list, "fixed");
+	eel_string_list_insert (font_list, "helvetica");
+	eel_string_list_insert (font_list, "times");
+	eel_string_list_insert (font_list, "courier");
+	eel_string_list_insert (font_list, "lucida");
 
-	nautilus_string_picker_set_string_list (NAUTILUS_STRING_PICKER (item->details->child), font_list);
-	nautilus_string_list_free (font_list);
+	eel_string_picker_set_string_list (EEL_STRING_PICKER (item->details->child), font_list);
+	eel_string_list_free (font_list);
 
 	item->details->change_signal_ID = gtk_signal_connect (GTK_OBJECT (item->details->child),
 							      "changed",
@@ -649,23 +649,23 @@ preferences_item_update_smooth_font (NautilusPreferencesItem *item)
  	current_value = nautilus_preferences_get (item->details->preference_name);
  	g_assert (current_value != NULL);
 
- 	nautilus_font_picker_set_selected_font (NAUTILUS_FONT_PICKER (item->details->child),
+ 	eel_font_picker_set_selected_font (EEL_FONT_PICKER (item->details->child),
 						current_value);
  	g_free (current_value);
 }
 
 static void
-preferences_smooth_font_changed_callback (NautilusFontPicker *font_picker,
+preferences_smooth_font_changed_callback (EelFontPicker *font_picker,
 					  gpointer callback_data)
 {
 	NautilusPreferencesItem *item;
  	char *new_value;
 
-	g_return_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker));
+	g_return_if_fail (EEL_IS_FONT_PICKER (font_picker));
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (callback_data));
 
 	item = NAUTILUS_PREFERENCES_ITEM (callback_data);
- 	new_value = nautilus_font_picker_get_selected_font (NAUTILUS_FONT_PICKER (item->details->child));
+ 	new_value = eel_font_picker_get_selected_font (EEL_FONT_PICKER (item->details->child));
  	g_assert (new_value != NULL);
 	nautilus_preferences_set (item->details->preference_name, new_value);
  	g_free (new_value);
@@ -678,13 +678,13 @@ preferences_item_create_smooth_font (NautilusPreferencesItem *item,
 	char *description = NULL;
 
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	description = nautilus_preferences_get_description (preference_name);
 	g_return_if_fail (description != NULL);
 	
-	item->details->child = nautilus_font_picker_new ();
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (item->details->child),
+	item->details->child = eel_font_picker_new ();
+	eel_caption_set_title_label (EEL_CAPTION (item->details->child),
 					  description);
 	
 	g_free (description);
@@ -732,7 +732,7 @@ enum_radio_group_changed_callback (GtkWidget *buttons, GtkWidget * button, gpoin
 
 	g_assert (item->details->preference_name != NULL);
 
-	i = nautilus_radio_button_group_get_active_index (NAUTILUS_RADIO_BUTTON_GROUP (buttons));
+	i = eel_radio_button_group_get_active_index (EEL_RADIO_BUTTON_GROUP (buttons));
 	
 	nautilus_preferences_set_integer (item->details->preference_name,
 					  nautilus_preferences_enumeration_get_nth_value (item->details->preference_name, i));
@@ -760,14 +760,14 @@ font_item_changed_callback (GtkWidget *string_picker, gpointer user_data)
 	NautilusPreferencesItem *item;
 	char *selected_string;
 
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
+	g_return_if_fail (EEL_IS_STRING_PICKER (string_picker));
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (user_data));
 
 	item = NAUTILUS_PREFERENCES_ITEM (user_data);
 
 	g_return_if_fail (item->details->preference_name != NULL);
 
-	selected_string = nautilus_string_picker_get_selected_string (NAUTILUS_STRING_PICKER (string_picker));
+	selected_string = eel_string_picker_get_selected_string (EEL_STRING_PICKER (string_picker));
 	g_return_if_fail (selected_string != NULL);
 
 	nautilus_preferences_set (item->details->preference_name, selected_string);
@@ -786,7 +786,7 @@ editable_string_changed_callback (GtkWidget *button, gpointer user_data)
 	item = NAUTILUS_PREFERENCES_ITEM (user_data);
 
 	g_assert (item->details->child != NULL);
-	g_assert (NAUTILUS_IS_TEXT_CAPTION (item->details->child));
+	g_assert (EEL_IS_TEXT_CAPTION (item->details->child));
 
 	preferences_item_update_text_settings_at_idle (item);
 }
@@ -802,33 +802,33 @@ editable_integer_changed_callback (GtkWidget *button, gpointer user_data)
 	item = NAUTILUS_PREFERENCES_ITEM (user_data);
 
 	g_assert (item->details->child != NULL);
-	g_assert (NAUTILUS_IS_TEXT_CAPTION (item->details->child));
+	g_assert (EEL_IS_TEXT_CAPTION (item->details->child));
 
 	preferences_item_update_editable_integer_settings_at_idle (item);
 }
 
 static void
-constrained_integer_changed_callback (NautilusStringPicker *string_picker,
+constrained_integer_changed_callback (EelStringPicker *string_picker,
 				      NautilusPreferencesItem *item)
 {
  	char *selected_label;
 	int position;
 	int new_value;
 
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
+	g_return_if_fail (EEL_IS_STRING_PICKER (string_picker));
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
 	g_return_if_fail (item->details->constrained_integer_values != NULL);
-	g_return_if_fail (nautilus_enumeration_get_num_entries (item->details->constrained_integer_values) > 0);
+	g_return_if_fail (eel_enumeration_get_num_entries (item->details->constrained_integer_values) > 0);
 	
- 	selected_label = nautilus_string_picker_get_selected_string (string_picker);
+ 	selected_label = eel_string_picker_get_selected_string (string_picker);
 	g_return_if_fail (selected_label != NULL);
 
-	position = nautilus_enumeration_get_entry_position (item->details->constrained_integer_values,
+	position = eel_enumeration_get_entry_position (item->details->constrained_integer_values,
 							    selected_label);
 	g_free (selected_label);
-	g_return_if_fail (position != NAUTILUS_STRING_LIST_NOT_FOUND);
+	g_return_if_fail (position != EEL_STRING_LIST_NOT_FOUND);
 
-	new_value = nautilus_enumeration_get_nth_value (item->details->constrained_integer_values,
+	new_value = eel_enumeration_get_nth_value (item->details->constrained_integer_values,
 							position);
 	
 	nautilus_preferences_set_integer (item->details->preference_name, new_value);
@@ -906,7 +906,7 @@ update_text_settings_at_idle (NautilusPreferencesItem *preferences_item)
 {
 	char *text;
 
-	text = nautilus_text_caption_get_text (NAUTILUS_TEXT_CAPTION (preferences_item->details->child));
+	text = eel_text_caption_get_text (EEL_TEXT_CAPTION (preferences_item->details->child));
 
 	if (text != NULL) {
 		nautilus_preferences_set (preferences_item->details->preference_name, text);
@@ -935,10 +935,10 @@ update_integer_settings_at_idle (NautilusPreferencesItem *preferences_item)
 	int value = 0;
 	char *text;
 
-	text = nautilus_text_caption_get_text (NAUTILUS_TEXT_CAPTION (preferences_item->details->child));
+	text = eel_text_caption_get_text (EEL_TEXT_CAPTION (preferences_item->details->child));
 
 	if (text != NULL) {
-		nautilus_eat_str_to_int (text, &value);
+		eel_eat_str_to_int (text, &value);
 	}
 	
 	nautilus_preferences_set_integer (preferences_item->details->preference_name, value);
@@ -965,7 +965,7 @@ nautilus_preferences_item_set_control_preference (NautilusPreferencesItem *prefe
 {
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (preferences_item));
 
-	if (nautilus_str_is_equal (preferences_item->details->control_preference_name,
+	if (eel_str_is_equal (preferences_item->details->control_preference_name,
 				   control_preference_name)) {
 		return;
 	}
@@ -1025,32 +1025,32 @@ nautilus_preferences_item_set_constrained_integer_values (NautilusPreferencesIte
 							  const char *values,
 							  const char *labels)
 {
-	NautilusStringList *entry_list;
+	EelStringList *entry_list;
 
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
 	g_return_if_fail (item->details->item_type == NAUTILUS_PREFERENCE_ITEM_CONSTRAINED_INTEGER);
-	g_return_if_fail (nautilus_strlen (labels) > 0);
-	g_return_if_fail (nautilus_strlen (values) > 0);
-	g_return_if_fail (nautilus_str_count_characters (labels, ',')
-			  == nautilus_str_count_characters (values, ','));
+	g_return_if_fail (eel_strlen (labels) > 0);
+	g_return_if_fail (eel_strlen (values) > 0);
+	g_return_if_fail (eel_str_count_characters (labels, ',')
+			  == eel_str_count_characters (values, ','));
 
-	nautilus_enumeration_free (item->details->constrained_integer_values);
+	eel_enumeration_free (item->details->constrained_integer_values);
 	
-	item->details->constrained_integer_values = nautilus_enumeration_new_from_tokens (labels,
+	item->details->constrained_integer_values = eel_enumeration_new_from_tokens (labels,
 											  NULL,
 											  values,
 											  ",");
 
- 	g_return_if_fail (nautilus_enumeration_get_num_entries (item->details->constrained_integer_values) > 0);
+ 	g_return_if_fail (eel_enumeration_get_num_entries (item->details->constrained_integer_values) > 0);
 
-	entry_list = nautilus_enumeration_get_entries (item->details->constrained_integer_values);
+	entry_list = eel_enumeration_get_entries (item->details->constrained_integer_values);
 
  	g_return_if_fail (entry_list != NULL);
 
-	nautilus_string_picker_set_string_list (NAUTILUS_STRING_PICKER (item->details->child),
+	eel_string_picker_set_string_list (EEL_STRING_PICKER (item->details->child),
 						entry_list);
 
-	nautilus_string_list_free (entry_list);
+	eel_string_list_free (entry_list);
 
 	preferences_item_update_displayed_value (item);
 }
@@ -1060,7 +1060,7 @@ nautilus_preferences_item_child_is_caption (const NautilusPreferencesItem *item)
 {
 	g_return_val_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item), FALSE);
 
-	return NAUTILUS_IS_CAPTION (item->details->child);
+	return EEL_IS_CAPTION (item->details->child);
 }
 
 int
@@ -1072,7 +1072,7 @@ nautilus_preferences_item_get_caption_title_label_width (const NautilusPreferenc
 		return 0;
 	}
 
-	return nautilus_caption_get_title_label_width (NAUTILUS_CAPTION (item->details->child));
+	return eel_caption_get_title_label_width (EEL_CAPTION (item->details->child));
 }
 
 void
@@ -1086,7 +1086,7 @@ nautilus_preferences_item_set_caption_extra_spacing (NautilusPreferencesItem *it
 		return;
 	}
 
-	nautilus_caption_set_extra_spacing (NAUTILUS_CAPTION (item->details->child), 
+	eel_caption_set_extra_spacing (EEL_CAPTION (item->details->child), 
 					    extra_spacing);
 }
 
@@ -1101,5 +1101,5 @@ nautilus_preferences_item_update_showing (NautilusPreferencesItem *item)
 		shown = nautilus_preferences_item_get_control_showing (item);
 	}
 
-	nautilus_gtk_widget_set_shown (GTK_WIDGET (item), shown);
+	eel_gtk_widget_set_shown (GTK_WIDGET (item), shown);
 }
diff --git a/libnautilus-private/nautilus-preferences-pane.c b/libnautilus-private/nautilus-preferences-pane.c
index 676c75369..1b28a8b00 100644
--- a/libnautilus-private/nautilus-preferences-pane.c
+++ b/libnautilus-private/nautilus-preferences-pane.c
@@ -25,10 +25,10 @@
 
 #include <config.h>
 #include "nautilus-preferences-pane.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-string.h"
-#include "nautilus-string-list.h"
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-string.h>
+#include <eel/eel-string-list.h>
 
 #include <gtk/gtkhbox.h>
 
@@ -39,7 +39,7 @@ struct _NautilusPreferencesPaneDetails
 {
 	GtkWidget *groups_box;
 	GList *groups;
-	NautilusStringList *control_preference_list;
+	EelStringList *control_preference_list;
 };
 
 /* NautilusPreferencesPaneClass methods */
@@ -49,7 +49,7 @@ static void nautilus_preferences_pane_initialize       (NautilusPreferencesPane
 /* GtkObjectClass methods */
 static void nautilus_preferences_pane_destroy          (GtkObject                    *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesPane, nautilus_preferences_pane, GTK_TYPE_VBOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesPane, nautilus_preferences_pane, GTK_TYPE_VBOX)
 
 /*
  * NautilusPreferencesPaneClass methods
@@ -84,11 +84,11 @@ nautilus_preferences_pane_destroy (GtkObject* object)
 	preferences_pane = NAUTILUS_PREFERENCES_PANE (object);
 
 	g_list_free (preferences_pane->details->groups);
-	nautilus_string_list_free (preferences_pane->details->control_preference_list);
+	eel_string_list_free (preferences_pane->details->control_preference_list);
 	g_free (preferences_pane->details);
 
 	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /*
@@ -187,7 +187,7 @@ nautilus_preferences_pane_update (NautilusPreferencesPane *preferences_pane)
 	for (iterator = preferences_pane->details->groups; iterator != NULL; iterator = iterator->next) {
 		NautilusPreferencesGroup *group = NAUTILUS_PREFERENCES_GROUP (iterator->data);
 		nautilus_preferences_group_update (group);
-		nautilus_gtk_widget_set_shown (GTK_WIDGET (group),
+		eel_gtk_widget_set_shown (GTK_WIDGET (group),
 					       nautilus_preferences_group_get_num_visible_items (group) > 0);
 	}
 }
@@ -232,7 +232,7 @@ nautilus_preferences_pane_find_group (const NautilusPreferencesPane *pane,
 		g_assert (NAUTILUS_IS_PREFERENCES_GROUP (node->data));
 
 		title = nautilus_preferences_group_get_title_label (NAUTILUS_PREFERENCES_GROUP (node->data));
-		if (nautilus_str_is_equal (title, group_title)) {
+		if (eel_str_is_equal (title, group_title)) {
 			g_free (title);
 			return node->data;
 		}
@@ -260,16 +260,16 @@ nautilus_preferences_pane_add_control_preference (NautilusPreferencesPane *pane,
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_PANE (pane));
 	g_return_if_fail (control_preference_name != NULL);
 
-	if (nautilus_string_list_contains (pane->details->control_preference_list,
+	if (eel_string_list_contains (pane->details->control_preference_list,
 					   control_preference_name)) {
 		return;
 	}
 
 	if (pane->details->control_preference_list == NULL) {
-		pane->details->control_preference_list = nautilus_string_list_new (TRUE);
+		pane->details->control_preference_list = eel_string_list_new (TRUE);
 	}
 
-	nautilus_string_list_insert (pane->details->control_preference_list,
+	eel_string_list_insert (pane->details->control_preference_list,
 				     control_preference_name);
 
  	nautilus_preferences_add_callback_while_alive (control_preference_name,
diff --git a/libnautilus-private/nautilus-preferences.c b/libnautilus-private/nautilus-preferences.c
index 5957ed4c3..adc2a65d5 100644
--- a/libnautilus-private/nautilus-preferences.c
+++ b/libnautilus-private/nautilus-preferences.c
@@ -26,19 +26,20 @@
 #include "nautilus-preferences.h"
 
 #include "nautilus-gconf-extensions.h"
-#include "nautilus-string-list.h"
-#include "nautilus-string.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-enumeration.h"
 #include "nautilus-lib-self-check-functions.h"
 
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
+#include <eel/eel-enumeration.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-string-list.h>
+#include <eel/eel-string.h>
 
+#include <gconf/gconf-client.h>
+#include <gconf/gconf.h>
 #include <gtk/gtksignal.h>
 
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
+
 #include <libgnomeui/gnome-dialog.h>
 #include <libgnomeui/gnome-dialog-util.h>
 
@@ -69,7 +70,7 @@ typedef struct {
 	GList *callback_list;
 	GList *auto_storage_list;
 	int gconf_connection_id;
-	NautilusEnumeration *enumeration;
+	EelEnumeration *enumeration;
 	GConfValue *cached_value;
 } PreferencesEntry;
 
@@ -186,7 +187,7 @@ preferences_preference_is_internal (const char *name)
 {
 	g_return_val_if_fail (name != NULL, FALSE);
 	
-	if (nautilus_str_has_prefix (name, "/")) {
+	if (eel_str_has_prefix (name, "/")) {
 		return FALSE;
 	}
 	
@@ -203,8 +204,8 @@ preferences_preference_is_user_level (const char *name)
 
 	user_level_key = preferences_get_user_level_key ();
 
-	result = nautilus_str_is_equal (name, user_level_key)
-		|| nautilus_str_is_equal (name, "user_level");
+	result = eel_str_is_equal (name, user_level_key)
+		|| eel_str_is_equal (name, "user_level");
 
 	g_free (user_level_key);
 
@@ -591,11 +592,11 @@ nautilus_preferences_get_user_level (void)
 	user_level = nautilus_gconf_get_string (key);
 	g_free (key);
 
-	if (nautilus_str_is_equal (user_level, "advanced")) {
+	if (eel_str_is_equal (user_level, "advanced")) {
 		result = NAUTILUS_USER_LEVEL_ADVANCED;
-	} else if (nautilus_str_is_equal (user_level, "intermediate")) {
+	} else if (eel_str_is_equal (user_level, "intermediate")) {
 		result = NAUTILUS_USER_LEVEL_INTERMEDIATE;
-	} else if (nautilus_str_is_equal (user_level, "novice")) {
+	} else if (eel_str_is_equal (user_level, "novice")) {
 		result = NAUTILUS_USER_LEVEL_NOVICE;
 	} else {
 		result = DEFAULT_USER_LEVEL;
@@ -923,7 +924,7 @@ preferences_user_level_changed_notice (GConfClient *client,
 {
 	g_return_if_fail (gconf_entry != NULL);
 	g_return_if_fail (gconf_entry->key != NULL);
-	g_return_if_fail (nautilus_str_has_suffix (gconf_entry->key, "user_level"));
+	g_return_if_fail (eel_str_has_suffix (gconf_entry->key, "user_level"));
 	
 	g_hash_table_foreach (preferences_global_table_get_global (),
 			      preferences_global_table_check_changes_function,
@@ -1203,7 +1204,7 @@ preferences_entry_free (PreferencesEntry *entry)
 	}
 
 	g_list_free (entry->auto_storage_list);
-	nautilus_g_list_free_deep_custom (entry->callback_list,
+	eel_g_list_free_deep_custom (entry->callback_list,
 					  preferences_callback_entry_free_func,
 					  NULL);
 	
@@ -1214,7 +1215,7 @@ preferences_entry_free (PreferencesEntry *entry)
 	g_free (entry->description);
 
 	nautilus_gconf_value_free (entry->cached_value);
-	nautilus_enumeration_free (entry->enumeration);
+	eel_enumeration_free (entry->enumeration);
 
 	g_free (entry);
 }
@@ -1533,10 +1534,10 @@ nautilus_preferences_enumeration_insert (const char *name,
 	g_assert (preferences_entry != NULL);
 
 	if (preferences_entry->enumeration == NULL) {
-		preferences_entry->enumeration = nautilus_enumeration_new ();
+		preferences_entry->enumeration = eel_enumeration_new ();
 	}
 
-	nautilus_enumeration_insert (preferences_entry->enumeration, entry, description, value);
+	eel_enumeration_insert (preferences_entry->enumeration, entry, description, value);
 }
 
 char *
@@ -1550,7 +1551,7 @@ nautilus_preferences_enumeration_get_nth_entry (const char *name,
 	preferences_entry = preferences_global_table_lookup_or_insert (name);
 	g_assert (preferences_entry != NULL);
 
-	return nautilus_enumeration_get_nth_entry (preferences_entry->enumeration, n);
+	return eel_enumeration_get_nth_entry (preferences_entry->enumeration, n);
 }
 
 char *
@@ -1564,7 +1565,7 @@ nautilus_preferences_enumeration_get_nth_description (const char *name,
 	preferences_entry = preferences_global_table_lookup_or_insert (name);
 	g_assert (preferences_entry != NULL);
 
-	return nautilus_enumeration_get_nth_description (preferences_entry->enumeration, n);
+	return eel_enumeration_get_nth_description (preferences_entry->enumeration, n);
 }
 
 int
@@ -1578,7 +1579,7 @@ nautilus_preferences_enumeration_get_nth_value (const char *name,
 	preferences_entry = preferences_global_table_lookup_or_insert (name);
 	g_assert (preferences_entry != NULL);
 
-	return nautilus_enumeration_get_nth_value (preferences_entry->enumeration, n);
+	return eel_enumeration_get_nth_value (preferences_entry->enumeration, n);
 }
 
 guint
@@ -1591,7 +1592,7 @@ nautilus_preferences_enumeration_get_num_entries (const char *name)
 	preferences_entry = preferences_global_table_lookup_or_insert (name);
 	g_assert (preferences_entry != NULL);
 
-	return nautilus_enumeration_get_num_entries (preferences_entry->enumeration);
+	return eel_enumeration_get_num_entries (preferences_entry->enumeration);
 }
 
 void
diff --git a/libnautilus-private/nautilus-preferences.h b/libnautilus-private/nautilus-preferences.h
index 7f6554d8c..e7cfe0094 100644
--- a/libnautilus-private/nautilus-preferences.h
+++ b/libnautilus-private/nautilus-preferences.h
@@ -27,7 +27,7 @@
 
 #include <gtk/gtkobject.h>
 #include <libgnome/gnome-defs.h>
-#include <libnautilus-extensions/nautilus-string-list.h>
+#include <eel/eel-string-list.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/libnautilus-private/nautilus-program-chooser.c b/libnautilus-private/nautilus-program-chooser.c
index 35e69efe0..fd317e998 100644
--- a/libnautilus-private/nautilus-program-chooser.c
+++ b/libnautilus-private/nautilus-program-chooser.c
@@ -26,12 +26,12 @@
 #include <config.h>
 #include "nautilus-program-chooser.h"
 
-#include "nautilus-gnome-extensions.h"
-#include "nautilus-gtk-extensions.h"
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 #include "nautilus-mime-actions.h"
 #include "nautilus-program-choosing.h"
-#include "nautilus-stock-dialogs.h"
-#include "nautilus-string.h"
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include "nautilus-view-identifier.h"
 #include <gtk/gtkclist.h>
 #include <gtk/gtkframe.h>
@@ -260,7 +260,7 @@ get_file_name_for_display (NautilusFile *file)
 	g_assert (NAUTILUS_IS_FILE (file));
 
 	full_name = nautilus_file_get_name (file);
-	truncated_name = nautilus_str_middle_truncate
+	truncated_name = eel_str_middle_truncate
 		(full_name, MAX_DISPLAYED_FILE_NAME_LENGTH);
 	g_free (full_name);
 
@@ -418,9 +418,9 @@ nautilus_program_chooser_set_is_cancellable (GnomeDialog *chooser, gboolean canc
 {
 	GtkButton *done_button, *cancel_button;
 
-	cancel_button = nautilus_gnome_dialog_get_button_by_index 
+	cancel_button = eel_gnome_dialog_get_button_by_index 
 		(chooser, GNOME_CANCEL);
-	done_button = nautilus_gnome_dialog_get_button_by_index 
+	done_button = eel_gnome_dialog_get_button_by_index 
 		(chooser, GNOME_CANCEL+1);
 
 	if (cancellable) {
@@ -702,7 +702,7 @@ get_selected_program_file_pair (GnomeDialog *dialog)
 	int selected_row;
 
 	clist = nautilus_program_chooser_get_clist (dialog);
-	selected_row = nautilus_gtk_clist_get_first_selected_row (clist);
+	selected_row = eel_gtk_clist_get_first_selected_row (clist);
 	
 	if (selected_row < 0) {
 		return NULL;
@@ -926,7 +926,7 @@ launch_mime_capplet (GtkWidget *button, gpointer callback_data)
 	
 	command = g_strdup_printf ("%s %s", FILE_TYPES_CAPPLET_NAME, (char *)callback_data);
 		
-	nautilus_launch_application_from_command (command, NULL, FALSE);
+	eel_launch_application_from_command (command, NULL, FALSE);
 	
 	g_free (command);
 }
@@ -1308,9 +1308,9 @@ nautilus_program_chooser_new (GnomeVFSMimeActionType action_type,
 	clist = create_program_clist ();
 
 	gtk_container_add (GTK_CONTAINER (list_scroller), clist);	  
-	nautilus_gtk_clist_set_double_click_button 
+	eel_gtk_clist_set_double_click_button 
 		(GTK_CLIST (clist), 
-		 nautilus_gnome_dialog_get_button_by_index 
+		 eel_gnome_dialog_get_button_by_index 
 			(GNOME_DIALOG (window), GNOME_OK));
 	gtk_object_set_data (GTK_OBJECT (window), "list", clist);
 
@@ -1336,7 +1336,7 @@ nautilus_program_chooser_new (GnomeVFSMimeActionType action_type,
   	gtk_box_pack_end (GTK_BOX (framed_hbox), change_button_holder, FALSE, FALSE, 0);
 
   	change_button = gtk_button_new_with_label(_("Modify..."));
-	nautilus_gtk_button_set_standard_padding (GTK_BUTTON (change_button));
+	eel_gtk_button_set_standard_padding (GTK_BUTTON (change_button));
   	gtk_widget_show (change_button);
   	gtk_box_pack_end (GTK_BOX (change_button_holder), change_button, TRUE, FALSE, 0);
 
@@ -1359,7 +1359,7 @@ nautilus_program_chooser_new (GnomeVFSMimeActionType action_type,
 	gtk_widget_show (capplet_button_vbox);
 	gtk_box_pack_end (GTK_BOX (capplet_hbox), capplet_button_vbox, FALSE, FALSE, 0);
 	capplet_button = gtk_button_new_with_label (_("Go There"));	 
-	nautilus_gtk_button_set_standard_padding (GTK_BUTTON (capplet_button));
+	eel_gtk_button_set_standard_padding (GTK_BUTTON (capplet_button));
 	gtk_signal_connect (GTK_OBJECT (capplet_button),
 			    "clicked",
 			    launch_mime_capplet_and_close_dialog,
@@ -1500,7 +1500,7 @@ nautilus_program_chooser_show_no_choices_message (GnomeVFSMimeActionType action_
 				    "Programs\" part of the GNOME Control Center. Do "
 				    "you want to go there now?"),
 				  unavailable_message);
-	dialog = nautilus_show_yes_no_dialog 
+	dialog = eel_show_yes_no_dialog 
 		(prompt, dialog_title, GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, parent_window);
 
 	gnome_dialog_button_connect (dialog, GNOME_OK, launch_mime_capplet, nautilus_file_get_mime_type (file));
diff --git a/libnautilus-private/nautilus-program-choosing.c b/libnautilus-private/nautilus-program-choosing.c
index f0f2cd8b1..d47f7a5ab 100644
--- a/libnautilus-private/nautilus-program-choosing.c
+++ b/libnautilus-private/nautilus-program-choosing.c
@@ -26,12 +26,12 @@
 #include <config.h>
 #include "nautilus-program-choosing.h"
 
-#include "nautilus-glib-extensions.h"
-#include "nautilus-gnome-extensions.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gnome-extensions.h>
 #include "nautilus-mime-actions.h"
 #include "nautilus-program-chooser.h"
-#include "nautilus-stock-dialogs.h"
-#include "nautilus-string.h"
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <gtk/gtk.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-uidefs.h>
@@ -250,7 +250,7 @@ nautilus_choose_component_for_file (NautilusFile *file,
 
 	/* Put pending entry into choose hash table. */
 	if (choose_component_hash_table == NULL) {
-		choose_component_hash_table = nautilus_g_hash_table_new_free_at_exit
+		choose_component_hash_table = eel_g_hash_table_new_free_at_exit
 			(choose_component_hash,
 			 choose_component_equal,
 			 "choose component");
@@ -390,7 +390,7 @@ nautilus_choose_application_for_file (NautilusFile *file,
 
 	/* Put pending entry into choose hash table. */
 	if (choose_application_hash_table == NULL) {
-		choose_application_hash_table = nautilus_g_hash_table_new_free_at_exit
+		choose_application_hash_table = eel_g_hash_table_new_free_at_exit
 			(choose_application_hash,
 			 choose_application_equal,
 			 "choose application");
@@ -493,7 +493,7 @@ application_cannot_open_location (GnomeVFSMimeApplication *application,
 					     "locations.  Would you like to choose another application?"),
 					   application->name, file_name, 
 					   application->name, uri_scheme);
-		message_dialog = nautilus_show_yes_no_dialog (message, 
+		message_dialog = eel_show_yes_no_dialog (message, 
 							       _("Can't Open Location"), 
 							       GNOME_STOCK_BUTTON_OK, 
 							       GNOME_STOCK_BUTTON_CANCEL,
@@ -515,7 +515,7 @@ application_cannot_open_location (GnomeVFSMimeApplication *application,
 					     "If you copy this file onto your computer, you may be able to open "
 					     "it."), application->name, file_name, 
 					   application->name, uri_scheme);
-		nautilus_show_info_dialog (message, _("Can't Open Location"), parent_window);
+		eel_show_info_dialog (message, _("Can't Open Location"), parent_window);
 	}
 
 	g_free (file_name);
@@ -548,11 +548,11 @@ nautilus_launch_application (GnomeVFSMimeApplication *application,
 	 */
 	if (application->expects_uris == GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_URIS ||
 	    ((application->expects_uris == GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_URIS_FOR_NON_FILES) &&
-	     nautilus_strcasecmp (uri_scheme, "file") != 0)) {
+	     eel_strcasecmp (uri_scheme, "file") != 0)) {
 		/* Check to be sure that the application also supports this particular URI scheme */
 		if (g_list_find_custom (application->supported_uri_schemes,
 					uri_scheme,
-					nautilus_strcmp_compare_func) == NULL) {
+					eel_strcmp_compare_func) == NULL) {
 			application_cannot_open_location (application,
 							  file,
 							  uri_scheme,
@@ -584,7 +584,7 @@ nautilus_launch_application (GnomeVFSMimeApplication *application,
 	}
 	g_free (uri_scheme);
 
-	nautilus_launch_application_from_command (application->command,
+	eel_launch_application_from_command (application->command,
 						  parameter, 
 						  application->requires_terminal);
 
@@ -592,7 +592,7 @@ nautilus_launch_application (GnomeVFSMimeApplication *application,
 }
 
 /**
- * nautilus_launch_application_from_command:
+ * eel_launch_application_from_command:
  * 
  * Fork off a process to launch an application with a given uri as
  * a parameter.
@@ -602,7 +602,7 @@ nautilus_launch_application (GnomeVFSMimeApplication *application,
  * @parameter: Passed as a parameter to the application as is.
  */
 void
-nautilus_launch_application_from_command (const char *command_string, 
+eel_launch_application_from_command (const char *command_string, 
 					  const char *parameter, 
 					  gboolean    use_terminal)
 {
@@ -614,11 +614,11 @@ nautilus_launch_application_from_command (const char *command_string,
 	/* FIXME bugzilla.eazel.com 7830: This needs to support things
 	 * like the "xalf" hack. Perhaps the best way to do that is
 	 * to use gnome_desktop_entry_launch_with_args instead of
-	 * calling system or nautilus_gnome_open_terminal.
+	 * calling system or eel_gnome_open_terminal.
 	 */
 
 	if (parameter != NULL) {
-		quoted_parameter = nautilus_shell_quote (parameter);
+		quoted_parameter = eel_shell_quote (parameter);
 		full_command = g_strconcat (command_string, " ", quoted_parameter, NULL);
 		g_free (quoted_parameter);
 	} else {
@@ -626,9 +626,9 @@ nautilus_launch_application_from_command (const char *command_string,
 	}
 
 	if (use_terminal) {
-		quoted_full_command = nautilus_shell_quote (full_command);
+		quoted_full_command = eel_shell_quote (full_command);
 		final_command = g_strconcat ("/bin/sh -c ", quoted_full_command, NULL);
-		nautilus_gnome_open_terminal (final_command);
+		eel_gnome_open_terminal (final_command);
 		g_free (quoted_full_command);
 	} else {
 		final_command = g_strconcat (full_command, " &", NULL);
diff --git a/libnautilus-private/nautilus-program-choosing.h b/libnautilus-private/nautilus-program-choosing.h
index 8d7c07904..bfbeddd63 100644
--- a/libnautilus-private/nautilus-program-choosing.h
+++ b/libnautilus-private/nautilus-program-choosing.h
@@ -53,7 +53,7 @@ void nautilus_cancel_choose_component_for_file   (NautilusFile
 void nautilus_launch_application                 (GnomeVFSMimeApplication           *application,
 						  NautilusFile                      *file,
 						  GtkWindow                         *parent_window);
-void nautilus_launch_application_from_command    (const char                        *command_string,
+void eel_launch_application_from_command    (const char                        *command_string,
 						  const char                        *parameter,
 						  gboolean                           use_terminal);
 
diff --git a/libnautilus-private/nautilus-radio-button-group.c b/libnautilus-private/nautilus-radio-button-group.c
deleted file mode 100644
index 201a7ad99..000000000
--- a/libnautilus-private/nautilus-radio-button-group.c
+++ /dev/null
@@ -1,430 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-radio-button-group.c - A radio button group container.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-radio-button-group.h"
-#include "nautilus-image.h"
-
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtksignal.h>
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-glib-extensions.h"
-
-static const gint RADIO_BUTTON_GROUP_INVALID = -1;
-
-/* Signals */
-typedef enum
-{
-	CHANGED,
-	LAST_SIGNAL
-} RadioGroupSignals;
-
-struct _NautilusRadioButtonGroupDetails
-{
-	GList		*rows;
-	GSList		*group;
-	guint		num_items;
-	gboolean	horizontal;
-};
-
-typedef struct
-{
-	GtkWidget	*button;
-	GtkWidget	*image;
-	GtkWidget	*description;
-} TableRow;
-
-/* NautilusRadioButtonGroupClass methods */
-static void nautilus_radio_button_group_initialize_class (NautilusRadioButtonGroupClass *klass);
-static void nautilus_radio_button_group_initialize       (NautilusRadioButtonGroup      *button_group);
-
-
-
-
-/* GtkObjectClass methods */
-static void nautilus_radio_button_group_destroy          (GtkObject                     *object);
-
-
-/* Private stuff */
-static void radio_button_group_free_button_group         (NautilusRadioButtonGroup      *button_group);
-static void radio_button_group_emit_changed_signal       (NautilusRadioButtonGroup      *button_group,
-							  GtkWidget                     *button);
-
-/* Radio button callbacks */
-static void button_toggled                               (GtkWidget                     *button,
-							  gpointer                       user_data);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusRadioButtonGroup,
-				   nautilus_radio_button_group,
-				   GTK_TYPE_TABLE)
-
-static guint radio_group_signals[LAST_SIGNAL] = { 0 };
-
-/*
- * NautilusRadioButtonGroupClass methods
- */
-static void
-nautilus_radio_button_group_initialize_class (NautilusRadioButtonGroupClass *radio_button_group_class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	
-	object_class = GTK_OBJECT_CLASS (radio_button_group_class);
-	widget_class = GTK_WIDGET_CLASS (radio_button_group_class);
-
- 	parent_class = gtk_type_class (gtk_table_get_type ());
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_radio_button_group_destroy;
-
-	/* Signals */
-	radio_group_signals[CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				0,
-				gtk_marshal_NONE__OBJECT,
-				GTK_TYPE_NONE, 
-				1,
-				GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, radio_group_signals, LAST_SIGNAL);
-}
-
-static void
-nautilus_radio_button_group_initialize (NautilusRadioButtonGroup *button_group)
-{
-	button_group->details = g_new (NautilusRadioButtonGroupDetails, 1);
-
-	button_group->details->rows = NULL;
-	button_group->details->group = NULL;
-	button_group->details->num_items = 0;
-	button_group->details->horizontal = FALSE;
-}
-
-/*
- * GtkObjectClass methods
- */
-static void
-nautilus_radio_button_group_destroy (GtkObject *object)
-{
-	NautilusRadioButtonGroup * button_group;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (NAUTILUS_IS_RADIO_BUTTON_GROUP (object));
-	
-	button_group = NAUTILUS_RADIO_BUTTON_GROUP (object);
-
-	radio_button_group_free_button_group (button_group);
-
-	g_free (button_group->details);
-	
-	/* Chain */
-	if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/*
- * Private stuff
- */
-static void
-radio_button_group_emit_changed_signal (NautilusRadioButtonGroup *button_group,
-				       GtkWidget *button)
-{
-	g_assert (button_group != NULL);
-	g_assert (button_group->details != NULL);
-	g_assert (button != NULL);
-
-	gtk_signal_emit (GTK_OBJECT (button_group), 
-			 radio_group_signals[CHANGED],
-			 button);
-}
-
-static void
-radio_button_group_free_button_group (NautilusRadioButtonGroup *button_group)
-{
-	g_assert (button_group != NULL);
-	g_assert (button_group->details != NULL);
-
-	if (button_group->details->rows) {
-		nautilus_g_list_free_deep (button_group->details->rows);
-		button_group->details->rows = NULL;
-	}
-
-	button_group->details->group = NULL;
-}
-
-/*
- * Radio button callbacks
- */
-static void
-button_toggled (GtkWidget *button, gpointer user_data)
-{
-	NautilusRadioButtonGroup *button_group = (NautilusRadioButtonGroup *) user_data;
-	
-	g_assert (button_group != NULL);
-	g_assert (button_group->details != NULL);
-
-	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) {
-		radio_button_group_emit_changed_signal (button_group, button);
-	}
-}
-
-/*
- * NautilusRadioButtonGroup public methods
- */
-GtkWidget*
-nautilus_radio_button_group_new (gboolean is_horizontal)
-{
-	NautilusRadioButtonGroup *button_group;
-
-	button_group = NAUTILUS_RADIO_BUTTON_GROUP
-		(gtk_widget_new (nautilus_radio_button_group_get_type (), NULL));
-	button_group->details->horizontal = is_horizontal;
-	
-	return GTK_WIDGET (button_group);
-}
- 
-/**
- * nautilus_radio_button_group_insert:
- * @button_group: The button group
- * @label: Label to use for the new button
- *
- * Create and insert a new radio button to the collection.
- *
- * Returns: The index of the new button.
- */
-guint
-nautilus_radio_button_group_insert (NautilusRadioButtonGroup	*button_group,
-				    const gchar			*label)
-{
-	GtkTable	*table;
-	TableRow	*row;
-
-	g_return_val_if_fail (button_group != NULL, 0);
-	g_return_val_if_fail (NAUTILUS_IS_RADIO_BUTTON_GROUP (button_group), 0);
-	g_return_val_if_fail (label != NULL, 0);
-
-	table = GTK_TABLE (button_group);
-
-	row = g_new (TableRow, 1);
-
-	row->button = gtk_radio_button_new_with_label (button_group->details->group, label);
-	row->image = NULL;
-	row->description = NULL;
-
-	/*
-	 * For some crazy reason I dont grok, the group has to be fetched each
-	 * time from the previous button
-	 */
-	button_group->details->group = gtk_radio_button_group (GTK_RADIO_BUTTON (row->button));
-
-	gtk_signal_connect (GTK_OBJECT (row->button),
-			    "toggled",
-			    GTK_SIGNAL_FUNC (button_toggled),
-			    (gpointer) button_group);
-
-	button_group->details->num_items++;
-
-	if (button_group->details->horizontal) {
-		/* Resize the table to fit all items in one row. */
-		gtk_table_resize (table, 1, button_group->details->num_items);
-		/* Place the radio button in the last (so far) column of the only row */
-		gtk_table_attach (table, 
-				  row->button,				/* child */
-				  button_group->details->num_items - 1, /* left_attach */
-				  button_group->details->num_items,	/* right_attach */
-				  0,					/* top_attach */
-				  1,					/* bottom_attach */
-				  (GTK_FILL|GTK_EXPAND),		/* xoptions */
-				  (GTK_FILL|GTK_EXPAND),		/* yoptions */
-				  0,					/* xpadding */
-				  0);					/* ypadding */
-	} else {
-		/* Resize the table to put each item on separate row. */
-		gtk_table_resize (table, button_group->details->num_items, 3);
-		/* Place the radio button in column 2 of the last (so far) row */
-		gtk_table_attach (table, 
-				  row->button,				/* child */
-				  1,					/* left_attach */
-				  2,					/* right_attach */
-				  button_group->details->num_items - 1,	/* top_attach */
-				  button_group->details->num_items,	/* bottom_attach */
-				  (GTK_FILL|GTK_EXPAND),		/* xoptions */
-				  (GTK_FILL|GTK_EXPAND),		/* yoptions */
-				  0,					/* xpadding */
-				  0);					/* ypadding */
-	}
-
-
-	gtk_widget_show (row->button);
-	
-	button_group->details->rows = g_list_append (button_group->details->rows, row);
-	
-	return g_list_length (button_group->details->rows) - 1;
-}
-
-/**
- * nautilus_radio_button_group_get_active_index:
- * @button_group: The button group
- *
- * Returns: The index of the active button.  There is always one active by law.
- */
-guint
-nautilus_radio_button_group_get_active_index (NautilusRadioButtonGroup *button_group)
-{
-	GList	*button_iterator;
-	gint	i = 0;
-
- 	g_return_val_if_fail (button_group != NULL, 0);
-	g_return_val_if_fail (NAUTILUS_IS_RADIO_BUTTON_GROUP (button_group), 0);
-	
-	g_assert (button_group != NULL);
-
-	button_iterator = button_group->details->rows;
-
-	while (button_iterator) {
-		TableRow *row;
-
-		row = button_iterator->data;
-		g_assert (row != NULL);
-		g_assert (row->button != NULL);
-		g_assert (GTK_TOGGLE_BUTTON (row->button));
-
-		if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (row->button))) {
-			return i;
-		}
-		
-		button_iterator = button_iterator->next;
-
-		i++;
-	}
-
-	g_assert_not_reached ();
-
-	return 0;
-}
-
-void
-nautilus_radio_button_group_set_active_index (NautilusRadioButtonGroup *button_group,
-					      guint active_index)
-{
-	TableRow *row;
-
- 	g_return_if_fail (button_group != NULL);
-	g_return_if_fail (NAUTILUS_IS_RADIO_BUTTON_GROUP (button_group));
-
-	row = g_list_nth_data (button_group->details->rows, active_index);
-	g_assert (row != NULL);
-	g_assert (row->button != NULL);
-	g_assert (GTK_TOGGLE_BUTTON (row->button));
-
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (row->button), TRUE);
-}
-
-/* Set an item's pixbuf. */
-void
-nautilus_radio_button_group_set_entry_pixbuf (NautilusRadioButtonGroup *button_group,
-					      guint                     entry_index,
-					      GdkPixbuf                *pixbuf)
-{
-	GtkTable	*table;
-	TableRow	*row;
-
- 	g_return_if_fail (button_group != NULL);
-	g_return_if_fail (NAUTILUS_IS_RADIO_BUTTON_GROUP (button_group));
-	g_return_if_fail (entry_index < g_list_length (button_group->details->rows));
-	g_return_if_fail (button_group->details->horizontal == FALSE);
-
-	table = GTK_TABLE (button_group);
-
-	row = g_list_nth_data (button_group->details->rows, entry_index);
-	g_assert (row != NULL);
-
-	if (row->image == NULL) {
-		row->image = nautilus_image_new (NULL);
-		
-		gtk_table_attach (table,
-				  row->image,			/* child */
-				  0,				/* left_attach */
-				  1,				/* right_attach */
-				  entry_index,			/* top_attach */
-				  entry_index + 1,		/* bottom_attach */
-				  GTK_FILL,			/* xoptions */
-				  (GTK_FILL|GTK_EXPAND),	/* yoptions */
-				  0,				/* xpadding */
-				  0);				/* ypadding */
-		
-		gtk_widget_show (row->image);
-	}
-
-	g_assert (row->image != NULL);
-	
-	nautilus_image_set_pixbuf (NAUTILUS_IMAGE (row->image), pixbuf);
-}
-
-/* Set an item's description. */
-void
-nautilus_radio_button_group_set_entry_description_text (NautilusRadioButtonGroup *button_group,
-							guint                     entry_index,
-							const char               *description_text)
-{
-	GtkTable	*table;
-	TableRow	*row;
-
- 	g_return_if_fail (button_group != NULL);
-	g_return_if_fail (NAUTILUS_IS_RADIO_BUTTON_GROUP (button_group));
-	g_return_if_fail (entry_index < g_list_length (button_group->details->rows));
-	g_return_if_fail (button_group->details->horizontal == FALSE);
-
-	table = GTK_TABLE (button_group);
-
-	row = g_list_nth_data (button_group->details->rows, entry_index);
-	g_assert (row != NULL);
-	
-	if (row->description == NULL) {
-		row->description = gtk_label_new (description_text);
-
-		gtk_misc_set_alignment (GTK_MISC (row->description), 0, 0.5);
-		
-		gtk_table_attach (table,
-				  row->description,		/* child */
-				  2,				/* left_attach */
-				  3,				/* right_attach */
-				  entry_index,			/* top_attach */
-				  entry_index + 1,		/* bottom_attach */
-				  (GTK_FILL|GTK_EXPAND),	/* xoptions */
-				  (GTK_FILL|GTK_EXPAND),	/* yoptions */
-				  0,				/* xpadding */
-				  0);				/* ypadding */
-		
-		gtk_widget_show (row->description);
-	}
-	else {
-		gtk_label_set_text (GTK_LABEL (row->description), description_text);
-	}
-}
-
diff --git a/libnautilus-private/nautilus-radio-button-group.h b/libnautilus-private/nautilus-radio-button-group.h
deleted file mode 100644
index ec2864736..000000000
--- a/libnautilus-private/nautilus-radio-button-group.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-radio-button-group.h - A radio button group container.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_RADIO_BUTTON_GROUP_H
-#define NAUTILUS_RADIO_BUTTON_GROUP_H
-
-#include <gtk/gtktable.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome/gnome-defs.h>
-
-/*
- * NautilusRadioButtonGroup is a collection of radio buttons
- * arranged into rows.  An optional icon and description can 
- * can be displayed with each radio button entry:
- * 
- * Icon1 < > Item one           Item 1 description
- * Icon2 < > Item two           Item 2 description
- * Icon3 <x> Item three         Item 3 description
- * Icon4 < > Item four          Item 4 description
- * 
- */
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_RADIO_BUTTON_GROUP            (nautilus_radio_button_group_get_type ())
-#define NAUTILUS_RADIO_BUTTON_GROUP(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_RADIO_BUTTON_GROUP, NautilusRadioButtonGroup))
-#define NAUTILUS_RADIO_BUTTON_GROUP_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_RADIO_BUTTON_GROUP, NautilusRadioButtonGroupClass))
-#define NAUTILUS_IS_RADIO_BUTTON_GROUP(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_RADIO_BUTTON_GROUP))
-
-typedef struct _NautilusRadioButtonGroup	   NautilusRadioButtonGroup;
-typedef struct _NautilusRadioButtonGroupClass      NautilusRadioButtonGroupClass;
-typedef struct _NautilusRadioButtonGroupDetails    NautilusRadioButtonGroupDetails;
-
-struct _NautilusRadioButtonGroup
-{
-	/* Super Class */
-	GtkTable			table;
-	
-	/* Private stuff */
-	NautilusRadioButtonGroupDetails	*details;
-};
-
-struct _NautilusRadioButtonGroupClass
-{
-	GtkTableClass			parent_class;
-};
-
-typedef struct
-{
-	guint active_button_index;
-} NautilusRadioButtonGroupSignalData;
-
-GtkType    nautilus_radio_button_group_get_type                   (void);
-GtkWidget* nautilus_radio_button_group_new	                  (gboolean is_horizontal);
-
-
-/* Insert a new item to the group.  Returns the new item's index */
-guint      nautilus_radio_button_group_insert                     (NautilusRadioButtonGroup *button_group,
-								   const gchar              *label);
-
-/* Get the active item index. By law there always is an active item */
-guint      nautilus_radio_button_group_get_active_index           (NautilusRadioButtonGroup *button_group);
-
-/* Set the active item index. */
-void       nautilus_radio_button_group_set_active_index           (NautilusRadioButtonGroup *button_group,
-								   guint                     active_index);
-
-/* Set an item's pixbuf. */
-void       nautilus_radio_button_group_set_entry_pixbuf           (NautilusRadioButtonGroup *button_group,
-								   guint                     entry_index,
-								   GdkPixbuf                *pixbuf);
-/* Set an item's description. */
-void       nautilus_radio_button_group_set_entry_description_text (NautilusRadioButtonGroup *button_group,
-								   guint                     entry_index,
-								   const char               *description);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_RADIO_BUTTON_GROUP_H */
-
-
diff --git a/libnautilus-private/nautilus-region.c b/libnautilus-private/nautilus-region.c
deleted file mode 100644
index 0ff4f044b..000000000
--- a/libnautilus-private/nautilus-region.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-region.c: A simple wrapper on GdkRegion with rectangle operations.
-
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-region.h"
-
-#include "nautilus-glib-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-
-struct NautilusRegion
-{
-	GdkRegion *gdk_region;
-};
-
-NautilusRegion *
-nautilus_region_new (void)
-{
-	NautilusRegion *region;
-	
-	region = g_new0 (NautilusRegion, 1);
-
-	region->gdk_region = gdk_region_new ();
-
-	return region;
-}
-
-void
-nautilus_region_free (NautilusRegion *region)
-{
-	if (region == NULL) {
-		return;
-	}
-
-	g_assert (region->gdk_region != NULL);
-	gdk_region_destroy (region->gdk_region);
-	
-	g_free (region);
-}
-
-static GdkRegion *
-gdk_region_new_from_irect (const ArtIRect *art_rect)
-{
-	GdkRegion *region;
- 	GdkRegion *empty_region;
-	GdkRectangle gdk_rect;
-
-	g_return_val_if_fail (art_rect != NULL, NULL);
-	
-	gdk_rect = nautilus_art_irect_to_gdk_rectangle (art_rect);
-	empty_region = gdk_region_new ();
-	region = gdk_region_union_with_rect (empty_region, &gdk_rect);
-	gdk_region_destroy (empty_region);
-
-	return region;
-}
-
-void
-nautilus_region_add_rectangle (NautilusRegion *region,
-			       const ArtIRect *rectangle)
-{
-	GdkRegion *add_region;
-	GdkRegion *new_region;
-
-	g_return_if_fail (region != NULL);
-	g_return_if_fail (rectangle != NULL);
-	g_return_if_fail (!art_irect_empty (rectangle));
-
-	add_region = gdk_region_new_from_irect (rectangle);
-	new_region = gdk_regions_union (region->gdk_region, add_region);
-	gdk_region_destroy (add_region);
-	gdk_region_destroy (region->gdk_region);
-	region->gdk_region = new_region;
-}
-
-void
-nautilus_region_subtract_rectangle (NautilusRegion *region,
-				    const ArtIRect *rectangle)
-{
-	GdkRegion *subtract_region;
-	GdkRegion *new_region;
-
-	g_return_if_fail (region != NULL);
-	g_return_if_fail (rectangle != NULL);
-	g_return_if_fail (!art_irect_empty (rectangle));
-
-	subtract_region = gdk_region_new_from_irect (rectangle);
-	new_region = gdk_regions_subtract (region->gdk_region, subtract_region);
-	gdk_region_destroy (subtract_region);
-	gdk_region_destroy (region->gdk_region);
-	region->gdk_region = new_region;
-}
-
-void
-nautilus_region_set_gc_clip_region (const NautilusRegion *region,
-				    GdkGC *gc)
-{
-	g_return_if_fail (region != NULL);
-	g_return_if_fail (gc != NULL);
-
-	gdk_gc_set_clip_region (gc, region->gdk_region);
-}
diff --git a/libnautilus-private/nautilus-region.h b/libnautilus-private/nautilus-region.h
deleted file mode 100644
index 1727469ad..000000000
--- a/libnautilus-private/nautilus-region.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-region.h: A simple wrapper on GdkRegion with rectangle operations.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_REGION_H
-#define NAUTILUS_REGION_H
-
-#include <libgnome/gnome-defs.h>
-#include <libart_lgpl/art_rect.h>
-#include <glib.h>
-#include <gdk/gdk.h>
-
-/* Opaque NautilusRegion declaration. */
-typedef struct NautilusRegion NautilusRegion;
-
-NautilusRegion *nautilus_region_new                (void);
-void            nautilus_region_free               (NautilusRegion       *region);
-void            nautilus_region_add_rectangle      (NautilusRegion       *region,
-						    const ArtIRect       *rectangle);
-void            nautilus_region_subtract_rectangle (NautilusRegion       *region,
-						    const ArtIRect       *rectangle);
-void            nautilus_region_set_gc_clip_region (const NautilusRegion       *region,
-						    GdkGC *gc);
-
-#endif /* NAUTILUS_REGION_H */
-
diff --git a/libnautilus-private/nautilus-scalable-font-private.h b/libnautilus-private/nautilus-scalable-font-private.h
deleted file mode 100644
index e65454e0f..000000000
--- a/libnautilus-private/nautilus-scalable-font-private.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-scalable-font-private.h - Private scalable font things.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_SCALABLE_FONT_PRIVATE_H
-#define NAUTILUS_SCALABLE_FONT_PRIVATE_H
-
-#include <libnautilus-extensions/nautilus-scalable-font.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_SCALABLE_FONT_UNDEFINED_HANDLE -1
-
-struct _RsvgFTCtx;
-
-int                nautilus_scalable_font_get_rsvg_handle  (const NautilusScalableFont *font);
-struct _RsvgFTCtx *nautilus_scalable_font_get_rsvg_context (const NautilusScalableFont *font);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_SCALABLE_FONT_PRIVATE_H */
-
-
diff --git a/libnautilus-private/nautilus-scalable-font.c b/libnautilus-private/nautilus-scalable-font.c
deleted file mode 100644
index 9cf671595..000000000
--- a/libnautilus-private/nautilus-scalable-font.c
+++ /dev/null
@@ -1,383 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-scalable-font.c - A GtkObject subclass for access to scalable fonts.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-scalable-font-private.h"
-
-#include "nautilus-background.h"
-#include "nautilus-font-manager.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-glyph.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-string.h"
-#include <librsvg/rsvg-ft.h>
-#include <libgnome/gnome-util.h>
-
-/* Detail member struct */
-struct NautilusScalableFontDetails
-{
-	RsvgFTFontHandle font_handle;
-	char *font_file_name;
-};
-
-/* Global things */
-static RsvgFTCtx		*global_rsvg_ft_context = NULL;
-static GHashTable		*global_font_handle_table = NULL;
-
-/* GtkObjectClass methods */
-static void nautilus_scalable_font_initialize_class (NautilusScalableFontClass *font_class);
-static void nautilus_scalable_font_initialize       (NautilusScalableFont      *font);
-static void nautilus_scalable_font_destroy          (GtkObject                 *object);
-static void initialize_global_stuff_if_needed       (void);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusScalableFont, nautilus_scalable_font, GTK_TYPE_OBJECT)
-
-/* Class init methods */
-static void
-nautilus_scalable_font_initialize_class (NautilusScalableFontClass *font_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (font_class);
-
-	initialize_global_stuff_if_needed ();
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_scalable_font_destroy;
-}
-
-void
-nautilus_scalable_font_initialize (NautilusScalableFont *font)
-{
-	font->details = g_new0 (NautilusScalableFontDetails, 1);
-
-	font->details->font_handle = NAUTILUS_SCALABLE_FONT_UNDEFINED_HANDLE;
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_scalable_font_destroy (GtkObject *object)
-{
- 	NautilusScalableFont *font;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (NAUTILUS_IS_SCALABLE_FONT (object));
-
-	font = NAUTILUS_SCALABLE_FONT (object);
-
-	g_free (font->details->font_file_name);
-	g_free (font->details);
-	
-	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-/* Public NautilusScalableFont methods */
-
-/**
- * nautilus_scalable_font_new:
- * @file_name: Postscript or TrueType font file name.
- *
- * Returns a font for the given font file name.
- *
- */
-NautilusScalableFont *
-nautilus_scalable_font_new (const char *file_name)
-{
-	NautilusScalableFont *font;
-	RsvgFTFontHandle font_handle = -1;
-
-	g_return_val_if_fail (nautilus_strlen (file_name) > 0, NULL);
-	g_return_val_if_fail (nautilus_font_manager_file_is_scalable_font (file_name), NULL);
-
-	initialize_global_stuff_if_needed ();
-
-	font = NAUTILUS_SCALABLE_FONT (gtk_object_new (nautilus_scalable_font_get_type (), NULL));
-	gtk_object_ref (GTK_OBJECT (font));
-	gtk_object_sink (GTK_OBJECT (font));
-	
-	font->details->font_file_name = g_strdup (file_name);
-
-	if (!g_hash_table_lookup_extended (global_font_handle_table,
-					   font->details->font_file_name,
-					   NULL,
-					   (gpointer *) &font_handle)) {
-		font_handle = rsvg_ft_intern (global_rsvg_ft_context, font->details->font_file_name);
-		g_hash_table_insert (global_font_handle_table,
-				     font->details->font_file_name,
-				     GINT_TO_POINTER (font_handle));
-	}
-	g_assert (font_handle >= 0);
-
-	font->details->font_handle = font_handle;
-
-	return font;
-}
-
-NautilusScalableFont *
-nautilus_scalable_font_make_bold (NautilusScalableFont *font)
-{
-	char *bold_font_file_name;
-	NautilusScalableFont *bold_font;
-
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), NULL);
-
-	bold_font_file_name = nautilus_font_manager_get_bold (font->details->font_file_name);
-	bold_font = nautilus_scalable_font_new (bold_font_file_name);
-	g_free (bold_font_file_name);
-
-	return bold_font;
-}
-
-NautilusDimensions
-nautilus_scalable_font_measure_text (const NautilusScalableFont *font,
-				     int font_size,
-				     const char *text,
-				     guint text_length)
-{
-	NautilusDimensions dimensions;
-	NautilusGlyph *glyph;
-
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), NAUTILUS_DIMENSIONS_EMPTY);
-	g_return_val_if_fail (font_size > 0, NAUTILUS_DIMENSIONS_EMPTY);
-
-	if (text == NULL || text[0] == '\0' || text_length == 0) {
-		return NAUTILUS_DIMENSIONS_EMPTY;
-	}
-
-	g_return_val_if_fail (text_length <= strlen (text), NAUTILUS_DIMENSIONS_EMPTY);
-
-	glyph = nautilus_glyph_new (font, font_size, text, text_length);
-	dimensions = nautilus_glyph_get_dimensions (glyph);
-	nautilus_glyph_free (glyph);
-
-	return dimensions;
-}
-
-int
-nautilus_scalable_font_text_width (const NautilusScalableFont *font,
-				   int font_size,
-				   const char *text,
-				   guint text_length)
-{
-	NautilusDimensions dimensions;
-
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), 0);
-	g_return_val_if_fail (font_size > 0, 0);
-
-	if (text == NULL || text[0] == '\0' || text_length == 0) {
-		return 0;
-	}
-
-	g_return_val_if_fail (text_length <= strlen (text), 0);
-
-	dimensions = nautilus_scalable_font_measure_text (font, font_size, text, text_length);
-
-	return dimensions.width;
-}
-
-void
-nautilus_scalable_font_draw_text (const NautilusScalableFont *font,
-				  GdkPixbuf *destination_pixbuf,
-				  int x,
-				  int y,
-				  const ArtIRect *clip_area,
-				  int font_size,
-				  const char *text,
-				  guint text_length,
-				  guint32 color,
-				  int opacity)
-{
-	NautilusGlyph *glyph;
-
-	g_return_if_fail (NAUTILUS_IS_SCALABLE_FONT (font));
-	g_return_if_fail (destination_pixbuf != NULL);
-	g_return_if_fail (font_size > 0);
-	g_return_if_fail (opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	if (text == NULL || text[0] == '\0' || text_length == 0) {
-		return;
-	}
-
-	g_return_if_fail (text_length <= strlen (text));
-
-	glyph = nautilus_glyph_new (font, font_size, text, text_length);
-
-	nautilus_glyph_draw_to_pixbuf (glyph,
-				       destination_pixbuf,
-				       x,
-				       y,
-				       clip_area,
-				       color,
-				       opacity);
-
-	nautilus_glyph_free (glyph);
-}
-
-/**
- * nautilus_scalable_font_largest_fitting_font_size
- * @font: A NautilusScalableFont
- * @text: Text to use for measurement.
- * @available_width: How much space is available in pixels.
- * @minimum_acceptable_font_size: The minimum acceptable font size in pixels.
- * @maximum_acceptable_font_size: The maximum acceptable font size in pixels.
- *
- * Returns: A font size than when used to render &text, will fit it all in 
- *          &available_width.  The minimum and maximum acceptable dimensions
- *          control the limits on the size of the font.  The font size is
- *          guranteed to be within this range.
- */
-int
-nautilus_scalable_font_largest_fitting_font_size (const NautilusScalableFont *font,
-						  const char *text,
-						  int available_width,
-						  int minimum_acceptable_font_size,
-						  int maximum_acceptable_font_size)
-{
-	NautilusStringList *tokenized_string;
-	int i;
-	char *longest_string;
-	int longest_string_length;
-
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), 0);
-	g_return_val_if_fail (text != NULL, 0);
-	g_return_val_if_fail (text[0] != '\0', 0);
-	g_return_val_if_fail (available_width > 0, 0);
-	g_return_val_if_fail (minimum_acceptable_font_size > 0, 0);
-	g_return_val_if_fail (maximum_acceptable_font_size > 0, 0);
-	g_return_val_if_fail (maximum_acceptable_font_size > minimum_acceptable_font_size, 0);
-
-	tokenized_string = nautilus_string_list_new_from_tokens (text, "\n", FALSE);
-	longest_string = nautilus_string_list_get_longest_string (tokenized_string);
-	g_assert (longest_string != NULL);
-	nautilus_string_list_free (tokenized_string);
-	longest_string_length = strlen (longest_string);
-	
-	for (i = maximum_acceptable_font_size; i >= minimum_acceptable_font_size; i--) {
-		int width;
-
-		width = nautilus_scalable_font_text_width (font,
-							   i,
-							   longest_string,
-							   longest_string_length);
-		
-		if (width <= available_width) {
-			g_free (longest_string);
-			return i;
-		}
-	}
-
-	g_free (longest_string);
-
-	return minimum_acceptable_font_size;
-}
-
-NautilusScalableFont *
-nautilus_scalable_font_get_default_font (void)
-{
-	char *default_font_file_name;
-	NautilusScalableFont *default_font;
-
-	default_font_file_name = nautilus_font_manager_get_default_font ();
-	g_assert (default_font_file_name != NULL);
-	default_font = nautilus_scalable_font_new (default_font_file_name);
-	g_free (default_font_file_name);
-	g_assert (NAUTILUS_IS_SCALABLE_FONT (default_font));
-	return default_font;
-}
-
-NautilusScalableFont *
-nautilus_scalable_font_get_default_bold_font (void)
-{
-	char *default_bold_font_file_name;
-	NautilusScalableFont *default_bold_font;
-
-	default_bold_font_file_name = nautilus_font_manager_get_default_bold_font ();
-	g_assert (default_bold_font_file_name != NULL);
-	default_bold_font = nautilus_scalable_font_new (default_bold_font_file_name);
-	g_free (default_bold_font_file_name);
-	g_assert (NAUTILUS_IS_SCALABLE_FONT (default_bold_font));
-	return default_bold_font;
-}
-
-/* 'atexit' destructor for rsvg context */
-static void
-destroy_global_rsvg_ft_context (void)
-{
-	rsvg_ft_ctx_done (global_rsvg_ft_context);
-}
-
-static void
-free_global_font_handle_table (void)
-{
-	if (global_font_handle_table != NULL) {
-		g_hash_table_destroy (global_font_handle_table);
-	}
-
-	global_font_handle_table = NULL;
-}
-
-static void
-initialize_global_stuff_if_needed (void)
-{
-	/* Initialize the rsvg font context shared by all fonts */
-	if (global_rsvg_ft_context == NULL) {
-		global_rsvg_ft_context = rsvg_ft_ctx_new ();
-		g_atexit (destroy_global_rsvg_ft_context);
-	}
-
-	if (global_font_handle_table == NULL) {
-		global_font_handle_table = g_hash_table_new (g_str_hash, g_str_equal);
-		g_atexit (free_global_font_handle_table);
-	}
-}
-
-/* Private NautilusScalableFont things */
-int
-nautilus_scalable_font_get_rsvg_handle (const NautilusScalableFont *font)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), NAUTILUS_SCALABLE_FONT_UNDEFINED_HANDLE);
-
-	return font->details->font_handle;
-}
-
-struct _RsvgFTCtx *
-nautilus_scalable_font_get_rsvg_context (const NautilusScalableFont *font)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), NULL);
-
-	initialize_global_stuff_if_needed ();
-
-	return global_rsvg_ft_context;
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-void
-nautilus_self_check_scalable_font (void)
-{
-	/* const char *fonts_place = NAUTILUS_DATADIR "/fonts/urw"; */
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-scalable-font.h b/libnautilus-private/nautilus-scalable-font.h
deleted file mode 100644
index c8add6e4b..000000000
--- a/libnautilus-private/nautilus-scalable-font.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-scalable-font.h - A GtkObject subclass for access to scalable fonts.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-/* NautilusScalableFont is a GtkObject that provdes a simple
- * interface to Raph Levien's librsvg FreeType2 based anti aliased
- * text rendering.
- *
- * Currently, only Type1 fonts are supported.
- *
- * Fonts are automatically queried and used if available.  Right
- * now this is fairly simple code which does not handle all the 
- * complexities of the hell that is unix fonts.
- *
- * In the Star Trek future, we will use gnome-print (gnome-font?).
- * However, we will keep the interface to scalable font usage simple
- * and hidden behind this interface.
- */
-
-#ifndef NAUTILUS_SCALABLE_FONT_H
-#define NAUTILUS_SCALABLE_FONT_H
-
-#include <gtk/gtkobject.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome/gnome-defs.h>
-#include <libnautilus-extensions/nautilus-string-list.h>
-#include <libnautilus-extensions/nautilus-art-extensions.h>
-#include <libart_lgpl/art_rect.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_SCALABLE_FONT		(nautilus_scalable_font_get_type ())
-#define NAUTILUS_SCALABLE_FONT(obj)		(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_SCALABLE_FONT, NautilusScalableFont))
-#define NAUTILUS_SCALABLE_FONT_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_SCALABLE_FONT, NautilusScalableFontClass))
-#define NAUTILUS_IS_SCALABLE_FONT(obj)		(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_SCALABLE_FONT))
-#define NAUTILUS_IS_SCALABLE_FONT_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_SCALABLE_FONT))
-
-typedef struct NautilusScalableFont	      NautilusScalableFont;
-typedef struct NautilusScalableFontClass      NautilusScalableFontClass;
-typedef struct NautilusScalableFontDetails    NautilusScalableFontDetails;
-
-struct NautilusScalableFont
-{
-	/* Superclass */
-	GtkObject object;
-
-	/* Private things */
-	NautilusScalableFontDetails *details;
-};
-
-struct NautilusScalableFontClass
-{
-	GtkObjectClass parent_class;
-};
-
-GtkType                nautilus_scalable_font_get_type                  (void);
-NautilusScalableFont * nautilus_scalable_font_new                       (const char                  *file_name);
-NautilusDimensions     nautilus_scalable_font_measure_text              (const NautilusScalableFont  *font,
-									 int                          font_size,
-									 const char                  *text,
-									 guint                        text_length);
-int                    nautilus_scalable_font_text_width                (const NautilusScalableFont  *font,
-									 int                          font_size,
-									 const char                  *text,
-									 guint                        text_length);
-void                   nautilus_scalable_font_draw_text                 (const NautilusScalableFont  *font,
-									 GdkPixbuf                   *destination_pixbuf,
-									 int                          x,
-									 int                          y,
-									 const ArtIRect              *clip_area,
-									 int                          font_size,
-									 const char                  *text,
-									 guint                        text_length,
-									 guint32                      color,
-									 int                          opacity);
-int                    nautilus_scalable_font_largest_fitting_font_size (const NautilusScalableFont  *font,
-									 const char                  *text,
-									 int                          available_width,
-									 int                          minimum_acceptable_font_size,
-									 int                          maximum_acceptable_font_size);
-NautilusScalableFont  *nautilus_scalable_font_get_default_font          (void);
-NautilusScalableFont  *nautilus_scalable_font_get_default_bold_font     (void);
-NautilusScalableFont  *nautilus_scalable_font_make_bold                 (NautilusScalableFont        *font);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_SCALABLE_FONT_H */
-
-
diff --git a/libnautilus-private/nautilus-search-uri.c b/libnautilus-private/nautilus-search-uri.c
index c71a22cd8..8f452a685 100644
--- a/libnautilus-private/nautilus-search-uri.c
+++ b/libnautilus-private/nautilus-search-uri.c
@@ -27,9 +27,9 @@
 /* Must be included before other libgnome headers. */
 #include <libgnome/gnome-defs.h>
 
-#include "nautilus-glib-extensions.h"
 #include "nautilus-lib-self-check-functions.h"
-#include "nautilus-string.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-string.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
@@ -85,7 +85,7 @@ free_tokenized_uri (GList *list)
         GList *node;
 
         for (node = list; node != NULL; node = node->next) {
-                nautilus_g_list_free_deep (node->data);
+                eel_g_list_free_deep (node->data);
         }
         g_list_free (list);
 }
@@ -503,7 +503,7 @@ get_translated_criterion (GList *criterion)
                    we output a concat of the translation and the 
                    last part of the uri.
                 */
-                context_stripped_operand = nautilus_str_remove_bracketed_text (_(operand_table[item_number].translation));
+                context_stripped_operand = eel_str_remove_bracketed_text (_(operand_table[item_number].translation));
                 ret_val = g_strdup_printf (context_stripped_operand,
 					   (char *) criterion->data);
                 g_free (context_stripped_operand);
@@ -519,11 +519,11 @@ get_translated_criterion (GList *criterion)
 
                 if (operand_table[item_number].translation == NULL) {
                         /* if we had no translation in operand criterion table */
-                        ret_val = nautilus_str_remove_bracketed_text (_(value_table[value_item_number].translation));
+                        ret_val = eel_str_remove_bracketed_text (_(value_table[value_item_number].translation));
                 } else {
                         /* if we have both some translation in level 2 and level 3 */
-                        context_stripped_operand = nautilus_str_remove_bracketed_text (_(operand_table[item_number].translation));
-                        context_stripped_value = nautilus_str_remove_bracketed_text (_(value_table[value_item_number].translation));
+                        context_stripped_operand = eel_str_remove_bracketed_text (_(operand_table[item_number].translation));
+                        context_stripped_value = eel_str_remove_bracketed_text (_(value_table[value_item_number].translation));
                         ret_val = g_strdup_printf (context_stripped_operand, context_stripped_value);
                         g_free (context_stripped_operand);
                         g_free (context_stripped_value);
@@ -553,12 +553,12 @@ get_nth_criterion_prefix (GList *criterion)
             strings elsewhere.  Translate only the words "and" here. */
         if (criterion->next == NULL) {
                 
-                return nautilus_str_remove_bracketed_text (_("[Items larger than 400K] and [without all the words \"apple orange\"]"));
+                return eel_str_remove_bracketed_text (_("[Items larger than 400K] and [without all the words \"apple orange\"]"));
         }
         /* Human readable description for a criterion in a search for
            files. Bracketed items are context, and are message
            strings elsewhere.  Translate only the words "and" here. */
-        return nautilus_str_remove_bracketed_text (_("[Items larger than 400K], [owned by root and without all the words \"apple orange\"]"));
+        return eel_str_remove_bracketed_text (_("[Items larger than 400K], [owned by root and without all the words \"apple orange\"]"));
 }
 
 /**
@@ -650,8 +650,8 @@ nautilus_is_search_uri (const char *uri)
 {
         g_return_val_if_fail (uri != NULL, FALSE);
 
-        return nautilus_istr_has_prefix (uri, "search:")
-                || nautilus_istr_has_prefix (uri, "gnome-search:");
+        return eel_istr_has_prefix (uri, "search:")
+                || eel_istr_has_prefix (uri, "gnome-search:");
 }
 
 #if !defined (NAUTILUS_OMIT_SELF_CHECK)
@@ -662,66 +662,66 @@ nautilus_self_check_search_uri (void)
 	/* search_uri_to_human */
 
         /* make sure that it does not accept non-supported uris.*/
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human (""), ""); 
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("s"), "s");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human (" "), " ");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("  "), "  ");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human (" s"), " s");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human (" s "), " s ");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("xxx:yyy"), "xxx:yyy");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]"), "search:[][]");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]fi"), "search:[][]fi");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human (""), ""); 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("s"), "s");
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human (" "), " ");
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("  "), "  ");
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human (" s"), " s");
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human (" s "), " s ");
+	EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("xxx:yyy"), "xxx:yyy");
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]"), "search:[][]");
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]fi"), "search:[][]fi");
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name"), 
                                       "search:[][]file_name");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name cont"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name cont"), 
                                       "search:[][]file_name cont");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains"), 
                                       "search:[][]file_name contains");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name c stuff"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name c stuff"), 
                                       "search:[][]file_name c stuff");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]&"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]&"), 
                                       "search:[][]&");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]f & s"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]f & s"), 
                                       "search:[][]f & s");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & f"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & f"), 
                                       "search:[][]file_name contains stuff & f");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & file_type i"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & file_type i"), 
                                       "search:[][]file_name contains stuff & file_type i");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & file_type is f"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & file_type is f"), 
                                       "search:[][]file_name contains stuff & file_type is f");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stu)ff & file_type is file"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stu)ff & file_type is file"), 
                                       "search:[][]file_name contains stu)ff & file_type is file");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stu(ff & file_type is file"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stu(ff & file_type is file"), 
                                       "search:[][]file_name contains stu(ff & file_type is file");
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stu|ff & file_type is file"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stu|ff & file_type is file"), 
                                       "search:[][]file_name contains stu|ff & file_type is file");
 
         /* make sure all the code paths work */
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff"), 
                                       _("Items containing \"stuff\" in their names"));
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_type is file"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_type is file"), 
                                       _("Items that are regular files"));
         /* FIXME bugzilla.eazel.com 5088: This may be what the function calls "human", but it's bad grammar. */
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & file_type is file"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & file_type is file"), 
                                       _("Items containing \"stuff\" in their names and that are regular files"));
         /* FIXME bugzilla.eazel.com 5088: This may be what the function calls "human", but it's bad grammar. */
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & file_type is file"
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & file_type is file"
                                                                     " & size smaller_than 2000"), 
                                       _("Items containing \"stuff\" in their names, that are regular files and "
                                         "smaller than 2000 bytes"));
         /* FIXME bugzilla.eazel.com 5088: This may be what the function calls "human", but it's bad grammar. */
-        NAUTILUS_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains medusa & file_type is directory"), 
+        EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains medusa & file_type is directory"), 
                                       _("Items containing \"medusa\" in their names and that are "
                                         "folders"));
         
         /* is_search_uri */
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri (""), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("search:"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("gnome-search:"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("xxx-search:"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("search:xxx"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("gnome-search:xxx"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("xxx-search:xxx"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri (""), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("search:"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("gnome-search:"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("xxx-search:"), FALSE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("search:xxx"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("gnome-search:xxx"), TRUE);
+	EEL_CHECK_BOOLEAN_RESULT (nautilus_is_search_uri ("xxx-search:xxx"), FALSE);
 }
 
 #endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-self-checks.c b/libnautilus-private/nautilus-self-checks.c
deleted file mode 100644
index 4adb11d05..000000000
--- a/libnautilus-private/nautilus-self-checks.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-   
-   nautilus-self-checks.c: The self-check framework.
- 
-   Copyright (C) 1999 Eazel, Inc.
-  
-   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.
-  
-   Author: Darin Adler <darin@eazel.com>
-*/
-
-#include <config.h>
-
-#if ! defined (NAUTILUS_OMIT_SELF_CHECK)
-
-#include "nautilus-self-checks.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-static gboolean failed;
-
-static const char *current_expression;
-static const char *current_file_name;
-static int current_line_number;
-
-void nautilus_exit_if_self_checks_failed (void)
-{
-	if (!failed) {
-		return;
-	}
-
-	printf ("\n");
-
-	exit (EXIT_FAILURE);
-}
-
-static void
-nautilus_report_check_failure (char *result, char *expected)
-{
-	if (!failed) {
-		fprintf (stderr, "\n");
-	}
-
-	fprintf (stderr, "FAIL: check failed in %s, line %d\n", current_file_name, current_line_number);
-	fprintf (stderr, "      evaluated: %s\n", current_expression);
-	fprintf (stderr, "       expected: %s\n", expected == NULL ? "NULL" : expected);
-	fprintf (stderr, "            got: %s\n", result == NULL ? "NULL" : result);
-	
-	failed = TRUE;
-
-	g_free (result);
-	g_free (expected);
-}
-
-static char *
-nautilus_strdup_boolean (gboolean boolean)
-{
-	if (boolean == FALSE) {
-		return g_strdup ("FALSE");
-	}
-	if (boolean == TRUE) {
-		return g_strdup ("TRUE");
-	}
-	return g_strdup_printf ("gboolean(%d)", boolean);
-}
-
-void
-nautilus_before_check (const char *expression,
-		       const char *file_name,
-		       int line_number)
-{
-	current_expression = expression;
-	current_file_name = file_name;
-	current_line_number = line_number;
-}
-
-static void
-nautilus_after_check (void)
-{
-	/* It would be good to check here if there was a memory leak. */
-}
-
-void
-nautilus_check_boolean_result (gboolean result, gboolean expected)
-{
-	if (result != expected) {
-		nautilus_report_check_failure (nautilus_strdup_boolean (result),
-					       nautilus_strdup_boolean (expected));
-	}
-	nautilus_after_check ();
-}
-
-void
-nautilus_check_rectangle_result (ArtIRect result,
-				 int expected_x0,
-				 int expected_y0,
-				 int expected_x1,
-				 int expected_y1)
-{
-	if (result.x0 != expected_x0
-	    || result.y0 != expected_y0
-	    || result.x1 != expected_x1
-	    || result.y1 != expected_y1) {
-		nautilus_report_check_failure (g_strdup_printf ("x0=%d, y0=%d, x1=%d, y1=%d",
-								result.x0,
-								result.y0,
-								result.x1,
-								result.y1),
-					       g_strdup_printf ("x0=%d, y0=%d, x1=%d, y1=%d",
-								expected_x0,
-								expected_y0,
-								expected_x1,
-								expected_y1));
-	}
-	nautilus_after_check ();
-}
-
-void
-nautilus_check_dimensions_result (NautilusDimensions result,
-				  int expected_width,
-				  int expected_height)
-{
-	if (result.width != expected_width
-	    || result.height != expected_height) {
-		nautilus_report_check_failure (g_strdup_printf ("width=%d, height=%d",
-								result.width,
-								result.height),
-					       g_strdup_printf ("width=%d, height=%d",
-								expected_width,
-								expected_height));
-	}
-	nautilus_after_check ();
-}
-
-void
-nautilus_check_integer_result (long result, long expected)
-{
-	if (result != expected) {
-		nautilus_report_check_failure (g_strdup_printf ("%ld", result),
-					       g_strdup_printf ("%ld", expected));
-	}
-	nautilus_after_check ();
-}
-
-void
-nautilus_check_string_result (char *result, const char *expected)
-{
-	gboolean match;
-	
-	/* Stricter than nautilus_strcmp.
-	 * NULL does not match "" in this test.
-	 */
-	if (expected == NULL) {
-		match = result == NULL;
-	} else {
-		match = result != NULL && strcmp (result, expected) == 0;
-	}
-
-	if (!match) {
-		nautilus_report_check_failure (result, g_strdup (expected));
-	} else {
-		g_free (result);
-	}
-	nautilus_after_check ();
-}
-
-void
-nautilus_before_check_function (const char *name)
-{
-	fprintf (stderr, "running %s\n", name);
-}
-
-void
-nautilus_after_check_function (void)
-{
-}
-
-#endif /* ! NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-self-checks.h b/libnautilus-private/nautilus-self-checks.h
deleted file mode 100644
index 73ff7e5c3..000000000
--- a/libnautilus-private/nautilus-self-checks.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-   
-   nautilus-self-checks.h: The self-check framework.
- 
-   Copyright (C) 1999 Eazel, Inc.
-  
-   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.
-  
-   Author: Darin Adler <darin@eazel.com>
-*/
-
-#ifndef NAUTILUS_SELF_CHECKS_H
-#define NAUTILUS_SELF_CHECKS_H
-
-#include <glib.h>
-#include <libnautilus-extensions/nautilus-art-extensions.h>
-
-#define NAUTILUS_CHECK_RESULT(type, expression, expected_value) \
-G_STMT_START { \
-	nautilus_before_check (#expression, __FILE__, __LINE__); \
-	nautilus_check_##type##_result (expression, expected_value); \
-} G_STMT_END
-
-#define NAUTILUS_CHECK_BOOLEAN_RESULT(expression, expected_value) \
-	NAUTILUS_CHECK_RESULT(boolean, expression, expected_value)
-#define NAUTILUS_CHECK_INTEGER_RESULT(expression, expected_value) \
-	NAUTILUS_CHECK_RESULT(integer, expression, expected_value)
-#define NAUTILUS_CHECK_STRING_RESULT(expression, expected_value) \
-	NAUTILUS_CHECK_RESULT(string, expression, expected_value)
-#define NAUTILUS_CHECK_RECTANGLE_RESULT(expression, expected_x0, expected_y0, expected_x1, expected_y1) \
-G_STMT_START { \
-	nautilus_before_check (#expression, __FILE__, __LINE__); \
-	nautilus_check_rectangle_result (expression, expected_x0, expected_y0, expected_x1, expected_y1); \
-} G_STMT_END
-#define NAUTILUS_CHECK_DIMENSIONS_RESULT(expression, expected_width, expected_height) \
-G_STMT_START { \
-	nautilus_before_check (#expression, __FILE__, __LINE__); \
-	nautilus_check_dimensions_result (expression, expected_width, expected_height); \
-} G_STMT_END
-
-void nautilus_exit_if_self_checks_failed (void);
-void nautilus_before_check_function      (const char         *name);
-void nautilus_after_check_function       (void);
-void nautilus_before_check               (const char         *expression,
-					  const char         *file_name,
-					  int                 line_number);
-void nautilus_check_boolean_result       (gboolean            result,
-					  gboolean            expected_value);
-void nautilus_check_integer_result       (long                result,
-					  long                expected_value);
-void nautilus_check_rectangle_result     (ArtIRect            result,
-					  int                 expected_x0,
-					  int                 expected_y0,
-					  int                 expected_x1,
-					  int                 expected_y1);
-void nautilus_check_dimensions_result    (NautilusDimensions  result,
-					  int                 expected_width,
-					  int                 expected_height);
-void nautilus_check_string_result        (char               *result,
-					  const char         *expected_value);
-
-#define NAUTILUS_SELF_CHECK_FUNCTION_PROTOTYPE(function) \
-	void function (void);
-
-#define NAUTILUS_CALL_SELF_CHECK_FUNCTION(function) \
-	nautilus_before_check_function (#function); \
-	function (); \
-	nautilus_after_check_function ();
-
-#endif /* NAUTILUS_SELF_CHECKS_H */
diff --git a/libnautilus-private/nautilus-sidebar-functions.c b/libnautilus-private/nautilus-sidebar-functions.c
index 1a64c67b8..e8ada756e 100644
--- a/libnautilus-private/nautilus-sidebar-functions.c
+++ b/libnautilus-private/nautilus-sidebar-functions.c
@@ -25,9 +25,9 @@
 #include <config.h>
 #include "nautilus-sidebar-functions.h"
 
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-glib-extensions.h>
 #include "nautilus-preferences.h"
-#include "nautilus-string.h"
+#include <eel/eel-string.h>
 #include "nautilus-view-identifier.h"
 
 #include <liboaf/liboaf.h>
@@ -46,7 +46,7 @@ compare_view_identifiers (gconstpointer a, gconstpointer b)
  	idenfifier_a = (NautilusViewIdentifier*) a;
  	idenfifier_b = (NautilusViewIdentifier*) b;
 	
-	return nautilus_strcmp (idenfifier_a->name, idenfifier_b->name);
+	return eel_strcmp (idenfifier_a->name, idenfifier_b->name);
 }
 
 static gboolean
@@ -119,7 +119,7 @@ nautilus_sidebar_get_enabled_sidebar_panel_view_identifiers (void)
         
 	enabled_view_identifiers = sidebar_get_sidebar_panel_view_identifiers ();
 
-	enabled_view_identifiers = nautilus_g_list_partition (enabled_view_identifiers,
+	enabled_view_identifiers = eel_g_list_partition (enabled_view_identifiers,
 							      sidebar_is_sidebar_panel_enabled_cover,
 							      NULL,
 							      &disabled_view_identifiers);
diff --git a/libnautilus-private/nautilus-smooth-text-layout-cache.c b/libnautilus-private/nautilus-smooth-text-layout-cache.c
deleted file mode 100644
index b006334ed..000000000
--- a/libnautilus-private/nautilus-smooth-text-layout-cache.c
+++ /dev/null
@@ -1,767 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-smooth-text-layout-cache.c - A GtkObject subclass for efficiently rendering smooth text.
-
-   Copyright (C) 2001 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: John Harper <jsh@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-smooth-text-layout-cache.h"
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-smooth-text-layout.h"
-#include <gtk/gtkmain.h>
-#include <string.h>
-#include <memory.h>
-
-typedef struct CacheIndex CacheIndex;
-
-/* Define this to get some cache statistics printed */
-#undef TEST
-
-/* Detail member struct */
-struct NautilusSmoothTextLayoutCacheDetails
-{
-	/* Hash table mapping from CacheIndex* -> NautilusSmoothTextLayout* */
-	GHashTable *table;
-
-	/* Linked list containing all cached items, in MRU order */
-	CacheIndex *head, *tail;
-
-	/* Current total size of the cache. */
-	int total_size;
-
-	/* Maximum size of the cache */
-	int maximum_size;
-
-#ifdef TEST
-	int misses, hits;
-#endif
-};
-
-/* Structure used to index cached layouts */
-struct CacheIndex
-{
-	/* These two fields are used to chain the linked list whose
-	 * header is `head' and `tail' in the details structure.
-	 */
-	CacheIndex *next, *previous;
-
-	/* These are the keyed values */
-	NautilusScalableFont *font;
-	int font_size;
-	char *text;
-	int text_length;
-	gboolean wrap;
-	int line_spacing;
-	int max_text_width;
-};
-
-/* FIXME: Make this return the actual memory size, then change maximum_size */
-#define LAYOUT_SIZE(l) 1
-
-#define DEFAULT_MAXIMUM_SIZE 200
-
-/* GtkObjectClass methods */
-static void   nautilus_smooth_text_layout_cache_initialize_class (NautilusSmoothTextLayoutCacheClass  *smooth_text_layout_cache_class);
-static void   nautilus_smooth_text_layout_cache_initialize       (NautilusSmoothTextLayoutCache       *smooth_text_layout_cache);
-static void   nautilus_smooth_text_layout_cache_destroy          (GtkObject                           *object);
-
-
-/* Cache index handling */
-
-/* Allocate a new index structure. TEXT is copied, FONT is ref'd. */
-static CacheIndex *
-cache_index_new (NautilusScalableFont *font, int font_size,
-		 const char *text, int text_length,
-		 gboolean wrap, int line_spacing, int max_text_width)
-{
-	CacheIndex *index;
-
-	index = g_new (CacheIndex, 1);
-	gtk_object_ref (GTK_OBJECT (font));
-	index->font = font;
-	index->font_size = font_size;
-	index->text = g_memdup (text, text_length);
-	index->text_length = text_length;
-	index->wrap = wrap;
-	index->line_spacing = line_spacing;
-	index->max_text_width = max_text_width;
-
-	return index;
-}
-
-static void
-cache_index_free (CacheIndex *index)
-{
-	gtk_object_unref (GTK_OBJECT (index->font));
-	g_free (index->text);
-	g_free (index);
-}
-
-/* Compare two indices */
-static gint
-cache_index_equal (gconstpointer x, gconstpointer y)
-{
-	const CacheIndex *cx, *cy;
-
-	cx = x;
-	cy = y;
-
-	return (cx->font == cy->font
-		&& cx->font_size == cy->font_size
-		&& cx->wrap == cy->wrap
-		&& cx->line_spacing == cy->line_spacing
-		&& cx->max_text_width == cy->max_text_width
-		&& cx->text_length == cy->text_length
-		&& memcmp (cx->text, cy->text, cx->text_length) == 0);
-}
-
-static inline guint
-hash_string (const char *text, int length)
-{
-    guint value;
-    int index;
-
-    /* Use the classic K=33 hash function */
-    value = 0;
-    for (index = 0; index < length; index++) {
-	    value = (value * 33) + *text++;
-    }
-
-    return value;
-}
-
-/* Returns a hash value for the given index */
-static guint
-cache_index_hash (gconstpointer x)
-{
-	const CacheIndex *cx;
-
-	cx = x;
-
-	/* Is this a good hash function? */
-	return cx->font_size + hash_string (cx->text, cx->text_length);
-}
-
-
-/* Cache management */
-
-/* Insert INDEX as the MRU item in CACHE */
-static void
-cache_insert (NautilusSmoothTextLayoutCache *cache, CacheIndex *index)
-{
-	index->next = cache->details->head;
-	index->previous = NULL;
-	if (cache->details->head != NULL) {
-		cache->details->head->previous = index;
-	}
-	cache->details->head = index;
-	if (cache->details->tail == NULL) {
-		cache->details->tail = index;
-	}
-}
-
-/* Unlink INDEX from the list of items in CACHE */
-static void
-cache_remove (NautilusSmoothTextLayoutCache *cache, CacheIndex *index)
-{
-	if (index->next != NULL) {
-		index->next->previous = index->previous;
-	}
-	if (index->previous != NULL) {
-		index->previous->next = index->next;
-	}
-
-	if (cache->details->head == index) {
-		cache->details->head = index->next;
-	}
-	if (cache->details->tail == index) {
-		cache->details->tail = index->previous;
-	}
-
-	index->next = index->previous = NULL;
-}
-
-/* Add the mapping INDEX->LAYOUT into CACHE. Assumes ownership of LAYOUT. */
-static void
-cache_enter (NautilusSmoothTextLayoutCache *cache, CacheIndex *index,
-	     NautilusSmoothTextLayout *layout)
-{
-	g_hash_table_insert (cache->details->table, index, layout);
-	cache_insert (cache, index);
-	cache->details->total_size += LAYOUT_SIZE (layout);
-}
-
-/* Remove the mapping from INDEX from CACHE */
-static void
-cache_evict (NautilusSmoothTextLayoutCache *cache, CacheIndex *index)
-{
-	CacheIndex *key;
-	NautilusSmoothTextLayout *layout;
-
-	if (g_hash_table_lookup_extended (cache->details->table, index, (gpointer) &key, (gpointer) &layout)) {
-		g_hash_table_remove (cache->details->table, key);
-		cache_remove (cache, index);
-		cache_index_free (index);
-		cache->details->total_size -= LAYOUT_SIZE (layout);
-		gtk_object_unref (GTK_OBJECT (layout));
-	} else {
-		g_warning ("index not in layout cache!");
-	}
-}
-
-/* Return the layout associated with the given parameters, or null */
-static NautilusSmoothTextLayout *
-cache_lookup (NautilusSmoothTextLayoutCache *cache,
-	      NautilusScalableFont *font, int font_size,
-	      const char *text, int text_length,
-	      gboolean wrap, int line_spacing, int max_text_width,
-	      CacheIndex **index_ptr)
-{
-	CacheIndex index, *key;
-	NautilusSmoothTextLayout *layout;
-
-	index.font = font;
-	index.font_size = font_size;
-	index.text = (char *) text;
-	index.text_length = text_length;
-	index.wrap = wrap;
-	index.line_spacing = line_spacing;
-	index.max_text_width = max_text_width;
-
-	if (g_hash_table_lookup_extended (cache->details->table, &index, (gpointer) &key, (gpointer) &layout)) {
-		if (index_ptr != NULL) {
-			*index_ptr = key;
-		}
-		return layout;
-	} else {
-		return NULL;
-	}
-}
-
-/* Remove the oldest items from CACHE until it's less than its maximum size */
-static inline void
-cache_trim (NautilusSmoothTextLayoutCache *cache)
-{
-#ifdef TEST
-	int old_size;
-	old_size = cache->details->total_size;
-#endif
-
-	while (cache->details->total_size > cache->details->maximum_size) {
-		g_assert (cache->details->tail != NULL);
-		cache_evict (cache, cache->details->tail);
-	}
-
-#ifdef TEST
-	if (old_size != cache->details->total_size) {
-		g_message ("cache %p: evicted %d entries (%d left)", cache,
-			   old_size - cache->details->total_size,
-			   cache->details->total_size);
-	}
-#endif
-}
-
-
-/* Public entrypoints */
-
-/**
- * nautilus_smooth_text_layout_cache_render:
- * @cache: The layout cache being queried
- * @text: The string to be rendered
- * @text_length: The number of bytes to draw
- * @font: The desired smooth font.
- * @font_size: The pixel size of the font
- * @wrap:
- * @line_spacing:
- * @max_text_width: Requested parameters of the Layout
- *
- * Returns a NautilusSmoothTextLayout. It should be unref'd when
- * finished with; none of the fields may be modified by the caller.
- *
- */
-NautilusSmoothTextLayout *
-nautilus_smooth_text_layout_cache_render (NautilusSmoothTextLayoutCache *cache,
-					  const char *text, int text_length,
-					  NautilusScalableFont *font, int font_size,
-					  gboolean wrap, int line_spacing, int max_text_width)
-{
-	NautilusSmoothTextLayout *layout;
-	CacheIndex *index;
-
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT_CACHE (cache), NULL);
-	g_return_val_if_fail (text != NULL, NULL);
-	g_return_val_if_fail (font != NULL, NULL);
-
-	layout = cache_lookup (cache,
-			       font, font_size,
-			       text, text_length,
-			       wrap, line_spacing, max_text_width,
-			       &index);
-
-	if (layout != NULL) {
-		if (cache->details->head != index) {
-			cache_remove (cache, index);
-			cache_insert (cache, index);
-		}
-#ifdef TEST
-		cache->details->hits++;
-#endif
-	} else {
-		layout = nautilus_smooth_text_layout_new (text, text_length,
-							  font, font_size,
-							  wrap);
-		if (layout == NULL) {
-			return NULL;
-		}
-
-		nautilus_smooth_text_layout_set_line_spacing (layout, line_spacing);
-		nautilus_smooth_text_layout_set_line_wrap_width (layout, max_text_width);
-		cache_trim (cache);
-		
-		index = cache_index_new (font, font_size,
-					 text, text_length,
-					 wrap, line_spacing, max_text_width);
-		cache_enter (cache, index, layout);
-
-#ifdef TEST
-		cache->details->misses++;
-#endif
-	}
-
-	gtk_object_ref (GTK_OBJECT (layout));
-	return layout;
-}
-
-
-/* GtkObject stuff */
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSmoothTextLayoutCache, nautilus_smooth_text_layout_cache, GTK_TYPE_OBJECT)
-
-NautilusSmoothTextLayoutCache *
-nautilus_smooth_text_layout_cache_new (void)
-{
-	NautilusSmoothTextLayoutCache *cache;
-
-	cache = NAUTILUS_SMOOTH_TEXT_LAYOUT_CACHE (gtk_object_new (nautilus_smooth_text_layout_cache_get_type (), NULL));
-	gtk_object_ref (GTK_OBJECT (cache));
-	gtk_object_sink (GTK_OBJECT (cache));
-
-	cache->details->maximum_size = DEFAULT_MAXIMUM_SIZE;
-
-	return cache;
-}
-
-static void
-nautilus_smooth_text_layout_cache_initialize_class (NautilusSmoothTextLayoutCacheClass *smooth_text_layout_cache_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (smooth_text_layout_cache_class);
-	
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_smooth_text_layout_cache_destroy;
-}
-
-static void
-nautilus_smooth_text_layout_cache_initialize (NautilusSmoothTextLayoutCache *smooth_text_layout_cache)
-{
-	smooth_text_layout_cache->details = g_new0 (NautilusSmoothTextLayoutCacheDetails, 1);
-	smooth_text_layout_cache->details->table = g_hash_table_new (cache_index_hash, cache_index_equal);
-}
-
-static void
-free_one_cache_entry (gpointer key, gpointer value, gpointer data)
-{
-	CacheIndex *index;
-	NautilusSmoothTextLayout *layout;
-
-	index = key;
-	layout = value;
-
-	cache_index_free (key);
-	gtk_object_unref (GTK_OBJECT (layout));
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_smooth_text_layout_cache_destroy (GtkObject *object)
-{
- 	NautilusSmoothTextLayoutCache *cache;
-
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT_CACHE (object));
-
-	cache = NAUTILUS_SMOOTH_TEXT_LAYOUT_CACHE (object);
-
-	g_hash_table_foreach (cache->details->table, free_one_cache_entry, NULL);
-	g_hash_table_destroy (cache->details->table);
-
-	g_free (cache->details);
-
-	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-
-/* Test harness
- *
- * The test works as follows:
- *
- * 0. Seed the random number generator with a constant value
- *
- * 1. Construct TOTAL_CASES/2 random test cases. Each has a random
- *    number of lines and a random number of words in each line. All
- *    the other parameters are also generated randomly.
- *
- * 2. In the second half of the test case array, randomly pick an entry
- *    from the first half and randomly change some parameters
- *
- * 3. Iterate TOTAL_TESTS times picking a random string, fetching its
- *    SmoothTextLayout object using both uncaching and caching
- *    functions, comparing the results (compares all fields in the
- *    structures, and their image buffers)
- */
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-#include "nautilus-debug.h"
-#include "nautilus-self-checks.h"
-#include <stdlib.h>
-#include <stdio.h>
-
-static NautilusSmoothTextLayoutCache *test_cache;
-static NautilusScalableFont *test_font;
-
-/* This is every 100th word from my /usr/share/dict/words file */
-static char *test_words[] = {
-	"abler", "absolve", "acceptances", "acculturating",
-	"acquisitions", "adaptors", "adjure", "adrenaline", "Aeolus",
-	"aforesaid", "agitations", "airplane", "Alexandre",
-	"Allentown", "alphabetize", "Amazon", "amortize", "anaphora",
-	"Angles", "annual", "anticipated", "apex", "appertain",
-	"approbation", "archaicness", "aristocracy", "arrests",
-	"ascensions", "assaults", "assurances", "Atlantis", "attire",
-	"aura", "automation", "avouch", "babyhood", "Baffin", "balled",
-	"bankrupting", "Barney", "basket", "Baylor", "beaver",
-	"beforehand", "belies", "beneficiaries", "berths",
-	"bewilderingly", "bilingual", "birdbath", "Blackfoot",
-	"bleacher", "Blomquist", "blushes", "boilerplate",
-	"bookkeeper", "bossed", "bowing", "branching", "breaks",
-	"Bridgewater", "broadcastings", "browsing", "Buenos", "bumps",
-	"Burmese", "butterball", "cabs", "callable", "cancel",
-	"capability", "carbonizes", "carriages", "casts", "cautioner",
-	"centaur", "chalices", "chargeable", "checkbook", "Chicanos",
-	"choir", "chuckles", "circuses", "classes", "cliches",
-	"closing", "coating", "cogitated", "colleges", "comedic",
-	"commonalities", "compensatory", "comprehensibility",
-	"conceptualized", "confectionery", "confusion", "Conrail",
-	"constant", "contemplative", "contribute", "convinces",
-	"coquette", "correspond", "councilwoman", "courtrooms",
-	"cramps", "creditor", "croaks", "crumpled", "cultivable",
-	"curtly", "cytoplasm", "dangle", "Davy", "debtor", "declarer",
-	"deep", "defy", "delirious", "Denebola", "deploy",
-	"descriptively", "destructiveness", "deviation", "diarrhea",
-	"diggings", "Diogenes", "disapprove", "discovery", "disk",
-	"displeasing", "distastes", "diverting", "doghouse", "dopers",
-	"downstairs", "dreamers", "drudgery", "dungeons", "dynamism",
-	"eaves", "educating", "ejecting", "elevation", "emancipate",
-	"emphasizing", "encounter", "Engels", "enriches", "enumerated",
-	"equates", "errs", "Ethernets", "Everglades", "exceeded",
-	"executional", "expect", "explosive", "extract", "facsimile",
-	"Falmouth", "Farrell", "Fayette", "feminism", "fibrously",
-	"filthy", "firming", "flamer", "flew", "floweriness", "folksy",
-	"forefathers", "formatively", "founds", "fray", "Freudianism",
-	"Fruehauf", "furlong", "galaxy", "garlanded", "gearing",
-	"geological", "giggle", "glazed", "Glynn", "Goodyear",
-	"gradual", "grassiest", "greeter", "grooved", "gubernatorial",
-	"guts", "hallmark", "handy", "harmfulness", "Hattie", "Healy",
-	"heights", "heralds", "Heuser", "hindered", "hobby", "homing",
-	"Horace", "housetop", "humorers", "Hyde", "identify",
-	"imagine", "impenetrable", "impotence", "inane",
-	"incompletely", "indescribable", "inductances", "inferior",
-	"ingeniousness", "injured", "insertion", "institutes",
-	"intensification", "interleaved", "interstate", "intubation",
-	"invoked", "irreversibility", "itemizations", "Janus",
-	"Jesuitizing", "Jordan", "Julie", "Kant", "keypad",
-	"Kinnickinnic", "knots", "labyrinths", "landings", "later",
-	"layers", "lectures", "leniency", "Lexington", "lighthearted",
-	"lingerie", "littering", "Lockwood", "looms", "loves",
-	"luring", "Mackey", "maids", "Malone", "Mann", "maritime",
-	"maskable", "matrix", "McDonnell", "medal", "melodies",
-	"mercenariness", "meteoritic", "microprocessing", "milk",
-	"minima", "miserably", "MITREs", "module", "monkeyed", "moped",
-	"motherland", "muck", "mumbles", "mutability", "names",
-	"naughtiness", "negatives", "Neva", "nihilism",
-	"nondeterminism", "north", "novices", "oases", "obstruction",
-	"odious", "oleomargarine", "operate", "orbital", "Orleans",
-	"outburst", "overboard", "oversized", "packaged", "palliative",
-	"parades", "pares", "partitioned", "patients", "payoffs",
-	"Peking", "perceived", "permeating", "perspiration", "phaser",
-	"phyla", "piggybacked", "pipelining", "Plainfield", "playing",
-	"plundered", "police", "pop", "position", "pottery",
-	"preallocated", "predictive", "preposterously", "pretexts",
-	"prior", "procurer", "projections", "properly", "protecting",
-	"proximal", "puffed", "purges", "Pythagoreanizes",
-	"quartering", "quince", "radiography", "rams", "rasping",
-	"reacted", "reasonings", "receives", "recommend", "recursing",
-	"reelects", "reformulated", "regrettable", "rejoiced",
-	"reloader", "rendezvous", "repetitious", "reproducibilities",
-	"resentment", "responded", "retailing", "retype", "revoked",
-	"Richmond", "Riordan", "Roberta", "roofing", "rounding",
-	"ruggedness", "ruthlessness", "sails", "sanatorium", "satires",
-	"Scala", "schemers", "scorner", "scripts", "seat", "seeming",
-	"semipermanently", "sequentially", "severance", "Shanghaied",
-	"Shelley", "shiver", "showed", "sicken", "silent", "sinews",
-	"sixties", "sky", "sleighs", "sluggishness", "smoothing",
-	"snorkel", "sofas", "Somerset", "soured", "sparsely",
-	"speculates", "spirituals", "sportswriter", "squadrons",
-	"stagers", "star", "steadier", "sterilizer", "stirrer",
-	"stouter", "streetcar", "strontium", "Styx", "subprogram",
-	"subtleness", "suffocated", "Sumter", "suppers", "surround",
-	"swat", "swivel", "synonymously", "Taipei", "tapestry",
-	"teaches", "televise", "tenure", "Thailand", "Thessaly",
-	"threatens", "tickles", "tingling", "tolerable", "torrent",
-	"tracked", "transferal", "trapezoidal", "tribunals", "Trotsky",
-	"tuft", "twenty", "umbrage", "unconditional", "undertakings",
-	"ungratefully", "unkindness", "unraveling", "unused", "urge",
-	"vacuumed", "variably", "Venetian", "vested", "vignettes",
-	"visited", "vouching", "Walgreen", "warning", "wavelength",
-	"Weidman", "wharves", "whitens", "wile", "Winsett",
-	"womanhood", "worldliness", "writ", "yelped", "Zionism",
-};
-
-struct test_case {
-	char *string;
-	int font_size;
-	gboolean wrap;
-	int line_spacing;
-	int max_text_width;
-};
-
-#define N_TEST_WORDS (sizeof (test_words) / sizeof (char *))
-
-#define MIN_WORDS_PER_LINE 1
-#define MAX_WORDS_PER_LINE 8
-
-#define MIN_LINES 1
-#define MAX_LINES 10
-
-#define MIN_FONT_SIZE 8
-#define MAX_FONT_SIZE 48
-
-#define MIN_LINE_SPACING 0
-#define MAX_LINE_SPACING 24
-
-#define MIN_MAX_TEXT_WIDTH 50
-#define MAX_MAX_TEXT_WIDTH 512
-
-/* I chose 1 1/2 here so that we get both cache reuse and ejection */
-#define TOTAL_CASES ((DEFAULT_MAXIMUM_SIZE * 3) / 2)
-
-/* I'd prefer to do more than 2, here. But it takes too long */
-#define DEFAULT_TOTAL_TESTS (TOTAL_CASES * 2)
-
-static int
-random_integer (int min, int max)
-{
-	int divisor, limit, value;
-	
-	limit = max - min;
-	divisor = RAND_MAX / limit;
-
-	do {
-		value = random () / divisor;
-	} while (value >= limit);
-
-	return min + value;
-}
-
-static gboolean
-random_boolean (void)
-{
-	return random () > (RAND_MAX / 2);
-}
-
-static inline const char *
-random_word (void)
-{
-	return test_words [random_integer (0, N_TEST_WORDS)];
-}
-
-static char *
-local_stpcpy (char *dst, const char *src)
-{
-	while ((*dst++ = *src++) != 0) {
-	}
-	return dst - 1;
-}
-
-static char *
-make_random_string (void)
-{
-	char *string, *ptr;
-	int x, y;
-	int width, height;
-	const char *words[MAX_LINES][MAX_WORDS_PER_LINE+1];
-        int string_length;
-
-	height = random_integer (MIN_LINES, MAX_LINES);
-	string_length = height;	/* newlines */
-	for (y = 0; y < height; y++) {
-		width = random_integer (MIN_WORDS_PER_LINE,
-					MAX_WORDS_PER_LINE);
-		string_length += width - 1;	/* spaces */
-		for (x = 0; x < width; x++) {
-			words[y][x] = random_word ();
-			string_length += strlen (words[y][x]);
-		}
-		words[y][x] = NULL;
-	}
-
-	string = g_new (gchar, string_length + 1);
-	ptr = string;
-	for (y = 0; y < height; y++) {
-		for (x = 0; words[y][x] != NULL; x++) {
-			if (x != 0) {
-				*ptr++ = ' ';
-			}
-			ptr = local_stpcpy (ptr, words[y][x]);
-		}
-		*ptr++ = '\n';
-	}
-	*ptr = '\0';
-
-	return string;
-}
-
-static void
-make_random_test_case (struct test_case *test)
-{
-	test->string = make_random_string ();
-	test->font_size = random_integer (MIN_FONT_SIZE, MAX_FONT_SIZE);
-	test->wrap = random_boolean ();
-	test->line_spacing = random_integer (MIN_LINE_SPACING,
-					     MAX_LINE_SPACING);
-	test->max_text_width = random_integer (MIN_MAX_TEXT_WIDTH,
-					       MAX_MAX_TEXT_WIDTH);
-}
-
-static void
-randomize_test_case (struct test_case *dest, struct test_case *src)
-{
-	dest->string =  random_boolean () ? g_strdup (src->string) : make_random_string ();
-	dest->font_size = (random_boolean () ? src->font_size
-			   : random_integer (MIN_FONT_SIZE, MAX_FONT_SIZE));
-	dest->wrap = random_boolean ();
-	dest->line_spacing = (random_boolean () ? src->line_spacing
-			      : random_integer (MIN_LINE_SPACING, MAX_LINE_SPACING));
-	dest->max_text_width = (random_boolean () ? src->max_text_width
-				: random_integer (MIN_MAX_TEXT_WIDTH, MAX_MAX_TEXT_WIDTH));
-}
-
-static void
-free_test_case (struct test_case *test)
-{
-	g_free (test->string);
-}
-
-static gboolean
-check_one (struct test_case *test)
-{
-	NautilusSmoothTextLayout *a, *b;
-	gboolean result;
-
-	g_assert (test_cache != NULL);
-	g_assert (test->string != NULL);
-
-	a = nautilus_smooth_text_layout_cache_render (test_cache,
-						      test->string,
-						      strlen (test->string),
-						      test_font,
-						      test->font_size,
-						      test->wrap,
-						      test->line_spacing,
-						      test->max_text_width);
-	g_assert (a != NULL);
-
-	b = nautilus_smooth_text_layout_new (test->string,
-					     strlen (test->string),
-					     test_font,
-					     test->font_size,
-					     test->wrap);
-	g_assert (b != NULL);
-	nautilus_smooth_text_layout_set_line_spacing (b, test->line_spacing);
-	nautilus_smooth_text_layout_set_line_wrap_width (b, test->max_text_width);
-
-	result = nautilus_smooth_text_layout_compare (a, b);
-
-	gtk_object_unref (GTK_OBJECT (a));
-	gtk_object_unref (GTK_OBJECT (b));
-
-	return result;
-}
-
-void
-nautilus_self_check_smooth_text_layout_cache (void)
-{
-	struct test_case cases[TOTAL_CASES];
-	int i, index;
-	int total_tests;
-	char *tem;
-
-	test_cache = nautilus_smooth_text_layout_cache_new ();
-	test_font = nautilus_scalable_font_get_default_font ();
-
-	/* decide how many tests we're going to do.. */
-	tem = getenv ("NAUTILUS_LAYOUT_CACHE_TESTS");
-	if (tem != NULL) {
-		total_tests = strtol (tem, 0, 0);
-		total_tests = MAX (total_tests, DEFAULT_TOTAL_TESTS);
-	} else {
-		total_tests = DEFAULT_TOTAL_TESTS;
-	}
-
-	/* initialize the random number generator to a known state */
-	srandom (1);
-
-	for (i = 0; i < TOTAL_CASES/2; i++) {
-		make_random_test_case (cases + i);
-	}
-	for (; i < TOTAL_CASES; i++) {
-		randomize_test_case (cases + i, cases + (i - TOTAL_CASES / 2));
-	}
-
-	for (i = 0; i < total_tests; i++) {
-		index = random_integer (0, TOTAL_CASES);
-		if (!check_one (cases + index)) {
-			/* hmm.. */
-			fprintf (stderr, "\nNautilusSmoothTextLayoutCache test %d failed\n", i);
-			NAUTILUS_CHECK_BOOLEAN_RESULT (FALSE, TRUE);
-		}
-	}
-
-	for (i = 0; i < TOTAL_CASES; i++) {
-		free_test_case (cases + i);
-	}
-
-	gtk_object_unref (GTK_OBJECT (test_font));
-	gtk_object_unref (GTK_OBJECT (test_cache));
-}
-
-#endif /* NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-smooth-text-layout-cache.h b/libnautilus-private/nautilus-smooth-text-layout-cache.h
deleted file mode 100644
index c9a1c6059..000000000
--- a/libnautilus-private/nautilus-smooth-text-layout-cache.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-smooth-text-layout-cache.h - A GtkObject subclass for efficiently rendering smooth text.
-
-   Copyright (C) 2001 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: John Harper <jsh@eazel.com>
-*/
-
-#ifndef NAUTILUS_SMOOTH_TEXT_LAYOUT_CACHE_H
-#define NAUTILUS_SMOOTH_TEXT_LAYOUT_CACHE_H
-
-#include <gtk/gtkobject.h>
-#include <libgnome/gnome-defs.h>
-#include <libnautilus-extensions/nautilus-smooth-text-layout.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT_CACHE		  (nautilus_smooth_text_layout_cache_get_type ())
-#define NAUTILUS_SMOOTH_TEXT_LAYOUT_CACHE(obj)		  (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT_CACHE, NautilusSmoothTextLayoutCache))
-#define NAUTILUS_SMOOTH_TEXT_LAYOUT_CACHE_CLASS(klass)	  (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT_CACHE, NautilusSmoothTextLayoutCacheClass))
-#define NAUTILUS_IS_SMOOTH_TEXT_LAYOUT_CACHE(obj)	  (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT_CACHE))
-#define NAUTILUS_IS_SMOOTH_TEXT_LAYOUT_CACHE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT_CACHE))
-
-typedef struct NautilusSmoothTextLayoutCache        NautilusSmoothTextLayoutCache;
-typedef struct NautilusSmoothTextLayoutCacheClass   NautilusSmoothTextLayoutCacheClass;
-typedef struct NautilusSmoothTextLayoutCacheDetails NautilusSmoothTextLayoutCacheDetails;
-
-struct NautilusSmoothTextLayoutCache
-{
-	/* Superclass */
-	GtkObject object;
-
-	/* Private things */
-	NautilusSmoothTextLayoutCacheDetails *details;
-};
-
-struct NautilusSmoothTextLayoutCacheClass
-{
-	GtkObjectClass parent_class;
-};
-
-GtkType                           nautilus_smooth_text_layout_cache_get_type (void);
-NautilusSmoothTextLayoutCache    *nautilus_smooth_text_layout_cache_new      (void);
-NautilusSmoothTextLayout	 *nautilus_smooth_text_layout_cache_render   (NautilusSmoothTextLayoutCache *cache,
-									      const char		    *text,
-									      int			     text_length,
-									      NautilusScalableFont	    *font,
-									      int			     font_size,
-									      gboolean			     wrap,
-									      int			     line_spacing,
-									      int			     max_text_width);
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-void				  nautilus_self_check_smooth_text_layout_cache (void);
-#endif /* NAUTILUS_OMIT_SELF_CHECK */
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_SMOOTH_TEXT_LAYOUT_CACHE_H */
diff --git a/libnautilus-private/nautilus-smooth-text-layout.c b/libnautilus-private/nautilus-smooth-text-layout.c
deleted file mode 100644
index 52fcb3dd2..000000000
--- a/libnautilus-private/nautilus-smooth-text-layout.c
+++ /dev/null
@@ -1,1289 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-smooth-text-layout.c - A GtkObject subclass for dealing with smooth text.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-smooth-text-layout.h"
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-gdk-pixbuf-extensions.h"
-#include "nautilus-string.h"
-#include "nautilus-glyph.h"
-#include "nautilus-debug-drawing.h"
-
-#include <libgnome/gnome-i18n.h>
-
-#define MIN_FONT_SIZE 5
-#define DEFAULT_LINE_SPACING 0
-#define DEFAULT_FONT_SIZE 14
-
-#define UNDEFINED_DIMENSION -1
-
-/* This magic string is copied from GtkLabel.  It lives there unlocalized as well. */
-#define DEFAULT_LINE_WRAP_WIDTH_TEXT "This is a good enough length for any line to have."
-
-#define DEFAULT_LINE_BREAK_CHARACTERS _(" -_,;.?/&")
-
-/* Detail member struct */
-struct NautilusSmoothTextLayoutDetails
-{
-	NautilusDimensions dimensions;
-
-	char *text;
-	int text_length;
-
- 	/* Smooth attributes */
- 	NautilusScalableFont *font;
- 	int font_size;
- 	int line_spacing;
- 	int empty_line_height;
-
-	/* Text lines */
-	GList *text_line_list;
-	int max_line_width;
-	int num_empty_lines;
-	int line_wrap_width;
-	int total_line_height;
-	
-	gboolean wrap;
-	char *line_break_characters;
-};
-
-/* GtkObjectClass methods */
-static void   nautilus_smooth_text_layout_initialize_class (NautilusSmoothTextLayoutClass  *smooth_text_layout_class);
-static void   nautilus_smooth_text_layout_initialize       (NautilusSmoothTextLayout       *smooth_text_layout);
-static void   nautilus_smooth_text_layout_destroy          (GtkObject                      *object);
-
-/* Private functions */
-static void   smooth_text_layout_set_text                  (NautilusSmoothTextLayout       *smooth_text_layout,
-							    const char                     *text,
-							    int                             text_length);
-static void   smooth_text_layout_clear_lines               (NautilusSmoothTextLayout       *smooth_text_layout);
-static void   smooth_text_layout_ensure_lines              (const NautilusSmoothTextLayout *smooth_text_layout);
-static int    smooth_text_layout_get_num_empty_lines       (const NautilusSmoothTextLayout *smooth_text_layout);
-static int    smooth_text_layout_get_empty_line_height     (const NautilusSmoothTextLayout *smooth_text_layout);
-static int    smooth_text_layout_get_max_line_width        (const NautilusSmoothTextLayout *smooth_text_layout);
-static int    smooth_text_layout_get_total_line_height     (const NautilusSmoothTextLayout *smooth_text_layout);
-static int    smooth_text_layout_get_line_wrap_width       (const NautilusSmoothTextLayout *smooth_text_layout);
-static GList *smooth_text_layout_line_list_new             (const char                     *text,
-							    int                             text_length,
-							    NautilusScalableFont           *font,
-							    int                             font_size);
-static void   smooth_text_layout_line_list_free            (GList                          *smooth_line_list);
-void          smooth_text_layout_line_list_draw_to_pixbuf  (GList                          *smooth_line_list,
-							    GdkPixbuf                      *pixbuf,
-							    int                             x,
-							    int                             y,
-							    GtkJustification                justification,
-							    gboolean                        underlined,
-							    int                             empty_line_height,
-							    int                             max_line_width,
-							    int                             line_spacing,
-							    guint32                         color,
-							    int                             opacity);
-static GList *smooth_text_layout_line_list_new_wrapped     (const char                     *text,
-							    int                             text_length,
-							    NautilusScalableFont           *font,
-							    int                             font_size,
-							    int                             max_width,
-							    const char                     *line_break_characters);
-
-/*
- * The following text_layout stuff was shamelessly plundered
- * from libgnomeui/gnome-icon-text.[ch] by Federico Mena.
- *
- * It was hacked to use NautilusScalableFont and GdkPixbuf
- * instead of GdkFont and GdkDrawable.  We want to use the
- * same layout algorithm in Nautilus so that both the smooth
- * and not smooth text rendering cases have predictably 
- * similar result.
- *
- * I also made some minor Nautilus-like style changes. -re
-
- */
-typedef struct
-{
-	char *text;
-	int width;
-	guint text_length;
-} NautilusTextLayoutRow;
-
-typedef struct
-{
-	GList *rows;
-	const NautilusScalableFont *font;
-	int font_size;
-	int width;
-	int height;
-	int baseline_skip;
-} NautilusTextLayout;
-
-NautilusTextLayout *nautilus_text_layout_new   (const NautilusScalableFont *font,
-						int                         font_size,
-						const char                 *text,
-						const char                 *separators,
-						int                         max_width,
-						gboolean                    confine);
-void                nautilus_text_layout_free  (NautilusTextLayout         *text_info);
-					    
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSmoothTextLayout, nautilus_smooth_text_layout, GTK_TYPE_OBJECT)
-
-/* Class init methods */
-static void
-nautilus_smooth_text_layout_initialize_class (NautilusSmoothTextLayoutClass *smooth_text_layout_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (smooth_text_layout_class);
-	
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_smooth_text_layout_destroy;
-}
-
-void
-nautilus_smooth_text_layout_initialize (NautilusSmoothTextLayout *smooth_text_layout)
-{
-	smooth_text_layout->details = g_new0 (NautilusSmoothTextLayoutDetails, 1);
-	smooth_text_layout->details->line_break_characters = g_strdup (DEFAULT_LINE_BREAK_CHARACTERS);
-	smooth_text_layout->details->font = nautilus_scalable_font_get_default_font ();
-	smooth_text_layout->details->font_size = DEFAULT_FONT_SIZE;
-	smooth_text_layout->details->line_spacing = DEFAULT_LINE_SPACING;
-	smooth_text_layout_clear_lines (smooth_text_layout);
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_smooth_text_layout_destroy (GtkObject *object)
-{
- 	NautilusSmoothTextLayout *smooth_text_layout;
-
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (object));
-
-	smooth_text_layout = NAUTILUS_SMOOTH_TEXT_LAYOUT (object);
-
-	smooth_text_layout_clear_lines (smooth_text_layout);
-	/* FIXME: it seems like we should unref the font here. */
-	g_free (smooth_text_layout->details->line_break_characters);
-	g_free (smooth_text_layout->details->text);
-
-	g_free (smooth_text_layout->details);
-
-	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-/* Private NautilusSmoothTextLayout functions */
-static void
-smooth_text_layout_clear_lines (NautilusSmoothTextLayout *smooth_text_layout)
-{
-
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-
-	smooth_text_layout_line_list_free (smooth_text_layout->details->text_line_list);
-	smooth_text_layout->details->text_line_list = NULL;
-	smooth_text_layout->details->dimensions.width = UNDEFINED_DIMENSION;
-	smooth_text_layout->details->dimensions.height = UNDEFINED_DIMENSION;
-	smooth_text_layout->details->max_line_width = UNDEFINED_DIMENSION;
-	smooth_text_layout->details->num_empty_lines = UNDEFINED_DIMENSION;
-	smooth_text_layout->details->empty_line_height = UNDEFINED_DIMENSION;
-	smooth_text_layout->details->line_wrap_width = UNDEFINED_DIMENSION;
-	smooth_text_layout->details->total_line_height = UNDEFINED_DIMENSION;
-
-}
-
-static void
-smooth_text_layout_ensure_lines (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-
-	if (smooth_text_layout->details->text_line_list != NULL) {
-		return;
-	}
-	
-	/* We cheat a little here.  Pretend text_line_list or wrap_text_layouts are mutable */
-	if (smooth_text_layout->details->wrap) {
-		smooth_text_layout->details->text_line_list = 
-			smooth_text_layout_line_list_new_wrapped (smooth_text_layout->details->text,
-								  smooth_text_layout->details->text_length,
-								  smooth_text_layout->details->font,
-								  smooth_text_layout->details->font_size,
-								  smooth_text_layout_get_line_wrap_width (smooth_text_layout),
-								  smooth_text_layout->details->line_break_characters);
-	} else {
-		smooth_text_layout->details->text_line_list = 
-			smooth_text_layout_line_list_new (smooth_text_layout->details->text,
-							  smooth_text_layout->details->text_length,
-							  smooth_text_layout->details->font,
-							  smooth_text_layout->details->font_size);
-	}
-}
-
-static GList *
-smooth_text_layout_line_list_new (const char *text,
-				  int text_length,
-				  NautilusScalableFont *font,
-				  int font_size)
-{
-	GList *line_list = NULL;
-	const char *line;
-	const char *end;
-
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), NULL);
-	g_return_val_if_fail (text_length >= 0, NULL);
-	g_return_val_if_fail (font_size >= MIN_FONT_SIZE, NULL);
-
-	end = text + text_length;
-	
-	line = text;
-
-	while (line != NULL && line <= end) {
-		const char *next_line;
-		int length;
-		NautilusGlyph *glyph = NULL;
-
-		next_line = strchr (line, '\n');
-
-		if (next_line != NULL) {
-			length = next_line - line;
-		} else {
-			length = end - line;
-		}
-
-		g_assert (length >= 0);
-
-		if (length > 0) {
-			glyph = nautilus_glyph_new (font, font_size, line, length);
-		}
-
-		line_list = g_list_append (line_list, glyph);
-
-		if (next_line != NULL) {
-			line = next_line + 1;
-		}
-		else {
-			line = NULL;
-		}
-	}
-
-	return line_list;
-}
-
-static void
-smooth_text_layout_line_list_free (GList *smooth_line_list)
-{
-	GList *node;
-
-	node = smooth_line_list;
-	while (node) {
-		if (node->data != NULL) {
-			nautilus_glyph_free (node->data);
-		}
-		node = node->next;
-	}
-
-	g_list_free (smooth_line_list);
-}
-
-void
-smooth_text_layout_line_list_draw_to_pixbuf (GList *text_line_list,
-					     GdkPixbuf *pixbuf,
-					     int x,
-					     int y,
-					     GtkJustification justification,
-					     gboolean underlined,
-					     int empty_line_height,
-					     int max_line_width,
-					     int line_spacing,
-					     guint32 color,
-					     int opacity)
-{
- 	GList *node;
-
-	g_return_if_fail (text_line_list != NULL);
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
-	g_return_if_fail (justification >= GTK_JUSTIFY_LEFT && justification <= GTK_JUSTIFY_FILL);
-	g_return_if_fail (empty_line_height > 0);
-	g_return_if_fail (max_line_width > 0);
-	g_return_if_fail (line_spacing >= 0);
-
-	/* FIXME bugzilla.eazel.com 5087: Make sure the color we are fed is opaque.  The real solution is 
-	 * to fix the callers.
-	 */
-	color = color | 0xFF000000;
-
- 	node = text_line_list;
- 	while (node) {
- 		if (node->data != NULL) {
-			NautilusGlyph *glyph;
-			int text_x = 0;
-			int text_y = 0;
-
-			glyph = node->data;
-
-			g_assert (max_line_width >= nautilus_glyph_get_width (glyph));
-
-			switch (justification) {
-			case GTK_JUSTIFY_LEFT:
-				text_x = x;
-				break;
-				
-			case GTK_JUSTIFY_CENTER:
-			case GTK_JUSTIFY_FILL:
-				text_x = x + (max_line_width - nautilus_glyph_get_width (glyph)) / 2;
-				break;
-
-			case GTK_JUSTIFY_RIGHT:
-				text_x = x + (max_line_width - nautilus_glyph_get_width (glyph));
-				break;
-				
-			default:
-				g_assert_not_reached ();
-				text_x = x;
-			}
-			
-			text_y = y;
-			
-			nautilus_glyph_draw_to_pixbuf (glyph, pixbuf, text_x, text_y, NULL, color, opacity);
-
-			/* Underline the text if needed */
-			if (underlined) {
-				ArtIRect underline_rect;
-
-				nautilus_glyph_get_underline_rectangle (glyph, &underline_rect);
-				underline_rect.y0 += text_y;
-				underline_rect.y1 += text_y;
-				underline_rect.x0 += text_x;
-				underline_rect.x1 += text_x;
-				nautilus_gdk_pixbuf_fill_rectangle_with_color (pixbuf,
-									       &underline_rect,
-									       color);
-			}
-			
-			y += nautilus_glyph_get_height (glyph) + line_spacing;
- 		} else {
-			y += empty_line_height;
-		}
- 		node = node->next;
- 	}
-}
-
-static GList *
-smooth_text_layout_line_list_new_wrapped (const char *text,
-					  int text_length,
-					  NautilusScalableFont *font,
-					  int font_size,
-					  int max_width,
-					  const char *line_break_characters)
-{
-	GList *line_list = NULL;
-	GList *layout_list = NULL;
-	GList *layout_node;
-	const char *line;
-	const char *end;
-
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), NULL);
-	g_return_val_if_fail (text_length >= 0, NULL);
-	g_return_val_if_fail (font_size >= MIN_FONT_SIZE, NULL);
-	g_return_val_if_fail (max_width > 0, NULL);
-	g_return_val_if_fail (line_break_characters != NULL, NULL);
-	g_return_val_if_fail (line_break_characters[0] != '\0', NULL);
-
-	end = text + text_length;
-	line = text;
-
-	while (line != NULL && line <= end) {
-		/* NULL layout means empty line */
-		NautilusTextLayout *layout = NULL;
-		const char *next_line;
-		int length;
-		next_line = strchr (line, '\n');
-
-		if (next_line != NULL) {
-			length = next_line - line;
-		} else {
-			length = end - line;
-		}
-
-		g_assert (length >= 0);
-
-		if (length > 0) {
-			char *null_terminated_line;
-			null_terminated_line = g_strndup (line, length);
-			layout = nautilus_text_layout_new (font,
-							   font_size,
-							   null_terminated_line,
-							   line_break_characters,
-							   max_width,
-							   TRUE);
-			g_free (null_terminated_line);
-		}
-
-		layout_list = g_list_append (layout_list, layout);
-
-		if (next_line != NULL) {
-			line = next_line + 1;
-		}
-		else {
-			line = NULL;
-		}
-	}
-
-	layout_node = layout_list;
-	while (layout_node != NULL) {
-		if (layout_node->data != NULL) {
-			NautilusTextLayout *layout;
-			GList *layout_row_node;
-			g_assert (layout_node->data != NULL);
-			layout = layout_node->data;
-			
-			layout_row_node = layout->rows;
-			while (layout_row_node != NULL) {
-				/* NULL glyph means empty line */				
-				NautilusGlyph *glyph = NULL;
-				
-				if (layout_row_node->data != NULL) {
-					const NautilusTextLayoutRow *row;
-					row = layout_row_node->data;
-					
-					glyph = nautilus_glyph_new (font, font_size, row->text, row->text_length);
-				} else {
-				}
-				
-				line_list = g_list_append (line_list, glyph);
-				
-				layout_row_node = layout_row_node->next;
-			}
-			
-			nautilus_text_layout_free (layout);
-		} else {
-			line_list = g_list_append (line_list, NULL);
-		}
-		layout_node = layout_node->next;
-	}
-	
-	g_list_free (layout_list);
-
-	return line_list;
-}
-
-static int
-smooth_text_layout_get_empty_line_height (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-
-	if (smooth_text_layout->details->empty_line_height == UNDEFINED_DIMENSION) {
-		smooth_text_layout->details->empty_line_height = smooth_text_layout->details->font_size / 2;
-	}
-
-	return smooth_text_layout->details->empty_line_height;
-}
-
-static int
-smooth_text_layout_get_num_empty_lines (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-	
-	if (smooth_text_layout->details->num_empty_lines == UNDEFINED_DIMENSION) {
-		GList *node;
-
-		smooth_text_layout->details->num_empty_lines = 0;
-		node = smooth_text_layout->details->text_line_list;
-		while (node) {
-			if (node->data == NULL) {
-				smooth_text_layout->details->num_empty_lines++;
-			}
-			node = node->next;
-		}
-	}
-
-	return smooth_text_layout->details->num_empty_lines;
-}
-
-static int
-smooth_text_layout_get_max_line_width (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-	
-	if (smooth_text_layout->details->max_line_width == UNDEFINED_DIMENSION) {
-		GList *node;
-
-		smooth_text_layout->details->max_line_width = 0;
-		node = smooth_text_layout->details->text_line_list;
-		while (node) {
-			if (node->data != NULL) {
-				smooth_text_layout->details->max_line_width = MAX (smooth_text_layout->details->max_line_width,
-										   nautilus_glyph_get_width (node->data));
-			}
-			node = node->next;
-		}
-	}
-
-	return smooth_text_layout->details->max_line_width;
-}
-
-static int
-smooth_text_layout_get_total_line_height (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-	
-	if (smooth_text_layout->details->total_line_height == UNDEFINED_DIMENSION) {
-		GList *node;
-
-		smooth_text_layout->details->total_line_height = 0;
-		node = smooth_text_layout->details->text_line_list;
-		while (node) {
-			if (node->data != NULL) {
-				smooth_text_layout->details->total_line_height += 
-					nautilus_glyph_get_height (node->data);
-			} else {
-				smooth_text_layout->details->total_line_height += 
-					smooth_text_layout_get_empty_line_height (smooth_text_layout);
-			}
-
-			node = node->next;
-		}
-	}
-
-	return smooth_text_layout->details->total_line_height;
-}
-
-static int
-smooth_text_layout_get_line_wrap_width (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-	
-	if (smooth_text_layout->details->line_wrap_width == UNDEFINED_DIMENSION) {
-		smooth_text_layout->details->line_wrap_width = 
-			nautilus_scalable_font_text_width (smooth_text_layout->details->font,
-							   smooth_text_layout->details->font_size,
-							   DEFAULT_LINE_WRAP_WIDTH_TEXT,
-							   strlen (DEFAULT_LINE_WRAP_WIDTH_TEXT));
-		
-	}
-
-	return smooth_text_layout->details->line_wrap_width;
-}
-
-/* Public NautilusSmoothTextLayout methods */
-
-/**
- * nautilus_smooth_text_layout_new:
- * @family: The desired smooth_text_layout family.
- * @weight: The desired smooth_text_layout weight.
- * @slant: The desired smooth_text_layout slant.
- * @set_width: The desired smooth_text_layout set_width.
- *
- * Returns a new smooth_text_layout.
- *
- */
-NautilusSmoothTextLayout *
-nautilus_smooth_text_layout_new (const char *text,
-				 int text_length,
-				 NautilusScalableFont *font,
-				 int font_size,
-				 gboolean wrap)
-{
-	NautilusSmoothTextLayout *smooth_text_layout;
-
-	g_return_val_if_fail (NAUTILUS_IS_SCALABLE_FONT (font), NULL);
-	g_return_val_if_fail (font_size >= MIN_FONT_SIZE, NULL);
-
-	smooth_text_layout = NAUTILUS_SMOOTH_TEXT_LAYOUT (gtk_object_new (nautilus_smooth_text_layout_get_type (), NULL));
-	gtk_object_ref (GTK_OBJECT (smooth_text_layout));
-	gtk_object_sink (GTK_OBJECT (smooth_text_layout));
-
-	smooth_text_layout_set_text (smooth_text_layout, text, text_length);
-	nautilus_smooth_text_layout_set_font (smooth_text_layout, font);
-	nautilus_smooth_text_layout_set_font_size (smooth_text_layout, font_size);
-	nautilus_smooth_text_layout_set_wrap (smooth_text_layout, wrap);
-	
-	return smooth_text_layout;
-}
-
-void
-nautilus_smooth_text_layout_draw_to_pixbuf (const NautilusSmoothTextLayout *smooth_text_layout,
-					    GdkPixbuf *destination_pixbuf,
-					    int source_x,
-					    int source_y,
-					    const ArtIRect *destination_area,
-					    GtkJustification justification,
-					    gboolean underlined,
-					    guint32 color,
-					    int opacity)
-{
-	NautilusDimensions dimensions;
-	ArtIRect target;
-	ArtIRect source;
-	int target_width;
-	int target_height;
-	int source_width;
-	int source_height;
-	GdkPixbuf *sub_pixbuf;
-
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (destination_pixbuf));
-	g_return_if_fail (destination_area != NULL);
-	g_return_if_fail (justification >= GTK_JUSTIFY_LEFT && justification <= GTK_JUSTIFY_FILL);
-	g_return_if_fail (!art_irect_empty (destination_area));
-
-	smooth_text_layout_ensure_lines (smooth_text_layout);
-	
-	dimensions = nautilus_smooth_text_layout_get_dimensions (smooth_text_layout);
-
-	g_return_if_fail (source_x >= 0);
-	g_return_if_fail (source_y >= 0);
-	g_return_if_fail (source_x < dimensions.width);
-	g_return_if_fail (source_y < dimensions.height);
-
-	/* Clip the destination area to the pixbuf dimensions; bail if no work */
-	target = nautilus_gdk_pixbuf_intersect (destination_pixbuf, 0, 0, destination_area);
-	if (art_irect_empty (&target)) {
- 		return;
- 	}
-
-	/* Assign the source area */
-	nautilus_art_irect_assign (&source,
-				   source_x,
-				   source_y,
-				   dimensions.width - source_x,
-				   dimensions.height - source_y);
-
-	/* Adjust the target width if the source area is smaller than the
-	 * source pixbuf dimensions */
-	target_width = target.x1 - target.x0;
-	target_height = target.y1 - target.y0;
-	source_width = source.x1 - source.x0;
-	source_height = source.y1 - source.y0;
-
-	target.x1 = target.x0 + MIN (target_width, source_width);
-	target.y1 = target.y0 + MIN (target_height, source_height);
-
-	/* Use a sub area pixbuf for simplicity */
-	sub_pixbuf = nautilus_gdk_pixbuf_new_from_pixbuf_sub_area (destination_pixbuf, &target);
-
-	smooth_text_layout_line_list_draw_to_pixbuf (smooth_text_layout->details->text_line_list,
-						     sub_pixbuf,
-						     -source_x,
-						     -source_y,
-						     justification,
-						     underlined,
-						     smooth_text_layout_get_empty_line_height (smooth_text_layout),
-						     smooth_text_layout_get_max_line_width (smooth_text_layout),
-						     smooth_text_layout->details->line_spacing,
-						     color,
-						     opacity);
-
-	gdk_pixbuf_unref (sub_pixbuf);
-}
-
-void
-nautilus_smooth_text_layout_draw_to_pixbuf_shadow (const NautilusSmoothTextLayout *smooth_text_layout,
-						   GdkPixbuf *destination_pixbuf,
-						   int source_x,
-						   int source_y,
-						   const ArtIRect *destination_area,
-						   int shadow_offset,
-						   GtkJustification justification,
-						   gboolean underlined,
-						   guint32 color,
-						   guint32 shadow_color,
-						   int opacity)
-{
-	NautilusDimensions dimensions;
-	ArtIRect target;
-	ArtIRect source;
-	int target_width;
-	int target_height;
-	int source_width;
-	int source_height;
-	GdkPixbuf *sub_pixbuf;
-
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (destination_pixbuf));
-	g_return_if_fail (destination_area != NULL);
-	g_return_if_fail (shadow_offset > 0);
-	g_return_if_fail (justification >= GTK_JUSTIFY_LEFT && justification <= GTK_JUSTIFY_FILL);
-	g_return_if_fail (!art_irect_empty (destination_area));
-
-	smooth_text_layout_ensure_lines (smooth_text_layout);
-	
-	dimensions = nautilus_smooth_text_layout_get_dimensions (smooth_text_layout);
-	dimensions.width += shadow_offset;
-	dimensions.height += shadow_offset;
-
-	g_return_if_fail (source_x >= 0);
-	g_return_if_fail (source_y >= 0);
-	g_return_if_fail (source_x < dimensions.width);
-	g_return_if_fail (source_y < dimensions.height);
-
-	/* Clip the destination area to the pixbuf dimensions; bail if no work */
-	target = nautilus_gdk_pixbuf_intersect (destination_pixbuf, 0, 0, destination_area);
-	if (art_irect_empty (&target)) {
- 		return;
- 	}
-
-	/* Assign the source area */
-	nautilus_art_irect_assign (&source,
-				   source_x,
-				   source_y,
-				   dimensions.width - source_x,
-				   dimensions.height - source_y);
-
-	/* Adjust the target width if the source area is smaller than the
-	 * source pixbuf dimensions */
-	target_width = target.x1 - target.x0;
-	target_height = target.y1 - target.y0;
-	source_width = source.x1 - source.x0;
-	source_height = source.y1 - source.y0;
-
-	target.x1 = target.x0 + MIN (target_width, source_width);
-	target.y1 = target.y0 + MIN (target_height, source_height);
-
-	/* Use a sub area pixbuf for simplicity */
-	sub_pixbuf = nautilus_gdk_pixbuf_new_from_pixbuf_sub_area (destination_pixbuf, &target);
-
-	/* Draw the shadow text */
-	smooth_text_layout_line_list_draw_to_pixbuf (smooth_text_layout->details->text_line_list,
-						     sub_pixbuf,
-						     -source_x + shadow_offset,
-						     -source_y + shadow_offset,
-						     justification,
-						     underlined,
-						     smooth_text_layout_get_empty_line_height (smooth_text_layout),
-						     smooth_text_layout_get_max_line_width (smooth_text_layout),
-						     smooth_text_layout->details->line_spacing,
-						     shadow_color,
-						     opacity);
-
-	/* Draw the text */
-	smooth_text_layout_line_list_draw_to_pixbuf (smooth_text_layout->details->text_line_list,
-						     sub_pixbuf,
-						     -source_x,
-						     -source_y,
-						     justification,
-						     underlined,
-						     smooth_text_layout_get_empty_line_height (smooth_text_layout),
-						     smooth_text_layout_get_max_line_width (smooth_text_layout),
-						     smooth_text_layout->details->line_spacing,
-						     color,
-						     opacity);
-
-	gdk_pixbuf_unref (sub_pixbuf);
-}
-
-NautilusDimensions
-nautilus_smooth_text_layout_get_dimensions (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), NAUTILUS_DIMENSIONS_EMPTY);
-
-	smooth_text_layout_ensure_lines (smooth_text_layout);
-
-	if (smooth_text_layout->details->dimensions.width == UNDEFINED_DIMENSION) {
-		const int max_line_width = smooth_text_layout_get_max_line_width (smooth_text_layout);
-		const int num_lines = g_list_length (smooth_text_layout->details->text_line_list);
-		const int num_empty_lines = smooth_text_layout_get_num_empty_lines (smooth_text_layout);
-		const int total_line_height = smooth_text_layout_get_total_line_height (smooth_text_layout);
-
-		g_assert (num_lines >= 0);
-		g_assert (num_empty_lines >= 0);
-		g_assert (num_lines >= num_empty_lines);
-		
-		smooth_text_layout->details->dimensions.width = max_line_width;
-		smooth_text_layout->details->dimensions.height = total_line_height;
-		
-		if (num_lines > 1) {
-			smooth_text_layout->details->dimensions.height += 
-				(num_lines - 1) * smooth_text_layout->details->line_spacing;
-		}
-	}
-
-	return smooth_text_layout->details->dimensions;
-}
-
-int
-nautilus_smooth_text_layout_get_width (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	NautilusDimensions dimensions;
-
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-
-	dimensions = nautilus_smooth_text_layout_get_dimensions (smooth_text_layout);
-
-	return dimensions.width;
-}
-
-int
-nautilus_smooth_text_layout_get_height (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	NautilusDimensions dimensions;
-
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-
-	dimensions = nautilus_smooth_text_layout_get_dimensions (smooth_text_layout);
-
-	return dimensions.height;
-}
-
-void
-nautilus_smooth_text_layout_set_wrap (NautilusSmoothTextLayout *smooth_text_layout,
-				      gboolean wrap)
-{
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-
-	if (smooth_text_layout->details->wrap == wrap) {
-		return;
-	}
-
-	smooth_text_layout_clear_lines (smooth_text_layout);
-	smooth_text_layout->details->wrap = wrap;
-}
-
-gboolean
-nautilus_smooth_text_layout_get_wrap (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), FALSE);
-
-	return smooth_text_layout->details->wrap;
-}
-
-void
-nautilus_smooth_text_layout_set_font (NautilusSmoothTextLayout *smooth_text_layout,
-				      NautilusScalableFont *font)
-{
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-	g_return_if_fail (NAUTILUS_IS_SCALABLE_FONT (font));
-
-	if (smooth_text_layout->details->font == font) {
-		return;
-	}
-
-	smooth_text_layout_clear_lines (smooth_text_layout);
-	gtk_object_unref (GTK_OBJECT (smooth_text_layout->details->font));
-	gtk_object_ref (GTK_OBJECT (font));
-	smooth_text_layout->details->font = font;
-}
-
-NautilusScalableFont *
-nautilus_smooth_text_layout_get_font (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), NULL);
-
-	gtk_object_ref (GTK_OBJECT (smooth_text_layout->details->font));
-	return smooth_text_layout->details->font;
-}
-
-void
-nautilus_smooth_text_layout_set_font_size (NautilusSmoothTextLayout *smooth_text_layout,
-					   int font_size)
-{
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-	g_return_if_fail (font_size >= MIN_FONT_SIZE);
-
-	if (smooth_text_layout->details->font_size == font_size) {
-		return;
-	}
-	
-	smooth_text_layout_clear_lines (smooth_text_layout);
-	smooth_text_layout->details->font_size = font_size;
-}
-
-int
-nautilus_smooth_text_layout_get_font_size (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-
-	return smooth_text_layout->details->font_size;
-}
-
-void
-nautilus_smooth_text_layout_set_line_spacing (NautilusSmoothTextLayout *smooth_text_layout,
-					      int line_spacing)
-{
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-	
-	if (smooth_text_layout->details->line_spacing == line_spacing) {
-		return;
-	}
-	
-	smooth_text_layout_clear_lines (smooth_text_layout);
-	smooth_text_layout->details->line_spacing = line_spacing;
-}
-
-int
-nautilus_smooth_text_layout_get_line_spacing (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-
-	return smooth_text_layout->details->line_spacing;
-}
-
-void
-nautilus_smooth_text_layout_set_empty_line_height (NautilusSmoothTextLayout *smooth_text_layout,
-						   int empty_line_height)
-{
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-	
-	if (smooth_text_layout->details->empty_line_height == empty_line_height) {
-		return;
-	}
-	
-	smooth_text_layout_clear_lines (smooth_text_layout);
-	smooth_text_layout->details->empty_line_height = empty_line_height;
-}
-
-int
-nautilus_smooth_text_layout_get_empty_line_height (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), 0);
-
-	return smooth_text_layout->details->empty_line_height;
-}
-
-static void
-smooth_text_layout_set_text (NautilusSmoothTextLayout *smooth_text_layout,
-			     const char *text,
-			     int text_length)
-{
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-
-	if (smooth_text_layout->details->text == text
-	    && smooth_text_layout->details->text_length == text_length) {
-		return;
-	}
-	
-	smooth_text_layout_clear_lines (smooth_text_layout);
-	g_free (smooth_text_layout->details->text);
-	smooth_text_layout->details->text = g_strdup (text);
-	smooth_text_layout->details->text_length = text_length;
-}
-
-void
-nautilus_smooth_text_layout_set_line_break_characters (NautilusSmoothTextLayout *smooth_text_layout,
-						       const char *line_break_characters)
-{
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-	g_return_if_fail (nautilus_strlen (line_break_characters) > 0);
-
-	if (nautilus_str_is_equal (smooth_text_layout->details->line_break_characters, line_break_characters)) {
-		return;
-	}
-
-	smooth_text_layout_clear_lines (smooth_text_layout);
-	g_free (smooth_text_layout->details->line_break_characters);
-	smooth_text_layout->details->line_break_characters = g_strdup (line_break_characters);
-}
-
-char *
-nautilus_smooth_text_layout_get_line_break_characters (const NautilusSmoothTextLayout *smooth_text_layout)
-{
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout), FALSE);
-
-	return g_strdup (smooth_text_layout->details->text);
-}
-
-void
-nautilus_smooth_text_layout_set_line_wrap_width (NautilusSmoothTextLayout *smooth_text_layout,
-						 int line_wrap_width)
-{
-	g_return_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (smooth_text_layout));
-
-	if (smooth_text_layout->details->line_wrap_width == line_wrap_width) {
-		return;
-	}
-
-	smooth_text_layout_clear_lines (smooth_text_layout);
-	smooth_text_layout->details->line_wrap_width = line_wrap_width;
-}
-
-/*
- * The following text_layout stuff was shamelessly plundered
- * from libgnomeui/gnome-icon-text.[ch] by Federico Mena.
- *
- * It was hacked to use NautilusScalableFont and GdkPixbuf
- * instead of GdkFont and GdkDrawable.  We want to use the
- * same layout algorithm in Nautilus so that both the smooth
- * and not smooth text rendering cases have predictably 
- * similar result.
- *
- * I also made some minor Nautilus-like style changes. -re
- *
- */
-static void
-text_layout_free_row (gpointer data,
-		      gpointer user_data)
-{
-	NautilusTextLayoutRow *row;
-
-	if (data) {
-		row = data;
-		g_free (row->text);
-		g_free (row);
-	}
-}
-
-/**
- * nautilus_text_layout_free:
- * @ti: An icon text info structure.
- *
- * Frees a &NautilusTextLayout structure.  You should call this instead of
- * freeing the structure yourself.
- */
-void
-nautilus_text_layout_free (NautilusTextLayout *text_layout)
-{
-	g_list_foreach (text_layout->rows, text_layout_free_row, NULL);
-	g_list_free (text_layout->rows);
-	g_free (text_layout);
-}
-
-/**
- * nautilus_text_layout_new:
- * @font:       Name of the font that will be used to render the text.
- * @text:       Text to be formatted.
- * @separators: Separators used for word wrapping, can be NULL.
- * @max_width:  Width in pixels to be used for word wrapping.
- * @confine:    Whether it is mandatory to wrap at @max_width.
- *
- * Creates a new &NautilusTextLayout structure by wrapping the specified
- * text.  If non-NULL, the @separators argument defines a set of characters
- * to be used as word delimiters for performing word wrapping.  If it is
- * NULL, then only spaces will be used as word delimiters.
- *
- * The @max_width argument is used to specify the width at which word
- * wrapping will be performed.  If there is a very long word that does not
- * fit in a single line, the @confine argument can be used to specify
- * whether the word should be unconditionally split to fit or whether
- * the maximum width should be increased as necessary.
- *
- * Return value: A newly-created &NautilusTextLayout structure.
- */
-NautilusTextLayout *
-nautilus_text_layout_new (const NautilusScalableFont *font,
-			  int font_size,
-			  const char *text,
-			  const char *separators,
-			  int max_width,
-			  gboolean confine)
-{
-	NautilusTextLayout *text_layout;
-	NautilusTextLayoutRow *row;
-	const char *row_end;
-	const char *s, *word_start, *word_end, *old_word_end;
-	char *sub_text;
-	int i, w_len;
-	int w;
-	const char *text_iter;
-	int text_len, separators_len;
-
-	g_return_val_if_fail (font != NULL, NULL);
-	g_return_val_if_fail (font_size > 0, NULL);
-	g_return_val_if_fail (text != NULL, NULL);
-	g_return_val_if_fail (nautilus_strlen (text) > 0, NULL);
-
-	if (!separators)
-		separators = " ";
-
-	text_len = strlen (text);
-
-	separators_len = strlen (separators);
-
-	text_layout = g_new0 (NautilusTextLayout, 1);
-
-	text_layout->rows = NULL;
-	text_layout->font = font;
-	text_layout->font_size = font_size;
-	text_layout->width = 0;
-	text_layout->height = 0;
-	text_layout->baseline_skip = font_size;
-
-	word_end = NULL;
-
-	text_iter = text;
-	while (*text_iter) {
-		for (row_end = text_iter; *row_end != 0 && *row_end != '\n'; row_end++);
-
-		/* Accumulate words from this row until they don't fit in the max_width */
-
-		s = text_iter;
-
-		while (s < row_end) {
-			word_start = s;
-			old_word_end = word_end;
-			for (word_end = word_start; *word_end; word_end++) {
-				const char *p;
-				for (p = separators; *p; p++) {
-					if (*word_end == *p)
-						goto found;
-				}
-			}
-		found:
-			if (word_end < row_end)
-				word_end++;
-
-			if (nautilus_scalable_font_text_width (font, font_size, text_iter, word_end - text_iter) > max_width) {
-				if (word_start == text_iter) {
-					if (confine) {
-						/* We must force-split the word.  Look for a proper
-                                                 * place to do it.
-						 */
-
-						w_len = word_end - word_start;
-						
-						for (i = 1; i < w_len; i++) {
-							w = nautilus_scalable_font_text_width (font, font_size, word_start, i);
-							if (w > max_width) {
-								if (i == 1)
-									/* Shit, not even a single character fits */
-									max_width = w;
-								else
-									break;
-							}
-						}
-
-						/* Create sub-row with the chars that fit */
-
-						sub_text = g_strndup (word_start, i - 1);
-						
-						row = g_new0 (NautilusTextLayoutRow, 1);
-						row->text = sub_text;
-						row->text_length = i - 1;
-						row->width = nautilus_scalable_font_text_width (font, font_size, 
-												sub_text, 
-												strlen (sub_text));
-
-						text_layout->rows = g_list_append (text_layout->rows, row);
-
-						if (row->width > text_layout->width)
-							text_layout->width = row->width;
-
-						text_layout->height += text_layout->baseline_skip;
-
-						/* Bump the text pointer */
-
-						text_iter += i - 1;
-						s = text_iter;
-
-						continue;
-					} else
-						max_width = nautilus_scalable_font_text_width (font, font_size, word_start, word_end - word_start);
-
-					continue; /* Retry split */
-				} else {
-					word_end = old_word_end; /* Restore to region that does fit */
-					break; /* Stop the loop because we found something that doesn't fit */
-				}
-			}
-
-			s = word_end;
-		}
-
-		/* Append row */
-
-		if (text_iter == row_end) {
-			/* We are on a newline, so append an empty row */
-
-			text_layout->rows = g_list_append (text_layout->rows, NULL);
-			text_layout->height += text_layout->baseline_skip / 2;
-
-			/* Next! */
-
-			text_iter = row_end + 1;
-		} else {
-			/* Create subrow and append it to the list */
-
-			int sub_len;
-			sub_len = word_end - text_iter;
-
-			sub_text = g_strndup (text_iter, sub_len);
-
-			row = g_new0 (NautilusTextLayoutRow, 1);
-			row->text = sub_text;
-			row->text_length = sub_len;
-			row->width = nautilus_scalable_font_text_width (font, font_size, sub_text, sub_len);
-
-			text_layout->rows = g_list_append (text_layout->rows, row);
-
-			if (row->width > text_layout->width)
-				text_layout->width = row->width;
-
-			text_layout->height += text_layout->baseline_skip;
-
-			/* Next! */
-
-			text_iter = word_end;
-		}
-	}
-
-	return text_layout;
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-gboolean
-nautilus_smooth_text_layout_compare (NautilusSmoothTextLayout *x,
-				     NautilusSmoothTextLayout *y)
-{
-	GList *xp, *yp;
-
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (x), FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_SMOOTH_TEXT_LAYOUT (y), FALSE);
-
-	/* Compare simple things */
-	if (x->details->dimensions.width != y->details->dimensions.width
-	    || x->details->dimensions.height != y->details->dimensions.height
-	    || x->details->text_length != y->details->text_length
-	    || memcmp (x->details->text, y->details->text, x->details->text_length) != 0
-	    || x->details->font != y->details->font
-	    || x->details->font_size != y->details->font_size
-	    || x->details->line_spacing != y->details->line_spacing
-	    || x->details->empty_line_height != y->details->empty_line_height
-	    || x->details->max_line_width != y->details->max_line_width
-	    || x->details->num_empty_lines != y->details->num_empty_lines
-	    || x->details->line_wrap_width != y->details->line_wrap_width
-	    || x->details->total_line_height != y->details->total_line_height
-	    || x->details->wrap != y->details->wrap
-	    || strcmp (x->details->line_break_characters, y->details->line_break_characters) != 0) {
-		return FALSE;
-	}
-
-	/* Compare glyphs */
-	smooth_text_layout_ensure_lines (x);
-	smooth_text_layout_ensure_lines (y);
-	for (xp = x->details->text_line_list, yp = y->details->text_line_list;
-	     xp != NULL && yp != NULL;
-	     xp = xp->next, yp = yp->next) {
-		if ((xp->data == NULL) != (yp->data == NULL)) {
-			return FALSE;
-		}
-		if (xp->data != NULL
-		    && !nautilus_glyph_compare (xp->data, yp->data)) {
-			return FALSE;
-		}
-	}
-	if (xp != NULL || yp != NULL) {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-#endif /* NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-smooth-text-layout.h b/libnautilus-private/nautilus-smooth-text-layout.h
deleted file mode 100644
index 147f5398d..000000000
--- a/libnautilus-private/nautilus-smooth-text-layout.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-smooth-text-layout.h - A GtkObject subclass for dealing with smooth text.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_SMOOTH_TEXT_LAYOUT_H
-#define NAUTILUS_SMOOTH_TEXT_LAYOUT_H
-
-#include <gtk/gtkobject.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome/gnome-defs.h>
-#include <libnautilus-extensions/nautilus-art-extensions.h>
-#include <libnautilus-extensions/nautilus-scalable-font.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT		(nautilus_smooth_text_layout_get_type ())
-#define NAUTILUS_SMOOTH_TEXT_LAYOUT(obj)		(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT, NautilusSmoothTextLayout))
-#define NAUTILUS_SMOOTH_TEXT_LAYOUT_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT, NautilusSmoothTextLayoutClass))
-#define NAUTILUS_IS_SMOOTH_TEXT_LAYOUT(obj)		(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT))
-#define NAUTILUS_IS_SMOOTH_TEXT_LAYOUT_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_SMOOTH_TEXT_LAYOUT))
-
-typedef struct NautilusSmoothTextLayout        NautilusSmoothTextLayout;
-typedef struct NautilusSmoothTextLayoutClass   NautilusSmoothTextLayoutClass;
-typedef struct NautilusSmoothTextLayoutDetails NautilusSmoothTextLayoutDetails;
-
-struct NautilusSmoothTextLayout
-{
-	/* Superclass */
-	GtkObject object;
-
-	/* Private things */
-	NautilusSmoothTextLayoutDetails *details;
-};
-
-struct NautilusSmoothTextLayoutClass
-{
-	GtkObjectClass parent_class;
-};
-
-GtkType                           nautilus_smooth_text_layout_get_type                  (void);
-NautilusSmoothTextLayout  *       nautilus_smooth_text_layout_new                       (const char                     *text,
-											 int                             text_length,
-											 NautilusScalableFont           *font,
-											 int                             font_size,
-											 gboolean                        wrap);
-NautilusDimensions                nautilus_smooth_text_layout_get_dimensions            (const NautilusSmoothTextLayout *smooth_text_layout);
-void                              nautilus_smooth_text_layout_set_line_wrap_width       (NautilusSmoothTextLayout       *smooth_text_layout,
-											 int                             line_wrap_width);
-int                               nautilus_smooth_text_layout_get_width                 (const NautilusSmoothTextLayout *smooth_text_layout);
-int                               nautilus_smooth_text_layout_get_height                (const NautilusSmoothTextLayout *smooth_text_layout);
-void                              nautilus_smooth_text_layout_set_wrap                  (NautilusSmoothTextLayout       *smooth_text_layout,
-											 gboolean                        wrap);
-gboolean                          nautilus_smooth_text_layout_get_wrap                  (const NautilusSmoothTextLayout *smooth_text_layout);
-void                              nautilus_smooth_text_layout_set_line_break_characters (NautilusSmoothTextLayout       *smooth_text_layout,
-											 const char                     *line_break_characters);
-char *                            nautilus_smooth_text_layout_get_line_break_characters (const NautilusSmoothTextLayout *smooth_text_layout);
-void                              nautilus_smooth_text_layout_set_font                  (NautilusSmoothTextLayout       *smooth_text_layout,
-											 NautilusScalableFont           *font);
-NautilusScalableFont             *nautilus_smooth_text_layout_get_font                  (const NautilusSmoothTextLayout *smooth_text_layout);
-void                              nautilus_smooth_text_layout_set_font_size             (NautilusSmoothTextLayout       *smooth_text_layout,
-											 int                             font_size);
-int                               nautilus_smooth_text_layout_get_font_size             (const NautilusSmoothTextLayout *smooth_text_layout);
-void                              nautilus_smooth_text_layout_set_line_spacing          (NautilusSmoothTextLayout       *smooth_text_layout,
-											 int                             line_spacing);
-int                               nautilus_smooth_text_layout_get_line_spacing          (const NautilusSmoothTextLayout *smooth_text_layout);
-void                              nautilus_smooth_text_layout_set_empty_line_height     (NautilusSmoothTextLayout       *smooth_text_layout,
-											 int                             empty_line_height);
-int                               nautilus_smooth_text_layout_get_empty_line_height     (const NautilusSmoothTextLayout *smooth_text_layout);
-void                              nautilus_smooth_text_layout_draw_to_pixbuf            (const NautilusSmoothTextLayout *smooth_text_layout,
-											 GdkPixbuf                      *destination_pixbuf,
-											 int                             source_x,
-											 int                             source_y,
-											 const ArtIRect                 *destination_area,
-											 GtkJustification                justification,
-											 gboolean                        underlined,
-											 guint32                         color,
-											 int                             opacity);
-void                              nautilus_smooth_text_layout_draw_to_pixbuf_shadow     (const NautilusSmoothTextLayout *smooth_text_layout,
-											 GdkPixbuf                      *destination_pixbuf,
-											 int                             source_x,
-											 int                             source_y,
-											 const ArtIRect                 *destination_area,
-											 int                             shadow_offset,
-											 GtkJustification                justification,
-											 gboolean                        underlined,
-											 guint32                         color,
-											 guint32                         shadow_color,
-											 int                             opacity);
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-gboolean 			  nautilus_smooth_text_layout_compare			(NautilusSmoothTextLayout	*x,
-											 NautilusSmoothTextLayout	*y);
-#endif /* NAUTILUS_OMIT_SELF_CHECK */
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_SMOOTH_TEXT_LAYOUT_H */
-
-
diff --git a/libnautilus-private/nautilus-smooth-widget.c b/libnautilus-private/nautilus-smooth-widget.c
deleted file mode 100644
index 75ba2c20b..000000000
--- a/libnautilus-private/nautilus-smooth-widget.c
+++ /dev/null
@@ -1,983 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-smooth-widget.c - Functions and types shared by smooth widgets.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-smooth-widget.h"
-#include "nautilus-gdk-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-
-#include <gtk/gtksignal.h>
-
-static NautilusArtIPoint smooth_widget_get_tile_origin_point              (const GtkWidget                   *widget,
-									   NautilusSmoothTileMode             tile_mode_vertical,
-									   NautilusSmoothTileMode             tile_mode_horizontal);
-static void              smooth_widget_paint_tile_opaque                  (GtkWidget                         *widget,
-									   GdkGC                             *gc,
-									   const GdkPixbuf                   *tile_pixbuf,
-									   const ArtIRect                    *tile_bounds,
-									   const NautilusArtIPoint           *tile_origin,
-									   const ArtIRect                    *dirty_area);
-static void              smooth_widget_paint_tile_transparent             (GtkWidget                         *widget,
-									   GdkGC                             *gc,
-									   NautilusSmoothBackgroundMode       background_mode,
-									   guint32                            solid_background_color,
-									   const GdkPixbuf                   *tile_pixbuf,
-									   const ArtIRect                    *tile_bounds,
-									   int                                tile_opacity,
-									   const NautilusArtIPoint           *tile_origin,
-									   const ArtIRect                    *dirty_area);
-static void              smooth_widget_paint_content_opaque               (GtkWidget                         *widget,
-									   GdkGC                             *gc,
-									   const ArtIRect                    *content_bounds,
-									   const ArtIRect                    *dirty_area,
-									   NautilusSmoothPaintOpaqueCallback  paint_callback,
-									   gpointer                           callback_data);
-static void              smooth_widget_paint_content_transparent          (GtkWidget                         *widget,
-									   GdkGC                             *gc,
-									   NautilusSmoothBackgroundMode       background_mode,
-									   guint32                            solid_background_color,
-									   const ArtIRect                    *content_bounds,
-									   int                                content_opacity,
-									   const ArtIRect                    *dirty_area,
-									   NautilusSmoothCompositeCallback    composite_callback,
-									   gpointer                           callback_data);
-static void              smooth_widget_paint_tile_and_content_transparent (GtkWidget                         *widget,
-									   GdkGC                             *gc,
-									   NautilusSmoothBackgroundMode       background_mode,
-									   guint32                            solid_background_color,
-									   const GdkPixbuf                   *tile_pixbuf,
-									   const ArtIRect                    *tile_bounds,
-									   int                                tile_opacity,
-									   const NautilusArtIPoint           *tile_origin,
-									   const ArtIRect                    *content_bounds,
-									   int                                content_opacity,
-									   const ArtIRect                    *dirty_area,
-									   NautilusSmoothCompositeCallback    composite_callback,
-									   gpointer                           callback_data);
-
-/* We maintain a global list of smooth widgets.  The smoothness of all these
- * widgets can then be changed with nautilus_smooth_widget_global_set_is_smooth().
- *
- * We do this so that labels and images will repect the "smooth_graphics"
- * automatically without any intervention from the users of these two widgets.
- */
-static GList *smooth_widget_list = NULL;
-
-/* We maintain a global list of types that can be smooth widgets.
- * We do this mostly for type safety - to make sure smooth operations only
- * happen on smooth widgets.
- */
-static GList *smooth_widget_type_list = NULL;
-
-static void
-smooth_widget_type_list_free (void)
-{
-	g_list_free (smooth_widget_type_list);
-	smooth_widget_type_list = NULL;
-}
-
-static void
-smooth_widget_list_free (void)
-{
-	g_list_free (smooth_widget_list);
-	smooth_widget_list = NULL;
-}
-
-static gboolean
-widget_is_smooth (const GtkWidget *widget)
-{
-	GList *node;
-
-	for (node = smooth_widget_type_list; node ; node = node->next) {
-		GtkType type;
-
-		type = GPOINTER_TO_INT (node->data);
-
-		if (GTK_CHECK_TYPE ((widget), type)) {
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-static void
-smooth_widget_set_is_smooth (GtkWidget *widget, gboolean is_smooth)
-{
-	g_return_if_fail (widget_is_smooth (widget));
-
-	gtk_signal_emit_by_name (GTK_OBJECT (widget), "set_is_smooth", is_smooth);
-}
-
-static void
-smooth_widget_destroy (GtkWidget *widget, gpointer callback_data)
-{
-	g_return_if_fail (widget_is_smooth (widget));
-
-	smooth_widget_list = g_list_remove (smooth_widget_list, widget);
-}
-
-static gboolean global_is_smooth = TRUE;
-
-void
-nautilus_smooth_widget_global_set_is_smooth (gboolean is_smooth)
-{
-	GList *node;
-
-	global_is_smooth = is_smooth;
-
-	for (node = smooth_widget_list; node != NULL; node = node->next) {
-		smooth_widget_set_is_smooth (GTK_WIDGET (node->data), global_is_smooth);
-	}
-}
-
-/**
- * nautilus_smooth_widget_register:
- * @widget: A smooth widget.
- *
- * Register a smooth widget.  For the life time of the widget, its 
- * 'is_smooth' attribute will be toggled when 
- * nautilus_smooth_widget_global_set_is_smooth() is called.
- */
-void
-nautilus_smooth_widget_register (GtkWidget *widget)
-{
-	g_return_if_fail (widget_is_smooth (widget));
-
-	smooth_widget_set_is_smooth (widget, global_is_smooth);
-
-	if (smooth_widget_list == NULL) {
-		g_atexit (smooth_widget_list_free);
-	}
-
-	smooth_widget_list = g_list_prepend (smooth_widget_list, widget);
-
-	/* Keep track of the widget's destruction so we can purge it */
-	gtk_signal_connect (GTK_OBJECT (widget),
-			    "destroy",
-			    GTK_SIGNAL_FUNC (smooth_widget_destroy),
-			    NULL);
-}
-
-/* Return the origin point for the widget given vertical
- * and horizontal tile modes.
- */
-static NautilusArtIPoint
-smooth_widget_get_tile_origin_point (const GtkWidget *widget,
-				     NautilusSmoothTileMode tile_mode_vertical,
-				     NautilusSmoothTileMode tile_mode_horizontal)
-
-{
-	NautilusArtIPoint origin_point;
-
-	g_return_val_if_fail (widget_is_smooth (widget), NAUTILUS_ART_IPOINT_ZERO);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NAUTILUS_ART_IPOINT_ZERO);
-	g_return_val_if_fail (tile_mode_vertical >= NAUTILUS_SMOOTH_TILE_SELF, NAUTILUS_ART_IPOINT_ZERO);
-	g_return_val_if_fail (tile_mode_vertical <= NAUTILUS_SMOOTH_TILE_ANCESTOR, NAUTILUS_ART_IPOINT_ZERO);
-	g_return_val_if_fail (tile_mode_horizontal >= NAUTILUS_SMOOTH_TILE_SELF, NAUTILUS_ART_IPOINT_ZERO);
-	g_return_val_if_fail (tile_mode_horizontal <= NAUTILUS_SMOOTH_TILE_ANCESTOR, NAUTILUS_ART_IPOINT_ZERO);
-
-	origin_point = NAUTILUS_ART_IPOINT_ZERO;
-
-	/* Using '0' for the ancestor origin works because our buddy GTK+ 
-	 * already makes our allocation.{x,y} the collected offsets of all
-	 * our ancestors.
-	 *
-	 * It might be more correct to make this the allocation.{x,y} of the
-	 * ancestor windowed widget - maybe.
-	 */
-	switch (tile_mode_vertical) {
-	case NAUTILUS_SMOOTH_TILE_SELF:
-		origin_point.y = widget->allocation.y;
-		break;
-
-	case NAUTILUS_SMOOTH_TILE_ANCESTOR:
-		origin_point.y = 0;
-		break;
-	}
-
-	switch (tile_mode_horizontal) {
-	case NAUTILUS_SMOOTH_TILE_SELF:
-		origin_point.x = widget->allocation.x;
-		break;
-
-	case NAUTILUS_SMOOTH_TILE_ANCESTOR:
-		origin_point.x = 0;
-		break;
-	}
-
-	return origin_point;
-}
-
-/* Return an area of the smooth widget's Gtk background as a pixbuf.
- * The resulting pixbuf needs to be unrefed when done using it.
- */
-static GdkPixbuf *
-smooth_widget_get_gtk_background (GtkWidget *widget, 
-				  const ArtIRect *area)
-{
-	GdkPixbuf *background;
-	int width;
-	int height;
-	
-	g_return_val_if_fail (widget_is_smooth (widget), NULL);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
-	g_return_val_if_fail (area != NULL && !art_irect_empty (area), NULL);
-
-	width = nautilus_art_irect_get_width (area);
-	height = nautilus_art_irect_get_height (area);
-	
-	background = nautilus_gdk_pixbuf_get_from_window_safe (widget->window,
-							       area->x0,
-							       area->y0,
-							       width,
-							       height);
-	if (background == NULL) {
-		ArtIRect fill_area;
-
-		background = nautilus_gdk_pixbuf_get_global_buffer (width, height);
-		nautilus_art_irect_assign (&fill_area, 0, 0, width, height);
-		nautilus_gdk_pixbuf_fill_rectangle_with_color (background,
-							       &fill_area,
-							       NAUTILUS_RGB_COLOR_WHITE);
-		gdk_pixbuf_ref (background);
-	} else {
-		g_assert (gdk_pixbuf_get_width (background) == width);
-		g_assert (gdk_pixbuf_get_height (background) == height);
-	}
-
-	return background;
-}
-
-/* Return an area of the smooth widget's background as a pixbuf.
- * The resulting pixbuf needs to be unrefed when done using it.
- */
-static GdkPixbuf *
-smooth_widget_get_background (GtkWidget *widget,
-			      const ArtIRect *area,
-			      NautilusSmoothBackgroundMode background_mode,
-			      guint32 solid_background_color)
-{
-	GdkPixbuf *buffer;
-	
-	g_return_val_if_fail (widget_is_smooth (widget), NULL);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
-	g_return_val_if_fail (area != NULL && !art_irect_empty (area), NULL);
-	g_return_val_if_fail (background_mode >= NAUTILUS_SMOOTH_BACKGROUND_GTK, NULL);
-	g_return_val_if_fail (background_mode <= NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR, NULL);
-
-	if (background_mode == NAUTILUS_SMOOTH_BACKGROUND_GTK) {
-		buffer = smooth_widget_get_gtk_background (widget, area);
-	} else {
-		buffer = nautilus_gdk_pixbuf_get_global_buffer (nautilus_art_irect_get_width (area),
-								nautilus_art_irect_get_height (area));
-
-		if (background_mode == NAUTILUS_SMOOTH_BACKGROUND_CALLBACK) {
-			gtk_signal_emit_by_name (GTK_OBJECT (widget),
-						 "draw_background",
-						 buffer,
-						 area);
-		} else {
-			nautilus_gdk_pixbuf_fill_rectangle_with_color (buffer,
-								       NULL,
-								       solid_background_color);
-		}
-
-		gdk_pixbuf_ref (buffer);
-	}
- 	g_return_val_if_fail (nautilus_gdk_pixbuf_is_valid (buffer), NULL);
-
-	return buffer;
-}
-
-/* Paint the smooth widget's tile in opaque mode */
-static void
-smooth_widget_paint_tile_opaque (GtkWidget *widget,
-				 GdkGC *gc,
-				 const GdkPixbuf *tile_pixbuf,
-				 const ArtIRect *tile_bounds,
-				 const NautilusArtIPoint *tile_origin,
-				 const ArtIRect *dirty_area)
-{
- 	ArtIRect tile_dirty_area;
-	
-	g_return_if_fail (widget_is_smooth (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (widget->window != NULL);
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (tile_pixbuf));
-	g_return_if_fail (tile_bounds != NULL && !art_irect_empty (tile_bounds));
-	g_return_if_fail (tile_origin != NULL);
-	g_return_if_fail (dirty_area != NULL && !art_irect_empty (dirty_area));
-	
-	/* Clip the tile to the dirty area */
-	art_irect_intersect (&tile_dirty_area, tile_bounds, dirty_area);
-	
-	/* Nothing to do */
- 	if (art_irect_empty (&tile_dirty_area)) {
- 		return;
- 	}
-
-	/* Tile the drawable. */
-	nautilus_gdk_pixbuf_draw_to_drawable_tiled (tile_pixbuf,
-						    widget->window,
-						    gc,
-						    &tile_dirty_area,
-						    gdk_pixbuf_get_width (tile_pixbuf),
-						    gdk_pixbuf_get_height (tile_pixbuf),
-						    tile_origin->x,
-						    tile_origin->y,
-						    GDK_RGB_DITHER_NONE,
-						    GDK_PIXBUF_ALPHA_BILEVEL,
-						    NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
-}
-
-/* Paint the smooth widget's tile in transparent alpha composited mode */
-static void
-smooth_widget_paint_tile_transparent (GtkWidget *widget,
-				      GdkGC *gc,
-				      NautilusSmoothBackgroundMode background_mode,
-				      guint32 solid_background_color,
-				      const GdkPixbuf *tile_pixbuf,
-				      const ArtIRect *tile_bounds,
-				      int tile_opacity,
-				      const NautilusArtIPoint *tile_origin,
-				      const ArtIRect *dirty_area)
-{
-	NautilusDimensions buffer_dimensions;
- 	ArtIRect tile_dirty_area;
-	ArtIRect tile_area;
-	GdkPixbuf *buffer;
-
-	g_return_if_fail (widget_is_smooth (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (gc != NULL);
-	g_return_if_fail (background_mode >= NAUTILUS_SMOOTH_BACKGROUND_GTK);
-	g_return_if_fail (background_mode <= NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	g_return_if_fail (tile_opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (tile_opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (tile_pixbuf));
-	g_return_if_fail (tile_bounds != NULL && !art_irect_empty (tile_bounds));
-	g_return_if_fail (tile_origin != NULL);
-	g_return_if_fail (dirty_area != NULL && !art_irect_empty (dirty_area));
-	
-	art_irect_intersect (&tile_dirty_area, tile_bounds, dirty_area);
-	
-	/* Nothing to do */
- 	if (art_irect_empty (&tile_dirty_area)) {
- 		return;
- 	}
-
-	buffer = smooth_widget_get_background (widget,
-					       &tile_dirty_area,
-					       background_mode,
-					       solid_background_color);
-
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (buffer));
-	
-	buffer_dimensions = nautilus_gdk_pixbuf_get_dimensions (buffer);
-	
-	nautilus_art_irect_assign (&tile_area, 0, 0, buffer_dimensions.width, buffer_dimensions.height);
-
-	/* Composite the tile into the buffer */	
-	nautilus_gdk_pixbuf_draw_to_pixbuf_tiled (tile_pixbuf,
-						  buffer,
-						  &tile_area,
-						  gdk_pixbuf_get_width (tile_pixbuf),
-						  gdk_pixbuf_get_height (tile_pixbuf),
-						  tile_origin->x - tile_dirty_area.x0,
-						  tile_origin->y - tile_dirty_area.y0,
-						  tile_opacity,
-						  GDK_INTERP_NEAREST);
-	
-	nautilus_gdk_pixbuf_draw_to_drawable (buffer,
-					      widget->window,
-					      gc,
-					      0,
-					      0,
-					      &tile_dirty_area,
-					      GDK_RGB_DITHER_NONE,
-					      GDK_PIXBUF_ALPHA_BILEVEL,
-					      NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
-	
-	gdk_pixbuf_unref (buffer);
-}
-
-/* Paint the smooth widget's content in opaque mode */
-static void
-smooth_widget_paint_content_opaque (GtkWidget *widget,
-				    GdkGC *gc,
-				    const ArtIRect *content_bounds,
-				    const ArtIRect *dirty_area,
-				    NautilusSmoothPaintOpaqueCallback paint_callback,
-				    gpointer callback_data)
-{
-	ArtIRect content_dirty_area;
-
-	g_return_if_fail (widget_is_smooth (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (gc != NULL);
-	g_return_if_fail (content_bounds != NULL && !art_irect_empty (content_bounds));
-	g_return_if_fail (dirty_area != NULL && !art_irect_empty (dirty_area));
-	g_return_if_fail (paint_callback != NULL);
-
-	/* Clip the content to the dirty area */
-	art_irect_intersect (&content_dirty_area, content_bounds, dirty_area);
-	
-	/* No work to do */
-	if (art_irect_empty (&content_dirty_area)) {
-		return;
-	}
-
-	/* Draw content to screen */
-	(* paint_callback) (widget,
-			    widget->window,
-			    gc,
-			    content_dirty_area.x0 - content_bounds->x0,
-			    content_dirty_area.y0 - content_bounds->y0,
-			    &content_dirty_area,
-			    callback_data);
-}
-
-/* Paint the smooth widget's content in transparent alpha composited mode */
-static void
-smooth_widget_paint_content_transparent (GtkWidget *widget,
-					 GdkGC *gc,
-					 NautilusSmoothBackgroundMode background_mode,
-					 guint32 solid_background_color,
-					 const ArtIRect *content_bounds,
-					 int content_opacity,
-					 const ArtIRect *dirty_area,
-					 NautilusSmoothCompositeCallback composite_callback,
-					 gpointer callback_data)
-{
-	ArtIRect content_dirty_area;
-	ArtIRect composite_area;
-	GdkPixbuf *buffer;
-
-	g_return_if_fail (widget_is_smooth (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (gc != NULL);
-	g_return_if_fail (background_mode >= NAUTILUS_SMOOTH_BACKGROUND_GTK);
-	g_return_if_fail (background_mode <= NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	g_return_if_fail (content_opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (content_opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-	g_return_if_fail (content_bounds != NULL && !art_irect_empty (content_bounds));
-	g_return_if_fail (dirty_area != NULL && !art_irect_empty (dirty_area));
-	g_return_if_fail (composite_callback != NULL);
-
-	art_irect_intersect (&content_dirty_area, content_bounds, dirty_area);
-
-	if (art_irect_empty (&content_dirty_area)) {
-		return;
-	}
-
-	buffer = smooth_widget_get_background (widget,
-					       &content_dirty_area,
-					       background_mode,
-					       solid_background_color);
-
- 	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (buffer));
-
-	nautilus_art_irect_assign (&composite_area,
-				   0,
-				   0,
-				   nautilus_art_irect_get_width (&content_dirty_area),
-				   nautilus_art_irect_get_height (&content_dirty_area));
-
-	/* Composite the content into the buffer */
-	(* composite_callback) (widget,
-				buffer,
-				content_dirty_area.x0 - content_bounds->x0,
-				content_dirty_area.y0 - content_bounds->y0,
-				&composite_area,
-				content_opacity,
-				callback_data);
-	
-	/* Draw the composited buffer to the screen */
-	nautilus_gdk_pixbuf_draw_to_drawable (buffer,
-					      widget->window,
-					      gc,
-					      0,
-					      0,
-					      &content_dirty_area,
-					      GDK_RGB_DITHER_NONE,
-					      GDK_PIXBUF_ALPHA_BILEVEL,
-					      NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
-
-	gdk_pixbuf_unref (buffer);
-}
-
-/* Paint both the smooth widget's tile and content in transparent alpha
- * composited mode. */
-static void
-smooth_widget_paint_tile_and_content_transparent (GtkWidget *widget,
-						  GdkGC *gc,
-						  NautilusSmoothBackgroundMode background_mode,
-						  guint32 solid_background_color,
-						  const GdkPixbuf *tile_pixbuf,
-						  const ArtIRect *tile_bounds,
-						  int tile_opacity,
-						  const NautilusArtIPoint *tile_origin,
-						  const ArtIRect *content_bounds,
-						  int content_opacity,
-						  const ArtIRect *dirty_area,
-						  NautilusSmoothCompositeCallback composite_callback,
-						  gpointer callback_data)
-{
- 	ArtIRect tile_dirty_area;
- 	ArtIRect content_dirty_area;
- 	ArtIRect tile_and_content_intersection;
- 	ArtIRect tile_and_content_union;
-
-	g_return_if_fail (widget_is_smooth (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (gc != NULL);
-	g_return_if_fail (background_mode >= NAUTILUS_SMOOTH_BACKGROUND_GTK);
-	g_return_if_fail (background_mode <= NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	g_return_if_fail (tile_opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (tile_opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (tile_pixbuf));
-	g_return_if_fail (tile_bounds != NULL && !art_irect_empty (tile_bounds));
-	g_return_if_fail (tile_origin != NULL);
-	g_return_if_fail (content_opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (content_opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-	g_return_if_fail (content_bounds != NULL && !art_irect_empty (content_bounds));
-	g_return_if_fail (dirty_area != NULL && !art_irect_empty (dirty_area));
-	g_return_if_fail (composite_callback != NULL);
-
-	art_irect_intersect (&tile_dirty_area, tile_bounds, dirty_area);
-	art_irect_intersect (&content_dirty_area, content_bounds, dirty_area);
-
-	/* Both empty, do nothing */
- 	if (art_irect_empty (&tile_dirty_area) && art_irect_empty (&content_dirty_area)) {
- 		return;
- 	}
-
-	/* Only the pixbuf is dirty */
- 	if (art_irect_empty (&tile_dirty_area) && !art_irect_empty (&content_dirty_area)) {
-		smooth_widget_paint_content_transparent (widget,
-							 gc,
-							 background_mode,
-							 solid_background_color,
-							 content_bounds,
-							 content_opacity,
-							 &content_dirty_area,
-							 composite_callback,
-							 NULL);
- 		return;
- 	}
-
-	/* Only the tile is dirty */
- 	if (!art_irect_empty (&tile_dirty_area) && art_irect_empty (&content_dirty_area)) {
-		smooth_widget_paint_tile_transparent (widget,
-						      gc,
-						      background_mode,
-						      solid_background_color,
-						      tile_pixbuf,
-						      tile_bounds,
-						      tile_opacity,
-						      tile_origin,
-						      &tile_dirty_area);
-		return;
- 	}
-
-	art_irect_intersect (&tile_and_content_intersection, &tile_dirty_area, &content_dirty_area);
-
-	/* Both dirty without overlaping each other */
-	if (art_irect_empty (&tile_and_content_intersection)) {
-		smooth_widget_paint_tile_transparent (widget,
-						      gc,
-						      background_mode,
-						      solid_background_color,
-						      tile_pixbuf,
-						      tile_bounds,
-						      tile_opacity,
-						      tile_origin,
-						      &tile_dirty_area);
-		
-		smooth_widget_paint_content_transparent (widget,
-							 gc,
-							 background_mode,
-							 solid_background_color,
-							 content_bounds,
-							 content_opacity,
-							 &content_dirty_area,
-							 composite_callback,
-							 NULL);
-		return;
-	}
-
-	/* Both dirty overlaping each other.  We use the union of the
-	 * two rectangles even though its not the most efficient way.
-	 */
-	art_irect_union (&tile_and_content_union, &tile_dirty_area, &content_dirty_area);
-	
-	if (!art_irect_empty (&tile_and_content_union)) {
-		GdkPixbuf *buffer;
-		ArtIRect tile_area;
-		ArtIRect composite_area;
-		
-		buffer = smooth_widget_get_background (widget,
-						       &tile_and_content_union,
-						       background_mode,
-						       solid_background_color);
-		g_return_if_fail (nautilus_gdk_pixbuf_is_valid (buffer));
-		
-		nautilus_art_irect_assign (&tile_area,
-					   tile_dirty_area.x0 - tile_and_content_union.x0,
-					   tile_dirty_area.y0 - tile_and_content_union.y0,
-					   nautilus_art_irect_get_width (&tile_dirty_area),
-					   nautilus_art_irect_get_height (&tile_dirty_area));
-		
-		/* Composite the tile into the buffer */
-		nautilus_gdk_pixbuf_draw_to_pixbuf_tiled (tile_pixbuf,
-							  buffer,
-							  &tile_area,
-							  gdk_pixbuf_get_width (tile_pixbuf),
-							  gdk_pixbuf_get_height (tile_pixbuf),
- 							  tile_origin->x - tile_and_content_union.x0,
- 							  tile_origin->y - tile_and_content_union.y0,
-							  tile_opacity,
-							  GDK_INTERP_NEAREST);
-
-		nautilus_art_irect_assign (&composite_area,
-					   content_dirty_area.x0 - tile_dirty_area.x0,
-					   content_dirty_area.y0 - tile_dirty_area.y0,
-					   nautilus_art_irect_get_width (&content_dirty_area),
-					   nautilus_art_irect_get_height (&content_dirty_area));
-
-		/* Composite the content into the buffer */
-		(* composite_callback) (widget,
-					buffer,
-					content_dirty_area.x0 - content_bounds->x0,
-					content_dirty_area.y0 - content_bounds->y0,
-					&composite_area,
-					content_opacity,
-					callback_data);
-
-		/* Draw the composited buffer to the screen */
-		nautilus_gdk_pixbuf_draw_to_drawable (buffer,
-						      widget->window,
-						      gc,
-						      0,
-						      0,
-						      &tile_and_content_union,
-						      GDK_RGB_DITHER_NONE,
-						      GDK_PIXBUF_ALPHA_BILEVEL,
-						      NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
-
-		gdk_pixbuf_unref (buffer);
-	}
-}
-
-/**
- * nautilus_smooth_widget_paint:
- * @widget: A smooth widget.
- * @gc: GdkGC to use for copy area.
- * @is_smooth: Is the widget smooth ?
- * @background_mode: Background mode.
- * @solid_background_color: Background color for the case when
- * background_mode is NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR.
- * @tile_pixbuf: Pixbuf to use for tiling or NULL.
- * @tile_bounds: The bounds of the tile or NAUTILUS_ART_IRECT_EMPTY.
- * @tile_opacity: The opacity for the tile when is_smooth is TRUE.
- * @tile_mode_vertical: The vertical tiliing mode.
- * @tile_mode_horizontal: The horizontal tiliing mode.
- * @content_bounds: The bounds of the content or NAUTILUS_ART_IRECT_EMPTY.
- * @content_opacity: The opacity for the content when is_smooth is TRUE.
- * @dirty_area: The dirty area, usually from expose_event().
- * @paint_callback: Content painting callback for when is_smooth is FALSE.
- * @composite_callback: Content compositing callback for when is_smooth is TRUE.
- * @callback_data: Data passed to the callbacks.
- *
- * Paint a smooth widget.  If the 'is_smooth' flag is TRUE, then all painting
- * will be done using alpha compositions.  In this mode the tile_opacity
- * and pixbuf_opacity are honored.  This mode is significantly slower.
- *
- * If the 'is_smooth' flag is FALSE, then all painting will be done
- * using simple copy_area operations.  This is mode is very fast
- * but doesnt look as good.  In this mode, the tile_opacity and
- * pixbuf_opacity are ignored.
- *
- * Also, when 'is_smooth' is TRUE, the 'background_mode' has a huge effect
- * on the performance of this function.  Here we list the 3 background modes
- * in order of SLOWEST to FASTEST:
- *
- * NAUTILUS_SMOOTH_BACKGROUND_GTK:
- *   Use the background as painted by Gtk.  This includes arbitrarily complex
- *   gradients, images and solid colors.  Using this mode will ensure that
- *   the content you are painting is smoothly displayed on top of anything
- *   that is rendered by Gtk.  Unfortunately, for this mode to work a lot
- *   of information needs to be transfered back and forth to the X server.
- *   That means it is very slow.  If you "know" what the contents of the 
- *   surface you are painting on, use on of the other two modes.
- *
- * NAUTILUS_SMOOTH_BACKGROUND_CALLBACK:
- *   Use a callback to draw the background.  This makes is possible to use 
- *   already existing background rendering code.  For example, Nautilus 
- *   uses a NautilusBackground object that can be used as a callback client
- *   for this mode.  The callback is implemented as a widget signal.  The
- *   signature of the callback is 'NautilusSmoothWidgetDrawBackground'.
- *
- * NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR:
- *   Use a solid color for the background.  This is the fastest mode.  It also
- *   has the benefit that since the background is always known, the content
- *   you are rendering can be cached.
- *
- * If a tile_pixbuf is given, then it is rendered according to the value of
- * 'tile_mode_vertical' and 'tile_mode_horizontal'   Here we list the 2
- * valid tiling modes:
- *
- * The 'paint_callback' is invoked when not it smooth mode.
- * The 'composite_callback' is invoked when in smooth mode.
- */
-void
-nautilus_smooth_widget_paint (GtkWidget *widget,
-			      GdkGC *gc,
-			      gboolean is_smooth,
-			      NautilusSmoothBackgroundMode background_mode,
-			      guint32 solid_background_color,
-			      const GdkPixbuf *tile_pixbuf,
-			      const ArtIRect *tile_bounds,
-			      int tile_opacity,
-			      NautilusSmoothTileMode tile_mode_vertical,
-			      NautilusSmoothTileMode tile_mode_horizontal,
-			      const ArtIRect *content_bounds,
-			      int content_opacity,
-			      const ArtIRect *dirty_area,
-			      NautilusSmoothPaintOpaqueCallback paint_callback,
-			      NautilusSmoothCompositeCallback composite_callback,
-			      gpointer callback_data)
-{
-	gboolean tile_empty;
-	gboolean content_empty;
-	NautilusArtIPoint tile_origin;
-
-	g_return_if_fail (widget_is_smooth (widget));
-	g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-	g_return_if_fail (gc != NULL);
-	g_return_if_fail (background_mode >= NAUTILUS_SMOOTH_BACKGROUND_GTK);
-	g_return_if_fail (background_mode <= NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	g_return_if_fail (tile_opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (tile_opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-	g_return_if_fail (tile_bounds != NULL);
-	g_return_if_fail (tile_mode_vertical >= NAUTILUS_SMOOTH_TILE_SELF);
-	g_return_if_fail (tile_mode_vertical <= NAUTILUS_SMOOTH_TILE_ANCESTOR);
-	g_return_if_fail (tile_mode_horizontal >= NAUTILUS_SMOOTH_TILE_SELF);
-	g_return_if_fail (tile_mode_horizontal <= NAUTILUS_SMOOTH_TILE_ANCESTOR);
-	g_return_if_fail (content_opacity >= NAUTILUS_OPACITY_FULLY_TRANSPARENT);
-	g_return_if_fail (content_opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
-	g_return_if_fail (content_bounds != NULL);
-	g_return_if_fail (dirty_area != NULL && !art_irect_empty (dirty_area));
-	g_return_if_fail (paint_callback != NULL);
-	g_return_if_fail (composite_callback != NULL);
-	
-	tile_empty = art_irect_empty (tile_bounds);
-	content_empty = art_irect_empty (content_bounds);
-
-	tile_origin = smooth_widget_get_tile_origin_point (widget,
-							   tile_mode_vertical,
-							   tile_mode_horizontal);
-
-	/* Smooth */
-	if (is_smooth) {
-		if (!content_empty && !tile_empty) {
-			smooth_widget_paint_tile_and_content_transparent (widget,
-									  gc,
-									  background_mode,
-									  solid_background_color,
-									  tile_pixbuf,
-									  tile_bounds,
-									  tile_opacity,
-									  &tile_origin,
-									  content_bounds,
-									  content_opacity,
-									  dirty_area,
-									  composite_callback,
-									  callback_data);
-			
-		} else if (!content_empty) {
-			smooth_widget_paint_content_transparent (widget,
-								 gc,
-								 background_mode,
-								 solid_background_color,
-								 content_bounds,
-								 content_opacity,
-								 dirty_area,
-								 composite_callback,
-								 callback_data);
-		} else {
-			smooth_widget_paint_tile_transparent (widget,
-							      gc,
-							      background_mode,
-							      solid_background_color,
-							      tile_pixbuf,
-							      tile_bounds,
-							      tile_opacity,
-							      &tile_origin,
-							      dirty_area);
-		}
-	/* Not smooth */
-	} else {
-		/* Draw the tile if needed */
-		if (!tile_empty) {
-			smooth_widget_paint_tile_opaque (widget,
-							 gc,
-							 tile_pixbuf,
-							 tile_bounds,
-							 &tile_origin,
-							 dirty_area);
-		}
-		
-		/* Drae the content if needed */
-		if (!content_empty) {
-			smooth_widget_paint_content_opaque (widget,
-							    gc,
-							    content_bounds,
-							    dirty_area,
-							    paint_callback,
-							    callback_data);
-		}
-	}
-}
-
-/**
- * nautilus_smooth_widget_get_tile_bounds:
- * @widget: A smooth widget.
- * @tile_pixbuf: The tile pixbuf.
- * @tile_width: The tile width.
- * @tile_height: The tile height.
- *
- * Return the bounds for the smooth widget's tile.  
- *
- * tile_width controls the horizontal extent of the tile.
- *
- * tile_height controls the vertical extent of the tile.
- *
- * tile_width/tile_height can be integer values greater than
- * zero.  We also allow two special values:
- *
- * NAUTILUS_SMOOTH_TILE_EXTENT_FULL:
- *   Tile occupies the full extent available either horizontall (tile_width)
- *   or vertically (tile_height).  This basically mean that the tile occupies
- *   the full 'GtkWidget allocation'
- *
- * NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP:
- *   Tile occupies a single tile step.  A tile step is equal to the width and
- *   height of the tile pixbuf for the horizontal and veritcal cases 
- *   respectively.
- *
- */
-ArtIRect
-nautilus_smooth_widget_get_tile_bounds (const GtkWidget *widget,
-					const GdkPixbuf *tile_pixbuf,
-					int tile_width,
-					int tile_height)
-{
-	ArtIRect bounds;
-	ArtIRect tile_bounds;
-	ArtIRect clipped_tile_bounds;
-
-	g_return_val_if_fail (widget_is_smooth (widget), NAUTILUS_ART_IRECT_EMPTY);
-	g_return_val_if_fail (tile_width >= NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP, NAUTILUS_ART_IRECT_EMPTY);
-	g_return_val_if_fail (tile_height >= NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP, NAUTILUS_ART_IRECT_EMPTY);
-
-	if (tile_pixbuf == NULL) {
-		return NAUTILUS_ART_IRECT_EMPTY;
-	}
-
-	tile_bounds.x0 = widget->allocation.x;
-	tile_bounds.y0 = widget->allocation.y;
-	
-	if (tile_width == NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP) {
-		tile_bounds.x1 = tile_bounds.x0 + gdk_pixbuf_get_width (tile_pixbuf);
-	} else if (tile_width == NAUTILUS_SMOOTH_TILE_EXTENT_FULL) {
-		tile_bounds.x1 = tile_bounds.x0 + widget->allocation.width;
-	} else {
-		tile_bounds.x1 = tile_bounds.x0 + tile_width;
-	}
-
-	if (tile_height == NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP) {
-		tile_bounds.y1 = tile_bounds.y0 + gdk_pixbuf_get_height (tile_pixbuf);
-	} else if (tile_height == NAUTILUS_SMOOTH_TILE_EXTENT_FULL) {
-		tile_bounds.y1 = tile_bounds.y0 + widget->allocation.height;
-	} else {
-		tile_bounds.y1 = tile_bounds.y0 + tile_height;
-	}
-
-	/* Clip the tile bounds to the widget bounds */
-	bounds = nautilus_gtk_widget_get_bounds (widget);
-	art_irect_intersect (&clipped_tile_bounds, &tile_bounds, &bounds);
-
-	return tile_bounds;
-}
-
-NautilusDimensions
-nautilus_smooth_widget_get_preferred_dimensions (const GtkWidget *widget,
-						 const NautilusDimensions *content_dimensions,
-						 const NautilusDimensions *tile_dimensions,
-						 int tile_width,
-						 int tile_height)
-{
-	NautilusDimensions preferred_dimensions;
-
-	g_return_val_if_fail (widget_is_smooth (widget), NAUTILUS_DIMENSIONS_EMPTY);
-	g_return_val_if_fail (content_dimensions != NULL, NAUTILUS_DIMENSIONS_EMPTY);
-	g_return_val_if_fail (tile_dimensions != NULL, NAUTILUS_DIMENSIONS_EMPTY);
-	g_return_val_if_fail (tile_width >= NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP, NAUTILUS_DIMENSIONS_EMPTY);
-	g_return_val_if_fail (tile_height >= NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP, NAUTILUS_DIMENSIONS_EMPTY);
-	
-	if (tile_width == NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP) {
-		tile_width = tile_dimensions->width;
-	} else {
-		tile_width = 0;
-	}
-
-	if (tile_height == NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP) {
-		tile_height = tile_dimensions->height;
-	} else {
-		tile_height = 0;
-	}
-	
-	preferred_dimensions.width = MAX (content_dimensions->width, tile_width) + (2 * GTK_MISC (widget)->xpad);
-	preferred_dimensions.height = MAX (content_dimensions->height, tile_height) + (2 * GTK_MISC (widget)->ypad);
-
-	/* Make sure the dimensions is not zero.  Gtk goes berserk with zero size widget */
-	preferred_dimensions.width = MAX (preferred_dimensions.width, 2);
-	preferred_dimensions.height = MAX (preferred_dimensions.height, 2);
-
-	return preferred_dimensions;
-}
-
-void
-nautilus_smooth_widget_register_type (GtkType type)
-{
-	if (smooth_widget_type_list == NULL) {
-		g_atexit (smooth_widget_type_list_free);
-	}
-
-	smooth_widget_type_list = g_list_append (smooth_widget_type_list, GINT_TO_POINTER (type));
-}
-
diff --git a/libnautilus-private/nautilus-smooth-widget.h b/libnautilus-private/nautilus-smooth-widget.h
deleted file mode 100644
index d92fc0515..000000000
--- a/libnautilus-private/nautilus-smooth-widget.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-smooth-widget.h - Functions and types shared by smooth widgets.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_SMOOTH_WIDGET_H
-#define NAUTILUS_SMOOTH_WIDGET_H
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkwidget.h>
-#include <libnautilus-extensions/nautilus-art-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-
-BEGIN_GNOME_DECLS
-
-/* See nautilus_smooth_widget_get_tile_bounds() */
-#define NAUTILUS_SMOOTH_TILE_EXTENT_FULL	-1
-#define NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP	-2
-
-/* See nautilus_smooth_widget_paint() */
-typedef enum
-{
-	NAUTILUS_SMOOTH_BACKGROUND_GTK,
-	NAUTILUS_SMOOTH_BACKGROUND_CALLBACK,
-	NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR
-} NautilusSmoothBackgroundMode;
-
-/* See nautilus_smooth_widget_paint() */
-typedef enum
-{
-	NAUTILUS_SMOOTH_TILE_SELF,
-	NAUTILUS_SMOOTH_TILE_ANCESTOR
-} NautilusSmoothTileMode;
-
-/* Prototypes for shared methods.  We declare these here so that
- * the signatures in the smooth widget's class struture dont
- * get out of whack.
- */
-typedef void (* NautilusSmoothWidgetDrawBackground) (GtkWidget *widget,
-						     GdkPixbuf *buffer,
-						     const ArtIRect *area);
-typedef void (* NautilusSmoothWidgetSetIsSmooth) (GtkWidget *widget,
-						  gboolean is_smooth);
-
-
-/* Callback for nautilus_smooth_widget_paint() used to render the
- * smooth widget's content when not in smooth mode.
- */
-typedef void (* NautilusSmoothPaintOpaqueCallback) (GtkWidget *widget,
-						    GdkDrawable *destination_drawable,
-						    GdkGC *gc,
-						    int source_x,
-						    int source_y,
-						    const ArtIRect *area,
-						    gpointer callback_data);
-
-/* Callback for nautilus_smooth_widget_paint() used to composite the
- * smooth widget's content when in smooth mode.
- */
-typedef void (* NautilusSmoothCompositeCallback) (GtkWidget *widget,
-						  GdkPixbuf *destination_pixbuf,
-						  int source_x,
-						  int source_y,
-						  const ArtIRect *area,
-						  int opacity,
-						  gpointer callback_data);
-
-void               nautilus_smooth_widget_register                 (GtkWidget                         *widget);
-void               nautilus_smooth_widget_paint                    (GtkWidget                         *widget,
-								    GdkGC                             *gc,
-								    gboolean                           is_smooth,
-								    NautilusSmoothBackgroundMode       background_mode,
-								    guint32                            solid_background_color,
-								    const GdkPixbuf                   *tile_pixbuf,
-								    const ArtIRect                    *tile_bounds,
-								    int                                tile_opacity,
-								    NautilusSmoothTileMode             tile_mode_vertical,
-								    NautilusSmoothTileMode             tile_mode_horizontal,
-								    const ArtIRect                    *content_bounds,
-								    int                                content_opacity,
-								    const ArtIRect                    *dirty_area,
-								    NautilusSmoothPaintOpaqueCallback  paint_callback,
-								    NautilusSmoothCompositeCallback    composite_callback,
-								    gpointer                           callback_data);
-ArtIRect           nautilus_smooth_widget_get_tile_bounds          (const GtkWidget                   *widget,
-								    const GdkPixbuf                   *tile_pixbuf,
-								    int                                tile_width,
-								    int                                tile_height);
-NautilusDimensions nautilus_smooth_widget_get_preferred_dimensions (const GtkWidget                   *widget,
-								    const NautilusDimensions          *content_dimensions,
-								    const NautilusDimensions          *tile_dimensions,
-								    int                                tile_width,
-								    int                                tile_height);
-void               nautilus_smooth_widget_register_type            (GtkType                            type);
-
-void               nautilus_smooth_widget_global_set_is_smooth     (gboolean                           is_smooth);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_SMOOTH_WIDGET_H */
-
-
diff --git a/libnautilus-private/nautilus-stock-dialogs.c b/libnautilus-private/nautilus-stock-dialogs.c
deleted file mode 100644
index d95f58706..000000000
--- a/libnautilus-private/nautilus-stock-dialogs.c
+++ /dev/null
@@ -1,668 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-stock-dialogs.c: Various standard dialogs for Nautilus.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-stock-dialogs.h"
-
-#include "nautilus-glib-extensions.h"
-#include "nautilus-gnome-extensions.h"
-#include "nautilus-string.h"
-#include <gtk/gtkbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnomeui/gnome-uidefs.h>
-
-#define TIMED_WAIT_STANDARD_DURATION 2000
-#define TIMED_WAIT_MIN_TIME_UP 3000
-
-#define TIMED_WAIT_MINIMUM_DIALOG_WIDTH 300
-
-typedef struct {
-	NautilusCancelCallback cancel_callback;
-	gpointer callback_data;
-
-	/* Parameters for creation of the window. */
-	char *window_title;
-	char *wait_message;
-	GtkWindow *parent_window;
-
-	/* Timer to determine when we need to create the window. */
-	guint timeout_handler_id;
-	
-	/* Window, once it's created. */
-	GnomeDialog *dialog;
-	
-	/* system time (microseconds) when dialog was created */
-	gint64 dialog_creation_time;
-
-} TimedWait;
-
-static GHashTable *timed_wait_hash_table;
-
-static void find_message_label_callback (GtkWidget *widget,
-					 gpointer   callback_data);
-
-static void timed_wait_dialog_destroy_callback (GtkObject *object, gpointer callback_data);
-
-
-static guint
-timed_wait_hash (gconstpointer value)
-{
-	const TimedWait *wait;
-
-	wait = value;
-
-	return GPOINTER_TO_UINT (wait->cancel_callback)
-		^ GPOINTER_TO_UINT (wait->callback_data);
-}
-
-static gboolean
-timed_wait_hash_equal (gconstpointer value1, gconstpointer value2)
-{
-	const TimedWait *wait1, *wait2;
-
-	wait1 = value1;
-	wait2 = value2;
-
-	return wait1->cancel_callback == wait2->cancel_callback
-		&& wait1->callback_data == wait2->callback_data;
-}
-
-static void
-add_label_to_dialog (GnomeDialog *dialog, const char *message)
-{
-	GtkLabel *message_widget;
-
-	if (message == NULL) {
-		return;
-	}
-	
-	message_widget = GTK_LABEL (gtk_label_new (message));
-	gtk_label_set_line_wrap (message_widget, TRUE);
-	gtk_label_set_justify (message_widget,
-			       GTK_JUSTIFY_LEFT);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox),
-			    GTK_WIDGET (message_widget),
-			    TRUE, TRUE, GNOME_PAD);
-}
-
-static void
-timed_wait_delayed_close_destroy_dialog_callback (GtkObject *object, gpointer callback_data)
-{
-	gtk_timeout_remove (GPOINTER_TO_UINT (callback_data));
-}
-
-static gboolean
-timed_wait_delayed_close_timeout_callback (gpointer callback_data)
-{
-	guint handler_id;
-
-	handler_id = GPOINTER_TO_UINT (gtk_object_get_data (GTK_OBJECT (callback_data),
-							    "nautilus-stock-dialogs/delayed_close_handler_timeout_id"));
-	
-	gtk_signal_disconnect_by_func (GTK_OBJECT (callback_data),
-			    	       timed_wait_delayed_close_destroy_dialog_callback,
-			    	       GUINT_TO_POINTER (handler_id));
-	
-	gtk_object_destroy (GTK_OBJECT (callback_data));
-
-	return FALSE;
-}
-
-static void
-timed_wait_free (TimedWait *wait)
-{
-	guint delayed_close_handler_id;
-	guint32 time_up;
-
-	g_assert (g_hash_table_lookup (timed_wait_hash_table, wait) != NULL);
-
-	g_hash_table_remove (timed_wait_hash_table, wait);
-
-	g_free (wait->window_title);
-	g_free (wait->wait_message);
-	if (wait->parent_window != NULL) {
-		gtk_widget_unref (GTK_WIDGET (wait->parent_window));
-	}
-	if (wait->timeout_handler_id != 0) {
-		gtk_timeout_remove (wait->timeout_handler_id);
-	}
-	if (wait->dialog != NULL) {
-		/* Make sure to detach from the "destroy" signal, or we'll
-		 * double-free.
-		 */
-		gtk_signal_disconnect_by_func (GTK_OBJECT (wait->dialog),
-					       timed_wait_dialog_destroy_callback,
-					       wait);
-
-		/* compute time up in milliseconds */
-		time_up = (nautilus_get_system_time () - wait->dialog_creation_time) / 1000;
-		
-		if (time_up < TIMED_WAIT_MIN_TIME_UP) {
-			delayed_close_handler_id = gtk_timeout_add (TIMED_WAIT_MIN_TIME_UP - time_up,
-			                                            timed_wait_delayed_close_timeout_callback,
-			                                            wait->dialog);
-			gtk_object_set_data (GTK_OBJECT (wait->dialog),
-					     "nautilus-stock-dialogs/delayed_close_handler_timeout_id",
-					     GUINT_TO_POINTER (delayed_close_handler_id));
-			gtk_signal_connect (GTK_OBJECT (wait->dialog), "destroy",
-					    timed_wait_delayed_close_destroy_dialog_callback,
-					    GUINT_TO_POINTER (delayed_close_handler_id));
-		} else {
-			gtk_object_destroy (GTK_OBJECT (wait->dialog));
-		}
-	}
-
-	/* And the wait object itself. */
-	g_free (wait);
-}
-
-static void
-timed_wait_dialog_destroy_callback (GtkObject *object, gpointer callback_data)
-{
-	TimedWait *wait;
-
-	wait = callback_data;
-
-	g_assert (GNOME_DIALOG (object) == wait->dialog);
-
-	wait->dialog = NULL;
-	
-	/* When there's no cancel_callback, the originator will/must
-	 * call nautilus_timed_wait_stop which will call timed_wait_free.
-	 */
-
-	if (wait->cancel_callback != NULL) {
-		(* wait->cancel_callback) (wait->callback_data);
-		timed_wait_free (wait);
-	}
-}
-
-static gboolean
-timed_wait_callback (gpointer callback_data)
-{
-	TimedWait *wait;
-	GnomeDialog *dialog;
-	const char *button;
-
-	wait = callback_data;
-
-	/* Put up the timed wait window. */
-	button = wait->cancel_callback != NULL ? GNOME_STOCK_BUTTON_CANCEL : GNOME_STOCK_BUTTON_OK;
-	dialog = GNOME_DIALOG (gnome_dialog_new (wait->window_title, button, NULL));
-
-	/* The contents are often very small, causing tiny little
-	 * dialogs with their titles clipped if you just let gtk
-	 * sizing do its thing. This enforces a minimum width to
-	 * make it more likely that the title won't be clipped.
-	 */
-	gtk_widget_set_usize (GTK_WIDGET (dialog),
-			      TIMED_WAIT_MINIMUM_DIALOG_WIDTH,
-			      -1);
-	gtk_window_set_wmclass (GTK_WINDOW (dialog), "dialog", "Nautilus");
-	add_label_to_dialog (dialog, wait->wait_message);
-	gnome_dialog_set_close (dialog, TRUE);
-	wait->dialog_creation_time = nautilus_get_system_time ();
-	gtk_widget_show_all (GTK_WIDGET (dialog));
-
-	/* FIXME bugzilla.eazel.com 2441: 
-	 * Could parent here, but it's complicated because we
-	 * don't want this window to go away just because the parent
-	 * would go away first.
-	 */
-
-	/* Make the dialog cancel the timed wait when it goes away.
-	 * Connect to "destroy" instead of "clicked" since we want
-	 * to be called no matter how the dialog goes away.
-	 */
-	gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
-			    timed_wait_dialog_destroy_callback, wait);
-
-	wait->timeout_handler_id = 0;
-	wait->dialog = dialog;
-	
-	return FALSE;
-}
-
-void
-nautilus_timed_wait_start_with_duration (int duration,
-					 NautilusCancelCallback cancel_callback,
-					 gpointer callback_data,
-					 const char *window_title,
-					 const char *wait_message,
-					 GtkWindow *parent_window)
-{
-	TimedWait *wait;
-	
-	g_return_if_fail (callback_data != NULL);
-	g_return_if_fail (window_title != NULL);
-	g_return_if_fail (wait_message != NULL);
-	g_return_if_fail (parent_window == NULL || GTK_IS_WINDOW (parent_window));
-
-	/* Create the timed wait record. */
-	wait = g_new0 (TimedWait, 1);
-	wait->window_title = g_strdup (window_title);
-	wait->wait_message = g_strdup (wait_message);
-	wait->cancel_callback = cancel_callback;
-	wait->callback_data = callback_data;
-	wait->parent_window = parent_window;
-	
-	if (parent_window != NULL) {
-		gtk_widget_ref (GTK_WIDGET (parent_window));
-	}
-
-	/* Start the timer. */
-	wait->timeout_handler_id = gtk_timeout_add (duration, timed_wait_callback, wait);
-
-	/* Put in the hash table so we can find it later. */
-	if (timed_wait_hash_table == NULL) {
-		timed_wait_hash_table = nautilus_g_hash_table_new_free_at_exit
-			(timed_wait_hash, timed_wait_hash_equal, __FILE__ ": timed wait");
-	}
-	g_assert (g_hash_table_lookup (timed_wait_hash_table, wait) == NULL);
-	g_hash_table_insert (timed_wait_hash_table, wait, wait);
-	g_assert (g_hash_table_lookup (timed_wait_hash_table, wait) == wait);
-}
-
-void
-nautilus_timed_wait_start (NautilusCancelCallback cancel_callback,
-			   gpointer callback_data,
-			   const char *window_title,
-			   const char *wait_message,
-			   GtkWindow *parent_window)
-{
-	nautilus_timed_wait_start_with_duration
-		(TIMED_WAIT_STANDARD_DURATION,
-		 cancel_callback, callback_data,
-		 window_title, wait_message, parent_window);
-}
-
-void
-nautilus_timed_wait_stop (NautilusCancelCallback cancel_callback,
-			  gpointer callback_data)
-{
-	TimedWait key;
-	TimedWait *wait;
-
-	g_return_if_fail (callback_data != NULL);
-	
-	key.cancel_callback = cancel_callback;
-	key.callback_data = callback_data;
-	wait = g_hash_table_lookup (timed_wait_hash_table, &key);
-
-	g_return_if_fail (wait != NULL);
-
-	timed_wait_free (wait);
-}
-
-static const char **
-convert_varargs_to_name_array (va_list args)
-{
-	GPtrArray *resizeable_array;
-	const char *name;
-	const char **plain_ole_array;
-	
-	resizeable_array = g_ptr_array_new ();
-
-	do {
-		name = va_arg (args, const char *);
-		g_ptr_array_add (resizeable_array, (gpointer) name);
-	} while (name != NULL);
-
-	plain_ole_array = (const char **) resizeable_array->pdata;
-	
-	g_ptr_array_free (resizeable_array, FALSE);
-
-	return plain_ole_array;
-}
-
-static gboolean
-delete_event_callback (gpointer data,
-		       gpointer user_data)
-{
-	g_return_val_if_fail (GNOME_IS_DIALOG (data), FALSE);
-	gtk_signal_emit_stop_by_name (GTK_OBJECT (data),
-				      "delete_event");
-	return TRUE;
-}
-
-int
-nautilus_run_simple_dialog (GtkWidget *parent, gboolean ignore_close_box,
-			const char *text, const char *title, ...)
-{
-	va_list button_title_args;
-	const char **button_titles;
-        GtkWidget *dialog;
-        GtkWidget *top_widget;
-	int result;
-
-	
-	/* Create the dialog. */
-	va_start (button_title_args, title);
-	button_titles = convert_varargs_to_name_array (button_title_args);
-	va_end (button_title_args);
-        dialog = gnome_dialog_newv (title, button_titles);
-	g_free (button_titles);
-	
-	/* Allow close. */
-	if (ignore_close_box) {
-		gtk_signal_connect (GTK_OBJECT (dialog),
-				    "delete_event",
-				    GTK_SIGNAL_FUNC (delete_event_callback),
-				    NULL);
-
-	}
-	
-        gnome_dialog_set_close (GNOME_DIALOG (dialog), TRUE);
-
-	gtk_window_set_wmclass (GTK_WINDOW (dialog), "dialog", "Nautilus");
-
-	/* Parent it if asked to. */
-        if (parent != NULL) {
-		top_widget = gtk_widget_get_toplevel (parent);
-		if (GTK_IS_WINDOW (top_widget) && !GTK_OBJECT_DESTROYED (top_widget)) {
-			gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (top_widget));
-		}
-	}
-	
-	/* Title it if asked to. */
-	add_label_to_dialog (GNOME_DIALOG (dialog), text);
-
-	/* Run it. */
-        gtk_widget_show_all (dialog);
-        result = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-	while (result == -1 && ignore_close_box) {
-		gtk_widget_show (GTK_WIDGET (dialog));
-		result = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-	}
-
-	return result;
-}
-
-static void
-find_message_label (GtkWidget *widget, const char *message)
-{
-	char *text;
-
-	/* Turn on the flag if we find a label with the message
-	 * in it.
-	 */
-	if (GTK_IS_LABEL (widget)) {
-		gtk_label_get (GTK_LABEL (widget), &text);
-		if (nautilus_strcmp (text, message) == 0) {
-			gtk_object_set_data (GTK_OBJECT (gtk_widget_get_toplevel (widget)),
-					     "message label", widget);
-		}
-	}
-
-	/* Recurse for children. */
-	if (GTK_IS_CONTAINER (widget)) {
-		gtk_container_foreach (GTK_CONTAINER (widget),
-				       find_message_label_callback,
-				       (char *) message);
-	}
-}
-
-static void
-find_message_label_callback (GtkWidget *widget, gpointer callback_data)
-{
-	find_message_label (widget, callback_data);
-}
-
-static GnomeDialog *
-create_message_box (const char *message,
-		  const char *dialog_title,
-		  const char *type,
-		  const char *button_0,
-		  const char *button_1,
-		  GtkWindow *parent)
-{  
-	GtkWidget *box;
-	GtkLabel *message_label;
-
-	g_assert (dialog_title != NULL);
-
-	box = gnome_message_box_new (message, type, button_0, button_1, NULL);
-	gtk_window_set_title (GTK_WINDOW (box), dialog_title);
-	gtk_window_set_wmclass (GTK_WINDOW (box), "stock_dialog", "Nautilus");
-	
-	/* A bit of a hack. We want to use gnome_message_box_new,
-	 * but we want the message to be wrapped. So, we search
-	 * for the label with this message so we can mark it.
-	 */
-	find_message_label (box, message);
-	message_label = GTK_LABEL (gtk_object_get_data (GTK_OBJECT (box), "message label"));
-	gtk_label_set_line_wrap (message_label, TRUE);
-
-	if (parent != NULL && !GTK_OBJECT_DESTROYED (parent)) {
-		gnome_dialog_set_parent (GNOME_DIALOG (box), parent);
-	}
-	return GNOME_DIALOG (box);
-}
-
-static GnomeDialog *
-show_message_box (const char *message,
-		  const char *dialog_title,
-		  const char *type,
-		  const char *button_0,
-		  const char *button_1,
-		  GtkWindow *parent)
-{
-	GnomeDialog *dialog;
-
-	dialog = create_message_box (message, dialog_title, type, 
-				     button_0, button_1, parent);  
-	gtk_widget_show (GTK_WIDGET (dialog));
-
-	return dialog;
-}
-
-static GnomeDialog *
-show_ok_box (const char *message,
-	     const char *dialog_title,
-	     const char *type,
-	     GtkWindow *parent)
-{  
-	return show_message_box	(message, dialog_title, type, GNOME_STOCK_BUTTON_OK, NULL, parent);
-}
-
-GnomeDialog *
-nautilus_create_info_dialog (const char *info,
-			     const char *dialog_title,
-			     GtkWindow *parent)
-{
-	return create_message_box (info, dialog_title, 
-				   GNOME_MESSAGE_BOX_INFO,
-				   GNOME_STOCK_BUTTON_OK, NULL, parent);
-				     
-}
-
-GnomeDialog *
-nautilus_show_info_dialog (const char *info,
-	 	      	   const char *dialog_title,
-		      	   GtkWindow *parent)
-{
-	return show_ok_box (info, 
-			    dialog_title == NULL ? _("Info") : dialog_title, 
-			    GNOME_MESSAGE_BOX_INFO, parent);
-}
-
-static void
-details_dialog_clicked_callback (GnomeDialog *dialog,
-				 int button_number,
-				 const char *detailed_message)
-{
-	GtkLabel *label;
-
-	switch (button_number) {
-	case 0: /* Details */
-		label = GTK_LABEL (gtk_object_get_data (GTK_OBJECT (dialog), "message label"));
-		gtk_label_set_text (label, detailed_message);
-		gtk_widget_hide (GTK_WIDGET (nautilus_gnome_dialog_get_button_by_index (dialog, 0)));
-		break;
-	case 1: /* OK */
-		gnome_dialog_close (dialog);
-		break;
-	}
-}
-
-
-GnomeDialog *
-nautilus_show_info_dialog_with_details (const char *info,
-					const char *dialog_title,
-					const char *detailed_info,
-					GtkWindow *parent)
-{
-	GnomeDialog *dialog;
-
-	if (detailed_info == NULL
-	    || strcmp (info, detailed_info) == 0) {
-		return nautilus_show_info_dialog (info, dialog_title, parent);
-	}
-
-	dialog = show_message_box (info, 
-				   dialog_title == NULL ? _("Info") : dialog_title, 
-				   GNOME_MESSAGE_BOX_INFO, 
-				   _("Details"), GNOME_STOCK_BUTTON_OK, parent);
-
-	gnome_dialog_set_close (dialog, FALSE);
-	gtk_signal_connect_full (GTK_OBJECT (dialog), "clicked",
-				 details_dialog_clicked_callback, NULL, g_strdup (detailed_info),
-				 g_free, FALSE, FALSE);
-
-	return dialog;
-
-}
-
-
-GnomeDialog *
-nautilus_show_warning_dialog (const char *warning,
-	 	      	      const char *dialog_title,
-			      GtkWindow *parent)
-{
-	return show_ok_box (warning, 
-			    dialog_title == NULL ? _("Warning") : dialog_title, 
-			    GNOME_MESSAGE_BOX_WARNING, parent);
-}
-
-
-GnomeDialog *
-nautilus_show_error_dialog (const char *error,
-	 	       	    const char *dialog_title,
-		       	    GtkWindow *parent)
-{
-	return show_ok_box (error,
-			    dialog_title == NULL ? _("Error") : dialog_title, 
-			    GNOME_MESSAGE_BOX_ERROR, parent);
-}
-
-
-GnomeDialog *
-nautilus_show_error_dialog_with_details (const char *error_message,
-				    	 const char *dialog_title,
-				    	 const char *detailed_error_message,
-				    	 GtkWindow *parent)
-{
-	GnomeDialog *dialog;
-
-	g_return_val_if_fail (error_message != NULL, NULL);
-	g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL);
-
-	if (detailed_error_message == NULL
-	    || strcmp (error_message, detailed_error_message) == 0) {
-		return nautilus_show_error_dialog (error_message, dialog_title, parent);
-	}
-
-	dialog = show_message_box (error_message, 
-				   dialog_title == NULL ? _("Error") : dialog_title,
-				   GNOME_MESSAGE_BOX_ERROR,
-				   _("Details"), GNOME_STOCK_BUTTON_OK, parent);
-
-	/* Show the details when you click on the details button. */
-	gnome_dialog_set_close (dialog, FALSE);
-	gtk_signal_connect_full (GTK_OBJECT (dialog), "clicked",
-				 details_dialog_clicked_callback, NULL, g_strdup (detailed_error_message),
-				 g_free, FALSE, FALSE);
-
-	return dialog;
-}
-
-/**
- * nautilus_show_yes_no_dialog:
- * 
- * Create and show a dialog asking a question with two choices.
- * The caller needs to set up any necessary callbacks 
- * for the buttons. Use nautilus_create_question_dialog instead
- * if any visual changes need to be made, to avoid flashiness.
- * @question: The text of the question.
- * @yes_label: The label of the "yes" button.
- * @no_label: The label of the "no" button.
- * @parent: The parent window for this dialog.
- */
-GnomeDialog *
-nautilus_show_yes_no_dialog (const char *question, 
-		    	     const char *dialog_title,
-			     const char *yes_label,
-			     const char *no_label,
-			     GtkWindow *parent)
-{
-	return show_message_box (question,
-				 dialog_title == NULL ? _("Question") : dialog_title, 
-				 GNOME_MESSAGE_BOX_QUESTION,
-				 yes_label,
-				 no_label,
-				 parent);
-}
-
-/**
- * nautilus_create_question_dialog:
- * 
- * Create a dialog asking a question with at least two choices.
- * The caller needs to set up any necessary callbacks 
- * for the buttons. The dialog is not yet shown, so that the
- * caller can add additional buttons or make other visual changes
- * without causing flashiness.
- * @question: The text of the question.
- * @answer_0: The label of the leftmost button (index 0)
- * @answer_1: The label of the 2nd-to-leftmost button (index 1)
- * @parent: The parent window for this dialog.
- */
-GnomeDialog *
-nautilus_create_question_dialog (const char *question,
-				 const char *dialog_title,
-				 const char *answer_0,
-				 const char *answer_1,
-				 GtkWindow *parent)
-{
-	return create_message_box (question,
-				   dialog_title == NULL ? _("Question") : dialog_title, 
-				   GNOME_MESSAGE_BOX_QUESTION,
-				   answer_0,
-				   answer_1,
-				   parent);
-}				 
diff --git a/libnautilus-private/nautilus-stock-dialogs.h b/libnautilus-private/nautilus-stock-dialogs.h
deleted file mode 100644
index c5980c2f0..000000000
--- a/libnautilus-private/nautilus-stock-dialogs.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-stock-dialogs.h: Various standard dialogs for Nautilus.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#ifndef NAUTILUS_STOCK_DIALOGS_H
-#define NAUTILUS_STOCK_DIALOGS_H
-
-#include <libgnomeui/gnome-dialog.h>
-
-typedef void (* NautilusCancelCallback) (gpointer callback_data);
-
-/* Dialog for cancelling something that normally is fast enough not to need a dialog. */
-void         nautilus_timed_wait_start          (NautilusCancelCallback  cancel_callback,
-						 gpointer                callback_data,
-						 const char             *window_title,
-						 const char             *wait_message,
-						 GtkWindow              *parent_window);
-void	     nautilus_timed_wait_start_with_duration (
-						 int			 duration,
-						 NautilusCancelCallback  cancel_callback,
-						 gpointer                callback_data,
-						 const char             *window_title,
-						 const char             *wait_message,
-						 GtkWindow              *parent_window);
-void         nautilus_timed_wait_stop           (NautilusCancelCallback  cancel_callback,
-						 gpointer                callback_data);
-
-/* Basic dialog with buttons. */
-int          nautilus_run_simple_dialog         (GtkWidget              *parent,
-						 gboolean               ignore_close_box,
-						 const char             *text,
-						 const char             *title,
-						 ...);
-
-/* Variations on gnome stock dialogs; these do line wrapping, we don't
- * bother with non-parented versions, we allow setting the title,
- * and we return GnomeDialog pointers instead of GtkWidget pointers.
- */
-
-GnomeDialog *nautilus_show_info_dialog               (const char             *informative_message,
-						      const char	     *dialog_title,
-						      GtkWindow              *parent);
-GnomeDialog *nautilus_show_info_dialog_with_details  (const char             *informative_message,
-						      const char             *dialog_title,
-						      const char             *detailed_informative_message,
-						      GtkWindow              *parent);
-GnomeDialog *nautilus_show_warning_dialog            (const char             *warning_message,
-						      const char	     *dialog_title,
-						      GtkWindow              *parent);
-GnomeDialog *nautilus_show_error_dialog              (const char             *error_message,
-						      const char	     *dialog_title,
-						      GtkWindow              *parent);
-GnomeDialog *nautilus_show_error_dialog_with_details (const char             *error_message,
-						      const char	     *dialog_title,
-						      const char             *detailed_error_message,
-						      GtkWindow              *parent);
-GnomeDialog *nautilus_show_yes_no_dialog             (const char             *question,
-						      const char	     *dialog_title,
-						      const char             *yes_label,
-						      const char             *no_label,
-						      GtkWindow              *parent);
-
-GnomeDialog *nautilus_create_question_dialog         (const char             *question,
-						      const char	     *dialog_title,
-						      const char             *answer_zero,
-						      const char             *answer_one,
-						      GtkWindow              *parent);
-GnomeDialog *nautilus_create_info_dialog             (const char             *informative_message,
-						      const char             *dialog_title,
-						      GtkWindow              *parent);
-
-#endif /* NAUTILUS_STOCK_DIALOGS_H */
diff --git a/libnautilus-private/nautilus-string-list.c b/libnautilus-private/nautilus-string-list.c
deleted file mode 100644
index 196c501f5..000000000
--- a/libnautilus-private/nautilus-string-list.c
+++ /dev/null
@@ -1,1223 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-string-list.h: A collection of strings.
- 
-   Copyright (C) 1999, 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-string-list.h"
-
-#include <string.h>
-#include "nautilus-glib-extensions.h"
-#include "nautilus-lib-self-check-functions.h"
-#include "nautilus-string.h"
-
-static gboolean suppress_out_of_bounds_warning;
-
-struct _NautilusStringList
-{
-	GList		*strings;
-	GCompareFunc	compare_function;
-};
-
-static gboolean str_is_equal (const char *a,
-			      const char *b,
-			      gboolean    case_sensitive);
-
-/**
- * nautilus_string_list_new:
- *
- * @case_sensitive: Flag indicating whether the new string list is case sensitive.
- *
- * Return value: A newly constructed string list.
- */
-NautilusStringList *
-nautilus_string_list_new (gboolean case_sensitive)
-{
-	NautilusStringList * string_list;
-
-	string_list = g_new (NautilusStringList, 1);
-
-	string_list->strings = NULL;
-	string_list->compare_function = case_sensitive
-		? nautilus_strcmp_compare_func
-		: nautilus_strcasecmp_compare_func;
-	/* FIXME: If these lists are seen by users, we want to use
-	 * strcoll, not strcasecmp.
-	 */
-
-	return string_list;
-}
-
-/**
- * nautilus_string_list_new_from_string:
- *
- * @other_or_null: A NautilusStringList or NULL
- * @case_sensitive: Flag indicating whether the new string list is case sensitive.
- *
- * Return value: A newly constructed string list with one entry 'string'.
- */
-NautilusStringList *
-nautilus_string_list_new_from_string (const char	*string,
-				      gboolean          case_sensitive)
-{
-	NautilusStringList * string_list;
-
-	g_return_val_if_fail (string != NULL, NULL);
-
-	string_list = nautilus_string_list_new (case_sensitive);
-
-	nautilus_string_list_insert (string_list, string);
-
-	return string_list;
-}
-
-/**
- * nautilus_string_list_new_from_string_list:
- *
- * @other_or_null: A NautilusStringList or NULL
- * @case_sensitive: Flag indicating whether the new string list is case sensitive.
- *
- * Return value: A newly allocated string list that is equal to other.
- */
-NautilusStringList *
-nautilus_string_list_new_from_string_list (const NautilusStringList	*other_or_null,
-					   gboolean			case_sensitive)
-{
-	NautilusStringList *string_list;
-
-	if (other_or_null == NULL) {
-		return NULL;
-	}
-
-	string_list = nautilus_string_list_new (case_sensitive);
-
-	nautilus_string_list_assign_from_string_list (string_list, other_or_null);
-
-	return string_list;
-}
-
-/* Construct a string list from tokens delimited by the given string and delimiter */
-NautilusStringList *
-nautilus_string_list_new_from_tokens (const char	*string,
-				      const char	*delimiter,
-				      gboolean          case_sensitive)
-{
-	NautilusStringList *string_list;
-
-	g_return_val_if_fail (delimiter != NULL, NULL);
-
-	string_list = nautilus_string_list_new (case_sensitive);
-
-	if (string != NULL) {
-		char  **string_array;
-		int i;
-
-		string_array = g_strsplit (string, delimiter, -1);
-		
-		if (string_array) {
-			for (i = 0; string_array[i]; i++) {
-				nautilus_string_list_insert (string_list, string_array[i]);
-			}
-			
-			g_strfreev (string_array);
-		}
-	}
-
-	return string_list;
-}
-
-void
-nautilus_string_list_assign_from_string_list (NautilusStringList       *string_list,
-					      const NautilusStringList *other_or_null)
-{
-	GList		*other_iterator;
-	const char	*other_string;
-
-	g_return_if_fail (string_list != NULL);
-
-	nautilus_string_list_clear (string_list);
-
-	if (other_or_null == NULL) {
-		return;
-	}
-
-	for (other_iterator = other_or_null->strings; 
-	     other_iterator != NULL; 
-	     other_iterator = other_iterator->next) {
-		
-		other_string = (const char *) other_iterator->data;
-
-		nautilus_string_list_insert (string_list, other_string);
-	}
-}
-
-void
-nautilus_string_list_free (NautilusStringList *string_list_or_null)
-{
-	if (string_list_or_null == NULL) {
-		return;
-	}
-	
-	nautilus_string_list_clear (string_list_or_null);
-	g_free (string_list_or_null);
-}
-
-void
-nautilus_string_list_insert (NautilusStringList *string_list,
-			     const char	 *string)
-{
-	g_return_if_fail (string_list != NULL);
-	g_return_if_fail (string != NULL);
-
-	string_list->strings = g_list_append (string_list->strings,
-					      (gpointer) g_strdup (string));
-}
-
-char *
-nautilus_string_list_nth (const NautilusStringList *string_list, guint n)
-{
-	g_return_val_if_fail (string_list != NULL, NULL);
-
-	if (n  < g_list_length (string_list->strings)) {
-		const char * s = (const char *) g_list_nth_data (string_list->strings, n);
-		
-		g_assert (s != NULL);
-		
-		return g_strdup (s);
-	} else if (!suppress_out_of_bounds_warning) {
-		g_warning ("nautilus_string_list_nth (n = %d) is out of bounds.", n);
-	}
-	
-	return NULL;
-}
-
-/**
- * nautilus_string_list_nth_as_integer
- *
- * @string_list: A NautilusStringList
- * @n: Index of string to convert.
- * @integer_result: Where to store the conversion result.
- *
- * Convert the nth string to an integer and store the result in &integer_result.
- *
- * Return value: Returns TRUE if the string to integer conversion was successful,
- * FALSE otherwise.
- */
-gboolean
-nautilus_string_list_nth_as_integer (const NautilusStringList *string_list,
-				     guint n,
-				     int *integer_result)
-{
-	const char *string;
-
-	g_return_val_if_fail (string_list != NULL, FALSE);
-	g_return_val_if_fail (integer_result != NULL, FALSE);
-
-	if (n >= g_list_length (string_list->strings)) {
-		if (!suppress_out_of_bounds_warning) {
-			g_warning ("(n = %d) is out of bounds.", n);
-		}
-		return FALSE;
-	}
-
-	string = g_list_nth_data (string_list->strings, n);
-	return nautilus_str_to_int (string, integer_result);
-}
-
-/**
- * nautilus_string_list_modify_nth
- *
- * @string_list: A NautilusStringList
- * @n: Index of string to modify.
- * @string: New value for the string.
- *
- * Modify the nth value of a string in the collection.
- */
-void
-nautilus_string_list_modify_nth (NautilusStringList *string_list,
-				 guint n,
-				 const char *string)
-{
-	GList* nth;
-
-	g_return_if_fail (string_list != NULL);
-	g_return_if_fail (string != NULL);
-
-	if (n >= g_list_length (string_list->strings)) {
-		if (!suppress_out_of_bounds_warning) {
-			g_warning ("nautilus_string_list_nth (n = %d) is out of bounds.", n);
-		}
-
-		return;
-	}
-
-	nth = g_list_nth (string_list->strings, n);
-	g_assert (nth != NULL);
-
-	g_free (nth->data);
-	nth->data = g_strdup (string);
-}
-
-/**
- * nautilus_string_list_remove_nth
- *
- * @string_list: A NautilusStringList
- * @n: Index of string to modify.
- *
- * Remove the nth string in the collection.
- */
-void
-nautilus_string_list_remove_nth (NautilusStringList *string_list,
-				 guint n)
-{
-	GList* nth;
-
-	g_return_if_fail (string_list != NULL);
-
-	if (n >= g_list_length (string_list->strings)) {
-		if (!suppress_out_of_bounds_warning) {
-			g_warning ("nautilus_string_list_nth (n = %d) is out of bounds.", n);
-		}
-
-		return;
-	}
-
-	nth = g_list_nth (string_list->strings, n);
-	g_assert (nth != NULL);
-	g_free (nth->data);
-	string_list->strings = g_list_remove_link (string_list->strings, nth);
-}
-
-gboolean
-nautilus_string_list_contains (const NautilusStringList	*string_list,
-			       const char		*string)
-{
-	GList *find;
-
-	if (string_list == NULL) {
-		return FALSE;
-	}
-
-	g_return_val_if_fail (string != NULL, FALSE);
-
-	find = g_list_find_custom (string_list->strings, (gpointer) string,
-				   string_list->compare_function);
-
-	return find == NULL ? FALSE : TRUE;
-}
-
-/**
- * nautilus_string_list_get_longest_string:
- *
- * @string_list: A NautilusStringList
- * @test_function: Function to use for testing the strings.
- * @callback_data: Data to pass to test function.
- *
- * Return value: Returns the first string in the collection for 
- * which the test function returns TRUE.  If the no string matches, the 
- * result is NULL.
- */
-char *
-nautilus_string_list_find_by_function (const NautilusStringList *string_list,
-				       NautilusStringListTestFunction test_function,
-				       gpointer callback_data)
-{
-	GList *iterator;
-
-	if (string_list == NULL) {
-		return NULL;
-	}
-
-	g_return_val_if_fail (test_function != NULL, FALSE);
-	
-	for (iterator = string_list->strings; iterator; iterator = iterator->next) {
-		if ((* test_function) (string_list, iterator->data, callback_data)) {
-			return g_strdup (iterator->data);
-		}
-	}
-
-	return NULL;
-}
-
-guint
-nautilus_string_list_get_length (const NautilusStringList *string_list)
-{
-	if (string_list == NULL) {
-		return 0;
-	}
-
-	return g_list_length (string_list->strings);
-}
-
-void
-nautilus_string_list_clear (NautilusStringList *string_list)
-{
-	g_return_if_fail (string_list != NULL);
-
-	nautilus_g_list_free_deep (string_list->strings);
-	string_list->strings = NULL;
-}
-
-gboolean
-nautilus_string_list_equals (const NautilusStringList *a,
-			     const NautilusStringList *b)
-{
-	GList *a_iterator;
-	GList *b_iterator;
-
-	g_return_val_if_fail (a != NULL, FALSE);
-	g_return_val_if_fail (b != NULL, FALSE);
-
-	for (a_iterator = a->strings, b_iterator = b->strings; 
-	     a_iterator != NULL && b_iterator != NULL;
-	     a_iterator = a_iterator->next, b_iterator = b_iterator->next) {
-		if (!str_is_equal ((const char *) a_iterator->data, (const char *) b_iterator->data,
-				   a->compare_function == b->compare_function)) {
-			return FALSE;
-		}
-	}
-	
-	return a_iterator == NULL && b_iterator == NULL;
-}
-
-/**
- * nautilus_string_list_as_g_list:
- *
- * @string_list: A NautilusStringList
- *
- * Return value: A GList of strings that must deep free the result with
- * nautilus_g_list_free_deep()
- */
-GList *
-nautilus_string_list_as_g_list (const NautilusStringList *string_list)
-{
-	guint i;
-	GList *copy = NULL;
-
-	g_return_val_if_fail (string_list != NULL, NULL);
-
-	for (i = 0; i < nautilus_string_list_get_length (string_list); i++) {
-		copy = g_list_append (copy, nautilus_string_list_nth (string_list, i));
-	}
-
-	return copy;
-}
-
-/**
- * nautilus_string_list_get_index_for_string:
- *
- * @string_list: A NautilusStringList
- * @string: The string to look for
- *
- * Return value: An int with the index of the given string or 
- * NAUTILUS_STRING_LIST_NOT_FOUND if the string aint found.
- */
-int
-nautilus_string_list_get_index_for_string (const NautilusStringList	*string_list,
-					   const char			*string)
-{
-	int	n = 0;
-	GList	*iterator;
-
-	g_return_val_if_fail (string_list != NULL, NAUTILUS_STRING_LIST_NOT_FOUND);
-	g_return_val_if_fail (string != NULL, NAUTILUS_STRING_LIST_NOT_FOUND);
-
-	for (iterator = string_list->strings; iterator != NULL; iterator = iterator->next) {
-		if (str_is_equal ((const char *) iterator->data, string,
-				  string_list->compare_function == nautilus_strcmp_compare_func)) {
-			return n;
-		}
-		
-		n++;
-	}
-
-	return NAUTILUS_STRING_LIST_NOT_FOUND;
-}
-
-/**
- * nautilus_string_list_as_tokens
- *
- * @string_list: A NautilusStringList
- * @delimiter: The string to use a delimeter, can be NULL.
- *
- * Return value: An newly allocated string concatenation of all the items in the list.
- * The string is delimited by 'delimiter'.
- */
-char *
-nautilus_string_list_as_concatenated_string (const NautilusStringList *string_list,
-					     const char               *delimiter)
-{
-	char *result = NULL;
-	int length;
-	
-	g_return_val_if_fail (string_list != NULL, NULL);
-	
-	length = nautilus_string_list_get_length (string_list);
-	
-	if (length > 0) {
-		int	n;
-		GList	*iterator;
-		GString	*tokens;
-
-		n = 0;
-		
-		tokens = g_string_new (NULL);
-		
-		for (iterator = string_list->strings; iterator != NULL; iterator = iterator->next) {
-			const char *current = (const char *) iterator->data;
-			
-			g_string_append (tokens, current);
-
-			
-			n++;
-
-			if (delimiter && (n != length)) {
-				g_string_append (tokens, delimiter);
-			}
-		}
-
-		result = tokens->str;
-
-		g_string_free (tokens, FALSE);
-	}
-
-	return result;
-}
-
-void
-nautilus_string_list_sort (NautilusStringList *string_list)
-{
-	g_return_if_fail (string_list != NULL);
-
-	string_list->strings = g_list_sort (string_list->strings, string_list->compare_function);
-}
-
-/**
- * nautilus_string_list_sort_by_function
- *
- * @string_list: A NautilusStringList
- * @compare_function: Function to use for comparing the strings.
- *
- * Sort the strings using the given compare function.
- */
-void
-nautilus_string_list_sort_by_function (NautilusStringList *string_list,
-				       GCompareFunc compare_function)
-{
-	g_return_if_fail (string_list != NULL);
-
-	string_list->strings = g_list_sort (string_list->strings, compare_function);
-}
-
-void
-nautilus_string_list_remove_duplicates (NautilusStringList *string_list)
-{
-	GList	*new_strings = NULL;
-	GList	*iterator;
-
-	g_return_if_fail (string_list != NULL);
-	
-	for (iterator = string_list->strings; iterator != NULL; iterator = iterator->next) {
-		const char *string = (const char *) iterator->data;
-		g_assert (string != NULL);
-
-		if (g_list_find_custom (new_strings, (gpointer) string, string_list->compare_function) == NULL) {
-			new_strings = g_list_append (new_strings, g_strdup (string));
-		}
-	}
-
-	nautilus_string_list_clear (string_list);
-
-	string_list->strings = new_strings;
-}
-
-void
-nautilus_string_list_for_each (const NautilusStringList *string_list,
-			       GFunc                     function,
-			       gpointer                  user_data)
-{
-	g_return_if_fail (string_list != NULL);
-
-	g_list_foreach (string_list->strings, function, user_data);
-}
-
-/**
- * nautilus_string_list_get_longest_string:
- *
- * @string_list: A NautilusStringList
- *
- * Return value: A copy of the longest string in the collection.  Need to g_free() it.
- */
-char *
-nautilus_string_list_get_longest_string (const NautilusStringList *string_list)
-{
-	int	longest_length = 0;
-	int	longest_index = 0;
-	GList	*iterator;
-	int	i;
-
-	g_return_val_if_fail (string_list != NULL, NULL);
-
-	if (string_list->strings == NULL) {
-		return NULL;
-	}
-	
-	for (iterator = string_list->strings, i = 0; iterator != NULL; iterator = iterator->next, i++) {
-		int current_length = nautilus_strlen ((const char *) iterator->data);
-		
-		if (current_length > longest_length) {
-			longest_index = i;
-			longest_length = current_length;
-		}
-	}
-
-	return nautilus_string_list_nth (string_list, longest_index);
-}
-
-/**
- * nautilus_string_list_get_longest_string_length:
- *
- * @string_list: A NautilusStringList
- *
- * Return value: The length of the longest string in the collection.
- */
-int
-nautilus_string_list_get_longest_string_length (const NautilusStringList *string_list)
-{
-	int	longest_length = 0;
-	GList	*iterator;
-	int	i;
-
-	g_return_val_if_fail (string_list != NULL, 0);
-
-	if (string_list->strings == NULL) {
-		return 0;
-	}
-	
-	for (iterator = string_list->strings, i = 0; iterator != NULL; iterator = iterator->next, i++) {
-		int current_length = nautilus_strlen ((const char *) iterator->data);
-		
-		if (current_length > longest_length) {
-			longest_length = current_length;
-		}
-	}
-
-	return longest_length;
-}
-
-static gboolean
-str_is_equal (const char	*a,
-	      const char	*b,
-	      gboolean		case_sensitive)
-{
-	return case_sensitive ? nautilus_str_is_equal (a, b) : nautilus_istr_is_equal (a, b);
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-static gboolean
-test_dog (const NautilusStringList *string_list,
-	     const char *string,
-	     gpointer callback_data)
-{
-	return nautilus_str_is_equal (string, "dog");
-}
-
-static gboolean
-test_data (const NautilusStringList *string_list,
-	   const char *string,
-	   gpointer callback_data)
-{
-	return nautilus_str_is_equal (string, callback_data);
-}
-
-static gboolean
-test_true (const NautilusStringList *string_list,
-	   const char *string,
-	   gpointer callback_data)
-{
-	return TRUE;
-}
-
-static gboolean
-test_false (const NautilusStringList *string_list,
-	    const char *string,
-	    gpointer callback_data)
-{
-	return FALSE;
-}
-
-static int
-compare_number (gconstpointer string_a,
-		gconstpointer string_b)
-{
-	int a;
-	int b;
-	
-	g_return_val_if_fail (string_a != NULL, 0);
-	g_return_val_if_fail (string_b != NULL, 0);
-
-	g_return_val_if_fail (nautilus_str_to_int (string_a, &a), 0);
-	g_return_val_if_fail (nautilus_str_to_int (string_b, &b), 0);
-
- 	if (a < b) {
- 		return -1;
-	}
-
- 	if (a == b) {
- 		return 0;
- 	}
-
-	return 1;
-}
-
-void
-nautilus_self_check_string_list (void)
-{
-	NautilusStringList *fruits;
-	NautilusStringList *cities;
-	NautilusStringList *cities_copy;
-	NautilusStringList *empty;
-	NautilusStringList *single;
-
-	/*
-	 * nautilus_string_list_contains
-	 */
-	empty = nautilus_string_list_new (TRUE);
-
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (empty), 0);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (empty, "something"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (NULL, "something"), FALSE);
-
-	/*
-	 * nautilus_string_list_new
-	 */
-	cities = nautilus_string_list_new (TRUE);
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_equals (cities, empty), TRUE);
-	
-	nautilus_string_list_insert (cities, "london");
-	nautilus_string_list_insert (cities, "paris");
-	nautilus_string_list_insert (cities, "rome");
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_equals (cities, empty), FALSE);
-
-	/*
-	 * nautilus_string_list_new_from_string_list
-	 */
-	cities_copy = nautilus_string_list_new_from_string_list (cities, TRUE);
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_equals (cities, cities_copy), TRUE);
-
-	nautilus_string_list_free (cities_copy);
-	nautilus_string_list_free (cities);
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_new_from_string_list (NULL, TRUE) == NULL, TRUE);
-
-	/*
-	 * nautilus_string_list_insert,
-	 * nautilus_string_list_nth,
-	 * nautilus_string_list_contains,
-	 * nautilus_string_list_get_length
-	 */
-	fruits = nautilus_string_list_new (TRUE);
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_equals (fruits, empty), TRUE);
-
-	nautilus_string_list_insert (fruits, "orange");
-	nautilus_string_list_insert (fruits, "apple");
-	nautilus_string_list_insert (fruits, "strawberry");
-	nautilus_string_list_insert (fruits, "cherry");
-	nautilus_string_list_insert (fruits, "bananna");
-	nautilus_string_list_insert (fruits, "watermelon");
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_equals (fruits, empty), FALSE);
-
- 	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (fruits, 0), "orange");
- 	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (fruits, 2), "strawberry");
- 	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (fruits, 3), "cherry");
- 	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (fruits, 5), "watermelon");
-	suppress_out_of_bounds_warning = TRUE;
- 	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (fruits, 6), NULL);
-	suppress_out_of_bounds_warning = FALSE;
-
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (fruits), 6);
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (fruits, "orange"), TRUE);
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (fruits, "apple"), TRUE);
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (fruits, "watermelon"), TRUE);
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (fruits, "pineapple"), FALSE);
-
- 	nautilus_string_list_clear (fruits);
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (fruits, "orange"), FALSE);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (fruits), 0);
-	
-	nautilus_string_list_free (fruits);
-	nautilus_string_list_free (empty);
-
-	/*
-	 * nautilus_string_list_new_from_string
-	 */
-	single = nautilus_string_list_new_from_string ("something", TRUE);
-
- 	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (single, "something"), TRUE);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (single), 1);
-
-	nautilus_string_list_free (single);
-
-
-	/*
-	 * nautilus_string_list_as_g_list
-	 */
-	{
-		guint			i;
-		GList			*glist;
-		GList			*glist_iterator;
-		NautilusStringList	*string_list;
-
-		string_list = nautilus_string_list_new (TRUE);
-		
-		nautilus_string_list_insert (string_list, "orange");
-		nautilus_string_list_insert (string_list, "apple");
-		nautilus_string_list_insert (string_list, "strawberry");
-		nautilus_string_list_insert (string_list, "cherry");
-		nautilus_string_list_insert (string_list, "bananna");
-		nautilus_string_list_insert (string_list, "watermelon");
-		
-		glist = nautilus_string_list_as_g_list (string_list);
-
-		NAUTILUS_CHECK_BOOLEAN_RESULT (g_list_length (glist) == nautilus_string_list_get_length (string_list),
-					       TRUE);
-
-		for (i = 0, glist_iterator = glist;
-		     i < nautilus_string_list_get_length (string_list); 
-		     i++, glist_iterator = glist_iterator->next) {
-			char *s1 = nautilus_string_list_nth (string_list, i);
-			const char *s2 = (const char *) glist_iterator->data;
-
-			NAUTILUS_CHECK_INTEGER_RESULT (nautilus_strcmp (s1, s2), 0);
-
-			g_free (s1);
-		}
-
-		nautilus_string_list_free (string_list);
-
-		nautilus_g_list_free_deep (glist);
-	}
-	
-	/*
-	 * nautilus_string_list_get_index_for_string
-	 *
-	 */
-
-	{
-		NautilusStringList *fruits;
-
-		fruits = nautilus_string_list_new (TRUE);
-		
-		nautilus_string_list_insert (fruits, "orange");
-		nautilus_string_list_insert (fruits, "apple");
-		nautilus_string_list_insert (fruits, "strawberry");
-		nautilus_string_list_insert (fruits, "cherry");
-		nautilus_string_list_insert (fruits, "bananna");
-		nautilus_string_list_insert (fruits, "watermelon");
-
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_index_for_string (fruits, "orange"), 0);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_index_for_string (fruits, "apple"), 1);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_index_for_string (fruits, "strawberry"), 2);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_index_for_string (fruits, "cherry"), 3);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_index_for_string (fruits, "bananna"), 4);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_index_for_string (fruits, "watermelon"), 5);
-
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_index_for_string (fruits, "papaya"), NAUTILUS_STRING_LIST_NOT_FOUND);
-
-		nautilus_string_list_free (fruits);
-	}
-
-	/*
-	 * nautilus_string_list_as_concatenated_string
-	 *
-	 */
-	{
-		NautilusStringList *l;
-
-		l = nautilus_string_list_new (TRUE);
-		
-		nautilus_string_list_insert (l, "x");
-
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_as_concatenated_string (l, NULL), "x");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_as_concatenated_string (l, ":"), "x");
-
-		nautilus_string_list_insert (l, "y");
-		nautilus_string_list_insert (l, "z");
-
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_as_concatenated_string (l, NULL), "xyz");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_as_concatenated_string (l, ""), "xyz");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_as_concatenated_string (l, ":"), "x:y:z");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_as_concatenated_string (l, "abc"), "xabcyabcz");
-
-		nautilus_string_list_free (l);
-	}
-
-
-	/*
-	 * nautilus_string_list_sort
-	 *
-	 */
-	{
-		NautilusStringList *l;
-
-		l = nautilus_string_list_new (TRUE);
-		
-		nautilus_string_list_insert (l, "dog");
-		nautilus_string_list_insert (l, "cat");
-		nautilus_string_list_insert (l, "bird");
-
-		nautilus_string_list_sort (l);
-
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 0), "bird");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 1), "cat");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 2), "dog");
-
-		nautilus_string_list_free (l);
-	}
-
-	/*
-	 * nautilus_string_list_remove_duplicates
-	 *
-	 */
-	{
-		NautilusStringList *l;
-
-		l = nautilus_string_list_new (TRUE);
-
-		nautilus_string_list_remove_duplicates (l);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (l), 0);
-		
-		nautilus_string_list_insert (l, "foo");
-		nautilus_string_list_insert (l, "bar");
-		nautilus_string_list_insert (l, "bar");
-		nautilus_string_list_insert (l, "foo");
-		nautilus_string_list_insert (l, "foo");
-
-		nautilus_string_list_remove_duplicates (l);
-
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (l), 2);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 0), "foo");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 1), "bar");
-
-		nautilus_string_list_clear (l);
-
-		nautilus_string_list_remove_duplicates (l);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (l), 0);
-
-		nautilus_string_list_insert (l, "single");
-		nautilus_string_list_remove_duplicates (l);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (l), 1);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 0), "single");
-
-		nautilus_string_list_clear (l);
-
-		nautilus_string_list_free (l);
-	}
-
-	/*
-	 * nautilus_string_list_assign_from_string_list
-	 *
-	 */
-	{
-		NautilusStringList *l;
-		NautilusStringList *other;
-
-		l = nautilus_string_list_new (TRUE);
-		other = nautilus_string_list_new (TRUE);
-
-		/* assign an other with some items */
-		nautilus_string_list_insert (other, "dog");
-		nautilus_string_list_insert (other, "cat");
-		nautilus_string_list_insert (other, "mouse");
-		nautilus_string_list_assign_from_string_list (l, other);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (l), 3);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 0), "dog");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 1), "cat");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 2), "mouse");
-
-		/* assign an other with 1 item */
-		nautilus_string_list_clear (other);
-		nautilus_string_list_insert (other, "something");
-		nautilus_string_list_assign_from_string_list (l, other);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (l), 1);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (l, 0), "something");
-		
-		/* assign an empty other */
-		nautilus_string_list_clear (other);
-		nautilus_string_list_assign_from_string_list (l, other);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (l), 0);
-
-		nautilus_string_list_free (l);
-		nautilus_string_list_free (other);
-	}
-
-
-	/*
-	 * nautilus_string_list_get_longest_string
-	 *
-	 */
-	{
-		NautilusStringList *l;
-
-		l = nautilus_string_list_new (TRUE);
-
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_get_longest_string (l), NULL);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_longest_string_length (l), 0);
-
-		nautilus_string_list_insert (l, "a");
-		nautilus_string_list_insert (l, "bb");
-		nautilus_string_list_insert (l, "ccc");
-		nautilus_string_list_insert (l, "dddd");
-
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_get_longest_string (l), "dddd");
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_longest_string_length (l), strlen ("dddd"));
-
-		nautilus_string_list_clear (l);
-
-		nautilus_string_list_insert (l, "foo");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_get_longest_string (l), "foo");
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_longest_string_length (l), strlen ("foo"));
-
-		nautilus_string_list_free (l);
-
-	}
-
-	/*
-	 * case insensitive tests
-	 *
-	 */
-	{
-		NautilusStringList *l;
-
-		l = nautilus_string_list_new (FALSE);
-
-		nautilus_string_list_insert (l, "foo");
-		nautilus_string_list_insert (l, "bar");
-
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (l, "Foo"), TRUE);
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (l, "foO"), TRUE);
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (l, "fOo"), TRUE);
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_contains (l, "foo"), TRUE);
-
-		nautilus_string_list_clear (l);
-
-		nautilus_string_list_insert (l, "Foo");
-		nautilus_string_list_insert (l, "Foo");
-		nautilus_string_list_insert (l, "fOo");
-		nautilus_string_list_insert (l, "foO");
-		nautilus_string_list_remove_duplicates (l);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (l), 1);
-
-		nautilus_string_list_free (l);
-	}
-
-	/*
-	 * nautilus_string_list_new_from_tokens
-	 */
-	{
-		NautilusStringList *lines;
-		NautilusStringList *thick_lines;
-
-		const char lines_string[] = "This\nAre\nSome\n\nLines";
-		const char thick_lines_string[] = "This####Are####Some########Lines";
-		const int num_lines = nautilus_str_count_characters (lines_string, '\n') + 1;
-
-		lines = nautilus_string_list_new_from_tokens (lines_string, "\n", TRUE);
-		thick_lines = nautilus_string_list_new_from_tokens (thick_lines_string, "####", TRUE);
-
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_equals (lines, thick_lines), TRUE);
-
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (lines), num_lines);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (lines, 0), "This");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (lines, 1), "Are");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (lines, 2), "Some");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (lines, 3), "");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (lines, 4), "Lines");
-		
-		nautilus_string_list_free (lines);
-		nautilus_string_list_free (thick_lines);
-	}
-
-	/*
-	 * nautilus_string_list_modify_nth
-	 */
-	{
-		NautilusStringList *list;
-
-		list = nautilus_string_list_new (TRUE);
-		nautilus_string_list_insert (list, "dog");
-		nautilus_string_list_insert (list, "cat");
-		nautilus_string_list_insert (list, "mouse");
-
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 0), "dog");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 2), "mouse");
-		nautilus_string_list_modify_nth (list, 2, "rat");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 2), "rat");
-		nautilus_string_list_modify_nth (list, 0, "pig");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 0), "pig");
-		
-		nautilus_string_list_free (list);
-	}
-
-	/*
-	 * nautilus_string_list_remove_nth
-	 */
-	{
-		NautilusStringList *list;
-
-		list = nautilus_string_list_new (TRUE);
-		nautilus_string_list_insert (list, "dog");
-		nautilus_string_list_insert (list, "cat");
-		nautilus_string_list_insert (list, "mouse");
-		nautilus_string_list_insert (list, "bird");
-		nautilus_string_list_insert (list, "pig");
-		
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (list), 5);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 0), "dog");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 4), "pig");
-
-		nautilus_string_list_remove_nth (list, 2);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (list), 4);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 2), "bird");
-
-		nautilus_string_list_remove_nth (list, 3);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (list), 3);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 0), "dog");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 2), "bird");
-
-		nautilus_string_list_remove_nth (list, 0);
-		NAUTILUS_CHECK_INTEGER_RESULT (nautilus_string_list_get_length (list), 2);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 0), "cat");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_nth (list, 1), "bird");
-		
-		nautilus_string_list_free (list);
-	}
-
-	/*
-	 * nautilus_string_list_find_by_function
-	 */
-	{
-		NautilusStringList *list;
-
-		list = nautilus_string_list_new (TRUE);
-		nautilus_string_list_insert (list, "house");
-		nautilus_string_list_insert (list, "street");
-		nautilus_string_list_insert (list, "car");
-		nautilus_string_list_insert (list, "dog");
-		
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_find_by_function (NULL, test_dog, NULL), NULL);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_find_by_function (list, test_dog, NULL), "dog");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_find_by_function (list, test_false, NULL), NULL);
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_find_by_function (list, test_true, NULL), "house");
-		NAUTILUS_CHECK_STRING_RESULT (nautilus_string_list_find_by_function (list, test_data, "car"), "car");
-
-		nautilus_string_list_free (list);
-	}
-
-	/*
-	 * nautilus_string_list_sort_by_function
-	 */
-	{
-		NautilusStringList *sorted_list;
-		NautilusStringList *list;
-
-		sorted_list = nautilus_string_list_new (TRUE);
-		nautilus_string_list_insert (sorted_list, "0");
-		nautilus_string_list_insert (sorted_list, "1");
-		nautilus_string_list_insert (sorted_list, "2");
-		nautilus_string_list_insert (sorted_list, "3");
-		nautilus_string_list_insert (sorted_list, "4");
-
-		list = nautilus_string_list_new (TRUE);
-		nautilus_string_list_insert (list, "4");
-		nautilus_string_list_insert (list, "2");
-		nautilus_string_list_insert (list, "1");
-		nautilus_string_list_insert (list, "0");
-		nautilus_string_list_insert (list, "3");
-
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_equals (list, sorted_list), FALSE);
-
-		nautilus_string_list_sort_by_function (list, compare_number);
-		
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_equals (list, sorted_list), TRUE);
-
-		nautilus_string_list_free (list);
-		nautilus_string_list_free (sorted_list);
-	}
-
-	/*
-	 * nautilus_string_list_nth_as_integer
-	 */
-	{
-		NautilusStringList *list;
-		const int untouched = 666;
-		int result;
-
-		list = nautilus_string_list_new_from_tokens ("word,c,0,1,20,xxx,foo,bar,-1", ",", TRUE);
-		
-		result = untouched;
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_nth_as_integer (list, 0, &result), FALSE);
-		NAUTILUS_CHECK_INTEGER_RESULT (result, untouched);
-
-		result = untouched;
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_nth_as_integer (list, 1, &result), FALSE);
-		NAUTILUS_CHECK_INTEGER_RESULT (result, untouched);
-
-		result = untouched;
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_nth_as_integer (list, 5, &result), FALSE);
-		NAUTILUS_CHECK_INTEGER_RESULT (result, untouched);
-
-		result = untouched;
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_nth_as_integer (list, 6, &result), FALSE);
-		NAUTILUS_CHECK_INTEGER_RESULT (result, untouched);
-
-		result = untouched;
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_nth_as_integer (list, 7, &result), FALSE);
-		NAUTILUS_CHECK_INTEGER_RESULT (result, untouched);
-		
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_nth_as_integer (list, 2, &result), TRUE);
-		NAUTILUS_CHECK_INTEGER_RESULT (result, 0);
-		
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_nth_as_integer (list, 3, &result), TRUE);
-		NAUTILUS_CHECK_INTEGER_RESULT (result, 1);
-
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_nth_as_integer (list, 4, &result), TRUE);
-		NAUTILUS_CHECK_INTEGER_RESULT (result, 20);
-		
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_string_list_nth_as_integer (list, 8, &result), TRUE);
-		NAUTILUS_CHECK_INTEGER_RESULT (result, -1);
-		
-		nautilus_string_list_free (list);
-	}
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-string-list.h b/libnautilus-private/nautilus-string-list.h
deleted file mode 100644
index 3bfd14a8c..000000000
--- a/libnautilus-private/nautilus-string-list.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-string-list.h: A collection of strings.
- 
-   Copyright (C) 1999, 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_STRING_LIST_H
-#define NAUTILUS_STRING_LIST_H
-
-#include <glib.h>
-
-#define NAUTILUS_STRING_LIST_NOT_FOUND -1
-
-/* Opaque type declaration. */
-typedef struct _NautilusStringList NautilusStringList;
-
-/* Test function for finding strings in the list */
-typedef gboolean (*NautilusStringListTestFunction) (const NautilusStringList *string_list,
-						    const char *string,
-						    gpointer callback_data);
-
-/* Construct an empty string list. */
-NautilusStringList *nautilus_string_list_new                       (gboolean                        case_sensitive);
-
-/* Construct a string list with a single element */
-NautilusStringList *nautilus_string_list_new_from_string           (const char                     *string,
-								    gboolean                        case_sensitive);
-
-/* Construct a string list that is a copy of another string list */
-NautilusStringList *nautilus_string_list_new_from_string_list      (const NautilusStringList       *other_or_null,
-								    gboolean                        case_sensitive);
-
-/* Construct a string list from tokens delimited by the given string and delimeter */
-NautilusStringList *nautilus_string_list_new_from_tokens           (const char                     *string,
-								    const char                     *delimiter,
-								    gboolean                        case_sensitive);
-
-/* Assign the contents another string list.  The other string list can be null. */
-void                nautilus_string_list_assign_from_string_list   (NautilusStringList             *string_list,
-								    const NautilusStringList       *other_or_null);
-/* Free a string list */
-void                nautilus_string_list_free                      (NautilusStringList             *string_list_or_null);
-
-/* Insert a string into the collection. */
-void                nautilus_string_list_insert                    (NautilusStringList             *string_list,
-								    const char                     *string);
-/* Clear the collection. */
-void                nautilus_string_list_clear                     (NautilusStringList             *string_list);
-
-/* Access the nth string in the collection.  Returns an strduped string. */
-char *              nautilus_string_list_nth                       (const NautilusStringList       *string_list,
-								    guint                           n);
-/* Access the nth string as an integer.  Return TRUE if the conversion was successful.  */
-gboolean            nautilus_string_list_nth_as_integer            (const NautilusStringList       *string_list,
-								    guint                           n,
-								    int *integer_result);
-/* Modify the nth string in the collection. */
-void                nautilus_string_list_modify_nth                (NautilusStringList             *string_list,
-								    guint                           n,
-								    const char                     *string);
-/* Remove the nth string in the collection. */
-void                nautilus_string_list_remove_nth                (NautilusStringList             *string_list,
-								    guint                           n);
-/* Does the string list contain the given string ? */
-gboolean            nautilus_string_list_contains                  (const NautilusStringList       *string_list,
-								    const char                     *string);
-/* Find a string using the given test function ? */
-char *              nautilus_string_list_find_by_function          (const NautilusStringList       *string_list,
-								    NautilusStringListTestFunction  test_function,
-								    gpointer                        callback_data);
-/* How many strings are currently in the collection ? */
-guint               nautilus_string_list_get_length                (const NautilusStringList       *string_list);
-
-/* Get the index for the given string.  Return NAUTILUS_STRING_LIST_NOT_FOUND if not found. */
-int                 nautilus_string_list_get_index_for_string      (const NautilusStringList       *string_list,
-								    const char                     *string);
-/* Does the string list a equal string list b ? */
-gboolean            nautilus_string_list_equals                    (const NautilusStringList       *a,
-								    const NautilusStringList       *b);
-/* Return the string list in a GList.  Must deep free the result with nautilus_g_list_free_deep() */
-GList *             nautilus_string_list_as_g_list                 (const NautilusStringList       *string_list);
-
-/* Return the string list as a concatenation of all the items delimeted by delimeter. */
-char *              nautilus_string_list_as_concatenated_string    (const NautilusStringList       *string_list,
-								    const char                     *delimiter);
-/* Sort the string collection. */
-void                nautilus_string_list_sort                      (NautilusStringList             *string_list);
-
-/* Sort the string collection using a comparison function. */
-void                nautilus_string_list_sort_by_function          (NautilusStringList             *string_list,
-								    GCompareFunc                    compare_function);
-/* Remove duplicate strings from the collection. */
-void                nautilus_string_list_remove_duplicates         (NautilusStringList             *string_list);
-
-/* Invoke the given function for each string in the collection. */
-void                nautilus_string_list_for_each                  (const NautilusStringList       *string_list,
-								    GFunc                           function,
-								    gpointer                        user_data);
-
-/* Return the longest string in the collection. */
-char *              nautilus_string_list_get_longest_string        (const NautilusStringList       *string_list);
-
-/* Return the length of the longest string in the collection. */
-int                 nautilus_string_list_get_longest_string_length (const NautilusStringList       *string_list);
-
-#endif /* NAUTILUS_STRING_LIST_H */
-
diff --git a/libnautilus-private/nautilus-string-map.c b/libnautilus-private/nautilus-string-map.c
deleted file mode 100644
index 19c0c9d5a..000000000
--- a/libnautilus-private/nautilus-string-map.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-string-map.c: A many-to-one string mapping data structure.
- 
-   Copyright (C) 1999, 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-string-map.h"
-#include "nautilus-string-list.h"
-#include "nautilus-string.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-lib-self-check-functions.h"
-#include <string.h>
-
-struct _NautilusStringMap
-{
-	GList		*map;
-	gboolean	case_sensitive;
-};
-
-typedef struct 
-{
-	char			*string;
-	NautilusStringList	*map_list;
-} MapEntry;
-
-/* MapEntry things */
-static MapEntry *map_entry_new                       (const char *string,
-						      gboolean    case_sensitive);
-static void      map_entry_free                      (MapEntry   *map_entry);
-static MapEntry *map_entry_list_lookup_mapped_string (GList      *entry_list,
-						      const char *mapped_string,
-						      gboolean    case_sensitive);
-static MapEntry *map_entry_list_lookup               (GList      *entry_list,
-						      const char *string);
-static gboolean  str_is_equal                        (const char *a,
-						      const char *b,
-						      gboolean    case_sensitive);
-
-/**
- * nautilus_string_map_new:
- *
- * @case_sensitive: Boolean flag indicating whether the string map is case sensitive.
- *
- * Allocate an empty string map.
- *
- * Return value: A newly allocated string map.
- */
-NautilusStringMap *
-nautilus_string_map_new (gboolean case_sensitive)
-{
-	NautilusStringMap * string_map;
-
-	string_map = g_new (NautilusStringMap, 1);
-
-	string_map->map = NULL;
-	string_map->case_sensitive = case_sensitive;
-
-	return string_map;
-}
-
-/**
- * nautilus_string_map_free:
- *
- * @string_map: A NautilusStringMap
- *
- * Free the string map.
- */
-void
-nautilus_string_map_free (NautilusStringMap *string_map)
-{
-	if (string_map == NULL) {
-		return;
-	}
-	
-	nautilus_string_map_clear (string_map);
-
-	g_free (string_map);
-}
-
-static void
-map_for_each_node_free (gpointer	data,
-			gpointer	user_data)
-{
-	MapEntry *map_entry = (MapEntry *) data;
-	g_assert (map_entry != NULL);
-
-	map_entry_free (map_entry);
-}
-
-/**
- * nautilus_string_map_clear:
- *
- * @string_map: A NautilusStringMap
- *
- * Clear the string map.
- */
-void
-nautilus_string_map_clear (NautilusStringMap *string_map)
-{
-	if (string_map == NULL) {
-		return;
-	}
-
-	g_return_if_fail (string_map != NULL);
-
-	nautilus_g_list_free_deep_custom (string_map->map, map_for_each_node_free, NULL);
-
-	string_map->map = NULL;
-}
-
-/**
- * nautilus_string_map_lookup:
- *
- * @string_map: A NautilusStringMap
- * @string: The mapped string to lookup
- *
- * Lookup the mapping for 'string'
- *
- * Return value: A copy of the mapped_to_string or NULL if no mapping exists.
- */
-char *
-nautilus_string_map_lookup (const NautilusStringMap	*string_map,
-			    const char			*string)
-{
-	MapEntry *map_entry;
-
-	if (string_map == NULL || string == NULL) {
-		return NULL;
-	}
-
-	map_entry = map_entry_list_lookup (string_map->map, string);
-
-	return map_entry ? g_strdup (map_entry->string) : NULL;
-}
-
-/**
- * nautilus_string_map_add:
- *
- * @string_map: A NautilusStringMap
- *
- * Add a mapping from 'string' to 'strings_maps_to'
- */
-void
-nautilus_string_map_add (NautilusStringMap	*string_map,
-			 const char		*string_maps_to,
-			 const char		*string)
-{
-	MapEntry *map_entry;
-
-	g_return_if_fail (string_map != NULL);
-	g_return_if_fail (string_maps_to != NULL);
-	g_return_if_fail (string != NULL);
-
-	map_entry = map_entry_list_lookup_mapped_string (string_map->map, string_maps_to, string_map->case_sensitive);
-
-	if (map_entry == NULL) {
-		map_entry = map_entry_new (string_maps_to, string_map->case_sensitive);
-
-		/* Add a mapping for the string_maps_to to simplify things */
-		nautilus_string_list_insert (map_entry->map_list, string_maps_to);
-
-		string_map->map = g_list_append (string_map->map, map_entry);
-	}
-
-	nautilus_string_list_insert (map_entry->map_list, string);
-}
-
-/* MapEntry things */
-static MapEntry *
-map_entry_new (const char	*string,
-	       gboolean		case_sensitive)
-{
-	MapEntry *map_entry;
-
-	g_return_val_if_fail (string != NULL, NULL);
-
-	map_entry = g_new (MapEntry, 1);
-	map_entry->map_list = nautilus_string_list_new (case_sensitive);
-	map_entry->string = g_strdup (string);
-
-	return map_entry;
-}
-
-static void
-map_entry_free (MapEntry *map_entry)
-{
-	g_return_if_fail (map_entry);
-
-	nautilus_string_list_free (map_entry->map_list);
-	map_entry->map_list = NULL;
-	g_free (map_entry->string);
-	g_free (map_entry);
-}
-
-static MapEntry *
-map_entry_list_lookup_mapped_string (GList	*entry_list,
-				     const char	*mapped_string,
-				     gboolean	case_sensitive)
-{
-	GList *iterator;
-
-	g_return_val_if_fail (mapped_string != NULL, NULL);
-
-	if (entry_list == NULL) {
-		return NULL;
-	}
-
-	for (iterator = entry_list; iterator != NULL; iterator = iterator->next) {
-		MapEntry *map_entry = (MapEntry *) iterator->data;
-		g_assert (map_entry != NULL);
-
-		if (str_is_equal (map_entry->string, mapped_string, case_sensitive)) {
-			return map_entry;
-		}
-	}
-
-	return NULL;
-}
-
-static MapEntry *
-map_entry_list_lookup (GList		*entry_list,
-		       const char	*string)
-{
-	GList *iterator;
-
-	g_return_val_if_fail (string != NULL, NULL);
-
-	if (entry_list == NULL) {
-		return NULL;
-	}
-
-	for (iterator = entry_list; iterator != NULL; iterator = iterator->next) {
-		MapEntry *map_entry = (MapEntry *) iterator->data;
-		g_assert (map_entry != NULL);
-
-		if (nautilus_string_list_contains (map_entry->map_list, string)) {
-			return map_entry;
-		}
-	}
-
-	return NULL;
-}
-
-static gboolean
-str_is_equal (const char	*a,
-	      const char	*b,
-	      gboolean		case_sensitive)
-{
-	return case_sensitive ? nautilus_str_is_equal (a, b) : nautilus_istr_is_equal (a, b);
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-void
-nautilus_self_check_string_map (void)
-{
-	NautilusStringMap *map;
-
-	map = nautilus_string_map_new (TRUE);
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "foo"), NULL);
-	
-	nautilus_string_map_clear (map);
-	
-	nautilus_string_map_add (map, "animal", "dog");
-	nautilus_string_map_add (map, "animal", "cat");
-	nautilus_string_map_add (map, "animal", "mouse");
-	nautilus_string_map_add (map, "human", "geek");
-	nautilus_string_map_add (map, "human", "nerd");
-	nautilus_string_map_add (map, "human", "lozer");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "animal"), "animal");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "cat"), "animal");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "dog"), "animal");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "mouse"), "animal");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "human"), "human");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "geek"), "human");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "nerd"), "human");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "lozer"), "human");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "Lozer"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "HuMaN"), NULL);
-
-	nautilus_string_map_free (map);
-
-	/*
-	 * case insensitive tests
-	 *
-	 */
-	map = nautilus_string_map_new (FALSE);
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "foo"), NULL);
-	
-	nautilus_string_map_clear (map);
-	
-	nautilus_string_map_add (map, "animal", "dog");
-	nautilus_string_map_add (map, "animal", "cat");
-	nautilus_string_map_add (map, "animal", "mouse");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "animal"), "animal");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "Animal"), "animal");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "cat"), "animal");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "CAT"), "animal");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "dog"), "animal");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_string_map_lookup (map, "DoG"), "animal");
-
-	nautilus_string_map_free (map);
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-string-map.h b/libnautilus-private/nautilus-string-map.h
deleted file mode 100644
index 22ff5ae0a..000000000
--- a/libnautilus-private/nautilus-string-map.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-string-map.h: A many-to-one string mapping data structure.
- 
-   Copyright (C) 1999, 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-/* NautilusStringMap is a simple data structure to manage many-to-one 
- * mappings of string.  For example:
- * 
- * map = map_new (TRUE);
- * map_add (map, "animal", "dog");
- * map_add (map, "animal", "cat");
- * map_add (map, "animal", "mouse");
- * 
- * map_lookup (map, "dog") => "animal"
- * map_lookup (map, "cat") => "animal"
- * map_lookup (map, "animal") => "animal"
- *
- */
-
-#ifndef NAUTILUS_STRING_MAP_H
-#define NAUTILUS_STRING_MAP_H
-
-#include <glib.h>
-
-/* Opaque type declaration. */
-typedef struct _NautilusStringMap NautilusStringMap;
-
-/* Construct an empty string map. */
-NautilusStringMap *nautilus_string_map_new    (gboolean                 case_sensitive);
-
-/* Add a mapping from 'string' to 'strings_maps_to' */
-void               nautilus_string_map_add    (NautilusStringMap       *string_map,
-					       const char              *string_maps_to,
-					       const char              *string);
-
-/* Free the string map */
-void               nautilus_string_map_free   (NautilusStringMap       *string_map);
-
-
-/* Clear the string map */
-void               nautilus_string_map_clear  (NautilusStringMap       *string_map);
-
-
-/* Lookup the string in the map.  Returns the string 'string' maps to or NULL of not found. */
-char *             nautilus_string_map_lookup (const NautilusStringMap *string_map,
-					       const char              *string);
-
-
-#endif /* NAUTILUS_STRING_MAP_H */
-
diff --git a/libnautilus-private/nautilus-string-picker.c b/libnautilus-private/nautilus-string-picker.c
deleted file mode 100644
index 8b1043e43..000000000
--- a/libnautilus-private/nautilus-string-picker.c
+++ /dev/null
@@ -1,382 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-string-picker.c - A widget to pick a string from a list.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-string-picker.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-glib-extensions.h"
-
-#include <gtk/gtklabel.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-
-#include <gtk/gtksignal.h>
-
-static const gint STRING_PICKER_SPACING = 10;
-
-/* Signals */
-typedef enum
-{
-	CHANGED,
-	LAST_SIGNAL
-} NautilusStringPickerSignals;
-
-struct _NautilusStringPickerDetail
-{
-	GtkWidget		*option_menu;
-	GtkWidget		*menu;
-	NautilusStringList	*string_list;
-};
-
-/* NautilusStringPickerClass methods */
-static void nautilus_string_picker_initialize_class (NautilusStringPickerClass *klass);
-static void nautilus_string_picker_initialize       (NautilusStringPicker      *string_picker);
-
-
-/* GtkObjectClass methods */
-static void nautilus_string_picker_destroy          (GtkObject                 *object);
-
-
-/* Option menu item callbacks */
-static void option_menu_activate_callback           (GtkWidget                 *menu_item,
-						     gpointer                   callback_data);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusStringPicker, nautilus_string_picker, NAUTILUS_TYPE_CAPTION)
-
-static guint string_picker_signals[LAST_SIGNAL] = { 0 };
-
-/*
- * NautilusStringPickerClass methods
- */
-static void
-nautilus_string_picker_initialize_class (NautilusStringPickerClass *string_picker_class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	
-	object_class = GTK_OBJECT_CLASS (string_picker_class);
-	widget_class = GTK_WIDGET_CLASS (string_picker_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_string_picker_destroy;
-	
-	/* Signals */
-	string_picker_signals[CHANGED] = gtk_signal_new ("changed",
-							 GTK_RUN_LAST,
-							 object_class->type,
-							 0,
-							 gtk_marshal_NONE__NONE,
-							 GTK_TYPE_NONE, 
-							 0);
-
-	gtk_object_class_add_signals (object_class, string_picker_signals, LAST_SIGNAL);
-}
-
-static void
-nautilus_string_picker_initialize (NautilusStringPicker *string_picker)
-{
-	string_picker->detail = g_new (NautilusStringPickerDetail, 1);
-
-	gtk_box_set_homogeneous (GTK_BOX (string_picker), FALSE);
-	gtk_box_set_spacing (GTK_BOX (string_picker), STRING_PICKER_SPACING);
-
-	string_picker->detail->string_list = nautilus_string_list_new (TRUE);
-	string_picker->detail->menu = NULL;
-
-	string_picker->detail->option_menu = gtk_option_menu_new ();
-
-	nautilus_caption_set_child (NAUTILUS_CAPTION (string_picker),
-				    string_picker->detail->option_menu,
-				    FALSE,
-				    FALSE);
-
-	gtk_widget_show (string_picker->detail->option_menu);
-}
-
-/*
- * GtkObjectClass methods
- */
-static void
-nautilus_string_picker_destroy (GtkObject* object)
-{
-	NautilusStringPicker * string_picker;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (object));
-	
-	string_picker = NAUTILUS_STRING_PICKER (object);
-
-	nautilus_string_list_free (string_picker->detail->string_list);
-
-	g_free (string_picker->detail);
-
-	/* Chain */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-/* Option menu item callbacks */
-static void
-option_menu_activate_callback (GtkWidget *menu_item, gpointer callback_data)
-{
-	NautilusStringPicker *string_picker;
-
-	g_return_if_fail (menu_item != NULL);
-	g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
-	
-	g_return_if_fail (callback_data != NULL);
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (callback_data));
-
-	string_picker = NAUTILUS_STRING_PICKER (callback_data);
-
-	gtk_signal_emit (GTK_OBJECT (string_picker), string_picker_signals[CHANGED]);
-}
-
-/*
- * NautilusStringPicker public methods
- */
-GtkWidget *
-nautilus_string_picker_new (void)
-{
-	return gtk_widget_new (nautilus_string_picker_get_type (), NULL);
-}
-
-/**
- * nautilus_string_picker_set_string_list:
- * @string_picker: A NautilusStringPicker
- * @string_list: A list of strings
- *
- * Returns: nope
- */
-void
-nautilus_string_picker_set_string_list (NautilusStringPicker		*string_picker,
-					const NautilusStringList	*string_list)
-{
-	guint i;
-
- 	g_return_if_fail (string_picker != NULL);
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
-
-	nautilus_string_list_assign_from_string_list (string_picker->detail->string_list, string_list);
-	
-	/* Kill the old menu if alive */
-	if (string_picker->detail->menu != NULL) {
-		gtk_option_menu_remove_menu (GTK_OPTION_MENU (string_picker->detail->option_menu));
-
-		/* The widget gets unrefed in the above call */
-		string_picker->detail->menu = NULL;
-	}
-
-	/* Make a new menu */
-	string_picker->detail->menu = gtk_menu_new ();
-	
-	if (nautilus_string_list_get_length (string_picker->detail->string_list) > 0) {
-		for (i = 0; i < nautilus_string_list_get_length (string_picker->detail->string_list); i++) {
-			GtkWidget *menu_item;
-			char *item_label = nautilus_string_list_nth (string_picker->detail->string_list, i);
-			g_assert (item_label != NULL);
-			
-			menu_item = gtk_menu_item_new_with_label (item_label);
-			g_free (item_label);
-
-			/* Save the index so we can later use it to retrieve the nth label from the list */
-			gtk_object_set_data (GTK_OBJECT (menu_item), "index", GINT_TO_POINTER (i));
-			
-			gtk_signal_connect (GTK_OBJECT (menu_item),
-					    "activate",
-					    GTK_SIGNAL_FUNC (option_menu_activate_callback),
-					    string_picker);
-			
-			gtk_widget_show (menu_item);
-			
-			gtk_menu_append (GTK_MENU (string_picker->detail->menu), menu_item);
-		}
-
-	}
-
-	/* Attatch the menu to the option button */
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (string_picker->detail->option_menu), string_picker->detail->menu);
-}
-
-/**
- * nautilus_string_picker_get_string_list:
- * @string_picker: A NautilusStringPicker
- *
- * Returns: A copy of the list of strings for the string picker.  Need to free it.
- */
-NautilusStringList*
-nautilus_string_picker_get_string_list (const NautilusStringPicker *string_picker)
-{
-
- 	g_return_val_if_fail (string_picker != NULL, NULL);
-	g_return_val_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker), NULL);
-
-	return nautilus_string_list_new_from_string_list (string_picker->detail->string_list, TRUE);
-}
-
-/* FIXME bugzilla.eazel.com 1556: 
- * Rename confusing string picker get/set functions
- */
-
-/**
- * nautilus_string_picker_get_selected_string
- * @string_picker: A NautilusStringPicker
- *
- * Returns: A copy of the currently selected text.  Need to g_free() it.
- */
-char *
-nautilus_string_picker_get_selected_string (NautilusStringPicker *string_picker)
-{
-	gint		item_index;
-	GtkWidget	*option_menu;
-	GtkWidget	*menu_item;
-
- 	g_return_val_if_fail (string_picker != NULL, NULL);
-	g_return_val_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker), NULL);
-
-	option_menu = string_picker->detail->option_menu;
-	
-	menu_item = GTK_OPTION_MENU (option_menu)->menu_item;
-
-	item_index = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (menu_item), "index"));
-
-	return (item_index != -1) ? nautilus_string_list_nth (string_picker->detail->string_list, item_index) : NULL;
-}
-
-/**
- * nautilus_string_picker_set_selected_string
- * @string_picker: A NautilusStringPicker
- *
- * Set the active item corresponding to the given text.
- */
-void
-nautilus_string_picker_set_selected_string (NautilusStringPicker	*string_picker,
-					    const char			*text)
-{
-	gint item_index;
-
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
-	g_return_if_fail (nautilus_string_list_contains (string_picker->detail->string_list, text));
-
-	item_index = nautilus_string_list_get_index_for_string (string_picker->detail->string_list, text);
-	g_assert (item_index != NAUTILUS_STRING_LIST_NOT_FOUND);
-
-	gtk_option_menu_set_history (GTK_OPTION_MENU (string_picker->detail->option_menu), item_index);
-}
-
-/**
- * nautilus_string_picker_set_selected_string_index
- * @string_picker: A NautilusStringPicker
- * @index: Index of selected string.
- *
- * Set the selected entry corresponding to the given index.
- */
-void
-nautilus_string_picker_set_selected_string_index (NautilusStringPicker *string_picker,
-						  guint index)
-{
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
-	g_return_if_fail (index < nautilus_string_list_get_length (string_picker->detail->string_list));
-	
-	gtk_option_menu_set_history (GTK_OPTION_MENU (string_picker->detail->option_menu), index);
-}
-
-/**
- * nautilus_string_picker_insert_string
- * @string_picker: A NautilusStringPicker
- * @string: The string to insert.
- *
- * Insert a new string into the string picker.
- */
-void
-nautilus_string_picker_insert_string (NautilusStringPicker       *string_picker,
-				      const char                 *string)
-{
-	NautilusStringList *new_string_list;
-
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
-
-	new_string_list = nautilus_string_list_new_from_string_list (string_picker->detail->string_list, TRUE);
-	nautilus_string_list_insert (new_string_list, string);
-	nautilus_string_picker_set_string_list (string_picker, new_string_list);
-	nautilus_string_list_free (new_string_list);
-}
-
-/**
- * nautilus_string_picker_insert_string
- * @string_picker: A NautilusStringPicker
- * @string: The string to insert.
- *
- * Insert a new string into the string picker.
- */
-gboolean
-nautilus_string_picker_contains (const NautilusStringPicker       *string_picker,
-				 const char			  *string)
-{
-	g_return_val_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker), FALSE);
-
-	return nautilus_string_list_contains (string_picker->detail->string_list, string);
-}
-
-/**
- * nautilus_string_picker_get_index_for_string
- * @string_picker: A NautilusStringPicker
- * @string: String to find.
- *
- * Return the index for the given string.  
- * Return NAUTILUS_STRING_LIST_NOT_FOUND if the string is not found.
- */
-int 
-nautilus_string_picker_get_index_for_string (const NautilusStringPicker *string_picker,
-					     const char *string)
-{
-	g_return_val_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker), NAUTILUS_STRING_LIST_NOT_FOUND);
-
-	return nautilus_string_list_get_index_for_string (string_picker->detail->string_list, string);
-}
-
-/**
- * nautilus_string_picker_clear:
-
- * @string_picker: A NautilusStringPicker
- *
- * Remove all entries from the string picker.
- */
-void
-nautilus_string_picker_clear (NautilusStringPicker *string_picker)
-{
-	NautilusStringList *empty_list;
-
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
-
-	/* Already empty */
-	if (nautilus_string_list_get_length (string_picker->detail->string_list) == 0) {
-		return;
-	}
-
-	empty_list = nautilus_string_list_new (TRUE);
-	nautilus_string_picker_set_string_list (string_picker, empty_list);
-	nautilus_string_list_free (empty_list);
-}
diff --git a/libnautilus-private/nautilus-string-picker.h b/libnautilus-private/nautilus-string-picker.h
deleted file mode 100644
index 9ce803b67..000000000
--- a/libnautilus-private/nautilus-string-picker.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-string-picker.h - A widget to pick a string from a list.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_STRING_PICKER_H
-#define NAUTILUS_STRING_PICKER_H
-
-#include <libnautilus-extensions/nautilus-caption.h>
-#include <libnautilus-extensions/nautilus-string-list.h>
-
-/*
- * NautilusStringPicker is made up of 2 widgets. 
- *
- * [title label] [string list]
- *
- * The user can select a string from the list.
- */
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_STRING_PICKER            (nautilus_string_picker_get_type ())
-#define NAUTILUS_STRING_PICKER(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_STRING_PICKER, NautilusStringPicker))
-#define NAUTILUS_STRING_PICKER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_STRING_PICKER, NautilusStringPickerClass))
-#define NAUTILUS_IS_STRING_PICKER(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_STRING_PICKER))
-
-typedef struct _NautilusStringPicker	       NautilusStringPicker;
-typedef struct _NautilusStringPickerClass      NautilusStringPickerClass;
-typedef struct _NautilusStringPickerDetail     NautilusStringPickerDetail;
-
-struct _NautilusStringPicker
-{
-	/* Super Class */
-	NautilusCaption			caption;
-	
-	/* Private stuff */
-	NautilusStringPickerDetail	*detail;
-};
-
-struct _NautilusStringPickerClass
-{
-	NautilusCaptionClass		parent_class;
-};
-
-GtkType             nautilus_string_picker_get_type                  (void);
-GtkWidget*          nautilus_string_picker_new                       (void);
-
-
-/* Set the list of strings. */
-void                nautilus_string_picker_set_string_list           (NautilusStringPicker       *string_picker,
-								      const NautilusStringList   *string_list);
-
-/* Access a copy of the list of strings. */
-NautilusStringList *nautilus_string_picker_get_string_list           (const NautilusStringPicker *string_picker);
-
-
-/* Get the selected string.  Resulting string needs to be freed with g_free(). */
-char *              nautilus_string_picker_get_selected_string       (NautilusStringPicker       *string_picker);
-
-
-/* Set the selected string.  The internal string list needs to contain the 'string'. */
-void                nautilus_string_picker_set_selected_string       (NautilusStringPicker       *string_picker,
-								      const char                 *string);
-void                nautilus_string_picker_set_selected_string_index (NautilusStringPicker       *string_picker,
-								      guint                       index);
-
-/* Add a new string to the picker. */
-void                nautilus_string_picker_insert_string             (NautilusStringPicker       *string_picker,
-								      const char                 *string);
-
-/* Does the string picker contain the given string ? */
-gboolean            nautilus_string_picker_contains                  (const NautilusStringPicker *string_picker,
-								      const char                 *string);
-
-/* Return the index of the given string */
-int                 nautilus_string_picker_get_index_for_string      (const NautilusStringPicker *string_picker,
-								      const char                 *string);
-
-/* Remove all entries from the string picker. */
-void                nautilus_string_picker_clear                     (NautilusStringPicker       *string_picker);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_STRING_PICKER_H */
-
-
diff --git a/libnautilus-private/nautilus-string.c b/libnautilus-private/nautilus-string.c
deleted file mode 100644
index 18f30bf07..000000000
--- a/libnautilus-private/nautilus-string.c
+++ /dev/null
@@ -1,1025 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-string.c: String routines to augment <string.h>.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-string.h"
-
-#include <ctype.h>
-#include <errno.h>
-#include <locale.h>
-#include <stdlib.h>
-
-#include "nautilus-lib-self-check-functions.h"
-
-size_t
-nautilus_strlen (const char *string)
-{
-	return string == NULL ? 0 : strlen (string);
-}
-
-char *
-nautilus_strchr (const char *haystack, char needle)
-{
-	return haystack == NULL ? NULL : strchr (haystack, needle);
-}
-
-int
-nautilus_strcmp (const char *string_a, const char *string_b)
-{
-	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
-	 * treat 'NULL < ""', or have a flavor that does that. If we
-	 * didn't have code that already relies on 'NULL == ""', I
-	 * would change it right now.
-	 */
-	return strcmp (string_a == NULL ? "" : string_a,
-		       string_b == NULL ? "" : string_b);
-}
-
-int
-nautilus_strcasecmp (const char *string_a, const char *string_b)
-{
-	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
-	 * treat 'NULL < ""', or have a flavor that does that. If we
-	 * didn't have code that already relies on 'NULL == ""', I
-	 * would change it right now.
-	 */
-	return g_strcasecmp (string_a == NULL ? "" : string_a,
-		             string_b == NULL ? "" : string_b);
-}
-
-int
-nautilus_strcmp_case_breaks_ties (const char *string_a, const char *string_b)
-{
-	int casecmp_result;
-
-	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
-	 * treat 'NULL < ""', or have a flavor that does that. If we
-	 * didn't have code that already relies on 'NULL == ""', I
-	 * would change it right now.
-	 */
-	casecmp_result = nautilus_strcasecmp (string_a, string_b);
-	if (casecmp_result != 0) {
-		return casecmp_result;
-	}
-	return nautilus_strcmp (string_a, string_b);
-}
-
-int
-nautilus_strcoll (const char *string_a, const char *string_b)
-{
-	const char *locale;
-	int result;
-	
-	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
-	 * treat 'NULL < ""', or have a flavor that does that. If we
-	 * didn't have code that already relies on 'NULL == ""', I
-	 * would change it right now.
-	 */
-
-	locale = setlocale (LC_COLLATE, NULL);
-	
-	if (locale == NULL || strcmp (locale, "C") == 0 || strcmp (locale, "POSIX") == 0) {
-		/* If locale is NULL or default "C" or "POSIX" use nautilus sorting */
-		return nautilus_strcmp_case_breaks_ties (string_a, string_b);
-	} else {
-		/* Use locale-specific collated sorting */
-		result = strcoll (string_a == NULL ? "" : string_a,
-				  string_b == NULL ? "" : string_b);
-		if (result != 0) {
-			return result;
-		}
-		return nautilus_strcmp (string_a, string_b);
-	}
-}
-
-gboolean
-nautilus_str_is_empty (const char *string_or_null)
-{
-	return nautilus_strcmp (string_or_null, NULL) == 0;
-}
-
-gboolean
-nautilus_str_is_equal (const char *string_a, const char *string_b)
-{
-	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
-	 * treat 'NULL != ""', or have a flavor that does that. If we
-	 * didn't have code that already relies on 'NULL == ""', I
-	 * would change it right now.
-	 */
-	return nautilus_strcmp (string_a, string_b) == 0;
-}
-
-gboolean
-nautilus_istr_is_equal (const char *string_a, const char *string_b)
-{
-	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
-	 * treat 'NULL != ""', or have a flavor that does that. If we
-	 * didn't have code that already relies on 'NULL == ""', I
-	 * would change it right now.
-	 */
-	return nautilus_strcasecmp (string_a, string_b) == 0;
-}
-
-int
-nautilus_strcmp_compare_func (gconstpointer string_a, gconstpointer string_b)
-{
-	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
-	 * treat 'NULL < ""', or have a flavor that does that. If we
-	 * didn't have code that already relies on 'NULL == ""', I
-	 * would change it right now.
-	 */
-	return nautilus_strcmp ((const char *) string_a,
-				(const char *) string_b);
-}
-
-int
-nautilus_strcoll_compare_func (gconstpointer string_a, gconstpointer string_b)
-{
-	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
-	 * treat 'NULL < ""', or have a flavor that does that. If we
-	 * didn't have code that already relies on 'NULL == ""', I
-	 * would change it right now.
-	 */
-	return nautilus_strcoll ((const char *) string_a,
-				 (const char *) string_b);
-}
-
-int
-nautilus_strcasecmp_compare_func (gconstpointer string_a, gconstpointer string_b)
-{
-	/* FIXME bugzilla.eazel.com 5450: Maybe we need to make this
-	 * treat 'NULL < ""', or have a flavor that does that. If we
-	 * didn't have code that already relies on 'NULL == ""', I
-	 * would change it right now.
-	 */
-	return nautilus_strcasecmp ((const char *) string_a,
-				    (const char *) string_b);
-}
-
-gboolean
-nautilus_str_has_prefix (const char *haystack, const char *needle)
-{
-	const char *h, *n;
-
-	/* Eat one character at a time. */
-	h = haystack == NULL ? "" : haystack;
-	n = needle == NULL ? "" : needle;
-	do {
-		if (*n == '\0') {
-			return TRUE;
-		}
-		if (*h == '\0') {
-			return FALSE;
-		}
-	} while (*h++ == *n++);
-	return FALSE;
-}
-
-gboolean
-nautilus_str_has_suffix (const char *haystack, const char *needle)
-{
-	const char *h, *n;
-
-	if (needle == NULL) {
-		return TRUE;
-	}
-	if (haystack == NULL) {
-		return needle[0] == '\0';
-	}
-		
-	/* Eat one character at a time. */
-	h = haystack + strlen(haystack);
-	n = needle + strlen(needle);
-	do {
-		if (n == needle) {
-			return TRUE;
-		}
-		if (h == haystack) {
-			return FALSE;
-		}
-	} while (*--h == *--n);
-	return FALSE;
-}
-
-gboolean
-nautilus_istr_has_prefix (const char *haystack, const char *needle)
-{
-	const char *h, *n;
-	char hc, nc;
-
-	/* Eat one character at a time. */
-	h = haystack == NULL ? "" : haystack;
-	n = needle == NULL ? "" : needle;
-	do {
-		if (*n == '\0') {
-			return TRUE;
-		}
-		if (*h == '\0') {
-			return FALSE;
-		}
-		hc = *h++;
-		nc = *n++;
-		hc = tolower ((guchar) hc);
-		nc = tolower ((guchar) nc);
-	} while (hc == nc);
-	return FALSE;
-}
-
-gboolean
-nautilus_istr_has_suffix (const char *haystack, const char *needle)
-{
-	const char *h, *n;
-	char hc, nc;
-
-	if (needle == NULL) {
-		return TRUE;
-	}
-	if (haystack == NULL) {
-		return needle[0] == '\0';
-	}
-		
-	/* Eat one character at a time. */
-	h = haystack + strlen (haystack);
-	n = needle + strlen (needle);
-	do {
-		if (n == needle) {
-			return TRUE;
-		}
-		if (h == haystack) {
-			return FALSE;
-		}
-		hc = *--h;
-		nc = *--n;
-		hc = tolower ((guchar) hc);
-		nc = tolower ((guchar) nc);
-	} while (hc == nc);
-	return FALSE;
-}
-
-/**
- * nautilus_str_get_prefix:
- * Get a new string containing the first part of an existing string.
- * 
- * @source: The string whose prefix should be extracted.
- * @delimiter: The string that marks the end of the prefix.
- * 
- * Return value: A newly-allocated string that that matches the first part
- * of @source, up to but not including the first occurrence of
- * @delimiter. If @source is NULL, returns NULL. If 
- * @delimiter is NULL, returns a copy of @source.
- * If @delimiter does not occur in @source, returns
- * a copy of @source.
- **/
-char *
-nautilus_str_get_prefix (const char *source, 
-			 const char *delimiter)
-{
-	char *prefix_start;
-
-	if (source == NULL) {
-		return NULL;
-	}
-
-	if (delimiter == NULL) {
-		return g_strdup (source);
-	}
-
-	prefix_start = strstr (source, delimiter);
-
-	if (prefix_start == NULL) {
-		return g_strdup ("");
-	}
-
-	return g_strndup (source, prefix_start - source);
-}
-
-
-/**
- * nautilus_str_get_after_prefix:
- * Get a new string containing the part of the string
- * after the prefix
- * @source: The string whose prefix should be extracted.
- * @delimiter: The string that marks the end of the prefix.
- * 
- * Return value: A newly-allocated string that that matches the end
- * of @source, starting right after the first occurr
- * @delimiter. If @source is NULL, returns NULL. If 
- * @delimiter is NULL, returns a copy of @source.
- * If @delimiter does not occur in @source, returns
- * NULL
- **/
-char *
-nautilus_str_get_after_prefix (const char *source,
-			       const char *delimiter)
-{
-	char *prefix_start;
-	
-	if (source == NULL) {
-		return NULL;
-	}
-	
-	if (delimiter == NULL) {
-		return g_strdup (source);
-	}
-	
-	prefix_start = strstr (source, delimiter);
-	
-	if (prefix_start == NULL) {
-		return NULL;
-	}
-	
-	return g_strdup (prefix_start);
-}
-
-gboolean
-nautilus_str_to_int (const char *string, int *integer)
-{
-	long result;
-	char *parse_end;
-
-	/* Check for the case of an empty string. */
-	if (string == NULL || *string == '\0') {
-		return FALSE;
-	}
-	
-	/* Call the standard library routine to do the conversion. */
-	errno = 0;
-	result = strtol (string, &parse_end, 0);
-
-	/* Check that the result is in range. */
-	if ((result == G_MINLONG || result == G_MAXLONG) && errno == ERANGE) {
-		return FALSE;
-	}
-	if (result < G_MININT || result > G_MAXINT) {
-		return FALSE;
-	}
-
-	/* Check that all the trailing characters are spaces. */
-	while (*parse_end != '\0') {
-		if (!isspace (*parse_end++)) {
-			return FALSE;
-		}
-	}
-
-	/* Return the result. */
-	*integer = result;
-	return TRUE;
-}
-
-/**
- * nautilus_str_strip_chr:
- * Remove all occurrences of a character from a string.
- * 
- * @source: The string to be stripped.
- * @remove_this: The char to remove from @source
- * 
- * Return value: A copy of @source, after removing all occurrences
- * of @remove_this.
- */
-char *
-nautilus_str_strip_chr (const char *source, char remove_this)
-{
-	char *result, *out;
-	const char *in;
-	
-        if (source == NULL) {
-		return NULL;
-	}
-	
-	result = g_new (char, strlen (source) + 1);
-	in = source;
-	out = result;
-	do {
-		if (*in != remove_this) {
-			*out++ = *in;
-		}
-	} while (*in++ != '\0');
-
-        return result;
-}
-
-/**
- * nautilus_str_strip_trailing_chr:
- * Remove trailing occurrences of a character from a string.
- * 
- * @source: The string to be stripped.
- * @remove_this: The char to remove from @source
- * 
- * Return value: @source, after removing trailing occurrences
- * of @remove_this.
- */
-char *
-nautilus_str_strip_trailing_chr (const char *source, char remove_this)
-{
-	const char *end;
-	
-        if (source == NULL) {
-		return NULL;
-	}
-
-	for (end = source + strlen (source); end != source; end--) {
-		if (end[-1] != remove_this) {
-			break;
-		}
-	}
-	
-        return g_strndup (source, end - source);
-}
-
-char *   
-nautilus_str_strip_trailing_str (const char *source, const char *remove_this)
-{
-	const char *end;
-	if (source == NULL) {
-		return NULL;
-	}
-	if (remove_this == NULL) {
-		return g_strdup (source);
-	}
-	end = source + strlen (source);
-	if (strcmp (end - strlen (remove_this), remove_this) != 0) {
-		return g_strdup (source);
-	}
-	else {
-		return g_strndup (source, strlen (source) - strlen(remove_this));
-	}
-	
-}
-
-gboolean
-nautilus_eat_str_to_int (char *source, int *integer)
-{
-	gboolean result;
-
-	result = nautilus_str_to_int (source, integer);
-	g_free (source);
-	return result;
-}
-
-char *
-nautilus_str_double_underscores (const char *string)
-{
-	int underscores;
-	const char *p;
-	char *q;
-	char *escaped;
-	
-	if (string == NULL) {
-		return NULL;
-	}
-	
-	underscores = 0;
-	for (p = string; *p != '\0'; p++) {
-		underscores += (*p == '_');
-	}
-	
-	if (underscores == 0) {
-		return g_strdup (string);
-	}
-
-	escaped = g_new (char, strlen (string) + underscores + 1);
-	for (p = string, q = escaped; *p != '\0'; p++, q++) {
-		/* Add an extra underscore. */
-		if (*p == '_') {
-			*q++ = '_';
-		}
-		*q = *p;
-	}
-	*q = '\0';
-	
-	return escaped;
-}
-
-char *
-nautilus_str_capitalize (const char *string)
-{
-	char *capitalized;
-
-	if (string == NULL) {
-		return NULL;
-	}
-
-	capitalized = g_strdup (string);
-
-	capitalized[0] = toupper ((guchar) capitalized[0]);
-
-	return capitalized;
-}
-
-/* Note: nautilus_string_ellipsize_* that use a length in pixels
- * rather than characters can be found in nautilus_gdk_extensions.h
- * 
- * FIXME bugzilla.eazel.com 5089: 
- * we should coordinate the names of nautilus_string_ellipsize_*
- * and nautilus_str_*_truncate so that they match better and reflect
- * their different behavior.
- */
-char *
-nautilus_str_middle_truncate (const char *string,
-			      guint truncate_length)
-{
-	char *truncated;
-	guint length;
-	guint num_left_chars;
-	guint num_right_chars;
-
-	const char delimter[] = "...";
-	const guint delimter_length = strlen (delimter);
-	const guint min_truncate_length = delimter_length + 2;
-
-	if (string == NULL) {
-		return NULL;
-	}
-
-	/* It doesnt make sense to truncate strings to less than
-	 * the size of the delimiter plus 2 characters (one on each
-	 * side)
-	 */
-	if (truncate_length < min_truncate_length) {
-		return g_strdup (string);
-	}
-
-	length = strlen (string);
-
-	/* Make sure the string is not already small enough. */
-	if (length <= truncate_length) {
-		return g_strdup (string);
-	}
-
-	/* Find the 'middle' where the truncation will occur. */
-	num_left_chars = (truncate_length - delimter_length) / 2;
-	num_right_chars = truncate_length - num_left_chars - delimter_length + 1;
-
-	truncated = g_new (char, truncate_length + 1);
-
-	strncpy (truncated, string, num_left_chars);
-	strncpy (truncated + num_left_chars, delimter, delimter_length);
-	strncpy (truncated + num_left_chars + delimter_length, string + length - num_right_chars + 1, num_right_chars);
-	
-	return truncated;
-}
-
-/**
- * nautilus_str_count_characters:
- * Count the number of 'c' characters that occur in 'string.
- * 
- * @string: The string to be scanned.
- * @c: The char to count.
- * 
- * Return value: @count, the 'c' occurance count.
- */
-guint
-nautilus_str_count_characters (const char	*string,
-			       char		c)
-{
-	guint count = 0;
-
-	while (string && *string != '\0') {
-		if (*string == c) {
-			count++;
-		}
-
-		string++;
-	}
-
-	return count;
-}
-
-char *
-nautilus_str_strip_substring_and_after (const char *string,
-					const char *substring)
-{
-	const char *substring_position;
-
-	g_return_val_if_fail (substring != NULL, g_strdup (string));
-	g_return_val_if_fail (substring[0] != '\0', g_strdup (string));
-
-	if (string == NULL) {
-		return NULL;
-	}
-
-	substring_position = strstr (string, substring);
-	if (substring_position == NULL) {
-		return g_strdup (string);
-	}
-
-	return g_strndup (string,
-			  substring_position - string);
-}
-
-char *
-nautilus_str_replace_substring (const char *string,
-				const char *substring,
-				const char *replacement)
-{
-	int substring_length, replacement_length, result_length, remaining_length;
-	const char *p, *substring_position;
-	char *result, *result_position;
-
-	g_return_val_if_fail (substring != NULL, g_strdup (string));
-	g_return_val_if_fail (substring[0] != '\0', g_strdup (string));
-
-	if (string == NULL) {
-		return NULL;
-	}
-
-	substring_length = strlen (substring);
-	replacement_length = nautilus_strlen (replacement);
-
-	result_length = strlen (string);
-	for (p = string; ; p = substring_position + substring_length) {
-		substring_position = strstr (p, substring);
-		if (substring_position == NULL) {
-			break;
-		}
-		result_length += replacement_length - substring_length;
-	}
-
-	result = g_malloc (result_length + 1);
-
-	result_position = result;
-	for (p = string; ; p = substring_position + substring_length) {
-		substring_position = strstr (p, substring);
-		if (substring_position == NULL) {
-			remaining_length = strlen (p);
-			memcpy (result_position, p, remaining_length);
-			result_position += remaining_length;
-			break;
-		}
-		memcpy (result_position, p, substring_position - p);
-		result_position += substring_position - p;
-		memcpy (result_position, replacement, replacement_length);
-		result_position += replacement_length;
-	}
-	g_assert (result_position - result == result_length);
-	result_position[0] = '\0';
-
-	return result;
-}
-
-
-/* Removes strings enclosed by the '[' and ']' characters.  Strings
-   that have unbalanced open and closed brackets will return the
-   string itself. */
-char *
-nautilus_str_remove_bracketed_text (const char *text)
-{
-	char *unbracketed_text;
-	char *unbracketed_segment, *new_unbracketed_text;
-	const char *current_text_location;
-	const char *next_open_bracket, *next_close_bracket;
-	int bracket_depth;
-	
-
-	g_return_val_if_fail (text != NULL, NULL);
-
-	current_text_location = text;
-	bracket_depth = 0;
-	unbracketed_text = g_strdup ("");
-	while (TRUE) {
-		next_open_bracket = strchr (current_text_location, '[');
-		next_close_bracket = strchr (current_text_location, ']');
-		/* No more brackets */
-		if (next_open_bracket == NULL &&
-		    next_close_bracket == NULL) {
-			if (bracket_depth == 0) {
-				new_unbracketed_text = g_strconcat (unbracketed_text, 
-								    current_text_location, NULL);
-				g_free (unbracketed_text);
-				return new_unbracketed_text;
-			}
-			else {
-				g_free (unbracketed_text);
-				return g_strdup (text);
-			}
-		}
-		/* Close bracket but no open bracket */
-		else if (next_open_bracket == NULL) {
-			if (bracket_depth == 0) {
-				g_free (unbracketed_text);
-				return g_strdup (text);
-			}
-			else {
-				current_text_location = next_close_bracket + 1;
-				bracket_depth--;
-			}
-		}
-		/* Open bracket but no close bracket */
-		else if (next_close_bracket == NULL) {
-			g_free (unbracketed_text);
-			return g_strdup (text);
-		}
-		/* Deal with the open bracket, that's first */
-		else if (next_open_bracket < next_close_bracket) {
-			if (bracket_depth == 0) {
-				/* We're out of brackets. Copy until the next bracket */
-				unbracketed_segment = g_strndup (current_text_location,
-								 next_open_bracket - current_text_location);
-				new_unbracketed_text = g_strconcat (unbracketed_text, unbracketed_segment, NULL);
-				g_free (unbracketed_text);
-				g_free (unbracketed_segment);
-				unbracketed_text = new_unbracketed_text;
-			}
-			current_text_location = next_open_bracket + 1;
-			bracket_depth++;
-		}
-		/* Deal with the close bracket, that's first */
-		else {
-			if (bracket_depth > 0) {
-				bracket_depth--;
-				current_text_location = next_close_bracket + 1;
-			}
-			else {
-				g_free (unbracketed_text);
-				return g_strdup (text);
-			}
-		}
-	}
-	
-	     
-
-}
-
-#if !defined (NAUTILUS_OMIT_SELF_CHECK)
-
-static int
-call_str_to_int (const char *string)
-{
-	int integer;
-
-	integer = 9999;
-	nautilus_str_to_int (string, &integer);
-	return integer;
-}
-
-static int
-call_eat_str_to_int (char *string)
-{
-	int integer;
-
-	integer = 9999;
-	nautilus_eat_str_to_int (string, &integer);
-	return integer;
-}
-
-void
-nautilus_self_check_string (void)
-{
-	int integer;
-
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_strlen (NULL), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_strlen (""), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_strlen ("abc"), 3);
-
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_strcmp (NULL, NULL), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_strcmp (NULL, ""), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_strcmp ("", NULL), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_strcmp ("a", "a"), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_strcmp ("aaab", "aaab"), 0);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_strcmp (NULL, "a") < 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_strcmp ("a", NULL) > 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_strcmp ("", "a") < 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_strcmp ("a", "") > 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_strcmp ("a", "b") < 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_strcmp ("a", "ab") < 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_strcmp ("ab", "a") > 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_strcmp ("aaa", "aaab") < 0, TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_strcmp ("aaab", "aaa") > 0, TRUE);
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix (NULL, NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix (NULL, ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("", NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("a", "a"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("aaab", "aaab"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix (NULL, "a"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("a", NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("", "a"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("a", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("a", "b"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("a", "ab"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("ab", "a"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("aaa", "aaab"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_prefix ("aaab", "aaa"), TRUE);
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix (NULL, NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix (NULL, ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("", NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("a", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("", "a"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("a", "a"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("aaab", "aaab"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix (NULL, "a"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("a", NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("", "a"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("a", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("a", "b"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("a", "ab"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("ab", "a"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("ab", "b"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("aaa", "baaa"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_has_suffix ("baaa", "aaa"), TRUE);
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix (NULL, NULL), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix (NULL, "foo"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix ("foo", NULL), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix ("", ""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix ("", "foo"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix ("foo", ""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix ("foo", "foo"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix ("foo:", ":"), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix ("foo:bar", ":"), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_prefix ("footle:bar", "tle:"), "foo");	
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix (NULL, NULL), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix (NULL, "foo"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix ("foo", NULL), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix ("", ""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix ("", "foo"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix ("foo", ""), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix ("foo", "foo"), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix ("foo:", ":"), ":");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix ("foo:bar", ":"), ":bar");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_get_after_prefix ("footle:bar", "tle:"), "tle:bar");	
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_chr (NULL, '_'), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_chr ("", '_'), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_chr ("foo", '_'), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_chr ("_foo", '_'), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_chr ("foo_", '_'), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_chr ("_foo__", '_'), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_chr ("_f_o__o_", '_'), "foo");
-        
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_chr (NULL, '_'), NULL);	
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_chr ("", '_'), "");	
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_chr ("foo", '_'), "foo");	
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_chr ("_foo", '_'), "_foo");	
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_chr ("foo_", '_'), "foo");	
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_chr ("_foo__", '_'), "_foo");	
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_chr ("_f_o__o_", '_'), "_f_o__o");	
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_str (NULL, NULL), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_str (NULL, "bar"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_str ("bar", NULL), "bar");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_str ("", ""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_str ("", "bar"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_str ("bar", ""), "bar");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_str ("foo", "bar"), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_str ("foo bar", "bar"), "foo ");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_trailing_str ("bar", "bar"), "");
-	
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_double_underscores (NULL), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_double_underscores (""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_double_underscores ("_"), "__");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_double_underscores ("foo"), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_double_underscores ("foo_bar"), "foo__bar");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_double_underscores ("foo_bar_2"), "foo__bar__2");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_double_underscores ("_foo"), "__foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_double_underscores ("foo_"), "foo__");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_capitalize (NULL), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_capitalize (""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_capitalize ("foo"), "Foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_capitalize ("Foo"), "Foo");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("foo", 0), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("foo", 1), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("foo", 3), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("foo", 4), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("foo", 5), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("foo", 6), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("foo", 7), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 0), "a_much_longer_foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 1), "a_much_longer_foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 2), "a_much_longer_foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 3), "a_much_longer_foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 4), "a_much_longer_foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 5), "a...o");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 6), "a...oo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 7), "a_...oo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 8), "a_...foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("a_much_longer_foo", 9), "a_m...foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_even", 8), "so...ven");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_odd", 8), "so...odd");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_even", 9), "som...ven");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_odd", 9), "som...odd");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_even", 10), "som...even");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_odd", 10), "som..._odd");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_even", 11), "some...even");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_odd", 11), "some..._odd");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_even", 12), "some..._even");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_odd", 12), "some...g_odd");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_even", 13), "somet..._even");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_odd", 13), "something_odd");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_even", 14), "something_even");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_middle_truncate ("something_odd", 13), "something_odd");
-
-	#define TEST_INTEGER_CONVERSION_FUNCTIONS(string, boolean_result, integer_result) \
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_to_int (string, &integer), boolean_result); \
-		NAUTILUS_CHECK_INTEGER_RESULT (call_str_to_int (string), integer_result); \
-		NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_eat_str_to_int (g_strdup (string), &integer), boolean_result); \
-		NAUTILUS_CHECK_INTEGER_RESULT (call_eat_str_to_int (g_strdup (string)), integer_result);
-
-	TEST_INTEGER_CONVERSION_FUNCTIONS (NULL, FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("a", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS (".", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("0", TRUE, 0)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("1", TRUE, 1)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("+1", TRUE, 1)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("-1", TRUE, -1)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("2147483647", TRUE, 2147483647)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("2147483648", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("+2147483647", TRUE, 2147483647)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("+2147483648", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("-2147483648", TRUE, INT_MIN)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("-2147483649", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("1a", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("0.0", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("1e1", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("21474836470", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("+21474836470", FALSE, 9999)
-	TEST_INTEGER_CONVERSION_FUNCTIONS ("-21474836480", FALSE, 9999)
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_is_equal (NULL, NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_is_equal (NULL, ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_is_equal ("", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_is_equal ("", NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_is_equal ("", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_is_equal ("foo", "foo"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_str_is_equal ("foo", "bar"), FALSE);
-
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal (NULL, NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal (NULL, ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("", NULL), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("", ""), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("foo", "foo"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("foo", "bar"), FALSE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("Foo", "foo"), TRUE);
-	NAUTILUS_CHECK_BOOLEAN_RESULT (nautilus_istr_is_equal ("foo", "Foo"), TRUE);
-
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters (NULL, 'x'), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters ("", 'x'), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters (NULL, '\0'), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters ("", '\0'), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters ("foo", 'x'), 0);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters ("foo", 'f'), 1);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters ("foo", 'o'), 2);
-	NAUTILUS_CHECK_INTEGER_RESULT (nautilus_str_count_characters ("xxxx", 'x'), 4);
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_substring_and_after (NULL, "bar"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_substring_and_after ("", "bar"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_substring_and_after ("foo", "bar"), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_substring_and_after ("foo bar", "bar"), "foo ");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_substring_and_after ("foo bar xxx", "bar"), "foo ");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_strip_substring_and_after ("bar", "bar"), "");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring (NULL, "foo", NULL), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring (NULL, "foo", "bar"), NULL);
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring ("bar", "foo", NULL), "bar");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring ("", "foo", ""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring ("", "foo", "bar"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring ("bar", "foo", ""), "bar");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring ("xxx", "x", "foo"), "foofoofoo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring ("fff", "f", "foo"), "foofoofoo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring ("foofoofoo", "foo", "f"), "fff");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_replace_substring ("foofoofoo", "f", ""), "oooooo");
-
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text (""), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("[]"), "");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("["), "[");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("]"), "]");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("[[]"), "[[]");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("foo"), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("foo [bar]"), "foo ");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("foo[ bar]"), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("foo[ bar] baz"), "foo baz");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("foo[ [b]ar] baz"), "foo baz");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("foo[ bar] baz[ bat]"), "foo baz");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("foo[ bar[ baz] bat]"), "foo");
-	NAUTILUS_CHECK_STRING_RESULT (nautilus_str_remove_bracketed_text ("foo[ bar] baz] bat]"), "foo[ bar] baz] bat]");
-}
-
-#endif /* !NAUTILUS_OMIT_SELF_CHECK */
diff --git a/libnautilus-private/nautilus-string.h b/libnautilus-private/nautilus-string.h
deleted file mode 100644
index d4e128bae..000000000
--- a/libnautilus-private/nautilus-string.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   nautilus-string.h: String routines to augment <string.h>.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#ifndef NAUTILUS_STRING_H
-#define NAUTILUS_STRING_H
-
-#include <glib.h>
-#include <string.h>
-
-/* We use the "str" abbrevation to mean char * string, since
- * "string" usually means g_string instead. We use the "istr"
- * abbreviation to mean a case-insensitive char *.
- */
-
-/* NULL is allowed for all the str parameters to these functions. */
-
-/* Versions of basic string functions that allow NULL, and handle
- * cases that the standard ones get a bit wrong for our purposes.
- */
-size_t   nautilus_strlen                        (const char    *str);
-char *   nautilus_strchr                        (const char    *haystack,
-						 char           needle);
-int      nautilus_strcmp                        (const char    *str_a,
-						 const char    *str_b);
-int      nautilus_strcoll                       (const char    *str_a,
-						 const char    *str_b);
-int      nautilus_strcasecmp                    (const char    *str_a,
-						 const char    *str_b);
-int      nautilus_strcmp_case_breaks_ties       (const char    *str_a,
-						 const char    *str_b);
-
-/* GCompareFunc versions. */
-int      nautilus_strcmp_compare_func           (gconstpointer  str_a,
-						 gconstpointer  str_b);
-int      nautilus_strcoll_compare_func          (gconstpointer  str_a,
-						 gconstpointer  str_b);
-int      nautilus_strcasecmp_compare_func       (gconstpointer  str_a,
-						 gconstpointer  str_b);
-
-/* Other basic string operations. */
-gboolean nautilus_str_is_empty                  (const char    *str_or_null);
-gboolean nautilus_str_is_equal                  (const char    *str_a,
-						 const char    *str_b);
-gboolean nautilus_istr_is_equal                 (const char    *str_a,
-						 const char    *str_b);
-gboolean nautilus_str_has_prefix                (const char    *target,
-						 const char    *prefix);
-char *   nautilus_str_get_prefix                (const char    *source,
-						 const char    *delimiter);
-char *   nautilus_str_get_after_prefix          (const char    *source,
-						 const char    *delimiter);
-gboolean nautilus_istr_has_prefix               (const char    *target,
-						 const char    *prefix);
-gboolean nautilus_str_has_suffix                (const char    *target,
-						 const char    *suffix);
-gboolean nautilus_istr_has_suffix               (const char    *target,
-						 const char    *suffix);
-char *   nautilus_str_strip_chr                 (const char    *str,
-						 char           remove_this);
-char *   nautilus_str_strip_trailing_chr        (const char    *str,
-						 char           remove_this);
-char *   nautilus_str_strip_trailing_str        (const char    *str,
-						 const char    *remove_this);
-
-/* Conversions to and from strings. */
-gboolean nautilus_str_to_int                    (const char    *str,
-						 int           *integer);
-gboolean nautilus_eat_str_to_int                (char          *str_gets_freed,
-						 int           *integer);
-/* Escape function for '_' character. */
-char *   nautilus_str_double_underscores        (const char    *str);
-
-/* Capitalize a string */
-char *   nautilus_str_capitalize                (const char    *str);
-
-/* Middle truncate a string to a maximum of truncate_length characters.
- * The resulting string will be truncated in the middle with a "..."
- * delimeter.
- */
-char *   nautilus_str_middle_truncate           (const char    *str,
-						 guint          truncate_length);
-
-
-/* Count the number of 'c' characters that occur in 'string'. */
-guint    nautilus_str_count_characters          (const char    *str,
-						 char           c);
-
-/* Remove all characters after the passed-in substring. */
-char *   nautilus_str_strip_substring_and_after (const char    *str,
-						 const char    *substring);
-
-/* Replace all occurrences of substring with replacement. */
-char *   nautilus_str_replace_substring         (const char    *str,
-						 const char    *substring,
-						 const char    *replacement);
-
-/* Remove all text in brackets.  Used where context is included in strings to 
- * be internationalized, to help translators, and to make sure that strings
- * that may be used in different places with a different meaning may be 
- * translated separately.  If brackets are not even, it will just return a 
- * copy of the original string. 
- */
-char *   nautilus_str_remove_bracketed_text     (const char    *text);
-
-#endif /* NAUTILUS_STRING_H */
diff --git a/libnautilus-private/nautilus-tabs.c b/libnautilus-private/nautilus-tabs.c
index bc718847f..a1a16b3f7 100644
--- a/libnautilus-private/nautilus-tabs.c
+++ b/libnautilus-private/nautilus-tabs.c
@@ -30,14 +30,14 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-scalable-font.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-scalable-font.h>
 #include <libnautilus-extensions/nautilus-theme.h>
 #include <math.h>
 #include <stdio.h>
@@ -80,7 +80,7 @@ struct NautilusTabsDetails {
 	int total_height;
 	
 	GdkRectangle title_rect;
-	NautilusScalableFont *tab_font;	
+	EelScalableFont *tab_font;	
 	int font_size;
 	int selected_tab;
 	
@@ -128,7 +128,7 @@ static void     draw_all_tabs		        (NautilusTabs *tabs);
 static TabItem* tab_item_find_by_name		(NautilusTabs	*tabs,
 						 const char		*name);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTabs, nautilus_tabs, GTK_TYPE_DRAWING_AREA)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTabs, nautilus_tabs, GTK_TYPE_DRAWING_AREA)
 
 static void
 nautilus_tabs_initialize_class (NautilusTabsClass *class)
@@ -181,7 +181,7 @@ nautilus_tabs_initialize (NautilusTabs *tabs)
 	/* FIXME bugzilla.eazel.com 5456: 
 	 * Hard coded font size.
 	 */
-	tabs->details->tab_font = nautilus_scalable_font_get_default_bold_font ();
+	tabs->details->tab_font = eel_scalable_font_get_default_bold_font ();
 	tabs->details->font_size = 14;
 	
 	gray_tab_directory_path = nautilus_theme_get_image_path ("gray_tab_pieces");
@@ -228,12 +228,12 @@ nautilus_tabs_destroy (GtkObject *object)
 	}
 	
 	/* release the tab list, if any */
-	nautilus_g_list_free_deep_custom (tabs->details->tab_items,
+	eel_g_list_free_deep_custom (tabs->details->tab_items,
 					  tab_item_destroy_cover,
 					  NULL);
 	g_free (tabs->details);
   	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* unload the tab piece images, if any */
@@ -481,7 +481,7 @@ allocate_cleared_pixbuf (int width, int height)
 static int
 measure_tab_name (NautilusTabs *tabs, const char *tab_name)
 {
-	return nautilus_scalable_font_text_width (tabs->details->tab_font,
+	return eel_scalable_font_text_width (tabs->details->tab_font,
 						  tabs->details->font_size,
 						  tab_name,
 						  strlen (tab_name));
@@ -499,32 +499,32 @@ draw_tab_label (NautilusTabs *tabs, GdkPixbuf *tab_pixbuf, int x_pos, const char
 	
 	/* make sure we can draw at least some of it */
 	if (text_x < gdk_pixbuf_get_width (tab_pixbuf)) {	
-		nautilus_scalable_font_draw_text (tabs->details->tab_font, tab_pixbuf, 
+		eel_scalable_font_draw_text (tabs->details->tab_font, tab_pixbuf, 
 					  text_x, text_y,
 					  NULL,
 					  tabs->details->font_size,
 					  label, strlen (label),
-					  NAUTILUS_RGB_COLOR_BLACK, NAUTILUS_OPACITY_FULLY_OPAQUE);
+					  EEL_RGB_COLOR_BLACK, EEL_OPACITY_FULLY_OPAQUE);
 		text_x -= 1;
 		text_y -= 1;
 
 		if (is_active) {
-			text_color = NAUTILUS_RGB_COLOR_WHITE;
+			text_color = EEL_RGB_COLOR_WHITE;
 		} else {
 			if (is_prelit) {
-				text_color = NAUTILUS_RGBA_COLOR_PACK (241, 241, 241, 255);		
+				text_color = EEL_RGBA_COLOR_PACK (241, 241, 241, 255);		
 			} else {
-				text_color = NAUTILUS_RGBA_COLOR_PACK (223, 223, 223, 255);		
+				text_color = EEL_RGBA_COLOR_PACK (223, 223, 223, 255);		
 			}
 		}
 	
-		nautilus_scalable_font_draw_text (tabs->details->tab_font, tab_pixbuf,
+		eel_scalable_font_draw_text (tabs->details->tab_font, tab_pixbuf,
 					  text_x, text_y,
 					  NULL,
 					  tabs->details->font_size,
 					  label, strlen (label),
 					  text_color,
-					  NAUTILUS_OPACITY_FULLY_OPAQUE);
+					  EEL_OPACITY_FULLY_OPAQUE);
 	}
 }
 
diff --git a/libnautilus-private/nautilus-text-caption.c b/libnautilus-private/nautilus-text-caption.c
deleted file mode 100644
index d98156684..000000000
--- a/libnautilus-private/nautilus-text-caption.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-text-caption.c - A text caption widget.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-text-caption.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-glib-extensions.h"
-
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-
-#include <libgnomevfs/gnome-vfs-utils.h>
-
-#include <string.h>
- 
-static const gint TEXT_CAPTION_INVALID = -1;
-static const gint TEXT_CAPTION_SPACING = 10;
-
-/* Signals */
-typedef enum
-{
-	CHANGED,
-	LAST_SIGNAL
-} NautilusTextCaptionSignals;
-
-struct _NautilusTextCaptionDetail
-{
-	GtkWidget		*text;
-
-	gboolean                expand_tilde;
-};
-
-/* NautilusTextCaptionClass methods */
-static void      nautilus_text_caption_initialize_class (NautilusTextCaptionClass *klass);
-static void      nautilus_text_caption_initialize       (NautilusTextCaption      *text_caption);
-
-/* GtkObjectClass methods */
-static void      nautilus_text_caption_destroy          (GtkObject                 *object);
-
-/* Editable (entry) callbacks */
-static void      entry_changed_callback                  (GtkWidget                 *entry,
-							  gpointer                   user_data);
-static void      entry_key_press_callback                (GtkWidget                 *widget,
-							  GdkEventKey               *event,
-							  gpointer                  user_data);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTextCaption, nautilus_text_caption, NAUTILUS_TYPE_CAPTION)
-
-static guint text_caption_signals[LAST_SIGNAL] = { 0 };
-
-/*
- * NautilusTextCaptionClass methods
- */
-static void
-nautilus_text_caption_initialize_class (NautilusTextCaptionClass *text_caption_class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	
-	object_class = GTK_OBJECT_CLASS (text_caption_class);
-	widget_class = GTK_WIDGET_CLASS (text_caption_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_text_caption_destroy;
-	
-	/* Signals */
-	text_caption_signals[CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				0,
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 
-				0);
-
-	gtk_object_class_add_signals (object_class, text_caption_signals, LAST_SIGNAL);
-}
-
-static void
-nautilus_text_caption_initialize (NautilusTextCaption *text_caption)
-{
-	text_caption->detail = g_new (NautilusTextCaptionDetail, 1);
-
-	gtk_box_set_homogeneous (GTK_BOX (text_caption), FALSE);
-	gtk_box_set_spacing (GTK_BOX (text_caption), TEXT_CAPTION_SPACING);
-
-	text_caption->detail->text = gtk_entry_new ();
-	
-	gtk_entry_set_editable (GTK_ENTRY (text_caption->detail->text), TRUE);
-	
-	nautilus_caption_set_child (NAUTILUS_CAPTION (text_caption),
-				    text_caption->detail->text,
-				    TRUE,
-				    TRUE);
-
-	gtk_signal_connect (GTK_OBJECT (text_caption->detail->text),
-			    "changed",
-			    GTK_SIGNAL_FUNC (entry_changed_callback),
-			    (gpointer) text_caption);
-	gtk_signal_connect_after (GTK_OBJECT (text_caption->detail->text),
-				  "key_press_event",
-				  GTK_SIGNAL_FUNC (entry_key_press_callback),
-				  (gpointer) text_caption);
-
-	gtk_widget_show (text_caption->detail->text);
-}
-
-/*
- * GtkObjectClass methods
- */
-static void
-nautilus_text_caption_destroy (GtkObject* object)
-{
-	NautilusTextCaption * text_caption;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (NAUTILUS_IS_TEXT_CAPTION (object));
-	
-	text_caption = NAUTILUS_TEXT_CAPTION (object);
-
-	g_free (text_caption->detail);
-
-	/* Chain */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-/*
- * Editable (entry) callbacks
- */
-static void
-entry_changed_callback (GtkWidget *entry, gpointer user_data)
-{
-	NautilusTextCaption *text_caption;
-
-	g_assert (user_data != NULL);
-	g_assert (NAUTILUS_IS_TEXT_CAPTION (user_data));
-
-	text_caption = NAUTILUS_TEXT_CAPTION (user_data);
-
-	gtk_signal_emit (GTK_OBJECT (text_caption), text_caption_signals[CHANGED]);
-}
-
-static void
-entry_key_press_callback (GtkWidget *widget, GdkEventKey *event, gpointer user_data)
-{
-	NautilusTextCaption *text_caption;
-	char *expanded_text;
-	
-	text_caption = NAUTILUS_TEXT_CAPTION (user_data);
-	
-	if (event->keyval == GDK_asciitilde) {
-		if (text_caption->detail->expand_tilde) {
-			expanded_text = gnome_vfs_expand_initial_tilde (gtk_entry_get_text (GTK_ENTRY (widget)));
-			
-			gtk_entry_set_text (GTK_ENTRY (widget), expanded_text);
-			g_free (expanded_text);
-		}
-	}
-}
-
-/*
- * NautilusTextCaption public methods
- */
-GtkWidget *
-nautilus_text_caption_new (void)
-{
-	return gtk_widget_new (nautilus_text_caption_get_type (), NULL);
-}
-
-/**
- * nautilus_text_caption_get_text
- * @text_caption: A NautilusTextCaption
- *
- * Returns: A copy of the currently selected text.  Need to g_free() it.
- */
-char *
-nautilus_text_caption_get_text (const NautilusTextCaption *text_caption)
-{
-	const char *entry_text;
-
- 	g_return_val_if_fail (text_caption != NULL, NULL);
-	g_return_val_if_fail (NAUTILUS_IS_TEXT_CAPTION (text_caption), NULL);
-
-	/* WATCHOUT: 
-	 * As of gtk1.2, gtk_entry_get_text() returns a non const reference to
-	 * the internal string.
-	 */
-	entry_text = (const char *) gtk_entry_get_text (GTK_ENTRY (text_caption->detail->text));
-
-	return g_strdup (entry_text);
-}
-
-void
-nautilus_text_caption_set_text (NautilusTextCaption	*text_caption,
-				 const char		*text)
-{
- 	g_return_if_fail (text_caption != NULL);
-	g_return_if_fail (NAUTILUS_IS_TEXT_CAPTION (text_caption));
-
-	gtk_entry_set_text (GTK_ENTRY (text_caption->detail->text), text);
-}
-
-void
-nautilus_text_caption_set_editable (NautilusTextCaption *text_caption,
-				    gboolean editable)
-{
-	g_return_if_fail (NAUTILUS_IS_TEXT_CAPTION (text_caption));
-
-	gtk_entry_set_editable (GTK_ENTRY (text_caption->detail->text), editable);
-}
-
-void
-nautilus_text_caption_set_expand_tilde (NautilusTextCaption *text_caption,
-					gboolean expand_tilde)
-{
-	g_return_if_fail (NAUTILUS_IS_TEXT_CAPTION (text_caption));
-
-	text_caption->detail->expand_tilde = expand_tilde;
-}
diff --git a/libnautilus-private/nautilus-text-caption.h b/libnautilus-private/nautilus-text-caption.h
deleted file mode 100644
index eda774889..000000000
--- a/libnautilus-private/nautilus-text-caption.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-text-caption.c - A text caption widget.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_TEXT_CAPTION_H
-#define NAUTILUS_TEXT_CAPTION_H
-
-#include <libnautilus-extensions/nautilus-caption.h>
-
-/*
- * NautilusTextCaption is made up of 2 widgets. 
- *
- * [title label] [string combo box]
- *
- * The user can select a string from the list.
- */
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_TEXT_CAPTION            (nautilus_text_caption_get_type ())
-#define NAUTILUS_TEXT_CAPTION(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_TEXT_CAPTION, NautilusTextCaption))
-#define NAUTILUS_TEXT_CAPTION_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_TEXT_CAPTION, NautilusTextCaptionClass))
-#define NAUTILUS_IS_TEXT_CAPTION(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_TEXT_CAPTION))
-
-typedef struct _NautilusTextCaption	       NautilusTextCaption;
-typedef struct _NautilusTextCaptionClass      NautilusTextCaptionClass;
-typedef struct _NautilusTextCaptionDetail     NautilusTextCaptionDetail;
-
-struct _NautilusTextCaption
-{
-	/* Super Class */
-	NautilusCaption caption;
-	
-	/* Private stuff */
-	NautilusTextCaptionDetail *detail;
-};
-
-struct _NautilusTextCaptionClass
-{
-	NautilusCaptionClass parent_class;
-};
-
-GtkType    nautilus_text_caption_get_type        (void);
-GtkWidget* nautilus_text_caption_new             (void);
-
-/* Entry text accesor. */
-char *nautilus_text_caption_get_text         (const NautilusTextCaption *text_caption);
-
-/* Entry text mutator. */
-void  nautilus_text_caption_set_text         (NautilusTextCaption       *text_caption,
-					      const char                *text);
-void  nautilus_text_caption_set_editable     (NautilusTextCaption       *text_caption,
-					      gboolean                   editable);
-void  nautilus_text_caption_set_expand_tilde (NautilusTextCaption       *text_caption,
-					      gboolean                   expand_tilde);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_TEXT_CAPTION_H */
-
-
diff --git a/libnautilus-private/nautilus-theme.c b/libnautilus-private/nautilus-theme.c
index fbf8ef060..0fb37d839 100644
--- a/libnautilus-private/nautilus-theme.c
+++ b/libnautilus-private/nautilus-theme.c
@@ -30,8 +30,8 @@
 #include "nautilus-global-preferences.h"
 #include "nautilus-metadata.h"
 #include "nautilus-preferences.h"
-#include "nautilus-string.h"
-#include "nautilus-xml-extensions.h"
+#include <eel/eel-string.h>
+#include <eel/eel-xml-extensions.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
@@ -84,7 +84,7 @@ nautilus_theme_set_theme (const char *new_theme)
 	char *old_theme;
 	
 	old_theme = nautilus_theme_get_theme ();
-	if (nautilus_strcmp (old_theme, new_theme)) {
+	if (eel_strcmp (old_theme, new_theme)) {
 		nautilus_preferences_set (NAUTILUS_PREFERENCES_THEME, new_theme);
 	}
 	g_free (old_theme);
@@ -165,7 +165,7 @@ nautilus_theme_get_theme_data_from_theme (const char *resource_name, const char
 	/* fetch the current theme name */
 	theme_data = NULL;
 	
-	if (nautilus_strcmp (theme_name, last_theme_name) == 0) {
+	if (eel_strcmp (theme_name, last_theme_name) == 0) {
 		theme_document = last_theme_document;
 	} else {
 		/* release the old saved data, since the theme changed */
@@ -182,7 +182,7 @@ nautilus_theme_get_theme_data_from_theme (const char *resource_name, const char
 	
 	if (theme_document != NULL) {
 		/* fetch the resource node */			
-		resource_node = nautilus_xml_get_child_by_name (xmlDocGetRootElement (theme_document), resource_name);
+		resource_node = eel_xml_get_child_by_name (xmlDocGetRootElement (theme_document), resource_name);
 		if (resource_node) {		
 			temp_str = xmlGetProp(resource_node, property_name);
 			if (temp_str) {
@@ -199,7 +199,7 @@ nautilus_theme_get_theme_data_from_theme (const char *resource_name, const char
 			g_atexit (free_default_theme);
 		}
 
-		resource_node = nautilus_xml_get_child_by_name (xmlDocGetRootElement (default_theme_document), resource_name);
+		resource_node = eel_xml_get_child_by_name (xmlDocGetRootElement (default_theme_document), resource_name);
 		if (resource_node) {		
 			temp_str = xmlGetProp (resource_node, property_name);
 			if (temp_str) {
@@ -259,7 +259,7 @@ nautilus_theme_get_image_path_from_theme (const char *image_name, const char* th
 {
 	char *image_path, *png_string, *temp_str;
 	
-	if (nautilus_strcmp (theme_name, "default") != 0) {
+	if (eel_strcmp (theme_name, "default") != 0) {
 		temp_str = g_strdup_printf ("%s/%s", theme_name, image_name);
 		image_path = nautilus_pixmap_file_may_be_local (temp_str);
 		
@@ -270,7 +270,7 @@ nautilus_theme_get_image_path_from_theme (const char *image_name, const char* th
 		}
 		
 		/* try if with a .png extension if it doesn't already have one */
-		if (!nautilus_istr_has_suffix (image_name, ".png")) {
+		if (!eel_istr_has_suffix (image_name, ".png")) {
 			png_string = g_strconcat (temp_str, ".png", NULL);
 			image_path = nautilus_pixmap_file_may_be_local (png_string);
 			g_free (png_string);
@@ -291,7 +291,7 @@ nautilus_theme_get_image_path_from_theme (const char *image_name, const char* th
 	}
 	
 	/* if it doesn't have a .png extension, try it with that */
-	if (!nautilus_istr_has_suffix (image_name, ".png")) {
+	if (!eel_istr_has_suffix (image_name, ".png")) {
 		png_string = g_strconcat (image_name, ".png", NULL);
 		image_path = nautilus_pixmap_file (png_string);
 		g_free (png_string);
@@ -329,7 +329,7 @@ nautilus_theme_make_selector (const char *theme_name)
 	GdkPixbuf *pixbuf;
 	
 	/* first, see if we can find an explicit preview */
-	if (!nautilus_strcmp (theme_name, "default")) {
+	if (!eel_strcmp (theme_name, "default")) {
 		theme_preview_name = g_strdup ("theme_preview.png");
 	} else {
 		theme_preview_name = g_strdup_printf ("%s/%s", theme_name, "theme_preview.png");
@@ -402,7 +402,7 @@ nautilus_theme_make_selector (const char *theme_name)
 	pixbuf = NULL;
 	
 	/* load the icon that we found and return it */
-	if (nautilus_istr_has_suffix (pixbuf_file, ".svg")) {
+	if (eel_istr_has_suffix (pixbuf_file, ".svg")) {
 		FILE *f = fopen (pixbuf_file, "rb");
 		if (f != NULL) {
 			pixbuf = rsvg_render_file (f, 1.0);
diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c
index b76901c01..00b464a51 100644
--- a/libnautilus-private/nautilus-thumbnails.c
+++ b/libnautilus-private/nautilus-thumbnails.c
@@ -28,17 +28,17 @@
 #include <libgnomevfs/gnome-vfs-file-info.h>
 #include <string.h>
 #include "nautilus-file-utilities.h"
-#include "nautilus-string.h"
+#include <eel/eel-string.h>
 #include <gtk/gtkmain.h>
 #include "nautilus-icon-factory-private.h"
 #include "nautilus-directory-notify.h"
 #include "nautilus-theme.h"
 #include <stdio.h>
-#include "nautilus-gdk-pixbuf-extensions.h"
+#include <eel/eel-gdk-pixbuf-extensions.h>
 #include <unistd.h>
 #include <sys/wait.h>
 #include <librsvg/rsvg.h>
-#include "nautilus-graphic-effects.h"
+#include <eel/eel-graphic-effects.h>
 
 /* permissions for thumbnail directory */
 #define THUMBNAIL_DIR_PERMISSIONS (GNOME_VFS_PERM_USER_ALL \
@@ -153,7 +153,7 @@ make_thumbnail_uri (const char *image_uri, gboolean directory_only, gboolean use
 		}
 		
 		/* append an image suffix if the correct one isn't already present */
-		if (!nautilus_istr_has_suffix (image_uri, ".png")) {		
+		if (!eel_istr_has_suffix (image_uri, ".png")) {		
 			char *old_uri = thumbnail_uri;
 			thumbnail_uri = g_strdup_printf ("%s.png", thumbnail_uri);
 			g_free(old_uri);			
@@ -595,7 +595,7 @@ make_thumbnails (gpointer data)
 				}
 			} else {
 				if (info->thumbnail_uri != NULL)
-					full_size_image = nautilus_gdk_pixbuf_load (info->thumbnail_uri);						
+					full_size_image = eel_gdk_pixbuf_load (info->thumbnail_uri);						
 			}
 			nautilus_file_unref (file);
 			
@@ -603,7 +603,7 @@ make_thumbnails (gpointer data)
 				thumbnail_image_frame = load_thumbnail_frame (info->anti_aliased);
 									
 				/* scale the content image as necessary */	
-				scaled_image = nautilus_gdk_pixbuf_scale_down_to_fit(full_size_image, 96, 96);	
+				scaled_image = eel_gdk_pixbuf_scale_down_to_fit(full_size_image, 96, 96);	
 				gdk_pixbuf_unref (full_size_image);
 				
 				/* embed the content image in the frame, if necessary  */
@@ -618,7 +618,7 @@ make_thumbnails (gpointer data)
 						right_offset = 6; bottom_offset = 6;
 					}
 				
-					framed_image = nautilus_embed_image_in_frame (scaled_image, thumbnail_image_frame,
+					framed_image = eel_embed_image_in_frame (scaled_image, thumbnail_image_frame,
 									      left_offset, top_offset, right_offset, bottom_offset);
 					g_free (frame_offset_str);
 				
@@ -630,7 +630,7 @@ make_thumbnails (gpointer data)
 				
 				thumbnail_path = gnome_vfs_get_local_path_from_uri (new_thumbnail_uri);
 				if (thumbnail_path == NULL
-				    || !nautilus_gdk_pixbuf_save_to_file (framed_image, thumbnail_path)) {
+				    || !eel_gdk_pixbuf_save_to_file (framed_image, thumbnail_path)) {
 					g_warning ("error saving thumbnail %s", thumbnail_path);
 				}
 				g_free (thumbnail_path);
diff --git a/libnautilus-private/nautilus-trash-directory.c b/libnautilus-private/nautilus-trash-directory.c
index 8a1bc706e..6a149130f 100644
--- a/libnautilus-private/nautilus-trash-directory.c
+++ b/libnautilus-private/nautilus-trash-directory.c
@@ -28,9 +28,9 @@
 
 #include "nautilus-directory-private.h"
 #include "nautilus-file.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-stock-dialogs.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-gtk-macros.h>
 #include "nautilus-volume-monitor.h"
 #include <gtk/gtksignal.h>
 #include <gtk/gtkmain.h>
@@ -55,7 +55,7 @@ static void     nautilus_trash_directory_initialize_class (gpointer
 static void	add_volume				  (NautilusTrashDirectory *trash,
 							   NautilusVolume	  *volume);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTrashDirectory,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTrashDirectory,
 				   nautilus_trash_directory,
 				   NAUTILUS_TYPE_MERGED_DIRECTORY)
 
@@ -67,7 +67,7 @@ static void
 find_directory_start (void)
 {
 	if (pending_find_directory_count == 0) {
-		nautilus_timed_wait_start_with_duration (TRASH_SEARCH_TIMED_WAIT_DELAY,
+		eel_timed_wait_start_with_duration (TRASH_SEARCH_TIMED_WAIT_DELAY,
 							 NULL,
 							 add_volume,
 							 _("Searching Disks"),
@@ -84,7 +84,7 @@ find_directory_end (void)
 	--pending_find_directory_count;
 
 	if (pending_find_directory_count == 0) {
-		nautilus_timed_wait_stop (NULL, add_volume);
+		eel_timed_wait_stop (NULL, add_volume);
 	}
 }
 
@@ -100,7 +100,7 @@ find_directory_callback (GnomeVFSAsyncHandle *handle,
 
 	trash_volume = callback_data;
 
-	g_assert (nautilus_g_list_exactly_one_item (results));
+	g_assert (eel_g_list_exactly_one_item (results));
 	g_assert (trash_volume != NULL);
 	g_assert (NAUTILUS_IS_TRASH_DIRECTORY (trash_volume->trash));
 	g_assert (trash_volume->real_directory == NULL);
@@ -284,14 +284,14 @@ trash_destroy (GtkObject *object)
 	gtk_signal_disconnect_by_data
 		(GTK_OBJECT (nautilus_volume_monitor_get ()), trash);
 
-	nautilus_g_hash_table_safe_for_each
+	eel_g_hash_table_safe_for_each
 		(trash->details->volumes,
 		 remove_trash_volume_cover,
 		 NULL);
 	g_hash_table_destroy (trash->details->volumes);
 	g_free (trash->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static char *
diff --git a/libnautilus-private/nautilus-trash-file.c b/libnautilus-private/nautilus-trash-file.c
index 417d14a19..12aa4fcb6 100644
--- a/libnautilus-private/nautilus-trash-file.c
+++ b/libnautilus-private/nautilus-trash-file.c
@@ -31,8 +31,8 @@
 #include "nautilus-file-attributes.h"
 #include "nautilus-file-private.h"
 #include "nautilus-file-utilities.h"
-#include "nautilus-glib-extensions.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include "nautilus-trash-directory.h"
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-defs.h>
@@ -81,7 +81,7 @@ static void nautilus_trash_file_initialize       (gpointer   object,
 						  gpointer   klass);
 static void nautilus_trash_file_initialize_class (gpointer   klass);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTrashFile,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTrashFile,
 				   nautilus_trash_file,
 				   NAUTILUS_TYPE_FILE)
 
@@ -92,7 +92,7 @@ is_delegated_attribute (const char *attribute)
 
 	g_return_val_if_fail (attribute != NULL, FALSE);
 
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (delegated_attributes); i++) {
+	for (i = 0; i < EEL_N_ELEMENTS (delegated_attributes); i++) {
 		if (strcmp (attribute, delegated_attributes[i]) == 0) {
 			return TRUE;
 		}
@@ -112,7 +112,7 @@ partition_attributes (GList *attributes,
 		      GList **delegated_attributes,
 		      GList **non_delegated_attributes)
 {
-	*delegated_attributes = nautilus_g_list_partition
+	*delegated_attributes = eel_g_list_partition
 		(attributes,
 		 is_delegated_attribute_predicate,
 		 NULL,
@@ -198,8 +198,8 @@ trash_callback_destroy (TrashCallback *trash_callback)
 	g_assert (NAUTILUS_IS_TRASH_FILE (trash_callback->trash));
 
 	nautilus_file_unref (NAUTILUS_FILE (trash_callback->trash));
-	nautilus_g_list_free_deep (trash_callback->delegated_attributes);
-	nautilus_g_list_free_deep (trash_callback->non_delegated_attributes);
+	eel_g_list_free_deep (trash_callback->delegated_attributes);
+	eel_g_list_free_deep (trash_callback->non_delegated_attributes);
 	g_list_free (trash_callback->non_ready_files);
 	g_free (trash_callback);
 }
@@ -322,7 +322,7 @@ remove_real_file (NautilusTrashFile *trash,
 	g_return_if_fail (NAUTILUS_IS_FILE (real_file));
 	g_return_if_fail (g_list_find (trash->details->files, real_file) != NULL);
 
-	nautilus_g_hash_table_safe_for_each
+	eel_g_hash_table_safe_for_each
 		(trash->details->callbacks,
 		 trash_callback_remove_file_cover,
 		 real_file);
@@ -416,7 +416,7 @@ trash_file_call_when_ready (NautilusFile *file,
 	trash_callback->callback_data = callback_data;
 	trash_callback->initializing = TRUE;
 
-	partition_attributes (nautilus_g_str_list_copy (attributes),
+	partition_attributes (eel_g_str_list_copy (attributes),
 			      &trash_callback->delegated_attributes,
 			      &trash_callback->non_delegated_attributes);
 
@@ -531,8 +531,8 @@ trash_file_monitor_add (NautilusFile *file,
 	monitor = g_hash_table_lookup (trash->details->monitors, client);
 	if (monitor != NULL) {
 		g_assert (monitor->trash == trash);
-		nautilus_g_list_free_deep (monitor->delegated_attributes);
-		nautilus_g_list_free_deep (monitor->non_delegated_attributes);
+		eel_g_list_free_deep (monitor->delegated_attributes);
+		eel_g_list_free_deep (monitor->non_delegated_attributes);
 	} else {
 		monitor = g_new0 (TrashMonitor, 1);
 		monitor->trash = trash;
@@ -540,7 +540,7 @@ trash_file_monitor_add (NautilusFile *file,
 				     (gpointer) client, monitor);
 	}
 
-	partition_attributes (nautilus_g_str_list_copy (attributes),
+	partition_attributes (eel_g_str_list_copy (attributes),
 			      &monitor->delegated_attributes,
 			      &monitor->non_delegated_attributes);
 
@@ -575,8 +575,8 @@ trash_file_monitor_remove (NautilusFile *file,
 		nautilus_file_monitor_remove (node->data, monitor);
 	}
 
-	nautilus_g_list_free_deep (monitor->delegated_attributes);
-	nautilus_g_list_free_deep (monitor->non_delegated_attributes);
+	eel_g_list_free_deep (monitor->delegated_attributes);
+	eel_g_list_free_deep (monitor->non_delegated_attributes);
 	g_free (monitor);
 }
 
@@ -801,7 +801,7 @@ trash_destroy (GtkObject *object)
 
 	nautilus_directory_unref (NAUTILUS_DIRECTORY (trash_directory));
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
diff --git a/libnautilus-private/nautilus-trash-monitor.c b/libnautilus-private/nautilus-trash-monitor.c
index 60c521364..6b6a54abb 100644
--- a/libnautilus-private/nautilus-trash-monitor.c
+++ b/libnautilus-private/nautilus-trash-monitor.c
@@ -30,7 +30,7 @@
 #include "nautilus-directory-notify.h"
 #include "nautilus-file-attributes.h"
 #include "nautilus-file-utilities.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 #include "nautilus-volume-monitor.h"
 #include <gtk/gtksignal.h>
 #include <libgnomevfs/gnome-vfs-find-directory.h>
@@ -55,7 +55,7 @@ static void nautilus_trash_monitor_initialize       (gpointer
 						     gpointer                   klass);
 static void destroy                                 (GtkObject                 *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTrashMonitor, nautilus_trash_monitor, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTrashMonitor, nautilus_trash_monitor, GTK_TYPE_OBJECT)
 
 static void
 nautilus_trash_monitor_initialize_class (NautilusTrashMonitorClass *klass)
diff --git a/libnautilus-private/nautilus-undo-context.c b/libnautilus-private/nautilus-undo-context.c
index d3f88f51b..279d010b9 100644
--- a/libnautilus-private/nautilus-undo-context.c
+++ b/libnautilus-private/nautilus-undo-context.c
@@ -26,7 +26,7 @@
 #include <config.h>
 #include "nautilus-undo-context.h"
 
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 #include <bonobo/bonobo-main.h>
 #include <gtk/gtksignal.h>
 #include <libnautilus/nautilus-bonobo-workarounds.h>
@@ -45,7 +45,7 @@ static void                  destroy                                      (GtkOb
 static Nautilus_Undo_Manager impl_Nautilus_Undo_Context__get_undo_manager (PortableServer_Servant    servant,
 									   CORBA_Environment        *ev);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusUndoContext, nautilus_undo_context, BONOBO_OBJECT_TYPE)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusUndoContext, nautilus_undo_context, BONOBO_OBJECT_TYPE)
 
 POA_Nautilus_Undo_Context__epv libnautilus_Nautilus_Undo_Context_epv =
 {
@@ -153,7 +153,7 @@ destroy (GtkObject *object)
 	
  	CORBA_exception_free (&ev);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
diff --git a/libnautilus-private/nautilus-undo-manager.c b/libnautilus-private/nautilus-undo-manager.c
index c1dd68d25..ea92de5e0 100644
--- a/libnautilus-private/nautilus-undo-manager.c
+++ b/libnautilus-private/nautilus-undo-manager.c
@@ -25,8 +25,8 @@
 #include <config.h>
 #include "nautilus-undo-manager.h"
 
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gtk-extensions.h"
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
 #include <gtk/gtksignal.h>
 #include <bonobo/bonobo-main.h>
 #include <libnautilus/nautilus-bonobo-workarounds.h>
@@ -82,7 +82,7 @@ static void corba_forget                           (PortableServer_Servant     s
 static void corba_undo                             (PortableServer_Servant     servant,
 						    CORBA_Environment         *ev);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusUndoManager, nautilus_undo_manager, BONOBO_OBJECT_TYPE)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusUndoManager, nautilus_undo_manager, BONOBO_OBJECT_TYPE)
 
 static PortableServer_ServantBase__epv base_epv;
 static POA_Nautilus_Undo_Manager__epv epv = {
@@ -320,7 +320,7 @@ destroy (GtkObject *object)
 
 	release_transaction (manager);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 void
@@ -434,7 +434,7 @@ nautilus_undo_manager_set_up_bonobo_ui_handler_undo_item (NautilusUndoManager *m
 	update_undo_menu_item (manager, connection);
 
 	/* Update it again whenever the changed signal is emitted. */
-	nautilus_gtk_signal_connect_full_while_alive
+	eel_gtk_signal_connect_full_while_alive
 		(GTK_OBJECT (manager), "changed",
 		 GTK_SIGNAL_FUNC (update_undo_menu_item), NULL,
 		 connection, undo_menu_handler_connection_free_cover,
diff --git a/libnautilus-private/nautilus-undo-signal-handlers.c b/libnautilus-private/nautilus-undo-signal-handlers.c
index 0cdcd2f27..2d55ae555 100644
--- a/libnautilus-private/nautilus-undo-signal-handlers.c
+++ b/libnautilus-private/nautilus-undo-signal-handlers.c
@@ -30,7 +30,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <libnautilus/nautilus-undo.h>
 
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 #include "nautilus-undo-signal-handlers.h"
 
diff --git a/libnautilus-private/nautilus-vfs-directory.c b/libnautilus-private/nautilus-vfs-directory.c
index 27678d939..946315aca 100644
--- a/libnautilus-private/nautilus-vfs-directory.c
+++ b/libnautilus-private/nautilus-vfs-directory.c
@@ -27,7 +27,7 @@
 #include "nautilus-vfs-directory.h"
 
 #include "nautilus-directory-private.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 #include "nautilus-file-private.h"
 
 struct NautilusVFSDirectoryDetails {
@@ -37,7 +37,7 @@ static void nautilus_vfs_directory_initialize       (gpointer   object,
 						     gpointer   klass);
 static void nautilus_vfs_directory_initialize_class (gpointer   klass);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusVFSDirectory,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusVFSDirectory,
 				   nautilus_vfs_directory,
 				   NAUTILUS_TYPE_DIRECTORY)
 
@@ -54,7 +54,7 @@ nautilus_vfs_directory_initialize (gpointer object, gpointer klass)
 static void
 vfs_destroy (GtkObject *object)
 {
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static gboolean
diff --git a/libnautilus-private/nautilus-vfs-file.c b/libnautilus-private/nautilus-vfs-file.c
index 86bc4b265..b02b90159 100644
--- a/libnautilus-private/nautilus-vfs-file.c
+++ b/libnautilus-private/nautilus-vfs-file.c
@@ -28,7 +28,7 @@
 
 #include "nautilus-directory-private.h"
 #include "nautilus-file-private.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-macros.h>
 
 struct NautilusVFSFileDetails {
 };
@@ -37,7 +37,7 @@ static void nautilus_vfs_file_initialize       (gpointer   object,
 						gpointer   klass);
 static void nautilus_vfs_file_initialize_class (gpointer   klass);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusVFSFile,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusVFSFile,
 				   nautilus_vfs_file,
 				   NAUTILUS_TYPE_FILE)
 
@@ -244,7 +244,7 @@ nautilus_vfs_file_initialize (gpointer object, gpointer klass)
 static void
 vfs_destroy (GtkObject *object)
 {
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
diff --git a/libnautilus-private/nautilus-view-identifier.c b/libnautilus-private/nautilus-view-identifier.c
index a8652f4c4..7dbff08a8 100644
--- a/libnautilus-private/nautilus-view-identifier.c
+++ b/libnautilus-private/nautilus-view-identifier.c
@@ -29,8 +29,8 @@
 #include <libgnome/gnome-i18n.h>
 
 
-#include "nautilus-glib-extensions.h"
-#include "nautilus-string.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-string.h>
 #include <glib.h>
 #include <stdlib.h>
 
@@ -118,12 +118,12 @@ get_lang_list (void)
 
 		/* Make sure we don't give oaf an empty
 		   lang string */
-		if (!nautilus_str_is_empty (lang_with_locale)) {
+		if (!eel_str_is_empty (lang_with_locale)) {
 			retval = g_slist_prepend (retval, 
 						  g_strdup (lang_with_locale));
 		}
 		g_free (lang_with_locale);
-		if (!nautilus_str_is_empty (lang)) {
+		if (!eel_str_is_empty (lang)) {
 			retval = g_slist_prepend (retval, g_strdup (lang));
 		}
         }
@@ -153,10 +153,10 @@ nautilus_view_identifier_new_from_oaf_server_info (OAF_ServerInfo *server, char
                 view_as_name = server->iid;
         }
 
-	nautilus_g_slist_free_deep (langs);
+	eel_g_slist_free_deep (langs);
 
 	/* if the name is an OAFIID, clean it up for display */
-	if (nautilus_str_has_prefix (view_as_name, "OAFIID:")) {
+	if (eel_str_has_prefix (view_as_name, "OAFIID:")) {
 		char *display_name, *colon_ptr;
 		NautilusViewIdentifier *new_identifier;
 		
@@ -225,7 +225,7 @@ nautilus_view_identifier_free_callback (gpointer identifier, gpointer ignore)
 void
 nautilus_view_identifier_list_free (GList *list)
 {
-	nautilus_g_list_free_deep_custom
+	eel_g_list_free_deep_custom
 		(list, nautilus_view_identifier_free_callback, NULL);
 }
 
diff --git a/libnautilus-private/nautilus-viewport.c b/libnautilus-private/nautilus-viewport.c
deleted file mode 100644
index 5ea54c17a..000000000
--- a/libnautilus-private/nautilus-viewport.c
+++ /dev/null
@@ -1,512 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-viewport.c - A subclass of GtkViewport with non broken drawing.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-viewport.h"
-
-#include "nautilus-gtk-macros.h"
-
-#include <gtk/gtksignal.h>
-
-/* Detail member struct */
-struct NautilusViewportDetails
-{
-	gboolean is_smooth;
-	gboolean never_smooth;
-       
-	gboolean constrain_width;
-	gboolean constrain_height;
-};
-
-/* GtkObjectClass methods */
-static void nautilus_viewport_initialize_class     (NautilusViewportClass *viewport_class);
-static void nautilus_viewport_initialize           (NautilusViewport      *viewport);
-static void nautilus_viewport_destroy              (GtkObject             *object);
-
-/* GtkWidgetClass methods */
-static void nautilus_viewport_realize              (GtkWidget             *widget);
-static void nautilus_viewport_draw                 (GtkWidget             *widget,
-						    GdkRectangle          *area);
-static void nautilus_viewport_size_allocate        (GtkWidget             *widget,
-						    GtkAllocation         *allocation);
-static gint nautilus_viewport_expose_event         (GtkWidget             *widget,
-						    GdkEventExpose        *event);
-static void nautilus_viewport_paint                (GtkWidget             *widget,
-						    GdkRectangle          *area);
-
-/* NautilusViewport signals */
-static void nautilus_viewport_set_is_smooth_signal (GtkWidget             *widget,
-						    gboolean               is_smooth);
-
-/* Signals */
-typedef enum
-{
-	SET_IS_SMOOTH,
-	LAST_SIGNAL
-} NautilusViewportSignal;
-
-/* Signals */
-static guint nautilus_viewport_signals[LAST_SIGNAL] = { 0 };
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusViewport, nautilus_viewport, GTK_TYPE_VIEWPORT)
-
-/* GtkObjectClass methods */
-static void
-nautilus_viewport_initialize_class (NautilusViewportClass *nautilus_viewport_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (nautilus_viewport_class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (nautilus_viewport_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_viewport_destroy;
-	
-	/* GtkWidgetClass */
-	widget_class->realize = nautilus_viewport_realize;
-	widget_class->expose_event = nautilus_viewport_expose_event;
-	widget_class->draw = nautilus_viewport_draw;
-	widget_class->size_allocate = nautilus_viewport_size_allocate;
-	
-	/* NautilusViewportClass */
-	nautilus_viewport_class->set_is_smooth = nautilus_viewport_set_is_smooth_signal;
-	
-	nautilus_viewport_signals[SET_IS_SMOOTH] = 
-		gtk_signal_new ("set_is_smooth",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (NautilusViewportClass, set_is_smooth),
-				gtk_marshal_NONE__BOOL,
-				GTK_TYPE_NONE, 
-				1,
-				GTK_TYPE_BOOL);
-	
-	gtk_object_class_add_signals (object_class, nautilus_viewport_signals, LAST_SIGNAL);
-
-	/* Let the smooth widget machinery know that our class can be smooth */
-	nautilus_smooth_widget_register_type (NAUTILUS_TYPE_VIEWPORT);
-}
-
-void
-nautilus_viewport_initialize (NautilusViewport *nautilus_viewport)
-{
-	nautilus_viewport->details = g_new0 (NautilusViewportDetails, 1);
-	
-	nautilus_smooth_widget_register (GTK_WIDGET (nautilus_viewport));
-	nautilus_viewport->details->never_smooth = TRUE;
-}
-
-void
-nautilus_viewport_destroy (GtkObject *object)
-{
-	NautilusViewport *viewport;
-
-	g_return_if_fail (NAUTILUS_IS_VIEWPORT (object));
-
-	viewport = NAUTILUS_VIEWPORT (object);
-	
-	g_free (viewport->details);
-
-	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-/* GtkWidgetClass methods */
-static void
-nautilus_viewport_draw (GtkWidget *widget,
-			GdkRectangle *area)
-{
-	NautilusViewport *nautilus_viewport;
-	GtkViewport *viewport;
-	GtkBin *bin;
-	GdkRectangle tmp_area;
-	GdkRectangle child_area;
-	gint border_width;
-	
-	g_return_if_fail (NAUTILUS_IS_VIEWPORT (widget));
-	g_return_if_fail (area != NULL);
-	
-	if (!GTK_WIDGET_DRAWABLE (widget)) {
-		return;
-	}
-
-	nautilus_viewport = NAUTILUS_VIEWPORT (widget);
-	viewport = GTK_VIEWPORT (widget);
-	bin = GTK_BIN (widget);
-	
-	border_width = GTK_CONTAINER (widget)->border_width;
-	
-	tmp_area = *area;
-	tmp_area.x -= border_width;
-	tmp_area.y -= border_width;
-	
-	nautilus_viewport_paint (widget, &tmp_area);
-	
-	tmp_area.x += viewport->hadjustment->value - widget->style->klass->xthickness;
-	tmp_area.y += viewport->vadjustment->value - widget->style->klass->ythickness;
-	
-	/* The gtk_viewport_draw() version does not adjust the width
-	 * and height of the tmp_area for the class x/y thickness.  This
-	 * causes some drawing to be clipped on the bottom.  This is a bug
-	 * in GTK+.
-	 */
-	
-	/* FIXME bugzilla.eazel.com xxxx: 
-	 * Remove this widget once the fix makes it to GTK+.
-	 */
-	tmp_area.width += 2 * widget->style->klass->xthickness;
-	tmp_area.height += 2 * widget->style->klass->ythickness;
-	
-	if (!nautilus_viewport_get_is_smooth (nautilus_viewport)) {
-		gtk_paint_flat_box (widget->style, viewport->bin_window, 
-				    GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-				    &tmp_area, widget, "viewportbin",
-				    0, 0, -1, -1);
-	}
-	
-	if (bin->child) {
-		if (gtk_widget_intersect (bin->child, &tmp_area, &child_area)) {
-			gtk_widget_draw (bin->child, &child_area);
-		}
-	}
-}
-
-static void
-nautilus_viewport_size_allocate (GtkWidget *widget,
-				 GtkAllocation *allocation)
-{
-	NautilusViewport *nautilus_viewport;
-	GtkViewport *viewport;
-	GtkBin *bin;
-	GtkAllocation child_allocation;
-	gint hval, vval;
-	gint border_width;
-	
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GTK_IS_VIEWPORT (widget));
-	g_return_if_fail (allocation != NULL);
-	
-	widget->allocation = *allocation;
-	nautilus_viewport = NAUTILUS_VIEWPORT (widget);
-	viewport = GTK_VIEWPORT (widget);
-	bin = GTK_BIN (widget);
-	  
-	border_width = GTK_CONTAINER (widget)->border_width;
-	
-	child_allocation.x = 0;
-	child_allocation.y = 0;
-	
-	if (viewport->shadow_type != GTK_SHADOW_NONE)
-	{
-		child_allocation.x = GTK_WIDGET (viewport)->style->klass->xthickness;
-		child_allocation.y = GTK_WIDGET (viewport)->style->klass->ythickness;
-	}
-	
-	child_allocation.width = MAX (1, allocation->width - child_allocation.x * 2 - border_width * 2);
-	child_allocation.height = MAX (1, allocation->height - child_allocation.y * 2 - border_width * 2);
-	  
-	if (GTK_WIDGET_REALIZED (widget))
-	{
-		gdk_window_move_resize (widget->window,
-					allocation->x + border_width,
-					allocation->y + border_width,
-					allocation->width - border_width * 2,
-					allocation->height - border_width * 2);
-		
-		gdk_window_move_resize (viewport->view_window,
-					child_allocation.x,
-					child_allocation.y,
-					child_allocation.width,
-					child_allocation.height);
-	}
-	
-	viewport->hadjustment->page_size = child_allocation.width;
-	viewport->hadjustment->page_increment = viewport->hadjustment->page_size / 2;
-	viewport->hadjustment->step_increment = 10;
-	
-	viewport->vadjustment->page_size = child_allocation.height;
-	viewport->vadjustment->page_increment = viewport->vadjustment->page_size / 2;
-	viewport->vadjustment->step_increment = 10;
-	
-	hval = viewport->hadjustment->value;
-	vval = viewport->vadjustment->value;
-	
-	if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
-	{
-		GtkRequisition child_requisition;
-		gtk_widget_get_child_requisition (bin->child, &child_requisition);
-		
-		viewport->hadjustment->lower = 0;
-		viewport->hadjustment->upper = MAX (child_requisition.width,
-						    child_allocation.width);
-		
-		hval = CLAMP (hval, 0,
-			      viewport->hadjustment->upper -
-			      viewport->hadjustment->page_size);
-		
-		viewport->vadjustment->lower = 0;
-		viewport->vadjustment->upper = MAX (child_requisition.height,
-						    child_allocation.height);
-		
-		vval = CLAMP (vval, 0,
-			      viewport->vadjustment->upper -
-			      viewport->vadjustment->page_size);
-	}
-	
-	if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
-	{
-		child_allocation.x = 0;
-		child_allocation.y = 0;
-		
-		child_allocation.width = viewport->hadjustment->upper;
-		child_allocation.height = viewport->vadjustment->upper;
-		
-		if (nautilus_viewport_get_constrain_width (nautilus_viewport)) {
-			child_allocation.width = widget->allocation.width;
-		}
-		if (nautilus_viewport_get_constrain_height (nautilus_viewport)) {
-			child_allocation.height = widget->allocation.height;
-		}
-		
-		if (GTK_WIDGET_REALIZED (widget))
-			gdk_window_resize (viewport->bin_window,
-					   child_allocation.width,
-					   child_allocation.height);
-		
-		child_allocation.x = 0;
-		child_allocation.y = 0;
-		gtk_widget_size_allocate (bin->child, &child_allocation);
-	}
-	
-	gtk_signal_emit_by_name (GTK_OBJECT (viewport->hadjustment), "changed");
-	gtk_signal_emit_by_name (GTK_OBJECT (viewport->vadjustment), "changed");
-	if (viewport->hadjustment->value != hval)
-	{
-		viewport->hadjustment->value = hval;
-		gtk_signal_emit_by_name (GTK_OBJECT (viewport->hadjustment), "value_changed");
-	}
-	if (viewport->vadjustment->value != vval)
-	{
-		viewport->vadjustment->value = vval;
-		gtk_signal_emit_by_name (GTK_OBJECT (viewport->vadjustment), "value_changed");
-	}
-}
-
-static gint
-nautilus_viewport_expose_event (GtkWidget *widget,
-				GdkEventExpose *event)
-{
-	NautilusViewport *nautilus_viewport;
-	GtkViewport *viewport;
-	GtkBin *bin;
-	
-	g_return_val_if_fail (NAUTILUS_IS_VIEWPORT (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	if (!GTK_WIDGET_DRAWABLE (widget)) {
-		return FALSE;
-	}
-
-	nautilus_viewport = NAUTILUS_VIEWPORT (widget);
-	viewport = GTK_VIEWPORT (widget);
-	bin = GTK_BIN (widget);
-	
-	if (event->window == widget->window) {
-		nautilus_viewport_paint (widget, &event->area);
-	} else if (event->window == viewport->bin_window) {
-		GdkEventExpose child_event;
-
-		child_event = *event;
-		
-		if (!nautilus_viewport_get_is_smooth (nautilus_viewport)) {
-			gtk_paint_flat_box (widget->style, viewport->bin_window, 
-					    GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-					    &event->area, widget, "viewportbin",
-					    0, 0, -1, -1);
-		}
-		
-		if ((bin->child != NULL) &&
-		    GTK_WIDGET_NO_WINDOW (bin->child) &&
-		    gtk_widget_intersect (bin->child, &event->area, &child_event.area))
-			gtk_widget_event (bin->child, (GdkEvent*) &child_event);
-	}
-	
-	return FALSE;
-}
-
-static void
-nautilus_viewport_realize (GtkWidget *widget)
-{
-	NautilusViewport *nautilus_viewport;
-	
-	g_return_if_fail (NAUTILUS_IS_VIEWPORT (widget));
-	
-	nautilus_viewport = NAUTILUS_VIEWPORT (widget);
-
-	/* GtkViewport does the actual realization */
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
-
- 	gdk_window_set_static_gravities (GTK_VIEWPORT (nautilus_viewport)->bin_window,
-					 nautilus_viewport_get_is_smooth (nautilus_viewport));
-}
-
-static void
-nautilus_viewport_paint (GtkWidget *widget,
-			 GdkRectangle *area)
-{
-	GtkViewport *viewport;
-	
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GTK_IS_VIEWPORT (widget));
-	g_return_if_fail (area != NULL);
-	
-	if (!GTK_WIDGET_DRAWABLE (widget)) {
-		return;
-	}
-
-	viewport = GTK_VIEWPORT (widget);
-	
-	gtk_draw_shadow (widget->style, widget->window,
-			 GTK_STATE_NORMAL, viewport->shadow_type,
-			 0, 0, -1, -1);
-}
-
-/* NautilusViewport signals */
-static void
-nautilus_viewport_set_is_smooth_signal (GtkWidget *widget,
-					gboolean is_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_VIEWPORT (widget));
-	
-	nautilus_viewport_set_is_smooth (NAUTILUS_VIEWPORT (widget), is_smooth);
-}
-
-/* Public NautilusViewport methods */
-GtkWidget*
-nautilus_viewport_new (GtkAdjustment *hadjustment,
-		       GtkAdjustment *vadjustment)
-{
-	NautilusViewport *nautilus_viewport;
-
-	nautilus_viewport = NAUTILUS_VIEWPORT (gtk_widget_new (nautilus_viewport_get_type (), NULL));
-	
-	gtk_viewport_set_hadjustment (GTK_VIEWPORT (nautilus_viewport), hadjustment);
-	gtk_viewport_set_vadjustment (GTK_VIEWPORT (nautilus_viewport), vadjustment);
-
-	return GTK_WIDGET (nautilus_viewport);
-}
-
-void
-nautilus_viewport_set_is_smooth (NautilusViewport *nautilus_viewport,
-				 gboolean is_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_VIEWPORT (nautilus_viewport));
-
-	if (nautilus_viewport->details->is_smooth == is_smooth) {
-		return;
-	}
-
-	nautilus_viewport->details->is_smooth = is_smooth;
-	
-	if (!GTK_WIDGET_REALIZED (nautilus_viewport)) {
-		return;
-	}
-	
- 	gdk_window_set_static_gravities (GTK_VIEWPORT (nautilus_viewport)->bin_window,
-					 nautilus_viewport->details->is_smooth);
-}
-
-gboolean
-nautilus_viewport_get_is_smooth (const NautilusViewport *nautilus_viewport)
-{
-	g_return_val_if_fail (NAUTILUS_IS_VIEWPORT (nautilus_viewport), FALSE);
-	
-	return !nautilus_viewport->details->never_smooth && nautilus_viewport->details->is_smooth;
-}
-
-void
-nautilus_viewport_set_constrain_width (NautilusViewport *nautilus_viewport,
-				       gboolean constrain_width)
-{
-	g_return_if_fail (NAUTILUS_IS_VIEWPORT (nautilus_viewport));
-
-	nautilus_viewport->details->constrain_width = constrain_width;
-}
-
-gboolean
-nautilus_viewport_get_constrain_width (const NautilusViewport *nautilus_viewport)
-{
-	g_return_val_if_fail (NAUTILUS_IS_VIEWPORT (nautilus_viewport), FALSE);
-
-	return nautilus_viewport->details->constrain_width;
-}
-
-void nautilus_viewport_set_constrain_height (NautilusViewport *nautilus_viewport,
-					     gboolean constrain_height)
-{
-	g_return_if_fail (NAUTILUS_IS_VIEWPORT (nautilus_viewport));
-	
-	nautilus_viewport->details->constrain_height = constrain_height;
-}
-
-gboolean
-nautilus_viewport_get_constrain_height (const NautilusViewport *nautilus_viewport)
-{
-	g_return_val_if_fail (NAUTILUS_IS_VIEWPORT (nautilus_viewport), FALSE);
-
-	return nautilus_viewport->details->constrain_height;
-}
-
-void
-nautilus_viewport_set_never_smooth (NautilusViewport *nautilus_viewport,
-				    gboolean never_smooth)
-{
-	g_return_if_fail (NAUTILUS_IS_VIEWPORT (nautilus_viewport));
-
-	nautilus_viewport->details->never_smooth = never_smooth;
-
-	if (!GTK_WIDGET_REALIZED (nautilus_viewport)) {
-		return;
-	}
-
- 	gdk_window_set_static_gravities (GTK_VIEWPORT (nautilus_viewport)->bin_window,
-					 nautilus_viewport_get_is_smooth (nautilus_viewport));
-}
-
-NautilusArtIPoint
-nautilus_viewport_get_scroll_offset (const NautilusViewport *nautilus_viewport)
-{
-	NautilusArtIPoint scroll_offset;
-	
-	g_return_val_if_fail (NAUTILUS_IS_VIEWPORT (nautilus_viewport), NAUTILUS_ART_IPOINT_ZERO);
-
-	if (!GTK_WIDGET_REALIZED (nautilus_viewport)) {
-		return NAUTILUS_ART_IPOINT_ZERO;
-	}
-
-	gdk_window_get_position (GTK_VIEWPORT (nautilus_viewport)->bin_window,
-				 &scroll_offset.x,
-				 &scroll_offset.y);
-
-	return scroll_offset;
-}
diff --git a/libnautilus-private/nautilus-viewport.h b/libnautilus-private/nautilus-viewport.h
deleted file mode 100644
index 633348f36..000000000
--- a/libnautilus-private/nautilus-viewport.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-viewport.h - A subclass of GtkViewport with non broken drawing.
-
-   Copyright (C) 1999, 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_VIEWPORT_H
-#define NAUTILUS_VIEWPORT_H
-
-#include <gtk/gtkviewport.h>
-#include <libgnome/gnome-defs.h>
-#include <libnautilus-extensions/nautilus-smooth-widget.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_VIEWPORT            (nautilus_viewport_get_type ())
-#define NAUTILUS_VIEWPORT(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEWPORT, NautilusViewport))
-#define NAUTILUS_VIEWPORT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEWPORT, NautilusViewportClass))
-#define NAUTILUS_IS_VIEWPORT(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEWPORT))
-#define NAUTILUS_IS_VIEWPORT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_VIEWPORT))
-
-typedef struct NautilusViewport	         NautilusViewport;
-typedef struct NautilusViewportClass     NautilusViewportClass;
-typedef struct NautilusViewportDetails   NautilusViewportDetails;
-
-struct NautilusViewport
-{
-	/* Superclass */
-	GtkViewport viewport;
-
-	/* Private things */
-	NautilusViewportDetails *details;
-};
-
-struct NautilusViewportClass
-{
-	GtkViewportClass parent_class;
-	NautilusSmoothWidgetSetIsSmooth set_is_smooth;
-};
-
-GtkType           nautilus_viewport_get_type              (void);
-GtkWidget *       nautilus_viewport_new                   (GtkAdjustment          *hadjustment,
-						          GtkAdjustment           *vadjustment);
-
-void              nautilus_viewport_set_is_smooth         (NautilusViewport       *nautilus_viewport,
-						          gboolean                is_smooth);
-gboolean          nautilus_viewport_get_is_smooth         (const NautilusViewport *nautilus_viewport);
-void              nautilus_viewport_set_never_smooth      (NautilusViewport       *nautilus_viewport,
-						          gboolean                never_smooth);
-
-NautilusArtIPoint nautilus_viewport_get_scroll_offset     (const NautilusViewport *nautilus_viewport);
-
-void              nautilus_viewport_set_constrain_width   (NautilusViewport       *nautilus_viewport,
-							  gboolean                constrain_width);
-gboolean          nautilus_viewport_get_constrain_width   (const NautilusViewport *nautilus_viewport);
-
-void              nautilus_viewport_set_constrain_height  (NautilusViewport       *nautilus_viewport,
-							   gboolean               constrain_height);
-gboolean          nautilus_viewport_get_constrain_height  (const NautilusViewport *nautilus_viewport);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_VIEWPORT_H */
-
-
diff --git a/libnautilus-private/nautilus-volume-monitor.c b/libnautilus-private/nautilus-volume-monitor.c
index ae7d329c9..b301497de 100644
--- a/libnautilus-private/nautilus-volume-monitor.c
+++ b/libnautilus-private/nautilus-volume-monitor.c
@@ -28,13 +28,13 @@
 #include "nautilus-cdrom-extensions.h"
 #include "nautilus-directory-notify.h"
 #include "nautilus-file-utilities.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gnome-extensions.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include "nautilus-iso9660.h"
-#include "nautilus-stock-dialogs.h"
-#include "nautilus-string.h"
-#include "nautilus-string-list.h"
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-string-list.h>
 #include "nautilus-volume-monitor.h"
 #include <errno.h>
 #include <fcntl.h>
@@ -182,7 +182,7 @@ static int              get_cdrom_type_solaris                          (const c
 									 int                            *fd);
 #endif
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusVolumeMonitor,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusVolumeMonitor,
 				   nautilus_volume_monitor,
 				   GTK_TYPE_OBJECT)
 
@@ -264,7 +264,7 @@ nautilus_volume_monitor_destroy (GtkObject *object)
 
 	global_volume_monitor = NULL;
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -338,7 +338,7 @@ has_removable_mntent_options (MountTableEntry *ent)
 	}
 
 #ifdef SOLARIS_MNT
-	if (nautilus_str_has_prefix (ent->mnt_special, "/vol/")) {
+	if (eel_str_has_prefix (ent->mnt_special, "/vol/")) {
 		return TRUE;
 	}
 #endif
@@ -375,7 +375,7 @@ get_removable_volumes (void)
         ent = &ent_storage;
 	while (! getmntent (file, ent)) {
 		/* On Solaris look for /vol/ for determining a removable volume */
-		if (nautilus_str_has_prefix (ent->mnt_special, noauto_string)) {
+		if (eel_str_has_prefix (ent->mnt_special, noauto_string)) {
 			volume = create_volume (ent->mnt_special, ent->mnt_mountp, ent->mnt_fstype);
 			volume->is_removable = TRUE;
 			volume->is_read_only = hasmntopt (ent, MNTOPT_RO) != NULL;
@@ -426,7 +426,7 @@ volume_is_removable (const NautilusVolume *volume)
 		if (strcmp (volume->device_path, ent->mnt_special) == 0) {
   			/* On Solaris look for /vol/ for determining
 			a removable volume */
-   		 	if (nautilus_str_has_prefix (ent->mnt_special, noauto_string)) {
+   		 	if (eel_str_has_prefix (ent->mnt_special, noauto_string)) {
 				fclose (file);
 				return TRUE;
 			}
@@ -850,7 +850,7 @@ eject_device (void *arg)
 
 	if (path != NULL) {		
 		command = g_strdup_printf ("eject %s", path);	
-		nautilus_gnome_shell_execute (command);
+		eel_gnome_shell_execute (command);
 		g_free (command);
 		g_free (path);
 	}
@@ -956,7 +956,7 @@ get_current_mount_list (void)
 #else
 	char line[PATH_MAX * 3];
 	char device_name[sizeof (line)];
-	NautilusStringList *list;
+	EelStringList *list;
 	char *device_path, *mount_path, *filesystem;
 	const char *separator;
 
@@ -973,22 +973,22 @@ get_current_mount_list (void)
 
 	while (fgets (line, sizeof(line), fh)) {
 		if (sscanf (line, "%s", device_name) == 1) {
-			list = nautilus_string_list_new_from_tokens (line, separator, FALSE);
+			list = eel_string_list_new_from_tokens (line, separator, FALSE);
 			if (list != NULL) {
 				/* The string list needs to have at least 3 items per line.
 				 * We need to find at least device path, mount path and file system type.
 				 */
-				if (nautilus_string_list_get_length (list) >= 3) {
-					device_path = nautilus_string_list_nth (list, 0);
-					mount_path = nautilus_string_list_nth (list, 1);
-					filesystem = nautilus_string_list_nth (list, 2);
+				if (eel_string_list_get_length (list) >= 3) {
+					device_path = eel_string_list_nth (list, 0);
+					mount_path = eel_string_list_nth (list, 1);
+					filesystem = eel_string_list_nth (list, 2);
 					volume = create_volume (device_path, mount_path, filesystem);
 					g_free (device_path);
 					g_free (mount_path);
 					g_free (filesystem);
 					current_mounts = mount_volume_add_filesystem (volume, current_mounts);
 				}				
-				nautilus_string_list_free (list);
+				eel_string_list_free (list);
 			}			
 		}
   	}
@@ -1463,7 +1463,7 @@ display_mount_status (gpointer callback_data)
 {
 	MountStatusInfo *info = callback_data;
 		
-	nautilus_show_error_dialog_with_details 
+	eel_show_error_dialog_with_details 
 		(info->message, info->title, info->detailed_message, NULL);
 
 	g_free (info->message);
@@ -1830,7 +1830,7 @@ mount_volume_add_filesystem (NautilusVolume *volume, GList *volume_list)
 {
 	gboolean mounted = FALSE;
 			
-	if (nautilus_str_has_prefix (volume->device_path, floppy_device_path_prefix)) {		
+	if (eel_str_has_prefix (volume->device_path, floppy_device_path_prefix)) {		
 		mounted = mount_volume_floppy_add (volume);
 	} else if (strcmp (volume->filesystem, "affs") == 0) {		
 		mounted = mount_volume_affs_add (volume);
diff --git a/libnautilus-private/nautilus-wrap-table.c b/libnautilus-private/nautilus-wrap-table.c
deleted file mode 100644
index 260f0feb3..000000000
--- a/libnautilus-private/nautilus-wrap-table.c
+++ /dev/null
@@ -1,996 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-wrap-box.c - A table that can wrap its contents as needed.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#include <config.h>
-
-#include "nautilus-wrap-table.h"
-
-#include "nautilus-gtk-macros.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-art-extensions.h"
-#include "nautilus-art-gtk-extensions.h"
-
-#include <gtk/gtkmain.h>
-#include <gtk/gtkviewport.h>
-
-/* Arguments */
-enum
-{
-	ARG_0,
-	ARG_X_SPACING,
-	ARG_Y_SPACING,
-	ARG_X_JUSTIFICATION,
-	ARG_Y_JUSTIFICATION,
-	ARG_HOMOGENEOUS,
-};
-
-/* Detail member struct */
-struct NautilusWrapTableDetails
-{
-	guint x_spacing;
-	guint y_spacing;
-	NautilusJustification x_justification;
-	NautilusJustification y_justification;
-	gboolean homogeneous;
-	GList *children;
-};
-
-/* GtkObjectClass methods */
-static void               nautilus_wrap_table_initialize_class (NautilusWrapTableClass   *wrap_table_class);
-static void               nautilus_wrap_table_initialize       (NautilusWrapTable        *wrap);
-static void               nautilus_wrap_table_destroy          (GtkObject                *object);
-static void               nautilus_wrap_table_set_arg          (GtkObject                *object,
-								GtkArg                   *arg,
-								guint                     arg_id);
-static void               nautilus_wrap_table_get_arg          (GtkObject                *object,
-								GtkArg                   *arg,
-								guint                     arg_id);
-/* GtkWidgetClass methods */
-static void               nautilus_wrap_table_size_request     (GtkWidget                *widget,
-								GtkRequisition           *requisition);
-static int                nautilus_wrap_table_expose_event     (GtkWidget                *widget,
-								GdkEventExpose           *event);
-static void               nautilus_wrap_table_size_allocate    (GtkWidget                *widget,
-								GtkAllocation            *allocation);
-static void               nautilus_wrap_table_map              (GtkWidget                *widget);
-static void               nautilus_wrap_table_unmap            (GtkWidget                *widget);
-
-/* GtkContainerClass methods */
-static void               nautilus_wrap_table_add              (GtkContainer             *container,
-								GtkWidget                *widget);
-static void               nautilus_wrap_table_remove           (GtkContainer             *container,
-								GtkWidget                *widget);
-static void               nautilus_wrap_table_forall           (GtkContainer             *container,
-								gboolean                  include_internals,
-								GtkCallback               callback,
-								gpointer                  callback_data);
-static GtkType            nautilus_wrap_table_child_type       (GtkContainer             *container);
-
-
-/* Private NautilusWrapTable methods */
-static NautilusDimensions wrap_table_art_irect_max_dimensions  (const NautilusDimensions *one,
-								const NautilusDimensions *two);
-static NautilusDimensions wrap_table_get_max_child_dimensions  (const NautilusWrapTable  *wrap_table);
-static NautilusDimensions wrap_table_get_content_dimensions    (const NautilusWrapTable  *wrap_table);
-static ArtIRect           wrap_table_get_content_bounds        (const NautilusWrapTable  *wrap_table);
-static NautilusArtIPoint  wrap_table_get_scroll_offset         (const NautilusWrapTable  *wrap_table);
-static GtkWidget *        wrap_table_find_child_at_point       (const NautilusWrapTable  *wrap_table,
-								int                       x,
-								int                       y);
-static void               wrap_table_layout                    (NautilusWrapTable        *wrap_table);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusWrapTable, nautilus_wrap_table, GTK_TYPE_CONTAINER)
-
-/* Class init methods */
-static void
-nautilus_wrap_table_initialize_class (NautilusWrapTableClass *wrap_table_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (wrap_table_class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (wrap_table_class);
-	GtkContainerClass *container_class = GTK_CONTAINER_CLASS (wrap_table_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_wrap_table_destroy;
-	object_class->set_arg = nautilus_wrap_table_set_arg;
-	object_class->get_arg = nautilus_wrap_table_get_arg;
-	
- 	/* GtkWidgetClass */
- 	widget_class->size_request = nautilus_wrap_table_size_request;
-	widget_class->size_allocate = nautilus_wrap_table_size_allocate;
- 	widget_class->expose_event = nautilus_wrap_table_expose_event;
-	widget_class->map = nautilus_wrap_table_map;
-	widget_class->unmap = nautilus_wrap_table_unmap;
-
- 	/* GtkContainerClass */
-	container_class->add = nautilus_wrap_table_add;
-	container_class->remove = nautilus_wrap_table_remove;
-	container_class->forall = nautilus_wrap_table_forall;
-	container_class->child_type = nautilus_wrap_table_child_type;
-  
-	/* Arguments */
-	gtk_object_add_arg_type ("NautilusWrapTable::x_spacing",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_X_SPACING);
-	gtk_object_add_arg_type ("NautilusWrapTable::y_spacing",
-				 GTK_TYPE_UINT,
-				 GTK_ARG_READWRITE,
-				 ARG_Y_SPACING);
-	gtk_object_add_arg_type ("NautilusWrapTable::x_justification",
-				 GTK_TYPE_ENUM,
-				 GTK_ARG_READWRITE,
-				 ARG_X_JUSTIFICATION);
-	gtk_object_add_arg_type ("NautilusWrapTable::y_justification",
-				 GTK_TYPE_ENUM,
-				 GTK_ARG_READWRITE,
-				 ARG_Y_JUSTIFICATION);
-	gtk_object_add_arg_type ("NautilusWrapTable::homogeneous",
-				 GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE,
-				 ARG_HOMOGENEOUS);
-}
-
-void
-nautilus_wrap_table_initialize (NautilusWrapTable *wrap_table)
-{
-	GTK_WIDGET_SET_FLAGS (wrap_table, GTK_NO_WINDOW);
-
-	wrap_table->details = g_new0 (NautilusWrapTableDetails, 1);
-	wrap_table->details->x_justification = NAUTILUS_JUSTIFICATION_BEGINNING;
-	wrap_table->details->y_justification = NAUTILUS_JUSTIFICATION_END;
-}
-
-/* GtkObjectClass methods */
-static void
-nautilus_wrap_table_destroy (GtkObject *object)
-{
- 	NautilusWrapTable *wrap_table;
-	
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (object));
-
-	wrap_table = NAUTILUS_WRAP_TABLE (object);
-
-	/*
-	 * Chain destroy before freeing our details.
-	 * The details will be used in the nautilus_wrap_box_remove () 
-	 * method as a result of the children being killed.
-	 */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-
-	g_list_free (wrap_table->details->children);
-
-	g_free (wrap_table->details);
-}
-
-static void
-nautilus_wrap_table_set_arg (GtkObject *object,
-			     GtkArg *arg,
-			     guint arg_id)
-{
-	NautilusWrapTable *wrap_table;
-	
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (object));
-
- 	wrap_table = NAUTILUS_WRAP_TABLE (object);
-
- 	switch (arg_id)
-	{
-	case ARG_X_SPACING:
-		nautilus_wrap_table_set_x_spacing (wrap_table, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_Y_SPACING:
-		nautilus_wrap_table_set_y_spacing (wrap_table, GTK_VALUE_UINT (*arg));
-		break;
-
-	case ARG_X_JUSTIFICATION:
-		nautilus_wrap_table_set_x_justification (wrap_table, GTK_VALUE_ENUM (*arg));
-		break;
-
-	case ARG_Y_JUSTIFICATION:
-		nautilus_wrap_table_set_y_justification (wrap_table, GTK_VALUE_ENUM (*arg));
-		break;
-
-	case ARG_HOMOGENEOUS:
-		nautilus_wrap_table_set_homogeneous (wrap_table, GTK_VALUE_BOOL (*arg));
-		break;
-
- 	default:
-		g_assert_not_reached ();
-	}
-}
-
-static void
-nautilus_wrap_table_get_arg (GtkObject *object,
-			    GtkArg *arg,
-			    guint arg_id)
-{
-	NautilusWrapTable *wrap_table;
-
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (object));
-	
-	wrap_table = NAUTILUS_WRAP_TABLE (object);
-
- 	switch (arg_id)
-	{
-	case ARG_X_SPACING:
-		GTK_VALUE_UINT (*arg) = nautilus_wrap_table_get_x_spacing (wrap_table);
-		break;
-
-	case ARG_Y_SPACING:
-		GTK_VALUE_UINT (*arg) = nautilus_wrap_table_get_y_spacing (wrap_table);
-		break;
-
-	case ARG_X_JUSTIFICATION:
-		GTK_VALUE_ENUM (*arg) = nautilus_wrap_table_get_x_justification (wrap_table);
-		break;
-
-	case ARG_Y_JUSTIFICATION:
-		GTK_VALUE_ENUM (*arg) = nautilus_wrap_table_get_y_justification (wrap_table);
-		break;
-
-	case ARG_HOMOGENEOUS:
-		GTK_VALUE_BOOL (*arg) = nautilus_wrap_table_get_homogeneous (wrap_table);
-		break;
-
- 	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* GtkWidgetClass methods */
-static void
-nautilus_wrap_table_size_request (GtkWidget *widget,
-				  GtkRequisition *requisition)
-{
-	NautilusWrapTable *wrap_table;
-	NautilusDimensions content_dimensions;
-
- 	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (widget));
- 	g_return_if_fail (requisition != NULL);
-
-  	wrap_table = NAUTILUS_WRAP_TABLE (widget);
-
-	content_dimensions = wrap_table_get_content_dimensions (wrap_table);
-
-	/* The -1 tells Satan to use as much space as is available */
-	requisition->width = -1;
-	requisition->height = content_dimensions.height + GTK_CONTAINER (widget)->border_width * 2;
-}
-
-static void
-nautilus_wrap_table_size_allocate (GtkWidget *widget,
-				   GtkAllocation *allocation)
-{
-	NautilusWrapTable *wrap_table;
-
- 	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (widget));
- 	g_return_if_fail (allocation != NULL);
-	
-  	wrap_table = NAUTILUS_WRAP_TABLE (widget);
-	
-	widget->allocation = *allocation;
-
-	wrap_table_layout (wrap_table);
-}
-
-static int
-nautilus_wrap_table_expose_event (GtkWidget *widget,
-				 GdkEventExpose *event)
-{
-	NautilusWrapTable *wrap_table;
-	GList *iterator;
-	
-	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (widget), TRUE);
-	g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
-	g_return_val_if_fail (event != NULL, TRUE);
-
-  	wrap_table = NAUTILUS_WRAP_TABLE (widget);
-
-	for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) {
-		GtkWidget *item;
-		GdkEventExpose item_event;
-
-		item = iterator->data;
-		item_event = *event;
-
-		if (GTK_WIDGET_DRAWABLE (item) &&
-		    GTK_WIDGET_NO_WINDOW (item) &&
-		    gtk_widget_intersect (item, &event->area, &item_event.area)) {
-			gtk_widget_event (item, (GdkEvent *) &item_event);
-		}
-	}
-
-	return FALSE;
-}
-
-static void
-nautilus_wrap_table_map (GtkWidget *widget)
-{
-	NautilusWrapTable *wrap_table;
-	GList *iterator;
-
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (widget));
-	
-	wrap_table = NAUTILUS_WRAP_TABLE (widget);
-
- 	GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
-	
-	for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) {
-		GtkWidget *item;
-
-		item = iterator->data;
-
-		if (GTK_WIDGET_VISIBLE (item) && !GTK_WIDGET_MAPPED (item)) {
-			gtk_widget_map (item);
-		}
-	}
-}
-
-static void
-nautilus_wrap_table_unmap (GtkWidget *widget)
-{
-	NautilusWrapTable *wrap_table;
-	GList *iterator;
-
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (widget));
-	
-	wrap_table = NAUTILUS_WRAP_TABLE (widget);
-
-	GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
-
-	for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) {
-		GtkWidget *item;
-
-		item = iterator->data;
-
-		if (GTK_WIDGET_VISIBLE (item) && GTK_WIDGET_MAPPED (item)) {
-			gtk_widget_unmap (item);
-		}
-	}
-}
-
-/* GtkContainerClass methods */
-static void
-nautilus_wrap_table_add (GtkContainer *container,
-			GtkWidget *child)
-{
-	NautilusWrapTable *wrap_table;
-
-	g_return_if_fail (container != NULL);
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (container));
-	g_return_if_fail (GTK_IS_WIDGET (child));
-
-	wrap_table = NAUTILUS_WRAP_TABLE (container);
-
-	gtk_widget_set_parent (child, GTK_WIDGET (container));
-
-	wrap_table->details->children = g_list_append (wrap_table->details->children, child);
-
-	if (GTK_WIDGET_REALIZED (container)) {
-		gtk_widget_realize (child);
-	}
-
-	if (GTK_WIDGET_VISIBLE (container) && GTK_WIDGET_VISIBLE (child)) {
-		if (GTK_WIDGET_MAPPED (container)) {
-			gtk_widget_map (child);
-		}
-		
-		gtk_widget_queue_resize (child);
-	}
-}
-
-static void
-nautilus_wrap_table_remove (GtkContainer *container,
-			    GtkWidget *child)
-{
-	NautilusWrapTable *wrap_table;
-	gboolean child_was_visible;
-	
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (container));
-	g_return_if_fail (GTK_IS_WIDGET (child));
-	
-	wrap_table = NAUTILUS_WRAP_TABLE (container);;
-
-	child_was_visible = GTK_WIDGET_VISIBLE (child);
-	gtk_widget_unparent (child);
-	wrap_table->details->children = g_list_remove (wrap_table->details->children, child);
-
-	if (child_was_visible) {
-		gtk_widget_queue_resize (GTK_WIDGET (container));
-	}
-}
-
-static void
-nautilus_wrap_table_forall (GtkContainer *container,
-			    gboolean include_internals,
-			    GtkCallback callback,
-			    gpointer callback_data)
-{
-	NautilusWrapTable *wrap_table;
-	GList *node;
-	GList *next;
-	
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (container));
-	g_return_if_fail (callback != NULL);
-	
-	wrap_table = NAUTILUS_WRAP_TABLE (container);;
-	
-	for (node = wrap_table->details->children; node != NULL; node = next) {
-		g_assert (GTK_IS_WIDGET (node->data));
-		next = node->next;
-		(* callback) (GTK_WIDGET (node->data), callback_data);	
-	}
-}
-
-static GtkType
-nautilus_wrap_table_child_type (GtkContainer   *container)
-{
-	return GTK_TYPE_WIDGET;
-}
-
-/* Private NautilusWrapTable methods */
-static void
-wrap_table_layout (NautilusWrapTable *wrap_table)
-{
-	GList *iterator;
-	NautilusArtIPoint pos;
-	NautilusDimensions max_child_dimensions;
-	ArtIRect content_bounds;
-
- 	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table));
-
-	max_child_dimensions = wrap_table_get_max_child_dimensions (wrap_table);
-	content_bounds = wrap_table_get_content_bounds (wrap_table);
-	pos.x = content_bounds.x0;
-	pos.y = content_bounds.y0;
-
-	for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) {
-		GtkWidget *item;
-
-		item = iterator->data;
-		
-		if (GTK_WIDGET_VISIBLE (item)) {
-			GtkAllocation item_allocation;
-
-			if (wrap_table->details->homogeneous) {
-				item_allocation.x = pos.x;
-				item_allocation.y = pos.y;
-				item_allocation.width = max_child_dimensions.width;
-				item_allocation.height = max_child_dimensions.height;
-				
-				if ((pos.x + max_child_dimensions.width) > content_bounds.x1) {
-					pos.x = content_bounds.x0 + wrap_table->details->x_spacing + max_child_dimensions.width;
-					pos.y += (max_child_dimensions.height + wrap_table->details->y_spacing);
-					item_allocation.x = content_bounds.x0;
-					item_allocation.y = pos.y;
-				} else {
-					pos.x += (wrap_table->details->x_spacing + max_child_dimensions.width);
-				}
-			} else {
-				GtkRequisition item_requisition;
-				
-				gtk_widget_size_request (item, &item_requisition);
-				
-				item_allocation.x = pos.x;
-				item_allocation.y = pos.y;
-				item_allocation.width = item_requisition.width;
-				item_allocation.height = item_requisition.height;
-				
-				g_assert (item_allocation.width <= max_child_dimensions.width);
-				g_assert (item_allocation.height <= max_child_dimensions.height);
-				
-				if ((pos.x + max_child_dimensions.width) > content_bounds.x1) {
-					pos.x = content_bounds.x0 + wrap_table->details->x_spacing + max_child_dimensions.width;
-					pos.y += (max_child_dimensions.height + wrap_table->details->y_spacing);
-					item_allocation.x = content_bounds.x0;
-					item_allocation.y = pos.y;
-				} else {
-					pos.x += (wrap_table->details->x_spacing + max_child_dimensions.width);
-				}
-				
-				switch (wrap_table->details->x_justification) {
-				case NAUTILUS_JUSTIFICATION_MIDDLE:
-					item_allocation.x += (max_child_dimensions.width - (int) item_allocation.width) / 2;
-					break;
-				case NAUTILUS_JUSTIFICATION_END:
-					item_allocation.x += (max_child_dimensions.width - (int) item_allocation.width);
-					break;
-				default:
-				}
-				
-				switch (wrap_table->details->y_justification) {
-				case NAUTILUS_JUSTIFICATION_MIDDLE:
-					item_allocation.y += (max_child_dimensions.height - (int) item_allocation.height) / 2;
-					break;
-				case NAUTILUS_JUSTIFICATION_END:
-					item_allocation.y += (max_child_dimensions.height - (int) item_allocation.height);
-					break;
-				default:
-				}
-			}
-			
-			gtk_widget_size_allocate (item, &item_allocation);
-		}
-	}
-}
-
-static NautilusDimensions
-wrap_table_art_irect_max_dimensions (const NautilusDimensions *one,
-				     const NautilusDimensions *two)
-{
-	NautilusDimensions max_dimensions;
-
-	g_return_val_if_fail (one != NULL, NAUTILUS_DIMENSIONS_EMPTY);
-	g_return_val_if_fail (two != NULL, NAUTILUS_DIMENSIONS_EMPTY);
-
-	max_dimensions.width = MAX (one->width, two->width);
-	max_dimensions.height = MAX (one->height, two->height);
-
-	return max_dimensions;
-}
-
-static NautilusDimensions
-wrap_table_get_max_child_dimensions (const NautilusWrapTable *wrap_table)
-{
-	NautilusDimensions max_dimensions;
-	GList *iterator;
-
-  	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), NAUTILUS_DIMENSIONS_EMPTY);
-
-	max_dimensions = NAUTILUS_DIMENSIONS_EMPTY;
-
-	for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) {
-		GtkWidget *child;
-		
-		child = iterator->data;
-		
-		if (GTK_WIDGET_VISIBLE (child)) {
- 			GtkRequisition child_requisition;
-			NautilusDimensions child_dimensions;
-
- 			gtk_widget_size_request (child, &child_requisition);
-
-			child_dimensions.width = (int) child_requisition.width;
-			child_dimensions.height = (int) child_requisition.height;
-
-			max_dimensions = wrap_table_art_irect_max_dimensions (&child_dimensions, &max_dimensions);
-		}
-	}
-
-	return max_dimensions;
-}
-
-static int
-wrap_table_get_num_fitting (int available,
-			    int spacing,
-			    int max_child_size)
-{
-	int num;
-
-  	g_return_val_if_fail (available >= 0, 0);
-  	g_return_val_if_fail (max_child_size > 0, 0);
-  	g_return_val_if_fail (spacing >= 0, 0);
-	
-	num = (available + spacing) / (max_child_size + spacing);
-	num = MAX (num, 1);
-
-	return num;
-}
-
-static NautilusDimensions
-wrap_table_get_content_dimensions (const NautilusWrapTable *wrap_table)
-{
-	NautilusDimensions content_dimensions;
-	guint num_children;
-
-  	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), NAUTILUS_DIMENSIONS_EMPTY);
-
-	content_dimensions = NAUTILUS_DIMENSIONS_EMPTY;
-	
-	num_children = g_list_length (wrap_table->details->children);
-
-	if (num_children > 0) {
-		NautilusDimensions max_child_dimensions;
-		NautilusDimensions dimensions;
-		int num_cols;
-		int num_rows;
-
-		dimensions = nautilus_gtk_widget_get_dimensions (GTK_WIDGET (wrap_table));
-		max_child_dimensions = wrap_table_get_max_child_dimensions (wrap_table);
-
-		max_child_dimensions.width = MAX (max_child_dimensions.width, 1);
-		max_child_dimensions.height = MAX (max_child_dimensions.height, 1);
-
-		num_cols = wrap_table_get_num_fitting (dimensions.width,
-						       wrap_table->details->x_spacing,
-						       max_child_dimensions.width);
-		num_rows = num_children / num_cols;
-		num_rows = MAX (num_rows, 1);
-		
-		if ((num_children % num_rows) > 0) {
-			num_rows++;
-		}
-		
-		content_dimensions.width = dimensions.width;
-		content_dimensions.height = num_rows * max_child_dimensions.height;
-
-		content_dimensions.width += (num_cols - 1) * wrap_table->details->x_spacing;
-		content_dimensions.height += (num_rows - 1) * wrap_table->details->y_spacing;
-	}
-
-	return content_dimensions;
-}
-
-static ArtIRect
-wrap_table_get_content_bounds (const NautilusWrapTable *wrap_table)
-{
-	ArtIRect content_bounds;
-
-  	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), NAUTILUS_ART_IRECT_EMPTY);
-
-	content_bounds = nautilus_gtk_widget_get_bounds (GTK_WIDGET (wrap_table));
-
-	content_bounds.x0 += GTK_CONTAINER (wrap_table)->border_width;
-	content_bounds.y0 += GTK_CONTAINER (wrap_table)->border_width;
-	content_bounds.x1 -= GTK_CONTAINER (wrap_table)->border_width;
-	content_bounds.y1 -= GTK_CONTAINER (wrap_table)->border_width;
-
-	return content_bounds;
-}
-
-static NautilusArtIPoint
-wrap_table_get_scroll_offset (const NautilusWrapTable *wrap_table)
-{
-	NautilusArtIPoint scroll_offset;
-	GtkWidget *parent;
-
-  	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), NAUTILUS_ART_IPOINT_ZERO);
-
-	scroll_offset = NAUTILUS_ART_IPOINT_ZERO;
-
-	parent = GTK_WIDGET (wrap_table)->parent;
-
-	/*
-	 * FIXME: It lame we have to hardcode for a possible viewport 
-	 * parent here.  Theres probably a better way to do this
-	 */
-	if (GTK_IS_VIEWPORT (parent)) {
-		gdk_window_get_position (GTK_VIEWPORT (parent)->bin_window,
-					 &scroll_offset.x,
-					 &scroll_offset.y);
-	}
-
-	return scroll_offset;
-}
-
-static GtkWidget *
-wrap_table_find_child_at_point (const NautilusWrapTable *wrap_table,
-			       int x,
-			       int y)
-{
-	GList *iterator;
-	
-  	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), NULL);
-
-	for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) {
-		GtkWidget *child;
-		
-		child = iterator->data;
-		
-		if (GTK_WIDGET_VISIBLE (child)) {
-			ArtIRect child_bounds;
-
-			child_bounds = nautilus_gtk_widget_get_bounds (child);
- 			
-			if (nautilus_art_irect_contains_point (&child_bounds, x, y)) {
-				return child;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-/**
- * nautilus_wrap_table_new:
- *
- */
-GtkWidget*
-nautilus_wrap_table_new (gboolean homogeneous)
-{
-	NautilusWrapTable *wrap_table;
-
-	wrap_table = NAUTILUS_WRAP_TABLE (gtk_widget_new (nautilus_wrap_table_get_type (), NULL));
-
-	nautilus_wrap_table_set_homogeneous (wrap_table, homogeneous);
-	
-	return GTK_WIDGET (wrap_table);
-}
-
-/**
- * nautilus_wrap_table_set_x_spacing:
- * @wrap_table: A NautilusWrapTable.
- * @x_spacing: The new horizontal spacing between wraps.
- *
- */
-void
-nautilus_wrap_table_set_x_spacing (NautilusWrapTable *wrap_table,
-				   guint x_spacing)
-{
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table));
-	
-	if (wrap_table->details->x_spacing == x_spacing) {
-		return;
-	}
-	
-	wrap_table->details->x_spacing = x_spacing;
-
-	gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
-}
-
-/**
- * nautilus_wrap_table_get_item_spacing:
- * @wrap_table: A NautilusWrapTable.
- *
- * Returns: The horizontal spacing between wraps.
- */
-guint
-nautilus_wrap_table_get_x_spacing (const NautilusWrapTable *wrap_table)
-{
-	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), 0);
-	
-	return wrap_table->details->x_spacing;
-}
-
-/**
- * nautilus_wrap_table_set_y_spacing:
- * @wrap_table: A NautilusWrapTable.
- * @y_spacing: The new horizontal spacing between wraps.
- *
- */
-void
-nautilus_wrap_table_set_y_spacing (NautilusWrapTable *wrap_table,
-				   guint y_spacing)
-{
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table));
-	
-	if (wrap_table->details->y_spacing == y_spacing) {
-		return;
-	}
-	
-	wrap_table->details->y_spacing = y_spacing;
-
-	gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
-}
-
-/**
- * nautilus_wrap_table_get_item_spacing:
- * @wrap_table: A NautilusWrapTable.
- *
- * Returns: The horizontal spacing between wraps.
- */
-guint
-nautilus_wrap_table_get_y_spacing (const NautilusWrapTable *wrap_table)
-{
-	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), 0);
-	
-	return wrap_table->details->y_spacing;
-}
-
-/**
- * nautilus_wrap_table_find_child_at_event_point:
- * @wrap_table: A NautilusWrapTable.
- * @x: Event x;
- * @y: Event y;
- *
- * Returns: Child found at given coordinates or NULL of no child is found.
- */
-GtkWidget *
-nautilus_wrap_table_find_child_at_event_point (const NautilusWrapTable *wrap_table,
-					       int x,
-					       int y)
-{
-	NautilusArtIPoint scroll_offset;
-
-	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), NULL);
-
-	scroll_offset = wrap_table_get_scroll_offset (wrap_table);
-	
-	return wrap_table_find_child_at_point (wrap_table,
-					      x + ABS (scroll_offset.x),
-					      y + ABS (scroll_offset.y));
-}
-
-/**
- * nautilus_wrap_table_set_x_justification:
- * @wrap_table: A NautilusWrapTable.
- * @x_justification: The new horizontal justification between wraps.
- *
- */
-void
-nautilus_wrap_table_set_x_justification (NautilusWrapTable *wrap_table,
-					 NautilusJustification x_justification)
-{
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table));
-	g_return_if_fail (x_justification >= NAUTILUS_JUSTIFICATION_BEGINNING);
-	g_return_if_fail (x_justification <= NAUTILUS_JUSTIFICATION_END);
-	
-	if (wrap_table->details->x_justification == x_justification) {
-		return;
-	}
-	
-	wrap_table->details->x_justification = x_justification;
-	gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
-}
-
-/**
- * nautilus_wrap_table_get_item_justification:
- * @wrap_table: A NautilusWrapTable.
- *
- * Returns: The horizontal justification between wraps.
- */
-NautilusJustification 
-nautilus_wrap_table_get_x_justification (const NautilusWrapTable *wrap_table)
-{
-	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), 0);
-	
-	return wrap_table->details->x_justification;
-}
-
-/**
- * nautilus_wrap_table_set_y_justification:
- * @wrap_table: A NautilusWrapTable.
- * @y_justification: The new horizontal justification between wraps.
- *
- */
-void
-nautilus_wrap_table_set_y_justification (NautilusWrapTable *wrap_table,
-					 NautilusJustification y_justification)
-{
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table));
-	g_return_if_fail (y_justification >= NAUTILUS_JUSTIFICATION_BEGINNING);
-	g_return_if_fail (y_justification <= NAUTILUS_JUSTIFICATION_END);
-	
-	if (wrap_table->details->y_justification == y_justification) {
-		return;
-	}
-	
-	wrap_table->details->y_justification = y_justification;
-	gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
-}
-
-/**
- * nautilus_wrap_table_get_item_justification:
- * @wrap_table: A NautilusWrapTable.
- *
- * Returns: The horizontal justification between wraps.
- */
-NautilusJustification 
-nautilus_wrap_table_get_y_justification (const NautilusWrapTable *wrap_table)
-{
-	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), 0);
-	
-	return wrap_table->details->y_justification;
-}
-
-/**
- * nautilus_wrap_table_set_homogeneous:
- * @wrap_table: A NautilusWrapTable.
- * @homogeneous: The new horizontal spacing between wraps.
- *
- */
-void
-nautilus_wrap_table_set_homogeneous (NautilusWrapTable *wrap_table,
-				     gboolean homogeneous)
-{
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table));
-	
-	if (wrap_table->details->homogeneous == homogeneous) {
-		return;
-	}
-	
-	wrap_table->details->homogeneous = homogeneous;
-
-	gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
-}
-
-/**
- * nautilus_wrap_table_get_item_spacing:
- * @wrap_table: A NautilusWrapTable.
- *
- * Returns: The horizontal spacing between wraps.
- */
-gboolean
-nautilus_wrap_table_get_homogeneous (const NautilusWrapTable *wrap_table)
-{
-	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), FALSE);
-	
-	return wrap_table->details->homogeneous;
-}
-
-/**
- * nautilus_wrap_table_reorder_child:
- * @wrap_table: A NautilusWrapTable.
- * @child: Child to reorder.
- * @position: New position to put child at.
- *
- * Reorder the given chilren into the given position.
- *
- * Position is interpreted as follows:
- *
- *  0 - Place child at start of table.
- * -1 - Place child at end of table.
- *  n - Place child at nth position.  Count starts at 0.
- */
-void
-nautilus_wrap_table_reorder_child (NautilusWrapTable *wrap_table,
-				   GtkWidget *child,
-				   int position)
-{
-	GList *node;
-	gboolean found_child = FALSE;
-
-	g_return_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table));
-	g_return_if_fail (g_list_length (wrap_table->details->children) > 0);
-
-	if (position == -1) {
-		position = g_list_length (wrap_table->details->children) - 1;
-	}
-
-	g_return_if_fail (position >= 0);
-	g_return_if_fail ((guint) position < g_list_length (wrap_table->details->children));
-
-	for (node = wrap_table->details->children; node != NULL; node = node->next) {
-		GtkWidget *next_child;
-		next_child = node->data;
-		
-		if (next_child == child) {
-			g_assert (found_child == FALSE);
-			found_child = TRUE;
-		}
-	}
-
-	g_return_if_fail (found_child);
-
-	wrap_table->details->children = g_list_remove (wrap_table->details->children, child);
-	wrap_table->details->children = g_list_insert (wrap_table->details->children, child, position);
-
-	gtk_widget_queue_resize (GTK_WIDGET (wrap_table));
-}
-
-/**
- * nautilus_wrap_table_get_num_children:
- * @wrap_table: A NautilusWrapTable.
- *
- * Returns: The number of children being managed by the wrap table.
- */
-guint
-nautilus_wrap_table_get_num_children (const NautilusWrapTable *wrap_table)
-{
-	g_return_val_if_fail (NAUTILUS_IS_WRAP_TABLE (wrap_table), 0);
-	
-	return g_list_length (wrap_table->details->children);
-}
-
diff --git a/libnautilus-private/nautilus-wrap-table.h b/libnautilus-private/nautilus-wrap-table.h
deleted file mode 100644
index 8ce6116c1..000000000
--- a/libnautilus-private/nautilus-wrap-table.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-wrap-table.h - A table that can wrap its contents as needed.
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Ramiro Estrugo <ramiro@eazel.com>
-*/
-
-#ifndef NAUTILUS_WRAP_TABLE_H
-#define NAUTILUS_WRAP_TABLE_H
-
-#include <gtk/gtkcontainer.h>
-#include <libgnome/gnome-defs.h>
-
-BEGIN_GNOME_DECLS
-
-#define NAUTILUS_TYPE_WRAP_TABLE            (nautilus_wrap_table_get_type ())
-#define NAUTILUS_WRAP_TABLE(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_WRAP_TABLE, NautilusWrapTable))
-#define NAUTILUS_WRAP_TABLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_WRAP_TABLE, NautilusWrapTableClass))
-#define NAUTILUS_IS_WRAP_TABLE(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_WRAP_TABLE))
-#define NAUTILUS_IS_WRAP_TABLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_WRAP_TABLE))
-
-typedef struct NautilusWrapTable	  NautilusWrapTable;
-typedef struct NautilusWrapTableClass     NautilusWrapTableClass;
-typedef struct NautilusWrapTableDetails   NautilusWrapTableDetails;
-
-struct NautilusWrapTable
-{
-	/* Superclass */
-	GtkContainer container;
-
-	/* Private things */
-	NautilusWrapTableDetails *details;
-};
-
-struct NautilusWrapTableClass
-{
-	GtkContainerClass parent_class;
-};
-
-typedef enum
-{
-	NAUTILUS_JUSTIFICATION_BEGINNING,
-	NAUTILUS_JUSTIFICATION_MIDDLE,
-	NAUTILUS_JUSTIFICATION_END
-} NautilusJustification;
-
-/* Public GtkWrapTable methods */
-GtkType               nautilus_wrap_table_get_type                  (void);
-GtkWidget *           nautilus_wrap_table_new                       (gboolean                 homogeneous);
-void                  nautilus_wrap_table_set_x_spacing             (NautilusWrapTable       *wrap_table,
-								     guint                    x_spacing);
-guint                 nautilus_wrap_table_get_x_spacing             (const NautilusWrapTable *wrap_table);
-void                  nautilus_wrap_table_set_y_spacing             (NautilusWrapTable       *wrap_table,
-								     guint                    y_spacing);
-guint                 nautilus_wrap_table_get_y_spacing             (const NautilusWrapTable *wrap_table);
-GtkWidget *           nautilus_wrap_table_find_child_at_event_point (const NautilusWrapTable *wrap_table,
-								     int                      x,
-								     int                      y);
-void                  nautilus_wrap_table_set_x_justification       (NautilusWrapTable       *wrap_table,
-								     GtkJustification         justification);
-NautilusJustification nautilus_wrap_table_get_x_justification       (const NautilusWrapTable *wrap_table);
-void                  nautilus_wrap_table_set_y_justification       (NautilusWrapTable       *wrap_table,
-								     NautilusJustification    justification);
-NautilusJustification nautilus_wrap_table_get_y_justification       (const NautilusWrapTable *wrap_table);
-void                  nautilus_wrap_table_set_homogeneous           (NautilusWrapTable       *wrap_table,
-								     gboolean                 homogeneous);
-gboolean              nautilus_wrap_table_get_homogeneous           (const NautilusWrapTable *wrap_table);
-void                  nautilus_wrap_table_reorder_child             (NautilusWrapTable       *wrap_table,
-								     GtkWidget               *child,
-								     int                      position);
-guint                 nautilus_wrap_table_get_num_children          (const NautilusWrapTable *wrap_table);
-
-END_GNOME_DECLS
-
-#endif /* NAUTILUS_WRAP_TABLE_H */
-
-
diff --git a/libnautilus-private/nautilus-xml-extensions.c b/libnautilus-private/nautilus-xml-extensions.c
deleted file mode 100644
index 652b99b23..000000000
--- a/libnautilus-private/nautilus-xml-extensions.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-xml-extensions.c - functions that extend gnome-xml
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#include <config.h>
-#include "nautilus-xml-extensions.h"
-
-#include "nautilus-string.h"
-#include <glib.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <stdlib.h>
-
-xmlNodePtr
-nautilus_xml_get_children (xmlNodePtr parent)
-{
-	if (parent == NULL) {
-		return NULL;
-	}
-	return parent->xmlChildrenNode;
-}
-
-xmlNodePtr
-nautilus_xml_get_root_children (xmlDocPtr document)
-{
-	return nautilus_xml_get_children (xmlDocGetRootElement (document));
-}
-
-xmlNodePtr
-nautilus_xml_get_child_by_name_and_property (xmlNodePtr parent,
-					     const char *child_name,
-					     const char *property_name,
-					     const char *property_value)
-{
-	xmlNodePtr child;
-	xmlChar *property;
-	gboolean match;
-
-	if (parent == NULL) {
-		return NULL;
-	}
-	for (child = nautilus_xml_get_children (parent); child != NULL; child = child->next) {
-		if (strcmp (child->name, child_name) == 0) {
-			property = xmlGetProp (child, property_name);
-			match = nautilus_strcmp (property, property_value) == 0;
-			xmlFree (property);
-			if (match) {
-				return child;
-			}
-		}
-	}
-	return NULL;
-}
-
-/* return a child of the passed-in node with a matching name */
-
-xmlNodePtr
-nautilus_xml_get_child_by_name (xmlNodePtr parent,
-					     const char *child_name)
-{
-	xmlNodePtr child;
-
-	if (parent == NULL) {
-		return NULL;
-	}
-	for (child = nautilus_xml_get_children (parent); child != NULL; child = child->next) {
-		if (strcmp (child->name, child_name) == 0) {
-			return child;
-		}
-	}
-	return NULL;
-}
-
-
-xmlNodePtr
-nautilus_xml_get_root_child_by_name_and_property (xmlDocPtr document,
-						  const char *child_name,
-						  const char *property_name,
-						  const char *property_value)
-{
-	return nautilus_xml_get_child_by_name_and_property
-		(xmlDocGetRootElement (document),
-		 child_name,
-		 property_name,
-		 property_value);
-}
-
-/**
- * nautilus_xml_get_property_for_children
- * 
- * Returns a list of the values for the specified property for all
- * children of the node that have the specified name.
- *
- * @parent:     xmlNodePtr representing the node in question.
- * @child_name: child element name to look for
- * @property:   name of propety to reutnr for matching children that have the property
- * 
- * Returns: A list of keywords.
- * 
- **/
-GList *
-nautilus_xml_get_property_for_children (xmlNodePtr parent,
-					const char *child_name,
-					const char *property_name)
-{
-	GList *properties;
-	xmlNode *child;
-	xmlChar *property;
-	
-	properties = NULL;
-	
-	for (child = nautilus_xml_get_children (parent);
-	     child != NULL;
-	     child = child->next) {
-		if (strcmp (child->name, child_name) == 0) {
-			property = xmlGetProp (child, property_name);
-			if (property != NULL) {
-				properties = g_list_prepend (properties,
-							     g_strdup (property));
-				xmlFree (property);
-			}
-		}
-	}
-
-	/* Reverse so you get them in the same order as the XML file. */
-	return g_list_reverse (properties);
-}
-
-xmlChar *
-nautilus_xml_get_property_translated (xmlNodePtr parent,
-				      const char *property_name)
-{
-	xmlChar *property, *untranslated_property;
-	char *untranslated_property_name;
-	const char *translated_property;
-
-	/* Try for the already-translated version. */
-	property = xmlGetProp (parent, property_name);
-	if (property != NULL) {
-		return property;
-	}
-
-	/* Try for the untranslated version. */
-	untranslated_property_name = g_strconcat ("_", property_name, NULL);
-	untranslated_property = xmlGetProp (parent, untranslated_property_name);
-	g_free (untranslated_property_name);
-	if (untranslated_property == NULL) {
-		return NULL;
-	}
-
-	/* Try to translate. */
-	translated_property = _(untranslated_property);
-
-	/* If not translation is found, return untranslated property as-is. */
-	if (translated_property == (char *) untranslated_property) {
-		return untranslated_property;
-	}
-	
-	/* If a translation happened, make a copy to match the normal
-	 * behavior of this function (returning a string you xmlFree).
-	 */
-	xmlFree (untranslated_property);
-	return xmlStrdup (translated_property);
-}
-
-void
-nautilus_xml_remove_node (xmlNodePtr node)
-{
-	g_return_if_fail (node != NULL);
-	g_return_if_fail (node->doc != NULL);
-	g_return_if_fail (node->parent != NULL);
-	g_return_if_fail (node->doc->xmlRootNode != node);
-
-	if (node->prev == NULL) {
-		g_assert (node->parent->xmlChildrenNode == node);
-		node->parent->xmlChildrenNode = node->next;
-	} else {
-		g_assert (node->parent->xmlChildrenNode != node);
-		node->prev->next = node->next;
-	}
-
-	if (node->next == NULL) {
-		g_assert (node->parent->last == node);
-		node->parent->last = node->prev;
-	} else {
-		g_assert (node->parent->last != node);
-		node->next->prev = node->prev;
-	}
-
-	node->doc = NULL;
-	node->parent = NULL;
-	node->next = NULL;
-	node->prev = NULL;
-}
diff --git a/libnautilus-private/nautilus-xml-extensions.h b/libnautilus-private/nautilus-xml-extensions.h
deleted file mode 100644
index c0d528aa6..000000000
--- a/libnautilus-private/nautilus-xml-extensions.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-xml-extensions.h - functions that extend gnome-xml
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Authors: Darin Adler <darin@eazel.com>
-*/
-
-#ifndef NAUTILUS_XML_EXTENSIONS_H
-#define NAUTILUS_XML_EXTENSIONS_H
-
-#include <gnome-xml/tree.h>
-#include <glib.h>
-
-xmlNodePtr nautilus_xml_get_children                        (xmlNodePtr  parent);
-xmlNodePtr nautilus_xml_get_root_children                   (xmlDocPtr   document);
-xmlNodePtr nautilus_xml_get_child_by_name                   (xmlNodePtr  parent,
-							     const char *child_name);
-xmlNodePtr nautilus_xml_get_child_by_name_and_property      (xmlNodePtr  parent,
-							     const char *child_name,
-							     const char *property_name,
-							     const char *property_value);
-xmlNodePtr nautilus_xml_get_root_child_by_name_and_property (xmlDocPtr   document,
-							     const char *child_name,
-							     const char *property_name,
-							     const char *property_value);
-GList     *nautilus_xml_get_property_for_children           (xmlNodePtr  parent,
-							     const char *child_name,
-							     const char *property_name);
-xmlChar   *nautilus_xml_get_property_translated             (xmlNodePtr  parent,
-							     const char *property_name);
-void       nautilus_xml_remove_node                         (xmlNodePtr  node);
-
-#endif /* NAUTILUS_XML_EXTENSIONS_H */
diff --git a/libnautilus/nautilus-undo-transaction.c b/libnautilus/nautilus-undo-transaction.c
index 676800c61..ac2e019f1 100644
--- a/libnautilus/nautilus-undo-transaction.c
+++ b/libnautilus/nautilus-undo-transaction.c
@@ -30,7 +30,7 @@
 #include "nautilus-undo-private.h"
 #include <bonobo/bonobo-main.h>
 #include <gtk/gtksignal.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus/nautilus-bonobo-workarounds.h>
 
 #define NAUTILUS_UNDO_TRANSACTION_LIST_DATA "Nautilus undo transaction list"
@@ -59,7 +59,7 @@ static void                    impl_Nautilus_Undo_Transaction__undo
 static void                    undo_atom_list_free                                (GList                        *list);
 static void                    undo_atom_list_undo_and_free                       (GList                        *list);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusUndoTransaction, nautilus_undo_transaction, BONOBO_OBJECT_TYPE)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusUndoTransaction, nautilus_undo_transaction, BONOBO_OBJECT_TYPE)
 
 static POA_Nautilus_Undo_Transaction__epv libnautilus_Nautilus_Undo_Transaction_epv =
 {
@@ -254,7 +254,7 @@ nautilus_undo_transaction_destroy (GtkObject *object)
 	CORBA_Object_release (transaction->owner, &ev);
 	CORBA_exception_free (&ev);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c
index 061130805..aae54c97e 100644
--- a/libnautilus/nautilus-view.c
+++ b/libnautilus/nautilus-view.c
@@ -41,7 +41,7 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 
 enum {
 	HISTORY_CHANGED,
@@ -93,7 +93,7 @@ static void nautilus_view_initialize             (NautilusView           *view);
 static void nautilus_view_destroy                (GtkObject              *object);
 static void nautilus_view_initialize_class       (NautilusViewClass      *klass);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusView, nautilus_view, BONOBO_OBJECT_TYPE)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusView, nautilus_view, BONOBO_OBJECT_TYPE)
 
 static POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
 {
@@ -492,7 +492,7 @@ nautilus_view_destroy (GtkObject *object)
 
 	g_free (view->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static Nautilus_ViewFrame
diff --git a/librsvg/.cvsignore b/librsvg/.cvsignore
deleted file mode 100644
index 5675f94b0..000000000
--- a/librsvg/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-*.lo
-*.la
-Makefile
-Makefile.in
-test-rsvg
-test-ft
-test-ft-gtk
-
diff --git a/librsvg/Makefile.am b/librsvg/Makefile.am
deleted file mode 100644
index 1ee84e61e..000000000
--- a/librsvg/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-NULL=
-
-noinst_PROGRAMS =\
-	test-rsvg \
-	test-ft \
-	test-ft-gtk \
-	$(NULL)
-
-noinst_LTLIBRARIES = librsvg.la
-
-INCLUDES = \
-	$(FREETYPE2_CFLAGS) \
-	$(GNOME_CFLAGS) \
-	$(GNOMECANVASPIXBUF_INCLUDEDIR) \
-	$(GDK_PIXBUF_CFLAGS) \
-	$(XML_CFLAGS) \
-	$(WERROR) \
-	-D_REENTRANT \
-	-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
-	$(NULL)
-
-librsvg_la_LDFLAGS= -static
-
-noinst_HEADERS =\
-	rsvg.h \
-	$(NULL)
-
-librsvg_la_SOURCES =\
-	rsvg.c	 		\
-	rsvg.h	 		\
-	rsvg-bpath-util.c 	\
-	rsvg-bpath-util.h	\
-	rsvg-css.c		\
-	rsvg-css.h		\
-	rsvg-defs.c		\
-	rsvg-defs.h		\
-	rsvg-ft.c		\
-	rsvg-ft.h		\
-	rsvg-paint-server.c 	\
-	rsvg-paint-server.h 	\
-	rsvg-path.c 		\
-	rsvg-path.h 		\
-	art_rgba.c		\
-	art_rgba.h		\
-	art_render.c		\
-	art_render.h		\
-	art_render_gradient.c	\
-	art_render_gradient.h	\
-	art_render_mask.c	\
-	art_render_mask.h	\
-	art_render_svp.c	\
-	art_render_svp.h	\
-	$(NULL)
-
-test_rsvg_SOURCES = test-rsvg.c
-test_ft_SOURCES = test-ft.c
-test_ft_gtk_SOURCES = test-ft-gtk.c
-
-test_rsvg_LDADD =\
-	librsvg.la \
-	$(GNOMECANVASPIXBUF_LIBS) \
-	$(GNOMEUI_LIBS) \
-	$(XML_LIBS) \
-	$(FREETYPE2_LIBS) \
-	$(LIBPNG) \
-	$(NULL)
-
-test_ft_LDADD =\
-	librsvg.la \
-	$(GNOMECANVASPIXBUF_LIBS) \
-	$(GNOMEUI_LIBS) \
-	$(XML_LIBS) \
-	$(FREETYPE2_LIBS) \
-	$(LIBPNG) \
-	$(NULL)
-
-test_ft_gtk_LDADD =\
-	librsvg.la \
-	$(GNOMECANVASPIXBUF_LIBS) \
-	$(GNOMEUI_LIBS) \
-	$(XML_LIBS) \
-	$(FREETYPE2_LIBS) \
-	$(LIBPNG) \
-	$(NULL)
-
diff --git a/librsvg/art_render.c b/librsvg/art_render.c
deleted file mode 100644
index a4a624b07..000000000
--- a/librsvg/art_render.c
+++ /dev/null
@@ -1,1140 +0,0 @@
-/* This file is adapted from art_render.c in Libart version 2.3.0 */
-
-#include <libart_lgpl/libart-features.h>
-
-#if LIBART_MAJOR_VERSION == 2 && LIBART_MINOR_VERSION < 3
-
-/* Libart_LGPL - library of basic graphic primitives
- * Copyright (C) 2000 Raph Levien
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Raph Levien <raph@acm.org>
- */
-
-#include <libart_lgpl/art_misc.h>
-#include <libart_lgpl/art_alphagamma.h>
-#include <libart_lgpl/art_rgb.h>
-
-#include "art_render.h"
-
-typedef struct _ArtRenderPriv ArtRenderPriv;
-
-struct _ArtRenderPriv {
-  ArtRender super;
-
-  ArtImageSource *image_source;
-
-  int n_mask_source;
-  ArtMaskSource **mask_source;
-
-  int n_callbacks;
-  ArtRenderCallback **callbacks;
-};
-
-ArtRender *
-art_render_new (int x0, int y0, int x1, int y1,
-		art_u8 *pixels, int rowstride,
-		int n_chan, int depth, ArtAlphaType alpha_type,
-		ArtAlphaGamma *alphagamma)
-{
-  ArtRenderPriv *priv;
-  ArtRender *result;
-
-  priv = art_new (ArtRenderPriv, 1);
-  result = &priv->super;
-
-  if (n_chan > ART_MAX_CHAN)
-    {
-      art_warn ("art_render_new: n_chan = %d, exceeds %d max\n",
-		n_chan, ART_MAX_CHAN);
-      return NULL;
-    }
-  if (depth > ART_MAX_DEPTH)
-    {
-      art_warn ("art_render_new: depth = %d, exceeds %d max\n",
-		depth, ART_MAX_DEPTH);
-      return NULL;
-    }
-  if (x0 >= x1)
-    {
-      art_warn ("art_render_new: x0 >= x1 (x0 = %d, x1 = %d)\n", x0, x1);
-      return NULL;
-    }
-  result->x0 = x0;
-  result->y0 = y0;
-  result->x1 = x1;
-  result->y1 = y1;
-  result->pixels = pixels;
-  result->rowstride = rowstride;
-  result->n_chan = n_chan;
-  result->depth = depth;
-  result->alpha_type = alpha_type;
-
-  result->clear = ART_FALSE;
-  result->opacity = 0x10000;
-  result->compositing_mode = ART_COMPOSITE_NORMAL;
-  result->alphagamma = alphagamma;
-
-  result->alpha_buf = NULL;
-  result->image_buf = NULL;
-
-  result->run = NULL;
-  result->span_x = NULL;
-
-  result->need_span = ART_FALSE;
-
-  priv->image_source = NULL;
-
-  priv->n_mask_source = 0;
-  priv->mask_source = NULL;
-
-  return result;
-}
-
-/* todo on clear routines: I haven't really figured out what to do
-   with clearing the alpha channel. It _should_ be possible to clear
-   to an arbitrary RGBA color. */
-
-/**
- * art_render_clear: Set clear color.
- * @clear_color: Color with which to clear dest.
- *
- * Sets clear color, equivalent to actually clearing the destination
- * buffer before rendering. This is the most general form.
- **/
-void
-art_render_clear (ArtRender *render, const ArtPixMaxDepth *clear_color)
-{
-  int i;
-  int n_ch = render->n_chan + (render->alpha_type != ART_ALPHA_NONE);
-
-  render->clear = ART_TRUE;
-  for (i = 0; i < n_ch; i++)
-    render->clear_color[i] = clear_color[i];
-}
-
-/**
- * art_render_clear_rgb: Set clear color, given in RGB format.
- * @clear_rgb: Clear color, in 0xRRGGBB format.
- *
- * Sets clear color, equivalent to actually clearing the destination
- * buffer before rendering.
- **/
-void
-art_render_clear_rgb (ArtRender *render, art_u32 clear_rgb)
-{
-  if (render->n_chan != 3)
-    art_warn ("art_render_clear_rgb: called on render with %d channels, only works with 3\n",
-	      render->n_chan);
-  else
-    {
-      int r, g, b;
-
-      render->clear = ART_TRUE;
-      r = clear_rgb >> 16;
-      g = (clear_rgb >> 8) & 0xff;
-      b = clear_rgb & 0xff;
-      render->clear_color[0] = ART_PIX_MAX_FROM_8(r);
-      render->clear_color[1] = ART_PIX_MAX_FROM_8(g);
-      render->clear_color[2] = ART_PIX_MAX_FROM_8(b);
-    }
-}
-
-static void
-art_render_nop_done (ArtRenderCallback *self, ArtRender *render)
-{
-}
-
-static void
-art_render_clear_render_rgb8 (ArtRenderCallback *self, ArtRender *render,
-			      art_u8 *dest, int y)
-{
-  int width = render->x1 - render->x0;
-  art_u8 r, g, b;
-  ArtPixMaxDepth color_max;
-
-  color_max = render->clear_color[0];
-  r = ART_PIX_8_FROM_MAX (color_max);
-  color_max = render->clear_color[1];
-  g = ART_PIX_8_FROM_MAX (color_max);
-  color_max = render->clear_color[2];
-  b = ART_PIX_8_FROM_MAX (color_max);
-
-  art_rgb_fill_run (dest, r, g, b, width);
-}
-
-static void
-art_render_clear_render_8 (ArtRenderCallback *self, ArtRender *render,
-			   art_u8 *dest, int y)
-{
-  int width = render->x1 - render->x0;
-  int i, j;
-  int n_ch = render->n_chan + (render->alpha_type != ART_ALPHA_NONE);
-  int ix;
-  art_u8 color[ART_MAX_CHAN + 1];
-
-  for (j = 0; j < n_ch; j++)
-    {
-      ArtPixMaxDepth color_max = render->clear_color[j];
-      color[j] = ART_PIX_8_FROM_MAX (color_max);
-    }
-
-  ix = 0;
-  for (i = 0; i < width; i++)
-    for (j = 0; j < n_ch; j++)
-      dest[ix++] = color[j];
-}
-
-const ArtRenderCallback art_render_clear_rgb8_obj =
-{
-  art_render_clear_render_rgb8,
-  art_render_nop_done
-};
-
-const ArtRenderCallback art_render_clear_8_obj =
-{
-  art_render_clear_render_8,
-  art_render_nop_done
-};
-
-#if ART_MAX_DEPTH >= 16
-
-static void
-art_render_clear_render_16 (ArtRenderCallback *self, ArtRender *render,
-			    art_u8 *dest, int y)
-{
-  int width = render->x1 - render->x0;
-  int i, j;
-  int n_ch = render->n_chan + (render->alpha_type != ART_ALPHA_NONE);
-  int ix;
-  art_u16 *dest_16 = (art_u16 *)dest;
-  art_u8 color[ART_MAX_CHAN + 1];
-
-  for (j = 0; j < n_ch; j++)
-    {
-      int color_16 = render->clear_color[j];
-      color[j] = color_16;
-    }
-
-  ix = 0;
-  for (i = 0; i < width; i++)
-    for (j = 0; j < n_ch; j++)
-      dest_16[ix++] = color[j];
-}
-
-const ArtRenderCallback art_render_clear_16_obj =
-{
-  art_render_clear_render_16,
-  art_render_nop_done
-};
-
-#endif /* ART_MAX_DEPTH >= 16 */
-
-/* todo: inline */
-static ArtRenderCallback *
-art_render_choose_clear_callback (ArtRender *render)
-{
-  ArtRenderCallback *clear_callback;
-
-  if (render->depth == 8)
-    {
-      if (render->n_chan == 3 &&
-	  render->alpha_type == ART_ALPHA_NONE)
-	clear_callback = (ArtRenderCallback *)&art_render_clear_rgb8_obj;
-      else
-	clear_callback = (ArtRenderCallback *)&art_render_clear_8_obj;
-    }
-#if ART_MAX_DEPTH >= 16
-  else if (render->depth == 16)
-    clear_callback = (ArtRenderCallback *)&art_render_clear_16_obj;
-#endif
-  else
-    {
-      art_die ("art_render_choose_clear_callback: inconsistent render->depth = %d\n",
-	       render->depth);
-      clear_callback = NULL; /* to avoid "may be used uninitialized" warning */
-    }
-  return clear_callback;
-}
-
-#if 0
-/* todo: get around to writing this */
-static void
-art_render_composite_render_noa_8_norm (ArtRenderCallback *self, ArtRender *render,
-					art_u8 *dest, int y)
-{
-  int width = render->x1 - render->x0;
-
-}
-#endif
-
-/* This is the most general form of the function. It is slow but
-   (hopefully) correct. Actually, I'm still worried about roundoff
-   errors in the premul case - it seems to me that an off-by-one could
-   lead to overflow. */
-static void
-art_render_composite (ArtRenderCallback *self, ArtRender *render,
-					art_u8 *dest, int y)
-{
-  ArtRenderMaskRun *run = render->run;
-  art_u32 depth = render->depth;
-  int n_run = render->n_run;
-  int x0 = render->x0;
-  int x;
-  int run_x0, run_x1;
-  art_u8 *alpha_buf = render->alpha_buf;
-  art_u8 *image_buf = render->image_buf;
-  int i, j;
-  art_u32 tmp;
-  art_u32 run_alpha;
-  art_u32 alpha;
-  int image_ix;
-  art_u16 src[ART_MAX_CHAN + 1];
-  art_u16 dst[ART_MAX_CHAN + 1];
-  int n_chan = render->n_chan;
-  ArtAlphaType alpha_type = render->alpha_type;
-  int n_ch = n_chan + (alpha_type != ART_ALPHA_NONE);
-  int dst_pixstride = n_ch * (depth >> 3);
-  int buf_depth = render->buf_depth;
-  ArtAlphaType buf_alpha = render->buf_alpha;
-  int buf_n_ch = n_chan + (buf_alpha != ART_ALPHA_NONE);
-  int buf_pixstride = buf_n_ch * (buf_depth >> 3);
-  art_u8 *bufptr;
-  art_u32 src_alpha;
-  art_u32 src_mul;
-  art_u8 *dstptr;
-  art_u32 dst_alpha;
-  art_u32 dst_mul;
-
-  image_ix = 0;
-  for (i = 0; i < n_run - 1; i++)
-    {
-      run_x0 = run[i].x;
-      run_x1 = run[i + 1].x;
-      tmp = run[i].alpha;
-      if (tmp < 0x8100)
-	continue;
-
-      run_alpha = (tmp + (tmp >> 8) + (tmp >> 16) - 0x8000) >> 8; /* range [0 .. 0x10000] */
-      bufptr = image_buf + (run_x0 - x0) * buf_pixstride;
-      dstptr = dest + (run_x0 - x0) * dst_pixstride;
-      for (x = run_x0; x < run_x1; x++)
-	{
-	  if (alpha_buf)
-	    {
-	      if (depth == 8)
-		{
-		  tmp = run_alpha * alpha_buf[x - x0] + 0x80;
-		  /* range 0x80 .. 0xff0080 */
-		  alpha = (tmp + (tmp >> 8) + (tmp >> 16)) >> 8;
-		}
-	      else /* (depth == 16) */
-		{
-		  tmp = ((art_u16 *)alpha_buf)[x - x0];
-		  tmp = (run_alpha * tmp + 0x8000) >> 8;
-		  /* range 0x80 .. 0xffff80 */
-		  alpha = (tmp + (tmp >> 16)) >> 8;
-		}
-	    }
-	  else
-	    alpha = run_alpha;
-	  /* alpha is run_alpha * alpha_buf[x], range 0 .. 0x10000 */
-
-	  /* convert (src pixel * alpha) to premul alpha form,
-	     store in src as 0..0xffff range */
-	  if (buf_alpha == ART_ALPHA_NONE)
-	    {
-	      src_alpha = alpha;
-	      src_mul = src_alpha;
-	    }
-	  else
-	    {
-	      if (buf_depth == 8)
-		{
-		  tmp = alpha * bufptr[n_chan] + 0x80;
-		  /* range 0x80 .. 0xff0080 */
-		  src_alpha = (tmp + (tmp >> 8) + (tmp >> 16)) >> 8;
-		}
-	      else /* (depth == 16) */
-		{
-		  tmp = ((art_u16 *)bufptr)[n_chan];
-		  tmp = (alpha * tmp + 0x8000) >> 8;
-		  /* range 0x80 .. 0xffff80 */
-		  src_alpha = (tmp + (tmp >> 16)) >> 8;
-		}
-	      if (buf_alpha == ART_ALPHA_SEPARATE)
-		src_mul = src_alpha;
-	      else /* buf_alpha == (ART_ALPHA_PREMUL) */
-		src_mul = alpha;
-	    }
-	  /* src_alpha is the (alpha of the source pixel * alpha),
-	     range 0..0x10000 */
-
-	  if (buf_depth == 8)
-	    {
-	      src_mul *= 0x101;
-	      for (j = 0; j < n_chan; j++)
-		src[j] = (bufptr[j] * src_mul + 0x8000) >> 16;
-	    }
-	  else if (buf_depth == 16)
-	    {
-	      for (j = 0; j < n_chan; j++)
-		src[j] = (((art_u16 *)bufptr)[j] * src_mul + 0x8000) >> 16;
-	    }
-	  bufptr += buf_pixstride;
-
-	  /* src[0..n_chan - 1] (range 0..0xffff) and src_alpha (range
-             0..0x10000) now contain the source pixel with
-             premultiplied alpha */
-
-	  /* convert dst pixel to premul alpha form,
-	     store in dst as 0..0xffff range */
-	  if (alpha_type == ART_ALPHA_NONE)
-	    {
-	      dst_alpha = 0x10000;
-	      dst_mul = dst_alpha;
-	    }
-	  else
-	    {
-	      if (depth == 8)
-		{
-		  tmp = dstptr[n_chan];
-		  /* range 0..0xff */
-		  dst_alpha = (tmp << 8) + tmp + (tmp >> 7);
-		}
-	      else /* (depth == 16) */
-		{
-		  tmp = ((art_u16 *)bufptr)[n_chan];
-		  dst_alpha = (tmp + (tmp >> 15));
-		}
-	      if (alpha_type == ART_ALPHA_SEPARATE)
-		dst_mul = dst_alpha;
-	      else /* (alpha_type == ART_ALPHA_PREMUL) */
-		dst_mul = 0x10000;
-	    }
-	  /* dst_alpha is the alpha of the dest pixel,
-	     range 0..0x10000 */
-
-	  if (depth == 8)
-	    {
-	      dst_mul *= 0x101;
-	      for (j = 0; j < n_chan; j++)
-		dst[j] = (dstptr[j] * dst_mul + 0x8000) >> 16;
-	    }
-	  else if (buf_depth == 16)
-	    {
-	      for (j = 0; j < n_chan; j++)
-		dst[j] = (((art_u16 *)dstptr)[j] * dst_mul + 0x8000) >> 16;
-	    }
-
-	  /* do the compositing, dst = (src over dst) */
-	  for (j = 0; j < n_chan; j++)
-	    {
-	      art_u32 srcv, dstv;
-	      art_u32 tmp;
-
-	      srcv = src[j];
-	      dstv = dst[j];
-	      tmp = ((dstv * (0x10000 - src_alpha) + 0x8000) >> 16) + srcv;
-	      tmp -= tmp >> 16;
-	      dst[j] = tmp;
-	    }
-
-	  if (alpha_type == ART_ALPHA_NONE)
-	    {
-	      if (depth == 8)
-		dst_mul = 0xff;
-	      else /* (depth == 16) */
-		dst_mul = 0xffff;
-	    }
-	  else
-	    {
-	      if (src_alpha >= 0x10000)
-		dst_alpha = 0x10000;
-	      else
-		dst_alpha += ((((0x10000 - dst_alpha) * src_alpha) >> 8) + 0x80) >> 8;
-	      if (alpha_type == ART_ALPHA_PREMUL || dst_alpha == 0)
-		{
-		  if (depth == 8)
-		    dst_mul = 0xff;
-		  else /* (depth == 16) */
-		    dst_mul = 0xffff;
-		}
-	      else /* (ALPHA_TYPE == ART_ALPHA_SEPARATE && dst_alpha != 0) */
-		{
-		  if (depth == 8)
-		    dst_mul = 0xff0000 / dst_alpha;
-		  else /* (depth == 16) */
-		    dst_mul = 0xffff0000 / dst_alpha;
-		}
-	    }
-	  if (depth == 8)
-	    {
-	      for (j = 0; j < n_chan; j++)
-		dstptr[j] = (dst[j] * dst_mul + 0x8000) >> 16;
-	      if (alpha_type != ART_ALPHA_NONE)
-		dstptr[n_chan] = (dst_alpha * 0xff + 0x8000) >> 16;
-	    }
-	  else if (depth == 16)
-	    {
-	      for (j = 0; j < n_chan; j++)
-		((art_u16 *)dstptr)[j] = (dst[j] * dst_mul + 0x8000) >> 16;
-	      if (alpha_type != ART_ALPHA_NONE)
-		dstptr[n_chan] = (dst_alpha * 0xffff + 0x8000) >> 16;
-	    }
-	  dstptr += dst_pixstride;
-	}
-    }
-}
-
-const ArtRenderCallback art_render_composite_obj =
-{
-  art_render_composite,
-  art_render_nop_done
-};
-
-static void
-art_render_composite_8 (ArtRenderCallback *self, ArtRender *render,
-			art_u8 *dest, int y)
-{
-  ArtRenderMaskRun *run = render->run;
-  int n_run = render->n_run;
-  int x0 = render->x0;
-  int x;
-  int run_x0, run_x1;
-  art_u8 *alpha_buf = render->alpha_buf;
-  art_u8 *image_buf = render->image_buf;
-  int i, j;
-  art_u32 tmp;
-  art_u32 run_alpha;
-  art_u32 alpha;
-  int image_ix;
-  int n_chan = render->n_chan;
-  ArtAlphaType alpha_type = render->alpha_type;
-  int n_ch = n_chan + (alpha_type != ART_ALPHA_NONE);
-  int dst_pixstride = n_ch;
-  ArtAlphaType buf_alpha = render->buf_alpha;
-  int buf_n_ch = n_chan + (buf_alpha != ART_ALPHA_NONE);
-  int buf_pixstride = buf_n_ch;
-  art_u8 *bufptr;
-  art_u32 src_alpha;
-  art_u32 src_mul;
-  art_u8 *dstptr;
-  art_u32 dst_alpha;
-  art_u32 dst_mul, dst_save_mul;
-
-  image_ix = 0;
-  for (i = 0; i < n_run - 1; i++)
-    {
-      run_x0 = run[i].x;
-      run_x1 = run[i + 1].x;
-      tmp = run[i].alpha;
-      if (tmp < 0x10000)
-	continue;
-
-      run_alpha = (tmp + (tmp >> 8) + (tmp >> 16) - 0x8000) >> 8; /* range [0 .. 0x10000] */
-      bufptr = image_buf + (run_x0 - x0) * buf_pixstride;
-      dstptr = dest + (run_x0 - x0) * dst_pixstride;
-      for (x = run_x0; x < run_x1; x++)
-	{
-	  if (alpha_buf)
-	    {
-	      tmp = run_alpha * alpha_buf[x - x0] + 0x80;
-	      /* range 0x80 .. 0xff0080 */
-	      alpha = (tmp + (tmp >> 8) + (tmp >> 16)) >> 8;
-	    }
-	  else
-	    alpha = run_alpha;
-	  /* alpha is run_alpha * alpha_buf[x], range 0 .. 0x10000 */
-
-	  /* convert (src pixel * alpha) to premul alpha form,
-	     store in src as 0..0xffff range */
-	  if (buf_alpha == ART_ALPHA_NONE)
-	    {
-	      src_alpha = alpha;
-	      src_mul = src_alpha;
-	    }
-	  else
-	    {
-	      tmp = alpha * bufptr[n_chan] + 0x80;
-	      /* range 0x80 .. 0xff0080 */
-	      src_alpha = (tmp + (tmp >> 8) + (tmp >> 16)) >> 8;
-
-	      if (buf_alpha == ART_ALPHA_SEPARATE)
-		src_mul = src_alpha;
-	      else /* buf_alpha == (ART_ALPHA_PREMUL) */
-		src_mul = alpha;
-	    }
-	  /* src_alpha is the (alpha of the source pixel * alpha),
-	     range 0..0x10000 */
-
-	  src_mul *= 0x101;
-
-	  if (alpha_type == ART_ALPHA_NONE)
-	    {
-	      dst_alpha = 0x10000;
-	      dst_mul = dst_alpha;
-	    }
-	  else
-	    {
-	      tmp = dstptr[n_chan];
-	      /* range 0..0xff */
-	      dst_alpha = (tmp << 8) + tmp + (tmp >> 7);
-	      if (alpha_type == ART_ALPHA_SEPARATE)
-		dst_mul = dst_alpha;
-	      else /* (alpha_type == ART_ALPHA_PREMUL) */
-		dst_mul = 0x10000;
-	    }
-	  /* dst_alpha is the alpha of the dest pixel,
-	     range 0..0x10000 */
-
-	  dst_mul *= 0x101;
-
-	  if (alpha_type == ART_ALPHA_NONE)
-	    {
-	      dst_save_mul = 0xff;
-	    }
-	  else
-	    {
-	      if (src_alpha >= 0x10000)
-		dst_alpha = 0x10000;
-	      else
-		dst_alpha += ((((0x10000 - dst_alpha) * src_alpha) >> 8) + 0x80) >> 8;
-	      if (alpha_type == ART_ALPHA_PREMUL || dst_alpha == 0)
-		{
-		  dst_save_mul = 0xff;
-		}
-	      else /* (ALPHA_TYPE == ART_ALPHA_SEPARATE && dst_alpha != 0) */
-		{
-		  dst_save_mul = 0xff0000 / dst_alpha;
-		}
-	    }
-	  for (j = 0; j < n_chan; j++)
-	    {
-	      art_u32 src, dst;
-	      art_u32 tmp;
-
-	      src = (bufptr[j] * src_mul + 0x8000) >> 16;
-	      dst = (dstptr[j] * dst_mul + 0x8000) >> 16;
-	      tmp = ((dst * (0x10000 - src_alpha) + 0x8000) >> 16) + src;
-	      tmp -= tmp >> 16;
-	      dstptr[j] = (tmp * dst_save_mul + 0x8000) >> 16;
-	    }
-	  if (alpha_type != ART_ALPHA_NONE)
-	    dstptr[n_chan] = (dst_alpha * 0xff + 0x8000) >> 16;
-
-	  bufptr += buf_pixstride;
-	  dstptr += dst_pixstride;
-	}
-    }
-}
-
-const ArtRenderCallback art_render_composite_8_obj =
-{
-  art_render_composite_8,
-  art_render_nop_done
-};
-
-/* todo: inline */
-static ArtRenderCallback *
-art_render_choose_compositing_callback (ArtRender *render)
-{
-  if (render->depth == 8 && render->buf_depth == 8)
-    return (ArtRenderCallback *)&art_render_composite_8_obj;
-  return (ArtRenderCallback *)&art_render_composite_obj;
-}
-
-/**
- * art_render_invoke_callbacks: Invoke the callbacks in the render object.
- * @render: The render object.
- * @y: The current Y coordinate value.
- *
- * Invokes the callbacks of the render object in the appropriate
- * order.  Drivers should call this routine once per scanline.
- *
- * todo: should management of dest devolve to this routine? very
- * plausibly yes.
- **/
-void
-art_render_invoke_callbacks (ArtRender *render, art_u8 *dest, int y)
-{
-  ArtRenderPriv *priv = (ArtRenderPriv *)render;
-  int i;
-
-  for (i = 0; i < priv->n_callbacks; i++)
-    {
-      ArtRenderCallback *callback;
-
-      callback = priv->callbacks[i];
-      callback->render (callback, render, dest, y);
-    }
-}
-
-/**
- * art_render_invoke: Perform the requested rendering task.
- * @render: The render object.
- *
- * Invokes the renderer and all sources associated with it, to perform
- * the requested rendering task.
- **/
-void
-art_render_invoke (ArtRender *render)
-{
-  ArtRenderPriv *priv = (ArtRenderPriv *)render;
-  int width;
-  int best_driver, best_score;
-  int i;
-  int n_callbacks, n_callbacks_max;
-  ArtImageSource *image_source;
-  ArtImageSourceFlags image_flags;
-  int buf_depth;
-  ArtAlphaType buf_alpha;
-  art_boolean first = ART_TRUE;
-
-  if (render == NULL)
-    {
-      art_warn ("art_render_invoke: called with render == NULL\n");
-      return;
-    }
-  if (priv->image_source == NULL)
-    {
-      art_warn ("art_render_invoke: no image source given\n");
-      return;
-    }
-
-  width = render->x1 - render->x0;
-
-  render->run = art_new (ArtRenderMaskRun, width + 1);
-
-  /* Elect a mask source as driver. */
-  best_driver = -1;
-  best_score = 0;
-  for (i = 0; i < priv->n_mask_source; i++)
-    {
-      int score;
-      ArtMaskSource *mask_source;
-
-      mask_source = priv->mask_source[i];
-      score = mask_source->can_drive (mask_source, render);
-      if (score > best_score)
-	{
-	  best_score = score;
-	  best_driver = i;
-	}
-    }
-
-  /* Allocate alpha buffer if needed. */
-  if (priv->n_mask_source > 1 ||
-      (priv->n_mask_source == 1 && best_driver < 0))
-    {
-      render->alpha_buf = art_new (art_u8, (width * render->depth) >> 3);
-    }
-
-  /* Negotiate image rendering and compositing. */
-  image_source = priv->image_source;
-  image_source->negotiate (image_source, render, &image_flags, &buf_depth,
-			   &buf_alpha);
-
-  /* Build callback list. */
-  n_callbacks_max = priv->n_mask_source + 3;
-  priv->callbacks = art_new (ArtRenderCallback *, n_callbacks_max);
-  n_callbacks = 0;
-  for (i = 0; i < priv->n_mask_source; i++)
-    if (i != best_driver)
-      {
-	ArtMaskSource *mask_source = priv->mask_source[i];
-
-	mask_source->prepare (mask_source, render, first);
-	first = ART_FALSE;
-	priv->callbacks[n_callbacks++] = &mask_source->super;
-      }
-
-  if (render->clear && !(image_flags & ART_IMAGE_SOURCE_CAN_CLEAR))
-    priv->callbacks[n_callbacks++] =
-      art_render_choose_clear_callback (render);
-
-  priv->callbacks[n_callbacks++] = &image_source->super;
-
-  /* Allocate image buffer and add compositing callback if needed. */
-  if (!(image_flags & ART_IMAGE_SOURCE_CAN_COMPOSITE))
-    {
-      int bytespp = ((render->n_chan + (buf_alpha != ART_ALPHA_NONE)) *
-		     buf_depth) >> 3;
-      render->buf_depth = buf_depth;
-      render->buf_alpha = buf_alpha;
-      render->image_buf = art_new (art_u8, width * bytespp);
-      priv->callbacks[n_callbacks++] =
-	art_render_choose_compositing_callback (render);
-    }
-
-  priv->n_callbacks = n_callbacks;
-
-  if (render->need_span)
-    render->span_x = art_new (int, width + 1);
-
-  /* Invoke the driver */
-  if (best_driver >= 0)
-    {
-      ArtMaskSource *driver;
-
-      driver = priv->mask_source[best_driver];
-      driver->invoke_driver (driver, render);
-    }
-  else
-    {
-      art_u8 *dest_ptr = render->pixels;
-      int y;
-
-      /* Dummy driver */
-      render->n_run = 2;
-      render->run[0].x = render->x0;
-      render->run[0].alpha = 0x8000 + 0xff * render->opacity;
-      render->run[1].x = render->x1;
-      render->run[1].alpha = 0x8000;
-      if (render->need_span)
-	{
-	  render->n_span = 2;
-	  render->span_x[0] = render->x0;
-	  render->span_x[1] = render->x1;
-	}
-      for (y = render->y0; y < render->y1; y++)
-	{
-	  art_render_invoke_callbacks (render, dest_ptr, y);
-	  dest_ptr += render->rowstride;
-	}
-    }
-
-  if (priv->mask_source != NULL)
-    art_free (priv->mask_source);
-
-  /* clean up callbacks */
-  for (i = 0; i < priv->n_callbacks; i++)
-    {
-      ArtRenderCallback *callback;
-
-      callback = priv->callbacks[i];
-      callback->done (callback, render);
-    }
-
-  /* Tear down object */
-  if (render->alpha_buf != NULL)
-    art_free (render->alpha_buf);
-  if (render->image_buf != NULL)
-    art_free (render->image_buf);
-  art_free (render->run);
-  if (render->span_x != NULL)
-    art_free (render->span_x);
-  art_free (priv->callbacks);
-  art_free (render);
-}
-
-/**
- * art_render_mask_solid: Add a solid translucent mask.
- * @render: The render object.
- * @opacity: Opacity in [0..0x10000] form.
- *
- * Adds a translucent mask to the rendering object.
- **/
-void
-art_render_mask_solid (ArtRender *render, int opacity)
-{
-  art_u32 old_opacity = render->opacity;
-  art_u32 new_opacity_tmp;
-
-  if (opacity == 0x10000)
-    /* avoid potential overflow */
-    return;
-  new_opacity_tmp = old_opacity * (art_u32)opacity + 0x8000;
-  render->opacity = new_opacity_tmp >> 16;
-}
-
-/**
- * art_render_add_mask_source: Add a mask source to the render object.
- * @render: Render object.
- * @mask_source: Mask source to add.
- *
- * This routine adds a mask source to the render object. In general,
- * client api's for adding mask sources should just take a render object,
- * then the mask source creation function should call this function.
- * Clients should never have to call this function directly, unless of
- * course they're creating custom mask sources.
- **/
-void
-art_render_add_mask_source (ArtRender *render, ArtMaskSource *mask_source)
-{
-  ArtRenderPriv *priv = (ArtRenderPriv *)render;
-  int n_mask_source = priv->n_mask_source++;
-
-  if (n_mask_source == 0)
-    priv->mask_source = art_new (ArtMaskSource *, 1);
-  /* This predicate is true iff n_mask_source is a power of two */
-  else if (!(n_mask_source & (n_mask_source - 1)))
-    priv->mask_source = art_renew (priv->mask_source, ArtMaskSource *,
-				   n_mask_source << 1);
-
-  priv->mask_source[n_mask_source] = mask_source;
-}
-
-/**
- * art_render_add_image_source: Add a mask source to the render object.
- * @render: Render object.
- * @image_source: Image source to add.
- *
- * This routine adds an image source to the render object. In general,
- * client api's for adding image sources should just take a render
- * object, then the mask source creation function should call this
- * function.  Clients should never have to call this function
- * directly, unless of course they're creating custom image sources.
- **/
-void
-art_render_add_image_source (ArtRender *render, ArtImageSource *image_source)
-{
-  ArtRenderPriv *priv = (ArtRenderPriv *)render;
-
-  if (priv->image_source != NULL)
-    {
-      art_warn ("art_render_add_image_source: image source already present.\n");
-      return;
-    }
-  priv->image_source = image_source;
-}
-
-/* Solid image source object and methods. Perhaps this should go into a
-   separate file. */
-
-typedef struct _ArtImageSourceSolid ArtImageSourceSolid;
-
-struct _ArtImageSourceSolid {
-  ArtImageSource super;
-  ArtPixMaxDepth color[ART_MAX_CHAN];
-  art_u32 *rgbtab;
-  art_boolean init;
-};
-
-static void
-art_render_image_solid_done (ArtRenderCallback *self, ArtRender *render)
-{
-  ArtImageSourceSolid *z = (ArtImageSourceSolid *)self;
-
-  if (z->rgbtab != NULL)
-    art_free (z->rgbtab);
-  art_free (self);
-}
-
-static void
-art_render_image_solid_rgb8_opaq_init (ArtImageSourceSolid *self, ArtRender *render)
-{
-  ArtImageSourceSolid *z = (ArtImageSourceSolid *)self;
-  ArtPixMaxDepth color_max;
-  int r_fg, g_fg, b_fg;
-  int r_bg, g_bg, b_bg;
-  int r, g, b;
-  int dr, dg, db;
-  int i;
-  int tmp;
-  art_u32 *rgbtab;
-
-  rgbtab = art_new (art_u32, 256);
-  z->rgbtab = rgbtab;
-
-  color_max = self->color[0];
-  r_fg = ART_PIX_8_FROM_MAX (color_max);
-  color_max = self->color[1];
-  g_fg = ART_PIX_8_FROM_MAX (color_max);
-  color_max = self->color[2];
-  b_fg = ART_PIX_8_FROM_MAX (color_max);
-
-  color_max = render->clear_color[0];
-  r_bg = ART_PIX_8_FROM_MAX (color_max);
-  color_max = render->clear_color[1];
-  g_bg = ART_PIX_8_FROM_MAX (color_max);
-  color_max = render->clear_color[2];
-  b_bg = ART_PIX_8_FROM_MAX (color_max);
-
-  r = (r_bg << 16) + 0x8000;
-  g = (g_bg << 16) + 0x8000;
-  b = (b_bg << 16) + 0x8000;
-  tmp = ((r_fg - r_bg) << 16) + 0x80;
-  dr = (tmp + (tmp >> 8)) >> 8;
-  tmp = ((g_fg - g_bg) << 16) + 0x80;
-  dg = (tmp + (tmp >> 8)) >> 8;
-  tmp = ((b_fg - b_bg) << 16) + 0x80;
-  db = (tmp + (tmp >> 8)) >> 8;
-
-  for (i = 0; i < 256; i++)
-    {
-      rgbtab[i] = (r & 0xff0000) | ((g & 0xff0000) >> 8) | (b >> 16);
-      r += dr;
-      g += dg;
-      b += db;
-    }
-}
-
-static void
-art_render_image_solid_rgb8_opaq (ArtRenderCallback *self, ArtRender *render,
-				  art_u8 *dest, int y)
-{
-  ArtImageSourceSolid *z = (ArtImageSourceSolid *)self;
-  ArtRenderMaskRun *run = render->run;
-  int n_run = render->n_run;
-  art_u32 *rgbtab = z->rgbtab;
-  art_u32 rgb;
-  int x0 = render->x0;
-  int x1 = render->x1;
-  int run_x0, run_x1;
-  int i;
-  int ix;
-
-  if (n_run > 0)
-    {
-      run_x1 = run[0].x;
-      if (run_x1 > x0)
-	{
-	  rgb = rgbtab[0];
-	  art_rgb_fill_run (dest,
-			    rgb >> 16, (rgb >> 8) & 0xff, rgb & 0xff,
-			    run_x1 - x0);
-	}
-      for (i = 0; i < n_run - 1; i++)
-	{
-	  run_x0 = run_x1;
-	  run_x1 = run[i + 1].x;
-	  rgb = rgbtab[(run[i].alpha >> 16) & 0xff];
-	  ix = (run_x0 - x0) * 3;
-#define OPTIMIZE_LEN_1
-#ifdef OPTIMIZE_LEN_1
-	  if (run_x1 - run_x0 == 1)
-	    {
-	      dest[ix] = rgb >> 16;
-	      dest[ix + 1] = (rgb >> 8) & 0xff;
-	      dest[ix + 2] = rgb & 0xff;
-	    }
-	  else
-	    {
-	      art_rgb_fill_run (dest + ix,
-				rgb >> 16, (rgb >> 8) & 0xff, rgb & 0xff,
-				run_x1 - run_x0);
-	    }
-#else
-	  art_rgb_fill_run (dest + ix,
-			    rgb >> 16, (rgb >> 8) & 0xff, rgb & 0xff,
-			    run_x1 - run_x0);
-#endif
-	}
-    }
-  else
-    {
-      run_x1 = x0;
-    }
-  if (run_x1 < x1)
-    {
-      rgb = rgbtab[0];
-      art_rgb_fill_run (dest + (run_x1 - x0) * 3,
-			rgb >> 16, (rgb >> 8) & 0xff, rgb & 0xff,
-			x1 - run_x1);
-    }
-}
-
-static void
-art_render_image_solid_rgb8 (ArtRenderCallback *self, ArtRender *render,
-			     art_u8 *dest, int y)
-{
-  ArtImageSourceSolid *z = (ArtImageSourceSolid *)self;
-  int width = render->x1 - render->x0;
-  art_u8 r, g, b;
-  ArtPixMaxDepth color_max;
-
-  /* todo: replace this simple test with real sparseness */
-  if (z->init)
-    return;
-  z->init = ART_TRUE;
-
-  color_max = z->color[0];
-  r = ART_PIX_8_FROM_MAX (color_max);
-  color_max = z->color[1];
-  g = ART_PIX_8_FROM_MAX (color_max);
-  color_max = z->color[2];
-  b = ART_PIX_8_FROM_MAX (color_max);
-
-  art_rgb_fill_run (render->image_buf, r, g, b, width);
-}
-
-static void
-art_render_image_solid_negotiate (ArtImageSource *self, ArtRender *render,
-				  ArtImageSourceFlags *p_flags,
-				  int *p_buf_depth, ArtAlphaType *p_alpha)
-{
-  ArtImageSourceSolid *z = (ArtImageSourceSolid *)self;
-  ArtImageSourceFlags flags = 0;
-  static void (*render_cbk) (ArtRenderCallback *self, ArtRender *render,
-			     art_u8 *dest, int y);
-
-  render_cbk = NULL;
-
-  if (render->depth == 8 && render->n_chan == 3 &&
-      render->alpha_type == ART_ALPHA_NONE)
-    {
-      if (render->clear)
-	{
-	  render_cbk = art_render_image_solid_rgb8_opaq;
-	  flags |= ART_IMAGE_SOURCE_CAN_CLEAR | ART_IMAGE_SOURCE_CAN_COMPOSITE;
-	  art_render_image_solid_rgb8_opaq_init (z, render);
-	}
-    }
-  if (render_cbk == NULL)
-    {
-      if (render->depth == 8)
-	{
-	  render_cbk = art_render_image_solid_rgb8;
-	  *p_buf_depth = 8;
-	  *p_alpha = ART_ALPHA_NONE; /* todo */
-	}
-    }
-  /* todo: general case */
-  self->super.render = render_cbk;
-  *p_flags = flags;
-}
-
-/**
- * art_render_image_solid: Add a solid color image source.
- * @render: The render object.
- * @color: Color.
- *
- * Adds an image source with the solid color given by @color. The
- * color need not be retained in memory after this call.
- **/
-void
-art_render_image_solid (ArtRender *render, ArtPixMaxDepth *color)
-{
-  ArtImageSourceSolid *image_source;
-  int i;
-
-  image_source = art_new (ArtImageSourceSolid, 1);
-  image_source->super.super.render = NULL;
-  image_source->super.super.done = art_render_image_solid_done;
-  image_source->super.negotiate = art_render_image_solid_negotiate;
-
-  for (i = 0; i < render->n_chan; i++)
-    image_source->color[i] = color[i];
-
-  image_source->rgbtab = NULL;
-  image_source->init = ART_FALSE;
-
-  art_render_add_image_source (render, &image_source->super);
-}
-
-#endif
diff --git a/librsvg/art_render.h b/librsvg/art_render.h
deleted file mode 100644
index 09d7bc3e5..000000000
--- a/librsvg/art_render.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* This file is adapted from art_render.h in Libart version 2.3.0 */
-
-#include <libart_lgpl/libart-features.h>
-
-#if LIBART_MAJOR_VERSION == 2 && LIBART_MINOR_VERSION < 3
-
-/*
- * art_render.h: Modular rendering architecture.
- *
- * Libart_LGPL - library of basic graphic primitives
- * Copyright (C) 2000 Raph Levien
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __ART_RENDER_H__
-#define __ART_RENDER_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Workaround for older versions of Libart that didn't define art_u16 */
-#ifndef ART_SIZEOF_SHORT
-typedef unsigned short art_u16;
-#endif
-
-/* Render object */
-
-#ifndef ART_MAX_DEPTH
-#define ART_MAX_DEPTH 16
-#endif
-
-#if ART_MAX_DEPTH == 16
-typedef art_u16 ArtPixMaxDepth;
-#define ART_PIX_MAX_FROM_8(x) ((x) | ((x) << 8))
-#define ART_PIX_8_FROM_MAX(x) (((x) + 0x80 - (((x) + 0x80) >> 8)) >> 8)
-#else
-#if ART_MAX_DEPTH == 8
-typedef art_u8 ArtPixMaxDepth;
-#define ART_PIX_MAX_FROM_8(x) (x)
-#define ART_PIX_8_FROM_MAX(x) (x)
-#else
-#error ART_MAX_DEPTH must be either 8 or 16
-#endif
-#endif
-
-#define ART_MAX_CHAN 16
-
-typedef struct _ArtRender ArtRender;
-typedef struct _ArtRenderCallback ArtRenderCallback;
-typedef struct _ArtRenderMaskRun ArtRenderMaskRun;
-typedef struct _ArtImageSource ArtImageSource;
-typedef struct _ArtMaskSource ArtMaskSource;
-
-typedef enum {
-  ART_ALPHA_NONE      = 0,
-  ART_ALPHA_SEPARATE  = 1,
-  ART_ALPHA_PREMUL    = 2
-} ArtAlphaType;
-
-typedef enum {
-  ART_COMPOSITE_NORMAL,
-  ART_COMPOSITE_MULTIPLY,
-  /* todo: more */
-  ART_COMPOSITE_CUSTOM
-} ArtCompositingMode;
-
-typedef enum {
-  ART_IMAGE_SOURCE_CAN_CLEAR = 1,
-  ART_IMAGE_SOURCE_CAN_COMPOSITE = 2
-} ArtImageSourceFlags;
-
-struct _ArtRenderMaskRun {
-  int x;
-  int alpha;
-};
-
-struct _ArtRenderCallback {
-  void (*render) (ArtRenderCallback *self, ArtRender *render,
-		  art_u8 *dest, int y);
-  void (*done) (ArtRenderCallback *self, ArtRender *render);
-};
-
-struct _ArtImageSource {
-  ArtRenderCallback super;
-  void (*negotiate) (ArtImageSource *self, ArtRender *render,
-		     ArtImageSourceFlags *p_flags,
-		     int *p_buf_depth, ArtAlphaType *p_alpha_type);
-};
-
-struct _ArtMaskSource {
-  ArtRenderCallback super;
-  int (*can_drive) (ArtMaskSource *self, ArtRender *render);
-  /* For each mask source, ::prepare() is invoked if it is not
-     a driver, or ::invoke_driver() if it is. */
-  void (*invoke_driver) (ArtMaskSource *self, ArtRender *render);
-  void (*prepare) (ArtMaskSource *self, ArtRender *render, art_boolean first);
-};
-
-struct _ArtRender {
-  /* parameters of destination image */
-  int x0, y0;
-  int x1, y1;
-  art_u8 *pixels;
-  int rowstride;
-  int n_chan;
-  int depth;
-  ArtAlphaType alpha_type;
-
-  art_boolean clear;
-  ArtPixMaxDepth clear_color[ART_MAX_CHAN + 1];
-  art_u32 opacity; /* [0..0x10000] */
-
-  ArtCompositingMode compositing_mode;
-
-  ArtAlphaGamma *alphagamma;
-
-  art_u8 *alpha_buf;
-
-  /* parameters of intermediate buffer */
-  int buf_depth;
-  ArtAlphaType buf_alpha;
-  art_u8 *image_buf;
-
-  /* driving alpha scanline data */
-  /* A "run" is a contiguous sequence of x values with the same alpha value. */
-  int n_run;
-  ArtRenderMaskRun *run;
-
-  /* A "span" is a contiguous sequence of x values with non-zero alpha. */
-  int n_span;
-  int *span_x;
-
-  art_boolean need_span;
-};
-
-ArtRender *
-art_render_new (int x0, int y0, int x1, int y1,
-		art_u8 *pixels, int rowstride,
-		int n_chan, int depth, ArtAlphaType alpha_type,
-		ArtAlphaGamma *alphagamma);
-
-void
-art_render_invoke (ArtRender *render);
-
-void
-art_render_clear (ArtRender *render, const ArtPixMaxDepth *clear_color);
-
-void
-art_render_clear_rgb (ArtRender *render, art_u32 clear_rgb);
-
-void
-art_render_mask_solid (ArtRender *render, int opacity);
-
-void
-art_render_image_solid (ArtRender *render, ArtPixMaxDepth *color);
-
-/* The next two functions are for custom mask sources only. */
-void
-art_render_add_mask_source (ArtRender *render, ArtMaskSource *mask_source);
-
-void
-art_render_invoke_callbacks (ArtRender *render, art_u8 *dest, int y);
-
-/* The following function is for custom image sources only. */
-void
-art_render_add_image_source (ArtRender *render, ArtImageSource *image_source);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __ART_RENDER_H__ */
-
-#else
-
-#include <libart_lgpl/art_render.h>
-
-#endif
diff --git a/librsvg/art_render_gradient.c b/librsvg/art_render_gradient.c
deleted file mode 100644
index cc17dceb1..000000000
--- a/librsvg/art_render_gradient.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/* This file is adapted from art_render_gradient.c in Libart version 2.3.0 */
-
-#include <libart_lgpl/libart-features.h>
-
-#if LIBART_MAJOR_VERSION == 2 && LIBART_MINOR_VERSION < 3
-
-/*
- * art_render_gradient.c: Gradient image source for modular rendering.
- *
- * Libart_LGPL - library of basic graphic primitives
- * Copyright (C) 2000 Raph Levien
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Raph Levien <raph@acm.org>
- *          Alexander Larsson <alla@lysator.liu.se>
- */
-
-#include <math.h>
-
-#include <libart_lgpl/art_misc.h>
-#include <libart_lgpl/art_alphagamma.h>
-#include <libart_lgpl/art_filterlevel.h>
-
-#include "art_render.h"
-#include "art_render_gradient.h"
-
-typedef struct _ArtImageSourceGradLin ArtImageSourceGradLin;
-typedef struct _ArtImageSourceGradRad ArtImageSourceGradRad;
-
-struct _ArtImageSourceGradLin {
-  ArtImageSource super;
-  const ArtGradientLinear *gradient;
-};
-
-struct _ArtImageSourceGradRad {
-  ArtImageSource super;
-  const ArtGradientRadial *gradient;
-  double a;
-};
-
-#define EPSILON 1e-6
-
-/**
- * art_render_gradient_setpix: Set a gradient pixel.
- * @render: The render object.
- * @dst: Pointer to destination (where to store pixel).
- * @n_stops: Number of stops in @stops.
- * @stops: The stops for the gradient.
- * @offset: The offset.
- *
- * @n_stops must be > 0.
- *
- * Sets a gradient pixel, storing it at @dst.
- **/
-static void
-art_render_gradient_setpix (ArtRender *render,
-			    art_u8 *dst,
-			    int n_stops, ArtGradientStop *stops,
-			    double offset)
-{
-  int ix;
-  int j;
-  double off0, off1;
-  int n_ch = render->n_chan + 1;
-
-  for (ix = 0; ix < n_stops; ix++)
-    if (stops[ix].offset > offset)
-      break;
-  /* stops[ix - 1].offset < offset < stops[ix].offset */
-  if (ix > 0 && ix < n_stops)
-    {
-      off0 = stops[ix - 1].offset;
-      off1 = stops[ix].offset;
-      if (fabs (off1 - off0) > EPSILON)
-	{
-	  double interp;
-
-	  interp = (offset - off0) / (off1 - off0);
-	  for (j = 0; j < n_ch; j++)
-	    {
-	      int z0, z1;
-	      int z;
-	      z0 = stops[ix - 1].color[j];
-	      z1 = stops[ix].color[j];
-	      z = floor (z0 + (z1 - z0) * interp + 0.5);
-	      if (render->buf_depth == 8)
-		dst[j] = ART_PIX_8_FROM_MAX (z);
-	      else /* (render->buf_depth == 16) */
-		((art_u16 *)dst)[j] = z;
-	    }
-	  return;
-	}
-    }
-  else if (ix == n_stops)
-    ix--;
-
-  for (j = 0; j < n_ch; j++)
-    {
-      int z;
-      z = stops[ix].color[j];
-      if (render->buf_depth == 8)
-	dst[j] = ART_PIX_8_FROM_MAX (z);
-      else /* (render->buf_depth == 16) */
-	((art_u16 *)dst)[j] = z;
-    }
-}
-
-static void
-art_render_gradient_linear_done (ArtRenderCallback *self, ArtRender *render)
-{
-  art_free (self);
-}
-
-static void
-art_render_gradient_linear_render (ArtRenderCallback *self, ArtRender *render,
-				   art_u8 *dest, int y)
-{
-  ArtImageSourceGradLin *z = (ArtImageSourceGradLin *)self;
-  const ArtGradientLinear *gradient = z->gradient;
-  int pixstride = (render->n_chan + 1) * (render->depth >> 3);
-  int x;
-  int width = render->x1 - render->x0;
-  double offset, d_offset;
-  double actual_offset;
-  int n_stops = gradient->n_stops;
-  ArtGradientStop *stops = gradient->stops;
-  art_u8 *bufp = render->image_buf;
-  ArtGradientSpread spread = gradient->spread;
-
-  offset = render->x0 * gradient->a + y * gradient->b + gradient->c;
-  d_offset = gradient->a;
-
-  for (x = 0; x < width; x++)
-    {
-      if (spread == ART_GRADIENT_PAD)
-	actual_offset = offset;
-      else if (spread == ART_GRADIENT_REPEAT)
-	actual_offset = offset - floor (offset);
-      else /* (spread == ART_GRADIENT_REFLECT) */
-	{
-	  double tmp;
-
-	  tmp = offset - 2 * floor (0.5 * offset);
-	  actual_offset = tmp > 1 ? 2 - tmp : tmp;
-	}
-      art_render_gradient_setpix (render, bufp, n_stops, stops, actual_offset);
-      offset += d_offset;
-      bufp += pixstride;
-    }
-}
-
-static void
-art_render_gradient_linear_negotiate (ArtImageSource *self, ArtRender *render,
-				      ArtImageSourceFlags *p_flags,
-				      int *p_buf_depth, ArtAlphaType *p_alpha)
-{
-  self->super.render = art_render_gradient_linear_render;
-  *p_flags = 0;
-  *p_buf_depth = render->depth;
-  *p_alpha = ART_ALPHA_PREMUL;
-}
-
-/**
- * art_render_gradient_linear: Add a linear gradient image source.
- * @render: The render object.
- * @gradient: The linear gradient.
- *
- * Adds the linear gradient @gradient as the image source for rendering
- * in the render object @render.
- **/
-void
-art_render_gradient_linear (ArtRender *render,
-			    const ArtGradientLinear *gradient,
-			    ArtFilterLevel level)
-{
-  ArtImageSourceGradLin *image_source = art_new (ArtImageSourceGradLin, 1);
-
-  image_source->super.super.render = NULL;
-  image_source->super.super.done = art_render_gradient_linear_done;
-  image_source->super.negotiate = art_render_gradient_linear_negotiate;
-
-  image_source->gradient = gradient;
-
-  art_render_add_image_source (render, &image_source->super);
-}
-
-static void
-art_render_gradient_radial_done (ArtRenderCallback *self, ArtRender *render)
-{
-  art_free (self);
-}
-
-static void
-art_render_gradient_radial_render (ArtRenderCallback *self, ArtRender *render,
-				   art_u8 *dest, int y)
-{
-  ArtImageSourceGradRad *z = (ArtImageSourceGradRad *)self;
-  const ArtGradientRadial *gradient = z->gradient;
-  int pixstride = (render->n_chan + 1) * (render->depth >> 3);
-  int x;
-  int x0 = render->x0;
-  int width = render->x1 - x0;
-  int n_stops = gradient->n_stops;
-  ArtGradientStop *stops = gradient->stops;
-  art_u8 *bufp = render->image_buf;
-  double fx = gradient->fx;
-  double fy = gradient->fy;
-  double dx, dy;
-  double *affine = gradient->affine;
-  double aff0 = affine[0];
-  double aff1 = affine[1];
-  const double a = z->a;
-  const double arecip = 1.0 / a;
-  double b, db;
-  double c, dc, ddc;
-  double b_a, db_a;
-  double rad, drad, ddrad;
-
-  dx = x0 * aff0 + y * affine[2] + affine[4] - fx;
-  dy = x0 * aff1 + y * affine[3] + affine[5] - fy;
-  b = dx * fx + dy * fy;
-  db = aff0 * fx + aff1 * fy;
-  c = dx * dx + dy * dy;
-  dc = 2 * aff0 * dx + aff0 * aff0 + 2 * aff1 * dy + aff1 * aff1;
-  ddc = 2 * aff0 * aff0 + 2 * aff1 * aff1;
-
-  b_a = b * arecip;
-  db_a = db * arecip;
-
-  rad = b_a * b_a + c * arecip;
-  drad = 2 * b_a * db_a + db_a * db_a + dc * arecip;
-  ddrad = 2 * db_a * db_a + ddc * arecip;
-
-  for (x = 0; x < width; x++)
-    {
-      double z;
-
-      if (rad > 0)
-	z = b_a + sqrt (rad);
-      else
-	z = b_a;
-      art_render_gradient_setpix (render, bufp, n_stops, stops, z);
-      bufp += pixstride;
-      b_a += db_a;
-      rad += drad;
-      drad += ddrad;
-    }
-}
-
-static void
-art_render_gradient_radial_negotiate (ArtImageSource *self, ArtRender *render,
-				      ArtImageSourceFlags *p_flags,
-				      int *p_buf_depth, ArtAlphaType *p_alpha)
-{
-  self->super.render = art_render_gradient_radial_render;
-  *p_flags = 0;
-  *p_buf_depth = render->depth;
-  *p_alpha = ART_ALPHA_PREMUL;
-}
-
-/**
- * art_render_gradient_radial: Add a radial gradient image source.
- * @render: The render object.
- * @gradient: The radial gradient.
- *
- * Adds the radial gradient @gradient as the image source for rendering
- * in the render object @render.
- **/
-void
-art_render_gradient_radial (ArtRender *render,
-			    const ArtGradientRadial *gradient,
-			    ArtFilterLevel level)
-{
-  ArtImageSourceGradRad *image_source = art_new (ArtImageSourceGradRad, 1);
-  double fx = gradient->fx;
-  double fy = gradient->fy;
-
-  image_source->super.super.render = NULL;
-  image_source->super.super.done = art_render_gradient_radial_done;
-  image_source->super.negotiate = art_render_gradient_radial_negotiate;
-
-  image_source->gradient = gradient;
-  /* todo: sanitycheck fx, fy? */
-  image_source->a = 1 - fx * fx - fy * fy;
-
-  art_render_add_image_source (render, &image_source->super);
-}
-
-#endif
diff --git a/librsvg/art_render_gradient.h b/librsvg/art_render_gradient.h
deleted file mode 100644
index a08b18748..000000000
--- a/librsvg/art_render_gradient.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* This file is adapted from art_render_gradient.h in Libart version 2.3.0 */
-
-#include <libart_lgpl/libart-features.h>
-
-#if LIBART_MAJOR_VERSION == 2 && LIBART_MINOR_VERSION < 3
-
-/*
- * art_render_gradient.h: Gradient image source for modular rendering.
- *
- * Libart_LGPL - library of basic graphic primitives
- * Copyright (C) 2000 Raph Levien
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Raph Levien <raph@acm.org>
- *          Alexander Larsson <alla@lysator.liu.se>
- */
-
-#ifndef __ART_RENDER_GRADIENT_H__
-#define __ART_RENDER_GRADIENT_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef struct _ArtGradientLinear ArtGradientLinear;
-typedef struct _ArtGradientRadial ArtGradientRadial;
-typedef struct _ArtGradientStop ArtGradientStop;
-
-typedef enum {
-  ART_GRADIENT_PAD,
-  ART_GRADIENT_REFLECT,
-  ART_GRADIENT_REPEAT
-} ArtGradientSpread;
-
-struct _ArtGradientLinear {
-  double a;
-  double b;
-  double c;
-  ArtGradientSpread spread;
-  int n_stops;
-  ArtGradientStop *stops;
-};
-
-struct _ArtGradientRadial {
-  double affine[6]; /* transforms user coordinates to unit circle */
-  double fx, fy;    /* focal point in unit circle coords */
-  int n_stops;
-  ArtGradientStop *stops;
-};
-
-struct _ArtGradientStop {
-  double offset;
-  ArtPixMaxDepth color[ART_MAX_CHAN + 1];
-};
-
-void
-art_render_gradient_linear (ArtRender *render,
-			    const ArtGradientLinear *gradient,
-			    ArtFilterLevel level);
-
-void
-art_render_gradient_radial (ArtRender *render,
-			    const ArtGradientRadial *gradient,
-			    ArtFilterLevel level);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __ART_RENDER_GRADIENT_H__ */
-
-#else
-
-#include <libart_lgpl/art_render_gradient.h>
-
-#endif
diff --git a/librsvg/art_render_mask.c b/librsvg/art_render_mask.c
deleted file mode 100644
index 81b28a273..000000000
--- a/librsvg/art_render_mask.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * art_render_mask.c: Alpha mask source for modular rendering.
- *
- * Libart_LGPL - library of basic graphic primitives
- * Copyright (C) 2000 Raph Levien
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Raph Levien <raph@acm.org>
- */
-
-#include <string.h>
-#include <libart_lgpl/art_misc.h>
-#include <libart_lgpl/art_alphagamma.h>
-
-#include "art_render.h"
-#include "art_render_mask.h"
-
-typedef struct _ArtMaskSourceMask ArtMaskSourceMask;
-
-struct _ArtMaskSourceMask {
-  ArtMaskSource super;
-  ArtRender *render;
-  art_boolean first;
-  int x0;
-  int y0;
-  int x1;
-  int y1;
-  const art_u8 *mask_buf;
-  int rowstride;
-};
-
-static void
-art_render_mask_done (ArtRenderCallback *self, ArtRender *render)
-{
-  art_free (self);
-}
-
-static int
-art_render_mask_can_drive (ArtMaskSource *self, ArtRender *render)
-{
-  return 0;
-}
-
-static void
-art_render_mask_render (ArtRenderCallback *self, ArtRender *render,
-			art_u8 *dest, int y)
-{
-  ArtMaskSourceMask *z = (ArtMaskSourceMask *)self;
-  int x0 = render->x0, x1 = render->x1;
-  int z_x0 = z->x0, z_x1 = z->x1;
-  int width = x1 - x0;
-  int z_width = z_x1 - z_x0;
-  art_u8 *alpha_buf = render->alpha_buf;
-
-  if (y < z->y0 || y >= z->y1 || z_width <= 0)
-    memset (alpha_buf, 0, width);
-  else
-    {
-      const art_u8 *src_line = z->mask_buf + (y - z->y0) * z->rowstride;
-      art_u8 *dst_line = alpha_buf + z_x0 - x0;
-
-      if (z_x0 > x0)
-	memset (alpha_buf, 0, z_x0 - x0);
-      
-      if (z->first)
-	memcpy (dst_line, src_line, z_width);
-      else
-	{
-	  int x;
-	  
-	  for (x = 0; x < z_width; x++)
-	    {
-	      int v;
-	      v = src_line[x];
-	      if (v)
-		{
-		  v = v * dst_line[x] + 0x80;
-		  v = (v + (v >> 8)) >> 8;
-		  dst_line[x] = v;
-		}
-	      else
-		{
-		  dst_line[x] = 0;
-		}
-	    }
-	}
-      
-      if (z_x1 < x1)
-	memset (alpha_buf + z_x1 - x0, 0, x1 - z_x1);
-    }
-}
-
-static void
-art_render_mask_prepare (ArtMaskSource *self, ArtRender *render,
-			 art_boolean first)
-{
-  ArtMaskSourceMask *z = (ArtMaskSourceMask *)self;
-  self->super.render = art_render_mask_render;
-  z->first = first;
-}
-
-/**
- * art_render_mask: Use an alpha buffer as a render mask source.
- * @render: Render object.
- * @x0: Left coordinate of mask rect.
- * @y0: Top coordinate of mask rect.
- * @x1: Right coordinate of mask rect.
- * @y1: Bottom coordinate of mask rect.
- * @mask_buf: Buffer containing 8bpp alpha mask data.
- * @rowstride: Rowstride of @mask_buf.
- *
- * Adds @mask_buf to the render object as a mask. Note: @mask_buf must
- * remain allocated until art_render_invoke() is called on @render.
- **/
-void
-art_render_mask (ArtRender *render,
-		 int x0, int y0, int x1, int y1,
-		 const art_u8 *mask_buf, int rowstride)
-{
-  ArtMaskSourceMask *mask_source;
-
-  if (x0 < render->x0)
-    {
-      mask_buf += render->x0 - x0;
-      x0 = render->x0;
-    }
-  if (x1 > render->x1)
-    x1 = render->x1;
-
-  if (y0 < render->y0)
-    {
-      mask_buf += (render->y0 - y0) * rowstride;
-      y0 = render->y0;
-    }
-  if (y1 > render->y1)
-    y1 = render->y1;
-
-  mask_source = art_new (ArtMaskSourceMask, 1);
-
-  mask_source->super.super.render = NULL;
-  mask_source->super.super.done = art_render_mask_done;
-  mask_source->super.can_drive = art_render_mask_can_drive;
-  mask_source->super.invoke_driver = NULL;
-  mask_source->super.prepare = art_render_mask_prepare;
-  mask_source->render = render;
-  mask_source->x0 = x0;
-  mask_source->y0 = y0;
-  mask_source->x1 = x1;
-  mask_source->y1 = y1;
-  mask_source->mask_buf = mask_buf;
-  mask_source->rowstride = rowstride;
-
-  art_render_add_mask_source (render, &mask_source->super);
-
-}
diff --git a/librsvg/art_render_mask.h b/librsvg/art_render_mask.h
deleted file mode 100644
index f7b6bf65b..000000000
--- a/librsvg/art_render_mask.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* This file is adapted from art_render_mask.h in Libart version 2.4.0 */
-
-#include <libart_lgpl/libart-features.h>
-
-#if LIBART_MAJOR_VERSION == 2 && LIBART_MINOR_VERSION < 4
-
-/*
- * art_render_mask.h: Alpha mask source for modular rendering.
- *
- * Libart_LGPL - library of basic graphic primitives
- * Copyright (C) 2000 Raph Levien
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Raph Levien <raph@acm.org>
- */
-
-#ifndef __ART_RENDER_MASK_H__
-#define __ART_RENDER_MASK_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-void
-art_render_mask (ArtRender *render,
-		 int x0, int y0, int x1, int y1,
-		 const art_u8 *mask_buf, int rowstride);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __ART_RENDER_MASK_H__ */
-
-#else
-
-#include <libart_lgpl/art_render_svp.h>
-
-#endif
diff --git a/librsvg/art_render_svp.c b/librsvg/art_render_svp.c
deleted file mode 100644
index 5a16bc4ca..000000000
--- a/librsvg/art_render_svp.c
+++ /dev/null
@@ -1,398 +0,0 @@
-/* This file is adapted from art_render_gradient.c in Libart version 2.3.0 */
-
-#include <libart_lgpl/libart-features.h>
-
-#if LIBART_MAJOR_VERSION == 2 && LIBART_MINOR_VERSION < 3
-
-/*
- * art_render_gradient.c: SVP mask source for modular rendering.
- *
- * Libart_LGPL - library of basic graphic primitives
- * Copyright (C) 2000 Raph Levien
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Raph Levien <raph@acm.org>
- */
-
-/* Use an SVP as a render mask source. */
-
-#include <libart_lgpl/art_misc.h>
-#include <libart_lgpl/art_alphagamma.h>
-#include <libart_lgpl/art_svp.h>
-#include <libart_lgpl/art_svp_render_aa.h>
-
-#include "art_render.h"
-#include "art_render_svp.h"
-
-typedef struct _ArtMaskSourceSVP ArtMaskSourceSVP;
-
-struct _ArtMaskSourceSVP {
-  ArtMaskSource super;
-  ArtRender *render;
-  const ArtSVP *svp;
-  art_u8 *dest_ptr;
-};
-
-static void
-art_render_svp_done (ArtRenderCallback *self, ArtRender *render)
-{
-  art_free (self);
-}
-
-static int
-art_render_svp_can_drive (ArtMaskSource *self, ArtRender *render)
-{
-  return 10;
-}
-
-/* The basic art_render_svp_callback function is repeated four times,
-   for all combinations of non-unit opacity and generating spans. In
-   general, I'd consider this bad style, but in this case I plead
-   a measurable performance improvement. */
-
-static void
-art_render_svp_callback (void *callback_data, int y,
-			 int start, ArtSVPRenderAAStep *steps, int n_steps)
-{
-  ArtMaskSourceSVP *z = (ArtMaskSourceSVP *)callback_data;
-  ArtRender *render = z->render;
-  int n_run = 0;
-  int i;
-  int running_sum = start;
-  int x0 = render->x0;
-  int x1 = render->x1;
-  int run_x0, run_x1;
-  ArtRenderMaskRun *run = render->run;
-
-  if (n_steps > 0)
-    {
-      run_x1 = steps[0].x;
-      if (run_x1 > x0 && running_sum > 0x80ff)
-	{
-	  run[0].x = x0;
-	  run[0].alpha = running_sum;
-	  n_run++;
-	}
-
-      for (i = 0; i < n_steps - 1; i++)
-	{
-          running_sum += steps[i].delta;
-          run_x0 = run_x1;
-          run_x1 = steps[i + 1].x;
-	  if (run_x1 > run_x0)
-	    {
-	      run[n_run].x = run_x0;
-	      run[n_run].alpha = running_sum;
-	      n_run++;
-	    }
-	}
-      if (x1 > run_x1)
-	{
-	  running_sum += steps[n_steps - 1].delta;
-	  run[n_run].x = run_x1;
-	  run[n_run].alpha = running_sum;
-	  n_run++;
-	}
-      if (running_sum > 0x80ff)
-	{
-	  run[n_run].x = x1;
-	  run[n_run].alpha = 0x8000;
-	  n_run++;
-	}
-    }
-
-  render->n_run = n_run;
-
-  art_render_invoke_callbacks (render, z->dest_ptr, y);
-
-  z->dest_ptr += render->rowstride;
-}
-
-static void
-art_render_svp_callback_span (void *callback_data, int y,
-			      int start, ArtSVPRenderAAStep *steps, int n_steps)
-{
-  ArtMaskSourceSVP *z = (ArtMaskSourceSVP *)callback_data;
-  ArtRender *render = z->render;
-  int n_run = 0;
-  int n_span = 0;
-  int i;
-  int running_sum = start;
-  int x0 = render->x0;
-  int x1 = render->x1;
-  int run_x0, run_x1;
-  ArtRenderMaskRun *run = render->run;
-  int *span_x = render->span_x;
-
-  if (n_steps > 0)
-    {
-      run_x1 = steps[0].x;
-      if (run_x1 > x0 && running_sum > 0x80ff)
-	{
-	  run[0].x = x0;
-	  run[0].alpha = running_sum;
-	  n_run++;
-	  span_x[0] = x0;
-	  n_span++;
-	}
-
-      for (i = 0; i < n_steps - 1; i++)
-	{
-          running_sum += steps[i].delta;
-          run_x0 = run_x1;
-          run_x1 = steps[i + 1].x;
-	  if (run_x1 > run_x0)
-	    {
-	      run[n_run].x = run_x0;
-	      run[n_run].alpha = running_sum;
-	      n_run++;
-	      if ((n_span & 1) != (running_sum > 0x80ff))
-		span_x[n_span++] = run_x0;
-	    }
-	}
-      if (x1 > run_x1)
-	{
-	  running_sum += steps[n_steps - 1].delta;
-	  run[n_run].x = run_x1;
-	  run[n_run].alpha = running_sum;
-	  n_run++;
-	  if ((n_span & 1) != (running_sum > 0x80ff))
-	    span_x[n_span++] = run_x1;
-	}
-      if (running_sum > 0x80ff)
-	{
-	  run[n_run].x = x1;
-	  run[n_run].alpha = 0x8000;
-	  n_run++;
-	  span_x[n_span++] = x1;
-	}
-    }
-
-  render->n_run = n_run;
-  render->n_span = n_span;
-
-  art_render_invoke_callbacks (render, z->dest_ptr, y);
-
-  z->dest_ptr += render->rowstride;
-}
-
-static void
-art_render_svp_callback_opacity (void *callback_data, int y,
-				 int start, ArtSVPRenderAAStep *steps, int n_steps)
-{
-  ArtMaskSourceSVP *z = (ArtMaskSourceSVP *)callback_data;
-  ArtRender *render = z->render;
-  int n_run = 0;
-  int i;
-  art_u32 running_sum;
-  int x0 = render->x0;
-  int x1 = render->x1;
-  int run_x0, run_x1;
-  ArtRenderMaskRun *run = render->run;
-  art_u32 opacity = render->opacity;
-  art_u32 alpha;
-
-  running_sum = start - 0x7f80;
-
-  if (n_steps > 0)
-    {
-      run_x1 = steps[0].x;
-      alpha = ((running_sum >> 8) * opacity + 0x80080) >> 8;
-      if (run_x1 > x0 && alpha > 0x80ff)
-	{
-	  run[0].x = x0;
-	  run[0].alpha = alpha;
-	  n_run++;
-	}
-
-      for (i = 0; i < n_steps - 1; i++)
-	{
-          running_sum += steps[i].delta;
-          run_x0 = run_x1;
-          run_x1 = steps[i + 1].x;
-	  if (run_x1 > run_x0)
-	    {
-	      run[n_run].x = run_x0;
-	      alpha = ((running_sum >> 8) * opacity + 0x80080) >> 8;
-	      run[n_run].alpha = alpha;
-	      n_run++;
-	    }
-	}
-      if (x1 > run_x1)
-	{
-	  running_sum += steps[n_steps - 1].delta;
-	  run[n_run].x = run_x1;
-	  alpha = ((running_sum >> 8) * opacity + 0x80080) >> 8;
-	  run[n_run].alpha = alpha;
-	  n_run++;
-	}
-      if (alpha > 0x80ff)
-	{
-	  run[n_run].x = x1;
-	  run[n_run].alpha = 0x8000;
-	  n_run++;
-	}
-    }
-
-  render->n_run = n_run;
-
-  art_render_invoke_callbacks (render, z->dest_ptr, y);
-
-  z->dest_ptr += render->rowstride;
-}
-
-static void
-art_render_svp_callback_opacity_span (void *callback_data, int y,
-				      int start, ArtSVPRenderAAStep *steps, int n_steps)
-{
-  ArtMaskSourceSVP *z = (ArtMaskSourceSVP *)callback_data;
-  ArtRender *render = z->render;
-  int n_run = 0;
-  int n_span = 0;
-  int i;
-  art_u32 running_sum;
-  int x0 = render->x0;
-  int x1 = render->x1;
-  int run_x0, run_x1;
-  ArtRenderMaskRun *run = render->run;
-  int *span_x = render->span_x;
-  art_u32 opacity = render->opacity;
-  art_u32 alpha;
-
-  running_sum = start - 0x7f80;
-
-  if (n_steps > 0)
-    {
-      run_x1 = steps[0].x;
-      alpha = ((running_sum >> 8) * opacity + 0x800080) >> 8;
-      if (run_x1 > x0 && alpha > 0x80ff)
-	{
-	  run[0].x = x0;
-	  run[0].alpha = alpha;
-	  n_run++;
-	  span_x[0] = x0;
-	  n_span++;
-	}
-
-      for (i = 0; i < n_steps - 1; i++)
-	{
-          running_sum += steps[i].delta;
-          run_x0 = run_x1;
-          run_x1 = steps[i + 1].x;
-	  if (run_x1 > run_x0)
-	    {
-	      run[n_run].x = run_x0;
-	      alpha = ((running_sum >> 8) * opacity + 0x800080) >> 8;
-	      run[n_run].alpha = alpha;
-	      n_run++;
-	      if ((n_span & 1) != (alpha > 0x80ff))
-		span_x[n_span++] = run_x0;
-	    }
-	}
-      if (x1 > run_x1)
-	{
-	  running_sum += steps[n_steps - 1].delta;
-	  run[n_run].x = run_x1;
-	  alpha = ((running_sum >> 8) * opacity + 0x800080) >> 8;
-	  run[n_run].alpha = alpha;
-	  n_run++;
-	  if ((n_span & 1) != (alpha > 0x80ff))
-	    span_x[n_span++] = run_x1;
-	}
-      if (alpha > 0x80ff)
-	{
-	  run[n_run].x = x1;
-	  run[n_run].alpha = 0x8000;
-	  n_run++;
-	  span_x[n_span++] = x1;
-	}
-    }
-
-  render->n_run = n_run;
-  render->n_span = n_span;
-
-  art_render_invoke_callbacks (render, z->dest_ptr, y);
-
-  z->dest_ptr += render->rowstride;
-}
-
-static void
-art_render_svp_invoke_driver (ArtMaskSource *self, ArtRender *render)
-{
-  ArtMaskSourceSVP *z = (ArtMaskSourceSVP *)self;
-  void (*callback) (void *callback_data,
-		    int y,
-		    int start,
-		    ArtSVPRenderAAStep *steps, int n_steps);
-
-  z->dest_ptr = render->pixels;
-  if (render->opacity == 0x10000)
-    {
-      if (render->need_span)
-	callback = art_render_svp_callback_span;
-      else
-	callback = art_render_svp_callback;
-    }
-  else
-    {
-      if (render->need_span)
-	callback = art_render_svp_callback_opacity_span;
-      else
-	callback = art_render_svp_callback_opacity;
-    }
-
-  art_svp_render_aa (z->svp,
-		     render->x0, render->y0,
-		     render->x1, render->y1, callback,
-		     self);
-  art_render_svp_done (&self->super, render);
-}
-
-static void
-art_render_svp_prepare (ArtMaskSource *self, ArtRender *render,
-			art_boolean first)
-{
-  /* todo */
-  art_die ("art_render_svp non-driver mode not yet implemented.\n");
-}
-
-/**
- * art_render_svp: Use an SVP as a render mask source.
- * @render: Render object.
- * @svp: SVP.
- *
- * Adds @svp to the render object as a mask. Note: @svp must remain
- * allocated until art_render_invoke() is called on @render.
- **/
-void
-art_render_svp (ArtRender *render, const ArtSVP *svp)
-{
-  ArtMaskSourceSVP *mask_source;
-  mask_source = art_new (ArtMaskSourceSVP, 1);
-
-  mask_source->super.super.render = NULL;
-  mask_source->super.super.done = art_render_svp_done;
-  mask_source->super.can_drive = art_render_svp_can_drive;
-  mask_source->super.invoke_driver = art_render_svp_invoke_driver;
-  mask_source->super.prepare = art_render_svp_prepare;
-  mask_source->render = render;
-  mask_source->svp = svp;
-
-  art_render_add_mask_source (render, &mask_source->super);
-}
-
-#endif
diff --git a/librsvg/art_render_svp.h b/librsvg/art_render_svp.h
deleted file mode 100644
index e8ce7d2fa..000000000
--- a/librsvg/art_render_svp.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* This file is adapted from art_render_svp.h in Libart version 2.3.0 */
-
-#include <libart_lgpl/libart-features.h>
-
-#if LIBART_MAJOR_VERSION == 2 && LIBART_MINOR_VERSION < 3
-
-/*
- * art_render_gradient.h: SVP mask source for modular rendering.
- *
- * Libart_LGPL - library of basic graphic primitives
- * Copyright (C) 2000 Raph Levien
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Raph Levien <raph@acm.org>
- */
-
-#ifndef __ART_RENDER_SVP_H__
-#define __ART_RENDER_SVP_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-void
-art_render_svp (ArtRender *render, const ArtSVP *svp);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __ART_RENDER_SVP_H__ */
-
-#else
-
-#include <libart_lgpl/art_render_svp.h>
-
-#endif
diff --git a/librsvg/art_rgba.c b/librsvg/art_rgba.c
deleted file mode 100644
index e457d1e2b..000000000
--- a/librsvg/art_rgba.c
+++ /dev/null
@@ -1,265 +0,0 @@
-#include <libart_lgpl/libart-features.h>
-
-#if LIBART_MAJOR_VERSION == 2 && LIBART_MINOR_VERSION < 3
-
-/*
- * art_rgba.c: Functions for manipulating RGBA pixel data.
- *
- * Libart_LGPL - library of basic graphic primitives
- * Copyright (C) 2000 Raph Levien
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <libart_lgpl/art_misc.h>
-#include "art_rgba.h"
-
-#define ART_OPTIMIZE_SPACE
-
-#ifndef ART_OPTIMIZE_SPACE
-#include "art_rgba_table.c"
-#endif
-
-/**
- * art_rgba_rgba_composite: Composite RGBA image over RGBA buffer.
- * @dst: Destination RGBA buffer.
- * @src: Source RGBA buffer.
- * @n: Number of RGBA pixels to composite.
- *
- * Composites the RGBA pixels in @dst over the @src buffer.
- **/
-void
-art_rgba_rgba_composite (art_u8 *dst, const art_u8 *src, int n)
-{
-  int i;
-#ifdef WORDS_BIGENDIAN
-  art_u32 src_rgba, dst_rgba;
-#else
-  art_u32 src_abgr, dst_abgr;
-#endif
-  art_u8 src_alpha, dst_alpha;
-
-  for (i = 0; i < n; i++)
-    {
-#ifdef WORDS_BIGENDIAN
-      src_rgba = ((art_u32 *)src)[i];
-      src_alpha = src_rgba & 0xff;
-#else
-      src_abgr = ((art_u32 *)src)[i];
-      src_alpha = (src_abgr >> 24) & 0xff;
-#endif
-      if (src_alpha)
-	{
-	  if (src_alpha == 0xff ||
-	      (
-#ifdef WORDS_BIGENDIAN
-	       dst_rgba = ((art_u32 *)dst)[i],
-	       dst_alpha = dst_rgba & 0xff,
-#else
-	       dst_abgr = ((art_u32 *)dst)[i],
-	       dst_alpha = (dst_abgr >> 24),
-#endif
-	       dst_alpha == 0))
-#ifdef WORDS_BIGENDIAN
-	    ((art_u32 *)dst)[i] = src_rgba;
-#else
-	    ((art_u32 *)dst)[i] = src_abgr;
-#endif
-	  else
-	    {
-	      int r, g, b, a;
-	      int src_r, src_g, src_b;
-	      int dst_r, dst_g, dst_b;
-	      int tmp;
-	      int c;
-
-#ifdef ART_OPTIMIZE_SPACE
-	      tmp = (255 - src_alpha) * (255 - dst_alpha) + 0x80;
-	      a = 255 - ((tmp + (tmp >> 8)) >> 8);
-	      c = ((src_alpha << 16) + (a >> 1)) / a;
-#else
-	      tmp = art_rgba_composite_table[(src_alpha << 8) + dst_alpha];
-	      c = tmp & 0x1ffff;
-	      a = tmp >> 24;
-#endif
-#ifdef WORDS_BIGENDIAN
-	      src_r = (src_rgba >> 24) & 0xff;
-	      src_g = (src_rgba >> 16) & 0xff;
-	      src_b = (src_rgba >> 8) & 0xff;
-	      dst_r = (dst_rgba >> 24) & 0xff;
-	      dst_g = (dst_rgba >> 16) & 0xff;
-	      dst_b = (dst_rgba >> 8) & 0xff;
-#else
-	      src_r = src_abgr & 0xff;
-	      src_g = (src_abgr >> 8) & 0xff;
-	      src_b = (src_abgr >> 16) & 0xff;
-	      dst_r = dst_abgr & 0xff;
-	      dst_g = (dst_abgr >> 8) & 0xff;
-	      dst_b = (dst_abgr >> 16) & 0xff;
-#endif
-	      r = dst_r + (((src_r - dst_r) * c + 0x8000) >> 16);
-	      g = dst_g + (((src_g - dst_g) * c + 0x8000) >> 16);
-	      b = dst_b + (((src_b - dst_b) * c + 0x8000) >> 16);
-#ifdef WORDS_BIGENDIAN
-	    ((art_u32 *)dst)[i] = (r << 24) | (g << 16) | (b << 8) | a;
-#else
-	    ((art_u32 *)dst)[i] = (a << 24) | (b << 16) | (g << 8) | r;
-#endif	      
-	    }
-	}
-#if 0
-      /* it's not clear to me this optimization really wins */
-      else
-	{
-	  /* skip over run of transparent pixels */
-	  for (; i < n - 1; i++)
-	    {
-#ifdef WORDS_BIGENDIAN
-	      src_rgba = ((art_u32 *)src)[i + 1];
-	      if (src_rgba & 0xff)
-		break;
-#else
-	      src_abgr = ((art_u32 *)src)[i + 1];
-	      if (src_abgr & 0xff000000)
-		break;
-#endif
-	    }
-	}
-#endif
-    }
-}
-
-/**
- * art_rgba_fill_run: fill an RGBA buffer a solid RGB color.
- * @buf: Buffer to fill.
- * @r: Red, range 0..255.
- * @g: Green, range 0..255.
- * @b: Blue, range 0..255.
- * @n: Number of RGB triples to fill.
- *
- * Fills a buffer with @n copies of the (@r, @g, @b) triple, solid
- * alpha. Thus, locations @buf (inclusive) through @buf + 4 * @n
- * (exclusive) are written.
- **/
-void
-art_rgba_fill_run (art_u8 *buf, art_u8 r, art_u8 g, art_u8 b, int n)
-{
-  int i;
-#ifdef WORDS_BIGENDIAN
-  art_u32 src_rgba;
-#else
-  art_u32 src_abgr;
-#endif
-
-#ifdef WORDS_BIGENDIAN
-  src_rgba = (r << 24) | (g << 16) | (b << 8) | 255;
-#else
-  src_abgr = (255 << 24) | (b << 16) | (g << 8) | r;
-#endif
-  for (i = 0; i < n; i++)
-    {
-#ifdef WORDS_BIGENDIAN
-      ((art_u32 *)buf)[i] = src_rgba;
-#else
-      ((art_u32 *)buf)[i] = src_abgr;
-#endif
-    }    
-}
-
-/**
- * art_rgba_run_alpha: Render semitransparent color over RGBA buffer.
- * @buf: Buffer for rendering.
- * @r: Red, range 0..255.
- * @g: Green, range 0..255.
- * @b: Blue, range 0..255.
- * @alpha: Alpha, range 0..255.
- * @n: Number of RGB triples to render.
- *
- * Renders a sequential run of solid (@r, @g, @b) color over @buf with
- * opacity @alpha. Note that the range of @alpha is 0..255, in contrast
- * to art_rgb_run_alpha, which has a range of 0..256.
- **/
-void
-art_rgba_run_alpha (art_u8 *buf, art_u8 r, art_u8 g, art_u8 b, int alpha, int n)
-{
-  int i;
-#ifdef WORDS_BIGENDIAN
-  art_u32 src_rgba, dst_rgba;
-#else
-  art_u32 src_abgr, dst_abgr;
-#endif
-  art_u8 dst_alpha;
-  int a;
-  int dst_r, dst_g, dst_b;
-  int tmp;
-  int c;
-
-#ifdef WORDS_BIGENDIAN
-  src_rgba = (r << 24) | (g << 16) | (b << 8) | alpha;
-#else
-  src_abgr = (alpha << 24) | (b << 16) | (g << 8) | r;
-#endif
-  for (i = 0; i < n; i++)
-    {
-#ifdef WORDS_BIGENDIAN
-      dst_rgba = ((art_u32 *)buf)[i];
-      dst_alpha = dst_rgba & 0xff;
-#else
-      dst_abgr = ((art_u32 *)buf)[i];
-      dst_alpha = (dst_abgr >> 24) & 0xff;
-#endif
-      if (dst_alpha)
-	{
-#ifdef ART_OPTIMIZE_SPACE
-	  tmp = (255 - alpha) * (255 - dst_alpha) + 0x80;
-	  a = 255 - ((tmp + (tmp >> 8)) >> 8);
-	  c = ((alpha << 16) + (a >> 1)) / a;
-#else
-	  tmp = art_rgba_composite_table[(alpha << 8) + dst_alpha];
-	  c = tmp & 0x1ffff;
-	  a = tmp >> 24;
-#endif
-#ifdef WORDS_BIGENDIAN
-	  dst_r = (dst_rgba >> 24) & 0xff;
-	  dst_g = (dst_rgba >> 16) & 0xff;
-	  dst_b = (dst_rgba >> 8) & 0xff;
-#else
-	  dst_r = dst_abgr & 0xff;
-	  dst_g = (dst_abgr >> 8) & 0xff;
-	  dst_b = (dst_abgr >> 16) & 0xff;
-#endif
-	  dst_r += (((r - dst_r) * c + 0x8000) >> 16);
-	  dst_g += (((g - dst_g) * c + 0x8000) >> 16);
-	  dst_b += (((b - dst_b) * c + 0x8000) >> 16);
-#ifdef WORDS_BIGENDIAN
-	  ((art_u32 *)buf)[i] = (dst_r << 24) | (dst_g << 16) | (dst_b << 8) | a;
-#else
-	  ((art_u32 *)buf)[i] = (a << 24) | (dst_b << 16) | (dst_g << 8) | dst_r;
-#endif
-	}
-      else
-	{
-#ifdef WORDS_BIGENDIAN
-	  ((art_u32 *)buf)[i] = src_rgba;
-#else
-	  ((art_u32 *)buf)[i] = src_abgr;
-#endif
-	}
-    }
-}
-
-#endif
diff --git a/librsvg/art_rgba.h b/librsvg/art_rgba.h
deleted file mode 100644
index 682d5ae3c..000000000
--- a/librsvg/art_rgba.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * art_rgba.h: Functions for manipulating RGBA pixel data.
- *
- * Libart_LGPL - library of basic graphic primitives
- * Copyright (C) 2000 Raph Levien
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __ART_RGBA_H__
-#define __ART_RGBA_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-void
-art_rgba_rgba_composite (art_u8 *dst, const art_u8 *src, int n);
-
-void
-art_rgba_fill_run (art_u8 *buf, art_u8 r, art_u8 g, art_u8 b, int n);
-
-void
-art_rgba_run_alpha (art_u8 *buf, art_u8 r, art_u8 g, art_u8 b, int alpha, int n);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/librsvg/example-nested-transform.svg b/librsvg/example-nested-transform.svg
deleted file mode 100644
index eae4dd8fb..000000000
--- a/librsvg/example-nested-transform.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN" 
-  "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd">
-<svg width="400" height="150">
-  <!-- Adapted from the example given in section 7.5 of the 3 Mar 2000
-	SVG draft -->
-  <desc>Example Nested - Nested transformations</desc>
-  <g style="fill:none; stroke:black; stroke-width:3">
-    <!-- Draw the axes of the original coordinate system -->
-    <path d="M0 1.5 L400 1.5"/>
-    <path d="M1.5 0 L1.5 150"/>
-  </g>
-  <!-- First, a translate -->
-  <g transform="translate(50,90)">
-    <g style="fill:none; stroke:red; stroke-width:3">
-      <path d="M0 0 L50 0"/>
-      <path d="M0 0 L0 50"/>
-    </g>
-    <text x="0" y="0" style="font-size:16; font-family:Helvetica">
-      ....Translate(1)
-    </text>
-    <!-- Second, a rotate -->
-    <g transform="rotate(-45)">
-      <g style="fill:none; stroke:green; stroke-width:3">
-        <path d="M0 0 L50 0"/>
-        <path d="M0 0 L0 50"/>
-      </g>
-      <text x="0" y="0" style="font-size:16; font-family:Helvetica">
-        ....Rotate(2)
-      </text>
-      <!-- Third, another translate -->
-      <g transform="translate(130,160)">
-        <g style="fill:none; stroke:blue; stroke-width:3">
-          <path d="M0 0 L50 0"/>
-          <path d="M0 0 L0 50"/>
-        </g>
-        <text x="0" y="0" style="font-size:16; font-family:Helvetica">
-          ....Translate(3)
-        </text>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/librsvg/makefile-simple b/librsvg/makefile-simple
deleted file mode 100644
index 731b270b3..000000000
--- a/librsvg/makefile-simple
+++ /dev/null
@@ -1,30 +0,0 @@
-# This is a very simple makefile which may be useful in those rare cases
-# when autoconf is more of a pain in the ass than it's worth.
-
-#FREETYPE_CFLAGS=-I/usr/local/include
-#FREETYPE_LDLIBS=-L/usr/local/lib -lfreetype
-
-FREETYPE_CFLAGS=-I../cut-n-paste-code
-FREETYPE_LDLIBS=-L../cut-n-paste-code/freetype/.libs -lfreetype
-
-CFLAGS=-g -Wall -ansi -Wno-uninitialized -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-sign-compare -Wsign-promo -Werror $(FREETYPE_CFLAGS) `gnome-config --cflags glib libart gdk_pixbuf xml`
-LDLIBS=`gnome-config --libs glib libart gdk_pixbuf xml` -lpopt $(FREETYPE_LDLIBS)
-
-RSVG_OBJS=art_render_gradient.o \
-	art_render_mask.o \
-	art_render_svp.o \
-	rsvg-bpath-util.o \
-	rsvg-css.o \
-	rsvg-defs.o \
-	rsvg-ft.o \
-	rsvg-paint-server.o \
-	rsvg-path.o \
-	rsvg.o
-
-all:	test-rsvg test-ft test-ft-gtk
-
-test-rsvg:	test-rsvg.o $(RSVG_OBJS)
-
-test-ft:	test-ft.o $(RSVG_OBJS)
-
-test-ft-gtk:	test-ft-gtk.o $(RSVG_OBJS)
diff --git a/librsvg/opacity.svg b/librsvg/opacity.svg
deleted file mode 100644
index 97ba754c2..000000000
--- a/librsvg/opacity.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<svg width="600" height="200">
- <!-- adapted from example opacity01 in SVG candidate recommendation 2 Aug 2000 -->
- <path style="fill:#008" d="M50 50 L50 150 550 150 550 50z"/>
- <g transform="translate(100,50)" style="opacity:1">
-   <path style="fill:#f00; opacity:1" d="M-30 0 L-10 20 10 0 -10 -20z"/>
-   <path style="fill:#0f0; opacity:1" d="M-10 0 L10 20 30 0 10 -20z"/>
- </g>
- <g transform="translate(200,50)" style="opacity:0.5">
-   <path style="fill:#f00; opacity:1" d="M-30 0 L-10 20 10 0 -10 -20z"/>
-   <path style="fill:#0f0; opacity:1" d="M-10 0 L10 20 30 0 10 -20z"/>
- </g>
- <g transform="translate(300,50)" style="opacity:1">
-   <path style="fill:#f00; opacity:0.5" d="M-30 0 L-10 20 10 0 -10 -20z"/>
-   <path style="fill:#0f0; opacity:0.5" d="M-10 0 L10 20 30 0 10 -20z"/>
- </g>
- <g transform="translate(400,50)" style="opacity:0.5">
-   <path style="fill:#f00; opacity:0.5" d="M-30 0 L-10 20 10 0 -10 -20z"/>
-   <path style="fill:#0f0; opacity:0.5" d="M-10 0 L10 20 30 0 10 -20z"/>
- </g>
-
- <g transform="translate(100,150)" style="opacity:1; stroke-width:5; stroke:#000">
-   <path style="fill:#f00; opacity:1" d="M-30 0 L-10 20 10 0 -10 -20z"/>
-   <path style="fill:#0f0; opacity:1" d="M-10 0 L10 20 30 0 10 -20z"/>
- </g>
- <g transform="translate(200,150)" style="opacity:0.5; stroke-width:5; stroke:#000">
-   <path style="fill:#f00; opacity:1" d="M-30 0 L-10 20 10 0 -10 -20z"/>
-   <path style="fill:#0f0; opacity:1" d="M-10 0 L10 20 30 0 10 -20z"/>
- </g>
- <g transform="translate(300,150)" style="opacity:1; stroke-width:5; stroke:#000">
-   <path style="fill:#f00; opacity:0.5" d="M-30 0 L-10 20 10 0 -10 -20z"/>
-   <path style="fill:#0f0; opacity:0.5" d="M-10 0 L10 20 30 0 10 -20z"/>
- </g>
- <g transform="translate(400,150)" style="opacity:0.5; stroke-width:5; stroke:#000">
-   <path style="fill:#f00; opacity:0.5" d="M-30 0 L-10 20 10 0 -10 -20z"/>
-   <path style="fill:#0f0; opacity:0.5" d="M-10 0 L10 20 30 0 10 -20z"/>
- </g>
- <g transform="translate(500,150)" style="opacity:1; stroke-width:5; stroke:#000">
-   <path style="fill:#f00; fill-opacity:0.5; stroke-opacity:0.5" d="M-30 0 L-10 20 10 0 -10 -20z"/>
-   <path style="fill:#0f0; fill-opacity:0.5; stroke-opacity:0.5" d="M-10 0 L10 20 30 0 10 -20z"/>
- </g>
-</svg>
\ No newline at end of file
diff --git a/librsvg/rsvg-bpath-util.c b/librsvg/rsvg-bpath-util.c
deleted file mode 100644
index 185959f5b..000000000
--- a/librsvg/rsvg-bpath-util.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/* 
-   rsvg-bpath-util.c: Data structure and convenience functions for creating bezier paths.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Raph Levien <raph@artofcode.com>
-*/
-
-#include <glib.h>
-#include <math.h>
-#include <string.h>
-#include "rsvg-bpath-util.h"
-
-/* This is adapted from gnome-canvas-bpath-util in libgnomeprint
-   (originally developed as part of Gill). */
-
-RsvgBpathDef *
-rsvg_bpath_def_new (void)
-{
-  RsvgBpathDef *bpd;
-
-  bpd = g_new (RsvgBpathDef, 1);
-  bpd->n_bpath = 0;
-  bpd->n_bpath_max = 16;
-  bpd->moveto_idx = -1;
-  bpd->bpath = g_new (ArtBpath, bpd->n_bpath_max);
-  bpd->ref_count = 1;
-
-  return bpd;
-}
-
-RsvgBpathDef *
-rsvg_bpath_def_new_from (ArtBpath *path)
-{
-  RsvgBpathDef *bpd;
-  int i;
-
-  g_return_val_if_fail (path != NULL, NULL);
-
-  for (i = 0; path[i].code != ART_END; i++)
-    ;
-  if (i <= 0)
-    return rsvg_bpath_def_new ();
-
-  bpd = g_new (RsvgBpathDef, 1);
-
-  bpd->n_bpath = i;
-  bpd->n_bpath_max = i;
-  bpd->moveto_idx = -1;
-  bpd->ref_count = 1;
-  bpd->bpath = g_new (ArtBpath, i);
-
-  memcpy (bpd->bpath, path, i * sizeof (ArtBpath));
-  return bpd;
-}
-
-RsvgBpathDef *
-rsvg_bpath_def_ref (RsvgBpathDef *bpd)
-{
-  g_return_val_if_fail (bpd != NULL, NULL);
-
-  bpd->ref_count += 1;
-  return bpd;
-}
-
-void
-rsvg_bpath_def_free (RsvgBpathDef *bpd)
-{
-  g_return_if_fail (bpd != NULL);
-
-  bpd->ref_count -= 1;
-  if (bpd->ref_count == 0)
-    {
-      g_free (bpd->bpath);
-      g_free (bpd);
-    }
-}
-
-void
-rsvg_bpath_def_moveto (RsvgBpathDef *bpd, double x, double y)
-{
-  ArtBpath *bpath;
-  int n_bpath;
-
-  g_return_if_fail (bpd != NULL);
-
-  n_bpath = bpd->n_bpath++;
-
-  if (n_bpath == bpd->n_bpath_max)
-    bpd->bpath = g_realloc (bpd->bpath,
-			    (bpd->n_bpath_max <<= 1) * sizeof (ArtBpath));
-  bpath = bpd->bpath;
-  bpath[n_bpath].code = ART_MOVETO_OPEN;
-  bpath[n_bpath].x3 = x;
-  bpath[n_bpath].y3 = y;
-  bpd->moveto_idx = n_bpath;
-}
-
-void
-rsvg_bpath_def_lineto (RsvgBpathDef *bpd, double x, double y)
-{
-  ArtBpath *bpath;
-  int n_bpath;
-
-  g_return_if_fail (bpd != NULL);
-  g_return_if_fail (bpd->moveto_idx >= 0);
-
-  n_bpath = bpd->n_bpath++;
-
-  if (n_bpath == bpd->n_bpath_max)
-    bpd->bpath = g_realloc (bpd->bpath,
-			    (bpd->n_bpath_max <<= 1) * sizeof (ArtBpath));
-  bpath = bpd->bpath;
-  bpath[n_bpath].code = ART_LINETO;
-  bpath[n_bpath].x3 = x;
-  bpath[n_bpath].y3 = y;
-}
-
-void
-rsvg_bpath_def_curveto (RsvgBpathDef *bpd, double x1, double y1, double x2, double y2, double x3, double y3)
-{
-  ArtBpath *bpath;
-  int n_bpath;
-
-  g_return_if_fail (bpd != NULL);
-  g_return_if_fail (bpd->moveto_idx >= 0);
-
-  n_bpath = bpd->n_bpath++;
-
-  if (n_bpath == bpd->n_bpath_max)
-    bpd->bpath = g_realloc (bpd->bpath,
-			    (bpd->n_bpath_max <<= 1) * sizeof (ArtBpath));
-  bpath = bpd->bpath;
-  bpath[n_bpath].code = ART_CURVETO;
-  bpath[n_bpath].x1 = x1;
-  bpath[n_bpath].y1 = y1;
-  bpath[n_bpath].x2 = x2;
-  bpath[n_bpath].y2 = y2;
-  bpath[n_bpath].x3 = x3;
-  bpath[n_bpath].y3 = y3;
-}
-
-void
-rsvg_bpath_def_closepath (RsvgBpathDef *bpd)
-{
-  ArtBpath *bpath;
-  int n_bpath;
-
-  g_return_if_fail (bpd != NULL);
-  g_return_if_fail (bpd->moveto_idx >= 0);
-  g_return_if_fail (bpd->n_bpath > 0);
-
-  bpath = bpd->bpath;
-  n_bpath = bpd->n_bpath;
-
-  /* Add closing vector if we need it. */
-  if (bpath[n_bpath - 1].x3 != bpath[bpd->moveto_idx].x3 ||
-      bpath[n_bpath - 1].y3 != bpath[bpd->moveto_idx].y3)
-    {
-      rsvg_bpath_def_lineto (bpd, bpath[bpd->moveto_idx].x3,
-			     bpath[bpd->moveto_idx].y3);
-      bpath = bpd->bpath;
-    }
-  bpath[bpd->moveto_idx].code = ART_MOVETO;
-  bpd->moveto_idx = -1;
-}
-
-void
-rsvg_bpath_def_art_finish (RsvgBpathDef *bpd)
-{
-  int n_bpath;
-
-  g_return_if_fail (bpd != NULL);
-
-  n_bpath = bpd->n_bpath++;
-
-  if (n_bpath == bpd->n_bpath_max)
-    bpd->bpath = g_realloc (bpd->bpath,
-			    (bpd->n_bpath_max <<= 1) * sizeof (ArtBpath));
-  bpd->bpath[n_bpath].code = ART_END;
-}
diff --git a/librsvg/rsvg-bpath-util.h b/librsvg/rsvg-bpath-util.h
deleted file mode 100644
index 7b887dbaa..000000000
--- a/librsvg/rsvg-bpath-util.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* 
-   rsvg-bpath-util.h: Data structure and convenience functions for creating bezier paths.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Raph Levien <raph@artofcode.com>
-*/
-
-#ifndef RSVG_BPATH_UTIL_H
-#define RSVG_BPATH_UTIL_H
-
-#include <libart_lgpl/art_bpath.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef struct _RsvgBpathDef RsvgBpathDef;
-
-struct _RsvgBpathDef {
-	int ref_count;
-	ArtBpath *bpath;
-	int n_bpath;
-	int n_bpath_max;
-	int moveto_idx;
-};
-
-
-RsvgBpathDef *rsvg_bpath_def_new (void);
-RsvgBpathDef *rsvg_bpath_def_new_from (ArtBpath *bpath);
-RsvgBpathDef *rsvg_bpath_def_ref (RsvgBpathDef *bpd);
-
-#define rsvg_bpath_def_unref rsvg_bpath_def_free
-void rsvg_bpath_def_free       (RsvgBpathDef *bpd);
-
-void rsvg_bpath_def_moveto     (RsvgBpathDef *bpd,
-					double x, double y);
-void rsvg_bpath_def_lineto     (RsvgBpathDef *bpd,
-					double x, double y);
-void rsvg_bpath_def_curveto    (RsvgBpathDef *bpd,
-					double x1, double y1,
-					double x2, double y2,
-					double x3, double y3);
-void rsvg_bpath_def_closepath  (RsvgBpathDef *bpd);
-
-void rsvg_bpath_def_art_finish (RsvgBpathDef *bpd);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-
diff --git a/librsvg/rsvg-css.c b/librsvg/rsvg-css.c
deleted file mode 100644
index f909bb900..000000000
--- a/librsvg/rsvg-css.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/* 
-   rsvg-css.c: Parse CSS basic data types.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Raph Levien <raph@artofcode.com>
-*/
-
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include <glib.h>
-
-#include "rsvg-css.h"
-
-/**
- * rsvg_css_parse_length: Parse CSS2 length to a pixel value.
- * @str: Original string.
- * @fixed: Where to store boolean value of whether length is fixed.
- *
- * Parses a CSS2 length into a pixel value.
- *
- * Returns: returns the length.
- **/
-double
-rsvg_css_parse_length (const char *str, gint *fixed)
-{
-  char *p;
-  
-  /* 
-   *  The supported CSS length unit specifiers are: 
-   *  em, ex, px, pt, pc, cm, mm, in, and percentages. 
-   */
-  
-  *fixed = FALSE;
-
-  p = strstr (str, "px");
-  if (p != NULL)
-    {
-      *fixed = TRUE;
-      return atof (str);
-    }
-  p = strstr (str, "in");
-  if (p != NULL)
-    {
-      *fixed = TRUE;
-      /* return svg->pixels_per_inch * atof (str); */
-    }
-  p = strstr (str, "%");
-  if (p != NULL)
-    {
-      return 0.01 * atof (str);
-    }
-  return atof (str);
-}
-
-gboolean
-rsvg_css_param_match (const char *str, const char *param_name)
-{
-  int i;
-
-  for (i = 0; str[i] != '\0' && str[i] != ':'; i++)
-    if (param_name[i] != str[i])
-      return FALSE;
-  return str[i] == ':' && param_name[i] == '\0';
-}
-
-int
-rsvg_css_param_arg_offset (const char *str)
-{
-  int i;
-
-  for (i = 0; str[i] != '\0' && str[i] != ':'; i++);
-  if (str[i] != '\0') i++;
-  for (; str[i] == ' '; i++);
-  return i;
-}
-
-/* Parse a CSS2 color, returning rgb */
-guint32
-rsvg_css_parse_color (const char *str)
-{
-  gint val = 0;
-  static GHashTable *colors = NULL;
-
-  /* todo: better failure detection */
-
-  /* 
-   * todo: handle the rgb (r, g, b) and rgb ( r%, g%, b%), syntax 
-   * defined in http://www.w3.org/TR/REC-CSS2/syndata.html#color-units 
-   */
-#ifdef VERBOSE
-  g_print ("color = %s\n", str);
-#endif
-  if (str[0] == '#')
-    {
-      int i;
-      for (i = 1; str[i]; i++)
-	{
-	  int hexval;
-	  if (str[i] >= '0' && str[i] <= '9')
-	    hexval = str[i] - '0';
-	  else if (str[i] >= 'A' && str[i] <= 'F')
-	    hexval = str[i] - 'A' + 10;
-	  else if (str[i] >= 'a' && str[i] <= 'f')
-	    hexval = str[i] - 'a' + 10;
-	  else
-	    break;
-	  val = (val << 4) + hexval;
-	}
-      /* handle #rgb case */
-      if (i == 4)
-	{
-	  val = ((val & 0xf00) << 8) |
-	    ((val & 0x0f0) << 4) |
-	    (val & 0x00f);
-	  val |= val << 4;
-	}
-#ifdef VERBOSE
-      printf ("val = %x\n", val);
-#endif
-    } 
-  else
-    {
-      GString * string;
-      if (!colors)
-	{
-	  colors = g_hash_table_new (g_str_hash, g_str_equal);
-	  
-	  g_hash_table_insert (colors, "black",    GINT_TO_POINTER (0x000000));
-	  g_hash_table_insert (colors, "silver",   GINT_TO_POINTER (0xc0c0c0));
-	  g_hash_table_insert (colors, "gray",     GINT_TO_POINTER (0x808080));
-	  g_hash_table_insert (colors, "white",    GINT_TO_POINTER (0xFFFFFF));
-	  g_hash_table_insert (colors, "maroon",   GINT_TO_POINTER (0x800000));
-	  g_hash_table_insert (colors, "red",      GINT_TO_POINTER (0xFF0000));
-	  g_hash_table_insert (colors, "purple",   GINT_TO_POINTER (0x800080));
-	  g_hash_table_insert (colors, "fuchsia",  GINT_TO_POINTER (0xFF00FF));
-	  g_hash_table_insert (colors, "green",    GINT_TO_POINTER (0x008000));
-	  g_hash_table_insert (colors, "lime",     GINT_TO_POINTER (0x00FF00));
-	  g_hash_table_insert (colors, "olive",    GINT_TO_POINTER (0x808000));
-	  g_hash_table_insert (colors, "yellow",   GINT_TO_POINTER (0xFFFF00));
-	  g_hash_table_insert (colors, "navy",     GINT_TO_POINTER (0x000080));
-	  g_hash_table_insert (colors, "blue",     GINT_TO_POINTER (0x0000FF));
-	  g_hash_table_insert (colors, "teal",     GINT_TO_POINTER (0x008080));
-	  g_hash_table_insert (colors, "aqua",     GINT_TO_POINTER (0x00FFFF));
-	}
-
-      string = g_string_down (g_string_new (str));
-
-      /* this will default to black on a failed lookup */
-      val = GPOINTER_TO_INT (g_hash_table_lookup (colors, string->str)); 
-    }
-
-  return val;
-}
-
-guint
-rsvg_css_parse_opacity (const char *str)
-{
-  char *end_ptr;
-  double opacity;
-
-  opacity = strtod (str, &end_ptr);
-
-  if (end_ptr[0] == '%')
-    opacity *= 0.01;
-
-  return floor (opacity * 255 + 0.5);
-}
-
-double
-rsvg_css_parse_fontsize (const char *str)
-{
-  char *end_ptr;
-  double size;
-
-  /* todo: handle absolute-size and relative-size tags and proper units */
-  size = strtod (str, &end_ptr);
-
-  if (end_ptr[0] == '%')
-    size = (36 * size * 0.01); /* todo: egregious hack */
-
-  return size;
-}
-
diff --git a/librsvg/rsvg-css.h b/librsvg/rsvg-css.h
deleted file mode 100644
index 6a6b645e5..000000000
--- a/librsvg/rsvg-css.h
+++ /dev/null
@@ -1,18 +0,0 @@
-
-double
-rsvg_css_parse_length (const char *str, gint *fixed);
-
-gboolean
-rsvg_css_param_match (const char *str, const char *param_name);
-
-int
-rsvg_css_param_arg_offset (const char *str);
-
-guint32
-rsvg_css_parse_color (const char *str);
-
-guint
-rsvg_css_parse_opacity (const char *str);
-
-double
-rsvg_css_parse_fontsize (const char *str);
diff --git a/librsvg/rsvg-defs.c b/librsvg/rsvg-defs.c
deleted file mode 100644
index 103b7ed5e..000000000
--- a/librsvg/rsvg-defs.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* 
-   rsvg-defs.c: Manage SVG defs and references.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Raph Levien <raph@artofcode.com>
-*/
-
-#include <glib.h>
-#include "rsvg-defs.h"
-
-struct _RsvgDefs {
-  GHashTable *hash;
-};
-
-RsvgDefs *
-rsvg_defs_new (void)
-{
-  RsvgDefs *result = g_new (RsvgDefs, 1);
-
-  result->hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-  return result;
-}
-
-RsvgDefVal *
-rsvg_defs_lookup (const RsvgDefs *defs, const char *name)
-{
-  return (RsvgDefVal *)g_hash_table_lookup (defs->hash, name);
-}
-
-void
-rsvg_defs_set (RsvgDefs *defs, const char *name, RsvgDefVal *val)
-{
-  g_hash_table_insert (defs->hash, g_strdup (name), val);
-}
-
-static void
-rsvg_defs_free_each (gpointer key, gpointer value, gpointer user_data)
-{
-  RsvgDefVal *def_val = (RsvgDefVal *)value;
-  g_free (key);
-  def_val->free (def_val);
-}
-
-void
-rsvg_defs_free (RsvgDefs *defs)
-{
-  g_hash_table_foreach (defs->hash, rsvg_defs_free_each, NULL);
-  g_hash_table_destroy (defs->hash);
-  g_free (defs);
-}
diff --git a/librsvg/rsvg-defs.h b/librsvg/rsvg-defs.h
deleted file mode 100644
index a71aab312..000000000
--- a/librsvg/rsvg-defs.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* A module for handling SVG defs */
-
-typedef struct _RsvgDefs RsvgDefs;
-typedef struct _RsvgDefVal RsvgDefVal;
-
-typedef enum {
-  /* todo: general question: should this be high level, ie a generic
-     paint server, coupled with a paint server interface; or low level,
-     ie specific definable things? For now, we're going low level,
-     but it's not clear that's the best way to go. */
-  RSVG_DEF_LINGRAD,
-  RSVG_DEF_RADGRAD
-} RsvgDefType;
-
-struct _RsvgDefVal {
-  RsvgDefType type;
-  void (*free) (RsvgDefVal *self);
-};
-
-RsvgDefs *
-rsvg_defs_new (void);
-
-RsvgDefVal *
-rsvg_defs_lookup (const RsvgDefs *defs, const char *name);
-
-void
-rsvg_defs_set (RsvgDefs *defs, const char *name, RsvgDefVal *val);
-
-void
-rsvg_defs_free (RsvgDefs *defs);
diff --git a/librsvg/rsvg-ft.c b/librsvg/rsvg-ft.c
deleted file mode 100644
index edcf4c795..000000000
--- a/librsvg/rsvg-ft.c
+++ /dev/null
@@ -1,1107 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   rsvg-ft.c: Basic functions for freetype/libart integration.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Raph Levien <raph@artofcode.com>
-*/
-
-#include <glib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include <freetype/freetype.h>
-
-#include <libart_lgpl/art_misc.h>
-#include <libart_lgpl/art_rect.h>
-#include <libart_lgpl/art_alphagamma.h>
-#include <libart_lgpl/art_affine.h>
-#include "art_render.h"
-#include "art_render_mask.h"
-
-#include "rsvg-ft.h"
-
-#define FT_FLOOR( x )  (   (x)        & -64 )
-#define FT_CEIL( x )   ( ( (x) + 63 ) & -64 )
-#define FT_TRUNC( x )  (   (x) >> 6 )
-#define FT_FROMFLOAT(x) ((int)floor ((x) * 64.0 + 0.5))
-#define FT_TOFLOAT(x) ((x) * (1.0 / 64.0))
-
-typedef struct _RsvgFTFont RsvgFTFont;
-typedef struct _RsvgFTFontCacheEntry RsvgFTFontCacheEntry;
-typedef struct _RsvgFTGlyphDesc RsvgFTGlyphDesc;
-typedef struct _RsvgFTGlyphCacheEntry RsvgFTGlyphCacheEntry;
-
-#define SUBPIXEL_FRACTION 4
-
-struct _RsvgFTCtx {
-	FT_Library ftlib;
-
-	GHashTable *font_hash_table; /* map filename to RsvgFTFontCacheEntry */
-
-	/* Notes on the font list:
-
-	   There is a font list entry for each font that is "intern"ed.
-	   This entry persists for the life of the RsvgFTCtx structure.
-	   These entry correspond one-to-one with font handles, which
-	   begin at 0 and allocate upwards.
-
-	   Each entry in the font list may be either loaded or not, as
-	   indicated by the non-NULL status of the font element of the
-	   RsvgFTFontCacheEntry.
-
-	   The lru list (first and last pointers here, prev and next
-	   pointers in the RsvgFTFontCacheEntry) contains only loaded
-	   fonts. This should be considered an invariant.
-	*/
-
-	int n_font_list;
-	RsvgFTFontCacheEntry **font_list;
-	RsvgFTFontCacheEntry *first, *last;
-
-	int n_loaded_fonts;
-	int n_loaded_fonts_max;
-
-	GHashTable *glyph_hash_table; /* map GlyphDesc to GlyphCacheEntry */
-	int glyph_bytes;
-	int glyph_bytes_max;
-	RsvgFTGlyphCacheEntry *glyph_first, *glyph_last;
-};
-
-struct _RsvgFTFont {
-	/* refcnt is likely to be obsoleted - clients now hold handles
-	   which don't really need refcounting */
-	int refcnt;
-	RsvgFTCtx *ctx;
-	FT_Face face;
-};
-
-struct _RsvgFTFontCacheEntry {
-	RsvgFTFontCacheEntry *prev, *next; /* for lru list */
-	char *fn;
-	char *fn_attached;
-	RsvgFTFont *font;
-	RsvgFTFontHandle handle; /* index in ctx->font_cache */
-};
-
-struct _RsvgFTGlyphDesc {
-	RsvgFTFontHandle fh;
-	FT_F26Dot6 char_width;
-	FT_F26Dot6 char_height;
-	FT_UInt glyph_index;
-	unsigned char x_subpixel;
-	unsigned char y_subpixel;
-};
-
-struct _RsvgFTGlyphCacheEntry {
-	RsvgFTGlyphCacheEntry *prev, *next; /* for lru list */
-	int x0, y0; /* relative to affine */
-	RsvgFTGlyph *glyph;
-	RsvgFTGlyphDesc *desc;
-};
-
-/* Glyph cache fun stuff */
-
-static guint
-rsvg_ft_glyph_desc_hash (gconstpointer v)
-{
-	const RsvgFTGlyphDesc *desc = (const RsvgFTGlyphDesc *)v;
-
-	/* not known to be a good mixing function */
-	return (desc->fh << 16) + desc->char_width +
-		((desc->char_width ^ desc->char_height) << 10) +
-		(desc->x_subpixel << 22) +
-		(desc->y_subpixel << 16) +
-		desc->glyph_index;
-}
-
-static gint
-rsvg_ft_glyph_desc_equal (gconstpointer v, gconstpointer v2)
-{
-	return !memcmp ((const gchar *)v, (const gchar *)v2,
-			sizeof(RsvgFTGlyphDesc));
-}
-
-/**
- * rsvg_ft_glyph_lookup: Look up a glyph in the glyph cache.
- * @ctx: The Rsvg FT context.
- * @desc: Glyph descriptor.
- * @xy: Where to store relative coordinates of glyph.
- *
- * Looks up the glyph in the glyph cache. If found, moves it to the front
- * of the LRU list. It does not bump the refcount on the glyph - most
- * of the time, the caller will want to do that.
- *
- * Return value: The glyph if found, otherwise NULL.
- **/
-static RsvgFTGlyph *
-rsvg_ft_glyph_lookup (RsvgFTCtx *ctx, const RsvgFTGlyphDesc *desc,
-		      int glyph_xy[2])
-{
-	RsvgFTGlyphCacheEntry *entry;
-
-	entry = g_hash_table_lookup (ctx->glyph_hash_table, desc);
-	if (entry == NULL)
-		return NULL;
-
-	/* move entry to front of LRU list */
-	if (entry->prev != NULL) {
-		entry->prev->next = entry->next;
-		if (entry->next != NULL) {
-			entry->next->prev = entry->prev;
-		} else {
-			ctx->glyph_last = entry->prev;
-		}
-		entry->prev = NULL;
-		entry->next = ctx->glyph_first;
-		ctx->glyph_first->prev = entry;
-		ctx->glyph_first = entry;
-
-	}
-	glyph_xy[0] = entry->x0;
-	glyph_xy[1] = entry->y0;
-	return entry->glyph;
-}
-
-/**
- * rsvg_ft_glyph_bytes: Determine the number of bytes in a glyph.
- * @glyph: Glyph.
- *
- * Determines the number of bytes used by @glyph, for the purposes of
- * caching. Note: I'm not counting malloc overhead. Maybe I should.
- *
- * Return value: Number of bytes used by glyph.
- **/
-static int
-rsvg_ft_glyph_bytes (RsvgFTGlyph *glyph)
-{
-	return glyph->rowstride * glyph->height + sizeof (RsvgFTGlyph);
-}
-
-/**
- * rsvg_gt_glyph_evict: Evict lru glyph from glyph cache.
- * @ctx: The RsvgFT context.
- * @amount_to_evict: The amount above the high water mark for the cache
- * that we are.
- *
- * Evicts any glyphs with a reference count of 1 until it is either
- * below the high water mark or out of glyphs.
- **/
-static void
-rsvg_ft_glyph_evict (RsvgFTCtx *ctx, int amount_to_evict)
-{
-	RsvgFTGlyphCacheEntry *victim, *prev;
-	RsvgFTGlyph *glyph;
-	int glyph_bytes, evicted_so_far;
-
-	evicted_so_far = 0;
-	for (victim = ctx->glyph_last; victim != NULL; victim = prev) {
-		prev = victim->prev;
-		glyph = victim->glyph;
-
-		if (glyph->refcnt != 1) {
-			continue;
-		}
-
-		if (victim->prev != NULL) {
-			victim->prev->next = victim->next;
-		} else {
-			ctx->glyph_first = victim->next;
-		}
-		if (victim->next != NULL) {
-			victim->next->prev = victim->prev;
-		} else {
-			ctx->glyph_last = victim->prev;
-		}
-		
-		glyph_bytes = rsvg_ft_glyph_bytes (glyph);
-		ctx->glyph_bytes -= glyph_bytes;
-		rsvg_ft_glyph_unref (glyph);
-		
-		g_hash_table_remove (ctx->glyph_hash_table, victim->desc);
-		g_free (victim->desc);
-		g_free (victim);
-		
-		evicted_so_far += glyph_bytes;
-		if (evicted_so_far >= amount_to_evict) {
-			break;
-		}
-	}
-}
-
-/**
- * rsvg_ft_glyph_insert: Insert a glyph into the glyph cache.
- * @ctx: The RsvgFT context.
- * @desc: Glyph descriptor.
- * @glyph: The glyph itself.
- * @x0: Relative x0 of glyph.
- * @y0: Relative y0 of glyph.
- *
- * Inserts @glyph into the glyph cache under the glyph descriptor @desc.
- * This routine also takes care of evicting glyphs when the cache
- * reaches its high water limit.
- **/
-static void
-rsvg_ft_glyph_insert (RsvgFTCtx *ctx, const RsvgFTGlyphDesc *desc,
-		      RsvgFTGlyph *glyph, int x0, int y0)
-{
-	RsvgFTGlyphDesc *new_desc;
-	RsvgFTGlyphCacheEntry *entry;
-
-	ctx->glyph_bytes += rsvg_ft_glyph_bytes (glyph);
-
-	if (ctx->glyph_bytes + rsvg_ft_glyph_bytes (glyph) >= ctx->glyph_bytes_max) {
-		rsvg_ft_glyph_evict (ctx, ctx->glyph_bytes + rsvg_ft_glyph_bytes (glyph) - ctx->glyph_bytes_max);
-	}
-	
-	new_desc = g_new (RsvgFTGlyphDesc, 1);
-	memcpy (new_desc, desc, sizeof (RsvgFTGlyphDesc));
-	entry = g_new (RsvgFTGlyphCacheEntry, 1);
-	entry->prev = NULL;
-	entry->next = ctx->glyph_first;
-	if (entry->next != NULL) {
-		entry->next->prev = entry;
-	} else {
-		ctx->glyph_last = entry;
-	}
-	ctx->glyph_first = entry;
-	entry->glyph = glyph;
-	entry->desc = new_desc;
-	entry->x0 = x0;
-	entry->y0 = y0;
-	g_hash_table_insert (ctx->glyph_hash_table, new_desc, entry);
-}
-
-RsvgFTCtx *
-rsvg_ft_ctx_new (void) {
-	RsvgFTCtx *result = g_new (RsvgFTCtx, 1);
-	FT_Error error;
-
-	error = FT_Init_FreeType (&result->ftlib);
-	if (error) {
-		g_free (result);
-		result = NULL;
-	}
-	result->font_hash_table = g_hash_table_new (g_str_hash, g_str_equal);
-	result->n_font_list = 0;
-	result->font_list = NULL;
-	result->first = NULL;
-	result->last = NULL;
-	result->n_loaded_fonts = 0;
-	result->n_loaded_fonts_max = 10;
-
-	result->glyph_bytes = 0;
-	result->glyph_bytes_max = 0x100000; /* 1 meg */
-	result->glyph_first = NULL;
-	result->glyph_last = NULL;
-
-	result->glyph_hash_table = g_hash_table_new (rsvg_ft_glyph_desc_hash,
-						     rsvg_ft_glyph_desc_equal);
-
-	return result;
-}
-
-void
-rsvg_ft_ctx_done (RsvgFTCtx *ctx) {
-	int i;
-	RsvgFTGlyphCacheEntry *glyph_ce, *next;
-
-	g_hash_table_destroy (ctx->font_hash_table);
-	for (i = 0; i < ctx->n_font_list; i++) {
-		RsvgFTFontCacheEntry *entry = ctx->font_list[i];
-		RsvgFTFont *font = entry->font;
-		g_free (entry->fn);
-		g_free (entry->fn_attached);
-		if (font != NULL) {
-			FT_Done_Face (font->face);
-			g_free (font);
-		}
-		g_free (entry);
-	}
-	g_free (ctx->font_list);
-
-	/* Free glyph cache. */
-	g_hash_table_destroy (ctx->glyph_hash_table);
-	for (glyph_ce = ctx->glyph_first; glyph_ce != NULL; glyph_ce = next) {
-		g_free (glyph_ce->desc);
-		g_free (glyph_ce->glyph->buf);
-		g_free (glyph_ce->glyph);
-		next = glyph_ce->next;
-		g_free (glyph_ce);
-	}
-
-	FT_Done_FreeType (ctx->ftlib);
-	g_free (ctx);
-}
-
-/**
- * rsvg_ft_load: Load a font.
- * @ctx: Rsvg FT context.
- * @font_file_name: File name.
- *
- * Return value: Newly created RsvgFont structure.
- **/
-static RsvgFTFont *
-rsvg_ft_load (RsvgFTCtx *ctx, const char *font_file_name)
-{
-	FT_Error error;
-	FT_Face face;
-	RsvgFTFont *result;
-
-	error = FT_New_Face (ctx->ftlib, font_file_name,
-			     0, &face);
-	if (error)
-		result = NULL;
-	else {
-		result = g_new (RsvgFTFont, 1);
-		result->refcnt = 1;
-		result->ctx = ctx;
-		result->face = face;
-	}
-	return result;
-}
-
-/**
- * rsvg_ft_intern: Intern a font.
- * @ctx: Rsvg FT context.
- * @font_file_name: File name.
- *
- * This routine checks the font list to see if the font has already been
- * interned. If so, it just returns the existing handle. Otherwise, it
- * adds the font to the font list with the new font handle.
- *
- * Return value: The font handle for the font.
- **/
-RsvgFTFontHandle
-rsvg_ft_intern (RsvgFTCtx *ctx, const char *font_file_name)
-{
-	RsvgFTFontCacheEntry *entry;
-
-	entry = g_hash_table_lookup (ctx->font_hash_table, font_file_name);
-	if (entry == NULL) {
-		/* not found in font list */
-		int n_font_list;
-
-		n_font_list = ctx->n_font_list++;
-		entry = g_new (RsvgFTFontCacheEntry, 1);
-		entry->fn = g_strdup (font_file_name);
-		entry->fn_attached = NULL;
-		entry->handle = n_font_list;
-		entry->font = NULL;
-		entry->prev = NULL;
-		entry->next = NULL;
-		if (n_font_list == 0) {
-			ctx->font_list = g_new (RsvgFTFontCacheEntry *, 1);
-		} else if (!(n_font_list & (n_font_list - 1))) {
-			ctx->font_list = g_renew (RsvgFTFontCacheEntry *,
-						   ctx->font_list,
-						   n_font_list << 1);
-		}
-		ctx->font_list[n_font_list] = entry;
-	}
-
-/* 	fprintf (stderr, "handle = %d\n", entry->handle); */
-	return entry->handle;
-}
-
-/**
- * rsvg_ft_font_attach: Attach an additional font file.
- * @ctx: Rsvg FT context.
- * @fh: Font handle.
- * @font_file_name: The filename of an additional file to attach.
- *
- * Attaches an additional font file to @font. For Type1 fonts, use
- * rsvg_ft_load() to load the .pfb file, then this one to attach
- * the afm.
- **/
-void
-rsvg_ft_font_attach (RsvgFTCtx *ctx, RsvgFTFontHandle fh,
-		     const char *font_file_name)
-{
-	RsvgFTFontCacheEntry *entry;
-	RsvgFTFont *font;
-	FT_Error error;
-
-	if (fh < 0 || fh >= ctx->n_font_list)
-		return;
-	entry = ctx->font_list[fh];
-	if (entry->fn_attached != NULL)
-		return;
-	entry->fn_attached = g_strdup (font_file_name);
-	font = entry->font;
-	if (font != NULL) {
-		error = FT_Attach_File (font->face, font_file_name);
-	}
-}
-
-/**
- * rsvg_ft_font_evict: Evict least recently used font from font cache.
- * @ctx: Rsvg FT context.
- *
- * Removes the least recently used font from the font cache.
- **/
-static void
-rsvg_ft_font_evict (RsvgFTCtx *ctx)
-{
-	RsvgFTFontCacheEntry *victim;
-	RsvgFTFont *font;
-
-#ifdef DEBUG
-	g_print ("rsvg_ft_font_evict: evicting!\n");
-#endif
-
-	victim = ctx->last;
-	if (victim == NULL) {
-		/* We definitely shouldn't get here, but if we do,
-		   print an error message that helps explain why we
-		   did. */
-		if (ctx->n_loaded_fonts > 0) {
-			g_error ("rsvg_ft_font_evict: no font in loaded font list to evict, but ctx->n_loaded_fonts = %d, internal invariant violated",
-				 ctx->n_loaded_fonts);
-		} else {
-			g_error ("rsvg_ft_font_evict: ctx->n_loaded_fonts_max = %d, it must be positive",
-				 ctx->n_loaded_fonts_max);
-		}
-	}
-
-	if (victim->prev == NULL)
-		ctx->first = NULL;
-	else
-		victim->prev->next = NULL;
-	if (victim->next != NULL) {
-		g_warning ("rsvg_ft_font_evict: last font in LRU font list has non-NULL next field, suggesting corruption of data structure");
-	}
-	ctx->last = victim->prev;
-
-	font = victim->font;
-	if (font != NULL) {
-		FT_Done_Face (font->face);
-		g_free (font);
-		victim->font = NULL;
-	}
-
-	ctx->n_loaded_fonts--;
-}
-
-/**
- * rsvg_ft_font_resolve: Resolve a font handle.
- * @ctx: Rsvg FT context.
- * @fh: Font handle.
- *
- * Resolves the font handle @fh to an actual font data structure.
- * This includes loading the font if it hasn't been loaded yet, or if
- * it's been evicted from the cache.
- *
- * Return value: RsvgFTFont structure.
- **/
-static RsvgFTFont *
-rsvg_ft_font_resolve (RsvgFTCtx *ctx, RsvgFTFontHandle fh)
-{
-	RsvgFTFontCacheEntry *entry = NULL;
-	RsvgFTFont *font = NULL;
-
-	if (fh < 0 || fh >= ctx->n_font_list)
-		return NULL;
-	entry = ctx->font_list[fh];
-	if (entry->font == NULL) {
-		while (ctx->n_loaded_fonts >= ctx->n_loaded_fonts_max) {
-			rsvg_ft_font_evict (ctx);
-		}
-		font = rsvg_ft_load (ctx, entry->fn);
-		if (font != NULL) {
-			if (entry->fn_attached != NULL) {
-				FT_Error error;
-
-				error = FT_Attach_File (font->face,
-							entry->fn_attached);
-			}
-			entry->font = font;
-			ctx->n_loaded_fonts++;
-
-			/* insert entry at front of list */
-			entry->next = ctx->first;
-			if (ctx->first != NULL)
-				ctx->first->prev = entry;
-			else
-				ctx->last = entry;
-			ctx->first = entry;
-		}
-	} else {
-		font = entry->font;
-
-		/* move entry to front of LRU list */
-		if (entry->prev != NULL) {
-			entry->prev->next = entry->next;
-			if (entry->next != NULL) {
-				entry->next->prev = entry->prev;
-			} else {
-				ctx->last = entry->prev;
-			}
-			entry->prev = NULL;
-			entry->next = ctx->first;
-			ctx->first->prev = entry;
-			ctx->first = entry;
-		}
-	}
-
-	return font;
-}
-
-/**
- * rsvg_ft_glyph_composite: Composite glyph using saturation.
- * @dst: Destination glyph over which to composite.
- * @src: Source glyph for compositing.
- * @dx: X offset of src glyph relative to dst.
- * @dy: Y offset of src glyph relative to dst.
- *
- * Composites @src over @dst using saturation arithmetic. This results
- * in "perfect" results when glyphs are disjoint (including the case
- * when glyphs abut), but somewhat darker than "perfect" results for
- * geometries involving overlap.
- **/
-static void
-rsvg_ft_glyph_composite (RsvgFTGlyph *dst, const RsvgFTGlyph *src,
-			 int dx, int dy)
-{
-	int x, y;
-	int x0, y0;
-	int x1, y1;
-	int width;
-	guchar *dst_line, *src_line;
-
-	x0 = MAX (0, dx);
-	x1 = MIN (dst->width, dx + src->width);
-	width = x1 - x0;
-	if (width <= 0)
-		return;
-
-	y0 = MAX (0, dy);
-	y1 = MIN (dst->height, dy + src->height);
-	src_line = src->buf + (y0 - dy) * src->rowstride + x0 - dx;
-	dst_line = dst->buf + y0 * dst->rowstride + x0;
-	for (y = y0; y < y1; y++) {
-		for (x = 0; x < width; x++) {
-			int v = src_line[x] + dst_line[x];
-			v |= -(v >> 8); /* fast for v = v > 255 ? 255 : v */
-			dst_line[x] = v;
-		}
-		src_line += src->rowstride;
-		dst_line += dst->rowstride;
-	}
-}
-
-/**
- * rsvg_ft_get_glyph: Get a rendered glyph.
- * @font: The font.
- * @glyph_ix: Glyph index.
- * @sx: Width of em in pixels.
- * @sy: Height of em in pixels.
- * @affine: Affine transformation.
- * @xy: Where to store the top left coordinates.
- *
- * Note: The nominal resolution is 72 dpi. For rendering at other resolutions,
- * scale the @affine by resolution/(72 dpi).
- *
- * Return value: The rendered glyph.
- **/
-static RsvgFTGlyph *
-rsvg_ft_get_glyph (RsvgFTFont *font, FT_UInt glyph_ix, double sx, double sy,
-		   const double affine[6], int xy[2])
-{
-	RsvgFTGlyph *result;
-	FT_Error error;
-	FT_GlyphSlot glyph;
-	FT_Face face = font->face;
-	int x0, y0, x1, y1;
-	int width, height;
-	FT_Matrix matrix;
-	FT_Vector delta;
-	double expansion, scale;
-
-	result = NULL;
-
-	if (glyph_ix == 0)
-		return NULL;
-
-	expansion = art_affine_expansion (affine);
-	scale = 0x10000 / expansion;
-
-	error = FT_Set_Char_Size (face,
-				  FT_FROMFLOAT(sx * expansion),
-				  FT_FROMFLOAT(sy * expansion),
-				  72, 72);
-
-	if (error)
-		return NULL;
-
-	matrix.xx = (int)floor (affine[0] * scale + 0.5);
-	matrix.yx = -(int)floor (affine[1] * scale + 0.5);
-	matrix.xy = -(int)floor (affine[2] * scale + 0.5);
-	matrix.yy = (int)floor (affine[3] * scale + 0.5);
-	delta.x = FT_FROMFLOAT(affine[4]);
-	delta.y = FT_FROMFLOAT(-affine[5]);
-
-	FT_Set_Transform (face, &matrix, &delta);
-
-	/* Tell freetype to never load bitmaps when loading glyphs.  We only
-	 * use the outlines of scalable fonts.  This means our code will work
-	 * even for glyphs that have embedded bitmaps.
-	 */
-	error = FT_Load_Glyph (face, glyph_ix, FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP);
-	if (error)
-		return NULL;
-
-	glyph = face->glyph;
-
-	x0 = FT_TRUNC(FT_FLOOR(glyph->metrics.horiBearingX));
-	x1 = FT_TRUNC(FT_CEIL(glyph->metrics.horiBearingX + glyph->metrics.width));
-	y0 = FT_TRUNC(FT_FLOOR(glyph->metrics.horiBearingY - glyph->metrics.height));
-	y1 = FT_TRUNC(FT_CEIL(glyph->metrics.horiBearingY));
-	width = x1 - x0;
-	height = y1 - y0;
-
-
-	if (glyph->format == ft_glyph_format_outline) {
-		FT_Bitmap *bitmap;
-		guchar *buf;
-		int bufsize;
-
-		error = FT_Render_Glyph (glyph, ft_render_mode_normal);
-		if (error) {
-			return NULL;
-		}
-
-		bitmap = &glyph->bitmap;
-
-		result = g_new (RsvgFTGlyph, 1);
-		result->refcnt = 1;
-		xy[0] = glyph->bitmap_left;
-		xy[1] = -glyph->bitmap_top;
-		result->width = bitmap->width;
-		result->height = bitmap->rows;
-		result->xpen = FT_TOFLOAT (glyph->advance.x);
-		result->ypen = -FT_TOFLOAT (glyph->advance.y);
-		result->rowstride = bitmap->pitch;
-		bufsize = bitmap->pitch * bitmap->rows;
-		buf = g_malloc (bufsize);
-		memcpy (buf, bitmap->buffer, bufsize);
-		result->buf = buf;
-	}
-	return result;
-}
-
-/**
- * rsvg_ft_get_glyph_cached: Get a rendered glyph, trying the cache.
- * @ctx: The RsvgFT context.
- * @fh: Font handle for the font.
- * @cache_ix: Glyph index to use in the cache.
- * @glyph_ix: Glyph index to use in the font.
- * @sx: Width of em in pixels.
- * @sy: Height of em in pixels.
- * @affine: Affine transformation.
- * @xy: Where to store the top left coordinates.
- *
- * Note: The nominal resolution is 72 dpi. For rendering at other resolutions,
- * scale the @affine by resolution/(72 dpi).
- *
- * Return value: The rendered glyph.
- **/
-static RsvgFTGlyph *
-rsvg_ft_get_glyph_cached (RsvgFTCtx *ctx, RsvgFTFontHandle fh,
-			  FT_UInt cache_ix, FT_UInt glyph_ix,
-			  double sx, double sy,
-			  const double affine[6], int xy[2])
-{
-	RsvgFTGlyphDesc desc;
-	RsvgFTFont *font;
-	RsvgFTGlyph *result;
-	int x_sp;
-
-	if (affine[1] != 0 || affine[2] != 0 || affine[0] != affine[3]) {
-		font = rsvg_ft_font_resolve (ctx, fh);
-		return rsvg_ft_get_glyph (font, glyph_ix, sx, sy, affine, xy);
-	}
-	desc.fh = fh;
-	desc.char_width = floor (sx * 64 + 0.5);
-	desc.char_height = floor (sy * 64 + 0.5);
-	desc.glyph_index = cache_ix;
-	x_sp = floor (SUBPIXEL_FRACTION * (affine[4] - floor (affine[4])));
-	desc.x_subpixel = x_sp;
-	desc.y_subpixel = 0;
-#ifdef VERBOSE
-	g_print ("affine[4] = %g, x subpix = %x\n",
-		 affine[4], desc.x_subpixel);
-#endif
-	result = rsvg_ft_glyph_lookup (ctx, &desc, xy);
-	if (result == NULL) {
-		int x0, y0;
-		double my_affine[6];
-
-		memcpy (my_affine, affine, sizeof(my_affine));
-		my_affine[4] = floor (affine[4]) +
-			(1.0 / SUBPIXEL_FRACTION) * x_sp;
-		font = rsvg_ft_font_resolve (ctx, fh);
-		result = rsvg_ft_get_glyph (font, glyph_ix, sx, sy, my_affine, xy);
-		if (result == NULL)
-			return NULL;
-		x0 = xy[0] - floor (affine[4]);
-		y0 = xy[1] - floor (affine[5]);
-		rsvg_ft_glyph_insert (ctx, &desc, result, x0, y0);
-	} else {
-		xy[0] += floor (affine[4]);
-		xy[1] += floor (affine[5]);
-	}
-	result->refcnt++;
-	return result;
-}
-
-/**
- * rsvg_ft_measure_or_render_string: Render a string into a glyph image.
- * @ctx: The Rsvg FT context.
- * @fh: Font handle for the font.
- * @str: String, in ISO-8859-1 encoding.
- * @sx: Width of em in pixels.
- * @sy: Height of em in pixels.
- * @affine: Affine transformation.
- * @xy: Where to store the top left coordinates.
- * &do_render: A boolean value indicating whether we should render the string.
- * &dimensions: Where to store the resulting glyph's dimensions.
- *
- * Return value: A glyph containing the rendered string.
- *
- * This function does the rendering of a string into a glyph.  It can
- * also work in measure only mode, so that no time is spent compositing
- * bitmaps.  This is useful for callers that only want to measure a
- * string.
- * 
- **/
-static RsvgFTGlyph *
-rsvg_ft_measure_or_render_string (RsvgFTCtx *ctx, 
-				  RsvgFTFontHandle fh,
-				  const char *str, 
-				  unsigned int length,
-				  double sx, double sy,
-				  const double affine[6], 
-				  int xy[2],
-				  gboolean do_render,
-				  unsigned int dimensions[2])
-{
-	RsvgFTFont *font;
-	RsvgFTGlyph *result;
-	RsvgFTGlyph **glyphs;
-	int *glyph_xy;
-	guint i;
-	ArtIRect bbox, glyph_bbox;
-	int rowstride;
-	guchar *buf;
-	double glyph_affine[6];
-	FT_UInt glyph_index, cache_index;
-	FT_UInt last_glyph = 0; /* for kerning */
-	guint n_glyphs;
-	double init_x, init_y;
-	int pixel_width, pixel_height, pixel_baseline;
-	int pixel_underline_position, pixel_underline_thickness;
-	int wclength;
-	wchar_t *wcstr;
-
-	g_return_val_if_fail (ctx != NULL, NULL);
-	g_return_val_if_fail (str != NULL, NULL);
-	g_return_val_if_fail (length <= strlen (str), NULL);
-
-	dimensions[0] = 0;
-	dimensions[1] = 0;
-
-	font = rsvg_ft_font_resolve (ctx, fh);
-	if (font == NULL)
-		return NULL;
-
-	/* Set the font to the correct size then generate the
-	 * vertical pixel positioning metrics we need. Use 72dpi
-	 * so that pixels == points
-	 */
-	FT_Set_Char_Size (font->face,
-			  FT_FROMFLOAT(sx),
-			  FT_FROMFLOAT(sy),
-			  72, 72);
-	pixel_height = FT_TRUNC (FT_CEIL (font->face->size->metrics.ascender
-					  - font->face->size->metrics.descender));
-	pixel_baseline = FT_TRUNC (FT_CEIL (font->face->size->metrics.ascender));
-
-	pixel_underline_position = ((font->face->ascender
-				     - font->face->underline_position
-				     - font->face->underline_thickness / 2) * sy
-				     / font->face->units_per_EM);
-
-	pixel_underline_thickness = (font->face->underline_thickness * sy
-				     / font->face->units_per_EM);
-	pixel_underline_thickness = MAX (1, pixel_underline_thickness);
-
-	bbox.x0 = bbox.x1 = 0;
-	bbox.y0 = bbox.y1 = 0;
-
-	glyphs = g_new (RsvgFTGlyph *, length);
-	glyph_xy = g_new (int, length * 2);
-
-	for (i = 0; i < 6; i++)
-		glyph_affine[i] = affine[i];
-
-	init_x = affine[4];
-	init_y = affine[5];
-	n_glyphs = 0;
-
-	/* Alloc max length of wide char */
-	wcstr = g_new0 (wchar_t, length);
-	wclength = mbstowcs (wcstr, str, length);
-
-	/* mbstowcs fallback.  0 means not found any wide chars.
-	 * -1 means an invalid sequence was found.  In either of 
-	 * these two cases we fill in the wide char array with 
-	 * the single byte chars.
-	 */
-	if (wclength > 0) {
-		length = wclength;
-	} else {
-		for (i = 0; i < length; i++) {
-			wcstr[i] = (unsigned char) str[i];
-		}
-	}
-	
-	for (i = 0; i < length; i++) {
-		RsvgFTGlyph *glyph;
-		
-		glyph_index = FT_Get_Char_Index (font->face, wcstr[i]);
-
-		/* FIXME bugzilla.eazel.com 2775: Need a better way to deal
-		 * with unknown characters.
-		 *
-		 * The following is just a band aid fix.
-		 */
-		if (glyph_index == 0) {
-			glyph_index = FT_Get_Char_Index (font->face, '?');
-		}
-
-		if (last_glyph != 0 && glyph_index != 0) {
-			FT_Vector kern;
-			double kx, ky;
-
-			/* note: ft_kerning_unscaled seems to do the
-			   right thing with non-trivial affine transformations.
-			   However, ft_kerning_default may be a better choice
-			   for straight text rendering. This probably needs
-			   a little more thought. */
-			FT_Get_Kerning (font->face, last_glyph, glyph_index,
-					ft_kerning_unscaled,
-					&kern);
-/* 			fprintf (stderr, "kern = (%ld, %ld)\n", kern.x, kern.y); */
-			kx = FT_TOFLOAT (kern.x);
-			ky = FT_TOFLOAT (kern.y);
-			glyph_affine[4] += glyph_affine[0] * kx +
-				glyph_affine[2] * ky;
-			glyph_affine[5] += glyph_affine[1] * kx +
-				glyph_affine[3] * ky;
-		}
-		if (glyph_index != 0) {
-			last_glyph = glyph_index;
-
-			glyph = rsvg_ft_get_glyph_cached (ctx, fh, glyph_index,
-							  glyph_index,
-							  sx, sy, glyph_affine,
-							  glyph_xy + n_glyphs * 2);
-
-			/* Evil hack to handle fonts that don't define glyphs
-			 * for ` ' characters. Ask for `-', zero the pixels, then
-			 * enter it in the cache under the glyph index of ` '
-			 *
-			 * (The reason that this is needed is that at least some
-			 * microsoft TrueType fonts give ` ' an index, but don't
-			 * give it an actual glyph definition. Presumably they
-			 * just use some kind of metric when spacing)
-			 */
-			if (glyph == NULL && wcstr[i] == ' ') {
-				cache_index = glyph_index;
-				glyph_index = FT_Get_Char_Index (font->face, '-');
-				if (glyph_index != 0) {
-					glyph = rsvg_ft_get_glyph_cached (ctx, fh, cache_index,
-									  glyph_index, sx, sy,
-									  glyph_affine,
-									  glyph_xy + n_glyphs * 2);
-					if (glyph != NULL) {
-						memset (glyph->buf, 0, glyph->height * glyph->rowstride);
-					}
-				}
-			}
-
-			if (glyph != NULL) {
-				glyphs[n_glyphs] = glyph;
-
-				glyph_bbox.x0 = glyph_xy[n_glyphs * 2];
-				glyph_bbox.y0 = glyph_xy[n_glyphs * 2 + 1];
-				glyph_bbox.x1 = glyph_bbox.x0 + glyph->width;
-				glyph_bbox.y1 = glyph_bbox.y0 + glyph->height;
-
-				art_irect_union (&bbox, &bbox, &glyph_bbox);
-
-#ifdef VERBOSE
-				g_print ("char '%c' bbox: (%d, %d) - (%d, %d)\n",
-					 str[i],
-					 glyph_bbox.x0, glyph_bbox.y0,
-					 glyph_bbox.x1, glyph_bbox.y1);
-#endif
-
-				glyph_affine[4] += glyph->xpen;
-				glyph_affine[5] += glyph->ypen;
-
-				n_glyphs++;
-			}
-		} else {
-			g_print ("no glyph loaded for character '%c'\n",
-				 str[i]);
-		}
-	}
-
-	xy[0] = bbox.x0;
-	xy[1] = bbox.y0;
-
-	/* Some callers of this function expect to get something with
-	 * non-zero width and height. So force the returned glyph to
-	 * be at least one pixel wide
-	 */
-	pixel_width = MAX (1, bbox.x1 - bbox.x0);
-
-	dimensions[0] = pixel_width;
-	dimensions[1] = pixel_height;
-
-	g_free (wcstr);
-	
-	/* Skip the glyph compositing loop for the case when all we
-	 * are doing is measuring strings.
-	 */
-	if (!do_render) {
-		for (i = 0; i < n_glyphs; i++) {
-			rsvg_ft_glyph_unref (glyphs[i]);
-		}
-		g_free (glyphs);
-		g_free (glyph_xy);
-		return NULL;
-	}
-
-	rowstride = (pixel_width + 3) & -4;
-	buf = g_malloc0 (rowstride * pixel_height);
-
-	result = g_new (RsvgFTGlyph, 1);
-	result->refcnt = 1;
-	result->width = pixel_width;
-	result->height = pixel_height;
-	result->xpen = glyph_affine[4] - init_x;
-	result->ypen = glyph_affine[5] - init_y;
-	result->rowstride = rowstride;
-	result->buf = buf;
-	result->underline_position = pixel_underline_position;
-	result->underline_thickness = pixel_underline_thickness;
-
-	for (i = 0; i < n_glyphs; i++) {
-		rsvg_ft_glyph_composite (result, glyphs[i],
-					 glyph_xy[i * 2] - bbox.x0,
-					 glyph_xy[i * 2 + 1]
-					 + pixel_baseline - glyph_affine[5]);
-		rsvg_ft_glyph_unref (glyphs[i]);
-	}
-
-	g_free (glyphs);
-	g_free (glyph_xy);
-
-	return result;
-}
-
-/**
- * rsvg_ft_render_string: Render a string into a glyph image.
- * @ctx: The Rsvg FT context.
- * @fh: Font handle for the font.
- * @str: String, in ISO-8859-1 encoding.
- * @sx: Width of em in pixels.
- * @sy: Height of em in pixels.
- * @affine: Affine transformation.
- * @xy: Where to store the top left coordinates.
- *
- * Return value: A glyph containing the rendered string.
- **/
-RsvgFTGlyph *
-rsvg_ft_render_string (RsvgFTCtx *ctx, RsvgFTFontHandle fh,
-		       const char *str, 
-		       unsigned int length,
-		       double sx, double sy,
-		       const double affine[6], int xy[2])
-{
-	unsigned int unused[2];
-	return rsvg_ft_measure_or_render_string (ctx, fh, str, length,
-						 sx, sy, affine, xy,
-						 TRUE, unused);
-}
-
-/**
- * rsvg_ft_measure_string: Measure a string.
- * @ctx: The Rsvg FT context.
- * @fh: Font handle for the font.
- * @str: String, in ISO-8859-1 encoding.
- * @sx: Width of em in pixels.
- * @sy: Height of em in pixels.
- * @affine: Affine transformation.
- * @xy: Where to store the top left coordinates.
- * @dimensions: Where to store the string dimensions.
- **/
-void
-rsvg_ft_measure_string (RsvgFTCtx *ctx, RsvgFTFontHandle fh,
-			const char *str, 
-			unsigned int length,
-			double sx, double sy,
-			const double affine[6], 
-			int xy[2],
-			unsigned int dimensions[2])
-{
-	rsvg_ft_measure_or_render_string (ctx, fh, str, length, sx, sy,
-					  affine, xy, FALSE, dimensions);
-}
-
-#if 0
-void
-rsvg_ft_font_ref (RsvgFTFont *font)
-{
-	font->refcnt++;
-}
-
-void
-rsvg_ft_font_unref (RsvgFTFont *font)
-{
-	if (--font->refcnt == 0) {
-		FT_Done_Face (font->face);
-		g_free (font);
-	}
-}
-#endif
-
-void
-rsvg_ft_glyph_unref (RsvgFTGlyph *glyph)
-{
-	if (--glyph->refcnt == 0) {
-		g_free (glyph->buf);
-		g_free (glyph);
-	}
-}
diff --git a/librsvg/rsvg-ft.h b/librsvg/rsvg-ft.h
deleted file mode 100644
index e84ccbf57..000000000
--- a/librsvg/rsvg-ft.h
+++ /dev/null
@@ -1,54 +0,0 @@
-typedef struct _RsvgFTCtx RsvgFTCtx;
-typedef struct _RsvgFTGlyph RsvgFTGlyph;
-
-struct _RsvgFTGlyph {
-	int refcnt;
-	int width, height;
-	int underline_position, underline_thickness;
-	double xpen, ypen; /* relative location of pen after the glyph */
-	int rowstride;
-	guchar *buf;
-};
-
-typedef int RsvgFTFontHandle;
-
-RsvgFTCtx *
-rsvg_ft_ctx_new (void);
-
-void
-rsvg_ft_ctx_done (RsvgFTCtx *ctx);
-
-RsvgFTFontHandle
-rsvg_ft_intern (RsvgFTCtx *ctx, const char *font_file_name);
-
-void
-rsvg_ft_font_attach (RsvgFTCtx *ctx, RsvgFTFontHandle fh,
-		     const char *font_file_name);
-
-#if 0
-void
-rsvg_ft_font_ref (RsvgFTFont *font);
-
-void
-rsvg_ft_font_unref (RsvgFTFont *font);
-#endif
-
-RsvgFTGlyph *
-rsvg_ft_render_string (RsvgFTCtx *ctx, RsvgFTFontHandle fh,
-		       const char *str, 
-		       unsigned int length,
-		       double sx, double sy,
-		       const double affine[6], int xy[2]);
-
-void
-rsvg_ft_measure_string (RsvgFTCtx *ctx,
-			RsvgFTFontHandle fh,
-			const char *str, 
-			unsigned int length,
-			double sx, double sy,
-			const double affine[6], 
-			int xy[2],
-			unsigned int dimensions[2]);
-
-void
-rsvg_ft_glyph_unref (RsvgFTGlyph *glyph);
diff --git a/librsvg/rsvg-paint-server.c b/librsvg/rsvg-paint-server.c
deleted file mode 100644
index 53e34e022..000000000
--- a/librsvg/rsvg-paint-server.c
+++ /dev/null
@@ -1,345 +0,0 @@
-/* 
-   rsvg-paint-server.c: Implement the SVG paint server abstraction.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Raph Levien <raph@artofcode.com>
-*/
-
-#include <string.h>
-#include <ctype.h>
-
-#include <glib.h>
-
-#include <libart_lgpl/art_misc.h>
-#include <libart_lgpl/art_alphagamma.h>
-#include <libart_lgpl/art_filterlevel.h>
-#include <libart_lgpl/art_affine.h>
-#include "art_render.h"
-#include "art_render_gradient.h"
-
-#include "rsvg-css.h"
-#include "rsvg-defs.h"
-#include "rsvg-paint-server.h"
-
-typedef struct _RsvgPaintServerSolid RsvgPaintServerSolid;
-typedef struct _RsvgPaintServerLinGrad RsvgPaintServerLinGrad;
-typedef struct _RsvgPaintServerRadGrad RsvgPaintServerRadGrad;
-
-struct _RsvgPaintServer {
-  int refcnt;
-  void (*free) (RsvgPaintServer *self);
-  void (*render) (RsvgPaintServer *self, ArtRender *ar, const RsvgPSCtx *ctx);
-};
-
-struct _RsvgPaintServerSolid {
-  RsvgPaintServer super;
-  guint32 rgb;
-};
-
-struct _RsvgPaintServerLinGrad {
-  RsvgPaintServer super;
-  RsvgLinearGradient *gradient;
-  ArtGradientLinear *agl;
-};
-
-struct _RsvgPaintServerRadGrad {
-  RsvgPaintServer super;
-  RsvgRadialGradient *gradient;
-  ArtGradientRadial *agr;
-};
-
-static void
-rsvg_paint_server_solid_free (RsvgPaintServer *self)
-{
-  g_free (self);
-}
-
-static void
-rsvg_paint_server_solid_render (RsvgPaintServer *self, ArtRender *ar,
-				const RsvgPSCtx *ctx)
-{
-  RsvgPaintServerSolid *z = (RsvgPaintServerSolid *)self;
-  guint32 rgb = z->rgb;
-  ArtPixMaxDepth color[3];
-
-  color[0] = ART_PIX_MAX_FROM_8 (rgb >> 16);
-  color[1] = ART_PIX_MAX_FROM_8 ((rgb >> 8) & 0xff);
-  color[2] = ART_PIX_MAX_FROM_8 (rgb  & 0xff);
-
-  art_render_image_solid (ar, color);
-}
-
-static RsvgPaintServer *
-rsvg_paint_server_solid (guint32 rgb)
-{
-  RsvgPaintServerSolid *result = g_new (RsvgPaintServerSolid, 1);
-
-  result->super.refcnt = 1;
-  result->super.free = rsvg_paint_server_solid_free;
-  result->super.render = rsvg_paint_server_solid_render;
-
-  result->rgb = rgb;
-
-  return &result->super;
-}
-
-static void
-rsvg_paint_server_lin_grad_free (RsvgPaintServer *self)
-{
-  RsvgPaintServerLinGrad *z = (RsvgPaintServerLinGrad *)self;
-
-  g_free (z->agl->stops);
-  g_free (z->agl);
-  g_free (self);
-}
-
-static ArtGradientStop *
-rsvg_paint_art_stops_from_rsvg (RsvgGradientStops *rstops)
-{
-  ArtGradientStop *stops;
-  int n_stop = rstops->n_stop;
-  int i;
-
-  stops = g_new (ArtGradientStop, n_stop);
-  for (i = 0; i < n_stop; i++)
-    {
-      guint32 rgba;
-      guint32 r, g, b, a;
-
-      stops[i].offset = rstops->stop[i].offset;
-      rgba = rstops->stop[i].rgba;
-      /* convert from separated to premultiplied alpha */
-      a = rgba & 0xff;
-      r = (rgba >> 24) * a + 0x80;
-      r = (r + (r >> 8)) >> 8;
-      g = ((rgba >> 16) & 0xff) * a + 0x80;
-      g = (g + (g >> 8)) >> 8;
-      b = ((rgba >> 8) & 0xff) * a + 0x80;
-      b = (b + (b >> 8)) >> 8;
-      stops[i].color[0] = ART_PIX_MAX_FROM_8(r);
-      stops[i].color[1] = ART_PIX_MAX_FROM_8(g);
-      stops[i].color[2] = ART_PIX_MAX_FROM_8(b);
-      stops[i].color[3] = ART_PIX_MAX_FROM_8(a);
-    }
-  return stops;
-}
-
-static void
-rsvg_paint_server_lin_grad_render (RsvgPaintServer *self, ArtRender *ar,
-				   const RsvgPSCtx *ctx)
-{
-  RsvgPaintServerLinGrad *z = (RsvgPaintServerLinGrad *)self;
-  RsvgLinearGradient *rlg = z->gradient;
-  ArtGradientLinear *agl;
-  double x1, y1, x2, y2;
-  double dx, dy, scale;
-
-  agl = z->agl;
-  if (agl == NULL)
-    {
-      agl = g_new (ArtGradientLinear, 1);
-      agl->n_stops = rlg->stops->n_stop;
-      agl->stops = rsvg_paint_art_stops_from_rsvg (rlg->stops);
-      z->agl = agl;
-    }
-
-  /* compute [xy][12] in pixel space */
-  /* todo: this code implicitly implements gradientUnits = userSpace */
-  x1 = rlg->x1 * rlg->affine[0] + rlg->y1 * rlg->affine[2] + rlg->affine[4];
-  y1 = rlg->x1 * rlg->affine[1] + rlg->y1 * rlg->affine[3] + rlg->affine[5];
-  x2 = rlg->x2 * rlg->affine[0] + rlg->y2 * rlg->affine[2] + rlg->affine[4];
-  y2 = rlg->x2 * rlg->affine[1] + rlg->y2 * rlg->affine[3] + rlg->affine[5];
-
-  /* solve a, b, c so ax1 + by1 + c = 0 and ax2 + by2 + c = 1, maximum
-     gradient is in x1,y1 to x2,y2 dir */
-  dx = x2 - x1;
-  dy = y2 - y1;
-  scale = 1.0 / (dx * dx + dy * dy);
-  agl->a = dx * scale;
-  agl->b = dy * scale;
-  agl->c = -(x1 * agl->a + y1 * agl->b);
-
-  agl->spread = rlg->spread;
-  art_render_gradient_linear (ar, agl, ART_FILTER_NEAREST);
-}
-
-static RsvgPaintServer *
-rsvg_paint_server_lin_grad (RsvgLinearGradient *gradient)
-{
-  RsvgPaintServerLinGrad *result = g_new (RsvgPaintServerLinGrad, 1);
-
-  result->super.refcnt = 1;
-  result->super.free = rsvg_paint_server_lin_grad_free;
-  result->super.render = rsvg_paint_server_lin_grad_render;
-
-  result->gradient = gradient;
-  result->agl = NULL;
-
-  return &result->super;
-}
-
-static void
-rsvg_paint_server_rad_grad_free (RsvgPaintServer *self)
-{
-  RsvgPaintServerRadGrad *z = (RsvgPaintServerRadGrad *)self;
-
-  g_free (z->agr->stops);
-  g_free (z->agr);
-  g_free (self);
-}
-
-static void
-rsvg_paint_server_rad_grad_render (RsvgPaintServer *self, ArtRender *ar,
-				   const RsvgPSCtx *ctx)
-{
-  RsvgPaintServerRadGrad *z = (RsvgPaintServerRadGrad *)self;
-  RsvgRadialGradient *rrg = z->gradient;
-  ArtGradientRadial *agr;
-  double aff1[6], aff2[6];
-
-  agr = z->agr;
-  if (agr == NULL)
-    {
-      agr = g_new (ArtGradientRadial, 1);
-      agr->n_stops = rrg->stops->n_stop;
-      agr->stops = rsvg_paint_art_stops_from_rsvg (rrg->stops);
-      z->agr = agr;
-    }
-
-  /* todo: this code implicitly implements gradientUnits = userSpace */
-  art_affine_scale (aff1, rrg->r, rrg->r);
-  art_affine_translate (aff2, rrg->cx, rrg->cy);
-  art_affine_multiply (aff1, aff1, aff2);
-  art_affine_multiply (aff1, aff1, rrg->affine);
-  art_affine_invert (agr->affine, aff1);
-
-  agr->fx = (rrg->fx - rrg->cx) / rrg->r;
-  agr->fy = (rrg->fy - rrg->cy) / rrg->r;
-
-  art_render_gradient_radial (ar, agr, ART_FILTER_NEAREST);
-}
-
-static RsvgPaintServer *
-rsvg_paint_server_rad_grad (RsvgRadialGradient *gradient)
-{
-  RsvgPaintServerRadGrad *result = g_new (RsvgPaintServerRadGrad, 1);
-
-  result->super.refcnt = 1;
-  result->super.free = rsvg_paint_server_rad_grad_free;
-  result->super.render = rsvg_paint_server_rad_grad_render;
-
-  result->gradient = gradient;
-  result->agr = NULL;
-
-  return &result->super;
-}
-
-/**
- * rsvg_paint_server_parse: Parse an SVG paint specification.
- * @defs: Defs for looking up gradients.
- * @str: The SVG paint specification string to parse.
- *
- * Parses the paint specification @str, creating a new paint server
- * object.
- *
- * Return value: The newly created paint server, or NULL on error.
- **/
-RsvgPaintServer *
-rsvg_paint_server_parse (const RsvgDefs *defs, const char *str)
-{
-  guint32 rgb;
-
-  if (!strcmp (str, "none"))
-    return NULL;
-  if (!strncmp (str, "url(", 4))
-    {
-      const char *p = str + 4;
-      int ix;
-      char *name;
-      RsvgDefVal *val;
-
-      while (isspace (*p)) p++;
-      if (*p != '#')
-	return NULL;
-      p++;
-      for (ix = 0; p[ix]; ix++)
-	if (p[ix] == ')') break;
-      if (p[ix] != ')')
-	return NULL;
-      name = g_strndup (p, ix);
-      val = rsvg_defs_lookup (defs, name);
-      g_free (name);
-      if (val == NULL)
-	return NULL;
-      switch (val->type)
-	{
-	case RSVG_DEF_LINGRAD:
-	  return rsvg_paint_server_lin_grad ((RsvgLinearGradient *)val);
-	case RSVG_DEF_RADGRAD:
-	  return rsvg_paint_server_rad_grad ((RsvgRadialGradient *)val);
-	default:
-	  return NULL;
-	}
-    }
-  else
-    {
-      rgb = rsvg_css_parse_color (str);
-      return rsvg_paint_server_solid (rgb);
-    }
-}
-
-/**
- * rsvg_render_paint_server: Render paint server as image source for libart.
- * @ar: Libart render object.
- * @ps: Paint server object.
- *
- * Hooks up @ps as an image source for a libart rendering operation.
- **/
-void
-rsvg_render_paint_server (ArtRender *ar, RsvgPaintServer *ps,
-			  const RsvgPSCtx *ctx)
-{
-  if (ps != NULL)
-    ps->render (ps, ar, ctx);
-}
-
-/**
- * rsvg_paint_server_ref: Reference a paint server object.
- * @ps: The paint server object to reference.
- **/
-void
-rsvg_paint_server_ref (RsvgPaintServer *ps)
-{
-  if (ps == NULL)
-    return;
-  ps->refcnt++;
-}
-
-/**
- * rsvg_paint_server_unref: Unreference a paint server object.
- * @ps: The paint server object to unreference.
- **/
-void
-rsvg_paint_server_unref (RsvgPaintServer *ps)
-{
-  if (ps == NULL)
-    return;
-  if (--ps->refcnt == 0)
-    ps->free (ps);
-}
diff --git a/librsvg/rsvg-paint-server.h b/librsvg/rsvg-paint-server.h
deleted file mode 100644
index 55e766d48..000000000
--- a/librsvg/rsvg-paint-server.h
+++ /dev/null
@@ -1,66 +0,0 @@
-typedef struct _RsvgGradientStop RsvgGradientStop;
-typedef struct _RsvgGradientStops RsvgGradientStops;
-typedef struct _RsvgLinearGradient RsvgLinearGradient;
-typedef struct _RsvgRadialGradient RsvgRadialGradient;
-
-typedef struct _RsvgPaintServer RsvgPaintServer;
-
-typedef struct _RsvgPSCtx RsvgPSCtx;
-
-struct _RsvgPSCtx {
-/* todo: we need to take in some context information, including:
-
-   1. The global affine transformation.
-
-   2. User coordinates at time of reference (to implement
-   gradientUnits = "userSpaceOnUse").
-
-   3. Object bounding box (to implement gradientUnits =
-   "objectBoundingBox").
-
-   Maybe signal for lazy evaluation of object bbox.
-*/
-};
-
-struct _RsvgGradientStop {
-  double offset;
-  guint32 rgba;
-};
-
-struct _RsvgGradientStops {
-  int n_stop;
-  RsvgGradientStop *stop;
-};
-
-struct _RsvgLinearGradient {
-  RsvgDefVal super;
-  double affine[6]; /* user space to actual at time of gradient def */
-  double x1, y1;
-  double x2, y2;
-  ArtGradientSpread spread;
-  RsvgGradientStops *stops;
-};
-
-struct _RsvgRadialGradient {
-  RsvgDefVal super;
-  double affine[6]; /* user space to actual at time of gradient def */
-  double cx, cy;
-  double r;
-  double fx, fy;
-  RsvgGradientStops *stops;
-};
-
-/* Create a new paint server based on a specification string. */
-RsvgPaintServer *
-rsvg_paint_server_parse (const RsvgDefs *defs, const char *str);
-
-void
-rsvg_render_paint_server (ArtRender *ar, RsvgPaintServer *ps,
-			  const RsvgPSCtx *ctx);
-
-void
-rsvg_paint_server_ref (RsvgPaintServer *ps);
-
-void
-rsvg_paint_server_unref (RsvgPaintServer *ps);
-
diff --git a/librsvg/rsvg-path.c b/librsvg/rsvg-path.c
deleted file mode 100644
index deb8d639b..000000000
--- a/librsvg/rsvg-path.c
+++ /dev/null
@@ -1,609 +0,0 @@
-/* 
-   rsvg-path.c: Parse SVG path element data into bezier path.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Raph Levien <raph@artofcode.com>
-*/
-
-/* This is adapted from svg-path in Gill. */
-
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include <glib.h>
-
-#include "rsvg-bpath-util.h"
-#include "rsvg-path.h"
-
-/* This module parses an SVG path element into an RsvgBpathDef.
-
-   At present, there is no support for <marker> or any other contextual
-   information from the SVG file. The API will need to change rather
-   significantly to support these.
-
-   Reference: SVG working draft 3 March 2000, section 8.
-*/
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif  /*  M_PI  */
-
-typedef struct _RSVGParsePathCtx RSVGParsePathCtx;
-
-struct _RSVGParsePathCtx {
-  RsvgBpathDef *bpath;
-  double cpx, cpy;  /* current point */
-  double rpx, rpy;  /* reflection point (for 's' and 't' commands) */
-  char cmd;         /* current command (lowercase) */
-  int param;        /* parameter number */
-  gboolean rel;     /* true if relative coords */
-  double params[7]; /* parameters that have been parsed */
-};
-
-static void
-rsvg_path_arc_segment (RSVGParsePathCtx *ctx,
-		      double xc, double yc,
-		      double th0, double th1,
-		      double rx, double ry, double x_axis_rotation)
-{
-  double sin_th, cos_th;
-  double a00, a01, a10, a11;
-  double x1, y1, x2, y2, x3, y3;
-  double t;
-  double th_half;
-
-  sin_th = sin (x_axis_rotation * (M_PI / 180.0));
-  cos_th = cos (x_axis_rotation * (M_PI / 180.0)); 
-  /* inverse transform compared with rsvg_path_arc */
-  a00 = cos_th * rx;
-  a01 = -sin_th * ry;
-  a10 = sin_th * rx;
-  a11 = cos_th * ry;
-
-  th_half = 0.5 * (th1 - th0);
-  t = (8.0 / 3.0) * sin (th_half * 0.5) * sin (th_half * 0.5) / sin (th_half);
-  x1 = xc + cos (th0) - t * sin (th0);
-  y1 = yc + sin (th0) + t * cos (th0);
-  x3 = xc + cos (th1);
-  y3 = yc + sin (th1);
-  x2 = x3 + t * sin (th1);
-  y2 = y3 - t * cos (th1);
-  rsvg_bpath_def_curveto (ctx->bpath,
-				  a00 * x1 + a01 * y1, a10 * x1 + a11 * y1,
-				  a00 * x2 + a01 * y2, a10 * x2 + a11 * y2,
-				  a00 * x3 + a01 * y3, a10 * x3 + a11 * y3);
-}
-
-/**
- * rsvg_path_arc: Add an RSVG arc to the path context.
- * @ctx: Path context.
- * @rx: Radius in x direction (before rotation).
- * @ry: Radius in y direction (before rotation).
- * @x_axis_rotation: Rotation angle for axes.
- * @large_arc_flag: 0 for arc length <= 180, 1 for arc >= 180.
- * @sweep: 0 for "negative angle", 1 for "positive angle".
- * @x: New x coordinate.
- * @y: New y coordinate.
- *
- **/
-static void
-rsvg_path_arc (RSVGParsePathCtx *ctx,
-	      double rx, double ry, double x_axis_rotation,
-	      int large_arc_flag, int sweep_flag,
-	      double x, double y)
-{
-  double sin_th, cos_th;
-  double a00, a01, a10, a11;
-  double x0, y0, x1, y1, xc, yc;
-  double d, sfactor, sfactor_sq;
-  double th0, th1, th_arc;
-  int i, n_segs;
-
-  sin_th = sin (x_axis_rotation * (M_PI / 180.0));
-  cos_th = cos (x_axis_rotation * (M_PI / 180.0));
-  a00 = cos_th / rx;
-  a01 = sin_th / rx;
-  a10 = -sin_th / ry;
-  a11 = cos_th / ry;
-  x0 = a00 * ctx->cpx + a01 * ctx->cpy;
-  y0 = a10 * ctx->cpx + a11 * ctx->cpy;
-  x1 = a00 * x + a01 * y;
-  y1 = a10 * x + a11 * y;
-  /* (x0, y0) is current point in transformed coordinate space.
-     (x1, y1) is new point in transformed coordinate space.
-
-     The arc fits a unit-radius circle in this space.
-  */
-  d = (x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0);
-  sfactor_sq = 1.0 / d - 0.25;
-  if (sfactor_sq < 0) sfactor_sq = 0;
-  sfactor = sqrt (sfactor_sq);
-  if (sweep_flag == large_arc_flag) sfactor = -sfactor;
-  xc = 0.5 * (x0 + x1) - sfactor * (y1 - y0);
-  yc = 0.5 * (y0 + y1) + sfactor * (x1 - x0);
-  /* (xc, yc) is center of the circle. */
-
-  th0 = atan2 (y0 - yc, x0 - xc);
-  th1 = atan2 (y1 - yc, x1 - xc);
-
-  th_arc = th1 - th0;
-  if (th_arc < 0 && sweep_flag)
-    th_arc += 2 * M_PI;
-  else if (th_arc > 0 && !sweep_flag)
-    th_arc -= 2 * M_PI;
-
-  n_segs = ceil (fabs (th_arc / (M_PI * 0.5 + 0.001)));
-
-  for (i = 0; i < n_segs; i++)
-    rsvg_path_arc_segment (ctx, xc, yc,
-			  th0 + i * th_arc / n_segs,
-			  th0 + (i + 1) * th_arc / n_segs,
-			  rx, ry, x_axis_rotation);
-
-  ctx->cpx = x;
-  ctx->cpy = y;
-}
-
-
-/* supply defaults for missing parameters, assuming relative coordinates
-   are to be interpreted as x,y */
-static void
-rsvg_parse_path_default_xy (RSVGParsePathCtx *ctx, int n_params)
-{
-  int i;
-
-  if (ctx->rel)
-    {
-      for (i = ctx->param; i < n_params; i++)
-	{
-	  if (i > 2)
-	    ctx->params[i] = ctx->params[i - 2];
-	  else if (i == 1)
-	    ctx->params[i] = ctx->cpy;
-	  else if (i == 0)
-	    /* we shouldn't get here (usually ctx->param > 0 as
-               precondition) */
-	    ctx->params[i] = ctx->cpx;
-	}
-    }
-  else
-    {
-      for (i = ctx->param; i < n_params; i++)
-	ctx->params[i] = 0.0;
-    }
-}
-
-static void
-rsvg_parse_path_do_cmd (RSVGParsePathCtx *ctx, gboolean final)
-{
-  double x1, y1, x2, y2, x3, y3;
-
-#ifdef VERBOSE
-  int i;
-
-  g_print ("parse_path %c:", ctx->cmd);
-  for (i = 0; i < ctx->param; i++)
-    g_print (" %f", ctx->params[i]);
-  g_print (final ? ".\n" : "\n");
-#endif
-
-  switch (ctx->cmd)
-    {
-    case 'm':
-      /* moveto */
-      if (ctx->param == 2 || final)
-	{
-	  rsvg_parse_path_default_xy (ctx, 2);
-#ifdef VERBOSE
-	  g_print ("'m' moveto %g,%g\n",
-		   ctx->params[0], ctx->params[1]);
-#endif
-	  rsvg_bpath_def_moveto (ctx->bpath,
-					 ctx->params[0], ctx->params[1]);
-	  ctx->cpx = ctx->rpx = ctx->params[0];
-	  ctx->cpy = ctx->rpy = ctx->params[1];
-	  ctx->param = 0;
-	}
-      break;
-    case 'l':
-      /* lineto */
-      if (ctx->param == 2 || final)
-	{
-	  rsvg_parse_path_default_xy (ctx, 2);
-#ifdef VERBOSE
-	  g_print ("'l' lineto %g,%g\n",
-		   ctx->params[0], ctx->params[1]);
-#endif
-	  rsvg_bpath_def_lineto (ctx->bpath,
-					 ctx->params[0], ctx->params[1]);
-	  ctx->cpx = ctx->rpx = ctx->params[0];
-	  ctx->cpy = ctx->rpy = ctx->params[1];
-	  ctx->param = 0;
-	}
-      break;
-    case 'c':
-      /* curveto */
-      if (ctx->param == 6 || final)
-	{
-	  rsvg_parse_path_default_xy (ctx, 6);
-	  x1 = ctx->params[0];
-	  y1 = ctx->params[1];
-	  x2 = ctx->params[2];
-	  y2 = ctx->params[3];
-	  x3 = ctx->params[4];
-	  y3 = ctx->params[5];
-#ifdef VERBOSE
-	  g_print ("'c' curveto %g,%g %g,%g, %g,%g\n",
-		   x1, y1, x2, y2, x3, y3);
-#endif
-	  rsvg_bpath_def_curveto (ctx->bpath,
-					  x1, y1, x2, y2, x3, y3);
-	  ctx->rpx = x2;
-	  ctx->rpy = y2;
-	  ctx->cpx = x3;
-	  ctx->cpy = y3;
-	  ctx->param = 0;
-	}
-      break;
-    case 's':
-      /* smooth curveto */
-      if (ctx->param == 4 || final)
-	{
-	  rsvg_parse_path_default_xy (ctx, 4);
-	  x1 = 2 * ctx->cpx - ctx->rpx;
-	  y1 = 2 * ctx->cpy - ctx->rpy;
-	  x2 = ctx->params[0];
-	  y2 = ctx->params[1];
-	  x3 = ctx->params[2];
-	  y3 = ctx->params[3];
-#ifdef VERBOSE
-	  g_print ("'s' curveto %g,%g %g,%g, %g,%g\n",
-		   x1, y1, x2, y2, x3, y3);
-#endif
-	  rsvg_bpath_def_curveto (ctx->bpath,
-					  x1, y1, x2, y2, x3, y3);
-	  ctx->rpx = x2;
-	  ctx->rpy = y2;
-	  ctx->cpx = x3;
-	  ctx->cpy = y3;
-	  ctx->param = 0;
-	}
-      break;
-    case 'h':
-      /* horizontal lineto */
-      if (ctx->param == 1)
-	{
-#ifdef VERBOSE
-	  g_print ("'h' lineto %g,%g\n",
-		   ctx->params[0], ctx->cpy);
-#endif
-	  rsvg_bpath_def_lineto (ctx->bpath,
-					 ctx->params[0], ctx->cpy);
-	  ctx->cpx = ctx->rpx = ctx->params[0];
-	  ctx->param = 0;
-	}
-      break;
-    case 'v':
-      /* vertical lineto */
-      if (ctx->param == 1)
-	{
-#ifdef VERBOSE
-	  g_print ("'v' lineto %g,%g\n",
-		   ctx->cpx, ctx->params[0]);
-#endif
-	  rsvg_bpath_def_lineto (ctx->bpath,
-					 ctx->cpx, ctx->params[0]);
-	  ctx->cpy = ctx->rpy = ctx->params[0];
-	  ctx->param = 0;
-	}
-      break;
-    case 'q':
-      /* quadratic bezier curveto */
-
-      /* non-normative reference:
-	 http://www.icce.rug.nl/erikjan/bluefuzz/beziers/beziers/beziers.html
-      */
-      if (ctx->param == 4 || final)
-	{
-	  rsvg_parse_path_default_xy (ctx, 4);
-	  /* raise quadratic bezier to cubic */
-	  x1 = (ctx->cpx + 2 * ctx->params[0]) * (1.0 / 3.0);
-	  y1 = (ctx->cpy + 2 * ctx->params[1]) * (1.0 / 3.0);
-	  x3 = ctx->params[2];
-	  y3 = ctx->params[3];
-	  x2 = (x3 + 2 * ctx->params[0]) * (1.0 / 3.0);
-	  y2 = (y3 + 2 * ctx->params[1]) * (1.0 / 3.0);
-#ifdef VERBOSE
-	  g_print ("'q' curveto %g,%g %g,%g, %g,%g\n",
-		   x1, y1, x2, y2, x3, y3);
-#endif
-	  rsvg_bpath_def_curveto (ctx->bpath,
-					  x1, y1, x2, y2, x3, y3);
-	  ctx->rpx = x2;
-	  ctx->rpy = y2;
-	  ctx->cpx = x3;
-	  ctx->cpy = y3;
-	  ctx->param = 0;
-	}
-      break;
-    case 't':
-      /* Truetype quadratic bezier curveto */
-      if (ctx->param == 2 || final)
-	{
-	  double xc, yc; /* quadratic control point */
-
-	  xc = 2 * ctx->cpx - ctx->rpx;
-	  yc = 2 * ctx->cpy - ctx->rpy;
-	  /* generate a quadratic bezier with control point = xc, yc */
-	  x1 = (ctx->cpx + 2 * xc) * (1.0 / 3.0);
-	  y1 = (ctx->cpy + 2 * yc) * (1.0 / 3.0);
-	  x3 = ctx->params[0];
-	  y3 = ctx->params[1];
-	  x2 = (x3 + 2 * xc) * (1.0 / 3.0);
-	  y2 = (y3 + 2 * yc) * (1.0 / 3.0);
-#ifdef VERBOSE
-	  g_print ("'t' curveto %g,%g %g,%g, %g,%g\n",
-		   x1, y1, x2, y2, x3, y3);
-#endif
-	  rsvg_bpath_def_curveto (ctx->bpath,
-					  x1, y1, x2, y2, x3, y3);
-	  ctx->rpx = xc;
-	  ctx->rpy = yc;
-	  ctx->cpx = x3;
-	  ctx->cpy = y3;
-	  ctx->param = 0;
-	}
-      else if (final)
-	{
-	  if (ctx->param > 2)
-	    {
-	      rsvg_parse_path_default_xy (ctx, 4);
-	      /* raise quadratic bezier to cubic */
-	      x1 = (ctx->cpx + 2 * ctx->params[0]) * (1.0 / 3.0);
-	      y1 = (ctx->cpy + 2 * ctx->params[1]) * (1.0 / 3.0);
-	      x3 = ctx->params[2];
-	      y3 = ctx->params[3];
-	      x2 = (x3 + 2 * ctx->params[0]) * (1.0 / 3.0);
-	      y2 = (y3 + 2 * ctx->params[1]) * (1.0 / 3.0);
-#ifdef VERBOSE
-	      g_print ("'t' curveto %g,%g %g,%g, %g,%g\n",
-		       x1, y1, x2, y2, x3, y3);
-#endif
-	      rsvg_bpath_def_curveto (ctx->bpath,
-					      x1, y1, x2, y2, x3, y3);
-	      ctx->rpx = x2;
-	      ctx->rpy = y2;
-	      ctx->cpx = x3;
-	      ctx->cpy = y3;
-	    }
-	  else
-	    {
-	      rsvg_parse_path_default_xy (ctx, 2);
-#ifdef VERBOSE
-	      g_print ("'t' lineto %g,%g\n",
-		       ctx->params[0], ctx->params[1]);
-#endif
-	      rsvg_bpath_def_lineto (ctx->bpath,
-					     ctx->params[0], ctx->params[1]);
-	      ctx->cpx = ctx->rpx = ctx->params[0];
-	      ctx->cpy = ctx->rpy = ctx->params[1];
-	    }
-	  ctx->param = 0;
-	}
-      break;
-    case 'a':
-      if (ctx->param == 7 || final)
-	{
-	  rsvg_path_arc (ctx,
-			ctx->params[0], ctx->params[1], ctx->params[2],
-			ctx->params[3], ctx->params[4],
-			ctx->params[5], ctx->params[6]);
-	  ctx->param = 0;
-	}
-      break;
-    default:
-      ctx->param = 0;
-    }
-}
-
-static void
-rsvg_parse_path_data (RSVGParsePathCtx *ctx, const char *data)
-{
-  int i = 0;
-  double val = 0;
-  char c = 0;
-  gboolean in_num = FALSE;
-  gboolean in_frac = FALSE;
-  gboolean in_exp = FALSE;
-  gboolean exp_wait_sign = FALSE;
-  int sign = 0;
-  int exp = 0;
-  int exp_sign = 0;
-  double frac = 0.0;
-
-  in_num = FALSE;
-  for (i = 0; ; i++)
-    {
-      c = data[i];
-      if (c >= '0' && c <= '9')
-	{
-	  /* digit */
-	  if (in_num)
-	    {
-	      if (in_exp)
-		{
-		  exp = (exp * 10) + c - '0';
-		  exp_wait_sign = FALSE;
-		}
-	      else if (in_frac)
-		val += (frac *= 0.1) * (c - '0');
-	      else
-		val = (val * 10) + c - '0';
-	    }
-	  else
-	    {
-	      in_num = TRUE;
-	      in_frac = FALSE;
-	      in_exp = FALSE;
-	      exp = 0;
-	      exp_sign = 1;
-	      exp_wait_sign = FALSE;
-	      val = c - '0';
-	      sign = 1;
-	    }
-	}
-      else if (c == '.')
-	{
-	  if (!in_num)
-	    {
-	      in_num = TRUE;
-	      val = 0;
-	    }
-	  in_frac = TRUE;
-	  frac = 1;
-	}
-      else if ((c == 'E' || c == 'e') && in_num)
-	{
-	  in_exp = TRUE;
-	  exp_wait_sign = TRUE;
-	  exp = 0;
-	  exp_sign = 1;
-	}
-      else if ((c == '+' || c == '-') && in_exp)
-	{
-	  exp_sign = c == '+' ? 1 : -1;
-	}
-      else if (in_num)
-	{
-	  /* end of number */
-
-	  val *= sign * pow (10, exp_sign * exp);
-	  if (ctx->rel)
-	    {
-	      /* Handle relative coordinates. This switch statement attempts
-		 to determine _what_ the coords are relative to. This is
-		 underspecified in the 12 Apr working draft. */
-	      switch (ctx->cmd)
-		{
-		case 'l':
-		case 'm':
-		case 'c':
-		case 's':
-		case 'q':
-		case 't':
-#ifndef RSVGV_RELATIVE
-		  /* rule: even-numbered params are x-relative, odd-numbered
-		     are y-relative */
-		  if ((ctx->param & 1) == 0)
-		    val += ctx->cpx;
-		  else if ((ctx->param & 1) == 1)
-		    val += ctx->cpy;
-		  break;
-#else
-		  /* rule: even-numbered params are x-relative, odd-numbered
-		     are y-relative */
-		  if (ctx->param == 0 || (ctx->param % 2 ==0))
-		    val += ctx->cpx;
-		  else 
-		    val += ctx->cpy;
-		  break;
-#endif
-		case 'a':
-		  /* rule: sixth and seventh are x and y, rest are not
-		     relative */
-		  if (ctx->param == 5)
-		    val += ctx->cpx;
-		  else if (ctx->param == 6)
-		    val += ctx->cpy;
-		  break;
-		case 'h':
-		  /* rule: x-relative */
-		  val += ctx->cpx;
-		  break;
-		case 'v':
-		  /* rule: y-relative */
-		  val += ctx->cpy;
-		  break;
-		}
-	    }
-	  ctx->params[ctx->param++] = val;
-	  rsvg_parse_path_do_cmd (ctx, FALSE);
-	  in_num = FALSE;
-	}
-
-      if (c == '\0')
-	break;
-      else if ((c == '+' || c == '-') && !exp_wait_sign)
-	{
-	  sign = c == '+' ? 1 : -1;;
-	  val = 0;
-	  in_num = TRUE;
-	  in_frac = FALSE;
-	  in_exp = FALSE;
-	  exp = 0;
-	  exp_sign = 1;
-	  exp_wait_sign = FALSE;
-	}
-      else if (c == 'z' || c == 'Z')
-	{
-	  if (ctx->param)
-	    rsvg_parse_path_do_cmd (ctx, TRUE);
-#ifdef VERBOSE
-	  g_print ("'z' closepath\n");
-#endif
-	  rsvg_bpath_def_closepath (ctx->bpath);
-	}
-      else if (c >= 'A' && c <= 'Z' && c != 'E')
-	{
-	  if (ctx->param)
-	    rsvg_parse_path_do_cmd (ctx, TRUE);
-	  ctx->cmd = c + 'a' - 'A';
-	  ctx->rel = FALSE;
-	}
-      else if (c >= 'a' && c <= 'z' && c != 'e')
-	{
-	  if (ctx->param)
-	    rsvg_parse_path_do_cmd (ctx, TRUE);
-	  ctx->cmd = c;
-	  ctx->rel = TRUE;
-	}
-      /* else c _should_ be whitespace or , */
-    }
-}
-
-RsvgBpathDef *
-rsvg_parse_path (const char *path_str)
-{
-  RSVGParsePathCtx ctx;
-
-  ctx.bpath = rsvg_bpath_def_new ();
-  ctx.cpx = 0.0;
-  ctx.cpy = 0.0;
-  ctx.cmd = 0;
-  ctx.param = 0;
-
-  rsvg_parse_path_data (&ctx, path_str);
-
-  if (ctx.param)
-    rsvg_parse_path_do_cmd (&ctx, TRUE);
-
-  return ctx.bpath;
-}
-
diff --git a/librsvg/rsvg-path.h b/librsvg/rsvg-path.h
deleted file mode 100644
index e7905256c..000000000
--- a/librsvg/rsvg-path.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
-   rsvg-path.h: Parse SVG path element data into bezier path.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Raph Levien <raph@artofcode.com>
-*/
-
-#ifndef RSVG_PATH_H
-#define RSVG_PATH_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-RsvgBpathDef *
-rsvg_parse_path (const char *path_str);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/librsvg/rsvg.c b/librsvg/rsvg.c
deleted file mode 100644
index 67902f86f..000000000
--- a/librsvg/rsvg.c
+++ /dev/null
@@ -1,1452 +0,0 @@
-/* 
-   rsvg.c: SAX-based renderer for SVG files into a GdkPixbuf.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Raph Levien <raph@artofcode.com>
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-#include <ctype.h>
-
-#include <glib.h>
-
-#include <libart_lgpl/art_misc.h>
-#include <libart_lgpl/art_filterlevel.h>
-#include <libart_lgpl/art_affine.h>
-#include <libart_lgpl/art_svp.h>
-#include <libart_lgpl/art_bpath.h>
-#include <libart_lgpl/art_vpath.h>
-#include <libart_lgpl/art_vpath_bpath.h>
-#include <libart_lgpl/art_rgb_svp.h>
-#include <libart_lgpl/art_svp_vpath_stroke.h>
-#include <libart_lgpl/art_svp_vpath.h>
-#include <libart_lgpl/art_svp_wind.h>
-
-#include "art_rgba.h"
-
-#include "art_render.h"
-#include "art_render_gradient.h"
-#include "art_render_svp.h"
-#include "art_render_mask.h"
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include <gnome-xml/SAX.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "rsvg-bpath-util.h"
-#include "rsvg-defs.h"
-#include "rsvg-path.h"
-#include "rsvg-css.h"
-#include "rsvg-paint-server.h"
-#include "rsvg-ft.h"
-#include "rsvg.h"
-
-#define noVERBOSE
-
-typedef struct _RsvgCtx RsvgCtx;
-typedef struct _RsvgState RsvgState;
-typedef struct _RsvgSaxHandler RsvgSaxHandler;
-
-struct _RsvgCtx {
-  GdkPixbuf *pixbuf;
-
-  double zoom;
-
-  /* stack; there is a state for each element */
-  RsvgState *state;
-  int n_state;
-  int n_state_max;
-
-  RsvgDefs *defs;
-
-  RsvgSaxHandler *handler; /* should this be a handler stack? */
-  int handler_nest;
-
-  GHashTable *entities; /* g_malloc'd string -> xmlEntityPtr */
-
-  RsvgFTCtx *ft_ctx;
-};
-
-struct _RsvgState {
-  double affine[6];
-
-  gint opacity; /* 0..255 */
-
-  RsvgPaintServer *fill;
-  gint fill_opacity; /* 0..255 */
-
-  RsvgPaintServer *stroke;
-  gint stroke_opacity; /* 0..255 */
-  double stroke_width;
-
-  ArtPathStrokeCapType cap;
-  ArtPathStrokeJoinType join;
-
-  double font_size;
-
-  guint32 stop_color; /* rgb */
-  gint stop_opacity; /* 0..255 */
-
-  gboolean in_defs;
-
-  GdkPixbuf *save_pixbuf;
-};
-
-struct _RsvgSaxHandler {
-  void (*free) (RsvgSaxHandler *self);
-  void (*start_element) (RsvgSaxHandler *self, const xmlChar *name, const xmlChar **atts);
-  void (*end_element) (RsvgSaxHandler *self, const xmlChar *name);
-  void (*characters) (RsvgSaxHandler *self, const xmlChar *ch, int len);
-};
-
-static RsvgCtx *
-rsvg_ctx_new (void)
-{
-  RsvgCtx *result;
-
-  result = g_new (RsvgCtx, 1);
-  result->pixbuf = NULL;
-  result->zoom = 1.0;
-  result->n_state = 0;
-  result->n_state_max = 16;
-  result->state = g_new (RsvgState, result->n_state_max);
-  result->defs = rsvg_defs_new ();
-  result->handler = NULL;
-  result->handler_nest = 0;
-  result->entities = g_hash_table_new (g_str_hash, g_str_equal);
-  result->ft_ctx = NULL;
-  return result;
-}
-
-static void
-rsvg_state_init (RsvgState *state)
-{
-  memset (state, 0, sizeof (*state));
-
-  art_affine_identity (state->affine);
-
-  state->opacity = 0xff;
-  state->fill = rsvg_paint_server_parse (NULL, "#000");
-  state->fill_opacity = 0xff;
-  state->stroke_opacity = 0xff;
-  state->stroke_width = 1;
-  state->cap = ART_PATH_STROKE_CAP_BUTT;
-  state->join = ART_PATH_STROKE_JOIN_MITER;
-  state->stop_opacity = 0xff;
-}
-
-static void
-rsvg_state_clone (RsvgState *dst, const RsvgState *src)
-{
-  *dst = *src;
-  rsvg_paint_server_ref (dst->fill);
-  rsvg_paint_server_ref (dst->stroke);
-  dst->save_pixbuf = NULL;
-}
-
-static void
-rsvg_state_finalize (RsvgState *state)
-{
-  rsvg_paint_server_unref (state->fill);
-  rsvg_paint_server_unref (state->stroke);
-}
-
-static void
-rsvg_ctx_free_helper (gpointer key, gpointer value, gpointer user_data)
-{
-  xmlEntityPtr entval = (xmlEntityPtr)value;
-
-  /* key == entval->name, so it's implicitly freed below */
-
-  g_free ((xmlChar *)entval->name);
-  g_free ((xmlChar *)entval->ExternalID);
-  g_free ((xmlChar *)entval->SystemID);
-  xmlFree (entval->content);
-  xmlFree (entval->orig);
-  g_free (entval);
-}
-
-/* does not destroy the pixbuf */
-static void
-rsvg_ctx_free (RsvgCtx *ctx)
-{
-  int i;
-
-  if (ctx->ft_ctx != NULL)
-    rsvg_ft_ctx_done (ctx->ft_ctx);
-  rsvg_defs_free (ctx->defs);
-
-  for (i = 0; i < ctx->n_state; i++)
-    rsvg_state_finalize (&ctx->state[i]);
-  g_free (ctx->state);
-
-  g_hash_table_foreach (ctx->entities, rsvg_ctx_free_helper, NULL);
-  g_hash_table_destroy (ctx->entities);
-
-  g_free (ctx);
-}
-
-static void
-rsvg_pixmap_destroy (guchar *pixels, gpointer data)
-{
-  g_free (pixels);
-}
-
-static void
-rsvg_start_svg (RsvgCtx *ctx, const xmlChar **atts)
-{
-  int i;
-  int width = -1, height = -1;
-  int rowstride;
-  art_u8 *pixels;
-  gint fixed;
-  RsvgState *state;
-  gboolean has_alpha = 1;
-
-  if (atts != NULL)
-    {
-      for (i = 0; atts[i] != NULL; i += 2)
-	{
-	  if (!strcmp ((char *)atts[i], "width"))
-	    width = rsvg_css_parse_length ((char *)atts[i + 1], &fixed);
-	  else if (!strcmp ((char *)atts[i], "height"))
-	    height = rsvg_css_parse_length ((char *)atts[i + 1], &fixed);
-	}
-#ifdef VERBOSE
-      fprintf (stdout, "rsvg_start_svg: width = %d, height = %d\n",
-	       width, height);
-#endif
-
-      if (width < 0 || height < 0)
-	{
-	  g_warning ("rsvg_start_svg: width and height attributes are not present in SVG\n");
-	  if (width < 0) width = 500;
-	  if (height < 0) height = 500;
-	}
-
-      /* Scale size of target pixbuf */
-      width = ceil (width * ctx->zoom);
-      height = ceil (height * ctx->zoom);
-
-      state = &ctx->state[ctx->n_state - 1];
-      art_affine_scale (state->affine, ctx->zoom, ctx->zoom);
-
-      rowstride = (width * (has_alpha ? 4 : 3) + 3) & -4;
-      pixels = g_new (art_u8, rowstride * height);
-      memset (pixels, has_alpha ? 0 : 255, rowstride * height);
-      ctx->pixbuf = gdk_pixbuf_new_from_data (pixels,
-					      GDK_COLORSPACE_RGB,
-					      has_alpha, 8,
-					      width, height,
-					      rowstride,
-					      rsvg_pixmap_destroy,
-					      NULL);
-    }
-}
-
-/* Parse a CSS2 style argument, setting the SVG context attributes. */
-static void
-rsvg_parse_style_arg (RsvgCtx *ctx, RsvgState *state, const char *str)
-{
-  int arg_off;
-
-  arg_off = rsvg_css_param_arg_offset (str);
-  if (rsvg_css_param_match (str, "opacity"))
-    {
-      state->opacity = rsvg_css_parse_opacity (str + arg_off);
-    }
-  else if (rsvg_css_param_match (str, "fill"))
-    {
-      rsvg_paint_server_unref (state->fill);
-      state->fill = rsvg_paint_server_parse (ctx->defs, str + arg_off);
-    }
-  else if (rsvg_css_param_match (str, "fill-opacity"))
-    {
-      state->fill_opacity = rsvg_css_parse_opacity (str + arg_off);
-    }
-  else if (rsvg_css_param_match (str, "stroke"))
-    {
-      rsvg_paint_server_unref (state->stroke);
-      state->stroke = rsvg_paint_server_parse (ctx->defs, str + arg_off);
-    }
-  else if (rsvg_css_param_match (str, "stroke-width"))
-    {
-      int fixed; 
-      state->stroke_width = rsvg_css_parse_length (str + arg_off, &fixed);
-    }
-  else if (rsvg_css_param_match (str, "stroke-linecap"))
-    {
-      if (!strcmp (str + arg_off, "butt"))
-	state->cap = ART_PATH_STROKE_CAP_BUTT;
-      else if (!strcmp (str + arg_off, "round"))
-	state->cap = ART_PATH_STROKE_CAP_ROUND;
-      else if (!strcmp (str + arg_off, "square"))
-	state->cap = ART_PATH_STROKE_CAP_SQUARE;
-      else
-	g_warning ("unknown line cap style %s", str + arg_off);
-    }
-  else if (rsvg_css_param_match (str, "stroke-opacity"))
-    {
-      state->stroke_opacity = rsvg_css_parse_opacity (str + arg_off);
-    }
-  else if (rsvg_css_param_match (str, "stroke-linejoin"))
-    {
-      if (!strcmp (str + arg_off, "miter"))
-	state->join = ART_PATH_STROKE_JOIN_MITER;
-      else if (!strcmp (str + arg_off, "round"))
-	state->join = ART_PATH_STROKE_JOIN_ROUND;
-      else if (!strcmp (str + arg_off, "bevel"))
-	state->join = ART_PATH_STROKE_JOIN_BEVEL;
-      else
-	g_warning ("unknown line join style %s", str + arg_off);
-    }
-  else if (rsvg_css_param_match (str, "font-size"))
-    {
-      state->font_size = rsvg_css_parse_fontsize (str + arg_off);
-    }
-  else if (rsvg_css_param_match (str, "font-family"))
-    {
-      /* state->font_family = g_strdup (str + arg_off); */
-    }
-  else if (rsvg_css_param_match (str, "stop-color"))
-    {
-      state->stop_color = rsvg_css_parse_color (str + arg_off);
-    }
-  else if (rsvg_css_param_match (str, "stop-opacity"))
-    {
-      state->stop_opacity = rsvg_css_parse_opacity (str + arg_off);
-    }
-}
-
-/* Split a CSS2 style into individual style arguments, setting attributes
-   in the SVG context.
-
-   It's known that this is _way_ out of spec. A more complete CSS2
-   implementation will happen later.
-*/
-static void
-rsvg_parse_style (RsvgCtx *ctx, RsvgState *state, const char *str)
-{
-  int start, end;
-  char *arg;
-
-  start = 0;
-  while (str[start] != '\0')
-    {
-      for (end = start; str[end] != '\0' && str[end] != ';'; end++);
-      arg = g_new (char, 1 + end - start);
-      memcpy (arg, str + start, end - start);
-      arg[end - start] = '\0';
-      rsvg_parse_style_arg (ctx, state, arg);
-      g_free (arg);
-      start = end;
-      if (str[start] == ';') start++;
-      while (str[start] == ' ') start++;
-    }
-}
-
-/* Parse an SVG transform string into an affine matrix. Reference: SVG
-   working draft dated 1999-07-06, section 8.5. Return TRUE on
-   success. */
-static gboolean
-rsvg_parse_transform (double dst[6], const char *src)
-{
-  int idx;
-  char keyword[32];
-  double args[6];
-  int n_args;
-  guint key_len;
-  double tmp_affine[6];
-
-  art_affine_identity (dst);
-
-  idx = 0;
-  while (src[idx])
-    {
-      /* skip initial whitespace */
-      while (isspace (src[idx]))
-	idx++;
-
-      /* parse keyword */
-      for (key_len = 0; key_len < sizeof (keyword); key_len++)
-	{
-	  char c;
-
-	  c = src[idx];
-	  if (isalpha (c) || c == '-')
-	    keyword[key_len] = src[idx++];
-	  else
-	    break;
-	}
-      if (key_len >= sizeof (keyword))
-	return FALSE;
-      keyword[key_len] = '\0';
-
-      /* skip whitespace */
-      while (isspace (src[idx]))
-	idx++;
-
-      if (src[idx] != '(')
-	return FALSE;
-      idx++;
-
-      for (n_args = 0; ; n_args++)
-	{
-	  char c;
-	  char *end_ptr;
-
-	  /* skip whitespace */
-	  while (isspace (src[idx]))
-	    idx++;
-	  c = src[idx];
-	  if (isdigit (c) || c == '+' || c == '-' || c == '.')
-	    {
-	      if (n_args == sizeof(args) / sizeof(args[0]))
-		return FALSE; /* too many args */
-	      args[n_args] = strtod (src + idx, &end_ptr);
-	      idx = end_ptr - src;
-
-	      while (isspace (src[idx]))
-		idx++;
-
-	      /* skip optional comma */
-	      if (src[idx] == ',')
-		idx++;
-	    }
-	  else if (c == ')')
-	    break;
-	  else
-	    return FALSE;
-	}
-      idx++;
-
-      /* ok, have parsed keyword and args, now modify the transform */
-      if (!strcmp (keyword, "matrix"))
-	{
-	  if (n_args != 6)
-	    return FALSE;
-	  art_affine_multiply (dst, args, dst);
-	}
-      else if (!strcmp (keyword, "translate"))
-	{
-	  if (n_args == 1)
-	    args[1] = 0;
-	  else if (n_args != 2)
-	    return FALSE;
-	  art_affine_translate (tmp_affine, args[0], args[1]);
-	  art_affine_multiply (dst, tmp_affine, dst);
-	}
-      else if (!strcmp (keyword, "scale"))
-	{
-	  if (n_args == 1)
-	    args[1] = args[0];
-	  else if (n_args != 2)
-	    return FALSE;
-	  art_affine_scale (tmp_affine, args[0], args[1]);
-	  art_affine_multiply (dst, tmp_affine, dst);
-	}
-      else if (!strcmp (keyword, "rotate"))
-	{
-	  if (n_args != 1)
-	    return FALSE;
-	  art_affine_rotate (tmp_affine, args[0]);
-	  art_affine_multiply (dst, tmp_affine, dst);
-	}
-      else if (!strcmp (keyword, "skewX"))
-	{
-	  if (n_args != 1)
-	    return FALSE;
-	  art_affine_shear (tmp_affine, args[0]);
-	  art_affine_multiply (dst, tmp_affine, dst);
-	}
-      else if (!strcmp (keyword, "skewY"))
-	{
-	  if (n_args != 1)
-	    return FALSE;
-	  art_affine_shear (tmp_affine, args[0]);
-	  /* transpose the affine, given that we know [1] is zero */
-	  tmp_affine[1] = tmp_affine[2];
-	  tmp_affine[2] = 0;
-	  art_affine_multiply (dst, tmp_affine, dst);
-	}
-      else
-	return FALSE; /* unknown keyword */
-    }
-  return TRUE;
-}
-
-/**
- * rsvg_parse_transform_attr: Parse transform attribute and apply to state.
- * @ctx: Rsvg context.
- * @state: State in which to apply the transform.
- * @str: String containing transform.
- *
- * Parses the transform attribute in @str and applies it to @state.
- **/
-static void
-rsvg_parse_transform_attr (RsvgCtx *ctx, RsvgState *state, const char *str)
-{
-  double affine[6];
-
-  if (rsvg_parse_transform (affine, str))
-    {
-      art_affine_multiply (state->affine, affine, state->affine);
-    }
-  else
-    {
-      /* parse error for transform attribute. todo: report */
-    }
-}
-
-/**
- * rsvg_parse_style_attrs: Parse style attribute.
- * @ctx: Rsvg context.
- * @atts: Attributes in SAX style.
- *
- * Parses style and transform attributes and modifies state at top of
- * stack.
- **/
-static void
-rsvg_parse_style_attrs (RsvgCtx *ctx, const xmlChar **atts)
-{
-  int i;
-
-  if (atts != NULL)
-    {
-      for (i = 0; atts[i] != NULL; i += 2)
-	{
-	  if (!strcmp ((char *)atts[i], "style"))
-	    rsvg_parse_style (ctx, &ctx->state[ctx->n_state - 1],
-			      (char *)atts[i + 1]);
-	  else if (!strcmp ((char *)atts[i], "transform"))
-	    rsvg_parse_transform_attr (ctx, &ctx->state[ctx->n_state - 1],
-				       (char *)atts[i + 1]);
-	}
-    }
-}
-
-/**
- * rsvg_push_opacity_group: Begin a new transparency group.
- * @ctx: Context in which to push.
- *
- * Pushes a new transparency group onto the stack. The top of the stack
- * is stored in the context, while the "saved" value is in the state
- * stack.
- **/
-static void
-rsvg_push_opacity_group (RsvgCtx *ctx)
-{
-  RsvgState *state;
-  GdkPixbuf *pixbuf;
-  art_u8 *pixels;
-  int width, height, rowstride;
-
-  state = &ctx->state[ctx->n_state - 1];
-  pixbuf = ctx->pixbuf;
-
-  if (!gdk_pixbuf_get_has_alpha (pixbuf))
-    {
-      g_warning ("push/pop transparency group on non-alpha buffer nyi");
-      return;
-    }
-
-  state->save_pixbuf = pixbuf;
-
-  width = gdk_pixbuf_get_width (pixbuf);
-  height = gdk_pixbuf_get_height (pixbuf);
-  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-  pixels = g_new (art_u8, rowstride * height);
-  memset (pixels, 0, rowstride * height);
-
-  pixbuf = gdk_pixbuf_new_from_data (pixels,
-				     GDK_COLORSPACE_RGB,
-				     TRUE,
-				     gdk_pixbuf_get_bits_per_sample (pixbuf),
-				     width,
-				     height,
-				     rowstride,
-				     rsvg_pixmap_destroy,
-				     NULL);
-  ctx->pixbuf = pixbuf;
-}
-
-/**
- * rsvg_pop_opacity_group: End a transparency group.
- * @ctx: Context in which to push.
- * @opacity: Opacity for blending (0..255).
- *
- * Pops a new transparency group from the stack, recompositing with the
- * next on stack.
- **/
-static void
-rsvg_pop_opacity_group (RsvgCtx *ctx, int opacity)
-{
-  RsvgState *state = &ctx->state[ctx->n_state - 1];
-  GdkPixbuf *tos, *nos;
-  art_u8 *tos_pixels, *nos_pixels;
-  int width;
-  int height;
-  int rowstride;
-  int x, y;
-  int tmp;
-
-  tos = ctx->pixbuf;
-  nos = state->save_pixbuf;
-
-  if (!gdk_pixbuf_get_has_alpha (nos))
-    {
-      g_warning ("push/pop transparency group on non-alpha buffer nyi");
-      return;
-    }
-
-  width = gdk_pixbuf_get_width (tos);
-  height = gdk_pixbuf_get_height (tos);
-  rowstride = gdk_pixbuf_get_rowstride (tos);
-
-  tos_pixels = gdk_pixbuf_get_pixels (tos);
-  nos_pixels = gdk_pixbuf_get_pixels (nos);
-
-  for (y = 0; y < height; y++)
-    {
-      for (x = 0; x < width; x++)
-	{
-	  art_u8 r, g, b, a;
-	  a = tos_pixels[4 * x + 3];
-	  if (a)
-	    {
-	      r = tos_pixels[4 * x];
-	      g = tos_pixels[4 * x + 1];
-	      b = tos_pixels[4 * x + 2];
-	      tmp = a * opacity + 0x80;
-	      a = (tmp + (tmp >> 8)) >> 8;
-	      art_rgba_run_alpha (nos_pixels + 4 * x, r, g, b, a, 1);
-	    }
-	}
-      tos_pixels += rowstride;
-      nos_pixels += rowstride;
-    }
-
-  gdk_pixbuf_unref (tos);
-  ctx->pixbuf = nos;
-}
-
-static void
-rsvg_start_g (RsvgCtx *ctx, const xmlChar **atts)
-{
-  RsvgState *state = &ctx->state[ctx->n_state - 1];
-
-  rsvg_parse_style_attrs (ctx, atts);
-
-  if (state->opacity != 0xff)
-    rsvg_push_opacity_group (ctx);
-}
-
-static void
-rsvg_end_g (RsvgCtx *ctx)
-{
-  RsvgState *state = &ctx->state[ctx->n_state - 1];
-
-  if (state->opacity != 0xff)
-    rsvg_pop_opacity_group (ctx, state->opacity);
-}
-
-/**
- * rsvg_close_vpath: Close a vector path.
- * @src: Source vector path.
- *
- * Closes any open subpaths in the vector path.
- *
- * Return value: Closed vector path, allocated with g_new.
- **/
-static ArtVpath *
-rsvg_close_vpath (const ArtVpath *src)
-{
-  ArtVpath *result;
-  int n_result, n_result_max;
-  int src_ix;
-  double beg_x, beg_y;
-  gboolean open;
-
-  n_result = 0;
-  n_result_max = 16;
-  result = g_new (ArtVpath, n_result_max);
-
-  beg_x = 0;
-  beg_y = 0;
-  open = FALSE;
-
-  for (src_ix = 0; src[src_ix].code != ART_END; src_ix++)
-    {
-      if (n_result == n_result_max)
-	result = g_renew (ArtVpath, result, n_result_max <<= 1);
-      result[n_result].code = src[src_ix].code == ART_MOVETO_OPEN ?
-	ART_MOVETO : src[src_ix].code;
-      result[n_result].x = src[src_ix].x;
-      result[n_result].y = src[src_ix].y;
-      n_result++;
-      if (src[src_ix].code == ART_MOVETO_OPEN)
-	{
-	  beg_x = src[src_ix].x;
-	  beg_y = src[src_ix].y;
-	  open = TRUE;
-	}
-      else if (src[src_ix + 1].code != ART_LINETO)
-	{
-	  if (open && (beg_x != src[src_ix].x || beg_y != src[src_ix].y))
-	    {
-	      if (n_result == n_result_max)
-		result = g_renew (ArtVpath, result, n_result_max <<= 1);
-	      result[n_result].code = ART_LINETO;
-	      result[n_result].x = beg_x;
-	      result[n_result].y = beg_y;
-	      n_result++;
-	    }
-	  open = FALSE;
-	}
-    }
-  if (n_result == n_result_max)
-    result = g_renew (ArtVpath, result, n_result_max <<= 1);
-  result[n_result].code = ART_END;
-  result[n_result].x = 0.0;
-  result[n_result].y = 0.0;
-  return result;
-}
-
-/**
- * rsvg_render_svp: Render an SVP.
- * @ctx: Context in which to render.
- * @svp: SVP to render.
- * @ps: Paint server for rendering.
- * @opacity: Opacity as 0..0xff.
- *
- * Renders the SVP over the pixbuf in @ctx.
- **/
-static void
-rsvg_render_svp (RsvgCtx *ctx, const ArtSVP *svp,
-		 RsvgPaintServer *ps, int opacity)
-{
-  GdkPixbuf *pixbuf;
-  ArtRender *render;
-  gboolean has_alpha;
-
-  pixbuf = ctx->pixbuf;
-  /* if a pixbuf hasn't been allocated, the svg is probably misformed.  Exit
-   * to avoid crashing.
-   */  
-  if (pixbuf == NULL) {
-  	return;
-  }
-  
-  has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
-
-  render = art_render_new (0, 0, 
-			   gdk_pixbuf_get_width (pixbuf),
-			   gdk_pixbuf_get_height (pixbuf),
-			   gdk_pixbuf_get_pixels (pixbuf),
-			   gdk_pixbuf_get_rowstride (pixbuf),
-			   gdk_pixbuf_get_n_channels (pixbuf) -
-			   (has_alpha ? 1 : 0),
-			   gdk_pixbuf_get_bits_per_sample (pixbuf),
-			   has_alpha ? ART_ALPHA_SEPARATE : ART_ALPHA_NONE,
-			   NULL);
-
-  art_render_svp (render, svp);
-  art_render_mask_solid (render, (opacity << 8) + opacity + (opacity >> 7));
-  rsvg_render_paint_server (render, ps, NULL); /* todo: paint server ctx */
-  art_render_invoke (render);
-}
-
-static void
-rsvg_render_bpath (RsvgCtx *ctx, const ArtBpath *bpath)
-{
-  RsvgState *state;
-  ArtBpath *affine_bpath;
-  ArtVpath *vpath;
-  ArtSVP *svp;
-  GdkPixbuf *pixbuf;
-  gboolean need_tmpbuf;
-  int opacity;
-  int tmp;
-
-  state = &ctx->state[ctx->n_state - 1];
-  pixbuf = ctx->pixbuf;
-  affine_bpath = art_bpath_affine_transform (bpath,
-					     state->affine);
-	
-  vpath = art_bez_path_to_vec (affine_bpath, 0.25);
-  art_free (affine_bpath);
-
-  need_tmpbuf = (state->fill != NULL) && (state->stroke != NULL) &&
-    state->opacity != 0xff;
-
-  if (need_tmpbuf)
-    rsvg_push_opacity_group (ctx);
-
-  if (state->fill != NULL)
-    {
-      ArtVpath *closed_vpath;
-      ArtVpath *perturbed_vpath;
-      ArtSVP *tmp_svp;
-      ArtWindRule art_wind;
-			
-      closed_vpath = rsvg_close_vpath (vpath);
-      perturbed_vpath = art_vpath_perturb (closed_vpath);
-      g_free (closed_vpath);
-      svp = art_svp_from_vpath (perturbed_vpath);
-      art_free (perturbed_vpath);
-      tmp_svp = art_svp_uncross (svp);
-      art_svp_free (svp);
-      art_wind = ART_WIND_RULE_NONZERO; /* todo - get from state */
-      svp = art_svp_rewind_uncrossed (tmp_svp, art_wind);
-      art_svp_free (tmp_svp);
-
-      opacity = state->fill_opacity;
-      if (!need_tmpbuf && state->opacity != 0xff)
-	{
-	  tmp = opacity * state->opacity + 0x80;
-	  opacity = (tmp + (tmp >> 8)) >> 8;
-	}
-      rsvg_render_svp (ctx, svp, state->fill, opacity);
-      art_svp_free (svp);
-    }
-
-  if (state->stroke != NULL)
-    {
-      /* todo: libart doesn't yet implement anamorphic scaling of strokes */
-      double stroke_width = state->stroke_width *
-	art_affine_expansion (state->affine);
-
-      if (stroke_width < 0.25)
-	stroke_width = 0.25;
-
-      svp = art_svp_vpath_stroke (vpath, state->join, state->cap,
-				  stroke_width, 4, 0.25);
-      opacity = state->stroke_opacity;
-      if (!need_tmpbuf && state->opacity != 0xff)
-	{
-	  tmp = opacity * state->opacity + 0x80;
-	  opacity = (tmp + (tmp >> 8)) >> 8;
-	}
-      rsvg_render_svp (ctx, svp, state->stroke, opacity);
-      art_svp_free (svp);
-    }
-
-  if (need_tmpbuf)
-    rsvg_pop_opacity_group (ctx, state->opacity);
-
-  art_free (vpath);
-}
-
-static void
-rsvg_start_path (RsvgCtx *ctx, const xmlChar **atts)
-{
-  int i;
-  char *d = NULL;
-
-  rsvg_parse_style_attrs (ctx, atts);
-  if (atts != NULL)
-    {
-      for (i = 0; atts[i] != NULL; i += 2)
-	{
-	  if (!strcmp ((char *)atts[i], "d"))
-	    d = (char *)atts[i + 1];
-	}
-    }
-  if (d != NULL)
-    {
-      RsvgBpathDef *bpath_def;
-
-      bpath_def = rsvg_parse_path (d);
-      rsvg_bpath_def_art_finish (bpath_def);
-
-      rsvg_render_bpath (ctx, bpath_def->bpath);
-
-      rsvg_bpath_def_free (bpath_def);
-    }
-}
-
-/* begin text - this should likely get split into its own .c file */
-
-typedef struct _RsvgSaxHandlerText RsvgSaxHandlerText;
-
-struct _RsvgSaxHandlerText {
-  RsvgSaxHandler super;
-  RsvgCtx *ctx;
-  double xpos;
-  double ypos;
-};
-
-static void
-rsvg_text_handler_free (RsvgSaxHandler *self)
-{
-  g_free (self);
-}
-
-static void
-rsvg_text_handler_characters (RsvgSaxHandler *self, const xmlChar *ch, int len)
-{
-  RsvgSaxHandlerText *z = (RsvgSaxHandlerText *)self;
-  RsvgCtx *ctx = z->ctx;
-  char *string;
-  int beg, end;
-  RsvgFTFontHandle fh;
-  RsvgFTGlyph *glyph;
-  int glyph_xy[2];
-  RsvgState *state;
-  ArtRender *render;
-  GdkPixbuf *pixbuf;
-  gboolean has_alpha;
-  int opacity;
-
-  /* Copy ch into string, chopping off leading and trailing whitespace */
-  for (beg = 0; beg < len; beg++)
-    if (!isspace (ch[beg]))
-      break;
-
-  for (end = len; end > beg; end--)
-    if (!isspace (ch[end - 1]))
-      break;
-
-  string = g_malloc (end - beg + 1);
-  memcpy (string, ch + beg, end - beg);
-  string[end - beg] = 0;
-
-
-#ifdef VERBOSE
-  fprintf (stderr, "text characters(%s, %d)\n", string, len);
-#endif
-
-  if (ctx->ft_ctx == NULL)
-    ctx->ft_ctx = rsvg_ft_ctx_new ();
-
-  /* FIXME bugzilla.eazel.com 3904: We need to make rsvg use the 
-   * Nautilus font mapping stuff in NautilusScalableFont.  See bug
-   * for details.
-   */
-  fh = rsvg_ft_intern (ctx->ft_ctx,
-		       NAUTILUS_DATADIR "/fonts/urw/n019003l.pfb");
-  rsvg_ft_font_attach (ctx->ft_ctx, fh,
-		       NAUTILUS_DATADIR "/fonts/urw/n019003l.afm");
-
-  state = &ctx->state[ctx->n_state - 1];
-
-  if (state->fill != NULL && state->font_size > 0)
-    {
-      pixbuf = ctx->pixbuf;
-      has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
-
-      render = art_render_new (0, 0, 
-			       gdk_pixbuf_get_width (pixbuf),
-			       gdk_pixbuf_get_height (pixbuf),
-			       gdk_pixbuf_get_pixels (pixbuf),
-			       gdk_pixbuf_get_rowstride (pixbuf),
-			       gdk_pixbuf_get_n_channels (pixbuf) -
-			       (has_alpha ? 1 : 0),
-			       gdk_pixbuf_get_bits_per_sample (pixbuf),
-			       has_alpha ? ART_ALPHA_SEPARATE : ART_ALPHA_NONE,
-			       NULL);
-
-      glyph = rsvg_ft_render_string (ctx->ft_ctx, fh, 
-				     string,
-				     strlen (string),
-				     state->font_size, state->font_size,
-				     state->affine, glyph_xy);
-
-      rsvg_render_paint_server (render, state->fill, NULL); /* todo: paint server ctx */
-      opacity = state->fill_opacity * state->opacity;
-      opacity = opacity + (opacity >> 7) + (opacity >> 14);
-#ifdef VERBOSE
-      fprintf (stderr, "opacity = %d\n", opacity);
-#endif
-      art_render_mask_solid (render, opacity);
-      art_render_mask (render,
-		       glyph_xy[0], glyph_xy[1],
-		       glyph_xy[0] + glyph->width, glyph_xy[1] + glyph->height,
-		       glyph->buf, glyph->rowstride);
-      art_render_invoke (render);
-      rsvg_ft_glyph_unref (glyph);
-    }
-
-  g_free (string);
-}
-
-static void
-rsvg_start_text (RsvgCtx *ctx, const xmlChar **atts)
-{
-  RsvgSaxHandlerText *handler = g_new0 (RsvgSaxHandlerText, 1);
-
-  handler->super.free = rsvg_text_handler_free;
-  handler->super.characters = rsvg_text_handler_characters;
-  handler->ctx = ctx;
-
-  /* todo: parse "x" and "y" attributes */
-  handler->xpos = 0;
-  handler->ypos = 0;
-
-  rsvg_parse_style_attrs (ctx, atts);
-  ctx->handler = &handler->super;
-#ifdef VERBOSE
-  fprintf (stderr, "begin text!\n");
-#endif
-}
-
-/* end text */
-
-static void
-rsvg_start_defs (RsvgCtx *ctx, const xmlChar **atts)
-{
-  RsvgState *state = &ctx->state[ctx->n_state - 1];
-
-  state->in_defs = TRUE;
-}
-
-typedef struct _RsvgSaxHandlerGstops RsvgSaxHandlerGstops;
-
-struct _RsvgSaxHandlerGstops {
-  RsvgSaxHandler super;
-  RsvgCtx *ctx;
-  RsvgGradientStops *stops;
-};
-
-static void
-rsvg_gradient_stop_handler_free (RsvgSaxHandler *self)
-{
-  g_free (self);
-}
-
-static void
-rsvg_gradient_stop_handler_start (RsvgSaxHandler *self, const xmlChar *name,
-				  const xmlChar **atts)
-{
-  RsvgSaxHandlerGstops *z = (RsvgSaxHandlerGstops *)self;
-  RsvgGradientStops *stops = z->stops;
-  int i;
-  double offset = 0;
-  gboolean got_offset = FALSE;
-  gint fixed;
-  RsvgState state;
-  int n_stop;
-
-  if (strcmp ((char *)name, "stop"))
-    {
-      g_warning ("unexpected <%s> element in gradient\n", name);
-      return;
-    }
-
-  rsvg_state_init (&state);
-
-  if (atts != NULL)
-    {
-      for (i = 0; atts[i] != NULL; i += 2)
-	{
-	  if (!strcmp ((char *)atts[i], "offset"))
-	    {
-	      offset = rsvg_css_parse_length ((char *)atts[i + 1], &fixed);
-	      got_offset = TRUE;
-	    }
-	  else if (!strcmp ((char *)atts[i], "style"))
-	    rsvg_parse_style (z->ctx, &state, (char *)atts[i + 1]);
-	}
-    }
-
-  rsvg_state_finalize (&state);
-
-  if (!got_offset)
-    {
-      g_warning ("gradient stop must specify offset\n");
-      return;
-    }
-
-  n_stop = stops->n_stop++;
-  if (n_stop == 0)
-    stops->stop = g_new (RsvgGradientStop, 1);
-  else if (!(n_stop & (n_stop - 1)))
-    /* double the allocation if size is a power of two */
-    stops->stop = g_renew (RsvgGradientStop, stops->stop, n_stop << 1);
-  stops->stop[n_stop].offset = offset;
-  stops->stop[n_stop].rgba = (state.stop_color << 8) | state.stop_opacity;
-}
-
-static void
-rsvg_gradient_stop_handler_end (RsvgSaxHandler *self, const xmlChar *name)
-{
-}
-
-static RsvgSaxHandler *
-rsvg_gradient_stop_handler_new (RsvgCtx *ctx, RsvgGradientStops **p_stops)
-{
-  RsvgSaxHandlerGstops *gstops = g_new0 (RsvgSaxHandlerGstops, 1);
-  RsvgGradientStops *stops = g_new (RsvgGradientStops, 1);
-
-  gstops->super.free = rsvg_gradient_stop_handler_free;
-  gstops->super.start_element = rsvg_gradient_stop_handler_start;
-  gstops->super.end_element = rsvg_gradient_stop_handler_end;
-  gstops->ctx = ctx;
-  gstops->stops = stops;
-
-  stops->n_stop = 0;
-  stops->stop = NULL;
-
-  *p_stops = stops;
-  return &gstops->super;
-}
-
-static void
-rsvg_linear_gradient_free (RsvgDefVal *self)
-{
-  RsvgLinearGradient *z = (RsvgLinearGradient *)self;
-
-  g_free (z->stops->stop);
-  g_free (z->stops);
-  g_free (self);
-}
-
-static void
-rsvg_start_linear_gradient (RsvgCtx *ctx, const xmlChar **atts)
-{
-  RsvgState *state = &ctx->state[ctx->n_state - 1];
-  RsvgLinearGradient *grad;
-  int i;
-  char *id = NULL;
-  double x1 = 0, y1 = 0, x2 = 100, y2 = 0;
-  ArtGradientSpread spread = ART_GRADIENT_PAD;
-
-  /* todo: only handles numeric coordinates in gradientUnits = userSpace */
-  if (atts != NULL)
-    {
-      for (i = 0; atts[i] != NULL; i += 2)
-	{
-	  if (!strcmp ((char *)atts[i], "id"))
-	    id = (char *)atts[i + 1];
-	  else if (!strcmp ((char *)atts[i], "x1"))
-	    x1 = atof ((char *)atts[i + 1]);
-	  else if (!strcmp ((char *)atts[i], "y1"))
-	    y1 = atof ((char *)atts[i + 1]);
-	  else if (!strcmp ((char *)atts[i], "x2"))
-	    x2 = atof ((char *)atts[i + 1]);
-	  else if (!strcmp ((char *)atts[i], "y2"))
-	    y2 = atof ((char *)atts[i + 1]);
-	  else if (!strcmp ((char *)atts[i], "spreadMethod"))
-	    {
-	      if (!strcmp ((char *)atts[i + 1], "pad"))
-		spread = ART_GRADIENT_PAD;
-	      else if (!strcmp ((char *)atts[i + 1], "reflect"))
-		spread = ART_GRADIENT_REFLECT;
-	      else if (!strcmp ((char *)atts[i + 1], "repeat"))
-		spread = ART_GRADIENT_REPEAT;
-	    }
-	}
-    }
-
-  grad = g_new (RsvgLinearGradient, 1);
-  grad->super.type = RSVG_DEF_LINGRAD;
-  grad->super.free = rsvg_linear_gradient_free;
-
-  ctx->handler = rsvg_gradient_stop_handler_new (ctx, &grad->stops);
-
-  rsvg_defs_set (ctx->defs, id, &grad->super);
-
-  for (i = 0; i < 6; i++)
-    grad->affine[i] = state->affine[i];
-  grad->x1 = x1;
-  grad->y1 = y1;
-  grad->x2 = x2;
-  grad->y2 = y2;
-  grad->spread = spread;
-}
-
-static void
-rsvg_radial_gradient_free (RsvgDefVal *self)
-{
-  RsvgRadialGradient *z = (RsvgRadialGradient *)self;
-
-  g_free (z->stops->stop);
-  g_free (z->stops);
-  g_free (self);
-}
-
-static void
-rsvg_start_radial_gradient (RsvgCtx *ctx, const xmlChar **atts)
-{
-  RsvgState *state = &ctx->state[ctx->n_state - 1];
-  RsvgRadialGradient *grad;
-  int i;
-  char *id = NULL;
-  double cx = 50, cy = 50, r = 50, fx = 50, fy = 50;
-
-  /* todo: only handles numeric coordinates in gradientUnits = userSpace */
-  if (atts != NULL)
-    {
-      for (i = 0; atts[i] != NULL; i += 2)
-	{
-	  if (!strcmp ((char *)atts[i], "id"))
-	    id = (char *)atts[i + 1];
-	  else if (!strcmp ((char *)atts[i], "cx"))
-	    cx = atof ((char *)atts[i + 1]);
-	  else if (!strcmp ((char *)atts[i], "cy"))
-	    cy = atof ((char *)atts[i + 1]);
-	  else if (!strcmp ((char *)atts[i], "r"))
-	    r = atof ((char *)atts[i + 1]);
-	  else if (!strcmp ((char *)atts[i], "fx"))
-	    fx = atof ((char *)atts[i + 1]);
-	  else if (!strcmp ((char *)atts[i], "fy"))
-	    fy = atof ((char *)atts[i + 1]);
-	}
-    }
-
-  grad = g_new (RsvgRadialGradient, 1);
-  grad->super.type = RSVG_DEF_RADGRAD;
-  grad->super.free = rsvg_radial_gradient_free;
-
-  ctx->handler = rsvg_gradient_stop_handler_new (ctx, &grad->stops);
-
-  rsvg_defs_set (ctx->defs, id, &grad->super);
-
-  for (i = 0; i < 6; i++)
-    grad->affine[i] = state->affine[i];
-  grad->cx = cx;
-  grad->cy = cy;
-  grad->r = r;
-  grad->fx = fx;
-  grad->fy = fy;
-}
-
-static void
-rsvg_start_element (void *data, const xmlChar *name, const xmlChar **atts)
-{
-  RsvgCtx *ctx = (RsvgCtx *)data;
-#ifdef VERBOSE
-  int i;
-#endif
-
-#ifdef VERBOSE
-  fprintf (stdout, "SAX.startElement(%s", (char *) name);
-  if (atts != NULL) {
-    for (i = 0;(atts[i] != NULL);i++) {
-      fprintf (stdout, ", %s='", atts[i++]);
-      fprintf (stdout, "%s'", atts[i]);
-    }
-  }
-  fprintf (stdout, ")\n");
-#endif
-
-  if (ctx->handler)
-    {
-      ctx->handler_nest++;
-      if (ctx->handler->start_element != NULL)
-	ctx->handler->start_element (ctx->handler, name, atts);
-    }
-  else
-    {
-      /* push the state stack */
-      if (ctx->n_state == ctx->n_state_max)
-	ctx->state = g_renew (RsvgState, ctx->state, ctx->n_state_max <<= 1);
-      if (ctx->n_state)
-	rsvg_state_clone (&ctx->state[ctx->n_state],
-			  &ctx->state[ctx->n_state - 1]);
-      else
-	rsvg_state_init (ctx->state);
-      ctx->n_state++;
-
-      if (!strcmp ((char *)name, "svg"))
-	rsvg_start_svg (ctx, atts);
-      else if (!strcmp ((char *)name, "g"))
-	rsvg_start_g (ctx, atts);
-      else if (!strcmp ((char *)name, "path"))
-	rsvg_start_path (ctx, atts);
-      else if (!strcmp ((char *)name, "text"))
-	rsvg_start_text (ctx, atts);
-      else if (!strcmp ((char *)name, "defs"))
-	rsvg_start_defs (ctx, atts);
-      else if (!strcmp ((char *)name, "linearGradient"))
-	rsvg_start_linear_gradient (ctx, atts);
-      else if (!strcmp ((char *)name, "radialGradient"))
-	rsvg_start_radial_gradient (ctx, atts);
-    }
-}
-
-static void
-rsvg_end_element (void *data, const xmlChar *name)
-{
-  RsvgCtx *ctx = (RsvgCtx *)data;
-
-  if (ctx->handler_nest > 0)
-    {
-      if (ctx->handler->end_element != NULL)
-	ctx->handler->end_element (ctx->handler, name);
-      ctx->handler_nest--;
-    }
-  else
-    {
-      if (ctx->handler != NULL)
-	{
-	  ctx->handler->free (ctx->handler);
-	  ctx->handler = NULL;
-	}
-      
-      if (!strcmp ((char *)name, "g"))
-	rsvg_end_g (ctx);
-
-      /* pop the state stack */
-      ctx->n_state--;
-      rsvg_state_finalize (&ctx->state[ctx->n_state]);
-
-#ifdef VERBOSE
-      fprintf (stdout, "SAX.endElement(%s)\n", (char *) name);
-#endif
-    }
-}
-
-static void
-rsvg_characters (void *data, const xmlChar *ch, int len)
-{
-  RsvgCtx *ctx = (RsvgCtx *)data;
-
-  if (ctx->handler && ctx->handler->characters != NULL)
-    ctx->handler->characters (ctx->handler, ch, len);
-}
-
-static xmlEntityPtr
-rsvg_get_entity (void *data, const xmlChar *name)
-{
-  RsvgCtx *ctx = (RsvgCtx *)data;
-
-  return (xmlEntityPtr)g_hash_table_lookup (ctx->entities, name);
-}
-
-static void
-rsvg_entity_decl (void *data, const xmlChar *name, int type,
-		  const xmlChar *publicId, const xmlChar *systemId, xmlChar *content)
-{
-  RsvgCtx *ctx = (RsvgCtx *)data;
-  GHashTable *entities = ctx->entities;
-  xmlEntityPtr entity;
-  char *dupname;
-
-  entity = g_new (xmlEntity, 1);
-  entity->type = type;
-  entity->len = strlen (name);
-  dupname = g_strdup (name);
-  entity->name = dupname;
-  entity->ExternalID = g_strdup (publicId);
-  entity->SystemID = g_strdup (systemId);
-  entity->content = xmlMemStrdup (content);
-  entity->length = strlen (content);
-  entity->orig = NULL;
-  g_hash_table_insert (entities, dupname, entity);
-}
-
-static xmlSAXHandler rsvgSAXHandlerStruct = {
-    NULL, /* internalSubset */
-    NULL, /* isStandalone */
-    NULL, /* hasInternalSubset */
-    NULL, /* hasExternalSubset */
-    NULL, /* resolveEntity */
-    rsvg_get_entity, /* getEntity */
-    rsvg_entity_decl, /* entityDecl */
-    NULL, /* notationDecl */
-    NULL, /* attributeDecl */
-    NULL, /* elementDecl */
-    NULL, /* unparsedEntityDecl */
-    NULL, /* setDocumentLocator */
-    NULL, /* startDocument */
-    NULL, /* endDocument */
-    rsvg_start_element, /* startElement */
-    rsvg_end_element, /* endElement */
-    NULL, /* reference */
-    rsvg_characters, /* characters */
-    NULL, /* ignorableWhitespace */
-    NULL, /* processingInstruction */
-    NULL, /* comment */
-    NULL, /* xmlParserWarning */
-    NULL, /* xmlParserError */
-    NULL, /* xmlParserError */
-    NULL, /* getParameterEntity */
-};
-
-static xmlSAXHandlerPtr rsvgSAXHandler = &rsvgSAXHandlerStruct;
-
-GdkPixbuf *
-rsvg_render_file (FILE *f, double zoom)
-{
-  int res;
-  char chars[10];
-  xmlParserCtxtPtr ctxt;
-  RsvgCtx *ctx;
-  GdkPixbuf *result;
-
-  ctx = rsvg_ctx_new ();
-  ctx->zoom = zoom;
-  res = fread(chars, 1, 4, f);
-  if (res > 0) {
-    ctxt = xmlCreatePushParserCtxt(rsvgSAXHandler, ctx,
-				   chars, res, "filename XXX");
-    ctxt->replaceEntities = TRUE;
-    while ((res = fread(chars, 1, 3, f)) > 0) {
-      xmlParseChunk(ctxt, chars, res, 0);
-    }
-    xmlParseChunk(ctxt, chars, 0, 1);
-    xmlFreeParserCtxt(ctxt);
-  }
-  result = ctx->pixbuf;
-  rsvg_ctx_free (ctx);
-  return result;
-}
-
-#ifdef RSVG_MAIN
-static void
-write_pixbuf (ArtPixBuf *pixbuf)
-{
-  int y;
-  printf ("P6\n%d %d\n255\n", pixbuf->width, pixbuf->height);
-  for (y = 0; y < pixbuf->height; y++)
-    fwrite (pixbuf->pixels + y * pixbuf->rowstride, 1, pixbuf->width * 3,
-	    stdout);
-}
-
-int
-main (int argc, char **argv)
-{
-  FILE *f;
-  ArtPixBuf *pixbuf;
-
-  if (argc == 1)
-    f = stdin;
-  else
-    {
-      f = fopen (argv[1], "r");
-      if (f == NULL)
-	{
-	  fprintf (stderr, "Error opening source file %s\n", argv[1]);
-	}
-    }
-
-  pixbuf = rsvg_render_file (f);
-
-  if (f != stdin)
-    fclose (f);
-
-  write_pixbuf (pixbuf);
-
-  return 0;
-}
-#endif
diff --git a/librsvg/rsvg.h b/librsvg/rsvg.h
deleted file mode 100644
index ae5e1dcd7..000000000
--- a/librsvg/rsvg.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
-   rsvg.h: SAX-based renderer for SVG files into a GdkPixbuf.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Raph Levien <raph@artofcode.com>
-*/
-
-#ifndef RSVG_H
-#define RSVG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-GdkPixbuf *
-rsvg_render_file (FILE *f, double zoom);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/librsvg/subpixel-text-test b/librsvg/subpixel-text-test
deleted file mode 100644
index d68e6aefa..000000000
--- a/librsvg/subpixel-text-test
+++ /dev/null
@@ -1,18 +0,0 @@
-This is a test of subpixel positioning.
-
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-cccccccccccccccccccccccccccccccccccccccc
-dddddddddddddddddddddddddddddddddddddddd
-eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-ffffffffffffffffffffffffffffffffffffffff
-gggggggggggggggggggggggggggggggggggggggg
-hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
-iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
-jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
-kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
-llllllllllllllllllllllllllllllllllllllll
-mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
-nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
-
-We now return you to your regularly scheduled programming.
\ No newline at end of file
diff --git a/librsvg/test-ft-gtk.c b/librsvg/test-ft-gtk.c
deleted file mode 100644
index 8f2a53d7a..000000000
--- a/librsvg/test-ft-gtk.c
+++ /dev/null
@@ -1,459 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   test-ft-gtk.c: Testbed for freetype/libart integration.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Raph Levien <raph@artofcode.com>
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <png.h>
-#include <popt.h>
-#include <math.h>
-#include <sys/time.h>
-#include <unistd.h>
-
-#include <gtk/gtk.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include <freetype/freetype.h>
-
-#include <libart_lgpl/art_misc.h>
-#include <libart_lgpl/art_rect.h>
-#include <libart_lgpl/art_alphagamma.h>
-#include <libart_lgpl/art_affine.h>
-#include "art_render.h"
-#include "art_render_mask.h"
-
-#include "rsvg.h"
-#include "rsvg-ft.h"
-
-typedef struct _TestCtx TestCtx;
-
-struct _TestCtx {
-	RsvgFTCtx *ctx;
-	RsvgFTFontHandle fh;
-	int n_lines;
-	char **lines;
-	int y_sp;
-	int y_scroll;
-	GtkWidget *drawingarea;
-	GtkWidget *status;
-	double start_time;
-	gboolean do_drawing;
-	gboolean do_scrolling;
-	gboolean do_invert;
-};
-
-static double
-timing_get_time (void)
-{
-	struct timeval tv;
-	struct timezone tz;
-
-	gettimeofday (&tv, &tz);
-
-	return tv.tv_sec + 1e-6 * tv.tv_usec;
-}
-
-static void invert_glyph (guchar *buf, int rowstride, int width, int height)
-{
-	int x, y;
-	int first;
-	int n_words;
-	int last;
-	guint32 *middle;
-
-	if (width >= 8 && ((rowstride & 3) == 0)) {
-		first = (-(long)buf) & 3;
-		n_words = (width - first) >> 2;
-		last = first + (n_words << 2);
-
-		for (y = 0; y < height; y++) {
-			middle = (guint32 *)(buf + first);
-			for (x = 0; x < first; x++)
-				buf[x] = ~buf[x];
-			for (x = 0; x < n_words; x++)
-				middle[x] = ~middle[x];
-			for (x = last; x < width; x++)
-				buf[x] = ~buf[x];
-			buf += rowstride;
-		}
-	} else {
-		for (y = 0; y < height; y++) {
-			for (x = 0; x < width; x++)
-				buf[x] = ~buf[x];
-			buf += rowstride;
-		}
-	}
-}
-
-static void draw_line (TestCtx *ctx, int line_num, ArtIRect *rect)
-{
-	GtkWidget *drawingarea = ctx->drawingarea;
-	int y0;
-	RsvgFTGlyph *glyph;
-	const double affine[6] = { 1, 0, 0, 1, 5, 12 };
-	int glyph_xy[2];
-	ArtIRect line_rect, clear_rect, glyph_rect, draw_rect;
-	int width;
-
-	width = drawingarea->allocation.width;
-
-	y0 = line_num * ctx->y_sp - ctx->y_scroll;
-	if (line_num < 0 || line_num >= ctx->n_lines) {
-		if (ctx->do_drawing) {
-			gdk_draw_rectangle (drawingarea->window,
-					    drawingarea->style->white_gc,
-					    TRUE,
-					    0, y0, width, ctx->y_sp);
-		}
-	} else {
-		guchar *buf;
-		int rowstride;
-
-		glyph = rsvg_ft_render_string (ctx->ctx, ctx->fh,
-					       ctx->lines[line_num],
-					       strlen (ctx->lines[line_num]),
-					       14, 14,
-					       affine,
-					       glyph_xy);
-		rowstride = glyph->rowstride;
-
-		glyph_rect.x0 = glyph_xy[0];
-		glyph_rect.y0 = y0 + glyph_xy[1];
-		glyph_rect.x1 = glyph_rect.x0 + glyph->width;
-		glyph_rect.y1 = glyph_rect.y0 + glyph->height;
-		line_rect.x0 = 0;
-		line_rect.y0 = y0;
-		line_rect.x1 = width;
-		line_rect.y1 = y0 + ctx->y_sp;
-		art_irect_intersect (&clear_rect, rect, &line_rect);
-
-		if (ctx->do_drawing)
-			gdk_draw_rectangle (drawingarea->window,
-					    drawingarea->style->white_gc,
-					    TRUE,
-					    clear_rect.x0, clear_rect.y0,
-					    clear_rect.x1 - clear_rect.x0,
-					    clear_rect.y1 - clear_rect.y0);
-
-		art_irect_intersect (&draw_rect, rect, &glyph_rect);
-		if (!art_irect_empty (&draw_rect) && ctx->do_drawing) {
-			buf = glyph->buf +
-				draw_rect.x0 - glyph_rect.x0 +
-				rowstride * (draw_rect.y0 - glyph_rect.y0);
-			if (ctx->do_invert) {
-				invert_glyph (buf, rowstride,
-					      draw_rect.x1 - draw_rect.x0,
-					      draw_rect.y1 - draw_rect.y0);
-			}
-			gdk_draw_gray_image (drawingarea->window,
-					     drawingarea->style->white_gc,
-					     draw_rect.x0, draw_rect.y0,
-					     draw_rect.x1 - draw_rect.x0,
-					     draw_rect.y1 - draw_rect.y0,
-					     GDK_RGB_DITHER_NONE,
-					     buf,
-					     rowstride);
-		}
-		rsvg_ft_glyph_unref (glyph);
-	}
-}
-
-static gint
-test_expose (GtkWidget *widget, GdkEventExpose *event, TestCtx *ctx)
-{
-	int line0, line1;
-	int line;
-	ArtIRect rect;
-
-	rect.x0 = event->area.x;
-	rect.y0 = event->area.y;
-	rect.x1 = rect.x0 + event->area.width;
-	rect.y1 = rect.y0 + event->area.height;
-	line0 = (rect.y0 + ctx->y_scroll) / ctx->y_sp;
-	line1 = (rect.y1 + ctx->y_scroll + ctx->y_sp - 1) / ctx->y_sp;
-	for (line = line0; line < line1; line++) {
-#ifdef VERBOSE
-		g_print ("drawing line %d of [%d..%d]\n", line, line0, line1 - 1);
-#endif
-		draw_line (ctx, line, &rect);
-	}
-	return FALSE;
-}
-
-static void
-scroll_to (TestCtx *ctx, int new_y)
-{
-	GtkWidget *drawingarea = ctx->drawingarea;
-	int scroll_amt = new_y - ctx->y_scroll;
-	int width = drawingarea->allocation.width;
-	int height = drawingarea->allocation.height;
-	int y0, y1;
-	GdkEventExpose expose;
-
-	if (scroll_amt == 0)
-		return;
-
-#ifdef VERBOSE
-	g_print ("scrolling to %d\n", new_y);
-#endif
-	if (scroll_amt > 0 && scroll_amt < height) {
-		y0 = height - scroll_amt;
-		y1 = height;
-		if (ctx->do_scrolling) {
-			gdk_draw_pixmap (drawingarea->window,
-					 drawingarea->style->white_gc,
-					 drawingarea->window,
-					 0, scroll_amt,
-					 0, 0,
-					 width, y0);
-		}
-	} else if (scroll_amt < 0 && -scroll_amt < height) {
-		y0 = 0;
-		y1 = -scroll_amt;
-		if (ctx->do_scrolling) {
-			gdk_draw_pixmap (drawingarea->window,
-					 drawingarea->style->white_gc,
-					 drawingarea->window,
-					 0, 0,
-					 0, y1,
-					 width, height - y1);
-		}
-	} else {
-		y0 = 0;
-		y1 = height;
-	}
-	ctx->y_scroll = new_y;
-	expose.area.x = 0;
-	expose.area.width = width;
-	expose.area.y = y0;
-	expose.area.height = y1 - y0;
-	test_expose (drawingarea, &expose, ctx);
-}
-
-static gboolean scroll_idler (gpointer data)
-{
-	TestCtx *ctx = (TestCtx *)data;
-	GtkWidget *drawingarea = ctx->drawingarea;
-	int width = drawingarea->allocation.width;
-	int height = drawingarea->allocation.height;
-
-	if ((ctx->y_scroll + height) < ctx->n_lines * ctx->y_sp) {
-		scroll_to (ctx, ctx->y_scroll + 100);
-		return TRUE;
-	} else {
-		double elapsed;
-		char str[128];
-
-		scroll_to (ctx, 0);
-		elapsed = timing_get_time () - ctx->start_time;
-		sprintf (str, "%g seconds to scroll, %g Mpix/s",
-			 elapsed,
-			 width * ctx->y_sp * ctx->n_lines * 1e-6 / elapsed);
-		gtk_label_set_text (GTK_LABEL (ctx->status), str);
-		return FALSE;
-	}
-}
-
-static void
-check_toggle (GtkWidget *button, int state, gboolean *bool) {
-	*bool = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
-}
-
-static GtkWidget *
-check_button (const char *label, gboolean *bool) {
-	GtkWidget *result;
-
-	result = gtk_check_button_new_with_label (label);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (result), *bool);
-	gtk_signal_connect (GTK_OBJECT (result), "state_changed",
-			    (GtkSignalFunc) check_toggle, bool);
-	return result;
-}
-
-static void
-start_scrolling (GtkWidget *widget, TestCtx *ctx)
-{
-	scroll_to (ctx, 0);
-	gtk_idle_add (scroll_idler, ctx);
-	ctx->start_time = timing_get_time ();
-	gtk_label_set_text (GTK_LABEL (ctx->status), "Scrolling...");
-}
-
-static void
-test_ft_quit (GtkWidget *widget, TestCtx *ctx)
-{
-	rsvg_ft_ctx_done (ctx->ctx);
-	gtk_main_quit ();
-}
-
-static TestCtx *new_test_window (const char *fn, const char *afn,
-				 int width, int height)
-{
-	GtkWidget *topwin;
-	GtkWidget *vbox;
-	GtkWidget *buttonbar;
-	GtkWidget *button;
-	GtkWidget *drawingarea;
-	TestCtx *ctx;
-
-	ctx = g_new (TestCtx, 1);
-
-	topwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_signal_connect (GTK_OBJECT (topwin), "destroy",
-			    (GtkSignalFunc) test_ft_quit, ctx);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (topwin), vbox);
-
-	drawingarea = gtk_drawing_area_new ();
-	gtk_drawing_area_size (GTK_DRAWING_AREA (drawingarea), width, height);
-	gtk_box_pack_start (GTK_BOX (vbox), drawingarea, TRUE, TRUE, 0);
-
-	ctx->ctx = rsvg_ft_ctx_new ();
-	ctx->fh = rsvg_ft_intern (ctx->ctx, fn);
-	if (afn) rsvg_ft_font_attach (ctx->ctx, ctx->fh, afn);
-	ctx->n_lines = 0;
-	ctx->lines = NULL;
-	ctx->y_sp = 16;
-	ctx->y_scroll = 0;
-	ctx->drawingarea = drawingarea;
-
-	ctx->do_drawing = TRUE;
-	ctx->do_scrolling = TRUE;
-	ctx->do_invert = TRUE;
-
-	gtk_signal_connect (GTK_OBJECT (drawingarea), "expose_event",
-			    (GtkSignalFunc) test_expose, ctx);
-
-	buttonbar = gtk_hbox_new (FALSE, 5);
-	gtk_box_pack_start (GTK_BOX (vbox), buttonbar, FALSE, FALSE, 0);
-
-	button = check_button ("Do drawing", &ctx->do_drawing);
-	gtk_container_add (GTK_CONTAINER (buttonbar), button);
-
-	button = check_button ("Do scrolling", &ctx->do_scrolling);
-	gtk_container_add (GTK_CONTAINER (buttonbar), button);
-
-	button = check_button ("Do invert", &ctx->do_invert);
-	gtk_container_add (GTK_CONTAINER (buttonbar), button);
-
-	button = gtk_button_new_with_label ("Start scroll test");
-	gtk_container_add (GTK_CONTAINER (buttonbar), button);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    (GtkSignalFunc) start_scrolling, ctx);
-
-	ctx->status = gtk_label_new ("");
-	gtk_box_pack_start (GTK_BOX (vbox), ctx->status, FALSE, FALSE, 2);
-
-	gtk_widget_show_all (topwin);
-
-	return ctx;
-}
-
-static void set_text (TestCtx *ctx, const char *fn) {
-	FILE *f;
-	char line[256];
-	int n_lines;
-	char **lines;
-
-	lines = NULL;
-
-	f = fopen (fn, "r");
-	if (f == NULL) {
-		g_warning ("Error opening file %s\n", fn);
-		return;
-	}
-	n_lines = 0;
-	for (;;) {
-		int len;
-
-		if (fgets (line, sizeof(line), f) == NULL)
-			break;
-		if (n_lines == 0)
-			lines = g_new (char *, 1);
-		else if (!(n_lines & (n_lines - 1))) {
-			lines = g_renew (char *, lines, n_lines << 1);
-		}
-
-		g_assert (lines != NULL);
-
-		len = strlen (line);
-	        if (len > 0 && line[len - 1] == '\n')
-			line[--len] = 0;
-	        while (len > 0 && line[len - 1] == '\r')
-			line[--len] = 0;
-		lines[n_lines++] = g_strdup (line);
-	}
-	fclose (f);
-	ctx->n_lines = n_lines;
-	ctx->lines = lines;
-}
-
-int main(int argc, char **argv)
-{
-	char *zoom_str = "1.0";
-	
- 	gint	font_width = 36;
- 	gint	font_height = 36;
-	char	*font_file_name = "/usr/share/fonts/default/Type1/n021003l.pfb";
-	char	*add_font_file_name = NULL;
-	char *text_file_name = "rsvg-ft.c";
-
-	poptContext optCtx;
-	struct poptOption optionsTable[] = 
-	{
-		{"zoom", 'z', POPT_ARG_STRING, &zoom_str, 0, NULL, "zoom factor"},
-		{"font-width", 'w', POPT_ARG_INT, &font_width, 0, NULL, "Font Width"},
-		{"font-height", 'h', POPT_ARG_INT, &font_height, 0, NULL, "Font Height"},
-		{"font-file-name", 'f', POPT_ARG_STRING, &font_file_name, 0, NULL, "Font File Name"},
-		{"add-font-file-name", 'a', POPT_ARG_STRING, &add_font_file_name, 0, NULL, "Additional Font File Name"},
-		{"text-file-name", 't', POPT_ARG_STRING, &text_file_name, 0, NULL, "Text"},
-		POPT_AUTOHELP {NULL, 0, 0, NULL, 0}
-	};
-	char c;
-	const char *const *args;
-	TestCtx *ctx;
-
-	gtk_init (&argc, &argv);
-
-	gdk_rgb_init ();
-
-	gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
-	gtk_widget_set_default_visual (gdk_rgb_get_visual ());
-
-	optCtx =
-	    poptGetContext("test-ft", argc, (const char **) argv,
-			   optionsTable, 0);
-
-	c = poptGetNextOpt(optCtx);
-	args = poptGetArgs(optCtx);
-
-	ctx = new_test_window (font_file_name, add_font_file_name, 640, 480);
-
-	set_text (ctx, text_file_name);
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/librsvg/test-ft.c b/librsvg/test-ft.c
deleted file mode 100644
index 710ad3047..000000000
--- a/librsvg/test-ft.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   test-ft.c: Testbed for freetype/libart integration.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Raph Levien <raph@artofcode.com>
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <png.h>
-#include <popt.h>
-#include <math.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include <freetype/freetype.h>
-
-#include <libart_lgpl/art_misc.h>
-#include <libart_lgpl/art_rect.h>
-#include <libart_lgpl/art_alphagamma.h>
-#include <libart_lgpl/art_affine.h>
-#include <libart_lgpl/art_affine.h>
-#include "art_render.h"
-#include "art_render_mask.h"
-
-#include "rsvg.h"
-#include "rsvg-ft.h"
-
-#if 0
-typedef struct _ArtMaskSourceFT ArtMaskSourceFT;
-
-struct _ArtMaskSourceFT {
-	ArtMaskSource super;
-	ArtRender *render;
-	art_boolean first;
-	const RsvgFTFont *font;
-	const char *text;
-};
-
-void
-art_render_freetype(ArtRender * render, const RsvgFTFont * font,
-		    const char *text, double sx, double sy,
-		    const double affine[6]);
-
-static void
-art_render_ft_done(ArtRenderCallback * self, ArtRender * render)
-{
-	art_free(self);
-}
-
-static int
-art_render_ft_can_drive(ArtMaskSource * self, ArtRender * render)
-{
-	return 0;
-}
-
-static void
-art_render_ft_render(ArtRenderCallback * self, ArtRender * render,
-		     art_u8 * dest, int y)
-{
-}
-
-static void
-art_render_ft_prepare(ArtMaskSource *self, ArtRender *render,
-		      art_boolean first)
-{
-	ArtMaskSourceFT *z = (ArtMaskSourceFT *) self;
-
-	z->first = first;
-	z->super.super.render = art_render_ft_render;
-}
-
-void
-art_render_freetype(ArtRender * render, const RsvgFTFont *font,
-		    const char *text, double sx, double sy,
-		    const double affine[6])
-{
-	ArtMaskSourceFT *mask_source = art_new(ArtMaskSourceFT, 1);
-
-	mask_source->super.super.render = NULL;
-	mask_source->super.super.done = art_render_ft_done;
-	mask_source->super.can_drive = art_render_ft_can_drive;
-	mask_source->super.invoke_driver = NULL;
-	mask_source->super.prepare = art_render_ft_prepare;
-	mask_source->render = render;
-	mask_source->font = font;
-	mask_source->text = text;
-
-	art_render_add_mask_source(render, &mask_source->super);
-}
-#endif
-
-/* The following routine is lifted wholesale from nautilus-icon-factory.c.
-   It should find a permanent home somewhere else, at which point it should
-   be deleted here and simply linked. -RLL
-*/
-
-/* utility routine for saving a pixbuf to a png file.
- * This was adapted from Iain Holmes' code in gnome-iconedit, and probably
- * should be in a utility library, possibly in gdk-pixbuf itself.
- * 
- * It is split up into save_pixbuf_to_file and save_pixbuf_to_file_internal
- * to work around a gcc warning about handle possibly getting clobbered by
- * longjmp. Declaring handle 'volatile FILE *' didn't work as it should have.
- */
-static gboolean
-save_pixbuf_to_file_internal (GdkPixbuf *pixbuf, char *filename, FILE *handle)
-{
-  	char *buffer;
-	gboolean has_alpha;
-	int width, height, depth, rowstride;
-  	guchar *pixels;
-  	png_structp png_ptr;
-  	png_infop info_ptr;
-  	png_text text[2];
-  	int i;
-	
-	png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-	if (png_ptr == NULL) {
-		return FALSE;
-	}
-
-	info_ptr = png_create_info_struct (png_ptr);
-	if (info_ptr == NULL) {
-		png_destroy_write_struct (&png_ptr, (png_infopp)NULL);
-	    	return FALSE;
-	}
-
-	if (setjmp (png_ptr->jmpbuf)) {
-		png_destroy_write_struct (&png_ptr, &info_ptr);
-		return FALSE;
-	}
-
-	png_init_io (png_ptr, (FILE *)handle);
-
-        has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
-	width = gdk_pixbuf_get_width (pixbuf);
-	height = gdk_pixbuf_get_height (pixbuf);
-	depth = gdk_pixbuf_get_bits_per_sample (pixbuf);
-	pixels = gdk_pixbuf_get_pixels (pixbuf);
-	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-
-	png_set_IHDR (png_ptr, info_ptr, width, height,
-			depth, PNG_COLOR_TYPE_RGB_ALPHA,
-			PNG_INTERLACE_NONE,
-			PNG_COMPRESSION_TYPE_DEFAULT,
-			PNG_FILTER_TYPE_DEFAULT);
-
-	/* Some text to go with the png image */
-	text[0].key = "Title";
-	text[0].text = filename;
-	text[0].compression = PNG_TEXT_COMPRESSION_NONE;
-	text[1].key = "Software";
-	text[1].text = "Test-Rsvg";
-	text[1].compression = PNG_TEXT_COMPRESSION_NONE;
-	png_set_text (png_ptr, info_ptr, text, 2);
-
-	/* Write header data */
-	png_write_info (png_ptr, info_ptr);
-
-	/* if there is no alpha in the data, allocate buffer to expand into */
-	if (has_alpha) {
-		buffer = NULL;
-	} else {
-		buffer = g_malloc(4 * width);
-	}
-	
-	/* pump the raster data into libpng, one scan line at a time */	
-	for (i = 0; i < height; i++) {
-		if (has_alpha) {
-			png_bytep row_pointer = pixels;
-			png_write_row (png_ptr, row_pointer);
-		} else {
-			/* expand RGB to RGBA using an opaque alpha value */
-			int x;
-			char *buffer_ptr = buffer;
-			char *source_ptr = pixels;
-			for (x = 0; x < width; x++) {
-				*buffer_ptr++ = *source_ptr++;
-				*buffer_ptr++ = *source_ptr++;
-				*buffer_ptr++ = *source_ptr++;
-				*buffer_ptr++ = 255;
-			}
-			png_write_row (png_ptr, (png_bytep) buffer);		
-		}
-		pixels += rowstride;
-	}
-	
-	png_write_end (png_ptr, info_ptr);
-	png_destroy_write_struct (&png_ptr, &info_ptr);
-	
-	g_free (buffer);
-
-	return TRUE;
-}
-
-static gboolean
-save_pixbuf_to_file (GdkPixbuf *pixbuf, char *filename)
-{
-	FILE *handle;
-	gboolean result;
-
-	g_return_val_if_fail (pixbuf != NULL, FALSE);
-	g_return_val_if_fail (filename != NULL, FALSE);
-	g_return_val_if_fail (filename[0] != '\0', FALSE);
-
-	if (!strcmp (filename, "-")) {
-		handle = stdout;
-	} else {
-		handle = fopen (filename, "wb");
-	}
-
-        if (handle == NULL) {
-        	return FALSE;
-	}
-
-	result = save_pixbuf_to_file_internal (pixbuf, filename, handle);
-	if (!result || handle != stdout)
-		fclose (handle);
-
-	return result;
-}
-
-static void test_pixmap_destroy(guchar * pixels, gpointer data)
-{
-	g_free(pixels);
-}
-
-#if 0
-/**
- * pixbuf_from_rsvg_ft_glyph: Create a GdkPixbuf from a glyph.
- * @glyph: The glyph to render as a pixbuf.
- * @rgb: Foreground color for rendering.
- * 
- * Renders a glyph as a transparent pixbuf, with foreground color @rgb.
- *
- * Return value: the resulting GdkPixbuf.
- **/
-static GdkPixbuf *
-pixbuf_from_rsvg_ft_glyph (RsvgFTGlyph *glyph, guint32 rgb)
-{
-	GdkPixbuf *pixbuf;
-	int width = glyph->x1 - glyph->x0;
-	int height = glyph->y1 - glyph->y0;
-	int rowstride;
-	art_u8 *pixels;
-	int x, y;
-	const guchar *src_line;
-	art_u8 *dst_line;
-	const art_u8 r = (rgb >> 16) & 0xff;
-	const art_u8 g = (rgb >> 8) & 0xff;
-	const art_u8 b = rgb & 0xff;
-
-	fprintf (stderr, "xpen, ypen = (%f, %f)\n", glyph->xpen, glyph->ypen);
-
-	rowstride = width << 2;
-	pixels = g_new (art_u8, rowstride * height);
-	src_line = glyph->buf;
-	dst_line = pixels;
-	for (y = 0; y < height; y++) {
-		for (x = 0; x < width; x++) {
-			dst_line[x * 4] = r;
-			dst_line[x * 4 + 1] = g;
-			dst_line[x * 4 + 2] = b;
-			dst_line[x * 4 + 3] = src_line[x];
-		}
-		src_line += glyph->rowstride;
-		dst_line += rowstride;
-	}
-	pixbuf = gdk_pixbuf_new_from_data (pixels,
-					   GDK_COLORSPACE_RGB,
-					   1, 8,
-					   width, height, rowstride,
-					   test_pixmap_destroy,
-					   NULL);
-	return pixbuf;
-}
-#endif
-
-static GdkPixbuf *
-glyph_render_test (RsvgFTGlyph *glyph, int glyph_xy[2]) {
-	GdkPixbuf *pixbuf;
-	art_u8 *pixels;
-	int width;
-	int height;
-	int rowstride;
-	ArtRender *render;
-	ArtPixMaxDepth color[3] = {ART_PIX_MAX_FROM_8(0x80), 0, 0 };
-
-	width = glyph->width;
-	height = glyph->height;
-
-	width = 200;
-	height = 200;
-
-	rowstride = width << 2;
-	pixels = g_new (art_u8, rowstride * height);
-
-	render = art_render_new (0, 0, width, height,
-				 pixels, rowstride,
-				 3, 8, ART_ALPHA_SEPARATE, NULL);
-	art_render_image_solid (render, color);
-	art_render_mask (render,
-			 glyph_xy[0], glyph_xy[1],
-			 glyph_xy[0] + glyph->width, glyph_xy[1] + glyph->height,
-			 glyph->buf, glyph->rowstride);
-	art_render_invoke (render);
-
-	pixbuf = gdk_pixbuf_new_from_data (pixels,
-					   GDK_COLORSPACE_RGB,
-					   1, 8,
-					   width, height, rowstride,
-					   test_pixmap_destroy,
-					   NULL);
-	return pixbuf;
-}
-
-int main(int argc, char **argv)
-{
-	char *out_fn;
-	GdkPixbuf *pixbuf;
-	char *zoom_str = "1.0";
-	int n_iter = 1;
-	
- 	gint	font_width = 36;
- 	gint	font_height = 36;
-	char	*font_file_name = "/usr/share/fonts/default/Type1/n021003l.pfb";
-
-	poptContext optCtx;
-	struct poptOption optionsTable[] = 
-	{
-		{"zoom", 'z', POPT_ARG_STRING, &zoom_str, 0, NULL, "zoom factor"},
-		{"num-iter", 'n', POPT_ARG_INT, &n_iter, 0, NULL, "number of iterations"},
-		{"font-width", 'w', POPT_ARG_INT, &font_width, 0, NULL, "Font Width"},
-		{"font-height", 'h', POPT_ARG_INT, &font_height, 0, NULL, "Font Height"},
-		{"font-file-name", 'f', POPT_ARG_STRING, &font_file_name, 0, NULL, "Font File Name"},
-		POPT_AUTOHELP {NULL, 0, 0, NULL, 0}
-	};
-	char c;
-	const char *const *args;
-	int i;
-
-	RsvgFTCtx *ctx;
-	RsvgFTFontHandle fh;
-
-#if 1
-	const double affine[6] = { .707, -.707, .707, .707, 10, 150 };
-#else
- 	double affine[6];
-	art_affine_identity (affine);
-#endif
-
-	optCtx =
-	    poptGetContext("test-ft", argc, (const char **) argv,
-			   optionsTable, 0);
-
-	c = poptGetNextOpt(optCtx);
-	args = poptGetArgs(optCtx);
-
-	if (args == NULL || args[0] == NULL)
-		out_fn = "-";
-	else
-		out_fn = (char *) args[0];
-
-	ctx = rsvg_ft_ctx_new ();
-	fh = rsvg_ft_intern (ctx, font_file_name);
-
-	for (i = 0; i < n_iter; i++) {
-		RsvgFTGlyph *glyph;
-		int glyph_xy[2];
-
-
-		glyph = rsvg_ft_render_string (ctx, fh, 
-					       "graphic(s)", 
-					       strlen ("graphic(s)"),
-					       font_width, 
-					       font_height,
-					       affine, 
-					       glyph_xy);
-
-/* 		fprintf (stderr, "xpen, ypen = (%f, %f)\n", glyph->xpen, glyph->ypen); */
-/* 		fprintf (stderr, "glyph_xy = (%d, %d)\n", glyph_xy[0], glyph_xy[1]); */
-
- 		glyph_xy[0] = 0; /* += glyph->xpen; */
- 		glyph_xy[1] = 0; /* += glyph->ypen; */
-
-		pixbuf = glyph_render_test (glyph, glyph_xy);
-
-		if (pixbuf != NULL) {
-			if (n_iter > 1)
-				gdk_pixbuf_unref(pixbuf);
-			else
-				save_pixbuf_to_file(pixbuf, out_fn);
-		} else {
-			fprintf(stderr, "Error rendering.\n");
-			return 1;
-		}
-	}
-
-	return 0;
-}
diff --git a/librsvg/test-rsvg.c b/librsvg/test-rsvg.c
deleted file mode 100644
index 49c591619..000000000
--- a/librsvg/test-rsvg.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   test-rsvg.c: Command line utility for exercising rsvg.
- 
-   Copyright (C) 2000 Eazel, Inc.
-  
-   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.
-  
-   Author: Raph Levien <raph@artofcode.com>
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <png.h>
-#include <popt.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "rsvg.h"
-
-
-/* The following routine is lifted wholesale from nautilus-icon-factory.c.
-   It should find a permanent home somewhere else, at which point it should
-   be deleted here and simply linked. -RLL
-*/
-
-/* utility routine for saving a pixbuf to a png file.
- * This was adapted from Iain Holmes' code in gnome-iconedit, and probably
- * should be in a utility library, possibly in gdk-pixbuf itself.
- * 
- * It is split up into save_pixbuf_to_file and save_pixbuf_to_file_internal
- * to work around a gcc warning about handle possibly getting clobbered by
- * longjmp. Declaring handle 'volatile FILE *' didn't work as it should have.
- */
-static gboolean
-save_pixbuf_to_file_internal (GdkPixbuf *pixbuf, char *filename, FILE *handle)
-{
-  	char *buffer;
-	gboolean has_alpha;
-	int width, height, depth, rowstride;
-  	guchar *pixels;
-  	png_structp png_ptr;
-  	png_infop info_ptr;
-  	png_text text[2];
-  	int i;
-	
-	png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-	if (png_ptr == NULL) {
-		return FALSE;
-	}
-
-	info_ptr = png_create_info_struct (png_ptr);
-	if (info_ptr == NULL) {
-		png_destroy_write_struct (&png_ptr, (png_infopp)NULL);
-	    	return FALSE;
-	}
-
-	if (setjmp (png_ptr->jmpbuf)) {
-		png_destroy_write_struct (&png_ptr, &info_ptr);
-		return FALSE;
-	}
-
-	png_init_io (png_ptr, (FILE *)handle);
-
-        has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
-	width = gdk_pixbuf_get_width (pixbuf);
-	height = gdk_pixbuf_get_height (pixbuf);
-	depth = gdk_pixbuf_get_bits_per_sample (pixbuf);
-	pixels = gdk_pixbuf_get_pixels (pixbuf);
-	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-
-	png_set_IHDR (png_ptr, info_ptr, width, height,
-			depth, PNG_COLOR_TYPE_RGB_ALPHA,
-			PNG_INTERLACE_NONE,
-			PNG_COMPRESSION_TYPE_DEFAULT,
-			PNG_FILTER_TYPE_DEFAULT);
-
-	/* Some text to go with the png image */
-	text[0].key = "Title";
-	text[0].text = filename;
-	text[0].compression = PNG_TEXT_COMPRESSION_NONE;
-	text[1].key = "Software";
-	text[1].text = "Test-Rsvg";
-	text[1].compression = PNG_TEXT_COMPRESSION_NONE;
-	png_set_text (png_ptr, info_ptr, text, 2);
-
-	/* Write header data */
-	png_write_info (png_ptr, info_ptr);
-
-	/* if there is no alpha in the data, allocate buffer to expand into */
-	if (has_alpha) {
-		buffer = NULL;
-	} else {
-		buffer = g_malloc(4 * width);
-	}
-	
-	/* pump the raster data into libpng, one scan line at a time */	
-	for (i = 0; i < height; i++) {
-		if (has_alpha) {
-			png_bytep row_pointer = pixels;
-			png_write_row (png_ptr, row_pointer);
-		} else {
-			/* expand RGB to RGBA using an opaque alpha value */
-			int x;
-			char *buffer_ptr = buffer;
-			char *source_ptr = pixels;
-			for (x = 0; x < width; x++) {
-				*buffer_ptr++ = *source_ptr++;
-				*buffer_ptr++ = *source_ptr++;
-				*buffer_ptr++ = *source_ptr++;
-				*buffer_ptr++ = 255;
-			}
-			png_write_row (png_ptr, (png_bytep) buffer);		
-		}
-		pixels += rowstride;
-	}
-	
-	png_write_end (png_ptr, info_ptr);
-	png_destroy_write_struct (&png_ptr, &info_ptr);
-	
-	g_free (buffer);
-
-	return TRUE;
-}
-
-static gboolean
-save_pixbuf_to_file (GdkPixbuf *pixbuf, char *filename)
-{
-	FILE *handle;
-	gboolean result;
-
-	g_return_val_if_fail (pixbuf != NULL, FALSE);
-	g_return_val_if_fail (filename != NULL, FALSE);
-	g_return_val_if_fail (filename[0] != '\0', FALSE);
-
-	if (!strcmp (filename, "-")) {
-		handle = stdout;
-	} else {
-		handle = fopen (filename, "wb");
-	}
-
-        if (handle == NULL) {
-        	return FALSE;
-	}
-
-	result = save_pixbuf_to_file_internal (pixbuf, filename, handle);
-	if (!result || handle != stdout)
-		fclose (handle);
-
-	return result;
-}
-
-int
-main (int argc, char **argv)
-{
-	FILE *f;
-	char *out_fn;
-	GdkPixbuf *pixbuf;
-	char *zoom_str = "1.0";
-	int n_iter = 1;
-	poptContext optCtx;
-	struct poptOption optionsTable[] = {
-		{ "zoom", 'z', POPT_ARG_STRING, &zoom_str, 0, NULL, "zoom factor" },
-		{ "num-iter", 'n', POPT_ARG_INT, &n_iter, 0, NULL, "number of iterations" },
-		POPT_AUTOHELP
-		{ NULL, 0, 0, NULL, 0 }
-	};
-	char c;
-	const char * const *args;
-	int i;
-
-	optCtx = poptGetContext ("test-rsvg", argc, (const char **)argv, optionsTable, 0);
-
-	c = poptGetNextOpt (optCtx);
-	args = poptGetArgs (optCtx);
-
-	for (i = 0; i < n_iter; i++) {
-		if (args == NULL || args[0] == NULL) {
-			if (n_iter > 1) {
-				fprintf (stderr, "Can't do multiple iterations on stdin\n");
-				exit (1);
-			}
-
-			f = stdin;
-			out_fn = "-";
-		} else {
-			f = fopen(args[0], "r");
-			if (f == NULL) {
-				fprintf(stderr, "Error opening source file %s\n", argv[0]);
-			}
-			if (args[1] == NULL)
-				out_fn = "-";
-			else
-				out_fn = (char *)args[1];
-		}
-
-		pixbuf = rsvg_render_file (f, atof (zoom_str));
-
-		if (f != stdin)
-			fclose(f);
-
-		if (pixbuf != NULL) {
-			if (n_iter > 1)
-				gdk_pixbuf_unref (pixbuf);
-			else
-				save_pixbuf_to_file (pixbuf, out_fn);
-		} else {
-			fprintf (stderr, "Error loading SVG file.\n");
-			return 1;
-		}
-	}
-
-	return 0;
-}
diff --git a/librsvg/test.svg b/librsvg/test.svg
deleted file mode 100644
index 7d5f10b32..000000000
--- a/librsvg/test.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<svg width="200" height="200">
- <defs>
-  <linearGradient id="LinGradient"
-	x1="50" y1="50" x2="150" y2="150" spreadMethod="repeat">
-   <stop offset="0%" style="stop-color:#00F; stop-opacity:10%"/>
-   <stop offset="100%" style="stop-color:#FFF"/>
-  </linearGradient>
-  <radialGradient id="RadGradient"
-	cx="100" cy="100" r="50" fx="145" fy="100">
-   <stop offset="0%" style="stop-color:#F00"/>
-   <stop offset="50%" style="stop-color:#FF0; stop-opacity:90%"/>
-   <stop offset="100%" style="stop-color:#000; stop-opacity:0"/>
-  </radialGradient>
- </defs>
- <g style="fill: url(#LinGradient)">
-  <path d="M30,30 L30,170 L170,170 L170,30z"/>
- </g>
- <g style="fill: url(#RadGradient); stroke: #000; stroke-width:3">
-  <path d="M50,50 L50,150 L150,150 L150,50z"/>
- </g>
-</svg>
diff --git a/nautilus-installer/src/nautilus-druid-page-eazel.c b/nautilus-installer/src/nautilus-druid-page-eazel.c
index 63a5dd9c2..fdaafd0c8 100644
--- a/nautilus-installer/src/nautilus-druid-page-eazel.c
+++ b/nautilus-installer/src/nautilus-druid-page-eazel.c
@@ -71,7 +71,7 @@ static void nautilus_druid_page_eazel_prepare       (GnomeDruidPage *page,
 #define DRUID_PAGE_MIN_WIDTH 516
 #define DRUID_PAGE_BORDER 24
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusDruidPageEazel, nautilus_druid_page_eazel, GNOME_TYPE_DRUID_PAGE)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusDruidPageEazel, nautilus_druid_page_eazel, GNOME_TYPE_DRUID_PAGE)
 
 static void
 nautilus_druid_page_eazel_initialize_class (NautilusDruidPageEazelClass *klass)
@@ -130,7 +130,7 @@ nautilus_druid_page_eazel_destroy(GtkObject *object)
 	druid_page_eazel->details->widget = NULL;
 
 	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -143,7 +143,7 @@ nautilus_druid_page_eazel_finalize (GtkObject *object)
 	druid_page_eazel->details = NULL;
 
 	/* Chain finalize */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
 }
 
 static void
@@ -272,7 +272,7 @@ static void
 nautilus_druid_page_eazel_size_allocate (GtkWidget               *widget,
 					 GtkAllocation           *allocation)
 {
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate,
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate,
 			      (widget, allocation));
 }
 
@@ -284,7 +284,7 @@ nautilus_druid_page_eazel_size_request(GtkWidget           *widget,
 
 	druid_page_eazel = NAUTILUS_DRUID_PAGE_EAZEL (widget);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_request,
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_request,
 			      (widget, requisition));
 
 	if (druid_page_eazel->details->widget) {
diff --git a/nautilus-installer/src/nautilus-druid.c b/nautilus-installer/src/nautilus-druid.c
index fcd3655f4..8336e85fd 100644
--- a/nautilus-installer/src/nautilus-druid.c
+++ b/nautilus-installer/src/nautilus-druid.c
@@ -36,7 +36,7 @@ static void nautilus_druid_size_request (GtkWidget               *widget,
 static void nautilus_druid_size_allocate(GtkWidget               *widget,
 					 GtkAllocation           *allocation);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusDruid, nautilus_druid, GNOME_TYPE_DRUID)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusDruid, nautilus_druid, GNOME_TYPE_DRUID)
 
 static void
 nautilus_druid_initialize_class (NautilusDruidClass *klass)
diff --git a/nautilus.spec.in b/nautilus.spec.in
index 9cb735432..95afbe171 100644
--- a/nautilus.spec.in
+++ b/nautilus.spec.in
@@ -37,6 +37,8 @@ Requires:	libghttp >= @LIBGHTTP_REQUIRED@
 Requires:	scrollkeeper >= @SCROLLKEEPER_REQUIRED@
 Requires:	libpng
 Requires:	control-center >= @CONTROL_CENTER_REQUIRED@
+Requires:	librsvg >= @LIBRSVG_REQUIRED@
+Requires:	eel >= @EEL_REQUIRED@
 
 %description
 Nautilus integrates access to files, applications, media, Internet-based
@@ -212,10 +214,6 @@ scrollkeeper-update
 %{prefix}/share/locale/*/LC_MESSAGES/*.mo
 %{prefix}/share/nautilus/*.xml
 %{prefix}/share/nautilus/emblems/*.png
-%{prefix}/share/nautilus/fonts/urw/*.dir
-%{prefix}/share/nautilus/fonts/urw/*.pfb
-%{prefix}/share/nautilus/fonts/urw/*.afm
-%{prefix}/share/nautilus/fonts/urw/*.pfm
 %{prefix}/share/nautilus/linksets/*.xml
 %{prefix}/share/nautilus/patterns/*.jpg
 %{prefix}/share/nautilus/patterns/*.png
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 23b4536ad..fc167f3df 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -100,27 +100,19 @@ libnautilus-extensions/nautilus-file.c
 libnautilus-extensions/nautilus-file-operations.c
 libnautilus-extensions/nautilus-file-operations-progress.c
 libnautilus-extensions/nautilus-font-factory.c
-libnautilus-extensions/nautilus-font-picker.c
 libnautilus-extensions/nautilus-gconf-extensions.c
-libnautilus-extensions/nautilus-gdk-font-extensions.c
-libnautilus-extensions/nautilus-glib-extensions.c
 libnautilus-extensions/nautilus-global-preferences.c
-libnautilus-extensions/nautilus-gnome-extensions.c
 libnautilus-extensions/nautilus-icon-container.c
 libnautilus-extensions/nautilus-icon-canvas-item.c
 libnautilus-extensions/nautilus-icon-dnd.c
 libnautilus-extensions/nautilus-icon-factory.c
 libnautilus-extensions/nautilus-icon-text-item.c
-libnautilus-extensions/nautilus-label.c
-libnautilus-extensions/nautilus-password-dialog.c
 libnautilus-extensions/nautilus-preferences-item.c
 libnautilus-extensions/nautilus-preferences.c
 libnautilus-extensions/nautilus-preferences-dialog.c
 libnautilus-extensions/nautilus-program-chooser.c
 libnautilus-extensions/nautilus-program-choosing.c
 libnautilus-extensions/nautilus-search-uri.c
-libnautilus-extensions/nautilus-smooth-text-layout.c
-libnautilus-extensions/nautilus-stock-dialogs.c
 libnautilus-extensions/nautilus-trash-directory.c
 libnautilus-extensions/nautilus-trash-file.c
 libnautilus-extensions/nautilus-undo-signal-handlers.c
diff --git a/po/az.po b/po/az.po
index 2ac62069d..fd75ffc95 100644
--- a/po/az.po
+++ b/po/az.po
@@ -2,10 +2,15 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Vasif Ismailoglu MD <azerb_linux@hotmail.com>, 2001.
 #
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 0.1.0\n"
-"POT-Creation-Date: 2001-03-16 12:36+0100\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-03-12 10:48+0200\n"
 "Last-Translator: Vasif Ismailoglu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkish\n"
@@ -148,8 +153,8 @@ msgid "Previous"
 msgstr "�vvəlki"
 
 #: components/help/converters/gnome-db2html2/gdb3html.c:721
-#: libnautilus-extensions/nautilus-global-preferences.c:686
-#: src/nautilus-shell-ui.xml.h:38
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "Ev"
 
@@ -342,16 +347,14 @@ msgid "Kernel Routines"
 msgstr ""
 
 #: components/help/hyperbola-filefmt.c:703
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
 msgid "Info"
 msgstr "Mə'lumat səhifələri"
 
-#: components/help/hyperbola-nav-tree.c:279
+#: components/help/hyperbola-nav-tree.c:310
 msgid "Introductory Documents:"
 msgstr ""
 
-#: components/help/hyperbola-nav-tree.c:293
+#: components/help/hyperbola-nav-tree.c:324
 msgid "Documents by Subject:"
 msgstr ""
 
@@ -424,7 +427,7 @@ msgstr "Keçmiş yan çubuğu"
 msgid "History sidebar panel for Nautilus"
 msgstr "Nautilusun Keçmiş yan çubuğu"
 
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "Bonobo'yu başlada bilmədim"
 
@@ -485,7 +488,7 @@ msgstr "Loser içindəkilər nümayişini dayandır"
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "_Fayl"
 
@@ -575,7 +578,7 @@ msgid "Sidebar Loser"
 msgstr "Yan Çubuq Loseri"
 
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -585,7 +588,7 @@ msgstr ""
 "  %s"
 
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -1029,7 +1032,6 @@ msgid "Oldies"
 msgstr "Köhnələr"
 
 #: components/music/mpg123.c:32
-#: libnautilus-extensions/nautilus-font-picker.c:117
 msgid "Other"
 msgstr "Başqaları"
 
@@ -1670,10 +1672,10 @@ msgid "Pause"
 msgstr "Dayandır"
 
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:945
-#: libnautilus-extensions/nautilus-file-operations.c:960
 #: libnautilus-extensions/nautilus-file-operations.c:979
-#: src/nautilus-shell-ui.xml.h:60
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Dayan"
 
@@ -1725,23 +1727,6 @@ msgstr "Musiqi nümayişi e'malatxanası"
 msgid "View as Music"
 msgstr "%s olaraq göstər"
 
-#. FIXME: eventually, get this from preferences
-#. set up the default font
-#: components/notes/nautilus-notes.c:200
-#: components/text/nautilus-text-view.c:186
-#: libnautilus-extensions/nautilus-global-preferences.c:1118
-#: libnautilus-extensions/nautilus-icon-container.c:3333
-#: libnautilus-extensions/nautilus-icon-container.c:3334
-#: libnautilus-extensions/nautilus-icon-container.c:3335
-#: libnautilus-extensions/nautilus-icon-container.c:3336
-#: libnautilus-extensions/nautilus-icon-container.c:3337
-#: libnautilus-extensions/nautilus-icon-container.c:3338
-#: libnautilus-extensions/nautilus-icon-container.c:3339
-#: libnautilus-extensions/nautilus-preferences-item.c:482
-#: src/nautilus-sidebar-title.c:500
-msgid "helvetica"
-msgstr "helvetika"
-
 #: components/notes/Nautilus_View_notes.oaf.in.h:1
 msgid "Factory for annotation view"
 msgstr "Not nümayişi e'malatxanası"
@@ -1838,7 +1823,7 @@ msgstr "Axtarış \"cgi\"ni bildirin"
 #: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
 #: components/services/install/command-line/eazel-test-packsys.c:590
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "Xəta ayıqlamasını göstər"
 
@@ -1902,176 +1887,179 @@ msgstr "RPM arqumentləri ehtiyac olan fayllardır"
 msgid "Run Query"
 msgstr "SorÄŸunu Ä°ÅŸÉ™ Sal"
 
-#. Disabled for 1.0
-#. {"revert", 'r', POPT_ARG_NONE, &arg_revert, 0, N_("Revert"), NULL},
-#: components/services/install/command-line/eazel-alt-install-corba.c:127
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
+#, fuzzy
+msgid "Revert"
+msgstr "qətiyyən"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr "\"Root\"u bildir"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:128
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "Vericiyi tap"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:129
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
 msgid "Dont print too much, just problems and download"
 msgstr ""
 "Çox şey göstərmə, sadəcə olaraq problemləri və endirmələri "
 "göstər"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:130
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr "ssl ad dəyişikliklərini apar"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:131
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
 msgid "argument is a suite id"
 msgstr "arqument uyğun gələn \"id\"dir"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "Sınaq"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr "İstifadəçi adına icazə ver"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:134
-#: components/services/install/lib/eazel-install-problem.c:1015
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "Güncəlləmələrə icazə ver"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "�traflı nəticə"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:136
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
 msgid "Install a specific package version"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:159
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
 msgid "*** You cannot specify more then one protocol type.\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:176
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
 msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:285
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, c-format
 msgid "File conflict checking %s...\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:299
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, c-format
 msgid "File uniqueness checking %s...\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:313
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
 #, c-format
 msgid "Feature consistency checking %s...\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:344
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
 #: components/services/install/lib/eazel-install-protocols.c:116
 #: components/services/install/lib/eazel-install-protocols.c:254
 #, c-format
 msgid "Downloading %s..."
 msgstr "\"%s\"i(ı) endirirəm..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:360
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
 msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:368
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
 #, fuzzy
 msgid "Downloading %s... (%d/%d) = %d%%"
 msgstr "\"%s\"i(ı) endirirəm..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:376
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
 #, c-format
 msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:381
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
 #, fuzzy, c-format
 msgid "Downloading %s... %3.1f KB/s Done\n"
 msgstr "\"%s\"i(ı) endirirəm..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:409
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:417
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:439
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:446
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:454
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
 #, fuzzy
 msgid "Done\n"
 msgstr "Oldu"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:474
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
 #, c-format
 msgid "Download of %s FAILED\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:496
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
 #, fuzzy, c-format
 msgid "Package %s failed to uninstall.\n"
 msgstr "bu apket onsuz da quruludur."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:498
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
 #, fuzzy, c-format
 msgid "Package %s failed to install.\n"
 msgstr "bu apket onsuz da quruludur."
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:519
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
 #, c-format
 msgid "\t· Problem : %s\n"
 msgstr ""
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:528
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
 #, c-format
 msgid "\t· Action : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:571
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
 #, fuzzy
 msgid "Cancelling operation\n"
 msgstr "Hökmlü əməliyyatlar :"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:582
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
 #, fuzzy, c-format
 msgid "About to install a total of %d packages, %dKB\n"
 msgstr "Təxminən %d paket qurulacaq, %dKB\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:586
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
 #, fuzzy, c-format
 msgid "About to uninstall a total of %d packages, %dKB\n"
 msgstr "Təxminən %d paket çıxardılacaq, %dKB\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:590
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
 #, fuzzy, c-format
 msgid "About to revert a total of %d packages, %d KB\n"
 msgstr "Təxminən %d paket çevriləcək, %dKB\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:607
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
 #, c-format
 msgid "\t· %s and it's dependencies\n"
 msgstr ""
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:610
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
 #, c-format
 msgid "\t· %s\n"
 msgstr ""
@@ -2081,39 +2069,39 @@ msgstr ""
 #. If you eg. translate this to Danish : "Fortsæt (j/n) " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:638
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
 msgid "Save transaction report ? (y/n) "
 msgstr ""
 
 #. I18N note: y is the letter for the word Yes. This is
 #. used in the response for a yes/no questions. Your translation
 #. must be 1 character only.
-#: components/services/install/command-line/eazel-alt-install-corba.c:649
-#: components/services/install/command-line/eazel-alt-install-corba.c:769
-#: components/services/install/command-line/eazel-alt-install-corba.c:811
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
 #, fuzzy
 msgid "y"
 msgstr "tərəfindən"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:670
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
 #, c-format
 msgid "Dependency : %s needs %s\n"
 msgstr ""
 
 #. I18N note: %s is a package name
-#: components/services/install/command-line/eazel-alt-install-corba.c:688
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
 #, c-format
 msgid "Package %s failed md5 check!\n"
 msgstr ""
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:690
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
 #, c-format
 msgid "\t· server MD5 checksum is %s\n"
 msgstr ""
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:692
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
 #, c-format
 msgid "\t· actual MD5 checksum is %s\n"
 msgstr ""
@@ -2123,7 +2111,7 @@ msgstr ""
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:758
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
 msgid "Continue? (y/n) "
 msgstr ""
 
@@ -2132,87 +2120,87 @@ msgstr ""
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:799
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
 msgid "Should I delete the RPM files? (y/n) "
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:831
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
 #, fuzzy
 msgid "Operation ok\n"
 msgstr "Milli Rok"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:833
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
 #, fuzzy
 msgid "Operation failed\n"
 msgstr "Qurulma bacarılmadı."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:959
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
 #, fuzzy
 msgid "Installing"
 msgstr "Qur"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:968
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
 #, fuzzy
 msgid "Uninstalling"
 msgstr "Qaldır"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:983
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
 msgid "Only one operation at a time please."
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:988
-#: components/services/install/command-line/eazel-alt-install-corba.c:996
-#: components/services/install/command-line/eazel-alt-install-corba.c:1040
-#: components/services/install/command-line/eazel-alt-install-corba.c:1047
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
 #, c-format
 msgid "%s: --help for usage\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
 #, c-format
 msgid "Name         : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
 #, fuzzy, c-format
 msgid "Version      : %s\n"
 msgstr "Buraxılış: %s"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1014
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
 #, c-format
 msgid "Minor        : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
 #, c-format
 msgid "Size         : %d\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
 #, c-format
 msgid "Arch         : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
 #, fuzzy, c-format
 msgid "Distribution : %s\n"
 msgstr "Yayılma : "
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1019
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
 #, fuzzy, c-format
 msgid "Description  : %s\n"
 msgstr "Ä°zahat"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1021
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
 #, fuzzy, c-format
 msgid "Install root : %s\n"
 msgstr "%s və \"%s\"in(ın) hər ikisini də qur"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1024
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
 msgid "Provides     : \n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1066
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
 #, c-format
 msgid "exit code %d\n"
 msgstr ""
@@ -2229,124 +2217,130 @@ msgstr ""
 "Göstərilən faylı paket siyahısını yaradarkən istifadə et, "
 "--packagelist arqumenti lazımdır"
 
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 msgid "Softcat server to connect to"
 msgstr "BAğlanılacaq softcat vericisi"
 
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr "Alternativ CGI yolu işlət"
 
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr "Ammonite ilə softcat istifadəçisi olaraq bağlan"
 
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 msgid "Number of times to try the request"
 msgstr "Sorğunun cəhd edilmə miqdarı"
 
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr "Sorğular arasında gecikmə, millisaniyələrlə"
 
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr "Eazel paket \"id\"si olaraq axtar"
 
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+#, fuzzy
+msgid "Lookup package that features a feature/file"
 msgstr ""
 "Paketləri xüsusiyyətlərinə və ya içindəki fayllara görə axtar"
 
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr "Paketi xas nəslə görə axtar"
 
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr "(with --version) >= müqayisəsi işlət"
 
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 msgid "use check function (for debugging)"
 msgstr "yoxlama funksiyası işlət (ayıqlama üçün)"
 
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 msgid "Show detailed sub-package info"
 msgstr "�traflı alt paket mə'lumatını işlət"
 
-#: components/services/install/lib/eazel-install-logic2.c:102
+#: components/services/install/command-line/eazel-test-softcat.c:66
+msgid "enable funk parser"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "Endirilən fayllara nişanlana bilmədim"
 
-#: components/services/install/lib/eazel-install-logic2.c:119
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "MD5 uyğun galmir, %s paketi uzaqlaşdırılış ola bilər"
 
-#: components/services/install/lib/eazel-install-logic2.c:135
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, fuzzy, c-format
 msgid "No MD5 available for %s"
 msgstr "\"%s\"nin izahı yoxdur"
 
 #. I18N note: "%is is ok" in the sense that %s=package name and the
 #. package is intact
-#: components/services/install/lib/eazel-install-logic2.c:330
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, fuzzy, c-format
 msgid "%s is ok"
 msgstr "Oldumu?"
 
-#: components/services/install/lib/eazel-install-logic2.c:436
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s buraxılış %s-%s onsuz da quruludur"
 
-#: components/services/install/lib/eazel-install-logic2.c:440
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s buraxılışı %s onsuz da quruludur"
 
-#: components/services/install/lib/eazel-install-logic2.c:449
-#: components/services/install/lib/eazel-install-logic2.c:454
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr "%s %s-%s buraxılışından %s-%s a(ə) güncəllənir"
 
-#: components/services/install/lib/eazel-install-logic2.c:463
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr "%s %s-%s buraxılışından %s-%s a(ə) aşağı güncəllənir"
 
-#: components/services/install/lib/eazel-install-logic2.c:468
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr "%s %s buraxılışından %s a(ə) aşağı güncəllənir"
 
-#: components/services/install/lib/eazel-install-logic2.c:521
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr "%s %s-%s buraxılışını qurur"
 
-#: components/services/install/lib/eazel-install-logic2.c:526
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr "%s %s buraxılışını qurur"
 
-#: components/services/install/lib/eazel-install-logic2.c:693
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, fuzzy, c-format
 msgid "Loading package info from file %s"
 msgstr "Paket haqqında mə'lumat alınır..."
 
 #. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
-#: components/services/install/lib/eazel-install-logic2.c:1010
+#: components/services/install/lib/eazel-install-logic2.c:1197
 #, fuzzy
 msgid "ok"
 msgstr "Rok"
 
-#: components/services/install/lib/eazel-install-logic2.c:1010
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "not ok"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1176
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
 msgid "Checking dependencies for %s"
 msgstr ""
@@ -2354,107 +2348,107 @@ msgstr ""
 #. I18N note: both %s' are package names.
 #. related is in the sense that the two packages apparently
 #. are connected somehow, eg. foo and foo-devel
-#: components/services/install/lib/eazel-install-logic2.c:1800
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, fuzzy, c-format
 msgid "%s is related to %s"
 msgstr "\"%s\" seçilidir (%s)"
 
-#: components/services/install/lib/eazel-install-logic2.c:1876
+#: components/services/install/lib/eazel-install-logic2.c:2090
 #, c-format
 msgid "updating %s to version %s-%s solves conflict"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1899
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
 msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1906
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, c-format
 msgid "could not revive %s"
 msgstr "%s dirildilÉ™ bilmir"
 
-#: components/services/install/lib/eazel-install-logic2.c:2061
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
 msgid "file uniqueness checking %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2082
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
 msgid "Duplicate file : %s occurs in %s and %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2094
-#: components/services/install/lib/eazel-install-logic2.c:2248
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
 msgid "... but it's ok, the packages are related"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2102
+#: components/services/install/lib/eazel-install-logic2.c:2324
 #, c-format
 msgid "(there were %d other conflicts)"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2197
+#: components/services/install/lib/eazel-install-logic2.c:2419
 #, fuzzy, c-format
 msgid "file conflict checking %s"
 msgstr "%s %s ilÉ™ toqquÅŸan fayl daxil edir"
 
-#: components/services/install/lib/eazel-install-logic2.c:2234
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
 msgid "file conflict : package %s already provides file %s also provided by %s"
 msgstr ""
 
 #. the owner of this file is a package that we're upgrading, and the
 #. * new version no longer has this file, so everything's okay.
-#: components/services/install/lib/eazel-install-logic2.c:2244
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
 msgid "...but it is okay, we're upgrading %s and it ditched that file"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2336
+#: components/services/install/lib/eazel-install-logic2.c:2558
 #, c-format
 msgid "checking feature consistency of %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2404
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
 msgid ""
 "feature missing : %s breaks if %s is installed (feature %s would be lost"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2483
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, fuzzy, c-format
 msgid "downloading %d packages"
 msgstr "Paketlər endirilir"
 
-#: components/services/install/lib/eazel-install-logic2.c:2753
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, fuzzy, c-format
 msgid "will upgrade %s"
 msgstr "Güncəlləmələrə icazə ver"
 
-#: components/services/install/lib/eazel-install-logic2.c:2756
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, fuzzy, c-format
 msgid "will downgrade %s"
 msgstr "Aşağı güncəlləmələrə icazə ver"
 
-#: components/services/install/lib/eazel-install-logic2.c:2759
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, fuzzy, c-format
 msgid "will install %s"
 msgstr "\"%s\" qururlur"
 
-#: components/services/install/lib/eazel-install-logic2.c:2762
+#: components/services/install/lib/eazel-install-logic2.c:2960
 #, fuzzy, c-format
 msgid "will uninstall %s"
 msgstr "Qaldır"
 
-#: components/services/install/lib/eazel-install-logic2.c:2847
-#: components/services/install/lib/eazel-install-problem.c:339
+#: components/services/install/lib/eazel-install-logic2.c:3045
 #: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
 #, c-format
 msgid "%s requires %s"
 msgstr "\"%s\"in(ın) \"%s\"a(ə) ehtiyacı var"
 
-#: components/services/install/lib/eazel-install-logic2.c:3040
+#: components/services/install/lib/eazel-install-logic2.c:3238
 #, fuzzy, c-format
 msgid "failed %s"
 msgstr "\"%s\"dÉ™ iflas etdim"
@@ -2467,39 +2461,39 @@ msgstr "Quraşdırma dosyesindən URL növünü tapa bilmədim !"
 msgid "Transactions are not stored, could not find home dir"
 msgstr "Gedişlər saxlanmır, ev qovluğu tapıla bilmir"
 
-#: components/services/install/lib/eazel-install-object.c:745
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr "Gedişlər %s da(də) saxlanılır"
 
-#: components/services/install/lib/eazel-install-object.c:1002
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "Vericidən paket siyahısını alıram ...\n"
 
-#: components/services/install/lib/eazel-install-object.c:1018
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "package-list.xmli(ı) ala bilmədim !\n"
 
-#: components/services/install/lib/eazel-install-object.c:1091
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr ""
 "%s dosyesinə yaza bilmədim, əsas qeyd idarəcisini istifadə edirəm"
 
-#: components/services/install/lib/eazel-install-object.c:1222
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "Yükləme müvəffəqiyyətsiz oldu"
 
-#: components/services/install/lib/eazel-install-object.c:1268
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "Qaldırma müvəffəqiyyətsiz oldu"
 
-#: components/services/install/lib/eazel-install-object.c:1403
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "Gediş qovluğu \"%s\"i(ı) yarada bilmədim ! ***\n"
 
-#: components/services/install/lib/eazel-install-object.c:1426
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr "Gediş %s a(ə) yazılır"
@@ -2510,7 +2504,7 @@ msgid "%s was cancelled"
 msgstr "%s ləğv edildi"
 
 #: components/services/install/lib/eazel-install-problem.c:168
-#: components/services/install/lib/eazel-install-problem.c:331
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
 msgid "%s is a source package, which is not yet supported"
 msgstr "%s qaynaq paketi deyildir, hələ dəstəkllənmir"
@@ -2542,52 +2536,52 @@ msgid "%s requires %s, which could not be found on the server"
 msgstr "\"%s\"in(ın) \"%s\"a(ə) ehtiyacı var, amma vericidə tapıla bilmir"
 
 #: components/services/install/lib/eazel-install-problem.c:204
-#, c-format
-msgid "%s could not be found on the server"
+#, fuzzy, c-format
+msgid "%s for %s could not be found on the server"
 msgstr "%s vericidə tapıla bilmədi"
 
-#: components/services/install/lib/eazel-install-problem.c:212
-#: components/services/install/lib/eazel-install-problem.c:357
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr "%s onsuz da quruludur"
 
-#: components/services/install/lib/eazel-install-problem.c:256
+#: components/services/install/lib/eazel-install-problem.c:259
 #, fuzzy, c-format
 msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr ""
 "%s onsuz da quruludur və daha təzədir, aşağı güncəlləmə "
 "fəallaşdırılmayıb"
 
-#: components/services/install/lib/eazel-install-problem.c:260
+#: components/services/install/lib/eazel-install-problem.c:263
 #, fuzzy, c-format
 msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr ""
 "%s onsuz da quruludur və daha köhnədir, güncəlləmə "
 "fəallaşdırılmayıb"
 
-#: components/services/install/lib/eazel-install-problem.c:350
+#: components/services/install/lib/eazel-install-problem.c:353
 #, fuzzy, c-format
 msgid "%s is not installed and could not be found on server"
 msgstr "%s vericidə tapıla bilmədi"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:917
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr "%s üçün yeni buraxılış olub olmadığını yoxla"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:928
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr "%s və \"%s\"in(ın) hər ikisini də qur"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:943
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr "\"%s\"i(ı) sistemdən çıxart"
@@ -2595,21 +2589,21 @@ msgstr "\"%s\"i(ı) sistemdən çıxart"
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:956
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr "\"%s\"in(ın) sistemdən çıxardılmasını zorla"
 
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:964
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr "Paket databeyzinin bütünlüyü xəsər görüb"
 
-#: components/services/install/lib/eazel-install-problem.c:1012
+#: components/services/install/lib/eazel-install-problem.c:1015
 msgid "Continue with force"
 msgstr "Zorlama ilÉ™ davam et"
 
-#: components/services/install/lib/eazel-install-problem.c:1018
+#: components/services/install/lib/eazel-install-problem.c:1021
 msgid "Allow downgrade"
 msgstr "Aşağı güncəlləmələrə icazə ver"
 
@@ -2734,94 +2728,94 @@ msgstr "*** Xəsərli asılılıq düyümləri!"
 msgid "*** Unknown node type '%s'"
 msgstr "*** Namə'lum '%s' düyüm növü"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:231
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** Paket siyahı faylı mə'lumat daxil etmir ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:236
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** CATEGORIES xml düyümünü tapa bilmədim ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:237
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr "*** Kateqoriyalar daramasından vəkil axtarıram! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:243
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** Kateqoriyalar yoxdur ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:244
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr "*** Kateqoriya daramasından vəkil axtarıram! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:298
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** Vəzifə xml düyümünü tapa bilmədim ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:300
-#: components/services/install/lib/eazel-install-xml-package-list.c:308
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr "*** Rabitə daramasından vəkil axtarıram! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:306
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** Paketlər yoxdur ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:342
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** Kateqoriyalar düyümü yoxdur ! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:346
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** CATEGORIES xml düyümünü tapa bilmədim ! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:380
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** Namə'lum %s düyümü"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:470
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** Xml paket siyahısını yaradarkən xəta oldu ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:517
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** Paket siyahısi oxuduğum vaxt xəta oldu ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:912
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** Osd xml heç bir mə'lumat daxil etmir ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:917
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr "*** Osd daramasından vəkil axtarıram! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:993
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "Xml darana bilmir (%d uzunluÄŸunda)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:764
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr "Paket databeyzi \"%s\"da(də) açılmışdır"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:769
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr "%s paket databeyzinin açılması bacarılmadı"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:802
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr "%s üçün db bağlanır (aç)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:807
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr "%s üçün db bağlanır (açıq deyil)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1138
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr "\"%s\"i(ı) aça bilmədim"
@@ -2934,7 +2928,7 @@ msgid "Now installing package \"%s\"."
 msgstr "Indi qurulan paket \"%s\"."
 
 #: components/services/install-view/callbacks.c:407
-#: components/services/install-view/nautilus-service-install-view.c:897
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "\"%s\" qururlur"
@@ -3087,31 +3081,31 @@ msgstr "Beton"
 
 #: components/services/install-view/forms.c:482
 #: libnautilus-extensions/nautilus-drag.c:493
-#: src/file-manager/fm-directory-view.c:3551
+#: src/file-manager/fm-directory-view.c:4326
 msgid "Cancel"
 msgstr "Ləğv Et"
 
-#: components/services/install-view/nautilus-service-install-view.c:419
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
 msgid "%s is in GNOME (footprint) > %s"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:437
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, fuzzy, c-format
 msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr " =B7 %s Gnome menyusudur.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:452
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, fuzzy, c-format
 msgid "%s is in the KDE menu.\n"
 msgstr " =B7 %s KDE menyusudur.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:653
+#: components/services/install-view/nautilus-service-install-view.c:655
 #, fuzzy
 msgid "Installation Complete"
 msgstr "Qurulma qurtarıldı."
 
-#: components/services/install-view/nautilus-service-install-view.c:708
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
 msgid ""
 "%sTo start %s, click the Launch button below, or to create a shortcut, drag "
@@ -3119,35 +3113,35 @@ msgid ""
 msgstr ""
 
 #. couldn't find an icon
-#: components/services/install-view/nautilus-service-install-view.c:716
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
 msgid "%sTo start %s, click the Launch button below."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:771
+#: components/services/install-view/nautilus-service-install-view.c:773
 msgid "Incorrect password."
 msgstr "Parol Səhvdir"
 
-#: components/services/install-view/nautilus-service-install-view.c:776
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr "Özünü ali istifadəçi olaraq tanıt"
 
-#: components/services/install-view/nautilus-service-install-view.c:893
+#: components/services/install-view/nautilus-service-install-view.c:895
 #, fuzzy
 msgid "Installing packages"
 msgstr "%d paketin %d qədəri qurulur"
 
-#: components/services/install-view/nautilus-service-install-view.c:895
+#: components/services/install-view/nautilus-service-install-view.c:897
 #, fuzzy
 msgid "Installing remote package"
 msgstr "Uzaq paketlər endirilir"
 
-#: components/services/install-view/nautilus-service-install-view.c:899
+#: components/services/install-view/nautilus-service-install-view.c:901
 #, fuzzy
 msgid "Installing some package"
 msgstr "Bə'zi paketlər endirilir"
 
-#: components/services/install-view/nautilus-service-install-view.c:916
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
@@ -3155,23 +3149,23 @@ msgstr ""
 "Eazel qurma xidməti mövcud deyildir:\n"
 "Qurulmalar işləməyəcəkdir."
 
-#: components/services/install-view/nautilus-service-install-view.c:965
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr "\"Eazel Software Catalog\"u ilə əlaqə qurulur..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1023
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr "Tanıtma üçün gözləyirəm ..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1095
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr "Paket endirmələri ləğv edildi (lütfən gözləyin) ..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1115
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "Paket endirilməsi ləğv edildi."
 
-#: components/services/install-view/nautilus-service-install-view.c:1116
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "Ləğv Edildi"
 
@@ -3462,12 +3456,12 @@ msgid "Services Login"
 msgstr "Xidmətlərə Giriş"
 
 #: components/services/summary/nautilus-summary-dialogs.c:131
-#: libnautilus-extensions/nautilus-password-dialog.c:269
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "İstifadəçi Adı:"
 
 #: components/services/summary/nautilus-summary-dialogs.c:138
-#: libnautilus-extensions/nautilus-password-dialog.c:276
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "Parol:"
 
@@ -3543,7 +3537,7 @@ msgstr "Xidmətlər"
 msgid "Featured Downloads"
 msgstr "Vacib Endirmələr"
 
-#: components/services/summary/nautilus-summary-view.c:883
+#: components/services/summary/nautilus-summary-view.c:884
 #, fuzzy
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
@@ -3554,7 +3548,7 @@ msgstr ""
 "deyildir.Ya da kompüteriniz düzgün quraşdırılmayıb. Sonra yenə "
 "sınaya biləsiniz."
 
-#: components/services/summary/nautilus-summary-view.c:893
+#: components/services/summary/nautilus-summary-view.c:894
 #, fuzzy
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
@@ -3563,7 +3557,7 @@ msgstr ""
 "Eazel vericilərində problem tapıldı. Lütfən support@ezel.com ilə "
 "əlaqə qurun."
 
-#: components/services/summary/nautilus-summary-view.c:916
+#: components/services/summary/nautilus-summary-view.c:917
 #, fuzzy
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
@@ -3572,7 +3566,7 @@ msgstr ""
 "Eazel vericilərində problem tapıldı. Lütfən support@ezel.com ilə "
 "əlaqə qurun."
 
-#: components/services/summary/nautilus-summary-view.c:958
+#: components/services/summary/nautilus-summary-view.c:959
 #, fuzzy
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
@@ -3583,7 +3577,7 @@ msgstr ""
 "deyildir.Ya da kompüteriniz düzgün quraşdırılmayıb. Sonra yenə "
 "sınaya biləsiniz."
 
-#: components/services/summary/nautilus-summary-view.c:968
+#: components/services/summary/nautilus-summary-view.c:969
 #, fuzzy
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
@@ -3592,11 +3586,11 @@ msgstr ""
 "Eazel vericilərində problem tapıldı. Lütfən support@ezel.com ilə "
 "əlaqə qurun."
 
-#: components/services/summary/nautilus-summary-view.c:985
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:1048
+#: components/services/summary/nautilus-summary-view.c:1049
 #: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr "Eazel Xidmətləri"
@@ -3717,48 +3711,68 @@ msgstr "eazel nümunəvi xidmət nümayişi"
 msgid "Factory for the sample service"
 msgstr "Nümunəvi xidmətlər e'malatxanası"
 
-#: components/text/nautilus-text-view.c:326
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr "Bağışlayın, %s Nautilusun yükləməsi üçün çox böyükdür."
 
-#: components/text/nautilus-text-view.c:329
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr "Fayl çox böyükdür"
 
 #: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "Yazı növləri"
+
+#: components/text/nautilus-text-view-ui.xml.h:2
 msgid "Lucida"
 msgstr "Lusida"
 
-#: components/text/nautilus-text-view-ui.xml.h:2
+#: components/text/nautilus-text-view-ui.xml.h:3
 msgid "Use the Courier Font"
 msgstr "Kuriyer Yazı Növünü İşlət"
 
-#: components/text/nautilus-text-view-ui.xml.h:3
+#: components/text/nautilus-text-view-ui.xml.h:4
+#, fuzzy
+msgid "Use the Fixed Font"
+msgstr "Tayms Yazı Növünü İşlət"
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+#, fuzzy
+msgid "Use the GTK System Font"
+msgstr "Tayms Yazı Növünü İşlət"
+
+#: components/text/nautilus-text-view-ui.xml.h:6
 msgid "Use the Helvetica Font"
 msgstr "Helvetika Yazı Növünü İşlət"
 
-#: components/text/nautilus-text-view-ui.xml.h:4
+#: components/text/nautilus-text-view-ui.xml.h:7
 msgid "Use the Lucida Font"
 msgstr "Lusida Yazı Növünü İşlət"
 
-#: components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:8
 msgid "Use the Times Font"
 msgstr "Tayms Yazı Növünü İşlət"
 
-#: components/text/nautilus-text-view-ui.xml.h:6
+#: components/text/nautilus-text-view-ui.xml.h:9
 msgid "_Courier"
 msgstr "_Kuriyer"
 
-#: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
-msgstr "_Yazı Növləri"
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "_Fayl"
 
-#: components/text/nautilus-text-view-ui.xml.h:8
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
 msgid "_Helvetica"
 msgstr "_Helvetika"
 
-#: components/text/nautilus-text-view-ui.xml.h:9
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr "_Tayms"
 
@@ -3829,7 +3843,7 @@ msgid "Nautilus Tree view"
 msgstr "Nautilus Ağac nümayişi"
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:638
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr "AÄŸac"
 
@@ -3841,7 +3855,7 @@ msgstr "Aparatlar"
 msgid "Azul"
 msgstr "Azul"
 
-#: data/browser.xml.h:3 libnautilus-extensions/nautilus-font-picker.c:105
+#: data/browser.xml.h:3
 msgid "Black"
 msgstr "Qara"
 
@@ -3953,7 +3967,7 @@ msgstr "Cismin alması üçün üstünə emblem sürükləyin"
 msgid "Eclipse"
 msgstr "Qaranlıqlaşma"
 
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1607
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "Emblemlər"
 
@@ -4050,7 +4064,7 @@ msgid "Numbers"
 msgstr "Rəqəmlər"
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "Oldu"
 
@@ -4171,11 +4185,11 @@ msgid "The Gimp"
 msgstr "GÄ°MP"
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:554
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "Masa Üstü"
 
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4796
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
 #: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
@@ -4210,7 +4224,7 @@ msgid "Google"
 msgstr "Google"
 
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:808
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "Axtarış Mühərrikləri"
 
@@ -4476,101 +4490,101 @@ msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2261
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr "bugün %-I:%M %p da(də)"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2266
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr "dünən saat %-H:%M %p da(də)"
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2271
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%A %-m/%-d/%y %-H:%M %p da(dÉ™)"
 
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2276
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%-m/%-d/%y %-H:%M %p da(dÉ™)"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 üzv"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr "0 qovluq"
 
-#: libnautilus-extensions/nautilus-file.c:3408
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 fayl"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 üzv"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr "1 qovluq"
 
-#: libnautilus-extensions/nautilus-file.c:3413
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 fayl"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "%u üzv"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr "%u qovluq"
 
-#: libnautilus-extensions/nautilus-file.c:3417
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u fayl"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3720
-#: libnautilus-extensions/nautilus-file.c:3735
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr "? üzv"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3726
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr "? bayt"
 
-#: libnautilus-extensions/nautilus-file.c:3739
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "namə'lum növ"
 
-#: libnautilus-extensions/nautilus-file.c:3741
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "namə'lum MIME növü"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3746
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "namÉ™'lum"
 
-#: libnautilus-extensions/nautilus-file.c:3782
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr "proqram"
 
-#: libnautilus-extensions/nautilus-file.c:3794
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
@@ -4580,7 +4594,7 @@ msgstr ""
 "faylınızın səhv yerdə olduğunu ya da nədənsə tapıla bilmədiyini "
 "göstərir."
 
-#: libnautilus-extensions/nautilus-file.c:3798
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
@@ -4589,7 +4603,7 @@ msgstr ""
 "\"%s\" maym növü üçün izahat (\"%s\" faylı) tapıla bilmədi, "
 "\"aaron@eazel.com\"a söylə."
 
-#: libnautilus-extensions/nautilus-file.c:3812
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "baÄŸla"
 
@@ -4597,27 +4611,27 @@ msgstr "baÄŸla"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1156
-#: libnautilus-extensions/nautilus-file.c:3818
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr "\"%s\"a(É™) baÄŸla"
 
-#: libnautilus-extensions/nautilus-file.c:3832
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr "baÄŸ qopuqdur"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "Qaynaq :"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "Hədəf :"
 
-#: libnautilus-extensions/nautilus-file-operations.c:588
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4628,7 +4642,7 @@ msgstr ""
 "\n"
 "\"%s\" sırf oxuna bilən diskdə olduğu üçün daşına bilmir."
 
-#: libnautilus-extensions/nautilus-file-operations.c:599
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4641,7 +4655,7 @@ msgstr ""
 "\"%s\" üstündə lazımi səlahiyyətləriniz olmadığı üçün silinə "
 "bilmədi."
 
-#: libnautilus-extensions/nautilus-file-operations.c:605
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4652,7 +4666,7 @@ msgstr ""
 "\n"
 "\"%s\" sırf oxuna bilən diskdə olduğu üçün silinə bilmir."
 
-#: libnautilus-extensions/nautilus-file-operations.c:636
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4665,7 +4679,7 @@ msgstr ""
 "\"%s\" üstündə lazımi səlahiyyətləriniz olmadığı üçün daşına "
 "bilmədi."
 
-#: libnautilus-extensions/nautilus-file-operations.c:643
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, fuzzy, c-format
 msgid ""
 "Error while moving.\n"
@@ -4678,7 +4692,7 @@ msgstr ""
 "\"%s\" üstündə lazımi səlahiyyətləriniz olmadığı üçün zibilə "
 "atıla bilmədi."
 
-#: libnautilus-extensions/nautilus-file-operations.c:667
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -4690,7 +4704,7 @@ msgstr ""
 "\"%s\" üstündə oxuma səlahiyyətləriniz olmadığı üçün oxuna "
 "bilmədi."
 
-#: libnautilus-extensions/nautilus-file-operations.c:689
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4701,7 +4715,7 @@ msgstr ""
 "\n"
 "Hədəfdə lazımi yer yoxdur."
 
-#: libnautilus-extensions/nautilus-file-operations.c:694
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4712,7 +4726,7 @@ msgstr ""
 "\n"
 "Hədəfdə lazımi yer yoxdur."
 
-#: libnautilus-extensions/nautilus-file-operations.c:698
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4723,7 +4737,7 @@ msgstr ""
 "\n"
 "Hədəfdə lazımi yer yoxdur."
 
-#: libnautilus-extensions/nautilus-file-operations.c:710
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4734,7 +4748,7 @@ msgstr ""
 "\n"
 "Bu qovluğa yazma səlahiyyətiniz yoxdur."
 
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4745,7 +4759,7 @@ msgstr ""
 "\n"
 "Hədəf disk sırx oxunandır."
 
-#: libnautilus-extensions/nautilus-file-operations.c:721
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4756,7 +4770,7 @@ msgstr ""
 "\n"
 "Bu qovluğa yazma səlahiyyətiniz yoxdur."
 
-#: libnautilus-extensions/nautilus-file-operations.c:725
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4767,7 +4781,7 @@ msgstr ""
 "\n"
 "Hədəf disk sırx oxunandır."
 
-#: libnautilus-extensions/nautilus-file-operations.c:732
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4778,7 +4792,7 @@ msgstr ""
 "\n"
 "Bu qovluğa yazma səlahiyyətiniz yoxdur."
 
-#: libnautilus-extensions/nautilus-file-operations.c:736
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4789,7 +4803,7 @@ msgstr ""
 "\n"
 "Hədəf disk sırx oxunandır."
 
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4799,7 +4813,7 @@ msgstr ""
 "Xəta \"%s\", \"%s\"i(ı) köçürdərkən oldu.\n"
 "Davam etmək istəyirsinizmi ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4810,7 +4824,7 @@ msgstr ""
 "\n"
 "Davam etmək istəyirsinizmi?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:773
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4821,7 +4835,7 @@ msgstr ""
 "\n"
 "Davam etmək istəyirsinizmi ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4832,7 +4846,7 @@ msgstr ""
 "\n"
 "Davam etmək istəyirsinizmi ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:794
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4843,7 +4857,7 @@ msgstr ""
 "\n"
 "Davam etmək istəyirsinizmi ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4854,7 +4868,7 @@ msgstr ""
 "\n"
 "Davam etmək istəyirsinizmi ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4865,7 +4879,7 @@ msgstr ""
 "\n"
 "Davam etmək istəyirsinizmi ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4876,34 +4890,34 @@ msgstr ""
 "\n"
 "Davam etmək istəyirsinizmi ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:924
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "Köçürdülərkən xəta oldu."
 
-#: libnautilus-extensions/nautilus-file-operations.c:927
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "Daşınarkən xəta oldu."
 
-#: libnautilus-extensions/nautilus-file-operations.c:930
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "Körpü qurarkən xəta oldu."
 
-#: libnautilus-extensions/nautilus-file-operations.c:935
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "Silərkən xəta oldu."
 
-#: libnautilus-extensions/nautilus-file-operations.c:960
-#: libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "Keç"
 
-#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Təzədən sına"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1057
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4912,7 +4926,7 @@ msgid ""
 "If you still want to move \"%s\", rename it and try again."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1063
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4921,11 +4935,11 @@ msgid ""
 "If you still want to copy \"%s\", rename it and try again."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "Fayl dəyişdirilə bilmir"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1081
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4936,22 +4950,22 @@ msgstr ""
 "\n"
 "Onu dəyişdirimmi ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1092
-#: libnautilus-extensions/nautilus-file-operations.c:1106
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "Köçürdülərkən toqquşma oldu"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Dəyişdir"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Hamısını Dəyişdir"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1160
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "\"%s\"a(É™) baÅŸqa baÄŸ"
@@ -4960,25 +4974,25 @@ msgstr "\"%s\"a(É™) baÅŸqa baÄŸ"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d ci(cı) körpü; hədəf %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1180
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d ci(cı) körpü; hədəf %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1184
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d ci(cı) körpü ; hədəf %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d ci(cı) körpü; hədəf %s"
@@ -4988,235 +5002,227 @@ msgstr "%d ci(cı) körpü; hədəf %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (nüsxə)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (başqa nüsxə)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1212
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr ". nüsxə)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr ". nüsxə)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1216
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr ". nüsxə)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr ". nüsxə)"
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (nüsxə)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (başqa nüsxə)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1232
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. nüsxə)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1234
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. nüsxə)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1236
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. nüsxə)%s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. nüsxə)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1322
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1330
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1487
-#: libnautilus-extensions/nautilus-file-operations.c:2072
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "NamÉ™'lum GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1802
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "Faylları zibil qutusuna daşıyıram"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1804
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr "Atılan fayllar:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1821
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "Daşınır"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1807
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "Zibil qutusuna daşımaya hazırlanıram ..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1817
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "Faylları daşıyıram"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "Daşınmış fayllar:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1822
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "Daşımaya Hazırlanıram ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "Daşımayı Qurtarıram ..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "Fayllara baÄŸ qururam"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1837
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "Körpü qurulmuş fayllar:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1839
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "Körpü Qurulur"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "Bağları Yaratmaya Hazırlanıram ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "Körpü Qurma �məliyyatı Qurtarır..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1848
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "Fayl köçürtmə"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "Köçürdülmüş fayllar:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "Köçürdülən"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "Köçürtməyə Hazırlayıram ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "Üzvləri zibil qutusuna köçürdə bilməzsiniz."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "Zibil Qutusuna Köçürdə Bilmədim."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1899
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "Zibil qutusu Masa üstündə olmalıdır."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "Bu zibil qutusunu daşıya bilməzsən."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1902
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "Zibil qutusu içindəkiləri köçürdə bilməzsən."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1903
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "Bu zibil qutusunu köçürdə bilməzsən."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1905
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Zibil Qutusu Yeri Dəyişdirilə Bilmədi"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1906
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Zibil Qutusu Köçürdülə Bilmədi"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1929
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "Bir qovluğu öz üstünə daşıya bilməzsən."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1930
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "Bir qovluğu öz içinə köçürdə bilməzsən."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1932
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "Öz İçinə Daşına Bilmir"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1933
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "Ö İçinə Köçürülə Bilmir"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1946
-msgid "You cannot move a file onto itself."
-msgstr "Bir faylı öz üstünə daşıya bilməzsən."
-
-#: libnautilus-extensions/nautilus-file-operations.c:1947
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "Bir faylı öz üstünə köçürdə bilməzsən."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1949
-msgid "Can't Move Onto Self"
-msgstr "Öz Üstünə Daşına Bilmir"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1950
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "Öz Üstünə Köçürülə Milmir"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2001
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5226,7 +5232,7 @@ msgstr ""
 "\n"
 "Bu hədəfə yazma səlahiyyətiniz yoxdur."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2004
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5236,51 +5242,51 @@ msgstr ""
 "\n"
 "Hədəddə boş yer yoxdur."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2007
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "\"%s\" yeni qovluq yaratma xətası."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2011
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "Yeni qovluq yaratma xətası"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2098
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "adsız qovluq"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2131
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "Fayl SilmÉ™"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2133
-#: libnautilus-extensions/nautilus-file-operations.c:2168
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "Silinən fayl:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2135
-#: libnautilus-extensions/nautilus-file-operations.c:2170
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Silinir"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2136
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "Faylları Silmeye Hazırlanıram ..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2166
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Zibil Qutusunu Boşaldıram"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2171
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Zibil Qutusunu Boşaltmaya Hazırlanıram ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2202
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 #, fuzzy
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
@@ -5288,664 +5294,637 @@ msgstr ""
 "Həiqətən də zibildəki bütün üzvləri həmişəlik silmək "
 "istəyirsən?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2204
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "Zibildəkiləi Silimmi?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2205
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "BoÅŸ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2243
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2243
-#: libnautilus-extensions/nautilus-file-operations.c:2253
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "foo (nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".foo (nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "foo foo (nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2247
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2247
-#: libnautilus-extensions/nautilus-file-operations.c:2254
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "foo (nüsxə)txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2248
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2248
-#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "foo foo (nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (nüsxə).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "foo.. (nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "foo... (nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "foo. (nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "foo. (başqa nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2253
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "foo (başqa nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2254
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "foo (başqa nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "foo (3cü nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "foo (3cü nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (başqa nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3cü nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
+#: libnautilus-extensions/nautilus-file-operations.c:2274
 #, fuzzy
 msgid "foo (13th copy)"
 msgstr "foo (21ci nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
+#: libnautilus-extensions/nautilus-file-operations.c:2274
 #, fuzzy
 msgid "foo (14th copy)"
 msgstr "foo (24cü nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2275
 #, fuzzy
 msgid "foo (13th copy).txt"
 msgstr "foo (21ci nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2275
 #, fuzzy
 msgid "foo (14th copy).txt"
 msgstr "foo (24cü nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2260
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "foo (21ci nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2260
-#: libnautilus-extensions/nautilus-file-operations.c:2262
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "foo (22ci nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2261
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "foo (21ci nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2261
-#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "foo (22ci nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2262
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "foo (23cü nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2263
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "foo (23cü nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2264
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "foo (24cü nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2265
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "foo (24cü nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "foo (25ci nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "foo (25ci nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24ci nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25ci nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24cü nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25ci nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000cu nüsxə).txt"
 
 #. FIXME bugzilla.eazel.com 7701: These are wrong.
-#: libnautilus-extensions/nautilus-file-operations.c:2273
+#: libnautilus-extensions/nautilus-file-operations.c:2289
 #, fuzzy
 msgid "foo (10th copy)"
 msgstr "foo (21ci nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2273
+#: libnautilus-extensions/nautilus-file-operations.c:2289
 #, fuzzy
 msgid "foo (11st copy)"
 msgstr "foo (21ci nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2274
+#: libnautilus-extensions/nautilus-file-operations.c:2290
 #, fuzzy
 msgid "foo (10th copy).txt"
 msgstr "foo (21ci nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2274
+#: libnautilus-extensions/nautilus-file-operations.c:2290
 #, fuzzy
 msgid "foo (11st copy).txt"
 msgstr "foo (21ci nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2291
 #, fuzzy
 msgid "foo (11th copy)"
 msgstr "foo (21ci nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2291
 #, fuzzy
 msgid "foo (12nd copy)"
 msgstr "foo (22ci nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 #, fuzzy
 msgid "foo (11th copy).txt"
 msgstr "foo (21ci nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 #, fuzzy
 msgid "foo (12nd copy).txt"
 msgstr "foo (22ci nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2293
 #, fuzzy
 msgid "foo (12th copy)"
 msgstr "foo (24cü nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2293
 #, fuzzy
 msgid "foo (13rd copy)"
 msgstr "foo (3cü nüsxə)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 #, fuzzy
 msgid "foo (12th copy).txt"
 msgstr "foo (24cü nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 #, fuzzy
 msgid "foo (13rd copy).txt"
 msgstr "foo (3cü nüsxə).txt"
 
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
 #, c-format
 msgid "%ld of %ld"
 msgstr "\"%ld\"in(ın) \"%ld\"i(ı) "
 
-#: libnautilus-extensions/nautilus-font-picker.c:96
-#, fuzzy
-msgid "Normal"
-msgstr "Normal Böyüklük"
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
+msgid "GConf Error"
+msgstr "GConf Xətası"
 
-#: libnautilus-extensions/nautilus-font-picker.c:97
-#: libnautilus-extensions/nautilus-volume-monitor.c:516
-#: libnautilus-extensions/nautilus-volume-monitor.c:535
-#, fuzzy
-msgid "Unknown"
-msgstr "namÉ™'lum"
+#. Constants
+#: libnautilus-extensions/nautilus-global-preferences.c:50
+msgid "Nautilus Preferences"
+msgstr "Nautilus Seçənəkləri"
 
-#: libnautilus-extensions/nautilus-font-picker.c:103
-#, fuzzy
-msgid "Bold"
-msgstr "Borland"
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "həmişə"
 
-#: libnautilus-extensions/nautilus-font-picker.c:104
-#, fuzzy
-msgid "Book"
-msgstr "NiÅŸanlar"
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "Həmişə"
 
-#: libnautilus-extensions/nautilus-font-picker.c:106
-msgid "Demibold"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "sadəcə yerli"
 
-#: libnautilus-extensions/nautilus-font-picker.c:107
-#, fuzzy
-msgid "Light"
-msgstr "Siyahı"
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "Sadəcə olaraq yerli dosyelərdə"
 
-#: libnautilus-extensions/nautilus-font-picker.c:113
-#, fuzzy
-msgid "Italic"
-msgstr "Baltik"
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "qətiyyən"
 
-#: libnautilus-extensions/nautilus-font-picker.c:114
-#, fuzzy
-msgid "Oblique"
-msgstr "Köhnələr"
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "Qətiyyən"
 
-#: libnautilus-extensions/nautilus-font-picker.c:115
-#, fuzzy
-msgid "Reverse Italic"
-msgstr "Çevir"
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "Daha Düzgün Rəsmlər"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "Daha düzgün (fəqət daha yavaş) rəsmləri istifadə et"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "Yazı növləri"
 
-#: libnautilus-extensions/nautilus-font-picker.c:116
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
 #, fuzzy
-msgid "Reverse Oblique"
-msgstr "Tərs Düzülüş"
+msgid "Font for Icon view:"
+msgstr "Musiqi nümayişi e'malatxanası"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-font-picker.c:123
+#: libnautilus-extensions/nautilus-global-preferences.c:609
 #, fuzzy
-msgid "Condensed"
-msgstr "İçindəkilər :"
+msgid "Font for List view:"
+msgstr "Keçmiş nümayişi e'malatxanası"
 
-#: libnautilus-extensions/nautilus-font-picker.c:124
-msgid "Semicondensed"
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-font-picker.c:226
-msgid "Font"
-msgstr "Yazı növü"
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
-msgid "GConf Error"
-msgstr "GConf Xətası"
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "Masa üstünü çəkmək üçün Nautilusdan istifadə et"
 
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:956
-msgid "fixed"
-msgstr "sabit"
-
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1427
-msgid "01/01/00, 01:00 AM"
-msgstr "01/01/00, 01:00 AM"
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
+msgstr "Yeni Pəncərələr Açılır"
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1428
-msgid "1/1/00, 1:00 AM"
-msgstr "1/1/00, 1:00 AM"
+#: libnautilus-extensions/nautilus-global-preferences.c:651
+msgid "Open each file or folder in a separate window"
+msgstr "Hər faylı və ya qovluğu başqa bir pəncərəde aç"
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1429
-msgid " 1/ 1/00,  1:00 AM"
-msgstr " 1/ 1/00,  1:00 AM"
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+#, fuzzy
+msgid "Display toolbar in new windows"
+msgstr "Vasitə çubuğunu yeni pəncərədə göstər"
 
-#. Constants
-#: libnautilus-extensions/nautilus-global-preferences.c:50
-msgid "Nautilus Preferences"
-msgstr "Nautilus Seçənəkləri"
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "Yer çubuğunu yeni pəncərədə göstər"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:97
-msgid "current theme"
-msgstr "hazırkı örtü"
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "Vəziyyət çubuğunu yeni pəncərədə göstər"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:100
-msgid "Open each file or folder in a separate window"
-msgstr "Hər faylı və ya qovluğu başqa bir pəncərəde aç"
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "Yan Çubuğu yeni bir pəncərəde göstər"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:103
-msgid "Ask before emptying the Trash"
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "Zibil Qutusu Davranışı"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+#, fuzzy
+msgid "Ask before emptying the Trash or deleting files"
 msgstr "Zibil qutusunu boşaltmadan əvvəl soruş"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:106
-#: libnautilus-extensions/nautilus-global-preferences.c:597
-msgid "Click Behavior"
-msgstr "Tıqlama davranışı"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
+
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:109
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 msgid "single"
 msgstr "tək tıqlama"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:110
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "Üzvləri tək tıqlamayla seç"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:114
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "cüt tıqlama"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:115
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "Üzvləri cüt tıqlamayla seç"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:119
-#: libnautilus-extensions/nautilus-global-preferences.c:604
-msgid "Executable Text Files"
-msgstr "İşə Salına Bilən Mətn Faylları"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:122
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 msgid "launch"
 msgstr "baÅŸlat"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:123
+#: libnautilus-extensions/nautilus-global-preferences.c:726
 msgid "Execute files when they are clicked"
 msgstr "Faylları tıqlandıqlarında işə sal"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:127
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 msgid "display"
 msgstr "göstər"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:128
+#: libnautilus-extensions/nautilus-global-preferences.c:730
 msgid "Display files when they are clicked"
 msgstr "Faylları tıqlandıqlarında göstər"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:132
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 msgid "ask"
 msgstr "soruÅŸ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:133
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 msgid "Ask each time"
 msgstr "HamiÅŸÉ™ soruÅŸ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:143
-#: libnautilus-extensions/nautilus-global-preferences.c:725
-msgid "Show Text in Icons"
-msgstr "Timsallarda Mətni Göstər"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:146
-#: libnautilus-extensions/nautilus-global-preferences.c:732
-msgid "Show Count of Items in Folders"
-msgstr "Qovluqdakı Üzv Miqdarını Göstər"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:149
-#: libnautilus-extensions/nautilus-global-preferences.c:739
-msgid "Show Thumbnails for Image Files"
-msgstr "Rəsm Faylları üçün Nümayişçi Rəsmləri Göstər"
-
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:152
-#: libnautilus-extensions/nautilus-global-preferences.c:755
-msgid "Make Folder Appearance Details Public"
-msgstr "Qovluq Görünüşünün �traflı Mə'lumatlarını Ümumi Et"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:155
-#: libnautilus-extensions/nautilus-global-preferences.c:746
-msgid "Preview Sound Files"
-msgstr "Səs Fayllarını Nümayiş Etdir"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Use smoother (but slower) graphics"
-msgstr "Daha düzgün (fəqət daha yavaş) rəsmləri istifadə et"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Use this font family to display file names:"
-msgstr "Fayl adlarında istifadə edəcəyin yazı növü ailesi:"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-#, fuzzy
-msgid "Display toolbar in new windows"
-msgstr "Vasitə çubuğunu yeni pəncərədə göstər"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:170
-msgid "Display location bar in new windows"
-msgstr "Yer çubuğunu yeni pəncərədə göstər"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:173
-msgid "Display status bar in new windows"
-msgstr "Vəziyyət çubuğunu yeni pəncərədə göstər"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:176
-msgid "Display sidebar in new windows"
-msgstr "Yan Çubuğu yeni bir pəncərəde göstər"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:179
-msgid "Use Nautilus to draw the desktop"
-msgstr "Masa üstünü çəkmək üçün Nautilusdan istifadə et"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:183
-msgid "Enable fast search (indexes your hard drive)"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-global-preferences.c:186
-msgid "search type to do by default"
-msgstr "əsas axtarış növü"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:189
-msgid "search by text"
-msgstr "mətndən axtar"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:190
-#, fuzzy
-msgid "Search for files by file name only"
-msgstr "Sadəcə olaraq mətnə görə axtar"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:194
-msgid "search by text and properties"
-msgstr "mətn və xüsusiyyətləre görə axtar"
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "Tıqlama davranışı"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:195
-#, fuzzy
-msgid "Search for files by file name and file properties"
-msgstr "Faylları mətn və xüsusiyyətləre görə axtar"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr "İşə Salına Bilən Mətn Faylları"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:199
-#, fuzzy
-msgid "Search Engine Location"
-msgstr "Veb Axtarış Məkanı"
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr "Seçənəkləri Gizlə/Göstər"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:203
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr "Gizli faylları göstər (fayl adları \".\" ilə başlayanlar)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:206
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr ""
 "Ehtiyat nüsxə fayllarını göstər (fayl adları \"~\" ilə bitənlər)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:209
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr "Xüsusiyyətler pəncərəsinde xüsusi işarətləri göstər"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:212
+#: libnautilus-extensions/nautilus-global-preferences.c:778
 #, fuzzy
-msgid "Show only folders (no files) in the tree"
-msgstr "Ağacda sadəcə olaraq qovluqları (faylları deyil) göstər"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:215
-msgid "Can add Content"
-msgstr "�lavə Ediləbilən Mövtəviyyat"
+msgid "Sorting Order"
+msgstr "Yiyə Düzəlşi Xətası"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:218
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
-msgstr "�sas qurulu nişanları Nişanlar menyusuna alma"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:222
-#: libnautilus-extensions/nautilus-global-preferences.c:227
-#: src/file-manager/fm-properties-window.c:1519 src/nautilus-location-bar.c:62
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
 msgid "Location:"
 msgstr "Yer :"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:226
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+#, fuzzy
+msgid "HTTP Proxy Settings"
+msgstr "Vəkil Verici Qurğuları"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "HTTP Vəkil Vericidən İstifadə Et"
 
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:228
+#: libnautilus-extensions/nautilus-global-preferences.c:812
 #: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr "Qapı:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:533
-msgid "Appearance"
-msgstr "Görünüş"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:535
-msgid "Smoother Graphics"
-msgstr "Daha Düzgün Rəsmlər"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "�vvəldən Qurulu Nişanlar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:552
-msgid "Windows & Desktop"
-msgstr "Pəncərələr və Masa üstü"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "�sas qurulu nişanları Nişanlar menyusuna alma"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:560
-msgid "Opening New Windows"
-msgstr "Yeni Pəncərələr Açılır"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "Timsallarda Mətni Göstər"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:583
-msgid "Trash Behavior"
-msgstr "Zibil Qutusu Davranışı"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr "Qovluqdakı Üzv Miqdarını Göstər"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:595
-msgid "Icon & List Views"
-msgstr "Timsal və Siyahı Nümayişləri"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "Rəsm Faylları üçün Nümayişçi Rəsmləri Göstər"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:611
-msgid "Show/Hide Options"
-msgstr "Seçənəkləri Gizlə/Göstər"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:632
-msgid "Sidebar Panels"
-msgstr "Yan çubuqları"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr "Səs Fayllarını Nümayiş Etdir"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:635
-msgid "Tabs"
-msgstr "Təblər"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr "Qovluq Görünüşünün �traflı Mə'lumatlarını Ümumi Et"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:684
-msgid "Navigation"
-msgstr "Naviqasiya"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "Görünüş"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:693
-#, fuzzy
-msgid "HTTP Proxy Settings"
-msgstr "Vəkil Verici Qurğuları"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr "Pəncərələr və Masa üstü"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:712
-msgid "Built-in Bookmarks"
-msgstr "�vvəldən Qurulu Nişanlar"
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr "Timsal və Siyahı Nümayişləri"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+msgid "Navigation"
+msgstr "Naviqasiya"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:723
+#: libnautilus-extensions/nautilus-global-preferences.c:962
 msgid "Speed Tradeoffs"
 msgstr "Sür'ətləndirmələr"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:794
-msgid "Search"
-msgstr "Axtar"
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr "mətndən axtar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+#, fuzzy
+msgid "Search for files by file name only"
+msgstr "Sadəcə olaraq mətnə görə axtar"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr "mətn və xüsusiyyətləre görə axtar"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+#, fuzzy
+msgid "Search for files by file name and file properties"
+msgstr "Faylları mətn və xüsusiyyətləre görə axtar"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "Axtarış Seçənəkləri"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:802
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "əsas axtarış növü"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 #, fuzzy
 msgid "Fast Search"
 msgstr "Axtar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:846
-msgid "Fonts"
-msgstr "Yazı növləri"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1026
-#, c-format
-msgid "Display %s tab in sidebar"
-msgstr "Yan çubudqda %s \"tab\"ı göstər"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1073
-msgid "always"
-msgstr "həmişə"
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+#, fuzzy
+msgid "Search Engine Location"
+msgstr "Veb Axtarış Məkanı"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1074
-msgid "Always"
-msgstr "Həmişə"
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Axtar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1077
-msgid "local only"
-msgstr "sadəcə yerli"
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+#, fuzzy
+msgid "Show only folders (no files) in the tree"
+msgstr "Ağacda sadəcə olaraq qovluqları (faylları deyil) göstər"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1078
-msgid "Local Files Only"
-msgstr "Sadəcə olaraq yerli dosyelərdə"
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, c-format
+msgid "Display %s tab in sidebar"
+msgstr "Yan çubudqda %s \"tab\"ı göstər"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1081
-msgid "never"
-msgstr "qətiyyən"
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "Yan çubuqları"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1082
-msgid "Never"
-msgstr "Qətiyyən"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr "Təblər"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1145
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "currently can't be performed because the program crond, which does nightly "
@@ -5953,13 +5932,13 @@ msgid ""
 "done, turn crond on."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1152
-#: libnautilus-extensions/nautilus-global-preferences.c:1170
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
 msgid "Files May Not Be Indexed"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1153
-#: libnautilus-extensions/nautilus-global-preferences.c:1171
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
 msgid ""
 "If you are running Linux, you can log in as root and type these commands to "
 "start cron:\n"
@@ -5968,7 +5947,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1162
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "may not be performed because the program crond, which does nightly tasks on "
@@ -5977,15 +5956,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-gnome-extensions.c:640
-msgid "No image was selected.  You must click on an image to select it."
-msgstr ""
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:641
-#, fuzzy
-msgid "No selection made"
-msgstr "buradakı qisim"
-
 #. The list of characters that cause line breaks can be localized.
 #: libnautilus-extensions/nautilus-icon-canvas-item.c:70
 msgid " -_,;.?/&"
@@ -6035,59 +6005,40 @@ msgstr "�llə Düzülüşə Keçimmi?"
 msgid "Switch"
 msgstr "Keç"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "Təzədən adlandır"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1551
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr "Yazdıqlarımı Geriyə Al"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1552
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "Köhnə adına geri dön"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1553
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "Yazdıqlarımı Bərpa Et"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1554
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Dəyişdirilmiş adı bərpa et"
 
-#: libnautilus-extensions/nautilus-password-dialog.c:306
-msgid "Remember this password"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-preferences-item.c:483
-#, fuzzy
-msgid "times"
-msgstr "_Tayms"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:484
-#, fuzzy
-msgid "courier"
-msgstr "_Kuriyer"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:485
-#, fuzzy
-msgid "lucida"
-msgstr "Lusida"
-
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "Yeni BaÅŸlayan"
 
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "Orta Səviyyəli"
 
-#: libnautilus-extensions/nautilus-preferences.c:79
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "Mütəxəssis"
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:202
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "Seçənəklər Qutusu"
 
@@ -6186,7 +6137,7 @@ msgid "Don't include in the menu for \"%s\" items"
 msgstr "Bütün \"%s\" üçün menyularda var olmasın"
 
 #: libnautilus-extensions/nautilus-program-chooser.c:1209
-#: src/file-manager/fm-list-view.c:2123
+#: src/file-manager/fm-list-view.c:2182
 #: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
@@ -6540,25 +6491,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Qovluq olan və adlarında \"medusa\" daxil edən üzvlər"
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr "�traflı"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr "Xabərdarlıq"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr "Xəta"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr "Sual"
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr "Disklər Axtarılıq"
@@ -6568,7 +6500,7 @@ msgstr "Disklər Axtarılıq"
 msgid "Nautilus is searching your disks for trash folders."
 msgstr "Nautilus zibil qutusu olan qovluqları axtarır"
 
-#: libnautilus-extensions/nautilus-trash-file.c:600
+#: libnautilus-extensions/nautilus-trash-file.c:725
 msgid "on the desktop"
 msgstr "masa üstündə"
 
@@ -6602,47 +6534,45 @@ msgstr "%s olaraq göstər"
 msgid "%s Viewer"
 msgstr "%s Göstərici"
 
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+#, fuzzy
+msgid "Unknown"
+msgstr "namÉ™'lum"
+
 #. Populate table with items we know localized names for.
-#: libnautilus-extensions/nautilus-volume-monitor.c:623
-#: libnautilus-extensions/nautilus-volume-monitor.c:1862
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr "Floppi"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:624
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
 msgid "CD-ROM"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:625
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
 msgid "Zip Drive"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:646
-#: libnautilus-extensions/nautilus-volume-monitor.c:668
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1547
-msgid "Mount Error"
-msgstr "Bağlama Xətası"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1549
-msgid "Unmount Error"
-msgstr "Ayırma Xətası"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1579
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr "yazma qorumalıdır, sırf oxunmaq üzəra bağlayıram"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1582
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "hökmlü blok avadanlığı deyil"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1583
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr "Heç bir medya tapılmadı"
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1587
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
@@ -6651,18 +6581,18 @@ msgstr ""
 "disket yoxdur."
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1591
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
 msgstr ""
 "Nautilus cildi bağlaya bilmədi. Dəyəsən avadanlıqda medya yoxdur."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1594
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr "səhv fs növü, səhv seçənək, səhv üst bloklu"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1597
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
@@ -6670,7 +6600,7 @@ msgstr ""
 "Nautilus disket sürücüsünü bağlaya bilmədi. Dəyəsən disket "
 "bağlanması mümkün olmayan şəkildədir."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1600
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
@@ -6678,50 +6608,58 @@ msgstr ""
 "Nautilus cildi bağlaya bilmədi. Dəyəsən cild bağlanması mümkün "
 "olmayan şakildədir."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1605
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr "Nautilus seçili disketi bağlaya bilmədi."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1607
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "Nautilus seçili cildi bağlaya bilmədi."
 
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1612
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr "Nautilıs seçili cildi ayıra bilmədi."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1764
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr "Bağlama Xətası"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr "Ayırma Xətası"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "ISO 9660 Cildi"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1779
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "Kök"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1786
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Ext2 Cildi"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1801
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "MSDOS Cildi"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1816
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "NFS Cildi"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1831
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
 #, fuzzy
 msgid "ReiserFS Volume"
 msgstr "NFS Cildi"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1847
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
 #, fuzzy
 msgid "UFS Volume"
 msgstr "NFS Cildi"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1877
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "NamÉ™'lum Cild"
 
@@ -6729,31 +6667,66 @@ msgstr "NamÉ™'lum Cild"
 msgid "C_lear Text"
 msgstr "Mətni _təmizlə"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "Mətni _təmizlə"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "Mətni K_öçürt"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "Seçili mətni ara yaddaşa köçürt"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:15
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "Mətni _Kəs"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
 msgid "Cut _Text"
 msgstr "_Mətni Kəs"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "Seçili mətni ara yaddaşa kəs"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:5 src/nautilus-shell-ui.xml.h:46
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "Mətni Y_apışdır"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "Seçili mətni ara yaddaşa yapışdır"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:6
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "Seçili mətni ara yaddaşa qoymadan sil"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:7 src/nautilus-shell-ui.xml.h:80
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "_Hamısını Seç"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+#, fuzzy
+msgid "Select _All"
+msgstr "_Hamısını Seç"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "Bu pəncərədeki bütün üzvləri seç"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "Mətni K_öçürt"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:93
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "Mətni Y_apışdır"
 
@@ -6762,7 +6735,7 @@ msgstr "Mətni Y_apışdır"
 #. * to change it when we upgrade to GTK 2.0.
 #.
 #: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
-#: src/nautilus-window-menus.c:573
+#: src/nautilus-window-menus.c:610
 msgid "Nautilus"
 msgstr "Nautilus"
 
@@ -6778,80 +6751,110 @@ msgstr "Nautilus Fayl İdarəcisi və Qrafiki Qabıq"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:786
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr " \"%s\"in(ın)  Evi"
 
-#: src/file-manager/fm-desktop-icon-view.c:1072
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "Zibili BoÅŸalt..."
 
-#: src/file-manager/fm-desktop-icon-view.c:1074
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "Zibili BoÅŸalt"
 
-#: src/file-manager/fm-desktop-icon-view.c:1094
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "Cildi Ayır"
 
-#: src/file-manager/fm-directory-view.c:474
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr ""
 "Bu, %d qədər müxtalif pəncərə açacaqdır. Həqiqətən də bunu "
 "etmək istəyirsinizmi?"
 
-#: src/file-manager/fm-directory-view.c:476
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d Pəncərə Aç"
 
-#: src/file-manager/fm-directory-view.c:1212
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr "\"%s\"i(ı) zibil qutusunda həmişəlik silmək istəyirsənmi?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+"%d seçili üzvü zibil qutusundan həmişəlik silmək istəyirsənmi?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Sil"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Sil"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+msgid "scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" seçilidir"
 
-#: src/file-manager/fm-directory-view.c:1214
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "1 qovluq seçilidir"
 
-#: src/file-manager/fm-directory-view.c:1217
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "%d qovluq seçilidir"
 
-#: src/file-manager/fm-directory-view.c:1223
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr "( 0 üzv daxil edir )"
 
-#: src/file-manager/fm-directory-view.c:1225
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr "( 1 üzv daxil edir )"
 
-#: src/file-manager/fm-directory-view.c:1227
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr "( %d üzv daxil edir )"
 
-#: src/file-manager/fm-directory-view.c:1238
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" seçilidir (%s)"
 
-#: src/file-manager/fm-directory-view.c:1242
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d üzv seçilidir (%s)"
 
-#: src/file-manager/fm-directory-view.c:1249
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 başqa üzv seçilidir (%s)"
 
-#: src/file-manager/fm-directory-view.c:1252
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d başqa üzv seçilidir (%s)"
@@ -6863,7 +6866,7 @@ msgstr "%d başqa üzv seçilidir (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1281
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -6872,7 +6875,7 @@ msgstr "%s%s, %s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1407
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
@@ -6881,11 +6884,11 @@ msgstr ""
 "Bu, \"%s\" qovluğu Nautilisun icazə verdiyi miqdardan artıq fayl daxil "
 "edir. Bə'zi fayllar göstərilməyəcəkdir."
 
-#: src/file-manager/fm-directory-view.c:1414
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "Həddindən Artıq Fayl"
 
-#: src/file-manager/fm-directory-view.c:2623
+#: src/file-manager/fm-directory-view.c:2752
 #, fuzzy, c-format
 msgid ""
 "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
@@ -6893,7 +6896,7 @@ msgstr ""
 "\"%s\" zibilə atıla bilmədi. Bunu ele hal hazırda silmək "
 "istəyirsinizmi?"
 
-#: src/file-manager/fm-directory-view.c:2628
+#: src/file-manager/fm-directory-view.c:2757
 #, fuzzy, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
@@ -6902,7 +6905,7 @@ msgstr ""
 "%d qədər seçili üzv zibilə atıla bilmir. Bunları ele hal hazırda "
 "silmək istəyirsinizmi?"
 
-#: src/file-manager/fm-directory-view.c:2632
+#: src/file-manager/fm-directory-view.c:2761
 #, fuzzy, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -6911,21 +6914,16 @@ msgstr ""
 "Seçili üzvlərdən %d qədəri zibilə atıla bilmir. Bu, %d "
 "üzvləriniele hal hazırda silmək istəyirsinizmi?"
 
-#: src/file-manager/fm-directory-view.c:2640
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "Həmən Silimmi*"
 
-#: src/file-manager/fm-directory-view.c:2641
-#: src/file-manager/fm-directory-view.c:2682
-msgid "Delete"
-msgstr "Sil"
-
-#: src/file-manager/fm-directory-view.c:2671
+#: src/file-manager/fm-directory-view.c:2799
 #, fuzzy, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr "\"%s\"i(ı) zibil qutusunda həmişəlik silmək istəyirsənmi?"
 
-#: src/file-manager/fm-directory-view.c:2675
+#: src/file-manager/fm-directory-view.c:2803
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
@@ -6933,76 +6931,214 @@ msgid ""
 msgstr ""
 "%d seçili üzvü zibil qutusundan həmişəlik silmək istəyirsənmi?"
 
-#: src/file-manager/fm-directory-view.c:2681
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "Zibil Qutusundan Sillimmi?"
 
-#: src/file-manager/fm-directory-view.c:2978
-#: src/file-manager/fm-directory-view.c:3018
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Seçili üzvü açmaq üçün \"%s\"dan(dən) istifadə et"
 
-#: src/file-manager/fm-directory-view.c:3220
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "BaÅŸqa _Proqram..."
+
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "BaÅŸqa _Proqram..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "Başqa _Nümayişçi..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "Başqa _Nümayişçi..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "Seçili üzvü açmaq üçün \"%s\"dan(dən) istifadə et"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "Nautilus seçili cildi bağlaya bilmədi."
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"%d qədər seçili üzv zibilə atıla bilmir. Bunları ele hal hazırda "
+"silmək istəyirsinizmi?"
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "Yeni Pəncərəde Aç"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 #, fuzzy
 msgid "Open _in New Window"
 msgstr "Yeni Pəncərəde Aç"
 
-#: src/file-manager/fm-directory-view.c:3222
+#: src/file-manager/fm-directory-view.c:3959
 #, fuzzy, c-format
 msgid "Open _in %d New Windows"
 msgstr "\"%d\"ni(nı) _Yeni Pəncərəde Aç"
 
-#: src/file-manager/fm-directory-view.c:3248
-msgid "Delete all selected items permanently"
-msgstr "Bütün seçili üzvləri həmişəlik sil"
-
-#: src/file-manager/fm-directory-view.c:3253
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "_Zibil Qutusundan Sil..."
 
-#: src/file-manager/fm-directory-view.c:3254
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "_Zibil Qutusundan Sil"
 
-#: src/file-manager/fm-directory-view.c:3258
-msgid "Move all selected items to the Trash"
-msgstr "Bütün seçili üzvləri zibil qutusuna daşı"
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "Bütün seçili üzvləri həmişəlik sil"
 
-#: src/file-manager/fm-directory-view.c:3262
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "Zi_bilə Daşı"
 
-#: src/file-manager/fm-directory-view.c:3292
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "Bütün seçili üzvləri zibil qutusuna daşı"
+
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "_Sil ..."
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "Sil"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "_Bağları Yarat"
 
-#: src/file-manager/fm-directory-view.c:3293
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "_BaÄŸ Yarat"
 
-#: src/file-manager/fm-directory-view.c:3311
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "Zibil Qutusunu _BoÅŸalt..."
 
-#: src/file-manager/fm-directory-view.c:3312
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "Zibil Qutusunu _BoÅŸalt"
 
-#: src/file-manager/fm-directory-view.c:3323
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "Xüsusi _Rəsmləri sil"
 
-#: src/file-manager/fm-directory-view.c:3324
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "Xüsusi _Rəsmi sil"
 
-#: src/file-manager/fm-directory-view.c:3477
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "_Fayl"
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u fayl"
+
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "Mətni K_öçürt"
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "Fayl köçürtmə"
+
+#: src/file-manager/fm-directory-view.c:4252
 #, fuzzy
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
@@ -7011,7 +7147,7 @@ msgstr ""
 "Bu bağ hədəfi olmadığı üçün işlədilə bilməz. Bu bağı zibilə "
 "atmaq istəyirsinizmi?"
 
-#: src/file-manager/fm-directory-view.c:3480
+#: src/file-manager/fm-directory-view.c:4255
 #, fuzzy, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
@@ -7020,15 +7156,15 @@ msgstr ""
 "Bu bağ hədəfi \"%s\" növcud olmadığı üçün işlədilə bilməz. Bu "
 "bağı zibilə atmaq istəyirsinizmi?"
 
-#: src/file-manager/fm-directory-view.c:3486
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "Qırıq Körpü"
 
-#: src/file-manager/fm-directory-view.c:3487
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr "At Getsin"
 
-#: src/file-manager/fm-directory-view.c:3540
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
@@ -7037,19 +7173,19 @@ msgstr ""
 "\"%s\" işə salına bilən mətn faylıdır. Bunu işə salıb "
 "içindakiləri görmək istəyirsinizmi*"
 
-#: src/file-manager/fm-directory-view.c:3546
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr "İşə salımmı yoxsa Göstərimmi?"
 
-#: src/file-manager/fm-directory-view.c:3547
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "Ä°ÅŸÉ™ Sal"
 
-#: src/file-manager/fm-directory-view.c:3548
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "Göstər"
 
-#: src/file-manager/fm-directory-view.c:3602
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
@@ -7057,16 +7193,16 @@ msgstr ""
 "Təhlükəsizlik tədbiri olaraq uzaq sistemlərdə əmr işə sala "
 "bilməzsiniz."
 
-#: src/file-manager/fm-directory-view.c:3604
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "Uzaqdakı bağı işə sala bilmirəm"
 
-#: src/file-manager/fm-directory-view.c:3738
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr "\"%s\" açılır"
 
-#: src/file-manager/fm-directory-view.c:3744
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "Açmayı Ləğv Edimmi ?"
 
@@ -7076,16 +7212,21 @@ msgid ""
 "You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "\"%s\"'yə baxmaq üçün lazımi səlahiyyətlərə sahib deyilsiniz."
 
-#: src/file-manager/fm-error-reporting.c:65
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Təəsüf ki \"%s\"nin(nın) içindəkiləri göstərə bilmirəm."
 
-#: src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Qovluq Nümayiş Xətası"
 
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
@@ -7093,21 +7234,21 @@ msgstr ""
 "\"%s\" adı bu qovluqda onsuz da istifadə edilməkdədir.\n"
 "Lütfən başqa bir ad istifadə edin."
 
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 "\"%s\" bu qovluqda deyildir. Silinmiş və ya daşınmış ola bilərmi?"
 
-#: src/file-manager/fm-error-reporting.c:109
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr ""
 "\"%s\"i(ı) təzədən adlandırmaq üçün lazımi səlahiyyətlərinə "
 "sahib deyilsən."
 
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -7116,28 +7257,28 @@ msgstr ""
 "\"%s\" adı \"/\" işarəsi daxil etdiyi üçün hökmsüzdür. Lütfən "
 "baÅŸqa bir ad istifadÉ™ edin."
 
-#: src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "\"%s\" adı hökmsüzdür. Lütfən başqa bir ad istifadə edin."
 
-#: src/file-manager/fm-error-reporting.c:124
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "\"%s\"in(ın) adı dəyişdirilə bilmir, çünkü sırf oxunan diskdədir"
 
-#: src/file-manager/fm-error-reporting.c:133
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr ""
 "Təəssüf ki \"%s\"nin(nın) adını \"%s\"'ye dəyişdirə bilmədim."
 
-#: src/file-manager/fm-error-reporting.c:140
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "Təzədən Adlandırma Xətası"
 
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
@@ -7145,37 +7286,37 @@ msgstr ""
 "\"%s\"nin(nın) qrupunu dəyişdirmek üçün lazımi səlahiyyətlərinə "
 "sahib deyilsən ."
 
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
 "\"%s\"in(ın) qrupu dəyişdirilə bilmir, çünkü sırf oxunan diskdədir"
 
-#: src/file-manager/fm-error-reporting.c:172
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Təəsüf ki \"%s\"nin(nın) qrupunu dəyişdirə bilmədim."
 
-#: src/file-manager/fm-error-reporting.c:176
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "Qruplaşdırma Xətası"
 
-#: src/file-manager/fm-error-reporting.c:198
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
 "\"%s\"in(ın) yiyəsi dəyişdirilə bilmir, çünkü sırf oxunan diskdədir"
 
-#: src/file-manager/fm-error-reporting.c:205
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Təəsüf ki \"%s\"nin(nın) yiyəsini dəyişdirə bilmədim ."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "Yiyə Düzəlşi Xətası"
 
-#: src/file-manager/fm-error-reporting.c:230
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
@@ -7183,22 +7324,22 @@ msgstr ""
 "Təəsüf ki \"%s\"nin(nın) səlahiyyətlərnı sorf oxunan diskdə "
 "yerləşdiyi üçün dəyişdirə bilmədim ."
 
-#: src/file-manager/fm-error-reporting.c:237
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr ""
 "Təəsüf ki \"%s\"nin(nın) səlahiyyətlərnı dəyişdirə bilmədim ."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "Səlahiyyət Dəyişdirmə Xətası"
 
-#: src/file-manager/fm-error-reporting.c:306
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "\"%s\"nin(nın) adı \"%s\"a(ə) dəyişdirildi ."
 
-#: src/file-manager/fm-error-reporting.c:311
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "Təzədən Adlandırmayı Ləğv Edimmi?"
 
@@ -7259,76 +7400,76 @@ msgstr ""
 "gedərək böyütdüyün an , bu mə'lumatlardan daha çoxunu görəcəksən "
 "."
 
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "_Ada görə"
 
-#: src/file-manager/fm-icon-view.c:159
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "Timsalları adlarına görə sırala"
 
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "_Böyüklüyə görə"
 
-#: src/file-manager/fm-icon-view.c:166
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "Timsalları böyüklüklərinə görə sırala"
 
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "_Növə görə"
 
-#: src/file-manager/fm-icon-view.c:173
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "Timsalları növlərinə görə sırala"
 
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "_Təkmilləşdirmə Tarixine görə"
 
-#: src/file-manager/fm-icon-view.c:180
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Timsalları düzəliş tarixlərinə görə sırala"
 
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "_Emblemlərə görə"
 
-#: src/file-manager/fm-icon-view.c:187
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Timsalları emblemlərə görə sırala"
 
-#: src/file-manager/fm-icon-view.c:1230
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "Timsalları Oriinal Böyüklüklərinə _Gətir"
 
-#: src/file-manager/fm-icon-view.c:1231
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "Timsalları Original Böyüklüklərinə G_ətir"
 
-#: src/file-manager/fm-icon-view.c:1443
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "\"%s\" göstərilər"
 
-#: src/file-manager/fm-list-view.c:2129
+#: src/file-manager/fm-list-view.c:2188
 #: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Böyüklük"
 
-#: src/file-manager/fm-list-view.c:2135
+#: src/file-manager/fm-list-view.c:2194
 #: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Növ"
 
-#: src/file-manager/fm-list-view.c:2141
+#: src/file-manager/fm-list-view.c:2200
 #: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Təkmilləşdirmə Tarixi"
@@ -7385,121 +7526,127 @@ msgstr "( bə'zi girişlər oxuna bilmədi )"
 msgid "Contents:"
 msgstr "İçindəkilər :"
 
-#: src/file-manager/fm-properties-window.c:1433
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "Təməl"
 
-#: src/file-manager/fm-properties-window.c:1512
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Növ : "
 
-#: src/file-manager/fm-properties-window.c:1517
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "Böyüklük : "
 
-#: src/file-manager/fm-properties-window.c:1521
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "Körpü dəstələri"
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
 msgstr "MIME növü : "
 
-#: src/file-manager/fm-properties-window.c:1527
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "Dəyişiklik : "
 
-#: src/file-manager/fm-properties-window.c:1530
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "Çatma :"
 
-#: src/file-manager/fm-properties-window.c:1539
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr "Hazırkı Timsalı Seç..."
 
-#: src/file-manager/fm-properties-window.c:1545
+#: src/file-manager/fm-properties-window.c:1558
 msgid "Remove Custom Icon"
 msgstr "Hazırkı Timsalı Sil..."
 
-#: src/file-manager/fm-properties-window.c:1873
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "İstifadəçi \"ID\"sini göstər"
 
-#: src/file-manager/fm-properties-window.c:1878
+#: src/file-manager/fm-properties-window.c:1891
 msgid "Special Flags:"
 msgstr "Xüsusi Bayraqlar:"
 
-#: src/file-manager/fm-properties-window.c:1881
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "Qrup \"ID\"sini göstər"
 
-#: src/file-manager/fm-properties-window.c:1883
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "Yapışıq"
 
-#: src/file-manager/fm-properties-window.c:1909
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Səlahiyyətlər"
 
-#: src/file-manager/fm-properties-window.c:1915
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
 "Yiyəsi olmadığın üçün, Səlahiyyətləri dəyişdirə bilməzsən."
 
-#: src/file-manager/fm-properties-window.c:1928
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "Fayl Yiyəsi:"
 
-#: src/file-manager/fm-properties-window.c:1937
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "Fayl Qrupu:"
 
-#: src/file-manager/fm-properties-window.c:1955
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "YiyÉ™:"
 
-#: src/file-manager/fm-properties-window.c:1956
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "Qrup:"
 
-#: src/file-manager/fm-properties-window.c:1957
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "O birisilər:"
 
-#: src/file-manager/fm-properties-window.c:1976
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "Oxu"
 
-#: src/file-manager/fm-properties-window.c:1980
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "Yaz"
 
-#: src/file-manager/fm-properties-window.c:1984
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "Ä°ÅŸÉ™ sal"
 
-#: src/file-manager/fm-properties-window.c:2035
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "Mətn Nümayişi :"
 
-#: src/file-manager/fm-properties-window.c:2036
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "Rəqəmlə Görünüş :"
 
-#: src/file-manager/fm-properties-window.c:2037
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "Axırıncı Dəyişiklik : "
 
-#: src/file-manager/fm-properties-window.c:2041
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "\"%s\"nin(nın) səlahiyyətləri bildirilmədi."
 
-#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr "Xüsusiyyətler Pəncərəsinin Nümayişini Ləğv et"
 
-#: src/file-manager/fm-properties-window.c:2322
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr "Xüsusiyyətler Pəncərəsi Yaradılır"
 
-#: src/file-manager/fm-properties-window.c:2422
+#: src/file-manager/fm-properties-window.c:2435
 msgid "Select an icon:"
 msgstr "Timsal Seç:"
 
@@ -7523,7 +7670,7 @@ msgid ""
 msgstr "Medusa axtarış xidməti qurulmadığı üçün yetişila bilinmir."
 
 #: src/file-manager/fm-search-list-view.c:159
-#: src/file-manager/nautilus-indexing-info.c:405
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr "Axtarış Xidmətinə Yetişilmir"
 
@@ -7703,7 +7850,7 @@ msgstr ""
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
 #: src/file-manager/fm-search-list-view.c:360
-#: src/file-manager/nautilus-indexing-info.c:340
+#: src/file-manager/nautilus-indexing-info.c:342
 #, fuzzy
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
@@ -7721,7 +7868,7 @@ msgid "Fast searches are not available on your computer"
 msgstr "Sür'ətli axtarış aparıla bilmir"
 
 #: src/file-manager/fm-search-list-view.c:373
-#: src/file-manager/nautilus-indexing-info.c:359
+#: src/file-manager/nautilus-indexing-info.c:361
 #, fuzzy
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
@@ -7731,14 +7878,14 @@ msgstr ""
 "indekslənməsini tələb edir. \"Find\" indeksə indi yetişə bilmir"
 
 #: src/file-manager/fm-search-list-view.c:376
-#: src/file-manager/nautilus-indexing-info.c:345
-#: src/file-manager/nautilus-indexing-info.c:363
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
 #, fuzzy
 msgid "Fast searches are not available on your computer."
 msgstr "Sür'ətli axtarış aparıla bilmir"
 
 #: src/file-manager/fm-search-list-view.c:377
-#: src/file-manager/nautilus-indexing-info.c:364
+#: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
 "To enable fast search, open the Preferences menu and choose Preferences. "
 "Then select Search preferences and put a checkmark in the Enable Fast Search "
@@ -7792,7 +7939,7 @@ msgid "Change Desktop Background"
 msgstr "Masa Üstü Arxa Planını Dəyişdir"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 #, fuzzy
 msgid "Delete all items in the Trash"
 msgstr "Zibil qutusundakı bütün üzvləri sil"
@@ -7841,145 +7988,197 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Seçili üzvü göstərəcək başqa bir göstəriciyi seç"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-msgid "Create Link"
-msgstr "Körpü Yarat"
+#, fuzzy
+msgid "Copy Files"
+msgstr "Fayl köçürtmə"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "Bu qovluq içində yeni boş bir qovluq yarat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "Bütün seçili üzvlərə yumşaq bağ yarat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u fayl"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "Bütün seçili üzvləri zibil qutusuna daşı"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "Cütləşdir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "Bütün seçili üzvləri cütləşdir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "Körpü Yarat"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 #, fuzzy
 msgid "Move each selected item to the Trash"
 msgstr "Bütün seçili üzvləri zibil qutusuna daşı"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Move to Trash"
 msgstr "Zibilə Daşı"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "Yeni Qovluq"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "Aç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 #, fuzzy
 msgid "Open Wit_h"
 msgstr "Fərqli aç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "Fərqli aç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "Hər bir seçili üzvü yeni bir pəncərəde aç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr "Yeni Pəncərəde Aç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Seçili üzvü bu pəncərəde aç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "Başqa Proqramla Aç ..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "Başqa Nümayişçi İlə Aç ..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Other _Application..."
-msgstr "BaÅŸqa _Proqram..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "Mətni Y_apışdır"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-msgid "Other _Viewer..."
-msgstr "Başqa _Nümayişçi..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr "Xüsusi Rəsmləri Sil"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr "Seçili timsaldan bütün xüsusi rəsmlərii sil"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr "Seçili timsaldan bütün xüsusi rəngləri və ya naxışları sil"
 
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "Arxa Planı Sıfırla"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#, fuzzy
+msgid "Scripts"
+msgstr "Gizli"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr "Bütün Faylları Seç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 #, fuzzy
 msgid "Select _All Files"
 msgstr "Bütün Faylları Seç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "Bu pəncərədeki bütün üzvləri seç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr "Xüsusiyyətləri Göstər"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Show Trash"
 msgstr "Zibil Qutusunu Göstər"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "_Xüsusiyyətləri göstər"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 #, fuzzy
 msgid "Show the contents of the Trash"
 msgstr "Zibil qutusu içindəkiləri göstər."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "Hər seçili üzvün xüsusiyyətlərini göstər ya da dəyişdir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "_Cütləşdir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 #, fuzzy
 msgid "_New Folder"
 msgstr "Yeni Qovluq"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "_Aç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "Mətni Y_apışdır"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Show Trash"
 msgstr "Zibil Qutusunu Göstər"
 
@@ -8158,7 +8357,7 @@ msgstr ""
 
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr "İndeksləmə Vəziyyəti"
 
@@ -8176,11 +8375,11 @@ msgstr ""
 msgid "Your files were last indexed at %s"
 msgstr "Fayllarınız axırıncı dəfə \"%s\"da(də) aparıldı"
 
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "İndi Güncəllə"
 
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast.  Your files are currently being indexed."
@@ -8189,11 +8388,11 @@ msgstr ""
 "axtarışlarınız sür'ətli aparılır. Fayllarınız hal hazırda "
 "indekslənir."
 
-#: src/file-manager/nautilus-indexing-info.c:404
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Bağışlayın, Medusa axtarış xidməti fəal deyil."
 
-#: src/file-manager/nautilus-indexing-info.c:426
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -8366,7 +8565,7 @@ msgstr "NiÅŸanlar"
 msgid "Location"
 msgstr "Yer"
 
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:767
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Çıxart"
 
@@ -8538,7 +8737,7 @@ msgstr ""
 msgid "Turn fast search on when cron is enabled"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1028
+#: src/nautilus-first-time-druid.c:1027
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "currently can't be performed because the program crond, which does\n"
@@ -8552,7 +8751,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1036
+#: src/nautilus-first-time-druid.c:1035
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "may not be performed because the program crond, which does nightly tasks\n"
@@ -8566,7 +8765,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1123
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
 "Click Finish to launch Nautilus. You'll start with two\n"
 "Nautilus windows: one shows your home folder, and the\n"
@@ -8576,7 +8775,7 @@ msgid ""
 "We hope you enjoy Nautilus!"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1130
+#: src/nautilus-first-time-druid.c:1129
 msgid ""
 "Click Finish to launch Nautilus. You'll start with a\n"
 "window showing your home folder.\n"
@@ -8584,16 +8783,16 @@ msgid ""
 "We hope you enjoy Nautilus!"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1154
+#: src/nautilus-first-time-druid.c:1153
 msgid "Nautilus First Time Setup"
 msgstr "Nautilus İlk Səfər Qurğuları"
 
-#: src/nautilus-first-time-druid.c:1184
+#: src/nautilus-first-time-druid.c:1183
 #, fuzzy
 msgid "Welcome to Nautilus"
 msgstr "Nautilus'a xoş gəldin !"
 
-#: src/nautilus-first-time-druid.c:1186
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
 "Nautilus...\n"
 "    Is a great file manager for the GNOME desktop.\n"
@@ -8605,53 +8804,53 @@ msgid ""
 msgstr ""
 
 #. set up the final page
-#: src/nautilus-first-time-druid.c:1197
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "Qurtarıldı"
 
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1210
+#: src/nautilus-first-time-druid.c:1209
 #, fuzzy
 msgid "Choose Your User Level"
 msgstr "Usta istifadəçi səviyyəsi"
 
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1214
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr "GMCdən Nautilusa Keçiş"
 
 #. set up the `Launch Medusa' page
-#: src/nautilus-first-time-druid.c:1218
+#: src/nautilus-first-time-druid.c:1217
 #, fuzzy
 msgid "Fast Searches"
 msgstr "Axtar"
 
 #. set up optional page to tell the user how to run cron
-#: src/nautilus-first-time-druid.c:1226
+#: src/nautilus-first-time-druid.c:1225
 msgid "The Cron Daemon"
 msgstr ""
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1231
+#: src/nautilus-first-time-druid.c:1230
 msgid "Checking Your Internet Connection"
 msgstr ""
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1242
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "Nautilus Güncəllənir..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1250
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "Ven Vəkil Verici Quraşdırması"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1325
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "Kod Həlli Güncəlləməsi..."
 
-#: src/nautilus-first-time-druid.c:1342
+#: src/nautilus-first-time-druid.c:1341
 #, fuzzy
 msgid "Update Complete. Click Next to Continue."
 msgstr ""
@@ -8662,7 +8861,7 @@ msgstr ""
 #. * doesn't exist. Arlo and I (jsh) and decided that the
 #. * best thing to do is silently fail
 #.
-#: src/nautilus-first-time-druid.c:1357
+#: src/nautilus-first-time-druid.c:1356
 #, fuzzy
 msgid "No Update Available... Press Next to Continue."
 msgstr ""
@@ -8696,47 +8895,47 @@ msgstr ""
 msgid "View in Multiple Windows?"
 msgstr "Çoxlu pəncərələrdə göstərilsinmi ?"
 
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr "Çox sür'ətli yoxlama sınaq dəstələrini işə sal."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "Bildirilən ölçülərdə başlanğıc pəncəreəsi yarat."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "GEOMETRY"
 
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Təkcə bildirilan URIlər üçün pəncərə yarat."
 
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "Nautilusdan çıx."
 
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "Nautilusu Yenidən Başlat."
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus : --check URI'lərlə bərabər istifadə edilə bilməz.\n"
 
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus : --check başqa seçənəklə istifadə edilə bilməz.\n"
 
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus : --quit URI'lerle bərabər istifadə edilə bilməz.\n"
 
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus : --restart URI'lərlə bərabər istifadə edilə bilməz.\n"
 
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 "nautilus : --geometry birdən çox URI ilə bərabər istifadə edilə "
@@ -9250,15 +9449,18 @@ msgid "View as List"
 msgstr "%s olaraq göstər"
 
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+#, fuzzy
+msgid " _Advanced"
 msgstr " �traflı"
 
 #: src/nautilus-shell-ui.xml.h:2
-msgid " Beginner"
+#, fuzzy
+msgid " _Beginner"
 msgstr " Yeni BaÅŸlayan"
 
 #: src/nautilus-shell-ui.xml.h:3
-msgid " Intermediate"
+#, fuzzy
+msgid " _Intermediate"
 msgstr " Ortabab"
 
 #: src/nautilus-shell-ui.xml.h:4
@@ -9299,21 +9501,21 @@ msgstr "Bütün Nautilus pəncərələri qapat"
 msgid "Close this window"
 msgstr "Bu pəncərəyi qapat"
 
-#: src/nautilus-shell-ui.xml.h:17
+#: src/nautilus-shell-ui.xml.h:15
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr ""
 "Bu menyunun içində nişanların dəyişdirilməsinə icazə verən "
 "pəncərəyi göstər"
 
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr "NAutilusun Yaradıcılarını göstər"
 
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr "Nautilus üçün xətdəki köməyi göstər"
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
@@ -9321,328 +9523,330 @@ msgstr ""
 "Xüsusiyyətleri dəyişdirə biləcək naxış, rəng və emblemləri "
 "göstər"
 
-#: src/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:19
 #, fuzzy
 msgid "Display quick reference pages for Nautilus"
 msgstr "Nautilusun lisenziyasını göstər"
 
-#: src/nautilus-shell-ui.xml.h:22
+#: src/nautilus-shell-ui.xml.h:20
 #, fuzzy
 msgid "Display release notes for Nautilus"
 msgstr "Nautilusun lisenziyasını göstər"
 
-#: src/nautilus-shell-ui.xml.h:23
+#: src/nautilus-shell-ui.xml.h:21
 #, fuzzy
 msgid "Display support information for Nautilus and Eazel Services"
 msgstr "Eazel Xidmətləri mə'lumatını göstər"
 
-#: src/nautilus-shell-ui.xml.h:24
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Display the latest contents of the current location"
 msgstr "Hal hazırkı yerin ən son möhtəviyyatını göstər"
 
-#: src/nautilus-shell-ui.xml.h:25
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr "Mövcud örtüləri göstər"
 
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:24
 msgid "Edit various Nautilus preferences"
 msgstr "Müxtəlif Nautilus Xüsusiyyətlərini Düzəlt"
 
-#: src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "Axtar"
 
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr "Keçmişi U_nut"
 
-#: src/nautilus-shell-ui.xml.h:29
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr "Eazel Xidmətlərinə Get"
 
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr "EvimÉ™ get"
 
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr "Bunu daxil edən yerə get"
 
-#: src/nautilus-shell-ui.xml.h:32
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr "Sonrakı yerə get"
 
-#: src/nautilus-shell-ui.xml.h:33
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr "�vvəlki yerə get"
 
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:446
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
 #, fuzzy
 msgid "Hide Location _Bar"
 msgstr "Yer Çubuğunu Gizlət"
 
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:428
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
 #, fuzzy
 msgid "Hide St_atus Bar"
 msgstr "Vəziyyət Çubuğunu Gizlət"
 
-#: src/nautilus-shell-ui.xml.h:36 src/nautilus-window-menus.c:434
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
 #, fuzzy
 msgid "Hide _Sidebar"
 msgstr "Yan Çubuğu Gizlət"
 
-#: src/nautilus-shell-ui.xml.h:37 src/nautilus-window-menus.c:440
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
 #, fuzzy
 msgid "Hide _Toolbar"
 msgstr "Vasitə Çubuğunu Gizlət"
 
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:37
 #, fuzzy
 msgid "Nautilus Quick _Reference"
 msgstr "Nautilus Seçənəkləri"
 
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:38
 #, fuzzy
 msgid "Nautilus Release _Notes"
 msgstr "Nautilus : %s xüsusiyyətləri"
 
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:39
 #, fuzzy
 msgid "Nautilus User _Manual"
 msgstr "Nautilus İstifadəçi Bələdçisi"
 
-#: src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "Yeni Pəncərə"
 
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:41
 #, fuzzy
 msgid "New _Window"
 msgstr "Yeni Pəncərə"
 
-#: src/nautilus-shell-ui.xml.h:44
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "Normal Böyüklük"
 
-#: src/nautilus-shell-ui.xml.h:45
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Yeri göstərmək üçün yeni bir Nautilus pəncərəsi aç"
 
-#: src/nautilus-shell-ui.xml.h:47
-msgid "Preferences..."
-msgstr "Xüsusiyyətlər..."
-
-#: src/nautilus-shell-ui.xml.h:48
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "YenilÉ™"
 
-#: src/nautilus-shell-ui.xml.h:49
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "Seçili mətni ara yaddaşa qoymadan silər"
-
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr "Profilləşdirməyi Raport Et"
 
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr "Profilləşdirməyi Sıfırla"
 
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr "VebdÉ™ Axtar"
 
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr "Faylları bu kompüterdə axtar"
 
-#: src/nautilus-shell-ui.xml.h:54
-#, fuzzy
-msgid "Select _All"
-msgstr "_Hamısını Seç"
-
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
 msgstr "Nautilus və Eazel ila əlaqə qura biləcəyiniz səhifəni göstər"
 
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "İçindəkiləri normal böyüklükdə göstər"
 
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "İçindəkiləri azaldılmış olaraq göstər"
 
-#: src/nautilus-shell-ui.xml.h:58
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "İçindəkiləri ətraflı göstər"
 
-#: src/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr "Profilləşdirməni Başlat"
 
-#: src/nautilus-shell-ui.xml.h:61
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr "Profilləşdirməni Qurtar"
 
-#: src/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr "Bu yeri yükləməni dayandır"
 
-#: src/nautilus-shell-ui.xml.h:63
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "Axırıncı mətn dəyişikliyini geri al"
 
-#: src/nautilus-shell-ui.xml.h:64
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "Yuxarı"
 
-#: src/nautilus-shell-ui.xml.h:65
-msgid "Use Advanced settings"
-msgstr "�traflı Qurğuları Göstər"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:66
-msgid "Use Beginner settings"
-msgstr "Yeni Başlayan Qurğularını İşlət"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:67
-msgid "Use Intermediate settings"
-msgstr "Ortabab İstifadəçi Qurğularını İşlət"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:63
 #, fuzzy
 msgid "We_b Search"
 msgstr "VebdÉ™ axtar"
 
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "VebdÉ™ axtar"
 
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "Yaxınlaş"
 
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "UzaqlaÅŸ"
 
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "_Yaxınlaş"
 
-#: src/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "_UzaqlaÅŸ"
 
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "_Nautilus haqqında ..."
 
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "_Nişan əlavə et"
 
-#: src/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "_Geri"
 
-#: src/nautilus-shell-ui.xml.h:77
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr "Ar_xaplan və Emblemlər"
 
-#: src/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "_NiÅŸanlar"
 
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "Pəncərəyi _bağla"
 
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:76
 #, fuzzy
 msgid "_Customer Support"
 msgstr "_Dəstək"
 
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "_Dəyişdir"
 
-#: src/nautilus-shell-ui.xml.h:83
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "Nişanları _dəyişdir ..."
 
-#: src/nautilus-shell-ui.xml.h:84
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "Xüsusiyyətlər..."
+
+#: src/nautilus-shell-ui.xml.h:80
 #, fuzzy
 msgid "_Feedback"
 msgstr "�la_qə"
 
-#: src/nautilus-shell-ui.xml.h:86 src/nautilus-window-menus.c:1362
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "Axta_r"
 
-#: src/nautilus-shell-ui.xml.h:87
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "_İrəii"
 
-#: src/nautilus-shell-ui.xml.h:88
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "G_et"
 
-#: src/nautilus-shell-ui.xml.h:89
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "_Kömək"
 
-#: src/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "_Ev"
 
-#: src/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "Yer"
+
+#: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr "_Nautilus Örtüləri..."
 
-#: src/nautilus-shell-ui.xml.h:92
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "_Normal Böyüklükdə"
 
-#: src/nautilus-shell-ui.xml.h:94
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "Seçənəklər"
+
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr "_Profilləşdirici"
 
-#: src/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "_YenilÉ™"
 
-#: src/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr "Profilləşdirməni _Bildir"
 
-#: src/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr "Profilləşdirməni _Sıfırla"
 
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr "Profilləşdirməni _Başlat"
 
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr "Profilləşdirməni _Dayandır"
 
-#: src/nautilus-shell-ui.xml.h:100
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "_GeriyÉ™ Get"
 
-#: src/nautilus-shell-ui.xml.h:101
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "Bir Səviyyə _Yuxarı"
 
-#: src/nautilus-shell-ui.xml.h:102
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "_Nümayişlər"
 
-#: src/nautilus-sidebar.c:659
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -9650,11 +9854,11 @@ msgstr ""
 "Eyni vaxtda bir neçə timsal işlədə bilərsiniz! �sad timsal üçün "
 "lütfən birini sürükləyin."
 
-#: src/nautilus-sidebar.c:661
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "Bir Rəsmdən Daha Çox"
 
-#: src/nautilus-sidebar.c:680
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -9662,11 +9866,11 @@ msgstr ""
 "Sürüklənən fayl yerli deyil. �sas rəsmlər üçün takcə yerli "
 "rəsmləri işlədə biləsiniz."
 
-#: src/nautilus-sidebar.c:682
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "Təkcə Yerli Rəsmlər"
 
-#: src/nautilus-sidebar.c:687
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -9674,22 +9878,22 @@ msgstr ""
 "Sürüklədiyiniz fayl rəsm deyildir. �sas rəsmlər üçün takcə yerli "
 "rəsmləri işlədə biləsiniz."
 
-#: src/nautilus-sidebar.c:689
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "Təkcə Rəsmlər"
 
-#: src/nautilus-sidebar.c:1247
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "%s ilə aç"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1283
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "Fərqli aç ..."
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1390
+#: src/nautilus-sidebar.c:1424
 msgid "  Empty Trash  "
 msgstr " Zibil Qutusunu BoÅŸalt  "
 
@@ -9783,17 +9987,17 @@ msgstr "Örtü silinə  bilmir."
 msgid "No description available for the \"%s\" theme"
 msgstr "\"%s\"nin izahı yoxdur"
 
-#: src/nautilus-window.c:584
+#: src/nautilus-window.c:637
 #, fuzzy
 msgid "View as ..."
 msgstr "%s olaraq göstər ...."
 
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1286
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "Fərqli olaraq Göstər ..."
 
-#: src/nautilus-window.c:1687
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "Qapat"
 
@@ -9807,11 +10011,11 @@ msgstr "Qapat"
 msgid "Preview Release %s: %s"
 msgstr "Nümayiş Buraxılışı %s: %s"
 
-#: src/nautilus-window-manage-views.c:812
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "Nümayiş Bacarılmadı"
 
-#: src/nautilus-window-manage-views.c:823
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
@@ -9820,12 +10024,12 @@ msgstr ""
 "%s nümayişində xəta oldu. Davam edə bilmirəm. Başqa yerdən başqa "
 "birini seçə bilərsiniz."
 
-#: src/nautilus-window-manage-views.c:834
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "%s nümayişində başlaqkən xəta oldu."
 
-#: src/nautilus-window-manage-views.c:993
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
@@ -9833,7 +10037,7 @@ msgstr ""
 "Yan çubuqlardan birində xəta oldu və davam edə bilmədi. Amma hansı "
 "olduğunu təəsüf ki bilmirəm."
 
-#: src/nautilus-window-manage-views.c:997
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
@@ -9842,18 +10046,18 @@ msgstr ""
 "%s yan çubuğunda xəta oldu və davam edə bilmədi. Belə davam edərsə "
 "paneli qapatsanız daha yaxşı olar."
 
-#: src/nautilus-window-manage-views.c:1002
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "Yan Çubuğu Paneli İflas Etdi"
 
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr ""
 "\"%s\"i(ı) tapa bilmədim. Lütfən yazmaq istədiyini doğru yazıb "
 "yazmadığını yoxla "
 
-#: src/nautilus-window-manage-views.c:1223
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
@@ -9861,7 +10065,7 @@ msgstr ""
 "\"%s\" hökmlü bir yer deyildir. Lütfən, yazmaq istədiyini doğru yazıb "
 "yazmadığını yoxla."
 
-#: src/nautilus-window-manage-views.c:1237
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -9870,7 +10074,7 @@ msgstr ""
 "\"%s\"i(ı) göstərə bilmədim, çünkü \"Nautilus\" hansı növdən "
 "olduğunu tapa bilmədi."
 
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr ""
@@ -9878,26 +10082,26 @@ msgstr ""
 "göstərilə bilmir."
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1257
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 "\"%s\"i(ı) göstərə bilmədim, çünkü \"Nautilus\"un %s: məkanları "
 "üçün bir idarəcisi yoxdur."
 
-#: src/nautilus-window-manage-views.c:1263
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "\"%s\"i(ı) göstərə bilmədim, çünkü giriş qadağan edildi."
 
-#: src/nautilus-window-manage-views.c:1268
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr ""
 "\"%s\"i(ı) göstərə bilmədim, çünkü \"Nautilus\"un qeyd etmə cəhdi "
 "müvəffəqiyyətsiz oldu."
 
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1287
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
@@ -9907,7 +10111,7 @@ msgstr ""
 "Vəkil verici qurğularınızı  və imla xətası edib etmədiyinizi "
 "yoxlayın."
 
-#: src/nautilus-window-manage-views.c:1287
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -9916,7 +10120,7 @@ msgstr ""
 "\"%s\"i(ı) göstərə bilmədim, çünkü yuva adı bş idi. Vəkil verici "
 "qurğularınızı yoxlayın."
 
-#: src/nautilus-window-manage-views.c:1299
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -9928,23 +10132,23 @@ msgstr ""
 "olmadığını bir yoxlayın. İndeksiniz yoxsa \"Medusa\" indeksləyicinizi "
 "də bir yoxlayın."
 
-#: src/nautilus-window-manage-views.c:1303
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "Axtarış Aparıla Bilmir"
 
-#: src/nautilus-window-manage-views.c:1307
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "\"%s\" Nautilus tərəfindən göstərilə bilmir ."
 
-#: src/nautilus-window-manage-views.c:1312
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "Bu Yeri Göstərə Bilmirəm"
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:317
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
@@ -9953,42 +10157,42 @@ msgstr ""
 "�gər bunu istəyirsinizsə bu vəziyyətə bir də məhkum olacaqsınız. "
 "(Heç xoş gün görmədim bu həyatda mən: hüngür hüngür!:))) Vasif"
 
-#: src/nautilus-window-menus.c:320
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
 "Həqiqətən də Nautilusdan indiyə qədər getdiyiniz yerlərin "
 "unudulmasını istəyirsiniz?"
 
-#: src/nautilus-window-menus.c:325
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "Keçmişi Unudummu?"
 
-#: src/nautilus-window-menus.c:326
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "Unut Getsin"
 
-#: src/nautilus-window-menus.c:429
+#: src/nautilus-window-menus.c:466
 #, fuzzy
 msgid "Show St_atus Bar"
 msgstr "Vəziyyət Çubuğunu Göstər"
 
-#: src/nautilus-window-menus.c:435
+#: src/nautilus-window-menus.c:472
 #, fuzzy
 msgid "Show _Sidebar"
 msgstr "Yan Çubuğunu Göstər"
 
-#: src/nautilus-window-menus.c:441
+#: src/nautilus-window-menus.c:478
 #, fuzzy
 msgid "Show _Toolbar"
 msgstr "Vasitə Çubuğunu Göstər"
 
-#: src/nautilus-window-menus.c:447
+#: src/nautilus-window-menus.c:484
 #, fuzzy
 msgid "Show Location _Bar"
 msgstr "Yer Çubuğunu Göstər"
 
-#: src/nautilus-window-menus.c:498
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "Seçənəklər"
 
@@ -9998,12 +10202,12 @@ msgstr "Seçənəklər"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:581
+#: src/nautilus-window-menus.c:618
 #, fuzzy
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr "Copyright (c) 1999-2001 Eazel, Ä°nc."
 
-#: src/nautilus-window-menus.c:583
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -10020,12 +10224,12 @@ msgstr ""
 #. * bottom of the about box to give credit
 #. * to the translator(s)
 #.
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:629
 #, fuzzy
 msgid "Translator Credits"
 msgstr "Gedişlər %s da(də) saxlanılır"
 
-#: src/nautilus-window-menus.c:762
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -10034,27 +10238,23 @@ msgstr ""
 "\"%s\" yeri yoxdur. Bu yerlə əlaqəli bütün nişanlarını siyahıdan "
 "silmək istəyirsənmi?"
 
-#: src/nautilus-window-menus.c:766
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "Xətalı Yer üçün Nişan"
 
-#: src/nautilus-window-menus.c:780
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "\"%s\" yeri yox olmuÅŸdur."
 
-#: src/nautilus-window-menus.c:781
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "Mövcud Olmayan Yerə Get"
 
-#: src/nautilus-window-menus.c:850
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "Nişanın göstərdiyi yerə get"
 
-#: src/nautilus-window-menus.c:1361
-msgid "_Browse"
-msgstr "_Gəz"
-
 #: src/nautilus-window-toolbars.c:402
 msgid "Back"
 msgstr "Geri"
@@ -10070,6 +10270,121 @@ msgstr "QabaÄŸa"
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 
+#~ msgid "helvetica"
+#~ msgstr "helvetika"
+
+#~ msgid "_Fonts"
+#~ msgstr "_Yazı Növləri"
+
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "Bir faylı öz üstünə daşıya bilməzsən."
+
+#~ msgid "Can't Move Onto Self"
+#~ msgstr "Öz Üstünə Daşına Bilmir"
+
+#, fuzzy
+#~ msgid "Normal"
+#~ msgstr "Normal Böyüklük"
+
+#, fuzzy
+#~ msgid "Bold"
+#~ msgstr "Borland"
+
+#, fuzzy
+#~ msgid "Book"
+#~ msgstr "NiÅŸanlar"
+
+#, fuzzy
+#~ msgid "Light"
+#~ msgstr "Siyahı"
+
+#, fuzzy
+#~ msgid "Italic"
+#~ msgstr "Baltik"
+
+#, fuzzy
+#~ msgid "Oblique"
+#~ msgstr "Köhnələr"
+
+#, fuzzy
+#~ msgid "Reverse Italic"
+#~ msgstr "Çevir"
+
+#, fuzzy
+#~ msgid "Reverse Oblique"
+#~ msgstr "Tərs Düzülüş"
+
+#, fuzzy
+#~ msgid "Condensed"
+#~ msgstr "İçindəkilər :"
+
+#~ msgid "Font"
+#~ msgstr "Yazı növü"
+
+#~ msgid "fixed"
+#~ msgstr "sabit"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00 AM"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00 AM"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00 AM"
+
+#~ msgid "current theme"
+#~ msgstr "hazırkı örtü"
+
+#~ msgid "Use this font family to display file names:"
+#~ msgstr "Fayl adlarında istifadə edəcəyin yazı növü ailesi:"
+
+#~ msgid "Can add Content"
+#~ msgstr "�lavə Ediləbilən Mövtəviyyat"
+
+#, fuzzy
+#~ msgid "No selection made"
+#~ msgstr "buradakı qisim"
+
+#, fuzzy
+#~ msgid "times"
+#~ msgstr "_Tayms"
+
+#, fuzzy
+#~ msgid "courier"
+#~ msgstr "_Kuriyer"
+
+#, fuzzy
+#~ msgid "lucida"
+#~ msgstr "Lusida"
+
+#~ msgid "Details"
+#~ msgstr "�traflı"
+
+#~ msgid "Warning"
+#~ msgstr "Xabərdarlıq"
+
+#~ msgid "Error"
+#~ msgstr "Xəta"
+
+#~ msgid "Question"
+#~ msgstr "Sual"
+
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "Seçili mətni ara yaddaşa qoymadan silər"
+
+#~ msgid "Use Advanced settings"
+#~ msgstr "�traflı Qurğuları Göstər"
+
+#~ msgid "Use Beginner settings"
+#~ msgstr "Yeni Başlayan Qurğularını İşlət"
+
+#~ msgid "Use Intermediate settings"
+#~ msgstr "Ortabab İstifadəçi Qurğularını İşlət"
+
+#~ msgid "_Browse"
+#~ msgstr "_Gəz"
+
 #~ msgid "System"
 #~ msgstr "Sistem"
 
@@ -10295,9 +10610,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 #~ "Xəta : Hökmsüz sintaksis\n"
 #~ "Sintaksis : %s\n"
 
-#~ msgid "Secret"
-#~ msgstr "Gizli"
-
 #~ msgid "Shared"
 #~ msgstr "Paylaşılmış"
 
@@ -10400,9 +10712,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 #~ msgid "Can't open remote file"
 #~ msgstr "Uzaqdakı faylı aça bilmədim"
 
-#~ msgid "_Cut Text"
-#~ msgstr "Mətni _Kəs"
-
 #~ msgid "Open in _New Window"
 #~ msgstr "_Yeni pəncərəde aç"
 
@@ -11088,9 +11397,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 #~ msgid "Deleting items"
 #~ msgstr "Üzvləri sil"
 
-#~ msgid "_Delete..."
-#~ msgstr "_Sil ..."
-
 #~ msgid "Reset _Background"
 #~ msgstr "_Arxaplanı sıfırla"
 
diff --git a/po/ca.po b/po/ca.po
index 0ea1e39e7..f255d3a94 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -4,16 +4,15 @@
 #
 # Traducció per Softcatalà <linux@softcatala.org>
 # Traductor: Valentín Trilles <vtrilles@yahoo.es>
-#: libnautilus-extensions/nautilus-search-uri.c:362
-#: libnautilus-extensions/nautilus-search-uri.c:368
-#: libnautilus-extensions/nautilus-search-uri.c:371
-#: libnautilus-extensions/nautilus-search-uri.c:374
-#: libnautilus-extensions/nautilus-search-uri.c:377
-#: libnautilus-extensions/nautilus-search-uri.c:380
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 0.1.0\n"
-"POT-Creation-Date: 2000-09-28 20:40+0200\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2000-09-29 14:41+0200\n"
 "Last-Translator: Quico Llach <tradgnome@softcatala.org>\n"
 "Language-Team: Catalan <linux@softcatala.org>\n"
@@ -21,6 +20,232 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: applets/launcher/nautilus-launcher-applet.c:272
+msgid "Can't create nautilus-launcher-applet!"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:211
+msgid "Can't create nautilus-preferences-applet!"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:226
+msgid "Show Desktop"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:230
+msgid "Smooth Graphics"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:243
+#: src/nautilus-application.c:639
+msgid "Quit"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:251
+#, fuzzy
+msgid "Start"
+msgstr "Estat"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:259
+#, fuzzy
+msgid "Restart"
+msgstr "Reintenta"
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:1
+msgid "Factory for Nautilus component adapter factories"
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:2
+msgid "Factory for Nautilus component adapter factories "
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:3
+msgid ""
+"Factory for objects that wrap ordinary Bonobo Controls or Embeddables to "
+"look like Nautilus Views"
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:4
+msgid "Nautilus component adapter factory"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:230
+#, c-format
+msgid ""
+"%s CPU\n"
+"%s MHz\n"
+"%s cache size"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:264
+#, c-format
+msgid "%lu GB RAM"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:266
+#, c-format
+msgid "%lu MB RAM"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:324
+#, c-format
+msgid "%lu GB"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:326
+#, fuzzy, c-format
+msgid "%lu MB"
+msgstr "1 MB"
+
+#. set up the title
+#: components/hardware/nautilus-hardware-view.c:407
+msgid "Hardware Overview"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:520
+msgid "This is a placeholder for the CPU page."
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:545
+msgid "This is a placeholder for the RAM page."
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:570
+msgid "This is a placeholder for the IDE page."
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:2
+#: components/hardware/nautilus-hardware-view.c:631
+#: data/static_bookmarks.xml.h:16
+msgid "Hardware"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:1
+msgid "Factory for hardware view"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:3
+msgid "Hardware Viewer"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:4
+msgid "Hardware view"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:5
+#, fuzzy
+msgid "View as Hardware"
+msgstr "Veure com altres..."
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:6
+msgid "hardware view"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/gdb3html.c:712
+#: components/music/nautilus-music-view.c:1512
+msgid "Previous"
+msgstr "Prèvia"
+
+#: components/help/converters/gnome-db2html2/gdb3html.c:721
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
+msgid "Home"
+msgstr "Inici"
+
+#: components/help/converters/gnome-db2html2/gdb3html.c:730
+#: components/music/nautilus-music-view.c:1568
+msgid "Next"
+msgstr "Següent"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:259
+#: components/notes/Nautilus_View_notes.oaf.in.h:2
+#, fuzzy
+msgid "Notes"
+msgstr "Sense coincidències."
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:709
+#, c-format
+msgid "Table %d."
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:864
+msgid "Up to Table of Contents"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1012
+#, c-format
+msgid "Figure %s"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1032
+msgid "the section here"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1034
+#, fuzzy
+msgid "the section"
+msgstr "Descripció"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1090
+#, c-format
+msgid "Figure %d"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1102
+msgid "IMAGE"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:2068
+#: components/help/converters/gnome-db2html2/sect-elements.c:2070
+#, fuzzy
+msgid "Legal Notice"
+msgstr "Principiant"
+
+#. This 'Q' is short for 'Question:'
+#: components/help/converters/gnome-db2html2/sect-elements.c:2116
+msgid "Q"
+msgstr ""
+
+#. This 'A' is short for 'Answer'
+#: components/help/converters/gnome-db2html2/sect-elements.c:2128
+msgid "A"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:2151
+msgid "See"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:2178
+#, fuzzy
+msgid "See also"
+msgstr "vegeu també"
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:322
+msgid "GNOME Documentation"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:353
+#, fuzzy
+msgid "Copyright"
+msgstr "S'està copiant"
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:353
+msgid "by"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:355
+#, fuzzy
+msgid "Table of Contents"
+msgstr "Continguts del paquet"
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:521
+msgid "PREFACE"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:530
+msgid "APPENDIX"
+msgstr ""
+
 #. * From 'man(7)':
 #.
 #. The manual sections are traditionally defined as follows:
@@ -61,59 +286,83 @@ msgstr ""
 #. GNU Public  License  and  many  people  are
 #. working on changes to the kernel)
 #. **
-#: components/help/hyperbola-filefmt.c:396
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:537
+#: components/help/hyperbola-filefmt.c:538
+#: components/help/hyperbola-filefmt.c:539
+#: components/help/hyperbola-filefmt.c:541
+#: components/help/hyperbola-filefmt.c:543
 msgid "Manual"
 msgstr "Manual"
 
-#: components/help/hyperbola-filefmt.c:397
-msgid "System"
-msgstr "Sistema"
-
-#: components/help/hyperbola-filefmt.c:397
-msgid "Configuration"
-msgstr "Configuaració"
-
-#: components/help/hyperbola-filefmt.c:397
-msgid "Config files"
-msgstr "Fitxers de configuració"
-
-#: components/help/hyperbola-filefmt.c:398
-#: components/help/hyperbola-filefmt.c:671
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:861 data/linksets/apps.xml.h:1
 msgid "Applications"
 msgstr "Aplicacions"
 
-#: components/help/hyperbola-filefmt.c:398
-msgid "Command Line"
-msgstr "Línia d'ordres"
-
-#: components/help/hyperbola-filefmt.c:399
-#: components/help/hyperbola-filefmt.c:400
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:543
 msgid "Development"
 msgstr "Desenvolupament"
 
-#: components/help/hyperbola-filefmt.c:399
-#: components/help/hyperbola-filefmt.c:400
-msgid "APIs"
-msgstr "API"
-
-#: components/help/hyperbola-filefmt.c:399
-msgid "Miscellaneous"
-msgstr "Miscel·lània"
-
-#: components/help/hyperbola-filefmt.c:400
+#: components/help/hyperbola-filefmt.c:532
 msgid "System Calls"
 msgstr "Cridades del sistema"
 
-#: components/help/hyperbola-filefmt.c:556
-#: libnautilus-extensions/nautilus-stock-dialogs.c:365
+#: components/help/hyperbola-filefmt.c:534
+msgid "Library Functions"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:536
+#, fuzzy
+msgid "Devices"
+msgstr "Serveis"
+
+#: components/help/hyperbola-filefmt.c:537
+#, fuzzy
+msgid "Configuration Files"
+msgstr "Configuaració"
+
+#: components/help/hyperbola-filefmt.c:538
+#, fuzzy
+msgid "Games"
+msgstr "Nom"
+
+#: components/help/hyperbola-filefmt.c:539
+#, fuzzy
+msgid "Conventions"
+msgstr "Continguts:"
+
+#: components/help/hyperbola-filefmt.c:541
+msgid "System Administration"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:543
+msgid "Kernel Routines"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:703
 msgid "Info"
 msgstr "Informació"
 
-#: components/help/hyperbola-nav-index.c:124
+#: components/help/hyperbola-nav-tree.c:310
+msgid "Introductory Documents:"
+msgstr ""
+
+#: components/help/hyperbola-nav-tree.c:324
+msgid "Documents by Subject:"
+msgstr ""
+
+#: components/help/hyperbola-nav-index.c:121
 msgid "see "
 msgstr "vegeu"
 
-#: components/help/hyperbola-nav-index.c:128
+#: components/help/hyperbola-nav-index.c:125
 msgid "see also "
 msgstr "vegeu també"
 
@@ -121,19 +370,107 @@ msgstr "vegeu també"
 msgid "No matches."
 msgstr "Sense coincidències."
 
-#: components/help/hyperbola-nav-index.c:479
+#: components/help/hyperbola-nav-index.c:476
 msgid " (see \""
 msgstr " (vegeu \""
 
-#: components/help/hyperbola-nav-index.c:484
+#: components/help/hyperbola-nav-index.c:479
 msgid " (see also \""
 msgstr " (vegeu també \""
 
-#: components/image-viewer/nautilus-image-view.c:698
+#: components/help/Nautilus_View_help.oaf.in.h:1
+#: components/services/summary/nautilus-summary-dialogs.c:106
+#, fuzzy
+msgid "Help"
+msgstr "_Ajuda"
+
+#: components/help/Nautilus_View_help.oaf.in.h:2
+msgid "Help Index"
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:3
+msgid "Help Index sidebar panel"
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:4
+#, fuzzy
+msgid "Help Navigation Tree"
+msgstr "aplicació"
+
+#: components/help/Nautilus_View_help.oaf.in.h:5
+#, fuzzy
+msgid "Help Search"
+msgstr "Cerca a la web"
+
+#: components/help/Nautilus_View_help.oaf.in.h:6
+#, fuzzy
+msgid "Help Search sidebar panel"
+msgstr "Barra lateral"
+
+#: components/help/Nautilus_View_help.oaf.in.h:7
+#, fuzzy
+msgid "Help sidebar panel"
+msgstr "Barra lateral"
+
+#: components/help/Nautilus_View_help.oaf.in.h:8
+msgid "Internal use only"
+msgstr ""
+
+#: components/history/Nautilus_View_history.oaf.in.h:1
+msgid "Factory for history views"
+msgstr ""
+
+#: components/history/Nautilus_View_history.oaf.in.h:2
+#, fuzzy
+msgid "History"
+msgstr "avui"
+
+#: components/history/Nautilus_View_history.oaf.in.h:3
+#, fuzzy
+msgid "History sidebar panel"
+msgstr "Barra lateral"
+
+#: components/history/Nautilus_View_history.oaf.in.h:4
+msgid "History sidebar panel for Nautilus"
+msgstr ""
+
+#: components/image-viewer/nautilus-image-view.c:833
 #, fuzzy
 msgid "I could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:1
+msgid "Generic Image Viewer"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:2
+msgid "Generic image control factory"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:3
+msgid "Image"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:4
+#, fuzzy
+msgid "Image Viewer"
+msgstr "%s Visualitzador"
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:5
+#, fuzzy
+msgid "Nautilus Image Viewer"
+msgstr "Nautilus: Veure com un altre"
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:6
+#, fuzzy
+msgid "Nautilus Image viewer factory"
+msgstr "Nautilus: Veure com un altre"
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:7
+#, fuzzy
+msgid "View as Image"
+msgstr "Veure com %s"
+
 #: components/loser/content/nautilus-content-loser.c:140
 #, c-format
 msgid ""
@@ -145,38 +482,67 @@ msgstr ""
 "\n"
 "Açò és una vista de contingut del Nautilus que falla a una petició."
 
-#: components/loser/content/nautilus-content-loser.c:199
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"You clicked the Kill Content View toolbar button."
+#: components/loser/content/nautilus-content-loser.c:189
+msgid "You have tried to kill the Content Loser"
 msgstr ""
-"%s\n"
-"\n"
-"Heu fet clic al botó 'Mata la vista de continguts' de la barra d'eines."
 
-#. BonoboUIHandler
-#. menu item path, must start with /some-existing-menu-path and be otherwise unique
-#: components/loser/content/nautilus-content-loser.c:247
-msgid "_Kill Content View"
-msgstr "_Mata la vista de continguts"
+#: components/loser/content/nautilus-content-loser-ui.xml.h:1
+#, fuzzy
+msgid "Kill Content Loser"
+msgstr "Mata la vista de continguts"
 
-#. menu item user-displayed label
-#: components/loser/content/nautilus-content-loser.c:248
+#: components/loser/content/nautilus-content-loser-ui.xml.h:2
 msgid "Kill the Loser content view"
 msgstr "Mata la vista de continguts del Loser"
 
-#. BonoboUIHandler
-#. button path, must start with /some-existing-toolbar-path and be otherwise unique
-#: components/loser/content/nautilus-content-loser.c:267
-msgid "Kill Content View"
+#: components/loser/content/nautilus-content-loser-ui.xml.h:3
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
+#: components/sample/nautilus-sample-content-view-ui.xml.h:4
+#: src/nautilus-shell-ui.xml.h:81
+msgid "_File"
+msgstr "_Fitxer"
+
+#: components/loser/content/nautilus-content-loser-ui.xml.h:4
+#, fuzzy
+msgid "_Kill Content Loser"
+msgstr "_Mata la vista de continguts"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:1
+#, fuzzy
+msgid "Content Loser"
+msgstr "Continguts:"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:2
+#, fuzzy
+msgid "Content Loser Viewer"
 msgstr "Mata la vista de continguts"
 
-#. button user-displayed label
-#: components/loser/content/nautilus-content-loser.c:268
-msgid "Kill the Loser content view."
-msgstr "Mata la vista de contingut del Loser"
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:3
+#, fuzzy
+msgid "Nautilus Content Loser"
+msgstr "Navegador de propietats del Nautilus"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:4
+msgid "Nautilus content loser component's factory"
+msgstr ""
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:5
+#, fuzzy
+msgid "Nautilus content loser factory"
+msgstr "Navegador de propietats del Nautilus"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:6
+#, fuzzy
+msgid "Nautilus content view that fails on command"
+msgstr ""
+"%s\n"
+"\n"
+"Açò és una vista de contingut del Nautilus que falla a una petició."
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:7
+#, fuzzy
+msgid "View as Content Loser"
+msgstr "Veure com altres..."
 
 #: components/loser/sidebar/nautilus-sidebar-loser.c:143
 #, c-format
@@ -189,320 +555,1270 @@ msgstr ""
 "\n"
 "Barra lateral del Loser."
 
-#: components/loser/sidebar/nautilus-sidebar-loser.c:202
+#: components/loser/sidebar/nautilus-sidebar-loser.c:192
+msgid "You have tried to kill the Sidebar Loser"
+msgstr ""
+
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:1
+#, fuzzy
+msgid "Kill Sidebar Loser"
+msgstr "_Mata la vista de la barra lateral"
+
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:2
+#, fuzzy
+msgid "Kill the Loser sidebar panel"
+msgstr "Mata la vista de la barra lateral del Loser"
+
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:4
+#, fuzzy
+msgid "_Kill Sidebar Loser"
+msgstr "_Mata la vista de la barra lateral"
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus Sidebar Loser"
+msgstr "Navegador de propietats del Nautilus"
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:2
+msgid "Nautilus sidebar loser component's factory"
+msgstr ""
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:3
+#, fuzzy
+msgid "Nautilus sidebar loser factory"
+msgstr "Nautilus: Veure com un altre"
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:4
+#, fuzzy
+msgid "Nautilus sidebar view that fails on command"
+msgstr ""
+"%s\n"
+"\n"
+"Açò és una vista de contingut del Nautilus que falla a una petició."
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:5
+#, fuzzy
+msgid "Sidebar Loser"
+msgstr "Barra lateral"
+
+#: components/mozilla/mozilla-preferences.cpp:126
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
+#, fuzzy, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr "S'ha produït un error HTTP: %d %s"
+
+#: components/mozilla/mozilla-preferences.cpp:133
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
-"%s\n"
+"GConf error:\n"
+"  %s\n"
+"All further errors shown only on terminal"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:38
+msgid "Arabic"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:39
+#, fuzzy
+msgid "Baltic"
+msgstr "Bàsic"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:40
+msgid "Central European"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:41
+#, fuzzy
+msgid "Chinese"
+msgstr "Canals"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:42
+msgid "Cyrillic"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:43
+msgid "Greek"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:44
+msgid "Hebrew"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:45
+msgid "Japanese"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:46
+msgid "Turkish"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:47
+msgid "Unicode"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:48
+msgid "UTF"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:49
+#, fuzzy
+msgid "Vietnamese"
+msgstr "Canvia el nom"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:50
+#, fuzzy
+msgid "Western"
+msgstr "Prova d'execució"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:55
+msgid "Arabic (IBM-864)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:56
+msgid "Arabic (ISO-8859-6)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:57
+msgid "Arabic (ISO-8859-6-E)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:58
+msgid "Arabic (ISO-8859-6-I)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:59
+msgid "Arabic (Windows-1256)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:60
+msgid "Armenian (ARMSCII-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:61
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:62
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:63
+msgid "Baltic (Windows-1257)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:64
+msgid "Celtic (ISO-8859-14)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:65
+msgid "Central European (IBM-852)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:66
+msgid "Central European (ISO-8859-2)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:67
+msgid "Central European (MacCE)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:68
+msgid "Central European (Windows-1250)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:69
+msgid "Chinese Simplified (GB2312)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:70
+msgid "Chinese Simplified (GBK)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:71
+msgid "Chinese Simplified (HZ)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:72
+msgid "Chinese Traditional (Big5)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:73
+msgid "Chinese Traditional (EUC-TW)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:74
+msgid "Croatian (MacCroatian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:75
+msgid "Cyrillic (IBM-855)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:76
+msgid "Cyrillic (ISO-8859-5)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:77
+msgid "Cyrillic (ISO-IR-111)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:78
+msgid "Cyrillic (MacCyrillic)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:79
+msgid "Cyrillic (Windows-1251)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:80
+msgid "Cyrillic/Russian (IBM-866)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:81
+msgid "Cyrillic/Russian (KOI8-R)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:82
+msgid "Cyrillic/Ukrainian (KOI8-U)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:83
+msgid "Cyrillic/Ukrainian (MacUkrainian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:84
+msgid "English (US-ASCII)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:85
+msgid "Greek (ISO-8859-7)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:86
+msgid "Greek (MacGreek)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:87
+msgid "Greek (Windows-1253)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:88
+msgid "Hebrew (IBM-862)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:89
+msgid "Hebrew (ISO-8859-8-E)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:90
+msgid "Hebrew (ISO-8859-8-I)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:91
+msgid "Hebrew (Windows-1255)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:92
+msgid "Icelandic (MacIcelandic)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:93
+msgid "Japanese (EUC-JP)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:94
+msgid "Japanese (ISO-2022-JP)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:95
+msgid "Japanese (Shift_JIS)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:96
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:97
+msgid "Nordic (ISO-8859-10)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:98
+msgid "Romanian (MacRomanian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:99
+msgid "South European (ISO-8859-3)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:100
+msgid "T.61-8bit"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:101
+msgid "Thai (TIS-620)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:102
+msgid "Turkish (IBM-857)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:103
+msgid "Turkish (ISO-8859-9)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:104
+msgid "Turkish (MacTurkish)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:105
+msgid "Turkish (Windows-1254)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:106
+msgid "Unicode (UTF-7)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:107
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:108
+#, fuzzy
+msgid "User Defined"
+msgstr "Directori"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:109
+msgid "UTF-16BE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:110
+msgid "UTF-16LE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:111
+msgid "UTF-32BE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:112
+msgid "UTF-32LE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:113
+msgid "Vietnamese (TCVN)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:114
+msgid "Vietnamese (VISCII)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:115
+msgid "Vietnamese (VPS)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:116
+msgid "Vietnamese (Windows-1258)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:117
+msgid "Visual Hebrew (ISO-8859-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:118
+msgid "Western (IBM-850)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:119
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:120
+msgid "Western (ISO-8859-15)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:121
+msgid "Western (MacRoman)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:122
+msgid "Western (Windows-1252)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:123
+msgid "windows-936"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:124
+msgid "x-imap4-modified-utf7"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:125
+msgid "x-u-escaped"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-content-view.c:809
+msgid ""
+"A JavaScript function (small software program) on this page tried to open a "
+"new window, but nautilus does not support the opening of new windows by "
+"JavaScript.\n"
 "\n"
-"You clicked the Kill Sidebar View toolbar button."
+"Try viewing the page in a different web browser, such as Mozilla or Netscape."
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-content-view.c:810
+#, fuzzy
+msgid "Nautilus Mozilla View Warning"
+msgstr "Nautilus: Veure com un altre"
+
+#: components/mozilla/nautilus-mozilla-ui.xml.h:1
+msgid "Charset Encoding"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:1
+#, fuzzy
+msgid "Mozilla Nautilus view"
+msgstr "Tanca totes les finestres"
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:2
+#, fuzzy
+msgid "Mozilla Nautilus view factory"
+msgstr "Nautilus: Veure com un altre"
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:3
+#, fuzzy
+msgid "Mozilla content view component"
 msgstr ""
 "%s\n"
 "\n"
-"Heu fet clic al botó 'Mata la vista de la barra lateral' de la barra d'eines."
+"Açò és una mostra dels components de la vista de contingut del Nautilus."
 
-#. BonoboUIHandler
-#. menu item path, must start with /some-existing-menu-path and be otherwise unique
-#: components/loser/sidebar/nautilus-sidebar-loser.c:250
-msgid "_Kill Sidebar View"
-msgstr "_Mata la vista de la barra lateral"
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:4
+msgid "Mozilla content view component's factory"
+msgstr ""
 
-#. menu item user-displayed label
-#: components/loser/sidebar/nautilus-sidebar-loser.c:251
-msgid "Kill the Loser sidebar view"
-msgstr "Mata la vista de la barra lateral del Loser"
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:5
+#, fuzzy
+msgid "View as Web Page"
+msgstr "Veure com altres..."
 
-#. BonoboUIHandler
-#. button path, must start with /some-existing-toolbar-path and be otherwise unique
-#: components/loser/sidebar/nautilus-sidebar-loser.c:270
-msgid "Loser"
-msgstr "Loser"
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:6
+msgid "Web Page"
+msgstr ""
 
-#. button user-displayed label
-#: components/loser/sidebar/nautilus-sidebar-loser.c:271
-msgid "Kill the Loser sidebar view."
-msgstr "Mata la vista de la barra lateral del Loser."
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:7
+msgid "Web Page Viewer"
+msgstr ""
 
-#.
-#. * Create our mozilla menu item.
-#. *
-#. * Note that it's sorta bogus that we know Nautilus has a menu whose
-#. * path is "/File", and also that we know a sensible position to use within
-#. * that menu. Nautilus should publish this information somehow.
-#.
-#. BonoboUIHandler
-#. menu item path, must start with /some-existing-menu-path and be otherwise unique
-#: components/mozilla/nautilus-mozilla-content-view.c:525
-msgid "_Mozilla"
-msgstr "_Mozilla"
-
-#. menu item user-displayed label
-#: components/mozilla/nautilus-mozilla-content-view.c:526
-msgid "This is a mozilla merged menu item"
-msgstr "Açò és un element del menú combinat del Mozilla"
-
-#. hint that appears in status bar
-#. position within menu; -1 means last
-#. pixmap type
-#. pixmap data
-#. accelerator key, couldn't bear the thought of using Control-S for anything except Save
-#. accelerator key modifiers
-#. callback function
-#. callback function data
-#.
-#. * Create our mozilla toolbar button.
-#. *
-#. * Note that it's sorta bogus that we know Nautilus has a toolbar whose
-#. * path is "/Main". Nautilus should publish this information somehow.
-#.
-#. BonoboUIHandler
-#. button path, must start with /Main/ and be otherwise unique
-#: components/mozilla/nautilus-mozilla-content-view.c:543
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#. button user-displayed label
-#: components/mozilla/nautilus-mozilla-content-view.c:544
-msgid "This is a mozilla merged toolbar button"
-msgstr "Açò és un element del menú combinat del Mozilla"
-
-#: components/music/nautilus-music-view.c:201
-msgid "Track "
-msgstr "Peça"
+#: components/music/mpg123.c:29
+msgid "Blues"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:201
-msgid "Title"
-msgstr "Títol"
+#: components/music/mpg123.c:29
+msgid "Classic Rock"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:201
-msgid "Artist"
-msgstr "Artista"
+#: components/music/mpg123.c:29
+msgid "Country"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:201
-msgid "Year"
-msgstr "Any"
+#: components/music/mpg123.c:29
+#, fuzzy
+msgid "Dance"
+msgstr "Cancel·la"
 
-#: components/music/nautilus-music-view.c:201
-msgid "Bitrate "
-msgstr "Bits per segon "
+#: components/music/mpg123.c:30
+#, fuzzy
+msgid "Disco"
+msgstr "Discos"
 
-#: components/music/nautilus-music-view.c:201
-msgid "Time "
-msgstr "Temps "
+#: components/music/mpg123.c:30
+msgid "Funk"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:201
-msgid "Album"
-msgstr "Àlbum"
+#: components/music/mpg123.c:30
+msgid "Grunge"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:201
-msgid "Comment"
+#: components/music/mpg123.c:30
+msgid "Hip-Hop"
+msgstr ""
+
+#: components/music/mpg123.c:31
+msgid "Jazz"
+msgstr ""
+
+#: components/music/mpg123.c:31
+#, fuzzy
+msgid "Metal"
+msgstr "Detalls"
+
+#: components/music/mpg123.c:31
+msgid "New Age"
+msgstr ""
+
+#: components/music/mpg123.c:31
+msgid "Oldies"
+msgstr ""
+
+#: components/music/mpg123.c:32
+#, fuzzy
+msgid "Other"
+msgstr "Altres:"
+
+#: components/music/mpg123.c:32
+msgid "Pop"
+msgstr ""
+
+#: components/music/mpg123.c:32
+msgid "R&B"
+msgstr ""
+
+#: components/music/mpg123.c:32
+msgid "Rap"
+msgstr ""
+
+#: components/music/mpg123.c:32
+#, fuzzy
+msgid "Reggae"
+msgstr "Canvia el nom"
+
+#: components/music/mpg123.c:33
+msgid "Rock"
+msgstr ""
+
+#: components/music/mpg123.c:33
+msgid "Techno"
+msgstr ""
+
+#: components/music/mpg123.c:33
+#, fuzzy
+msgid "Industrial"
+msgstr "Instal·la"
+
+#: components/music/mpg123.c:33
+msgid "Alternative"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Ska"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Death Metal"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Pranks"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Soundtrack"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Euro-Techno"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Ambient"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Trip-Hop"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Vocal"
+msgstr ""
+
+#: components/music/mpg123.c:36
+msgid "Jazz+Funk"
+msgstr ""
+
+#: components/music/mpg123.c:36
+#, fuzzy
+msgid "Fusion"
+msgstr "Descripció"
+
+#: components/music/mpg123.c:36
+#, fuzzy
+msgid "Trance"
+msgstr "Cancel·la"
+
+#: components/music/mpg123.c:36
+msgid "Classical"
+msgstr ""
+
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "Instrumental"
+msgstr "Instal·la"
+
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "Acid"
+msgstr "copiat"
+
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "House"
+msgstr "Inici"
+
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "Game"
+msgstr "Nom"
+
+#: components/music/mpg123.c:38
+msgid "Sound Clip"
+msgstr ""
+
+#: components/music/mpg123.c:38
+msgid "Gospel"
+msgstr ""
+
+#: components/music/mpg123.c:38
+#, fuzzy
+msgid "Noise"
+msgstr "Pricipiant"
+
+#: components/music/mpg123.c:38
+msgid "Alt"
+msgstr ""
+
+#: components/music/mpg123.c:39
+#, fuzzy
+msgid "Bass"
+msgstr "Bàsic"
+
+#: components/music/mpg123.c:39
+msgid "Soul"
+msgstr ""
+
+#: components/music/mpg123.c:39
+msgid "Punk"
+msgstr ""
+
+#: components/music/mpg123.c:39
+#, fuzzy
+msgid "Space"
+msgstr "Reemplaça"
+
+#: components/music/mpg123.c:40
+msgid "Meditative"
+msgstr ""
+
+#: components/music/mpg123.c:40
+msgid "Instrumental Pop"
+msgstr ""
+
+#: components/music/mpg123.c:41
+msgid "Instrumental Rock"
+msgstr ""
+
+#: components/music/mpg123.c:41
+msgid "Ethnic"
+msgstr ""
+
+#: components/music/mpg123.c:41
+#, fuzzy
+msgid "Gothic"
+msgstr "res"
+
+#: components/music/mpg123.c:42
+msgid "Darkwave"
+msgstr ""
+
+#: components/music/mpg123.c:42
+msgid "Techno-Industrial"
+msgstr ""
+
+#: components/music/mpg123.c:42
+msgid "Electronic"
+msgstr ""
+
+#: components/music/mpg123.c:43
+msgid "Pop-Folk"
+msgstr ""
+
+#: components/music/mpg123.c:43
+msgid "Eurodance"
+msgstr ""
+
+#: components/music/mpg123.c:43
+msgid "Dream"
+msgstr ""
+
+#: components/music/mpg123.c:44
+msgid "Southern Rock"
+msgstr ""
+
+#: components/music/mpg123.c:44
+#, fuzzy
+msgid "Comedy"
 msgstr "Comentari"
 
-#: components/music/nautilus-music-view.c:201
-msgid "Channels"
-msgstr "Canals"
+#: components/music/mpg123.c:44
+#, fuzzy
+msgid "Cult"
+msgstr "_Talla"
 
-#: components/music/nautilus-music-view.c:201
-msgid "Sample Rate"
-msgstr "Velocitat de mostreig"
+#: components/music/mpg123.c:45
+msgid "Gangsta Rap"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:845
-msgid "Sorry, but the music view can't play non-local files yet! "
+#: components/music/mpg123.c:45
+msgid "Top 40"
 msgstr ""
 
-#: components/music/nautilus-music-view.c:846
+#: components/music/mpg123.c:45
+msgid "Christian Rap"
+msgstr ""
+
+#: components/music/mpg123.c:46
+msgid "Pop/Funk"
+msgstr ""
+
+#: components/music/mpg123.c:46
 #, fuzzy
-msgid "Can't Play Remote Files"
-msgstr "No es pot obrir el fitxer remot"
+msgid "Jungle"
+msgstr "mida"
 
-#: components/music/nautilus-music-view.c:1157
-msgid "Previous"
-msgstr "Prèvia"
+#: components/music/mpg123.c:46
+msgid "Native American"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:1169
-msgid "Play"
+#: components/music/mpg123.c:47
+msgid "Cabaret"
+msgstr ""
+
+#: components/music/mpg123.c:47
+msgid "New Wave"
+msgstr ""
+
+#: components/music/mpg123.c:47
+msgid "Psychedelic"
+msgstr ""
+
+#: components/music/mpg123.c:47
+#, fuzzy
+msgid "Rave"
+msgstr "Elimina"
+
+#: components/music/mpg123.c:48
+msgid "Showtunes"
+msgstr ""
+
+#: components/music/mpg123.c:48
+#, fuzzy
+msgid "Trailer"
+msgstr "Títol"
+
+#: components/music/mpg123.c:48
+msgid "Lo-Fi"
+msgstr ""
+
+#: components/music/mpg123.c:48
+msgid "Tribal"
+msgstr ""
+
+#: components/music/mpg123.c:49
+msgid "Acid Punk"
+msgstr ""
+
+#: components/music/mpg123.c:49
+msgid "Acid Jazz"
+msgstr ""
+
+#: components/music/mpg123.c:49
+#, fuzzy
+msgid "Polka"
 msgstr "Reproduir"
 
-#: components/music/nautilus-music-view.c:1181
-msgid "Pause"
-msgstr "Pausa"
+#: components/music/mpg123.c:49
+#, fuzzy
+msgid "Retro"
+msgstr "Reintenta"
 
-#: components/music/nautilus-music-view.c:1193
-#: libnautilus-extensions/nautilus-file-operations.c:385
-#: libnautilus-extensions/nautilus-file-operations.c:412
-#: src/nautilus-window-toolbars.c:148
-msgid "Stop"
-msgstr "Aturar"
+#: components/music/mpg123.c:50
+#, fuzzy
+msgid "Musical"
+msgstr "música"
 
-#: components/music/nautilus-music-view.c:1205
-msgid "Next"
-msgstr "Següent"
+#: components/music/mpg123.c:50
+msgid "Rock & Roll"
+msgstr ""
 
-#. set up the window title
-#: components/rpmview/nautilus-rpm-verify-window.c:182
-#, fuzzy, c-format
-msgid "Verifying %s..."
-msgstr "S'està escrivint..."
+#: components/music/mpg123.c:50
+msgid "Hard Rock"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:146
-msgid "Package Contents"
-msgstr "Continguts del paquet"
+#: components/music/mpg123.c:50
+msgid "Folk"
+msgstr ""
 
-#. allocate the name field
-#: components/rpmview/nautilus-rpm-view.c:189
-msgid "Package Title"
-msgstr "Títol del paquet"
+#: components/music/mpg123.c:51
+msgid "Folk/Rock"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:212
-msgid "Size: "
-msgstr "Mida: "
+#: components/music/mpg123.c:51
+msgid "National Folk"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:218
-msgid "<size>"
-msgstr "<mida>"
+#: components/music/mpg123.c:51
+msgid "Swing"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:224
-msgid "Install Date: "
-msgstr "Data d'instal·lació: "
+#: components/music/mpg123.c:52
+msgid "Fast-Fusion"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:230
-#: components/rpmview/nautilus-rpm-view.c:242
-#: components/rpmview/nautilus-rpm-view.c:254
-#: components/rpmview/nautilus-rpm-view.c:266
-#: components/rpmview/nautilus-rpm-view.c:278
-msgid "<unknown>"
-msgstr "<desconegut>"
+#: components/music/mpg123.c:52
+msgid "Bebob"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:236
-msgid "License: "
-msgstr "Llicència: "
+#: components/music/mpg123.c:52
+#, fuzzy
+msgid "Latin"
+msgstr "Ubicació"
 
-#: components/rpmview/nautilus-rpm-view.c:248
-msgid "Build Date: "
-msgstr "Data de muntatge: "
+#: components/music/mpg123.c:52
+msgid "Revival"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:260
-msgid "Distribution: "
-msgstr "Distribució: "
+#: components/music/mpg123.c:53
+msgid "Celtic"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:272
-msgid "Vendor: "
-msgstr "Venedor: "
+#: components/music/mpg123.c:53
+msgid "Bluegrass"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:305
-msgid "Install"
-msgstr "Instal·la"
+#: components/music/mpg123.c:53
+msgid "Avantgarde"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:321
-msgid "Update"
-msgstr "Actualitza"
+#: components/music/mpg123.c:54
+msgid "Gothic Rock"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:330
-msgid "Uninstall"
-msgstr "Desinstal·lar"
+#: components/music/mpg123.c:54
+#, fuzzy
+msgid "Progressive Rock"
+msgstr "Progrés..."
 
-#: components/rpmview/nautilus-rpm-view.c:346
-msgid "Verify"
+#: components/music/mpg123.c:55
+msgid "Psychedelic Rock"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:382
-msgid "Go to selected file"
-msgstr "Vés al fitxer selecionat"
+#: components/music/mpg123.c:55
+msgid "Symphonic Rock"
+msgstr ""
 
-#. add the description
-#: components/rpmview/nautilus-rpm-view.c:393
-msgid "Description"
-msgstr "Descripció"
+#: components/music/mpg123.c:55
+msgid "Slow Rock"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:582
-#, c-format
-msgid "Package \"%s\" "
-msgstr "Paquet \"%s\" "
+#: components/music/mpg123.c:56
+msgid "Big Band"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:647
-#, c-format
-msgid "version %s-%s"
-msgstr "versió %s-%s"
+#: components/music/mpg123.c:56
+#, fuzzy
+msgid "Chorus"
+msgstr "Trieu"
 
-#: components/rpmview/nautilus-rpm-view.c:727
-#, c-format
-msgid "Package Contents: %d files"
-msgstr "Contingut del paquet: %d fitxers"
+#: components/music/mpg123.c:56
+msgid "Easy Listening"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:852
-#, fuzzy, c-format
-msgid "checking %s..."
-msgstr "S'està comprovant el fitxer local %s..."
+#: components/music/mpg123.c:57
+#, fuzzy
+msgid "Acoustic"
+msgstr "música"
 
-#: components/rpmview/nautilus-rpm-view.c:854
-#, c-format
-msgid "file %s has an error!"
+#: components/music/mpg123.c:57
+msgid "Humour"
+msgstr ""
+
+#: components/music/mpg123.c:57
+#, fuzzy
+msgid "Speech"
+msgstr "Cerca"
+
+#: components/music/mpg123.c:57
+#, fuzzy
+msgid "Chanson"
+msgstr "Canals"
+
+#: components/music/mpg123.c:58
+#, fuzzy
+msgid "Opera"
+msgstr "_Obre"
+
+#: components/music/mpg123.c:58
+msgid "Chamber Music"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:872
-msgid "Verification completed."
+#: components/music/mpg123.c:58
+msgid "Sonata"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:108
-#, c-format
-msgid "%s would not work anymore\n"
+#: components/music/mpg123.c:58
+msgid "Symphony"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:111
+#: components/music/mpg123.c:59
+msgid "Booty Bass"
+msgstr ""
+
+#: components/music/mpg123.c:59
+#, fuzzy
+msgid "Primus"
+msgstr "Prèvia"
+
+#: components/music/mpg123.c:59
+msgid "Porn Groove"
+msgstr ""
+
+#: components/music/mpg123.c:60
+#, fuzzy
+msgid "Satire"
+msgstr "Enmagatzemat"
+
+#: components/music/mpg123.c:60
+msgid "Slow Jam"
+msgstr ""
+
+#: components/music/mpg123.c:60
+msgid "Club"
+msgstr ""
+
+#: components/music/mpg123.c:60
+msgid "Tango"
+msgstr ""
+
+#: components/music/mpg123.c:61
+msgid "Samba"
+msgstr ""
+
+#: components/music/mpg123.c:61
+msgid "Folklore"
+msgstr ""
+
+#: components/music/mpg123.c:61
+msgid "Ballad"
+msgstr ""
+
+#: components/music/mpg123.c:61
+msgid "Power Ballad"
+msgstr ""
+
+#: components/music/mpg123.c:62
+msgid "Rhythmic Soul"
+msgstr ""
+
+#: components/music/mpg123.c:62
+msgid "Freestyle"
+msgstr ""
+
+#: components/music/mpg123.c:62
+#, fuzzy
+msgid "Duet"
+msgstr "Suprimeix"
+
+#: components/music/mpg123.c:63
+msgid "Punk Rock"
+msgstr ""
+
+#: components/music/mpg123.c:63
+msgid "Drum Solo"
+msgstr ""
+
+#: components/music/mpg123.c:63
+msgid "A Cappella"
+msgstr ""
+
+#: components/music/mpg123.c:64
+msgid "Euro-House"
+msgstr ""
+
+#: components/music/mpg123.c:64
+#, fuzzy
+msgid "Dance Hall"
+msgstr "Cancel·la"
+
+#: components/music/mpg123.c:64
+#, fuzzy
+msgid "Goa"
+msgstr "_Vés"
+
+#: components/music/mpg123.c:65
+msgid "Drum & Bass"
+msgstr ""
+
+#: components/music/mpg123.c:65
+#, fuzzy
+msgid "Club-House"
+msgstr "Tanca"
+
+#: components/music/mpg123.c:65
+#, fuzzy
+msgid "Hardcore"
+msgstr "0 directoris"
+
+#: components/music/mpg123.c:66
+msgid "Terror"
+msgstr ""
+
+#: components/music/mpg123.c:66
+msgid "Indie"
+msgstr ""
+
+#: components/music/mpg123.c:66
+msgid "BritPop"
+msgstr ""
+
+#: components/music/mpg123.c:66
+msgid "Negerpunk"
+msgstr ""
+
+#: components/music/mpg123.c:67
+msgid "Polsk Punk"
+msgstr ""
+
+#: components/music/mpg123.c:67
+msgid "Beat"
+msgstr ""
+
+#: components/music/mpg123.c:67
+msgid "Christian Gangsta Rap"
+msgstr ""
+
+#: components/music/mpg123.c:68
+msgid "Heavy Metal"
+msgstr ""
+
+#: components/music/mpg123.c:68
+msgid "Black Metal"
+msgstr ""
+
+#: components/music/mpg123.c:68
+msgid "Crossover"
+msgstr ""
+
+#: components/music/mpg123.c:69
+msgid "Contemporary Christian"
+msgstr ""
+
+#: components/music/mpg123.c:69
+msgid "Christian Rock"
+msgstr ""
+
+#: components/music/mpg123.c:70
+msgid "Merengue"
+msgstr ""
+
+#: components/music/mpg123.c:70
+msgid "Salsa"
+msgstr ""
+
+#: components/music/mpg123.c:70
+msgid "Thrash Metal"
+msgstr ""
+
+#: components/music/mpg123.c:71
+#, fuzzy
+msgid "Anime"
+msgstr "Temps "
+
+#: components/music/mpg123.c:71
+msgid "JPop"
+msgstr ""
+
+#: components/music/mpg123.c:71
+#, fuzzy
+msgid "Synthpop"
+msgstr "Aturar"
+
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Track"
+msgstr "Peça"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Title"
+msgstr "Títol"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Artist"
+msgstr "Artista"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Year"
+msgstr "Any"
+
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Bit Rate"
+msgstr "Bits per segon "
+
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Time"
+msgstr "Temps "
+
+#: components/music/nautilus-music-view.c:238
+msgid "Album"
+msgstr "Àlbum"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Comment"
+msgstr "Comentari"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Channels"
+msgstr "Canals"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Sample Rate"
+msgstr "Velocitat de mostreig"
+
+#: components/music/nautilus-music-view.c:350
+#, fuzzy
+msgid "Set Cover Image"
+msgstr "Defineix ID d'usuari"
+
+#: components/music/nautilus-music-view.c:694
 #, fuzzy, c-format
-msgid "%s would break other installed packages\n"
-msgstr "S'està llegint la llista de paquets d'instal·lació ..."
+msgid "Sorry, but '%s' is not a usable image file."
+msgstr "'%s' no és un fitxer d'imatge!"
 
-#: components/rpmview/nautilus-rpm-view-install.c:116
-#, c-format
-msgid "%s is needed, but could not be found\n"
+#: components/music/nautilus-music-view.c:696
+#: src/nautilus-property-browser.c:1060 src/nautilus-property-browser.c:1312
+#, fuzzy
+msgid "Not an Image"
+msgstr "no és al menú"
+
+#: components/music/nautilus-music-view.c:744
+#, fuzzy
+msgid "Select an image file for the album cover:"
+msgstr "Seleccioneu un fitxer d'imatge per al nou emblema:"
+
+#: components/music/nautilus-music-view.c:1174
+msgid ""
+"Sorry, but the music view is unable to play back sound right now. Either "
+"another program is using or blocking the sound card, or your sound card is "
+"not configured properly. Try quitting any applications that may be blocking "
+"use of the sound card."
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:121
-#, c-format
-msgid "%s was already installed\n"
+#: components/music/nautilus-music-view.c:1178
+msgid "Unable to Play File"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:140
-#, c-format
-msgid "Installing %s failed because of the following issue(s):\n"
+#: components/music/nautilus-music-view.c:1199
+msgid "Sorry, but the music view can't play non-local files yet."
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:142
+#: components/music/nautilus-music-view.c:1200
+#, fuzzy
+msgid "Can't Play Remote Files"
+msgstr "No es pot obrir el fitxer remot"
+
+#: components/music/nautilus-music-view.c:1486
+msgid "Drag to seek within track"
+msgstr ""
+
+#: components/music/nautilus-music-view.c:1526
+msgid "Play"
+msgstr "Reproduir"
+
+#: components/music/nautilus-music-view.c:1540
+msgid "Pause"
+msgstr "Pausa"
+
+#: components/music/nautilus-music-view.c:1554
+#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
+msgid "Stop"
+msgstr "Aturar"
+
+#: components/music/nautilus-music-view.c:1679
 #, c-format
-msgid "Uninstalling %s failed because of the following issue(s):\n"
+msgid "Sorry, but there was an error reading %s."
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:219
+#: components/music/nautilus-music-view.c:1680
 #, fuzzy
-msgid "Uninstall failed..."
-msgstr "La desinstal·lació ha fallat"
+msgid "Can't Read Folder"
+msgstr "No es pot obrir el fitxer remot"
 
-#: components/rpmview/nautilus-rpm-view-install.c:220
+#: components/music/nautilus-music-view.c:1750
 #, fuzzy
-msgid "Uninstall Failed"
-msgstr "La desinstal·lació ha fallat"
+msgid "Stereo"
+msgstr "Enmagatzemat"
 
-#: components/rpmview/nautilus-rpm-view-install.c:222
+#: components/music/nautilus-music-view.c:1750
 #, fuzzy
-msgid "Install failed..."
-msgstr "La instal·lació ha fallat"
+msgid "Mono"
+msgstr "S'està movent"
 
-#: components/rpmview/nautilus-rpm-view-install.c:223
+#: components/music/nautilus-music-view.c:1792
+#, fuzzy, c-format
+msgid "%s - %s"
+msgstr "%s%s"
+
+#: components/music/Nautilus_View_music.oaf.in.h:1
+msgid "Factory for music view"
+msgstr ""
+
+#: components/music/Nautilus_View_music.oaf.in.h:2
 #, fuzzy
-msgid "Install Failed"
-msgstr "La instal·lació ha fallat"
+msgid "Music"
+msgstr "música"
 
-#: components/rpmview/nautilus-rpm-view-install.c:267
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:899
+#: components/music/Nautilus_View_music.oaf.in.h:3
 #, fuzzy
-msgid "Incorrect password."
-msgstr "Introduïu la contrassenya"
+msgid "Music Viewer"
+msgstr "%s Visualitzador"
+
+#: components/music/Nautilus_View_music.oaf.in.h:4
+msgid "Music view"
+msgstr ""
+
+#: components/music/Nautilus_View_music.oaf.in.h:5
+msgid "Music view factory"
+msgstr ""
 
-#: components/sample/nautilus-sample-content-view.c:86
+#: components/music/Nautilus_View_music.oaf.in.h:6
+#, fuzzy
+msgid "View as Music"
+msgstr "Veure com %s"
+
+#: components/notes/Nautilus_View_notes.oaf.in.h:1
+msgid "Factory for annotation view"
+msgstr ""
+
+#: components/notes/Nautilus_View_notes.oaf.in.h:3
+#, fuzzy
+msgid "Notes sidebar panel"
+msgstr "Barra lateral"
+
+#: components/notes/Nautilus_View_notes.oaf.in.h:4
+msgid "Notes sidebar panel for Nautilus"
+msgstr ""
+
+#: components/sample/nautilus-sample-content-view.c:136
 msgid "(none)"
 msgstr "(cap)"
 
-#: components/sample/nautilus-sample-content-view.c:148
+#: components/sample/nautilus-sample-content-view.c:189
 #, c-format
 msgid ""
 "%s\n"
@@ -513,7 +1829,7 @@ msgstr ""
 "\n"
 "Açò és una mostra dels components de la vista de contingut del Nautilus."
 
-#: components/sample/nautilus-sample-content-view.c:206
+#: components/sample/nautilus-sample-content-view.c:252
 #, c-format
 msgid ""
 "%s\n"
@@ -524,107 +1840,458 @@ msgstr ""
 "\n"
 "Heu fet clic al botó 'Mostra de la barra d'eines'."
 
-#. menu item path, must start with /some-existing-menu-path and be otherwise unique
-#: components/sample/nautilus-sample-content-view.c:246
-msgid "_Sample"
-msgstr "_Mostra"
+#: components/sample/Nautilus_View_sample.oaf.in.h:3
+#: components/sample/nautilus-sample-content-view-ui.xml.h:1
+#: components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in.h:2
+msgid "Sample"
+msgstr "Mostra"
 
-#. menu item user-displayed label
-#: components/sample/nautilus-sample-content-view.c:247
+#: components/sample/nautilus-sample-content-view-ui.xml.h:2
 msgid "This is a sample merged menu item"
 msgstr "Açò és un element de mostra del menú combinat"
 
-#. button path, must start with /some-existing-toolbar-path and be otherwise unique
-#: components/sample/nautilus-sample-content-view.c:262
-msgid "Sample"
-msgstr "Mostra"
-
-#. button user-displayed label
-#: components/sample/nautilus-sample-content-view.c:263
+#: components/sample/nautilus-sample-content-view-ui.xml.h:3
 msgid "This is a sample merged toolbar button"
 msgstr "Açò és una mostra dels botons de la barra d'eines"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:79
+#: components/sample/nautilus-sample-content-view-ui.xml.h:5
+msgid "_Sample"
+msgstr "_Mostra"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus Sample view"
+msgstr "Nautilus"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Sample view factory"
+msgstr "Nautilus: Veure com un altre"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:4
+#, fuzzy
+msgid "Sample Viewer"
+msgstr "Velocitat de mostreig"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:5
+#, fuzzy
+msgid "Sample content view component"
+msgstr ""
+"%s\n"
+"\n"
+"Açò és una mostra dels components de la vista de contingut del Nautilus."
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:6
+#, fuzzy
+msgid "Sample content view component's factory"
+msgstr ""
+"%s\n"
+"\n"
+"Açò és una mostra dels components de la vista de contingut del Nautilus."
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:7
+#, fuzzy
+msgid "View as Sample"
+msgstr "Veure com altres..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:107
+msgid "Set the default answer to continue, also default delete to Yes"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:108
+#, fuzzy
+msgid "Specify search cgi"
+msgstr "Especifiqueu el servidor"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
+#: components/services/install/command-line/eazel-test-packsys.c:590
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "Mostra la sortida de la depuració"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:80
+#: components/services/install/command-line/eazel-alt-install-corba.c:110
 msgid "10 sec delay after starting service"
 msgstr "Retard de 10 seg. després d'iniciar el servei"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:81
+#: components/services/install/command-line/eazel-alt-install-corba.c:111
 #, fuzzy
 msgid "Allow downgrades"
 msgstr "Permet instal·lar noves versions"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:82
+#: components/services/install/command-line/eazel-alt-install-corba.c:112
 msgid "Erase packages"
 msgstr "Elimina els paquets"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:83
+#: components/services/install/command-line/eazel-alt-install-corba.c:113
+#, fuzzy
+msgid "enable ei2"
+msgstr "Habilita el procés de depuració"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:114
 msgid "RPM args are filename"
 msgstr "Els arguments de l'RPM són el nom de fitxer"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:84
-msgid "Force install"
-msgstr "Força la intal·lació"
-
-#: components/services/install/command-line/eazel-alt-install-corba.c:85
+#: components/services/install/command-line/eazel-alt-install-corba.c:115
 msgid "Use ftp"
 msgstr "Utilitza l'ftp"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:86
+#: components/services/install/command-line/eazel-alt-install-corba.c:116
 msgid "Use local"
 msgstr "Utilitza la ubicació local"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:87
+#: components/services/install/command-line/eazel-alt-install-corba.c:117
 msgid "Use http"
 msgstr "Utilitza l'http"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:88
+#: components/services/install/command-line/eazel-alt-install-corba.c:118
+#, fuzzy
+msgid "RPM args are Eazel Ids"
+msgstr "Els arguments de l'RPM són el nom de fitxer"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:119
+msgid "machine readable output"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:120
+msgid "Don't print fancy percent output"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:121
+msgid "don't use eazel auth stuff"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:122
 #, fuzzy
 msgid "Specify package file"
 msgstr "Títol del paquet"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:89
-msgid "Set port numer (80)"
-msgstr "Especifiqueu el número de port (80)"
+#: components/services/install/command-line/eazel-alt-install-corba.c:123
+#, fuzzy
+msgid "RPM args are needed files"
+msgstr "Els arguments de l'RPM són el nom de fitxer"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:90
+#: components/services/install/command-line/eazel-alt-install-corba.c:124
 msgid "Run Query"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:91
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
 #, fuzzy
 msgid "Revert"
 msgstr "Elimina"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:92
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 #, fuzzy
 msgid "Set root"
 msgstr "Defineix ID de grup"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:93
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "Especifiqueu el servidor"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:94
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
+msgid "Dont print too much, just problems and download"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
+msgid "Perform ssl renaming"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
+msgid "argument is a suite id"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "Prova d'execució"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:95
-msgid "Set tmp dir (/tmp/eazel-install)"
-msgstr "Especifiqueu el directori temporal (/tmp/eazel-install)"
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#, fuzzy
+msgid "Allow username"
+msgstr "Permet instal·lar noves versions"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:96
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "Permet instal·lar noves versions"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:97
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr ""
 
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#, fuzzy
+msgid "Install a specific package version"
+msgstr "S'està instal·lant \"%s\" "
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
+msgid "*** You cannot specify more then one protocol type.\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
+msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
+#, fuzzy, c-format
+msgid "File conflict checking %s...\n"
+msgstr "S'està comprovant el fitxer local %s..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
+#, fuzzy, c-format
+msgid "File uniqueness checking %s...\n"
+msgstr "S'està comprovant el fitxer local %s..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
+#, c-format
+msgid "Feature consistency checking %s...\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
+#, c-format
+msgid "Downloading %s..."
+msgstr "S'està descarregant %s..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
+msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
+#, fuzzy
+msgid "Downloading %s... (%d/%d) = %d%%"
+msgstr "S'està descarregant %s..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
+#, c-format
+msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
+#, fuzzy, c-format
+msgid "Downloading %s... %3.1f KB/s Done\n"
+msgstr "S'està descarregant %s..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
+msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
+msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
+#, fuzzy
+msgid "Done\n"
+msgstr "Fet"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
+#, c-format
+msgid "Download of %s FAILED\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
+#, c-format
+msgid "Package %s failed to uninstall.\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
+#, fuzzy, c-format
+msgid "Package %s failed to install.\n"
+msgstr "Força la intal·lació"
+
+#. I18N note: \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
+#, c-format
+msgid "\t· Problem : %s\n"
+msgstr ""
+
+#. I18N note: \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
+#, c-format
+msgid "\t· Action : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
+#, fuzzy
+msgid "Cancelling operation\n"
+msgstr "Operacions vàlides:"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
+#, c-format
+msgid "About to install a total of %d packages, %dKB\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
+#, c-format
+msgid "About to uninstall a total of %d packages, %dKB\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
+#, c-format
+msgid "About to revert a total of %d packages, %d KB\n"
+msgstr ""
+
+#. I18N note: %s is a package name, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
+#, c-format
+msgid "\t· %s and it's dependencies\n"
+msgstr ""
+
+#. I18N note: %s is a package name, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
+#, c-format
+msgid "\t· %s\n"
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n) " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
+msgid "Save transaction report ? (y/n) "
+msgstr ""
+
+#. I18N note: y is the letter for the word Yes. This is
+#. used in the response for a yes/no questions. Your translation
+#. must be 1 character only.
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
+msgid "y"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
+#, c-format
+msgid "Dependency : %s needs %s\n"
+msgstr ""
+
+#. I18N note: %s is a package name
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
+#, c-format
+msgid "Package %s failed md5 check!\n"
+msgstr ""
+
+#. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
+#, c-format
+msgid "\t· server MD5 checksum is %s\n"
+msgstr ""
+
+#. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
+#, c-format
+msgid "\t· actual MD5 checksum is %s\n"
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
+msgid "Continue? (y/n) "
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
+msgid "Should I delete the RPM files? (y/n) "
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
+msgid "Operation ok\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
+#, fuzzy
+msgid "Operation failed\n"
+msgstr "La instal·lació ha fallat"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
+#, fuzzy
+msgid "Installing"
+msgstr "Instal·la"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
+#, fuzzy
+msgid "Uninstalling"
+msgstr "Desinstal·lar"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
+msgid "Only one operation at a time please."
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
+#, c-format
+msgid "%s: --help for usage\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
+#, c-format
+msgid "Name         : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#, fuzzy, c-format
+msgid "Version      : %s\n"
+msgstr "Versió %s-%s"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#, c-format
+msgid "Minor        : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
+#, c-format
+msgid "Size         : %d\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#, c-format
+msgid "Arch         : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#, fuzzy, c-format
+msgid "Distribution : %s\n"
+msgstr "Distribució: "
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#, fuzzy, c-format
+msgid "Description  : %s\n"
+msgstr "Descripció"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
+#, fuzzy, c-format
+msgid "Install root : %s\n"
+msgstr "Data d'instal·lació: "
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
+msgid "Provides     : \n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
+#, c-format
+msgid "exit code %d\n"
+msgstr ""
+
 #: components/services/install/command-line/eazel-gen-xml.c:41
 msgid "Specify package list to use (/var/eazel/service/package-list.xml)"
 msgstr ""
@@ -637,666 +2304,2263 @@ msgstr ""
 "Utilitza un fitxer especificat per a generar una llista de paquets, "
 "requereix --packagelist"
 
-#: components/services/install/lib/eazel-install-metadata.c:172
-msgid "Could not set URLType from config file!"
-msgstr "No s'ha pogut definir el tipus d'URL des d'el fitxer de configuració!"
-
-#: components/services/install/lib/eazel-install-object.c:672
-msgid "Creating temporary download directory ...\n"
-msgstr "S'està creant un directori temporal de descàrrega ...\n"
+#: components/services/install/command-line/eazel-test-softcat.c:54
+msgid "Softcat server to connect to"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:677
-msgid "Could not create temporary directory!\n"
-msgstr "No s'ha pogut crear un directori temporal!\n"
+#: components/services/install/command-line/eazel-test-softcat.c:55
+msgid "Use alternate CGI path"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:691
-msgid "Getting package list from remote server ...\n"
-msgstr "S'està obtenint la llista de paquets del servidor remot ...\n"
+#: components/services/install/command-line/eazel-test-softcat.c:57
+msgid "Connect as a softcat user through ammonite"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:711
-msgid "Unable to retrieve package-list.xml!\n"
-msgstr "És impossible recuerar package-list.xml!\n"
+#: components/services/install/command-line/eazel-test-softcat.c:58
+msgid "Number of times to try the request"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:756
-#, c-format
-msgid "Cannot write to file %s, using default log handler"
+#: components/services/install/command-line/eazel-test-softcat.c:59
+msgid "Delay between request retries, in usec"
 msgstr ""
-"No es pot escriure al fitxer %s, s'emprarà el gestor de registre "
-"predeterminat"
 
-#: components/services/install/lib/eazel-install-object.c:856
-msgid "Install failed"
-msgstr "La instal·lació ha fallat"
+#: components/services/install/command-line/eazel-test-softcat.c:60
+#, fuzzy
+msgid "Lookup by Eazel package id"
+msgstr "Cerca el paquet a la base de dades"
 
-#: components/services/install/lib/eazel-install-object.c:887
-msgid "Uninstall failed"
-msgstr "La desinstal·lació ha fallat"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+msgid "Lookup package that features a feature/file"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:122
-#: components/services/install/lib/eazel-install-protocols.c:223
-#, c-format
-msgid "Downloading %s..."
-msgstr "S'està descarregant %s..."
+#: components/services/install/command-line/eazel-test-softcat.c:62
+#, fuzzy
+msgid "Lookup package with a specific version"
+msgstr "Cerca el paquet a la base de dades"
 
-#: components/services/install/lib/eazel-install-protocols.c:133
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:399
-#, c-format
-msgid "Could not open target file %s"
-msgstr "No s'ha pogut obrir el fitxer objectiu %s"
+#: components/services/install/command-line/eazel-test-softcat.c:63
+msgid "(with --version) Use >= comparison"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:140
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:333
-msgid "Could not create an http request !"
-msgstr "No s'ha pogut crear una sol·licitud http !"
+#: components/services/install/command-line/eazel-test-softcat.c:64
+msgid "use check function (for debugging)"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:147
-#, fuzzy
-msgid "Proxy: Invalid uri !"
-msgstr "La uri és invàlida!"
+#: components/services/install/command-line/eazel-test-softcat.c:65
+msgid "Show detailed sub-package info"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:152
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:338
-msgid "Invalid uri !"
-msgstr "La uri és invàlida!"
+#: components/services/install/command-line/eazel-test-softcat.c:66
+msgid "enable funk parser"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:159
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:348
-msgid "Could not prepare http request !"
-msgstr "No s'ha pogut preparar la sol·licitud http !"
+#: components/services/install/lib/eazel-install-logic2.c:117
+msgid "Failed to lock the downloaded file"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:163
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:353
-msgid "Couldn't get async mode "
-msgstr "No s'ha pogut aconseguir el mode asíncron"
+#: components/services/install/lib/eazel-install-logic2.c:134
+#, c-format
+msgid "MD5 mismatch, package %s may be compromised"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:188
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:363
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, c-format
-msgid "HTTP error: %d %s"
-msgstr "S'ha produït un error HTTP: %d %s"
+msgid "No MD5 available for %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:198
-msgid "Could not get request body!"
-msgstr "No s'ha pogut obtenir el cos de la sol·licitud!"
+#. I18N note: "%is is ok" in the sense that %s=package name and the
+#. package is intact
+#: components/services/install/lib/eazel-install-logic2.c:356
+#, c-format
+msgid "%s is ok"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:224
-msgid "FTP not supported yet"
-msgstr "L'FTP encara no està suportat"
+#: components/services/install/lib/eazel-install-logic2.c:462
+#, fuzzy, c-format
+msgid "%s-%s version %s-%s already installed"
+msgstr "Força la intal·lació"
 
-#: components/services/install/lib/eazel-install-protocols.c:409
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
-msgid "Checking local file %s..."
-msgstr "S'està comprovant el fitxer local %s..."
+msgid "%s version %s already installed"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:481
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
-msgid "Failed to retreive %s!"
-msgstr "Ha fallat la recuperació de %s!"
+msgid "%s upgrades from version %s-%s to %s-%s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:539
-#: components/services/install/lib/eazel-install-protocols.c:593
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
-msgid "Could not get a URL for %s"
-msgstr "No s'ha pogut obtenir una URL per a %s"
+msgid "%s downgrades from version %s-%s to %s-%s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:557
-#: components/services/install/lib/eazel-install-protocols.c:606
-#: components/services/install/lib/eazel-install-protocols.c:655
-msgid "File download failed"
+#: components/services/install/lib/eazel-install-logic2.c:494
+#, c-format
+msgid "%s downgrades from version %s to %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:587
-msgid "Using local protocol cannot resolve library dependencies"
-msgstr "La utilització d'un protocol local no pot resoldre les dependències"
+#: components/services/install/lib/eazel-install-logic2.c:547
+#, fuzzy, c-format
+msgid "%s installs version %s-%s"
+msgstr "versió %s-%s"
 
-#: components/services/install/lib/eazel-install-protocols.c:636
-#, fuzzy
-msgid "Using local protocol cannot fetch by id"
-msgstr "La utilització d'un protocol local no pot resoldre les dependències"
+#: components/services/install/lib/eazel-install-logic2.c:552
+#, c-format
+msgid "%s installs version %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:642
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, fuzzy, c-format
-msgid "Could not get a URL for package id %s"
-msgstr "No s'ha pogut obtenir una URL per a %s"
+msgid "Loading package info from file %s"
+msgstr "No s'ha pogut crear el mapa de píxels a partir del fitxer: %s"
+
+#. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
+#: components/services/install/lib/eazel-install-logic2.c:1197
+msgid "ok"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:1197
+msgid "not ok"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:742
-#: components/services/install/lib/eazel-install-protocols.c:746
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
-msgid "Could not retrieve a URL for %s"
-msgstr "No s'ha pogut recuperar un URL per a %s"
+msgid "Checking dependencies for %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:750
+#. I18N note: both %s' are package names.
+#. related is in the sense that the two packages apparently
+#. are connected somehow, eg. foo and foo-devel
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, fuzzy, c-format
-msgid "Could not retrieve a URL for id %s"
+msgid "%s is related to %s"
+msgstr "\"%s\" seleccionat (%s)"
+
+#: components/services/install/lib/eazel-install-logic2.c:2090
+#, c-format
+msgid "updating %s to version %s-%s solves conflict"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2113
+#, c-format
+msgid "available update to %s (%s-%s) does not solves conflict"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2128
+#, fuzzy, c-format
+msgid "could not revive %s"
 msgstr "No s'ha pogut recuperar un URL per a %s"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:135
-#: components/services/install/lib/eazel-install-rpm-glue.c:464
-msgid "Dry Run Mode Activated.  Packages will not actually be installed ..."
+#: components/services/install/lib/eazel-install-logic2.c:2284
+#, c-format
+msgid "file uniqueness checking %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2305
+#, c-format
+msgid "Duplicate file : %s occurs in %s and %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
+msgid "... but it's ok, the packages are related"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2324
+#, c-format
+msgid "(there were %d other conflicts)"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2419
+#, c-format
+msgid "file conflict checking %s"
 msgstr ""
-"S'ha activat el mode Dry Run. Els paquets no s'instal·laran realment..."
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:166
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
-msgid "*** Could not create tmp directory (%s)! ***\n"
-msgstr "*** No s'ha pogut crear el directori tmp (%s)! ***\n"
+msgid "file conflict : package %s already provides file %s also provided by %s"
+msgstr ""
+
+#. the owner of this file is a package that we're upgrading, and the
+#. * new version no longer has this file, so everything's okay.
+#: components/services/install/lib/eazel-install-logic2.c:2466
+#, c-format
+msgid "...but it is okay, we're upgrading %s and it ditched that file"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:173
+#: components/services/install/lib/eazel-install-logic2.c:2558
+#, c-format
+msgid "checking feature consistency of %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2626
+#, c-format
+msgid ""
+"feature missing : %s breaks if %s is installed (feature %s would be lost"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, fuzzy, c-format
-msgid "Reading the install package list %s"
-msgstr "S'està llegint la llista de paquets d'instal·lació ..."
+msgid "downloading %d packages"
+msgstr "S'està eliminant el paquet %s"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:245
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, fuzzy, c-format
-msgid "Will download %s"
+msgid "will upgrade %s"
+msgstr "Permet instal·lar noves versions"
+
+#: components/services/install/lib/eazel-install-logic2.c:2954
+#, fuzzy, c-format
+msgid "will downgrade %s"
 msgstr "S'està descarregant %s..."
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:258
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, fuzzy, c-format
-msgid "%s already installed"
-msgstr "Força la intal·lació"
+msgid "will install %s"
+msgstr "Eina d'instal·lació del Nautilus"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:373
-#, c-format
-msgid "%s..."
+#: components/services/install/lib/eazel-install-logic2.c:2960
+#, fuzzy, c-format
+msgid "will uninstall %s"
+msgstr "Desinstal·lar"
+
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
+#, fuzzy, c-format
+msgid "%s requires %s"
+msgstr "%s %s trenca %s"
+
+#: components/services/install/lib/eazel-install-logic2.c:3238
+#, fuzzy, c-format
+msgid "failed %s"
+msgstr "0 fitxers"
+
+#: components/services/install/lib/eazel-install-metadata.c:174
+msgid "Could not set URLType from config file!"
+msgstr "No s'ha pogut definir el tipus d'URL des d'el fitxer de configuració!"
+
+#: components/services/install/lib/eazel-install-object.c:717
+msgid "Transactions are not stored, could not find home dir"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:382
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
-msgid "Skipping %s..."
+msgid "Transactions are stored in %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:437
+#: components/services/install/lib/eazel-install-object.c:1005
+msgid "Getting package list from remote server ...\n"
+msgstr "S'està obtenint la llista de paquets del servidor remot ...\n"
+
+#: components/services/install/lib/eazel-install-object.c:1021
+msgid "Unable to retrieve package-list.xml!\n"
+msgstr "És impossible recuerar package-list.xml!\n"
+
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
-msgid "Category = %s"
-msgstr "Categoria = %s"
+msgid "Cannot write to file %s, using default log handler"
+msgstr ""
+"No es pot escriure al fitxer %s, s'emprarà el gestor de registre "
+"predeterminat"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:750
+#: components/services/install/lib/eazel-install-object.c:1225
+msgid "Install failed"
+msgstr "La instal·lació ha fallat"
+
+#: components/services/install/lib/eazel-install-object.c:1271
+msgid "Uninstall failed"
+msgstr "La desinstal·lació ha fallat"
+
+#: components/services/install/lib/eazel-install-object.c:1406
 #, fuzzy, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "*** No s'ha pogut crear un directori de transacció (%s) ***\n"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:772
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:970
-msgid "Failed to lock the downloaded file"
+#: components/services/install/lib/eazel-install-problem.c:163
+#, c-format
+msgid "%s was cancelled"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:985
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
-msgid "MD5 mismatch, package %s may be compromised"
+msgid "%s is a source package, which is not yet supported"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1043
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
 #, fuzzy, c-format
-msgid "Preflight (%d bytes, %d packages)"
-msgstr "Categoria = %s, %d paquets"
+msgid "%s would break other packages"
+msgstr "S'està llegint la llista de paquets d'instal·lació ..."
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1081
-msgid "rpm running..."
+#: components/services/install/lib/eazel-install-problem.c:185
+#, c-format
+msgid "%s would break"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1173
-#, fuzzy, c-format
-msgid "Removing package %s %s"
-msgstr "S'està eliminant el paquet %s"
-
-#: components/services/install/lib/eazel-install-rpm-glue.c:1294
+#: components/services/install/lib/eazel-install-problem.c:191
 #, c-format
-msgid "Cannot open %s"
-msgstr "No es pot obrir %s"
+msgid "%s would break %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1356
+#: components/services/install/lib/eazel-install-problem.c:197
 #, c-format
-msgid "Closing db for %s (open)"
+msgid "%s is damaged"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1361
+#: components/services/install/lib/eazel-install-problem.c:201
 #, c-format
-msgid "Closing db for %s (not open)"
+msgid "%s requires %s, which could not be found on the server"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1417
-msgid "RPM package database query failed !"
-msgstr "La consulta a la base de dades de paquets de l'RPM ha fallat !"
+#: components/services/install/lib/eazel-install-problem.c:204
+#, c-format
+msgid "%s for %s could not be found on the server"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1420
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, fuzzy, c-format
-msgid "Opened packages database in %s"
-msgstr "La consulta a la base de dades de paquets de l'RPM ha fallat !"
+msgid "%s is already installed"
+msgstr "Força la intal·lació"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1422
-#, fuzzy, c-format
-msgid "Opening packages database in %s failed"
-msgstr "La consulta a la base de dades de paquets de l'RPM ha fallat !"
+#: components/services/install/lib/eazel-install-problem.c:259
+#, c-format
+msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1439
-#, fuzzy
-msgid "Preparing package system"
-msgstr "S'està eliminant el paquet %s"
+#: components/services/install/lib/eazel-install-problem.c:263
+#, c-format
+msgid "%s, which is older, needs upgrade and upgrade is not enabled"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1693
+#: components/services/install/lib/eazel-install-problem.c:353
 #, c-format
-msgid "%s upgrades from version %s to %s"
+msgid "%s is not installed and could not be found on server"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1698
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. %s is a package name or filename
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
-msgid "%s downgrades from version %s to %s"
+msgid "Check for a new version of %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1705
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. both %s's are package names or filenames
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
-msgid "%s version %s already installed"
+msgid "Install both %s and %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1828
-#, fuzzy, c-format
-msgid "%s requires %s"
-msgstr "%s %s trenca %s"
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. %s is a package name or filename
+#: components/services/install/lib/eazel-install-problem.c:946
+#, c-format
+msgid "Remove %s from your system"
+msgstr ""
 
-#. If we end here, it's a conflict is going to break something
-#. FIXME bugzilla.eazel.com 1514:
-#. Need to handle this more intelligently
-#: components/services/install/lib/eazel-install-rpm-glue.c:1885
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. %s is a package name or filename. "Force" is in the rpm sense of force,
+#. meaning that no dependency checking etc will be done
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
-msgid "%s conflicts %s-%s"
-msgstr "%s provoca conflicte %s-%s"
+msgid "Force the removal of %s from your system"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1899
-#, fuzzy, c-format
-msgid "Processing dep for %s, requires library %s"
-msgstr "S'estàn processant les dependències per a %s : requereix %s"
+#. TRANSLATORS : This string is a solution to a dependency problem
+#: components/services/install/lib/eazel-install-problem.c:967
+msgid "Package database has an inconsistency"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:1015
+msgid "Continue with force"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:1021
+#, fuzzy
+msgid "Allow downgrade"
+msgstr "Permet instal·lar noves versions"
+
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
+#, c-format
+msgid "Could not open target file %s"
+msgstr "No s'ha pogut obrir el fitxer objectiu %s"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1908
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
+msgid "Could not create an http request !"
+msgstr "No s'ha pogut crear una sol·licitud http !"
+
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
+#, fuzzy
+msgid "Proxy: Invalid uri !"
+msgstr "La uri és invàlida!"
+
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
+msgid "Invalid uri !"
+msgstr "La uri és invàlida!"
+
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
+msgid "Could not prepare http request !"
+msgstr "No s'ha pogut preparar la sol·licitud http !"
+
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
+msgid "Couldn't get async mode "
+msgstr "No s'ha pogut aconseguir el mode asíncron"
+
+#. probably out of disk space
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
+#, c-format
+msgid "DISK FULL: could not write %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
+msgid "Could not get request body!"
+msgstr "No s'ha pogut obtenir el cos de la sol·licitud!"
+
+#: components/services/install/lib/eazel-install-protocols.c:208
+#, c-format
+msgid "HTTP error: %d %s"
+msgstr "S'ha produït un error HTTP: %d %s"
+
+#: components/services/install/lib/eazel-install-protocols.c:255
+msgid "FTP not supported yet"
+msgstr "L'FTP encara no està suportat"
+
+#: components/services/install/lib/eazel-install-protocols.c:463
+#, c-format
+msgid "Checking local file %s..."
+msgstr "S'està comprovant el fitxer local %s..."
+
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, fuzzy, c-format
-msgid "Processing dep for %s, requires package %s"
-msgstr "S'estàn processant les dependències per a %s : requereix %s"
+msgid "Failed to retrieve %s!"
+msgstr "Ha fallat la recuperació de %s!"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:2190
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, fuzzy, c-format
-msgid "%d dependency failure(s)"
-msgstr "%d dependències han fallat!"
+msgid "Could not get an URL for %s"
+msgstr "No s'ha pogut obtenir una URL per a %s"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:2254
-msgid "Dependencies are ok"
-msgstr "Les dependències estàn bé"
+#: components/services/install/lib/eazel-install-protocols.c:672
+msgid "Downloaded package does not have the correct name"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-protocols.c:673
+#, c-format
+msgid "Package %s should have had name %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:701
+msgid "File download failed"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr "*** Comença el vessat de paquets ***\n"
 
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr "*** Acaba el vessat de paquets ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:129
-#: components/services/install/lib/eazel-install-xml-package-list.c:136
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 #, fuzzy
-msgid "*** No package nodes! ***"
+msgid "*** No package nodes! (cat has no children) ***"
 msgstr "*** No hi ha els nodes dels paquets! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:131
-#: components/services/install/lib/eazel-install-xml-package-list.c:138
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 #, fuzzy
 msgid "*** Bailing from package parse! ***"
 msgstr "*** Bailing from package parse! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:143
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
+#, fuzzy
+msgid "*** No package nodes! ***"
+msgstr "*** No hi ha els nodes dels paquets! ***\n"
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 #, fuzzy
 msgid "*** Malformed package node!"
 msgstr "*** No hi ha els nodes dels paquets! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:153
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
+#, fuzzy
+msgid "*** No depends nodes! ***"
+msgstr "*** No hi ha els nodes dels paquets! ***\n"
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:182
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** El fitxer de la llista de paquets no conté dades! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:187
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** No es pot trobar el node xml de CATEGORIES! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:189
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr "*** Bailing from categories parse! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:195
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** Les categories no hi són! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:197
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr "*** Bailing from category parse! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:248
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** No es pot trobar el node xml de TRANSACCIÓ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:250
-#: components/services/install/lib/eazel-install-xml-package-list.c:258
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr "*** Bailing from transaction parse! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:256
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** Els paquets no hi són! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:364
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
+#, fuzzy
+msgid "*** No category nodes! ***"
+msgstr "*** No hi ha els nodes dels paquets! ***\n"
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
+#, fuzzy
+msgid "*** Cannot find the CATEGORIES xmlnode! ***"
+msgstr "*** No es pot trobar el node xml de CATEGORIES! ***\n"
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
+#, fuzzy, c-format
+msgid "*** Unknown node %s"
+msgstr "Desconegut"
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** Hi ha hagut un error en generar la llista de paquets xml! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:411
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** Hi ha hagut un error en llegir la llista de paquets! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:590
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 #, fuzzy
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** El fitxer de configuració no conté dades! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:595
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 #, fuzzy
 msgid "*** Bailing from osd parse! ***\n"
 msgstr "*** Bailing from xmlparse! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:648
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, fuzzy, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "No s'ha pogut obrir el fitxer objectiu %s"
 
-#. Setup the title
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:103
-#, fuzzy
-msgid "Easy Install"
-msgstr "Instal·la"
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
+#, fuzzy, c-format
+msgid "Opened packages database in %s"
+msgstr "La consulta a la base de dades de paquets de l'RPM ha fallat !"
 
-#. Setup the progress header
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:198
-msgid "Messages"
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
+#, fuzzy, c-format
+msgid "Opening packages database in %s failed"
+msgstr "La consulta a la base de dades de paquets de l'RPM ha fallat !"
+
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
+#, c-format
+msgid "Closing db for %s (open)"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:198
-#, fuzzy
-msgid "Progress"
-msgstr "Progrés..."
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
+#, c-format
+msgid "Closing db for %s (not open)"
+msgstr ""
+
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
+#, c-format
+msgid "Cannot open %s"
+msgstr "No es pot obrir %s"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:498
+#. this stuff flies by so fast, it's probably enough to just say "info"
+#: components/services/install-view/callbacks.c:64
 #, fuzzy
-msgid "Complete!"
-msgstr "Comentari"
+msgid "Getting package information ..."
+msgstr "S'està obtenint la llista de paquets del servidor remot ...\n"
+
+#: components/services/install-view/callbacks.c:82
+#, fuzzy, c-format
+msgid "Checking \"%s\" for conflicts..."
+msgstr "S'està comprovant el fitxer local %s..."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:544
+#: components/services/install-view/callbacks.c:185
 #, fuzzy, c-format
-msgid "Downloading package %s"
+msgid "Downloading 1 package (%s)"
 msgstr "S'està eliminant el paquet %s"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:551
+#: components/services/install-view/callbacks.c:187
 #, fuzzy, c-format
-msgid "Downloading package %s ..."
+msgid "Downloading %d packages (%s)"
+msgstr "S'està eliminant el paquet %s"
+
+#: components/services/install-view/callbacks.c:236
+#, fuzzy, c-format
+msgid "Downloading \"%s\""
 msgstr "S'està descarregant %s..."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:576
+#: components/services/install-view/callbacks.c:242
 #, c-format
-msgid "Dependency check: Package %s needs %s"
+msgid "0K of %dK"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:617
+#: components/services/install-view/callbacks.c:249
+#, c-format
 msgid ""
-"I'm about to install the following packages:\n"
-"\n"
+"The package \"%s\" requires \"%s\" to run.\n"
+"Downloading \"%s\" now."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:635
+#: components/services/install-view/callbacks.c:252
+#, fuzzy, c-format
+msgid "Attempting to download package \"%s\"."
+msgstr "S'està eliminant el paquet %s"
+
+#: components/services/install-view/callbacks.c:262
+#: components/services/install-view/callbacks.c:333
+#, fuzzy
+msgid "Complete"
+msgstr "Comentari"
+
+#: components/services/install-view/callbacks.c:266
+#, c-format
 msgid ""
-"\n"
-"Is this okay?"
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" has been successfully downloaded."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:655
-#, fuzzy
-msgid "Preparing to install 1 package"
-msgstr "S'està llegint la llista de paquets d'instal·lació ..."
+#: components/services/install-view/callbacks.c:269
+#, fuzzy, c-format
+msgid "The package \"%s\" has been successfully downloaded."
+msgstr "Llista de paquets XML generada amb èxit ...\n"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:657
+#: components/services/install-view/callbacks.c:287
+#, c-format
+msgid "%dK of %dK"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:316
 #, fuzzy, c-format
-msgid "Preparing to install %d packages"
-msgstr "S'està llegint la llista de paquets d'instal·lació ..."
+msgid "Download of package \"%s\" failed!"
+msgstr "S'està eliminant el paquet %s"
+
+#: components/services/install-view/callbacks.c:338
+#, c-format
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" has been successfully downloaded and installed."
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:678
+#: components/services/install-view/callbacks.c:341
 #, c-format
-msgid "Download of package %s failed!"
+msgid "\"%s\" has been successfully downloaded and installed."
 msgstr ""
 
 #. starting a new package -- create new progress indicator
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:695
+#: components/services/install-view/callbacks.c:369
 #, fuzzy, c-format
 msgid "Installing package %d of %d"
 msgstr "S'està instal·lant \"%s\" "
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:701
+#: components/services/install-view/callbacks.c:396
+#, c-format
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" is now being installed."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:399
 #, fuzzy, c-format
-msgid "Installing package %s ..."
+msgid "Now installing package \"%s\"."
 msgstr "S'està instal·lant \"%s\" "
 
-#. first package is the main one.  update top info, now that we know it
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:709
+#: components/services/install-view/callbacks.c:407
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, fuzzy, c-format
 msgid "Installing \"%s\""
 msgstr "S'està instal·lant \"%s\" "
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:716
+#: components/services/install-view/callbacks.c:415
+#: src/nautilus-zoom-control.c:592
+#, fuzzy
+msgid "%d%%"
+msgstr "%.0f%%"
+
+#: components/services/install-view/callbacks.c:443
 #, fuzzy, c-format
-msgid "Version: %s"
-msgstr "Versió %s-%s"
+msgid "Installation failed on %s"
+msgstr "La instal·lació ha fallat"
+
+#: components/services/install-view/callbacks.c:471
+msgid "I ran into problems while installing."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:472
+msgid "I'd like to try the following :"
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:772
+#: components/services/install-view/callbacks.c:481
+msgid "Is this ok ?"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:556
 #, fuzzy
-msgid "Installation complete!"
+msgid "Installation cancelled."
 msgstr "La instal·lació ha fallat"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:774
+#: components/services/install-view/callbacks.c:558
+msgid "This package has already been installed."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
 #, fuzzy
-msgid "Installation aborted."
-msgstr "Data d'instal·lació: "
+msgid "Installation complete."
+msgstr "La instal·lació ha fallat"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:776
+#: components/services/install-view/callbacks.c:564
 #, fuzzy
-msgid "Installation failed!"
+msgid "Installation failed."
 msgstr "La instal·lació ha fallat"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:790
+#. some succeeded; some failed
+#: components/services/install-view/callbacks.c:568
+#, fuzzy
+msgid "Some packages installed successfully:"
+msgstr "Llista de paquets XML generada amb èxit ...\n"
+
+#: components/services/install-view/callbacks.c:577
+#, fuzzy
+msgid ""
+"\n"
+"Some packages failed:"
+msgstr "Títol del paquet"
+
+#: components/services/install-view/callbacks.c:626
+msgid "Erase the RPM files?"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:628
+msgid "Erase the leftover RPM files?"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:658
+msgid "Ok"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:673
+msgid ""
+"A core package of Nautilus has been\n"
+"updated.  You should restart Nautilus.\n"
+"\n"
+"Do you wish to do that now?"
+msgstr ""
+
+#. Setup the title
+#: components/services/install-view/forms.c:201
+#, fuzzy
+msgid "Easy Install"
+msgstr "Instal·la"
+
+#. Setup the progress header
+#. FIXME: the middle header is all fubar now, so we just say "messages", but the spec
+#. * shows "progress" over the 2nd column of the message box.  it's just too hard to get
+#. * it aligned currently.
+#.
+#: components/services/install-view/forms.c:327
+msgid "Messages"
+msgstr ""
+
+#: components/services/install-view/forms.c:358
+#: components/services/summary/nautilus-summary-view.c:647
+#, fuzzy, c-format
+msgid "Version: %s"
+msgstr "Versió %s-%s"
+
+#: components/services/install-view/forms.c:407
+msgid "These packages are ready to be downloaded and installed:"
+msgstr ""
+
+#: components/services/install-view/forms.c:408
+msgid "If you wish to download and install these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:411
+msgid "These packages are ready to be uninstalled:"
+msgstr ""
+
+#: components/services/install-view/forms.c:412
+msgid "If you wish to uninstall these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:415
+msgid "These packages are ready to be reverted:"
+msgstr ""
+
+#: components/services/install-view/forms.c:416
+msgid "If you wish to revert these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:464
 #, c-format
-msgid "%s %s: would not work anymore\n"
+msgid "for a total of %ld MB."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:793
+#: components/services/install-view/forms.c:466
 #, c-format
-msgid "%s %s: couldn't find this package\n"
+msgid "for a total of %ld KB."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:796
+#. buttons
+#: components/services/install-view/forms.c:478
+#, fuzzy
+msgid "Continue"
+msgstr "Contingut"
+
+#: components/services/install-view/forms.c:482
+#: libnautilus-extensions/nautilus-drag.c:493
+#: src/file-manager/fm-directory-view.c:4326
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
-msgid "%s %s: source package (not supported)\n"
+msgid "%s is in GNOME (footprint) > %s"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:799
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, c-format
-msgid "%s %s: would break other installed packages\n"
+msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:803
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
-msgid "%s %s: conflicts with installed files\n"
+msgid "%s is in the KDE menu.\n"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:806
+#: components/services/install-view/nautilus-service-install-view.c:655
+#, fuzzy
+msgid "Installation Complete"
+msgstr "La instal·lació ha fallat"
+
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
-msgid "%s %s: already installed\n"
+msgid ""
+"%sTo start %s, click the Launch button below, or to create a shortcut, drag "
+"the icon on the right to the GNOME panel or your desktop."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:837
-msgid "This package has already been installed."
+#. couldn't find an icon
+#: components/services/install-view/nautilus-service-install-view.c:718
+#, c-format
+msgid "%sTo start %s, click the Launch button below."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:844
+#: components/services/install-view/nautilus-service-install-view.c:773
 #, fuzzy
+msgid "Incorrect password."
+msgstr "Introduïu la contrassenya"
+
+#: components/services/install-view/nautilus-service-install-view.c:778
+msgid "Authenticate as root"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:895
+#, fuzzy
+msgid "Installing packages"
+msgstr "S'està instal·lant \"%s\" "
+
+#: components/services/install-view/nautilus-service-install-view.c:897
+#, fuzzy
+msgid "Installing remote package"
+msgstr "S'està instal·lant \"%s\" "
+
+#: components/services/install-view/nautilus-service-install-view.c:901
+#, fuzzy
+msgid "Installing some package"
+msgstr "S'està instal·lant \"%s\" "
+
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
-"Installation Failed!\n"
-"\n"
+"The Eazel install service is missing:\n"
+"Installs will not work."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:967
+msgid "Contacting the Eazel Software Catalog ..."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:1025
+#, fuzzy
+msgid "Checking for authorization..."
+msgstr "S'està esperant una connexió..."
+
+#: components/services/install-view/nautilus-service-install-view.c:1097
+msgid "Aborting package downloads (please wait) ..."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:1117
+msgid "Package download aborted."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:1118
+#, fuzzy
+msgid "Aborted"
+msgstr "Enmagatzemat"
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:1
+#: components/services/install/server/Trilobite_Service_install.oaf.in.h:2
+#: components/services/summary/nautilus-summary-view.c:123
+msgid "Install"
+msgstr "Instal·la"
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:2
+#, fuzzy
+msgid "Install Viewer"
 msgstr "La instal·lació ha fallat"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:863
-msgid "Should I delete the leftover RPM files?"
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:3
+#, fuzzy
+msgid "Nautilus Service Install View"
+msgstr "Eina d'instal·lació del Nautilus"
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:4
+#, fuzzy
+msgid "Nautilus Service Install View Factory"
+msgstr "Eina d'instal·lació del Nautilus"
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:5
+msgid "Service Install View Component"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1010
-msgid "Downloading remote package"
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:6
+msgid "Service Install View Component's Factory"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1012
-#, fuzzy, c-format
-msgid "Downloading \"%s\""
-msgstr "S'està descarregant %s..."
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:7
+#, fuzzy
+msgid "View as Install"
+msgstr "Instal·la"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1047
-msgid "Contacting install server ..."
+#: components/services/install/server/Trilobite_Service_install.oaf.in.h:1
+msgid "Factory for the install service"
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:135
-msgid "Could not find a valid boolean value for grey_out!"
+#: components/services/inventory/eazel-inventory-client.c:70
+msgid "Enable inventory upload."
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:184
-msgid "There is no service data !\n"
+#: components/services/inventory/eazel-inventory-client.c:72
+msgid "Disable inventory upload."
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:209
-#: components/services/summary/lib/eazel-summary-shared.c:234
-msgid "There is no eazel news data !\n"
+#: components/services/inventory/eazel-inventory-client.c:73
+#, fuzzy
+msgid "Display information about current inventory settings."
+msgstr "Mostra informació sobre el programa Nautilus"
+
+#: components/services/inventory/eazel-inventory-client.c:74
+msgid "Upload inventory now, if not up to date."
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:264
+#: components/services/inventory/Trilobite_Service_inventory.oaf.in.h:1
+msgid "Factory for the inventory service"
+msgstr ""
+
+#: components/services/inventory/Trilobite_Service_inventory.oaf.in.h:2
+msgid "Inventory"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:1
+msgid "Nautilus Inventory view"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:2
+msgid "Nautilus Inventory view factory"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:3
+msgid "Nautilus System Inventory component's component's factory"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:4
+msgid "System Inventory"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:5
+msgid "System Inventory Viewer"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:6
+msgid "System inventory view component"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:7
+msgid "View as System Inventory"
+msgstr ""
+
+#. Setup the title
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:153
+msgid "Please Change Your Eazel Password"
+msgstr ""
+
+#. add password boxes
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:174
+msgid "User Name:"
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:181
 #, fuzzy
-msgid "Could not fetch summary configuration !"
+msgid "Current Password:"
+msgstr "Introduïu la contrassenya"
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:188
+msgid "New Password:"
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:195
+msgid "Confirm New Password:"
+msgstr ""
+
+#. allocate the command buttons - first the change_password button
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:227
+msgid "Change my password"
+msgstr ""
+
+#. now allocate the account maintenance button
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:234
+msgid "I need assistance"
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:297
+msgid "Your password has been changed!"
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:328
+msgid ""
+"I'm sorry, but that password\n"
+"is incorrect.  Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:332
+msgid ""
+"I'm sorry, but your new password\n"
+"must be at least six (6) characters long.\n"
+"Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:337
+msgid ""
+"I'm sorry, but your new password\n"
+"can't be ridiculously long.\n"
+"Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:346
+msgid ""
+"I'm sorry, but your new password must\n"
+"contain letters along with at least one\n"
+"number or symbol. Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:350
+msgid ""
+"I'm sorry, but I hit an unexpected\n"
+"error. Please try again, with\n"
+"different passwords."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:434
+msgid ""
+"I'm sorry, but I got an unexpected\n"
+"error.  Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:467
+msgid ""
+"I'm sorry, but your new password\n"
+"wasn't typed the same way twice.\n"
+"Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:1
+msgid "Change Password"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:2
+msgid "Change Password Viewer"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:3
+msgid "Eazel Change Password View"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:4
+msgid "Eazel Change Password view component"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:5
+msgid "Nautilus Service Login View Factory"
 msgstr ""
-"*** No s'ha pogut crear el fitxer de la configuració predeterminada! ***\n"
 
-#: components/services/summary/lib/eazel-summary-shared.c:287
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:6
+msgid "Service Login View Component's Factory"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:7
 #, fuzzy
-msgid "The summary configuration contains no data!\n"
-msgstr "*** El fitxer de configuració no conté dades! ***\n"
+msgid "View as Change Password"
+msgstr "Veure com altres..."
 
-#: components/services/summary/lib/eazel-summary-shared.c:292
+#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:295
 #, fuzzy
-msgid "Cannot find the SUMMARY_DATA xmlnode!\n"
-msgstr "*** No es pot trobar el node xml de TRANSACCIÓ! ***\n"
+msgid "Unknown Date"
+msgstr "tipus desconegut"
+
+#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:300
+msgid "%A, %B %d"
+msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:294
+#: components/services/summary/nautilus-summary-callbacks.c:97
+msgid ""
+"Sorry, network problems are preventing you from connecting to Eazel Services."
+msgstr ""
+
+#. FIXME we really should use the services alert icon here, eh?
+#: components/services/summary/nautilus-summary-callbacks.c:102
+msgid ""
+"Your Eazel Services account has not yet been activated.  You can't log into "
+"Eazel Services until you activate your account.\n"
+"\n"
+"Please check your email for activation instructions."
+msgstr ""
+
+#. FIXME we really should use the services alert icon here, eh?
+#: components/services/summary/nautilus-summary-callbacks.c:109
+msgid ""
+"Your Eazel Service User Account has been temporarily disabled.\n"
+"\n"
+"Please try again in a few minutes, or contact Eazel support if this problem "
+"continues."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-callbacks.c:131
+msgid "We're sorry, but your name and password are still not recognized."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-dialogs.c:69
 #, fuzzy
-msgid "Bailing from the SUMMARY_DATA parse!\n"
-msgstr "*** Bailing from category parse! ***\n"
+msgid "Eazel Service Login Error"
+msgstr "Serveis de l'Eazel"
 
-#: components/services/summary/lib/eazel-summary-shared.c:301
-msgid "Could not find any summary configuration data!\n"
+#: components/services/summary/nautilus-summary-dialogs.c:80
+#, fuzzy
+msgid "Service Error"
+msgstr "Serveis"
+
+#: components/services/summary/nautilus-summary-dialogs.c:104
+msgid "Register Now"
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:303
+#: components/services/summary/nautilus-summary-dialogs.c:115
 #, fuzzy
-msgid "Bailing from summary configuration parse!\n"
-msgstr "*** Bailing from transaction parse! ***\n"
+msgid "Services Login"
+msgstr "Serveis"
+
+#: components/services/summary/nautilus-summary-dialogs.c:131
+#: libnautilus-extensions/nautilus-global-preferences.c:827
+#, fuzzy
+msgid "Username:"
+msgstr "Canvia el nom"
+
+#: components/services/summary/nautilus-summary-dialogs.c:138
+#: libnautilus-extensions/nautilus-global-preferences.c:835
+msgid "Password:"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-dialogs.c:146
+#: components/services/summary/nautilus-summary-dialogs.c:155
+#, fuzzy
+msgid "Please log in to Eazel Services"
+msgstr "Serveis de l'Eazel"
 
-#: components/services/time/command-line/main.c:43
-msgid "display service name and such"
-msgstr "visualitza el nom del servei i d'altres"
+#: components/services/summary/nautilus-summary-dialogs.c:150
+msgid "Your user name or password were not correct.  Please try again."
+msgstr ""
 
-#: components/services/time/command-line/main.c:44
-msgid "maximum allowed difference in seconds"
-msgstr "diferència máxima permitida en segons"
+#: components/services/summary/nautilus-summary-view.c:117
+#: libnautilus-extensions/nautilus-program-chooser.c:1361
+msgid "Go There"
+msgstr "Vés allà"
 
-#: components/services/time/command-line/main.c:45
-msgid "update the system clock"
-msgstr "actualita el rellotge del sistema"
+#: components/services/summary/nautilus-summary-view.c:120
+#, fuzzy
+msgid "More Info"
+msgstr "Informació"
 
-#: components/services/time/command-line/main.c:46
-msgid "specify time url"
-msgstr "especifica l'url de temps"
+#: components/services/summary/nautilus-summary-view.c:131
+#, fuzzy
+msgid "Account Preferences"
+msgstr "Nautilus: Preferències inicials"
 
-#: components/services/time/service/trilobite-eazel-time-service.c:103
-msgid "Unable to get server time"
+#: components/services/summary/nautilus-summary-view.c:132
+msgid "Logout"
 msgstr ""
 
-#: components/services/time/service/trilobite-eazel-time-service.c:105
-#, c-format
-msgid "Time off by %d, max allowed diff is %d"
+#: components/services/summary/nautilus-summary-view.c:133
+#: components/services/summary/nautilus-summary-view.c:141
+msgid "Terms of Use"
 msgstr ""
 
-#: components/services/time/service/trilobite-eazel-time-service.c:282
+#: components/services/summary/nautilus-summary-view.c:134
+#: components/services/summary/nautilus-summary-view.c:142
+msgid "Privacy Statement"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:139
+#, fuzzy
+msgid "Register"
+msgstr "Començament"
+
+#: components/services/summary/nautilus-summary-view.c:140
+#, fuzzy
+msgid "Login"
+msgstr "Ubicació"
+
+#: components/services/summary/nautilus-summary-view.c:170
 #, fuzzy, c-format
-msgid "Could not read time-service config from %s"
-msgstr "No s'ha pogut recuperar un URL per a %s"
+msgid "Eazel Services - Welcome, %s!"
+msgstr "Serveis de l'Eazel"
+
+#: components/services/summary/nautilus-summary-view.c:175
+msgid "Eazel Services - You are not logged in"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:182
+#, fuzzy
+msgid "Connecting to Eazel Services..."
+msgstr "Serveis de l'Eazel"
+
+#: components/services/summary/nautilus-summary-view.c:741
+#: data/linksets/home.xml.h:3 src/nautilus-service-ui.xml.h:4
+msgid "Services"
+msgstr "Serveis"
+
+#: components/services/summary/nautilus-summary-view.c:752
+msgid "Featured Downloads"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:884
+msgid ""
+"Unable to get services data from Eazel's server. The server might be "
+"unavailable right now, or your computer might be configured incorrectly. "
+"Please contact support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:894
+msgid ""
+"Found a problem with services data on Eazel servers. Please contact "
+"support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:917
+msgid ""
+"Information is missing from the redirect data on Eazel servers. Please "
+"contact support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:959
+msgid ""
+"Unable to connect to Eazel's server. The server might be unavailable right "
+"now, or your computer might be configured incorrectly. You could try again "
+"later."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:969
+msgid ""
+"Found a problem with redirect data on Eazel servers. Please contact "
+"support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:986
+msgid "Failed to upload system inventory."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:1049
+#: src/nautilus-first-time-druid.c:258
+msgid "Eazel Services"
+msgstr "Serveis de l'Eazel"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:1
+msgid "Configure your service preferences"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:2
+msgid "Go to the Eazel Services Registration Form"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:3
+#, fuzzy
+msgid "Log out from Eazel Services"
+msgstr "Serveis de l'Eazel"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:4
+#, fuzzy
+msgid "Service _Preferences"
+msgstr "Nautilus: Preferències inicials"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:5
+msgid "Show the log-in dialog box"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:6
+#, fuzzy
+msgid "_Log in to Eazel Services"
+msgstr "Serveis de l'Eazel"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:7
+#, fuzzy
+msgid "_Log out from Eazel Services"
+msgstr "Serveis de l'Eazel"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:8
+#, fuzzy
+msgid "_Register for Eazel Services"
+msgstr "Serveis de l'Eazel"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:1
+msgid "Nautilus Service Summary View Factory"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Summary View"
+msgstr "Nautilus: advertiment"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:3
+msgid "Service Summary View Component's Factory"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:4
+msgid "Service Summary view component"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:5
+msgid "Summary"
+msgstr ""
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:442
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:6
+#, fuzzy
+msgid "Summary Viewer"
+msgstr "Vista de nombre:"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:7
+#, fuzzy
+msgid "View as Summary"
+msgstr "Veure com altres..."
+
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
+#, fuzzy, c-format
+msgid "HTTP error %d \"%s\" on uri %s"
+msgstr "S'ha produït un error HTTP: %d %s"
+
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 msgid "Could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:457
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr ""
 "No es por escriure el fitxer de registre %s -- s'emprarà el gestor de "
 "registres predeterminat"
 
-#: components/services/vault/command-line/main.c:37
-msgid "Enable debugging"
-msgstr "Habilita el procés de depuració"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus eazel sample service view component"
+msgstr ""
+"%s\n"
+"\n"
+"Açò és una mostra dels components de la vista de contingut del Nautilus."
 
-#: components/services/vault/command-line/main.c:38
-msgid "Vault location"
-msgstr "Ubicació del lloc d'arxiu"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:2
+msgid "Nautilus services startup view factory"
+msgstr ""
 
-#: components/services/vault/command-line/main.c:46
-msgid "Valid operations:"
-msgstr "Operacions vàlides:"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:3
+#, fuzzy
+msgid "Service"
+msgstr "Serveis"
 
-#: components/services/vault/command-line/main.c:86
-msgid "Error: No operation supplied\n"
-msgstr "S'ha produït un error: No s'ha subministrat cap operació\n"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:4
+#, fuzzy
+msgid "Service Viewer"
+msgstr "Serveis"
 
-#: components/services/vault/command-line/main.c:94
-#, c-format
-msgid "Error: Invalid operation supplied (%s)\n"
-msgstr "S'ha produït un error: L'operació subministrada no és vàlida (%s)\n"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:5
+msgid "Services startup view factory"
+msgstr ""
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:6
+#, fuzzy
+msgid "View as Service"
+msgstr "Veure com altres..."
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:7
+msgid "eazel sample service view"
+msgstr ""
+
+#: components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in.h:1
+msgid "Factory for the sample service"
+msgstr ""
 
-#: components/services/vault/command-line/main.c:119
+#: components/text/nautilus-text-view.c:334
 #, c-format
-msgid ""
-"Error: Invalid syntax\n"
-"Syntax: %s\n"
+msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr ""
-"S'ha produït un error: La sintaxi no és vàlida\n"
-"Sintaxi: %s\n"
 
-#: libnautilus-extensions/nautilus-druid-page-eazel.c:343
+#: components/text/nautilus-text-view.c:337
+msgid "File too large"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:1
 #, fuzzy
-msgid "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
-msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*"
+msgid "F_onts"
+msgstr "conté"
 
-#: libnautilus-extensions/nautilus-druid-page-eazel.c:352
+#: components/text/nautilus-text-view-ui.xml.h:2
+msgid "Lucida"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:3
+msgid "Use the Courier Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:4
+msgid "Use the Fixed Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+msgid "Use the GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:6
+msgid "Use the Helvetica Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:7
+msgid "Use the Lucida Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:8
+msgid "Use the Times Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:9
+msgid "_Courier"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "_Fitxer"
+
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
+msgid "_Helvetica"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:13
+#, fuzzy
+msgid "_Times"
+msgstr "Temps "
+
+#: components/text/Nautilus_View_text.oaf.in.h:1
+msgid "Factory for text view"
+msgstr ""
+
+#: components/text/Nautilus_View_text.oaf.in.h:2
+#, fuzzy
+msgid "Text"
+msgstr "Següent"
+
+#: components/text/Nautilus_View_text.oaf.in.h:3
+#, fuzzy
+msgid "Text Viewer"
+msgstr "Vista de text:"
+
+#: components/text/Nautilus_View_text.oaf.in.h:4
+#, fuzzy
+msgid "Text view"
+msgstr "Vista de text:"
+
+#: components/text/Nautilus_View_text.oaf.in.h:5
+msgid "Text view factory"
+msgstr ""
+
+#: components/text/Nautilus_View_text.oaf.in.h:6
+#, fuzzy
+msgid "View as Text"
+msgstr "Veure com %s"
+
+#: components/text/services/google.xml.h:1
+msgid "Search Google for Selected Text"
+msgstr ""
+
+#: components/text/services/google.xml.h:2
+msgid "Use Google to search the web for the selected text"
+msgstr ""
+
+#: components/text/services/webster.xml.h:1
+#, fuzzy
+msgid "Look Up Selected Text in Dictionary"
+msgstr "Copia el text seleccionat al portaretalls"
+
+#: components/text/services/webster.xml.h:2
+#, fuzzy
+msgid "Look up the selected text in the Merriam-Webster dictionary"
+msgstr "Copia el text seleccionat al portaretalls"
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:1
+msgid "animation to indicate on-going activity"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:2
+msgid "throbber"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:3
+msgid "throbber factory"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:4
+msgid "throbber object factory"
+msgstr ""
+
+#: components/tree/Nautilus_View_tree.oaf.in.h:1
+msgid "Nautilus Tree sidebar panel"
+msgstr ""
+
+#: components/tree/Nautilus_View_tree.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Tree view"
+msgstr "Nautilus"
+
+#: components/tree/Nautilus_View_tree.oaf.in.h:3
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
+msgid "Tree"
+msgstr ""
+
+#: data/browser.xml.h:1
+#, fuzzy
+msgid "Apparition"
+msgstr "Aplicacions"
+
+#: data/browser.xml.h:2
+msgid "Azul"
+msgstr ""
+
+#: data/browser.xml.h:3
+#, fuzzy
+msgid "Black"
+msgstr "Endarrere"
+
+#: data/browser.xml.h:4
+msgid "Blue Ridge"
+msgstr ""
+
+#: data/browser.xml.h:5
+msgid "Blue Rough"
+msgstr ""
+
+#: data/browser.xml.h:6
+#, fuzzy
+msgid "Blue Type"
+msgstr "Tipus"
+
+#: data/browser.xml.h:7
+msgid "Brushed Metal"
+msgstr ""
+
+#: data/browser.xml.h:8
+msgid "Bubble Gum"
+msgstr ""
+
+#: data/browser.xml.h:9
+msgid "Burlap"
+msgstr ""
+
+#: data/browser.xml.h:10
+msgid "Camouflage"
+msgstr ""
+
+#: data/browser.xml.h:11
+msgid "Certified"
+msgstr ""
+
+#: data/browser.xml.h:12
+#, fuzzy
+msgid "Chalk"
+msgstr "Canals"
+
+#: data/browser.xml.h:13
+msgid "Charcoal"
+msgstr ""
+
+#: data/browser.xml.h:14
+#, fuzzy
+msgid "Colors"
+msgstr "Tanca"
+
+#: data/browser.xml.h:15
+#, fuzzy
+msgid "Concrete"
+msgstr "Contingut"
+
+#: data/browser.xml.h:16
+#, fuzzy
+msgid "Cool"
+msgstr "Trieu"
+
+#: data/browser.xml.h:17
+msgid "Cork"
+msgstr ""
+
+#: data/browser.xml.h:18
+#, fuzzy
+msgid "Countertop"
+msgstr "Contingut"
+
+#: data/browser.xml.h:19
+#, fuzzy
+msgid "Danger"
+msgstr "Fet"
+
+#: data/browser.xml.h:20
+#, fuzzy
+msgid "Danube"
+msgstr "Fet"
+
+#: data/browser.xml.h:21
+msgid "Dark Cork"
+msgstr ""
+
+#: data/browser.xml.h:22
+msgid "Dark GNOME"
+msgstr ""
+
+#: data/browser.xml.h:23
+msgid "Deep Teal"
+msgstr ""
+
+#: data/browser.xml.h:24
+#, fuzzy
+msgid "Distinguished"
+msgstr "Finalitzat"
+
+#: data/browser.xml.h:25
+#, fuzzy
+msgid "Dots"
+msgstr "conté"
+
+#: data/browser.xml.h:26
+msgid "Draft"
+msgstr ""
+
+#: data/browser.xml.h:27
+msgid "Drag a color to an object to change it to that color"
+msgstr ""
+
+#: data/browser.xml.h:28
+msgid "Drag a pattern tile to an object to change it"
+msgstr ""
+
+#: data/browser.xml.h:29
+msgid "Drag an emblem to an object to add it to the object"
+msgstr ""
+
+#: data/browser.xml.h:30
+msgid "Eclipse"
+msgstr ""
+
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
+msgid "Emblems"
+msgstr "Emblemes"
+
+#: data/browser.xml.h:32
+msgid "Envy"
+msgstr ""
+
+#: data/browser.xml.h:33
+#, fuzzy
+msgid "Erase"
+msgstr "Pausa"
+
+#: data/browser.xml.h:34
+#, fuzzy
+msgid "Favorite"
+msgstr "Escritura"
+
+#: data/browser.xml.h:35
+msgid "Fibers"
+msgstr ""
+
+#: data/browser.xml.h:36
+msgid "Fire Engine"
+msgstr ""
+
+#: data/browser.xml.h:37
+msgid "Fleur De Lis"
+msgstr ""
+
+#: data/browser.xml.h:38
+#, fuzzy
+msgid "Floral"
+msgstr "Endarrere"
+
+#: data/browser.xml.h:39
+msgid "Fossil"
+msgstr ""
+
+#: data/browser.xml.h:40 icons/gnome/gnome.xml.h:1
+msgid "GNOME"
+msgstr ""
+
+#: data/browser.xml.h:41
+#, fuzzy
+msgid "Granite"
+msgstr "Escritura"
+
+#: data/browser.xml.h:42
+msgid "Grapefruit"
+msgstr ""
+
+#: data/browser.xml.h:43
+msgid "Green Weave"
+msgstr ""
+
+#: data/browser.xml.h:44
+msgid "Ice"
+msgstr ""
+
+#: data/browser.xml.h:45
+msgid "Important"
+msgstr ""
+
+#: data/browser.xml.h:46
+#, fuzzy
+msgid "Indigo"
+msgstr "Informació"
+
+#: data/browser.xml.h:47
+msgid "Leaf"
+msgstr ""
+
+#: data/browser.xml.h:48
+msgid "Lemon"
+msgstr ""
+
+#: data/browser.xml.h:49
+msgid "Mango"
+msgstr ""
+
+#: data/browser.xml.h:50
+msgid "Manila Paper"
+msgstr ""
+
+#: data/browser.xml.h:51
+msgid "Moss Ridge"
+msgstr ""
+
+#: data/browser.xml.h:52
+msgid "Mud"
+msgstr ""
+
+#: data/browser.xml.h:53
+msgid "New"
+msgstr ""
+
+#: data/browser.xml.h:54
+#, fuzzy
+msgid "Numbers"
+msgstr "Vista de nombre:"
+
+#: data/browser.xml.h:55
+#: libnautilus-extensions/nautilus-file-operations.c:1102
+msgid "OK"
+msgstr "D'acord"
+
+#: data/browser.xml.h:56
+msgid "Ocean Strips"
+msgstr ""
+
+#: data/browser.xml.h:57
+msgid "Oh No"
+msgstr ""
+
+#: data/browser.xml.h:58
+msgid "Onyx"
+msgstr ""
+
+#: data/browser.xml.h:59
+msgid "Orange"
+msgstr ""
+
+#: data/browser.xml.h:60
+msgid "Pale Blue"
+msgstr ""
+
+#: data/browser.xml.h:61
+msgid "Patterns"
+msgstr ""
+
+#: data/browser.xml.h:62
+#, fuzzy
+msgid "Personal"
+msgstr "Permissos"
+
+#: data/browser.xml.h:63
+#, fuzzy
+msgid "Purple Marble"
+msgstr "il·legible"
+
+#: data/browser.xml.h:64
+msgid "Ridged Paper"
+msgstr ""
+
+#: data/browser.xml.h:65
+msgid "Rough Paper"
+msgstr ""
+
+#: data/browser.xml.h:66
+msgid "Ruby"
+msgstr ""
+
+#: data/browser.xml.h:67
+#, fuzzy
+msgid "Sea Foam"
+msgstr "Cerca:"
+
+#: data/browser.xml.h:68
+#, fuzzy
+msgid "Shale"
+msgstr "Mostra"
+
+#: data/browser.xml.h:69
+#, fuzzy
+msgid "Silver"
+msgstr "Mida"
+
+#: data/browser.xml.h:70
+#, fuzzy
+msgid "Sky"
+msgstr "Enganxós"
+
+#: data/browser.xml.h:71
+msgid "Sky Ridge"
+msgstr ""
+
+#: data/browser.xml.h:72
+#, fuzzy
+msgid "Snow Ridge"
+msgstr "Barra lateral"
+
+#: data/browser.xml.h:73
+#, fuzzy
+msgid "Special"
+msgstr "Senyaladors especials:"
+
+#: data/browser.xml.h:74
+#, fuzzy
+msgid "Stucco"
+msgstr "Aturar"
+
+#: data/browser.xml.h:75
+msgid "Tangerine"
+msgstr ""
+
+#: data/browser.xml.h:76
+msgid "Terracotta"
+msgstr ""
+
+#: data/browser.xml.h:77
+msgid "Urgent"
+msgstr ""
+
+#: data/browser.xml.h:78
+msgid "Violet"
+msgstr ""
+
+#: data/browser.xml.h:79
+msgid "Wavy White"
+msgstr ""
+
+#: data/browser.xml.h:80
+#, fuzzy
+msgid "White"
+msgstr "Escritura"
+
+#: data/browser.xml.h:81
+msgid "White Ribs"
+msgstr ""
+
+#: data/linksets/apps.xml.h:2
+msgid "Gnumeric"
+msgstr ""
+
+#: data/linksets/apps.xml.h:3
+msgid "Netscape"
+msgstr ""
+
+#: data/linksets/apps.xml.h:4
+msgid "The Gimp"
+msgstr ""
+
+#: data/linksets/desktop.xml.h:1
+#: libnautilus-extensions/nautilus-global-preferences.c:642
+msgid "Desktop"
+msgstr ""
+
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
+#: libnautilus-extensions/nautilus-trash-directory.c:301
+#: src/file-manager/fm-desktop-icon-view.c:67
+msgid "Trash"
+msgstr ""
+
+#: data/linksets/home.xml.h:1
+#, fuzzy
+msgid "Computer"
+msgstr "Comentari"
+
+#: data/linksets/home.xml.h:2
+#, fuzzy
+msgid "Home Directory"
+msgstr "Directori"
+
+#: data/linksets/portals.xml.h:1
+#, fuzzy
+msgid "Excite"
+msgstr "Execució"
+
+#: data/linksets/portals.xml.h:2
+msgid "Portals"
+msgstr ""
+
+#: data/linksets/portals.xml.h:3
+msgid "Yahoo"
+msgstr ""
+
+#: data/linksets/search_engines.xml.h:1
+#, fuzzy
+msgid "Alta Vista"
+msgstr "Artista"
+
+#: data/linksets/search_engines.xml.h:2
+msgid "Google"
+msgstr ""
+
+#: data/linksets/search_engines.xml.h:3
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
+#, fuzzy
+msgid "Search Engines"
+msgstr "Ubicació"
+
+#: data/static_bookmarks.xml.h:1
+msgid "Allaire"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:2
+msgid "Binary Freedom"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:3
+msgid "Borland"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:4
+msgid "CNET Computers.com"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:5
+msgid "CNET Linux Center"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:6
+msgid "CollabNet"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:7
+msgid "Compaq"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:8
+#, fuzzy
+msgid "Conectiva"
+msgstr "Contingut"
+
+#: data/static_bookmarks.xml.h:9
+#, fuzzy
+msgid "Covalent"
+msgstr "Contingut"
+
+#: data/static_bookmarks.xml.h:10
+msgid "Debian.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:11
+#, fuzzy
+msgid "Dell"
+msgstr "Suprimeix"
+
+#: data/static_bookmarks.xml.h:12
+msgid "Eazel"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:13
+msgid "Freshmeat.net"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:14
+msgid "GNOME.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:15
+msgid "GNU.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:17
+#, fuzzy
+msgid "International"
+msgstr "La instal·lació ha fallat"
+
+#: data/static_bookmarks.xml.h:18
+msgid "Linux Documentation Project"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:19
+msgid "Linux One"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:20
+msgid "Linux Online"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:21
+msgid "Linux Resources"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:22
+msgid "Linux Weekly News"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:23
+msgid "LinuxNewbie.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:24
+msgid "LinuxOrbit.com"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:25
+msgid "MandrakeSoft"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:26
+msgid "Netraverse"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:27
+msgid "News and Media"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:28
+msgid "O'Reilly"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:29
+msgid "OSDN"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:30
+msgid "Open Source Asia"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:31
+msgid "OpenOffice"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:32
+msgid "Penguin Computing"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:33
+#, fuzzy
+msgid "Rackspace"
+msgstr "Reemplaça"
+
+#: data/static_bookmarks.xml.h:34
+#, fuzzy
+msgid "Red Hat"
+msgstr "Refés Edició"
+
+#: data/static_bookmarks.xml.h:35
+msgid "Red Hat Network"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:36
+msgid "RedFlag Linux"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:37
+msgid "Software"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:38
+msgid "SourceForge"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:39
+msgid "Sun StarOffice"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:40
+msgid "Sun Wah Linux"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:41
+#, fuzzy
+msgid "Web Services"
+msgstr "Serveis"
+
+#: data/static_bookmarks.xml.h:42
+msgid "ZDNet Linux Hardware Database"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:43
+msgid "ZDNet Linux Resource Center"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:44
+msgid "Zero-Knowledge"
+msgstr ""
+
+#: icons/ardmore/ardmore.xml.h:1
+msgid "Tahoe"
+msgstr ""
+
+#: icons/ardmore/ardmore.xml.h:2
+msgid "This theme uses photo-realistic folders."
+msgstr ""
+
+#: icons/arlo/arlo.xml.h:1
+msgid "A Teal variation of the Crux theme."
+msgstr ""
+
+#: icons/arlo/arlo.xml.h:2
+msgid "Crux-Teal"
+msgstr ""
+
+#: icons/crux_eggplant/crux_eggplant.xml.h:1
+msgid "An Eggplant variation of the Crux theme."
+msgstr ""
+
+#: icons/crux_eggplant/crux_eggplant.xml.h:2
+msgid "Crux-Eggplant"
+msgstr ""
+
+#: icons/default.xml.h:1
+#, fuzzy
+msgid "Default"
+msgstr "Deixa el Zoom Predeterminat"
+
+#: icons/default.xml.h:2
+#, fuzzy
+msgid "This is the default theme for Nautilus."
+msgstr "És el predeterminat per a \"%s\"."
+
+#: icons/gnome/gnome.xml.h:2
+msgid "This theme uses the classic GNOME icons."
+msgstr ""
+
+#: icons/villanova/villanova.xml.h:1
+#, fuzzy
+msgid "Sierra"
+msgstr "Mida"
+
+#: icons/villanova/villanova.xml.h:2
+msgid "Uses manila folders and gray-green backgrounds."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-drag.c:489
+#, fuzzy
+msgid "_Move here"
+msgstr "Vés allà"
+
+#: libnautilus-extensions/nautilus-drag.c:490
+#, fuzzy
+msgid "_Copy here"
+msgstr "_Copia el text"
+
+#: libnautilus-extensions/nautilus-drag.c:491
+#, fuzzy
+msgid "_Link here"
+msgstr "Configuració dels enllaços"
+
+#. Note to localizers: this font is used for text items in Druid pages
+#: libnautilus-extensions/nautilus-druid-page-eazel.c:381
 #, fuzzy
 msgid "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-*"
 msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*"
 
+#. Note to localizers: this font is used for page titles in Druid pages
+#: libnautilus-extensions/nautilus-druid-page-eazel.c:560
+#, fuzzy
+msgid "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
+msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*"
+
 #. Today, use special word.
 #. * Note to localizers: You can look at man strftime
 #. * for details on the format, but you should only use
@@ -1309,173 +4573,439 @@ msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:1765
-msgid "today %-I:%M %p"
+#: libnautilus-extensions/nautilus-file.c:2277
+#, fuzzy
+msgid "today at %-I:%M %p"
 msgstr "avuí %-I:%M %p"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:1770
-msgid "yesterday %-I:%M %p"
+#: libnautilus-extensions/nautilus-file.c:2282
+#, fuzzy
+msgid "yesterday at %-I:%M %p"
 msgstr "ahir %-I:%M %p"
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:1775
-msgid "%A %-m/%-d/%y %-I:%M %p"
+#: libnautilus-extensions/nautilus-file.c:2287
+#, fuzzy
+msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%A %-m/%-d/%y %-I:%M %p"
 
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:1780
-msgid "%-m/%-d/%y %-I:%M %p"
+#: libnautilus-extensions/nautilus-file.c:2292
+#, fuzzy
+msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%-m/-%d/%y %I:%M %p"
 
-#: libnautilus-extensions/nautilus-file.c:2783
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 elements"
 
-#: libnautilus-extensions/nautilus-file.c:2783
+#: libnautilus-extensions/nautilus-file.c:3423
 #, fuzzy
 msgid "0 folders"
 msgstr "0 fitxers"
 
-#: libnautilus-extensions/nautilus-file.c:2784
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 fitxers"
 
-#: libnautilus-extensions/nautilus-file.c:2788
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 element"
 
-#: libnautilus-extensions/nautilus-file.c:2788
+#: libnautilus-extensions/nautilus-file.c:3428
 #, fuzzy
 msgid "1 folder"
 msgstr "1 fitxer"
 
-#: libnautilus-extensions/nautilus-file.c:2789
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 fitxer"
 
-#: libnautilus-extensions/nautilus-file.c:2792
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "%u elements"
 
-#: libnautilus-extensions/nautilus-file.c:2792
+#: libnautilus-extensions/nautilus-file.c:3432
 #, fuzzy, c-format
 msgid "%u folders"
 msgstr "%u fitxers"
 
-#: libnautilus-extensions/nautilus-file.c:2793
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u fitxers"
 
-#: libnautilus-extensions/nautilus-file.c:3122
+#. This means no contents at all were readable
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
+#, fuzzy
+msgid "? items"
+msgstr "0 elements"
+
+#. This means no contents at all were readable
+#: libnautilus-extensions/nautilus-file.c:3746
+msgid "? bytes"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "tipus desconegut"
 
-#: libnautilus-extensions/nautilus-file.c:3124
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "tipus de MIME desconegut"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3129
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "desconegut"
 
+#: libnautilus-extensions/nautilus-file.c:3802
+msgid "program"
+msgstr "programa"
+
+#: libnautilus-extensions/nautilus-file.c:3814
+msgid ""
+"Can't find description even for \"x-directory/normal\". This probably means "
+"that your gnome-vfs.keys file is in the wrong place or isn't being found for "
+"some other reason."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3818
+#, c-format
+msgid ""
+"No description found for mime type \"%s\" (file is \"%s\"), tell "
+"aaron@eazel.com"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3832
+msgid "link"
+msgstr ""
+
 #. Note to localizers: convert file type string for file
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:519
-#: libnautilus-extensions/nautilus-file.c:3145
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, fuzzy, c-format
 msgid "link to %s"
 msgstr "Configuració dels enllaços"
 
-#: libnautilus-extensions/nautilus-file.c:3168
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3177
-msgid "program"
-msgstr "programa"
-
-#: libnautilus-extensions/nautilus-file-operations.c:202
+#. "From" dialog label, source path gets placed next to it in the dialog
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "Des de:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:216
+#. "To" dialog label, source path gets placed next to it in the dialog
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "A:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:366
-#: libnautilus-extensions/nautilus-file-operations.c:373
+#: libnautilus-extensions/nautilus-file-operations.c:622
+#, c-format
+msgid ""
+"Error while moving.\n"
+"\n"
+"\"%s\" cannot be moved because it is on a read-only disk."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:633
+#, c-format
+msgid ""
+"Error while deleting.\n"
+"\n"
+"\"%s\" cannot be deleted because you do not have permissions to modify its "
+"parent folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:639
+#, c-format
+msgid ""
+"Error while deleting.\n"
+"\n"
+"\"%s\" cannot be deleted because it is on a read-only disk."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:670
+#, c-format
+msgid ""
+"Error while moving.\n"
+"\n"
+"\"%s\" cannot be moved because you do not have permissions to change it or "
+"its parent folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:677
+#, c-format
+msgid ""
+"Error while moving.\n"
+"\n"
+"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"change it or its parent folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:701
+#, c-format
+msgid ""
+"Error while copying.\n"
+"\n"
+"\"%s\" cannot be copied because you do not have permissions to read it."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:723
+#, c-format
+msgid ""
+"Error while copying to \"%s\".\n"
+"\n"
+"There is not enough space on the destination."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:728
+#, c-format
+msgid ""
+"Error while moving to \"%s\".\n"
+"\n"
+"There is not enough space on the destination."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:732
+#, c-format
+msgid ""
+"Error while creating link in \"%s\".\n"
+"\n"
+"There is not enough space on the destination."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:744
+#, c-format
+msgid ""
+"Error while copying to \"%s\".\n"
+"\n"
+"You do not have permissions to write to this folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, fuzzy, c-format
 msgid ""
-"Error while %s \"%s\".\n"
-"The destination is read-only. Would you like to continue?"
+"Error while copying to \"%s\".\n"
+"\n"
+"The destination disk is read-only."
 msgstr ""
 "Hi ha hagut un error mentre %s \"%s\".\n"
 "%s. Voleu continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:384
-#: libnautilus-extensions/nautilus-file-operations.c:411
-#, fuzzy
-msgid "Error while Copying"
-msgstr "Hi ha hagut un error en copiar"
+#: libnautilus-extensions/nautilus-file-operations.c:755
+#, c-format
+msgid ""
+"Error while moving items to \"%s\".\n"
+"\n"
+"You do not have permissions to write to this folder."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:385
-#: libnautilus-extensions/nautilus-file-operations.c:412
-#: libnautilus-extensions/nautilus-file-operations.c:463
-#: libnautilus-extensions/nautilus-file-operations.c:477
-msgid "Skip"
-msgstr "Omet"
+#: libnautilus-extensions/nautilus-file-operations.c:759
+#, fuzzy, c-format
+msgid ""
+"Error while moving items to \"%s\".\n"
+"\n"
+"The destination disk is read-only."
+msgstr ""
+"Hi ha hagut un error mentre %s \"%s\".\n"
+"%s. Voleu continuar?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:766
+#, c-format
+msgid ""
+"Error while creating links in \"%s\".\n"
+"\n"
+"You do not have permissions to write to this folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:770
+#, fuzzy, c-format
+msgid ""
+"Error while creating links in \"%s\".\n"
+"\n"
+"The destination disk is read-only."
+msgstr ""
+"Hi ha hagut un error mentre %s \"%s\".\n"
+"%s. Voleu continuar?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:799
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while copying \"%s\".\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"Hi ha hagut un error mentre %s \"%s\".\n"
+"%s. Voleu continuar?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:803
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while moving \"%s\".\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"Hi ha hagut un error mentre %s \"%s\".\n"
+"%s. Voleu continuar?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:807
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while creating a link to \"%s\".\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"Hi ha hagut un error mentre %s \"%s\".\n"
+"%s. Voleu continuar?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:813
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while deleting \"%s\".\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"Hi ha hagut un error mentre %s \"%s\".\n"
+"%s. Voleu continuar?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:828
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while copying.\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"S'ha produït un error \"%s\" en copiar el fitxer %s.\n"
+"Voleu continuar?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:832
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while moving.\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"Hi ha hagut un error mentre %s \"%s\".\n"
+"%s. Voleu continuar?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:836
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while linking.\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"Hi ha hagut un error mentre %s \"%s\".\n"
+"%s. Voleu continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:401
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, fuzzy, c-format
 msgid ""
-"Error \"%s\" while %s \"%s\".\n"
+"Error \"%s\" while deleting.\n"
+"\n"
 "Would you like to continue?"
 msgstr ""
 "Hi ha hagut un error mentre %s \"%s\".\n"
 "%s. Voleu continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:412
+#: libnautilus-extensions/nautilus-file-operations.c:958
+#, fuzzy
+msgid "Error while copying."
+msgstr "Hi ha hagut un error en copiar"
+
+#: libnautilus-extensions/nautilus-file-operations.c:961
+#, fuzzy
+msgid "Error while moving."
+msgstr "Hi ha hagut un error en copiar"
+
+#: libnautilus-extensions/nautilus-file-operations.c:964
+#, fuzzy
+msgid "Error while linking."
+msgstr "Hi ha hagut un error en copiar"
+
+#: libnautilus-extensions/nautilus-file-operations.c:969
+#, fuzzy
+msgid "Error while deleting."
+msgstr "Hi ha hagut un error en copiar"
+
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
+msgid "Skip"
+msgstr "Omet"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Reintenta"
 
-#: libnautilus-extensions/nautilus-file-operations.c:451
+#: libnautilus-extensions/nautilus-file-operations.c:1088
+#, c-format
+msgid ""
+"\"%s\" could not be moved to the new location, because its name is already "
+"used for a special item that cannot be removed or replaced.\n"
+"\n"
+"If you still want to move \"%s\", rename it and try again."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
-"File %s already exists.\n"
+"\"%s\" could not be copied to the new location, because its name is already "
+"used for a special item that cannot be removed or replaced.\n"
+"\n"
+"If you still want to copy \"%s\", rename it and try again."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1102
+#, fuzzy
+msgid "Unable to replace file."
+msgstr "Vés al fitxer selecionat"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1112
+#, fuzzy, c-format
+msgid ""
+"File \"%s\" already exists.\n"
+"\n"
 "Would you like to replace it?"
 msgstr ""
 "El fitxer %s ja existeix.\n"
 "Voleu reemplaçar-lo?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:462
-#: libnautilus-extensions/nautilus-file-operations.c:476
-msgid "Conflict while Copying"
-msgstr ""
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
+#, fuzzy
+msgid "Conflict while copying"
+msgstr "Hi ha hagut un error en copiar"
 
-#: libnautilus-extensions/nautilus-file-operations.c:463
-#: libnautilus-extensions/nautilus-file-operations.c:477
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Reemplaça"
 
-#: libnautilus-extensions/nautilus-file-operations.c:477
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Reemplaça-ho tot"
 
-#: libnautilus-extensions/nautilus-file-operations.c:522
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr ""
@@ -1484,669 +5014,1001 @@ msgstr ""
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:538
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:541
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:544
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:547
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr ""
 
+#. Localizers:
+#. * Feel free to leave out the st, nd, rd and th suffix or
+#. * make some or all of them match.
+#.
+#. localizers: tag used to detect the first copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
+msgid " (copy)"
+msgstr ""
+
+#. localizers: tag used to detect the second copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
+msgid " (another copy)"
+msgstr ""
+
+#. localizers: tag used to detect the x1st copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1243
+msgid "st copy)"
+msgstr ""
+
+#. localizers: tag used to detect the x2nd copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1245
+msgid "nd copy)"
+msgstr ""
+
+#. localizers: tag used to detect the x3rd copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1247
+msgid "rd copy)"
+msgstr ""
+
+#. localizers: tag used to detect the xxth copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1249
+msgid "th copy)"
+msgstr ""
+
+#. localizers: appended to first file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1259
+#, c-format
+msgid "%s (copy)%s"
+msgstr ""
+
+#. localizers: appended to second file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1261
+#, c-format
+msgid "%s (another copy)%s"
+msgstr ""
+
+#. localizers: appended to x1st file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1263
+#, c-format
+msgid "%s (%dst copy)%s"
+msgstr ""
+
+#. localizers: appended to x2nd file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1265
+#, c-format
+msgid "%s (%dnd copy)%s"
+msgstr ""
+
+#. localizers: appended to x3rd file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1267
+#, c-format
+msgid "%s (%drd copy)%s"
+msgstr ""
+
+#. localizers: appended to xxth file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1269
+#, c-format
+msgid "%s (%dth copy)%s"
+msgstr ""
+
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:648
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr ""
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:656
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:806
-#: libnautilus-extensions/nautilus-file-operations.c:1249
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus %d desconegut"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1094
-msgid "Moving files"
-msgstr "S'està movent els fitxers"
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1822
+msgid "Moving files to the Trash"
+msgstr "S'estàn movent els fitxers a la paperera"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1095
-msgid "moved"
-msgstr "moguts"
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1824
+#, fuzzy
+msgid "Files thrown out:"
+msgstr "llançat"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1096
-#: libnautilus-extensions/nautilus-file-operations.c:1375
+#. localizers: label prepended to the name of the current file moved
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "S'està movent"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1097
+#: libnautilus-extensions/nautilus-file-operations.c:1827
+msgid "Preparing to Move to Trash..."
+msgstr "S'està preparant per a moure a la paperera..."
+
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1837
+msgid "Moving files"
+msgstr "S'està movent els fitxers"
+
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1839
+#, fuzzy
+msgid "Files moved:"
+msgstr "Propietari del fitxer:"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "S'està preparant per a moure..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1098
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "S'està acabant de moure..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1108
-msgid "linked"
-msgstr ""
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1857
+#, fuzzy
+msgid "Files linked:"
+msgstr "Propietari del fitxer:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1109
+#. localizers: label prepended to the name of the current file linked
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 #, fuzzy
 msgid "Linking"
 msgstr "inclou"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1110
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 #, fuzzy
 msgid "Preparing to Create Links..."
 msgstr "S'està preparant per a suprimir els fitxers..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1111
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 #, fuzzy
 msgid "Finishing Creating Links..."
 msgstr "S'està acabant de moure..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1117
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "S'estàn copiant els fitxers"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1118
-msgid "copied"
-msgstr "copiat"
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1870
+#, fuzzy
+msgid "Files copied:"
+msgstr "Grup del fitxer:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1119
+#. localizers: label prepended to the name of the current file copied
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "S'està copiant"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1120
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "S'està preparant per a copiar..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1138
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "No podeu copiar elements a la paperera"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1139
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 #, fuzzy
 msgid "Can't Copy to Trash"
 msgstr "No podeu copiar la paperera."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1154
-#: libnautilus-extensions/nautilus-file-operations.c:1333
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1155
+#: libnautilus-extensions/nautilus-file-operations.c:1920
+#, fuzzy
+msgid "You cannot move this trash folder."
+msgstr "No podeu moure la paperera."
+
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "No podeu copiar la paperera."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1157
-#: libnautilus-extensions/nautilus-file-operations.c:1334
+#: libnautilus-extensions/nautilus-file-operations.c:1923
+#, fuzzy
+msgid "You cannot copy this trash folder."
+msgstr "No podeu copiar la paperera."
+
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1158
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 #, fuzzy
 msgid "Can't Copy Trash"
 msgstr "No podeu copiar la paperera."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1175
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 #, fuzzy
 msgid "You cannot move a folder into itself."
 msgstr "No podeu moure un element a sobre d'ell mateix."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 #, fuzzy
 msgid "You cannot copy a folder into itself."
 msgstr "No podeu copiar un element a sobre d'ell mateix."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1177
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1272
-msgid "untitled folder"
-msgstr ""
+#: libnautilus-extensions/nautilus-file-operations.c:1953
+#, fuzzy
+msgid "Can't Copy Into Self"
+msgstr "No podeu copiar la paperera."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1341
-#, c-format
-msgid "You cannot throw \"%s\" into the Trash."
-msgstr "No podeu llançar \"%s\" a la paperera."
+#: libnautilus-extensions/nautilus-file-operations.c:1965
+#, fuzzy
+msgid "You cannot copy a file over itself."
+msgstr "No podeu copiar un element a sobre d'ell mateix."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1345
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 #, fuzzy
-msgid "Error Moving to Trash"
-msgstr "Hi ha hagut un error en moure a la paperera"
+msgid "Can't Copy Over Self"
+msgstr "No podeu copiar la paperera."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1373
-msgid "Moving files to the Trash"
-msgstr "S'estàn movent els fitxers a la paperera"
+#: libnautilus-extensions/nautilus-file-operations.c:2017
+msgid ""
+"Error creating new folder.\n"
+"\n"
+"You do not have permissions to write to the destination."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1374
-msgid "thrown out"
-msgstr "llançat"
+#: libnautilus-extensions/nautilus-file-operations.c:2020
+msgid ""
+"Error creating new folder.\n"
+"\n"
+"There is no space on the destination."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1376
-msgid "Preparing to Move to Trash..."
-msgstr "S'està preparant per a moure a la paperera..."
+#: libnautilus-extensions/nautilus-file-operations.c:2023
+#, c-format
+msgid "Error \"%s\" creating new folder."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1417
+#: libnautilus-extensions/nautilus-file-operations.c:2027
+msgid "Error creating new folder"
+msgstr ""
+
+#. localizers: the initial name of a new folder
+#: libnautilus-extensions/nautilus-file-operations.c:2114
+msgid "untitled folder"
+msgstr ""
+
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "S'estàn suprimint els fitxers"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1418
-#: libnautilus-extensions/nautilus-file-operations.c:1467
-msgid "deleted"
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
+#, fuzzy
+msgid "Files deleted:"
 msgstr "suprimit"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1419
-#: libnautilus-extensions/nautilus-file-operations.c:1468
+#. localizers: label prepended to the name of the current file deleted
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "S'està suprimint"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1420
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "S'està preparant per a suprimir els fitxers..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1466
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "S'està buidant la paperera"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1469
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "S'està preparant per a buidar la paperera..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1503
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently delete all of the items in the trash?"
+"Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr "Esteu segur de que voleu eliminar permanentment l'element \"%s\"?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1505
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1506
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr ""
 
-#. test the next duplicate name generator
-#: libnautilus-extensions/nautilus-file-operations.c:1560
-msgid " (copy)"
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+msgid "foo"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1560
-msgid " (another copy)"
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+msgid "foo (copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1561
-msgid "foo"
+#: libnautilus-extensions/nautilus-file-operations.c:2260
+msgid ".bashrc"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1561
-#: libnautilus-extensions/nautilus-file-operations.c:1569
-msgid "foo (copy)"
+#: libnautilus-extensions/nautilus-file-operations.c:2260
+msgid ".bashrc (copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2261
+msgid ".foo.txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1562
+#: libnautilus-extensions/nautilus-file-operations.c:2261
+msgid ".foo (copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1562
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1563
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1563
-#: libnautilus-extensions/nautilus-file-operations.c:1570
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1564
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1564
-#: libnautilus-extensions/nautilus-file-operations.c:1584
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1565
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1565
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1566
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1566
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1567
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1567
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1568
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1568
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1569
-#: libnautilus-extensions/nautilus-file-operations.c:1571
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1570
-#: libnautilus-extensions/nautilus-file-operations.c:1572
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1571
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1572
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1573
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1573
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1574
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+msgid "foo (13th copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+msgid "foo (14th copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+msgid "foo (13th copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+msgid "foo (14th copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1574
-#: libnautilus-extensions/nautilus-file-operations.c:1576
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1575
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1575
-#: libnautilus-extensions/nautilus-file-operations.c:1577
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1576
-#: libnautilus-extensions/nautilus-file-operations.c:1578
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1577
-#: libnautilus-extensions/nautilus-file-operations.c:1579
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1578
-#: libnautilus-extensions/nautilus-file-operations.c:1580
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1579
-#: libnautilus-extensions/nautilus-file-operations.c:1581
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1580
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1581
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1582
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1582
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1583
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1583
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1584
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-font-picker.c:128
-msgid "Font"
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+msgid "foo (10th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:112
-#, fuzzy
-msgid "Folder Views"
-msgstr "_Mata la vista de la barra lateral"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:113
-msgid "Folder Views Settings"
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+msgid "foo (11st copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:115
-msgid "Window Behavior"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+msgid "foo (10th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:122
-msgid "Click Behavior"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+msgid "foo (11st copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:129
-msgid "Trash Behavior"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+msgid "foo (11th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:136
-#, fuzzy
-msgid "Display"
-msgstr "Mostra la barra lateral"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+msgid "foo (12nd copy)"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:157
-#, fuzzy
-msgid "Sidebar Panels"
-msgstr "Barra lateral"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+msgid "foo (11th copy).txt"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Sidebar Panels Description"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+msgid "foo (12nd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-msgid "Choose which panels should appear in the sidebar"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+msgid "foo (12th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:198
-msgid "Appearance"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+msgid "foo (13rd copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:199
-msgid "Appearance Settings"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+msgid "foo (12th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:201
-msgid "Smoother Graphics"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+msgid "foo (13rd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:208
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
+#, fuzzy, c-format
+msgid "%ld of %ld"
+msgstr "S'ha llegit %d%%%% de %ld"
+
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
 #, fuzzy
-msgid "Fonts"
-msgstr "conté"
+msgid "GConf Error"
+msgstr "S'ha produït un error HTTP: %d %s"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:214
+#. Constants
+#: libnautilus-extensions/nautilus-global-preferences.c:50
 #, fuzzy
-msgid "Views"
-msgstr "Veure com %s"
+msgid "Nautilus Preferences"
+msgstr "Nautilus: Preferències inicials"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:238
-msgid "Speed Tradeoffs"
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+#, fuzzy
+msgid "always"
+msgstr "Reproduir"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+#, fuzzy
+msgid "Always"
+msgstr "Reproduir"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:239
-msgid "Speed Tradeoffs Settings"
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:241
-msgid "Show Text in Icons"
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+#, fuzzy
+msgid "never"
+msgstr "propietari"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:248
-msgid "Show Thumbnails for Image Files"
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
 msgstr ""
 
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:256
-msgid "Make Folder Appearance Details Public"
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:268
-msgid "Search"
-msgstr "Cerca"
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+#, fuzzy
+msgid "Fonts"
+msgstr "conté"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:269
-msgid "Search Settings"
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+msgid "Font for Icon view:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:271
-msgid "Search Complexity Options"
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:277
-msgid "Search Tradeoffs"
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+msgid "Font for List view:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:285
-#, fuzzy
-msgid "Search Locations"
-msgstr "Ubicació"
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:295
-#, fuzzy
-msgid "Navigation"
-msgstr "aplicació"
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:296
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
 #, fuzzy
-msgid "Navigation Settings"
-msgstr "Edita els paràmetres..."
+msgid "Opening New Windows"
+msgstr "Obre en una _Nova Finestra"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:298
+#: libnautilus-extensions/nautilus-global-preferences.c:651
 #, fuzzy
-msgid "Home Location"
-msgstr "Ubicació"
+msgid "Open each file or folder in a separate window"
+msgstr "Obre cada element seleccionat en una nova finestra"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:305
+#: libnautilus-extensions/nautilus-global-preferences.c:658
 #, fuzzy
-msgid "Proxy Settings"
-msgstr "Edita els paràmetres..."
+msgid "Display toolbar in new windows"
+msgstr "Mostra la barra d'eines"
 
 #: libnautilus-extensions/nautilus-global-preferences.c:665
 #, fuzzy
-msgid "always"
-msgstr "Reproduir"
+msgid "Display location bar in new windows"
+msgstr "Mostra la barra de ubicació"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:666
+#: libnautilus-extensions/nautilus-global-preferences.c:672
 #, fuzzy
-msgid "Always"
-msgstr "Reproduir"
+msgid "Display status bar in new windows"
+msgstr "Mostra la barra d'estat"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:670
-msgid "local only"
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+#, fuzzy
+msgid "Display sidebar in new windows"
+msgstr "Mostra la barra lateral"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:671
-msgid "Local Files Only"
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+msgid "Ask before emptying the Trash or deleting files"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:675
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 #, fuzzy
-msgid "never"
-msgstr "propietari"
+msgid "single"
+msgstr "mida"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:676
-msgid "Never"
+#: libnautilus-extensions/nautilus-global-preferences.c:714
+msgid "Activate items with a single click"
 msgstr ""
 
 #: libnautilus-extensions/nautilus-global-preferences.c:717
-msgid "current theme"
+msgid "double"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:718
+msgid "Activate items with a double click"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:725
+msgid "launch"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:726
+msgid "Execute files when they are clicked"
 msgstr ""
 
 #: libnautilus-extensions/nautilus-global-preferences.c:729
 #, fuzzy
-msgid "Open each item in a new window"
-msgstr "Obre cada element seleccionat en una nova finestra"
+msgid "display"
+msgstr "Mostra la barra lateral"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:736
-#, fuzzy
-msgid "Ask before deleting items from the trash"
-msgstr "Mou tots els elements seleccionats a la Paperera"
+#: libnautilus-extensions/nautilus-global-preferences.c:730
+msgid "Display files when they are clicked"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:733
+msgid "ask"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:734
+msgid "Ask each time"
+msgstr ""
 
+#: libnautilus-extensions/nautilus-global-preferences.c:741
 #: libnautilus-extensions/nautilus-global-preferences.c:743
-msgid "Click policy"
+msgid "Click Behavior"
 msgstr ""
 
 #: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
 #, fuzzy
-msgid "single"
-msgstr "mida"
+msgid "Show/Hide Options"
+msgstr "Mostra/amaga elements"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:750
-msgid "Activate items with a single click"
+#: libnautilus-extensions/nautilus-global-preferences.c:759
+msgid "Show hidden files (file names start with \".\")"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:754
-msgid "double"
+#: libnautilus-extensions/nautilus-global-preferences.c:766
+msgid "Show backup files (file names end with \"~\")"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:755
-msgid "Activate items with a double click"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:773
+#, fuzzy
+msgid "Show special flags in Properties window"
+msgstr "Selecciona tots els elements d'aquesta finestra"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:760
-msgid "Display text in icons"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+msgid "Sorting Order"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:766
-msgid "Show thumbnails for image files"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:772
-msgid "Read and write metadata in each folder"
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
+msgid "Location:"
+msgstr "Ubicació:"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+#, fuzzy
+msgid "HTTP Proxy Settings"
+msgstr "Edita els paràmetres..."
+
+#: libnautilus-extensions/nautilus-global-preferences.c:798
+msgid "Use HTTP Proxy"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:782
-msgid "Use smoother (but slower) graphics"
+#. allocate the proxy label, followed by the entry
+#: libnautilus-extensions/nautilus-global-preferences.c:812
+#: src/nautilus-first-time-druid.c:683
+msgid "Port:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:788
-msgid "Font family used to display file names"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:795
+#: libnautilus-extensions/nautilus-global-preferences.c:841
 #, fuzzy
-msgid "Display tool bar in new windows"
-msgstr "Mostra la barra d'eines"
+msgid "Built-in Bookmarks"
+msgstr "Nautilus: Preferits"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:801
+#: libnautilus-extensions/nautilus-global-preferences.c:843
 #, fuzzy
-msgid "Display location bar in new windows"
-msgstr "Mostra la barra de ubicació"
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "Inclou la llista de preferits incorporada al menú"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:807
-#, fuzzy
-msgid "Display status bar in new windows"
-msgstr "Mostra la barra d'estat"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:813
-#, fuzzy
-msgid "Display sidebar in new windows"
-msgstr "Mostra la barra lateral"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:821
-msgid "Always do slow, complete search"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:828
-msgid "search type to do by default"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:834
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr ""
+
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+#, fuzzy
+msgid "Navigation"
+msgstr "aplicació"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:962
+msgid "Speed Tradeoffs"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:985
 msgid "search by text"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:835
-msgid "Search for files by text only"
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+msgid "Search for files by file name only"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:839
+#: libnautilus-extensions/nautilus-global-preferences.c:989
 msgid "search by text and properties"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:840
-msgid "Search for files by text and by their properties"
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+msgid "Search for files by file name and file properties"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:845
-msgid "Search Web Location"
+#: libnautilus-extensions/nautilus-global-preferences.c:997
+msgid "Search Complexity Options"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:852
-msgid "Show hidden files (starting with \".\")"
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:858
-msgid "Show backup files (ending with \"~\")"
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
+#, fuzzy
+msgid "Fast Search"
+msgstr "Cerca"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:864
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
 #, fuzzy
-msgid "Show special flags in Properties window"
-msgstr "Selecciona tots els elements d'aquesta finestra"
+msgid "Search Engine Location"
+msgstr "Ubicació"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Cerca"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, fuzzy, c-format
+msgid "Display %s tab in sidebar"
+msgstr "Mostra la barra d'estat"
+
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
 #, fuzzy
-msgid "Can add Content"
-msgstr "Continguts del paquet"
+msgid "Sidebar Panels"
+msgstr "Barra lateral"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:903
-msgid "Use HTTP Proxy"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"currently can't be performed because the program crond, which does nightly "
+"tasks on your computer, is turned off. To make sure fast searches can be "
+"done, turn crond on."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:909
-msgid "HTTP Proxy"
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
+msgid "Files May Not Be Indexed"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
+msgid ""
+"If you are running Linux, you can log in as root and type these commands to "
+"start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:915
-msgid "HTTP Proxy Port"
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"may not be performed because the program crond, which does nightly tasks on "
+"your computer, may be turned off. To make sure fast searches can be done, "
+"check to make sure that crond is turned on.\n"
+"\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:676
+#. The list of characters that cause line breaks can be localized.
+#: libnautilus-extensions/nautilus-icon-canvas-item.c:70
+msgid " -_,;.?/&"
+msgstr " -_,;.?/&"
+
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
+#, fuzzy
 msgid ""
-"This directory uses automatic layout. Do you want to switch to manual layout "
+"This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
 "manual layout."
 msgstr ""
@@ -2154,9 +6016,10 @@ msgstr ""
 "deixar aquest element on l'heu soltat? Això sacsejarà el format manual "
 "enmagatzemat."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:680
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
+#, fuzzy
 msgid ""
-"This directory uses automatic layout. Do you want to switch to manual layout "
+"This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
 "manual layout."
 msgstr ""
@@ -2164,233 +6027,215 @@ msgstr ""
 "deixar aquests elements on els heu soltat? Això sacsejarà el format manual "
 "enmagatzemat."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:686
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
+#, fuzzy
 msgid ""
-"This directory uses automatic layout. Do you want to switch to manual layout "
+"This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
 msgstr ""
 "Aquest directori empra un format automàtic. Voleu canviar a format manual i "
 "deixar aquest element on l'heu soltat?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:689
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
+#, fuzzy
 msgid ""
-"This directory uses automatic layout. Do you want to switch to manual layout "
+"This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
 msgstr ""
 "Aquest directori empra un format automàtic. Voleu canviar a format manual i "
 "deixar aquests elements on els heu soltat?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:696
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "Canviar a format automàtic?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:697
-#: src/nautilus-window-menus.c:584
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "Canvia"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1506
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
+#: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "Canvia el nom"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1507
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 #, fuzzy
 msgid "Undo Typing"
 msgstr "Desfés Edició"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1508
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "Restaura el nom antic"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1509
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 #, fuzzy
 msgid "Redo Typing"
 msgstr "Refés Edició"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1510
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Restaura el nom canviat"
 
-#. FIXME bugzilla.eazel.com 1102: Embedded text should use preferences to determine
-#. * the font it uses
-#.
-#: libnautilus-extensions/nautilus-icon-factory.c:2190
+#: libnautilus-extensions/nautilus-preferences.c:92
 #, fuzzy
-msgid "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*"
-msgstr "-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-*-*"
+msgid "Beginner"
+msgstr "Començament"
 
-#: libnautilus-extensions/nautilus-preferences.c:1093
-#, fuzzy, c-format
-msgid ""
-"GConf error:\n"
-"  %s"
-msgstr "S'ha produït un error HTTP: %d %s"
+#: libnautilus-extensions/nautilus-preferences.c:93
+msgid "Intermediate"
+msgstr "Intermedi"
 
-#: libnautilus-extensions/nautilus-preferences.c:1100
-#, c-format
-msgid ""
-"GConf error:\n"
-"  %s\n"
-"All further errors shown only on terminal"
+#: libnautilus-extensions/nautilus-preferences.c:94
+msgid "Advanced"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:201
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "Quadre de preferències"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:188
-#: src/nautilus-window.c:734
-#, c-format
-msgid "View as %s"
-msgstr "Veure com %s"
-
-#: libnautilus-extensions/nautilus-program-chooser.c:218
+#: libnautilus-extensions/nautilus-program-chooser.c:226
 msgid "not in menu"
 msgstr "no és al menú"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:221
+#: libnautilus-extensions/nautilus-program-chooser.c:229
 msgid "in menu for this file"
 msgstr "al menú per a aquest fitxer"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:224
-#: libnautilus-extensions/nautilus-program-chooser.c:227
+#: libnautilus-extensions/nautilus-program-chooser.c:232
+#: libnautilus-extensions/nautilus-program-chooser.c:235
 #, c-format
 msgid "in menu for \"%s\""
 msgstr "al menú per a \"%s\""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:230
+#: libnautilus-extensions/nautilus-program-chooser.c:238
 msgid "default for this file"
 msgstr "predeterminat per a aquest fitxer"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:233
-#: libnautilus-extensions/nautilus-program-chooser.c:236
+#: libnautilus-extensions/nautilus-program-chooser.c:241
+#: libnautilus-extensions/nautilus-program-chooser.c:244
 #, c-format
 msgid "default for \"%s\""
 msgstr "predeterminat per a \"%s\""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:265
+#: libnautilus-extensions/nautilus-program-chooser.c:289
 #, c-format
 msgid "Is not in the menu for \"%s\" items."
 msgstr "No és al menú per a \"%s\" elements."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:268
+#: libnautilus-extensions/nautilus-program-chooser.c:292
 #, c-format
 msgid "Is in the menu for \"%s\"."
 msgstr "És al menú per a \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:271
+#: libnautilus-extensions/nautilus-program-chooser.c:295
 #, c-format
 msgid "Is in the menu for \"%s\" items."
 msgstr "És al menú per a \"%s\" elements."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:274
+#: libnautilus-extensions/nautilus-program-chooser.c:298
 #, c-format
 msgid "Is in the menu for all \"%s\" items."
 msgstr "És al menú per a tots \"%s\" elements."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:277
+#: libnautilus-extensions/nautilus-program-chooser.c:301
 #, c-format
 msgid "Is the default for \"%s\"."
 msgstr "És el predeterminat per a \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:280
+#: libnautilus-extensions/nautilus-program-chooser.c:304
 #, c-format
 msgid "Is the default for \"%s\" items."
 msgstr "És predeterminat per a \"%s\" elements."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:283
+#: libnautilus-extensions/nautilus-program-chooser.c:307
 #, c-format
 msgid "Is the default for all \"%s\" items."
 msgstr "És predeterminat per a tots \"%s\" elements."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1040
+#: libnautilus-extensions/nautilus-program-chooser.c:993
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Modifica \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-extensions/nautilus-program-chooser.c:1064
+#: libnautilus-extensions/nautilus-program-chooser.c:1018
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Inclou al menú per a \"%s\" elements"
 
 #. Radio button for setting default for file type.
-#: libnautilus-extensions/nautilus-program-chooser.c:1071
+#: libnautilus-extensions/nautilus-program-chooser.c:1025
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Empra com predeterminat per a \"%s\" elements"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1078
+#: libnautilus-extensions/nautilus-program-chooser.c:1032
 #, c-format
 msgid "Include in the menu just for \"%s\""
 msgstr "Inclou al menú només per a \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1084
+#: libnautilus-extensions/nautilus-program-chooser.c:1038
 #, c-format
 msgid "Use as default just for \"%s\""
 msgstr "Empra com predeterminat només per a \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1091
+#: libnautilus-extensions/nautilus-program-chooser.c:1045
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "No inclore al menú per a \"%s\" elements"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1255
-#: src/file-manager/fm-list-view.c:1757
-#: src/file-manager/fm-search-list-view.c:238
-#: src/nautilus-bookmarks-window.c:169 src/nautilus-search-bar-criterion.c:66
+#: libnautilus-extensions/nautilus-program-chooser.c:1209
+#: src/file-manager/fm-list-view.c:2182
+#: src/file-manager/fm-search-list-view.c:545
+#: src/nautilus-bookmarks-window.c:164
 msgid "Name"
 msgstr "Nom"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1258
+#: libnautilus-extensions/nautilus-program-chooser.c:1212
 msgid "Status"
 msgstr "Estat"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1306
+#: libnautilus-extensions/nautilus-program-chooser.c:1260
 #, fuzzy
 msgid "Open with Other"
 msgstr "Nautilus: Obrir amb un altre"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1307
+#: libnautilus-extensions/nautilus-program-chooser.c:1261
 #, c-format
 msgid "Choose an application with which to open \"%s\"."
 msgstr "Trieu una aplicació per a obrir \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1311
+#: libnautilus-extensions/nautilus-program-chooser.c:1265
 #, fuzzy
 msgid "View as Other"
 msgstr "Veure com altres..."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1312
+#: libnautilus-extensions/nautilus-program-chooser.c:1266
 #, c-format
 msgid "Choose a view for \"%s\"."
 msgstr "Trieu una vista per a \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1319
+#: libnautilus-extensions/nautilus-program-chooser.c:1273
 msgid "Choose"
 msgstr "Trieu"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1321
+#: libnautilus-extensions/nautilus-program-chooser.c:1275
 msgid "Done"
 msgstr "Fet"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1383
+#: libnautilus-extensions/nautilus-program-chooser.c:1338
 msgid "Modify..."
 msgstr "Modifica..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-extensions/nautilus-program-chooser.c:1394
+#: libnautilus-extensions/nautilus-program-chooser.c:1349
 msgid "File Types and Programs"
 msgstr "Tipus de fitxers i programes"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1403
-msgid "Go There"
-msgstr "Vés allà"
-
-#: libnautilus-extensions/nautilus-program-chooser.c:1412
+#: libnautilus-extensions/nautilus-program-chooser.c:1370
 #, fuzzy
 msgid ""
 "You can configure which programs are offered for which file types in the "
@@ -2399,228 +6244,317 @@ msgstr ""
 "Podeu configurar quins programes s'ofereixen per a cada tipus de fitxer al "
 "Centre de Control de Gnome"
 
-#. This application can't deal with this URI,
-#. * because it can only handle local
-#. * files. Tell user. Some day we could offer
-#. * to copy it locally for the user, if we knew
-#. * where to put it, and who would delete it
-#. * when done.
+#: libnautilus-extensions/nautilus-program-chooser.c:1485
+#, fuzzy, c-format
+msgid "No viewers are available for \"%s\"."
+msgstr "Trieu una vista per a \"%s\"."
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1486
+msgid "No Viewers Available"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1489
+#, fuzzy, c-format
+msgid "No applications are available for \"%s\"."
+msgstr "Trieu una vista per a \"%s\"."
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1490
+#, fuzzy
+msgid "No Applications Available"
+msgstr "Aplicacions"
+
+#. Note: This might be misleading in the components case, since the
+#. * user can't add components to the complete list even from the capplet.
+#. * (They can add applications though.)
 #.
-#: libnautilus-extensions/nautilus-program-choosing.c:259
+#: libnautilus-extensions/nautilus-program-chooser.c:1497
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"You can configure which programs are offered for which file types with the "
+"\"File Types and Programs\" part of the GNOME Control Center. Do you want to "
+"go there now?"
+msgstr ""
+"Podeu configurar quins programes s'ofereixen per a cada tipus de fitxer al "
+"Centre de Control de Gnome"
+
+#: libnautilus-extensions/nautilus-program-choosing.c:492
 #, c-format
 msgid ""
-"Sorry, %s can only open local files, and \"%s\" is remote. If you want to "
-"open it with %s, make a local copy first."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  Would you like to choose another application?"
 msgstr ""
-"%s només pot obrir fitxers locals, i \"%s\" és remot. Si voleu obrir-lo amb "
-"%s, feu primer una còpia local."
 
-#: libnautilus-extensions/nautilus-program-choosing.c:263
-msgid "Can't open remote file"
-msgstr "No es pot obrir el fitxer remot"
+#: libnautilus-extensions/nautilus-program-choosing.c:497
+#: libnautilus-extensions/nautilus-program-choosing.c:518
+#, fuzzy
+msgid "Can't Open Location"
+msgstr "Mostra la barra de ubicació"
 
-#: libnautilus-extensions/nautilus-search-uri.c:207
+#: libnautilus-extensions/nautilus-program-choosing.c:513
 #, c-format
-msgid "that have \"%s\" in the name"
-msgstr ""
+msgid ""
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  No other applications are available to view this file.  If you "
+"copy this file onto your computer, you may be able to open it."
+msgstr ""
+
+#. Human readable description for a criterion in a search for
+#. files. Bracketed items are context, and are message
+#. strings elsewhere.  You don't have to translate the whole
+#. string, and only the translation for "containing '%s' will
+#. be used.  If you do translate the whole string, leave the
+#. translations of the rest of the text in brackets, so it
+#. will not be used.
+#. "%s" here is a pattern the file name
+#. matched, such as "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:212
+#, fuzzy, c-format
+msgid "[Items ]containing \"%s\" in their names"
+msgstr " (contenint %d elements)"
 
-#: libnautilus-extensions/nautilus-search-uri.c:210
+#. "%s" here is a pattern the file name started with, such as
+#. "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:217
 #, fuzzy, c-format
-msgid "that start with \"%s\""
+msgid "[Items ]starting with \"%s\""
 msgstr "comença amb"
 
-#: libnautilus-extensions/nautilus-search-uri.c:213
+#. "%s" here is a pattern the file name ended with, such as
+#. "mime"
+#: libnautilus-extensions/nautilus-search-uri.c:222
 #, fuzzy, c-format
-msgid "that end with %s"
+msgid "[Items ]ending with %s"
 msgstr "Obre amb %s"
 
-#: libnautilus-extensions/nautilus-search-uri.c:216
+#. "%s" here is a pattern the file name did not match, such
+#. as "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:227
 #, c-format
-msgid "that don't contain \"%s\""
+msgid "[Items ]not containing \"%s\" in their names"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:219
+#. "%s" is a regular expression string, for example "[abc]"
+#: libnautilus-extensions/nautilus-search-uri.c:231
 #, c-format
-msgid "that match the regular expression \"%s\""
+msgid "[Items ]matching the regular expression \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:222
+#. "%s" is a file glob, for example "*.txt"
+#: libnautilus-extensions/nautilus-search-uri.c:235
 #, c-format
-msgid "that match the file pattern \"%s\""
+msgid "[Items ]matching the file pattern \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:235
+#: libnautilus-extensions/nautilus-search-uri.c:248
 #, fuzzy
-msgid "regular files"
+msgid "[Items that are ]regular files"
 msgstr "fitxer habitual"
 
-#: libnautilus-extensions/nautilus-search-uri.c:238
-#, fuzzy
-msgid "text files"
-msgstr "fitxer de text"
+#: libnautilus-extensions/nautilus-search-uri.c:251
+msgid "[Items that are ]text files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:241
-#, fuzzy
-msgid "applications"
-msgstr "aplicació"
+#: libnautilus-extensions/nautilus-search-uri.c:254
+msgid "[Items that are ]applications"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:244
-#, fuzzy
-msgid "directories"
-msgstr "0 directoris"
+#: libnautilus-extensions/nautilus-search-uri.c:257
+msgid "[Items that are ]folders"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:247
-#: src/nautilus-search-bar-criterion.c:106
-msgid "music"
-msgstr "música"
+#: libnautilus-extensions/nautilus-search-uri.c:260
+msgid "[Items that are ]music"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:254
+#. "%s" here is a word describing a file type, for example
+#. "folder"
+#: libnautilus-extensions/nautilus-search-uri.c:268
 #, c-format
-msgid "are not %s"
+msgid "[Items ]that are not %s"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:258
+#. "%s" here is a word describing a file type, for example
+#. "folder"
+#: libnautilus-extensions/nautilus-search-uri.c:273
+#, fuzzy, c-format
+msgid "[Items ]that are %s"
+msgstr "S'han llegit %d octets"
+
+#. "%s" here is the name of user on a Linux machine, such as
+#. "root"
+#: libnautilus-extensions/nautilus-search-uri.c:287
 #, c-format
-msgid "are %s"
+msgid "[Items ]not owned by \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:269
+#. "%s" here is the name of user on a Linux machine, such as
+#. "root"
+#: libnautilus-extensions/nautilus-search-uri.c:292
 #, c-format
-msgid "are not owned by \"%s\""
+msgid "[Items ]owned by \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:272
+#: libnautilus-extensions/nautilus-search-uri.c:295
 #, c-format
-msgid "are owned by \"%s\""
+msgid "[Items ]with owner UID \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:276
+#: libnautilus-extensions/nautilus-search-uri.c:298
 #, c-format
-msgid "have owner UID \"%s\""
+msgid "[Items ]with owner UID other than \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:279
+#: libnautilus-extensions/nautilus-search-uri.c:309
+#, fuzzy, c-format
+msgid "[Items ]larger than %s bytes"
+msgstr "S'han llegit %d octets"
+
+#: libnautilus-extensions/nautilus-search-uri.c:312
 #, c-format
-msgid "have owner UID other than \"%s\""
+msgid "[Items ]smaller than %s bytes"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:290
-#, c-format
-msgid "that are larger than %s bytes"
+#: libnautilus-extensions/nautilus-search-uri.c:315
+#, fuzzy, c-format
+msgid "[Items ]of %s bytes"
+msgstr "Versió %s-%s"
+
+#: libnautilus-extensions/nautilus-search-uri.c:326
+#, fuzzy
+msgid "[Items ]modified today"
+msgstr "data de modificació"
+
+#: libnautilus-extensions/nautilus-search-uri.c:329
+msgid "[Items ]modified yesterday"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:293
+#: libnautilus-extensions/nautilus-search-uri.c:332
+#, fuzzy, c-format
+msgid "[Items ]modified on %s"
+msgstr "data de modificació"
+
+#: libnautilus-extensions/nautilus-search-uri.c:334
 #, c-format
-msgid "that are smaller than %s bytes"
+msgid "[Items ]not modified on %s"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:296
-#, fuzzy, c-format
-msgid "that are %s bytes"
-msgstr "S'han llegit %d octets"
+#: libnautilus-extensions/nautilus-search-uri.c:337
+#, c-format
+msgid "[Items ]modified before %s"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:307
+#: libnautilus-extensions/nautilus-search-uri.c:340
 #, c-format
-msgid "modified after %s"
+msgid "[Items ]modified after %s"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:310
+#: libnautilus-extensions/nautilus-search-uri.c:343
 #, c-format
-msgid "modified before %s"
+msgid "[Items ]modified within a week of %s"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:322
+#: libnautilus-extensions/nautilus-search-uri.c:346
 #, fuzzy, c-format
-msgid "marked with \"%s\""
-msgstr "marcat amb"
+msgid "[Items ]modified within a month of %s"
+msgstr "aquest mes"
 
-#: libnautilus-extensions/nautilus-search-uri.c:325
+#. "%s" here is the name of an Emblem
+#: libnautilus-extensions/nautilus-search-uri.c:359
 #, fuzzy, c-format
-msgid "not marked with \"%s\""
+msgid "[Items ]marked with \"%s\""
 msgstr "no marcat amb"
 
-#: libnautilus-extensions/nautilus-search-uri.c:339
-#, c-format
-msgid "with all the words %s"
-msgstr ""
+#. "%s" here is the name of an Emblem
+#: libnautilus-extensions/nautilus-search-uri.c:363
+#, fuzzy, c-format
+msgid "[Items ]not marked with \"%s\""
+msgstr "no marcat amb"
 
-#: libnautilus-extensions/nautilus-search-uri.c:342
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:379
+#, fuzzy, c-format
+msgid "[Items ]with all the words \"%s\""
+msgstr "És el predeterminat per a \"%s\"."
+
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:384
 #, c-format
-msgid "containing one of the words %s"
+msgid "[Items ]containing one of the words \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:345
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:389
 #, c-format
-msgid "without all the words %s"
+msgid "[Items ]without all the words \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:348
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:394
 #, c-format
-msgid "without any of the words %s"
+msgid "[Items ]without any of the words \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:365
-#, fuzzy
-msgid "that"
-msgstr "Estat"
-
-#: libnautilus-extensions/nautilus-search-uri.c:485
-#, fuzzy
-msgid "are directories"
-msgstr "0 directoris"
+#: libnautilus-extensions/nautilus-search-uri.c:556
+msgid "[Items larger than 400K] and [without all the words \"apple orange\"]"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:529
-msgid " and "
+#. Human readable description for a criterion in a search for
+#. files. Bracketed items are context, and are message
+#. strings elsewhere.  Translate only the words "and" here.
+#: libnautilus-extensions/nautilus-search-uri.c:561
+msgid ""
+"[Items larger than 400K], [owned by root and without all the words \"apple "
+"orange\"]"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:594
+#. The beginning of the description of a search that has just been
+#. performed.  The "%s" here is a description of a single criterion,
+#. which in english might be "that contain the word 'foo'"
+#: libnautilus-extensions/nautilus-search-uri.c:591
 #, fuzzy, c-format
-msgid "Items %s%s"
+msgid "Items %s"
 msgstr "Versió %s-%s"
 
-#: libnautilus-extensions/nautilus-search-uri.c:597
-#, c-format
-msgid "Items %s %s%s"
-msgstr ""
+#: libnautilus-extensions/nautilus-search-uri.c:701
+#, fuzzy
+msgid "Items containing \"stuff\" in their names"
+msgstr " (contenint 0 elements)"
 
-#: libnautilus-extensions/nautilus-search-uri.c:706
-msgid "Items that have \"stuff\" in the name."
-msgstr ""
+#: libnautilus-extensions/nautilus-search-uri.c:703
+#, fuzzy
+msgid "Items that are regular files"
+msgstr "fitxer habitual"
 
-#: libnautilus-extensions/nautilus-search-uri.c:708
-msgid "Items that have \"stuff\" in the name and are regular files."
+#: libnautilus-extensions/nautilus-search-uri.c:706
+msgid "Items containing \"stuff\" in their names and that are regular files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:711
+#: libnautilus-extensions/nautilus-search-uri.c:710
 msgid ""
-"Items that have \"stuff\" in the name, are regular files and that are "
-"smaller than 2000 bytes."
+"Items containing \"stuff\" in their names, that are regular files and "
+"smaller than 2000 bytes"
 msgstr ""
 
 #: libnautilus-extensions/nautilus-search-uri.c:714
-msgid "Items that have \"medusa\" in the name and are directories."
+msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:375
-msgid "Warning"
+#: libnautilus-extensions/nautilus-trash-directory.c:73
+msgid "Searching Disks"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:385
-#: libnautilus-extensions/nautilus-stock-dialogs.c:425
-msgid "Error"
+#: libnautilus-extensions/nautilus-trash-directory.c:74
+msgid "Nautilus is searching your disks for trash folders."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:427
-msgid "Details"
-msgstr "Detalls"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:457
-#, fuzzy
-msgid "Question"
-msgstr "Descripció"
-
-#: libnautilus-extensions/nautilus-trash-directory.c:285
-msgid "Trash"
+#: libnautilus-extensions/nautilus-trash-file.c:725
+msgid "on the desktop"
 msgstr ""
 
 #: libnautilus-extensions/nautilus-undo-signal-handlers.c:175
@@ -2643,145 +6577,339 @@ msgstr "Refés Edició"
 msgid "Redo the edit"
 msgstr "Refés l'edició"
 
-#: libnautilus-extensions/nautilus-user-level-manager.c:59
+#: libnautilus-extensions/nautilus-view-identifier.c:61
+#, c-format
+msgid "View as %s"
+msgstr "Veure com %s"
+
+#: libnautilus-extensions/nautilus-view-identifier.c:64
+#, c-format
+msgid "%s Viewer"
+msgstr "%s Visualitzador"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
 #, fuzzy
-msgid "Beginner"
-msgstr "Començament"
+msgid "Unknown"
+msgstr "desconegut"
 
-#: libnautilus-extensions/nautilus-user-level-manager.c:60
-msgid "Intermediate"
-msgstr "Intermedi"
+#. Populate table with items we know localized names for.
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
+msgid "Floppy"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-user-level-manager.c:61
-msgid "Advanced"
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
+msgid "CD-ROM"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
+msgid "Zip Drive"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
+msgid "Audio CD"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
+msgid "is write-protected, mounting read-only"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
+msgid "is not a valid block device"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
+msgid "No medium found"
+msgstr ""
+
+#. Handle floppy case
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
+msgid ""
+"Nautilus was unable to mount the floppy drive. There is probably no floppy "
+"in the drive."
+msgstr ""
+
+#. All others
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
+msgid ""
+"Nautilus was unable to mount the volume. There is probably no media in the "
+"device."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
+msgid "wrong fs type, bad option, bad superblock on"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
+msgid ""
+"Nautilus was unable to mount the floppy drive. The floppy is probably in a "
+"format that cannot be mounted."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
+msgid ""
+"Nautilus was unable to mount the selected volume. The volume is probably in "
+"a format that cannot be mounted."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
+msgid "Nautilus was unable to mount the selected floppy drive."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
+msgid "Nautilus was unable to mount the selected volume."
+msgstr ""
+
+#. FIXME: Should we parse this message and report something more meaningful?
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
+msgid "Nautilus was unable to unmount the selected volume."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:505
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
 #, fuzzy
-msgid "Unknown Volume"
-msgstr "Desconegut"
+msgid "Unmount Error"
+msgstr "S'està canviant el nom de %s a %s."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1165
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1172
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
+msgid "Root"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1178
-msgid "Floppy"
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
+msgid "MSDOS Volume"
 msgstr ""
 
-#: libnautilus/nautilus-clipboard.c:135 src/nautilus-window-menus.c:1461
-msgid "_Cut Text"
-msgstr "_Retalla el text"
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
+msgid "NFS Volume"
+msgstr ""
 
-#: libnautilus/nautilus-clipboard.c:136 src/nautilus-window-menus.c:1462
-msgid "Cuts the selected text to the clipboard"
-msgstr "Retalla el text seleccionat i el posa al portaretalls"
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
+msgid "ReiserFS Volume"
+msgstr ""
 
-#: libnautilus/nautilus-clipboard.c:140 src/nautilus-window-menus.c:1473
-msgid "_Copy Text"
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
+#, fuzzy
+msgid "UFS Volume"
+msgstr "Desconegut"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
+#, fuzzy
+msgid "Unknown Volume"
+msgstr "Desconegut"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:5
+msgid "C_lear Text"
+msgstr "Neteja el text"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "Neteja el text"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
 msgstr "_Copia el text"
 
-#: libnautilus/nautilus-clipboard.c:141 src/nautilus-window-menus.c:1474
-msgid "Copies the selected text to the clipboard"
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
+#, fuzzy
+msgid "Copy the selected text to the clipboard"
 msgstr "Copia el text seleccionat al portaretalls"
 
-#: libnautilus/nautilus-clipboard.c:145 src/nautilus-window-menus.c:1485
-msgid "_Paste Text"
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "_Retalla el text"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+#, fuzzy
+msgid "Cut _Text"
+msgstr "_Retalla el text"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
+#, fuzzy
+msgid "Cut the selected text to the clipboard"
+msgstr "Retalla el text seleccionat i el posa al portaretalls"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
 msgstr "_Enganxa el text"
 
-#: libnautilus/nautilus-clipboard.c:146 src/nautilus-window-menus.c:1486
-msgid "Pastes the text stored on the clipboard"
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
+#, fuzzy
+msgid "Paste the text stored on the clipboard"
 msgstr "Enganxa el text enmagatzemat al portaretalls"
 
-#: libnautilus/nautilus-clipboard.c:150 src/nautilus-window-menus.c:1497
-msgid "C_lear Text"
-msgstr "Neteja el text"
-
-#: libnautilus/nautilus-clipboard.c:151 src/nautilus-window-menus.c:1498
-msgid "Removes the selected text without putting it on the clipboard"
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
+#, fuzzy
+msgid "Remove the selected text without putting it on the clipboard"
 msgstr "Elimina el text seleccionat sense posar-lo al portaretalls"
 
-#: src/file-manager/fm-desktop-icon-view.c:399
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
 #, fuzzy
-msgid "Empty Trash"
-msgstr "_Buida la Paperera"
+msgid "Select All"
+msgstr "_Selecciona-ho Tot"
 
-#: src/file-manager/fm-desktop-icon-view.c:428
-msgid "New Terminal"
-msgstr "Nova terminal"
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+#, fuzzy
+msgid "Select _All"
+msgstr "_Selecciona-ho Tot"
 
-#: src/file-manager/fm-desktop-icon-view.c:437
-msgid "Disks"
-msgstr "Discos"
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "Selecciona tots els elements d'aquesta finestra"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
+msgid "_Copy Text"
+msgstr "_Copia el text"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
+msgid "_Paste Text"
+msgstr "_Enganxa el text"
+
+#. The copyright character in here is correct for
+#. * Latin-1 encoding, but not for UTF-8, so we have
+#. * to change it when we upgrade to GTK 2.0.
+#.
+#: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
+#: src/nautilus-window-menus.c:610
+msgid "Nautilus"
+msgstr "Nautilus"
+
+#: nautilus.desktop.in.h:2
+msgid "Nautilus File Manager and Graphic Shell"
+msgstr ""
+
+#. Note to translators: If it's hard to compose a good home
+#. * icon name from the user name, you can use a string without
+#. * an "%s" here, in which case the home icon name will not
+#. * include the user's name, which should be fine. To avoid a
+#. * warning, put "%.0s" somewhere in the string, which will
+#. * match the user name string passed by the C code, but not
+#. * put the user name in the final string.
+#.
+#: src/file-manager/fm-desktop-icon-view.c:886
+#, fuzzy, c-format
+msgid "%s's Home"
+msgstr "Inici"
 
-#: src/file-manager/fm-desktop-icon-view.c:496
+#: src/file-manager/fm-desktop-icon-view.c:1175
 #, fuzzy
-msgid "Reset Desktop Background"
-msgstr "Reinicialitza el fons"
+msgid "Empty Trash..."
+msgstr "_Buida la Paperera"
 
-#: src/file-manager/fm-desktop-icon-view.c:504
+#: src/file-manager/fm-desktop-icon-view.c:1177
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 #, fuzzy
-msgid "Change Desktop Background"
-msgstr "Reinicialitza el fons"
+msgid "Empty Trash"
+msgstr "_Buida la Paperera"
 
-#: src/file-manager/fm-directory-view.c:401
+#: src/file-manager/fm-desktop-icon-view.c:1197
+#, fuzzy
+msgid "Unmount Volume"
+msgstr "Desconegut"
+
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:403
+#: src/file-manager/fm-directory-view.c:442
 #, fuzzy, c-format
 msgid "Open %d Windows?"
 msgstr "Obre en %d _Noves Finestres"
 
-#: src/file-manager/fm-directory-view.c:1183
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr "Esteu segur de que voleu eliminar permanentment l'element \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+"Esteu segur de que voleu eliminar permanentment els %d elements seleccionats?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Suprimeix"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Suprimeix"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+#, fuzzy
+msgid "scripts"
+msgstr "Descripció"
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" seleccionat"
 
-#: src/file-manager/fm-directory-view.c:1185
+#: src/file-manager/fm-directory-view.c:1337
 #, fuzzy
 msgid "1 folder selected"
 msgstr "1 directori seleccionat"
 
-#: src/file-manager/fm-directory-view.c:1188
+#: src/file-manager/fm-directory-view.c:1340
 #, fuzzy, c-format
 msgid "%d folders selected"
 msgstr "%d directoris seleccionats"
 
-#: src/file-manager/fm-directory-view.c:1194
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr " (contenint 0 elements)"
 
-#: src/file-manager/fm-directory-view.c:1196
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr " (contenint 1 element)"
 
-#: src/file-manager/fm-directory-view.c:1198
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr " (contenint %d elements)"
 
-#: src/file-manager/fm-directory-view.c:1209
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" seleccionat (%s)"
 
-#: src/file-manager/fm-directory-view.c:1213
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d elements seleccionats (%s)"
 
-#: src/file-manager/fm-directory-view.c:1220
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "un altre element seleccionat (%s)"
 
-#: src/file-manager/fm-directory-view.c:1223
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d elements més seleccionats (%s)"
@@ -2793,365 +6921,513 @@ msgstr "%d elements més seleccionats (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1252
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
 
-#: src/file-manager/fm-directory-view.c:2237
+#. Note that the number of items actually displayed varies somewhat due
+#. * to the way files are collected in batches. So you can't assume that
+#. * no more than the constant limit are displayed.
+#.
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
-"\"%s\" cannot be moved to the trash. Do you want to delete it immediately?"
+"The folder \"%s\" contains more files than Nautilus can handle. Some files "
+"will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1537
+msgid "Too Many Files"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2242
+#: src/file-manager/fm-directory-view.c:2752
 #, c-format
 msgid ""
-"The %d selected items cannot be moved to the trash. Do you want to delete "
+"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:2757
+#, c-format
+msgid ""
+"The %d selected items cannot be moved to the Trash. Do you want to delete "
 "them immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2246
+#: src/file-manager/fm-directory-view.c:2761
 #, c-format
 msgid ""
-"%d of the selected items cannot be moved to the trash. Do you want to delete "
+"%d of the selected items cannot be moved to the Trash. Do you want to delete "
 "those %d items immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2254
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2255
-#: src/file-manager/fm-directory-view.c:2296
-msgid "Delete"
-msgstr "Suprimeix"
-
-#: src/file-manager/fm-directory-view.c:2285
+#: src/file-manager/fm-directory-view.c:2799
 #, fuzzy, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
+msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr "Esteu segur de que voleu eliminar permanentment l'element \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:2289
+#: src/file-manager/fm-directory-view.c:2803
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"trash?"
+"Trash?"
 msgstr ""
 "Esteu segur de que voleu eliminar permanentment els %d elements seleccionats?"
 
-#: src/file-manager/fm-directory-view.c:2295
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2551
-msgid "_Open"
-msgstr "_Obre"
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
+#, fuzzy, c-format
+msgid "Use \"%s\" to open the selected item"
+msgstr "Tria un programa amb el què obrir l'element seleccionat"
 
-#: src/file-manager/fm-directory-view.c:2554
-msgid "Open With"
-msgstr "Obre amb"
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#, fuzzy
+msgid "Other _Application..."
+msgstr "Una altra aplicació...."
 
-#: src/file-manager/fm-directory-view.c:2557
-msgid "Other Application..."
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
 msgstr "Una altra aplicació...."
 
-#: src/file-manager/fm-directory-view.c:2559
-msgid "Other Viewer..."
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#, fuzzy
+msgid "Other _Viewer..."
 msgstr "Un altre visualitzador..."
 
-#: src/file-manager/fm-directory-view.c:2563
-msgid "Open in _New Window"
-msgstr "Obre en una _Nova Finestra"
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "Un altre visualitzador..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "Reanomena l'element seleccionat"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2565
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
 #, c-format
-msgid "Open in %d _New Windows"
-msgstr "Obre en %d _Noves Finestres"
+msgid "Nautilus was unable to create the directory %s."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2577
-msgid "New Folder"
-msgstr "Nova Carpeta"
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "Obre en una _Nova Finestra"
 
-#: src/file-manager/fm-directory-view.c:2581
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#, fuzzy
+msgid "Open _in New Window"
+msgstr "Obre en una _Nova Finestra"
+
+#: src/file-manager/fm-directory-view.c:3959
+#, fuzzy, c-format
+msgid "Open _in %d New Windows"
+msgstr "Obre en %d _Noves Finestres"
+
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2583
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2587
+#: src/file-manager/fm-directory-view.c:3979
+#, fuzzy
+msgid "Delete all selected items permanently"
+msgstr "Suprimeix tots els elements seleccionats"
+
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 #, fuzzy
 msgid "Move to _Trash"
 msgstr "_Mou a la Paperera"
 
-#: src/file-manager/fm-directory-view.c:2590
-msgid "_Duplicate"
-msgstr "_Duplica"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "Mou tots els elements seleccionats a la Paperera"
 
-#: src/file-manager/fm-directory-view.c:2594
-msgid "Create _Links"
-msgstr ""
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "_Suprimeix..."
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "Suprimeix"
 
-#: src/file-manager/fm-directory-view.c:2596
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4038
+msgid "Make _Links"
 msgstr ""
 
-#. No ellipses here because this command does not require further
-#. * information to be completed.
-#.
-#: src/file-manager/fm-directory-view.c:2603
-msgid "Show _Properties"
-msgstr "Mostra les _Propietats"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+msgid "Make _Link"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2607
+#: src/file-manager/fm-directory-view.c:4056
 #, fuzzy
 msgid "_Empty Trash..."
 msgstr "_Buida la Paperera"
 
-#: src/file-manager/fm-directory-view.c:2609
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "_Buida la Paperera"
 
-#: src/file-manager/fm-directory-view.c:2613
-#, fuzzy
-msgid "_Select All Files"
-msgstr "_Selecciona-ho Tot"
-
-#: src/file-manager/fm-directory-view.c:2617
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "_Elimina les Imatges Personalitzades"
 
-#: src/file-manager/fm-directory-view.c:2619
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "_Elimina la Imatge Personalitzada"
 
-#: src/file-manager/fm-directory-view.c:2623
-msgid "Reset _Background"
-msgstr "Reinicialitza el _Fons"
-
-#: src/file-manager/fm-directory-view.c:2778
-msgid "Zoom In"
-msgstr "Amplia el Zoom"
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "_Fitxer"
 
-#: src/file-manager/fm-directory-view.c:2780
-msgid "Zoom Out"
-msgstr "Redueix el Zoom"
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "_Fitxer"
 
-#: src/file-manager/fm-directory-view.c:2782
+#: src/file-manager/fm-directory-view.c:4094
 #, fuzzy
-msgid "Normal Size"
-msgstr "Normalitza el menú"
+msgid "_Copy File"
+msgstr "_Copia el text"
 
-#: src/file-manager/fm-directory-view.c:2796
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 #, fuzzy
-msgid "_New Folder"
-msgstr "Nova Carpeta"
+msgid "_Copy Files"
+msgstr "S'estàn copiant els fitxers"
 
-#: src/file-manager/fm-directory-view.c:2889
-#: src/file-manager/fm-directory-view.c:3153
+#: src/file-manager/fm-directory-view.c:4252
+msgid ""
+"This link can't be used, because it has no target. Do you want to put this "
+"link in the Trash?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
-msgid "%s Viewer"
-msgstr "%s Visualitzador"
+msgid ""
+"This link can't be used, because its target \"%s\" doesn't exist. Do you "
+"want to put this link in the Trash?"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3182
-msgid "Move all selected items to the Trash"
-msgstr "Mou tots els elements seleccionats a la Paperera"
+#: src/file-manager/fm-directory-view.c:4261
+msgid "Broken Link"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3191
-#, fuzzy
-msgid "Delete all selected items permanently"
-msgstr "Suprimeix tots els elements seleccionats"
+#: src/file-manager/fm-directory-view.c:4262
+msgid "Throw Away"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3214
-msgid "Choose a program with which to open the selected item"
-msgstr "Tria un programa amb el què obrir l'element seleccionat"
+#: src/file-manager/fm-directory-view.c:4315
+#, c-format
+msgid ""
+"\"%s\" is an executable text file. Do you want to run it, or display its "
+"contents?"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3235
-msgid "Choose another application with which to open the selected item"
-msgstr "Tria una altra aplicació amb la què obrir l'element seleccionat"
+#: src/file-manager/fm-directory-view.c:4321
+#, fuzzy
+msgid "Run or Display?"
+msgstr "Mostra la barra lateral"
 
-#: src/file-manager/fm-directory-view.c:3257
-msgid "Choose another viewer with which to view the selected item"
-msgstr "Tria un altre visualitzador amb el què veure l'element seleccionat"
+#: src/file-manager/fm-directory-view.c:4322
+msgid "Run"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3281
-msgid "Create a new folder in this window"
-msgstr "Crea una nova carpeta en aquesta finestra"
+#: src/file-manager/fm-directory-view.c:4323
+#, fuzzy
+msgid "Display"
+msgstr "Mostra la barra lateral"
 
-#: src/file-manager/fm-directory-view.c:3289
-msgid "Open the selected item in this window"
-msgstr "Obre l'element seleccionat en aquest finestra"
+#: src/file-manager/fm-directory-view.c:4377
+msgid ""
+"Sorry, but you can't execute commands from a remote site due to security "
+"considerations."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3297
-msgid "Open each selected item in a new window"
-msgstr "Obre cada element seleccionat en una nova finestra"
+#: src/file-manager/fm-directory-view.c:4379
+#, fuzzy
+msgid "Can't execute remote links"
+msgstr "No es pot obrir el fitxer remot"
 
-#: src/file-manager/fm-directory-view.c:3312
-msgid "View or modify the properties of the selected items"
-msgstr "Visualitza o modfica les propietats dels elements seleccionats"
+#: src/file-manager/fm-directory-view.c:4513
+#, fuzzy, c-format
+msgid "Opening \"%s\""
+msgstr "s'està apuntant a \"%s\""
 
-#: src/file-manager/fm-directory-view.c:3323
+#: src/file-manager/fm-directory-view.c:4519
 #, fuzzy
-msgid "Duplicate each selected item"
-msgstr "Duplica tots els elements seleccionats"
+msgid "Cancel Open?"
+msgstr "Cancel·lar en canvi de nom?"
 
-#: src/file-manager/fm-directory-view.c:3331
-#, fuzzy
-msgid "Create a symbolic link for each selected item"
-msgstr "Suprimeix tots els elements seleccionats"
+#: src/file-manager/fm-error-reporting.c:58
+#, fuzzy, c-format
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
+msgstr "No teniu els permissos necessaris per a veure \"%s\"."
 
-#: src/file-manager/fm-directory-view.c:3345
-msgid "Delete all items in the trash"
-msgstr "Suprimeix tots els elements de la paperera"
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3353
-msgid "Select all items in this window"
-msgstr "Selecciona tots els elements d'aquesta finestra"
+#: src/file-manager/fm-error-reporting.c:69
+#, fuzzy, c-format
+msgid "Sorry, couldn't display all the contents of \"%s\"."
+msgstr "No s'ha pogut canviar el propietari de \"%s\"."
 
-#: src/file-manager/fm-directory-view.c:3367
-msgid "Remove the custom image from each selected icon"
-msgstr "Elimina la imatge personalitzada de cada icona seleccionada"
+#: src/file-manager/fm-error-reporting.c:72
+msgid "Error Displaying Folder"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3601
+#: src/file-manager/fm-error-reporting.c:103
+#, fuzzy, c-format
 msgid ""
-"This link can't be used, because it has no target. Do you want to put this "
-"link in the trash?"
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
+"El nom \"%s\" ja està utilitzat en aquest directori.\n"
+"Si us plau utilitzeu un nom diferent."
 
-#: src/file-manager/fm-directory-view.c:3604
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to put this link in the trash?"
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3610
-msgid "Broken Link"
-msgstr ""
+#: src/file-manager/fm-error-reporting.c:113
+#, fuzzy, c-format
+msgid "You do not have the permissions necessary to rename \"%s\"."
+msgstr "No teniu els permissos necessaris per a reanomenar \"%s.\""
 
-#: src/file-manager/fm-directory-view.c:3611
-msgid "Throw Away"
+#: src/file-manager/fm-error-reporting.c:118
+#, fuzzy, c-format
+msgid ""
+"The name \"%s\" is not valid because it contains the character \"/\". Please "
+"use a different name."
 msgstr ""
+"El nom \"%s\" ja està utilitzat en aquest directori.\n"
+"Si us plau utilitzeu un nom diferent."
 
-#: src/file-manager/fm-error-reporting.c:50
+#: src/file-manager/fm-error-reporting.c:122
 #, fuzzy, c-format
-msgid ""
-"The name \"%s\" is already used in this folder.\n"
-"Please use a different name."
+msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr ""
 "El nom \"%s\" ja està utilitzat en aquest directori.\n"
 "Si us plau utilitzeu un nom diferent."
 
-#: src/file-manager/fm-error-reporting.c:55
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
-msgid "You do not have the permissions necessary to rename \"%s.\""
-msgstr "No teniu els permissos necessaris per a reanomenar \"%s.\""
+msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
+msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:64
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "No s'ha pogut reanomenar \"%s\" a \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:69
+#: src/file-manager/fm-error-reporting.c:144
 #, fuzzy
 msgid "Renaming Error"
 msgstr "S'està canviant el nom de %s a %s."
 
-#: src/file-manager/fm-error-reporting.c:85
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "No teniu els permissos necessaris per a canviar el grup de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:93
+#: src/file-manager/fm-error-reporting.c:168
+#, c-format
+msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "No s'ha pogut canviar el grup de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:97
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:115
+#: src/file-manager/fm-error-reporting.c:202
+#, c-format
+msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "No s'ha pogut canviar el propietari de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:119
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:137
+#: src/file-manager/fm-error-reporting.c:234
+#, fuzzy, c-format
+msgid ""
+"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgstr "No s'han pogut canviar els permissos de \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "No s'han pogut canviar els permissos de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:141
+#: src/file-manager/fm-error-reporting.c:244
 #, fuzzy
 msgid "Error Setting Permissions"
 msgstr "permissos en octal"
 
-#: src/file-manager/fm-error-reporting.c:214
-#, c-format
-msgid "Renaming %s to %s."
+#: src/file-manager/fm-error-reporting.c:310
+#, fuzzy, c-format
+msgid "Renaming \"%s\" to \"%s\"."
 msgstr "S'està canviant el nom de %s a %s."
 
-#: src/file-manager/fm-error-reporting.c:226
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "Cancel·lar en canvi de nom?"
 
-#: src/file-manager/fm-icon-text-window.c:75
+#: src/file-manager/fm-icon-text-window.c:77
 msgid "size"
 msgstr "mida"
 
-#: src/file-manager/fm-icon-text-window.c:76
+#: src/file-manager/fm-icon-text-window.c:78
 msgid "type"
 msgstr "tipus"
 
-#: src/file-manager/fm-icon-text-window.c:77
+#: src/file-manager/fm-icon-text-window.c:79
 msgid "date modified"
 msgstr "data de modificació"
 
-#: src/file-manager/fm-icon-text-window.c:78
+#: src/file-manager/fm-icon-text-window.c:80
 msgid "date changed"
 msgstr "data de canvi"
 
-#: src/file-manager/fm-icon-text-window.c:79
+#: src/file-manager/fm-icon-text-window.c:81
 msgid "date accessed"
 msgstr "data d'accés"
 
-#: src/file-manager/fm-icon-text-window.c:80
+#: src/file-manager/fm-icon-text-window.c:82
 msgid "owner"
 msgstr "propietari"
 
-#: src/file-manager/fm-icon-text-window.c:81
+#: src/file-manager/fm-icon-text-window.c:83
 msgid "group"
 msgstr "grup"
 
-#: src/file-manager/fm-icon-text-window.c:82
+#: src/file-manager/fm-icon-text-window.c:84
 msgid "permissions"
 msgstr "permissos"
 
-#: src/file-manager/fm-icon-text-window.c:83
+#: src/file-manager/fm-icon-text-window.c:85
 msgid "octal permissions"
 msgstr "permissos en octal"
 
-#: src/file-manager/fm-icon-text-window.c:84
+#: src/file-manager/fm-icon-text-window.c:86
 msgid "MIME type"
 msgstr "tipus MIME"
 
-#: src/file-manager/fm-icon-text-window.c:85
+#: src/file-manager/fm-icon-text-window.c:87
 msgid "none"
 msgstr "cap"
 
-#: src/file-manager/fm-icon-text-window.c:260
+#: src/file-manager/fm-icon-text-window.c:263
 #, fuzzy
 msgid "Icon Captions"
 msgstr "Títol de les _icones..."
 
-#: src/file-manager/fm-icon-text-window.c:267
+#: src/file-manager/fm-icon-text-window.c:271
 msgid ""
 "Choose the order for information to appear beneath icon names. More "
 "information appears as you zoom in closer."
@@ -3159,194 +7435,127 @@ msgstr ""
 "Trieu l'ordre en què ha d'aparéixer la informació a sota dels noms de les "
 "icones. Apareixerà més informació a mida que amplieu el zoom."
 
-#: src/file-manager/fm-icon-view.c:137
+#: src/file-manager/fm-icon-view.c:168
 #, fuzzy
 msgid "by _Name"
 msgstr "Ordena per _nom"
 
-#: src/file-manager/fm-icon-view.c:138
+#: src/file-manager/fm-icon-view.c:169
+#: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "Mantenir les icones ordenades per nom en columnes"
 
-#: src/file-manager/fm-icon-view.c:144
+#: src/file-manager/fm-icon-view.c:175
 #, fuzzy
 msgid "by _Size"
 msgstr "Ordena per _mida"
 
-#: src/file-manager/fm-icon-view.c:145
+#: src/file-manager/fm-icon-view.c:176
+#: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "Mantenir les icones ordenades per mida en columnes"
 
-#: src/file-manager/fm-icon-view.c:151
+#: src/file-manager/fm-icon-view.c:182
 #, fuzzy
 msgid "by _Type"
 msgstr "Ordena per _tipus"
 
-#: src/file-manager/fm-icon-view.c:152
+#: src/file-manager/fm-icon-view.c:183
+#: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "Mantenir les icones ordenades per tipus en columnes"
 
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:189
 #, fuzzy
 msgid "by Modification _Date"
 msgstr "Ordena per _data de modificació"
 
-#: src/file-manager/fm-icon-view.c:159
+#: src/file-manager/fm-icon-view.c:190
+#: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Mantenir les icones ordenades per data de modificació en columnes"
 
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:196
 #, fuzzy
 msgid "by _Emblems"
 msgstr "Ordena per _emblemes"
 
-#: src/file-manager/fm-icon-view.c:166
+#: src/file-manager/fm-icon-view.c:197
+#: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Mantenir les icones ordenades per emblemes en columnes"
 
-#: src/file-manager/fm-icon-view.c:435
-msgid "_Stretch Icon"
-msgstr "_Estira la icona"
-
-#: src/file-manager/fm-icon-view.c:443
+#: src/file-manager/fm-icon-view.c:1241
+#: src/file-manager/nautilus-icon-view-ui.xml.h:39
 #, fuzzy
 msgid "_Restore Icons' Original Sizes"
 msgstr "_Restaura les icones a la mida sense estirar"
 
-#: src/file-manager/fm-icon-view.c:445
+#: src/file-manager/fm-icon-view.c:1242
 #, fuzzy
 msgid "_Restore Icon's Original Size"
 msgstr "_Restaura les icones a la mida sense estirar"
 
-#: src/file-manager/fm-icon-view.c:449
-msgid "_Icon Captions..."
-msgstr "Títol de les _icones..."
-
-#. Modify file name. We only allow this on a single file selection.
-#: src/file-manager/fm-icon-view.c:452
-msgid "_Rename"
-msgstr "_Reanomena"
-
-#: src/file-manager/fm-icon-view.c:456
-msgid "_Clean Up by Name"
-msgstr ""
-
-#: src/file-manager/fm-icon-view.c:459
-msgid "_Use Tighter Layout"
-msgstr ""
-
-#: src/file-manager/fm-icon-view.c:463
-msgid "Re_versed Order"
-msgstr ""
-
-#: src/file-manager/fm-icon-view.c:467
-#, fuzzy
-msgid "_Lay out items"
-msgstr "_Format"
-
-#: src/file-manager/fm-icon-view.c:470
-#, fuzzy
-msgid "_manually"
-msgstr "Manual"
-
-#: src/file-manager/fm-icon-view.c:1542
-msgid "Choose which information appears beneath each icon's name"
-msgstr "Trieu quina informació apareix a sota el cada nom de cada icona"
-
-#: src/file-manager/fm-icon-view.c:1548
-msgid "Make the selected icon stretchable"
-msgstr "Fés estirable la icona seleccionada"
-
-#: src/file-manager/fm-icon-view.c:1554
-msgid "Restore each selected icon to its original size"
-msgstr "Restaura cada icona seleccionada a la seua mida original"
-
-#: src/file-manager/fm-icon-view.c:1571
-msgid "Choose an order for the icons in this folder"
-msgstr ""
-
-#: src/file-manager/fm-icon-view.c:1577
-msgid "Leave icons wherever they are dropped"
-msgstr "Deixa les icones allà on han estat soltades"
-
-#: src/file-manager/fm-icon-view.c:1600
-msgid "Toggle using a tighter layout scheme"
-msgstr ""
-
-#: src/file-manager/fm-icon-view.c:1607
-msgid "Display icons in the opposite order"
-msgstr ""
-
-#: src/file-manager/fm-icon-view.c:1616
-msgid "Reposition icons to better fit in the window and avoid overlapping"
-msgstr ""
-
-#: src/file-manager/fm-icon-view.c:1625
-msgid "Rename selected item"
-msgstr "Reanomena l'element seleccionat"
-
-#: src/file-manager/fm-icon-view.c:1836
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "s'està apuntant a \"%s\""
 
-#: src/file-manager/fm-list-view.c:1763
-#: src/file-manager/fm-search-list-view.c:250
-#: src/nautilus-search-bar-criterion.c:69
+#: src/file-manager/fm-list-view.c:2188
+#: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Mida"
 
-#: src/file-manager/fm-list-view.c:1769
-#: src/file-manager/fm-search-list-view.c:256
-#: src/nautilus-search-bar-criterion.c:68
+#: src/file-manager/fm-list-view.c:2194
+#: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Tipus"
 
-#: src/file-manager/fm-list-view.c:1775
-#: src/file-manager/fm-search-list-view.c:262
+#: src/file-manager/fm-list-view.c:2200
+#: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Data de modificació"
 
-#: src/file-manager/fm-properties-window.c:458
+#: src/file-manager/fm-properties-window.c:522
 #, fuzzy, c-format
 msgid "%s Properties"
 msgstr "Mostra les _Propietats"
 
-#: src/file-manager/fm-properties-window.c:590
+#: src/file-manager/fm-properties-window.c:717
 msgid "Cancel Group Change?"
 msgstr "Voleu cancel·lar el canvi de grup?"
 
-#: src/file-manager/fm-properties-window.c:591
+#: src/file-manager/fm-properties-window.c:718
 msgid "Changing group"
 msgstr "S'està canviant el grup"
 
-#: src/file-manager/fm-properties-window.c:736
+#: src/file-manager/fm-properties-window.c:879
 msgid "Cancel Owner Change?"
 msgstr "Voleu cancel·lar el canvi de propietari?"
 
-#: src/file-manager/fm-properties-window.c:737
+#: src/file-manager/fm-properties-window.c:880
 msgid "Changing owner"
 msgstr "S'està canviant el propietari"
 
-#: src/file-manager/fm-properties-window.c:894
+#: src/file-manager/fm-properties-window.c:1063
 msgid "nothing"
 msgstr "res"
 
-#: src/file-manager/fm-properties-window.c:896
+#: src/file-manager/fm-properties-window.c:1065
 msgid "unreadable"
 msgstr "il·legible"
 
-#: src/file-manager/fm-properties-window.c:905
+#: src/file-manager/fm-properties-window.c:1074
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 element, amb mida %s"
 
-#: src/file-manager/fm-properties-window.c:907
+#: src/file-manager/fm-properties-window.c:1076
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d elements, amb un total de %s"
 
-#: src/file-manager/fm-properties-window.c:913
+#: src/file-manager/fm-properties-window.c:1082
 msgid "(some contents unreadable)"
 msgstr "(alguns continguts són il·legibles)"
 
@@ -3355,116 +7564,334 @@ msgstr "(alguns continguts són il·legibles)"
 #. * "Contents:" title to line up with the first line of the 2-line value.
 #. * Maybe there's a better way to do this, but I couldn't think of one.
 #.
-#: src/file-manager/fm-properties-window.c:927
+#: src/file-manager/fm-properties-window.c:1096
 msgid "Contents:"
 msgstr "Continguts:"
 
-#: src/file-manager/fm-properties-window.c:1081
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "Bàsic"
 
-#: src/file-manager/fm-properties-window.c:1145
-msgid "Where:"
-msgstr "On:"
-
-#: src/file-manager/fm-properties-window.c:1147
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Tipus:"
 
-#: src/file-manager/fm-properties-window.c:1153
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "Mida:"
 
-#: src/file-manager/fm-properties-window.c:1156
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "Configuració dels enllaços"
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
+msgstr "Tipus MIME:"
+
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "Modificat:"
 
-#: src/file-manager/fm-properties-window.c:1158
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "Amb accés:"
 
-#: src/file-manager/fm-properties-window.c:1161
-msgid "MIME type:"
-msgstr "Tipus MIME:"
-
-#: src/file-manager/fm-properties-window.c:1290
-msgid "Emblems"
-msgstr "Emblemes"
+#: src/file-manager/fm-properties-window.c:1552
+msgid "Select Custom Icon..."
+msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1523
-msgid "Special Flags:"
-msgstr "Senyaladors especials:"
+#: src/file-manager/fm-properties-window.c:1558
+#, fuzzy
+msgid "Remove Custom Icon"
+msgstr "_Elimina la Imatge Personalitzada"
 
-#: src/file-manager/fm-properties-window.c:1527
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "Defineix ID d'usuari"
 
-#: src/file-manager/fm-properties-window.c:1531
+#: src/file-manager/fm-properties-window.c:1891
+msgid "Special Flags:"
+msgstr "Senyaladors especials:"
+
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "Defineix ID de grup"
 
-#: src/file-manager/fm-properties-window.c:1535
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "Enganxós"
 
-#: src/file-manager/fm-properties-window.c:1546
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Permissos"
 
-#: src/file-manager/fm-properties-window.c:1552
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "No sóu el propietari, podeu, però, canviar aquestos permissos"
 
-#: src/file-manager/fm-properties-window.c:1579
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "Propietari del fitxer:"
 
-#: src/file-manager/fm-properties-window.c:1589
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "Grup del fitxer:"
 
-#: src/file-manager/fm-properties-window.c:1607
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "Propietari:"
 
-#: src/file-manager/fm-properties-window.c:1610
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "Grup:"
 
-#: src/file-manager/fm-properties-window.c:1613
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "Altres:"
 
-#: src/file-manager/fm-properties-window.c:1616
+#: src/file-manager/fm-properties-window.c:1989
+msgid "Read"
+msgstr "Lectura"
+
+#: src/file-manager/fm-properties-window.c:1993
+msgid "Write"
+msgstr "Escritura"
+
+#: src/file-manager/fm-properties-window.c:1997
+msgid "Execute"
+msgstr "Execució"
+
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "Vista de text:"
 
-#: src/file-manager/fm-properties-window.c:1619
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "Vista de nombre:"
 
-#: src/file-manager/fm-properties-window.c:1622
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "Últim canvi:"
 
-#: src/file-manager/fm-properties-window.c:1626
-msgid "Read"
-msgstr "Lectura"
+#: src/file-manager/fm-properties-window.c:2054
+#, c-format
+msgid "The permissions of \"%s\" could not be determined."
+msgstr "No s'han pogut determinar els permisos de \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:1630
-msgid "Write"
-msgstr "Escritura"
+#: src/file-manager/fm-properties-window.c:2334
+#, fuzzy
+msgid "Cancel Showing Properties Window?"
+msgstr "Selecciona tots els elements d'aquesta finestra"
 
-#: src/file-manager/fm-properties-window.c:1634
-msgid "Execute"
-msgstr "Execució"
+#: src/file-manager/fm-properties-window.c:2335
+#, fuzzy
+msgid "Creating Properties window"
+msgstr "Selecciona tots els elements d'aquesta finestra"
 
-#: src/file-manager/fm-properties-window.c:1696
+#: src/file-manager/fm-properties-window.c:2435
+#, fuzzy
+msgid "Select an icon:"
+msgstr "Seleccioneu un color per a afegir:"
+
+#: src/file-manager/fm-search-list-view.c:124
+#, fuzzy
+msgid "Search Results"
+msgstr "Resultats"
+
+#: src/file-manager/fm-search-list-view.c:142
 #, c-format
-msgid "The permissions of \"%s\" could not be determined."
-msgstr "No s'han pogut determinar els permisos de \"%s\"."
+msgid ""
+"Search results may not include items modified after %s, when your drive was "
+"last indexed."
+msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:158
+msgid ""
+"Sorry, but the Medusa search service is not available because it is not "
+"installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:159
+#: src/file-manager/nautilus-indexing-info.c:407
+msgid "Search Service Not Available"
+msgstr ""
+
+#. FIXME bugzilla.eazel.com 5058: Should be two messages, one for each of whether
+#. "slow complete search" turned on or not
+#: src/file-manager/fm-search-list-view.c:184
+msgid ""
+"The search you have selected is newer than the index on your system.  The "
+"search will return no results right now.  Would you like to create a new "
+"index now?"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:189
+msgid "Search for items that are too new"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
+msgid "Create a new index"
+msgstr "Crea una nova finestra"
+
+#: src/file-manager/fm-search-list-view.c:191
+msgid "Don't create index"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:200
+msgid ""
+"Every indexed file on your computer matches the criteria you selected. You "
+"can check the spelling on your selections or add more criteria to narrow "
+"your results."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:204
+#: src/file-manager/fm-search-list-view.c:218
+#, fuzzy
+msgid "Error during search"
+msgstr "Hi ha hagut un error en moure a la paperera"
+
+#: src/file-manager/fm-search-list-view.c:213
+#, c-format
+msgid "An error occurred while loading this search's contents: %s"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:241
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Find can't access your index right now so a slower search will be performed "
+"that doesn't use the index."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:246
+msgid ""
+"To do a content search, Find requires an index of the files on your system.  "
+"Find can't access your index right now. "
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast searches are not available"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:319
+#: src/file-manager/fm-search-list-view.c:338
+msgid "Content searches are not available"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:254
+msgid ""
+"Your index files are available but the Medusa search daemon, which handles "
+"index requests, isn't running.  To start this program, log in as root and "
+"enter this command at the command line: medusa-searchd"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:274
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Your computer does not have an index right now.  Because Find cannot use an "
+"index, this search may take several minutes.  Would you like to create an "
+"index? Creating an index will be done while you are not actively using your "
+"computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:283
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  Your computer does not have an index right now.  Would you like to "
+"create an index?  Creating an index will be done while you are not actively "
+"using your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:290
+#: src/file-manager/fm-search-list-view.c:318
+#: src/file-manager/fm-search-list-view.c:337
+msgid "Indexed searches are not available"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:294
+#, fuzzy
+msgid "Create an Index"
+msgstr "Crea una nova finestra"
+
+#: src/file-manager/fm-search-list-view.c:295
+#, fuzzy
+msgid "Don't Create an Index Now"
+msgstr "Crea una nova finestra"
+
+#: src/file-manager/fm-search-list-view.c:306
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Your computer is currently creating that index.   Because Find cannot use an "
+"index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:312
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  Your computer is currently creating that index.  Content searches "
+"will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:326
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  An "
+"index can't be created right now. When an index is not available, searches "
+"will take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:332
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  An index can't be created right now."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:341
+msgid ""
+"The program that creates an index is not set up correctly.  You can create "
+"an index by hand by running \"medusa-indexd\" as root on the command line."
+msgstr ""
+
+#. It is not necessary to translate this text just yet; it has not been
+#. edited yet, and will be replaced by a final copy in a few days.
+#: src/file-manager/fm-search-list-view.c:360
+#: src/file-manager/nautilus-indexing-info.c:342
+msgid ""
+"To do a fast search, Find requires an index of the files on your system. "
+"Your system administrator has disabled fast search on your computer, so no "
+"index is available."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:364
+msgid "Fast searches are not available on your computer"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:373
+#: src/file-manager/nautilus-indexing-info.c:361
+msgid ""
+"To do a fast search, Find requires an index of the files on your system. "
+"Fast search is disabled in your Search preferences, so no index is available."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:376
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
+msgid "Fast searches are not available on your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:377
+#: src/file-manager/nautilus-indexing-info.c:366
+msgid ""
+"To enable fast search, open the Preferences menu and choose Preferences. "
+"Then select Search preferences and put a checkmark in the Enable Fast Search "
+"checkbox. An index will be generated while your computer is idle, so your "
+"index won't be available immediately."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:551
 #, fuzzy
 msgid "Where"
 msgstr "On:"
@@ -3474,7 +7901,8 @@ msgstr "On:"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:297
+#: src/file-manager/fm-search-list-view.c:603
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 #, fuzzy
 msgid "_Reveal in New Window"
 msgstr "Obre en una _Nova Finestra"
@@ -3485,130 +7913,610 @@ msgstr "Obre en una _Nova Finestra"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:305
+#: src/file-manager/fm-search-list-view.c:611
 #, fuzzy, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Obre en %d _Noves Finestres"
 
-#: src/file-manager/fm-search-list-view.c:451
-#: src/file-manager/nautilus-indexing-info.c:282
-msgid "Indexing Info..."
+#. Note that the number of items actually displayed varies somewhat due
+#. * to the way files are collected in batches. So you can't assume that
+#. * no more than the constant limit are displayed.
+#.
+#: src/file-manager/fm-search-list-view.c:723
+msgid ""
+"Nautilus found more search results than it can display. Some matching items "
+"will not be displayed. "
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:452
-msgid "Show indexing info dialog"
+#: src/file-manager/fm-search-list-view.c:725
+msgid "Too Many Matches"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:464
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:1
 #, fuzzy
-msgid "Reveal each selected item in its original folder"
+msgid "Change Desktop Background"
+msgstr "Reinicialitza el fons"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#, fuzzy
+msgid "Delete all items in the Trash"
+msgstr "Suprimeix tots els elements de la paperera"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
+msgid "Disks"
+msgstr "Discos"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:5
+msgid "Mount or unmount disks"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:6
+msgid "New Terminal"
+msgstr "Nova terminal"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:7
+#, fuzzy
+msgid "Open a new GNOME terminal window"
+msgstr "Obre cada element seleccionat en una nova finestra"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:8
+msgid "Remove any custom pattern or color from the desktop background"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
+#, fuzzy
+msgid "Reset Desktop Background"
+msgstr "Reinicialitza el fons"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:10
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+msgid "Choose a program with which to open the selected item"
+msgstr "Tria un programa amb el què obrir l'element seleccionat"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:2
+msgid "Choose another application with which to open the selected item"
+msgstr "Tria una altra aplicació amb la què obrir l'element seleccionat"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:3
+msgid "Choose another viewer with which to view the selected item"
+msgstr "Tria un altre visualitzador amb el què veure l'element seleccionat"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:4
+#, fuzzy
+msgid "Copy Files"
+msgstr "S'estàn copiant els fitxers"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
+#, fuzzy
+msgid "Create a new empty folder inside this folder"
+msgstr "Crea una nova carpeta en aquesta finestra"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#, fuzzy
+msgid "Create a symbolic link for each selected item"
+msgstr "Suprimeix tots els elements seleccionats"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u fitxers"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "Mou tots els elements seleccionats a la Paperera"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#, fuzzy
+msgid "Duplicate"
+msgstr "_Duplica"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#, fuzzy
+msgid "Duplicate each selected item"
+msgstr "Duplica tots els elements seleccionats"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+msgid "Make Link"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#, fuzzy
+msgid "Move each selected item to the Trash"
+msgstr "Mou tots els elements seleccionats a la Paperera"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#, fuzzy
+msgid "Move to Trash"
+msgstr "_Mou a la Paperera"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+msgid "New Folder"
+msgstr "Nova Carpeta"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#, fuzzy
+msgid "Open"
+msgstr "_Obre"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#, fuzzy
+msgid "Open Wit_h"
+msgstr "Obre amb"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "Open With"
+msgstr "Obre amb"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+msgid "Open each selected item in a new window"
+msgstr "Obre cada element seleccionat en una nova finestra"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#, fuzzy
+msgid "Open in New Window"
+msgstr "Obre en una _Nova Finestra"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+msgid "Open the selected item in this window"
+msgstr "Obre l'element seleccionat en aquest finestra"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+msgid "Other Application..."
+msgstr "Una altra aplicació...."
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+msgid "Other Viewer..."
+msgstr "Un altre visualitzador..."
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "fitxer de text"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#, fuzzy
+msgid "Remove Custom Images"
+msgstr "_Elimina les Imatges Personalitzades"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#, fuzzy
+msgid "Remove any custom images from selected icons"
+msgstr "Elimina la imatge personalitzada de cada icona seleccionada"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+msgid "Remove any custom pattern or color from the background of this location"
+msgstr ""
+
+#. add the reset background item, possibly disabled
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
+msgid "Reset Background"
+msgstr "Reinicialitza el fons"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+msgid "Scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#, fuzzy
+msgid "Select All Files"
+msgstr "_Selecciona-ho Tot"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#, fuzzy
+msgid "Select _All Files"
+msgstr "_Selecciona-ho Tot"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+msgid "Select all items in this window"
+msgstr "Selecciona tots els elements d'aquesta finestra"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#, fuzzy
+msgid "Show Properties"
+msgstr "Mostra les _Propietats"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#, fuzzy
+msgid "Show Trash"
+msgstr "Barra d'eines"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+msgid "Show _Properties"
+msgstr "Mostra les _Propietats"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#, fuzzy
+msgid "Show the contents of the Trash"
+msgstr "(alguns continguts són il·legibles)"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "View or modify the properties of each selected item"
+msgstr "Visualitza o modfica les propietats dels elements seleccionats"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+msgid "_Duplicate"
+msgstr "_Duplica"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#, fuzzy
+msgid "_New Folder"
+msgstr "Nova Carpeta"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+msgid "_Open"
+msgstr "_Obre"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "_Enganxa el text"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
+#, fuzzy
+msgid "_Show Trash"
+msgstr "_Buida la Paperera"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#, fuzzy
+msgid "By Emblems"
+msgstr "Ordena per _emblemes"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:2
+#, fuzzy
+msgid "By Modification Date"
+msgstr "Ordena per _data de modificació"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:3
+#, fuzzy
+msgid "By Modification _Date"
+msgstr "Ordena per _data de modificació"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:4
+#, fuzzy
+msgid "By Name"
+msgstr "Ordena per _nom"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:5
+#, fuzzy
+msgid "By Size"
+msgstr "Ordena per _mida"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:6
+#, fuzzy
+msgid "By Type"
+msgstr "Ordena per _tipus"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:7
+#, fuzzy
+msgid "By _Emblems"
+msgstr "Ordena per _emblemes"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:8
+#, fuzzy
+msgid "By _Name"
+msgstr "Ordena per _nom"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:9
+#, fuzzy
+msgid "By _Size"
+msgstr "Ordena per _mida"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:10
+#, fuzzy
+msgid "By _Type"
+msgstr "Ordena per _tipus"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:11
+msgid "Choose which information appears beneath each icon's name"
+msgstr "Trieu quina informació apareix a sota el cada nom de cada icona"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:12
+msgid "Clean Up by Name"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:13
+msgid "Display icons in the opposite order"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:14
+#, fuzzy
+msgid "Icon Captions..."
+msgstr "Títol de les _icones..."
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:20
+#, fuzzy
+msgid "Lay Out Items"
+msgstr "_Format"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:21
+msgid "Leave icons wherever they are dropped"
+msgstr "Deixa les icones allà on han estat soltades"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:22
+msgid "Make the selected icon stretchable"
+msgstr "Fés estirable la icona seleccionada"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:23
+#, fuzzy
+msgid "Manually"
+msgstr "Manual"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:24
+msgid "Re_versed Order"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:26
+#, fuzzy
+msgid "Rename selected icon"
+msgstr "Reanomena l'element seleccionat"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:27
+msgid "Reposition icons to better fit in the window and avoid overlapping"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:28
+#, fuzzy
+msgid "Restore Icons' Original Sizes"
+msgstr "_Restaura les icones a la mida sense estirar"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:29
+msgid "Restore each selected icon to its original size"
 msgstr "Restaura cada icona seleccionada a la seua mida original"
 
-#: src/file-manager/nautilus-indexing-info.c:106
-msgid "Busy"
+#: src/file-manager/nautilus-icon-view-ui.xml.h:30
+msgid "Reversed Order"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:109
-msgid "No response"
+#: src/file-manager/nautilus-icon-view-ui.xml.h:31
+#, fuzzy
+msgid "Stretch Icon"
+msgstr "_Estira la icona"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:32
+msgid "Tighter Layout"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:112
-msgid "No indexer present"
+#: src/file-manager/nautilus-icon-view-ui.xml.h:33
+msgid "Toggle using a tighter layout scheme"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:120
-#, c-format
-msgid "Error while trying to reindex: %s"
+#: src/file-manager/nautilus-icon-view-ui.xml.h:34
+msgid "_Clean Up by Name"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:163
-msgid "%I:%M %p, %x"
+#: src/file-manager/nautilus-icon-view-ui.xml.h:35
+msgid "_Icon Captions..."
+msgstr "Títol de les _icones..."
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:36
+#, fuzzy
+msgid "_Lay Out Items"
+msgstr "_Format"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:37
+#, fuzzy
+msgid "_Manually"
+msgstr "Manual"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:38
+msgid "_Rename"
+msgstr "_Reanomena"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:40
+msgid "_Stretch Icon"
+msgstr "_Estira la icona"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:41
+msgid "_Tighter Layout"
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:85
+msgid "Indexing is %d%% complete."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:175
+msgid "The indexer is currently busy."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:180
+msgid ""
+"An indexer is not running, or is not responding to requests to reindex your "
+"computer."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:179
+#: src/file-manager/nautilus-indexing-info.c:185
+msgid ""
+"An attempt to reindex, caused an Internal Indexer Error.  Tell "
+"rebecka@eazel.com"
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:194
+#, fuzzy
+msgid "Reindexing Failed"
+msgstr "La desinstal·lació ha fallat"
+
+#: src/file-manager/nautilus-indexing-info.c:216
+msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast. If you need to update your index now, click on the \"Update Now\" "
+"button."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:219
+#: src/file-manager/nautilus-indexing-info.c:226
+#: src/file-manager/nautilus-indexing-info.c:281
+#, fuzzy
+msgid "Indexing Status"
+msgstr "Barra d'estat"
+
+#. FIXME: Do we want to talk about the index not being available?
+#: src/file-manager/nautilus-indexing-info.c:224
+msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast. "
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:236
 #, c-format
 msgid "Your files were last indexed at %s"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:190
+#: src/file-manager/nautilus-indexing-info.c:249
 #, fuzzy
 msgid "Update Now"
 msgstr "Actualitza"
 
-#: src/file-manager/nautilus-indexing-info.c:210
-msgid "Your files are currently being indexed:"
+#: src/file-manager/nautilus-indexing-info.c:279
+msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast.  Your files are currently being indexed."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:270
-msgid "Search service not available"
+#: src/file-manager/nautilus-indexing-info.c:406
+msgid "Sorry, but the medusa search service is not available."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:295
-msgid ""
-"Once a day your files and text content are indexed so\n"
-"your searches are fast.  If you need to update your index\n"
-"now, click on the \"Update Now\" button for the\n"
-"appropriate index.\n"
+#: src/file-manager/nautilus-indexing-info.c:428
+msgid "%I:%M %p, %x"
 msgstr ""
 
-#. set the window title
-#: src/nautilus-about.c:142
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:1
 #, fuzzy
-msgid "About Nautilus"
-msgstr "_Quant al Nautilus"
+msgid "Reveal each selected item in its original folder"
+msgstr "Restaura cada icona seleccionada a la seua mida original"
 
-#: src/nautilus-application.c:217
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:2
 #, fuzzy
-msgid "User Directory"
-msgstr "Directori"
+msgid "Reveal in New Window"
+msgstr "Obre en una _Nova Finestra"
 
-#: src/nautilus-application.c:222
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:3
 #, fuzzy
-msgid "User Main Directory"
-msgstr "Directori"
+msgid "Show Indexing Status"
+msgstr "Barra d'estat"
 
-#: src/nautilus-application.c:227
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:4
 #, fuzzy
-msgid "Desktop Directory"
-msgstr "Directori"
+msgid "Show _Indexing Status"
+msgstr "Barra d'estat"
 
-#: src/nautilus-application.c:242
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:5
+msgid "Show status of indexing used when searching"
+msgstr ""
+
+#. set the window title and standard close key accelerator
+#: src/nautilus-about.c:141
 #, fuzzy
-msgid "Missing Directories"
-msgstr "0 directoris"
+msgid "About Nautilus"
+msgstr "_Quant al Nautilus"
+
+#. draw the authors title
+#: src/nautilus-about.c:361
+msgid "Authors"
+msgstr ""
+
+#: src/nautilus-application.c:275
+#, fuzzy
+msgid "Couldn't Create Required Folder"
+msgstr "No s'ha pogut obtenir el cos de la sol·licitud!"
+
+#: src/nautilus-application.c:276
+#, c-format
+msgid ""
+"Nautilus could not create the required folder \"%s\". Before running "
+"Nautilus, please create this folder, or set permissions such that Nautilus "
+"can create it."
+msgstr ""
+
+#: src/nautilus-application.c:281
+#, fuzzy
+msgid "Couldn't Create Required Folders"
+msgstr "No s'ha pogut crear el mapa de píxels a partir del fitxer: %s"
+
+#: src/nautilus-application.c:282
+#, c-format
+msgid ""
+"Nautilus could not create the following required folders:\n"
+"\n"
+"%s\n"
+"\n"
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
+msgstr ""
 
 #. Can't register myself due to trouble locating the
-#. * nautilus.oafinfo file. This has happened when you
+#. * Nautilus_Shell.oaf file. This has happened when you
 #. * launch Nautilus with an LD_LIBRARY_PATH that
 #. * doesn't include the directory containg the oaf
 #. * library. It could also happen if the
-#. * nautilus.oafinfo file was not present for some
+#. * Nautilus_Shell.oaf file was not present for some
 #. * reason. Sometimes killing oafd and gconfd fixes
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:338
+#: src/nautilus-application.c:407
 msgid ""
-"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
-"again may fix the problem."
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again."
 msgstr ""
-"El Nautilus no es pot utilitzar ara. Reiniciar l'ordinador o instalar el "
-"Nautilus altra vegada pot arreglar el problema."
 
 #. FIXME bugzilla.eazel.com 2536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:342
+#: src/nautilus-application.c:413
+#, fuzzy
 msgid ""
-"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
-"again may fix the problem.\n"
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again.\n"
 "\n"
-"OAF couldn't locate the nautilus.oafinfo file. One cause of this seems to be "
-"an LD_LIBRARY_PATH that does not include the oaf library's directory. "
-"Another possible cause would be bad install with a missing nautilus.oafinfo "
-"file.\n"
+"OAF couldn't locate the Nautilus_shell.oaf file. One cause of this seems to "
+"be an LD_LIBRARY_PATH that does not include the oaf library's directory. "
+"Another possible cause would be bad install with a missing "
+"Nautilus_Shell.oaf file.\n"
+"\n"
+"Running \"nautilus-clean.sh -x\" will kill all OAF and GConf processes, "
+"which may be needed by other applications.\n"
 "\n"
 "Sometimes killing oafd and gconfd fixes the problem, but we don't know why.\n"
 "\n"
-"We need a much less confusing message here for Nautilus 1.0."
+"We have also seen this error when a faulty version of oaf was installed."
 msgstr ""
 "El Nautilus no es pot utilitzar ara. Reiniciar l'ordinador o instalar el "
 "Nautilus altra vegada pot arreglar el problema.\n"
@@ -3632,11 +8540,12 @@ msgstr ""
 #. * wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:367 src/nautilus-application.c:385
+#: src/nautilus-application.c:444 src/nautilus-application.c:462
+#: src/nautilus-application.c:469
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "No es por utilitzar el Nautilus ara, degut a un error inesperat."
 
-#: src/nautilus-application.c:368
+#: src/nautilus-application.c:445
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
 "attempting to register the file manager view server."
@@ -3644,17 +8553,30 @@ msgstr ""
 "No es por utilitzar el Nautilus ara, degut a un error inesperat de l'OAF en "
 "intentar enregistrar el servidor de vistes del gestor de fitxers."
 
-#: src/nautilus-application.c:386
+#: src/nautilus-application.c:463
+#, fuzzy
+msgid ""
+"Nautilus can't be used now, due to an unexpected error from OAF when "
+"attempting to locate the factory.Killing oafd and restarting Nautilus may "
+"help fix the problem."
+msgstr ""
+"No es por utilitzar el Nautilus ara, degut a un error inesperat de l'OAF en "
+"intentar ubicar la fàbrica."
+
+#: src/nautilus-application.c:470
+#, fuzzy
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
-"attempting to locate the factory."
+"attempting to locate the shell object. Killing oafd and restarting Nautilus "
+"may help fix the problem."
 msgstr ""
 "No es por utilitzar el Nautilus ara, degut a un error inesperat de l'OAF en "
 "intentar ubicar la fàbrica."
 
-#: src/nautilus-application.c:527
+#: src/nautilus-application.c:635
+#, fuzzy
 msgid ""
-"You are running Nautilus as root.\n"
+"You are about to run Nautilus as root.\n"
 "\n"
 "As root, you can damage your system if you are not careful, and\n"
 "Nautilus will not stop you from doing it."
@@ -3664,711 +8586,1409 @@ msgstr ""
 "Com a superusuari, podeu malmetre el sistema si no teniu compte, i\n"
 "el Nautilus no us impedirà fer-ho."
 
-#: src/nautilus-bookmarks-window.c:133
+#: src/nautilus-bookmarks-window.c:127
 #, fuzzy
 msgid "Bookmarks"
 msgstr "_Preferits"
 
-#: src/nautilus-bookmarks-window.c:182
+#: src/nautilus-bookmarks-window.c:177
 msgid "Location"
 msgstr "Ubicació"
 
-#: src/nautilus-bookmarks-window.c:195 src/nautilus-window-menus.c:794
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Elimina"
 
-#: src/nautilus-bookmarks-window.c:200
-msgid "Include built-in bookmarks in menu"
-msgstr "Inclou la llista de preferits incorporada al menú"
+#: src/nautilus-complex-search-bar.c:233
+#, fuzzy
+msgid "More Options"
+msgstr "Títol de les _icones..."
+
+#: src/nautilus-complex-search-bar.c:243
+msgid "Fewer Options"
+msgstr ""
+
+#. Create button first so we can use it for auto_click
+#: src/nautilus-complex-search-bar.c:261 src/nautilus-simple-search-bar.c:129
+msgid "Find Them!"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:112
+#: src/nautilus-first-time-druid.c:191
 msgid ""
-"Existence of this file indicates that the Nautilus configuration wizard\n"
+"Existence of this file indicates that the Nautilus configuration druid\n"
 "has been presented.\n"
 "\n"
-"You can manually erase this file to present the wizard again.\n"
+"You can manually erase this file to present the druid again.\n"
 "\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:348
+#: src/nautilus-first-time-druid.c:487
 #, fuzzy
 msgid ""
-"User levels provide a way to adjust the software to\n"
-"your level of technical expertise.  Pick an initial level that you\n"
-"feel comfortable with; you can always change it later."
+"Your user level adjusts Nautilus to your degree of experience\n"
+"using GNOME and Linux. Choose a level that's comfortable for\n"
+"you - you can always change it later."
 msgstr ""
 "Els nivells d'usuari proporcionen una forma d'ajustar l'aplicació al vostre "
 "nivell de perícia tècnica. Trieu un nivell inicial amb el què us trobeu "
 "confortable; sempre podreu canvar-lo més tard."
 
-#: src/nautilus-first-time-druid.c:358
+#: src/nautilus-first-time-druid.c:498
 msgid ""
-"For beginner users that are not yet\n"
-"familiar with the working of GNOME and Linux."
+"For users who have no previous experience with GNOME\n"
+"and Linux."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:365
+#: src/nautilus-first-time-druid.c:504
 msgid ""
-"For non-technical users that are comfortable with\n"
-"their GNOME and Linux environment."
+"For users who are comfortable with GNOME and Linux,\n"
+"but don't describe themselves as ``technical.''"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:371
+#: src/nautilus-first-time-druid.c:510
 msgid ""
-"For users that have the need to be exposed\n"
-"to every detail of their operating system."
+"For users who have GNOME and Linux experience, and\n"
+"like to see every detail of the operating system."
 msgstr ""
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:406
-#, fuzzy
+#: src/nautilus-first-time-druid.c:548
 msgid ""
-"Eazel offers a growing number of services to \n"
-"help you install and maintain new software and manage \n"
-"your files across the network.  If you want to find out more \n"
-"about Eazel services, just press the 'Next' button. "
+"To verify your Internet connection and make sure you have\n"
+"the latest Nautilus updates, Nautilus will now connect to\n"
+"Eazel's web site. This will take seconds if your copy of\n"
+"Nautilus is recent; longer (but no more than a minute or two)\n"
+"if you need an update.\n"
+"\n"
+"If you know your computer uses a proxy connection, click\n"
+"Verify and Nautilus will use it.\n"
 msgstr ""
-"Eazel ofereix un creixent nombre de serveis per a ajudar-vos a instal·lar i "
-"mantenir noves aplicacions i gestionar els vostres fitxers a través de la "
-"xarxa. Si voleu buscar més sobre els serveis de l'Eazel, premeu el botó "
-"'Següent'."
 
-#: src/nautilus-first-time-druid.c:410
-msgid "Eazel Services"
-msgstr "Serveis de l'Eazel"
+#: src/nautilus-first-time-druid.c:562
+msgid "Verify my connection and check for updates"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:563
+msgid "Don't verify my connection or check for updates"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:628
+msgid ""
+"We are having trouble making an external web connection.\n"
+"Sometimes, firewalls require you to specify a web proxy server.\n"
+"Fill in the name or port of your proxy server, if any, below."
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:418
-msgid "I want to learn more about Eazel services."
-msgstr "Vull aprendre més sobre els serveis de l'Eazel."
+#: src/nautilus-first-time-druid.c:640
+msgid "No proxy server required."
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:419
-msgid "I want to sign up for Eazel services now."
-msgstr "Vull contractar els serveis de l'Eazel ara."
+#: src/nautilus-first-time-druid.c:641
+msgid "Use this proxy server:"
+msgstr ""
+
+#. allocate the proxy label, followed by the entry
+#: src/nautilus-first-time-druid.c:666
+msgid "Proxy address:"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:420
-msgid "I've already signed up and want to login now."
+#: src/nautilus-first-time-druid.c:728
+msgid "Verifying your Internet connection and checking for updates..."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:421
+#: src/nautilus-first-time-druid.c:736
 #, fuzzy
-msgid "I don't want to learn about Eazel services at this time."
-msgstr "No vull aprendre sobre els serveis de l'Eazel per ara."
+msgid "Downloading Nautilus updates..."
+msgstr "S'està descarregant %s..."
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:448
+#: src/nautilus-first-time-druid.c:906
 msgid ""
-"Nautilus will now contact Eazel services to verify your \n"
-"web connection and download the latest updates.  \n"
-"Click the Next button to continue."
+"If you have been using the GNOME Midnight Commander\n"
+"these settings move your desktop icons to Nautilus and\n"
+"make Nautilus the default desktop.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:452
-#, fuzzy
-msgid "Updating Nautilus"
-msgstr "Nautilus"
+#: src/nautilus-first-time-druid.c:913
+msgid "Use Nautilus to draw the desktop."
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:460
-msgid "Yes, verify my web connection and update Nautilus now."
+#: src/nautilus-first-time-druid.c:919
+msgid "Move existing desktop icons to the Nautilus desktop."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:461
-msgid "No, I don't wish to connect and update Nautilus now."
+#. This option is currently disabled, per bugzilla.eazel.com 7557
+#: src/nautilus-first-time-druid.c:927
+msgid "Launch Nautilus when GNOME starts up."
 msgstr ""
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:492
+#: src/nautilus-first-time-druid.c:967
 msgid ""
-"We are having troubles making an external web connection.  \n"
-"Sometimes, firewalls require you to specify a web proxy server.  \n"
-" Fill in the name of port of your proxy server, if any, below."
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties.  The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+"Fast search requires that the cron daemon on your system be running.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:496
-#, fuzzy
-msgid "HTTP Proxy Configuration"
-msgstr "Configuaració"
+#: src/nautilus-first-time-druid.c:972
+msgid ""
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties. The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:508
-msgid "No proxy server required."
+#: src/nautilus-first-time-druid.c:981
+msgid "Enable fast search"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:509
-msgid "Use this proxy server:"
+#: src/nautilus-first-time-druid.c:982
+msgid "Turn fast search on when cron is enabled"
 msgstr ""
 
-#. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:534
-msgid "Proxy address:"
+#: src/nautilus-first-time-druid.c:1027
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"currently can't be performed because the program crond, which does\n"
+"nightly tasks on your computer, is turned off. To make sure fast searches\n"
+"can be done, turn crond on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands \n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:551
-msgid "Port:"
+#: src/nautilus-first-time-druid.c:1035
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"may not be performed because the program crond, which does nightly tasks\n"
+"on your computer, may be turned off. To make sure fast searches can be\n"
+"done, check to make sure that crond is turned on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands\n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:582
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
-"We are now contacting the Eazel service to test your \n"
-"web connection and update Nautilus."
+"Click Finish to launch Nautilus. You'll start with two\n"
+"Nautilus windows: one shows your home folder, and the\n"
+"other tells you about Eazel's services that make the life\n"
+"of a Linux user easier.\n"
+"\n"
+"We hope you enjoy Nautilus!"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:587
-#, fuzzy
-msgid "Downloading Nautilus updates..."
-msgstr "S'està descarregant %s..."
+#: src/nautilus-first-time-druid.c:1129
+msgid ""
+"Click Finish to launch Nautilus. You'll start with a\n"
+"window showing your home folder.\n"
+"\n"
+"We hope you enjoy Nautilus!"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:678
+#: src/nautilus-first-time-druid.c:1153
 #, fuzzy
-msgid "Initial Preferences"
-msgstr "Nautilus: Preferències inicials"
+msgid "Nautilus First Time Setup"
+msgstr "Eina d'instal·lació del Nautilus"
 
-#. make the title label
-#: src/nautilus-first-time-druid.c:707
-msgid "Welcome to Nautilus!"
+#: src/nautilus-first-time-druid.c:1183
+#, fuzzy
+msgid "Welcome to Nautilus"
 msgstr "Benvingut al Nautilus!"
 
-#: src/nautilus-first-time-druid.c:715
-#, fuzzy
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
-"Since this is the first time that you've launched\n"
-"Nautilus, we'd like to ask you a few questions\n"
-"to help personalize it for your use."
-msgstr ""
-"Benvingut al Nautilus!\n"
-"Com aquesta és la primera vegada que executeu\n"
-"el Nautilus, ens agaradria fer-vos unes preguntes\n"
-"per a ajudar-vos a personalitzar-lo.\n"
+"Nautilus...\n"
+"    Is a great file manager for the GNOME desktop.\n"
+"    Provides a simple intuitive way to access Internet services.\n"
+"    Is an extensible framework for GNOME developers.\n"
+"    Provides a powerful delivery platform for service providers.\n"
 "\n"
-"Premeu el botó Següent per a continuar."
-
-#: src/nautilus-first-time-druid.c:720
-msgid "Press the next button to continue."
+"Click Next to begin customizing your Nautilus environment."
 msgstr ""
 
 #. set up the final page
-#: src/nautilus-first-time-druid.c:728
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "Finalitzat"
 
-#: src/nautilus-first-time-druid.c:735
+#. set up the user level page
+#: src/nautilus-first-time-druid.c:1209
 #, fuzzy
-msgid ""
-"Click the finish button to launch Nautilus.\n"
-"We hope that you enjoy using it!"
+msgid "Choose Your User Level"
+msgstr "Especifica el nivell de l'usuari expert"
+
+#. set up the GMC transition page
+#: src/nautilus-first-time-druid.c:1213
+msgid "GMC to Nautilus Transition"
 msgstr ""
-"Premeu fins al botó Acabar per a executar el Nautilus.\n"
-"\n"
-"Esperem que disfruteu utilitzant-lo!"
 
-#. set up the user level page
-#: src/nautilus-first-time-druid.c:741
+#. set up the `Launch Medusa' page
+#: src/nautilus-first-time-druid.c:1217
 #, fuzzy
-msgid "Select A User Level"
-msgstr "Especifica el nivell de l'usuari principiant"
+msgid "Fast Searches"
+msgstr "Cerca"
 
-#. set up the service sign-up page
-#: src/nautilus-first-time-druid.c:745
-#, fuzzy
-msgid "Sign Up for Eazel Services"
-msgstr "Serveis de l'Eazel"
+#. set up optional page to tell the user how to run cron
+#: src/nautilus-first-time-druid.c:1225
+msgid "The Cron Daemon"
+msgstr ""
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:749
-#, fuzzy
-msgid "Nautilus Update"
-msgstr "Nautilus: advertiment"
+#: src/nautilus-first-time-druid.c:1230
+msgid "Checking Your Internet Connection"
+msgstr ""
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:757
+#: src/nautilus-first-time-druid.c:1241
 #, fuzzy
 msgid "Updating Nautilus..."
 msgstr "_Quant al Nautilus"
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:765
+#: src/nautilus-first-time-druid.c:1249
 #, fuzzy
 msgid "Web Proxy Configuration"
 msgstr "Configuaració"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:833
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:842
-msgid "Update Completed... Press Next to Continue."
+#: src/nautilus-first-time-druid.c:1341
+msgid "Update Complete. Click Next to Continue."
+msgstr ""
+
+#. The update file couldn't be loaded because it
+#. * doesn't exist. Arlo and I (jsh) and decided that the
+#. * best thing to do is silently fail
+#.
+#: src/nautilus-first-time-druid.c:1356
+msgid "No Update Available... Press Next to Continue."
 msgstr ""
 
 #. set the window title
-#: src/nautilus-link-set-window.c:188
+#: src/nautilus-link-set-window.c:189
 msgid "Link sets"
 msgstr "Configuració dels enllaços"
 
 #. add a descriptive label
-#: src/nautilus-link-set-window.c:200
+#: src/nautilus-link-set-window.c:202
 msgid "Add or remove sets of links by clicking on the checkboxes below."
 msgstr ""
 "Afegeix o elimina configuracions dels enllaços fent clic als quadres de "
 "verificació d'abaix."
 
-#: src/nautilus-location-bar.c:131
+#: src/nautilus-location-bar.c:63
+#, fuzzy
+msgid "Go To:"
+msgstr "A:"
+
+#: src/nautilus-location-bar.c:153
 #, c-format
 msgid "Do you want to view these %d locations in separate windows?"
 msgstr "Voleu veure aquestes %d ubicacions en finestres separades?"
 
-#: src/nautilus-location-bar.c:137
+#: src/nautilus-location-bar.c:160
 msgid "View in Multiple Windows?"
 msgstr "Veure en multiples finestres?"
 
-#: src/nautilus-location-bar.c:445 src/nautilus-location-bar.c:572
-msgid "Location:"
-msgstr "Ubicació:"
+#: src/nautilus-main.c:145
+#, fuzzy
+msgid "Perform a quick set of self-check tests."
+msgstr "Realitza les proves d'auto comprovació d'alta velocitat."
 
-#: src/nautilus-location-bar.c:574
-msgid "   Go To:"
+#: src/nautilus-main.c:148
+msgid "Create the initial window with the given geometry."
 msgstr ""
 
-#: src/nautilus-main.c:139
-msgid "Perform high-speed self-check tests."
-msgstr "Realitza les proves d'auto comprovació d'alta velocitat."
+#: src/nautilus-main.c:148
+msgid "GEOMETRY"
+msgstr ""
+
+#: src/nautilus-main.c:150
+msgid "Only create windows for explicitly specified URIs."
+msgstr ""
 
-#: src/nautilus-main.c:141
+#: src/nautilus-main.c:152
 #, fuzzy
 msgid "Quit Nautilus."
 msgstr "_Quant al Nautilus"
 
-#: src/nautilus-main.c:142
+#: src/nautilus-main.c:154
 #, fuzzy
 msgid "Restart Nautilus."
 msgstr "Estabilitza el Nautilus"
 
-#: src/nautilus-main.c:143
-#, fuzzy
-msgid "Don't draw background and icons on desktop."
-msgstr "Arrastra el fons i les icones a l'escriptori."
-
-#: src/nautilus-main.c:144
-msgid "Draw background and icons on desktop."
-msgstr "Arrastra el fons i les icones a l'escriptori."
-
-#: src/nautilus-main.c:177
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:181
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 
-#: src/nautilus-main.c:185
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:189
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:193
-msgid "nautilus: --quit and --start-desktop cannot be used together.\n"
+#: src/nautilus-main.c:225
+msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 
-#: src/nautilus-main.c:197
-msgid "nautilus: --restart and --start-desktop cannot be used together.\n"
+#. set the title and standard close accelerator
+#: src/nautilus-property-browser.c:265
+msgid "Backgrounds and Emblems"
 msgstr ""
 
-#: src/nautilus-main.c:201
-msgid "nautilus: --stop-desktop and --start-desktop cannot be used together.\n"
-msgstr ""
-
-#. set the title
-#: src/nautilus-property-browser.c:217
-msgid "Nautilus Property Browser"
-msgstr "Navegador de propietats del Nautilus"
-
-#. add the title label
-#: src/nautilus-property-browser.c:280 src/nautilus-property-browser.c:1705
-msgid "Select A Category:"
-msgstr "Seleccioneu una categoria:"
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:362 src/nautilus-theme-selector.c:267
+#, fuzzy
+msgid "  Done  "
+msgstr "Fet"
 
-#: src/nautilus-property-browser.c:315
-msgid "Add new..."
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:373
+#, fuzzy
+msgid "  Add new...  "
 msgstr "Afegeix una nova..."
 
-#: src/nautilus-property-browser.c:326
-msgid "Remove..."
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:388
+#, fuzzy
+msgid "  Remove...  "
 msgstr "Elimina..."
 
-#: src/nautilus-property-browser.c:725
+#: src/nautilus-property-browser.c:879
 #, c-format
-msgid "Sorry, but background %s couldn't be deleted."
+msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:726 src/nautilus-property-browser.c:755
+#: src/nautilus-property-browser.c:880 src/nautilus-property-browser.c:909
 #, fuzzy
-msgid "Couldn't delete background"
+msgid "Couldn't delete pattern"
 msgstr "No s'ha pogut aconseguir el mode asíncron"
 
-#: src/nautilus-property-browser.c:754
+#: src/nautilus-property-browser.c:908
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:854 src/nautilus-property-browser.c:950
-#, fuzzy, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
-msgstr "'%s' no és un fitxer d'imatge!"
-
-#: src/nautilus-property-browser.c:856 src/nautilus-property-browser.c:951
-#, fuzzy
-msgid "Not an Image"
-msgstr "no és al menú"
-
-#: src/nautilus-property-browser.c:881
+#: src/nautilus-property-browser.c:944
 msgid "Create a New Emblem:"
 msgstr "Crea un emblema nou:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:886
+#: src/nautilus-property-browser.c:949
 msgid "Keyword:"
 msgstr "Paraula clau:"
 
-#. set up a gnome file entry to pick the image file
-#: src/nautilus-property-browser.c:903
+#. set up a gnome icon entry to pick the image file
+#: src/nautilus-property-browser.c:962
+msgid "Image:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:966
 msgid "Select an image file for the new emblem:"
 msgstr "Seleccioneu un fitxer d'imatge per al nou emblema:"
 
-#: src/nautilus-property-browser.c:983
-#, c-format
-msgid "Sorry, but the background %s couldn't be installed."
-msgstr ""
+#: src/nautilus-property-browser.c:993
+#, fuzzy
+msgid "Create a New Color:"
+msgstr "Crea un emblema nou:"
 
-#: src/nautilus-property-browser.c:984
-msgid "Couldn't install background"
+#. make the name label and field
+#: src/nautilus-property-browser.c:998
+msgid "Color name:"
 msgstr ""
 
 #: src/nautilus-property-browser.c:1009
-msgid "Select an image file to add as a background:"
+msgid "Color value:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:1045
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a valid file name."
+msgstr "'%s' no és un fitxer d'imatge!"
+
+#: src/nautilus-property-browser.c:1047
+#, fuzzy
+msgid "Sorry, but you did not supply a valid file name."
+msgstr "'%s' no és un fitxer d'imatge!"
+
+#: src/nautilus-property-browser.c:1049 src/nautilus-property-browser.c:1092
+#, fuzzy
+msgid "Couldn't install pattern"
+msgstr "No s'ha pogut aconseguir el mode asíncron"
+
+#: src/nautilus-property-browser.c:1060
+msgid "Sorry, but you can't replace the reset image."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1091
+#, c-format
+msgid "Sorry, but the pattern %s couldn't be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1114
+#, fuzzy
+msgid "Select an image file to add as a pattern:"
 msgstr "Seleccioneu un fitxer d'imatge com a fons:"
 
-#: src/nautilus-property-browser.c:1107
+#: src/nautilus-property-browser.c:1173
+msgid "Sorry, but you must specify a non-blank name for the new color."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1174
+#, fuzzy
+msgid "Couldn't install color"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#: src/nautilus-property-browser.c:1230
 msgid "Select a color to add:"
 msgstr "Seleccioneu un color per a afegir:"
 
-#: src/nautilus-property-browser.c:1142
-msgid "Sorry, but you must specify a keyword for the new emblem."
+#: src/nautilus-property-browser.c:1311
+#, fuzzy, c-format
+msgid "Sorry, but '%s' is not a usable image file!"
+msgstr "'%s' no és un fitxer d'imatge!"
+
+#: src/nautilus-property-browser.c:1329
+msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1143 src/nautilus-property-browser.c:1171
+#: src/nautilus-property-browser.c:1330 src/nautilus-property-browser.c:1333
+#: src/nautilus-property-browser.c:1337 src/nautilus-property-browser.c:1366
 #, fuzzy
 msgid "Couldn't install emblem"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: src/nautilus-property-browser.c:1170
+#: src/nautilus-property-browser.c:1332
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1335
+#, fuzzy, c-format
+msgid ""
+"Sorry, but \"%s\" is an existing keyword.  Please choose a different name "
+"for it."
+msgstr ""
+"El nom \"%s\" ja està utilitzat en aquest directori.\n"
+"Si us plau utilitzeu un nom diferent."
+
+#: src/nautilus-property-browser.c:1365
 #, c-format
 msgid "Sorry, but the image at %s couldn't be installed as an emblem."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1713 src/nautilus-theme-selector.c:491
+#: src/nautilus-property-browser.c:2024
+msgid "Select A Category:"
+msgstr "Seleccioneu una categoria:"
+
+#: src/nautilus-property-browser.c:2032 src/nautilus-theme-selector.c:497
 msgid "Cancel Remove"
 msgstr "Cancel·la eliminar"
 
-#: src/nautilus-property-browser.c:1715
-#, c-format
-msgid "Add a new %s"
-msgstr "Afegeix un nou %s"
+#: src/nautilus-property-browser.c:2037
+msgid "  Add a New Pattern  "
+msgstr ""
 
-#. strip trailing s
-#: src/nautilus-property-browser.c:1730
-#, c-format
-msgid "Click on a %s to remove it"
+#: src/nautilus-property-browser.c:2040
+msgid "  Add a New Color  "
+msgstr ""
+
+#: src/nautilus-property-browser.c:2043
+#, fuzzy
+msgid "  Add a New Emblem  "
+msgstr "Crea un emblema nou:"
+
+#: src/nautilus-property-browser.c:2066
+#, fuzzy
+msgid "Click on a pattern to remove it"
 msgstr "Feu click a sobre de %s per a eliminar-lo"
 
-#: src/nautilus-property-browser.c:1742
-#, c-format
-msgid "Remove a %s"
+#: src/nautilus-property-browser.c:2069
+#, fuzzy
+msgid "Click on a color to remove it"
+msgstr "Feu click a sobre de %s per a eliminar-lo"
+
+#: src/nautilus-property-browser.c:2072
+#, fuzzy
+msgid "Click on an emblem to remove it"
+msgstr "Feu click a sobre de %s per a eliminar-lo"
+
+#: src/nautilus-property-browser.c:2081
+#, fuzzy
+msgid "Patterns:"
+msgstr "Altres:"
+
+#: src/nautilus-property-browser.c:2084
+#, fuzzy
+msgid "Colors:"
+msgstr "Tanca"
+
+#: src/nautilus-property-browser.c:2087
+#, fuzzy
+msgid "Emblems:"
+msgstr "Emblemes"
+
+#: src/nautilus-property-browser.c:2106
+msgid "  Remove a Pattern  "
+msgstr ""
+
+#: src/nautilus-property-browser.c:2109
+#, fuzzy
+msgid "  Remove a Color  "
 msgstr "Elimina un %s"
 
-#: src/nautilus-search-bar-criterion.c:67
-msgid "Content"
-msgstr "Contingut"
+#: src/nautilus-property-browser.c:2112
+msgid "  Remove an Emblem  "
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:70
-msgid "With Emblem"
-msgstr "Amb l'emblema"
+#. Menu item in the search bar.
+#. Bracketed items are context, and are message
+#. strings elsewhere.  You don't have to translate the whole
+#. string, and only the translation for "containing '%s' will
+#. be used.  If you do translate the whole string, leave the
+#. translations of the rest of the text in brackets, so it
+#. will not be used.
+#: src/nautilus-search-bar-criterion.c:74
+msgid "[Search for] Name [contains \"fish\"]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:75
+msgid "[Search for] Content [includes all of \"fish tree\"]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:71
-msgid "Last Modified"
-msgstr "Última modificació"
+#: src/nautilus-search-bar-criterion.c:76
+msgid "[Search for] Type [is regular file]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:72
-msgid "Owned By"
-msgstr "Propietat de"
+#: src/nautilus-search-bar-criterion.c:77
+msgid "[Search for] Size [larger than 400K]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:78
-msgid "contains"
-msgstr "conté"
+msgid "[Search for] With Emblem [includes \"Important\"]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:79
-msgid "starts with"
-msgstr "comença amb"
+msgid "[Search for] Last Modified [before yesterday]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:80
-msgid "ends with"
-msgstr "acaba amb"
-
-#: src/nautilus-search-bar-criterion.c:81
-msgid "matches glob"
-msgstr "coincidències globals"
+msgid "[Search for] Owner [is not root]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:82
-msgid "matches regexp"
-msgstr "coincidències regexp"
+#: src/nautilus-search-bar-criterion.c:86
+msgid "[File name] contains [help]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:87
-#, fuzzy
-msgid "includes all of"
-msgstr "inclou"
+msgid "[File name] starts with [nautilus]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:88
-#, fuzzy
-msgid "includes any of"
-msgstr "inclou"
+msgid "[File name] ends with [.c]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:89
-#, fuzzy
-msgid "does not include all of"
-msgstr "no inclou"
+msgid "[File name] matches glob [*.c]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:90
-#, fuzzy
-msgid "includes none of"
-msgstr "inclou"
+msgid "[File name] matches regexp [\"e??l.$\"]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:95
+msgid "[File content] includes all of [apple orange]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:96
-#: src/nautilus-search-bar-criterion.c:123
-#: src/nautilus-search-bar-criterion.c:138
-msgid "is"
-msgstr "és"
+msgid "[File content] includes any of [apply orange]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:97
-#: src/nautilus-search-bar-criterion.c:124
-#: src/nautilus-search-bar-criterion.c:139
-msgid "is not"
-msgstr "no és"
-
-#: src/nautilus-search-bar-criterion.c:102
-msgid "regular file"
-msgstr "fitxer habitual"
+#, fuzzy
+msgid "[File content] does not include all of [apple orange]"
+msgstr "no inclou"
 
-#: src/nautilus-search-bar-criterion.c:103
-msgid "text file"
-msgstr "fitxer de text"
+#: src/nautilus-search-bar-criterion.c:98
+msgid "[File content] includes none of [apple orange]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:104
-msgid "application"
-msgstr "aplicació"
+msgid "[File type] is [folder]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:105
-msgid "directory"
-msgstr "directori"
+msgid "[File type] is not [folder]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:110
+#, fuzzy
+msgid "[File type is] regular file"
+msgstr "fitxer habitual"
 
 #: src/nautilus-search-bar-criterion.c:111
-msgid "larger than"
-msgstr "major de"
+msgid "[File type is] text file"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:112
-msgid "smaller than"
-msgstr "menor de"
+msgid "[File type is] application"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:117
-msgid "marked with"
-msgstr "marcat amb"
+#: src/nautilus-search-bar-criterion.c:113
+msgid "[File type is] folder"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:118
-msgid "not marked with"
-msgstr "no marcat amb"
+#: src/nautilus-search-bar-criterion.c:114
+msgid "[File type is] music"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:119
+msgid "[File size is] larger than [400K]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:120
+msgid "[File size is] smaller than [300K]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:125
-#, fuzzy
-msgid "is after"
-msgstr "després"
+msgid "[With emblem] marked with [Important]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:126
-#, fuzzy
-msgid "is before"
-msgstr "abans"
+msgid "[With emblem] not marked with [Important]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:131
+msgid "[Last modified date] is [1/24/00]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:128
+#: src/nautilus-search-bar-criterion.c:132
+msgid "[Last modified date] is not [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:133
+msgid "[Last modified date] is after [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:134
+msgid "[Last modified date] is before [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:136
+msgid "[Last modified date] is today"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:137
+msgid "[Last modified date] is yesterday"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:139
+msgid "[Last modified date] is within a week of [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:140
+msgid "[Last modified date] is within a month of [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:159
+msgid "[File owner] is [root]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:160
+msgid "[File owner] is not [root]"
+msgstr ""
+
+#: src/nautilus-service-ui.xml.h:1
+msgid "Go to the Eazel Services Summary Page"
+msgstr ""
+
+#: src/nautilus-service-ui.xml.h:2
+msgid "Go to the Eazel Software Catalog"
+msgstr ""
+
+#: src/nautilus-service-ui.xml.h:3
 #, fuzzy
-msgid "is today"
-msgstr "avui"
+msgid "Go to your online storage repository"
+msgstr "Va al directori d'inici"
 
-#: src/nautilus-search-bar-criterion.c:129
-msgid "is yesterday"
+#: src/nautilus-service-ui.xml.h:5
+msgid "Software _Catalog"
 msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:131
-msgid "is within a week of"
+#: src/nautilus-service-ui.xml.h:6
+#, fuzzy
+msgid "_Eazel Services Home"
+msgstr "Serveis de l'Eazel"
+
+#: src/nautilus-service-ui.xml.h:7
+msgid "_Online Storage"
 msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:132
+#: src/nautilus-service-ui.xml.h:8
 #, fuzzy
-msgid "is within a month of"
-msgstr "aquest mes"
+msgid "_Services"
+msgstr "Serveis"
 
-#: src/nautilus-shell.c:165
+#: src/nautilus-shell.c:188
 msgid "Caveat"
 msgstr ""
 
-#: src/nautilus-shell.c:201
-#, fuzzy
+#: src/nautilus-shell.c:225
 msgid ""
-"The Nautilus shell is under development; it's not\n"
-"ready for daily use. Some features are not yet done,\n"
-"partly done, or unstable. The program doesn't look\n"
-"or act exactly the way it will in version 1.0.\n"
-"\n"
-"If you do decide to test this version of Nautilus, \n"
-"beware. The program could do something \n"
-"unpredictable and may even delete or overwrite \n"
-"files on your computer.\n"
+"Thank you for your interest in Nautilus.\n"
+" \n"
+"As with any software under development, you should exercise caution when "
+"using Nautilus.  Eazel does not provide any guarantee that it will work "
+"properly, or assume any liability for your use of it.  Please use it at your "
+"own risk.\n"
 "\n"
-"For more information, visit http://nautilus.eazel.com."
+"Please visit http://www.eazel.com/feedback.html to provide feedback, "
+"comments, and suggestions."
 msgstr ""
-"La shell del Nautilus està desenvolupant-se; no està preparada per a un ús "
-"habitual. Moltes característiques, incloent-hi algunes de les millors, "
-"encara no estàn llestes deltot o són inestables. El programa no sembla o "
-"actua com ho hauria de fer a la versió 1.0.\n"
-"\n"
-"Si decidiu provar aquesta versión del Nautilus, compte. El programa podria "
-"fer alguna cosa impredecible i pot inclús esborrar o sobreescriure fitxers "
-"al seu ordinador.\n"
-"\n"
-"Per a més informació, visiteu http://nautilus.eazel.com."
 
-#. add the reset background item, possibly disabled
-#: src/nautilus-sidebar.c:431
-msgid "Reset Background"
-msgstr "Reinicialitza el fons"
+#: src/Nautilus_shell.oaf.in.h:1
+msgid "Factory for Nautilus shell and file manager"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:2
+#, fuzzy
+msgid "Icons"
+msgstr "conté"
+
+#: src/Nautilus_shell.oaf.in.h:3
+#, fuzzy
+msgid "Icons Viewer"
+msgstr "%s Visualitzador"
+
+#: src/Nautilus_shell.oaf.in.h:4
+#, fuzzy
+msgid "List"
+msgstr "és"
+
+#: src/Nautilus_shell.oaf.in.h:5
+#, fuzzy
+msgid "List Viewer"
+msgstr "%s Visualitzador"
+
+#: src/Nautilus_shell.oaf.in.h:6
+#, fuzzy
+msgid "Nautilus factory"
+msgstr "Nautilus: advertiment"
+
+#: src/Nautilus_shell.oaf.in.h:7
+msgid "Nautilus file manager component that shows a scrollable list"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:8
+msgid ""
+"Nautilus file manager component that shows a scrollable list for search "
+"results"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:9
+msgid "Nautilus file manager component that shows a two-dimensional icon space"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:10
+msgid "Nautilus file manager component that shows icons on the the desktop"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:11
+msgid "Nautilus file manager desktop icon view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:12
+msgid "Nautilus file manager icon view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:13
+msgid "Nautilus file manager list view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:14
+msgid "Nautilus file manager search results list view"
+msgstr ""
 
-#: src/nautilus-sidebar.c:605
+#: src/Nautilus_shell.oaf.in.h:15
+#, fuzzy
+msgid "Nautilus metafile factory"
+msgstr "Eina d'instal·lació del Nautilus"
+
+#: src/Nautilus_shell.oaf.in.h:16
+#, fuzzy
+msgid "Nautilus shell"
+msgstr "Nautilus: %s"
+
+#: src/Nautilus_shell.oaf.in.h:17
+msgid ""
+"Nautilus shell operations that can be done from subsequent command-line "
+"invocations"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:18
+msgid "Produces metafile objects for accessing Nautilus metadata"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:19
+#, fuzzy
+msgid "Search List"
+msgstr "Ubicació"
+
+#: src/Nautilus_shell.oaf.in.h:20
+#, fuzzy
+msgid "View as Icons"
+msgstr "Veure com %s"
+
+#: src/Nautilus_shell.oaf.in.h:21
+#, fuzzy
+msgid "View as List"
+msgstr "Veure com %s"
+
+#: src/nautilus-shell-ui.xml.h:1
+msgid " _Advanced"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:2
+#, fuzzy
+msgid " _Beginner"
+msgstr "Començament"
+
+#: src/nautilus-shell-ui.xml.h:3
+#, fuzzy
+msgid " _Intermediate"
+msgstr "Intermedi"
+
+#: src/nautilus-shell-ui.xml.h:4
+msgid "Add a bookmark for the current location to this menu"
+msgstr "Afegeix la ubicació actual a la llista de preferits d'aquest menú"
+
+#: src/nautilus-shell-ui.xml.h:6
+msgid "Change the visibility of this window's location bar"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:7
+msgid "Change the visibility of this window's sidebar"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:8
+msgid "Change the visibility of this window's status bar"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:9
+msgid "Change the visibility of this window's toolbar"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:10
+msgid "Clear contents of Go menu and Back/Forward lists"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:11
+#, fuzzy
+msgid "Close _All Windows"
+msgstr "Tanca totes les finestres"
+
+#: src/nautilus-shell-ui.xml.h:12
+#, fuzzy
+msgid "Close all Nautilus windows"
+msgstr "Tanca totes les finestres"
+
+#: src/nautilus-shell-ui.xml.h:13
+msgid "Close this window"
+msgstr "Tanca aquesta finestra"
+
+#: src/nautilus-shell-ui.xml.h:15
+msgid "Display a window that allows editing the bookmarks in this menu"
+msgstr "Mostra una finestra que permet editar els preferits d'aquest menú"
+
+#: src/nautilus-shell-ui.xml.h:16
+msgid "Display credits for the creators of Nautilus"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:17
+msgid "Display on-line help for Nautilus"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:18
+#, fuzzy
+msgid ""
+"Display patterns, colors, and emblems that can be used to customize "
+"appearance"
+msgstr ""
+"Mostra el navegador de propietats, per afegir propietats als objectes i "
+"personalitzar l'aparença"
+
+#: src/nautilus-shell-ui.xml.h:19
+msgid "Display quick reference pages for Nautilus"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:20
+msgid "Display release notes for Nautilus"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:21
+#, fuzzy
+msgid "Display support information for Nautilus and Eazel Services"
+msgstr "Mostra informació sobre el programa Nautilus"
+
+#: src/nautilus-shell-ui.xml.h:22
+msgid "Display the latest contents of the current location"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:23
+msgid "Display the set of available appearance themes"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:24
+#, fuzzy
+msgid "Edit various Nautilus preferences"
+msgstr "Nautilus: Preferències inicials"
+
+#: src/nautilus-shell-ui.xml.h:25
+#, fuzzy
+msgid "Find"
+msgstr "Finalitzat"
+
+#: src/nautilus-shell-ui.xml.h:26
+msgid "For_get History"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:27
+#, fuzzy
+msgid "Go to Eazel Services"
+msgstr "Serveis de l'Eazel"
+
+#: src/nautilus-shell-ui.xml.h:28
+msgid "Go to the home location"
+msgstr "Vés a la ubicació d'inici"
+
+#: src/nautilus-shell-ui.xml.h:29
+msgid "Go to the location that contains this one"
+msgstr "Vés a la ubicació que conté a aquesta"
+
+#: src/nautilus-shell-ui.xml.h:30
+#, fuzzy
+msgid "Go to the next visited location"
+msgstr "Vés a la ubicació visitada anteriorment"
+
+#: src/nautilus-shell-ui.xml.h:31
+msgid "Go to the previous visited location"
+msgstr "Vés a la ubicació visitada anteriorment"
+
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
+#, fuzzy
+msgid "Hide Location _Bar"
+msgstr "Barra d'ubicació"
+
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
+#, fuzzy
+msgid "Hide St_atus Bar"
+msgstr "Barra d'estat"
+
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
+#, fuzzy
+msgid "Hide _Sidebar"
+msgstr "Barra lateral"
+
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
+#, fuzzy
+msgid "Hide _Toolbar"
+msgstr "Barra d'eines"
+
+#: src/nautilus-shell-ui.xml.h:37
+msgid "Nautilus Quick _Reference"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:38
+#, fuzzy
+msgid "Nautilus Release _Notes"
+msgstr "Nautilus: Veure com un altre"
+
+#: src/nautilus-shell-ui.xml.h:39
+#, fuzzy
+msgid "Nautilus User _Manual"
+msgstr "Nautilus: advertiment"
+
+#: src/nautilus-shell-ui.xml.h:40
+#, fuzzy
+msgid "New Window"
+msgstr "_Nova finestra"
+
+#: src/nautilus-shell-ui.xml.h:41
+#, fuzzy
+msgid "New _Window"
+msgstr "_Nova finestra"
+
+#: src/nautilus-shell-ui.xml.h:42
+#, fuzzy
+msgid "Normal Size"
+msgstr "Normalitza el menú"
+
+#: src/nautilus-shell-ui.xml.h:43
+msgid "Open another Nautilus window for the displayed location"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:44
+#, fuzzy
+msgid "Refresh"
+msgstr "abans"
+
+#: src/nautilus-shell-ui.xml.h:45
+msgid "Report Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:46
+msgid "Reset Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:47
+#, fuzzy
+msgid "Search the World Wide Web"
+msgstr "Cerca a la web"
+
+#: src/nautilus-shell-ui.xml.h:48
+msgid "Search this computer for files"
+msgstr "Cerca fitxers en aquest ordinador"
+
+#: src/nautilus-shell-ui.xml.h:50
+msgid ""
+"Show a page from which you can send feedback about Nautilus and Eazel "
+"Services"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:51
+msgid "Show the contents at the normal size"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:52
+msgid "Show the contents in less detail"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:53
+#, fuzzy
+msgid "Show the contents in more detail"
+msgstr "(alguns continguts són il·legibles)"
+
+#: src/nautilus-shell-ui.xml.h:54
+msgid "Start Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:56
+msgid "Stop Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:57
+#, fuzzy
+msgid "Stop loading this location"
+msgstr "Vés a la ubicació d'inici"
+
+#: src/nautilus-shell-ui.xml.h:58
+msgid "Undo the last text change"
+msgstr "Desfà l'últim canvi al text"
+
+#: src/nautilus-shell-ui.xml.h:59
+msgid "Up"
+msgstr "A dalt"
+
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:63
+#, fuzzy
+msgid "We_b Search"
+msgstr "Cerca a la web"
+
+#: src/nautilus-shell-ui.xml.h:64
+msgid "Web Search"
+msgstr "Cerca a la web"
+
+#: src/nautilus-shell-ui.xml.h:65
+msgid "Zoom In"
+msgstr "Amplia el Zoom"
+
+#: src/nautilus-shell-ui.xml.h:66
+msgid "Zoom Out"
+msgstr "Redueix el Zoom"
+
+#: src/nautilus-shell-ui.xml.h:67
+#, fuzzy
+msgid "Zoom _In"
+msgstr "Amplia el Zoom"
+
+#: src/nautilus-shell-ui.xml.h:68
+#, fuzzy
+msgid "Zoom _Out"
+msgstr "Redueix el Zoom"
+
+#: src/nautilus-shell-ui.xml.h:69
+msgid "_About Nautilus..."
+msgstr "_Quant al Nautilus"
+
+#: src/nautilus-shell-ui.xml.h:70
+msgid "_Add Bookmark"
+msgstr "_Afegeix preferit"
+
+#: src/nautilus-shell-ui.xml.h:71
+msgid "_Back"
+msgstr "_Endarrere"
+
+#: src/nautilus-shell-ui.xml.h:72
+msgid "_Backgrounds and Emblems..."
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:73
+msgid "_Bookmarks"
+msgstr "_Preferits"
+
+#: src/nautilus-shell-ui.xml.h:74
+msgid "_Close Window"
+msgstr "_Tanca la finestra"
+
+#: src/nautilus-shell-ui.xml.h:76
+msgid "_Customer Support"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:77
+msgid "_Edit"
+msgstr "_Edita"
+
+#: src/nautilus-shell-ui.xml.h:78
+msgid "_Edit Bookmarks..."
+msgstr "_Edita els preferits..."
+
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "Nautilus: Preferències inicials"
+
+#: src/nautilus-shell-ui.xml.h:80
+msgid "_Feedback"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:82
+#, fuzzy
+msgid "_Find"
+msgstr "Finalitzat"
+
+#: src/nautilus-shell-ui.xml.h:83
+msgid "_Forward"
+msgstr "_Endavant"
+
+#: src/nautilus-shell-ui.xml.h:84
+msgid "_Go"
+msgstr "_Vés"
+
+#: src/nautilus-shell-ui.xml.h:85
+msgid "_Help"
+msgstr "_Ajuda"
+
+#: src/nautilus-shell-ui.xml.h:86
+msgid "_Home"
+msgstr "_Inici"
+
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "Ubicació"
+
+#: src/nautilus-shell-ui.xml.h:88
+#, fuzzy
+msgid "_Nautilus Themes..."
+msgstr "Nautilus"
+
+#: src/nautilus-shell-ui.xml.h:89
+#, fuzzy
+msgid "_Normal Size"
+msgstr "Normalitza el menú"
+
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "Nautilus: Preferències inicials"
+
+#: src/nautilus-shell-ui.xml.h:92
+msgid "_Profiler"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:93
+msgid "_Refresh"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:94
+msgid "_Report Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:95
+msgid "_Reset Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:96
+msgid "_Start Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:97
+msgid "_Stop Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:98
+msgid "_Undo"
+msgstr "_Desfés"
+
+#: src/nautilus-shell-ui.xml.h:99
+#, fuzzy
+msgid "_Up a Level"
+msgstr "Nivells d'usuari"
+
+#: src/nautilus-shell-ui.xml.h:100
+#, fuzzy
+msgid "_View"
+msgstr "_Fitxer"
+
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
 msgstr ""
 
-#: src/nautilus-sidebar.c:607
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr ""
 
-#: src/nautilus-sidebar.c:629
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
 msgstr ""
 
-#: src/nautilus-sidebar.c:631
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr ""
 
-#: src/nautilus-sidebar.c:636
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
 msgstr ""
 
-#: src/nautilus-sidebar.c:638
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr ""
 
-#: src/nautilus-sidebar.c:1193
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "Obre amb %s"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1222
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "Obre amb..."
 
-#. Create button first so we can use it for auto_click
-#: src/nautilus-simple-search-bar.c:101
-msgid "Find Them!"
-msgstr ""
+#. FIXME: We don't use spaces to pad labels!
+#: src/nautilus-sidebar.c:1424
+#, fuzzy
+msgid "  Empty Trash  "
+msgstr "_Buida la Paperera"
 
-#: src/nautilus-switchable-search-bar.c:105
-msgid "Search For:"
-msgstr "Cerca:"
+#: src/nautilus-switchable-search-bar.c:132
+#, fuzzy
+msgid "Find:"
+msgstr "Finalitzat"
 
-#. set the title
-#: src/nautilus-theme-selector.c:146
+#. set the title and standard close accelerator
+#: src/nautilus-theme-selector.c:170
 msgid "Nautilus Theme Selector"
 msgstr ""
 
 #. add the title label
-#: src/nautilus-theme-selector.c:180
+#: src/nautilus-theme-selector.c:199
 #, fuzzy
 msgid "Nautilus Theme:"
 msgstr "Nautilus"
 
-#: src/nautilus-theme-selector.c:238
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:278
 #, fuzzy
-msgid "Add new theme"
+msgid "  Add New Theme  "
 msgstr "Afegeix un nou %s"
 
-#: src/nautilus-theme-selector.c:250
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:288
 #, fuzzy
-msgid "Remove theme"
+msgid "  Remove Theme  "
 msgstr "Elimina"
 
-#: src/nautilus-theme-selector.c:383
+#: src/nautilus-theme-selector.c:400
 #, fuzzy, c-format
-msgid "Sorry, but %s is not a valid theme directory."
+msgid "Sorry, but \"%s\" is not a valid theme folder."
 msgstr "'%s' no és un fitxer d'imatge!"
 
-#: src/nautilus-theme-selector.c:384
+#: src/nautilus-theme-selector.c:401
 #, fuzzy
 msgid "Couldn't add theme"
 msgstr "No s'ha pogut aconseguir el mode asíncron"
 
-#: src/nautilus-theme-selector.c:412
+#: src/nautilus-theme-selector.c:429
 #, c-format
-msgid "Sorry, but the theme %s couldn't be installed."
+msgid "Sorry, but the \"%s\" theme couldn't be installed."
 msgstr ""
 
-#: src/nautilus-theme-selector.c:413
+#: src/nautilus-theme-selector.c:430
 #, fuzzy
 msgid "Couldn't install theme"
 msgstr "No s'ha pogut aconseguir el mode asíncron"
 
-#: src/nautilus-theme-selector.c:454
+#: src/nautilus-theme-selector.c:463
 #, fuzzy
-msgid "Select a theme directory to add as a new theme:"
+msgid "Select a theme folder to add as a new theme:"
 msgstr "Seleccioneu un fitxer d'imatge com a fons:"
 
-#: src/nautilus-theme-selector.c:487 src/nautilus-theme-selector.c:537
+#: src/nautilus-theme-selector.c:495 src/nautilus-theme-selector.c:542
 #, fuzzy
 msgid "Click on a theme to remove it."
 msgstr "Feu click a sobre de %s per a eliminar-lo"
 
-#: src/nautilus-theme-selector.c:540
+#: src/nautilus-theme-selector.c:545
 msgid ""
 "Click on a theme to change the\n"
 "appearance of Nautilus."
 msgstr ""
 
 #. change the add button label back to it's normal state
-#: src/nautilus-theme-selector.c:552
+#: src/nautilus-theme-selector.c:558
 msgid "Add New Theme"
 msgstr ""
 
-#: src/nautilus-theme-selector.c:580
+#: src/nautilus-theme-selector.c:585
 msgid ""
-"Sorry, but you can't remove the current theme.  Please change to another "
-"theme before removing this one"
+"Sorry, but you can't remove the current theme. Please change to another "
+"theme before removing this one."
 msgstr ""
 
-#: src/nautilus-theme-selector.c:581
+#: src/nautilus-theme-selector.c:587
 #, fuzzy
 msgid "Can't delete current theme"
 msgstr "Neteja la selecció actual"
@@ -4382,68 +10002,76 @@ msgstr ""
 msgid "Couldn't remove theme"
 msgstr "No s'ha pogut aconseguir el mode asíncron"
 
-#: src/nautilus-theme-selector.c:698
+#: src/nautilus-theme-selector.c:716
 #, c-format
-msgid "No information available for the  %s theme"
+msgid "No description available for the \"%s\" theme"
 msgstr ""
 
-#: src/nautilus-window.c:967
-#, c-format
-msgid "View as %s..."
+#: src/nautilus-window.c:637
+#, fuzzy
+msgid "View as ..."
 msgstr "Veure com %s..."
 
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:989
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "Veure com altres..."
 
-#: src/nautilus-window.c:1540
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "Tanca"
 
-#: src/nautilus-window-manage-views.c:242 src/nautilus-window-menus.c:656
-msgid "Nautilus"
-msgstr "Nautilus"
-
-#: src/nautilus-window-manage-views.c:719
+#. FIXME bugzilla.eazel.com 5037: The text Preview
+#. * Release is hardcoded here. Are all builds with
+#. * time stamps really best described as "preview
+#. * release"?.
+#.
+#: src/nautilus-window-manage-views.c:216
 #, c-format
-msgid "You do not have the permissions necessary to view \"%s\"."
-msgstr "No teniu els permissos necessaris per a veure \"%s\"."
-
-#: src/nautilus-window-manage-views.c:721
-#, fuzzy
-msgid "Inadequate Permissions"
-msgstr "Permissos"
+msgid "Preview Release %s: %s"
+msgstr ""
 
-#: src/nautilus-window-manage-views.c:916
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:929
+#: src/nautilus-window-manage-views.c:831
+#, c-format
+msgid ""
+"The %s view encountered an error and can't continue. You can choose another "
+"view or go to a different location."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:842
+#, c-format
+msgid "The %s view encountered an error while starting up."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:933
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
 "happening, you might want to turn this panel off."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:940
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1339
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr ""
 "No s'ha pogut trobar \"%s\". Si us plau comproveu l'ortografia i proveu de "
 "nou."
 
-#: src/nautilus-window-manage-views.c:1345
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
@@ -4451,54 +10079,70 @@ msgstr ""
 "\"%s\" no és una ubicació vàlida. Si us plau comproveu l'ortografia i proveu "
 "de nou."
 
-#: src/nautilus-window-manage-views.c:1363
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot handle items of this type."
-msgstr ""
-"No s'ha pogut mostrar \"%s\" perquè el Nautilus no pot gestionar elements "
-"d'aquest tipus."
-
-#: src/nautilus-window-manage-views.c:1367
-#, c-format
+#: src/nautilus-window-manage-views.c:1245
+#, fuzzy, c-format
 msgid ""
-"Couldn't display \"%s\", because Nautilus cannot handle items of type \"%s\"."
+"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
+"it is."
 msgstr ""
 "No s'ha pogut mostrar \"%s\" perquè el Nautilus no pot gestionar elements "
 "del tipus \"%s\"."
 
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy, c-format
+msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+msgstr "El Nautilus no pot mostrar \"%s\"."
+
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1379
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 "No s'ha pogut mostrar \"%s\" perquè el Nautilus no pot gestionar ubicacions "
 "%s: ."
 
-#: src/nautilus-window-manage-views.c:1385
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "No s'ha pogut mostrar \"%s\", perquè ha fallat l'intent d'entrada."
 
-#. FIXME bugzilla.eazel.com 2458: Need to give the user some advice about what to do here.
-#: src/nautilus-window-manage-views.c:1392
+#: src/nautilus-window-manage-views.c:1276
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because access was denied."
+msgstr "No s'ha pogut mostrar \"%s\", perquè ha fallat l'intent d'entrada."
+
+#: src/nautilus-window-manage-views.c:1287
+#, c-format
+msgid ""
+"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
+"the spelling is correct and that your proxy settings are correct."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1295
+#, fuzzy, c-format
+msgid ""
+"Couldn't display \"%s\", because the host name was empty. Check that your "
+"proxy settings are correct."
+msgstr "No s'ha pogut mostrar \"%s\", perquè ha fallat l'intent d'entrada."
+
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running.  Be sure that you have started the Medusa "
+"search service isn't running. Be sure that you have started the Medusa "
 "search service, and if you don't have an index, that the Medusa indexer is "
 "running."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1393
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1397
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "El Nautilus no pot mostrar \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1409
+#: src/nautilus-window-manage-views.c:1320
 #, fuzzy
 msgid "Can't Display Location"
 msgstr "Mostra la barra de ubicació"
@@ -4506,94 +10150,77 @@ msgstr "Mostra la barra de ubicació"
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:353
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
 msgstr ""
 
-#: src/nautilus-window-menus.c:356
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
 
-#: src/nautilus-window-menus.c:361
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr ""
 
-#: src/nautilus-window-menus.c:362
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr ""
 
-#: src/nautilus-window-menus.c:463
-#, fuzzy
-msgid "Hide Status Bar"
-msgstr "Barra d'estat"
-
-#: src/nautilus-window-menus.c:464
+#: src/nautilus-window-menus.c:466
 #, fuzzy
-msgid "Show Status Bar"
+msgid "Show St_atus Bar"
 msgstr "Barra d'estat"
 
-#: src/nautilus-window-menus.c:470
+#: src/nautilus-window-menus.c:472
 #, fuzzy
-msgid "Hide Sidebar"
+msgid "Show _Sidebar"
 msgstr "Barra lateral"
 
-#: src/nautilus-window-menus.c:471
-#, fuzzy
-msgid "Show Sidebar"
-msgstr "Barra lateral"
-
-#: src/nautilus-window-menus.c:477
-#, fuzzy
-msgid "Hide Tool Bar"
-msgstr "Barra d'eines"
-
 #: src/nautilus-window-menus.c:478
 #, fuzzy
-msgid "Show Tool Bar"
+msgid "Show _Toolbar"
 msgstr "Barra d'eines"
 
 #: src/nautilus-window-menus.c:484
 #, fuzzy
-msgid "Hide Location Bar"
+msgid "Show Location _Bar"
 msgstr "Barra d'ubicació"
 
-#: src/nautilus-window-menus.c:485
+#: src/nautilus-window-menus.c:535
 #, fuzzy
-msgid "Show Location Bar"
-msgstr "Barra d'ubicació"
+msgid "Preferences"
+msgstr "Nautilus: Preferències inicials"
 
-#. Localizers: This is the message in the dialog that appears if the user chooses "Edit Beginner Settings".
-#. * The first %s is the name of the lowest user level ("Beginner"). The 2nd and 4th %s are the
-#. * names of the middle user level ("Intermediate"). The 3rd %s is the name of the highest user
-#. * level ("Advanced").
+#. Localize to deal with
+#. * issues in the copyright
+#. * symbol characters -- do
+#. * not translate the
+#. * company name, please.
 #.
-#: src/nautilus-window-menus.c:569
-#, c-format
-msgid ""
-"None of the settings for the %s level can be edited. If you want to edit the "
-"settings you must choose the %s or %s level. Do you want to switch to the %s "
-"level now and edit its settings?"
+#: src/nautilus-window-menus.c:618
+msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr ""
 
-#. Localizers: This is the title of the dialog that appears if the user chooses "Edit Beginner Settings".
-#. * The %s is the name of the middle user level ("Intermediate").
-#.
-#: src/nautilus-window-menus.c:581
-#, fuzzy, c-format
-msgid "Switch to %s Level?"
-msgstr "Canviar a format automàtic?"
-
-#: src/nautilus-window-menus.c:660
+#: src/nautilus-window-menus.c:620
 msgid ""
-"Nautilus is a graphical shell \n"
-"for GNOME that makes it \n"
-"easy to manage your files \n"
+"Nautilus is a graphical shell\n"
+"for GNOME that makes it\n"
+"easy to manage your files\n"
 "and the rest of your system."
 msgstr ""
 
+#. translators should localize the following
+#. * string which will be displayed at the
+#. * bottom of the about box to give credit
+#. * to the translator(s)
+#.
+#: src/nautilus-window-menus.c:629
+msgid "Translator Credits"
+msgstr ""
+
 #: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
@@ -4620,266 +10247,538 @@ msgstr ""
 msgid "Go to Nonexistent Location"
 msgstr "Vés a la següent ubicació visitada"
 
-#: src/nautilus-window-menus.c:883
-msgid "Go to the specified location"
-msgstr "Vés a la ubicació especificada"
+#: src/nautilus-window-menus.c:877
+#, fuzzy
+msgid "Go to the location specified by this bookmark"
+msgstr "Vés a la ubicació que conté a aquesta"
 
-#: src/nautilus-window-menus.c:1144
-msgid "_File"
-msgstr "_Fitxer"
+#: src/nautilus-window-toolbars.c:402
+msgid "Back"
+msgstr "Endarrere"
 
-#: src/nautilus-window-menus.c:1148
-msgid "_Edit"
-msgstr "_Edita"
+#: src/nautilus-window-toolbars.c:404
+msgid "Forward"
+msgstr "Endarrere"
 
-#: src/nautilus-window-menus.c:1152
+#. Note to localizers: this font is used for the number in the
+#. * zoom control widget.
+#.
+#: src/nautilus-zoom-control.c:531
 #, fuzzy
-msgid "_View"
-msgstr "_Fitxer"
+msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
+msgstr "-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-*-*"
 
-#: src/nautilus-window-menus.c:1156
-msgid "_Go"
-msgstr "_Vés"
+#~ msgid "System"
+#~ msgstr "Sistema"
 
-#: src/nautilus-window-menus.c:1160
-msgid "_Bookmarks"
-msgstr "_Preferits"
+#~ msgid "Config files"
+#~ msgstr "Fitxers de configuració"
 
-#: src/nautilus-window-menus.c:1164
-msgid "_Help"
-msgstr "_Ajuda"
+#~ msgid "Command Line"
+#~ msgstr "Línia d'ordres"
 
-#. Localizers: This is the menu hint for the user-level setting (%s is name of user
-#. * level, "Beginner", "Intermediate", or "Advanced")
-#.
-#: src/nautilus-window-menus.c:1334
-#, c-format
-msgid "Use %s settings"
-msgstr ""
+#~ msgid "APIs"
+#~ msgstr "API"
 
-#: src/nautilus-window-menus.c:1376
-msgid "_New Window"
-msgstr "_Nova finestra"
+#~ msgid "Miscellaneous"
+#~ msgstr "Miscel·lània"
 
-#: src/nautilus-window-menus.c:1377
-msgid "Create a new window"
-msgstr "Crea una nova finestra"
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "You clicked the Kill Content View toolbar button."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Heu fet clic al botó 'Mata la vista de continguts' de la barra d'eines."
 
-#: src/nautilus-window-menus.c:1391
-msgid "_Close Window"
-msgstr "_Tanca la finestra"
+#~ msgid "Kill the Loser content view."
+#~ msgstr "Mata la vista de contingut del Loser"
 
-#: src/nautilus-window-menus.c:1392
-msgid "Close this window"
-msgstr "Tanca aquesta finestra"
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "You clicked the Kill Sidebar View toolbar button."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Heu fet clic al botó 'Mata la vista de la barra lateral' de la barra d'eines."
+
+#~ msgid "Loser"
+#~ msgstr "Loser"
+
+#~ msgid "Kill the Loser sidebar view."
+#~ msgstr "Mata la vista de la barra lateral del Loser."
+
+#~ msgid "_Mozilla"
+#~ msgstr "_Mozilla"
+
+#~ msgid "This is a mozilla merged menu item"
+#~ msgstr "Açò és un element del menú combinat del Mozilla"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "This is a mozilla merged toolbar button"
+#~ msgstr "Açò és un element del menú combinat del Mozilla"
 
-#: src/nautilus-window-menus.c:1403
 #, fuzzy
-msgid "Close _All Windows"
-msgstr "Tanca totes les finestres"
+#~ msgid "Verifying %s..."
+#~ msgstr "S'està escrivint..."
+
+#~ msgid "Package Title"
+#~ msgstr "Títol del paquet"
+
+#~ msgid "Size: "
+#~ msgstr "Mida: "
+
+#~ msgid "<size>"
+#~ msgstr "<mida>"
+
+#~ msgid "<unknown>"
+#~ msgstr "<desconegut>"
+
+#~ msgid "License: "
+#~ msgstr "Llicència: "
+
+#~ msgid "Build Date: "
+#~ msgstr "Data de muntatge: "
+
+#~ msgid "Vendor: "
+#~ msgstr "Venedor: "
+
+#~ msgid "Update"
+#~ msgstr "Actualitza"
+
+#~ msgid "Package \"%s\" "
+#~ msgstr "Paquet \"%s\" "
+
+#~ msgid "Package Contents: %d files"
+#~ msgstr "Contingut del paquet: %d fitxers"
 
-#: src/nautilus-window-menus.c:1404
 #, fuzzy
-msgid "Close all Nautilus windows"
-msgstr "Tanca totes les finestres"
+#~ msgid "Uninstall failed..."
+#~ msgstr "La desinstal·lació ha fallat"
 
-#: src/nautilus-window-menus.c:1432
 #, fuzzy
-msgid "_Web Search"
-msgstr "Cerca a la web"
+#~ msgid "Install failed..."
+#~ msgstr "La instal·lació ha fallat"
 
-#: src/nautilus-window-menus.c:1447 src/nautilus-window-menus.c:1833
-msgid "_Undo"
-msgstr "_Desfés"
+#~ msgid "Force install"
+#~ msgstr "Força la intal·lació"
 
-#: src/nautilus-window-menus.c:1448 src/nautilus-window-menus.c:1833
-msgid "Undo the last text change"
-msgstr "Desfà l'últim canvi al text"
+#~ msgid "Set port numer (80)"
+#~ msgstr "Especifiqueu el número de port (80)"
 
-#: src/nautilus-window-menus.c:1524
-msgid "_Select All"
-msgstr "_Selecciona-ho Tot"
+#~ msgid "Set tmp dir (/tmp/eazel-install)"
+#~ msgstr "Especifiqueu el directori temporal (/tmp/eazel-install)"
 
-#: src/nautilus-window-menus.c:1538
-msgid "_Customize..."
-msgstr "_Personalitzar..."
+#~ msgid "Creating temporary download directory ...\n"
+#~ msgstr "S'està creant un directori temporal de descàrrega ...\n"
 
-#: src/nautilus-window-menus.c:1539
-msgid ""
-"Displays the Property Browser, to add properties to objects and customize "
-"appearance"
-msgstr ""
-"Mostra el navegador de propietats, per afegir propietats als objectes i "
-"personalitzar l'aparença"
+#~ msgid "Could not create temporary directory!\n"
+#~ msgstr "No s'ha pogut crear un directori temporal!\n"
 
-#: src/nautilus-window-menus.c:1550
-msgid "_Change Appearance..."
-msgstr ""
+#~ msgid "Using local protocol cannot resolve library dependencies"
+#~ msgstr "La utilització d'un protocol local no pot resoldre les dependències"
 
-#: src/nautilus-window-menus.c:1551
-msgid ""
-"Displays a list of alternative appearances, to allow you to change the "
-"appearance"
-msgstr ""
+#, fuzzy
+#~ msgid "Using local protocol cannot fetch by id"
+#~ msgstr "La utilització d'un protocol local no pot resoldre les dependències"
 
-#: src/nautilus-window-menus.c:1567
-msgid "_Refresh"
-msgstr ""
+#, fuzzy
+#~ msgid "Could not get a URL for package id %s"
+#~ msgstr "No s'ha pogut obtenir una URL per a %s"
 
-#. Title computed dynamically
-#: src/nautilus-window-menus.c:1581
-msgid "Change the visibility of this window's sidebar"
-msgstr ""
+#, fuzzy
+#~ msgid "Could not retrieve a URL for id %s"
+#~ msgstr "No s'ha pogut recuperar un URL per a %s"
 
-#. Title computed dynamically
-#: src/nautilus-window-menus.c:1592
-msgid "Change the visibility of this window's tool bar"
-msgstr ""
+#~ msgid "Dry Run Mode Activated.  Packages will not actually be installed ..."
+#~ msgstr ""
+#~ "S'ha activat el mode Dry Run. Els paquets no s'instal·laran realment..."
 
-#. Title computed dynamically
-#: src/nautilus-window-menus.c:1603
-msgid "Change the visibility of this window's location bar"
-msgstr ""
+#~ msgid "*** Could not create tmp directory (%s)! ***\n"
+#~ msgstr "*** No s'ha pogut crear el directori tmp (%s)! ***\n"
 
-#. Title computed dynamically
-#: src/nautilus-window-menus.c:1614
-msgid "Change the visibility of this window's status bar"
-msgstr ""
+#, fuzzy
+#~ msgid "Reading the install package list %s"
+#~ msgstr "S'està llegint la llista de paquets d'instal·lació ..."
+
+#~ msgid "Category = %s"
+#~ msgstr "Categoria = %s"
 
-#: src/nautilus-window-menus.c:1630
 #, fuzzy
-msgid "Zoom _In"
-msgstr "Amplia el Zoom"
+#~ msgid "Preflight (%d bytes, %d packages)"
+#~ msgstr "Categoria = %s, %d paquets"
 
-#: src/nautilus-window-menus.c:1631
 #, fuzzy
-msgid "Show the contents in more detail"
-msgstr "(alguns continguts són il·legibles)"
+#~ msgid "Removing package %s %s"
+#~ msgstr "S'està eliminant el paquet %s"
+
+#~ msgid "RPM package database query failed !"
+#~ msgstr "La consulta a la base de dades de paquets de l'RPM ha fallat !"
 
-#: src/nautilus-window-menus.c:1642
 #, fuzzy
-msgid "Zoom _Out"
-msgstr "Redueix el Zoom"
+#~ msgid "Preparing package system"
+#~ msgstr "S'està eliminant el paquet %s"
 
-#: src/nautilus-window-menus.c:1643
-msgid "Show the contents in less detail"
-msgstr ""
+#~ msgid "%s conflicts %s-%s"
+#~ msgstr "%s provoca conflicte %s-%s"
 
-#: src/nautilus-window-menus.c:1654
 #, fuzzy
-msgid "_Normal Size"
-msgstr "Normalitza el menú"
+#~ msgid "Processing dep for %s, requires library %s"
+#~ msgstr "S'estàn processant les dependències per a %s : requereix %s"
 
-#: src/nautilus-window-menus.c:1655
-msgid "Show the contents at the normal size"
-msgstr ""
+#, fuzzy
+#~ msgid "Processing dep for %s, requires package %s"
+#~ msgstr "S'estàn processant les dependències per a %s : requereix %s"
 
-#: src/nautilus-window-menus.c:1670
-msgid "_Back"
-msgstr "_Endarrere"
+#, fuzzy
+#~ msgid "%d dependency failure(s)"
+#~ msgstr "%d dependències han fallat!"
 
-#: src/nautilus-window-menus.c:1682
-msgid "_Forward"
-msgstr "_Endavant"
+#~ msgid "Dependencies are ok"
+#~ msgstr "Les dependències estàn bé"
 
-#: src/nautilus-window-menus.c:1694
 #, fuzzy
-msgid "_Up a Level"
-msgstr "Nivells d'usuari"
+#~ msgid "Downloading package %s ..."
+#~ msgstr "S'està descarregant %s..."
 
-#: src/nautilus-window-menus.c:1706
-msgid "_Home"
-msgstr "_Inici"
+#, fuzzy
+#~ msgid "Preparing to install 1 package"
+#~ msgstr "S'està llegint la llista de paquets d'instal·lació ..."
 
-#: src/nautilus-window-menus.c:1719
-msgid "For_get History"
-msgstr ""
+#, fuzzy
+#~ msgid "Preparing to install %d packages"
+#~ msgstr "S'està llegint la llista de paquets d'instal·lació ..."
 
-#: src/nautilus-window-menus.c:1720
-msgid "Clear contents of Go menu and Back/Forward lists"
-msgstr ""
+#, fuzzy
+#~ msgid "Installation aborted."
+#~ msgstr "Data d'instal·lació: "
 
-#: src/nautilus-window-menus.c:1735
-msgid "_Add Bookmark"
-msgstr "_Afegeix preferit"
+#, fuzzy
+#~ msgid ""
+#~ "Installation Failed!\n"
+#~ "\n"
+#~ msgstr "La instal·lació ha fallat"
 
-#: src/nautilus-window-menus.c:1736
-msgid "Add a bookmark for the current location to this menu"
-msgstr "Afegeix la ubicació actual a la llista de preferits d'aquest menú"
+#, fuzzy
+#~ msgid "Could not fetch summary configuration !"
+#~ msgstr ""
+#~ "*** No s'ha pogut crear el fitxer de la configuració predeterminada! ***\n"
 
-#: src/nautilus-window-menus.c:1747
-msgid "_Edit Bookmarks..."
-msgstr "_Edita els preferits..."
+#, fuzzy
+#~ msgid "The summary configuration contains no data!\n"
+#~ msgstr "*** El fitxer de configuració no conté dades! ***\n"
 
-#: src/nautilus-window-menus.c:1748
-msgid "Display a window that allows editing the bookmarks in this menu"
-msgstr "Mostra una finestra que permet editar els preferits d'aquest menú"
+#, fuzzy
+#~ msgid "Cannot find the SUMMARY_DATA xmlnode!\n"
+#~ msgstr "*** No es pot trobar el node xml de TRANSACCIÓ! ***\n"
 
-#: src/nautilus-window-menus.c:1763
-msgid "_About Nautilus..."
-msgstr "_Quant al Nautilus"
+#, fuzzy
+#~ msgid "Bailing from the SUMMARY_DATA parse!\n"
+#~ msgstr "*** Bailing from category parse! ***\n"
 
-#: src/nautilus-window-menus.c:1764
-msgid "Displays information about the Nautilus program"
-msgstr "Mostra informació sobre el programa Nautilus"
+#, fuzzy
+#~ msgid "Bailing from summary configuration parse!\n"
+#~ msgstr "*** Bailing from transaction parse! ***\n"
 
-#: src/nautilus-window-menus.c:1817
-msgid "Edit Settings..."
-msgstr "Edita els paràmetres..."
+#~ msgid "display service name and such"
+#~ msgstr "visualitza el nom del servei i d'altres"
 
-#: src/nautilus-window-menus.c:1818
-msgid "Edit Settings for the Current User Level"
-msgstr "Edita els paràmetres per al nivell de l'usuari actual"
+#~ msgid "maximum allowed difference in seconds"
+#~ msgstr "diferència máxima permitida en segons"
 
-#: src/nautilus-window-menus.c:1882
-msgid "_Browse"
-msgstr ""
+#~ msgid "update the system clock"
+#~ msgstr "actualita el rellotge del sistema"
+
+#~ msgid "specify time url"
+#~ msgstr "especifica l'url de temps"
 
-#: src/nautilus-window-menus.c:1883
 #, fuzzy
-msgid "_Find"
-msgstr "Finalitzat"
+#~ msgid "Could not read time-service config from %s"
+#~ msgstr "No s'ha pogut recuperar un URL per a %s"
 
-#: src/nautilus-window-toolbars.c:109
-msgid "Back"
-msgstr "Endarrere"
+#~ msgid "Vault location"
+#~ msgstr "Ubicació del lloc d'arxiu"
 
-#: src/nautilus-window-toolbars.c:114
-msgid "Forward"
-msgstr "Endarrere"
+#~ msgid "Error: No operation supplied\n"
+#~ msgstr "S'ha produït un error: No s'ha subministrat cap operació\n"
 
-#: src/nautilus-window-toolbars.c:119
-msgid "Up"
-msgstr "A dalt"
+#~ msgid "Error: Invalid operation supplied (%s)\n"
+#~ msgstr "S'ha produït un error: L'operació subministrada no és vàlida (%s)\n"
+
+#~ msgid ""
+#~ "Error: Invalid syntax\n"
+#~ "Syntax: %s\n"
+#~ msgstr ""
+#~ "S'ha produït un error: La sintaxi no és vàlida\n"
+#~ "Sintaxi: %s\n"
+
+#~ msgid "moved"
+#~ msgstr "moguts"
+
+#~ msgid "You cannot throw \"%s\" into the Trash."
+#~ msgstr "No podeu llançar \"%s\" a la paperera."
 
-#: src/nautilus-window-toolbars.c:124
 #, fuzzy
-msgid "Refresh"
-msgstr "abans"
+#~ msgid "Folder Views"
+#~ msgstr "_Mata la vista de la barra lateral"
 
-#: src/nautilus-window-toolbars.c:131
-msgid "Home"
-msgstr "Inici"
+#, fuzzy
+#~ msgid "Views"
+#~ msgstr "Veure com %s"
 
-#: src/nautilus-window-toolbars.c:136
 #, fuzzy
-msgid "Find"
-msgstr "Finalitzat"
+#~ msgid "Navigation Settings"
+#~ msgstr "Edita els paràmetres..."
 
-#: src/nautilus-window-toolbars.c:141
-msgid "Web Search"
-msgstr "Cerca a la web"
+#, fuzzy
+#~ msgid "Home Location"
+#~ msgstr "Ubicació"
 
-#: src/nautilus-window-toolbars.c:154
-msgid "Services"
-msgstr "Serveis"
+#, fuzzy
+#~ msgid "Ask before deleting items from the trash"
+#~ msgstr "Mou tots els elements seleccionats a la Paperera"
 
-#. This is marked for localization in case the % sign is not
-#. * appropriate in some locale. I guess that's unlikely.
-#.
-#: src/nautilus-zoom-control.c:565
-msgid "%.0f%%"
-msgstr "%.0f%%"
+#, fuzzy
+#~ msgid "Can add Content"
+#~ msgstr "Continguts del paquet"
+
+#~ msgid ""
+#~ "Sorry, %s can only open local files, and \"%s\" is remote. If you want to "
+#~ "open it with %s, make a local copy first."
+#~ msgstr ""
+#~ "%s només pot obrir fitxers locals, i \"%s\" és remot. Si voleu obrir-lo amb "
+#~ "%s, feu primer una còpia local."
+
+#, fuzzy
+#~ msgid "applications"
+#~ msgstr "aplicació"
+
+#, fuzzy
+#~ msgid "directories"
+#~ msgstr "0 directoris"
+
+#, fuzzy
+#~ msgid "marked with \"%s\""
+#~ msgstr "marcat amb"
+
+#, fuzzy
+#~ msgid "that"
+#~ msgstr "Estat"
+
+#~ msgid "Reset _Background"
+#~ msgstr "Reinicialitza el _Fons"
+
+#~ msgid "Where:"
+#~ msgstr "On:"
+
+#, fuzzy
+#~ msgid "User Main Directory"
+#~ msgstr "Directori"
+
+#, fuzzy
+#~ msgid "Desktop Directory"
+#~ msgstr "Directori"
+
+#, fuzzy
+#~ msgid "Missing Directories"
+#~ msgstr "0 directoris"
+
+#~ msgid ""
+#~ "Nautilus can't be used now. Rebooting the computer or installing Nautilus "
+#~ "again may fix the problem."
+#~ msgstr ""
+#~ "El Nautilus no es pot utilitzar ara. Reiniciar l'ordinador o instalar el "
+#~ "Nautilus altra vegada pot arreglar el problema."
+
+#, fuzzy
+#~ msgid ""
+#~ "Eazel offers a growing number of services to \n"
+#~ "help you install and maintain new software and manage \n"
+#~ "your files across the network.  If you want to find out more \n"
+#~ "about Eazel services, just press the 'Next' button. "
+#~ msgstr ""
+#~ "Eazel ofereix un creixent nombre de serveis per a ajudar-vos a instal·lar i "
+#~ "mantenir noves aplicacions i gestionar els vostres fitxers a través de la "
+#~ "xarxa. Si voleu buscar més sobre els serveis de l'Eazel, premeu el botó "
+#~ "'Següent'."
+
+#~ msgid "I want to learn more about Eazel services."
+#~ msgstr "Vull aprendre més sobre els serveis de l'Eazel."
+
+#~ msgid "I want to sign up for Eazel services now."
+#~ msgstr "Vull contractar els serveis de l'Eazel ara."
+
+#, fuzzy
+#~ msgid "I don't want to learn about Eazel services at this time."
+#~ msgstr "No vull aprendre sobre els serveis de l'Eazel per ara."
+
+#, fuzzy
+#~ msgid "Updating Nautilus"
+#~ msgstr "Nautilus"
+
+#, fuzzy
+#~ msgid "HTTP Proxy Configuration"
+#~ msgstr "Configuaració"
+
+#, fuzzy
+#~ msgid ""
+#~ "Since this is the first time that you've launched\n"
+#~ "Nautilus, we'd like to ask you a few questions\n"
+#~ "to help personalize it for your use."
+#~ msgstr ""
+#~ "Benvingut al Nautilus!\n"
+#~ "Com aquesta és la primera vegada que executeu\n"
+#~ "el Nautilus, ens agaradria fer-vos unes preguntes\n"
+#~ "per a ajudar-vos a personalitzar-lo.\n"
+#~ "\n"
+#~ "Premeu el botó Següent per a continuar."
+
+#, fuzzy
+#~ msgid ""
+#~ "Click the finish button to launch Nautilus.\n"
+#~ "We hope that you enjoy using it!"
+#~ msgstr ""
+#~ "Premeu fins al botó Acabar per a executar el Nautilus.\n"
+#~ "\n"
+#~ "Esperem que disfruteu utilitzant-lo!"
+
+#, fuzzy
+#~ msgid "Select A User Level"
+#~ msgstr "Especifica el nivell de l'usuari principiant"
+
+#, fuzzy
+#~ msgid "Don't draw background and icons on desktop."
+#~ msgstr "Arrastra el fons i les icones a l'escriptori."
+
+#~ msgid "Draw background and icons on desktop."
+#~ msgstr "Arrastra el fons i les icones a l'escriptori."
+
+#~ msgid "Add a new %s"
+#~ msgstr "Afegeix un nou %s"
+
+#~ msgid "With Emblem"
+#~ msgstr "Amb l'emblema"
+
+#~ msgid "Last Modified"
+#~ msgstr "Última modificació"
+
+#~ msgid "Owned By"
+#~ msgstr "Propietat de"
+
+#~ msgid "starts with"
+#~ msgstr "comença amb"
+
+#~ msgid "ends with"
+#~ msgstr "acaba amb"
+
+#~ msgid "matches glob"
+#~ msgstr "coincidències globals"
+
+#~ msgid "matches regexp"
+#~ msgstr "coincidències regexp"
+
+#, fuzzy
+#~ msgid "includes all of"
+#~ msgstr "inclou"
+
+#, fuzzy
+#~ msgid "includes any of"
+#~ msgstr "inclou"
+
+#, fuzzy
+#~ msgid "includes none of"
+#~ msgstr "inclou"
+
+#~ msgid "is not"
+#~ msgstr "no és"
+
+#~ msgid "text file"
+#~ msgstr "fitxer de text"
+
+#~ msgid "application"
+#~ msgstr "aplicació"
+
+#~ msgid "directory"
+#~ msgstr "directori"
+
+#~ msgid "larger than"
+#~ msgstr "major de"
+
+#~ msgid "smaller than"
+#~ msgstr "menor de"
+
+#~ msgid "marked with"
+#~ msgstr "marcat amb"
+
+#~ msgid "not marked with"
+#~ msgstr "no marcat amb"
+
+#, fuzzy
+#~ msgid "is after"
+#~ msgstr "després"
+
+#, fuzzy
+#~ msgid "is before"
+#~ msgstr "abans"
+
+#, fuzzy
+#~ msgid ""
+#~ "The Nautilus shell is under development; it's not\n"
+#~ "ready for daily use. Some features are not yet done,\n"
+#~ "partly done, or unstable. The program doesn't look\n"
+#~ "or act exactly the way it will in version 1.0.\n"
+#~ "\n"
+#~ "If you do decide to test this version of Nautilus, \n"
+#~ "beware. The program could do something \n"
+#~ "unpredictable and may even delete or overwrite \n"
+#~ "files on your computer.\n"
+#~ "\n"
+#~ "For more information, visit http://nautilus.eazel.com."
+#~ msgstr ""
+#~ "La shell del Nautilus està desenvolupant-se; no està preparada per a un ús "
+#~ "habitual. Moltes característiques, incloent-hi algunes de les millors, "
+#~ "encara no estàn llestes deltot o són inestables. El programa no sembla o "
+#~ "actua com ho hauria de fer a la versió 1.0.\n"
+#~ "\n"
+#~ "Si decidiu provar aquesta versión del Nautilus, compte. El programa podria "
+#~ "fer alguna cosa impredecible i pot inclús esborrar o sobreescriure fitxers "
+#~ "al seu ordinador.\n"
+#~ "\n"
+#~ "Per a més informació, visiteu http://nautilus.eazel.com."
+
+#, fuzzy
+#~ msgid "Inadequate Permissions"
+#~ msgstr "Permissos"
+
+#~ msgid ""
+#~ "Couldn't display \"%s\", because Nautilus cannot handle items of this type."
+#~ msgstr ""
+#~ "No s'ha pogut mostrar \"%s\" perquè el Nautilus no pot gestionar elements "
+#~ "d'aquest tipus."
+
+#, fuzzy
+#~ msgid "Switch to %s Level?"
+#~ msgstr "Canviar a format automàtic?"
+
+#~ msgid "Go to the specified location"
+#~ msgstr "Vés a la ubicació especificada"
+
+#, fuzzy
+#~ msgid "_Web Search"
+#~ msgstr "Cerca a la web"
+
+#~ msgid "_Customize..."
+#~ msgstr "_Personalitzar..."
+
+#~ msgid "Edit Settings..."
+#~ msgstr "Edita els paràmetres..."
+
+#~ msgid "Edit Settings for the Current User Level"
+#~ msgstr "Edita els paràmetres per al nivell de l'usuari actual"
 
 #~ msgid "Specify config file (/var/eazel/services/eazel-services-config.xml)"
 #~ msgstr ""
@@ -4889,9 +10788,6 @@ msgstr "%.0f%%"
 #~ msgid "*** Could not generate xml package list! ***\n"
 #~ msgstr "*** No s'ha pogut generar la llista de paquets xml! ***\n"
 
-#~ msgid "XML package list successfully generated ...\n"
-#~ msgstr "Llista de paquets XML generada amb èxit ...\n"
-
 #~ msgid "*** Could not create temporary directory! ***\n"
 #~ msgstr "*** No s'ha pogut crear un directori temporal! ***\n"
 
@@ -4926,9 +10822,6 @@ msgstr "%.0f%%"
 #~ msgid "Transaction completed normally...\n"
 #~ msgstr "La transacció s'ha completat normalment...\n"
 
-#~ msgid "Lookup package in the db"
-#~ msgstr "Cerca el paquet a la base de dades"
-
 #~ msgid "Who owns specified files"
 #~ msgstr "Quí és el propietari dels fitxers especificats"
 
@@ -4941,15 +10834,9 @@ msgstr "%.0f%%"
 #~ msgid "Installing \"The Gimp\""
 #~ msgstr "S'està instal·lant \"The Gimp\""
 
-#~ msgid "Results"
-#~ msgstr "Resultats"
-
 #~ msgid "Finish"
 #~ msgstr "Finalitza"
 
-#~ msgid "Stored"
-#~ msgstr "Enmagatzemat"
-
 #~ msgid "With Note"
 #~ msgstr "Amb la nota"
 
@@ -4968,9 +10855,6 @@ msgstr "%.0f%%"
 #~ msgid "100 KB"
 #~ msgstr "100 kB"
 
-#~ msgid "1 MB"
-#~ msgstr "1 MB"
-
 #~ msgid "10 MB"
 #~ msgstr "10 MB"
 
@@ -4995,9 +10879,6 @@ msgstr "%.0f%%"
 #~ "l'instal·lador de forma real, sense\n"
 #~ "l' --assenyalador de prova... Compte!"
 
-#~ msgid "Nautilus install tool"
-#~ msgstr "Eina d'instal·lació del Nautilus"
-
 #~ msgid "Step one:"
 #~ msgstr "Primer pas:"
 
@@ -5072,12 +10953,6 @@ msgstr "%.0f%%"
 #~ msgid "Couldn't find pixmap file: %s"
 #~ msgstr "No s'ha pogut trobar el fitxer de mapa de píxels: %s"
 
-#~ msgid "Couldn't create pixmap from file: %s"
-#~ msgstr "No s'ha pogut crear el mapa de píxels a partir del fitxer: %s"
-
-#~ msgid "Novice"
-#~ msgstr "Pricipiant"
-
 #~ msgid "Hacker"
 #~ msgstr "Expert"
 
@@ -5099,15 +10974,9 @@ msgstr "%.0f%%"
 #~ msgid "Contacting %s"
 #~ msgstr "S'està contactant amb %s"
 
-#~ msgid "Waiting for a connection..."
-#~ msgstr "S'està esperant una connexió..."
-
 #~ msgid "Logging in..."
 #~ msgstr "S'està entrant..."
 
-#~ msgid "Read %d%%%% of %ld"
-#~ msgstr "S'ha llegit %d%%%% de %ld"
-
 #~ msgid "Read %ld bytes"
 #~ msgstr "S'han llegit %ld octets"
 
@@ -5182,30 +11051,18 @@ msgstr "%.0f%%"
 #~ msgid " --"
 #~ msgstr " --"
 
-#~ msgid " -_,;.?/&"
-#~ msgstr " -_,;.?/&"
-
 #~ msgid "Undo Rename"
 #~ msgstr "Desfés el canvi de nom"
 
 #~ msgid "Redo Rename"
 #~ msgstr "Refés canviar el nom"
 
-#~ msgid "Nautilus: View as Other"
-#~ msgstr "Nautilus: Veure com un altre"
-
-#~ msgid "_Cut"
-#~ msgstr "_Talla"
-
 #~ msgid "Remove selected text from selection"
 #~ msgstr "Elimina el text seleccionat de la selecció"
 
 #~ msgid "_Copy"
 #~ msgstr "_Copia"
 
-#~ msgid "Copy selected text to the clipboard"
-#~ msgstr "Copia el text seleccionat al portaretalls"
-
 #~ msgid "_Paste"
 #~ msgstr "_Enganxa"
 
@@ -5224,13 +11081,6 @@ msgstr "%.0f%%"
 #~ msgid "File copy error"
 #~ msgstr "Hi ha un error en la còpia del fitxer"
 
-#~ msgid ""
-#~ "Error \"%s\" copying file %s.\n"
-#~ "Would you like to continue?"
-#~ msgstr ""
-#~ "S'ha produït un error \"%s\" en copiar el fitxer %s.\n"
-#~ "Voleu continuar?"
-
 #~ msgid "File copy conflict"
 #~ msgstr "Hi ha un conflicte en la còpia del fitxer"
 
@@ -5249,30 +11099,12 @@ msgstr "%.0f%%"
 #~ "no s'ha pogut començar:\n"
 #~ "%s"
 
-#~ msgid "OK"
-#~ msgstr "D'acord"
-
-#~ msgid "You cannot move the Trash."
-#~ msgstr "No podeu moure la paperera."
-
 #~ msgid "You cannot throw away the Trash."
 #~ msgstr "No podeu llançar la paperera."
 
-#~ msgid "%s%s"
-#~ msgstr "%s%s"
-
 #~ msgid "Deleting items"
 #~ msgstr "S'estàn suprimint els elements"
 
-#~ msgid "Cancel"
-#~ msgstr "Cancel·la"
-
-#~ msgid "_Delete..."
-#~ msgstr "_Suprimeix..."
-
-#~ msgid "Zoom to Default"
-#~ msgstr "Deixa el Zoom Predeterminat"
-
 #~ msgid "Nautilus: Icon Captions"
 #~ msgstr "Nautilus: títol de les icones"
 
@@ -5303,48 +11135,21 @@ msgstr "%.0f%%"
 #~ msgid "Nautilus: %s Properties"
 #~ msgstr "Nautilus: propietats %s"
 
-#~ msgid "Nautilus: Bookmarks"
-#~ msgstr "Nautilus: Preferits"
-
-#~ msgid "Nautilus: %s"
-#~ msgstr "Nautilus: %s"
-
 #~ msgid "The Gnome Shell"
 #~ msgstr "La shell del GNOME"
 
 #~ msgid "Go To Bad Location"
 #~ msgstr "Vés a la ubicació incorrecta"
 
-#~ msgid "Go to the previous visited location"
-#~ msgstr "Vés a la ubicació visitada anteriorment"
-
 #~ msgid "_Up"
 #~ msgstr "_A dalt"
 
-#~ msgid "Go to the location that contains this one"
-#~ msgstr "Vés a la ubicació que conté a aquesta"
-
-#~ msgid "Go to the home location"
-#~ msgstr "Vés a la ubicació d'inici"
-
-#~ msgid "Show/Hide Stuff"
-#~ msgstr "Mostra/amaga elements"
-
-#~ msgid " Novice"
-#~ msgstr "Principiant"
-
-#~ msgid " Intermediate"
-#~ msgstr "Intermedi"
-
 #~ msgid "Set Intermediate User Level"
 #~ msgstr "Especifica el nivell de l'usuari intermedi"
 
 #~ msgid " Expert"
 #~ msgstr "Expert"
 
-#~ msgid "Set Expert User Level"
-#~ msgstr "Especifica el nivell de l'usuari expert"
-
 #~ msgid "Go to the previously visited directory"
 #~ msgstr "Vés al directori visitat abans"
 
@@ -5360,14 +11165,5 @@ msgstr "%.0f%%"
 #~ msgid "Reload this view"
 #~ msgstr "Actualitza aquesta vista"
 
-#~ msgid "Go to your home directory"
-#~ msgstr "Va al directori d'inici"
-
-#~ msgid "Search this computer for files"
-#~ msgstr "Cerca fitxers en aquest ordinador"
-
-#~ msgid "Search the web"
-#~ msgstr "Cerca a la web"
-
 #~ msgid "Interrupt loading"
 #~ msgstr "Interromp la càrrega"
diff --git a/po/da.po b/po/da.po
index 50c0f73b5..f4f33a5ab 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,10 +8,15 @@
 # af et tilvalg så oversæt det. Dette gælder bl.a. 
 # "APPENDIX", "GEOMETRY".
 #
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus\n"
-"POT-Creation-Date: 2001-03-07 19:06+0100\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-02-21 22:50+01:00\n"
 "Last-Translator: <kenneth@gnu.org>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -148,8 +153,8 @@ msgid "Previous"
 msgstr "Forrige"
 
 #: components/help/converters/gnome-db2html2/gdb3html.c:721
-#: libnautilus-extensions/nautilus-global-preferences.c:686
-#: src/nautilus-shell-ui.xml.h:38
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "Hjem"
 
@@ -338,16 +343,14 @@ msgid "Kernel Routines"
 msgstr "Kernerutiner"
 
 #: components/help/hyperbola-filefmt.c:703
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
 msgid "Info"
 msgstr "Info"
 
-#: components/help/hyperbola-nav-tree.c:279
+#: components/help/hyperbola-nav-tree.c:310
 msgid "Introductory Documents:"
 msgstr "Introducerende dokumenter:"
 
-#: components/help/hyperbola-nav-tree.c:293
+#: components/help/hyperbola-nav-tree.c:324
 msgid "Documents by Subject:"
 msgstr "Dokumenter efter emne:"
 
@@ -420,7 +423,7 @@ msgstr "Sidepanel til historik"
 msgid "History sidebar panel for Nautilus"
 msgstr "Historik-sidepanel til Nautilus"
 
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "Kunne ikke klargøre Bonobo"
 
@@ -478,7 +481,7 @@ msgstr "Dræb taberens indholdsvisning"
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "_Fil"
 
@@ -562,7 +565,7 @@ msgid "Sidebar Loser"
 msgstr "Sidepanelstaber"
 
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -572,7 +575,7 @@ msgstr ""
 "  %s"
 
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -1013,7 +1016,6 @@ msgid "Oldies"
 msgstr "Evergreens"
 
 #: components/music/mpg123.c:32
-#: libnautilus-extensions/nautilus-font-picker.c:115
 msgid "Other"
 msgstr "Andre"
 
@@ -1652,10 +1654,10 @@ msgid "Pause"
 msgstr "Pause"
 
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:945
-#: libnautilus-extensions/nautilus-file-operations.c:960
 #: libnautilus-extensions/nautilus-file-operations.c:979
-#: src/nautilus-shell-ui.xml.h:60
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Stop"
 
@@ -1705,23 +1707,6 @@ msgstr "Fabrik for musik-visning"
 msgid "View as Music"
 msgstr "Vis som musik"
 
-#. FIXME: eventually, get this from preferences
-#. set up the default font
-#: components/notes/nautilus-notes.c:200
-#: components/text/nautilus-text-view.c:186
-#: libnautilus-extensions/nautilus-global-preferences.c:1118
-#: libnautilus-extensions/nautilus-icon-container.c:3332
-#: libnautilus-extensions/nautilus-icon-container.c:3333
-#: libnautilus-extensions/nautilus-icon-container.c:3334
-#: libnautilus-extensions/nautilus-icon-container.c:3335
-#: libnautilus-extensions/nautilus-icon-container.c:3336
-#: libnautilus-extensions/nautilus-icon-container.c:3337
-#: libnautilus-extensions/nautilus-icon-container.c:3338
-#: libnautilus-extensions/nautilus-preferences-item.c:482
-#: src/nautilus-sidebar-title.c:495
-msgid "helvetica"
-msgstr "helvetica"
-
 #: components/notes/Nautilus_View_notes.oaf.in.h:1
 msgid "Factory for annotation view"
 msgstr "Fabrik for notevisning"
@@ -1813,7 +1798,7 @@ msgstr "Angiv søge-cgi"
 #: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
 #: components/services/install/command-line/eazel-test-packsys.c:590
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "Vis fejlfindingsinfo"
 
@@ -1877,171 +1862,174 @@ msgstr "RPM-parametre er nødvendige filer"
 msgid "Run Query"
 msgstr "Kør forespørgsel"
 
-#. Disabled for 1.0
-#. {"revert", 'r', POPT_ARG_NONE, &arg_revert, 0, N_("Revert"), NULL},
-#: components/services/install/command-line/eazel-alt-install-corba.c:127
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
+#, fuzzy
+msgid "Revert"
+msgstr "aldrig"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr "Sæt rod"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:128
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "Angiv vært"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:129
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
 msgid "Dont print too much, just problems and download"
 msgstr "Skriv ikke for meget, kun problemer og nedhentning"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:130
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr "Udfør ssl-omdøbing"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:131
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
 msgid "argument is a suite id"
 msgstr "parameteren er en suite id"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "Testkørsel"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr "Tillad brugernavn"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:134
-#: components/services/install/lib/eazel-install-problem.c:1011
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "Tillad opgraderinger"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "Snaksalig udskrift"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:136
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
 msgid "Install a specific package version"
 msgstr "Installér en specifik pakkeudgave"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:159
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
 msgid "*** You cannot specify more then one protocol type.\n"
 msgstr "*** Du kan ikke specificere mere end én protokoltype.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:176
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
 msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
 msgstr "*** Slet eller gør om ? Skal vi ikke spille bombermand :)\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:285
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, c-format
 msgid "File conflict checking %s...\n"
 msgstr "Kontrollerer for filkonflikt, %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:299
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, c-format
 msgid "File uniqueness checking %s...\n"
 msgstr "Kontrollerer for unikthed, %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:313
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
 #, c-format
 msgid "Feature consistency checking %s...\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:344
-#: components/services/install/lib/eazel-install-protocols.c:110
-#: components/services/install/lib/eazel-install-protocols.c:248
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
 #, c-format
 msgid "Downloading %s..."
 msgstr "Henter %s..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:360
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
 msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
 msgstr "Henter %s... (%d/%d) = %d%% %.1f KB/s"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:368
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
 msgid "Downloading %s... (%d/%d) = %d%%"
 msgstr "Henter %s... (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:376
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
 #, c-format
 msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
 msgstr "Henter %s... (%d/%d) %.1f KB/s færdig         \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:381
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
 #, c-format
 msgid "Downloading %s... %3.1f KB/s Done\n"
 msgstr "Henter %s...  %3.1f KB/s færdig\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:409
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "Installerer  %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:417
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "Afinstallerer %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:439
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "Installerer %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% færdig\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:446
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "Afinstallerer %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% færdig\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:454
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
 msgid "Done\n"
 msgstr "Færdig\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:474
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
 #, c-format
 msgid "Download of %s FAILED\n"
 msgstr "Hentning af %s MISLYKKEDES\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:496
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
 #, c-format
 msgid "Package %s failed to uninstall.\n"
 msgstr "Afinstallering af %s mislykkedes.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:498
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
 #, c-format
 msgid "Package %s failed to install.\n"
 msgstr "Installering af %s mislykkedes.\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:519
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
 #, c-format
 msgid "\t· Problem : %s\n"
 msgstr "\t· Problem : %s\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:528
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
 #, c-format
 msgid "\t· Action : %s\n"
 msgstr "\t· Handling : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:571
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
 msgid "Cancelling operation\n"
 msgstr "Afbryder operation\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:582
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
 #, c-format
 msgid "About to install a total of %d packages, %dKB\n"
 msgstr "På vej til at installere %d pakker, %d KB\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:586
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
 #, c-format
 msgid "About to uninstall a total of %d packages, %dKB\n"
 msgstr "På vej til at afinstallere %d pakker, %d KB\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:590
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
 #, c-format
 msgid "About to revert a total of %d packages, %d KB\n"
 msgstr "På vej til at forkaste %d pakker, %d KB\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:607
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
 #, c-format
 msgid "\t· %s and it's dependencies\n"
 msgstr ""
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:610
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
 #, c-format
 msgid "\t· %s\n"
 msgstr "\t· %s\n"
@@ -2051,38 +2039,38 @@ msgstr "\t· %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n) " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:638
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
 msgid "Save transaction report ? (y/n) "
 msgstr "Gem overførselsrapport ? (j/n) "
 
 #. I18N note: y is the letter for the word Yes. This is
 #. used in the response for a yes/no questions. Your translation
 #. must be 1 character only.
-#: components/services/install/command-line/eazel-alt-install-corba.c:649
-#: components/services/install/command-line/eazel-alt-install-corba.c:769
-#: components/services/install/command-line/eazel-alt-install-corba.c:811
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
 msgid "y"
 msgstr "j"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:670
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
 #, c-format
 msgid "Dependency : %s needs %s\n"
 msgstr "Afhængighed : %s behøver %s\n"
 
 #. I18N note: %s is a package name
-#: components/services/install/command-line/eazel-alt-install-corba.c:688
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
 #, c-format
 msgid "Package %s failed md5 check!\n"
 msgstr "MD5-tjek af pakken %s fejlede!\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:690
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
 #, c-format
 msgid "\t· server MD5 checksum is %s\n"
 msgstr ""
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:692
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
 #, c-format
 msgid "\t· actual MD5 checksum is %s\n"
 msgstr ""
@@ -2092,7 +2080,7 @@ msgstr ""
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:758
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
 msgid "Continue? (y/n) "
 msgstr "Fortsæt? (j/n) "
 
@@ -2101,83 +2089,83 @@ msgstr "Fortsæt? (j/n) "
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:799
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
 msgid "Should I delete the RPM files? (y/n) "
 msgstr "Skal RPM-filerne slettes? (j/n) "
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:831
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
 msgid "Operation ok\n"
 msgstr "Operation forløb fint\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:833
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
 msgid "Operation failed\n"
 msgstr "Operationen mislykkedes!\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:959
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
 msgid "Installing"
 msgstr "Installerer"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:968
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
 msgid "Uninstalling"
 msgstr "Afinstallerer"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:983
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
 msgid "Only one operation at a time please."
 msgstr "Kun en operation af gangen, tak."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:988
-#: components/services/install/command-line/eazel-alt-install-corba.c:996
-#: components/services/install/command-line/eazel-alt-install-corba.c:1040
-#: components/services/install/command-line/eazel-alt-install-corba.c:1047
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
 #, c-format
 msgid "%s: --help for usage\n"
 msgstr "%s: --help for brug\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
 #, c-format
 msgid "Name         : %s\n"
 msgstr "Navn         : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
 #, c-format
 msgid "Version      : %s\n"
 msgstr "Udgave       : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1014
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
 #, c-format
 msgid "Minor        : %s\n"
 msgstr "Pakning      : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
 #, c-format
 msgid "Size         : %d\n"
 msgstr "Størrelse    : %d\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
 #, c-format
 msgid "Arch         : %s\n"
 msgstr "Aktitektur   : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
 #, c-format
 msgid "Distribution : %s\n"
 msgstr "Distribution : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1019
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
 #, c-format
 msgid "Description  : %s\n"
 msgstr "Beskrivelse  : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1021
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
 #, fuzzy, c-format
 msgid "Install root : %s\n"
 msgstr "Installér både %s og %s"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1024
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
 msgid "Provides     : \n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1066
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
 #, c-format
 msgid "exit code %d\n"
 msgstr "afslutskode %d\n"
@@ -2190,122 +2178,129 @@ msgstr "Angiv pakkeliste som skal bruges (/var/eazel/service/package-list.xml)"
 msgid "Use specified file to generate a package list, requires --packagelist"
 msgstr "Brug angivet fil til at generere en pakkeliste, behøver --packagelist"
 
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 msgid "Softcat server to connect to"
 msgstr "Softcat-vært at koble op på"
 
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr "Benyt alternativ CGI-sti"
 
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr "Tilkobl som en softcat-bruger gennem Ammonite"
 
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 msgid "Number of times to try the request"
 msgstr "Antal gange forespørgslen forsøges"
 
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr "Pause mellem forespørgselsforsøg, i mikrosekunder"
 
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr "Slå op efter Eazel-pakkeid"
 
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+#, fuzzy
+msgid "Lookup package that features a feature/file"
 msgstr "Slå pakke op der tilbyder en facilitet/fil"
 
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr "Slå pakke op med en specifik version"
 
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr "(med --version) Brug >= sammenligning"
 
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 msgid "use check function (for debugging)"
 msgstr "benyt kontrollérfunktion (til fejlretning)"
 
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 msgid "Show detailed sub-package info"
 msgstr "Vis detaljeret underpakke-info"
 
-#: components/services/install/lib/eazel-install-logic2.c:99
+#: components/services/install/command-line/eazel-test-softcat.c:66
+#, fuzzy
+msgid "enable funk parser"
+msgstr "Anvend hurtig søgning"
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "Låsning af den hentede fil mislykkedes"
 
-#: components/services/install/lib/eazel-install-logic2.c:116
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "MD5 uoverensstemmelse, pakke %s kan være beskadiget"
 
-#: components/services/install/lib/eazel-install-logic2.c:132
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, c-format
 msgid "No MD5 available for %s"
 msgstr "Ingen MD5 tilstede for %s"
 
 #. I18N note: "%is is ok" in the sense that %s=package name and the
 #. package is intact
-#: components/services/install/lib/eazel-install-logic2.c:327
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, c-format
 msgid "%s is ok"
 msgstr "%s er i orden"
 
-#: components/services/install/lib/eazel-install-logic2.c:433
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s version %s-%s er allerede installeret"
 
-#: components/services/install/lib/eazel-install-logic2.c:437
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s version %s er allerede installeret"
 
-#: components/services/install/lib/eazel-install-logic2.c:446
-#: components/services/install/lib/eazel-install-logic2.c:451
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr "%s opgraderinger fra version %s-%s til %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:460
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr "%s nedgraderinger fra version %s-%s til %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:465
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr "%s nedgraderinger fra version %s til %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:518
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr "%s installerer version %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:523
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr "%s installerer version %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:687
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, fuzzy, c-format
 msgid "Loading package info from file %s"
 msgstr "Henter information om pakke ..."
 
 #. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
-#: components/services/install/lib/eazel-install-logic2.c:993
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "ok"
 msgstr "i orden"
 
-#: components/services/install/lib/eazel-install-logic2.c:993
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "not ok"
 msgstr "ikke i orden"
 
-#: components/services/install/lib/eazel-install-logic2.c:1159
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
 msgid "Checking dependencies for %s"
 msgstr "Kontrollerer afhængigheder for %s"
@@ -2313,235 +2308,235 @@ msgstr "Kontrollerer afhængigheder for %s"
 #. I18N note: both %s' are package names.
 #. related is in the sense that the two packages apparently
 #. are connected somehow, eg. foo and foo-devel
-#: components/services/install/lib/eazel-install-logic2.c:1766
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, fuzzy, c-format
 msgid "%s is related to %s"
 msgstr "\"%s\" valgt (%s)"
 
-#: components/services/install/lib/eazel-install-logic2.c:1826
+#: components/services/install/lib/eazel-install-logic2.c:2090
 #, c-format
 msgid "updating %s to version %s-%s solves conflict"
 msgstr "opdatering af %s til udgave %s-%s løser konflikten"
 
-#: components/services/install/lib/eazel-install-logic2.c:1842
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
 msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1849
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, c-format
 msgid "could not revive %s"
 msgstr "Kunne ikke forny %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2004
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
 msgid "file uniqueness checking %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2025
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
 msgid "Duplicate file : %s occurs in %s and %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2037
-#: components/services/install/lib/eazel-install-logic2.c:2191
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
 msgid "... but it's ok, the packages are related"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2045
+#: components/services/install/lib/eazel-install-logic2.c:2324
 #, fuzzy, c-format
 msgid "(there were %d other conflicts)"
 msgstr "Men der er filkonflikter"
 
-#: components/services/install/lib/eazel-install-logic2.c:2140
+#: components/services/install/lib/eazel-install-logic2.c:2419
 #, fuzzy, c-format
 msgid "file conflict checking %s"
 msgstr "%s havde en fil i konflikt med %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2177
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
 msgid "file conflict : package %s already provides file %s also provided by %s"
 msgstr ""
 
 #. the owner of this file is a package that we're upgrading, and the
 #. * new version no longer has this file, so everything's okay.
-#: components/services/install/lib/eazel-install-logic2.c:2187
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
 msgid "...but it is okay, we're upgrading %s and it ditched that file"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2279
+#: components/services/install/lib/eazel-install-logic2.c:2558
 #, c-format
 msgid "checking feature consistency of %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2347
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
 msgid ""
 "feature missing : %s breaks if %s is installed (feature %s would be lost"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2426
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, fuzzy, c-format
 msgid "downloading %d packages"
 msgstr "Henter pakker"
 
-#: components/services/install/lib/eazel-install-logic2.c:2695
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, c-format
 msgid "will upgrade %s"
 msgstr "vil opgradere %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2698
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, c-format
 msgid "will downgrade %s"
 msgstr "vil nedgradere %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2701
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, c-format
 msgid "will install %s"
 msgstr "vil installere %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2704
+#: components/services/install/lib/eazel-install-logic2.c:2960
 #, c-format
 msgid "will uninstall %s"
 msgstr "vil affinstallere %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2789
-#: components/services/install/lib/eazel-install-problem.c:335
-#: components/services/install/lib/eazel-install-problem.c:338
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
 #, c-format
 msgid "%s requires %s"
 msgstr "%s er afhængig af %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2982
+#: components/services/install/lib/eazel-install-logic2.c:3238
 #, c-format
 msgid "failed %s"
 msgstr "Mislykket %s"
 
-#: components/services/install/lib/eazel-install-metadata.c:171
+#: components/services/install/lib/eazel-install-metadata.c:174
 msgid "Could not set URLType from config file!"
 msgstr "Kunne ikke sætte URLType fra konfigurationsfilen!"
 
-#: components/services/install/lib/eazel-install-object.c:713
+#: components/services/install/lib/eazel-install-object.c:717
 msgid "Transactions are not stored, could not find home dir"
 msgstr "Transaktioner gemmes ikke, kunne ikke finde hjemmekatalog"
 
-#: components/services/install/lib/eazel-install-object.c:741
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr "Transaktioner gemmes i %s"
 
-#: components/services/install/lib/eazel-install-object.c:998
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "Henter pakkeliste fra ekstern betjener ...\n"
 
-#: components/services/install/lib/eazel-install-object.c:1014
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "Kan ikke modtage package-list.xml!\n"
 
-#: components/services/install/lib/eazel-install-object.c:1087
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr "Kan ikke skrive til fil %s, bruger standard-loghåndtering"
 
-#: components/services/install/lib/eazel-install-object.c:1218
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "Installering mislykkedes"
 
-#: components/services/install/lib/eazel-install-object.c:1264
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "Afinstallering mislykkedes"
 
-#: components/services/install/lib/eazel-install-object.c:1387
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "Kunne ikke oprette transaktionskatalog (%s)! ***\n"
 
-#: components/services/install/lib/eazel-install-object.c:1410
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr "Skriver transaktion til %s"
 
-#: components/services/install/lib/eazel-install-problem.c:159
+#: components/services/install/lib/eazel-install-problem.c:163
 #, c-format
 msgid "%s was cancelled"
 msgstr "%s blev annulleret"
 
-#: components/services/install/lib/eazel-install-problem.c:164
-#: components/services/install/lib/eazel-install-problem.c:327
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
 msgid "%s is a source package, which is not yet supported"
 msgstr "%s er en kildepakke, hvilket ikke er understøttet endnu"
 
-#: components/services/install/lib/eazel-install-problem.c:178
-#: components/services/install/lib/eazel-install-problem.c:189
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
 #, c-format
 msgid "%s would break other packages"
 msgstr "%s ville ødelægge andre pakker"
 
-#: components/services/install/lib/eazel-install-problem.c:181
+#: components/services/install/lib/eazel-install-problem.c:185
 #, c-format
 msgid "%s would break"
 msgstr "%s ville ødelægge"
 
-#: components/services/install/lib/eazel-install-problem.c:187
+#: components/services/install/lib/eazel-install-problem.c:191
 #, c-format
 msgid "%s would break %s"
 msgstr "%s ville ødelægge %s"
 
-#: components/services/install/lib/eazel-install-problem.c:193
+#: components/services/install/lib/eazel-install-problem.c:197
 #, c-format
 msgid "%s is damaged"
 msgstr "%s er beskadiget"
 
-#: components/services/install/lib/eazel-install-problem.c:197
+#: components/services/install/lib/eazel-install-problem.c:201
 #, c-format
 msgid "%s requires %s, which could not be found on the server"
 msgstr "%s kræver %s, som ikke kunne findes på betjeneren"
 
-#: components/services/install/lib/eazel-install-problem.c:200
-#, c-format
-msgid "%s could not be found on the server"
+#: components/services/install/lib/eazel-install-problem.c:204
+#, fuzzy, c-format
+msgid "%s for %s could not be found on the server"
 msgstr "%s kunne ikke findes på betjeneren"
 
-#: components/services/install/lib/eazel-install-problem.c:208
-#: components/services/install/lib/eazel-install-problem.c:353
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr "%s er allerede installeret"
 
-#: components/services/install/lib/eazel-install-problem.c:252
+#: components/services/install/lib/eazel-install-problem.c:259
 #, fuzzy, c-format
 msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr "%s som er nyere, er allerede installeret og nedgradering er ikke mulig"
 
-#: components/services/install/lib/eazel-install-problem.c:256
+#: components/services/install/lib/eazel-install-problem.c:263
 #, c-format
 msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr "%s som er ældre, kræver opgradering og opgradering er ikke slået til"
 
-#: components/services/install/lib/eazel-install-problem.c:346
+#: components/services/install/lib/eazel-install-problem.c:353
 #, fuzzy, c-format
 msgid "%s is not installed and could not be found on server"
 msgstr "%s kunne ikke findes på betjeneren"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:913
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr "Se efter en ny version af %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:924
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr "Installér både %s og %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:939
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr "Fjern %s fra dit system"
@@ -2549,232 +2544,232 @@ msgstr "Fjern %s fra dit system"
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:952
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr "Gennemtving fjernelsen af %s fra dit system"
 
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:960
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr "Pakkedatabase har en inkonsistens"
 
-#: components/services/install/lib/eazel-install-problem.c:1008
+#: components/services/install/lib/eazel-install-problem.c:1015
 msgid "Continue with force"
 msgstr "Fortsæt med tvang"
 
-#: components/services/install/lib/eazel-install-problem.c:1014
+#: components/services/install/lib/eazel-install-problem.c:1021
 msgid "Allow downgrade"
 msgstr "Tillad nedgradering"
 
-#: components/services/install/lib/eazel-install-protocols.c:123
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:166
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
 #, c-format
 msgid "Could not open target file %s"
 msgstr "Kunne ikke åbne mål-fil %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:130
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:92
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
 msgid "Could not create an http request !"
 msgstr "Kunne ikke oprette en http-forespørgsel!"
 
-#: components/services/install/lib/eazel-install-protocols.c:137
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:99
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
 msgid "Proxy: Invalid uri !"
 msgstr "Mellemvært: Ugyldig uri!"
 
-#: components/services/install/lib/eazel-install-protocols.c:142
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:105
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
 msgid "Invalid uri !"
 msgstr "Ugyldig uri!"
 
-#: components/services/install/lib/eazel-install-protocols.c:149
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:115
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
 msgid "Could not prepare http request !"
 msgstr "Kunne ikke forberede http-forespørgsel!"
 
-#: components/services/install/lib/eazel-install-protocols.c:154
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:120
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
 msgid "Couldn't get async mode "
 msgstr "Kunne ikke gå over i asynkron tilstand"
 
 #. probably out of disk space
-#: components/services/install/lib/eazel-install-protocols.c:183
-#: components/services/install/lib/eazel-install-protocols.c:212
-#: components/services/install/lib/eazel-install-protocols.c:228
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, c-format
 msgid "DISK FULL: could not write %s"
 msgstr "DISKEN FYLDT: kunne ikke skrive %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:189
-#: components/services/install/lib/eazel-install-protocols.c:217
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
 msgid "Could not get request body!"
 msgstr "Fik ikke forespørgslens krop!"
 
-#: components/services/install/lib/eazel-install-protocols.c:202
+#: components/services/install/lib/eazel-install-protocols.c:208
 #, c-format
 msgid "HTTP error: %d %s"
 msgstr "HTTP-fejl: %d %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:249
+#: components/services/install/lib/eazel-install-protocols.c:255
 msgid "FTP not supported yet"
 msgstr "FTP er ikke understøttet endnu"
 
-#: components/services/install/lib/eazel-install-protocols.c:457
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, c-format
 msgid "Checking local file %s..."
 msgstr "Kontrollerer lokal fil %s..."
 
-#: components/services/install/lib/eazel-install-protocols.c:578
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, c-format
 msgid "Failed to retrieve %s!"
 msgstr "Kunne ikke modtage %s!"
 
-#: components/services/install/lib/eazel-install-protocols.c:651
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, c-format
 msgid "Could not get an URL for %s"
 msgstr "Fandt ikke en URI for %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:666
+#: components/services/install/lib/eazel-install-protocols.c:672
 msgid "Downloaded package does not have the correct name"
 msgstr "Hentet pakke har ikke det korrekt navn"
 
-#: components/services/install/lib/eazel-install-protocols.c:667
+#: components/services/install/lib/eazel-install-protocols.c:673
 #, c-format
 msgid "Package %s should have had name %s"
 msgstr "Pakken %s skulle have haft navn %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:695
+#: components/services/install/lib/eazel-install-protocols.c:701
 msgid "File download failed"
 msgstr "Hentning af fil mislykkedes"
 
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr "*** Start pakkedump ***\n"
 
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr "*** Afslut pakkedump ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:158
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 msgid "*** No package nodes! (cat has no children) ***"
 msgstr "*** Ingen pakkepunkter! (cat har ingen børn) ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:160
-#: components/services/install/lib/eazel-install-xml-package-list.c:168
-#: components/services/install/lib/eazel-install-xml-package-list.c:183
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 msgid "*** Bailing from package parse! ***"
 msgstr "*** Stopper læsning af pakke! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:166
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
 msgid "*** No package nodes! ***"
 msgstr "*** Ingen pakkeknuder! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:172
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 msgid "*** Malformed package node!"
 msgstr "*** Forkert udformet pakkeknude! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:181
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
 msgid "*** No depends nodes! ***"
 msgstr "*** Ingen afhængighedsknude! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:187
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr "*** Forkert udformet afhængighedsknude!"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:211
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr "** Ukendt punkttype '%s'"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:228
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** pakkelistefilen indeholder ingen data ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:233
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** Kan ikke finde xml-punktet CATEGORIES! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:234
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr "*** Stopper fortolkning af kategorier! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:240
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** Ingen kategorier! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:241
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr "*** Stopper tolkning af kategorier! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:295
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** Kan ikke finde xml-punktet TRANSACTION! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:297
-#: components/services/install/lib/eazel-install-xml-package-list.c:305
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr "*** Stopper fortolking af transaktioner! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:303
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** Ingen pakker! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:339
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** Ingen kategoriknuder! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:343
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** Kan ikke finde xml-knuden CATEGORIES! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:377
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "** Ukendt punkt %s"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:467
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** Fejl ved generering af xml pakkeliste! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:514
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** Fejl ved læsning af pakkelisten! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:909
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** Osd xml indeholder ingen data! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:914
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr "*** Stopper osd-fortolking! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:990
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "Kunne ikke fortolke xml (længde %d)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:763
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr "Åbnede pakkedatabase i %s"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:768
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr "Åbning af pakkedatabase i %s mislykkedes!"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:801
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr "Lukker db for %s (åben)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:806
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr "Lukker db for %s (ikke åben)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1137
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr "Kan ikke åbne %s"
@@ -2887,7 +2882,7 @@ msgid "Now installing package \"%s\"."
 msgstr "Installerer nu pakken \"%s\"..."
 
 #: components/services/install-view/callbacks.c:407
-#: components/services/install-view/nautilus-service-install-view.c:887
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "Installerer \"%s\""
@@ -2914,29 +2909,29 @@ msgstr "Vil nu forsøge følgende:"
 msgid "Is this ok ?"
 msgstr "Er dette i orden?"
 
-#: components/services/install-view/callbacks.c:557
+#: components/services/install-view/callbacks.c:556
 msgid "Installation cancelled."
 msgstr "Installation afbrudt."
 
-#: components/services/install-view/callbacks.c:559
+#: components/services/install-view/callbacks.c:558
 msgid "This package has already been installed."
 msgstr "Denne pakke er allerede installeret."
 
-#: components/services/install-view/callbacks.c:561
-#: components/services/install-view/callbacks.c:658
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
 msgid "Installation complete."
 msgstr "Installationen er fuldført."
 
-#: components/services/install-view/callbacks.c:565
+#: components/services/install-view/callbacks.c:564
 msgid "Installation failed."
 msgstr "Installationen mislykkedes."
 
 #. some succeeded; some failed
-#: components/services/install-view/callbacks.c:569
+#: components/services/install-view/callbacks.c:568
 msgid "Some packages installed successfully:"
 msgstr "Nogle pakker er blevet installeret:"
 
-#: components/services/install-view/callbacks.c:578
+#: components/services/install-view/callbacks.c:577
 msgid ""
 "\n"
 "Some packages failed:"
@@ -2944,19 +2939,19 @@ msgstr ""
 "\n"
 "Nogle pakker blev ikke:"
 
-#: components/services/install-view/callbacks.c:627
+#: components/services/install-view/callbacks.c:626
 msgid "Erase the RPM files?"
 msgstr "Slet RPM-filerne?"
 
-#: components/services/install-view/callbacks.c:629
+#: components/services/install-view/callbacks.c:628
 msgid "Erase the leftover RPM files?"
 msgstr "Slet de tiloversblevne RPM-filer?"
 
-#: components/services/install-view/callbacks.c:659
+#: components/services/install-view/callbacks.c:658
 msgid "Ok"
 msgstr "Ok"
 
-#: components/services/install-view/callbacks.c:674
+#: components/services/install-view/callbacks.c:673
 msgid ""
 "A core package of Nautilus has been\n"
 "updated.  You should restart Nautilus.\n"
@@ -3032,30 +3027,30 @@ msgstr "fortsæt"
 
 #: components/services/install-view/forms.c:482
 #: libnautilus-extensions/nautilus-drag.c:493
-#: src/file-manager/fm-directory-view.c:3523
+#: src/file-manager/fm-directory-view.c:4326
 msgid "Cancel"
 msgstr "Annullér"
 
-#: components/services/install-view/nautilus-service-install-view.c:419
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
 msgid "%s is in GNOME (footprint) > %s"
 msgstr "%s er i Gnome (foden) > %s"
 
-#: components/services/install-view/nautilus-service-install-view.c:437
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, fuzzy, c-format
 msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr " · %s er i Gnome-menuen under %s"
 
-#: components/services/install-view/nautilus-service-install-view.c:452
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
 msgid "%s is in the KDE menu.\n"
 msgstr "%s er i KDE-menuen.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:653
+#: components/services/install-view/nautilus-service-install-view.c:655
 msgid "Installation Complete"
 msgstr "Installationen er fuldført"
 
-#: components/services/install-view/nautilus-service-install-view.c:698
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
 msgid ""
 "%sTo start %s, click the Launch button below, or to create a shortcut, drag "
@@ -3063,32 +3058,32 @@ msgid ""
 msgstr ""
 
 #. couldn't find an icon
-#: components/services/install-view/nautilus-service-install-view.c:706
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
 msgid "%sTo start %s, click the Launch button below."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:761
+#: components/services/install-view/nautilus-service-install-view.c:773
 msgid "Incorrect password."
 msgstr "Ugyldig adgangskode."
 
-#: components/services/install-view/nautilus-service-install-view.c:766
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr "Adgangstilladelse som root"
 
-#: components/services/install-view/nautilus-service-install-view.c:883
+#: components/services/install-view/nautilus-service-install-view.c:895
 msgid "Installing packages"
 msgstr "Installerer pakker"
 
-#: components/services/install-view/nautilus-service-install-view.c:885
+#: components/services/install-view/nautilus-service-install-view.c:897
 msgid "Installing remote package"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:889
+#: components/services/install-view/nautilus-service-install-view.c:901
 msgid "Installing some package"
 msgstr "Installerer nogle pakker"
 
-#: components/services/install-view/nautilus-service-install-view.c:906
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
@@ -3096,23 +3091,23 @@ msgstr ""
 "Eazels installeringstjeneste mangler:\n"
 "Installeringer vil ikke virke."
 
-#: components/services/install-view/nautilus-service-install-view.c:955
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr "Kontakter Eazels programkatalog ..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1013
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr "Kontrollerer for godkendelse..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1085
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr "Afbryder pakkenedhentninger (vent venligst)..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1105
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "Hentning af pakke afbrudt."
 
-#: components/services/install-view/nautilus-service-install-view.c:1106
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "Afbrudt"
 
@@ -3393,12 +3388,12 @@ msgid "Services Login"
 msgstr "Log på tjenester"
 
 #: components/services/summary/nautilus-summary-dialogs.c:131
-#: libnautilus-extensions/nautilus-password-dialog.c:269
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "Brugernavn:"
 
 #: components/services/summary/nautilus-summary-dialogs.c:138
-#: libnautilus-extensions/nautilus-password-dialog.c:276
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "Adgangskode:"
 
@@ -3447,12 +3442,13 @@ msgid "Login"
 msgstr "Log på"
 
 #: components/services/summary/nautilus-summary-view.c:170
-#, c-format
-msgid "Welcome, %s!"
-msgstr "Velkommen, %s!"
+#, fuzzy, c-format
+msgid "Eazel Services - Welcome, %s!"
+msgstr "_Eazel tjenesters indeks"
 
 #: components/services/summary/nautilus-summary-view.c:175
-msgid "You are not logged in"
+#, fuzzy
+msgid "Eazel Services - You are not logged in"
 msgstr "Du er ikke logget på"
 
 #: components/services/summary/nautilus-summary-view.c:182
@@ -3468,7 +3464,7 @@ msgstr "Tjenester"
 msgid "Featured Downloads"
 msgstr "Interessante filer"
 
-#: components/services/summary/nautilus-summary-view.c:883
+#: components/services/summary/nautilus-summary-view.c:884
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
 "unavailable right now, or your computer might be configured incorrectly. "
@@ -3478,7 +3474,7 @@ msgstr ""
 "utilgængelig lige nu, eller måske er din maskine ikke sat rigtigt op. "
 "Kontakt venligst support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:893
+#: components/services/summary/nautilus-summary-view.c:894
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3486,7 +3482,7 @@ msgstr ""
 "Fandt et problem med tjenestedata på Eazels servere. Kontakt venligst "
 "support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:916
+#: components/services/summary/nautilus-summary-view.c:917
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
 "contact support@eazel.com."
@@ -3494,7 +3490,7 @@ msgstr ""
 "Der mangler information i omdirigeringsdata på Eazels servere. Kontakt "
 "venligst support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:958
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
 "now, or your computer might be configured incorrectly. You could try again "
@@ -3503,7 +3499,7 @@ msgstr ""
 "Kunne ikke koble til Eazels server. Serveren kan være utilgængelig lige nu, "
 "eller måske er din maskine ikke sat rigtigt op. Du kan prøve igen senere."
 
-#: components/services/summary/nautilus-summary-view.c:968
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3511,12 +3507,12 @@ msgstr ""
 "Fandt et problem med omdirigeringsdata på Eazels servere. Kontakt venligst "
 "support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:985
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:1048
-#: src/nautilus-first-time-druid.c:255
+#: components/services/summary/nautilus-summary-view.c:1049
+#: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr "Eazel tjenester"
 
@@ -3583,16 +3579,16 @@ msgstr "Oversigtsviser"
 msgid "View as Summary"
 msgstr "Vis som oversigt"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:130
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
 #, c-format
 msgid "HTTP error %d \"%s\" on uri %s"
 msgstr "HTTP-fejl %d \"%s\" ved uri %s"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:200
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke klargøre Bonobo"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:215
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr "Kan ikke skrive logfil %s -- bruger forvalgt loghåndterer"
@@ -3629,48 +3625,68 @@ msgstr "prøve på Eazel tjenestevisning"
 msgid "Factory for the sample service"
 msgstr "Fabrik for prøvetjenesten"
 
-#: components/text/nautilus-text-view.c:326
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr "Beklager, men %s er for stor til at Nautilus kan indlæse det hele."
 
-#: components/text/nautilus-text-view.c:329
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr "For stor fil"
 
 #: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "Skrifttyper"
+
+#: components/text/nautilus-text-view-ui.xml.h:2
 msgid "Lucida"
 msgstr "Lucida"
 
-#: components/text/nautilus-text-view-ui.xml.h:2
+#: components/text/nautilus-text-view-ui.xml.h:3
 msgid "Use the Courier Font"
 msgstr "Benyt Courier-skrifttypen"
 
-#: components/text/nautilus-text-view-ui.xml.h:3
+#: components/text/nautilus-text-view-ui.xml.h:4
+#, fuzzy
+msgid "Use the Fixed Font"
+msgstr "Benyt Times-skrifttypen"
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+#, fuzzy
+msgid "Use the GTK System Font"
+msgstr "Benyt Times-skrifttypen"
+
+#: components/text/nautilus-text-view-ui.xml.h:6
 msgid "Use the Helvetica Font"
 msgstr "Benyt Helvetica-skrifttypen"
 
-#: components/text/nautilus-text-view-ui.xml.h:4
+#: components/text/nautilus-text-view-ui.xml.h:7
 msgid "Use the Lucida Font"
 msgstr "Benyt Lucida-skrifttypen"
 
-#: components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:8
 msgid "Use the Times Font"
 msgstr "Benyt Times-skrifttypen"
 
-#: components/text/nautilus-text-view-ui.xml.h:6
+#: components/text/nautilus-text-view-ui.xml.h:9
 msgid "_Courier"
 msgstr "_Courier"
 
-#: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
-msgstr "_Skrifttyper"
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "_Fil"
 
-#: components/text/nautilus-text-view-ui.xml.h:8
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
 msgid "_Helvetica"
 msgstr "_Helvetica"
 
-#: components/text/nautilus-text-view-ui.xml.h:9
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr "_Times"
 
@@ -3739,7 +3755,7 @@ msgid "Nautilus Tree view"
 msgstr "Nautilus trævisning"
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:638
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr "Træ"
 
@@ -3751,7 +3767,7 @@ msgstr "Spøgelse"
 msgid "Azul"
 msgstr "Azur"
 
-#: data/browser.xml.h:3 libnautilus-extensions/nautilus-font-picker.c:103
+#: data/browser.xml.h:3
 msgid "Black"
 msgstr "Sort"
 
@@ -3863,7 +3879,7 @@ msgstr "Træk et emblem til et objekt for at tilføje det til objektet"
 msgid "Eclipse"
 msgstr "Formørkelse"
 
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1607
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "Emblemer"
 
@@ -3960,7 +3976,7 @@ msgid "Numbers"
 msgstr "Tal"
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "Ok"
 
@@ -4081,13 +4097,13 @@ msgid "The Gimp"
 msgstr "Gimp'en"
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:554
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4796
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
-#: src/file-manager/fm-desktop-icon-view.c:65
+#: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
 msgstr "Papirkurv"
 
@@ -4120,7 +4136,7 @@ msgid "Google"
 msgstr "Google"
 
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:808
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "Søgemotorer"
 
@@ -4378,101 +4394,101 @@ msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2261
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr "i dag kl. %H:%M"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2266
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr "i går kl. %H:%M"
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2271
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%A %Y-%-m-%-d %H:%M"
 
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2276
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%-d/%-m-%Y kl. %H:%M"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 ting"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr "0 mapper"
 
-#: libnautilus-extensions/nautilus-file.c:3408
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 filer"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 ting"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: libnautilus-extensions/nautilus-file.c:3413
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 fil"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "%u ting"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr "%u mapper"
 
-#: libnautilus-extensions/nautilus-file.c:3417
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u filer"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3720
-#: libnautilus-extensions/nautilus-file.c:3735
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr "? ting"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3726
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr "? byte"
 
-#: libnautilus-extensions/nautilus-file.c:3739
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "ukendt type"
 
-#: libnautilus-extensions/nautilus-file.c:3741
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "ukendt MIME-type"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3746
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "ukendt"
 
-#: libnautilus-extensions/nautilus-file.c:3782
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr "program"
 
-#: libnautilus-extensions/nautilus-file.c:3794
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
@@ -4482,7 +4498,7 @@ msgstr ""
 "skyldes sandsynligvis at din gnome-vfs.keys-fil er det forkerte sted eller "
 "ikke bliver fundet af en eller anden grund."
 
-#: libnautilus-extensions/nautilus-file.c:3798
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
@@ -4491,7 +4507,7 @@ msgstr ""
 "Ingen beskrivelse fundet for MIME-typen \"%s\" (filen er \"%s\"), skriv til "
 "aaron@eazel.com"
 
-#: libnautilus-extensions/nautilus-file.c:3812
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "henvisning"
 
@@ -4499,27 +4515,27 @@ msgstr "henvisning"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1156
-#: libnautilus-extensions/nautilus-file.c:3818
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr "henvisning til %s"
 
-#: libnautilus-extensions/nautilus-file.c:3832
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr "henvisning (ødelagt)"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "Fra:"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "Til:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:588
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4530,7 +4546,7 @@ msgstr ""
 "\n"
 "'%s' kan ikke flyttes fordi den er på en skrivebeskyttet disk."
 
-#: libnautilus-extensions/nautilus-file-operations.c:599
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4542,7 +4558,7 @@ msgstr ""
 "\n"
 "'%s' kan ikke slettes fordi du ikke har lov til at ændre dens forældremappe."
 
-#: libnautilus-extensions/nautilus-file-operations.c:605
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4553,7 +4569,7 @@ msgstr ""
 "\n"
 "'%s' kan ikke slettes fordi den er på en skrivebeskyttet disk."
 
-#: libnautilus-extensions/nautilus-file-operations.c:636
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4566,7 +4582,7 @@ msgstr ""
 "'%s' kan ikke flyttes fordi du ikke har lov til at ændre den eller dens "
 "forældremappe."
 
-#: libnautilus-extensions/nautilus-file-operations.c:643
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4575,7 +4591,7 @@ msgid ""
 "change it or its parent folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:667
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -4586,7 +4602,7 @@ msgstr ""
 "\n"
 "'%s' kan ikke kopieres fordi du ikke har lov til at læse den."
 
-#: libnautilus-extensions/nautilus-file-operations.c:689
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4597,7 +4613,7 @@ msgstr ""
 "\n"
 "Der er ikke nok plads på målet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:694
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4608,7 +4624,7 @@ msgstr ""
 "\n"
 "Der er ikke nok plads på målet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:698
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4619,7 +4635,7 @@ msgstr ""
 "\n"
 "Der er ikke nok plads på målet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:710
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4630,7 +4646,7 @@ msgstr ""
 "\n"
 "Du har ikke lov til at skrive i denne mappe."
 
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4641,7 +4657,7 @@ msgstr ""
 "\n"
 "Destinationsdisken er skrivebeskyttet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:721
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4652,7 +4668,7 @@ msgstr ""
 "\n"
 "Du har ikke lov til at skrive til denne mappe."
 
-#: libnautilus-extensions/nautilus-file-operations.c:725
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4662,7 +4678,7 @@ msgstr ""
 "Fejl ved flytning af elementer til '%s'.\n"
 "Disken for målet er skrivebeskyttet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:732
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4673,7 +4689,7 @@ msgstr ""
 "\n"
 "Du har ikke lov til at skrive til denne mappe."
 
-#: libnautilus-extensions/nautilus-file-operations.c:736
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4684,7 +4700,7 @@ msgstr ""
 "\n"
 "Destinationsdisken er skrivebeskyttet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4695,7 +4711,7 @@ msgstr ""
 "\n"
 "Vil du fortsætte?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4706,7 +4722,7 @@ msgstr ""
 "\n"
 "Vil du fortsætte?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:773
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4717,7 +4733,7 @@ msgstr ""
 "\n"
 "Vil du fortsætte?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4728,7 +4744,7 @@ msgstr ""
 "\n"
 "Vil du gerne fortsætte?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:794
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4739,7 +4755,7 @@ msgstr ""
 "\n"
 "Vil du gerne fortsætte?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4750,7 +4766,7 @@ msgstr ""
 "\n"
 "Vil du gerne fortsætte?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4761,7 +4777,7 @@ msgstr ""
 "\n"
 "Vil du gerne fortsætte?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4772,34 +4788,34 @@ msgstr ""
 "\n"
 "Vil du gerne fortsætte?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:924
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "Fejl ved kopiering."
 
-#: libnautilus-extensions/nautilus-file-operations.c:927
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "Fejl ved flytning."
 
-#: libnautilus-extensions/nautilus-file-operations.c:930
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "Fejl ved oprettelse af henvisning."
 
-#: libnautilus-extensions/nautilus-file-operations.c:935
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "Fejl ved sletning."
 
-#: libnautilus-extensions/nautilus-file-operations.c:960
-#: libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "Spring over"
 
-#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Prøv igen"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1057
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4813,7 +4829,7 @@ msgstr ""
 "\n"
 "Hvis du stadig ønsker at flytte \"%s\" så omdøb den og prøv igen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1063
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4827,11 +4843,11 @@ msgstr ""
 "\n"
 "Hvis du stadig ønsker at kopiere \"%s\" så omdøb den og prøv igen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "Kan ikke erstatte fil."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1081
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4842,22 +4858,22 @@ msgstr ""
 "\n"
 "Vil du gerne erstatte den?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1092
-#: libnautilus-extensions/nautilus-file-operations.c:1106
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "Konflikt ved kopiering"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Erstat"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Erstat alt"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1160
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "en anden lænke til %s"
@@ -4866,25 +4882,25 @@ msgstr "en anden lænke til %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. lænke til %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1180
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. lænke til %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1184
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. lænke til %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. lænke til %s"
@@ -4894,241 +4910,227 @@ msgstr "%d. lænke til %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
-#: libnautilus-extensions/nautilus-file-operations.c:2351
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (kopi)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
-#: libnautilus-extensions/nautilus-file-operations.c:2351
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (ny kopi)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1212
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr ". (kopi)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr ". (kopi)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1216
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr ". (kopi)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr ". (kopi)"
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopi)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (ny kopi)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1232
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. kopi)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1234
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. kopi)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1236
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. kopi)%s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. kopi)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1322
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1330
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1487
-#: libnautilus-extensions/nautilus-file-operations.c:2066
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Ukendt GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1802
-#: libnautilus-extensions/nautilus-file-operations.c:2195
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "Flytter filer til papirkurv"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1804
-#: libnautilus-extensions/nautilus-file-operations.c:2197
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr "Filer smidt ud:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1821
-#: libnautilus-extensions/nautilus-file-operations.c:2199
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "Flytter"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1807
-#: libnautilus-extensions/nautilus-file-operations.c:2200
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "Forbereder flytning til papirkurv"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1817
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "Flytter filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "Filer flyttet:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1822
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "Forbereder flytning..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "Færdiggør flytning..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "Opretter lænker til filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1837
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "Filer lænket:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1839
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "Lænker"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "Forbereder oprettelse af lænker..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "Fuldfører opretelse af lænker..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1848
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "Kopierer filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "Filer kopieret:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "Kopierer"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "Forbereder kopiering..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "Du kan ikke kopiere ting til papirkurven"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "Kan ikke kopiere til papirkurv"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1899
-#: libnautilus-extensions/nautilus-file-operations.c:2157
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "Papirkurven skal befinde sig på skrivebordet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "Du kan ikke flytte denne papirkurv."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1902
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "Du kan ikke kopiere papirkurven."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1903
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "Du kan ikke kopiere denne papirkurv."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1905
-#: libnautilus-extensions/nautilus-file-operations.c:2158
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Kan ikke ændre placering af papirkurven"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1906
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Kan ikke kopiere papirkurven"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1923
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "Du kan ikke flytte en mappe til den selv."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1924
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "Du kan ikke kopiere en mappe til den selv."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1926
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "Kan ikke flytte til sig selv"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1927
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "Kan ikke kopiere til sig selv"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1940
-msgid "You cannot move a file onto itself."
-msgstr "Du kan ikke flytte en fil til den selv."
-
-#: libnautilus-extensions/nautilus-file-operations.c:1941
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "Du kan ikke kopiere en fil til den selv."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1943
-msgid "Can't Move Onto Self"
-msgstr "Kan ikke flytte til sig selv"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1944
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "Kan ikke kopiere til sig selv"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1995
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5138,7 +5140,7 @@ msgstr ""
 "\n"
 "Du har ikke lov til at skrive til målet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1998
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5148,631 +5150,682 @@ msgstr ""
 "\n"
 "Der er ikke plads på målet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2001
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Fejl '%s' ved oprettelse af ny mappe."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2005
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "Fejl ved oprettelse af ny mappe"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2092
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "mappe uden navn"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2164
-#, c-format
-msgid "You cannot throw \"%s\" into the Trash."
-msgstr "Du kan ikke kaste '%s' i papirkurven."
-
-#: libnautilus-extensions/nautilus-file-operations.c:2168
-msgid "Error Moving to Trash"
-msgstr "Fejl under flytning til papirkurven"
-
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2240
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "Sletter filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2242
-#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "Filer slettet:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2244
-#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Sletter"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "Forbereder sletning af filer..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Tømmer papirkurv"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Forbereder tømning af papirkurv"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2311
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr ""
 "Er du sikker på at du en gang for alle ønsker at slette alle elementer i "
 "papirskurven?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2313
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "Slet indhold i papirkurv?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2314
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "Tom"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2352
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "fæ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2352
-#: libnautilus-extensions/nautilus-file-operations.c:2362
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "fæ (kopiér)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2353
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2353
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2354
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".fæ.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2354
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".fæ (kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2355
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "fæ fæ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2355
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "fæ fæ (kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2356
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "fæ.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2356
-#: libnautilus-extensions/nautilus-file-operations.c:2363
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "fæ (kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2357
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "fæ fæ.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2357
-#: libnautilus-extensions/nautilus-file-operations.c:2377
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "fæ fæ (kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2358
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "fæ fæ.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2358
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "fæ fæ (kopi).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2359
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "fæ...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2359
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "fæ.. (kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2360
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "fæ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2360
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "fæ... (kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2361
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "fæ. (kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2361
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "fæ. (ny kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2362
-#: libnautilus-extensions/nautilus-file-operations.c:2364
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "fæ (ny kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2363
-#: libnautilus-extensions/nautilus-file-operations.c:2365
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "fæ (ny kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2364
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "fæ (3. kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2365
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "fæ (3. kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2366
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "fæ fæ (ny kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2366
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "fæ fæ (3. kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2367
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr "fæ (21. kopi)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr "fæ (24. kopi)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr "fæ (21. kopi).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr "fæ (24. kopi).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "fæ (21. kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2367
-#: libnautilus-extensions/nautilus-file-operations.c:2369
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "fæ (22. kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2368
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "fæ (21. kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2368
-#: libnautilus-extensions/nautilus-file-operations.c:2370
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "fæ (22. kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2369
-#: libnautilus-extensions/nautilus-file-operations.c:2371
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "fæ (23. kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2370
-#: libnautilus-extensions/nautilus-file-operations.c:2372
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "fæ (23. kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2371
-#: libnautilus-extensions/nautilus-file-operations.c:2373
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "fæ (24. kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2372
-#: libnautilus-extensions/nautilus-file-operations.c:2374
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "fæ (24. kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2373
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "fæ (25. kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2374
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "fæ (25. kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2375
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "fæ fæ (24. kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2375
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "fæ fæ (25. kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2376
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "fæ fæ (24. kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2376
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "fæ fæ (25. kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2377
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "fæ fæ (100000000000000te kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
-#, c-format
-msgid "%ld of %ld"
-msgstr "%ld af %ld"
-
-#: libnautilus-extensions/nautilus-font-picker.c:94
-msgid "Normal"
-msgstr "Normal"
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (10th copy)"
+msgstr "fæ (21. kopi)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:95
-#: libnautilus-extensions/nautilus-volume-monitor.c:516
-#: libnautilus-extensions/nautilus-volume-monitor.c:535
-msgid "Unknown"
-msgstr "Ukendt"
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (11st copy)"
+msgstr "fæ (21. kopi)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:101
-msgid "Bold"
-msgstr "Fed"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (10th copy).txt"
+msgstr "fæ (21. kopi).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:102
-msgid "Book"
-msgstr "Bog"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (11st copy).txt"
+msgstr "fæ (21. kopi).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:104
-msgid "Demibold"
-msgstr "Mellemfed"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (11th copy)"
+msgstr "fæ (21. kopi)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:105
-msgid "Light"
-msgstr "Let"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (12nd copy)"
+msgstr "fæ (22. kopi)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:111
-msgid "Italic"
-msgstr "Kursiv"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (11th copy).txt"
+msgstr "fæ (21. kopi).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:112
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 #, fuzzy
-msgid "Oblique"
-msgstr "Evergreens"
+msgid "foo (12nd copy).txt"
+msgstr "fæ (22. kopi).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:113
+#: libnautilus-extensions/nautilus-file-operations.c:2293
 #, fuzzy
-msgid "Reverse Italic"
-msgstr "Forkast"
+msgid "foo (12th copy)"
+msgstr "fæ (24. kopi)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:114
+#: libnautilus-extensions/nautilus-file-operations.c:2293
 #, fuzzy
-msgid "Reverse Oblique"
-msgstr "Omvendt rækkefølge"
+msgid "foo (13rd copy)"
+msgstr "fæ (3. kopi)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:121
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 #, fuzzy
-msgid "Condensed"
-msgstr "Indhold:"
+msgid "foo (12th copy).txt"
+msgstr "fæ (25. kopi).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:122
-msgid "Semicondensed"
-msgstr ""
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (13rd copy).txt"
+msgstr "fæ (3. kopi).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:224
-msgid "Font"
-msgstr "Skrifttype"
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
+#, c-format
+msgid "%ld of %ld"
+msgstr "%ld af %ld"
 
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
 msgid "GConf Error"
 msgstr "GConf-fejl"
 
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:956
-msgid "fixed"
-msgstr "fast"
-
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1427
-msgid "01/01/00, 01:00 AM"
-msgstr "01/01/00 01:00"
-
-#: libnautilus-extensions/nautilus-glib-extensions.c:1428
-msgid "1/1/00, 1:00 AM"
-msgstr "1/1/00, 1:00"
-
-#: libnautilus-extensions/nautilus-glib-extensions.c:1429
-msgid " 1/ 1/00,  1:00 AM"
-msgstr "1/ 1/00,  1:00"
-
 #. Constants
 #: libnautilus-extensions/nautilus-global-preferences.c:50
 msgid "Nautilus Preferences"
 msgstr "Brugervalg for Nautilus"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:97
-msgid "current theme"
-msgstr "nuværende tema"
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "altid"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "Altid"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "kun lokalt"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "Kun lokale filer"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "aldrig"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "Aldrig"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:100
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "Jævnere grafik"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "Brug jævnere (men langsommere) grafik"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "Skrifttyper"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+#, fuzzy
+msgid "Font for Icon view:"
+msgstr "Fabrik for musik-visning"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "Fabrik for historik-visning"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "Benyt Nautilus til at håndtere skrivebordet."
+
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
+msgstr "Åbning af nye vinduer"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:651
 msgid "Open each file or folder in a separate window"
 msgstr "Åbn hver fil eller mappe i et separat vindue"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:103
-msgid "Ask before emptying the Trash"
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+msgid "Display toolbar in new windows"
+msgstr "Vis værktøjslinje i nyt vindue"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "Vis adresselinje i nye vinduer"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "Vis statuslinje i nye vinduer"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "Vis sidelinje i nye vinduer"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "Papirkurvs-opførsel"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+#, fuzzy
+msgid "Ask before emptying the Trash or deleting files"
 msgstr "Spørg før tømning af papirkurven"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:106
-#: libnautilus-extensions/nautilus-global-preferences.c:597
-msgid "Click Behavior"
-msgstr "Klik-opførsel"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
+
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:109
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 msgid "single"
 msgstr "enkelt"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:110
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "Aktivér opføringer med enkeltklik"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:114
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "dobbelt"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:115
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "Aktivér opføringer med dobbeltklik"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:119
-#: libnautilus-extensions/nautilus-global-preferences.c:604
-msgid "Executable Text Files"
-msgstr "Kørbare tekstfiler"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:122
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 msgid "launch"
 msgstr "kør"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:123
+#: libnautilus-extensions/nautilus-global-preferences.c:726
 msgid "Execute files when they are clicked"
 msgstr "Kør filer når der klikkes på dem"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:127
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 msgid "display"
 msgstr "fremvis"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:128
+#: libnautilus-extensions/nautilus-global-preferences.c:730
 msgid "Display files when they are clicked"
 msgstr "Vis filer når der klikkes på dem"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:132
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 msgid "ask"
 msgstr "spørg"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:133
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 msgid "Ask each time"
 msgstr "Spørg hver gang"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:143
-#: libnautilus-extensions/nautilus-global-preferences.c:725
-msgid "Show Text in Icons"
-msgstr "Vis tekst i ikoner"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:146
-#: libnautilus-extensions/nautilus-global-preferences.c:732
-msgid "Show Count of Items in Folders"
-msgstr "Vis antallet af punkter i mapper"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:149
-#: libnautilus-extensions/nautilus-global-preferences.c:739
-msgid "Show Thumbnails for Image Files"
-msgstr "Vis miniaturer for billedfiler"
-
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:152
-#: libnautilus-extensions/nautilus-global-preferences.c:755
-msgid "Make Folder Appearance Details Public"
-msgstr "Gør detaljer om katalogudseende offentlig"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:155
-#: libnautilus-extensions/nautilus-global-preferences.c:746
-msgid "Preview Sound Files"
-msgstr "Smughør lydfiler"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Use smoother (but slower) graphics"
-msgstr "Brug jævnere (men langsommere) grafik"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Use this font family to display file names:"
-msgstr "Brug denne skrifttypefamilie vise filnavne:"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-msgid "Display toolbar in new windows"
-msgstr "Vis værktøjslinje i nyt vindue"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:170
-msgid "Display location bar in new windows"
-msgstr "Vis adresselinje i nye vinduer"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:173
-msgid "Display status bar in new windows"
-msgstr "Vis statuslinje i nye vinduer"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:176
-msgid "Display sidebar in new windows"
-msgstr "Vis sidelinje i nye vinduer"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:179
-msgid "Use Nautilus to draw the desktop"
-msgstr "Benyt Nautilus til at håndtere skrivebordet."
-
-#: libnautilus-extensions/nautilus-global-preferences.c:183
-msgid "Enable fast search (indexes your hard drive)"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-global-preferences.c:186
-msgid "search type to do by default"
-msgstr "standard-søgetype"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:189
-msgid "search by text"
-msgstr "søg efter tekst"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:190
-#, fuzzy
-msgid "Search for files by file name only"
-msgstr "Søg kun filer efter tekst"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:194
-msgid "search by text and properties"
-msgstr "søg efter tekst og egenskaber"
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "Klik-opførsel"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:195
-#, fuzzy
-msgid "Search for files by file name and file properties"
-msgstr "Søg efter filer med tekstindhold og egenskaber"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr "Kørbare tekstfiler"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:199
-msgid "Search Engine Location"
-msgstr "Internet-søgningssted"
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr "Skjul/vis valgmuligheder"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:203
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr "Vis skjulte filer (filnavne begynder med \".\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:206
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr "Vis sikkerhedskopier (filnavne slutter med \"~\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:209
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr "Vis specielle flag i Egenskaber-vinduet"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:212
-msgid "Show only folders (no files) in the tree"
-msgstr "Vis kun mapper (ikke filer) i træet"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:215
-msgid "Can add Content"
-msgstr "Kan tilføje indhold"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+#, fuzzy
+msgid "Sorting Order"
+msgstr "Fejl ved ændring af ejer"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:218
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
-msgstr "Inkludér ikke indbyggede bogmærker i bogmærkemenuen"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:222
-#: libnautilus-extensions/nautilus-global-preferences.c:227
-#: src/file-manager/fm-properties-window.c:1519 src/nautilus-location-bar.c:62
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
 msgid "Location:"
 msgstr "Placering:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:226
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+msgid "HTTP Proxy Settings"
+msgstr "Indstillinger for proxyer"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "Brug HTTP-mellemvært"
 
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:228
-#: src/nautilus-first-time-druid.c:680
+#: libnautilus-extensions/nautilus-global-preferences.c:812
+#: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr "Port:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:533
-msgid "Appearance"
-msgstr "Udseende"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:535
-msgid "Smoother Graphics"
-msgstr "Jævnere grafik"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "Indbyggede bogmærker"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:552
-msgid "Windows & Desktop"
-msgstr "Vinduer og skrivebord"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "Inkludér ikke indbyggede bogmærker i bogmærkemenuen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:560
-msgid "Opening New Windows"
-msgstr "Åbning af nye vinduer"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "Vis tekst i ikoner"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:583
-msgid "Trash Behavior"
-msgstr "Papirkurvs-opførsel"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr "Vis antallet af punkter i mapper"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:595
-msgid "Icon & List Views"
-msgstr "Ikon- og listevisninger"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "Vis miniaturer for billedfiler"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:611
-msgid "Show/Hide Options"
-msgstr "Skjul/vis valgmuligheder"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:632
-msgid "Sidebar Panels"
-msgstr "Sidepaneler"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr "Smughør lydfiler"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:635
-msgid "Tabs"
-msgstr "Faner"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr "Gør detaljer om katalogudseende offentlig"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:684
-msgid "Navigation"
-msgstr "Navigering"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "Udseende"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:693
-msgid "HTTP Proxy Settings"
-msgstr "Indstillinger for proxyer"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr "Vinduer og skrivebord"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:712
-msgid "Built-in Bookmarks"
-msgstr "Indbyggede bogmærker"
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr "Ikon- og listevisninger"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+msgid "Navigation"
+msgstr "Navigering"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:723
+#: libnautilus-extensions/nautilus-global-preferences.c:962
 msgid "Speed Tradeoffs"
 msgstr "Hastighedsvalg"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:794
-msgid "Search"
-msgstr "Søg"
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr "søg efter tekst"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+#, fuzzy
+msgid "Search for files by file name only"
+msgstr "Søg kun filer efter tekst"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr "søg efter tekst og egenskaber"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+#, fuzzy
+msgid "Search for files by file name and file properties"
+msgstr "Søg efter filer med tekstindhold og egenskaber"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "Indstillinger for kompleksitet i søgning"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:802
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "standard-søgetype"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 msgid "Fast Search"
 msgstr "Hurtig søgning"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:846
-msgid "Fonts"
-msgstr "Skrifttyper"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1026
-#, c-format
-msgid "Display %s tab in sidebar"
-msgstr "Vis %s-fane i sidepanelet"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1073
-msgid "always"
-msgstr "altid"
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+msgid "Search Engine Location"
+msgstr "Internet-søgningssted"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1074
-msgid "Always"
-msgstr "Altid"
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Søg"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1077
-msgid "local only"
-msgstr "kun lokalt"
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr "Vis kun mapper (ikke filer) i træet"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1078
-msgid "Local Files Only"
-msgstr "Kun lokale filer"
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, c-format
+msgid "Display %s tab in sidebar"
+msgstr "Vis %s-fane i sidepanelet"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1081
-msgid "never"
-msgstr "aldrig"
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "Sidepaneler"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1082
-msgid "Never"
-msgstr "Aldrig"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr "Faner"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1145
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "currently can't be performed because the program crond, which does nightly "
@@ -5780,13 +5833,13 @@ msgid ""
 "done, turn crond on."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1152
-#: libnautilus-extensions/nautilus-global-preferences.c:1170
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
 msgid "Files May Not Be Indexed"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1153
-#: libnautilus-extensions/nautilus-global-preferences.c:1171
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
 msgid ""
 "If you are running Linux, you can log in as root and type these commands to "
 "start cron:\n"
@@ -5795,7 +5848,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1162
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "may not be performed because the program crond, which does nightly tasks on "
@@ -5804,22 +5857,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-gnome-extensions.c:640
-msgid "No image was selected.  You must click on an image to select it."
-msgstr ""
-"Intet billede var valgt.  Du skal klikke på et billede for at vælge det."
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:641
-#, fuzzy
-msgid "No selection made"
-msgstr "sektionen her"
-
 #. The list of characters that cause line breaks can be localized.
 #: libnautilus-extensions/nautilus-icon-canvas-item.c:70
 msgid " -_,;.?/&"
 msgstr " -_,;.?/&"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:766
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
@@ -5829,7 +5872,7 @@ msgstr ""
 "placering og lade punktet blive hvor du slap det? Dette vil ødelægge den "
 "gemte manuelle placering."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:770
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
@@ -5839,7 +5882,7 @@ msgstr ""
 "placering og lade disse punkter blive hvor du slap dem? Dette vil ødelægge "
 "den gemte manuelle placering."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:776
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
@@ -5847,7 +5890,7 @@ msgstr ""
 "Dette katalog bruger automatisk placering. Ønsker du at skifte til manuel "
 "placering og lade punktet blive hvor du slap den?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:779
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
@@ -5855,64 +5898,48 @@ msgstr ""
 "Dette katalog bruger automatisk placering. Ønsker du at skifte til manuel "
 "placering og lade disse punkter blive hvor du slap dem?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:784
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "Skift til manuelt udseende?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:785
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "Skift"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "Omdøb"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1551
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr "Fortryd indtasting"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1552
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "Genskab det gamle navn"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1553
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "Genopret indtasting"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1554
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Genskab det ændrede navn"
 
-#: libnautilus-extensions/nautilus-password-dialog.c:306
-msgid "Remember this password"
-msgstr "Husk denne adgangskode"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:483
-msgid "times"
-msgstr "times"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:484
-msgid "courier"
-msgstr "courier"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:485
-msgid "lucida"
-msgstr "lucida"
-
-#: libnautilus-extensions/nautilus-preferences.c:76
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "Begynder"
 
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "Viderekommen"
 
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:202
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "Indstillingsboks"
 
@@ -6011,7 +6038,7 @@ msgid "Don't include in the menu for \"%s\" items"
 msgstr "Inkludér ikke i menuen for \"%s\"-punkter."
 
 #: libnautilus-extensions/nautilus-program-chooser.c:1209
-#: src/file-manager/fm-list-view.c:2122
+#: src/file-manager/fm-list-view.c:2182
 #: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
@@ -6362,25 +6389,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Ting indeholdende \"medusa\" i navnet og som er mapper"
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr "Detaljer"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr "Advarsel"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr "Fejl"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr "Spørgsmål"
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr "Søger på diskene"
@@ -6389,7 +6397,7 @@ msgstr "Søger på diskene"
 msgid "Nautilus is searching your disks for trash folders."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-trash-file.c:600
+#: libnautilus-extensions/nautilus-trash-file.c:725
 msgid "on the desktop"
 msgstr "på skrivebordet"
 
@@ -6423,47 +6431,44 @@ msgstr "Vis som liste"
 msgid "%s Viewer"
 msgstr "%s fremviser"
 
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+msgid "Unknown"
+msgstr "Ukendt"
+
 #. Populate table with items we know localized names for.
-#: libnautilus-extensions/nautilus-volume-monitor.c:623
-#: libnautilus-extensions/nautilus-volume-monitor.c:1862
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr "Diskette"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:624
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
 msgid "CD-ROM"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:625
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
 msgid "Zip Drive"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:646
-#: libnautilus-extensions/nautilus-volume-monitor.c:668
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 msgid "Audio CD"
 msgstr "Lyd-cd"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1547
-msgid "Mount Error"
-msgstr "Monteringsfejl"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1549
-msgid "Unmount Error"
-msgstr "Felj ved afmontering"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1579
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr "er skrivebeskyttet, monterer ligeså"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1582
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "er ikke en gyldig blok-enhed"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1583
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr "Intet medium fundet"
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1587
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
@@ -6472,7 +6477,7 @@ msgstr ""
 "diskettedrevet."
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1591
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
@@ -6480,11 +6485,11 @@ msgstr ""
 "Nautilus kunne ikke montere arkivet. Der er formentlig intet medium i "
 "enheden."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1594
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr "Forkert filsystemstype, dårligt tilvalg, dårlig superblok på"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1597
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
@@ -6492,7 +6497,7 @@ msgstr ""
 "Nautilus kunne ikke montere disketten. Disketten er formentlig i et format "
 "der ikke kan monteres."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1600
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
@@ -6500,50 +6505,58 @@ msgstr ""
 "Nautilus kunne ikke montere det valgte arkiv. Arkivet er formentlig i et "
 "format der ikke kan monteres."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1605
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr "Nautilus kunne ikke montere den valgte disketteenhed."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1607
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "Nautilus kunne ikke montere det valgte arkiv."
 
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1612
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr "Nautilus kunne ikke afmontere det valgte arkiv."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1764
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr "Monteringsfejl"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr "Felj ved afmontering"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "ISO 9660-arkiv"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1779
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "Rod"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1786
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Ext2-arkiv"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1801
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "MSDOS-arkiv"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1816
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "NFS-arkiv"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1831
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
 #, fuzzy
 msgid "ReiserFS Volume"
 msgstr "NFS-arkiv"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1847
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
 #, fuzzy
 msgid "UFS Volume"
 msgstr "NFS-arkiv"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1877
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "Ukendt arkiv"
 
@@ -6551,31 +6564,65 @@ msgstr "Ukendt arkiv"
 msgid "C_lear Text"
 msgstr "_Ryd tekst"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "_Ryd tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "_Indsæt tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "Kopiér valgt tekst til klippebordet"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "Klip _tekst ud"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+msgid "Cut _Text"
+msgstr "Klip _tekst ud"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "Klip valgt tekst ud til klippebordet"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:46
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "_Indsæt tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "Indsæt tekst som er gemt på klippebordet"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "Fjern den valgte tekst uden at placere den på klippebordet"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:80
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "Vælg _alt"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+msgid "Select _All"
+msgstr "Vælg _alt"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "Vælg alle ting i dette vindue"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "_Indsæt tekst"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:7
-msgid "_Cut Text"
-msgstr "_Klip tekst"
-
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:93
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "_Indsæt tekst"
 
@@ -6584,7 +6631,7 @@ msgstr "_Indsæt tekst"
 #. * to change it when we upgrade to GTK 2.0.
 #.
 #: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
-#: src/nautilus-window-menus.c:563
+#: src/nautilus-window-menus.c:610
 msgid "Nautilus"
 msgstr "Nautilus"
 
@@ -6600,78 +6647,111 @@ msgstr "Nautilus filhåndtering og grafisk skal"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:735
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr "Privat mappe%.0s"
 
-#: src/file-manager/fm-desktop-icon-view.c:1021
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "Tøm papirkurv..."
 
-#: src/file-manager/fm-desktop-icon-view.c:1023
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "Tøm papirkurv"
 
-#: src/file-manager/fm-desktop-icon-view.c:1043
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "Afmontér arkiv"
 
-#: src/file-manager/fm-directory-view.c:474
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr "Dette vil åbne %d separate vinduer. Er du sikker på at du vil dette?"
 
-#: src/file-manager/fm-directory-view.c:476
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Åbn %d nye vinduer?"
 
-#: src/file-manager/fm-directory-view.c:1219
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr ""
+"Er du sikker på at du en gang for alle ønsker at slette alle elementer i "
+"papirskurven?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+"Er du sikker på at du en gang for alle ønsker at slette alle elementer i "
+"papirskurven?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Slet"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Slet"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+msgid "scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" valgt"
 
-#: src/file-manager/fm-directory-view.c:1221
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "1 mappe valgt"
 
-#: src/file-manager/fm-directory-view.c:1224
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "%d mapper valgt"
 
-#: src/file-manager/fm-directory-view.c:1230
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr "(med 0 ting)"
 
-#: src/file-manager/fm-directory-view.c:1232
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr "(med 1 ting)"
 
-#: src/file-manager/fm-directory-view.c:1234
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr "(med %d ting)"
 
-#: src/file-manager/fm-directory-view.c:1245
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" valgt (%s)"
 
-#: src/file-manager/fm-directory-view.c:1249
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d ting valgt (%s)"
 
-#: src/file-manager/fm-directory-view.c:1256
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 anden ting valgt (%s)"
 
-#: src/file-manager/fm-directory-view.c:1259
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d andre ting valgte (%s)"
@@ -6683,7 +6763,7 @@ msgstr "%d andre ting valgte (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1288
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s %s"
@@ -6692,7 +6772,7 @@ msgstr "%s%s %s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1415
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
@@ -6701,141 +6781,272 @@ msgstr ""
 "Mappen \"%s\" indeholder flere filer end Nautilus kan håndtere. Nogle filer "
 "vil ikke blive vist."
 
-#: src/file-manager/fm-directory-view.c:1422
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "For mange filer"
 
-#: src/file-manager/fm-directory-view.c:2619
+#: src/file-manager/fm-directory-view.c:2752
 #, c-format
 msgid ""
 "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2624
+#: src/file-manager/fm-directory-view.c:2757
 #, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
 "them immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2628
+#: src/file-manager/fm-directory-view.c:2761
 #, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
 "those %d items immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2636
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "Slet med det samme?"
 
-#: src/file-manager/fm-directory-view.c:2637
-#: src/file-manager/fm-directory-view.c:2678
-msgid "Delete"
-msgstr "Slet"
-
-#: src/file-manager/fm-directory-view.c:2667
+#: src/file-manager/fm-directory-view.c:2799
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2671
+#: src/file-manager/fm-directory-view.c:2803
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
 "Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2677
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "Slet fra papirkurven?"
 
-#: src/file-manager/fm-directory-view.c:2950
-#: src/file-manager/fm-directory-view.c:2990
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Brug \"%s\" for at åbne det markerede objekt"
 
-#: src/file-manager/fm-directory-view.c:3192
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "Andre _applikationer..."
+
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "Andre _applikationer..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "Andet _visningsprogram..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "Andet _visningsprogram..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "Brug \"%s\" for at åbne det markerede objekt"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "Nautilus kunne ikke montere det valgte arkiv."
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "Åbn _i nyt vindue"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open _in New Window"
 msgstr "Åbn _i nyt vindue"
 
-#: src/file-manager/fm-directory-view.c:3194
+#: src/file-manager/fm-directory-view.c:3959
 #, fuzzy, c-format
 msgid "Open _in %d New Windows"
 msgstr "Åbn i %d _nye vinduer"
 
-#: src/file-manager/fm-directory-view.c:3220
-msgid "Delete all selected items permanently"
-msgstr "Slet alle valgte ting permanent"
-
-#: src/file-manager/fm-directory-view.c:3225
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "Sle_t fra papirkurven..."
 
-#: src/file-manager/fm-directory-view.c:3226
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "Sle_t fra papirkurven"
 
-#: src/file-manager/fm-directory-view.c:3230
-msgid "Move all selected items to the Trash"
-msgstr "Flyt alle valgte ting til papirkurv"
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "Slet alle valgte ting permanent"
 
-#: src/file-manager/fm-directory-view.c:3234
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "Fly_t til papirkurv"
 
-#: src/file-manager/fm-directory-view.c:3264
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "Flyt alle valgte ting til papirkurv"
+
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "Slet"
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "Slet"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "Opret _henvisninger"
 
-#: src/file-manager/fm-directory-view.c:3265
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "Opret _henvisning"
 
-#: src/file-manager/fm-directory-view.c:3283
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "_Tøm papirkurv..."
 
-#: src/file-manager/fm-directory-view.c:3284
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "_Tøm papirkurv"
 
-#: src/file-manager/fm-directory-view.c:3295
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "Fj_ern personlige billeder"
 
-#: src/file-manager/fm-directory-view.c:3296
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "Fj_ern personligt billede"
 
-#: src/file-manager/fm-directory-view.c:3449
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "_Fil"
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u filer"
+
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "_Indsæt tekst"
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "Kopierer filer"
+
+#: src/file-manager/fm-directory-view.c:4252
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
 "link in the Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3452
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
 "want to put this link in the Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3458
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "Ødelagt henvisning"
 
-#: src/file-manager/fm-directory-view.c:3459
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr "Smid væk"
 
-#: src/file-manager/fm-directory-view.c:3512
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
@@ -6843,19 +7054,19 @@ msgid ""
 msgstr ""
 "\"%s\" er en udførbar tekstfil. Vil du udføre den eller vise dens indhold?"
 
-#: src/file-manager/fm-directory-view.c:3518
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr "Udfør eller fremvis"
 
-#: src/file-manager/fm-directory-view.c:3519
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "Udfør"
 
-#: src/file-manager/fm-directory-view.c:3520
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "Fremvis"
 
-#: src/file-manager/fm-directory-view.c:3574
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
@@ -6863,16 +7074,16 @@ msgstr ""
 "Desværre, men du kan ikke udføre kommandoer fra et ekstern nebsted pga. "
 "sikkerhedshensyn."
 
-#: src/file-manager/fm-directory-view.c:3576
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "Kan ikke køre eksterne henvisninger"
 
-#: src/file-manager/fm-directory-view.c:3710
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr "Åbner \"%s\""
 
-#: src/file-manager/fm-directory-view.c:3716
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "Fortryd åbning?"
 
@@ -6882,23 +7093,28 @@ msgid ""
 "You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "Du har ikke de nødvendige tilladelser til at se indholdet af '%s.'"
 
-#: src/file-manager/fm-error-reporting.c:65
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Desværre, kunne ikke vise hele indholdet af '%s'."
 
-#: src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Fejl ved visning af mappe"
 
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "Navnet \"%s\" er allerede i brug i denne mappe. Benyt venligst et andet navn."
 
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
@@ -6906,12 +7122,12 @@ msgstr ""
 "Der er ingen '%s' i denne mappe. Måske er den lige blevet flyttet eller "
 "slettet?"
 
-#: src/file-manager/fm-error-reporting.c:109
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Du har ikke de nødvendige tilladelser til at omdøbe '%s'."
 
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -6920,62 +7136,62 @@ msgstr ""
 "Navnet \"%s\" er ikke gyldigt fordi det indeholder tegnet '/'. Benyt "
 "venligst et andet navn."
 
-#: src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Navnet \"%s\" er ikke gyldigt. Benyt venligst et andet navn."
 
-#: src/file-manager/fm-error-reporting.c:124
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "Kunne ikke omdøbe '%s' fordi den er på en skrivebeskyttet disk."
 
-#: src/file-manager/fm-error-reporting.c:133
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Desværre, kunne ikke omdøbe \"%s\" til \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:140
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "Fejl ved omdøbelse"
 
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Du har ikke de nødvendige tilladelser til at ændre gruppen til '%s.'"
 
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Kunne ikke ændre gruppen til '%s' fordi den er på en skrivebeskyttet disk."
 
-#: src/file-manager/fm-error-reporting.c:172
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Desværre, kunne ikke ændre gruppen til '%s'."
 
-#: src/file-manager/fm-error-reporting.c:176
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "Fejl under sætning af gruppe"
 
-#: src/file-manager/fm-error-reporting.c:198
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Kunne ikke ændre ejeren af '%s' fordi den er på en skrivebeskyttet disk."
 
-#: src/file-manager/fm-error-reporting.c:205
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Desværre, kunne ikke ændre ejeren af '%s'."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "Fejl ved ændring af ejer"
 
-#: src/file-manager/fm-error-reporting.c:230
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
@@ -6983,21 +7199,21 @@ msgstr ""
 "Kunne ikke ændre rettighederne til '%s' fordi den er på en skrivebeskyttet "
 "disk."
 
-#: src/file-manager/fm-error-reporting.c:237
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Desværre, kunne ikke ændre rettighederne til '%s'."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "Fejl ved sætning af rettigheder"
 
-#: src/file-manager/fm-error-reporting.c:306
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Omdøber '%s' til '%s'"
 
-#: src/file-manager/fm-error-reporting.c:311
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "Fortryd omdøbning?"
 
@@ -7057,76 +7273,76 @@ msgstr ""
 "Vælg rækkefølgen for information der skal vises under ikonnavnene. Mere "
 "information dukker op når du zoomer nærmere ind."
 
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "efter _navn"
 
-#: src/file-manager/fm-icon-view.c:159
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "Hold ikoner sorteret efter navn i rækker"
 
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "efter _størrelse"
 
-#: src/file-manager/fm-icon-view.c:166
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "Hold ikoner sorteret efter størrelse i rækker"
 
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "efter _type"
 
-#: src/file-manager/fm-icon-view.c:173
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "Hold ikoner sorteret efter type i rækker"
 
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "efter ændrings_dato"
 
-#: src/file-manager/fm-icon-view.c:180
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Hold ikoner sorteret efter ændringsdato i rækker"
 
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "efter _emblemer"
 
-#: src/file-manager/fm-icon-view.c:187
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Hold ikoner sorteret efter emblemer i rækker"
 
-#: src/file-manager/fm-icon-view.c:1230
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "_Genopret ikonets oprindelige størrelser"
 
-#: src/file-manager/fm-icon-view.c:1231
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "_Genopret ikonets oprindelige størrelse"
 
-#: src/file-manager/fm-icon-view.c:1443
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "peger på \"%s\""
 
-#: src/file-manager/fm-list-view.c:2128
+#: src/file-manager/fm-list-view.c:2188
 #: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/file-manager/fm-list-view.c:2134
+#: src/file-manager/fm-list-view.c:2194
 #: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Type"
 
-#: src/file-manager/fm-list-view.c:2140
+#: src/file-manager/fm-list-view.c:2200
 #: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Dato for ændring"
@@ -7183,120 +7399,126 @@ msgstr "(noget indhold ulæseligt)"
 msgid "Contents:"
 msgstr "Indhold:"
 
-#: src/file-manager/fm-properties-window.c:1433
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "Basal"
 
-#: src/file-manager/fm-properties-window.c:1512
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Type:"
 
-#: src/file-manager/fm-properties-window.c:1517
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: src/file-manager/fm-properties-window.c:1521
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "Henvisningssæt"
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
 msgstr "MIME-type:"
 
-#: src/file-manager/fm-properties-window.c:1527
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "Ændret:"
 
-#: src/file-manager/fm-properties-window.c:1530
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "Berørt:"
 
-#: src/file-manager/fm-properties-window.c:1539
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr "Vælg tilpasset ikon..."
 
-#: src/file-manager/fm-properties-window.c:1545
+#: src/file-manager/fm-properties-window.c:1558
 msgid "Remove Custom Icon"
 msgstr "Fjern egen ikon"
 
-#: src/file-manager/fm-properties-window.c:1873
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "Sæt bruger-ID"
 
-#: src/file-manager/fm-properties-window.c:1878
+#: src/file-manager/fm-properties-window.c:1891
 msgid "Special Flags:"
 msgstr "Specielle kørselsflag:"
 
-#: src/file-manager/fm-properties-window.c:1881
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "Sæt gruppe-ID"
 
-#: src/file-manager/fm-properties-window.c:1883
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "Klæbrig"
 
-#: src/file-manager/fm-properties-window.c:1909
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Rettigheder"
 
-#: src/file-manager/fm-properties-window.c:1915
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Du er ikke ejeren, så du kan ikke ændre disse rettigheder."
 
-#: src/file-manager/fm-properties-window.c:1928
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "Filens ejer:"
 
-#: src/file-manager/fm-properties-window.c:1937
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "Filens gruppe:"
 
-#: src/file-manager/fm-properties-window.c:1955
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "Ejer:"
 
-#: src/file-manager/fm-properties-window.c:1956
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "Gruppe"
 
-#: src/file-manager/fm-properties-window.c:1957
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "Andre:"
 
-#: src/file-manager/fm-properties-window.c:1976
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "Læs"
 
-#: src/file-manager/fm-properties-window.c:1980
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "Skriv"
 
-#: src/file-manager/fm-properties-window.c:1984
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "Udfør"
 
-#: src/file-manager/fm-properties-window.c:2035
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "Tekstvisning:"
 
-#: src/file-manager/fm-properties-window.c:2036
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "Talvisning:"
 
-#: src/file-manager/fm-properties-window.c:2037
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "Senest ændret:"
 
-#: src/file-manager/fm-properties-window.c:2041
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Rettighederne for '%s' kunne ikke bestemmes."
 
-#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr "Annullér visning af egenskaber-vinduet?"
 
-#: src/file-manager/fm-properties-window.c:2322
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr "Opretter egenskaber-vinduet"
 
-#: src/file-manager/fm-properties-window.c:2422
+#: src/file-manager/fm-properties-window.c:2435
 msgid "Select an icon:"
 msgstr "Vælg et ikon:"
 
@@ -7322,7 +7544,7 @@ msgstr ""
 "installeret."
 
 #: src/file-manager/fm-search-list-view.c:159
-#: src/file-manager/nautilus-indexing-info.c:405
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr "Søgetjeneste ikke tilgængelig"
 
@@ -7467,7 +7689,7 @@ msgstr ""
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
 #: src/file-manager/fm-search-list-view.c:360
-#: src/file-manager/nautilus-indexing-info.c:340
+#: src/file-manager/nautilus-indexing-info.c:342
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
@@ -7479,20 +7701,20 @@ msgid "Fast searches are not available on your computer"
 msgstr "Hurtige søgninger er ikke tilgængelige på din maskine"
 
 #: src/file-manager/fm-search-list-view.c:373
-#: src/file-manager/nautilus-indexing-info.c:359
+#: src/file-manager/nautilus-indexing-info.c:361
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Fast search is disabled in your Search preferences, so no index is available."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:376
-#: src/file-manager/nautilus-indexing-info.c:345
-#: src/file-manager/nautilus-indexing-info.c:363
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
 msgid "Fast searches are not available on your computer."
 msgstr "Hurtige søgninger er ikke tilgængelige på din maskine."
 
 #: src/file-manager/fm-search-list-view.c:377
-#: src/file-manager/nautilus-indexing-info.c:364
+#: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
 "To enable fast search, open the Preferences menu and choose Preferences. "
 "Then select Search preferences and put a checkmark in the Enable Fast Search "
@@ -7544,7 +7766,7 @@ msgid "Change Desktop Background"
 msgstr "Ændr skrivebordsbaggrund"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Delete all items in the Trash"
 msgstr "Slet alle elementer i papirkurven"
 
@@ -7593,141 +7815,192 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Vælg en anden fremviser som du vil bruge til at vise den valgte ting"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-msgid "Create Link"
-msgstr "Opret lænke"
+#, fuzzy
+msgid "Copy Files"
+msgstr "Kopierer filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "Opret en ny tom mappe i denne mappe"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "Opret en symbolsk lænke for hver valgt opføring"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u filer"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "Flyt alle valgte ting til papirkurv"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "Duplikér"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "Duplikér alle valgte opføringer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "Opret lænke"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Move to Trash"
 msgstr "Flyt til papirkurv"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "Nyt mappe"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "Åbn"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid "Open Wit_h"
 msgstr "Åbn med"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "Åbn med"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "Åbn hver valgt ting i et nyt vindue"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr "Åbn i nyt vindue"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Åben den valgte ting i dette vindue"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "Andre applikationer..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "Anden fremviser"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Other _Application..."
-msgstr "Andre _applikationer..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "_Indsæt tekst"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-msgid "Other _Viewer..."
-msgstr "Andet _visningsprogram..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr "Fjern personlige billeder"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr "Fjern egendefinerede billeder fra valgte ikoner"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr ""
 "Fjern alle tilpassede mønstre eller farver fra baggrunden på dette sted"
 
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "Nulstil baggrund"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+msgid "Scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr "Vælg alle filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Select _All Files"
 msgstr "Vælg _alle filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "Vælg alle ting i dette vindue"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr "Vis egenskaber"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Show Trash"
 msgstr "Vis papirkurv"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "Vis _egenskaber"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "Show the contents of the Trash"
 msgstr "Vis indholdet af papirkurven"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "Vis eller modificér egenskaberne for hver af de valgte opføringer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "_Duplikér"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "_Åbn"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "_Indsæt tekst"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Show Trash"
 msgstr "Vis _papirkurv"
 
@@ -7907,7 +8180,7 @@ msgstr ""
 
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr "Indekseringsstatus"
 
@@ -7925,11 +8198,11 @@ msgstr ""
 msgid "Your files were last indexed at %s"
 msgstr "Dine filer blev sidst indekseret %s"
 
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "Opdatér nu"
 
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast.  Your files are currently being indexed."
@@ -7937,11 +8210,11 @@ msgstr ""
 "En gang om dagen bliver dine filer og tekstindhold indekseret så søgninger "
 "er hurtige. Din filer bliver i øjeblikket indekseret."
 
-#: src/file-manager/nautilus-indexing-info.c:404
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Beklager men Medusa søgningstjenesten er ikke tilgængelig."
 
-#: src/file-manager/nautilus-indexing-info.c:426
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr " "
 
@@ -8114,7 +8387,7 @@ msgstr "Bogmærker"
 msgid "Location"
 msgstr "Placering"
 
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:757
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Fjern"
 
@@ -8131,7 +8404,7 @@ msgstr "Færre valgmuligheder"
 msgid "Find Them!"
 msgstr "Find dem!"
 
-#: src/nautilus-first-time-druid.c:184
+#: src/nautilus-first-time-druid.c:191
 #, fuzzy
 msgid ""
 "Existence of this file indicates that the Nautilus configuration druid\n"
@@ -8146,7 +8419,7 @@ msgstr ""
 "Du kan slette denne fil manuelt for at få vismanden frem igen.\n"
 "\n"
 
-#: src/nautilus-first-time-druid.c:484
+#: src/nautilus-first-time-druid.c:487
 #, fuzzy
 msgid ""
 "Your user level adjusts Nautilus to your degree of experience\n"
@@ -8157,7 +8430,7 @@ msgstr ""
 "dit niveau af teknisk ekspertise. Vælg et startniveau som du\n"
 "er komfortabel med; du kan altid ændre det igen senere."
 
-#: src/nautilus-first-time-druid.c:495
+#: src/nautilus-first-time-druid.c:498
 msgid ""
 "For users who have no previous experience with GNOME\n"
 "and Linux."
@@ -8165,7 +8438,7 @@ msgstr ""
 "For brugere som har tidligere erfaring med Gnome\n"
 "og Linux."
 
-#: src/nautilus-first-time-druid.c:501
+#: src/nautilus-first-time-druid.c:504
 #, fuzzy
 msgid ""
 "For users who are comfortable with GNOME and Linux,\n"
@@ -8174,7 +8447,7 @@ msgstr ""
 "For ikke-tekniske brugere som er komfortabel med\n"
 "deres GNOME og Linux-miljøer."
 
-#: src/nautilus-first-time-druid.c:507
+#: src/nautilus-first-time-druid.c:510
 #, fuzzy
 msgid ""
 "For users who have GNOME and Linux experience, and\n"
@@ -8183,7 +8456,7 @@ msgstr ""
 "For brugere som behøver adgang til\n"
 "alle detaljer i deres styresystem."
 
-#: src/nautilus-first-time-druid.c:545
+#: src/nautilus-first-time-druid.c:548
 msgid ""
 "To verify your Internet connection and make sure you have\n"
 "the latest Nautilus updates, Nautilus will now connect to\n"
@@ -8195,16 +8468,16 @@ msgid ""
 "Verify and Nautilus will use it.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:559
+#: src/nautilus-first-time-druid.c:562
 #, fuzzy
 msgid "Verify my connection and check for updates"
 msgstr "Ja, efterprøv min forbindelse og opdatér Nautilus nu."
 
-#: src/nautilus-first-time-druid.c:560
+#: src/nautilus-first-time-druid.c:563
 msgid "Don't verify my connection or check for updates"
 msgstr "Efterprøv ikke min forbindelse eller tjek efter opdateringer"
 
-#: src/nautilus-first-time-druid.c:625
+#: src/nautilus-first-time-druid.c:628
 #, fuzzy
 msgid ""
 "We are having trouble making an external web connection.\n"
@@ -8216,47 +8489,48 @@ msgstr ""
 "dørvogtere. Udfyld navn og port for din proxy, hvis\n"
 "du har en, nedenunder."
 
-#: src/nautilus-first-time-druid.c:637
+#: src/nautilus-first-time-druid.c:640
 msgid "No proxy server required."
 msgstr "Ingen proxy nødvendig."
 
-#: src/nautilus-first-time-druid.c:638
+#: src/nautilus-first-time-druid.c:641
 msgid "Use this proxy server:"
 msgstr "Benyt denne mellemvært:"
 
 #. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:663
+#: src/nautilus-first-time-druid.c:666
 msgid "Proxy address:"
 msgstr "Mellemværtsadresse:"
 
-#: src/nautilus-first-time-druid.c:725
+#: src/nautilus-first-time-druid.c:728
 msgid "Verifying your Internet connection and checking for updates..."
 msgstr "Efterprøv din Internetsforbindelse og tjek efter opdateringer..."
 
-#: src/nautilus-first-time-druid.c:733
+#: src/nautilus-first-time-druid.c:736
 msgid "Downloading Nautilus updates..."
 msgstr "Henter Nautilus-opdateringer..."
 
-#: src/nautilus-first-time-druid.c:902
+#: src/nautilus-first-time-druid.c:906
 msgid ""
 "If you have been using the GNOME Midnight Commander\n"
 "these settings move your desktop icons to Nautilus and\n"
 "make Nautilus the default desktop.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:909
+#: src/nautilus-first-time-druid.c:913
 msgid "Use Nautilus to draw the desktop."
 msgstr "Benyt Nautilus til at håndtere skrivebordet."
 
-#: src/nautilus-first-time-druid.c:915
+#: src/nautilus-first-time-druid.c:919
 msgid "Move existing desktop icons to the Nautilus desktop."
 msgstr "Overfør eksisterende skrivebordsikoner til Nautilus skrivebordet."
 
-#: src/nautilus-first-time-druid.c:920
+#. This option is currently disabled, per bugzilla.eazel.com 7557
+#: src/nautilus-first-time-druid.c:927
 msgid "Launch Nautilus when GNOME starts up."
 msgstr "Start Nautilus sammen med Gnome."
 
-#: src/nautilus-first-time-druid.c:959
+#: src/nautilus-first-time-druid.c:967
 msgid ""
 "The fast search feature indexes all the items on your hard disk.\n"
 "It speeds up searching and allows you to search by file content\n"
@@ -8265,7 +8539,7 @@ msgid ""
 "Fast search requires that the cron daemon on your system be running.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:964
+#: src/nautilus-first-time-druid.c:972
 msgid ""
 "The fast search feature indexes all the items on your hard disk.\n"
 "It speeds up searching and allows you to search by file content\n"
@@ -8273,15 +8547,15 @@ msgid ""
 "takes time but is performed only when your computer is idle.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:973
+#: src/nautilus-first-time-druid.c:981
 msgid "Enable fast search"
 msgstr "Anvend hurtig søgning"
 
-#: src/nautilus-first-time-druid.c:974
+#: src/nautilus-first-time-druid.c:982
 msgid "Turn fast search on when cron is enabled"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1020
+#: src/nautilus-first-time-druid.c:1027
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "currently can't be performed because the program crond, which does\n"
@@ -8295,7 +8569,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1028
+#: src/nautilus-first-time-druid.c:1035
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "may not be performed because the program crond, which does nightly tasks\n"
@@ -8309,82 +8583,89 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1128
+#: src/nautilus-first-time-druid.c:1122
+msgid ""
+"Click Finish to launch Nautilus. You'll start with two\n"
+"Nautilus windows: one shows your home folder, and the\n"
+"other tells you about Eazel's services that make the life\n"
+"of a Linux user easier.\n"
+"\n"
+"We hope you enjoy Nautilus!"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1129
+msgid ""
+"Click Finish to launch Nautilus. You'll start with a\n"
+"window showing your home folder.\n"
+"\n"
+"We hope you enjoy Nautilus!"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1153
 msgid "Nautilus First Time Setup"
 msgstr "Nautilus første-gangs opsætning"
 
-#: src/nautilus-first-time-druid.c:1158
+#: src/nautilus-first-time-druid.c:1183
 msgid "Welcome to Nautilus"
 msgstr "Velkommen til Nautilus"
 
-#: src/nautilus-first-time-druid.c:1160
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
-"Nautilus is part of your GNOME desktop environment. It\n"
-"helps you manage your files and folders (directories),\n"
-"view documents, connect to the Internet, and do many\n"
-"other tasks.\n"
+"Nautilus...\n"
+"    Is a great file manager for the GNOME desktop.\n"
+"    Provides a simple intuitive way to access Internet services.\n"
+"    Is an extensible framework for GNOME developers.\n"
+"    Provides a powerful delivery platform for service providers.\n"
 "\n"
-"The next four screens ask about your level of Linux\n"
-"experience, and check your Internet connection. Click Next\n"
-"to continue."
+"Click Next to begin customizing your Nautilus environment."
 msgstr ""
 
 #. set up the final page
-#: src/nautilus-first-time-druid.c:1172
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "Færdig"
 
-#: src/nautilus-first-time-druid.c:1179
-msgid ""
-"Click Finish to launch Nautilus. You'll start with two\n"
-"Nautilus windows: one shows your home folder, and the\n"
-"other tells you about Eazel's services that make the life\n"
-"of a Linux user easier.\n"
-"\n"
-"We hope you enjoy Nautilus!"
-msgstr ""
-
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1188
+#: src/nautilus-first-time-druid.c:1209
 msgid "Choose Your User Level"
 msgstr "Vælg dit brugerniveau"
 
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1192
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr "Overgang fra GMC til Nautilus"
 
 #. set up the `Launch Medusa' page
-#: src/nautilus-first-time-druid.c:1196
+#: src/nautilus-first-time-druid.c:1217
 msgid "Fast Searches"
 msgstr "Hurtige søgninger"
 
 #. set up optional page to tell the user how to run cron
-#: src/nautilus-first-time-druid.c:1204
+#: src/nautilus-first-time-druid.c:1225
 msgid "The Cron Daemon"
 msgstr "Cron-dæmonen"
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1209
+#: src/nautilus-first-time-druid.c:1230
 msgid "Checking Your Internet Connection"
 msgstr "Kontrollerer din Internetforbindelse"
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1220
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "Opdaterer Nautilus..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1228
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "Konfigurering af mellemvært"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1303
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "Dekoder opdatering..."
 
-#: src/nautilus-first-time-druid.c:1320
+#: src/nautilus-first-time-druid.c:1341
 msgid "Update Complete. Click Next to Continue."
 msgstr "Opdatering fuldført. Klik næste for at fortsætte."
 
@@ -8392,7 +8673,7 @@ msgstr "Opdatering fuldført. Klik næste for at fortsætte."
 #. * doesn't exist. Arlo and I (jsh) and decided that the
 #. * best thing to do is silently fail
 #.
-#: src/nautilus-first-time-druid.c:1333
+#: src/nautilus-first-time-druid.c:1356
 #, fuzzy
 msgid "No Update Available... Press Next to Continue."
 msgstr "Opdatering fuldført... Tryk næste for at fortsætte."
@@ -8422,48 +8703,48 @@ msgstr "Vil du vise disse %d lokationer i forskellige vinduer?"
 msgid "View in Multiple Windows?"
 msgstr "Vis i flere vinduer?"
 
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr "Udfør et hurtigt sæt af selvtjek-prøver."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "Opret det første vindue med den angivne geometri."
 
 # Tilvalgsnavn
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "GEOMETRI"
 
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Opret kun vinduer til eksplicit angivne URI'er."
 
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "Afslut Nautilus."
 
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "Start Nautilus igen."
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check kan ikke bruges med URIer.\n"
 
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check kan ikke bruges med andre valgmuligheder.\n"
 
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit kan ikke bruges med URIer.\n"
 
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart kan ikke bruges med URIer.\n"
 
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry kan ikke bruges med mere end én URI.\n"
 
@@ -8959,15 +9240,18 @@ msgid "View as List"
 msgstr "Vis som liste"
 
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+#, fuzzy
+msgid " _Advanced"
 msgstr " Avanceret"
 
 #: src/nautilus-shell-ui.xml.h:2
-msgid " Beginner"
+#, fuzzy
+msgid " _Beginner"
 msgstr " Begynder"
 
 #: src/nautilus-shell-ui.xml.h:3
-msgid " Intermediate"
+#, fuzzy
+msgid " _Intermediate"
 msgstr " Mellem"
 
 #: src/nautilus-shell-ui.xml.h:4
@@ -9007,162 +9291,146 @@ msgid "Close this window"
 msgstr "Luk dette vindue"
 
 #: src/nautilus-shell-ui.xml.h:15
-msgid "Cut _Text"
-msgstr "Klip _tekst ud"
-
-#: src/nautilus-shell-ui.xml.h:17
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "Vis et vindue der tillader redigering af bogmærker i denne menu"
 
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr "Vis information om dem som lavede Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr "Vis hjælp for Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
 msgstr ""
 "Vis mønstre, farver og emblemer som kan bruges til at tilpasse udseendet"
 
-#: src/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:19
 msgid "Display quick reference pages for Nautilus"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:22
+#: src/nautilus-shell-ui.xml.h:20
 #, fuzzy
 msgid "Display release notes for Nautilus"
 msgstr "Vis hjælp for Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:23
+#: src/nautilus-shell-ui.xml.h:21
 msgid "Display support information for Nautilus and Eazel Services"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:24
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Display the latest contents of the current location"
 msgstr "Vis det nyeste indhold i aktiv lokation"
 
-#: src/nautilus-shell-ui.xml.h:25
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr "Vis tilgængelige temaer for udseende"
 
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:24
 msgid "Edit various Nautilus preferences"
 msgstr "Redigér forskellige Nautilus-indstillinger"
 
-#: src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "Find"
 
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr "_Glem historik"
 
-#: src/nautilus-shell-ui.xml.h:29
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr "Gå til Eazel tjenester"
 
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr "Gå til hjemstedet"
 
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr "Gå til stedet der indeholder denne"
 
-#: src/nautilus-shell-ui.xml.h:32
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr "Gå til næste besøgte lokation"
 
-#: src/nautilus-shell-ui.xml.h:33
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr "Gå til forrige besøgte placering"
 
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:442
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
 #, fuzzy
 msgid "Hide Location _Bar"
 msgstr "Skjul adresselinje"
 
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:424
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
 #, fuzzy
 msgid "Hide St_atus Bar"
 msgstr "Skjul statuslinje"
 
-#: src/nautilus-shell-ui.xml.h:36 src/nautilus-window-menus.c:430
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
 #, fuzzy
 msgid "Hide _Sidebar"
 msgstr "Skjul sidelinje"
 
-#: src/nautilus-shell-ui.xml.h:37 src/nautilus-window-menus.c:436
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
 #, fuzzy
 msgid "Hide _Toolbar"
 msgstr "Skjul sidelinje"
 
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:37
 msgid "Nautilus Quick _Reference"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:38
 msgid "Nautilus Release _Notes"
 msgstr "Nautilus udgivelsesbemærkninger"
 
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:39
 msgid "Nautilus User _Manual"
 msgstr "Nautilus brugerhåndbog"
 
-#: src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "Nyt vindue"
 
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:41
 msgid "New _Window"
 msgstr "Nyt vindue"
 
-#: src/nautilus-shell-ui.xml.h:44
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "Normal størrelse"
 
-#: src/nautilus-shell-ui.xml.h:45
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Opret et nyt Nautilus-vindue for det viste netsted"
 
-#: src/nautilus-shell-ui.xml.h:47
-msgid "Preferences..."
-msgstr "Indstillinger..."
-
-#: src/nautilus-shell-ui.xml.h:48
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "Opdatér"
 
-#: src/nautilus-shell-ui.xml.h:49
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "Fjerner den valgte tekst uden at putte den på klippebordet"
-
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr "Rapportér profilering"
 
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr "Nulstil profilering"
 
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr "Søg på webbet"
 
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr "Søg efter filer på denne datamaskine"
 
-#: src/nautilus-shell-ui.xml.h:54
-msgid "Select _All"
-msgstr "Vælg _alt"
-
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
@@ -9170,179 +9438,194 @@ msgstr ""
 "Vis en side, fra hvilken du kan sende tilbagemeldinger om Nautilus og "
 "Eazel-tjenester"
 
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "Vis indholdet i normal størrelse"
 
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "Vis indholdet med mindre grad af detaljer"
 
-#: src/nautilus-shell-ui.xml.h:58
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "Vis indhold med større grad af detaljer"
 
-#: src/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr "Start profilering"
 
-#: src/nautilus-shell-ui.xml.h:61
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr "Stop profilering"
 
-#: src/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr "Stop indlæsning af denne lokation"
 
-#: src/nautilus-shell-ui.xml.h:63
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "Fortryd sidste tekstændring"
 
-#: src/nautilus-shell-ui.xml.h:64
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "Op"
 
-#: src/nautilus-shell-ui.xml.h:65
-msgid "Use Advanced settings"
-msgstr "Brug avancerede indstillinger"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:66
-msgid "Use Beginner settings"
-msgstr "Brug indstillinger for begynder"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:67
-msgid "Use Intermediate settings"
-msgstr "Brug indstillinger for viderekomne"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:63
 msgid "We_b Search"
 msgstr "We_bsøgning"
 
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "Websøgning"
 
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "Zoom ind"
 
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "Zoom ud"
 
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "Zoom _Ind"
 
-#: src/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "Zoom _Ud"
 
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "_Om Nautilus..."
 
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "_Tilføj bogmærke"
 
-#: src/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "_Tilbage"
 
-#: src/nautilus-shell-ui.xml.h:77
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr "_Baggrunde og emblemer..."
 
-#: src/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "_Bogmærker"
 
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "_Luk vindue"
 
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:76
 msgid "_Customer Support"
 msgstr "Forbrugersupport"
 
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "_Redigér"
 
-#: src/nautilus-shell-ui.xml.h:83
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "_Ændr bogmærker..."
 
-#: src/nautilus-shell-ui.xml.h:84
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "Indstillinger..."
+
+#: src/nautilus-shell-ui.xml.h:80
 msgid "_Feedback"
 msgstr "Tilbagemeldinger"
 
-#: src/nautilus-shell-ui.xml.h:86 src/nautilus-window-menus.c:1352
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "_Find"
 
-#: src/nautilus-shell-ui.xml.h:87
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "_Fremad"
 
-#: src/nautilus-shell-ui.xml.h:88
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "_Gå til"
 
-#: src/nautilus-shell-ui.xml.h:89
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "_Hjælp"
 
-#: src/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "_Hjem"
 
-#: src/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "Placering"
+
+#: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr "Nautilus _temaer..."
 
-#: src/nautilus-shell-ui.xml.h:92
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "_Normal størrelse"
 
-#: src/nautilus-shell-ui.xml.h:94
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "Indstillinger"
+
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr "_Profilering"
 
-#: src/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "_Genopfrisk"
 
-#: src/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr "_Rapportér profilering"
 
-#: src/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr "_Nulstil profilering"
 
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr "_Start profilering"
 
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr "_Stop profilering"
 
-#: src/nautilus-shell-ui.xml.h:100
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "_Fortryd"
 
-#: src/nautilus-shell-ui.xml.h:101
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "_Op et niveau"
 
-#: src/nautilus-shell-ui.xml.h:102
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "_Vis"
 
-#: src/nautilus-sidebar.c:659
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -9350,11 +9633,11 @@ msgstr ""
 "Du kan ikke tilegne mere end et egendefineret ikon ad gangen! Træk venligst "
 "kun et billede for at bestemme egendefineret ikon."
 
-#: src/nautilus-sidebar.c:661
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "Mere end 1 billede"
 
-#: src/nautilus-sidebar.c:680
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -9362,11 +9645,11 @@ msgstr ""
 "Filen du slap er ikke lokal. Du kan kun bruge lokale billeder som "
 "egendefinerede ikoner."
 
-#: src/nautilus-sidebar.c:682
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "Kun lokale billeder"
 
-#: src/nautilus-sidebar.c:687
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -9374,22 +9657,22 @@ msgstr ""
 "Filen du slap er ikke et billede. Du kan kun bruge lokale billeder som "
 "egendefinerede ikoner."
 
-#: src/nautilus-sidebar.c:689
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "Kun billeder"
 
-#: src/nautilus-sidebar.c:1247
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "Åbn med %s"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1283
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "Åbn med..."
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1390
+#: src/nautilus-sidebar.c:1424
 msgid "  Empty Trash  "
 msgstr "  Tøm papirkurv  "
 
@@ -9481,16 +9764,16 @@ msgstr "Kunne ikke fjerne tema"
 msgid "No description available for the \"%s\" theme"
 msgstr "Ingen beskrivelse tilstede for '%s' temaet"
 
-#: src/nautilus-window.c:584
+#: src/nautilus-window.c:637
 msgid "View as ..."
 msgstr "Vis som ..."
 
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1286
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "Vis som andet..."
 
-#: src/nautilus-window.c:1687
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "Luk"
 
@@ -9504,11 +9787,11 @@ msgstr "Luk"
 msgid "Preview Release %s: %s"
 msgstr "Forpræmiere %s: %s"
 
-#: src/nautilus-window-manage-views.c:812
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "Visning mislykkedes"
 
-#: src/nautilus-window-manage-views.c:823
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
@@ -9517,12 +9800,12 @@ msgstr ""
 "Visningen %s blev udsat for en fejl og kan ikke fortsætte. Du kan vælge en "
 "anden visning eller gå til et andet sted."
 
-#: src/nautilus-window-manage-views.c:834
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "%s visningen blev udsat for en fejl ved opstart."
 
-#: src/nautilus-window-manage-views.c:993
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
@@ -9530,7 +9813,7 @@ msgstr ""
 "Et af sidepanelerne blev udsat for en fejl og kan ikke fortsætte. "
 "Beklageligvis kan jeg ikke sige hvilket panel dette gælder."
 
-#: src/nautilus-window-manage-views.c:997
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
@@ -9539,22 +9822,22 @@ msgstr ""
 "Sidepanelet %s blev udsat for en fejl og kan ikke fortsætte. Hvis dette "
 "fortsætter, kan du slå dette panel fra."
 
-#: src/nautilus-window-manage-views.c:1002
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "Sidelinjepanel mislykkedes"
 
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr "Kunne ikke finde \"%s\". Tjek venligst stavningen og prøv igen."
 
-#: src/nautilus-window-manage-views.c:1223
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
 msgstr "\"%s\" er ikke et gyldigt sted. Tjek venligst stavningen og prøv igen."
 
-#: src/nautilus-window-manage-views.c:1237
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -9563,28 +9846,28 @@ msgstr ""
 "Kunne ikke vise \"%s\", fordi Nautilus ikke kan finde ud af hvilken filtype "
 "det er."
 
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr "Nautilus har ingen installeret fremviser der kan vise '%s'."
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1257
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr "Kunne ikke vise \"%s\", fordi Nautilus ikke kan behandle %s: steder."
 
-#: src/nautilus-window-manage-views.c:1263
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "Kunne ikke vise \"%s\", fordi pålogningsforsøget fejlede."
 
-#: src/nautilus-window-manage-views.c:1268
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "Kunne ikke vise \"%s\", fordi adgang blev nægtet."
 
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1287
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
@@ -9593,7 +9876,7 @@ msgstr ""
 "Kunne ikke vise \"%s\", fordi værten \"%s\" ikke blev fundet. Tjek at "
 "stavningen og mellemværts-indstillingerne er korrekte."
 
-#: src/nautilus-window-manage-views.c:1287
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -9602,7 +9885,7 @@ msgstr ""
 "Kunne ikke vise \"%s\", fordi værtsnavnet var tomt. Kontrollér at "
 "mellemværts-indstillingene er korrekte."
 
-#: src/nautilus-window-manage-views.c:1299
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -9613,23 +9896,23 @@ msgstr ""
 "søgetjenesten ikke kører. Vær sikker på at du har startet Medusa "
 "søgetjenesten, og hvis du ikke har et indeks, at MEDUSA indekseren kører."
 
-#: src/nautilus-window-manage-views.c:1303
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "Søgning ikke tilgængelig"
 
-#: src/nautilus-window-manage-views.c:1307
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus kan ikke vise '%s'."
 
-#: src/nautilus-window-manage-views.c:1312
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "Kan ikke vise lokation"
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:313
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
@@ -9637,37 +9920,37 @@ msgstr ""
 "Er du sikker på at du ønsker at glemme historikken? Hvis det er tilfældet, "
 "vil du være dømt til at gentage den."
 
-#: src/nautilus-window-menus.c:316
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
 "Er du sikker på at du ønsker at Nautilus skal glemme stederne du har besøgt?"
 
-#: src/nautilus-window-menus.c:321
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "Glem historik?"
 
-#: src/nautilus-window-menus.c:322
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "Glem"
 
-#: src/nautilus-window-menus.c:425
+#: src/nautilus-window-menus.c:466
 msgid "Show St_atus Bar"
 msgstr "Vis st_atuslinje"
 
-#: src/nautilus-window-menus.c:431
+#: src/nautilus-window-menus.c:472
 msgid "Show _Sidebar"
 msgstr "Vis _sidelinje"
 
-#: src/nautilus-window-menus.c:437
+#: src/nautilus-window-menus.c:478
 msgid "Show _Toolbar"
 msgstr "Vis værk_tøjslinje"
 
-#: src/nautilus-window-menus.c:443
+#: src/nautilus-window-menus.c:484
 msgid "Show Location _Bar"
 msgstr "Vis adresselinje"
 
-#: src/nautilus-window-menus.c:494
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "Indstillinger"
 
@@ -9677,11 +9960,11 @@ msgstr "Indstillinger"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:571
+#: src/nautilus-window-menus.c:618
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr "Ophavsret (C) tilhørende Eazel, Inc. 1999-2001"
 
-#: src/nautilus-window-menus.c:573
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -9698,11 +9981,11 @@ msgstr ""
 #. * bottom of the about box to give credit
 #. * to the translator(s)
 #.
-#: src/nautilus-window-menus.c:582
+#: src/nautilus-window-menus.c:629
 msgid "Translator Credits"
 msgstr "Kenneth Christainsen, Keld Simonsen, og Ole Laursen"
 
-#: src/nautilus-window-menus.c:752
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -9711,27 +9994,23 @@ msgstr ""
 "Lokationen \"%s\" eksisterer ikke. Ønsker du at fjerne alle bogmærker med "
 "denne lokation fra din liste?"
 
-#: src/nautilus-window-menus.c:756
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "Bogmærke for ikke-eksisterende lokation"
 
-#: src/nautilus-window-menus.c:770
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "Lokationen \"%s\" eksisterer ikke længere."
 
-#: src/nautilus-window-menus.c:771
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "Gå til ikke-eksisterende lokation"
 
-#: src/nautilus-window-menus.c:840
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "Gå til stedet givet ved dette bogmærke"
 
-#: src/nautilus-window-menus.c:1351
-msgid "_Browse"
-msgstr "_Gennemse"
-
 #: src/nautilus-window-toolbars.c:402
 msgid "Back"
 msgstr "Tilbage"
@@ -9747,6 +10026,135 @@ msgstr "Fremad"
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 
+#~ msgid "helvetica"
+#~ msgstr "helvetica"
+
+#~ msgid "Welcome, %s!"
+#~ msgstr "Velkommen, %s!"
+
+#~ msgid "_Fonts"
+#~ msgstr "_Skrifttyper"
+
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "Du kan ikke flytte en fil til den selv."
+
+#~ msgid "Can't Move Onto Self"
+#~ msgstr "Kan ikke flytte til sig selv"
+
+#~ msgid "You cannot throw \"%s\" into the Trash."
+#~ msgstr "Du kan ikke kaste '%s' i papirkurven."
+
+#~ msgid "Error Moving to Trash"
+#~ msgstr "Fejl under flytning til papirkurven"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Bold"
+#~ msgstr "Fed"
+
+#~ msgid "Book"
+#~ msgstr "Bog"
+
+#~ msgid "Demibold"
+#~ msgstr "Mellemfed"
+
+#~ msgid "Light"
+#~ msgstr "Let"
+
+#~ msgid "Italic"
+#~ msgstr "Kursiv"
+
+#, fuzzy
+#~ msgid "Oblique"
+#~ msgstr "Evergreens"
+
+#, fuzzy
+#~ msgid "Reverse Italic"
+#~ msgstr "Forkast"
+
+#, fuzzy
+#~ msgid "Reverse Oblique"
+#~ msgstr "Omvendt rækkefølge"
+
+#, fuzzy
+#~ msgid "Condensed"
+#~ msgstr "Indhold:"
+
+#~ msgid "Font"
+#~ msgstr "Skrifttype"
+
+#~ msgid "fixed"
+#~ msgstr "fast"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00 01:00"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr "1/ 1/00,  1:00"
+
+#~ msgid "current theme"
+#~ msgstr "nuværende tema"
+
+#~ msgid "Use this font family to display file names:"
+#~ msgstr "Brug denne skrifttypefamilie vise filnavne:"
+
+#~ msgid "Can add Content"
+#~ msgstr "Kan tilføje indhold"
+
+#~ msgid "No image was selected.  You must click on an image to select it."
+#~ msgstr ""
+#~ "Intet billede var valgt.  Du skal klikke på et billede for at vælge det."
+
+#, fuzzy
+#~ msgid "No selection made"
+#~ msgstr "sektionen her"
+
+#~ msgid "Remember this password"
+#~ msgstr "Husk denne adgangskode"
+
+#~ msgid "times"
+#~ msgstr "times"
+
+#~ msgid "courier"
+#~ msgstr "courier"
+
+#~ msgid "lucida"
+#~ msgstr "lucida"
+
+#~ msgid "Details"
+#~ msgstr "Detaljer"
+
+#~ msgid "Warning"
+#~ msgstr "Advarsel"
+
+#~ msgid "Error"
+#~ msgstr "Fejl"
+
+#~ msgid "Question"
+#~ msgstr "Spørgsmål"
+
+#~ msgid "_Cut Text"
+#~ msgstr "_Klip tekst"
+
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "Fjerner den valgte tekst uden at putte den på klippebordet"
+
+#~ msgid "Use Advanced settings"
+#~ msgstr "Brug avancerede indstillinger"
+
+#~ msgid "Use Beginner settings"
+#~ msgstr "Brug indstillinger for begynder"
+
+#~ msgid "Use Intermediate settings"
+#~ msgstr "Brug indstillinger for viderekomne"
+
+#~ msgid "_Browse"
+#~ msgstr "_Gennemse"
+
 #~ msgid "System"
 #~ msgstr "System"
 
diff --git a/po/de.po b/po/de.po
index ff581d11d..5c8b9c94a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -41,10 +41,15 @@
 # Ich habe in Absprache mit Kai Lahmann angekuendigt, eine Referenz dazu zu
 # schreiben. Diese wird sich dann im CVS in gnome-i18n/extra-po/de befinden!
 #
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 0.5.0\n"
-"POT-Creation-Date: 2001-03-08 22:47+0100\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-03-08 21:59+01:00\n"
 "Last-Translator: Matthias Warkus <mawarkus@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -181,8 +186,8 @@ msgid "Previous"
 msgstr "Voriger"
 
 #: components/help/converters/gnome-db2html2/gdb3html.c:721
-#: libnautilus-extensions/nautilus-global-preferences.c:686
-#: src/nautilus-shell-ui.xml.h:38
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "Heim"
 
@@ -371,16 +376,14 @@ msgid "Kernel Routines"
 msgstr "Kernelroutinen"
 
 #: components/help/hyperbola-filefmt.c:703
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
 msgid "Info"
 msgstr "Info"
 
-#: components/help/hyperbola-nav-tree.c:279
+#: components/help/hyperbola-nav-tree.c:310
 msgid "Introductory Documents:"
 msgstr "Einführungsdokumente:"
 
-#: components/help/hyperbola-nav-tree.c:293
+#: components/help/hyperbola-nav-tree.c:324
 msgid "Documents by Subject:"
 msgstr "Dokumente nach Thema:"
 
@@ -453,7 +456,7 @@ msgstr "Chronik-Seitenleistenpaneel"
 msgid "History sidebar panel for Nautilus"
 msgstr "Chronik-Seitenleistenpaneel für Nautilus"
 
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "Bonobo konnte nicht initialisiert werden"
 
@@ -511,7 +514,7 @@ msgstr "Die Verlierer-Inhaltsansicht töten"
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "Datei"
 
@@ -595,7 +598,7 @@ msgid "Sidebar Loser"
 msgstr "Seitenleisten-Verlierer"
 
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -605,7 +608,7 @@ msgstr ""
 "  %s"
 
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -1052,7 +1055,6 @@ msgid "Oldies"
 msgstr "Oldies"
 
 #: components/music/mpg123.c:32
-#: libnautilus-extensions/nautilus-font-picker.c:115
 msgid "Other"
 msgstr "Sonstiges"
 
@@ -1693,10 +1695,10 @@ msgid "Pause"
 msgstr "Pause"
 
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:945
-#: libnautilus-extensions/nautilus-file-operations.c:960
 #: libnautilus-extensions/nautilus-file-operations.c:979
-#: src/nautilus-shell-ui.xml.h:60
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Stopp"
 
@@ -1746,23 +1748,6 @@ msgstr "Factory für Musik-Ansichten"
 msgid "View as Music"
 msgstr "Als Musik betrachten"
 
-#. FIXME: eventually, get this from preferences
-#. set up the default font
-#: components/notes/nautilus-notes.c:200
-#: components/text/nautilus-text-view.c:186
-#: libnautilus-extensions/nautilus-global-preferences.c:1118
-#: libnautilus-extensions/nautilus-icon-container.c:3332
-#: libnautilus-extensions/nautilus-icon-container.c:3333
-#: libnautilus-extensions/nautilus-icon-container.c:3334
-#: libnautilus-extensions/nautilus-icon-container.c:3335
-#: libnautilus-extensions/nautilus-icon-container.c:3336
-#: libnautilus-extensions/nautilus-icon-container.c:3337
-#: libnautilus-extensions/nautilus-icon-container.c:3338
-#: libnautilus-extensions/nautilus-preferences-item.c:482
-#: src/nautilus-sidebar-title.c:500
-msgid "helvetica"
-msgstr "helvetica"
-
 #: components/notes/Nautilus_View_notes.oaf.in.h:1
 msgid "Factory for annotation view"
 msgstr "Factory für Notiz-Ansicht"
@@ -1855,7 +1840,7 @@ msgstr "Such-CGI angeben"
 #: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
 #: components/services/install/command-line/eazel-test-packsys.c:590
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "Diagnoseausgabe zeigen"
 
@@ -1919,171 +1904,174 @@ msgstr "RPM-Argumente sind benötigte Dateien"
 msgid "Run Query"
 msgstr "Abfrage ausführen"
 
-#. Disabled for 1.0
-#. {"revert", 'r', POPT_ARG_NONE, &arg_revert, 0, N_("Revert"), NULL},
-#: components/services/install/command-line/eazel-alt-install-corba.c:127
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
+#, fuzzy
+msgid "Revert"
+msgstr "nie"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr "Root einstellen"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:128
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "Server angeben"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:129
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
 msgid "Dont print too much, just problems and download"
 msgstr "Nicht allzu viel ausgeben, nur Probleme und Download"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:130
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr "SSL-Umbenennen durchführen"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:131
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
 msgid "argument is a suite id"
 msgstr "Argument ist eine Suitenkennung"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "Testlauf"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr "Benutzername erlauben"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:134
-#: components/services/install/lib/eazel-install-problem.c:1011
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "Upgrades erlauben"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "Wortreiche Ausgabe"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:136
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
 msgid "Install a specific package version"
 msgstr "Eine bestimmte Paketversion installieren"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:159
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
 msgid "*** You cannot specify more then one protocol type.\n"
 msgstr "*** Sie können nicht mehr als einen Protokolltyp angeben.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:176
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
 msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
 msgstr "*** Löschen und zurücksetzen? Jemand hat uns einen Streich gespielt!\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:285
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, c-format
 msgid "File conflict checking %s...\n"
 msgstr "Überprüfen von %s auf Dateikonflikte...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:299
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, c-format
 msgid "File uniqueness checking %s...\n"
 msgstr "Überprüfen von %s auf Einzigartigkeit der Dateien...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:313
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
 #, c-format
 msgid "Feature consistency checking %s...\n"
 msgstr "Überprüfen von %s auf Merkmalkonsistenz...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:344
-#: components/services/install/lib/eazel-install-protocols.c:110
-#: components/services/install/lib/eazel-install-protocols.c:248
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
 #, c-format
 msgid "Downloading %s..."
 msgstr "%s wird heruntergeladen ..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:360
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
 msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
 msgstr "%s wird heruntergeladen... (%d/%d) = %d%% %.1f kB/s"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:368
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
 msgid "Downloading %s... (%d/%d) = %d%%"
 msgstr "%s wird heruntergeladen... (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:376
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
 #, c-format
 msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
 msgstr "%s wird heruntergeladen... (%d/%d) %.1f kB/s Fertig     \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:381
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
 #, c-format
 msgid "Downloading %s... %3.1f KB/s Done\n"
 msgstr "%s wird heruntergeladen... %3.1f kB/s Fertig\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:409
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "%s wird installiert (%d/%d), (%d/%d) b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:417
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "%s wird deinstalliert (%d/%d), (%d/%d) b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:439
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "%s wird installiert (%d/%d), (%d/%d) b - (%d/%d) = %d%% Fertig\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:446
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "%s wird deinstalliert (%d/%d), (%d/%d) b - (%d/%d) = %d%% Fertig\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:454
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
 msgid "Done\n"
 msgstr "Fertig\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:474
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
 #, c-format
 msgid "Download of %s FAILED\n"
 msgstr "Herunterladen von %s FEHLGESCHLAGEN\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:496
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
 #, c-format
 msgid "Package %s failed to uninstall.\n"
 msgstr "Paket %s konnte nicht deinstalliert werden.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:498
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
 #, c-format
 msgid "Package %s failed to install.\n"
 msgstr "Paket %s konnte nicht installiert werden.\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:519
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
 #, c-format
 msgid "\t· Problem : %s\n"
 msgstr "\t· Problem: %s\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:528
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
 #, c-format
 msgid "\t· Action : %s\n"
 msgstr "\t· Aktion: %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:571
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
 msgid "Cancelling operation\n"
 msgstr "Operation wird abgebrochen\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:582
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
 #, c-format
 msgid "About to install a total of %d packages, %dKB\n"
 msgstr "Es werden insgesamt %d Pakete, %d kB installiert\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:586
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
 #, c-format
 msgid "About to uninstall a total of %d packages, %dKB\n"
 msgstr "Es werden insgesamt %d Pakete, %d kB deinstalliert\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:590
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
 #, c-format
 msgid "About to revert a total of %d packages, %d KB\n"
 msgstr "Es werden insgesamt %d Pakete, %d kB zurückgesetzt\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:607
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
 #, c-format
 msgid "\t· %s and it's dependencies\n"
 msgstr "\t· %s und seine Abhängigkeiten\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:610
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
 #, c-format
 msgid "\t· %s\n"
 msgstr "\t· %s\n"
@@ -2093,38 +2081,38 @@ msgstr "\t· %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n) " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:638
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
 msgid "Save transaction report ? (y/n) "
 msgstr "Transaktionsbericht speichern? (j/n)"
 
 #. I18N note: y is the letter for the word Yes. This is
 #. used in the response for a yes/no questions. Your translation
 #. must be 1 character only.
-#: components/services/install/command-line/eazel-alt-install-corba.c:649
-#: components/services/install/command-line/eazel-alt-install-corba.c:769
-#: components/services/install/command-line/eazel-alt-install-corba.c:811
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
 msgid "y"
 msgstr "j"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:670
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
 #, c-format
 msgid "Dependency : %s needs %s\n"
 msgstr "Abhängigkeit: %s benötigt %s\n"
 
 #. I18N note: %s is a package name
-#: components/services/install/command-line/eazel-alt-install-corba.c:688
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
 #, c-format
 msgid "Package %s failed md5 check!\n"
 msgstr "Paket %s fiel durch die MD5-Prüfung!\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:690
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
 #, c-format
 msgid "\t· server MD5 checksum is %s\n"
 msgstr "\t· Server-MD5-Prüfsumme ist %s\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:692
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
 #, c-format
 msgid "\t· actual MD5 checksum is %s\n"
 msgstr "\t· vorliegende MD5-Prüfsumme ist %s\n"
@@ -2134,7 +2122,7 @@ msgstr "\t· vorliegende MD5-Prüfsumme ist %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:758
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
 msgid "Continue? (y/n) "
 msgstr "Fortfahren? (j/n)"
 
@@ -2143,83 +2131,83 @@ msgstr "Fortfahren? (j/n)"
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:799
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
 msgid "Should I delete the RPM files? (y/n) "
 msgstr "Sollen die RPM-Dateien gelöscht werden? (j/n) "
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:831
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
 msgid "Operation ok\n"
 msgstr "Aktion OK\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:833
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
 msgid "Operation failed\n"
 msgstr "Aktion fehlgeschlagen\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:959
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
 msgid "Installing"
 msgstr "Installieren"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:968
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
 msgid "Uninstalling"
 msgstr "Deinstallieren"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:983
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
 msgid "Only one operation at a time please."
 msgstr "Bitte immer nur eine Aktion auf einmal."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:988
-#: components/services/install/command-line/eazel-alt-install-corba.c:996
-#: components/services/install/command-line/eazel-alt-install-corba.c:1040
-#: components/services/install/command-line/eazel-alt-install-corba.c:1047
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
 #, c-format
 msgid "%s: --help for usage\n"
 msgstr "%s: --help zur Verwendung\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
 #, c-format
 msgid "Name         : %s\n"
 msgstr "Name         : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
 #, c-format
 msgid "Version      : %s\n"
 msgstr "Version      : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1014
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
 #, c-format
 msgid "Minor        : %s\n"
 msgstr "Minor        : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
 #, c-format
 msgid "Size         : %d\n"
 msgstr "Größe        : %d\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
 #, c-format
 msgid "Arch         : %s\n"
 msgstr "Architektur  : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
 #, c-format
 msgid "Distribution : %s\n"
 msgstr "Distribution : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1019
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
 #, c-format
 msgid "Description  : %s\n"
 msgstr "Beschreibung : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1021
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
 #, c-format
 msgid "Install root : %s\n"
 msgstr "Installationswurzel: %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1024
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
 msgid "Provides     : \n"
 msgstr "Stellt bereit: \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1066
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
 #, c-format
 msgid "exit code %d\n"
 msgstr "Rückkehrwert %d\n"
@@ -2234,122 +2222,129 @@ msgid "Use specified file to generate a package list, requires --packagelist"
 msgstr ""
 "Angegebene Datei benutzen, um Paketliste zu erzeugen; braucht --packagelist"
 
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 msgid "Softcat server to connect to"
 msgstr "Softcat-Server, mit dem verbunden werden soll"
 
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr "Anderen CGI-Pfad verwenden"
 
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr "Durch Ammonite als softcat-Benutzer verbinden"
 
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 msgid "Number of times to try the request"
 msgstr "Maximale Anzahl der Verbindungsversuche"
 
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr "Verzögerung zwischen Anfrageversuchen in Mikrosekunden"
 
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr "Auffinden nach Eazel-Paketkennung"
 
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+#, fuzzy
+msgid "Lookup package that features a feature/file"
 msgstr "Paket auffinden, das ein Merkmal / eine Datei bereitstellt"
 
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr "Paket mit einer bestimmten Version auffinden"
 
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr "(mit --version) Vergleich >= verwenden"
 
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 msgid "use check function (for debugging)"
 msgstr "Prüffunktion verwenden (zur Fehlerdiagnose)"
 
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 msgid "Show detailed sub-package info"
 msgstr "Detaillierte Information über Unterpakete anzeigen"
 
-#: components/services/install/lib/eazel-install-logic2.c:99
+#: components/services/install/command-line/eazel-test-softcat.c:66
+#, fuzzy
+msgid "enable funk parser"
+msgstr "Schnelle Suche aktivieren"
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "Sperren der heruntergeladenen Datei fehlgeschlagen"
 
-#: components/services/install/lib/eazel-install-logic2.c:116
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "MD5 stimmt nicht überein, Paket %s könnte defekt sein"
 
-#: components/services/install/lib/eazel-install-logic2.c:132
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, c-format
 msgid "No MD5 available for %s"
 msgstr "Keine MD5 verfügbar für %s"
 
 #. I18N note: "%is is ok" in the sense that %s=package name and the
 #. package is intact
-#: components/services/install/lib/eazel-install-logic2.c:327
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, c-format
 msgid "%s is ok"
 msgstr "%s ist OK"
 
-#: components/services/install/lib/eazel-install-logic2.c:433
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s Version %s-%s ist bereits installiert"
 
-#: components/services/install/lib/eazel-install-logic2.c:437
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s Version %s ist bereits installiert"
 
-#: components/services/install/lib/eazel-install-logic2.c:446
-#: components/services/install/lib/eazel-install-logic2.c:451
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr "%s führt Upgrade von Version %s-%s auf %s-%s aus"
 
-#: components/services/install/lib/eazel-install-logic2.c:460
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr "%s führt Downgrade von Version %s-%s auf %s-%s aus"
 
-#: components/services/install/lib/eazel-install-logic2.c:465
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr "%s führt Downgrade von Version %s auf %s aus"
 
-#: components/services/install/lib/eazel-install-logic2.c:518
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr "%s installiert Version %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:523
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr "%s installiert Version %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:687
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, c-format
 msgid "Loading package info from file %s"
 msgstr "Paketinformationen werden aus Datei %s geladen"
 
 #. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
-#: components/services/install/lib/eazel-install-logic2.c:993
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "ok"
 msgstr "OK"
 
-#: components/services/install/lib/eazel-install-logic2.c:993
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "not ok"
 msgstr "nicht OK"
 
-#: components/services/install/lib/eazel-install-logic2.c:1159
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
 msgid "Checking dependencies for %s"
 msgstr "Abhängigkeiten für %s werden überprüft"
@@ -2357,52 +2352,52 @@ msgstr "Abhängigkeiten für %s werden überprüft"
 #. I18N note: both %s' are package names.
 #. related is in the sense that the two packages apparently
 #. are connected somehow, eg. foo and foo-devel
-#: components/services/install/lib/eazel-install-logic2.c:1766
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, c-format
 msgid "%s is related to %s"
 msgstr "%s hängt zusammen mit %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:1826
+#: components/services/install/lib/eazel-install-logic2.c:2090
 #, c-format
 msgid "updating %s to version %s-%s solves conflict"
 msgstr "Update von %s auf Version %s-%s löst Konflikt"
 
-#: components/services/install/lib/eazel-install-logic2.c:1842
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
 msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr "verfügbares Update von %s (%s-%s) löst den Konflikt nicht"
 
-#: components/services/install/lib/eazel-install-logic2.c:1849
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, c-format
 msgid "could not revive %s"
 msgstr "%s konnte nicht wiederbelebt werden"
 
-#: components/services/install/lib/eazel-install-logic2.c:2004
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
 msgid "file uniqueness checking %s"
 msgstr "Überprüfen von %s auf Einzigartigkeit der Dateien"
 
-#: components/services/install/lib/eazel-install-logic2.c:2025
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
 msgid "Duplicate file : %s occurs in %s and %s"
 msgstr "Doppelte Datei: %s kommt in %s und in %s vor"
 
-#: components/services/install/lib/eazel-install-logic2.c:2037
-#: components/services/install/lib/eazel-install-logic2.c:2191
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
 msgid "... but it's ok, the packages are related"
 msgstr "...aber das geht in Ordnung, die Pakete stehen in Bezug"
 
-#: components/services/install/lib/eazel-install-logic2.c:2045
+#: components/services/install/lib/eazel-install-logic2.c:2324
 #, c-format
 msgid "(there were %d other conflicts)"
 msgstr "(es gab %d andere Konflikte)"
 
-#: components/services/install/lib/eazel-install-logic2.c:2140
+#: components/services/install/lib/eazel-install-logic2.c:2419
 #, c-format
 msgid "file conflict checking %s"
 msgstr "Überprüfen von %s auf Dateikonflikte"
 
-#: components/services/install/lib/eazel-install-logic2.c:2177
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
 msgid "file conflict : package %s already provides file %s also provided by %s"
 msgstr ""
@@ -2410,19 +2405,19 @@ msgstr ""
 
 #. the owner of this file is a package that we're upgrading, and the
 #. * new version no longer has this file, so everything's okay.
-#: components/services/install/lib/eazel-install-logic2.c:2187
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
 msgid "...but it is okay, we're upgrading %s and it ditched that file"
 msgstr ""
 "...aber das ist in Ordnung, ein Upgrade von %s wird durchgeführt und "
 "verwirft diese Datei"
 
-#: components/services/install/lib/eazel-install-logic2.c:2279
+#: components/services/install/lib/eazel-install-logic2.c:2558
 #, c-format
 msgid "checking feature consistency of %s"
 msgstr "Überprüfen von %s auf Merkmalkonsistenz"
 
-#: components/services/install/lib/eazel-install-logic2.c:2347
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
 msgid ""
 "feature missing : %s breaks if %s is installed (feature %s would be lost"
@@ -2430,152 +2425,152 @@ msgstr ""
 "Merkmal fehlt: %s funktioniert nicht mehr, wenn %s installiert wird (Merkmal "
 "%s würde verloren gehen)"
 
-#: components/services/install/lib/eazel-install-logic2.c:2426
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, c-format
 msgid "downloading %d packages"
 msgstr "%d Pakete werden heruntergeladen"
 
-#: components/services/install/lib/eazel-install-logic2.c:2695
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, c-format
 msgid "will upgrade %s"
 msgstr "Upgrade von %s wird durchgeführt"
 
-#: components/services/install/lib/eazel-install-logic2.c:2698
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, c-format
 msgid "will downgrade %s"
 msgstr "Downgrade von %s wird durchgeführt"
 
-#: components/services/install/lib/eazel-install-logic2.c:2701
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, c-format
 msgid "will install %s"
 msgstr "%s wird installiert"
 
-#: components/services/install/lib/eazel-install-logic2.c:2704
+#: components/services/install/lib/eazel-install-logic2.c:2960
 #, c-format
 msgid "will uninstall %s"
 msgstr "%s wird deinstalliert"
 
-#: components/services/install/lib/eazel-install-logic2.c:2789
-#: components/services/install/lib/eazel-install-problem.c:335
-#: components/services/install/lib/eazel-install-problem.c:338
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
 #, c-format
 msgid "%s requires %s"
 msgstr "%s benötig %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2982
+#: components/services/install/lib/eazel-install-logic2.c:3238
 #, c-format
 msgid "failed %s"
 msgstr "%s ist fehlgeschlagen"
 
-#: components/services/install/lib/eazel-install-metadata.c:171
+#: components/services/install/lib/eazel-install-metadata.c:174
 msgid "Could not set URLType from config file!"
 msgstr "URLType konnte nicht aus Konfigurationsdatei entnommen werden!"
 
-#: components/services/install/lib/eazel-install-object.c:713
+#: components/services/install/lib/eazel-install-object.c:717
 msgid "Transactions are not stored, could not find home dir"
 msgstr ""
 "Transaktionen werden nicht gespeichert, da Heimverzeichnis nicht gefunden "
 "werden konnte"
 
-#: components/services/install/lib/eazel-install-object.c:741
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr "Transaktionen werden gespeichert in %s"
 
-#: components/services/install/lib/eazel-install-object.c:998
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "Paketliste wird von entferntem Server bezogen...\n"
 
-#: components/services/install/lib/eazel-install-object.c:1014
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "package-list.xml konnte nicht bezogen werden!\n"
 
-#: components/services/install/lib/eazel-install-object.c:1087
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr ""
 "In Datei %s konnte nicht geschrieben werden, voreingestellter Logbuchhandler "
 "wird benutzt"
 
-#: components/services/install/lib/eazel-install-object.c:1218
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "Installation fehlgeschlagen"
 
-#: components/services/install/lib/eazel-install-object.c:1264
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "Deinstallation fehlgeschlagen"
 
-#: components/services/install/lib/eazel-install-object.c:1387
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "Transaktionsverzeichnis konnte nicht angelegt werden (%s)! ***\n"
 
-#: components/services/install/lib/eazel-install-object.c:1410
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr "Transaktion wird in %s geschrieben"
 
-#: components/services/install/lib/eazel-install-problem.c:159
+#: components/services/install/lib/eazel-install-problem.c:163
 #, c-format
 msgid "%s was cancelled"
 msgstr "%s wurde storniert"
 
-#: components/services/install/lib/eazel-install-problem.c:164
-#: components/services/install/lib/eazel-install-problem.c:327
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
 msgid "%s is a source package, which is not yet supported"
 msgstr "%s ist ein Quellpaket; dies wird noch nicht unterstütz"
 
-#: components/services/install/lib/eazel-install-problem.c:178
-#: components/services/install/lib/eazel-install-problem.c:189
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
 #, c-format
 msgid "%s would break other packages"
 msgstr "%s würde andere Pakete beschädigen"
 
-#: components/services/install/lib/eazel-install-problem.c:181
+#: components/services/install/lib/eazel-install-problem.c:185
 #, c-format
 msgid "%s would break"
 msgstr "%s würde beschädigt"
 
-#: components/services/install/lib/eazel-install-problem.c:187
+#: components/services/install/lib/eazel-install-problem.c:191
 #, c-format
 msgid "%s would break %s"
 msgstr "%s würde %s beschädigen"
 
-#: components/services/install/lib/eazel-install-problem.c:193
+#: components/services/install/lib/eazel-install-problem.c:197
 #, c-format
 msgid "%s is damaged"
 msgstr "%s ist beschädigt"
 
-#: components/services/install/lib/eazel-install-problem.c:197
+#: components/services/install/lib/eazel-install-problem.c:201
 #, c-format
 msgid "%s requires %s, which could not be found on the server"
 msgstr "%s benötigt %s, das nicht auf dem Server gefunden werden konnte"
 
-#: components/services/install/lib/eazel-install-problem.c:200
-#, c-format
-msgid "%s could not be found on the server"
+#: components/services/install/lib/eazel-install-problem.c:204
+#, fuzzy, c-format
+msgid "%s for %s could not be found on the server"
 msgstr "%s konnte auf dem Server nicht gefunden werden"
 
-#: components/services/install/lib/eazel-install-problem.c:208
-#: components/services/install/lib/eazel-install-problem.c:353
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr "%s ist bereits installiert"
 
-#: components/services/install/lib/eazel-install-problem.c:252
+#: components/services/install/lib/eazel-install-problem.c:259
 #, c-format
 msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr ""
 "%s ist neuer und verlangt darum ein Drowngrade; Downgrade ist nicht "
 "eingeschaltet"
 
-#: components/services/install/lib/eazel-install-problem.c:256
+#: components/services/install/lib/eazel-install-problem.c:263
 #, c-format
 msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr "%s ist älter und benötigt ein Upgrade; Upgrade ist nicht eingeschaltet"
 
-#: components/services/install/lib/eazel-install-problem.c:346
+#: components/services/install/lib/eazel-install-problem.c:353
 #, c-format
 msgid "%s is not installed and could not be found on server"
 msgstr ""
@@ -2583,21 +2578,21 @@ msgstr ""
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:913
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr "Auf eine neue Version von %s hin überprüfen"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:924
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr "Sowohl %s als auch %s installieren"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:939
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr "%s von Ihrem System entfernen"
@@ -2605,232 +2600,232 @@ msgstr "%s von Ihrem System entfernen"
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:952
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr "Das Entfernen von %s von Ihrem System erzwingen"
 
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:960
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr "Paketdatenbank ist inkonsistent"
 
-#: components/services/install/lib/eazel-install-problem.c:1008
+#: components/services/install/lib/eazel-install-problem.c:1015
 msgid "Continue with force"
 msgstr "Gewaltsam fortfahren"
 
-#: components/services/install/lib/eazel-install-problem.c:1014
+#: components/services/install/lib/eazel-install-problem.c:1021
 msgid "Allow downgrade"
 msgstr "Downgrades erlauben"
 
-#: components/services/install/lib/eazel-install-protocols.c:123
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:166
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
 #, c-format
 msgid "Could not open target file %s"
 msgstr "Zieldatei %s konnte nicht geöffnet werden"
 
-#: components/services/install/lib/eazel-install-protocols.c:130
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:92
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
 msgid "Could not create an http request !"
 msgstr "HTTP-Anfrage konnte nicht erzeugt werden!"
 
-#: components/services/install/lib/eazel-install-protocols.c:137
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:99
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
 msgid "Proxy: Invalid uri !"
 msgstr "Proxy: Ungültiger URI!"
 
-#: components/services/install/lib/eazel-install-protocols.c:142
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:105
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
 msgid "Invalid uri !"
 msgstr "Ungültiger URI!"
 
-#: components/services/install/lib/eazel-install-protocols.c:149
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:115
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
 msgid "Could not prepare http request !"
 msgstr "HTTP-Anfrage konnte nicht vorbereitet werden!"
 
-#: components/services/install/lib/eazel-install-protocols.c:154
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:120
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
 msgid "Couldn't get async mode "
 msgstr "Asynchroner Modus konnte nicht erhalten werden "
 
 #. probably out of disk space
-#: components/services/install/lib/eazel-install-protocols.c:183
-#: components/services/install/lib/eazel-install-protocols.c:212
-#: components/services/install/lib/eazel-install-protocols.c:228
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, c-format
 msgid "DISK FULL: could not write %s"
 msgstr "PLATTE VOLL: konnte %s nicht schreiben"
 
-#: components/services/install/lib/eazel-install-protocols.c:189
-#: components/services/install/lib/eazel-install-protocols.c:217
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
 msgid "Could not get request body!"
 msgstr "Anfragerumpf konnte nicht erhalten werden!"
 
-#: components/services/install/lib/eazel-install-protocols.c:202
+#: components/services/install/lib/eazel-install-protocols.c:208
 #, c-format
 msgid "HTTP error: %d %s"
 msgstr "HTTP-Fehler: %d %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:249
+#: components/services/install/lib/eazel-install-protocols.c:255
 msgid "FTP not supported yet"
 msgstr "FTP noch nicht unterstützt"
 
-#: components/services/install/lib/eazel-install-protocols.c:457
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, c-format
 msgid "Checking local file %s..."
 msgstr "Lokale Datei %s wird geprüft..."
 
-#: components/services/install/lib/eazel-install-protocols.c:578
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, c-format
 msgid "Failed to retrieve %s!"
 msgstr "%s konnte nicht bezogen werden!"
 
-#: components/services/install/lib/eazel-install-protocols.c:651
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, c-format
 msgid "Could not get an URL for %s"
 msgstr "URL für %s konnte nicht erhalten werden"
 
-#: components/services/install/lib/eazel-install-protocols.c:666
+#: components/services/install/lib/eazel-install-protocols.c:672
 msgid "Downloaded package does not have the correct name"
 msgstr "Heruntergeladenes Paket hat nicht den korrekten Namen"
 
-#: components/services/install/lib/eazel-install-protocols.c:667
+#: components/services/install/lib/eazel-install-protocols.c:673
 #, c-format
 msgid "Package %s should have had name %s"
 msgstr "Paket %s sollte den Namen %s tragen"
 
-#: components/services/install/lib/eazel-install-protocols.c:695
+#: components/services/install/lib/eazel-install-protocols.c:701
 msgid "File download failed"
 msgstr "Herunterladen einer Datei fehlgeschlagen"
 
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr "*** Beginne Paketdump ***\n"
 
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr "*** Ende Paketdump ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:158
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 msgid "*** No package nodes! (cat has no children) ***"
 msgstr "*** Keine Paket-Nodes! (cat hat keine Kinder) ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:160
-#: components/services/install/lib/eazel-install-xml-package-list.c:168
-#: components/services/install/lib/eazel-install-xml-package-list.c:183
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 msgid "*** Bailing from package parse! ***"
 msgstr "*** Paketparsing abgebrochen! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:166
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
 msgid "*** No package nodes! ***"
 msgstr "*** Keine Paket-Nodes! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:172
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 msgid "*** Malformed package node!"
 msgstr "*** Ungültiger Paket-Node! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:181
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
 msgid "*** No depends nodes! ***"
 msgstr "*** Keine Abhängigkeits-Nodes! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:187
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr "*** Ungültiger Abhängigkeiten-Node!"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:211
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr "*** Unbekannter Node-Typ \"%s\""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:228
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** Die Paketlistendatei enthält keine Daten! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:233
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** xmlnode CATEGORIES ist nicht zu finden! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:234
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr "*** Kategorienparsing abgebrochen! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:240
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** Keine Kategorien! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:241
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr "*** Kategorienparsing abgebrochen! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:295
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** xmlnode TRANSACTION ist nicht zu finden! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:297
-#: components/services/install/lib/eazel-install-xml-package-list.c:305
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr "*** Transaktionsparsing abgebrochen! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:303
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** Keine Pakete! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:339
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** Keine Kategorie-Nodes! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:343
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** xmlnode CATEGORIES ist nicht zu finden! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:377
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** Unbekannter Node %s ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:467
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** Fehler beim Erzeugen der XML-Paketliste! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:514
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** Fehler beim Lesen der Paketliste! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:909
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** osd-XML enthält keine Daten! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:914
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr "*** osd-Parsing abgebrochen! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:990
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "XML (Länge %d) konnte nicht geparst werden"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:763
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr "Paketdatenbank in %s geöffnet"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:768
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr "Öffnen von Paketdatenbank in %s schlug fehl"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:801
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr "DB für %s (offen) wird geschlossen"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:806
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr "DB für %s (nicht offen) wird geschlossen"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1137
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr "%s kann nicht geöffnet werden"
@@ -2943,7 +2938,7 @@ msgid "Now installing package \"%s\"."
 msgstr "Paket \"%s\" wird gerade installiert."
 
 #: components/services/install-view/callbacks.c:407
-#: components/services/install-view/nautilus-service-install-view.c:897
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "\"%s\" wird installiert"
@@ -2970,29 +2965,29 @@ msgstr "Folgendes sollte jetzt geschehen:"
 msgid "Is this ok ?"
 msgstr "Ist das in Ordnung?"
 
-#: components/services/install-view/callbacks.c:557
+#: components/services/install-view/callbacks.c:556
 msgid "Installation cancelled."
 msgstr "Installation abgebrochen."
 
-#: components/services/install-view/callbacks.c:559
+#: components/services/install-view/callbacks.c:558
 msgid "This package has already been installed."
 msgstr "Dieses Paket wurde bereits installiert."
 
-#: components/services/install-view/callbacks.c:561
-#: components/services/install-view/callbacks.c:658
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
 msgid "Installation complete."
 msgstr "Installation abgeschlossen."
 
-#: components/services/install-view/callbacks.c:565
+#: components/services/install-view/callbacks.c:564
 msgid "Installation failed."
 msgstr "Installation fehlgeschlagen."
 
 #. some succeeded; some failed
-#: components/services/install-view/callbacks.c:569
+#: components/services/install-view/callbacks.c:568
 msgid "Some packages installed successfully:"
 msgstr "Einige Pakete wurden erfolgreich installiert:"
 
-#: components/services/install-view/callbacks.c:578
+#: components/services/install-view/callbacks.c:577
 msgid ""
 "\n"
 "Some packages failed:"
@@ -3000,19 +2995,19 @@ msgstr ""
 "\n"
 "Einige Pakete schlugen fehl:"
 
-#: components/services/install-view/callbacks.c:627
+#: components/services/install-view/callbacks.c:626
 msgid "Erase the RPM files?"
 msgstr "Die RPM-Dateien löschen?"
 
-#: components/services/install-view/callbacks.c:629
+#: components/services/install-view/callbacks.c:628
 msgid "Erase the leftover RPM files?"
 msgstr "Die übrig gebliebenen RPM-Dateien löschen?"
 
-#: components/services/install-view/callbacks.c:659
+#: components/services/install-view/callbacks.c:658
 msgid "Ok"
 msgstr "OK"
 
-#: components/services/install-view/callbacks.c:674
+#: components/services/install-view/callbacks.c:673
 msgid ""
 "A core package of Nautilus has been\n"
 "updated.  You should restart Nautilus.\n"
@@ -3089,30 +3084,30 @@ msgstr "Fortfahren"
 
 #: components/services/install-view/forms.c:482
 #: libnautilus-extensions/nautilus-drag.c:493
-#: src/file-manager/fm-directory-view.c:3520
+#: src/file-manager/fm-directory-view.c:4326
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: components/services/install-view/nautilus-service-install-view.c:419
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
 msgid "%s is in GNOME (footprint) > %s"
 msgstr "%s ist in GNOME (Fußabdruck) > %s"
 
-#: components/services/install-view/nautilus-service-install-view.c:437
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, c-format
 msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr "%s ist im GNOME-(Fußabdruck-)Menü.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:452
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
 msgid "%s is in the KDE menu.\n"
 msgstr "%s ist im KDE-Menü.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:653
+#: components/services/install-view/nautilus-service-install-view.c:655
 msgid "Installation Complete"
 msgstr "Installation abgeschlossen"
 
-#: components/services/install-view/nautilus-service-install-view.c:708
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
 msgid ""
 "%sTo start %s, click the Launch button below, or to create a shortcut, drag "
@@ -3123,32 +3118,32 @@ msgstr ""
 "GNOME-Panel oder auf Ihren Desktop."
 
 #. couldn't find an icon
-#: components/services/install-view/nautilus-service-install-view.c:716
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
 msgid "%sTo start %s, click the Launch button below."
 msgstr "%sUm %s zu starten, klicken Sie den Knopf \"Starten\" unten."
 
-#: components/services/install-view/nautilus-service-install-view.c:771
+#: components/services/install-view/nautilus-service-install-view.c:773
 msgid "Incorrect password."
 msgstr "Falsches Passwort."
 
-#: components/services/install-view/nautilus-service-install-view.c:776
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr "Als root legitimieren"
 
-#: components/services/install-view/nautilus-service-install-view.c:893
+#: components/services/install-view/nautilus-service-install-view.c:895
 msgid "Installing packages"
 msgstr "Pakete werden installiert"
 
-#: components/services/install-view/nautilus-service-install-view.c:895
+#: components/services/install-view/nautilus-service-install-view.c:897
 msgid "Installing remote package"
 msgstr "Pakete aus dem Netz werden installiert"
 
-#: components/services/install-view/nautilus-service-install-view.c:899
+#: components/services/install-view/nautilus-service-install-view.c:901
 msgid "Installing some package"
 msgstr "Irgend ein Paket wird installiert"
 
-#: components/services/install-view/nautilus-service-install-view.c:916
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
@@ -3156,23 +3151,23 @@ msgstr ""
 "Der Eazel-Installationsdienst fehlt:\n"
 "Installationen werden nicht funktionieren."
 
-#: components/services/install-view/nautilus-service-install-view.c:965
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr "Verbindung mit dem Eazel-Softwarekatalog wird aufgenommen..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1023
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr "Legitimation wird geprüft..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1095
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr "Paketdownloads werden abgebrochen (bitte warten)..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1115
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "Herunterladen eines Pakets abgebrochen."
 
-#: components/services/install-view/nautilus-service-install-view.c:1116
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "Abgebrochen"
 
@@ -3458,12 +3453,12 @@ msgid "Services Login"
 msgstr "Dienste-Anmeldung"
 
 #: components/services/summary/nautilus-summary-dialogs.c:131
-#: libnautilus-extensions/nautilus-password-dialog.c:269
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "Benutzername:"
 
 #: components/services/summary/nautilus-summary-dialogs.c:138
-#: libnautilus-extensions/nautilus-password-dialog.c:276
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "Fensterverhalten"
 
@@ -3535,7 +3530,7 @@ msgstr "Dienste"
 msgid "Featured Downloads"
 msgstr "Downloads im Angebot"
 
-#: components/services/summary/nautilus-summary-view.c:883
+#: components/services/summary/nautilus-summary-view.c:884
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
 "unavailable right now, or your computer might be configured incorrectly. "
@@ -3545,7 +3540,7 @@ msgstr ""
 "Server ist vielleicht nicht verfügbar oder Ihr Computer könnte falsch "
 "konfiguriert sein. Bitte setzen Sie sich mit support@eazel.com in Verbindung."
 
-#: components/services/summary/nautilus-summary-view.c:893
+#: components/services/summary/nautilus-summary-view.c:894
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3553,7 +3548,7 @@ msgstr ""
 "Probleme mit den Daten auf den Eazel-Servern sind aufgetreten. Bitte wenden "
 "Sie sich an support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:916
+#: components/services/summary/nautilus-summary-view.c:917
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
 "contact support@eazel.com."
@@ -3561,7 +3556,7 @@ msgstr ""
 "Informationen fehlen in den Umleitungsdaten auf den Eazel-Servern. Bitte "
 "wenden Sie sich an support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:958
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
 "now, or your computer might be configured incorrectly. You could try again "
@@ -3571,7 +3566,7 @@ msgstr ""
 "ist vielleicht nicht verfügbar oder Ihr Computer könnte falsch konfiguriert "
 "sein. Sie können es später noch einmal versuchen."
 
-#: components/services/summary/nautilus-summary-view.c:968
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3579,11 +3574,11 @@ msgstr ""
 "Probleme mit Umleitungsdaten auf den Eazel-Servern sind aufgetreten. Bitte "
 "wenden Sie sich an support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:985
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr "Systeminventar konnte nicht hochgeladen werden."
 
-#: components/services/summary/nautilus-summary-view.c:1048
+#: components/services/summary/nautilus-summary-view.c:1049
 #: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr "Eazel-Dienste"
@@ -3648,16 +3643,16 @@ msgstr "Zusammenfassungsbetrachter"
 msgid "View as Summary"
 msgstr "Als Zusammenfassung betrachten"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:130
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
 #, c-format
 msgid "HTTP error %d \"%s\" on uri %s"
 msgstr "HTTP-Fehler: %d \"%s\" bei URI %s"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:200
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo konnte nicht initialisiert werden"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:215
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr ""
@@ -3696,50 +3691,70 @@ msgstr "beispielhafte Eazel-Diensteansicht"
 msgid "Factory for the sample service"
 msgstr "Factory für den beispielhaften Dienst"
 
-#: components/text/nautilus-text-view.c:326
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr ""
 "Entschuldigung, aber %s ist so groß, dass Nautilus nicht alles davon laden "
 "kann."
 
-#: components/text/nautilus-text-view.c:329
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr "Datei zu groß"
 
 #: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "Schriftarten"
+
+#: components/text/nautilus-text-view-ui.xml.h:2
 msgid "Lucida"
 msgstr "Lucida"
 
-#: components/text/nautilus-text-view-ui.xml.h:2
+#: components/text/nautilus-text-view-ui.xml.h:3
 msgid "Use the Courier Font"
 msgstr "Die Schriftart Courier verwenden"
 
-#: components/text/nautilus-text-view-ui.xml.h:3
+#: components/text/nautilus-text-view-ui.xml.h:4
+#, fuzzy
+msgid "Use the Fixed Font"
+msgstr "Die Schriftart Times verwenden"
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+#, fuzzy
+msgid "Use the GTK System Font"
+msgstr "Die Schriftart Times verwenden"
+
+#: components/text/nautilus-text-view-ui.xml.h:6
 msgid "Use the Helvetica Font"
 msgstr "Die Schriftart Helvetica verwenden"
 
-#: components/text/nautilus-text-view-ui.xml.h:4
+#: components/text/nautilus-text-view-ui.xml.h:7
 msgid "Use the Lucida Font"
 msgstr "Die Schriftart Lucida verwenden"
 
-#: components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:8
 msgid "Use the Times Font"
 msgstr "Die Schriftart Times verwenden"
 
-#: components/text/nautilus-text-view-ui.xml.h:6
+#: components/text/nautilus-text-view-ui.xml.h:9
 msgid "_Courier"
 msgstr "_Courier"
 
-#: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
-msgstr "Schriftarten"
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "Datei"
 
-#: components/text/nautilus-text-view-ui.xml.h:8
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
 msgid "_Helvetica"
 msgstr "_Helvetica"
 
-#: components/text/nautilus-text-view-ui.xml.h:9
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr "_Times"
 
@@ -3808,7 +3823,7 @@ msgid "Nautilus Tree view"
 msgstr "Nautilus-Baumansicht"
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:638
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr "Baum"
 
@@ -3820,7 +3835,7 @@ msgstr "Erscheinung"
 msgid "Azul"
 msgstr "Azur"
 
-#: data/browser.xml.h:3 libnautilus-extensions/nautilus-font-picker.c:103
+#: data/browser.xml.h:3
 msgid "Black"
 msgstr "Schwarz"
 
@@ -3932,7 +3947,7 @@ msgstr "Ein Emblem auf ein Objekt ziehen, um es ihm hinzuzufügen"
 msgid "Eclipse"
 msgstr "Finsternis"
 
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1607
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "Embleme"
 
@@ -4029,7 +4044,7 @@ msgid "Numbers"
 msgstr "Zahlen"
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "OK"
 
@@ -4150,13 +4165,13 @@ msgid "The Gimp"
 msgstr "Das Gimp"
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:554
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "Desktop"
 
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4796
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
-#: src/file-manager/fm-desktop-icon-view.c:65
+#: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
 msgstr "Müll"
 
@@ -4189,7 +4204,7 @@ msgid "Google"
 msgstr "Google"
 
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:808
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "Suchmaschinen"
 
@@ -4443,101 +4458,101 @@ msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-iso8859-1,*-r-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2261
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr "heute um %-H.%M"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2266
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr "gestern um %-H.%M"
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2271
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%A, %-d.%-m.%y um %-H.%M"
 
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2276
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%-d.%-m.%y um %-H.%M"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 Dateien"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr "0 Ordner"
 
-#: libnautilus-extensions/nautilus-file.c:3408
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 Dateien"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 Objekt"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: libnautilus-extensions/nautilus-file.c:3413
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 Datei"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "%u Objekte"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr "%u Ordner"
 
-#: libnautilus-extensions/nautilus-file.c:3417
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u Dateien"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3720
-#: libnautilus-extensions/nautilus-file.c:3735
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr "? Objekte"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3726
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr "? Bytes"
 
-#: libnautilus-extensions/nautilus-file.c:3739
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "unbekannter Typ"
 
-#: libnautilus-extensions/nautilus-file.c:3741
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "unbekannter MIME-Typ"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3746
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "unbekannt"
 
-#: libnautilus-extensions/nautilus-file.c:3782
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr "Programm"
 
-#: libnautilus-extensions/nautilus-file.c:3794
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
@@ -4547,7 +4562,7 @@ msgstr ""
 "werden. Das heißt wahrscheinlich, dass Ihre Datei gnome-vfs.keys am falschen "
 "Ort ist oder aus irgend einem anderen Grund nicht gefunden werden kann."
 
-#: libnautilus-extensions/nautilus-file.c:3798
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
@@ -4556,7 +4571,7 @@ msgstr ""
 "Keine Beschreibung für MIME-Type \"%s\" gefunden (Datei ist \"%s\", teilen "
 "Sie dies aaron@eazel.com mit"
 
-#: libnautilus-extensions/nautilus-file.c:3812
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "Link"
 
@@ -4564,27 +4579,27 @@ msgstr "Link"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1156
-#: libnautilus-extensions/nautilus-file.c:3818
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr "Link auf %s"
 
-#: libnautilus-extensions/nautilus-file.c:3832
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr "Link (defekt)"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "Von:"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "Nach:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:588
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4596,7 +4611,7 @@ msgstr ""
 "\"%s\" kann nicht verschoben werden, da es sich auf einer schreibgeschützten "
 "Platte befindet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:599
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4609,7 +4624,7 @@ msgstr ""
 "\"%s\" kann nicht gelöscht werden, da Sie nicht die Berechtigungen haben, um "
 "seinen Elternordner zu verändern."
 
-#: libnautilus-extensions/nautilus-file-operations.c:605
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4621,7 +4636,7 @@ msgstr ""
 "\"%s\" kann nicht gelöscht werden, da es sich auf einer schreibgeschützten "
 "Platte befindet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:636
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4634,7 +4649,7 @@ msgstr ""
 "\"%s\" kann nicht verschoben werden, da Sie nicht die Berechtigungen haben, "
 "es oder seinen Elternordner zu verändern."
 
-#: libnautilus-extensions/nautilus-file-operations.c:643
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4647,7 +4662,7 @@ msgstr ""
 "\"%s\" kann nicht in den Müll verschoben werden, da Sie nicht die "
 "Berechtigungen haben, es oder seinen Elternordner zu verändern."
 
-#: libnautilus-extensions/nautilus-file-operations.c:667
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -4659,7 +4674,7 @@ msgstr ""
 "\"%s\" kann nicht verschoben werden, da Sie nicht die Berechtigungen haben, "
 "um es zu lesen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:689
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4670,7 +4685,7 @@ msgstr ""
 "\n"
 "Am Ziel ist kein Platz."
 
-#: libnautilus-extensions/nautilus-file-operations.c:694
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4681,7 +4696,7 @@ msgstr ""
 "\n"
 "Am Ziel ist kein Platz."
 
-#: libnautilus-extensions/nautilus-file-operations.c:698
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4692,7 +4707,7 @@ msgstr ""
 "\n"
 "Am Ziel ist kein Platz."
 
-#: libnautilus-extensions/nautilus-file-operations.c:710
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4703,7 +4718,7 @@ msgstr ""
 "\n"
 "Sie haben keine Berechtigung, in diesen Ordner zu schreiben."
 
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4714,7 +4729,7 @@ msgstr ""
 "\n"
 "Die Zielplatte ist schreibgeschützt."
 
-#: libnautilus-extensions/nautilus-file-operations.c:721
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4725,7 +4740,7 @@ msgstr ""
 "\n"
 "Sie haben keine Berechtigung, in diesen Ordner zu schreiben."
 
-#: libnautilus-extensions/nautilus-file-operations.c:725
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4736,7 +4751,7 @@ msgstr ""
 "\n"
 "Die Zielplatte ist schreibgeschützt."
 
-#: libnautilus-extensions/nautilus-file-operations.c:732
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4747,7 +4762,7 @@ msgstr ""
 "\n"
 "Sie haben keine Berechtigung, in diesen Ordner zu schreiben."
 
-#: libnautilus-extensions/nautilus-file-operations.c:736
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4758,7 +4773,7 @@ msgstr ""
 "\n"
 "Die Zielplatte ist schreibgeschützt."
 
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4769,7 +4784,7 @@ msgstr ""
 "\n"
 "Wollen Sie fortfahren?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4780,7 +4795,7 @@ msgstr ""
 "\n"
 "Wollen Sie fortfahren?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:773
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4791,7 +4806,7 @@ msgstr ""
 "\n"
 "Wollen Sie fortfahren?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4802,7 +4817,7 @@ msgstr ""
 "\n"
 "Wollen Sie fortfahren?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:794
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4813,7 +4828,7 @@ msgstr ""
 "\n"
 "Wollen Sie fortfahren?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4824,7 +4839,7 @@ msgstr ""
 "\n"
 "Wollen Sie fortfahren?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4835,7 +4850,7 @@ msgstr ""
 "\n"
 "Wollen Sie fortfahren?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4846,34 +4861,34 @@ msgstr ""
 "\n"
 "Wollen Sie fortfahren?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:924
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "Fehler beim Kopieren."
 
-#: libnautilus-extensions/nautilus-file-operations.c:927
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "Fehler beim Verschieben."
 
-#: libnautilus-extensions/nautilus-file-operations.c:930
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "Fehler beim Linken."
 
-#: libnautilus-extensions/nautilus-file-operations.c:935
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "Fehler beim Löschen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:960
-#: libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "Überspringen"
 
-#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1057
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4888,7 +4903,7 @@ msgstr ""
 "Wenn Sie \"%s\" immer noch verschieben wollen, benennen Sie es um und "
 "versuchen Sie es noch einmal."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1063
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4903,11 +4918,11 @@ msgstr ""
 "Wenn Sie \"%s\" immer noch kopieren wollen, benennen Sie es um und versuchen "
 "Sie es noch einmal."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "Datei kann nicht ersetzt werden."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1081
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4918,22 +4933,22 @@ msgstr ""
 "\n"
 "Wollen Sie sie ersetzen?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1092
-#: libnautilus-extensions/nautilus-file-operations.c:1106
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "Konflikt beim Kopieren"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Alle ersetzen"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1160
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "noch ein Link auf %s"
@@ -4942,25 +4957,25 @@ msgstr "noch ein Link auf %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. link auf %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1180
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. Link auf %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1184
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. Link auf %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. link auf %s"
@@ -4970,241 +4985,227 @@ msgstr "%d. link auf %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
-#: libnautilus-extensions/nautilus-file-operations.c:2351
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (Kopie)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
-#: libnautilus-extensions/nautilus-file-operations.c:2351
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (noch eine Kopie)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1212
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr ". Kopie)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr ". Kopie)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1216
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr ". Kopie)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr ". Kopie)"
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (Kopie)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (noch eine Kopie)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1232
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. Kopie)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1234
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. Kopie)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1236
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. Kopie)%s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. Kopie)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1322
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1330
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1487
-#: libnautilus-extensions/nautilus-file-operations.c:2066
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Unbekannter GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1802
-#: libnautilus-extensions/nautilus-file-operations.c:2195
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "Dateien werden in den Müll verschoben"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1804
-#: libnautilus-extensions/nautilus-file-operations.c:2197
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr "Weggeworfene Dateien:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1821
-#: libnautilus-extensions/nautilus-file-operations.c:2199
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "Verschiebe"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1807
-#: libnautilus-extensions/nautilus-file-operations.c:2200
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "Verschieben in den Müll wird vorbereitet..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1817
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "Dateien werden verschoben"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "Verschobene Dateien:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1822
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "Verschieben wird vorbereitet..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "Verschieben wird beendet..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "Links auf Dateien werden erzeugt"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1837
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "Verlinkte Dateien:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1839
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "Linke"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "Erzeugen von Links wird vorbereitet..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "Erzeugen von Links wird beendet..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1848
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "Dateien werden kopiert"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "Kopierte Dateien:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "Kopieren"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "Kopieren wird vorbereitet..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "Sie können Dateien nicht in den Müll kopieren."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "In Müll kann nicht kopiert werden"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1899
-#: libnautilus-extensions/nautilus-file-operations.c:2157
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "Der Müll muss auf dem Desktop verbleiben."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "Sie können diesen Müllordner nicht verschieben."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1902
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "Sie können den Müll nicht kopieren.<"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1903
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "Sie können diesen Müllordner nicht kopieren.<"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1905
-#: libnautilus-extensions/nautilus-file-operations.c:2158
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Ort des Mülls kann nicht geändert werden"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1906
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Müll kann nicht kopiert werden"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1923
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "Sie können einen Ordner nicht in sich selbst verschieben."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1924
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "Sie können einen Ordner nicht in sich selbst kopieren."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1926
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "Kann nicht auf sich selbst verschoben werden"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1927
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "Kann nicht auf sich selbst kopiert werden"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1940
-msgid "You cannot move a file onto itself."
-msgstr "Sie können eine Datei nicht auf sich selbst verschieben."
-
-#: libnautilus-extensions/nautilus-file-operations.c:1941
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "Sie können eine Datei nicht über sich selbst kopieren."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1943
-msgid "Can't Move Onto Self"
-msgstr "Kann nicht auf sich selbst verschoben werden"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1944
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "Kann nicht über sich selbst kopiert werden"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1995
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5214,7 +5215,7 @@ msgstr ""
 "\n"
 "Sie haben nicht die Berechtigung, auf das Ziel zu schreiben."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1998
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5224,624 +5225,679 @@ msgstr ""
 "\n"
 "Am Ziel ist kein Platz."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2001
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Fehler \"%s\" beim Anlegen eines neuen Ordners."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2005
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "Fehler beim Anlegen eines neuen Ordners"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2092
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "unbenannter Ordner"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2164
-#, c-format
-msgid "You cannot throw \"%s\" into the Trash."
-msgstr "Sie können \"%s\" nicht in den Müll werfen.<"
-
-#: libnautilus-extensions/nautilus-file-operations.c:2168
-msgid "Error Moving to Trash"
-msgstr "Fehler beim Verschieben in den Müll"
-
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2240
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "Dateien werden gelöscht"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2242
-#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "Gelöschte Dateien:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2244
-#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Lösche"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "Löschen von Dateien wird vorbereitet..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Müll wird geleert"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Leeren des Mülls wird vorbereitet..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2311
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr ""
 "Sind sie sicher, dass Sie alle Objekte im Müll auf Dauer löschen wollen?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2313
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "Müll-Inhalt löschen?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2314
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "Leer"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2352
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2352
-#: libnautilus-extensions/nautilus-file-operations.c:2362
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "foo (Kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2353
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2353
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (Kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2354
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2354
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".foo (Kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2355
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2355
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "foo foo (Kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2356
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2356
-#: libnautilus-extensions/nautilus-file-operations.c:2363
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "foo (Kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2357
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2357
-#: libnautilus-extensions/nautilus-file-operations.c:2377
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "foo foo (Kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2358
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2358
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (Kopie).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2359
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2359
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "foo.. (Kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2360
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2360
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "foo... (Kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2361
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "foo. (Kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2361
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "foo. (noch eine Kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2362
-#: libnautilus-extensions/nautilus-file-operations.c:2364
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "foo (noch eine Kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2363
-#: libnautilus-extensions/nautilus-file-operations.c:2365
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "foo (noch eine Kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2364
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "foo (3. Kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2365
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "foo (3. Kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2366
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (noch eine Kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2366
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3. Kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2367
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr "foo (21. Kopie)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr "foo (24. Kopie)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr "foo (21. Kopie).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr "foo (24. Kopie).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "foo (21. Kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2367
-#: libnautilus-extensions/nautilus-file-operations.c:2369
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "foo (22. Kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2368
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "foo (21. Kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2368
-#: libnautilus-extensions/nautilus-file-operations.c:2370
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "foo (22. Kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2369
-#: libnautilus-extensions/nautilus-file-operations.c:2371
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "foo (23. Kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2370
-#: libnautilus-extensions/nautilus-file-operations.c:2372
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "foo (23. Kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2371
-#: libnautilus-extensions/nautilus-file-operations.c:2373
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "foo (24. Kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2372
-#: libnautilus-extensions/nautilus-file-operations.c:2374
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "foo (24. Kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2373
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "foo (25. Kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2374
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "foo (25. Kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2375
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24. Kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2375
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25. Kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2376
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24. Kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2376
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25. Kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2377
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000. Kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
-#, c-format
-msgid "%ld of %ld"
-msgstr "%ld von %ld"
-
-#: libnautilus-extensions/nautilus-font-picker.c:94
-msgid "Normal"
-msgstr "Normal"
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (10th copy)"
+msgstr "foo (21. Kopie)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:95
-#: libnautilus-extensions/nautilus-volume-monitor.c:516
-#: libnautilus-extensions/nautilus-volume-monitor.c:535
-msgid "Unknown"
-msgstr "Unbekannt"
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (11st copy)"
+msgstr "foo (21. Kopie)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:101
-msgid "Bold"
-msgstr "Fett"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (10th copy).txt"
+msgstr "foo (21. Kopie).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:102
-msgid "Book"
-msgstr "Buch"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (11st copy).txt"
+msgstr "foo (21. Kopie).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:104
-msgid "Demibold"
-msgstr "Halbfett"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (11th copy)"
+msgstr "foo (21. Kopie)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:105
-msgid "Light"
-msgstr "Leicht"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (12nd copy)"
+msgstr "foo (22. Kopie)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:111
-msgid "Italic"
-msgstr "Kursiv"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (11th copy).txt"
+msgstr "foo (21. Kopie).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:112
-msgid "Oblique"
-msgstr "Schräg"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (12nd copy).txt"
+msgstr "foo (22. Kopie).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:113
-msgid "Reverse Italic"
-msgstr "Umgekehrt kursiv"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (12th copy)"
+msgstr "foo (24. Kopie)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:114
-msgid "Reverse Oblique"
-msgstr "Umgekehrt schräg"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (13rd copy)"
+msgstr "foo (3. Kopie)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:121
-msgid "Condensed"
-msgstr "Schmal"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (12th copy).txt"
+msgstr "foo (25. Kopie).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:122
-msgid "Semicondensed"
-msgstr "Halbschmal"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (13rd copy).txt"
+msgstr "foo (3. Kopie).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:224
-msgid "Font"
-msgstr "Schriftart"
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
+#, c-format
+msgid "%ld of %ld"
+msgstr "%ld von %ld"
 
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
 msgid "GConf Error"
 msgstr "GConf-Fehler"
 
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:956
-msgid "fixed"
-msgstr "nichtproportional"
-
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1427
-msgid "01/01/00, 01:00 AM"
+#. Constants
+#: libnautilus-extensions/nautilus-global-preferences.c:50
+msgid "Nautilus Preferences"
+msgstr "Nautilus-Einstellungen"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "immer"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "Immer"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "nur lokal"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "Nur lokale Dateien"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "nie"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "Nie"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "Glattere Grafik"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "Geglättete (aber langsamere) Grafik verwenden"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "Schriftarten"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+#, fuzzy
+msgid "Font for Icon view:"
+msgstr "Factory für Musik-Ansicht"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1428
-msgid "1/1/00, 1:00 AM"
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "Factory für Chronik-Ansichten"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1429
-msgid " 1/ 1/00,  1:00 AM"
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
 msgstr ""
 
-#. Constants
-#: libnautilus-extensions/nautilus-global-preferences.c:50
-msgid "Nautilus Preferences"
-msgstr "Nautilus-Einstellungen"
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "Nautilus benutzen, um den Desktop zu zeichnen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:97
-msgid "current theme"
-msgstr "aktuelles Thema"
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
+msgstr "Neue Fenster öffnen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:100
+#: libnautilus-extensions/nautilus-global-preferences.c:651
 msgid "Open each file or folder in a separate window"
 msgstr "Jede Datei bzw. jeden Ordner in einem eigenen Fenster öffnen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:103
-msgid "Ask before emptying the Trash"
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+msgid "Display toolbar in new windows"
+msgstr "Werkzeugleiste in neuen Fenstern anzeigen"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "Adressleiste in neuen Fenstern anzeigen"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "Statusleiste in neuen Fenstern anzeigen"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "Seitenleiste in neuen Fenstern anzeigen"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "Müll-Verhalten"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+#, fuzzy
+msgid "Ask before emptying the Trash or deleting files"
 msgstr "Nachfragen vor Leeren des Mülls"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:106
-#: libnautilus-extensions/nautilus-global-preferences.c:597
-msgid "Click Behavior"
-msgstr "Klickverhalten"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
+
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:109
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 msgid "single"
 msgstr "einzeln"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:110
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "Objekte mit einem einfachen Klick aktivieren"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:114
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "doppelt"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:115
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "Objekte mit einem Doppelklick aktivieren"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:119
-#: libnautilus-extensions/nautilus-global-preferences.c:604
-msgid "Executable Text Files"
-msgstr "Ausführbare Textdateien"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:122
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 msgid "launch"
 msgstr "starten"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:123
+#: libnautilus-extensions/nautilus-global-preferences.c:726
 msgid "Execute files when they are clicked"
 msgstr "Dateien ausführen, wenn sie angeklickt werden"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:127
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 msgid "display"
 msgstr "anzeigen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:128
+#: libnautilus-extensions/nautilus-global-preferences.c:730
 msgid "Display files when they are clicked"
 msgstr "Dateien anzeigen, wenn sie angeklickt werden"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:132
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 msgid "ask"
 msgstr "fragen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:133
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 msgid "Ask each time"
 msgstr "Jedes Mal nachfragen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:143
-#: libnautilus-extensions/nautilus-global-preferences.c:725
-msgid "Show Text in Icons"
-msgstr "Text in Icons anzeigen"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:146
-#: libnautilus-extensions/nautilus-global-preferences.c:732
-msgid "Show Count of Items in Folders"
-msgstr "Objektanzahlen für Ordner anzeigen"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:149
-#: libnautilus-extensions/nautilus-global-preferences.c:739
-msgid "Show Thumbnails for Image Files"
-msgstr "Indexbilder für Bilddateien anzeigen"
-
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:152
-#: libnautilus-extensions/nautilus-global-preferences.c:755
-msgid "Make Folder Appearance Details Public"
-msgstr "Details für Ordnererscheinungsbilder veröffentlichen"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:155
-#: libnautilus-extensions/nautilus-global-preferences.c:746
-msgid "Preview Sound Files"
-msgstr "Vorschau für Sounddateien"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Use smoother (but slower) graphics"
-msgstr "Geglättete (aber langsamere) Grafik verwenden"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Use this font family to display file names:"
-msgstr "Diese Schriftartfamilie zur Anzeige von Dateinamen benutzen:"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-msgid "Display toolbar in new windows"
-msgstr "Werkzeugleiste in neuen Fenstern anzeigen"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:170
-msgid "Display location bar in new windows"
-msgstr "Adressleiste in neuen Fenstern anzeigen"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:173
-msgid "Display status bar in new windows"
-msgstr "Statusleiste in neuen Fenstern anzeigen"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:176
-msgid "Display sidebar in new windows"
-msgstr "Seitenleiste in neuen Fenstern anzeigen"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:179
-msgid "Use Nautilus to draw the desktop"
-msgstr "Nautilus benutzen, um den Desktop zu zeichnen"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:183
-msgid "Enable fast search (indexes your hard drive)"
-msgstr "Schnelle Suche aktivieren (indiziert Ihre Festplatte)"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:186
-msgid "search type to do by default"
-msgstr "normalerweise auszuführender Suchtyp"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:189
-msgid "search by text"
-msgstr "Suche nach Text"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:190
-msgid "Search for files by file name only"
-msgstr "Dateien nur nach Dateiname suchen"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:194
-msgid "search by text and properties"
-msgstr "Nach Text und Eigenschaften suchen"
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "Klickverhalten"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:195
-msgid "Search for files by file name and file properties"
-msgstr "Dateien nach Dateinamen und ihren Eigenschaften suchen"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr "Ausführbare Textdateien"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:199
-msgid "Search Engine Location"
-msgstr "Ort der Suchmaschine"
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr "Optionen anzeigen/verbergen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:203
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr "Versteckte Dateien (Namen beginnen mit \".\") anzeigen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:206
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr "Backupdateien (Name endet mit \"~\") anzeigen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:209
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr "Besondere Flags im Eigenschaften-Fenster anzeigen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:212
-msgid "Show only folders (no files) in the tree"
-msgstr "Nur Ordner (keine Dateien) im Baum anzeigen"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:215
-msgid "Can add Content"
-msgstr "Kann Inhalt hinzufügen"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+#, fuzzy
+msgid "Sorting Order"
+msgstr "Fehler beim Ändern des Besitzers"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:218
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
-msgstr "Eingebaute Lesezeichen nicht im Lesezeichen-Menü einbinden"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:222
-#: libnautilus-extensions/nautilus-global-preferences.c:227
-#: src/file-manager/fm-properties-window.c:1519 src/nautilus-location-bar.c:62
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
 msgid "Location:"
 msgstr "Ort:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:226
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+msgid "HTTP Proxy Settings"
+msgstr "HTTP-Proxy-Einstellungen"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "HTTP-Proxy verwenden"
 
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:228
+#: libnautilus-extensions/nautilus-global-preferences.c:812
 #: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr "Port:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:533
-msgid "Appearance"
-msgstr "Erscheinungsbild"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:535
-msgid "Smoother Graphics"
-msgstr "Glattere Grafik"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "Eingebaute Lesezeichen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:552
-msgid "Windows & Desktop"
-msgstr "Fenster u. Desktop"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "Eingebaute Lesezeichen nicht im Lesezeichen-Menü einbinden"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:560
-msgid "Opening New Windows"
-msgstr "Neue Fenster öffnen"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "Text in Icons anzeigen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:583
-msgid "Trash Behavior"
-msgstr "Müll-Verhalten"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr "Objektanzahlen für Ordner anzeigen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:595
-msgid "Icon & List Views"
-msgstr "Icon- u. Listenansichten"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "Indexbilder für Bilddateien anzeigen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:611
-msgid "Show/Hide Options"
-msgstr "Optionen anzeigen/verbergen"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:632
-msgid "Sidebar Panels"
-msgstr "Seitenleisten-Paneele"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr "Vorschau für Sounddateien"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:635
-msgid "Tabs"
-msgstr "Reiter"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr "Details für Ordnererscheinungsbilder veröffentlichen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:684
-msgid "Navigation"
-msgstr "Navigation"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "Erscheinungsbild"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:693
-msgid "HTTP Proxy Settings"
-msgstr "HTTP-Proxy-Einstellungen"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr "Fenster u. Desktop"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:712
-msgid "Built-in Bookmarks"
-msgstr "Eingebaute Lesezeichen"
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr "Icon- u. Listenansichten"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:723
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+msgid "Navigation"
+msgstr "Navigation"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:962
 msgid "Speed Tradeoffs"
 msgstr "Geschwindigkeit<->Komfort"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:794
-msgid "Search"
-msgstr "Suche"
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr "Suche nach Text"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+msgid "Search for files by file name only"
+msgstr "Dateien nur nach Dateiname suchen"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr "Nach Text und Eigenschaften suchen"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+msgid "Search for files by file name and file properties"
+msgstr "Dateien nach Dateinamen und ihren Eigenschaften suchen"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "Komplexitätsoptionen zur Suche"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:802
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "normalerweise auszuführender Suchtyp"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 msgid "Fast Search"
 msgstr "Schnelle Suche"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:846
-msgid "Fonts"
-msgstr "Schriftarten"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1026
-#, c-format
-msgid "Display %s tab in sidebar"
-msgstr "Reiter %s in Seitenleiste anzeigen"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr "Schnelle Suche aktivieren (indiziert Ihre Festplatte)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1073
-msgid "always"
-msgstr "immer"
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+msgid "Search Engine Location"
+msgstr "Ort der Suchmaschine"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1074
-msgid "Always"
-msgstr "Immer"
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Suche"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1077
-msgid "local only"
-msgstr "nur lokal"
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr "Nur Ordner (keine Dateien) im Baum anzeigen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1078
-msgid "Local Files Only"
-msgstr "Nur lokale Dateien"
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, c-format
+msgid "Display %s tab in sidebar"
+msgstr "Reiter %s in Seitenleiste anzeigen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1081
-msgid "never"
-msgstr "nie"
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "Seitenleisten-Paneele"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1082
-msgid "Never"
-msgstr "Nie"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr "Reiter"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1145
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "currently can't be performed because the program crond, which does nightly "
@@ -5854,13 +5910,13 @@ msgstr ""
 "Nacht) ausführt, abgeschaltet ist. Um sicherzustellen, dass schnelle Suchen "
 "funktionieren, schalten Sie crond ein."
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1152
-#: libnautilus-extensions/nautilus-global-preferences.c:1170
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
 msgid "Files May Not Be Indexed"
 msgstr "Dateien können nicht indiziert werden"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1153
-#: libnautilus-extensions/nautilus-global-preferences.c:1171
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
 msgid ""
 "If you are running Linux, you can log in as root and type these commands to "
 "start cron:\n"
@@ -5874,7 +5930,7 @@ msgstr ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1162
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "may not be performed because the program crond, which does nightly tasks on "
@@ -5889,22 +5945,12 @@ msgstr ""
 "Suchen funktionieren, stellen Sie sicher, dass crond eingeschaltet ist.\n"
 "\n"
 
-#: libnautilus-extensions/nautilus-gnome-extensions.c:640
-msgid "No image was selected.  You must click on an image to select it."
-msgstr ""
-"Es wurde kein Bild ausgewählt. Sie müssen auf ein Bild klicken, um es "
-"auszuwählen."
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:641
-msgid "No selection made"
-msgstr "Es wurde keine Auswahl vorgenommen"
-
 #. The list of characters that cause line breaks can be localized.
 #: libnautilus-extensions/nautilus-icon-canvas-item.c:70
 msgid " -_,;.?/&"
 msgstr " -_,;.?/&"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:766
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
@@ -5914,7 +5960,7 @@ msgstr ""
 "Layout umschalten und dieses Objekt dort lassen, wo Sie es fallen gelassen "
 "haben? Dies wird das gespeicherte manuelle Layout überschreiben."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:770
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
@@ -5924,7 +5970,7 @@ msgstr ""
 "Layout umschalten und diese Objekte dort lassen, wo Sie sie fallen gelassen "
 "haben? Dies wird das gespeicherte manuelle Layout überschreiben."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:776
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
@@ -5933,7 +5979,7 @@ msgstr ""
 "Layout umschalten und dieses Objekt dort lassen, wo Sie es fallen gelassen "
 "haben?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:779
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
@@ -5942,64 +5988,48 @@ msgstr ""
 "Layout umschalten und diese Objekte dort lassen, wo Sie sie fallen gelassen "
 "haben?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:784
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "Auf manuelles Layout umschalten?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:785
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "Umschalten"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "_Umbenennen"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1551
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr "Eingabe rückgängig machen"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1552
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "Den alten Namen wiederherstellen"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1553
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "Eingabe wiederherstellen"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1554
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Den geänderten Namen wiederherstellen"
 
-#: libnautilus-extensions/nautilus-password-dialog.c:306
-msgid "Remember this password"
-msgstr "An dieses Passwort erinnern"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:483
-msgid "times"
-msgstr "times"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:484
-msgid "courier"
-msgstr "courier"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:485
-msgid "lucida"
-msgstr "lucida"
-
-#: libnautilus-extensions/nautilus-preferences.c:76
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "Anfänger"
 
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "Fortgeschrittene"
 
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "Experten"
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:202
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "Einstellungsdialogfeld"
 
@@ -6098,7 +6128,7 @@ msgid "Don't include in the menu for \"%s\" items"
 msgstr "Nicht ints Menü für \"%s\"-Objekte aufnehmen"
 
 #: libnautilus-extensions/nautilus-program-chooser.c:1209
-#: src/file-manager/fm-list-view.c:2123
+#: src/file-manager/fm-list-view.c:2182
 #: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
@@ -6459,25 +6489,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Objekte mit \"medusa\" in ihren Namen, die Ordner sind"
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr "Details"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr "Warnung"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr "Fehler"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr "Frage"
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr "Platten durchsuchen"
@@ -6486,7 +6497,7 @@ msgstr "Platten durchsuchen"
 msgid "Nautilus is searching your disks for trash folders."
 msgstr "Nautilus durchsucht Ihre Platten nach Müllordnern."
 
-#: libnautilus-extensions/nautilus-trash-file.c:600
+#: libnautilus-extensions/nautilus-trash-file.c:725
 msgid "on the desktop"
 msgstr "auf dem Desktop"
 
@@ -6520,47 +6531,44 @@ msgstr "Als %s betrachten"
 msgid "%s Viewer"
 msgstr "%s-Betrachter"
 
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+msgid "Unknown"
+msgstr "Unbekannt"
+
 #. Populate table with items we know localized names for.
-#: libnautilus-extensions/nautilus-volume-monitor.c:623
-#: libnautilus-extensions/nautilus-volume-monitor.c:1862
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr "Diskette"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:624
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:625
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
 msgid "Zip Drive"
 msgstr "Zip-Laufwerk"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:646
-#: libnautilus-extensions/nautilus-volume-monitor.c:668
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 msgid "Audio CD"
 msgstr "Audio-CD"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1547
-msgid "Mount Error"
-msgstr "Fehler beim Mounten"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1549
-msgid "Unmount Error"
-msgstr "Fehler beim Unmounten"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1579
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr "ist schreibgeschützt; wird nur mit Lesezugriff gemountet"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1582
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "ist kein gültiges Blockgerät"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1583
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr "Kein Medium gefunden"
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1587
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
@@ -6569,7 +6577,7 @@ msgstr ""
 "keine Diskette im Laufwerk."
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1591
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
@@ -6577,11 +6585,11 @@ msgstr ""
 "Nautilus konnte die Partition nicht mounten. Wahrscheinlich ist kein Medium "
 "im Laufwerk."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1594
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr "Falscher Dateisystemtyp, ungültige Option, defekter Superblock auf"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1597
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
@@ -6589,7 +6597,7 @@ msgstr ""
 "Nautilus konnte das Diskettenlaufwerk nicht mounten. Die Diskette hat "
 "wahrscheinlich ein Format, das nicht gemountet werden kann."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1600
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
@@ -6597,48 +6605,56 @@ msgstr ""
 "Nautilus konnte die ausgewählte Partition nicht mounten. Sie hat "
 "wahrscheinlich ein Format, das nicht gemountet werden kann."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1605
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr "Nautilus konnte das ausgewählte Diskettenlaufwerk nicht mounten."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1607
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "Nautilus konnte die ausgewählte Partition nicht mounten."
 
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1612
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr "Nautilus konnte die ausgewählte Partition nicht unmounten."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1764
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr "Fehler beim Mounten"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr "Fehler beim Unmounten"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "ISO-9660-Datenträger"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1779
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "Wurzel"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1786
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Ext2-Partition"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1801
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "MS-DOS-Partition"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1816
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "NFS-Partition"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1831
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
 msgid "ReiserFS Volume"
 msgstr "ReiserFS-Partition"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1847
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
 msgid "UFS Volume"
 msgstr "UFS-Partition"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1877
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "Unbekannte Partition"
 
@@ -6646,31 +6662,65 @@ msgstr "Unbekannte Partition"
 msgid "C_lear Text"
 msgstr "Text _löschen"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "Text _löschen"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "Text _kopieren"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "Kopiert den ausgewählten Text in die Zwischenablage"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "Text ausschneiden"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+msgid "Cut _Text"
+msgstr "Text ausschneiden"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "Den ausgewählten Text in die Zwischenablage ausschneiden"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:46
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "Text _einfügen"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "Den in der Zwischenablage gespeicherten Text einfügen"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "Den ausgewählten Text löschen, ohne ihn in die Zwischenablage zu legen"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:80
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "_Alle auswählen"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+msgid "Select _All"
+msgstr "_Alle auswählen"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "Alle Objekte in diesem Fenster auswählen"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "Text _kopieren"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:7
-msgid "_Cut Text"
-msgstr "Text _ausschneiden"
-
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:93
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "Text _einfügen"
 
@@ -6679,7 +6729,7 @@ msgstr "Text _einfügen"
 #. * to change it when we upgrade to GTK 2.0.
 #.
 #: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
-#: src/nautilus-window-menus.c:563
+#: src/nautilus-window-menus.c:610
 msgid "Nautilus"
 msgstr "Nautilus"
 
@@ -6695,80 +6745,112 @@ msgstr "Nautilus: Dateimanager und grafische Shell"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:735
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr "Heim von %s"
 
-#: src/file-manager/fm-desktop-icon-view.c:1021
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "Müll leeren..."
 
-#: src/file-manager/fm-desktop-icon-view.c:1023
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "Müll leeren"
 
-#: src/file-manager/fm-desktop-icon-view.c:1043
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "Partition aushängen"
 
-#: src/file-manager/fm-directory-view.c:474
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr ""
 "Dies wird %d getrennte Fenster öffnen. Sind Sie sicher, dass Sie das tun "
 "wollen?"
 
-#: src/file-manager/fm-directory-view.c:476
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d Fenster öffnen?"
 
-#: src/file-manager/fm-directory-view.c:1212
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr ""
+"Sind sie sicher, dass Sie \"%s\" auf Dauer aus dem Müll löschen wollen?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+"Sind sie sicher, dass Sie die %d ausgewählten Objekte auf Dauer aus dem Müll "
+"löschen wollen?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Löschen"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Löschen"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+msgid "scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" ausgewählt"
 
-#: src/file-manager/fm-directory-view.c:1214
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "1 Ordner ausgewählt"
 
-#: src/file-manager/fm-directory-view.c:1217
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "%d Ordner ausgewählt"
 
-#: src/file-manager/fm-directory-view.c:1223
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr " (enthält 0 Objekte)"
 
-#: src/file-manager/fm-directory-view.c:1225
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr " (enthält 1 Objekte)"
 
-#: src/file-manager/fm-directory-view.c:1227
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr " (enthält %d Objekte)"
 
-#: src/file-manager/fm-directory-view.c:1238
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" ausgewählt (%s)"
 
-#: src/file-manager/fm-directory-view.c:1242
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d Objekte ausgewählt (%s)"
 
-#: src/file-manager/fm-directory-view.c:1249
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 anderes Objekt ausgewählt (%s)"
 
-#: src/file-manager/fm-directory-view.c:1252
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d andere Objekte ausgewählt (%s)"
@@ -6780,7 +6862,7 @@ msgstr "%d andere Objekte ausgewählt (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1281
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -6789,7 +6871,7 @@ msgstr "%s%s, %s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1407
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
@@ -6798,11 +6880,11 @@ msgstr ""
 "Der Ordner \"%s\" enthält mehr Dateien, als Nautilus vertragen kann. Einige "
 "Dateien werden nicht angezeigt."
 
-#: src/file-manager/fm-directory-view.c:1414
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "Zu viele Dateien"
 
-#: src/file-manager/fm-directory-view.c:2616
+#: src/file-manager/fm-directory-view.c:2752
 #, c-format
 msgid ""
 "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
@@ -6810,7 +6892,7 @@ msgstr ""
 "\"%s\" kann nicht in den Müll verschoben werden. Wollen Sie es sofort "
 "löschen?"
 
-#: src/file-manager/fm-directory-view.c:2621
+#: src/file-manager/fm-directory-view.c:2757
 #, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
@@ -6819,7 +6901,7 @@ msgstr ""
 "Die %d ausgewählten Objekte können nicht in den Müll verschoben werden. "
 "Wollen Sie sie sofort löschen?"
 
-#: src/file-manager/fm-directory-view.c:2625
+#: src/file-manager/fm-directory-view.c:2761
 #, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -6828,22 +6910,17 @@ msgstr ""
 "%d der ausgewählten Objekte können nicht in den Müll verschoben werden. "
 "Wollen Sie diese %d Objekte sofort löschen?"
 
-#: src/file-manager/fm-directory-view.c:2633
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "Sofort löschen?"
 
-#: src/file-manager/fm-directory-view.c:2634
-#: src/file-manager/fm-directory-view.c:2675
-msgid "Delete"
-msgstr "Löschen"
-
-#: src/file-manager/fm-directory-view.c:2664
+#: src/file-manager/fm-directory-view.c:2799
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr ""
 "Sind sie sicher, dass Sie \"%s\" auf Dauer aus dem Müll löschen wollen?"
 
-#: src/file-manager/fm-directory-view.c:2668
+#: src/file-manager/fm-directory-view.c:2803
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
@@ -6852,75 +6929,213 @@ msgstr ""
 "Sind sie sicher, dass Sie die %d ausgewählten Objekte auf Dauer aus dem Müll "
 "löschen wollen?"
 
-#: src/file-manager/fm-directory-view.c:2674
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "Aus Müll löschen?"
 
-#: src/file-manager/fm-directory-view.c:2947
-#: src/file-manager/fm-directory-view.c:2987
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "\"%s\" benutzen, um das ausgewählte Objekt zu öffnen"
 
-#: src/file-manager/fm-directory-view.c:3189
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "Andere _Anwendung..."
+
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "Andere _Anwendung..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "Anderer Betrachter..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "Anderer Betrachter..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "\"%s\" benutzen, um das ausgewählte Objekt zu öffnen"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "Nautilus konnte die ausgewählte Partition nicht mounten."
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"Die %d ausgewählten Objekte können nicht in den Müll verschoben werden. "
+"Wollen Sie sie sofort löschen?"
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "_In neuem Fenster öffnen"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open _in New Window"
 msgstr "_In neuem Fenster öffnen"
 
-#: src/file-manager/fm-directory-view.c:3191
+#: src/file-manager/fm-directory-view.c:3959
 #, c-format
 msgid "Open _in %d New Windows"
 msgstr "_In %d neuen Fenstern öffnen"
 
-#: src/file-manager/fm-directory-view.c:3217
-msgid "Delete all selected items permanently"
-msgstr "Alle gewählten Objekte auf Dauer löschen"
-
-#: src/file-manager/fm-directory-view.c:3222
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "Aus Müll löschen..."
 
-#: src/file-manager/fm-directory-view.c:3223
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "Aus Müll löschen"
 
-#: src/file-manager/fm-directory-view.c:3227
-msgid "Move all selected items to the Trash"
-msgstr "Verschiebe alle gewählten Objekte in den Müll"
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "Alle gewählten Objekte auf Dauer löschen"
 
-#: src/file-manager/fm-directory-view.c:3231
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "In den _Müll verschieben"
 
-#: src/file-manager/fm-directory-view.c:3261
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "Verschiebe alle gewählten Objekte in den Müll"
+
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "Löschen"
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "Löschen"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "_Links anlegen"
 
-#: src/file-manager/fm-directory-view.c:3262
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "_Link anlegen"
 
-#: src/file-manager/fm-directory-view.c:3280
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "Müll _leeren..."
 
-#: src/file-manager/fm-directory-view.c:3281
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "Müll leeren"
 
-#: src/file-manager/fm-directory-view.c:3292
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "Eigene Bilder entfernen"
 
-#: src/file-manager/fm-directory-view.c:3293
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "Eigenes _Bild entfernen"
 
-#: src/file-manager/fm-directory-view.c:3446
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "Datei"
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u Dateien"
+
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "Text _kopieren"
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "Dateien werden kopiert"
+
+#: src/file-manager/fm-directory-view.c:4252
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
 "link in the Trash?"
@@ -6928,7 +7143,7 @@ msgstr ""
 "Dieser Link kann nicht benutzt werden, da er kein Ziel hat. Wollen Sie ihn "
 "diesen Link in den Müll werfen?"
 
-#: src/file-manager/fm-directory-view.c:3449
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
@@ -6937,15 +7152,15 @@ msgstr ""
 "Dieser Link kann nicht benutzt werden, da sein Ziel \"%s\" nicht existiert. "
 "Wollen Sie diesen Link in den Müll werfen?"
 
-#: src/file-manager/fm-directory-view.c:3455
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "Defekter Link"
 
-#: src/file-manager/fm-directory-view.c:3456
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr "Wegwerfen"
 
-#: src/file-manager/fm-directory-view.c:3509
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
@@ -6954,19 +7169,19 @@ msgstr ""
 "\"%s\" ist eine ausführbare Textdatei. Wollen Sie sie ausführen oder Ihren "
 "Inhalt anzeigen lassen?"
 
-#: src/file-manager/fm-directory-view.c:3515
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr "Ausführen oder anzeigen?"
 
-#: src/file-manager/fm-directory-view.c:3516
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "Ausführen"
 
-#: src/file-manager/fm-directory-view.c:3517
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "Anzeigen"
 
-#: src/file-manager/fm-directory-view.c:3571
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
@@ -6974,16 +7189,16 @@ msgstr ""
 "Entschuldigung, aber Sie dürfen aus Sicherheitsgründen keine Befehle von "
 "einen fernen Rechner ausführen."
 
-#: src/file-manager/fm-directory-view.c:3573
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "Ferne Links können nicht ausgeführt werden"
 
-#: src/file-manager/fm-directory-view.c:3707
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr "Öffnen von \"%s\""
 
-#: src/file-manager/fm-directory-view.c:3713
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "Öffnen abbrechen?"
 
@@ -6994,17 +7209,22 @@ msgid ""
 msgstr ""
 "Sie haben nicht die nötigen Rechte, um den Inhalt von \"%s\" zu betrachten."
 
-#: src/file-manager/fm-error-reporting.c:65
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr ""
 "Entschuldigung, es konnte nicht der ganze Inhalt von \"%s\" angezeigt werden."
 
-#: src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Fehler beim Anzeigen eines Ordners"
 
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
@@ -7012,7 +7232,7 @@ msgstr ""
 "Der Name \"%s\" wird in diesem Ordner bereits verwendet. Bitte benutzen Sie "
 "einen anderen Namen."
 
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
@@ -7020,12 +7240,12 @@ msgstr ""
 "Es gibt kein \"%s\" in diesem Ordner. Vielleicht wurde es gerade verschoben "
 "oder gelöscht?"
 
-#: src/file-manager/fm-error-reporting.c:109
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Sie haben nicht die nötigen Rechte, um \"%s\" umzubenennen."
 
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -7034,67 +7254,67 @@ msgstr ""
 "Der Name \"%s\" ist nicht gültig, da er das Zeichen \"/\" enthält. Bitte "
 "benutzen Sie einen anderen Namen."
 
-#: src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Der Name \"%s\" ist ungültig. Bitte benutzen Sie einen anderen Namen."
 
-#: src/file-manager/fm-error-reporting.c:124
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Der Name von \"%s\" konnte nicht geändert werden, da es sich auf einer "
 "schreibgeschützten Platte befindet"
 
-#: src/file-manager/fm-error-reporting.c:133
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Entschuldigung, konnte \"%s\" nicht in \"%s\" umbenennen."
 
-#: src/file-manager/fm-error-reporting.c:140
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "Fehler beim Umbenennen"
 
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr ""
 "Sie haben nicht die nötigen Rechte, um die Gruppe von \"%s\" zu ändern."
 
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Die Gruppe von \"%s\" konnte nicht geändert werden, da es sich auf einer "
 "schreibgeschützten Platte befindet"
 
-#: src/file-manager/fm-error-reporting.c:172
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Entschuldigung, konnte die Gruppe von \"%s\" nicht ändern."
 
-#: src/file-manager/fm-error-reporting.c:176
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "Fehler beim Ändern der Gruppe"
 
-#: src/file-manager/fm-error-reporting.c:198
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Der Besitzer von \"%s\" konnte nicht geändert werden, da es sich auf einer "
 "schreibgeschützten Platte befindet"
 
-#: src/file-manager/fm-error-reporting.c:205
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Entschuldigung, konnte den Besitzer von \"%s\" nicht ändern."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "Fehler beim Ändern des Besitzers"
 
-#: src/file-manager/fm-error-reporting.c:230
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
@@ -7102,21 +7322,21 @@ msgstr ""
 "Die Berechtigungen von \"%s\" konnten nicht geändert werden, da es sich auf "
 "einer schreibgeschützten Platte befindet."
 
-#: src/file-manager/fm-error-reporting.c:237
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Entschuldigung, konnte die Berechtigungen von \"%s\" nicht ändern."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "Fehler beim Ändern von Berechtigungen"
 
-#: src/file-manager/fm-error-reporting.c:306
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "\"%s\" wird in \"%s\" umbenannt."
 
-#: src/file-manager/fm-error-reporting.c:311
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "Umbenennen abbrechen`"
 
@@ -7176,76 +7396,76 @@ msgstr ""
 "Wählen Sie die Reihenfolge, in der Informationen unter den Namen der Icons "
 "erscheinen sollen. Mehr Informationen erscheinen, wenn Sie heranzoomen"
 
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "nach _Name"
 
-#: src/file-manager/fm-icon-view.c:159
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "Sortiere Icons nach Name in Zeilen"
 
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "nach _Größe"
 
-#: src/file-manager/fm-icon-view.c:166
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "Sortiere Icons nach Größe in Zeilen"
 
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "nach _Typ"
 
-#: src/file-manager/fm-icon-view.c:173
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "Sortiere Icons nach Typ in Zeilen"
 
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "nach Modifikations_datum"
 
-#: src/file-manager/fm-icon-view.c:180
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Sortiere Icons nach Modifikationsdatum in Zeilen"
 
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "nach _Emblemen"
 
-#: src/file-manager/fm-icon-view.c:187
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Sortiere Icons nach Emblemen in Zeilen"
 
-#: src/file-manager/fm-icon-view.c:1230
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "Originalgrößen der Icons _wiederherstellen"
 
-#: src/file-manager/fm-icon-view.c:1231
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "Originalgröße des Icons _wiederherstellen"
 
-#: src/file-manager/fm-icon-view.c:1443
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "zeigt auf \"%s\""
 
-#: src/file-manager/fm-list-view.c:2129
+#: src/file-manager/fm-list-view.c:2188
 #: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Größe"
 
-#: src/file-manager/fm-list-view.c:2135
+#: src/file-manager/fm-list-view.c:2194
 #: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Typ"
 
-#: src/file-manager/fm-list-view.c:2141
+#: src/file-manager/fm-list-view.c:2200
 #: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Modifikationsdatum"
@@ -7302,121 +7522,127 @@ msgstr "(Teile des Inhalts unlesbar)"
 msgid "Contents:"
 msgstr "Inhalt:"
 
-#: src/file-manager/fm-properties-window.c:1433
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "Grundlegend"
 
-#: src/file-manager/fm-properties-window.c:1512
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Type:"
 
-#: src/file-manager/fm-properties-window.c:1517
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "Größe:"
 
-#: src/file-manager/fm-properties-window.c:1521
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "Linksätze"
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
 msgstr "MIME Typ:"
 
-#: src/file-manager/fm-properties-window.c:1527
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "Modifiziert:"
 
-#: src/file-manager/fm-properties-window.c:1530
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "Zugegriffen:"
 
-#: src/file-manager/fm-properties-window.c:1539
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr "Eigenes Icon wählen..."
 
-#: src/file-manager/fm-properties-window.c:1545
+#: src/file-manager/fm-properties-window.c:1558
 msgid "Remove Custom Icon"
 msgstr "Eigenes Icon entfernen"
 
-#: src/file-manager/fm-properties-window.c:1873
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "Set User ID"
 
-#: src/file-manager/fm-properties-window.c:1878
+#: src/file-manager/fm-properties-window.c:1891
 msgid "Special Flags:"
 msgstr "Spezielle Markierungen:"
 
-#: src/file-manager/fm-properties-window.c:1881
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "Set Group ID"
 
-#: src/file-manager/fm-properties-window.c:1883
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "Sticky"
 
-#: src/file-manager/fm-properties-window.c:1909
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: src/file-manager/fm-properties-window.c:1915
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
 "Sie sind nicht der Besitzer, deshalb können Sie diese Rechte nicht ändern"
 
-#: src/file-manager/fm-properties-window.c:1928
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "Dateibesitzer:"
 
-#: src/file-manager/fm-properties-window.c:1937
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "Dateigruppe:"
 
-#: src/file-manager/fm-properties-window.c:1955
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "Besitzer:"
 
-#: src/file-manager/fm-properties-window.c:1956
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: src/file-manager/fm-properties-window.c:1957
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "Andere:"
 
-#: src/file-manager/fm-properties-window.c:1976
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "Lesen"
 
-#: src/file-manager/fm-properties-window.c:1980
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "Schreiben"
 
-#: src/file-manager/fm-properties-window.c:1984
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "Ausführen"
 
-#: src/file-manager/fm-properties-window.c:2035
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "Textansicht:"
 
-#: src/file-manager/fm-properties-window.c:2036
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "Zahlenansicht:"
 
-#: src/file-manager/fm-properties-window.c:2037
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "Zuletzt geändert:"
 
-#: src/file-manager/fm-properties-window.c:2041
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Die Rechte von \"%s\" konnten nicht festgestellt werden."
 
-#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr "Anzeigen des Eigenschaften-Fensters abbrechen?"
 
-#: src/file-manager/fm-properties-window.c:2322
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr "Eigenschaften-Fenster wird erzeugt"
 
-#: src/file-manager/fm-properties-window.c:2422
+#: src/file-manager/fm-properties-window.c:2435
 msgid "Select an icon:"
 msgstr "Wählen Sie ein Icon:"
 
@@ -7442,7 +7668,7 @@ msgstr ""
 "installiert ist."
 
 #: src/file-manager/fm-search-list-view.c:159
-#: src/file-manager/nautilus-indexing-info.c:405
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr "Suchdienst nicht verfügbar"
 
@@ -7623,7 +7849,7 @@ msgstr ""
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
 #: src/file-manager/fm-search-list-view.c:360
-#: src/file-manager/nautilus-indexing-info.c:340
+#: src/file-manager/nautilus-indexing-info.c:342
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
@@ -7638,7 +7864,7 @@ msgid "Fast searches are not available on your computer"
 msgstr "Schnelle Suchen sind auf Ihrem Computer nicht verfügbar"
 
 #: src/file-manager/fm-search-list-view.c:373
-#: src/file-manager/nautilus-indexing-info.c:359
+#: src/file-manager/nautilus-indexing-info.c:361
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Fast search is disabled in your Search preferences, so no index is available."
@@ -7648,13 +7874,13 @@ msgstr ""
 "abgeschaltet, so dass kein Index verfügbar ist."
 
 #: src/file-manager/fm-search-list-view.c:376
-#: src/file-manager/nautilus-indexing-info.c:345
-#: src/file-manager/nautilus-indexing-info.c:363
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
 msgid "Fast searches are not available on your computer."
 msgstr "Schnelle Suchen sind auf Ihrem Computer nicht verfügbar."
 
 #: src/file-manager/fm-search-list-view.c:377
-#: src/file-manager/nautilus-indexing-info.c:364
+#: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
 "To enable fast search, open the Preferences menu and choose Preferences. "
 "Then select Search preferences and put a checkmark in the Enable Fast Search "
@@ -7713,7 +7939,7 @@ msgid "Change Desktop Background"
 msgstr "Desktop-Hintergrund ändern"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Delete all items in the Trash"
 msgstr "Alle Objekte im Müll löschen"
 
@@ -7765,142 +7991,193 @@ msgstr ""
 "Einen anderen Betrachter zum Betrachten der ausgewählten Objekte wählen"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-msgid "Create Link"
-msgstr "Link anlegen"
+#, fuzzy
+msgid "Copy Files"
+msgstr "Dateien werden kopiert"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "Einen neuen leeren Ordner in diesem Ordner anlegen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "Ein symbolisches Link für jedes ausgewählte Objekt anlegen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u Dateien"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "Jedes gewählte Objekt in den Müll verschieben"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "Duplizieren"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "Alle gewählten Objekte duplizieren"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "Link anlegen"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr "Jedes gewählte Objekt in den Müll verschieben"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Move to Trash"
 msgstr "In den Müll verschieben"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "Neues _Verzeichnis"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "Öffnen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid "Open Wit_h"
 msgstr "Öffnen mit"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "Öffnen mit"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "Öffnet jedes ausgewählte Objekt in einem neuen Fenster"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr "In neuem Fenster öffnen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Öffnet das ausgewählte Objekt in diesem Fenster"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "Anderer Anwendung..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "Anderem Betrachter..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Other _Application..."
-msgstr "Andere _Anwendung..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "Text _einfügen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-msgid "Other _Viewer..."
-msgstr "Anderer Betrachter..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr "Eigene Bilder entfernen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr "Alle eigenen Bilder aus ausgewählten Icons entfernen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr ""
 "Jegliche eigene Farbe bzw. eigenes Muster vom Hintergrund dieses Ortes "
 "entfernen"
 
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "Hintergrund zurücksetzen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+msgid "Scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr "Alle Dateien auswählen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Select _All Files"
 msgstr "_Alle Dateien auswählen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "Alle Objekte in diesem Fenster auswählen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr "Eigenschaften zeigen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Show Trash"
 msgstr "Müll anzeigen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "_Eigenschaften zeigen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "Show the contents of the Trash"
 msgstr "Inhalt des Mülls anzeigen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "Die Eigenschaften aller ausgewählten Objekte betrachten oder ändern"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "_Duplizieren"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_New Folder"
 msgstr "_Neuer Ordner"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "_Öffnen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "Text _einfügen"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Show Trash"
 msgstr "Müll anzeigen"
 
@@ -8082,7 +8359,7 @@ msgstr ""
 
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr "Indizierungsstatus"
 
@@ -8100,11 +8377,11 @@ msgstr ""
 msgid "Your files were last indexed at %s"
 msgstr "Ihre Dateien wurden zum letzten Mal am %s indiziert"
 
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "Jetzt aktualisieren"
 
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast.  Your files are currently being indexed."
@@ -8112,11 +8389,11 @@ msgstr ""
 "Einmal am Tag werden Ihre Dateien und Textinhalte indiziert, so dass "
 "Suchvorgänge schnell sind. Ihre Dateien werden gerade indiziert."
 
-#: src/file-manager/nautilus-indexing-info.c:404
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Entschuldigung, aber der Medusa-Suchdienst ist nicht verfügbar."
 
-#: src/file-manager/nautilus-indexing-info.c:426
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr "%H:%M, %x"
 
@@ -8309,7 +8586,7 @@ msgstr "Lesezeichen"
 msgid "Location"
 msgstr "Ort"
 
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:757
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Löschen"
 
@@ -8457,11 +8734,12 @@ msgstr "Nautilus benutzen, um den Desktop zu zeichnen."
 msgid "Move existing desktop icons to the Nautilus desktop."
 msgstr "Existierende Desktopicons auf Nautilus-Desktop übernehmen."
 
-#: src/nautilus-first-time-druid.c:924
+#. This option is currently disabled, per bugzilla.eazel.com 7557
+#: src/nautilus-first-time-druid.c:927
 msgid "Launch Nautilus when GNOME starts up."
 msgstr "Nautilus aufrufen, wenn GNOME startet."
 
-#: src/nautilus-first-time-druid.c:963
+#: src/nautilus-first-time-druid.c:967
 msgid ""
 "The fast search feature indexes all the items on your hard disk.\n"
 "It speeds up searching and allows you to search by file content\n"
@@ -8477,7 +8755,7 @@ msgstr ""
 "Computer unbeschäftigt ist. Die schnelle Suche erfordert es,\n"
 "dass der Cron-Dämon auf Ihrem System läuft.\n"
 
-#: src/nautilus-first-time-druid.c:968
+#: src/nautilus-first-time-druid.c:972
 msgid ""
 "The fast search feature indexes all the items on your hard disk.\n"
 "It speeds up searching and allows you to search by file content\n"
@@ -8491,15 +8769,15 @@ msgstr ""
 "braucht Zeit, findet aber immer nur dann statt, wenn Ihr\n"
 "Computer unbeschäftigt ist.\n"
 
-#: src/nautilus-first-time-druid.c:977
+#: src/nautilus-first-time-druid.c:981
 msgid "Enable fast search"
 msgstr "Schnelle Suche aktivieren"
 
-#: src/nautilus-first-time-druid.c:978
+#: src/nautilus-first-time-druid.c:982
 msgid "Turn fast search on when cron is enabled"
 msgstr "Schnelle Suche einschalten, wenn cron aktiv ist"
 
-#: src/nautilus-first-time-druid.c:1024
+#: src/nautilus-first-time-druid.c:1027
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "currently can't be performed because the program crond, which does\n"
@@ -8519,7 +8797,7 @@ msgstr ""
 "Suchen funktionieren, sch\\alten Sie crond ein.\n"
 "\n"
 
-#: src/nautilus-first-time-druid.c:1032
+#: src/nautilus-first-time-druid.c:1035
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "may not be performed because the program crond, which does nightly tasks\n"
@@ -8535,7 +8813,8 @@ msgstr ""
 "Die Indizierung ist eingeschaltet und macht dadurch schnelles Suchen\n"
 "möglich. Allerdings kann vielleicht nicht indiziert werden, da das Programm\n"
 "crond, das regelmäßige Wartungsaufgaben auf Ihrem Computer (meist über\n"
-"Nacht) ausführt, abgeschaltet sein könnte. Um sicherzustellen, dass schnelle\n"
+"Nacht) ausführt, abgeschaltet sein könnte. Um sicherzustellen, dass "
+"schnelle\n"
 "Suchen funktionieren, stellen Sie sicher, dass crond eingeschaltet ist.\n"
 "\n"
 "Falls Sie Linux benutzen, können Sie sich als root einloggen und diese\n"
@@ -8544,7 +8823,7 @@ msgstr ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: src/nautilus-first-time-druid.c:1119
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
 "Click Finish to launch Nautilus. You'll start with two\n"
 "Nautilus windows: one shows your home folder, and the\n"
@@ -8560,7 +8839,7 @@ msgstr ""
 "\n"
 "Wir hoffen, dass Ihnen Nautilus gefällt!"
 
-#: src/nautilus-first-time-druid.c:1126
+#: src/nautilus-first-time-druid.c:1129
 msgid ""
 "Click Finish to launch Nautilus. You'll start with a\n"
 "window showing your home folder.\n"
@@ -8572,15 +8851,15 @@ msgstr ""
 "\n"
 "Wir hoffen, dass Ihnen Nautilus gefällt!"
 
-#: src/nautilus-first-time-druid.c:1150
+#: src/nautilus-first-time-druid.c:1153
 msgid "Nautilus First Time Setup"
 msgstr "Nautilus: Einrichtung beim ersten Start"
 
-#: src/nautilus-first-time-druid.c:1180
+#: src/nautilus-first-time-druid.c:1183
 msgid "Welcome to Nautilus"
 msgstr "Willkommen bei Nautilus"
 
-#: src/nautilus-first-time-druid.c:1182
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
 "Nautilus...\n"
 "    Is a great file manager for the GNOME desktop.\n"
@@ -8600,51 +8879,51 @@ msgstr ""
 "beginnen."
 
 #. set up the final page
-#: src/nautilus-first-time-druid.c:1193
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "Abgeschlossen"
 
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1206
+#: src/nautilus-first-time-druid.c:1209
 msgid "Choose Your User Level"
 msgstr "Ihr Nutzungsniveau wählen"
 
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1210
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr "Übergang von GMC auf Nautilus"
 
 #. set up the `Launch Medusa' page
-#: src/nautilus-first-time-druid.c:1214
+#: src/nautilus-first-time-druid.c:1217
 msgid "Fast Searches"
 msgstr "Schnelles Suchen"
 
 #. set up optional page to tell the user how to run cron
-#: src/nautilus-first-time-druid.c:1222
+#: src/nautilus-first-time-druid.c:1225
 msgid "The Cron Daemon"
 msgstr "Der Cron-Dämon"
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1227
+#: src/nautilus-first-time-druid.c:1230
 msgid "Checking Your Internet Connection"
 msgstr "Überprüfen Ihrer Internetverbindung"
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1238
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "Nautilus-Update..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1246
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "Web-Proxy-Konfiguration"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1321
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "Decodiere Update..."
 
-#: src/nautilus-first-time-druid.c:1338
+#: src/nautilus-first-time-druid.c:1341
 msgid "Update Complete. Click Next to Continue."
 msgstr "Update abgeschlossen. Klicken Sie \"Weiter\" zum Fortfahren."
 
@@ -8652,7 +8931,7 @@ msgstr "Update abgeschlossen. Klicken Sie \"Weiter\" zum Fortfahren."
 #. * doesn't exist. Arlo and I (jsh) and decided that the
 #. * best thing to do is silently fail
 #.
-#: src/nautilus-first-time-druid.c:1353
+#: src/nautilus-first-time-druid.c:1356
 msgid "No Update Available... Press Next to Continue."
 msgstr "Kein Update verfügbar... Klicken Sie \"Weiter\" zum Fortsetzen."
 
@@ -9235,15 +9514,18 @@ msgid "View as List"
 msgstr "Als Liste betrachten"
 
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+#, fuzzy
+msgid " _Advanced"
 msgstr " Experten"
 
 #: src/nautilus-shell-ui.xml.h:2
-msgid " Beginner"
+#, fuzzy
+msgid " _Beginner"
 msgstr " Anfänger"
 
 #: src/nautilus-shell-ui.xml.h:3
-msgid " Intermediate"
+#, fuzzy
+msgid " _Intermediate"
 msgstr " Fortgeschrittene"
 
 #: src/nautilus-shell-ui.xml.h:4
@@ -9283,24 +9565,20 @@ msgid "Close this window"
 msgstr "Diese Fenster schließen"
 
 #: src/nautilus-shell-ui.xml.h:15
-msgid "Cut _Text"
-msgstr "Text ausschneiden"
-
-#: src/nautilus-shell-ui.xml.h:17
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr ""
 "Ein Fenster anzeigen, das das Bearbeiten der Lesezeichen in diesem Menü "
 "erlaubt"
 
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr "Würdigungen für die Schöpfer von Nautilus anzeigen"
 
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr "Online-Hilfe für Nautilus anzeigen"
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
@@ -9308,136 +9586,123 @@ msgstr ""
 "Muster, Farben und Embleme anzeigen, mit denen das Erscheinungsbild "
 "angepasst werden kann"
 
-#: src/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:19
 msgid "Display quick reference pages for Nautilus"
 msgstr "Schnellreferenz-Seiten für Nautilus anzeigen"
 
-#: src/nautilus-shell-ui.xml.h:22
+#: src/nautilus-shell-ui.xml.h:20
 msgid "Display release notes for Nautilus"
 msgstr "Hinweise zu dieser Nautilus-Version anzeigen"
 
-#: src/nautilus-shell-ui.xml.h:23
+#: src/nautilus-shell-ui.xml.h:21
 msgid "Display support information for Nautilus and Eazel Services"
 msgstr "Support-Informationen zu Nautilus und Eazel-Diensten anzeigen"
 
-#: src/nautilus-shell-ui.xml.h:24
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Display the latest contents of the current location"
 msgstr "Die neuesten Inhalte des aktuellen Ortes anzeigen"
 
-#: src/nautilus-shell-ui.xml.h:25
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr "Zeigt die Menge der verfügbaren Erscheinungsbilder-Themen"
 
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:24
 msgid "Edit various Nautilus preferences"
 msgstr "Verschiedene Nautilus-Einstellungen bearbeiten"
 
-#: src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "Suchen"
 
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr "Chronik vergessen"
 
-#: src/nautilus-shell-ui.xml.h:29
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr "Zu Eazel-Diensten gehen"
 
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr "Zum Heimatort gehen"
 
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr "Zum Ort gehen, der dies enthält"
 
-#: src/nautilus-shell-ui.xml.h:32
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr "Zum nächsten besuchten Ort gehen"
 
-#: src/nautilus-shell-ui.xml.h:33
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr "Zum vorher besuchten Ort gehen"
 
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:442
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
 msgid "Hide Location _Bar"
 msgstr "_Adressleiste verbergen"
 
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:424
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
 msgid "Hide St_atus Bar"
 msgstr "_Statusleiste verbergen"
 
-#: src/nautilus-shell-ui.xml.h:36 src/nautilus-window-menus.c:430
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
 msgid "Hide _Sidebar"
 msgstr "Sei_tenleiste verbergen"
 
-#: src/nautilus-shell-ui.xml.h:37 src/nautilus-window-menus.c:436
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
 msgid "Hide _Toolbar"
 msgstr "_Werkzeugleiste verbergen"
 
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:37
 msgid "Nautilus Quick _Reference"
 msgstr "Nautilus-Schnell_referenz"
 
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:38
 msgid "Nautilus Release _Notes"
 msgstr "Nautilus-Versionshinweise"
 
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:39
 msgid "Nautilus User _Manual"
 msgstr "Nautilus-Benutzerhandbuch"
 
-#: src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "Neues Fenster"
 
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:41
 msgid "New _Window"
 msgstr "_Neues Fenster"
 
-#: src/nautilus-shell-ui.xml.h:44
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "Normalgröße"
 
-#: src/nautilus-shell-ui.xml.h:45
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Ein anderes Nautilus-Fenster für den angezeigten Ort öffnen"
 
-#: src/nautilus-shell-ui.xml.h:47
-msgid "Preferences..."
-msgstr "Einstellungen..."
-
-#: src/nautilus-shell-ui.xml.h:48
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: src/nautilus-shell-ui.xml.h:49
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr ""
-"Entfernt den ausgewählten Text, ohne ihn in die Zwischenablage zu legen"
-
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr "Profiling-Bericht"
 
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr "Profiling zurücksetzen"
 
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr "Das World Wide Web durchsuchen"
 
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr "Auf diesem Computer nach Dateien suchen"
 
-#: src/nautilus-shell-ui.xml.h:54
-msgid "Select _All"
-msgstr "_Alle auswählen"
-
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
@@ -9445,179 +9710,194 @@ msgstr ""
 "Zeigt eine Seite an, von der aus Sie Rückmeldungen über Nautilus und Eazel "
 "senden können"
 
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "Die Inhalte mit normaler Größe anzeigen"
 
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "Die Inhalte mit weniger Details anzeigen"
 
-#: src/nautilus-shell-ui.xml.h:58
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "Die Inhalte detaillierter anzeigen"
 
-#: src/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr "Profiling beginnen"
 
-#: src/nautilus-shell-ui.xml.h:61
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr "Profiling beenden"
 
-#: src/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr "Laden dieses Orts abbrechen"
 
-#: src/nautilus-shell-ui.xml.h:63
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "Die letzte Änderung am Text rückgängig machen"
 
-#: src/nautilus-shell-ui.xml.h:64
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "Rauf"
 
-#: src/nautilus-shell-ui.xml.h:65
-msgid "Use Advanced settings"
-msgstr "Einstellungen für Experten verwenden"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:66
-msgid "Use Beginner settings"
-msgstr "Einstellungen für Anfänger verwenden"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:67
-msgid "Use Intermediate settings"
-msgstr "Einstellungen für Fortgeschrittene verwenden"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:63
 msgid "We_b Search"
 msgstr "_Web-Suche"
 
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "Web-Suche"
 
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "Einzoomen"
 
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "Wegzoomen"
 
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "Einzoomen"
 
-#: src/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "Wegzoomen"
 
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "Über Nautilus..."
 
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "Lesezeichen hinzufügen"
 
-#: src/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "Zurück"
 
-#: src/nautilus-shell-ui.xml.h:77
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr "Hintergründe und Embleme..."
 
-#: src/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "Lesezeichen"
 
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "Fenster s_chließen"
 
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:76
 msgid "_Customer Support"
 msgstr "Kundendienst"
 
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "Bearbeiten"
 
-#: src/nautilus-shell-ui.xml.h:83
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "Lesezeichen bearbeiten..."
 
-#: src/nautilus-shell-ui.xml.h:84
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "Einstellungen..."
+
+#: src/nautilus-shell-ui.xml.h:80
 msgid "_Feedback"
 msgstr "Rückmeldungen"
 
-#: src/nautilus-shell-ui.xml.h:86 src/nautilus-window-menus.c:1352
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "_Suchen"
 
-#: src/nautilus-shell-ui.xml.h:87
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "Vor"
 
-#: src/nautilus-shell-ui.xml.h:88
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "_Gehe zu"
 
-#: src/nautilus-shell-ui.xml.h:89
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: src/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "_Heim"
 
-#: src/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "Ort"
+
+#: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr "_Nautilus-Themen..."
 
-#: src/nautilus-shell-ui.xml.h:92
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "Normalgröße"
 
-#: src/nautilus-shell-ui.xml.h:94
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "Einstellungen"
+
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr "Profiler"
 
-#: src/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "Aktualisiern"
 
-#: src/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr "Profiling-Bericht"
 
-#: src/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr "Profiling zurücksetzen"
 
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr "Profiling beginnen"
 
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr "Profiling beenden"
 
-#: src/nautilus-shell-ui.xml.h:100
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "Rückgängig"
 
-#: src/nautilus-shell-ui.xml.h:101
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "Eine Ebene rauf"
 
-#: src/nautilus-shell-ui.xml.h:102
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "Ansicht"
 
-#: src/nautilus-sidebar.c:659
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -9625,11 +9905,11 @@ msgstr ""
 "Sie können nicht mehr als ein eigenes Icon auf einmal zuweisen! Bitte ziehen "
 "Sie bloß ein Bild, um ein eigenes Icon einzustellen."
 
-#: src/nautilus-sidebar.c:661
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "Mehr als ein Bild"
 
-#: src/nautilus-sidebar.c:680
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -9637,11 +9917,11 @@ msgstr ""
 "Die Datei, die Sie fallengelassen haben, ist nicht lokal. Sie können nur "
 "lokale Bilder als eigene Icons verwenden."
 
-#: src/nautilus-sidebar.c:682
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "Nur lokale Bilder"
 
-#: src/nautilus-sidebar.c:687
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -9649,22 +9929,22 @@ msgstr ""
 "Die Datei, die Sie fallengelassen haben, ist kein Bild. Sie können nur "
 "lokale Bilder als eigene Icons verwenden."
 
-#: src/nautilus-sidebar.c:689
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "Nur Bilder"
 
-#: src/nautilus-sidebar.c:1247
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "Öffnen mit %s"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1283
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "Öffnen mit..."
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1390
+#: src/nautilus-sidebar.c:1424
 msgid "  Empty Trash  "
 msgstr " Müll leeren "
 
@@ -9757,16 +10037,16 @@ msgstr "Thema konnte nicht entfernt werden"
 msgid "No description available for the \"%s\" theme"
 msgstr "Keine Beschreibung verfügbar für das Thema \"%s\""
 
-#: src/nautilus-window.c:584
+#: src/nautilus-window.c:637
 msgid "View as ..."
 msgstr "Betrachten als..."
 
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1286
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "Als Sonstiges betrachten"
 
-#: src/nautilus-window.c:1687
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "Schließen"
 
@@ -9780,11 +10060,11 @@ msgstr "Schließen"
 msgid "Preview Release %s: %s"
 msgstr "Vorschauversion %s: %s"
 
-#: src/nautilus-window-manage-views.c:812
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "Ansicht fehlgeschlagen"
 
-#: src/nautilus-window-manage-views.c:823
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
@@ -9793,12 +10073,12 @@ msgstr ""
 "Die Ansicht %s stieß auf einen Fehler und kann nicht weitermachen. Sie "
 "können eine andere Ansicht wählen oder an einen anderen Ort gehen."
 
-#: src/nautilus-window-manage-views.c:834
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "Die Ansicht %s stieß beim Starten auf einen Fehler."
 
-#: src/nautilus-window-manage-views.c:993
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
@@ -9806,7 +10086,7 @@ msgstr ""
 "Eines der Seitenleisten-Paneele stieß auf einen Fehler und kann nicht "
 "weitermachen. Leider kann ich Ihnen nicht sagen, welches."
 
-#: src/nautilus-window-manage-views.c:997
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
@@ -9816,18 +10096,18 @@ msgstr ""
 "weitermachen. Wenn dies öfter vorkommt, werden Sie es vielleicht abschalten "
 "wollen."
 
-#: src/nautilus-window-manage-views.c:1002
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "Seitenleisten-Paneel fehlgeschlagen"
 
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr ""
 "\"%s\" konnte nicht gefunden werden. Bitte prüfen Sie die Rechtschreibung "
 "und versuchen Sie es noch einmal."
 
-#: src/nautilus-window-manage-views.c:1223
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
@@ -9835,7 +10115,7 @@ msgstr ""
 "\"%s\" ist kein gültiger Ort. Bitte prüfen Sie die Rechtschreibung und "
 "versuchen Sie es noch einmal."
 
-#: src/nautilus-window-manage-views.c:1237
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -9844,32 +10124,32 @@ msgstr ""
 "\"%s\" konnte nicht dargestellt werden, da Nautilus seinen Dateityp nicht "
 "bestimmen konnte."
 
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr "Nautilus hat keinen Viewer installiert, der \"%s\" anzeigen kann."
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1257
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 "\"%s\" konnte nicht angezeigt werden, da Nautilus nicht mit %s:-Orten "
 "umgehen kann."
 
-#: src/nautilus-window-manage-views.c:1263
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr ""
 "\"%s\" konnte nicht angezeigt werden, da der Versuch, sich anzumelden, "
 "fehlgeschlagen ist."
 
-#: src/nautilus-window-manage-views.c:1268
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "\"%s\" konnte nicht angezeigt werden, da der Zugriff verweigert wurde."
 
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1287
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
@@ -9879,7 +10159,7 @@ msgstr ""
 "werden konnte. Überprüfen Sie, ob der Rechnername richtig geschrieben wurde "
 "und ob Ihre Proxy-Einstellungen richtig sind."
 
-#: src/nautilus-window-manage-views.c:1287
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -9888,7 +10168,7 @@ msgstr ""
 "\"%s\" konnte nicht angezeigt werden, da der Rechnername leer war. "
 "Überprüfen Sie, ob Ihre Proxy-Einstellungen richtig sind."
 
-#: src/nautilus-window-manage-views.c:1299
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -9900,23 +10180,23 @@ msgstr ""
 "Medusa-Suchdienst gestartet haben, bzw., falls Sie noch keinen Index haben, "
 "dass der Medusa-Indizierer läuft."
 
-#: src/nautilus-window-manage-views.c:1303
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "Suche nicht verfügbar"
 
-#: src/nautilus-window-manage-views.c:1307
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus kann \"%s\" nicht anzeigen."
 
-#: src/nautilus-window-manage-views.c:1312
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "Ort kann nicht angezeigt werden"
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:313
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
@@ -9924,38 +10204,38 @@ msgstr ""
 "Sind Sie sicher, dass Sie die Geschichte vergessen wollen? Wenn ja, werden "
 "Sie dazu verdammt sein, Sie zu wiederholen."
 
-#: src/nautilus-window-menus.c:316
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
 "Sind Sie sicher, dass Sie wollen, dass Nautilus vergisst, welche Orte Sie "
 "besucht haben?"
 
-#: src/nautilus-window-menus.c:321
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "Chronik vergessen?"
 
-#: src/nautilus-window-menus.c:322
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "Vergessen"
 
-#: src/nautilus-window-menus.c:425
+#: src/nautilus-window-menus.c:466
 msgid "Show St_atus Bar"
 msgstr "_Statusleiste zeigen"
 
-#: src/nautilus-window-menus.c:431
+#: src/nautilus-window-menus.c:472
 msgid "Show _Sidebar"
 msgstr "Sei_tenleiste zeigen"
 
-#: src/nautilus-window-menus.c:437
+#: src/nautilus-window-menus.c:478
 msgid "Show _Toolbar"
 msgstr "_Werkzeugleiste zeigen"
 
-#: src/nautilus-window-menus.c:443
+#: src/nautilus-window-menus.c:484
 msgid "Show Location _Bar"
 msgstr "_Adressleiste zeigen"
 
-#: src/nautilus-window-menus.c:494
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -9965,11 +10245,11 @@ msgstr "Einstellungen"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:571
+#: src/nautilus-window-menus.c:618
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
-#: src/nautilus-window-menus.c:573
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -9987,7 +10267,7 @@ msgstr ""
 #. * bottom of the about box to give credit
 #. * to the translator(s)
 #.
-#: src/nautilus-window-menus.c:582
+#: src/nautilus-window-menus.c:629
 msgid "Translator Credits"
 msgstr ""
 "Deutsche Übersetzung:\n"
@@ -9995,7 +10275,7 @@ msgstr ""
 "Christian Meyer <linux@chrisime.de>\n"
 "Benedikt Roth <Benedikt.Roth@gmx.net>"
 
-#: src/nautilus-window-menus.c:752
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -10004,27 +10284,23 @@ msgstr ""
 "Der Ort \"%s\" existiert nicht. Möchten Sie alle Lesezeichen mit diesem Ort "
 "aus Ihrer Liste entfernen?"
 
-#: src/nautilus-window-menus.c:756
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "Lesezeichen für nicht existierenden Ort"
 
-#: src/nautilus-window-menus.c:770
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "Der Ort \"%s\" existiert nicht mehr."
 
-#: src/nautilus-window-menus.c:771
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "\"Gehe zu\" nichtexistentem Ort"
 
-#: src/nautilus-window-menus.c:840
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "Zum durch dieses Lesezeichen angegebenen Ort gehen"
 
-#: src/nautilus-window-menus.c:1351
-msgid "_Browse"
-msgstr "Stöbern"
-
 #: src/nautilus-window-toolbars.c:402
 msgid "Back"
 msgstr "Zurück"
@@ -10039,3 +10315,120 @@ msgstr "Vor"
 #: src/nautilus-zoom-control.c:531
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-iso8859-1"
+
+#~ msgid "helvetica"
+#~ msgstr "helvetica"
+
+#~ msgid "_Fonts"
+#~ msgstr "Schriftarten"
+
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "Sie können eine Datei nicht auf sich selbst verschieben."
+
+#~ msgid "Can't Move Onto Self"
+#~ msgstr "Kann nicht auf sich selbst verschoben werden"
+
+#~ msgid "You cannot throw \"%s\" into the Trash."
+#~ msgstr "Sie können \"%s\" nicht in den Müll werfen.<"
+
+#~ msgid "Error Moving to Trash"
+#~ msgstr "Fehler beim Verschieben in den Müll"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Bold"
+#~ msgstr "Fett"
+
+#~ msgid "Book"
+#~ msgstr "Buch"
+
+#~ msgid "Demibold"
+#~ msgstr "Halbfett"
+
+#~ msgid "Light"
+#~ msgstr "Leicht"
+
+#~ msgid "Italic"
+#~ msgstr "Kursiv"
+
+#~ msgid "Oblique"
+#~ msgstr "Schräg"
+
+#~ msgid "Reverse Italic"
+#~ msgstr "Umgekehrt kursiv"
+
+#~ msgid "Reverse Oblique"
+#~ msgstr "Umgekehrt schräg"
+
+#~ msgid "Condensed"
+#~ msgstr "Schmal"
+
+#~ msgid "Semicondensed"
+#~ msgstr "Halbschmal"
+
+#~ msgid "Font"
+#~ msgstr "Schriftart"
+
+#~ msgid "fixed"
+#~ msgstr "nichtproportional"
+
+#~ msgid "current theme"
+#~ msgstr "aktuelles Thema"
+
+#~ msgid "Use this font family to display file names:"
+#~ msgstr "Diese Schriftartfamilie zur Anzeige von Dateinamen benutzen:"
+
+#~ msgid "Can add Content"
+#~ msgstr "Kann Inhalt hinzufügen"
+
+#~ msgid "No image was selected.  You must click on an image to select it."
+#~ msgstr ""
+#~ "Es wurde kein Bild ausgewählt. Sie müssen auf ein Bild klicken, um es "
+#~ "auszuwählen."
+
+#~ msgid "No selection made"
+#~ msgstr "Es wurde keine Auswahl vorgenommen"
+
+#~ msgid "Remember this password"
+#~ msgstr "An dieses Passwort erinnern"
+
+#~ msgid "times"
+#~ msgstr "times"
+
+#~ msgid "courier"
+#~ msgstr "courier"
+
+#~ msgid "lucida"
+#~ msgstr "lucida"
+
+#~ msgid "Details"
+#~ msgstr "Details"
+
+#~ msgid "Warning"
+#~ msgstr "Warnung"
+
+#~ msgid "Error"
+#~ msgstr "Fehler"
+
+#~ msgid "Question"
+#~ msgstr "Frage"
+
+#~ msgid "_Cut Text"
+#~ msgstr "Text _ausschneiden"
+
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr ""
+#~ "Entfernt den ausgewählten Text, ohne ihn in die Zwischenablage zu legen"
+
+#~ msgid "Use Advanced settings"
+#~ msgstr "Einstellungen für Experten verwenden"
+
+#~ msgid "Use Beginner settings"
+#~ msgstr "Einstellungen für Anfänger verwenden"
+
+#~ msgid "Use Intermediate settings"
+#~ msgstr "Einstellungen für Fortgeschrittene verwenden"
+
+#~ msgid "_Browse"
+#~ msgstr "Stöbern"
diff --git a/po/el.po b/po/el.po
index ee15dafcf..4570fd231 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,10 +16,15 @@
 # simos: 1926 messages, 01Mar2001, 86 messages remaining.
 # simos: 2009 messages, 02Mar2001, full translation.
 #
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 0.8.3\n"
-"POT-Creation-Date: 2001-03-26 20:54+0100\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-03-26 23:54:18+0900\n"
 "Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -157,7 +162,7 @@ msgid "Previous"
 msgstr "Ðñïçãïýìåíï"
 
 #: components/help/converters/gnome-db2html2/gdb3html.c:721
-#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:789
 #: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "Áñ÷Þ"
@@ -350,16 +355,14 @@ msgid "Kernel Routines"
 msgstr "Ñïõôßíåò ÐõñÞíá"
 
 #: components/help/hyperbola-filefmt.c:703
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
 msgid "Info"
 msgstr "Ðëçñïöïñßåò"
 
-#: components/help/hyperbola-nav-tree.c:279
+#: components/help/hyperbola-nav-tree.c:310
 msgid "Introductory Documents:"
 msgstr "ÅéóáãùãéêÜ ¸ããñáöá:"
 
-#: components/help/hyperbola-nav-tree.c:293
+#: components/help/hyperbola-nav-tree.c:324
 msgid "Documents by Subject:"
 msgstr "¸ããñáöá âÜóç ÈÝìáôïò:"
 
@@ -433,7 +436,7 @@ msgstr "ÐëÜãéï ôáìðëþ éóôïñéêïý"
 msgid "History sidebar panel for Nautilus"
 msgstr "ÐëÜãéï ôáìðëþ éóôïñéêïý ôïõ Íáõôßëïõ"
 
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "Áíåðéôõ÷Þò ðñïóðÜèåéá áñ÷éêïðïßçóçò ôïõ Ìðïíüìðï"
 
@@ -579,7 +582,7 @@ msgstr "Áðïôõ÷ßá ÐëåõñéêÞò ÌðÜñáò"
 
 # gconf/gconftool.c:951
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -589,7 +592,7 @@ msgstr ""
 "  %s"
 
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -1042,7 +1045,6 @@ msgstr "ÐáëéÜ"
 
 #
 #: components/music/mpg123.c:32
-#: libnautilus-extensions/nautilus-font-picker.c:101
 msgid "Other"
 msgstr "¶ëëá"
 
@@ -1700,9 +1702,9 @@ msgstr "Ðáýóç"
 
 #
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:984
-#: libnautilus-extensions/nautilus-file-operations.c:999
-#: libnautilus-extensions/nautilus-file-operations.c:1018
+#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 #: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "ÄéáêïðÞ"
@@ -1754,23 +1756,6 @@ msgstr "ÅñãïóôÜóéï ìïõóéêÞ üøçò"
 msgid "View as Music"
 msgstr "ÐñïâïëÞ ùò ÌïõóéêÞ"
 
-#. FIXME: eventually, get this from preferences
-#. set up the default font
-#: components/notes/nautilus-notes.c:200
-#: components/text/nautilus-text-view.c:186
-#: libnautilus-extensions/nautilus-global-preferences.c:1185
-#: libnautilus-extensions/nautilus-icon-container.c:3333
-#: libnautilus-extensions/nautilus-icon-container.c:3334
-#: libnautilus-extensions/nautilus-icon-container.c:3335
-#: libnautilus-extensions/nautilus-icon-container.c:3336
-#: libnautilus-extensions/nautilus-icon-container.c:3337
-#: libnautilus-extensions/nautilus-icon-container.c:3338
-#: libnautilus-extensions/nautilus-icon-container.c:3339
-#: libnautilus-extensions/nautilus-preferences-item.c:482
-#: src/nautilus-sidebar-title.c:500
-msgid "helvetica"
-msgstr "helveticagr"
-
 #: components/notes/Nautilus_View_notes.oaf.in.h:1
 msgid "Factory for annotation view"
 msgstr "ÅñãïóôÜóéï ãéá üøç åðéóçìåßùóçò"
@@ -1930,173 +1915,177 @@ msgid "Run Query"
 msgstr "ÅêôÝëåóç Åðåñþôçóçò"
 
 #
-#. Disabled for 1.0
-#. {"revert", 'r', POPT_ARG_NONE, &arg_revert, 0, N_("Revert"), NULL},
-#: components/services/install/command-line/eazel-alt-install-corba.c:127
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
+#, fuzzy
+msgid "Revert"
+msgstr "ðïôÝ"
+
+#
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr "Êáèïñéóìüò áñ÷Þò"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:128
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "Êáèïñéóìüò åîõðçñåôçôÞ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:129
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
 msgid "Dont print too much, just problems and download"
 msgstr "Íá ìçí åêôõðþíïíôáé ðïëëÜ, ìüíï ðñïâëÞìáôá êáé ìåôáöïñôþóåéò"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:130
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr "ÅêôÝëåóç ìåôáíïìáóßáò ssl"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:131
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
 msgid "argument is a suite id"
 msgstr "ôï üñéóìá åßíáé ôáõôüôçôá óïõßôáò"
 
 #
-#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "ÄïêéìáóôéêÞ åêôÝëåóç"
 
 #
-#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr "Íá åðéôñÝðåôáé üíïìá ÷ñÞóôç"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:134
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
 #: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "Íá åðéôñÝðïíôáé áíáâáèìßóåéò"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "ÐåñéöñÜóôéêÜ ìçíýìáôá"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:136
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
 msgid "Install a specific package version"
 msgstr "ÅãêáôÜóôáóç ðáêÝôïõ óõãêåêñéìÝíçò Ýêäïóçò"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:159
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
 msgid "*** You cannot specify more then one protocol type.\n"
 msgstr "*** Äå ìðïñåßôå íá êáèïñßóåôå ðåñéóóüôåñá áðü Ýíá åßäç ðñùôïêüëëùí.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:176
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
 msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
 msgstr "*** ÄéáãñáöÞ êáé åðáíáöïñÜ; ÊÜðïéïò ìáò åíåñãïðïßçóå ôç âüìâá!\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:285
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, c-format
 msgid "File conflict checking %s...\n"
 msgstr "¸ëåã÷ïò óýãñïõóçò áñ÷åßùí %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:299
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, c-format
 msgid "File uniqueness checking %s...\n"
 msgstr "¸ëåã÷ïò ìïíáäéêüôçôáò áñ÷åßùí %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:313
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
 #, c-format
 msgid "Feature consistency checking %s...\n"
 msgstr "¸ëåã÷ïò áõôïôÝëåéáò ÷áñáêôçñéóôéêïý %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:344
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
 #: components/services/install/lib/eazel-install-protocols.c:116
 #: components/services/install/lib/eazel-install-protocols.c:254
 #, c-format
 msgid "Downloading %s..."
 msgstr "ËÞøç ôïõ %s..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:360
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
 msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
 msgstr "Ìåôáöüñôùóç ôïõ %s... (%d/%d) = %d%% %.1f KB/s"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:368
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
 msgid "Downloading %s... (%d/%d) = %d%%"
 msgstr "Ìåôáöüñôùóç ôïõ %s... (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:376
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
 #, c-format
 msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
 msgstr "Ìåôáöüñôùóç ôïõ %s... (%d/%d) %.1f KB/s Ïëïêëçñþèçêå\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:381
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
 #, c-format
 msgid "Downloading %s... %3.1f KB/s Done\n"
 msgstr "Ìåôáöüñôùóç ôïõ %s... %3.1f KB/s Ïëïêëçñþèçêå\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:409
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "ÅãêáôÜóôáóç ôïõ %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:417
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "ÁðåãêáôÜóôáóç ôïõ %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:439
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "ÅãêáôÜóôáóç ôïõ %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Ïëïêëçñþèçêå\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:446
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "ÁðåãêáôÜóôáóç ôïõ %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Ïëïêëçñþèçêå\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:454
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
 msgid "Done\n"
 msgstr "Ïëïêëçñþèçêå\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:474
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
 #, c-format
 msgid "Download of %s FAILED\n"
 msgstr "ÁÐÏÔÕ׺Á ìåôáöüñôùóçò ôïõ %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:496
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
 #, c-format
 msgid "Package %s failed to uninstall.\n"
 msgstr "Áðïôõ÷ßá áðåãêáôÜóôáóçò ôïõ ðáêÝôïõ %s.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:498
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
 #, c-format
 msgid "Package %s failed to install.\n"
 msgstr "Áðïôõ÷ßá åãêáôÜóôáóçò ôïõ ðáêÝôïõ %s.\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:519
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
 #, c-format
 msgid "\t· Problem : %s\n"
 msgstr "\t· Ðñüâëçìá : %s\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:528
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
 #, c-format
 msgid "\t· Action : %s\n"
 msgstr "\t· ÅíÝñãåéá : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:571
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
 msgid "Cancelling operation\n"
 msgstr "Áêýñùóç ëåéôïõñãßáò\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:582
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
 #, c-format
 msgid "About to install a total of %d packages, %dKB\n"
 msgstr "Ðñüêåéôáé íá ãßíåé åãêáôÜóôáóç %d ðáêÝôùí, %dKB\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:586
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
 #, c-format
 msgid "About to uninstall a total of %d packages, %dKB\n"
 msgstr "Ðñüêåéôáé íá ãßíåé áðåãêáôÜóôáóç %d ðáêÝôùí, %dKB\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:590
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
 #, c-format
 msgid "About to revert a total of %d packages, %d KB\n"
 msgstr "Ðñüêåéôáé íá ãßíåé åðáíáöïñÜ %d ðáêÝôùí, %d KB\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:607
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
 #, c-format
 msgid "\t· %s and it's dependencies\n"
 msgstr "\t· ôï %s êáé ïé åîáñôÞóåéò ôïõ\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:610
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
 #, c-format
 msgid "\t· %s\n"
 msgstr "\t· %s\n"
@@ -2106,38 +2095,38 @@ msgstr "\t· %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n) " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:638
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
 msgid "Save transaction report ? (y/n) "
 msgstr "ÁðïèÞêåõóç áíáöïñÜò óõíáëëáãÞò; (í/ï) "
 
 #. I18N note: y is the letter for the word Yes. This is
 #. used in the response for a yes/no questions. Your translation
 #. must be 1 character only.
-#: components/services/install/command-line/eazel-alt-install-corba.c:649
-#: components/services/install/command-line/eazel-alt-install-corba.c:769
-#: components/services/install/command-line/eazel-alt-install-corba.c:811
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
 msgid "y"
 msgstr "í"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:670
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
 #, c-format
 msgid "Dependency : %s needs %s\n"
 msgstr "ÅîÜñôçóç : ôï %s áðáéôåß ôï %s\n"
 
 #. I18N note: %s is a package name
-#: components/services/install/command-line/eazel-alt-install-corba.c:688
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
 #, c-format
 msgid "Package %s failed md5 check!\n"
 msgstr "Áðïôõ÷ßá åëÝã÷ïõ md5 áðü ôï ðáêÝôï %s!\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:690
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
 #, c-format
 msgid "\t· server MD5 checksum is %s\n"
 msgstr "\t· ôï Üèñïéóìá åëÝã÷ïõ MD5 ôïõ åîõðçñåôçôÞ åßíáé %s\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:692
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
 #, c-format
 msgid "\t· actual MD5 checksum is %s\n"
 msgstr "\t· ôï ðñáãìáôéêü Üèñïéóìá åëÝã÷ïõ MD5 åßíáé %s\n"
@@ -2147,7 +2136,7 @@ msgstr "\t· ôï ðñáãìáôéêü Üèñïéóìá åëÝã÷ïõ MD5 åßíáé %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:758
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
 msgid "Continue? (y/n) "
 msgstr "ÓõíÝ÷éóç; (í/ï) "
 
@@ -2156,85 +2145,85 @@ msgstr "ÓõíÝ÷éóç; (í/ï) "
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:799
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
 msgid "Should I delete the RPM files? (y/n) "
 msgstr "Íá äéáãñáöïýí ôá áñ÷åßá RPM; (í/ï) "
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:831
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
 msgid "Operation ok\n"
 msgstr "Ç ëåéôïõñãßá ïëïêëçñþèçêå\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:833
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
 msgid "Operation failed\n"
 msgstr "Áðïôõ÷ßá ëåéôïõñãßáò\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:959
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
 msgid "Installing"
 msgstr "Ãßíåôå åãêáôÜóôáóç"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:968
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
 msgid "Uninstalling"
 msgstr "Ãßíåôå áðåãêáôÜóôáóç"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:983
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
 msgid "Only one operation at a time please."
 msgstr "Ìüíï ìßá ëåéôïõñãßá ôç öïñÜ ðáñáêáëþ."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:988
-#: components/services/install/command-line/eazel-alt-install-corba.c:996
-#: components/services/install/command-line/eazel-alt-install-corba.c:1040
-#: components/services/install/command-line/eazel-alt-install-corba.c:1047
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
 #, c-format
 msgid "%s: --help for usage\n"
 msgstr "%s: --help ãéá âïÞèåéá\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
 #, c-format
 msgid "Name         : %s\n"
 msgstr "¼íïìá        : %s\n"
 
 #
-#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
 #, c-format
 msgid "Version      : %s\n"
 msgstr "¸êäïóç:      : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1014
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
 #, c-format
 msgid "Minor        : %s\n"
 msgstr "EëÜóóùí      : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
 #, c-format
 msgid "Size         : %d\n"
 msgstr "ÌÝãåèïò      : %d\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
 #, c-format
 msgid "Arch         : %s\n"
 msgstr "Áñ÷éôåêôïíéêÞ: %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
 #, c-format
 msgid "Distribution : %s\n"
 msgstr "ÄéáíïìÞ      : %s\n"
 
 #
-#: components/services/install/command-line/eazel-alt-install-corba.c:1019
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
 #, c-format
 msgid "Description  : %s\n"
 msgstr "ÐåñéãñáöÞ    : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1021
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
 #, c-format
 msgid "Install root : %s\n"
 msgstr "ÄéáäñïìÞ åãêáô/óçò: %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1024
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
 msgid "Provides     : \n"
 msgstr "Ðáñï÷åßò     : \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1066
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
 #, c-format
 msgid "exit code %d\n"
 msgstr "áðïôÝëåóìá åíÝñãåéáò %d\n"
@@ -2314,65 +2303,65 @@ msgstr "Äåí õðÜñ÷åé MD5 äéáèÝóéìï ãéá ôï \"%s\""
 
 #. I18N note: "%is is ok" in the sense that %s=package name and the
 #. package is intact
-#: components/services/install/lib/eazel-install-logic2.c:354
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, c-format
 msgid "%s is ok"
 msgstr "Ôï %s åßíáé åíôÜîåé"
 
 #
-#: components/services/install/lib/eazel-install-logic2.c:460
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s Ýêäïóç %s-%s åßíáé Þäç åãêáôåóôçìÝíï"
 
 #
-#: components/services/install/lib/eazel-install-logic2.c:464
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s Ýêäïóç %s åßíáé Þäç åãêáôåóôçìÝíï"
 
-#: components/services/install/lib/eazel-install-logic2.c:473
-#: components/services/install/lib/eazel-install-logic2.c:478
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr "Ôï %s áíáâáèìßæåé áðü Ýêäïóç %s-%s óå %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:487
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr "Ôï %s õðïâáèìßæåé áðü Ýêäïóç %s-%s óå %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:492
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr "Ôï %s õðïâáèìßæåé áðü Ýêäïóç %s óå %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:545
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr "Ôï %s åãêáèéóôÜ ôçí Ýêäïóç %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:550
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr "Ôï %s åãêáèéóôÜ ôçí Ýêäïóç %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:731
-#: components/services/install/lib/eazel-install-logic2.c:913
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, c-format
 msgid "Loading package info from file %s"
 msgstr "ËÞøç ðëçñïöïñéþí ðáêÝôïõ áðü ôï áñ÷åßï %s"
 
 #. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
-#: components/services/install/lib/eazel-install-logic2.c:1198
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "ok"
 msgstr "åíôÜîåé"
 
-#: components/services/install/lib/eazel-install-logic2.c:1198
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "not ok"
 msgstr "äåí åßíáé åíôÜîåé"
 
-#: components/services/install/lib/eazel-install-logic2.c:1364
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
 msgid "Checking dependencies for %s"
 msgstr "Åëåã÷ïò åîáñôÞóåùí ãéá ôï %s"
@@ -2380,53 +2369,53 @@ msgstr "Åëåã÷ïò åîáñôÞóåùí ãéá ôï %s"
 #. I18N note: both %s' are package names.
 #. related is in the sense that the two packages apparently
 #. are connected somehow, eg. foo and foo-devel
-#: components/services/install/lib/eazel-install-logic2.c:2015
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, c-format
 msgid "%s is related to %s"
 msgstr "Ôï %s ó÷åôßæåôáé ìå ôï %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2091
+#: components/services/install/lib/eazel-install-logic2.c:2090
 #, c-format
 msgid "updating %s to version %s-%s solves conflict"
 msgstr "ç åíçìÝñùóç ôïõ %s óôçí Ýêäïóç %s-%s åðéëýåé ôç óýãêñïõóç"
 
-#: components/services/install/lib/eazel-install-logic2.c:2114
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
 msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr "ç äéáèÝóéìç áíáíÝùóç óôï %s (%s-%s) äåí åðéëýåé ôç óýãêñïõóç"
 
 #
-#: components/services/install/lib/eazel-install-logic2.c:2129
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, c-format
 msgid "could not revive %s"
 msgstr "áäýíáôç ç áíáæùïãüíçóç ôïõ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2285
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
 msgid "file uniqueness checking %s"
 msgstr "Ýëåã÷ïò ìïíáäéêüôçôáò áñ÷åßïõ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2306
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
 msgid "Duplicate file : %s occurs in %s and %s"
 msgstr "Äéðëü áñ÷åßï : ôï %s õðÜñ÷åé óôï %s êáé óôï %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2317
-#: components/services/install/lib/eazel-install-logic2.c:2471
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
 msgid "... but it's ok, the packages are related"
 msgstr "... áëëÜ åßíáé åíôÜîåé, ôá ðáêÝôá áëëçëïó÷åôßæïíôáé"
 
-#: components/services/install/lib/eazel-install-logic2.c:2325
+#: components/services/install/lib/eazel-install-logic2.c:2324
 #, c-format
 msgid "(there were %d other conflicts)"
 msgstr "(õðÞñîáí %d Üëëåò óõãêñïýóåéò)"
 
-#: components/services/install/lib/eazel-install-logic2.c:2420
+#: components/services/install/lib/eazel-install-logic2.c:2419
 #, c-format
 msgid "file conflict checking %s"
 msgstr "Ýëåã÷ïò óýãêñïõóçò áñ÷åßïõ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2457
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
 msgid "file conflict : package %s already provides file %s also provided by %s"
 msgstr ""
@@ -2435,17 +2424,17 @@ msgstr ""
 
 #. the owner of this file is a package that we're upgrading, and the
 #. * new version no longer has this file, so everything's okay.
-#: components/services/install/lib/eazel-install-logic2.c:2467
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
 msgid "...but it is okay, we're upgrading %s and it ditched that file"
 msgstr "...áëëÜ åßíáé åíôÜîåé äéüôé áíáâáèìßæïõìå ôï %s êáé ôï äéáãñÜöåé"
 
-#: components/services/install/lib/eazel-install-logic2.c:2559
+#: components/services/install/lib/eazel-install-logic2.c:2558
 #, c-format
 msgid "checking feature consistency of %s"
 msgstr "Ýëåã÷ïò áõôïôÝëåéáò ÷áñáêôçñéóôéêïý ôïõ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2627
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
 msgid ""
 "feature missing : %s breaks if %s is installed (feature %s would be lost"
@@ -2453,39 +2442,39 @@ msgstr ""
 "ëåßðåé ÷áñáêôçñéóôéêü : ôï %s Ý÷åé ðñüâëçìá áí åãêáôáóôáèåß ôï %s (ôï "
 "÷áñáêô. %s èá ÷áèåß"
 
-#: components/services/install/lib/eazel-install-logic2.c:2706
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, c-format
 msgid "downloading %d packages"
 msgstr "ìåôáöüñôùóç %d ðáêÝôùí"
 
-#: components/services/install/lib/eazel-install-logic2.c:2952
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, c-format
 msgid "will upgrade %s"
 msgstr "èá ãßíåé áíáâÜèìéóç ôïõ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2955
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, c-format
 msgid "will downgrade %s"
 msgstr "èá ãßíåé õðïâÜèìéóç ôïõ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2958
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, c-format
 msgid "will install %s"
 msgstr "èá ãßíåé åãêáôÜóôáóç ôïõ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2961
+#: components/services/install/lib/eazel-install-logic2.c:2960
 #, c-format
 msgid "will uninstall %s"
 msgstr "èá ãßíåé áðåãêáôÜóôáóç ôïõ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:3046
+#: components/services/install/lib/eazel-install-logic2.c:3045
 #: components/services/install/lib/eazel-install-problem.c:342
 #: components/services/install/lib/eazel-install-problem.c:345
 #, c-format
 msgid "%s requires %s"
 msgstr "Ôï %s áðáéôåß ôï %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:3239
+#: components/services/install/lib/eazel-install-logic2.c:3238
 #, c-format
 msgid "failed %s"
 msgstr "áðïôõ÷ßá ôïõ %s"
@@ -2771,69 +2760,69 @@ msgstr "*** Êáêïó÷çìáôéóìÝíïò êüìâïò åîÜñôçóçò!"
 msgid "*** Unknown node type '%s'"
 msgstr "*** ¶ãíùóôï åßäïò êüìâïõ '%s'"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:231
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** Ôï áñ÷åßï ëßóôáò ðáêÝôùí äåí ðåñéÝ÷åé äåäïìÝíá! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:236
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** Áäýíáôç ç åýñåóç êüìâïõ xml ÊÁÔÇÃÏÑÉÅÓ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:237
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr "*** ÅãêáôÜëåéøç ôçò áíÜëõóçò êáôçãïñéþí! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:243
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** ×ùñßò Êáôçãïñßåò! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:244
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr "*** ÅãêáôÜëåéøç ôçò áíÜëõóçò êáôçãïñßáò! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:298
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** Áäýíáôç ç åýñåóç êüìâïõ xml ÓÕÍÁËËÁù! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:300
-#: components/services/install/lib/eazel-install-xml-package-list.c:308
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr "*** ÅãêáôÜëåéøç ôçò áíÜëõóçò óõíáëëáãÞò! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:306
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** ×ùñßò ðáêÝôá! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:342
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** ×ùñßò êüìâïõò êáôçãïñéþí! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:346
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** Áäýíáôç ç åýñåóç êüìâïõ xml ÊÁÔÇÃÏÑÉÅÓ! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:380
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** ¶ãíùóôïò êüìâïò %s"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:470
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** ÓöÜëìá äçìéïõñãßáò ëßóôáò ðáêÝôùí xml! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:517
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** ÓöÜëìá áíÜãíùóçò ôçò ëßóôáò ðáêÝôùí! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:912
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** Ôï xml osd äå ðåñéÝ÷åé äåäïìÝíá! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:917
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr "*** ÅãêáôÜëåéøç ôçò áíÜëõóçò osd! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:993
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "Áäýíáôç ç áíÜëõóç ôïõ xml (ìÞêïò %d)"
@@ -2973,7 +2962,7 @@ msgid "Now installing package \"%s\"."
 msgstr "Ôþñá åãêáèßóôáôáé ôþñá ôï ðáêÝôï \"%s\"."
 
 #: components/services/install-view/callbacks.c:407
-#: components/services/install-view/nautilus-service-install-view.c:897
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "ÅãêáôÜóôáóç ôïõ \"%s\""
@@ -3118,66 +3107,68 @@ msgstr "ÓõíÝ÷åéá"
 
 #: components/services/install-view/forms.c:482
 #: libnautilus-extensions/nautilus-drag.c:493
-#: src/file-manager/fm-directory-view.c:4398
+#: src/file-manager/fm-directory-view.c:4326
 msgid "Cancel"
 msgstr "Áêýñùóç"
 
-#: components/services/install-view/nautilus-service-install-view.c:419
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
 msgid "%s is in GNOME (footprint) > %s"
 msgstr "ôï %s åßíáé óôï GNOME (ðáôçìáóéÜ) > %s"
 
-#: components/services/install-view/nautilus-service-install-view.c:437
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, c-format
 msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr "ôï %s åßíáé óôï ìåíïý GNOME (ðáôçìáóéÜ).\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:452
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
 msgid "%s is in the KDE menu.\n"
 msgstr "ôï %s åßíáé óôï ìåíïý KDE.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:653
+#: components/services/install-view/nautilus-service-install-view.c:655
 msgid "Installation Complete"
 msgstr "ÏëïêëÞñùóç ÅãêáôÜóôáóçò"
 
-#: components/services/install-view/nautilus-service-install-view.c:708
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
 msgid ""
 "%sTo start %s, click the Launch button below, or to create a shortcut, drag "
 "the icon on the right to the GNOME panel or your desktop."
 msgstr ""
-"%sÃéá íá åêêéíÞóåôå ôï %s, ðáôÞóôå ôï ðáñáêÜôù êïõìðß Åêêßíçóç Þ ãéá íá äçìéïõñãÞóôå "
-"ìéá óõíôüìåõóç, óýñôå ôï åéêïíßäéï óôá äåîéÜ óôï ôáìðëþ ôïõ GNOME Þ óôçí åðéöÜíåéá åñãáóßáò."
+"%sÃéá íá åêêéíÞóåôå ôï %s, ðáôÞóôå ôï ðáñáêÜôù êïõìðß Åêêßíçóç Þ ãéá íá "
+"äçìéïõñãÞóôå ìéá óõíôüìåõóç, óýñôå ôï åéêïíßäéï óôá äåîéÜ óôï ôáìðëþ ôïõ "
+"GNOME Þ óôçí åðéöÜíåéá åñãáóßáò."
 
 #. couldn't find an icon
-#: components/services/install-view/nautilus-service-install-view.c:716
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
 msgid "%sTo start %s, click the Launch button below."
-msgstr "%sÃéá ôçí åêêßíçóç ôïõ %s, ðáôÞóôå ôï êïõìðß Åêêßíçóç ðïõ âñßóêåôáé ðáñáêÜôù."
+msgstr ""
+"%sÃéá ôçí åêêßíçóç ôïõ %s, ðáôÞóôå ôï êïõìðß Åêêßíçóç ðïõ âñßóêåôáé ðáñáêÜôù."
 
 #
-#: components/services/install-view/nautilus-service-install-view.c:771
+#: components/services/install-view/nautilus-service-install-view.c:773
 msgid "Incorrect password."
 msgstr "ÅóöáëìÝíïò êùäéêüò ðñüóâáóçò."
 
-#: components/services/install-view/nautilus-service-install-view.c:776
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr "Áõèåíôéêïðïßçóç ùò äéá÷åéñéóôÞò"
 
-#: components/services/install-view/nautilus-service-install-view.c:893
+#: components/services/install-view/nautilus-service-install-view.c:895
 msgid "Installing packages"
 msgstr "ÅãêáôÜóôáóç ðáêÝôùí"
 
-#: components/services/install-view/nautilus-service-install-view.c:895
+#: components/services/install-view/nautilus-service-install-view.c:897
 msgid "Installing remote package"
 msgstr "ÅãêáôÜóôáóç áðïìáêñõóìÝíïõ ðáêÝôïõ"
 
-#: components/services/install-view/nautilus-service-install-view.c:899
+#: components/services/install-view/nautilus-service-install-view.c:901
 msgid "Installing some package"
 msgstr "ÅãêáôÜóôáóç êÜðïéïõ ðáêÝôïõ"
 
-#: components/services/install-view/nautilus-service-install-view.c:916
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
@@ -3185,23 +3176,23 @@ msgstr ""
 "Ëåßðåé ç õðçñåóßá åãêáôÜóôáóçò Eazel:\n"
 "Ç åãêáôÜóôáóç äå èá ëåéôïõñãÞóåé."
 
-#: components/services/install-view/nautilus-service-install-view.c:965
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr "Óýíäåóç ìå ôïí ÊáôÜëïãï Ëïãéóìéêïý Eazel ..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1023
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr "¸ëåã÷ïò Üäåéáò óýíäåóçò..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1095
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr "ÅãêáôÜëåéøç ìåôáöïñôþóåùí ðáêÝôùí (ðáñáêáëþ ðåñéìÝíåôå) ..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1115
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "Ç ìåôáöüñôùóç ðáêÝôùí äéáêüðçêå."
 
-#: components/services/install-view/nautilus-service-install-view.c:1116
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "Äéáêüðçêå."
 
@@ -3485,13 +3476,13 @@ msgid "Services Login"
 msgstr "Áõèåíôéêïðïßçóç óôéò Õðçñåóßåò"
 
 #: components/services/summary/nautilus-summary-dialogs.c:131
-#: libnautilus-extensions/nautilus-password-dialog.c:269
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "¼íïìá ÷ñÞóôç:"
 
 #
 #: components/services/summary/nautilus-summary-dialogs.c:138
-#: libnautilus-extensions/nautilus-password-dialog.c:276
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "Êùäéêüò:"
 
@@ -3562,7 +3553,7 @@ msgstr "Õðçñåóßåò"
 msgid "Featured Downloads"
 msgstr "Îå÷ùñéóôÝò Ìåôáöïñôþóåéò"
 
-#: components/services/summary/nautilus-summary-view.c:883
+#: components/services/summary/nautilus-summary-view.c:884
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
 "unavailable right now, or your computer might be configured incorrectly. "
@@ -3572,7 +3563,7 @@ msgstr ""
 "åîõðçñåôçôÞò ìðïñåß íá åßíáé ìç ðñïóâÜóéìïò áõôÞ ôç óôéãìÞ Þ ï õðïëïãéóôÞò "
 "íá ìçí Ý÷åé ñõèìéóôåß óùóôÜ. Ðáñáêáëþ åðéêïéíùíåßóôå ìå support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:893
+#: components/services/summary/nautilus-summary-view.c:894
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3580,7 +3571,7 @@ msgstr ""
 "ÂñÝèçêå ðñüâëçìá ìå ôá äåäïìÝíá õðçñåóéþí óôïõò åîõðçñåôçôÝò ôçò Eazel. "
 "Ðáñáêáëþ åðéêïéíùíåßóôå ìå support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:916
+#: components/services/summary/nautilus-summary-view.c:917
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
 "contact support@eazel.com."
@@ -3588,7 +3579,7 @@ msgstr ""
 "Ëåßðïõí ðëçñïöïñßåò áðü ôá äåäïìÝíá ðïõ Ý÷ïõí åðáíáêáôåõèõíèåß óôïõò "
 "åîõðçñåôçôÝò ôçò Eazel. Ðáñáêáëþ åðéêïéíùíåßóôå ìå support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:958
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
 "now, or your computer might be configured incorrectly. You could try again "
@@ -3598,7 +3589,7 @@ msgstr ""
 "ìðïñåß íá åßíáé ìç ðñïóâÜóéìïò áõôÞ ôç óôéãìÞ Þ ï õðïëïãéóôÞò íá ìçí Ý÷åé "
 "ñõèìéóôåß óùóôÜ. Ìðïñåßôå íá äïêéìÜóåôå îáíÜ áñãüôåñá."
 
-#: components/services/summary/nautilus-summary-view.c:968
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3606,12 +3597,12 @@ msgstr ""
 "Åìöáíßóôçêå ðñüâëçìá ìå äåäïìÝíá ðïõ Ý÷ïõí åðáíáêáôåõèõíèåß óôïõò "
 "åîõðçñåôçôÝò ôçò Eazel. Ðáñáêáëþ åðéêïéíùíåßóôå ìå support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:985
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr "Áðïôõ÷ßá áðïóôïëÞò áðïãñáöÞò óõóôÞìáôïò."
 
 #
-#: components/services/summary/nautilus-summary-view.c:1048
+#: components/services/summary/nautilus-summary-view.c:1049
 #: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr "Õðçñåóßåò Eazel"
@@ -3725,51 +3716,74 @@ msgstr "üøç-äåßãìá õðçñåóéþí eazel"
 msgid "Factory for the sample service"
 msgstr "ÅñãïóôÜóéï ãéá ôçí õðçñåóßá-äåßãìá"
 
-#: components/text/nautilus-text-view.c:326
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr ""
 "Óõããíþìç, áëëÜ ôï %s åßíáé õðåñâïëéêÜ ìåãÜëï ãéá íá ôï öïñôþóåé üëï ï "
 "Íáõôßëïò."
 
-#: components/text/nautilus-text-view.c:329
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr "Ôï áñ÷åßï åßíáé ðïëý ìåãÜëï"
 
 #: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "ÃñáììáôïóåéñÝò"
+
+#: components/text/nautilus-text-view-ui.xml.h:2
 msgid "Lucida"
 msgstr "Lucida"
 
-#: components/text/nautilus-text-view-ui.xml.h:2
+#: components/text/nautilus-text-view-ui.xml.h:3
 msgid "Use the Courier Font"
 msgstr "×ñÞóç ÃñáììáôïóåéñÜò Courier"
 
-#: components/text/nautilus-text-view-ui.xml.h:3
+#
+#: components/text/nautilus-text-view-ui.xml.h:4
+#, fuzzy
+msgid "Use the Fixed Font"
+msgstr "×ñÞóç ÃñáììáôïóåéñÜò Times"
+
+#
+#: components/text/nautilus-text-view-ui.xml.h:5
+#, fuzzy
+msgid "Use the GTK System Font"
+msgstr "×ñÞóç ÃñáììáôïóåéñÜò Times"
+
+#: components/text/nautilus-text-view-ui.xml.h:6
 msgid "Use the Helvetica Font"
 msgstr "×ñÞóç ÃñáììáôïóåéñÜò Helvetica"
 
-#: components/text/nautilus-text-view-ui.xml.h:4
+#: components/text/nautilus-text-view-ui.xml.h:7
 msgid "Use the Lucida Font"
 msgstr "×ñÞóç ÃñáììáôïóåéñÜò Lucida"
 
 #
-#: components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:8
 msgid "Use the Times Font"
 msgstr "×ñÞóç ÃñáììáôïóåéñÜò Times"
 
-#: components/text/nautilus-text-view-ui.xml.h:6
+#: components/text/nautilus-text-view-ui.xml.h:9
 msgid "_Courier"
 msgstr "_Courier"
 
-#: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
-msgstr "_ÃñáììáôïóåéñÝò"
+#
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "_Áñ÷åßï"
 
-#: components/text/nautilus-text-view-ui.xml.h:8
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
 msgid "_Helvetica"
 msgstr "_Helvetica"
 
-#: components/text/nautilus-text-view-ui.xml.h:9
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr "_Times"
 
@@ -3842,7 +3856,7 @@ msgid "Nautilus Tree view"
 msgstr "¼øç ÄÝíôñïõ ôïõ Íáõôßëïõ"
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:700
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr "ÄÝíôñï"
 
@@ -3854,7 +3868,7 @@ msgstr "ÖÜíôáóìá"
 msgid "Azul"
 msgstr "Ìðëå"
 
-#: data/browser.xml.h:3 libnautilus-extensions/nautilus-font-picker.c:89
+#: data/browser.xml.h:3
 msgid "Black"
 msgstr "Ìáýñï"
 
@@ -4073,7 +4087,7 @@ msgstr "Áñéèìïß"
 
 #
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1110
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "ÅíôÜîåé"
 
@@ -4199,12 +4213,12 @@ msgid "The Gimp"
 msgstr "Ôï Gimp"
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "ÅðéöÜíåéá åñãáóßáò"
 
 #
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4827
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
 #: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
@@ -4241,7 +4255,7 @@ msgid "Google"
 msgstr "Google"
 
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:875
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "Ìç÷áíÝò ÁíáæÞôçóçò"
 
@@ -4501,86 +4515,86 @@ msgstr "-greek-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2270
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr "óÞìåñá óôéò %-I:%M %p"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2275
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr "÷ôåò óôéò %-I:%M %p"
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2280
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%A %-m/%-d/%y at %-I:%M %p"
 
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2285
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%-m/%-d/%y at %-I:%M %p"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 áíôéêåßìåíá"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr "0 öÜêåëïé"
 
-#: libnautilus-extensions/nautilus-file.c:3417
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 áñ÷åßá"
 
-#: libnautilus-extensions/nautilus-file.c:3421
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 áíôéêåßìåíï"
 
-#: libnautilus-extensions/nautilus-file.c:3421
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr " 1 öÜêåëïò"
 
-#: libnautilus-extensions/nautilus-file.c:3422
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 áñ÷åßï"
 
-#: libnautilus-extensions/nautilus-file.c:3425
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "%u áíôéêåßìåíá"
 
-#: libnautilus-extensions/nautilus-file.c:3425
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr "%u öÜêåëïé"
 
-#: libnautilus-extensions/nautilus-file.c:3426
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u áñ÷åßá"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3733
-#: libnautilus-extensions/nautilus-file.c:3748
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr "; áíôéêåßìåíá"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3739
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr "; byte"
 
-#: libnautilus-extensions/nautilus-file.c:3752
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "Üãíùóôïò ôýðïò"
 
-#: libnautilus-extensions/nautilus-file.c:3754
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "Üãíùóôï åßäïò MIME"
 
@@ -4588,15 +4602,15 @@ msgstr "Üãíùóôï åßäïò MIME"
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3759
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "Üãíùóôï"
 
-#: libnautilus-extensions/nautilus-file.c:3795
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr "ðñüãñáììá"
 
-#: libnautilus-extensions/nautilus-file.c:3807
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
@@ -4606,7 +4620,7 @@ msgstr ""
 "Áõôü ðéèáíüôáôá óçìáßíåé üôé ôï áñ÷åßï óáò gnome-vfs.keys åßíáé óå ëÜèïò "
 "ìÝñïò Þ äå ìðïñåß íá âñåèåß ãéá êÜðïéï Üëëï ëüãï."
 
-#: libnautilus-extensions/nautilus-file.c:3811
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
@@ -4615,7 +4629,7 @@ msgstr ""
 "Äå âñÝèçêå ðåñéãñáöÞ ãéá ôï åßäïò ÌÉÌÅ \"%s\" (ôï áñ÷åßï åßíáé \"%s\"), "
 "åíçìåñþóôå ôïí aaron@eazel.com"
 
-#: libnautilus-extensions/nautilus-file.c:3825
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "óýíäåóìïò"
 
@@ -4623,29 +4637,29 @@ msgstr "óýíäåóìïò"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1195
-#: libnautilus-extensions/nautilus-file.c:3831
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr "óýíäåóìïò óôï %s"
 
-#: libnautilus-extensions/nautilus-file.c:3845
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr "óýíäåóìïò (óðáóìÝíïò)"
 
 #
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:424
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "Áðü:"
 
 #
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:439
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "Ðñüò:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:627
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4657,7 +4671,7 @@ msgstr ""
 "Ôï \"%s\" äå ìðïñåß íá ìåôáêéíçèåß äéüôé âñßóêåôáé óå äßóêï ìüíï ãéá "
 "áíÜãíùóç."
 
-#: libnautilus-extensions/nautilus-file-operations.c:638
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4670,7 +4684,7 @@ msgstr ""
 "Ôï \"%s\" äå ìðïñåß íá ìåôáêéíçèåß äéüôé äåí Ý÷åôå äéêáßùìáôá ôñïðïðïßçóçò "
 "óôï ãïíéêü öÜêåëï."
 
-#: libnautilus-extensions/nautilus-file-operations.c:644
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4681,7 +4695,7 @@ msgstr ""
 "\n"
 "Ôï \"%s\" äå ìðïñåß íá äéáãñáöåß äéüôé âñßóêåôáé óå äßóêï ìüíï ãéá áíÜãíùóç. "
 
-#: libnautilus-extensions/nautilus-file-operations.c:675
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4694,7 +4708,7 @@ msgstr ""
 "Ôï \"%s\" äå ìðïñåß íá ìåôáêéíçèåß äéüôé äåí Ý÷åôå äéêáßùìáôá ôñïðïðïßçóçò "
 "óôï ãïíéêü öÜêåëï."
 
-#: libnautilus-extensions/nautilus-file-operations.c:682
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4707,7 +4721,7 @@ msgstr ""
 "Ôï \"%s\" äå ìðïñåß íá ìåôáêéíçèåß óôá Áðïññßììáôá äéüôé äåí Ý÷åôå äéêáßùìá "
 "ôñïðïðïßçóçò óôï ãïíéêü öÜêåëï."
 
-#: libnautilus-extensions/nautilus-file-operations.c:706
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -4718,7 +4732,7 @@ msgstr ""
 "\n"
 "Ôï \"%s\" äå ìðïñåß íá áíôéãñáöåß äéüôé äåí Ý÷åôå äéêáßùìá áíÜãíùóÞò ôïõ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:728
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4729,7 +4743,7 @@ msgstr ""
 "\n"
 "Äåí õðÜñ÷åé äéáèÝóéìïò ÷þñïò óôï ðñïïñéóìü."
 
-#: libnautilus-extensions/nautilus-file-operations.c:733
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4740,7 +4754,7 @@ msgstr ""
 "\n"
 "Äåí õðÜñ÷åé äéáèÝóéìïò ÷þñïò óôï ðñïïñéóìü."
 
-#: libnautilus-extensions/nautilus-file-operations.c:737
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4751,7 +4765,7 @@ msgstr ""
 "\n"
 "Äåí õðÜñ÷åé äéáèÝóéìïò ÷þñïò óôï ðñïïñéóìü."
 
-#: libnautilus-extensions/nautilus-file-operations.c:749
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4762,7 +4776,7 @@ msgstr ""
 "\n"
 "Äåí Ý÷åôå äéêáßùìá åããñáöÞò óå áõôü ôï öÜêåëï."
 
-#: libnautilus-extensions/nautilus-file-operations.c:753
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4773,7 +4787,7 @@ msgstr ""
 "\n"
 "Ï äßóêïò ðñïïñéóìïý åßíáé ìüíï ãéá áíÜãíùóç."
 
-#: libnautilus-extensions/nautilus-file-operations.c:760
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4784,7 +4798,7 @@ msgstr ""
 "\n"
 "Äåí Ý÷åôå äéêáßùìá åããñáöÞò óå áõôü ôï öÜêåëï."
 
-#: libnautilus-extensions/nautilus-file-operations.c:764
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4795,7 +4809,7 @@ msgstr ""
 "\n"
 "Ï äßóêïò ðñïïñéóìïý åßíáé ìüíï ãéá áíÜãíùóç."
 
-#: libnautilus-extensions/nautilus-file-operations.c:771
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4806,7 +4820,7 @@ msgstr ""
 "\n"
 "Äåí Ý÷åôå äéêáßùìá åããñáöÞò óå áõôü ôï öÜêåëï."
 
-#: libnautilus-extensions/nautilus-file-operations.c:775
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4817,7 +4831,7 @@ msgstr ""
 "\n"
 "Ï äßóêïò ðñïïñéóìïý åßíáé ìüíï ãéá áíÜãíùóç."
 
-#: libnautilus-extensions/nautilus-file-operations.c:804
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4828,7 +4842,7 @@ msgstr ""
 "\n"
 "ÈÝëåôå íá óõíå÷ßóåôå;"
 
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4839,7 +4853,7 @@ msgstr ""
 "\n"
 "ÈÝëåôå íá óõíå÷ßóåôå;"
 
-#: libnautilus-extensions/nautilus-file-operations.c:812
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4850,7 +4864,7 @@ msgstr ""
 "\n"
 "ÈÝëåôå íá óõíå÷ßóåôå;"
 
-#: libnautilus-extensions/nautilus-file-operations.c:818
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4861,7 +4875,7 @@ msgstr ""
 "\n"
 "ÈÝëåôå íá óõíå÷ßóåôå;"
 
-#: libnautilus-extensions/nautilus-file-operations.c:833
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4872,7 +4886,7 @@ msgstr ""
 "\n"
 "ÈÝëåôå íá óõíå÷ßóåôå;"
 
-#: libnautilus-extensions/nautilus-file-operations.c:837
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4883,7 +4897,7 @@ msgstr ""
 "\n"
 "ÈÝëåôå íá óõíå÷ßóåôå;"
 
-#: libnautilus-extensions/nautilus-file-operations.c:841
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4894,7 +4908,7 @@ msgstr ""
 "\n"
 "ÈÝëåôå íá óõíå÷ßóåôå;"
 
-#: libnautilus-extensions/nautilus-file-operations.c:847
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4905,34 +4919,34 @@ msgstr ""
 "\n"
 "ÈÝëåôå íá óõíå÷ßóåôå;"
 
-#: libnautilus-extensions/nautilus-file-operations.c:963
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "ÓöÜëìá êáôÜ ôçí áíôéãñáöÞ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:966
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "ÓöÜëìá êáôÜ ôç ìåôáöïñÜ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:969
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "ÓöÜëìá êáôÜ ôç óýíäåóç."
 
-#: libnautilus-extensions/nautilus-file-operations.c:974
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "ÓöÜëìá êáôÜ ôç äéáãñáöÞ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:999
-#: libnautilus-extensions/nautilus-file-operations.c:1018
-#: libnautilus-extensions/nautilus-file-operations.c:1132
-#: libnautilus-extensions/nautilus-file-operations.c:1146
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "ÐñïóðÝñáóç"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1018
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "ÅðáíÜëçøç"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1096
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4945,7 +4959,7 @@ msgstr ""
 "íá äéáãñáöåß.\n"
 "Áí èÝëåôå íá ìåôáêéíÞóåôå ôï \"%s\", ìåôïíïìÜóôå ôï êáé äïêéìÜóôå îáíÜ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1102
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4960,11 +4974,11 @@ msgstr ""
 "Áí èÝëåôå óßãïõñá íá áíôéãñÜøåôå ôï \"%s\", ìåôïíïìÜóôå ôï êáé äïêéìÜóôå "
 "îáíÜ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1110
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "Áäýíáôç ç áíôéêáôÜóôáóç áñ÷åßïõ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1120
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4975,22 +4989,22 @@ msgstr ""
 "\n"
 "ÈÝëåôå íá ôï áíôéêáôáóôÞóåôå;"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1131
-#: libnautilus-extensions/nautilus-file-operations.c:1145
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "Óýãêñïõóç êáôÜ ôçí áíôéãñáöÞ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1132
-#: libnautilus-extensions/nautilus-file-operations.c:1146
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "ÁíôéêáôÜóôáóç"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1146
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Αντικατάσταση Όλων"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1199
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "Üëëïò óýíäåóìïò óôï %s"
@@ -4999,25 +5013,25 @@ msgstr "Üëëïò óýíäåóìïò óôï %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1215
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dïò óýíäåóìïò óôï %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1219
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dïò óýíäåóìïò óôï %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1223
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%dïò óýíäåóìïò óôï %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1227
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dïò óýíäåóìïò óôï %s"
@@ -5027,236 +5041,228 @@ msgstr "%dïò óýíäåóìïò óôï %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1247
-#: libnautilus-extensions/nautilus-file-operations.c:2254
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (áíôßãñáöï)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1249
-#: libnautilus-extensions/nautilus-file-operations.c:2254
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (åðéðëÝïí áíôßãñáöï)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1251
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr "ôï áíôßãñáöï)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1253
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr "ñï áíôßãñáöï)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1255
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr "ôï áíôßãñáöï)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1257
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr "íéïóôü áíôßãñáöï)"
 
 #
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1267
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (áíôßãñáöï)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1269
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (Üëëï áíôßãñáöï)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1271
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dôï áíôßãñáöï)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1273
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dñï áíôßãñáöï)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1275
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%dôï áíôßãñáöï)%s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1277
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d-óôü áíôßãñáöï)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1361
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1369
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1526
-#: libnautilus-extensions/nautilus-file-operations.c:2084
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "¶ãíùóôï GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1814
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "ÌåôáöïñÜ áñ÷åßùí óôá Áðïññßìáôá"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1816
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr "Áñ÷åßá ðïõ ðåôÜ÷ôçêáí:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1818
-#: libnautilus-extensions/nautilus-file-operations.c:1833
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "Ãßíåôå ìåôáêßíçóç"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "Ðñïåôïéìáóßá ÌåôáöïñÜò óôá Áðïññßìáôá..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1829
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "Ìåôáêßíçóç áñ÷åßùí"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1831
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "Áñ÷åßá ðïõ ìåôáêéíÞèçêáí:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1834
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "Ðñïåôïéìáóßá Ãéá Ìåôáêßíçóç..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "ÏëïêëÞñùóç Ìåôáêßíçóçò..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1847
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "Äçìéïõñãßá óõíäÝóìùí óôá áñ÷åßá"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1849
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "Áñ÷åßá ðïõ óõíäÝèçêáí:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1851
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "Óýíäåóç"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "Ðñïåôïéìáóßá Äçìéïõñãßáò ÓõíäÝóìùí..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "ÏëïêëÞñùóç Äçìéïõñãßáò ÓõíäÝóìùí..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1860
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "ÁíôéãñáöÞ áñ÷åßùí"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1862
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "Áñ÷åßá ðïõ áíôéãñÜöçóáí:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1864
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "ÁíôéãñáöÞ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1865
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "Ðñïåôïéìáóßá Ãéá ÁíôéãñáöÞ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1883
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "Äå ìðïñåßôå íá áíôéãñÜøåôå ôá áíôéêåßìåíá óôá Áðïññßììáôá."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1884
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "Äå ìðïñåß íá ãßíåé ÁíôéãñáãÞ óôá Áðïññßìáôá"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1911
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "Ôá Áðïññßìáôá ðñÝðåé íá ðáñáìåßíïõí óôçí åðéöÜíåéáò åñãáóßáò."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1912
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "Äå ìðïñåßôå íá ìåôáêéíÞóåôå ôïí öÜêåëï áðïññéììÜôùí."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1914
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "Äå ìðïñåßôå íá áíôéãñÜøåôå ôá Áðïññßìáôá."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1915
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "Äå ìðïñåßôå íá áíôéãñÜøåôå áõôüí ôï öÜêåëï áðïññéììÜôùí."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1917
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Äå ìðïñåßôå íá ÁëëÜîåôå ôç ÈÝóç ôùí ÁðïññéìÜôùí"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1918
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Áäýíáôç ç ÁíôéãñáöÞ ôùí ÁðïññéìÜôùí"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1941
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "Äå ìðïñåßôå íá ìåôáêéíÞóåôå Ýíá öÜêåëï ìÝóù óôï åáõôü ôïõ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1942
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "Äå ìðïñåßôå íá áíôéãñÜøåôå Ýíá öÜêåëï óôïí åáõôü ôïõ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1944
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "Áäýíáôç ç ÌåôáöïñÜ ÌÝóá óôï ºäéï"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1945
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "Áäýíáôç ç ÁíôéãñáãÞ ÌÝóá óôï ºäéï"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1958
-msgid "You cannot move a file onto itself."
-msgstr "Äå ìðïñåßôå íá ìåôáêéíÞóåôå Ýíá áñ÷åßï ðÜíù óôï ßäéï ôï áñ÷åßï."
-
-#: libnautilus-extensions/nautilus-file-operations.c:1959
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "Äå ìðïñåßôå íá áíôéãñÜøåôå Ýíá áñ÷åßï ðÜíù óôï ßäéï ôï áñ÷åßï."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1961
-msgid "Can't Move Onto Self"
-msgstr "Áäýíáôç ç Ìåôáêßíçóç ÐÜíù óôï ºäéï"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1962
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "Áäýíáôç ç ÁíôéãñáöÞ ÐÜíù óôï ºäéï"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2013
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5266,7 +5272,7 @@ msgstr ""
 "\n"
 "Äåí Ý÷åôå äéêáßùìá åããñáöÞò óôïí ðñïïñéóìü."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2016
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5276,728 +5282,676 @@ msgstr ""
 "\n"
 "Äåí õðÜñ÷åé äéáèÝóéìïò ÷þñïò óôïí ðñïïñéóìü."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2019
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "ÓöÜëìá \"%s\" êáôÜ ôç äçìéïõñãßá íÝïõ öáêÝëïõ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2023
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "ÓöÜëìá äçìéïõñãßáò íÝïõ öáêÝëïõ"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2110
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "áíþíõìïò öÜêåëïò"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2143
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "ÄéáãñáöÞ áñ÷åßùí"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2145
-#: libnautilus-extensions/nautilus-file-operations.c:2180
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "ÄéåãñáììÝíá áñ÷åßá:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2147
-#: libnautilus-extensions/nautilus-file-operations.c:2182
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "ÄéáãñÜöïíôáé"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2148
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "Ðñïåôïéìáóßá ãéá ÄéáãñáöÞ áñ÷åßùí..."
 
 #
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2178
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "¶äåéáóìá ôùí ÁðïññéìÜôùí"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2183
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Ðñïåôïéìáóßá ÁäåéÜóìáôïò ôùí ÁðïññéììÜôùí..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2214
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr ""
 "Åßóôå âÝâáéïé üôé èÝëåôå íá äéáãñÜøåôå ïñéóôéêÜ üëá ôá ðåñéå÷üìåíÜ ôùí "
 "ÁðïññéììÜôùí;"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2216
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "ÄéáãñáöÞ Ðåñéå÷ïìÝíùí ÁðïññéììÜôùí;"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2217
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "Êåíü"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "öïõ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2255
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "öïõ (áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".öïõ.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".öïõ (áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "öïõ öïõ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "öïõ öïõ (áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "öïõ.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "öïõ (áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2260
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "öïõ öïõ.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2260
-#: libnautilus-extensions/nautilus-file-operations.c:2282
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "öïõ öïõ (áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2261
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "öïõ öïõ.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2261
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "öïõ öïõ (áíôßãñáöï).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2262
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "öïõ...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2262
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "öïõ... (áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "öïõ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "öïõ... (áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "öïõ. (áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "öïõ. (Üëëï áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2265
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "öïõ (Üëëï áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2266
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "öïõ (Üëëï áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "öïõ (3ôï áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "öïõ (3ôï áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "öïõ öïõ (Üëëï áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "öïõ öïõ (3ôï áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2274
 msgid "foo (13th copy)"
 msgstr "öïõ (13ôï áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2274
 msgid "foo (14th copy)"
 msgstr "öïõ (14ôï áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2271
+#: libnautilus-extensions/nautilus-file-operations.c:2275
 msgid "foo (13th copy).txt"
 msgstr "öïõ (13ôï áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2271
+#: libnautilus-extensions/nautilus-file-operations.c:2275
 msgid "foo (14th copy).txt"
 msgstr "öïõ (14ôï áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2272
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "öïõ (21ôï áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2272
-#: libnautilus-extensions/nautilus-file-operations.c:2274
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "öïõ (22ñï áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2273
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "öïõ (21ôï áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2273
-#: libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "öïõ (22ñï áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2274
-#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "öïõ (23ôï áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2275
-#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "öïõ (23ôï áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2276
-#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "öïõ (24ôï áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2277
-#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "öïõ (24ôï áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "öïõ (25ôï áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "öïõ (25ôï áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "öïõ öïõ (24ôï áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "öïõ öïõ (25ôï áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "öïõ öïõ (24ôï áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "öïõ öïõ (25ôï áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2282
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "öïõ öïõ (100000000000000ôï áíôßãñáöï).txt"
 
 #. FIXME bugzilla.eazel.com 7701: These are wrong.
-#: libnautilus-extensions/nautilus-file-operations.c:2285
+#: libnautilus-extensions/nautilus-file-operations.c:2289
 msgid "foo (10th copy)"
 msgstr "öïõ (10ôï áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2285
+#: libnautilus-extensions/nautilus-file-operations.c:2289
 msgid "foo (11st copy)"
 msgstr "öïõ (11ôï áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2286
+#: libnautilus-extensions/nautilus-file-operations.c:2290
 msgid "foo (10th copy).txt"
 msgstr "öïõ (10ôï áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2286
+#: libnautilus-extensions/nautilus-file-operations.c:2290
 msgid "foo (11st copy).txt"
 msgstr "öïõ (11ôï áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2287
+#: libnautilus-extensions/nautilus-file-operations.c:2291
 msgid "foo (11th copy)"
 msgstr "öïõ (11ôï áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2287
+#: libnautilus-extensions/nautilus-file-operations.c:2291
 msgid "foo (12nd copy)"
 msgstr "öïõ (12ôï áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2288
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 msgid "foo (11th copy).txt"
 msgstr "öïõ (11ôï áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2288
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 msgid "foo (12nd copy).txt"
 msgstr "öïõ (12ôï áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2289
+#: libnautilus-extensions/nautilus-file-operations.c:2293
 msgid "foo (12th copy)"
 msgstr "öïõ (12ôï áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2289
+#: libnautilus-extensions/nautilus-file-operations.c:2293
 msgid "foo (13rd copy)"
 msgstr "öïõ (13ôï áíôßãñáöï)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2290
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 msgid "foo (12th copy).txt"
 msgstr "öïõ (12ôï áíôßãñáöï).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2290
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 msgid "foo (13rd copy).txt"
 msgstr "öïõ (13ôï áíôßãñáöï).txt"
 
 #
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld áðü %ld"
 
-#: libnautilus-extensions/nautilus-font-picker.c:80
-msgid "Normal"
-msgstr "Êáíïíéêü"
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
+msgid "GConf Error"
+msgstr "ÓöÜëìá GConf"
 
 #
-#: libnautilus-extensions/nautilus-font-picker.c:81
-#: libnautilus-extensions/nautilus-volume-monitor.c:493
-#: libnautilus-extensions/nautilus-volume-monitor.c:512
-msgid "Unknown"
-msgstr "¶ãíùóôï"
-
-#: libnautilus-extensions/nautilus-font-picker.c:87
-msgid "Bold"
-msgstr "Óêïýñï"
+#. Constants
+#: libnautilus-extensions/nautilus-global-preferences.c:50
+msgid "Nautilus Preferences"
+msgstr "Ðñïôéìßóåéò Íáõôßëïõ"
 
-#: libnautilus-extensions/nautilus-font-picker.c:88
-msgid "Book"
-msgstr "Âéâëßï"
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "ðÜíôá"
 
-#: libnautilus-extensions/nautilus-font-picker.c:90
-msgid "Demibold"
-msgstr "Çìéóêïýñï"
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "ÐÜíôá"
 
-#: libnautilus-extensions/nautilus-font-picker.c:91
-msgid "Light"
-msgstr "Öùôåéíü"
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "ôïðéêÜ ìüíï"
 
-#: libnautilus-extensions/nautilus-font-picker.c:97
-msgid "Italic"
-msgstr "ÐëÜãéá"
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "Ìüíï ÔïðéêÜ Áñ÷åßá"
 
 #
-#: libnautilus-extensions/nautilus-font-picker.c:98
-msgid "Oblique"
-msgstr "ËïîÜ"
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "ðïôÝ"
 
 #
-#: libnautilus-extensions/nautilus-font-picker.c:99
-msgid "Reverse Italic"
-msgstr "ÁíÜðïäá ÐëÜãéá"
-
-#: libnautilus-extensions/nautilus-font-picker.c:100
-msgid "Reverse Oblique"
-msgstr "ÁíÜðïäá ËïîÜ"
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "ÐïôÝ"
 
-#: libnautilus-extensions/nautilus-font-picker.c:107
-msgid "Condensed"
-msgstr "ÓõìðéåóìÝíá"
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "Ïìáëüôåñá ÃñáöéêÜ"
 
-#: libnautilus-extensions/nautilus-font-picker.c:108
-msgid "Semicondensed"
-msgstr "¹ìéóõìðéåóìÝíá"
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "×ñÞóç ïìáëüôåñùí (áëëÜ áñãüôåñùí) ãñáöéêþí"
 
-#. The title label
-#: libnautilus-extensions/nautilus-font-picker.c:245
-msgid "Pick A Font"
-msgstr "ÅðéëïãÞ ÃñáììáôïóåéñÜò"
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "ÃñáììáôïóåéñÝò"
 
-#
-#: libnautilus-extensions/nautilus-font-picker.c:434
-msgid "More..."
-msgstr "Ðåñéóóüôåñá..."
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+#, fuzzy
+msgid "Font for Icon view:"
+msgstr "ÅñãïóôÜóéï ãéá üøç ìïõóéêÞò"
 
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
-msgid "GConf Error"
-msgstr "ÓöÜëìá GConf"
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
+msgstr ""
 
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:956
-msgid "fixed"
-msgstr "grfixed"
-
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1427
-msgid "01/01/00, 01:00 AM"
-msgstr "01/01/00, 01:00 ðì"
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "ÅñãïóôÜóéï ãéá üøçò éóôïñéêïý"
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1428
-msgid "1/1/00, 1:00 AM"
-msgstr "1/1/00, 1:00 ðì"
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1429
-msgid " 1/ 1/00,  1:00 AM"
-msgstr " 1/ 1/00,  1:00 ðì"
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
 
-#
-#. Constants
-#: libnautilus-extensions/nautilus-global-preferences.c:50
-msgid "Nautilus Preferences"
-msgstr "Ðñïôéìßóåéò Íáõôßëïõ"
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "×ñÞóç ôïõ Íáõôßëïõ óôç ó÷åäßáóç ôçò åðéöÜíåéáò åñãáóßáò"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:97
-msgid "current theme"
-msgstr "ôñÝ÷ùí èÝìá"
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
+msgstr "¶íïéãìá ÍÝùí Ðáñáèýñùí"
 
 #
-#: libnautilus-extensions/nautilus-global-preferences.c:100
+#: libnautilus-extensions/nautilus-global-preferences.c:651
 msgid "Open each file or folder in a separate window"
 msgstr "¶íïéãìá êÜèå áñ÷åßï Þ öÜêåëï óå îå÷ùñéóôü ðáñÜèõñï"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:103
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+msgid "Display toolbar in new windows"
+msgstr "ÅìöÜíéóç ôçò åñãáëåéïèÞêçò óôá íÝá ðáñÜèõñá"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "ÅìöÜíéóç ìðÜñáò ôïðïèåóßáò óôá íÝá ðáñÜèõñá"
+
+#
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "ÅìöÜíéóç ìðÜñáò êáôÜóôáóçò óôá íÝá ðáñÜèõñá"
+
+#
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "ÅìöÜíéóç ðëÜãéáò ìðÜñáò óôá íÝá ðáñÜèõñá"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "ÓõìðåñéöïñÜ ÁðïññéììÜôùí"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:686
 msgid "Ask before emptying the Trash or deleting files"
 msgstr "Åñþôçóç ðñéí ôï Üäåéáóìá ôùí ÁðïññéììÜôùí Þ ôç äéáãñáöÞ áñ÷åßùí"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:106
+#: libnautilus-extensions/nautilus-global-preferences.c:693
 msgid "Include a Delete command that bypasses Trash"
 msgstr "Óõìðåñßëçøç ìéáò åíôïëÞò ÄéáãñáöÞò ðïõ ðáñáêÜìðôåé ôá Áðïññßììáôá"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:109
-#: libnautilus-extensions/nautilus-global-preferences.c:649
-msgid "Click Behavior"
-msgstr "ÓõìðåñéöïñÜ ÐáôÞìáôïò"
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr "Óõíôïìåýóåéò ÊåéìÝíïõ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr "×ñÞóç óõíôïìåýóåùí ðëçêôñïëïãßïõ ôýðïõ-Emacs óôá ðåäßá êåéìÝíïõ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:112
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 msgid "single"
 msgstr "ìïíü"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:113
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "Åíåñãïðïßçóç áíôéêåéìÝíùí ìå Ýíá ðÜôçìá"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:117
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "äéðëü"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:118
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "Åíåñãïðïßçóç áíôéêåéìÝíùí ìå äéðëü ðÜôçìá"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:122
-#: libnautilus-extensions/nautilus-global-preferences.c:657
-msgid "Executable Text Files"
-msgstr "ÅêôåëÝóéìá Áñ÷åßá ÊåéìÝíïõ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:125
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 msgid "launch"
 msgstr "åêêßíçóç"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:126
+#: libnautilus-extensions/nautilus-global-preferences.c:726
 msgid "Execute files when they are clicked"
 msgstr "ÅêôÝëåóç áñ÷åßùí üôáí ðáôçèïýí ìßá öïñÜ"
 
 #
-#: libnautilus-extensions/nautilus-global-preferences.c:130
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 msgid "display"
 msgstr "åìöÜíéóç"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:131
+#: libnautilus-extensions/nautilus-global-preferences.c:730
 msgid "Display files when they are clicked"
 msgstr "ÅìöÜíéóç ôùí áñ÷åßùí üôáí ðáôçèïýí"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:135
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 msgid "ask"
 msgstr "åñþôçóç"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:136
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 msgid "Ask each time"
 msgstr "Åñþôçóç êÜèå öïñÜ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:146
-#: libnautilus-extensions/nautilus-global-preferences.c:789
-msgid "Show Text in Icons"
-msgstr "ÅìöÜíéóç ÊåéìÝíïõ óôá Åéêïíßäéá"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:149
-#: libnautilus-extensions/nautilus-global-preferences.c:797
-msgid "Show Count of Items in Folders"
-msgstr "ÅìöÜíéóç ÌåôñçôÞ ÁíôéêåéìÝíùí óôïõò ÖáêÝëïõò"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:152
-#: libnautilus-extensions/nautilus-global-preferences.c:805
-msgid "Show Thumbnails for Image Files"
-msgstr "ÅìöÜíéóç ÄåéãìÜôùí ãéá Áñ÷åßá Åéêüíùí"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:155
-#: libnautilus-extensions/nautilus-global-preferences.c:822
-msgid "Make Folder Appearance Details Public"
-msgstr "Íá ãßíïõí ïé ËåðôïìÝñåéåò Ðáñïõóéáóôéêïý ôïõ ÖáêÝëïõ Äçìüóéåò"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-#: libnautilus-extensions/nautilus-global-preferences.c:813
-msgid "Preview Sound Files"
-msgstr "Ðñïåðéóêüðéóç Áñ÷åßùí ¹÷ïõ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-msgid "Use smoother (but slower) graphics"
-msgstr "×ñÞóç ïìáëüôåñùí (áëëÜ áñãüôåñùí) ãñáöéêþí"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Use this font to display non-smooth text:"
-msgstr ""
-"×ñÞóç áõôÞò ôçò ãñáììáôïóåéñÜò óôçí åìöÜíéóç ìç-ïìáëïðïéçìÝíïõ êåéìÝíïõ:"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-msgid "Use this font to display smooth text:"
-msgstr ""
-"×ñÞóç áõôÞò ôçò ãñáììáôïóåéñÜò óôçí åìöÜíéóç ïìáëïðïéçìÝíïõ êåéìÝíïõ:"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:170
-msgid "Display toolbar in new windows"
-msgstr "ÅìöÜíéóç ôçò åñãáëåéïèÞêçò óôá íÝá ðáñÜèõñá"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:173
-msgid "Display location bar in new windows"
-msgstr "ÅìöÜíéóç ìðÜñáò ôïðïèåóßáò óôá íÝá ðáñÜèõñá"
-
-#
-#: libnautilus-extensions/nautilus-global-preferences.c:176
-msgid "Display status bar in new windows"
-msgstr "ÅìöÜíéóç ìðÜñáò êáôÜóôáóçò óôá íÝá ðáñÜèõñá"
-
-#
-#: libnautilus-extensions/nautilus-global-preferences.c:179
-msgid "Display sidebar in new windows"
-msgstr "ÅìöÜíéóç ðëÜãéáò ìðÜñáò óôá íÝá ðáñÜèõñá"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:182
-msgid "Use Nautilus to draw the desktop"
-msgstr "×ñÞóç ôïõ Íáõôßëïõ óôç ó÷åäßáóç ôçò åðéöÜíåéáò åñãáóßáò"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:186
-msgid "Enable fast search (indexes your hard drive)"
-msgstr "Åíåñãïðïßçóç ãñÞãïñçò áíáæÞôçóçò (äçìéïõñãåß åõñåôÞñéï äßóêïõ)"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:189
-msgid "search type to do by default"
-msgstr "åî' ïñéóìïý åßäïò áíáæÞôçóçò"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:192
-msgid "search by text"
-msgstr "áíáæÞôçóç âÜóç êåéìÝíïõ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:193
-msgid "Search for files by file name only"
-msgstr "ÁíáæÞôçóç áñ÷åßùí âÜóç ïíüìáôïò áñ÷åßïõ ìüíï"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:197
-msgid "search by text and properties"
-msgstr "áíáæÞôçóç âÜóç êåéìÝíïõ êáé éäéïôÞôùí"
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "ÓõìðåñéöïñÜ ÐáôÞìáôïò"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:198
-msgid "Search for files by file name and file properties"
-msgstr "ÁíáæÞôçóç áñ÷åßùí âÜóç ïíüìáôïò êáé éäéïôÞôùí"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr "ÅêôåëÝóéìá Áñ÷åßá ÊåéìÝíïõ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:202
-msgid "Search Engine Location"
-msgstr "Ôïðïèåóßá Ìç÷áíÞò ÁíáæÞôçóçò"
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr "ÅìöÜíéóç/Áðüêñõøç Åðéëïãþí"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:206
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr "ÅìöÜíéóç êñõöþí áñ÷åßùí (ðïõ ôï üíïìÜ ôïõò áñ÷ßæåé áðü \".\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:209
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr "ÅìöÜíéóç áíôéãñÜöùí áóöÜëåéáò (ðïõ ôï üíïìÜ ôïõò áñ÷ßæåé áðü \"~\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:212
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr "ÅìöÜíéóç åéäéêþí óçìáßùí óôï ðáñÜèõñï ÉäéïôÞôùí"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:215
+#
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+msgid "Sorting Order"
+msgstr "ÖïñÜ Ôáîéíüìçóçò"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:780
 msgid "Always list folders before files"
 msgstr "ÐÜíôá åìöÜíéóç öáêÝëùí ðñéí ôùí áñ÷åßùí"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:218
-msgid "Show only folders (no files) in the tree"
-msgstr "ÅìöÜíéóç ìüíï öáêÝëùí (ü÷é áñ÷åßá) óôï äÝíôñï"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:221
-msgid "Can add Content"
-msgstr "ÄõíáôÞ ç ðñïóèÞêç Ðåñéå÷ïìÝíïõ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:224
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
-msgstr ""
-"Íá ìç óõìðåñéëçöèïýí ïé óåëéäïäåßêôåò óõóôÞìáôïò óôï ìåíïý Óåëéäïäåéêôþí"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:227
-msgid "Use Emacs-style keyboard shortcuts in text fields"
-msgstr "×ñÞóç óõíôïìåýóåùí ðëçêôñïëïãßïõ ôýðïõ-Emacs óôá ðåäßá êåéìÝíïõ"
-
 #
-#: libnautilus-extensions/nautilus-global-preferences.c:230
-#: libnautilus-extensions/nautilus-global-preferences.c:235
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
 #: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
 msgid "Location:"
 msgstr "Ôïðïèåóßá:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:234
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+msgid "HTTP Proxy Settings"
+msgstr "Ñõèìßóåéò ÄéáìåóïëáâçôÞ HTTP"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "×ñÞóç ÄéáìåóïëáâçôÞ HTTP:"
 
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:236
+#: libnautilus-extensions/nautilus-global-preferences.c:812
 #: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr "Èýñá:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:562
-msgid "Appearance"
-msgstr "ÅìöÜíéóç"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:565
-msgid "Smoother Graphics"
-msgstr "Ïìáëüôåñá ÃñáöéêÜ"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "Óåëéäïäåßêôåò ÓõóôÞìáôïò"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:582
-msgid "Windows & Desktop"
-msgstr "ÐáñÜèõñá & ÅðéöÜíåéá Åñãáóßáò"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr ""
+"Íá ìç óõìðåñéëçöèïýí ïé óåëéäïäåßêôåò óõóôÞìáôïò óôï ìåíïý Óåëéäïäåéêôþí"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:593
-msgid "Opening New Windows"
-msgstr "¶íïéãìá ÍÝùí Ðáñáèýñùí"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "ÅìöÜíéóç ÊåéìÝíïõ óôá Åéêïíßäéá"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:618
-msgid "Trash Behavior"
-msgstr "ÓõìðåñéöïñÜ ÁðïññéììÜôùí"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr "ÅìöÜíéóç ÌåôñçôÞ ÁíôéêåéìÝíùí óôïõò ÖáêÝëïõò"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:635
-msgid "Keyboard Shortcuts"
-msgstr "Óõíôïìåýóåéò ÊåéìÝíïõ"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "ÅìöÜíéóç ÄåéãìÜôùí ãéá Áñ÷åßá Åéêüíùí"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:646
-msgid "Icon & List Views"
-msgstr "¼øåéò Åéêïíéäßùí êáé Ëéóôþí"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:665
-msgid "Show/Hide Options"
-msgstr "ÅìöÜíéóç/Áðüêñõøç Åðéëïãþí"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr "Ðñïåðéóêüðéóç Áñ÷åßùí ¹÷ïõ"
 
-#
-#: libnautilus-extensions/nautilus-global-preferences.c:683
-msgid "Sorting Order"
-msgstr "ÖïñÜ Ôáîéíüìçóçò"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr "Íá ãßíïõí ïé ËåðôïìÝñåéåò Ðáñïõóéáóôéêïý ôïõ ÖáêÝëïõ Äçìüóéåò"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:694
-msgid "Sidebar Panels"
-msgstr "ÐëåõñéêÜ Ôáìðëþ"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "ÅìöÜíéóç"
 
-#
-#: libnautilus-extensions/nautilus-global-preferences.c:697
-msgid "Tabs"
-msgstr "ÊáñôÝëåò"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr "ÐáñÜèõñá & ÅðéöÜíåéá Åñãáóßáò"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr "¼øåéò Åéêïíéäßùí êáé Ëéóôþí"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:746
+#: libnautilus-extensions/nautilus-global-preferences.c:957
 msgid "Navigation"
 msgstr "ÐåñéÞãçóç"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:757
-msgid "HTTP Proxy Settings"
-msgstr "Ñõèìßóåéò ÄéáìåóïëáâçôÞ HTTP"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:776
-msgid "Built-in Bookmarks"
-msgstr "Óåëéäïäåßêôåò ÓõóôÞìáôïò"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:786
+#: libnautilus-extensions/nautilus-global-preferences.c:962
 msgid "Speed Tradeoffs"
 msgstr "Áíôéóôáèìßóåéò Ôá÷ýôçôáò"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:861
-msgid "Search"
-msgstr "ÁíáæÞôçóç"
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr "áíáæÞôçóç âÜóç êåéìÝíïõ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:863
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+msgid "Search for files by file name only"
+msgstr "ÁíáæÞôçóç áñ÷åßùí âÜóç ïíüìáôïò áñ÷åßïõ ìüíï"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr "áíáæÞôçóç âÜóç êåéìÝíïõ êáé éäéïôÞôùí"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+msgid "Search for files by file name and file properties"
+msgstr "ÁíáæÞôçóç áñ÷åßùí âÜóç ïíüìáôïò êáé éäéïôÞôùí"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "ÅðéëïãÝò Ðïëõðëïêüôçôáò ÁíáæçôÞóåùí"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:869
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "åî' ïñéóìïý åßäïò áíáæÞôçóçò"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 msgid "Fast Search"
 msgstr "ÃñÞãïñç ÁíáæÞôçóç"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:913
-msgid "Fonts"
-msgstr "ÃñáììáôïóåéñÝò"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr "Åíåñãïðïßçóç ãñÞãïñçò áíáæÞôçóçò (äçìéïõñãåß åõñåôÞñéï äßóêïõ)"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+msgid "Search Engine Location"
+msgstr "Ôïðïèåóßá Ìç÷áíÞò ÁíáæÞôçóçò"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "ÁíáæÞôçóç"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr "ÅìöÜíéóç ìüíï öáêÝëùí (ü÷é áñ÷åßá) óôï äÝíôñï"
 
 #
-#: libnautilus-extensions/nautilus-global-preferences.c:1093
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
 #, c-format
 msgid "Display %s tab in sidebar"
 msgstr "ÅìöÜíéóç ôçò êáñôÝëáò %s óôçí ðëåõñéêÞ ìðÜñá"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1140
-msgid "always"
-msgstr "ðÜíôá"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1141
-msgid "Always"
-msgstr "ÐÜíôá"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1144
-msgid "local only"
-msgstr "ôïðéêÜ ìüíï"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1145
-msgid "Local Files Only"
-msgstr "Ìüíï ÔïðéêÜ Áñ÷åßá"
-
-#
-#: libnautilus-extensions/nautilus-global-preferences.c:1148
-msgid "never"
-msgstr "ðïôÝ"
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "ÐëåõñéêÜ Ôáìðëþ"
 
 #
-#: libnautilus-extensions/nautilus-global-preferences.c:1149
-msgid "Never"
-msgstr "ÐïôÝ"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr "ÊáñôÝëåò"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1212
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "currently can't be performed because the program crond, which does nightly "
@@ -6005,13 +5959,13 @@ msgid ""
 "done, turn crond on."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1219
-#: libnautilus-extensions/nautilus-global-preferences.c:1237
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
 msgid "Files May Not Be Indexed"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1220
-#: libnautilus-extensions/nautilus-global-preferences.c:1238
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
 msgid ""
 "If you are running Linux, you can log in as root and type these commands to "
 "start cron:\n"
@@ -6020,7 +5974,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1229
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "may not be performed because the program crond, which does nightly tasks on "
@@ -6029,15 +5983,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-gnome-extensions.c:640
-msgid "No image was selected.  You must click on an image to select it."
-msgstr ""
-"Äåí åðéëÝ÷èçêå åéêüíá. ÐñÝðåé íá êÜíôå êëéê óôçí åéêüíá ãéá íá ôçí åðéëÝîôå."
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:641
-msgid "No selection made"
-msgstr "Äåí Ýãéíå åðéëïãÞ"
-
 #. The list of characters that cause line breaks can be localized.
 #: libnautilus-extensions/nautilus-icon-canvas-item.c:70
 msgid " -_,;.?/&"
@@ -6109,35 +6054,19 @@ msgstr "ÅðáíáöïñÜ Ðëçêôñïëüãçóçò"
 msgid "Restore the changed name"
 msgstr "ÅðáíáöïñÜ ôïõ áëëáãìÝíïõ ïíüìáôïò"
 
-#: libnautilus-extensions/nautilus-password-dialog.c:306
-msgid "Remember this password"
-msgstr "Áðïìíçìüíåõóç áõôïý ôïõ êùäéêïý"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:483
-msgid "times"
-msgstr "times"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:484
-msgid "courier"
-msgstr "courier"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:485
-msgid "lucida"
-msgstr "lucida"
-
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "Áñ÷Üñéïò"
 
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "ÌÝóïõ åðéðÝäïõ"
 
-#: libnautilus-extensions/nautilus-preferences.c:79
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "Ðñï÷ùñçìÝíïò"
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:202
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "Êïõôß Ñõèìßóåùí"
 
@@ -6238,7 +6167,7 @@ msgstr "Íá ìçí óõìðåñéëçöèåß óôï ìåíïý ãéá \"%s\" áíôéêåßìåíá"
 
 #
 #: libnautilus-extensions/nautilus-program-chooser.c:1209
-#: src/file-manager/fm-list-view.c:2163
+#: src/file-manager/fm-list-view.c:2182
 #: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
@@ -6352,9 +6281,9 @@ msgid ""
 "copy this file onto your computer, you may be able to open it."
 msgstr ""
 "Ôï \"%s\" äå ìðïñåß íá áíïßîåé ôï \"%s\" äéüôé ôï \"%s\" äå ìðïñåß íá "
-"ðñïóðåëÜóåé áñ÷åßá óôéò \"%s\" ôïðïèåóßåò.  Äåí õðÜñ÷ïõí Üëëåò åöáñìïãÝò ãéá ôçí "
-"åìöÜíéóç áõôïý ôïõ áñ÷åßïõ.  Áí áíôéãñÜøåôå áõôü ôï áñ÷åßï óôïí õðïëïãéóôÞ "
-"óáò, ßóùò ìðïñÝóåôå íá ôï áíïßîåôå."
+"ðñïóðåëÜóåé áñ÷åßá óôéò \"%s\" ôïðïèåóßåò.  Äåí õðÜñ÷ïõí Üëëåò åöáñìïãÝò ãéá "
+"ôçí åìöÜíéóç áõôïý ôïõ áñ÷åßïõ.  Áí áíôéãñÜøåôå áõôü ôï áñ÷åßï óôïí "
+"õðïëïãéóôÞ óáò, ßóùò ìðïñÝóåôå íá ôï áíïßîåôå."
 
 #. Human readable description for a criterion in a search for
 #. files. Bracketed items are context, and are message
@@ -6606,26 +6535,6 @@ msgstr ""
 "Áíôéêåßìåíá ðïõ ðåñéÝ÷ïõí ôç ëÝîç \"ìÝäïõóá\" óôï üíïìÜ ôïõò êáé åßíáé "
 "öÜêåëïé"
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr "ËåðôïìÝñåéåò"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr "Ðñïåéäïðïßçóç"
-
-#
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr "ÓöÜëìá"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr "Åñþôçóç"
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr "ÁíáæÞôçóç ôùí Äßóêùí"
@@ -6669,39 +6578,45 @@ msgstr "ÐñïâïëÞ ùò %s"
 msgid "%s Viewer"
 msgstr "ÐñïâïëÝáò %s"
 
+#
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+msgid "Unknown"
+msgstr "¶ãíùóôï"
+
 #. Populate table with items we know localized names for.
-#: libnautilus-extensions/nautilus-volume-monitor.c:600
-#: libnautilus-extensions/nautilus-volume-monitor.c:1798
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr "ÄéóêÝôá"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:601
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
 msgid "CD-ROM"
 msgstr "ÓõóêåõÞ CD-ROM"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:602
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
 msgid "Zip Drive"
 msgstr "ÓõóêåõÞ Zip"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:621
-#: libnautilus-extensions/nautilus-volume-monitor.c:643
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 msgid "Audio CD"
 msgstr "CD ÌïõóéêÞò"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1507
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr "åßíáé ðñïóôáôåõìÝíï áðü åããñáöÞ, ðñïóÜñôçóç ìüíï ãéá áíÜãíùóç"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1510
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "äåí åßíáé Ýãêõñç óõóêåõÞ ìðëïê"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1511
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr "Äå âñÝèçêå ìÝóï"
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1515
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
@@ -6710,7 +6625,7 @@ msgstr ""
 "äéóêÝôá óôïí ïäçãü äéóêÝôáò."
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1519
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
@@ -6718,11 +6633,11 @@ msgstr ""
 "Ï Íáõôßëïò äå ìðüñåóå íá ðñïóáñôÞóåé ôïí ôüìï. Ðéèáíüí íá ìçí õðÜñ÷ïõí ìÝóá "
 "óôç óõóêåõÞ."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1522
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr "ëÜèïò åßäïò óõóôÞìáôïò áñ÷åßùí, ëÜèïò åðéëïãÞ Þ ëÜèïò õðåñìðëüê"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1525
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
@@ -6730,7 +6645,7 @@ msgstr ""
 "Ï Íáõôßëïò äå ìðüñåóå íá ðñïóáñôÞóåé ôç äéóêÝôá. Ðéèáíüí ç äéóêÝôá íá åßíáé "
 "óå ìïñöÞ ðïõ äå ìðïñåß íá ðñïóáñôçèåß."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1528
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
@@ -6738,56 +6653,56 @@ msgstr ""
 "Ï Íáõôßëïò äå ìðüñåóå íá ðñïóáñôÞóåé ôïí åðéëåãìÝíï ôüìï. Ðéèáíüí ï ôüìïò íá "
 "åßíáé óå ìïñöïðïßçóç ðïõ äå ìðïñåß íá ðñïóáñôçèåß."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1533
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr "Ï Íáõôßëïò äå ìðüñåóå íá ðñïóáñôÞóåé ôçí åðéëåãìÝíç äéóêÝôá."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1535
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "Ï Íáõôßëïò äå ìðüñåóå íá ðñïóáñôÞóåé ôïí åðéëåãìÝíï ôüìï."
 
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1540
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr "Ï Íáõôßëïò äå ìðüñåóå íá áðïðñïóáñôÞóåé ôïí åðéëåãìÝíï ôüìï."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1548
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
 msgid "Mount Error"
 msgstr "ÓöÜëìá ÐñïóÜñôçóçò"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1548
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
 msgid "Unmount Error"
 msgstr "ÓöÜëìá ÁðïðñïóÜñôçóçò"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1700
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "Ôüìïò ISO 9660"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1715
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "Ñßæá"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1722
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Ôüìïò Ext2"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1737
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "Ôüìïò MSDOS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1752
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "Ôüìïò NFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1767
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
 msgid "ReiserFS Volume"
 msgstr "Ôüìïò ReiserFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1783
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
 msgid "UFS Volume"
 msgstr "Ôüìïò UFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1813
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "¶ãíùóôïò Ôüìïò"
 
@@ -6860,7 +6775,7 @@ msgstr "_ÁíôéãñáöÞ ÊåéìÝíïõ"
 
 # # NOTE: Translation of "Create" as "New" to
 # #       keep msg length relatively short...
-#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:89
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "_Åðéêüëëçóç ÊåéìÝíïõ"
 
@@ -6869,7 +6784,7 @@ msgstr "_Åðéêüëëçóç ÊåéìÝíïõ"
 #. * to change it when we upgrade to GTK 2.0.
 #.
 #: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
-#: src/nautilus-window-menus.c:571
+#: src/nautilus-window-menus.c:610
 msgid "Nautilus"
 msgstr "Íáõôßëïò"
 
@@ -6885,59 +6800,58 @@ msgstr "Ï Äéá÷åéñéóôÞò Áñ÷åßùí êáé Ãñáöéêüò Öëïéüò Íáõôßëïò"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:797
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr "Ï Áñ÷éêüò ÊáôÜëïãïò ôïõ %s"
 
 #
-#: src/file-manager/fm-desktop-icon-view.c:1086
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "¶äåéáóìá ÁðïññéìÜôùí..."
 
-#: src/file-manager/fm-desktop-icon-view.c:1088
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "¶äåéáóìá ÁðïññéìÜôùí"
 
-#: src/file-manager/fm-desktop-icon-view.c:1108
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "ÁðïðñïóÜñôçóç Ôüìïõ"
 
 #
-#: src/file-manager/fm-directory-view.c:438
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr "Áõôü èá áíïßîåé %d äéáöïñåôéêÜ ðáñÜèõñá. ÐñÜãìáôé èÝëåôå íá ôï êÜíåôå;"
 
-#: src/file-manager/fm-directory-view.c:440
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Íá áíïé÷ôïýí %d ÐáñÜèõñá;"
 
-#: src/file-manager/fm-directory-view.c:746
+#: src/file-manager/fm-directory-view.c:748
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
-msgstr ""
-"Åßóáóôå âÝâáéïé üôé èÝëåôå íá äéáãñÜøåôå ïñéóôéêÜ ôï \"%s\";"
+msgstr "Åßóáóôå âÝâáéïé üôé èÝëåôå íá äéáãñÜøåôå ïñéóôéêÜ ôï \"%s\";"
 
-#: src/file-manager/fm-directory-view.c:750
+#: src/file-manager/fm-directory-view.c:752
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 "Åßóôå âÝâáéïé üôé èÝëåôå íá äéáãñÜøåôå ïñéóôéêÜ ôá %d åðéëåãìÝíá áíôéêåßìåíá;"
 
 #
-#: src/file-manager/fm-directory-view.c:756
+#: src/file-manager/fm-directory-view.c:758
 msgid "Delete?"
 msgstr "ÄéáãñáöÞ;"
 
 #
-#: src/file-manager/fm-directory-view.c:757
-#: src/file-manager/fm-directory-view.c:2804
-#: src/file-manager/fm-directory-view.c:2844
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Delete"
 msgstr "ÄéáãñáöÞ"
 
@@ -6945,56 +6859,56 @@ msgstr "ÄéáãñáöÞ"
 #. Localizers: This is the name of a directory that's created in ~/Nautilus, and
 #. * stores the scripts that appear in the Scripts submenu.
 #.
-#: src/file-manager/fm-directory-view.c:1048
+#: src/file-manager/fm-directory-view.c:1026
 msgid "scripts"
 msgstr "ðñïãñÜììáôá åíôïëþí"
 
 #
-#: src/file-manager/fm-directory-view.c:1369
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "ÅðéëÝ÷èçóáí \"%s\""
 
-#: src/file-manager/fm-directory-view.c:1371
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "ÅðéëÝ÷èçêå Ýíáò öÜêåëïò"
 
 #
-#: src/file-manager/fm-directory-view.c:1374
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "ÅðéëÝ÷èçóáí %d öÜêåëïé"
 
-#: src/file-manager/fm-directory-view.c:1380
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr " (ðåñéÝ÷ïõí 0 áíôéêåßìåíá)"
 
-#: src/file-manager/fm-directory-view.c:1382
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr " (ðåñéÝ÷ïõí 1 áíôéêåßìåíï)"
 
-#: src/file-manager/fm-directory-view.c:1384
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr " (ðåñéÝ÷ïõí %d áíôéêåßìåíá)"
 
-#: src/file-manager/fm-directory-view.c:1395
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "ÅðéëÝ÷èçóáí \"%s\" (%s)"
 
 #
-#: src/file-manager/fm-directory-view.c:1399
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "ÅðéëÝ÷èçóáí %d áíôéêåßìåíá (%s)"
 
-#: src/file-manager/fm-directory-view.c:1406
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "ÅðéëÝ÷èçêå 1 Üëëï áíôéêåßìåíï (%s)"
 
-#: src/file-manager/fm-directory-view.c:1409
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "ÅðéëÝ÷èçêáí %d Üëëá áíôéêåßìåíá (%s)"
@@ -7006,7 +6920,7 @@ msgstr "ÅðéëÝ÷èçêáí %d Üëëá áíôéêåßìåíá (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1438
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -7015,7 +6929,7 @@ msgstr "%s%s, %s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1564
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
@@ -7024,11 +6938,11 @@ msgstr ""
 "Ï öÜêåëïò \"%s\" ðåñéÝ÷åé ðåñéóóüôåñá áñ÷åßá áðü ôïí áñéèìü ðïõ ï Íáõôßëïò "
 "ìðïñåß íá ÷åéñéóôåß. ÌåñéêÜ áñ÷åßá äå èá åìöáíéóôïýí."
 
-#: src/file-manager/fm-directory-view.c:1571
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "ÐÜñá ÐïëëÜ Áñ÷åßá"
 
-#: src/file-manager/fm-directory-view.c:2786
+#: src/file-manager/fm-directory-view.c:2752
 #, c-format
 msgid ""
 "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
@@ -7036,7 +6950,7 @@ msgstr ""
 "Ôï \"%s\" äå ìðïñåß íá ìåôáêéíçèåß óôá Áðïññßììáôá. ÈÝëåôå íá ôï äéáãñÜøåôå "
 "áìÝóùò;"
 
-#: src/file-manager/fm-directory-view.c:2791
+#: src/file-manager/fm-directory-view.c:2757
 #, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
@@ -7045,7 +6959,7 @@ msgstr ""
 "Ôá %d åðéëåãìÝíá áíôéêåßìåíá äå ìðïñïýí íá ìåôáêéíçèïýí óôá Áðïññßììáôá. "
 "ÈÝëåôå íá ôá äéáãñÜøåôå áìÝóùò;"
 
-#: src/file-manager/fm-directory-view.c:2795
+#: src/file-manager/fm-directory-view.c:2761
 #, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -7055,18 +6969,18 @@ msgstr ""
 "ÈÝëåôå íá äéáãñÜøåôå áõôÜ ôá %d áíôéêåßìåíá áìÝóùò;"
 
 #
-#: src/file-manager/fm-directory-view.c:2803
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "ÄéáãñáöÞ ÁìÝóùò;"
 
-#: src/file-manager/fm-directory-view.c:2833
+#: src/file-manager/fm-directory-view.c:2799
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr ""
 "Åßóáóôå âÝâáéïé üôé èÝëåôå íá äéáãñÜøåôå ïñéóôéêÜ ôï \"%s\" áðü ôá "
 "Áðïññßììáôá;"
 
-#: src/file-manager/fm-directory-view.c:2837
+#: src/file-manager/fm-directory-view.c:2803
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
@@ -7075,53 +6989,53 @@ msgstr ""
 "Åßóôå âÝâáéïé üôé èÝëåôå íá äéáãñÜøåôå ïñéóôéêÜ ôá %d åðéëåãìÝíá áíôéêåßìåíá "
 "áðü ôá Áðïññßììáôá;"
 
-#: src/file-manager/fm-directory-view.c:2843
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "ÄéáãñáöÞ Áðü Ôá Áðïññßììáôá;"
 
 #
-#: src/file-manager/fm-directory-view.c:3142
-#: src/file-manager/fm-directory-view.c:3184
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "×ñÞóç ôïõ \"%s\" ãéá ôï Üíïéãìá ôïõ åðéëåãìÝíïõ áíôéêåéìÝíïõ"
 
-#: src/file-manager/fm-directory-view.c:3266
+#: src/file-manager/fm-directory-view.c:3232
 #: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Other _Application..."
 msgstr "¶ëëç _ÅöáñìïãÞ..."
 
-#: src/file-manager/fm-directory-view.c:3266
+#: src/file-manager/fm-directory-view.c:3232
 msgid "An _Application..."
 msgstr "Ìßá _ÅöáñìïãÞ..."
 
-#: src/file-manager/fm-directory-view.c:3272
+#: src/file-manager/fm-directory-view.c:3238
 #: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Other _Viewer..."
 msgstr "¶ëëï Ðñüãñáììá _ÐñïâïëÞò..."
 
-#: src/file-manager/fm-directory-view.c:3272
+#: src/file-manager/fm-directory-view.c:3238
 msgid "A _Viewer..."
 msgstr "¸íá Ðñüãñáììá _ÐñïâïëÞò..."
 
 #
-#: src/file-manager/fm-directory-view.c:3485
+#: src/file-manager/fm-directory-view.c:3451
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "ÅêôÝëåóç ôïõ \"%s\" óå êÜèå åðéëåãìÝíï áíôéêåßìåíï"
 
-#: src/file-manager/fm-directory-view.c:3600
+#: src/file-manager/fm-directory-view.c:3566
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3603
+#: src/file-manager/fm-directory-view.c:3569
 msgid "About Scripts"
 msgstr "Ó÷åôéêÜ ìå ôá ÐñïãñÜììáôá Åíôïëþí"
 
-#: src/file-manager/fm-directory-view.c:3604
+#: src/file-manager/fm-directory-view.c:3570
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -7146,140 +7060,145 @@ msgstr ""
 #. This shouldn't happen. If it does, get_scripts_directory was unable to
 #. * mkdir the scripts directory, and this case should be debugged.
 #.
-#: src/file-manager/fm-directory-view.c:3671
+#: src/file-manager/fm-directory-view.c:3637
 #, c-format
 msgid "Nautilus was unable to create the directory %s."
 msgstr "Ï Íáõôßëïò äå ìðüñåóå íá äçìéïõñãÞóåé ôïí êáôÜëïãï %s."
 
-#: src/file-manager/fm-directory-view.c:3672
+#: src/file-manager/fm-directory-view.c:3638
 msgid "No Scripts Folder"
 msgstr "Äåí ÕðÜñ÷åé ÖÜêåëïò ÐñïãñáììÜôùí Åíôïëþí"
 
-#: src/file-manager/fm-directory-view.c:3727
+#: src/file-manager/fm-directory-view.c:3693
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3731
+#: src/file-manager/fm-directory-view.c:3697
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3738
+#: src/file-manager/fm-directory-view.c:3704
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
-"Ôá %d åðéëåãìÝíá áíôéêåßìåíá èá ìåôáêéíçèïýí áí åðéëÝîôå ôçí åíôïëÞ Åðéêüëëçóç Áñ÷åßùí"
+"Ôá %d åðéëåãìÝíá áíôéêåßìåíá èá ìåôáêéíçèïýí áí åðéëÝîôå ôçí åíôïëÞ "
+"Åðéêüëëçóç Áñ÷åßùí"
 
-#: src/file-manager/fm-directory-view.c:3742
+#: src/file-manager/fm-directory-view.c:3708
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
-msgstr "Ôá %d åðéëåãìÝíá áíôéêåßìåíá èá áíôéãñáöïýí áí åðéëÝîôå ôçí åíôïëÞ Åðéêüëëçóç Áñ÷åßùí"
+msgstr ""
+"Ôá %d åðéëåãìÝíá áíôéêåßìåíá èá áíôéãñáöïýí áí åðéëÝîôå ôçí åíôïëÞ "
+"Åðéêüëëçóç Áñ÷åßùí"
 
-#: src/file-manager/fm-directory-view.c:3888
+#: src/file-manager/fm-directory-view.c:3854
 msgid "There is nothing on the clipboard to paste."
 msgstr "Äåí õðÜñ÷åé ôßðïôá óôï ôåìÜ÷éï ãéá íá åðéêïëëçèåß."
 
-#: src/file-manager/fm-directory-view.c:4026
+#: src/file-manager/fm-directory-view.c:3954
 msgid "Open _in This Window"
 msgstr "¶íïéãìá _óå Áõôü ôï ÐáñÜèõñï"
 
-#: src/file-manager/fm-directory-view.c:4029
+#: src/file-manager/fm-directory-view.c:3957
 #: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open _in New Window"
 msgstr "¶íïéãìá _óå ÍÝï ÐáñÜèõñï"
 
-#: src/file-manager/fm-directory-view.c:4031
+#: src/file-manager/fm-directory-view.c:3959
 #, c-format
 msgid "Open _in %d New Windows"
 msgstr "¶íïéãìá _óå %d ÍÝá ÐáñÜèõñá"
 
-#: src/file-manager/fm-directory-view.c:4049
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "ÄéáãñáöÞ áðü ôá _Áðïññßììáôá..."
 
-#: src/file-manager/fm-directory-view.c:4049
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "ÄéáãñáöÞ áðü ôá _Áðïññßììáôá"
 
-#: src/file-manager/fm-directory-view.c:4051
+#: src/file-manager/fm-directory-view.c:3979
 msgid "Delete all selected items permanently"
 msgstr "ÏñéóôéêÞ äéáãñáöÞ ôùí åðéëåãìÝíùí áíôéêåéìÝíùí"
 
-#: src/file-manager/fm-directory-view.c:4054
+#: src/file-manager/fm-directory-view.c:3982
 #: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "Ìåôáêßíçóç óôá _Áðïññßììáôá"
 
-#: src/file-manager/fm-directory-view.c:4056
+#: src/file-manager/fm-directory-view.c:3984
 msgid "Move all selected items to the Trash"
 msgstr "Ìåôáêßíçóç üëùí ôùí åðéëåãìÝíùí áíôéêåéìÝíùí óôá Áðïññßììáôá"
 
 #
-#: src/file-manager/fm-directory-view.c:4087
+#: src/file-manager/fm-directory-view.c:4015
 msgid "De_lete..."
 msgstr "Äéá_ãñáöÞ..."
 
 #
-#: src/file-manager/fm-directory-view.c:4087
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "De_lete"
 msgstr "Äéá_ãñáöÞ"
 
-#: src/file-manager/fm-directory-view.c:4110
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "Äçìéïõñãßá _ÓõíäÝóìùí"
 
-#: src/file-manager/fm-directory-view.c:4111
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "Äçìéïõñãßá _ÓõíäÝóìïõ"
 
 #
-#: src/file-manager/fm-directory-view.c:4128
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "¶äåéáóìá Áðïññé_ììÜôùí"
 
 #
-#: src/file-manager/fm-directory-view.c:4129
+#: src/file-manager/fm-directory-view.c:4057
 #: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "¶äåéáóìá Áðïññé_ììÜôùí"
 
-#: src/file-manager/fm-directory-view.c:4140
+#: src/file-manager/fm-directory-view.c:4068
 #: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "Á_öáßñåóç Åéêüíùí ×ñÞóôç"
 
-#: src/file-manager/fm-directory-view.c:4141
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "Á_öáßñåóç Åéêüíáò ×ñÞóôç"
 
 #
-#: src/file-manager/fm-directory-view.c:4155
+#: src/file-manager/fm-directory-view.c:4083
 msgid "Cu_t File"
 msgstr "ÁðïêïðÞ _Áñ÷åßïõ"
 
 #
-#: src/file-manager/fm-directory-view.c:4156
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
 msgid "Cu_t Files"
 msgstr "ÁðïêïðÞ _Áñ÷åßùí"
 
 # # NOTE: Translation of "Create" as "New" to
 # #       keep msg length relatively short...
-#: src/file-manager/fm-directory-view.c:4166
+#: src/file-manager/fm-directory-view.c:4094
 msgid "_Copy File"
 msgstr "_ÁíôéãñáöÞ Áñ÷åßïõ"
 
-#: src/file-manager/fm-directory-view.c:4167
+#: src/file-manager/fm-directory-view.c:4095
 #: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Copy Files"
 msgstr "_ÁíôéãñáöÞ Áñ÷åßùí"
 
-#: src/file-manager/fm-directory-view.c:4324
+#: src/file-manager/fm-directory-view.c:4252
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
 "link in the Trash?"
@@ -7287,7 +7206,7 @@ msgstr ""
 "Áõôüò ï óýíäåóìïò äå ìðïñåß íá ÷ñçóéìïðïéçèåß äéüôé äåí Ý÷åé óôü÷ï. ÈÝëåôå "
 "íá ôïðïèåôÞóåôå áõôüí ôï óýíäåóìï óôá Áðïññßììáôá;"
 
-#: src/file-manager/fm-directory-view.c:4327
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
@@ -7296,15 +7215,15 @@ msgstr ""
 "Áõôüò ï óýíäåóìïò äå ìðïñåß íá ÷ñçóéìïðïéçèåß äéüôé ï óôü÷ïò ôïõ \"%s\" äåí "
 "õðÜñ÷åé. ÈÝëåôå íá ôïí ôïðïèåôÞóåôå óôá Áðïññßììáôá;"
 
-#: src/file-manager/fm-directory-view.c:4333
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "Äéáêïðåßóá ÓùëÞíùóç"
 
-#: src/file-manager/fm-directory-view.c:4334
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr "ÐÝôáãìá"
 
-#: src/file-manager/fm-directory-view.c:4387
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
@@ -7314,20 +7233,20 @@ msgstr ""
 "åìöáíßóåôå ôá ðåñéå÷üìåíÜ ôïõ;"
 
 #
-#: src/file-manager/fm-directory-view.c:4393
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr "ÅêôÝëåóç Þ ÅìöÜíéóç;"
 
-#: src/file-manager/fm-directory-view.c:4394
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "ÅêôÝëåóç"
 
 #
-#: src/file-manager/fm-directory-view.c:4395
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "ÅìöÜíéóç"
 
-#: src/file-manager/fm-directory-view.c:4449
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
@@ -7335,16 +7254,16 @@ msgstr ""
 "Óõããíþìç, áëëÜ äå ìðïñåßôå íá åêôåëÝóåôå åíôïëÝò áðü Ýíá áðïìáêñõóìÝíï "
 "óýóôçìá ëüãù ôùí óõíåðåéþí áóöÜëåéáò."
 
-#: src/file-manager/fm-directory-view.c:4451
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "Äåí åßíáé äõíáôÞ ç åêôÝëåóç áðïìáêñõóìÝíùí óõíäÝóìùí"
 
-#: src/file-manager/fm-directory-view.c:4585
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr "¶íïéãìá ôïõ \"%s\""
 
-#: src/file-manager/fm-directory-view.c:4591
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "Áêýñùóç Áíïßãìáôïò;"
 
@@ -7546,80 +7465,80 @@ msgstr ""
 "ÅðéëÝîôå ôç äéÜôáîç åìöÜíéóçò ôùí ðëçñïöïñéþí êÜôù áðü ôï ïíüìáôá "
 "åéêïíéäßùí. Ðåñéóóüôåñåò ðëçñïöïñßåò åìöáíßæïíôáé êáèþò Ýñ÷åóôå êïíôýôåñá."
 
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "âÜóç _Ïíüìáôïò"
 
-#: src/file-manager/fm-icon-view.c:159
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "ÄéáôÞñçóç ôçò ôáîéíüìçóçò ôùí åéêïíéäßùí âÜóç ïíüìáôïò óå ãñáììÝò"
 
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "âÜóç _ÌåãÝèïõò"
 
-#: src/file-manager/fm-icon-view.c:166
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "ÄéáôÞñçóç ôçò ôáîéíüìçóçò ôùí åéêïíéäßùí âÜóç ìåãÝèïõò óå ãñáììÝò"
 
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "âÜóç _Åßäïõò"
 
-#: src/file-manager/fm-icon-view.c:173
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "ÄéáôÞñçóç ôçò ôáîéíüìçóçò ôùí åéêïíéäßùí âÜóç åßäïõò óå ãñáììÝò"
 
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "âÜóç ¿ñáò _Ôñïðïðïßçóçò"
 
-#: src/file-manager/fm-icon-view.c:180
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr ""
 "ÄéáôÞñçóç ôçò ôáîéíüìçóçò ôùí åéêïíéäßùí âÜóç çìåñïìçíßá ôñïðïðïßçóçò óå "
 "ãñáììÝò"
 
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "âÜóç _ÅìâëÞìáôïò"
 
-#: src/file-manager/fm-icon-view.c:187
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "ÄéáôÞñçóç ôçò ôáîéíüìçóçò ôùí åéêïíéäßùí âÜóç åìâëÞìáôïò óå ãñáììÝò"
 
-#: src/file-manager/fm-icon-view.c:1230
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "_ÅðáíáöïñÜ Åéêïíéäßùí óôá Áñ÷éêÜ ôïõò ÌåãÝèç"
 
-#: src/file-manager/fm-icon-view.c:1231
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "_ÅðáíáöïñÜ Åéêïíéäßïõ óôï Áñ÷éêü ôïõ ÌÝãåèïò"
 
-#: src/file-manager/fm-icon-view.c:1443
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "äåß÷íåé óôï \"%s\""
 
 #
-#: src/file-manager/fm-list-view.c:2169
+#: src/file-manager/fm-list-view.c:2188
 #: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "ÌÝãåèïò"
 
 #
-#: src/file-manager/fm-list-view.c:2175
+#: src/file-manager/fm-list-view.c:2194
 #: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Ôýðïò"
 
-#: src/file-manager/fm-list-view.c:2181
+#: src/file-manager/fm-list-view.c:2200
 #: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Çìåñïìçíßá Ôñïðïðïßçóçò"
@@ -7824,7 +7743,7 @@ msgstr ""
 "åßíáé åãêáôåóôçìÝíç."
 
 #: src/file-manager/fm-search-list-view.c:159
-#: src/file-manager/nautilus-indexing-info.c:405
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr "Ç Õðçñåóßá ÁíáæÞôçóçò Äåí Åßíáé ÄéáèÝóéìç"
 
@@ -8009,7 +7928,7 @@ msgstr ""
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
 #: src/file-manager/fm-search-list-view.c:360
-#: src/file-manager/nautilus-indexing-info.c:340
+#: src/file-manager/nautilus-indexing-info.c:342
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
@@ -8024,7 +7943,7 @@ msgid "Fast searches are not available on your computer"
 msgstr "Ïé ãñÞãïñåò áíáæçôÞóåéò äåí åßíáé äéáèÝóéìåò óôïí õðïëïãéóôÞ óáò"
 
 #: src/file-manager/fm-search-list-view.c:373
-#: src/file-manager/nautilus-indexing-info.c:359
+#: src/file-manager/nautilus-indexing-info.c:361
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Fast search is disabled in your Search preferences, so no index is available."
@@ -8034,13 +7953,13 @@ msgstr ""
 "ðñïôéìÞóåéò ÁíáæÞôçóçò, ïðüôå äåí õðÜñ÷åé äéáèÝóéìïò ðßíáêáò. "
 
 #: src/file-manager/fm-search-list-view.c:376
-#: src/file-manager/nautilus-indexing-info.c:345
-#: src/file-manager/nautilus-indexing-info.c:363
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
 msgid "Fast searches are not available on your computer."
 msgstr "Ïé ãñÞãïñåò áíáæçôÞóåéò äåí åßíáé äéáèÝóéìåò óôïí õðïëïãéóôÞ óáò."
 
 #: src/file-manager/fm-search-list-view.c:377
-#: src/file-manager/nautilus-indexing-info.c:364
+#: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
 "To enable fast search, open the Preferences menu and choose Preferences. "
 "Then select Search preferences and put a checkmark in the Enable Fast Search "
@@ -8100,7 +8019,7 @@ msgid "Change Desktop Background"
 msgstr "ÁëëáãÞ Ðáñáóêçíßïõ ÅðéöÜíåéáò Åñãáóßáò"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Delete all items in the Trash"
 msgstr "ÄéáãñáöÞ üëùí ôùí áíôéêåéìÝíùí áðü ôá Áðïññßììáôá"
 
@@ -8159,34 +8078,36 @@ msgid "Copy Files"
 msgstr "ÁíôéãñáöÞ Áñ÷åßùí"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create Link"
-msgstr "Äçìéïõñãßá ÓõíäÝóìïõ"
-
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
 msgid "Create a new empty folder inside this folder"
 msgstr "Äçìéïõñãßá íÝïõ êåíïý öáêÝëïõ ìÝóá óå áõôü ôï öÜêåëï"
 
 #
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "Äçìéïõñãßá óõìâïëéêïý óõíäÝóìïõ ãéá êÜèå åðéëåãìÝíï áíôéêåßìåíï"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
 msgid "Cut Files"
 msgstr "ÁðïêïðÞ Áñ÷åßùí"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "Delete each selected item, without moving to the Trash"
-msgstr "ÄéáãñáöÞ êÜèå åðéëåãìÝíïõ áíôéêåéìÝíïõ, ÷ùñßò ìåôáêßíçóç óôá Áðïññßììáôá"
+msgstr ""
+"ÄéáãñáöÞ êÜèå åðéëåãìÝíïõ áíôéêåéìÝíïõ, ÷ùñßò ìåôáêßíçóç óôá Áðïññßììáôá"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "Äçìéïõñãßá áíôéãñÜöïõ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "Äçìéïõñãßá áíôéãñÜöïõ ãéá êÜèå åðéëåãìÝíï áíôéêåßìåíï"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "Äçìéïõñãßá ÓõíäÝóìïõ"
+
 #: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr "Ìåôáêßíçóç êÜèå åðéëåãìÝíïõ áíôéêåéìÝíïõ óôá Áðïññßììáôá"
@@ -8250,11 +8171,15 @@ msgstr "Åðéêüëëçóç Áñ÷åßùí"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Prepare the selected files to be copied with a Paste Files command"
-msgstr "Ðñïåôïéìáóßá ôùí åðéëåãìÝíùí áñ÷åßùí ðñïò áíôéãñáöÞ ìÝóù åíôïëÞò Åðéêüëëçóç Áñ÷åßùí"
+msgstr ""
+"Ðñïåôïéìáóßá ôùí åðéëåãìÝíùí áñ÷åßùí ðñïò áíôéãñáöÞ ìÝóù åíôïëÞò Åðéêüëëçóç "
+"Áñ÷åßùí"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Prepare the selected files to be moved with a Paste Files command"
-msgstr "Ðñïåôïéìáóßá ôùí åðéëåãìÝíùí áñ÷åßùí ðñïò ìåôáêßíçóç ìÝóù åíôïëÞò Åðéêüëëçóç Áñ÷åßùí"
+msgstr ""
+"Ðñïåôïéìáóßá ôùí åðéëåãìÝíùí áñ÷åßùí ðñïò ìåôáêßíçóç ìÝóù åíôïëÞò Åðéêüëëçóç "
+"Áñ÷åßùí"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
@@ -8272,7 +8197,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-directory-view-ui.xml.h:42
-#: src/nautilus-sidebar.c:490
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "Áñ÷éêïðïßçóç Ðáñáóêçíßïõ"
 
@@ -8532,7 +8457,7 @@ msgstr ""
 
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr "ÊáôÜóôáóç Äçìéïõñãßáò Åõñåôçñßïõ"
 
@@ -8551,11 +8476,11 @@ msgid "Your files were last indexed at %s"
 msgstr "Ôá áñ÷åßá óáò áíáíåþèçêáí óôï åõñåôÞñéï ôåëåõôáßá öïñÜ óôéò %s"
 
 #
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "ÅíçìÝñùóç Ôþñá"
 
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast.  Your files are currently being indexed."
@@ -8564,11 +8489,11 @@ msgstr ""
 "êáôáëïãñáöïýíôáé ìå óêïðü ïé áíáæçôÞóåéò óáò íá åßíáé ãñçãïñüôåñåò. Ôá "
 "áñ÷åßá óáò êáôáëïãñáöïýíôáé áõôÞ ôç óôéãìÞ. "
 
-#: src/file-manager/nautilus-indexing-info.c:404
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Óõããíþìç áëëÜ ç õðçñåóßá áíáæÞôçóçò ìÝäïõóá äåí åßíáé äéáèÝóéìç."
 
-#: src/file-manager/nautilus-indexing-info.c:426
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -8763,7 +8688,7 @@ msgid "Location"
 msgstr "Ôïðïèåóßá"
 
 #
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:755
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Áöáßñåóç"
 
@@ -8927,7 +8852,8 @@ msgstr ""
 "ïíüìáôïò áñ÷åßïõ, çìåñïìçíßáò êáé Üëëùí éäéïôÞôùí ôùí áñ÷åßùí.\n"
 "Ç êáôáëïãñÜöçóç äéáñêåß ÷ñüíï áëëÜ åêôåëåßôå üôáí ï õðïëïãéóôÞò óáò\n"
 "åßíáé áíåíåñãüò.\n"
-"Ç ãñÞãïñç áíáæÞôçóç áðáéôåß íá åßíáé åíåñãÞ ç õðçñåóßá cron óôï óýóôçìÜ óáò.\n"
+"Ç ãñÞãïñç áíáæÞôçóç áðáéôåß íá åßíáé åíåñãÞ ç õðçñåóßá cron óôï óýóôçìÜ "
+"óáò.\n"
 
 #: src/nautilus-first-time-druid.c:972
 msgid ""
@@ -9107,48 +9033,48 @@ msgstr "ÈÝëåôå íá äåßôå áõôÝò ôéò %d ôïðïèåóßåò óå äéáöïñåôéêÜ ðáñÜèõñá;"
 msgid "View in Multiple Windows?"
 msgstr "ÐñïâïëÞ óå ÐïëëáðëÜ ÐáñÜèõñá;"
 
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr "ÅêôÝëåóç ìéá ãñÞãïñç ïìÜäá áðü äïêéìÝò åãêõñüôçôáò."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "Äçìéïõñãßá ôïõ áñ÷éêïý ðáñáèýñïõ ìå ôçí äïèåßóá ãåùìåôñßá."
 
 #
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "ÄÉÁÓÔÁÓÅÉÓ"
 
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Ìüíï äçìéïõñãßá ðáñáèýñùí ãéá êáèïñéóìÝíá URI."
 
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "Ôåñìáôéóìüò ôïõ Íáõôßëïõ."
 
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "Åðáíåêêßíçóç ôïõ Íáõôßëïõ."
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: ôï --check äå ìðïñåß íá ÷ñçóéìïðïéçèåß ìå URI.\n"
 
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: ôï --check äå ìðïñåß íá ÷ñçóéìïðïéçèåß ìå Üëëåò åðéëïãÝò.\n"
 
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: ôï --quit äå ìðïñåß íá ÷ñçóéìïðïéçèåß ìå URI.\n"
 
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: ôï --restart äå ìðïñåß íá ÷ñçóéìïðïéçèåß ìå URI.\n"
 
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 "nautilus: ôï --geometry äå ìðïñåß íá ÷ñçóéìïðïéçèåß ìå ðåñéóóüôåñá áðü Ýíá "
@@ -9790,19 +9716,19 @@ msgstr "ÐÞãáéíå óôçí åðüìåíç ôïðïèåóßá ôçò ëßóôáò éóôïñéêïý"
 msgid "Go to the previous visited location"
 msgstr "ÐÞãáéíå óôçí ðñïçãïýìåíç ôïðïèåóßá ôçò ëßóôá éóôïñéêïý"
 
-#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:444
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
 msgid "Hide Location _Bar"
 msgstr "Áðüêñõøç ÌðÜñáò _Ôïðïèåóßáò"
 
-#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:426
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
 msgid "Hide St_atus Bar"
 msgstr "Áðüêñõøç _ÃñáììÞò ÊáôÜóôáóçò"
 
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:432
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
 msgid "Hide _Sidebar"
 msgstr "Áðüêñõøç _ÐëåõñéêÞò ÌðÜñáò"
 
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:438
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
 msgid "Hide _Toolbar"
 msgstr "Áðüêñõøç _ÅñãáëåéïèÞêçò"
 
@@ -9981,7 +9907,7 @@ msgstr "_Åðåîåñãáóßá ÐñïôéìÞóåùí..."
 msgid "_Feedback"
 msgstr "_ÁíÜäñáóç"
 
-#: src/nautilus-shell-ui.xml.h:82 src/nautilus-window-menus.c:1332
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "_ÁíáæÞôçóç"
 
@@ -10002,56 +9928,61 @@ msgid "_Home"
 msgstr "_Áñ÷éêÞ óåëßäá"
 
 #: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "Ôïðïèåóßá"
+
+#: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr "_ÈÝìáôá Íáõôßëïõ..."
 
-#: src/nautilus-shell-ui.xml.h:88
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "_Êáíïíéêü ÌÝãåèïò"
 
 #
-#: src/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:91
 msgid "_Preferences"
 msgstr "_ÐñïôéìÞóåéò"
 
-#: src/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr "_¸ëåã÷ïò Áðüäïóçò"
 
 #
-#: src/nautilus-shell-ui.xml.h:92
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "_ÁíáíÝùóç"
 
-#: src/nautilus-shell-ui.xml.h:93
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr "_ÁíáöïñÜ ÅëÝã÷ïõ Áðüäïóçò"
 
-#: src/nautilus-shell-ui.xml.h:94
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr "_Áñ÷éêïðïßçóç ÅëÝã÷ïõ Áðüäïóçò"
 
-#: src/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr "_Åêêßíçóç ÅëÝã÷ïõ Áðüäïóçò"
 
-#: src/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr "_ÄéáêïðÞ ÅëÝã÷ïõ Áðüäïóçò"
 
-#: src/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "_Áíáßñåóç"
 
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "_ÅðÜíù Ýíá Åðßðåäï"
 
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "_ÐñïâïëÞ"
 
-#: src/nautilus-sidebar.c:659
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -10059,11 +9990,11 @@ msgstr ""
 "Äå ìðïñåßôå íá êáèïñßóåôå ðåñéóóüôåñá áðü Ýíá ðáñáìåôñïðïéçìÝíá åéêïíßäéá! "
 "Ðáñáêáëþ óýñôå ìüíï ìéá åéêüíá ãéá íá èÝóåôå ôï ðáñáìåôñïðïéçìÝíï åéêïíßäéï."
 
-#: src/nautilus-sidebar.c:661
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "Ðåñéóóüôåñåò Áðü Ìßá Åéêüíá"
 
-#: src/nautilus-sidebar.c:680
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -10072,11 +10003,11 @@ msgstr ""
 "ôïðéêÝò åéêüíåò ùò ðáñáìåôñïðïéçìÝíá åéêïíßäéá."
 
 #
-#: src/nautilus-sidebar.c:682
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "ÔïðéêÝò Åéêüíåò Ìüíï"
 
-#: src/nautilus-sidebar.c:687
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -10084,23 +10015,23 @@ msgstr ""
 "Ôï áñ÷åßï ðïõ ñßîáôå äåí åßíáé åéêüíá. Ìðïñåßôå íá ÷ñçóéìïðïéÞóåôå ìüíï "
 "ôïðéêÝò åéêüíåò ùò ðáñáìåôñïðïéçìÝíá åéêïíßäéá."
 
-#: src/nautilus-sidebar.c:689
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "Ìüíï Åéêüíåò"
 
-#: src/nautilus-sidebar.c:1247
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "¶íïéãìá ìå %s"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1283
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "¶íïéãìá ìå..."
 
 #
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1390
+#: src/nautilus-sidebar.c:1424
 msgid "  Empty Trash  "
 msgstr " ¶äåéáóìá ÁðïññéìÜôùí "
 
@@ -10192,17 +10123,17 @@ msgstr "Áäýíáôç ç äéáãñáöÞ èÝìáôïò"
 msgid "No description available for the \"%s\" theme"
 msgstr "Äåí õðÜñ÷åé ðåñéãñáöÞ äéáèÝóéìç ãéá ôï èÝìá \"%s\""
 
-#: src/nautilus-window.c:611
+#: src/nautilus-window.c:637
 msgid "View as ..."
 msgstr "ÐñïâïëÞ ùò ..."
 
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1297
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "ÅìöÜíéóç ùò ¶ëëï..."
 
 #
-#: src/nautilus-window.c:1698
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "Êëåßóéìï"
 
@@ -10216,11 +10147,11 @@ msgstr "Êëåßóéìï"
 msgid "Preview Release %s: %s"
 msgstr "¸êäïóç Ðñïåðéóêüðçóç %s: %s"
 
-#: src/nautilus-window-manage-views.c:812
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "Áðïôõ÷ßá ÐñïâïëÞò"
 
-#: src/nautilus-window-manage-views.c:823
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
@@ -10229,12 +10160,12 @@ msgstr ""
 "Ç üøç %s ðáñïõóßáóå Ýíá óöÜëìá êáé äå ìðïñåß íá óõíå÷ßóåé. Ìðïñåßôå íá "
 "åðéëÝîôå ìéá Üëëç üøç Þ íá ðÜôå óå äéáöïñåôéêÞ ôïðïèåóßá."
 
-#: src/nautilus-window-manage-views.c:834
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "ÐñïÝêõøå óöÜëìá êáôÜ ôçí åêêßíçóç ôçò ðñïâïëÞò %s."
 
-#: src/nautilus-window-manage-views.c:993
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
@@ -10242,7 +10173,7 @@ msgstr ""
 "¸íá áðü ôá ðëåõñéêÜ ôáìðëþ ðáñïõóßáóå Ýíá óöÜëìá êáé äå ìðïñåß íá óõíå÷ßóåé. "
 "Äõóôõ÷þò äåí åßíáé äõíáôüò ï áêñéâÞò åíôïðéóìüò ôïõ."
 
-#: src/nautilus-window-manage-views.c:997
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
@@ -10251,18 +10182,18 @@ msgstr ""
 "Ôï ðëåõñéêü ôáìðëþ %s ðáñïõóßáóå Ýíá óöÜëìá êáé äå ìðïñåß íá óõíå÷ßóåé. Áí "
 "áõôü óõíå÷ßóåé íá óõìâáßíåé, ßóùò èåëÞóåôå íá ôï áðåíåñãïðïéÞóåôå."
 
-#: src/nautilus-window-manage-views.c:1002
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "Áðïôõ÷ßá Ðëåõñéêïý Ôáìðëþ"
 
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr ""
 "Áäýíáôç ç åýñåóç ôïõ \"%s\". Ðáñáêáëþ åëÝãîôå ôçí ïñèïãñáößá êáé äïêéìÜóôå "
 "îáíÜ."
 
-#: src/nautilus-window-manage-views.c:1223
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
@@ -10270,7 +10201,7 @@ msgstr ""
 "Ôï \"%s\" äåí åßíáé Ýãêõñç äéáäñïìÞ. Ðáñáêáëþ åëÝãîôå ôçí ïñèïãñáößá êáé "
 "äïêéìÜóôå îáíÜ."
 
-#: src/nautilus-window-manage-views.c:1237
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -10279,7 +10210,7 @@ msgstr ""
 "Áäýíáôç ç åìöÜíéóç ôïõ \"%s\" äéüôé ï Íáõôßëïò äå ìðïñåß íá äéáêñßíåé ôï "
 "åßäïò ôïõ áñ÷åßïõ."
 
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr ""
@@ -10287,25 +10218,25 @@ msgstr ""
 "\"%s\"."
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1257
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 "Áäýíáôç ç åìöÜíéóç ôïõ \"%s\" äéüôé ï Íáõôßëïò äå ìðïñåß íá ÷åéñéóôåß "
 "äéáäñïìÝò %s:."
 
-#: src/nautilus-window-manage-views.c:1263
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr ""
 "Áäýíáôç ç åìöÜíéóç ôïõ \"%s\" äéüôé áðÝôõ÷å ç ðñïóðÜèåéá áõèåíôéêïðïßçóçò."
 
-#: src/nautilus-window-manage-views.c:1268
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "Áäýíáôç ç åìöÜíéóç ôïõ \"%s\" äéüôé ç ðñüóâáóç áðáãïñåýôçêå."
 
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1287
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
@@ -10315,7 +10246,7 @@ msgstr ""
 "åëÝãîôå üôé ç ïñèïãñáößá åßíáé óùóôÞ êáé üôé ïé ñõèìßóåéò äéáìåóïëáâçôÞ "
 "åßíáé óùóôÝò."
 
-#: src/nautilus-window-manage-views.c:1287
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -10324,7 +10255,7 @@ msgstr ""
 "Áäýíáôç ç åìöÜíéóç ôïõ \"%s\" äéüôé ôï üíïìá óõóôÞìáôïò åßíáé êåíü. ÅëÝãîôå "
 "üôé ïé ñõèìßóåéò äéáìåóïëáâçôÞ åßíáé óùóôÝò."
 
-#: src/nautilus-window-manage-views.c:1299
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -10336,23 +10267,23 @@ msgstr ""
 "Ý÷åôå åêêéíÞóåé ôçí õðçñåóßá áíáæÞôçóçò ÌÝäïõóá êáé áí äåí Ý÷åôå êÜíåé "
 "êáôáëïãñÜöçóç, üôé ôï ðñüãñáììá êáôáëïãñÜöçóçò ÌÝäïõóá åêôåëåßôå."
 
-#: src/nautilus-window-manage-views.c:1303
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "ÁíáæÞôçóç Äåí åßíáé ÄéáèÝóéìç"
 
-#: src/nautilus-window-manage-views.c:1307
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Ï Íáõôßëïò äå ìðïñåß íá áðåéêïíßóåé ôï \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1312
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "Áäýíáôç ç ÅìöÜíéóç ôçò Ôïðïèåóßáò"
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:315
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
@@ -10360,40 +10291,40 @@ msgstr ""
 "Óßãïõñá èÝëåôå íá ëçóìïíÞóåôå ôï éóôïñéêü; Áí íáé, åßóôå êáôáäéêáóìÝíïò/ç íá "
 "ôï åðáíáëÜâåôå."
 
-#: src/nautilus-window-menus.c:318
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
 "Åßóáóôå âÝâáéïé üôé èÝëåôå ï Íáõôßëïò íá ëçóìïíÞóåé ôéò ôïðïèåóßåò ðïõ Ý÷åôå "
 "åðéóêåöôåß;"
 
-#: src/nautilus-window-menus.c:323
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "Ëçóìüíçóç Éóôïñéêïý;"
 
-#: src/nautilus-window-menus.c:324
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "Ëçóìüíçóç"
 
-#: src/nautilus-window-menus.c:427
+#: src/nautilus-window-menus.c:466
 msgid "Show St_atus Bar"
 msgstr "ÅìöÜíéóç _ÃñáììÞò ÊáôÜóôáóçò"
 
 #
-#: src/nautilus-window-menus.c:433
+#: src/nautilus-window-menus.c:472
 msgid "Show _Sidebar"
 msgstr "ÅìöÜíéóç _ÐëåõñéêÞò ÌðÜñáò"
 
-#: src/nautilus-window-menus.c:439
+#: src/nautilus-window-menus.c:478
 msgid "Show _Toolbar"
 msgstr "ÅìöÜíéóç _ÅñãáëåéïèÞêçò"
 
-#: src/nautilus-window-menus.c:445
+#: src/nautilus-window-menus.c:484
 msgid "Show Location _Bar"
 msgstr "ÅìöÜíéóç _ÃñáììÞò Ôïðïèåóßáò"
 
 #
-#: src/nautilus-window-menus.c:496
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "ÐñïôéìÞóåéò"
 
@@ -10404,11 +10335,11 @@ msgstr "ÐñïôéìÞóåéò"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:618
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr "ÐíåõìáôéêÜ äéêáéþìáôá © 1999-2001 Eazel, Inc."
 
-#: src/nautilus-window-menus.c:581
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -10426,11 +10357,11 @@ msgstr ""
 #. * bottom of the about box to give credit
 #. * to the translator(s)
 #.
-#: src/nautilus-window-menus.c:590
+#: src/nautilus-window-menus.c:629
 msgid "Translator Credits"
 msgstr "Ìíåßá Ìåôáöñáóôþí"
 
-#: src/nautilus-window-menus.c:750
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -10439,27 +10370,23 @@ msgstr ""
 "Ç ôïðïèåóßá \"%s\" äåí õðÜñ÷åé. ÈÝëåôå íá äéáãñÜøåôå ôïõò óåëéäïäåßêôåò ìå "
 "áõôÞí ôçí ôïðïèåóßá áðü ôçí ëßóôá óáò;"
 
-#: src/nautilus-window-menus.c:754
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "Óåëéäïäåßêôçò óå Ìç ÕðáñêôÞ Ôïðïèåóßá"
 
-#: src/nautilus-window-menus.c:768
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "Ç ôïðïèåóßá \"%s\" äåí õðÜñ÷åé ðéá."
 
-#: src/nautilus-window-menus.c:769
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "ÐÞãáéíå óå Ìç ÕðáñêôÞ Ôïðïèåóßá"
 
-#: src/nautilus-window-menus.c:838
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "ÐÞãáéíå óôç ôïðïèåóßá ðïõ êáèïñßæåôå áðü ôï öõëëïìåôñçôÞ"
 
-#: src/nautilus-window-menus.c:1331
-msgid "_Browse"
-msgstr "_ÐåñéÞãçóç"
-
 #: src/nautilus-window-toolbars.c:402
 msgid "Back"
 msgstr "Ðßóù"
@@ -10476,6 +10403,121 @@ msgstr "ÌðñïóôÜ"
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-greek-courier-medium-r-normal-*-12-*-*-*-m-*-*-*"
 
+#~ msgid "helvetica"
+#~ msgstr "helveticagr"
+
+#~ msgid "_Fonts"
+#~ msgstr "_ÃñáììáôïóåéñÝò"
+
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "Äå ìðïñåßôå íá ìåôáêéíÞóåôå Ýíá áñ÷åßï ðÜíù óôï ßäéï ôï áñ÷åßï."
+
+#~ msgid "Can't Move Onto Self"
+#~ msgstr "Áäýíáôç ç Ìåôáêßíçóç ÐÜíù óôï ºäéï"
+
+#~ msgid "Normal"
+#~ msgstr "Êáíïíéêü"
+
+#~ msgid "Bold"
+#~ msgstr "Óêïýñï"
+
+#~ msgid "Book"
+#~ msgstr "Âéâëßï"
+
+#~ msgid "Demibold"
+#~ msgstr "Çìéóêïýñï"
+
+#~ msgid "Light"
+#~ msgstr "Öùôåéíü"
+
+#~ msgid "Italic"
+#~ msgstr "ÐëÜãéá"
+
+#
+#~ msgid "Oblique"
+#~ msgstr "ËïîÜ"
+
+#
+#~ msgid "Reverse Italic"
+#~ msgstr "ÁíÜðïäá ÐëÜãéá"
+
+#~ msgid "Reverse Oblique"
+#~ msgstr "ÁíÜðïäá ËïîÜ"
+
+#~ msgid "Condensed"
+#~ msgstr "ÓõìðéåóìÝíá"
+
+#~ msgid "Semicondensed"
+#~ msgstr "¹ìéóõìðéåóìÝíá"
+
+#~ msgid "Pick A Font"
+#~ msgstr "ÅðéëïãÞ ÃñáììáôïóåéñÜò"
+
+#
+#~ msgid "More..."
+#~ msgstr "Ðåñéóóüôåñá..."
+
+#~ msgid "fixed"
+#~ msgstr "grfixed"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00 ðì"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00 ðì"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00 ðì"
+
+#~ msgid "current theme"
+#~ msgstr "ôñÝ÷ùí èÝìá"
+
+#~ msgid "Use this font to display non-smooth text:"
+#~ msgstr ""
+#~ "×ñÞóç áõôÞò ôçò ãñáììáôïóåéñÜò óôçí åìöÜíéóç ìç-ïìáëïðïéçìÝíïõ êåéìÝíïõ:"
+
+#~ msgid "Use this font to display smooth text:"
+#~ msgstr ""
+#~ "×ñÞóç áõôÞò ôçò ãñáììáôïóåéñÜò óôçí åìöÜíéóç ïìáëïðïéçìÝíïõ êåéìÝíïõ:"
+
+#~ msgid "Can add Content"
+#~ msgstr "ÄõíáôÞ ç ðñïóèÞêç Ðåñéå÷ïìÝíïõ"
+
+#~ msgid "No image was selected.  You must click on an image to select it."
+#~ msgstr ""
+#~ "Äåí åðéëÝ÷èçêå åéêüíá. ÐñÝðåé íá êÜíôå êëéê óôçí åéêüíá ãéá íá ôçí åðéëÝîôå."
+
+#~ msgid "No selection made"
+#~ msgstr "Äåí Ýãéíå åðéëïãÞ"
+
+#~ msgid "Remember this password"
+#~ msgstr "Áðïìíçìüíåõóç áõôïý ôïõ êùäéêïý"
+
+#~ msgid "times"
+#~ msgstr "times"
+
+#~ msgid "courier"
+#~ msgstr "courier"
+
+#~ msgid "lucida"
+#~ msgstr "lucida"
+
+#~ msgid "Details"
+#~ msgstr "ËåðôïìÝñåéåò"
+
+#~ msgid "Warning"
+#~ msgstr "Ðñïåéäïðïßçóç"
+
+#
+#~ msgid "Error"
+#~ msgstr "ÓöÜëìá"
+
+#~ msgid "Question"
+#~ msgstr "Åñþôçóç"
+
+#~ msgid "_Browse"
+#~ msgstr "_ÐåñéÞãçóç"
+
 #
 #~ msgid "Font"
 #~ msgstr "ÃñáììáôïóåéñÜ"
diff --git a/po/en_GB.po b/po/en_GB.po
index 922479096..fcdde8be7 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,10 +1,15 @@
 # English (Commonwealth) translation of Nautilus
 # Robert Brady <rwb197@zepler.org>, 2000
 #
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus CVS\n"
-"POT-Creation-Date: 2001-03-05 08:24-0800\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2000-11-09 16:20+0000\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -136,8 +141,8 @@ msgid "Previous"
 msgstr ""
 
 #: components/help/converters/gnome-db2html2/gdb3html.c:721
-#: libnautilus-extensions/nautilus-global-preferences.c:679
-#: src/nautilus-shell-ui.xml.h:38
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr ""
 
@@ -270,73 +275,71 @@ msgstr ""
 #. GNU Public  License  and  many  people  are
 #. working on changes to the kernel)
 #. **
-#: components/help/hyperbola-filefmt.c:529
-#: components/help/hyperbola-filefmt.c:531
-#: components/help/hyperbola-filefmt.c:533
-#: components/help/hyperbola-filefmt.c:535
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
 #: components/help/hyperbola-filefmt.c:536
 #: components/help/hyperbola-filefmt.c:537
 #: components/help/hyperbola-filefmt.c:538
-#: components/help/hyperbola-filefmt.c:540
-#: components/help/hyperbola-filefmt.c:542
+#: components/help/hyperbola-filefmt.c:539
+#: components/help/hyperbola-filefmt.c:541
+#: components/help/hyperbola-filefmt.c:543
 msgid "Manual"
 msgstr ""
 
-#: components/help/hyperbola-filefmt.c:529
-#: components/help/hyperbola-filefmt.c:860 data/linksets/apps.xml.h:1
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:861 data/linksets/apps.xml.h:1
 msgid "Applications"
 msgstr ""
 
-#: components/help/hyperbola-filefmt.c:531
-#: components/help/hyperbola-filefmt.c:533
-#: components/help/hyperbola-filefmt.c:535
-#: components/help/hyperbola-filefmt.c:542
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:543
 msgid "Development"
 msgstr ""
 
-#: components/help/hyperbola-filefmt.c:531
+#: components/help/hyperbola-filefmt.c:532
 msgid "System Calls"
 msgstr ""
 
-#: components/help/hyperbola-filefmt.c:533
+#: components/help/hyperbola-filefmt.c:534
 msgid "Library Functions"
 msgstr ""
 
-#: components/help/hyperbola-filefmt.c:535
+#: components/help/hyperbola-filefmt.c:536
 msgid "Devices"
 msgstr ""
 
-#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:537
 msgid "Configuration Files"
 msgstr ""
 
-#: components/help/hyperbola-filefmt.c:537
+#: components/help/hyperbola-filefmt.c:538
 msgid "Games"
 msgstr ""
 
-#: components/help/hyperbola-filefmt.c:538
+#: components/help/hyperbola-filefmt.c:539
 msgid "Conventions"
 msgstr ""
 
-#: components/help/hyperbola-filefmt.c:540
+#: components/help/hyperbola-filefmt.c:541
 msgid "System Administration"
 msgstr ""
 
-#: components/help/hyperbola-filefmt.c:542
+#: components/help/hyperbola-filefmt.c:543
 msgid "Kernel Routines"
 msgstr ""
 
-#: components/help/hyperbola-filefmt.c:702
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
+#: components/help/hyperbola-filefmt.c:703
 msgid "Info"
 msgstr ""
 
-#: components/help/hyperbola-nav-tree.c:279
+#: components/help/hyperbola-nav-tree.c:310
 msgid "Introductory Documents:"
 msgstr ""
 
-#: components/help/hyperbola-nav-tree.c:293
+#: components/help/hyperbola-nav-tree.c:324
 msgid "Documents by Subject:"
 msgstr ""
 
@@ -409,7 +412,7 @@ msgstr ""
 msgid "History sidebar panel for Nautilus"
 msgstr ""
 
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "I could not initialise Bonobo"
 
@@ -464,7 +467,7 @@ msgstr ""
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr ""
 
@@ -546,7 +549,7 @@ msgid "Sidebar Loser"
 msgstr ""
 
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -554,7 +557,7 @@ msgid ""
 msgstr ""
 
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -708,19 +711,19 @@ msgid "Cyrillic (ISO-IR-111)"
 msgstr ""
 
 #: components/mozilla/nautilus-mozilla-encoding-tables.c:78
-msgid "Cyrillic (KOI8-R)"
+msgid "Cyrillic (MacCyrillic)"
 msgstr ""
 
 #: components/mozilla/nautilus-mozilla-encoding-tables.c:79
-msgid "Cyrillic (MacCyrillic)"
+msgid "Cyrillic (Windows-1251)"
 msgstr ""
 
 #: components/mozilla/nautilus-mozilla-encoding-tables.c:80
-msgid "Cyrillic (Windows-1251)"
+msgid "Cyrillic/Russian (IBM-866)"
 msgstr ""
 
 #: components/mozilla/nautilus-mozilla-encoding-tables.c:81
-msgid "Cyrillic/Russian (IBM-866)"
+msgid "Cyrillic/Russian (KOI8-R)"
 msgstr ""
 
 #: components/mozilla/nautilus-mozilla-encoding-tables.c:82
@@ -1629,10 +1632,10 @@ msgid "Pause"
 msgstr ""
 
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:945
-#: libnautilus-extensions/nautilus-file-operations.c:960
 #: libnautilus-extensions/nautilus-file-operations.c:979
-#: src/nautilus-shell-ui.xml.h:58
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr ""
 
@@ -1694,215 +1697,6 @@ msgstr ""
 msgid "Notes sidebar panel for Nautilus"
 msgstr ""
 
-#. buttons
-#: components/rpmview/nautilus-rpm-verify-window.c:155
-#: components/services/install-view/forms.c:478
-msgid "Continue"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-verify-window.c:160
-#: components/services/install-view/forms.c:482
-#: libnautilus-extensions/nautilus-drag.c:493
-#: src/file-manager/fm-directory-view.c:3503
-msgid "Cancel"
-msgstr ""
-
-#. set up the window title
-#: components/rpmview/nautilus-rpm-verify-window.c:185
-#, c-format
-msgid "Verifying %s..."
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-verify-window.c:209
-#, c-format
-msgid "Failed on \"%s\""
-msgstr ""
-
-#. TRANSLATORS: this is printed while verifying files from packages,
-#. %s is the filename, %d/%d is filenumber of total-number-of-files
-#: components/rpmview/nautilus-rpm-verify-window.c:213
-#, c-format
-msgid "Checking \"%s\" (%ld/%ld)"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:118
-msgid "Package Contents"
-msgstr ""
-
-#. allocate the name field
-#: components/rpmview/nautilus-rpm-view.c:165
-msgid "Package Title"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:186
-msgid "Installed Size: "
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:192
-msgid "<size>"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:198
-msgid "Install Date: "
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:204
-#: components/rpmview/nautilus-rpm-view.c:216
-#: components/rpmview/nautilus-rpm-view.c:228
-#: components/rpmview/nautilus-rpm-view.c:240
-#: components/rpmview/nautilus-rpm-view.c:252
-msgid "<unknown>"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:210
-msgid "License: "
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:222
-msgid "Build Date: "
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:234
-msgid "Distribution: "
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:246
-msgid "Vendor: "
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:279
-#: components/services/install-view/Nautilus_View_install.oaf.in.h:1
-#: components/services/install/server/Trilobite_Service_install.oaf.in.h:2
-#: components/services/summary/nautilus-summary-view.c:123
-msgid "Install"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:295
-msgid "Update"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:304
-msgid "Uninstall"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:320
-msgid "Verify"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:372
-msgid "Description"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:567
-#, c-format
-msgid "Package Contents: %d files"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:573
-#, c-format
-msgid "Package \"%s\" "
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:616
-msgid "This package is currently installed"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:619
-msgid "This package is currently not installed"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:762
-msgid "Verification completed, package ok."
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:119
-#, c-format
-msgid "%s would not work anymore\n"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:122
-#, c-format
-msgid "%s would break other installed packages\n"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:127
-#, c-format
-msgid "%s is needed, but could not be found\n"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:132
-#, c-format
-msgid "%s was already installed\n"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:135
-#, c-format
-msgid "%s causes a circular dependency problem\n"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:140
-msgid "Cannot access the local package system\n"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:156
-#, c-format
-msgid "Installing %s failed because of the following issue(s):\n"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:158
-#, c-format
-msgid "Uninstalling %s failed because of the following issue(s):\n"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:278
-msgid "Uninstall failed..."
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:279
-msgid "Uninstall Failed"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:281
-msgid "Install failed..."
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:282
-msgid "Install Failed"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:342
-#: components/services/install-view/nautilus-service-install-view.c:761
-msgid "Incorrect password."
-msgstr ""
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:1
-msgid "Factory for rpm view"
-msgstr ""
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:2
-msgid "Package"
-msgstr ""
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:3
-msgid "Package Viewer"
-msgstr ""
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:4
-msgid "RPM component"
-msgstr ""
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:5
-msgid "RPM view factory"
-msgstr ""
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:6
-msgid "View as Package"
-msgstr ""
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:7
-msgid "rpm view"
-msgstr ""
-
 #: components/sample/nautilus-sample-content-view.c:136
 msgid "(none)"
 msgstr ""
@@ -1976,7 +1770,7 @@ msgstr ""
 #: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
 #: components/services/install/command-line/eazel-test-packsys.c:590
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr ""
 
@@ -2073,7 +1867,7 @@ msgid "Allow username"
 msgstr ""
 
 #: components/services/install/command-line/eazel-alt-install-corba.c:133
-#: components/services/install/lib/eazel-install-problem.c:1009
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr ""
 
@@ -2109,8 +1903,8 @@ msgid "Feature consistency checking %s...\n"
 msgstr ""
 
 #: components/services/install/command-line/eazel-alt-install-corba.c:343
-#: components/services/install/lib/eazel-install-protocols.c:110
-#: components/services/install/lib/eazel-install-protocols.c:248
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
 #, c-format
 msgid "Downloading %s..."
 msgstr ""
@@ -2216,38 +2010,38 @@ msgstr ""
 #. If you eg. translate this to Danish : "Fortsæt (j/n) " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:634
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
 msgid "Save transaction report ? (y/n) "
 msgstr ""
 
 #. I18N note: y is the letter for the word Yes. This is
 #. used in the response for a yes/no questions. Your translation
 #. must be 1 character only.
-#: components/services/install/command-line/eazel-alt-install-corba.c:645
-#: components/services/install/command-line/eazel-alt-install-corba.c:765
-#: components/services/install/command-line/eazel-alt-install-corba.c:807
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
 msgid "y"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:666
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
 #, c-format
 msgid "Dependency : %s needs %s\n"
 msgstr ""
 
 #. I18N note: %s is a package name
-#: components/services/install/command-line/eazel-alt-install-corba.c:684
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
 #, c-format
 msgid "Package %s failed md5 check!\n"
 msgstr ""
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:686
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
 #, c-format
 msgid "\t· server MD5 checksum is %s\n"
 msgstr ""
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:688
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
 #, c-format
 msgid "\t· actual MD5 checksum is %s\n"
 msgstr ""
@@ -2257,7 +2051,7 @@ msgstr ""
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:754
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
 msgid "Continue? (y/n) "
 msgstr ""
 
@@ -2266,83 +2060,83 @@ msgstr ""
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:795
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
 msgid "Should I delete the RPM files? (y/n) "
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:827
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
 msgid "Operation ok\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:829
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
 msgid "Operation failed\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:949
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
 msgid "Installing"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:958
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
 msgid "Uninstalling"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:973
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
 msgid "Only one operation at a time please."
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:978
-#: components/services/install/command-line/eazel-alt-install-corba.c:986
-#: components/services/install/command-line/eazel-alt-install-corba.c:1030
-#: components/services/install/command-line/eazel-alt-install-corba.c:1037
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
 #, c-format
 msgid "%s: --help for usage\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1002
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
 #, c-format
 msgid "Name         : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1003
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
 #, c-format
 msgid "Version      : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1004
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
 #, c-format
 msgid "Minor        : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1006
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
 #, c-format
 msgid "Size         : %d\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1007
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
 #, c-format
 msgid "Arch         : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1008
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
 #, c-format
 msgid "Distribution : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1009
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
 #, c-format
 msgid "Description  : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1011
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
 #, c-format
 msgid "Install root : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1014
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
 msgid "Provides     : \n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1056
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
 #, c-format
 msgid "exit code %d\n"
 msgstr ""
@@ -2355,122 +2149,127 @@ msgstr ""
 msgid "Use specified file to generate a package list, requires --packagelist"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 msgid "Softcat server to connect to"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 msgid "Number of times to try the request"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+msgid "Lookup package that features a feature/file"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 msgid "use check function (for debugging)"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 msgid "Show detailed sub-package info"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:99
+#: components/services/install/command-line/eazel-test-softcat.c:66
+msgid "enable funk parser"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:116
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:132
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, c-format
 msgid "No MD5 available for %s"
 msgstr ""
 
 #. I18N note: "%is is ok" in the sense that %s=package name and the
 #. package is intact
-#: components/services/install/lib/eazel-install-logic2.c:317
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, c-format
 msgid "%s is ok"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:423
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:427
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:436
-#: components/services/install/lib/eazel-install-logic2.c:441
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:450
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:455
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:508
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:513
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:663
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, c-format
 msgid "Loading package info from file %s"
 msgstr ""
 
 #. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
-#: components/services/install/lib/eazel-install-logic2.c:973
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "ok"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:973
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "not ok"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1139
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
 msgid "Checking dependencies for %s"
 msgstr ""
@@ -2478,230 +2277,235 @@ msgstr ""
 #. I18N note: both %s' are package names.
 #. related is in the sense that the two packages apparently
 #. are connected somehow, eg. foo and foo-devel
-#: components/services/install/lib/eazel-install-logic2.c:1700
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, c-format
 msgid "%s is related to %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1760
+#: components/services/install/lib/eazel-install-logic2.c:2090
 #, c-format
 msgid "updating %s to version %s-%s solves conflict"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1776
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
 msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1783
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, c-format
 msgid "could not revive %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1919
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
 msgid "file uniqueness checking %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1940
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
 msgid "Duplicate file : %s occurs in %s and %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1958
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
+msgid "... but it's ok, the packages are related"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2324
 #, c-format
 msgid "(there were %d other conflicts)"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2053
+#: components/services/install/lib/eazel-install-logic2.c:2419
 #, c-format
 msgid "file conflict checking %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2090
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
 msgid "file conflict : package %s already provides file %s also provided by %s"
 msgstr ""
 
 #. the owner of this file is a package that we're upgrading, and the
 #. * new version no longer has this file, so everything's okay.
-#: components/services/install/lib/eazel-install-logic2.c:2100
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
 msgid "...but it is okay, we're upgrading %s and it ditched that file"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2190
+#: components/services/install/lib/eazel-install-logic2.c:2558
 #, c-format
 msgid "checking feature consistency of %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2258
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
 msgid ""
 "feature missing : %s breaks if %s is installed (feature %s would be lost"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2336
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, c-format
 msgid "downloading %d packages"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2605
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, c-format
 msgid "will upgrade %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2608
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, c-format
 msgid "will downgrade %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2611
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, c-format
 msgid "will install %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2614
+#: components/services/install/lib/eazel-install-logic2.c:2960
 #, c-format
 msgid "will uninstall %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2697
-#: components/services/install/lib/eazel-install-problem.c:335
-#: components/services/install/lib/eazel-install-problem.c:338
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
 #, c-format
 msgid "%s requires %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2861
+#: components/services/install/lib/eazel-install-logic2.c:3238
 #, c-format
 msgid "failed %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-metadata.c:171
+#: components/services/install/lib/eazel-install-metadata.c:174
 msgid "Could not set URLType from config file!"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:713
+#: components/services/install/lib/eazel-install-object.c:717
 msgid "Transactions are not stored, could not find home dir"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:741
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:998
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:1014
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:1087
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:1218
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:1264
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:1387
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:1410
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:159
+#: components/services/install/lib/eazel-install-problem.c:163
 #, c-format
 msgid "%s was cancelled"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:164
-#: components/services/install/lib/eazel-install-problem.c:327
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
 msgid "%s is a source package, which is not yet supported"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:178
-#: components/services/install/lib/eazel-install-problem.c:189
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
 #, c-format
 msgid "%s would break other packages"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:181
+#: components/services/install/lib/eazel-install-problem.c:185
 #, c-format
 msgid "%s would break"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:187
+#: components/services/install/lib/eazel-install-problem.c:191
 #, c-format
 msgid "%s would break %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:193
+#: components/services/install/lib/eazel-install-problem.c:197
 #, c-format
 msgid "%s is damaged"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:197
+#: components/services/install/lib/eazel-install-problem.c:201
 #, c-format
 msgid "%s requires %s, which could not be found on the server"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:200
+#: components/services/install/lib/eazel-install-problem.c:204
 #, c-format
-msgid "%s could not be found on the server"
+msgid "%s for %s could not be found on the server"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:208
-#: components/services/install/lib/eazel-install-problem.c:352
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:252
+#: components/services/install/lib/eazel-install-problem.c:259
 #, c-format
 msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:256
+#: components/services/install/lib/eazel-install-problem.c:263
 #, c-format
 msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:346
+#: components/services/install/lib/eazel-install-problem.c:353
 #, c-format
-msgid "%s is not installed"
+msgid "%s is not installed and could not be found on server"
 msgstr ""
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:911
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr ""
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:922
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr ""
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:937
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr ""
@@ -2709,232 +2513,232 @@ msgstr ""
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:950
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr ""
 
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:958
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:1006
+#: components/services/install/lib/eazel-install-problem.c:1015
 msgid "Continue with force"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:1012
+#: components/services/install/lib/eazel-install-problem.c:1021
 msgid "Allow downgrade"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:123
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:166
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
 #, c-format
 msgid "Could not open target file %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:130
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:92
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
 msgid "Could not create an http request !"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:137
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:99
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
 msgid "Proxy: Invalid uri !"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:142
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:105
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
 msgid "Invalid uri !"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:149
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:115
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
 msgid "Could not prepare http request !"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:154
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:120
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
 msgid "Couldn't get async mode "
 msgstr ""
 
 #. probably out of disk space
-#: components/services/install/lib/eazel-install-protocols.c:183
-#: components/services/install/lib/eazel-install-protocols.c:212
-#: components/services/install/lib/eazel-install-protocols.c:228
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, c-format
 msgid "DISK FULL: could not write %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:189
-#: components/services/install/lib/eazel-install-protocols.c:217
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
 msgid "Could not get request body!"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:202
+#: components/services/install/lib/eazel-install-protocols.c:208
 #, c-format
 msgid "HTTP error: %d %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:249
+#: components/services/install/lib/eazel-install-protocols.c:255
 msgid "FTP not supported yet"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:457
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, c-format
 msgid "Checking local file %s..."
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:578
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, c-format
 msgid "Failed to retrieve %s!"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:651
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, c-format
 msgid "Could not get an URL for %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:666
+#: components/services/install/lib/eazel-install-protocols.c:672
 msgid "Downloaded package does not have the correct name"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:667
+#: components/services/install/lib/eazel-install-protocols.c:673
 #, c-format
 msgid "Package %s should have had name %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:695
+#: components/services/install/lib/eazel-install-protocols.c:701
 msgid "File download failed"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:158
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 msgid "*** No package nodes! (cat has no children) ***"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:160
-#: components/services/install/lib/eazel-install-xml-package-list.c:168
-#: components/services/install/lib/eazel-install-xml-package-list.c:183
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 msgid "*** Bailing from package parse! ***"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:166
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
 msgid "*** No package nodes! ***"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:172
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 msgid "*** Malformed package node!"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:181
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
 msgid "*** No depends nodes! ***"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:187
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:211
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:228
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:233
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:234
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:240
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:241
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:295
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:297
-#: components/services/install/lib/eazel-install-xml-package-list.c:305
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:303
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:339
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:343
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:377
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:467
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:514
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:909
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:914
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:990
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr ""
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:763
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:768
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr ""
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:801
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr ""
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:806
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr ""
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1137
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr ""
@@ -3039,7 +2843,7 @@ msgid "Now installing package \"%s\"."
 msgstr ""
 
 #: components/services/install-view/callbacks.c:407
-#: components/services/install-view/nautilus-service-install-view.c:887
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr ""
@@ -3066,47 +2870,47 @@ msgstr ""
 msgid "Is this ok ?"
 msgstr ""
 
-#: components/services/install-view/callbacks.c:557
+#: components/services/install-view/callbacks.c:556
 msgid "Installation cancelled."
 msgstr ""
 
-#: components/services/install-view/callbacks.c:559
+#: components/services/install-view/callbacks.c:558
 msgid "This package has already been installed."
 msgstr ""
 
-#: components/services/install-view/callbacks.c:561
-#: components/services/install-view/callbacks.c:658
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
 msgid "Installation complete."
 msgstr ""
 
-#: components/services/install-view/callbacks.c:565
+#: components/services/install-view/callbacks.c:564
 msgid "Installation failed."
 msgstr ""
 
 #. some succeeded; some failed
-#: components/services/install-view/callbacks.c:569
+#: components/services/install-view/callbacks.c:568
 msgid "Some packages installed successfully:"
 msgstr ""
 
-#: components/services/install-view/callbacks.c:578
+#: components/services/install-view/callbacks.c:577
 msgid ""
 "\n"
 "Some packages failed:"
 msgstr ""
 
-#: components/services/install-view/callbacks.c:627
+#: components/services/install-view/callbacks.c:626
 msgid "Erase the RPM files?"
 msgstr ""
 
-#: components/services/install-view/callbacks.c:629
+#: components/services/install-view/callbacks.c:628
 msgid "Erase the leftover RPM files?"
 msgstr ""
 
-#: components/services/install-view/callbacks.c:659
+#: components/services/install-view/callbacks.c:658
 msgid "Ok"
 msgstr ""
 
-#: components/services/install-view/callbacks.c:674
+#: components/services/install-view/callbacks.c:673
 msgid ""
 "A core package of Nautilus has been\n"
 "updated.  You should restart Nautilus.\n"
@@ -3168,26 +2972,37 @@ msgstr ""
 msgid "for a total of %ld KB."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:419
+#. buttons
+#: components/services/install-view/forms.c:478
+msgid "Continue"
+msgstr ""
+
+#: components/services/install-view/forms.c:482
+#: libnautilus-extensions/nautilus-drag.c:493
+#: src/file-manager/fm-directory-view.c:4326
+msgid "Cancel"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
 msgid "%s is in GNOME (footprint) > %s"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:437
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, c-format
 msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:452
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
 msgid "%s is in the KDE menu.\n"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:653
+#: components/services/install-view/nautilus-service-install-view.c:655
 msgid "Installation Complete"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:698
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
 msgid ""
 "%sTo start %s, click the Launch button below, or to create a shortcut, drag "
@@ -3195,54 +3010,64 @@ msgid ""
 msgstr ""
 
 #. couldn't find an icon
-#: components/services/install-view/nautilus-service-install-view.c:706
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
 msgid "%sTo start %s, click the Launch button below."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:766
+#: components/services/install-view/nautilus-service-install-view.c:773
+msgid "Incorrect password."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:883
+#: components/services/install-view/nautilus-service-install-view.c:895
 msgid "Installing packages"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:885
+#: components/services/install-view/nautilus-service-install-view.c:897
 msgid "Installing remote package"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:889
+#: components/services/install-view/nautilus-service-install-view.c:901
 msgid "Installing some package"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:906
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:955
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:1013
+#: components/services/install-view/nautilus-service-install-view.c:1025
 #, fuzzy
 msgid "Checking for authorization..."
 msgstr "Custo_misation..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1085
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:1105
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:1106
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr ""
 
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:1
+#: components/services/install/server/Trilobite_Service_install.oaf.in.h:2
+#: components/services/summary/nautilus-summary-view.c:123
+msgid "Install"
+msgstr ""
+
 #: components/services/install-view/Nautilus_View_install.oaf.in.h:2
 msgid "Install Viewer"
 msgstr ""
@@ -3486,12 +3311,12 @@ msgid "Services Login"
 msgstr ""
 
 #: components/services/summary/nautilus-summary-dialogs.c:131
-#: libnautilus-extensions/nautilus-password-dialog.c:269
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr ""
 
 #: components/services/summary/nautilus-summary-dialogs.c:138
-#: libnautilus-extensions/nautilus-password-dialog.c:276
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr ""
 
@@ -3541,11 +3366,11 @@ msgstr ""
 
 #: components/services/summary/nautilus-summary-view.c:170
 #, c-format
-msgid "Welcome, %s!"
+msgid "Eazel Services - Welcome, %s!"
 msgstr ""
 
 #: components/services/summary/nautilus-summary-view.c:175
-msgid "You are not logged in"
+msgid "Eazel Services - You are not logged in"
 msgstr ""
 
 #: components/services/summary/nautilus-summary-view.c:182
@@ -3561,44 +3386,44 @@ msgstr ""
 msgid "Featured Downloads"
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:883
+#: components/services/summary/nautilus-summary-view.c:884
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
 "unavailable right now, or your computer might be configured incorrectly. "
 "Please contact support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:893
+#: components/services/summary/nautilus-summary-view.c:894
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
 "support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:916
+#: components/services/summary/nautilus-summary-view.c:917
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
 "contact support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:958
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
 "now, or your computer might be configured incorrectly. You could try again "
 "later."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:968
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
 "support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:985
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:1048
-#: src/nautilus-first-time-druid.c:250
+#: components/services/summary/nautilus-summary-view.c:1049
+#: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr ""
 
@@ -3662,16 +3487,16 @@ msgstr ""
 msgid "View as Summary"
 msgstr ""
 
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:130
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
 #, c-format
 msgid "HTTP error %d \"%s\" on uri %s"
 msgstr ""
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:200
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:215
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr ""
@@ -3708,57 +3533,64 @@ msgstr ""
 msgid "Factory for the sample service"
 msgstr ""
 
-#. FIXME: eventually, get this from preferences
-#. set up the default font
-#: components/text/nautilus-text-view.c:188
-#: libnautilus-extensions/nautilus-global-preferences.c:267
-#: libnautilus-extensions/nautilus-preferences-item.c:472
-#: src/nautilus-first-time-druid.c:342
-msgid "helvetica"
-msgstr ""
-
-#: components/text/nautilus-text-view.c:330
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr ""
 
-#: components/text/nautilus-text-view.c:331
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr ""
 
 #: components/text/nautilus-text-view-ui.xml.h:1
-msgid "Lucida"
+msgid "F_onts"
 msgstr ""
 
 #: components/text/nautilus-text-view-ui.xml.h:2
-msgid "Use the Courier Font"
+msgid "Lucida"
 msgstr ""
 
 #: components/text/nautilus-text-view-ui.xml.h:3
-msgid "Use the Helvetica Font"
+msgid "Use the Courier Font"
 msgstr ""
 
 #: components/text/nautilus-text-view-ui.xml.h:4
-msgid "Use the Lucida Font"
+msgid "Use the Fixed Font"
 msgstr ""
 
 #: components/text/nautilus-text-view-ui.xml.h:5
-msgid "Use the Times Font"
+msgid "Use the GTK System Font"
 msgstr ""
 
 #: components/text/nautilus-text-view-ui.xml.h:6
-msgid "_Courier"
+msgid "Use the Helvetica Font"
 msgstr ""
 
 #: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
+msgid "Use the Lucida Font"
 msgstr ""
 
 #: components/text/nautilus-text-view-ui.xml.h:8
-msgid "_Helvetica"
+msgid "Use the Times Font"
 msgstr ""
 
 #: components/text/nautilus-text-view-ui.xml.h:9
+msgid "_Courier"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:10
+msgid "_Fixed"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
+msgid "_Helvetica"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr ""
 
@@ -3827,7 +3659,7 @@ msgid "Nautilus Tree view"
 msgstr ""
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:631
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr ""
 
@@ -3951,7 +3783,7 @@ msgstr ""
 msgid "Eclipse"
 msgstr ""
 
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1607
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr ""
 
@@ -4049,7 +3881,7 @@ msgid "Numbers"
 msgstr ""
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr ""
 
@@ -4170,13 +4002,13 @@ msgid "The Gimp"
 msgstr ""
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:547
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr ""
 
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4796
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
-#: src/file-manager/fm-desktop-icon-view.c:65
+#: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
 msgstr "Wastebasket"
 
@@ -4209,7 +4041,7 @@ msgid "Google"
 msgstr ""
 
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:801
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr ""
 
@@ -4278,23 +4110,23 @@ msgid "International"
 msgstr ""
 
 #: data/static_bookmarks.xml.h:18
-msgid "LWN.net"
+msgid "Linux Documentation Project"
 msgstr ""
 
 #: data/static_bookmarks.xml.h:19
-msgid "Linux Documentation Project"
+msgid "Linux One"
 msgstr ""
 
 #: data/static_bookmarks.xml.h:20
-msgid "Linux One"
+msgid "Linux Online"
 msgstr ""
 
 #: data/static_bookmarks.xml.h:21
-msgid "Linux Online"
+msgid "Linux Resources"
 msgstr ""
 
 #: data/static_bookmarks.xml.h:22
-msgid "Linux Resources"
+msgid "Linux Weekly News"
 msgstr ""
 
 #: data/static_bookmarks.xml.h:23
@@ -4464,115 +4296,115 @@ msgstr ""
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2261
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr ""
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2266
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr ""
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2271
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr ""
 
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2276
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3408
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3413
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3417
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr ""
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3720
-#: libnautilus-extensions/nautilus-file.c:3735
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr ""
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3726
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3739
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3741
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr ""
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3746
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3782
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3794
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
 "some other reason."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3798
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
 "aaron@eazel.com"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3812
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr ""
 
@@ -4580,27 +4412,27 @@ msgstr ""
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1156
-#: libnautilus-extensions/nautilus-file.c:3818
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3832
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr ""
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr ""
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:588
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4608,7 +4440,7 @@ msgid ""
 "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:599
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4617,7 +4449,7 @@ msgid ""
 "parent folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:605
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4625,7 +4457,7 @@ msgid ""
 "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:636
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4634,7 +4466,7 @@ msgid ""
 "its parent folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:643
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4643,7 +4475,7 @@ msgid ""
 "change it or its parent folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:667
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -4651,7 +4483,7 @@ msgid ""
 "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:689
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4659,7 +4491,7 @@ msgid ""
 "There is not enough space on the destination."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:694
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4667,7 +4499,7 @@ msgid ""
 "There is not enough space on the destination."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:698
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4675,7 +4507,7 @@ msgid ""
 "There is not enough space on the destination."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:710
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4683,7 +4515,7 @@ msgid ""
 "You do not have permissions to write to this folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4691,7 +4523,7 @@ msgid ""
 "The destination disk is read-only."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:721
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4699,7 +4531,7 @@ msgid ""
 "You do not have permissions to write to this folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:725
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4707,7 +4539,7 @@ msgid ""
 "The destination disk is read-only."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:732
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4715,7 +4547,7 @@ msgid ""
 "You do not have permissions to write to this folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:736
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4723,7 +4555,7 @@ msgid ""
 "The destination disk is read-only."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4731,7 +4563,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4739,7 +4571,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:773
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4747,7 +4579,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4755,7 +4587,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:794
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4763,7 +4595,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4771,7 +4603,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4779,7 +4611,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4787,34 +4619,34 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:924
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:927
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:930
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:935
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:960
-#: libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1057
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4823,7 +4655,7 @@ msgid ""
 "If you still want to move \"%s\", rename it and try again."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1063
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4832,11 +4664,11 @@ msgid ""
 "If you still want to copy \"%s\", rename it and try again."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1081
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4844,22 +4676,22 @@ msgid ""
 "Would you like to replace it?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1092
-#: libnautilus-extensions/nautilus-file-operations.c:1106
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1160
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr ""
@@ -4868,25 +4700,25 @@ msgstr ""
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1180
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1184
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr ""
@@ -4896,314 +4728,290 @@ msgstr ""
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
-#: libnautilus-extensions/nautilus-file-operations.c:2351
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr ""
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
-#: libnautilus-extensions/nautilus-file-operations.c:2351
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr ""
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1212
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr ""
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr ""
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1216
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr ""
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr ""
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr ""
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr ""
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1232
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr ""
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1234
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr ""
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1236
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr ""
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr ""
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1322
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr ""
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1330
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1487
-#: libnautilus-extensions/nautilus-file-operations.c:2066
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1802
-#: libnautilus-extensions/nautilus-file-operations.c:2195
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "Moving files to the Wastebasket"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1804
-#: libnautilus-extensions/nautilus-file-operations.c:2197
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1821
-#: libnautilus-extensions/nautilus-file-operations.c:2199
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1807
-#: libnautilus-extensions/nautilus-file-operations.c:2200
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "Preparing to Move to Wastebasket..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1817
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1822
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1837
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1839
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1848
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "You cannot copy items into the Wastebasket."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "Can't Copy to Wastebasket"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1899
-#: libnautilus-extensions/nautilus-file-operations.c:2157
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "The Wastebasket must remain on the desktop."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 #, fuzzy
 msgid "You cannot move this trash folder."
 msgstr "You cannot copy the Wastebasket."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1902
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "You cannot copy the Wastebasket."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1903
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 #, fuzzy
 msgid "You cannot copy this trash folder."
 msgstr "You cannot copy the Wastebasket."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1905
-#: libnautilus-extensions/nautilus-file-operations.c:2158
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Can't Change Wastebasket Location"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1906
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Can't Copy Wastebasket"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1923
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1924
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1926
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1927
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 #, fuzzy
 msgid "Can't Copy Into Self"
 msgstr "Can't Copy to Wastebasket"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1940
-#, fuzzy
-msgid "You cannot move a file onto itself."
-msgstr "You cannot copy items into the Wastebasket."
-
-#: libnautilus-extensions/nautilus-file-operations.c:1941
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 #, fuzzy
 msgid "You cannot copy a file over itself."
 msgstr "You cannot copy the Wastebasket."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1943
-msgid "Can't Move Onto Self"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-file-operations.c:1944
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 #, fuzzy
 msgid "Can't Copy Over Self"
 msgstr "Can't Copy Wastebasket"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1995
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
 "You do not have permissions to write to the destination."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1998
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
 "There is no space on the destination."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2001
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2005
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr ""
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2092
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2164
-#, c-format
-msgid "You cannot throw \"%s\" into the Trash."
-msgstr "You cannot throw \"%s\" into the Wastebasket."
-
-#: libnautilus-extensions/nautilus-file-operations.c:2168
-msgid "Error Moving to Trash"
-msgstr "Error Moving to Wastebasket"
-
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2240
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2242
-#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2244
-#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Emptying the Wastebasket"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Preparing to Empty the Wastebasket..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2311
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 #, fuzzy
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
@@ -5211,521 +5019,640 @@ msgstr ""
 "Are you sure you want to permanently delete all of the items in the "
 "Wastebasket?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2313
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "Delete Wastebasket Contents?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2314
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2352
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2352
-#: libnautilus-extensions/nautilus-file-operations.c:2362
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2353
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2353
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2354
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2354
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2355
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2355
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2356
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2356
-#: libnautilus-extensions/nautilus-file-operations.c:2363
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2357
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2357
-#: libnautilus-extensions/nautilus-file-operations.c:2377
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2358
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2358
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2359
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2359
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2360
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2360
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2361
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2361
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2362
-#: libnautilus-extensions/nautilus-file-operations.c:2364
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2363
-#: libnautilus-extensions/nautilus-file-operations.c:2365
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2364
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2365
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2366
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2366
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2367
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+msgid "foo (13th copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+msgid "foo (14th copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+msgid "foo (13th copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+msgid "foo (14th copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2367
-#: libnautilus-extensions/nautilus-file-operations.c:2369
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2368
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2368
-#: libnautilus-extensions/nautilus-file-operations.c:2370
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2369
-#: libnautilus-extensions/nautilus-file-operations.c:2371
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2370
-#: libnautilus-extensions/nautilus-file-operations.c:2372
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2371
-#: libnautilus-extensions/nautilus-file-operations.c:2373
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2372
-#: libnautilus-extensions/nautilus-file-operations.c:2374
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2373
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2374
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2375
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2375
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2376
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2376
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2377
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
-#, c-format
-msgid "%ld of %ld"
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+msgid "foo (10th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-font-picker.c:131
-msgid "Font"
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+msgid "foo (11st copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
-msgid "GConf Error"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+msgid "foo (10th copy).txt"
 msgstr ""
 
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:905
-msgid "fixed"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+msgid "foo (11st copy).txt"
 msgstr ""
 
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1364
-msgid "01/01/00, 01:00 AM"
-msgstr "01/01/00, 01:00"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+msgid "foo (11th copy)"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1365
-msgid "1/1/00, 1:00 AM"
-msgstr "1/1/00, 1:00"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+msgid "foo (12nd copy)"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1366
-msgid " 1/ 1/00,  1:00 AM"
-msgstr " 1/ 1/00,  1:00"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+msgid "foo (11th copy).txt"
+msgstr ""
 
-#. Constants
-#: libnautilus-extensions/nautilus-global-preferences.c:45
-msgid "Nautilus Preferences"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+msgid "foo (12nd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:90
-msgid "current theme"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+msgid "foo (12th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:93
-msgid "Open each file or folder in a separate window"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+msgid "foo (13rd copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:96
-#, fuzzy
-msgid "Ask before emptying the Trash"
-msgstr "Ask before deleting items from the wastebasket"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+msgid "foo (12th copy).txt"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:99
-#: libnautilus-extensions/nautilus-global-preferences.c:590
-msgid "Click Behavior"
-msgstr "Click Behaviour"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+msgid "foo (13rd copy).txt"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:102
-msgid "single"
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
+#, c-format
+msgid "%ld of %ld"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:103
-msgid "Activate items with a single click"
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
+msgid "GConf Error"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:107
-msgid "double"
+#. Constants
+#: libnautilus-extensions/nautilus-global-preferences.c:50
+msgid "Nautilus Preferences"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:108
-msgid "Activate items with a double click"
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:112
-#: libnautilus-extensions/nautilus-global-preferences.c:597
-msgid "Executable Text Files"
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:115
-msgid "launch"
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:116
-msgid "Execute files when they are clicked"
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:120
-msgid "display"
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:121
-msgid "Display files when they are clicked"
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:125
-msgid "ask"
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:126
-msgid "Ask each time"
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:136
-#: libnautilus-extensions/nautilus-global-preferences.c:718
-msgid "Show Text in Icons"
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:139
-#: libnautilus-extensions/nautilus-global-preferences.c:725
-msgid "Show Count of Items in Folders"
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+msgid "Font for Icon view:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:142
-#: libnautilus-extensions/nautilus-global-preferences.c:732
-msgid "Show Thumbnails for Image Files"
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
 msgstr ""
 
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:145
-#: libnautilus-extensions/nautilus-global-preferences.c:748
-msgid "Make Folder Appearance Details Public"
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+msgid "Font for List view:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:148
-#: libnautilus-extensions/nautilus-global-preferences.c:739
-msgid "Preview Sound Files"
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:151
-msgid "Use smoother (but slower) graphics"
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:154
-msgid "Use this font family to display file names:"
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:158
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:651
+msgid "Open each file or folder in a separate window"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:658
 msgid "Display toolbar in new windows"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:161
+#: libnautilus-extensions/nautilus-global-preferences.c:665
 msgid "Display location bar in new windows"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:164
+#: libnautilus-extensions/nautilus-global-preferences.c:672
 msgid "Display status bar in new windows"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:167
+#: libnautilus-extensions/nautilus-global-preferences.c:679
 msgid "Display sidebar in new windows"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:170
-msgid "Use Nautilus to draw the desktop"
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "Wastebasket Behaviour"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+#, fuzzy
+msgid "Ask before emptying the Trash or deleting files"
+msgstr "Ask before deleting items from the wastebasket"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:174
-msgid "Enable fast search (indexes your hard drive)"
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:177
-msgid "search type to do by default"
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:180
-msgid "search by text"
+#: libnautilus-extensions/nautilus-global-preferences.c:713
+msgid "single"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:181
-msgid "Search for files by file name only"
+#: libnautilus-extensions/nautilus-global-preferences.c:714
+msgid "Activate items with a single click"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:185
-msgid "search by text and properties"
+#: libnautilus-extensions/nautilus-global-preferences.c:717
+msgid "double"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:186
-msgid "Search for files by file name and file properties"
+#: libnautilus-extensions/nautilus-global-preferences.c:718
+msgid "Activate items with a double click"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:190
-msgid "Search Engine Location"
+#: libnautilus-extensions/nautilus-global-preferences.c:725
+msgid "launch"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:726
+msgid "Execute files when they are clicked"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:729
+msgid "display"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:730
+msgid "Display files when they are clicked"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:733
+msgid "ask"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:194
+#: libnautilus-extensions/nautilus-global-preferences.c:734
+msgid "Ask each time"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "Click Behaviour"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:197
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:200
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:203
-msgid "Show only folders (no files) in the tree"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+msgid "Sorting Order"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:206
-msgid "Can add Content"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:209
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
+msgid "Location:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:213
-#: libnautilus-extensions/nautilus-global-preferences.c:218
-#: src/file-manager/fm-properties-window.c:1519 src/nautilus-location-bar.c:62
-msgid "Location:"
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+msgid "HTTP Proxy Settings"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:217
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr ""
 
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:219
-#: src/nautilus-first-time-druid.c:667
+#: libnautilus-extensions/nautilus-global-preferences.c:812
+#: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:525
-msgid "Appearance"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:527
-msgid "Smoother Graphics"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:534
-msgid "Fonts"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:545
-msgid "Windows & Desktop"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:553
-msgid "Opening New Windows"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:576
-msgid "Trash Behavior"
-msgstr "Wastebasket Behaviour"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:588
-msgid "Icon & List Views"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:604
-msgid "Show/Hide Options"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:625
-msgid "Sidebar Panels"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:628
-#, fuzzy
-msgid "Tabs"
-msgstr "Wastebasket"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:677
-msgid "Navigation"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:686
-msgid "HTTP Proxy Settings"
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:705
-msgid "Built-in Bookmarks"
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+msgid "Navigation"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:716
+#: libnautilus-extensions/nautilus-global-preferences.c:962
 msgid "Speed Tradeoffs"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:787
-msgid "Search"
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+msgid "Search for files by file name only"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+msgid "Search for files by file name and file properties"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:795
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 msgid "Fast Search"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:968
-#, c-format
-msgid "Display %s tab in sidebar"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1015
-msgid "always"
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+msgid "Search Engine Location"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1016
-msgid "Always"
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1019
-msgid "local only"
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1020
-msgid "Local Files Only"
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, c-format
+msgid "Display %s tab in sidebar"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1023
-msgid "never"
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1024
-msgid "Never"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+#, fuzzy
+msgid "Tabs"
+msgstr "Wastebasket"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"currently can't be performed because the program crond, which does nightly "
+"tasks on your computer, is turned off. To make sure fast searches can be "
+"done, turn crond on."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
+msgid "Files May Not Be Indexed"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-gnome-extensions.c:640
-msgid "No image was selected.  You must click on an image to select it."
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
+msgid ""
+"If you are running Linux, you can log in as root and type these commands to "
+"start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-gnome-extensions.c:641
-msgid "No selection made"
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"may not be performed because the program crond, which does nightly tasks on "
+"your computer, may be turned off. To make sure fast searches can be done, "
+"check to make sure that crond is turned on.\n"
+"\n"
 msgstr ""
 
 #. The list of characters that cause line breaks can be localized.
@@ -5733,90 +5660,74 @@ msgstr ""
 msgid " -_,;.?/&"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:741
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
 "manual layout."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:745
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
 "manual layout."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:751
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:754
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:759
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:760
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1551
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1552
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1553
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1554
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-password-dialog.c:306
-msgid "Remember this password"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-preferences-item.c:473
-msgid "times"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-preferences-item.c:474
-msgid "courier"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-preferences-item.c:475
-msgid "lucida"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-preferences.c:76
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:202
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr ""
 
@@ -5915,7 +5826,7 @@ msgid "Don't include in the menu for \"%s\" items"
 msgstr ""
 
 #: libnautilus-extensions/nautilus-program-chooser.c:1209
-#: src/file-manager/fm-list-view.c:2122
+#: src/file-manager/fm-list-view.c:2182
 #: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
@@ -6002,25 +5913,25 @@ msgstr ""
 "You can configure which programs are offered for which file types in the "
 "GNOME Control Centre."
 
-#: libnautilus-extensions/nautilus-program-choosing.c:516
+#: libnautilus-extensions/nautilus-program-choosing.c:492
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
 "locations.  Would you like to choose another application?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-choosing.c:521
-#: libnautilus-extensions/nautilus-program-choosing.c:542
+#: libnautilus-extensions/nautilus-program-choosing.c:497
+#: libnautilus-extensions/nautilus-program-choosing.c:518
 #, fuzzy
 msgid "Can't Open Location"
 msgstr "Can't Change Wastebasket Location"
 
-#: libnautilus-extensions/nautilus-program-choosing.c:537
+#: libnautilus-extensions/nautilus-program-choosing.c:513
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
 "locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you will be able to open it."
+"copy this file onto your computer, you may be able to open it."
 msgstr ""
 
 #. Human readable description for a criterion in a search for
@@ -6264,25 +6175,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr ""
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr ""
@@ -6291,7 +6183,7 @@ msgstr ""
 msgid "Nautilus is searching your disks for trash folders."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-trash-file.c:593
+#: libnautilus-extensions/nautilus-trash-file.c:725
 msgid "on the desktop"
 msgstr ""
 
@@ -6325,157 +6217,182 @@ msgstr ""
 msgid "%s Viewer"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:515
-#: libnautilus-extensions/nautilus-volume-monitor.c:534
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
 msgid "Unknown"
 msgstr ""
 
 #. Populate table with items we know localized names for.
-#: libnautilus-extensions/nautilus-volume-monitor.c:621
-#: libnautilus-extensions/nautilus-volume-monitor.c:1835
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:622
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
 msgid "CD-ROM"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:623
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
 msgid "Zip Drive"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:644
-#: libnautilus-extensions/nautilus-volume-monitor.c:666
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 msgid "Audio CD"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1536
-msgid "Mount Error"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1538
-msgid "Unmount Error"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1568
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1571
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1572
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr ""
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1576
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
 msgstr ""
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1580
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1583
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1586
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1589
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1594
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1596
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr ""
 
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1601
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1753
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1768
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1775
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1790
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1805
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1820
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
 msgid "ReiserFS Volume"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1850
-msgid "Unknown Volume"
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
+msgid "UFS Volume"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1900
-#, c-format
-msgid ""
-"Nautilus doesn't know about mount type %s. Please email this message to "
-"gzr@eazel.com."
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
+msgid "Unknown Volume"
 msgstr ""
 
 #: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:5
 msgid "C_lear Text"
 msgstr ""
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+msgid "Clear Text"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+msgid "Copy Text"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr ""
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+msgid "Cut Text"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+msgid "Cut _Text"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr ""
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:45
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+msgid "Paste Text"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr ""
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr ""
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:77
-msgid "_Copy Text"
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+msgid "Select All"
 msgstr ""
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:7
-msgid "_Cut Text"
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+msgid "Select _All"
 msgstr ""
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:91
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+msgid "Select all the text in a text field"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
+msgid "_Copy Text"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr ""
 
@@ -6484,7 +6401,7 @@ msgstr ""
 #. * to change it when we upgrade to GTK 2.0.
 #.
 #: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
-#: src/nautilus-window-menus.c:563
+#: src/nautilus-window-menus.c:610
 msgid "Nautilus"
 msgstr ""
 
@@ -6500,79 +6417,110 @@ msgstr ""
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:735
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr ""
 
-#: src/file-manager/fm-desktop-icon-view.c:1021
+#: src/file-manager/fm-desktop-icon-view.c:1175
 #, fuzzy
 msgid "Empty Trash..."
 msgstr "_Empty Trash..."
 
-#: src/file-manager/fm-desktop-icon-view.c:1023
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "Empty Wastebasket"
 
-#: src/file-manager/fm-desktop-icon-view.c:1043
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:474
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:476
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1199
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr ""
+"Are you sure you want to permanently delete \"%s\" from the wastebasket?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+"Are you sure you want to permanently delete the %d selected items from the "
+"wastebasket?"
+
+#: src/file-manager/fm-directory-view.c:758
+msgid "Delete?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr ""
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+msgid "scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1201
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1204
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1210
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1212
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1214
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1225
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1229
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1236
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1239
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr ""
@@ -6584,7 +6532,7 @@ msgstr ""
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1268
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr ""
@@ -6593,18 +6541,18 @@ msgstr ""
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1395
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
 "will not be displayed."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1402
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2599
+#: src/file-manager/fm-directory-view.c:2752
 #, fuzzy, c-format
 msgid ""
 "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
@@ -6612,7 +6560,7 @@ msgstr ""
 "\"%s\" cannot be moved to the wastebasket. Do you want to delete it "
 "immediately?"
 
-#: src/file-manager/fm-directory-view.c:2604
+#: src/file-manager/fm-directory-view.c:2757
 #, fuzzy, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
@@ -6621,7 +6569,7 @@ msgstr ""
 "The %d selected items cannot be moved to the wastebasket. Do you want to "
 "delete them immediately?"
 
-#: src/file-manager/fm-directory-view.c:2608
+#: src/file-manager/fm-directory-view.c:2761
 #, fuzzy, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -6630,22 +6578,17 @@ msgstr ""
 "%d of the selected items cannot be moved to the wastebasket. Do you want to "
 "delete those %d items immediately?"
 
-#: src/file-manager/fm-directory-view.c:2616
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2617
-#: src/file-manager/fm-directory-view.c:2658
-msgid "Delete"
-msgstr ""
-
-#: src/file-manager/fm-directory-view.c:2647
+#: src/file-manager/fm-directory-view.c:2799
 #, fuzzy, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr ""
 "Are you sure you want to permanently delete \"%s\" from the wastebasket?"
 
-#: src/file-manager/fm-directory-view.c:2651
+#: src/file-manager/fm-directory-view.c:2803
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
@@ -6654,74 +6597,202 @@ msgstr ""
 "Are you sure you want to permanently delete the %d selected items from the "
 "wastebasket?"
 
-#: src/file-manager/fm-directory-view.c:2657
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "Delete From Wastebasket?"
 
-#: src/file-manager/fm-directory-view.c:2930
-#: src/file-manager/fm-directory-view.c:2970
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3172
-msgid "Open in _New Window"
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3174
+#: src/file-manager/fm-directory-view.c:3232
+msgid "An _Application..."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3238
+msgid "A _Viewer..."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3451
 #, c-format
-msgid "Open in %d _New Windows"
+msgid "Run \"%s\" on any selected items"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3200
-msgid "Delete all selected items permanently"
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "The Wastebasket must remain on the desktop."
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"The %d selected items cannot be moved to the wastebasket. Do you want to "
+"delete them immediately?"
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3205
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+msgid "Open _in This Window"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+msgid "Open _in New Window"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3959
+#, c-format
+msgid "Open _in %d New Windows"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "Delete from _Wastebasket..."
 
-#: src/file-manager/fm-directory-view.c:3206
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "Delete from _Wastebasket"
 
-#: src/file-manager/fm-directory-view.c:3210
-msgid "Move all selected items to the Trash"
-msgstr "Move all selected items to the Wastebasket"
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3214
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "Move to _Wastebasket"
 
-#: src/file-manager/fm-directory-view.c:3244
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "Move all selected items to the Wastebasket"
+
+#: src/file-manager/fm-directory-view.c:4015
+msgid "De_lete..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3245
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+msgid "De_lete"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4038
+msgid "Make _Links"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+msgid "Make _Link"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3263
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "_Empty Trash..."
 
-#: src/file-manager/fm-directory-view.c:3264
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "_Empty Trash"
 
-#: src/file-manager/fm-directory-view.c:3275
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3276
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3429
+#: src/file-manager/fm-directory-view.c:4083
+msgid "Cu_t File"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+msgid "Cu_t Files"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4094
+msgid "_Copy File"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+msgid "_Copy Files"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4252
 #, fuzzy
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
@@ -6730,7 +6801,7 @@ msgstr ""
 "This link can't be used, because it has no target. Do you want to put this "
 "link in the wastebasket?"
 
-#: src/file-manager/fm-directory-view.c:3432
+#: src/file-manager/fm-directory-view.c:4255
 #, fuzzy, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
@@ -6739,49 +6810,49 @@ msgstr ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
 "want to put this link in the wastebasket?"
 
-#: src/file-manager/fm-directory-view.c:3438
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3439
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3492
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
 "contents?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3498
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3499
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3500
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3554
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3556
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3690
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3696
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr ""
 
@@ -6791,113 +6862,118 @@ msgid ""
 "You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:65
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:109
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:124
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:133
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:140
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:172
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:176
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:198
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:205
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:230
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:237
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:306
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:311
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr ""
 
@@ -6955,76 +7031,76 @@ msgid ""
 "information appears as you zoom in closer."
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:157
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:164
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:171
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:178
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:185
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:1229
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:1230
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:1442
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr ""
 
-#: src/file-manager/fm-list-view.c:2128
+#: src/file-manager/fm-list-view.c:2188
 #: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr ""
 
-#: src/file-manager/fm-list-view.c:2134
+#: src/file-manager/fm-list-view.c:2194
 #: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr ""
 
-#: src/file-manager/fm-list-view.c:2140
+#: src/file-manager/fm-list-view.c:2200
 #: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr ""
@@ -7081,121 +7157,125 @@ msgstr ""
 msgid "Contents:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1433
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1512
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1517
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1521
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1531
+msgid "Link Target:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1527
+#: src/file-manager/fm-properties-window.c:1534
+msgid "MIME Type:"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1530
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1539
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1545
+#: src/file-manager/fm-properties-window.c:1558
 #, fuzzy
 msgid "Remove Custom Icon"
 msgstr "Remove a colour"
 
-#: src/file-manager/fm-properties-window.c:1873
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1878
+#: src/file-manager/fm-properties-window.c:1891
 msgid "Special Flags:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1881
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1883
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1909
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1915
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1928
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1937
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1955
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1956
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1957
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1976
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1980
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1984
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2035
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2036
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2037
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2041
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2322
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2422
+#: src/file-manager/fm-properties-window.c:2435
 #, fuzzy
 msgid "Select an icon:"
 msgstr "Select a colour to add:"
@@ -7218,7 +7298,7 @@ msgid ""
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:159
-#: src/file-manager/nautilus-indexing-info.c:405
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr ""
 
@@ -7359,7 +7439,7 @@ msgstr ""
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
 #: src/file-manager/fm-search-list-view.c:360
-#: src/file-manager/nautilus-indexing-info.c:340
+#: src/file-manager/nautilus-indexing-info.c:342
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
@@ -7371,20 +7451,20 @@ msgid "Fast searches are not available on your computer"
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:373
-#: src/file-manager/nautilus-indexing-info.c:359
+#: src/file-manager/nautilus-indexing-info.c:361
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Fast search is disabled in your Search preferences, so no index is available."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:376
-#: src/file-manager/nautilus-indexing-info.c:345
-#: src/file-manager/nautilus-indexing-info.c:363
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
 msgid "Fast searches are not available on your computer."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:377
-#: src/file-manager/nautilus-indexing-info.c:364
+#: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
 "To enable fast search, open the Preferences menu and choose Preferences. "
 "Then select Search preferences and put a checkmark in the Enable Fast Search "
@@ -7436,7 +7516,7 @@ msgid "Change Desktop Background"
 msgstr ""
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 #, fuzzy
 msgid "Delete all items in the Trash"
 msgstr "Delete all items in the wastebasket"
@@ -7483,143 +7563,189 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-msgid "Create Link"
+msgid "Copy Files"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Cut Files"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "Move each selected item to the Wastebasket"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+msgid "Make Link"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr "Move each selected item to the Wastebasket"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 #, fuzzy
 msgid "Move to Trash"
 msgstr "Move to _Wastebasket"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
-msgid "New _Folder"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+msgid "Open"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
-msgid "Open"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+msgid "Open Wit_h"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
-msgid "Other _Application..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+msgid "Paste Files"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Other _Viewer..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr ""
 
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+msgid "Scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+msgid "Select _All Files"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 #, fuzzy
 msgid "Show Trash"
 msgstr "Wastebasket"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 #, fuzzy
 msgid "Show the contents of the Trash"
 msgstr "You cannot copy the Wastebasket."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+msgid "_New Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
-msgid "_Open in New Window"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
-msgid "_Select All Files"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+msgid "_Paste Files"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 #, fuzzy
 msgid "_Show Trash"
 msgstr "Wastebasket"
@@ -7793,7 +7919,7 @@ msgstr ""
 
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr ""
 
@@ -7809,21 +7935,21 @@ msgstr ""
 msgid "Your files were last indexed at %s"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast.  Your files are currently being indexed."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:404
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:426
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr ""
 
@@ -7971,7 +8097,7 @@ msgstr ""
 msgid "Location"
 msgstr ""
 
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:757
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr ""
 
@@ -7988,7 +8114,7 @@ msgstr ""
 msgid "Find Them!"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:180
+#: src/nautilus-first-time-druid.c:191
 msgid ""
 "Existence of this file indicates that the Nautilus configuration druid\n"
 "has been presented.\n"
@@ -7997,36 +8123,32 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:342
-msgid "medium"
-msgstr ""
-
-#: src/nautilus-first-time-druid.c:471
+#: src/nautilus-first-time-druid.c:487
 msgid ""
 "Your user level adjusts Nautilus to your degree of experience\n"
 "using GNOME and Linux. Choose a level that's comfortable for\n"
 "you - you can always change it later."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:482
+#: src/nautilus-first-time-druid.c:498
 msgid ""
 "For users who have no previous experience with GNOME\n"
 "and Linux."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:488
+#: src/nautilus-first-time-druid.c:504
 msgid ""
 "For users who are comfortable with GNOME and Linux,\n"
 "but don't describe themselves as ``technical.''"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:494
+#: src/nautilus-first-time-druid.c:510
 msgid ""
 "For users who have GNOME and Linux experience, and\n"
 "like to see every detail of the operating system."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:532
+#: src/nautilus-first-time-druid.c:548
 msgid ""
 "To verify your Internet connection and make sure you have\n"
 "the latest Nautilus updates, Nautilus will now connect to\n"
@@ -8038,100 +8160,117 @@ msgid ""
 "Verify and Nautilus will use it.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:546
+#: src/nautilus-first-time-druid.c:562
 msgid "Verify my connection and check for updates"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:547
+#: src/nautilus-first-time-druid.c:563
 msgid "Don't verify my connection or check for updates"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:612
+#: src/nautilus-first-time-druid.c:628
 msgid ""
 "We are having trouble making an external web connection.\n"
 "Sometimes, firewalls require you to specify a web proxy server.\n"
 "Fill in the name or port of your proxy server, if any, below."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:624
+#: src/nautilus-first-time-druid.c:640
 msgid "No proxy server required."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:625
+#: src/nautilus-first-time-druid.c:641
 msgid "Use this proxy server:"
 msgstr ""
 
 #. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:650
+#: src/nautilus-first-time-druid.c:666
 msgid "Proxy address:"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:712
+#: src/nautilus-first-time-druid.c:728
 msgid "Verifying your Internet connection and checking for updates..."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:720
+#: src/nautilus-first-time-druid.c:736
 msgid "Downloading Nautilus updates..."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:873
+#: src/nautilus-first-time-druid.c:906
 msgid ""
 "If you have been using the GNOME Midnight Commander\n"
 "these settings move your desktop icons to Nautilus and\n"
 "make Nautilus the default desktop.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:880
+#: src/nautilus-first-time-druid.c:913
 #, fuzzy
 msgid "Use Nautilus to draw the desktop."
 msgstr "The Wastebasket must remain on the desktop."
 
-#: src/nautilus-first-time-druid.c:886
+#: src/nautilus-first-time-druid.c:919
 msgid "Move existing desktop icons to the Nautilus desktop."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:891
+#. This option is currently disabled, per bugzilla.eazel.com 7557
+#: src/nautilus-first-time-druid.c:927
 msgid "Launch Nautilus when GNOME starts up."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:926
+#: src/nautilus-first-time-druid.c:967
 msgid ""
 "The fast search feature indexes all the items on your hard disk.\n"
 "It speeds up searching and allows you to search by file content\n"
-"as well as filename, date, and other file properties. The indexing\n"
+"as well as filename, date, and other file properties.  The indexing\n"
 "takes time but is performed only when your computer is idle.\n"
+"Fast search requires that the cron daemon on your system be running.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:934
-msgid "Enable fast search"
+#: src/nautilus-first-time-druid.c:972
+msgid ""
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties. The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1028
-msgid "Nautilus First Time Setup"
+#: src/nautilus-first-time-druid.c:981
+msgid "Enable fast search"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1058
-msgid "Welcome to Nautilus"
+#: src/nautilus-first-time-druid.c:982
+msgid "Turn fast search on when cron is enabled"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1060
+#: src/nautilus-first-time-druid.c:1027
 msgid ""
-"Nautilus is part of your GNOME desktop environment. It\n"
-"helps you manage your files and folders (directories),\n"
-"view documents, connect to the Internet, and do many\n"
-"other tasks.\n"
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"currently can't be performed because the program crond, which does\n"
+"nightly tasks on your computer, is turned off. To make sure fast searches\n"
+"can be done, turn crond on.\n"
 "\n"
-"The next four screens ask about your level of Linux\n"
-"experience, and check your Internet connection. Click Next\n"
-"to continue."
+"If you are running Linux, you can log in as root and type these commands \n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#. set up the final page
-#: src/nautilus-first-time-druid.c:1072
-msgid "Finished"
+#: src/nautilus-first-time-druid.c:1035
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"may not be performed because the program crond, which does nightly tasks\n"
+"on your computer, may be turned off. To make sure fast searches can be\n"
+"done, check to make sure that crond is turned on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands\n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1079
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
 "Click Finish to launch Nautilus. You'll start with two\n"
 "Nautilus windows: one shows your home folder, and the\n"
@@ -8141,42 +8280,79 @@ msgid ""
 "We hope you enjoy Nautilus!"
 msgstr ""
 
+#: src/nautilus-first-time-druid.c:1129
+msgid ""
+"Click Finish to launch Nautilus. You'll start with a\n"
+"window showing your home folder.\n"
+"\n"
+"We hope you enjoy Nautilus!"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1153
+msgid "Nautilus First Time Setup"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1183
+msgid "Welcome to Nautilus"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1185
+msgid ""
+"Nautilus...\n"
+"    Is a great file manager for the GNOME desktop.\n"
+"    Provides a simple intuitive way to access Internet services.\n"
+"    Is an extensible framework for GNOME developers.\n"
+"    Provides a powerful delivery platform for service providers.\n"
+"\n"
+"Click Next to begin customizing your Nautilus environment."
+msgstr ""
+
+#. set up the final page
+#: src/nautilus-first-time-druid.c:1196
+msgid "Finished"
+msgstr ""
+
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1088
+#: src/nautilus-first-time-druid.c:1209
 msgid "Choose Your User Level"
 msgstr ""
 
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1092
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr ""
 
 #. set up the `Launch Medusa' page
-#: src/nautilus-first-time-druid.c:1096
+#: src/nautilus-first-time-druid.c:1217
 msgid "Fast Searches"
 msgstr ""
 
+#. set up optional page to tell the user how to run cron
+#: src/nautilus-first-time-druid.c:1225
+msgid "The Cron Daemon"
+msgstr ""
+
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1100
+#: src/nautilus-first-time-druid.c:1230
 msgid "Checking Your Internet Connection"
 msgstr ""
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1108
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr ""
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1116
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr ""
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1191
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1208
+#: src/nautilus-first-time-druid.c:1341
 msgid "Update Complete. Click Next to Continue."
 msgstr ""
 
@@ -8184,7 +8360,7 @@ msgstr ""
 #. * doesn't exist. Arlo and I (jsh) and decided that the
 #. * best thing to do is silently fail
 #.
-#: src/nautilus-first-time-druid.c:1221
+#: src/nautilus-first-time-druid.c:1356
 msgid "No Update Available... Press Next to Continue."
 msgstr ""
 
@@ -8211,47 +8387,47 @@ msgstr ""
 msgid "View in Multiple Windows?"
 msgstr ""
 
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr ""
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr ""
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr ""
 
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr ""
 
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr ""
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 
@@ -8738,15 +8914,15 @@ msgid "View as List"
 msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+msgid " _Advanced"
 msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:2
-msgid " Beginner"
+msgid " _Beginner"
 msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:3
-msgid " Intermediate"
+msgid " _Intermediate"
 msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:4
@@ -8786,287 +8962,291 @@ msgid "Close this window"
 msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:15
-msgid "Cut _Text"
-msgstr ""
-
-#: src/nautilus-shell-ui.xml.h:17
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:19
 msgid "Display quick reference pages for Nautilus"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:22
+#: src/nautilus-shell-ui.xml.h:20
 msgid "Display release notes for Nautilus"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:23
+#: src/nautilus-shell-ui.xml.h:21
 msgid "Display support information for Nautilus and Eazel Services"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:24
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Display the latest contents of the current location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:25
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:24
 msgid "Edit various Nautilus preferences"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:29
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:32
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:33
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:442
-msgid "Hide Location Bar"
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
+msgid "Hide Location _Bar"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:430
-msgid "Hide Sidebar"
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
+msgid "Hide St_atus Bar"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:36 src/nautilus-window-menus.c:424
-msgid "Hide Status Bar"
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
+msgid "Hide _Sidebar"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:37 src/nautilus-window-menus.c:436
-msgid "Hide Toolbar"
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
+msgid "Hide _Toolbar"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:37
 msgid "Nautilus Quick _Reference"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:38
 msgid "Nautilus Release _Notes"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:39
 msgid "Nautilus User _Manual"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:43
-msgid "Normal Size"
+#: src/nautilus-shell-ui.xml.h:41
+msgid "New _Window"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:44
-msgid "Open another Nautilus window for the displayed location"
+#: src/nautilus-shell-ui.xml.h:42
+msgid "Normal Size"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:46
-msgid "Preferences..."
+#: src/nautilus-shell-ui.xml.h:43
+msgid "Open another Nautilus window for the displayed location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:47
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:48
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr ""
-
-#: src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:54
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:60
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:61
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:63
-msgid "Use Advanced settings"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:64
-msgid "Use Beginner settings"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:65
-msgid "Use Intermediate settings"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:66
+#: src/nautilus-shell-ui.xml.h:63
+msgid "We_b Search"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:67
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:76
 msgid "_Customer Support"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:80
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:79
+msgid "_Edit Preferences..."
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:80
 msgid "_Feedback"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:83 src/nautilus-window-menus.c:1352
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:84
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:86
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:87
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr ""
 
+#: src/nautilus-shell-ui.xml.h:87
+msgid "_Location..."
+msgstr ""
+
 #: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:89
-msgid "_New Window"
+msgid "_Normal Size"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:90
-msgid "_Normal Size"
+#: src/nautilus-shell-ui.xml.h:91
+msgid "_Preferences"
 msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:92
@@ -9086,75 +9266,67 @@ msgid "_Reset Profiling"
 msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:96
-msgid "_Select All"
-msgstr ""
-
-#: src/nautilus-shell-ui.xml.h:97
 msgid "_Start Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:100
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:101
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:102
-msgid "_Web Search"
-msgstr ""
-
-#: src/nautilus-sidebar.c:659
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
 msgstr ""
 
-#: src/nautilus-sidebar.c:661
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr ""
 
-#: src/nautilus-sidebar.c:680
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
 msgstr ""
 
-#: src/nautilus-sidebar.c:682
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr ""
 
-#: src/nautilus-sidebar.c:687
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
 msgstr ""
 
-#: src/nautilus-sidebar.c:689
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr ""
 
-#: src/nautilus-sidebar.c:1247
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr ""
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1283
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr ""
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1390
+#: src/nautilus-sidebar.c:1424
 #, fuzzy
 msgid "  Empty Trash  "
 msgstr "Empty Wastebasket"
@@ -9244,16 +9416,16 @@ msgstr ""
 msgid "No description available for the \"%s\" theme"
 msgstr ""
 
-#: src/nautilus-window.c:584
+#: src/nautilus-window.c:637
 msgid "View as ..."
 msgstr ""
 
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1286
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr ""
 
-#: src/nautilus-window.c:1687
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr ""
 
@@ -9267,93 +9439,93 @@ msgstr ""
 msgid "Preview Release %s: %s"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:812
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:823
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
 "view or go to a different location."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:834
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:993
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:997
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
 "happening, you might want to turn this panel off."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1002
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1223
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1237
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
 "it is."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr ""
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1257
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1263
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1268
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1287
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
 "the spelling is correct and that your proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1287
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
 "proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1299
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -9361,58 +9533,59 @@ msgid ""
 "running."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1303
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1307
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1312
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr ""
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:313
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
 msgstr ""
 
-#: src/nautilus-window-menus.c:316
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
 
-#: src/nautilus-window-menus.c:321
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr ""
 
-#: src/nautilus-window-menus.c:322
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr ""
 
-#: src/nautilus-window-menus.c:425
-msgid "Show Status Bar"
+#: src/nautilus-window-menus.c:466
+msgid "Show St_atus Bar"
 msgstr ""
 
-#: src/nautilus-window-menus.c:431
-msgid "Show Sidebar"
+#: src/nautilus-window-menus.c:472
+msgid "Show _Sidebar"
 msgstr ""
 
-#: src/nautilus-window-menus.c:437
-msgid "Show Toolbar"
-msgstr ""
+#: src/nautilus-window-menus.c:478
+#, fuzzy
+msgid "Show _Toolbar"
+msgstr "Wastebasket"
 
-#: src/nautilus-window-menus.c:443
-msgid "Show Location Bar"
+#: src/nautilus-window-menus.c:484
+msgid "Show Location _Bar"
 msgstr ""
 
-#: src/nautilus-window-menus.c:494
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr ""
 
@@ -9422,11 +9595,11 @@ msgstr ""
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:571
+#: src/nautilus-window-menus.c:618
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr ""
 
-#: src/nautilus-window-menus.c:573
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -9439,38 +9612,34 @@ msgstr ""
 #. * bottom of the about box to give credit
 #. * to the translator(s)
 #.
-#: src/nautilus-window-menus.c:582
+#: src/nautilus-window-menus.c:629
 msgid "Translator Credits"
 msgstr ""
 
-#: src/nautilus-window-menus.c:752
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
 "this location from your list?"
 msgstr ""
 
-#: src/nautilus-window-menus.c:756
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr ""
 
-#: src/nautilus-window-menus.c:770
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr ""
 
-#: src/nautilus-window-menus.c:771
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr ""
 
-#: src/nautilus-window-menus.c:840
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr ""
 
-#: src/nautilus-window-menus.c:1351
-msgid "_Browse"
-msgstr ""
-
 #: src/nautilus-window-toolbars.c:402
 msgid "Back"
 msgstr ""
@@ -9486,6 +9655,25 @@ msgstr ""
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr ""
 
+#, fuzzy
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "You cannot copy items into the Wastebasket."
+
+#~ msgid "You cannot throw \"%s\" into the Trash."
+#~ msgstr "You cannot throw \"%s\" into the Wastebasket."
+
+#~ msgid "Error Moving to Trash"
+#~ msgstr "Error Moving to Wastebasket"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00"
+
 #~ msgid "Window Behavior"
 #~ msgstr "Window Behaviour"
 
diff --git a/po/es.po b/po/es.po
index 64be1b1d2..157b29369 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,10 +1,15 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Pablo Gonzalo del Campo <pablodc@bigfoot.com>, 2000.
 # Carlos Perelló Marín <carlos@hispalinux.es>, 2000
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus\n"
-"POT-Creation-Date: 2001-03-08 21:00-0400\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-03-08 21:09-0400\n"
 "Last-Translator: Pablo Gonzalo del Campo <pablodc@bigfoot.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -54,8 +59,8 @@ msgstr "Original para las fabricas de componente adaptador Nautilus"
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:3
 msgid ""
-"Factory for objects that wrap ordinary Bonobo Controls or Embeddables to look "
-"like Nautilus Views"
+"Factory for objects that wrap ordinary Bonobo Controls or Embeddables to "
+"look like Nautilus Views"
 msgstr ""
 "Original para objetos que contienen controles Bonobo o Incrustables para "
 "verse como las Vistas Nautilus"
@@ -145,8 +150,8 @@ msgid "Previous"
 msgstr "Anterior"
 
 #: components/help/converters/gnome-db2html2/gdb3html.c:721
-#: libnautilus-extensions/nautilus-global-preferences.c:686
-#: src/nautilus-shell-ui.xml.h:38
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "Inicio"
 
@@ -357,16 +362,14 @@ msgstr "Rutinal del Kernel"
 
 # components/help/hyperbola-filefmt.c:556
 #: components/help/hyperbola-filefmt.c:703
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
 msgid "Info"
 msgstr "Info"
 
-#: components/help/hyperbola-nav-tree.c:279
+#: components/help/hyperbola-nav-tree.c:310
 msgid "Introductory Documents:"
 msgstr "Documentos Introductorios:"
 
-#: components/help/hyperbola-nav-tree.c:293
+#: components/help/hyperbola-nav-tree.c:324
 msgid "Documents by Subject:"
 msgstr "Documentos por asunto:"
 
@@ -454,7 +457,7 @@ msgid "History sidebar panel for Nautilus"
 msgstr "Solapa Histórico para Nautilus"
 
 # components/services/trilobite/libtrilobite/trilobite-core-utils.c:197
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "No se pudo inicializar Bonobo"
 
@@ -516,7 +519,7 @@ msgstr "Eliminar la vista de contenido perdido"
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "_Archivo"
 
@@ -609,7 +612,7 @@ msgstr "Barra Lateral Perdida"
 
 # components/services/install/lib/eazel-install-protocols.c:137
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -619,7 +622,7 @@ msgstr ""
 "  %s"
 
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -1078,7 +1081,6 @@ msgstr "Viejitos"
 
 # src/file-manager/fm-properties-window.c:1560
 #: components/music/mpg123.c:32
-#: libnautilus-extensions/nautilus-font-picker.c:117
 msgid "Other"
 msgstr "Otro"
 
@@ -1748,8 +1750,8 @@ msgid ""
 "not configured properly. Try quitting any applications that may be blocking "
 "use of the sound card."
 msgstr ""
-"Lo siento, pero la vista de música no puede reproducir ahora, o otro programa "
-"esta bloqueando la tarjeta de sonido o su tarjeta de sonido no esta "
+"Lo siento, pero la vista de música no puede reproducir ahora, o otro "
+"programa esta bloqueando la tarjeta de sonido o su tarjeta de sonido no esta "
 "configurada correctamente. Intente cerrar cualquier aplicación que pudiese "
 "estar bloqueando la tarjeta de sonido."
 
@@ -1785,10 +1787,10 @@ msgstr "Pausa"
 # src/file-manager/dfos-xfer.c:352 src/file-manager/dfos-xfer.c:372
 # src/nautilus-window-toolbars.c:156
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:945
-#: libnautilus-extensions/nautilus-file-operations.c:960
 #: libnautilus-extensions/nautilus-file-operations.c:979
-#: src/nautilus-shell-ui.xml.h:60
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Parar"
 
@@ -1844,23 +1846,6 @@ msgstr "Vista de Música Original"
 msgid "View as Music"
 msgstr "Ver como Música"
 
-#. FIXME: eventually, get this from preferences
-#. set up the default font
-#: components/notes/nautilus-notes.c:200
-#: components/text/nautilus-text-view.c:186
-#: libnautilus-extensions/nautilus-global-preferences.c:1118
-#: libnautilus-extensions/nautilus-icon-container.c:3332
-#: libnautilus-extensions/nautilus-icon-container.c:3333
-#: libnautilus-extensions/nautilus-icon-container.c:3334
-#: libnautilus-extensions/nautilus-icon-container.c:3335
-#: libnautilus-extensions/nautilus-icon-container.c:3336
-#: libnautilus-extensions/nautilus-icon-container.c:3337
-#: libnautilus-extensions/nautilus-icon-container.c:3338
-#: libnautilus-extensions/nautilus-preferences-item.c:482
-#: src/nautilus-sidebar-title.c:500
-msgid "helvetica"
-msgstr "helvetica"
-
 #: components/notes/Nautilus_View_notes.oaf.in.h:1
 msgid "Factory for annotation view"
 msgstr "Original para la vista de anotaciones"
@@ -1962,8 +1947,8 @@ msgstr "Ver como Ejemplo"
 #: components/services/install/command-line/eazel-alt-install-corba.c:107
 msgid "Set the default answer to continue, also default delete to Yes"
 msgstr ""
-"Configura la respuesta predeterminada como Continuar, también utiliza Si para "
-"borrar"
+"Configura la respuesta predeterminada como Continuar, también utiliza Si "
+"para borrar"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:93
 # components/services/install/command-line/eazel-revert.c:80
@@ -1978,7 +1963,7 @@ msgstr "Especificar la búsqueda cgi"
 #: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
 #: components/services/install/command-line/eazel-test-packsys.c:590
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "Mostrar la salida de depuración"
 
@@ -2062,188 +2047,192 @@ msgstr "Los argumentos de RPM son archivos necesarios"
 msgid "Run Query"
 msgstr "Ejecutar Consulta"
 
+# libnautilus-extensions/nautilus-global-preferences.c:591
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
+#, fuzzy
+msgid "Revert"
+msgstr "nunca"
+
 # src/file-manager/fm-properties-window.c:1478
-#. Disabled for 1.0
-#. {"revert", 'r', POPT_ARG_NONE, &arg_revert, 0, N_("Revert"), NULL},
-#: components/services/install/command-line/eazel-alt-install-corba.c:127
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr "Usar root"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:93
 # components/services/install/command-line/eazel-revert.c:80
-#: components/services/install/command-line/eazel-alt-install-corba.c:128
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "Especificar el Servidor"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:129
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
 msgid "Dont print too much, just problems and download"
 msgstr "No imprimir demasiado, solo problemas y descarga"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:130
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr "Ejecutar renombrado ssl"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:131
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
 msgid "argument is a suite id"
 msgstr "el argumento es un suite id"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:94
 # components/services/install/command-line/eazel-revert.c:78
 # components/services/install/command-line/eazel-uninstall.c:69
-#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "Ejecución de prueba"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:96
-#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr "Permitir nombre de usuario"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:96
-#: components/services/install/command-line/eazel-alt-install-corba.c:134
-#: components/services/install/lib/eazel-install-problem.c:1011
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "Permitir actualizaciones"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "Salida Verbosa"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:340
-#: components/services/install/command-line/eazel-alt-install-corba.c:136
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
 msgid "Install a specific package version"
 msgstr "Instalar una versión especifica del paquete"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:159
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
 msgid "*** You cannot specify more then one protocol type.\n"
 msgstr "*** No puede especificar más de un tipo de protocolo.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:176
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
 msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
 msgstr "*** Borrar y revertir ? Alguien nos puso la bomba!\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:285
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, c-format
 msgid "File conflict checking %s...\n"
 msgstr "Verificación de conflicto de Archivo %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:299
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, c-format
 msgid "File uniqueness checking %s...\n"
 msgstr "Verificando unicidad del archivo %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:313
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
 #, c-format
 msgid "Feature consistency checking %s...\n"
 msgstr "Verificación de consistencia de característica %s...\n"
 
 # components/services/install/lib/eazel-install-protocols.c:70
 # components/services/install/lib/eazel-install-protocols.c:172
-#: components/services/install/command-line/eazel-alt-install-corba.c:344
-#: components/services/install/lib/eazel-install-protocols.c:110
-#: components/services/install/lib/eazel-install-protocols.c:248
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
 #, c-format
 msgid "Downloading %s..."
 msgstr "Descargando %s..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:360
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
 msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
 msgstr "Descargando %s... (%d%d) = %d%% %.1f KB/s     "
 
 # components/services/install/lib/eazel-install-protocols.c:70
 # components/services/install/lib/eazel-install-protocols.c:172
-#: components/services/install/command-line/eazel-alt-install-corba.c:368
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
 msgid "Downloading %s... (%d/%d) = %d%%"
 msgstr "Descargando %s... (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:376
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
 #, c-format
 msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
 msgstr "Descargando %s... (%d/%d) %.1f KB/d Terminado\n"
 
 # components/services/install/lib/eazel-install-protocols.c:70
 # components/services/install/lib/eazel-install-protocols.c:172
-#: components/services/install/command-line/eazel-alt-install-corba.c:381
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
 #, c-format
 msgid "Downloading %s... %3.1f KB/s Done\n"
 msgstr "Descargando %s... %3.1f KB/s Terminado\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:409
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "Instalando %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:417
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "Desinstalando %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:439
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "Instalando %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Terminado\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:446
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "Desinstalando %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Terminado\n"
 
 # libnautilus-extensions/nautilus-program-chooser.c:1262
-#: components/services/install/command-line/eazel-alt-install-corba.c:454
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
 msgid "Done\n"
 msgstr "Terminado\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:474
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
 #, c-format
 msgid "Download of %s FAILED\n"
 msgstr "La descarga de %s ha FALLADO\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:496
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
 #, c-format
 msgid "Package %s failed to uninstall.\n"
 msgstr "Ha fallado la desinstalación del paquete %s.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:498
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
 #, c-format
 msgid "Package %s failed to install.\n"
 msgstr "Ha fallado la instalación del paquete %s.\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:519
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
 #, c-format
 msgid "\t· Problem : %s\n"
 msgstr "\t· Problema : %s\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:528
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
 #, c-format
 msgid "\t· Action : %s\n"
 msgstr "\t· Acción : %s\n"
 
 # components/services/vault/command-line/main.c:46
-#: components/services/install/command-line/eazel-alt-install-corba.c:571
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
 msgid "Cancelling operation\n"
 msgstr "Cancelando operación\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:582
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
 #, c-format
 msgid "About to install a total of %d packages, %dKB\n"
 msgstr "A punto de instalar un total de %d paquetes, %dKB\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:586
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
 #, c-format
 msgid "About to uninstall a total of %d packages, %dKB\n"
 msgstr "A punto de desinstalar un total de %d paquetes, %dKB\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:590
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
 #, c-format
 msgid "About to revert a total of %d packages, %d KB\n"
 msgstr "A punto de revertir un total de %d paquetes, %dKB\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:607
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
 #, c-format
 msgid "\t· %s and it's dependencies\n"
 msgstr "\t· %s y sus dependencias\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:610
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
 #, c-format
 msgid "\t· %s\n"
 msgstr "\t· %s\n"
@@ -2253,38 +2242,38 @@ msgstr "\t· %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n) " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:638
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
 msgid "Save transaction report ? (y/n) "
 msgstr "¿ Guardar el reporte de transacción ? (s/n)"
 
 #. I18N note: y is the letter for the word Yes. This is
 #. used in the response for a yes/no questions. Your translation
 #. must be 1 character only.
-#: components/services/install/command-line/eazel-alt-install-corba.c:649
-#: components/services/install/command-line/eazel-alt-install-corba.c:769
-#: components/services/install/command-line/eazel-alt-install-corba.c:811
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
 msgid "y"
 msgstr "y"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:670
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
 #, c-format
 msgid "Dependency : %s needs %s\n"
 msgstr "Dependencia : %s necesita de %s\n"
 
 #. I18N note: %s is a package name
-#: components/services/install/command-line/eazel-alt-install-corba.c:688
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
 #, c-format
 msgid "Package %s failed md5 check!\n"
 msgstr "¡Ha fallado el chequeo md5 del paquete %s!\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:690
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
 #, c-format
 msgid "\t· server MD5 checksum is %s\n"
 msgstr "\t· el checksum MD5 del servidor es %s\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:692
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
 #, c-format
 msgid "\t· actual MD5 checksum is %s\n"
 msgstr "\t· el checksum MD5 actual es %s\n"
@@ -2294,7 +2283,7 @@ msgstr "\t· el checksum MD5 actual es %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:758
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
 msgid "Continue? (y/n) "
 msgstr "¿Continuar? (s/n)"
 
@@ -2303,92 +2292,92 @@ msgstr "¿Continuar? (s/n)"
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:799
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
 msgid "Should I delete the RPM files? (y/n) "
 msgstr "¿Debería borrar los archivos RPM? (s/n)"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:831
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
 msgid "Operation ok\n"
 msgstr "Operación Terminada\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:833
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
 msgid "Operation failed\n"
 msgstr "La Operación Falló\n"
 
 # components/rpmview/nautilus-rpm-view.c:261
-#: components/services/install/command-line/eazel-alt-install-corba.c:959
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
 msgid "Installing"
 msgstr "Instalando"
 
 # components/rpmview/nautilus-rpm-view.c:286
-#: components/services/install/command-line/eazel-alt-install-corba.c:968
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
 msgid "Uninstalling"
 msgstr "Desinstalando"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:983
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
 msgid "Only one operation at a time please."
 msgstr "Sólo una operación a la vez por favor."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:988
-#: components/services/install/command-line/eazel-alt-install-corba.c:996
-#: components/services/install/command-line/eazel-alt-install-corba.c:1040
-#: components/services/install/command-line/eazel-alt-install-corba.c:1047
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
 #, c-format
 msgid "%s: --help for usage\n"
 msgstr "%s: --help para saber como usarlo\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
 #, c-format
 msgid "Name         : %s\n"
 msgstr "Nombre       : %s\n"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:381
-#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
 #, c-format
 msgid "Version      : %s\n"
 msgstr ""
 "Versión      : %s\n"
 " \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1014
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
 #, c-format
 msgid "Minor        : %s\n"
 msgstr "Menor        : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
 #, c-format
 msgid "Size         : %d\n"
 msgstr "Tamaño       : %d\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
 #, c-format
 msgid "Arch         : %s\n"
 msgstr "Archivo      : %s\n"
 
 # components/rpmview/nautilus-rpm-view.c:219
-#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
 #, c-format
 msgid "Distribution : %s\n"
 msgstr "Distribución : %s\n"
 
 # components/rpmview/nautilus-rpm-view.c:336
-#: components/services/install/command-line/eazel-alt-install-corba.c:1019
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
 #, c-format
 msgid "Description  : %s\n"
 msgstr ""
 "Descripción  : %s\n"
 " \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1021
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
 #, c-format
 msgid "Install root : %s\n"
 msgstr "Ruta de Instalación : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1024
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
 msgid "Provides     : \n"
 msgstr "Provee       :\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1066
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
 #, c-format
 msgid "exit code %d\n"
 msgstr "código de salida %d\n"
@@ -2406,125 +2395,135 @@ msgstr ""
 "Usar el archivo especificado para generar una lista de paquetes, requiere "
 "--packagelist"
 
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 msgid "Softcat server to connect to"
 msgstr "Servidor de Catalogo de software para conectarse"
 
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr "Usar ruta alternativa CGI"
 
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr ""
 "Conectarse como un usuario del catalogo de software a través de ammonite"
 
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 msgid "Number of times to try the request"
 msgstr "Número de veces para intentar el pedido"
 
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr "Retraso entre los reintentos de pedidos, en usec"
 
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr "Buscar por id de paquete Eazel"
 
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+#, fuzzy
+msgid "Lookup package that features a feature/file"
 msgstr "Buscar paquete que provea una característica/archivo"
 
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr "Buscar paquete con una versión especifica"
 
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr "(con --version) Usar >= comparación"
 
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 msgid "use check function (for debugging)"
 msgstr "usar función de chequeo (para depurar)"
 
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 msgid "Show detailed sub-package info"
 msgstr "Mostrar información detallada del sub-paquete"
 
-#: components/services/install/lib/eazel-install-logic2.c:99
+# components/websearch/ntl-web-search.c:164
+# libnautilus-extensions/nautilus-global-preferences.c:276
+# src/nautilus-window-toolbars.c:144
+#: components/services/install/command-line/eazel-test-softcat.c:66
+#, fuzzy
+msgid "enable funk parser"
+msgstr "Habilitar búsqueda rápida"
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "Falló el bloqueo del archivo descargado"
 
-#: components/services/install/lib/eazel-install-logic2.c:116
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "Inconsistencia MD5, el paquete %s puede estar comprometido"
 
-#: components/services/install/lib/eazel-install-logic2.c:132
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, c-format
 msgid "No MD5 available for %s"
 msgstr "No hay MD5 disponible para %s"
 
 #. I18N note: "%is is ok" in the sense that %s=package name and the
 #. package is intact
-#: components/services/install/lib/eazel-install-logic2.c:327
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, c-format
 msgid "%s is ok"
 msgstr "%s esta bien"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:86
-#: components/services/install/lib/eazel-install-logic2.c:433
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s versión %s-%s está instalado"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:86
-#: components/services/install/lib/eazel-install-logic2.c:437
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s versión %s está instalado"
 
-#: components/services/install/lib/eazel-install-logic2.c:446
-#: components/services/install/lib/eazel-install-logic2.c:451
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr "%s actualizaciones desde la versión %s-%s hasta la %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:460
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr "%s des-actualizaciones desde la versión %s-%s hasta la %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:465
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr "%s des-actualizaciones desde la versión %s a la versión %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:518
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr "%s instala la versión %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:523
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr "%s instala la versión %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:687
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, c-format
 msgid "Loading package info from file %s"
 msgstr "Carga Información del paquete desde el archivo %s"
 
 #. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
-#: components/services/install/lib/eazel-install-logic2.c:993
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "ok"
 msgstr "aceptar"
 
-#: components/services/install/lib/eazel-install-logic2.c:993
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "not ok"
 msgstr "no esta bien"
 
-#: components/services/install/lib/eazel-install-logic2.c:1159
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
 msgid "Checking dependencies for %s"
 msgstr "Verificando dependencias para %s"
@@ -2533,74 +2532,73 @@ msgstr "Verificando dependencias para %s"
 #. I18N note: both %s' are package names.
 #. related is in the sense that the two packages apparently
 #. are connected somehow, eg. foo and foo-devel
-#: components/services/install/lib/eazel-install-logic2.c:1766
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, c-format
 msgid "%s is related to %s"
 msgstr "%s esta relacionado con %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:1826
+#: components/services/install/lib/eazel-install-logic2.c:2090
 #, c-format
 msgid "updating %s to version %s-%s solves conflict"
 msgstr "actualizando %s a la versión %s-%s resuelve el conflicto"
 
-#: components/services/install/lib/eazel-install-logic2.c:1842
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
 msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr "la actualizacion disponible para %s (%s-%s) no resuelve el conflicto"
 
 # components/services/install/lib/eazel-install-protocols.c:93
-#: components/services/install/lib/eazel-install-logic2.c:1849
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, c-format
 msgid "could not revive %s"
 msgstr "No se puede recuperar %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2004
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
 msgid "file uniqueness checking %s"
 msgstr "Verificando unicidad del archivo %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2025
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
 msgid "Duplicate file : %s occurs in %s and %s"
 msgstr "Duplicar archivo : %s ocurre en %s y %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2037
-#: components/services/install/lib/eazel-install-logic2.c:2191
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
 msgid "... but it's ok, the packages are related"
 msgstr "... pero esta bien, el paquete esta relacionado"
 
-#: components/services/install/lib/eazel-install-logic2.c:2045
+#: components/services/install/lib/eazel-install-logic2.c:2324
 #, c-format
 msgid "(there were %d other conflicts)"
 msgstr "(hubo %d otros conflictos)"
 
-#: components/services/install/lib/eazel-install-logic2.c:2140
+#: components/services/install/lib/eazel-install-logic2.c:2419
 #, c-format
 msgid "file conflict checking %s"
 msgstr "verificando conflicto de archivo %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2177
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
-msgid ""
-"file conflict : package %s already provides file %s also provided by %s"
+msgid "file conflict : package %s already provides file %s also provided by %s"
 msgstr ""
-"conflicto de archivo : el paquete %s ya provee el archivo %s también provisto "
-"por %s"
+"conflicto de archivo : el paquete %s ya provee el archivo %s también "
+"provisto por %s"
 
 #. the owner of this file is a package that we're upgrading, and the
 #. * new version no longer has this file, so everything's okay.
-#: components/services/install/lib/eazel-install-logic2.c:2187
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
 msgid "...but it is okay, we're upgrading %s and it ditched that file"
 msgstr ""
 "...pero esta bien, estamos actualizando %s y este descartó este archivo"
 
-#: components/services/install/lib/eazel-install-logic2.c:2279
+#: components/services/install/lib/eazel-install-logic2.c:2558
 #, c-format
 msgid "checking feature consistency of %s"
 msgstr "verificando consistencia de característica %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2347
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
 msgid ""
 "feature missing : %s breaks if %s is installed (feature %s would be lost"
@@ -2609,76 +2607,76 @@ msgstr ""
 "será perdida"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:340
-#: components/services/install/lib/eazel-install-logic2.c:2426
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, c-format
 msgid "downloading %d packages"
 msgstr "descargando %d paquetes"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:96
-#: components/services/install/lib/eazel-install-logic2.c:2695
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, c-format
 msgid "will upgrade %s"
 msgstr "actualizará %s"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:83
-#: components/services/install/lib/eazel-install-logic2.c:2698
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, c-format
 msgid "will downgrade %s"
 msgstr "des-actualizará %s"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:340
-#: components/services/install/lib/eazel-install-logic2.c:2701
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, c-format
 msgid "will install %s"
 msgstr "instalará %s"
 
 # components/rpmview/nautilus-rpm-view.c:286
-#: components/services/install/lib/eazel-install-logic2.c:2704
+#: components/services/install/lib/eazel-install-logic2.c:2960
 #, c-format
 msgid "will uninstall %s"
 msgstr "des-instalará %s"
 
 # components/services/install/lib/eazel-install-rpm-glue.c:1287
-#: components/services/install/lib/eazel-install-logic2.c:2789
-#: components/services/install/lib/eazel-install-problem.c:335
-#: components/services/install/lib/eazel-install-problem.c:338
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
 #, c-format
 msgid "%s requires %s"
 msgstr "%s necesita %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2982
+#: components/services/install/lib/eazel-install-logic2.c:3238
 #, c-format
 msgid "failed %s"
 msgstr "ha fallado %s"
 
 # components/services/install/lib/eazel-install-metadata.c:155
-#: components/services/install/lib/eazel-install-metadata.c:171
+#: components/services/install/lib/eazel-install-metadata.c:174
 msgid "Could not set URLType from config file!"
 msgstr ""
 "!No se puede configurar el tipo de URL desde el archivo de configuración!"
 
-#: components/services/install/lib/eazel-install-object.c:713
+#: components/services/install/lib/eazel-install-object.c:717
 msgid "Transactions are not stored, could not find home dir"
 msgstr ""
 "Las transacciones no son almacenadas, no puedo encontrar el directorio inicio"
 
-#: components/services/install/lib/eazel-install-object.c:741
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr "Las transacciones son almacenadas en %s"
 
 # components/services/install/lib/eazel-install-object.c:584
-#: components/services/install/lib/eazel-install-object.c:998
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "Obteniendo la lista de paquetes desde el servidor remoto ...\n"
 
 # components/services/install/lib/eazel-install-object.c:594
-#: components/services/install/lib/eazel-install-object.c:1014
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "!Imposible obtener la lista de paquetes!\n"
 
 # components/services/install/lib/eazel-install-object.c:638
-#: components/services/install/lib/eazel-install-object.c:1087
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr ""
@@ -2686,112 +2684,112 @@ msgstr ""
 "predeterminado"
 
 # components/services/install/lib/eazel-install-object.c:668
-#: components/services/install/lib/eazel-install-object.c:1218
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "Falla en la instalación"
 
 # components/services/install/lib/eazel-install-object.c:725
-#: components/services/install/lib/eazel-install-object.c:1264
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "Desinstalación Fallada"
 
 # components/services/install/lib/eazel-install-rpm-glue.c:667
-#: components/services/install/lib/eazel-install-object.c:1387
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "!No se puede crear el directorio de transacción (%s)! ***\n"
 
-#: components/services/install/lib/eazel-install-object.c:1410
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr "Escribiendo transacción a %s"
 
-#: components/services/install/lib/eazel-install-problem.c:159
+#: components/services/install/lib/eazel-install-problem.c:163
 #, c-format
 msgid "%s was cancelled"
 msgstr "%s fue cancelado"
 
-#: components/services/install/lib/eazel-install-problem.c:164
-#: components/services/install/lib/eazel-install-problem.c:327
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
 msgid "%s is a source package, which is not yet supported"
 msgstr "%s es un paquete de código fuente, el cual no esta soportado aún"
 
 # components/services/install/lib/eazel-install-rpm-glue.c:132
-#: components/services/install/lib/eazel-install-problem.c:178
-#: components/services/install/lib/eazel-install-problem.c:189
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
 #, c-format
 msgid "%s would break other packages"
 msgstr "%s puede interferir con otros paquetes instalados"
 
-#: components/services/install/lib/eazel-install-problem.c:181
+#: components/services/install/lib/eazel-install-problem.c:185
 #, c-format
 msgid "%s would break"
 msgstr "%s No romperá"
 
-#: components/services/install/lib/eazel-install-problem.c:187
+#: components/services/install/lib/eazel-install-problem.c:191
 #, c-format
 msgid "%s would break %s"
 msgstr "%s No romperá %s"
 
-#: components/services/install/lib/eazel-install-problem.c:193
+#: components/services/install/lib/eazel-install-problem.c:197
 #, c-format
 msgid "%s is damaged"
 msgstr "%s esta dañado"
 
-#: components/services/install/lib/eazel-install-problem.c:197
+#: components/services/install/lib/eazel-install-problem.c:201
 #, c-format
 msgid "%s requires %s, which could not be found on the server"
 msgstr "%s necesita %s, el cual no pudo ser encontrado en el servidor"
 
-#: components/services/install/lib/eazel-install-problem.c:200
-#, c-format
-msgid "%s could not be found on the server"
+#: components/services/install/lib/eazel-install-problem.c:204
+#, fuzzy, c-format
+msgid "%s for %s could not be found on the server"
 msgstr "%s no pudo ser encontrado en el servidor"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:86
-#: components/services/install/lib/eazel-install-problem.c:208
-#: components/services/install/lib/eazel-install-problem.c:353
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr "%s ya está instalado"
 
-#: components/services/install/lib/eazel-install-problem.c:252
+#: components/services/install/lib/eazel-install-problem.c:259
 #, c-format
 msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr ""
 "%s, el cual es más nuevo, necesita desactualizarse y desactualizar no esta "
 "habilitado."
 
-#: components/services/install/lib/eazel-install-problem.c:256
+#: components/services/install/lib/eazel-install-problem.c:263
 #, c-format
 msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr ""
 "%s, el cual es más viejo, necesita desactualizarse y desactualizar no esta "
 "habilitado."
 
-#: components/services/install/lib/eazel-install-problem.c:346
+#: components/services/install/lib/eazel-install-problem.c:353
 #, c-format
 msgid "%s is not installed and could not be found on server"
 msgstr "%s no esta instalado y no pudo ser encontrado en el servidor"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:913
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr "Consiga una nueva versión de %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:924
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr "Instalar ambos %s y %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:939
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr "Quitar %s de su sistema"
@@ -2799,273 +2797,273 @@ msgstr "Quitar %s de su sistema"
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:952
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr "Forzar la eliminación de %s de su sistema"
 
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:960
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr "La base de datos de paquetes tiene una inconsistencia"
 
-#: components/services/install/lib/eazel-install-problem.c:1008
+#: components/services/install/lib/eazel-install-problem.c:1015
 msgid "Continue with force"
 msgstr "Continuar Forzándolo"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:83
-#: components/services/install/lib/eazel-install-problem.c:1014
+#: components/services/install/lib/eazel-install-problem.c:1021
 msgid "Allow downgrade"
 msgstr "Permitir des-actualizar"
 
 # components/services/install/lib/eazel-install-protocols.c:93
-#: components/services/install/lib/eazel-install-protocols.c:123
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:166
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
 #, c-format
 msgid "Could not open target file %s"
 msgstr "No se puede abrir el archivo destino %s"
 
 # components/services/install/lib/eazel-install-protocols.c:100
 # components/services/install/lib/eazel-install-protocols.c:373
-#: components/services/install/lib/eazel-install-protocols.c:130
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:92
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
 msgid "Could not create an http request !"
 msgstr "!No se puede crear una petición HTTP!"
 
 # components/services/install/lib/eazel-install-protocols.c:105
-#: components/services/install/lib/eazel-install-protocols.c:137
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:99
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
 msgid "Proxy: Invalid uri !"
 msgstr "Proxy: ! URL Inválida !"
 
 # components/services/install/lib/eazel-install-protocols.c:105
-#: components/services/install/lib/eazel-install-protocols.c:142
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:105
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
 msgid "Invalid uri !"
 msgstr "! URL Inválida !"
 
 # components/services/install/lib/eazel-install-protocols.c:112
 # components/services/install/lib/eazel-install-protocols.c:380
-#: components/services/install/lib/eazel-install-protocols.c:149
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:115
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
 msgid "Could not prepare http request !"
 msgstr "!Imposible preparar el requerimiento HTTP!"
 
 # components/services/install/lib/eazel-install-protocols.c:116
-#: components/services/install/lib/eazel-install-protocols.c:154
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:120
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
 msgid "Couldn't get async mode "
 msgstr "Imposible obtener el modo asíncrono"
 
 #. probably out of disk space
-#: components/services/install/lib/eazel-install-protocols.c:183
-#: components/services/install/lib/eazel-install-protocols.c:212
-#: components/services/install/lib/eazel-install-protocols.c:228
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, c-format
 msgid "DISK FULL: could not write %s"
 msgstr "DISCO LLENO: No se pudo escribir %s"
 
 # components/services/install/lib/eazel-install-protocols.c:147
-#: components/services/install/lib/eazel-install-protocols.c:189
-#: components/services/install/lib/eazel-install-protocols.c:217
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
 msgid "Could not get request body!"
 msgstr "!No se puede obtener el cuerpo del pedido!"
 
 # components/services/install/lib/eazel-install-protocols.c:137
-#: components/services/install/lib/eazel-install-protocols.c:202
+#: components/services/install/lib/eazel-install-protocols.c:208
 #, c-format
 msgid "HTTP error: %d %s"
 msgstr "Error HTTP: %d %s"
 
 # components/services/install/lib/eazel-install-protocols.c:173
-#: components/services/install/lib/eazel-install-protocols.c:249
+#: components/services/install/lib/eazel-install-protocols.c:255
 msgid "FTP not supported yet"
 msgstr "Aún no se soporta FTP"
 
 # components/services/install/lib/eazel-install-protocols.c:185
-#: components/services/install/lib/eazel-install-protocols.c:457
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, c-format
 msgid "Checking local file %s..."
 msgstr "Verificando archivo local %s..."
 
 # components/services/install/lib/eazel-install-rpm-glue.c:200
-#: components/services/install/lib/eazel-install-protocols.c:578
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, c-format
 msgid "Failed to retrieve %s!"
 msgstr "¡No se ha podido obtener %s!"
 
 # components/services/install/lib/eazel-install-protocols.c:269
 # components/services/install/lib/eazel-install-protocols.c:317
-#: components/services/install/lib/eazel-install-protocols.c:651
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, c-format
 msgid "Could not get an URL for %s"
 msgstr "No se ha podido obtener una URL para %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:666
+#: components/services/install/lib/eazel-install-protocols.c:672
 msgid "Downloaded package does not have the correct name"
 msgstr "El paquete descargado no tiene el nombre correcto"
 
-#: components/services/install/lib/eazel-install-protocols.c:667
+#: components/services/install/lib/eazel-install-protocols.c:673
 #, c-format
 msgid "Package %s should have had name %s"
 msgstr "El paquete %s debería tener el nombre %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:695
+#: components/services/install/lib/eazel-install-protocols.c:701
 msgid "File download failed"
 msgstr "Falló la descarga de archivo"
 
 # components/services/install/lib/eazel-install-tests.c:33
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr "*** Iniciando el volcado del paquete ***\n"
 
 # components/services/install/lib/eazel-install-tests.c:40
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr "*** Fin del volcado del paquete ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:124
-#: components/services/install/lib/eazel-install-xml-package-list.c:158
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 msgid "*** No package nodes! (cat has no children) ***"
 msgstr "*** !No hay nodos para el paquete! (cat no tiene hijo) ***"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:157
-#: components/services/install/lib/eazel-install-xml-package-list.c:160
-#: components/services/install/lib/eazel-install-xml-package-list.c:168
-#: components/services/install/lib/eazel-install-xml-package-list.c:183
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 msgid "*** Bailing from package parse! ***"
 msgstr "*** ¡Saliendo del análisis de paquete! ****"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:124
-#: components/services/install/lib/eazel-install-xml-package-list.c:166
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
 msgid "*** No package nodes! ***"
 msgstr "*** !No hay nodos para el paquete! ***"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:124
-#: components/services/install/lib/eazel-install-xml-package-list.c:172
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 msgid "*** Malformed package node!"
 msgstr "*** !El nodo del paquete está defectuoso! ***"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:124
-#: components/services/install/lib/eazel-install-xml-package-list.c:181
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
 msgid "*** No depends nodes! ***"
 msgstr "*** !No hay nodos de dependencia! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:187
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr "*** ¡Nodo de dependencia mal formado!"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:211
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr "*** Tipo de nodo desconocido '%s'"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:150
-#: components/services/install/lib/eazel-install-xml-package-list.c:228
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** La lista de paquetes no contiene información! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:155
-#: components/services/install/lib/eazel-install-xml-package-list.c:233
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** !Imposible encontrar las categorías xmlnode! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:157
-#: components/services/install/lib/eazel-install-xml-package-list.c:234
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr "*** ¡Saliendo del análisis de categorías! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:163
-#: components/services/install/lib/eazel-install-xml-package-list.c:240
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** !No hay categorías! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:165
-#: components/services/install/lib/eazel-install-xml-package-list.c:241
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr "*** ¡Saliendo del análisis de categoría! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:216
-#: components/services/install/lib/eazel-install-xml-package-list.c:295
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** !No se puede encontrar el nodo xml TRANSACTION! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:218
 # components/services/install/lib/eazel-install-xml-package-list.c:226
-#: components/services/install/lib/eazel-install-xml-package-list.c:297
-#: components/services/install/lib/eazel-install-xml-package-list.c:305
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr "*** ¡Saliendo del análisis de transacción! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:224
-#: components/services/install/lib/eazel-install-xml-package-list.c:303
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** !No hay paquetes! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:163
-#: components/services/install/lib/eazel-install-xml-package-list.c:339
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** !No hay nodos de categorías! ***"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:155
-#: components/services/install/lib/eazel-install-xml-package-list.c:343
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** !Imposible encontrar el nodo xml CATEGORIES! ***"
 
 # src/file-manager/dfos-corba.c:126
-#: components/services/install/lib/eazel-install-xml-package-list.c:377
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** Nodo %s desconocido"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:328
-#: components/services/install/lib/eazel-install-xml-package-list.c:467
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** !Error al generar la lista de paquete xml! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:375
-#: components/services/install/lib/eazel-install-xml-package-list.c:514
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** !Error al leer la lista de paquetes! ***\n"
 
 # components/services/install/lib/eazel-install-metadata.c:126
-#: components/services/install/lib/eazel-install-xml-package-list.c:909
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** !El xml osd no tiene datos! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:914
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr "*** Saliendo del análisis de osd ***\n"
 
 # components/services/install/lib/eazel-install-protocols.c:93
-#: components/services/install/lib/eazel-install-xml-package-list.c:990
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "No se puede analizar el xml (longitud %d)"
 
 # components/services/install/lib/eazel-install-rpm-glue.c:1040
-#: components/services/install/lib/eazel-package-system-rpm3.c:763
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr "Abierta la base de datos de paquetes en %s"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:768
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr "Ha fallado la apertura de la base de datos de paquetes en %s"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:801
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr "Cerrando la base\\base de datos para %s (abierta)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:806
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr "Cerrando la base de datos para %s (no abierta)"
 
 # components/services/install/lib/eazel-install-rpm-glue.c:942
-#: components/services/install/lib/eazel-package-system-rpm3.c:1137
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr "No se puede abrir %s"
@@ -3188,7 +3186,7 @@ msgstr "Instalando paquete \"%s\" ahora."
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:340
 #: components/services/install-view/callbacks.c:407
-#: components/services/install-view/nautilus-service-install-view.c:897
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "Instalando \"%s\""
@@ -3218,33 +3216,33 @@ msgid "Is this ok ?"
 msgstr "¿ Esta esto bien ?"
 
 # components/services/install/lib/eazel-install-object.c:668
-#: components/services/install-view/callbacks.c:557
+#: components/services/install-view/callbacks.c:556
 msgid "Installation cancelled."
 msgstr "Instalación cancelada."
 
-#: components/services/install-view/callbacks.c:559
+#: components/services/install-view/callbacks.c:558
 msgid "This package has already been installed."
 msgstr "Este paquete ya ha sido instalado."
 
 # components/services/install/lib/eazel-install-protocols.c:70
 # components/services/install/lib/eazel-install-protocols.c:172
-#: components/services/install-view/callbacks.c:561
-#: components/services/install-view/callbacks.c:658
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
 msgid "Installation complete."
 msgstr "Instalación completa."
 
 # components/services/install/lib/eazel-install-object.c:668
-#: components/services/install-view/callbacks.c:565
+#: components/services/install-view/callbacks.c:564
 msgid "Installation failed."
 msgstr "Ha fallado la Instalación."
 
 #. some succeeded; some failed
-#: components/services/install-view/callbacks.c:569
+#: components/services/install-view/callbacks.c:568
 msgid "Some packages installed successfully:"
 msgstr "Algunos paquetes que han sido instalados satisfactoriamente:"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:90
-#: components/services/install-view/callbacks.c:578
+#: components/services/install-view/callbacks.c:577
 msgid ""
 "\n"
 "Some packages failed:"
@@ -3252,19 +3250,19 @@ msgstr ""
 "\n"
 "Algunos paquetes han fallado:"
 
-#: components/services/install-view/callbacks.c:627
+#: components/services/install-view/callbacks.c:626
 msgid "Erase the RPM files?"
 msgstr "¿Borrar los archivo RPM?"
 
-#: components/services/install-view/callbacks.c:629
+#: components/services/install-view/callbacks.c:628
 msgid "Erase the leftover RPM files?"
 msgstr "¿Borrar los archivos RPM que quedan?"
 
-#: components/services/install-view/callbacks.c:659
+#: components/services/install-view/callbacks.c:658
 msgid "Ok"
 msgstr "Aceptar"
 
-#: components/services/install-view/callbacks.c:674
+#: components/services/install-view/callbacks.c:673
 msgid ""
 "A core package of Nautilus has been\n"
 "updated.  You should restart Nautilus.\n"
@@ -3341,34 +3339,34 @@ msgstr "Continuar"
 # libnautilus-extensions/nautilus-program-chooser.c:1262
 #: components/services/install-view/forms.c:482
 #: libnautilus-extensions/nautilus-drag.c:493
-#: src/file-manager/fm-directory-view.c:3551
+#: src/file-manager/fm-directory-view.c:4326
 msgid "Cancel"
 msgstr "Cancelar"
 
 # libnautilus-extensions/nautilus-program-chooser.c:264
-#: components/services/install-view/nautilus-service-install-view.c:419
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
 msgid "%s is in GNOME (footprint) > %s"
 msgstr "%s esta en GNOME (huella) >%s"
 
 # libnautilus-extensions/nautilus-program-chooser.c:264
-#: components/services/install-view/nautilus-service-install-view.c:437
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, c-format
 msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr "%s esta en el menu GNOME (huella).\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:452
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
 msgid "%s is in the KDE menu.\n"
 msgstr "%s esta en el menú KDE.\n"
 
 # components/services/install/lib/eazel-install-protocols.c:70
 # components/services/install/lib/eazel-install-protocols.c:172
-#: components/services/install-view/nautilus-service-install-view.c:653
+#: components/services/install-view/nautilus-service-install-view.c:655
 msgid "Installation Complete"
 msgstr "Instalación Completa"
 
-#: components/services/install-view/nautilus-service-install-view.c:708
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
 msgid ""
 "%sTo start %s, click the Launch button below, or to create a shortcut, drag "
@@ -3379,37 +3377,37 @@ msgstr ""
 "panel de GNOME o hacia su escritorio."
 
 #. couldn't find an icon
-#: components/services/install-view/nautilus-service-install-view.c:716
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
 msgid "%sTo start %s, click the Launch button below."
 msgstr ""
 "%sPara empezar %s, haga clic en el botón ejecutar que aparece a continuación."
 
 # components/html/gnome-dialogs.c:318 components/html/gnome-dialogs.c:359
-#: components/services/install-view/nautilus-service-install-view.c:771
+#: components/services/install-view/nautilus-service-install-view.c:773
 msgid "Incorrect password."
 msgstr "Contraseña incorrecta."
 
-#: components/services/install-view/nautilus-service-install-view.c:776
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr "Autenticado como root"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:340
-#: components/services/install-view/nautilus-service-install-view.c:893
+#: components/services/install-view/nautilus-service-install-view.c:895
 msgid "Installing packages"
 msgstr "Instalando paquetes"
 
-#: components/services/install-view/nautilus-service-install-view.c:895
+#: components/services/install-view/nautilus-service-install-view.c:897
 msgid "Installing remote package"
 msgstr "Instalando paquete remoto"
 
 # components/services/install/lib/eazel-install-protocols.c:70
 # components/services/install/lib/eazel-install-protocols.c:172
-#: components/services/install-view/nautilus-service-install-view.c:899
+#: components/services/install-view/nautilus-service-install-view.c:901
 msgid "Installing some package"
 msgstr "Instalando algún paquete"
 
-#: components/services/install-view/nautilus-service-install-view.c:916
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
@@ -3417,23 +3415,23 @@ msgstr ""
 "El servicio de instalación de Eazel no se encuentra:\n"
 "La instalación no funcionará."
 
-#: components/services/install-view/nautilus-service-install-view.c:965
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr "Contactando el Catalogo de Software Eazel..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1023
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr "Verificando autorización"
 
-#: components/services/install-view/nautilus-service-install-view.c:1095
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr "Cancelando la descarga de paquetes (espere por favor) ..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1115
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "Descarga del paquete Cancelada."
 
-#: components/services/install-view/nautilus-service-install-view.c:1116
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "Cancelado"
 
@@ -3693,8 +3691,8 @@ msgid ""
 "\n"
 "Please check your email for activation instructions."
 msgstr ""
-"Su cuenta para los servicios Eazel no fue activada aún. No puede conectarse a "
-"los Servicios Eazel hasta que active su cuenta.\n"
+"Su cuenta para los servicios Eazel no fue activada aún. No puede conectarse "
+"a los Servicios Eazel hasta que active su cuenta.\n"
 "\n"
 "Por favor verifique en su correo electrónico las instrucciones de activación."
 
@@ -3706,7 +3704,8 @@ msgid ""
 "Please try again in a few minutes, or contact Eazel support if this problem "
 "continues."
 msgstr ""
-"Su cuenta de usuario de Servicios Eazel ha sido deshabilitada temporalmente.\n"
+"Su cuenta de usuario de Servicios Eazel ha sido deshabilitada "
+"temporalmente.\n"
 "\n"
 "Por favor intente de nuevo en unos minutos, o comuníquese con el soporte de "
 "Eazel si\n"
@@ -3738,13 +3737,13 @@ msgstr "Servicios de conexión"
 # libnautilus-extensions/nautilus-icon-text-item.c:1487
 # src/file-manager/fm-icon-view.c:1105
 #: components/services/summary/nautilus-summary-dialogs.c:131
-#: libnautilus-extensions/nautilus-password-dialog.c:269
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "Nombre de usuario"
 
 # components/html/gnome-dialogs.c:318 components/html/gnome-dialogs.c:359
 #: components/services/summary/nautilus-summary-dialogs.c:138
-#: libnautilus-extensions/nautilus-password-dialog.c:276
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "Contraseña:"
 
@@ -3825,18 +3824,18 @@ msgstr "Servicios"
 msgid "Featured Downloads"
 msgstr "Descargas Programadas"
 
-#: components/services/summary/nautilus-summary-view.c:883
+#: components/services/summary/nautilus-summary-view.c:884
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
 "unavailable right now, or your computer might be configured incorrectly. "
 "Please contact support@eazel.com."
 msgstr ""
-"No se puede obtener los servicios de datos del Servidor de Eazel. El servidor "
-"debe no estar disponible en este momento o su computadora puede estar "
-"configurada incorrectamente. Por favor póngase en contacto con "
+"No se puede obtener los servicios de datos del Servidor de Eazel. El "
+"servidor debe no estar disponible en este momento o su computadora puede "
+"estar configurada incorrectamente. Por favor póngase en contacto con "
 "support@eazel.com"
 
-#: components/services/summary/nautilus-summary-view.c:893
+#: components/services/summary/nautilus-summary-view.c:894
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3844,7 +3843,7 @@ msgstr ""
 "Se encontró un problema con los servicios de datos en los servidores de "
 "Eazel. Por favor póngase en contacto con support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:916
+#: components/services/summary/nautilus-summary-view.c:917
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
 "contact support@eazel.com."
@@ -3852,7 +3851,7 @@ msgstr ""
 "Información perdida desde la re-dirección en los servidores de Eazel. Por "
 "favor póngase en contacto con support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:958
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
 "now, or your computer might be configured incorrectly. You could try again "
@@ -3862,20 +3861,20 @@ msgstr ""
 "en este momento, ó su computadora podría estar configurada de forma "
 "incorrecta. Podría probar de nuevo más tarde."
 
-#: components/services/summary/nautilus-summary-view.c:968
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
 "support@eazel.com."
 msgstr ""
-"Se encontró un problema con la re-dirección de datos en los servidores Eazel. "
-"Por favor póngase en contacto con support@eazel.com"
+"Se encontró un problema con la re-dirección de datos en los servidores "
+"Eazel. Por favor póngase en contacto con support@eazel.com"
 
-#: components/services/summary/nautilus-summary-view.c:985
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr "Ha Fallado la carga del inventario del sistema."
 
 # src/nautilus-first-time-druid.c:230 src/nautilus-window-toolbars.c:161
-#: components/services/summary/nautilus-summary-view.c:1048
+#: components/services/summary/nautilus-summary-view.c:1049
 #: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr "Servicios Eazel"
@@ -3948,18 +3947,18 @@ msgid "View as Summary"
 msgstr "Ver como Resumen"
 
 # components/services/install/lib/eazel-install-protocols.c:137
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:130
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
 #, c-format
 msgid "HTTP error %d \"%s\" on uri %s"
 msgstr "Error HTTP %d \"%s\" en uri %s"
 
 # components/services/trilobite/libtrilobite/trilobite-core-utils.c:197
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:200
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 msgid "Could not initialize Bonobo"
 msgstr "No se puede inicializar Bonobo"
 
 # components/services/trilobite/libtrilobite/trilobite-core-utils.c:212
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:215
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr ""
@@ -4002,53 +4001,74 @@ msgstr "ejemplo de vista de servicio eazel"
 msgid "Factory for the sample service"
 msgstr "Original para el servicio de ejemplo"
 
-#: components/text/nautilus-text-view.c:326
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr ""
-"Lo siento, pero %s es demasiado grande para Nautilus como para poder cargarlo "
-"íntegro."
+"Lo siento, pero %s es demasiado grande para Nautilus como para poder "
+"cargarlo íntegro."
 
-#: components/text/nautilus-text-view.c:329
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr "Archivo demasiado grande"
 
-# src/file-manager/dfos-xfer.c:724
+# libnautilus-extensions/nautilus-global-preferences.c:216
 #: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "Fuentes"
+
+# src/file-manager/dfos-xfer.c:724
+#: components/text/nautilus-text-view-ui.xml.h:2
 msgid "Lucida"
 msgstr "Lucida"
 
-#: components/text/nautilus-text-view-ui.xml.h:2
+#: components/text/nautilus-text-view-ui.xml.h:3
 msgid "Use the Courier Font"
 msgstr "Usar la fuente Courier"
 
-#: components/text/nautilus-text-view-ui.xml.h:3
+#: components/text/nautilus-text-view-ui.xml.h:4
+#, fuzzy
+msgid "Use the Fixed Font"
+msgstr "Usar la fuente Times"
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+#, fuzzy
+msgid "Use the GTK System Font"
+msgstr "Usar la fuente Times"
+
+#: components/text/nautilus-text-view-ui.xml.h:6
 msgid "Use the Helvetica Font"
 msgstr "Usar la fuente Helvética"
 
-#: components/text/nautilus-text-view-ui.xml.h:4
+#: components/text/nautilus-text-view-ui.xml.h:7
 msgid "Use the Lucida Font"
 msgstr "Usar la fuente Lucida"
 
-#: components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:8
 msgid "Use the Times Font"
 msgstr "Usar la fuente Times"
 
-#: components/text/nautilus-text-view-ui.xml.h:6
+#: components/text/nautilus-text-view-ui.xml.h:9
 msgid "_Courier"
 msgstr "_Courier"
 
-# libnautilus-extensions/nautilus-global-preferences.c:216
-#: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
-msgstr "_Fuentes"
+# components/music/nautilus-music-view.c:198
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "_Archivo"
 
-#: components/text/nautilus-text-view-ui.xml.h:8
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
 msgid "_Helvetica"
 msgstr "_Helvética"
 
 # components/music/nautilus-music-view.c:198
-#: components/text/nautilus-text-view-ui.xml.h:9
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr "_Times"
 
@@ -4127,7 +4147,7 @@ msgid "Nautilus Tree view"
 msgstr "Vista Nautilus Árbol"
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:638
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr "Árbol"
 
@@ -4142,7 +4162,7 @@ msgid "Azul"
 msgstr "Azul"
 
 # src/file-manager/fm-properties-window.c:1031
-#: data/browser.xml.h:3 libnautilus-extensions/nautilus-font-picker.c:105
+#: data/browser.xml.h:3
 msgid "Black"
 msgstr "Negro"
 
@@ -4264,7 +4284,7 @@ msgid "Eclipse"
 msgstr "Eclipse"
 
 # src/file-manager/fm-properties-window.c:1237
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1607
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "Marcas"
 
@@ -4370,7 +4390,7 @@ msgid "Numbers"
 msgstr "Números"
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "Aceptar"
 
@@ -4505,13 +4525,13 @@ msgid "The Gimp"
 msgstr "El Gimp"
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:554
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "Escritorio"
 
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4796
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
-#: src/file-manager/fm-desktop-icon-view.c:65
+#: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
 msgstr "Papelera"
 
@@ -4548,7 +4568,7 @@ msgstr "Google"
 
 # libnautilus-extensions/nautilus-global-preferences.c:277
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:808
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "Buscadores"
 
@@ -4819,7 +4839,7 @@ msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2261
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr "hoy a las %H:%M"
 
@@ -4827,7 +4847,7 @@ msgstr "hoy a las %H:%M"
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2266
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr "ayer a las %H:%M"
 
@@ -4835,7 +4855,7 @@ msgstr "ayer a las %H:%M"
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2271
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%A %-d/%-m/%Y %H:%M"
 
@@ -4843,78 +4863,78 @@ msgstr "%A %-d/%-m/%Y %H:%M"
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2276
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%-d/%-m/%Y %H:%M"
 
 # libnautilus-extensions/nautilus-file.c:2585
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 elementos"
 
 # libnautilus-extensions/nautilus-file.c:2586
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr "0 carpetas"
 
 # libnautilus-extensions/nautilus-file.c:2586
-#: libnautilus-extensions/nautilus-file.c:3408
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 archivos"
 
 # libnautilus-extensions/nautilus-file.c:2590
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 elemento"
 
 # libnautilus-extensions/nautilus-file.c:2591
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr "1 carpeta"
 
 # libnautilus-extensions/nautilus-file.c:2591
-#: libnautilus-extensions/nautilus-file.c:3413
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 archivo"
 
 # libnautilus-extensions/nautilus-file.c:2594
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "%u elementos"
 
 # libnautilus-extensions/nautilus-file.c:2595
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr "%u carpetas"
 
 # libnautilus-extensions/nautilus-file.c:2595
-#: libnautilus-extensions/nautilus-file.c:3417
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u archivos"
 
 # libnautilus-extensions/nautilus-file.c:2585
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3720
-#: libnautilus-extensions/nautilus-file.c:3735
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr "? elementos"
 
 # libnautilus-extensions/nautilus-file.c:2585
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3726
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr "? bytes"
 
 # libnautilus-extensions/nautilus-file.c:2929
-#: libnautilus-extensions/nautilus-file.c:3739
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "tipo desconocido"
 
 # libnautilus-extensions/nautilus-file.c:2931
-#: libnautilus-extensions/nautilus-file.c:3741
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "Tipo MIME desconocido"
 
@@ -4922,16 +4942,16 @@ msgstr "Tipo MIME desconocido"
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3746
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "desconocido"
 
 # libnautilus-extensions/nautilus-file.c:2965
-#: libnautilus-extensions/nautilus-file.c:3782
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr "programa"
 
-#: libnautilus-extensions/nautilus-file.c:3794
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
@@ -4941,17 +4961,17 @@ msgstr ""
 "esto signifique que su archivo gnome-vfs.keys no está en el lugar correcto ó "
 "no esta siendo encontrada por alguna otra razón."
 
-#: libnautilus-extensions/nautilus-file.c:3798
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
 "aaron@eazel.com"
 msgstr ""
-"No se encontró descripción para el tipo mime %s (el archivo es \"%s\"), avise "
-"a aaron@eazel.com"
+"No se encontró descripción para el tipo mime %s (el archivo es \"%s\"), "
+"avise a aaron@eazel.com"
 
 # src/file-manager/dfos-xfer.c:714
-#: libnautilus-extensions/nautilus-file.c:3812
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "enlace"
 
@@ -4960,29 +4980,29 @@ msgstr "enlace"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1156
-#: libnautilus-extensions/nautilus-file.c:3818
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr "enlace a %s"
 
-#: libnautilus-extensions/nautilus-file.c:3832
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr "enlace (roto)"
 
 # src/file-manager/dfos-xfer.c:174
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "De:"
 
 # src/file-manager/dfos-xfer.c:188
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "A:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:588
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4993,7 +5013,7 @@ msgstr ""
 "\n"
 "\"%s\" no puede ser movido porque esta en un disco de sólo lectura."
 
-#: libnautilus-extensions/nautilus-file-operations.c:599
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -5006,7 +5026,7 @@ msgstr ""
 "\"%s\" no puede ser borrado porque usted no tiene permisos para modificar la "
 "carpeta superior."
 
-#: libnautilus-extensions/nautilus-file-operations.c:605
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -5017,7 +5037,7 @@ msgstr ""
 "\n"
 "\"%s\" no puede ser borrado porque esta en un disco de sólo lectura."
 
-#: libnautilus-extensions/nautilus-file-operations.c:636
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -5030,7 +5050,7 @@ msgstr ""
 "\"%s\" no puede ser movido porque usted no tiene los permisos para "
 "cambiárselos a él ó a la carpeta superior"
 
-#: libnautilus-extensions/nautilus-file-operations.c:643
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -5043,7 +5063,7 @@ msgstr ""
 "\"%s\" no puede ser movido a la Papelera porque usted no tiene permisos para "
 "cambiar a este o su carpeta superior."
 
-#: libnautilus-extensions/nautilus-file-operations.c:667
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -5054,7 +5074,7 @@ msgstr ""
 "\n"
 "\"%s\" no puede ser copiado porque usted no tiene permisos para leerlo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:689
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -5065,7 +5085,7 @@ msgstr ""
 "\n"
 "No hay suficiente espacio en el destino."
 
-#: libnautilus-extensions/nautilus-file-operations.c:694
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -5076,7 +5096,7 @@ msgstr ""
 "\n"
 "No hay suficiente espacio en el destino."
 
-#: libnautilus-extensions/nautilus-file-operations.c:698
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -5087,7 +5107,7 @@ msgstr ""
 "\n"
 "No hay suficiente espacio en el destino"
 
-#: libnautilus-extensions/nautilus-file-operations.c:710
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -5098,7 +5118,7 @@ msgstr ""
 "\n"
 "Usted no tiene permisos para escribir en su carpeta."
 
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -5109,7 +5129,7 @@ msgstr ""
 "\n"
 "El disco de destino de de sólo lectura."
 
-#: libnautilus-extensions/nautilus-file-operations.c:721
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -5120,7 +5140,7 @@ msgstr ""
 "\n"
 "Usted no tiene permisos suficientes para escribir en esta carpeta"
 
-#: libnautilus-extensions/nautilus-file-operations.c:725
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -5131,7 +5151,7 @@ msgstr ""
 "\n"
 "El disco de destino es de sólo lectura."
 
-#: libnautilus-extensions/nautilus-file-operations.c:732
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -5142,7 +5162,7 @@ msgstr ""
 "\n"
 "Usted no tiene permisos para escribir es su carpeta."
 
-#: libnautilus-extensions/nautilus-file-operations.c:736
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -5154,7 +5174,7 @@ msgstr ""
 "El disco de destino es de sólo lectura."
 
 # src/file-manager/dfos-xfer.c:342
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -5166,7 +5186,7 @@ msgstr ""
 "¿Desea Continuar?"
 
 # src/file-manager/dfos-xfer.c:342
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -5178,7 +5198,7 @@ msgstr ""
 "¿Desea Continuar?"
 
 # src/file-manager/dfos-xfer.c:342
-#: libnautilus-extensions/nautilus-file-operations.c:773
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -5190,7 +5210,7 @@ msgstr ""
 "¿Desea Continuar?"
 
 # src/file-manager/dfos-xfer.c:342
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -5202,7 +5222,7 @@ msgstr ""
 "¿Desea Continuar?"
 
 # src/file-manager/dfos-xfer.c:342
-#: libnautilus-extensions/nautilus-file-operations.c:794
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -5214,7 +5234,7 @@ msgstr ""
 "¿Desea Continuar?"
 
 # src/file-manager/dfos-xfer.c:342
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -5226,7 +5246,7 @@ msgstr ""
 "¿Desea Continuar?"
 
 # src/file-manager/dfos-xfer.c:342
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -5238,7 +5258,7 @@ msgstr ""
 "¿Desea Continuar?"
 
 # src/file-manager/dfos-xfer.c:342
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -5250,40 +5270,40 @@ msgstr ""
 "¿Desea Continuar?"
 
 # src/file-manager/dfos-xfer.c:745
-#: libnautilus-extensions/nautilus-file-operations.c:924
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "Error copiando."
 
 # src/file-manager/dfos-xfer.c:745
-#: libnautilus-extensions/nautilus-file-operations.c:927
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "Error moviendo."
 
 # src/file-manager/dfos-xfer.c:745
-#: libnautilus-extensions/nautilus-file-operations.c:930
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "Error enlazando."
 
 # src/file-manager/dfos-xfer.c:745
-#: libnautilus-extensions/nautilus-file-operations.c:935
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "Error borrando."
 
 # src/file-manager/dfos-xfer.c:352 src/file-manager/dfos-xfer.c:372
 # src/file-manager/dfos-xfer.c:419 src/file-manager/dfos-xfer.c:430
-#: libnautilus-extensions/nautilus-file-operations.c:960
-#: libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "Siguiente"
 
 # src/file-manager/dfos-xfer.c:372
-#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Reintentar"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1057
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -5297,7 +5317,7 @@ msgstr ""
 "\n"
 "Si aún quiere mover \"%s\", cámbiele el nombre e intente de nuevo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1063
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -5311,12 +5331,12 @@ msgstr ""
 "\n"
 "Si aún quiere copiar \"%s\" renómbrelo e intente de nuevo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "Imposible reemplazar archivo."
 
 # src/file-manager/dfos-xfer.c:407
-#: libnautilus-extensions/nautilus-file-operations.c:1081
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -5327,24 +5347,24 @@ msgstr ""
 "\n"
 "¿Desea reemplazarlo?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1092
-#: libnautilus-extensions/nautilus-file-operations.c:1106
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "Problemas mientras se copiaba"
 
 # src/file-manager/dfos-xfer.c:419 src/file-manager/dfos-xfer.c:430
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Reemplazar"
 
 # src/file-manager/dfos-xfer.c:430
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Remplazar todos"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1160
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "otro enlace hacia %s"
@@ -5353,25 +5373,25 @@ msgstr "otro enlace hacia %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dst enlaza hacia %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1180
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dnd enlaza hacia %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1184
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%drd enlaza hacia %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dth enlaza hacia %s"
@@ -5381,263 +5401,254 @@ msgstr "%dth enlaza hacia %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (copiar)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (otra copia)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1212
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr "ra copia)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr "da copia)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1216
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr "ra copia)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr "ta copia)"
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (copia) %s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (otra copia) %s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1232
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dra copia) %s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1234
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dda copia) %s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1236
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%dra copia) %s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dta copia) %s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1322
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1330
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
 # src/file-manager/dfos-xfer.c:526 src/file-manager/dfos-xfer.c:859
-#: libnautilus-extensions/nautilus-file-operations.c:1487
-#: libnautilus-extensions/nautilus-file-operations.c:2072
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus %d desconocido"
 
 # src/file-manager/dfos-xfer.c:961
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1802
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "Moviendo archivos ha la papelera"
 
 # src/file-manager/dfos-xfer.c:962
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1804
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr "Archivos para arrojar:"
 
 # src/file-manager/dfos-xfer.c:702 src/file-manager/dfos-xfer.c:963
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1821
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "Moviendo"
 
 # src/file-manager/dfos-xfer.c:964
-#: libnautilus-extensions/nautilus-file-operations.c:1807
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "Preparando para Mover hacia la Papelera..."
 
 # src/file-manager/dfos-xfer.c:700
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1817
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "Moviendo archivos"
 
 # src/file-manager/fm-properties-window.c:1526
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "Archivos movidos:"
 
 # src/file-manager/dfos-xfer.c:703
-#: libnautilus-extensions/nautilus-file-operations.c:1822
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "Preparando para Mover..."
 
 # src/file-manager/dfos-xfer.c:704
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "Finalizando Mover..."
 
 # src/file-manager/dfos-xfer.c:713
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "Creando un enlace a los archivos"
 
 # src/file-manager/fm-properties-window.c:1526
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1837
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "Archivos Enlazados:"
 
 # src/file-manager/dfos-xfer.c:715
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1839
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "enlazando"
 
 # src/file-manager/dfos-xfer.c:716
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "Preparándose para crear enlaces..."
 
 # src/file-manager/dfos-xfer.c:717
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "Finalizando la creación de los enlaces..."
 
 # src/file-manager/dfos-xfer.c:723
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1848
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "Copiando archivos"
 
 # src/file-manager/fm-properties-window.c:1536
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "Archivos Copiados:"
 
 # src/file-manager/dfos-xfer.c:725
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "Copiando"
 
 # src/file-manager/dfos-xfer.c:726
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "Preparando para Copiar..."
 
 # src/file-manager/dfos-xfer.c:744
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "No puede copiar elementos en la Papelera."
 
 # src/file-manager/dfos-xfer.c:763
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "No puede copiar a la Papelera"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1899
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "La Papelera debe quedar en el escritorio."
 
 # src/file-manager/dfos-xfer.c:778
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "No puede mover esta carpeta papelera."
 
 # src/file-manager/dfos-xfer.c:763
-#: libnautilus-extensions/nautilus-file-operations.c:1902
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "No puede copiar la Papelera."
 
 # src/file-manager/dfos-xfer.c:763
-#: libnautilus-extensions/nautilus-file-operations.c:1903
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "No puede copiar la Papelera."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1905
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "No se puede cambiar el lugar de la Papelera"
 
 # src/file-manager/dfos-xfer.c:763
-#: libnautilus-extensions/nautilus-file-operations.c:1906
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "No se puede copiar la Papelera"
 
 # src/file-manager/dfos-xfer.c:778
-#: libnautilus-extensions/nautilus-file-operations.c:1929
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "No puede mover un elemento sobre si mismo."
 
 # src/file-manager/dfos-xfer.c:779
-#: libnautilus-extensions/nautilus-file-operations.c:1930
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "No puede copiar un elemento sobre si mismo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1932
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "No se puede mover sobre si mismo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1933
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "No se puede copiar sobre si mismo"
 
-# src/file-manager/dfos-xfer.c:778
-#: libnautilus-extensions/nautilus-file-operations.c:1946
-msgid "You cannot move a file onto itself."
-msgstr "No puede mover un archivo sobre si mismo."
-
 # src/file-manager/dfos-xfer.c:779
-#: libnautilus-extensions/nautilus-file-operations.c:1947
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "No puede copiar un archivo sobre si mismo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1949
-msgid "Can't Move Onto Self"
-msgstr "No Puede Mover Sobre Si Mismo"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1950
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "No Puede Copiar Sobre Si Mismo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2001
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5647,7 +5658,7 @@ msgstr ""
 "\n"
 "Usted no tiene permisos para escribir en la destinación"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2004
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5657,691 +5668,744 @@ msgstr ""
 "\n"
 "No hay espacio suficiente en el destino."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2007
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Error \"%s\" creando nueva carpeta."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2011
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "Error creando nueva carpeta"
 
 # src/nautilus-window-manage-views.c:173
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2098
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "carpeta sin título"
 
 # src/file-manager/dfos-xfer.c:1006
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2131
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "Eliminando archivos"
 
 # src/file-manager/dfos-xfer.c:1007 src/file-manager/dfos-xfer.c:1057
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2133
-#: libnautilus-extensions/nautilus-file-operations.c:2168
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "Archivos eliminados:"
 
 # src/file-manager/dfos-xfer.c:1008 src/file-manager/dfos-xfer.c:1058
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2135
-#: libnautilus-extensions/nautilus-file-operations.c:2170
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Eliminando"
 
 # src/file-manager/dfos-xfer.c:1009
-#: libnautilus-extensions/nautilus-file-operations.c:2136
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "Preparándose para borrar archivos..."
 
 # src/file-manager/dfos-xfer.c:1056
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2166
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Vaciar la Papelera"
 
 # src/file-manager/dfos-xfer.c:1059
-#: libnautilus-extensions/nautilus-file-operations.c:2171
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Preparando para Vaciar la Papelera..."
 
 # src/file-manager/fm-directory-view.c:1855
-#: libnautilus-extensions/nautilus-file-operations.c:2202
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr ""
 "¿Esta seguro que desea eliminar permanentemente todos los elementos de la "
 "papelera?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2204
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "¿Borrar el contenido de la Papelera?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2205
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "Vaciar"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2243
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2243
-#: libnautilus-extensions/nautilus-file-operations.c:2253
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr "foo (copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".bashrc (copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr ".foo (copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2247
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2247
-#: libnautilus-extensions/nautilus-file-operations.c:2254
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "foo foo (copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2248
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "foo (copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2248
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "foo foo (copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (copy).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "foo..."
 
 # libnautilus-extensions/nautilus-search-bar-criterion.c:46
 # src/file-manager/fm-list-view.c:1587
 # src/file-manager/fm-search-list-view.c:146
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "Sierra"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "foo... (copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "foo. (copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2253
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "foo.. (copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2254
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "foo foo (copy).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "foo (another copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "foo (3rd copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "foo (another copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (another copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr "foo (3rd copy).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr "foo (24th copy)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr "foo (22nd copy)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr "foo (22nd copy).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "foo (3rd copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
-#: libnautilus-extensions/nautilus-file-operations.c:2260
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "foo (21st copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "foo (22nd copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
-#: libnautilus-extensions/nautilus-file-operations.c:2261
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "foo (22nd copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2260
-#: libnautilus-extensions/nautilus-file-operations.c:2262
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "foo (23rd copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2261
-#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "foo. (another copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2262
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "foo (24th copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2263
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "foo (22nd copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "foo (25th copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "foo (23rd copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "foo (24th copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "foo (22nd copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "foo (21st copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25th copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000th copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
-#, c-format
-msgid "%ld of %ld"
-msgstr "%ld de %ld"
-
-# src/nautilus-window-menus.c:1314
-#: libnautilus-extensions/nautilus-font-picker.c:96
-msgid "Normal"
-msgstr "Normal"
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (10th copy)"
+msgstr "foo (3rd copy).txt"
 
-# libnautilus-extensions/nautilus-file.c:2936
-#: libnautilus-extensions/nautilus-font-picker.c:97
-#: libnautilus-extensions/nautilus-volume-monitor.c:516
-#: libnautilus-extensions/nautilus-volume-monitor.c:535
-msgid "Unknown"
-msgstr "Desconocido"
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (11st copy)"
+msgstr "foo (3rd copy).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:103
-msgid "Bold"
-msgstr "Negrita"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (10th copy).txt"
+msgstr "foo (22nd copy)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:104
-msgid "Book"
-msgstr "Libro"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (11st copy).txt"
+msgstr "foo (22nd copy)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:106
-msgid "Demibold"
-msgstr "Demibold"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (11th copy)"
+msgstr "foo (3rd copy).txt"
 
-# libnautilus-extensions/nautilus-search-bar-criterion.c:71
-# libnautilus-extensions/nautilus-search-bar-criterion.c:86
-# libnautilus-extensions/nautilus-search-bar-criterion.c:141
-#: libnautilus-extensions/nautilus-font-picker.c:107
-msgid "Light"
-msgstr "Liviano"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (12nd copy)"
+msgstr "foo (21st copy)"
 
-# src/file-manager/fm-properties-window.c:1031
-#: libnautilus-extensions/nautilus-font-picker.c:113
-msgid "Italic"
-msgstr "Itálica"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (11th copy).txt"
+msgstr "foo (22nd copy)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:114
-msgid "Oblique"
-msgstr "Obliqua"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (12nd copy).txt"
+msgstr "foo (22nd copy).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:115
-msgid "Reverse Italic"
-msgstr "Itálica Invertida"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (12th copy)"
+msgstr "foo (24th copy)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:116
-msgid "Reverse Oblique"
-msgstr "Obliqua Inversa"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (13rd copy)"
+msgstr "foo (another copy)"
 
-# src/file-manager/fm-properties-window.c:878
-#: libnautilus-extensions/nautilus-font-picker.c:123
-msgid "Condensed"
-msgstr "Condensada"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (12th copy).txt"
+msgstr "foo (23rd copy).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:124
-msgid "Semicondensed"
-msgstr "SemiCondensada"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (13rd copy).txt"
+msgstr "foo (3rd copy)"
 
-# libnautilus-extensions/nautilus-global-preferences.c:216
-#: libnautilus-extensions/nautilus-font-picker.c:226
-msgid "Font"
-msgstr "Fuente"
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
+#, c-format
+msgid "%ld of %ld"
+msgstr "%ld de %ld"
 
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
 msgid "GConf Error"
 msgstr "Error de GConf"
 
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:956
-msgid "fixed"
-msgstr "arreglado"
-
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1427
-msgid "01/01/00, 01:00 AM"
-msgstr "01/01/00, 01:00 AM"
-
-#: libnautilus-extensions/nautilus-glib-extensions.c:1428
-msgid "1/1/00, 1:00 AM"
-msgstr "1/1/00, 1:00 AM"
-
-#: libnautilus-extensions/nautilus-glib-extensions.c:1429
-msgid " 1/ 1/00,  1:00 AM"
-msgstr "foo (25th copy).txt"
-
 # src/nautilus-first-time-druid.c:272
 #. Constants
 #: libnautilus-extensions/nautilus-global-preferences.c:50
 msgid "Nautilus Preferences"
 msgstr "Preferencias de Nautilus"
 
-# libnautilus-extensions/nautilus-global-preferences.c:674
-#: libnautilus-extensions/nautilus-global-preferences.c:97
-msgid "current theme"
-msgstr "tema actual"
+# libnautilus-extensions/nautilus-global-preferences.c:581
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "siempre"
+
+# libnautilus-extensions/nautilus-global-preferences.c:582
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "Siempre"
+
+# libnautilus-extensions/nautilus-global-preferences.c:586
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "Sólo local"
+
+# libnautilus-extensions/nautilus-global-preferences.c:587
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "Sólo los archivos locales"
+
+# libnautilus-extensions/nautilus-global-preferences.c:591
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "nunca"
+
+# libnautilus-extensions/nautilus-global-preferences.c:592
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "Nunca"
+
+# libnautilus-extensions/nautilus-global-preferences.c:209
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "Gráficos Mejorados"
+
+# libnautilus-extensions/nautilus-global-preferences.c:668
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "Usar Gráficos Mejorados (más lento)"
+
+# libnautilus-extensions/nautilus-global-preferences.c:216
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "Fuentes"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+#, fuzzy
+msgid "Font for Icon view:"
+msgstr "Original para vista música"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "Original para vistas historial"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "Usar Nautilus para dibujar el escritorio"
+
+# src/file-manager/fm-directory-view.c:2126
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
+msgstr "Abrir en Ventana Nueva"
 
 # libnautilus-extensions/nautilus-global-preferences.c:622
-#: libnautilus-extensions/nautilus-global-preferences.c:100
+#: libnautilus-extensions/nautilus-global-preferences.c:651
 msgid "Open each file or folder in a separate window"
 msgstr "Abrir cada archivo o carpeta en una ventana nueva"
 
+# libnautilus-extensions/nautilus-global-preferences.c:687
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+msgid "Display toolbar in new windows"
+msgstr "Mostrar barra de herramientas en ventanas nuevas"
+
+# libnautilus-extensions/nautilus-global-preferences.c:693
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "Mostrar la barra de dirección en ventanas nuevas"
+
+# libnautilus-extensions/nautilus-global-preferences.c:699
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "Mostrar la barra de estado en ventanas nuevas"
+
+# libnautilus-extensions/nautilus-global-preferences.c:622
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "Mostrar barra lateral en ventanas nuevas"
+
+# libnautilus-extensions/nautilus-global-preferences.c:142
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "Comportamiento de la papelera"
+
 # src/file-manager/fm-directory-view.c:2669
-#: libnautilus-extensions/nautilus-global-preferences.c:103
-msgid "Ask before emptying the Trash"
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+#, fuzzy
+msgid "Ask before emptying the Trash or deleting files"
 msgstr "Preguntar antes de vaciar la Papelera"
 
-# libnautilus-extensions/nautilus-global-preferences.c:142
-#: libnautilus-extensions/nautilus-global-preferences.c:106
-#: libnautilus-extensions/nautilus-global-preferences.c:597
-msgid "Click Behavior"
-msgstr "Comportamiento del Clic"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
+
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
 
 # libnautilus-extensions/nautilus-global-preferences.c:635
-#: libnautilus-extensions/nautilus-global-preferences.c:109
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 msgid "single"
 msgstr "único"
 
 # libnautilus-extensions/nautilus-global-preferences.c:636
-#: libnautilus-extensions/nautilus-global-preferences.c:110
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "Activar los elementos con un único clic"
 
 # libnautilus-extensions/nautilus-global-preferences.c:640
-#: libnautilus-extensions/nautilus-global-preferences.c:114
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "doble"
 
 # libnautilus-extensions/nautilus-global-preferences.c:641
-#: libnautilus-extensions/nautilus-global-preferences.c:115
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "Activar los elementos con un doble clic"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:119
-#: libnautilus-extensions/nautilus-global-preferences.c:604
-msgid "Executable Text Files"
-msgstr "Archivos de Texto Ejecutables"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:122
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 msgid "launch"
 msgstr "lanzar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:123
+#: libnautilus-extensions/nautilus-global-preferences.c:726
 msgid "Execute files when they are clicked"
 msgstr "Ejecutar archivos cuando son seleccionados"
 
 # libnautilus-extensions/nautilus-global-preferences.c:149
-#: libnautilus-extensions/nautilus-global-preferences.c:127
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 msgid "display"
 msgstr "mostrar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:128
+#: libnautilus-extensions/nautilus-global-preferences.c:730
 msgid "Display files when they are clicked"
 msgstr "Mostrar archivos cuando son seleccionados"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:132
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 msgid "ask"
 msgstr "preguntar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:133
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 msgid "Ask each time"
 msgstr "Preguntar cada vez"
 
-# libnautilus-extensions/nautilus-global-preferences.c:249
-#: libnautilus-extensions/nautilus-global-preferences.c:143
-#: libnautilus-extensions/nautilus-global-preferences.c:725
-msgid "Show Text in Icons"
-msgstr "Mostrar Texto en los iconos"
-
-# src/file-manager/dfos-xfer.c:763
-#: libnautilus-extensions/nautilus-global-preferences.c:146
-#: libnautilus-extensions/nautilus-global-preferences.c:732
-msgid "Show Count of Items in Folders"
-msgstr "Mostrar Cantidad de Elementos en Carpetas"
-
-# libnautilus-extensions/nautilus-global-preferences.c:256
-#: libnautilus-extensions/nautilus-global-preferences.c:149
-#: libnautilus-extensions/nautilus-global-preferences.c:739
-msgid "Show Thumbnails for Image Files"
-msgstr "Ver Muestras para los archivos de imágenes"
-
-# libnautilus-extensions/nautilus-global-preferences.c:264
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:152
-#: libnautilus-extensions/nautilus-global-preferences.c:755
-msgid "Make Folder Appearance Details Public"
-msgstr "Hacer los detalles de apariencia público"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:155
-#: libnautilus-extensions/nautilus-global-preferences.c:746
-msgid "Preview Sound Files"
-msgstr "Escucha Previa de Archivos de Sonido"
-
-# libnautilus-extensions/nautilus-global-preferences.c:668
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Use smoother (but slower) graphics"
-msgstr "Usar Gráficos Mejorados (más lento)"
-
-# libnautilus-extensions/nautilus-global-preferences.c:680
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Use this font family to display file names:"
-msgstr "Fuente para los nombres de archivo"
-
-# libnautilus-extensions/nautilus-global-preferences.c:687
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-msgid "Display toolbar in new windows"
-msgstr "Mostrar barra de herramientas en ventanas nuevas"
-
-# libnautilus-extensions/nautilus-global-preferences.c:693
-#: libnautilus-extensions/nautilus-global-preferences.c:170
-msgid "Display location bar in new windows"
-msgstr "Mostrar la barra de dirección en ventanas nuevas"
-
-# libnautilus-extensions/nautilus-global-preferences.c:699
-#: libnautilus-extensions/nautilus-global-preferences.c:173
-msgid "Display status bar in new windows"
-msgstr "Mostrar la barra de estado en ventanas nuevas"
-
-# libnautilus-extensions/nautilus-global-preferences.c:622
-#: libnautilus-extensions/nautilus-global-preferences.c:176
-msgid "Display sidebar in new windows"
-msgstr "Mostrar barra lateral en ventanas nuevas"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:179
-msgid "Use Nautilus to draw the desktop"
-msgstr "Usar Nautilus para dibujar el escritorio"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:183
-msgid "Enable fast search (indexes your hard drive)"
-msgstr "Habilitar búsqueda rápida (indexa su disco rígido)"
-
-# libnautilus-extensions/nautilus-global-preferences.c:720
-#: libnautilus-extensions/nautilus-global-preferences.c:186
-msgid "search type to do by default"
-msgstr "buscar tipo para hacer predeterminado"
-
-# libnautilus-extensions/nautilus-global-preferences.c:726
-#: libnautilus-extensions/nautilus-global-preferences.c:189
-msgid "search by text"
-msgstr "buscar por texto"
-
-# libnautilus-extensions/nautilus-global-preferences.c:727
-#: libnautilus-extensions/nautilus-global-preferences.c:190
-msgid "Search for files by file name only"
-msgstr "Buscar archivos solo por nombre"
-
-# libnautilus-extensions/nautilus-global-preferences.c:731
-#: libnautilus-extensions/nautilus-global-preferences.c:194
-msgid "search by text and properties"
-msgstr "buscar por texto y propiedades"
+# libnautilus-extensions/nautilus-global-preferences.c:142
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "Comportamiento del Clic"
 
-# libnautilus-extensions/nautilus-global-preferences.c:732
-#: libnautilus-extensions/nautilus-global-preferences.c:195
-msgid "Search for files by file name and file properties"
-msgstr "Buscar archivos por nombre y por sus propiedades"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr "Archivos de Texto Ejecutables"
 
-# libnautilus-extensions/nautilus-global-preferences.c:737
-#: libnautilus-extensions/nautilus-global-preferences.c:199
-msgid "Search Engine Location"
-msgstr "Dirección del Motor de Búsqueda"
+# src/file-manager/fm-icon-view.c:324
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr "Mostrar/Ocultar Opciones"
 
 # libnautilus-extensions/nautilus-global-preferences.c:744
-#: libnautilus-extensions/nautilus-global-preferences.c:203
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr "Mostrar archivos ocultos (empiezan con \".\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:206
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr "Mostrar copias de seguridad (terminan con \"~\")"
 
 # libnautilus-extensions/nautilus-global-preferences.c:750
-#: libnautilus-extensions/nautilus-global-preferences.c:209
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr "Mostrar banderas especiales en la ventana Propiedades"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:212
-msgid "Show only folders (no files) in the tree"
-msgstr "Mostrar sólo carpetas (no archivos) en el árbol"
-
-# libnautilus-extensions/nautilus-global-preferences.c:756
-#: libnautilus-extensions/nautilus-global-preferences.c:215
-msgid "Can add Content"
-msgstr "Puede agregar Contenido"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+#, fuzzy
+msgid "Sorting Order"
+msgstr "Error Configurando Dueño"
 
-# src/nautilus-bookmarks-window.c:203
-#: libnautilus-extensions/nautilus-global-preferences.c:218
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
-msgstr "No Incluir los marcadores internos en el menú Marcadores"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
 # src/nautilus-location-bar.c:401
-#: libnautilus-extensions/nautilus-global-preferences.c:222
-#: libnautilus-extensions/nautilus-global-preferences.c:227
-#: src/file-manager/fm-properties-window.c:1519 src/nautilus-location-bar.c:62
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
 msgid "Location:"
 msgstr "Dirección:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:226
+# libnautilus-extensions/nautilus-global-preferences.c:277
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+msgid "HTTP Proxy Settings"
+msgstr "Configuración de Proxy HTTP"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "Usar Proxy HTTP"
 
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:228
+#: libnautilus-extensions/nautilus-global-preferences.c:812
 #: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr "Puerto:"
 
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
+
+# src/nautilus-bookmarks-window.c:136
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "Marcadores propios"
+
+# src/nautilus-bookmarks-window.c:203
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "No Incluir los marcadores internos en el menú Marcadores"
+
+# libnautilus-extensions/nautilus-global-preferences.c:249
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "Mostrar Texto en los iconos"
+
+# src/file-manager/dfos-xfer.c:763
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr "Mostrar Cantidad de Elementos en Carpetas"
+
+# libnautilus-extensions/nautilus-global-preferences.c:256
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "Ver Muestras para los archivos de imágenes"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr "Escucha Previa de Archivos de Sonido"
+
+# libnautilus-extensions/nautilus-global-preferences.c:264
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr "Hacer los detalles de apariencia público"
+
 # libnautilus-extensions/nautilus-global-preferences.c:206
-#: libnautilus-extensions/nautilus-global-preferences.c:533
+#: libnautilus-extensions/nautilus-global-preferences.c:936
 msgid "Appearance"
 msgstr "Apariencia"
 
-# libnautilus-extensions/nautilus-global-preferences.c:209
-#: libnautilus-extensions/nautilus-global-preferences.c:535
-msgid "Smoother Graphics"
-msgstr "Gráficos Mejorados"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:552
+#: libnautilus-extensions/nautilus-global-preferences.c:941
 msgid "Windows & Desktop"
 msgstr "Ventanas & Escritorio"
 
-# src/file-manager/fm-directory-view.c:2126
-#: libnautilus-extensions/nautilus-global-preferences.c:560
-msgid "Opening New Windows"
-msgstr "Abrir en Ventana Nueva"
-
-# libnautilus-extensions/nautilus-global-preferences.c:142
-#: libnautilus-extensions/nautilus-global-preferences.c:583
-msgid "Trash Behavior"
-msgstr "Comportamiento de la papelera"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:595
+#: libnautilus-extensions/nautilus-global-preferences.c:946
 msgid "Icon & List Views"
 msgstr "Vistas Icono & Lista"
 
-# src/file-manager/fm-icon-view.c:324
-#: libnautilus-extensions/nautilus-global-preferences.c:611
-msgid "Show/Hide Options"
-msgstr "Mostrar/Ocultar Opciones"
-
-# libnautilus-extensions/nautilus-global-preferences.c:165
-#: libnautilus-extensions/nautilus-global-preferences.c:632
-msgid "Sidebar Panels"
-msgstr "Solapas de la barra lateral"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:635
-msgid "Tabs"
-msgstr "Solapas"
-
 # libnautilus-extensions/nautilus-global-preferences.c:303
-#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:957
 msgid "Navigation"
 msgstr "Navegación"
 
-# libnautilus-extensions/nautilus-global-preferences.c:277
-#: libnautilus-extensions/nautilus-global-preferences.c:693
-msgid "HTTP Proxy Settings"
-msgstr "Configuración de Proxy HTTP"
-
-# src/nautilus-bookmarks-window.c:136
-#: libnautilus-extensions/nautilus-global-preferences.c:712
-msgid "Built-in Bookmarks"
-msgstr "Marcadores propios"
-
 # libnautilus-extensions/nautilus-global-preferences.c:246
-#: libnautilus-extensions/nautilus-global-preferences.c:723
+#: libnautilus-extensions/nautilus-global-preferences.c:962
 msgid "Speed Tradeoffs"
 msgstr "Equilibrar rapidez"
 
-# components/websearch/ntl-web-search.c:164
-# libnautilus-extensions/nautilus-global-preferences.c:276
-# src/nautilus-window-toolbars.c:144
-#: libnautilus-extensions/nautilus-global-preferences.c:794
-msgid "Search"
-msgstr "Búsqueda"
+# libnautilus-extensions/nautilus-global-preferences.c:726
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr "buscar por texto"
+
+# libnautilus-extensions/nautilus-global-preferences.c:727
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+msgid "Search for files by file name only"
+msgstr "Buscar archivos solo por nombre"
+
+# libnautilus-extensions/nautilus-global-preferences.c:731
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr "buscar por texto y propiedades"
+
+# libnautilus-extensions/nautilus-global-preferences.c:732
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+msgid "Search for files by file name and file properties"
+msgstr "Buscar archivos por nombre y por sus propiedades"
 
 # libnautilus-extensions/nautilus-global-preferences.c:279
-#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "Opciones de búsqueda compleja"
 
+# libnautilus-extensions/nautilus-global-preferences.c:720
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "buscar tipo para hacer predeterminado"
+
 # components/websearch/ntl-web-search.c:164
 # libnautilus-extensions/nautilus-global-preferences.c:276
 # src/nautilus-window-toolbars.c:144
-#: libnautilus-extensions/nautilus-global-preferences.c:802
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 msgid "Fast Search"
 msgstr "Búsqueda Rápida"
 
-# libnautilus-extensions/nautilus-global-preferences.c:216
-#: libnautilus-extensions/nautilus-global-preferences.c:846
-msgid "Fonts"
-msgstr "Fuentes"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr "Habilitar búsqueda rápida (indexa su disco rígido)"
+
+# libnautilus-extensions/nautilus-global-preferences.c:737
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+msgid "Search Engine Location"
+msgstr "Dirección del Motor de Búsqueda"
+
+# components/websearch/ntl-web-search.c:164
+# libnautilus-extensions/nautilus-global-preferences.c:276
+# src/nautilus-window-toolbars.c:144
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Búsqueda"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr "Mostrar sólo carpetas (no archivos) en el árbol"
 
 # libnautilus-extensions/nautilus-global-preferences.c:699
-#: libnautilus-extensions/nautilus-global-preferences.c:1026
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
 #, c-format
 msgid "Display %s tab in sidebar"
 msgstr "Mostrar la solapa %s en la barra lateral"
 
-# libnautilus-extensions/nautilus-global-preferences.c:581
-#: libnautilus-extensions/nautilus-global-preferences.c:1073
-msgid "always"
-msgstr "siempre"
-
-# libnautilus-extensions/nautilus-global-preferences.c:582
-#: libnautilus-extensions/nautilus-global-preferences.c:1074
-msgid "Always"
-msgstr "Siempre"
-
-# libnautilus-extensions/nautilus-global-preferences.c:586
-#: libnautilus-extensions/nautilus-global-preferences.c:1077
-msgid "local only"
-msgstr "Sólo local"
-
-# libnautilus-extensions/nautilus-global-preferences.c:587
-#: libnautilus-extensions/nautilus-global-preferences.c:1078
-msgid "Local Files Only"
-msgstr "Sólo los archivos locales"
-
-# libnautilus-extensions/nautilus-global-preferences.c:591
-#: libnautilus-extensions/nautilus-global-preferences.c:1081
-msgid "never"
-msgstr "nunca"
+# libnautilus-extensions/nautilus-global-preferences.c:165
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "Solapas de la barra lateral"
 
-# libnautilus-extensions/nautilus-global-preferences.c:592
-#: libnautilus-extensions/nautilus-global-preferences.c:1082
-msgid "Never"
-msgstr "Nunca"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr "Solapas"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1145
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "currently can't be performed because the program crond, which does nightly "
@@ -6349,18 +6413,18 @@ msgid ""
 "done, turn crond on."
 msgstr ""
 "El indexado esta activado habilitando la caracteristica de búsqueda rápida. "
-"Sin embargo el indexado no puede ser realizado actualmente porque el programa "
-"crond, el cual lleva a cabo tareas nocturnas en su computadora, no esta "
-"ejecutandose. Para asegurarse que de las búsquedas rápidas puedan ser "
+"Sin embargo el indexado no puede ser realizado actualmente porque el "
+"programa crond, el cual lleva a cabo tareas nocturnas en su computadora, no "
+"esta ejecutandose. Para asegurarse que de las búsquedas rápidas puedan ser "
 "realizadas ejecute el proceso crond."
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1152
-#: libnautilus-extensions/nautilus-global-preferences.c:1170
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
 msgid "Files May Not Be Indexed"
 msgstr "Los Archivos No Pueden Ser Indexados"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1153
-#: libnautilus-extensions/nautilus-global-preferences.c:1171
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
 msgid ""
 "If you are running Linux, you can log in as root and type these commands to "
 "start cron:\n"
@@ -6374,7 +6438,7 @@ msgstr ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/crond start\n"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1162
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "may not be performed because the program crond, which does nightly tasks on "
@@ -6388,16 +6452,6 @@ msgstr ""
 "que las búsquedas rápidas puedan ser realizadas asegurese de que crond esta "
 "ejecutnadose.\n"
 
-#: libnautilus-extensions/nautilus-gnome-extensions.c:640
-msgid "No image was selected.  You must click on an image to select it."
-msgstr ""
-"No se ha seleccionado una imagen. Debe hacer clic sobre la imagen para "
-"selccionarla."
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:641
-msgid "No selection made"
-msgstr "No se ha hecho ninguna selección"
-
 # libnautilus-extensions/nautilus-icon-canvas-item.c:704
 #. The list of characters that cause line breaks can be localized.
 #: libnautilus-extensions/nautilus-icon-canvas-item.c:70
@@ -6405,115 +6459,97 @@ msgid " -_,;.?/&"
 msgstr " -_,;.?/&"
 
 # libnautilus-extensions/nautilus-icon-dnd.c:690
-#: libnautilus-extensions/nautilus-icon-dnd.c:766
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout and "
-"leave this item where you dropped it? This will clobber the stored manual "
-"layout."
+"This folder uses automatic layout. Do you want to switch to manual layout "
+"and leave this item where you dropped it? This will clobber the stored "
+"manual layout."
 msgstr ""
 "Esta carpeta usa organización automática. ¿Quiere cambiar a organización "
 "manual y dejar este elemento donde lo arrastró? Se pasará al modo de "
 "organización manual"
 
 # libnautilus-extensions/nautilus-icon-dnd.c:694
-#: libnautilus-extensions/nautilus-icon-dnd.c:770
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout and "
-"leave these items where you dropped them? This will clobber the stored manual "
-"layout."
+"This folder uses automatic layout. Do you want to switch to manual layout "
+"and leave these items where you dropped them? This will clobber the stored "
+"manual layout."
 msgstr ""
 "Esta carpeta usa organización automática. ¿Quiere cambiar a organización "
 "manual y dejar estos elementos donde los arrastró? Se pasará al modo de "
 "organización manual"
 
 # libnautilus-extensions/nautilus-icon-dnd.c:700
-#: libnautilus-extensions/nautilus-icon-dnd.c:776
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout and "
-"leave this item where you dropped it?"
+"This folder uses automatic layout. Do you want to switch to manual layout "
+"and leave this item where you dropped it?"
 msgstr ""
 "Esta carpeta usa organización automática. ¿Quiere cambiar a organización "
 "manual y dejar este elemento donde lo arrastró?"
 
 # libnautilus-extensions/nautilus-icon-dnd.c:703
-#: libnautilus-extensions/nautilus-icon-dnd.c:779
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout and "
-"leave these items where you dropped them?"
+"This folder uses automatic layout. Do you want to switch to manual layout "
+"and leave these items where you dropped them?"
 msgstr ""
 "Esta carpeta usa organización automática. ¿Quiere cambiar a organización "
 "manual y dejar estos elementos donde los arrastró?"
 
 # libnautilus-extensions/nautilus-icon-dnd.c:710
-#: libnautilus-extensions/nautilus-icon-dnd.c:784
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "¿ Desea pasar al modo de Organización Manual ?"
 
 # libnautilus-extensions/nautilus-icon-dnd.c:711
-#: libnautilus-extensions/nautilus-icon-dnd.c:785
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "Cambiar"
 
 # libnautilus-extensions/nautilus-icon-text-item.c:1487
 # src/file-manager/fm-icon-view.c:1105
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "Renombrar"
 
 # libnautilus-extensions/nautilus-undo-signal-handlers.c:175
-#: libnautilus-extensions/nautilus-icon-text-item.c:1551
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr "Deshacer edición"
 
 # libnautilus-extensions/nautilus-icon-text-item.c:1489
-#: libnautilus-extensions/nautilus-icon-text-item.c:1552
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "Recuperar el nombre anterior"
 
 # libnautilus-extensions/nautilus-undo-signal-handlers.c:177
-#: libnautilus-extensions/nautilus-icon-text-item.c:1553
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "Rehacer edición"
 
 # libnautilus-extensions/nautilus-icon-text-item.c:1491
-#: libnautilus-extensions/nautilus-icon-text-item.c:1554
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Recuperar el nombre cambiado"
 
-#: libnautilus-extensions/nautilus-password-dialog.c:306
-msgid "Remember this password"
-msgstr "Recordar esta contraseña"
-
-# components/music/nautilus-music-view.c:198
-#: libnautilus-extensions/nautilus-preferences-item.c:483
-msgid "times"
-msgstr "times"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:484
-msgid "courier"
-msgstr "courier"
-
-# src/file-manager/dfos-xfer.c:724
-#: libnautilus-extensions/nautilus-preferences-item.c:485
-msgid "lucida"
-msgstr "lucida"
-
-#: libnautilus-extensions/nautilus-preferences.c:76
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "Principiante"
 
 # src/nautilus-first-time-druid.c:185
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "Intermedio"
 
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "Avanzado"
 
 # libnautilus-extensions/nautilus-preferences-dialog.c:201
-#: libnautilus-extensions/nautilus-preferences-dialog.c:202
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "Preferencias"
 
@@ -6637,7 +6673,7 @@ msgstr "No incluir en el menú para los elementos \"%s\""
 # src/file-manager/fm-search-list-view.c:140
 # src/nautilus-bookmarks-window.c:172
 #: libnautilus-extensions/nautilus-program-chooser.c:1209
-#: src/file-manager/fm-list-view.c:2123
+#: src/file-manager/fm-list-view.c:2182
 #: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
@@ -6731,8 +6767,8 @@ msgid ""
 "%s\n"
 "\n"
 "You can configure which programs are offered for which file types with the "
-"\"File Types and Programs\" part of the GNOME Control Center. Do you want to go "
-"there now?"
+"\"File Types and Programs\" part of the GNOME Control Center. Do you want to "
+"go there now?"
 msgstr ""
 "%s\n"
 "\n"
@@ -6747,8 +6783,8 @@ msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
 "locations.  Would you like to choose another application?"
 msgstr ""
-"\"%s\" no puede abrir \"%s\" porque \"%s\" no puede acceder a los archivos en "
-"las direcciones \"%s\". ¿Le gustaría elegir alguna otra aplicación?"
+"\"%s\" no puede abrir \"%s\" porque \"%s\" no puede acceder a los archivos "
+"en las direcciones \"%s\". ¿Le gustaría elegir alguna otra aplicación?"
 
 # libnautilus-extensions/nautilus-global-preferences.c:693
 #: libnautilus-extensions/nautilus-program-choosing.c:497
@@ -7017,8 +7053,8 @@ msgstr "Elementos que tienen \"cosas\" en el nombre y son archivos regulares"
 
 #: libnautilus-extensions/nautilus-search-uri.c:710
 msgid ""
-"Items containing \"stuff\" in their names, that are regular files and smaller "
-"than 2000 bytes"
+"Items containing \"stuff\" in their names, that are regular files and "
+"smaller than 2000 bytes"
 msgstr ""
 "Elementos que tienen \"cosas\" en sus nombres, son archivos regulares y "
 "tienen menos de 2000 bytes"
@@ -7027,27 +7063,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Elementos que tienen \"medusa\" en sus nombres y son directorios."
 
-# libnautilus-extensions/nautilus-stock-dialogs.c:409
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr "Detalles"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr "Cuidado"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr "Error"
-
-# components/rpmview/nautilus-rpm-view.c:336
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr "Pregunta"
-
 # libnautilus-extensions/nautilus-global-preferences.c:277
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
@@ -7057,7 +7072,7 @@ msgstr "Buscando Discos"
 msgid "Nautilus is searching your disks for trash folders."
 msgstr "Nautilus esta buscando en sus discos carpetas papelera."
 
-#: libnautilus-extensions/nautilus-trash-file.c:600
+#: libnautilus-extensions/nautilus-trash-file.c:725
 msgid "on the desktop"
 msgstr "en el escritorio"
 
@@ -7100,57 +7115,54 @@ msgstr "Ver como %s"
 msgid "%s Viewer"
 msgstr "Visualizador %s"
 
+# libnautilus-extensions/nautilus-file.c:2936
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+msgid "Unknown"
+msgstr "Desconocido"
+
 #. Populate table with items we know localized names for.
-#: libnautilus-extensions/nautilus-volume-monitor.c:623
-#: libnautilus-extensions/nautilus-volume-monitor.c:1862
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr "Disquetera"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:624
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:625
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
 msgid "Zip Drive"
 msgstr "Unidad Zip"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:646
-#: libnautilus-extensions/nautilus-volume-monitor.c:668
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 msgid "Audio CD"
 msgstr "CD de Audio"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1547
-msgid "Mount Error"
-msgstr "Error al Montar"
-
-# src/file-manager/fm-error-reporting.c:214
-#: libnautilus-extensions/nautilus-volume-monitor.c:1549
-msgid "Unmount Error"
-msgstr "Error al desmontar"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1579
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr "esta protegido contra escritura, montándolo sólo-lectura"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1582
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "no es un dispositivo de bloque válido"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1583
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr "No se encontró medio"
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1587
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
-"Nautilus was unable to mount the floppy drive. There is probably no floppy in "
-"the drive."
+"Nautilus was unable to mount the floppy drive. There is probably no floppy "
+"in the drive."
 msgstr ""
 "Nautilus no pudo montar la disquetera. Probablemente no haya un disquete "
 "colocado en ella."
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1591
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
@@ -7158,11 +7170,11 @@ msgstr ""
 "Nautilus no pudo montar el Volumen. Probablemente no haya un medio en el "
 "dispositivo."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1594
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr "Tipo de fs inválido, mala opción, superbloque malo en el"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1597
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
@@ -7170,58 +7182,67 @@ msgstr ""
 "Nautilus no pudo montar la disquetera. Probablemente el disquete este "
 "formateado de forma tal que no puede ser montado."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1600
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
-"Nautilus was unable to mount the selected volume. The volume is probably in a "
-"format that cannot be mounted."
+"Nautilus was unable to mount the selected volume. The volume is probably in "
+"a format that cannot be mounted."
 msgstr ""
 "Nautilus no pudo montar el Volumen seleccionado. Probablemente el volumen "
 "este formateado de tal forma que no pueda ser montado."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1605
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr "Nautilus no pudo montar la disquetera seleccionada."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1607
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "Nautilus no pudo montar el volumen seleccionado."
 
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1612
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr "Nautilus no pudo desmontar el volumen seleccionado."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1764
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr "Error al Montar"
+
+# src/file-manager/fm-error-reporting.c:214
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr "Error al desmontar"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "Volumen ISO 9660"
 
 # src/file-manager/fm-icon-view.c:1052
-#: libnautilus-extensions/nautilus-volume-monitor.c:1779
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "Raíz"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1786
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Volumen Ext2"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1801
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "Volumen MS-DOS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1816
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "Volumen NFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1831
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
 msgid "ReiserFS Volume"
 msgstr "Volumen ReiserFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1847
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
 msgid "UFS Volume"
 msgstr "Volumen UFS"
 
 # components/html/gnome-dialogs.c:234
-#: libnautilus-extensions/nautilus-volume-monitor.c:1877
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "Volumen desconocido"
 
@@ -7229,32 +7250,69 @@ msgstr "Volumen desconocido"
 msgid "C_lear Text"
 msgstr "_Limpiar Texto"
 
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "_Limpiar Texto"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "_Copiar Texto"
+
 # src/file-manager/fm-directory-view.c:2669
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "Copiar el texto seleccionado al Porta Papeles"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "Cortar _Texto"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+msgid "Cut _Text"
+msgstr "Cortar _Texto"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "Corta el texto seleccionado en el porta papeles"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:46
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "_Pegar Texto"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "Pega el texto que esta almacenado en el porta papeles"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "Quita el texto seleccionado sin ponerlo en el porta papeles"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:80
+# src/file-manager/fm-directory-view.c:2157 src/nautilus-window-menus.c:1153
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "_Seleccionar Todo"
+
+# src/file-manager/fm-directory-view.c:2157 src/nautilus-window-menus.c:1153
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+msgid "Select _All"
+msgstr "_Seleccionar Todo"
+
+# libnautilus-extensions/nautilus-global-preferences.c:622
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "Seleccionar todos los elementos en esta ventana"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "_Copiar Texto"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:7
-msgid "_Cut Text"
-msgstr "_Cortar Texto"
-
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:93
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "_Pegar Texto"
 
@@ -7266,7 +7324,7 @@ msgstr "_Pegar Texto"
 #. * to change it when we upgrade to GTK 2.0.
 #.
 #: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
-#: src/nautilus-window-menus.c:563
+#: src/nautilus-window-menus.c:610
 msgid "Nautilus"
 msgstr "Nautilus"
 
@@ -7282,92 +7340,127 @@ msgstr "Manejador de Archivos y Shell Gráfico Nautilus"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:735
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr "Directorio Personal de %s"
 
 # src/file-manager/fm-directory-view.c:2154
-#: src/file-manager/fm-desktop-icon-view.c:1021
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "Vaciar Papelera..."
 
 # src/file-manager/fm-directory-view.c:2154
-#: src/file-manager/fm-desktop-icon-view.c:1023
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "Vaciar la papelera"
 
 # components/html/gnome-dialogs.c:234
-#: src/file-manager/fm-desktop-icon-view.c:1043
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "Desmontar Volumen"
 
-#: src/file-manager/fm-directory-view.c:474
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr "Esto abrirá %d ventanas separadas. ¿Esta seguro de que quiere esto?"
 
 # src/file-manager/fm-directory-view.c:2128
-#: src/file-manager/fm-directory-view.c:476
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "¿Abrir %d ventanas?"
 
+# src/file-manager/fm-directory-view.c:1855
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr "¿Esta seguro que desea eliminar permanentemente \"%s\" de la papelera?"
+
+# src/file-manager/fm-directory-view.c:1860
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+"¿Esta seguro de que desea eliminar permanentemente los %d elementos "
+"seleccionados de la papelera?"
+
+# src/file-manager/fm-directory-view.c:1865
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Eliminar"
+
+# src/file-manager/fm-directory-view.c:1865
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Eliminar"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+msgid "scripts"
+msgstr ""
+
 # src/file-manager/fm-directory-view.c:1015
-#: src/file-manager/fm-directory-view.c:1212
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" seleccionado"
 
 # src/file-manager/fm-directory-view.c:1017
-#: src/file-manager/fm-directory-view.c:1214
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "1 carpeta seleccionada"
 
 # src/file-manager/fm-directory-view.c:1020
-#: src/file-manager/fm-directory-view.c:1217
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "%d carpetas seleccionadas"
 
 # src/file-manager/fm-directory-view.c:1026
-#: src/file-manager/fm-directory-view.c:1223
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr " (conteniendo 0 elementos)"
 
 # src/file-manager/fm-directory-view.c:1028
-#: src/file-manager/fm-directory-view.c:1225
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr " (conteniendo 1 elemento)"
 
 # src/file-manager/fm-directory-view.c:1030
-#: src/file-manager/fm-directory-view.c:1227
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr " (conteniendo %d elementos)"
 
 # src/file-manager/fm-directory-view.c:1041
-#: src/file-manager/fm-directory-view.c:1238
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" seleccionado (%s)"
 
 # src/file-manager/fm-directory-view.c:1045
-#: src/file-manager/fm-directory-view.c:1242
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d elementos seleccionados (%s)"
 
 # src/file-manager/fm-directory-view.c:1052
-#: src/file-manager/fm-directory-view.c:1249
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 otro elemento seleccionado (%s)"
 
 # src/file-manager/fm-directory-view.c:1055
-#: src/file-manager/fm-directory-view.c:1252
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d otros elementos seleccionados (%s)"
@@ -7380,7 +7473,7 @@ msgstr "%d otros elementos seleccionados (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1281
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -7389,7 +7482,7 @@ msgstr "%s%s, %s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1407
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
@@ -7398,11 +7491,11 @@ msgstr ""
 "La carpeta \"%s\" contiene más archivos de los que Nautilus puede manejar. "
 "Algunos archivos no serán mostrados."
 
-#: src/file-manager/fm-directory-view.c:1414
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "Demasiados archivos"
 
-#: src/file-manager/fm-directory-view.c:2623
+#: src/file-manager/fm-directory-view.c:2752
 #, c-format
 msgid ""
 "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
@@ -7410,7 +7503,7 @@ msgstr ""
 "\"%s\" no puede ser movido a la Papelera. ¿Quiere borrarlo permanentemente "
 "inmediatamente?"
 
-#: src/file-manager/fm-directory-view.c:2628
+#: src/file-manager/fm-directory-view.c:2757
 #, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
@@ -7419,7 +7512,7 @@ msgstr ""
 "Los %d elementos no pueden ser movidos a la Papelera. ¿Quiere borrarlos "
 "permanentemente en este momento?"
 
-#: src/file-manager/fm-directory-view.c:2632
+#: src/file-manager/fm-directory-view.c:2761
 #, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -7428,24 +7521,18 @@ msgstr ""
 "%d de los elementos seleccionados no pueden ser movidos a la Papelera. "
 "¿Quiere eliminar los %d elementos en este momento?"
 
-#: src/file-manager/fm-directory-view.c:2640
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "¿Borrar en este momento?"
 
-# src/file-manager/fm-directory-view.c:1865
-#: src/file-manager/fm-directory-view.c:2641
-#: src/file-manager/fm-directory-view.c:2682
-msgid "Delete"
-msgstr "Eliminar"
-
 # src/file-manager/fm-directory-view.c:1855
-#: src/file-manager/fm-directory-view.c:2671
+#: src/file-manager/fm-directory-view.c:2799
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr "¿Esta seguro que desea eliminar permanentemente \"%s\" de la papelera?"
 
 # src/file-manager/fm-directory-view.c:1860
-#: src/file-manager/fm-directory-view.c:2675
+#: src/file-manager/fm-directory-view.c:2803
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
@@ -7454,84 +7541,232 @@ msgstr ""
 "¿Esta seguro de que desea eliminar permanentemente los %d elementos "
 "seleccionados de la papelera?"
 
-#: src/file-manager/fm-directory-view.c:2681
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "¿Vaciar la Papelera?"
 
-#: src/file-manager/fm-directory-view.c:2978
-#: src/file-manager/fm-directory-view.c:3018
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Usar \"%s\" para abrir el elemento seleccionado"
 
+# src/file-manager/fm-directory-view.c:2120
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "Otra _Aplicación..."
+
+# src/file-manager/fm-directory-view.c:2120
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "Otra _Aplicación..."
+
+# src/file-manager/fm-directory-view.c:2122
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "Otro _Visualizador..."
+
+# src/file-manager/fm-directory-view.c:2122
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "Otro _Visualizador..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "Usar \"%s\" para abrir el elemento seleccionado"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "Nautilus no pudo montar el volumen seleccionado."
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"Los %d elementos no pueden ser movidos a la Papelera. ¿Quiere borrarlos "
+"permanentemente en este momento?"
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
 # src/file-manager/fm-directory-view.c:2126
-#: src/file-manager/fm-directory-view.c:3220
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "Abrir _en Ventana Nueva"
+
+# src/file-manager/fm-directory-view.c:2126
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open _in New Window"
 msgstr "Abrir _en Ventana Nueva"
 
 # src/file-manager/fm-directory-view.c:2128
-#: src/file-manager/fm-directory-view.c:3222
+#: src/file-manager/fm-directory-view.c:3959
 #, c-format
 msgid "Open _in %d New Windows"
 msgstr "Abrir _en  %d Nuevas Ventanas"
 
-# src/file-manager/fm-directory-view.c:2678
-#: src/file-manager/fm-directory-view.c:3248
-msgid "Delete all selected items permanently"
-msgstr "Eliminar todos los elementos seleccionados permanentemente"
-
-#: src/file-manager/fm-directory-view.c:3253
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "Vaciar la _Papelera..."
 
-#: src/file-manager/fm-directory-view.c:3254
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "Vaciar la _Papelera"
 
-# src/file-manager/fm-directory-view.c:2669
-#: src/file-manager/fm-directory-view.c:3258
-msgid "Move all selected items to the Trash"
-msgstr "Mover todos los elementos seleccionados a la Papelera"
+# src/file-manager/fm-directory-view.c:2678
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "Eliminar todos los elementos seleccionados permanentemente"
 
 # src/file-manager/fm-directory-view.c:2145
-#: src/file-manager/fm-directory-view.c:3262
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "Mover a la _papelera"
 
-#: src/file-manager/fm-directory-view.c:3292
-msgid "Create _Links"
+# src/file-manager/fm-directory-view.c:2669
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "Mover todos los elementos seleccionados a la Papelera"
+
+# src/file-manager/fm-directory-view.c:1865
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "Eliminar"
+
+# src/file-manager/fm-directory-view.c:1865
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "Eliminar"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "Crear _Enlaces"
 
-#: src/file-manager/fm-directory-view.c:3293
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "Crear _Enlace"
 
 # src/file-manager/fm-directory-view.c:2154
-#: src/file-manager/fm-directory-view.c:3311
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "_Vaciar la papelera"
 
 # src/file-manager/fm-directory-view.c:2154
-#: src/file-manager/fm-directory-view.c:3312
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "_Vaciar la Papelera"
 
 # src/file-manager/fm-directory-view.c:2161
-#: src/file-manager/fm-directory-view.c:3323
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "_Remover la Imágenes Personalizadas"
 
 # src/file-manager/fm-directory-view.c:2163
-#: src/file-manager/fm-directory-view.c:3324
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "_Remover la Imagen Personalizada"
 
-#: src/file-manager/fm-directory-view.c:3477
+# components/music/nautilus-music-view.c:198
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "_Archivo"
+
+# libnautilus-extensions/nautilus-file.c:2595
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u archivos"
+
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "_Copiar Texto"
+
+# src/file-manager/dfos-xfer.c:723
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "Copiando archivos"
+
+#: src/file-manager/fm-directory-view.c:4252
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
 "link in the Trash?"
@@ -7539,24 +7774,24 @@ msgstr ""
 "Este enlace no puede ser utilizado debido a que no tiene destino. ¿Quiere "
 "poner este enlace en la Papelera?"
 
-#: src/file-manager/fm-directory-view.c:3480
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you want "
-"to put this link in the Trash?"
+"This link can't be used, because its target \"%s\" doesn't exist. Do you "
+"want to put this link in the Trash?"
 msgstr ""
 "Este enlace no puede ser usado porque el destino \"%s\" no existe. ¿Quiere "
 "poner este enlace en la Papelera?"
 
-#: src/file-manager/fm-directory-view.c:3486
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "Enlace Roto"
 
-#: src/file-manager/fm-directory-view.c:3487
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr "Descartar"
 
-#: src/file-manager/fm-directory-view.c:3540
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
@@ -7566,20 +7801,20 @@ msgstr ""
 "contenido?"
 
 # libnautilus-extensions/nautilus-global-preferences.c:149
-#: src/file-manager/fm-directory-view.c:3546
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr "¿Ejecutar o Mostrar?"
 
-#: src/file-manager/fm-directory-view.c:3547
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "Ejecutar"
 
 # libnautilus-extensions/nautilus-global-preferences.c:149
-#: src/file-manager/fm-directory-view.c:3548
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "Vista"
 
-#: src/file-manager/fm-directory-view.c:3602
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
@@ -7588,18 +7823,18 @@ msgstr ""
 "consideraciones de seguridad."
 
 # libnautilus-extensions/nautilus-program-choosing.c:252
-#: src/file-manager/fm-directory-view.c:3604
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "No se pueden ejecutar enlaces remotos"
 
 # src/file-manager/fm-icon-view.c:1277
-#: src/file-manager/fm-directory-view.c:3738
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr "Abriendo \"%s\""
 
 # src/file-manager/fm-error-reporting.c:226
-#: src/file-manager/fm-directory-view.c:3744
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "¿Cancelar Abrir?"
 
@@ -7610,18 +7845,23 @@ msgid ""
 "You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "No tiene los permisos suficientes para ver el contenido de \"%s\"."
 
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
 # src/file-manager/fm-error-reporting.c:115
-#: src/file-manager/fm-error-reporting.c:65
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Lo siento, no se pudo mostrar todo el contenido de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Error Mostrando Carpeta"
 
 # src/file-manager/fm-error-reporting.c:50
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
@@ -7629,7 +7869,7 @@ msgstr ""
 "El nombre \"%s\" ya está siendo usado en esta carpeta.\n"
 "Por favor seleccione un nombre diferente."
 
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
@@ -7638,13 +7878,13 @@ msgstr ""
 "borrado?"
 
 # src/file-manager/fm-error-reporting.c:55
-#: src/file-manager/fm-error-reporting.c:109
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "No tiene los permisos suficientes para renombrar \"%s\"."
 
 # src/file-manager/fm-error-reporting.c:50
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -7654,12 +7894,12 @@ msgstr ""
 "use un nombre distinto."
 
 # src/file-manager/fm-error-reporting.c:50
-#: src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "El nombre \"%s\" no es válido. Por favor use un nombre distinto."
 
-#: src/file-manager/fm-error-reporting.c:124
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
@@ -7667,57 +7907,57 @@ msgstr ""
 "lectura"
 
 # src/file-manager/fm-error-reporting.c:64
-#: src/file-manager/fm-error-reporting.c:133
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Lo siento, no se pudo renombrar \"%s\" por \"%s\"."
 
 # src/file-manager/fm-error-reporting.c:214
-#: src/file-manager/fm-error-reporting.c:140
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "Error al renombrar"
 
 # src/file-manager/fm-error-reporting.c:85
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "No tiene los permisos suficientes para cambiar el grupo de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
 "No se pudo cambiar el grupo de \"%s\" porque esta en un disco de sólo lectura"
 
 # src/file-manager/fm-error-reporting.c:93
-#: src/file-manager/fm-error-reporting.c:172
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Lo siento, no se pudo cambiar el grupo de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:176
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "Grupo de Error de Configuración"
 
-#: src/file-manager/fm-error-reporting.c:198
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
 "No se pudo cambiar el dueño de \"%s\" porque esta en un disco de sólo lectura"
 
 # src/file-manager/fm-error-reporting.c:115
-#: src/file-manager/fm-error-reporting.c:205
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Lo siento, no se pudo cambiar el dueño de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "Error Configurando Dueño"
 
 # src/file-manager/fm-error-reporting.c:137
-#: src/file-manager/fm-error-reporting.c:230
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
@@ -7726,24 +7966,24 @@ msgstr ""
 "lectura"
 
 # src/file-manager/fm-error-reporting.c:137
-#: src/file-manager/fm-error-reporting.c:237
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Lo siento, no se pudo cambiar los permisos de \"%s\"."
 
 # src/file-manager/fm-icon-text-window.c:83
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "Error al establecer permisos"
 
 # src/file-manager/fm-error-reporting.c:214
-#: src/file-manager/fm-error-reporting.c:306
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Renombrando \"%s\" por \"%s\"."
 
 # src/file-manager/fm-error-reporting.c:226
-#: src/file-manager/fm-error-reporting.c:311
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "¿Cancelar renombrar?"
 
@@ -7817,73 +8057,73 @@ msgstr ""
 "iconos. Aparecerá más información a medida que agrande más la vista."
 
 # src/file-manager/fm-icon-view.c:109
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "por _Nombre"
 
 # src/file-manager/fm-icon-view.c:110
-#: src/file-manager/fm-icon-view.c:159
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "Mantener los iconos ordenados por nombre en filas"
 
 # src/file-manager/fm-icon-view.c:116
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "por T_amaño"
 
 # src/file-manager/fm-icon-view.c:117
-#: src/file-manager/fm-icon-view.c:166
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "Mantener los iconos ordenados por tamaño en filas"
 
 # src/file-manager/fm-icon-view.c:123
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "por _Tipo"
 
 # src/file-manager/fm-icon-view.c:124
-#: src/file-manager/fm-icon-view.c:173
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "Mantener los iconos ordenados por tipo en filas"
 
 # src/file-manager/fm-icon-view.c:130
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "por Fecha de Mo_dificación"
 
 # src/file-manager/fm-icon-view.c:131
-#: src/file-manager/fm-icon-view.c:180
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Mantener los iconos ordenados por fecha de modificación en filas"
 
 # src/file-manager/fm-icon-view.c:137
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "por Ma_rcas"
 
 # src/file-manager/fm-icon-view.c:138
-#: src/file-manager/fm-icon-view.c:187
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Mantener los iconos ordenados por Marcas en filas"
 
 # src/file-manager/fm-icon-view.c:318
-#: src/file-manager/fm-icon-view.c:1230
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "_Restaurar los Iconos a su Tamaño Normal"
 
 # src/file-manager/fm-icon-view.c:318
-#: src/file-manager/fm-icon-view.c:1231
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "_Restaurar los Iconos a su Tamaño Normal"
 
 # src/file-manager/fm-icon-view.c:1277
-#: src/file-manager/fm-icon-view.c:1443
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "apuntando a \"%s\""
@@ -7891,7 +8131,7 @@ msgstr "apuntando a \"%s\""
 # libnautilus-extensions/nautilus-search-bar-criterion.c:46
 # src/file-manager/fm-list-view.c:1587
 # src/file-manager/fm-search-list-view.c:146
-#: src/file-manager/fm-list-view.c:2129
+#: src/file-manager/fm-list-view.c:2188
 #: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Tamaño"
@@ -7899,14 +8139,14 @@ msgstr "Tamaño"
 # libnautilus-extensions/nautilus-search-bar-criterion.c:44
 # src/file-manager/fm-list-view.c:1593
 # src/file-manager/fm-search-list-view.c:152
-#: src/file-manager/fm-list-view.c:2135
+#: src/file-manager/fm-list-view.c:2194
 #: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Tipo"
 
 # src/file-manager/fm-list-view.c:1599
 # src/file-manager/fm-search-list-view.c:158
-#: src/file-manager/fm-list-view.c:2141
+#: src/file-manager/fm-list-view.c:2200
 #: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Fecha de Modificación"
@@ -7975,147 +8215,154 @@ msgid "Contents:"
 msgstr "Contenidos:"
 
 # src/file-manager/fm-properties-window.c:1031
-#: src/file-manager/fm-properties-window.c:1433
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "Básico"
 
 # src/file-manager/fm-properties-window.c:1094
-#: src/file-manager/fm-properties-window.c:1512
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Tipo:"
 
 # src/file-manager/fm-properties-window.c:1100
-#: src/file-manager/fm-properties-window.c:1517
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "Tamaño:"
 
+# src/nautilus-link-set-window.c:185
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "Configuraciones de Enlace"
+
 # src/file-manager/fm-properties-window.c:1108
-#: src/file-manager/fm-properties-window.c:1521
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
 msgstr "Tipo MIME:"
 
 # src/file-manager/fm-properties-window.c:1103
-#: src/file-manager/fm-properties-window.c:1527
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "Modificado:"
 
 # src/file-manager/fm-properties-window.c:1105
-#: src/file-manager/fm-properties-window.c:1530
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "Accedido:"
 
-#: src/file-manager/fm-properties-window.c:1539
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr "Seleccionar Icono Personal"
 
 # src/file-manager/fm-directory-view.c:2163
-#: src/file-manager/fm-properties-window.c:1545
+#: src/file-manager/fm-properties-window.c:1558
 msgid "Remove Custom Icon"
 msgstr "Remover Icono Personal"
 
 # src/file-manager/fm-properties-window.c:1474
-#: src/file-manager/fm-properties-window.c:1873
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "Configurar UID"
 
 # src/file-manager/fm-properties-window.c:1470
-#: src/file-manager/fm-properties-window.c:1878
+#: src/file-manager/fm-properties-window.c:1891
 msgid "Special Flags:"
 msgstr "Banderas Especiales:"
 
 # src/file-manager/fm-properties-window.c:1478
-#: src/file-manager/fm-properties-window.c:1881
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "Poner el Bit GID"
 
 # src/file-manager/fm-properties-window.c:1482
-#: src/file-manager/fm-properties-window.c:1883
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "Pegadizo"
 
 # src/file-manager/fm-properties-window.c:1493
-#: src/file-manager/fm-properties-window.c:1909
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Permisos"
 
 # src/file-manager/fm-properties-window.c:1499
-#: src/file-manager/fm-properties-window.c:1915
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Usted no es el dueño, por eso no puede cambiar los permisos."
 
 # src/file-manager/fm-properties-window.c:1526
-#: src/file-manager/fm-properties-window.c:1928
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "Dueño:"
 
 # src/file-manager/fm-properties-window.c:1536
-#: src/file-manager/fm-properties-window.c:1937
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "Grupo:"
 
 # src/file-manager/fm-properties-window.c:1554
-#: src/file-manager/fm-properties-window.c:1955
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "Dueño:"
 
 # src/file-manager/fm-properties-window.c:1557
-#: src/file-manager/fm-properties-window.c:1956
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "Grupo:"
 
 # src/file-manager/fm-properties-window.c:1560
-#: src/file-manager/fm-properties-window.c:1957
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "Otros:"
 
 # src/file-manager/fm-properties-window.c:1573
-#: src/file-manager/fm-properties-window.c:1976
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "Lectura"
 
 # src/file-manager/fm-properties-window.c:1577
-#: src/file-manager/fm-properties-window.c:1980
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "Escritura"
 
 # src/file-manager/fm-properties-window.c:1581
-#: src/file-manager/fm-properties-window.c:1984
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "Ejecución"
 
 # src/file-manager/fm-properties-window.c:1563
-#: src/file-manager/fm-properties-window.c:2035
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "Vista Texto:"
 
 # src/file-manager/fm-properties-window.c:1566
-#: src/file-manager/fm-properties-window.c:2036
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "Vista Número:"
 
 # src/file-manager/fm-properties-window.c:1569
-#: src/file-manager/fm-properties-window.c:2037
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "Último Cambio:"
 
 # src/file-manager/fm-properties-window.c:1641
-#: src/file-manager/fm-properties-window.c:2041
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "No se pueden determinar los permisos de \"%s\"."
 
 # libnautilus-extensions/nautilus-global-preferences.c:750
-#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr "¿Cancela Mostrando Ventana de Propiedades?"
 
 # libnautilus-extensions/nautilus-global-preferences.c:750
-#: src/file-manager/fm-properties-window.c:2322
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr "Creando Ventana de Propiedades"
 
 # src/nautilus-property-browser.c:1083
-#: src/file-manager/fm-properties-window.c:2422
+#: src/file-manager/fm-properties-window.c:2435
 msgid "Select an icon:"
 msgstr "Elija un icono:"
 
@@ -8142,7 +8389,7 @@ msgstr ""
 "se encuentra instalado."
 
 #: src/file-manager/fm-search-list-view.c:159
-#: src/file-manager/nautilus-indexing-info.c:405
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr "Servicio de búsqueda no disponible"
 
@@ -8175,12 +8422,12 @@ msgstr "No crear índice"
 #: src/file-manager/fm-search-list-view.c:200
 msgid ""
 "Every indexed file on your computer matches the criteria you selected. You "
-"can check the spelling on your selections or add more criteria to narrow your "
-"results."
+"can check the spelling on your selections or add more criteria to narrow "
+"your results."
 msgstr ""
-"Cada archivo indexado en su computadora coincide con el criterio de búsqueda. "
-"Puede comprobar lo que escribió en sus selecciones o agregar más criterios "
-"para achicar los resultados."
+"Cada archivo indexado en su computadora coincide con el criterio de "
+"búsqueda. Puede comprobar lo que escribió en sus selecciones o agregar más "
+"criterios para achicar los resultados."
 
 # src/file-manager/dfos-xfer.c:764 src/file-manager/dfos-xfer.c:780
 # src/file-manager/dfos-xfer.c:923 src/file-manager/dfos-xfer.c:933
@@ -8202,8 +8449,8 @@ msgid ""
 "that doesn't use the index."
 msgstr ""
 "Para hacer una búsqueda rápida Buscar necesita un índice de los archivos de "
-"su sistema. Buscar no puede acceder a su índice en este momento, por eso será "
-"ejecutada una búsqueda lenta que no utiliza el índice."
+"su sistema. Buscar no puede acceder a su índice en este momento, por eso "
+"será ejecutada una búsqueda lenta que no utiliza el índice."
 
 #: src/file-manager/fm-search-list-view.c:246
 msgid ""
@@ -8230,9 +8477,9 @@ msgid ""
 "index requests, isn't running.  To start this program, log in as root and "
 "enter this command at the command line: medusa-searchd"
 msgstr ""
-"Sus archivos índices están disponibles pero el proceso Medusa, el cual maneja "
-"las peticiones del índice no esta ejecutándose. Para iniciar este programa "
-"conéctese como root e ingrese lo siguiente en la línea de comandos: "
+"Sus archivos índices están disponibles pero el proceso Medusa, el cual "
+"maneja las peticiones del índice no esta ejecutándose. Para iniciar este "
+"programa conéctese como root e ingrese lo siguiente en la línea de comandos: "
 "medusa-searchd"
 
 #: src/file-manager/fm-search-list-view.c:274
@@ -8246,20 +8493,20 @@ msgstr ""
 "Para hacer una búsqueda rápida Buscar necesita un índice de los archivos de "
 "su sistema. Su Computadora no tiene un índice en este momento. Debido a que "
 "Buscar no tiene un índice esta búsqueda puede llevar varios minutos. ¿Le "
-"gustaría crear un índice? La creación de un índice será realizada mientras no "
-"se este usando activamente la computadora."
+"gustaría crear un índice? La creación de un índice será realizada mientras "
+"no se este usando activamente la computadora."
 
 #: src/file-manager/fm-search-list-view.c:283
 msgid ""
-"To do a content search, Find requires an index of the content on your system. "
-" Your computer does not have an index right now.  Would you like to create an "
-"index?  Creating an index will be done while you are not actively using your "
-"computer."
+"To do a content search, Find requires an index of the content on your "
+"system.  Your computer does not have an index right now.  Would you like to "
+"create an index?  Creating an index will be done while you are not actively "
+"using your computer."
 msgstr ""
 "Para hacer una búsqueda por contenido Buscar necesita un índice de los "
 "contenidos de su sistema. Su computadora no tiene un índice en este momento. "
-"¿Le gustaría crear un índice? La creación del índice sería realizada mientras "
-"no se utiliza activamente su computadora."
+"¿Le gustaría crear un índice? La creación del índice sería realizada "
+"mientras no se utiliza activamente su computadora."
 
 #: src/file-manager/fm-search-list-view.c:290
 #: src/file-manager/fm-search-list-view.c:318
@@ -8288,9 +8535,9 @@ msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:312
 msgid ""
-"To do a content search, Find requires an index of the content on your system. "
-" Your computer is currently creating that index.  Content searches will be "
-"available when the index is complete."
+"To do a content search, Find requires an index of the content on your "
+"system.  Your computer is currently creating that index.  Content searches "
+"will be available when the index is complete."
 msgstr ""
 "Para hacer una búsqueda por contenidos Buscar necesita un índice de los "
 "contenidos de su sistema. Su computadora esta creando el índice en este "
@@ -8309,59 +8556,59 @@ msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:332
 msgid ""
-"To do a content search, Find requires an index of the content on your system. "
-" An index can't be created right now."
+"To do a content search, Find requires an index of the content on your "
+"system.  An index can't be created right now."
 msgstr ""
 "Para hacer una búsqueda por contenidos Buscar necesita un índice del "
 "contenido de su sistema. Se esta creando un índice justo en este momento."
 
 #: src/file-manager/fm-search-list-view.c:341
 msgid ""
-"The program that creates an index is not set up correctly.  You can create an "
-"index by hand by running \"medusa-indexd\" as root on the command line."
+"The program that creates an index is not set up correctly.  You can create "
+"an index by hand by running \"medusa-indexd\" as root on the command line."
 msgstr ""
-"El programa que crea un índice no esta configurado correctamente. Puede crear "
-"un índice por sus medios ejecutando \"medusa-indexd\" como root desde la "
-"línea de comandos."
+"El programa que crea un índice no esta configurado correctamente. Puede "
+"crear un índice por sus medios ejecutando \"medusa-indexd\" como root desde "
+"la línea de comandos."
 
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
 #: src/file-manager/fm-search-list-view.c:360
-#: src/file-manager/nautilus-indexing-info.c:340
+#: src/file-manager/nautilus-indexing-info.c:342
 msgid ""
-"To do a fast search, Find requires an index of the files on your system. Your "
-"system administrator has disabled fast search on your computer, so no index "
-"is available."
+"To do a fast search, Find requires an index of the files on your system. "
+"Your system administrator has disabled fast search on your computer, so no "
+"index is available."
 msgstr ""
 "Para hacer una búsqueda rápida Buscar necesita un índice de los archivos de "
-"su sistema. Su Administrador del Sistema ha desactivado la búsqueda rápida en "
-"su computadora debido a esto no hay un índice disponible."
+"su sistema. Su Administrador del Sistema ha desactivado la búsqueda rápida "
+"en su computadora debido a esto no hay un índice disponible."
 
 #: src/file-manager/fm-search-list-view.c:364
 msgid "Fast searches are not available on your computer"
 msgstr "Las Búsquedas Rápidas no están disponible en su computadora"
 
 #: src/file-manager/fm-search-list-view.c:373
-#: src/file-manager/nautilus-indexing-info.c:359
+#: src/file-manager/nautilus-indexing-info.c:361
 msgid ""
-"To do a fast search, Find requires an index of the files on your system. Fast "
-"search is disabled in your Search preferences, so no index is available."
+"To do a fast search, Find requires an index of the files on your system. "
+"Fast search is disabled in your Search preferences, so no index is available."
 msgstr ""
 "Para hacer una búsqueda rápida Buscar necesita un índice de archivos de su "
 "sistema. La Búsqueda Rápida esta deshabilitada en sus Preferencias de "
 "Búsqueda, debido a esto hay un índice disponible."
 
 #: src/file-manager/fm-search-list-view.c:376
-#: src/file-manager/nautilus-indexing-info.c:345
-#: src/file-manager/nautilus-indexing-info.c:363
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
 msgid "Fast searches are not available on your computer."
 msgstr "Las Búsquedas Rápidas no están disponible en su computadora."
 
 #: src/file-manager/fm-search-list-view.c:377
-#: src/file-manager/nautilus-indexing-info.c:364
+#: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
-"To enable fast search, open the Preferences menu and choose Preferences. Then "
-"select Search preferences and put a checkmark in the Enable Fast Search "
+"To enable fast search, open the Preferences menu and choose Preferences. "
+"Then select Search preferences and put a checkmark in the Enable Fast Search "
 "checkbox. An index will be generated while your computer is idle, so your "
 "index won't be available immediately."
 msgstr ""
@@ -8422,7 +8669,7 @@ msgstr "Cambiar fondo del escritorio"
 
 # src/file-manager/fm-directory-view.c:2669
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Delete all items in the Trash"
 msgstr "Borrar todos los elementos que hay en la Papelera"
 
@@ -8474,170 +8721,221 @@ msgstr "Elegir otra aplicación con la cual abrir el elemento seleccionado"
 msgid "Choose another viewer with which to view the selected item"
 msgstr "Escoja otra vista con la cual ver el elemento seleccionado"
 
+# src/file-manager/dfos-xfer.c:723
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-msgid "Create Link"
-msgstr "Crear Enlace"
+#, fuzzy
+msgid "Copy Files"
+msgstr "Copiando archivos"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "Crear una nueva carpeta vacía dentro de esta carpeta"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "Crear un enlace simbólico para cada elemento seleccionado"
 
+# libnautilus-extensions/nautilus-file.c:2595
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u archivos"
+
+# src/file-manager/fm-directory-view.c:2669
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "Mover cada elemento seleccionado a la Papelera"
+
 # src/file-manager/fm-directory-view.c:2148
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "_Duplicar"
 
 # src/file-manager/fm-directory-view.c:2678
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "Duplicar cada elemento seleccionado"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "Crear Enlace"
+
 # src/file-manager/fm-directory-view.c:2669
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr "Mover cada elemento seleccionado a la Papelera"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
 # src/file-manager/fm-directory-view.c:2145
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Move to Trash"
 msgstr "Mover a la Papelera"
 
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "Nueva Carpeta"
 
 # src/file-manager/fm-directory-view.c:2114
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "Abrir"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
 # src/file-manager/fm-directory-view.c:2117
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid "Open Wit_h"
 msgstr "Abrir Co_n"
 
 # src/file-manager/fm-directory-view.c:2117
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "Abrir Con"
 
 # libnautilus-extensions/nautilus-global-preferences.c:622
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "Abrir cada elemento seleccionado en una ventana nueva"
 
 # src/file-manager/fm-directory-view.c:2126
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr "Abrir en Ventana Nueva"
 
 # libnautilus-extensions/nautilus-global-preferences.c:622
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Abrir el elemento seleccionado en esta ventana"
 
 # src/file-manager/fm-directory-view.c:2120
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "Otra Aplicación..."
 
 # src/file-manager/fm-directory-view.c:2122
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "Otro Visualizador..."
 
-# src/file-manager/fm-directory-view.c:2120
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Other _Application..."
-msgstr "Otra _Aplicación..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "_Pegar Texto"
 
-# src/file-manager/fm-directory-view.c:2122
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-msgid "Other _Viewer..."
-msgstr "Otro _Visualizador..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
 
 # src/file-manager/fm-directory-view.c:2161
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr "_Remover Imágenes Personales"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr "Quitar cualquier imagen personal de los iconos seleccionados"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
-msgid ""
-"Remove any custom pattern or color from the background of this location"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+msgid "Remove any custom pattern or color from the background of this location"
 msgstr "Quitar cualquier fondo o color personalizado de esta dirección"
 
 # src/nautilus-sidebar.c:424
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "Restaurar Fondo"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+msgid "Scripts"
+msgstr ""
+
 # src/file-manager/fm-directory-view.c:2157 src/nautilus-window-menus.c:1153
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr "Seleccionar todos los archivos"
 
 # src/file-manager/fm-directory-view.c:2157 src/nautilus-window-menus.c:1153
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Select _All Files"
 msgstr "Seleccionar _Todos los Archivos"
 
 # libnautilus-extensions/nautilus-global-preferences.c:622
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "Seleccionar todos los elementos en esta ventana"
 
 # src/file-manager/fm-directory-view.c:2151
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr "Ver _Propiedades"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Show Trash"
 msgstr "Mostrar _Papelera"
 
 # src/file-manager/fm-directory-view.c:2151
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "Ver _Propiedades"
 
 # src/file-manager/dfos-xfer.c:763
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "Show the contents of the Trash"
 msgstr "Mostrar los contenidos de la Papelera"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "Ver o modificar las propiedades de cada elemento seleccionado"
 
 # src/file-manager/fm-directory-view.c:2148
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "_Duplicar"
 
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_New Folder"
 msgstr "_Nueva Carpeta"
 
 # src/file-manager/fm-directory-view.c:2114
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "_Pegar Texto"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Show Trash"
 msgstr "Mostrar _Papelera"
 
@@ -8821,8 +9119,8 @@ msgid ""
 "An attempt to reindex, caused an Internal Indexer Error.  Tell "
 "rebecka@eazel.com"
 msgstr ""
-"Un intento de re-indexado a causado un Error Interno del Indexador. Por avise "
-"a rebecka@eazel.com"
+"Un intento de re-indexado a causado un Error Interno del Indexador. Por "
+"avise a rebecka@eazel.com"
 
 #: src/file-manager/nautilus-indexing-info.c:194
 msgid "Reindexing Failed"
@@ -8830,25 +9128,26 @@ msgstr "Falla al Re-indexar"
 
 #: src/file-manager/nautilus-indexing-info.c:216
 msgid ""
-"Once a day your files and text content are indexed so your searches are fast. "
-"If you need to update your index now, click on the \"Update Now\" button."
+"Once a day your files and text content are indexed so your searches are "
+"fast. If you need to update your index now, click on the \"Update Now\" "
+"button."
 msgstr ""
 "Una vez al día sus archivos y textos son indexados, de esa forma las "
-"búsquedas son rápidas. Si necesita actualizar su índice ahora haga clic en el "
-"botón \"Actualizar Ahora\"."
+"búsquedas son rápidas. Si necesita actualizar su índice ahora haga clic en "
+"el botón \"Actualizar Ahora\"."
 
 # src/nautilus-window-menus.c:1292
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr "Estado de Indexación"
 
 #. FIXME: Do we want to talk about the index not being available?
 #: src/file-manager/nautilus-indexing-info.c:224
 msgid ""
-"Once a day your files and text content are indexed so your searches are fast. "
-""
+"Once a day your files and text content are indexed so your searches are "
+"fast. "
 msgstr ""
 "Una vez al día sus archivos y textos son indexados, de esta forma las "
 "búsquedas son rápidas."
@@ -8859,23 +9158,23 @@ msgid "Your files were last indexed at %s"
 msgstr "Sus archivos fueron ordenados por última vez a las %s"
 
 # components/rpmview/nautilus-rpm-view.c:277
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "Actualizar Ahora"
 
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
-"Once a day your files and text content are indexed so your searches are fast. "
-" Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are "
+"fast.  Your files are currently being indexed."
 msgstr ""
 "Una vez al día sus archivos y textos son indexados, de esa forma las "
 "búsquedas son rápidas. Sus archivos esta siendo indexados en este momento."
 
-#: src/file-manager/nautilus-indexing-info.c:404
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Lo siento, pero el servicio de búsqueda medusa no esta disponible."
 
-#: src/file-manager/nautilus-indexing-info.c:426
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -8939,8 +9238,8 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"Before running Nautilus, please create these folders, or set permissions such "
-"that Nautilus can create them."
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
 msgstr ""
 "Nautilus no pudo crear las siguientes carpetas que se han requerido\n"
 "\n"
@@ -8961,9 +9260,9 @@ msgstr ""
 #.
 #: src/nautilus-application.c:407
 msgid ""
-"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" from "
-"the console may fix the problem. If not, you can try rebooting the computer "
-"or installing Nautilus again."
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again."
 msgstr ""
 "Nautilus no puede ser usado ahora. Ejecutando el comando \"nautilus-clean-sh "
 "-x\" desde la consola puede arreglar este problema. Sino lo arregla puede "
@@ -8973,36 +9272,36 @@ msgstr ""
 #. FIXME bugzilla.eazel.com 2536: The guesses and stuff here are lame.
 #: src/nautilus-application.c:413
 msgid ""
-"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" from "
-"the console may fix the problem. If not, you can try rebooting the computer "
-"or installing Nautilus again.\n"
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again.\n"
 "\n"
 "OAF couldn't locate the Nautilus_shell.oaf file. One cause of this seems to "
 "be an LD_LIBRARY_PATH that does not include the oaf library's directory. "
-"Another possible cause would be bad install with a missing Nautilus_Shell.oaf "
-"file.\n"
+"Another possible cause would be bad install with a missing "
+"Nautilus_Shell.oaf file.\n"
 "\n"
-"Running \"nautilus-clean.sh -x\" will kill all OAF and GConf processes, which "
-"may be needed by other applications.\n"
+"Running \"nautilus-clean.sh -x\" will kill all OAF and GConf processes, "
+"which may be needed by other applications.\n"
 "\n"
 "Sometimes killing oafd and gconfd fixes the problem, but we don't know why.\n"
 "\n"
 "We have also seen this error when a faulty version of oaf was installed."
 msgstr ""
-"Nautilus no puede ser utilizado ahora. Ejecutando el comando \"nautilus-clean "
-"-x\" desde la consola puede arreglar el problema. Si no lo arregla intente "
-"reiniciar su computadora o instalar Nautilus nuevamente.\n"
+"Nautilus no puede ser utilizado ahora. Ejecutando el comando "
+"\"nautilus-clean -x\" desde la consola puede arreglar el problema. Si no lo "
+"arregla intente reiniciar su computadora o instalar Nautilus nuevamente.\n"
 "\n"
 "OAF no pudo ubicar el archivo Nautilus_shell.oaf. Una de las causas de esto "
 "parece ser un LD_LIBRARY_PATH que no incluye el directorio de la librería "
 "OAF. Otra posible causa pudo haber sido una mala instalación con un archivo "
 "Nautilus_Shell.oaf perdido.\n"
 "\n"
-"Ejecutando \"nautilus-clean.sh -x\" eliminará todos los procesos OAF y GConf, "
-"los cuales son necesarios por otras aplicaciones.\n"
+"Ejecutando \"nautilus-clean.sh -x\" eliminará todos los procesos OAF y "
+"GConf, los cuales son necesarios por otras aplicaciones.\n"
 "\n"
-"Algunas veces matando a oafd y gconfd se arregla el problema, pero no sabemos "
-"por que.\n"
+"Algunas veces matando a oafd y gconfd se arregla el problema, pero no "
+"sabemos por que.\n"
 "\n"
 "Hemos visto este error también cuando una fue instalada una versión de oaf "
 "con fallas."
@@ -9078,7 +9377,7 @@ msgid "Location"
 msgstr "Dirección"
 
 # src/nautilus-bookmarks-window.c:198 src/nautilus-window-menus.c:588
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:757
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Remover"
 
@@ -9100,8 +9399,8 @@ msgstr "Buscar"
 # src/nautilus-application.c:614
 #: src/nautilus-first-time-druid.c:191
 msgid ""
-"Existence of this file indicates that the Nautilus configuration "
-"druid\nhas been presented.\n"
+"Existence of this file indicates that the Nautilus configuration druid\n"
+"has been presented.\n"
 "\n"
 "You can manually erase this file to present the druid again.\n"
 "\n"
@@ -9226,11 +9525,12 @@ msgstr "Usar Nautilus para dibujar el escritorio."
 msgid "Move existing desktop icons to the Nautilus desktop."
 msgstr "Mover los iconos del escritorio actual al escritorio Nautilus."
 
-#: src/nautilus-first-time-druid.c:924
+#. This option is currently disabled, per bugzilla.eazel.com 7557
+#: src/nautilus-first-time-druid.c:927
 msgid "Launch Nautilus when GNOME starts up."
 msgstr "Ejecutar Nautilus cuando arranca GNOME."
 
-#: src/nautilus-first-time-druid.c:963
+#: src/nautilus-first-time-druid.c:967
 msgid ""
 "The fast search feature indexes all the items on your hard disk.\n"
 "It speeds up searching and allows you to search by file content\n"
@@ -9246,7 +9546,7 @@ msgstr ""
 "La Búsqueda Rápida requiere que el proceso cron se este ejecutando en\n"
 "su computadora.\n"
 
-#: src/nautilus-first-time-druid.c:968
+#: src/nautilus-first-time-druid.c:972
 msgid ""
 "The fast search feature indexes all the items on your hard disk.\n"
 "It speeds up searching and allows you to search by file content\n"
@@ -9262,15 +9562,15 @@ msgstr ""
 # components/websearch/ntl-web-search.c:164
 # libnautilus-extensions/nautilus-global-preferences.c:276
 # src/nautilus-window-toolbars.c:144
-#: src/nautilus-first-time-druid.c:977
+#: src/nautilus-first-time-druid.c:981
 msgid "Enable fast search"
 msgstr "Habilitar búsqueda rápida"
 
-#: src/nautilus-first-time-druid.c:978
+#: src/nautilus-first-time-druid.c:982
 msgid "Turn fast search on when cron is enabled"
 msgstr "Activar la búsqueda rápida con cron esta habilitado"
 
-#: src/nautilus-first-time-druid.c:1024
+#: src/nautilus-first-time-druid.c:1027
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "currently can't be performed because the program crond, which does\n"
@@ -9289,7 +9589,7 @@ msgstr ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/crond start\n"
 
-#: src/nautilus-first-time-druid.c:1032
+#: src/nautilus-first-time-druid.c:1035
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "may not be performed because the program crond, which does nightly tasks\n"
@@ -9308,7 +9608,7 @@ msgstr ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/crond start\n"
 
-#: src/nautilus-first-time-druid.c:1119
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
 "Click Finish to launch Nautilus. You'll start with two\n"
 "Nautilus windows: one shows your home folder, and the\n"
@@ -9324,7 +9624,7 @@ msgstr ""
 "\n"
 "¡Esperamos que disfrute de Nautilus!"
 
-#: src/nautilus-first-time-druid.c:1126
+#: src/nautilus-first-time-druid.c:1129
 msgid ""
 "Click Finish to launch Nautilus. You'll start with a\n"
 "window showing your home folder.\n"
@@ -9336,16 +9636,16 @@ msgstr ""
 "\n"
 "¡Esperamos que disfrute de Nautilus!"
 
-#: src/nautilus-first-time-druid.c:1150
+#: src/nautilus-first-time-druid.c:1153
 msgid "Nautilus First Time Setup"
 msgstr "Primera Configuración de Nautilus"
 
 # src/nautilus-first-time-druid.c:286
-#: src/nautilus-first-time-druid.c:1180
+#: src/nautilus-first-time-druid.c:1183
 msgid "Welcome to Nautilus"
 msgstr "!Bienvenido a Nautilus!"
 
-#: src/nautilus-first-time-druid.c:1182
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
 "Nautilus...\n"
 "    Is a great file manager for the GNOME desktop.\n"
@@ -9366,18 +9666,18 @@ msgstr ""
 
 # src/nautilus-first-time-druid.c:290
 #. set up the final page
-#: src/nautilus-first-time-druid.c:1193
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "Aceptar"
 
 # src/nautilus-window-menus.c:1398
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1206
+#: src/nautilus-first-time-druid.c:1209
 msgid "Choose Your User Level"
 msgstr "Seleccione Su Nivel de Usuario"
 
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1210
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr "Transición de GMC a Nautilus"
 
@@ -9385,38 +9685,38 @@ msgstr "Transición de GMC a Nautilus"
 # libnautilus-extensions/nautilus-global-preferences.c:276
 # src/nautilus-window-toolbars.c:144
 #. set up the `Launch Medusa' page
-#: src/nautilus-first-time-druid.c:1214
+#: src/nautilus-first-time-druid.c:1217
 msgid "Fast Searches"
 msgstr "Búsquedas Rápidas"
 
 #. set up optional page to tell the user how to run cron
-#: src/nautilus-first-time-druid.c:1222
+#: src/nautilus-first-time-druid.c:1225
 msgid "The Cron Daemon"
 msgstr "El Proceso Cron"
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1227
+#: src/nautilus-first-time-druid.c:1230
 msgid "Checking Your Internet Connection"
 msgstr "Verificando su conexión a Internet"
 
 # src/nautilus-main.c:65
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1238
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "Actualizando Nautilus..."
 
 # components/help/hyperbola-filefmt.c:397
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1246
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "Configuración del Proxy WEB"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1321
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "Decodificando la Actualización..."
 
-#: src/nautilus-first-time-druid.c:1338
+#: src/nautilus-first-time-druid.c:1341
 msgid "Update Complete. Click Next to Continue."
 msgstr "Actualización Completa. Presione el botón Siguiente para Continuar."
 
@@ -9424,7 +9724,7 @@ msgstr "Actualización Completa. Presione el botón Siguiente para Continuar."
 #. * doesn't exist. Arlo and I (jsh) and decided that the
 #. * best thing to do is silently fail
 #.
-#: src/nautilus-first-time-druid.c:1353
+#: src/nautilus-first-time-druid.c:1356
 msgid "No Update Available... Press Next to Continue."
 msgstr "No hay Actualizaciones... Presione Siguiente para Continuar."
 
@@ -9458,54 +9758,54 @@ msgid "View in Multiple Windows?"
 msgstr "¿Ver en Ventanas Múltiples?"
 
 # src/nautilus-main.c:63
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr "Ejecutar unas rápidas pruebas de auto-chequeo."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "Crear la ventana inicial con la geometría indicada"
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "GEOMETRY"
 
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Solo crear ventanas para las URIs explícitamente especificadas."
 
 # src/nautilus-main.c:65
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "Cerrar Nautilus."
 
 # src/nautilus-main.c:65
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "Reiniciar Nautilus."
 
 # src/nautilus-main.c:117
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check no se puede usar con URIs.\n"
 
 # src/nautilus-main.c:117
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check no se puede usar con otras opciones.\n"
 
 # src/nautilus-main.c:117
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit no se puede usar con URIs.\n"
 
 # src/nautilus-main.c:117
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --reiniciar no se puede usar con URIs.\n"
 
 # src/nautilus-main.c:117
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --reiniciar no se puede usar con URIs.\n"
 
@@ -9656,8 +9956,8 @@ msgstr ""
 #: src/nautilus-property-browser.c:1335
 #, c-format
 msgid ""
-"Sorry, but \"%s\" is an existing keyword.  Please choose a different name for "
-"it."
+"Sorry, but \"%s\" is an existing keyword.  Please choose a different name "
+"for it."
 msgstr ""
 "Lo siento, pero \"%s\" es una palabra clave existente. Por favor escoja un "
 "nombre diferente."
@@ -9948,8 +10248,8 @@ msgstr ""
 "correctamente, o asume alguna responsabilidad por el uso de el. Por favor "
 "utilícelo bajo su propio riesgo.\n"
 "\n"
-"Por favor visite http://eazel.com/feedback.html para información, comentarios "
-"o sugerencias."
+"Por favor visite http://eazel.com/feedback.html para información, "
+"comentarios o sugerencias."
 
 #: src/Nautilus_shell.oaf.in.h:1
 msgid "Factory for Nautilus shell and file manager"
@@ -9999,8 +10299,7 @@ msgstr ""
 "desplegable para buscar resultados"
 
 #: src/Nautilus_shell.oaf.in.h:9
-msgid ""
-"Nautilus file manager component that shows a two-dimensional icon space"
+msgid "Nautilus file manager component that shows a two-dimensional icon space"
 msgstr ""
 "Componente del manejador de archivos Nautilus que muestra un espaciado de "
 "icono bi-dimensional"
@@ -10068,16 +10367,19 @@ msgid "View as List"
 msgstr "Ver como Lista"
 
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+#, fuzzy
+msgid " _Advanced"
 msgstr " Avanzado"
 
 #: src/nautilus-shell-ui.xml.h:2
-msgid " Beginner"
+#, fuzzy
+msgid " _Beginner"
 msgstr " Principiante"
 
 # src/nautilus-first-time-druid.c:185
 #: src/nautilus-shell-ui.xml.h:3
-msgid " Intermediate"
+#, fuzzy
+msgid " _Intermediate"
 msgstr " Intermedio"
 
 #: src/nautilus-shell-ui.xml.h:4
@@ -10117,23 +10419,19 @@ msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
 #: src/nautilus-shell-ui.xml.h:15
-msgid "Cut _Text"
-msgstr "Cortar _Texto"
-
-#: src/nautilus-shell-ui.xml.h:17
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr ""
 "Muestra una ventana que permite editar los marcadores que hay en este menú"
 
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr "Muestra los créditos de los creadores de Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr "Muestra la Ayuda en línea para Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
@@ -10142,154 +10440,140 @@ msgstr ""
 "apariencia"
 
 # libnautilus-extensions/nautilus-global-preferences.c:646
-#: src/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:19
 msgid "Display quick reference pages for Nautilus"
 msgstr "Muestra las páginas de referencia rápida para Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:22
+#: src/nautilus-shell-ui.xml.h:20
 msgid "Display release notes for Nautilus"
 msgstr "Muestra la notas de liberación de Nautilus"
 
 # src/nautilus-first-time-druid.c:230 src/nautilus-window-toolbars.c:161
-#: src/nautilus-shell-ui.xml.h:23
+#: src/nautilus-shell-ui.xml.h:21
 msgid "Display support information for Nautilus and Eazel Services"
 msgstr "Muestra la información de soporte para Nautilus y los Servicios Eazel"
 
-#: src/nautilus-shell-ui.xml.h:24
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Display the latest contents of the current location"
 msgstr "Muestra los últimos contenidos de la dirección actual"
 
-#: src/nautilus-shell-ui.xml.h:25
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr "Muestra el conjunto de temas de apariencia disponibles"
 
 # src/nautilus-first-time-druid.c:272
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:24
 msgid "Edit various Nautilus preferences"
 msgstr "Editar varias preferencias de Nautilus"
 
 # src/nautilus-first-time-druid.c:290
-#: src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "Buscar"
 
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr "_Borrar Historial"
 
 # src/nautilus-first-time-druid.c:230 src/nautilus-window-toolbars.c:161
-#: src/nautilus-shell-ui.xml.h:29
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr "Ir a Servicios Eazel"
 
 # src/nautilus-window-menus.c:670
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr "Ir a la dirección inicial"
 
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr "Ir a la dirección que contiene a la actual"
 
 # src/nautilus-window-menus.c:670
-#: src/nautilus-shell-ui.xml.h:32
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr "Ir a la siguiente dirección visitada"
 
 # src/nautilus-window-menus.c:670
-#: src/nautilus-shell-ui.xml.h:33
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr "Ir a la dirección visitada previamente"
 
 # libnautilus-extensions/nautilus-global-preferences.c:306
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:442
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
 msgid "Hide Location _Bar"
 msgstr "Ocultar Barra de _Dirección"
 
 # src/nautilus-window-menus.c:1292
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:424
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
 msgid "Hide St_atus Bar"
 msgstr "Ocultar Ba_rra de Estado"
 
 # src/nautilus-window-menus.c:1303
-#: src/nautilus-shell-ui.xml.h:36 src/nautilus-window-menus.c:430
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
 msgid "Hide _Sidebar"
 msgstr "Ocultar Barra _Lateral"
 
 # src/nautilus-window-menus.c:1269
-#: src/nautilus-shell-ui.xml.h:37 src/nautilus-window-menus.c:436
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
 msgid "Hide _Toolbar"
 msgstr "Ocultar Barra de _Herramientas"
 
 # src/nautilus-first-time-druid.c:272
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:37
 msgid "Nautilus Quick _Reference"
 msgstr "_Referencia Rápida de Nautilus"
 
 # src/nautilus-first-time-druid.c:272
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:38
 msgid "Nautilus Release _Notes"
 msgstr "_Notas de Liberación de Nautilus"
 
 # src/nautilus-shell.c:157
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:39
 msgid "Nautilus User _Manual"
 msgstr "_Manual del Usuario de Nautilus"
 
 # src/file-manager/fm-directory-view.c:2126
-#: src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "Ventana Nueva"
 
 # src/file-manager/fm-directory-view.c:2126
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:41
 msgid "New _Window"
 msgstr "_Ventana Nueva"
 
 # src/nautilus-window-menus.c:1314
-#: src/nautilus-shell-ui.xml.h:44
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "Tamaño normal"
 
-#: src/nautilus-shell-ui.xml.h:45
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Abrir otra ventana de Nautilus para la dirección mostrada"
 
-# src/nautilus-first-time-druid.c:272
-#: src/nautilus-shell-ui.xml.h:47
-msgid "Preferences..."
-msgstr "Preferencias..."
-
-#: src/nautilus-shell-ui.xml.h:48
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: src/nautilus-shell-ui.xml.h:49
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "Quitar el texto seleccionado sin colocarlo en el porta papeles"
-
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr "Preparación de Reporte"
 
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr "Reiniciar Perfiles"
 
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr "Buscar en la Web"
 
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr "Buscar archivos en esta computadora"
 
-# src/file-manager/fm-directory-view.c:2157 src/nautilus-window-menus.c:1153
-#: src/nautilus-shell-ui.xml.h:54
-msgid "Select _All"
-msgstr "_Seleccionar Todo"
-
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
@@ -10297,206 +10581,222 @@ msgstr ""
 "Muestra una página desde donde podrá enviar sus comentarios acerca de "
 "Nautilus y los servicios Eazel"
 
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "Muestra el contenido a tamaño normal"
 
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "Muestra los contenidos con menos detalles"
 
 # src/file-manager/fm-properties-window.c:864
-#: src/nautilus-shell-ui.xml.h:58
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "Muestra los contenidos con más detalle"
 
-#: src/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr "Iniciar Perfiles"
 
-#: src/nautilus-shell-ui.xml.h:61
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr "Parar Perfiles"
 
-#: src/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr "Cancelar la carga de esta dirección"
 
-#: src/nautilus-shell-ui.xml.h:63
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "Deshacer el último cambio de texto"
 
-#: src/nautilus-shell-ui.xml.h:64
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "Arriba"
 
-# libnautilus-extensions/nautilus-global-preferences.c:207
-#: src/nautilus-shell-ui.xml.h:65
-msgid "Use Advanced settings"
-msgstr "Usar configuraciones Avanzadas"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:66
-msgid "Use Beginner settings"
-msgstr "Usar configuraciones de Principiante"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
-# src/nautilus-first-time-druid.c:185
-#: src/nautilus-shell-ui.xml.h:67
-msgid "Use Intermediate settings"
-msgstr "Usar configuraciones Intermedias"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
 # components/websearch/ntl-web-search.c:164
 # libnautilus-extensions/nautilus-global-preferences.c:276
 # src/nautilus-window-toolbars.c:144
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:63
 msgid "We_b Search"
 msgstr "Búsqueda We_b"
 
 # components/websearch/ntl-web-search.c:164
 # libnautilus-extensions/nautilus-global-preferences.c:276
 # src/nautilus-window-toolbars.c:144
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "Búsqueda Web"
 
 # src/file-manager/fm-directory-view.c:2268
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "Agrandar"
 
 # src/file-manager/fm-directory-view.c:2270
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "Achicar"
 
 # src/file-manager/fm-directory-view.c:2268
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "Ag_randar"
 
 # src/file-manager/fm-directory-view.c:2270
-#: src/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "Ac_hicar"
 
 # src/nautilus-window-menus.c:1329
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "_Acerca de Nautilus..."
 
 # src/nautilus-window-menus.c:1235
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "_Agregar Marcador"
 
 # src/file-manager/fm-properties-window.c:1031
-#: src/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "_Atrás"
 
-#: src/nautilus-shell-ui.xml.h:77
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr "_Fondos y Marcas..."
 
 # src/nautilus-window-menus.c:1235
-#: src/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "_Marcadores"
 
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "Cerrar _Ventana"
 
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:76
 msgid "_Customer Support"
 msgstr "_Soporte de Usuarios"
 
 # libnautilus-extensions/nautilus-undo-signal-handlers.c:174
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "_Edición"
 
 # src/nautilus-bookmarks-window.c:136
-#: src/nautilus-shell-ui.xml.h:83
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "_Editar Marcadores"
 
-#: src/nautilus-shell-ui.xml.h:84
+# src/nautilus-first-time-druid.c:272
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "Preferencias..."
+
+#: src/nautilus-shell-ui.xml.h:80
 msgid "_Feedback"
 msgstr "_Comentarios"
 
 # src/nautilus-first-time-druid.c:290
-#: src/nautilus-shell-ui.xml.h:86 src/nautilus-window-menus.c:1352
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "_Buscar"
 
-#: src/nautilus-shell-ui.xml.h:87
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "_Adelante"
 
-#: src/nautilus-shell-ui.xml.h:88
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "_Ir a"
 
 # src/nautilus-window-menus.c:1325
-#: src/nautilus-shell-ui.xml.h:89
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: src/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "_Inicio"
 
+# src/nautilus-bookmarks-window.c:185
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "Dirección"
+
 # src/nautilus-window-manage-views.c:184
 # src/nautilus-window-manage-views.c:217
 # src/nautilus-window-manage-views.c:218 src/nautilus-window-menus.c:437
-#: src/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr "Temas de _Nautilus..."
 
 # src/nautilus-window-menus.c:1314
-#: src/nautilus-shell-ui.xml.h:92
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "_Tamaño normal"
 
-#: src/nautilus-shell-ui.xml.h:94
+# src/nautilus-first-time-druid.c:272
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "Preferencias"
+
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr "_Perfilador"
 
-#: src/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "_Actualizar"
 
-#: src/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr "_Reporte de Perfiles"
 
-#: src/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr "_Reiniciar Perfiles"
 
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr "_Iniciar Perfiles"
 
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr "_Detener Perfiles"
 
 # src/nautilus-first-time-druid.c:290
-#: src/nautilus-shell-ui.xml.h:100
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "_Deshacer"
 
-#: src/nautilus-shell-ui.xml.h:101
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "_Subir un Nivel"
 
 # libnautilus-extensions/nautilus-global-preferences.c:222
-#: src/nautilus-shell-ui.xml.h:102
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "_Ver"
 
-#: src/nautilus-sidebar.c:659
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -10504,11 +10804,11 @@ msgstr ""
 "¡No puede asignar más de un icono personalizado a la vez! Por favor arrastre "
 "sólo una imagen para usar como un icono personalizado."
 
-#: src/nautilus-sidebar.c:661
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "Más de una Imagen"
 
-#: src/nautilus-sidebar.c:680
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -10518,11 +10818,11 @@ msgstr ""
 "personalizados"
 
 # libnautilus-extensions/nautilus-global-preferences.c:587
-#: src/nautilus-sidebar.c:682
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "Sólo imágenes locales"
 
-#: src/nautilus-sidebar.c:687
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -10530,25 +10830,25 @@ msgstr ""
 "El archivo que a soltado no es una imagen. Sólo use imágenes locales como "
 "iconos personalizados."
 
-#: src/nautilus-sidebar.c:689
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "Sólo Imágenes"
 
 # src/nautilus-sidebar.c:1145
-#: src/nautilus-sidebar.c:1247
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "Abrir con %s"
 
 # src/nautilus-sidebar.c:1174
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1283
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "Abrir con..."
 
 # src/file-manager/fm-directory-view.c:2154
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1390
+#: src/nautilus-sidebar.c:1424
 msgid "  Empty Trash  "
 msgstr "  Vaciar Papelera"
 
@@ -10628,8 +10928,8 @@ msgstr "Agregar Tema Nuevo"
 
 #: src/nautilus-theme-selector.c:585
 msgid ""
-"Sorry, but you can't remove the current theme. Please change to another theme "
-"before removing this one."
+"Sorry, but you can't remove the current theme. Please change to another "
+"theme before removing this one."
 msgstr ""
 "Lo siento, pero no puede quitar el tema actual. Por favor cambie este por "
 "otro tema antes de quitar el actual."
@@ -10654,18 +10954,18 @@ msgid "No description available for the \"%s\" theme"
 msgstr "No hay descripción disponible para el tema %s"
 
 # src/nautilus-window.c:843
-#: src/nautilus-window.c:584
+#: src/nautilus-window.c:637
 msgid "View as ..."
 msgstr "Ver como..."
 
 # src/nautilus-window.c:843
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1286
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "Ver como Otro ..."
 
 # src/nautilus-window.c:1267
-#: src/nautilus-window.c:1687
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "Cerrar"
 
@@ -10679,11 +10979,11 @@ msgstr "Cerrar"
 msgid "Preview Release %s: %s"
 msgstr "Versión de Prueba %s: %s"
 
-#: src/nautilus-window-manage-views.c:812
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "Falló la Vista"
 
-#: src/nautilus-window-manage-views.c:823
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
@@ -10692,12 +10992,12 @@ msgstr ""
 "La vista %s ha encontrado un error y no puede continuar. Puede elegir otra "
 "vista o ir a una dirección diferente."
 
-#: src/nautilus-window-manage-views.c:834
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "La vista %s a encontrado un error mientras se inicializaba."
 
-#: src/nautilus-window-manage-views.c:993
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
@@ -10705,7 +11005,7 @@ msgstr ""
 "Una de las solapas de la barra lateral ha fallado y no puede continuar. "
 "Desafortunadamente no puedo informarle cual."
 
-#: src/nautilus-window-manage-views.c:997
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
@@ -10715,12 +11015,12 @@ msgstr ""
 "Si esto sigue sucediendo debería desactivar esta solapa."
 
 # libnautilus-extensions/nautilus-global-preferences.c:165
-#: src/nautilus-window-manage-views.c:1002
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "Solapa Lateral Fallada"
 
 # src/nautilus-window-manage-views.c:1241
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr ""
@@ -10728,7 +11028,7 @@ msgstr ""
 "de nuevo."
 
 # src/nautilus-window-manage-views.c:1247
-#: src/nautilus-window-manage-views.c:1223
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
@@ -10737,7 +11037,7 @@ msgstr ""
 "pruebe de nuevo."
 
 # src/nautilus-window-manage-views.c:1269
-#: src/nautilus-window-manage-views.c:1237
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -10747,34 +11047,34 @@ msgstr ""
 "archivo es."
 
 # src/nautilus-window-manage-views.c:1299
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr "Nautilus no ha instalado un visualizador capaz de mostrar \"%s\"."
 
 # src/nautilus-window-manage-views.c:1281
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1257
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
-"No se puedo mostrar \"%s\", porque Nautilus no puede manejar las direcciones: "
-"%s ."
+"No se puedo mostrar \"%s\", porque Nautilus no puede manejar las "
+"direcciones: %s ."
 
 # src/nautilus-window-manage-views.c:1287
-#: src/nautilus-window-manage-views.c:1263
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "No se puede mostrar \"%s\", por que falló el intento de registrarse."
 
 # src/nautilus-window-manage-views.c:1287
-#: src/nautilus-window-manage-views.c:1268
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "No se puede mostrar \"%s\", porque el acceso fue denegado."
 
 # src/nautilus-window-manage-views.c:1287
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1287
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
@@ -10785,7 +11085,7 @@ msgstr ""
 "Proxy sea correcta."
 
 # src/nautilus-window-manage-views.c:1287
-#: src/nautilus-window-manage-views.c:1287
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -10794,80 +11094,81 @@ msgstr ""
 "No se puede mostrar \"%s\" porque el nombre del host estaba vacío. Verifique "
 "que la configuración de su servidor Proxy este correcta."
 
-#: src/nautilus-window-manage-views.c:1299
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa search "
-"service, and if you don't have an index, that the Medusa indexer is running."
+"search service isn't running. Be sure that you have started the Medusa "
+"search service, and if you don't have an index, that the Medusa indexer is "
+"running."
 msgstr ""
 "Buscar no está disponible ahora, debido a que, ó no tiene un índice, o el "
 "servicio de búsqueda no esta ejecutándose. Asegúrese que ha inicializado el "
 "servicio Medusa de búsqueda, y si usted no tiene un índice, que el indexador "
 "Medusa este ejecutándose."
 
-#: src/nautilus-window-manage-views.c:1303
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "Búsqueda No Disponible"
 
 # src/nautilus-window-manage-views.c:1299
-#: src/nautilus-window-manage-views.c:1307
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus no puede visualizar \"%s\"."
 
 # libnautilus-extensions/nautilus-global-preferences.c:693
-#: src/nautilus-window-manage-views.c:1312
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "No se puede Mostrar la Dirección"
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:313
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
 msgstr ""
-"¿Esta seguro de que quiere borrar el historial?, si lo hace estará obligado a "
-"repetirlo."
+"¿Esta seguro de que quiere borrar el historial?, si lo hace estará obligado "
+"a repetirlo."
 
-#: src/nautilus-window-menus.c:316
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
 "¿Esta seguro de que quiere que Nautilus borre las direcciones que ha "
 "visitado?"
 
-#: src/nautilus-window-menus.c:321
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "¿Borrar Histórico?"
 
-#: src/nautilus-window-menus.c:322
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "Borrar"
 
 # src/nautilus-window-menus.c:1292
-#: src/nautilus-window-menus.c:425
+#: src/nautilus-window-menus.c:466
 msgid "Show St_atus Bar"
 msgstr "Mostrar Barra de _Estado"
 
 # src/nautilus-window-menus.c:1303
-#: src/nautilus-window-menus.c:431
+#: src/nautilus-window-menus.c:472
 msgid "Show _Sidebar"
 msgstr "Mostrar Barra _Lateral"
 
 # src/nautilus-window-menus.c:1269
-#: src/nautilus-window-menus.c:437
+#: src/nautilus-window-menus.c:478
 msgid "Show _Toolbar"
 msgstr "Mostrar Barra de _Herramientas"
 
 # src/nautilus-window-menus.c:1281
-#: src/nautilus-window-menus.c:443
+#: src/nautilus-window-menus.c:484
 msgid "Show Location _Bar"
 msgstr "Mostrar Barra de _Dirección"
 
 # src/nautilus-first-time-druid.c:272
-#: src/nautilus-window-menus.c:494
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -10877,11 +11178,11 @@ msgstr "Preferencias"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:571
+#: src/nautilus-window-menus.c:618
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
-#: src/nautilus-window-menus.c:573
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -10899,7 +11200,7 @@ msgstr ""
 #. * bottom of the about box to give credit
 #. * to the translator(s)
 #.
-#: src/nautilus-window-menus.c:582
+#: src/nautilus-window-menus.c:629
 msgid "Translator Credits"
 msgstr ""
 "Créditos del Traductor\n"
@@ -10908,40 +11209,36 @@ msgstr ""
 " <pablodc@bigfoot.com>"
 
 # src/nautilus-window-menus.c:584
-#: src/nautilus-window-menus.c:752
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
 "this location from your list?"
 msgstr ""
-"La dirección \"%s\" no existe. ¿Desea eliminar los marcadores de su lista que "
-"apuntan a esta dirección ?"
+"La dirección \"%s\" no existe. ¿Desea eliminar los marcadores de su lista "
+"que apuntan a esta dirección ?"
 
 # src/nautilus-window-menus.c:599
-#: src/nautilus-window-menus.c:756
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "Marcador para Dirección Inexistente"
 
 # src/nautilus-window-menus.c:602
-#: src/nautilus-window-menus.c:770
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "La dirección \"%s\" no existe más."
 
 # src/nautilus-window-menus.c:1198
-#: src/nautilus-window-menus.c:771
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "Ir a la Dirección Inexistente"
 
 # src/nautilus-window-menus.c:670
-#: src/nautilus-window-menus.c:840
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "Ir a la dirección especificada por este marcador"
 
-#: src/nautilus-window-menus.c:1351
-msgid "_Browse"
-msgstr "_Navegar"
-
 # src/file-manager/fm-properties-window.c:1031
 #: src/nautilus-window-toolbars.c:402
 msgid "Back"
@@ -10958,3 +11255,139 @@ msgstr "Adelante"
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 
+#~ msgid "helvetica"
+#~ msgstr "helvetica"
+
+# libnautilus-extensions/nautilus-global-preferences.c:216
+#~ msgid "_Fonts"
+#~ msgstr "_Fuentes"
+
+# src/file-manager/dfos-xfer.c:778
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "No puede mover un archivo sobre si mismo."
+
+#~ msgid "Can't Move Onto Self"
+#~ msgstr "No Puede Mover Sobre Si Mismo"
+
+# src/nautilus-window-menus.c:1314
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Bold"
+#~ msgstr "Negrita"
+
+#~ msgid "Book"
+#~ msgstr "Libro"
+
+#~ msgid "Demibold"
+#~ msgstr "Demibold"
+
+# libnautilus-extensions/nautilus-search-bar-criterion.c:71
+# libnautilus-extensions/nautilus-search-bar-criterion.c:86
+# libnautilus-extensions/nautilus-search-bar-criterion.c:141
+#~ msgid "Light"
+#~ msgstr "Liviano"
+
+# src/file-manager/fm-properties-window.c:1031
+#~ msgid "Italic"
+#~ msgstr "Itálica"
+
+#~ msgid "Oblique"
+#~ msgstr "Obliqua"
+
+#~ msgid "Reverse Italic"
+#~ msgstr "Itálica Invertida"
+
+#~ msgid "Reverse Oblique"
+#~ msgstr "Obliqua Inversa"
+
+# src/file-manager/fm-properties-window.c:878
+#~ msgid "Condensed"
+#~ msgstr "Condensada"
+
+#~ msgid "Semicondensed"
+#~ msgstr "SemiCondensada"
+
+# libnautilus-extensions/nautilus-global-preferences.c:216
+#~ msgid "Font"
+#~ msgstr "Fuente"
+
+#~ msgid "fixed"
+#~ msgstr "arreglado"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00 AM"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00 AM"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr "foo (25th copy).txt"
+
+# libnautilus-extensions/nautilus-global-preferences.c:674
+#~ msgid "current theme"
+#~ msgstr "tema actual"
+
+# libnautilus-extensions/nautilus-global-preferences.c:680
+#~ msgid "Use this font family to display file names:"
+#~ msgstr "Fuente para los nombres de archivo"
+
+# libnautilus-extensions/nautilus-global-preferences.c:756
+#~ msgid "Can add Content"
+#~ msgstr "Puede agregar Contenido"
+
+#~ msgid "No image was selected.  You must click on an image to select it."
+#~ msgstr ""
+#~ "No se ha seleccionado una imagen. Debe hacer clic sobre la imagen para "
+#~ "selccionarla."
+
+#~ msgid "No selection made"
+#~ msgstr "No se ha hecho ninguna selección"
+
+#~ msgid "Remember this password"
+#~ msgstr "Recordar esta contraseña"
+
+# components/music/nautilus-music-view.c:198
+#~ msgid "times"
+#~ msgstr "times"
+
+#~ msgid "courier"
+#~ msgstr "courier"
+
+# src/file-manager/dfos-xfer.c:724
+#~ msgid "lucida"
+#~ msgstr "lucida"
+
+# libnautilus-extensions/nautilus-stock-dialogs.c:409
+#~ msgid "Details"
+#~ msgstr "Detalles"
+
+#~ msgid "Warning"
+#~ msgstr "Cuidado"
+
+#~ msgid "Error"
+#~ msgstr "Error"
+
+# components/rpmview/nautilus-rpm-view.c:336
+#~ msgid "Question"
+#~ msgstr "Pregunta"
+
+#~ msgid "_Cut Text"
+#~ msgstr "_Cortar Texto"
+
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "Quitar el texto seleccionado sin colocarlo en el porta papeles"
+
+# libnautilus-extensions/nautilus-global-preferences.c:207
+#~ msgid "Use Advanced settings"
+#~ msgstr "Usar configuraciones Avanzadas"
+
+#~ msgid "Use Beginner settings"
+#~ msgstr "Usar configuraciones de Principiante"
+
+# src/nautilus-first-time-druid.c:185
+#~ msgid "Use Intermediate settings"
+#~ msgstr "Usar configuraciones Intermedias"
+
+#~ msgid "_Browse"
+#~ msgstr "_Navegar"
diff --git a/po/fi.po b/po/fi.po
index 26ae6feb2..ac767180a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -17,10 +17,15 @@
 #
 # pattern = glob = ??
 #
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2001-02-26 23:21+0200\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-01-11 20:44+02:00\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@saunalahti.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -36,6 +41,31 @@ msgstr "Ei voi luoda nautilus-launcher-appletia!"
 msgid "Can't create nautilus-preferences-applet!"
 msgstr "Ei voi luoda nautilus-preferences-appletia!"
 
+#: applets/preferences-applet/nautilus-preferences-applet.c:226
+#, fuzzy
+msgid "Show Desktop"
+msgstr "Työpöytä"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:230
+#, fuzzy
+msgid "Smooth Graphics"
+msgstr "Pehmeämmät grafiikat"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:243
+#: src/nautilus-application.c:639
+msgid "Quit"
+msgstr "Lopeta"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:251
+#, fuzzy
+msgid "Start"
+msgstr "Tila"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:259
+#, fuzzy
+msgid "Restart"
+msgstr "Yritä uudelleen"
+
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:1
 msgid "Factory for Nautilus component adapter factories"
 msgstr "Tehdas, joka tuottaa Nautiluksen komponenttisovitintehtaita"
@@ -92,6 +122,18 @@ msgstr "%lu Gt"
 msgid "Hardware Overview"
 msgstr "Laitteisto"
 
+#: components/hardware/nautilus-hardware-view.c:520
+msgid "This is a placeholder for the CPU page."
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:545
+msgid "This is a placeholder for the RAM page."
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:570
+msgid "This is a placeholder for the IDE page."
+msgstr ""
+
 #: components/hardware/Nautilus_View_hardware.oaf.in.h:2
 #: components/hardware/nautilus-hardware-view.c:631
 #: data/static_bookmarks.xml.h:16
@@ -118,18 +160,18 @@ msgstr "Näytä laitteisto"
 msgid "hardware view"
 msgstr "laitteistonäkymä"
 
-#: components/help/converters/gnome-db2html2/gdb3html.c:710
+#: components/help/converters/gnome-db2html2/gdb3html.c:712
 #: components/music/nautilus-music-view.c:1512
 msgid "Previous"
 msgstr "Edellinen"
 
-#: components/help/converters/gnome-db2html2/gdb3html.c:719
-#: libnautilus-extensions/nautilus-global-preferences.c:684
-#: src/nautilus-shell-ui.xml.h:38
+#: components/help/converters/gnome-db2html2/gdb3html.c:721
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "Koti"
 
-#: components/help/converters/gnome-db2html2/gdb3html.c:728
+#: components/help/converters/gnome-db2html2/gdb3html.c:730
 #: components/music/nautilus-music-view.c:1568
 msgid "Next"
 msgstr "Seuraava"
@@ -257,64 +299,75 @@ msgstr "LIITE"
 #. GNU Public  License  and  many  people  are
 #. working on changes to the kernel)
 #. **
-#: components/help/hyperbola-filefmt.c:503
-#: components/help/hyperbola-filefmt.c:505
-#: components/help/hyperbola-filefmt.c:509
-#: components/help/hyperbola-filefmt.c:511
-#: components/help/hyperbola-filefmt.c:515
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:537
+#: components/help/hyperbola-filefmt.c:538
+#: components/help/hyperbola-filefmt.c:539
+#: components/help/hyperbola-filefmt.c:541
+#: components/help/hyperbola-filefmt.c:543
 msgid "Manual"
 msgstr "Manuaalisivut"
 
-#: components/help/hyperbola-filefmt.c:505
-msgid "System"
-msgstr "Järjestelmä"
-
-#: components/help/hyperbola-filefmt.c:505
-msgid "Configuration"
-msgstr "Asetukset"
-
-#: components/help/hyperbola-filefmt.c:505
-msgid "Config files"
-msgstr "Asetustiedostot"
-
-#: components/help/hyperbola-filefmt.c:509
-#: components/help/hyperbola-filefmt.c:833 data/linksets/apps.xml.h:1
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:861 data/linksets/apps.xml.h:1
 msgid "Applications"
 msgstr "Sovellukset"
 
-#: components/help/hyperbola-filefmt.c:509
-msgid "Command Line"
-msgstr "Komentorivi"
-
-#: components/help/hyperbola-filefmt.c:511
-#: components/help/hyperbola-filefmt.c:515
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:543
 msgid "Development"
 msgstr "Ohjelmointi"
 
-#: components/help/hyperbola-filefmt.c:511
-#: components/help/hyperbola-filefmt.c:515
-msgid "APIs"
-msgstr "Ohjelmointirajapinnat"
-
-#: components/help/hyperbola-filefmt.c:511
-msgid "Miscellaneous"
-msgstr "Sekalaista"
-
-#: components/help/hyperbola-filefmt.c:515
+#: components/help/hyperbola-filefmt.c:532
 msgid "System Calls"
 msgstr "Järjestelmäkutsut"
 
-#: components/help/hyperbola-filefmt.c:675
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
+#: components/help/hyperbola-filefmt.c:534
+msgid "Library Functions"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:536
+#, fuzzy
+msgid "Devices"
+msgstr "Palvelut"
+
+#: components/help/hyperbola-filefmt.c:537
+#, fuzzy
+msgid "Configuration Files"
+msgstr "Asetukset"
+
+#: components/help/hyperbola-filefmt.c:538
+#, fuzzy
+msgid "Games"
+msgstr "Peli"
+
+#: components/help/hyperbola-filefmt.c:539
+#, fuzzy
+msgid "Conventions"
+msgstr "Sisältö:"
+
+#: components/help/hyperbola-filefmt.c:541
+msgid "System Administration"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:543
+msgid "Kernel Routines"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:703
 msgid "Info"
 msgstr "Info-sivut"
 
-#: components/help/hyperbola-nav-tree.c:277
+#: components/help/hyperbola-nav-tree.c:310
 msgid "Introductory Documents:"
 msgstr "Johdantoasiakirjat:"
 
-#: components/help/hyperbola-nav-tree.c:291
+#: components/help/hyperbola-nav-tree.c:324
 msgid "Documents by Subject:"
 msgstr "Asiakirjat aiheen mukaan:"
 
@@ -387,7 +440,7 @@ msgstr "Historiikkisivupaneeli"
 msgid "History sidebar panel for Nautilus"
 msgstr "Nautiluksen historiikkisivupaneeli"
 
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "Bonoboa ei voitu alustaa"
 
@@ -445,7 +498,7 @@ msgstr "Sulje hukkasisältönäkymä"
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "_Tiedosto"
 
@@ -529,7 +582,7 @@ msgid "Sidebar Loser"
 msgstr "Hukkasivu"
 
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -539,7 +592,7 @@ msgstr ""
 "  %s"
 
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -695,21 +748,22 @@ msgid "Cyrillic (ISO-IR-111)"
 msgstr "Kyrillinen (ISO-IR-111)"
 
 #: components/mozilla/nautilus-mozilla-encoding-tables.c:78
-msgid "Cyrillic (KOI8-R)"
-msgstr "Kyrillinen (KOI8-R)"
-
-#: components/mozilla/nautilus-mozilla-encoding-tables.c:79
 msgid "Cyrillic (MacCyrillic)"
 msgstr "Kyrillinen (MacCyrillic)"
 
-#: components/mozilla/nautilus-mozilla-encoding-tables.c:80
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:79
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kyrillinen (Windows-1251)"
 
-#: components/mozilla/nautilus-mozilla-encoding-tables.c:81
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:80
 msgid "Cyrillic/Russian (IBM-866)"
 msgstr "Kyrillinen/venäläinen (IBM-866)"
 
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:81
+#, fuzzy
+msgid "Cyrillic/Russian (KOI8-R)"
+msgstr "Kyrillinen/venäläinen (IBM-866)"
+
 #: components/mozilla/nautilus-mozilla-encoding-tables.c:82
 msgid "Cyrillic/Ukrainian (KOI8-U)"
 msgstr "Kyrillinen/ukrainalainen (KOI8-U)"
@@ -886,19 +940,22 @@ msgstr "x-imap4-modified-utf7"
 msgid "x-u-escaped"
 msgstr "x-u-escaped"
 
-#: components/mozilla/nautilus-mozilla-content-view.c:842
+#: components/mozilla/nautilus-mozilla-content-view.c:809
+#, fuzzy
 msgid ""
-"A Javascript function (small software program) on this page tried to open a "
+"A JavaScript function (small software program) on this page tried to open a "
 "new window, but nautilus does not support the opening of new windows by "
-"Javascript.\n"
+"JavaScript.\n"
 "\n"
 "Try viewing the page in a different web browser, such as Mozilla or Netscape."
 msgstr ""
-"Javascript-funktio (pieni ohjelma) tällä sivulla yritti avata uuden ikkunan, mutta Nautilus ei tue tätä ominaisuutta, joten se ei onnistunut.\n"
+"Javascript-funktio (pieni ohjelma) tällä sivulla yritti avata uuden ikkunan, "
+"mutta Nautilus ei tue tätä ominaisuutta, joten se ei onnistunut.\n"
 "\n"
-"Yritä katsoa tätä sivua toisella WWW-selaimella, kuten Mozillalla tai Netscapella."
+"Yritä katsoa tätä sivua toisella WWW-selaimella, kuten Mozillalla tai "
+"Netscapella."
 
-#: components/mozilla/nautilus-mozilla-content-view.c:843
+#: components/mozilla/nautilus-mozilla-content-view.c:810
 msgid "Nautilus Mozilla View Warning"
 msgstr "Nautiluksen Mozilla-näkymän varoitus"
 
@@ -1576,7 +1633,7 @@ msgid "Sorry, but '%s' is not a usable image file."
 msgstr "'%s' ei ole kelvollinen kuvatiedosto."
 
 #: components/music/nautilus-music-view.c:696
-#: src/nautilus-property-browser.c:1055 src/nautilus-property-browser.c:1307
+#: src/nautilus-property-browser.c:1060 src/nautilus-property-browser.c:1312
 msgid "Not an Image"
 msgstr "Ei ole kuva"
 
@@ -1622,10 +1679,10 @@ msgid "Pause"
 msgstr "Keskeytä"
 
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:945
-#: libnautilus-extensions/nautilus-file-operations.c:960
 #: libnautilus-extensions/nautilus-file-operations.c:979
-#: src/nautilus-shell-ui.xml.h:58
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Pysäytä"
 
@@ -1687,194 +1744,6 @@ msgstr "Muistiinpanosivupaneeli"
 msgid "Notes sidebar panel for Nautilus"
 msgstr "Nautiluksen muistiinpanosivupaneeli"
 
-#. set up the window title
-#: components/rpmview/nautilus-rpm-verify-window.c:183
-#, c-format
-msgid "Verifying %s..."
-msgstr "Tarkistaa %s..."
-
-#: components/rpmview/nautilus-rpm-verify-window.c:207
-#, c-format
-msgid "Failed on \"%s\""
-msgstr "Virhe tiedoston \"%s\" kohdalla"
-
-#. TRANSLATORS: this is printed while verifying files from packages,
-#. %s is the filename, %d/%d is filenumber of total-number-of-files
-#: components/rpmview/nautilus-rpm-verify-window.c:211
-#, c-format
-msgid "Checking \"%s\" (%ld/%ld)"
-msgstr "\"%s\" (%ld/%ld) tarkistuu"
-
-#: components/rpmview/nautilus-rpm-view.c:122
-msgid "Package Contents"
-msgstr "Paketin sisältö"
-
-#. allocate the name field
-#: components/rpmview/nautilus-rpm-view.c:169
-msgid "Package Title"
-msgstr "Paketin nimi"
-
-#: components/rpmview/nautilus-rpm-view.c:190
-msgid "Installed Size: "
-msgstr "Asennettu koko: "
-
-#: components/rpmview/nautilus-rpm-view.c:196
-msgid "<size>"
-msgstr "<koko>"
-
-#: components/rpmview/nautilus-rpm-view.c:202
-msgid "Install Date: "
-msgstr "Asennuspäivämäärä: "
-
-#: components/rpmview/nautilus-rpm-view.c:208
-#: components/rpmview/nautilus-rpm-view.c:220
-#: components/rpmview/nautilus-rpm-view.c:232
-#: components/rpmview/nautilus-rpm-view.c:244
-#: components/rpmview/nautilus-rpm-view.c:256
-msgid "<unknown>"
-msgstr "<tuntematon>"
-
-#: components/rpmview/nautilus-rpm-view.c:214
-msgid "License: "
-msgstr "Lisenssi: "
-
-#: components/rpmview/nautilus-rpm-view.c:226
-msgid "Build Date: "
-msgstr "Tekopäivämäärä: "
-
-#: components/rpmview/nautilus-rpm-view.c:238
-msgid "Distribution: "
-msgstr "Jakelu: "
-
-#: components/rpmview/nautilus-rpm-view.c:250
-msgid "Vendor: "
-msgstr "Toimittaja: "
-
-#: components/rpmview/nautilus-rpm-view.c:283
-#: components/services/install-view/Nautilus_View_install.oaf.in.h:1
-#: components/services/install/server/Trilobite_Service_install.oaf.in.h:2
-#: components/services/summary/nautilus-summary-view.c:122
-msgid "Install"
-msgstr "Asenna"
-
-#: components/rpmview/nautilus-rpm-view.c:299
-msgid "Update"
-msgstr "Päivitä"
-
-#: components/rpmview/nautilus-rpm-view.c:308
-msgid "Uninstall"
-msgstr "Poista asennus"
-
-#: components/rpmview/nautilus-rpm-view.c:324
-msgid "Verify"
-msgstr "Tarkista"
-
-#: components/rpmview/nautilus-rpm-view.c:375
-msgid "Description"
-msgstr "Kuvaus"
-
-#: components/rpmview/nautilus-rpm-view.c:570
-#, c-format
-msgid "Package Contents: %d files"
-msgstr "Paketin sisältö: %d tiedostoa"
-
-#: components/rpmview/nautilus-rpm-view.c:576
-#, c-format
-msgid "Package \"%s\" "
-msgstr "Paketti \"%s\""
-
-#: components/rpmview/nautilus-rpm-view.c:762
-msgid "Verification completed, package ok."
-msgstr "Tarkistus valmis, paketti on kunnossa."
-
-#: components/rpmview/nautilus-rpm-view-install.c:119
-#, c-format
-msgid "%s would not work anymore\n"
-msgstr "%s ei toiminut enää\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:122
-#, c-format
-msgid "%s would break other installed packages\n"
-msgstr "%s rikkoisi muita asennettuja paketteja\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:127
-#, c-format
-msgid "%s is needed, but could not be found\n"
-msgstr "%s tarvitaan, mutta sitä ei löytynyt\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:132
-#, c-format
-msgid "%s was already installed\n"
-msgstr "Paketti %s on jo asennettu\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:135
-#, c-format
-msgid "%s causes a circular dependency problem\n"
-msgstr "%s aiheuttaa kehäriippuvuusongelman\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:140
-msgid "Cannot access the local package system\n"
-msgstr "Ei voi käyttää paikallista pakettijärjestelmää\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:156
-#, c-format
-msgid "Installing %s failed because of the following issue(s):\n"
-msgstr "Paketin %s asennus epäonnistui seuraavista syistä:\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:158
-#, c-format
-msgid "Uninstalling %s failed because of the following issue(s):\n"
-msgstr "Paketin %s asennuksen poisto epäonnistui seuraavista syistä:\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:278
-msgid "Uninstall failed..."
-msgstr "Asennuksen poistaminen epäonnistui..."
-
-#: components/rpmview/nautilus-rpm-view-install.c:279
-msgid "Uninstall Failed"
-msgstr "Asennuksen poistaminen epäonnistui"
-
-#: components/rpmview/nautilus-rpm-view-install.c:281
-msgid "Install failed..."
-msgstr "Asennus epäonnistui..."
-
-#: components/rpmview/nautilus-rpm-view-install.c:282
-msgid "Install Failed"
-msgstr "Asennus epäonnistui"
-
-#: components/rpmview/nautilus-rpm-view-install.c:342
-#: components/services/install-view/nautilus-service-install-view.c:514
-msgid "Incorrect password."
-msgstr "Väärä salasana."
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:1
-msgid "Factory for rpm view"
-msgstr "Tehdas, joka tuottaa RPM-näkymiä"
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:2
-msgid "Package"
-msgstr "Paketti"
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:3
-msgid "Package Viewer"
-msgstr "Pakettikatselin"
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:4
-msgid "RPM component"
-msgstr "RPM-komponentti"
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:5
-msgid "RPM view factory"
-msgstr "RPM-näkymätehdas"
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:6
-msgid "View as Package"
-msgstr "Näytä pakettina"
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:7
-msgid "rpm view"
-msgstr "RPM-näkymä"
-
 #: components/sample/nautilus-sample-content-view.c:136
 msgid "(none)"
 msgstr "(ei mikään)"
@@ -1955,7 +1824,7 @@ msgstr "Valitse etsintä-cgi"
 #: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
 #: components/services/install/command-line/eazel-test-packsys.c:590
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "Näytä vianetsintätuloste"
 
@@ -1980,240 +1849,254 @@ msgid "RPM args are filename"
 msgstr "RPM-parametrit ovat tiedostojen nimiä"
 
 #: components/services/install/command-line/eazel-alt-install-corba.c:115
-msgid "Force install"
-msgstr "Asenna väkisin"
-
-#: components/services/install/command-line/eazel-alt-install-corba.c:116
 msgid "Use ftp"
 msgstr "Käytä ftp-protokollaa"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:117
+#: components/services/install/command-line/eazel-alt-install-corba.c:116
 msgid "Use local"
 msgstr "Asenna paikalliselta"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:118
+#: components/services/install/command-line/eazel-alt-install-corba.c:117
 msgid "Use http"
 msgstr "Käytä http-protokollaa"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:119
+#: components/services/install/command-line/eazel-alt-install-corba.c:118
 msgid "RPM args are Eazel Ids"
 msgstr "RPM-parametrit ovat Eazel-Id:itä"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:120
+#: components/services/install/command-line/eazel-alt-install-corba.c:119
 msgid "machine readable output"
 msgstr "koneen luettava tuloste"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:121
+#: components/services/install/command-line/eazel-alt-install-corba.c:120
 msgid "Don't print fancy percent output"
 msgstr "Älä näytä prosentteja hienosti"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:122
+#: components/services/install/command-line/eazel-alt-install-corba.c:121
 msgid "don't use eazel auth stuff"
 msgstr "älä käytä Eazelin todentamistavaraa"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:123
+#: components/services/install/command-line/eazel-alt-install-corba.c:122
 msgid "Specify package file"
 msgstr "Valitse pakettitiedosto"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:124
+#: components/services/install/command-line/eazel-alt-install-corba.c:123
 msgid "RPM args are needed files"
 msgstr "RPM-parametrit ovat tarvittavia tiedostoja"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:125
+#: components/services/install/command-line/eazel-alt-install-corba.c:124
 msgid "Run Query"
 msgstr "Tee kysely"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:126
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
 msgid "Revert"
 msgstr "Palauta"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:127
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr "Aseta juurihakemisto"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:128
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "Valitse palvelin"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:129
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
 msgid "Dont print too much, just problems and download"
 msgstr "Älä tulosta liian paljoa, vaan vain ongelmat ja tiedostohaut"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:130
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr "Suorita ssl-uudelleen nimeäminen"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:131
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
 msgid "argument is a suite id"
 msgstr "parametri ei ole sarjan id"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "Koekäyttö"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr "Salli käyttäjätunnus"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:134
-#: components/services/install/lib/eazel-install-problem.c:1009
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "Salli päivitykset"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "Näytä lisätietoja"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:136
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
 msgid "Install a specific package version"
 msgstr "Asenna tietty paketin versio"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:167
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
 msgid "*** You cannot specify more then one protocol type.\n"
 msgstr "*** Voit antaa vain yhden protokollatyypin.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:184
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
 msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
 msgstr "*** Poista ja palauta?  Joku asetti meille pommin!\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:293
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, c-format
 msgid "File conflict checking %s...\n"
 msgstr "Tarkistaa tiedostoristiriitoja paketista %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:307
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, c-format
 msgid "File uniqueness checking %s...\n"
 msgstr "Tarkistaa tiedostojen ainoutta paketista %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:321
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
 #, c-format
 msgid "Feature consistency checking %s...\n"
 msgstr "Tarkistaa ominaisuusyhtenäisyyttä paketista %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:352
-#: components/services/install/lib/eazel-install-protocols.c:110
-#: components/services/install/lib/eazel-install-protocols.c:248
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
 #, c-format
 msgid "Downloading %s..."
 msgstr "Haen %s..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:368
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
 msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
 msgstr "Hakee paketin %s... (%d/%d) = %d%% %.1f kt/s"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:376
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
 msgid "Downloading %s... (%d/%d) = %d%%"
 msgstr "Hakee paketin %s... (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:384
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
 #, c-format
 msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
 msgstr "Hakee paketin %s... (%d/%d) %.1f kt/s valmis\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:389
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
 #, c-format
 msgid "Downloading %s... %3.1f KB/s Done\n"
 msgstr "Hakee paketin %s... %3.1f kt/s valmis\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:417
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "Asentaa pakettia %s (%d/%d), (%d/%d)t - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:425
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "Poistaa paketin %s asennusta (%d/%d), (%d/%d)t - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:447
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "Asentaa pakettia %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% valmis\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:454
-msgid "Unnstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
+#, fuzzy
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "Poistaa paketin %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% valmis\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:462
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
 msgid "Done\n"
 msgstr "Valmis\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:482
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
 #, c-format
 msgid "Download of %s FAILED\n"
 msgstr "Paketin %s haku EPÄONNISTUI\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:602
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
 #, c-format
 msgid "Package %s failed to uninstall.\n"
 msgstr "Paketin %s asennuksen poisto epäonnistui.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:604
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
 #, c-format
 msgid "Package %s failed to install.\n"
 msgstr "Paketin %s asennus epäonnistui.\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:625
-#: components/services/install/command-line/eazel-alt-install-corba.c:627
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
 #, c-format
 msgid "\t· Problem : %s\n"
 msgstr "\t· Ongelma : %s\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:636
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
 #, c-format
 msgid "\t· Action : %s\n"
 msgstr "\t· Toiminto : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:679
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
 msgid "Cancelling operation\n"
 msgstr "Peruu toimintoa\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:690
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
 #, c-format
 msgid "About to install a total of %d packages, %dKB\n"
 msgstr "Valmiina asentamaan yhteensä %d pakettia eli %dkt\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:694
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
 #, c-format
 msgid "About to uninstall a total of %d packages, %dKB\n"
 msgstr "Valmiina poistamaan yhteensä %d:n paketin asennuksen eli %dkt\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:698
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
 #, c-format
 msgid "About to revert a total of %d packages, %d KB\n"
 msgstr "Valmiina palauttamaan yhteensä %d pakettia eli %d kt\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:713
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
 #, c-format
 msgid "\t· %s and it's dependencies\n"
 msgstr "\t· %s ja sen riippuvuudet\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:716
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
 #, c-format
 msgid "\t· %s\n"
 msgstr "\t· %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:738
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n) " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
+msgid "Save transaction report ? (y/n) "
+msgstr ""
+
+#. I18N note: y is the letter for the word Yes. This is
+#. used in the response for a yes/no questions. Your translation
+#. must be 1 character only.
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
+msgid "y"
+msgstr "k"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
 #, c-format
 msgid "Dependency : %s needs %s\n"
 msgstr "Riippuvuus : paketti %s tarvitsee %s\n"
 
 #. I18N note: %s is a package name
-#: components/services/install/command-line/eazel-alt-install-corba.c:756
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
 #, c-format
 msgid "Package %s failed md5 check!\n"
 msgstr "Paketin %s failed md5 check!\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:758
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
 #, c-format
 msgid "\t· server MD5 checksum is %s\n"
 msgstr "\t· palvelimen MD5-tarkistussumma on %s\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:760
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
 #, c-format
 msgid "\t· actual MD5 checksum is %s\n"
 msgstr "\t· todellinen MD5-tarkistussumma on %s\n"
@@ -2223,100 +2106,92 @@ msgstr "\t· todellinen MD5-tarkistussumma on %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:826
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
 msgid "Continue? (y/n) "
 msgstr "Jatketaanko? (k/e) "
 
-#. I18N note: y is the letter for the word Yes. This is
-#. used in the response for a yes/no questions. Your translation
-#. must be 1 character only.
-#: components/services/install/command-line/eazel-alt-install-corba.c:837
-#: components/services/install/command-line/eazel-alt-install-corba.c:879
-msgid "y"
-msgstr "k"
-
 #. I18N note: the (y/n) is translateable. There is later a 1 character
 #. string with the context "y" which is the "yes" indicator.
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:867
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
 msgid "Should I delete the RPM files? (y/n) "
 msgstr "Poistanko RPM-tiedostot? (k/e) "
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:899
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
 msgid "Operation ok\n"
 msgstr "Toiminto onnistui\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:901
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
 msgid "Operation failed\n"
 msgstr "Toiminto epäonnistui\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
 msgid "Installing"
 msgstr "Asentaa"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1027
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
 msgid "Uninstalling"
 msgstr "Poistaa asennusta"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1042
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
 msgid "Only one operation at a time please."
 msgstr "Vain yksi toiminto kerrallaan."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1047
-#: components/services/install/command-line/eazel-alt-install-corba.c:1055
-#: components/services/install/command-line/eazel-alt-install-corba.c:1099
-#: components/services/install/command-line/eazel-alt-install-corba.c:1106
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
 #, c-format
 msgid "%s: --help for usage\n"
 msgstr "%s: --help käyttöohje\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1071
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
 #, c-format
 msgid "Name         : %s\n"
 msgstr "Nimi         : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1072
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
 #, c-format
 msgid "Version      : %s\n"
 msgstr "Versio       : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1073
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
 #, c-format
 msgid "Minor        : %s\n"
 msgstr "Vähäinen     : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1075
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
 #, c-format
 msgid "Size         : %d\n"
 msgstr "Koko         : %d\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1076
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
 #, c-format
 msgid "Arch         : %s\n"
 msgstr "Laitteisto   : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1077
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
 #, c-format
 msgid "Distribution : %s\n"
 msgstr "Jakelu       : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1078
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
 #, c-format
 msgid "Description  : %s\n"
 msgstr "Kuvaus       : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1080
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
 #, c-format
 msgid "Install root : %s\n"
 msgstr "Asennusjuuri : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1083
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
 msgid "Provides     : \n"
 msgstr "Tarjoaa      : \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1125
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
 #, c-format
 msgid "exit code %d\n"
 msgstr "lopetuskoodi %d\n"
@@ -2332,67 +2207,73 @@ msgstr ""
 "Käytä annettua tiedostoa pakettiluettelon luomiseen, vaatii valitsimen "
 "--packagelist"
 
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 msgid "Softcat server to connect to"
 msgstr "Softcat-palvelin, johon yhdistetään"
 
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr "Käytä vaihtoehtoista CGI-polkua"
 
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr "Ota yhteys softcat-käyttäjänä ammoniten avulla"
 
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 msgid "Number of times to try the request"
 msgstr "Pyynnön toistokerrat"
 
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr "Viive pyyntöjen välillä mikrosekunteina"
 
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr "Etsi Eazel-paketin tunnisteen mukaan"
 
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+#, fuzzy
+msgid "Lookup package that features a feature/file"
 msgstr "Etsi paketti, joka tarjoaa ominaisuuden tai tiedoston"
 
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr "Etsi paketti, joka on tiettyä versiota"
 
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr "(--version -valitsimen kanssa) Käytä >= vertailua"
 
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 msgid "use check function (for debugging)"
 msgstr "käytä tarkistusfunktiota (virheenetsintään)"
 
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 msgid "Show detailed sub-package info"
 msgstr "Näytä tarkat alipaketin tiedot"
 
-#: components/services/install/lib/eazel-install-logic2.c:140
+#: components/services/install/command-line/eazel-test-softcat.c:66
+#, fuzzy
+msgid "enable funk parser"
+msgstr "Käytä nopeaa etsintää"
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "Haettavan tiedoston lukitseminen epäonnistui"
 
-#: components/services/install/lib/eazel-install-logic2.c:157
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "MD5-summa ei sovi: pakettia %s voi olla käpälöity"
 
-#: components/services/install/lib/eazel-install-logic2.c:173
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, c-format
 msgid "No MD5 available for %s"
 msgstr "Ei MD5-summaa paketille %s"
 
 #. I18N note: "%is is ok" in the sense that %s=package name and the
 #. package is intact
-#: components/services/install/lib/eazel-install-logic2.c:357
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, c-format
 msgid "%s is ok"
 msgstr "Paketti %s on kunnossa"
@@ -2433,21 +2314,22 @@ msgstr "%s asentaa version %s-%s"
 msgid "%s installs version %s"
 msgstr "%s asentaa version %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:624
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, c-format
 msgid "Loading package info from file %s"
 msgstr "Hakee paketin tietoja tiedostosta %s..."
 
 #. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
-#: components/services/install/lib/eazel-install-logic2.c:992
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "ok"
 msgstr "kunnossa"
 
-#: components/services/install/lib/eazel-install-logic2.c:992
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "not ok"
 msgstr "ei kunnossa"
 
-#: components/services/install/lib/eazel-install-logic2.c:1156
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
 msgid "Checking dependencies for %s"
 msgstr "Tarkastaa paketin %s riippuvuuksia"
@@ -2455,48 +2337,53 @@ msgstr "Tarkastaa paketin %s riippuvuuksia"
 #. I18N note: both %s' are package names.
 #. related is in the sense that the two packages apparently
 #. are connected somehow, eg. foo and foo-devel
-#: components/services/install/lib/eazel-install-logic2.c:1715
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, c-format
 msgid "%s is related to %s"
 msgstr "Paketti %s liittyy pakettiin %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:1769
+#: components/services/install/lib/eazel-install-logic2.c:2090
 #, c-format
 msgid "updating %s to version %s-%s solves conflict"
 msgstr "Paketin %s päivittäminen versioksi %s-%s ratkaisee ristiriidan"
 
-#: components/services/install/lib/eazel-install-logic2.c:1786
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
 msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr ""
 "mahdollinen paketin %s päivitys versioksi (%s-%s) ei ratkaise ristiriitaa"
 
-#: components/services/install/lib/eazel-install-logic2.c:1793
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, c-format
 msgid "could not revive %s"
 msgstr "ei voinut palauttaa pakettia %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:1929
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
 msgid "file uniqueness checking %s"
 msgstr "tarkistaa tiedostojen ainoutta paketista %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:1950
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
 msgid "Duplicate file : %s occurs in %s and %s"
 msgstr "Moninkertainen tiedosto: %s on sekä paketissa %s että %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:1968
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
+msgid "... but it's ok, the packages are related"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2324
 #, c-format
 msgid "(there were %d other conflicts)"
 msgstr "(muita ristiriitoja oli %d)"
 
-#: components/services/install/lib/eazel-install-logic2.c:2063
+#: components/services/install/lib/eazel-install-logic2.c:2419
 #, c-format
 msgid "file conflict checking %s"
 msgstr "tarkistaa tiedostoristiriitoja paketista %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2111
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
 msgid "file conflict : package %s already provides file %s also provided by %s"
 msgstr ""
@@ -2504,17 +2391,17 @@ msgstr ""
 
 #. the owner of this file is a package that we're upgrading, and the
 #. * new version no longer has this file, so everything's okay.
-#: components/services/install/lib/eazel-install-logic2.c:2121
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
 msgid "...but it is okay, we're upgrading %s and it ditched that file"
 msgstr "...mutta se ei haittaa, sillä paketti %s päivittyy ja tiedosto poistuu"
 
-#: components/services/install/lib/eazel-install-logic2.c:2211
+#: components/services/install/lib/eazel-install-logic2.c:2558
 #, c-format
 msgid "checking feature consistency of %s"
 msgstr "tarkistaa ominaisuusyhtenäisyyttä paketista %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2277
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
 msgid ""
 "feature missing : %s breaks if %s is installed (feature %s would be lost"
@@ -2522,168 +2409,168 @@ msgstr ""
 "puuttuva ominaisuus : %s rikkoutuu, jos %s on asennettu (ominaisuus %s "
 "häviäisi"
 
-#: components/services/install/lib/eazel-install-logic2.c:2355
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, c-format
 msgid "downloading %d packages"
 msgstr "hakee %d pakettia"
 
-#: components/services/install/lib/eazel-install-logic2.c:2620
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, c-format
 msgid "will upgrade %s"
 msgstr "päivittää paketin %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2623
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, c-format
 msgid "will downgrade %s"
 msgstr "vaihtaa vanhemmaksi paketin %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2626
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, c-format
 msgid "will install %s"
 msgstr "asentaa paketin %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2629
+#: components/services/install/lib/eazel-install-logic2.c:2960
 #, c-format
 msgid "will uninstall %s"
 msgstr "poistaa paketin %s asennuksen"
 
-#: components/services/install/lib/eazel-install-logic2.c:2712
-#: components/services/install/lib/eazel-install-problem.c:335
-#: components/services/install/lib/eazel-install-problem.c:338
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
 #, c-format
 msgid "%s requires %s"
 msgstr "Paketti %s vaatii paketin %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2876
+#: components/services/install/lib/eazel-install-logic2.c:3238
 #, c-format
 msgid "failed %s"
 msgstr "paketti %s epäonnistui"
 
-#: components/services/install/lib/eazel-install-metadata.c:171
+#: components/services/install/lib/eazel-install-metadata.c:174
 msgid "Could not set URLType from config file!"
 msgstr "URLTypeä ei voitu asettaa asetustiedostosta!"
 
-#: components/services/install/lib/eazel-install-object.c:701
+#: components/services/install/lib/eazel-install-object.c:717
 msgid "Transactions are not stored, could not find home dir"
 msgstr "Tapahtumia ei ole tallennettu: kotihakemistoa ei löytynyt"
 
-#: components/services/install/lib/eazel-install-object.c:729
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr "Tapahtumat on tallennettu hakemistoon %s"
 
-#: components/services/install/lib/eazel-install-object.c:986
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "Haen pakettiluettelon etäpalvelimelta ...\n"
 
-#: components/services/install/lib/eazel-install-object.c:1002
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "Tiedoston package-list.xml hakeminen epäonnistui!\n"
 
-#: components/services/install/lib/eazel-install-object.c:1075
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr "Tiedostoon %s ei voi kirjoittaa, käytetään oletuslokikäsittelijää"
 
-#: components/services/install/lib/eazel-install-object.c:1206
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "Asennus epäonnistui"
 
-#: components/services/install/lib/eazel-install-object.c:1252
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "Asennuksen poistaminen epäonnistui"
 
-#: components/services/install/lib/eazel-install-object.c:1373
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "Tapahtumahakemistoa (%s) ei voitu luoda! ***\n"
 
-#: components/services/install/lib/eazel-install-object.c:1396
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr "Kirjoittaa tapahtuman tiedostoon %s"
 
-#: components/services/install/lib/eazel-install-problem.c:159
+#: components/services/install/lib/eazel-install-problem.c:163
 #, c-format
 msgid "%s was cancelled"
 msgstr "%s peruttiin"
 
-#: components/services/install/lib/eazel-install-problem.c:164
-#: components/services/install/lib/eazel-install-problem.c:327
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
 msgid "%s is a source package, which is not yet supported"
 msgstr "%s on lähdekoodipaketti, joita ei vielä tueta"
 
-#: components/services/install/lib/eazel-install-problem.c:178
-#: components/services/install/lib/eazel-install-problem.c:189
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
 #, c-format
 msgid "%s would break other packages"
 msgstr "%s rikkoisi muita paketteja"
 
-#: components/services/install/lib/eazel-install-problem.c:181
+#: components/services/install/lib/eazel-install-problem.c:185
 #, c-format
 msgid "%s would break"
 msgstr "%s särkisi"
 
-#: components/services/install/lib/eazel-install-problem.c:187
+#: components/services/install/lib/eazel-install-problem.c:191
 #, c-format
 msgid "%s would break %s"
 msgstr "%s särkisi paketin %s"
 
-#: components/services/install/lib/eazel-install-problem.c:193
+#: components/services/install/lib/eazel-install-problem.c:197
 #, c-format
 msgid "%s is damaged"
 msgstr "%s on vahingoittunut"
 
-#: components/services/install/lib/eazel-install-problem.c:197
+#: components/services/install/lib/eazel-install-problem.c:201
 #, c-format
 msgid "%s requires %s, which could not be found on the server"
 msgstr "%s tarvitsee paketin %s, jota ei löytynyt palvelimelta"
 
-#: components/services/install/lib/eazel-install-problem.c:200
-#, c-format
-msgid "%s could not be found on the server"
+#: components/services/install/lib/eazel-install-problem.c:204
+#, fuzzy, c-format
+msgid "%s for %s could not be found on the server"
 msgstr "Pakettia %s ei löytynyt palvelimelta"
 
-#: components/services/install/lib/eazel-install-problem.c:208
-#: components/services/install/lib/eazel-install-problem.c:352
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr "Paketti %s on jo asennettu"
 
-#: components/services/install/lib/eazel-install-problem.c:252
+#: components/services/install/lib/eazel-install-problem.c:259
 #, c-format
 msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr ""
 "%s, joka on uudempi, vaatii vanhempaan versioon vaihtoa, mikä ei ole käytössä"
 
-#: components/services/install/lib/eazel-install-problem.c:256
+#: components/services/install/lib/eazel-install-problem.c:263
 #, c-format
 msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr "%s, joka on vanhempi, vaatii päivitystä, mikä ei ole käytössä"
 
-#: components/services/install/lib/eazel-install-problem.c:346
-#, c-format
-msgid "%s is not installed"
-msgstr "%s ei ole asennettu"
+#: components/services/install/lib/eazel-install-problem.c:353
+#, fuzzy, c-format
+msgid "%s is not installed and could not be found on server"
+msgstr "Pakettia %s ei löytynyt palvelimelta"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:911
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr "Tarkista, onko paketista %s uudempaa versiota"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:922
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr "Asenna paketit %s ja %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:937
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr "Poista paketti %s järjestelmästäsi"
@@ -2691,273 +2578,541 @@ msgstr "Poista paketti %s järjestelmästäsi"
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:950
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr "Poista paketti %s väkisin järjestelmästäsi"
 
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:958
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr "Pakettitietokanta oli epäyhtenäinen"
 
-#: components/services/install/lib/eazel-install-problem.c:1006
+#: components/services/install/lib/eazel-install-problem.c:1015
 msgid "Continue with force"
 msgstr "Jatka väkisin"
 
-#: components/services/install/lib/eazel-install-problem.c:1012
+#: components/services/install/lib/eazel-install-problem.c:1021
 msgid "Allow downgrade"
 msgstr "Salli vaihto vanhemmaksi"
 
-#: components/services/install/lib/eazel-install-protocols.c:123
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:166
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
 #, c-format
 msgid "Could not open target file %s"
 msgstr "Kohdetiedostoa %s ei voitu avata"
 
-#: components/services/install/lib/eazel-install-protocols.c:130
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:92
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
 msgid "Could not create an http request !"
 msgstr "http-pyyntöä ei voitu luoda!"
 
-#: components/services/install/lib/eazel-install-protocols.c:137
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:99
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
 msgid "Proxy: Invalid uri !"
 msgstr "Välityspalvelin: Virheellinen URI!"
 
-#: components/services/install/lib/eazel-install-protocols.c:142
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:105
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
 msgid "Invalid uri !"
 msgstr "Virheellinen URI!"
 
-#: components/services/install/lib/eazel-install-protocols.c:149
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:115
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
 msgid "Could not prepare http request !"
 msgstr "http-pyyntöä ei voitu valmistella!"
 
-#: components/services/install/lib/eazel-install-protocols.c:154
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:120
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
 msgid "Couldn't get async mode "
 msgstr "Asynkronista tilaa ei saatu "
 
 #. probably out of disk space
-#: components/services/install/lib/eazel-install-protocols.c:183
-#: components/services/install/lib/eazel-install-protocols.c:212
-#: components/services/install/lib/eazel-install-protocols.c:228
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, c-format
 msgid "DISK FULL: could not write %s"
 msgstr "LEVY TÄYNNÄ: ei voitu kirjoittaa tiedostoa %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:189
-#: components/services/install/lib/eazel-install-protocols.c:217
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
 msgid "Could not get request body!"
 msgstr "Pyynnön runkoa ei saatu!"
 
-#: components/services/install/lib/eazel-install-protocols.c:202
+#: components/services/install/lib/eazel-install-protocols.c:208
 #, c-format
 msgid "HTTP error: %d %s"
 msgstr "HTTP-virhe: %d %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:249
+#: components/services/install/lib/eazel-install-protocols.c:255
 msgid "FTP not supported yet"
 msgstr "FTP-siirtoja ei vielä tueta"
 
-#: components/services/install/lib/eazel-install-protocols.c:457
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, c-format
 msgid "Checking local file %s..."
 msgstr "Tarkistaa paikallista tiedostoa %s..."
 
-#: components/services/install/lib/eazel-install-protocols.c:578
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, c-format
 msgid "Failed to retrieve %s!"
 msgstr "Tiedoston %s hakeminen epäonnistui!"
 
-#: components/services/install/lib/eazel-install-protocols.c:651
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, c-format
 msgid "Could not get an URL for %s"
 msgstr "Paketille %s ei voitu hakea URL:a"
 
-#: components/services/install/lib/eazel-install-protocols.c:666
+#: components/services/install/lib/eazel-install-protocols.c:672
 msgid "Downloaded package does not have the correct name"
 msgstr "Haetun paketin nimi ei ole oikea"
 
-#: components/services/install/lib/eazel-install-protocols.c:667
+#: components/services/install/lib/eazel-install-protocols.c:673
 #, c-format
 msgid "Package %s should have had name %s"
 msgstr "Paketin %s olisi pitänyt olla nimeltään %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:695
+#: components/services/install/lib/eazel-install-protocols.c:701
 msgid "File download failed"
 msgstr "Tiedoston hakeminen epäonnistui"
 
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr "*** Pakettilistauksen alku ***\n"
 
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr "*** Pakettilistauksen loppu ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:158
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 msgid "*** No package nodes! (cat has no children) ***"
 msgstr "*** Ei pakettisolmuja! (cat:lla ei ole lapsia) ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:160
-#: components/services/install/lib/eazel-install-xml-package-list.c:168
-#: components/services/install/lib/eazel-install-xml-package-list.c:183
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 msgid "*** Bailing from package parse! ***"
 msgstr "*** Paketin tulkitseminen epäonnistui! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:166
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
 msgid "*** No package nodes! ***"
 msgstr "*** Ei pakettisolmuja! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:172
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 msgid "*** Malformed package node!"
 msgstr "*** Viallinen pakettisolmu!"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:181
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
 msgid "*** No depends nodes! ***"
 msgstr "*** Ei riippuvuussolmuja! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:187
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr "*** Viallinen riippuvuussolmu!"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:211
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr "*** Tuntematon solmutyyppi '%s'"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:228
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** Pakettiluettelotiedosto ei sisällä tietoja! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:233
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** \"CATEGORIES\" -XML-solmua ei löydy! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:234
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr "*** Kategorioiden tulkitseminen epäonnistui! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:240
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** Ei kategorioita! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:241
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr "*** Kategorian tulkitseminen epäonnistui! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:295
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** XML-solmua TRANSACTION ei löydy! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:297
-#: components/services/install/lib/eazel-install-xml-package-list.c:305
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr "*** Tapahtumien tulkinta epäonnistui! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:303
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** Ei paketteja! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:339
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** Ei kategoriasolmuja! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:343
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** XML-solmua CATEGORIES ei löydy! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:377
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** Tuntematon solmu %s"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:467
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** Virhe XML-pakettilistaa luodessa! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:514
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** Virhe pakettilistaa lukiessa! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:909
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** osd xml ei sisällä tietoa! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:914
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr "*** osd:n tulkitseminen epäonnistui! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:976
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "XML:ää (pituus %d) ei voitu tulkita"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:755
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr "Pakettitietokanta hakemistossa %s avattu"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:760
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr "Hakemiston %s pakettitietokannan avaaminen epäonnistui"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:793
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr "Sulkee avaimen %s (auki) tietokannan"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:798
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr "Sulkee avaimen %s (ei auki) tietokannan"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1099
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr "Tiedostoa %s ei voi avata"
 
-#: components/services/install-view/nautilus-service-install-view.c:418
+#. this stuff flies by so fast, it's probably enough to just say "info"
+#: components/services/install-view/callbacks.c:64
+#, fuzzy
+msgid "Getting package information ..."
+msgstr "Haen pakettiluettelon etäpalvelimelta ...\n"
+
+#: components/services/install-view/callbacks.c:82
+#, fuzzy, c-format
+msgid "Checking \"%s\" for conflicts..."
+msgstr "Tarkistaa lupaa..."
+
+#: components/services/install-view/callbacks.c:185
+#, fuzzy, c-format
+msgid "Downloading 1 package (%s)"
+msgstr "hakee %d pakettia"
+
+#: components/services/install-view/callbacks.c:187
+#, fuzzy, c-format
+msgid "Downloading %d packages (%s)"
+msgstr "hakee %d pakettia"
+
+#: components/services/install-view/callbacks.c:236
+#, fuzzy, c-format
+msgid "Downloading \"%s\""
+msgstr "Haen %s..."
+
+#: components/services/install-view/callbacks.c:242
+#, fuzzy, c-format
+msgid "0K of %dK"
+msgstr "%ld / %ld"
+
+#: components/services/install-view/callbacks.c:249
 #, c-format
-msgid " · %s is in the GNOME footprint menu under %s"
-msgstr " · %s on Gnomen jalanjälkivalikossa %s alla."
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"Downloading \"%s\" now."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:252
+#, c-format
+msgid "Attempting to download package \"%s\"."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:262
+#: components/services/install-view/callbacks.c:333
+#, fuzzy
+msgid "Complete"
+msgstr "Tietokone"
+
+#: components/services/install-view/callbacks.c:266
+#, c-format
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" has been successfully downloaded."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:269
+#, c-format
+msgid "The package \"%s\" has been successfully downloaded."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:287
+#, fuzzy, c-format
+msgid "%dK of %dK"
+msgstr "%ld / %ld"
+
+#: components/services/install-view/callbacks.c:316
+#, fuzzy, c-format
+msgid "Download of package \"%s\" failed!"
+msgstr "hakee %d pakettia"
+
+#: components/services/install-view/callbacks.c:338
+#, c-format
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" has been successfully downloaded and installed."
+msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:436
+#: components/services/install-view/callbacks.c:341
 #, c-format
-msgid " · %s is in the Gnome menu.\n"
-msgstr " . %s on Gnomen valikossa.\n"
+msgid "\"%s\" has been successfully downloaded and installed."
+msgstr ""
+
+#. starting a new package -- create new progress indicator
+#: components/services/install-view/callbacks.c:369
+#, fuzzy, c-format
+msgid "Installing package %d of %d"
+msgstr "Asentaa paketteja"
+
+#: components/services/install-view/callbacks.c:396
+#, c-format
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" is now being installed."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:399
+#, fuzzy, c-format
+msgid "Now installing package \"%s\"."
+msgstr "Asentaa paketteja"
 
-#: components/services/install-view/nautilus-service-install-view.c:463
+#: components/services/install-view/callbacks.c:407
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
-msgid " · %s is in the KDE menu.\n"
+msgid "Installing \"%s\""
+msgstr "Asentaa \"%s\""
+
+#: components/services/install-view/callbacks.c:415
+#: src/nautilus-zoom-control.c:592
+msgid "%d%%"
+msgstr "%d%%"
+
+#: components/services/install-view/callbacks.c:443
+#, fuzzy, c-format
+msgid "Installation failed on %s"
+msgstr "Asennus epäonnistui"
+
+#: components/services/install-view/callbacks.c:471
+msgid "I ran into problems while installing."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:472
+msgid "I'd like to try the following :"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:481
+#, fuzzy
+msgid "Is this ok ?"
+msgstr "Paketti %s on kunnossa"
+
+#: components/services/install-view/callbacks.c:556
+#, fuzzy
+msgid "Installation cancelled."
+msgstr "Asennus epäonnistui..."
+
+#: components/services/install-view/callbacks.c:558
+#, fuzzy
+msgid "This package has already been installed."
+msgstr "Paketti %s on jo asennettu\n"
+
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
+#, fuzzy
+msgid "Installation complete."
+msgstr "Hakee jonkin paketin"
+
+#: components/services/install-view/callbacks.c:564
+#, fuzzy
+msgid "Installation failed."
+msgstr "Asennus epäonnistui"
+
+#. some succeeded; some failed
+#: components/services/install-view/callbacks.c:568
+msgid "Some packages installed successfully:"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:577
+#, fuzzy
+msgid ""
+"\n"
+"Some packages failed:"
+msgstr "Valitse pakettitiedosto"
+
+#: components/services/install-view/callbacks.c:626
+msgid "Erase the RPM files?"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:628
+msgid "Erase the leftover RPM files?"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:658
+msgid "Ok"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:673
+msgid ""
+"A core package of Nautilus has been\n"
+"updated.  You should restart Nautilus.\n"
+"\n"
+"Do you wish to do that now?"
+msgstr ""
+
+#. Setup the title
+#: components/services/install-view/forms.c:201
+#, fuzzy
+msgid "Easy Install"
+msgstr "Näytä asennuksena"
+
+#. Setup the progress header
+#. FIXME: the middle header is all fubar now, so we just say "messages", but the spec
+#. * shows "progress" over the 2nd column of the message box.  it's just too hard to get
+#. * it aligned currently.
+#.
+#: components/services/install-view/forms.c:327
+msgid "Messages"
+msgstr ""
+
+#: components/services/install-view/forms.c:358
+#: components/services/summary/nautilus-summary-view.c:647
+#, c-format
+msgid "Version: %s"
+msgstr "Versio: %s"
+
+#: components/services/install-view/forms.c:407
+msgid "These packages are ready to be downloaded and installed:"
+msgstr ""
+
+#: components/services/install-view/forms.c:408
+msgid "If you wish to download and install these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:411
+#, fuzzy
+msgid "These packages are ready to be uninstalled:"
+msgstr "Paketin %s asennuksen poisto epäonnistui.\n"
+
+#: components/services/install-view/forms.c:412
+msgid "If you wish to uninstall these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:415
+msgid "These packages are ready to be reverted:"
+msgstr ""
+
+#: components/services/install-view/forms.c:416
+msgid "If you wish to revert these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:464
+#, c-format
+msgid "for a total of %ld MB."
+msgstr ""
+
+#: components/services/install-view/forms.c:466
+#, c-format
+msgid "for a total of %ld KB."
+msgstr ""
+
+#. buttons
+#: components/services/install-view/forms.c:478
+#, fuzzy
+msgid "Continue"
+msgstr "Jatketaanko? (k/e) "
+
+#: components/services/install-view/forms.c:482
+#: libnautilus-extensions/nautilus-drag.c:493
+#: src/file-manager/fm-directory-view.c:4326
+msgid "Cancel"
+msgstr "Peru"
+
+#: components/services/install-view/nautilus-service-install-view.c:421
+#, fuzzy, c-format
+msgid "%s is in GNOME (footprint) > %s"
+msgstr " · %s on Gnomen jalanjälkivalikossa %s alla."
+
+#: components/services/install-view/nautilus-service-install-view.c:439
+#, fuzzy, c-format
+msgid "%s is in the GNOME (footprint) menu.\n"
+msgstr " · %s on Gnomen jalanjälkivalikossa %s alla."
+
+#: components/services/install-view/nautilus-service-install-view.c:454
+#, fuzzy, c-format
+msgid "%s is in the KDE menu.\n"
 msgstr " . %s on KDE:n valikossa.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:519
+#: components/services/install-view/nautilus-service-install-view.c:655
+#, fuzzy
+msgid "Installation Complete"
+msgstr "Hakee jonkin paketin"
+
+#: components/services/install-view/nautilus-service-install-view.c:710
+#, c-format
+msgid ""
+"%sTo start %s, click the Launch button below, or to create a shortcut, drag "
+"the icon on the right to the GNOME panel or your desktop."
+msgstr ""
+
+#. couldn't find an icon
+#: components/services/install-view/nautilus-service-install-view.c:718
+#, c-format
+msgid "%sTo start %s, click the Launch button below."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:773
+msgid "Incorrect password."
+msgstr "Väärä salasana."
+
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr "Todenna pääkäyttäjänä"
 
-#: components/services/install-view/nautilus-service-install-view.c:636
+#: components/services/install-view/nautilus-service-install-view.c:895
 msgid "Installing packages"
 msgstr "Asentaa paketteja"
 
-#: components/services/install-view/nautilus-service-install-view.c:638
+#: components/services/install-view/nautilus-service-install-view.c:897
 msgid "Installing remote package"
 msgstr "Hakee paketteja etäältä"
 
-#: components/services/install-view/nautilus-service-install-view.c:640
-#, c-format
-msgid "Installing \"%s\""
-msgstr "Asentaa \"%s\""
-
-#: components/services/install-view/nautilus-service-install-view.c:642
+#: components/services/install-view/nautilus-service-install-view.c:901
 msgid "Installing some package"
 msgstr "Hakee jonkin paketin"
 
-#: components/services/install-view/nautilus-service-install-view.c:659
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
@@ -2965,26 +3120,32 @@ msgstr ""
 "Eazel-asennuspalvelu puuttuu, joten\n"
 "asentaminen ei toimi."
 
-#: components/services/install-view/nautilus-service-install-view.c:706
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr "Yhteys Eazel-ohjelmaluetteloon muodostuu..."
 
-#: components/services/install-view/nautilus-service-install-view.c:764
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr "Tarkistaa lupaa..."
 
-#: components/services/install-view/nautilus-service-install-view.c:836
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr "Peruu pakettien hakua (odota)..."
 
-#: components/services/install-view/nautilus-service-install-view.c:856
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "Paketin hakeminen keskeytettiin."
 
-#: components/services/install-view/nautilus-service-install-view.c:857
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "Keskeytetty"
 
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:1
+#: components/services/install/server/Trilobite_Service_install.oaf.in.h:2
+#: components/services/summary/nautilus-summary-view.c:123
+msgid "Install"
+msgstr "Asenna"
+
 #: components/services/install-view/Nautilus_View_install.oaf.in.h:2
 msgid "Install Viewer"
 msgstr "Asennuskatselin"
@@ -3253,85 +3414,84 @@ msgid "Services Login"
 msgstr "Palveluihin kirjautuminen"
 
 #: components/services/summary/nautilus-summary-dialogs.c:131
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "Käyttäjätunnus:"
 
 #: components/services/summary/nautilus-summary-dialogs.c:138
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "Salasana:"
 
 #: components/services/summary/nautilus-summary-dialogs.c:146
 #: components/services/summary/nautilus-summary-dialogs.c:155
-msgid "Please log in to Eazel services"
+#, fuzzy
+msgid "Please log in to Eazel Services"
 msgstr "Ole hyvä, ja kirjaudu Eazel-palveluihin"
 
 #: components/services/summary/nautilus-summary-dialogs.c:150
 msgid "Your user name or password were not correct.  Please try again."
 msgstr "Tunnuksesi tai salasanasi ei ollut oikein. Yritä uudelleen."
 
-#: components/services/summary/nautilus-summary-view.c:116
-#: libnautilus-extensions/nautilus-program-chooser.c:1337
+#: components/services/summary/nautilus-summary-view.c:117
+#: libnautilus-extensions/nautilus-program-chooser.c:1361
 msgid "Go There"
 msgstr "Siirry sinne"
 
-#: components/services/summary/nautilus-summary-view.c:119
+#: components/services/summary/nautilus-summary-view.c:120
 msgid "More Info"
 msgstr "Lisätietoja"
 
-#: components/services/summary/nautilus-summary-view.c:130
+#: components/services/summary/nautilus-summary-view.c:131
 msgid "Account Preferences"
 msgstr "Tunnuksen asetukset"
 
-#: components/services/summary/nautilus-summary-view.c:131
+#: components/services/summary/nautilus-summary-view.c:132
 msgid "Logout"
 msgstr "Kirjaudu ulos"
 
-#: components/services/summary/nautilus-summary-view.c:132
-#: components/services/summary/nautilus-summary-view.c:140
+#: components/services/summary/nautilus-summary-view.c:133
+#: components/services/summary/nautilus-summary-view.c:141
 msgid "Terms of Use"
 msgstr "Käyttöehdot"
 
-#: components/services/summary/nautilus-summary-view.c:133
-#: components/services/summary/nautilus-summary-view.c:141
+#: components/services/summary/nautilus-summary-view.c:134
+#: components/services/summary/nautilus-summary-view.c:142
 msgid "Privacy Statement"
 msgstr "Yksityisyyden suoja"
 
-#: components/services/summary/nautilus-summary-view.c:138
+#: components/services/summary/nautilus-summary-view.c:139
 msgid "Register"
 msgstr "Rekisteröidy"
 
-#: components/services/summary/nautilus-summary-view.c:139
+#: components/services/summary/nautilus-summary-view.c:140
 msgid "Login"
 msgstr "Sisään kirjautuminen"
 
-#: components/services/summary/nautilus-summary-view.c:169
-#, c-format
-msgid "Welcome, %s!"
-msgstr "Tervetuloa, %s!"
+#: components/services/summary/nautilus-summary-view.c:170
+#, fuzzy, c-format
+msgid "Eazel Services - Welcome, %s!"
+msgstr "_Eazel-palvelut"
 
-#: components/services/summary/nautilus-summary-view.c:174
-msgid "You are not logged in"
+#: components/services/summary/nautilus-summary-view.c:175
+#, fuzzy
+msgid "Eazel Services - You are not logged in"
 msgstr "Et ole kirjautunut sisään"
 
-#: components/services/summary/nautilus-summary-view.c:181
+#: components/services/summary/nautilus-summary-view.c:182
 msgid "Connecting to Eazel Services..."
 msgstr "Yhdistää Eazel-palveluihin..."
 
-#: components/services/summary/nautilus-summary-view.c:643
-#, c-format
-msgid "Version: %s"
-msgstr "Versio: %s"
-
-#: components/services/summary/nautilus-summary-view.c:737
+#: components/services/summary/nautilus-summary-view.c:741
 #: data/linksets/home.xml.h:3 src/nautilus-service-ui.xml.h:4
 msgid "Services"
 msgstr "Palvelut"
 
-#: components/services/summary/nautilus-summary-view.c:748
+#: components/services/summary/nautilus-summary-view.c:752
 msgid "Featured Downloads"
 msgstr "Mahdolliset haut"
 
-#: components/services/summary/nautilus-summary-view.c:875
+#: components/services/summary/nautilus-summary-view.c:884
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
 "unavailable right now, or your computer might be configured incorrectly. "
@@ -3341,7 +3501,7 @@ msgstr ""
 "tavoittamattomissa, tai tietokoneesi asetukset ovat väärin. Ota yhteyttä "
 "(englanniksi) osoitteeseen support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:885
+#: components/services/summary/nautilus-summary-view.c:894
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3349,7 +3509,7 @@ msgstr ""
 "Eazelin palvelimien tiedoista löytyi virhe. Ota yhteys sähköpostitse "
 "(englanniksi) osoitteeseen support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:908
+#: components/services/summary/nautilus-summary-view.c:917
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
 "contact support@eazel.com."
@@ -3357,7 +3517,7 @@ msgstr ""
 "Tietoja puuttuu Eazel-palvelimien uudelleenohjausdatasta. Ota yhteys "
 "sähköpostitse (englanniksi) osoitteeseen support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:950
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
 "now, or your computer might be configured incorrectly. You could try again "
@@ -3367,7 +3527,7 @@ msgstr ""
 "tavoittamattomissa, tai tietokoneesi asetukset ovat väärin. Voinet yrittää "
 "myöhemmin uudelleen."
 
-#: components/services/summary/nautilus-summary-view.c:960
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3375,12 +3535,12 @@ msgstr ""
 "Eazelin palvelimien uudelleenohjaustiedoista löytyi virhe. Ota yhteys "
 "sähköpostitse (englanniksi) osoitteeseen support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:977
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr "Järjestelmän sisällysluettelon lähetys epäonnistui."
 
-#: components/services/summary/nautilus-summary-view.c:1040
-#: src/nautilus-first-time-druid.c:250
+#: components/services/summary/nautilus-summary-view.c:1049
+#: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr "Eazel-palvelut"
 
@@ -3444,16 +3604,16 @@ msgstr "Tiivistelmäkatselin"
 msgid "View as Summary"
 msgstr "Näytä tiivistelmänä"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:130
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
 #, c-format
 msgid "HTTP error %d \"%s\" on uri %s"
 msgstr "HTTP-virhe: %d \"%s\" uri:ssa %s"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:200
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 msgid "Could not initialize Bonobo"
 msgstr "Bonoboa ei voitu käynnistää"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:215
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr "Lokitiedostoa %s ei voi kirjoittaa -- käytetään oletuslokikäsittelijää"
@@ -3490,49 +3650,69 @@ msgstr "eazelin esimerkkipalvelunäkymä"
 msgid "Factory for the sample service"
 msgstr "Tehdas, joka tuottaa esimerkkipalvelua"
 
-#: components/text/nautilus-text-view.c:329
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr ""
 "Valitettavasti tiedosto %s on liian suuri Nautiluksen kokonaan ladattavaksi."
 
-#: components/text/nautilus-text-view.c:330
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr "Tiedosto on liian suuri"
 
 #: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "Kirjasimet"
+
+#: components/text/nautilus-text-view-ui.xml.h:2
 msgid "Lucida"
 msgstr "Lucida"
 
-#: components/text/nautilus-text-view-ui.xml.h:2
+#: components/text/nautilus-text-view-ui.xml.h:3
 msgid "Use the Courier Font"
 msgstr "Käytä courier-kirjasinta"
 
-#: components/text/nautilus-text-view-ui.xml.h:3
+#: components/text/nautilus-text-view-ui.xml.h:4
+#, fuzzy
+msgid "Use the Fixed Font"
+msgstr "Käytä times-kirjasinta"
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+#, fuzzy
+msgid "Use the GTK System Font"
+msgstr "Käytä times-kirjasinta"
+
+#: components/text/nautilus-text-view-ui.xml.h:6
 msgid "Use the Helvetica Font"
 msgstr "Käytä helvetica-kirjasinta"
 
-#: components/text/nautilus-text-view-ui.xml.h:4
+#: components/text/nautilus-text-view-ui.xml.h:7
 msgid "Use the Lucida Font"
 msgstr "Käytä lucida-kirjasinta"
 
-#: components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:8
 msgid "Use the Times Font"
 msgstr "Käytä times-kirjasinta"
 
-#: components/text/nautilus-text-view-ui.xml.h:6
+#: components/text/nautilus-text-view-ui.xml.h:9
 msgid "_Courier"
 msgstr "_Courier"
 
-#: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
-msgstr "_Kirjasimet"
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "_Tiedosto"
 
-#: components/text/nautilus-text-view-ui.xml.h:8
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
 msgid "_Helvetica"
 msgstr "_Helvetica"
 
-#: components/text/nautilus-text-view-ui.xml.h:9
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr "_Times"
 
@@ -3601,7 +3781,7 @@ msgid "Nautilus Tree view"
 msgstr "Nautiluksen puunäkymä"
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:635
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr "Puu"
 
@@ -3725,7 +3905,7 @@ msgstr "Vedä tunnusmerkki johonkin osaan asettaaksesi osan tunnusmerkin"
 msgid "Eclipse"
 msgstr "Pimennys"
 
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1592
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "Tunnusmerkit"
 
@@ -3822,7 +4002,7 @@ msgid "Numbers"
 msgstr "Numeroita"
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "OK"
 
@@ -3875,67 +4055,59 @@ msgid "Sea Foam"
 msgstr "Meren vaahto"
 
 #: data/browser.xml.h:68
-msgid "Secret"
-msgstr "Salaisuus"
-
-#: data/browser.xml.h:69
 msgid "Shale"
 msgstr "Liuske"
 
-#: data/browser.xml.h:70
-msgid "Shared"
-msgstr "Jaettu"
-
-#: data/browser.xml.h:71
+#: data/browser.xml.h:69
 msgid "Silver"
 msgstr "Hopea"
 
-#: data/browser.xml.h:72
+#: data/browser.xml.h:70
 msgid "Sky"
 msgstr "Taivas"
 
-#: data/browser.xml.h:73
+#: data/browser.xml.h:71
 msgid "Sky Ridge"
 msgstr "Taivasviirut"
 
-#: data/browser.xml.h:74
+#: data/browser.xml.h:72
 msgid "Snow Ridge"
 msgstr "Lumiviirut"
 
-#: data/browser.xml.h:75
+#: data/browser.xml.h:73
 msgid "Special"
 msgstr "Erityinen"
 
-#: data/browser.xml.h:76
+#: data/browser.xml.h:74
 msgid "Stucco"
 msgstr "Stukko"
 
 # Who would have believed? :)
-#: data/browser.xml.h:77
+#: data/browser.xml.h:75
 msgid "Tangerine"
 msgstr "Mandariini"
 
-#: data/browser.xml.h:78
+#: data/browser.xml.h:76
 msgid "Terracotta"
 msgstr "Terrakotta"
 
-#: data/browser.xml.h:79
+#: data/browser.xml.h:77
 msgid "Urgent"
 msgstr "Kiireellinen"
 
-#: data/browser.xml.h:80
+#: data/browser.xml.h:78
 msgid "Violet"
 msgstr "Violetti"
 
-#: data/browser.xml.h:81
+#: data/browser.xml.h:79
 msgid "Wavy White"
 msgstr "Aaltoileva valkoinen"
 
-#: data/browser.xml.h:82
+#: data/browser.xml.h:80
 msgid "White"
 msgstr "Valkoinen"
 
-#: data/browser.xml.h:83
+#: data/browser.xml.h:81
 msgid "White Ribs"
 msgstr "Valkoiset kylkiluut"
 
@@ -3952,13 +4124,13 @@ msgid "The Gimp"
 msgstr "Gimp"
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:549
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "Työpöytä"
 
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4740
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
-#: src/file-manager/fm-desktop-icon-view.c:65
+#: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
 msgstr "Roskakori"
 
@@ -3991,7 +4163,7 @@ msgid "Google"
 msgstr "Google"
 
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:808
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "Etsintäkoneet"
 
@@ -4060,25 +4232,25 @@ msgid "International"
 msgstr "Kansainvälinen"
 
 #: data/static_bookmarks.xml.h:18
-msgid "LWN.net"
-msgstr "LWN.net"
-
-#: data/static_bookmarks.xml.h:19
 msgid "Linux Documentation Project"
 msgstr "Linuxin ohjeprojekti"
 
-#: data/static_bookmarks.xml.h:20
+#: data/static_bookmarks.xml.h:19
 msgid "Linux One"
 msgstr "Linux One"
 
-#: data/static_bookmarks.xml.h:21
+#: data/static_bookmarks.xml.h:20
 msgid "Linux Online"
 msgstr "Linux linjoilla"
 
-#: data/static_bookmarks.xml.h:22
+#: data/static_bookmarks.xml.h:21
 msgid "Linux Resources"
 msgstr "Linux-voimavarat"
 
+#: data/static_bookmarks.xml.h:22
+msgid "Linux Weekly News"
+msgstr ""
+
 #: data/static_bookmarks.xml.h:23
 msgid "LinuxNewbie.org"
 msgstr "LinuxNewbie.org"
@@ -4088,78 +4260,82 @@ msgid "LinuxOrbit.com"
 msgstr "LinuxOrbit.com"
 
 #: data/static_bookmarks.xml.h:25
+msgid "MandrakeSoft"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:26
 msgid "Netraverse"
 msgstr "Netraverse"
 
-#: data/static_bookmarks.xml.h:26
+#: data/static_bookmarks.xml.h:27
 msgid "News and Media"
 msgstr "Uutiset ja tiedotusvälineet"
 
-#: data/static_bookmarks.xml.h:27
+#: data/static_bookmarks.xml.h:28
 msgid "O'Reilly"
 msgstr "O'Reilly"
 
-#: data/static_bookmarks.xml.h:28
+#: data/static_bookmarks.xml.h:29
 msgid "OSDN"
 msgstr "OSDN"
 
-#: data/static_bookmarks.xml.h:29
+#: data/static_bookmarks.xml.h:30
 msgid "Open Source Asia"
 msgstr "Open Source Asia"
 
-#: data/static_bookmarks.xml.h:30
+#: data/static_bookmarks.xml.h:31
 msgid "OpenOffice"
 msgstr "OpenOffice"
 
-#: data/static_bookmarks.xml.h:31
+#: data/static_bookmarks.xml.h:32
 msgid "Penguin Computing"
 msgstr "Penguin Computing"
 
-#: data/static_bookmarks.xml.h:32
+#: data/static_bookmarks.xml.h:33
 msgid "Rackspace"
 msgstr "Rackspace"
 
-#: data/static_bookmarks.xml.h:33
+#: data/static_bookmarks.xml.h:34
 msgid "Red Hat"
 msgstr "Red Hat"
 
-#: data/static_bookmarks.xml.h:34
+#: data/static_bookmarks.xml.h:35
 msgid "Red Hat Network"
 msgstr "Red Hat -verkko"
 
-#: data/static_bookmarks.xml.h:35
+#: data/static_bookmarks.xml.h:36
 msgid "RedFlag Linux"
 msgstr "RedFlag Linux"
 
-#: data/static_bookmarks.xml.h:36
+#: data/static_bookmarks.xml.h:37
 msgid "Software"
 msgstr "Ohjelmisto"
 
-#: data/static_bookmarks.xml.h:37
+#: data/static_bookmarks.xml.h:38
 msgid "SourceForge"
 msgstr "SourceForge"
 
-#: data/static_bookmarks.xml.h:38
+#: data/static_bookmarks.xml.h:39
 msgid "Sun StarOffice"
 msgstr "Sun StarOffice"
 
-#: data/static_bookmarks.xml.h:39
+#: data/static_bookmarks.xml.h:40
 msgid "Sun Wah Linux"
 msgstr "Sun Wah Linux"
 
-#: data/static_bookmarks.xml.h:40
+#: data/static_bookmarks.xml.h:41
 msgid "Web Services"
 msgstr "WWW-palvelut"
 
-#: data/static_bookmarks.xml.h:41
+#: data/static_bookmarks.xml.h:42
 msgid "ZDNet Linux Hardware Database"
 msgstr "ZDNet Linux-laitteistokeskus"
 
-#: data/static_bookmarks.xml.h:42
+#: data/static_bookmarks.xml.h:43
 msgid "ZDNet Linux Resource Center"
 msgstr "ZDNet Linux-keskus"
 
-#: data/static_bookmarks.xml.h:43
+#: data/static_bookmarks.xml.h:44
 msgid "Zero-Knowledge"
 msgstr "Zero-Knowledge"
 
@@ -4207,23 +4383,18 @@ msgstr "Sierra"
 msgid "Uses manila folders and gray-green backgrounds."
 msgstr "Käyttää manillakansioita ja harmaanvihreitä taustoja."
 
-#: libnautilus-extensions/nautilus-drag.c:483
+#: libnautilus-extensions/nautilus-drag.c:489
 msgid "_Move here"
 msgstr "_Siirry sinne"
 
-#: libnautilus-extensions/nautilus-drag.c:484
+#: libnautilus-extensions/nautilus-drag.c:490
 msgid "_Copy here"
 msgstr "_Kopioi tänne"
 
-#: libnautilus-extensions/nautilus-drag.c:485
+#: libnautilus-extensions/nautilus-drag.c:491
 msgid "_Link here"
 msgstr "_Linkitä tänne"
 
-#: libnautilus-extensions/nautilus-drag.c:487
-#: src/file-manager/fm-directory-view.c:3503
-msgid "Cancel"
-msgstr "Peru"
-
 #. Note to localizers: this font is used for text items in Druid pages
 #: libnautilus-extensions/nautilus-druid-page-eazel.c:381
 msgid "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-*"
@@ -4246,101 +4417,101 @@ msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2217
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr "tänään %-H:%M"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2222
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr "eilen %-H:%M"
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2227
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%A %d.%m.%y %-H:%M"
 
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2232
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%d.%m.%y %-H:%M"
 
-#: libnautilus-extensions/nautilus-file.c:3363
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 kohdetta"
 
-#: libnautilus-extensions/nautilus-file.c:3363
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr "0 hakemistoa"
 
-#: libnautilus-extensions/nautilus-file.c:3364
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 tiedostoa"
 
-#: libnautilus-extensions/nautilus-file.c:3368
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 kohde"
 
-#: libnautilus-extensions/nautilus-file.c:3368
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr "1 hakemisto"
 
-#: libnautilus-extensions/nautilus-file.c:3369
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 tiedosto"
 
-#: libnautilus-extensions/nautilus-file.c:3372
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "%u kohdetta"
 
-#: libnautilus-extensions/nautilus-file.c:3372
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr "%u hakemistoa"
 
-#: libnautilus-extensions/nautilus-file.c:3373
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u tiedostoa"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3676
-#: libnautilus-extensions/nautilus-file.c:3691
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr "? kohdetta"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3682
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr "? tavua"
 
-#: libnautilus-extensions/nautilus-file.c:3695
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "tuntematon tyyppi"
 
-#: libnautilus-extensions/nautilus-file.c:3697
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "tuntematon MIME-tyyppi"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3702
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "tuntematon"
 
-#: libnautilus-extensions/nautilus-file.c:3738
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr "ohjelma"
 
-#: libnautilus-extensions/nautilus-file.c:3750
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
@@ -4350,7 +4521,7 @@ msgstr ""
 "tarkoittanee, että tiedosto gnome-vfs.keys on väärässä paikassa tai ei löydy "
 "muusta syystä."
 
-#: libnautilus-extensions/nautilus-file.c:3754
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
@@ -4359,7 +4530,7 @@ msgstr ""
 "Ei kuvausta Mime-tyypille \"%s\" (tiedosto on \"%s\"). Ilmoita (englanniksi) "
 "osoitteeseen aaron@eazel.com."
 
-#: libnautilus-extensions/nautilus-file.c:3768
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "linkki"
 
@@ -4368,27 +4539,27 @@ msgstr "linkki"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1156
-#: libnautilus-extensions/nautilus-file.c:3774
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr "linkki tyyppiin %s"
 
-#: libnautilus-extensions/nautilus-file.c:3788
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr "linkki (rikki)"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "Hakemistosta:"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "Hakemistoon:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:588
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4399,7 +4570,7 @@ msgstr ""
 "\n"
 "Kohdetta \"%s\" ei voi siirtää, koska se on levyllä, jota voi vain lukea."
 
-#: libnautilus-extensions/nautilus-file-operations.c:599
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4412,7 +4583,7 @@ msgstr ""
 "Kohdetta \"%s\" ei voi poistaa, koska sinulla ei ole oikeuksia sen "
 "ylähakemiston muuttamiseen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:605
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4423,7 +4594,7 @@ msgstr ""
 "\n"
 "Kohdetta \"%s\" ei voi poistaa, koska se on levyllä, jota voi vain lukea."
 
-#: libnautilus-extensions/nautilus-file-operations.c:636
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4436,7 +4607,7 @@ msgstr ""
 "Kohdetta \"%s\" ei voi siirtää, koska sinulla ei ole oikeuksia sen tai sen "
 "ylähakemiston muuttamiseen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:643
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4449,7 +4620,7 @@ msgstr ""
 "Kohdetta \"%s\" ei voi siirtää roskakoriin, koska sinulla ei ole oikeuksia "
 "sen tai sen ylähakemiston muuttamiseen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:667
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -4461,7 +4632,7 @@ msgstr ""
 "Kohdetta \"%s\" ei voi kopioida, koska sinulla ei ole oikeuksia sen "
 "lukemiseen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:689
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4472,7 +4643,7 @@ msgstr ""
 "\n"
 "Levytilaa ei ole jäljellä."
 
-#: libnautilus-extensions/nautilus-file-operations.c:694
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4483,7 +4654,7 @@ msgstr ""
 "\n"
 "Levytilaa ei ole jäljellä."
 
-#: libnautilus-extensions/nautilus-file-operations.c:698
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4494,7 +4665,7 @@ msgstr ""
 "\n"
 "Levytilaa ei ole jäljellä"
 
-#: libnautilus-extensions/nautilus-file-operations.c:710
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4505,7 +4676,7 @@ msgstr ""
 "\n"
 "Sinulla ei ole tämän hakemiston kirjoitusoikeutta."
 
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4516,7 +4687,7 @@ msgstr ""
 "\n"
 "Kohdelevylle ei voi kirjoittaa."
 
-#: libnautilus-extensions/nautilus-file-operations.c:721
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4527,7 +4698,7 @@ msgstr ""
 "\n"
 "Sinulla ei ole tämän hakemiston kirjoitusoikeutta."
 
-#: libnautilus-extensions/nautilus-file-operations.c:725
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4538,7 +4709,7 @@ msgstr ""
 "\n"
 "Kohdelevylle ei voi kirjoittaa."
 
-#: libnautilus-extensions/nautilus-file-operations.c:732
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4549,7 +4720,7 @@ msgstr ""
 "\n"
 "Sinulla ei ole tämän hakemiston kirjoitusoikeutta."
 
-#: libnautilus-extensions/nautilus-file-operations.c:736
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4560,7 +4731,7 @@ msgstr ""
 "\n"
 "Kohdelevylle ei voi kirjoittaa."
 
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4571,7 +4742,7 @@ msgstr ""
 "\n"
 "Haluatko jatkaa?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4582,7 +4753,7 @@ msgstr ""
 "\n"
 "Haluatko jatkaa?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:773
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4593,7 +4764,7 @@ msgstr ""
 "\n"
 "Haluatko jatkaa?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4604,7 +4775,7 @@ msgstr ""
 "\n"
 "Haluatko jatkaa?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:794
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4615,7 +4786,7 @@ msgstr ""
 "\n"
 "Haluatko jatkaa?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4626,7 +4797,7 @@ msgstr ""
 "\n"
 "Haluatko jatkaa?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4637,7 +4808,7 @@ msgstr ""
 "\n"
 "Haluatko jatkaa?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4648,34 +4819,34 @@ msgstr ""
 "\n"
 "Haluatko jatkaa?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:924
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "Virhe kopioidessa."
 
-#: libnautilus-extensions/nautilus-file-operations.c:927
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "Virhe siirtäessä."
 
-#: libnautilus-extensions/nautilus-file-operations.c:930
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "Virhe linkittäessä."
 
-#: libnautilus-extensions/nautilus-file-operations.c:935
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "Virhe poistaessa."
 
-#: libnautilus-extensions/nautilus-file-operations.c:960
-#: libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "Ohita"
 
-#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Yritä uudelleen"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1057
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4689,7 +4860,7 @@ msgstr ""
 "\n"
 "Jos haluat siirtää kohteen \"%s\", nimeä se uudelleen ja yritä uudestaan."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1063
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4704,11 +4875,11 @@ msgstr ""
 "Jos haluat kopioida kohteen \\\"%s\\\", nimeä se uudelleen ja yritä "
 "uudestaan."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "Ei voi korvata tiedostoa"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1081
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4719,23 +4890,23 @@ msgstr ""
 "\n"
 "Haluatko korvata sen?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1092
-#: libnautilus-extensions/nautilus-file-operations.c:1106
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "Ristiriita kopioinnissa"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Korvaa"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Korvaa kaikki"
 
 # Another hard
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1160
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "toinen linkki tyyppiin %s"
@@ -4744,25 +4915,25 @@ msgstr "toinen linkki tyyppiin %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. linkki tyyppiin %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1180
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. linkki tyyppiin %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1184
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. linkki tyyppiin %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. linkki tyyppiin %s"
@@ -4772,241 +4943,227 @@ msgstr "%d. linkki tyyppiin %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
-#: libnautilus-extensions/nautilus-file-operations.c:2351
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (kopio)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
-#: libnautilus-extensions/nautilus-file-operations.c:2351
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (toinen kopio)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1212
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr ". kopio)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr ". kopio)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1216
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr ". kopio)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr ". kopio)"
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopio)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (toinen kopio) %s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1232
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. kopio)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1234
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. kopio)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1236
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. kopio)%s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. kopio)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1322
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1330
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1487
-#: libnautilus-extensions/nautilus-file-operations.c:2066
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Tuntematon GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1802
-#: libnautilus-extensions/nautilus-file-operations.c:2195
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "Siirretään tiedostoja roskakoriin"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1804
-#: libnautilus-extensions/nautilus-file-operations.c:2197
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr "Tiedostoja heitetty pois:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1821
-#: libnautilus-extensions/nautilus-file-operations.c:2199
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "siirtäessä kohdetta"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1807
-#: libnautilus-extensions/nautilus-file-operations.c:2200
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "Valmistellaan roskakoriin siirtämistä..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1817
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "Siirretään tiedostoja"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "Tiedostoja siirtynyt:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1822
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "Valmistellaan siirtoa..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "Viimeistellään siirtoa..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "Luodaan linkkejä tiedostoihin"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1837
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "Tiedostoja linkittynyt:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1839
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "Linkittäessä"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "Valmistellaan linkkien luontia..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "Viimeistellään linkkien luontia..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1848
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "Kopioidaan tiedostoja"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "Tiedostoja kopioitunut:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "Kopioidaan"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "Valmistellaan kopiointia"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "Et voi kopioida kohteita roskakoriin."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "Ei voi kopioida roskakoriin"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1899
-#: libnautilus-extensions/nautilus-file-operations.c:2157
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "Roskakorin pitää olla työpöydällä."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "Et voi siirtää tätä roskakorihakemistoa."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1902
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "Et voi kopioida roskakoria."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1903
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "Et voi kopioida tätä roskakorihakemistoa."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1905
-#: libnautilus-extensions/nautilus-file-operations.c:2158
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Roskakorin sijaintia ei voi muuttaa"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1906
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Roskakoria ei voi kopioida"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1923
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "Et voi siirtää hakemistoa itseensä."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1924
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "Et voi kopioida hakemistoa itseensä."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1926
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "Ei voi siirtää itsensä sisälle"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1927
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "Ei voi kopioida itseensä"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1940
-msgid "You cannot move a file onto itself."
-msgstr "Et voi siirtää tiedostoa itseensä."
-
-#: libnautilus-extensions/nautilus-file-operations.c:1941
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "Et voi kopioida tiedostoa itseensä."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1943
-msgid "Can't Move Onto Self"
-msgstr "Ei voi siirtää itseensä"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1944
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "Ei voi kopioida itseensä"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1995
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5016,7 +5173,7 @@ msgstr ""
 "\n"
 "Sinulla ei ole kohteen kirjoitusoikeuksia."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1998
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5026,606 +5183,716 @@ msgstr ""
 "\n"
 "Levytilaa ei ole jäljellä."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2001
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Virhe \"%s\" uutta hakemistoa luodessa."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2005
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "Virhe uuden hakemiston luonnissa"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2092
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "nimetön hakemisto"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2164
-#, c-format
-msgid "You cannot throw \"%s\" into the Trash."
-msgstr "Et voi heittää kohdetta \"%s\" roskakoriin."
-
-#: libnautilus-extensions/nautilus-file-operations.c:2168
-msgid "Error Moving to Trash"
-msgstr "Virhe siirtäessä roskakoriin"
-
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2240
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "Poistaa tiedostoja"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2242
-#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "Tiedostoja poistettu:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2244
-#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Poistaa"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "Valmistellaan tiedostojen poistamista..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Tyhjennetään roskakori"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Valmistellaan roskakorin tyhjentämistä..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2311
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr ""
 "Oletko varma, että haluat poistaa pysyvästi kaiken roskakorin sisällön?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2313
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "Poistetaanko roskakorin sisältö?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2314
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "Tyhjennä"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2352
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "jokin"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2352
-#: libnautilus-extensions/nautilus-file-operations.c:2362
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "jokin (kopio)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2353
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2353
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopio)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2354
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".jokin.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2354
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".jokin (kopio).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2355
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "jokin jokin"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2355
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "jokin jokin (kopio)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2356
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "jokin.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2356
-#: libnautilus-extensions/nautilus-file-operations.c:2363
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "jokin (kopio).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2357
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "jokin jokin.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2357
-#: libnautilus-extensions/nautilus-file-operations.c:2377
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "jokin jokin (kopio).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2358
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "jokin jokin.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2358
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "jokin jokin (kopio).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2359
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "jokin...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2359
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "jokin.. (kopio).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2360
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "jokin..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2360
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "jokin... (kopio)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2361
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "jokin. (kopio)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2361
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "jokin. (toinen kopio)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2362
-#: libnautilus-extensions/nautilus-file-operations.c:2364
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "jokin (toinen kopio)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2363
-#: libnautilus-extensions/nautilus-file-operations.c:2365
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "jokin (toinen kopio).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2364
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "jokin (3. kopio)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2365
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "jokin (3. kopio).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2366
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "jokin jokin (toinen kopio).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2366
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "jokin jokin (3. kopio).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2367
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr "jokin (21. kopio)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr "jokin (24. kopio)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr "jokin (21. kopio).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr "jokin (24. kopio).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "jokin (21. kopio)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2367
-#: libnautilus-extensions/nautilus-file-operations.c:2369
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "jokin (22. kopio)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2368
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "jokin (21. kopio).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2368
-#: libnautilus-extensions/nautilus-file-operations.c:2370
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "jokin (22. kopio).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2369
-#: libnautilus-extensions/nautilus-file-operations.c:2371
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "jokin (23. kopio)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2370
-#: libnautilus-extensions/nautilus-file-operations.c:2372
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "jokin (23. kopio).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2371
-#: libnautilus-extensions/nautilus-file-operations.c:2373
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "jokin (24. kopio)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2372
-#: libnautilus-extensions/nautilus-file-operations.c:2374
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "jokin (24. kopio).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2373
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "jokin (25. kopio)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2374
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "jokin (25. kopio).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2375
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "jokin jokin (24. kopio)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2375
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "jokin jokin (25. kopio)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2376
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "jokin jokin (24. kopio).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2376
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "jokin jokin (25. kopio).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2377
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "jokin jokin (100000000000000. kopio).txt"
 
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (10th copy)"
+msgstr "jokin (21. kopio)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (11st copy)"
+msgstr "jokin (21. kopio)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (10th copy).txt"
+msgstr "jokin (21. kopio).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (11st copy).txt"
+msgstr "jokin (21. kopio).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (11th copy)"
+msgstr "jokin (21. kopio)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (12nd copy)"
+msgstr "jokin (22. kopio)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (11th copy).txt"
+msgstr "jokin (21. kopio).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (12nd copy).txt"
+msgstr "jokin (22. kopio).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (12th copy)"
+msgstr "jokin (24. kopio)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (13rd copy)"
+msgstr "jokin (3. kopio)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (12th copy).txt"
+msgstr "jokin (25. kopio).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (13rd copy).txt"
+msgstr "jokin (3. kopio).txt"
+
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld / %ld"
 
-#: libnautilus-extensions/nautilus-font-picker.c:131
-msgid "Font"
-msgstr "Kirjasin"
-
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
 msgid "GConf Error"
 msgstr "GConf-virhe"
 
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:704
-msgid "fixed"
-msgstr "tasavälinen"
-
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1359
-msgid "01/01/00, 01:00 AM"
-msgstr "01/01/00, 01:00"
-
-#: libnautilus-extensions/nautilus-glib-extensions.c:1360
-msgid "1/1/00, 1:00 AM"
-msgstr "1/1/00, 1:00"
-
-#: libnautilus-extensions/nautilus-glib-extensions.c:1361
-msgid " 1/ 1/00,  1:00 AM"
-msgstr " 1/ 1/00,  1:00"
-
 #. Constants
-#: libnautilus-extensions/nautilus-global-preferences.c:45
+#: libnautilus-extensions/nautilus-global-preferences.c:50
 msgid "Nautilus Preferences"
 msgstr "Nautiluksen asetukset"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:90
-msgid "current theme"
-msgstr "nykyinen teema"
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "aina"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "Aina"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "vain paikallinen"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "Vain paikalliset tiedostot"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "ei koskaan"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "Ei koskaan"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "Pehmeämmät grafiikat"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "Käytä pehmeämpää (mutta hitaampaa) grafiikkaa"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "Kirjasimet"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+#, fuzzy
+msgid "Font for Icon view:"
+msgstr "Tehdas, joka tuottaa musiikkinäkymiä"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "Tehdas, joka tuottaa historiikkinäkymiä"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "Piirrä työpöytä Nautiluksella"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
+msgstr "Uusien ikkunoiden avaaminen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:93
+#: libnautilus-extensions/nautilus-global-preferences.c:651
 msgid "Open each file or folder in a separate window"
 msgstr "Avaa jokainen tiedosto tai hakemisto omassa ikkunassaan"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:96
-msgid "Ask before emptying the Trash"
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+msgid "Display toolbar in new windows"
+msgstr "Näytä työkalupalkki uusissa ikkunoissa"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "Näytä sijaintipalkki uusissa ikkunoissa"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "Näytä tilarivi uusissa ikkunoissa"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "Näytä sivupaneeli uusissa ikkunoissa"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "Roskakorin toiminta"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+#, fuzzy
+msgid "Ask before emptying the Trash or deleting files"
 msgstr "Kysy ennen roskakorin tyhjennystä"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:99
-#: libnautilus-extensions/nautilus-global-preferences.c:593
-msgid "Click Behavior"
-msgstr "Napsautusten toiminta"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
+
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:102
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 msgid "single"
 msgstr "yksinkertainen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:103
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "Käytä kohteita yhdellä napsautuksella"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:107
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "kaksinkertainen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:108
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "Käytä kohteita kaksoisnapsautuksella"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:112
-#: libnautilus-extensions/nautilus-global-preferences.c:600
-msgid "Executable Text Files"
-msgstr "Suoritettavat tekstitiedostot"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:115
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 msgid "launch"
 msgstr "käynnistä"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:116
+#: libnautilus-extensions/nautilus-global-preferences.c:726
 msgid "Execute files when they are clicked"
 msgstr "Käynnistä tiedostot, kun niitä napsautetaan"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:120
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 msgid "display"
 msgstr "näytä"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:121
+#: libnautilus-extensions/nautilus-global-preferences.c:730
 msgid "Display files when they are clicked"
 msgstr "Näytä tiedostot, kun niitä napsautetaan"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:125
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 msgid "ask"
 msgstr "kysy"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:126
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 msgid "Ask each time"
 msgstr "Kysy joka kerta"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:136
-#: libnautilus-extensions/nautilus-global-preferences.c:724
-msgid "Show Text in Icons"
-msgstr "Näytä tekstit kuvakkeissa"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:139
-#: libnautilus-extensions/nautilus-global-preferences.c:731
-msgid "Show Count of Items in Folders"
-msgstr "Näytä hakemistojen sisältöjen lukumäärät"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:142
-#: libnautilus-extensions/nautilus-global-preferences.c:738
-msgid "Show Thumbnails for Image Files"
-msgstr "Näytä pienoiskuvat kuvatiedostoista"
-
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:145
-#: libnautilus-extensions/nautilus-global-preferences.c:754
-msgid "Make Folder Appearance Details Public"
-msgstr "Tee hakemiston ulkonäön asetuksista julkisia"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:148
-#: libnautilus-extensions/nautilus-global-preferences.c:745
-msgid "Preview Sound Files"
-msgstr "Kuuntele äänitiedostoja"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:151
-msgid "Use smoother (but slower) graphics"
-msgstr "Käytä pehmeämpää (mutta hitaampaa) grafiikkaa"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:154
-msgid "Use this font family to display file names:"
-msgstr "Käytä tätä kirjasinperhettä tiedostojen nimien näyttämiseen:"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Display toolbar in new windows"
-msgstr "Näytä työkalupalkki uusissa ikkunoissa"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-msgid "Display location bar in new windows"
-msgstr "Näytä sijaintipalkki uusissa ikkunoissa"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Display status bar in new windows"
-msgstr "Näytä tilarivi uusissa ikkunoissa"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-msgid "Display sidebar in new windows"
-msgstr "Näytä sivupaneeli uusissa ikkunoissa"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:170
-msgid "Use Nautilus to draw the desktop"
-msgstr "Piirrä työpöytä Nautiluksella"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:174
-msgid "Enable fast search (indexes your hard drive)"
-msgstr "Käytä nopeaa etsintää (luetteloi levyasemasi)"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:177
-msgid "search type to do by default"
-msgstr "etsinnän oletustyyppi"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:180
-msgid "search by text"
-msgstr "etsi tekstin perusteella"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:181
-msgid "Search for files by file name only"
-msgstr "Etsi tiedostoja vain nimen perusteella"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:185
-msgid "search by text and properties"
-msgstr "etsi tekstin ja ominaisuuksien perusteella"
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "Napsautusten toiminta"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:186
-msgid "Search for files by file name and file properties"
-msgstr "Etsi tiedostoja nimen ja ominaisuuksien perusteella"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr "Suoritettavat tekstitiedostot"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:190
-msgid "Search Engine Location"
-msgstr "Hakukoneen sijainti"
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr "Näytä/piilota valinnat"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:194
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr "Näytä piilotiedostot (alkavat merkillä \".\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:197
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr "Näytä varmuuskopiot (loppuvat merkkiin \"~\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:200
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr "Näytä erityiset liput ominaisuusikkunassa"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:203
-msgid "Show only folders (no files) in the tree"
-msgstr "Näytä vain hakemistot (ei tiedostoja) puussa"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:206
-msgid "Can add Content"
-msgstr "Voi lisätä sisältöä"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+#, fuzzy
+msgid "Sorting Order"
+msgstr "Virhe omistajaa asettaessa"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:209
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
-msgstr "Älä näytä sisäänrakennettuja kirjanmerkkejä"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:213
-#: libnautilus-extensions/nautilus-global-preferences.c:218
-#: src/file-manager/fm-properties-window.c:1504 src/nautilus-location-bar.c:62
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
 msgid "Location:"
 msgstr "Sijainti:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:217
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+msgid "HTTP Proxy Settings"
+msgstr "HTTP-välityspalvelinasetukset"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "Käytä HTTP-välityspalvelinta"
 
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:219
-#: src/nautilus-first-time-druid.c:667
+#: libnautilus-extensions/nautilus-global-preferences.c:812
+#: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr "Portti:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:525
-msgid "Appearance"
-msgstr "Ulkonäkö"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:526
-msgid "Appearance Settings"
-msgstr "Ulkonäön asetukset"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:528
-msgid "Smoother Graphics"
-msgstr "Pehmeämmät grafiikat"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:535
-msgid "Fonts"
-msgstr "Kirjasimet"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "Sisäänrakennetut kirjanmerkit"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:546
-msgid "Windows & Desktop"
-msgstr "Ikkunat & työpöytä"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "Älä näytä sisäänrakennettuja kirjanmerkkejä"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:547
-msgid "Windows & Desktop Settings"
-msgstr "Ikkunat & työpöydän asetukset"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "Näytä tekstit kuvakkeissa"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:555
-msgid "Opening New Windows"
-msgstr "Uusien ikkunoiden avaaminen"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr "Näytä hakemistojen sisältöjen lukumäärät"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:578
-msgid "Trash Behavior"
-msgstr "Roskakorin toiminta"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "Näytä pienoiskuvat kuvatiedostoista"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:590
-msgid "Icon & List Views"
-msgstr "Kuvake- ja luettelonäkymät"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:591
-msgid "Icon & List Views Settings"
-msgstr "Kuvake- ja luettelonäkymien asetukset"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr "Kuuntele äänitiedostoja"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:607
-msgid "Show/Hide Options"
-msgstr "Näytä/piilota valinnat"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr "Tee hakemiston ulkonäön asetuksista julkisia"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:628
-msgid "Sidebar Panels"
-msgstr "Sivupaneelit"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "Ulkonäkö"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:629
-msgid "Sidebar Panels Settings"
-msgstr "Sivupaneelien asetukset"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr "Ikkunat & työpöytä"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:632
-msgid "Tabs"
-msgstr "Lehdet"
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr "Kuvake- ja luettelonäkymät"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:681
+#: libnautilus-extensions/nautilus-global-preferences.c:957
 msgid "Navigation"
 msgstr "Ohjailu"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:682
-msgid "Navigation Settings"
-msgstr "Ohjailun asetukset"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:691
-msgid "HTTP Proxy Settings"
-msgstr "HTTP-välityspalvelinasetukset"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:710
-msgid "Built-in Bookmarks"
-msgstr "Sisäänrakennetut kirjanmerkit"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:721
+#: libnautilus-extensions/nautilus-global-preferences.c:962
 msgid "Speed Tradeoffs"
 msgstr "Nopeuden lisääminen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:722
-msgid "Speed Tradeoffs Settings"
-msgstr "Nopeuden lisäämisen asetukset"
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr "etsi tekstin perusteella"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:793
-msgid "Search"
-msgstr "Etsi"
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+msgid "Search for files by file name only"
+msgstr "Etsi tiedostoja vain nimen perusteella"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:794
-msgid "Search Settings"
-msgstr "Etsinnän asetukset"
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr "etsi tekstin ja ominaisuuksien perusteella"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+msgid "Search for files by file name and file properties"
+msgstr "Etsi tiedostoja nimen ja ominaisuuksien perusteella"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "Etsinnän monimutkaisuuden asetukset"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:802
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "etsinnän oletustyyppi"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 msgid "Fast Search"
 msgstr "Nopea etsintä"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:975
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr "Käytä nopeaa etsintää (luetteloi levyasemasi)"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+msgid "Search Engine Location"
+msgstr "Hakukoneen sijainti"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Etsi"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr "Näytä vain hakemistot (ei tiedostoja) puussa"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
 #, c-format
 msgid "Display %s tab in sidebar"
 msgstr "Näytä lehti %s sivupaneelissa"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1022
-msgid "always"
-msgstr "aina"
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "Sivupaneelit"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1023
-msgid "Always"
-msgstr "Aina"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr "Lehdet"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1026
-msgid "local only"
-msgstr "vain paikallinen"
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"currently can't be performed because the program crond, which does nightly "
+"tasks on your computer, is turned off. To make sure fast searches can be "
+"done, turn crond on."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1027
-msgid "Local Files Only"
-msgstr "Vain paikalliset tiedostot"
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
+msgid "Files May Not Be Indexed"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1030
-msgid "never"
-msgstr "ei koskaan"
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
+msgid ""
+"If you are running Linux, you can log in as root and type these commands to "
+"start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1031
-msgid "Never"
-msgstr "Ei koskaan"
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"may not be performed because the program crond, which does nightly tasks on "
+"your computer, may be turned off. To make sure fast searches can be done, "
+"check to make sure that crond is turned on.\n"
+"\n"
+msgstr ""
 
 #. The list of characters that cause line breaks can be localized.
-#: libnautilus-extensions/nautilus-icon-canvas-item.c:68
+#: libnautilus-extensions/nautilus-icon-canvas-item.c:70
 msgid " -_,;.?/&"
 msgstr " -_,;.?/&"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:741
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
@@ -5635,7 +5902,7 @@ msgstr ""
 "asetteluun ja jättää tämän kohteen sinne, minne pudotit sen? Tämä sotkee "
 "tallennetun käsin asettelun."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:745
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
@@ -5645,7 +5912,7 @@ msgstr ""
 "asetteluun ja jättää nämä kohteet sinne, minne pudotit ne? Tämä sotkee "
 "tallennetun käsin asettelun."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:751
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
@@ -5653,7 +5920,7 @@ msgstr ""
 "Tämä hakemiston sisältö on aseteltu automaattisesti. Haluatko siirtyä käsin "
 "asetteluun ja jättää tämän kohteen sinne, minne pudotit sen?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:754
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
@@ -5661,192 +5928,192 @@ msgstr ""
 "Tämä hakemiston sisältö on aseteltu automaattisesti. Haluatko käyttää käsin "
 "asettelua ja jättää nämä kohteet sinne, minne pudotit ne?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:759
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "Käytetäänkö käsin asettelua?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:760
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "Siirry"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1551
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr "Peru kirjoitus"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1552
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "Palauta vanha nimi"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1553
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "Tee kirjoitus uudelleen"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1554
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Palauta muutettu nimi"
 
-#: libnautilus-extensions/nautilus-preferences.c:76
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "Aloittelija"
 
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "Keskitaso"
 
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "Edistynyt"
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:205
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "Asetuslaatikko"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:218
+#: libnautilus-extensions/nautilus-program-chooser.c:226
 msgid "not in menu"
 msgstr "ei valikossa"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:221
+#: libnautilus-extensions/nautilus-program-chooser.c:229
 msgid "in menu for this file"
 msgstr "tämän tiedoston valikossa"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:224
-#: libnautilus-extensions/nautilus-program-chooser.c:227
+#: libnautilus-extensions/nautilus-program-chooser.c:232
+#: libnautilus-extensions/nautilus-program-chooser.c:235
 #, c-format
 msgid "in menu for \"%s\""
 msgstr "tyypin \"%s\" valikossa"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:230
+#: libnautilus-extensions/nautilus-program-chooser.c:238
 msgid "default for this file"
 msgstr "tämän tiedoston oletus"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:233
-#: libnautilus-extensions/nautilus-program-chooser.c:236
+#: libnautilus-extensions/nautilus-program-chooser.c:241
+#: libnautilus-extensions/nautilus-program-chooser.c:244
 #, c-format
 msgid "default for \"%s\""
 msgstr "tyypin \"%s\" oletus"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:265
+#: libnautilus-extensions/nautilus-program-chooser.c:289
 #, c-format
 msgid "Is not in the menu for \"%s\" items."
 msgstr "Ei ole tiedostotyypin \"%s\" valikossa."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:268
+#: libnautilus-extensions/nautilus-program-chooser.c:292
 #, c-format
 msgid "Is in the menu for \"%s\"."
 msgstr "On tiedoston \"%s\" valikossa."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:271
+#: libnautilus-extensions/nautilus-program-chooser.c:295
 #, c-format
 msgid "Is in the menu for \"%s\" items."
 msgstr "On tiedostotyypin \"%s\" valikossa."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:274
+#: libnautilus-extensions/nautilus-program-chooser.c:298
 #, c-format
 msgid "Is in the menu for all \"%s\" items."
 msgstr "On kaikkien tiedostotyyppien \"%s\" valikossa."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:277
+#: libnautilus-extensions/nautilus-program-chooser.c:301
 #, c-format
 msgid "Is the default for \"%s\"."
 msgstr "On tiedoston \"%s\" oletus."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:280
+#: libnautilus-extensions/nautilus-program-chooser.c:304
 #, c-format
 msgid "Is the default for \"%s\" items."
 msgstr "On tiedostotyypin \"%s\" oletus."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:283
+#: libnautilus-extensions/nautilus-program-chooser.c:307
 #, c-format
 msgid "Is the default for all \"%s\" items."
 msgstr "On kaikkien tiedostotyyppien \"%s\" oletus."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:969
+#: libnautilus-extensions/nautilus-program-chooser.c:993
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Muokkaa ohjelmalla \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-extensions/nautilus-program-chooser.c:994
+#: libnautilus-extensions/nautilus-program-chooser.c:1018
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Näytä tiedostotyypin \"%s\" valikossa"
 
 #. Radio button for setting default for file type.
-#: libnautilus-extensions/nautilus-program-chooser.c:1001
+#: libnautilus-extensions/nautilus-program-chooser.c:1025
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Käytä tiedostotyypin \"%s\" oletuksena"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1008
+#: libnautilus-extensions/nautilus-program-chooser.c:1032
 #, c-format
 msgid "Include in the menu just for \"%s\""
 msgstr "Näytä vain tiedoston \"%s\" valikossa"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1014
+#: libnautilus-extensions/nautilus-program-chooser.c:1038
 #, c-format
 msgid "Use as default just for \"%s\""
 msgstr "Käytä vain tiedoston \"%s\" oletuksena"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1021
+#: libnautilus-extensions/nautilus-program-chooser.c:1045
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Älä näytä tiedostotyypin \"%s\" valikossa"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1185
-#: src/file-manager/fm-list-view.c:2122
+#: libnautilus-extensions/nautilus-program-chooser.c:1209
+#: src/file-manager/fm-list-view.c:2182
 #: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
 msgstr "Nimi"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1188
+#: libnautilus-extensions/nautilus-program-chooser.c:1212
 msgid "Status"
 msgstr "Tila"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1236
+#: libnautilus-extensions/nautilus-program-chooser.c:1260
 msgid "Open with Other"
 msgstr "Avaa muulla ohjelmalla"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1237
+#: libnautilus-extensions/nautilus-program-chooser.c:1261
 #, c-format
 msgid "Choose an application with which to open \"%s\"."
 msgstr "Valitse sovellus, jolla tiedosto \"%s\" avataan"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1241
+#: libnautilus-extensions/nautilus-program-chooser.c:1265
 msgid "View as Other"
 msgstr "Katsele muuna tyyppinä"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1242
+#: libnautilus-extensions/nautilus-program-chooser.c:1266
 #, c-format
 msgid "Choose a view for \"%s\"."
 msgstr "Valitse tiedoston \"%s\" näkymä."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1249
+#: libnautilus-extensions/nautilus-program-chooser.c:1273
 msgid "Choose"
 msgstr "Valitse"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1251
+#: libnautilus-extensions/nautilus-program-chooser.c:1275
 msgid "Done"
 msgstr "Valmis"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1314
+#: libnautilus-extensions/nautilus-program-chooser.c:1338
 msgid "Modify..."
 msgstr "Muokkaa..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-extensions/nautilus-program-chooser.c:1325
+#: libnautilus-extensions/nautilus-program-chooser.c:1349
 msgid "File Types and Programs"
 msgstr "Tiedostotyypit ja ohjelmat"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1346
+#: libnautilus-extensions/nautilus-program-chooser.c:1370
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "GNOME Control Center."
@@ -5854,7 +6121,42 @@ msgstr ""
 "Voi valita Gnomen hallintakeskuksesta, mitä ohjelmia tarjotaan millekin "
 "tiedostotyypille."
 
-#: libnautilus-extensions/nautilus-program-choosing.c:516
+#: libnautilus-extensions/nautilus-program-chooser.c:1485
+#, fuzzy, c-format
+msgid "No viewers are available for \"%s\"."
+msgstr "Ei MD5-summaa paketille %s"
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1486
+msgid "No Viewers Available"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1489
+#, fuzzy, c-format
+msgid "No applications are available for \"%s\"."
+msgstr "Teeman \"%s\" kuvausta ei ole saatavilla"
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1490
+#, fuzzy
+msgid "No Applications Available"
+msgstr "Sovellukset"
+
+#. Note: This might be misleading in the components case, since the
+#. * user can't add components to the complete list even from the capplet.
+#. * (They can add applications though.)
+#.
+#: libnautilus-extensions/nautilus-program-chooser.c:1497
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"You can configure which programs are offered for which file types with the "
+"\"File Types and Programs\" part of the GNOME Control Center. Do you want to "
+"go there now?"
+msgstr ""
+"Voi valita Gnomen hallintakeskuksesta, mitä ohjelmia tarjotaan millekin "
+"tiedostotyypille."
+
+#: libnautilus-extensions/nautilus-program-choosing.c:492
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
@@ -5863,17 +6165,17 @@ msgstr ""
 "\"%s\" ei voi avata kohdetta \"%s\" koska \"%s\" ei voi koskea tiedostoihin "
 "sijainneissa \"%s\". Haluatko valita toisen ohjelman?"
 
-#: libnautilus-extensions/nautilus-program-choosing.c:521
-#: libnautilus-extensions/nautilus-program-choosing.c:542
+#: libnautilus-extensions/nautilus-program-choosing.c:497
+#: libnautilus-extensions/nautilus-program-choosing.c:518
 msgid "Can't Open Location"
 msgstr "Ei voi avata sijaintia"
 
-#: libnautilus-extensions/nautilus-program-choosing.c:537
-#, c-format
+#: libnautilus-extensions/nautilus-program-choosing.c:513
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
 "locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you will be able to open it."
+"copy this file onto your computer, you may be able to open it."
 msgstr ""
 "\"%s\" ei voi avata kohdetta \"%s\", koska \"%s\" ei voi koskea tiedostoihin "
 "\"%s\" sijainneissa.  Muita ohjelmia tämän tiedoston näyttämiseen ei ole. "
@@ -6123,25 +6425,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Kohteet, joiden nimessä on \"medusa\" ja jotka ovat hakemistoja."
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr "Tiedot"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr "Varoitus"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr "Virhe"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr "Kysymys"
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr "Etsitään levyiltä"
@@ -6150,7 +6433,7 @@ msgstr "Etsitään levyiltä"
 msgid "Nautilus is searching your disks for trash folders."
 msgstr "Nautilus etsii roskakorihakemistoja levyasemiltasi."
 
-#: libnautilus-extensions/nautilus-trash-file.c:593
+#: libnautilus-extensions/nautilus-trash-file.c:725
 msgid "on the desktop"
 msgstr "työpöydällä"
 
@@ -6174,52 +6457,54 @@ msgstr "Tee muokkaus uudelleen"
 msgid "Redo the edit"
 msgstr "Tee muokkaus uudelleen"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:514
-#: libnautilus-extensions/nautilus-volume-monitor.c:533
+#: libnautilus-extensions/nautilus-view-identifier.c:61
+#, fuzzy, c-format
+msgid "View as %s"
+msgstr "Näytä luettelona"
+
+#: libnautilus-extensions/nautilus-view-identifier.c:64
+#, fuzzy, c-format
+msgid "%s Viewer"
+msgstr "Luettelokatselin"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #. Populate table with items we know localized names for.
-#: libnautilus-extensions/nautilus-volume-monitor.c:619
-#: libnautilus-extensions/nautilus-volume-monitor.c:1807
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr "Levyke"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:620
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:621
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
 msgid "Zip Drive"
 msgstr "Zip-asema"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:642
-#: libnautilus-extensions/nautilus-volume-monitor.c:664
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 msgid "Audio CD"
 msgstr "Ääni-CD"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1523
-msgid "Mount Error"
-msgstr "Liittämisvirhe"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1525
-msgid "Unmount Error"
-msgstr "Irrottamisvirhe"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1555
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr "on kirjoitussuojattu: liitetään vain luettavaksi."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1558
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "ei ole kelvollinen lohkolaite"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr "Ei tallennusvälinettä"
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1563
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
@@ -6228,25 +6513,25 @@ msgstr ""
 "levykettä sisällä."
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1567
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
 msgstr ""
 "Nautilus ei voinut liittää osiota. Laitteessa ei todennäköisesti ole levyä."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1570
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr "väärä tiedostojärjestelmä, väärä valitsin, väärä superblock päällä"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1573
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
 msgstr ""
 "Nautilus ei voinut liittää levykeasemaa. Luultavasti syynä on tallennusmuoto."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1576
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
@@ -6254,40 +6539,58 @@ msgstr ""
 "Nautilus ei voinut liittää valittua osiota. Luultavasti syynä on "
 "tallennusmuoto."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1581
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr "Nautilus ei voinut liittää valittua levykeasemaa."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1583
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "Nautilus ei voinut liittää valittua osiota."
 
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1588
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr "Nautilus ei voinut irrottaa valittua osiota."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1740
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr "Liittämisvirhe"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr "Irrottamisvirhe"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "ISO 9660 -osio"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1755
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "Juuri"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1762
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Ext2-osio"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1777
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "MS DOS-osio"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1792
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "NFS-osio"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1822
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
+#, fuzzy
+msgid "ReiserFS Volume"
+msgstr "NFS-osio"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
+#, fuzzy
+msgid "UFS Volume"
+msgstr "NFS-osio"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "Tuntematon osio"
 
@@ -6295,31 +6598,66 @@ msgstr "Tuntematon osio"
 msgid "C_lear Text"
 msgstr "_Tyhjennä teksti"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "_Tyhjennä teksti"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "_Kopioi teksti"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "Kopioi valittu teksti leikepöydälle"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "_Leikkaa teksti"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+msgid "Cut _Text"
+msgstr "_Leikkaa teksti"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "Leikkaa valittu teksti leikepöydälle"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:45
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "_Liitä tekstiä"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "Liitä leikepöydän sisältämä teksti"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "Poista valittu teksti kopioimatta sitä leikepöydälle"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:77
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "_Valitse kaikki"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+#, fuzzy
+msgid "Select _All"
+msgstr "_Valitse kaikki"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "Valitse tämän ikkunan kaikki kohteet"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "_Kopioi teksti"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:7
-msgid "_Cut Text"
-msgstr "_Leikkaa teksti"
-
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:91
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "_Liitä tekstiä"
 
@@ -6328,7 +6666,7 @@ msgstr "_Liitä tekstiä"
 #. * to change it when we upgrade to GTK 2.0.
 #.
 #: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
-#: src/nautilus-window-menus.c:559
+#: src/nautilus-window-menus.c:610
 msgid "Nautilus"
 msgstr "Nautilus"
 
@@ -6344,78 +6682,111 @@ msgstr "Nautilus-tiedostonhallinta ja graafinen komentotulkki"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:735
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr "Käyttäjän %s kotihakemisto"
 
-#: src/file-manager/fm-desktop-icon-view.c:1021
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "Tyhjennä roskakori..."
 
-#: src/file-manager/fm-desktop-icon-view.c:1023
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "Tyhjennä roskakori"
 
-#: src/file-manager/fm-desktop-icon-view.c:1043
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "Irrota osio"
 
-#: src/file-manager/fm-directory-view.c:474
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr "Tämä avaisi %d eri ikkunaa. Oletko varma, että haluat tehdä tämän?"
 
-#: src/file-manager/fm-directory-view.c:476
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Avataanko %d ikkunaa?"
 
-#: src/file-manager/fm-directory-view.c:1199
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr ""
+"Oletko varma, että haluat poistaa kohteen \"%s\" pysyvästi roskakorista?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+"Oletko varma, että haluat poistaa pysyvästi kaikki %d valittua kohdetta "
+"roskakorista?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Poista"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Poista"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+#, fuzzy
+msgid "scripts"
+msgstr "Kuvaus"
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" valittu"
 
-#: src/file-manager/fm-directory-view.c:1201
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "1 hakemisto valittu"
 
-#: src/file-manager/fm-directory-view.c:1204
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "%d hakemistoa valittu"
 
-#: src/file-manager/fm-directory-view.c:1210
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr " (sisältää 0 kohdetta)"
 
-#: src/file-manager/fm-directory-view.c:1212
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr " (sisältää yhden kohteen)"
 
-#: src/file-manager/fm-directory-view.c:1214
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr " (sisältää %d kohdetta)"
 
-#: src/file-manager/fm-directory-view.c:1225
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" valittu (%s)"
 
-#: src/file-manager/fm-directory-view.c:1229
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d kohdetta on valittu (%s)"
 
-#: src/file-manager/fm-directory-view.c:1236
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 toinen kohde on valittu (%s)"
 
-#: src/file-manager/fm-directory-view.c:1239
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d muuta kohdetta on valittu (%s)"
@@ -6427,7 +6798,7 @@ msgstr "%d muuta kohdetta on valittu (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1268
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -6436,7 +6807,7 @@ msgstr "%s%s, %s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1395
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
@@ -6445,17 +6816,17 @@ msgstr ""
 "Hakemisto \"%s\" sisältää enemmän tiedostoja kuin Nautilus voi käsitellä. "
 "Joitakin tiedostoja ei näy."
 
-#: src/file-manager/fm-directory-view.c:1402
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "Liian monta tiedostoa"
 
-#: src/file-manager/fm-directory-view.c:2599
+#: src/file-manager/fm-directory-view.c:2752
 #, c-format
 msgid ""
 "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
 msgstr "Kohdetta \"%s\" ei voi siirtää roskakoriin. Haluatko poistaa sen heti?"
 
-#: src/file-manager/fm-directory-view.c:2604
+#: src/file-manager/fm-directory-view.c:2757
 #, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
@@ -6463,7 +6834,7 @@ msgid ""
 msgstr ""
 "Ei voi siirtää %d valittua kohdetta roskakoriin. Haluatko poistaa ne heti?"
 
-#: src/file-manager/fm-directory-view.c:2608
+#: src/file-manager/fm-directory-view.c:2761
 #, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -6472,22 +6843,17 @@ msgstr ""
 "On %d valittua kohdetta, joita ei voi siirtää roskakoriin. Haluatko poistaa "
 "nämä %d kohdetta heti?"
 
-#: src/file-manager/fm-directory-view.c:2616
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "Poistetaanko heti?"
 
-#: src/file-manager/fm-directory-view.c:2617
-#: src/file-manager/fm-directory-view.c:2658
-msgid "Delete"
-msgstr "Poista"
-
-#: src/file-manager/fm-directory-view.c:2647
+#: src/file-manager/fm-directory-view.c:2799
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr ""
 "Oletko varma, että haluat poistaa kohteen \"%s\" pysyvästi roskakorista?"
 
-#: src/file-manager/fm-directory-view.c:2651
+#: src/file-manager/fm-directory-view.c:2803
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
@@ -6496,74 +6862,213 @@ msgstr ""
 "Oletko varma, että haluat poistaa pysyvästi kaikki %d valittua kohdetta "
 "roskakorista?"
 
-#: src/file-manager/fm-directory-view.c:2657
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "Poistetaanko roskakorista?"
 
-#: src/file-manager/fm-directory-view.c:2930
-#: src/file-manager/fm-directory-view.c:2970
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Käytä ohjelmaa \"%s\" valitun kohteen avaamiseen"
 
-#: src/file-manager/fm-directory-view.c:3172
-msgid "Open in _New Window"
-msgstr "Avaa uudessa _ikkunassa"
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "Muu _sovellus..."
+
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "Muu _sovellus..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "Muu _katselin..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "Muu _katselin..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "Käytä ohjelmaa \"%s\" valitun kohteen avaamiseen"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "Nautilus ei voinut liittää valittua osiota."
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3174
+#: src/file-manager/fm-directory-view.c:3693
 #, c-format
-msgid "Open in %d _New Windows"
-msgstr "Avaa %d _uutta ikkunaa näyttämistä varten"
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3200
-msgid "Delete all selected items permanently"
-msgstr "Poista kaikki valitut kohteet pysyvästi"
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"Ei voi siirtää %d valittua kohdetta roskakoriin. Haluatko poistaa ne heti?"
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "Avaa uudessa ikkunassa"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#, fuzzy
+msgid "Open _in New Window"
+msgstr "Avaa uudessa ikkunassa"
+
+#: src/file-manager/fm-directory-view.c:3959
+#, fuzzy, c-format
+msgid "Open _in %d New Windows"
+msgstr "Avaa %d _uutta ikkunaa näyttämistä varten"
 
-#: src/file-manager/fm-directory-view.c:3205
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "Poista _roskakorista..."
 
-#: src/file-manager/fm-directory-view.c:3206
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "Poista _roskakorista"
 
-#: src/file-manager/fm-directory-view.c:3210
-msgid "Move all selected items to the Trash"
-msgstr "Siirrä kaikki valitut kohteet roskakoriin"
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "Poista kaikki valitut kohteet pysyvästi"
 
-#: src/file-manager/fm-directory-view.c:3214
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "Siirrä _roskakoriin"
 
-#: src/file-manager/fm-directory-view.c:3244
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "Siirrä kaikki valitut kohteet roskakoriin"
+
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "Poista"
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "Poista"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "_Luo linkkejä"
 
-#: src/file-manager/fm-directory-view.c:3245
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "_Luo linkki"
 
-#: src/file-manager/fm-directory-view.c:3263
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "_Tyhjennä roskakori..."
 
-#: src/file-manager/fm-directory-view.c:3264
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: src/file-manager/fm-directory-view.c:3275
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "Poista _mukautetut kuvat"
 
-#: src/file-manager/fm-directory-view.c:3276
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "Poista _mukautettu kuva"
 
-#: src/file-manager/fm-directory-view.c:3429
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "_Tiedosto"
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u tiedostoa"
+
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "_Kopioi teksti"
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "Kopioidaan tiedostoja"
+
+#: src/file-manager/fm-directory-view.c:4252
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
 "link in the Trash?"
@@ -6571,7 +7076,7 @@ msgstr ""
 "Tätä linkkiä ei voi käyttää, koska sillä ei ole kohdetta. Haluatko heittää "
 "tämän linkin roskakoriin?"
 
-#: src/file-manager/fm-directory-view.c:3432
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
@@ -6580,15 +7085,15 @@ msgstr ""
 "Tätä linkkiä ei voi käyttää, koska sen kohdetta \"%s\" ei ole olemassa. "
 "Haluatko heittää tämän linkin roskakoriin?"
 
-#: src/file-manager/fm-directory-view.c:3438
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "Rikkinäinen linkki"
 
-#: src/file-manager/fm-directory-view.c:3439
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr "Heitä pois"
 
-#: src/file-manager/fm-directory-view.c:3492
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
@@ -6597,35 +7102,35 @@ msgstr ""
 "\"%s\" on suoritettava tekstitiedosto. Haluatko käynnistää sen vai nähdä sen "
 "sisällön?"
 
-#: src/file-manager/fm-directory-view.c:3498
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr "Käynnistä vai näytä?"
 
-#: src/file-manager/fm-directory-view.c:3499
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "Käynnistä"
 
-#: src/file-manager/fm-directory-view.c:3500
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "Näyttö"
 
-#: src/file-manager/fm-directory-view.c:3554
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
 msgstr ""
 "Valitettavasti et voi turvallisuussyistä suorittaa komentoja etäsivustolta."
 
-#: src/file-manager/fm-directory-view.c:3556
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "Etälinkkejä ei voi suorittaa"
 
-#: src/file-manager/fm-directory-view.c:3690
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr "Avaa tiedostoa \"%s\""
 
-#: src/file-manager/fm-directory-view.c:3696
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "Perutaanko avaaminen?"
 
@@ -6636,22 +7141,27 @@ msgid ""
 msgstr ""
 "Sinulla ei ole kohteen \"%s\" sisällön katselemiseen tarvittavia oikeuksia."
 
-#: src/file-manager/fm-error-reporting.c:65
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Ei voinut näyttää kohteen \"%s\" kaikkea sisältöä."
 
-#: src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Virhe näyttäessä hakemistoa"
 
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "Nimi \"%s\" on jo käytössä tässä hakemistossa. Käytä toista nimeä."
 
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
@@ -6659,80 +7169,80 @@ msgstr ""
 "Kohdetta \"%s\" ei ole tässä hakemistossa. Ehkä se siirrettiin tai "
 "poistettiin juuri?"
 
-#: src/file-manager/fm-error-reporting.c:109
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr ""
 "Sinulla ei ole kohteen \"%s\" nimen muuttamiseen tarvittavia oikeuksia."
 
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr "Nimi \"%s\" ei käy, koska siinä on merkki \"/\". Käytä toista nimeä."
 
-#: src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Nimi \"%s.\" ei kelpaa.  Käytä toista nimeä."
 
-#: src/file-manager/fm-error-reporting.c:124
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Kohteen \"%s\" nimeä ei voitu muuttaa, koska kohde on levyllä, jota voi vain "
 "lukea."
 
-#: src/file-manager/fm-error-reporting.c:133
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Valitettavasti kohdetta \"%s\" ei voitu nimetä kohteeksi \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:140
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "Uudelleennimeämisvirhe"
 
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr ""
 "Sinulla ei ole kohteen \"%s\" nimen muuttamiseen tarvittavia oikeuksia."
 
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Kohteen \"%s\" ryhmää ei voitu muuttaa, koska kohde on levyllä, jota voi "
 "vain lukea."
 
-#: src/file-manager/fm-error-reporting.c:172
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Valitettavasti kohteen \"%s\" ryhmää ei voitu vaihtaa."
 
-#: src/file-manager/fm-error-reporting.c:176
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "Virhe ryhmää asettaessa"
 
-#: src/file-manager/fm-error-reporting.c:198
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Kohteen \"%s\" omistajaa ei voitu muuttaa, koska kohde on levyllä, jota voi "
 "vain lukea."
 
-#: src/file-manager/fm-error-reporting.c:205
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Valitettavasti kohteen \"%s\" omistajaa ei voitu vaihtaa."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "Virhe omistajaa asettaessa"
 
-#: src/file-manager/fm-error-reporting.c:230
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
@@ -6740,21 +7250,21 @@ msgstr ""
 "Kohteen \"%s\" oikeuksia ei voitu muuttaa, koska kohde on levyllä, jota voi "
 "vain lukea."
 
-#: src/file-manager/fm-error-reporting.c:237
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Valitettavasti kohteen \"%s\" oikeuksia ei voitu muuttaa."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "Virhe oikeuksia asettaessa"
 
-#: src/file-manager/fm-error-reporting.c:306
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Nimetään kohde \"%s\" kohteeksi \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:311
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "Perutaanko uudelleen nimeäminen?"
 
@@ -6814,120 +7324,120 @@ msgstr ""
 "Valitse tietojen ilmestymisjärjestys. Niitä ilmestyy kuvakkeiden alle, kun "
 "kasvatat suurennosta."
 
-#: src/file-manager/fm-icon-view.c:157
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "_Nimen mukaan"
 
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "Pidä kuvakkeet riveissä nimen mukaisessa järjestyksessä"
 
-#: src/file-manager/fm-icon-view.c:164
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "_Koon mukaan"
 
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "Pidä kuvakkeet riveissä koon mukaisessa järjestyksessä"
 
-#: src/file-manager/fm-icon-view.c:171
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "_Tyypin mukaan"
 
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "Pidä kuvakkeet riveissä tyypin mukaisessa järjestyksessä"
 
-#: src/file-manager/fm-icon-view.c:178
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "Muokkaus_päivämäärän mukaan"
 
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Pidä kuvakkeet riveissä muokkauspäivämääärän mukaisessa järjestyksessä"
 
-#: src/file-manager/fm-icon-view.c:185
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "Tunnus_merkkien mukaan"
 
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Pidä kuvakkeet riveissä tunnusmerkkien mukaisessa järjestyksessä"
 
-#: src/file-manager/fm-icon-view.c:1229
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "_Palauta kuvakkeiden alkuperäiset koot"
 
-#: src/file-manager/fm-icon-view.c:1230
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "_Palauta kuvakkeen alkuperäinen koko"
 
-#: src/file-manager/fm-icon-view.c:1442
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "viittaa kohteeseen \"%s\""
 
-#: src/file-manager/fm-list-view.c:2128
+#: src/file-manager/fm-list-view.c:2188
 #: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Koko"
 
-#: src/file-manager/fm-list-view.c:2134
+#: src/file-manager/fm-list-view.c:2194
 #: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Tyyppi"
 
-#: src/file-manager/fm-list-view.c:2140
+#: src/file-manager/fm-list-view.c:2200
 #: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Muokattu"
 
-#: src/file-manager/fm-properties-window.c:519
+#: src/file-manager/fm-properties-window.c:522
 #, c-format
 msgid "%s Properties"
 msgstr "Kohteen %s ominaisuudet"
 
-#: src/file-manager/fm-properties-window.c:714
+#: src/file-manager/fm-properties-window.c:717
 msgid "Cancel Group Change?"
 msgstr "Haluatko perua ryhmän vaihdon?"
 
-#: src/file-manager/fm-properties-window.c:715
+#: src/file-manager/fm-properties-window.c:718
 msgid "Changing group"
 msgstr "Ryhmän vaihto"
 
-#: src/file-manager/fm-properties-window.c:876
+#: src/file-manager/fm-properties-window.c:879
 msgid "Cancel Owner Change?"
 msgstr "Haluatko perua omistajan vaihdon?"
 
-#: src/file-manager/fm-properties-window.c:877
+#: src/file-manager/fm-properties-window.c:880
 msgid "Changing owner"
 msgstr "Omistajan vaihto"
 
-#: src/file-manager/fm-properties-window.c:1052
+#: src/file-manager/fm-properties-window.c:1063
 msgid "nothing"
 msgstr "ei mitään"
 
-#: src/file-manager/fm-properties-window.c:1054
+#: src/file-manager/fm-properties-window.c:1065
 msgid "unreadable"
 msgstr "ei luettavissa"
 
-#: src/file-manager/fm-properties-window.c:1063
+#: src/file-manager/fm-properties-window.c:1074
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 kohde, jonka koko on %s"
 
-#: src/file-manager/fm-properties-window.c:1065
+#: src/file-manager/fm-properties-window.c:1076
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d kohdetta, yhteensä %s"
 
-#: src/file-manager/fm-properties-window.c:1071
+#: src/file-manager/fm-properties-window.c:1082
 msgid "(some contents unreadable)"
 msgstr "(sisältö ei kokonaan luettavissa) "
 
@@ -6936,124 +7446,130 @@ msgstr "(sisältö ei kokonaan luettavissa) "
 #. * "Contents:" title to line up with the first line of the 2-line value.
 #. * Maybe there's a better way to do this, but I couldn't think of one.
 #.
-#: src/file-manager/fm-properties-window.c:1085
+#: src/file-manager/fm-properties-window.c:1096
 msgid "Contents:"
 msgstr "Sisältö:"
 
-#: src/file-manager/fm-properties-window.c:1418
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "Perustiedot"
 
-#: src/file-manager/fm-properties-window.c:1497
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: src/file-manager/fm-properties-window.c:1502
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "Koko:"
 
-#: src/file-manager/fm-properties-window.c:1506
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "Linkkiryhmät"
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
 msgstr "MIME-tyyppi:"
 
-#: src/file-manager/fm-properties-window.c:1512
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "Muokattu:"
 
-#: src/file-manager/fm-properties-window.c:1515
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "Käytetty:"
 
-#: src/file-manager/fm-properties-window.c:1524
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr "Valitse mukautettu kuva..."
 
-#: src/file-manager/fm-properties-window.c:1530
+#: src/file-manager/fm-properties-window.c:1558
 msgid "Remove Custom Icon"
 msgstr "Poista mukautettu kuva"
 
-#: src/file-manager/fm-properties-window.c:1855
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "Asettaa käyttäjän (SUID)"
 
-#: src/file-manager/fm-properties-window.c:1860
+#: src/file-manager/fm-properties-window.c:1891
 msgid "Special Flags:"
 msgstr "Erikoisliput:"
 
-#: src/file-manager/fm-properties-window.c:1863
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "Asettaa ryhmän (SGID)"
 
-#: src/file-manager/fm-properties-window.c:1865
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "\"Sticky\""
 
-#: src/file-manager/fm-properties-window.c:1891
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Oikeudet"
 
-#: src/file-manager/fm-properties-window.c:1897
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Et ole tiedoston omistaja, joten et voi muuttaa sen oikeuksia."
 
-#: src/file-manager/fm-properties-window.c:1910
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "Tiedoston omistaja:"
 
-#: src/file-manager/fm-properties-window.c:1919
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "Tiedoston ryhmä:"
 
-#: src/file-manager/fm-properties-window.c:1937
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "Omistaja:"
 
-#: src/file-manager/fm-properties-window.c:1938
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "Ryhmä:"
 
-#: src/file-manager/fm-properties-window.c:1939
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "Muut:"
 
-#: src/file-manager/fm-properties-window.c:1958
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "Luku"
 
-#: src/file-manager/fm-properties-window.c:1962
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "Kirjoitus"
 
-#: src/file-manager/fm-properties-window.c:1966
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "Suoritus"
 
-#: src/file-manager/fm-properties-window.c:2017
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "Tekstinä:"
 
-#: src/file-manager/fm-properties-window.c:2018
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "Numeroina:"
 
-#: src/file-manager/fm-properties-window.c:2019
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "Viimeksi muuttuneet:"
 
-#: src/file-manager/fm-properties-window.c:2023
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Kohteen \"%s\" oikeuksia ei saatu selville."
 
-#: src/file-manager/fm-properties-window.c:2303
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr "Perutaanko ominaisuusikkunan näyttäminen?"
 
-#: src/file-manager/fm-properties-window.c:2304
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr "Luodaan ominaisuusikkuna"
 
-#: src/file-manager/fm-properties-window.c:2404
+#: src/file-manager/fm-properties-window.c:2435
 msgid "Select an icon:"
 msgstr "Valitse kuvake:"
 
@@ -7077,7 +7593,7 @@ msgid ""
 msgstr "Medusa-etsintäpalvelu ei ole asennettu."
 
 #: src/file-manager/fm-search-list-view.c:159
-#: src/file-manager/nautilus-indexing-info.c:405
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr "Etsintäpalvelu ei ole saatavilla"
 
@@ -7249,7 +7765,7 @@ msgstr ""
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
 #: src/file-manager/fm-search-list-view.c:360
-#: src/file-manager/nautilus-indexing-info.c:340
+#: src/file-manager/nautilus-indexing-info.c:342
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
@@ -7264,7 +7780,7 @@ msgid "Fast searches are not available on your computer"
 msgstr "Nopeat etsinnät eivät ole käytössä koneellasi."
 
 #: src/file-manager/fm-search-list-view.c:373
-#: src/file-manager/nautilus-indexing-info.c:359
+#: src/file-manager/nautilus-indexing-info.c:361
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Fast search is disabled in your Search preferences, so no index is available."
@@ -7273,13 +7789,13 @@ msgstr ""
 "Nopea etsintä ei ole käytössä etsintäasetuksissasi, joten luetteloa ei ole."
 
 #: src/file-manager/fm-search-list-view.c:376
-#: src/file-manager/nautilus-indexing-info.c:345
-#: src/file-manager/nautilus-indexing-info.c:363
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
 msgid "Fast searches are not available on your computer."
 msgstr "Nopeat etsinnät eivät ole käytössä koneellasi."
 
 #: src/file-manager/fm-search-list-view.c:377
-#: src/file-manager/nautilus-indexing-info.c:364
+#: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
 "To enable fast search, open the Preferences menu and choose Preferences. "
 "Then select Search preferences and put a checkmark in the Enable Fast Search "
@@ -7336,7 +7852,7 @@ msgid "Change Desktop Background"
 msgstr "Muuta työpöydän taustaa"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Delete all items in the Trash"
 msgstr "Poista kaikki roskakorin sisältö"
 
@@ -7382,140 +7898,195 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Valitse katselin, jolla valittua kohdetta katsellaan"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-msgid "Create Link"
-msgstr "Luo linkki"
+#, fuzzy
+msgid "Copy Files"
+msgstr "Kopioidaan tiedostoja"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "Luo uusi tyhjä hakemisto tähän hakemistoon"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "Luo symbolinen linkki jokaiselle valitulle kohteelle"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u tiedostoa"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "Siirrä jokainen valittu kohde roskakoriin"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "Monista"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "Monista valitut kohteet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "Luo linkki"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr "Siirrä jokainen valittu kohde roskakoriin"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Move to Trash"
 msgstr "Siirrä roskakoriin"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "Uusi hakemisto"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
-msgid "New _Folder"
-msgstr "Uusi _hakemisto"
-
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "Avaa"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#, fuzzy
+msgid "Open Wit_h"
+msgstr "Avaa ohjelmalla"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "Avaa ohjelmalla"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "Avaa jokainen valittu kohde uudessa ikkunassa"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr "Avaa uudessa ikkunassa"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Avaa valittu kohde tässä ikkunassa"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "Muu sovellus..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "Muu katselin..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
-msgid "Other _Application..."
-msgstr "Muu _sovellus..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "_Liitä tekstiä"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Other _Viewer..."
-msgstr "Muu _katselin..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr "Poista mukautetut kuvat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr "Poista kaikki valittujen kuvakkeiden mukautetut kuvat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr "Poista tämän sijainnin taustan omat kuviot tai värit."
 
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "Palauta tausta"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#, fuzzy
+msgid "Scripts"
+msgstr "Salaisuus"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr "Valitse kaikki tiedostot"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#, fuzzy
+msgid "Select _All Files"
+msgstr "Valitse kaikki tiedostot"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "Valitse tämän ikkunan kaikki kohteet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr "Näytä ominaisuudet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Show Trash"
 msgstr "Näytä roskakori"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "_Näytä ominaisuudet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "Show the contents of the Trash"
 msgstr "Näytä roskakorin sisältö"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "Katsele tai muokkaa jokaisen valitun kohteen ominaisuuksia"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "_Monista"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#, fuzzy
+msgid "_New Folder"
+msgstr "Uusi hakemisto"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "_Avaa"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
-msgid "_Open in New Window"
-msgstr "Avaa _uudessa ikkunassa"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
-msgid "_Select All Files"
-msgstr "_Valitse kaikki tiedostot"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "_Liitä tekstiä"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Show Trash"
 msgstr "_Näytä roskakori"
 
@@ -7697,7 +8268,7 @@ msgstr ""
 
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr "Luetteloinnin tila"
 
@@ -7715,11 +8286,11 @@ msgstr ""
 msgid "Your files were last indexed at %s"
 msgstr "Tiedostosi luetteloitiin viimeksi %s"
 
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "Päivitä nyt"
 
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast.  Your files are currently being indexed."
@@ -7727,11 +8298,11 @@ msgstr ""
 "Kerran päivässä tiedostosi ja tekstitiedostojen sisällöt luetteloidaan, "
 "jotta etsintäsi olisivat nopeita. Tiedostosi luetteloituvat parhaillaan."
 
-#: src/file-manager/nautilus-indexing-info.c:404
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Valitettavasti Medusa-etsintäpalvelu ei ole saatavilla."
 
-#: src/file-manager/nautilus-indexing-info.c:426
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr "%H:%M, %x"
 
@@ -7765,14 +8336,33 @@ msgstr "Tietoja Nautiluksesta"
 msgid "Authors"
 msgstr "Tekijät"
 
-#: src/nautilus-application.c:274
+#: src/nautilus-application.c:275
 msgid "Couldn't Create Required Folder"
 msgstr "Vaadittua hakemistoa ei voitu luoda"
 
-#: src/nautilus-application.c:279
+#: src/nautilus-application.c:276
+#, c-format
+msgid ""
+"Nautilus could not create the required folder \"%s\". Before running "
+"Nautilus, please create this folder, or set permissions such that Nautilus "
+"can create it."
+msgstr ""
+
+#: src/nautilus-application.c:281
 msgid "Couldn't Create Required Folders"
 msgstr "Vaadittuja hakemistoja ei voitu luoda"
 
+#: src/nautilus-application.c:282
+#, c-format
+msgid ""
+"Nautilus could not create the following required folders:\n"
+"\n"
+"%s\n"
+"\n"
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
+msgstr ""
+
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.oaf file. This has happened when you
 #. * launch Nautilus with an LD_LIBRARY_PATH that
@@ -7783,7 +8373,7 @@ msgstr "Vaadittuja hakemistoja ei voitu luoda"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:404
+#: src/nautilus-application.c:407
 msgid ""
 "Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
 "from the console may fix the problem. If not, you can try rebooting the "
@@ -7794,7 +8384,7 @@ msgstr ""
 "käynnistää tietokoneesi uudelleen ja asentaa Nautiluksen uudestaan."
 
 #. FIXME bugzilla.eazel.com 2536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:410
+#: src/nautilus-application.c:413
 msgid ""
 "Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
 "from the console may fix the problem. If not, you can try rebooting the "
@@ -7838,12 +8428,12 @@ msgstr ""
 #. * wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:441 src/nautilus-application.c:459
-#: src/nautilus-application.c:466
+#: src/nautilus-application.c:444 src/nautilus-application.c:462
+#: src/nautilus-application.c:469
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilusta ei voi käyttää nyt odottamattoman virheen takia."
 
-#: src/nautilus-application.c:442
+#: src/nautilus-application.c:445
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
 "attempting to register the file manager view server."
@@ -7851,7 +8441,7 @@ msgstr ""
 "Nautilusta ei voi käyttää nyt, koska OAF ilmoitti odottamattomasta virheestä "
 "tiedostonhallintanäkymää rekisteröidessä."
 
-#: src/nautilus-application.c:460
+#: src/nautilus-application.c:463
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
 "attempting to locate the factory.Killing oafd and restarting Nautilus may "
@@ -7861,7 +8451,7 @@ msgstr ""
 "tehdasta paikantaessa. Oafd:n sulkeminen ja Nautiluksen käynnistäminen "
 "uudelleen saattaa korjata ongelman."
 
-#: src/nautilus-application.c:467
+#: src/nautilus-application.c:470
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
 "attempting to locate the shell object. Killing oafd and restarting Nautilus "
@@ -7871,7 +8461,7 @@ msgstr ""
 "komentotulkkioliota paikantaessa. Oafd:n sulkeminen ja Nautiluksen "
 "käynnistäminen uudelleen saattaa korjata ongelman."
 
-#: src/nautilus-application.c:632
+#: src/nautilus-application.c:635
 msgid ""
 "You are about to run Nautilus as root.\n"
 "\n"
@@ -7884,10 +8474,6 @@ msgstr ""
 "järjestelmääsi, jos olet varomaton, ja Nautilus ei estä sinua\n"
 "tekemästä tätä."
 
-#: src/nautilus-application.c:636
-msgid "Quit"
-msgstr "Lopeta"
-
 #: src/nautilus-bookmarks-window.c:127
 msgid "Bookmarks"
 msgstr "Kirjanmerkit"
@@ -7896,7 +8482,7 @@ msgstr "Kirjanmerkit"
 msgid "Location"
 msgstr "Sijainti"
 
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:749
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Poista"
 
@@ -7913,12 +8499,13 @@ msgstr "Vähemmän valintoja"
 msgid "Find Them!"
 msgstr "Etsi!"
 
-#: src/nautilus-first-time-druid.c:180
+#: src/nautilus-first-time-druid.c:191
+#, fuzzy
 msgid ""
-"Existence of this file indicates that the Nautilus configuration wizard\n"
+"Existence of this file indicates that the Nautilus configuration druid\n"
 "has been presented.\n"
 "\n"
-"You can manually erase this file to present the wizard again.\n"
+"You can manually erase this file to present the druid again.\n"
 "\n"
 msgstr ""
 "Tämän tiedoston olemassaolo tarkoittaa, että Nautiluksen asetusvelho\n"
@@ -7927,17 +8514,7 @@ msgstr ""
 "Voit poistaa tämän tiedoston, jos haluat käydä velhon läpi uudestaan.\n"
 "\n"
 
-#. Note to localizers: this font is used for title text in
-#. * the first time druid
-#: src/nautilus-first-time-druid.c:342
-msgid "helvetica"
-msgstr "helvetica"
-
-#: src/nautilus-first-time-druid.c:342
-msgid "medium"
-msgstr "keskivahva"
-
-#: src/nautilus-first-time-druid.c:471
+#: src/nautilus-first-time-druid.c:487
 msgid ""
 "Your user level adjusts Nautilus to your degree of experience\n"
 "using GNOME and Linux. Choose a level that's comfortable for\n"
@@ -7947,7 +8524,7 @@ msgstr ""
 "kokemuksesi mukaan. Valitse nyt taso, jonka luulet sopivan\n"
 "itsellesi. Voit vaihtaa sen halutessasi myöhemmin."
 
-#: src/nautilus-first-time-druid.c:482
+#: src/nautilus-first-time-druid.c:498
 msgid ""
 "For users who have no previous experience with GNOME\n"
 "and Linux."
@@ -7955,7 +8532,7 @@ msgstr ""
 "Käyttäjille, joilla ei ole aikaisempaa kokemusta Gnomesta\n"
 "tai Linuxista."
 
-#: src/nautilus-first-time-druid.c:488
+#: src/nautilus-first-time-druid.c:504
 msgid ""
 "For users who are comfortable with GNOME and Linux,\n"
 "but don't describe themselves as ``technical.''"
@@ -7963,7 +8540,7 @@ msgstr ""
 "Käyttäjille, jotka ovat tutustuneet Gnomeen ja Linuxiin, \n"
 "mutta eivät pidä itseään mitenkään \"teknisinä\"."
 
-#: src/nautilus-first-time-druid.c:494
+#: src/nautilus-first-time-druid.c:510
 msgid ""
 "For users who have GNOME and Linux experience, and\n"
 "like to see every detail of the operating system."
@@ -7971,7 +8548,7 @@ msgstr ""
 "Käyttäjille, joilla on kokemusta Gnomesta ja Linuxista ja\n"
 "jotka haluavat nähdä kaikki käyttöjärjestelmänsä pikkuasiat."
 
-#: src/nautilus-first-time-druid.c:532
+#: src/nautilus-first-time-druid.c:548
 msgid ""
 "To verify your Internet connection and make sure you have\n"
 "the latest Nautilus updates, Nautilus will now connect to\n"
@@ -7991,15 +8568,15 @@ msgstr ""
 "Jos tiedät, että tietokoneesi käyttää välityspalvelinta, niin\n"
 "napsauta \"Tarkista\", ja Nautiluskin käyttää sitä.\n"
 
-#: src/nautilus-first-time-druid.c:546
+#: src/nautilus-first-time-druid.c:562
 msgid "Verify my connection and check for updates"
 msgstr "Tarkista yhteyteni ja etsi päivityksiä"
 
-#: src/nautilus-first-time-druid.c:547
+#: src/nautilus-first-time-druid.c:563
 msgid "Don't verify my connection or check for updates"
 msgstr "Älä tarkista yhteyttä tai etsi päivityksiä"
 
-#: src/nautilus-first-time-druid.c:612
+#: src/nautilus-first-time-druid.c:628
 msgid ""
 "We are having trouble making an external web connection.\n"
 "Sometimes, firewalls require you to specify a web proxy server.\n"
@@ -8010,28 +8587,28 @@ msgstr ""
 "palomuurien takia. Jos välityspalvelin on, niin kirjoita  \n"
 "alla olevaan laatikkoon sen portti tai nimi."
 
-#: src/nautilus-first-time-druid.c:624
+#: src/nautilus-first-time-druid.c:640
 msgid "No proxy server required."
 msgstr "Välityspalvelinta ei tarvita."
 
-#: src/nautilus-first-time-druid.c:625
+#: src/nautilus-first-time-druid.c:641
 msgid "Use this proxy server:"
 msgstr "Käytä tätä välityspalvelinta:"
 
 #. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:650
+#: src/nautilus-first-time-druid.c:666
 msgid "Proxy address:"
 msgstr "Osoite:"
 
-#: src/nautilus-first-time-druid.c:712
+#: src/nautilus-first-time-druid.c:728
 msgid "Verifying your Internet connection and checking for updates..."
 msgstr "Tarkistaa Internet-yhteyttäsi ja etsii päivityksiä..."
 
-#: src/nautilus-first-time-druid.c:720
+#: src/nautilus-first-time-druid.c:736
 msgid "Downloading Nautilus updates..."
 msgstr "Hakee Nautiluksen päivityksiä..."
 
-#: src/nautilus-first-time-druid.c:873
+#: src/nautilus-first-time-druid.c:906
 msgid ""
 "If you have been using the GNOME Midnight Commander\n"
 "these settings move your desktop icons to Nautilus and\n"
@@ -8041,19 +8618,35 @@ msgstr ""
 "asetukset siirtävät työpöydän kuvakkeesi Nautilukseen ja\n"
 "tekevät Nautiluksesta oletustyöpöydän.\n"
 
-#: src/nautilus-first-time-druid.c:880
+#: src/nautilus-first-time-druid.c:913
 msgid "Use Nautilus to draw the desktop."
 msgstr "Piirrä työpöytä Nautiluksella."
 
-#: src/nautilus-first-time-druid.c:886
+#: src/nautilus-first-time-druid.c:919
 msgid "Move existing desktop icons to the Nautilus desktop."
 msgstr "Siirrä olemassa olevat työpöydän kuvakkeet Nautiluksen työpöydälle."
 
-#: src/nautilus-first-time-druid.c:891
+#. This option is currently disabled, per bugzilla.eazel.com 7557
+#: src/nautilus-first-time-druid.c:927
 msgid "Launch Nautilus when GNOME starts up."
 msgstr "Käynnistä Nautilus Gnomen käynnistyessä."
 
-#: src/nautilus-first-time-druid.c:926
+#: src/nautilus-first-time-druid.c:967
+#, fuzzy
+msgid ""
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties.  The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+"Fast search requires that the cron daemon on your system be running.\n"
+msgstr ""
+"Nopea etsintä luetteloi tietokoneesi asemien kaikki kohteet.\n"
+"Se nopeuttaa etsintää ja mahdollistaa tiedostojen sisällön\n"
+"perusteella etsimisen, sekä myös nimi-, päivämäärä- ja tiedosto-\n"
+"ominaisuushaut. Luettelointi vie aikaa, mutta se tapahtuu vain\n"
+"kuin tietokoneesi on jouten.\n"
+
+#: src/nautilus-first-time-druid.c:972
 msgid ""
 "The fast search feature indexes all the items on your hard disk.\n"
 "It speeds up searching and allows you to search by file content\n"
@@ -8066,44 +8659,43 @@ msgstr ""
 "ominaisuushaut. Luettelointi vie aikaa, mutta se tapahtuu vain\n"
 "kuin tietokoneesi on jouten.\n"
 
-#: src/nautilus-first-time-druid.c:934
+#: src/nautilus-first-time-druid.c:981
 msgid "Enable fast search"
 msgstr "Käytä nopeaa etsintää"
 
-#: src/nautilus-first-time-druid.c:1028
-msgid "Nautilus First Time Setup"
-msgstr "Nautiluksen ensi kerran asennus"
-
-#: src/nautilus-first-time-druid.c:1058
-msgid "Welcome to Nautilus"
-msgstr "Tervetuloa Nautilukseen"
+#: src/nautilus-first-time-druid.c:982
+msgid "Turn fast search on when cron is enabled"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:1060
+#: src/nautilus-first-time-druid.c:1027
 msgid ""
-"Nautilus is part of your GNOME desktop environment. It\n"
-"helps you manage your files and folders (directories),\n"
-"view documents, connect to the Internet, and do many\n"
-"other tasks.\n"
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"currently can't be performed because the program crond, which does\n"
+"nightly tasks on your computer, is turned off. To make sure fast searches\n"
+"can be done, turn crond on.\n"
 "\n"
-"The next four screens ask about your level of Linux\n"
-"experience, and check your Internet connection. Click Next\n"
-"to continue."
-msgstr ""
-"Nautilus on osa GNOME-työpöytäsi ympäristöä. Se auttaa\n"
-"tiedostojen ja hakemistojen (kansioiden) käsittelyssä,\n"
-"asiakirjojen katselussa, Internet-yhteydessä ja monissa\n"
-"muissakin töissä.\n"
+"If you are running Linux, you can log in as root and type these commands \n"
+"to start cron:\n"
 "\n"
-"Seuraavat neljä ruutua kysyvät Linux-kokemuksestasi ja\n"
-"tarkistavat Internet-yhteytesi. Napsauta \"Seuraava\"\n"
-"jatkaaksesi."
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
 
-#. set up the final page
-#: src/nautilus-first-time-druid.c:1072
-msgid "Finished"
-msgstr "Valmis"
+#: src/nautilus-first-time-druid.c:1035
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"may not be performed because the program crond, which does nightly tasks\n"
+"on your computer, may be turned off. To make sure fast searches can be\n"
+"done, check to make sure that crond is turned on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands\n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:1079
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
 "Click Finish to launch Nautilus. You'll start with two\n"
 "Nautilus windows: one shows your home folder, and the\n"
@@ -8119,42 +8711,86 @@ msgstr ""
 "\n"
 "Toivomme, että pidät Nautiluksesta!"
 
+#: src/nautilus-first-time-druid.c:1129
+#, fuzzy
+msgid ""
+"Click Finish to launch Nautilus. You'll start with a\n"
+"window showing your home folder.\n"
+"\n"
+"We hope you enjoy Nautilus!"
+msgstr ""
+"Napsauta \"Valmis\" käynnistääksesi Nautiluksen. Saat esille\n"
+"kaksi ikkunaa: toinen näyttää kotihakemistosi ja toinen kertoo\n"
+"Eazel-palveluista, jotka tekevät Linux-käyttäjän elämää\n"
+"helpommaksi.\n"
+"\n"
+"Toivomme, että pidät Nautiluksesta!"
+
+#: src/nautilus-first-time-druid.c:1153
+msgid "Nautilus First Time Setup"
+msgstr "Nautiluksen ensi kerran asennus"
+
+#: src/nautilus-first-time-druid.c:1183
+msgid "Welcome to Nautilus"
+msgstr "Tervetuloa Nautilukseen"
+
+#: src/nautilus-first-time-druid.c:1185
+msgid ""
+"Nautilus...\n"
+"    Is a great file manager for the GNOME desktop.\n"
+"    Provides a simple intuitive way to access Internet services.\n"
+"    Is an extensible framework for GNOME developers.\n"
+"    Provides a powerful delivery platform for service providers.\n"
+"\n"
+"Click Next to begin customizing your Nautilus environment."
+msgstr ""
+
+#. set up the final page
+#: src/nautilus-first-time-druid.c:1196
+msgid "Finished"
+msgstr "Valmis"
+
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1088
+#: src/nautilus-first-time-druid.c:1209
 msgid "Choose Your User Level"
 msgstr "Valitse käyttäjätaso"
 
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1092
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr "GMC:stä Nautilukseen siirtyminen"
 
 #. set up the `Launch Medusa' page
-#: src/nautilus-first-time-druid.c:1096
+#: src/nautilus-first-time-druid.c:1217
 msgid "Fast Searches"
 msgstr "Nopeat etsinnät"
 
+#. set up optional page to tell the user how to run cron
+#: src/nautilus-first-time-druid.c:1225
+msgid "The Cron Daemon"
+msgstr ""
+
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1100
+#: src/nautilus-first-time-druid.c:1230
 msgid "Checking Your Internet Connection"
 msgstr "Tarkistaa Internet-yhteyttäsi"
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1108
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "Nautilus päivittyy..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1116
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "WWW-välityspalvelimen asetukset"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1191
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "Purkaa päivitystä..."
 
-#: src/nautilus-first-time-druid.c:1208
+#: src/nautilus-first-time-druid.c:1341
 msgid "Update Complete. Click Next to Continue."
 msgstr "Päivitys valmis. Napsauta \"Seuraava\" jatkaaksesi."
 
@@ -8162,7 +8798,7 @@ msgstr "Päivitys valmis. Napsauta \"Seuraava\" jatkaaksesi."
 #. * doesn't exist. Arlo and I (jsh) and decided that the
 #. * best thing to do is silently fail
 #.
-#: src/nautilus-first-time-druid.c:1221
+#: src/nautilus-first-time-druid.c:1356
 msgid "No Update Available... Press Next to Continue."
 msgstr "Ei päivityksiä. Napsauta \"Seuraava\" jatkaaksesi."
 
@@ -8191,238 +8827,241 @@ msgstr "Haluatko avata %d ikkunaa näiden sijaintien katselua varten?"
 msgid "View in Multiple Windows?"
 msgstr "Haluatko katsella useissa ikkunoissa?"
 
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr "Suorita nopeita itsetarkistuksia."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "Aseta luotavan ikkunan mitat annetuiksi."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "MITAT"
 
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Luo Nautilus-ikkunoita vain erikseen annetuille URI:lle."
 
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "Lopeta nautilus."
 
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "Käynnistä Nautilus uudelleen."
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: valitsinta --check ei voi käyttää URI:en kanssa.\n"
 
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 "nautilus: valitsinta --check ei voi käyttää muiden valitsinten kanssa.\n"
 
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: valitsinta --quit ei voi käyttää URI:en kanssa.\n"
 
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: valitsinta --restart ei voi käyttää URI:en kanssa.\n"
 
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 "nautilus: valitsinta --geometry ei voi käyttää yhtä useamman URI:n kanssa.\n"
 
 #. set the title and standard close accelerator
-#: src/nautilus-property-browser.c:263
+#: src/nautilus-property-browser.c:265
 msgid "Backgrounds and Emblems"
 msgstr "Taustat ja tunnusmerkit"
 
-#: src/nautilus-property-browser.c:359 src/nautilus-theme-selector.c:266
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:362 src/nautilus-theme-selector.c:267
 msgid "  Done  "
 msgstr "  Valmis  "
 
-#: src/nautilus-property-browser.c:369
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:373
 msgid "  Add new...  "
 msgstr "  Lisää uusi...  "
 
-#: src/nautilus-property-browser.c:383
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:388
 msgid "  Remove...  "
 msgstr "  Poista...  "
 
-#: src/nautilus-property-browser.c:874
+#: src/nautilus-property-browser.c:879
 #, c-format
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Valitettavasti kuviota %s ei voitu poistaa."
 
-#: src/nautilus-property-browser.c:875 src/nautilus-property-browser.c:904
+#: src/nautilus-property-browser.c:880 src/nautilus-property-browser.c:909
 msgid "Couldn't delete pattern"
 msgstr "Kuviota ei voitu poistaa"
 
-#: src/nautilus-property-browser.c:903
+#: src/nautilus-property-browser.c:908
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Valitettavasti tunnusmerkkiä %s ei voitu poistaa."
 
-#: src/nautilus-property-browser.c:939
+#: src/nautilus-property-browser.c:944
 msgid "Create a New Emblem:"
 msgstr "Lisää uusi tunnusmerkki:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:944
+#: src/nautilus-property-browser.c:949
 msgid "Keyword:"
 msgstr "Avainsana:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:957
+#: src/nautilus-property-browser.c:962
 msgid "Image:"
 msgstr "Kuva:"
 
-#: src/nautilus-property-browser.c:961
+#: src/nautilus-property-browser.c:966
 msgid "Select an image file for the new emblem:"
 msgstr "Valitse uuden tunnusmerkin kuva:"
 
-#: src/nautilus-property-browser.c:988
+#: src/nautilus-property-browser.c:993
 msgid "Create a New Color:"
 msgstr "Luo uusi väri:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:993
+#: src/nautilus-property-browser.c:998
 msgid "Color name:"
 msgstr "Värin nimi:"
 
-#: src/nautilus-property-browser.c:1004
+#: src/nautilus-property-browser.c:1009
 msgid "Color value:"
 msgstr "Väriarvo:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1045
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "\"%s\" ei ole kelvollinen tiedoston nimi."
 
-#: src/nautilus-property-browser.c:1042
+#: src/nautilus-property-browser.c:1047
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Et antanut kelvollista tiedoston nimeä."
 
-#: src/nautilus-property-browser.c:1044 src/nautilus-property-browser.c:1087
+#: src/nautilus-property-browser.c:1049 src/nautilus-property-browser.c:1092
 msgid "Couldn't install pattern"
 msgstr "Kuviota ei voitu asentaa"
 
-#: src/nautilus-property-browser.c:1055
+#: src/nautilus-property-browser.c:1060
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Et voi vaihtaa uudelleenasetuskuvaa."
 
-#: src/nautilus-property-browser.c:1086
+#: src/nautilus-property-browser.c:1091
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Valitettavasti kuviota %s ei voitu asentaa."
 
-#: src/nautilus-property-browser.c:1109
+#: src/nautilus-property-browser.c:1114
 msgid "Select an image file to add as a pattern:"
 msgstr "Valitse kuviona lisättävä kuva:"
 
-#: src/nautilus-property-browser.c:1168
+#: src/nautilus-property-browser.c:1173
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Uudelle värille pitää antaa nimi."
 
-#: src/nautilus-property-browser.c:1169
+#: src/nautilus-property-browser.c:1174
 msgid "Couldn't install color"
 msgstr "Väriä ei voitu asentaa"
 
-#: src/nautilus-property-browser.c:1225
+#: src/nautilus-property-browser.c:1230
 msgid "Select a color to add:"
 msgstr "Valitse lisättävä väri:"
 
-#: src/nautilus-property-browser.c:1306
+#: src/nautilus-property-browser.c:1311
 #, c-format
 msgid "Sorry, but '%s' is not a usable image file!"
 msgstr "Valitettavasti '%s' ei ole kelvollinen kuvatiedosto."
 
-#: src/nautilus-property-browser.c:1324
+#: src/nautilus-property-browser.c:1329
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Uudelle tunnusmerkille pitää antaa avainsana."
 
-#: src/nautilus-property-browser.c:1325 src/nautilus-property-browser.c:1328
-#: src/nautilus-property-browser.c:1332 src/nautilus-property-browser.c:1361
+#: src/nautilus-property-browser.c:1330 src/nautilus-property-browser.c:1333
+#: src/nautilus-property-browser.c:1337 src/nautilus-property-browser.c:1366
 msgid "Couldn't install emblem"
 msgstr "Tunnusmerkkiä ei voitu asentaa"
 
-#: src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1332
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
 "Valitettavasti tunnusmerkkien avainsanat voivat sisältää vain kirjaimia, "
 "tyhjää sekä numeroita."
 
-#: src/nautilus-property-browser.c:1330
+#: src/nautilus-property-browser.c:1335
 #, c-format
 msgid ""
 "Sorry, but \"%s\" is an existing keyword.  Please choose a different name "
 "for it."
 msgstr "Avainsana \"%s\" on olemassa. Valitsepa jokin toinen."
 
-#: src/nautilus-property-browser.c:1360
+#: src/nautilus-property-browser.c:1365
 #, c-format
 msgid "Sorry, but the image at %s couldn't be installed as an emblem."
 msgstr "Valitettavasti kuvaa %s ei voitu asentaa tunnusmerkiksi."
 
-#: src/nautilus-property-browser.c:2012
+#: src/nautilus-property-browser.c:2024
 msgid "Select A Category:"
 msgstr "Valitse kategoria:"
 
-#: src/nautilus-property-browser.c:2020 src/nautilus-theme-selector.c:494
+#: src/nautilus-property-browser.c:2032 src/nautilus-theme-selector.c:497
 msgid "Cancel Remove"
 msgstr "Peru poisto"
 
-#: src/nautilus-property-browser.c:2024
+#: src/nautilus-property-browser.c:2037
 msgid "  Add a New Pattern  "
 msgstr "  Lisää uusi kuvio  "
 
-#: src/nautilus-property-browser.c:2027
+#: src/nautilus-property-browser.c:2040
 msgid "  Add a New Color  "
 msgstr "  Lisää uusi väri  "
 
-#: src/nautilus-property-browser.c:2030
+#: src/nautilus-property-browser.c:2043
 msgid "  Add a New Emblem  "
 msgstr "  Lisää uusi tunnusmerkki  "
 
-#: src/nautilus-property-browser.c:2053
+#: src/nautilus-property-browser.c:2066
 msgid "Click on a pattern to remove it"
 msgstr "Napsauta kuviota poistaaksesi sen."
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2069
 msgid "Click on a color to remove it"
 msgstr "Napsauta väriä poistaaksesi sen"
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2072
 msgid "Click on an emblem to remove it"
 msgstr "Napsauta tunnusmerkkiä poistaaksesi sen"
 
-#: src/nautilus-property-browser.c:2068
+#: src/nautilus-property-browser.c:2081
 msgid "Patterns:"
 msgstr "Kuviot:"
 
-#: src/nautilus-property-browser.c:2071
+#: src/nautilus-property-browser.c:2084
 msgid "Colors:"
 msgstr "Värit:"
 
-#: src/nautilus-property-browser.c:2074
+#: src/nautilus-property-browser.c:2087
 msgid "Emblems:"
 msgstr "Tunnusmerkit:"
 
-#: src/nautilus-property-browser.c:2092
+#: src/nautilus-property-browser.c:2106
 msgid "  Remove a Pattern  "
 msgstr "  Poista kuvio  "
 
-#: src/nautilus-property-browser.c:2095
+#: src/nautilus-property-browser.c:2109
 msgid "  Remove a Color  "
 msgstr "  Poista väri  "
 
-#: src/nautilus-property-browser.c:2098
+#: src/nautilus-property-browser.c:2112
 msgid "  Remove an Emblem  "
 msgstr "  Poista tunnusmerkki  "
 
@@ -8733,15 +9372,18 @@ msgid "View as List"
 msgstr "Näytä luettelona"
 
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+#, fuzzy
+msgid " _Advanced"
 msgstr " Edistynyt"
 
 #: src/nautilus-shell-ui.xml.h:2
-msgid " Beginner"
+#, fuzzy
+msgid " _Beginner"
 msgstr " Aloittelija"
 
 #: src/nautilus-shell-ui.xml.h:3
-msgid " Intermediate"
+#, fuzzy
+msgid " _Intermediate"
 msgstr " Keskitaso"
 
 #: src/nautilus-shell-ui.xml.h:4
@@ -8783,291 +9425,305 @@ msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
 
 #: src/nautilus-shell-ui.xml.h:15
-msgid "Cut _Text"
-msgstr "_Leikkaa teksti"
-
-#: src/nautilus-shell-ui.xml.h:17
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "Näytä ikkuna, jossa voi tämän valikon kirjanmerkkejä voi muokata"
 
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr "Näytä luettelo Nautiluksen tekijöistä"
 
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr "Näytä Nautiluksen käyttöopas"
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
 msgstr ""
 "Näytä kuviot, värit ja tunnusmerkit, joilla voi muuttaa ohjelman ulkonäköä"
 
-#: src/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:19
 msgid "Display quick reference pages for Nautilus"
 msgstr "Näytä Nautiluksen pikaohjesivut"
 
-#: src/nautilus-shell-ui.xml.h:22
+#: src/nautilus-shell-ui.xml.h:20
 msgid "Display release notes for Nautilus"
 msgstr "Näytä Nautiluksen julkaisuhuomautukset"
 
-#: src/nautilus-shell-ui.xml.h:23
+#: src/nautilus-shell-ui.xml.h:21
 msgid "Display support information for Nautilus and Eazel Services"
 msgstr "Näytä Nautiluksen ja Eazel-palvelujen tukitietoja"
 
-#: src/nautilus-shell-ui.xml.h:24
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Display the latest contents of the current location"
 msgstr "Näytä nykyisen sijainnin viimeisin sisältö"
 
-#: src/nautilus-shell-ui.xml.h:25
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr "Näytä käytettävissä olevat teemat"
 
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:24
 msgid "Edit various Nautilus preferences"
 msgstr "Muuta Nautiluksen asetuksia"
 
-#: src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "Etsi"
 
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr "Unohda _historia"
 
-#: src/nautilus-shell-ui.xml.h:29
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr "Siirry Eazelin palveluihin"
 
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr "Siirry kotisijaintiin"
 
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr "Siirry sijaintiin, joka sisältää tämän sijainnin"
 
-#: src/nautilus-shell-ui.xml.h:32
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr "Siirry seuraavaan sijaintiin"
 
-#: src/nautilus-shell-ui.xml.h:33
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr "Siirry edelliseen sijaintiin"
 
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:440
-msgid "Hide Location Bar"
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
+#, fuzzy
+msgid "Hide Location _Bar"
 msgstr "Piilota sijaintipalkki"
 
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:428
-msgid "Hide Sidebar"
-msgstr "Piilota sivupaneeli"
-
-#: src/nautilus-shell-ui.xml.h:36 src/nautilus-window-menus.c:422
-msgid "Hide Status Bar"
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
+#, fuzzy
+msgid "Hide St_atus Bar"
 msgstr "Piilota tilarivi"
 
-#: src/nautilus-shell-ui.xml.h:37 src/nautilus-window-menus.c:434
-msgid "Hide Toolbar"
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
+#, fuzzy
+msgid "Hide _Sidebar"
+msgstr "Piilota sivupaneeli"
+
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
+#, fuzzy
+msgid "Hide _Toolbar"
 msgstr "Piilota työkalupalkki"
 
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:37
 msgid "Nautilus Quick _Reference"
 msgstr "Nautiluksen _pikaohje"
 
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:38
 msgid "Nautilus Release _Notes"
 msgstr "Nautiluksen _julkaisuhuomautukset"
 
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:39
 msgid "Nautilus User _Manual"
 msgstr "Nautiluksen _käyttöopas"
 
-#: src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "Uusi ikkuna"
 
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:41
+#, fuzzy
+msgid "New _Window"
+msgstr "Uusi ikkuna"
+
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "Tavallinen koko"
 
-#: src/nautilus-shell-ui.xml.h:44
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Avaa nykyinen sijainti toisessa Nautiluksen ikkunassa"
 
-#: src/nautilus-shell-ui.xml.h:46
-msgid "Preferences..."
-msgstr "Asetukset..."
-
-#: src/nautilus-shell-ui.xml.h:47
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "Päivitä"
 
-#: src/nautilus-shell-ui.xml.h:48
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "Poistaa valitun tekstin kopioimatta sitä leikepöydälle"
-
-#: src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr "Näytä profiloinnin tulokset"
 
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr "Alusta profilointi"
 
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr "Etsi World Wide Webistä"
 
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr "Etsi tästä tietokoneesta tiedostoja"
 
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
 msgstr ""
 "Näytä sivu, jolta voi lähettää palautetta Nautiluksesta ja Eazel-palveluista."
 
-#: src/nautilus-shell-ui.xml.h:54
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "Näytä sisältö tavallisen kokoisena"
 
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "Näytä vähemmän tietoja sisällöstä"
 
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "Näytä lisää tietoja sisällöstä"
 
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr "Aloita profilointi"
 
-#: src/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr "Lopeta profilointi"
 
-#: src/nautilus-shell-ui.xml.h:60
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr "Lopeta tämän sijainnin lataaminen"
 
-#: src/nautilus-shell-ui.xml.h:61
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "Kumoa viimeisin tekstin muutos"
 
-#: src/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "Ylös"
 
-#: src/nautilus-shell-ui.xml.h:63
-msgid "Use Advanced settings"
-msgstr "Käytä edistyneen käyttäjän asetuksia"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:64
-msgid "Use Beginner settings"
-msgstr "Käytä aloittelijan asetuksia"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:65
-msgid "Use Intermediate settings"
-msgstr "Käytä keskitason käyttäjän asetuksia"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:66
+#: src/nautilus-shell-ui.xml.h:63
+#, fuzzy
+msgid "We_b Search"
+msgstr "Etsi WWW:stä"
+
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "Etsi WWW:stä"
 
-#: src/nautilus-shell-ui.xml.h:67
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "Suurenna"
 
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "Pienennä"
 
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "_Suurenna"
 
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "_Pienennä"
 
-#: src/nautilus-shell-ui.xml.h:71
-msgid "_About Nautilus"
+#: src/nautilus-shell-ui.xml.h:69
+#, fuzzy
+msgid "_About Nautilus..."
 msgstr "Tietoja _Nautiluksesta"
 
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "_Lisää kirjanmerkki"
 
-#: src/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "_Takaisin"
 
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr "_Taustat ja tunnusmerkit..."
 
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "_Kirjanmerkit"
 
-#: src/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "_Sulje ikkuna"
 
-#: src/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:76
 msgid "_Customer Support"
 msgstr "_Asiakaspalvelu"
 
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: src/nautilus-shell-ui.xml.h:80
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "_Muokkaa kirjanmerkkejä..."
 
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "Asetukset..."
+
+#: src/nautilus-shell-ui.xml.h:80
 msgid "_Feedback"
 msgstr "_Palaute"
 
-#: src/nautilus-shell-ui.xml.h:83 src/nautilus-window-menus.c:1306
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "_Etsi"
 
-#: src/nautilus-shell-ui.xml.h:84
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "_Eteenpäin"
 
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "_Siirry"
 
-#: src/nautilus-shell-ui.xml.h:86
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "_Ohje"
 
-#: src/nautilus-shell-ui.xml.h:87
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "_Koti"
 
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "Sijainti"
+
 #: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr "_Nautiluksen teemat..."
 
 #: src/nautilus-shell-ui.xml.h:89
-msgid "_New Window"
-msgstr "_Uusi ikkuna"
-
-#: src/nautilus-shell-ui.xml.h:90
 msgid "_Normal Size"
 msgstr "_Tavallinen koko"
 
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "Asetukset"
+
 #: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr "_Profilointi"
@@ -9085,34 +9741,26 @@ msgid "_Reset Profiling"
 msgstr "_Alusta profilointi"
 
 #: src/nautilus-shell-ui.xml.h:96
-msgid "_Select All"
-msgstr "_Valitse kaikki"
-
-#: src/nautilus-shell-ui.xml.h:97
 msgid "_Start Profiling"
 msgstr "_Aloita profilointi"
 
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr "_Lopeta profilointi"
 
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "_Kumoa"
 
-#: src/nautilus-shell-ui.xml.h:100
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "_Ylemmälle tasolle"
 
-#: src/nautilus-shell-ui.xml.h:101
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "_Näytä"
 
-#: src/nautilus-shell-ui.xml.h:102
-msgid "_Web Search"
-msgstr "Etsi _WWW:stä"
-
-#: src/nautilus-sidebar.c:659
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -9120,11 +9768,11 @@ msgstr ""
 "Voi asettaa vain yhden mukautetun kuvakkeen kerrallaan. Vedä vain yhtä "
 "kuvaketta asettaaksesi mukautetun kuvakkeen."
 
-#: src/nautilus-sidebar.c:661
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "Useampi kuin yksi kuva"
 
-#: src/nautilus-sidebar.c:680
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -9132,11 +9780,11 @@ msgstr ""
 "Pudottamasi tiedosto ei ole paikallinen. Vain paikallisia tiedostoja voi "
 "käyttää mukautettuina kuvakkeina."
 
-#: src/nautilus-sidebar.c:682
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "Vain paikalliset kuvat"
 
-#: src/nautilus-sidebar.c:687
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -9144,22 +9792,22 @@ msgstr ""
 "Pudottamasi tiedosto ei ole kuva. Vain paikallisia kuvia voi käyttää "
 "mukautettuina kuvakkeina."
 
-#: src/nautilus-sidebar.c:689
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "Vain kuvat"
 
-#: src/nautilus-sidebar.c:1247
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "Avaa ohjelmalla %s"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1283
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "Avaa ohjelmalla..."
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1390
+#: src/nautilus-sidebar.c:1424
 msgid "  Empty Trash  "
 msgstr "  Tyhjennä roskakori  "
 
@@ -9177,41 +9825,43 @@ msgstr "Nautiluksen teemavalitsin"
 msgid "Nautilus Theme:"
 msgstr "Nautiluksen teema:"
 
-#: src/nautilus-theme-selector.c:276
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:278
 msgid "  Add New Theme  "
 msgstr "  Lisää uusi teema  "
 
-#: src/nautilus-theme-selector.c:285
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:288
 msgid "  Remove Theme  "
 msgstr "  Poista teema  "
 
-#: src/nautilus-theme-selector.c:397
+#: src/nautilus-theme-selector.c:400
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid theme folder."
 msgstr "Valitettavasti \"%s\" ei ole kelvollinen teemahakemisto."
 
-#: src/nautilus-theme-selector.c:398
+#: src/nautilus-theme-selector.c:401
 msgid "Couldn't add theme"
 msgstr "Teemaa ei voitu lisätä"
 
-#: src/nautilus-theme-selector.c:426
+#: src/nautilus-theme-selector.c:429
 #, c-format
 msgid "Sorry, but the \"%s\" theme couldn't be installed."
 msgstr "Valitettavasti teemaa \"%s\" ei voitu asentaa."
 
-#: src/nautilus-theme-selector.c:427
+#: src/nautilus-theme-selector.c:430
 msgid "Couldn't install theme"
 msgstr "Teemaa ei voitu asentaa"
 
-#: src/nautilus-theme-selector.c:460
+#: src/nautilus-theme-selector.c:463
 msgid "Select a theme folder to add as a new theme:"
 msgstr "Valitse teemana asennettava teemahakemisto:"
 
-#: src/nautilus-theme-selector.c:492 src/nautilus-theme-selector.c:539
+#: src/nautilus-theme-selector.c:495 src/nautilus-theme-selector.c:542
 msgid "Click on a theme to remove it."
 msgstr "Napsauta teemaa poistaaksesi sen."
 
-#: src/nautilus-theme-selector.c:542
+#: src/nautilus-theme-selector.c:545
 msgid ""
 "Click on a theme to change the\n"
 "appearance of Nautilus."
@@ -9220,11 +9870,11 @@ msgstr ""
 "Nautiluksen ulkonäköä."
 
 #. change the add button label back to it's normal state
-#: src/nautilus-theme-selector.c:555
+#: src/nautilus-theme-selector.c:558
 msgid "Add New Theme"
 msgstr "Lisää uusi teema"
 
-#: src/nautilus-theme-selector.c:582
+#: src/nautilus-theme-selector.c:585
 msgid ""
 "Sorry, but you can't remove the current theme. Please change to another "
 "theme before removing this one."
@@ -9232,29 +9882,34 @@ msgstr ""
 "Valitettavasti et voi poistaa nykyistä teemaa. Valitse joku muu teema ennen "
 "tämän teeman poistamista"
 
-#: src/nautilus-theme-selector.c:584
+#: src/nautilus-theme-selector.c:587
 msgid "Can't delete current theme"
 msgstr "Nykyistä teemaa ei voi poistaa"
 
-#: src/nautilus-theme-selector.c:605
+#: src/nautilus-theme-selector.c:608
 msgid "Sorry, but that theme could not be removed!"
 msgstr "Valitettavasti tätä teemaa ei voitu poistaa."
 
-#: src/nautilus-theme-selector.c:606
+#: src/nautilus-theme-selector.c:609
 msgid "Couldn't remove theme"
 msgstr "Teemaa ei voitu poistaa"
 
-#: src/nautilus-theme-selector.c:713
+#: src/nautilus-theme-selector.c:716
 #, c-format
 msgid "No description available for the \"%s\" theme"
 msgstr "Teeman \"%s\" kuvausta ei ole saatavilla"
 
+#: src/nautilus-window.c:637
+#, fuzzy
+msgid "View as ..."
+msgstr "Katsele muuna muotona..."
+
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1113
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "Katsele muuna muotona..."
 
-#: src/nautilus-window.c:1476
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "Sulje"
 
@@ -9268,11 +9923,11 @@ msgstr "Sulje"
 msgid "Preview Release %s: %s"
 msgstr "Esiversio %s: %s"
 
-#: src/nautilus-window-manage-views.c:798
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "Katselu epäonnistui"
 
-#: src/nautilus-window-manage-views.c:809
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
@@ -9281,12 +9936,12 @@ msgstr ""
 "Näkymä %s ei voi jatkaa toimintaansa, koska tapahtui virhe. Voit valita muun "
 "näkymän tai siirtyä toiseen sijaintiin."
 
-#: src/nautilus-window-manage-views.c:820
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "Näkymässä %s tapahtui virhe sen käynnistyessä."
 
-#: src/nautilus-window-manage-views.c:975
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
@@ -9294,7 +9949,7 @@ msgstr ""
 "Jossakin sivupaneelissa tapahtui virhe, joten se ei voi jatkaa. "
 "Valitettavasti ei saatu selville, mikä se niistä oli."
 
-#: src/nautilus-window-manage-views.c:979
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
@@ -9303,17 +9958,17 @@ msgstr ""
 "Sivupaneeli %s ei voi jatkaa toimintaansa, koska tapahtui virhe. Jos tätä "
 "ilmenee jatkuvasti, voit poistaa kyseisen paneelin käytöstä."
 
-#: src/nautilus-window-manage-views.c:984
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "Virhe sivupaneelissa"
 
-#: src/nautilus-window-manage-views.c:1194
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr ""
 "Sijaintia \"%s\" ei löytynyt. Tarkasta oikeinkirjoitus ja yritä uudelleen."
 
-#: src/nautilus-window-manage-views.c:1200
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
@@ -9321,7 +9976,7 @@ msgstr ""
 "\"%s\" ei ole kelvollinen sijainti. Tarkasta oikeinkirjoitus ja yritä "
 "uudelleen."
 
-#: src/nautilus-window-manage-views.c:1214
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -9329,32 +9984,32 @@ msgid ""
 msgstr ""
 "Sijaintia \"%s\" ei voitu näyttää, koska Nautilus ei tiedä sen tyyppiä."
 
-#: src/nautilus-window-manage-views.c:1222
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr ""
 "Nautilukseen ei ole asennettu katselinta, joka voisi näyttää kohteen \"%s\"."
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1234
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 "Ei voitu näyttää kohdetta \"%s\", koska Nautilus ei voi käsitellä %s: "
 "-sijainteja."
 
-#: src/nautilus-window-manage-views.c:1240
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr ""
 "Ei voitu näyttää kohdetta \"%s\", koska sisään kirjautuminen epäonnistui."
 
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "Ei voitu näyttää kohdetta \"%s\", koska oikeudet eivät riittäneet."
 
-#: src/nautilus-window-manage-views.c:1256
+#: src/nautilus-window-manage-views.c:1287
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
@@ -9364,7 +10019,7 @@ msgstr ""
 "löytynyt. Varmista että se on oikein kirjoitettu ja että "
 "välityspalvelinasetukset ovat kunnossa."
 
-#: src/nautilus-window-manage-views.c:1264
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -9373,7 +10028,7 @@ msgstr ""
 "Ei voitu näyttää kohdetta \"%s\", koska isäntäkoneen nimi oli tyhjä. "
 "Varmista, että välityspalvelinasetukset ovat kunnossa."
 
-#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -9384,23 +10039,23 @@ msgstr ""
 "ei ole käynnissä. Varmista, että olet käynnistänyt Medusa-etsintäpalvelun. "
 "Jos sinulla ei ole luetteloa vielä, niin käynnistä myös Medusa-luettelin."
 
-#: src/nautilus-window-manage-views.c:1280
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "Etsintäpalvelu ei ole saatavilla"
 
-#: src/nautilus-window-manage-views.c:1284
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus ei voi näyttää sijaintia \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1289
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "Sijaintia ei voi näyttää"
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:313
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
@@ -9408,37 +10063,41 @@ msgstr ""
 "Oletko varma, että haluat historian unohtuvan? Jos haluat, niin joudut "
 "toistamaan sen itse."
 
-#: src/nautilus-window-menus.c:316
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
 "Oletko varma, että haluat Nautiluksen unohtavan, missä paikoissa olet käynyt?"
 
-#: src/nautilus-window-menus.c:321
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "Haluatko, että historia unohtuu?"
 
-#: src/nautilus-window-menus.c:322
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "Unohda"
 
-#: src/nautilus-window-menus.c:423
-msgid "Show Status Bar"
+#: src/nautilus-window-menus.c:466
+#, fuzzy
+msgid "Show St_atus Bar"
 msgstr "Näytä tilarivi"
 
-#: src/nautilus-window-menus.c:429
-msgid "Show Sidebar"
+#: src/nautilus-window-menus.c:472
+#, fuzzy
+msgid "Show _Sidebar"
 msgstr "Näytä sivupaneeli"
 
-#: src/nautilus-window-menus.c:435
-msgid "Show Toolbar"
+#: src/nautilus-window-menus.c:478
+#, fuzzy
+msgid "Show _Toolbar"
 msgstr "Näytä työkalupalkki"
 
-#: src/nautilus-window-menus.c:441
-msgid "Show Location Bar"
+#: src/nautilus-window-menus.c:484
+#, fuzzy
+msgid "Show Location _Bar"
 msgstr "Näytä sijaintipalkki"
 
-#: src/nautilus-window-menus.c:490
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -9448,11 +10107,11 @@ msgstr "Asetukset"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:567
+#: src/nautilus-window-menus.c:618
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
-#: src/nautilus-window-menus.c:569
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -9470,7 +10129,7 @@ msgstr ""
 #. * bottom of the about box to give credit
 #. * to the translator(s)
 #.
-#: src/nautilus-window-menus.c:578
+#: src/nautilus-window-menus.c:629
 msgid "Translator Credits"
 msgstr ""
 "Suomennos:\n"
@@ -9478,7 +10137,7 @@ msgstr ""
 "GNOME Finnish Translation Team\n"
 "http://gnome-fi.sourceforge.net/"
 
-#: src/nautilus-window-menus.c:744
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -9487,32 +10146,28 @@ msgstr ""
 "Sijainti \"%s\" ei ole olemassa. Haluatko, että kaikki siihen viittaavat "
 "kirjanmerkkisi poistetaan?"
 
-#: src/nautilus-window-menus.c:748
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "Olemattomaan sijaintiin viittaava kirjanmerkki"
 
-#: src/nautilus-window-menus.c:762
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "Sijainti \"%s\" ei ole enää olemassa"
 
-#: src/nautilus-window-menus.c:763
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "Siirry olemattomaan sijaintiin"
 
-#: src/nautilus-window-menus.c:830
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "Siirry tämän kirjanmerkin osoittamaan sijaintiin"
 
-#: src/nautilus-window-menus.c:1305
-msgid "_Browse"
-msgstr "_Selaa"
-
-#: src/nautilus-window-toolbars.c:381
+#: src/nautilus-window-toolbars.c:402
 msgid "Back"
 msgstr "Takaisin"
 
-#: src/nautilus-window-toolbars.c:383
+#: src/nautilus-window-toolbars.c:404
 msgid "Forward"
 msgstr "Eteenpäin"
 
@@ -9523,6 +10178,279 @@ msgstr "Eteenpäin"
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-iso8859-15"
 
-#: src/nautilus-zoom-control.c:592
-msgid "%d%%"
-msgstr "%d%%"
+#~ msgid "System"
+#~ msgstr "Järjestelmä"
+
+#~ msgid "Config files"
+#~ msgstr "Asetustiedostot"
+
+#~ msgid "Command Line"
+#~ msgstr "Komentorivi"
+
+#~ msgid "APIs"
+#~ msgstr "Ohjelmointirajapinnat"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Sekalaista"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Kyrillinen (KOI8-R)"
+
+#~ msgid "Verifying %s..."
+#~ msgstr "Tarkistaa %s..."
+
+#~ msgid "Failed on \"%s\""
+#~ msgstr "Virhe tiedoston \"%s\" kohdalla"
+
+#~ msgid "Checking \"%s\" (%ld/%ld)"
+#~ msgstr "\"%s\" (%ld/%ld) tarkistuu"
+
+#~ msgid "Package Contents"
+#~ msgstr "Paketin sisältö"
+
+#~ msgid "Package Title"
+#~ msgstr "Paketin nimi"
+
+#~ msgid "Installed Size: "
+#~ msgstr "Asennettu koko: "
+
+#~ msgid "<size>"
+#~ msgstr "<koko>"
+
+#~ msgid "Install Date: "
+#~ msgstr "Asennuspäivämäärä: "
+
+#~ msgid "<unknown>"
+#~ msgstr "<tuntematon>"
+
+#~ msgid "License: "
+#~ msgstr "Lisenssi: "
+
+#~ msgid "Build Date: "
+#~ msgstr "Tekopäivämäärä: "
+
+#~ msgid "Distribution: "
+#~ msgstr "Jakelu: "
+
+#~ msgid "Vendor: "
+#~ msgstr "Toimittaja: "
+
+#~ msgid "Update"
+#~ msgstr "Päivitä"
+
+#~ msgid "Uninstall"
+#~ msgstr "Poista asennus"
+
+#~ msgid "Verify"
+#~ msgstr "Tarkista"
+
+#~ msgid "Package Contents: %d files"
+#~ msgstr "Paketin sisältö: %d tiedostoa"
+
+#~ msgid "Package \"%s\" "
+#~ msgstr "Paketti \"%s\""
+
+#~ msgid "Verification completed, package ok."
+#~ msgstr "Tarkistus valmis, paketti on kunnossa."
+
+#~ msgid "%s would not work anymore\n"
+#~ msgstr "%s ei toiminut enää\n"
+
+#~ msgid "%s would break other installed packages\n"
+#~ msgstr "%s rikkoisi muita asennettuja paketteja\n"
+
+#~ msgid "%s is needed, but could not be found\n"
+#~ msgstr "%s tarvitaan, mutta sitä ei löytynyt\n"
+
+#~ msgid "%s causes a circular dependency problem\n"
+#~ msgstr "%s aiheuttaa kehäriippuvuusongelman\n"
+
+#~ msgid "Cannot access the local package system\n"
+#~ msgstr "Ei voi käyttää paikallista pakettijärjestelmää\n"
+
+#~ msgid "Installing %s failed because of the following issue(s):\n"
+#~ msgstr "Paketin %s asennus epäonnistui seuraavista syistä:\n"
+
+#~ msgid "Uninstalling %s failed because of the following issue(s):\n"
+#~ msgstr "Paketin %s asennuksen poisto epäonnistui seuraavista syistä:\n"
+
+#~ msgid "Uninstall failed..."
+#~ msgstr "Asennuksen poistaminen epäonnistui..."
+
+#~ msgid "Uninstall Failed"
+#~ msgstr "Asennuksen poistaminen epäonnistui"
+
+#~ msgid "Install Failed"
+#~ msgstr "Asennus epäonnistui"
+
+#~ msgid "Factory for rpm view"
+#~ msgstr "Tehdas, joka tuottaa RPM-näkymiä"
+
+#~ msgid "Package"
+#~ msgstr "Paketti"
+
+#~ msgid "Package Viewer"
+#~ msgstr "Pakettikatselin"
+
+#~ msgid "RPM component"
+#~ msgstr "RPM-komponentti"
+
+#~ msgid "RPM view factory"
+#~ msgstr "RPM-näkymätehdas"
+
+#~ msgid "View as Package"
+#~ msgstr "Näytä pakettina"
+
+#~ msgid "rpm view"
+#~ msgstr "RPM-näkymä"
+
+#~ msgid "Force install"
+#~ msgstr "Asenna väkisin"
+
+#~ msgid "%s is not installed"
+#~ msgstr "%s ei ole asennettu"
+
+#~ msgid " · %s is in the Gnome menu.\n"
+#~ msgstr " . %s on Gnomen valikossa.\n"
+
+#~ msgid "Welcome, %s!"
+#~ msgstr "Tervetuloa, %s!"
+
+#~ msgid "_Fonts"
+#~ msgstr "_Kirjasimet"
+
+#~ msgid "Shared"
+#~ msgstr "Jaettu"
+
+#~ msgid "LWN.net"
+#~ msgstr "LWN.net"
+
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "Et voi siirtää tiedostoa itseensä."
+
+#~ msgid "Can't Move Onto Self"
+#~ msgstr "Ei voi siirtää itseensä"
+
+#~ msgid "You cannot throw \"%s\" into the Trash."
+#~ msgstr "Et voi heittää kohdetta \"%s\" roskakoriin."
+
+#~ msgid "Error Moving to Trash"
+#~ msgstr "Virhe siirtäessä roskakoriin"
+
+#~ msgid "Font"
+#~ msgstr "Kirjasin"
+
+#~ msgid "fixed"
+#~ msgstr "tasavälinen"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00"
+
+#~ msgid "current theme"
+#~ msgstr "nykyinen teema"
+
+#~ msgid "Use this font family to display file names:"
+#~ msgstr "Käytä tätä kirjasinperhettä tiedostojen nimien näyttämiseen:"
+
+#~ msgid "Can add Content"
+#~ msgstr "Voi lisätä sisältöä"
+
+#~ msgid "Appearance Settings"
+#~ msgstr "Ulkonäön asetukset"
+
+#~ msgid "Windows & Desktop Settings"
+#~ msgstr "Ikkunat & työpöydän asetukset"
+
+#~ msgid "Icon & List Views Settings"
+#~ msgstr "Kuvake- ja luettelonäkymien asetukset"
+
+#~ msgid "Sidebar Panels Settings"
+#~ msgstr "Sivupaneelien asetukset"
+
+#~ msgid "Navigation Settings"
+#~ msgstr "Ohjailun asetukset"
+
+#~ msgid "Speed Tradeoffs Settings"
+#~ msgstr "Nopeuden lisäämisen asetukset"
+
+#~ msgid "Search Settings"
+#~ msgstr "Etsinnän asetukset"
+
+#~ msgid "Details"
+#~ msgstr "Tiedot"
+
+#~ msgid "Warning"
+#~ msgstr "Varoitus"
+
+#~ msgid "Error"
+#~ msgstr "Virhe"
+
+#~ msgid "Question"
+#~ msgstr "Kysymys"
+
+#~ msgid "_Cut Text"
+#~ msgstr "_Leikkaa teksti"
+
+#~ msgid "Open in _New Window"
+#~ msgstr "Avaa uudessa _ikkunassa"
+
+#~ msgid "New _Folder"
+#~ msgstr "Uusi _hakemisto"
+
+#~ msgid "_Open in New Window"
+#~ msgstr "Avaa _uudessa ikkunassa"
+
+#~ msgid "_Select All Files"
+#~ msgstr "_Valitse kaikki tiedostot"
+
+#~ msgid "helvetica"
+#~ msgstr "helvetica"
+
+#~ msgid "medium"
+#~ msgstr "keskivahva"
+
+#~ msgid ""
+#~ "Nautilus is part of your GNOME desktop environment. It\n"
+#~ "helps you manage your files and folders (directories),\n"
+#~ "view documents, connect to the Internet, and do many\n"
+#~ "other tasks.\n"
+#~ "\n"
+#~ "The next four screens ask about your level of Linux\n"
+#~ "experience, and check your Internet connection. Click Next\n"
+#~ "to continue."
+#~ msgstr ""
+#~ "Nautilus on osa GNOME-työpöytäsi ympäristöä. Se auttaa\n"
+#~ "tiedostojen ja hakemistojen (kansioiden) käsittelyssä,\n"
+#~ "asiakirjojen katselussa, Internet-yhteydessä ja monissa\n"
+#~ "muissakin töissä.\n"
+#~ "\n"
+#~ "Seuraavat neljä ruutua kysyvät Linux-kokemuksestasi ja\n"
+#~ "tarkistavat Internet-yhteytesi. Napsauta \"Seuraava\"\n"
+#~ "jatkaaksesi."
+
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "Poistaa valitun tekstin kopioimatta sitä leikepöydälle"
+
+#~ msgid "Use Advanced settings"
+#~ msgstr "Käytä edistyneen käyttäjän asetuksia"
+
+#~ msgid "Use Beginner settings"
+#~ msgstr "Käytä aloittelijan asetuksia"
+
+#~ msgid "Use Intermediate settings"
+#~ msgstr "Käytä keskitason käyttäjän asetuksia"
+
+#~ msgid "_New Window"
+#~ msgstr "_Uusi ikkuna"
+
+#~ msgid "_Web Search"
+#~ msgstr "Etsi _WWW:stä"
+
+#~ msgid "_Browse"
+#~ msgstr "_Selaa"
diff --git a/po/fr.po b/po/fr.po
index f510c3bd5..8f79ca2ab 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,10 +3,15 @@
 # Jean-Michel Ardantz <jmardantz@ifrance.com>, 2000.
 # Christophe Merlet (RedFox) <redfox@eikonex.org>, 2001.
 #
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus 0.8.3\n"
-"POT-Creation-Date: 2001-03-09 18:33+0100\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-03-08 13:14+0100\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@eikonex.org>\n"
 "Language-Team: GNOME French Team <gnomefr@gnomefr.traduc.org>\n"
@@ -141,8 +146,8 @@ msgid "Previous"
 msgstr "Précédent"
 
 #: components/help/converters/gnome-db2html2/gdb3html.c:721
-#: libnautilus-extensions/nautilus-global-preferences.c:686
-#: src/nautilus-shell-ui.xml.h:38
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "Rép. perso"
 
@@ -331,16 +336,14 @@ msgid "Kernel Routines"
 msgstr "Routines du noyau"
 
 #: components/help/hyperbola-filefmt.c:703
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
 msgid "Info"
 msgstr "Info"
 
-#: components/help/hyperbola-nav-tree.c:279
+#: components/help/hyperbola-nav-tree.c:310
 msgid "Introductory Documents:"
 msgstr "Documents d'introduction :"
 
-#: components/help/hyperbola-nav-tree.c:293
+#: components/help/hyperbola-nav-tree.c:324
 msgid "Documents by Subject:"
 msgstr "Documents par sujet :"
 
@@ -413,7 +416,7 @@ msgstr "Panneau d'historique"
 msgid "History sidebar panel for Nautilus"
 msgstr "Panneau d'historique de Nautilus"
 
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "Impossible d'initialiser Bonobo"
 
@@ -471,7 +474,7 @@ msgstr "Détruit la vue « Loser »"
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "_Fichier"
 
@@ -555,7 +558,7 @@ msgid "Sidebar Loser"
 msgstr "Panneau « Loser »"
 
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -565,7 +568,7 @@ msgstr ""
 "  %s"
 
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -1012,7 +1015,6 @@ msgid "Oldies"
 msgstr "Vieux"
 
 #: components/music/mpg123.c:32
-#: libnautilus-extensions/nautilus-font-picker.c:117
 msgid "Other"
 msgstr "Autres"
 
@@ -1652,10 +1654,10 @@ msgid "Pause"
 msgstr "Pause"
 
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:945
-#: libnautilus-extensions/nautilus-file-operations.c:960
 #: libnautilus-extensions/nautilus-file-operations.c:979
-#: src/nautilus-shell-ui.xml.h:60
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Arrêt"
 
@@ -1705,23 +1707,6 @@ msgstr ""
 msgid "View as Music"
 msgstr "Voir en tant que Musique"
 
-#. FIXME: eventually, get this from preferences
-#. set up the default font
-#: components/notes/nautilus-notes.c:200
-#: components/text/nautilus-text-view.c:186
-#: libnautilus-extensions/nautilus-global-preferences.c:1118
-#: libnautilus-extensions/nautilus-icon-container.c:3332
-#: libnautilus-extensions/nautilus-icon-container.c:3333
-#: libnautilus-extensions/nautilus-icon-container.c:3334
-#: libnautilus-extensions/nautilus-icon-container.c:3335
-#: libnautilus-extensions/nautilus-icon-container.c:3336
-#: libnautilus-extensions/nautilus-icon-container.c:3337
-#: libnautilus-extensions/nautilus-icon-container.c:3338
-#: libnautilus-extensions/nautilus-preferences-item.c:482
-#: src/nautilus-sidebar-title.c:500
-msgid "helvetica"
-msgstr "helvetica"
-
 #: components/notes/Nautilus_View_notes.oaf.in.h:1
 msgid "Factory for annotation view"
 msgstr ""
@@ -1813,7 +1798,7 @@ msgstr "Spécifier cgi de recherche"
 #: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
 #: components/services/install/command-line/eazel-test-packsys.c:590
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "Afficher la sortie de débogage"
 
@@ -1877,171 +1862,174 @@ msgstr "Les arguments RPM sont des fichiers"
 msgid "Run Query"
 msgstr "Lancer la requête"
 
-#. Disabled for 1.0
-#. {"revert", 'r', POPT_ARG_NONE, &arg_revert, 0, N_("Revert"), NULL},
-#: components/services/install/command-line/eazel-alt-install-corba.c:127
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
+#, fuzzy
+msgid "Revert"
+msgstr "jamais"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr "Se positionner root"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:128
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "Spécifier le serveur"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:129
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
 msgid "Dont print too much, just problems and download"
 msgstr "Ne pas trop afficher, juste les problèmes et le téléchargement"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:130
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr "Changer le nom via ssl"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:131
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
 msgid "argument is a suite id"
 msgstr "l'argument est un identificateur de suite"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "Tester le lancement"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr "Autorise l'utilisateur"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:134
-#: components/services/install/lib/eazel-install-problem.c:1011
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "Autorise la mise à jour"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "Afficher trace"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:136
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
 msgid "Install a specific package version"
 msgstr "Installe une version spécifique du paquet"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:159
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
 msgid "*** You cannot specify more then one protocol type.\n"
 msgstr "*** Vous ne pouvez spécifier plus d'un type de protocole.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:176
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
 msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
 msgstr "*** Efface et annule ?\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:285
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, c-format
 msgid "File conflict checking %s...\n"
 msgstr "Vérification de conflit de fichier %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:299
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, c-format
 msgid "File uniqueness checking %s...\n"
 msgstr "Vérification de l'unicité des fichiers %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:313
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
 #, c-format
 msgid "Feature consistency checking %s...\n"
 msgstr "Verification de l'homogéneité des fonctionalités %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:344
-#: components/services/install/lib/eazel-install-protocols.c:110
-#: components/services/install/lib/eazel-install-protocols.c:248
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
 #, c-format
 msgid "Downloading %s..."
 msgstr "Téléchargement de %s..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:360
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
 msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
 msgstr "Téléchargement de %s... (%d/%d) = %d%% %.1f ko/s"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:368
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
 msgid "Downloading %s... (%d/%d) = %d%%"
 msgstr "Téléchargement de %s... (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:376
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
 #, c-format
 msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
 msgstr "Téléchargement de %s... (%d/%d) %.1f ko/s effectué\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:381
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
 #, c-format
 msgid "Downloading %s... %3.1f KB/s Done\n"
 msgstr "Téléchargement de %s... %3.1f ko/s effectué\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:409
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "Installation de %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:417
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "Désinstallation de %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:439
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "Installation de %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% effectué\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:446
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "Désinstallation de %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% effectué\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:454
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
 msgid "Done\n"
 msgstr "Effectué\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:474
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
 #, c-format
 msgid "Download of %s FAILED\n"
 msgstr "Échec du téléchargement de %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:496
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
 #, c-format
 msgid "Package %s failed to uninstall.\n"
 msgstr "Le paquet %s n'a pu être désinstallé.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:498
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
 #, c-format
 msgid "Package %s failed to install.\n"
 msgstr "Le paquet %s n'a pu être installé.\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:519
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
 #, c-format
 msgid "\t· Problem : %s\n"
 msgstr "\t· Problème : %s\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:528
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
 #, c-format
 msgid "\t· Action : %s\n"
 msgstr "\t· Action : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:571
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
 msgid "Cancelling operation\n"
 msgstr "Annulation de l'opération\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:582
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
 #, c-format
 msgid "About to install a total of %d packages, %dKB\n"
 msgstr "Sur le point d'installer %d paquets, %d ko\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:586
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
 #, c-format
 msgid "About to uninstall a total of %d packages, %dKB\n"
 msgstr "Sur le point de désinstaller %d paquets, %d ko\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:590
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
 #, c-format
 msgid "About to revert a total of %d packages, %d KB\n"
 msgstr "Sur le point d'annuler %d paquets, %d ko\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:607
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
 #, c-format
 msgid "\t· %s and it's dependencies\n"
 msgstr "\t· %s et ses dépendances\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:610
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
 #, c-format
 msgid "\t· %s\n"
 msgstr "\t· %s\n"
@@ -2051,38 +2039,38 @@ msgstr "\t· %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n) " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:638
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
 msgid "Save transaction report ? (y/n) "
 msgstr ""
 
 #. I18N note: y is the letter for the word Yes. This is
 #. used in the response for a yes/no questions. Your translation
 #. must be 1 character only.
-#: components/services/install/command-line/eazel-alt-install-corba.c:649
-#: components/services/install/command-line/eazel-alt-install-corba.c:769
-#: components/services/install/command-line/eazel-alt-install-corba.c:811
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
 msgid "y"
 msgstr "o"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:670
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
 #, c-format
 msgid "Dependency : %s needs %s\n"
 msgstr "Vérification des dépendances : %s a besoin de %s\n"
 
 #. I18N note: %s is a package name
-#: components/services/install/command-line/eazel-alt-install-corba.c:688
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
 #, c-format
 msgid "Package %s failed md5 check!\n"
 msgstr "La vérification md5 du paquet %s a échoué !\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:690
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
 #, c-format
 msgid "\t· server MD5 checksum is %s\n"
 msgstr "\t· la somme de vérification MD5 du serveur est %s\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:692
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
 #, c-format
 msgid "\t· actual MD5 checksum is %s\n"
 msgstr "\t· la somme de vérification MD5 du paquet est %s\n"
@@ -2092,7 +2080,7 @@ msgstr "\t· la somme de vérification MD5 du paquet est %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:758
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
 msgid "Continue? (y/n) "
 msgstr "Continuer ? (o/n) "
 
@@ -2101,83 +2089,83 @@ msgstr "Continuer ? (o/n) "
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:799
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
 msgid "Should I delete the RPM files? (y/n) "
 msgstr "Dois-je supprimer les fichiers RPM ? (o/n)"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:831
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
 msgid "Operation ok\n"
 msgstr "Opération ok\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:833
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
 msgid "Operation failed\n"
 msgstr "Échec de l'opération\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:959
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
 msgid "Installing"
 msgstr "Installation"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:968
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
 msgid "Uninstalling"
 msgstr "Désinstallation"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:983
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
 msgid "Only one operation at a time please."
 msgstr "Une seule opération à la fois, s'il vous plait."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:988
-#: components/services/install/command-line/eazel-alt-install-corba.c:996
-#: components/services/install/command-line/eazel-alt-install-corba.c:1040
-#: components/services/install/command-line/eazel-alt-install-corba.c:1047
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
 #, c-format
 msgid "%s: --help for usage\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
 #, c-format
 msgid "Name         : %s\n"
 msgstr "Nom          : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
 #, c-format
 msgid "Version      : %s\n"
 msgstr "Version      : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1014
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
 #, c-format
 msgid "Minor        : %s\n"
 msgstr "Mineur       : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
 #, c-format
 msgid "Size         : %d\n"
 msgstr "Taille       : %d\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
 #, c-format
 msgid "Arch         : %s\n"
 msgstr "Arch         : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
 #, c-format
 msgid "Distribution : %s\n"
 msgstr "Distribution : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1019
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
 #, c-format
 msgid "Description  : %s\n"
 msgstr "Description  : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1021
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
 #, c-format
 msgid "Install root : %s\n"
 msgstr "Racine       : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1024
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
 msgid "Provides     : \n"
 msgstr "Fournit      : \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1066
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
 #, c-format
 msgid "exit code %d\n"
 msgstr "code de sortie %d\n"
@@ -2194,122 +2182,129 @@ msgstr ""
 "Utiliser le fichier spécifié afin de générer une liste de paquets, nécessite "
 "--packagelist"
 
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 msgid "Softcat server to connect to"
 msgstr "Serveur Softcat auquel se connecter"
 
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr "Utilise un autre chemin pour le script CGI"
 
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr "Se connecte en tant qu'utilisateur softcat à travers ammonite"
 
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 msgid "Number of times to try the request"
 msgstr "Nombre d'essais de la requète"
 
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr "Délais entre les essais de requètes"
 
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr "Reherche par identificateur de paquet Eazel"
 
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+#, fuzzy
+msgid "Lookup package that features a feature/file"
 msgstr "Recherche un paquet qui fournit une fonctionalité/un fichier"
 
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr "Recherche un paquet avec un numéro de version spécifique"
 
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr "(avec --version) Utilise comparaison >="
 
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 msgid "use check function (for debugging)"
 msgstr "utilise fonction de vérification (debugging)"
 
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 msgid "Show detailed sub-package info"
 msgstr "Afficher les informations détaillées d'un sous-paquet"
 
-#: components/services/install/lib/eazel-install-logic2.c:99
+#: components/services/install/command-line/eazel-test-softcat.c:66
+#, fuzzy
+msgid "enable funk parser"
+msgstr "Activer la recherche rapide"
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "Le vérouillage du fichier téléchargé a échoué"
 
-#: components/services/install/lib/eazel-install-logic2.c:116
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "Erreur MD5, le paquet %s est peut être corrompu"
 
-#: components/services/install/lib/eazel-install-logic2.c:132
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, c-format
 msgid "No MD5 available for %s"
 msgstr "Pas de somme de vérification MD5 disponible pour %s"
 
 #. I18N note: "%is is ok" in the sense that %s=package name and the
 #. package is intact
-#: components/services/install/lib/eazel-install-logic2.c:327
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, c-format
 msgid "%s is ok"
 msgstr "%s est bon"
 
-#: components/services/install/lib/eazel-install-logic2.c:433
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s version %s-%s est déjà installée"
 
-#: components/services/install/lib/eazel-install-logic2.c:437
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s version %s est déjà installée"
 
-#: components/services/install/lib/eazel-install-logic2.c:446
-#: components/services/install/lib/eazel-install-logic2.c:451
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr "%s mets à niveau de la version %s-%s vers %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:460
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr "%s permet de revenir de la version %s-%s à %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:465
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr "%s permet de revenir de la version %s vers %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:518
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr "%s installe la version %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:523
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr "%s installe la version %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:687
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, c-format
 msgid "Loading package info from file %s"
 msgstr "Charge les informations du paquet depuis le fichier %s"
 
 #. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
-#: components/services/install/lib/eazel-install-logic2.c:993
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "ok"
 msgstr "ok"
 
-#: components/services/install/lib/eazel-install-logic2.c:993
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "not ok"
 msgstr "pas ok"
 
-#: components/services/install/lib/eazel-install-logic2.c:1159
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
 msgid "Checking dependencies for %s"
 msgstr "Vérifie les dépendances pour %s"
@@ -2317,52 +2312,52 @@ msgstr "Vérifie les dépendances pour %s"
 #. I18N note: both %s' are package names.
 #. related is in the sense that the two packages apparently
 #. are connected somehow, eg. foo and foo-devel
-#: components/services/install/lib/eazel-install-logic2.c:1766
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, c-format
 msgid "%s is related to %s"
 msgstr "« %s » est relié à (%s)"
 
-#: components/services/install/lib/eazel-install-logic2.c:1826
+#: components/services/install/lib/eazel-install-logic2.c:2090
 #, c-format
 msgid "updating %s to version %s-%s solves conflict"
 msgstr "La mise à jour de %s à la version %s-%s résoud le conflit"
 
-#: components/services/install/lib/eazel-install-logic2.c:1842
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
 msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr "la mise à jour de %s vers la version (%s-%s) ne résoud pas le conflit"
 
-#: components/services/install/lib/eazel-install-logic2.c:1849
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, c-format
 msgid "could not revive %s"
 msgstr "Impossible de ressusciter %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2004
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
 msgid "file uniqueness checking %s"
 msgstr "vérifie l'unicité de fichier %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2025
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
 msgid "Duplicate file : %s occurs in %s and %s"
 msgstr "Fichier double : %s est contenu dans %s et %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2037
-#: components/services/install/lib/eazel-install-logic2.c:2191
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
 msgid "... but it's ok, the packages are related"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2045
+#: components/services/install/lib/eazel-install-logic2.c:2324
 #, c-format
 msgid "(there were %d other conflicts)"
 msgstr "(il y a eu %d autres conflits)"
 
-#: components/services/install/lib/eazel-install-logic2.c:2140
+#: components/services/install/lib/eazel-install-logic2.c:2419
 #, c-format
 msgid "file conflict checking %s"
 msgstr "Vérification de conflit de fichier %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2177
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
 msgid "file conflict : package %s already provides file %s also provided by %s"
 msgstr ""
@@ -2371,18 +2366,18 @@ msgstr ""
 
 #. the owner of this file is a package that we're upgrading, and the
 #. * new version no longer has this file, so everything's okay.
-#: components/services/install/lib/eazel-install-logic2.c:2187
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
 msgid "...but it is okay, we're upgrading %s and it ditched that file"
 msgstr ""
 "...c'est ok, nous mettons à jour %s et ceci nous a débarrasé de ce fichier"
 
-#: components/services/install/lib/eazel-install-logic2.c:2279
+#: components/services/install/lib/eazel-install-logic2.c:2558
 #, c-format
 msgid "checking feature consistency of %s"
 msgstr "verifie la consistance des fonctionalités de %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2347
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
 msgid ""
 "feature missing : %s breaks if %s is installed (feature %s would be lost"
@@ -2390,172 +2385,172 @@ msgstr ""
 "fonctionalité manquante : %s casse si %s est installé (la fonctionalité %s "
 "serat perdue"
 
-#: components/services/install/lib/eazel-install-logic2.c:2426
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, c-format
 msgid "downloading %d packages"
 msgstr "téléchargement de %d paquets"
 
-#: components/services/install/lib/eazel-install-logic2.c:2695
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, c-format
 msgid "will upgrade %s"
 msgstr "mettra à jour %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2698
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, c-format
 msgid "will downgrade %s"
 msgstr "passera à une vieille version de %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2701
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, c-format
 msgid "will install %s"
 msgstr "installera %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2704
+#: components/services/install/lib/eazel-install-logic2.c:2960
 #, c-format
 msgid "will uninstall %s"
 msgstr "désinstallera %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2789
-#: components/services/install/lib/eazel-install-problem.c:335
-#: components/services/install/lib/eazel-install-problem.c:338
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
 #, c-format
 msgid "%s requires %s"
 msgstr "%s nécessite %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2982
+#: components/services/install/lib/eazel-install-logic2.c:3238
 #, c-format
 msgid "failed %s"
 msgstr "%s a échoué"
 
-#: components/services/install/lib/eazel-install-metadata.c:171
+#: components/services/install/lib/eazel-install-metadata.c:174
 msgid "Could not set URLType from config file!"
 msgstr ""
 "Impossible de déterminer le type d'URL d'après le fichier de configuration!"
 
-#: components/services/install/lib/eazel-install-object.c:713
+#: components/services/install/lib/eazel-install-object.c:717
 msgid "Transactions are not stored, could not find home dir"
 msgstr ""
 "Les transactions ne sont pas archivées, impossible de trouver le répertoire "
 "de l'utilisateur"
 
-#: components/services/install/lib/eazel-install-object.c:741
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr "Les transactions sont archivées dans %s"
 
-#: components/services/install/lib/eazel-install-object.c:998
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "Obtention de la liste des paquets depuis le serveur distant...\n"
 
-#: components/services/install/lib/eazel-install-object.c:1014
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "Impossible de récupérer le fichier package-list.xml!\n"
 
-#: components/services/install/lib/eazel-install-object.c:1087
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr "Impossible d'écrire dans le fichier %s"
 
-#: components/services/install/lib/eazel-install-object.c:1218
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "L'installation a échoué"
 
-#: components/services/install/lib/eazel-install-object.c:1264
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "Echec de la dé-installation"
 
-#: components/services/install/lib/eazel-install-object.c:1387
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "Impossible de créer le répertoire de transaction (%s)! ***\n"
 
-#: components/services/install/lib/eazel-install-object.c:1410
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr "Ecriture de la transaction dans %s"
 
-#: components/services/install/lib/eazel-install-problem.c:159
+#: components/services/install/lib/eazel-install-problem.c:163
 #, c-format
 msgid "%s was cancelled"
 msgstr "%s a été annulé"
 
-#: components/services/install/lib/eazel-install-problem.c:164
-#: components/services/install/lib/eazel-install-problem.c:327
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
 msgid "%s is a source package, which is not yet supported"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:178
-#: components/services/install/lib/eazel-install-problem.c:189
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
 #, c-format
 msgid "%s would break other packages"
 msgstr "%s peut endommager d'autres paquets"
 
-#: components/services/install/lib/eazel-install-problem.c:181
+#: components/services/install/lib/eazel-install-problem.c:185
 #, c-format
 msgid "%s would break"
 msgstr "%s serait endommagé"
 
-#: components/services/install/lib/eazel-install-problem.c:187
+#: components/services/install/lib/eazel-install-problem.c:191
 #, c-format
 msgid "%s would break %s"
 msgstr "%s endommagerait %s"
 
-#: components/services/install/lib/eazel-install-problem.c:193
+#: components/services/install/lib/eazel-install-problem.c:197
 #, c-format
 msgid "%s is damaged"
 msgstr "%s est endommagé"
 
-#: components/services/install/lib/eazel-install-problem.c:197
+#: components/services/install/lib/eazel-install-problem.c:201
 #, c-format
 msgid "%s requires %s, which could not be found on the server"
 msgstr "%s requiert %s qui n'a put être trouvé sur le serveur"
 
-#: components/services/install/lib/eazel-install-problem.c:200
-#, c-format
-msgid "%s could not be found on the server"
+#: components/services/install/lib/eazel-install-problem.c:204
+#, fuzzy, c-format
+msgid "%s for %s could not be found on the server"
 msgstr "%s ne peut être trouvé sur le serveur"
 
-#: components/services/install/lib/eazel-install-problem.c:208
-#: components/services/install/lib/eazel-install-problem.c:353
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr "%s est déjà installé"
 
-#: components/services/install/lib/eazel-install-problem.c:252
+#: components/services/install/lib/eazel-install-problem.c:259
 #, c-format
 msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr ""
 "Je dois installer une ancienne version de %s mais ceci n'est pas autorisé"
 
-#: components/services/install/lib/eazel-install-problem.c:256
+#: components/services/install/lib/eazel-install-problem.c:263
 #, c-format
 msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr ""
 "%s, qui est plus vieux, doit être mis à jour mais ceci n'est pas autorisé"
 
-#: components/services/install/lib/eazel-install-problem.c:346
+#: components/services/install/lib/eazel-install-problem.c:353
 #, c-format
 msgid "%s is not installed and could not be found on server"
 msgstr "%s n'est pas installé et ne peut être trouvé sur le serveur"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:913
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr "Cherche une nouvelle version de %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:924
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr "Installe %s ET %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:939
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr "Supprimer %s de votre système"
@@ -2563,232 +2558,232 @@ msgstr "Supprimer %s de votre système"
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:952
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr "Force la suppression de %s de votre système"
 
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:960
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr "La base de données des paquets n'est pas valide"
 
-#: components/services/install/lib/eazel-install-problem.c:1008
+#: components/services/install/lib/eazel-install-problem.c:1015
 msgid "Continue with force"
 msgstr "Continuer en forçant"
 
-#: components/services/install/lib/eazel-install-problem.c:1014
+#: components/services/install/lib/eazel-install-problem.c:1021
 msgid "Allow downgrade"
 msgstr "Autoriser la mise à jour avec d'anciennes versions"
 
-#: components/services/install/lib/eazel-install-protocols.c:123
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:166
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
 #, c-format
 msgid "Could not open target file %s"
 msgstr "Impossible d'ouvrir le fichier destination %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:130
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:92
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
 msgid "Could not create an http request !"
 msgstr "Impossible de créer la requête http !"
 
-#: components/services/install/lib/eazel-install-protocols.c:137
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:99
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
 msgid "Proxy: Invalid uri !"
 msgstr "Proxy : URI invalide !"
 
-#: components/services/install/lib/eazel-install-protocols.c:142
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:105
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
 msgid "Invalid uri !"
 msgstr "URI invalide !"
 
-#: components/services/install/lib/eazel-install-protocols.c:149
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:115
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
 msgid "Could not prepare http request !"
 msgstr "Impossible de préparer la requête http !"
 
-#: components/services/install/lib/eazel-install-protocols.c:154
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:120
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
 msgid "Couldn't get async mode "
 msgstr "Impossible d'obtenir un mode asynchrone"
 
 #. probably out of disk space
-#: components/services/install/lib/eazel-install-protocols.c:183
-#: components/services/install/lib/eazel-install-protocols.c:212
-#: components/services/install/lib/eazel-install-protocols.c:228
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, c-format
 msgid "DISK FULL: could not write %s"
 msgstr "Fichier plein : impossible d'écrire %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:189
-#: components/services/install/lib/eazel-install-protocols.c:217
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
 msgid "Could not get request body!"
 msgstr "Impossible de récupérer le corps de la requête!"
 
-#: components/services/install/lib/eazel-install-protocols.c:202
+#: components/services/install/lib/eazel-install-protocols.c:208
 #, c-format
 msgid "HTTP error: %d %s"
 msgstr "Erreur HTTP : %d %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:249
+#: components/services/install/lib/eazel-install-protocols.c:255
 msgid "FTP not supported yet"
 msgstr "FTP non supporté"
 
-#: components/services/install/lib/eazel-install-protocols.c:457
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, c-format
 msgid "Checking local file %s..."
 msgstr "Vérification du fichier local %s..."
 
-#: components/services/install/lib/eazel-install-protocols.c:578
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, c-format
 msgid "Failed to retrieve %s!"
 msgstr "Echec dans la récupération de %s!"
 
-#: components/services/install/lib/eazel-install-protocols.c:651
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, c-format
 msgid "Could not get an URL for %s"
 msgstr "Impossible d'obtenir une URL pour %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:666
+#: components/services/install/lib/eazel-install-protocols.c:672
 msgid "Downloaded package does not have the correct name"
 msgstr "Le paquet téléchargé n'a pas le nom adéquat"
 
-#: components/services/install/lib/eazel-install-protocols.c:667
+#: components/services/install/lib/eazel-install-protocols.c:673
 #, c-format
 msgid "Package %s should have had name %s"
 msgstr "Le paquet %s devrait avoir comme nom %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:695
+#: components/services/install/lib/eazel-install-protocols.c:701
 msgid "File download failed"
 msgstr "Le chargement de fichier a échoué"
 
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr "*** Début chargement paquet ***\n"
 
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr "*** Fin chargement paquet ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:158
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 msgid "*** No package nodes! (cat has no children) ***"
 msgstr "*** Aucun noeud de paquets ! (cat n'a pas d'enfant) ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:160
-#: components/services/install/lib/eazel-install-xml-package-list.c:168
-#: components/services/install/lib/eazel-install-xml-package-list.c:183
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 msgid "*** Bailing from package parse! ***"
 msgstr "*** Recherche des paquet s! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:166
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
 msgid "*** No package nodes! ***"
 msgstr "*** Aucun noeud de paquets ! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:172
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 msgid "*** Malformed package node!"
 msgstr "*** Noeud de paquets malformé !"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:181
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
 msgid "*** No depends nodes! ***"
 msgstr "*** Aucun noeud de dependance ! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:187
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr "*** noeud de dépendance malformé!"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:211
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr "*** Type de noeud inconnu « %s »"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:228
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** La liste des paquets ne contient pas de données ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:233
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** Impossible de trouver le neoud xml CATEGORIES ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:234
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr "*** Échec de la recherche des catégories ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:240
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** Aucunes catégories ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:241
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr "*** Echec de la recherche des catégories ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:295
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** Impossible de trouver le noeud xml TRANSACTION ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:297
-#: components/services/install/lib/eazel-install-xml-package-list.c:305
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr "*** Echec de la transaction ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:303
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** Aucun paquets ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:339
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** Aucun noeud de catégorie ! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:343
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** Impossible de trouver le neoud xml CATEGORIES ! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:377
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** Noeud inconnu %s"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:467
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** Erreur dans la génération de la liste xml du package! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:514
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** Erreur durant la lecture de la liste de paquets ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:909
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** Le fichier osd xml est vide! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:914
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr "*** Echec de la recherche de osd! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:990
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "Impossible de traiter le fichier xml (de longueur %d)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:763
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr "Ouverture de la base des paquets dans %s"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:768
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr "Échec de l'ouverture de la base des paquets dans %s"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:801
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr "Fermeture de la base pour %s (ouverte)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:806
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr "Fermeture de la base pour %s (non ouverte)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1137
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr "Impossible d'ouvrir %s"
@@ -2901,7 +2896,7 @@ msgid "Now installing package \"%s\"."
 msgstr "Installation du paquet « %s »."
 
 #: components/services/install-view/callbacks.c:407
-#: components/services/install-view/nautilus-service-install-view.c:897
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "Installation de « %s »"
@@ -2928,29 +2923,29 @@ msgstr "Je veux essayer :"
 msgid "Is this ok ?"
 msgstr "Les informations sont-elles correctes ?"
 
-#: components/services/install-view/callbacks.c:557
+#: components/services/install-view/callbacks.c:556
 msgid "Installation cancelled."
 msgstr "Installation annulée."
 
-#: components/services/install-view/callbacks.c:559
+#: components/services/install-view/callbacks.c:558
 msgid "This package has already been installed."
 msgstr "Ce paquet a déjà été installé."
 
-#: components/services/install-view/callbacks.c:561
-#: components/services/install-view/callbacks.c:658
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
 msgid "Installation complete."
 msgstr "Installation terminée."
 
-#: components/services/install-view/callbacks.c:565
+#: components/services/install-view/callbacks.c:564
 msgid "Installation failed."
 msgstr "Échec de l'installation."
 
 #. some succeeded; some failed
-#: components/services/install-view/callbacks.c:569
+#: components/services/install-view/callbacks.c:568
 msgid "Some packages installed successfully:"
 msgstr "Quelques paquets ont étés installés avec succés :"
 
-#: components/services/install-view/callbacks.c:578
+#: components/services/install-view/callbacks.c:577
 msgid ""
 "\n"
 "Some packages failed:"
@@ -2958,19 +2953,19 @@ msgstr ""
 "\n"
 "Quelques paquets ont echoué :"
 
-#: components/services/install-view/callbacks.c:627
+#: components/services/install-view/callbacks.c:626
 msgid "Erase the RPM files?"
 msgstr "Effacer les fichiers RPM ?"
 
-#: components/services/install-view/callbacks.c:629
+#: components/services/install-view/callbacks.c:628
 msgid "Erase the leftover RPM files?"
 msgstr "Efface les fichiers RPMs téléchargés ?"
 
-#: components/services/install-view/callbacks.c:659
+#: components/services/install-view/callbacks.c:658
 msgid "Ok"
 msgstr "Ok"
 
-#: components/services/install-view/callbacks.c:674
+#: components/services/install-view/callbacks.c:673
 msgid ""
 "A core package of Nautilus has been\n"
 "updated.  You should restart Nautilus.\n"
@@ -3044,30 +3039,30 @@ msgstr "Continue"
 
 #: components/services/install-view/forms.c:482
 #: libnautilus-extensions/nautilus-drag.c:493
-#: src/file-manager/fm-directory-view.c:3551
+#: src/file-manager/fm-directory-view.c:4326
 msgid "Cancel"
 msgstr "Annuler"
 
-#: components/services/install-view/nautilus-service-install-view.c:419
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
 msgid "%s is in GNOME (footprint) > %s"
 msgstr "%s est dans le menu GNOME > %s"
 
-#: components/services/install-view/nautilus-service-install-view.c:437
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, c-format
 msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr "%s est dans le menu GNOME.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:452
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
 msgid "%s is in the KDE menu.\n"
 msgstr "%s est dans le menu KDE.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:653
+#: components/services/install-view/nautilus-service-install-view.c:655
 msgid "Installation Complete"
 msgstr "Installation terminée"
 
-#: components/services/install-view/nautilus-service-install-view.c:708
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
 msgid ""
 "%sTo start %s, click the Launch button below, or to create a shortcut, drag "
@@ -3075,32 +3070,32 @@ msgid ""
 msgstr ""
 
 #. couldn't find an icon
-#: components/services/install-view/nautilus-service-install-view.c:716
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
 msgid "%sTo start %s, click the Launch button below."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:771
+#: components/services/install-view/nautilus-service-install-view.c:773
 msgid "Incorrect password."
 msgstr "Mot de passe incorrect."
 
-#: components/services/install-view/nautilus-service-install-view.c:776
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr "Authentifie en tant que « root »"
 
-#: components/services/install-view/nautilus-service-install-view.c:893
+#: components/services/install-view/nautilus-service-install-view.c:895
 msgid "Installing packages"
 msgstr "Installation des paquets"
 
-#: components/services/install-view/nautilus-service-install-view.c:895
+#: components/services/install-view/nautilus-service-install-view.c:897
 msgid "Installing remote package"
 msgstr "Installation du paquet distant"
 
-#: components/services/install-view/nautilus-service-install-view.c:899
+#: components/services/install-view/nautilus-service-install-view.c:901
 msgid "Installing some package"
 msgstr "Installation d'un paquet"
 
-#: components/services/install-view/nautilus-service-install-view.c:916
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
@@ -3108,23 +3103,23 @@ msgstr ""
 "Le service d'installation de Eazel manque :\n"
 "les installations ne fonctionneront pas."
 
-#: components/services/install-view/nautilus-service-install-view.c:965
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr "Contacter les catalog de logiciels Eazel ..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1023
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr "Vérifie authorisation..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1095
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr "Abandon du téléchargement des paquets (patientez s'il vous plait)..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1115
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "Le téléchargement des paquets a été interrompu"
 
-#: components/services/install-view/nautilus-service-install-view.c:1116
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "Interrompu"
 
@@ -3398,12 +3393,12 @@ msgid "Services Login"
 msgstr "Connection aux services"
 
 #: components/services/summary/nautilus-summary-dialogs.c:131
-#: libnautilus-extensions/nautilus-password-dialog.c:269
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "Nom :"
 
 #: components/services/summary/nautilus-summary-dialogs.c:138
-#: libnautilus-extensions/nautilus-password-dialog.c:276
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "Mot de passe :"
 
@@ -3475,7 +3470,7 @@ msgstr "Services"
 msgid "Featured Downloads"
 msgstr "Téléchargements prévus"
 
-#: components/services/summary/nautilus-summary-view.c:883
+#: components/services/summary/nautilus-summary-view.c:884
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
 "unavailable right now, or your computer might be configured incorrectly. "
@@ -3485,21 +3480,21 @@ msgstr ""
 "inactif en ce moment, ou votre ordinateur est mal configuré. Contactez "
 "support@eazel.com"
 
-#: components/services/summary/nautilus-summary-view.c:893
+#: components/services/summary/nautilus-summary-view.c:894
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
 "support@eazel.com."
 msgstr ""
 "Erreur de donnée au niveau du serveur Eazel. Contactez support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:916
+#: components/services/summary/nautilus-summary-view.c:917
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
 "contact support@eazel.com."
 msgstr ""
 "Erreur de donnée au niveau du serveur Eazel. Contactez support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:958
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
 "now, or your computer might be configured incorrectly. You could try again "
@@ -3509,7 +3504,7 @@ msgstr ""
 "indisponible en ce moment, ou votre ordinateur est mal configuré. Essayez un "
 "peu plus tard."
 
-#: components/services/summary/nautilus-summary-view.c:968
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3517,11 +3512,11 @@ msgstr ""
 "A trouvé un problème avec les données de redirection des serveurs Eazel. "
 "Contactez support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:985
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:1048
+#: components/services/summary/nautilus-summary-view.c:1049
 #: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr "Les services Eazel"
@@ -3592,16 +3587,16 @@ msgstr "Visionneur de résumé"
 msgid "View as Summary"
 msgstr "Voir en tant que Résumé"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:130
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
 #, c-format
 msgid "HTTP error %d \"%s\" on uri %s"
 msgstr "Erreur HTTP %d « %s » sur l'URI %s"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:200
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 msgid "Could not initialize Bonobo"
 msgstr "Impossible d'initialiser Bonobo"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:215
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr "Impossible d'écrire dans le fichier log %s"
@@ -3642,48 +3637,68 @@ msgstr ""
 msgid "Factory for the sample service"
 msgstr ""
 
-#: components/text/nautilus-text-view.c:326
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr ""
 
-#: components/text/nautilus-text-view.c:329
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr "Fichier trop grand"
 
 #: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "Polices"
+
+#: components/text/nautilus-text-view-ui.xml.h:2
 msgid "Lucida"
 msgstr "Lucida"
 
-#: components/text/nautilus-text-view-ui.xml.h:2
+#: components/text/nautilus-text-view-ui.xml.h:3
 msgid "Use the Courier Font"
 msgstr "Utiliser la police Courier"
 
-#: components/text/nautilus-text-view-ui.xml.h:3
+#: components/text/nautilus-text-view-ui.xml.h:4
+#, fuzzy
+msgid "Use the Fixed Font"
+msgstr "Utiliser la police Times"
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+#, fuzzy
+msgid "Use the GTK System Font"
+msgstr "Utiliser la police Times"
+
+#: components/text/nautilus-text-view-ui.xml.h:6
 msgid "Use the Helvetica Font"
 msgstr "Utiliser la police Helvetica"
 
-#: components/text/nautilus-text-view-ui.xml.h:4
+#: components/text/nautilus-text-view-ui.xml.h:7
 msgid "Use the Lucida Font"
 msgstr "Utiliser la police Lucida"
 
-#: components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:8
 msgid "Use the Times Font"
 msgstr "Utiliser la police Times"
 
-#: components/text/nautilus-text-view-ui.xml.h:6
+#: components/text/nautilus-text-view-ui.xml.h:9
 msgid "_Courier"
 msgstr "_Courier"
 
-#: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
-msgstr "_Polices"
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "_Fichier"
 
-#: components/text/nautilus-text-view-ui.xml.h:8
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
 msgid "_Helvetica"
 msgstr "_Helvetica"
 
-#: components/text/nautilus-text-view-ui.xml.h:9
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr "_Times"
 
@@ -3755,7 +3770,7 @@ msgid "Nautilus Tree view"
 msgstr "Theme Nautilus:"
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:638
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr ""
 
@@ -3767,7 +3782,7 @@ msgstr "Apparition"
 msgid "Azul"
 msgstr "Azur"
 
-#: data/browser.xml.h:3 libnautilus-extensions/nautilus-font-picker.c:105
+#: data/browser.xml.h:3
 msgid "Black"
 msgstr "Noir"
 
@@ -3882,7 +3897,7 @@ msgstr ""
 msgid "Eclipse"
 msgstr ""
 
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1607
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "Emblèmes"
 
@@ -3980,7 +3995,7 @@ msgid "Numbers"
 msgstr "Nombres"
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "Valider"
 
@@ -4105,13 +4120,13 @@ msgid "The Gimp"
 msgstr "The GIMP"
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:554
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "Bureau"
 
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4796
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
-#: src/file-manager/fm-desktop-icon-view.c:65
+#: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
 msgstr "Corbeille"
 
@@ -4146,7 +4161,7 @@ msgid "Google"
 msgstr "Google"
 
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:808
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "Moteur de recherche"
 
@@ -4402,21 +4417,21 @@ msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2261
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr "aujourd'hui à %-I:%M %p"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2266
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr "hier à %-I:%M %p"
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2271
+#: libnautilus-extensions/nautilus-file.c:2287
 #, fuzzy
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%A %-d/%-m/%Y %H:%M"
@@ -4424,95 +4439,95 @@ msgstr "%A %-d/%-m/%Y %H:%M"
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2276
+#: libnautilus-extensions/nautilus-file.c:2292
 #, fuzzy
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%-d/%-m/%Y %H:%M"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "aucun élément"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr "aucun répertoire"
 
-#: libnautilus-extensions/nautilus-file.c:3408
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "aucun fichier"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 élément"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr "1 répertoire"
 
-#: libnautilus-extensions/nautilus-file.c:3413
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 fichier"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "%u éléments"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr "%u répertoires"
 
-#: libnautilus-extensions/nautilus-file.c:3417
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u fichiers"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3720
-#: libnautilus-extensions/nautilus-file.c:3735
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr "? éléments"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3726
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr "? octets"
 
-#: libnautilus-extensions/nautilus-file.c:3739
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "type inconnu"
 
-#: libnautilus-extensions/nautilus-file.c:3741
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "type MIME inconnu"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3746
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "inconnu"
 
-#: libnautilus-extensions/nautilus-file.c:3782
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr "application"
 
-#: libnautilus-extensions/nautilus-file.c:3794
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
 "some other reason."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3798
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
 "aaron@eazel.com"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3812
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "lien"
 
@@ -4520,27 +4535,27 @@ msgstr "lien"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1156
-#: libnautilus-extensions/nautilus-file.c:3818
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr "Lien vers %s"
 
-#: libnautilus-extensions/nautilus-file.c:3832
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr "lien (rompu)"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "De :"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "À :"
 
-#: libnautilus-extensions/nautilus-file-operations.c:588
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4548,7 +4563,7 @@ msgid ""
 "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:599
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4557,7 +4572,7 @@ msgid ""
 "parent folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:605
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4565,7 +4580,7 @@ msgid ""
 "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:636
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4574,7 +4589,7 @@ msgid ""
 "its parent folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:643
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4587,7 +4602,7 @@ msgstr ""
 "« %s » ne peut être déplacé vers la corbeille car vous n'avez pas la "
 "permission de le modifier, lui ou son répertoire parent."
 
-#: libnautilus-extensions/nautilus-file-operations.c:667
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -4595,7 +4610,7 @@ msgid ""
 "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:689
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4606,7 +4621,7 @@ msgstr ""
 "\n"
 "La destination n'a plus assez d'espace libre."
 
-#: libnautilus-extensions/nautilus-file-operations.c:694
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4617,7 +4632,7 @@ msgstr ""
 "\n"
 "La destination n'a plus assez d'espace libre."
 
-#: libnautilus-extensions/nautilus-file-operations.c:698
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4628,7 +4643,7 @@ msgstr ""
 "\n"
 "La destination n'a plus assez d'espace libre."
 
-#: libnautilus-extensions/nautilus-file-operations.c:710
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4636,7 +4651,7 @@ msgid ""
 "You do not have permissions to write to this folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4647,7 +4662,7 @@ msgstr ""
 "\n"
 "Le disque de destination est en lecture seule."
 
-#: libnautilus-extensions/nautilus-file-operations.c:721
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4658,7 +4673,7 @@ msgstr ""
 "\n"
 "Le répertoire de destination est en lecture seule."
 
-#: libnautilus-extensions/nautilus-file-operations.c:725
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4669,7 +4684,7 @@ msgstr ""
 "\n"
 "Le disque de destination est en lecture seule."
 
-#: libnautilus-extensions/nautilus-file-operations.c:732
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4677,7 +4692,7 @@ msgid ""
 "You do not have permissions to write to this folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:736
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4688,7 +4703,7 @@ msgstr ""
 "\n"
 "Le disque de destination est en lecture seule."
 
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4699,7 +4714,7 @@ msgstr ""
 "\n"
 "Voulez-vous continuer ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4710,7 +4725,7 @@ msgstr ""
 "\n"
 "Voulez-vous continuer ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:773
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4721,7 +4736,7 @@ msgstr ""
 "\n"
 "Voulez-vous continuer ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4732,7 +4747,7 @@ msgstr ""
 "\n"
 "Voulez-vous continuer ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:794
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4743,7 +4758,7 @@ msgstr ""
 "\n"
 "Voulez-vous continuer ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4754,7 +4769,7 @@ msgstr ""
 "\n"
 "Voulez-vous continuer ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4765,7 +4780,7 @@ msgstr ""
 "\n"
 "Voulez-vous continuer ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4776,34 +4791,34 @@ msgstr ""
 "\n"
 "Voulez-vous continuer ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:924
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "Erreur durant la copie."
 
-#: libnautilus-extensions/nautilus-file-operations.c:927
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "Erreur durant le déplacement."
 
-#: libnautilus-extensions/nautilus-file-operations.c:930
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "Erreur durant la création du lien."
 
-#: libnautilus-extensions/nautilus-file-operations.c:935
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "Erreur durant la suppression."
 
-#: libnautilus-extensions/nautilus-file-operations.c:960
-#: libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "Suivant"
 
-#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Ré-essayer"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1057
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4812,7 +4827,7 @@ msgid ""
 "If you still want to move \"%s\", rename it and try again."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1063
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4821,11 +4836,11 @@ msgid ""
 "If you still want to copy \"%s\", rename it and try again."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "Incapable de remplacer le fichier."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1081
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4836,22 +4851,22 @@ msgstr ""
 "\n"
 "Voulez-vous le remplacer ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1092
-#: libnautilus-extensions/nautilus-file-operations.c:1106
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "Conflit lors de la copie"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Remplacer"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Remplacer tout"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1160
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "un autre lien vers %s"
@@ -4860,25 +4875,25 @@ msgstr "un autre lien vers %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%der lien vers %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1180
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dnd lien vers %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1184
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%dème lien vers %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dème lien vers %s"
@@ -4888,249 +4903,239 @@ msgstr "%dème lien vers %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (copie)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (une autre copie)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1212
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr "ère copie)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr "nde copie)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1216
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr "ième copie)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr "ième copie)"
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (copie)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (autre copie)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1232
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dière copie)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1234
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dnde copie)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1236
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%dième copie)%s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dième copie)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1322
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1330
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1487
-#: libnautilus-extensions/nautilus-file-operations.c:2072
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus %d inconnu"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1802
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "Déplacer des fichiers dans la corbeille"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1804
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr "Fichier à traiter :"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1821
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "Déplacement"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1807
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "Préparation du déplacement vers la corbeille..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1817
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "Déplacement de fichiers"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "Fichiers déplacés :"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1822
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "Préparation du déplacement..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "Déplacement terminé..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "Création des liens sur les fichiers"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1837
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "Fichiers liés :"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1839
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "liaison"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "Préparation de la création de liens..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "Création de liens terminée..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1848
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "Copie de fichiers"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "Fichiers copiés :"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "Copie"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "Préparation de la copie..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "Impossible de copier ces éléments dans la corbeille"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "Impossible de copier dans la corbeille"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1899
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "La corbeille doit rester sur le bureau."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 #, fuzzy
 msgid "You cannot move this trash folder."
 msgstr "Impossible de déplacer un répertoire sur lui même."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1902
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "Copie de la corbeille impossible."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1903
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 #, fuzzy
 msgid "You cannot copy this trash folder."
 msgstr "Copie de la corbeille impossible."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1905
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Impossible de changer l'emplacement de la corbeille"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1906
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Impossible de copier la corbeille"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1929
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "Impossible de déplacer un répertoire sur lui même."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1930
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "Impossible de copier un répertoire sur lui même."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1932
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "Ne peut être déplacé sur soi-même"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1933
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 #, fuzzy
 msgid "Can't Copy Into Self"
 msgstr "Ne peut être déplacé sur soi-même"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1946
-#, fuzzy
-msgid "You cannot move a file onto itself."
-msgstr "Impossible de déplacer un répertoire sur lui même."
-
-#: libnautilus-extensions/nautilus-file-operations.c:1947
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 #, fuzzy
 msgid "You cannot copy a file over itself."
 msgstr "Impossible de copier un répertoire sur lui même."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1949
-#, fuzzy
-msgid "Can't Move Onto Self"
-msgstr "Ne peut être déplacé sur soi-même"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1950
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 #, fuzzy
 msgid "Can't Copy Over Self"
 msgstr "Ne peut être déplacé sur soi-même"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2001
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
 "You do not have permissions to write to the destination."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2004
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 #, fuzzy
 msgid ""
 "Error creating new folder.\n"
@@ -5140,639 +5145,691 @@ msgstr ""
 "Erreur durant %s%s.\n"
 "La destination n'a plus assez d'espace libre."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2007
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2011
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 #, fuzzy
 msgid "Error creating new folder"
 msgstr "Erreur dans l'attribution du propriétaire"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2098
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "nouveau répertoire"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2131
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "Suppression de fichiers"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2133
-#: libnautilus-extensions/nautilus-file-operations.c:2168
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "Fichiers supprimés :"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2135
-#: libnautilus-extensions/nautilus-file-operations.c:2170
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Suppression"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2136
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "Préparation de la suppression..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2166
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Vider la corbeille"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2171
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Préparation de la purge de la corbeille..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2202
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr ""
 "Voulez-vous vraiment supprimer définitivement tous les éléments de la "
 "corbeille ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2204
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "Supprimer le contenu de la corbeille?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2205
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "Vider"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2243
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2243
-#: libnautilus-extensions/nautilus-file-operations.c:2253
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "foo (copie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (copie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".foo (copie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "foo foo (copie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2247
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2247
-#: libnautilus-extensions/nautilus-file-operations.c:2254
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "foo (copie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2248
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2248
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "foo foo (copie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (copie).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "foo.. (copie)txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "foo... (copie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "foo. (copie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "foo. (une autre copie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2253
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "foo (une autre copie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2254
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "foo (une autre copie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "foo (3ème copie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "foo (3ème copie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (une autre copie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3ème copie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr "foo (21ème copie)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr "foo (24ème copie)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr "foo (21ème copie).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr "foo (24ème copie).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "foo (21ème copie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
-#: libnautilus-extensions/nautilus-file-operations.c:2260
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "foo (22ème copie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "foo (21ème copie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
-#: libnautilus-extensions/nautilus-file-operations.c:2261
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "foo (22ème copie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2260
-#: libnautilus-extensions/nautilus-file-operations.c:2262
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "foo (23ème copie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2261
-#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "foo (23ème copie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2262
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "foo (24ème copie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2263
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "foo (24ème copie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "foo (25ème copie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "foo (25ème copie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24ème copie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25ème copie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24ème copie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25ème copie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000ème copie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
-#, c-format
-msgid "%ld of %ld"
-msgstr ""
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (10th copy)"
+msgstr "foo (21ème copie)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:96
+#: libnautilus-extensions/nautilus-file-operations.c:2289
 #, fuzzy
-msgid "Normal"
-msgstr "Taille normale"
+msgid "foo (11st copy)"
+msgstr "foo (21ème copie)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:97
-#: libnautilus-extensions/nautilus-volume-monitor.c:516
-#: libnautilus-extensions/nautilus-volume-monitor.c:535
+#: libnautilus-extensions/nautilus-file-operations.c:2290
 #, fuzzy
-msgid "Unknown"
-msgstr "inconnu"
+msgid "foo (10th copy).txt"
+msgstr "foo (21ème copie).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:103
+#: libnautilus-extensions/nautilus-file-operations.c:2290
 #, fuzzy
-msgid "Bold"
-msgstr "Borland"
+msgid "foo (11st copy).txt"
+msgstr "foo (21ème copie).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:104
+#: libnautilus-extensions/nautilus-file-operations.c:2291
 #, fuzzy
-msgid "Book"
-msgstr "ok"
+msgid "foo (11th copy)"
+msgstr "foo (21ème copie)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:106
-msgid "Demibold"
-msgstr ""
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (12nd copy)"
+msgstr "foo (22ème copie)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:107
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 #, fuzzy
-msgid "Light"
-msgstr "Liste"
+msgid "foo (11th copy).txt"
+msgstr "foo (21ème copie).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:113
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 #, fuzzy
-msgid "Italic"
-msgstr "Balte"
+msgid "foo (12nd copy).txt"
+msgstr "foo (22ème copie).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:114
+#: libnautilus-extensions/nautilus-file-operations.c:2293
 #, fuzzy
-msgid "Oblique"
-msgstr "Vieux"
+msgid "foo (12th copy)"
+msgstr "foo (24ème copie)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:115
-msgid "Reverse Italic"
-msgstr ""
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (13rd copy)"
+msgstr "foo (3ème copie)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:116
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 #, fuzzy
-msgid "Reverse Oblique"
-msgstr "In_verser l'ordre"
+msgid "foo (12th copy).txt"
+msgstr "foo (25ème copie).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:123
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 #, fuzzy
-msgid "Condensed"
-msgstr "Contenu:"
+msgid "foo (13rd copy).txt"
+msgstr "foo (3ème copie).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:124
-msgid "Semicondensed"
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
+#, c-format
+msgid "%ld of %ld"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-font-picker.c:226
-msgid "Font"
-msgstr "Police"
-
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
 msgid "GConf Error"
 msgstr "Erreur GConf"
 
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:956
-msgid "fixed"
-msgstr "fixé"
-
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1427
-msgid "01/01/00, 01:00 AM"
+#. Constants
+#: libnautilus-extensions/nautilus-global-preferences.c:50
+msgid "Nautilus Preferences"
+msgstr "Préférences de Nautilus"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "toujours"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "Toujours"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "uniquement local"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "Uniquement les fichiers locaux"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "jamais"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "Jamais"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "Rendu graphique"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "Utilise un rendu anti-aliasé (mais plus lent)"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "Polices"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+msgid "Font for Icon view:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1428
-msgid "1/1/00, 1:00 AM"
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1429
-msgid " 1/ 1/00,  1:00 AM"
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "Usine pour les vues d'historiques"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
 msgstr ""
 
-#. Constants
-#: libnautilus-extensions/nautilus-global-preferences.c:50
-msgid "Nautilus Preferences"
-msgstr "Préférences de Nautilus"
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "Utiliser Nautilus pour l'affichage du bureau"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:97
-msgid "current theme"
-msgstr "theme courant"
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+#, fuzzy
+msgid "Opening New Windows"
+msgstr "Ouvrir dans une _nouvelle fenêtre"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:100
+#: libnautilus-extensions/nautilus-global-preferences.c:651
 #, fuzzy
 msgid "Open each file or folder in a separate window"
 msgstr "Ouvrir chaque élément dans une nouvelle fenêtre"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:103
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+#, fuzzy
+msgid "Display toolbar in new windows"
+msgstr "Affiche la barre d'outils dans les nouvelles fenêtres"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "Affiche la barre de localisation dans les nouvelles fenêtres"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "Affiche la barre d'état dans les nouvelles fenêtres"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "Affiche le paneau latéral dans les nouvelles fenêtres"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "Corbeille"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:686
 #, fuzzy
-msgid "Ask before emptying the Trash"
+msgid "Ask before emptying the Trash or deleting files"
 msgstr "Demander avant de détruire des éléments de la corbeille"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:106
-#: libnautilus-extensions/nautilus-global-preferences.c:597
-msgid "Click Behavior"
-msgstr "Click"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
+
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:109
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 msgid "single"
 msgstr "simpe"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:110
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "Active les éléments avec un simple click"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:114
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "double"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:115
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "Active les éléments avec un double click"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:119
-#: libnautilus-extensions/nautilus-global-preferences.c:604
-msgid "Executable Text Files"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-global-preferences.c:122
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 msgid "launch"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:123
+#: libnautilus-extensions/nautilus-global-preferences.c:726
 msgid "Execute files when they are clicked"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:127
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 msgid "display"
 msgstr "affichage"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:128
+#: libnautilus-extensions/nautilus-global-preferences.c:730
 msgid "Display files when they are clicked"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:132
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 msgid "ask"
 msgstr "demander"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:133
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 msgid "Ask each time"
 msgstr "Demander chaque fois"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:143
-#: libnautilus-extensions/nautilus-global-preferences.c:725
-msgid "Show Text in Icons"
-msgstr "Afficher le texte dans les icônes"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:146
-#: libnautilus-extensions/nautilus-global-preferences.c:732
-msgid "Show Count of Items in Folders"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-global-preferences.c:149
-#: libnautilus-extensions/nautilus-global-preferences.c:739
-msgid "Show Thumbnails for Image Files"
-msgstr "Afficher des mini-images pour les fichiers images"
-
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:152
-#: libnautilus-extensions/nautilus-global-preferences.c:755
-msgid "Make Folder Appearance Details Public"
-msgstr "L'apparence des répertoires est public"
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "Click"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:155
-#: libnautilus-extensions/nautilus-global-preferences.c:746
-msgid "Preview Sound Files"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Use smoother (but slower) graphics"
-msgstr "Utilise un rendu anti-aliasé (mais plus lent)"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-#, fuzzy
-msgid "Use this font family to display file names:"
-msgstr "Fonte utilisée pour l'affichage des noms de fichiers"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-#, fuzzy
-msgid "Display toolbar in new windows"
-msgstr "Affiche la barre d'outils dans les nouvelles fenêtres"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:170
-msgid "Display location bar in new windows"
-msgstr "Affiche la barre de localisation dans les nouvelles fenêtres"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:173
-msgid "Display status bar in new windows"
-msgstr "Affiche la barre d'état dans les nouvelles fenêtres"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:176
-msgid "Display sidebar in new windows"
-msgstr "Affiche le paneau latéral dans les nouvelles fenêtres"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:179
-msgid "Use Nautilus to draw the desktop"
-msgstr "Utiliser Nautilus pour l'affichage du bureau"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:183
-msgid "Enable fast search (indexes your hard drive)"
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:186
-msgid "search type to do by default"
-msgstr "recherche par défaut"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:189
-msgid "search by text"
-msgstr "recherche par nom"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:190
-#, fuzzy
-msgid "Search for files by file name only"
-msgstr "Rechercher de fichiers par nom seulement"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:194
-msgid "search by text and properties"
-msgstr "recherche par nom et propriétés"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:195
-#, fuzzy
-msgid "Search for files by file name and file properties"
-msgstr "Recherche de fichiers par nom et par propriétés"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:199
-#, fuzzy
-msgid "Search Engine Location"
-msgstr "Moteur de recherche Web"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:203
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 #, fuzzy
 msgid "Show hidden files (file names start with \".\")"
 msgstr "Affiche les fichiers cachés (commançant par \".\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:206
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 #, fuzzy
 msgid "Show backup files (file names end with \"~\")"
 msgstr "Affiche les fichiers de sauvegarde (commançant par \"~\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:209
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr "Afficher les permissions spéciales dans la fenêtre Propriétés"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:212
-msgid "Show only folders (no files) in the tree"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-global-preferences.c:215
-msgid "Can add Content"
-msgstr "Possibilité d'ajouter des éléments"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:218
+#: libnautilus-extensions/nautilus-global-preferences.c:778
 #, fuzzy
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
-msgstr "Ne pas inclure les signets par défaut dans le menu"
+msgid "Sorting Order"
+msgstr "Erreur dans l'attribution du propriétaire"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:222
-#: libnautilus-extensions/nautilus-global-preferences.c:227
-#: src/file-manager/fm-properties-window.c:1519 src/nautilus-location-bar.c:62
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
 msgid "Location:"
 msgstr "Emplacement:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:226
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+#, fuzzy
+msgid "HTTP Proxy Settings"
+msgstr "Paramètres du Proxy"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "Utiliser un Proxy HTTP"
 
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:228
+#: libnautilus-extensions/nautilus-global-preferences.c:812
 #: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr "Port:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:533
-msgid "Appearance"
-msgstr "Apparence"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:535
-msgid "Smoother Graphics"
-msgstr "Rendu graphique"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:552
-msgid "Windows & Desktop"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:560
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "Signets par défaut"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:843
 #, fuzzy
-msgid "Opening New Windows"
-msgstr "Ouvrir dans une _nouvelle fenêtre"
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "Ne pas inclure les signets par défaut dans le menu"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:583
-msgid "Trash Behavior"
-msgstr "Corbeille"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "Afficher le texte dans les icônes"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:595
-msgid "Icon & List Views"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:611
-msgid "Show/Hide Options"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "Afficher des mini-images pour les fichiers images"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:632
-msgid "Sidebar Panels"
-msgstr "Panneaux latéraux"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:635
-#, fuzzy
-msgid "Tabs"
-msgstr "Corbeille"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr "L'apparence des répertoires est public"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:684
-msgid "Navigation"
-msgstr "Navigation"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "Apparence"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:693
-#, fuzzy
-msgid "HTTP Proxy Settings"
-msgstr "Paramètres du Proxy"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:712
-msgid "Built-in Bookmarks"
-msgstr "Signets par défaut"
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+msgid "Navigation"
+msgstr "Navigation"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:723
+#: libnautilus-extensions/nautilus-global-preferences.c:962
 msgid "Speed Tradeoffs"
 msgstr "Accélération affichage"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:794
-msgid "Search"
-msgstr "Chercher"
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr "recherche par nom"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+#, fuzzy
+msgid "Search for files by file name only"
+msgstr "Rechercher de fichiers par nom seulement"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr "recherche par nom et propriétés"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+#, fuzzy
+msgid "Search for files by file name and file properties"
+msgstr "Recherche de fichiers par nom et par propriétés"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "Complexité de recherche"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:802
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "recherche par défaut"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 msgid "Fast Search"
 msgstr "Recherche rapide"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:846
-msgid "Fonts"
-msgstr "Polices"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1026
-#, c-format
-msgid "Display %s tab in sidebar"
-msgstr "Afficher l'onglet %s dans la barre de coté"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1073
-msgid "always"
-msgstr "toujours"
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+#, fuzzy
+msgid "Search Engine Location"
+msgstr "Moteur de recherche Web"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1074
-msgid "Always"
-msgstr "Toujours"
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Chercher"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1077
-msgid "local only"
-msgstr "uniquement local"
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1078
-msgid "Local Files Only"
-msgstr "Uniquement les fichiers locaux"
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, c-format
+msgid "Display %s tab in sidebar"
+msgstr "Afficher l'onglet %s dans la barre de coté"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1081
-msgid "never"
-msgstr "jamais"
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "Panneaux latéraux"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1082
-msgid "Never"
-msgstr "Jamais"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+#, fuzzy
+msgid "Tabs"
+msgstr "Corbeille"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1145
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "currently can't be performed because the program crond, which does nightly "
@@ -5780,13 +5837,13 @@ msgid ""
 "done, turn crond on."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1152
-#: libnautilus-extensions/nautilus-global-preferences.c:1170
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
 msgid "Files May Not Be Indexed"
 msgstr "Des fichiers peuvent ne pas être indexés"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1153
-#: libnautilus-extensions/nautilus-global-preferences.c:1171
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
 msgid ""
 "If you are running Linux, you can log in as root and type these commands to "
 "start cron:\n"
@@ -5800,7 +5857,7 @@ msgstr ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1162
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "may not be performed because the program crond, which does nightly tasks on "
@@ -5809,22 +5866,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-gnome-extensions.c:640
-msgid "No image was selected.  You must click on an image to select it."
-msgstr ""
-"Aucune image sélectionnée. Vous devez cliquer sur une image pour la "
-"sélectionner."
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:641
-msgid "No selection made"
-msgstr "Aucune sélection faite"
-
 #. The list of characters that cause line breaks can be localized.
 #: libnautilus-extensions/nautilus-icon-canvas-item.c:70
 msgid " -_,;.?/&"
 msgstr " -_,;.?/&"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:766
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
@@ -5834,7 +5881,7 @@ msgstr ""
 "basculer en mode manuel et laisser l'élément à cet endroit ? Ceci changera "
 "le mode de réorganisation en manuel."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:770
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
@@ -5844,7 +5891,7 @@ msgstr ""
 "basculer en mode manuel et laisser les éléments à cet endroit ? Ceci "
 "changera le mode de réorganisation en manuel."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:776
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
@@ -5852,7 +5899,7 @@ msgstr ""
 "Ce répertoire utilise un mode de réorganisation automatique. Voulez-vous "
 "basculer en mode manuel et laisser l'élément à cet endroit ?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:779
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
@@ -5860,64 +5907,48 @@ msgstr ""
 "Ce répertoire utilise un mode de réorganisation automatique. Voulez-vous "
 "basculer en mode manuel et laisser les éléments à cet endroit ?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:784
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "Basculer en réorganisation manuelle ?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:785
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "Basculer"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "Renommer"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1551
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr "Annuler saisie"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1552
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "Reprendre l'ancien nom"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1553
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "Recommencer saisie"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1554
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Restaurer le nom modifié"
 
-#: libnautilus-extensions/nautilus-password-dialog.c:306
-msgid "Remember this password"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-preferences-item.c:483
-msgid "times"
-msgstr "times"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:484
-msgid "courier"
-msgstr "courier"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:485
-msgid "lucida"
-msgstr "lucida"
-
-#: libnautilus-extensions/nautilus-preferences.c:76
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "Débutant"
 
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "Intermédaire"
 
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "Expert"
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:202
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "Préférences"
 
@@ -6016,7 +6047,7 @@ msgid "Don't include in the menu for \"%s\" items"
 msgstr "Ne pas inclure dans le menu les éléments de type « %s »"
 
 #: libnautilus-extensions/nautilus-program-chooser.c:1209
-#: src/file-manager/fm-list-view.c:2123
+#: src/file-manager/fm-list-view.c:2182
 #: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
@@ -6375,25 +6406,6 @@ msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr ""
 "Éléments qui contiennent « medusa » dans leur nom et sont des répertoires."
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr "Détails"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr "Attention"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr "Erreur"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr "Question"
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr "Recherche les disques"
@@ -6402,7 +6414,7 @@ msgstr "Recherche les disques"
 msgid "Nautilus is searching your disks for trash folders."
 msgstr "Nautilus recherche des dossiers corbeille dans vos disques."
 
-#: libnautilus-extensions/nautilus-trash-file.c:600
+#: libnautilus-extensions/nautilus-trash-file.c:725
 msgid "on the desktop"
 msgstr "sur le bureau"
 
@@ -6436,47 +6448,45 @@ msgstr "Voir en tant que %s"
 msgid "%s Viewer"
 msgstr "Visionneur de %s"
 
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+#, fuzzy
+msgid "Unknown"
+msgstr "inconnu"
+
 #. Populate table with items we know localized names for.
-#: libnautilus-extensions/nautilus-volume-monitor.c:623
-#: libnautilus-extensions/nautilus-volume-monitor.c:1862
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr "Disquette"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:624
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:625
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
 msgid "Zip Drive"
 msgstr "Lecteur Zip"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:646
-#: libnautilus-extensions/nautilus-volume-monitor.c:668
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 msgid "Audio CD"
 msgstr "CD audio"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1547
-msgid "Mount Error"
-msgstr "Erreur de montage"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1549
-msgid "Unmount Error"
-msgstr "Erreur de démontage"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1579
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr "est protégé en écriture, montage en lecture seule"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1582
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "n'est pas un périphérique bloc valide"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1583
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr "Aucun média trouvé"
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1587
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
@@ -6485,7 +6495,7 @@ msgstr ""
 "disquette dans le lecteur."
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1591
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
@@ -6493,12 +6503,12 @@ msgstr ""
 "Nautilus a été incapable de monter le volume.  Il n'y a probablement pas de "
 "média dans le périphérique."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1594
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr ""
 "mauvais type de système de fichiers, mauvaise option, mauvais superbloc"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1597
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
@@ -6506,7 +6516,7 @@ msgstr ""
 "Nautilus est incapable de monter la disquette.  La disquette est "
 "probablement dans un format qui ne peut être monté."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1600
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
@@ -6514,50 +6524,58 @@ msgstr ""
 "Nautilus est incapable de monter le volume sélectionné.  Le volume est "
 "probablement dans un format qui ne peut être monté."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1605
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr "Nautilus est incapable de monter la disquette sélectionnée."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1607
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "Nautilus est incapable de monter le volume sélectionné."
 
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1612
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr "Nautilus est incapable de démonter le volume sélectionné."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1764
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr "Erreur de montage"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr "Erreur de démontage"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "Volume de type ISO 9660"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1779
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "Racine"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1786
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Volume de type Ext2"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1801
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "Volume de type MSDOS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1816
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "Volume de type NFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1831
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
 #, fuzzy
 msgid "ReiserFS Volume"
 msgstr "Volume de type NFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1847
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
 #, fuzzy
 msgid "UFS Volume"
 msgstr "Volume de type NFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1877
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "Volume inconnu"
 
@@ -6565,31 +6583,65 @@ msgstr "Volume inconnu"
 msgid "C_lear Text"
 msgstr "_Effacer le texte"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "_Effacer le texte"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "_Copier le texte"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "Copie le texte sélectionné dans le presse-papiers"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "Co_uper le texte"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+msgid "Cut _Text"
+msgstr "Co_uper le texte"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "Coupe le texte sélectionné dans le presse-papiers"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:46
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "C_oller le texte"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "Colle le texte contenu dans le presse-papiers"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "Efface le texte sélectionné sans le placer dans le presse-papiers"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:80
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "Sélectionner _tout"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+msgid "Select _All"
+msgstr "Sélectionner _tout"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "Sélectionner tous les éléments de cette fenêtre"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "_Copier le texte"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:7
-msgid "_Cut Text"
-msgstr "Co_uper le texte"
-
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:93
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "C_oller le texte"
 
@@ -6598,7 +6650,7 @@ msgstr "C_oller le texte"
 #. * to change it when we upgrade to GTK 2.0.
 #.
 #: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
-#: src/nautilus-window-menus.c:563
+#: src/nautilus-window-menus.c:610
 msgid "Nautilus"
 msgstr "Nautilus"
 
@@ -6614,80 +6666,112 @@ msgstr "Gestionnaire de fichier Nautilus et shell graphique"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:735
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr "Rép. perso %.0s"
 
-#: src/file-manager/fm-desktop-icon-view.c:1021
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "Vider la corbeille..."
 
-#: src/file-manager/fm-desktop-icon-view.c:1023
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "Vider la corbeille"
 
-#: src/file-manager/fm-desktop-icon-view.c:1043
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "Démonter le volume"
 
-#: src/file-manager/fm-directory-view.c:474
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr ""
 "Cette opération ouvrira %d fenêtres indépendantes. Êtes-vous sûr de vouloir "
 "faire cela ?"
 
-#: src/file-manager/fm-directory-view.c:476
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Ouvrir %d fenêtres ?"
 
-#: src/file-manager/fm-directory-view.c:1212
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr ""
+"Êtes-vous sûr de vouloir supprimer définitivement « %s » de la corbeille ?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+"Êtes-vous sûr de vouloir supprimer définitivement les %d éléments "
+"sélectionnés de la corbeille ?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Supprimer"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Supprimer"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+msgid "scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "« %s » sélectionné"
 
-#: src/file-manager/fm-directory-view.c:1214
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "1 répertoire sélectionné"
 
-#: src/file-manager/fm-directory-view.c:1217
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "%d répertoires sélectionnés"
 
-#: src/file-manager/fm-directory-view.c:1223
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr " (sans élément)"
 
-#: src/file-manager/fm-directory-view.c:1225
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr " (contenant 1 élément)"
 
-#: src/file-manager/fm-directory-view.c:1227
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr " (contenant %d éléments)"
 
-#: src/file-manager/fm-directory-view.c:1238
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "« %s » sélectionné (%s)"
 
-#: src/file-manager/fm-directory-view.c:1242
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d éléments sélectionnés (%s)"
 
-#: src/file-manager/fm-directory-view.c:1249
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 autre élément sélectionné (%s)"
 
-#: src/file-manager/fm-directory-view.c:1252
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d autres éléments sélectionnés (%s)"
@@ -6699,7 +6783,7 @@ msgstr "%d autres éléments sélectionnés (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1281
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -6708,7 +6792,7 @@ msgstr "%s%s, %s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1407
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
@@ -6717,11 +6801,11 @@ msgstr ""
 "Le répertoire « %s » contient plus de fichiers que Nautilus peut en gérer. "
 "Quelques fichiers ne seront pas affichés."
 
-#: src/file-manager/fm-directory-view.c:1414
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "Beaucoup trop de fichiers"
 
-#: src/file-manager/fm-directory-view.c:2623
+#: src/file-manager/fm-directory-view.c:2752
 #, c-format
 msgid ""
 "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
@@ -6729,7 +6813,7 @@ msgstr ""
 "« %s » ne peut être déplacé dans la corbeille. Voulez-vous le supprimer "
 "immédiatement ?"
 
-#: src/file-manager/fm-directory-view.c:2628
+#: src/file-manager/fm-directory-view.c:2757
 #, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
@@ -6738,7 +6822,7 @@ msgstr ""
 "Les %d éléments sélectionnés ne peuvent être déplacés dans la corbeille. "
 "Voulez-vous les supprimer immédiatement ?"
 
-#: src/file-manager/fm-directory-view.c:2632
+#: src/file-manager/fm-directory-view.c:2761
 #, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -6747,22 +6831,17 @@ msgstr ""
 "%d des éléments sélectionnés ne peuvent être déplacés dans la corbeille. "
 "Voulez-vous supprimer ces %d éléments immédiatement ?"
 
-#: src/file-manager/fm-directory-view.c:2640
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "Supprimer immédiatement?"
 
-#: src/file-manager/fm-directory-view.c:2641
-#: src/file-manager/fm-directory-view.c:2682
-msgid "Delete"
-msgstr "Supprimer"
-
-#: src/file-manager/fm-directory-view.c:2671
+#: src/file-manager/fm-directory-view.c:2799
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr ""
 "Êtes-vous sûr de vouloir supprimer définitivement « %s » de la corbeille ?"
 
-#: src/file-manager/fm-directory-view.c:2675
+#: src/file-manager/fm-directory-view.c:2803
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
@@ -6771,75 +6850,213 @@ msgstr ""
 "Êtes-vous sûr de vouloir supprimer définitivement les %d éléments "
 "sélectionnés de la corbeille ?"
 
-#: src/file-manager/fm-directory-view.c:2681
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "Supprimer de la corbeille ?"
 
-#: src/file-manager/fm-directory-view.c:2978
-#: src/file-manager/fm-directory-view.c:3018
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Utiliser « %s » pour ouvrir l'élément sélectionné"
 
-#: src/file-manager/fm-directory-view.c:3220
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "Autre _application..."
+
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "Autre _application..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "Autre _visionneur..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "Autre _visionneur..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "Utiliser « %s » pour ouvrir l'élément sélectionné"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "Nautilus est incapable de monter le volume sélectionné."
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"Les %d éléments sélectionnés ne peuvent être déplacés dans la corbeille. "
+"Voulez-vous les supprimer immédiatement ?"
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "Ouvrir dans une _nouvelle fenêtre"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open _in New Window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
-#: src/file-manager/fm-directory-view.c:3222
+#: src/file-manager/fm-directory-view.c:3959
 #, c-format
 msgid "Open _in %d New Windows"
 msgstr "Ouvrir dans %d _nouvelles fenêtres"
 
-#: src/file-manager/fm-directory-view.c:3248
-msgid "Delete all selected items permanently"
-msgstr "Supprimer tous les éléments sélectionnés définitivement"
-
-#: src/file-manager/fm-directory-view.c:3253
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "Supprimer de la _corbeille..."
 
-#: src/file-manager/fm-directory-view.c:3254
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "_Supprimer de la corbeille"
 
-#: src/file-manager/fm-directory-view.c:3258
-msgid "Move all selected items to the Trash"
-msgstr "Déplacer tous les éléments sélectionnés dans la corbeille"
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "Supprimer tous les éléments sélectionnés définitivement"
 
-#: src/file-manager/fm-directory-view.c:3262
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "_Déplacer dans la corbeille"
 
-#: src/file-manager/fm-directory-view.c:3292
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "Déplacer tous les éléments sélectionnés dans la corbeille"
+
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "Supprimer"
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "Supprimer"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "Créer des _liens"
 
-#: src/file-manager/fm-directory-view.c:3293
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "Créer un _lien"
 
-#: src/file-manager/fm-directory-view.c:3311
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "_Vider la corbeille..."
 
-#: src/file-manager/fm-directory-view.c:3312
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "_Vider la corbeille"
 
-#: src/file-manager/fm-directory-view.c:3323
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "_Enlever les images personnalisées"
 
-#: src/file-manager/fm-directory-view.c:3324
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "_Enlever l'image personnalisée"
 
-#: src/file-manager/fm-directory-view.c:3477
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "_Fichier"
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u fichiers"
+
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "_Copier le texte"
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "Copie de fichiers"
+
+#: src/file-manager/fm-directory-view.c:4252
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
 "link in the Trash?"
@@ -6847,7 +7064,7 @@ msgstr ""
 "Ce lien ne peut être utilisé, car il ne pointe sur rien. Voulez-vous envoyer "
 "ce lien dans la corbeille ?"
 
-#: src/file-manager/fm-directory-view.c:3480
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
@@ -6856,15 +7073,15 @@ msgstr ""
 "Ce lien ne peut être utilisé, car sa cible « %s » n'existe pas. Voulez-vous "
 "envoyer ce lien dans la corbeille ?"
 
-#: src/file-manager/fm-directory-view.c:3486
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "Lien rompu"
 
-#: src/file-manager/fm-directory-view.c:3487
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr "Passer outre"
 
-#: src/file-manager/fm-directory-view.c:3540
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
@@ -6873,19 +7090,19 @@ msgstr ""
 "« %s » est un fichier texte exécutable. Voulez-vous le lancer ou afficher "
 "son contenu ?"
 
-#: src/file-manager/fm-directory-view.c:3546
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr "Lancer ou afficher ?"
 
-#: src/file-manager/fm-directory-view.c:3547
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "Lancer"
 
-#: src/file-manager/fm-directory-view.c:3548
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "Afficher"
 
-#: src/file-manager/fm-directory-view.c:3602
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
@@ -6893,16 +7110,16 @@ msgstr ""
 "Désolé, mais vous ne pouvez pas exécuter des commandes à partir d'un site "
 "distant pour des raisons de sécurité."
 
-#: src/file-manager/fm-directory-view.c:3604
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "Impossible de lancer les liens distants"
 
-#: src/file-manager/fm-directory-view.c:3738
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr "Ouverture de « %s »"
 
-#: src/file-manager/fm-directory-view.c:3744
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "Annuler l'ouverture ?"
 
@@ -6914,16 +7131,21 @@ msgstr ""
 "Vous n'avez pas les permissions nécessaire pour visualiser le contenu de « "
 "%s »."
 
-#: src/file-manager/fm-error-reporting.c:65
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Désolé, ne peut afficher tout le contenu de « %s »."
 
-#: src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Erreur d'affichage du dossier"
 
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
@@ -6931,7 +7153,7 @@ msgstr ""
 "Le nom « %s » est déjà utilisé dans ce répertoire. Veuillez utiliser un nom "
 "différent."
 
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
@@ -6939,12 +7161,12 @@ msgstr ""
 "Il n'y a pas de « %s » dans ce répertoire. Peut-être vient-il juste d'être "
 "déplacé ou supprimé ?"
 
-#: src/file-manager/fm-error-reporting.c:109
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Vous n'avez pas les permissions nécessaires pour renommer « %s »."
 
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -6953,64 +7175,64 @@ msgstr ""
 "Le nom « %s » n'est pas valide car il contient le caractère « / ». Veuillez "
 "utiliser un nom différent."
 
-#: src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Le nom « %s » n'est pas valide. veuillez utiliser un nom différent."
 
-#: src/file-manager/fm-error-reporting.c:124
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Ne peut changer le nom de « %s » car il est sur un disque en lecture seule"
 
-#: src/file-manager/fm-error-reporting.c:133
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Désolé, ne peut renommer « %s » en « %s »."
 
-#: src/file-manager/fm-error-reporting.c:140
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "Erreur dans le changement de nom"
 
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Vous n'avez pas l'autorisation de changer le groupe de « %s »."
 
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
 "ne peut changer le groupe de « %s » car il est sur un disque en lecture seule"
 
-#: src/file-manager/fm-error-reporting.c:172
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Désolé, ne peut changer le groupe de « %s »."
 
-#: src/file-manager/fm-error-reporting.c:176
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "Erreur dans l'attribution du groupe"
 
-#: src/file-manager/fm-error-reporting.c:198
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Ne peut changer le propriétaire de « %s » car il est sur un disque en "
 "lecture seule"
 
-#: src/file-manager/fm-error-reporting.c:205
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Désolé, ne peut changer le propriétaire de « %s »."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "Erreur dans l'attribution du propriétaire"
 
-#: src/file-manager/fm-error-reporting.c:230
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
@@ -7018,21 +7240,21 @@ msgstr ""
 "Ne peut changer les permissions de « %s » car il est sur un disque en "
 "lecture seule"
 
-#: src/file-manager/fm-error-reporting.c:237
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Désolé, ne peut changer les permissions de « %s »."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "Erreur dans l'attribution des permissions"
 
-#: src/file-manager/fm-error-reporting.c:306
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Renommage de « %s » vers « %s »."
 
-#: src/file-manager/fm-error-reporting.c:311
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "Annuler le changement de nom?"
 
@@ -7093,76 +7315,76 @@ msgstr ""
 "Plus vous zoomez sur un élément et plus les informations qui vont apparaître "
 "seront nombreuses."
 
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "Par _Nom"
 
-#: src/file-manager/fm-icon-view.c:159
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "Les éléments apparaissent triés par nom"
 
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "Par T_aille"
 
-#: src/file-manager/fm-icon-view.c:166
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "Les éléments apparaissent triés par taille"
 
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "Par _Type"
 
-#: src/file-manager/fm-icon-view.c:173
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "Les éléments apparaissent triés par type"
 
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "Par _Date de Modification"
 
-#: src/file-manager/fm-icon-view.c:180
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Les éléments apparaissent triés par date"
 
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "Par _Emblèmes"
 
-#: src/file-manager/fm-icon-view.c:187
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Les éléments apparaissent triés par emblèmes"
 
-#: src/file-manager/fm-icon-view.c:1230
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "Rest_aurer les icône à leur taille initiale"
 
-#: src/file-manager/fm-icon-view.c:1231
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "Rest_aurer l'icône à sa taille initiale"
 
-#: src/file-manager/fm-icon-view.c:1443
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "pointe sur « %s »"
 
-#: src/file-manager/fm-list-view.c:2129
+#: src/file-manager/fm-list-view.c:2188
 #: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Taille"
 
-#: src/file-manager/fm-list-view.c:2135
+#: src/file-manager/fm-list-view.c:2194
 #: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Type"
 
-#: src/file-manager/fm-list-view.c:2141
+#: src/file-manager/fm-list-view.c:2200
 #: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Date de modification"
@@ -7219,122 +7441,128 @@ msgstr "(quelques éléments sont impossible à lire)"
 msgid "Contents:"
 msgstr "Contenu :"
 
-#: src/file-manager/fm-properties-window.c:1433
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "Général"
 
-#: src/file-manager/fm-properties-window.c:1512
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Type :"
 
-#: src/file-manager/fm-properties-window.c:1517
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "Taille :"
 
-#: src/file-manager/fm-properties-window.c:1521
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "Liens"
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
 msgstr "Type MIME :"
 
-#: src/file-manager/fm-properties-window.c:1527
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "Dernière modification :"
 
-#: src/file-manager/fm-properties-window.c:1530
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "Dernier accès :"
 
-#: src/file-manager/fm-properties-window.c:1539
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr "Sélectionner une icône personnalisée..."
 
-#: src/file-manager/fm-properties-window.c:1545
+#: src/file-manager/fm-properties-window.c:1558
 msgid "Remove Custom Icon"
 msgstr "Enlever l'icône personnalisée"
 
-#: src/file-manager/fm-properties-window.c:1873
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "Bit UID"
 
-#: src/file-manager/fm-properties-window.c:1878
+#: src/file-manager/fm-properties-window.c:1891
 msgid "Special Flags:"
 msgstr "Permissions spéciales :"
 
-#: src/file-manager/fm-properties-window.c:1881
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "Bit GID"
 
-#: src/file-manager/fm-properties-window.c:1883
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "Sticky bit"
 
-#: src/file-manager/fm-properties-window.c:1909
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Permissions"
 
-#: src/file-manager/fm-properties-window.c:1915
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
 "Vous n'êtes pas le propriétaire de cet élément, vous ne pouvez donc pas en "
 "changer les permissions."
 
-#: src/file-manager/fm-properties-window.c:1928
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "Propriétaire :"
 
-#: src/file-manager/fm-properties-window.c:1937
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "Groupe :"
 
-#: src/file-manager/fm-properties-window.c:1955
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "Propriétaire :"
 
-#: src/file-manager/fm-properties-window.c:1956
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "Groupe :"
 
-#: src/file-manager/fm-properties-window.c:1957
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "Autres :"
 
-#: src/file-manager/fm-properties-window.c:1976
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "Lecture"
 
-#: src/file-manager/fm-properties-window.c:1980
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "Écriture"
 
-#: src/file-manager/fm-properties-window.c:1984
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "Exécution"
 
-#: src/file-manager/fm-properties-window.c:2035
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "En mode texte :"
 
-#: src/file-manager/fm-properties-window.c:2036
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "En mode numérique :"
 
-#: src/file-manager/fm-properties-window.c:2037
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "Dernier changement :"
 
-#: src/file-manager/fm-properties-window.c:2041
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Impossible de déterminer les permissions de « %s »."
 
-#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr "Annuler l'affichage de la fenêtre Propriétés ?"
 
-#: src/file-manager/fm-properties-window.c:2322
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr "Création de la fenêtre Propriétés"
 
-#: src/file-manager/fm-properties-window.c:2422
+#: src/file-manager/fm-properties-window.c:2435
 msgid "Select an icon:"
 msgstr "Sélectionnez une icône :"
 
@@ -7356,7 +7584,7 @@ msgid ""
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:159
-#: src/file-manager/nautilus-indexing-info.c:405
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr "Le service de recherche n'est pas disponible"
 
@@ -7496,7 +7724,7 @@ msgstr ""
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
 #: src/file-manager/fm-search-list-view.c:360
-#: src/file-manager/nautilus-indexing-info.c:340
+#: src/file-manager/nautilus-indexing-info.c:342
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
@@ -7508,20 +7736,20 @@ msgid "Fast searches are not available on your computer"
 msgstr "La recherche rapide n'est pas disponible sur votre ordinateur"
 
 #: src/file-manager/fm-search-list-view.c:373
-#: src/file-manager/nautilus-indexing-info.c:359
+#: src/file-manager/nautilus-indexing-info.c:361
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Fast search is disabled in your Search preferences, so no index is available."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:376
-#: src/file-manager/nautilus-indexing-info.c:345
-#: src/file-manager/nautilus-indexing-info.c:363
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
 msgid "Fast searches are not available on your computer."
 msgstr "La recherche rapide n'est pas disponible sur votre ordinateur."
 
 #: src/file-manager/fm-search-list-view.c:377
-#: src/file-manager/nautilus-indexing-info.c:364
+#: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
 "To enable fast search, open the Preferences menu and choose Preferences. "
 "Then select Search preferences and put a checkmark in the Enable Fast Search "
@@ -7573,7 +7801,7 @@ msgid "Change Desktop Background"
 msgstr "Changer le fond d'écran"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Delete all items in the Trash"
 msgstr "Supprimer tous les éléments de la corbeille"
 
@@ -7620,141 +7848,192 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Choisir un autre visionneur pour afficher l'élément sélectionné"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-msgid "Create Link"
-msgstr "Créer un lien"
+#, fuzzy
+msgid "Copy Files"
+msgstr "Copie de fichiers"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "Créer un répertoire vide dans ce répertoire"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "Créer un lien symbolique pour chaque élément sélectionné"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u fichiers"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "Déplacer chaque élément sélectionné dans la corbeille"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "Dupliquer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "Dupliquer chaque élément sélectionné"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "Créer un lien"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr "Déplacer chaque élément sélectionné dans la corbeille"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Move to Trash"
 msgstr "Déplacer dans la corbeille"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "Nouveau répertoire"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid "Open Wit_h"
 msgstr "Ouvrir _avec"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "Ouvrir avec"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "Ouvrir chaque élément sélectionné dans une nouvelle fenêtre"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr "Ouvrir dans une nouvelle fenêtre"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Ouvrir l'élément sélectionné dans cette fenêtre"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "Autre application..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "Autre visionneur..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Other _Application..."
-msgstr "Autre _application..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "C_oller le texte"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-msgid "Other _Viewer..."
-msgstr "Autre _visionneur..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr "Enlever les images personnalisées"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr "Enlever toutes les images personnalisées de l'icône sélectionné"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr ""
 "Enlever tous les motifs ou couleurs de l'arrière-plan de cet emplacement"
 
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "Réinitialiser l'arrière-plan"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+msgid "Scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr "Sélectionner tous les fichiers"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Select _All Files"
 msgstr "Sélectionner _tous les fichiers"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "Sélectionner tous les éléments de cette fenêtre"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr "Afficher les propriétés"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Show Trash"
 msgstr "Afficher la corbeille"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "Voir les _propriétés"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "Show the contents of the Trash"
 msgstr "Afficher le contenu de la corbeille"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "Voir ou modifier les propriétés de chaque élément sélectionné"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "D_upliquer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_New Folder"
 msgstr "_Nouveau répertoire"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "C_oller le texte"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Show Trash"
 msgstr "_Afficher la corbeille"
 
@@ -7930,7 +8209,7 @@ msgstr ""
 
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr "État de l'indexation"
 
@@ -7948,11 +8227,11 @@ msgstr ""
 msgid "Your files were last indexed at %s"
 msgstr "Dernière indexation de vos fichiers à %s"
 
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "Mettre à jour maintenant"
 
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast.  Your files are currently being indexed."
@@ -7961,11 +8240,11 @@ msgstr ""
 "rendre vos recherches plus rapides. Vos fichiers sont en train d'être "
 "indexés."
 
-#: src/file-manager/nautilus-indexing-info.c:404
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Désolé, mais le service de recherche par medusa n'est pas disponible."
 
-#: src/file-manager/nautilus-indexing-info.c:426
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -8126,7 +8405,7 @@ msgstr "Signets"
 msgid "Location"
 msgstr "Emplacement"
 
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:757
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -8308,7 +8587,7 @@ msgstr "Activer la recherche rapide"
 msgid "Turn fast search on when cron is enabled"
 msgstr "Activer la recherche rapide lorsque cron est activé"
 
-#: src/nautilus-first-time-druid.c:1028
+#: src/nautilus-first-time-druid.c:1027
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "currently can't be performed because the program crond, which does\n"
@@ -8322,7 +8601,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1036
+#: src/nautilus-first-time-druid.c:1035
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "may not be performed because the program crond, which does nightly tasks\n"
@@ -8336,7 +8615,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1123
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
 "Click Finish to launch Nautilus. You'll start with two\n"
 "Nautilus windows: one shows your home folder, and the\n"
@@ -8352,7 +8631,7 @@ msgstr ""
 "\n"
 "Nous espérons que vous apprécierez Nautilus !"
 
-#: src/nautilus-first-time-druid.c:1130
+#: src/nautilus-first-time-druid.c:1129
 msgid ""
 "Click Finish to launch Nautilus. You'll start with a\n"
 "window showing your home folder.\n"
@@ -8364,15 +8643,15 @@ msgstr ""
 "\n"
 "Nous espérons que vous apprécierez Nautilus !"
 
-#: src/nautilus-first-time-druid.c:1154
+#: src/nautilus-first-time-druid.c:1153
 msgid "Nautilus First Time Setup"
 msgstr "Première configuration de Nautilus"
 
-#: src/nautilus-first-time-druid.c:1184
+#: src/nautilus-first-time-druid.c:1183
 msgid "Welcome to Nautilus"
 msgstr "Bienvenue dans Nautilus"
 
-#: src/nautilus-first-time-druid.c:1186
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
 "Nautilus...\n"
 "    Is a great file manager for the GNOME desktop.\n"
@@ -8393,51 +8672,51 @@ msgstr ""
 "Cliquez sur « Suivant » pour personnaliser votre environnement Nautilus."
 
 #. set up the final page
-#: src/nautilus-first-time-druid.c:1197
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "Terminé"
 
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1210
+#: src/nautilus-first-time-druid.c:1209
 msgid "Choose Your User Level"
 msgstr "Choisissez votre niveau d'utilisateur"
 
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1214
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr "Transition GMC vers Nautilus"
 
 #. set up the `Launch Medusa' page
-#: src/nautilus-first-time-druid.c:1218
+#: src/nautilus-first-time-druid.c:1217
 msgid "Fast Searches"
 msgstr "Recherches rapides"
 
 #. set up optional page to tell the user how to run cron
-#: src/nautilus-first-time-druid.c:1226
+#: src/nautilus-first-time-druid.c:1225
 msgid "The Cron Daemon"
 msgstr "Le démon cron"
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1231
+#: src/nautilus-first-time-druid.c:1230
 msgid "Checking Your Internet Connection"
 msgstr "Vérification de votre connexion Internet"
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1242
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "Mise à jour de Nautilus..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1250
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "Configuration du Proxy"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1325
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "Mise à jour en cours..."
 
-#: src/nautilus-first-time-druid.c:1342
+#: src/nautilus-first-time-druid.c:1341
 msgid "Update Complete. Click Next to Continue."
 msgstr "Mise à jour terminée. Cliquez sur le bouton Suivant pour continuer."
 
@@ -8445,7 +8724,7 @@ msgstr "Mise à jour terminée. Cliquez sur le bouton Suivant pour continuer."
 #. * doesn't exist. Arlo and I (jsh) and decided that the
 #. * best thing to do is silently fail
 #.
-#: src/nautilus-first-time-druid.c:1357
+#: src/nautilus-first-time-druid.c:1356
 msgid "No Update Available... Press Next to Continue."
 msgstr ""
 "Aucune mise à jour disponible... Cliquez sur le bouton Suivant pour "
@@ -8474,49 +8753,49 @@ msgstr "Voulez-vous voir ces %d emplacements dans des fenêtres différentes?"
 msgid "View in Multiple Windows?"
 msgstr "Voir dans des fenêtres multiples?"
 
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr "Effectue des rapides tests de cohérence."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "Crée la fenêtre initiale avec la géométrie donnée."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "GÉOMÉTRIE"
 
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 "Ne crée ne nouvelles fenêtres que pour les URIs explicitement spécifiés"
 
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "Quitte Nautilus."
 
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "Relancer Nautilus."
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus : l'option --check ne peut être utilisée avec les URIs.\n"
 
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 "nautilus : l'option --check ne peut être utilisée avec d'autres options.\n"
 
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus : l'option --quit ne peut être utilisée avec les URIs.\n"
 
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus : l'option --restart ne peut être utilisée avec les URIs.\n"
 
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus : l'option --restart ne peut être utilisée avec les URIs.\n"
 
@@ -9013,15 +9292,18 @@ msgid "View as List"
 msgstr "Voir en tant que Liste"
 
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+#, fuzzy
+msgid " _Advanced"
 msgstr " Expert"
 
 #: src/nautilus-shell-ui.xml.h:2
-msgid " Beginner"
+#, fuzzy
+msgid " _Beginner"
 msgstr " Débutant"
 
 #: src/nautilus-shell-ui.xml.h:3
-msgid " Intermediate"
+#, fuzzy
+msgid " _Intermediate"
 msgstr " Intermédaire"
 
 #: src/nautilus-shell-ui.xml.h:4
@@ -9061,157 +9343,141 @@ msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
 #: src/nautilus-shell-ui.xml.h:15
-msgid "Cut _Text"
-msgstr "Co_uper le texte"
-
-#: src/nautilus-shell-ui.xml.h:17
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "Editer les signets du menu"
 
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr "Afficher la liste des créateurs de Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr "Afficher l'aide en ligne de Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:19
 msgid "Display quick reference pages for Nautilus"
 msgstr "Affiche les pages de référence rapide de Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:22
+#: src/nautilus-shell-ui.xml.h:20
 msgid "Display release notes for Nautilus"
 msgstr "Affiche les notes de version de Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:23
+#: src/nautilus-shell-ui.xml.h:21
 msgid "Display support information for Nautilus and Eazel Services"
 msgstr ""
 "Affiche les informations de support concernant Nautilus et les Services Eazel"
 
-#: src/nautilus-shell-ui.xml.h:24
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Display the latest contents of the current location"
 msgstr "Rafraîchir le répertoire courant"
 
-#: src/nautilus-shell-ui.xml.h:25
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr "Afficher la liste des thèmes disponibles"
 
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:24
 msgid "Edit various Nautilus preferences"
 msgstr "Édite diverses préférences Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "Rechercher"
 
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr "Oublier l'historique"
 
-#: src/nautilus-shell-ui.xml.h:29
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr "Aller aux services Eazel"
 
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr "Aller à votre répertoire personnel"
 
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr "Remonter d'un niveau dans la hiérarchie"
 
-#: src/nautilus-shell-ui.xml.h:32
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr "Aller à l'emplacement suivant"
 
-#: src/nautilus-shell-ui.xml.h:33
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr "Aller à l'emplacement précédent"
 
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:442
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
 msgid "Hide Location _Bar"
 msgstr "Cacher la barre d'_emplacement"
 
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:424
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
 msgid "Hide St_atus Bar"
 msgstr "Cacher la barre d'_état"
 
-#: src/nautilus-shell-ui.xml.h:36 src/nautilus-window-menus.c:430
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
 msgid "Hide _Sidebar"
 msgstr "Cacher le _panneau latéral"
 
-#: src/nautilus-shell-ui.xml.h:37 src/nautilus-window-menus.c:436
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
 msgid "Hide _Toolbar"
 msgstr "Cacher la barre d'_outils"
 
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:37
 msgid "Nautilus Quick _Reference"
 msgstr "_Référence rapide de Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:38
 msgid "Nautilus Release _Notes"
 msgstr "_Notes de version de Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:39
 msgid "Nautilus User _Manual"
 msgstr "_Manuel utilisateur de Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "Nouvelle fenêtre"
 
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:41
 msgid "New _Window"
 msgstr "Nouvelle _fenêtre"
 
-#: src/nautilus-shell-ui.xml.h:44
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "Taille normale"
 
-#: src/nautilus-shell-ui.xml.h:45
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Ouvrir une autre fenêtre"
 
-#: src/nautilus-shell-ui.xml.h:47
-msgid "Preferences..."
-msgstr "Préférences..."
-
-#: src/nautilus-shell-ui.xml.h:48
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: src/nautilus-shell-ui.xml.h:49
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "Enlever le texte sélectionné sans le placer dans le presse-papier"
-
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr "Rapporter le profilage"
 
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr "Initialiser le profilage"
 
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr "Rechercher sur le Web"
 
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr "Rechercher des fichiers en local"
 
-#: src/nautilus-shell-ui.xml.h:54
-msgid "Select _All"
-msgstr "Sélectionner _tout"
-
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
@@ -9219,179 +9485,194 @@ msgstr ""
 "Affiche une page dans laquelle vous pouvez envoyer vos impressions sur "
 "Nautilus et les Services Eazel"
 
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "Afficher le contenu avec un niveau de détail normal"
 
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "Affiche le contenu avec un niveau de détail moins élevé"
 
-#: src/nautilus-shell-ui.xml.h:58
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "Affiche le contenu avec un niveau de détail plus élevé"
 
-#: src/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr "Démarrer le profilage"
 
-#: src/nautilus-shell-ui.xml.h:61
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr "Arrêter le profilage"
 
-#: src/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr "Arrêter le chargement de cet emplacement"
 
-#: src/nautilus-shell-ui.xml.h:63
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "Annuler la dernière modification de texte"
 
-#: src/nautilus-shell-ui.xml.h:64
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "Haut"
 
-#: src/nautilus-shell-ui.xml.h:65
-msgid "Use Advanced settings"
-msgstr "Utiliser la configuration expert"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:66
-msgid "Use Beginner settings"
-msgstr "Utiliser la configuration débutant"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:67
-msgid "Use Intermediate settings"
-msgstr "Utiliser la configuration intermédaire"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:63
 msgid "We_b Search"
 msgstr "Recherche _Web"
 
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "Recherche Web"
 
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "Zoom avant"
 
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "Zoom arrière"
 
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "Zoom a_vant"
 
-#: src/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "Zoom a_rrière"
 
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "À _propos de Nautilus..."
 
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "_Ajouter un signet"
 
-#: src/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "Précédent"
 
-#: src/nautilus-shell-ui.xml.h:77
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr "_Arrière-plans et emblèmes..."
 
-#: src/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "S_ignets"
 
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "_Fermer la fenêtre"
 
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:76
 msgid "_Customer Support"
 msgstr "Services _clientèle"
 
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "_Édition"
 
-#: src/nautilus-shell-ui.xml.h:83
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "_Éditer les signets..."
 
-#: src/nautilus-shell-ui.xml.h:84
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "Préférences..."
+
+#: src/nautilus-shell-ui.xml.h:80
 msgid "_Feedback"
 msgstr "_Sentiment"
 
-#: src/nautilus-shell-ui.xml.h:86 src/nautilus-window-menus.c:1352
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "_Rechercher"
 
-#: src/nautilus-shell-ui.xml.h:87
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "_Suivant"
 
-#: src/nautilus-shell-ui.xml.h:88
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "_Aller"
 
-#: src/nautilus-shell-ui.xml.h:89
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "_Aide"
 
-#: src/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "_Rép perso"
 
-#: src/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "Emplacement"
+
+#: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr "Thème _Nautilus..."
 
-#: src/nautilus-shell-ui.xml.h:92
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "Taille normale"
 
-#: src/nautilus-shell-ui.xml.h:94
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "Préférences"
+
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr "_Profilage"
 
-#: src/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "_Rafraîchir"
 
-#: src/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr "_Papproter le profilage"
 
-#: src/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr "_Initialiser le profilage"
 
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr "_Démarrer le profilage"
 
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr "_Arreter le profilage"
 
-#: src/nautilus-shell-ui.xml.h:100
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "_Annuler"
 
-#: src/nautilus-shell-ui.xml.h:101
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "_Remonter niveau"
 
-#: src/nautilus-shell-ui.xml.h:102
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "_Vue"
 
-#: src/nautilus-sidebar.c:659
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -9399,11 +9680,11 @@ msgstr ""
 "Vous ne pouvez pas assigner plus d'un icône à la fois! Sélectionnez juste "
 "une image pour en faire un icône personnalisé."
 
-#: src/nautilus-sidebar.c:661
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "Plus d'une image"
 
-#: src/nautilus-sidebar.c:680
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -9412,11 +9693,11 @@ msgstr ""
 "Vous ne pouvez utiliser que des images en local pour en faire des icônes "
 "personnalisés."
 
-#: src/nautilus-sidebar.c:682
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "Uniquement les images locales"
 
-#: src/nautilus-sidebar.c:687
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -9424,22 +9705,22 @@ msgstr ""
 "Le fichier que vous avez sélectionné n'est pas une image. Vous ne pouvez "
 "utiliser que des images en local pour en faire des icônes personnalisés."
 
-#: src/nautilus-sidebar.c:689
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "Images uniquement"
 
-#: src/nautilus-sidebar.c:1247
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "Ouvrir avec %s"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1283
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "Ouvrir avec..."
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1390
+#: src/nautilus-sidebar.c:1424
 msgid "  Empty Trash  "
 msgstr "  Vider la corbeille  "
 
@@ -9533,16 +9814,16 @@ msgstr "Ne peut supprimer le thème"
 msgid "No description available for the \"%s\" theme"
 msgstr "Aucune information de disponible pour le theme « %s »"
 
-#: src/nautilus-window.c:584
+#: src/nautilus-window.c:637
 msgid "View as ..."
 msgstr "Voir en tant que..."
 
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1286
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "Voir en tant que autre..."
 
-#: src/nautilus-window.c:1687
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "Fermer"
 
@@ -9556,11 +9837,11 @@ msgstr "Fermer"
 msgid "Preview Release %s: %s"
 msgstr "Aperçu de version %s : %s"
 
-#: src/nautilus-window-manage-views.c:812
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "Echec de visualisation"
 
-#: src/nautilus-window-manage-views.c:823
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
@@ -9569,12 +9850,12 @@ msgstr ""
 "La vue %s a rencontré une erreur et son exécution ne peut pas continuer. "
 "Vous pouvez choisir une autre vue ou aller à un un emplacement différent."
 
-#: src/nautilus-window-manage-views.c:834
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "La vue %s a rencontrée une erreur durand son démarrage."
 
-#: src/nautilus-window-manage-views.c:993
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
@@ -9582,7 +9863,7 @@ msgstr ""
 "Un des panneaux lattéraux a provoqué une erreur et son exécution ne peut pas "
 "continuer. Malheureusement je ne peux pas identifier lequel."
 
-#: src/nautilus-window-manage-views.c:997
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
@@ -9591,23 +9872,23 @@ msgstr ""
 "Le panneau lattéral %s a provoqué une erreur et son exécution ne peut pas "
 "continuer. Si cette erreur persiste, vous devrez déselectionner ce panneau."
 
-#: src/nautilus-window-manage-views.c:1002
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "Echec panneau latéral"
 
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr "Ne peut trouver « %s ». Vérifiez l'orthographe et essayez à nouveau."
 
-#: src/nautilus-window-manage-views.c:1223
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
 msgstr ""
 "Emplacement \"%s\" invalide. Vérifiez l'orthographe et essayer à nouveau."
 
-#: src/nautilus-window-manage-views.c:1237
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -9615,29 +9896,29 @@ msgid ""
 msgstr ""
 "Ne peut afficher « %s », car Nautilus ne peut déterminer le type du fichier."
 
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr "Nautilus n'a aucun visionneur d'installé capable d'afficher « %s »."
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1257
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 "Ne peut afficher « %s », car Nautilus ne reconnaît pas les emplacements %s."
 
-#: src/nautilus-window-manage-views.c:1263
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "Ne peut afficher « %s », car la tentative de connexion a échouée."
 
-#: src/nautilus-window-manage-views.c:1268
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "Ne peut afficher « %s », car l'accès n'a pas été autorisé."
 
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1287
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
@@ -9646,7 +9927,7 @@ msgstr ""
 "Ne peut afficher « %s », car aucun hote « %s » n'a pas été trouvé. Vérifiez "
 "que l'orthographe ainsi que vos paramètres de proxy soient corrects."
 
-#: src/nautilus-window-manage-views.c:1287
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -9655,7 +9936,7 @@ msgstr ""
 "Impossible de visualiser « %s », car le nom de serveur est vide. Vérifiez "
 "que vos paramètres du proxy sont corrects."
 
-#: src/nautilus-window-manage-views.c:1299
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -9667,58 +9948,58 @@ msgstr ""
 "service de recherche Medusa, et si vous n'avez pas d'index que l'indexeur "
 "Medusa est en cours."
 
-#: src/nautilus-window-manage-views.c:1303
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "Recherche indisponible"
 
-#: src/nautilus-window-manage-views.c:1307
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus ne peut pas visualiser « %s »."
 
-#: src/nautilus-window-manage-views.c:1312
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "Impossible d'afficher la localisation"
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:313
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
 msgstr "Voulez-vous réellement oublier tout l'historique?"
 
-#: src/nautilus-window-menus.c:316
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr "Voulez-vous réellement ne pas conserver les emplacements visités?"
 
-#: src/nautilus-window-menus.c:321
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "Oublier l'historique ?"
 
-#: src/nautilus-window-menus.c:322
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "Oublier"
 
-#: src/nautilus-window-menus.c:425
+#: src/nautilus-window-menus.c:466
 msgid "Show St_atus Bar"
 msgstr "Afficher la barre d'_état"
 
-#: src/nautilus-window-menus.c:431
+#: src/nautilus-window-menus.c:472
 msgid "Show _Sidebar"
 msgstr "Afficher le _panneau latéral"
 
-#: src/nautilus-window-menus.c:437
+#: src/nautilus-window-menus.c:478
 msgid "Show _Toolbar"
 msgstr "Afficher la barre d'_outils"
 
-#: src/nautilus-window-menus.c:443
+#: src/nautilus-window-menus.c:484
 msgid "Show Location _Bar"
 msgstr "Afficher la barre d'_emplacement"
 
-#: src/nautilus-window-menus.c:494
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -9728,11 +10009,11 @@ msgstr "Préférences"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:571
+#: src/nautilus-window-menus.c:618
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
-#: src/nautilus-window-menus.c:573
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -9751,7 +10032,7 @@ msgstr ""
 #. * bottom of the about box to give credit
 #. * to the translator(s)
 #.
-#: src/nautilus-window-menus.c:582
+#: src/nautilus-window-menus.c:629
 msgid "Translator Credits"
 msgstr ""
 "Traducteurs :\n"
@@ -9759,7 +10040,7 @@ msgstr ""
 "Christophe Merlet (RedFox) <redfox@eikonex.org>, 2001.\n"
 "Rapporter les anomalies de traductions à <gnomefr@gnomefr.traduc.org>"
 
-#: src/nautilus-window-menus.c:752
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -9768,27 +10049,23 @@ msgstr ""
 "L'emplacement « %s » n'existe pas. Voulez-vous supprimer tout les signets "
 "pointant sur cet emplacement de votre liste ?"
 
-#: src/nautilus-window-menus.c:756
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "Signet pour emplacement inexistant"
 
-#: src/nautilus-window-menus.c:770
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "L'emplacement « %s » n'existe plus."
 
-#: src/nautilus-window-menus.c:771
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "Aller à l'emplacement inexistant"
 
-#: src/nautilus-window-menus.c:840
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "Va à l'emplacement spécifié par ce signet"
 
-#: src/nautilus-window-menus.c:1351
-msgid "_Browse"
-msgstr "_Naviguer"
-
 #: src/nautilus-window-toolbars.c:402
 msgid "Back"
 msgstr "Précédent"
@@ -9804,6 +10081,115 @@ msgstr "Suivant"
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 
+#~ msgid "helvetica"
+#~ msgstr "helvetica"
+
+#~ msgid "_Fonts"
+#~ msgstr "_Polices"
+
+#, fuzzy
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "Impossible de déplacer un répertoire sur lui même."
+
+#, fuzzy
+#~ msgid "Can't Move Onto Self"
+#~ msgstr "Ne peut être déplacé sur soi-même"
+
+#, fuzzy
+#~ msgid "Normal"
+#~ msgstr "Taille normale"
+
+#, fuzzy
+#~ msgid "Bold"
+#~ msgstr "Borland"
+
+#, fuzzy
+#~ msgid "Book"
+#~ msgstr "ok"
+
+#, fuzzy
+#~ msgid "Light"
+#~ msgstr "Liste"
+
+#, fuzzy
+#~ msgid "Italic"
+#~ msgstr "Balte"
+
+#, fuzzy
+#~ msgid "Oblique"
+#~ msgstr "Vieux"
+
+#, fuzzy
+#~ msgid "Reverse Oblique"
+#~ msgstr "In_verser l'ordre"
+
+#, fuzzy
+#~ msgid "Condensed"
+#~ msgstr "Contenu:"
+
+#~ msgid "Font"
+#~ msgstr "Police"
+
+#~ msgid "fixed"
+#~ msgstr "fixé"
+
+#~ msgid "current theme"
+#~ msgstr "theme courant"
+
+#, fuzzy
+#~ msgid "Use this font family to display file names:"
+#~ msgstr "Fonte utilisée pour l'affichage des noms de fichiers"
+
+#~ msgid "Can add Content"
+#~ msgstr "Possibilité d'ajouter des éléments"
+
+#~ msgid "No image was selected.  You must click on an image to select it."
+#~ msgstr ""
+#~ "Aucune image sélectionnée. Vous devez cliquer sur une image pour la "
+#~ "sélectionner."
+
+#~ msgid "No selection made"
+#~ msgstr "Aucune sélection faite"
+
+#~ msgid "times"
+#~ msgstr "times"
+
+#~ msgid "courier"
+#~ msgstr "courier"
+
+#~ msgid "lucida"
+#~ msgstr "lucida"
+
+#~ msgid "Details"
+#~ msgstr "Détails"
+
+#~ msgid "Warning"
+#~ msgstr "Attention"
+
+#~ msgid "Error"
+#~ msgstr "Erreur"
+
+#~ msgid "Question"
+#~ msgstr "Question"
+
+#~ msgid "_Cut Text"
+#~ msgstr "Co_uper le texte"
+
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "Enlever le texte sélectionné sans le placer dans le presse-papier"
+
+#~ msgid "Use Advanced settings"
+#~ msgstr "Utiliser la configuration expert"
+
+#~ msgid "Use Beginner settings"
+#~ msgstr "Utiliser la configuration débutant"
+
+#~ msgid "Use Intermediate settings"
+#~ msgstr "Utiliser la configuration intermédaire"
+
+#~ msgid "_Browse"
+#~ msgstr "_Naviguer"
+
 #~ msgid "You cannot throw \"%s\" into the Trash."
 #~ msgstr "Impossible de déplacer \"%s\" dans la corbeille."
 
diff --git a/po/ga.po b/po/ga.po
index 118f9cfa5..eb1269843 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -2,10 +2,15 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Alastair McKinstry <mckinstry@computer.org>, 2000 
 #
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus CVS\n"
-"POT-Creation-Date: 2000-08-24 19:35+0100\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2000-08-24 19:35+0100\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -13,883 +18,9739 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/nautilus-bookmarks-window.c:125
-msgid "Nautilus: Bookmarks"
+#: applets/launcher/nautilus-launcher-applet.c:272
+msgid "Can't create nautilus-launcher-applet!"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:211
+msgid "Can't create nautilus-preferences-applet!"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:226
+msgid "Show Desktop"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:230
+msgid "Smooth Graphics"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:243
+#: src/nautilus-application.c:639
+msgid "Quit"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:251
+msgid "Start"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:259
+msgid "Restart"
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:1
+msgid "Factory for Nautilus component adapter factories"
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:2
+msgid "Factory for Nautilus component adapter factories "
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:3
+msgid ""
+"Factory for objects that wrap ordinary Bonobo Controls or Embeddables to "
+"look like Nautilus Views"
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:4
+msgid "Nautilus component adapter factory"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:230
+#, c-format
+msgid ""
+"%s CPU\n"
+"%s MHz\n"
+"%s cache size"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:264
+#, c-format
+msgid "%lu GB RAM"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:266
+#, c-format
+msgid "%lu MB RAM"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:324
+#, c-format
+msgid "%lu GB"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:326
+#, c-format
+msgid "%lu MB"
+msgstr ""
+
+#. set up the title
+#: components/hardware/nautilus-hardware-view.c:407
+msgid "Hardware Overview"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:520
+msgid "This is a placeholder for the CPU page."
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:545
+msgid "This is a placeholder for the RAM page."
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:570
+msgid "This is a placeholder for the IDE page."
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:2
+#: components/hardware/nautilus-hardware-view.c:631
+#: data/static_bookmarks.xml.h:16
+msgid "Hardware"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:1
+msgid "Factory for hardware view"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:3
+msgid "Hardware Viewer"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:4
+msgid "Hardware view"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:5
+msgid "View as Hardware"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:6
+msgid "hardware view"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/gdb3html.c:712
+#: components/music/nautilus-music-view.c:1512
+msgid "Previous"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/gdb3html.c:721
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
+msgid "Home"
+msgstr "Baile"
+
+#: components/help/converters/gnome-db2html2/gdb3html.c:730
+#: components/music/nautilus-music-view.c:1568
+msgid "Next"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:259
+#: components/notes/Nautilus_View_notes.oaf.in.h:2
+msgid "Notes"
+msgstr "Notaí"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:709
+#, c-format
+msgid "Table %d."
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:864
+msgid "Up to Table of Contents"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1012
+#, c-format
+msgid "Figure %s"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1032
+msgid "the section here"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1034
+msgid "the section"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1090
+#, c-format
+msgid "Figure %d"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1102
+msgid "IMAGE"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:2068
+#: components/help/converters/gnome-db2html2/sect-elements.c:2070
+msgid "Legal Notice"
+msgstr ""
+
+#. This 'Q' is short for 'Question:'
+#: components/help/converters/gnome-db2html2/sect-elements.c:2116
+msgid "Q"
+msgstr ""
+
+#. This 'A' is short for 'Answer'
+#: components/help/converters/gnome-db2html2/sect-elements.c:2128
+msgid "A"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:2151
+msgid "See"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:2178
+msgid "See also"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:322
+msgid "GNOME Documentation"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:353
+msgid "Copyright"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:353
+msgid "by"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:355
+msgid "Table of Contents"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:521
+msgid "PREFACE"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:530
+msgid "APPENDIX"
+msgstr ""
+
+#. * From 'man(7)':
+#.
+#. The manual sections are traditionally defined as follows:
+#.
+#. 1 Commands
+#. Those  commands that can be executed by the
+#. user from within a shell.
+#.
+#. 2 System calls
+#. Those functions which must be performed  by
+#. the kernel.
+#.
+#. 3 Library calls
+#. Most   of   the  libc  functions,  such  as
+#. sort(3))
+#.
+#. 4 Special files
+#. Files found in /dev)
+#.
+#. 5 File formats and conventions
+#. The format for /etc/passwd and other human-
+#. readable files.
+#.
+#. 6 Games
+#.
+#. 7 Macro packages and conventions
+#. A  description  of the standard file system
+#. layout, this man page, and other things.
+#.
+#. 8 System management commands
+#. Commands like mount(8), which only root can
+#. execute.
+#.
+#. 9 Kernel routines
+#. This  is  a non-standard manual section and
+#. is included because the source code to  the
+#. Linux  kernel is freely available under the
+#. GNU Public  License  and  many  people  are
+#. working on changes to the kernel)
+#. **
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:537
+#: components/help/hyperbola-filefmt.c:538
+#: components/help/hyperbola-filefmt.c:539
+#: components/help/hyperbola-filefmt.c:541
+#: components/help/hyperbola-filefmt.c:543
+msgid "Manual"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:861 data/linksets/apps.xml.h:1
+#, fuzzy
+msgid "Applications"
+msgstr "Áit"
+
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:543
+msgid "Development"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:532
+msgid "System Calls"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:534
+msgid "Library Functions"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:536
+msgid "Devices"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:537
+msgid "Configuration Files"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:538
+#, fuzzy
+msgid "Games"
+msgstr "Ainm"
+
+#: components/help/hyperbola-filefmt.c:539
+msgid "Conventions"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:541
+msgid "System Administration"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:543
+msgid "Kernel Routines"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:703
+msgid "Info"
+msgstr ""
+
+#: components/help/hyperbola-nav-tree.c:310
+msgid "Introductory Documents:"
+msgstr ""
+
+#: components/help/hyperbola-nav-tree.c:324
+msgid "Documents by Subject:"
+msgstr ""
+
+#: components/help/hyperbola-nav-index.c:121
+msgid "see "
+msgstr ""
+
+#: components/help/hyperbola-nav-index.c:125
+msgid "see also "
+msgstr ""
+
+#: components/help/hyperbola-nav-index.c:212
+#, fuzzy
+msgid "No matches."
+msgstr "Notaí"
+
+#: components/help/hyperbola-nav-index.c:476
+msgid " (see \""
+msgstr ""
+
+#: components/help/hyperbola-nav-index.c:479
+msgid " (see also \""
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:1
+#: components/services/summary/nautilus-summary-dialogs.c:106
+msgid "Help"
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:2
+msgid "Help Index"
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:3
+msgid "Help Index sidebar panel"
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:4
+msgid "Help Navigation Tree"
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:5
+#, fuzzy
+msgid "Help Search"
+msgstr "Cuardaigh"
+
+#: components/help/Nautilus_View_help.oaf.in.h:6
+msgid "Help Search sidebar panel"
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:7
+msgid "Help sidebar panel"
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:8
+msgid "Internal use only"
+msgstr ""
+
+#: components/history/Nautilus_View_history.oaf.in.h:1
+msgid "Factory for history views"
+msgstr ""
+
+#: components/history/Nautilus_View_history.oaf.in.h:2
+msgid "History"
+msgstr "Stair"
+
+#: components/history/Nautilus_View_history.oaf.in.h:3
+msgid "History sidebar panel"
+msgstr ""
+
+#: components/history/Nautilus_View_history.oaf.in.h:4
+msgid "History sidebar panel for Nautilus"
+msgstr ""
+
+#: components/image-viewer/nautilus-image-view.c:833
+msgid "I could not initialize Bonobo"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:1
+msgid "Generic Image Viewer"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:2
+msgid "Generic image control factory"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:3
+msgid "Image"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:4
+msgid "Image Viewer"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:5
+#, fuzzy
+msgid "Nautilus Image Viewer"
 msgstr "Nautilus: Leabharmarcanna"
 
-#. Icon
-#. Emblems
-#: src/file-manager/fm-list-view.c:307 src/nautilus-bookmarks-window.c:161
-msgid "Name"
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:6
+msgid "Nautilus Image viewer factory"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:7
+msgid "View as Image"
+msgstr ""
+
+#: components/loser/content/nautilus-content-loser.c:140
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"This is a Nautilus content view that fails on demand."
+msgstr ""
+
+#: components/loser/content/nautilus-content-loser.c:189
+msgid "You have tried to kill the Content Loser"
+msgstr ""
+
+#: components/loser/content/nautilus-content-loser-ui.xml.h:1
+msgid "Kill Content Loser"
+msgstr ""
+
+#: components/loser/content/nautilus-content-loser-ui.xml.h:2
+msgid "Kill the Loser content view"
+msgstr ""
+
+#: components/loser/content/nautilus-content-loser-ui.xml.h:3
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
+#: components/sample/nautilus-sample-content-view-ui.xml.h:4
+#: src/nautilus-shell-ui.xml.h:81
+msgid "_File"
+msgstr ""
+
+#: components/loser/content/nautilus-content-loser-ui.xml.h:4
+msgid "_Kill Content Loser"
+msgstr ""
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:1
+msgid "Content Loser"
+msgstr ""
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:2
+msgid "Content Loser Viewer"
+msgstr ""
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:3
+msgid "Nautilus Content Loser"
+msgstr ""
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:4
+msgid "Nautilus content loser component's factory"
+msgstr ""
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:5
+msgid "Nautilus content loser factory"
+msgstr ""
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:6
+msgid "Nautilus content view that fails on command"
+msgstr ""
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:7
+msgid "View as Content Loser"
+msgstr ""
+
+#: components/loser/sidebar/nautilus-sidebar-loser.c:143
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Loser sidebar."
+msgstr ""
+
+#: components/loser/sidebar/nautilus-sidebar-loser.c:192
+msgid "You have tried to kill the Sidebar Loser"
+msgstr ""
+
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:1
+msgid "Kill Sidebar Loser"
+msgstr ""
+
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:2
+msgid "Kill the Loser sidebar panel"
+msgstr ""
+
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:4
+msgid "_Kill Sidebar Loser"
+msgstr ""
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:1
+msgid "Nautilus Sidebar Loser"
+msgstr ""
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:2
+msgid "Nautilus sidebar loser component's factory"
+msgstr ""
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:3
+msgid "Nautilus sidebar loser factory"
+msgstr ""
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:4
+msgid "Nautilus sidebar view that fails on command"
+msgstr ""
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:5
+msgid "Sidebar Loser"
+msgstr ""
+
+#: components/mozilla/mozilla-preferences.cpp:126
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+
+#: components/mozilla/mozilla-preferences.cpp:133
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s\n"
+"All further errors shown only on terminal"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:38
+msgid "Arabic"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:39
+#, fuzzy
+msgid "Baltic"
+msgstr "Riomh"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:40
+msgid "Central European"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:41
+msgid "Chinese"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:42
+msgid "Cyrillic"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:43
+msgid "Greek"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:44
+msgid "Hebrew"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:45
+msgid "Japanese"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:46
+msgid "Turkish"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:47
+msgid "Unicode"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:48
+msgid "UTF"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:49
+msgid "Vietnamese"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:50
+msgid "Western"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:55
+msgid "Arabic (IBM-864)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:56
+msgid "Arabic (ISO-8859-6)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:57
+msgid "Arabic (ISO-8859-6-E)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:58
+msgid "Arabic (ISO-8859-6-I)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:59
+msgid "Arabic (Windows-1256)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:60
+msgid "Armenian (ARMSCII-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:61
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:62
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:63
+msgid "Baltic (Windows-1257)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:64
+msgid "Celtic (ISO-8859-14)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:65
+msgid "Central European (IBM-852)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:66
+msgid "Central European (ISO-8859-2)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:67
+msgid "Central European (MacCE)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:68
+msgid "Central European (Windows-1250)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:69
+msgid "Chinese Simplified (GB2312)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:70
+msgid "Chinese Simplified (GBK)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:71
+msgid "Chinese Simplified (HZ)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:72
+msgid "Chinese Traditional (Big5)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:73
+msgid "Chinese Traditional (EUC-TW)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:74
+msgid "Croatian (MacCroatian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:75
+msgid "Cyrillic (IBM-855)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:76
+msgid "Cyrillic (ISO-8859-5)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:77
+msgid "Cyrillic (ISO-IR-111)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:78
+msgid "Cyrillic (MacCyrillic)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:79
+msgid "Cyrillic (Windows-1251)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:80
+msgid "Cyrillic/Russian (IBM-866)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:81
+msgid "Cyrillic/Russian (KOI8-R)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:82
+msgid "Cyrillic/Ukrainian (KOI8-U)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:83
+msgid "Cyrillic/Ukrainian (MacUkrainian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:84
+msgid "English (US-ASCII)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:85
+msgid "Greek (ISO-8859-7)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:86
+msgid "Greek (MacGreek)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:87
+msgid "Greek (Windows-1253)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:88
+msgid "Hebrew (IBM-862)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:89
+msgid "Hebrew (ISO-8859-8-E)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:90
+msgid "Hebrew (ISO-8859-8-I)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:91
+msgid "Hebrew (Windows-1255)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:92
+msgid "Icelandic (MacIcelandic)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:93
+msgid "Japanese (EUC-JP)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:94
+msgid "Japanese (ISO-2022-JP)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:95
+msgid "Japanese (Shift_JIS)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:96
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:97
+msgid "Nordic (ISO-8859-10)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:98
+msgid "Romanian (MacRomanian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:99
+msgid "South European (ISO-8859-3)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:100
+msgid "T.61-8bit"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:101
+msgid "Thai (TIS-620)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:102
+msgid "Turkish (IBM-857)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:103
+msgid "Turkish (ISO-8859-9)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:104
+msgid "Turkish (MacTurkish)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:105
+msgid "Turkish (Windows-1254)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:106
+msgid "Unicode (UTF-7)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:107
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:108
+msgid "User Defined"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:109
+msgid "UTF-16BE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:110
+msgid "UTF-16LE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:111
+msgid "UTF-32BE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:112
+msgid "UTF-32LE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:113
+msgid "Vietnamese (TCVN)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:114
+msgid "Vietnamese (VISCII)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:115
+msgid "Vietnamese (VPS)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:116
+msgid "Vietnamese (Windows-1258)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:117
+msgid "Visual Hebrew (ISO-8859-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:118
+msgid "Western (IBM-850)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:119
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:120
+msgid "Western (ISO-8859-15)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:121
+msgid "Western (MacRoman)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:122
+msgid "Western (Windows-1252)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:123
+msgid "windows-936"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:124
+msgid "x-imap4-modified-utf7"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:125
+msgid "x-u-escaped"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-content-view.c:809
+msgid ""
+"A JavaScript function (small software program) on this page tried to open a "
+"new window, but nautilus does not support the opening of new windows by "
+"JavaScript.\n"
+"\n"
+"Try viewing the page in a different web browser, such as Mozilla or Netscape."
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-content-view.c:810
+msgid "Nautilus Mozilla View Warning"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-ui.xml.h:1
+msgid "Charset Encoding"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:1
+msgid "Mozilla Nautilus view"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:2
+msgid "Mozilla Nautilus view factory"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:3
+msgid "Mozilla content view component"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:4
+msgid "Mozilla content view component's factory"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:5
+msgid "View as Web Page"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:6
+msgid "Web Page"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:7
+msgid "Web Page Viewer"
+msgstr ""
+
+#: components/music/mpg123.c:29
+msgid "Blues"
+msgstr ""
+
+#: components/music/mpg123.c:29
+msgid "Classic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:29
+msgid "Country"
+msgstr ""
+
+#: components/music/mpg123.c:29
+#, fuzzy
+msgid "Dance"
+msgstr "Cealaigh"
+
+#: components/music/mpg123.c:30
+msgid "Disco"
+msgstr ""
+
+#: components/music/mpg123.c:30
+msgid "Funk"
+msgstr ""
+
+#: components/music/mpg123.c:30
+msgid "Grunge"
+msgstr ""
+
+#: components/music/mpg123.c:30
+msgid "Hip-Hop"
+msgstr ""
+
+#: components/music/mpg123.c:31
+msgid "Jazz"
+msgstr ""
+
+#: components/music/mpg123.c:31
+msgid "Metal"
+msgstr ""
+
+#: components/music/mpg123.c:31
+msgid "New Age"
+msgstr ""
+
+#: components/music/mpg123.c:31
+msgid "Oldies"
+msgstr ""
+
+#: components/music/mpg123.c:32
+msgid "Other"
+msgstr ""
+
+#: components/music/mpg123.c:32
+msgid "Pop"
+msgstr ""
+
+#: components/music/mpg123.c:32
+msgid "R&B"
+msgstr ""
+
+#: components/music/mpg123.c:32
+msgid "Rap"
+msgstr ""
+
+#: components/music/mpg123.c:32
+msgid "Reggae"
+msgstr ""
+
+#: components/music/mpg123.c:33
+msgid "Rock"
+msgstr ""
+
+#: components/music/mpg123.c:33
+msgid "Techno"
+msgstr ""
+
+#: components/music/mpg123.c:33
+msgid "Industrial"
+msgstr ""
+
+#: components/music/mpg123.c:33
+msgid "Alternative"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Ska"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Death Metal"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Pranks"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Soundtrack"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Euro-Techno"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Ambient"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Trip-Hop"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Vocal"
+msgstr ""
+
+#: components/music/mpg123.c:36
+msgid "Jazz+Funk"
+msgstr ""
+
+#: components/music/mpg123.c:36
+msgid "Fusion"
+msgstr ""
+
+#: components/music/mpg123.c:36
+#, fuzzy
+msgid "Trance"
+msgstr "Cealaigh"
+
+#: components/music/mpg123.c:36
+msgid "Classical"
+msgstr ""
+
+#: components/music/mpg123.c:37
+msgid "Instrumental"
+msgstr ""
+
+#: components/music/mpg123.c:37
+msgid "Acid"
+msgstr ""
+
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "House"
+msgstr "Baile"
+
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "Game"
 msgstr "Ainm"
 
-#: src/nautilus-bookmarks-window.c:173
-msgid "Location"
+#: components/music/mpg123.c:38
+msgid "Sound Clip"
+msgstr ""
+
+#: components/music/mpg123.c:38
+msgid "Gospel"
+msgstr ""
+
+#: components/music/mpg123.c:38
+#, fuzzy
+msgid "Noise"
+msgstr "Notaí"
+
+#: components/music/mpg123.c:38
+msgid "Alt"
+msgstr ""
+
+#: components/music/mpg123.c:39
+msgid "Bass"
+msgstr ""
+
+#: components/music/mpg123.c:39
+msgid "Soul"
+msgstr ""
+
+#: components/music/mpg123.c:39
+msgid "Punk"
+msgstr ""
+
+#: components/music/mpg123.c:39
+msgid "Space"
+msgstr ""
+
+#: components/music/mpg123.c:40
+msgid "Meditative"
+msgstr ""
+
+#: components/music/mpg123.c:40
+msgid "Instrumental Pop"
+msgstr ""
+
+#: components/music/mpg123.c:41
+msgid "Instrumental Rock"
+msgstr ""
+
+#: components/music/mpg123.c:41
+msgid "Ethnic"
+msgstr ""
+
+#: components/music/mpg123.c:41
+msgid "Gothic"
+msgstr ""
+
+#: components/music/mpg123.c:42
+msgid "Darkwave"
+msgstr ""
+
+#: components/music/mpg123.c:42
+msgid "Techno-Industrial"
+msgstr ""
+
+#: components/music/mpg123.c:42
+msgid "Electronic"
+msgstr ""
+
+#: components/music/mpg123.c:43
+msgid "Pop-Folk"
+msgstr ""
+
+#: components/music/mpg123.c:43
+msgid "Eurodance"
+msgstr ""
+
+#: components/music/mpg123.c:43
+msgid "Dream"
+msgstr ""
+
+#: components/music/mpg123.c:44
+msgid "Southern Rock"
+msgstr ""
+
+#: components/music/mpg123.c:44
+#, fuzzy
+msgid "Comedy"
+msgstr "Baile"
+
+#: components/music/mpg123.c:44
+msgid "Cult"
+msgstr ""
+
+#: components/music/mpg123.c:45
+msgid "Gangsta Rap"
+msgstr ""
+
+#: components/music/mpg123.c:45
+msgid "Top 40"
+msgstr ""
+
+#: components/music/mpg123.c:45
+msgid "Christian Rap"
+msgstr ""
+
+#: components/music/mpg123.c:46
+msgid "Pop/Funk"
+msgstr ""
+
+#: components/music/mpg123.c:46
+msgid "Jungle"
+msgstr ""
+
+#: components/music/mpg123.c:46
+msgid "Native American"
+msgstr ""
+
+#: components/music/mpg123.c:47
+msgid "Cabaret"
+msgstr ""
+
+#: components/music/mpg123.c:47
+msgid "New Wave"
+msgstr ""
+
+#: components/music/mpg123.c:47
+msgid "Psychedelic"
+msgstr ""
+
+#: components/music/mpg123.c:47
+#, fuzzy
+msgid "Rave"
+msgstr "Scríos"
+
+#: components/music/mpg123.c:48
+msgid "Showtunes"
+msgstr ""
+
+#: components/music/mpg123.c:48
+msgid "Trailer"
+msgstr ""
+
+#: components/music/mpg123.c:48
+msgid "Lo-Fi"
+msgstr ""
+
+#: components/music/mpg123.c:48
+msgid "Tribal"
+msgstr ""
+
+#: components/music/mpg123.c:49
+msgid "Acid Punk"
+msgstr ""
+
+#: components/music/mpg123.c:49
+msgid "Acid Jazz"
+msgstr ""
+
+#: components/music/mpg123.c:49
+msgid "Polka"
+msgstr ""
+
+#: components/music/mpg123.c:49
+msgid "Retro"
+msgstr ""
+
+#: components/music/mpg123.c:50
+msgid "Musical"
+msgstr ""
+
+#: components/music/mpg123.c:50
+msgid "Rock & Roll"
+msgstr ""
+
+#: components/music/mpg123.c:50
+msgid "Hard Rock"
+msgstr ""
+
+#: components/music/mpg123.c:50
+msgid "Folk"
+msgstr ""
+
+#: components/music/mpg123.c:51
+msgid "Folk/Rock"
+msgstr ""
+
+#: components/music/mpg123.c:51
+msgid "National Folk"
+msgstr ""
+
+#: components/music/mpg123.c:51
+msgid "Swing"
+msgstr ""
+
+#: components/music/mpg123.c:52
+msgid "Fast-Fusion"
+msgstr ""
+
+#: components/music/mpg123.c:52
+msgid "Bebob"
+msgstr ""
+
+#: components/music/mpg123.c:52
+#, fuzzy
+msgid "Latin"
 msgstr "Áit"
 
-#: src/nautilus-bookmarks-window.c:185
-msgid "Remove"
+#: components/music/mpg123.c:52
+msgid "Revival"
+msgstr ""
+
+#: components/music/mpg123.c:53
+msgid "Celtic"
+msgstr ""
+
+#: components/music/mpg123.c:53
+msgid "Bluegrass"
+msgstr ""
+
+#: components/music/mpg123.c:53
+msgid "Avantgarde"
+msgstr ""
+
+#: components/music/mpg123.c:54
+msgid "Gothic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:54
+msgid "Progressive Rock"
+msgstr ""
+
+#: components/music/mpg123.c:55
+msgid "Psychedelic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:55
+msgid "Symphonic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:55
+msgid "Slow Rock"
+msgstr ""
+
+#: components/music/mpg123.c:56
+msgid "Big Band"
+msgstr ""
+
+#: components/music/mpg123.c:56
+msgid "Chorus"
+msgstr ""
+
+#: components/music/mpg123.c:56
+msgid "Easy Listening"
+msgstr ""
+
+#: components/music/mpg123.c:57
+msgid "Acoustic"
+msgstr ""
+
+#: components/music/mpg123.c:57
+msgid "Humour"
+msgstr ""
+
+#: components/music/mpg123.c:57
+#, fuzzy
+msgid "Speech"
+msgstr "Cuardaigh"
+
+#: components/music/mpg123.c:57
+msgid "Chanson"
+msgstr ""
+
+#: components/music/mpg123.c:58
+#, fuzzy
+msgid "Opera"
+msgstr "_Oscáil"
+
+#: components/music/mpg123.c:58
+msgid "Chamber Music"
+msgstr ""
+
+#: components/music/mpg123.c:58
+msgid "Sonata"
+msgstr ""
+
+#: components/music/mpg123.c:58
+msgid "Symphony"
+msgstr ""
+
+#: components/music/mpg123.c:59
+msgid "Booty Bass"
+msgstr ""
+
+#: components/music/mpg123.c:59
+msgid "Primus"
+msgstr ""
+
+#: components/music/mpg123.c:59
+msgid "Porn Groove"
+msgstr ""
+
+#: components/music/mpg123.c:60
+#, fuzzy
+msgid "Satire"
+msgstr "Meid"
+
+#: components/music/mpg123.c:60
+msgid "Slow Jam"
+msgstr ""
+
+#: components/music/mpg123.c:60
+msgid "Club"
+msgstr ""
+
+#: components/music/mpg123.c:60
+msgid "Tango"
+msgstr ""
+
+#: components/music/mpg123.c:61
+msgid "Samba"
+msgstr ""
+
+#: components/music/mpg123.c:61
+msgid "Folklore"
+msgstr ""
+
+#: components/music/mpg123.c:61
+msgid "Ballad"
+msgstr ""
+
+#: components/music/mpg123.c:61
+msgid "Power Ballad"
+msgstr ""
+
+#: components/music/mpg123.c:62
+msgid "Rhythmic Soul"
+msgstr ""
+
+#: components/music/mpg123.c:62
+msgid "Freestyle"
+msgstr ""
+
+#: components/music/mpg123.c:62
+#, fuzzy
+msgid "Duet"
 msgstr "Scríos"
 
-#: src/nautilus-location-bar.c:206
-msgid "Location:"
-msgstr "Áit:"
+#: components/music/mpg123.c:63
+msgid "Punk Rock"
+msgstr ""
 
-#: src/nautilus-window-menus.c:115
-msgid "New Window"
-msgstr "Fuinneog Nua"
+#: components/music/mpg123.c:63
+msgid "Drum Solo"
+msgstr ""
 
-#: src/nautilus-window-menus.c:115
-msgid "Create a new window"
+#: components/music/mpg123.c:63
+msgid "A Cappella"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1482
-#: src/file-manager/fm-directory-view.c:1653 src/nautilus-window-menus.c:140
-msgid "Select All"
-msgstr "Tóg gach rud"
+#: components/music/mpg123.c:64
+msgid "Euro-House"
+msgstr ""
 
-#: src/nautilus-window-menus.c:151 src/nautilus-window-toolbars.c:51
-msgid "Back"
-msgstr "Riomh"
+#: components/music/mpg123.c:64
+#, fuzzy
+msgid "Dance Hall"
+msgstr "Cealaigh"
 
-#: src/nautilus-window-menus.c:151
-msgid "Go to the previous visited location"
+#: components/music/mpg123.c:64
+msgid "Goa"
 msgstr ""
 
-#: src/nautilus-window-menus.c:158 src/nautilus-window-toolbars.c:54
-msgid "Forward"
-msgstr "Eile"
+#: components/music/mpg123.c:65
+msgid "Drum & Bass"
+msgstr ""
 
-#: src/nautilus-window-menus.c:158
-msgid "Go to the next visited location"
+#: components/music/mpg123.c:65
+#, fuzzy
+msgid "Club-House"
+msgstr "Dún"
+
+#: components/music/mpg123.c:65
+msgid "Hardcore"
 msgstr ""
 
-#: src/nautilus-window-menus.c:165 src/nautilus-window-toolbars.c:57
-msgid "Up"
-msgstr "Suas"
+#: components/music/mpg123.c:66
+msgid "Terror"
+msgstr ""
 
-#: src/nautilus-window-menus.c:165
-msgid "Go to the location that contains this one"
+#: components/music/mpg123.c:66
+msgid "Indie"
 msgstr ""
 
-#: src/nautilus-window-menus.c:172 src/nautilus-window-toolbars.c:64
-msgid "Home"
-msgstr "Baile"
+#: components/music/mpg123.c:66
+msgid "BritPop"
+msgstr ""
 
-#: src/nautilus-window-menus.c:172
-msgid "Go to the home location"
+#: components/music/mpg123.c:66
+msgid "Negerpunk"
 msgstr ""
 
-#: src/nautilus-window-menus.c:201
-msgid "Color selector"
-msgstr "Roghnóir Dathanna"
+#: components/music/mpg123.c:67
+msgid "Polsk Punk"
+msgstr ""
 
-#: src/nautilus-window-menus.c:220
-msgid "_Add Bookmark"
-msgstr "_Suimigh Leabharmarc"
+#: components/music/mpg123.c:67
+msgid "Beat"
+msgstr ""
 
-#: src/nautilus-window-menus.c:221
-msgid "Add a bookmark for the current location to this menu."
+#: components/music/mpg123.c:67
+msgid "Christian Gangsta Rap"
 msgstr ""
 
-#: src/nautilus-window-menus.c:225
-msgid "_Edit Bookmarks..."
-msgstr "_Eagar Leabharmarcanna..."
+#: components/music/mpg123.c:68
+msgid "Heavy Metal"
+msgstr ""
 
-#: src/nautilus-window-menus.c:226
-msgid "Display a window that allows editing the bookmarks in this menu."
+#: components/music/mpg123.c:68
+msgid "Black Metal"
 msgstr ""
 
-#: src/nautilus-window-menus.c:256
-msgid "_General Settings..."
-msgstr "_Roghnachais gnáth..."
+#: components/music/mpg123.c:68
+msgid "Crossover"
+msgstr ""
 
-#: src/nautilus-window-menus.c:256
-msgid "Customize various aspects of Nautilus's appearance and behavior"
+#: components/music/mpg123.c:69
+msgid "Contemporary Christian"
 msgstr ""
 
-#: src/nautilus-window-menus.c:264
-msgid "Use _Eazel Theme Icons"
+#: components/music/mpg123.c:69
+msgid "Christian Rock"
 msgstr ""
 
-#: src/nautilus-window-menus.c:265
-msgid "Select whether to use standard or Eazel icons"
+#: components/music/mpg123.c:70
+msgid "Merengue"
 msgstr ""
 
-#: src/nautilus-window-menus.c:276
-msgid "About Nautilus..."
-msgstr "Faoi Nautilus..."
+#: components/music/mpg123.c:70
+msgid "Salsa"
+msgstr ""
 
-#: src/nautilus-window-menus.c:276
-msgid "Info about the Nautilus program"
-msgstr "Eolas faoi an ríomhchlár Nautilus"
+#: components/music/mpg123.c:70
+msgid "Thrash Metal"
+msgstr ""
 
-#: src/nautilus-window-menus.c:285
-msgid "Show Color selector..."
-msgstr "Taispeán roghnóir Dath..."
+#: components/music/mpg123.c:71
+msgid "Anime"
+msgstr ""
 
-#: src/nautilus-window-menus.c:285
-msgid "Show the color picker window"
+#: components/music/mpg123.c:71
+msgid "JPop"
 msgstr ""
 
-#: src/nautilus-window-menus.c:293
-msgid "_Go"
+#: components/music/mpg123.c:71
+#, fuzzy
+msgid "Synthpop"
+msgstr "Stad"
+
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Track"
+msgstr "Riomh"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Title"
 msgstr ""
 
-#: src/nautilus-window-menus.c:294
-msgid "_Bookmarks"
-msgstr "_Leabharmarcanna"
+#: components/music/nautilus-music-view.c:238
+msgid "Artist"
+msgstr ""
 
-#: src/nautilus-window-menus.c:297
-msgid "_Debug"
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Year"
+msgstr "Cuardaigh"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Bit Rate"
 msgstr ""
 
-#: src/nautilus-window-menus.c:345
-msgid "Go to the specified location"
+#: components/music/nautilus-music-view.c:238
+msgid "Time"
 msgstr ""
 
-#: src/nautilus-window-menus.c:479 src/ntl-window-msgs.c:212
-#: src/ntl-window-msgs.c:247 src/ntl-window-msgs.c:248
-msgid "Nautilus"
-msgstr "Nautilus"
+#: components/music/nautilus-music-view.c:238
+msgid "Album"
+msgstr ""
 
-#: src/nautilus-window-menus.c:483
-msgid "The Cool Shell Program"
+#: components/music/nautilus-music-view.c:238
+msgid "Comment"
 msgstr ""
 
-#: src/nautilus-window-toolbars.c:51
-msgid "Go to the previously visited directory"
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Channels"
+msgstr "Cealaigh"
+
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Sample Rate"
+msgstr "Sampla"
+
+#: components/music/nautilus-music-view.c:350
+msgid "Set Cover Image"
 msgstr ""
 
-#: src/nautilus-window-toolbars.c:54
-msgid "Go to the next directory"
+#: components/music/nautilus-music-view.c:694
+#, c-format
+msgid "Sorry, but '%s' is not a usable image file."
 msgstr ""
 
-#: src/nautilus-window-toolbars.c:57
-msgid "Go up a level in the directory heirarchy"
+#: components/music/nautilus-music-view.c:696
+#: src/nautilus-property-browser.c:1060 src/nautilus-property-browser.c:1312
+msgid "Not an Image"
 msgstr ""
 
-#: src/nautilus-window-toolbars.c:60
-msgid "Reload"
-msgstr "Athlód"
+#: components/music/nautilus-music-view.c:744
+msgid "Select an image file for the album cover:"
+msgstr ""
 
-#: src/nautilus-window-toolbars.c:60
-msgid "Reload this view"
+#: components/music/nautilus-music-view.c:1174
+msgid ""
+"Sorry, but the music view is unable to play back sound right now. Either "
+"another program is using or blocking the sound card, or your sound card is "
+"not configured properly. Try quitting any applications that may be blocking "
+"use of the sound card."
+msgstr ""
+
+#: components/music/nautilus-music-view.c:1178
+msgid "Unable to Play File"
+msgstr ""
+
+#: components/music/nautilus-music-view.c:1199
+msgid "Sorry, but the music view can't play non-local files yet."
+msgstr ""
+
+#: components/music/nautilus-music-view.c:1200
+msgid "Can't Play Remote Files"
+msgstr ""
+
+#: components/music/nautilus-music-view.c:1486
+msgid "Drag to seek within track"
 msgstr ""
 
-#: src/nautilus-window-toolbars.c:64
-msgid "Go to your home directory"
+#: components/music/nautilus-music-view.c:1526
+msgid "Play"
 msgstr ""
 
-#: src/file-manager/dfos-xfer.c:189 src/nautilus-window-toolbars.c:68
+#: components/music/nautilus-music-view.c:1540
+msgid "Pause"
+msgstr ""
+
+#: components/music/nautilus-music-view.c:1554
+#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Stad"
 
-#: src/nautilus-window-toolbars.c:68
-msgid "Interrupt loading"
+#: components/music/nautilus-music-view.c:1679
+#, c-format
+msgid "Sorry, but there was an error reading %s."
+msgstr ""
+
+#: components/music/nautilus-music-view.c:1680
+msgid "Can't Read Folder"
 msgstr ""
 
-#: src/ntl-main.c:54
-msgid "Perform high-speed self-check tests."
+#: components/music/nautilus-music-view.c:1750
+#, fuzzy
+msgid "Stereo"
+msgstr "Stad"
+
+#: components/music/nautilus-music-view.c:1750
+msgid "Mono"
 msgstr ""
 
-#: src/ntl-view-bonobo-control.c:78
+#: components/music/nautilus-music-view.c:1792
+#, fuzzy, c-format
+msgid "%s - %s"
+msgstr "%s%s"
+
+#: components/music/Nautilus_View_music.oaf.in.h:1
+msgid "Factory for music view"
+msgstr ""
+
+#: components/music/Nautilus_View_music.oaf.in.h:2
+msgid "Music"
+msgstr ""
+
+#: components/music/Nautilus_View_music.oaf.in.h:3
+msgid "Music Viewer"
+msgstr ""
+
+#: components/music/Nautilus_View_music.oaf.in.h:4
+msgid "Music view"
+msgstr ""
+
+#: components/music/Nautilus_View_music.oaf.in.h:5
+msgid "Music view factory"
+msgstr ""
+
+#: components/music/Nautilus_View_music.oaf.in.h:6
+msgid "View as Music"
+msgstr ""
+
+#: components/notes/Nautilus_View_notes.oaf.in.h:1
+msgid "Factory for annotation view"
+msgstr ""
+
+#: components/notes/Nautilus_View_notes.oaf.in.h:3
+msgid "Notes sidebar panel"
+msgstr ""
+
+#: components/notes/Nautilus_View_notes.oaf.in.h:4
+msgid "Notes sidebar panel for Nautilus"
+msgstr ""
+
+#: components/sample/nautilus-sample-content-view.c:136
+msgid "(none)"
+msgstr ""
+
+#: components/sample/nautilus-sample-content-view.c:189
 #, c-format
-msgid "Control %p"
+msgid ""
+"%s\n"
+"\n"
+"This is a sample Nautilus content view component."
 msgstr ""
 
-#: src/ntl-window-msgs.c:250
+#: components/sample/nautilus-sample-content-view.c:252
 #, c-format
-msgid "Nautilus: %s"
-msgstr "Nautilus: %s"
+msgid ""
+"%s\n"
+"\n"
+"You clicked the Sample toolbar button."
+msgstr ""
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:3
+#: components/sample/nautilus-sample-content-view-ui.xml.h:1
+#: components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in.h:2
+msgid "Sample"
+msgstr "Sampla"
+
+#: components/sample/nautilus-sample-content-view-ui.xml.h:2
+msgid "This is a sample merged menu item"
+msgstr ""
+
+#: components/sample/nautilus-sample-content-view-ui.xml.h:3
+msgid "This is a sample merged toolbar button"
+msgstr ""
+
+#: components/sample/nautilus-sample-content-view-ui.xml.h:5
+msgid "_Sample"
+msgstr "_Sampla"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:1
+msgid "Nautilus Sample view"
+msgstr ""
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:2
+msgid "Nautilus Sample view factory"
+msgstr ""
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:4
+#, fuzzy
+msgid "Sample Viewer"
+msgstr "Sampla"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:5
+msgid "Sample content view component"
+msgstr ""
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:6
+msgid "Sample content view component's factory"
+msgstr ""
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:7
+#, fuzzy
+msgid "View as Sample"
+msgstr "Sampla"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:107
+msgid "Set the default answer to continue, also default delete to Yes"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:108
+msgid "Specify search cgi"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:109
+#: components/services/install/command-line/eazel-gen-xml.c:43
+#: components/services/install/command-line/eazel-test-packsys.c:590
+#: components/services/install/command-line/eazel-test-softcat.c:56
+msgid "Show debug output"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:110
+msgid "10 sec delay after starting service"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:111
+msgid "Allow downgrades"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:112
+msgid "Erase packages"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:113
+msgid "enable ei2"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:114
+msgid "RPM args are filename"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:115
+msgid "Use ftp"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:116
+msgid "Use local"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:117
+msgid "Use http"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:118
+msgid "RPM args are Eazel Ids"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:119
+msgid "machine readable output"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:120
+msgid "Don't print fancy percent output"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:121
+msgid "don't use eazel auth stuff"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:122
+msgid "Specify package file"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:123
+msgid "RPM args are needed files"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:124
+msgid "Run Query"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
+#, fuzzy
+msgid "Revert"
+msgstr "Scríos"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
+msgid "Set root"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
+msgid "Specify server"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
+msgid "Dont print too much, just problems and download"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
+msgid "Perform ssl renaming"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
+msgid "argument is a suite id"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
+msgid "Test run"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
+msgid "Allow username"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
+msgid "Allow upgrades"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
+msgid "Verbose output"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
+msgid "Install a specific package version"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
+msgid "*** You cannot specify more then one protocol type.\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
+msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
+#, c-format
+msgid "File conflict checking %s...\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
+#, c-format
+msgid "File uniqueness checking %s...\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
+#, c-format
+msgid "Feature consistency checking %s...\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
+#, c-format
+msgid "Downloading %s..."
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
+msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
+msgid "Downloading %s... (%d/%d) = %d%%"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
+#, c-format
+msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
+#, c-format
+msgid "Downloading %s... %3.1f KB/s Done\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
+msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
+msgstr ""
 
-#: src/ntl-window-msgs.c:1050
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
+msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
+#, fuzzy
+msgid "Done\n"
+msgstr "Críochnaithe!"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
+#, c-format
+msgid "Download of %s FAILED\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
+#, c-format
+msgid "Package %s failed to uninstall.\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
+#, c-format
+msgid "Package %s failed to install.\n"
+msgstr ""
+
+#. I18N note: \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
+#, c-format
+msgid "\t· Problem : %s\n"
+msgstr ""
+
+#. I18N note: \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
+#, c-format
+msgid "\t· Action : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
+msgid "Cancelling operation\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
+#, c-format
+msgid "About to install a total of %d packages, %dKB\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
+#, c-format
+msgid "About to uninstall a total of %d packages, %dKB\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
+#, c-format
+msgid "About to revert a total of %d packages, %d KB\n"
+msgstr ""
+
+#. I18N note: %s is a package name, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
+#, c-format
+msgid "\t· %s and it's dependencies\n"
+msgstr ""
+
+#. I18N note: %s is a package name, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
+#, c-format
+msgid "\t· %s\n"
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n) " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
+msgid "Save transaction report ? (y/n) "
+msgstr ""
+
+#. I18N note: y is the letter for the word Yes. This is
+#. used in the response for a yes/no questions. Your translation
+#. must be 1 character only.
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
+msgid "y"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
+#, c-format
+msgid "Dependency : %s needs %s\n"
+msgstr ""
+
+#. I18N note: %s is a package name
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
+#, c-format
+msgid "Package %s failed md5 check!\n"
+msgstr ""
+
+#. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
+#, c-format
+msgid "\t· server MD5 checksum is %s\n"
+msgstr ""
+
+#. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
+#, c-format
+msgid "\t· actual MD5 checksum is %s\n"
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
+msgid "Continue? (y/n) "
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
+msgid "Should I delete the RPM files? (y/n) "
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
+msgid "Operation ok\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
+msgid "Operation failed\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
+msgid "Installing"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
+msgid "Uninstalling"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
+msgid "Only one operation at a time please."
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
+#, c-format
+msgid "%s: --help for usage\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
+#, c-format
+msgid "Name         : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#, c-format
+msgid "Version      : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#, c-format
+msgid "Minor        : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
+#, c-format
+msgid "Size         : %d\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#, c-format
+msgid "Arch         : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#, c-format
+msgid "Distribution : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#, c-format
+msgid "Description  : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
+#, c-format
+msgid "Install root : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
+msgid "Provides     : \n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
+#, c-format
+msgid "exit code %d\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-gen-xml.c:41
+msgid "Specify package list to use (/var/eazel/service/package-list.xml)"
+msgstr ""
+
+#: components/services/install/command-line/eazel-gen-xml.c:42
+msgid "Use specified file to generate a package list, requires --packagelist"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:54
+msgid "Softcat server to connect to"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:55
+msgid "Use alternate CGI path"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:57
+msgid "Connect as a softcat user through ammonite"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:58
+msgid "Number of times to try the request"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:59
+msgid "Delay between request retries, in usec"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:60
+msgid "Lookup by Eazel package id"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:61
+msgid "Lookup package that features a feature/file"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:62
+msgid "Lookup package with a specific version"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:63
+msgid "(with --version) Use >= comparison"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:64
+msgid "use check function (for debugging)"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:65
+msgid "Show detailed sub-package info"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:66
+msgid "enable funk parser"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:117
+msgid "Failed to lock the downloaded file"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:134
+#, c-format
+msgid "MD5 mismatch, package %s may be compromised"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:150
+#, c-format
+msgid "No MD5 available for %s"
+msgstr ""
+
+#. I18N note: "%is is ok" in the sense that %s=package name and the
+#. package is intact
+#: components/services/install/lib/eazel-install-logic2.c:356
+#, c-format
+msgid "%s is ok"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:462
+#, c-format
+msgid "%s-%s version %s-%s already installed"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:466
+#, c-format
+msgid "%s version %s already installed"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
+#, c-format
+msgid "%s upgrades from version %s-%s to %s-%s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:489
+#, c-format
+msgid "%s downgrades from version %s-%s to %s-%s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:494
+#, c-format
+msgid "%s downgrades from version %s to %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:547
+#, c-format
+msgid "%s installs version %s-%s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:552
+#, c-format
+msgid "%s installs version %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
+#, c-format
+msgid "Loading package info from file %s"
+msgstr ""
+
+#. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
+#: components/services/install/lib/eazel-install-logic2.c:1197
+msgid "ok"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:1197
+msgid "not ok"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:1363
+#, c-format
+msgid "Checking dependencies for %s"
+msgstr ""
+
+#. I18N note: both %s' are package names.
+#. related is in the sense that the two packages apparently
+#. are connected somehow, eg. foo and foo-devel
+#: components/services/install/lib/eazel-install-logic2.c:2014
+#, c-format
+msgid "%s is related to %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2090
+#, c-format
+msgid "updating %s to version %s-%s solves conflict"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2113
+#, c-format
+msgid "available update to %s (%s-%s) does not solves conflict"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2128
+#, c-format
+msgid "could not revive %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2284
+#, c-format
+msgid "file uniqueness checking %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2305
+#, c-format
+msgid "Duplicate file : %s occurs in %s and %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
+msgid "... but it's ok, the packages are related"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2324
+#, c-format
+msgid "(there were %d other conflicts)"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2419
+#, c-format
+msgid "file conflict checking %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2456
+#, c-format
+msgid "file conflict : package %s already provides file %s also provided by %s"
+msgstr ""
+
+#. the owner of this file is a package that we're upgrading, and the
+#. * new version no longer has this file, so everything's okay.
+#: components/services/install/lib/eazel-install-logic2.c:2466
+#, c-format
+msgid "...but it is okay, we're upgrading %s and it ditched that file"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2558
+#, c-format
+msgid "checking feature consistency of %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
 msgid ""
-"Couldn't find \"%s\".\n"
-"Please check the spelling and try again."
+"feature missing : %s breaks if %s is installed (feature %s would be lost"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2705
+#, c-format
+msgid "downloading %d packages"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2951
+#, c-format
+msgid "will upgrade %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2954
+#, c-format
+msgid "will downgrade %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2957
+#, c-format
+msgid "will install %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2960
+#, c-format
+msgid "will uninstall %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
+#, c-format
+msgid "%s requires %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:3238
+#, c-format
+msgid "failed %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-metadata.c:174
+msgid "Could not set URLType from config file!"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-object.c:717
+msgid "Transactions are not stored, could not find home dir"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-object.c:748
+#, c-format
+msgid "Transactions are stored in %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-object.c:1005
+msgid "Getting package list from remote server ...\n"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-object.c:1021
+msgid "Unable to retrieve package-list.xml!\n"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-object.c:1094
+#, c-format
+msgid "Cannot write to file %s, using default log handler"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-object.c:1225
+msgid "Install failed"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-object.c:1271
+msgid "Uninstall failed"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-object.c:1406
+#, c-format
+msgid "Could not create transaction directory (%s)! ***\n"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-object.c:1429
+#, c-format
+msgid "Writing transaction to %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:163
+#, c-format
+msgid "%s was cancelled"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
+#, c-format
+msgid "%s is a source package, which is not yet supported"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
+#, c-format
+msgid "%s would break other packages"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:185
+#, c-format
+msgid "%s would break"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:191
+#, c-format
+msgid "%s would break %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:197
+#, c-format
+msgid "%s is damaged"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:201
+#, c-format
+msgid "%s requires %s, which could not be found on the server"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:204
+#, c-format
+msgid "%s for %s could not be found on the server"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
+#, c-format
+msgid "%s is already installed"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:259
+#, c-format
+msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:263
+#, c-format
+msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr ""
 
-#: src/ntl-window-msgs.c:1054
+#: components/services/install/lib/eazel-install-problem.c:353
+#, c-format
+msgid "%s is not installed and could not be found on server"
+msgstr ""
+
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. %s is a package name or filename
+#: components/services/install/lib/eazel-install-problem.c:920
+#, c-format
+msgid "Check for a new version of %s"
+msgstr ""
+
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. both %s's are package names or filenames
+#: components/services/install/lib/eazel-install-problem.c:931
+#, c-format
+msgid "Install both %s and %s"
+msgstr ""
+
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. %s is a package name or filename
+#: components/services/install/lib/eazel-install-problem.c:946
+#, c-format
+msgid "Remove %s from your system"
+msgstr ""
+
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. %s is a package name or filename. "Force" is in the rpm sense of force,
+#. meaning that no dependency checking etc will be done
+#: components/services/install/lib/eazel-install-problem.c:959
+#, c-format
+msgid "Force the removal of %s from your system"
+msgstr ""
+
+#. TRANSLATORS : This string is a solution to a dependency problem
+#: components/services/install/lib/eazel-install-problem.c:967
+msgid "Package database has an inconsistency"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:1015
+msgid "Continue with force"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:1021
+msgid "Allow downgrade"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
+#, c-format
+msgid "Could not open target file %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
+msgid "Could not create an http request !"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
+msgid "Proxy: Invalid uri !"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
+msgid "Invalid uri !"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
+msgid "Could not prepare http request !"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
+msgid "Couldn't get async mode "
+msgstr ""
+
+#. probably out of disk space
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
+#, c-format
+msgid "DISK FULL: could not write %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
+msgid "Could not get request body!"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:208
+#, c-format
+msgid "HTTP error: %d %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:255
+msgid "FTP not supported yet"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:463
+#, c-format
+msgid "Checking local file %s..."
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:584
+#, c-format
+msgid "Failed to retrieve %s!"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:657
+#, c-format
+msgid "Could not get an URL for %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:672
+msgid "Downloaded package does not have the correct name"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:673
+#, c-format
+msgid "Package %s should have had name %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:701
+msgid "File download failed"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-tests.c:34
+msgid "*** Begin pkg dump ***\n"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-tests.c:41
+msgid "*** End pkg dump ***\n"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
+msgid "*** No package nodes! (cat has no children) ***"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
+msgid "*** Bailing from package parse! ***"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
+msgid "*** No package nodes! ***"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
+msgid "*** Malformed package node!"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
+msgid "*** No depends nodes! ***"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
+msgid "*** Malformed depends node!"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
+#, c-format
+msgid "*** Unknown node type '%s'"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
+msgid "*** The pkg list file contains no data! ***\n"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
+msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
+msgid "*** Bailing from categories parse! ***\n"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
+msgid "*** No Categories! ***\n"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
+msgid "*** Bailing from category parse! ***\n"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
+msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
+msgid "*** Bailing from transaction parse! ***\n"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
+msgid "*** No packages! ***\n"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
+msgid "*** No category nodes! ***"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
+msgid "*** Cannot find the CATEGORIES xmlnode! ***"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
+#, c-format
+msgid "*** Unknown node %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
+msgid "*** Error generating xml package list! ***\n"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
+msgid "*** Error reading package list! ***\n"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
+msgid "*** The osd xml contains no data! ***\n"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
+msgid "*** Bailing from osd parse! ***\n"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
+#, c-format
+msgid "Could not parse the xml (length %d)"
+msgstr ""
+
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
+#, c-format
+msgid "Opened packages database in %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
+#, c-format
+msgid "Opening packages database in %s failed"
+msgstr ""
+
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
+#, c-format
+msgid "Closing db for %s (open)"
+msgstr ""
+
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
+#, c-format
+msgid "Closing db for %s (not open)"
+msgstr ""
+
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
+#, c-format
+msgid "Cannot open %s"
+msgstr ""
+
+#. this stuff flies by so fast, it's probably enough to just say "info"
+#: components/services/install-view/callbacks.c:64
+msgid "Getting package information ..."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:82
+#, c-format
+msgid "Checking \"%s\" for conflicts..."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:185
+#, c-format
+msgid "Downloading 1 package (%s)"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:187
+#, c-format
+msgid "Downloading %d packages (%s)"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:236
+#, c-format
+msgid "Downloading \"%s\""
+msgstr ""
+
+#: components/services/install-view/callbacks.c:242
+#, c-format
+msgid "0K of %dK"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:249
 #, c-format
 msgid ""
-"\"%s\" is not a valid location.\n"
-"Please check the spelling and try again."
+"The package \"%s\" requires \"%s\" to run.\n"
+"Downloading \"%s\" now."
 msgstr ""
 
-#: src/ntl-window-msgs.c:1061
+#: components/services/install-view/callbacks.c:252
+#, c-format
+msgid "Attempting to download package \"%s\"."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:262
+#: components/services/install-view/callbacks.c:333
+msgid "Complete"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:266
 #, c-format
 msgid ""
-"Couldn't display \"%s\",\n"
-"because Nautilus cannot handle items of type \"%s\"."
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" has been successfully downloaded."
 msgstr ""
 
-#: src/ntl-window-msgs.c:1065
+#: components/services/install-view/callbacks.c:269
+#, c-format
+msgid "The package \"%s\" has been successfully downloaded."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:287
+#, c-format
+msgid "%dK of %dK"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:316
+#, c-format
+msgid "Download of package \"%s\" failed!"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:338
 #, c-format
 msgid ""
-"Couldn't display \"%s\",\n"
-"because Nautilus cannot handle items of this type."
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" has been successfully downloaded and installed."
 msgstr ""
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/ntl-window-msgs.c:1075
+#: components/services/install-view/callbacks.c:341
+#, c-format
+msgid "\"%s\" has been successfully downloaded and installed."
+msgstr ""
+
+#. starting a new package -- create new progress indicator
+#: components/services/install-view/callbacks.c:369
 #, c-format
+msgid "Installing package %d of %d"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:396
+#, c-format
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" is now being installed."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:399
+#, c-format
+msgid "Now installing package \"%s\"."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:407
+#: components/services/install-view/nautilus-service-install-view.c:899
+#, c-format
+msgid "Installing \"%s\""
+msgstr ""
+
+#: components/services/install-view/callbacks.c:415
+#: src/nautilus-zoom-control.c:592
+msgid "%d%%"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:443
+#, c-format
+msgid "Installation failed on %s"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:471
+msgid "I ran into problems while installing."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:472
+msgid "I'd like to try the following :"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:481
+msgid "Is this ok ?"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:556
+msgid "Installation cancelled."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:558
+msgid "This package has already been installed."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
+msgid "Installation complete."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:564
+msgid "Installation failed."
+msgstr ""
+
+#. some succeeded; some failed
+#: components/services/install-view/callbacks.c:568
+msgid "Some packages installed successfully:"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:577
 msgid ""
-"Couldn't display \"%s\",\n"
-"because Nautilus cannot handle %s: locations."
+"\n"
+"Some packages failed:"
 msgstr ""
 
-#. It is so sad that we can't say anything more useful than this.
-#. * When this comes up, we should figure out what's really happening
-#. * and add another specific case.
+#: components/services/install-view/callbacks.c:626
+msgid "Erase the RPM files?"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:628
+msgid "Erase the leftover RPM files?"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:658
+msgid "Ok"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:673
+msgid ""
+"A core package of Nautilus has been\n"
+"updated.  You should restart Nautilus.\n"
+"\n"
+"Do you wish to do that now?"
+msgstr ""
+
+#. Setup the title
+#: components/services/install-view/forms.c:201
+msgid "Easy Install"
+msgstr ""
+
+#. Setup the progress header
+#. FIXME: the middle header is all fubar now, so we just say "messages", but the spec
+#. * shows "progress" over the 2nd column of the message box.  it's just too hard to get
+#. * it aligned currently.
 #.
-#: src/ntl-window-msgs.c:1085
+#: components/services/install-view/forms.c:327
+msgid "Messages"
+msgstr ""
+
+#: components/services/install-view/forms.c:358
+#: components/services/summary/nautilus-summary-view.c:647
 #, c-format
-msgid "Nautilus cannot display \"%s\"."
+msgid "Version: %s"
+msgstr ""
+
+#: components/services/install-view/forms.c:407
+msgid "These packages are ready to be downloaded and installed:"
+msgstr ""
+
+#: components/services/install-view/forms.c:408
+msgid "If you wish to download and install these packages, click Continue."
 msgstr ""
 
-#: src/ntl-window-msgs.c:1142
-msgid "Gathering information"
+#: components/services/install-view/forms.c:411
+msgid "These packages are ready to be uninstalled:"
 msgstr ""
 
-#: src/ntl-window-msgs.c:1221
+#: components/services/install-view/forms.c:412
+msgid "If you wish to uninstall these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:415
+msgid "These packages are ready to be reverted:"
+msgstr ""
+
+#: components/services/install-view/forms.c:416
+msgid "If you wish to revert these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:464
 #, c-format
-msgid "View as %s"
+msgid "for a total of %ld MB."
 msgstr ""
 
-#: src/ntl-window.c:932
-msgid "Close"
+#: components/services/install-view/forms.c:466
+#, c-format
+msgid "for a total of %ld KB."
+msgstr ""
+
+#. buttons
+#: components/services/install-view/forms.c:478
+msgid "Continue"
+msgstr ""
+
+#: components/services/install-view/forms.c:482
+#: libnautilus-extensions/nautilus-drag.c:493
+#: src/file-manager/fm-directory-view.c:4326
+msgid "Cancel"
+msgstr "Cealaigh"
+
+#: components/services/install-view/nautilus-service-install-view.c:421
+#, c-format
+msgid "%s is in GNOME (footprint) > %s"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:439
+#, c-format
+msgid "%s is in the GNOME (footprint) menu.\n"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:454
+#, c-format
+msgid "%s is in the KDE menu.\n"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:655
+msgid "Installation Complete"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:710
+#, c-format
+msgid ""
+"%sTo start %s, click the Launch button below, or to create a shortcut, drag "
+"the icon on the right to the GNOME panel or your desktop."
+msgstr ""
+
+#. couldn't find an icon
+#: components/services/install-view/nautilus-service-install-view.c:718
+#, c-format
+msgid "%sTo start %s, click the Launch button below."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:773
+msgid "Incorrect password."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:778
+msgid "Authenticate as root"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:895
+msgid "Installing packages"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:897
+msgid "Installing remote package"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:901
+msgid "Installing some package"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:918
+msgid ""
+"The Eazel install service is missing:\n"
+"Installs will not work."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:967
+msgid "Contacting the Eazel Software Catalog ..."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:1025
+msgid "Checking for authorization..."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:1097
+msgid "Aborting package downloads (please wait) ..."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:1117
+msgid "Package download aborted."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:1118
+msgid "Aborted"
+msgstr ""
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:1
+#: components/services/install/server/Trilobite_Service_install.oaf.in.h:2
+#: components/services/summary/nautilus-summary-view.c:123
+msgid "Install"
+msgstr ""
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:2
+msgid "Install Viewer"
+msgstr ""
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:3
+msgid "Nautilus Service Install View"
+msgstr ""
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:4
+msgid "Nautilus Service Install View Factory"
+msgstr ""
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:5
+msgid "Service Install View Component"
+msgstr ""
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:6
+msgid "Service Install View Component's Factory"
+msgstr ""
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:7
+msgid "View as Install"
+msgstr ""
+
+#: components/services/install/server/Trilobite_Service_install.oaf.in.h:1
+msgid "Factory for the install service"
+msgstr ""
+
+#: components/services/inventory/eazel-inventory-client.c:70
+msgid "Enable inventory upload."
+msgstr ""
+
+#: components/services/inventory/eazel-inventory-client.c:72
+msgid "Disable inventory upload."
+msgstr ""
+
+#: components/services/inventory/eazel-inventory-client.c:73
+msgid "Display information about current inventory settings."
+msgstr ""
+
+#: components/services/inventory/eazel-inventory-client.c:74
+msgid "Upload inventory now, if not up to date."
+msgstr ""
+
+#: components/services/inventory/Trilobite_Service_inventory.oaf.in.h:1
+msgid "Factory for the inventory service"
+msgstr ""
+
+#: components/services/inventory/Trilobite_Service_inventory.oaf.in.h:2
+msgid "Inventory"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:1
+msgid "Nautilus Inventory view"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:2
+msgid "Nautilus Inventory view factory"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:3
+msgid "Nautilus System Inventory component's component's factory"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:4
+msgid "System Inventory"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:5
+msgid "System Inventory Viewer"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:6
+msgid "System inventory view component"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:7
+msgid "View as System Inventory"
+msgstr ""
+
+#. Setup the title
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:153
+msgid "Please Change Your Eazel Password"
+msgstr ""
+
+#. add password boxes
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:174
+msgid "User Name:"
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:181
+msgid "Current Password:"
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:188
+msgid "New Password:"
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:195
+msgid "Confirm New Password:"
+msgstr ""
+
+#. allocate the command buttons - first the change_password button
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:227
+msgid "Change my password"
+msgstr ""
+
+#. now allocate the account maintenance button
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:234
+msgid "I need assistance"
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:297
+msgid "Your password has been changed!"
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:328
+msgid ""
+"I'm sorry, but that password\n"
+"is incorrect.  Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:332
+msgid ""
+"I'm sorry, but your new password\n"
+"must be at least six (6) characters long.\n"
+"Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:337
+msgid ""
+"I'm sorry, but your new password\n"
+"can't be ridiculously long.\n"
+"Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:346
+msgid ""
+"I'm sorry, but your new password must\n"
+"contain letters along with at least one\n"
+"number or symbol. Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:350
+msgid ""
+"I'm sorry, but I hit an unexpected\n"
+"error. Please try again, with\n"
+"different passwords."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:434
+msgid ""
+"I'm sorry, but I got an unexpected\n"
+"error.  Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:467
+msgid ""
+"I'm sorry, but your new password\n"
+"wasn't typed the same way twice.\n"
+"Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:1
+msgid "Change Password"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:2
+msgid "Change Password Viewer"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:3
+msgid "Eazel Change Password View"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:4
+msgid "Eazel Change Password view component"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:5
+msgid "Nautilus Service Login View Factory"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:6
+msgid "Service Login View Component's Factory"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:7
+msgid "View as Change Password"
+msgstr ""
+
+#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:295
+#, fuzzy
+msgid "Unknown Date"
+msgstr "saghas gan aithne"
+
+#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:300
+msgid "%A, %B %d"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-callbacks.c:97
+msgid ""
+"Sorry, network problems are preventing you from connecting to Eazel Services."
+msgstr ""
+
+#. FIXME we really should use the services alert icon here, eh?
+#: components/services/summary/nautilus-summary-callbacks.c:102
+msgid ""
+"Your Eazel Services account has not yet been activated.  You can't log into "
+"Eazel Services until you activate your account.\n"
+"\n"
+"Please check your email for activation instructions."
+msgstr ""
+
+#. FIXME we really should use the services alert icon here, eh?
+#: components/services/summary/nautilus-summary-callbacks.c:109
+msgid ""
+"Your Eazel Service User Account has been temporarily disabled.\n"
+"\n"
+"Please try again in a few minutes, or contact Eazel support if this problem "
+"continues."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-callbacks.c:131
+msgid "We're sorry, but your name and password are still not recognized."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-dialogs.c:69
+msgid "Eazel Service Login Error"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-dialogs.c:80
+msgid "Service Error"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-dialogs.c:104
+msgid "Register Now"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-dialogs.c:115
+msgid "Services Login"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-dialogs.c:131
+#: libnautilus-extensions/nautilus-global-preferences.c:827
+msgid "Username:"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-dialogs.c:138
+#: libnautilus-extensions/nautilus-global-preferences.c:835
+msgid "Password:"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-dialogs.c:146
+#: components/services/summary/nautilus-summary-dialogs.c:155
+msgid "Please log in to Eazel Services"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-dialogs.c:150
+msgid "Your user name or password were not correct.  Please try again."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:117
+#: libnautilus-extensions/nautilus-program-chooser.c:1361
+msgid "Go There"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:120
+msgid "More Info"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:131
+msgid "Account Preferences"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:132
+msgid "Logout"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:133
+#: components/services/summary/nautilus-summary-view.c:141
+msgid "Terms of Use"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:134
+#: components/services/summary/nautilus-summary-view.c:142
+msgid "Privacy Statement"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:139
+msgid "Register"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:140
+#, fuzzy
+msgid "Login"
+msgstr "Áit"
+
+#: components/services/summary/nautilus-summary-view.c:170
+#, c-format
+msgid "Eazel Services - Welcome, %s!"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:175
+msgid "Eazel Services - You are not logged in"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:182
+msgid "Connecting to Eazel Services..."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:741
+#: data/linksets/home.xml.h:3 src/nautilus-service-ui.xml.h:4
+msgid "Services"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:752
+msgid "Featured Downloads"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:884
+msgid ""
+"Unable to get services data from Eazel's server. The server might be "
+"unavailable right now, or your computer might be configured incorrectly. "
+"Please contact support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:894
+msgid ""
+"Found a problem with services data on Eazel servers. Please contact "
+"support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:917
+msgid ""
+"Information is missing from the redirect data on Eazel servers. Please "
+"contact support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:959
+msgid ""
+"Unable to connect to Eazel's server. The server might be unavailable right "
+"now, or your computer might be configured incorrectly. You could try again "
+"later."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:969
+msgid ""
+"Found a problem with redirect data on Eazel servers. Please contact "
+"support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:986
+msgid "Failed to upload system inventory."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:1049
+#: src/nautilus-first-time-druid.c:258
+msgid "Eazel Services"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:1
+msgid "Configure your service preferences"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:2
+msgid "Go to the Eazel Services Registration Form"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:3
+msgid "Log out from Eazel Services"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:4
+msgid "Service _Preferences"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:5
+msgid "Show the log-in dialog box"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:6
+msgid "_Log in to Eazel Services"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:7
+msgid "_Log out from Eazel Services"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:8
+msgid "_Register for Eazel Services"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:1
+msgid "Nautilus Service Summary View Factory"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Summary View"
+msgstr "Nautilus: Leabharmarcanna"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:3
+msgid "Service Summary View Component's Factory"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:4
+msgid "Service Summary view component"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:5
+msgid "Summary"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:6
+msgid "Summary Viewer"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:7
+msgid "View as Summary"
+msgstr ""
+
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
+#, c-format
+msgid "HTTP error %d \"%s\" on uri %s"
+msgstr ""
+
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
+msgid "Could not initialize Bonobo"
+msgstr ""
+
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
+#, c-format
+msgid "Can't write logfile %s -- using default log handler"
+msgstr ""
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:1
+msgid "Nautilus eazel sample service view component"
+msgstr ""
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:2
+msgid "Nautilus services startup view factory"
+msgstr ""
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:3
+#, fuzzy
+msgid "Service"
+msgstr "Cuardaigh"
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:4
+msgid "Service Viewer"
+msgstr ""
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:5
+msgid "Services startup view factory"
+msgstr ""
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:6
+msgid "View as Service"
+msgstr ""
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:7
+msgid "eazel sample service view"
+msgstr ""
+
+#: components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in.h:1
+msgid "Factory for the sample service"
+msgstr ""
+
+#: components/text/nautilus-text-view.c:334
+#, c-format
+msgid "Sorry, but %s is too large for Nautilus to load all of it."
+msgstr ""
+
+#: components/text/nautilus-text-view.c:337
+msgid "File too large"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:1
+msgid "F_onts"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:2
+msgid "Lucida"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:3
+msgid "Use the Courier Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:4
+msgid "Use the Fixed Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+msgid "Use the GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:6
+msgid "Use the Helvetica Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:7
+msgid "Use the Lucida Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:8
+msgid "Use the Times Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:9
+msgid "_Courier"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:10
+msgid "_Fixed"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
+msgid "_Helvetica"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:13
+msgid "_Times"
+msgstr ""
+
+#: components/text/Nautilus_View_text.oaf.in.h:1
+msgid "Factory for text view"
+msgstr ""
+
+#: components/text/Nautilus_View_text.oaf.in.h:2
+msgid "Text"
+msgstr ""
+
+#: components/text/Nautilus_View_text.oaf.in.h:3
+msgid "Text Viewer"
+msgstr ""
+
+#: components/text/Nautilus_View_text.oaf.in.h:4
+msgid "Text view"
+msgstr ""
+
+#: components/text/Nautilus_View_text.oaf.in.h:5
+msgid "Text view factory"
+msgstr ""
+
+#: components/text/Nautilus_View_text.oaf.in.h:6
+msgid "View as Text"
+msgstr ""
+
+#: components/text/services/google.xml.h:1
+msgid "Search Google for Selected Text"
+msgstr ""
+
+#: components/text/services/google.xml.h:2
+msgid "Use Google to search the web for the selected text"
+msgstr ""
+
+#: components/text/services/webster.xml.h:1
+msgid "Look Up Selected Text in Dictionary"
+msgstr ""
+
+#: components/text/services/webster.xml.h:2
+msgid "Look up the selected text in the Merriam-Webster dictionary"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:1
+msgid "animation to indicate on-going activity"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:2
+msgid "throbber"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:3
+msgid "throbber factory"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:4
+msgid "throbber object factory"
+msgstr ""
+
+#: components/tree/Nautilus_View_tree.oaf.in.h:1
+msgid "Nautilus Tree sidebar panel"
+msgstr ""
+
+#: components/tree/Nautilus_View_tree.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Tree view"
+msgstr "Nautilus"
+
+#: components/tree/Nautilus_View_tree.oaf.in.h:3
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
+msgid "Tree"
+msgstr ""
+
+#: data/browser.xml.h:1
+msgid "Apparition"
+msgstr ""
+
+#: data/browser.xml.h:2
+msgid "Azul"
+msgstr ""
+
+#: data/browser.xml.h:3
+#, fuzzy
+msgid "Black"
+msgstr "Riomh"
+
+#: data/browser.xml.h:4
+msgid "Blue Ridge"
+msgstr ""
+
+#: data/browser.xml.h:5
+msgid "Blue Rough"
+msgstr ""
+
+#: data/browser.xml.h:6
+#, fuzzy
+msgid "Blue Type"
+msgstr "Saghas"
+
+#: data/browser.xml.h:7
+msgid "Brushed Metal"
+msgstr ""
+
+#: data/browser.xml.h:8
+msgid "Bubble Gum"
+msgstr ""
+
+#: data/browser.xml.h:9
+msgid "Burlap"
+msgstr ""
+
+#: data/browser.xml.h:10
+msgid "Camouflage"
+msgstr ""
+
+#: data/browser.xml.h:11
+msgid "Certified"
+msgstr ""
+
+#: data/browser.xml.h:12
+msgid "Chalk"
+msgstr ""
+
+#: data/browser.xml.h:13
+msgid "Charcoal"
+msgstr ""
+
+#: data/browser.xml.h:14
+#, fuzzy
+msgid "Colors"
 msgstr "Dún"
 
-#: src/file-manager/dfos-corba.c:110
+#: data/browser.xml.h:15
+msgid "Concrete"
+msgstr ""
+
+#: data/browser.xml.h:16
+msgid "Cool"
+msgstr ""
+
+#: data/browser.xml.h:17
+msgid "Cork"
+msgstr ""
+
+#: data/browser.xml.h:18
+msgid "Countertop"
+msgstr ""
+
+#: data/browser.xml.h:19
+msgid "Danger"
+msgstr ""
+
+#: data/browser.xml.h:20
+msgid "Danube"
+msgstr ""
+
+#: data/browser.xml.h:21
+msgid "Dark Cork"
+msgstr ""
+
+#: data/browser.xml.h:22
+msgid "Dark GNOME"
+msgstr ""
+
+#: data/browser.xml.h:23
+msgid "Deep Teal"
+msgstr ""
+
+#: data/browser.xml.h:24
+msgid "Distinguished"
+msgstr ""
+
+#: data/browser.xml.h:25
+#, fuzzy
+msgid "Dots"
+msgstr "Notaí"
+
+#: data/browser.xml.h:26
+msgid "Draft"
+msgstr ""
+
+#: data/browser.xml.h:27
+msgid "Drag a color to an object to change it to that color"
+msgstr ""
+
+#: data/browser.xml.h:28
+msgid "Drag a pattern tile to an object to change it"
+msgstr ""
+
+#: data/browser.xml.h:29
+msgid "Drag an emblem to an object to add it to the object"
+msgstr ""
+
+#: data/browser.xml.h:30
+msgid "Eclipse"
+msgstr ""
+
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
+msgid "Emblems"
+msgstr ""
+
+#: data/browser.xml.h:32
+msgid "Envy"
+msgstr ""
+
+#: data/browser.xml.h:33
+msgid "Erase"
+msgstr ""
+
+#: data/browser.xml.h:34
+msgid "Favorite"
+msgstr ""
+
+#: data/browser.xml.h:35
+msgid "Fibers"
+msgstr ""
+
+#: data/browser.xml.h:36
+msgid "Fire Engine"
+msgstr ""
+
+#: data/browser.xml.h:37
+msgid "Fleur De Lis"
+msgstr ""
+
+#: data/browser.xml.h:38
+#, fuzzy
+msgid "Floral"
+msgstr "Eile"
+
+#: data/browser.xml.h:39
+msgid "Fossil"
+msgstr ""
+
+#: data/browser.xml.h:40 icons/gnome/gnome.xml.h:1
+msgid "GNOME"
+msgstr ""
+
+#: data/browser.xml.h:41
+msgid "Granite"
+msgstr ""
+
+#: data/browser.xml.h:42
+msgid "Grapefruit"
+msgstr ""
+
+#: data/browser.xml.h:43
+msgid "Green Weave"
+msgstr ""
+
+#: data/browser.xml.h:44
+msgid "Ice"
+msgstr ""
+
+#: data/browser.xml.h:45
+msgid "Important"
+msgstr ""
+
+#: data/browser.xml.h:46
+msgid "Indigo"
+msgstr ""
+
+#: data/browser.xml.h:47
+msgid "Leaf"
+msgstr ""
+
+#: data/browser.xml.h:48
+msgid "Lemon"
+msgstr ""
+
+#: data/browser.xml.h:49
+msgid "Mango"
+msgstr ""
+
+#: data/browser.xml.h:50
+msgid "Manila Paper"
+msgstr ""
+
+#: data/browser.xml.h:51
+msgid "Moss Ridge"
+msgstr ""
+
+#: data/browser.xml.h:52
+msgid "Mud"
+msgstr ""
+
+#: data/browser.xml.h:53
+msgid "New"
+msgstr ""
+
+#: data/browser.xml.h:54
+msgid "Numbers"
+msgstr ""
+
+#: data/browser.xml.h:55
+#: libnautilus-extensions/nautilus-file-operations.c:1102
+msgid "OK"
+msgstr ""
+
+#: data/browser.xml.h:56
+msgid "Ocean Strips"
+msgstr ""
+
+#: data/browser.xml.h:57
+msgid "Oh No"
+msgstr ""
+
+#: data/browser.xml.h:58
+msgid "Onyx"
+msgstr ""
+
+#: data/browser.xml.h:59
+msgid "Orange"
+msgstr ""
+
+#: data/browser.xml.h:60
+msgid "Pale Blue"
+msgstr ""
+
+#: data/browser.xml.h:61
+msgid "Patterns"
+msgstr ""
+
+#: data/browser.xml.h:62
+msgid "Personal"
+msgstr ""
+
+#: data/browser.xml.h:63
+msgid "Purple Marble"
+msgstr ""
+
+#: data/browser.xml.h:64
+msgid "Ridged Paper"
+msgstr ""
+
+#: data/browser.xml.h:65
+msgid "Rough Paper"
+msgstr ""
+
+#: data/browser.xml.h:66
+msgid "Ruby"
+msgstr ""
+
+#: data/browser.xml.h:67
+msgid "Sea Foam"
+msgstr ""
+
+#: data/browser.xml.h:68
+#, fuzzy
+msgid "Shale"
+msgstr "Sampla"
+
+#: data/browser.xml.h:69
+#, fuzzy
+msgid "Silver"
+msgstr "Meid"
+
+#: data/browser.xml.h:70
+msgid "Sky"
+msgstr ""
+
+#: data/browser.xml.h:71
+msgid "Sky Ridge"
+msgstr ""
+
+#: data/browser.xml.h:72
+msgid "Snow Ridge"
+msgstr ""
+
+#: data/browser.xml.h:73
+msgid "Special"
+msgstr ""
+
+#: data/browser.xml.h:74
+#, fuzzy
+msgid "Stucco"
+msgstr "Stad"
+
+#: data/browser.xml.h:75
+msgid "Tangerine"
+msgstr ""
+
+#: data/browser.xml.h:76
+msgid "Terracotta"
+msgstr ""
+
+#: data/browser.xml.h:77
+msgid "Urgent"
+msgstr ""
+
+#: data/browser.xml.h:78
+msgid "Violet"
+msgstr ""
+
+#: data/browser.xml.h:79
+msgid "Wavy White"
+msgstr ""
+
+#: data/browser.xml.h:80
+msgid "White"
+msgstr ""
+
+#: data/browser.xml.h:81
+msgid "White Ribs"
+msgstr ""
+
+#: data/linksets/apps.xml.h:2
+msgid "Gnumeric"
+msgstr ""
+
+#: data/linksets/apps.xml.h:3
+msgid "Netscape"
+msgstr ""
+
+#: data/linksets/apps.xml.h:4
+msgid "The Gimp"
+msgstr ""
+
+#: data/linksets/desktop.xml.h:1
+#: libnautilus-extensions/nautilus-global-preferences.c:642
+msgid "Desktop"
+msgstr ""
+
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
+#: libnautilus-extensions/nautilus-trash-directory.c:301
+#: src/file-manager/fm-desktop-icon-view.c:67
+msgid "Trash"
+msgstr ""
+
+#: data/linksets/home.xml.h:1
+msgid "Computer"
+msgstr ""
+
+#: data/linksets/home.xml.h:2
+msgid "Home Directory"
+msgstr ""
+
+#: data/linksets/portals.xml.h:1
+msgid "Excite"
+msgstr ""
+
+#: data/linksets/portals.xml.h:2
+msgid "Portals"
+msgstr ""
+
+#: data/linksets/portals.xml.h:3
+msgid "Yahoo"
+msgstr ""
+
+#: data/linksets/search_engines.xml.h:1
+msgid "Alta Vista"
+msgstr ""
+
+#: data/linksets/search_engines.xml.h:2
+msgid "Google"
+msgstr ""
+
+#: data/linksets/search_engines.xml.h:3
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
+#, fuzzy
+msgid "Search Engines"
+msgstr "Cuardaigh"
+
+#: data/static_bookmarks.xml.h:1
+msgid "Allaire"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:2
+msgid "Binary Freedom"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:3
+msgid "Borland"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:4
+msgid "CNET Computers.com"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:5
+msgid "CNET Linux Center"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:6
+msgid "CollabNet"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:7
+msgid "Compaq"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:8
+msgid "Conectiva"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:9
+msgid "Covalent"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:10
+msgid "Debian.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:11
+#, fuzzy
+msgid "Dell"
+msgstr "Scríos"
+
+#: data/static_bookmarks.xml.h:12
+msgid "Eazel"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:13
+msgid "Freshmeat.net"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:14
+msgid "GNOME.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:15
+msgid "GNU.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:17
+msgid "International"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:18
+msgid "Linux Documentation Project"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:19
+msgid "Linux One"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:20
+msgid "Linux Online"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:21
+msgid "Linux Resources"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:22
+msgid "Linux Weekly News"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:23
+msgid "LinuxNewbie.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:24
+msgid "LinuxOrbit.com"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:25
+msgid "MandrakeSoft"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:26
+msgid "Netraverse"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:27
+msgid "News and Media"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:28
+msgid "O'Reilly"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:29
+msgid "OSDN"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:30
+msgid "Open Source Asia"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:31
+msgid "OpenOffice"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:32
+msgid "Penguin Computing"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:33
+msgid "Rackspace"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:34
+msgid "Red Hat"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:35
+msgid "Red Hat Network"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:36
+msgid "RedFlag Linux"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:37
+msgid "Software"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:38
+msgid "SourceForge"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:39
+msgid "Sun StarOffice"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:40
+msgid "Sun Wah Linux"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:41
+msgid "Web Services"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:42
+msgid "ZDNet Linux Hardware Database"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:43
+msgid "ZDNet Linux Resource Center"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:44
+msgid "Zero-Knowledge"
+msgstr ""
+
+#: icons/ardmore/ardmore.xml.h:1
+msgid "Tahoe"
+msgstr ""
+
+#: icons/ardmore/ardmore.xml.h:2
+msgid "This theme uses photo-realistic folders."
+msgstr ""
+
+#: icons/arlo/arlo.xml.h:1
+msgid "A Teal variation of the Crux theme."
+msgstr ""
+
+#: icons/arlo/arlo.xml.h:2
+msgid "Crux-Teal"
+msgstr ""
+
+#: icons/crux_eggplant/crux_eggplant.xml.h:1
+msgid "An Eggplant variation of the Crux theme."
+msgstr ""
+
+#: icons/crux_eggplant/crux_eggplant.xml.h:2
+msgid "Crux-Eggplant"
+msgstr ""
+
+#: icons/default.xml.h:1
+#, fuzzy
+msgid "Default"
+msgstr "Scríos"
+
+#: icons/default.xml.h:2
+msgid "This is the default theme for Nautilus."
+msgstr ""
+
+#: icons/gnome/gnome.xml.h:2
+msgid "This theme uses the classic GNOME icons."
+msgstr ""
+
+#: icons/villanova/villanova.xml.h:1
+#, fuzzy
+msgid "Sierra"
+msgstr "Meid"
+
+#: icons/villanova/villanova.xml.h:2
+msgid "Uses manila folders and gray-green backgrounds."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-drag.c:489
+msgid "_Move here"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-drag.c:490
+msgid "_Copy here"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-drag.c:491
+msgid "_Link here"
+msgstr ""
+
+#. Note to localizers: this font is used for text items in Druid pages
+#: libnautilus-extensions/nautilus-druid-page-eazel.c:381
+msgid "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-*"
+msgstr ""
+
+#. Note to localizers: this font is used for page titles in Druid pages
+#: libnautilus-extensions/nautilus-druid-page-eazel.c:560
+msgid "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
+msgstr ""
+
+#. Today, use special word.
+#. * Note to localizers: You can look at man strftime
+#. * for details on the format, but you should only use
+#. * the specifiers from the C standard, not extensions.
+#. * These include "%" followed by one of
+#. * "aAbBcdHIjmMpSUwWxXyYZ". There are two extensions
+#. * in the Nautilus version of strftime that can be
+#. * used (and match GNU extensions). Putting a "-"
+#. * between the "%" and any numeric directive will turn
+#. * off zero padding, and putting a "_" there will use
+#. * space padding instead of zero padding.
+#.
+#: libnautilus-extensions/nautilus-file.c:2277
+#, fuzzy
+msgid "today at %-I:%M %p"
+msgstr "inniu %-I:%M %p"
+
+#. Yesterday, use special word.
+#. * Note to localizers: Same issues as "today" string.
+#.
+#: libnautilus-extensions/nautilus-file.c:2282
+#, fuzzy
+msgid "yesterday at %-I:%M %p"
+msgstr "inné %-I:%M %p"
+
+#. Current week, include day of week.
+#. * Note to localizers: Same issues as "today" string.
+#.
+#: libnautilus-extensions/nautilus-file.c:2287
+#, fuzzy
+msgid "%A %-m/%-d/%y at %-I:%M %p"
+msgstr "%A %-m/%-d/%y %-I:%M %p"
+
+#. Other dates.
+#. * Note to localizers: Same issues as "today" string.
+#.
+#: libnautilus-extensions/nautilus-file.c:2292
+#, fuzzy
+msgid "%-m/%-d/%y at %-I:%M %p"
+msgstr "%-m/%-d/%y %-I:%M %p"
+
+#: libnautilus-extensions/nautilus-file.c:3423
+msgid "0 items"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3423
+msgid "0 folders"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3424
+msgid "0 files"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3428
+msgid "1 item"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3428
+msgid "1 folder"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3429
+msgid "1 file"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3432
+#, c-format
+msgid "%u items"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
-msgid "Unknown XferOverwriteMode %d"
+msgid "%u folders"
 msgstr ""
 
-#: src/file-manager/dfos-corba.c:124
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
-msgid "Unknown XferErrorMode %d"
+msgid "%u files"
 msgstr ""
 
-#: src/file-manager/dfos-xfer-progress-dialog.c:314
-msgid "From: "
+#. This means no contents at all were readable
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
+msgid "? items"
 msgstr ""
 
-#: src/file-manager/dfos-xfer-progress-dialog.c:318
-msgid "To: "
+#. This means no contents at all were readable
+#: libnautilus-extensions/nautilus-file.c:3746
+msgid "? bytes"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3759
+msgid "unknown type"
+msgstr "saghas gan aithne"
+
+#: libnautilus-extensions/nautilus-file.c:3761
+#, fuzzy
+msgid "unknown MIME type"
+msgstr "saghas gan aithne"
+
+#. Fallback, use for both unknown attributes and attributes
+#. * for which we have no more appropriate default.
+#.
+#: libnautilus-extensions/nautilus-file.c:3766
+#, fuzzy
+msgid "unknown"
+msgstr "<gan aithne>"
+
+#: libnautilus-extensions/nautilus-file.c:3802
+msgid "program"
+msgstr "ríomhchlár"
+
+#: libnautilus-extensions/nautilus-file.c:3814
+msgid ""
+"Can't find description even for \"x-directory/normal\". This probably means "
+"that your gnome-vfs.keys file is in the wrong place or isn't being found for "
+"some other reason."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3818
+#, c-format
+msgid ""
+"No description found for mime type \"%s\" (file is \"%s\"), tell "
+"aaron@eazel.com"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3832
+msgid "link"
+msgstr ""
+
+#. Note to localizers: convert file type string for file
+#. * (e.g. "folder", "plain text") to file type for symbolic link
+#. * to that kind of file (e.g. "link to folder").
+#.
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
+#, c-format
+msgid "link to %s"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3852
+msgid "link (broken)"
+msgstr ""
+
+#. "From" dialog label, source path gets placed next to it in the dialog
+#: libnautilus-extensions/nautilus-file-operations.c:425
+msgid "From:"
+msgstr ""
+
+#. "To" dialog label, source path gets placed next to it in the dialog
+#: libnautilus-extensions/nautilus-file-operations.c:440
+msgid "To:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:622
+#, c-format
+msgid ""
+"Error while moving.\n"
+"\n"
+"\"%s\" cannot be moved because it is on a read-only disk."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:633
+#, c-format
+msgid ""
+"Error while deleting.\n"
+"\n"
+"\"%s\" cannot be deleted because you do not have permissions to modify its "
+"parent folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:639
+#, c-format
+msgid ""
+"Error while deleting.\n"
+"\n"
+"\"%s\" cannot be deleted because it is on a read-only disk."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:670
+#, c-format
+msgid ""
+"Error while moving.\n"
+"\n"
+"\"%s\" cannot be moved because you do not have permissions to change it or "
+"its parent folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:677
+#, c-format
+msgid ""
+"Error while moving.\n"
+"\n"
+"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"change it or its parent folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:701
+#, c-format
+msgid ""
+"Error while copying.\n"
+"\n"
+"\"%s\" cannot be copied because you do not have permissions to read it."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:723
+#, c-format
+msgid ""
+"Error while copying to \"%s\".\n"
+"\n"
+"There is not enough space on the destination."
 msgstr ""
 
-#. transfer error, prompt the user to continue or stop
-#: src/file-manager/dfos-xfer.c:183
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
-"Error %s copying file %s. \n"
+"Error while moving to \"%s\".\n"
+"\n"
+"There is not enough space on the destination."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:732
+#, c-format
+msgid ""
+"Error while creating link in \"%s\".\n"
+"\n"
+"There is not enough space on the destination."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:744
+#, c-format
+msgid ""
+"Error while copying to \"%s\".\n"
+"\n"
+"You do not have permissions to write to this folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:748
+#, c-format
+msgid ""
+"Error while copying to \"%s\".\n"
+"\n"
+"The destination disk is read-only."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:755
+#, c-format
+msgid ""
+"Error while moving items to \"%s\".\n"
+"\n"
+"You do not have permissions to write to this folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:759
+#, c-format
+msgid ""
+"Error while moving items to \"%s\".\n"
+"\n"
+"The destination disk is read-only."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:766
+#, c-format
+msgid ""
+"Error while creating links in \"%s\".\n"
+"\n"
+"You do not have permissions to write to this folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:770
+#, c-format
+msgid ""
+"Error while creating links in \"%s\".\n"
+"\n"
+"The destination disk is read-only."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:799
+#, c-format
+msgid ""
+"Error \"%s\" while copying \"%s\".\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:803
+#, c-format
+msgid ""
+"Error \"%s\" while moving \"%s\".\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:807
+#, c-format
+msgid ""
+"Error \"%s\" while creating a link to \"%s\".\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:813
+#, c-format
+msgid ""
+"Error \"%s\" while deleting \"%s\".\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:828
+#, c-format
+msgid ""
+"Error \"%s\" while copying.\n"
+"\n"
 "Would you like to continue?"
 msgstr ""
 
-#: src/file-manager/dfos-xfer.c:188
-msgid "File copy error"
+#: libnautilus-extensions/nautilus-file-operations.c:832
+#, c-format
+msgid ""
+"Error \"%s\" while moving.\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:836
+#, c-format
+msgid ""
+"Error \"%s\" while linking.\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:842
+#, c-format
+msgid ""
+"Error \"%s\" while deleting.\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:958
+msgid "Error while copying."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:961
+msgid "Error while moving."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:964
+msgid "Error while linking."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:969
+msgid "Error while deleting."
 msgstr ""
 
-#: src/file-manager/dfos-xfer.c:189 src/file-manager/dfos-xfer.c:229
-#: src/file-manager/dfos-xfer.c:239
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr ""
 
-#: src/file-manager/dfos-xfer.c:189
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr ""
 
-#: src/file-manager/dfos-xfer.c:219
+#: libnautilus-extensions/nautilus-file-operations.c:1088
+#, c-format
+msgid ""
+"\"%s\" could not be moved to the new location, because its name is already "
+"used for a special item that cannot be removed or replaced.\n"
+"\n"
+"If you still want to move \"%s\", rename it and try again."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
-"File %s already exists. \n"
+"\"%s\" could not be copied to the new location, because its name is already "
+"used for a special item that cannot be removed or replaced.\n"
+"\n"
+"If you still want to copy \"%s\", rename it and try again."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1102
+msgid "Unable to replace file."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1112
+#, c-format
+msgid ""
+"File \"%s\" already exists.\n"
+"\n"
 "Would you like to replace it?"
 msgstr ""
 
-#: src/file-manager/dfos-xfer.c:228 src/file-manager/dfos-xfer.c:238
-msgid "File copy conflict"
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
+msgid "Conflict while copying"
 msgstr ""
 
-#: src/file-manager/dfos-xfer.c:229 src/file-manager/dfos-xfer.c:239
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr ""
 
-#: src/file-manager/dfos-xfer.c:239
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr ""
 
-#: src/file-manager/dfos-xfer.c:293
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
-msgid "Unknown GnomeVFSXferProgressStatus %d"
+msgid "another link to %s"
 msgstr ""
 
-#: src/file-manager/dfos-xfer.c:363
+#. Localizers: Feel free to leave out the "st" suffix
+#. * if there's no way to do that nicely for a
+#. * particular language.
+#.
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
-msgid ""
-"The transfer between\n"
-"%s\n"
-"and\n"
-"%s\n"
-"could not be started:\n"
-"%s"
+msgid "%dst link to %s"
+msgstr ""
+
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1211
+#, c-format
+msgid "%dnd link to %s"
+msgstr ""
+
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1215
+#, c-format
+msgid "%drd link to %s"
+msgstr ""
+
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1219
+#, c-format
+msgid "%dth link to %s"
+msgstr ""
+
+#. Localizers:
+#. * Feel free to leave out the st, nd, rd and th suffix or
+#. * make some or all of them match.
+#.
+#. localizers: tag used to detect the first copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
+msgid " (copy)"
+msgstr ""
+
+#. localizers: tag used to detect the second copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
+msgid " (another copy)"
+msgstr ""
+
+#. localizers: tag used to detect the x1st copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1243
+msgid "st copy)"
+msgstr ""
+
+#. localizers: tag used to detect the x2nd copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1245
+msgid "nd copy)"
+msgstr ""
+
+#. localizers: tag used to detect the x3rd copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1247
+msgid "rd copy)"
+msgstr ""
+
+#. localizers: tag used to detect the xxth copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1249
+msgid "th copy)"
+msgstr ""
+
+#. localizers: appended to first file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1259
+#, c-format
+msgid "%s (copy)%s"
+msgstr ""
+
+#. localizers: appended to second file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1261
+#, c-format
+msgid "%s (another copy)%s"
+msgstr ""
+
+#. localizers: appended to x1st file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1263
+#, c-format
+msgid "%s (%dst copy)%s"
+msgstr ""
+
+#. localizers: appended to x2nd file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1265
+#, c-format
+msgid "%s (%dnd copy)%s"
+msgstr ""
+
+#. localizers: appended to x3rd file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1267
+#, c-format
+msgid "%s (%drd copy)%s"
+msgstr ""
+
+#. localizers: appended to xxth file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1269
+#, c-format
+msgid "%s (%dth copy)%s"
+msgstr ""
+
+#. localizers: opening parentheses to match the "th copy)" string
+#: libnautilus-extensions/nautilus-file-operations.c:1353
+msgid " ("
+msgstr ""
+
+#. localizers: opening parentheses of the "th copy)" string
+#: libnautilus-extensions/nautilus-file-operations.c:1361
+#, c-format
+msgid " (%d"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
+#, c-format
+msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr ""
 
-#: src/file-manager/dfos-xfer.c:478
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1822
+msgid "Moving files to the Trash"
+msgstr ""
+
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1824
+msgid "Files thrown out:"
+msgstr ""
+
+#. localizers: label prepended to the name of the current file moved
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr ""
 
-#: src/file-manager/dfos-xfer.c:479
+#: libnautilus-extensions/nautilus-file-operations.c:1827
+msgid "Preparing to Move to Trash..."
+msgstr ""
+
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1837
+msgid "Moving files"
+msgstr ""
+
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1839
+msgid "Files moved:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr ""
 
-#: src/file-manager/dfos-xfer.c:481
+#: libnautilus-extensions/nautilus-file-operations.c:1843
+msgid "Finishing Move..."
+msgstr ""
+
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1855
+msgid "Creating links to files"
+msgstr ""
+
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1857
+msgid "Files linked:"
+msgstr ""
+
+#. localizers: label prepended to the name of the current file linked
+#: libnautilus-extensions/nautilus-file-operations.c:1859
+msgid "Linking"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1860
+msgid "Preparing to Create Links..."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1861
+msgid "Finishing Creating Links..."
+msgstr ""
+
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1868
+msgid "Copying files"
+msgstr ""
+
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1870
+msgid "Files copied:"
+msgstr ""
+
+#. localizers: label prepended to the name of the current file copied
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr ""
 
-#: src/file-manager/dfos-xfer.c:482
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:592
+#: libnautilus-extensions/nautilus-file-operations.c:1891
+msgid "You cannot copy items into the Trash."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1892
+msgid "Can't Copy to Trash"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1919
+msgid "The Trash must remain on the desktop."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1920
+msgid "You cannot move this trash folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1922
+msgid "You cannot copy the Trash."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1923
+msgid "You cannot copy this trash folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1925
+msgid "Can't Change Trash Location"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1926
+msgid "Can't Copy Trash"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1949
+msgid "You cannot move a folder into itself."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1950
+msgid "You cannot copy a folder into itself."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1952
+msgid "Can't Move Into Self"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1953
+msgid "Can't Copy Into Self"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1965
+msgid "You cannot copy a file over itself."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1966
+msgid "Can't Copy Over Self"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2017
+msgid ""
+"Error creating new folder.\n"
+"\n"
+"You do not have permissions to write to the destination."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2020
+msgid ""
+"Error creating new folder.\n"
+"\n"
+"There is no space on the destination."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
-msgid "\"%s\" selected"
+msgid "Error \"%s\" creating new folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2027
+msgid "Error creating new folder"
+msgstr ""
+
+#. localizers: the initial name of a new folder
+#: libnautilus-extensions/nautilus-file-operations.c:2114
+msgid "untitled folder"
+msgstr ""
+
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:2147
+#, fuzzy
+msgid "Deleting files"
+msgstr "Scríos"
+
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
+msgid "Files deleted:"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:594
-msgid "1 directory selected"
+#. localizers: label prepended to the name of the current file deleted
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
+#, fuzzy
+msgid "Deleting"
+msgstr "Scríos"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2152
+msgid "Preparing to Delete files..."
+msgstr ""
+
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:2182
+msgid "Emptying the Trash"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2187
+msgid "Preparing to Empty the Trash..."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2218
+msgid ""
+"Are you sure you want to permanently delete all of the items in the Trash?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2220
+msgid "Delete Trash Contents?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2221
+msgid "Empty"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+msgid "foo"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+msgid "foo (copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2260
+msgid ".bashrc"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2260
+msgid ".bashrc (copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2261
+msgid ".foo.txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2261
+msgid ".foo (copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2262
+msgid "foo foo"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2262
+msgid "foo foo (copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+msgid "foo.txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+msgid "foo (copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+msgid "foo foo.txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
+msgid "foo foo (copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2265
+msgid "foo foo.txt txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2265
+msgid "foo foo (copy).txt txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2266
+msgid "foo...txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2266
+msgid "foo.. (copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2267
+msgid "foo..."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2267
+msgid "foo... (copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2268
+msgid "foo. (copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2268
+msgid "foo. (another copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
+msgid "foo (another copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
+msgid "foo (another copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2271
+msgid "foo (3rd copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2272
+msgid "foo (3rd copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2273
+msgid "foo foo (another copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2273
+msgid "foo foo (3rd copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+msgid "foo (13th copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+msgid "foo (14th copy)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:597
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+msgid "foo (13th copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+msgid "foo (14th copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+msgid "foo (21st copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+msgid "foo (22nd copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+msgid "foo (21st copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+msgid "foo (22nd copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+msgid "foo (23rd copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+msgid "foo (23rd copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
+msgid "foo (24th copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
+msgid "foo (24th copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2282
+msgid "foo (25th copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2283
+msgid "foo (25th copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2284
+msgid "foo foo (24th copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2284
+msgid "foo foo (25th copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2285
+msgid "foo foo (24th copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2285
+msgid "foo foo (25th copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2286
+msgid "foo foo (100000000000000th copy).txt"
+msgstr ""
+
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+msgid "foo (10th copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+msgid "foo (11st copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+msgid "foo (10th copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+msgid "foo (11st copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+msgid "foo (11th copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+msgid "foo (12nd copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+msgid "foo (11th copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+msgid "foo (12nd copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+msgid "foo (12th copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+msgid "foo (13rd copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+msgid "foo (12th copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+msgid "foo (13rd copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
 #, c-format
-msgid "%d directories selected"
+msgid "%ld of %ld"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
+msgid "GConf Error"
+msgstr ""
+
+#. Constants
+#: libnautilus-extensions/nautilus-global-preferences.c:50
+#, fuzzy
+msgid "Nautilus Preferences"
+msgstr "Nautilus: %s"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+#, fuzzy
+msgid "never"
+msgstr "úinear"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+#, fuzzy
+msgid "Fonts"
+msgstr "Notaí"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+msgid "Font for Icon view:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+msgid "Font for List view:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+#, fuzzy
+msgid "Opening New Windows"
+msgstr "Oscáil ins an Fuinneog _Nua"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:651
+msgid "Open each file or folder in a separate window"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+msgid "Display toolbar in new windows"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+msgid "Ask before emptying the Trash or deleting files"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
+
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:713
+#, fuzzy
+msgid "single"
+msgstr "meid"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:714
+msgid "Activate items with a single click"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:717
+msgid "double"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:718
+msgid "Activate items with a double click"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:725
+msgid "launch"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:726
+msgid "Execute files when they are clicked"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:729
+msgid "display"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:730
+msgid "Display files when they are clicked"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:733
+msgid "ask"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:734
+msgid "Ask each time"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:759
+msgid "Show hidden files (file names start with \".\")"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:766
+msgid "Show backup files (file names end with \"~\")"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:773
+msgid "Show special flags in Properties window"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+msgid "Sorting Order"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
+msgid "Location:"
+msgstr "Áit:"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+msgid "HTTP Proxy Settings"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:798
+msgid "Use HTTP Proxy"
+msgstr ""
+
+#. allocate the proxy label, followed by the entry
+#: libnautilus-extensions/nautilus-global-preferences.c:812
+#: src/nautilus-first-time-druid.c:683
+msgid "Port:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+#, fuzzy
+msgid "Built-in Bookmarks"
+msgstr "Nautilus: Leabharmarcanna"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr ""
+
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+msgid "Navigation"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:962
+msgid "Speed Tradeoffs"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+msgid "Search for files by file name only"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+msgid "Search for files by file name and file properties"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:997
+msgid "Search Complexity Options"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
+#, fuzzy
+msgid "Fast Search"
+msgstr "Cuardaigh"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+msgid "Search Engine Location"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Cuardaigh"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, c-format
+msgid "Display %s tab in sidebar"
+msgstr ""
+
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"currently can't be performed because the program crond, which does nightly "
+"tasks on your computer, is turned off. To make sure fast searches can be "
+"done, turn crond on."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
+msgid "Files May Not Be Indexed"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
+msgid ""
+"If you are running Linux, you can log in as root and type these commands to "
+"start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"may not be performed because the program crond, which does nightly tasks on "
+"your computer, may be turned off. To make sure fast searches can be done, "
+"check to make sure that crond is turned on.\n"
+"\n"
+msgstr ""
+
+#. The list of characters that cause line breaks can be localized.
+#: libnautilus-extensions/nautilus-icon-canvas-item.c:70
+msgid " -_,;.?/&"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
+msgid ""
+"This folder uses automatic layout. Do you want to switch to manual layout "
+"and leave this item where you dropped it? This will clobber the stored "
+"manual layout."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
+msgid ""
+"This folder uses automatic layout. Do you want to switch to manual layout "
+"and leave these items where you dropped them? This will clobber the stored "
+"manual layout."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
+msgid ""
+"This folder uses automatic layout. Do you want to switch to manual layout "
+"and leave this item where you dropped it?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
+msgid ""
+"This folder uses automatic layout. Do you want to switch to manual layout "
+"and leave these items where you dropped them?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
+msgid "Switch to Manual Layout?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
+msgid "Switch"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
+#: src/file-manager/nautilus-icon-view-ui.xml.h:25
+msgid "Rename"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
+msgid "Undo Typing"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
+msgid "Restore the old name"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
+msgid "Redo Typing"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
+msgid "Restore the changed name"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-preferences.c:92
+msgid "Beginner"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-preferences.c:93
+msgid "Intermediate"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-preferences.c:94
+msgid "Advanced"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
+msgid "Prefs Box"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:226
+msgid "not in menu"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:229
+msgid "in menu for this file"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:232
+#: libnautilus-extensions/nautilus-program-chooser.c:235
+#, c-format
+msgid "in menu for \"%s\""
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:238
+msgid "default for this file"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:241
+#: libnautilus-extensions/nautilus-program-chooser.c:244
+#, c-format
+msgid "default for \"%s\""
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:289
+#, c-format
+msgid "Is not in the menu for \"%s\" items."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:292
+#, c-format
+msgid "Is in the menu for \"%s\"."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:295
+#, c-format
+msgid "Is in the menu for \"%s\" items."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:298
+#, c-format
+msgid "Is in the menu for all \"%s\" items."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:301
+#, c-format
+msgid "Is the default for \"%s\"."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:304
+#, c-format
+msgid "Is the default for \"%s\" items."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:307
+#, c-format
+msgid "Is the default for all \"%s\" items."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:993
+#, c-format
+msgid "Modify \"%s\""
+msgstr ""
+
+#. Radio button for adding to short list for file type.
+#: libnautilus-extensions/nautilus-program-chooser.c:1018
+#, c-format
+msgid "Include in the menu for \"%s\" items"
+msgstr ""
+
+#. Radio button for setting default for file type.
+#: libnautilus-extensions/nautilus-program-chooser.c:1025
+#, c-format
+msgid "Use as default for \"%s\" items"
+msgstr ""
+
+#. Radio button for adding to short list for specific file.
+#: libnautilus-extensions/nautilus-program-chooser.c:1032
+#, c-format
+msgid "Include in the menu just for \"%s\""
+msgstr ""
+
+#. Radio button for setting default for specific file.
+#: libnautilus-extensions/nautilus-program-chooser.c:1038
+#, c-format
+msgid "Use as default just for \"%s\""
+msgstr ""
+
+#. Radio button for not including program in short list for type or file.
+#: libnautilus-extensions/nautilus-program-chooser.c:1045
+#, c-format
+msgid "Don't include in the menu for \"%s\" items"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1209
+#: src/file-manager/fm-list-view.c:2182
+#: src/file-manager/fm-search-list-view.c:545
+#: src/nautilus-bookmarks-window.c:164
+msgid "Name"
+msgstr "Ainm"
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1212
+msgid "Status"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1260
+msgid "Open with Other"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1261
+#, c-format
+msgid "Choose an application with which to open \"%s\"."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1265
+msgid "View as Other"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1266
+#, c-format
+msgid "Choose a view for \"%s\"."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1273
+#, fuzzy
+msgid "Choose"
+msgstr "Dún"
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1275
+#, fuzzy
+msgid "Done"
+msgstr "Críochnaithe!"
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1338
+msgid "Modify..."
+msgstr ""
+
+#. Framed area with button to launch mime type editing capplet.
+#: libnautilus-extensions/nautilus-program-chooser.c:1349
+msgid "File Types and Programs"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1370
+msgid ""
+"You can configure which programs are offered for which file types in the "
+"GNOME Control Center."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:603
+#: libnautilus-extensions/nautilus-program-chooser.c:1485
+#, c-format
+msgid "No viewers are available for \"%s\"."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1486
+msgid "No Viewers Available"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1489
+#, c-format
+msgid "No applications are available for \"%s\"."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1490
+msgid "No Applications Available"
+msgstr ""
+
+#. Note: This might be misleading in the components case, since the
+#. * user can't add components to the complete list even from the capplet.
+#. * (They can add applications though.)
+#.
+#: libnautilus-extensions/nautilus-program-chooser.c:1497
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"You can configure which programs are offered for which file types with the "
+"\"File Types and Programs\" part of the GNOME Control Center. Do you want to "
+"go there now?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-choosing.c:492
+#, c-format
+msgid ""
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  Would you like to choose another application?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-choosing.c:497
+#: libnautilus-extensions/nautilus-program-choosing.c:518
+msgid "Can't Open Location"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-choosing.c:513
+#, c-format
+msgid ""
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  No other applications are available to view this file.  If you "
+"copy this file onto your computer, you may be able to open it."
+msgstr ""
+
+#. Human readable description for a criterion in a search for
+#. files. Bracketed items are context, and are message
+#. strings elsewhere.  You don't have to translate the whole
+#. string, and only the translation for "containing '%s' will
+#. be used.  If you do translate the whole string, leave the
+#. translations of the rest of the text in brackets, so it
+#. will not be used.
+#. "%s" here is a pattern the file name
+#. matched, such as "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:212
+#, c-format
+msgid "[Items ]containing \"%s\" in their names"
+msgstr ""
+
+#. "%s" here is a pattern the file name started with, such as
+#. "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:217
+#, c-format
+msgid "[Items ]starting with \"%s\""
+msgstr ""
+
+#. "%s" here is a pattern the file name ended with, such as
+#. "mime"
+#: libnautilus-extensions/nautilus-search-uri.c:222
+#, c-format
+msgid "[Items ]ending with %s"
+msgstr ""
+
+#. "%s" here is a pattern the file name did not match, such
+#. as "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:227
+#, c-format
+msgid "[Items ]not containing \"%s\" in their names"
+msgstr ""
+
+#. "%s" is a regular expression string, for example "[abc]"
+#: libnautilus-extensions/nautilus-search-uri.c:231
+#, c-format
+msgid "[Items ]matching the regular expression \"%s\""
+msgstr ""
+
+#. "%s" is a file glob, for example "*.txt"
+#: libnautilus-extensions/nautilus-search-uri.c:235
+#, c-format
+msgid "[Items ]matching the file pattern \"%s\""
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:248
+msgid "[Items that are ]regular files"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:251
+msgid "[Items that are ]text files"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:254
+msgid "[Items that are ]applications"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:257
+msgid "[Items that are ]folders"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:260
+msgid "[Items that are ]music"
+msgstr ""
+
+#. "%s" here is a word describing a file type, for example
+#. "folder"
+#: libnautilus-extensions/nautilus-search-uri.c:268
+#, c-format
+msgid "[Items ]that are not %s"
+msgstr ""
+
+#. "%s" here is a word describing a file type, for example
+#. "folder"
+#: libnautilus-extensions/nautilus-search-uri.c:273
+#, c-format
+msgid "[Items ]that are %s"
+msgstr ""
+
+#. "%s" here is the name of user on a Linux machine, such as
+#. "root"
+#: libnautilus-extensions/nautilus-search-uri.c:287
+#, c-format
+msgid "[Items ]not owned by \"%s\""
+msgstr ""
+
+#. "%s" here is the name of user on a Linux machine, such as
+#. "root"
+#: libnautilus-extensions/nautilus-search-uri.c:292
+#, c-format
+msgid "[Items ]owned by \"%s\""
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:295
+#, c-format
+msgid "[Items ]with owner UID \"%s\""
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:298
+#, c-format
+msgid "[Items ]with owner UID other than \"%s\""
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:309
+#, c-format
+msgid "[Items ]larger than %s bytes"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:312
+#, c-format
+msgid "[Items ]smaller than %s bytes"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:315
+#, c-format
+msgid "[Items ]of %s bytes"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:326
+msgid "[Items ]modified today"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:329
+msgid "[Items ]modified yesterday"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:332
+#, c-format
+msgid "[Items ]modified on %s"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:334
+#, c-format
+msgid "[Items ]not modified on %s"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:337
+#, c-format
+msgid "[Items ]modified before %s"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:340
+#, c-format
+msgid "[Items ]modified after %s"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:343
+#, c-format
+msgid "[Items ]modified within a week of %s"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:346
+#, c-format
+msgid "[Items ]modified within a month of %s"
+msgstr ""
+
+#. "%s" here is the name of an Emblem
+#: libnautilus-extensions/nautilus-search-uri.c:359
+#, c-format
+msgid "[Items ]marked with \"%s\""
+msgstr ""
+
+#. "%s" here is the name of an Emblem
+#: libnautilus-extensions/nautilus-search-uri.c:363
+#, c-format
+msgid "[Items ]not marked with \"%s\""
+msgstr ""
+
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:379
+#, c-format
+msgid "[Items ]with all the words \"%s\""
+msgstr ""
+
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:384
+#, c-format
+msgid "[Items ]containing one of the words \"%s\""
+msgstr ""
+
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:389
+#, c-format
+msgid "[Items ]without all the words \"%s\""
+msgstr ""
+
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:394
+#, c-format
+msgid "[Items ]without any of the words \"%s\""
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:556
+msgid "[Items larger than 400K] and [without all the words \"apple orange\"]"
+msgstr ""
+
+#. Human readable description for a criterion in a search for
+#. files. Bracketed items are context, and are message
+#. strings elsewhere.  Translate only the words "and" here.
+#: libnautilus-extensions/nautilus-search-uri.c:561
+msgid ""
+"[Items larger than 400K], [owned by root and without all the words \"apple "
+"orange\"]"
+msgstr ""
+
+#. The beginning of the description of a search that has just been
+#. performed.  The "%s" here is a description of a single criterion,
+#. which in english might be "that contain the word 'foo'"
+#: libnautilus-extensions/nautilus-search-uri.c:591
+#, c-format
+msgid "Items %s"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:701
+msgid "Items containing \"stuff\" in their names"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:703
+msgid "Items that are regular files"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:706
+msgid "Items containing \"stuff\" in their names and that are regular files"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:710
+msgid ""
+"Items containing \"stuff\" in their names, that are regular files and "
+"smaller than 2000 bytes"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:714
+msgid "Items containing \"medusa\" in their names and that are folders"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-trash-directory.c:73
+msgid "Searching Disks"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-trash-directory.c:74
+msgid "Nautilus is searching your disks for trash folders."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-trash-file.c:725
+msgid "on the desktop"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-undo-signal-handlers.c:175
+msgid "Edit"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-undo-signal-handlers.c:176
+msgid "Undo Edit"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-undo-signal-handlers.c:177
+msgid "Undo the edit"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-undo-signal-handlers.c:178
+msgid "Redo Edit"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-undo-signal-handlers.c:179
+msgid "Redo the edit"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-view-identifier.c:61
+#, c-format
+msgid "View as %s"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-view-identifier.c:64
+#, c-format
+msgid "%s Viewer"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+msgid "Unknown"
+msgstr "Gan aithne"
+
+#. Populate table with items we know localized names for.
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
+msgid "Floppy"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
+msgid "CD-ROM"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
+msgid "Zip Drive"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
+msgid "Audio CD"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
+msgid "is write-protected, mounting read-only"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
+msgid "is not a valid block device"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
+msgid "No medium found"
+msgstr ""
+
+#. Handle floppy case
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
+msgid ""
+"Nautilus was unable to mount the floppy drive. There is probably no floppy "
+"in the drive."
+msgstr ""
+
+#. All others
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
+msgid ""
+"Nautilus was unable to mount the volume. There is probably no media in the "
+"device."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
+msgid "wrong fs type, bad option, bad superblock on"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
+msgid ""
+"Nautilus was unable to mount the floppy drive. The floppy is probably in a "
+"format that cannot be mounted."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
+msgid ""
+"Nautilus was unable to mount the selected volume. The volume is probably in "
+"a format that cannot be mounted."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
+msgid "Nautilus was unable to mount the selected floppy drive."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
+msgid "Nautilus was unable to mount the selected volume."
+msgstr ""
+
+#. FIXME: Should we parse this message and report something more meaningful?
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
+msgid "Nautilus was unable to unmount the selected volume."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
+msgid "ISO 9660 Volume"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
+msgid "Root"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
+msgid "Ext2 Volume"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
+msgid "MSDOS Volume"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
+msgid "NFS Volume"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
+msgid "ReiserFS Volume"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
+msgid "UFS Volume"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
+#, fuzzy
+msgid "Unknown Volume"
+msgstr "Gan aithne"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:5
+msgid "C_lear Text"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+msgid "Clear Text"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+msgid "Copy Text"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
+msgid "Copy the selected text to the clipboard"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+msgid "Cut Text"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+msgid "Cut _Text"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
+msgid "Cut the selected text to the clipboard"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+msgid "Paste Text"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
+msgid "Paste the text stored on the clipboard"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
+msgid "Remove the selected text without putting it on the clipboard"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+msgid "Select All"
+msgstr "Tóg gach rud"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+#, fuzzy
+msgid "Select _All"
+msgstr "Tóg gach rud"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+msgid "Select all the text in a text field"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
+msgid "_Copy Text"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
+msgid "_Paste Text"
+msgstr ""
+
+#. The copyright character in here is correct for
+#. * Latin-1 encoding, but not for UTF-8, so we have
+#. * to change it when we upgrade to GTK 2.0.
+#.
+#: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
+#: src/nautilus-window-menus.c:610
+msgid "Nautilus"
+msgstr "Nautilus"
+
+#: nautilus.desktop.in.h:2
+msgid "Nautilus File Manager and Graphic Shell"
+msgstr ""
+
+#. Note to translators: If it's hard to compose a good home
+#. * icon name from the user name, you can use a string without
+#. * an "%s" here, in which case the home icon name will not
+#. * include the user's name, which should be fine. To avoid a
+#. * warning, put "%.0s" somewhere in the string, which will
+#. * match the user name string passed by the C code, but not
+#. * put the user name in the final string.
+#.
+#: src/file-manager/fm-desktop-icon-view.c:886
+#, fuzzy, c-format
+msgid "%s's Home"
+msgstr "Baile"
+
+#: src/file-manager/fm-desktop-icon-view.c:1175
+msgid "Empty Trash..."
+msgstr ""
+
+#: src/file-manager/fm-desktop-icon-view.c:1177
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+msgid "Empty Trash"
+msgstr ""
+
+#: src/file-manager/fm-desktop-icon-view.c:1197
+msgid "Unmount Volume"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:440
+#, c-format
+msgid "This will open %d separate windows. Are you sure you want to do this?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:442
+#, fuzzy, c-format
+msgid "Open %d Windows?"
+msgstr "Oscáil ins an Fuinneog _Nua"
+
+#: src/file-manager/fm-directory-view.c:748
+#, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:752
+#, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Scríos"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Scríos"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+msgid "scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1335
+#, c-format
+msgid "\"%s\" selected"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1337
+#, fuzzy
+msgid "1 folder selected"
+msgstr "Roghnóir Dathanna"
+
+#: src/file-manager/fm-directory-view.c:1340
+#, fuzzy, c-format
+msgid "%d folders selected"
+msgstr "Roghnóir Dathanna"
+
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:605
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:607
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:618
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:622
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:629
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:632
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:646
-#, c-format
-msgid "%s%s"
-msgstr "%s%s"
-
-#: src/file-manager/fm-directory-view.c:650
+#. This is marked for translation in case a localizer
+#. * needs to change ", " to something else. The comma
+#. * is between the message about the number of folders
+#. * and the number of items in those folders and the
+#. * message about the number of other items and the
+#. * total size of those items.
+#.
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
 
-#: src/file-manager/fm-directory-view.c:1278
+#. Note that the number of items actually displayed varies somewhat due
+#. * to the way files are collected in batches. So you can't assume that
+#. * no more than the constant limit are displayed.
+#.
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
-msgid "Sorry, but %s could not be deleted"
+msgid ""
+"The folder \"%s\" contains more files than Nautilus can handle. Some files "
+"will not be displayed."
 msgstr ""
 
-#. Don't use GNOME_STOCK_BUTTON_CANCEL because the
-#. * red X is confusing in this context.
+#: src/file-manager/fm-directory-view.c:1537
+msgid "Too Many Files"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:2752
+#, c-format
+msgid ""
+"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:2757
+#, c-format
+msgid ""
+"The %d selected items cannot be moved to the Trash. Do you want to delete "
+"them immediately?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:2761
+#, c-format
+msgid ""
+"%d of the selected items cannot be moved to the Trash. Do you want to delete "
+"those %d items immediately?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:2769
+msgid "Delete Immediately?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:2799
+#, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:2803
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the %d selected items from the "
+"Trash?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:2809
+msgid "Delete From Trash?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
+#, c-format
+msgid "Use \"%s\" to open the selected item"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3232
+msgid "An _Application..."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3238
+msgid "A _Viewer..."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3451
+#, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
 #.
-#: src/file-manager/fm-directory-view.c:1305
-msgid "Delete Selection"
+#: src/file-manager/fm-directory-view.c:3637
+#, c-format
+msgid "Nautilus was unable to create the directory %s."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1306
-msgid "Delete"
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "Oscáil ins an Fuinneog _Nua"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#, fuzzy
+msgid "Open _in New Window"
+msgstr "Oscáil ins an Fuinneog _Nua"
+
+#: src/file-manager/fm-directory-view.c:3959
+#, fuzzy, c-format
+msgid "Open _in %d New Windows"
+msgstr "Oscáil ins an Fuinneog _Nua"
+
+#: src/file-manager/fm-directory-view.c:3977
+#, fuzzy
+msgid "Delete from _Trash..."
+msgstr "Scríos..."
+
+#: src/file-manager/fm-directory-view.c:3977
+msgid "Delete from _Trash"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+msgid "Move to _Trash"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "Scríos..."
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
 msgstr "Scríos"
 
-#: src/file-manager/fm-directory-view.c:1307
-msgid "Cancel"
+#: src/file-manager/fm-directory-view.c:4038
+msgid "Make _Links"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+msgid "Make _Link"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4056
+msgid "_Empty Trash..."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+msgid "_Empty Trash"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+msgid "R_emove Custom Images"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4069
+msgid "R_emove Custom Image"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4083
+msgid "Cu_t File"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+msgid "Cu_t Files"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4094
+msgid "_Copy File"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+msgid "_Copy Files"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4252
+msgid ""
+"This link can't be used, because it has no target. Do you want to put this "
+"link in the Trash?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4255
+#, c-format
+msgid ""
+"This link can't be used, because its target \"%s\" doesn't exist. Do you "
+"want to put this link in the Trash?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4261
+msgid "Broken Link"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4262
+msgid "Throw Away"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4315
+#, c-format
+msgid ""
+"\"%s\" is an executable text file. Do you want to run it, or display its "
+"contents?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4321
+msgid "Run or Display?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4322
+msgid "Run"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4323
+msgid "Display"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4377
+msgid ""
+"Sorry, but you can't execute commands from a remote site due to security "
+"considerations."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4379
+msgid "Can't execute remote links"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4513
+#, c-format
+msgid "Opening \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4519
+#, fuzzy
+msgid "Cancel Open?"
 msgstr "Cealaigh"
 
-#: src/file-manager/fm-directory-view.c:1326
+#: src/file-manager/fm-error-reporting.c:58
 #, c-format
-msgid "Are you sure you want to delete \"%s\"?"
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1329
+#: src/file-manager/fm-error-reporting.c:62
 #, c-format
-msgid "Are you sure you want to delete the %d selected items?"
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1483
-msgid "Zoom In"
+#: src/file-manager/fm-error-reporting.c:69
+#, c-format
+msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1485
-msgid "Zoom Out"
+#: src/file-manager/fm-error-reporting.c:72
+msgid "Error Displaying Folder"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1499
-#: src/file-manager/fm-directory-view.c:1595
-msgid "_Open"
-msgstr "_Oscáil"
+#: src/file-manager/fm-error-reporting.c:103
+#, c-format
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1503
-msgid "Open in _New Window"
-msgstr "Oscáil ins an Fuinneog _Nua"
+#: src/file-manager/fm-error-reporting.c:108
+#, c-format
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1505
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
-msgid "Open in %d _New Windows"
+msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1509
-msgid "_Delete..."
-msgstr "_Scríos..."
+#: src/file-manager/fm-error-reporting.c:118
+#, c-format
+msgid ""
+"The name \"%s\" is not valid because it contains the character \"/\". Please "
+"use a different name."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1512
-msgid "_Duplicate"
+#: src/file-manager/fm-error-reporting.c:122
+#, c-format
+msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1515
-msgid "Set _Properties..."
+#: src/file-manager/fm-error-reporting.c:128
+#, c-format
+msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1596
-msgid "Open the selected item in this window"
+#: src/file-manager/fm-error-reporting.c:137
+#, c-format
+msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1606
-msgid "Open in New Window"
+#: src/file-manager/fm-error-reporting.c:144
+msgid "Renaming Error"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1607
-msgid "Open each selected item in a new window"
+#: src/file-manager/fm-error-reporting.c:164
+#, c-format
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1620
-msgid "Set Properties..."
+#: src/file-manager/fm-error-reporting.c:168
+#, c-format
+msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1621
-msgid "View or modify the properties of the selected items"
+#: src/file-manager/fm-error-reporting.c:176
+#, c-format
+msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1631
-msgid "Delete..."
-msgstr "Scríos..."
+#: src/file-manager/fm-error-reporting.c:180
+msgid "Error Setting Group"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1632
-msgid "Delete all selected items"
+#: src/file-manager/fm-error-reporting.c:202
+#, c-format
+msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1642
-msgid "Duplicate"
+#: src/file-manager/fm-error-reporting.c:209
+#, c-format
+msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1643
-msgid "Duplicate all selected items"
+#: src/file-manager/fm-error-reporting.c:212
+msgid "Error Setting Owner"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1654
-msgid "Select all items in this window"
+#: src/file-manager/fm-error-reporting.c:234
+#, c-format
+msgid ""
+"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-icon-text-window.c:72
+#: src/file-manager/fm-error-reporting.c:241
+#, c-format
+msgid "Sorry, couldn't change the permissions of \"%s\"."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:244
+msgid "Error Setting Permissions"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:310
+#, c-format
+msgid "Renaming \"%s\" to \"%s\"."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:315
+#, fuzzy
+msgid "Cancel Rename?"
+msgstr "Cealaigh"
+
+#: src/file-manager/fm-icon-text-window.c:77
 msgid "size"
 msgstr "meid"
 
-#: src/file-manager/fm-icon-text-window.c:73
+#: src/file-manager/fm-icon-text-window.c:78
 msgid "type"
 msgstr "saghas"
 
-#: src/file-manager/fm-icon-text-window.c:74
+#: src/file-manager/fm-icon-text-window.c:79
 msgid "date modified"
 msgstr ""
 
-#: src/file-manager/fm-icon-text-window.c:75
+#: src/file-manager/fm-icon-text-window.c:80
 msgid "date changed"
 msgstr ""
 
-#: src/file-manager/fm-icon-text-window.c:76
+#: src/file-manager/fm-icon-text-window.c:81
 msgid "date accessed"
 msgstr ""
 
-#: src/file-manager/fm-icon-text-window.c:77
+#: src/file-manager/fm-icon-text-window.c:82
 msgid "owner"
 msgstr "úinear"
 
-#: src/file-manager/fm-icon-text-window.c:78
+#: src/file-manager/fm-icon-text-window.c:83
 msgid "group"
 msgstr "grupa"
 
-#: src/file-manager/fm-icon-text-window.c:79
+#: src/file-manager/fm-icon-text-window.c:84
 msgid "permissions"
 msgstr ""
 
-#: src/file-manager/fm-icon-text-window.c:80
+#: src/file-manager/fm-icon-text-window.c:85
+msgid "octal permissions"
+msgstr ""
+
+#: src/file-manager/fm-icon-text-window.c:86
 msgid "MIME type"
 msgstr "saghas MIME"
 
-#: src/file-manager/fm-icon-text-window.c:251
-msgid "Nautilus: Icon Text"
+#: src/file-manager/fm-icon-text-window.c:87
+#, fuzzy
+msgid "none"
+msgstr "Críochnaithe!"
+
+#: src/file-manager/fm-icon-text-window.c:263
+msgid "Icon Captions"
 msgstr ""
 
-#: src/file-manager/fm-icon-text-window.c:258
+#: src/file-manager/fm-icon-text-window.c:271
 msgid ""
 "Choose the order for information to appear beneath icon names. More "
 "information appears as you zoom in closer."
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:439
-msgid "_Stretch Icon"
+#: src/file-manager/fm-icon-view.c:168
+#, fuzzy
+msgid "by _Name"
+msgstr "Ainm"
+
+#: src/file-manager/fm-icon-view.c:169
+#: src/file-manager/nautilus-icon-view-ui.xml.h:17
+msgid "Keep icons sorted by name in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:447
-msgid "_Restore Icons to Unstretched Size"
+#: src/file-manager/fm-icon-view.c:175
+#, fuzzy
+msgid "by _Size"
+msgstr "Meid"
+
+#: src/file-manager/fm-icon-view.c:176
+#: src/file-manager/nautilus-icon-view-ui.xml.h:18
+msgid "Keep icons sorted by size in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:449
-msgid "_Restore Icon to Unstretched Size"
+#: src/file-manager/fm-icon-view.c:182
+#, fuzzy
+msgid "by _Type"
+msgstr "Saghas"
+
+#: src/file-manager/fm-icon-view.c:183
+#: src/file-manager/nautilus-icon-view-ui.xml.h:19
+msgid "Keep icons sorted by type in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:454
-msgid "Customize _Icon Text..."
+#: src/file-manager/fm-icon-view.c:189
+msgid "by Modification _Date"
 msgstr ""
 
-#. Modify file name. We only allow this on a single file selection.
-#: src/file-manager/fm-icon-view.c:458
-msgid "_Rename"
+#: src/file-manager/fm-icon-view.c:190
+#: src/file-manager/nautilus-icon-view-ui.xml.h:16
+msgid "Keep icons sorted by modification date in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:862
-msgid "Make the selected icon stretchable"
+#: src/file-manager/fm-icon-view.c:196
+msgid "by _Emblems"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:866
-msgid "Restore each selected icon to its original size"
+#: src/file-manager/fm-icon-view.c:197
+#: src/file-manager/nautilus-icon-view-ui.xml.h:15
+msgid "Keep icons sorted by emblems in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:875
-msgid "Choose which information appears beneath each icon's name"
+#: src/file-manager/fm-icon-view.c:1241
+#: src/file-manager/nautilus-icon-view-ui.xml.h:39
+msgid "_Restore Icons' Original Sizes"
+msgstr ""
+
+#: src/file-manager/fm-icon-view.c:1242
+msgid "_Restore Icon's Original Size"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:886
-msgid "Auto Layout"
+#: src/file-manager/fm-icon-view.c:1489
+#, c-format
+msgid "pointing at \"%s\""
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:887
-msgid "Keep icons sorted in rows and columns"
+#: src/file-manager/fm-list-view.c:2188
+#: src/file-manager/fm-search-list-view.c:557
+msgid "Size"
+msgstr "Meid"
+
+#: src/file-manager/fm-list-view.c:2194
+#: src/file-manager/fm-search-list-view.c:563
+msgid "Type"
+msgstr "Saghas"
+
+#: src/file-manager/fm-list-view.c:2200
+#: src/file-manager/fm-search-list-view.c:569
+msgid "Date Modified"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:893
-msgid "Manual Layout"
+#: src/file-manager/fm-properties-window.c:522
+#, c-format
+msgid "%s Properties"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:894
-msgid "Leave icons wherever they are dropped"
+#: src/file-manager/fm-properties-window.c:717
+msgid "Cancel Group Change?"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:901
-msgid "Rename"
+#: src/file-manager/fm-properties-window.c:718
+msgid "Changing group"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:902
-msgid "Rename selected item"
+#: src/file-manager/fm-properties-window.c:879
+msgid "Cancel Owner Change?"
 msgstr ""
 
-#: src/file-manager/fm-list-view.c:308
-msgid "Size"
+#: src/file-manager/fm-properties-window.c:880
+msgid "Changing owner"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1063
+msgid "nothing"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1065
+msgid "unreadable"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1074
+#, c-format
+msgid "1 item, with size %s"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1076
+#, c-format
+msgid "%d items, totalling %s"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1082
+msgid "(some contents unreadable)"
+msgstr ""
+
+#. Also set the title field here, with a trailing carriage return & space
+#. * if the value field has two lines. This is a hack to get the
+#. * "Contents:" title to line up with the first line of the 2-line value.
+#. * Maybe there's a better way to do this, but I couldn't think of one.
+#.
+#: src/file-manager/fm-properties-window.c:1096
+msgid "Contents:"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1443
+msgid "Basic"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1522
+#, fuzzy
+msgid "Type:"
+msgstr "Saghas"
+
+#: src/file-manager/fm-properties-window.c:1527
+#, fuzzy
+msgid "Size:"
+msgstr "Meid: "
+
+#: src/file-manager/fm-properties-window.c:1531
+msgid "Link Target:"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
+msgstr "saghas MIME"
+
+#: src/file-manager/fm-properties-window.c:1540
+msgid "Modified:"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1543
+msgid "Accessed:"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1552
+msgid "Select Custom Icon..."
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1558
+msgid "Remove Custom Icon"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1886
+msgid "Set User ID"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1891
+msgid "Special Flags:"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1894
+msgid "Set Group ID"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1896
+msgid "Sticky"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1922
+msgid "Permissions"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1928
+msgid "You are not the owner, so you can't change these permissions."
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1941
+msgid "File Owner:"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1950
+msgid "File Group:"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1968
+#, fuzzy
+msgid "Owner:"
+msgstr "úinear"
+
+#: src/file-manager/fm-properties-window.c:1969
+#, fuzzy
+msgid "Group:"
+msgstr "grupa"
+
+#: src/file-manager/fm-properties-window.c:1970
+msgid "Others:"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1989
+#, fuzzy
+msgid "Read"
+msgstr "Athlód"
+
+#: src/file-manager/fm-properties-window.c:1993
+msgid "Write"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1997
+msgid "Execute"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:2048
+msgid "Text View:"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:2049
+msgid "Number View:"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:2050
+msgid "Last Changed:"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:2054
+#, c-format
+msgid "The permissions of \"%s\" could not be determined."
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:2334
+msgid "Cancel Showing Properties Window?"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:2335
+msgid "Creating Properties window"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:2435
+msgid "Select an icon:"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:124
+#, fuzzy
+msgid "Search Results"
+msgstr "Cuardaigh"
+
+#: src/file-manager/fm-search-list-view.c:142
+#, c-format
+msgid ""
+"Search results may not include items modified after %s, when your drive was "
+"last indexed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:158
+msgid ""
+"Sorry, but the Medusa search service is not available because it is not "
+"installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:159
+#: src/file-manager/nautilus-indexing-info.c:407
+msgid "Search Service Not Available"
+msgstr ""
+
+#. FIXME bugzilla.eazel.com 5058: Should be two messages, one for each of whether
+#. "slow complete search" turned on or not
+#: src/file-manager/fm-search-list-view.c:184
+msgid ""
+"The search you have selected is newer than the index on your system.  The "
+"search will return no results right now.  Would you like to create a new "
+"index now?"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:189
+msgid "Search for items that are too new"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:190
+msgid "Create a new index"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:191
+msgid "Don't create index"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:200
+msgid ""
+"Every indexed file on your computer matches the criteria you selected. You "
+"can check the spelling on your selections or add more criteria to narrow "
+"your results."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:204
+#: src/file-manager/fm-search-list-view.c:218
+msgid "Error during search"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:213
+#, c-format
+msgid "An error occurred while loading this search's contents: %s"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:241
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Find can't access your index right now so a slower search will be performed "
+"that doesn't use the index."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:246
+msgid ""
+"To do a content search, Find requires an index of the files on your system.  "
+"Find can't access your index right now. "
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast searches are not available"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:319
+#: src/file-manager/fm-search-list-view.c:338
+msgid "Content searches are not available"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:254
+msgid ""
+"Your index files are available but the Medusa search daemon, which handles "
+"index requests, isn't running.  To start this program, log in as root and "
+"enter this command at the command line: medusa-searchd"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:274
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Your computer does not have an index right now.  Because Find cannot use an "
+"index, this search may take several minutes.  Would you like to create an "
+"index? Creating an index will be done while you are not actively using your "
+"computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:283
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  Your computer does not have an index right now.  Would you like to "
+"create an index?  Creating an index will be done while you are not actively "
+"using your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:290
+#: src/file-manager/fm-search-list-view.c:318
+#: src/file-manager/fm-search-list-view.c:337
+msgid "Indexed searches are not available"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:294
+msgid "Create an Index"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:295
+msgid "Don't Create an Index Now"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:306
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Your computer is currently creating that index.   Because Find cannot use an "
+"index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:312
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  Your computer is currently creating that index.  Content searches "
+"will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:326
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  An "
+"index can't be created right now. When an index is not available, searches "
+"will take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:332
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  An index can't be created right now."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:341
+msgid ""
+"The program that creates an index is not set up correctly.  You can create "
+"an index by hand by running \"medusa-indexd\" as root on the command line."
+msgstr ""
+
+#. It is not necessary to translate this text just yet; it has not been
+#. edited yet, and will be replaced by a final copy in a few days.
+#: src/file-manager/fm-search-list-view.c:360
+#: src/file-manager/nautilus-indexing-info.c:342
+msgid ""
+"To do a fast search, Find requires an index of the files on your system. "
+"Your system administrator has disabled fast search on your computer, so no "
+"index is available."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:364
+msgid "Fast searches are not available on your computer"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:373
+#: src/file-manager/nautilus-indexing-info.c:361
+msgid ""
+"To do a fast search, Find requires an index of the files on your system. "
+"Fast search is disabled in your Search preferences, so no index is available."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:376
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
+msgid "Fast searches are not available on your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:377
+#: src/file-manager/nautilus-indexing-info.c:366
+msgid ""
+"To enable fast search, open the Preferences menu and choose Preferences. "
+"Then select Search preferences and put a checkmark in the Enable Fast Search "
+"checkbox. An index will be generated while your computer is idle, so your "
+"index won't be available immediately."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:551
+msgid "Where"
+msgstr ""
+
+#. "Reveal in New Window" means open the parent folder for the
+#. * selected item in a new window, select the item in that window,
+#. * and scroll as necessary to make that item visible (this comment
+#. * is to inform translators of this tricky concept).
+#.
+#: src/file-manager/fm-search-list-view.c:603
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:6
+#, fuzzy
+msgid "_Reveal in New Window"
+msgstr "Oscáil ins an Fuinneog _Nua"
+
+#. "Reveal in n New Windows" means open the parent folder for each
+#. * selected item in a separate new window, select each selected
+#. * item in its new window, and scroll as necessary to make those
+#. * items visible (this comment is to inform translators of this
+#. * tricky concept).
+#.
+#: src/file-manager/fm-search-list-view.c:611
+#, fuzzy, c-format
+msgid "Reveal in %d _New Windows"
+msgstr "Oscáil ins an Fuinneog _Nua"
+
+#. Note that the number of items actually displayed varies somewhat due
+#. * to the way files are collected in batches. So you can't assume that
+#. * no more than the constant limit are displayed.
+#.
+#: src/file-manager/fm-search-list-view.c:723
+msgid ""
+"Nautilus found more search results than it can display. Some matching items "
+"will not be displayed. "
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:725
+msgid "Too Many Matches"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:1
+msgid "Change Desktop Background"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+msgid "Delete all items in the Trash"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
+msgid "Disks"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:5
+msgid "Mount or unmount disks"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:6
+msgid "New Terminal"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:7
+msgid "Open a new GNOME terminal window"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:8
+msgid "Remove any custom pattern or color from the desktop background"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
+msgid "Reset Desktop Background"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:10
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+msgid "Choose a program with which to open the selected item"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:2
+msgid "Choose another application with which to open the selected item"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:3
+msgid "Choose another viewer with which to view the selected item"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:4
+msgid "Copy Files"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
+msgid "Create a new empty folder inside this folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+msgid "Create a symbolic link for each selected item"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Cut Files"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+msgid "Delete each selected item, without moving to the Trash"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+msgid "Duplicate"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+msgid "Duplicate each selected item"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+msgid "Make Link"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+msgid "Move each selected item to the Trash"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+msgid "Move to Trash"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+msgid "New Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#, fuzzy
+msgid "Open"
+msgstr "_Oscáil"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+msgid "Open Wit_h"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "Open With"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+msgid "Open each selected item in a new window"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+msgid "Open in New Window"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+msgid "Open the selected item in this window"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+msgid "Other Application..."
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+msgid "Other Viewer..."
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+msgid "Paste Files"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+msgid "Remove Custom Images"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+msgid "Remove any custom images from selected icons"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+msgid "Remove any custom pattern or color from the background of this location"
+msgstr ""
+
+#. add the reset background item, possibly disabled
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
+msgid "Reset Background"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+msgid "Scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#, fuzzy
+msgid "Select All Files"
+msgstr "Tóg gach rud"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#, fuzzy
+msgid "Select _All Files"
+msgstr "Tóg gach rud"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+msgid "Select all items in this window"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+msgid "Show Properties"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+msgid "Show Trash"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+msgid "Show _Properties"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+msgid "Show the contents of the Trash"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+msgid "View or modify the properties of each selected item"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+msgid "_Duplicate"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+msgid "_New Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+msgid "_Open"
+msgstr "_Oscáil"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+msgid "_Paste Files"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
+msgid "_Show Trash"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+msgid "By Emblems"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:2
+msgid "By Modification Date"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:3
+msgid "By Modification _Date"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:4
+#, fuzzy
+msgid "By Name"
+msgstr "Ainm"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:5
+#, fuzzy
+msgid "By Size"
 msgstr "Meid"
 
-#: src/file-manager/fm-list-view.c:309
-msgid "Type"
+#: src/file-manager/nautilus-icon-view-ui.xml.h:6
+#, fuzzy
+msgid "By Type"
 msgstr "Saghas"
 
-#: src/file-manager/fm-list-view.c:310
-msgid "Date Modified"
+#: src/file-manager/nautilus-icon-view-ui.xml.h:7
+msgid "By _Emblems"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:8
+#, fuzzy
+msgid "By _Name"
+msgstr "Ainm"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:9
+#, fuzzy
+msgid "By _Size"
+msgstr "Meid"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:10
+#, fuzzy
+msgid "By _Type"
+msgstr "Saghas"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:11
+msgid "Choose which information appears beneath each icon's name"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:12
+msgid "Clean Up by Name"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:13
+msgid "Display icons in the opposite order"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:14
+msgid "Icon Captions..."
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:20
+msgid "Lay Out Items"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:21
+msgid "Leave icons wherever they are dropped"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:22
+msgid "Make the selected icon stretchable"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:23
+msgid "Manually"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:24
+msgid "Re_versed Order"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:26
+msgid "Rename selected icon"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:27
+msgid "Reposition icons to better fit in the window and avoid overlapping"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:28
+msgid "Restore Icons' Original Sizes"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:29
+msgid "Restore each selected icon to its original size"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:30
+msgid "Reversed Order"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:31
+msgid "Stretch Icon"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:32
+msgid "Tighter Layout"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:33
+msgid "Toggle using a tighter layout scheme"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:34
+msgid "_Clean Up by Name"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:35
+msgid "_Icon Captions..."
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:36
+msgid "_Lay Out Items"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:37
+msgid "_Manually"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:38
+msgid "_Rename"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:40
+msgid "_Stretch Icon"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:41
+msgid "_Tighter Layout"
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:85
+msgid "Indexing is %d%% complete."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:175
+msgid "The indexer is currently busy."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:180
+msgid ""
+"An indexer is not running, or is not responding to requests to reindex your "
+"computer."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:185
+msgid ""
+"An attempt to reindex, caused an Internal Indexer Error.  Tell "
+"rebecka@eazel.com"
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:194
+msgid "Reindexing Failed"
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:216
+msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast. If you need to update your index now, click on the \"Update Now\" "
+"button."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:316
+#: src/file-manager/nautilus-indexing-info.c:219
+#: src/file-manager/nautilus-indexing-info.c:226
+#: src/file-manager/nautilus-indexing-info.c:281
+msgid "Indexing Status"
+msgstr ""
+
+#. FIXME: Do we want to talk about the index not being available?
+#: src/file-manager/nautilus-indexing-info.c:224
+msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast. "
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:236
 #, c-format
-msgid "Nautilus: %s Properties"
+msgid "Your files were last indexed at %s"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:372
-msgid "Basic"
+#: src/file-manager/nautilus-indexing-info.c:249
+msgid "Update Now"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:426
-msgid "Emblems"
+#: src/file-manager/nautilus-indexing-info.c:279
+msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast.  Your files are currently being indexed."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:406
+msgid "Sorry, but the medusa search service is not available."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:428
+msgid "%I:%M %p, %x"
+msgstr ""
+
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:1
+msgid "Reveal each selected item in its original folder"
+msgstr ""
+
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:2
+#, fuzzy
+msgid "Reveal in New Window"
+msgstr "Oscáil ins an Fuinneog _Nua"
+
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:3
+msgid "Show Indexing Status"
 msgstr ""
 
-#. The prompt.
-#: src/file-manager/fm-properties-window.c:430
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:4
+msgid "Show _Indexing Status"
+msgstr ""
+
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:5
+msgid "Show status of indexing used when searching"
+msgstr ""
+
+#. set the window title and standard close key accelerator
+#: src/nautilus-about.c:141
+#, fuzzy
+msgid "About Nautilus"
+msgstr "Faoi Nautilus..."
+
+#. draw the authors title
+#: src/nautilus-about.c:361
+msgid "Authors"
+msgstr ""
+
+#: src/nautilus-application.c:275
+msgid "Couldn't Create Required Folder"
+msgstr ""
+
+#: src/nautilus-application.c:276
+#, c-format
 msgid ""
-"This is a placeholder for the final emblems design. For now, you can turn "
-"some hard-wired properties with corresponding emblems on and off."
+"Nautilus could not create the required folder \"%s\". Before running "
+"Nautilus, please create this folder, or set permissions such that Nautilus "
+"can create it."
 msgstr ""
 
-#: nautilus-widgets/nautilus-preferences-dialog.c:200
-msgid "Prefs Box"
+#: src/nautilus-application.c:281
+msgid "Couldn't Create Required Folders"
 msgstr ""
 
-#. today, use special word
-#: libnautilus-extensions/nautilus-file.c:915
-msgid "today %-I:%M %p"
-msgstr "inniu %-I:%M %p"
+#: src/nautilus-application.c:282
+#, c-format
+msgid ""
+"Nautilus could not create the following required folders:\n"
+"\n"
+"%s\n"
+"\n"
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
+msgstr ""
+
+#. Can't register myself due to trouble locating the
+#. * Nautilus_Shell.oaf file. This has happened when you
+#. * launch Nautilus with an LD_LIBRARY_PATH that
+#. * doesn't include the directory containg the oaf
+#. * library. It could also happen if the
+#. * Nautilus_Shell.oaf file was not present for some
+#. * reason. Sometimes killing oafd and gconfd fixes
+#. * this problem but we don't exactly understand why,
+#. * since neither of the above causes explain it.
+#.
+#: src/nautilus-application.c:407
+msgid ""
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again."
+msgstr ""
 
-#. yesterday, use special word
-#: libnautilus-extensions/nautilus-file.c:918
-msgid "yesterday %-I:%M %p"
-msgstr "inné %-I:%M %p"
+#. FIXME bugzilla.eazel.com 2536: The guesses and stuff here are lame.
+#: src/nautilus-application.c:413
+msgid ""
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again.\n"
+"\n"
+"OAF couldn't locate the Nautilus_shell.oaf file. One cause of this seems to "
+"be an LD_LIBRARY_PATH that does not include the oaf library's directory. "
+"Another possible cause would be bad install with a missing "
+"Nautilus_Shell.oaf file.\n"
+"\n"
+"Running \"nautilus-clean.sh -x\" will kill all OAF and GConf processes, "
+"which may be needed by other applications.\n"
+"\n"
+"Sometimes killing oafd and gconfd fixes the problem, but we don't know why.\n"
+"\n"
+"We have also seen this error when a faulty version of oaf was installed."
+msgstr ""
+
+#. Some misc. error (can never happen with current
+#. * version of OAF). Show dialog and terminate the
+#. * program.
+#.
+#. FIXME bugzilla.eazel.com 2537: Looks like this does happen with the
+#. * current OAF. I guess I read the code
+#. * wrong. Need to figure out when and make a
+#. * good message.
+#.
+#: src/nautilus-application.c:444 src/nautilus-application.c:462
+#: src/nautilus-application.c:469
+msgid "Nautilus can't be used now, due to an unexpected error."
+msgstr ""
 
-#. current week, include day of week
-#: libnautilus-extensions/nautilus-file.c:921
-msgid "%A %-m/%-d/%y %-I:%M %p"
-msgstr "%A %-m/%-d/%y %-I:%M %p"
+#: src/nautilus-application.c:445
+msgid ""
+"Nautilus can't be used now, due to an unexpected error from OAF when "
+"attempting to register the file manager view server."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:923
-msgid "%-m/%-d/%y %-I:%M %p"
-msgstr "%-m/%-d/%y %-I:%M %p"
+#: src/nautilus-application.c:463
+msgid ""
+"Nautilus can't be used now, due to an unexpected error from OAF when "
+"attempting to locate the factory.Killing oafd and restarting Nautilus may "
+"help fix the problem."
+msgstr ""
+
+#: src/nautilus-application.c:470
+msgid ""
+"Nautilus can't be used now, due to an unexpected error from OAF when "
+"attempting to locate the shell object. Killing oafd and restarting Nautilus "
+"may help fix the problem."
+msgstr ""
+
+#: src/nautilus-application.c:635
+msgid ""
+"You are about to run Nautilus as root.\n"
+"\n"
+"As root, you can damage your system if you are not careful, and\n"
+"Nautilus will not stop you from doing it."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:1040
-msgid "unknown owner"
-msgstr "úineár gan aithne"
+#: src/nautilus-bookmarks-window.c:127
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Leabharmarcanna"
 
-#: libnautilus-extensions/nautilus-file.c:1070
-msgid "unknown group"
-msgstr "grupa gan aithne"
+#: src/nautilus-bookmarks-window.c:177
+msgid "Location"
+msgstr "Áit"
 
-#: libnautilus-extensions/nautilus-file.c:1122
-msgid "xxx"
-msgstr "xxx"
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
+msgid "Remove"
+msgstr "Scríos"
 
-#: libnautilus-extensions/nautilus-file.c:1122
-msgid "--"
-msgstr "--"
+#: src/nautilus-complex-search-bar.c:233
+msgid "More Options"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:1125
-msgid "0 items"
+#: src/nautilus-complex-search-bar.c:243
+msgid "Fewer Options"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:1128
-msgid "1 item"
+#. Create button first so we can use it for auto_click
+#: src/nautilus-complex-search-bar.c:261 src/nautilus-simple-search-bar.c:129
+msgid "Find Them!"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:191
+msgid ""
+"Existence of this file indicates that the Nautilus configuration druid\n"
+"has been presented.\n"
+"\n"
+"You can manually erase this file to present the druid again.\n"
+"\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:1130
+#: src/nautilus-first-time-druid.c:487
+msgid ""
+"Your user level adjusts Nautilus to your degree of experience\n"
+"using GNOME and Linux. Choose a level that's comfortable for\n"
+"you - you can always change it later."
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:498
+msgid ""
+"For users who have no previous experience with GNOME\n"
+"and Linux."
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:504
+msgid ""
+"For users who are comfortable with GNOME and Linux,\n"
+"but don't describe themselves as ``technical.''"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:510
+msgid ""
+"For users who have GNOME and Linux experience, and\n"
+"like to see every detail of the operating system."
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:548
+msgid ""
+"To verify your Internet connection and make sure you have\n"
+"the latest Nautilus updates, Nautilus will now connect to\n"
+"Eazel's web site. This will take seconds if your copy of\n"
+"Nautilus is recent; longer (but no more than a minute or two)\n"
+"if you need an update.\n"
+"\n"
+"If you know your computer uses a proxy connection, click\n"
+"Verify and Nautilus will use it.\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:562
+msgid "Verify my connection and check for updates"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:563
+msgid "Don't verify my connection or check for updates"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:628
+msgid ""
+"We are having trouble making an external web connection.\n"
+"Sometimes, firewalls require you to specify a web proxy server.\n"
+"Fill in the name or port of your proxy server, if any, below."
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:640
+msgid "No proxy server required."
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:641
+msgid "Use this proxy server:"
+msgstr ""
+
+#. allocate the proxy label, followed by the entry
+#: src/nautilus-first-time-druid.c:666
+msgid "Proxy address:"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:728
+msgid "Verifying your Internet connection and checking for updates..."
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:736
+msgid "Downloading Nautilus updates..."
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:906
+msgid ""
+"If you have been using the GNOME Midnight Commander\n"
+"these settings move your desktop icons to Nautilus and\n"
+"make Nautilus the default desktop.\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:913
+msgid "Use Nautilus to draw the desktop."
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:919
+msgid "Move existing desktop icons to the Nautilus desktop."
+msgstr ""
+
+#. This option is currently disabled, per bugzilla.eazel.com 7557
+#: src/nautilus-first-time-druid.c:927
+msgid "Launch Nautilus when GNOME starts up."
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:967
+msgid ""
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties.  The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+"Fast search requires that the cron daemon on your system be running.\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:972
+msgid ""
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties. The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:981
+msgid "Enable fast search"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:982
+msgid "Turn fast search on when cron is enabled"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1027
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"currently can't be performed because the program crond, which does\n"
+"nightly tasks on your computer, is turned off. To make sure fast searches\n"
+"can be done, turn crond on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands \n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1035
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"may not be performed because the program crond, which does nightly tasks\n"
+"on your computer, may be turned off. To make sure fast searches can be\n"
+"done, check to make sure that crond is turned on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands\n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1122
+msgid ""
+"Click Finish to launch Nautilus. You'll start with two\n"
+"Nautilus windows: one shows your home folder, and the\n"
+"other tells you about Eazel's services that make the life\n"
+"of a Linux user easier.\n"
+"\n"
+"We hope you enjoy Nautilus!"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1129
+msgid ""
+"Click Finish to launch Nautilus. You'll start with a\n"
+"window showing your home folder.\n"
+"\n"
+"We hope you enjoy Nautilus!"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1153
+msgid "Nautilus First Time Setup"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1183
+#, fuzzy
+msgid "Welcome to Nautilus"
+msgstr "Faoi Nautilus..."
+
+#: src/nautilus-first-time-druid.c:1185
+msgid ""
+"Nautilus...\n"
+"    Is a great file manager for the GNOME desktop.\n"
+"    Provides a simple intuitive way to access Internet services.\n"
+"    Is an extensible framework for GNOME developers.\n"
+"    Provides a powerful delivery platform for service providers.\n"
+"\n"
+"Click Next to begin customizing your Nautilus environment."
+msgstr ""
+
+#. set up the final page
+#: src/nautilus-first-time-druid.c:1196
+msgid "Finished"
+msgstr ""
+
+#. set up the user level page
+#: src/nautilus-first-time-druid.c:1209
+msgid "Choose Your User Level"
+msgstr ""
+
+#. set up the GMC transition page
+#: src/nautilus-first-time-druid.c:1213
+msgid "GMC to Nautilus Transition"
+msgstr ""
+
+#. set up the `Launch Medusa' page
+#: src/nautilus-first-time-druid.c:1217
+#, fuzzy
+msgid "Fast Searches"
+msgstr "Cuardaigh"
+
+#. set up optional page to tell the user how to run cron
+#: src/nautilus-first-time-druid.c:1225
+msgid "The Cron Daemon"
+msgstr ""
+
+#. set up the update page
+#: src/nautilus-first-time-druid.c:1230
+msgid "Checking Your Internet Connection"
+msgstr ""
+
+#. set up the update feedback page
+#: src/nautilus-first-time-druid.c:1241
+#, fuzzy
+msgid "Updating Nautilus..."
+msgstr "Faoi Nautilus..."
+
+#. set up the (optional) proxy configuration page
+#: src/nautilus-first-time-druid.c:1249
+msgid "Web Proxy Configuration"
+msgstr ""
+
+#. change the message to expanding file
+#: src/nautilus-first-time-druid.c:1324
+msgid "Decoding Update..."
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1341
+msgid "Update Complete. Click Next to Continue."
+msgstr ""
+
+#. The update file couldn't be loaded because it
+#. * doesn't exist. Arlo and I (jsh) and decided that the
+#. * best thing to do is silently fail
+#.
+#: src/nautilus-first-time-druid.c:1356
+msgid "No Update Available... Press Next to Continue."
+msgstr ""
+
+#. set the window title
+#: src/nautilus-link-set-window.c:189
+msgid "Link sets"
+msgstr ""
+
+#. add a descriptive label
+#: src/nautilus-link-set-window.c:202
+msgid "Add or remove sets of links by clicking on the checkboxes below."
+msgstr ""
+
+#: src/nautilus-location-bar.c:63
+msgid "Go To:"
+msgstr ""
+
+#: src/nautilus-location-bar.c:153
 #, c-format
-msgid "%u items"
+msgid "Do you want to view these %d locations in separate windows?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:1229
-msgid "program"
-msgstr "ríomhchlár"
+#: src/nautilus-location-bar.c:160
+msgid "View in Multiple Windows?"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:1232
-msgid "unknown type"
-msgstr "saghas gan aithne"
+#: src/nautilus-main.c:145
+msgid "Perform a quick set of self-check tests."
+msgstr ""
 
-#: libnautilus/nautilus-meta-view-frame.c:144
-msgid "Label"
+#: src/nautilus-main.c:148
+msgid "Create the initial window with the given geometry."
 msgstr ""
 
-#: components/history/ntl-history-view.c:245
-msgid "History"
-msgstr "Stair"
+#: src/nautilus-main.c:148
+msgid "GEOMETRY"
+msgstr ""
+
+#: src/nautilus-main.c:150
+msgid "Only create windows for explicitly specified URIs."
+msgstr ""
 
-#: components/html/gnome-dialogs.c:87
-msgid "Transfer Progress"
+#: src/nautilus-main.c:152
+#, fuzzy
+msgid "Quit Nautilus."
+msgstr "Faoi Nautilus..."
+
+#: src/nautilus-main.c:154
+#, fuzzy
+msgid "Restart Nautilus."
+msgstr "Faoi Nautilus..."
+
+#: src/nautilus-main.c:209
+msgid "nautilus: --check cannot be used with URIs.\n"
+msgstr ""
+
+#: src/nautilus-main.c:213
+msgid "nautilus: --check cannot be used with other options.\n"
+msgstr ""
+
+#: src/nautilus-main.c:217
+msgid "nautilus: --quit cannot be used with URIs.\n"
+msgstr ""
+
+#: src/nautilus-main.c:221
+msgid "nautilus: --restart cannot be used with URIs.\n"
+msgstr ""
+
+#: src/nautilus-main.c:225
+msgid "nautilus: --geometry cannot be used with more than one URI.\n"
+msgstr ""
+
+#. set the title and standard close accelerator
+#: src/nautilus-property-browser.c:265
+msgid "Backgrounds and Emblems"
+msgstr ""
+
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:362 src/nautilus-theme-selector.c:267
+#, fuzzy
+msgid "  Done  "
+msgstr "Críochnaithe!"
+
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:373
+msgid "  Add new...  "
 msgstr ""
 
-#: components/html/gnome-dialogs.c:141
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:388
+#, fuzzy
+msgid "  Remove...  "
+msgstr "Scríos"
+
+#: src/nautilus-property-browser.c:879
 #, c-format
-msgid "Looking up %s"
+msgid "Sorry, but pattern %s couldn't be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:880 src/nautilus-property-browser.c:909
+msgid "Couldn't delete pattern"
+msgstr ""
+
+#: src/nautilus-property-browser.c:908
+#, c-format
+msgid "Sorry, but emblem %s couldn't be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:944
+msgid "Create a New Emblem:"
+msgstr ""
+
+#. make the keyword label and field
+#: src/nautilus-property-browser.c:949
+msgid "Keyword:"
+msgstr ""
+
+#. set up a gnome icon entry to pick the image file
+#: src/nautilus-property-browser.c:962
+msgid "Image:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:966
+msgid "Select an image file for the new emblem:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:993
+msgid "Create a New Color:"
+msgstr ""
+
+#. make the name label and field
+#: src/nautilus-property-browser.c:998
+msgid "Color name:"
 msgstr ""
 
-#: components/html/gnome-dialogs.c:147
+#: src/nautilus-property-browser.c:1009
+#, fuzzy
+msgid "Color value:"
+msgstr "Roghnóir Dathanna"
+
+#: src/nautilus-property-browser.c:1045
 #, c-format
-msgid "Contacting %s"
+msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr ""
 
-#: components/html/gnome-dialogs.c:154
-msgid "Waiting for a connection..."
+#: src/nautilus-property-browser.c:1047
+msgid "Sorry, but you did not supply a valid file name."
 msgstr ""
 
-#: components/html/gnome-dialogs.c:158
-msgid "Logging in..."
+#: src/nautilus-property-browser.c:1049 src/nautilus-property-browser.c:1092
+msgid "Couldn't install pattern"
 msgstr ""
 
-#: components/html/gnome-dialogs.c:167
-msgid "Read %d%%%% of %ld"
+#: src/nautilus-property-browser.c:1060
+msgid "Sorry, but you can't replace the reset image."
 msgstr ""
 
-#: components/html/gnome-dialogs.c:177
+#: src/nautilus-property-browser.c:1091
 #, c-format
-msgid "Read %ld bytes"
+msgid "Sorry, but the pattern %s couldn't be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1114
+msgid "Select an image file to add as a pattern:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:1173
+msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr ""
 
-#: components/html/gnome-dialogs.c:179
+#: src/nautilus-property-browser.c:1174
+msgid "Couldn't install color"
+msgstr ""
+
+#: src/nautilus-property-browser.c:1230
+msgid "Select a color to add:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:1311
 #, c-format
-msgid "Read %d bytes"
+msgid "Sorry, but '%s' is not a usable image file!"
 msgstr ""
 
-#: components/html/gnome-dialogs.c:181
-msgid "Reading..."
-msgstr "Ag leámh..."
+#: src/nautilus-property-browser.c:1329
+msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
+msgstr ""
 
-#: components/html/gnome-dialogs.c:196
-msgid "Writing %d%%%% of %ld"
+#: src/nautilus-property-browser.c:1330 src/nautilus-property-browser.c:1333
+#: src/nautilus-property-browser.c:1337 src/nautilus-property-browser.c:1366
+msgid "Couldn't install emblem"
 msgstr ""
 
-#: components/html/gnome-dialogs.c:206
+#: src/nautilus-property-browser.c:1332
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1335
 #, c-format
-msgid "Writing %ld bytes"
+msgid ""
+"Sorry, but \"%s\" is an existing keyword.  Please choose a different name "
+"for it."
 msgstr ""
 
-#: components/html/gnome-dialogs.c:208
+#: src/nautilus-property-browser.c:1365
 #, c-format
-msgid "Writing %d bytes"
+msgid "Sorry, but the image at %s couldn't be installed as an emblem."
 msgstr ""
 
-#: components/html/gnome-dialogs.c:210
-msgid "Writing..."
+#: src/nautilus-property-browser.c:2024
+msgid "Select A Category:"
 msgstr ""
 
-#: components/html/gnome-dialogs.c:218
-msgid "Done!"
-msgstr "Críochnaithe!"
+#: src/nautilus-property-browser.c:2032 src/nautilus-theme-selector.c:497
+#, fuzzy
+msgid "Cancel Remove"
+msgstr "Cealaigh"
+
+#: src/nautilus-property-browser.c:2037
+msgid "  Add a New Pattern  "
+msgstr ""
+
+#: src/nautilus-property-browser.c:2040
+msgid "  Add a New Color  "
+msgstr ""
+
+#: src/nautilus-property-browser.c:2043
+msgid "  Add a New Emblem  "
+msgstr ""
+
+#: src/nautilus-property-browser.c:2066
+msgid "Click on a pattern to remove it"
+msgstr ""
+
+#: src/nautilus-property-browser.c:2069
+msgid "Click on a color to remove it"
+msgstr ""
+
+#: src/nautilus-property-browser.c:2072
+msgid "Click on an emblem to remove it"
+msgstr ""
+
+#: src/nautilus-property-browser.c:2081
+msgid "Patterns:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:2084
+#, fuzzy
+msgid "Colors:"
+msgstr "Dún"
+
+#: src/nautilus-property-browser.c:2087
+msgid "Emblems:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:2106
+msgid "  Remove a Pattern  "
+msgstr ""
+
+#: src/nautilus-property-browser.c:2109
+msgid "  Remove a Color  "
+msgstr ""
+
+#: src/nautilus-property-browser.c:2112
+msgid "  Remove an Emblem  "
+msgstr ""
+
+#. Menu item in the search bar.
+#. Bracketed items are context, and are message
+#. strings elsewhere.  You don't have to translate the whole
+#. string, and only the translation for "containing '%s' will
+#. be used.  If you do translate the whole string, leave the
+#. translations of the rest of the text in brackets, so it
+#. will not be used.
+#: src/nautilus-search-bar-criterion.c:74
+msgid "[Search for] Name [contains \"fish\"]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:75
+msgid "[Search for] Content [includes all of \"fish tree\"]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:76
+msgid "[Search for] Type [is regular file]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:77
+msgid "[Search for] Size [larger than 400K]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:78
+msgid "[Search for] With Emblem [includes \"Important\"]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:79
+msgid "[Search for] Last Modified [before yesterday]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:80
+msgid "[Search for] Owner [is not root]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:86
+msgid "[File name] contains [help]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:87
+msgid "[File name] starts with [nautilus]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:88
+msgid "[File name] ends with [.c]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:89
+msgid "[File name] matches glob [*.c]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:90
+msgid "[File name] matches regexp [\"e??l.$\"]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:95
+msgid "[File content] includes all of [apple orange]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:96
+msgid "[File content] includes any of [apply orange]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:97
+msgid "[File content] does not include all of [apple orange]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:98
+msgid "[File content] includes none of [apple orange]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:104
+msgid "[File type] is [folder]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:105
+msgid "[File type] is not [folder]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:110
+msgid "[File type is] regular file"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:111
+msgid "[File type is] text file"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:112
+msgid "[File type is] application"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:113
+msgid "[File type is] folder"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:114
+msgid "[File type is] music"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:119
+msgid "[File size is] larger than [400K]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:120
+msgid "[File size is] smaller than [300K]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:125
+msgid "[With emblem] marked with [Important]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:126
+msgid "[With emblem] not marked with [Important]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:131
+msgid "[Last modified date] is [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:132
+msgid "[Last modified date] is not [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:133
+msgid "[Last modified date] is after [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:134
+msgid "[Last modified date] is before [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:136
+msgid "[Last modified date] is today"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:137
+msgid "[Last modified date] is yesterday"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:139
+msgid "[Last modified date] is within a week of [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:140
+msgid "[Last modified date] is within a month of [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:159
+msgid "[File owner] is [root]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:160
+msgid "[File owner] is not [root]"
+msgstr ""
+
+#: src/nautilus-service-ui.xml.h:1
+msgid "Go to the Eazel Services Summary Page"
+msgstr ""
+
+#: src/nautilus-service-ui.xml.h:2
+msgid "Go to the Eazel Software Catalog"
+msgstr ""
+
+#: src/nautilus-service-ui.xml.h:3
+msgid "Go to your online storage repository"
+msgstr ""
+
+#: src/nautilus-service-ui.xml.h:5
+msgid "Software _Catalog"
+msgstr ""
+
+#: src/nautilus-service-ui.xml.h:6
+msgid "_Eazel Services Home"
+msgstr ""
+
+#: src/nautilus-service-ui.xml.h:7
+msgid "_Online Storage"
+msgstr ""
+
+#: src/nautilus-service-ui.xml.h:8
+msgid "_Services"
+msgstr ""
+
+#: src/nautilus-shell.c:188
+msgid "Caveat"
+msgstr ""
+
+#: src/nautilus-shell.c:225
+msgid ""
+"Thank you for your interest in Nautilus.\n"
+" \n"
+"As with any software under development, you should exercise caution when "
+"using Nautilus.  Eazel does not provide any guarantee that it will work "
+"properly, or assume any liability for your use of it.  Please use it at your "
+"own risk.\n"
+"\n"
+"Please visit http://www.eazel.com/feedback.html to provide feedback, "
+"comments, and suggestions."
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:1
+msgid "Factory for Nautilus shell and file manager"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:2
+msgid "Icons"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:3
+msgid "Icons Viewer"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:4
+msgid "List"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:5
+msgid "List Viewer"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:6
+#, fuzzy
+msgid "Nautilus factory"
+msgstr "Nautilus"
+
+#: src/Nautilus_shell.oaf.in.h:7
+msgid "Nautilus file manager component that shows a scrollable list"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:8
+msgid ""
+"Nautilus file manager component that shows a scrollable list for search "
+"results"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:9
+msgid "Nautilus file manager component that shows a two-dimensional icon space"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:10
+msgid "Nautilus file manager component that shows icons on the the desktop"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:11
+msgid "Nautilus file manager desktop icon view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:12
+msgid "Nautilus file manager icon view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:13
+msgid "Nautilus file manager list view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:14
+msgid "Nautilus file manager search results list view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:15
+msgid "Nautilus metafile factory"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:16
+#, fuzzy
+msgid "Nautilus shell"
+msgstr "Nautilus: %s"
+
+#: src/Nautilus_shell.oaf.in.h:17
+msgid ""
+"Nautilus shell operations that can be done from subsequent command-line "
+"invocations"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:18
+msgid "Produces metafile objects for accessing Nautilus metadata"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:19
+#, fuzzy
+msgid "Search List"
+msgstr "Cuardaigh"
+
+#: src/Nautilus_shell.oaf.in.h:20
+msgid "View as Icons"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:21
+msgid "View as List"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:1
+msgid " _Advanced"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:2
+msgid " _Beginner"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:3
+msgid " _Intermediate"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:4
+msgid "Add a bookmark for the current location to this menu"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:6
+msgid "Change the visibility of this window's location bar"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:7
+msgid "Change the visibility of this window's sidebar"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:8
+msgid "Change the visibility of this window's status bar"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:9
+msgid "Change the visibility of this window's toolbar"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:10
+msgid "Clear contents of Go menu and Back/Forward lists"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:11
+msgid "Close _All Windows"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:12
+msgid "Close all Nautilus windows"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:13
+msgid "Close this window"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:15
+msgid "Display a window that allows editing the bookmarks in this menu"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:16
+msgid "Display credits for the creators of Nautilus"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:17
+msgid "Display on-line help for Nautilus"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:18
+msgid ""
+"Display patterns, colors, and emblems that can be used to customize "
+"appearance"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:19
+msgid "Display quick reference pages for Nautilus"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:20
+msgid "Display release notes for Nautilus"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:21
+msgid "Display support information for Nautilus and Eazel Services"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:22
+msgid "Display the latest contents of the current location"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:23
+msgid "Display the set of available appearance themes"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:24
+msgid "Edit various Nautilus preferences"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:25
+msgid "Find"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:26
+#, fuzzy
+msgid "For_get History"
+msgstr "Stair"
+
+#: src/nautilus-shell-ui.xml.h:27
+msgid "Go to Eazel Services"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:28
+msgid "Go to the home location"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:29
+msgid "Go to the location that contains this one"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:30
+msgid "Go to the next visited location"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:31
+msgid "Go to the previous visited location"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
+#, fuzzy
+msgid "Hide Location _Bar"
+msgstr "Áit"
+
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
+msgid "Hide St_atus Bar"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
+msgid "Hide _Sidebar"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
+msgid "Hide _Toolbar"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:37
+msgid "Nautilus Quick _Reference"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:38
+msgid "Nautilus Release _Notes"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:39
+#, fuzzy
+msgid "Nautilus User _Manual"
+msgstr "Nautilus: %s"
+
+#: src/nautilus-shell-ui.xml.h:40
+msgid "New Window"
+msgstr "Fuinneog Nua"
+
+#: src/nautilus-shell-ui.xml.h:41
+#, fuzzy
+msgid "New _Window"
+msgstr "Fuinneog Nua"
+
+#: src/nautilus-shell-ui.xml.h:42
+msgid "Normal Size"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:43
+msgid "Open another Nautilus window for the displayed location"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:44
+msgid "Refresh"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:45
+msgid "Report Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:46
+msgid "Reset Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:47
+msgid "Search the World Wide Web"
+msgstr ""
 
-#: components/html/gnome-dialogs.c:222
-msgid "Interrupted!"
+#: src/nautilus-shell-ui.xml.h:48
+msgid "Search this computer for files"
 msgstr ""
 
-#: components/html/gnome-dialogs.c:226
-msgid "Please wait..."
+#: src/nautilus-shell-ui.xml.h:50
+msgid ""
+"Show a page from which you can send feedback about Nautilus and Eazel "
+"Services"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:51
+msgid "Show the contents at the normal size"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:52
+msgid "Show the contents in less detail"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:53
+msgid "Show the contents in more detail"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:54
+msgid "Start Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:56
+msgid "Stop Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:57
+msgid "Stop loading this location"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:58
+msgid "Undo the last text change"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:59
+msgid "Up"
+msgstr "Suas"
+
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:63
+#, fuzzy
+msgid "We_b Search"
+msgstr "Cuardaigh"
+
+#: src/nautilus-shell-ui.xml.h:64
+#, fuzzy
+msgid "Web Search"
+msgstr "Cuardaigh"
+
+#: src/nautilus-shell-ui.xml.h:65
+msgid "Zoom In"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:66
+msgid "Zoom Out"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:67
+msgid "Zoom _In"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:68
+msgid "Zoom _Out"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:69
+#, fuzzy
+msgid "_About Nautilus..."
+msgstr "Faoi Nautilus..."
+
+#: src/nautilus-shell-ui.xml.h:70
+msgid "_Add Bookmark"
+msgstr "_Suimigh Leabharmarc"
+
+#: src/nautilus-shell-ui.xml.h:71
+#, fuzzy
+msgid "_Back"
+msgstr "Riomh"
+
+#: src/nautilus-shell-ui.xml.h:72
+msgid "_Backgrounds and Emblems..."
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:73
+msgid "_Bookmarks"
+msgstr "_Leabharmarcanna"
+
+#: src/nautilus-shell-ui.xml.h:74
+#, fuzzy
+msgid "_Close Window"
+msgstr "Fuinneog Nua"
+
+#: src/nautilus-shell-ui.xml.h:76
+msgid "_Customer Support"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:77
+msgid "_Edit"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:78
+msgid "_Edit Bookmarks..."
+msgstr "_Eagar Leabharmarcanna..."
+
+#: src/nautilus-shell-ui.xml.h:79
+msgid "_Edit Preferences..."
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:80
+msgid "_Feedback"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:82
+msgid "_Find"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:83
+#, fuzzy
+msgid "_Forward"
+msgstr "Eile"
+
+#: src/nautilus-shell-ui.xml.h:84
+msgid "_Go"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:85
+msgid "_Help"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:86
+#, fuzzy
+msgid "_Home"
+msgstr "Baile"
+
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "Áit"
+
+#: src/nautilus-shell-ui.xml.h:88
+#, fuzzy
+msgid "_Nautilus Themes..."
+msgstr "Nautilus: %s"
+
+#: src/nautilus-shell-ui.xml.h:89
+msgid "_Normal Size"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:91
+msgid "_Preferences"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:92
+msgid "_Profiler"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:93
+msgid "_Refresh"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:94
+msgid "_Report Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:95
+msgid "_Reset Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:96
+msgid "_Start Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:97
+msgid "_Stop Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:98
+msgid "_Undo"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:99
+msgid "_Up a Level"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:100
+msgid "_View"
+msgstr ""
+
+#: src/nautilus-sidebar.c:694
+msgid ""
+"You can't assign more than one custom icon at a time! Please drag just one "
+"image to set a custom icon."
+msgstr ""
+
+#: src/nautilus-sidebar.c:696
+msgid "More Than One Image"
+msgstr ""
+
+#: src/nautilus-sidebar.c:715
+msgid ""
+"The file that you dropped is not local.  You can only use local images as "
+"custom icons."
+msgstr ""
+
+#: src/nautilus-sidebar.c:717
+msgid "Local Images Only"
+msgstr ""
+
+#: src/nautilus-sidebar.c:722
+msgid ""
+"The file that you dropped is not an image.  You can only use local images as "
+"custom icons."
+msgstr ""
+
+#: src/nautilus-sidebar.c:724
+msgid "Images Only"
+msgstr ""
+
+#: src/nautilus-sidebar.c:1281
+#, c-format
+msgid "Open with %s"
+msgstr ""
+
+#. Catch-all button after all the others.
+#: src/nautilus-sidebar.c:1317
+#, fuzzy
+msgid "Open with..."
 msgstr "Fán tamaill..."
 
-#: components/html/gnome-dialogs.c:230
-msgid "Request timeout!"
+#. FIXME: We don't use spaces to pad labels!
+#: src/nautilus-sidebar.c:1424
+msgid "  Empty Trash  "
 msgstr ""
 
-#: components/html/gnome-dialogs.c:234
-msgid "Unknown"
-msgstr "Gan aithne"
+#: src/nautilus-switchable-search-bar.c:132
+msgid "Find:"
+msgstr ""
 
-#: components/html/gnome-dialogs.c:277
-msgid "Enter Text"
+#. set the title and standard close accelerator
+#: src/nautilus-theme-selector.c:170
+msgid "Nautilus Theme Selector"
 msgstr ""
 
-#: components/html/gnome-dialogs.c:318 components/html/gnome-dialogs.c:359
-msgid "Enter Password"
+#. add the title label
+#: src/nautilus-theme-selector.c:199
+#, fuzzy
+msgid "Nautilus Theme:"
+msgstr "Nautilus"
+
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:278
+msgid "  Add New Theme  "
 msgstr ""
 
-#: components/html/main.c:551
-msgid "Could not initialize Bonobo!"
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:288
+msgid "  Remove Theme  "
 msgstr ""
 
-#: components/notes/ntl-notes.c:178
-msgid "Notes"
-msgstr "Notaí"
+#: src/nautilus-theme-selector.c:400
+#, c-format
+msgid "Sorry, but \"%s\" is not a valid theme folder."
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:217
-msgid "Size: "
-msgstr "Meid: "
+#: src/nautilus-theme-selector.c:401
+msgid "Couldn't add theme"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:226
-msgid "Install Date: "
+#: src/nautilus-theme-selector.c:429
+#, c-format
+msgid "Sorry, but the \"%s\" theme couldn't be installed."
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:230
-msgid "<unknown>"
-msgstr "<gan aithne>"
+#: src/nautilus-theme-selector.c:430
+msgid "Couldn't install theme"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:235
-msgid "License: "
-msgstr "Ceadúnas: "
+#: src/nautilus-theme-selector.c:463
+msgid "Select a theme folder to add as a new theme:"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:244
-msgid "Build Date: "
+#: src/nautilus-theme-selector.c:495 src/nautilus-theme-selector.c:542
+msgid "Click on a theme to remove it."
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:253
-msgid "Distribution: "
+#: src/nautilus-theme-selector.c:545
+msgid ""
+"Click on a theme to change the\n"
+"appearance of Nautilus."
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:263
-msgid "Vendor: "
+#. change the add button label back to it's normal state
+#: src/nautilus-theme-selector.c:558
+msgid "Add New Theme"
 msgstr ""
 
+#: src/nautilus-theme-selector.c:585
+msgid ""
+"Sorry, but you can't remove the current theme. Please change to another "
+"theme before removing this one."
+msgstr ""
+
+#: src/nautilus-theme-selector.c:587
+msgid "Can't delete current theme"
+msgstr ""
+
+#: src/nautilus-theme-selector.c:608
+msgid "Sorry, but that theme could not be removed!"
+msgstr ""
+
+#: src/nautilus-theme-selector.c:609
+msgid "Couldn't remove theme"
+msgstr ""
+
+#: src/nautilus-theme-selector.c:716
+#, c-format
+msgid "No description available for the \"%s\" theme"
+msgstr ""
+
+#: src/nautilus-window.c:637
+msgid "View as ..."
+msgstr ""
+
+#. Add "View as Other..." extra bonus choice.
+#: src/nautilus-window.c:1317
+msgid "View as Other..."
+msgstr ""
+
+#: src/nautilus-window.c:1722
+msgid "Close"
+msgstr "Dún"
+
+#. FIXME bugzilla.eazel.com 5037: The text Preview
+#. * Release is hardcoded here. Are all builds with
+#. * time stamps really best described as "preview
+#. * release"?.
 #.
-#. * Create our sample menu item.
-#. *
-#. * Note that it's sorta bogus that we know Nautilus has a menu whose
-#. * path is "/File", and also that we know a sensible position to use within
-#. * that menu. Nautilus should publish this information somehow.
+#: src/nautilus-window-manage-views.c:216
+#, c-format
+msgid "Preview Release %s: %s"
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:820
+msgid "View Failed"
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:831
+#, c-format
+msgid ""
+"The %s view encountered an error and can't continue. You can choose another "
+"view or go to a different location."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:842
+#, c-format
+msgid "The %s view encountered an error while starting up."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1001
+msgid ""
+"One of the sidebar panels encountered an error and can't continue. "
+"Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1005
+#, c-format
+msgid ""
+"The %s sidebar panel encountered an error and can't continue. If this keeps "
+"happening, you might want to turn this panel off."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1010
+msgid "Sidebar Panel Failed"
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1225
+#, c-format
+msgid "Couldn't find \"%s\". Please check the spelling and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1231
+#, c-format
+msgid ""
+"\"%s\" is not a valid location. Please check the spelling and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1245
+#, c-format
+msgid ""
+"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
+"it is."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1253
+#, c-format
+msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+msgstr ""
+
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1265
+#, c-format
+msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1271
+#, c-format
+msgid "Couldn't display \"%s\", because the attempt to log in failed."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1276
+#, c-format
+msgid "Couldn't display \"%s\", because access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1287
+#, c-format
+msgid ""
+"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
+"the spelling is correct and that your proxy settings are correct."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1295
+#, c-format
+msgid ""
+"Couldn't display \"%s\", because the host name was empty. Check that your "
+"proxy settings are correct."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1307
+msgid ""
+"Searching is unavailable right now, because you either have no index, or the "
+"search service isn't running. Be sure that you have started the Medusa "
+"search service, and if you don't have an index, that the Medusa indexer is "
+"running."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1311
+msgid "Searching Unavailable"
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1315
+#, c-format
+msgid "Nautilus cannot display \"%s\"."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1320
+msgid "Can't Display Location"
+msgstr ""
+
+#. This is a little joke, shows up occasionally. I only
+#. * implemented this feature so I could use this joke.
 #.
-#. BonoboUIHandler
-#. menu item path, must start with /some-existing-menu-path and be otherwise unique
-#: components/sample/nautilus-sample-content-view.c:243
-msgid "_Sample"
-msgstr "_Sampla"
+#: src/nautilus-window-menus.c:354
+msgid ""
+"Are you sure you want to forget history? If you do, you will be doomed to "
+"repeat it."
+msgstr ""
 
-#. menu item user-displayed label
-#: components/sample/nautilus-sample-content-view.c:244
-msgid "This is a sample merged menu item"
+#: src/nautilus-window-menus.c:357
+msgid ""
+"Are you sure you want Nautilus to forget which locations you have visited?"
+msgstr ""
+
+#: src/nautilus-window-menus.c:362
+#, fuzzy
+msgid "Forget History?"
+msgstr "Stair"
+
+#: src/nautilus-window-menus.c:363
+msgid "Forget"
+msgstr ""
+
+#: src/nautilus-window-menus.c:466
+msgid "Show St_atus Bar"
+msgstr ""
+
+#: src/nautilus-window-menus.c:472
+msgid "Show _Sidebar"
 msgstr ""
 
-#. hint that appears in status bar
-#. position within menu; -1 means last
-#. pixmap type
-#. pixmap data
-#. accelerator key, couldn't bear the thought of using Control-S for anything except Save
-#. accelerator key modifiers
-#. callback function
-#. callback function data
+#: src/nautilus-window-menus.c:478
+msgid "Show _Toolbar"
+msgstr ""
+
+#: src/nautilus-window-menus.c:484
+#, fuzzy
+msgid "Show Location _Bar"
+msgstr "Áit"
+
+#: src/nautilus-window-menus.c:535
+msgid "Preferences"
+msgstr ""
+
+#. Localize to deal with
+#. * issues in the copyright
+#. * symbol characters -- do
+#. * not translate the
+#. * company name, please.
 #.
-#. * Create our sample toolbar button.
-#. *
-#. * Note that it's sorta bogus that we know Nautilus has a toolbar whose
-#. * path is "/Main". Nautilus should publish this information somehow.
+#: src/nautilus-window-menus.c:618
+msgid "Copyright © 1999-2001 Eazel, Inc."
+msgstr ""
+
+#: src/nautilus-window-menus.c:620
+msgid ""
+"Nautilus is a graphical shell\n"
+"for GNOME that makes it\n"
+"easy to manage your files\n"
+"and the rest of your system."
+msgstr ""
+
+#. translators should localize the following
+#. * string which will be displayed at the
+#. * bottom of the about box to give credit
+#. * to the translator(s)
 #.
-#. BonoboUIHandler
-#. button path, must start with /Main/ and be otherwise unique
-#: components/sample/nautilus-sample-content-view.c:261
-msgid "Sample"
-msgstr "Sampla"
+#: src/nautilus-window-menus.c:629
+msgid "Translator Credits"
+msgstr ""
 
-#. button user-displayed label
-#: components/sample/nautilus-sample-content-view.c:262
-msgid "This is a sample merged toolbar button"
+#: src/nautilus-window-menus.c:789
+#, c-format
+msgid ""
+"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
+"this location from your list?"
 msgstr ""
 
-#: components/websearch/ntl-web-search.c:176
-msgid "Search"
-msgstr "Cuardaigh"
+#: src/nautilus-window-menus.c:793
+msgid "Bookmark for Nonexistent Location"
+msgstr ""
+
+#: src/nautilus-window-menus.c:807
+#, c-format
+msgid "The location \"%s\" no longer exists."
+msgstr ""
+
+#: src/nautilus-window-menus.c:808
+msgid "Go to Nonexistent Location"
+msgstr ""
 
-#. For now we just display the results as HTML
-#. Results list
-#: components/websearch/ntl-web-search.c:194
-msgid "Results"
+#: src/nautilus-window-menus.c:877
+msgid "Go to the location specified by this bookmark"
 msgstr ""
 
-#: components/websearch/ntl-web-search.c:224
-msgid "WebSearch"
+#: src/nautilus-window-toolbars.c:402
+msgid "Back"
+msgstr "Riomh"
+
+#: src/nautilus-window-toolbars.c:404
+msgid "Forward"
+msgstr "Eile"
+
+#. Note to localizers: this font is used for the number in the
+#. * zoom control widget.
+#.
+#: src/nautilus-zoom-control.c:531
+msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr ""
+
+#~ msgid "_General Settings..."
+#~ msgstr "_Roghnachais gnáth..."
+
+#~ msgid "Info about the Nautilus program"
+#~ msgstr "Eolas faoi an ríomhchlár Nautilus"
+
+#~ msgid "Show Color selector..."
+#~ msgstr "Taispeán roghnóir Dath..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_Scríos..."
+
+#~ msgid "unknown owner"
+#~ msgstr "úineár gan aithne"
+
+#~ msgid "unknown group"
+#~ msgstr "grupa gan aithne"
+
+#~ msgid "xxx"
+#~ msgstr "xxx"
+
+#~ msgid "--"
+#~ msgstr "--"
+
+#~ msgid "Reading..."
+#~ msgstr "Ag leámh..."
+
+#~ msgid "License: "
+#~ msgstr "Ceadúnas: "
diff --git a/po/gl.po b/po/gl.po
index 814143f83..852434147 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,10 +9,15 @@
 #
 # First Version: 2000-05-06 20:53+0200
 #
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2001-03-09 11:34+0100\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2000-10-07 19:16+0200\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -145,8 +150,8 @@ msgid "Previous"
 msgstr "Anterior"
 
 #: components/help/converters/gnome-db2html2/gdb3html.c:721
-#: libnautilus-extensions/nautilus-global-preferences.c:686
-#: src/nautilus-shell-ui.xml.h:38
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "Inicio"
 
@@ -339,16 +344,14 @@ msgid "Kernel Routines"
 msgstr ""
 
 #: components/help/hyperbola-filefmt.c:703
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
 msgid "Info"
 msgstr "Info"
 
-#: components/help/hyperbola-nav-tree.c:279
+#: components/help/hyperbola-nav-tree.c:310
 msgid "Introductory Documents:"
 msgstr ""
 
-#: components/help/hyperbola-nav-tree.c:293
+#: components/help/hyperbola-nav-tree.c:324
 msgid "Documents by Subject:"
 msgstr ""
 
@@ -421,7 +424,7 @@ msgstr "Panel lateral da historia"
 msgid "History sidebar panel for Nautilus"
 msgstr "Panel lateral da historia do Nautilus"
 
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
@@ -478,7 +481,7 @@ msgstr ""
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "_Ficheiro"
 
@@ -560,7 +563,7 @@ msgid "Sidebar Loser"
 msgstr ""
 
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -570,7 +573,7 @@ msgstr ""
 "  %s"
 
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -1015,7 +1018,6 @@ msgid "Oldies"
 msgstr "Antigo"
 
 #: components/music/mpg123.c:32
-#: libnautilus-extensions/nautilus-font-picker.c:117
 msgid "Other"
 msgstr "Outro"
 
@@ -1652,10 +1654,10 @@ msgid "Pause"
 msgstr "Pausa"
 
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:945
-#: libnautilus-extensions/nautilus-file-operations.c:960
 #: libnautilus-extensions/nautilus-file-operations.c:979
-#: src/nautilus-shell-ui.xml.h:60
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Parar"
 
@@ -1705,23 +1707,6 @@ msgstr "Fábrica da vista de música"
 msgid "View as Music"
 msgstr "Ver como música"
 
-#. FIXME: eventually, get this from preferences
-#. set up the default font
-#: components/notes/nautilus-notes.c:200
-#: components/text/nautilus-text-view.c:186
-#: libnautilus-extensions/nautilus-global-preferences.c:1118
-#: libnautilus-extensions/nautilus-icon-container.c:3332
-#: libnautilus-extensions/nautilus-icon-container.c:3333
-#: libnautilus-extensions/nautilus-icon-container.c:3334
-#: libnautilus-extensions/nautilus-icon-container.c:3335
-#: libnautilus-extensions/nautilus-icon-container.c:3336
-#: libnautilus-extensions/nautilus-icon-container.c:3337
-#: libnautilus-extensions/nautilus-icon-container.c:3338
-#: libnautilus-extensions/nautilus-preferences-item.c:482
-#: src/nautilus-sidebar-title.c:500
-msgid "helvetica"
-msgstr "helvetica"
-
 #: components/notes/Nautilus_View_notes.oaf.in.h:1
 msgid "Factory for annotation view"
 msgstr "Fábrica para a vista de anotacións"
@@ -1816,7 +1801,7 @@ msgstr ""
 #: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
 #: components/services/install/command-line/eazel-test-packsys.c:590
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "Mostrar saída de depuración"
 
@@ -1880,171 +1865,174 @@ msgstr ""
 msgid "Run Query"
 msgstr ""
 
-#. Disabled for 1.0
-#. {"revert", 'r', POPT_ARG_NONE, &arg_revert, 0, N_("Revert"), NULL},
-#: components/services/install/command-line/eazel-alt-install-corba.c:127
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
+#, fuzzy
+msgid "Revert"
+msgstr "nunca"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:128
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "Especificar servidor"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:129
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
 msgid "Dont print too much, just problems and download"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:130
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:131
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
 msgid "argument is a suite id"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:134
-#: components/services/install/lib/eazel-install-problem.c:1011
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "Permitir actualizacións"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "Saída detallada"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:136
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
 msgid "Install a specific package version"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:159
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
 msgid "*** You cannot specify more then one protocol type.\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:176
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
 msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:285
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, fuzzy, c-format
 msgid "File conflict checking %s...\n"
 msgstr "comprobando %s..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:299
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, fuzzy, c-format
 msgid "File uniqueness checking %s...\n"
 msgstr "comprobando %s..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:313
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
 #, c-format
 msgid "Feature consistency checking %s...\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:344
-#: components/services/install/lib/eazel-install-protocols.c:110
-#: components/services/install/lib/eazel-install-protocols.c:248
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
 #, c-format
 msgid "Downloading %s..."
 msgstr "Descargando %s..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:360
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
 msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
 msgstr "Descargando %s... (%d/%d) = %d%% %.1f KB/s"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:368
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
 msgid "Downloading %s... (%d/%d) = %d%%"
 msgstr "Descargando %s... (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:376
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
 #, c-format
 msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
 msgstr "Descargando %s... (%d/%d) %.1f KB/s Feito     \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:381
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
 #, c-format
 msgid "Downloading %s... %3.1f KB/s Done\n"
 msgstr "Descargando %s... %3.1f KB/s Feito\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:409
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "Instalando %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:417
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "Desinstalando %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:439
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "Instalando %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Feito\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:446
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "Desinstalando %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Feito\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:454
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
 msgid "Done\n"
 msgstr "Feito\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:474
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
 #, c-format
 msgid "Download of %s FAILED\n"
 msgstr "A descarga de %s FALLOU\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:496
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
 #, c-format
 msgid "Package %s failed to uninstall.\n"
 msgstr "Fallou a desinstalación do paquete %s.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:498
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
 #, c-format
 msgid "Package %s failed to install.\n"
 msgstr "Fallou a instalación do paquete %s.\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:519
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
 #, c-format
 msgid "\t· Problem : %s\n"
 msgstr "\t· Problema : %s\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:528
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
 #, c-format
 msgid "\t· Action : %s\n"
 msgstr "\t· Acción : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:571
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
 msgid "Cancelling operation\n"
 msgstr "Cancelando a operación\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:582
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
 #, c-format
 msgid "About to install a total of %d packages, %dKB\n"
 msgstr "A piques de instalar un total de %d paquetes, %dKB\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:586
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
 #, c-format
 msgid "About to uninstall a total of %d packages, %dKB\n"
 msgstr "A piques de desinstalar un total de %d paquetes, %dKB\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:590
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
 #, c-format
 msgid "About to revert a total of %d packages, %d KB\n"
 msgstr "A piques de reverter un total de %d paquetes, %dKB\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:607
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
 #, c-format
 msgid "\t· %s and it's dependencies\n"
 msgstr "\t· %s e as súas dependencias\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:610
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
 #, c-format
 msgid "\t· %s\n"
 msgstr "\t· %s\n"
@@ -2054,38 +2042,38 @@ msgstr "\t· %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n) " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:638
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
 msgid "Save transaction report ? (y/n) "
 msgstr "¿Gardar o informe da transacción? (s/n) "
 
 #. I18N note: y is the letter for the word Yes. This is
 #. used in the response for a yes/no questions. Your translation
 #. must be 1 character only.
-#: components/services/install/command-line/eazel-alt-install-corba.c:649
-#: components/services/install/command-line/eazel-alt-install-corba.c:769
-#: components/services/install/command-line/eazel-alt-install-corba.c:811
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
 msgid "y"
 msgstr "s"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:670
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
 #, c-format
 msgid "Dependency : %s needs %s\n"
 msgstr "Dependencia : %s necesita %s\n"
 
 #. I18N note: %s is a package name
-#: components/services/install/command-line/eazel-alt-install-corba.c:688
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
 #, c-format
 msgid "Package %s failed md5 check!\n"
 msgstr ""
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:690
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
 #, c-format
 msgid "\t· server MD5 checksum is %s\n"
 msgstr ""
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:692
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
 #, c-format
 msgid "\t· actual MD5 checksum is %s\n"
 msgstr ""
@@ -2095,7 +2083,7 @@ msgstr ""
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:758
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
 msgid "Continue? (y/n) "
 msgstr "¿Continuar? (s/n) "
 
@@ -2104,83 +2092,83 @@ msgstr "¿Continuar? (s/n) "
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:799
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
 msgid "Should I delete the RPM files? (y/n) "
 msgstr "¿Borrar os ficheiros RPM? (s/n) "
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:831
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
 msgid "Operation ok\n"
 msgstr "Operación correcta\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:833
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
 msgid "Operation failed\n"
 msgstr "A operación fallou\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:959
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
 msgid "Installing"
 msgstr "Instalando"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:968
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
 msgid "Uninstalling"
 msgstr "Desinstalando"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:983
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
 msgid "Only one operation at a time please."
 msgstr "Só unha operación ó mesmo tempo, por favor."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:988
-#: components/services/install/command-line/eazel-alt-install-corba.c:996
-#: components/services/install/command-line/eazel-alt-install-corba.c:1040
-#: components/services/install/command-line/eazel-alt-install-corba.c:1047
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
 #, c-format
 msgid "%s: --help for usage\n"
 msgstr "%s: --help para o uso\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
 #, c-format
 msgid "Name         : %s\n"
 msgstr "Nome         : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
 #, c-format
 msgid "Version      : %s\n"
 msgstr "Versión      : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1014
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
 #, c-format
 msgid "Minor        : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
 #, c-format
 msgid "Size         : %d\n"
 msgstr "Tamaño       : %d\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
 #, c-format
 msgid "Arch         : %s\n"
 msgstr "Arquit       : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
 #, c-format
 msgid "Distribution : %s\n"
 msgstr "Distribución : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1019
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
 #, c-format
 msgid "Description  : %s\n"
 msgstr "Descrición   : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1021
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
 #, c-format
 msgid "Install root : %s\n"
 msgstr "Raíz de inst.: %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1024
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
 msgid "Provides     : \n"
 msgstr "Fornece      : \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1066
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
 #, c-format
 msgid "exit code %d\n"
 msgstr "código de saída %d\n"
@@ -2196,123 +2184,128 @@ msgstr ""
 "Usar o ficheiro especificado para xerar unha lista de paquetes, require "
 "--packagelist"
 
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 msgid "Softcat server to connect to"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 msgid "Number of times to try the request"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+msgid "Lookup package that features a feature/file"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 msgid "use check function (for debugging)"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 msgid "Show detailed sub-package info"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:99
+#: components/services/install/command-line/eazel-test-softcat.c:66
+msgid "enable funk parser"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:116
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:132
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, fuzzy, c-format
 msgid "No MD5 available for %s"
 msgstr "Non hai información dispoñible para o tema %s"
 
 #. I18N note: "%is is ok" in the sense that %s=package name and the
 #. package is intact
-#: components/services/install/lib/eazel-install-logic2.c:327
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, fuzzy, c-format
 msgid "%s is ok"
 msgstr "¿É isto correcto?"
 
-#: components/services/install/lib/eazel-install-logic2.c:433
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s versión %s-%s xa está instalado"
 
-#: components/services/install/lib/eazel-install-logic2.c:437
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s versión %s xa está instalado"
 
-#: components/services/install/lib/eazel-install-logic2.c:446
-#: components/services/install/lib/eazel-install-logic2.c:451
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:460
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:465
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:518
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:523
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:687
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, fuzzy, c-format
 msgid "Loading package info from file %s"
 msgstr "Obtendo a lista de paquetes do servidor remoto ...\n"
 
 #. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
-#: components/services/install/lib/eazel-install-logic2.c:993
+#: components/services/install/lib/eazel-install-logic2.c:1197
 #, fuzzy
 msgid "ok"
 msgstr "Rock"
 
-#: components/services/install/lib/eazel-install-logic2.c:993
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "not ok"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1159
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
 msgid "Checking dependencies for %s"
 msgstr ""
@@ -2320,237 +2313,237 @@ msgstr ""
 #. I18N note: both %s' are package names.
 #. related is in the sense that the two packages apparently
 #. are connected somehow, eg. foo and foo-devel
-#: components/services/install/lib/eazel-install-logic2.c:1766
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, fuzzy, c-format
 msgid "%s is related to %s"
 msgstr "\"%s\" seleccionado (%s)"
 
-#: components/services/install/lib/eazel-install-logic2.c:1826
+#: components/services/install/lib/eazel-install-logic2.c:2090
 #, c-format
 msgid "updating %s to version %s-%s solves conflict"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1842
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
 msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1849
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, c-format
 msgid "could not revive %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2004
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, fuzzy, c-format
 msgid "file uniqueness checking %s"
 msgstr "comprobando %s..."
 
-#: components/services/install/lib/eazel-install-logic2.c:2025
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
 msgid "Duplicate file : %s occurs in %s and %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2037
-#: components/services/install/lib/eazel-install-logic2.c:2191
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
 msgid "... but it's ok, the packages are related"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2045
+#: components/services/install/lib/eazel-install-logic2.c:2324
 #, c-format
 msgid "(there were %d other conflicts)"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2140
+#: components/services/install/lib/eazel-install-logic2.c:2419
 #, fuzzy, c-format
 msgid "file conflict checking %s"
 msgstr "comprobando %s..."
 
-#: components/services/install/lib/eazel-install-logic2.c:2177
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
 msgid "file conflict : package %s already provides file %s also provided by %s"
 msgstr ""
 
 #. the owner of this file is a package that we're upgrading, and the
 #. * new version no longer has this file, so everything's okay.
-#: components/services/install/lib/eazel-install-logic2.c:2187
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
 msgid "...but it is okay, we're upgrading %s and it ditched that file"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2279
+#: components/services/install/lib/eazel-install-logic2.c:2558
 #, c-format
 msgid "checking feature consistency of %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2347
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
 msgid ""
 "feature missing : %s breaks if %s is installed (feature %s would be lost"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2426
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, fuzzy, c-format
 msgid "downloading %d packages"
 msgstr "Descargando os paquetes"
 
-#: components/services/install/lib/eazel-install-logic2.c:2695
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, fuzzy, c-format
 msgid "will upgrade %s"
 msgstr "Permitir actualizacións"
 
-#: components/services/install/lib/eazel-install-logic2.c:2698
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, fuzzy, c-format
 msgid "will downgrade %s"
 msgstr "Permitir actualizacións"
 
-#: components/services/install/lib/eazel-install-logic2.c:2701
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, fuzzy, c-format
 msgid "will install %s"
 msgstr "Instalando \"%s\""
 
-#: components/services/install/lib/eazel-install-logic2.c:2704
+#: components/services/install/lib/eazel-install-logic2.c:2960
 #, fuzzy, c-format
 msgid "will uninstall %s"
 msgstr "Desinstalar"
 
-#: components/services/install/lib/eazel-install-logic2.c:2789
-#: components/services/install/lib/eazel-install-problem.c:335
-#: components/services/install/lib/eazel-install-problem.c:338
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
 #, c-format
 msgid "%s requires %s"
 msgstr "%s require %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2982
+#: components/services/install/lib/eazel-install-logic2.c:3238
 #, fuzzy, c-format
 msgid "failed %s"
 msgstr "0 ficheiros"
 
-#: components/services/install/lib/eazel-install-metadata.c:171
+#: components/services/install/lib/eazel-install-metadata.c:174
 msgid "Could not set URLType from config file!"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:713
+#: components/services/install/lib/eazel-install-object.c:717
 msgid "Transactions are not stored, could not find home dir"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:741
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:998
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "Obtendo a lista de paquetes do servidor remoto ...\n"
 
-#: components/services/install/lib/eazel-install-object.c:1014
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "¡Non foi posible recibir o ficheiro package-list.xml!\n"
 
-#: components/services/install/lib/eazel-install-object.c:1087
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr ""
 "Non se pode escribir ó ficheiro %s, usando o manexador de rexistro por "
 "defecto"
 
-#: components/services/install/lib/eazel-install-object.c:1218
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "A instalación fallou"
 
-#: components/services/install/lib/eazel-install-object.c:1264
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "A desinstalación fallou"
 
-#: components/services/install/lib/eazel-install-object.c:1387
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "!Non foi posible crear o directorio de transaccións (%s)! ***\n"
 
-#: components/services/install/lib/eazel-install-object.c:1410
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr "Escribindo a transacción a %s"
 
-#: components/services/install/lib/eazel-install-problem.c:159
+#: components/services/install/lib/eazel-install-problem.c:163
 #, c-format
 msgid "%s was cancelled"
 msgstr "%s foi cancelado"
 
-#: components/services/install/lib/eazel-install-problem.c:164
-#: components/services/install/lib/eazel-install-problem.c:327
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
 msgid "%s is a source package, which is not yet supported"
 msgstr "%s é un paquete de código fonte, e aínda non está soportado"
 
-#: components/services/install/lib/eazel-install-problem.c:178
-#: components/services/install/lib/eazel-install-problem.c:189
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
 #, c-format
 msgid "%s would break other packages"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:181
+#: components/services/install/lib/eazel-install-problem.c:185
 #, c-format
 msgid "%s would break"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:187
+#: components/services/install/lib/eazel-install-problem.c:191
 #, c-format
 msgid "%s would break %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:193
+#: components/services/install/lib/eazel-install-problem.c:197
 #, c-format
 msgid "%s is damaged"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:197
+#: components/services/install/lib/eazel-install-problem.c:201
 #, c-format
 msgid "%s requires %s, which could not be found on the server"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:200
-#, c-format
-msgid "%s could not be found on the server"
-msgstr ""
+#: components/services/install/lib/eazel-install-problem.c:204
+#, fuzzy, c-format
+msgid "%s for %s could not be found on the server"
+msgstr "necesítase %s, pero non se atopou\n"
 
-#: components/services/install/lib/eazel-install-problem.c:208
-#: components/services/install/lib/eazel-install-problem.c:353
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr "%s xa está instalado"
 
-#: components/services/install/lib/eazel-install-problem.c:252
+#: components/services/install/lib/eazel-install-problem.c:259
 #, fuzzy, c-format
 msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr "%s xa estaba instalado\n"
 
-#: components/services/install/lib/eazel-install-problem.c:256
+#: components/services/install/lib/eazel-install-problem.c:263
 #, fuzzy, c-format
 msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr "%s xa estaba instalado\n"
 
-#: components/services/install/lib/eazel-install-problem.c:346
+#: components/services/install/lib/eazel-install-problem.c:353
 #, fuzzy, c-format
 msgid "%s is not installed and could not be found on server"
 msgstr "necesítase %s, pero non se atopou\n"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:913
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr ""
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:924
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr ""
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:939
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr ""
@@ -2558,235 +2551,235 @@ msgstr ""
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:952
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr ""
 
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:960
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:1008
+#: components/services/install/lib/eazel-install-problem.c:1015
 msgid "Continue with force"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:1014
+#: components/services/install/lib/eazel-install-problem.c:1021
 #, fuzzy
 msgid "Allow downgrade"
 msgstr "Permitir actualizacións"
 
-#: components/services/install/lib/eazel-install-protocols.c:123
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:166
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
 #, c-format
 msgid "Could not open target file %s"
 msgstr "Non foi posible abrir o ficheiro destino %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:130
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:92
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
 msgid "Could not create an http request !"
 msgstr "¡ Non foi posible crear unha petición http !"
 
-#: components/services/install/lib/eazel-install-protocols.c:137
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:99
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
 msgid "Proxy: Invalid uri !"
 msgstr "Proxy: ¡ Uri non válida !"
 
-#: components/services/install/lib/eazel-install-protocols.c:142
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:105
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
 msgid "Invalid uri !"
 msgstr "¡ Uri non válida !"
 
-#: components/services/install/lib/eazel-install-protocols.c:149
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:115
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
 msgid "Could not prepare http request !"
 msgstr "¡ Non foi posible preparar a petición http !"
 
-#: components/services/install/lib/eazel-install-protocols.c:154
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:120
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
 msgid "Couldn't get async mode "
 msgstr ""
 
 #. probably out of disk space
-#: components/services/install/lib/eazel-install-protocols.c:183
-#: components/services/install/lib/eazel-install-protocols.c:212
-#: components/services/install/lib/eazel-install-protocols.c:228
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, c-format
 msgid "DISK FULL: could not write %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:189
-#: components/services/install/lib/eazel-install-protocols.c:217
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
 msgid "Could not get request body!"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:202
+#: components/services/install/lib/eazel-install-protocols.c:208
 #, c-format
 msgid "HTTP error: %d %s"
 msgstr "Erro HTTP: %d %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:249
+#: components/services/install/lib/eazel-install-protocols.c:255
 msgid "FTP not supported yet"
 msgstr "FTP aínda non soportado"
 
-#: components/services/install/lib/eazel-install-protocols.c:457
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, c-format
 msgid "Checking local file %s..."
 msgstr "Comprobando o ficheiro local %s..."
 
-#: components/services/install/lib/eazel-install-protocols.c:578
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, fuzzy, c-format
 msgid "Failed to retrieve %s!"
 msgstr "¡Fallo ó recibir %s!"
 
-#: components/services/install/lib/eazel-install-protocols.c:651
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, fuzzy, c-format
 msgid "Could not get an URL for %s"
 msgstr "Non foi posible obter un URL para %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:666
+#: components/services/install/lib/eazel-install-protocols.c:672
 msgid "Downloaded package does not have the correct name"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:667
+#: components/services/install/lib/eazel-install-protocols.c:673
 #, c-format
 msgid "Package %s should have had name %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:695
+#: components/services/install/lib/eazel-install-protocols.c:701
 msgid "File download failed"
 msgstr "A descarga do ficheiro fallou"
 
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:158
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 #, fuzzy
 msgid "*** No package nodes! (cat has no children) ***"
 msgstr "*** ¡Non hai nós de paquetes! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:160
-#: components/services/install/lib/eazel-install-xml-package-list.c:168
-#: components/services/install/lib/eazel-install-xml-package-list.c:183
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 msgid "*** Bailing from package parse! ***"
 msgstr "*** ¡Saíndo da análise de paquetes! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:166
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
 msgid "*** No package nodes! ***"
 msgstr "*** ¡Non hai nós de paquetes! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:172
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 msgid "*** Malformed package node!"
 msgstr "*** ¡Nó de paquete malformado!"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:181
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
 #, fuzzy
 msgid "*** No depends nodes! ***"
 msgstr "*** ¡Non hai nós de paquetes! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:187
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr "*** ¡Nó de dependencias malformado!"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:211
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr "*** Tipo de nó '%s' descoñecido"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:228
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** O ficheiro de lista de paquetes non contén datos! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:233
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** ¡Non se atopa o xmlnode CATEGORIES! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:234
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr "*** ¡Saíndo da análise de categorías! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:240
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** ¡Non hai Categorías! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:241
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr "*** ¡Saíndo da análise de categorías! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:295
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** ¡Non se atopa o xmlnode TRANSACTION! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:297
-#: components/services/install/lib/eazel-install-xml-package-list.c:305
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr "*** ¡Saíndo da análise de transaccións! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:303
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** ¡Non hai paquetes! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:339
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** ¡Non hai nós de categorías! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:343
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** ¡Non se pode atopar o xmlnode CATEGORIES! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:377
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** Nó %s descoñecido"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:467
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** ¡Erro xerando a lista de paquetes xml! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:514
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** Erro lendo a lista de paquetes! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:909
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** ¡O xml de osd non contén datos! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:914
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr "*** Saíndo da análise de osd! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:990
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "Non foi posible analizar o xml (lonxitude %d)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:763
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr "Aberta a base de datos de paquetes en %s"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:768
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr "Fallo ó abrir a base de datos de paquetes en %s"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:801
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr ""
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:806
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr ""
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1137
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr "Non se pode abrir %s"
@@ -2893,7 +2886,7 @@ msgid "Now installing package \"%s\"."
 msgstr "Instalando o paquete %s ..."
 
 #: components/services/install-view/callbacks.c:407
-#: components/services/install-view/nautilus-service-install-view.c:897
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "Instalando \"%s\""
@@ -2920,30 +2913,30 @@ msgstr ""
 msgid "Is this ok ?"
 msgstr "¿É isto correcto?"
 
-#: components/services/install-view/callbacks.c:557
+#: components/services/install-view/callbacks.c:556
 #, fuzzy
 msgid "Installation cancelled."
 msgstr "A instalación fallou."
 
-#: components/services/install-view/callbacks.c:559
+#: components/services/install-view/callbacks.c:558
 msgid "This package has already been installed."
 msgstr "Este paquete xa foi instalado."
 
-#: components/services/install-view/callbacks.c:561
-#: components/services/install-view/callbacks.c:658
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
 msgid "Installation complete."
 msgstr "Instalación completa."
 
-#: components/services/install-view/callbacks.c:565
+#: components/services/install-view/callbacks.c:564
 msgid "Installation failed."
 msgstr "A instalación fallou."
 
 #. some succeeded; some failed
-#: components/services/install-view/callbacks.c:569
+#: components/services/install-view/callbacks.c:568
 msgid "Some packages installed successfully:"
 msgstr "Algúns paquetes instaláronse correctamente:"
 
-#: components/services/install-view/callbacks.c:578
+#: components/services/install-view/callbacks.c:577
 msgid ""
 "\n"
 "Some packages failed:"
@@ -2951,19 +2944,19 @@ msgstr ""
 "\n"
 "Algúns paquetes fallaron:"
 
-#: components/services/install-view/callbacks.c:627
+#: components/services/install-view/callbacks.c:626
 msgid "Erase the RPM files?"
 msgstr "¿Borrar os ficheiros RPM?"
 
-#: components/services/install-view/callbacks.c:629
+#: components/services/install-view/callbacks.c:628
 msgid "Erase the leftover RPM files?"
 msgstr ""
 
-#: components/services/install-view/callbacks.c:659
+#: components/services/install-view/callbacks.c:658
 msgid "Ok"
 msgstr ""
 
-#: components/services/install-view/callbacks.c:674
+#: components/services/install-view/callbacks.c:673
 msgid ""
 "A core package of Nautilus has been\n"
 "updated.  You should restart Nautilus.\n"
@@ -3039,32 +3032,32 @@ msgstr "Contido"
 
 #: components/services/install-view/forms.c:482
 #: libnautilus-extensions/nautilus-drag.c:493
-#: src/file-manager/fm-directory-view.c:3551
+#: src/file-manager/fm-directory-view.c:4326
 #, fuzzy
 msgid "Cancel"
 msgstr "Canles"
 
-#: components/services/install-view/nautilus-service-install-view.c:419
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
 msgid "%s is in GNOME (footprint) > %s"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:437
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, c-format
 msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:452
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
 msgid "%s is in the KDE menu.\n"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:653
+#: components/services/install-view/nautilus-service-install-view.c:655
 #, fuzzy
 msgid "Installation Complete"
 msgstr "Instalación completa."
 
-#: components/services/install-view/nautilus-service-install-view.c:708
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
 msgid ""
 "%sTo start %s, click the Launch button below, or to create a shortcut, drag "
@@ -3072,57 +3065,57 @@ msgid ""
 msgstr ""
 
 #. couldn't find an icon
-#: components/services/install-view/nautilus-service-install-view.c:716
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
 msgid "%sTo start %s, click the Launch button below."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:771
+#: components/services/install-view/nautilus-service-install-view.c:773
 msgid "Incorrect password."
 msgstr "Contrasinal incorrecto."
 
-#: components/services/install-view/nautilus-service-install-view.c:776
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:893
+#: components/services/install-view/nautilus-service-install-view.c:895
 #, fuzzy
 msgid "Installing packages"
 msgstr "Instalando o paquete %d de %d"
 
-#: components/services/install-view/nautilus-service-install-view.c:895
+#: components/services/install-view/nautilus-service-install-view.c:897
 #, fuzzy
 msgid "Installing remote package"
 msgstr "Descargando o paquete remoto"
 
-#: components/services/install-view/nautilus-service-install-view.c:899
+#: components/services/install-view/nautilus-service-install-view.c:901
 #, fuzzy
 msgid "Installing some package"
 msgstr "Descargando algún paquete"
 
-#: components/services/install-view/nautilus-service-install-view.c:916
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:965
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr "Contactando co Catálogo de Software de Eazel ..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1023
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr "Comprobando a autorización..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1095
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr "Abortando as descargas de paquetes (por favor, agarde) ..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1115
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "A descarga do paquete abortou."
 
-#: components/services/install-view/nautilus-service-install-view.c:1116
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "Abortado"
 
@@ -3379,12 +3372,12 @@ msgid "Services Login"
 msgstr ""
 
 #: components/services/summary/nautilus-summary-dialogs.c:131
-#: libnautilus-extensions/nautilus-password-dialog.c:269
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "Nome de usuario:"
 
 #: components/services/summary/nautilus-summary-dialogs.c:138
-#: libnautilus-extensions/nautilus-password-dialog.c:276
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "Contrasinal:"
 
@@ -3456,43 +3449,43 @@ msgstr "Servicios"
 msgid "Featured Downloads"
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:883
+#: components/services/summary/nautilus-summary-view.c:884
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
 "unavailable right now, or your computer might be configured incorrectly. "
 "Please contact support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:893
+#: components/services/summary/nautilus-summary-view.c:894
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
 "support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:916
+#: components/services/summary/nautilus-summary-view.c:917
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
 "contact support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:958
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
 "now, or your computer might be configured incorrectly. You could try again "
 "later."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:968
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
 "support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:985
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:1048
+#: components/services/summary/nautilus-summary-view.c:1049
 #: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr "Servicios Eazel"
@@ -3557,16 +3550,16 @@ msgstr "Visualizador de resumes"
 msgid "View as Summary"
 msgstr "Ver como resume"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:130
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
 #, c-format
 msgid "HTTP error %d \"%s\" on uri %s"
 msgstr "Erro HTTP %d \"%s\" no uri %s"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:200
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:215
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr ""
@@ -3609,48 +3602,68 @@ msgstr ""
 msgid "Factory for the sample service"
 msgstr ""
 
-#: components/text/nautilus-text-view.c:326
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr "%s é demasiado grande para que o Nautilus o cargue enteiro."
 
-#: components/text/nautilus-text-view.c:329
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr "Ficheiro demasiado grande"
 
 #: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "Fontes"
+
+#: components/text/nautilus-text-view-ui.xml.h:2
 msgid "Lucida"
 msgstr "Lucida"
 
-#: components/text/nautilus-text-view-ui.xml.h:2
+#: components/text/nautilus-text-view-ui.xml.h:3
 msgid "Use the Courier Font"
 msgstr "Usar a fonte Courier"
 
-#: components/text/nautilus-text-view-ui.xml.h:3
+#: components/text/nautilus-text-view-ui.xml.h:4
+#, fuzzy
+msgid "Use the Fixed Font"
+msgstr "Usar a fonte Times"
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+#, fuzzy
+msgid "Use the GTK System Font"
+msgstr "Usar a fonte Times"
+
+#: components/text/nautilus-text-view-ui.xml.h:6
 msgid "Use the Helvetica Font"
 msgstr "Usar a fonte Helvetica"
 
-#: components/text/nautilus-text-view-ui.xml.h:4
+#: components/text/nautilus-text-view-ui.xml.h:7
 msgid "Use the Lucida Font"
 msgstr "Usar a fonte Lucida"
 
-#: components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:8
 msgid "Use the Times Font"
 msgstr "Usar a fonte Times"
 
-#: components/text/nautilus-text-view-ui.xml.h:6
+#: components/text/nautilus-text-view-ui.xml.h:9
 msgid "_Courier"
 msgstr "_Courier"
 
-#: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
-msgstr "_Fontes"
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "_Ficheiro"
 
-#: components/text/nautilus-text-view-ui.xml.h:8
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
 msgid "_Helvetica"
 msgstr "_Helvetica"
 
-#: components/text/nautilus-text-view-ui.xml.h:9
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr "_Times"
 
@@ -3719,7 +3732,7 @@ msgid "Nautilus Tree view"
 msgstr "Vista de árbore do Nautilus"
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:638
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr "Árbore"
 
@@ -3731,7 +3744,7 @@ msgstr "Aparición"
 msgid "Azul"
 msgstr "Azul"
 
-#: data/browser.xml.h:3 libnautilus-extensions/nautilus-font-picker.c:105
+#: data/browser.xml.h:3
 msgid "Black"
 msgstr "Negro"
 
@@ -3843,7 +3856,7 @@ msgstr "Solte un emblema sobre un obxecto para engadilo ó obxecto"
 msgid "Eclipse"
 msgstr "Eclipse"
 
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1607
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "Emblemas"
 
@@ -3940,7 +3953,7 @@ msgid "Numbers"
 msgstr "Números"
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "Aceptar"
 
@@ -4061,13 +4074,13 @@ msgid "The Gimp"
 msgstr "O Gimp"
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:554
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "Escritorio"
 
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4796
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
-#: src/file-manager/fm-desktop-icon-view.c:65
+#: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
 msgstr "Lixo"
 
@@ -4100,7 +4113,7 @@ msgid "Google"
 msgstr "Google"
 
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:808
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "Motores de busca"
 
@@ -4354,101 +4367,101 @@ msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2261
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr "hoxe ás %-H:%M"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2266
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr "onte ás %-H:%M"
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2271
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%A %-d/%-m/%y ás %-H:%M"
 
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2276
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%-d/%-m/%y ás %-H:%M"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 elementos"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr "0 cartafoles"
 
-#: libnautilus-extensions/nautilus-file.c:3408
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 ficheiros"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 elemento"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr "1 cartafol"
 
-#: libnautilus-extensions/nautilus-file.c:3413
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "%u elementos"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr "%u cartafoles"
 
-#: libnautilus-extensions/nautilus-file.c:3417
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u ficheiros"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3720
-#: libnautilus-extensions/nautilus-file.c:3735
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr "? elementos"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3726
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr "? bytes"
 
-#: libnautilus-extensions/nautilus-file.c:3739
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "tipo descoñecido"
 
-#: libnautilus-extensions/nautilus-file.c:3741
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "tipo MIME descoñecido"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3746
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "descoñecido"
 
-#: libnautilus-extensions/nautilus-file.c:3782
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr "programa"
 
-#: libnautilus-extensions/nautilus-file.c:3794
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
@@ -4458,16 +4471,16 @@ msgstr ""
 "probablemente signifique que o ficheiro gnome-vfs.keys non está no lugar "
 "correcto ou que non se atopa por algunha outra razón."
 
-#: libnautilus-extensions/nautilus-file.c:3798
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
 "aaron@eazel.com"
 msgstr ""
-"Non se atopou a descrición do tipo mime \"%s\" (o ficheiro é \"%s\"), "
-"por favor, informe a aaron@eazel.com"
+"Non se atopou a descrición do tipo mime \"%s\" (o ficheiro é \"%s\"), por "
+"favor, informe a aaron@eazel.com"
 
-#: libnautilus-extensions/nautilus-file.c:3812
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "ligazón"
 
@@ -4475,27 +4488,27 @@ msgstr "ligazón"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1156
-#: libnautilus-extensions/nautilus-file.c:3818
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr "ligazón a %s"
 
-#: libnautilus-extensions/nautilus-file.c:3832
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr "ligazón (estragada)"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "De:"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "A:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:588
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4506,7 +4519,7 @@ msgstr ""
 "\n"
 "Non é posible mover \"%s\" porque está nun disco de só lectura."
 
-#: libnautilus-extensions/nautilus-file-operations.c:599
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4519,7 +4532,7 @@ msgstr ""
 "Non é posible borrar \"%s\" porque non ten permisos para modificar o "
 "cartafol do nivel superior."
 
-#: libnautilus-extensions/nautilus-file-operations.c:605
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4530,7 +4543,7 @@ msgstr ""
 "\n"
 "Non é posible borrar \"%s\" porque está nun disco de só lectura."
 
-#: libnautilus-extensions/nautilus-file-operations.c:636
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4540,10 +4553,10 @@ msgid ""
 msgstr ""
 "Erro ó mover.\n"
 "\n"
-"Non é posible mover \"%s\" porque non ten permisos para modificar o "
-"cartafol do nivel superior."
+"Non é posible mover \"%s\" porque non ten permisos para modificar o cartafol "
+"do nivel superior."
 
-#: libnautilus-extensions/nautilus-file-operations.c:643
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4556,7 +4569,7 @@ msgstr ""
 "Non é posible mover \"%s\" ó lixo porque non ten permisos para modificar o "
 "cartafol do nivel superior."
 
-#: libnautilus-extensions/nautilus-file-operations.c:667
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -4567,7 +4580,7 @@ msgstr ""
 "\n"
 "Non é posible copiar \"%s\" porque non ten permisos para lelo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:689
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4578,7 +4591,7 @@ msgstr ""
 "\n"
 "Non hai espacio dabondo no destino."
 
-#: libnautilus-extensions/nautilus-file-operations.c:694
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4589,7 +4602,7 @@ msgstr ""
 "\n"
 "Non hai espacio dabondo no destino."
 
-#: libnautilus-extensions/nautilus-file-operations.c:698
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4600,7 +4613,7 @@ msgstr ""
 "\n"
 "Non espacio dabondo no destino."
 
-#: libnautilus-extensions/nautilus-file-operations.c:710
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4611,7 +4624,7 @@ msgstr ""
 "\n"
 "Non ten permisos para escribir neste cartafol."
 
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4622,7 +4635,7 @@ msgstr ""
 "\n"
 "O disco de destino é de só lectura."
 
-#: libnautilus-extensions/nautilus-file-operations.c:721
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4633,7 +4646,7 @@ msgstr ""
 "\n"
 "Non ten permisos para escribir neste cartafol."
 
-#: libnautilus-extensions/nautilus-file-operations.c:725
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4644,7 +4657,7 @@ msgstr ""
 "\n"
 "O disco de destino é de só lectura."
 
-#: libnautilus-extensions/nautilus-file-operations.c:732
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4655,7 +4668,7 @@ msgstr ""
 "\n"
 "Non ten permisos para escribir neste cartafol."
 
-#: libnautilus-extensions/nautilus-file-operations.c:736
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4666,7 +4679,7 @@ msgstr ""
 "\n"
 "O disco de destino é de só lectura."
 
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4677,7 +4690,7 @@ msgstr ""
 "\n"
 "¿Desexa continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4688,7 +4701,7 @@ msgstr ""
 "\n"
 "¿Desexa continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:773
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4699,7 +4712,7 @@ msgstr ""
 "\n"
 "¿Desexa continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4710,7 +4723,7 @@ msgstr ""
 "\n"
 "¿Desexa continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:794
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4721,7 +4734,7 @@ msgstr ""
 "\n"
 "¿Desexa continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4732,7 +4745,7 @@ msgstr ""
 "\n"
 "¿Desexa continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4743,7 +4756,7 @@ msgstr ""
 "\n"
 "¿Desexa continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4754,34 +4767,34 @@ msgstr ""
 "\n"
 "¿Desexa continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:924
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "Erro ó copiar."
 
-#: libnautilus-extensions/nautilus-file-operations.c:927
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "Erro ó mover."
 
-#: libnautilus-extensions/nautilus-file-operations.c:930
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "Erro ó ligar."
 
-#: libnautilus-extensions/nautilus-file-operations.c:935
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "Erro ó borrar."
 
-#: libnautilus-extensions/nautilus-file-operations.c:960
-#: libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "Omitir"
 
-#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Retentar"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1057
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4790,7 +4803,7 @@ msgid ""
 "If you still want to move \"%s\", rename it and try again."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1063
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4799,11 +4812,11 @@ msgid ""
 "If you still want to copy \"%s\", rename it and try again."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "Non se pode substituír o ficheiro."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1081
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4814,22 +4827,22 @@ msgstr ""
 "\n"
 "¿Desexa sobrescribilo?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1092
-#: libnautilus-extensions/nautilus-file-operations.c:1106
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "Conflicto ó copiar"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Substituír"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Substituír todos"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1160
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "outra ligazón a %s"
@@ -4838,25 +4851,25 @@ msgstr "outra ligazón a %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dª ligazón a %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1180
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dª ligazón a %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1184
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%dª ligazón a %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dª ligazón a %s"
@@ -4866,235 +4879,227 @@ msgstr "%dª ligazón a %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (copia)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (outra copia)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1212
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr "ª copia)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr "ª copia)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1216
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr "ª copia)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr "ª copia)"
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (copia)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (outra copia)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1232
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dª copia)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1234
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dª copia)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1236
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%dª copia)%s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dª copia)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1322
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1330
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1487
-#: libnautilus-extensions/nautilus-file-operations.c:2072
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus %d descoñecido"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1802
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "Movendo ficheiros ó lixo"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1804
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr "Ficheiros eliminados:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1821
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "Movendo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1807
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "Preparando para mover ó lixo..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1817
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "Movendo ficheiros"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "Ficheiros movidos:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1822
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "Preparando para mover..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "Acabando de mover..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "Creando ligazóns ós ficheiros"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1837
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "Ficheiros ligados:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1839
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "Ligando"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "Preparando para crear ligazóns..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "Acabando de crear ligazóns..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1848
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "Copiando ficheiros"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "Ficheiros copiados:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "Copiando"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "Preparando para copiar..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "Non pode copiar elementos ó lixo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "Non se pode copiar ó lixo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1899
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "O lixo ten que ficar no escritorio."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "Non pode mover este cartafol do lixo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1902
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "Non pode copiar ó lixo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1903
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "Non pode copiar este cartafol de lixo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1905
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Non se pode alterar a localización do lixo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1906
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Non se pode copiar o lixo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1929
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "Non se pode mover un cartafol a si mesmo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1930
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "Non se pode copiar un cartafol a si mesmo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1932
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "Non se pode mover a si mesmo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1933
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "Non se pode copiar a si mesmo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1946
-msgid "You cannot move a file onto itself."
-msgstr "Non pode mover un ficheiro sobre si mesmo."
-
-#: libnautilus-extensions/nautilus-file-operations.c:1947
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "Non pode copiar un ficheiro sobre si mesmo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1949
-msgid "Can't Move Onto Self"
-msgstr "Non se pode mover sobre si mesmo"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1950
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "Non se pode copiar sobre si mesmo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2001
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5104,7 +5109,7 @@ msgstr ""
 "\n"
 "Non ten permisos para escribir no destino."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2004
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5114,614 +5119,678 @@ msgstr ""
 "\n"
 "Non hai espacio no destino."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2007
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Erro \"%s\" creando o novo cartafol."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2011
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "Erro creando o novo cartafol"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2098
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "cartafol sen título"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2131
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "Borrando ficheiros"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2133
-#: libnautilus-extensions/nautilus-file-operations.c:2168
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "Ficheiros borrados:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2135
-#: libnautilus-extensions/nautilus-file-operations.c:2170
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Borrando"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2136
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "Preparando para borrar ficheiros..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2166
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Baleirando o lixo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2171
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Preparando para baleirar o lixo..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2202
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr "¿Está seguro de que quere borrar permanentemente os elementos do lixo?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2204
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "¿Borrar os contidos do lixo?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2205
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "Baleiro"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2243
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "chou"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2243
-#: libnautilus-extensions/nautilus-file-operations.c:2253
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "chou (copia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (copia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".chou.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".chou (copia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "chou chou"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "chou chou (copia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2247
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "chou.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2247
-#: libnautilus-extensions/nautilus-file-operations.c:2254
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "chou (copia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2248
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "chou chou.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2248
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "chou chou (copia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "chou chou.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "chou chou (copia).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "chou...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "chou.. (copia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "chou..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "chou... (copia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "chou. (copia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "chou. (outra copia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2253
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "chou (outra copia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2254
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "chou (outra copia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "chou (3ª copia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "chou (3ª copia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "chou chou (outra copia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "chou chou (3ª copia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr "chou (21ª copia)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr "chou (24ª copia)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr "chou (21ª copia).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr "chou (24ª copia).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "chou (21ª copia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
-#: libnautilus-extensions/nautilus-file-operations.c:2260
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "chou (22ª copia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "chou (21ª copia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
-#: libnautilus-extensions/nautilus-file-operations.c:2261
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "chou (22ª copia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2260
-#: libnautilus-extensions/nautilus-file-operations.c:2262
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "chou (23ª copia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2261
-#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "chou (23ª copia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2262
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "chou (24ª copia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2263
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "chou (24ª copia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "chou (25ª copia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "chou (25ª copia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "chou chou (24ª copia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "chou chou (25ª copia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "chou chou (24ª copia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "chou chou (25ª copia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "chou chou (100000000000000ª copia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
-#, c-format
-msgid "%ld of %ld"
-msgstr "%ld de %ld"
-
-#: libnautilus-extensions/nautilus-font-picker.c:96
-msgid "Normal"
-msgstr "Normal"
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (10th copy)"
+msgstr "chou (21ª copia)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:97
-#: libnautilus-extensions/nautilus-volume-monitor.c:516
-#: libnautilus-extensions/nautilus-volume-monitor.c:535
-msgid "Unknown"
-msgstr "Descoñecido"
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (11st copy)"
+msgstr "chou (21ª copia)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:103
-msgid "Bold"
-msgstr "Negra"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (10th copy).txt"
+msgstr "chou (21ª copia).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:104
-msgid "Book"
-msgstr "Libro"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (11st copy).txt"
+msgstr "chou (21ª copia).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:106
-msgid "Demibold"
-msgstr "Seminegra"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (11th copy)"
+msgstr "chou (21ª copia)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:107
-msgid "Light"
-msgstr "Lixeira"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (12nd copy)"
+msgstr "chou (22ª copia)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:113
-msgid "Italic"
-msgstr "Itálica"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (11th copy).txt"
+msgstr "chou (21ª copia).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:114
-msgid "Oblique"
-msgstr "Oblícua"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (12nd copy).txt"
+msgstr "chou (22ª copia).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:115
-msgid "Reverse Italic"
-msgstr "Itálica inversa"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (12th copy)"
+msgstr "chou (24ª copia)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:116
-msgid "Reverse Oblique"
-msgstr "Oblícua inversa"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (13rd copy)"
+msgstr "chou (3ª copia)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:123
-msgid "Condensed"
-msgstr "Condensada"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (12th copy).txt"
+msgstr "chou (25ª copia).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:124
-msgid "Semicondensed"
-msgstr "Semicondensada"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (13rd copy).txt"
+msgstr "chou (3ª copia).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:226
-msgid "Font"
-msgstr "Fonte"
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
+#, c-format
+msgid "%ld of %ld"
+msgstr "%ld de %ld"
 
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
 msgid "GConf Error"
 msgstr "Erro do GConf"
 
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:956
-msgid "fixed"
-msgstr "fixed"
-
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1427
-msgid "01/01/00, 01:00 AM"
-msgstr "01/01/00, 01:00"
-
-#: libnautilus-extensions/nautilus-glib-extensions.c:1428
-msgid "1/1/00, 1:00 AM"
-msgstr "1/1/00, 1:00"
-
-#: libnautilus-extensions/nautilus-glib-extensions.c:1429
-msgid " 1/ 1/00,  1:00 AM"
-msgstr " 1/ 1/00,  1:00"
-
 #. Constants
 #: libnautilus-extensions/nautilus-global-preferences.c:50
 msgid "Nautilus Preferences"
 msgstr "Preferencias do Nautilus"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:97
-msgid "current theme"
-msgstr "tema actual"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:100
-msgid "Open each file or folder in a separate window"
-msgstr "Abrir cada ficheiro ou cartafol nunha fiestra distinta"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:103
-msgid "Ask before emptying the Trash"
-msgstr "Preguntar antes de baleirar o lixo"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:106
-#: libnautilus-extensions/nautilus-global-preferences.c:597
-msgid "Click Behavior"
-msgstr "Comportamento do clic"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:109
-msgid "single"
-msgstr "simple"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:110
-msgid "Activate items with a single click"
-msgstr "Activar elementos cun clic simple"
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "sempre"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:114
-msgid "double"
-msgstr "dobre"
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "Sempre"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:115
-msgid "Activate items with a double click"
-msgstr "Activar elementos cun clic dobre"
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "só locais"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:119
-#: libnautilus-extensions/nautilus-global-preferences.c:604
-msgid "Executable Text Files"
-msgstr "Ficheiros de texto executables"
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "Só Ficheiros Locais"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:122
-msgid "launch"
-msgstr "lanzar"
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "nunca"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:123
-msgid "Execute files when they are clicked"
-msgstr "Executar os ficheiros ó premelos"
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "Nunca"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:127
-msgid "display"
-msgstr "visualizar"
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "Gráficos máis suaves"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:128
-msgid "Display files when they are clicked"
-msgstr "Visualizar os ficheiros ó premelos"
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "Usar gráficos máis suaves (pero máis lentos)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:132
-msgid "ask"
-msgstr "preguntar"
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "Fontes"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:133
-msgid "Ask each time"
-msgstr "Preguntar cada vez"
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+#, fuzzy
+msgid "Font for Icon view:"
+msgstr "Fábrica para a vista de música"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:143
-#: libnautilus-extensions/nautilus-global-preferences.c:725
-msgid "Show Text in Icons"
-msgstr "Mostrar texto nas iconas"
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:146
-#: libnautilus-extensions/nautilus-global-preferences.c:732
-msgid "Show Count of Items in Folders"
-msgstr "Mostrar a conta dos elementos nos cartafoles"
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "Vistas de iconas e lista"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:149
-#: libnautilus-extensions/nautilus-global-preferences.c:739
-msgid "Show Thumbnails for Image Files"
-msgstr "Mostrar unha reducción para os ficheiros de imaxe"
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
+msgstr ""
 
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:152
-#: libnautilus-extensions/nautilus-global-preferences.c:755
-msgid "Make Folder Appearance Details Public"
-msgstr "Facer que os detalles da aparencia do cartafol sexan públicos"
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:155
-#: libnautilus-extensions/nautilus-global-preferences.c:746
-msgid "Preview Sound Files"
-msgstr "Previsualizar os ficheiros de son"
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Use smoother (but slower) graphics"
-msgstr "Usar gráficos máis suaves (pero máis lentos)"
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
+msgstr "Apertura de novas fiestras"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Use this font family to display file names:"
-msgstr "Familia de fontes para mostrar os nomes de ficheiro:"
+#: libnautilus-extensions/nautilus-global-preferences.c:651
+msgid "Open each file or folder in a separate window"
+msgstr "Abrir cada ficheiro ou cartafol nunha fiestra distinta"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:167
+#: libnautilus-extensions/nautilus-global-preferences.c:658
 msgid "Display toolbar in new windows"
 msgstr "Amosar a barra de ferramentas nas novas fiestras"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:170
+#: libnautilus-extensions/nautilus-global-preferences.c:665
 msgid "Display location bar in new windows"
 msgstr "Amosar a barra de localización nas novas fiestras"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:173
+#: libnautilus-extensions/nautilus-global-preferences.c:672
 msgid "Display status bar in new windows"
 msgstr "Amosar a barra de estado nas novas fiestras"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:176
+#: libnautilus-extensions/nautilus-global-preferences.c:679
 msgid "Display sidebar in new windows"
 msgstr "Amosar a barra lateral nas novas fiestras"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:179
-msgid "Use Nautilus to draw the desktop"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "Comportamento do Lixo"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:183
-msgid "Enable fast search (indexes your hard drive)"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+#, fuzzy
+msgid "Ask before emptying the Trash or deleting files"
+msgstr "Preguntar antes de baleirar o lixo"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:186
-msgid "search type to do by default"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:189
-msgid "search by text"
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:190
-msgid "Search for files by file name only"
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:194
-msgid "search by text and properties"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:713
+msgid "single"
+msgstr "simple"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:195
-msgid "Search for files by file name and file properties"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:714
+msgid "Activate items with a single click"
+msgstr "Activar elementos cun clic simple"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:199
-msgid "Search Engine Location"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:717
+msgid "double"
+msgstr "dobre"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:718
+msgid "Activate items with a double click"
+msgstr "Activar elementos cun clic dobre"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:725
+msgid "launch"
+msgstr "lanzar"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:726
+msgid "Execute files when they are clicked"
+msgstr "Executar os ficheiros ó premelos"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:729
+msgid "display"
+msgstr "visualizar"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:730
+msgid "Display files when they are clicked"
+msgstr "Visualizar os ficheiros ó premelos"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:733
+msgid "ask"
+msgstr "preguntar"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:734
+msgid "Ask each time"
+msgstr "Preguntar cada vez"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "Comportamento do clic"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr "Ficheiros de texto executables"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr "Amosar/Agochar opcións"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:203
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr "Amosar os ficheiros agochados (o seu nome empeza por \".\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:206
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr "Amosar os ficheiros de backup (o seu nome termina en \"~\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:209
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:212
-msgid "Show only folders (no files) in the tree"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-global-preferences.c:215
-msgid "Can add Content"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+#, fuzzy
+msgid "Sorting Order"
+msgstr "Erro establecendo o dono"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:218
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:222
-#: libnautilus-extensions/nautilus-global-preferences.c:227
-#: src/file-manager/fm-properties-window.c:1519 src/nautilus-location-bar.c:62
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
 msgid "Location:"
 msgstr "Lugar:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:226
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+msgid "HTTP Proxy Settings"
+msgstr "Configuración do proxy HTTP"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "Usar Proxy HTTP"
 
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:228
+#: libnautilus-extensions/nautilus-global-preferences.c:812
 #: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr "Porto:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:533
-msgid "Appearance"
-msgstr "Aparencia"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:535
-msgid "Smoother Graphics"
-msgstr "Gráficos máis suaves"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "Marcadores integrados"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:552
-msgid "Windows & Desktop"
-msgstr "Fiestras e escritorio"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:560
-msgid "Opening New Windows"
-msgstr "Apertura de novas fiestras"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "Mostrar texto nas iconas"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:583
-msgid "Trash Behavior"
-msgstr "Comportamento do Lixo"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr "Mostrar a conta dos elementos nos cartafoles"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:595
-msgid "Icon & List Views"
-msgstr "Vistas de iconas e lista"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "Mostrar unha reducción para os ficheiros de imaxe"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:611
-msgid "Show/Hide Options"
-msgstr "Amosar/Agochar opcións"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:632
-msgid "Sidebar Panels"
-msgstr "Paneis laterais"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr "Previsualizar os ficheiros de son"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:635
-msgid "Tabs"
-msgstr "Pestanas"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr "Facer que os detalles da aparencia do cartafol sexan públicos"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "Aparencia"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr "Fiestras e escritorio"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr "Vistas de iconas e lista"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:957
 msgid "Navigation"
 msgstr "Navegación"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:693
-msgid "HTTP Proxy Settings"
-msgstr "Configuración do proxy HTTP"
+#: libnautilus-extensions/nautilus-global-preferences.c:962
+msgid "Speed Tradeoffs"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:712
-msgid "Built-in Bookmarks"
-msgstr "Marcadores integrados"
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:723
-msgid "Speed Tradeoffs"
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+msgid "Search for files by file name only"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:794
-msgid "Search"
-msgstr "Buscar"
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+msgid "Search for files by file name and file properties"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "Opcións de complexidade da busca"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:802
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 msgid "Fast Search"
 msgstr "Busca rápida"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:846
-msgid "Fonts"
-msgstr "Fontes"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1026
-#, c-format
-msgid "Display %s tab in sidebar"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1073
-msgid "always"
-msgstr "sempre"
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+msgid "Search Engine Location"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1074
-msgid "Always"
-msgstr "Sempre"
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Buscar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1077
-msgid "local only"
-msgstr "só locais"
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1078
-msgid "Local Files Only"
-msgstr "Só Ficheiros Locais"
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, c-format
+msgid "Display %s tab in sidebar"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1081
-msgid "never"
-msgstr "nunca"
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "Paneis laterais"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1082
-msgid "Never"
-msgstr "Nunca"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr "Pestanas"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1145
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "currently can't be performed because the program crond, which does nightly "
@@ -5729,13 +5798,13 @@ msgid ""
 "done, turn crond on."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1152
-#: libnautilus-extensions/nautilus-global-preferences.c:1170
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
 msgid "Files May Not Be Indexed"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1153
-#: libnautilus-extensions/nautilus-global-preferences.c:1171
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
 msgid ""
 "If you are running Linux, you can log in as root and type these commands to "
 "start cron:\n"
@@ -5744,7 +5813,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1162
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "may not be performed because the program crond, which does nightly tasks on "
@@ -5753,20 +5822,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-gnome-extensions.c:640
-msgid "No image was selected.  You must click on an image to select it."
-msgstr ""
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:641
-msgid "No selection made"
-msgstr ""
-
 #. The list of characters that cause line breaks can be localized.
 #: libnautilus-extensions/nautilus-icon-canvas-item.c:70
 msgid " -_,;.?/&"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:766
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
@@ -5776,7 +5837,7 @@ msgstr ""
 "deixar este elemento onde o deixou? Isto estragará a disposición manual "
 "almacenada."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:770
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
@@ -5786,7 +5847,7 @@ msgstr ""
 "deixar estes elementos onde os deixou? Isto estragará a disposición manual "
 "almacenada."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:776
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
@@ -5794,7 +5855,7 @@ msgstr ""
 "Esta carpeta usa colocación automática. ¿Quere trocar a colocación manual e "
 "deixar este elemento onde o deixou?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:779
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
@@ -5802,64 +5863,48 @@ msgstr ""
 "Esta carpeta usa colocación automática. ¿Quere trocar a colocación manual e "
 "deixar estes elementos onde os deixou?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:784
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "¿Trocar a Colocación Manual?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:785
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "Trocar"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "Renomear"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1551
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1552
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "Restaurar nome anterior"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1553
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1554
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Restaurar nome cambiado"
 
-#: libnautilus-extensions/nautilus-password-dialog.c:306
-msgid "Remember this password"
-msgstr "Lembrar este contrasinal"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:483
-msgid "times"
-msgstr "times"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:484
-msgid "courier"
-msgstr "courier"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:485
-msgid "lucida"
-msgstr "lucida"
-
-#: libnautilus-extensions/nautilus-preferences.c:76
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "Principiante"
 
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "Intermedio"
 
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:202
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "Caixa de Prefs"
 
@@ -5958,7 +6003,7 @@ msgid "Don't include in the menu for \"%s\" items"
 msgstr ""
 
 #: libnautilus-extensions/nautilus-program-chooser.c:1209
-#: src/file-manager/fm-list-view.c:2123
+#: src/file-manager/fm-list-view.c:2182
 #: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
@@ -6309,25 +6354,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Elementos que teñen \"medusa\" no nome e son cartafoles"
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr "Detalles"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr "Aviso"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr "Erro"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr "Cuestión"
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr "Buscando nos discos"
@@ -6336,7 +6362,7 @@ msgstr "Buscando nos discos"
 msgid "Nautilus is searching your disks for trash folders."
 msgstr "Nautilus está buscando nos discos os cartafoles de lixo."
 
-#: libnautilus-extensions/nautilus-trash-file.c:600
+#: libnautilus-extensions/nautilus-trash-file.c:725
 msgid "on the desktop"
 msgstr "no escritorio"
 
@@ -6370,47 +6396,44 @@ msgstr "Ver como %s"
 msgid "%s Viewer"
 msgstr "Visualizador de %s"
 
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+msgid "Unknown"
+msgstr "Descoñecido"
+
 #. Populate table with items we know localized names for.
-#: libnautilus-extensions/nautilus-volume-monitor.c:623
-#: libnautilus-extensions/nautilus-volume-monitor.c:1862
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr "Disquete"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:624
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:625
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
 msgid "Zip Drive"
 msgstr "Unidade Zip"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:646
-#: libnautilus-extensions/nautilus-volume-monitor.c:668
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 msgid "Audio CD"
 msgstr "CD Audio"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1547
-msgid "Mount Error"
-msgstr "Erro ó montar"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1549
-msgid "Unmount Error"
-msgstr "Erro ó desmontar"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1579
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr "está protexido para escritura, montando só para lectura"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1582
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "non é un dispositivo de bloques válido"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1583
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr "Non se atopou o medio"
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1587
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
@@ -6419,29 +6442,29 @@ msgstr ""
 "unidade."
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1591
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
 msgstr ""
-"O nautilus non puido montar o volume. Probablemente non hai ningún medio "
-"no dispositivo."
+"O nautilus non puido montar o volume. Probablemente non hai ningún medio no "
+"dispositivo."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1594
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr ""
-"tipo de sistema de ficheiros incorrecto, opción errónea, superbloque "
-"erróneo en"
+"tipo de sistema de ficheiros incorrecto, opción errónea, superbloque erróneo "
+"en"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1597
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
 msgstr ""
-"O Nautilus non puido montar a disqueteira. O disquete está probablemente "
-"nun formato que non pode ser montado."
+"O Nautilus non puido montar a disqueteira. O disquete está probablemente nun "
+"formato que non pode ser montado."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1600
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
@@ -6449,48 +6472,56 @@ msgstr ""
 "O Nautilus non puido montar o volume seleccionado. Probablemente está nun "
 "formato que non pode ser montado."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1605
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr "O Nautilus non puido montar a unidade de disquete seleccionada."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1607
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "O Nautilus non puido montar o volume seleccionado."
 
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1612
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr "O Nautilus non puido desmontar o volume seleccionado."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1764
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr "Erro ó montar"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr "Erro ó desmontar"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "Volume ISO 9660"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1779
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "Raíz"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1786
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Volume Ext2"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1801
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "Volume MSDOS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1816
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "Volume NFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1831
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
 msgid "ReiserFS Volume"
 msgstr "Volume ReiserFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1847
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
 msgid "UFS Volume"
 msgstr "Volume UFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1877
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "Volume descoñecido"
 
@@ -6498,31 +6529,65 @@ msgstr "Volume descoñecido"
 msgid "C_lear Text"
 msgstr "_Limpar texto"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "_Limpar texto"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "_Copiar texto"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "Copiar o texto seleccionado ó portarretallos"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "Cortar _texto"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+msgid "Cut _Text"
+msgstr "Cortar _texto"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "Cortar o texto seleccionado ó portarretallos"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:46
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "_Pegar texto"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "Pegar o texto almacenado no portarretallos"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "Eliminar o texto seleccionado sen colocalo no portarretallos"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:80
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "Seleccionar _Todos"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+msgid "Select _All"
+msgstr "Seleccionar _Todos"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "Seleccionar tódolos elementos desta fiestra"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "_Copiar texto"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:7
-msgid "_Cut Text"
-msgstr "C_ortar texto"
-
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:93
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "_Pegar texto"
 
@@ -6531,7 +6596,7 @@ msgstr "_Pegar texto"
 #. * to change it when we upgrade to GTK 2.0.
 #.
 #: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
-#: src/nautilus-window-menus.c:563
+#: src/nautilus-window-menus.c:610
 msgid "Nautilus"
 msgstr "Nautilus"
 
@@ -6547,79 +6612,110 @@ msgstr "Xestor de ficheiros e shell gráfica Nautilus"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:735
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr "Persoal de %s"
 
-#: src/file-manager/fm-desktop-icon-view.c:1021
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "Baleirar o lixo..."
 
-#: src/file-manager/fm-desktop-icon-view.c:1023
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "Baleirar o lixo"
 
-#: src/file-manager/fm-desktop-icon-view.c:1043
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "Desmontar volume"
 
-#: src/file-manager/fm-directory-view.c:474
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr ""
 "Isto abrirá %d fiestras separadas. ¿Está seguro de que quere facer isto?"
 
-#: src/file-manager/fm-directory-view.c:476
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "¿Abrir %d fiestras?"
 
-#: src/file-manager/fm-directory-view.c:1212
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr "¿Está seguro de que quere borrar \"%s\" permanentemente do lixo?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+"¿Está seguro de que quere eliminar permanentemente do lixo os %d elementos "
+"seleccionados?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Borrar"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Borrar"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+msgid "scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" seleccionado"
 
-#: src/file-manager/fm-directory-view.c:1214
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "1 cartafol seleccionado"
 
-#: src/file-manager/fm-directory-view.c:1217
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "%d cartafoles seleccionados"
 
-#: src/file-manager/fm-directory-view.c:1223
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr " (contendo 0 elementos)"
 
-#: src/file-manager/fm-directory-view.c:1225
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr " (contendo 1 elemento)"
 
-#: src/file-manager/fm-directory-view.c:1227
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr " (contendo %d elementos)"
 
-#: src/file-manager/fm-directory-view.c:1238
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" seleccionado (%s)"
 
-#: src/file-manager/fm-directory-view.c:1242
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d elementos seleccionados (%s)"
 
-#: src/file-manager/fm-directory-view.c:1249
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "outro elemento seleccionado (%s)"
 
-#: src/file-manager/fm-directory-view.c:1252
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d outros elementos seleccionados (%s)"
@@ -6631,7 +6727,7 @@ msgstr "%d outros elementos seleccionados (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1281
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -6640,7 +6736,7 @@ msgstr "%s%s, %s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1407
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
@@ -6649,18 +6745,17 @@ msgstr ""
 "O cartafol \"%s\" contén máis ficheiros dos que pode manexar o Nautilus. "
 "Algúns deles non serán mostrados."
 
-#: src/file-manager/fm-directory-view.c:1414
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "Demasiados ficheiros"
 
-#: src/file-manager/fm-directory-view.c:2623
+#: src/file-manager/fm-directory-view.c:2752
 #, c-format
 msgid ""
 "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
-msgstr ""
-"Non é posible mover \"%s\" ó lixo. ¿Quere borralo inmediatamente?"
+msgstr "Non é posible mover \"%s\" ó lixo. ¿Quere borralo inmediatamente?"
 
-#: src/file-manager/fm-directory-view.c:2628
+#: src/file-manager/fm-directory-view.c:2757
 #, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
@@ -6669,7 +6764,7 @@ msgstr ""
 "Non é posible mover ó lixo os %d elementos seleccionados. ¿Quere borralos "
 "inmediatamente?"
 
-#: src/file-manager/fm-directory-view.c:2632
+#: src/file-manager/fm-directory-view.c:2761
 #, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -6678,21 +6773,16 @@ msgstr ""
 "Non é posible mover ó lixo %d dos elementos seleccionados. ¿Quere borrar "
 "eses %d elementos inmediatamente?"
 
-#: src/file-manager/fm-directory-view.c:2640
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "¿Borrar inmediatamente?"
 
-#: src/file-manager/fm-directory-view.c:2641
-#: src/file-manager/fm-directory-view.c:2682
-msgid "Delete"
-msgstr "Borrar"
-
-#: src/file-manager/fm-directory-view.c:2671
+#: src/file-manager/fm-directory-view.c:2799
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr "¿Está seguro de que quere borrar \"%s\" permanentemente do lixo?"
 
-#: src/file-manager/fm-directory-view.c:2675
+#: src/file-manager/fm-directory-view.c:2803
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
@@ -6701,75 +6791,213 @@ msgstr ""
 "¿Está seguro de que quere eliminar permanentemente do lixo os %d elementos "
 "seleccionados?"
 
-#: src/file-manager/fm-directory-view.c:2681
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "¿Borrar do lixo"
 
-#: src/file-manager/fm-directory-view.c:2978
-#: src/file-manager/fm-directory-view.c:3018
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Usar \"%s\" para abrir o elemento seleccionado"
 
-#: src/file-manager/fm-directory-view.c:3220
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "Outras _aplicacións..."
+
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "Outras _aplicacións..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "Outro _visualizador..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "Outro _visualizador..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "Usar \"%s\" para abrir o elemento seleccionado"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "O Nautilus non puido montar o volume seleccionado."
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"Non é posible mover ó lixo os %d elementos seleccionados. ¿Quere borralos "
+"inmediatamente?"
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "Abrir nunha _nova fiestra"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open _in New Window"
 msgstr "Abrir nunha _nova fiestra"
 
-#: src/file-manager/fm-directory-view.c:3222
+#: src/file-manager/fm-directory-view.c:3959
 #, fuzzy, c-format
 msgid "Open _in %d New Windows"
 msgstr "Abrir en %d nova_s fiestras"
 
-#: src/file-manager/fm-directory-view.c:3248
-msgid "Delete all selected items permanently"
-msgstr "Borrar permanentemente tódolos elementos seleccionados"
-
-#: src/file-manager/fm-directory-view.c:3253
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "Borrar do _lixo..."
 
-#: src/file-manager/fm-directory-view.c:3254
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "Borrar do _lixo"
 
-#: src/file-manager/fm-directory-view.c:3258
-msgid "Move all selected items to the Trash"
-msgstr "Mover tódolos elementos seleccionados ó lixo"
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "Borrar permanentemente tódolos elementos seleccionados"
 
-#: src/file-manager/fm-directory-view.c:3262
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "Mover ó _lixo"
 
-#: src/file-manager/fm-directory-view.c:3292
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "Mover tódolos elementos seleccionados ó lixo"
+
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "Borrar"
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "Borrar"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "Crear _ligazóns"
 
-#: src/file-manager/fm-directory-view.c:3293
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "Crear _ligazón"
 
-#: src/file-manager/fm-directory-view.c:3311
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "_Baleirar o lixo..."
 
-#: src/file-manager/fm-directory-view.c:3312
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "_Baleirar o lixo"
 
-#: src/file-manager/fm-directory-view.c:3323
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "_Quitar a imaxe personalizada"
 
-#: src/file-manager/fm-directory-view.c:3324
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "_Quitar as imaxes personalizadas"
 
-#: src/file-manager/fm-directory-view.c:3477
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "_Ficheiro"
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u ficheiros"
+
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "_Copiar texto"
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "Copiando ficheiros"
+
+#: src/file-manager/fm-directory-view.c:4252
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
 "link in the Trash?"
@@ -6777,7 +7005,7 @@ msgstr ""
 "Non se pode usar esta ligazón, xa que non ten destino. ¿Quere pór esta "
 "ligazón no lixo?"
 
-#: src/file-manager/fm-directory-view.c:3480
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
@@ -6786,15 +7014,15 @@ msgstr ""
 "Non se pode usar esta ligazón, xa que o seu destino \"%s\" non existe. "
 "¿Quere pórr esta ligazón no lixo?"
 
-#: src/file-manager/fm-directory-view.c:3486
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "Ligazón estragada"
 
-#: src/file-manager/fm-directory-view.c:3487
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr "Eliminar"
 
-#: src/file-manager/fm-directory-view.c:3540
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
@@ -6803,35 +7031,35 @@ msgstr ""
 "\"%s\" é un ficheiro de texto executable. ¿Desexa executalo, ou visualizar "
 "os seus contidos"
 
-#: src/file-manager/fm-directory-view.c:3546
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr "¿Executar ou visualizar?"
 
-#: src/file-manager/fm-directory-view.c:3547
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "Executar"
 
-#: src/file-manager/fm-directory-view.c:3548
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "Visualizar"
 
-#: src/file-manager/fm-directory-view.c:3602
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
 msgstr ""
 "Non pode executar comandos nun sitio remoto por consideracións de seguridade."
 
-#: src/file-manager/fm-directory-view.c:3604
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "Non é posible executar ligazóns remotas"
 
-#: src/file-manager/fm-directory-view.c:3738
+#: src/file-manager/fm-directory-view.c:4513
 #, fuzzy, c-format
 msgid "Opening \"%s\""
 msgstr "Instalando \"%s\""
 
-#: src/file-manager/fm-directory-view.c:3744
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "¿Cancelar a apertura?"
 
@@ -6841,35 +7069,39 @@ msgid ""
 "You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "Non ten os permisos necesarios para ver os contidos de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:65
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Non foi posible visualizar tódolos contidos de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Erro visualizando o cartafol"
 
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "O nome \"%s\" xa está a ser usado neste cartafol. Utilice un nome diferente."
 
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
-msgstr ""
-"Non existe \"%s\" neste cartafol. ¿Se cadra foi movido ou borrado?"
+msgstr "Non existe \"%s\" neste cartafol. ¿Se cadra foi movido ou borrado?"
 
-#: src/file-manager/fm-error-reporting.c:109
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Non ten os permisos necesarios para renomear \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -6878,63 +7110,63 @@ msgstr ""
 "O nome \"%s\" non é válido porque contén o carácter \"/\". Utilice un nome "
 "diferente."
 
-#: src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "O nome \"%s\" non é válido. Utilice un nome diferente."
 
-#: src/file-manager/fm-error-reporting.c:124
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Non foi posible mudar o nome de \"%s\" porque está nun disco de só lectura"
 
-#: src/file-manager/fm-error-reporting.c:133
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Non foi posible renomear \"%s\" a \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:140
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "Erro ó renomear"
 
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Non ten os permisos necesarios para mudar o grupo de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Non foi posible mudar o grupo de \"%s\" porque está nun disco de só lectura"
 
-#: src/file-manager/fm-error-reporting.c:172
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Non foi posible mudar o grupo de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:176
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "Erro establecendo o grupo"
 
-#: src/file-manager/fm-error-reporting.c:198
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Non foi posible mudar o dono de \"%s\" porque está nun disco de só lectura"
 
-#: src/file-manager/fm-error-reporting.c:205
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Non foi posible mudar o dono de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "Erro establecendo o dono"
 
-#: src/file-manager/fm-error-reporting.c:230
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
@@ -6942,21 +7174,21 @@ msgstr ""
 "Non foi posible mudar os permisos de \"%s\" porque está nun disco de só "
 "lectura"
 
-#: src/file-manager/fm-error-reporting.c:237
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Non foi posible mudar os permisos de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "Erro establecendo os permisos"
 
-#: src/file-manager/fm-error-reporting.c:306
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Renomeando \"%s\" a \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:311
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "¿Cancelar o renomeamento?"
 
@@ -7013,79 +7245,79 @@ msgid ""
 "Choose the order for information to appear beneath icon names. More "
 "information appears as you zoom in closer."
 msgstr ""
-"Escolla a orde da información que aparece baixo os nomes das iconas. "
-"Aparece máis información a medida que se vai achegando."
+"Escolla a orde da información que aparece baixo os nomes das iconas. Aparece "
+"máis información a medida que se vai achegando."
 
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "polo _nome"
 
-#: src/file-manager/fm-icon-view.c:159
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "Manter as iconas ordenadas polo nome en ringleiras"
 
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "polo _tamaño"
 
-#: src/file-manager/fm-icon-view.c:166
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "Manter as iconas ordenadas polo tamaño en ringleiras"
 
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "polo ti_po"
 
-#: src/file-manager/fm-icon-view.c:173
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "Manter as iconas ordenadas polo tipo en ringleiras"
 
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "pola _data de modificación"
 
-#: src/file-manager/fm-icon-view.c:180
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Manter as iconas ordenadas pola data de modificación en ringleiras"
 
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "polos _emblemas"
 
-#: src/file-manager/fm-icon-view.c:187
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Manter as iconas ordenadas polos emblemas en ringleiras"
 
-#: src/file-manager/fm-icon-view.c:1230
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "_Restaurar os tamaños orixinais das iconas"
 
-#: src/file-manager/fm-icon-view.c:1231
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "_Restaurar o tamaño orixinal da icona"
 
-#: src/file-manager/fm-icon-view.c:1443
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "apuntando a \"%s\""
 
-#: src/file-manager/fm-list-view.c:2129
+#: src/file-manager/fm-list-view.c:2188
 #: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/file-manager/fm-list-view.c:2135
+#: src/file-manager/fm-list-view.c:2194
 #: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Tipo"
 
-#: src/file-manager/fm-list-view.c:2141
+#: src/file-manager/fm-list-view.c:2200
 #: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Data de modificación"
@@ -7142,120 +7374,126 @@ msgstr "(algúns contidos son ilexibles)"
 msgid "Contents:"
 msgstr "Contidos:"
 
-#: src/file-manager/fm-properties-window.c:1433
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "Básica"
 
-#: src/file-manager/fm-properties-window.c:1512
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/file-manager/fm-properties-window.c:1517
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: src/file-manager/fm-properties-window.c:1521
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "_Ligar aquí"
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
 msgstr "Tipo MIME:"
 
-#: src/file-manager/fm-properties-window.c:1527
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "Modificado:"
 
-#: src/file-manager/fm-properties-window.c:1530
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "Accedido:"
 
-#: src/file-manager/fm-properties-window.c:1539
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr "Seleccionar unha icona personalizada..."
 
-#: src/file-manager/fm-properties-window.c:1545
+#: src/file-manager/fm-properties-window.c:1558
 msgid "Remove Custom Icon"
 msgstr "Quitar a icona personalizada"
 
-#: src/file-manager/fm-properties-window.c:1873
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "Establecer o ID de usuario"
 
-#: src/file-manager/fm-properties-window.c:1878
+#: src/file-manager/fm-properties-window.c:1891
 msgid "Special Flags:"
 msgstr "Flags especiais:"
 
-#: src/file-manager/fm-properties-window.c:1881
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "Establecer o ID de grupo"
 
-#: src/file-manager/fm-properties-window.c:1883
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "Pegañento"
 
-#: src/file-manager/fm-properties-window.c:1909
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Permisos"
 
-#: src/file-manager/fm-properties-window.c:1915
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Vostede non é o dono, polo que non pode cambiar estes permisos."
 
-#: src/file-manager/fm-properties-window.c:1928
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "Dono do ficheiro:"
 
-#: src/file-manager/fm-properties-window.c:1937
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "Grupo do ficheiro:"
 
-#: src/file-manager/fm-properties-window.c:1955
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "Dono:"
 
-#: src/file-manager/fm-properties-window.c:1956
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "Grupo:"
 
-#: src/file-manager/fm-properties-window.c:1957
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "Outros:"
 
-#: src/file-manager/fm-properties-window.c:1976
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "Lectura"
 
-#: src/file-manager/fm-properties-window.c:1980
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "Escritura"
 
-#: src/file-manager/fm-properties-window.c:1984
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "Execución"
 
-#: src/file-manager/fm-properties-window.c:2035
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2036
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2037
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "Última modificación:"
 
-#: src/file-manager/fm-properties-window.c:2041
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Non foi posible determinar os permisos de \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2322
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr "Creando a fiestra de propiedades"
 
-#: src/file-manager/fm-properties-window.c:2422
+#: src/file-manager/fm-properties-window.c:2435
 msgid "Select an icon:"
 msgstr "Seleccione unha icona:"
 
@@ -7280,7 +7518,7 @@ msgstr ""
 "O servicio de busca Medusa non está dispoñible porque non está instalado."
 
 #: src/file-manager/fm-search-list-view.c:159
-#: src/file-manager/nautilus-indexing-info.c:405
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr "Servicio de busca non dispoñible"
 
@@ -7333,9 +7571,9 @@ msgid ""
 "Find can't access your index right now so a slower search will be performed "
 "that doesn't use the index."
 msgstr ""
-"Para facer unha busca rápida, requírese un índice dos ficheiros do "
-"sistema. Non é posible acceder neste intre a ese índice, polo que se "
-"realizará unha busca máis lenta que non o necesita."
+"Para facer unha busca rápida, requírese un índice dos ficheiros do sistema. "
+"Non é posible acceder neste intre a ese índice, polo que se realizará unha "
+"busca máis lenta que non o necesita."
 
 #: src/file-manager/fm-search-list-view.c:246
 msgid ""
@@ -7430,7 +7668,7 @@ msgstr ""
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
 #: src/file-manager/fm-search-list-view.c:360
-#: src/file-manager/nautilus-indexing-info.c:340
+#: src/file-manager/nautilus-indexing-info.c:342
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
@@ -7442,20 +7680,20 @@ msgid "Fast searches are not available on your computer"
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:373
-#: src/file-manager/nautilus-indexing-info.c:359
+#: src/file-manager/nautilus-indexing-info.c:361
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Fast search is disabled in your Search preferences, so no index is available."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:376
-#: src/file-manager/nautilus-indexing-info.c:345
-#: src/file-manager/nautilus-indexing-info.c:363
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
 msgid "Fast searches are not available on your computer."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:377
-#: src/file-manager/nautilus-indexing-info.c:364
+#: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
 "To enable fast search, open the Preferences menu and choose Preferences. "
 "Then select Search preferences and put a checkmark in the Enable Fast Search "
@@ -7509,7 +7747,7 @@ msgid "Change Desktop Background"
 msgstr "Cambiar o fondo do escritorio"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Delete all items in the Trash"
 msgstr "Borrar tódolos elementos do lixo"
 
@@ -7557,140 +7795,191 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Escolla outro visualizador para ver o elemento seleccionado"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-msgid "Create Link"
-msgstr "Crear ligazón"
+#, fuzzy
+msgid "Copy Files"
+msgstr "Copiando ficheiros"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "Crear un novo cartafol baleiro dentro deste cartafol"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "Crear unha ligazón simbólica para cada elemento seleccionado"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u ficheiros"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "Mover tódolos elementos seleccionados ó Lixo"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "Duplicar cada elemento seleccionado"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "Crear ligazón"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr "Mover tódolos elementos seleccionados ó Lixo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Move to Trash"
 msgstr "Mover ó Lixo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "Novo Cartafol"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "Abrir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid "Open Wit_h"
 msgstr "Abrir _con"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "Abrir con"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "Abrir cada elemento seleccionado nunha nova fiestra"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr "Abrir nunha nova fiestra"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Abrir o elemento seleccionado nesta fiestra"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "Outras aplicacións..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "Outro visualizador..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Other _Application..."
-msgstr "Outras _aplicacións..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "_Pegar texto"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-msgid "Other _Viewer..."
-msgstr "Outro _visualizador..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr "Quitar as imaxes personalizadas"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr "Quitar as imaxes personalizadas das iconas seleccionadas"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr "Quitar os patróns ou cores do fondo desta localización"
 
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "Restablecer o fondo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+msgid "Scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr "Seleccionar tódolos ficheiros"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Select _All Files"
 msgstr "Seleccionar _tódolos ficheiros"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "Seleccionar tódolos elementos desta fiestra"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr "Amosar as propiedades"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Show Trash"
 msgstr "Amosar o lixo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "Amosar as _propiedades"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "Show the contents of the Trash"
 msgstr "Amosar os contidos do lixo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "Ver ou modificar as propiedades dos elementos seleccionados"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "_Duplicar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_New Folder"
 msgstr "_Novo cartafol"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "_Pegar texto"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Show Trash"
 msgstr "_Amosar o lixo"
 
@@ -7851,8 +8140,8 @@ msgid ""
 "An attempt to reindex, caused an Internal Indexer Error.  Tell "
 "rebecka@eazel.com"
 msgstr ""
-"Unha tentativa de reindexar provocou un erro interno do indexador. "
-"Por favor, informe a rebecka@eazel.com"
+"Unha tentativa de reindexar provocou un erro interno do indexador. Por "
+"favor, informe a rebecka@eazel.com"
 
 #: src/file-manager/nautilus-indexing-info.c:194
 msgid "Reindexing Failed"
@@ -7867,7 +8156,7 @@ msgstr ""
 
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr "Estado da indexación"
 
@@ -7877,32 +8166,32 @@ msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr ""
-"Unha vez cada día, os ficheiros e os contidos textuais son indexados, "
-"de xeito que as buscas sexan máis rápidas."
+"Unha vez cada día, os ficheiros e os contidos textuais son indexados, de "
+"xeito que as buscas sexan máis rápidas."
 
 #: src/file-manager/nautilus-indexing-info.c:236
 #, c-format
 msgid "Your files were last indexed at %s"
 msgstr "Os ficheiros foron indexados por última vez o %s"
 
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "Actualizar agora"
 
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast.  Your files are currently being indexed."
 msgstr ""
-"Unha vez cada día, os ficheiros e os contidos textuais son indexados, "
-"de xeito que as buscas sexan máis rápidas. Neste intre os ficheiros están "
-"a ser indexados."
+"Unha vez cada día, os ficheiros e os contidos textuais son indexados, de "
+"xeito que as buscas sexan máis rápidas. Neste intre os ficheiros están a ser "
+"indexados."
 
-#: src/file-manager/nautilus-indexing-info.c:404
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "O servicio de busca Medusa non está dispoñible."
 
-#: src/file-manager/nautilus-indexing-info.c:426
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr "%H:%M, %x"
 
@@ -7969,8 +8258,8 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"Antes de executar o Nautilus, cre estes cartafoles, ou modifique os "
-"permisos de xeito que o Nautilus poida crealos."
+"Antes de executar o Nautilus, cre estes cartafoles, ou modifique os permisos "
+"de xeito que o Nautilus poida crealos."
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.oaf file. This has happened when you
@@ -8028,8 +8317,8 @@ msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
 "attempting to register the file manager view server."
 msgstr ""
-"Non é posible usar agora o Nautilus, por mor dun erro inesperado do OAF "
-"ó tentar rexistrar o servidor de vistas do xestor de ficheiros."
+"Non é posible usar agora o Nautilus, por mor dun erro inesperado do OAF ó "
+"tentar rexistrar o servidor de vistas do xestor de ficheiros."
 
 #: src/nautilus-application.c:463
 msgid ""
@@ -8037,9 +8326,9 @@ msgid ""
 "attempting to locate the factory.Killing oafd and restarting Nautilus may "
 "help fix the problem."
 msgstr ""
-"Non é posible usar agora o Nautilus, por mor dun erro inesperado do OAF "
-"ó tentar localizar a fábrica. Pode que o problema se resolva matando o "
-"oafd e reiniciando o Nautilus."
+"Non é posible usar agora o Nautilus, por mor dun erro inesperado do OAF ó "
+"tentar localizar a fábrica. Pode que o problema se resolva matando o oafd e "
+"reiniciando o Nautilus."
 
 #: src/nautilus-application.c:470
 #, fuzzy
@@ -8071,7 +8360,7 @@ msgstr "Marcadores"
 msgid "Location"
 msgstr "Lugar"
 
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:757
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -8226,7 +8515,7 @@ msgstr ""
 msgid "Turn fast search on when cron is enabled"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1028
+#: src/nautilus-first-time-druid.c:1027
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "currently can't be performed because the program crond, which does\n"
@@ -8240,7 +8529,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1036
+#: src/nautilus-first-time-druid.c:1035
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "may not be performed because the program crond, which does nightly tasks\n"
@@ -8254,7 +8543,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1123
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
 "Click Finish to launch Nautilus. You'll start with two\n"
 "Nautilus windows: one shows your home folder, and the\n"
@@ -8264,7 +8553,7 @@ msgid ""
 "We hope you enjoy Nautilus!"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1130
+#: src/nautilus-first-time-druid.c:1129
 msgid ""
 "Click Finish to launch Nautilus. You'll start with a\n"
 "window showing your home folder.\n"
@@ -8272,15 +8561,15 @@ msgid ""
 "We hope you enjoy Nautilus!"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1154
+#: src/nautilus-first-time-druid.c:1153
 msgid "Nautilus First Time Setup"
 msgstr "Configuración inicial do Nautilus"
 
-#: src/nautilus-first-time-druid.c:1184
+#: src/nautilus-first-time-druid.c:1183
 msgid "Welcome to Nautilus"
 msgstr "Benvido ó Nautilus"
 
-#: src/nautilus-first-time-druid.c:1186
+#: src/nautilus-first-time-druid.c:1185
 #, fuzzy
 msgid ""
 "Nautilus...\n"
@@ -8295,56 +8584,56 @@ msgstr ""
 "    É un gran xestor de ficheiros para o escritorio GNOME.\n"
 "    Fornece un xeito simple e intuitivo para acceder ós servicios de "
 "Internet.\n"
-"    É un ambiente de desenvolvemento extensible para os desenvolvedores "
-"de GNOME.\n"
+"    É un ambiente de desenvolvemento extensible para os desenvolvedores de "
+"GNOME.\n"
 "    Fornece unha plataforma"
 
 #. set up the final page
-#: src/nautilus-first-time-druid.c:1197
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "Finalizado"
 
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1210
+#: src/nautilus-first-time-druid.c:1209
 msgid "Choose Your User Level"
 msgstr "Escolla o seu nivel de usuario"
 
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1214
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr "Transición do GMC ó Nautilus"
 
 #. set up the `Launch Medusa' page
-#: src/nautilus-first-time-druid.c:1218
+#: src/nautilus-first-time-druid.c:1217
 msgid "Fast Searches"
 msgstr "Buscas rápidas"
 
 #. set up optional page to tell the user how to run cron
-#: src/nautilus-first-time-druid.c:1226
+#: src/nautilus-first-time-druid.c:1225
 msgid "The Cron Daemon"
 msgstr "O daemon cron"
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1231
+#: src/nautilus-first-time-druid.c:1230
 msgid "Checking Your Internet Connection"
 msgstr "Comprobando a conexión á Internet"
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1242
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "Actualizando o Nautilus..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1250
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "Configuración do proxy Web"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1325
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "Descodificando a actualización..."
 
-#: src/nautilus-first-time-druid.c:1342
+#: src/nautilus-first-time-druid.c:1341
 msgid "Update Complete. Click Next to Continue."
 msgstr "Actualización completa. Prema Seguinte para continuar."
 
@@ -8352,7 +8641,7 @@ msgstr "Actualización completa. Prema Seguinte para continuar."
 #. * doesn't exist. Arlo and I (jsh) and decided that the
 #. * best thing to do is silently fail
 #.
-#: src/nautilus-first-time-druid.c:1357
+#: src/nautilus-first-time-druid.c:1356
 msgid "No Update Available... Press Next to Continue."
 msgstr "Non hai actualización dispoñible... Prema Seguinte apra continuar."
 
@@ -8379,47 +8668,47 @@ msgstr "¿Desexa ver estes %d lugares en fiestras separadas?"
 msgid "View in Multiple Windows?"
 msgstr "¿Ver en múltiples fiestras?"
 
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr "Facer unha serie rápida de auto-comprobacións."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "Crear a fiestra inicial coa xeometría indicada."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "XEOMETRÍA"
 
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "Saír do Nautilus."
 
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "Reiniciar o Nautilus."
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check non se pode usar con URIs.\n"
 
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check non se pode usar con outras opcións.\n"
 
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit non se pode usar con URIs.\n"
 
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart non se pode usar con URIs.\n"
 
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry non se pode usar con máis dun URI.\n"
 
@@ -8552,8 +8841,7 @@ msgstr ""
 msgid ""
 "Sorry, but \"%s\" is an existing keyword.  Please choose a different name "
 "for it."
-msgstr ""
-"\"%s\" é unha palabra chave xa existente. Escolla un nome diferente."
+msgstr "\"%s\" é unha palabra chave xa existente. Escolla un nome diferente."
 
 #: src/nautilus-property-browser.c:1365
 #, c-format
@@ -8905,15 +9193,18 @@ msgid "View as List"
 msgstr "Ver como lista"
 
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+#, fuzzy
+msgid " _Advanced"
 msgstr " Avanzado"
 
 #: src/nautilus-shell-ui.xml.h:2
-msgid " Beginner"
+#, fuzzy
+msgid " _Beginner"
 msgstr " Principiante"
 
 #: src/nautilus-shell-ui.xml.h:3
-msgid " Intermediate"
+#, fuzzy
+msgid " _Intermediate"
 msgstr " Intermedio"
 
 #: src/nautilus-shell-ui.xml.h:4
@@ -8953,377 +9244,376 @@ msgid "Close this window"
 msgstr "Pechar esta fiestra"
 
 #: src/nautilus-shell-ui.xml.h:15
-msgid "Cut _Text"
-msgstr "Cortar _texto"
-
-#: src/nautilus-shell-ui.xml.h:17
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "Amosar unha fiestra que permite editar os marcadores deste menú"
 
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr "Amosar os créditos dos creadores do Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr "Amosar a axuda online do Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
 msgstr ""
-"Amosar os patróns, cores e emblemas que se poden usar para personalizar "
-"a aparencia"
+"Amosar os patróns, cores e emblemas que se poden usar para personalizar a "
+"aparencia"
 
-#: src/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:19
 msgid "Display quick reference pages for Nautilus"
 msgstr "Amosar as páxinas de referencia rápida do Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:22
+#: src/nautilus-shell-ui.xml.h:20
 msgid "Display release notes for Nautilus"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:23
+#: src/nautilus-shell-ui.xml.h:21
 msgid "Display support information for Nautilus and Eazel Services"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:24
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Display the latest contents of the current location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:25
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:24
 msgid "Edit various Nautilus preferences"
 msgstr "Editar diversas preferencias do Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "Buscar"
 
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr "_Esquecer a historia"
 
-#: src/nautilus-shell-ui.xml.h:29
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:32
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:33
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:442
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
 msgid "Hide Location _Bar"
 msgstr "Agochar a barra de _localización"
 
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:424
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
 msgid "Hide St_atus Bar"
 msgstr "Agochar barra de e_stado"
 
-#: src/nautilus-shell-ui.xml.h:36 src/nautilus-window-menus.c:430
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
 msgid "Hide _Sidebar"
 msgstr "Agochar a barra _lateral"
 
-#: src/nautilus-shell-ui.xml.h:37 src/nautilus-window-menus.c:436
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
 msgid "Hide _Toolbar"
 msgstr "Agochar a barra de _ferramentas"
 
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:37
 msgid "Nautilus Quick _Reference"
 msgstr "_Referencia rápida do Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:38
 msgid "Nautilus Release _Notes"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:39
 msgid "Nautilus User _Manual"
 msgstr "_Manual de usuario do Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "Nova fiestra"
 
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:41
 msgid "New _Window"
 msgstr "Nova _fiestra"
 
-#: src/nautilus-shell-ui.xml.h:44
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "Tamaño normal"
 
-#: src/nautilus-shell-ui.xml.h:45
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Abrir outra fiestra do Nautilus para a localización amosada"
 
-#: src/nautilus-shell-ui.xml.h:47
-msgid "Preferences..."
-msgstr "Preferencias..."
-
-#: src/nautilus-shell-ui.xml.h:48
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: src/nautilus-shell-ui.xml.h:49
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "Elimina o texto seleccionado sen colocalo no portarretallos"
-
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr "Buscar na World Wide Web"
 
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr "Buscar ficheiros neste ordenador"
 
-#: src/nautilus-shell-ui.xml.h:54
-msgid "Select _All"
-msgstr "Seleccionar _Todos"
-
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "Amosar os contidos co tamaño normal"
 
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "Amosar os contidos con menos detalle"
 
-#: src/nautilus-shell-ui.xml.h:58
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "Amosar os contidos con máis detalle"
 
-#: src/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:61
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:63
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "Desfacer o último cambio no texto"
 
-#: src/nautilus-shell-ui.xml.h:64
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "Arriba"
 
-#: src/nautilus-shell-ui.xml.h:65
-msgid "Use Advanced settings"
-msgstr "Usar opcións avanzadas"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:66
-msgid "Use Beginner settings"
-msgstr "Usar opcións de principante"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:67
-msgid "Use Intermediate settings"
-msgstr "Usar opcións Intermedias"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:63
 msgid "We_b Search"
 msgstr "Busca na _Web"
 
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "Busca na Web"
 
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "Achegar"
 
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "Afastar"
 
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "A_chegar"
 
-#: src/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "A_fastar"
 
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "_Acerca do Nautilus..."
 
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "_Engadir marcador"
 
-#: src/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "A_trás"
 
-#: src/nautilus-shell-ui.xml.h:77
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr "_Fondos e emblemas..."
 
-#: src/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "_Marcadores"
 
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "_Pechar a fiestra"
 
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:76
 msgid "_Customer Support"
 msgstr "Soporte ó _cliente"
 
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/nautilus-shell-ui.xml.h:83
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "_Editar os marcadores..."
 
-#: src/nautilus-shell-ui.xml.h:84
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "Preferencias..."
+
+#: src/nautilus-shell-ui.xml.h:80
 msgid "_Feedback"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:86 src/nautilus-window-menus.c:1352
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "_Buscar"
 
-#: src/nautilus-shell-ui.xml.h:87
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "A_diante"
 
-#: src/nautilus-shell-ui.xml.h:88
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "_Ir"
 
-#: src/nautilus-shell-ui.xml.h:89
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "A_xuda"
 
-#: src/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "_Inicio"
 
-#: src/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "Lugar"
+
+#: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr "Temas do Nautilus..."
 
-#: src/nautilus-shell-ui.xml.h:92
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "Tamaño _Normal"
 
-#: src/nautilus-shell-ui.xml.h:94
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "Preferencias"
+
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "_Actualizar"
 
-#: src/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:100
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "_Desfacer"
 
-#: src/nautilus-shell-ui.xml.h:101
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "_Subir un nivel"
 
-#: src/nautilus-shell-ui.xml.h:102
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "_Vista"
 
-#: src/nautilus-sidebar.c:659
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
 msgstr ""
 
-#: src/nautilus-sidebar.c:661
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "Máis dunha imaxe"
 
-#: src/nautilus-sidebar.c:680
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
 msgstr ""
 
-#: src/nautilus-sidebar.c:682
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "Só imaxes locais"
 
-#: src/nautilus-sidebar.c:687
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
 msgstr ""
 
-#: src/nautilus-sidebar.c:689
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "Só imaxes"
 
-#: src/nautilus-sidebar.c:1247
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "Abrir con %s"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1283
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "Abrir con..."
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1390
+#: src/nautilus-sidebar.c:1424
 msgid "  Empty Trash  "
 msgstr " Baleirar o lixo "
 
@@ -9414,16 +9704,16 @@ msgstr "Non foi posible eliminar o tema"
 msgid "No description available for the \"%s\" theme"
 msgstr "Non hai información dispoñible para o tema \"%s\""
 
-#: src/nautilus-window.c:584
+#: src/nautilus-window.c:637
 msgid "View as ..."
 msgstr "Ver como ..."
 
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1286
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "Ver como outro..."
 
-#: src/nautilus-window.c:1687
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "Pechar"
 
@@ -9437,52 +9727,52 @@ msgstr "Pechar"
 msgid "Preview Release %s: %s"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:812
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:823
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
 "view or go to a different location."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:834
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:993
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:997
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
 "happening, you might want to turn this panel off."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1002
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "O panel lateral fallou"
 
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr "Non se atopou \"%s\". Comprobe a ortografía e tente de novo."
 
-#: src/nautilus-window-manage-views.c:1223
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
 msgstr ""
 "\"%s\" non é unha localización válida. Comprobe a escrita e probe de novo."
 
-#: src/nautilus-window-manage-views.c:1237
+#: src/nautilus-window-manage-views.c:1245
 #, fuzzy, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -9491,44 +9781,44 @@ msgstr ""
 "Non foi posible amosar \"%s\", xa que Nautilus non pode manexar elementos do "
 "tipo \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, fuzzy, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr "Nautilus non pode amosar \"%s\"."
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1257
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 "Non foi posible amosar \"%s\", xa que Nautilus non pode manexar "
 "localizacións do tipo %s:."
 
-#: src/nautilus-window-manage-views.c:1263
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1268
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "Non foi posible mostrar \"%s\", porque o acceso foi denegado."
 
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1287
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
 "the spelling is correct and that your proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1287
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
 "proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1299
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -9536,58 +9826,58 @@ msgid ""
 "running."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1303
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "Busca non dispoñible"
 
-#: src/nautilus-window-manage-views.c:1307
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus non pode amosar \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1312
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr ""
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:313
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
 msgstr ""
 
-#: src/nautilus-window-menus.c:316
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr "¿Está seguro de que quere que o Nautilus esqueza os lugares visitados?"
 
-#: src/nautilus-window-menus.c:321
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "¿Esquecer a historia?"
 
-#: src/nautilus-window-menus.c:322
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "Esquecer"
 
-#: src/nautilus-window-menus.c:425
+#: src/nautilus-window-menus.c:466
 msgid "Show St_atus Bar"
 msgstr "Amosar a barra de e_stado"
 
-#: src/nautilus-window-menus.c:431
+#: src/nautilus-window-menus.c:472
 msgid "Show _Sidebar"
 msgstr "Amosar a barra _lateral"
 
-#: src/nautilus-window-menus.c:437
+#: src/nautilus-window-menus.c:478
 msgid "Show _Toolbar"
 msgstr "Amosar a barra de _ferramentas"
 
-#: src/nautilus-window-menus.c:443
+#: src/nautilus-window-menus.c:484
 msgid "Show Location _Bar"
 msgstr "Amosar a barra de _localización"
 
-#: src/nautilus-window-menus.c:494
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -9597,11 +9887,11 @@ msgstr "Preferencias"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:571
+#: src/nautilus-window-menus.c:618
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
-#: src/nautilus-window-menus.c:573
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -9618,38 +9908,34 @@ msgstr ""
 #. * bottom of the about box to give credit
 #. * to the translator(s)
 #.
-#: src/nautilus-window-menus.c:582
+#: src/nautilus-window-menus.c:629
 msgid "Translator Credits"
 msgstr "Créditos da traducción"
 
-#: src/nautilus-window-menus.c:752
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
 "this location from your list?"
 msgstr ""
 
-#: src/nautilus-window-menus.c:756
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr ""
 
-#: src/nautilus-window-menus.c:770
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "A localización \"%s\" xa non existe."
 
-#: src/nautilus-window-menus.c:771
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr ""
 
-#: src/nautilus-window-menus.c:840
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "Ir para o lugar indicado por este marcador"
 
-#: src/nautilus-window-menus.c:1351
-msgid "_Browse"
-msgstr "_Explorar"
-
 #: src/nautilus-window-toolbars.c:402
 msgid "Back"
 msgstr "Atrás"
@@ -9664,3 +9950,111 @@ msgstr "Adiante"
 #: src/nautilus-zoom-control.c:531
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
+
+#~ msgid "helvetica"
+#~ msgstr "helvetica"
+
+#~ msgid "_Fonts"
+#~ msgstr "_Fontes"
+
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "Non pode mover un ficheiro sobre si mesmo."
+
+#~ msgid "Can't Move Onto Self"
+#~ msgstr "Non se pode mover sobre si mesmo"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Bold"
+#~ msgstr "Negra"
+
+#~ msgid "Book"
+#~ msgstr "Libro"
+
+#~ msgid "Demibold"
+#~ msgstr "Seminegra"
+
+#~ msgid "Light"
+#~ msgstr "Lixeira"
+
+#~ msgid "Italic"
+#~ msgstr "Itálica"
+
+#~ msgid "Oblique"
+#~ msgstr "Oblícua"
+
+#~ msgid "Reverse Italic"
+#~ msgstr "Itálica inversa"
+
+#~ msgid "Reverse Oblique"
+#~ msgstr "Oblícua inversa"
+
+#~ msgid "Condensed"
+#~ msgstr "Condensada"
+
+#~ msgid "Semicondensed"
+#~ msgstr "Semicondensada"
+
+#~ msgid "Font"
+#~ msgstr "Fonte"
+
+#~ msgid "fixed"
+#~ msgstr "fixed"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00"
+
+#~ msgid "current theme"
+#~ msgstr "tema actual"
+
+#~ msgid "Use this font family to display file names:"
+#~ msgstr "Familia de fontes para mostrar os nomes de ficheiro:"
+
+#~ msgid "Remember this password"
+#~ msgstr "Lembrar este contrasinal"
+
+#~ msgid "times"
+#~ msgstr "times"
+
+#~ msgid "courier"
+#~ msgstr "courier"
+
+#~ msgid "lucida"
+#~ msgstr "lucida"
+
+#~ msgid "Details"
+#~ msgstr "Detalles"
+
+#~ msgid "Warning"
+#~ msgstr "Aviso"
+
+#~ msgid "Error"
+#~ msgstr "Erro"
+
+#~ msgid "Question"
+#~ msgstr "Cuestión"
+
+#~ msgid "_Cut Text"
+#~ msgstr "C_ortar texto"
+
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "Elimina o texto seleccionado sen colocalo no portarretallos"
+
+#~ msgid "Use Advanced settings"
+#~ msgstr "Usar opcións avanzadas"
+
+#~ msgid "Use Beginner settings"
+#~ msgstr "Usar opcións de principante"
+
+#~ msgid "Use Intermediate settings"
+#~ msgstr "Usar opcións Intermedias"
+
+#~ msgid "_Browse"
+#~ msgstr "_Explorar"
diff --git a/po/hu.po b/po/hu.po
index 04ea1ab8a..8351ff6e4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3,10 +3,15 @@
 # Szabolcs Ban <shooby@gnome.hu>
 # Emese Kovacs <emese@gnome.hu>
 # Andras Timar <timar@gnome.hu>
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus CVS-HEAD\n"
-"POT-Creation-Date: 2001-03-12 15:19+0100\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-03-12 15:35+01:00\n"
 "Last-Translator: Emese Kovacs <emese@gnome.hu>\n"
 "Language-Team: Hungarian <hu@gnome.hu>\n"
@@ -177,8 +182,8 @@ msgstr "Elõzõ"
 # libnautilus-extensions/nautilus-global-preferences.c:706
 # src/nautilus-shell-ui.xml.h:36
 #: components/help/converters/gnome-db2html2/gdb3html.c:721
-#: libnautilus-extensions/nautilus-global-preferences.c:686
-#: src/nautilus-shell-ui.xml.h:38
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "Kezdõlap"
 
@@ -407,16 +412,14 @@ msgstr "Kernel rutinok"
 # components/help/hyperbola-filefmt.c:675
 # libnautilus-extensions/nautilus-stock-dialogs.c:509
 #: components/help/hyperbola-filefmt.c:703
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
 msgid "Info"
 msgstr "GNU Infó"
 
-#: components/help/hyperbola-nav-tree.c:279
+#: components/help/hyperbola-nav-tree.c:310
 msgid "Introductory Documents:"
 msgstr "Bevezetõk:"
 
-#: components/help/hyperbola-nav-tree.c:293
+#: components/help/hyperbola-nav-tree.c:324
 msgid "Documents by Subject:"
 msgstr "Leírások tárgy alapján:"
 
@@ -510,7 +513,7 @@ msgstr "A Nautilus emlékezet-oldalpanele"
 
 # components/image-viewer/nautilus-image-view.c:675
 # components/image-viewer/nautilus-image-view.c:831
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "A Bonobo inicializálása sikertelen"
 
@@ -582,7 +585,7 @@ msgstr "A Content Loser nézet elpusztítása"
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "_Fájl"
 
@@ -688,7 +691,7 @@ msgstr "Sidebar Loser"
 # components/mozilla/mozilla-preferences.cpp:126
 # libnautilus-extensions/nautilus-gconf-extensions.c:80
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -700,7 +703,7 @@ msgstr ""
 # components/mozilla/mozilla-preferences.cpp:133
 # libnautilus-extensions/nautilus-gconf-extensions.c:84
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -1253,7 +1256,6 @@ msgstr "Oldies"
 
 # components/music/mpg123.c:32
 #: components/music/mpg123.c:32
-#: libnautilus-extensions/nautilus-font-picker.c:117
 msgid "Other"
 msgstr "Egyéb"
 
@@ -2055,10 +2057,10 @@ msgstr "Szünet"
 # libnautilus-extensions/nautilus-file-operations.c:979
 # src/nautilus-shell-ui.xml.h:54
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:945
-#: libnautilus-extensions/nautilus-file-operations.c:960
 #: libnautilus-extensions/nautilus-file-operations.c:979
-#: src/nautilus-shell-ui.xml.h:60
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Állj"
 
@@ -2120,24 +2122,6 @@ msgstr "Zenenézet factory"
 msgid "View as Music"
 msgstr "Zeneként"
 
-# libnautilus-extensions/nautilus-icon-factory.c:133
-#. FIXME: eventually, get this from preferences
-#. set up the default font
-#: components/notes/nautilus-notes.c:200
-#: components/text/nautilus-text-view.c:186
-#: libnautilus-extensions/nautilus-global-preferences.c:1118
-#: libnautilus-extensions/nautilus-icon-container.c:3332
-#: libnautilus-extensions/nautilus-icon-container.c:3333
-#: libnautilus-extensions/nautilus-icon-container.c:3334
-#: libnautilus-extensions/nautilus-icon-container.c:3335
-#: libnautilus-extensions/nautilus-icon-container.c:3336
-#: libnautilus-extensions/nautilus-icon-container.c:3337
-#: libnautilus-extensions/nautilus-icon-container.c:3338
-#: libnautilus-extensions/nautilus-preferences-item.c:482
-#: src/nautilus-sidebar-title.c:500
-msgid "helvetica"
-msgstr "helvetica"
-
 # components/notes/Nautilus_View_notes.oaf.in.h:1
 #: components/notes/Nautilus_View_notes.oaf.in.h:1
 msgid "Factory for annotation view"
@@ -2256,7 +2240,7 @@ msgstr "Keresési cgi megadása"
 #: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
 #: components/services/install/command-line/eazel-test-packsys.c:590
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "Hibakeresõ-kimenet mutatása"
 
@@ -2335,198 +2319,201 @@ msgstr "Az RPM argumentumai szükséges fájlok"
 msgid "Run Query"
 msgstr "Lekérdezés futtatása"
 
+# components/services/install/command-line/eazel-alt-install-corba.c:125
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
+msgid "Revert"
+msgstr "Visszaállítás"
+
 # components/services/install/command-line/eazel-alt-install-corba.c:126
-#. Disabled for 1.0
-#. {"revert", 'r', POPT_ARG_NONE, &arg_revert, 0, N_("Revert"), NULL},
-#: components/services/install/command-line/eazel-alt-install-corba.c:127
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr "Gyökér megadása"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:127
-#: components/services/install/command-line/eazel-alt-install-corba.c:128
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "Kiszolgáló megadása"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:128
-#: components/services/install/command-line/eazel-alt-install-corba.c:129
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
 msgid "Dont print too much, just problems and download"
 msgstr "Ne írjon ki túl sokat, csak a hibákat és indítsa a letöltést"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:129
-#: components/services/install/command-line/eazel-alt-install-corba.c:130
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr "SSL átnevezés"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:130
-#: components/services/install/command-line/eazel-alt-install-corba.c:131
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
 msgid "argument is a suite id"
 msgstr "az argumentum egy suite id"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:131
-#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "Tesztfuttatás"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:132
-#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr "Felhasználónév engedélyezése"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:133
 # components/services/install/lib/eazel-install-problem.c:969
-#: components/services/install/command-line/eazel-alt-install-corba.c:134
-#: components/services/install/lib/eazel-install-problem.c:1011
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "Frissítés engedélyezése"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:134
-#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "Bõbeszédû kimenet"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:136
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
 msgid "Install a specific package version"
 msgstr "Adott változat telepítése"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:159
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
 msgid "*** You cannot specify more then one protocol type.\n"
 msgstr "*** Nem adhatsz meg több mint egy protokoll-típust. \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:176
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
 msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:285
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, c-format
 msgid "File conflict checking %s...\n"
 msgstr "Fájlütközések ellenõrzése: %s ...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:299
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, c-format
 msgid "File uniqueness checking %s...\n"
 msgstr "Fájlegyediség ellenõrzése: %s ...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:313
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
 #, c-format
 msgid "Feature consistency checking %s...\n"
 msgstr "Konzisztenciaellenõrzés: %s ...\n"
 
 # components/services/install/lib/eazel-install-protocols.c:112
 # components/services/install/lib/eazel-install-protocols.c:250
-#: components/services/install/command-line/eazel-alt-install-corba.c:344
-#: components/services/install/lib/eazel-install-protocols.c:110
-#: components/services/install/lib/eazel-install-protocols.c:248
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
 #, c-format
 msgid "Downloading %s..."
 msgstr "%s letöltése folyamatban..."
 
 # components/services/install/lib/eazel-install-protocols.c:112
 # components/services/install/lib/eazel-install-protocols.c:250
-#: components/services/install/command-line/eazel-alt-install-corba.c:360
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
 msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
 msgstr "%s letöltése folyamatban... (%d/%d) = %d%% %.1f KB/s"
 
 # components/services/install/lib/eazel-install-protocols.c:112
 # components/services/install/lib/eazel-install-protocols.c:250
-#: components/services/install/command-line/eazel-alt-install-corba.c:368
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
 msgid "Downloading %s... (%d/%d) = %d%%"
 msgstr "%s letöltése folyamatban... (%d/%d) = %d%%"
 
 # components/services/install/lib/eazel-install-protocols.c:112
 # components/services/install/lib/eazel-install-protocols.c:250
-#: components/services/install/command-line/eazel-alt-install-corba.c:376
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
 #, c-format
 msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
 msgstr "%s letöltése folyamatban... (%d/%d) %.1f KB/s kész.      \n"
 
 # components/services/install/lib/eazel-install-protocols.c:112
 # components/services/install/lib/eazel-install-protocols.c:250
-#: components/services/install/command-line/eazel-alt-install-corba.c:381
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
 #, c-format
 msgid "Downloading %s... %3.1f KB/s Done\n"
 msgstr "%s letöltése folyamatban... %3.1f KB/s kész\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:409
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "%s telepítése (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:417
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "%s eltávolítása (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:439
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "%s telepítése (%d/%d), (%d/%d)b - (%d/%d) = %d%% kész\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:446
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "%s eltávolítása (%d/%d), (%d/%d)b - (%d/%d) = %d%% kész\n"
 
 # libnautilus-extensions/nautilus-program-chooser.c:1252
-#: components/services/install/command-line/eazel-alt-install-corba.c:454
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
 msgid "Done\n"
 msgstr "Kész\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:474
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
 #, c-format
 msgid "Download of %s FAILED\n"
 msgstr "%s letöltése sikertelen\n"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1314
-#: components/services/install/command-line/eazel-alt-install-corba.c:496
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
 #, c-format
 msgid "Package %s failed to uninstall.\n"
 msgstr "%s csomag eltávolítása sikertelen.\n"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1314
-#: components/services/install/command-line/eazel-alt-install-corba.c:498
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
 #, c-format
 msgid "Package %s failed to install.\n"
 msgstr "%s csomag telepítése sikertelen.\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:519
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
 #, c-format
 msgid "\t· Problem : %s\n"
 msgstr "\t· Probléma : %s\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:528
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
 #, c-format
 msgid "\t· Action : %s\n"
 msgstr "\t· Megoldás : %s\n"
 
 # components/services/vault/command-line/main.c:47
-#: components/services/install/command-line/eazel-alt-install-corba.c:571
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
 msgid "Cancelling operation\n"
 msgstr "Mûvelet megszakítása\n"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:641
-#: components/services/install/command-line/eazel-alt-install-corba.c:582
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
 #, c-format
 msgid "About to install a total of %d packages, %dKB\n"
 msgstr "Telepítésre kerül összesen %d csomag, %dKB\n"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:645
-#: components/services/install/command-line/eazel-alt-install-corba.c:586
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
 #, c-format
 msgid "About to uninstall a total of %d packages, %dKB\n"
 msgstr "Eltávolításra kerül összesen %d csomag, %dKB\n"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:649
-#: components/services/install/command-line/eazel-alt-install-corba.c:590
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
 #, c-format
 msgid "About to revert a total of %d packages, %d KB\n"
 msgstr "Visszaállításra kerül összesen %d csomag, %dKB\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:607
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
 #, c-format
 msgid "\t· %s and it's dependencies\n"
 msgstr "\t· %s és a függõségek\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:610
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
 #, c-format
 msgid "\t· %s\n"
 msgstr "\t· %s\n"
@@ -2536,7 +2523,7 @@ msgstr "\t· %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n) " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:638
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
 msgid "Save transaction report ? (y/n) "
 msgstr "Jelentés mentése a tranzakciókról? (i/n) "
 
@@ -2544,31 +2531,31 @@ msgstr "Jelentés mentése a tranzakciókról? (i/n) "
 #. I18N note: y is the letter for the word Yes. This is
 #. used in the response for a yes/no questions. Your translation
 #. must be 1 character only.
-#: components/services/install/command-line/eazel-alt-install-corba.c:649
-#: components/services/install/command-line/eazel-alt-install-corba.c:769
-#: components/services/install/command-line/eazel-alt-install-corba.c:811
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
 msgid "y"
 msgstr "i"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:670
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
 #, c-format
 msgid "Dependency : %s needs %s\n"
 msgstr "Függõség : %s igényli %s\n"
 
 #. I18N note: %s is a package name
-#: components/services/install/command-line/eazel-alt-install-corba.c:688
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
 #, c-format
 msgid "Package %s failed md5 check!\n"
 msgstr "%s csomag nem ment át az md5 ellenõrzésen!\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:690
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
 #, c-format
 msgid "\t· server MD5 checksum is %s\n"
 msgstr "\t· kiszolgáló MD5 azonosítója is %s\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:692
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
 #, c-format
 msgid "\t· actual MD5 checksum is %s\n"
 msgstr "\t· az itteni MD5 azonosító %s\n"
@@ -2578,7 +2565,7 @@ msgstr "\t· az itteni MD5 azonosító %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:758
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
 msgid "Continue? (y/n) "
 msgstr "Folytassam? (i/n) "
 
@@ -2587,47 +2574,47 @@ msgstr "Folytassam? (i/n) "
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:799
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
 msgid "Should I delete the RPM files? (y/n) "
 msgstr "Törölhetem az RPM fájlokat? (i/n) "
 
 # components/music/mpg123.c:51
-#: components/services/install/command-line/eazel-alt-install-corba.c:831
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
 msgid "Operation ok\n"
 msgstr "A mûvelet rendben van\n"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1319
-#: components/services/install/command-line/eazel-alt-install-corba.c:833
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
 msgid "Operation failed\n"
 msgstr "A mûvelet sikertelen\n"
 
 # components/rpmview/nautilus-rpm-view.c:285
 # components/services/install/nautilus-view/Nautilus_View_install.oaf.in.h:1
 # components/services/install/server/Trilobite_Service_install.oaf.in.h:2
-#: components/services/install/command-line/eazel-alt-install-corba.c:959
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
 msgid "Installing"
 msgstr "Telepítés"
 
 # components/rpmview/nautilus-rpm-view.c:310
-#: components/services/install/command-line/eazel-alt-install-corba.c:968
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
 msgid "Uninstalling"
 msgstr "Eltávolítás"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:983
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
 msgid "Only one operation at a time please."
 msgstr "Egyszerre csak egy mûveletet adhatsz meg."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:988
-#: components/services/install/command-line/eazel-alt-install-corba.c:996
-#: components/services/install/command-line/eazel-alt-install-corba.c:1040
-#: components/services/install/command-line/eazel-alt-install-corba.c:1047
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
 #, c-format
 msgid "%s: --help for usage\n"
 msgstr ""
 "%s: --help rövid segítséghez\n"
 "\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
 #, c-format
 msgid "Name         : %s\n"
 msgstr "Név         : %s\n"
@@ -2635,49 +2622,49 @@ msgstr "Név         : %s\n"
 # components/services/install/nautilus-view/nautilus-service-install-view.c:800
 # components/services/install/nautilus-view/nautilus-service-install-view.c:655
 # components/services/summary/nautilus-view/nautilus-summary-view.c:542
-#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
 #, c-format
 msgid "Version      : %s\n"
 msgstr "Változat     : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1014
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
 #, c-format
 msgid "Minor        : %s\n"
 msgstr "Alváltozat      : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
 #, c-format
 msgid "Size         : %d\n"
 msgstr "Méret        : %d\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
 #, c-format
 msgid "Arch         : %s\n"
 msgstr "Architektúra : %s\n"
 
 # components/rpmview/nautilus-rpm-view.c:240
-#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
 #, c-format
 msgid "Distribution : %s\n"
 msgstr "Disztribúció : %s\n"
 
 # components/rpmview/nautilus-rpm-view.c:373
-#: components/services/install/command-line/eazel-alt-install-corba.c:1019
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
 #, c-format
 msgid "Description  : %s\n"
 msgstr "Leírás       : %s\n"
 
 # components/services/install/lib/eazel-install-problem.c:882
-#: components/services/install/command-line/eazel-alt-install-corba.c:1021
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
 #, c-format
 msgid "Install root : %s\n"
 msgstr "Telepítés alapkönyvtára: %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1024
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
 msgid "Provides     : \n"
 msgstr "Szolgáltat   : \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1066
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
 #, c-format
 msgid "exit code %d\n"
 msgstr "kilépési érték: %d\n"
@@ -2696,74 +2683,80 @@ msgstr ""
 "szükséges"
 
 # components/services/install/command-line/eazel-test-softcat.c:43
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 msgid "Softcat server to connect to"
 msgstr "Softcat kiszolgáló, ahova csatlakozol"
 
 # components/services/install/command-line/eazel-test-softcat.c:44
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr "Másik CGI útvonal használata"
 
 # components/services/install/command-line/eazel-test-softcat.c:46
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr "Csatlakozás ammonite-n keresztül, softcat felhasználóként"
 
 # components/services/install/command-line/eazel-test-softcat.c:47
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 msgid "Number of times to try the request"
 msgstr "Újrapróbálkozások száma"
 
 # components/services/install/command-line/eazel-test-softcat.c:48
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr "Újrapróbálkozások közötti várakozás (usec-ban)"
 
 # components/services/install/command-line/eazel-test-softcat.c:49
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr "Keresés Eazel csomagazonosító alapján"
 
 # components/services/install/command-line/eazel-test-softcat.c:50
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+#, fuzzy
+msgid "Lookup package that features a feature/file"
 msgstr ""
 "Olyan csomag keresése ami a következõt szolgáltatja (szolgáltatás v. fájl)"
 
 # components/services/install/command-line/eazel-test-softcat.c:51
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr "Adott változatú csomag keresése"
 
 # components/services/install/command-line/eazel-test-softcat.c:52
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr "(--version -el) Használd a >= összehasonlítást"
 
 # components/services/install/command-line/eazel-test-softcat.c:53
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 msgid "use check function (for debugging)"
 msgstr "ellenõrzés használata (hibakereséshez)"
 
 # components/services/install/command-line/eazel-test-softcat.c:54
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 msgid "Show detailed sub-package info"
 msgstr "Részletes alcsomag-információ"
 
+#: components/services/install/command-line/eazel-test-softcat.c:66
+#, fuzzy
+msgid "enable funk parser"
+msgstr "Gyorskeresés engedélyezése"
+
 # components/services/install/lib/eazel-install-logic2.c:137
-#: components/services/install/lib/eazel-install-logic2.c:99
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "A letöltött fájl zárolása sikertelen"
 
 # components/services/install/lib/eazel-install-logic2.c:154
-#: components/services/install/lib/eazel-install-logic2.c:116
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "MD5 eltérés, a %s csomag lehet, hogy hamis"
 
 # src/nautilus-theme-selector.c:709
-#: components/services/install/lib/eazel-install-logic2.c:132
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, c-format
 msgid "No MD5 available for %s"
 msgstr "Nincs MD5 a következõhöz: %s"
@@ -2771,20 +2764,20 @@ msgstr "Nincs MD5 a következõhöz: %s"
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1259
 #. I18N note: "%is is ok" in the sense that %s=package name and the
 #. package is intact
-#: components/services/install/lib/eazel-install-logic2.c:327
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, c-format
 msgid "%s is ok"
 msgstr "%s rendben van?"
 
 # components/services/install/lib/eazel-install-logic2.c:408
-#: components/services/install/lib/eazel-install-logic2.c:433
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s %s-%s változat már telepítve van"
 
 # components/services/install/lib/eazel-install-logic.c:1508
 # components/services/install/lib/eazel-install-logic2.c:412
-#: components/services/install/lib/eazel-install-logic2.c:437
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s %s változata már telepítve van"
@@ -2793,53 +2786,54 @@ msgstr "%s %s változata már telepítve van"
 # components/services/install/lib/eazel-install-logic.c:1522
 # components/services/install/lib/eazel-install-logic2.c:421
 # components/services/install/lib/eazel-install-logic2.c:426
-#: components/services/install/lib/eazel-install-logic2.c:446
-#: components/services/install/lib/eazel-install-logic2.c:451
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr "%s frissít %s-%s változatról %s-%s változatra"
 
 # components/services/install/lib/eazel-install-logic2.c:435
-#: components/services/install/lib/eazel-install-logic2.c:460
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr "%s verziócsökkenést idéz elõ %s-%s változatról %s-%s változatra"
 
 # components/services/install/lib/eazel-install-logic2.c:440
-#: components/services/install/lib/eazel-install-logic2.c:465
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr "%s verziócsökkenést idéz elõ %s változatról %s változatra"
 
 # components/services/install/lib/eazel-install-logic2.c:494
-#: components/services/install/lib/eazel-install-logic2.c:518
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr "%s a következõ változatot telepíti: %s-%s"
 
 # components/services/install/lib/eazel-install-logic2.c:499
-#: components/services/install/lib/eazel-install-logic2.c:523
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr "%s a következõ változatot telepíti: %s"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:809
-#: components/services/install/lib/eazel-install-logic2.c:691
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, c-format
 msgid "Loading package info from file %s"
 msgstr "Csomaginformáció betöltése %s fájlból0..."
 
 # components/music/mpg123.c:33
 #. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
-#: components/services/install/lib/eazel-install-logic2.c:1008
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "ok"
 msgstr "rendben"
 
-#: components/services/install/lib/eazel-install-logic2.c:1008
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "not ok"
 msgstr "nincs rendben"
 
-#: components/services/install/lib/eazel-install-logic2.c:1174
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
 msgid "Checking dependencies for %s"
 msgstr "%s függõségeinek ellenõrzése"
@@ -2849,71 +2843,71 @@ msgstr "%s függõségeinek ellenõrzése"
 #. I18N note: both %s' are package names.
 #. related is in the sense that the two packages apparently
 #. are connected somehow, eg. foo and foo-devel
-#: components/services/install/lib/eazel-install-logic2.c:1798
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, c-format
 msgid "%s is related to %s"
 msgstr "%s és %s összetartozik"
 
-#: components/services/install/lib/eazel-install-logic2.c:1874
+#: components/services/install/lib/eazel-install-logic2.c:2090
 #, c-format
 msgid "updating %s to version %s-%s solves conflict"
 msgstr "%s frissítése %s-%s változatra megoldja a problémát"
 
-#: components/services/install/lib/eazel-install-logic2.c:1897
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
 msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr "az elérhetõ frissítés (%s %s-%s) nem oldja meg a problémát"
 
 # components/services/install/lib/eazel-install-logic2.c:1239
-#: components/services/install/lib/eazel-install-logic2.c:1905
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, c-format
 msgid "could not revive %s"
 msgstr "%s újraélesztése sikertelen"
 
-#: components/services/install/lib/eazel-install-logic2.c:2060
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
 msgid "file uniqueness checking %s"
 msgstr "fájlegyediség ellenõrzése: %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2081
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
 msgid "Duplicate file : %s occurs in %s and %s"
 msgstr "A %s fájl több csomagban elõfordul: %s és %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2093
-#: components/services/install/lib/eazel-install-logic2.c:2247
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
 msgid "... but it's ok, the packages are related"
 msgstr "... de ez rendben van, a csomagok rokoni kapcsolatban állnak"
 
-#: components/services/install/lib/eazel-install-logic2.c:2101
+#: components/services/install/lib/eazel-install-logic2.c:2324
 #, c-format
 msgid "(there were %d other conflicts)"
 msgstr "(még %d probléma van)"
 
-#: components/services/install/lib/eazel-install-logic2.c:2196
+#: components/services/install/lib/eazel-install-logic2.c:2419
 #, c-format
 msgid "file conflict checking %s"
 msgstr "fájlütközés ellenõrzése: %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2233
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
 msgid "file conflict : package %s already provides file %s also provided by %s"
 msgstr "fájlütközések: a(z) %s csomag tartalmazza ezt: %s, de %s is."
 
 #. the owner of this file is a package that we're upgrading, and the
 #. * new version no longer has this file, so everything's okay.
-#: components/services/install/lib/eazel-install-logic2.c:2243
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
 msgid "...but it is okay, we're upgrading %s and it ditched that file"
 msgstr ""
 "... de ez rendben van, %s csomagot frissítjük, ezzel megoldódik a probléma"
 
-#: components/services/install/lib/eazel-install-logic2.c:2335
+#: components/services/install/lib/eazel-install-logic2.c:2558
 #, c-format
 msgid "checking feature consistency of %s"
 msgstr "szolgáltatás-konzisztenciaellenõrzés: %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2403
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
 msgid ""
 "feature missing : %s breaks if %s is installed (feature %s would be lost"
@@ -2922,183 +2916,183 @@ msgstr ""
 "elvész"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1614
-#: components/services/install/lib/eazel-install-logic2.c:2482
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, c-format
 msgid "downloading %d packages"
 msgstr "%d csomag letöltése"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:133
 # components/services/install/lib/eazel-install-problem.c:969
-#: components/services/install/lib/eazel-install-logic2.c:2752
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, c-format
 msgid "will upgrade %s"
 msgstr "frissíteni fogja a következõt: %s"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:110
-#: components/services/install/lib/eazel-install-logic2.c:2755
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, c-format
 msgid "will downgrade %s"
 msgstr "csökkenteni fogja %s verzióját"
 
-#: components/services/install/lib/eazel-install-logic2.c:2758
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, c-format
 msgid "will install %s"
 msgstr "telepíteni fogja a következõt: %s"
 
 # components/rpmview/nautilus-rpm-view.c:310
-#: components/services/install/lib/eazel-install-logic2.c:2761
+#: components/services/install/lib/eazel-install-logic2.c:2960
 #, c-format
 msgid "will uninstall %s"
 msgstr "el fogja távolítani a következõt: %s"
 
 # components/services/install/lib/eazel-install-problem.c:312
 # components/services/install/lib/eazel-install-problem.c:315
-#: components/services/install/lib/eazel-install-logic2.c:2846
-#: components/services/install/lib/eazel-install-problem.c:335
-#: components/services/install/lib/eazel-install-problem.c:338
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
 #, c-format
 msgid "%s requires %s"
 msgstr "%s igényli a következõt: %s"
 
 # components/rpmview/nautilus-rpm-verify-window.c:207
-#: components/services/install/lib/eazel-install-logic2.c:3039
+#: components/services/install/lib/eazel-install-logic2.c:3238
 #, c-format
 msgid "failed %s"
 msgstr "sikertelen: %s"
 
 # components/services/install/lib/eazel-install-metadata.c:171
 # components/services/install/lib/eazel-install-metadata.c:171
-#: components/services/install/lib/eazel-install-metadata.c:171
+#: components/services/install/lib/eazel-install-metadata.c:174
 msgid "Could not set URLType from config file!"
 msgstr "URLType beállítása a konfig fájlból sikertelen!"
 
 # components/services/install/lib/eazel-install-object.c:581
 # components/services/install/lib/eazel-install-object.c:701
-#: components/services/install/lib/eazel-install-object.c:713
+#: components/services/install/lib/eazel-install-object.c:717
 msgid "Transactions are not stored, could not find home dir"
 msgstr ""
 "A tranzakciók nincsenek letárolva, mert a saját könyvtár nem található."
 
 # components/services/install/lib/eazel-install-object.c:729
-#: components/services/install/lib/eazel-install-object.c:741
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr "Tranzakciók tárolásának helye: %s"
 
 # components/services/install/lib/eazel-install-object.c:986
-#: components/services/install/lib/eazel-install-object.c:998
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "Csomaglista letöltése a távoli kiszolgálóról...\n"
 
 # components/services/install/lib/eazel-install-object.c:1002
-#: components/services/install/lib/eazel-install-object.c:1014
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "package-list.xml letöltése sikertelen!\n"
 
 # components/services/install/lib/eazel-install-object.c:1075
-#: components/services/install/lib/eazel-install-object.c:1087
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr ""
 "%s fájl írása sikertelen. Helyette az alapértelmezett naplóeszköz használata."
 
 # components/services/install/lib/eazel-install-object.c:1206
-#: components/services/install/lib/eazel-install-object.c:1218
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "Sikertelen telepítés"
 
 # components/services/install/lib/eazel-install-object.c:1252
-#: components/services/install/lib/eazel-install-object.c:1264
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "Sikertelen eltávolítás"
 
 # components/services/install/lib/eazel-install-object.c:1373
-#: components/services/install/lib/eazel-install-object.c:1387
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "Nem tudom a tranzakciós könyvtárat létrehozni: %s\n"
 
 # components/services/install/lib/eazel-install-object.c:1396
-#: components/services/install/lib/eazel-install-object.c:1410
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr "Tranzakció írása ide: %s"
 
 # components/services/install/lib/eazel-install-problem.c:141
-#: components/services/install/lib/eazel-install-problem.c:159
+#: components/services/install/lib/eazel-install-problem.c:163
 #, c-format
 msgid "%s was cancelled"
 msgstr "%s meg lett szakítva"
 
 # components/services/install/lib/eazel-install-problem.c:145
 # components/services/install/lib/eazel-install-problem.c:304
-#: components/services/install/lib/eazel-install-problem.c:164
-#: components/services/install/lib/eazel-install-problem.c:327
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
 msgid "%s is a source package, which is not yet supported"
 msgstr "%s forráscsomag. A forráscsomagok még nem támogatottak."
 
 # components/services/install/lib/eazel-install-problem.c:167
 # components/services/install/lib/eazel-install-problem.c:178
-#: components/services/install/lib/eazel-install-problem.c:178
-#: components/services/install/lib/eazel-install-problem.c:189
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
 #, c-format
 msgid "%s would break other packages"
 msgstr "%s elrontana más csomagokat"
 
 # components/services/install/lib/eazel-install-problem.c:170
-#: components/services/install/lib/eazel-install-problem.c:181
+#: components/services/install/lib/eazel-install-problem.c:185
 #, c-format
 msgid "%s would break"
 msgstr "%s elromlana"
 
 # components/services/install/lib/eazel-install-problem.c:176
-#: components/services/install/lib/eazel-install-problem.c:187
+#: components/services/install/lib/eazel-install-problem.c:191
 #, c-format
 msgid "%s would break %s"
 msgstr "%s elrontaná a következõt: %s"
 
 # components/services/install/lib/eazel-install-problem.c:182
-#: components/services/install/lib/eazel-install-problem.c:193
+#: components/services/install/lib/eazel-install-problem.c:197
 #, c-format
 msgid "%s is damaged"
 msgstr "%s megsérült"
 
 # components/services/install/lib/eazel-install-problem.c:187
-#: components/services/install/lib/eazel-install-problem.c:197
+#: components/services/install/lib/eazel-install-problem.c:201
 #, c-format
 msgid "%s requires %s, which could not be found on the server"
 msgstr "%s igényli a következõt: %s. Ez utóbbi nem található a kiszolgálón."
 
 # components/services/install/lib/eazel-install-problem.c:191
-#: components/services/install/lib/eazel-install-problem.c:200
-#, c-format
-msgid "%s could not be found on the server"
+#: components/services/install/lib/eazel-install-problem.c:204
+#, fuzzy, c-format
+msgid "%s for %s could not be found on the server"
 msgstr "%s nem található s kiszolgálón"
 
 # components/services/install/lib/eazel-install-problem.c:199
 # components/services/install/lib/eazel-install-problem.c:329
-#: components/services/install/lib/eazel-install-problem.c:208
-#: components/services/install/lib/eazel-install-problem.c:353
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr "%s már telepítve van"
 
 # components/services/install/lib/eazel-install-problem.c:230
-#: components/services/install/lib/eazel-install-problem.c:252
+#: components/services/install/lib/eazel-install-problem.c:259
 #, c-format
 msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr ""
 "%s, ami újabb, már telepítve van, és a verziócsökkentés nincs engedélyezve"
 
 # components/services/install/lib/eazel-install-problem.c:230
-#: components/services/install/lib/eazel-install-problem.c:256
+#: components/services/install/lib/eazel-install-problem.c:263
 #, c-format
 msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr "%s, ami régebbi, frissítésre szorul, de a frissítés nincs engedélyezve"
 
 # components/services/install/lib/eazel-install-problem.c:191
-#: components/services/install/lib/eazel-install-problem.c:346
+#: components/services/install/lib/eazel-install-problem.c:353
 #, c-format
 msgid "%s is not installed and could not be found on server"
 msgstr "%s nincs feltelepítve, és nem található a kiszolgálón"
@@ -3106,7 +3100,7 @@ msgstr "%s nincs feltelepítve, és nem található a kiszolgálón"
 # components/services/install/lib/eazel-install-problem.c:871
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:913
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr "Próbáld telepíteni %s újabb változatát"
@@ -3114,7 +3108,7 @@ msgstr "Próbáld telepíteni %s újabb változatát"
 # components/services/install/lib/eazel-install-problem.c:882
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:924
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr "Próbáld meg telepíteni a következõket: %s, %s."
@@ -3122,7 +3116,7 @@ msgstr "Próbáld meg telepíteni a következõket: %s, %s."
 # components/services/install/lib/eazel-install-problem.c:897
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:939
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr "Távolítsd el a következõt a rendszerbõl: %s."
@@ -3131,31 +3125,31 @@ msgstr "Távolítsd el a következõt a rendszerbõl: %s."
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:952
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr "Próbáld meg eltávolítani (--force kapcsolóval) a következõt: %s."
 
 # components/services/install/lib/eazel-install-problem.c:918
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:960
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr "A csomagadatbázis inkonzisztens."
 
 # components/services/install/lib/eazel-install-problem.c:966
-#: components/services/install/lib/eazel-install-problem.c:1008
+#: components/services/install/lib/eazel-install-problem.c:1015
 msgid "Continue with force"
 msgstr "Folytatás erõltetéssel"
 
 # components/services/install/lib/eazel-install-problem.c:972
-#: components/services/install/lib/eazel-install-problem.c:1014
+#: components/services/install/lib/eazel-install-problem.c:1021
 msgid "Allow downgrade"
 msgstr "Verziócsökkenés engedélyezése"
 
 # components/services/install/lib/eazel-install-protocols.c:125
 # components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:166
-#: components/services/install/lib/eazel-install-protocols.c:123
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:166
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
 #, c-format
 msgid "Could not open target file %s"
 msgstr "A %s célfájl megnyitása sikertelen"
@@ -3163,38 +3157,38 @@ msgstr "A %s célfájl megnyitása sikertelen"
 # components/services/install/lib/eazel-install-protocols.c:132
 # components/services/inventory/eazel-inventory-service.c:253
 # components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:92
-#: components/services/install/lib/eazel-install-protocols.c:130
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:92
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
 msgid "Could not create an http request !"
 msgstr "A http kérés létrehozása sikertelen!"
 
 # components/services/install/lib/eazel-install-protocols.c:139
 # components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:99
-#: components/services/install/lib/eazel-install-protocols.c:137
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:99
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
 msgid "Proxy: Invalid uri !"
 msgstr "Proxy: érvénytelen URI!"
 
 # components/services/install/lib/eazel-install-protocols.c:144
 # components/services/inventory/eazel-inventory-service.c:258
 # components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:105
-#: components/services/install/lib/eazel-install-protocols.c:142
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:105
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
 msgid "Invalid uri !"
 msgstr "Érvénytelen URI!"
 
 # components/services/install/lib/eazel-install-protocols.c:151
 # components/services/inventory/eazel-inventory-service.c:301
 # components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:115
-#: components/services/install/lib/eazel-install-protocols.c:149
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:115
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
 msgid "Could not prepare http request !"
 msgstr "A http kérés elõkészítése sikertelen!"
 
 # components/services/install/lib/eazel-install-protocols.c:156
 # components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:120
-#: components/services/install/lib/eazel-install-protocols.c:154
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:120
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
 msgid "Couldn't get async mode "
 msgstr "Aszinkron módba váltás sikertelen"
 
@@ -3202,225 +3196,225 @@ msgstr "Aszinkron módba váltás sikertelen"
 # components/services/install/lib/eazel-install-protocols.c:214
 # components/services/install/lib/eazel-install-protocols.c:230
 #. probably out of disk space
-#: components/services/install/lib/eazel-install-protocols.c:183
-#: components/services/install/lib/eazel-install-protocols.c:212
-#: components/services/install/lib/eazel-install-protocols.c:228
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, c-format
 msgid "DISK FULL: could not write %s"
 msgstr "MEGTELT A LEMEZ: %s írása sikertelen"
 
 # components/services/install/lib/eazel-install-protocols.c:191
 # components/services/install/lib/eazel-install-protocols.c:219
-#: components/services/install/lib/eazel-install-protocols.c:189
-#: components/services/install/lib/eazel-install-protocols.c:217
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
 msgid "Could not get request body!"
 msgstr "A törzs letöltése sikertelen!"
 
 # components/services/install/lib/eazel-install-protocols.c:204
-#: components/services/install/lib/eazel-install-protocols.c:202
+#: components/services/install/lib/eazel-install-protocols.c:208
 #, c-format
 msgid "HTTP error: %d %s"
 msgstr "HTTP hiba: %d %s"
 
 # components/services/install/lib/eazel-install-protocols.c:251
-#: components/services/install/lib/eazel-install-protocols.c:249
+#: components/services/install/lib/eazel-install-protocols.c:255
 msgid "FTP not supported yet"
 msgstr "Az FTP még nem támogatott"
 
 # components/services/install/lib/eazel-install-protocols.c:446
-#: components/services/install/lib/eazel-install-protocols.c:457
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, c-format
 msgid "Checking local file %s..."
 msgstr "Lokális fájl (%s) ellenõrzése..."
 
 # components/services/install/lib/eazel-install-protocols.c:567
-#: components/services/install/lib/eazel-install-protocols.c:578
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, c-format
 msgid "Failed to retrieve %s!"
 msgstr "Nem sikerült a következõt letölteni: %s"
 
 # components/services/install/lib/eazel-install-protocols.c:633
-#: components/services/install/lib/eazel-install-protocols.c:651
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, c-format
 msgid "Could not get an URL for %s"
 msgstr "A következõhöz nincs URL: %s"
 
 # components/services/install/lib/eazel-install-protocols.c:648
-#: components/services/install/lib/eazel-install-protocols.c:666
+#: components/services/install/lib/eazel-install-protocols.c:672
 msgid "Downloaded package does not have the correct name"
 msgstr "A letöltött csomagnak nem jó a neve."
 
 # components/services/install/lib/eazel-install-protocols.c:649
-#: components/services/install/lib/eazel-install-protocols.c:667
+#: components/services/install/lib/eazel-install-protocols.c:673
 #, c-format
 msgid "Package %s should have had name %s"
 msgstr "A %s csomag neve %s kellett volna legyen."
 
 # components/services/install/lib/eazel-install-protocols.c:676
-#: components/services/install/lib/eazel-install-protocols.c:695
+#: components/services/install/lib/eazel-install-protocols.c:701
 msgid "File download failed"
 msgstr "A fájl letöltése sikertelen"
 
 # components/services/install/lib/eazel-install-tests.c:33
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr "*** pkg dump eleje ***\n"
 
 # components/services/install/lib/eazel-install-tests.c:40
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr "*** pkg dump vége ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:157
-#: components/services/install/lib/eazel-install-xml-package-list.c:158
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 msgid "*** No package nodes! (cat has no children) ***"
 msgstr ""
 
 # components/services/install/lib/eazel-install-xml-package-list.c:159
 # components/services/install/lib/eazel-install-xml-package-list.c:167
 # components/services/install/lib/eazel-install-xml-package-list.c:182
-#: components/services/install/lib/eazel-install-xml-package-list.c:160
-#: components/services/install/lib/eazel-install-xml-package-list.c:168
-#: components/services/install/lib/eazel-install-xml-package-list.c:183
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 msgid "*** Bailing from package parse! ***"
 msgstr ""
 
 # components/services/install/lib/eazel-install-xml-package-list.c:165
-#: components/services/install/lib/eazel-install-xml-package-list.c:166
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
 msgid "*** No package nodes! ***"
 msgstr "*** Nincsenek csomag node-ok! ***"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:171
-#: components/services/install/lib/eazel-install-xml-package-list.c:172
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 msgid "*** Malformed package node!"
 msgstr "*** Rossz a csomag node-ok formátuma!"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:180
-#: components/services/install/lib/eazel-install-xml-package-list.c:181
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
 msgid "*** No depends nodes! ***"
 msgstr "*** Nincsenek \"depends\" node-ok ***"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:186
-#: components/services/install/lib/eazel-install-xml-package-list.c:187
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr "*** Rossz formátumú \"depends\" node-ok!"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:210
-#: components/services/install/lib/eazel-install-xml-package-list.c:211
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr "*** Ismeretlen node típus: '%s'"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:227
-#: components/services/install/lib/eazel-install-xml-package-list.c:228
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** A csomaglista fájlban nincs adat! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:232
-#: components/services/install/lib/eazel-install-xml-package-list.c:233
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** A CATEGORIES xmlnode nem található! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:233
-#: components/services/install/lib/eazel-install-xml-package-list.c:234
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr ""
 
 # components/services/install/lib/eazel-install-xml-package-list.c:239
-#: components/services/install/lib/eazel-install-xml-package-list.c:240
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** Nincsenek kategóriák! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:240
-#: components/services/install/lib/eazel-install-xml-package-list.c:241
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr ""
 
 # components/services/install/lib/eazel-install-xml-package-list.c:294
-#: components/services/install/lib/eazel-install-xml-package-list.c:295
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** A TRANSACTION xmlnodenem található! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:296
 # components/services/install/lib/eazel-install-xml-package-list.c:304
-#: components/services/install/lib/eazel-install-xml-package-list.c:297
-#: components/services/install/lib/eazel-install-xml-package-list.c:305
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr ""
 
 # components/services/install/lib/eazel-install-xml-package-list.c:302
-#: components/services/install/lib/eazel-install-xml-package-list.c:303
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** Nincsenek csomagok! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:338
-#: components/services/install/lib/eazel-install-xml-package-list.c:339
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** Nincsenek kategória node-ok! ***"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:342
-#: components/services/install/lib/eazel-install-xml-package-list.c:343
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** A CATEGORIES xmlnode nem található! ***"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:376
-#: components/services/install/lib/eazel-install-xml-package-list.c:377
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** Ismeretlen node: %s"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:466
-#: components/services/install/lib/eazel-install-xml-package-list.c:467
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** Hiba az xml csomaglista generálása közben! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:513
-#: components/services/install/lib/eazel-install-xml-package-list.c:514
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** Hiba a csomaglista olvasásakor! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:892
-#: components/services/install/lib/eazel-install-xml-package-list.c:909
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** Az osd xml-ben nincs adat! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:897
-#: components/services/install/lib/eazel-install-xml-package-list.c:914
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr ""
 
 # components/services/install/lib/eazel-install-xml-package-list.c:958
-#: components/services/install/lib/eazel-install-xml-package-list.c:990
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "Az XML értelmezése sikertelen (hossz %d)"
 
 # components/services/install/lib/eazel-package-system-rpm3.c:668
-#: components/services/install/lib/eazel-package-system-rpm3.c:763
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr "Megnyitott csomagadatbázis helye: %s"
 
 # components/services/install/lib/eazel-package-system-rpm3.c:673
-#: components/services/install/lib/eazel-package-system-rpm3.c:768
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr "A csomagadatbázis megnyitása sikertelen (hely: %s)"
 
 # components/services/install/lib/eazel-package-system-rpm3.c:696
-#: components/services/install/lib/eazel-package-system-rpm3.c:801
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr "Adatbázis lezárása (következõnek: %s) (nyitva)"
 
 # components/services/install/lib/eazel-package-system-rpm3.c:701
-#: components/services/install/lib/eazel-package-system-rpm3.c:806
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr "Adatbázis lezárása (következõnek: %s) (nincs nyitva)"
 
 # components/services/install/lib/eazel-package-system-rpm3.c:953
-#: components/services/install/lib/eazel-package-system-rpm3.c:1137
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr "%s megnyitása sikertelen"
@@ -3555,7 +3549,7 @@ msgstr "\"%s\" csomag telepítése."
 # components/services/install/nautilus-view/nautilus-service-install-view.c:791
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1088
 #: components/services/install-view/callbacks.c:407
-#: components/services/install-view/nautilus-service-install-view.c:897
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "\"%s\" telepítése"
@@ -3589,34 +3583,34 @@ msgid "Is this ok ?"
 msgstr "Jó ez így?"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1312
-#: components/services/install-view/callbacks.c:557
+#: components/services/install-view/callbacks.c:556
 msgid "Installation cancelled."
 msgstr "A telepítés megszakadt."
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:910
-#: components/services/install-view/callbacks.c:559
+#: components/services/install-view/callbacks.c:558
 msgid "This package has already been installed."
 msgstr "Ez a csomag már fel van telepítve."
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1316
-#: components/services/install-view/callbacks.c:561
-#: components/services/install-view/callbacks.c:658
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
 msgid "Installation complete."
 msgstr "A telepítésnek vége."
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1465
-#: components/services/install-view/callbacks.c:565
+#: components/services/install-view/callbacks.c:564
 msgid "Installation failed."
 msgstr "A telepítés sikertelen."
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1323
 #. some succeeded; some failed
-#: components/services/install-view/callbacks.c:569
+#: components/services/install-view/callbacks.c:568
 msgid "Some packages installed successfully:"
 msgstr "Egyes csomagok telepítése sikeres volt:"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1332
-#: components/services/install-view/callbacks.c:578
+#: components/services/install-view/callbacks.c:577
 msgid ""
 "\n"
 "Some packages failed:"
@@ -3625,21 +3619,21 @@ msgstr ""
 "Egyes csomagok nem mentek fel:"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1375
-#: components/services/install-view/callbacks.c:627
+#: components/services/install-view/callbacks.c:626
 msgid "Erase the RPM files?"
 msgstr "RPM fájlok törlése?"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1377
-#: components/services/install-view/callbacks.c:629
+#: components/services/install-view/callbacks.c:628
 msgid "Erase the leftover RPM files?"
 msgstr "A megmaradt RPM fájlok törlése?"
 
-#: components/services/install-view/callbacks.c:659
+#: components/services/install-view/callbacks.c:658
 msgid "Ok"
 msgstr "Ok"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1411
-#: components/services/install-view/callbacks.c:674
+#: components/services/install-view/callbacks.c:673
 msgid ""
 "A core package of Nautilus has been\n"
 "updated.  You should restart Nautilus.\n"
@@ -3728,34 +3722,34 @@ msgstr "Folytatás"
 # src/file-manager/fm-directory-view.c:3494
 #: components/services/install-view/forms.c:482
 #: libnautilus-extensions/nautilus-drag.c:493
-#: src/file-manager/fm-directory-view.c:3551
+#: src/file-manager/fm-directory-view.c:4326
 msgid "Cancel"
 msgstr "Mégse"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1151
-#: components/services/install-view/nautilus-service-install-view.c:419
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
 msgid "%s is in GNOME (footprint) > %s"
 msgstr "%s a következõ alatt található: GNOME (tappancs) > %s"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1151
-#: components/services/install-view/nautilus-service-install-view.c:437
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, c-format
 msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr "%s a GNOME tappancsmenüben található.\n"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1196
-#: components/services/install-view/nautilus-service-install-view.c:452
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
 msgid "%s is in the KDE menu.\n"
 msgstr "%s a KDE menüben található.\n"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1316
-#: components/services/install-view/nautilus-service-install-view.c:653
+#: components/services/install-view/nautilus-service-install-view.c:655
 msgid "Installation Complete"
 msgstr "A telepítésnek vége."
 
-#: components/services/install-view/nautilus-service-install-view.c:708
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
 msgid ""
 "%sTo start %s, click the Launch button below, or to create a shortcut, drag "
@@ -3766,39 +3760,39 @@ msgstr ""
 "munkafelületre."
 
 #. couldn't find an icon
-#: components/services/install-view/nautilus-service-install-view.c:716
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
 msgid "%sTo start %s, click the Launch button below."
 msgstr "%s%s elindításához kattints az Indítás gombra."
 
 # components/rpmview/nautilus-rpm-view-install.c:291
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1491
-#: components/services/install-view/nautilus-service-install-view.c:771
+#: components/services/install-view/nautilus-service-install-view.c:773
 msgid "Incorrect password."
 msgstr "Hibás jelszó."
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1496
-#: components/services/install-view/nautilus-service-install-view.c:776
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr "Azonosítás root felhasználóként"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1080
-#: components/services/install-view/nautilus-service-install-view.c:893
+#: components/services/install-view/nautilus-service-install-view.c:895
 msgid "Installing packages"
 msgstr "Csomagok telepítése"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1616
-#: components/services/install-view/nautilus-service-install-view.c:895
+#: components/services/install-view/nautilus-service-install-view.c:897
 msgid "Installing remote package"
 msgstr "Távoli csomag telepítése"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1620
-#: components/services/install-view/nautilus-service-install-view.c:899
+#: components/services/install-view/nautilus-service-install-view.c:901
 msgid "Installing some package"
 msgstr "Néhány csomag telepítése"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1637
-#: components/services/install-view/nautilus-service-install-view.c:916
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
@@ -3807,27 +3801,27 @@ msgstr ""
 "a telepítés nem fog sikerülni."
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1684
-#: components/services/install-view/nautilus-service-install-view.c:965
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr "Csatlakozás az Eazel Szoftverkatalógushoz..."
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1742
-#: components/services/install-view/nautilus-service-install-view.c:1023
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr "Jogosultságok ellenõrzése..."
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1813
-#: components/services/install-view/nautilus-service-install-view.c:1095
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr "Csomagletöltés megszakítása (kérlek várj)..."
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1833
-#: components/services/install-view/nautilus-service-install-view.c:1115
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "Csomagletöltés megszakítva."
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1834
-#: components/services/install-view/nautilus-service-install-view.c:1116
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "Megszakítva"
 
@@ -4164,13 +4158,13 @@ msgstr "Bejelentkezés a szolgáltatásokhoz"
 
 # components/services/summary/nautilus-view/nautilus-summary-dialogs.c:129
 #: components/services/summary/nautilus-summary-dialogs.c:131
-#: libnautilus-extensions/nautilus-password-dialog.c:269
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "Felhasználói név:"
 
 # components/services/summary/nautilus-view/nautilus-summary-dialogs.c:136
 #: components/services/summary/nautilus-summary-dialogs.c:138
-#: libnautilus-extensions/nautilus-password-dialog.c:276
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "Jelszó:"
 
@@ -4260,7 +4254,7 @@ msgstr "Szolgáltatások"
 msgid "Featured Downloads"
 msgstr "Extra letöltések"
 
-#: components/services/summary/nautilus-summary-view.c:883
+#: components/services/summary/nautilus-summary-view.c:884
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
 "unavailable right now, or your computer might be configured incorrectly. "
@@ -4271,7 +4265,7 @@ msgstr ""
 "gépeden rossz a hálózati beállítás. Vedd fel a kapcsolatot szakembereinkkel "
 "a support@eazel.com címen."
 
-#: components/services/summary/nautilus-summary-view.c:893
+#: components/services/summary/nautilus-summary-view.c:894
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -4279,13 +4273,13 @@ msgstr ""
 "Probléma van az adatokkal az Eazel kiszolgálóján. Lépj kapcsolatba "
 "szakembereinkkel az support@eazel.com címen."
 
-#: components/services/summary/nautilus-summary-view.c:916
+#: components/services/summary/nautilus-summary-view.c:917
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
 "contact support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:958
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
 "now, or your computer might be configured incorrectly. You could try again "
@@ -4295,18 +4289,18 @@ msgstr ""
 "kiszolgáló most nem elérhetõ, vagy a számÍtógépeden nincs jól beállÍtva a "
 "hálózat. Próbálkozz késõbb."
 
-#: components/services/summary/nautilus-summary-view.c:968
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
 "support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:985
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr "Rendszerleltár feltöltése sikertelen."
 
 # src/nautilus-first-time-druid.c:248 src/nautilus-first-time-druid.c:511
-#: components/services/summary/nautilus-summary-view.c:1048
+#: components/services/summary/nautilus-summary-view.c:1049
 #: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr "Eazel Szolgáltatások"
@@ -4386,20 +4380,20 @@ msgid "View as Summary"
 msgstr "Összefoglalóként"
 
 # components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:130
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:130
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
 #, c-format
 msgid "HTTP error %d \"%s\" on uri %s"
 msgstr "HTTP hiba %d \"%s\" a következõ URI-n: %s"
 
 # components/services/trilobite/libtrilobite/trilobite-core-utils.c:477
 # components/services/trilobite/libtrilobite/trilobite-core-utils.c:200
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:200
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo inicializálása sikertelen"
 
 # components/services/trilobite/libtrilobite/trilobite-core-utils.c:498
 # components/services/trilobite/libtrilobite/trilobite-core-utils.c:215
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:215
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr ""
@@ -4445,59 +4439,85 @@ msgid "Factory for the sample service"
 msgstr ""
 
 # components/text/nautilus-text-view.c:316
-#: components/text/nautilus-text-view.c:326
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr ""
 "Sajnálom, de %s túl nagy a Nautilusnak, nem tudja az egészet betölteni."
 
 # components/text/nautilus-text-view.c:317
-#: components/text/nautilus-text-view.c:329
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr "Túl nagy fájl"
 
-# components/text/nautilus-text-view-ui.xml.h:1
+# libnautilus-extensions/nautilus-global-preferences.c:534
 #: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "Betûkészletek"
+
+# components/text/nautilus-text-view-ui.xml.h:1
+#: components/text/nautilus-text-view-ui.xml.h:2
 msgid "Lucida"
 msgstr "Lucida"
 
 # components/text/nautilus-text-view-ui.xml.h:2
-#: components/text/nautilus-text-view-ui.xml.h:2
+#: components/text/nautilus-text-view-ui.xml.h:3
 msgid "Use the Courier Font"
 msgstr "Courier betûkészlet használata"
 
+# components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:4
+#, fuzzy
+msgid "Use the Fixed Font"
+msgstr "Times betûkészlet használata"
+
+# components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:5
+#, fuzzy
+msgid "Use the GTK System Font"
+msgstr "Times betûkészlet használata"
+
 # components/text/nautilus-text-view-ui.xml.h:3
-#: components/text/nautilus-text-view-ui.xml.h:3
+#: components/text/nautilus-text-view-ui.xml.h:6
 msgid "Use the Helvetica Font"
 msgstr "Helvetica betûkészlet használata"
 
 # components/text/nautilus-text-view-ui.xml.h:4
-#: components/text/nautilus-text-view-ui.xml.h:4
+#: components/text/nautilus-text-view-ui.xml.h:7
 msgid "Use the Lucida Font"
 msgstr "Lucida betûkészlet használata"
 
 # components/text/nautilus-text-view-ui.xml.h:5
-#: components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:8
 msgid "Use the Times Font"
 msgstr "Times betûkészlet használata"
 
 # components/text/nautilus-text-view-ui.xml.h:6
-#: components/text/nautilus-text-view-ui.xml.h:6
+#: components/text/nautilus-text-view-ui.xml.h:9
 msgid "_Courier"
 msgstr "_Courier"
 
-# components/text/nautilus-text-view-ui.xml.h:7
-#: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
-msgstr "_Betûkészletek"
+# components/loser/content/nautilus-content-loser-ui.xml.h:3
+# components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
+# components/sample/nautilus-sample-content-view-ui.xml.h:4
+# src/nautilus-shell-ui.xml.h:77
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "_Fájl"
+
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
 
 # components/text/nautilus-text-view-ui.xml.h:8
-#: components/text/nautilus-text-view-ui.xml.h:8
+#: components/text/nautilus-text-view-ui.xml.h:12
 msgid "_Helvetica"
 msgstr "_Helvetica"
 
 # components/text/nautilus-text-view-ui.xml.h:9
-#: components/text/nautilus-text-view-ui.xml.h:9
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr "_Times"
 
@@ -4585,7 +4605,7 @@ msgstr "Nautilus fanézet"
 # components/tree/Nautilus_View_tree.oaf.in.h:3
 # libnautilus-extensions/nautilus-global-preferences.c:635
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:638
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr "Fa"
 
@@ -4600,7 +4620,7 @@ msgid "Azul"
 msgstr ""
 
 # data/browser.xml.h:3
-#: data/browser.xml.h:3 libnautilus-extensions/nautilus-font-picker.c:105
+#: data/browser.xml.h:3
 msgid "Black"
 msgstr "Fekete"
 
@@ -4740,7 +4760,7 @@ msgid "Eclipse"
 msgstr ""
 
 # data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1592
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1607
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "Matricák"
 
@@ -4862,7 +4882,7 @@ msgstr "Számok"
 # data/browser.xml.h:55
 # libnautilus-extensions/nautilus-file-operations.c:1071
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "OK"
 
@@ -5014,16 +5034,16 @@ msgstr "A Gimp"
 # data/linksets/desktop.xml.h:1
 # libnautilus-extensions/nautilus-global-preferences.c:548
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:554
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "Munkaasztal"
 
 # data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4751
 # libnautilus-extensions/nautilus-trash-directory.c:301
 # src/file-manager/fm-desktop-icon-view.c:65
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4796
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
-#: src/file-manager/fm-desktop-icon-view.c:65
+#: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
 msgstr "Kuka"
 
@@ -5064,7 +5084,7 @@ msgstr "Google"
 
 # data/linksets/search_engines.xml.h:3
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:808
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "Keresõmotor"
 
@@ -5368,7 +5388,7 @@ msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2261
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr "ma %-I:%M %p"
 
@@ -5376,7 +5396,7 @@ msgstr "ma %-I:%M %p"
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2266
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr "tegnap %-I:%M %p"
 
@@ -5384,7 +5404,7 @@ msgstr "tegnap %-I:%M %p"
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2271
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%A %-m/%-d/%y, %-I:%M %p"
 
@@ -5392,54 +5412,54 @@ msgstr "%A %-m/%-d/%y, %-I:%M %p"
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2276
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%-m/%-d/%y, %-I:%M %p"
 
 # libnautilus-extensions/nautilus-file.c:3392
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 elem"
 
 # libnautilus-extensions/nautilus-file.c:3392
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr "0 mappa"
 
 # libnautilus-extensions/nautilus-file.c:3393
-#: libnautilus-extensions/nautilus-file.c:3408
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 fájl"
 
 # libnautilus-extensions/nautilus-file.c:3397
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 elem"
 
 # libnautilus-extensions/nautilus-file.c:3397
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr "1 mappa"
 
 # libnautilus-extensions/nautilus-file.c:3398
-#: libnautilus-extensions/nautilus-file.c:3413
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 fájl"
 
 # libnautilus-extensions/nautilus-file.c:3401
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "%u elem"
 
 # libnautilus-extensions/nautilus-file.c:3401
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr "%u mappa"
 
 # libnautilus-extensions/nautilus-file.c:3402
-#: libnautilus-extensions/nautilus-file.c:3417
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u fájl"
@@ -5447,24 +5467,24 @@ msgstr "%u fájl"
 # libnautilus-extensions/nautilus-file.c:3705
 # libnautilus-extensions/nautilus-file.c:3720
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3720
-#: libnautilus-extensions/nautilus-file.c:3735
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr "? elem"
 
 # libnautilus-extensions/nautilus-file.c:3711
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3726
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr "? bájt"
 
 # libnautilus-extensions/nautilus-file.c:3724
-#: libnautilus-extensions/nautilus-file.c:3739
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "ismeretlen típus"
 
 # libnautilus-extensions/nautilus-file.c:3726
-#: libnautilus-extensions/nautilus-file.c:3741
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "ismeretlen MIME-típus"
 
@@ -5472,17 +5492,17 @@ msgstr "ismeretlen MIME-típus"
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3746
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "ismeretlen"
 
 # libnautilus-extensions/nautilus-file.c:3767
-#: libnautilus-extensions/nautilus-file.c:3782
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr "program"
 
 # libnautilus-extensions/nautilus-file.c:3779
-#: libnautilus-extensions/nautilus-file.c:3794
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
@@ -5493,7 +5513,7 @@ msgstr ""
 "Nautilus nem találja meg."
 
 # libnautilus-extensions/nautilus-file.c:3783
-#: libnautilus-extensions/nautilus-file.c:3798
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
@@ -5503,7 +5523,7 @@ msgstr ""
 "mindenképpen mond el aaron@eazel.com -nak."
 
 # libnautilus-extensions/nautilus-file.c:3797
-#: libnautilus-extensions/nautilus-file.c:3812
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "link"
 
@@ -5513,31 +5533,31 @@ msgstr "link"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1156
-#: libnautilus-extensions/nautilus-file.c:3818
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr "link erre: %s"
 
 # libnautilus-extensions/nautilus-file.c:3817
-#: libnautilus-extensions/nautilus-file.c:3832
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr "link (törött)"
 
 # libnautilus-extensions/nautilus-file-operations.c:385
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "Forrás:"
 
 # libnautilus-extensions/nautilus-file-operations.c:400
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "Cél:"
 
 # libnautilus-extensions/nautilus-file-operations.c:588
-#: libnautilus-extensions/nautilus-file-operations.c:588
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -5549,7 +5569,7 @@ msgstr ""
 "\"%s\" nem helyezhetõ át, mert csak olvasható lemezen van."
 
 # libnautilus-extensions/nautilus-file-operations.c:599
-#: libnautilus-extensions/nautilus-file-operations.c:599
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -5562,7 +5582,7 @@ msgstr ""
 "\"%s\" nem törölhetõ, mert nincs jogod a szülõkönyvtárat módosítani."
 
 # libnautilus-extensions/nautilus-file-operations.c:605
-#: libnautilus-extensions/nautilus-file-operations.c:605
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -5574,7 +5594,7 @@ msgstr ""
 "\"%s\" nem törölhetõ, mert csak olvasható lemezen van."
 
 # libnautilus-extensions/nautilus-file-operations.c:636
-#: libnautilus-extensions/nautilus-file-operations.c:636
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -5588,7 +5608,7 @@ msgstr ""
 "szülõkönyvtárát."
 
 # libnautilus-extensions/nautilus-file-operations.c:636
-#: libnautilus-extensions/nautilus-file-operations.c:643
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -5602,7 +5622,7 @@ msgstr ""
 "szülõkönyvtárát."
 
 # libnautilus-extensions/nautilus-file-operations.c:667
-#: libnautilus-extensions/nautilus-file-operations.c:667
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -5614,7 +5634,7 @@ msgstr ""
 "\"%s\" nem másolható, mert nincs rá olvasási jogod."
 
 # libnautilus-extensions/nautilus-file-operations.c:689
-#: libnautilus-extensions/nautilus-file-operations.c:689
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -5626,7 +5646,7 @@ msgstr ""
 "A célfájl lemezén nincs elég hely."
 
 # libnautilus-extensions/nautilus-file-operations.c:694
-#: libnautilus-extensions/nautilus-file-operations.c:694
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -5638,7 +5658,7 @@ msgstr ""
 "A célfájl lemezén nincs elég hely."
 
 # libnautilus-extensions/nautilus-file-operations.c:698
-#: libnautilus-extensions/nautilus-file-operations.c:698
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -5650,7 +5670,7 @@ msgstr ""
 "A célterületen nincs elég hely."
 
 # libnautilus-extensions/nautilus-file-operations.c:710
-#: libnautilus-extensions/nautilus-file-operations.c:710
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -5659,7 +5679,7 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:714
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -5668,7 +5688,7 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:721
-#: libnautilus-extensions/nautilus-file-operations.c:721
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -5677,7 +5697,7 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:725
-#: libnautilus-extensions/nautilus-file-operations.c:725
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -5686,7 +5706,7 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:732
-#: libnautilus-extensions/nautilus-file-operations.c:732
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -5695,7 +5715,7 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:736
-#: libnautilus-extensions/nautilus-file-operations.c:736
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -5707,7 +5727,7 @@ msgstr ""
 "A céllemez csak olvasható."
 
 # libnautilus-extensions/nautilus-file-operations.c:765
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -5716,7 +5736,7 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:769
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -5725,7 +5745,7 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:773
-#: libnautilus-extensions/nautilus-file-operations.c:773
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -5734,7 +5754,7 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:779
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -5743,7 +5763,7 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:794
-#: libnautilus-extensions/nautilus-file-operations.c:794
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -5752,7 +5772,7 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:798
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -5761,7 +5781,7 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:802
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -5770,7 +5790,7 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:808
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -5779,22 +5799,22 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:924
-#: libnautilus-extensions/nautilus-file-operations.c:924
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "Hiba másoláskor."
 
 # libnautilus-extensions/nautilus-file-operations.c:927
-#: libnautilus-extensions/nautilus-file-operations.c:927
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "Hiba áthelyezéskor."
 
 # libnautilus-extensions/nautilus-file-operations.c:930
-#: libnautilus-extensions/nautilus-file-operations.c:930
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "Hiba kapocs létrehozásakoz."
 
 # libnautilus-extensions/nautilus-file-operations.c:935
-#: libnautilus-extensions/nautilus-file-operations.c:935
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "Hiba törléskor."
 
@@ -5802,20 +5822,20 @@ msgstr "Hiba törléskor."
 # libnautilus-extensions/nautilus-file-operations.c:979
 # libnautilus-extensions/nautilus-file-operations.c:1093
 # libnautilus-extensions/nautilus-file-operations.c:1107
-#: libnautilus-extensions/nautilus-file-operations.c:960
-#: libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "Mellõz"
 
 # libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Újra"
 
 # libnautilus-extensions/nautilus-file-operations.c:1057
-#: libnautilus-extensions/nautilus-file-operations.c:1057
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -5825,7 +5845,7 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:1063
-#: libnautilus-extensions/nautilus-file-operations.c:1063
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -5835,12 +5855,12 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:1071
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "A fájl helyettesítése sikertelen."
 
 # libnautilus-extensions/nautilus-file-operations.c:1081
-#: libnautilus-extensions/nautilus-file-operations.c:1081
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -5853,26 +5873,26 @@ msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:1092
 # libnautilus-extensions/nautilus-file-operations.c:1106
-#: libnautilus-extensions/nautilus-file-operations.c:1092
-#: libnautilus-extensions/nautilus-file-operations.c:1106
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "Ütközés másoláskor"
 
 # libnautilus-extensions/nautilus-file-operations.c:1093
 # libnautilus-extensions/nautilus-file-operations.c:1107
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Cserél"
 
 # libnautilus-extensions/nautilus-file-operations.c:1107
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Mindent cserél"
 
 # libnautilus-extensions/nautilus-file-operations.c:1160
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1160
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "még egy kapocs ehhez: %s"
@@ -5882,28 +5902,28 @@ msgstr "még egy kapocs ehhez: %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. kapocs ehhez: %s"
 
 # libnautilus-extensions/nautilus-file-operations.c:1180
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1180
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. kapocs ehhez: %s"
 
 # libnautilus-extensions/nautilus-file-operations.c:1184
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1184
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. kapocs ehhez: %s"
 
 # libnautilus-extensions/nautilus-file-operations.c:1188
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. kapocs ehhez: %s"
@@ -5915,102 +5935,102 @@ msgstr "%d. kapocs ehhez: %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (másolat)"
 
 # libnautilus-extensions/nautilus-file-operations.c:1210
 # libnautilus-extensions/nautilus-file-operations.c:2351
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (még egy másolat)"
 
 # libnautilus-extensions/nautilus-file-operations.c:1212
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1212
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr ". másolat)"
 
 # libnautilus-extensions/nautilus-file-operations.c:1214
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr ". másolat)"
 
 # libnautilus-extensions/nautilus-file-operations.c:1216
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1216
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr ". másolat)"
 
 # libnautilus-extensions/nautilus-file-operations.c:1218
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr ". másolat)"
 
 # libnautilus-extensions/nautilus-file-operations.c:1228
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (másolat)%s"
 
 # libnautilus-extensions/nautilus-file-operations.c:1230
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (még egy másolat)%s"
 
 # libnautilus-extensions/nautilus-file-operations.c:1232
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1232
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. másolat)%s"
 
 # libnautilus-extensions/nautilus-file-operations.c:1234
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1234
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. másolat)%s"
 
 # libnautilus-extensions/nautilus-file-operations.c:1236
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1236
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. másolat)%s"
 
 # libnautilus-extensions/nautilus-file-operations.c:1238
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. másolat)%s"
 
 # libnautilus-extensions/nautilus-file-operations.c:1322
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1322
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 # libnautilus-extensions/nautilus-file-operations.c:1330
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1330
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
 # libnautilus-extensions/nautilus-file-operations.c:1487
 # libnautilus-extensions/nautilus-file-operations.c:2066
-#: libnautilus-extensions/nautilus-file-operations.c:1487
-#: libnautilus-extensions/nautilus-file-operations.c:2072
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Ismeretlen GnomeVFSXferProgressStatus %d"
@@ -6018,14 +6038,14 @@ msgstr "Ismeretlen GnomeVFSXferProgressStatus %d"
 # libnautilus-extensions/nautilus-file-operations.c:1802
 # libnautilus-extensions/nautilus-file-operations.c:2195
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1802
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "Fájlok áthelyezése a kukába"
 
 # libnautilus-extensions/nautilus-file-operations.c:1804
 # libnautilus-extensions/nautilus-file-operations.c:2197
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1804
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr "Kidobott fájlok:"
 
@@ -6033,174 +6053,164 @@ msgstr "Kidobott fájlok:"
 # libnautilus-extensions/nautilus-file-operations.c:1821
 # libnautilus-extensions/nautilus-file-operations.c:2199
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1821
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "Áthelyezés"
 
 # libnautilus-extensions/nautilus-file-operations.c:1807
 # libnautilus-extensions/nautilus-file-operations.c:2200
-#: libnautilus-extensions/nautilus-file-operations.c:1807
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "Felkészülés a kukába való áthelyezésre..."
 
 # libnautilus-extensions/nautilus-file-operations.c:1817
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1817
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "Fájlok áthelyezése"
 
 # libnautilus-extensions/nautilus-file-operations.c:1819
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "Áthelyezett fájlok:"
 
 # libnautilus-extensions/nautilus-file-operations.c:1822
-#: libnautilus-extensions/nautilus-file-operations.c:1822
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "Felkészülés áthelyezésre..."
 
 # libnautilus-extensions/nautilus-file-operations.c:1823
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "Áthelyezés befejezése..."
 
 # libnautilus-extensions/nautilus-file-operations.c:1835
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "Kapcsok létrehozása"
 
 # libnautilus-extensions/nautilus-file-operations.c:1837
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1837
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "Kapcsolt fájlok:"
 
 # libnautilus-extensions/nautilus-file-operations.c:1839
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1839
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "Kapcsok létrehozása:"
 
 # libnautilus-extensions/nautilus-file-operations.c:1840
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "Kapcsok létrehozásának elõkészítése..."
 
 # libnautilus-extensions/nautilus-file-operations.c:1841
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "Kapcsok létrehozásának befejezése..."
 
 # libnautilus-extensions/nautilus-file-operations.c:1848
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1848
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "Fájlok másolása"
 
 # libnautilus-extensions/nautilus-file-operations.c:1850
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "Átmásolt fájlok:"
 
 # libnautilus-extensions/nautilus-file-operations.c:1852
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "Másolás alatt"
 
 # libnautilus-extensions/nautilus-file-operations.c:1853
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "Felkészülés a másolára..."
 
 # libnautilus-extensions/nautilus-file-operations.c:1871
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "Nem lehet elemeket a Kukába másolni."
 
 # libnautilus-extensions/nautilus-file-operations.c:1872
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "Nem lehet a Kukába másolni"
 
 # libnautilus-extensions/nautilus-file-operations.c:1899
 # libnautilus-extensions/nautilus-file-operations.c:2157
-#: libnautilus-extensions/nautilus-file-operations.c:1899
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "A Kuka a munkaasztalon kell maradjon."
 
 # libnautilus-extensions/nautilus-file-operations.c:1900
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "Nem lehet áthelyezni ezt a Kuka mappát."
 
 # libnautilus-extensions/nautilus-file-operations.c:1902
-#: libnautilus-extensions/nautilus-file-operations.c:1902
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "A Kukát nem lehet másolni."
 
 # libnautilus-extensions/nautilus-file-operations.c:1903
-#: libnautilus-extensions/nautilus-file-operations.c:1903
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "Nem lehet másolni ezt a Kuka mappát."
 
 # libnautilus-extensions/nautilus-file-operations.c:1905
 # libnautilus-extensions/nautilus-file-operations.c:2158
-#: libnautilus-extensions/nautilus-file-operations.c:1905
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Nem lehet a Kuka helyét megváltoztatni"
 
 # libnautilus-extensions/nautilus-file-operations.c:1906
-#: libnautilus-extensions/nautilus-file-operations.c:1906
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Nem lehet a Kukát másolni"
 
 # libnautilus-extensions/nautilus-file-operations.c:1923
-#: libnautilus-extensions/nautilus-file-operations.c:1929
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "Nem lehet egy mappát önmagába áthelyezni."
 
 # libnautilus-extensions/nautilus-file-operations.c:1924
-#: libnautilus-extensions/nautilus-file-operations.c:1930
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "Nem lehet egy mappát önmagára másolni."
 
 # libnautilus-extensions/nautilus-file-operations.c:1926
-#: libnautilus-extensions/nautilus-file-operations.c:1932
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "Nem lehet a Sajátba átmozgatni"
 
 # libnautilus-extensions/nautilus-file-operations.c:1927
-#: libnautilus-extensions/nautilus-file-operations.c:1933
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "Nem lehet a Sajátba másolni"
 
-# libnautilus-extensions/nautilus-file-operations.c:1940
-#: libnautilus-extensions/nautilus-file-operations.c:1946
-msgid "You cannot move a file onto itself."
-msgstr "Nem lehet a fájlt saját magára áthelyezni."
-
 # libnautilus-extensions/nautilus-file-operations.c:1941
-#: libnautilus-extensions/nautilus-file-operations.c:1947
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "Nem lehet a fájlt saját magára másolni."
 
-# libnautilus-extensions/nautilus-file-operations.c:1943
-#: libnautilus-extensions/nautilus-file-operations.c:1949
-msgid "Can't Move Onto Self"
-msgstr "Nem lehet az objektumot saját magára áthelyezni"
-
 # libnautilus-extensions/nautilus-file-operations.c:1944
-#: libnautilus-extensions/nautilus-file-operations.c:1950
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "Nem lehet az objektumot saját magára másolni"
 
 # libnautilus-extensions/nautilus-file-operations.c:1995
-#: libnautilus-extensions/nautilus-file-operations.c:2001
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -6211,7 +6221,7 @@ msgstr ""
 "Nincs jogod írni a célterületre."
 
 # libnautilus-extensions/nautilus-file-operations.c:1998
-#: libnautilus-extensions/nautilus-file-operations.c:2004
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -6219,769 +6229,840 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:2001
-#: libnautilus-extensions/nautilus-file-operations.c:2007
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:2005
-#: libnautilus-extensions/nautilus-file-operations.c:2011
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "Hiba új mappa létrehozása közben"
 
 # libnautilus-extensions/nautilus-file-operations.c:2092
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2098
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "névtelen mappa"
 
 # libnautilus-extensions/nautilus-file-operations.c:2240
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2131
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "Fájlok törlése folyamatban"
 
 # libnautilus-extensions/nautilus-file-operations.c:2242
 # libnautilus-extensions/nautilus-file-operations.c:2277
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2133
-#: libnautilus-extensions/nautilus-file-operations.c:2168
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "Törölt fájlok:"
 
 # libnautilus-extensions/nautilus-file-operations.c:2244
 # libnautilus-extensions/nautilus-file-operations.c:2279
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2135
-#: libnautilus-extensions/nautilus-file-operations.c:2170
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Törlés folyamatban"
 
 # libnautilus-extensions/nautilus-file-operations.c:2245
-#: libnautilus-extensions/nautilus-file-operations.c:2136
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "Felkészülés a fájlok törlésére..."
 
 # libnautilus-extensions/nautilus-file-operations.c:2275
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2166
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Kuka ürítése folyamatban"
 
 # libnautilus-extensions/nautilus-file-operations.c:2280
-#: libnautilus-extensions/nautilus-file-operations.c:2171
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Felkészülés a kuka ürítésére..."
 
 # libnautilus-extensions/nautilus-file-operations.c:2311
-#: libnautilus-extensions/nautilus-file-operations.c:2202
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr "Tényleg véglegesen törölni akarod a Kukában található elemeket?"
 
 # libnautilus-extensions/nautilus-file-operations.c:2313
-#: libnautilus-extensions/nautilus-file-operations.c:2204
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "Kuka tartalmának törlése?"
 
 # libnautilus-extensions/nautilus-file-operations.c:2314
-#: libnautilus-extensions/nautilus-file-operations.c:2205
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "Üres"
 
 # libnautilus-extensions/nautilus-file-operations.c:2352
-#: libnautilus-extensions/nautilus-file-operations.c:2243
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "foo"
 
 # libnautilus-extensions/nautilus-file-operations.c:2352
 # libnautilus-extensions/nautilus-file-operations.c:2362
-#: libnautilus-extensions/nautilus-file-operations.c:2243
-#: libnautilus-extensions/nautilus-file-operations.c:2253
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "foo (másolat)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2353
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
 # libnautilus-extensions/nautilus-file-operations.c:2353
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (másolat)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2354
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2354
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".foo (másolat).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2355
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "foo foo"
 
 # libnautilus-extensions/nautilus-file-operations.c:2355
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "foo foo (másolat)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2356
-#: libnautilus-extensions/nautilus-file-operations.c:2247
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "foo.txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2356
 # libnautilus-extensions/nautilus-file-operations.c:2363
-#: libnautilus-extensions/nautilus-file-operations.c:2247
-#: libnautilus-extensions/nautilus-file-operations.c:2254
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "foo (másolat).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2357
-#: libnautilus-extensions/nautilus-file-operations.c:2248
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2357
 # libnautilus-extensions/nautilus-file-operations.c:2377
-#: libnautilus-extensions/nautilus-file-operations.c:2248
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "foo foo (másolat).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2358
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2358
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (másolat).txt txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2359
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "foo...txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2359
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "foo.. (másolat).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2360
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "foo..."
 
 # libnautilus-extensions/nautilus-file-operations.c:2360
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "foo... (másolat)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2361
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "foo. (másolat)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2361
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "foo. (még egy másolat)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2362
 # libnautilus-extensions/nautilus-file-operations.c:2364
-#: libnautilus-extensions/nautilus-file-operations.c:2253
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "foo (még egy másolat)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2363
 # libnautilus-extensions/nautilus-file-operations.c:2365
-#: libnautilus-extensions/nautilus-file-operations.c:2254
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "foo (még egy másolat).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2364
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "foo (3. másolat)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2365
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "foo (3. másolat).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2366
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (még egy másolat).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2366
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3. másolat).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2367
-#: libnautilus-extensions/nautilus-file-operations.c:2258
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr "foo (21. másolat)"
+
+# libnautilus-extensions/nautilus-file-operations.c:2371
+# libnautilus-extensions/nautilus-file-operations.c:2373
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr "foo (24th copy)"
+
+# libnautilus-extensions/nautilus-file-operations.c:2368
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr "foo (21. másolat).txt"
+
+# libnautilus-extensions/nautilus-file-operations.c:2372
+# libnautilus-extensions/nautilus-file-operations.c:2374
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr "foo (24th copy).txt"
+
+# libnautilus-extensions/nautilus-file-operations.c:2367
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "foo (21. másolat)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2367
 # libnautilus-extensions/nautilus-file-operations.c:2369
-#: libnautilus-extensions/nautilus-file-operations.c:2258
-#: libnautilus-extensions/nautilus-file-operations.c:2260
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "foo (22. másolat)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2368
-#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "foo (21. másolat).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2368
 # libnautilus-extensions/nautilus-file-operations.c:2370
-#: libnautilus-extensions/nautilus-file-operations.c:2259
-#: libnautilus-extensions/nautilus-file-operations.c:2261
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "foo (22. másolat).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2369
 # libnautilus-extensions/nautilus-file-operations.c:2371
-#: libnautilus-extensions/nautilus-file-operations.c:2260
-#: libnautilus-extensions/nautilus-file-operations.c:2262
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "foo (23rd copy)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2370
 # libnautilus-extensions/nautilus-file-operations.c:2372
-#: libnautilus-extensions/nautilus-file-operations.c:2261
-#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "foo (23rd copy).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2371
 # libnautilus-extensions/nautilus-file-operations.c:2373
-#: libnautilus-extensions/nautilus-file-operations.c:2262
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "foo (24th copy)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2372
 # libnautilus-extensions/nautilus-file-operations.c:2374
-#: libnautilus-extensions/nautilus-file-operations.c:2263
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "foo (24th copy).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2373
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "foo (25th copy)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2374
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "foo (25th copy).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2375
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24th copy)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2375
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25th copy)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2376
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24th copy).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2376
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25th copy).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2377
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000. másolat).txt"
 
-# libnautilus-extensions/nautilus-file-operations-progress.c:345
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
-#, c-format
-msgid "%ld of %ld"
-msgstr "%ld / %ld"
-
-# src/nautilus-shell-ui.xml.h:39
-#: libnautilus-extensions/nautilus-font-picker.c:96
-msgid "Normal"
-msgstr "Normál"
+# libnautilus-extensions/nautilus-file-operations.c:2367
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (10th copy)"
+msgstr "foo (21. másolat)"
 
-# libnautilus-extensions/nautilus-file.c:3731
-#: libnautilus-extensions/nautilus-font-picker.c:97
-#: libnautilus-extensions/nautilus-volume-monitor.c:516
-#: libnautilus-extensions/nautilus-volume-monitor.c:535
-msgid "Unknown"
-msgstr "Ismeretlen"
+# libnautilus-extensions/nautilus-file-operations.c:2367
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (11st copy)"
+msgstr "foo (21. másolat)"
 
-# data/static_bookmarks.xml.h:1
-#: libnautilus-extensions/nautilus-font-picker.c:103
-msgid "Bold"
-msgstr "Kövér"
+# libnautilus-extensions/nautilus-file-operations.c:2368
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (10th copy).txt"
+msgstr "foo (21. másolat).txt"
 
-# components/music/mpg123.c:33
-#: libnautilus-extensions/nautilus-font-picker.c:104
-msgid "Book"
-msgstr "Könyv"
+# libnautilus-extensions/nautilus-file-operations.c:2368
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (11st copy).txt"
+msgstr "foo (21. másolat).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:106
-msgid "Demibold"
-msgstr "Félkövér"
+# libnautilus-extensions/nautilus-file-operations.c:2367
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (11th copy)"
+msgstr "foo (21. másolat)"
 
-# src/Nautilus_shell.oaf.in.h:3
-#: libnautilus-extensions/nautilus-font-picker.c:107
-msgid "Light"
-msgstr "Világos"
+# libnautilus-extensions/nautilus-file-operations.c:2367
+# libnautilus-extensions/nautilus-file-operations.c:2369
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (12nd copy)"
+msgstr "foo (22. másolat)"
 
-# components/mozilla/nautilus-mozilla-embed-extensions.cpp:318
-#: libnautilus-extensions/nautilus-font-picker.c:113
-msgid "Italic"
-msgstr "Kurzív"
+# libnautilus-extensions/nautilus-file-operations.c:2368
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (11th copy).txt"
+msgstr "foo (21. másolat).txt"
 
-# components/music/mpg123.c:31
-#: libnautilus-extensions/nautilus-font-picker.c:114
-msgid "Oblique"
-msgstr "Hamis kurzív"
+# libnautilus-extensions/nautilus-file-operations.c:2368
+# libnautilus-extensions/nautilus-file-operations.c:2370
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (12nd copy).txt"
+msgstr "foo (22. másolat).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:115
-msgid "Reverse Italic"
-msgstr "Fordított kurzív"
+# libnautilus-extensions/nautilus-file-operations.c:2371
+# libnautilus-extensions/nautilus-file-operations.c:2373
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (12th copy)"
+msgstr "foo (24th copy)"
 
-# src/file-manager/nautilus-icon-view-ui.xml.h:30
-#: libnautilus-extensions/nautilus-font-picker.c:116
-msgid "Reverse Oblique"
-msgstr "Fordított hamis kurzív"
+# libnautilus-extensions/nautilus-file-operations.c:2364
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (13rd copy)"
+msgstr "foo (3. másolat)"
 
-# src/file-manager/fm-properties-window.c:1085
-#: libnautilus-extensions/nautilus-font-picker.c:123
-msgid "Condensed"
-msgstr "Keskenyített"
+# libnautilus-extensions/nautilus-file-operations.c:2374
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (12th copy).txt"
+msgstr "foo (25th copy).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:124
-msgid "Semicondensed"
-msgstr "Félkeskenyített"
+# libnautilus-extensions/nautilus-file-operations.c:2365
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (13rd copy).txt"
+msgstr "foo (3. másolat).txt"
 
-# libnautilus-extensions/nautilus-font-picker.c:131
-#: libnautilus-extensions/nautilus-font-picker.c:226
-msgid "Font"
-msgstr "Betûkészlet"
+# libnautilus-extensions/nautilus-file-operations-progress.c:345
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
+#, c-format
+msgid "%ld of %ld"
+msgstr "%ld / %ld"
 
 # libnautilus-extensions/nautilus-gconf-extensions.c:88
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
 msgid "GConf Error"
 msgstr "GConf hiba"
 
-# libnautilus-extensions/nautilus-gdk-font-extensions.c:638
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:956
-msgid "fixed"
-msgstr "fixed"
-
-# libnautilus-extensions/nautilus-glib-extensions.c:1221
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1427
-msgid "01/01/00, 01:00 AM"
-msgstr "01/01/00, 01:00"
-
-# libnautilus-extensions/nautilus-glib-extensions.c:1222
-#: libnautilus-extensions/nautilus-glib-extensions.c:1428
-msgid "1/1/00, 1:00 AM"
-msgstr "1/1/00, 1:00"
-
-# libnautilus-extensions/nautilus-glib-extensions.c:1223
-#: libnautilus-extensions/nautilus-glib-extensions.c:1429
-msgid " 1/ 1/00,  1:00 AM"
-msgstr " 1/ 1/00,  1:00"
-
 # libnautilus-extensions/nautilus-global-preferences.c:44
 #. Constants
 #: libnautilus-extensions/nautilus-global-preferences.c:50
 msgid "Nautilus Preferences"
 msgstr "A Nautilus beállításai"
 
-# libnautilus-extensions/nautilus-global-preferences.c:87
-#: libnautilus-extensions/nautilus-global-preferences.c:97
-msgid "current theme"
-msgstr "jelenlegi téma"
+# libnautilus-extensions/nautilus-global-preferences.c:986
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "mindig"
+
+# libnautilus-extensions/nautilus-global-preferences.c:987
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "Mindig"
+
+# libnautilus-extensions/nautilus-global-preferences.c:990
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "csak helyi"
+
+# libnautilus-extensions/nautilus-global-preferences.c:991
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "Csak helyi fájlok"
+
+# libnautilus-extensions/nautilus-global-preferences.c:994
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "soha"
+
+# libnautilus-extensions/nautilus-global-preferences.c:995
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "Soha"
+
+# libnautilus-extensions/nautilus-global-preferences.c:527
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "Szebb grafika"
+
+# libnautilus-extensions/nautilus-global-preferences.c:148
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "Szebb, de lassabb megjelenítés"
+
+# libnautilus-extensions/nautilus-global-preferences.c:534
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "Betûkészletek"
+
+# components/music/Nautilus_View_music.oaf.in.h:1
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+#, fuzzy
+msgid "Font for Icon view:"
+msgstr "Factory a zenenézethez"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
+msgstr ""
+
+# components/history/Nautilus_View_history.oaf.in.h:1
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "Factory az emlékezetnézetekhez"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
+
+# libnautilus-extensions/nautilus-global-preferences.c:167
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "A Nautilus jeleníti meg a munkafelületet"
+
+# libnautilus-extensions/nautilus-global-preferences.c:554
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
+msgstr "Új ablakok nyitása"
 
 # libnautilus-extensions/nautilus-global-preferences.c:90
-#: libnautilus-extensions/nautilus-global-preferences.c:100
+#: libnautilus-extensions/nautilus-global-preferences.c:651
 msgid "Open each file or folder in a separate window"
 msgstr "Minden fájl vagy mappa megnyitása külön ablakban"
 
+# libnautilus-extensions/nautilus-global-preferences.c:155
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+msgid "Display toolbar in new windows"
+msgstr "Eszközsor megjelenítése az új ablakokban"
+
+# libnautilus-extensions/nautilus-global-preferences.c:158
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "Címsor megjelenítése az új ablakokban"
+
+# libnautilus-extensions/nautilus-global-preferences.c:161
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "Állapotsor megjelenítése az új ablakokban"
+
+# libnautilus-extensions/nautilus-global-preferences.c:164
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "Oldalpanel megjelenítése az új ablakokban"
+
+# libnautilus-extensions/nautilus-global-preferences.c:577
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "Kuka viselkedése"
+
 # libnautilus-extensions/nautilus-global-preferences.c:93
-#: libnautilus-extensions/nautilus-global-preferences.c:103
-msgid "Ask before emptying the Trash"
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+#, fuzzy
+msgid "Ask before emptying the Trash or deleting files"
 msgstr "Kérdezés a Kuka ürítése elõtt"
 
-# libnautilus-extensions/nautilus-global-preferences.c:96
-# libnautilus-extensions/nautilus-global-preferences.c:593
-#: libnautilus-extensions/nautilus-global-preferences.c:106
-#: libnautilus-extensions/nautilus-global-preferences.c:597
-msgid "Click Behavior"
-msgstr "Viselkedés kattintáskor"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
+
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
 
 # libnautilus-extensions/nautilus-global-preferences.c:99
-#: libnautilus-extensions/nautilus-global-preferences.c:109
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 msgid "single"
 msgstr "egyszeres"
 
 # libnautilus-extensions/nautilus-global-preferences.c:100
-#: libnautilus-extensions/nautilus-global-preferences.c:110
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "Elemek aktiválása egy kattintással"
 
 # libnautilus-extensions/nautilus-global-preferences.c:104
-#: libnautilus-extensions/nautilus-global-preferences.c:114
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "dupla"
 
 # libnautilus-extensions/nautilus-global-preferences.c:105
-#: libnautilus-extensions/nautilus-global-preferences.c:115
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "Elemek aktiválása dupla kattintással"
 
-# libnautilus-extensions/nautilus-global-preferences.c:109
-# libnautilus-extensions/nautilus-global-preferences.c:600
-#: libnautilus-extensions/nautilus-global-preferences.c:119
-#: libnautilus-extensions/nautilus-global-preferences.c:604
-msgid "Executable Text Files"
-msgstr "Végrehajtható szöveges fájlok"
-
 # libnautilus-extensions/nautilus-global-preferences.c:112
-#: libnautilus-extensions/nautilus-global-preferences.c:122
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 msgid "launch"
 msgstr "indítás"
 
 # libnautilus-extensions/nautilus-global-preferences.c:113
-#: libnautilus-extensions/nautilus-global-preferences.c:123
+#: libnautilus-extensions/nautilus-global-preferences.c:726
 msgid "Execute files when they are clicked"
 msgstr "Végrehajtás kattintáskor"
 
 # libnautilus-extensions/nautilus-global-preferences.c:117
-#: libnautilus-extensions/nautilus-global-preferences.c:127
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 msgid "display"
 msgstr "megjelenítés"
 
 # libnautilus-extensions/nautilus-global-preferences.c:118
-#: libnautilus-extensions/nautilus-global-preferences.c:128
+#: libnautilus-extensions/nautilus-global-preferences.c:730
 msgid "Display files when they are clicked"
 msgstr "Megjelenítés kattintáskor"
 
 # libnautilus-extensions/nautilus-global-preferences.c:122
-#: libnautilus-extensions/nautilus-global-preferences.c:132
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 msgid "ask"
 msgstr "kérdezés"
 
 # libnautilus-extensions/nautilus-global-preferences.c:123
-#: libnautilus-extensions/nautilus-global-preferences.c:133
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 msgid "Ask each time"
 msgstr "Kérdezd meg minden alkalommal"
 
-# libnautilus-extensions/nautilus-global-preferences.c:133
-# libnautilus-extensions/nautilus-global-preferences.c:746
-#: libnautilus-extensions/nautilus-global-preferences.c:143
-#: libnautilus-extensions/nautilus-global-preferences.c:725
-msgid "Show Text in Icons"
-msgstr "Szöveg mutatása az ikonokban"
-
-# libnautilus-extensions/nautilus-global-preferences.c:136
-# libnautilus-extensions/nautilus-global-preferences.c:753
-#: libnautilus-extensions/nautilus-global-preferences.c:146
-#: libnautilus-extensions/nautilus-global-preferences.c:732
-msgid "Show Count of Items in Folders"
-msgstr "A mappában található elemek számának mutatása"
-
-# libnautilus-extensions/nautilus-global-preferences.c:139
-# libnautilus-extensions/nautilus-global-preferences.c:760
-#: libnautilus-extensions/nautilus-global-preferences.c:149
-#: libnautilus-extensions/nautilus-global-preferences.c:739
-msgid "Show Thumbnails for Image Files"
-msgstr "Képfájlokat kis elõnézetként"
-
-# libnautilus-extensions/nautilus-global-preferences.c:142
-# libnautilus-extensions/nautilus-global-preferences.c:776
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:152
-#: libnautilus-extensions/nautilus-global-preferences.c:755
-msgid "Make Folder Appearance Details Public"
-msgstr "A könyvtár kinézetét beállító adatok nyilvánosak"
-
-# libnautilus-extensions/nautilus-global-preferences.c:145
-# libnautilus-extensions/nautilus-global-preferences.c:767
-#: libnautilus-extensions/nautilus-global-preferences.c:155
-#: libnautilus-extensions/nautilus-global-preferences.c:746
-msgid "Preview Sound Files"
-msgstr "Hangfájlok elõnézete"
-
-# libnautilus-extensions/nautilus-global-preferences.c:148
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Use smoother (but slower) graphics"
-msgstr "Szebb, de lassabb megjelenítés"
-
-# libnautilus-extensions/nautilus-global-preferences.c:151
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Use this font family to display file names:"
-msgstr "Fájlnevek megjelenítése ezzel a betûcsaláddal:"
-
-# libnautilus-extensions/nautilus-global-preferences.c:155
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-msgid "Display toolbar in new windows"
-msgstr "Eszközsor megjelenítése az új ablakokban"
-
-# libnautilus-extensions/nautilus-global-preferences.c:158
-#: libnautilus-extensions/nautilus-global-preferences.c:170
-msgid "Display location bar in new windows"
-msgstr "Címsor megjelenítése az új ablakokban"
-
-# libnautilus-extensions/nautilus-global-preferences.c:161
-#: libnautilus-extensions/nautilus-global-preferences.c:173
-msgid "Display status bar in new windows"
-msgstr "Állapotsor megjelenítése az új ablakokban"
-
-# libnautilus-extensions/nautilus-global-preferences.c:164
-#: libnautilus-extensions/nautilus-global-preferences.c:176
-msgid "Display sidebar in new windows"
-msgstr "Oldalpanel megjelenítése az új ablakokban"
-
-# libnautilus-extensions/nautilus-global-preferences.c:167
-#: libnautilus-extensions/nautilus-global-preferences.c:179
-msgid "Use Nautilus to draw the desktop"
-msgstr "A Nautilus jeleníti meg a munkafelületet"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:183
-msgid "Enable fast search (indexes your hard drive)"
-msgstr "Gyorskeresés engedélyezése (leindexeli a merevlemezedet)"
-
-# libnautilus-extensions/nautilus-global-preferences.c:174
-#: libnautilus-extensions/nautilus-global-preferences.c:186
-msgid "search type to do by default"
-msgstr "alapértelmezett keresés"
-
-# libnautilus-extensions/nautilus-global-preferences.c:177
-#: libnautilus-extensions/nautilus-global-preferences.c:189
-msgid "search by text"
-msgstr "keresés szöveg alapján"
-
-# libnautilus-extensions/nautilus-global-preferences.c:178
-#: libnautilus-extensions/nautilus-global-preferences.c:190
-msgid "Search for files by file name only"
-msgstr "Fájlok keresése csak fájlnév alapján"
-
-# libnautilus-extensions/nautilus-global-preferences.c:182
-#: libnautilus-extensions/nautilus-global-preferences.c:194
-msgid "search by text and properties"
-msgstr "keresés szöveg és tulajdonságok alapján"
+# libnautilus-extensions/nautilus-global-preferences.c:96
+# libnautilus-extensions/nautilus-global-preferences.c:593
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "Viselkedés kattintáskor"
 
-# libnautilus-extensions/nautilus-global-preferences.c:183
-#: libnautilus-extensions/nautilus-global-preferences.c:195
-msgid "Search for files by file name and file properties"
-msgstr "Fájlok keresése fájlnév és tulajdonságok alapján"
+# libnautilus-extensions/nautilus-global-preferences.c:109
+# libnautilus-extensions/nautilus-global-preferences.c:600
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr "Végrehajtható szöveges fájlok"
 
-# libnautilus-extensions/nautilus-global-preferences.c:187
-#: libnautilus-extensions/nautilus-global-preferences.c:199
-msgid "Search Engine Location"
-msgstr "Keresõprogram helye"
+# libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr "Mutatás/elrejtés beállításai"
 
 # libnautilus-extensions/nautilus-global-preferences.c:191
-#: libnautilus-extensions/nautilus-global-preferences.c:203
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr "Rejtett fájlok mutatása (\".\"-al kezdõdõ fájlok)"
 
 # libnautilus-extensions/nautilus-global-preferences.c:194
-#: libnautilus-extensions/nautilus-global-preferences.c:206
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr "Biztonsági másolatok mutatása (a fájlnév \"~\"-re végzõdik"
 
 # libnautilus-extensions/nautilus-global-preferences.c:197
-#: libnautilus-extensions/nautilus-global-preferences.c:209
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr "Speciális kapcsolók mutatása a Tulajdonságok ablakban"
 
-# libnautilus-extensions/nautilus-global-preferences.c:200
-#: libnautilus-extensions/nautilus-global-preferences.c:212
-msgid "Show only folders (no files) in the tree"
-msgstr "Csak mappák mutatása (fájloké nem) a fanézetben"
-
-# libnautilus-extensions/nautilus-global-preferences.c:203
-#: libnautilus-extensions/nautilus-global-preferences.c:215
-msgid "Can add Content"
-msgstr "Hozzáadhat tartalmat"
+# src/file-manager/fm-error-reporting.c:196
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+#, fuzzy
+msgid "Sorting Order"
+msgstr "Hiba a tulajdonos beállításakor"
 
-# libnautilus-extensions/nautilus-global-preferences.c:206
-#: libnautilus-extensions/nautilus-global-preferences.c:218
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
-msgstr "Ne add hozzá a gyári könyvjelzõket a Könyvjelzõk menühöz"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
 # src/nautilus-location-bar.c:62
-#: libnautilus-extensions/nautilus-global-preferences.c:222
-#: libnautilus-extensions/nautilus-global-preferences.c:227
-#: src/file-manager/fm-properties-window.c:1519 src/nautilus-location-bar.c:62
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
 msgid "Location:"
 msgstr "Cím:"
 
+# libnautilus-extensions/nautilus-global-preferences.c:713
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+msgid "HTTP Proxy Settings"
+msgstr "HTTP Proxy beállításai"
+
 # libnautilus-extensions/nautilus-global-preferences.c:214
-#: libnautilus-extensions/nautilus-global-preferences.c:226
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "HTTP proxy használata"
 
 # src/nautilus-first-time-druid.c:690
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:228
+#: libnautilus-extensions/nautilus-global-preferences.c:812
 #: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr "Port:"
 
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
+
+# libnautilus-extensions/nautilus-global-preferences.c:732
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "Beépített könyvjelzõk"
+
+# libnautilus-extensions/nautilus-global-preferences.c:206
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "Ne add hozzá a gyári könyvjelzõket a Könyvjelzõk menühöz"
+
+# libnautilus-extensions/nautilus-global-preferences.c:133
+# libnautilus-extensions/nautilus-global-preferences.c:746
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "Szöveg mutatása az ikonokban"
+
+# libnautilus-extensions/nautilus-global-preferences.c:136
+# libnautilus-extensions/nautilus-global-preferences.c:753
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr "A mappában található elemek számának mutatása"
+
+# libnautilus-extensions/nautilus-global-preferences.c:139
+# libnautilus-extensions/nautilus-global-preferences.c:760
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "Képfájlokat kis elõnézetként"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
+
+# libnautilus-extensions/nautilus-global-preferences.c:145
+# libnautilus-extensions/nautilus-global-preferences.c:767
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr "Hangfájlok elõnézete"
+
+# libnautilus-extensions/nautilus-global-preferences.c:142
+# libnautilus-extensions/nautilus-global-preferences.c:776
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr "A könyvtár kinézetét beállító adatok nyilvánosak"
+
 # libnautilus-extensions/nautilus-global-preferences.c:524
-#: libnautilus-extensions/nautilus-global-preferences.c:533
+#: libnautilus-extensions/nautilus-global-preferences.c:936
 msgid "Appearance"
 msgstr "Kinézet"
 
-# libnautilus-extensions/nautilus-global-preferences.c:527
-#: libnautilus-extensions/nautilus-global-preferences.c:535
-msgid "Smoother Graphics"
-msgstr "Szebb grafika"
-
 # libnautilus-extensions/nautilus-global-preferences.c:545
-#: libnautilus-extensions/nautilus-global-preferences.c:552
+#: libnautilus-extensions/nautilus-global-preferences.c:941
 msgid "Windows & Desktop"
 msgstr "Ablakok és munkafelületek"
 
-# libnautilus-extensions/nautilus-global-preferences.c:554
-#: libnautilus-extensions/nautilus-global-preferences.c:560
-msgid "Opening New Windows"
-msgstr "Új ablakok nyitása"
-
-# libnautilus-extensions/nautilus-global-preferences.c:577
-#: libnautilus-extensions/nautilus-global-preferences.c:583
-msgid "Trash Behavior"
-msgstr "Kuka viselkedése"
-
 # libnautilus-extensions/nautilus-global-preferences.c:589
-#: libnautilus-extensions/nautilus-global-preferences.c:595
+#: libnautilus-extensions/nautilus-global-preferences.c:946
 msgid "Icon & List Views"
 msgstr "Ikon- és listanézet"
 
-# libnautilus-extensions/nautilus-global-preferences.c:607
-#: libnautilus-extensions/nautilus-global-preferences.c:611
-msgid "Show/Hide Options"
-msgstr "Mutatás/elrejtés beállításai"
-
-# libnautilus-extensions/nautilus-global-preferences.c:628
-#: libnautilus-extensions/nautilus-global-preferences.c:632
-msgid "Sidebar Panels"
-msgstr "Oldalpenelek"
-
-# libnautilus-extensions/nautilus-global-preferences.c:632
-#: libnautilus-extensions/nautilus-global-preferences.c:635
-msgid "Tabs"
-msgstr "Fülek"
-
 # libnautilus-extensions/nautilus-global-preferences.c:703
-#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:957
 msgid "Navigation"
 msgstr "Navigáció"
 
-# libnautilus-extensions/nautilus-global-preferences.c:713
-#: libnautilus-extensions/nautilus-global-preferences.c:693
-msgid "HTTP Proxy Settings"
-msgstr "HTTP Proxy beállításai"
-
-# libnautilus-extensions/nautilus-global-preferences.c:732
-#: libnautilus-extensions/nautilus-global-preferences.c:712
-msgid "Built-in Bookmarks"
-msgstr "Beépített könyvjelzõk"
-
 # libnautilus-extensions/nautilus-global-preferences.c:743
-#: libnautilus-extensions/nautilus-global-preferences.c:723
+#: libnautilus-extensions/nautilus-global-preferences.c:962
 msgid "Speed Tradeoffs"
 msgstr "Mûködés gyorsítása"
 
-# libnautilus-extensions/nautilus-global-preferences.c:676
-#: libnautilus-extensions/nautilus-global-preferences.c:794
-msgid "Search"
-msgstr "Keresés"
+# libnautilus-extensions/nautilus-global-preferences.c:177
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr "keresés szöveg alapján"
+
+# libnautilus-extensions/nautilus-global-preferences.c:178
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+msgid "Search for files by file name only"
+msgstr "Fájlok keresése csak fájlnév alapján"
+
+# libnautilus-extensions/nautilus-global-preferences.c:182
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr "keresés szöveg és tulajdonságok alapján"
+
+# libnautilus-extensions/nautilus-global-preferences.c:183
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+msgid "Search for files by file name and file properties"
+msgstr "Fájlok keresése fájlnév és tulajdonságok alapján"
 
 # libnautilus-extensions/nautilus-global-preferences.c:679
-#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "Keresés bonyolultságának beállítása"
 
+# libnautilus-extensions/nautilus-global-preferences.c:174
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "alapértelmezett keresés"
+
 # libnautilus-extensions/nautilus-global-preferences.c:676
-#: libnautilus-extensions/nautilus-global-preferences.c:802
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 msgid "Fast Search"
 msgstr "Gyorskeresés"
 
-# libnautilus-extensions/nautilus-global-preferences.c:534
-#: libnautilus-extensions/nautilus-global-preferences.c:846
-msgid "Fonts"
-msgstr "Betûkészletek"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr "Gyorskeresés engedélyezése (leindexeli a merevlemezedet)"
+
+# libnautilus-extensions/nautilus-global-preferences.c:187
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+msgid "Search Engine Location"
+msgstr "Keresõprogram helye"
+
+# libnautilus-extensions/nautilus-global-preferences.c:676
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Keresés"
+
+# libnautilus-extensions/nautilus-global-preferences.c:200
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr "Csak mappák mutatása (fájloké nem) a fanézetben"
 
 # libnautilus-extensions/nautilus-global-preferences.c:939
-#: libnautilus-extensions/nautilus-global-preferences.c:1026
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
 #, c-format
 msgid "Display %s tab in sidebar"
 msgstr "%s fül az oldalpanelen"
 
-# libnautilus-extensions/nautilus-global-preferences.c:986
-#: libnautilus-extensions/nautilus-global-preferences.c:1073
-msgid "always"
-msgstr "mindig"
-
-# libnautilus-extensions/nautilus-global-preferences.c:987
-#: libnautilus-extensions/nautilus-global-preferences.c:1074
-msgid "Always"
-msgstr "Mindig"
-
-# libnautilus-extensions/nautilus-global-preferences.c:990
-#: libnautilus-extensions/nautilus-global-preferences.c:1077
-msgid "local only"
-msgstr "csak helyi"
-
-# libnautilus-extensions/nautilus-global-preferences.c:991
-#: libnautilus-extensions/nautilus-global-preferences.c:1078
-msgid "Local Files Only"
-msgstr "Csak helyi fájlok"
-
-# libnautilus-extensions/nautilus-global-preferences.c:994
-#: libnautilus-extensions/nautilus-global-preferences.c:1081
-msgid "never"
-msgstr "soha"
+# libnautilus-extensions/nautilus-global-preferences.c:628
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "Oldalpenelek"
 
-# libnautilus-extensions/nautilus-global-preferences.c:995
-#: libnautilus-extensions/nautilus-global-preferences.c:1082
-msgid "Never"
-msgstr "Soha"
+# libnautilus-extensions/nautilus-global-preferences.c:632
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr "Fülek"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1145
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "currently can't be performed because the program crond, which does nightly "
@@ -6989,13 +7070,13 @@ msgid ""
 "done, turn crond on."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1152
-#: libnautilus-extensions/nautilus-global-preferences.c:1170
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
 msgid "Files May Not Be Indexed"
 msgstr "A fájlokat nem lehet indexelni"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1153
-#: libnautilus-extensions/nautilus-global-preferences.c:1171
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
 msgid ""
 "If you are running Linux, you can log in as root and type these commands to "
 "start cron:\n"
@@ -7009,7 +7090,7 @@ msgstr ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1162
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "may not be performed because the program crond, which does nightly tasks on "
@@ -7024,15 +7105,6 @@ msgstr ""
 "rendszereden.\n"
 "\n"
 
-#: libnautilus-extensions/nautilus-gnome-extensions.c:640
-msgid "No image was selected.  You must click on an image to select it."
-msgstr "Nincs kijelölt kép. Kattints egy képre annak kijelöléséhez."
-
-# components/help/converters/gnome-db2html2/sect-elements.c:1028
-#: libnautilus-extensions/nautilus-gnome-extensions.c:641
-msgid "No selection made"
-msgstr "Nincs kijelölés"
-
 # libnautilus-extensions/nautilus-icon-canvas-item.c:68
 #. The list of characters that cause line breaks can be localized.
 #: libnautilus-extensions/nautilus-icon-canvas-item.c:70
@@ -7040,7 +7112,7 @@ msgid " -_,;.?/&"
 msgstr " -_,;.?/&"
 
 # libnautilus-extensions/nautilus-icon-dnd.c:733
-#: libnautilus-extensions/nautilus-icon-dnd.c:741
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
@@ -7048,7 +7120,7 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-icon-dnd.c:737
-#: libnautilus-extensions/nautilus-icon-dnd.c:745
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
@@ -7056,7 +7128,7 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-icon-dnd.c:743
-#: libnautilus-extensions/nautilus-icon-dnd.c:751
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
@@ -7065,7 +7137,7 @@ msgstr ""
 "elrendezés, és otthagyni ezt az elemet, ahova letetted?"
 
 # libnautilus-extensions/nautilus-icon-dnd.c:746
-#: libnautilus-extensions/nautilus-icon-dnd.c:754
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
@@ -7074,78 +7146,59 @@ msgstr ""
 "elrendezésre és otthagyni ezeket az elemeket, ahova letetted õket?"
 
 # libnautilus-extensions/nautilus-icon-dnd.c:751
-#: libnautilus-extensions/nautilus-icon-dnd.c:759
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "Átváltás kézi elrendezésre?"
 
 # libnautilus-extensions/nautilus-icon-dnd.c:752
-#: libnautilus-extensions/nautilus-icon-dnd.c:760
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "Átváltás"
 
 # libnautilus-extensions/nautilus-icon-text-item.c:1546
 # src/file-manager/nautilus-icon-view-ui.xml.h:25
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "Átnevezés"
 
 # libnautilus-extensions/nautilus-icon-text-item.c:1547
-#: libnautilus-extensions/nautilus-icon-text-item.c:1551
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr "Gépelés visszavonása"
 
 # libnautilus-extensions/nautilus-icon-text-item.c:1548
-#: libnautilus-extensions/nautilus-icon-text-item.c:1552
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "Régi név visszaállítása"
 
 # libnautilus-extensions/nautilus-icon-text-item.c:1549
-#: libnautilus-extensions/nautilus-icon-text-item.c:1553
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "Gépelés újra"
 
 # libnautilus-extensions/nautilus-icon-text-item.c:1550
-#: libnautilus-extensions/nautilus-icon-text-item.c:1554
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Megváltoztatott név visszaállítása"
 
-#: libnautilus-extensions/nautilus-password-dialog.c:306
-msgid "Remember this password"
-msgstr "Jelszó mentése"
-
-# components/text/nautilus-text-view-ui.xml.h:9
-#: libnautilus-extensions/nautilus-preferences-item.c:483
-msgid "times"
-msgstr "times"
-
-# components/text/nautilus-text-view-ui.xml.h:6
-#: libnautilus-extensions/nautilus-preferences-item.c:484
-msgid "courier"
-msgstr "courier"
-
-# components/text/nautilus-text-view-ui.xml.h:1
-#: libnautilus-extensions/nautilus-preferences-item.c:485
-msgid "lucida"
-msgstr "lucida"
-
 # libnautilus-extensions/nautilus-preferences.c:76
-#: libnautilus-extensions/nautilus-preferences.c:76
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "Kezdõ"
 
 # libnautilus-extensions/nautilus-preferences.c:77
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "Középszintû"
 
 # libnautilus-extensions/nautilus-preferences.c:78
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "Haladó"
 
 # libnautilus-extensions/nautilus-preferences-dialog.c:205
-#: libnautilus-extensions/nautilus-preferences-dialog.c:202
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "Beáll. ablak"
 
@@ -7271,7 +7324,7 @@ msgstr "Ne vegye bele a menübe \"%s\" elemekhez"
 # src/file-manager/fm-search-list-view.c:549
 # src/nautilus-bookmarks-window.c:164
 #: libnautilus-extensions/nautilus-program-chooser.c:1209
-#: src/file-manager/fm-list-view.c:2123
+#: src/file-manager/fm-list-view.c:2182
 #: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
@@ -7689,31 +7742,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Elemek, melyek neve tartalmazza a \"medúza\" szót és melyek mappák"
 
-# libnautilus-extensions/nautilus-stock-dialogs.c:572
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr "Részletek"
-
-# libnautilus-extensions/nautilus-stock-dialogs.c:519
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr "Figyelmeztetés"
-
-# libnautilus-extensions/nautilus-stock-dialogs.c:530
-# libnautilus-extensions/nautilus-stock-dialogs.c:570
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr "Hiba"
-
-# libnautilus-extensions/nautilus-stock-dialogs.c:603
-# libnautilus-extensions/nautilus-stock-dialogs.c:631
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr "Kérdés"
-
 # libnautilus-extensions/nautilus-trash-directory.c:73
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
@@ -7725,7 +7753,7 @@ msgid "Nautilus is searching your disks for trash folders."
 msgstr "A Nautilus keresi a Kuka mappákat a helyi lemezeken."
 
 # libnautilus-extensions/nautilus-trash-file.c:593
-#: libnautilus-extensions/nautilus-trash-file.c:600
+#: libnautilus-extensions/nautilus-trash-file.c:725
 msgid "on the desktop"
 msgstr "a munkaasztalon"
 
@@ -7767,56 +7795,52 @@ msgstr "%sként"
 msgid "%s Viewer"
 msgstr "%smegjelenítõ"
 
+# libnautilus-extensions/nautilus-file.c:3731
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+msgid "Unknown"
+msgstr "Ismeretlen"
+
 # libnautilus-extensions/nautilus-volume-monitor.c:1575
 #. Populate table with items we know localized names for.
-#: libnautilus-extensions/nautilus-volume-monitor.c:623
-#: libnautilus-extensions/nautilus-volume-monitor.c:1862
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr "Floppy"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:624
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:625
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
 msgid "Zip Drive"
 msgstr "Zip meghajtó"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:475
 # libnautilus-extensions/nautilus-volume-monitor.c:497
-#: libnautilus-extensions/nautilus-volume-monitor.c:646
-#: libnautilus-extensions/nautilus-volume-monitor.c:668
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 msgid "Audio CD"
 msgstr "Audio CD"
 
-# libnautilus-extensions/nautilus-volume-monitor.c:1306
-#: libnautilus-extensions/nautilus-volume-monitor.c:1547
-msgid "Mount Error"
-msgstr "Hiba beillesztéskor"
-
-# libnautilus-extensions/nautilus-volume-monitor.c:1308
-#: libnautilus-extensions/nautilus-volume-monitor.c:1549
-msgid "Unmount Error"
-msgstr "Hiba leválasztáskor"
-
 # libnautilus-extensions/nautilus-volume-monitor.c:1338
-#: libnautilus-extensions/nautilus-volume-monitor.c:1579
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr "írásvédett, beillesztés csak olvasható módban"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1341
-#: libnautilus-extensions/nautilus-volume-monitor.c:1582
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "nem érvényes blokkos eszköz"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1342
-#: libnautilus-extensions/nautilus-volume-monitor.c:1583
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr "Adathordozó nem található"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1346
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1587
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
@@ -7826,7 +7850,7 @@ msgstr ""
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1350
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1591
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
@@ -7835,13 +7859,13 @@ msgstr ""
 "adathordozó az eszközben."
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1353
-#: libnautilus-extensions/nautilus-volume-monitor.c:1594
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr ""
 "rossz fájlrendszertípus, rossz beállítás vagy szuperblokk a következõn:"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1356
-#: libnautilus-extensions/nautilus-volume-monitor.c:1597
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
@@ -7850,7 +7874,7 @@ msgstr ""
 "valószínûleg olyan fájlrendszer van, amit nem lehet beilleszteni."
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1359
-#: libnautilus-extensions/nautilus-volume-monitor.c:1600
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
@@ -7859,58 +7883,68 @@ msgstr ""
 "valószínûleg ismeretlen."
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1364
-#: libnautilus-extensions/nautilus-volume-monitor.c:1605
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr "A Nautilus nem tudta beilleszteni a kijelölt hajlékonylemez meghajtót."
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1366
-#: libnautilus-extensions/nautilus-volume-monitor.c:1607
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "A Nautilus nem tudta beilleszteni a kijelölt kötetet."
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1371
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1612
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr "A Nautilus nem tudta leválasztani a kijelölt kötetet."
 
+# libnautilus-extensions/nautilus-volume-monitor.c:1306
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr "Hiba beillesztéskor"
+
+# libnautilus-extensions/nautilus-volume-monitor.c:1308
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr "Hiba leválasztáskor"
+
 # libnautilus-extensions/nautilus-volume-monitor.c:1508
-#: libnautilus-extensions/nautilus-volume-monitor.c:1764
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "ISO 9660 Kötet"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1523
-#: libnautilus-extensions/nautilus-volume-monitor.c:1779
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "Gyökér"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1530
-#: libnautilus-extensions/nautilus-volume-monitor.c:1786
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Ext2 Kötet"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1545
-#: libnautilus-extensions/nautilus-volume-monitor.c:1801
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "MSDOS Kötet"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1560
-#: libnautilus-extensions/nautilus-volume-monitor.c:1816
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "NFS Kötet"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1560
-#: libnautilus-extensions/nautilus-volume-monitor.c:1831
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
 msgid "ReiserFS Volume"
 msgstr "ReiserFS Kötet"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1560
-#: libnautilus-extensions/nautilus-volume-monitor.c:1847
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
 msgid "UFS Volume"
 msgstr "UFS Kötet"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1590
-#: libnautilus-extensions/nautilus-volume-monitor.c:1877
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "Ismeretlen kötet"
 
@@ -7919,38 +7953,79 @@ msgstr "Ismeretlen kötet"
 msgid "C_lear Text"
 msgstr "Szöveg tör_lése"
 
+# libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:5
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "Szöveg tör_lése"
+
+# libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:73
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "Szöveg _másolása"
+
 # libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "A kijelölt szöveg másolása a vágólapra"
 
+# src/nautilus-shell-ui.xml.h:15
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "Szöveg ki_vágása"
+
+# src/nautilus-shell-ui.xml.h:15
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+msgid "Cut _Text"
+msgstr "Szöveg ki_vágása"
+
 # libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:16
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "A kijelölt szöveg áthelyezése a vágólapra"
 
+# libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:87
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "Szöveg _beillesztése"
+
 # libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:41
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:46
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "Szöveg beillesztése a vágólapról"
 
 # libnautilus/nautilus-clipboard-ui.xml.h:5
-#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "A kijelölt szöveg törlése, a vágólapra helyezés nélkül"
 
+# src/nautilus-shell-ui.xml.h:92
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "M_indent kijelöl"
+
+# src/nautilus-shell-ui.xml.h:92
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+msgid "Select _All"
+msgstr "M_indent kijelöl"
+
+# src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "Minden elemet kijelöl ebben az ablakban"
+
 # libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:73
-#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:80
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "Szöveg _másolása"
 
-# libnautilus/nautilus-clipboard-ui.xml.h:7
-#: libnautilus/nautilus-clipboard-ui.xml.h:7
-msgid "_Cut Text"
-msgstr "Szöveg ki_vágása"
-
 # libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:87
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:93
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "Szöveg _beillesztése"
 
@@ -7961,7 +8036,7 @@ msgstr "Szöveg _beillesztése"
 #. * to change it when we upgrade to GTK 2.0.
 #.
 #: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
-#: src/nautilus-window-menus.c:569
+#: src/nautilus-window-menus.c:610
 msgid "Nautilus"
 msgstr "Nautilus"
 
@@ -7978,102 +8053,139 @@ msgstr "Nautilus fájlkezelõ és grafikus shell"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:735
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr "%s könyvtára"
 
 # src/file-manager/fm-desktop-icon-view.c:1020
-#: src/file-manager/fm-desktop-icon-view.c:1021
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "Kuka ürítése..."
 
 # src/file-manager/fm-desktop-icon-view.c:1022
 # src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
 # src/file-manager/nautilus-directory-view-ui.xml.h:11
-#: src/file-manager/fm-desktop-icon-view.c:1023
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "Kuka ürítése"
 
 # src/file-manager/fm-desktop-icon-view.c:1042
-#: src/file-manager/fm-desktop-icon-view.c:1043
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "Kötet leválasztása"
 
 # src/file-manager/fm-directory-view.c:466
-#: src/file-manager/fm-directory-view.c:474
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr "Ez %d ablakot fog megnyitni. Biztos, hogy ezt akarod?"
 
 # src/file-manager/fm-directory-view.c:468
-#: src/file-manager/fm-directory-view.c:476
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d ablak megnyitása?"
 
+# src/file-manager/fm-directory-view.c:2637
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr "Biztosan véglegesen törölni akarod a következõt a Kukából: \"%s\"?"
+
+# src/file-manager/fm-directory-view.c:2641
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr "Biztosan véglegesen törölni akarod a %d kijelölt elemet a Kukából?"
+
+# src/file-manager/fm-directory-view.c:2607
+# src/file-manager/fm-directory-view.c:2648
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Törlés"
+
+# src/file-manager/fm-directory-view.c:2607
+# src/file-manager/fm-directory-view.c:2648
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Törlés"
+
+# components/rpmview/nautilus-rpm-view.c:373
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+#, fuzzy
+msgid "scripts"
+msgstr "Leírás"
+
 # src/file-manager/fm-directory-view.c:1224
 # src/file-manager/fm-directory-view.c:1189
-#: src/file-manager/fm-directory-view.c:1212
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" kijelölve"
 
 # src/file-manager/fm-directory-view.c:1226
 # src/file-manager/fm-directory-view.c:1191
-#: src/file-manager/fm-directory-view.c:1214
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "1 mappa kijelölve"
 
 # src/file-manager/fm-directory-view.c:1229
 # src/file-manager/fm-directory-view.c:1194
-#: src/file-manager/fm-directory-view.c:1217
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "%d mappa kijelölve"
 
 # src/file-manager/fm-directory-view.c:1235
 # src/file-manager/fm-directory-view.c:1200
-#: src/file-manager/fm-directory-view.c:1223
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr " (0 elemet tartalmaz)"
 
 # src/file-manager/fm-directory-view.c:1237
 # src/file-manager/fm-directory-view.c:1202
-#: src/file-manager/fm-directory-view.c:1225
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr " (1 elemet tartalmaz)"
 
 # src/file-manager/fm-directory-view.c:1204
-#: src/file-manager/fm-directory-view.c:1227
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr " (%d elemet tartalmaz)"
 
 # src/file-manager/fm-directory-view.c:1215
-#: src/file-manager/fm-directory-view.c:1238
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" kijelölt (%s)"
 
 # src/file-manager/fm-directory-view.c:1254
 # src/file-manager/fm-directory-view.c:1219
-#: src/file-manager/fm-directory-view.c:1242
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d elem kijelölve (%s)"
 
 # src/file-manager/fm-directory-view.c:1261
 # src/file-manager/fm-directory-view.c:1226
-#: src/file-manager/fm-directory-view.c:1249
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "még 1 elem kijelölve (%s)"
 
 # src/file-manager/fm-directory-view.c:1229
-#: src/file-manager/fm-directory-view.c:1252
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "még %d elem kijelölve (%s)"
@@ -8086,7 +8198,7 @@ msgstr "még %d elem kijelölve (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1281
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -8096,7 +8208,7 @@ msgstr "%s%s, %s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1407
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
@@ -8106,19 +8218,19 @@ msgstr ""
 "birkózni. Nem jelenik meg minden fájl."
 
 # src/file-manager/fm-directory-view.c:1392
-#: src/file-manager/fm-directory-view.c:1414
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "Túl sok fájl"
 
 # src/file-manager/fm-directory-view.c:2589
-#: src/file-manager/fm-directory-view.c:2623
+#: src/file-manager/fm-directory-view.c:2752
 #, c-format
 msgid ""
 "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
 msgstr "\"%s\" nem helyezhetõ át a Kukába. Törölni akarod most rögtön?"
 
 # src/file-manager/fm-directory-view.c:2594
-#: src/file-manager/fm-directory-view.c:2628
+#: src/file-manager/fm-directory-view.c:2757
 #, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
@@ -8128,7 +8240,7 @@ msgstr ""
 "rögtön?"
 
 # src/file-manager/fm-directory-view.c:2594
-#: src/file-manager/fm-directory-view.c:2632
+#: src/file-manager/fm-directory-view.c:2761
 #, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -8138,25 +8250,18 @@ msgstr ""
 "%d elemt most rögtön?"
 
 # src/file-manager/fm-directory-view.c:2606
-#: src/file-manager/fm-directory-view.c:2640
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "Törlés azonnal?"
 
-# src/file-manager/fm-directory-view.c:2607
-# src/file-manager/fm-directory-view.c:2648
-#: src/file-manager/fm-directory-view.c:2641
-#: src/file-manager/fm-directory-view.c:2682
-msgid "Delete"
-msgstr "Törlés"
-
 # src/file-manager/fm-directory-view.c:2637
-#: src/file-manager/fm-directory-view.c:2671
+#: src/file-manager/fm-directory-view.c:2799
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr "Biztosan véglegesen törölni akarod a következõt a Kukából: \"%s\"?"
 
 # src/file-manager/fm-directory-view.c:2641
-#: src/file-manager/fm-directory-view.c:2675
+#: src/file-manager/fm-directory-view.c:2803
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
@@ -8164,95 +8269,253 @@ msgid ""
 msgstr "Biztosan véglegesen törölni akarod a %d kijelölt elemet a Kukából?"
 
 # src/file-manager/fm-directory-view.c:2647
-#: src/file-manager/fm-directory-view.c:2681
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "Törlés a Kukából?"
 
 # src/file-manager/fm-directory-view.c:2920
 # src/file-manager/fm-directory-view.c:2961
-#: src/file-manager/fm-directory-view.c:2978
-#: src/file-manager/fm-directory-view.c:3018
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Használd a következõt a kijelölt elem megnyitásához: \"%s\""
 
+# src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "Más _alkalmazás..."
+
+# src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "Más _alkalmazás..."
+
+# src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "Más _megjelenítõ..."
+
+# src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "Más _megjelenítõ..."
+
+# src/file-manager/fm-directory-view.c:2920
+# src/file-manager/fm-directory-view.c:2961
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "Használd a következõt a kijelölt elem megnyitásához: \"%s\""
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+# libnautilus-extensions/nautilus-volume-monitor.c:1366
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "A Nautilus nem tudta beilleszteni a kijelölt kötetet."
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+# src/file-manager/fm-directory-view.c:2594
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"A kijelölt %d elem nem helyezhetõ át a Kukába. Törölni akarod ezeket most "
+"rögtön?"
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
 # src/file-manager/nautilus-directory-view-ui.xml.h:20
-#: src/file-manager/fm-directory-view.c:3220
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "Megnyitás új _ablakban"
+
+# src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open _in New Window"
 msgstr "Megnyitás új _ablakban"
 
 # src/file-manager/fm-directory-view.c:3165
-#: src/file-manager/fm-directory-view.c:3222
+#: src/file-manager/fm-directory-view.c:3959
 #, c-format
 msgid "Open _in %d New Windows"
 msgstr "Megnyitás %d új _ablakban"
 
-# src/file-manager/fm-directory-view.c:3191
-#: src/file-manager/fm-directory-view.c:3248
-msgid "Delete all selected items permanently"
-msgstr "Minden kijelölt elem végleges törlése"
-
 # src/file-manager/fm-directory-view.c:3196
-#: src/file-manager/fm-directory-view.c:3253
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "Törlés a _Kukából..."
 
 # src/file-manager/fm-directory-view.c:3197
-#: src/file-manager/fm-directory-view.c:3254
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "Törlés a _Kukából"
 
-# src/file-manager/fm-directory-view.c:3201
-#: src/file-manager/fm-directory-view.c:3258
-msgid "Move all selected items to the Trash"
-msgstr "Minden kijelölt elem áthelyezése a Kukába"
+# src/file-manager/fm-directory-view.c:3191
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "Minden kijelölt elem végleges törlése"
 
 # src/file-manager/fm-directory-view.c:3205
 # src/file-manager/nautilus-directory-view-ui.xml.h:14
-#: src/file-manager/fm-directory-view.c:3262
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "Áthelyezés a _Kukába"
 
+# src/file-manager/fm-directory-view.c:3201
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "Minden kijelölt elem áthelyezése a Kukába"
+
+# src/file-manager/fm-directory-view.c:2607
+# src/file-manager/fm-directory-view.c:2648
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "Törlés"
+
+# src/file-manager/fm-directory-view.c:2607
+# src/file-manager/fm-directory-view.c:2648
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "Törlés"
+
 # src/file-manager/fm-directory-view.c:3235
-#: src/file-manager/fm-directory-view.c:3292
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "_Kapcsok létrehozása"
 
 # src/file-manager/fm-directory-view.c:3236
 # src/file-manager/nautilus-directory-view-ui.xml.h:5
-#: src/file-manager/fm-directory-view.c:3293
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "_Kapocs létrehozása"
 
 # src/file-manager/fm-directory-view.c:3254
-#: src/file-manager/fm-directory-view.c:3311
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "_Kuka ürítése..."
 
 # src/file-manager/fm-directory-view.c:3255
 # src/file-manager/nautilus-directory-view-ui.xml.h:39
-#: src/file-manager/fm-directory-view.c:3312
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "_Kuka ürítése"
 
 # src/file-manager/fm-directory-view.c:3266
 # src/file-manager/nautilus-directory-view-ui.xml.h:26
-#: src/file-manager/fm-directory-view.c:3323
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "Egyéni képek tö_rlése"
 
 # src/file-manager/fm-directory-view.c:3267
-#: src/file-manager/fm-directory-view.c:3324
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "Egyéni kép tö_rlése"
 
+# components/loser/content/nautilus-content-loser-ui.xml.h:3
+# components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
+# components/sample/nautilus-sample-content-view-ui.xml.h:4
+# src/nautilus-shell-ui.xml.h:77
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "_Fájl"
+
+# libnautilus-extensions/nautilus-file.c:3402
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u fájl"
+
+# libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:73
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "Szöveg _másolása"
+
+# libnautilus-extensions/nautilus-file-operations.c:1848
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "Fájlok másolása"
+
 # src/file-manager/fm-directory-view.c:3420
-#: src/file-manager/fm-directory-view.c:3477
+#: src/file-manager/fm-directory-view.c:4252
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
 "link in the Trash?"
@@ -8261,7 +8524,7 @@ msgstr ""
 "kapcsot a Kukába?"
 
 # src/file-manager/fm-directory-view.c:3423
-#: src/file-manager/fm-directory-view.c:3480
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
@@ -8271,17 +8534,17 @@ msgstr ""
 "létezik. Áthelyezed a kapcsot a Kukába?"
 
 # src/file-manager/fm-directory-view.c:3429
-#: src/file-manager/fm-directory-view.c:3486
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "Törött kapocs"
 
 # src/file-manager/fm-directory-view.c:3430
-#: src/file-manager/fm-directory-view.c:3487
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr "Kidobni"
 
 # src/file-manager/fm-directory-view.c:3483
-#: src/file-manager/fm-directory-view.c:3540
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
@@ -8291,22 +8554,22 @@ msgstr ""
 "melyeket tartalmaz, vagy meg szeretnéd nézni a tartalmát?"
 
 # src/file-manager/fm-directory-view.c:3489
-#: src/file-manager/fm-directory-view.c:3546
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr "Futtatás vagy megtekintés?"
 
 # src/file-manager/fm-directory-view.c:3490
-#: src/file-manager/fm-directory-view.c:3547
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "Futtatás"
 
 # src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/fm-directory-view.c:3548
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "Megtekintés"
 
 # src/file-manager/fm-directory-view.c:3540
-#: src/file-manager/fm-directory-view.c:3602
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
@@ -8315,19 +8578,19 @@ msgstr ""
 "parancsokat."
 
 # src/file-manager/fm-directory-view.c:3541
-#: src/file-manager/fm-directory-view.c:3604
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "Távoli kapcsok futtatása nem lehetséges"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:791
 # src/file-manager/fm-directory-view.c:3672
-#: src/file-manager/fm-directory-view.c:3738
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr "\"%s\" megnyitása"
 
 # src/file-manager/fm-directory-view.c:3678
-#: src/file-manager/fm-directory-view.c:3744
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "Mégse nyitod meg?"
 
@@ -8338,26 +8601,31 @@ msgid ""
 "You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "Nem vagy jogosult \"%s\" tartalmának megtekintésére."
 
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
 # src/file-manager/fm-error-reporting.c:63
-#: src/file-manager/fm-error-reporting.c:65
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Sajnálom, nem lehetett megjeleníteni \"%s\" teljes tartalmát."
 
 # src/file-manager/fm-error-reporting.c:66
-#: src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Hiba a mappa megjelenítésekor"
 
 # src/file-manager/fm-error-reporting.c:89
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "%s nevû elem már létezik ebben a mappában. Használj egy másik nevet."
 
 # src/file-manager/fm-error-reporting.c:94
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
@@ -8365,13 +8633,13 @@ msgstr ""
 "Nincs \"%s\" ebben a könyvtárban. Lehet, hogy letörölték, vagy áthelyezték?"
 
 # src/file-manager/fm-error-reporting.c:99
-#: src/file-manager/fm-error-reporting.c:109
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Nem vagy jogosult \"%s\" átnevezésére."
 
 # src/file-manager/fm-error-reporting.c:104
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -8381,38 +8649,38 @@ msgstr ""
 "Használj másik nevet."
 
 # src/file-manager/fm-error-reporting.c:108
-#: src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "A következõ név (%s) nem érvényes. Használj másikat."
 
 # src/file-manager/fm-error-reporting.c:114
-#: src/file-manager/fm-error-reporting.c:124
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "\"%s\" nevét nem lehetett megváltoztatni, mert csak olvasható lemezen van"
 
 # src/file-manager/fm-error-reporting.c:122
-#: src/file-manager/fm-error-reporting.c:133
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Sajnálom, nem lehet átnevezni \"%s\"-t erre: \"%s\"."
 
 # src/file-manager/fm-error-reporting.c:128
-#: src/file-manager/fm-error-reporting.c:140
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "Hiba átnevezéskor"
 
 # src/file-manager/fm-error-reporting.c:148
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Nem vagy jogosult \"%s\" csoportjának megváltoztatására."
 
 # src/file-manager/fm-error-reporting.c:152
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
@@ -8420,18 +8688,18 @@ msgstr ""
 "lemezen található"
 
 # src/file-manager/fm-error-reporting.c:160
-#: src/file-manager/fm-error-reporting.c:172
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Sajnálom, \"%s\" csoportját nem lehetett megváltoztatni."
 
 # src/file-manager/fm-error-reporting.c:164
-#: src/file-manager/fm-error-reporting.c:176
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "Hiba a csoport beállításakor"
 
 # src/file-manager/fm-error-reporting.c:186
-#: src/file-manager/fm-error-reporting.c:198
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
@@ -8439,18 +8707,18 @@ msgstr ""
 "található"
 
 # src/file-manager/fm-error-reporting.c:193
-#: src/file-manager/fm-error-reporting.c:205
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Sajnálom, \"%s\" tulajdonosának megváltoztatása sikertlen."
 
 # src/file-manager/fm-error-reporting.c:196
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "Hiba a tulajdonos beállításakor"
 
 # src/file-manager/fm-error-reporting.c:218
-#: src/file-manager/fm-error-reporting.c:230
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
@@ -8459,24 +8727,24 @@ msgstr ""
 "lemezen található"
 
 # src/file-manager/fm-error-reporting.c:225
-#: src/file-manager/fm-error-reporting.c:237
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Sajnálom, \"%s\" jogosultságainak megváltoztatása sikertelen."
 
 # src/file-manager/fm-error-reporting.c:228
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "Hiba a jogosultságok beállításakor"
 
 # src/file-manager/fm-error-reporting.c:294
-#: src/file-manager/fm-error-reporting.c:306
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "\"%s\" átnevezése erre: \"%s\""
 
 # src/file-manager/fm-error-reporting.c:299
-#: src/file-manager/fm-error-reporting.c:311
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "Mégse nevezed át?"
 
@@ -8550,100 +8818,100 @@ msgstr ""
 "Egyre több adat jelenik meg, ahogyan kinagyítod a nézetet."
 
 # src/file-manager/fm-icon-view.c:157
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "_név alapján"
 
 # src/file-manager/fm-icon-view.c:158
 # src/file-manager/nautilus-icon-view-ui.xml.h:17
-#: src/file-manager/fm-icon-view.c:159
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "Ikonok maradjanak név alapján rendezve"
 
 # src/file-manager/fm-icon-view.c:164
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "_méret szerint"
 
 # src/file-manager/fm-icon-view.c:165
 # src/file-manager/nautilus-icon-view-ui.xml.h:18
-#: src/file-manager/fm-icon-view.c:166
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "Ikonok maradjanak méret szerint rendezve"
 
 # src/file-manager/fm-icon-view.c:171
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "_típus szerint"
 
 # src/file-manager/fm-icon-view.c:172
 # src/file-manager/nautilus-icon-view-ui.xml.h:19
-#: src/file-manager/fm-icon-view.c:173
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "Ikonok maradjanak típus szerint rendezve"
 
 # src/file-manager/fm-icon-view.c:178
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "mó_dosítás dátuma szerint"
 
 # src/file-manager/fm-icon-view.c:179
 # src/file-manager/nautilus-icon-view-ui.xml.h:16
-#: src/file-manager/fm-icon-view.c:180
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Ikonok maradjanak a módosítás dátuma szerint rendezve"
 
 # src/file-manager/fm-icon-view.c:185
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "_Matrica szerint"
 
 # src/file-manager/fm-icon-view.c:186
 # src/file-manager/nautilus-icon-view-ui.xml.h:15
-#: src/file-manager/fm-icon-view.c:187
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Ikonok maradjanak a matricák szerint rendezve"
 
 # src/file-manager/fm-icon-view.c:1225
 # src/file-manager/nautilus-icon-view-ui.xml.h:39
-#: src/file-manager/fm-icon-view.c:1230
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "Ikonok e_redeti méretének visszaállítása"
 
 # src/file-manager/fm-icon-view.c:1226
-#: src/file-manager/fm-icon-view.c:1231
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "Ikon e_redeti méretének visszaállítása"
 
 # src/file-manager/fm-icon-view.c:1440
-#: src/file-manager/fm-icon-view.c:1443
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "erre mutat: \"%s\""
 
 # src/file-manager/fm-list-view.c:1976
 # src/file-manager/fm-search-list-view.c:561
-#: src/file-manager/fm-list-view.c:2129
+#: src/file-manager/fm-list-view.c:2188
 #: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Méret"
 
 # src/file-manager/fm-list-view.c:1982
 # src/file-manager/fm-search-list-view.c:567
-#: src/file-manager/fm-list-view.c:2135
+#: src/file-manager/fm-list-view.c:2194
 #: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Típus"
 
 # src/file-manager/fm-list-view.c:1988
 # src/file-manager/fm-search-list-view.c:573
-#: src/file-manager/fm-list-view.c:2141
+#: src/file-manager/fm-list-view.c:2200
 #: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Módosítás dátuma"
@@ -8712,148 +8980,155 @@ msgid "Contents:"
 msgstr "Tartalom:"
 
 # src/file-manager/fm-properties-window.c:1418
-#: src/file-manager/fm-properties-window.c:1433
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "Alap"
 
 # src/file-manager/fm-properties-window.c:1497
-#: src/file-manager/fm-properties-window.c:1512
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Típus:"
 
 # src/file-manager/fm-properties-window.c:1502
-#: src/file-manager/fm-properties-window.c:1517
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "Méret:"
 
+# src/nautilus-link-set-window.c:189
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "Hivatkozáscsoportok"
+
 # src/file-manager/fm-properties-window.c:1506
-#: src/file-manager/fm-properties-window.c:1521
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
 msgstr "MIME-típus:"
 
 # src/file-manager/fm-properties-window.c:1512
-#: src/file-manager/fm-properties-window.c:1527
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "Módosítva:"
 
 # src/file-manager/fm-properties-window.c:1515
-#: src/file-manager/fm-properties-window.c:1530
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "Elérés:"
 
 # src/file-manager/fm-properties-window.c:1524
-#: src/file-manager/fm-properties-window.c:1539
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr "Egyéni ikon kiválasztása..."
 
 # src/file-manager/fm-properties-window.c:1530
-#: src/file-manager/fm-properties-window.c:1545
+#: src/file-manager/fm-properties-window.c:1558
 msgid "Remove Custom Icon"
 msgstr "Egyéni ikon eltávolítása"
 
 # src/file-manager/fm-properties-window.c:1855
-#: src/file-manager/fm-properties-window.c:1873
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "Felhasználói ID beállítása"
 
 # src/file-manager/fm-properties-window.c:1860
-#: src/file-manager/fm-properties-window.c:1878
+#: src/file-manager/fm-properties-window.c:1891
 msgid "Special Flags:"
 msgstr "Speciális kapcsolók:"
 
 # src/file-manager/fm-properties-window.c:1863
-#: src/file-manager/fm-properties-window.c:1881
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "Csoport ID beállítása"
 
 # src/file-manager/fm-properties-window.c:1865
-#: src/file-manager/fm-properties-window.c:1883
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "Ragadós (sticky)"
 
 # src/file-manager/fm-properties-window.c:1891
-#: src/file-manager/fm-properties-window.c:1909
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Jogosultságok"
 
 # src/file-manager/fm-properties-window.c:1897
-#: src/file-manager/fm-properties-window.c:1915
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Nem módosíthatod a jogosultságokat, mivel nem a tiéd a fájl."
 
 # src/file-manager/fm-properties-window.c:1910
-#: src/file-manager/fm-properties-window.c:1928
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "Fájl tulajdonosa:"
 
 # src/file-manager/fm-properties-window.c:1919
-#: src/file-manager/fm-properties-window.c:1937
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "Fájl csoportja:"
 
 # src/file-manager/fm-properties-window.c:1937
-#: src/file-manager/fm-properties-window.c:1955
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "Tulajdonos:"
 
 # src/file-manager/fm-properties-window.c:1938
-#: src/file-manager/fm-properties-window.c:1956
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "Csoport:"
 
 # src/file-manager/fm-properties-window.c:1939
-#: src/file-manager/fm-properties-window.c:1957
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "A többiek:"
 
 # src/file-manager/fm-properties-window.c:1958
-#: src/file-manager/fm-properties-window.c:1976
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "Olvasás"
 
 # src/file-manager/fm-properties-window.c:1962
-#: src/file-manager/fm-properties-window.c:1980
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "Írás"
 
 # src/file-manager/fm-properties-window.c:1966
-#: src/file-manager/fm-properties-window.c:1984
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "Futtatás"
 
 # src/file-manager/fm-properties-window.c:2017
-#: src/file-manager/fm-properties-window.c:2035
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "Szövegnézet:"
 
 # src/file-manager/fm-properties-window.c:2018
-#: src/file-manager/fm-properties-window.c:2036
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "Számnézet:"
 
 # src/file-manager/fm-properties-window.c:2019
-#: src/file-manager/fm-properties-window.c:2037
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "Utolsó változás:"
 
 # src/file-manager/fm-properties-window.c:2023
-#: src/file-manager/fm-properties-window.c:2041
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "\"%s\" jogosultságait nem lehetett megállapítani."
 
 # src/file-manager/fm-properties-window.c:2303
-#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr "Ne mutassa a tulajdonságok ablakot?"
 
 # src/file-manager/fm-properties-window.c:2304
-#: src/file-manager/fm-properties-window.c:2322
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr "Tulajdonságok létrehozása ablak"
 
 # src/file-manager/fm-properties-window.c:2401
-#: src/file-manager/fm-properties-window.c:2422
+#: src/file-manager/fm-properties-window.c:2435
 msgid "Select an icon:"
 msgstr "Ikon kijelölése:"
 
@@ -8882,7 +9157,7 @@ msgstr "Sajnálom, a Medusa keresés nem elérhetõ, mert nincs telepítve."
 # src/file-manager/fm-search-list-view.c:160
 # src/file-manager/nautilus-indexing-info.c:397
 #: src/file-manager/fm-search-list-view.c:159
-#: src/file-manager/nautilus-indexing-info.c:405
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr "Keresési szolgáltatás nem elérhetõ"
 
@@ -9085,7 +9360,7 @@ msgstr ""
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
 #: src/file-manager/fm-search-list-view.c:360
-#: src/file-manager/nautilus-indexing-info.c:340
+#: src/file-manager/nautilus-indexing-info.c:342
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
@@ -9102,7 +9377,7 @@ msgstr "A gyorskeresés nem érhetõ el a rendszereden"
 
 # src/file-manager/fm-search-list-view.c:247
 #: src/file-manager/fm-search-list-view.c:373
-#: src/file-manager/nautilus-indexing-info.c:359
+#: src/file-manager/nautilus-indexing-info.c:361
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Fast search is disabled in your Search preferences, so no index is available."
@@ -9113,13 +9388,13 @@ msgstr ""
 
 # src/file-manager/fm-search-list-view.c:251
 #: src/file-manager/fm-search-list-view.c:376
-#: src/file-manager/nautilus-indexing-info.c:345
-#: src/file-manager/nautilus-indexing-info.c:363
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
 msgid "Fast searches are not available on your computer."
 msgstr "A gyorskeresés nem elérhetõ a rendszereden"
 
 #: src/file-manager/fm-search-list-view.c:377
-#: src/file-manager/nautilus-indexing-info.c:364
+#: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
 "To enable fast search, open the Preferences menu and choose Preferences. "
 "Then select Search preferences and put a checkmark in the Enable Fast Search "
@@ -9185,7 +9460,7 @@ msgstr "Munkafelület hátterének megváltoztatása"
 # src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
 # src/file-manager/nautilus-directory-view-ui.xml.h:8
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Delete all items in the Trash"
 msgstr "Minden elem törlése a Kukából"
 
@@ -9244,176 +9519,232 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr ""
 "Válassz egy másik megjelenítõt, amivel megtekintheted a kijelölt elemet"
 
-# src/file-manager/nautilus-directory-view-ui.xml.h:4
+# libnautilus-extensions/nautilus-file-operations.c:1848
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-msgid "Create Link"
-msgstr "Kapocs létrehozása"
+#, fuzzy
+msgid "Copy Files"
+msgstr "Fájlok másolása"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:6
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "Új üres mappa létrehozása ebbe a mappába"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:7
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "Minden kijelölt elemre szimbolikus kapcsot hoz létre"
 
+# libnautilus-extensions/nautilus-file.c:3402
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u fájl"
+
+# src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "Minden kijelölt elem áthelyezése a Kukába"
+
 # src/file-manager/nautilus-directory-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "Kettõzés"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:10
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "Minden kijelölt elem kettõzése"
 
+# src/file-manager/nautilus-directory-view-ui.xml.h:4
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "Kapocs létrehozása"
+
 # src/file-manager/nautilus-directory-view-ui.xml.h:12
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr "Minden kijelölt elem áthelyezése a Kukába"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
 # src/file-manager/nautilus-directory-view-ui.xml.h:13
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Move to Trash"
 msgstr "Áthelyezés a Kukába"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:15
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "Új mappa"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:17
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "Megnyitás"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
 # src/file-manager/nautilus-directory-view-ui.xml.h:18
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid "Open Wit_h"
 msgstr "Megnyitás e_zzel"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:18
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "Megnyitás ezzel"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:19
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "Minden kijelölt elem megnyitása új ablakban"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:20
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr "Megnyitás új ablakban"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:21
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "A kijelölt elem megnyitása ebben a ablakban"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:22
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "Más alkalmazás..."
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:23
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "Más megjelenítõ..."
 
-# src/file-manager/nautilus-directory-view-ui.xml.h:24
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Other _Application..."
-msgstr "Más _alkalmazás..."
+# libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:87
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "Szöveg _beillesztése"
 
-# src/file-manager/nautilus-directory-view-ui.xml.h:25
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-msgid "Other _Viewer..."
-msgstr "Más _megjelenítõ..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:27
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr "Egyéni képek eltávolítása"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:28
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr "Minden egyéni kép eltávolítása a kijelölt ikonokról"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:29
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr "Minden egyéni szín és minta eltávolítása ennek a helynek a hátterérõl"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:30
 # src/nautilus-sidebar.c:490
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "Háttér visszaállítása"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+# data/browser.xml.h:68
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#, fuzzy
+msgid "Scripts"
+msgstr "Titok"
+
 # src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr "Minden fájlt kijelöl"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Select _All Files"
 msgstr "Minden fájlt _kijelöl"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:32
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "Minden elemet kijelöl ebben az ablakban"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:33
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr "Tulajdonságok mutatása"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:34
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Show Trash"
 msgstr "Kuka mutatása"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:35
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "_Tulajdonságok mutatása"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:36
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "Show the contents of the Trash"
 msgstr "A Kuka tartalmának mutatása"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
 # src/file-manager/nautilus-directory-view-ui.xml.h:37
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "Minden kijelölt elem tulajdonságainak megtekintése vagy módosítása"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:38
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "K_ettõzés"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:15
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_New Folder"
 msgstr "Új ma_ppa"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:40
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "_Megnyitás"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+# libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:87
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "Szöveg _beillesztése"
+
 # src/file-manager/nautilus-directory-view-ui.xml.h:43
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Show Trash"
 msgstr "_Kuka mutatása"
 
@@ -9634,7 +9965,7 @@ msgstr ""
 # src/file-manager/nautilus-indexing-info.c:280
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr "Indexelés állapota"
 
@@ -9655,12 +9986,12 @@ msgid "Your files were last indexed at %s"
 msgstr "A fájljaid utoljára ekkor voltak indexelve: %s"
 
 # src/file-manager/nautilus-indexing-info.c:248
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "Frissítés most"
 
 # src/file-manager/nautilus-indexing-info.c:278
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast.  Your files are currently being indexed."
@@ -9669,12 +10000,12 @@ msgstr ""
 "keresések gyorsabbak legyenek. Az indexelés folyamatban van."
 
 # src/file-manager/nautilus-indexing-info.c:396
-#: src/file-manager/nautilus-indexing-info.c:404
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Sajnálom, de a Medusa keresés nem elérhetõ."
 
 # src/file-manager/nautilus-indexing-info.c:418
-#: src/file-manager/nautilus-indexing-info.c:426
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -9879,7 +10210,7 @@ msgid "Location"
 msgstr "Hely"
 
 # src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:725
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:763
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Törlés"
 
@@ -10081,7 +10412,7 @@ msgstr "Gyorskeresés engedélyezése"
 msgid "Turn fast search on when cron is enabled"
 msgstr "A gyorskeresés bekapcsolása, ha fut cron démon"
 
-#: src/nautilus-first-time-druid.c:1028
+#: src/nautilus-first-time-druid.c:1027
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "currently can't be performed because the program crond, which does\n"
@@ -10106,7 +10437,7 @@ msgstr ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: src/nautilus-first-time-druid.c:1036
+#: src/nautilus-first-time-druid.c:1035
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "may not be performed because the program crond, which does nightly tasks\n"
@@ -10131,7 +10462,7 @@ msgstr ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: src/nautilus-first-time-druid.c:1123
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
 "Click Finish to launch Nautilus. You'll start with two\n"
 "Nautilus windows: one shows your home folder, and the\n"
@@ -10148,7 +10479,7 @@ msgstr ""
 "\n"
 "Reméljük élvezni fogod a Nautilus használatát."
 
-#: src/nautilus-first-time-druid.c:1130
+#: src/nautilus-first-time-druid.c:1129
 msgid ""
 "Click Finish to launch Nautilus. You'll start with a\n"
 "window showing your home folder.\n"
@@ -10161,16 +10492,16 @@ msgstr ""
 "Reméljük élvezni fogod a Nautilus használatát."
 
 # src/nautilus-first-time-druid.c:944
-#: src/nautilus-first-time-druid.c:1154
+#: src/nautilus-first-time-druid.c:1153
 msgid "Nautilus First Time Setup"
 msgstr "\"Elsõ találkozás\" beállítások"
 
 # src/nautilus-first-time-druid.c:974
-#: src/nautilus-first-time-druid.c:1184
+#: src/nautilus-first-time-druid.c:1183
 msgid "Welcome to Nautilus"
 msgstr "Üdvözöl a Nautilus!"
 
-#: src/nautilus-first-time-druid.c:1186
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
 "Nautilus...\n"
 "    Is a great file manager for the GNOME desktop.\n"
@@ -10190,58 +10521,58 @@ msgstr ""
 
 # src/nautilus-first-time-druid.c:995
 #. set up the final page
-#: src/nautilus-first-time-druid.c:1197
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "Befejezés"
 
 # src/nautilus-first-time-druid.c:1008
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1210
+#: src/nautilus-first-time-druid.c:1209
 msgid "Choose Your User Level"
 msgstr "Válassz felhasználói szintet"
 
 # src/nautilus-first-time-druid.c:1012
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1214
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr "GMC -> Nautilus átmenet"
 
 # libnautilus-extensions/nautilus-global-preferences.c:676
 #. set up the `Launch Medusa' page
-#: src/nautilus-first-time-druid.c:1218
+#: src/nautilus-first-time-druid.c:1217
 msgid "Fast Searches"
 msgstr "Gyorskeresés"
 
 #. set up optional page to tell the user how to run cron
-#: src/nautilus-first-time-druid.c:1226
+#: src/nautilus-first-time-druid.c:1225
 msgid "The Cron Daemon"
 msgstr "A Cron démon"
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1231
+#: src/nautilus-first-time-druid.c:1230
 msgid "Checking Your Internet Connection"
 msgstr "Internetkapcsolat ellenõrzése"
 
 # src/nautilus-first-time-druid.c:1028
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1242
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "A Nautilus frissítése..."
 
 # src/nautilus-first-time-druid.c:1036
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1250
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "Web Proxy beállítása"
 
 # src/nautilus-first-time-druid.c:1108
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1325
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "A frissítés dekódolása..."
 
 # src/nautilus-first-time-druid.c:1125
-#: src/nautilus-first-time-druid.c:1342
+#: src/nautilus-first-time-druid.c:1341
 msgid "Update Complete. Click Next to Continue."
 msgstr "Frissítés sikeres. Kattints a Következõ gombra a folytatáshoz."
 
@@ -10250,7 +10581,7 @@ msgstr "Frissítés sikeres. Kattints a Következõ gombra a folytatáshoz."
 #. * doesn't exist. Arlo and I (jsh) and decided that the
 #. * best thing to do is silently fail
 #.
-#: src/nautilus-first-time-druid.c:1357
+#: src/nautilus-first-time-druid.c:1356
 msgid "No Update Available... Press Next to Continue."
 msgstr "Nincs elérhetõ frissítés. Kattints a Következõ gombra a folytatáshoz."
 
@@ -10285,57 +10616,57 @@ msgid "View in Multiple Windows?"
 msgstr "Megtekintés külön ablakokban?"
 
 # src/nautilus-main.c:144
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr "Néhány gyors ellenõrzõrutin futtatása."
 
 # src/nautilus-main.c:147
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "Az indulóablak létrehozása adott helyen és méretekkel."
 
 # src/nautilus-main.c:147
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "GEOMETRY"
 
 # src/nautilus-main.c:149
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Csak a kifejezetten megadott URI-khez hozzon létre ablakot."
 
 # src/nautilus-main.c:151
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "Kilépés a Nautilusból."
 
 # src/nautilus-main.c:153
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "A Nautilus újraindítása."
 
 # src/nautilus-main.c:208
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check nem használható URI-kel.\n"
 
 # src/nautilus-main.c:212
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check nem használható más paraméterekkel.\n"
 
 # src/nautilus-main.c:216
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit nem használható URI-kel.\n"
 
 # src/nautilus-main.c:220
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart nem használható URI-kel.\n"
 
 # src/nautilus-main.c:224
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry nem használható több mint egy URI-vel.\n"
 
@@ -10946,17 +11277,20 @@ msgstr "Listaként"
 
 # src/nautilus-shell-ui.xml.h:1
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+#, fuzzy
+msgid " _Advanced"
 msgstr " Haladó"
 
 # src/nautilus-shell-ui.xml.h:2
 #: src/nautilus-shell-ui.xml.h:2
-msgid " Beginner"
+#, fuzzy
+msgid " _Beginner"
 msgstr " Kezdõ"
 
 # src/nautilus-shell-ui.xml.h:3
 #: src/nautilus-shell-ui.xml.h:3
-msgid " Intermediate"
+#, fuzzy
+msgid " _Intermediate"
 msgstr " Középszintû"
 
 # src/nautilus-shell-ui.xml.h:4
@@ -11004,30 +11338,25 @@ msgstr "Minden Nautilus ablak bezárása"
 msgid "Close this window"
 msgstr "Aktuális ablak bezárása"
 
-# src/nautilus-shell-ui.xml.h:15
-#: src/nautilus-shell-ui.xml.h:15
-msgid "Cut _Text"
-msgstr "Szöveg ki_vágása"
-
 # src/nautilus-shell-ui.xml.h:17
-#: src/nautilus-shell-ui.xml.h:17
+#: src/nautilus-shell-ui.xml.h:15
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr ""
 "Megjelenít egy ablakot, amelybõl szerkesztheted az ehhez a menühöz tartozó "
 "könyvjelzõket"
 
 # src/nautilus-shell-ui.xml.h:18
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr "Információ a Nautilus szerzõirõl"
 
 # src/nautilus-shell-ui.xml.h:19
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr "Súgó a Nautilushoz"
 
 # src/nautilus-shell-ui.xml.h:20
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
@@ -11036,169 +11365,154 @@ msgstr ""
 "Nautilust"
 
 # src/nautilus-shell-ui.xml.h:22
-#: src/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:19
 msgid "Display quick reference pages for Nautilus"
 msgstr "Rövid útmutató megjelenítése a Nautilushoz"
 
 # src/nautilus-shell-ui.xml.h:22
-#: src/nautilus-shell-ui.xml.h:22
+#: src/nautilus-shell-ui.xml.h:20
 msgid "Display release notes for Nautilus"
 msgstr "A Nautilus ezen változatához fûzött megjegyzések mgjelenítése"
 
 # src/nautilus-service-ui.xml.h:1
-#: src/nautilus-shell-ui.xml.h:23
+#: src/nautilus-shell-ui.xml.h:21
 msgid "Display support information for Nautilus and Eazel Services"
 msgstr ""
 "Információ megjelenítése a Nautilusszal és az Eazel Szolgáltásokkal "
 "kapcsolatos terméktámogatásról"
 
 # src/nautilus-shell-ui.xml.h:21
-#: src/nautilus-shell-ui.xml.h:24
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Display the latest contents of the current location"
 msgstr "Frissíti a jelenlegi hely nézetét"
 
 # src/nautilus-shell-ui.xml.h:23
-#: src/nautilus-shell-ui.xml.h:25
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr "Az elérhetõ témák megjelenítése"
 
 # src/nautilus-shell-ui.xml.h:24
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:24
 msgid "Edit various Nautilus preferences"
 msgstr "A Nautilus beállításainak megváltoztatása"
 
 # src/nautilus-shell-ui.xml.h:25
-#: src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "Keresés"
 
 # src/nautilus-shell-ui.xml.h:26
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr "Emlékezet _törlése"
 
 # src/nautilus-shell-ui.xml.h:27
-#: src/nautilus-shell-ui.xml.h:29
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr "Irány az Eazel Szolgáltatások"
 
 # src/nautilus-shell-ui.xml.h:28
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr "Irány a kezdõoldal"
 
 # src/nautilus-shell-ui.xml.h:29
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr "Ugrás az ezt a helyet tartalmazó helyre"
 
 # src/nautilus-shell-ui.xml.h:30
-#: src/nautilus-shell-ui.xml.h:32
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr "A következõ meglátogatott helyre ugrik"
 
 # src/nautilus-shell-ui.xml.h:31
-#: src/nautilus-shell-ui.xml.h:33
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr "Az elõzõ meglátogatott helyre ugrik"
 
 # src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:434
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:442
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
 msgid "Hide Location _Bar"
 msgstr "_Címsáv elrejtése"
 
 # src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:416
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:424
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
 msgid "Hide St_atus Bar"
 msgstr "_Státuszsor elrejtése"
 
 # src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:422
-#: src/nautilus-shell-ui.xml.h:36 src/nautilus-window-menus.c:430
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
 msgid "Hide _Sidebar"
 msgstr "_Oldalpanel elrejtése"
 
 # src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:428
-#: src/nautilus-shell-ui.xml.h:37 src/nautilus-window-menus.c:436
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
 msgid "Hide _Toolbar"
 msgstr "_Eszközsor elrejtése"
 
 # libnautilus-extensions/nautilus-global-preferences.c:44
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:37
 msgid "Nautilus Quick _Reference"
 msgstr "Nautilus Rövid Ú_tmutató"
 
 # libnautilus-extensions/nautilus-global-preferences.c:44
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:38
 msgid "Nautilus Release _Notes"
 msgstr "Megjegyzések a Nautilus ezen kiadásához"
 
 # src/nautilus-shell-ui.xml.h:84
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:39
 msgid "Nautilus User _Manual"
 msgstr "Nautilus _Felhasználói Kézikönyv"
 
 # src/nautilus-shell-ui.xml.h:38
-#: src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "Új ablak"
 
 # src/nautilus-shell-ui.xml.h:38
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:41
 msgid "New _Window"
 msgstr "Új a_blak"
 
 # src/nautilus-shell-ui.xml.h:39
-#: src/nautilus-shell-ui.xml.h:44
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "Normál méret"
 
 # src/nautilus-shell-ui.xml.h:40
-#: src/nautilus-shell-ui.xml.h:45
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Egy másik Nautilus ablak nyitása a megjelenített helyhez"
 
-# src/nautilus-shell-ui.xml.h:42
-#: src/nautilus-shell-ui.xml.h:47
-msgid "Preferences..."
-msgstr "Beállítások..."
-
 # src/nautilus-shell-ui.xml.h:43
-#: src/nautilus-shell-ui.xml.h:48
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "Frissítés"
 
-# src/nautilus-shell-ui.xml.h:44
-#: src/nautilus-shell-ui.xml.h:49
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "Törli a kijelölt szöveget, a vágólapra helyezés nélkül"
-
 # src/nautilus-shell-ui.xml.h:45
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr ""
 
 # src/nautilus-shell-ui.xml.h:46
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr ""
 
 # src/nautilus-shell-ui.xml.h:47
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr "Keresés a Weben"
 
 # src/nautilus-shell-ui.xml.h:48
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr "Fájlok keresése ezen a számítógépen"
 
-# src/nautilus-shell-ui.xml.h:92
-#: src/nautilus-shell-ui.xml.h:54
-msgid "Select _All"
-msgstr "M_indent kijelöl"
-
 # src/nautilus-shell-ui.xml.h:49
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
@@ -11207,222 +11521,237 @@ msgstr ""
 "Nautilusról és az Eazel Szolgáltatásokról"
 
 # src/nautilus-shell-ui.xml.h:50
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "A tartalom mutatása normál méretben"
 
 # src/nautilus-shell-ui.xml.h:51
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "Kevesebb részlet mutatása"
 
 # src/nautilus-shell-ui.xml.h:52
-#: src/nautilus-shell-ui.xml.h:58
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "Több részlet mutatása"
 
 # src/nautilus-shell-ui.xml.h:53
-#: src/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr ""
 
 # src/nautilus-shell-ui.xml.h:55
-#: src/nautilus-shell-ui.xml.h:61
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr ""
 
 # src/nautilus-shell-ui.xml.h:56
-#: src/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr "Hely betöltésének leállítása"
 
 # src/nautilus-shell-ui.xml.h:57
-#: src/nautilus-shell-ui.xml.h:63
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "Utolsó szövegváltoztatás visszavonása"
 
 # src/nautilus-shell-ui.xml.h:58
-#: src/nautilus-shell-ui.xml.h:64
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "Fel"
 
-# src/nautilus-shell-ui.xml.h:59
-#: src/nautilus-shell-ui.xml.h:65
-msgid "Use Advanced settings"
-msgstr "Haladó beállítások használata"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-# src/nautilus-shell-ui.xml.h:60
-#: src/nautilus-shell-ui.xml.h:66
-msgid "Use Beginner settings"
-msgstr "Kezdõ beállítások használata"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
-# src/nautilus-shell-ui.xml.h:61
-#: src/nautilus-shell-ui.xml.h:67
-msgid "Use Intermediate settings"
-msgstr "Középszintû beállítások használata"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
 # src/nautilus-shell-ui.xml.h:62
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:63
 msgid "We_b Search"
 msgstr "Keresés a _weben"
 
 # src/nautilus-shell-ui.xml.h:62
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "Keresés a weben"
 
 # src/nautilus-shell-ui.xml.h:63
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "Nagyítás"
 
 # src/nautilus-shell-ui.xml.h:64
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "Kicsinyítés"
 
 # src/nautilus-shell-ui.xml.h:65
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "_Nagyítás"
 
 # src/nautilus-shell-ui.xml.h:66
-#: src/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "_Kicsinyítés"
 
 # src/nautilus-shell-ui.xml.h:67
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "A Nautilus _névjegye..."
 
 # src/nautilus-shell-ui.xml.h:68
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "Könyvjelzõ hozzá_adása"
 
 # src/nautilus-shell-ui.xml.h:69
-#: src/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "_Vissza"
 
 # src/nautilus-shell-ui.xml.h:70
-#: src/nautilus-shell-ui.xml.h:77
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr "_Hátterek és matricák..."
 
 # src/nautilus-shell-ui.xml.h:71
-#: src/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "_Könyvjelzõk"
 
 # src/nautilus-shell-ui.xml.h:72
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "Ablak _bezárása"
 
 # src/nautilus-service-ui.xml.h:10
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:76
 msgid "_Customer Support"
 msgstr "_Támogatás"
 
 # src/nautilus-shell-ui.xml.h:74
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "_Szerkesztés"
 
 # src/nautilus-shell-ui.xml.h:75
-#: src/nautilus-shell-ui.xml.h:83
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "Könyvjelzõk _szerkesztése..."
 
+# src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "Beállítások..."
+
 # src/nautilus-shell-ui.xml.h:76
-#: src/nautilus-shell-ui.xml.h:84
+#: src/nautilus-shell-ui.xml.h:80
 msgid "_Feedback"
 msgstr "_Visszajelzés"
 
 # src/nautilus-shell-ui.xml.h:78 src/nautilus-window-menus.c:1280
-#: src/nautilus-shell-ui.xml.h:86 src/nautilus-window-menus.c:1358
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "_Keresés"
 
 # src/nautilus-shell-ui.xml.h:79
-#: src/nautilus-shell-ui.xml.h:87
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "_Elõre"
 
 # src/nautilus-shell-ui.xml.h:80
-#: src/nautilus-shell-ui.xml.h:88
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "_Ugrás"
 
 # src/nautilus-shell-ui.xml.h:81
-#: src/nautilus-shell-ui.xml.h:89
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "_Súgó"
 
 # src/nautilus-shell-ui.xml.h:82
-#: src/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "_Kezdõlap"
 
+# src/nautilus-bookmarks-window.c:177
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "Hely"
+
 # src/nautilus-shell-ui.xml.h:83
-#: src/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr "_Nautilus témák..."
 
 # src/nautilus-shell-ui.xml.h:86
-#: src/nautilus-shell-ui.xml.h:92
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "_Normál méret"
 
+# src/nautilus-window-menus.c:484
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "Beállítások"
+
 # src/nautilus-shell-ui.xml.h:88
-#: src/nautilus-shell-ui.xml.h:94
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr ""
 
 # src/nautilus-shell-ui.xml.h:89
-#: src/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "_Frissítés"
 
 # src/nautilus-shell-ui.xml.h:90
-#: src/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr ""
 
 # src/nautilus-shell-ui.xml.h:91
-#: src/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr ""
 
 # src/nautilus-shell-ui.xml.h:93
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr ""
 
 # src/nautilus-shell-ui.xml.h:94
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr ""
 
 # src/nautilus-shell-ui.xml.h:95
-#: src/nautilus-shell-ui.xml.h:100
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "_Visszavonás"
 
 # src/nautilus-shell-ui.xml.h:96
-#: src/nautilus-shell-ui.xml.h:101
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "_Fel egy szintet"
 
 # src/nautilus-shell-ui.xml.h:97
-#: src/nautilus-shell-ui.xml.h:102
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "_Nézet"
 
 # src/nautilus-sidebar.c:663
-#: src/nautilus-sidebar.c:659
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -11431,12 +11760,12 @@ msgstr ""
 "az elemre a testreszabott ikon beállításához"
 
 # src/nautilus-sidebar.c:665
-#: src/nautilus-sidebar.c:661
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "Több mint egy kép"
 
 # src/nautilus-sidebar.c:684
-#: src/nautilus-sidebar.c:680
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -11445,12 +11774,12 @@ msgstr ""
 "ikonként."
 
 # src/nautilus-sidebar.c:686
-#: src/nautilus-sidebar.c:682
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "Csak helyi képek"
 
 # src/nautilus-sidebar.c:691
-#: src/nautilus-sidebar.c:687
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -11459,25 +11788,25 @@ msgstr ""
 "ikonként."
 
 # src/nautilus-sidebar.c:693
-#: src/nautilus-sidebar.c:689
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "Csak képek"
 
 # src/nautilus-sidebar.c:1251
-#: src/nautilus-sidebar.c:1247
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "Megnyitás ezzel: %s"
 
 # src/nautilus-sidebar.c:1287
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1283
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "Megnyitás ezzel..."
 
 # src/nautilus-sidebar.c:1393
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1390
+#: src/nautilus-sidebar.c:1424
 msgid "  Empty Trash  "
 msgstr "  Kuka ürítése  "
 
@@ -11588,18 +11917,18 @@ msgid "No description available for the \"%s\" theme"
 msgstr "Nincs leírás a következõ témához: %s"
 
 # src/nautilus-window.c:1113
-#: src/nautilus-window.c:584
+#: src/nautilus-window.c:637
 msgid "View as ..."
 msgstr "Nézet mint..."
 
 # src/nautilus-window.c:1113
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1286
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "Nézet másként..."
 
 # src/nautilus-window.c:1476
-#: src/nautilus-window.c:1687
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "Bezárás"
 
@@ -11615,12 +11944,12 @@ msgid "Preview Release %s: %s"
 msgstr "%s elõnézet változat: %s"
 
 # src/nautilus-window-manage-views.c:754
-#: src/nautilus-window-manage-views.c:812
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "Sikertelen megtekintés"
 
 # src/nautilus-window-manage-views.c:765
-#: src/nautilus-window-manage-views.c:823
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
@@ -11630,13 +11959,13 @@ msgstr ""
 "Választhatsz másik nézetet vagy megnézhetsz egy másik helyet."
 
 # src/nautilus-window-manage-views.c:776
-#: src/nautilus-window-manage-views.c:834
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "A(z) %smegjelenítõ hibát észlelt induláskor."
 
 # src/nautilus-window-manage-views.c:925
-#: src/nautilus-window-manage-views.c:993
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
@@ -11645,7 +11974,7 @@ msgstr ""
 "állapítható meg, hogy melyik oldalpanelrõl van szó."
 
 # src/nautilus-window-manage-views.c:929
-#: src/nautilus-window-manage-views.c:997
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
@@ -11655,19 +11984,19 @@ msgstr ""
 "is fennáll, kapcsold ki a kérdéses panelt."
 
 # src/nautilus-window-manage-views.c:934
-#: src/nautilus-window-manage-views.c:1002
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "Oldalpanel hibát észlelt"
 
 # src/nautilus-window-manage-views.c:1151
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr ""
 "\"%s\" nem található. Ellenõrizd, hogy nem gépelted el és próbáld újra."
 
 # src/nautilus-window-manage-views.c:1157
-#: src/nautilus-window-manage-views.c:1223
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
@@ -11675,7 +12004,7 @@ msgstr ""
 "\"%s\" nem érvényes hely. Ellenõrizd, hogy nem gépelted el és próbáld újra."
 
 # src/nautilus-window-manage-views.c:1171
-#: src/nautilus-window-manage-views.c:1237
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -11685,7 +12014,7 @@ msgstr ""
 "fájl típusát."
 
 # src/nautilus-window-manage-views.c:1179
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr ""
@@ -11694,7 +12023,7 @@ msgstr ""
 
 # src/nautilus-window-manage-views.c:1191
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1257
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
@@ -11702,19 +12031,19 @@ msgstr ""
 "helyeket."
 
 # src/nautilus-window-manage-views.c:1197
-#: src/nautilus-window-manage-views.c:1263
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "\"%s\" nem jeleníthetõ meg, mert a bejelentkezés sikertelen volt."
 
 # src/nautilus-window-manage-views.c:1202
-#: src/nautilus-window-manage-views.c:1268
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "\"%s\" nem jeleníthetõ meg, mert a hozzásférés le van tiltva."
 
 # src/nautilus-window-manage-views.c:1213
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1287
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
@@ -11724,7 +12053,7 @@ msgstr ""
 "Ellenõrizd, hogy jól írtál be mindent és hogy a proxy beállítások jók."
 
 # src/nautilus-window-manage-views.c:1221
-#: src/nautilus-window-manage-views.c:1287
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -11732,7 +12061,7 @@ msgid ""
 msgstr ""
 
 # src/nautilus-window-manage-views.c:1233
-#: src/nautilus-window-manage-views.c:1299
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -11741,18 +12070,18 @@ msgid ""
 msgstr ""
 
 # src/nautilus-window-manage-views.c:1237
-#: src/nautilus-window-manage-views.c:1303
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "A keresés nem elérhetõ"
 
 # src/nautilus-window-manage-views.c:1241
-#: src/nautilus-window-manage-views.c:1307
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "A Nautilus nem tudja megjeleníteni a következõt: \"%s\"."
 
 # src/nautilus-window-manage-views.c:1246
-#: src/nautilus-window-manage-views.c:1312
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "A hely megjelenítése sikertelen."
 
@@ -11760,7 +12089,7 @@ msgstr "A hely megjelenítése sikertelen."
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:313
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
@@ -11769,7 +12098,7 @@ msgstr ""
 "hogy milyen helyeken jártál már."
 
 # src/nautilus-window-menus.c:310
-#: src/nautilus-window-menus.c:316
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
@@ -11777,37 +12106,37 @@ msgstr ""
 "jártál már?"
 
 # src/nautilus-window-menus.c:315
-#: src/nautilus-window-menus.c:321
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "Emlékezet törlése?"
 
 # src/nautilus-window-menus.c:316
-#: src/nautilus-window-menus.c:322
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "Törlés"
 
 # src/nautilus-window-menus.c:417
-#: src/nautilus-window-menus.c:425
+#: src/nautilus-window-menus.c:466
 msgid "Show St_atus Bar"
 msgstr "_Státuszsor mutatása"
 
 # src/nautilus-window-menus.c:423
-#: src/nautilus-window-menus.c:431
+#: src/nautilus-window-menus.c:472
 msgid "Show _Sidebar"
 msgstr "_Oldalpanel mutatása"
 
 # src/nautilus-window-menus.c:429
-#: src/nautilus-window-menus.c:437
+#: src/nautilus-window-menus.c:478
 msgid "Show _Toolbar"
 msgstr "_Eszközsor mutatása"
 
 # src/nautilus-window-menus.c:435
-#: src/nautilus-window-menus.c:443
+#: src/nautilus-window-menus.c:484
 msgid "Show Location _Bar"
 msgstr "_Címsáv mutatása"
 
 # src/nautilus-window-menus.c:484
-#: src/nautilus-window-menus.c:494
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "Beállítások"
 
@@ -11818,12 +12147,12 @@ msgstr "Beállítások"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:577
+#: src/nautilus-window-menus.c:618
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
 # src/nautilus-window-menus.c:563
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -11842,12 +12171,12 @@ msgstr ""
 #. * bottom of the about box to give credit
 #. * to the translator(s)
 #.
-#: src/nautilus-window-menus.c:588
+#: src/nautilus-window-menus.c:629
 msgid "Translator Credits"
 msgstr "Fordítók"
 
 # src/nautilus-window-menus.c:720
-#: src/nautilus-window-menus.c:758
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -11857,31 +12186,26 @@ msgstr ""
 "amely ide mutat?"
 
 # src/nautilus-window-menus.c:724
-#: src/nautilus-window-menus.c:762
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "Nem létezõ helyre mutató könyvjelzõ"
 
 # src/nautilus-window-menus.c:738
-#: src/nautilus-window-menus.c:776
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "A \"%s\" hely nem létezik tovább."
 
 # src/nautilus-window-menus.c:739
-#: src/nautilus-window-menus.c:777
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "Nemlétezõ helyre ugrik"
 
 # src/nautilus-window-menus.c:806
-#: src/nautilus-window-menus.c:846
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "Ugrás a könyvjelzõ által jelölt helyre"
 
-# src/nautilus-window-menus.c:1279
-#: src/nautilus-window-menus.c:1357
-msgid "_Browse"
-msgstr "_Böngészés"
-
 # src/nautilus-window-toolbars.c:381
 #: src/nautilus-window-toolbars.c:402
 msgid "Back"
@@ -11900,6 +12224,159 @@ msgstr "Elõre"
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*-r-"
 
+# libnautilus-extensions/nautilus-icon-factory.c:133
+#~ msgid "helvetica"
+#~ msgstr "helvetica"
+
+# components/text/nautilus-text-view-ui.xml.h:7
+#~ msgid "_Fonts"
+#~ msgstr "_Betûkészletek"
+
+# libnautilus-extensions/nautilus-file-operations.c:1940
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "Nem lehet a fájlt saját magára áthelyezni."
+
+# libnautilus-extensions/nautilus-file-operations.c:1943
+#~ msgid "Can't Move Onto Self"
+#~ msgstr "Nem lehet az objektumot saját magára áthelyezni"
+
+# src/nautilus-shell-ui.xml.h:39
+#~ msgid "Normal"
+#~ msgstr "Normál"
+
+# data/static_bookmarks.xml.h:1
+#~ msgid "Bold"
+#~ msgstr "Kövér"
+
+# components/music/mpg123.c:33
+#~ msgid "Book"
+#~ msgstr "Könyv"
+
+#~ msgid "Demibold"
+#~ msgstr "Félkövér"
+
+# src/Nautilus_shell.oaf.in.h:3
+#~ msgid "Light"
+#~ msgstr "Világos"
+
+# components/mozilla/nautilus-mozilla-embed-extensions.cpp:318
+#~ msgid "Italic"
+#~ msgstr "Kurzív"
+
+# components/music/mpg123.c:31
+#~ msgid "Oblique"
+#~ msgstr "Hamis kurzív"
+
+#~ msgid "Reverse Italic"
+#~ msgstr "Fordított kurzív"
+
+# src/file-manager/nautilus-icon-view-ui.xml.h:30
+#~ msgid "Reverse Oblique"
+#~ msgstr "Fordított hamis kurzív"
+
+# src/file-manager/fm-properties-window.c:1085
+#~ msgid "Condensed"
+#~ msgstr "Keskenyített"
+
+#~ msgid "Semicondensed"
+#~ msgstr "Félkeskenyített"
+
+# libnautilus-extensions/nautilus-font-picker.c:131
+#~ msgid "Font"
+#~ msgstr "Betûkészlet"
+
+# libnautilus-extensions/nautilus-gdk-font-extensions.c:638
+#~ msgid "fixed"
+#~ msgstr "fixed"
+
+# libnautilus-extensions/nautilus-glib-extensions.c:1221
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00"
+
+# libnautilus-extensions/nautilus-glib-extensions.c:1222
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00"
+
+# libnautilus-extensions/nautilus-glib-extensions.c:1223
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00"
+
+# libnautilus-extensions/nautilus-global-preferences.c:87
+#~ msgid "current theme"
+#~ msgstr "jelenlegi téma"
+
+# libnautilus-extensions/nautilus-global-preferences.c:151
+#~ msgid "Use this font family to display file names:"
+#~ msgstr "Fájlnevek megjelenítése ezzel a betûcsaláddal:"
+
+# libnautilus-extensions/nautilus-global-preferences.c:203
+#~ msgid "Can add Content"
+#~ msgstr "Hozzáadhat tartalmat"
+
+#~ msgid "No image was selected.  You must click on an image to select it."
+#~ msgstr "Nincs kijelölt kép. Kattints egy képre annak kijelöléséhez."
+
+# components/help/converters/gnome-db2html2/sect-elements.c:1028
+#~ msgid "No selection made"
+#~ msgstr "Nincs kijelölés"
+
+#~ msgid "Remember this password"
+#~ msgstr "Jelszó mentése"
+
+# components/text/nautilus-text-view-ui.xml.h:9
+#~ msgid "times"
+#~ msgstr "times"
+
+# components/text/nautilus-text-view-ui.xml.h:6
+#~ msgid "courier"
+#~ msgstr "courier"
+
+# components/text/nautilus-text-view-ui.xml.h:1
+#~ msgid "lucida"
+#~ msgstr "lucida"
+
+# libnautilus-extensions/nautilus-stock-dialogs.c:572
+#~ msgid "Details"
+#~ msgstr "Részletek"
+
+# libnautilus-extensions/nautilus-stock-dialogs.c:519
+#~ msgid "Warning"
+#~ msgstr "Figyelmeztetés"
+
+# libnautilus-extensions/nautilus-stock-dialogs.c:530
+# libnautilus-extensions/nautilus-stock-dialogs.c:570
+#~ msgid "Error"
+#~ msgstr "Hiba"
+
+# libnautilus-extensions/nautilus-stock-dialogs.c:603
+# libnautilus-extensions/nautilus-stock-dialogs.c:631
+#~ msgid "Question"
+#~ msgstr "Kérdés"
+
+# libnautilus/nautilus-clipboard-ui.xml.h:7
+#~ msgid "_Cut Text"
+#~ msgstr "Szöveg ki_vágása"
+
+# src/nautilus-shell-ui.xml.h:44
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "Törli a kijelölt szöveget, a vágólapra helyezés nélkül"
+
+# src/nautilus-shell-ui.xml.h:59
+#~ msgid "Use Advanced settings"
+#~ msgstr "Haladó beállítások használata"
+
+# src/nautilus-shell-ui.xml.h:60
+#~ msgid "Use Beginner settings"
+#~ msgstr "Kezdõ beállítások használata"
+
+# src/nautilus-shell-ui.xml.h:61
+#~ msgid "Use Intermediate settings"
+#~ msgstr "Középszintû beállítások használata"
+
+# src/nautilus-window-menus.c:1279
+#~ msgid "_Browse"
+#~ msgstr "_Böngészés"
+
 # libnautilus-extensions/nautilus-file-operations.c:2164
 #~ msgid "You cannot throw \"%s\" into the Trash."
 #~ msgstr "A következõt nem dobhatod a Kukába: \"%s\"."
@@ -11999,10 +12476,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*-r-"
 #~ msgid "Verify"
 #~ msgstr "Ellenõrzés"
 
-# components/rpmview/nautilus-rpm-view.c:373
-#~ msgid "Description"
-#~ msgstr "Leírás"
-
 # components/rpmview/nautilus-rpm-view.c:492
 #~ msgid "Package Contents: %d files"
 #~ msgstr "Csomag taralma: %d fájl"
@@ -12133,10 +12606,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*-r-"
 #~ msgid "Cannot access the local package system\n"
 #~ msgstr "A helyi csomagkezelõ-rendszer nem érhetõ el\n"
 
-# components/services/install/command-line/eazel-alt-install-corba.c:125
-#~ msgid "Revert"
-#~ msgstr "Visszaállítás"
-
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1169
 #~ msgid " · %s is in the Gnome menu.\n"
 #~ msgstr " · %s a Gnome menüben található.\n"
@@ -12194,10 +12663,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*-r-"
 #~ msgid "Force install"
 #~ msgstr "Erõltetett telepítés"
 
-# data/browser.xml.h:68
-#~ msgid "Secret"
-#~ msgstr "Titok"
-
 # data/browser.xml.h:70
 #~ msgid "Shared"
 #~ msgstr "Megosztott"
diff --git a/po/it.po b/po/it.po
index 19efc11aa..9ca9c95e8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,16 +1,15 @@
 # Italian translation for Nautilus
 # Christopher R. Gabriel <cgabriel@pluto.linux.it>, 2000
 #
-#: libnautilus-extensions/nautilus-search-uri.c:362
-#: libnautilus-extensions/nautilus-search-uri.c:368
-#: libnautilus-extensions/nautilus-search-uri.c:371
-#: libnautilus-extensions/nautilus-search-uri.c:374
-#: libnautilus-extensions/nautilus-search-uri.c:377
-#: libnautilus-extensions/nautilus-search-uri.c:380
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 0.1\n"
-"POT-Creation-Date: 2000-10-28 02:36+0200\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2000-10-28 03:51+02:00\n"
 "Last-Translator: Christopher R. Gabriel <cgabriel@pluto.linux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -18,6 +17,229 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: applets/launcher/nautilus-launcher-applet.c:272
+msgid "Can't create nautilus-launcher-applet!"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:211
+msgid "Can't create nautilus-preferences-applet!"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:226
+msgid "Show Desktop"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:230
+msgid "Smooth Graphics"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:243
+#: src/nautilus-application.c:639
+msgid "Quit"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:251
+msgid "Start"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:259
+#, fuzzy
+msgid "Restart"
+msgstr "Ripristina"
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:1
+msgid "Factory for Nautilus component adapter factories"
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:2
+msgid "Factory for Nautilus component adapter factories "
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:3
+msgid ""
+"Factory for objects that wrap ordinary Bonobo Controls or Embeddables to "
+"look like Nautilus Views"
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:4
+msgid "Nautilus component adapter factory"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:230
+#, c-format
+msgid ""
+"%s CPU\n"
+"%s MHz\n"
+"%s cache size"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:264
+#, c-format
+msgid "%lu GB RAM"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:266
+#, c-format
+msgid "%lu MB RAM"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:324
+#, c-format
+msgid "%lu GB"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:326
+#, c-format
+msgid "%lu MB"
+msgstr ""
+
+#. set up the title
+#: components/hardware/nautilus-hardware-view.c:407
+msgid "Hardware Overview"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:520
+msgid "This is a placeholder for the CPU page."
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:545
+msgid "This is a placeholder for the RAM page."
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:570
+msgid "This is a placeholder for the IDE page."
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:2
+#: components/hardware/nautilus-hardware-view.c:631
+#: data/static_bookmarks.xml.h:16
+msgid "Hardware"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:1
+msgid "Factory for hardware view"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:3
+msgid "Hardware Viewer"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:4
+msgid "Hardware view"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:5
+msgid "View as Hardware"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:6
+msgid "hardware view"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/gdb3html.c:712
+#: components/music/nautilus-music-view.c:1512
+msgid "Previous"
+msgstr "Precedente"
+
+#: components/help/converters/gnome-db2html2/gdb3html.c:721
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
+msgid "Home"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/gdb3html.c:730
+#: components/music/nautilus-music-view.c:1568
+msgid "Next"
+msgstr "Successivo"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:259
+#: components/notes/Nautilus_View_notes.oaf.in.h:2
+#, fuzzy
+msgid "Notes"
+msgstr "Nessun risultato."
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:709
+#, c-format
+msgid "Table %d."
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:864
+msgid "Up to Table of Contents"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1012
+#, fuzzy, c-format
+msgid "Figure %s"
+msgstr "sono %s"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1032
+msgid "the section here"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1034
+#, fuzzy
+msgid "the section"
+msgstr "Descrizione"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1090
+#, c-format
+msgid "Figure %d"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1102
+msgid "IMAGE"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:2068
+#: components/help/converters/gnome-db2html2/sect-elements.c:2070
+msgid "Legal Notice"
+msgstr ""
+
+#. This 'Q' is short for 'Question:'
+#: components/help/converters/gnome-db2html2/sect-elements.c:2116
+msgid "Q"
+msgstr ""
+
+#. This 'A' is short for 'Answer'
+#: components/help/converters/gnome-db2html2/sect-elements.c:2128
+msgid "A"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:2151
+#, fuzzy
+msgid "See"
+msgstr "Stero"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:2178
+#, fuzzy
+msgid "See also"
+msgstr "guarda inoltre "
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:322
+msgid "GNOME Documentation"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:353
+msgid "Copyright"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:353
+msgid "by"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:355
+#, fuzzy
+msgid "Table of Contents"
+msgstr "Contenuto pacchetto"
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:521
+msgid "PREFACE"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:530
+msgid "APPENDIX"
+msgstr ""
+
 #. * From 'man(7)':
 #.
 #. The manual sections are traditionally defined as follows:
@@ -58,59 +280,83 @@ msgstr ""
 #. GNU Public  License  and  many  people  are
 #. working on changes to the kernel)
 #. **
-#: components/help/hyperbola-filefmt.c:396
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:537
+#: components/help/hyperbola-filefmt.c:538
+#: components/help/hyperbola-filefmt.c:539
+#: components/help/hyperbola-filefmt.c:541
+#: components/help/hyperbola-filefmt.c:543
 msgid "Manual"
 msgstr "Manuale"
 
-#: components/help/hyperbola-filefmt.c:397
-msgid "System"
-msgstr "Sistema"
-
-#: components/help/hyperbola-filefmt.c:397
-msgid "Configuration"
-msgstr "Configurazione"
-
-#: components/help/hyperbola-filefmt.c:397
-msgid "Config files"
-msgstr "File di configurazione"
-
-#: components/help/hyperbola-filefmt.c:398
-#: components/help/hyperbola-filefmt.c:683
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:861 data/linksets/apps.xml.h:1
 msgid "Applications"
 msgstr "Applicazioni"
 
-#: components/help/hyperbola-filefmt.c:398
-msgid "Command Line"
-msgstr "Linea di comando"
-
-#: components/help/hyperbola-filefmt.c:399
-#: components/help/hyperbola-filefmt.c:400
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:543
 msgid "Development"
 msgstr "Sviluppo"
 
-#: components/help/hyperbola-filefmt.c:399
-#: components/help/hyperbola-filefmt.c:400
-msgid "APIs"
-msgstr "APIs"
-
-#: components/help/hyperbola-filefmt.c:399
-msgid "Miscellaneous"
-msgstr "Miscellanea"
-
-#: components/help/hyperbola-filefmt.c:400
+#: components/help/hyperbola-filefmt.c:532
 msgid "System Calls"
 msgstr "Chiamate di sistema"
 
-#: components/help/hyperbola-filefmt.c:556
-#: libnautilus-extensions/nautilus-stock-dialogs.c:405
+#: components/help/hyperbola-filefmt.c:534
+msgid "Library Functions"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:536
+#, fuzzy
+msgid "Devices"
+msgstr "Servizi"
+
+#: components/help/hyperbola-filefmt.c:537
+#, fuzzy
+msgid "Configuration Files"
+msgstr "Configurazione"
+
+#: components/help/hyperbola-filefmt.c:538
+#, fuzzy
+msgid "Games"
+msgstr "Nome"
+
+#: components/help/hyperbola-filefmt.c:539
+#, fuzzy
+msgid "Conventions"
+msgstr "Contenuto"
+
+#: components/help/hyperbola-filefmt.c:541
+msgid "System Administration"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:543
+msgid "Kernel Routines"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:703
 msgid "Info"
 msgstr "Info"
 
-#: components/help/hyperbola-nav-index.c:124
+#: components/help/hyperbola-nav-tree.c:310
+msgid "Introductory Documents:"
+msgstr ""
+
+#: components/help/hyperbola-nav-tree.c:324
+msgid "Documents by Subject:"
+msgstr ""
+
+#: components/help/hyperbola-nav-index.c:121
 msgid "see "
 msgstr "guarda "
 
-#: components/help/hyperbola-nav-index.c:128
+#: components/help/hyperbola-nav-index.c:125
 msgid "see also "
 msgstr "guarda inoltre "
 
@@ -118,87 +364,96 @@ msgstr "guarda inoltre "
 msgid "No matches."
 msgstr "Nessun risultato."
 
-#: components/help/hyperbola-nav-index.c:479
+#: components/help/hyperbola-nav-index.c:476
 msgid " (see \""
 msgstr ""
 
-#: components/help/hyperbola-nav-index.c:484
+#: components/help/hyperbola-nav-index.c:479
 msgid " (see also \""
 msgstr ""
 
-#: components/image-viewer/nautilus-image-view.c:675
-msgid "I could not initialize Bonobo"
+#: components/help/Nautilus_View_help.oaf.in.h:1
+#: components/services/summary/nautilus-summary-dialogs.c:106
+msgid "Help"
 msgstr ""
 
-#. Setup the title
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:153
-msgid "Change your Eazel password..."
+#: components/help/Nautilus_View_help.oaf.in.h:2
+msgid "Help Index"
 msgstr ""
 
-#. username
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:167
-msgid "User Name: "
+#: components/help/Nautilus_View_help.oaf.in.h:3
+msgid "Help Index sidebar panel"
 msgstr ""
 
-#. old password
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:186
-msgid "Current password: "
-msgstr "Password attuale: "
+#: components/help/Nautilus_View_help.oaf.in.h:4
+msgid "Help Navigation Tree"
+msgstr ""
 
-#. new password
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:197
-msgid "New password: "
-msgstr "Nuova password: "
+#: components/help/Nautilus_View_help.oaf.in.h:5
+#, fuzzy
+msgid "Help Search"
+msgstr "Cerca sul web"
 
-#. repeat password
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:208
-msgid "New password (again): "
+#: components/help/Nautilus_View_help.oaf.in.h:6
+msgid "Help Search sidebar panel"
 msgstr ""
 
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:231
-msgid " Change my password! "
+#: components/help/Nautilus_View_help.oaf.in.h:7
+msgid "Help sidebar panel"
 msgstr ""
 
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:250
-msgid "  I need some help!  "
+#: components/help/Nautilus_View_help.oaf.in.h:8
+msgid "Internal use only"
 msgstr ""
 
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:307
-msgid "Password changed!"
+#: components/history/Nautilus_View_history.oaf.in.h:1
+msgid "Factory for history views"
 msgstr ""
 
-#.
-#. *  This file is autogenerated from nautilus-content-loser-ui.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: components/loser/content/nautilus-content-loser-ui.xml.h:9
-#: components/loser/content/nautilus-content-loser-ui.xml.h:13
-msgid "Kill Content Loser"
+#: components/history/Nautilus_View_history.oaf.in.h:2
+#, fuzzy
+msgid "History"
+msgstr "di oggi"
+
+#: components/history/Nautilus_View_history.oaf.in.h:3
+msgid "History sidebar panel"
 msgstr ""
 
-#: components/loser/content/nautilus-content-loser-ui.xml.h:10
-#: components/loser/content/nautilus-content-loser-ui.xml.h:14
-msgid "Kill the Loser content view"
+#: components/history/Nautilus_View_history.oaf.in.h:4
+msgid "History sidebar panel for Nautilus"
 msgstr ""
 
-#: components/loser/content/nautilus-content-loser-ui.xml.h:11
-#: components/loser/content/nautilus-content-loser-ui.xml.h:15
-#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:11
-#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:15
-#: components/mozilla/nautilus-mozilla-ui.xml.h:12
-#: components/mozilla/nautilus-mozilla-ui.xml.h:17
-#: components/sample/nautilus-sample-content-view-ui.xml.h:12
-#: components/sample/nautilus-sample-content-view-ui.xml.h:17
-#: src/nautilus-shell-ui.xml.h:81 src/nautilus-shell-ui.xml.h:174
-msgid "_File"
+#: components/image-viewer/nautilus-image-view.c:833
+msgid "I could not initialize Bonobo"
 msgstr ""
 
-#: components/loser/content/nautilus-content-loser-ui.xml.h:12
-#: components/loser/content/nautilus-content-loser-ui.xml.h:16
-msgid "_Kill Content Loser"
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:1
+msgid "Generic Image Viewer"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:2
+msgid "Generic image control factory"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:3
+msgid "Image"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:4
+msgid "Image Viewer"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:5
+#, fuzzy
+msgid "Nautilus Image Viewer"
+msgstr "Aggiornamento Nautilus"
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:6
+msgid "Nautilus Image viewer factory"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:7
+msgid "View as Image"
 msgstr ""
 
 #: components/loser/content/nautilus-content-loser.c:140
@@ -213,26 +468,52 @@ msgstr ""
 msgid "You have tried to kill the Content Loser"
 msgstr ""
 
-#.
-#. *  This file is autogenerated from nautilus-sidebar-loser-ui.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:9
-#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:13
-msgid "Kill Sidebar Loser"
+#: components/loser/content/nautilus-content-loser-ui.xml.h:1
+msgid "Kill Content Loser"
 msgstr ""
 
-#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:10
-#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:14
-msgid "Kill the Loser sidebar panel"
+#: components/loser/content/nautilus-content-loser-ui.xml.h:2
+msgid "Kill the Loser content view"
 msgstr ""
 
-#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:12
-#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:16
-msgid "_Kill Sidebar Loser"
+#: components/loser/content/nautilus-content-loser-ui.xml.h:3
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
+#: components/sample/nautilus-sample-content-view-ui.xml.h:4
+#: src/nautilus-shell-ui.xml.h:81
+msgid "_File"
+msgstr ""
+
+#: components/loser/content/nautilus-content-loser-ui.xml.h:4
+msgid "_Kill Content Loser"
+msgstr ""
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:1
+#, fuzzy
+msgid "Content Loser"
+msgstr "Contenuto"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:2
+msgid "Content Loser Viewer"
+msgstr ""
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:3
+msgid "Nautilus Content Loser"
+msgstr ""
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:4
+msgid "Nautilus content loser component's factory"
+msgstr ""
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:5
+msgid "Nautilus content loser factory"
+msgstr ""
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:6
+msgid "Nautilus content view that fails on command"
+msgstr ""
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:7
+msgid "View as Content Loser"
 msgstr ""
 
 #: components/loser/sidebar/nautilus-sidebar-loser.c:143
@@ -247,8 +528,41 @@ msgstr ""
 msgid "You have tried to kill the Sidebar Loser"
 msgstr ""
 
-#: components/mozilla/nautilus-mozilla-content-view.c:172
-#: libnautilus-extensions/nautilus-preferences.c:1086
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:1
+msgid "Kill Sidebar Loser"
+msgstr ""
+
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:2
+msgid "Kill the Loser sidebar panel"
+msgstr ""
+
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:4
+msgid "_Kill Sidebar Loser"
+msgstr ""
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus Sidebar Loser"
+msgstr "Aggiornamento Nautilus"
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:2
+msgid "Nautilus sidebar loser component's factory"
+msgstr ""
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:3
+msgid "Nautilus sidebar loser factory"
+msgstr ""
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:4
+msgid "Nautilus sidebar view that fails on command"
+msgstr ""
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:5
+msgid "Sidebar Loser"
+msgstr ""
+
+#: components/mozilla/mozilla-preferences.cpp:126
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -257,8 +571,8 @@ msgstr ""
 "Errore GConf:\n"
 "  %s"
 
-#: components/mozilla/nautilus-mozilla-content-view.c:179
-#: libnautilus-extensions/nautilus-preferences.c:1093
+#: components/mozilla/mozilla-preferences.cpp:133
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -266,346 +580,1173 @@ msgid ""
 "All further errors shown only on terminal"
 msgstr ""
 
-#.
-#. *  This file is autogenerated from nautilus-mozilla-ui.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: components/mozilla/nautilus-mozilla-ui.xml.h:9
-#: components/mozilla/nautilus-mozilla-ui.xml.h:14
-msgid "Mozilla Test"
-msgstr "Test Mozilla"
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:38
+msgid "Arabic"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:39
+#, fuzzy
+msgid "Baltic"
+msgstr "Indietro"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:40
+msgid "Central European"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:41
+#, fuzzy
+msgid "Chinese"
+msgstr "Canali"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:42
+msgid "Cyrillic"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:43
+msgid "Greek"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:44
+msgid "Hebrew"
+msgstr ""
 
-#: components/mozilla/nautilus-mozilla-ui.xml.h:10
-#: components/mozilla/nautilus-mozilla-ui.xml.h:15
-msgid "This is a Mozilla merged menu item"
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:45
+msgid "Japanese"
 msgstr ""
 
-#: components/mozilla/nautilus-mozilla-ui.xml.h:11
-#: components/mozilla/nautilus-mozilla-ui.xml.h:16
-msgid "This is a Mozilla merged tool bar button"
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:46
+msgid "Turkish"
 msgstr ""
 
-#: components/mozilla/nautilus-mozilla-ui.xml.h:13
-#: components/mozilla/nautilus-mozilla-ui.xml.h:18
-msgid "_Mozilla Test"
-msgstr "Test _Mozilla"
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:47
+msgid "Unicode"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:48
+msgid "UTF"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:49
+msgid "Vietnamese"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:50
+#, fuzzy
+msgid "Western"
+msgstr "Avvia test"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:55
+msgid "Arabic (IBM-864)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:56
+msgid "Arabic (ISO-8859-6)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:57
+msgid "Arabic (ISO-8859-6-E)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:58
+msgid "Arabic (ISO-8859-6-I)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:59
+msgid "Arabic (Windows-1256)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:60
+msgid "Armenian (ARMSCII-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:61
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:62
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:63
+msgid "Baltic (Windows-1257)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:64
+msgid "Celtic (ISO-8859-14)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:65
+msgid "Central European (IBM-852)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:66
+msgid "Central European (ISO-8859-2)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:67
+msgid "Central European (MacCE)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:68
+msgid "Central European (Windows-1250)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:69
+msgid "Chinese Simplified (GB2312)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:70
+msgid "Chinese Simplified (GBK)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:71
+msgid "Chinese Simplified (HZ)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:72
+msgid "Chinese Traditional (Big5)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:73
+msgid "Chinese Traditional (EUC-TW)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:74
+msgid "Croatian (MacCroatian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:75
+msgid "Cyrillic (IBM-855)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:76
+msgid "Cyrillic (ISO-8859-5)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:77
+msgid "Cyrillic (ISO-IR-111)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:78
+msgid "Cyrillic (MacCyrillic)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:79
+msgid "Cyrillic (Windows-1251)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:80
+msgid "Cyrillic/Russian (IBM-866)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:81
+msgid "Cyrillic/Russian (KOI8-R)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:82
+msgid "Cyrillic/Ukrainian (KOI8-U)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:83
+msgid "Cyrillic/Ukrainian (MacUkrainian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:84
+msgid "English (US-ASCII)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:85
+msgid "Greek (ISO-8859-7)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:86
+msgid "Greek (MacGreek)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:87
+msgid "Greek (Windows-1253)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:88
+msgid "Hebrew (IBM-862)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:89
+msgid "Hebrew (ISO-8859-8-E)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:90
+msgid "Hebrew (ISO-8859-8-I)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:91
+msgid "Hebrew (Windows-1255)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:92
+msgid "Icelandic (MacIcelandic)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:93
+msgid "Japanese (EUC-JP)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:94
+msgid "Japanese (ISO-2022-JP)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:95
+msgid "Japanese (Shift_JIS)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:96
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:97
+msgid "Nordic (ISO-8859-10)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:98
+msgid "Romanian (MacRomanian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:99
+msgid "South European (ISO-8859-3)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:100
+msgid "T.61-8bit"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:101
+msgid "Thai (TIS-620)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:102
+msgid "Turkish (IBM-857)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:103
+msgid "Turkish (ISO-8859-9)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:104
+msgid "Turkish (MacTurkish)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:105
+msgid "Turkish (Windows-1254)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:106
+msgid "Unicode (UTF-7)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:107
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:108
+#, fuzzy
+msgid "User Defined"
+msgstr "Directory Utente"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:109
+msgid "UTF-16BE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:110
+msgid "UTF-16LE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:111
+msgid "UTF-32BE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:112
+msgid "UTF-32LE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:113
+msgid "Vietnamese (TCVN)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:114
+msgid "Vietnamese (VISCII)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:115
+msgid "Vietnamese (VPS)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:116
+msgid "Vietnamese (Windows-1258)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:117
+msgid "Visual Hebrew (ISO-8859-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:118
+msgid "Western (IBM-850)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:119
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:120
+msgid "Western (ISO-8859-15)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:121
+msgid "Western (MacRoman)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:122
+msgid "Western (Windows-1252)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:123
+msgid "windows-936"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:124
+msgid "x-imap4-modified-utf7"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:125
+msgid "x-u-escaped"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-content-view.c:809
+msgid ""
+"A JavaScript function (small software program) on this page tried to open a "
+"new window, but nautilus does not support the opening of new windows by "
+"JavaScript.\n"
+"\n"
+"Try viewing the page in a different web browser, such as Mozilla or Netscape."
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-content-view.c:810
+msgid "Nautilus Mozilla View Warning"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-ui.xml.h:1
+msgid "Charset Encoding"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:1
+msgid "Mozilla Nautilus view"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:2
+msgid "Mozilla Nautilus view factory"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:3
+msgid "Mozilla content view component"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:4
+msgid "Mozilla content view component's factory"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:5
+msgid "View as Web Page"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:6
+msgid "Web Page"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:7
+msgid "Web Page Viewer"
+msgstr ""
+
+#: components/music/mpg123.c:29
+msgid "Blues"
+msgstr ""
+
+#: components/music/mpg123.c:29
+msgid "Classic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:29
+msgid "Country"
+msgstr ""
+
+#: components/music/mpg123.c:29
+msgid "Dance"
+msgstr ""
+
+#: components/music/mpg123.c:30
+#, fuzzy
+msgid "Disco"
+msgstr "Dischi"
+
+#: components/music/mpg123.c:30
+msgid "Funk"
+msgstr ""
+
+#: components/music/mpg123.c:30
+msgid "Grunge"
+msgstr ""
+
+#: components/music/mpg123.c:30
+msgid "Hip-Hop"
+msgstr ""
+
+#: components/music/mpg123.c:31
+msgid "Jazz"
+msgstr ""
+
+#: components/music/mpg123.c:31
+#, fuzzy
+msgid "Metal"
+msgstr "Dettagli"
+
+#: components/music/mpg123.c:31
+msgid "New Age"
+msgstr ""
+
+#: components/music/mpg123.c:31
+msgid "Oldies"
+msgstr ""
+
+#: components/music/mpg123.c:32
+msgid "Other"
+msgstr ""
+
+#: components/music/mpg123.c:32
+msgid "Pop"
+msgstr ""
+
+#: components/music/mpg123.c:32
+msgid "R&B"
+msgstr ""
+
+#: components/music/mpg123.c:32
+msgid "Rap"
+msgstr ""
+
+#: components/music/mpg123.c:32
+msgid "Reggae"
+msgstr ""
+
+#: components/music/mpg123.c:33
+msgid "Rock"
+msgstr ""
+
+#: components/music/mpg123.c:33
+msgid "Techno"
+msgstr ""
+
+#: components/music/mpg123.c:33
+#, fuzzy
+msgid "Industrial"
+msgstr "Installa"
+
+#: components/music/mpg123.c:33
+msgid "Alternative"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Ska"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Death Metal"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Pranks"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Soundtrack"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Euro-Techno"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Ambient"
+msgstr ""
 
-#. FIXME: I think this is not portable. It works in gcc, but not other C compilers.
-#: components/music/nautilus-music-view.c:220
-msgid "Track "
+#: components/music/mpg123.c:35
+msgid "Trip-Hop"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Vocal"
+msgstr ""
+
+#: components/music/mpg123.c:36
+msgid "Jazz+Funk"
+msgstr ""
+
+#: components/music/mpg123.c:36
+#, fuzzy
+msgid "Fusion"
+msgstr "Domanda"
+
+#: components/music/mpg123.c:36
+#, fuzzy
+msgid "Trance"
 msgstr "Traccia "
 
-#: components/music/nautilus-music-view.c:220
-msgid "Title"
-msgstr "Titolo"
+#: components/music/mpg123.c:36
+msgid "Classical"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:220
-msgid "Artist"
-msgstr "Artista"
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "Instrumental"
+msgstr "Installa"
 
-#: components/music/nautilus-music-view.c:220
-msgid "Year"
-msgstr "Anno"
+#: components/music/mpg123.c:37
+msgid "Acid"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:220
-msgid "Bitrate "
-msgstr "Bitrate"
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "House"
+msgstr "Pausa"
 
-#: components/music/nautilus-music-view.c:220
-msgid "Time "
-msgstr "Durata "
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "Game"
+msgstr "Nome"
 
-#: components/music/nautilus-music-view.c:220
-msgid "Album"
-msgstr "Album"
-#: components/music/nautilus-music-view.c:220
-msgid "Comment"
+#: components/music/mpg123.c:38
+msgid "Sound Clip"
+msgstr ""
+
+#: components/music/mpg123.c:38
+msgid "Gospel"
+msgstr ""
+
+#: components/music/mpg123.c:38
+msgid "Noise"
+msgstr ""
+
+#: components/music/mpg123.c:38
+msgid "Alt"
+msgstr ""
+
+#: components/music/mpg123.c:39
+msgid "Bass"
+msgstr ""
+
+#: components/music/mpg123.c:39
+#, fuzzy
+msgid "Soul"
+msgstr "doppio"
+
+#: components/music/mpg123.c:39
+msgid "Punk"
+msgstr ""
+
+#: components/music/mpg123.c:39
+msgid "Space"
+msgstr ""
+
+#: components/music/mpg123.c:40
+msgid "Meditative"
+msgstr ""
+
+#: components/music/mpg123.c:40
+msgid "Instrumental Pop"
+msgstr ""
+
+#: components/music/mpg123.c:41
+msgid "Instrumental Rock"
+msgstr ""
+
+#: components/music/mpg123.c:41
+msgid "Ethnic"
+msgstr ""
+
+#: components/music/mpg123.c:41
+msgid "Gothic"
+msgstr ""
+
+#: components/music/mpg123.c:42
+msgid "Darkwave"
+msgstr ""
+
+#: components/music/mpg123.c:42
+msgid "Techno-Industrial"
+msgstr ""
+
+#: components/music/mpg123.c:42
+msgid "Electronic"
+msgstr ""
+
+#: components/music/mpg123.c:43
+msgid "Pop-Folk"
+msgstr ""
+
+#: components/music/mpg123.c:43
+msgid "Eurodance"
+msgstr ""
+
+#: components/music/mpg123.c:43
+msgid "Dream"
+msgstr ""
+
+#: components/music/mpg123.c:44
+msgid "Southern Rock"
+msgstr ""
+
+#: components/music/mpg123.c:44
+#, fuzzy
+msgid "Comedy"
 msgstr "Commento"
 
-#: components/music/nautilus-music-view.c:220
-msgid "Channels"
-msgstr "Canali"
+#: components/music/mpg123.c:44
+msgid "Cult"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:220
-msgid "Sample Rate"
-msgstr "Campionamento"
+#: components/music/mpg123.c:45
+msgid "Gangsta Rap"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:319
-msgid "Set Cover Image"
+#: components/music/mpg123.c:45
+msgid "Top 40"
 msgstr ""
 
-#: components/music/nautilus-music-view.c:478
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file."
+#: components/music/mpg123.c:45
+msgid "Christian Rap"
 msgstr ""
 
-#: components/music/nautilus-music-view.c:480
-#: src/nautilus-property-browser.c:902 src/nautilus-property-browser.c:997
-msgid "Not an Image"
+#: components/music/mpg123.c:46
+msgid "Pop/Funk"
 msgstr ""
 
-#: components/music/nautilus-music-view.c:528
-msgid "Select an image file for the album cover:"
+#: components/music/mpg123.c:46
+#, fuzzy
+msgid "Jungle"
+msgstr "singolo"
+
+#: components/music/mpg123.c:46
+msgid "Native American"
 msgstr ""
 
-#: components/music/nautilus-music-view.c:999
-msgid "Sorry, but the music view can't play non-local files yet."
+#: components/music/mpg123.c:47
+msgid "Cabaret"
 msgstr ""
 
-#: components/music/nautilus-music-view.c:1000
-msgid "Can't Play Remote Files"
-msgstr "Impossibile suonare il file remoto"
+#: components/music/mpg123.c:47
+#, fuzzy
+msgid "New Wave"
+msgstr "Mai"
 
-#: components/music/nautilus-music-view.c:1318
-msgid "Drag to seek within track"
+#: components/music/mpg123.c:47
+msgid "Psychedelic"
 msgstr ""
 
-#: components/music/nautilus-music-view.c:1341
-msgid "Previous"
-msgstr "Precedente"
+#: components/music/mpg123.c:47
+#, fuzzy
+msgid "Rave"
+msgstr "Ripristina"
 
-#: components/music/nautilus-music-view.c:1356
-msgid "Play"
+#: components/music/mpg123.c:48
+msgid "Showtunes"
+msgstr ""
+
+#: components/music/mpg123.c:48
+#, fuzzy
+msgid "Trailer"
+msgstr "Titolo"
+
+#: components/music/mpg123.c:48
+msgid "Lo-Fi"
+msgstr ""
+
+#: components/music/mpg123.c:48
+msgid "Tribal"
+msgstr ""
+
+#: components/music/mpg123.c:49
+msgid "Acid Punk"
+msgstr ""
+
+#: components/music/mpg123.c:49
+msgid "Acid Jazz"
+msgstr ""
+
+#: components/music/mpg123.c:49
+#, fuzzy
+msgid "Polka"
 msgstr "Suona"
 
-#: components/music/nautilus-music-view.c:1371
-msgid "Pause"
-msgstr "Pausa"
+#: components/music/mpg123.c:49
+msgid "Retro"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:1385
-#: libnautilus-extensions/nautilus-file-operations.c:397
-#: libnautilus-extensions/nautilus-file-operations.c:416
-#: libnautilus-extensions/nautilus-file-operations.c:434
-#: src/nautilus-shell-ui.xml.h:63 src/nautilus-shell-ui.xml.h:155
-msgid "Stop"
-msgstr "Stop"
+#: components/music/mpg123.c:50
+#, fuzzy
+msgid "Musical"
+msgstr "musica"
 
-#: components/music/nautilus-music-view.c:1399
-msgid "Next"
-msgstr "Successivo"
+#: components/music/mpg123.c:50
+msgid "Rock & Roll"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:1412
-msgid "Sound hardware missing or busy!"
+#: components/music/mpg123.c:50
+msgid "Hard Rock"
 msgstr ""
 
-#: components/music/nautilus-music-view.c:1517
-#, c-format
-msgid "Sorry, but there was an error reading %s."
+#: components/music/mpg123.c:50
+msgid "Folk"
 msgstr ""
 
-#: components/music/nautilus-music-view.c:1518
-msgid "Can't Read Folder"
+#: components/music/mpg123.c:51
+msgid "Folk/Rock"
 msgstr ""
 
-#: components/music/nautilus-music-view.c:1594
-msgid "Stereo"
+#: components/music/mpg123.c:51
+msgid "National Folk"
+msgstr ""
+
+#: components/music/mpg123.c:51
+msgid "Swing"
+msgstr ""
+
+#: components/music/mpg123.c:52
+msgid "Fast-Fusion"
+msgstr ""
+
+#: components/music/mpg123.c:52
+msgid "Bebob"
+msgstr ""
+
+#: components/music/mpg123.c:52
+msgid "Latin"
+msgstr ""
+
+#: components/music/mpg123.c:52
+msgid "Revival"
+msgstr ""
+
+#: components/music/mpg123.c:53
+msgid "Celtic"
+msgstr ""
+
+#: components/music/mpg123.c:53
+msgid "Bluegrass"
+msgstr ""
+
+#: components/music/mpg123.c:53
+msgid "Avantgarde"
+msgstr ""
+
+#: components/music/mpg123.c:54
+msgid "Gothic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:54
+#, fuzzy
+msgid "Progressive Rock"
+msgstr "Progresso"
+
+#: components/music/mpg123.c:55
+msgid "Psychedelic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:55
+msgid "Symphonic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:55
+msgid "Slow Rock"
+msgstr ""
+
+#: components/music/mpg123.c:56
+msgid "Big Band"
+msgstr ""
+
+#: components/music/mpg123.c:56
+msgid "Chorus"
+msgstr ""
+
+#: components/music/mpg123.c:56
+msgid "Easy Listening"
+msgstr ""
+
+#: components/music/mpg123.c:57
+#, fuzzy
+msgid "Acoustic"
+msgstr "musica"
+
+#: components/music/mpg123.c:57
+msgid "Humour"
+msgstr ""
+
+#: components/music/mpg123.c:57
+#, fuzzy
+msgid "Speech"
+msgstr "Cerca"
+
+#: components/music/mpg123.c:57
+#, fuzzy
+msgid "Chanson"
+msgstr "Canali"
+
+#: components/music/mpg123.c:58
+msgid "Opera"
+msgstr ""
+
+#: components/music/mpg123.c:58
+msgid "Chamber Music"
+msgstr ""
+
+#: components/music/mpg123.c:58
+#, fuzzy
+msgid "Sonata"
+msgstr "Carattere"
+
+#: components/music/mpg123.c:58
+msgid "Symphony"
+msgstr ""
+
+#: components/music/mpg123.c:59
+msgid "Booty Bass"
+msgstr ""
+
+#: components/music/mpg123.c:59
+#, fuzzy
+msgid "Primus"
+msgstr "Precedente"
+
+#: components/music/mpg123.c:59
+msgid "Porn Groove"
+msgstr ""
+
+#: components/music/mpg123.c:60
+#, fuzzy
+msgid "Satire"
 msgstr "Stero"
 
-#: components/music/nautilus-music-view.c:1594
-msgid "Mono"
+#: components/music/mpg123.c:60
+msgid "Slow Jam"
 msgstr ""
 
-#: components/music/nautilus-music-view.c:1637
-#, c-format
-msgid "%s by %s"
-msgstr "%s di %s"
+#: components/music/mpg123.c:60
+msgid "Club"
+msgstr ""
 
-#. set up the window title
-#: components/rpmview/nautilus-rpm-verify-window.c:182
-#, c-format
-msgid "Verifying %s..."
-msgstr "Verica di %s..."
+#: components/music/mpg123.c:60
+msgid "Tango"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:108
-#, c-format
-msgid "%s would not work anymore\n"
+#: components/music/mpg123.c:61
+msgid "Samba"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:111
-#, c-format
-msgid "%s would break other installed packages\n"
-msgstr "%s corrompe altri pacchetti installati\n"
+#: components/music/mpg123.c:61
+msgid "Folklore"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:116
-#, c-format
-msgid "%s is needed, but could not be found\n"
+#: components/music/mpg123.c:61
+msgid "Ballad"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:121
-#, c-format
-msgid "%s was already installed\n"
+#: components/music/mpg123.c:61
+msgid "Power Ballad"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:124
-#, c-format
-msgid "%s causes a circular dependency problem\n"
+#: components/music/mpg123.c:62
+msgid "Rhythmic Soul"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:143
-#, c-format
-msgid "Installing %s failed because of the following issue(s):\n"
+#: components/music/mpg123.c:62
+msgid "Freestyle"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:145
-#, c-format
-msgid "Uninstalling %s failed because of the following issue(s):\n"
+#: components/music/mpg123.c:62
+msgid "Duet"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:240
-msgid "Uninstall failed..."
-msgstr "Disinstallazione fallita..."
+#: components/music/mpg123.c:63
+msgid "Punk Rock"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:241
-msgid "Uninstall Failed"
-msgstr "Disinstallazione fallita"
+#: components/music/mpg123.c:63
+msgid "Drum Solo"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:243
-msgid "Install failed..."
-msgstr "Installazione fallita..."
+#: components/music/mpg123.c:63
+msgid "A Cappella"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:244
-msgid "Install Failed"
-msgstr "Installazione fallita"
+#: components/music/mpg123.c:64
+msgid "Euro-House"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:288
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:959
-msgid "Incorrect password."
-msgstr "Password non corretta"
+#: components/music/mpg123.c:64
+msgid "Dance Hall"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:146
-msgid "Package Contents"
-msgstr "Contenuto pacchetto"
+#: components/music/mpg123.c:64
+msgid "Goa"
+msgstr ""
 
-#. allocate the name field
-#: components/rpmview/nautilus-rpm-view.c:189
-msgid "Package Title"
-msgstr "Titolo pacchetto"
+#: components/music/mpg123.c:65
+msgid "Drum & Bass"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:212
-msgid "Size: "
-msgstr "Dimensione: "
+#: components/music/mpg123.c:65
+msgid "Club-House"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:218
-msgid "<size>"
-msgstr "<dimensione>"
+#: components/music/mpg123.c:65
+msgid "Hardcore"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:224
-msgid "Install Date: "
-msgstr "Data di installazione: "
+#: components/music/mpg123.c:66
+msgid "Terror"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:230
-#: components/rpmview/nautilus-rpm-view.c:242
-#: components/rpmview/nautilus-rpm-view.c:254
-#: components/rpmview/nautilus-rpm-view.c:266
-#: components/rpmview/nautilus-rpm-view.c:278
-msgid "<unknown>"
-msgstr "<sconociuto>"
+#: components/music/mpg123.c:66
+msgid "Indie"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:236
-msgid "License: "
-msgstr "Licenza: "
+#: components/music/mpg123.c:66
+msgid "BritPop"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:248
-msgid "Build Date: "
-msgstr "Data creazione: "
+#: components/music/mpg123.c:66
+msgid "Negerpunk"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:260
-msgid "Distribution: "
-msgstr "Distribuzione: "
+#: components/music/mpg123.c:67
+msgid "Polsk Punk"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:272
-msgid "Vendor: "
-msgstr "Distributore: "
+#: components/music/mpg123.c:67
+msgid "Beat"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:305
-msgid "Install"
-msgstr "Installa"
+#: components/music/mpg123.c:67
+msgid "Christian Gangsta Rap"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:321
-msgid "Update"
-msgstr "Aggiorna"
+#: components/music/mpg123.c:68
+msgid "Heavy Metal"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:330
-msgid "Uninstall"
-msgstr "Disinstalla"
+#: components/music/mpg123.c:68
+msgid "Black Metal"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:346
-msgid "Verify"
+#: components/music/mpg123.c:68
+msgid "Crossover"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:382
-msgid "Go to selected file"
-msgstr "Vai al file selezionato"
+#: components/music/mpg123.c:69
+msgid "Contemporary Christian"
+msgstr ""
 
-#. add the description
-#: components/rpmview/nautilus-rpm-view.c:393
-msgid "Description"
-msgstr "Descrizione"
+#: components/music/mpg123.c:69
+msgid "Christian Rock"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:631
-#, c-format
-msgid "Package Contents: %d files"
-msgstr "Contenuto pacchetto: %d file"
+#: components/music/mpg123.c:70
+msgid "Merengue"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:643
-#, c-format
-msgid "Package \"%s\" "
-msgstr "Pacchetto \"%s\" "
+#: components/music/mpg123.c:70
+msgid "Salsa"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:708
-#, c-format
-msgid "version %s-%s"
-msgstr "versione %s-%s"
+#: components/music/mpg123.c:70
+msgid "Thrash Metal"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:865
+#: components/music/mpg123.c:71
+#, fuzzy
+msgid "Anime"
+msgstr "Durata "
+
+#: components/music/mpg123.c:71
+msgid "JPop"
+msgstr ""
+
+#: components/music/mpg123.c:71
+#, fuzzy
+msgid "Synthpop"
+msgstr "Stop"
+
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Track"
+msgstr "Traccia "
+
+#: components/music/nautilus-music-view.c:238
+msgid "Title"
+msgstr "Titolo"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Artist"
+msgstr "Artista"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Year"
+msgstr "Anno"
+
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Bit Rate"
+msgstr "Bitrate"
+
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Time"
+msgstr "Durata "
+
+#: components/music/nautilus-music-view.c:238
+msgid "Album"
+msgstr "Album"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Comment"
+msgstr "Commento"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Channels"
+msgstr "Canali"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Sample Rate"
+msgstr "Campionamento"
+
+#: components/music/nautilus-music-view.c:350
+msgid "Set Cover Image"
+msgstr ""
+
+#: components/music/nautilus-music-view.c:694
 #, c-format
-msgid "checking %s..."
-msgstr "Controllo  %s..."
+msgid "Sorry, but '%s' is not a usable image file."
+msgstr ""
+
+#: components/music/nautilus-music-view.c:696
+#: src/nautilus-property-browser.c:1060 src/nautilus-property-browser.c:1312
+msgid "Not an Image"
+msgstr ""
+
+#: components/music/nautilus-music-view.c:744
+msgid "Select an image file for the album cover:"
+msgstr ""
+
+#: components/music/nautilus-music-view.c:1174
+msgid ""
+"Sorry, but the music view is unable to play back sound right now. Either "
+"another program is using or blocking the sound card, or your sound card is "
+"not configured properly. Try quitting any applications that may be blocking "
+"use of the sound card."
+msgstr ""
+
+#: components/music/nautilus-music-view.c:1178
+msgid "Unable to Play File"
+msgstr ""
+
+#: components/music/nautilus-music-view.c:1199
+msgid "Sorry, but the music view can't play non-local files yet."
+msgstr ""
+
+#: components/music/nautilus-music-view.c:1200
+msgid "Can't Play Remote Files"
+msgstr "Impossibile suonare il file remoto"
+
+#: components/music/nautilus-music-view.c:1486
+msgid "Drag to seek within track"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:867
+#: components/music/nautilus-music-view.c:1526
+msgid "Play"
+msgstr "Suona"
+
+#: components/music/nautilus-music-view.c:1540
+msgid "Pause"
+msgstr "Pausa"
+
+#: components/music/nautilus-music-view.c:1554
+#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
+msgid "Stop"
+msgstr "Stop"
+
+#: components/music/nautilus-music-view.c:1679
 #, c-format
-msgid "file %s has an error!"
+msgid "Sorry, but there was an error reading %s."
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:885
-msgid "Verification completed."
+#: components/music/nautilus-music-view.c:1680
+msgid "Can't Read Folder"
 msgstr ""
 
-#.
-#. *  This file is autogenerated from nautilus-sample-content-view-ui.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: components/sample/nautilus-sample-content-view-ui.xml.h:9
-#: components/sample/nautilus-sample-content-view-ui.xml.h:14
-msgid "Sample"
-msgstr "Esempio"
+#: components/music/nautilus-music-view.c:1750
+msgid "Stereo"
+msgstr "Stero"
 
-#: components/sample/nautilus-sample-content-view-ui.xml.h:10
-#: components/sample/nautilus-sample-content-view-ui.xml.h:15
-msgid "This is a sample merged menu item"
+#: components/music/nautilus-music-view.c:1750
+msgid "Mono"
+msgstr ""
+
+#: components/music/nautilus-music-view.c:1792
+#, fuzzy, c-format
+msgid "%s - %s"
+msgstr "%s di %s"
+
+#: components/music/Nautilus_View_music.oaf.in.h:1
+msgid "Factory for music view"
 msgstr ""
 
-#: components/sample/nautilus-sample-content-view-ui.xml.h:11
-#: components/sample/nautilus-sample-content-view-ui.xml.h:16
-msgid "This is a sample merged tool bar button"
+#: components/music/Nautilus_View_music.oaf.in.h:2
+#, fuzzy
+msgid "Music"
+msgstr "musica"
+
+#: components/music/Nautilus_View_music.oaf.in.h:3
+msgid "Music Viewer"
 msgstr ""
 
-#: components/sample/nautilus-sample-content-view-ui.xml.h:13
-#: components/sample/nautilus-sample-content-view-ui.xml.h:18
-msgid "_Sample"
-msgstr "_Esempio"
+#: components/music/Nautilus_View_music.oaf.in.h:4
+msgid "Music view"
+msgstr ""
 
-#: components/sample/nautilus-sample-content-view.c:83
+#: components/music/Nautilus_View_music.oaf.in.h:5
+msgid "Music view factory"
+msgstr ""
+
+#: components/music/Nautilus_View_music.oaf.in.h:6
+msgid "View as Music"
+msgstr ""
+
+#: components/notes/Nautilus_View_notes.oaf.in.h:1
+msgid "Factory for annotation view"
+msgstr ""
+
+#: components/notes/Nautilus_View_notes.oaf.in.h:3
+msgid "Notes sidebar panel"
+msgstr ""
+
+#: components/notes/Nautilus_View_notes.oaf.in.h:4
+msgid "Notes sidebar panel for Nautilus"
+msgstr ""
+
+#: components/sample/nautilus-sample-content-view.c:136
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: components/sample/nautilus-sample-content-view.c:145
+#: components/sample/nautilus-sample-content-view.c:189
 #, c-format
 msgid ""
 "%s\n"
@@ -613,7 +1754,7 @@ msgid ""
 "This is a sample Nautilus content view component."
 msgstr ""
 
-#: components/sample/nautilus-sample-content-view.c:203
+#: components/sample/nautilus-sample-content-view.c:252
 #, c-format
 msgid ""
 "%s\n"
@@ -621,95 +1762,440 @@ msgid ""
 "You clicked the Sample toolbar button."
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:85
+#: components/sample/Nautilus_View_sample.oaf.in.h:3
+#: components/sample/nautilus-sample-content-view-ui.xml.h:1
+#: components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in.h:2
+msgid "Sample"
+msgstr "Esempio"
+
+#: components/sample/nautilus-sample-content-view-ui.xml.h:2
+msgid "This is a sample merged menu item"
+msgstr ""
+
+#: components/sample/nautilus-sample-content-view-ui.xml.h:3
+msgid "This is a sample merged toolbar button"
+msgstr ""
+
+#: components/sample/nautilus-sample-content-view-ui.xml.h:5
+msgid "_Sample"
+msgstr "_Esempio"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus Sample view"
+msgstr "Aggiornamento Nautilus"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:2
+msgid "Nautilus Sample view factory"
+msgstr ""
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:4
+#, fuzzy
+msgid "Sample Viewer"
+msgstr "Campionamento"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:5
+msgid "Sample content view component"
+msgstr ""
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:6
+msgid "Sample content view component's factory"
+msgstr ""
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:7
+#, fuzzy
+msgid "View as Sample"
+msgstr "Esempio"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:107
+msgid "Set the default answer to continue, also default delete to Yes"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:108
+#, fuzzy
+msgid "Specify search cgi"
+msgstr "Specifica server"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
+#: components/services/install/command-line/eazel-test-packsys.c:590
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "Mostra messaggi di debug"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:86
+#: components/services/install/command-line/eazel-alt-install-corba.c:110
 msgid "10 sec delay after starting service"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:87
+#: components/services/install/command-line/eazel-alt-install-corba.c:111
 msgid "Allow downgrades"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:88
+#: components/services/install/command-line/eazel-alt-install-corba.c:112
 msgid "Erase packages"
 msgstr "Cancella pacchetti"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:89
-msgid "RPM args are filename"
+#: components/services/install/command-line/eazel-alt-install-corba.c:113
+msgid "enable ei2"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:90
-msgid "Force install"
-msgstr "Forza installazione"
+#: components/services/install/command-line/eazel-alt-install-corba.c:114
+msgid "RPM args are filename"
+msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:91
+#: components/services/install/command-line/eazel-alt-install-corba.c:115
 msgid "Use ftp"
 msgstr "Usa ftp"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:92
+#: components/services/install/command-line/eazel-alt-install-corba.c:116
 msgid "Use local"
 msgstr "Usa disco locale"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:93
+#: components/services/install/command-line/eazel-alt-install-corba.c:117
 msgid "Use http"
 msgstr "Usa http"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:94
+#: components/services/install/command-line/eazel-alt-install-corba.c:118
 msgid "RPM args are Eazel Ids"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:95
+#: components/services/install/command-line/eazel-alt-install-corba.c:119
+msgid "machine readable output"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:120
+msgid "Don't print fancy percent output"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:121
+msgid "don't use eazel auth stuff"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:122
 msgid "Specify package file"
 msgstr "Specificare il file del pacchetto"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:96
-msgid "Set port numer (80)"
-msgstr "Imposta numero della porta (80)"
-
-#: components/services/install/command-line/eazel-alt-install-corba.c:97
+#: components/services/install/command-line/eazel-alt-install-corba.c:123
 msgid "RPM args are needed files"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:98
+#: components/services/install/command-line/eazel-alt-install-corba.c:124
 msgid "Run Query"
 msgstr "Avvia interrogazione"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:99
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
 msgid "Revert"
 msgstr "Ripristina"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:100
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:101
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "Specifica server"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:102
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
+msgid "Dont print too much, just problems and download"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:103
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
+msgid "argument is a suite id"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "Avvia test"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:104
-msgid "Set tmp dir (/tmp)"
-msgstr "Imposta directory temporanea (/tmp)"
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#, fuzzy
+msgid "Allow username"
+msgstr "Permetti aggiornamenti"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:105
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "Permetti aggiornamenti"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:106
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr ""
 
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#, fuzzy
+msgid "Install a specific package version"
+msgstr "Installazione pacchetto %s ..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
+msgid "*** You cannot specify more then one protocol type.\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
+msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
+#, fuzzy, c-format
+msgid "File conflict checking %s...\n"
+msgstr "Controllo  %s..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
+#, fuzzy, c-format
+msgid "File uniqueness checking %s...\n"
+msgstr "Controllo  %s..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
+#, c-format
+msgid "Feature consistency checking %s...\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
+#, c-format
+msgid "Downloading %s..."
+msgstr "Prelievo di %s...."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
+msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
+#, fuzzy
+msgid "Downloading %s... (%d/%d) = %d%%"
+msgstr "Prelievo di %s...."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
+#, c-format
+msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
+#, fuzzy, c-format
+msgid "Downloading %s... %3.1f KB/s Done\n"
+msgstr "Prelievo di %s...."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
+msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
+msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
+msgid "Done\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
+#, c-format
+msgid "Download of %s FAILED\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
+#, c-format
+msgid "Package %s failed to uninstall.\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
+#, fuzzy, c-format
+msgid "Package %s failed to install.\n"
+msgstr "%s correntemente installato"
+
+#. I18N note: \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
+#, c-format
+msgid "\t· Problem : %s\n"
+msgstr ""
+
+#. I18N note: \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
+#, c-format
+msgid "\t· Action : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
+msgid "Cancelling operation\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
+#, c-format
+msgid "About to install a total of %d packages, %dKB\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
+#, c-format
+msgid "About to uninstall a total of %d packages, %dKB\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
+#, c-format
+msgid "About to revert a total of %d packages, %d KB\n"
+msgstr ""
+
+#. I18N note: %s is a package name, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
+#, c-format
+msgid "\t· %s and it's dependencies\n"
+msgstr ""
+
+#. I18N note: %s is a package name, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
+#, c-format
+msgid "\t· %s\n"
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n) " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
+msgid "Save transaction report ? (y/n) "
+msgstr ""
+
+#. I18N note: y is the letter for the word Yes. This is
+#. used in the response for a yes/no questions. Your translation
+#. must be 1 character only.
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
+msgid "y"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
+#, c-format
+msgid "Dependency : %s needs %s\n"
+msgstr ""
+
+#. I18N note: %s is a package name
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
+#, c-format
+msgid "Package %s failed md5 check!\n"
+msgstr ""
+
+#. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
+#, c-format
+msgid "\t· server MD5 checksum is %s\n"
+msgstr ""
+
+#. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
+#, c-format
+msgid "\t· actual MD5 checksum is %s\n"
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
+msgid "Continue? (y/n) "
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
+msgid "Should I delete the RPM files? (y/n) "
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
+msgid "Operation ok\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
+#, fuzzy
+msgid "Operation failed\n"
+msgstr "Installazione fallita!"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
+#, fuzzy
+msgid "Installing"
+msgstr "Installa"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
+#, fuzzy
+msgid "Uninstalling"
+msgstr "Disinstalla"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
+msgid "Only one operation at a time please."
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
+#, c-format
+msgid "%s: --help for usage\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
+#, c-format
+msgid "Name         : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#, fuzzy, c-format
+msgid "Version      : %s\n"
+msgstr "versione: %s"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#, c-format
+msgid "Minor        : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
+#, c-format
+msgid "Size         : %d\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#, c-format
+msgid "Arch         : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#, fuzzy, c-format
+msgid "Distribution : %s\n"
+msgstr "Distribuzione: "
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#, fuzzy, c-format
+msgid "Description  : %s\n"
+msgstr "Descrizione"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
+#, fuzzy, c-format
+msgid "Install root : %s\n"
+msgstr "Data di installazione: "
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
+msgid "Provides     : \n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
+#, c-format
+msgid "exit code %d\n"
+msgstr ""
+
 #: components/services/install/command-line/eazel-gen-xml.c:41
 msgid "Specify package list to use (/var/eazel/service/package-list.xml)"
 msgstr ""
@@ -718,885 +2204,2609 @@ msgstr ""
 msgid "Use specified file to generate a package list, requires --packagelist"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:179
+#: components/services/install/command-line/eazel-test-softcat.c:54
+msgid "Softcat server to connect to"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:55
+msgid "Use alternate CGI path"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:57
+msgid "Connect as a softcat user through ammonite"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:58
+msgid "Number of times to try the request"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:59
+msgid "Delay between request retries, in usec"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:60
+msgid "Lookup by Eazel package id"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:61
+msgid "Lookup package that features a feature/file"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:62
+msgid "Lookup package with a specific version"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:63
+msgid "(with --version) Use >= comparison"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:64
+msgid "use check function (for debugging)"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:65
+msgid "Show detailed sub-package info"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:66
+msgid "enable funk parser"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:117
+msgid "Failed to lock the downloaded file"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
-msgid "Reading the install package list %s"
-msgstr "Lettura della lista dei pacchetti di installazione %s"
+msgid "MD5 mismatch, package %s may be compromised"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:256
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, c-format
-msgid "Will download %s"
-msgstr "Verrà prelevato %s"
+msgid "No MD5 available for %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:270
+#. I18N note: "%is is ok" in the sense that %s=package name and the
+#. package is intact
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, c-format
-msgid "%s already installed"
+msgid "%s is ok"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:462
+#, fuzzy, c-format
+msgid "%s-%s version %s-%s already installed"
 msgstr "%s correntemente installato"
 
-#: components/services/install/lib/eazel-install-logic.c:433
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
-msgid "Category = %s"
-msgstr "Categoria = %s"
+msgid "%s version %s already installed"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:705
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
-msgid "Could not create transaction directory (%s)! ***\n"
-msgstr "Impossibile creare la directory di transazione (%s) ! ***\n"
+msgid "%s upgrades from version %s-%s to %s-%s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:728
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
-msgid "Writing transaction to %s"
+msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:961
-msgid "Failed to lock the downloaded file"
+#: components/services/install/lib/eazel-install-logic2.c:494
+#, c-format
+msgid "%s downgrades from version %s to %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:976
+#: components/services/install/lib/eazel-install-logic2.c:547
+#, fuzzy, c-format
+msgid "%s installs version %s-%s"
+msgstr "versione %s-%s"
+
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
-msgid "MD5 mismatch, package %s may be compromised"
+msgid "%s installs version %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
+#, fuzzy, c-format
+msgid "Loading package info from file %s"
+msgstr "Prelevo pacchetto %s"
+
+#. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
+#: components/services/install/lib/eazel-install-logic2.c:1197
+msgid "ok"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:1197
+msgid "not ok"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1058
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
-msgid "Preflight (%ld bytes, %ld packages)"
+msgid "Checking dependencies for %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1221
+#. I18N note: both %s' are package names.
+#. related is in the sense that the two packages apparently
+#. are connected somehow, eg. foo and foo-devel
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, c-format
-msgid "Removing package %s-%s-%s (0x%x) %s"
-msgstr "Rimozione pacchetto %s-%s-%s (0x%x) %s"
+msgid "%s is related to %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1329
-msgid "Preparing package system"
-msgstr "Preparazione del sistema dei pacchetti"
+#: components/services/install/lib/eazel-install-logic2.c:2090
+#, c-format
+msgid "updating %s to version %s-%s solves conflict"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1451
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
-msgid "%s upgrades from version %s to %s"
+msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1456
+#: components/services/install/lib/eazel-install-logic2.c:2128
+#, fuzzy, c-format
+msgid "could not revive %s"
+msgstr "Impossibile prelevare la URL per %s"
+
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
-msgid "%s downgrades from version %s to %s"
+msgid "file uniqueness checking %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1465
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
-msgid "%s version %s already installed"
+msgid "Duplicate file : %s occurs in %s and %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
+msgid "... but it's ok, the packages are related"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2324
+#, c-format
+msgid "(there were %d other conflicts)"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2419
+#, c-format
+msgid "file conflict checking %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2456
+#, c-format
+msgid "file conflict : package %s already provides file %s also provided by %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:2028
-#: components/services/install/lib/eazel-install-logic.c:2036
-msgid "Dependencies appear ok"
-msgstr "Le dipendenze sono soddisfatte"
+#. the owner of this file is a package that we're upgrading, and the
+#. * new version no longer has this file, so everything's okay.
+#: components/services/install/lib/eazel-install-logic2.c:2466
+#, c-format
+msgid "...but it is okay, we're upgrading %s and it ditched that file"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:2031
-msgid "But there are file conflicts"
+#: components/services/install/lib/eazel-install-logic2.c:2558
+#, c-format
+msgid "checking feature consistency of %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2626
+#, c-format
+msgid ""
+"feature missing : %s breaks if %s is installed (feature %s would be lost"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-metadata.c:172
+#: components/services/install/lib/eazel-install-logic2.c:2705
+#, fuzzy, c-format
+msgid "downloading %d packages"
+msgstr "Prelevo pacchetto %s"
+
+#: components/services/install/lib/eazel-install-logic2.c:2951
+#, fuzzy, c-format
+msgid "will upgrade %s"
+msgstr "Permetti aggiornamenti"
+
+#: components/services/install/lib/eazel-install-logic2.c:2954
+#, fuzzy, c-format
+msgid "will downgrade %s"
+msgstr "Verrà prelevato %s"
+
+#: components/services/install/lib/eazel-install-logic2.c:2957
+#, fuzzy, c-format
+msgid "will install %s"
+msgstr "Installazione di \"%s\""
+
+#: components/services/install/lib/eazel-install-logic2.c:2960
+#, fuzzy, c-format
+msgid "will uninstall %s"
+msgstr "Disinstalla"
+
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
+#, c-format
+msgid "%s requires %s"
+msgstr "%s richiede %s"
+
+#: components/services/install/lib/eazel-install-logic2.c:3238
+#, fuzzy, c-format
+msgid "failed %s"
+msgstr "sono %s"
+
+#: components/services/install/lib/eazel-install-metadata.c:174
 msgid "Could not set URLType from config file!"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:756
+#: components/services/install/lib/eazel-install-object.c:717
+msgid "Transactions are not stored, could not find home dir"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-object.c:748
+#, c-format
+msgid "Transactions are stored in %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:776
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:821
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:928
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "Installazione fallita"
 
-#: components/services/install/lib/eazel-install-object.c:972
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "Disinstallazione fallita"
 
-#: components/services/install/lib/eazel-install-protocols.c:126
-#: components/services/install/lib/eazel-install-protocols.c:229
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
-msgid "Downloading %s..."
-msgstr "Prelievo di %s...."
+msgid "Could not create transaction directory (%s)! ***\n"
+msgstr "Impossibile creare la directory di transazione (%s) ! ***\n"
 
-#: components/services/install/lib/eazel-install-protocols.c:137
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:406
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
-msgid "Could not open target file %s"
-msgstr "Impossibile aprire il file di destinazione %s"
-
-#: components/services/install/lib/eazel-install-protocols.c:144
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:340
-msgid "Could not create an http request !"
-msgstr "Impossibile creare richiesta http !"
-
-#: components/services/install/lib/eazel-install-protocols.c:151
-msgid "Proxy: Invalid uri !"
-msgstr "Proxy: URI non valida!"
-
-#: components/services/install/lib/eazel-install-protocols.c:156
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:345
-msgid "Invalid uri !"
-msgstr "URI non valida!"
-
-#: components/services/install/lib/eazel-install-protocols.c:163
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:355
-msgid "Could not prepare http request !"
-msgstr "Impossibile prepare richiesta http !"
-
-#: components/services/install/lib/eazel-install-protocols.c:168
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:360
-msgid "Couldn't get async mode "
-msgstr "Impossibile utilizzare modalità asincrona"
+msgid "Writing transaction to %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:194
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:370
+#: components/services/install/lib/eazel-install-problem.c:163
 #, c-format
-msgid "HTTP error: %d %s"
-msgstr "Errore HTTP: %d %s"
+msgid "%s was cancelled"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:204
-msgid "Could not get request body!"
-msgstr "Impossibile ottenere il corpo della richiesta!"
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
+#, c-format
+msgid "%s is a source package, which is not yet supported"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:230
-msgid "FTP not supported yet"
-msgstr "FTP non ancora supportato"
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
+#, fuzzy, c-format
+msgid "%s would break other packages"
+msgstr "%s corrompe altri pacchetti installati\n"
 
-#: components/services/install/lib/eazel-install-protocols.c:427
+#: components/services/install/lib/eazel-install-problem.c:185
 #, c-format
-msgid "Checking local file %s..."
-msgstr "Controllo file locale %s..."
+msgid "%s would break"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:488
+#: components/services/install/lib/eazel-install-problem.c:191
 #, c-format
-msgid "Failed to retrieve %s!"
-msgstr "Impossibile prelevare %s!"
+msgid "%s would break %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:556
+#: components/services/install/lib/eazel-install-problem.c:197
 #, c-format
-msgid "Could not get a URL for %s"
+msgid "%s is damaged"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:574
-msgid "Downloaded package does not have the correct name"
+#: components/services/install/lib/eazel-install-problem.c:201
+#, c-format
+msgid "%s requires %s, which could not be found on the server"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:575
+#: components/services/install/lib/eazel-install-problem.c:204
 #, c-format
-msgid "Package %s should have had name %s"
+msgid "%s for %s could not be found on the server"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:582
-msgid "Downloaded package does not have the correct version"
-msgstr ""
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
+#, fuzzy, c-format
+msgid "%s is already installed"
+msgstr "%s correntemente installato"
 
-#: components/services/install/lib/eazel-install-protocols.c:583
+#: components/services/install/lib/eazel-install-problem.c:259
 #, c-format
-msgid "Package %s had version %s and not %s"
+msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:602
-msgid "File download failed"
+#: components/services/install/lib/eazel-install-problem.c:263
+#, c-format
+msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:734
-#: components/services/install/lib/eazel-install-protocols.c:739
+#: components/services/install/lib/eazel-install-problem.c:353
 #, c-format
-msgid "Could not retrieve a URL for %s"
-msgstr "Impossibile prelevare la URL per %s"
+msgid "%s is not installed and could not be found on server"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:744
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. %s is a package name or filename
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
-msgid "Could not retrieve a URL for id %s"
-msgstr "Impossibile prelevare la URL per id %s"
+msgid "Check for a new version of %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:63
-msgid "Dry Run Mode Activated.  Packages will not actually be installed ..."
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. both %s's are package names or filenames
+#: components/services/install/lib/eazel-install-problem.c:931
+#, c-format
+msgid "Install both %s and %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:250
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. %s is a package name or filename
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
-msgid "Closing db for %s (open)"
+msgid "Remove %s from your system"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:255
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. %s is a package name or filename. "Force" is in the rpm sense of force,
+#. meaning that no dependency checking etc will be done
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
-msgid "Closing db for %s (not open)"
+msgid "Force the removal of %s from your system"
+msgstr ""
+
+#. TRANSLATORS : This string is a solution to a dependency problem
+#: components/services/install/lib/eazel-install-problem.c:967
+msgid "Package database has an inconsistency"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:1015
+msgid "Continue with force"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:316
+#: components/services/install/lib/eazel-install-problem.c:1021
+#, fuzzy
+msgid "Allow downgrade"
+msgstr "Permetti aggiornamenti"
+
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
 #, c-format
-msgid "Opened packages database in %s"
-msgstr "Aperto database dei pacchetti in %s"
+msgid "Could not open target file %s"
+msgstr "Impossibile aprire il file di destinazione %s"
+
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
+msgid "Could not create an http request !"
+msgstr "Impossibile creare richiesta http !"
+
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
+msgid "Proxy: Invalid uri !"
+msgstr "Proxy: URI non valida!"
+
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
+msgid "Invalid uri !"
+msgstr "URI non valida!"
+
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
+msgid "Could not prepare http request !"
+msgstr "Impossibile prepare richiesta http !"
+
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
+msgid "Couldn't get async mode "
+msgstr "Impossibile utilizzare modalità asincrona"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:321
+#. probably out of disk space
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, c-format
-msgid "Opening packages database in %s failed"
-msgstr "Apertura del database dei pacchetti in %s fallita"
+msgid "DISK FULL: could not write %s"
+msgstr ""
 
-#. Possibly the implest case, we're installing package A, which requires
-#. B that is not installed.
-#: components/services/install/lib/eazel-install-rpm-glue.c:480
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
+msgid "Could not get request body!"
+msgstr "Impossibile ottenere il corpo della richiesta!"
+
+#: components/services/install/lib/eazel-install-protocols.c:208
 #, c-format
-msgid "%s requires %s"
-msgstr "%s richiede %s"
+msgid "HTTP error: %d %s"
+msgstr "Errore HTTP: %d %s"
 
-#. If we end here, it's a conflict is going to break something
-#: components/services/install/lib/eazel-install-rpm-glue.c:616
+#: components/services/install/lib/eazel-install-protocols.c:255
+msgid "FTP not supported yet"
+msgstr "FTP non ancora supportato"
+
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, c-format
-msgid "Package %s conflicts with %s-%s"
-msgstr "Il pacchetto %s è in conflitto con %s-%s"
+msgid "Checking local file %s..."
+msgstr "Controllo file locale %s..."
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:630
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, c-format
-msgid "Processing dep for %s, requires library %s"
+msgid "Failed to retrieve %s!"
+msgstr "Impossibile prelevare %s!"
+
+#: components/services/install/lib/eazel-install-protocols.c:657
+#, fuzzy, c-format
+msgid "Could not get an URL for %s"
+msgstr "Impossibile prelevare la URL per %s"
+
+#: components/services/install/lib/eazel-install-protocols.c:672
+msgid "Downloaded package does not have the correct name"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:637
+#: components/services/install/lib/eazel-install-protocols.c:673
 #, c-format
-msgid "Processing dep for %s, requires package %s"
+msgid "Package %s should have had name %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-protocols.c:701
+msgid "File download failed"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-types.c:455
-#, c-format
-msgid "Cannot open %s"
-msgstr "Impossibile aprire %s"
-
-#: components/services/install/lib/eazel-install-xml-package-list.c:129
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 msgid "*** No package nodes! (cat has no children) ***"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:131
-#: components/services/install/lib/eazel-install-xml-package-list.c:139
-#: components/services/install/lib/eazel-install-xml-package-list.c:154
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 msgid "*** Bailing from package parse! ***"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:137
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
 msgid "*** No package nodes! ***"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:143
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 msgid "*** Malformed package node!"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:152
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
 msgid "*** No depends nodes! ***"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:158
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:176
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:193
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:198
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:199
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:205
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:206
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:260
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:262
-#: components/services/install/lib/eazel-install-xml-package-list.c:270
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:268
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:304
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:308
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:342
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:435
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:482
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:688
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:693
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:746
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "Impossibile leggere xml (lunghezza %d)"
 
-#. Setup the title
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:116
-msgid "Easy Install"
-msgstr "Installazione facile"
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
+#, c-format
+msgid "Opened packages database in %s"
+msgstr "Aperto database dei pacchetti in %s"
 
-#. Setup the progress header
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:212
-msgid "Messages"
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
+#, c-format
+msgid "Opening packages database in %s failed"
+msgstr "Apertura del database dei pacchetti in %s fallita"
+
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
+#, c-format
+msgid "Closing db for %s (open)"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:212
-msgid "Progress"
-msgstr "Progresso"
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
+#, c-format
+msgid "Closing db for %s (not open)"
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:573
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
-msgid "Downloading package %s"
+msgid "Cannot open %s"
+msgstr "Impossibile aprire %s"
+
+#. this stuff flies by so fast, it's probably enough to just say "info"
+#: components/services/install-view/callbacks.c:64
+#, fuzzy
+msgid "Getting package information ..."
+msgstr "Installazione pacchetto %s ..."
+
+#: components/services/install-view/callbacks.c:82
+#, fuzzy, c-format
+msgid "Checking \"%s\" for conflicts..."
+msgstr "Controllo file locale %s..."
+
+#: components/services/install-view/callbacks.c:185
+#, fuzzy, c-format
+msgid "Downloading 1 package (%s)"
 msgstr "Prelevo pacchetto %s"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:580
-#, c-format
-msgid "Downloading package %s ..."
-msgstr "Prelievo pacchetto %s ..."
+#: components/services/install-view/callbacks.c:187
+#, fuzzy, c-format
+msgid "Downloading %d packages (%s)"
+msgstr "Prelevo pacchetto %s"
 
-#. done!  turn progress bar into a label
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:585
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:785
-msgid "Complete!"
-msgstr "Completato!"
+#: components/services/install-view/callbacks.c:236
+#, c-format
+msgid "Downloading \"%s\""
+msgstr "Prelevo \"%s\""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:607
+#: components/services/install-view/callbacks.c:242
 #, c-format
-msgid "Dependency check: Package %s needs %s"
+msgid "0K of %dK"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:648
+#: components/services/install-view/callbacks.c:249
+#, c-format
 msgid ""
-"I'm about to install the following packages:\n"
-"\n"
+"The package \"%s\" requires \"%s\" to run.\n"
+"Downloading \"%s\" now."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:666
+#: components/services/install-view/callbacks.c:252
+#, fuzzy, c-format
+msgid "Attempting to download package \"%s\"."
+msgstr "Prelevo pacchetto %s"
+
+#: components/services/install-view/callbacks.c:262
+#: components/services/install-view/callbacks.c:333
+#, fuzzy
+msgid "Complete"
+msgstr "Completato!"
+
+#: components/services/install-view/callbacks.c:266
+#, c-format
 msgid ""
-"\n"
-"Is this okay?"
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" has been successfully downloaded."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:686
-msgid "Preparing to install 1 package"
-msgstr "In preparazione l'installazione di 1 pacchetto"
+#: components/services/install-view/callbacks.c:269
+#, c-format
+msgid "The package \"%s\" has been successfully downloaded."
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:688
+#: components/services/install-view/callbacks.c:287
 #, c-format
-msgid "Preparing to install %d packages"
-msgstr "In preparazione l'installazione di %d pacchetti"
+msgid "%dK of %dK"
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:709
+#: components/services/install-view/callbacks.c:316
+#, fuzzy, c-format
+msgid "Download of package \"%s\" failed!"
+msgstr "Prelevo pacchetto %s"
+
+#: components/services/install-view/callbacks.c:338
 #, c-format
-msgid "Download of package %s failed!"
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" has been successfully downloaded and installed."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:341
+#, c-format
+msgid "\"%s\" has been successfully downloaded and installed."
 msgstr ""
 
 #. starting a new package -- create new progress indicator
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:726
+#: components/services/install-view/callbacks.c:369
 #, c-format
 msgid "Installing package %d of %d"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:747
+#: components/services/install-view/callbacks.c:396
+#, c-format
 msgid ""
-"A core package of nautilus has been updated.\n"
-"You should restart nautilus."
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" is now being installed."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:749
-msgid "Nautilus updated"
-msgstr ""
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:756
-#, c-format
-msgid "Installing package %s ..."
+#: components/services/install-view/callbacks.c:399
+#, fuzzy, c-format
+msgid "Now installing package \"%s\"."
 msgstr "Installazione pacchetto %s ..."
 
-#. first package is the main one.  update top info, now that we know it
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:764
+#: components/services/install-view/callbacks.c:407
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "Installazione di \"%s\""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:773
+#: components/services/install-view/callbacks.c:415
+#: src/nautilus-zoom-control.c:592
+msgid "%d%%"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:443
+#, fuzzy, c-format
+msgid "Installation failed on %s"
+msgstr "Installazione fallita!"
+
+#: components/services/install-view/callbacks.c:471
+msgid "I ran into problems while installing."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:472
+msgid "I'd like to try the following :"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:481
+msgid "Is this ok ?"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:556
+#, fuzzy
+msgid "Installation cancelled."
+msgstr "Installazione fallita!"
+
+#: components/services/install-view/callbacks.c:558
+msgid "This package has already been installed."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
+#, fuzzy
+msgid "Installation complete."
+msgstr "Installazione completata!"
+
+#: components/services/install-view/callbacks.c:564
+#, fuzzy
+msgid "Installation failed."
+msgstr "Installazione fallita!"
+
+#. some succeeded; some failed
+#: components/services/install-view/callbacks.c:568
+msgid "Some packages installed successfully:"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:577
+#, fuzzy
+msgid ""
+"\n"
+"Some packages failed:"
+msgstr "Specificare il file del pacchetto"
+
+#: components/services/install-view/callbacks.c:626
+msgid "Erase the RPM files?"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:628
+msgid "Erase the leftover RPM files?"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:658
+msgid "Ok"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:673
+msgid ""
+"A core package of Nautilus has been\n"
+"updated.  You should restart Nautilus.\n"
+"\n"
+"Do you wish to do that now?"
+msgstr ""
+
+#. Setup the title
+#: components/services/install-view/forms.c:201
+msgid "Easy Install"
+msgstr "Installazione facile"
+
+#. Setup the progress header
+#. FIXME: the middle header is all fubar now, so we just say "messages", but the spec
+#. * shows "progress" over the 2nd column of the message box.  it's just too hard to get
+#. * it aligned currently.
+#.
+#: components/services/install-view/forms.c:327
+msgid "Messages"
+msgstr ""
+
+#: components/services/install-view/forms.c:358
+#: components/services/summary/nautilus-summary-view.c:647
 #, c-format
 msgid "Version: %s"
 msgstr "versione: %s"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:832
-msgid "Installation complete!"
-msgstr "Installazione completata!"
+#: components/services/install-view/forms.c:407
+msgid "These packages are ready to be downloaded and installed:"
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:834
-msgid "Installation aborted."
-msgstr "Installazione interrotta."
+#: components/services/install-view/forms.c:408
+msgid "If you wish to download and install these packages, click Continue."
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:836
-msgid "Installation failed!"
-msgstr "Installazione fallita!"
+#: components/services/install-view/forms.c:411
+msgid "These packages are ready to be uninstalled:"
+msgstr ""
+
+#: components/services/install-view/forms.c:412
+msgid "If you wish to uninstall these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:415
+msgid "These packages are ready to be reverted:"
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:850
+#: components/services/install-view/forms.c:416
+msgid "If you wish to revert these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:464
 #, c-format
-msgid "%s %s: would not work anymore\n"
+msgid "for a total of %ld MB."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:853
+#: components/services/install-view/forms.c:466
+#, c-format
+msgid "for a total of %ld KB."
+msgstr ""
+
+#. buttons
+#: components/services/install-view/forms.c:478
+#, fuzzy
+msgid "Continue"
+msgstr "Contenuto"
+
+#: components/services/install-view/forms.c:482
+#: libnautilus-extensions/nautilus-drag.c:493
+#: src/file-manager/fm-directory-view.c:4326
+#, fuzzy
+msgid "Cancel"
+msgstr "Canali"
+
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
-msgid "%s %s: couldn't find this package\n"
+msgid "%s is in GNOME (footprint) > %s"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:856
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, c-format
-msgid "%s %s: source package (not supported)\n"
+msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:859
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
-msgid "%s %s: would break other installed packages\n"
+msgid "%s is in the KDE menu.\n"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:863
+#: components/services/install-view/nautilus-service-install-view.c:655
+#, fuzzy
+msgid "Installation Complete"
+msgstr "Installazione completata!"
+
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
-msgid "%s %s: conflicts with installed files\n"
+msgid ""
+"%sTo start %s, click the Launch button below, or to create a shortcut, drag "
+"the icon on the right to the GNOME panel or your desktop."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:866
+#. couldn't find an icon
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
-msgid "%s %s: already installed\n"
+msgid "%sTo start %s, click the Launch button below."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:897
-msgid "This package has already been installed."
+#: components/services/install-view/nautilus-service-install-view.c:773
+msgid "Incorrect password."
+msgstr "Password non corretta"
+
+#: components/services/install-view/nautilus-service-install-view.c:778
+msgid "Authenticate as root"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:895
+#, fuzzy
+msgid "Installing packages"
+msgstr "Installazione pacchetto %s ..."
+
+#: components/services/install-view/nautilus-service-install-view.c:897
+#, fuzzy
+msgid "Installing remote package"
+msgstr "Installazione pacchetto %s ..."
+
+#: components/services/install-view/nautilus-service-install-view.c:901
+#, fuzzy
+msgid "Installing some package"
+msgstr "Prelevo alcuni pacchetti"
+
+#: components/services/install-view/nautilus-service-install-view.c:918
+msgid ""
+"The Eazel install service is missing:\n"
+"Installs will not work."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:967
+msgid "Contacting the Eazel Software Catalog ..."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:1025
+msgid "Checking for authorization..."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:1097
+msgid "Aborting package downloads (please wait) ..."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:1117
+msgid "Package download aborted."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:1118
+msgid "Aborted"
+msgstr ""
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:1
+#: components/services/install/server/Trilobite_Service_install.oaf.in.h:2
+#: components/services/summary/nautilus-summary-view.c:123
+msgid "Install"
+msgstr "Installa"
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:2
+#, fuzzy
+msgid "Install Viewer"
+msgstr "Installazione fallita"
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:3
+msgid "Nautilus Service Install View"
+msgstr ""
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:4
+msgid "Nautilus Service Install View Factory"
+msgstr ""
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:5
+msgid "Service Install View Component"
+msgstr ""
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:6
+msgid "Service Install View Component's Factory"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:904
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:7
+#, fuzzy
+msgid "View as Install"
+msgstr "Installazione facile"
+
+#: components/services/install/server/Trilobite_Service_install.oaf.in.h:1
+msgid "Factory for the install service"
+msgstr ""
+
+#: components/services/inventory/eazel-inventory-client.c:70
+msgid "Enable inventory upload."
+msgstr ""
+
+#: components/services/inventory/eazel-inventory-client.c:72
+msgid "Disable inventory upload."
+msgstr ""
+
+#: components/services/inventory/eazel-inventory-client.c:73
+msgid "Display information about current inventory settings."
+msgstr ""
+
+#: components/services/inventory/eazel-inventory-client.c:74
+msgid "Upload inventory now, if not up to date."
+msgstr ""
+
+#: components/services/inventory/Trilobite_Service_inventory.oaf.in.h:1
+msgid "Factory for the inventory service"
+msgstr ""
+
+#: components/services/inventory/Trilobite_Service_inventory.oaf.in.h:2
+msgid "Inventory"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:1
+msgid "Nautilus Inventory view"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:2
+msgid "Nautilus Inventory view factory"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:3
+msgid "Nautilus System Inventory component's component's factory"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:4
+msgid "System Inventory"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:5
+msgid "System Inventory Viewer"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:6
+msgid "System inventory view component"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:7
+msgid "View as System Inventory"
+msgstr ""
+
+#. Setup the title
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:153
+msgid "Please Change Your Eazel Password"
+msgstr ""
+
+#. add password boxes
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:174
+msgid "User Name:"
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:181
+#, fuzzy
+msgid "Current Password:"
+msgstr "Password attuale: "
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:188
+#, fuzzy
+msgid "New Password:"
+msgstr "Nuova password: "
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:195
+#, fuzzy
+msgid "Confirm New Password:"
+msgstr "Nuova password: "
+
+#. allocate the command buttons - first the change_password button
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:227
+#, fuzzy
+msgid "Change my password"
+msgstr "Nuova password: "
+
+#. now allocate the account maintenance button
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:234
+msgid "I need assistance"
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:297
+msgid "Your password has been changed!"
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:328
+msgid ""
+"I'm sorry, but that password\n"
+"is incorrect.  Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:332
 msgid ""
-"Installation Failed!\n"
+"I'm sorry, but your new password\n"
+"must be at least six (6) characters long.\n"
+"Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:337
+msgid ""
+"I'm sorry, but your new password\n"
+"can't be ridiculously long.\n"
+"Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:346
+msgid ""
+"I'm sorry, but your new password must\n"
+"contain letters along with at least one\n"
+"number or symbol. Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:350
+msgid ""
+"I'm sorry, but I hit an unexpected\n"
+"error. Please try again, with\n"
+"different passwords."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:434
+msgid ""
+"I'm sorry, but I got an unexpected\n"
+"error.  Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:467
+msgid ""
+"I'm sorry, but your new password\n"
+"wasn't typed the same way twice.\n"
+"Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:1
+#, fuzzy
+msgid "Change Password"
+msgstr "Password:"
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:2
+msgid "Change Password Viewer"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:3
+msgid "Eazel Change Password View"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:4
+msgid "Eazel Change Password view component"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:5
+msgid "Nautilus Service Login View Factory"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:6
+msgid "Service Login View Component's Factory"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:7
+msgid "View as Change Password"
+msgstr ""
+
+#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:295
+#, fuzzy
+msgid "Unknown Date"
+msgstr "tipo sconosciuto"
+
+#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:300
+msgid "%A, %B %d"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-callbacks.c:97
+msgid ""
+"Sorry, network problems are preventing you from connecting to Eazel Services."
+msgstr ""
+
+#. FIXME we really should use the services alert icon here, eh?
+#: components/services/summary/nautilus-summary-callbacks.c:102
+msgid ""
+"Your Eazel Services account has not yet been activated.  You can't log into "
+"Eazel Services until you activate your account.\n"
 "\n"
-msgstr "Installazione fallita!\n\n"
+"Please check your email for activation instructions."
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:923
-msgid "Should I delete the leftover RPM files?"
+#. FIXME we really should use the services alert icon here, eh?
+#: components/services/summary/nautilus-summary-callbacks.c:109
+msgid ""
+"Your Eazel Service User Account has been temporarily disabled.\n"
+"\n"
+"Please try again in a few minutes, or contact Eazel support if this problem "
+"continues."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1070
-msgid "Downloading remote package"
+#: components/services/summary/nautilus-summary-callbacks.c:131
+msgid "We're sorry, but your name and password are still not recognized."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1072
-#, c-format
-msgid "Downloading \"%s\""
-msgstr "Prelevo \"%s\""
+#: components/services/summary/nautilus-summary-dialogs.c:69
+#, fuzzy
+msgid "Eazel Service Login Error"
+msgstr "Servizi Eazel"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1074
-msgid "Downloading some package"
-msgstr "Prelevo alcuni pacchetti"
+#: components/services/summary/nautilus-summary-dialogs.c:80
+msgid "Service Error"
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1115
-msgid "Contacting install server ..."
+#: components/services/summary/nautilus-summary-dialogs.c:104
+msgid "Register Now"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1167
-msgid "Package download aborted."
+#: components/services/summary/nautilus-summary-dialogs.c:115
+msgid "Services Login"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1169
-msgid "Aborted."
+#: components/services/summary/nautilus-summary-dialogs.c:131
+#: libnautilus-extensions/nautilus-global-preferences.c:827
+msgid "Username:"
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:137
-msgid "Could not find a valid boolean value for grey_out!"
+#: components/services/summary/nautilus-summary-dialogs.c:138
+#: libnautilus-extensions/nautilus-global-preferences.c:835
+msgid "Password:"
+msgstr "Password:"
+
+#: components/services/summary/nautilus-summary-dialogs.c:146
+#: components/services/summary/nautilus-summary-dialogs.c:155
+#, fuzzy
+msgid "Please log in to Eazel Services"
+msgstr "Entra nei Servizi Eazel"
+
+#: components/services/summary/nautilus-summary-dialogs.c:150
+msgid "Your user name or password were not correct.  Please try again."
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:188
-msgid "There is no service data !\n"
+#: components/services/summary/nautilus-summary-view.c:117
+#: libnautilus-extensions/nautilus-program-chooser.c:1361
+msgid "Go There"
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:213
-#: components/services/summary/lib/eazel-summary-shared.c:238
-msgid "There is no eazel news data !\n"
+#: components/services/summary/nautilus-summary-view.c:120
+#, fuzzy
+msgid "More Info"
+msgstr "Info"
+
+#: components/services/summary/nautilus-summary-view.c:131
+msgid "Account Preferences"
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:268
-msgid "Could not fetch summary configuration !"
+#: components/services/summary/nautilus-summary-view.c:132
+msgid "Logout"
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:291
-msgid "The summary configuration contains no data!\n"
+#: components/services/summary/nautilus-summary-view.c:133
+#: components/services/summary/nautilus-summary-view.c:141
+msgid "Terms of Use"
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:296
-msgid "Cannot find the SUMMARY_DATA xmlnode!\n"
+#: components/services/summary/nautilus-summary-view.c:134
+#: components/services/summary/nautilus-summary-view.c:142
+msgid "Privacy Statement"
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:298
-msgid "Bailing from the SUMMARY_DATA parse!\n"
+#: components/services/summary/nautilus-summary-view.c:139
+msgid "Register"
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:305
-msgid "Could not find any summary configuration data!\n"
+#: components/services/summary/nautilus-summary-view.c:140
+msgid "Login"
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:307
-msgid "Bailing from summary configuration parse!\n"
+#: components/services/summary/nautilus-summary-view.c:170
+#, fuzzy, c-format
+msgid "Eazel Services - Welcome, %s!"
+msgstr "Servizi Eazel"
+
+#: components/services/summary/nautilus-summary-view.c:175
+msgid "Eazel Services - You are not logged in"
 msgstr ""
 
-#. parse_summary_xml_file
-#.
-#. *  This file is autogenerated from nautilus-summary-view-ui.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:9
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:17
+#: components/services/summary/nautilus-summary-view.c:182
+#, fuzzy
+msgid "Connecting to Eazel Services..."
+msgstr "Entra nei Servizi Eazel"
+
+#: components/services/summary/nautilus-summary-view.c:741
+#: data/linksets/home.xml.h:3 src/nautilus-service-ui.xml.h:4
+msgid "Services"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:752
+msgid "Featured Downloads"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:884
+msgid ""
+"Unable to get services data from Eazel's server. The server might be "
+"unavailable right now, or your computer might be configured incorrectly. "
+"Please contact support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:894
+msgid ""
+"Found a problem with services data on Eazel servers. Please contact "
+"support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:917
+msgid ""
+"Information is missing from the redirect data on Eazel servers. Please "
+"contact support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:959
+msgid ""
+"Unable to connect to Eazel's server. The server might be unavailable right "
+"now, or your computer might be configured incorrectly. You could try again "
+"later."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:969
+msgid ""
+"Found a problem with redirect data on Eazel servers. Please contact "
+"support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:986
+msgid "Failed to upload system inventory."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:1049
+#: src/nautilus-first-time-druid.c:258
+msgid "Eazel Services"
+msgstr "Servizi di Eazel"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:1
 msgid "Configure your service preferences"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:10
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:18
+#: components/services/summary/nautilus-summary-view-ui.xml.h:2
 msgid "Go to the Eazel Services Registration Form"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:11
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:19
+#: components/services/summary/nautilus-summary-view-ui.xml.h:3
 msgid "Log out from Eazel Services"
 msgstr "Terminazione dei Servizi Eazel"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:12
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:20
+#: components/services/summary/nautilus-summary-view-ui.xml.h:4
 msgid "Service _Preferences"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:13
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:21
+#: components/services/summary/nautilus-summary-view-ui.xml.h:5
 msgid "Show the log-in dialog box"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:14
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:22
+#: components/services/summary/nautilus-summary-view-ui.xml.h:6
 msgid "_Log in to Eazel Services"
 msgstr "Entra nei Servizi Eazel"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:15
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:23
+#: components/services/summary/nautilus-summary-view-ui.xml.h:7
 msgid "_Log out from Eazel Services"
 msgstr "Esci dai Servizi Eazel"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:16
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:24
+#: components/services/summary/nautilus-summary-view-ui.xml.h:8
 msgid "_Register for Eazel Services"
 msgstr "Registrazione per i Servizi Eazel"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:281
-msgid "Register"
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:1
+msgid "Nautilus Service Summary View Factory"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:282
-msgid "Login"
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Summary View"
+msgstr "Aggiornamento Nautilus"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:3
+msgid "Service Summary View Component's Factory"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:283
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:291
-msgid "Terms of Use"
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:4
+msgid "Service Summary view component"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:284
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:292
-msgid "Privacy Statement"
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:5
+msgid "Summary"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:289
-msgid "Account Preferences"
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:6
+msgid "Summary Viewer"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:290
-msgid "Logout"
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:7
+msgid "View as Summary"
+msgstr ""
+
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
+#, fuzzy, c-format
+msgid "HTTP error %d \"%s\" on uri %s"
+msgstr "Errore HTTP: %d %s"
+
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
+msgid "Could not initialize Bonobo"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:344
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
-msgid "Welcome Back %s!"
-msgstr "Bentornato %s!"
+msgid "Can't write logfile %s -- using default log handler"
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:350
-msgid "You are not logged in!"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:1
+msgid "Nautilus eazel sample service view component"
 msgstr ""
 
-#. add the tab
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:441
-msgid "Your Services"
-msgstr "I tuoi Servizi"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:2
+msgid "Nautilus services startup view factory"
+msgstr ""
 
-#. create the Additional Services pane
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:505
-msgid "Additional Services"
-msgstr "Servizi addizionali"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:3
+#, fuzzy
+msgid "Service"
+msgstr "Servizi"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:525
-msgid ""
-"Check back here for new system management\n"
-"services that will help make Linux easier to use."
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:4
+#, fuzzy
+msgid "Service Viewer"
+msgstr "Servizi"
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:5
+msgid "Services startup view factory"
+msgstr ""
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:6
+#, fuzzy
+msgid "View as Service"
+msgstr "Servizi di Eazel"
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:7
+msgid "eazel sample service view"
 msgstr ""
 
-#. add the tab
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:564
-msgid "Current Updates"
+#: components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in.h:1
+msgid "Factory for the sample service"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:597
+#: components/text/nautilus-text-view.c:334
 #, c-format
-msgid "Version %s"
-msgstr "versione %s"
+msgid "Sorry, but %s is too large for Nautilus to load all of it."
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1189
-msgid "Service Error"
+#: components/text/nautilus-text-view.c:337
+msgid "File too large"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1254
-msgid "Register Now"
+#: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "Caratteri"
+
+#: components/text/nautilus-text-view-ui.xml.h:2
+msgid "Lucida"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1256
-msgid "Help"
+#: components/text/nautilus-text-view-ui.xml.h:3
+msgid "Use the Courier Font"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1259
-msgid "Services Login"
+#: components/text/nautilus-text-view-ui.xml.h:4
+msgid "Use the Fixed Font"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1271
-msgid "Username:"
+#: components/text/nautilus-text-view-ui.xml.h:5
+msgid "Use the GTK System Font"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1278
-msgid "Password:"
-msgstr "Password:"
+#: components/text/nautilus-text-view-ui.xml.h:6
+msgid "Use the Helvetica Font"
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1286
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1298
-msgid "Please login to eazel services"
+#: components/text/nautilus-text-view-ui.xml.h:7
+msgid "Use the Lucida Font"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1290
-msgid "Oops! Your user name or password were not correct. Please try again:"
+#: components/text/nautilus-text-view-ui.xml.h:8
+msgid "Use the Times Font"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1294
-msgid "We're sorry, but your name and password are still not recognized."
+#: components/text/nautilus-text-view-ui.xml.h:9
+msgid "_Courier"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "_Trova"
+
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
+msgid "_Helvetica"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:13
+#, fuzzy
+msgid "_Times"
+msgstr "Durata "
+
+#: components/text/Nautilus_View_text.oaf.in.h:1
+msgid "Factory for text view"
+msgstr ""
+
+#: components/text/Nautilus_View_text.oaf.in.h:2
+#, fuzzy
+msgid "Text"
+msgstr "Successivo"
+
+#: components/text/Nautilus_View_text.oaf.in.h:3
+#, fuzzy
+msgid "Text Viewer"
+msgstr "file di testo"
+
+#: components/text/Nautilus_View_text.oaf.in.h:4
+#, fuzzy
+msgid "Text view"
+msgstr "file di testo"
+
+#: components/text/Nautilus_View_text.oaf.in.h:5
+msgid "Text view factory"
+msgstr ""
+
+#: components/text/Nautilus_View_text.oaf.in.h:6
+msgid "View as Text"
+msgstr ""
+
+#: components/text/services/google.xml.h:1
+msgid "Search Google for Selected Text"
+msgstr ""
+
+#: components/text/services/google.xml.h:2
+msgid "Use Google to search the web for the selected text"
+msgstr ""
+
+#: components/text/services/webster.xml.h:1
+msgid "Look Up Selected Text in Dictionary"
+msgstr ""
+
+#: components/text/services/webster.xml.h:2
+msgid "Look up the selected text in the Merriam-Webster dictionary"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:1
+msgid "animation to indicate on-going activity"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:2
+msgid "throbber"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:3
+msgid "throbber factory"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:4
+msgid "throbber object factory"
+msgstr ""
+
+#: components/tree/Nautilus_View_tree.oaf.in.h:1
+msgid "Nautilus Tree sidebar panel"
+msgstr ""
+
+#: components/tree/Nautilus_View_tree.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Tree view"
+msgstr "Aggiornamento Nautilus"
+
+#: components/tree/Nautilus_View_tree.oaf.in.h:3
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
+msgid "Tree"
+msgstr ""
+
+#: data/browser.xml.h:1
+#, fuzzy
+msgid "Apparition"
+msgstr "Applicazioni"
+
+#: data/browser.xml.h:2
+msgid "Azul"
+msgstr ""
+
+#: data/browser.xml.h:3
+#, fuzzy
+msgid "Black"
+msgstr "Indietro"
+
+#: data/browser.xml.h:4
+msgid "Blue Ridge"
+msgstr ""
+
+#: data/browser.xml.h:5
+msgid "Blue Rough"
+msgstr ""
+
+#: data/browser.xml.h:6
+#, fuzzy
+msgid "Blue Type"
+msgstr "Tipo"
+
+#: data/browser.xml.h:7
+msgid "Brushed Metal"
+msgstr ""
+
+#: data/browser.xml.h:8
+msgid "Bubble Gum"
+msgstr ""
+
+#: data/browser.xml.h:9
+msgid "Burlap"
+msgstr ""
+
+#: data/browser.xml.h:10
+msgid "Camouflage"
+msgstr ""
+
+#: data/browser.xml.h:11
+msgid "Certified"
+msgstr ""
+
+#: data/browser.xml.h:12
+#, fuzzy
+msgid "Chalk"
+msgstr "Canali"
+
+#: data/browser.xml.h:13
+msgid "Charcoal"
+msgstr ""
+
+#: data/browser.xml.h:14
+msgid "Colors"
+msgstr ""
+
+#: data/browser.xml.h:15
+#, fuzzy
+msgid "Concrete"
+msgstr "Contenuto"
+
+#: data/browser.xml.h:16
+msgid "Cool"
+msgstr ""
+
+#: data/browser.xml.h:17
+msgid "Cork"
+msgstr ""
+
+#: data/browser.xml.h:18
+#, fuzzy
+msgid "Countertop"
+msgstr "Contenuto"
+
+#: data/browser.xml.h:19
+msgid "Danger"
+msgstr ""
+
+#: data/browser.xml.h:20
+msgid "Danube"
+msgstr ""
+
+#: data/browser.xml.h:21
+msgid "Dark Cork"
+msgstr ""
+
+#: data/browser.xml.h:22
+msgid "Dark GNOME"
+msgstr ""
+
+#: data/browser.xml.h:23
+msgid "Deep Teal"
+msgstr ""
+
+#: data/browser.xml.h:24
+#, fuzzy
+msgid "Distinguished"
+msgstr "Fine"
+
+#: data/browser.xml.h:25
+#, fuzzy
+msgid "Dots"
+msgstr "Caratteri"
+
+#: data/browser.xml.h:26
+msgid "Draft"
+msgstr ""
+
+#: data/browser.xml.h:27
+msgid "Drag a color to an object to change it to that color"
+msgstr ""
+
+#: data/browser.xml.h:28
+msgid "Drag a pattern tile to an object to change it"
+msgstr ""
+
+#: data/browser.xml.h:29
+msgid "Drag an emblem to an object to add it to the object"
+msgstr ""
+
+#: data/browser.xml.h:30
+msgid "Eclipse"
+msgstr ""
+
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
+msgid "Emblems"
+msgstr ""
+
+#: data/browser.xml.h:32
+msgid "Envy"
+msgstr ""
+
+#: data/browser.xml.h:33
+#, fuzzy
+msgid "Erase"
+msgstr "Pausa"
+
+#: data/browser.xml.h:34
+msgid "Favorite"
+msgstr ""
+
+#: data/browser.xml.h:35
+msgid "Fibers"
+msgstr ""
+
+#: data/browser.xml.h:36
+msgid "Fire Engine"
+msgstr ""
+
+#: data/browser.xml.h:37
+msgid "Fleur De Lis"
+msgstr ""
+
+#: data/browser.xml.h:38
+msgid "Floral"
+msgstr ""
+
+#: data/browser.xml.h:39
+msgid "Fossil"
+msgstr ""
+
+#: data/browser.xml.h:40 icons/gnome/gnome.xml.h:1
+msgid "GNOME"
+msgstr ""
+
+#: data/browser.xml.h:41
+msgid "Granite"
+msgstr ""
+
+#: data/browser.xml.h:42
+msgid "Grapefruit"
+msgstr ""
+
+#: data/browser.xml.h:43
+msgid "Green Weave"
+msgstr ""
+
+#: data/browser.xml.h:44
+msgid "Ice"
+msgstr ""
+
+#: data/browser.xml.h:45
+msgid "Important"
+msgstr ""
+
+#: data/browser.xml.h:46
+#, fuzzy
+msgid "Indigo"
+msgstr "Info"
+
+#: data/browser.xml.h:47
+msgid "Leaf"
+msgstr ""
+
+#: data/browser.xml.h:48
+msgid "Lemon"
+msgstr ""
+
+#: data/browser.xml.h:49
+msgid "Mango"
+msgstr ""
+
+#: data/browser.xml.h:50
+msgid "Manila Paper"
+msgstr ""
+
+#: data/browser.xml.h:51
+msgid "Moss Ridge"
+msgstr ""
+
+#: data/browser.xml.h:52
+msgid "Mud"
+msgstr ""
+
+#: data/browser.xml.h:53
+msgid "New"
+msgstr ""
+
+#: data/browser.xml.h:54
+msgid "Numbers"
+msgstr ""
+
+#: data/browser.xml.h:55
+#: libnautilus-extensions/nautilus-file-operations.c:1102
+msgid "OK"
+msgstr ""
+
+#: data/browser.xml.h:56
+msgid "Ocean Strips"
+msgstr ""
+
+#: data/browser.xml.h:57
+msgid "Oh No"
+msgstr ""
+
+#: data/browser.xml.h:58
+msgid "Onyx"
+msgstr ""
+
+#: data/browser.xml.h:59
+msgid "Orange"
+msgstr ""
+
+#: data/browser.xml.h:60
+msgid "Pale Blue"
+msgstr ""
+
+#: data/browser.xml.h:61
+msgid "Patterns"
+msgstr ""
+
+#: data/browser.xml.h:62
+msgid "Personal"
+msgstr ""
+
+#: data/browser.xml.h:63
+msgid "Purple Marble"
+msgstr ""
+
+#: data/browser.xml.h:64
+msgid "Ridged Paper"
+msgstr ""
+
+#: data/browser.xml.h:65
+msgid "Rough Paper"
+msgstr ""
+
+#: data/browser.xml.h:66
+msgid "Ruby"
+msgstr ""
+
+#: data/browser.xml.h:67
+#, fuzzy
+msgid "Sea Foam"
+msgstr "Cerca per:"
+
+#: data/browser.xml.h:68
+#, fuzzy
+msgid "Shale"
+msgstr "Esempio"
+
+#: data/browser.xml.h:69
+#, fuzzy
+msgid "Silver"
+msgstr "Dimensione"
+
+#: data/browser.xml.h:70
+msgid "Sky"
+msgstr ""
+
+#: data/browser.xml.h:71
+msgid "Sky Ridge"
+msgstr ""
+
+#: data/browser.xml.h:72
+msgid "Snow Ridge"
+msgstr ""
+
+#: data/browser.xml.h:73
+msgid "Special"
+msgstr ""
+
+#: data/browser.xml.h:74
+#, fuzzy
+msgid "Stucco"
+msgstr "Stop"
+
+#: data/browser.xml.h:75
+msgid "Tangerine"
+msgstr ""
+
+#: data/browser.xml.h:76
+msgid "Terracotta"
+msgstr ""
+
+#: data/browser.xml.h:77
+msgid "Urgent"
+msgstr ""
+
+#: data/browser.xml.h:78
+msgid "Violet"
+msgstr ""
+
+#: data/browser.xml.h:79
+msgid "Wavy White"
+msgstr ""
+
+#: data/browser.xml.h:80
+#, fuzzy
+msgid "White"
+msgstr "Titolo"
+
+#: data/browser.xml.h:81
+msgid "White Ribs"
+msgstr ""
+
+#: data/linksets/apps.xml.h:2
+msgid "Gnumeric"
+msgstr ""
+
+#: data/linksets/apps.xml.h:3
+msgid "Netscape"
+msgstr ""
+
+#: data/linksets/apps.xml.h:4
+msgid "The Gimp"
+msgstr ""
+
+#: data/linksets/desktop.xml.h:1
+#: libnautilus-extensions/nautilus-global-preferences.c:642
+msgid "Desktop"
+msgstr ""
+
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
+#: libnautilus-extensions/nautilus-trash-directory.c:301
+#: src/file-manager/fm-desktop-icon-view.c:67
+msgid "Trash"
+msgstr ""
+
+#: data/linksets/home.xml.h:1
+#, fuzzy
+msgid "Computer"
+msgstr "Completato!"
+
+#: data/linksets/home.xml.h:2
+#, fuzzy
+msgid "Home Directory"
+msgstr "Directory Utente"
+
+#: data/linksets/portals.xml.h:1
+msgid "Excite"
+msgstr ""
+
+#: data/linksets/portals.xml.h:2
+msgid "Portals"
+msgstr ""
+
+#: data/linksets/portals.xml.h:3
+msgid "Yahoo"
+msgstr ""
+
+#: data/linksets/search_engines.xml.h:1
+#, fuzzy
+msgid "Alta Vista"
+msgstr "Artista"
+
+#: data/linksets/search_engines.xml.h:2
+msgid "Google"
+msgstr ""
+
+#: data/linksets/search_engines.xml.h:3
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
+#, fuzzy
+msgid "Search Engines"
+msgstr "Cerca"
+
+#: data/static_bookmarks.xml.h:1
+msgid "Allaire"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:2
+msgid "Binary Freedom"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:3
+msgid "Borland"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:4
+msgid "CNET Computers.com"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:5
+msgid "CNET Linux Center"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:6
+msgid "CollabNet"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:7
+msgid "Compaq"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:8
+#, fuzzy
+msgid "Conectiva"
+msgstr "Contenuto"
+
+#: data/static_bookmarks.xml.h:9
+#, fuzzy
+msgid "Covalent"
+msgstr "Contenuto"
+
+#: data/static_bookmarks.xml.h:10
+msgid "Debian.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:11
+msgid "Dell"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:12
+msgid "Eazel"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:13
+msgid "Freshmeat.net"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:14
+msgid "GNOME.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:15
+msgid "GNU.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:17
+#, fuzzy
+msgid "International"
+msgstr "Installazione fallita!"
+
+#: data/static_bookmarks.xml.h:18
+msgid "Linux Documentation Project"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:19
+msgid "Linux One"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:20
+msgid "Linux Online"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:21
+msgid "Linux Resources"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:22
+msgid "Linux Weekly News"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:23
+msgid "LinuxNewbie.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:24
+msgid "LinuxOrbit.com"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:25
+msgid "MandrakeSoft"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:26
+#, fuzzy
+msgid "Netraverse"
+msgstr "Mai"
+
+#: data/static_bookmarks.xml.h:27
+msgid "News and Media"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:28
+msgid "O'Reilly"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:29
+msgid "OSDN"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:30
+msgid "Open Source Asia"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:31
+msgid "OpenOffice"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:32
+msgid "Penguin Computing"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:33
+msgid "Rackspace"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:34
+msgid "Red Hat"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:35
+msgid "Red Hat Network"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:36
+msgid "RedFlag Linux"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:37
+msgid "Software"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:38
+msgid "SourceForge"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:39
+msgid "Sun StarOffice"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:40
+msgid "Sun Wah Linux"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:41
+#, fuzzy
+msgid "Web Services"
+msgstr "Servizi di Eazel"
+
+#: data/static_bookmarks.xml.h:42
+msgid "ZDNet Linux Hardware Database"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:43
+msgid "ZDNet Linux Resource Center"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1489
+#: data/static_bookmarks.xml.h:44
+msgid "Zero-Knowledge"
+msgstr ""
+
+#: icons/ardmore/ardmore.xml.h:1
+msgid "Tahoe"
+msgstr ""
+
+#: icons/ardmore/ardmore.xml.h:2
+msgid "This theme uses photo-realistic folders."
+msgstr ""
+
+#: icons/arlo/arlo.xml.h:1
+msgid "A Teal variation of the Crux theme."
+msgstr ""
+
+#: icons/arlo/arlo.xml.h:2
+msgid "Crux-Teal"
+msgstr ""
+
+#: icons/crux_eggplant/crux_eggplant.xml.h:1
+msgid "An Eggplant variation of the Crux theme."
+msgstr ""
+
+#: icons/crux_eggplant/crux_eggplant.xml.h:2
+msgid "Crux-Eggplant"
+msgstr ""
+
+#: icons/default.xml.h:1
+msgid "Default"
+msgstr ""
+
+#: icons/default.xml.h:2
+msgid "This is the default theme for Nautilus."
+msgstr ""
+
+#: icons/gnome/gnome.xml.h:2
+msgid "This theme uses the classic GNOME icons."
+msgstr ""
+
+#: icons/villanova/villanova.xml.h:1
+#, fuzzy
+msgid "Sierra"
+msgstr "Dimensione"
+
+#: icons/villanova/villanova.xml.h:2
+msgid "Uses manila folders and gray-green backgrounds."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-drag.c:489
+msgid "_Move here"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-drag.c:490
+msgid "_Copy here"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-drag.c:491
+msgid "_Link here"
+msgstr ""
+
+#. Note to localizers: this font is used for text items in Druid pages
+#: libnautilus-extensions/nautilus-druid-page-eazel.c:381
+msgid "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-*"
+msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
+
+#. Note to localizers: this font is used for page titles in Druid pages
+#: libnautilus-extensions/nautilus-druid-page-eazel.c:560
+msgid "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
+msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
+
+#. Today, use special word.
+#. * Note to localizers: You can look at man strftime
+#. * for details on the format, but you should only use
+#. * the specifiers from the C standard, not extensions.
+#. * These include "%" followed by one of
+#. * "aAbBcdHIjmMpSUwWxXyYZ". There are two extensions
+#. * in the Nautilus version of strftime that can be
+#. * used (and match GNU extensions). Putting a "-"
+#. * between the "%" and any numeric directive will turn
+#. * off zero padding, and putting a "_" there will use
+#. * space padding instead of zero padding.
+#.
+#: libnautilus-extensions/nautilus-file.c:2277
+msgid "today at %-I:%M %p"
+msgstr ""
+
+#. Yesterday, use special word.
+#. * Note to localizers: Same issues as "today" string.
+#.
+#: libnautilus-extensions/nautilus-file.c:2282
+msgid "yesterday at %-I:%M %p"
+msgstr ""
+
+#. Current week, include day of week.
+#. * Note to localizers: Same issues as "today" string.
+#.
+#: libnautilus-extensions/nautilus-file.c:2287
+msgid "%A %-m/%-d/%y at %-I:%M %p"
+msgstr ""
+
+#. Other dates.
+#. * Note to localizers: Same issues as "today" string.
+#.
+#: libnautilus-extensions/nautilus-file.c:2292
+msgid "%-m/%-d/%y at %-I:%M %p"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3423
+msgid "0 items"
+msgstr "0 oggetti"
+
+#: libnautilus-extensions/nautilus-file.c:3423
+msgid "0 folders"
+msgstr "0 cartelle"
+
+#: libnautilus-extensions/nautilus-file.c:3424
+msgid "0 files"
+msgstr "0 file"
+
+#: libnautilus-extensions/nautilus-file.c:3428
+msgid "1 item"
+msgstr "1 oggetto"
+
+#: libnautilus-extensions/nautilus-file.c:3428
+msgid "1 folder"
+msgstr "1 cartella"
+
+#: libnautilus-extensions/nautilus-file.c:3429
+msgid "1 file"
+msgstr "1 file"
+
+#: libnautilus-extensions/nautilus-file.c:3432
+#, c-format
+msgid "%u items"
+msgstr "%u oggetti"
+
+#: libnautilus-extensions/nautilus-file.c:3432
+#, c-format
+msgid "%u folders"
+msgstr "%u cartelle"
+
+#: libnautilus-extensions/nautilus-file.c:3433
+#, c-format
+msgid "%u files"
+msgstr "%u file"
+
+#. This means no contents at all were readable
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
+msgid "? items"
+msgstr "? oggetti"
+
+#. This means no contents at all were readable
+#: libnautilus-extensions/nautilus-file.c:3746
+#, fuzzy
+msgid "? bytes"
+msgstr "? oggetti"
+
+#: libnautilus-extensions/nautilus-file.c:3759
+msgid "unknown type"
+msgstr "tipo sconosciuto"
+
+#: libnautilus-extensions/nautilus-file.c:3761
+msgid "unknown MIME type"
+msgstr "tipo MIME sconosciuto"
+
+#. Fallback, use for both unknown attributes and attributes
+#. * for which we have no more appropriate default.
+#.
+#: libnautilus-extensions/nautilus-file.c:3766
+msgid "unknown"
+msgstr "sconosciuto"
+
+#: libnautilus-extensions/nautilus-file.c:3802
+msgid "program"
+msgstr "programma"
+
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
-"Unable to connect to Eazel's server. The server might be unavailable right "
-"now, or your computer might be configured incorrectly.You could try again "
-"later."
+"Can't find description even for \"x-directory/normal\". This probably means "
+"that your gnome-vfs.keys file is in the wrong place or isn't being found for "
+"some other reason."
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1507
+#: libnautilus-extensions/nautilus-file.c:3818
+#, c-format
 msgid ""
-"Found problem with data on Eazel servers. Please contact support@eazel.com."
+"No description found for mime type \"%s\" (file is \"%s\"), tell "
+"aaron@eazel.com"
 msgstr ""
 
-#: components/services/time/command-line/main.c:43
-msgid "display service name and such"
+#: libnautilus-extensions/nautilus-file.c:3832
+msgid "link"
 msgstr ""
 
-#: components/services/time/command-line/main.c:44
-msgid "maximum allowed difference in seconds"
+#. Note to localizers: convert file type string for file
+#. * (e.g. "folder", "plain text") to file type for symbolic link
+#. * to that kind of file (e.g. "link to folder").
+#.
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
+#, c-format
+msgid "link to %s"
 msgstr ""
 
-#: components/services/time/command-line/main.c:45
-msgid "update the system clock"
-msgstr "aggiorna orologio di sistema"
+#: libnautilus-extensions/nautilus-file.c:3852
+msgid "link (broken)"
+msgstr ""
 
-#: components/services/time/command-line/main.c:46
-msgid "specify time server"
-msgstr "specifica il server per l'orario"
+#. "From" dialog label, source path gets placed next to it in the dialog
+#: libnautilus-extensions/nautilus-file-operations.c:425
+msgid "From:"
+msgstr ""
 
-#: components/services/time/service/trilobite-eazel-time-service.c:113
-msgid "Unable to get server time"
+#. "To" dialog label, source path gets placed next to it in the dialog
+#: libnautilus-extensions/nautilus-file-operations.c:440
+msgid "To:"
 msgstr ""
 
-#: components/services/time/service/trilobite-eazel-time-service.c:115
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
-msgid "Time off by %d, max allowed diff is %d"
+msgid ""
+"Error while moving.\n"
+"\n"
+"\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 
-#: components/services/time/service/trilobite-eazel-time-service.c:292
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
-msgid "Could not read time-service config from %s"
-msgstr "Impossibile prelevare la URL per %s"
+msgid ""
+"Error while deleting.\n"
+"\n"
+"\"%s\" cannot be deleted because you do not have permissions to modify its "
+"parent folder."
+msgstr ""
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:449
-msgid "Could not initialize Bonobo"
+#: libnautilus-extensions/nautilus-file-operations.c:639
+#, c-format
+msgid ""
+"Error while deleting.\n"
+"\n"
+"\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:464
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
-msgid "Can't write logfile %s -- using default log handler"
+msgid ""
+"Error while moving.\n"
+"\n"
+"\"%s\" cannot be moved because you do not have permissions to change it or "
+"its parent folder."
 msgstr ""
 
-#: components/services/vault/command-line/main.c:37
-msgid "Enable debugging"
+#: libnautilus-extensions/nautilus-file-operations.c:677
+#, c-format
+msgid ""
+"Error while moving.\n"
+"\n"
+"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"change it or its parent folder."
 msgstr ""
 
-#: components/services/vault/command-line/main.c:38
-msgid "Vault location"
+#: libnautilus-extensions/nautilus-file-operations.c:701
+#, c-format
+msgid ""
+"Error while copying.\n"
+"\n"
+"\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 
-#: components/services/vault/command-line/main.c:46
-msgid "Valid operations:"
+#: libnautilus-extensions/nautilus-file-operations.c:723
+#, c-format
+msgid ""
+"Error while copying to \"%s\".\n"
+"\n"
+"There is not enough space on the destination."
 msgstr ""
 
-#: components/services/vault/command-line/main.c:86
-msgid "Error: No operation supplied\n"
+#: libnautilus-extensions/nautilus-file-operations.c:728
+#, c-format
+msgid ""
+"Error while moving to \"%s\".\n"
+"\n"
+"There is not enough space on the destination."
 msgstr ""
 
-#: components/services/vault/command-line/main.c:94
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
-msgid "Error: Invalid operation supplied (%s)\n"
+msgid ""
+"Error while creating link in \"%s\".\n"
+"\n"
+"There is not enough space on the destination."
 msgstr ""
 
-#: components/services/vault/command-line/main.c:119
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
-"Error: Invalid syntax\n"
-"Syntax: %s\n"
+"Error while copying to \"%s\".\n"
+"\n"
+"You do not have permissions to write to this folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-druid-page-eazel.c:343
-msgid "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
-msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
+#: libnautilus-extensions/nautilus-file-operations.c:748
+#, c-format
+msgid ""
+"Error while copying to \"%s\".\n"
+"\n"
+"The destination disk is read-only."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-druid-page-eazel.c:352
-msgid "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-*"
-msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
+#: libnautilus-extensions/nautilus-file-operations.c:755
+#, c-format
+msgid ""
+"Error while moving items to \"%s\".\n"
+"\n"
+"You do not have permissions to write to this folder."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:205
-msgid "From:"
+#: libnautilus-extensions/nautilus-file-operations.c:759
+#, c-format
+msgid ""
+"Error while moving items to \"%s\".\n"
+"\n"
+"The destination disk is read-only."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:219
-msgid "To:"
+#: libnautilus-extensions/nautilus-file-operations.c:766
+#, c-format
+msgid ""
+"Error while creating links in \"%s\".\n"
+"\n"
+"You do not have permissions to write to this folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:770
+#, c-format
+msgid ""
+"Error while creating links in \"%s\".\n"
+"\n"
+"The destination disk is read-only."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:388
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
-"Error while %s%s.\n"
-"The destination is read-only."
+"Error \"%s\" while copying \"%s\".\n"
+"\n"
+"Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:397
-#: libnautilus-extensions/nautilus-file-operations.c:416
-#: libnautilus-extensions/nautilus-file-operations.c:433
-msgid "Error while Copying"
+#: libnautilus-extensions/nautilus-file-operations.c:803
+#, c-format
+msgid ""
+"Error \"%s\" while moving \"%s\".\n"
+"\n"
+"Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:407
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
-"Error while %s%s.\n"
-"There is no space on the destination."
+"Error \"%s\" while creating a link to \"%s\".\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:813
+#, c-format
+msgid ""
+"Error \"%s\" while deleting \"%s\".\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:828
+#, c-format
+msgid ""
+"Error \"%s\" while copying.\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:832
+#, c-format
+msgid ""
+"Error \"%s\" while moving.\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:836
+#, c-format
+msgid ""
+"Error \"%s\" while linking.\n"
+"\n"
+"Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:423
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
-"Error \"%s\" while %s%s.\n"
+"Error \"%s\" while deleting.\n"
+"\n"
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:434
-#: libnautilus-extensions/nautilus-file-operations.c:485
-#: libnautilus-extensions/nautilus-file-operations.c:499
+#: libnautilus-extensions/nautilus-file-operations.c:958
+msgid "Error while copying."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:961
+msgid "Error while moving."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:964
+msgid "Error while linking."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:969
+msgid "Error while deleting."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:434
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:473
+#: libnautilus-extensions/nautilus-file-operations.c:1088
+#, c-format
+msgid ""
+"\"%s\" could not be moved to the new location, because its name is already "
+"used for a special item that cannot be removed or replaced.\n"
+"\n"
+"If you still want to move \"%s\", rename it and try again."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
-"File %s already exists.\n"
+"\"%s\" could not be copied to the new location, because its name is already "
+"used for a special item that cannot be removed or replaced.\n"
+"\n"
+"If you still want to copy \"%s\", rename it and try again."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1102
+#, fuzzy
+msgid "Unable to replace file."
+msgstr "Vai al file selezionato"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1112
+#, c-format
+msgid ""
+"File \"%s\" already exists.\n"
+"\n"
 "Would you like to replace it?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:484
-#: libnautilus-extensions/nautilus-file-operations.c:498
-msgid "Conflict while Copying"
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
+msgid "Conflict while copying"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:485
-#: libnautilus-extensions/nautilus-file-operations.c:499
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:499
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr ""
 
-#. Note to localizers: convert file type string for file
-#. * (e.g. "folder", "plain text") to file type for symbolic link
-#. * to that kind of file (e.g. "link to folder").
-#.
-#: libnautilus-extensions/nautilus-file-operations.c:547
-#: libnautilus-extensions/nautilus-file.c:3312
-#, c-format
-msgid "link to %s"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-file-operations.c:550
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr ""
@@ -1605,1224 +4815,1486 @@ msgstr ""
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:566
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:569
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:572
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:575
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr ""
 
+#. Localizers:
+#. * Feel free to leave out the st, nd, rd and th suffix or
+#. * make some or all of them match.
+#.
+#. localizers: tag used to detect the first copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
+msgid " (copy)"
+msgstr ""
+
+#. localizers: tag used to detect the second copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
+msgid " (another copy)"
+msgstr ""
+
+#. localizers: tag used to detect the x1st copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1243
+msgid "st copy)"
+msgstr ""
+
+#. localizers: tag used to detect the x2nd copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1245
+msgid "nd copy)"
+msgstr ""
+
+#. localizers: tag used to detect the x3rd copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1247
+msgid "rd copy)"
+msgstr ""
+
+#. localizers: tag used to detect the xxth copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1249
+msgid "th copy)"
+msgstr ""
+
+#. localizers: appended to first file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1259
+#, fuzzy, c-format
+msgid "%s (copy)%s"
+msgstr "%s di %s"
+
+#. localizers: appended to second file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1261
+#, c-format
+msgid "%s (another copy)%s"
+msgstr ""
+
+#. localizers: appended to x1st file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1263
+#, c-format
+msgid "%s (%dst copy)%s"
+msgstr ""
+
+#. localizers: appended to x2nd file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1265
+#, c-format
+msgid "%s (%dnd copy)%s"
+msgstr ""
+
+#. localizers: appended to x3rd file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1267
+#, c-format
+msgid "%s (%drd copy)%s"
+msgstr ""
+
+#. localizers: appended to xxth file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1269
+#, c-format
+msgid "%s (%dth copy)%s"
+msgstr ""
+
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:682
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr ""
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:690
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:849
-#: libnautilus-extensions/nautilus-file-operations.c:1340
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1175
-msgid "Moving files"
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1822
+msgid "Moving files to the Trash"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1176
-msgid "moved"
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1824
+msgid "Files thrown out:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1177
-#: libnautilus-extensions/nautilus-file-operations.c:1467
+#. localizers: label prepended to the name of the current file moved
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1178
+#: libnautilus-extensions/nautilus-file-operations.c:1827
+msgid "Preparing to Move to Trash..."
+msgstr ""
+
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1837
+msgid "Moving files"
+msgstr ""
+
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1839
+msgid "Files moved:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1179
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1189
-msgid "linked"
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1857
+msgid "Files linked:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1190
+#. localizers: label prepended to the name of the current file linked
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1191
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1192
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1198
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1199
-msgid "copied"
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1870
+msgid "Files copied:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1200
+#. localizers: label prepended to the name of the current file copied
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1201
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1220
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1221
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1237
-#: libnautilus-extensions/nautilus-file-operations.c:1425
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1920
+msgid "You cannot move this trash folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1240
-#: libnautilus-extensions/nautilus-file-operations.c:1426
+#: libnautilus-extensions/nautilus-file-operations.c:1923
+msgid "You cannot copy this trash folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Impossibile copiare il Cestino"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1259
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1260
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1261
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1363
-msgid "untitled folder"
+#: libnautilus-extensions/nautilus-file-operations.c:1953
+#, fuzzy
+msgid "Can't Copy Into Self"
+msgstr "Impossibile copiare il Cestino"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1965
+msgid "You cannot copy a file over itself."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1433
-#, c-format
-msgid "You cannot throw \"%s\" into the Trash."
+#: libnautilus-extensions/nautilus-file-operations.c:1966
+#, fuzzy
+msgid "Can't Copy Over Self"
+msgstr "Impossibile copiare il Cestino"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2017
+msgid ""
+"Error creating new folder.\n"
+"\n"
+"You do not have permissions to write to the destination."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1437
-msgid "Error Moving to Trash"
+#: libnautilus-extensions/nautilus-file-operations.c:2020
+msgid ""
+"Error creating new folder.\n"
+"\n"
+"There is no space on the destination."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1465
-msgid "Moving files to the Trash"
+#: libnautilus-extensions/nautilus-file-operations.c:2023
+#, c-format
+msgid "Error \"%s\" creating new folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1466
-msgid "thrown out"
+#: libnautilus-extensions/nautilus-file-operations.c:2027
+msgid "Error creating new folder"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1468
-msgid "Preparing to Move to Trash..."
+#. localizers: the initial name of a new folder
+#: libnautilus-extensions/nautilus-file-operations.c:2114
+msgid "untitled folder"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1509
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1510
-#: libnautilus-extensions/nautilus-file-operations.c:1557
-msgid "deleted"
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
+msgid "Files deleted:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1511
-#: libnautilus-extensions/nautilus-file-operations.c:1558
+#. localizers: label prepended to the name of the current file deleted
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1512
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1556
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1559
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1592
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 msgid ""
-"Are you sure you want to permanently delete all of the items in the trash?"
+"Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1594
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1595
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr ""
 
-#. test the next duplicate name generator
-#: libnautilus-extensions/nautilus-file-operations.c:1649
-msgid " (copy)"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-file-operations.c:1649
-msgid " (another copy)"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-file-operations.c:1650
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1650
-#: libnautilus-extensions/nautilus-file-operations.c:1660
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1651
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1651
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1652
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1652
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1653
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1653
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1654
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1654
-#: libnautilus-extensions/nautilus-file-operations.c:1661
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1655
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1655
-#: libnautilus-extensions/nautilus-file-operations.c:1675
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1656
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1656
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1657
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1657
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1658
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1658
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1659
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1659
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1660
-#: libnautilus-extensions/nautilus-file-operations.c:1662
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1661
-#: libnautilus-extensions/nautilus-file-operations.c:1663
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1662
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1663
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1664
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1664
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1665
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+msgid "foo (13th copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+msgid "foo (14th copy)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+msgid "foo (13th copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+msgid "foo (14th copy).txt"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1665
-#: libnautilus-extensions/nautilus-file-operations.c:1667
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1666
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1666
-#: libnautilus-extensions/nautilus-file-operations.c:1668
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1667
-#: libnautilus-extensions/nautilus-file-operations.c:1669
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1668
-#: libnautilus-extensions/nautilus-file-operations.c:1670
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1669
-#: libnautilus-extensions/nautilus-file-operations.c:1671
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1670
-#: libnautilus-extensions/nautilus-file-operations.c:1672
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1671
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1672
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1673
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1673
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1674
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1674
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1675
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr ""
 
-#. Today, use special word.
-#. * Note to localizers: You can look at man strftime
-#. * for details on the format, but you should only use
-#. * the specifiers from the C standard, not extensions.
-#. * These include "%" followed by one of
-#. * "aAbBcdHIjmMpSUwWxXyYZ". There are two extensions
-#. * in the Nautilus version of strftime that can be
-#. * used (and match GNU extensions). Putting a "-"
-#. * between the "%" and any numeric directive will turn
-#. * off zero padding, and putting a "_" there will use
-#. * space padding instead of zero padding.
-#.
-#: libnautilus-extensions/nautilus-file.c:1851
-msgid "today %-I:%M %p"
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+msgid "foo (10th copy)"
 msgstr ""
 
-#. Yesterday, use special word.
-#. * Note to localizers: Same issues as "today" string.
-#.
-#: libnautilus-extensions/nautilus-file.c:1856
-msgid "yesterday %-I:%M %p"
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+msgid "foo (11st copy)"
 msgstr ""
 
-#. Current week, include day of week.
-#. * Note to localizers: Same issues as "today" string.
-#.
-#: libnautilus-extensions/nautilus-file.c:1861
-msgid "%A %-m/%-d/%y %-I:%M %p"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+msgid "foo (10th copy).txt"
 msgstr ""
 
-#. Other dates.
-#. * Note to localizers: Same issues as "today" string.
-#.
-#: libnautilus-extensions/nautilus-file.c:1866
-msgid "%-m/%-d/%y %-I:%M %p"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+msgid "foo (11st copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:2890
-msgid "0 items"
-msgstr "0 oggetti"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+msgid "foo (11th copy)"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:2890
-msgid "0 folders"
-msgstr "0 cartelle"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+msgid "foo (12nd copy)"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:2891
-msgid "0 files"
-msgstr "0 file"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+msgid "foo (11th copy).txt"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:2895
-msgid "1 item"
-msgstr "1 oggetto"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+msgid "foo (12nd copy).txt"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:2895
-msgid "1 folder"
-msgstr "1 cartella"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+msgid "foo (12th copy)"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:2896
-msgid "1 file"
-msgstr "1 file"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+msgid "foo (13rd copy)"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:2899
-#, c-format
-msgid "%u items"
-msgstr "%u oggetti"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+msgid "foo (12th copy).txt"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:2899
-#, c-format
-msgid "%u folders"
-msgstr "%u cartelle"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+msgid "foo (13rd copy).txt"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:2900
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
 #, c-format
-msgid "%u files"
-msgstr "%u file"
+msgid "%ld of %ld"
+msgstr ""
 
-#. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3200
-#: libnautilus-extensions/nautilus-file.c:3214
-msgid "? items"
-msgstr "? oggetti"
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
+#, fuzzy
+msgid "GConf Error"
+msgstr ""
+"Errore GConf:\n"
+"  %s"
 
-#: libnautilus-extensions/nautilus-file.c:3218
-msgid "unknown type"
-msgstr "tipo sconosciuto"
+#. Constants
+#: libnautilus-extensions/nautilus-global-preferences.c:50
+msgid "Nautilus Preferences"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3220
-msgid "unknown MIME type"
-msgstr "tipo MIME sconosciuto"
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "sempre"
 
-#. Fallback, use for both unknown attributes and attributes
-#. * for which we have no more appropriate default.
-#.
-#: libnautilus-extensions/nautilus-file.c:3225
-msgid "unknown"
-msgstr "sconosciuto"
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "Sempre"
 
-#: libnautilus-extensions/nautilus-file.c:3271
-msgid "folder"
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3274
-msgid "program"
-msgstr "programma"
-
-#: libnautilus-extensions/nautilus-file.c:3306
-msgid "link"
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3326
-msgid "link (broken)"
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "mai"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "Mai"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-font-factory.c:321
-msgid "fixed"
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-font-picker.c:131
-msgid "Font"
-msgstr "Carattere"
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "Caratteri"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:118
-msgid "Folder Views"
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+msgid "Font for Icon view:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:119
-msgid "Folder Views Settings"
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:121
-msgid "Window Behavior"
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+msgid "Font for List view:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:128
-msgid "Click Behavior"
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:135
-msgid "Trash Behavior"
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:142
-msgid "Display"
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:163
-msgid "Sidebar Panels"
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Sidebar Panels Description"
+#: libnautilus-extensions/nautilus-global-preferences.c:651
+msgid "Open each file or folder in a separate window"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-msgid "Choose which panels should appear in the sidebar"
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+msgid "Display toolbar in new windows"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:204
-msgid "Appearance"
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:205
-msgid "Appearance Settings"
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:207
-msgid "Smoother Graphics"
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:214
-msgid "Fonts"
-msgstr "Caratteri"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:220
-msgid "Views"
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:238
-msgid "Desktop"
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+msgid "Ask before emptying the Trash or deleting files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:249
-msgid "Speed Tradeoffs"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:250
-msgid "Speed Tradeoffs Settings"
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:252
-msgid "Show Text in Icons"
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:259
-msgid "Show Thumbnails for Image Files"
+#: libnautilus-extensions/nautilus-global-preferences.c:713
+msgid "single"
+msgstr "singolo"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:714
+msgid "Activate items with a single click"
 msgstr ""
 
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:267
-msgid "Make Folder Appearance Details Public"
+#: libnautilus-extensions/nautilus-global-preferences.c:717
+msgid "double"
+msgstr "doppio"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:718
+msgid "Activate items with a double click"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:279
-msgid "Search"
-msgstr "Cerca"
+#: libnautilus-extensions/nautilus-global-preferences.c:725
+msgid "launch"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:280
-msgid "Search Settings"
+#: libnautilus-extensions/nautilus-global-preferences.c:726
+msgid "Execute files when they are clicked"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:282
-msgid "Search Complexity Options"
+#: libnautilus-extensions/nautilus-global-preferences.c:729
+msgid "display"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:288
-msgid "Search Tradeoffs"
+#: libnautilus-extensions/nautilus-global-preferences.c:730
+msgid "Display files when they are clicked"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:296
-msgid "Search Locations"
+#: libnautilus-extensions/nautilus-global-preferences.c:733
+msgid "ask"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:306
-msgid "Navigation"
+#: libnautilus-extensions/nautilus-global-preferences.c:734
+msgid "Ask each time"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:307
-msgid "Navigation Settings"
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:309
-msgid "Home Location"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:316
-msgid "Proxy Settings"
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:335
-msgid "Built-in Bookmarks"
+#: libnautilus-extensions/nautilus-global-preferences.c:759
+msgid "Show hidden files (file names start with \".\")"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:665
-msgid "always"
-msgstr "sempre"
+#: libnautilus-extensions/nautilus-global-preferences.c:766
+msgid "Show backup files (file names end with \"~\")"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:666
-msgid "Always"
-msgstr "Sempre"
+#: libnautilus-extensions/nautilus-global-preferences.c:773
+msgid "Show special flags in Properties window"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:670
-msgid "local only"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+msgid "Sorting Order"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:671
-msgid "Local Files Only"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:675
-msgid "never"
-msgstr "mai"
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
+msgid "Location:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:676
-msgid "Never"
-msgstr "Mai"
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+#, fuzzy
+msgid "HTTP Proxy Settings"
+msgstr "Configurazione Proxy HTTP"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:771
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:777
-msgid "HTTP Proxy"
+#. allocate the proxy label, followed by the entry
+#: libnautilus-extensions/nautilus-global-preferences.c:812
+#: src/nautilus-first-time-druid.c:683
+msgid "Port:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:783
-msgid "HTTP Proxy Port"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:837
-msgid "current theme"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:849
-msgid "Open each item in a new window"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:856
-msgid "Ask before deleting items from the trash"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:863
-msgid "Click policy"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:869
-msgid "single"
-msgstr "singolo"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:870
-msgid "Activate items with a single click"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:874
-msgid "double"
-msgstr "doppio"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:875
-msgid "Activate items with a double click"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:880
-msgid "Display text in icons"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:886
-msgid "Show thumbnails for image files"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:892
-msgid "Read and write metadata in each folder"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:902
-msgid "Use smoother (but slower) graphics"
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:908
-msgid "Font family used to display file names"
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+msgid "Navigation"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:915
-msgid "Display tool bar in new windows"
+#: libnautilus-extensions/nautilus-global-preferences.c:962
+msgid "Speed Tradeoffs"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:921
-msgid "Display location bar in new windows"
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:927
-msgid "Display status bar in new windows"
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+msgid "Search for files by file name only"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:933
-msgid "Display sidebar in new windows"
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:939
-msgid "Use Nautilus to draw the desktop"
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+msgid "Search for files by file name and file properties"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:946
-msgid "Always do slow, complete search"
+#: libnautilus-extensions/nautilus-global-preferences.c:997
+msgid "Search Complexity Options"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:953
+#: libnautilus-extensions/nautilus-global-preferences.c:999
 msgid "search type to do by default"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:959
-msgid "search by text"
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
+#, fuzzy
+msgid "Fast Search"
+msgstr "Cerca"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:960
-msgid "Search for files by text only"
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+msgid "Search Engine Location"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:964
-msgid "search by text and properties"
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Cerca"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:965
-msgid "Search for files by text and by their properties"
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, c-format
+msgid "Display %s tab in sidebar"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:970
-msgid "Search Web Location"
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:977
-msgid "Show hidden files (starting with \".\")"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:983
-msgid "Show backup files (ending with \"~\")"
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"currently can't be performed because the program crond, which does nightly "
+"tasks on your computer, is turned off. To make sure fast searches can be "
+"done, turn crond on."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:989
-msgid "Show special flags in Properties window"
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
+msgid "Files May Not Be Indexed"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:995
-msgid "Can add Content"
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
+msgid ""
+"If you are running Linux, you can log in as root and type these commands to "
+"start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1001
-msgid "Don't include the built-in bookmarks"
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"may not be performed because the program crond, which does nightly tasks on "
+"your computer, may be turned off. To make sure fast searches can be done, "
+"check to make sure that crond is turned on.\n"
+"\n"
+msgstr ""
+
+#. The list of characters that cause line breaks can be localized.
+#: libnautilus-extensions/nautilus-icon-canvas-item.c:70
+msgid " -_,;.?/&"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:731
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
 "manual layout."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:735
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
 "manual layout."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:741
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:744
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:749
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:750
-#: src/nautilus-window-menus.c:543
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr ""
 
-#. FIXME bugzilla.eazel.com 1102: Embedded text should use preferences to determine
-#. * the font it uses
-#.
-#: libnautilus-extensions/nautilus-icon-factory.c:2251
-msgid "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*"
-msgstr "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*"
-
-#: libnautilus-extensions/nautilus-icon-text-item.c:1498
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
+#: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1499
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1500
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1501
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1502
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-label.c:177
-msgid " -_,;.?/&"
+#: libnautilus-extensions/nautilus-preferences.c:92
+msgid "Beginner"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:201
-msgid "Prefs Box"
+#: libnautilus-extensions/nautilus-preferences.c:93
+msgid "Intermediate"
+msgstr "Intermedio"
+
+#: libnautilus-extensions/nautilus-preferences.c:94
+msgid "Advanced"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:188
-#: src/nautilus-window.c:787
-#, c-format
-msgid "View as %s"
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
+msgid "Prefs Box"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:218
+#: libnautilus-extensions/nautilus-program-chooser.c:226
 msgid "not in menu"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:221
+#: libnautilus-extensions/nautilus-program-chooser.c:229
 msgid "in menu for this file"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:224
-#: libnautilus-extensions/nautilus-program-chooser.c:227
+#: libnautilus-extensions/nautilus-program-chooser.c:232
+#: libnautilus-extensions/nautilus-program-chooser.c:235
 #, c-format
 msgid "in menu for \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:230
+#: libnautilus-extensions/nautilus-program-chooser.c:238
 msgid "default for this file"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:233
-#: libnautilus-extensions/nautilus-program-chooser.c:236
+#: libnautilus-extensions/nautilus-program-chooser.c:241
+#: libnautilus-extensions/nautilus-program-chooser.c:244
 #, c-format
 msgid "default for \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:265
+#: libnautilus-extensions/nautilus-program-chooser.c:289
 #, c-format
 msgid "Is not in the menu for \"%s\" items."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:268
+#: libnautilus-extensions/nautilus-program-chooser.c:292
 #, c-format
 msgid "Is in the menu for \"%s\"."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:271
+#: libnautilus-extensions/nautilus-program-chooser.c:295
 #, c-format
 msgid "Is in the menu for \"%s\" items."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:274
+#: libnautilus-extensions/nautilus-program-chooser.c:298
 #, c-format
 msgid "Is in the menu for all \"%s\" items."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:277
+#: libnautilus-extensions/nautilus-program-chooser.c:301
 #, c-format
 msgid "Is the default for \"%s\"."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:280
+#: libnautilus-extensions/nautilus-program-chooser.c:304
 #, c-format
 msgid "Is the default for \"%s\" items."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:283
+#: libnautilus-extensions/nautilus-program-chooser.c:307
 #, c-format
 msgid "Is the default for all \"%s\" items."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:967
+#: libnautilus-extensions/nautilus-program-chooser.c:993
 #, c-format
 msgid "Modify \"%s\""
 msgstr ""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-extensions/nautilus-program-chooser.c:991
+#: libnautilus-extensions/nautilus-program-chooser.c:1018
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr ""
 
 #. Radio button for setting default for file type.
-#: libnautilus-extensions/nautilus-program-chooser.c:998
+#: libnautilus-extensions/nautilus-program-chooser.c:1025
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr ""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1005
+#: libnautilus-extensions/nautilus-program-chooser.c:1032
 #, c-format
 msgid "Include in the menu just for \"%s\""
 msgstr ""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1011
+#: libnautilus-extensions/nautilus-program-chooser.c:1038
 #, c-format
 msgid "Use as default just for \"%s\""
 msgstr ""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1018
+#: libnautilus-extensions/nautilus-program-chooser.c:1045
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1182
-#: src/file-manager/fm-list-view.c:1885
-#: src/file-manager/fm-search-list-view.c:272
-#: src/nautilus-bookmarks-window.c:161 src/nautilus-search-bar-criterion.c:66
+#: libnautilus-extensions/nautilus-program-chooser.c:1209
+#: src/file-manager/fm-list-view.c:2182
+#: src/file-manager/fm-search-list-view.c:545
+#: src/nautilus-bookmarks-window.c:164
 msgid "Name"
 msgstr "Nome"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1185
+#: libnautilus-extensions/nautilus-program-chooser.c:1212
 msgid "Status"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1233
+#: libnautilus-extensions/nautilus-program-chooser.c:1260
 msgid "Open with Other"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1234
+#: libnautilus-extensions/nautilus-program-chooser.c:1261
 #, c-format
 msgid "Choose an application with which to open \"%s\"."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1238
+#: libnautilus-extensions/nautilus-program-chooser.c:1265
 msgid "View as Other"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1239
+#: libnautilus-extensions/nautilus-program-chooser.c:1266
 #, c-format
 msgid "Choose a view for \"%s\"."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1246
+#: libnautilus-extensions/nautilus-program-chooser.c:1273
 msgid "Choose"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1248
-#: src/nautilus-property-browser.c:343
+#: libnautilus-extensions/nautilus-program-chooser.c:1275
 msgid "Done"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1310
+#: libnautilus-extensions/nautilus-program-chooser.c:1338
 msgid "Modify..."
 msgstr ""
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-extensions/nautilus-program-chooser.c:1321
+#: libnautilus-extensions/nautilus-program-chooser.c:1349
 msgid "File Types and Programs"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1330
-msgid "Go There"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-program-chooser.c:1339
+#: libnautilus-extensions/nautilus-program-chooser.c:1370
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "GNOME Control Center."
 msgstr ""
 
-#. This application can't deal with this URI,
-#. * because it can only handle local
-#. * files. Tell user. Some day we could offer
-#. * to copy it locally for the user, if we knew
-#. * where to put it, and who would delete it
-#. * when done.
+#: libnautilus-extensions/nautilus-program-chooser.c:1485
+#, c-format
+msgid "No viewers are available for \"%s\"."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1486
+msgid "No Viewers Available"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1489
+#, c-format
+msgid "No applications are available for \"%s\"."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1490
+#, fuzzy
+msgid "No Applications Available"
+msgstr "Applicazioni"
+
+#. Note: This might be misleading in the components case, since the
+#. * user can't add components to the complete list even from the capplet.
+#. * (They can add applications though.)
 #.
-#: libnautilus-extensions/nautilus-program-choosing.c:253
+#: libnautilus-extensions/nautilus-program-chooser.c:1497
 #, c-format
 msgid ""
-"Sorry, %s can only open local files, and \"%s\" is remote. If you want to "
-"open it with %s, make a local copy first."
+"%s\n"
+"\n"
+"You can configure which programs are offered for which file types with the "
+"\"File Types and Programs\" part of the GNOME Control Center. Do you want to "
+"go there now?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-choosing.c:257
-msgid "Can't open remote file"
-msgstr "Impossibile aprire file remoto"
-
-#: libnautilus-extensions/nautilus-search-uri.c:207
+#: libnautilus-extensions/nautilus-program-choosing.c:492
 #, c-format
-msgid "that have \"%s\" in the name"
+msgid ""
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  Would you like to choose another application?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:210
+#: libnautilus-extensions/nautilus-program-choosing.c:497
+#: libnautilus-extensions/nautilus-program-choosing.c:518
+#, fuzzy
+msgid "Can't Open Location"
+msgstr "Impossibile aprire file remoto"
+
+#: libnautilus-extensions/nautilus-program-choosing.c:513
 #, c-format
-msgid "that start with \"%s\""
+msgid ""
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  No other applications are available to view this file.  If you "
+"copy this file onto your computer, you may be able to open it."
+msgstr ""
+
+#. Human readable description for a criterion in a search for
+#. files. Bracketed items are context, and are message
+#. strings elsewhere.  You don't have to translate the whole
+#. string, and only the translation for "containing '%s' will
+#. be used.  If you do translate the whole string, leave the
+#. translations of the rest of the text in brackets, so it
+#. will not be used.
+#. "%s" here is a pattern the file name
+#. matched, such as "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:212
+#, c-format
+msgid "[Items ]containing \"%s\" in their names"
+msgstr ""
+
+#. "%s" here is a pattern the file name started with, such as
+#. "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:217
+#, fuzzy, c-format
+msgid "[Items ]starting with \"%s\""
 msgstr "che inizia con \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:213
-#, c-format
-msgid "that end with %s"
+#. "%s" here is a pattern the file name ended with, such as
+#. "mime"
+#: libnautilus-extensions/nautilus-search-uri.c:222
+#, fuzzy, c-format
+msgid "[Items ]ending with %s"
 msgstr "che termina con %s"
 
-#: libnautilus-extensions/nautilus-search-uri.c:216
+#. "%s" here is a pattern the file name did not match, such
+#. as "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:227
 #, c-format
-msgid "that don't contain \"%s\""
+msgid "[Items ]not containing \"%s\" in their names"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:219
+#. "%s" is a regular expression string, for example "[abc]"
+#: libnautilus-extensions/nautilus-search-uri.c:231
 #, c-format
-msgid "that match the regular expression \"%s\""
+msgid "[Items ]matching the regular expression \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:222
+#. "%s" is a file glob, for example "*.txt"
+#: libnautilus-extensions/nautilus-search-uri.c:235
 #, c-format
-msgid "that match the file pattern \"%s\""
+msgid "[Items ]matching the file pattern \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:235
-msgid "regular files"
+#: libnautilus-extensions/nautilus-search-uri.c:248
+msgid "[Items that are ]regular files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:238
-msgid "text files"
-msgstr "file di testo"
+#: libnautilus-extensions/nautilus-search-uri.c:251
+msgid "[Items that are ]text files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:241
-msgid "applications"
-msgstr "applicazioni"
+#: libnautilus-extensions/nautilus-search-uri.c:254
+msgid "[Items that are ]applications"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:244
-msgid "directories"
-msgstr "directory"
+#: libnautilus-extensions/nautilus-search-uri.c:257
+msgid "[Items that are ]folders"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:247
-#: src/nautilus-search-bar-criterion.c:106
-msgid "music"
-msgstr "musica"
+#: libnautilus-extensions/nautilus-search-uri.c:260
+msgid "[Items that are ]music"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:254
-#, c-format
-msgid "are not %s"
+#. "%s" here is a word describing a file type, for example
+#. "folder"
+#: libnautilus-extensions/nautilus-search-uri.c:268
+#, fuzzy, c-format
+msgid "[Items ]that are not %s"
 msgstr "non sono %s"
 
-#: libnautilus-extensions/nautilus-search-uri.c:258
-#, c-format
-msgid "are %s"
-msgstr "sono %s"
+#. "%s" here is a word describing a file type, for example
+#. "folder"
+#: libnautilus-extensions/nautilus-search-uri.c:273
+#, fuzzy, c-format
+msgid "[Items ]that are %s"
+msgstr "che sono grandi %s byte"
 
-#: libnautilus-extensions/nautilus-search-uri.c:269
-#, c-format
-msgid "are not owned by \"%s\""
+#. "%s" here is the name of user on a Linux machine, such as
+#. "root"
+#: libnautilus-extensions/nautilus-search-uri.c:287
+#, fuzzy, c-format
+msgid "[Items ]not owned by \"%s\""
 msgstr "non posseduto da %s"
 
-#: libnautilus-extensions/nautilus-search-uri.c:272
-#, c-format
-msgid "are owned by \"%s\""
+#. "%s" here is the name of user on a Linux machine, such as
+#. "root"
+#: libnautilus-extensions/nautilus-search-uri.c:292
+#, fuzzy, c-format
+msgid "[Items ]owned by \"%s\""
 msgstr "sono posseduti da \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:276
-#, c-format
-msgid "have owner UID \"%s\""
+#: libnautilus-extensions/nautilus-search-uri.c:295
+#, fuzzy, c-format
+msgid "[Items ]with owner UID \"%s\""
 msgstr "che hanno il proprietario con UID \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:279
+#: libnautilus-extensions/nautilus-search-uri.c:298
 #, c-format
-msgid "have owner UID other than \"%s\""
+msgid "[Items ]with owner UID other than \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:290
+#: libnautilus-extensions/nautilus-search-uri.c:309
+#, fuzzy, c-format
+msgid "[Items ]larger than %s bytes"
+msgstr "che sono grandi %s byte"
+
+#: libnautilus-extensions/nautilus-search-uri.c:312
 #, c-format
-msgid "that are larger than %s bytes"
+msgid "[Items ]smaller than %s bytes"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:293
-#, c-format
-msgid "that are smaller than %s bytes"
+#: libnautilus-extensions/nautilus-search-uri.c:315
+#, fuzzy, c-format
+msgid "[Items ]of %s bytes"
+msgstr "Oggetti %s%s"
+
+#: libnautilus-extensions/nautilus-search-uri.c:326
+msgid "[Items ]modified today"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:296
-#, c-format
-msgid "that are %s bytes"
-msgstr "che sono grandi %s byte"
+#: libnautilus-extensions/nautilus-search-uri.c:329
+msgid "[Items ]modified yesterday"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:307
+#: libnautilus-extensions/nautilus-search-uri.c:332
 #, c-format
-msgid "modified after %s"
+msgid "[Items ]modified on %s"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:310
+#: libnautilus-extensions/nautilus-search-uri.c:334
 #, c-format
-msgid "modified before %s"
+msgid "[Items ]not modified on %s"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:322
+#: libnautilus-extensions/nautilus-search-uri.c:337
 #, c-format
-msgid "marked with \"%s\""
-msgstr "marcato con \"%s\""
+msgid "[Items ]modified before %s"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:325
+#: libnautilus-extensions/nautilus-search-uri.c:340
 #, c-format
-msgid "not marked with \"%s\""
-msgstr "non marcato con \"%s\""
+msgid "[Items ]modified after %s"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:339
+#: libnautilus-extensions/nautilus-search-uri.c:343
 #, c-format
-msgid "with all the words %s"
+msgid "[Items ]modified within a week of %s"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:342
+#: libnautilus-extensions/nautilus-search-uri.c:346
+#, fuzzy, c-format
+msgid "[Items ]modified within a month of %s"
+msgstr "questo mese"
+
+#. "%s" here is the name of an Emblem
+#: libnautilus-extensions/nautilus-search-uri.c:359
+#, fuzzy, c-format
+msgid "[Items ]marked with \"%s\""
+msgstr "non marcato con \"%s\""
+
+#. "%s" here is the name of an Emblem
+#: libnautilus-extensions/nautilus-search-uri.c:363
+#, fuzzy, c-format
+msgid "[Items ]not marked with \"%s\""
+msgstr "non marcato con \"%s\""
+
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:379
 #, c-format
-msgid "containing one of the words %s"
+msgid "[Items ]with all the words \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:345
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:384
 #, c-format
-msgid "without all the words %s"
+msgid "[Items ]containing one of the words \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:348
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:389
 #, c-format
-msgid "without any of the words %s"
+msgid "[Items ]without all the words \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:365
-msgid "that"
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:394
+#, c-format
+msgid "[Items ]without any of the words \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:485
-msgid "are directories"
+#: libnautilus-extensions/nautilus-search-uri.c:556
+msgid "[Items larger than 400K] and [without all the words \"apple orange\"]"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:529
-msgid " and "
+#. Human readable description for a criterion in a search for
+#. files. Bracketed items are context, and are message
+#. strings elsewhere.  Translate only the words "and" here.
+#: libnautilus-extensions/nautilus-search-uri.c:561
+msgid ""
+"[Items larger than 400K], [owned by root and without all the words \"apple "
+"orange\"]"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:594
-#, c-format
-msgid "Items %s%s"
+#. The beginning of the description of a search that has just been
+#. performed.  The "%s" here is a description of a single criterion,
+#. which in english might be "that contain the word 'foo'"
+#: libnautilus-extensions/nautilus-search-uri.c:591
+#, fuzzy, c-format
+msgid "Items %s"
 msgstr "Oggetti %s%s"
 
-#: libnautilus-extensions/nautilus-search-uri.c:597
-#, c-format
-msgid "Items %s %s%s"
+#: libnautilus-extensions/nautilus-search-uri.c:701
+msgid "Items containing \"stuff\" in their names"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:706
-msgid "Items that have \"stuff\" in the name."
-msgstr ""
+#: libnautilus-extensions/nautilus-search-uri.c:703
+#, fuzzy
+msgid "Items that are regular files"
+msgstr "file regolare"
 
-#: libnautilus-extensions/nautilus-search-uri.c:708
-msgid "Items that have \"stuff\" in the name and are regular files."
+#: libnautilus-extensions/nautilus-search-uri.c:706
+msgid "Items containing \"stuff\" in their names and that are regular files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:711
+#: libnautilus-extensions/nautilus-search-uri.c:710
 msgid ""
-"Items that have \"stuff\" in the name, are regular files and that are "
-"smaller than 2000 bytes."
+"Items containing \"stuff\" in their names, that are regular files and "
+"smaller than 2000 bytes"
 msgstr ""
 
 #: libnautilus-extensions/nautilus-search-uri.c:714
-msgid "Items that have \"medusa\" in the name and are directories."
+msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:415
-msgid "Warning"
+#: libnautilus-extensions/nautilus-trash-directory.c:73
+msgid "Searching Disks"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:425
-#: libnautilus-extensions/nautilus-stock-dialogs.c:465
-msgid "Error"
+#: libnautilus-extensions/nautilus-trash-directory.c:74
+msgid "Nautilus is searching your disks for trash folders."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:467
-msgid "Details"
-msgstr "Dettagli"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:497
-msgid "Question"
-msgstr "Domanda"
-
-#: libnautilus-extensions/nautilus-trash-directory.c:286
-msgid "Trash"
+#: libnautilus-extensions/nautilus-trash-file.c:725
+msgid "on the desktop"
 msgstr ""
 
 #: libnautilus-extensions/nautilus-undo-signal-handlers.c:175
@@ -2845,164 +6317,326 @@ msgstr ""
 msgid "Redo the edit"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-user-level-manager.c:61
-msgid "Beginner"
+#: libnautilus-extensions/nautilus-view-identifier.c:61
+#, c-format
+msgid "View as %s"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-user-level-manager.c:62
-msgid "Intermediate"
-msgstr "Intermedio"
+#: libnautilus-extensions/nautilus-view-identifier.c:64
+#, c-format
+msgid "%s Viewer"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-user-level-manager.c:63
-msgid "Advanced"
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+#, fuzzy
+msgid "Unknown"
+msgstr "sconosciuto"
+
+#. Populate table with items we know localized names for.
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
+msgid "Floppy"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:504
-msgid "Unknown Volume"
-msgstr "Volume sconosciuto"
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
+msgid "CD-ROM"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
+msgid "Zip Drive"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
+msgid "Audio CD"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
+msgid "is write-protected, mounting read-only"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
+msgid "is not a valid block device"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
+msgid "No medium found"
+msgstr ""
+
+#. Handle floppy case
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
+msgid ""
+"Nautilus was unable to mount the floppy drive. There is probably no floppy "
+"in the drive."
+msgstr ""
+
+#. All others
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
+msgid ""
+"Nautilus was unable to mount the volume. There is probably no media in the "
+"device."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
+msgid "wrong fs type, bad option, bad superblock on"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1164
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
+msgid ""
+"Nautilus was unable to mount the floppy drive. The floppy is probably in a "
+"format that cannot be mounted."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
+msgid ""
+"Nautilus was unable to mount the selected volume. The volume is probably in "
+"a format that cannot be mounted."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
+msgid "Nautilus was unable to mount the selected floppy drive."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
+msgid "Nautilus was unable to mount the selected volume."
+msgstr ""
+
+#. FIXME: Should we parse this message and report something more meaningful?
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
+msgid "Nautilus was unable to unmount the selected volume."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1171
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
+msgid "Root"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1177
-msgid "Floppy"
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
+msgid "MSDOS Volume"
 msgstr ""
 
-#.
-#. *  This file is autogenerated from nautilus-clipboard-ui.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: libnautilus/nautilus-clipboard-ui.xml.h:9
-#: libnautilus/nautilus-clipboard-ui.xml.h:17 src/nautilus-shell-ui.xml.h:15
-#: src/nautilus-shell-ui.xml.h:107
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
+msgid "NFS Volume"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
+msgid "ReiserFS Volume"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
+#, fuzzy
+msgid "UFS Volume"
+msgstr "Volume sconosciuto"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
+msgid "Unknown Volume"
+msgstr "Volume sconosciuto"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:5
 msgid "C_lear Text"
 msgstr ""
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:10
-#: libnautilus/nautilus-clipboard-ui.xml.h:18 src/nautilus-shell-ui.xml.h:24
-#: src/nautilus-shell-ui.xml.h:116
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "Tagliare testo"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "Tagliare testo"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr ""
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:11
-#: libnautilus/nautilus-clipboard-ui.xml.h:19 src/nautilus-shell-ui.xml.h:27
-#: src/nautilus-shell-ui.xml.h:119
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "Tagliare testo"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+msgid "Cut _Text"
+msgstr "Tagliare testo"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr ""
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:12
-#: libnautilus/nautilus-clipboard-ui.xml.h:20 src/nautilus-shell-ui.xml.h:51
-#: src/nautilus-shell-ui.xml.h:143
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "Tagliare testo"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr ""
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:13
-#: libnautilus/nautilus-clipboard-ui.xml.h:21
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr ""
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:14
-#: libnautilus/nautilus-clipboard-ui.xml.h:22 src/nautilus-shell-ui.xml.h:78
-#: src/nautilus-shell-ui.xml.h:171
-msgid "_Copy Text"
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "Selezionare livello utente"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+#, fuzzy
+msgid "Select _All"
+msgstr "Selezionare livello utente"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+msgid "Select all the text in a text field"
 msgstr ""
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:15
-#: libnautilus/nautilus-clipboard-ui.xml.h:23
-msgid "_Cut Text"
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
+msgid "_Copy Text"
 msgstr ""
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:16
-#: libnautilus/nautilus-clipboard-ui.xml.h:24 src/nautilus-shell-ui.xml.h:90
-#: src/nautilus-shell-ui.xml.h:183
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr ""
 
-#: src/file-manager/fm-desktop-icon-view.c:431
-msgid "Empty Trash"
+#. The copyright character in here is correct for
+#. * Latin-1 encoding, but not for UTF-8, so we have
+#. * to change it when we upgrade to GTK 2.0.
+#.
+#: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
+#: src/nautilus-window-menus.c:610
+msgid "Nautilus"
 msgstr ""
 
-#: src/file-manager/fm-desktop-icon-view.c:460
-msgid "New Terminal"
-msgstr "Nuovo terminale"
-
-#: src/file-manager/fm-desktop-icon-view.c:469
-msgid "Disks"
-msgstr "Dischi"
+#: nautilus.desktop.in.h:2
+msgid "Nautilus File Manager and Graphic Shell"
+msgstr ""
 
-#: src/file-manager/fm-desktop-icon-view.c:528
-msgid "Reset Desktop Background"
+#. Note to translators: If it's hard to compose a good home
+#. * icon name from the user name, you can use a string without
+#. * an "%s" here, in which case the home icon name will not
+#. * include the user's name, which should be fine. To avoid a
+#. * warning, put "%.0s" somewhere in the string, which will
+#. * match the user name string passed by the C code, but not
+#. * put the user name in the final string.
+#.
+#: src/file-manager/fm-desktop-icon-view.c:886
+#, c-format
+msgid "%s's Home"
 msgstr ""
 
-#: src/file-manager/fm-desktop-icon-view.c:536
-msgid "Change Desktop Background"
+#: src/file-manager/fm-desktop-icon-view.c:1175
+msgid "Empty Trash..."
 msgstr ""
 
-#: src/file-manager/fm-desktop-icon-view.c:546
-msgid "Quit Nautilus Desktop"
+#: src/file-manager/fm-desktop-icon-view.c:1177
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+msgid "Empty Trash"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:417
+#: src/file-manager/fm-desktop-icon-view.c:1197
+#, fuzzy
+msgid "Unmount Volume"
+msgstr "Volume sconosciuto"
+
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:419
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1188
+#: src/file-manager/fm-directory-view.c:748
+#, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:752
+#, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:758
+msgid "Delete?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr ""
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+#, fuzzy
+msgid "scripts"
+msgstr "Descrizione"
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1190
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "1 cartella selezionata"
 
-#: src/file-manager/fm-directory-view.c:1193
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1199
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1201
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1203
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1214
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1218
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1225
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1228
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr ""
@@ -3014,534 +6648,606 @@ msgstr ""
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1257
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1368
+#. Note that the number of items actually displayed varies somewhat due
+#. * to the way files are collected in batches. So you can't assume that
+#. * no more than the constant limit are displayed.
+#.
+#: src/file-manager/fm-directory-view.c:1530
+#, c-format
 msgid ""
-"We're sorry, but the directory you're viewing has more files than we're able "
-"to display.  As a result, we are only able to show you the first 4000 files "
-"it contains. \n"
-"This is a temporary limitation in this Preview Release of Nautilus, and will "
-"not be present in the final shipping version.\n"
+"The folder \"%s\" contains more files than Nautilus can handle. Some files "
+"will not be displayed."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1374
-msgid "Too many Files"
+#: src/file-manager/fm-directory-view.c:1537
+msgid "Too Many Files"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2438
+#: src/file-manager/fm-directory-view.c:2752
 #, c-format
 msgid ""
-"\"%s\" cannot be moved to the trash. Do you want to delete it immediately?"
+"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2443
+#: src/file-manager/fm-directory-view.c:2757
 #, c-format
 msgid ""
-"The %d selected items cannot be moved to the trash. Do you want to delete "
+"The %d selected items cannot be moved to the Trash. Do you want to delete "
 "them immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2447
+#: src/file-manager/fm-directory-view.c:2761
 #, c-format
 msgid ""
-"%d of the selected items cannot be moved to the trash. Do you want to delete "
+"%d of the selected items cannot be moved to the Trash. Do you want to delete "
 "those %d items immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2455
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2456
-#: src/file-manager/fm-directory-view.c:2497
-msgid "Delete"
-msgstr ""
-
-#: src/file-manager/fm-directory-view.c:2486
+#: src/file-manager/fm-directory-view.c:2799
 #, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
+msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2490
+#: src/file-manager/fm-directory-view.c:2803
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"trash?"
+"Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2496
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2733
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
-msgid "_Open"
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
+#, c-format
+msgid "Use \"%s\" to open the selected item"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2736
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
-msgid "Open With"
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "Altre applicazioni..."
+
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "Altre applicazioni..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2739
-msgid "Other Application..."
+#: src/file-manager/fm-directory-view.c:3238
+msgid "A _Viewer..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2741
-msgid "Other Viewer..."
+#: src/file-manager/fm-directory-view.c:3451
+#, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2745
-msgid "Open in _New Window"
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2747
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
 #, c-format
-msgid "Open in %d _New Windows"
+msgid "Nautilus was unable to create the directory %s."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2759
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
-msgid "New Folder"
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2764
-msgid "Delete from _Trash..."
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2766
-msgid "Delete from _Trash"
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2769
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
-msgid "Move to _Trash"
+#: src/file-manager/fm-directory-view.c:3704
+#, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2773
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
-msgid "_Duplicate"
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2777
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2779
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:3954
+msgid "Open _in This Window"
 msgstr ""
 
-#. No ellipses here because this command does not require further
-#. * information to be completed.
-#.
-#: src/file-manager/fm-directory-view.c:2786
+#: src/file-manager/fm-directory-view.c:3957
 #: src/file-manager/nautilus-directory-view-ui.xml.h:27
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
-msgid "Show _Properties"
+msgid "Open _in New Window"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2790
-msgid "_Empty Trash..."
+#: src/file-manager/fm-directory-view.c:3959
+#, c-format
+msgid "Open _in %d New Windows"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2792
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
-msgid "_Empty Trash"
+#: src/file-manager/fm-directory-view.c:3977
+msgid "Delete from _Trash..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2796
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
-msgid "_Select All Files"
+#: src/file-manager/fm-directory-view.c:3977
+msgid "Delete from _Trash"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2800
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
-msgid "R_emove Custom Images"
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2802
-msgid "R_emove Custom Image"
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+msgid "Move to _Trash"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2806
-msgid "Reset _Background"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2966
-msgid "Zoom In"
+#: src/file-manager/fm-directory-view.c:4015
+msgid "De_lete..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2968
-msgid "Zoom Out"
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+msgid "De_lete"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2970
-msgid "Normal Size"
+#: src/file-manager/fm-directory-view.c:4038
+msgid "Make _Links"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2984
-msgid "_New Folder"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+msgid "Make _Link"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3078
-#: src/file-manager/fm-directory-view.c:3309
-#, c-format
-msgid "%s Viewer"
+#: src/file-manager/fm-directory-view.c:4056
+msgid "_Empty Trash..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3345
-msgid "Delete all selected items permanently"
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+msgid "_Empty Trash"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3352
-msgid "Move all selected items to the Trash"
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+msgid "R_emove Custom Images"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4069
+msgid "R_emove Custom Image"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3355
-msgid "*Control*t"
+#: src/file-manager/fm-directory-view.c:4083
+msgid "Cu_t File"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3657
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u file"
+
+#: src/file-manager/fm-directory-view.c:4094
+msgid "_Copy File"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "File di configurazione"
+
+#: src/file-manager/fm-directory-view.c:4252
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
-"link in the trash?"
+"link in the Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3660
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to put this link in the trash?"
+"want to put this link in the Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3666
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3667
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3729
+#: src/file-manager/fm-directory-view.c:4315
+#, c-format
+msgid ""
+"\"%s\" is an executable text file. Do you want to run it, or display its "
+"contents?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4321
+msgid "Run or Display?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4322
+msgid "Run"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4323
+msgid "Display"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3730
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "Impossibile eseguire links remotamente"
 
-#: src/file-manager/fm-error-reporting.c:50
+#: src/file-manager/fm-directory-view.c:4513
+#, fuzzy, c-format
+msgid "Opening \"%s\""
+msgstr "Installazione di \"%s\""
+
+#: src/file-manager/fm-directory-view.c:4519
+msgid "Cancel Open?"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:58
+#, c-format
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
+#, c-format
+msgid "Sorry, couldn't display all the contents of \"%s\"."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:72
+msgid "Error Displaying Folder"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:103
+#, c-format
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:108
+#, c-format
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:113
+#, c-format
+msgid "You do not have the permissions necessary to rename \"%s\"."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
-"The name \"%s\" is already used in this folder.\n"
-"Please use a different name."
+"The name \"%s\" is not valid because it contains the character \"/\". Please "
+"use a different name."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:122
+#, c-format
+msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:55
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
-msgid "You do not have the permissions necessary to rename \"%s.\""
+msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:64
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:69
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:85
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:93
+#: src/file-manager/fm-error-reporting.c:168
+#, c-format
+msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:97
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:115
+#: src/file-manager/fm-error-reporting.c:202
+#, c-format
+msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:119
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:137
+#: src/file-manager/fm-error-reporting.c:234
+#, c-format
+msgid ""
+"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:141
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:205
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
-msgid "Renaming %s to %s."
+msgid "Renaming \"%s\" to \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:210
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr ""
 
-#: src/file-manager/fm-icon-text-window.c:76
+#: src/file-manager/fm-icon-text-window.c:77
 msgid "size"
 msgstr ""
 
-#: src/file-manager/fm-icon-text-window.c:77
+#: src/file-manager/fm-icon-text-window.c:78
 msgid "type"
 msgstr ""
 
-#: src/file-manager/fm-icon-text-window.c:78
+#: src/file-manager/fm-icon-text-window.c:79
 msgid "date modified"
 msgstr ""
 
-#: src/file-manager/fm-icon-text-window.c:79
+#: src/file-manager/fm-icon-text-window.c:80
 msgid "date changed"
 msgstr ""
 
-#: src/file-manager/fm-icon-text-window.c:80
+#: src/file-manager/fm-icon-text-window.c:81
 msgid "date accessed"
 msgstr ""
 
-#: src/file-manager/fm-icon-text-window.c:81
+#: src/file-manager/fm-icon-text-window.c:82
 msgid "owner"
 msgstr ""
 
-#: src/file-manager/fm-icon-text-window.c:82
+#: src/file-manager/fm-icon-text-window.c:83
 msgid "group"
 msgstr ""
 
-#: src/file-manager/fm-icon-text-window.c:83
+#: src/file-manager/fm-icon-text-window.c:84
 msgid "permissions"
 msgstr ""
 
-#: src/file-manager/fm-icon-text-window.c:84
+#: src/file-manager/fm-icon-text-window.c:85
 msgid "octal permissions"
 msgstr ""
 
-#: src/file-manager/fm-icon-text-window.c:85
+#: src/file-manager/fm-icon-text-window.c:86
 msgid "MIME type"
 msgstr ""
 
-#: src/file-manager/fm-icon-text-window.c:86
+#: src/file-manager/fm-icon-text-window.c:87
 msgid "none"
 msgstr ""
 
-#: src/file-manager/fm-icon-text-window.c:261
+#: src/file-manager/fm-icon-text-window.c:263
 msgid "Icon Captions"
 msgstr "Titoi Icona"
 
-#: src/file-manager/fm-icon-text-window.c:268
+#: src/file-manager/fm-icon-text-window.c:271
 msgid ""
 "Choose the order for information to appear beneath icon names. More "
 "information appears as you zoom in closer."
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:152
-#: src/file-manager/nautilus-icon-view-ui.xml.h:33
-#: src/file-manager/nautilus-icon-view-ui.xml.h:60
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "per _Nome"
 
-#: src/file-manager/fm-icon-view.c:153
-#: src/file-manager/nautilus-icon-view-ui.xml.h:13
-#: src/file-manager/nautilus-icon-view-ui.xml.h:40
+#: src/file-manager/fm-icon-view.c:169
+#: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:159
-#: src/file-manager/nautilus-icon-view-ui.xml.h:34
-#: src/file-manager/nautilus-icon-view-ui.xml.h:61
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "per _Dimensione"
 
-#: src/file-manager/fm-icon-view.c:160
-#: src/file-manager/nautilus-icon-view-ui.xml.h:14
-#: src/file-manager/nautilus-icon-view-ui.xml.h:41
+#: src/file-manager/fm-icon-view.c:176
+#: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:166
-#: src/file-manager/nautilus-icon-view-ui.xml.h:35
-#: src/file-manager/nautilus-icon-view-ui.xml.h:62
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "per _Tipo"
 
-#: src/file-manager/fm-icon-view.c:167
-#: src/file-manager/nautilus-icon-view-ui.xml.h:15
-#: src/file-manager/nautilus-icon-view-ui.xml.h:42
+#: src/file-manager/fm-icon-view.c:183
+#: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:173
-#: src/file-manager/nautilus-icon-view-ui.xml.h:31
-#: src/file-manager/nautilus-icon-view-ui.xml.h:58
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:174
-#: src/file-manager/nautilus-icon-view-ui.xml.h:12
-#: src/file-manager/nautilus-icon-view-ui.xml.h:39
+#: src/file-manager/fm-icon-view.c:190
+#: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:180
-#: src/file-manager/nautilus-icon-view-ui.xml.h:32
-#: src/file-manager/nautilus-icon-view-ui.xml.h:59
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "per _Simbolo"
 
-#: src/file-manager/fm-icon-view.c:181
-#: src/file-manager/nautilus-icon-view-ui.xml.h:11
-#: src/file-manager/nautilus-icon-view-ui.xml.h:38
+#: src/file-manager/fm-icon-view.c:197
+#: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:504
-#: src/file-manager/nautilus-icon-view-ui.xml.h:28
-#: src/file-manager/nautilus-icon-view-ui.xml.h:55
-msgid "_Stretch Icon"
-msgstr ""
-
-#: src/file-manager/fm-icon-view.c:513
-#: src/file-manager/nautilus-icon-view-ui.xml.h:27
-#: src/file-manager/nautilus-icon-view-ui.xml.h:54
+#: src/file-manager/fm-icon-view.c:1241
+#: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:515
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:520
-#: src/file-manager/nautilus-icon-view-ui.xml.h:24
-#: src/file-manager/nautilus-icon-view-ui.xml.h:51
-msgid "_Icon Captions..."
-msgstr ""
-
-#. Modify file name. We only allow this on a single file selection.
-#: src/file-manager/fm-icon-view.c:523
-#: src/file-manager/nautilus-icon-view-ui.xml.h:26
-#: src/file-manager/nautilus-icon-view-ui.xml.h:53
-msgid "_Rename"
-msgstr ""
-
-#: src/file-manager/fm-icon-view.c:527
-#: src/file-manager/nautilus-icon-view-ui.xml.h:23
-#: src/file-manager/nautilus-icon-view-ui.xml.h:50
-msgid "_Clean Up by Name"
-msgstr ""
-
-#: src/file-manager/fm-icon-view.c:530
-msgid "_Use Tighter Layout"
-msgstr ""
-
-#: src/file-manager/fm-icon-view.c:534
-#: src/file-manager/nautilus-icon-view-ui.xml.h:18
-#: src/file-manager/nautilus-icon-view-ui.xml.h:45
-msgid "Re_versed Order"
-msgstr ""
-
-#: src/file-manager/fm-icon-view.c:538
-#: src/file-manager/nautilus-icon-view-ui.xml.h:25
-#: src/file-manager/nautilus-icon-view-ui.xml.h:52
-msgid "_Lay out items"
-msgstr "Disponi oggetti"
-
-#: src/file-manager/fm-icon-view.c:541
-#: src/file-manager/nautilus-icon-view-ui.xml.h:30
-#: src/file-manager/nautilus-icon-view-ui.xml.h:57
-msgid "_manually"
-msgstr "manualmente"
-
-#: src/file-manager/fm-icon-view.c:1757
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr ""
 
-#: src/file-manager/fm-list-view.c:1891
-#: src/file-manager/fm-search-list-view.c:284
-#: src/nautilus-search-bar-criterion.c:69
+#: src/file-manager/fm-list-view.c:2188
+#: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/file-manager/fm-list-view.c:1897
-#: src/file-manager/fm-search-list-view.c:290
-#: src/nautilus-search-bar-criterion.c:68
+#: src/file-manager/fm-list-view.c:2194
+#: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Tipo"
 
-#: src/file-manager/fm-list-view.c:1903
-#: src/file-manager/fm-search-list-view.c:296
+#: src/file-manager/fm-list-view.c:2200
+#: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Data modifica"
 
-#: src/file-manager/fm-properties-window.c:456
+#: src/file-manager/fm-properties-window.c:522
 #, c-format
 msgid "%s Properties"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:588
+#: src/file-manager/fm-properties-window.c:717
 msgid "Cancel Group Change?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:589
+#: src/file-manager/fm-properties-window.c:718
 msgid "Changing group"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:734
+#: src/file-manager/fm-properties-window.c:879
 msgid "Cancel Owner Change?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:735
+#: src/file-manager/fm-properties-window.c:880
 msgid "Changing owner"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:892
+#: src/file-manager/fm-properties-window.c:1063
 msgid "nothing"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:894
+#: src/file-manager/fm-properties-window.c:1065
 msgid "unreadable"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:903
+#: src/file-manager/fm-properties-window.c:1074
 #, c-format
 msgid "1 item, with size %s"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:905
+#: src/file-manager/fm-properties-window.c:1076
 #, c-format
 msgid "%d items, totalling %s"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:911
+#: src/file-manager/fm-properties-window.c:1082
 msgid "(some contents unreadable)"
 msgstr ""
 
@@ -3550,116 +7256,324 @@ msgstr ""
 #. * "Contents:" title to line up with the first line of the 2-line value.
 #. * Maybe there's a better way to do this, but I couldn't think of one.
 #.
-#: src/file-manager/fm-properties-window.c:925
+#: src/file-manager/fm-properties-window.c:1096
 msgid "Contents:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1079
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1143
-msgid "Where:"
-msgstr ""
-
-#: src/file-manager/fm-properties-window.c:1145
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1151
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1154
+#: src/file-manager/fm-properties-window.c:1531
+msgid "Link Target:"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1534
+msgid "MIME Type:"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1156
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1159
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1552
+msgid "Select Custom Icon..."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1293
-msgid "Emblems"
+#: src/file-manager/fm-properties-window.c:1558
+msgid "Remove Custom Icon"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1526
-msgid "Special Flags:"
+#: src/file-manager/fm-properties-window.c:1886
+msgid "Set User ID"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1530
-msgid "Set User ID"
+#: src/file-manager/fm-properties-window.c:1891
+msgid "Special Flags:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1534
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1538
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1549
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1555
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1582
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1592
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1610
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1613
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1616
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1619
+#: src/file-manager/fm-properties-window.c:1989
+msgid "Read"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1993
+msgid "Write"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:1997
+msgid "Execute"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1622
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1625
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1629
-msgid "Read"
+#: src/file-manager/fm-properties-window.c:2054
+#, c-format
+msgid "The permissions of \"%s\" could not be determined."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1633
-msgid "Write"
+#: src/file-manager/fm-properties-window.c:2334
+msgid "Cancel Showing Properties Window?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1637
-msgid "Execute"
+#: src/file-manager/fm-properties-window.c:2335
+msgid "Creating Properties window"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1699
+#: src/file-manager/fm-properties-window.c:2435
+msgid "Select an icon:"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:124
+#, fuzzy
+msgid "Search Results"
+msgstr "Cerca"
+
+#: src/file-manager/fm-search-list-view.c:142
 #, c-format
-msgid "The permissions of \"%s\" could not be determined."
+msgid ""
+"Search results may not include items modified after %s, when your drive was "
+"last indexed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:158
+msgid ""
+"Sorry, but the Medusa search service is not available because it is not "
+"installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:159
+#: src/file-manager/nautilus-indexing-info.c:407
+msgid "Search Service Not Available"
+msgstr ""
+
+#. FIXME bugzilla.eazel.com 5058: Should be two messages, one for each of whether
+#. "slow complete search" turned on or not
+#: src/file-manager/fm-search-list-view.c:184
+msgid ""
+"The search you have selected is newer than the index on your system.  The "
+"search will return no results right now.  Would you like to create a new "
+"index now?"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:189
+msgid "Search for items that are too new"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:190
+msgid "Create a new index"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:191
+msgid "Don't create index"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:278
+#: src/file-manager/fm-search-list-view.c:200
+msgid ""
+"Every indexed file on your computer matches the criteria you selected. You "
+"can check the spelling on your selections or add more criteria to narrow "
+"your results."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:204
+#: src/file-manager/fm-search-list-view.c:218
+msgid "Error during search"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:213
+#, c-format
+msgid "An error occurred while loading this search's contents: %s"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:241
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Find can't access your index right now so a slower search will be performed "
+"that doesn't use the index."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:246
+msgid ""
+"To do a content search, Find requires an index of the files on your system.  "
+"Find can't access your index right now. "
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast searches are not available"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:319
+#: src/file-manager/fm-search-list-view.c:338
+msgid "Content searches are not available"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:254
+msgid ""
+"Your index files are available but the Medusa search daemon, which handles "
+"index requests, isn't running.  To start this program, log in as root and "
+"enter this command at the command line: medusa-searchd"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:274
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Your computer does not have an index right now.  Because Find cannot use an "
+"index, this search may take several minutes.  Would you like to create an "
+"index? Creating an index will be done while you are not actively using your "
+"computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:283
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  Your computer does not have an index right now.  Would you like to "
+"create an index?  Creating an index will be done while you are not actively "
+"using your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:290
+#: src/file-manager/fm-search-list-view.c:318
+#: src/file-manager/fm-search-list-view.c:337
+msgid "Indexed searches are not available"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:294
+msgid "Create an Index"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:295
+msgid "Don't Create an Index Now"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:306
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Your computer is currently creating that index.   Because Find cannot use an "
+"index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:312
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  Your computer is currently creating that index.  Content searches "
+"will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:326
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  An "
+"index can't be created right now. When an index is not available, searches "
+"will take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:332
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  An index can't be created right now."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:341
+msgid ""
+"The program that creates an index is not set up correctly.  You can create "
+"an index by hand by running \"medusa-indexd\" as root on the command line."
+msgstr ""
+
+#. It is not necessary to translate this text just yet; it has not been
+#. edited yet, and will be replaced by a final copy in a few days.
+#: src/file-manager/fm-search-list-view.c:360
+#: src/file-manager/nautilus-indexing-info.c:342
+msgid ""
+"To do a fast search, Find requires an index of the files on your system. "
+"Your system administrator has disabled fast search on your computer, so no "
+"index is available."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:364
+msgid "Fast searches are not available on your computer"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:373
+#: src/file-manager/nautilus-indexing-info.c:361
+msgid ""
+"To do a fast search, Find requires an index of the files on your system. "
+"Fast search is disabled in your Search preferences, so no index is available."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:376
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
+msgid "Fast searches are not available on your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:377
+#: src/file-manager/nautilus-indexing-info.c:366
+msgid ""
+"To enable fast search, open the Preferences menu and choose Preferences. "
+"Then select Search preferences and put a checkmark in the Enable Fast Search "
+"checkbox. An index will be generated while your computer is idle, so your "
+"index won't be available immediately."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:551
 msgid "Where"
 msgstr ""
 
@@ -3668,9 +7582,8 @@ msgstr ""
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:331
-#: src/file-manager/nautilus-search-list-view-ui.xml.h:12
-#: src/file-manager/nautilus-search-list-view-ui.xml.h:16
+#: src/file-manager/fm-search-list-view.c:603
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr ""
 
@@ -3680,273 +7593,575 @@ msgstr ""
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:339
+#: src/file-manager/fm-search-list-view.c:611
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr ""
 
+#. Note that the number of items actually displayed varies somewhat due
+#. * to the way files are collected in batches. So you can't assume that
+#. * no more than the constant limit are displayed.
 #.
-#. *  This file is autogenerated from nautilus-directory-view-ui.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/fm-search-list-view.c:723
+msgid ""
+"Nautilus found more search results than it can display. Some matching items "
+"will not be displayed. "
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:725
+msgid "Too Many Matches"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:1
+msgid "Change Desktop Background"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+msgid "Delete all items in the Trash"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
+msgid "Disks"
+msgstr "Dischi"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:5
+msgid "Mount or unmount disks"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:6
+msgid "New Terminal"
+msgstr "Nuovo terminale"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:7
+msgid "Open a new GNOME terminal window"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:8
+msgid "Remove any custom pattern or color from the desktop background"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
+msgid "Reset Desktop Background"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:10
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+msgid "Choose a program with which to open the selected item"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:2
 msgid "Choose another application with which to open the selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:3
 msgid "Choose another viewer with which to view the selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:4
+#, fuzzy
+msgid "Copy Files"
+msgstr "File di configurazione"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
-msgid "Delete all items in the trash"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u file"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+msgid "Delete each selected item, without moving to the Trash"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#, fuzzy
+msgid "Duplicate"
+msgstr "applicazione"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:16
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+msgid "Make Link"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr ""
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
 #: src/file-manager/nautilus-directory-view-ui.xml.h:20
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+msgid "Move to Trash"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+msgid "New Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+msgid "Open"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#, fuzzy
+msgid "Open Wit_h"
+msgstr "termina con"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "Open With"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+msgid "Open in New Window"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+msgid "Other Application..."
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+msgid "Other Viewer..."
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "file di testo"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+msgid "Remove Custom Images"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+msgid "Remove any custom images from selected icons"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+msgid "Remove any custom pattern or color from the background of this location"
+msgstr ""
+
+#. add the reset background item, possibly disabled
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
+msgid "Reset Background"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+msgid "Scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+msgid "Select All Files"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+msgid "Select _All Files"
+msgstr ""
+
 #: src/file-manager/nautilus-directory-view-ui.xml.h:47
-msgid "Other _Application..."
-msgstr "Altre applicazioni..."
+msgid "Select all items in this window"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 #: src/file-manager/nautilus-directory-view-ui.xml.h:48
-msgid "Other _Viewer..."
+msgid "Show Properties"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+msgid "Show Trash"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 #: src/file-manager/nautilus-directory-view-ui.xml.h:50
-msgid "Remove any custom images from selected icons"
+msgid "Show _Properties"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 #: src/file-manager/nautilus-directory-view-ui.xml.h:51
-msgid "Select all items in this window"
+msgid "Show the contents of the Trash"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+msgid "_Duplicate"
+msgstr ""
+
 #: src/file-manager/nautilus-directory-view-ui.xml.h:57
-msgid "_Open in New Window"
+msgid "_New Folder"
 msgstr ""
 
-#.
-#. *  This file is autogenerated from nautilus-icon-view-ui.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+msgid "_Open"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "file di testo"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
+msgid "_Show Trash"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#, fuzzy
+msgid "By Emblems"
+msgstr "per _Simbolo"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:2
+msgid "By Modification Date"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:3
+msgid "By Modification _Date"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:4
+#, fuzzy
+msgid "By Name"
+msgstr "per _Nome"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:5
+#, fuzzy
+msgid "By Size"
+msgstr "per _Dimensione"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:6
+#, fuzzy
+msgid "By Type"
+msgstr "per _Tipo"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:7
+#, fuzzy
+msgid "By _Emblems"
+msgstr "per _Simbolo"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:8
+#, fuzzy
+msgid "By _Name"
+msgstr "per _Nome"
+
 #: src/file-manager/nautilus-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-icon-view-ui.xml.h:36
+#, fuzzy
+msgid "By _Size"
+msgstr "per _Dimensione"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:10
+#, fuzzy
+msgid "By _Type"
+msgstr "per _Tipo"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:11
 msgid "Choose which information appears beneath each icon's name"
 msgstr ""
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:10
-#: src/file-manager/nautilus-icon-view-ui.xml.h:37
+#: src/file-manager/nautilus-icon-view-ui.xml.h:12
+msgid "Clean Up by Name"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:13
 msgid "Display icons in the opposite order"
 msgstr ""
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:16
-#: src/file-manager/nautilus-icon-view-ui.xml.h:43
+#: src/file-manager/nautilus-icon-view-ui.xml.h:14
+#, fuzzy
+msgid "Icon Captions..."
+msgstr "Titoi Icona"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:20
+#, fuzzy
+msgid "Lay Out Items"
+msgstr "Disponi oggetti"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:21
 msgid "Leave icons wherever they are dropped"
 msgstr ""
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:17
-#: src/file-manager/nautilus-icon-view-ui.xml.h:44
+#: src/file-manager/nautilus-icon-view-ui.xml.h:22
 msgid "Make the selected icon stretchable"
 msgstr ""
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:19
-#: src/file-manager/nautilus-icon-view-ui.xml.h:46
+#: src/file-manager/nautilus-icon-view-ui.xml.h:23
+#, fuzzy
+msgid "Manually"
+msgstr "Manuale"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:24
+msgid "Re_versed Order"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:26
 msgid "Rename selected icon"
 msgstr ""
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:20
-#: src/file-manager/nautilus-icon-view-ui.xml.h:47
+#: src/file-manager/nautilus-icon-view-ui.xml.h:27
 msgid "Reposition icons to better fit in the window and avoid overlapping"
 msgstr ""
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:21
-#: src/file-manager/nautilus-icon-view-ui.xml.h:48
+#: src/file-manager/nautilus-icon-view-ui.xml.h:28
+msgid "Restore Icons' Original Sizes"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:29
 msgid "Restore each selected icon to its original size"
 msgstr ""
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:22
-#: src/file-manager/nautilus-icon-view-ui.xml.h:49
+#: src/file-manager/nautilus-icon-view-ui.xml.h:30
+msgid "Reversed Order"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:31
+msgid "Stretch Icon"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:32
+msgid "Tighter Layout"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:33
 msgid "Toggle using a tighter layout scheme"
 msgstr ""
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:29
-#: src/file-manager/nautilus-icon-view-ui.xml.h:56
+#: src/file-manager/nautilus-icon-view-ui.xml.h:34
+msgid "_Clean Up by Name"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:35
+msgid "_Icon Captions..."
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:36
+#, fuzzy
+msgid "_Lay Out Items"
+msgstr "Disponi oggetti"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:37
+#, fuzzy
+msgid "_Manually"
+msgstr "manualmente"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:38
+msgid "_Rename"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:40
+msgid "_Stretch Icon"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:41
 msgid "_Tighter Layout"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:106
-msgid "Busy"
+#: src/file-manager/nautilus-indexing-info.c:85
+msgid "Indexing is %d%% complete."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:109
-msgid "No response"
+#: src/file-manager/nautilus-indexing-info.c:175
+msgid "The indexer is currently busy."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:112
-msgid "No indexer present"
+#: src/file-manager/nautilus-indexing-info.c:180
+msgid ""
+"An indexer is not running, or is not responding to requests to reindex your "
+"computer."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:120
-#, c-format
-msgid "Error while trying to reindex: %s"
+#: src/file-manager/nautilus-indexing-info.c:185
+msgid ""
+"An attempt to reindex, caused an Internal Indexer Error.  Tell "
+"rebecka@eazel.com"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:163
-msgid "%I:%M %p, %x"
+#: src/file-manager/nautilus-indexing-info.c:194
+#, fuzzy
+msgid "Reindexing Failed"
+msgstr "Disinstallazione fallita"
+
+#: src/file-manager/nautilus-indexing-info.c:216
+msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast. If you need to update your index now, click on the \"Update Now\" "
+"button."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:219
+#: src/file-manager/nautilus-indexing-info.c:226
+#: src/file-manager/nautilus-indexing-info.c:281
+msgid "Indexing Status"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:179
+#. FIXME: Do we want to talk about the index not being available?
+#: src/file-manager/nautilus-indexing-info.c:224
+msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast. "
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:236
 #, c-format
 msgid "Your files were last indexed at %s"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:190
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "Aggiorna Adesso"
 
-#: src/file-manager/nautilus-indexing-info.c:210
-msgid "Your files are currently being indexed:"
+#: src/file-manager/nautilus-indexing-info.c:279
+msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast.  Your files are currently being indexed."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:270
-msgid "Search service not available"
+#: src/file-manager/nautilus-indexing-info.c:406
+msgid "Sorry, but the medusa search service is not available."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:282
-msgid "Indexing Info..."
+#: src/file-manager/nautilus-indexing-info.c:428
+msgid "%I:%M %p, %x"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:295
-msgid ""
-"Once a day your files and text content are indexed so\n"
-"your searches are fast.  If you need to update your index\n"
-"now, click on the \"Update Now\" button for the\n"
-"appropriate index.\n"
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:1
+msgid "Reveal each selected item in its original folder"
 msgstr ""
 
-#.
-#. *  This file is autogenerated from nautilus-search-list-view-ui.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: src/file-manager/nautilus-search-list-view-ui.xml.h:9
-#: src/file-manager/nautilus-search-list-view-ui.xml.h:13
-msgid "Reveal each selected item in its original folder"
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:2
+msgid "Reveal in New Window"
 msgstr ""
 
-#: src/file-manager/nautilus-search-list-view-ui.xml.h:10
-#: src/file-manager/nautilus-search-list-view-ui.xml.h:14
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:3
+msgid "Show Indexing Status"
+msgstr ""
+
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:4
 msgid "Show _Indexing Status"
 msgstr ""
 
-#: src/file-manager/nautilus-search-list-view-ui.xml.h:11
-#: src/file-manager/nautilus-search-list-view-ui.xml.h:15
-msgid "Show status of indexing used by searching"
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:5
+msgid "Show status of indexing used when searching"
 msgstr ""
 
-#. set the window title
-#: src/nautilus-about.c:139
+#. set the window title and standard close key accelerator
+#: src/nautilus-about.c:141
 msgid "About Nautilus"
 msgstr "Informazioni su Nautilus"
 
 #. draw the authors title
-#: src/nautilus-about.c:355
+#: src/nautilus-about.c:361
 msgid "Authors"
 msgstr ""
 
-#: src/nautilus-application.c:234
-msgid "User Directory"
-msgstr "Directory Utente"
+#: src/nautilus-application.c:275
+#, fuzzy
+msgid "Couldn't Create Required Folder"
+msgstr "Impossibile ottenere il corpo della richiesta!"
 
-#: src/nautilus-application.c:239
-msgid "User Main Directory"
-msgstr "Directory Principale Utente"
+#: src/nautilus-application.c:276
+#, c-format
+msgid ""
+"Nautilus could not create the required folder \"%s\". Before running "
+"Nautilus, please create this folder, or set permissions such that Nautilus "
+"can create it."
+msgstr ""
 
-#: src/nautilus-application.c:244
-msgid "Desktop Directory"
-msgstr "Directory Desktop"
+#: src/nautilus-application.c:281
+#, fuzzy
+msgid "Couldn't Create Required Folders"
+msgstr "Impossibile ottenere il corpo della richiesta!"
 
-#: src/nautilus-application.c:259
-msgid "Missing Directories"
-msgstr "Directory mancanti"
+#: src/nautilus-application.c:282
+#, c-format
+msgid ""
+"Nautilus could not create the following required folders:\n"
+"\n"
+"%s\n"
+"\n"
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
+msgstr ""
 
 #. Can't register myself due to trouble locating the
-#. * nautilus.oafinfo file. This has happened when you
+#. * Nautilus_Shell.oaf file. This has happened when you
 #. * launch Nautilus with an LD_LIBRARY_PATH that
 #. * doesn't include the directory containg the oaf
 #. * library. It could also happen if the
-#. * nautilus.oafinfo file was not present for some
+#. * Nautilus_Shell.oaf file was not present for some
 #. * reason. Sometimes killing oafd and gconfd fixes
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:358
+#: src/nautilus-application.c:407
 msgid ""
-"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
-"again may fix the problem."
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again."
 msgstr ""
 
 #. FIXME bugzilla.eazel.com 2536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:362
+#: src/nautilus-application.c:413
 msgid ""
-"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
-"again may fix the problem.\n"
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again.\n"
+"\n"
+"OAF couldn't locate the Nautilus_shell.oaf file. One cause of this seems to "
+"be an LD_LIBRARY_PATH that does not include the oaf library's directory. "
+"Another possible cause would be bad install with a missing "
+"Nautilus_Shell.oaf file.\n"
 "\n"
-"OAF couldn't locate the nautilus.oafinfo file. One cause of this seems to be "
-"an LD_LIBRARY_PATH that does not include the oaf library's directory. "
-"Another possible cause would be bad install with a missing nautilus.oafinfo "
-"file.\n"
+"Running \"nautilus-clean.sh -x\" will kill all OAF and GConf processes, "
+"which may be needed by other applications.\n"
 "\n"
 "Sometimes killing oafd and gconfd fixes the problem, but we don't know why.\n"
 "\n"
-"We need a much less confusing message here for Nautilus 1.0."
+"We have also seen this error when a faulty version of oaf was installed."
 msgstr ""
 
 #. Some misc. error (can never happen with current
@@ -3958,1189 +8173,1490 @@ msgstr ""
 #. * wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:387 src/nautilus-application.c:405
+#: src/nautilus-application.c:444 src/nautilus-application.c:462
+#: src/nautilus-application.c:469
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr ""
 
-#: src/nautilus-application.c:388
+#: src/nautilus-application.c:445
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
 "attempting to register the file manager view server."
 msgstr ""
 
-#: src/nautilus-application.c:406
+#: src/nautilus-application.c:463
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
-"attempting to locate the factory."
+"attempting to locate the factory.Killing oafd and restarting Nautilus may "
+"help fix the problem."
 msgstr ""
 
-#: src/nautilus-application.c:547
+#: src/nautilus-application.c:470
 msgid ""
-"You are running Nautilus as root.\n"
+"Nautilus can't be used now, due to an unexpected error from OAF when "
+"attempting to locate the shell object. Killing oafd and restarting Nautilus "
+"may help fix the problem."
+msgstr ""
+
+#: src/nautilus-application.c:635
+msgid ""
+"You are about to run Nautilus as root.\n"
 "\n"
 "As root, you can damage your system if you are not careful, and\n"
 "Nautilus will not stop you from doing it."
 msgstr ""
 
-#: src/nautilus-bookmarks-window.c:125
+#: src/nautilus-bookmarks-window.c:127
 msgid "Bookmarks"
 msgstr ""
 
-#: src/nautilus-bookmarks-window.c:174
+#: src/nautilus-bookmarks-window.c:177
 msgid "Location"
 msgstr ""
 
-#: src/nautilus-bookmarks-window.c:187 src/nautilus-window-menus.c:778
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:112
+#: src/nautilus-complex-search-bar.c:233
+#, fuzzy
+msgid "More Options"
+msgstr "Titoi Icona"
+
+#: src/nautilus-complex-search-bar.c:243
+msgid "Fewer Options"
+msgstr ""
+
+#. Create button first so we can use it for auto_click
+#: src/nautilus-complex-search-bar.c:261 src/nautilus-simple-search-bar.c:129
+msgid "Find Them!"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:191
 msgid ""
-"Existence of this file indicates that the Nautilus configuration wizard\n"
+"Existence of this file indicates that the Nautilus configuration druid\n"
 "has been presented.\n"
 "\n"
-"You can manually erase this file to present the wizard again.\n"
+"You can manually erase this file to present the druid again.\n"
 "\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:348
+#: src/nautilus-first-time-druid.c:487
 msgid ""
-"User levels provide a way to adjust the software to\n"
-"your level of technical expertise.  Pick an initial level that you\n"
-"feel comfortable with; you can always change it later."
+"Your user level adjusts Nautilus to your degree of experience\n"
+"using GNOME and Linux. Choose a level that's comfortable for\n"
+"you - you can always change it later."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:358
+#: src/nautilus-first-time-druid.c:498
 msgid ""
-"For beginner users that are not yet\n"
-"familiar with the working of GNOME and Linux."
+"For users who have no previous experience with GNOME\n"
+"and Linux."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:365
+#: src/nautilus-first-time-druid.c:504
 msgid ""
-"For non-technical users that are comfortable with\n"
-"their GNOME and Linux environment."
+"For users who are comfortable with GNOME and Linux,\n"
+"but don't describe themselves as ``technical.''"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:371
+#: src/nautilus-first-time-druid.c:510
 msgid ""
-"For users that have the need to be exposed\n"
-"to every detail of their operating system."
+"For users who have GNOME and Linux experience, and\n"
+"like to see every detail of the operating system."
 msgstr ""
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:406
+#: src/nautilus-first-time-druid.c:548
 msgid ""
-"Eazel offers a growing number of services to \n"
-"help you install and maintain new software and manage \n"
-"your files across the network.  If you want to find out more \n"
-"about Eazel services, just press the 'Next' button. "
+"To verify your Internet connection and make sure you have\n"
+"the latest Nautilus updates, Nautilus will now connect to\n"
+"Eazel's web site. This will take seconds if your copy of\n"
+"Nautilus is recent; longer (but no more than a minute or two)\n"
+"if you need an update.\n"
+"\n"
+"If you know your computer uses a proxy connection, click\n"
+"Verify and Nautilus will use it.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:410
-msgid "Eazel Services"
-msgstr "Servizi di Eazel"
+#: src/nautilus-first-time-druid.c:562
+msgid "Verify my connection and check for updates"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:563
+msgid "Don't verify my connection or check for updates"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:628
+msgid ""
+"We are having trouble making an external web connection.\n"
+"Sometimes, firewalls require you to specify a web proxy server.\n"
+"Fill in the name or port of your proxy server, if any, below."
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:418
-msgid "I want to learn more about Eazel services."
+#: src/nautilus-first-time-druid.c:640
+msgid "No proxy server required."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:419
-msgid "I want to sign up for Eazel services now."
+#: src/nautilus-first-time-druid.c:641
+msgid "Use this proxy server:"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:420
-msgid "I've already signed up and want to login now."
+#. allocate the proxy label, followed by the entry
+#: src/nautilus-first-time-druid.c:666
+msgid "Proxy address:"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:421
-msgid "I don't want to learn about Eazel services at this time."
+#: src/nautilus-first-time-druid.c:728
+msgid "Verifying your Internet connection and checking for updates..."
 msgstr ""
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:448
+#: src/nautilus-first-time-druid.c:736
+msgid "Downloading Nautilus updates..."
+msgstr "Prelievo degli aggiornamenti di Nautilus..."
+
+#: src/nautilus-first-time-druid.c:906
 msgid ""
-"Nautilus will now contact Eazel services to verify your \n"
-"web connection and download the latest updates.  \n"
-"Click the Next button to continue."
+"If you have been using the GNOME Midnight Commander\n"
+"these settings move your desktop icons to Nautilus and\n"
+"make Nautilus the default desktop.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:452
-msgid "Updating Nautilus"
-msgstr "Aggiornamento di Nautilus"
+#: src/nautilus-first-time-druid.c:913
+msgid "Use Nautilus to draw the desktop."
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:460
-msgid "Yes, verify my web connection and update Nautilus now."
+#: src/nautilus-first-time-druid.c:919
+msgid "Move existing desktop icons to the Nautilus desktop."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:461
-msgid "No, I don't wish to connect and update Nautilus now."
+#. This option is currently disabled, per bugzilla.eazel.com 7557
+#: src/nautilus-first-time-druid.c:927
+msgid "Launch Nautilus when GNOME starts up."
 msgstr ""
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:492
+#: src/nautilus-first-time-druid.c:967
 msgid ""
-"We are having troubles making an external web connection.  \n"
-"Sometimes, firewalls require you to specify a web proxy server.  \n"
-" Fill in the name of port of your proxy server, if any, below."
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties.  The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+"Fast search requires that the cron daemon on your system be running.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:496
-msgid "HTTP Proxy Configuration"
-msgstr "Configurazione Proxy HTTP"
+#: src/nautilus-first-time-druid.c:972
+msgid ""
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties. The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:508
-msgid "No proxy server required."
+#: src/nautilus-first-time-druid.c:981
+msgid "Enable fast search"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:509
-msgid "Use this proxy server:"
+#: src/nautilus-first-time-druid.c:982
+msgid "Turn fast search on when cron is enabled"
 msgstr ""
 
-#. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:534
-msgid "Proxy address:"
+#: src/nautilus-first-time-druid.c:1027
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"currently can't be performed because the program crond, which does\n"
+"nightly tasks on your computer, is turned off. To make sure fast searches\n"
+"can be done, turn crond on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands \n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:551
-msgid "Port:"
+#: src/nautilus-first-time-druid.c:1035
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"may not be performed because the program crond, which does nightly tasks\n"
+"on your computer, may be turned off. To make sure fast searches can be\n"
+"done, check to make sure that crond is turned on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands\n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:582
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
-"We are now contacting the Eazel service to test your \n"
-"web connection and update Nautilus."
+"Click Finish to launch Nautilus. You'll start with two\n"
+"Nautilus windows: one shows your home folder, and the\n"
+"other tells you about Eazel's services that make the life\n"
+"of a Linux user easier.\n"
+"\n"
+"We hope you enjoy Nautilus!"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:587
-msgid "Downloading Nautilus updates..."
-msgstr "Prelievo degli aggiornamenti di Nautilus..."
+#: src/nautilus-first-time-druid.c:1129
+msgid ""
+"Click Finish to launch Nautilus. You'll start with a\n"
+"window showing your home folder.\n"
+"\n"
+"We hope you enjoy Nautilus!"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:678
-msgid "Initial Preferences"
+#: src/nautilus-first-time-druid.c:1153
+msgid "Nautilus First Time Setup"
 msgstr ""
 
-#. make the title label
-#: src/nautilus-first-time-druid.c:707
-msgid "Welcome to Nautilus!"
+#: src/nautilus-first-time-druid.c:1183
+#, fuzzy
+msgid "Welcome to Nautilus"
 msgstr "Benvenuti in Nautilus!"
 
-#: src/nautilus-first-time-druid.c:715
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
-"Since this is the first time that you've launched\n"
-"Nautilus, we'd like to ask you a few questions\n"
-"to help personalize it for your use."
-msgstr ""
-
-#: src/nautilus-first-time-druid.c:720
-msgid "Press the next button to continue."
+"Nautilus...\n"
+"    Is a great file manager for the GNOME desktop.\n"
+"    Provides a simple intuitive way to access Internet services.\n"
+"    Is an extensible framework for GNOME developers.\n"
+"    Provides a powerful delivery platform for service providers.\n"
+"\n"
+"Click Next to begin customizing your Nautilus environment."
 msgstr ""
 
 #. set up the final page
-#: src/nautilus-first-time-druid.c:728
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "Fine"
 
-#: src/nautilus-first-time-druid.c:735
-msgid ""
-"Click the finish button to launch Nautilus.\n"
-"We hope that you enjoy using it!"
-msgstr ""
-
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:741
-msgid "Select A User Level"
+#: src/nautilus-first-time-druid.c:1209
+#, fuzzy
+msgid "Choose Your User Level"
 msgstr "Selezionare livello utente"
 
-#. set up the service sign-up page
-#: src/nautilus-first-time-druid.c:745
-msgid "Sign Up for Eazel Services"
-msgstr "Iscriviati ai Servizi Eazel"
+#. set up the GMC transition page
+#: src/nautilus-first-time-druid.c:1213
+msgid "GMC to Nautilus Transition"
+msgstr ""
+
+#. set up the `Launch Medusa' page
+#: src/nautilus-first-time-druid.c:1217
+#, fuzzy
+msgid "Fast Searches"
+msgstr "Cerca"
+
+#. set up optional page to tell the user how to run cron
+#: src/nautilus-first-time-druid.c:1225
+msgid "The Cron Daemon"
+msgstr ""
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:749
-msgid "Nautilus Update"
-msgstr "Aggiornamento Nautilus"
+#: src/nautilus-first-time-druid.c:1230
+msgid "Checking Your Internet Connection"
+msgstr ""
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:757
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr ""
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:765
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "Configurazione Proxy Web"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:833
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:842
-msgid "Update Completed... Press Next to Continue."
+#: src/nautilus-first-time-druid.c:1341
+msgid "Update Complete. Click Next to Continue."
+msgstr ""
+
+#. The update file couldn't be loaded because it
+#. * doesn't exist. Arlo and I (jsh) and decided that the
+#. * best thing to do is silently fail
+#.
+#: src/nautilus-first-time-druid.c:1356
+msgid "No Update Available... Press Next to Continue."
 msgstr ""
 
 #. set the window title
-#: src/nautilus-link-set-window.c:192
+#: src/nautilus-link-set-window.c:189
 msgid "Link sets"
 msgstr ""
 
 #. add a descriptive label
-#: src/nautilus-link-set-window.c:204
+#: src/nautilus-link-set-window.c:202
 msgid "Add or remove sets of links by clicking on the checkboxes below."
 msgstr ""
 
-#: src/nautilus-location-bar.c:134
+#: src/nautilus-location-bar.c:63
+msgid "Go To:"
+msgstr ""
+
+#: src/nautilus-location-bar.c:153
 #, c-format
 msgid "Do you want to view these %d locations in separate windows?"
 msgstr ""
 
-#: src/nautilus-location-bar.c:141
+#: src/nautilus-location-bar.c:160
 msgid "View in Multiple Windows?"
 msgstr ""
 
-#: src/nautilus-location-bar.c:449 src/nautilus-location-bar.c:591
-msgid "Location:"
+#: src/nautilus-main.c:145
+msgid "Perform a quick set of self-check tests."
+msgstr ""
+
+#: src/nautilus-main.c:148
+msgid "Create the initial window with the given geometry."
 msgstr ""
 
-#: src/nautilus-location-bar.c:593
-msgid "   Go To:"
+#: src/nautilus-main.c:148
+msgid "GEOMETRY"
 msgstr ""
 
-#: src/nautilus-main.c:140
-msgid "Perform high-speed self-check tests."
+#: src/nautilus-main.c:150
+msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:142
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr ""
 
-#: src/nautilus-main.c:143
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "Riavvia Nautilus"
 
-#: src/nautilus-main.c:144
-msgid "Don't draw background and icons on desktop."
-msgstr ""
-
-#: src/nautilus-main.c:145
-msgid "Draw background and icons on desktop."
-msgstr ""
-
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 
-#: src/nautilus-main.c:204
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:212
-msgid "nautilus: --quit and --start-desktop cannot be used together.\n"
-msgstr ""
-
-#: src/nautilus-main.c:216
-msgid "nautilus: --restart and --start-desktop cannot be used together.\n"
+#: src/nautilus-main.c:225
+msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 
-#: src/nautilus-main.c:220
-msgid "nautilus: --stop-desktop and --start-desktop cannot be used together.\n"
+#. set the title and standard close accelerator
+#: src/nautilus-property-browser.c:265
+msgid "Backgrounds and Emblems"
 msgstr ""
 
-#. set the title
-#: src/nautilus-property-browser.c:245
-msgid "Customization Options"
-msgstr ""
-
-#. add the title label
-#: src/nautilus-property-browser.c:308 src/nautilus-property-browser.c:1778
-msgid "Select A Category:"
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:362 src/nautilus-theme-selector.c:267
+msgid "  Done  "
 msgstr ""
 
-#: src/nautilus-property-browser.c:353
-msgid "Add new..."
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:373
+msgid "  Add new...  "
 msgstr ""
 
-#: src/nautilus-property-browser.c:364
-msgid "Remove..."
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:388
+msgid "  Remove...  "
 msgstr ""
 
-#: src/nautilus-property-browser.c:766
+#: src/nautilus-property-browser.c:879
 #, c-format
-msgid "Sorry, but background %s couldn't be deleted."
+msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:767 src/nautilus-property-browser.c:796
-msgid "Couldn't delete background"
+#: src/nautilus-property-browser.c:880 src/nautilus-property-browser.c:909
+#, fuzzy
+msgid "Couldn't delete pattern"
 msgstr "Impossibile cancellare lo sfondo"
 
-#: src/nautilus-property-browser.c:795
+#: src/nautilus-property-browser.c:908
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:900 src/nautilus-property-browser.c:996
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
-msgstr ""
-
-#: src/nautilus-property-browser.c:927
+#: src/nautilus-property-browser.c:944
 msgid "Create a New Emblem:"
 msgstr ""
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:932
+#: src/nautilus-property-browser.c:949
 msgid "Keyword:"
 msgstr ""
 
-#. set up a gnome file entry to pick the image file
-#: src/nautilus-property-browser.c:949
+#. set up a gnome icon entry to pick the image file
+#: src/nautilus-property-browser.c:962
+msgid "Image:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:966
 msgid "Select an image file for the new emblem:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1029
+#: src/nautilus-property-browser.c:993
+msgid "Create a New Color:"
+msgstr ""
+
+#. make the name label and field
+#: src/nautilus-property-browser.c:998
+msgid "Color name:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:1009
+msgid "Color value:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:1045
+#, c-format
+msgid "Sorry, but \"%s\" is not a valid file name."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1047
+msgid "Sorry, but you did not supply a valid file name."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1049 src/nautilus-property-browser.c:1092
+#, fuzzy
+msgid "Couldn't install pattern"
+msgstr "Impossibile installare tema"
+
+#: src/nautilus-property-browser.c:1060
+msgid "Sorry, but you can't replace the reset image."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1091
 #, c-format
-msgid "Sorry, but the background %s couldn't be installed."
+msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1030
-msgid "Couldn't install background"
+#: src/nautilus-property-browser.c:1114
+msgid "Select an image file to add as a pattern:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1055
-msgid "Select an image file to add as a background:"
+#: src/nautilus-property-browser.c:1173
+msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1153
+#: src/nautilus-property-browser.c:1174
+#, fuzzy
+msgid "Couldn't install color"
+msgstr "Impossibile installare tema"
+
+#: src/nautilus-property-browser.c:1230
 msgid "Select a color to add:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1188
-msgid "Sorry, but you must specify a keyword for the new emblem."
+#: src/nautilus-property-browser.c:1311
+#, c-format
+msgid "Sorry, but '%s' is not a usable image file!"
+msgstr ""
+
+#: src/nautilus-property-browser.c:1329
+msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1189 src/nautilus-property-browser.c:1217
+#: src/nautilus-property-browser.c:1330 src/nautilus-property-browser.c:1333
+#: src/nautilus-property-browser.c:1337 src/nautilus-property-browser.c:1366
 msgid "Couldn't install emblem"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1216
+#: src/nautilus-property-browser.c:1332
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1335
+#, c-format
+msgid ""
+"Sorry, but \"%s\" is an existing keyword.  Please choose a different name "
+"for it."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1365
 #, c-format
 msgid "Sorry, but the image at %s couldn't be installed as an emblem."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1786 src/nautilus-theme-selector.c:481
+#: src/nautilus-property-browser.c:2024
+msgid "Select A Category:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:2032 src/nautilus-theme-selector.c:497
 msgid "Cancel Remove"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1790
-msgid "Add a new background"
+#: src/nautilus-property-browser.c:2037
+msgid "  Add a New Pattern  "
 msgstr ""
 
-#: src/nautilus-property-browser.c:1793
-msgid "Add a new color"
+#: src/nautilus-property-browser.c:2040
+msgid "  Add a New Color  "
 msgstr ""
 
-#: src/nautilus-property-browser.c:1796
-msgid "Add a new emblem"
+#: src/nautilus-property-browser.c:2043
+msgid "  Add a New Emblem  "
 msgstr ""
 
-#: src/nautilus-property-browser.c:1820
-msgid "Click on a background to remove it"
+#: src/nautilus-property-browser.c:2066
+msgid "Click on a pattern to remove it"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1823
+#: src/nautilus-property-browser.c:2069
 msgid "Click on a color to remove it"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1826
+#: src/nautilus-property-browser.c:2072
 msgid "Click on an emblem to remove it"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1848
-msgid "Remove a background"
+#: src/nautilus-property-browser.c:2081
+msgid "Patterns:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:2084
+msgid "Colors:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1851
-msgid "Remove a color"
+#: src/nautilus-property-browser.c:2087
+#, fuzzy
+msgid "Emblems:"
+msgstr "per _Simbolo"
+
+#: src/nautilus-property-browser.c:2106
+msgid "  Remove a Pattern  "
 msgstr ""
 
-#: src/nautilus-property-browser.c:1854
-msgid "Remove an emblem"
+#: src/nautilus-property-browser.c:2109
+msgid "  Remove a Color  "
 msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:67
-msgid "Content"
-msgstr "Contenuto"
+#: src/nautilus-property-browser.c:2112
+msgid "  Remove an Emblem  "
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:70
-msgid "With Emblem"
-msgstr "Con simbolo"
+#. Menu item in the search bar.
+#. Bracketed items are context, and are message
+#. strings elsewhere.  You don't have to translate the whole
+#. string, and only the translation for "containing '%s' will
+#. be used.  If you do translate the whole string, leave the
+#. translations of the rest of the text in brackets, so it
+#. will not be used.
+#: src/nautilus-search-bar-criterion.c:74
+msgid "[Search for] Name [contains \"fish\"]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:75
+msgid "[Search for] Content [includes all of \"fish tree\"]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:71
-msgid "Last Modified"
-msgstr "Data ultima modifica"
+#: src/nautilus-search-bar-criterion.c:76
+msgid "[Search for] Type [is regular file]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:72
-msgid "Owned By"
-msgstr "Posseduto da"
+#: src/nautilus-search-bar-criterion.c:77
+msgid "[Search for] Size [larger than 400K]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:78
-msgid "contains"
-msgstr "contiene"
+msgid "[Search for] With Emblem [includes \"Important\"]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:79
-msgid "starts with"
-msgstr "inizia con"
+msgid "[Search for] Last Modified [before yesterday]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:80
-msgid "ends with"
-msgstr "termina con"
-
-#: src/nautilus-search-bar-criterion.c:81
-msgid "matches glob"
+msgid "[Search for] Owner [is not root]"
 msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:82
-msgid "matches regexp"
+#: src/nautilus-search-bar-criterion.c:86
+msgid "[File name] contains [help]"
 msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:87
-msgid "includes all of"
-msgstr "includi tutti di"
+msgid "[File name] starts with [nautilus]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:88
-msgid "includes any of"
-msgstr "include qualunque di"
+msgid "[File name] ends with [.c]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:89
-msgid "does not include all of"
-msgstr "non includere tutti di"
+msgid "[File name] matches glob [*.c]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:90
-msgid "includes none of"
-msgstr "include nessuno di"
+msgid "[File name] matches regexp [\"e??l.$\"]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:95
+msgid "[File content] includes all of [apple orange]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:96
-#: src/nautilus-search-bar-criterion.c:123
-#: src/nautilus-search-bar-criterion.c:138
-msgid "is"
-msgstr "è"
+msgid "[File content] includes any of [apply orange]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:97
-#: src/nautilus-search-bar-criterion.c:124
-#: src/nautilus-search-bar-criterion.c:139
-msgid "is not"
-msgstr "non è"
-
-#: src/nautilus-search-bar-criterion.c:102
-msgid "regular file"
-msgstr "file regolare"
+#, fuzzy
+msgid "[File content] does not include all of [apple orange]"
+msgstr "non includere tutti di"
 
-#: src/nautilus-search-bar-criterion.c:103
-msgid "text file"
-msgstr "file di testo"
+#: src/nautilus-search-bar-criterion.c:98
+msgid "[File content] includes none of [apple orange]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:104
-msgid "application"
-msgstr "applicazione"
+msgid "[File type] is [folder]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:105
-msgid "directory"
-msgstr "directory"
+msgid "[File type] is not [folder]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:110
+#, fuzzy
+msgid "[File type is] regular file"
+msgstr "file regolare"
 
 #: src/nautilus-search-bar-criterion.c:111
-msgid "larger than"
-msgstr "più grande di"
+msgid "[File type is] text file"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:112
-msgid "smaller than"
-msgstr "più piccolo di"
+msgid "[File type is] application"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:117
-msgid "marked with"
-msgstr "marcato con"
+#: src/nautilus-search-bar-criterion.c:113
+msgid "[File type is] folder"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:118
-msgid "not marked with"
-msgstr "non marcato con"
+#: src/nautilus-search-bar-criterion.c:114
+msgid "[File type is] music"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:125
-msgid "is after"
-msgstr "è dopo"
+#: src/nautilus-search-bar-criterion.c:119
+msgid "[File size is] larger than [400K]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:126
-msgid "is before"
-msgstr "è prima"
+#: src/nautilus-search-bar-criterion.c:120
+msgid "[File size is] smaller than [300K]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:128
-msgid "is today"
-msgstr "di oggi"
+#: src/nautilus-search-bar-criterion.c:125
+msgid "[With emblem] marked with [Important]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:129
-msgid "is yesterday"
+#: src/nautilus-search-bar-criterion.c:126
+msgid "[With emblem] not marked with [Important]"
 msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:131
-msgid "is within a week of"
+msgid "[Last modified date] is [1/24/00]"
 msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:132
-msgid "is within a month of"
-msgstr "questo mese"
+msgid "[Last modified date] is not [1/24/00]"
+msgstr ""
 
-#.
-#. *  This file is autogenerated from nautilus-service-ui.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: src/nautilus-service-ui.xml.h:9
-msgid "Display support information for Eazel Services"
+#: src/nautilus-search-bar-criterion.c:133
+msgid "[Last modified date] is after [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:134
+msgid "[Last modified date] is before [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:136
+msgid "[Last modified date] is today"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:137
+msgid "[Last modified date] is yesterday"
 msgstr ""
 
-#: src/nautilus-service-ui.xml.h:10
+#: src/nautilus-search-bar-criterion.c:139
+msgid "[Last modified date] is within a week of [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:140
+msgid "[Last modified date] is within a month of [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:159
+msgid "[File owner] is [root]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:160
+msgid "[File owner] is not [root]"
+msgstr ""
+
+#: src/nautilus-service-ui.xml.h:1
 msgid "Go to the Eazel Services Summary Page"
 msgstr ""
 
-#: src/nautilus-service-ui.xml.h:11
+#: src/nautilus-service-ui.xml.h:2
 msgid "Go to the Eazel Software Catalog"
 msgstr ""
 
-#: src/nautilus-service-ui.xml.h:12
+#: src/nautilus-service-ui.xml.h:3
 msgid "Go to your online storage repository"
 msgstr ""
 
-#: src/nautilus-service-ui.xml.h:13
-msgid "Services"
-msgstr ""
-
-#: src/nautilus-service-ui.xml.h:14
+#: src/nautilus-service-ui.xml.h:5
 msgid "Software _Catalog"
 msgstr ""
 
-#: src/nautilus-service-ui.xml.h:15
+#: src/nautilus-service-ui.xml.h:6
 msgid "_Eazel Services Home"
 msgstr "Servizi Eazel"
 
-#: src/nautilus-service-ui.xml.h:16
+#: src/nautilus-service-ui.xml.h:7
 msgid "_Online Storage"
 msgstr ""
 
-#: src/nautilus-service-ui.xml.h:17
+#: src/nautilus-service-ui.xml.h:8
 msgid "_Services"
 msgstr "Servizi"
 
-#: src/nautilus-service-ui.xml.h:18
-msgid "_Support"
+#: src/nautilus-shell.c:188
+msgid "Caveat"
 msgstr ""
 
-#.
-#. *  This file is autogenerated from nautilus-shell-ui.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: src/nautilus-shell-ui.xml.h:9 src/nautilus-shell-ui.xml.h:101
-msgid " Advanced"
+#: src/nautilus-shell.c:225
+msgid ""
+"Thank you for your interest in Nautilus.\n"
+" \n"
+"As with any software under development, you should exercise caution when "
+"using Nautilus.  Eazel does not provide any guarantee that it will work "
+"properly, or assume any liability for your use of it.  Please use it at your "
+"own risk.\n"
+"\n"
+"Please visit http://www.eazel.com/feedback.html to provide feedback, "
+"comments, and suggestions."
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:10 src/nautilus-shell-ui.xml.h:102
-msgid " Beginner"
+#: src/Nautilus_shell.oaf.in.h:1
+msgid "Factory for Nautilus shell and file manager"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:11 src/nautilus-shell-ui.xml.h:103
-msgid " Intermediate"
+#: src/Nautilus_shell.oaf.in.h:2
+#, fuzzy
+msgid "Icons"
+msgstr "contiene"
+
+#: src/Nautilus_shell.oaf.in.h:3
+msgid "Icons Viewer"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:12 src/nautilus-shell-ui.xml.h:104
-msgid "Add a bookmark for the current location to this menu"
+#: src/Nautilus_shell.oaf.in.h:4
+#, fuzzy
+msgid "List"
+msgstr "è"
+
+#: src/Nautilus_shell.oaf.in.h:5
+msgid "List Viewer"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:13 src/nautilus-shell-ui.xml.h:105
-msgid "Back"
-msgstr "Indietro"
+#: src/Nautilus_shell.oaf.in.h:6
+#, fuzzy
+msgid "Nautilus factory"
+msgstr "Aggiornamento Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:14 src/nautilus-shell-ui.xml.h:106
-msgid "C_hange Appearance..."
+#: src/Nautilus_shell.oaf.in.h:7
+msgid "Nautilus file manager component that shows a scrollable list"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:8
+msgid ""
+"Nautilus file manager component that shows a scrollable list for search "
+"results"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:16 src/nautilus-shell-ui.xml.h:108
+#: src/Nautilus_shell.oaf.in.h:9
+msgid "Nautilus file manager component that shows a two-dimensional icon space"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:10
+msgid "Nautilus file manager component that shows icons on the the desktop"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:11
+msgid "Nautilus file manager desktop icon view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:12
+msgid "Nautilus file manager icon view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:13
+msgid "Nautilus file manager list view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:14
+msgid "Nautilus file manager search results list view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:15
+msgid "Nautilus metafile factory"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:16
+#, fuzzy
+msgid "Nautilus shell"
+msgstr "Aggiornamento Nautilus"
+
+#: src/Nautilus_shell.oaf.in.h:17
+msgid ""
+"Nautilus shell operations that can be done from subsequent command-line "
+"invocations"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:18
+msgid "Produces metafile objects for accessing Nautilus metadata"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:19
+#, fuzzy
+msgid "Search List"
+msgstr "Cerca"
+
+#: src/Nautilus_shell.oaf.in.h:20
+msgid "View as Icons"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:21
+msgid "View as List"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:1
+msgid " _Advanced"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:2
+msgid " _Beginner"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:3
+#, fuzzy
+msgid " _Intermediate"
+msgstr "Intermedio"
+
+#: src/nautilus-shell-ui.xml.h:4
+msgid "Add a bookmark for the current location to this menu"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:6
 msgid "Change the visibility of this window's location bar"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:17 src/nautilus-shell-ui.xml.h:109
+#: src/nautilus-shell-ui.xml.h:7
 msgid "Change the visibility of this window's sidebar"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:18 src/nautilus-shell-ui.xml.h:110
+#: src/nautilus-shell-ui.xml.h:8
 msgid "Change the visibility of this window's status bar"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:19 src/nautilus-shell-ui.xml.h:111
-msgid "Change the visibility of this window's tool bar"
+#: src/nautilus-shell-ui.xml.h:9
+msgid "Change the visibility of this window's toolbar"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:20 src/nautilus-shell-ui.xml.h:112
+#: src/nautilus-shell-ui.xml.h:10
 msgid "Clear contents of Go menu and Back/Forward lists"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:21 src/nautilus-shell-ui.xml.h:113
+#: src/nautilus-shell-ui.xml.h:11
 msgid "Close _All Windows"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:22 src/nautilus-shell-ui.xml.h:114
+#: src/nautilus-shell-ui.xml.h:12
 msgid "Close all Nautilus windows"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:23 src/nautilus-shell-ui.xml.h:115
+#: src/nautilus-shell-ui.xml.h:13
 msgid "Close this window"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:25 src/nautilus-shell-ui.xml.h:117
-msgid "Custo_mization..."
-msgstr ""
-
-#: src/nautilus-shell-ui.xml.h:26 src/nautilus-shell-ui.xml.h:118
-msgid "Cut _Text"
-msgstr "Tagliare testo"
-
-#: src/nautilus-shell-ui.xml.h:28 src/nautilus-shell-ui.xml.h:120
+#: src/nautilus-shell-ui.xml.h:15
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:29 src/nautilus-shell-ui.xml.h:121
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:30 src/nautilus-shell-ui.xml.h:122
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:31 src/nautilus-shell-ui.xml.h:123
-msgid "Display the Property Browser, containing patterns, colors, and emblems"
+#: src/nautilus-shell-ui.xml.h:18
+msgid ""
+"Display patterns, colors, and emblems that can be used to customize "
+"appearance"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:19
+msgid "Display quick reference pages for Nautilus"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:32 src/nautilus-shell-ui.xml.h:124
-msgid "Display the latest contents of the current location"
+#: src/nautilus-shell-ui.xml.h:20
+msgid "Display release notes for Nautilus"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:33 src/nautilus-shell-ui.xml.h:125
-msgid "Display the set of available appearance themes"
+#: src/nautilus-shell-ui.xml.h:21
+msgid "Display support information for Nautilus and Eazel Services"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:22
+msgid "Display the latest contents of the current location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-shell-ui.xml.h:126
-msgid "Edit Settings..."
+#: src/nautilus-shell-ui.xml.h:23
+msgid "Display the set of available appearance themes"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-shell-ui.xml.h:127
-msgid "Edit settings for the current user level"
+#: src/nautilus-shell-ui.xml.h:24
+msgid "Edit various Nautilus preferences"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:36 src/nautilus-shell-ui.xml.h:128
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "Trova"
 
-#: src/nautilus-shell-ui.xml.h:37 src/nautilus-shell-ui.xml.h:129
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:38 src/nautilus-shell-ui.xml.h:130
-msgid "Forward"
-msgstr ""
-
-#: src/nautilus-shell-ui.xml.h:39 src/nautilus-shell-ui.xml.h:131
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr "Vai ai Servizi Eazel"
 
-#: src/nautilus-shell-ui.xml.h:40 src/nautilus-shell-ui.xml.h:132
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:41 src/nautilus-shell-ui.xml.h:133
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:42 src/nautilus-shell-ui.xml.h:134
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:43 src/nautilus-shell-ui.xml.h:135
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:44 src/nautilus-shell-ui.xml.h:136
-#: src/nautilus-window-menus.c:444
-msgid "Hide Location Bar"
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
+msgid "Hide Location _Bar"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:45 src/nautilus-shell-ui.xml.h:137
-#: src/nautilus-window-menus.c:432
-msgid "Hide Sidebar"
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
+msgid "Hide St_atus Bar"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:46 src/nautilus-shell-ui.xml.h:138
-#: src/nautilus-window-menus.c:426
-msgid "Hide Status Bar"
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
+msgid "Hide _Sidebar"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:47 src/nautilus-shell-ui.xml.h:139
-#: src/nautilus-window-menus.c:438
-msgid "Hide Tool Bar"
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
+msgid "Hide _Toolbar"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:48 src/nautilus-shell-ui.xml.h:140
-msgid "Home"
+#: src/nautilus-shell-ui.xml.h:37
+msgid "Nautilus Quick _Reference"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:38
+#, fuzzy
+msgid "Nautilus Release _Notes"
+msgstr "Aggiornamento Nautilus"
+
+#: src/nautilus-shell-ui.xml.h:39
+#, fuzzy
+msgid "Nautilus User _Manual"
+msgstr "Aggiornamento Nautilus"
+
+#: src/nautilus-shell-ui.xml.h:40
+msgid "New Window"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:49 src/nautilus-shell-ui.xml.h:141
-msgid "Nautilus _Feedback..."
+#: src/nautilus-shell-ui.xml.h:41
+msgid "New _Window"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:42
+msgid "Normal Size"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:50 src/nautilus-shell-ui.xml.h:142
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:52 src/nautilus-shell-ui.xml.h:144
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: src/nautilus-shell-ui.xml.h:53 src/nautilus-shell-ui.xml.h:145
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr ""
-
-#: src/nautilus-shell-ui.xml.h:54 src/nautilus-shell-ui.xml.h:146
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:55 src/nautilus-shell-ui.xml.h:147
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:56 src/nautilus-shell-ui.xml.h:148
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:57 src/nautilus-shell-ui.xml.h:149
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:58 src/nautilus-shell-ui.xml.h:150
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
-"Show a page from which you can send feedback about Nautilus to its creators"
+"Show a page from which you can send feedback about Nautilus and Eazel "
+"Services"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:59 src/nautilus-shell-ui.xml.h:151
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:60 src/nautilus-shell-ui.xml.h:152
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:61 src/nautilus-shell-ui.xml.h:153
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:62 src/nautilus-shell-ui.xml.h:154
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:64 src/nautilus-shell-ui.xml.h:156
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:65 src/nautilus-shell-ui.xml.h:157
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:66 src/nautilus-shell-ui.xml.h:159
+#: src/nautilus-shell-ui.xml.h:58
+msgid "Undo the last text change"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:67 src/nautilus-shell-ui.xml.h:160
-msgid "Use Advanced settings"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:68 src/nautilus-shell-ui.xml.h:161
-msgid "Use Beginner settings"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:69 src/nautilus-shell-ui.xml.h:162
-msgid "Use Intermediate settings"
-msgstr "Usa impostazioni Intermedie"
+#: src/nautilus-shell-ui.xml.h:63
+#, fuzzy
+msgid "We_b Search"
+msgstr "Cerca sul web"
 
-#: src/nautilus-shell-ui.xml.h:70 src/nautilus-shell-ui.xml.h:163
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:71 src/nautilus-shell-ui.xml.h:164
+#: src/nautilus-shell-ui.xml.h:65
+msgid "Zoom In"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:66
+msgid "Zoom Out"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:72 src/nautilus-shell-ui.xml.h:165
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:73 src/nautilus-shell-ui.xml.h:166
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:74 src/nautilus-shell-ui.xml.h:167
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:75 src/nautilus-shell-ui.xml.h:168
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:76 src/nautilus-shell-ui.xml.h:169
+#: src/nautilus-shell-ui.xml.h:72
+msgid "_Backgrounds and Emblems..."
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:77 src/nautilus-shell-ui.xml.h:170
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:79 src/nautilus-shell-ui.xml.h:172
+#: src/nautilus-shell-ui.xml.h:76
+msgid "_Customer Support"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:80 src/nautilus-shell-ui.xml.h:173
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:82 src/nautilus-shell-ui.xml.h:175
-#: src/nautilus-window-menus.c:1336
+#: src/nautilus-shell-ui.xml.h:79
+msgid "_Edit Preferences..."
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:80
+msgid "_Feedback"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "_Trova"
 
-#: src/nautilus-shell-ui.xml.h:83 src/nautilus-shell-ui.xml.h:176
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:84 src/nautilus-shell-ui.xml.h:177
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:85 src/nautilus-shell-ui.xml.h:178
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:86 src/nautilus-shell-ui.xml.h:179
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:87 src/nautilus-shell-ui.xml.h:180
-msgid "_Nautilus User Manual"
-msgstr ""
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "Altre applicazioni..."
 
-#: src/nautilus-shell-ui.xml.h:88 src/nautilus-shell-ui.xml.h:181
-msgid "_New Window"
+#: src/nautilus-shell-ui.xml.h:88
+msgid "_Nautilus Themes..."
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:89 src/nautilus-shell-ui.xml.h:182
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:91 src/nautilus-shell-ui.xml.h:184
+#: src/nautilus-shell-ui.xml.h:91
+msgid "_Preferences"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:92 src/nautilus-shell-ui.xml.h:185
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:93 src/nautilus-shell-ui.xml.h:186
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:94 src/nautilus-shell-ui.xml.h:187
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:95 src/nautilus-shell-ui.xml.h:188
-msgid "_Select All"
-msgstr ""
-
-#: src/nautilus-shell-ui.xml.h:96 src/nautilus-shell-ui.xml.h:189
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:97 src/nautilus-shell-ui.xml.h:190
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:98 src/nautilus-shell-ui.xml.h:192
-msgid "_Up a Level"
-msgstr "Risali un livello"
-
-#: src/nautilus-shell-ui.xml.h:99 src/nautilus-shell-ui.xml.h:193
-msgid "_View"
-msgstr ""
-
-#: src/nautilus-shell-ui.xml.h:100 src/nautilus-shell-ui.xml.h:194
-msgid "_Web Search"
-msgstr "Cerca sul web"
-
-#: src/nautilus-shell-ui.xml.h:158
-msgid "Undo the last text change"
-msgstr ""
-
-#: src/nautilus-shell-ui.xml.h:191
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr ""
 
-#: src/nautilus-shell.c:167
-msgid "Caveat"
-msgstr ""
-
-#: src/nautilus-shell.c:203
-msgid ""
-"The Nautilus shell is under development; it's not ready for daily use. Some "
-"features are not yet done, partly done, or unstable. The program doesn't "
-"look or act exactly the way it will in version 1.0.\n"
-"\n"
-"If you do decide to test this version of Nautilus, beware. The program could "
-"do something unpredictable and may even delete or overwrite files on your "
-"computer.\n"
-"\n"
-"For more information, visit http://nautilus.eazel.com."
-msgstr ""
+#: src/nautilus-shell-ui.xml.h:99
+msgid "_Up a Level"
+msgstr "Risali un livello"
 
-#. add the reset background item, possibly disabled
-#: src/nautilus-sidebar.c:444
-msgid "Reset Background"
+#: src/nautilus-shell-ui.xml.h:100
+msgid "_View"
 msgstr ""
 
-#: src/nautilus-sidebar.c:617
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
 msgstr ""
 
-#: src/nautilus-sidebar.c:619
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr ""
 
-#: src/nautilus-sidebar.c:638
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
 msgstr ""
 
-#: src/nautilus-sidebar.c:640
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr ""
 
-#: src/nautilus-sidebar.c:645
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
 msgstr ""
 
-#: src/nautilus-sidebar.c:647
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr ""
 
-#: src/nautilus-sidebar.c:1181
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr ""
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1210
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr ""
 
-#. Create button first so we can use it for auto_click
-#: src/nautilus-simple-search-bar.c:129
-msgid "Find Them!"
+#. FIXME: We don't use spaces to pad labels!
+#: src/nautilus-sidebar.c:1424
+msgid "  Empty Trash  "
 msgstr ""
 
 #: src/nautilus-switchable-search-bar.c:132
-msgid "Search For:"
-msgstr "Cerca per:"
+#, fuzzy
+msgid "Find:"
+msgstr "Trova"
 
-#. set the title
-#: src/nautilus-theme-selector.c:157
+#. set the title and standard close accelerator
+#: src/nautilus-theme-selector.c:170
 msgid "Nautilus Theme Selector"
 msgstr ""
 
 #. add the title label
-#: src/nautilus-theme-selector.c:191
+#: src/nautilus-theme-selector.c:199
 msgid "Nautilus Theme:"
 msgstr ""
 
-#: src/nautilus-theme-selector.c:249
-msgid "Add new theme"
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:278
+msgid "  Add New Theme  "
 msgstr ""
 
-#: src/nautilus-theme-selector.c:261
-msgid "Remove theme"
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:288
+msgid "  Remove Theme  "
 msgstr ""
 
-#: src/nautilus-theme-selector.c:373
+#: src/nautilus-theme-selector.c:400
 #, c-format
-msgid "Sorry, but %s is not a valid theme directory."
+msgid "Sorry, but \"%s\" is not a valid theme folder."
 msgstr ""
 
-#: src/nautilus-theme-selector.c:374
+#: src/nautilus-theme-selector.c:401
 msgid "Couldn't add theme"
 msgstr "Impossibile aggiungere tema"
 
-#: src/nautilus-theme-selector.c:402
+#: src/nautilus-theme-selector.c:429
 #, c-format
-msgid "Sorry, but the theme %s couldn't be installed."
+msgid "Sorry, but the \"%s\" theme couldn't be installed."
 msgstr ""
 
-#: src/nautilus-theme-selector.c:403
+#: src/nautilus-theme-selector.c:430
 msgid "Couldn't install theme"
 msgstr "Impossibile installare tema"
 
-#: src/nautilus-theme-selector.c:444
-msgid "Select a theme directory to add as a new theme:"
+#: src/nautilus-theme-selector.c:463
+msgid "Select a theme folder to add as a new theme:"
 msgstr ""
 
-#: src/nautilus-theme-selector.c:477 src/nautilus-theme-selector.c:527
+#: src/nautilus-theme-selector.c:495 src/nautilus-theme-selector.c:542
 msgid "Click on a theme to remove it."
 msgstr ""
 
-#: src/nautilus-theme-selector.c:530
+#: src/nautilus-theme-selector.c:545
 msgid ""
 "Click on a theme to change the\n"
 "appearance of Nautilus."
 msgstr ""
 
 #. change the add button label back to it's normal state
-#: src/nautilus-theme-selector.c:542
+#: src/nautilus-theme-selector.c:558
 msgid "Add New Theme"
 msgstr ""
 
-#: src/nautilus-theme-selector.c:570
+#: src/nautilus-theme-selector.c:585
 msgid ""
-"Sorry, but you can't remove the current theme.  Please change to another "
-"theme before removing this one"
+"Sorry, but you can't remove the current theme. Please change to another "
+"theme before removing this one."
 msgstr ""
 
-#: src/nautilus-theme-selector.c:571
+#: src/nautilus-theme-selector.c:587
 msgid "Can't delete current theme"
 msgstr ""
 
-#: src/nautilus-theme-selector.c:592
+#: src/nautilus-theme-selector.c:608
 msgid "Sorry, but that theme could not be removed!"
 msgstr ""
 
-#: src/nautilus-theme-selector.c:593
+#: src/nautilus-theme-selector.c:609
 msgid "Couldn't remove theme"
 msgstr "Impossibile rimuovere tema"
 
-#: src/nautilus-theme-selector.c:682
+#: src/nautilus-theme-selector.c:716
 #, c-format
-msgid "No information available for the  %s theme"
+msgid "No description available for the \"%s\" theme"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:213 src/nautilus-window-menus.c:629
-msgid "Nautilus"
+#: src/nautilus-window.c:637
+msgid "View as ..."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:574
-#, c-format
-msgid "You do not have the permissions necessary to view \"%s\"."
+#. Add "View as Other..." extra bonus choice.
+#: src/nautilus-window.c:1317
+msgid "View as Other..."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:576
-msgid "Inadequate Permissions"
+#: src/nautilus-window.c:1722
+msgid "Close"
+msgstr ""
+
+#. FIXME bugzilla.eazel.com 5037: The text Preview
+#. * Release is hardcoded here. Are all builds with
+#. * time stamps really best described as "preview
+#. * release"?.
+#.
+#: src/nautilus-window-manage-views.c:216
+#, c-format
+msgid "Preview Release %s: %s"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:740
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:751
+#: src/nautilus-window-manage-views.c:831
+#, c-format
+msgid ""
+"The %s view encountered an error and can't continue. You can choose another "
+"view or go to a different location."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:842
+#, c-format
+msgid "The %s view encountered an error while starting up."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:755
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
 "happening, you might want to turn this panel off."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:760
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1126
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1132
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1146
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
-"Couldn't display \"%s\", because Nautilus cannot handle items of this "
-"unknown type."
+"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
+"it is."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1150
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot handle items of type \"%s\"."
+msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr ""
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1162
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1168
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1173
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1178
+#: src/nautilus-window-manage-views.c:1287
 #, c-format
 msgid ""
-"Couldn't display \"%s\", because the host couldn't be found. Check that your "
-"proxy settings are correct."
+"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
+"the spelling is correct and that your proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1184
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
 "proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1196
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -5148,155 +9664,325 @@ msgid ""
 "running."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1200
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1204
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr ""
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:317
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
 msgstr ""
 
-#: src/nautilus-window-menus.c:320
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
 
-#: src/nautilus-window-menus.c:325
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr ""
 
-#: src/nautilus-window-menus.c:326
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr ""
 
-#: src/nautilus-window-menus.c:427
-msgid "Show Status Bar"
+#: src/nautilus-window-menus.c:466
+msgid "Show St_atus Bar"
 msgstr ""
 
-#: src/nautilus-window-menus.c:433
-msgid "Show Sidebar"
+#: src/nautilus-window-menus.c:472
+msgid "Show _Sidebar"
 msgstr ""
 
-#: src/nautilus-window-menus.c:439
-msgid "Show Tool Bar"
+#: src/nautilus-window-menus.c:478
+msgid "Show _Toolbar"
 msgstr ""
 
-#: src/nautilus-window-menus.c:445
-msgid "Show Location Bar"
+#: src/nautilus-window-menus.c:484
+msgid "Show Location _Bar"
 msgstr ""
 
-#. Localizers: This is the message in the dialog that appears if the user chooses "Edit Beginner Settings".
-#. * The first %s is the name of the lowest user level ("Beginner"). The 2nd and 4th %s are the
-#. * names of the middle user level ("Intermediate"). The 3rd %s is the name of the highest user
-#. * level ("Advanced").
-#.
-#: src/nautilus-window-menus.c:528
-#, c-format
-msgid ""
-"None of the settings for the %s level can be edited. If you want to edit the "
-"settings you must choose the %s or %s level. Do you want to switch to the %s "
-"level now and edit its settings?"
+#: src/nautilus-window-menus.c:535
+msgid "Preferences"
 msgstr ""
 
-#. Localizers: This is the title of the dialog that appears if the user chooses "Edit Beginner Settings".
-#. * The %s is the name of the middle user level ("Intermediate").
+#. Localize to deal with
+#. * issues in the copyright
+#. * symbol characters -- do
+#. * not translate the
+#. * company name, please.
 #.
-#: src/nautilus-window-menus.c:540
-#, c-format
-msgid "Switch to %s Level?"
+#: src/nautilus-window-menus.c:618
+msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr ""
 
-#: src/nautilus-window-menus.c:633
+#: src/nautilus-window-menus.c:620
 msgid ""
-"Nautilus is a graphical shell \n"
-"for GNOME that makes it \n"
-"easy to manage your files \n"
+"Nautilus is a graphical shell\n"
+"for GNOME that makes it\n"
+"easy to manage your files\n"
 "and the rest of your system."
 msgstr ""
 
-#: src/nautilus-window-menus.c:773
+#. translators should localize the following
+#. * string which will be displayed at the
+#. * bottom of the about box to give credit
+#. * to the translator(s)
+#.
+#: src/nautilus-window-menus.c:629
+msgid "Translator Credits"
+msgstr ""
+
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
 "this location from your list?"
 msgstr ""
 
-#: src/nautilus-window-menus.c:777
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr ""
 
-#: src/nautilus-window-menus.c:791
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr ""
 
-#: src/nautilus-window-menus.c:792
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr ""
 
-#: src/nautilus-window-menus.c:854
-msgid "Go to the specified location"
+#: src/nautilus-window-menus.c:877
+msgid "Go to the location specified by this bookmark"
 msgstr ""
 
-#: src/nautilus-window-menus.c:1335
-msgid "_Browse"
-msgstr ""
+#: src/nautilus-window-toolbars.c:402
+msgid "Back"
+msgstr "Indietro"
 
-#. Localizers: This is the title of the user-level settings
-#. * dialog. %s will be replaced with the name of a user level
-#. * ("Beginner", "Intermediate", or "Advanced").
-#.
-#: src/nautilus-window-menus.c:1531
-#, c-format
-msgid "Edit %s Settings"
+#: src/nautilus-window-toolbars.c:404
+msgid "Forward"
 msgstr ""
 
-#. Localizers: This is the label for the menu item that brings
-#. * up the user-level settings dialog. %s will be replaced with
-#. * the name of a user level ("Beginner", "Intermediate", or
-#. * "Advanced").
+#. Note to localizers: this font is used for the number in the
+#. * zoom control widget.
 #.
-#: src/nautilus-window-menus.c:1553
-#, c-format
-msgid "Edit %s Settings..."
-msgstr ""
+#: src/nautilus-zoom-control.c:531
+msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
+msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 
-#: src/nautilus-window.c:1008
-#, c-format
-msgid "View as %s..."
-msgstr ""
+#~ msgid "System"
+#~ msgstr "Sistema"
 
-#. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1030
-msgid "View as Other..."
-msgstr ""
+#~ msgid "Command Line"
+#~ msgstr "Linea di comando"
 
-#: src/nautilus-window.c:1377
-msgid "Close"
-msgstr ""
+#~ msgid "APIs"
+#~ msgstr "APIs"
 
-#: src/nautilus-zoom-control.c:328
-msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
-msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
+#~ msgid "Miscellaneous"
+#~ msgstr "Miscellanea"
 
-#. This is marked for localization in case the % sign is not
-#. * appropriate in some locale. I guess that's unlikely.
-#.
-#: src/nautilus-zoom-control.c:565
-msgid "%.0f%%"
-msgstr ""
+#~ msgid "Mozilla Test"
+#~ msgstr "Test Mozilla"
+
+#~ msgid "_Mozilla Test"
+#~ msgstr "Test _Mozilla"
+
+#~ msgid "Verifying %s..."
+#~ msgstr "Verica di %s..."
+
+#~ msgid "Uninstall failed..."
+#~ msgstr "Disinstallazione fallita..."
+
+#~ msgid "Install failed..."
+#~ msgstr "Installazione fallita..."
+
+#~ msgid "Package Title"
+#~ msgstr "Titolo pacchetto"
+
+#~ msgid "Size: "
+#~ msgstr "Dimensione: "
+
+#~ msgid "<size>"
+#~ msgstr "<dimensione>"
+
+#~ msgid "<unknown>"
+#~ msgstr "<sconociuto>"
+
+#~ msgid "License: "
+#~ msgstr "Licenza: "
+
+#~ msgid "Build Date: "
+#~ msgstr "Data creazione: "
+
+#~ msgid "Vendor: "
+#~ msgstr "Distributore: "
+
+#~ msgid "Update"
+#~ msgstr "Aggiorna"
+
+#~ msgid "Package Contents: %d files"
+#~ msgstr "Contenuto pacchetto: %d file"
+
+#~ msgid "Package \"%s\" "
+#~ msgstr "Pacchetto \"%s\" "
+
+#~ msgid "Force install"
+#~ msgstr "Forza installazione"
+
+#~ msgid "Set port numer (80)"
+#~ msgstr "Imposta numero della porta (80)"
+
+#~ msgid "Set tmp dir (/tmp)"
+#~ msgstr "Imposta directory temporanea (/tmp)"
+
+#~ msgid "Reading the install package list %s"
+#~ msgstr "Lettura della lista dei pacchetti di installazione %s"
+
+#~ msgid "Category = %s"
+#~ msgstr "Categoria = %s"
+
+#~ msgid "Removing package %s-%s-%s (0x%x) %s"
+#~ msgstr "Rimozione pacchetto %s-%s-%s (0x%x) %s"
+
+#~ msgid "Preparing package system"
+#~ msgstr "Preparazione del sistema dei pacchetti"
+
+#~ msgid "Dependencies appear ok"
+#~ msgstr "Le dipendenze sono soddisfatte"
+
+#~ msgid "Could not retrieve a URL for id %s"
+#~ msgstr "Impossibile prelevare la URL per id %s"
+
+#~ msgid "Package %s conflicts with %s-%s"
+#~ msgstr "Il pacchetto %s è in conflitto con %s-%s"
+
+#~ msgid "Downloading package %s ..."
+#~ msgstr "Prelievo pacchetto %s ..."
+
+#~ msgid "Preparing to install 1 package"
+#~ msgstr "In preparazione l'installazione di 1 pacchetto"
+
+#~ msgid "Preparing to install %d packages"
+#~ msgstr "In preparazione l'installazione di %d pacchetti"
+
+#~ msgid "Installation aborted."
+#~ msgstr "Installazione interrotta."
+
+#~ msgid ""
+#~ "Installation Failed!\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Installazione fallita!\n"
+#~ "\n"
+
+#~ msgid "Welcome Back %s!"
+#~ msgstr "Bentornato %s!"
+
+#~ msgid "Your Services"
+#~ msgstr "I tuoi Servizi"
+
+#~ msgid "Additional Services"
+#~ msgstr "Servizi addizionali"
+
+#~ msgid "Version %s"
+#~ msgstr "versione %s"
+
+#~ msgid "update the system clock"
+#~ msgstr "aggiorna orologio di sistema"
+
+#~ msgid "specify time server"
+#~ msgstr "specifica il server per l'orario"
+
+#~ msgid "Could not read time-service config from %s"
+#~ msgstr "Impossibile prelevare la URL per %s"
+
+#~ msgid "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*"
+#~ msgstr "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*"
+
+#~ msgid "applications"
+#~ msgstr "applicazioni"
+
+#~ msgid "directories"
+#~ msgstr "directory"
+
+#~ msgid "marked with \"%s\""
+#~ msgstr "marcato con \"%s\""
+
+#~ msgid "User Main Directory"
+#~ msgstr "Directory Principale Utente"
+
+#~ msgid "Desktop Directory"
+#~ msgstr "Directory Desktop"
+
+#~ msgid "Missing Directories"
+#~ msgstr "Directory mancanti"
+
+#~ msgid "Updating Nautilus"
+#~ msgstr "Aggiornamento di Nautilus"
+
+#~ msgid "Sign Up for Eazel Services"
+#~ msgstr "Iscriviati ai Servizi Eazel"
+
+#~ msgid "With Emblem"
+#~ msgstr "Con simbolo"
+
+#~ msgid "Last Modified"
+#~ msgstr "Data ultima modifica"
+
+#~ msgid "Owned By"
+#~ msgstr "Posseduto da"
+
+#~ msgid "starts with"
+#~ msgstr "inizia con"
+
+#~ msgid "includes all of"
+#~ msgstr "includi tutti di"
+
+#~ msgid "includes any of"
+#~ msgstr "include qualunque di"
+
+#~ msgid "includes none of"
+#~ msgstr "include nessuno di"
+
+#~ msgid "is not"
+#~ msgstr "non è"
+
+#~ msgid "directory"
+#~ msgstr "directory"
+
+#~ msgid "larger than"
+#~ msgstr "più grande di"
+
+#~ msgid "smaller than"
+#~ msgstr "più piccolo di"
+
+#~ msgid "marked with"
+#~ msgstr "marcato con"
+
+#~ msgid "not marked with"
+#~ msgstr "non marcato con"
+
+#~ msgid "is after"
+#~ msgstr "è dopo"
+
+#~ msgid "is before"
+#~ msgstr "è prima"
 
+#~ msgid "Use Intermediate settings"
+#~ msgstr "Usa impostazioni Intermedie"
diff --git a/po/ja.po b/po/ja.po
index 0a3e140bf..72eacf576 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,10 +4,15 @@
 # Takuo Kitame <kitame@debian.org>, 2001.
 # Yukihiro Nakai <nakai@gnome.gr.jp>, 2001.
 #
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus CVS-20010221\n"
-"POT-Creation-Date: 2001-03-13 09:53+0900\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-02-22 23:33-0500\n"
 "Last-Translator: Takuo KITAME <kitame@debian.org>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -142,8 +147,8 @@ msgid "Previous"
 msgstr "Ìá¤ë"
 
 #: components/help/converters/gnome-db2html2/gdb3html.c:721
-#: libnautilus-extensions/nautilus-global-preferences.c:686
-#: src/nautilus-shell-ui.xml.h:38
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "¥Û¡¼¥à"
 
@@ -332,16 +337,14 @@ msgid "Kernel Routines"
 msgstr ""
 
 #: components/help/hyperbola-filefmt.c:703
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
 msgid "Info"
 msgstr "Info"
 
-#: components/help/hyperbola-nav-tree.c:279
+#: components/help/hyperbola-nav-tree.c:310
 msgid "Introductory Documents:"
 msgstr ""
 
-#: components/help/hyperbola-nav-tree.c:293
+#: components/help/hyperbola-nav-tree.c:324
 msgid "Documents by Subject:"
 msgstr ""
 
@@ -414,7 +417,7 @@ msgstr "¥µ¥¤¥É¥Ð¡¼¥Ñ¥Í¥ë¤ÎÍúÎò"
 msgid "History sidebar panel for Nautilus"
 msgstr "Nautilus ¤Î¥µ¥¤¥É¥Ð¡¼¥Ñ¥Í¥ë¤ÎÍúÎò"
 
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "Bonobo ¤ò½é´ü²½¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
 
@@ -472,7 +475,7 @@ msgstr "¸Å¤¤¥³¥ó¥Æ¥ó¥Ä¥Ó¥å¡¼¤ò KILL ¤·¤Þ¤¹"
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "¥Õ¥¡¥¤¥ë(_F)"
 
@@ -556,7 +559,7 @@ msgid "Sidebar Loser"
 msgstr "¥µ¥¤¥É¥Ð¡¼¥ë¡¼¥¶¡¼"
 
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -566,7 +569,7 @@ msgstr ""
 "  %s"
 
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -1007,7 +1010,6 @@ msgid "Oldies"
 msgstr "¥ª¡¼¥ë¥Ç¥£¡¼¥º"
 
 #: components/music/mpg123.c:32
-#: libnautilus-extensions/nautilus-font-picker.c:117
 msgid "Other"
 msgstr "¤½¤Î¾"
 
@@ -1620,8 +1622,8 @@ msgstr ""
 "¤¢¤ë¤¤¤Ï¥µ¥¦¥ó¥É¥«¡¼¥É¤ò¥Ö¥í¥Ã¥¯¤·¤Æ¤¤¤ë, "
 "¤Þ¤¿¤Ï¥µ¥¦¥ó¥É¥«¡¼¥É¤¬Å¬ÀÚ¤ËÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤Åù¤ÎÍýͳ¤Ç, "
 "¥ß¥å¡¼¥¸¥Ã¥¯¥Ó¥å¡¼¤Ï¸½ºßºÆÀ¸¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó. "
-"¥µ¥¦¥ó¥É¥«¡¼¥É¤ò»È¤Ã¤Æ¥Ö¥í¥Ã¥¯¤·¤Æ¤¤¤ë²ÄǽÀ­¤Î¤¢¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò½ªÎ»¤·¤Æ»¢ "
-"¤Æ¤¯¤À¤µ¤¤¡¥¢"
+"¥µ¥¦¥ó¥É¥«¡¼¥É¤ò»È¤Ã¤Æ¥Ö¥í¥Ã¥¯¤·¤Æ¤¤¤ë²ÄǽÀ­¤Î¤¢¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò½ªÎ»¤·¤Æ»"
+"¢ ¤Æ¤¯¤À¤µ¤¤¡¥¢"
 
 #: components/music/nautilus-music-view.c:1178
 msgid "Unable to Play File"
@@ -1649,10 +1651,10 @@ msgid "Pause"
 msgstr "°ì»þÄä»ß"
 
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:945
-#: libnautilus-extensions/nautilus-file-operations.c:960
 #: libnautilus-extensions/nautilus-file-operations.c:979
-#: src/nautilus-shell-ui.xml.h:60
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Ää»ß"
 
@@ -1702,23 +1704,6 @@ msgstr "¥ß¥å¡¼¥¸¥Ã¥¯¥Ó¥å¡¼¥Õ¥¡¥¯¥È¥ê"
 msgid "View as Music"
 msgstr "¥ß¥å¡¼¥¸¥Ã¥¯¤Çɽ¼¨"
 
-#. FIXME: eventually, get this from preferences
-#. set up the default font
-#: components/notes/nautilus-notes.c:200
-#: components/text/nautilus-text-view.c:186
-#: libnautilus-extensions/nautilus-global-preferences.c:1118
-#: libnautilus-extensions/nautilus-icon-container.c:3332
-#: libnautilus-extensions/nautilus-icon-container.c:3333
-#: libnautilus-extensions/nautilus-icon-container.c:3334
-#: libnautilus-extensions/nautilus-icon-container.c:3335
-#: libnautilus-extensions/nautilus-icon-container.c:3336
-#: libnautilus-extensions/nautilus-icon-container.c:3337
-#: libnautilus-extensions/nautilus-icon-container.c:3338
-#: libnautilus-extensions/nautilus-preferences-item.c:482
-#: src/nautilus-sidebar-title.c:500
-msgid "helvetica"
-msgstr "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*"
-
 #: components/notes/Nautilus_View_notes.oaf.in.h:1
 msgid "Factory for annotation view"
 msgstr "Ãí¼á¥Ó¥å¡¼¤Î¥Õ¥¡¥¯¥È¥ê"
@@ -1810,7 +1795,7 @@ msgstr "¸¡º÷ CGI ¤ò»ØÄꤹ¤ë"
 #: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
 #: components/services/install/command-line/eazel-test-packsys.c:590
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "¥Ç¥Ð¥Ã¥°¤Î½ÐÎϤòɽ¼¨¤¹¤ë"
 
@@ -1874,307 +1859,310 @@ msgstr "RPM °ú¿ô¤Ï̾Á°¤ÎÉÕ¤¤¤¿¥Õ¥¡¥¤¥ë¤Ç¤¹"
 msgid "Run Query"
 msgstr "Ì䤤¹ç¤ï¤»¤Î¼Â¹Ô"
 
-#. Disabled for 1.0
-#. {"revert", 'r', POPT_ARG_NONE, &arg_revert, 0, N_("Revert"), NULL},
-#: components/services/install/command-line/eazel-alt-install-corba.c:127
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
+#, fuzzy
+msgid "Revert"
+msgstr "¤·¤Ê¤¤"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr "root ¤ÎÀßÄê"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:128
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "¥µ¡¼¥Ð¤ò»ØÄꤹ¤ë"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:129
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
 msgid "Dont print too much, just problems and download"
 msgstr "°õºþ¤·¤¹¤®¤Ê¤¤¤Ç¡¢ÌäÂêÅÀ¤È¥À¥¦¥ó¥í¡¼¥É¤À¤±¤Ë¤¹¤ë"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:130
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr "SSL¥ê¥Í¡¼¥à¤Î¼Â¹Ô"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:131
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
 msgid "argument is a suite id"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "¥Æ¥¹¥È¼Â¹Ô¤ò¤¹¤ë"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr "¥æ¡¼¥¶Ì¾¤òµö²Ä¤¹¤ë"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:134
-#: components/services/install/lib/eazel-install-problem.c:1015
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "¥¢¥Ã¥×¥°¥ì¡¼¥É¤òµö²Ä¤¹¤ë"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "¾éĹ¤Ê½ÐÎϤò¤¹¤ë"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:136
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
 msgid "Install a specific package version"
 msgstr "ÆÃÄê¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:159
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
 msgid "*** You cannot specify more then one protocol type.\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:176
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
 msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:285
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, c-format
 msgid "File conflict checking %s...\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:299
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, c-format
 msgid "File uniqueness checking %s...\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:313
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
 #, c-format
 msgid "Feature consistency checking %s...\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:344
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
 #: components/services/install/lib/eazel-install-protocols.c:116
 #: components/services/install/lib/eazel-install-protocols.c:254
 #, c-format
 msgid "Downloading %s..."
 msgstr "%s ¤«¤é¥À¥¦¥ó¥í¡¼¥ÉÃæ..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:360
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
 msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:368
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
 msgid "Downloading %s... (%d/%d) = %d%%"
 msgstr "%s ¤ò¥À¥¦¥ó¥í¡¼¥ÉÃæ...(%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:376
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
 #, c-format
 msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:381
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
 #, c-format
 msgid "Downloading %s... %3.1f KB/s Done\n"
 msgstr "%s ¤ò¥À¥¦¥ó¥í¡¼¥ÉÃæ... %3.1f KB/s Done\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:409
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:417
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:439
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:446
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:454
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
 msgid "Done\n"
 msgstr "´°Î»\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:474
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
 #, c-format
 msgid "Download of %s FAILED\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:496
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
 #, c-format
 msgid "Package %s failed to uninstall.\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:498
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
 #, c-format
 msgid "Package %s failed to install.\n"
 msgstr ""
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:519
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
 #, c-format
-msgid "\t7 Problem : %s\n"
+msgid "\t· Problem : %s\n"
 msgstr ""
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:528
-#, c-format
-msgid "\t7 Action : %s\n"
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
+#, fuzzy, c-format
+msgid "\t· Action : %s\n"
 msgstr "\t7 ¥¢¥¯¥·¥ç¥ó : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:571
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
 msgid "Cancelling operation\n"
 msgstr "Áàºî¤ò¥­¥ã¥ó¥»¥ë\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:582
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
 #, c-format
 msgid "About to install a total of %d packages, %dKB\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:586
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
 #, c-format
 msgid "About to uninstall a total of %d packages, %dKB\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:590
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
 #, c-format
 msgid "About to revert a total of %d packages, %d KB\n"
 msgstr ""
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:607
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
 #, c-format
-msgid "\t7 %s and it's dependencies\n"
+msgid "\t· %s and it's dependencies\n"
 msgstr ""
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:610
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
 #, c-format
-msgid "\t7 %s\n"
+msgid "\t· %s\n"
 msgstr ""
 
 #. I18N note: the (y/n) is translateable. There is later a 1 character
 #. string with the context "y" which is the "yes" indicator.
-#. If you eg. translate this to Danish : "Fortsæô (j/n) " and
+#. If you eg. translate this to Danish : "Fortsæt (j/n) " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:638
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
 msgid "Save transaction report ? (y/n) "
 msgstr ""
 
 #. I18N note: y is the letter for the word Yes. This is
 #. used in the response for a yes/no questions. Your translation
 #. must be 1 character only.
-#: components/services/install/command-line/eazel-alt-install-corba.c:649
-#: components/services/install/command-line/eazel-alt-install-corba.c:769
-#: components/services/install/command-line/eazel-alt-install-corba.c:811
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
 msgid "y"
 msgstr "y"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:670
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
 #, c-format
 msgid "Dependency : %s needs %s\n"
 msgstr ""
 
 #. I18N note: %s is a package name
-#: components/services/install/command-line/eazel-alt-install-corba.c:688
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
 #, c-format
 msgid "Package %s failed md5 check!\n"
 msgstr ""
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:690
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
 #, c-format
-msgid "\t7 server MD5 checksum is %s\n"
+msgid "\t· server MD5 checksum is %s\n"
 msgstr ""
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:692
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
 #, c-format
-msgid "\t7 actual MD5 checksum is %s\n"
+msgid "\t· actual MD5 checksum is %s\n"
 msgstr ""
 
 #. I18N note: the (y/n) is translateable. There is later a 1 character
 #. string with the context "y" which is the "yes" indicator.
-#. If you eg. translate this to Danish : "Fortsæô (j/n " and
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:758
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
 msgid "Continue? (y/n) "
 msgstr ""
 
 #. I18N note: the (y/n) is translateable. There is later a 1 character
 #. string with the context "y" which is the "yes" indicator.
-#. If you eg. translate this to Danish : "Fortsæô (j/n " and
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:799
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
 msgid "Should I delete the RPM files? (y/n) "
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:831
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
 msgid "Operation ok\n"
 msgstr "¥ª¥Ú¥ì¡¼¥·¥ç¥óÀ®¸ù\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:833
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
 msgid "Operation failed\n"
 msgstr "¥ª¥Ú¥ì¡¼¥·¥ç¥ó¼ºÇÔ\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:959
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
 msgid "Installing"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:968
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
 msgid "Uninstalling"
 msgstr "¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:983
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
 msgid "Only one operation at a time please."
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:988
-#: components/services/install/command-line/eazel-alt-install-corba.c:996
-#: components/services/install/command-line/eazel-alt-install-corba.c:1040
-#: components/services/install/command-line/eazel-alt-install-corba.c:1047
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
 #, c-format
 msgid "%s: --help for usage\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
 #, c-format
 msgid "Name         : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
 #, c-format
 msgid "Version      : %s\n"
 msgstr "¥Ð¡¼¥¸¥ç¥ó: %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1014
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
 #, c-format
 msgid "Minor        : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
 #, c-format
 msgid "Size         : %d\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
 #, c-format
 msgid "Arch         : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
 #, c-format
 msgid "Distribution : %s\n"
 msgstr "¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó: %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1019
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
 #, c-format
 msgid "Description  : %s\n"
 msgstr "ÀâÌÀ : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1021
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
 #, c-format
 msgid "Install root : %s\n"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë root : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1024
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
 msgid "Provides     : \n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1066
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
 #, c-format
 msgid "exit code %d\n"
 msgstr ""
@@ -2189,122 +2177,129 @@ msgid "Use specified file to generate a package list, requires --packagelist"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤òÀ¸À®¤¹¤ë¤¿¤á¤Ë»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤ò»È¤¦, --packagelist ¤¬É¬Í×"
 
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 msgid "Softcat server to connect to"
 msgstr "Àܳ¤¹¤ëSoftcat¥µ¡¼¥Ð"
 
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr "softcat¥æ¡¼¥¶¤Çammonite¤ÇÀܳ"
 
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 msgid "Number of times to try the request"
 msgstr "¥ê¥¯¥¨¥¹¥È¤ò¥È¥é¥¤¤¹¤ë²ó¿ô"
 
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr "Eazel¥Ñ¥Ã¥±¡¼¥¸ID¤Ç¸¡º÷"
 
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+#, fuzzy
+msgid "Lookup package that features a feature/file"
 msgstr "µ¡Ç½/¥Õ¥¡¥¤¥ë¤ò»ý¤Ä¥Ñ¥Ã¥±¡¼¥¸¤ò¸¡º÷"
 
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr "ÆÃÄê¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸¡º÷"
 
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr "(--version¤Ç) >= ¤Ë¤è¤ëÈæ³Ó¤ò»È¤¦"
 
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 msgid "use check function (for debugging)"
 msgstr "¥Á¥§¥Ã¥¯´Ø¿ô¤ò»È¤¦(¥Ç¥Ð¥Ã¥°ÍÑ)"
 
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 msgid "Show detailed sub-package info"
 msgstr "¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤Î¾Ü¤·¤¤¾ðÊó¤òɽ¼¨"
 
-#: components/services/install/lib/eazel-install-logic2.c:102
+#: components/services/install/command-line/eazel-test-softcat.c:66
+#, fuzzy
+msgid "enable funk parser"
+msgstr "¹â®¸¡º÷¤ò¤¹¤ë"
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "¥À¥¦¥ó¥í¡¼¥É¤·¤¿¥Õ¥¡¥¤¥ë¤Î¥í¥Ã¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: components/services/install/lib/eazel-install-logic2.c:119
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "MD5¤ÎÉÔ°ìÃס¢¥Ñ¥Ã¥±¡¼¥¸%s¤ÏÃÖ¤­´¹¤ï¤Ã¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó"
 
-#: components/services/install/lib/eazel-install-logic2.c:135
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, c-format
 msgid "No MD5 available for %s"
 msgstr "\"%s\" ¤Î¤¿¤á¤Î MD5 ¤Ï¤¢¤ê¤Þ¤»¤ó"
 
 #. I18N note: "%is is ok" in the sense that %s=package name and the
 #. package is intact
-#: components/services/install/lib/eazel-install-logic2.c:330
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, c-format
 msgid "%s is ok"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:436
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s ¥Ð¡¼¥¸¥ç¥ó %s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: components/services/install/lib/eazel-install-logic2.c:440
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s ¥Ð¡¼¥¸¥ç¥ó %s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: components/services/install/lib/eazel-install-logic2.c:449
-#: components/services/install/lib/eazel-install-logic2.c:454
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr "%s¤ò¥Ð¡¼¥¸¥ç¥ó%s-%s¤«¤é%s-%s¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Æ¤¤¤Þ¤¹"
 
-#: components/services/install/lib/eazel-install-logic2.c:463
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr "%s¤ò¥Ð¡¼¥¸¥ç¥ó%s-%s¤«¤é%s-%s¤Ë¥À¥¦¥ó¥°¥ì¡¼¥É¤·¤Æ¤¤¤Þ¤¹"
 
-#: components/services/install/lib/eazel-install-logic2.c:468
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr "%s¤ò¥Ð¡¼¥¸¥ç¥ó%s¤«¤é%s¤Ë¥À¥¦¥ó¥°¥ì¡¼¥É¤·¤Æ¤¤¤Þ¤¹"
 
-#: components/services/install/lib/eazel-install-logic2.c:521
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr "%s¤Î¥Ð¡¼¥¸¥ç¥ó%s-%s¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Þ¤¹"
 
-#: components/services/install/lib/eazel-install-logic2.c:526
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr "%s¤Î¥Ð¡¼¥¸¥ç¥ó%s¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Þ¤¹"
 
-#: components/services/install/lib/eazel-install-logic2.c:693
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, c-format
 msgid "Loading package info from file %s"
 msgstr ""
 
 #. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
-#: components/services/install/lib/eazel-install-logic2.c:1010
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "ok"
 msgstr "ÌäÂê̵¤·"
 
-#: components/services/install/lib/eazel-install-logic2.c:1010
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "not ok"
 msgstr "ÌäÂêºß¤ê"
 
-#: components/services/install/lib/eazel-install-logic2.c:1176
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
 msgid "Checking dependencies for %s"
 msgstr ""
@@ -2312,107 +2307,107 @@ msgstr ""
 #. I18N note: both %s' are package names.
 #. related is in the sense that the two packages apparently
 #. are connected somehow, eg. foo and foo-devel
-#: components/services/install/lib/eazel-install-logic2.c:1800
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, c-format
 msgid "%s is related to %s"
 msgstr "%s ¤Ï %s ¤Ë´Ø·¸"
 
-#: components/services/install/lib/eazel-install-logic2.c:1876
+#: components/services/install/lib/eazel-install-logic2.c:2090
 #, c-format
 msgid "updating %s to version %s-%s solves conflict"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1899
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
 msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1906
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, c-format
 msgid "could not revive %s"
 msgstr "%s¤ò¸µ¤ËÌ᤹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: components/services/install/lib/eazel-install-logic2.c:2061
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
 msgid "file uniqueness checking %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2082
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
 msgid "Duplicate file : %s occurs in %s and %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2094
-#: components/services/install/lib/eazel-install-logic2.c:2248
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
 msgid "... but it's ok, the packages are related"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2102
+#: components/services/install/lib/eazel-install-logic2.c:2324
 #, c-format
 msgid "(there were %d other conflicts)"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2197
+#: components/services/install/lib/eazel-install-logic2.c:2419
 #, c-format
 msgid "file conflict checking %s"
 msgstr "%s ¤Î¾×Æͤ¹¤ë¥Õ¥¡¥¤¥ë¤òÁܺºÃæ"
 
-#: components/services/install/lib/eazel-install-logic2.c:2234
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
 msgid "file conflict : package %s already provides file %s also provided by %s"
 msgstr ""
 
 #. the owner of this file is a package that we're upgrading, and the
 #. * new version no longer has this file, so everything's okay.
-#: components/services/install/lib/eazel-install-logic2.c:2244
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
 msgid "...but it is okay, we're upgrading %s and it ditched that file"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2336
+#: components/services/install/lib/eazel-install-logic2.c:2558
 #, c-format
 msgid "checking feature consistency of %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2404
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
 msgid ""
 "feature missing : %s breaks if %s is installed (feature %s would be lost"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2483
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, c-format
 msgid "downloading %d packages"
 msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É"
 
-#: components/services/install/lib/eazel-install-logic2.c:2753
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, c-format
 msgid "will upgrade %s"
 msgstr "%s ¤Ï¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹"
 
-#: components/services/install/lib/eazel-install-logic2.c:2756
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, c-format
 msgid "will downgrade %s"
 msgstr "%s ¤Ï¥À¥¦¥ó¥°¥ì¡¼¥É¤·¤Þ¤¹"
 
-#: components/services/install/lib/eazel-install-logic2.c:2759
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, c-format
 msgid "will install %s"
 msgstr "%s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹"
 
-#: components/services/install/lib/eazel-install-logic2.c:2762
+#: components/services/install/lib/eazel-install-logic2.c:2960
 #, c-format
 msgid "will uninstall %s"
 msgstr "%s ¤Ï¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹"
 
-#: components/services/install/lib/eazel-install-logic2.c:2847
-#: components/services/install/lib/eazel-install-problem.c:339
+#: components/services/install/lib/eazel-install-logic2.c:3045
 #: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
 #, c-format
 msgid "%s requires %s"
 msgstr "%s ¤Ë¤Ï %s ¤¬É¬ÍפǤ¹"
 
-#: components/services/install/lib/eazel-install-logic2.c:3040
+#: components/services/install/lib/eazel-install-logic2.c:3238
 #, c-format
 msgid "failed %s"
 msgstr "%s ¤Ç¼ºÇÔ¤·¤Þ¤·¤¿"
@@ -2424,42 +2419,42 @@ msgstr "ÀßÄê¥Õ¥¡¥¤¥ë¤«¤é URLType ¤òÀßÄê¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿!"
 #: components/services/install/lib/eazel-install-object.c:717
 msgid "Transactions are not stored, could not find home dir"
 msgstr ""
-"¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤ÏÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡¢¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤òȯ¸«¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¢"
-"¿¢"
+"¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤ÏÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡¢¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤òȯ¸«¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤"
+"¢¿¢"
 
-#: components/services/install/lib/eazel-install-object.c:745
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr "¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤Ï%s¤ËÊݸ¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: components/services/install/lib/eazel-install-object.c:1002
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "¥ê¥â¡¼¥È¥µ¡¼¥Ð¤«¤é¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤ò¼èÆÀÃæ...\n"
 
-#: components/services/install/lib/eazel-install-object.c:1018
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "package-list.xml ¤ò¼è¤ê½Ð¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó!\n"
 
-#: components/services/install/lib/eazel-install-object.c:1091
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr ""
 "¥Õ¥¡¥¤¥ë %s ¤Ë½ñ¤­¹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó, ¥Ç¥Õ¥©¥ë¥È¤Î¥í¥°¥Ï¥ó¥É¥é¤ò»ÈÍѤ·¤Þ¤¹"
 
-#: components/services/install/lib/eazel-install-object.c:1222
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Ï¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: components/services/install/lib/eazel-install-object.c:1268
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¤Ï¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: components/services/install/lib/eazel-install-object.c:1403
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "*** ¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¥Ç¥£¥ì¥¯¥È¥ê (%s) ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿! ***\n"
 
-#: components/services/install/lib/eazel-install-object.c:1426
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr "%s ¤Ø¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤ò½ñ¤­¹þ¤ßÃæ"
@@ -2470,7 +2465,7 @@ msgid "%s was cancelled"
 msgstr "%s ¤Ï¥­¥ã¥ó¥»¥ë¤µ¤ì¤Þ¤·¤¿"
 
 #: components/services/install/lib/eazel-install-problem.c:168
-#: components/services/install/lib/eazel-install-problem.c:331
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
 msgid "%s is a source package, which is not yet supported"
 msgstr "%s ¤Ï¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¹¤¬¡¤¤Þ¤À¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó"
@@ -2502,50 +2497,50 @@ msgid "%s requires %s, which could not be found on the server"
 msgstr "%s¤¬É¬ÍפȤ¹¤ë%s¤Ï¡¢¥µ¡¼¥Ð¤Ë¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
 
 #: components/services/install/lib/eazel-install-problem.c:204
-#, c-format
-msgid "%s could not be found on the server"
+#, fuzzy, c-format
+msgid "%s for %s could not be found on the server"
 msgstr "%s¤Ï¥µ¡¼¥Ð¤Ë¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: components/services/install/lib/eazel-install-problem.c:212
-#: components/services/install/lib/eazel-install-problem.c:357
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr "%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: components/services/install/lib/eazel-install-problem.c:256
+#: components/services/install/lib/eazel-install-problem.c:259
 #, c-format
 msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr ""
 "%s ¤Ï¤è¤ê¿·¤·¤¤¤â¤Î¤Ç¡¢¥À¥¦¥ó¥°¥ì¡¼¥É¤¬É¬ÍפǤ¹¤¬¡¢¥À¥¦¥ó¥°¥ì¡¼¥É¤Ï̵¸ú¤Ç¤¹"
 
-#: components/services/install/lib/eazel-install-problem.c:260
+#: components/services/install/lib/eazel-install-problem.c:263
 #, c-format
 msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr ""
 "%s ¤Ï¤è¤ê¸Å¤¤¤â¤Î¤Ç¤¹¤¬¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¤¬É¬ÍפǤ¹¤¬¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ï̵¸ú¤Ç¤¹"
 
-#: components/services/install/lib/eazel-install-problem.c:350
+#: components/services/install/lib/eazel-install-problem.c:353
 #, c-format
 msgid "%s is not installed and could not be found on server"
 msgstr "%s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤ª¤é¤º¡¢¥µ¡¼¥Ð¤Ë¤â¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:917
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr "%s¤Î¿·¥Ð¡¼¥¸¥ç¥ó¤ò¥Á¥§¥Ã¥¯"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:928
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr "%s¤È%s¤òξÊý¥¤¥ó¥¹¥È¡¼¥ë"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:943
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr "¥·¥¹¥Æ¥à¤«¤é %s ¤òºï½ü¤·¤Þ¤¹"
@@ -2553,21 +2548,21 @@ msgstr "¥·¥¹¥Æ¥à¤«¤é %s ¤òºï½ü¤·¤Þ¤¹"
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:956
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr "%s¤ò¥·¥¹¥Æ¥à¤«¤é¶¯À©Åª¤Ëºï½ü"
 
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:964
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÀ°¹ç¤Î¤È¤ì¤Æ¤¤¤Ê¤¤¤È¤³¤í¤¬¤¢¤ê¤Þ¤¹"
 
-#: components/services/install/lib/eazel-install-problem.c:1012
+#: components/services/install/lib/eazel-install-problem.c:1015
 msgid "Continue with force"
 msgstr "¶¯À©Åª¤Ë¿Ê¤à"
 
-#: components/services/install/lib/eazel-install-problem.c:1018
+#: components/services/install/lib/eazel-install-problem.c:1021
 msgid "Allow downgrade"
 msgstr "¥À¥¦¥ó¥°¥ì¡¼¥É¤òµö²Ä"
 
@@ -2691,94 +2686,94 @@ msgstr "*** ¤ª¤«¤·¤Ê¥Î¡¼¥É°Í¸!"
 msgid "*** Unknown node type '%s'"
 msgstr "*** ÉÔÌÀ¤Ê¥Î¡¼¥É¥¿¥¤¥× '%s'"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:231
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** pkg ¥ê¥¹¥È¥Õ¥¡¥¤¥ë¤Ï¥Ç¡¼¥¿¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:236
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** xml ¥Î¡¼¥É CATEGORIES ¤ò¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:237
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr "*** ¥«¥Æ¥´¥ê¹½Ê¸²òÀϤ«¤éæ½Ð¤·¤Þ¤·¤¿! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:243
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** ¥«¥Æ¥´¥ê¤¬¤¢¤ê¤Þ¤»¤ó! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:244
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr "*** ¥«¥Æ¥´¥ê¹½Ê¸²òÀϤ«¤éæ½Ð¤·¤Þ¤·¤¿! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:298
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** xml ¥Î¡¼¥É TRANSACTION ¤ò¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:300
-#: components/services/install/lib/eazel-install-xml-package-list.c:308
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr "*** ½èÍý¹½Ê¸²òÀϤ«¤éæ½Ð¤·¤Þ¤·¤¿! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:306
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** ¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:342
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** ¥«¥Æ¥´¥ê¤¬¤¢¤ê¤Þ¤»¤ó! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:346
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** xml ¥Î¡¼¥É CATEGORIES ¤ò¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:380
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** ÉÔÌÀ¤Ê¥Î¡¼¥É %s"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:470
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** xml ¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤ÎÀ¸À®Ãæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:517
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** ¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤ÎÆɤ߹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:912
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** osd xml ¤Ï¥Ç¡¼¥¿¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:917
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr "osd parse ¤«¤éæ½Ð¤·¤Þ¤·¤¿! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:993
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "XML ¤ò²òÀϤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿ (Ťµ %d)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:764
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr "%s ¤«¤é¥Ñ¥Ã¥±¡¼¥¸¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò³«¤­¤Þ¤·¤¿"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:769
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr "%s ¤«¤é¥Ñ¥Ã¥±¡¼¥¸¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò³«¤¯¤³¤È¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:802
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr "%s ¤Î¤¿¤á¤Î db ¤òÊĤ¸¤Æ¤¤¤Þ¤¹ (open)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:807
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr "%s ¤Î¤¿¤á¤Î db ¤òÊĤ¸¤Æ¤¤¤Þ¤¹ (not open)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1138
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr "%s ¤ò³«¤±¤Þ¤»¤ó"
@@ -2883,7 +2878,7 @@ msgid "Now installing package \"%s\"."
 msgstr "¤¿¤À¤¤¤Þ ¥Ñ¥Ã¥±¡¼¥¸ \"%s\" ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Þ¤¹"
 
 #: components/services/install-view/callbacks.c:407
-#: components/services/install-view/nautilus-service-install-view.c:897
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "\"%s\" ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Þ¤¹"
@@ -2937,7 +2932,9 @@ msgstr ""
 msgid ""
 "\n"
 "Some packages failed:"
-msgstr "\n¤¤¤¯¤Ä¤«¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¼ºÇÔ:"
+msgstr ""
+"\n"
+"¤¤¤¯¤Ä¤«¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¼ºÇÔ:"
 
 #: components/services/install-view/callbacks.c:626
 msgid "Erase the RPM files?"
@@ -3021,30 +3018,30 @@ msgstr "³¤±¤ë"
 
 #: components/services/install-view/forms.c:482
 #: libnautilus-extensions/nautilus-drag.c:493
-#: src/file-manager/fm-directory-view.c:3551
+#: src/file-manager/fm-directory-view.c:4326
 msgid "Cancel"
 msgstr "¥­¥ã¥ó¥»¥ë"
 
-#: components/services/install-view/nautilus-service-install-view.c:419
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
 msgid "%s is in GNOME (footprint) > %s"
 msgstr "%s ¤Ï GNOME(­·¿) ¤Ë¤¢¤ê¤Þ¤¹ > %s"
 
-#: components/services/install-view/nautilus-service-install-view.c:437
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, c-format
 msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr "%s ¤Ï GNOME (­·¿) ¥á¥Ë¥å¡¼¤Ë¤¢¤ê¤Þ¤¹.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:452
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
 msgid "%s is in the KDE menu.\n"
 msgstr "%s ¤Ï KDE ¥á¥Ë¥å¡¼¤Ë¤¢¤ê¤Þ¤¹.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:653
+#: components/services/install-view/nautilus-service-install-view.c:655
 msgid "Installation Complete"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë´°Î»"
 
-#: components/services/install-view/nautilus-service-install-view.c:708
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
 msgid ""
 "%sTo start %s, click the Launch button below, or to create a shortcut, drag "
@@ -3052,32 +3049,32 @@ msgid ""
 msgstr ""
 
 #. couldn't find an icon
-#: components/services/install-view/nautilus-service-install-view.c:716
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
 msgid "%sTo start %s, click the Launch button below."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:771
+#: components/services/install-view/nautilus-service-install-view.c:773
 msgid "Incorrect password."
 msgstr "´Ö°ã¤Ã¤¿¥Ñ¥¹¥ï¡¼¥É¤Ç¤¹"
 
-#: components/services/install-view/nautilus-service-install-view.c:776
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr "root¤Çǧ¾Ú"
 
-#: components/services/install-view/nautilus-service-install-view.c:893
+#: components/services/install-view/nautilus-service-install-view.c:895
 msgid "Installing packages"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Þ¤¹"
 
-#: components/services/install-view/nautilus-service-install-view.c:895
+#: components/services/install-view/nautilus-service-install-view.c:897
 msgid "Installing remote package"
 msgstr "¥ê¥â¡¼¥È¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Þ¤¹"
 
-#: components/services/install-view/nautilus-service-install-view.c:899
+#: components/services/install-view/nautilus-service-install-view.c:901
 msgid "Installing some package"
 msgstr "¤¤¤¯¤Ä¤«¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¤¤¤Þ¤¹"
 
-#: components/services/install-view/nautilus-service-install-view.c:916
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
@@ -3085,23 +3082,23 @@ msgstr ""
 "Eazel¥¤¥ó¥¹¥È¡¼¥ë¥µ¡¼¥Ó¥¹¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó:\n"
 "¥¤¥ó¥¹¥È¡¼¥ë¤ÏÆ°ºî¤·¤Þ¤»¤ó¡£"
 
-#: components/services/install-view/nautilus-service-install-view.c:965
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr "Eazel¥½¥Õ¥È¥¦¥§¥¢¥«¥¿¥í¥°¤ò³Îǧ¤·¤Æ¤¤¤Þ¤¹ ..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1023
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr "ǧ¾Ú¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ¤¤¤Þ¤¹..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1095
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥í¡¼¥É¤òÃæ»ß¤·¤Þ¤·¤¿ (¤ªÂÔ¤Á¤¯¤À¤µ¤¤) ..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1115
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥í¡¼¥É¤òÃæ»ß¤·¤Þ¤·¤¿¡£"
 
-#: components/services/install-view/nautilus-service-install-view.c:1116
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "Ãæ»ß¤·¤Þ¤·¤¿"
 
@@ -3356,12 +3353,12 @@ msgid "Services Login"
 msgstr "¥µ¡¼¥Ó¥¹¥í¥°¥¤¥ó"
 
 #: components/services/summary/nautilus-summary-dialogs.c:131
-#: libnautilus-extensions/nautilus-password-dialog.c:269
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "¥æ¡¼¥¶¡¼Ì¾:"
 
 #: components/services/summary/nautilus-summary-dialogs.c:138
-#: libnautilus-extensions/nautilus-password-dialog.c:276
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "¥Ñ¥¹¥ï¡¼¥É:"
 
@@ -3431,43 +3428,43 @@ msgstr "¥µ¡¼¥Ó¥¹"
 msgid "Featured Downloads"
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:883
+#: components/services/summary/nautilus-summary-view.c:884
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
 "unavailable right now, or your computer might be configured incorrectly. "
 "Please contact support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:893
+#: components/services/summary/nautilus-summary-view.c:894
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
 "support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:916
+#: components/services/summary/nautilus-summary-view.c:917
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
 "contact support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:958
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
 "now, or your computer might be configured incorrectly. You could try again "
 "later."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:968
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
 "support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:985
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:1048
+#: components/services/summary/nautilus-summary-view.c:1049
 #: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr "Eazel ¥µ¡¼¥Ó¥¹"
@@ -3580,48 +3577,66 @@ msgstr "eazel ¥µ¥ó¥×¥ë¥µ¡¼¥Ó¥¹¥Ó¥å¡¼"
 msgid "Factory for the sample service"
 msgstr "¥µ¥ó¥×¥ë¥µ¡¼¥Ó¥¹¤Î¥Õ¥¡¥¯¥È¥ê"
 
-#: components/text/nautilus-text-view.c:326
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr ""
 
-#: components/text/nautilus-text-view.c:329
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr "¥Õ¥¡¥¤¥ë¤ÏÂ礭¤¹¤®¤Þ¤¹"
 
 #: components/text/nautilus-text-view-ui.xml.h:1
-msgid "Lucida"
-msgstr ""
+#, fuzzy
+msgid "F_onts"
+msgstr "¥Õ¥©¥ó¥È"
 
 #: components/text/nautilus-text-view-ui.xml.h:2
-msgid "Use the Courier Font"
+msgid "Lucida"
 msgstr ""
 
 #: components/text/nautilus-text-view-ui.xml.h:3
-msgid "Use the Helvetica Font"
+msgid "Use the Courier Font"
 msgstr ""
 
 #: components/text/nautilus-text-view-ui.xml.h:4
-msgid "Use the Lucida Font"
+msgid "Use the Fixed Font"
 msgstr ""
 
 #: components/text/nautilus-text-view-ui.xml.h:5
-msgid "Use the Times Font"
+msgid "Use the GTK System Font"
 msgstr ""
 
 #: components/text/nautilus-text-view-ui.xml.h:6
-msgid "_Courier"
+msgid "Use the Helvetica Font"
 msgstr ""
 
 #: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
-msgstr "¥Õ¥©¥ó¥È(_F)"
+msgid "Use the Lucida Font"
+msgstr ""
 
 #: components/text/nautilus-text-view-ui.xml.h:8
-msgid "_Helvetica"
+msgid "Use the Times Font"
 msgstr ""
 
 #: components/text/nautilus-text-view-ui.xml.h:9
+msgid "_Courier"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "¥Õ¥¡¥¤¥ë(_F)"
+
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
+msgid "_Helvetica"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr ""
 
@@ -3690,7 +3705,7 @@ msgid "Nautilus Tree view"
 msgstr "Nautilus ¥Ä¥ê¡¼¥Ó¥å¡¼"
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:638
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr "¥Ä¥ê¡¼"
 
@@ -3702,7 +3717,7 @@ msgstr "¥¢¥Ñ¥ê¥·¥ç¥ó"
 msgid "Azul"
 msgstr "¥¢¥º¥ë"
 
-#: data/browser.xml.h:3 libnautilus-extensions/nautilus-font-picker.c:105
+#: data/browser.xml.h:3
 msgid "Black"
 msgstr "¥Ö¥é¥Ã¥¯"
 
@@ -3814,7 +3829,7 @@ msgstr "¥¨¥ó¥Ö¥ì¥à¤ò¥ª¥Ö¥¸¥§¥¯¥È¤Ë¥É¥é¥Ã¥°¤¹¤ë¤È¤½¤ì¤¬Äɲ䵤ì¤Þ¤¹"
 msgid "Eclipse"
 msgstr "¥¨¥¯¥ê¥×¥¹"
 
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1607
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "¥¨¥ó¥Ö¥ì¥à"
 
@@ -3911,7 +3926,7 @@ msgid "Numbers"
 msgstr "¥Ê¥ó¥Ð¡¼¥º"
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "OK"
 
@@ -4032,13 +4047,13 @@ msgid "The Gimp"
 msgstr "GIMP"
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:554
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "¥Ç¥¹¥¯¥È¥Ã¥×"
 
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4796
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
-#: src/file-manager/fm-desktop-icon-view.c:65
+#: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
 msgstr "¥´¥ßÈ¢"
 
@@ -4071,7 +4086,7 @@ msgid "Google"
 msgstr "Google"
 
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:808
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "¸¡º÷¥¨¥ó¥¸¥ó"
 
@@ -4325,115 +4340,115 @@ msgstr "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2261
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr "º£Æü¤Î %-I:%M %p"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2266
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr "ºòÆü¤Î %-I:%M %p"
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2271
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr ""
 
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2276
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 ¸Ä¤Î¥¢¥¤¥Æ¥à"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr "0 ¸Ä¤Î¥Õ¥©¥ë¥À"
 
-#: libnautilus-extensions/nautilus-file.c:3408
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 ¸Ä¤Î¥Õ¥¡¥¤¥ë"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 ¸Ä¤Î¥¢¥¤¥Æ¥à"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr "1 ¸Ä¤Î¥Õ¥©¥ë¥À"
 
-#: libnautilus-extensions/nautilus-file.c:3413
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 ¸Ä¤Î¥Õ¥¡¥¤¥ë"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "%u ¸Ä¤Î¥¢¥¤¥Æ¥à"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr "%u ¸Ä¤Î¥Õ¥©¥ë¥À"
 
-#: libnautilus-extensions/nautilus-file.c:3417
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u ¸Ä¤Î¥Õ¥¡¥¤¥ë"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3720
-#: libnautilus-extensions/nautilus-file.c:3735
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr "? ¥¢¥¤¥Æ¥à"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3726
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr "? ¥Ð¥¤¥È"
 
-#: libnautilus-extensions/nautilus-file.c:3739
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "ÉÔÌÀ¤Ê¥¿¥¤¥×"
 
-#: libnautilus-extensions/nautilus-file.c:3741
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "ÉÔÌÀ¤Ê MIME ¥¿¥¤¥×"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3746
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "ÉÔÌÀ"
 
-#: libnautilus-extensions/nautilus-file.c:3782
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr "¥×¥í¥°¥é¥à"
 
-#: libnautilus-extensions/nautilus-file.c:3794
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
 "some other reason."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3798
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
 "aaron@eazel.com"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3812
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "¥ê¥ó¥¯"
 
@@ -4441,27 +4456,27 @@ msgstr "¥ê¥ó¥¯"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1156
-#: libnautilus-extensions/nautilus-file.c:3818
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr "%s ¤Ë¥ê¥ó¥¯"
 
-#: libnautilus-extensions/nautilus-file.c:3832
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr "¥ê¥ó¥¯ (ÀÚ¤ì¤Æ¤¤¤Þ¤¹)"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr ""
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:588
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4469,7 +4484,7 @@ msgid ""
 "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:599
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4478,7 +4493,7 @@ msgid ""
 "parent folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:605
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4486,7 +4501,7 @@ msgid ""
 "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:636
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4495,7 +4510,7 @@ msgid ""
 "its parent folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:643
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4504,7 +4519,7 @@ msgid ""
 "change it or its parent folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:667
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -4512,7 +4527,7 @@ msgid ""
 "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:689
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4523,7 +4538,7 @@ msgstr ""
 "\n"
 "°ÜÆ°Àè¤Ë½½Ê¬¤Ê¶õ¤­¤¬¤¢¤ê¤Þ¤»¤ó."
 
-#: libnautilus-extensions/nautilus-file-operations.c:694
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4534,7 +4549,7 @@ msgstr ""
 "\n"
 "°ÜÆ°Àè¤Ë½½Ê¬¤Ê¶õ¤­¤¬¤¢¤ê¤Þ¤»¤ó."
 
-#: libnautilus-extensions/nautilus-file-operations.c:698
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4545,7 +4560,7 @@ msgstr ""
 "\n"
 "¥ê¥ó¥¯Àè¤Ë½½Ê¬¤Ê¶õ¤­¤¬¤¢¤ê¤Þ¤»¤ó."
 
-#: libnautilus-extensions/nautilus-file-operations.c:710
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4553,7 +4568,7 @@ msgid ""
 "You do not have permissions to write to this folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4564,7 +4579,7 @@ msgstr ""
 "\n"
 "¥³¥Ô¡¼À褬Æɤ߹þ¤ßÀìÍѤǤ¹."
 
-#: libnautilus-extensions/nautilus-file-operations.c:721
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4572,7 +4587,7 @@ msgid ""
 "You do not have permissions to write to this folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:725
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4583,7 +4598,7 @@ msgstr ""
 "\n"
 "°ÜÆ°À褬Æɤ߹þ¤ßÀìÍѤǤ¹."
 
-#: libnautilus-extensions/nautilus-file-operations.c:732
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4591,7 +4606,7 @@ msgid ""
 "You do not have permissions to write to this folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:736
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4602,7 +4617,7 @@ msgstr ""
 "\n"
 "¥ê¥ó¥¯À褬Æɤ߹þ¤ßÀìÍѤǤ¹."
 
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4610,7 +4625,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4618,7 +4633,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:773
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4626,7 +4641,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4634,7 +4649,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:794
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4642,7 +4657,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4650,7 +4665,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4658,7 +4673,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4666,34 +4681,34 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:924
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "¥³¥Ô¡¼Ãæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: libnautilus-extensions/nautilus-file-operations.c:927
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "°ÜÆ°Ãæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: libnautilus-extensions/nautilus-file-operations.c:930
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "¥ê¥ó¥¯Ãæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: libnautilus-extensions/nautilus-file-operations.c:935
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "ºï½üÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: libnautilus-extensions/nautilus-file-operations.c:960
-#: libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "¥¹¥­¥Ã¥×"
 
-#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "ºÆ»î¹Ô"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1057
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4702,7 +4717,7 @@ msgid ""
 "If you still want to move \"%s\", rename it and try again."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1063
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4711,11 +4726,11 @@ msgid ""
 "If you still want to copy \"%s\", rename it and try again."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "¥Õ¥¡¥¤¥ë¤òÃÖ¤­´¹¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1081
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4726,22 +4741,22 @@ msgstr ""
 "\n"
 "ÃÖ¤­´¹¤¨¤Æ¤â¤¤¤¤¤Ç¤¹¤«?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1092
-#: libnautilus-extensions/nautilus-file-operations.c:1106
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "¥³¥Ô¡¼Ãæ¤Ë¾×ÆÍ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "ÃÖ´¹"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "¤¹¤Ù¤ÆÃÖ´¹"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1160
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "%s ¤ËÊ̤Υê¥ó¥¯"
@@ -4750,25 +4765,25 @@ msgstr "%s ¤ËÊ̤Υê¥ó¥¯"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d ÈÖÌܤΠ%s ¤Ë¥ê¥ó¥¯"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1180
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d ÈÖÌܤΠ%s ¤Ë¥ê¥ó¥¯"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1184
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d ÈÖÌܤΠ%s ¤Ë¥ê¥ó¥¯"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d ÈÖÌܤΠ%s ¤Ë¥ê¥ó¥¯"
@@ -4778,242 +4793,234 @@ msgstr "%d ÈÖÌܤΠ%s ¤Ë¥ê¥ó¥¯"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (¥³¥Ô¡¼)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (Ê̤Υ³¥Ô¡¼)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1212
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr "ÈÖÌܤΥ³¥Ô¡¼)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr "ÈÖÌܤΥ³¥Ô¡¼)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1216
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr "ÈÖÌܤΥ³¥Ô¡¼)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr "ÈÖÌܤΥ³¥Ô¡¼)"
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (¥³¥Ô¡¼)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (Ê̤Υ³¥Ô¡¼)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1232
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dÈÖÌܤΥ³¥Ô¡¼)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1234
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dÈÖÌܤΥ³¥Ô¡¼)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1236
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%dÈÖÌܤΥ³¥Ô¡¼)%s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dÈÖÌܤΥ³¥Ô¡¼)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1322
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1330
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1487
-#: libnautilus-extensions/nautilus-file-operations.c:2072
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "ÉÔÌÀ¤Ê GnomeVFSXferProgressStatus %d ¤Ç¤¹"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1802
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "¥´¥ßÈ¢¤Ø¥Õ¥¡¥¤¥ë¤ò°ÜÆ°Ãæ"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1804
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1821
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "°ÜÆ°Ãæ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1807
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "¥´¥ßÈ¢¤Ø°ÜÆ°¤¹¤ë½àÈ÷Ãæ..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1817
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "¥Õ¥¡¥¤¥ë¤ò°ÜÆ°Ãæ"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "¥Õ¥¡¥¤¥ë¤ò°ÜÆ°¤·¤Þ¤·¤¿:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1822
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "°ÜÆ°¤Î½àÈ÷Ãæ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "°ÜÆ°´°Î»..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "¥Õ¥¡¥¤¥ë¤Ø¤Î¥ê¥ó¥¯¤òºîÀ®Ãæ"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1837
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "¥Õ¥¡¥¤¥ë¤ò¥ê¥ó¥¯¤·¤Þ¤·¤¿:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1839
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "¥ê¥ó¥¯Ãæ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "¥ê¥ó¥¯ºîÀ®¤Î½àÈ÷Ãæ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "¥ê¥ó¥¯¤ÎºîÀ®¤ò´°Î»¤·¤Þ¤·¤¿..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1848
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼Ãæ"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "¥Õ¥¡¥¤¥ë¤ò¥³¥Ô¡¼¤·¤Þ¤·¤¿:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "¥³¥Ô¡¼Ãæ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "¥³¥Ô¡¼¤Î½àÈ÷Ãæ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "¥´¥ßÈ¢¤ÎÃæ¤Ø¥¢¥¤¥Æ¥à¤ò¥³¥Ô¡¼¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "¥´¥ßÈ¢¤Ø¥³¥Ô¡¼¤Ç¤­¤Þ¤»¤ó"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1899
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "¥´¥ßÈ¢¤Ï¥Ç¥¹¥¯¥È¥Ã¥×¤Ë»Ä¤¹¤Ù¤­¤Ç¤¹"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "¤³¤Î¥´¥ßÈ¢¤ò°ÜÆ°¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1902
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "¥´¥ßÈ¢¤ò¥³¥Ô¡¼¤Ç¤­¤Þ¤»¤ó"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1903
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "¤³¤Î¥´¥ßÈ¢¤ò¥³¥Ô¡¼¤Ç¤­¤Þ¤»¤ó"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1905
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "¥´¥ßÈ¢¤Î¾ì½ê¤ÏÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1906
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "¥´¥ßÈ¢¤Ø¥³¥Ô¡¼¤Ç¤­¤Þ¤»¤ó"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1929
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "¤½¤ì¼«¿È¤ÎÃæ¤Ø¥Õ¥©¥ë¥À¤ò°ÜÆ°¤Ç¤­¤Þ¤»¤ó"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1930
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "¤½¤ì¼«¿È¤ÎÃæ¤Ø¥Õ¥©¥ë¥À¤ò¥³¥Ô¡¼¤Ç¤­¤Þ¤»¤ó"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1932
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "¼«Ê¬¤ÎÃæ¤Ë°ÜÆ°¤Ç¤­¤Þ¤»¤ó"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1933
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "¼«Ê¬¤ÎÃæ¤Ë¥³¥Ô¡¼¤Ç¤­¤Þ¤»¤ó"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1946
-msgid "You cannot move a file onto itself."
-msgstr "¤½¤ì¼«¿È¤ÎÃæ¤Ø¥Õ¥©¥ë¥À¤ò°ÜÆ°¤Ç¤­¤Þ¤»¤ó¡£"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1947
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "¤½¤ì¼«¿È¤ÎÃæ¤Ø¥Õ¥©¥ë¥À¤ò¥³¥Ô¡¼¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1949
-msgid "Can't Move Onto Self"
-msgstr "¼«Ê¬¤Î¾å¤Ë°ÜÆ°¤Ç¤­¤Þ¤»¤ó"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1950
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "¼«Ê¬¤Î¾å¤Ë¥³¥Ô¡¼¤Ç¤­¤Þ¤»¤ó"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2001
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
 "You do not have permissions to write to the destination."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2004
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5023,614 +5030,678 @@ msgstr ""
 "\n"
 "ºîÀ®Àè¤Ë½½Ê¬¤Ê¶õ¤­¤¬¤¢¤ê¤Þ¤»¤ó."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2007
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2011
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "¿·µ¬¥Õ¥©¥ë¥À¤òºîÀ®Ãæ¤Ë¥¨¥é¡¼"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2098
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "̤¥¿¥¤¥È¥ë¤Î¥Õ¥©¥ë¥À"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2131
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "¥Õ¥¡¥¤¥ë¤òºï½üÃæ"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2133
-#: libnautilus-extensions/nautilus-file-operations.c:2168
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤·¤¿:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2135
-#: libnautilus-extensions/nautilus-file-operations.c:2170
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "ºï½üÃæ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2136
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "¥Õ¥¡¥¤¥ëºï½ü¤Î½àÈ÷Ãæ..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2166
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "¥´¥ßÈ¢¤ò¶õ¤Ë¤·¤Æ¤¤¤Þ¤¹"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2171
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "¥´¥ßÈ¢¤ò¶õ¤Ë¤¹¤ë½àÈ÷Ãæ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2202
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr "¥´¥ßÈ¢¤Î¤¹¤Ù¤Æ¤Î¥¢¥¤¥Æ¥à¤ò´°Á´¤Ëºï½ü¤·¤Þ¤¹¤«?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2204
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "¥´¥ßÈ¢¤ÎÆâÍƤòºï½ü¤·¤Þ¤¹¤«?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2205
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "¶õ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2243
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2243
-#: libnautilus-extensions/nautilus-file-operations.c:2253
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "foo (¥³¥Ô¡¼)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (¥³¥Ô¡¼)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".foo (¥³¥Ô¡¼).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "foo foo (¥³¥Ô¡¼)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2247
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2247
-#: libnautilus-extensions/nautilus-file-operations.c:2254
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "foo (¥³¥Ô¡¼).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2248
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2248
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "foo foo (¥³¥Ô¡¼).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (¥³¥Ô¡¼).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "foo.. (¥³¥Ô¡¼).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "foo... (¥³¥Ô¡¼)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "foo. (¥³¥Ô¡¼)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "foo. (Ê̤Υ³¥Ô¡¼)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2253
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "foo (Ê̤Υ³¥Ô¡¼)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2254
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "foo (Ê̤Υ³¥Ô¡¼).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "foo (3ÈÖÌܤΥ³¥Ô¡¼)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "foo (3ÈÖÌܤΥ³¥Ô¡¼).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (Ê̤Υ³¥Ô¡¼).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3ÈÖÌܤΥ³¥Ô¡¼).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr "foo (21ÈÖÌܤΥ³¥Ô¡¼)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr "foo (24ÈÖÌܤΥ³¥Ô¡¼)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr "foo (21ÈÖÌܤΥ³¥Ô¡¼).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr "foo (24ÈÖÌܤΥ³¥Ô¡¼).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "foo (21ÈÖÌܤΥ³¥Ô¡¼)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
-#: libnautilus-extensions/nautilus-file-operations.c:2260
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "foo (22ÈÖÌܤΥ³¥Ô¡¼)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "foo (21ÈÖÌܤΥ³¥Ô¡¼).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
-#: libnautilus-extensions/nautilus-file-operations.c:2261
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "foo (22ÈÖÌܤΥ³¥Ô¡¼).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2260
-#: libnautilus-extensions/nautilus-file-operations.c:2262
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "foo (23ÈÖÌܤΥ³¥Ô¡¼)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2261
-#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "foo (23ÈÖÌܤΥ³¥Ô¡¼).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2262
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "foo (24ÈÖÌܤΥ³¥Ô¡¼)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2263
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "foo (24ÈÖÌܤΥ³¥Ô¡¼).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "foo (25ÈÖÌܤΥ³¥Ô¡¼)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "foo (25ÈÖÌܤΥ³¥Ô¡¼).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24ÈÖÌܤΥ³¥Ô¡¼)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25ÈÖÌܤΥ³¥Ô¡¼)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24ÈÖÌܤΥ³¥Ô¡¼).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25ÈÖÌܤΥ³¥Ô¡¼).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100ÃûÈÖÌܤΥ³¥Ô¡¼).txt"
 
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (10th copy)"
+msgstr "foo (21ÈÖÌܤΥ³¥Ô¡¼)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (11st copy)"
+msgstr "foo (21ÈÖÌܤΥ³¥Ô¡¼)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (10th copy).txt"
+msgstr "foo (21ÈÖÌܤΥ³¥Ô¡¼).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (11st copy).txt"
+msgstr "foo (21ÈÖÌܤΥ³¥Ô¡¼).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (11th copy)"
+msgstr "foo (21ÈÖÌܤΥ³¥Ô¡¼)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (12nd copy)"
+msgstr "foo (22ÈÖÌܤΥ³¥Ô¡¼)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (11th copy).txt"
+msgstr "foo (21ÈÖÌܤΥ³¥Ô¡¼).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (12nd copy).txt"
+msgstr "foo (22ÈÖÌܤΥ³¥Ô¡¼).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (12th copy)"
+msgstr "foo (24ÈÖÌܤΥ³¥Ô¡¼)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (13rd copy)"
+msgstr "foo (3ÈÖÌܤΥ³¥Ô¡¼)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (12th copy).txt"
+msgstr "foo (25ÈÖÌܤΥ³¥Ô¡¼).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (13rd copy).txt"
+msgstr "foo (3ÈÖÌܤΥ³¥Ô¡¼).txt"
+
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld (%ldÃæ)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:96
-msgid "Normal"
-msgstr "ɸ½à"
-
-#: libnautilus-extensions/nautilus-font-picker.c:97
-#: libnautilus-extensions/nautilus-volume-monitor.c:516
-#: libnautilus-extensions/nautilus-volume-monitor.c:535
-msgid "Unknown"
-msgstr "ÉÔÌÀ"
-
-#: libnautilus-extensions/nautilus-font-picker.c:103
-msgid "Bold"
-msgstr "ÂÀ»ú"
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
+msgid "GConf Error"
+msgstr "GConf¥¨¥é¡¼"
 
-#: libnautilus-extensions/nautilus-font-picker.c:104
-msgid "Book"
-msgstr "¥Ö¥Ã¥¯"
+#. Constants
+#: libnautilus-extensions/nautilus-global-preferences.c:50
+msgid "Nautilus Preferences"
+msgstr "NautilusÀßÄê"
 
-#: libnautilus-extensions/nautilus-font-picker.c:106
-msgid "Demibold"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "¾ï¤Ë"
 
-#: libnautilus-extensions/nautilus-font-picker.c:107
-msgid "Light"
-msgstr "·Ú¤¤"
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "¾ï¤Ë"
 
-#: libnautilus-extensions/nautilus-font-picker.c:113
-msgid "Italic"
-msgstr "¼ÐÂÎ"
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "¥í¡¼¥«¥ë¤Î¤ß"
 
-#: libnautilus-extensions/nautilus-font-picker.c:114
-msgid "Oblique"
-msgstr "µÞ¼ÐÂÎ"
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤Î¤ß"
 
-#: libnautilus-extensions/nautilus-font-picker.c:115
-msgid "Reverse Italic"
-msgstr "µÕ¼ÐÂÎ"
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "¤·¤Ê¤¤"
 
-#: libnautilus-extensions/nautilus-font-picker.c:116
-msgid "Reverse Oblique"
-msgstr "µÞµÕ¼ÐÂÎ"
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "¤·¤Ê¤¤"
 
-#: libnautilus-extensions/nautilus-font-picker.c:123
-msgid "Condensed"
-msgstr "¶Å½Ì"
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "³ê¤é¤«¤Ê¥°¥é¥Õ¥£¥Ã¥¯"
 
-#: libnautilus-extensions/nautilus-font-picker.c:124
-msgid "Semicondensed"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "²èÁü¤ò³ê¤é¤«¤Ë¤¹¤ë(ÃÙ¤¤)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:226
-msgid "Font"
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
 msgstr "¥Õ¥©¥ó¥È"
 
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
-msgid "GConf Error"
-msgstr "GConf¥¨¥é¡¼"
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+#, fuzzy
+msgid "Font for Icon view:"
+msgstr "¥ß¥å¡¼¥¸¥Ã¥¯¥Ó¥å¡¼¤Î¤¿¤á¤Î¥Õ¥¡¥¯¥È¥ê¤Ç¤¹"
 
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:956
-msgid "fixed"
-msgstr "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*"
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
+msgstr ""
 
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1427
-msgid "01/01/00, 01:00 AM"
-msgstr "01/01/00 ¸áÁ° 01:00"
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "ÍúÎò¥Ó¥å¡¼¤Î¥Õ¥¡¥¯¥È¥ê"
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1428
-msgid "1/1/00, 1:00 AM"
-msgstr "1/1/00 ¸áÁ° 1:00"
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1429
-msgid " 1/ 1/00,  1:00 AM"
-msgstr " 1/ 1/00 ¸áÁ° 1:00"
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
 
-#. Constants
-#: libnautilus-extensions/nautilus-global-preferences.c:50
-msgid "Nautilus Preferences"
-msgstr "NautilusÀßÄê"
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "¥Ç¥¹¥¯¥È¥Ã¥×ÉÁ²è¤Ë Nautilus ¤ò»È¤¦"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:97
-msgid "current theme"
-msgstr "¸½ºß¤Î¥Æ¡¼¥Þ"
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
+msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤ò³«¤¤¤Æ¤¤¤Þ¤¹"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:100
+#: libnautilus-extensions/nautilus-global-preferences.c:651
 msgid "Open each file or folder in a separate window"
 msgstr "¥Õ¥¡¥¤¥ë¤È¥Õ¥©¥ë¥À¤´¤È¤ËÊ̤Υ¦¥£¥ó¥É¥¦¤ò³«¤¯"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:103
-msgid "Ask before emptying the Trash"
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+msgid "Display toolbar in new windows"
+msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤Ë¥Ä¡¼¥ë¥Ð¡¼¤òɽ¼¨"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤Ë¥í¥±¡¼¥·¥ç¥ó¥Ð¡¼¤òɽ¼¨"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤Ë¥¹¥Æ¡¼¥¿¥¹¥Ð¡¼¤òɽ¼¨"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤Ë¥µ¥¤¥É¥Ð¡¼¤òɽ¼¨"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "¥´¥ßÈ¢¤ÎµóÆ°"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+#, fuzzy
+msgid "Ask before emptying the Trash or deleting files"
 msgstr "¥´¥ßÈ¢¤«¤é¥¢¥¤¥Æ¥à¤òºï½ü¤¹¤ëÁ°¤Ë³Îǧ¤¹¤ë"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:106
-#: libnautilus-extensions/nautilus-global-preferences.c:597
-msgid "Click Behavior"
-msgstr "¥¯¥ê¥Ã¥¯¤ÎµóÆ°"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
+
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:109
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 msgid "single"
 msgstr "¥·¥ó¥°¥ë"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:110
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "¥·¥ó¥°¥ë¥¯¥ê¥Ã¥¯¤Ç¥¢¥¤¥Æ¥à¤òµ¯Æ°¤¹¤ë"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:114
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "¥¿¥Ö¥ë"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:115
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "¥À¥Ö¥ë¥¯¥ê¥Ã¥¯¤Ç¥¢¥¤¥Æ¥à¤òµ¯Æ°¤¹¤ë"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:119
-#: libnautilus-extensions/nautilus-global-preferences.c:604
-msgid "Executable Text Files"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-global-preferences.c:122
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 msgid "launch"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:123
+#: libnautilus-extensions/nautilus-global-preferences.c:726
 msgid "Execute files when they are clicked"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:127
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 msgid "display"
 msgstr "ɽ¼¨"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:128
+#: libnautilus-extensions/nautilus-global-preferences.c:730
 msgid "Display files when they are clicked"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:132
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 msgid "ask"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:133
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 msgid "Ask each time"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:143
-#: libnautilus-extensions/nautilus-global-preferences.c:725
-msgid "Show Text in Icons"
-msgstr "¥¢¥¤¥³¥ó¤Ë¥Æ¥­¥¹¥È¤òɽ¼¨¤¹¤ë"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:146
-#: libnautilus-extensions/nautilus-global-preferences.c:732
-msgid "Show Count of Items in Folders"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-global-preferences.c:149
-#: libnautilus-extensions/nautilus-global-preferences.c:739
-msgid "Show Thumbnails for Image Files"
-msgstr "¥¤¥á¡¼¥¸¥Õ¥¡¥¤¥ë¤Î¤¿¤á¤Î½Ì¾®²èÁü¤òɽ¼¨¤¹¤ë"
-
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:152
-#: libnautilus-extensions/nautilus-global-preferences.c:755
-msgid "Make Folder Appearance Details Public"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-global-preferences.c:155
-#: libnautilus-extensions/nautilus-global-preferences.c:746
-msgid "Preview Sound Files"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Use smoother (but slower) graphics"
-msgstr "²èÁü¤ò³ê¤é¤«¤Ë¤¹¤ë(ÃÙ¤¤)"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Use this font family to display file names:"
-msgstr "¥Õ¥¡¥¤¥ë̾¤Îɽ¼¨¤Ë¤³¤Î¥Õ¥©¥ó¥È¥Õ¥¡¥ß¥ê¤ò»È¤¦"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-msgid "Display toolbar in new windows"
-msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤Ë¥Ä¡¼¥ë¥Ð¡¼¤òɽ¼¨"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:170
-msgid "Display location bar in new windows"
-msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤Ë¥í¥±¡¼¥·¥ç¥ó¥Ð¡¼¤òɽ¼¨"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:173
-msgid "Display status bar in new windows"
-msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤Ë¥¹¥Æ¡¼¥¿¥¹¥Ð¡¼¤òɽ¼¨"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:176
-msgid "Display sidebar in new windows"
-msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤Ë¥µ¥¤¥É¥Ð¡¼¤òɽ¼¨"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:179
-msgid "Use Nautilus to draw the desktop"
-msgstr "¥Ç¥¹¥¯¥È¥Ã¥×ÉÁ²è¤Ë Nautilus ¤ò»È¤¦"
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "¥¯¥ê¥Ã¥¯¤ÎµóÆ°"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:183
-msgid "Enable fast search (indexes your hard drive)"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:186
-msgid "search type to do by default"
-msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¸¡º÷¥¿¥¤¥×"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:189
-msgid "search by text"
-msgstr "¥Æ¥­¥¹¥È¤Ç¸¡º÷"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:190
-msgid "Search for files by file name only"
-msgstr "¥Õ¥¡¥¤¥ë̾¤Î¤ß¤Ç¥Õ¥¡¥¤¥ë¤ò¸¡º÷"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:194
-msgid "search by text and properties"
-msgstr "¥Æ¥­¥¹¥È¤È°À­¤Ç¸¡º÷"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:195
-msgid "Search for files by file name and file properties"
-msgstr "¥Õ¥¡¥¤¥ë̾¤È°À­¤Ç¥Õ¥¡¥¤¥ë¤ò¸¡º÷"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:199
-msgid "Search Engine Location"
-msgstr "¸¡º÷¥¨¥ó¥¸¥ó¤Î¾ì½ê"
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr "¥ª¥×¥·¥ç¥ó¤òɽ¼¨¤¹¤ë/¤·¤Ê¤¤"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:203
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr "±£¤·¥Õ¥¡¥¤¥ë¤òɽ¼¨¤¹¤ë (\".\" ¤Ç¤Ï¤¸¤Þ¤ë¥Õ¥¡¥¤¥ë̾)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:206
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr "¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òɽ¼¨¤¹¤ë (\"~\"¤Ç¤ª¤ï¤ë¥Õ¥¡¥¤¥ë̾)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:209
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr "¥×¥í¥Ñ¥Æ¥£¥¦¥£¥ó¥É¥¦¤ËÆüì¤Ê¥Õ¥é¥°¤òɽ¼¨¤¹¤ë"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:212
-msgid "Show only folders (no files) in the tree"
-msgstr "¥Ä¥ê¡¼¤Ë¥Õ¥©¥ë¥À¤À¤±(¥Õ¥¡¥¤¥ë¤Ê¤·)¤òɽ¼¨¤¹¤ë"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:215
-msgid "Can add Content"
-msgstr "ÆâÍƤòÄɲäǤ­¤ë"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+#, fuzzy
+msgid "Sorting Order"
+msgstr "½êÍ­¼Ô¤ÎÀßÄêÃæ¤Ë¥¨¥é¡¼"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:218
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
-msgstr "¥Ó¥ë¥È¥¤¥ó¥Ö¥Ã¥¯¥Þ¡¼¥¯¤ò¥Ö¥Ã¥¯¥Þ¡¼¥¯¥á¥Ë¥å¡¼¤Ë´Þ¤á¤Ê¤¤"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:222
-#: libnautilus-extensions/nautilus-global-preferences.c:227
-#: src/file-manager/fm-properties-window.c:1519 src/nautilus-location-bar.c:62
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
 msgid "Location:"
 msgstr "¾ì½ê:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:226
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+msgid "HTTP Proxy Settings"
+msgstr "HTTP ¥×¥í¥¯¥·¤ÎÀßÄê"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "HTTP¥×¥í¥¯¥·¤ò»È¤¦"
 
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:228
+#: libnautilus-extensions/nautilus-global-preferences.c:812
 #: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr "¥Ý¡¼¥È:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:533
-msgid "Appearance"
-msgstr "³°´Ñ"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:535
-msgid "Smoother Graphics"
-msgstr "³ê¤é¤«¤Ê¥°¥é¥Õ¥£¥Ã¥¯"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "Æ⢥֥寥ޡ¼¥¯"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:552
-msgid "Windows & Desktop"
-msgstr "¥¦¥£¥ó¥É¥¦&¥Ç¥¹¥¯¥È¥Ã¥×"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "¥Ó¥ë¥È¥¤¥ó¥Ö¥Ã¥¯¥Þ¡¼¥¯¤ò¥Ö¥Ã¥¯¥Þ¡¼¥¯¥á¥Ë¥å¡¼¤Ë´Þ¤á¤Ê¤¤"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:560
-msgid "Opening New Windows"
-msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤ò³«¤¤¤Æ¤¤¤Þ¤¹"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "¥¢¥¤¥³¥ó¤Ë¥Æ¥­¥¹¥È¤òɽ¼¨¤¹¤ë"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:583
-msgid "Trash Behavior"
-msgstr "¥´¥ßÈ¢¤ÎµóÆ°"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:595
-msgid "Icon & List Views"
-msgstr "¥¢¥¤¥³¥ó&¥ê¥¹¥È¥Ó¥å¡¼"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "¥¤¥á¡¼¥¸¥Õ¥¡¥¤¥ë¤Î¤¿¤á¤Î½Ì¾®²èÁü¤òɽ¼¨¤¹¤ë"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:611
-msgid "Show/Hide Options"
-msgstr "¥ª¥×¥·¥ç¥ó¤òɽ¼¨¤¹¤ë/¤·¤Ê¤¤"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:632
-msgid "Sidebar Panels"
-msgstr "¥µ¥¤¥É¥Ð¡¼¥Ñ¥Í¥ë"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:635
-msgid "Tabs"
-msgstr "¥¿¥Ö"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:684
-msgid "Navigation"
-msgstr "¥Ê¥Ó¥²¡¼¥·¥ç¥ó"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "³°´Ñ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:693
-msgid "HTTP Proxy Settings"
-msgstr "HTTP ¥×¥í¥¯¥·¤ÎÀßÄê"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr "¥¦¥£¥ó¥É¥¦&¥Ç¥¹¥¯¥È¥Ã¥×"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:712
-msgid "Built-in Bookmarks"
-msgstr "Æ⢥֥寥ޡ¼¥¯"
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr "¥¢¥¤¥³¥ó&¥ê¥¹¥È¥Ó¥å¡¼"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+msgid "Navigation"
+msgstr "¥Ê¥Ó¥²¡¼¥·¥ç¥ó"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:723
+#: libnautilus-extensions/nautilus-global-preferences.c:962
 msgid "Speed Tradeoffs"
 msgstr "®Å٥ȥ졼¥É¥ª¥Õ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:794
-msgid "Search"
-msgstr "¸¡º÷"
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr "¥Æ¥­¥¹¥È¤Ç¸¡º÷"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+msgid "Search for files by file name only"
+msgstr "¥Õ¥¡¥¤¥ë̾¤Î¤ß¤Ç¥Õ¥¡¥¤¥ë¤ò¸¡º÷"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr "¥Æ¥­¥¹¥È¤È°À­¤Ç¸¡º÷"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+msgid "Search for files by file name and file properties"
+msgstr "¥Õ¥¡¥¤¥ë̾¤È°À­¤Ç¥Õ¥¡¥¤¥ë¤ò¸¡º÷"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "¸¡º÷¤ÎÊ£»¨¤Ê¥ª¥×¥·¥ç¥ó"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:802
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¸¡º÷¥¿¥¤¥×"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 msgid "Fast Search"
 msgstr "¹â®¸¡º÷"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:846
-msgid "Fonts"
-msgstr "¥Õ¥©¥ó¥È"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1026
-#, c-format
-msgid "Display %s tab in sidebar"
-msgstr "%s¥¿¥Ö¤ò¥µ¥¤¥É¥Ð¡¼¤Ëɽ¼¨"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1073
-msgid "always"
-msgstr "¾ï¤Ë"
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+msgid "Search Engine Location"
+msgstr "¸¡º÷¥¨¥ó¥¸¥ó¤Î¾ì½ê"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1074
-msgid "Always"
-msgstr "¾ï¤Ë"
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "¸¡º÷"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1077
-msgid "local only"
-msgstr "¥í¡¼¥«¥ë¤Î¤ß"
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr "¥Ä¥ê¡¼¤Ë¥Õ¥©¥ë¥À¤À¤±(¥Õ¥¡¥¤¥ë¤Ê¤·)¤òɽ¼¨¤¹¤ë"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1078
-msgid "Local Files Only"
-msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤Î¤ß"
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, c-format
+msgid "Display %s tab in sidebar"
+msgstr "%s¥¿¥Ö¤ò¥µ¥¤¥É¥Ð¡¼¤Ëɽ¼¨"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1081
-msgid "never"
-msgstr "¤·¤Ê¤¤"
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "¥µ¥¤¥É¥Ð¡¼¥Ñ¥Í¥ë"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1082
-msgid "Never"
-msgstr "¤·¤Ê¤¤"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr "¥¿¥Ö"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1145
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "currently can't be performed because the program crond, which does nightly "
@@ -5638,13 +5709,13 @@ msgid ""
 "done, turn crond on."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1152
-#: libnautilus-extensions/nautilus-global-preferences.c:1170
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
 msgid "Files May Not Be Indexed"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1153
-#: libnautilus-extensions/nautilus-global-preferences.c:1171
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
 msgid ""
 "If you are running Linux, you can log in as root and type these commands to "
 "start cron:\n"
@@ -5653,7 +5724,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1162
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "may not be performed because the program crond, which does nightly tasks on "
@@ -5662,20 +5733,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-gnome-extensions.c:640
-msgid "No image was selected.  You must click on an image to select it."
-msgstr ""
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:641
-msgid "No selection made"
-msgstr "¥»¥¯¥·¥ç¥ó¤ÏºîÀ®¤µ¤ì¤Æ¤Þ¤»¤ó"
-
 #. The list of characters that cause line breaks can be localized.
 #: libnautilus-extensions/nautilus-icon-canvas-item.c:70
 msgid " -_,;.?/&"
 msgstr " -_,;.?/&"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:766
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
@@ -5685,7 +5748,7 @@ msgstr ""
 "¤³¤Î¥¢¥¤¥Æ¥à¤ò¥É¥í¥Ã¥×¤·¤¿¾ì½ê¤ËÃÖ¤­¤¿¤¤¤Ç¤¹¤«? ¤³¤ì¤ÏÊݸ¤µ¤ì¤¿¼êÆ° "
 "¥ì¥¤¥¢¥¦¥È¤ò¾Ãµî¤·¤ÆÉü¸µ¤Ç¤­¤Ê¤¯¤Ê¤ë¤Ç¤·¤ç¤¦"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:770
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
@@ -5695,7 +5758,7 @@ msgstr ""
 "¤³¤ì¤é¥¢¥¤¥Æ¥à¤ò¥É¥í¥Ã¥×¤·¤¿¾ì½ê¤ËÃÖ¤­¤¿¤¤¤Ç¤¹¤«? ¤³¤ì¤ÏÊݸ¤µ¤ì¤¿¼êÆ° "
 "¥ì¥¤¥¢¥¦¥È¤ò¾Ãµî¤·¤ÆÉü¸µ¤Ç¤­¤Ê¤¯¤Ê¤ë¤Ç¤·¤ç¤¦"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:776
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
@@ -5703,7 +5766,7 @@ msgstr ""
 "¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï¼«Æ°¥ì¥¤¥¢¥¦¥È¤ò»È¤Ã¤Æ¤¤¤Þ¤¹. ¼êÆ°¥ì¥¤¥¢¥¦¥È¤ØÀÚÂؤ¨¤Æ "
 "¤³¤Î¥¢¥¤¥Æ¥à¤ò¥É¥í¥Ã¥×¤·¤¿¾ì½ê¤ËÃÖ¤­¤¿¤¤¤Ç¤¹¤«?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:779
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
@@ -5711,64 +5774,48 @@ msgstr ""
 "¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï¼«Æ°¥ì¥¤¥¢¥¦¥È¤ò»È¤Ã¤Æ¤¤¤Þ¤¹. ¼êÆ°¥ì¥¤¥¢¥¦¥È¤ØÀÚÂؤ¨¤Æ "
 "¤³¤ì¤é¤Î¥¢¥¤¥Æ¥à¤ò¥É¥í¥Ã¥×¤·¤¿¾ì½ê¤ËÃÖ¤­¤¿¤¤¤Ç¤¹¤«?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:784
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "¼êÆ°¥ì¥¤¥¢¥¦¥È¤ËÀÚÂؤ¨¤Þ¤¹¤«?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:785
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "ÀÚÂؤ¨"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "̾Á°Êѹ¹"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1551
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr "ÆþÎϤò¸µ¤ËÌ᤹"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1552
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "¸Å¤¤Ì¾Á°¤òÉü¸µ¤¹¤ë"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1553
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "ÆþÎϤò·«¤êÊÖ¤¹"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1554
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Êѹ¹¤·¤¿Ì¾Á°¤òÉü¸µ¤¹¤ë"
 
-#: libnautilus-extensions/nautilus-password-dialog.c:306
-msgid "Remember this password"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-preferences-item.c:483
-msgid "times"
-msgstr "»þ´Ö"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:484
-msgid "courier"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-preferences-item.c:485
-msgid "lucida"
-msgstr "misc"
-
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "½é¿´¼Ô"
 
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "Ãæ´Ö"
 
-#: libnautilus-extensions/nautilus-preferences.c:79
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "¾åµé¼Ô"
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:202
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "ÁªÂò¥Ü¥Ã¥¯¥¹"
 
@@ -5867,7 +5914,7 @@ msgid "Don't include in the menu for \"%s\" items"
 msgstr "\"%s\" ¥¢¥¤¥Æ¥à¤Î¥á¥Ë¥å¡¼¤Ë´Þ¤Þ¤ì¤Þ¤»¤ó"
 
 #: libnautilus-extensions/nautilus-program-chooser.c:1209
-#: src/file-manager/fm-list-view.c:2123
+#: src/file-manager/fm-list-view.c:2182
 #: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
@@ -6216,25 +6263,6 @@ msgstr "̾Á°¤ÎÃæ¤Ë \"stuff\" ¤ò´Þ¤à¥¢¥¤¥Æ¥à¤Ç 2000 ¥Ð¥¤¥È°Ê²¼¤ÎÄ̾ï¥Õ¥¡¥¤¥ë"
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "̾Á°¤ÎÃæ¤Ë \"medusa\" ¤ò´Þ¤à¥¢¥¤¥Æ¥à¤Ç¥Õ¥©¥ë¥À"
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr "¾ÜºÙ"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr "·Ù¹ð"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr "¥¨¥é¡¼"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr "¼ÁÌä"
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr "¥Ç¥£¥¹¥¯¤ò¸¡º÷Ãæ"
@@ -6243,7 +6271,7 @@ msgstr "¥Ç¥£¥¹¥¯¤ò¸¡º÷Ãæ"
 msgid "Nautilus is searching your disks for trash folders."
 msgstr "Nautilus¤Ï¥Ç¥£¥¹¥¯¤Î¥´¥ßÈ¢¥Õ¥©¥ë¥À¤ò¸¡º÷¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: libnautilus-extensions/nautilus-trash-file.c:600
+#: libnautilus-extensions/nautilus-trash-file.c:725
 msgid "on the desktop"
 msgstr "¥Ç¥¹¥¯¥È¥Ã¥×¾å"
 
@@ -6277,119 +6305,124 @@ msgstr "°ìÍ÷¤Çɽ¼¨"
 msgid "%s Viewer"
 msgstr "¥ê¥¹¥È¥Ó¥å¡¼¥¢"
 
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+msgid "Unknown"
+msgstr "ÉÔÌÀ"
+
 #. Populate table with items we know localized names for.
-#: libnautilus-extensions/nautilus-volume-monitor.c:623
-#: libnautilus-extensions/nautilus-volume-monitor.c:1862
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr "¥Õ¥í¥Ã¥Ô¡¼"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:624
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
 msgid "CD-ROM"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:625
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
 msgid "Zip Drive"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:646
-#: libnautilus-extensions/nautilus-volume-monitor.c:668
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 msgid "Audio CD"
 msgstr "¥ª¡¼¥Ç¥£¥ª CD"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1547
-msgid "Mount Error"
-msgstr "¥Þ¥¦¥ó¥È¥¨¥é¡¼"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1549
-msgid "Unmount Error"
-msgstr "¥¢¥ó¥Þ¥¦¥ó¥È¥¨¥é¡¼"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1579
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1582
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1583
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr ""
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1587
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
 msgstr ""
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1591
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1594
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1597
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1600
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1605
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1607
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr ""
 
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1612
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1764
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr "¥Þ¥¦¥ó¥È¥¨¥é¡¼"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr "¥¢¥ó¥Þ¥¦¥ó¥È¥¨¥é¡¼"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "ISO 9660 ¥Ü¥ê¥å¡¼¥à"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1779
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "¥ë¡¼¥È"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1786
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Ext2 ¥Ü¥ê¥å¡¼¥à"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1801
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "MSDOS ¥Ü¥ê¥å¡¼¥à"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1816
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "NFS ¥Ü¥ê¥å¡¼¥à"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1831
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
 #, fuzzy
 msgid "ReiserFS Volume"
 msgstr "NFS ¥Ü¥ê¥å¡¼¥à"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1847
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
 #, fuzzy
 msgid "UFS Volume"
 msgstr "NFS ¥Ü¥ê¥å¡¼¥à"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1877
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "ÉÔÌÀ¤Ê¥Ü¥ê¥å¡¼¥à"
 
@@ -6397,31 +6430,66 @@ msgstr "ÉÔÌÀ¤Ê¥Ü¥ê¥å¡¼¥à"
 msgid "C_lear Text"
 msgstr "¥Æ¥­¥¹¥È¤Î¥¯¥ê¥¢(_l)"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "¥Æ¥­¥¹¥È¤Î¥¯¥ê¥¢(_l)"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "¥Æ¥­¥¹¥È¤Î¥³¥Ô¡¼(_C)"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "ÁªÂò¤µ¤ì¤¿¥Æ¥­¥¹¥È¤ò¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼¤¹¤ë"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "¥Æ¥­¥¹¥È¤ÎÀÚ¤ê¼è¤ê(_T)"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+msgid "Cut _Text"
+msgstr "¥Æ¥­¥¹¥È¤ÎÀÚ¤ê¼è¤ê(_T)"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "ÁªÂò¤µ¤ì¤¿¥Æ¥­¥¹¥È¤ò¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤ØÀÚ¤ê¼è¤ë"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:46
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "¥Æ¥­¥¹¥È¤ÎŽ¤êÉÕ¤±(_P)"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤ËÊݴɤ·¤Æ¤¤¤¿¥Æ¥­¥¹¥È¤òŽ¤êÉÕ¤±¤ë"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤ØÃÖ¤«¤º¤ËÁªÂò¤µ¤ì¤¿¥Æ¥­¥¹¥È¤òºï½ü¤¹¤ë"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:80
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "¤¹¤Ù¤ÆÁªÂò(_S)"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+#, fuzzy
+msgid "Select _All"
+msgstr "¤¹¤Ù¤ÆÁªÂò(_S)"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤Î¤¹¤Ù¤Æ¤Î¥¢¥¤¥Æ¥à¤òÁªÂò¤·¤Þ¤¹"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "¥Æ¥­¥¹¥È¤Î¥³¥Ô¡¼(_C)"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:7
-msgid "_Cut Text"
-msgstr "¥Æ¥­¥¹¥È¤ÎÀÚ¤ê¼è¤ê(_C)"
-
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:93
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "¥Æ¥­¥¹¥È¤ÎŽ¤êÉÕ¤±(_P)"
 
@@ -6430,7 +6498,7 @@ msgstr "¥Æ¥­¥¹¥È¤ÎŽ¤êÉÕ¤±(_P)"
 #. * to change it when we upgrade to GTK 2.0.
 #.
 #: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
-#: src/nautilus-window-menus.c:569
+#: src/nautilus-window-menus.c:610
 msgid "Nautilus"
 msgstr "Nautilus"
 
@@ -6446,79 +6514,109 @@ msgstr "Nautilus ¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤È¥°¥é¥Õ¥£¥«¥ë¥·¥§¥ë"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:735
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr "%s ¤Î¥Û¡¼¥à"
 
-#: src/file-manager/fm-desktop-icon-view.c:1021
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "¥´¥ßÈ¢¤ò¶õ¤Ë¤¹¤ë..."
 
-#: src/file-manager/fm-desktop-icon-view.c:1023
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "¥´¥ßÈ¢¤ò¶õ¤Ë¤¹¤ë"
 
-#: src/file-manager/fm-desktop-icon-view.c:1043
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "¥¢¥ó¥Þ¥¦¥ó¥È¥Ü¥ê¥å¡¼¥à"
 
-#: src/file-manager/fm-directory-view.c:474
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr ""
 "¤³¤ì¤Ï %d ¸Ä¤Î¥¦¥£¥ó¥É¥¦¤Ëʬ³ä¤µ¤ì¤Þ¤¹¡£ ¤³¤Î¤Þ¤Þ¼Â¹Ô¤·¤Æ¤â¤è¤í¤·¤¤¤Ç¤¹¤«?"
 
-#: src/file-manager/fm-directory-view.c:476
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d ¸Ä¤Î¥¦¥£¥ó¥É¥¦¤ò³«¤­¤Þ¤¹¤«?"
 
-#: src/file-manager/fm-directory-view.c:1212
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr "¥´¥ßÈ¢¤«¤é %s ¤Î´°Á´¤Ëºï½ü¤ò¤·¤Þ¤¹¤«?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr "¥´¥ßÈ¢¤«¤éÁªÂò¤·¤¿ %d ¸Ä¤Î¥¢¥¤¥Æ¥à¤ò´°Á´¤Ëºï½ü¤·¤Þ¤¹¤«?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "ºï½ü"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "ºï½ü"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+#, fuzzy
+msgid "scripts"
+msgstr "ÀâÌÀ"
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" ¤òÁªÂò"
 
-#: src/file-manager/fm-directory-view.c:1214
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "1 ¤Ä¤Î¥Õ¥©¥ë¥À¤òÁªÂò"
 
-#: src/file-manager/fm-directory-view.c:1217
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "%d ¤Ä¤Î¥Õ¥©¥ë¥À¤òÁªÂò"
 
-#: src/file-manager/fm-directory-view.c:1223
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr "(0 ¸Ä¤Î¥¢¥¤¥Æ¥à¤ò´Þ¤à)"
 
-#: src/file-manager/fm-directory-view.c:1225
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr "(1 ¸Ä¤Î¥¢¥¤¥Æ¥à¤ò´Þ¤à)"
 
-#: src/file-manager/fm-directory-view.c:1227
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr "(%d ¸Ä¤Î¥¢¥¤¥Æ¥à¤ò´Þ¤à)"
 
-#: src/file-manager/fm-directory-view.c:1238
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" ¤òÁªÂò (%s)"
 
-#: src/file-manager/fm-directory-view.c:1242
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d ¸Ä¤Î¥¢¥¤¥Æ¥à¤òÁªÂò (%s)"
 
-#: src/file-manager/fm-directory-view.c:1249
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "¾¤Ë 1 ¸Ä¤Î¥¢¥¤¥Æ¥à¤òÁªÂò (%s)"
 
-#: src/file-manager/fm-directory-view.c:1252
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "¾¤Ë %d ¸Ä¤Î¥¢¥¤¥Æ¥à¤òÁªÂò (%s)"
@@ -6530,7 +6628,7 @@ msgstr "¾¤Ë %d ¸Ä¤Î¥¢¥¤¥Æ¥à¤òÁªÂò (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1281
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -6539,24 +6637,24 @@ msgstr "%s%s, %s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1407
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
 "will not be displayed."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1414
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "¥Õ¥¡¥¤¥ë¤¬Â¿¤¹¤®¤Þ¤¹"
 
-#: src/file-manager/fm-directory-view.c:2623
+#: src/file-manager/fm-directory-view.c:2752
 #, c-format
 msgid ""
 "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
 msgstr "\"%s\" ¤Ï¥´¥ßÈ¢¤Ø°ÜÆ°¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£º£¤¹¤°ºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/file-manager/fm-directory-view.c:2628
+#: src/file-manager/fm-directory-view.c:2757
 #, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
@@ -6565,7 +6663,7 @@ msgstr ""
 "%d "
 "¸Ä¤ÎÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤Ï¥´¥ßÈ¢¤Ø°ÜÆ°¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£º£¤¹¤°ºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/file-manager/fm-directory-view.c:2632
+#: src/file-manager/fm-directory-view.c:2761
 #, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -6574,154 +6672,287 @@ msgstr ""
 "ÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤Î %d ¸Ä¤Ï¥´¥ßÈ¢¤Ø°ÜÆ°¤Ç¤­¤Þ¤»¤ó. º£¤¹¤°¤³¤ì¤é¤Î %d "
 "¸Ä¤Î¥¢¥¤¥Æ¥à¤òºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/file-manager/fm-directory-view.c:2640
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "º£¤¹¤°ºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/file-manager/fm-directory-view.c:2641
-#: src/file-manager/fm-directory-view.c:2682
-msgid "Delete"
-msgstr "ºï½ü"
-
-#: src/file-manager/fm-directory-view.c:2671
+#: src/file-manager/fm-directory-view.c:2799
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr "¥´¥ßÈ¢¤«¤é %s ¤Î´°Á´¤Ëºï½ü¤ò¤·¤Þ¤¹¤«?"
 
-#: src/file-manager/fm-directory-view.c:2675
+#: src/file-manager/fm-directory-view.c:2803
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
 "Trash?"
 msgstr "¥´¥ßÈ¢¤«¤éÁªÂò¤·¤¿ %d ¸Ä¤Î¥¢¥¤¥Æ¥à¤ò´°Á´¤Ëºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/file-manager/fm-directory-view.c:2681
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "¥´¥ßÈ¢¤«¤éºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/file-manager/fm-directory-view.c:2978
-#: src/file-manager/fm-directory-view.c:3018
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "ÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤ò \"%s\" ¤ò»È¤Ã¤Æ³«¤¯"
 
-#: src/file-manager/fm-directory-view.c:3220
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "¾¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó(_A)..."
+
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "¾¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó(_A)..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "¾¤Î¥Ó¥å¡¼¥¢(_V)..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "¾¤Î¥Ó¥å¡¼¥¢(_V)..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "ÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤ò \"%s\" ¤ò»È¤Ã¤Æ³«¤¯"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "¥Ç¥¹¥¯¥È¥Ã¥×ÉÁ²è¤Ë Nautilus ¤ò»È¤¦"
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"%d "
+"¸Ä¤ÎÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤Ï¥´¥ßÈ¢¤Ø°ÜÆ°¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£º£¤¹¤°ºï½ü¤·¤Þ¤¹¤«?"
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤Ë³«¤¯"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 #, fuzzy
 msgid "Open _in New Window"
 msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤Ë³«¤¯"
 
-#: src/file-manager/fm-directory-view.c:3222
+#: src/file-manager/fm-directory-view.c:3959
 #, fuzzy, c-format
 msgid "Open _in %d New Windows"
 msgstr "%d ¸Ä¤Î¿·µ¬¥¦¥£¥ó¥É¥¦¤Ç³«¤¯(_N)"
 
-#: src/file-manager/fm-directory-view.c:3248
-msgid "Delete all selected items permanently"
-msgstr "¤¹¤Ù¤Æ¤ÎÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤ò±Êµ×Ū¤Ëºï½ü¤¹¤ë"
-
-#: src/file-manager/fm-directory-view.c:3253
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "¥´¥ßÈ¢¤«¤éºï½ü(_T)..."
 
-#: src/file-manager/fm-directory-view.c:3254
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "¥´¥ßÈ¢¤«¤éºï½ü(_T)"
 
-#: src/file-manager/fm-directory-view.c:3258
-msgid "Move all selected items to the Trash"
-msgstr "¤¹¤Ù¤Æ¤ÎÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤ò¥´¥ßÈ¢¤Ø°ÜÆ°¤·¤Þ¤¹"
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "¤¹¤Ù¤Æ¤ÎÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤ò±Êµ×Ū¤Ëºï½ü¤¹¤ë"
 
-#: src/file-manager/fm-directory-view.c:3262
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "¥´¥ßÈ¢¤Ø°ÜÆ°(_T)"
 
-#: src/file-manager/fm-directory-view.c:3292
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "¤¹¤Ù¤Æ¤ÎÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤ò¥´¥ßÈ¢¤Ø°ÜÆ°¤·¤Þ¤¹"
+
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "ºï½ü"
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "ºï½ü"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "¥ê¥ó¥¯¤òºîÀ®(_L)"
 
-#: src/file-manager/fm-directory-view.c:3293
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "¥ê¥ó¥¯¤òºîÀ®(_L)"
 
-#: src/file-manager/fm-directory-view.c:3311
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "¥´¥ßÈ¢¤ò¶õ¤Ë¤¹¤ë(_E)..."
 
-#: src/file-manager/fm-directory-view.c:3312
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "¥´¥ßÈ¢¤ò¶õ¤Ë¤¹¤ë(_E)"
 
-#: src/file-manager/fm-directory-view.c:3323
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "¥«¥¹¥¿¥à¥¤¥á¡¼¥¸¤òºï½ü¤¹¤ë(_e)"
 
-#: src/file-manager/fm-directory-view.c:3324
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "¥«¥¹¥¿¥à¥¤¥á¡¼¥¸¤òºï½ü¤¹¤ë(_e)"
 
-#: src/file-manager/fm-directory-view.c:3477
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "¥Õ¥¡¥¤¥ë(_F)"
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u ¸Ä¤Î¥Õ¥¡¥¤¥ë"
+
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "¥Æ¥­¥¹¥È¤Î¥³¥Ô¡¼(_C)"
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼Ãæ"
+
+#: src/file-manager/fm-directory-view.c:4252
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
 "link in the Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3480
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
 "want to put this link in the Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3486
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "²õ¤ì¤¿¥ê¥ó¥¯"
 
-#: src/file-manager/fm-directory-view.c:3487
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr "¼Î¤Æ¤ë"
 
-#: src/file-manager/fm-directory-view.c:3540
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
 "contents?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3546
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr "¼Â¹Ô¤Þ¤¿¤Ïɽ¼¨¤·¤Þ¤¹¤«?"
 
-#: src/file-manager/fm-directory-view.c:3547
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "¼Â¹Ô"
 
-#: src/file-manager/fm-directory-view.c:3548
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "ɽ¼¨"
 
-#: src/file-manager/fm-directory-view.c:3602
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
 msgstr ""
-"¤¹¤¤¤Þ¤»¤ó¤¬¡¢¥»¥­¥å¥ê¥Æ¥£¾å¤Î´Ø·¸¤Ç¥ê¥â¡¼¥È¥µ¥¤¥È¤Ë¤¢¤ë¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤³¤¢ "
-"ȤϤǤ­¤Þ¤»¤ó¡£¢"
+"¤¹¤¤¤Þ¤»¤ó¤¬¡¢¥»¥­¥å¥ê¥Æ¥£¾å¤Î´Ø·¸¤Ç¥ê¥â¡¼¥È¥µ¥¤¥È¤Ë¤¢¤ë¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤³¤"
+"¢ ȤϤǤ­¤Þ¤»¤ó¡£¢"
 
-#: src/file-manager/fm-directory-view.c:3604
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "¥ê¥â¡¼¥È¥ê¥ó¥¯¤ò¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: src/file-manager/fm-directory-view.c:3738
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr "\"%s\" ¤ò¥ª¡¼¥×¥óÃæ"
 
-#: src/file-manager/fm-directory-view.c:3744
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "¥ª¡¼¥×¥ó¤ò¥­¥ã¥ó¥»¥ë¤·¤Þ¤¹¤«?"
 
@@ -6731,116 +6962,121 @@ msgid ""
 "You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "\"%s\"¤ÎÆâÍƤòɽ¼¨¤¹¤ë¤¿¤á¤ËɬÍפʥ¢¥¯¥»¥¹¸¢¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/file-manager/fm-error-reporting.c:65
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "¤¹¤¤¤Þ¤»¤ó¤¬¡¢\"%s\"¤ÎÆâÍƤòɽ¼¨¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "¿·µ¬¥Õ¥©¥ë¥À¤òɽ¼¨Ãæ¤Ë¥¨¥é¡¼"
 
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "̾Á° \"%s\" ¤Ï¤¹¤Ç¤Ë¤³¤Î¥Õ¥©¥ë¥ÀÆâ¤Ç»È¤ï¤ì¤Æ¤¤¤Þ¤¹. Ê̤Î̾Á°¤ò»È¤Ã¤Æ²¼¤µ¤¤"
 
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 "¤³¤Î¥Õ¥©¥ë¥À¤Ë \"%s\" ¤Ï¤¢¤ê¤Þ¤»¤ó. ¤ª¤½¤é¤¯°ÜÆ°¤·¤¿¤«ºï½ü¤·¤¿¤Î¤Ç¤·¤ç¤¦?"
 
-#: src/file-manager/fm-error-reporting.c:109
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "\"%s\" ¤ò̾Á°Êѹ¹¤¹¤ë¤¿¤á¤ËɬÍפʥ¢¥¯¥»¥¹¸¢¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "̾Á° \"%s\" ¤ÏÍ­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó. Ê̤Î̾Á°¤ò»È¤Ã¤Æ²¼¤µ¤¤"
 
-#: src/file-manager/fm-error-reporting.c:124
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:133
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "¤¹¤¤¤Þ¤»¤ó¡¤\"%s\" ¤«¤é \"%s\" ¤Ø̾Á°Êѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: src/file-manager/fm-error-reporting.c:140
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "̾Á°Êѹ¹Ãæ¤Ë¥¨¥é¡¼"
 
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr ""
 "¤¢¤Ê¤¿¤Ë¤Ï \"%s\" ¤Î¥°¥ë¡¼¥×¤òÊѹ¹¤¹¤ë¤¿¤á¤ËɬÍפʥѡ¼¥ß¥Ã¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:172
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "¤¹¤¤¤Þ¤»¤ó¡¤\"%s\" ¤Î¥°¥ë¡¼¥×¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: src/file-manager/fm-error-reporting.c:176
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "¥°¥ë¡¼¥×ÀßÄêÃæ¤Ë¥¨¥é¡¼"
 
-#: src/file-manager/fm-error-reporting.c:198
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:205
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "¤¹¤¤¤Þ¤»¤ó¡¤\"%s\" ¤Î½êÍ­¼Ô¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "½êÍ­¼Ô¤ÎÀßÄêÃæ¤Ë¥¨¥é¡¼"
 
-#: src/file-manager/fm-error-reporting.c:230
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr "Æɤ߹þ¤ßÀìÍѥǥ£¥¹¥¯¤Ê¤Î¤Ç \"%s\" ¤Î¥¢¥¯¥»¥¹¸¢¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: src/file-manager/fm-error-reporting.c:237
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "¤¹¤¤¤Þ¤»¤ó¡¤\"%s\" ¤Î¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "¥¢¥¯¥»¥¹¸¢¤ÎÀßÄêÃæ¤Ë¥¨¥é¡¼"
 
-#: src/file-manager/fm-error-reporting.c:306
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "\"%s\" ¤«¤é \"%s\" ¤Ø̾Á°Êѹ¹Ãæ"
 
-#: src/file-manager/fm-error-reporting.c:311
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "̾Á°Êѹ¹¤ò¥­¥ã¥ó¥»¥ë¤·¤Þ¤¹¤«?"
 
@@ -6900,76 +7136,76 @@ msgstr ""
 "¾ðÊ󤬥¢¥¤¥³¥ó̾¤Î²¼¤Ë¸½¤ì¤ë¤è¤¦¤Ë¥ª¡¼¥À¡¼¤òÁª¤ó¤Ç²¼¤µ¤¤. "
 "¤è¤ê¿¤¯¤Î¾ðÊó¤ÏÀܶᤷ³ÈÂ礷¤¿»þ¤Ë¸½¤ì¤Þ¤¹¡¥"
 
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "̾Á°(_N)"
 
-#: src/file-manager/fm-icon-view.c:159
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "Îó¤Î¥¢¥¤¥³¥ó¤ò̾Á°½ç¤Ç¥½¡¼¥È"
 
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "¥µ¥¤¥º(_S)"
 
-#: src/file-manager/fm-icon-view.c:166
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "Îó¤Î¥¢¥¤¥³¥ó¤ò¥µ¥¤¥º½ç¤Ç¥½¡¼¥È"
 
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "¼ïÎàÊÌ(_T)"
 
-#: src/file-manager/fm-icon-view.c:173
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "Îó¤Î¥¢¥¤¥³¥ó¤ò¼ïÎà½ç¤Ë¥½¡¼¥È"
 
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "¹¹¿·Æü»þ(_D)"
 
-#: src/file-manager/fm-icon-view.c:180
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Îó¤Î¥¢¥¤¥³¥ó¤ò¹¹¿·Æü»þ½ç¤Ë¥½¡¼¥È"
 
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "¥¨¥ó¥Ö¥ì¥à(_E)"
 
-#: src/file-manager/fm-icon-view.c:187
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Îó¤Î¥¢¥¤¥³¥ó¤ò¥¨¥ó¥Ö¥ì¥à½ç¤Ë¤Ç¥½¡¼¥È"
 
-#: src/file-manager/fm-icon-view.c:1230
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "¥¢¥¤¥³¥ó¤ò¸µ¤Î¥µ¥¤¥º¤ËÌ᤹(_R)"
 
-#: src/file-manager/fm-icon-view.c:1231
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "¥¢¥¤¥³¥ó¤ò¸µ¤Î¥µ¥¤¥º¤ËÌ᤹(_R)"
 
-#: src/file-manager/fm-icon-view.c:1443
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "%s ¤ò»Ø¤·¤Æ¤¤¤Þ¤¹"
 
-#: src/file-manager/fm-list-view.c:2129
+#: src/file-manager/fm-list-view.c:2188
 #: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "¥µ¥¤¥º"
 
-#: src/file-manager/fm-list-view.c:2135
+#: src/file-manager/fm-list-view.c:2194
 #: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "¥¿¥¤¥×"
 
-#: src/file-manager/fm-list-view.c:2141
+#: src/file-manager/fm-list-view.c:2200
 #: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "¹¹¿·Æü»þ"
@@ -7026,121 +7262,127 @@ msgstr "(¤¤¤¯¤Ä¤«¤Î¥³¥ó¥Æ¥ó¥Ä¤ÏÆɤ߹þ¤ó¤Ç¤¤¤Þ¤»¤ó)"
 msgid "Contents:"
 msgstr "ÆâÍÆ:"
 
-#: src/file-manager/fm-properties-window.c:1433
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "´ðËÜ"
 
-#: src/file-manager/fm-properties-window.c:1512
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "¥¿¥¤¥×:"
 
-#: src/file-manager/fm-properties-window.c:1517
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "¥µ¥¤¥º:"
 
-#: src/file-manager/fm-properties-window.c:1521
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "¥ê¥ó¥¯¤ÎÀßÄê"
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
 msgstr "MIME ¥¿¥¤¥×:"
 
-#: src/file-manager/fm-properties-window.c:1527
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "½¤Àµ:"
 
-#: src/file-manager/fm-properties-window.c:1530
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "¥¢¥¯¥»¥¹:"
 
-#: src/file-manager/fm-properties-window.c:1539
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr "¥«¥¹¥¿¥à¥¢¥¤¥³¥ó¤ÎÁªÂò..."
 
-#: src/file-manager/fm-properties-window.c:1545
+#: src/file-manager/fm-properties-window.c:1558
 msgid "Remove Custom Icon"
 msgstr "¥«¥¹¥¿¥à¥¢¥¤¥³¥ó¤òºï½ü"
 
-#: src/file-manager/fm-properties-window.c:1873
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "Set user ID"
 
-#: src/file-manager/fm-properties-window.c:1878
+#: src/file-manager/fm-properties-window.c:1891
 msgid "Special Flags:"
 msgstr "Æüì¤Ê¥Õ¥é¥°:"
 
-#: src/file-manager/fm-properties-window.c:1881
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "Set group ID"
 
-#: src/file-manager/fm-properties-window.c:1883
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "Sticky"
 
-#: src/file-manager/fm-properties-window.c:1909
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "¥¢¥¯¥»¥¹¸¢"
 
-#: src/file-manager/fm-properties-window.c:1915
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
 "¤¢¤Ê¤¿¤Ï½êÍ­¼Ô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡¥¤·¤¿¤¬¤Ã¤Æ¤³¤ì¤é¤Î¥¢¥¯¥»¥¹¸¢¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-#: src/file-manager/fm-properties-window.c:1928
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "¥Õ¥¡¥¤¥ë¤Î½êÍ­¼Ô:"
 
-#: src/file-manager/fm-properties-window.c:1937
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "¥Õ¥¡¥¤¥ë¤Î¥°¥ë¡¼¥×:"
 
-#: src/file-manager/fm-properties-window.c:1955
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "½êÍ­¼Ô:"
 
-#: src/file-manager/fm-properties-window.c:1956
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "¥°¥ë¡¼¥×:"
 
-#: src/file-manager/fm-properties-window.c:1957
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "¤½¤Î¾:"
 
-#: src/file-manager/fm-properties-window.c:1976
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "Æɤ߹þ¤ß"
 
-#: src/file-manager/fm-properties-window.c:1980
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "½ñ¤­¹þ¤ß"
 
-#: src/file-manager/fm-properties-window.c:1984
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "¼Â¹Ô"
 
-#: src/file-manager/fm-properties-window.c:2035
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "¥Æ¥­¥¹¥Èɽµ­:"
 
-#: src/file-manager/fm-properties-window.c:2036
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "¿ô»úɽµ­:"
 
-#: src/file-manager/fm-properties-window.c:2037
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "ºÇ½ªÊѹ¹:"
 
-#: src/file-manager/fm-properties-window.c:2041
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "\"%s\" ¤Î¥¢¥¯¥»¥¹¸¢¤Ï³ÎÄê¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr "¥×¥í¥Ñ¥Æ¥£¥¦¥£¥ó¥É¥¦¤Îɽ¼¨¤ò¥­¥ã¥ó¥»¥ë¤·¤Þ¤¹¤«?"
 
-#: src/file-manager/fm-properties-window.c:2322
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr "¥×¥í¥Ñ¥Æ¥£¥¦¥£¥ó¥É¥¦¤òºîÀ®Ãæ"
 
-#: src/file-manager/fm-properties-window.c:2422
+#: src/file-manager/fm-properties-window.c:2435
 msgid "Select an icon:"
 msgstr "¥¢¥¤¥³¥ó¤ÎÁªÂò:"
 
@@ -7162,7 +7404,7 @@ msgid ""
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:159
-#: src/file-manager/nautilus-indexing-info.c:405
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr "¸¡º÷¥µ¡¼¥Ó¥¹¤ÏÍøÍѤǤ­¤Þ¤»¤ó"
 
@@ -7302,7 +7544,7 @@ msgstr ""
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
 #: src/file-manager/fm-search-list-view.c:360
-#: src/file-manager/nautilus-indexing-info.c:340
+#: src/file-manager/nautilus-indexing-info.c:342
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
@@ -7314,20 +7556,20 @@ msgid "Fast searches are not available on your computer"
 msgstr "¹â®¸¡º÷¤Ï¤³¤Î¥Þ¥·¥ó¤Ç¤ÏÍøÍѤǤ­¤Þ¤»¤ó"
 
 #: src/file-manager/fm-search-list-view.c:373
-#: src/file-manager/nautilus-indexing-info.c:359
+#: src/file-manager/nautilus-indexing-info.c:361
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Fast search is disabled in your Search preferences, so no index is available."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:376
-#: src/file-manager/nautilus-indexing-info.c:345
-#: src/file-manager/nautilus-indexing-info.c:363
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
 msgid "Fast searches are not available on your computer."
 msgstr "¹â®¸¡º÷¤Ï¤³¤Î¥Þ¥·¥ó¤Ç¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£"
 
 #: src/file-manager/fm-search-list-view.c:377
-#: src/file-manager/nautilus-indexing-info.c:364
+#: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
 "To enable fast search, open the Preferences menu and choose Preferences. "
 "Then select Search preferences and put a checkmark in the Enable Fast Search "
@@ -7379,7 +7621,7 @@ msgid "Change Desktop Background"
 msgstr "¥Ç¥¹¥¯¥È¥Ã¥×ÇطʤòÊѹ¹"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Delete all items in the Trash"
 msgstr "¥´¥ßÈ¢¤Î¤¹¤Ù¤Æ¤Î¥¢¥¤¥Æ¥à¤òºï½ü¤¹¤ë"
 
@@ -7425,143 +7667,195 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "ÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤ò±ÜÍ÷¤¹¤ëÊ̤Υӥ塼¥¢¤òÁª¤Ö"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-msgid "Create Link"
-msgstr "¥ê¥ó¥¯¤òºîÀ®"
+#, fuzzy
+msgid "Copy Files"
+msgstr "¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼Ãæ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "¤³¤Î¥Õ¥©¥ë¥À¤ÎÃæ¤Ë¶õ¤Î¥Õ¥©¥ë¥À¤ò¿·µ¬¤ËºîÀ®¤·¤Þ¤¹"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "ÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤´¤È¤Î¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤òºîÀ®¤·¤Þ¤¹"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u ¸Ä¤Î¥Õ¥¡¥¤¥ë"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "ÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤ò¥´¥ßÈ¢¤Ø°ÜÆ°¤·¤Þ¤¹"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "Ê£À½"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "ÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤ÎÊ£À½¤òºî¤ê¤Þ¤¹"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "¥ê¥ó¥¯¤òºîÀ®"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr "ÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤ò¥´¥ßÈ¢¤Ø°ÜÆ°¤·¤Þ¤¹"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Move to Trash"
 msgstr "¥´¥ßÈ¢¤Ø°ÜÆ°"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "¿·µ¬¥Õ¥©¥ë¥À"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "³«¤¯(_O)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 #, fuzzy
 msgid "Open Wit_h"
 msgstr "¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤«¤é³«¤¯"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤«¤é³«¤¯"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤Ë³Æ¥¢¥¤¥Æ¥à¤ò³«¤­¤Þ¤¹"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤Ë³«¤¯"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤ËÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤ò³«¤­¤Þ¤¹"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "¾¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "¾¤Î¥Ó¥å¡¼¥¢..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Other _Application..."
-msgstr "¾¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó(_A)..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "¥Æ¥­¥¹¥È¤ÎŽ¤êÉÕ¤±(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-msgid "Other _Viewer..."
-msgstr "¾¤Î¥Ó¥å¡¼¥¢(_V)..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr "¥«¥¹¥¿¥à¥¤¥á¡¼¥¸¤òºï½ü¤¹¤ë"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr ""
 
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "Çطʤò¥ê¥»¥Ã¥È"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#, fuzzy
+msgid "Scripts"
+msgstr "¥·¡¼¥¯¥ì¥Ã¥È"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr "¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤òÁªÂò"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 #, fuzzy
 msgid "Select _All Files"
 msgstr "¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤òÁªÂò"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤Î¤¹¤Ù¤Æ¤Î¥¢¥¤¥Æ¥à¤òÁªÂò¤·¤Þ¤¹"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr "¥×¥í¥Ñ¥Æ¥£¤Îɽ¼¨"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Show Trash"
 msgstr "¥´¥ßÈ¢¤òɽ¼¨"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "¥×¥í¥Ñ¥Æ¥£¤Îɽ¼¨(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "Show the contents of the Trash"
 msgstr "¥´¥ßÈ¢¤ÎÆâÍƤòɽ¼¨¤·¤Þ¤¹"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "ÁªÂò¤·¤¿¥¢¥¤¥Æ¥à¤Î¤½¤ì¤¾¤ì¤Î¥×¥í¥Ñ¥Æ¥£¤òɽ¼¨¡¦½¤Àµ¤·¤Þ¤¹"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "Ê£À½(_D)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 #, fuzzy
 msgid "_New Folder"
 msgstr "¿·µ¬¥Õ¥©¥ë¥À"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "³«¤¯(_O)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "¥Æ¥­¥¹¥È¤ÎŽ¤êÉÕ¤±(_P)"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Show Trash"
 msgstr "¥´¥ßÈ¢¤òɽ¼¨(_S)"
 
@@ -7734,7 +8028,7 @@ msgstr ""
 
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr "¥¤¥ó¥Ç¥¯¥¹ºîÀ®¥¹¥Æ¡¼¥¿¥¹"
 
@@ -7750,21 +8044,21 @@ msgstr ""
 msgid "Your files were last indexed at %s"
 msgstr "¤¢¤Ê¤¿¤Î¥Õ¥¡¥¤¥ë¤Ï %s ¤ËºÇ½ª¥¤¥ó¥Ç¥Ã¥¯¥¹¤µ¤ì¤¿"
 
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "¸½ºß¹¹¿·¤·¤Æ¤¤¤Þ¤¹"
 
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast.  Your files are currently being indexed."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:404
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "¤¹¤¤¤Þ¤»¤ó¤¬, medusa ¸¡º÷¥µ¡¼¥Ó¥¹¤ÏÍøÍѤǤ­¤Þ¤»¤ó"
 
-#: src/file-manager/nautilus-indexing-info.c:426
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr "%p %I:%M, %x"
 
@@ -7863,13 +8157,13 @@ msgid ""
 msgstr ""
 "Nautilus "
 "¤Ï¸½ºß¼ÂÍÑŪ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤Ê¤Ë¤«ÌäÂ꤬µ¯¤³¤Ã¤¿¤é¡¢\"nautilus-clean.sh -x\" "
-"¤È¤¤¤¦¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ì¤Ð²ò·è¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤â¤·²ò·è¤·¤Ê¤«¤Ã¤¿¤é¡¢¥³¥ó¥¢"
-"ԥ塼¥¿¤òºÆµ¯Æ°¤¹¤ë¤+ Nautilus ¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£\n"
+"¤È¤¤¤¦¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ì¤Ð²ò·è¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤â¤·²ò·è¤·¤Ê¤«¤Ã¤¿¤é¡¢¥³¥ó¥"
+"¢Ô¥å¡¼¥¿¤òºÆµ¯Æ°¤¹¤ë¤+ Nautilus ¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£\n"
 "\n"
 "OAF ¤Ï Nautilus_Shell.oaf ¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿. "
 "¤Ò¤È¤Ä¤Î¸¶°ø¤È¤·¤Æ¤Ï¡¢LD_LIBRARY_PATH ¤Ë OAF "
-"¥é¥¤¥Ö¥é¥ê¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬¤Ê¤¤¤È¤¤¤¦¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤½¤Î¤Û¤«¤Î¤¢¤êÆÀ¤ë¸¶°ø¤È¤¢"
-"·¤Æ¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤¬¸í¤Ã¤Æ¤¤¤F Nautilus_Shell.oaf "
+"¥é¥¤¥Ö¥é¥ê¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬¤Ê¤¤¤È¤¤¤¦¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤½¤Î¤Û¤«¤Î¤¢¤êÆÀ¤ë¸¶°ø¤È¤"
+"¢·¤Æ¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤¬¸í¤Ã¤Æ¤¤¤F Nautilus_Shell.oaf "
 "¥Õ¥¡¥¤¥ë¤¬¤Ê¤¯¤Ê¤Ã¤¿¤È¤¤¤¦¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£\n"
 "\n"
 "\"nautilus-clean.sh -x\" "
@@ -7879,8 +8173,8 @@ msgstr ""
 "oafd ¤È gconfd ¤ò kill "
 "¤¹¤ë¤ÈÌäÂ꤬²ò·è¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¤¬¡¢¤½¤ì¤Ï¤Ê¤¼¤À¤«¤ï¤«¤ê¤Þ¤»¤ó¡£\n"
 "\n"
-"Àµ¤·¤¯¤Ê¤¤¥Ð¡¼¥¸¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤ë¤È¤³¤Î¥¨¥é¡¼¤¬µ¯¤­¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡¢"
-"£¢"
+"Àµ¤·¤¯¤Ê¤¤¥Ð¡¼¥¸¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤ë¤È¤³¤Î¥¨¥é¡¼¤¬µ¯¤­¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡"
+"¢£¢"
 
 #. Some misc. error (can never happen with current
 #. * version of OAF). Show dialog and terminate the
@@ -7911,8 +8205,8 @@ msgid ""
 "help fix the problem."
 msgstr ""
 "¥Õ¥¡¥¯¥È¥ê¤òõ¤½¤¦¤È¤·¤ÆOAF¤¬Í½´ü¤·¤Ê¤¤¥¨¥é¡¼¤òȯÀ¸¤·¤¿¤Î¤ÇNautilus¤Ï¸½ºß»ÈÍÑ"
-"¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£oafd¤òkill¤·¤ÆNautilus¤òºÆµ¯Æ°¤¹¤ë¤³¤È¤ÇÌäÂ꤬²ò·è¤¹¤ë¤¢"
-"«¤â¤·¤ì¤Þ¤»¤ó¡£¢"
+"¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£oafd¤òkill¤·¤ÆNautilus¤òºÆµ¯Æ°¤¹¤ë¤³¤È¤ÇÌäÂ꤬²ò·è¤¹¤ë¤"
+"¢«¤â¤·¤ì¤Þ¤»¤ó¡£¢"
 
 #: src/nautilus-application.c:470
 msgid ""
@@ -7921,8 +8215,8 @@ msgid ""
 "may help fix the problem."
 msgstr ""
 "¥·¥§¥ë¥ª¥Ö¥¸¥§¥¯¥È¤òõ¤½¤¦¤È¤·¤ÆOAF¤¬Í½´ü¤·¤Ê¤¤¥¨¥é¡¼¤òȯÀ¸¤·¤¿¤Î¤ÇNautilus¤Ï"
-"¸½ºß»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£oafd¤òkill¤·¤ÆNautilus¤òºÆµ¯Æ°¤¹¤ë¤³¤È¤ÇÌäÂ꤬²¢"
-"ò·è¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¢"
+"¸½ºß»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£oafd¤òkill¤·¤ÆNautilus¤òºÆµ¯Æ°¤¹¤ë¤³¤È¤ÇÌäÂ꤬²"
+"¢ò·è¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¢"
 
 #: src/nautilus-application.c:635
 msgid ""
@@ -7944,7 +8238,7 @@ msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯"
 msgid "Location"
 msgstr "¾ì½ê"
 
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:763
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "ºï½ü"
 
@@ -8101,7 +8395,7 @@ msgstr "¹â®¸¡º÷¤ò¤¹¤ë"
 msgid "Turn fast search on when cron is enabled"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1028
+#: src/nautilus-first-time-druid.c:1027
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "currently can't be performed because the program crond, which does\n"
@@ -8115,7 +8409,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1036
+#: src/nautilus-first-time-druid.c:1035
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "may not be performed because the program crond, which does nightly tasks\n"
@@ -8129,7 +8423,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1123
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
 "Click Finish to launch Nautilus. You'll start with two\n"
 "Nautilus windows: one shows your home folder, and the\n"
@@ -8139,7 +8433,7 @@ msgid ""
 "We hope you enjoy Nautilus!"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1130
+#: src/nautilus-first-time-druid.c:1129
 msgid ""
 "Click Finish to launch Nautilus. You'll start with a\n"
 "window showing your home folder.\n"
@@ -8147,15 +8441,15 @@ msgid ""
 "We hope you enjoy Nautilus!"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1154
+#: src/nautilus-first-time-druid.c:1153
 msgid "Nautilus First Time Setup"
 msgstr "Nautilus ½é´üÀßÄê"
 
-#: src/nautilus-first-time-druid.c:1184
+#: src/nautilus-first-time-druid.c:1183
 msgid "Welcome to Nautilus"
 msgstr "Nautilus ¤Ø¤è¤¦¤³¤½"
 
-#: src/nautilus-first-time-druid.c:1186
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
 "Nautilus...\n"
 "    Is a great file manager for the GNOME desktop.\n"
@@ -8167,51 +8461,51 @@ msgid ""
 msgstr ""
 
 #. set up the final page
-#: src/nautilus-first-time-druid.c:1197
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "´°Î»"
 
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1210
+#: src/nautilus-first-time-druid.c:1209
 msgid "Choose Your User Level"
 msgstr "¥æ¡¼¥¶¥ì¥Ù¥ë¤ÎÁªÂò"
 
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1214
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr "GMC¤«¤éNautilus¤Ø¤Î¾è¤ê´¹¤¨"
 
 #. set up the `Launch Medusa' page
-#: src/nautilus-first-time-druid.c:1218
+#: src/nautilus-first-time-druid.c:1217
 msgid "Fast Searches"
 msgstr "¹â®¸¡º÷"
 
 #. set up optional page to tell the user how to run cron
-#: src/nautilus-first-time-druid.c:1226
+#: src/nautilus-first-time-druid.c:1225
 msgid "The Cron Daemon"
 msgstr ""
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1231
+#: src/nautilus-first-time-druid.c:1230
 msgid "Checking Your Internet Connection"
 msgstr ""
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1242
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "Nautilus ¤ò¥¢¥Ã¥×¥Ç¡¼¥ÈÃæ..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1250
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "Web Proxy ¹½À®"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1325
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "¥Ç¥³¡¼¥É¥¢¥Ã¥×¥Ç¡¼¥È..."
 
-#: src/nautilus-first-time-druid.c:1342
+#: src/nautilus-first-time-druid.c:1341
 msgid "Update Complete. Click Next to Continue."
 msgstr "¹¹¿·¤Ï´°Î»¤·¤Þ¤·¤¿. ³¤±¤ë¤¿¤á¤Ë¼¡¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤."
 
@@ -8219,7 +8513,7 @@ msgstr "¹¹¿·¤Ï´°Î»¤·¤Þ¤·¤¿. ³¤±¤ë¤¿¤á¤Ë¼¡¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤."
 #. * doesn't exist. Arlo and I (jsh) and decided that the
 #. * best thing to do is silently fail
 #.
-#: src/nautilus-first-time-druid.c:1357
+#: src/nautilus-first-time-druid.c:1356
 msgid "No Update Available... Press Next to Continue."
 msgstr "¹¹¿·¤Ï¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿. ³¤±¤ë¤¿¤á¤Ë¼¡¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤"
 
@@ -8248,47 +8542,47 @@ msgstr "ÊÌ¡¹¤Î¥¦¥£¥ó¥É¥¦¤Ç¤³¤ì¤é %d ¤Ä¤Î¾ì½ê¤òɽ¼¨¤·¤¿¤¤¤Ç¤¹¤«?"
 msgid "View in Multiple Windows?"
 msgstr "Ê£¿ô¤Î¥¦¥£¥ó¥É¥¦¤Çɽ¼¨¤·¤Þ¤¹¤«?"
 
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr ""
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr ""
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr ""
 
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "Nautilus ¤Î½ªÎ»"
 
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "Nautilus ¤ÎºÆµ¯Æ°"
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check ¤Ï URIs ¤Ç»È¤ï¤ì¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check ¤Ï¾¤Î¥ª¥×¥·¥ç¥ó¤Ç»È¤ï¤ì¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit ¤Ï URIs ¤Ç»È¤ï¤ì¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart ¤Ï URIs ¤Ç»È¤ï¤ì¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 
@@ -8682,10 +8976,9 @@ msgid ""
 "comments, and suggestions."
 msgstr ""
 "Nautilus¤ò¤ª»È¤¤¤¤¤¿¤À¤¤¤Æ¤¢¤ê¤¬¤È¤¦¤´¤¶¤¤¤Þ¤¹¡£\n"
-"¾¤Î³«È¯ÅÓÃæ¤Î¥½¥Õ¥È¥¦¥§¥¢¤ÈƱ¤¸¤è¤¦¤Ë¡¢Nautilus¤ò»È¤Ã¤Æ¤¤¤ë¤È¤­¤Ë¤ÏÃí°Õ¤·¤Ê¤¢"
-"¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£Åazel¤ÏNautilus¤¬Àµ¤·¤¯Æ°ºî¤¹¤ë¤È¤¤¤¦ÊݾڤϤʤˤ⤷¤Þ¤»¤ó¤·¡¢"
-"¢»ÈÍѾå¤Î¿®ÍêÀ­¤â¤¢¤ê¤Þ¤»¤ó¡£¥æ¡¼¥¶Â¦¤Î¥ê¥¹¥¯¤Ç¤´ÍøÍѤ¯¤À¤µ¤¤¡£Ün"
-"\n"
+"¾¤Î³«È¯ÅÓÃæ¤Î¥½¥Õ¥È¥¦¥§¥¢¤ÈƱ¤¸¤è¤¦¤Ë¡¢Nautilus¤ò»È¤Ã¤Æ¤¤¤ë¤È¤­¤Ë¤ÏÃí°Õ¤·¤Ê¤"
+"¢¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£Åazel¤ÏNautilus¤¬Àµ¤·¤¯Æ°ºî¤¹¤ë¤È¤¤¤¦ÊݾڤϤʤˤ⤷¤Þ¤»¤ó¤·"
+"¡¢¢»ÈÍѾå¤Î¿®ÍêÀ­¤â¤¢¤ê¤Þ¤»¤ó¡£¥æ¡¼¥¶Â¦¤Î¥ê¥¹¥¯¤Ç¤´ÍøÍѤ¯¤À¤µ¤¤¡£Ün\n"
 "http://www.eazel.com/feedback.html "
 "¤òˬÌ䤷¤Æ¥Õ¥£¡¼¥É¥Ð¥Ã¥¯¤ä¡¢¥³¥á¥ó¥È¡¢Äó°Æ¤ò¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
@@ -8778,15 +9071,18 @@ msgid "View as List"
 msgstr "°ìÍ÷¤Çɽ¼¨"
 
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+#, fuzzy
+msgid " _Advanced"
 msgstr " ¾åµé¼Ô"
 
 #: src/nautilus-shell-ui.xml.h:2
-msgid " Beginner"
+#, fuzzy
+msgid " _Beginner"
 msgstr " ½é¿´¼Ô"
 
 #: src/nautilus-shell-ui.xml.h:3
-msgid " Intermediate"
+#, fuzzy
+msgid " _Intermediate"
 msgstr " Ãæ´Ö"
 
 #: src/nautilus-shell-ui.xml.h:4
@@ -8826,341 +9122,339 @@ msgid "Close this window"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤Þ¤¹"
 
 #: src/nautilus-shell-ui.xml.h:15
-msgid "Cut _Text"
-msgstr "¥Æ¥­¥¹¥È¤ÎÀÚ¤ê¼è¤ê(_T)"
-
-#: src/nautilus-shell-ui.xml.h:17
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr "Nautilus¤òºî¤Ã¤¿¿Í¤¿¤Á¤Î¥¯¥ì¥¸¥Ã¥È¤òɽ¼¨¤·¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr "Nautilus¤Î¥ª¥ó¥é¥¤¥ó¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:19
 msgid "Display quick reference pages for Nautilus"
 msgstr "Nautilus ¤Î¥¯¥¤¥Ã¥¯¥ê¥Õ¥¡¥ì¥ó¥¹¥Ú¡¼¥¸¤òɽ¼¨¤¹¤ë"
 
-#: src/nautilus-shell-ui.xml.h:22
+#: src/nautilus-shell-ui.xml.h:20
 msgid "Display release notes for Nautilus"
 msgstr "Nautilus ¤Î¥ê¥ê¡¼¥¹¥Î¡¼¥È¤òɽ¼¨¤¹¤ë"
 
-#: src/nautilus-shell-ui.xml.h:23
+#: src/nautilus-shell-ui.xml.h:21
 msgid "Display support information for Nautilus and Eazel Services"
 msgstr "Nautilus¤ÈEazel¥µ¡¼¥Ó¥¹¤Î¥µ¥Ý¡¼¥È¾ðÊó¤òɽ¼¨¤·¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:24
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Display the latest contents of the current location"
 msgstr "¸½ºß¤Î¾ì½ê¤ÎºÇ¿·¥³¥ó¥Æ¥ó¥Ä¤òɽ¼¨¤·¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:25
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr "ÍøÍѲÄǽ¤Ê¥Æ¡¼¥Þ¤òɽ¼¨¤·¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:24
 msgid "Edit various Nautilus preferences"
 msgstr "³Æ¼ï Nautilus ¤ÎÀßÄê¤òÊÔ½¸"
 
-#: src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "¸¡º÷"
 
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr "ÍúÎò¤òºï½ü(_G)"
 
-#: src/nautilus-shell-ui.xml.h:29
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr "Eazel¥µ¡¼¥Ó¥¹¤Ë¹Ô¤­¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr "¥Û¡¼¥à¤Ø°ÜÆ°¤·¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr "¤³¤ì¤¬¤¢¤ë¾ì½ê¤Ø°ÜÆ°¤·¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:32
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr "¼¡¤ÎˬÌäºÑ¤ß¤Î¾ì½ê¤Ø°ÜÆ°¤·¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:33
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr "Á°¤ÎˬÌäºÑ¤ß¤Î¾ì½ê¤Ø°ÜÆ°¤·¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:442
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
 #, fuzzy
 msgid "Hide Location _Bar"
 msgstr "¥í¥±¡¼¥·¥ç¥ó¥Ð¡¼¤òÈóɽ¼¨"
 
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:424
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
 #, fuzzy
 msgid "Hide St_atus Bar"
 msgstr "¥¹¥Æ¡¼¥¿¥¹¥Ð¡¼¤òÈóɽ¼¨"
 
-#: src/nautilus-shell-ui.xml.h:36 src/nautilus-window-menus.c:430
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
 #, fuzzy
 msgid "Hide _Sidebar"
 msgstr "¥µ¥¤¥É¥Ð¡¼¤òÈóɽ¼¨"
 
-#: src/nautilus-shell-ui.xml.h:37 src/nautilus-window-menus.c:436
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
 #, fuzzy
 msgid "Hide _Toolbar"
 msgstr "¥Ä¡¼¥ë¥Ð¡¼¤ò±£¤¹"
 
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:37
 msgid "Nautilus Quick _Reference"
 msgstr "Nautilus ¥¯¥¤¥Ã¥¯¥ê¥Õ¥¡¥ì¥ó¥¹(_R)"
 
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:38
 msgid "Nautilus Release _Notes"
 msgstr "Nautilus ¥ê¥ê¡¼¥¹¥Î¡¼¥È(_N)"
 
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:39
 msgid "Nautilus User _Manual"
 msgstr "Nautilus ¥æ¡¼¥¶¡¼¥Þ¥Ë¥å¥¢¥ë(_N)"
 
-#: src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦"
 
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:41
 #, fuzzy
 msgid "New _Window"
 msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦"
 
-#: src/nautilus-shell-ui.xml.h:44
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "Ä̾掠¥¤¥º"
 
-#: src/nautilus-shell-ui.xml.h:45
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Ʊ¤¸¾ì½ê¤òɽ¼¨¤¹¤ëNautilus¥¦¥£¥ó¥É¥¦¤ò¤â¤¦°ì¤Ä³«¤­¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:47
-msgid "Preferences..."
-msgstr "ÀßÄê..."
-
-#: src/nautilus-shell-ui.xml.h:48
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "¹¹¿·"
 
-#: src/nautilus-shell-ui.xml.h:49
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤ØÃÖ¤«¤º¤ËÁªÂò¤µ¤ì¤¿¥Æ¥­¥¹¥È¤òºï½ü¤·¤Þ¤¹"
-
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr "¥×¥í¥Õ¥¡¥¤¥ë¤ò¥ì¥Ý¡¼¥È¤·¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr "¥×¥í¥Õ¥¡¥¤¥ë¤ò¥ê¥»¥Ã¥È¤·¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr "¥¦¥§¥Ö¤ò¸¡º÷¤·¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr "¤³¤Î¥Þ¥·¥ó¤Î¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤·¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:54
-#, fuzzy
-msgid "Select _All"
-msgstr "¤¹¤Ù¤ÆÁªÂò(_S)"
-
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
 msgstr "Nautilus¤ÈEazel¥µ¡¼¥Ó¥¹¤Î¥Õ¥£¡¼¥É¥Ð¥Ã¥¯¤òÁ÷¤ë¥Ú¡¼¥¸¤òɽ¼¨¤·¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "ÆâÍƤòÄ̾ï¤Î¥µ¥¤¥º¤Çɽ¼¨¤·¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "ÆâÍƤò¤è¤êÂç¤Þ¤«¤Ëɽ¼¨¤·¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:58
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "ÆâÍƤò¤è¤ê¾ÜºÙ¤Ëɽ¼¨¤·¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr "¥×¥í¥Õ¥¡¥¤¥ë¤Î³«»Ï"
 
-#: src/nautilus-shell-ui.xml.h:61
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr "¥×¥í¥Õ¥¡¥¤¥ë¤ÎÄä»ß"
 
-#: src/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr "¤³¤Î¾ì½ê¤ÎÆɤ߹þ¤ß¤òÄä»ß¤·¤Þ¤¹"
 
-#: src/nautilus-shell-ui.xml.h:63
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "ºÇ¸å¤ËÊѹ¹¤·¤¿¥Æ¥­¥¹¥È¤ò¸µ¤ËÌ᤹"
 
-#: src/nautilus-shell-ui.xml.h:64
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "¾å"
 
-#: src/nautilus-shell-ui.xml.h:65
-msgid "Use Advanced settings"
-msgstr "¾åµé¼Ô¤ÎÀßÄê¤ò»È¤¦"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:66
-msgid "Use Beginner settings"
-msgstr "½é¿´¼Ô¤ÎÀßÄê¤ò»È¤¦"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:67
-msgid "Use Intermediate settings"
-msgstr "Ãæµé¼Ô¤ÎÀßÄê¤ò»È¤¦"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:63
 #, fuzzy
 msgid "We_b Search"
 msgstr "¥¦¥§¥Ö¸¡º÷"
 
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "¥¦¥§¥Ö¸¡º÷"
 
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "³ÈÂç"
 
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "½Ì¾®"
 
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "³ÈÂç (_I)"
 
-#: src/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "½Ì¾® (_O)"
 
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "Nautilus ¤Ë¤Ä¤¤¤Æ(_A)..."
 
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¤ËÄɲÃ(_A)"
 
-#: src/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "Ìá¤ë(_B)"
 
-#: src/nautilus-shell-ui.xml.h:77
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr "Çطʤȥ¨¥ó¥Ö¥ì¥à(_B)..."
 
-#: src/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯(_B)"
 
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë(_C)"
 
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:76
 msgid "_Customer Support"
 msgstr "¥«¥¹¥¿¥Þ¡¼¥µ¥Ý¡¼¥È(_C)"
 
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "ÊÔ½¸(_E)"
 
-#: src/nautilus-shell-ui.xml.h:83
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¤ÎÊÔ½¸(_E)"
 
-#: src/nautilus-shell-ui.xml.h:84
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "ÀßÄê..."
+
+#: src/nautilus-shell-ui.xml.h:80
 msgid "_Feedback"
 msgstr "¥Õ¥£¡¼¥É¥Ð¥Ã¥¯(_F)"
 
-#: src/nautilus-shell-ui.xml.h:86 src/nautilus-window-menus.c:1358
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "¸¡º÷(_F)"
 
-#: src/nautilus-shell-ui.xml.h:87
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "Á°(_F)"
 
-#: src/nautilus-shell-ui.xml.h:88
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "°ÜÆ°(_G)"
 
-#: src/nautilus-shell-ui.xml.h:89
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "¥Ø¥ë¥×(_H)"
 
-#: src/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "¥Û¡¼¥à(_H)"
 
-#: src/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "¾ì½ê"
+
+#: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr "Nautilus¥Æ¡¼¥Þ(_N)..."
 
-#: src/nautilus-shell-ui.xml.h:92
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "Ä̾掠¥¤¥º(_N)"
 
-#: src/nautilus-shell-ui.xml.h:94
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "ÀßÄê"
+
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr "¥×¥í¥Õ¥¡¥¤¥é(_P)"
 
-#: src/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "¹¹¿·(_R)"
 
-#: src/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr "¥×¥í¥Õ¥¡¥¤¥ë¤Î¥ì¥Ý¡¼¥È(_R)"
 
-#: src/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr "¥×¥í¥Õ¥¡¥¤¥ë¤Î¥ê¥»¥Ã¥È(_R)"
 
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr "¥×¥í¥Õ¥¡¥¤¥ë¤Î³«»Ï(_S)"
 
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr "¥×¥í¥Õ¥¡¥¤¥ë¤ÎÄä»ß(_S)"
 
-#: src/nautilus-shell-ui.xml.h:100
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "¸µ¤ËÌ᤹(_U)"
 
-#: src/nautilus-shell-ui.xml.h:101
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "¾å¤Ø(_U)"
 
-#: src/nautilus-shell-ui.xml.h:102
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "ɽ¼¨(_V)"
 
-#: src/nautilus-sidebar.c:659
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -9168,42 +9462,42 @@ msgstr ""
 "¥«¥¹¥¿¥à¥¢¥¤¥³¥ó¤Ï°ìÅÙ¤Ë2¤Ä°Ê¾åºî¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó! "
 "°ì¤Ä¤Î²èÁü¤ò¥«¥¹¥¿¥à¥¢¥¤¥³¥ó¤Ë¥É¥é¥Ã¥°¤·¤Æ¥»¥Ã¥È¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: src/nautilus-sidebar.c:661
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "¤â¤¦°ì¤Ä¤Î²èÁü"
 
-#: src/nautilus-sidebar.c:680
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
 msgstr ""
 
-#: src/nautilus-sidebar.c:682
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "¥í¡¼¥«¥ë²èÁü¤Î¤ß"
 
-#: src/nautilus-sidebar.c:687
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
 msgstr ""
 
-#: src/nautilus-sidebar.c:689
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "²èÁü¤Î¤ß"
 
-#: src/nautilus-sidebar.c:1247
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "%s ¤«¤é³«¤¯"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1283
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "¾¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤«¤é³«¤¯..."
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1390
+#: src/nautilus-sidebar.c:1424
 msgid "  Empty Trash  "
 msgstr "  ¥´¥ßÈ¢¤ò¶õ¤Ë¤¹¤ë  "
 
@@ -9295,17 +9589,17 @@ msgstr "¥Æ¡¼¥Þ¤òºï½ü¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 msgid "No description available for the \"%s\" theme"
 msgstr "\"%s\" ¥Æ¡¼¥Þ¤Î¤¿¤á¤Î¾ðÊó¤ÏÍøÍѤǤ­¤Þ¤»¤ó"
 
-#: src/nautilus-window.c:584
+#: src/nautilus-window.c:637
 #, fuzzy
 msgid "View as ..."
 msgstr "¾¤Çɽ¼¨..."
 
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1286
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "¾¤Çɽ¼¨..."
 
-#: src/nautilus-window.c:1687
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "ÊĤ¸¤ë"
 
@@ -9319,23 +9613,23 @@ msgstr "ÊĤ¸¤ë"
 msgid "Preview Release %s: %s"
 msgstr "¥×¥ì¥Ó¥å¡¼¥ê¥ê¡¼¥¹ %s: %s"
 
-#: src/nautilus-window-manage-views.c:812
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "ɽ¼¨¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: src/nautilus-window-manage-views.c:823
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
 "view or go to a different location."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:834
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:993
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
@@ -9343,70 +9637,70 @@ msgstr ""
 "¥µ¥¤¥É¥Ð¡¼¥Ñ¥Í¥ë¤Î¤Ò¤È¤Ä¤ÇºÆµ¯ÉÔǽ¤Ê¥¨¥é¡¼¤ÈÁø¶ø¤·¤Þ¤·¤¿. "
 "»ÄÇ°¤Ê¤¬¤é²¿¤â¤¤¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: src/nautilus-window-manage-views.c:997
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
 "happening, you might want to turn this panel off."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1002
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "¥µ¥¤¥É¥Ð¡¼¥Ñ¥Í¥ë¤Ï¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr ""
 "\"%s\" ¤ò¸«¤Ä¤±¤ë»ö¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡¥ÄÖ¤ê¤ò¥Á¥§¥Ã¥¯¤·¤ÆºÆ»î¹Ô¤·¤Æ²¼¤µ¤¤"
 
-#: src/nautilus-window-manage-views.c:1223
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
 msgstr "\"%s\" ¤ÏÍ­¸ú¤Ê¾ì½ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡¥ÄÖ¤ê¤ò¥Á¥§¥Ã¥¯¤·¤ÆºÆ»î¹Ô¤·¤Æ²¼¤µ¤¤"
 
-#: src/nautilus-window-manage-views.c:1237
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
 "it is."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr ""
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1257
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 "\"%s\" ¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿. ¤À¤«¤é Nautilus ¤Ï %s "
 "¤Î¾ì½ê¤ò°·¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: src/nautilus-window-manage-views.c:1263
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "\"%s\" ¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿. ¥í¥°¥¤¥ó¤¹¤ë»î¤ß¤Ï¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: src/nautilus-window-manage-views.c:1268
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "\"%s\" ¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿. µö²Ä¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1287
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
 "the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "\"%s\" "
-"¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£¥Û¥¹¥È̾\"%s\"¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£Ä֤꤬Àµ¤·¤¤¤«¤¢"
-"ɤ¦¤«¤È¥×¥í¥¯¥·¡¼ÀßÄ꤬Àµ¤·¤¤¤«¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£¢"
+"¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£¥Û¥¹¥È̾\"%s\"¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£Ä֤꤬Àµ¤·¤¤¤«¤"
+"¢É¤¦¤«¤È¥×¥í¥¯¥·¡¼ÀßÄ꤬Àµ¤·¤¤¤«¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£¢"
 
-#: src/nautilus-window-manage-views.c:1287
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -9415,73 +9709,74 @@ msgstr ""
 "\"%s\" ¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿. ¥Û¥¹¥È̾¤¬¶õ¤Ç¤¹. "
 "¥×¥í¥­¥·¡¼¤ÎÀßÄ꤬Àµ¤·¤¤¤«³Îǧ¤·¤Æ¤¯¤À¤µ¤¤."
 
-#: src/nautilus-window-manage-views.c:1299
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
 "search service, and if you don't have an index, that the Medusa indexer is "
 "running."
 msgstr ""
-"¸¡º÷¤Ï¸½ºßÍøÍѤǤ­¤Þ¤»¤ó¡£¥¤¥ó¥Ç¥¯¥¹¤¬¤Ê¤¤¤«¡¢¤¢¤ë¤¤¤Ï¸¡º÷¥µ¡¼¥Ó¥¹¤¬µ¯Æ°¤·¤Æ¤¢ "
-"¤¤Ê¤¤¤¿¤á¤Ç¤¹¡£Íedusa¸¡º÷¥µ¡¼¥Ó¥¹¤òµ¯Æ°¤·¤¿¤«¤É¤¦¤«¤ò³Îǧ¤·¤Æ¡¢¤â¤·¥¤¥ó¥Ç¥¯¥¹ "
-"¤¬¤Ê¤¤¾ì¹ç¤ÏMedusa¥¤¥ó¥Ç¥¯¥µ¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£"
+"¸¡º÷¤Ï¸½ºßÍøÍѤǤ­¤Þ¤»¤ó¡£¥¤¥ó¥Ç¥¯¥¹¤¬¤Ê¤¤¤«¡¢¤¢¤ë¤¤¤Ï¸¡º÷¥µ¡¼¥Ó¥¹¤¬µ¯Æ°¤·¤Æ¤"
+"¢ "
+"¤¤Ê¤¤¤¿¤á¤Ç¤¹¡£Íedusa¸¡º÷¥µ¡¼¥Ó¥¹¤òµ¯Æ°¤·¤¿¤«¤É¤¦¤«¤ò³Îǧ¤·¤Æ¡¢¤â¤·¥¤¥ó¥Ç¥¯¥¹"
+" ¤¬¤Ê¤¤¾ì¹ç¤ÏMedusa¥¤¥ó¥Ç¥¯¥µ¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: src/nautilus-window-manage-views.c:1303
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "¸¡º÷¤ÏÍøÍѤǤ­¤Þ¤»¤ó"
 
-#: src/nautilus-window-manage-views.c:1307
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus ¤Ï \"%s\" ¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó"
 
-#: src/nautilus-window-manage-views.c:1312
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "¾ì½ê¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó"
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:313
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
 msgstr ""
 
-#: src/nautilus-window-menus.c:316
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
 
-#: src/nautilus-window-menus.c:321
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "ÍúÎò¤òºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/nautilus-window-menus.c:322
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "˺¤ì¤ë"
 
-#: src/nautilus-window-menus.c:425
+#: src/nautilus-window-menus.c:466
 #, fuzzy
 msgid "Show St_atus Bar"
 msgstr "¥¹¥Æ¡¼¥¿¥¹¥Ð¡¼¤òɽ¼¨"
 
-#: src/nautilus-window-menus.c:431
+#: src/nautilus-window-menus.c:472
 #, fuzzy
 msgid "Show _Sidebar"
 msgstr "¥µ¥¤¥É¥Ð¡¼¤òɽ¼¨"
 
-#: src/nautilus-window-menus.c:437
+#: src/nautilus-window-menus.c:478
 #, fuzzy
 msgid "Show _Toolbar"
 msgstr "¥Ä¡¼¥ë¥Ð¡¼¤òɽ¼¨"
 
-#: src/nautilus-window-menus.c:443
+#: src/nautilus-window-menus.c:484
 #, fuzzy
 msgid "Show Location _Bar"
 msgstr "¥í¥±¡¼¥·¥ç¥ó¥Ð¡¼¤òɽ¼¨"
 
-#: src/nautilus-window-menus.c:494
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "ÀßÄê"
 
@@ -9491,12 +9786,12 @@ msgstr "ÀßÄê"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:577
+#: src/nautilus-window-menus.c:618
 #, fuzzy
-msgid "Copyright ) 1999-2001 Eazel, Inc."
+msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -9514,11 +9809,11 @@ msgstr ""
 #. * bottom of the about box to give credit
 #. * to the translator(s)
 #.
-#: src/nautilus-window-menus.c:588
+#: src/nautilus-window-menus.c:629
 msgid "Translator Credits"
 msgstr "ËÝÌõ¼Ô¤Î¥¯¥ì¥¸¥Ã¥È"
 
-#: src/nautilus-window-menus.c:758
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -9527,27 +9822,23 @@ msgstr ""
 "¾ì½ê \"%s\" ¤Ï¸ºß¤·¤Þ¤»¤ó. "
 "¥ê¥¹¥È¤«¤é¤³¤Î¾ì½ê¤ò¤â¤Ã¤¿¥Ö¥Ã¥¯¥Þ¡¼¥¯¤òºï½ü¤·¤¿¤¤¤Ç¤¹¤«?"
 
-#: src/nautilus-window-menus.c:762
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "¸ºß¤·¤Ê¤¤¾ì½ê¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯"
 
-#: src/nautilus-window-menus.c:776
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "¾ì½ê \"%s\" ¤Ï¤â¤Ï¤ä¸ºß¤·¤Þ¤»¤ó"
 
-#: src/nautilus-window-menus.c:777
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "¸ºß¤·¤Ê¤¤¾ì½ê¤Ø°ÜÆ°¤¹¤ë"
 
-#: src/nautilus-window-menus.c:846
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "¤³¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯¤Ë»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì½ê¤Ë°ÜÆ°¤¹¤ë"
 
-#: src/nautilus-window-menus.c:1357
-msgid "_Browse"
-msgstr "±ÜÍ÷(_B)"
-
 #: src/nautilus-window-toolbars.c:402
 msgid "Back"
 msgstr "Ìá¤ë"
@@ -9563,6 +9854,108 @@ msgstr "Á°"
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*,*-r-*"
 
+#~ msgid "helvetica"
+#~ msgstr "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*"
+
+#~ msgid "_Fonts"
+#~ msgstr "¥Õ¥©¥ó¥È(_F)"
+
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "¤½¤ì¼«¿È¤ÎÃæ¤Ø¥Õ¥©¥ë¥À¤ò°ÜÆ°¤Ç¤­¤Þ¤»¤ó¡£"
+
+#~ msgid "Can't Move Onto Self"
+#~ msgstr "¼«Ê¬¤Î¾å¤Ë°ÜÆ°¤Ç¤­¤Þ¤»¤ó"
+
+#~ msgid "Normal"
+#~ msgstr "ɸ½à"
+
+#~ msgid "Bold"
+#~ msgstr "ÂÀ»ú"
+
+#~ msgid "Book"
+#~ msgstr "¥Ö¥Ã¥¯"
+
+#~ msgid "Light"
+#~ msgstr "·Ú¤¤"
+
+#~ msgid "Italic"
+#~ msgstr "¼ÐÂÎ"
+
+#~ msgid "Oblique"
+#~ msgstr "µÞ¼ÐÂÎ"
+
+#~ msgid "Reverse Italic"
+#~ msgstr "µÕ¼ÐÂÎ"
+
+#~ msgid "Reverse Oblique"
+#~ msgstr "µÞµÕ¼ÐÂÎ"
+
+#~ msgid "Condensed"
+#~ msgstr "¶Å½Ì"
+
+#~ msgid "Font"
+#~ msgstr "¥Õ¥©¥ó¥È"
+
+#~ msgid "fixed"
+#~ msgstr "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00 ¸áÁ° 01:00"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00 ¸áÁ° 1:00"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00 ¸áÁ° 1:00"
+
+#~ msgid "current theme"
+#~ msgstr "¸½ºß¤Î¥Æ¡¼¥Þ"
+
+#~ msgid "Use this font family to display file names:"
+#~ msgstr "¥Õ¥¡¥¤¥ë̾¤Îɽ¼¨¤Ë¤³¤Î¥Õ¥©¥ó¥È¥Õ¥¡¥ß¥ê¤ò»È¤¦"
+
+#~ msgid "Can add Content"
+#~ msgstr "ÆâÍƤòÄɲäǤ­¤ë"
+
+#~ msgid "No selection made"
+#~ msgstr "¥»¥¯¥·¥ç¥ó¤ÏºîÀ®¤µ¤ì¤Æ¤Þ¤»¤ó"
+
+#~ msgid "times"
+#~ msgstr "»þ´Ö"
+
+#~ msgid "lucida"
+#~ msgstr "misc"
+
+#~ msgid "Details"
+#~ msgstr "¾ÜºÙ"
+
+#~ msgid "Warning"
+#~ msgstr "·Ù¹ð"
+
+#~ msgid "Error"
+#~ msgstr "¥¨¥é¡¼"
+
+#~ msgid "Question"
+#~ msgstr "¼ÁÌä"
+
+#~ msgid "_Cut Text"
+#~ msgstr "¥Æ¥­¥¹¥È¤ÎÀÚ¤ê¼è¤ê(_C)"
+
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤ØÃÖ¤«¤º¤ËÁªÂò¤µ¤ì¤¿¥Æ¥­¥¹¥È¤òºï½ü¤·¤Þ¤¹"
+
+#~ msgid "Use Advanced settings"
+#~ msgstr "¾åµé¼Ô¤ÎÀßÄê¤ò»È¤¦"
+
+#~ msgid "Use Beginner settings"
+#~ msgstr "½é¿´¼Ô¤ÎÀßÄê¤ò»È¤¦"
+
+#~ msgid "Use Intermediate settings"
+#~ msgstr "Ãæµé¼Ô¤ÎÀßÄê¤ò»È¤¦"
+
+#~ msgid "_Browse"
+#~ msgstr "±ÜÍ÷(_B)"
+
 #~ msgid "Cyrillic (KOI8-R)"
 #~ msgstr "¥­¥ê¥ëʸ»ú (KOI8-R)"
 
@@ -9614,9 +10007,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*,*-r-*"
 #~ msgid "Verify"
 #~ msgstr "¥Ù¥ê¥Õ¥¡¥¤"
 
-#~ msgid "Description"
-#~ msgstr "ÀâÌÀ"
-
 #~ msgid "Package Contents: %d files"
 #~ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ÎÆâÍÆ: %d ¥Õ¥¡¥¤¥ë"
 
@@ -9871,9 +10261,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*,*-r-*"
 #~ "¥¨¥é¡¼: ̵¸ú¤Êʸˡ¤Ç¤¹\n"
 #~ "ʸˡ: %s\n"
 
-#~ msgid "Secret"
-#~ msgstr "¥·¡¼¥¯¥ì¥Ã¥È"
-
 #~ msgid "Shared"
 #~ msgstr "¶¦Í­"
 
diff --git a/po/ko.po b/po/ko.po
index e073b1058..ecbc27809 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,10 +2,15 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Young-ho, Cha <ganadist@dacome.co.kr>, 2000, 2001.
 #
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 0.8.3\n"
-"POT-Creation-Date: 2001-03-16 12:03+0100\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-03-19 04:24+0900\n"
 "Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -140,8 +145,8 @@ msgid "Previous"
 msgstr "ÀÌÀü"
 
 #: components/help/converters/gnome-db2html2/gdb3html.c:721
-#: libnautilus-extensions/nautilus-global-preferences.c:686
-#: src/nautilus-shell-ui.xml.h:38
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "Ȩ"
 
@@ -330,16 +335,14 @@ msgid "Kernel Routines"
 msgstr "Ä¿³Î ·çƾ"
 
 #: components/help/hyperbola-filefmt.c:703
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
 msgid "Info"
 msgstr "Á¤º¸ ÆäÀÌÁö"
 
-#: components/help/hyperbola-nav-tree.c:279
+#: components/help/hyperbola-nav-tree.c:310
 msgid "Introductory Documents:"
 msgstr ""
 
-#: components/help/hyperbola-nav-tree.c:293
+#: components/help/hyperbola-nav-tree.c:324
 msgid "Documents by Subject:"
 msgstr ""
 
@@ -412,7 +415,7 @@ msgstr "¹æ¹®±â·Ï °¡ÀåÀÚ¸®¸·´ë ÆгÎ"
 msgid "History sidebar panel for Nautilus"
 msgstr "³ëÆ¿·¯½ºÀÇ ¹æ¹®±â·Ï °¡ÀåÀÚ¸®¸·´ë ÆгÎ"
 
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "Bonobo¸¦ ÃʱâÈ­ ÇÒ¼ö ¾ø½À´Ï´Ù"
 
@@ -470,7 +473,7 @@ msgstr "¾µ¸ð¾ø´Â ³»¿ëÀ» °­Á¦·Î Á¾·áÇÕ´Ï´Ù"
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "ÆÄÀÏ(_F)"
 
@@ -554,7 +557,7 @@ msgid "Sidebar Loser"
 msgstr "¾µ¸ð¾ø´Â °¡ÀåÀÚ¸®¸·´ë"
 
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -564,7 +567,7 @@ msgstr ""
 "  %s"
 
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -1005,7 +1008,6 @@ msgid "Oldies"
 msgstr ""
 
 #: components/music/mpg123.c:32
-#: libnautilus-extensions/nautilus-font-picker.c:117
 msgid "Other"
 msgstr ""
 
@@ -1644,10 +1646,10 @@ msgid "Pause"
 msgstr "ÁßÁö"
 
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:945
-#: libnautilus-extensions/nautilus-file-operations.c:960
 #: libnautilus-extensions/nautilus-file-operations.c:979
-#: src/nautilus-shell-ui.xml.h:60
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "ÁßÁö"
 
@@ -1697,23 +1699,6 @@ msgstr "À½¾Ç º¸±â ÆÑÅ丮"
 msgid "View as Music"
 msgstr "À½¾ÇÀ¸·Î º¸±â"
 
-#. FIXME: eventually, get this from preferences
-#. set up the default font
-#: components/notes/nautilus-notes.c:200
-#: components/text/nautilus-text-view.c:186
-#: libnautilus-extensions/nautilus-global-preferences.c:1118
-#: libnautilus-extensions/nautilus-icon-container.c:3333
-#: libnautilus-extensions/nautilus-icon-container.c:3334
-#: libnautilus-extensions/nautilus-icon-container.c:3335
-#: libnautilus-extensions/nautilus-icon-container.c:3336
-#: libnautilus-extensions/nautilus-icon-container.c:3337
-#: libnautilus-extensions/nautilus-icon-container.c:3338
-#: libnautilus-extensions/nautilus-icon-container.c:3339
-#: libnautilus-extensions/nautilus-preferences-item.c:482
-#: src/nautilus-sidebar-title.c:500
-msgid "helvetica"
-msgstr "helvetica,gulim"
-
 #: components/notes/Nautilus_View_notes.oaf.in.h:1
 msgid "Factory for annotation view"
 msgstr ""
@@ -1805,7 +1790,7 @@ msgstr "°Ë»ö cgi ÁöÁ¤"
 #: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
 #: components/services/install/command-line/eazel-test-packsys.c:590
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "µð¹ö±× Ãâ·Â º¸±â"
 
@@ -1869,171 +1854,174 @@ msgstr "RPM ÀÎÀÚ·Î ÆÄÀÏÀÌ ÇÊ¿ä"
 msgid "Run Query"
 msgstr "Äõ¸® ½ÇÇà"
 
-#. Disabled for 1.0
-#. {"revert", 'r', POPT_ARG_NONE, &arg_revert, 0, N_("Revert"), NULL},
-#: components/services/install/command-line/eazel-alt-install-corba.c:127
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
+#, fuzzy
+msgid "Revert"
+msgstr "ÀüÇô"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr "root ÁöÁ¤"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:128
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "¼­¹ö ÁöÁ¤"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:129
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
 msgid "Dont print too much, just problems and download"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:130
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr "ssl À̸§¹Ù²Þ ½ÇÇà"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:131
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
 msgid "argument is a suite id"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "½ÃÇè ½ÇÇà"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr "»ç¿ëÀÚÀ̸§ Çã¿ë"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:134
-#: components/services/install/lib/eazel-install-problem.c:1015
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "¾÷±×·¹À̵å Çã¿ë"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "ÀÚ¼¼ÇÑ Ãâ·Â"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:136
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
 msgid "Install a specific package version"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:159
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
 msgid "*** You cannot specify more then one protocol type.\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:176
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
 msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:285
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, c-format
 msgid "File conflict checking %s...\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:299
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, c-format
 msgid "File uniqueness checking %s...\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:313
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
 #, c-format
 msgid "Feature consistency checking %s...\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:344
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
 #: components/services/install/lib/eazel-install-protocols.c:116
 #: components/services/install/lib/eazel-install-protocols.c:254
 #, c-format
 msgid "Downloading %s..."
 msgstr "%s¸¦ ¹Þ´ÂÁß..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:360
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
 msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
 msgstr "%s¸¦ ¹Þ´ÂÁß... (%d/%d) = %d%% %.1f KB/s"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:368
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
 msgid "Downloading %s... (%d/%d) = %d%%"
 msgstr "%s¸¦ ¹Þ´ÂÁß... (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:376
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
 #, c-format
 msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
 msgstr "%s¸¦ ¹Þ´ÂÁß... (%d/%d) %.1f KB/s ¿Ï·á      \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:381
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
 #, c-format
 msgid "Downloading %s... %3.1f KB/s Done\n"
 msgstr "%s¸¦ ¹Þ´ÂÁß... %3.1f KB/s ¿Ï·á\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:409
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "%s¸¦ ÀνºÅçÁß (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:417
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "%s¸¦ Á¦°ÅÁß (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:439
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "%s¸¦ ÀνºÅçÁß (%d/%d), (%d/%d)b - (%d/%d) = %d%% ¿Ï·á\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:446
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "%s¸¦ Á¦°ÅÁß (%d/%d), (%d/%d)b - (%d/%d) = %d%% ¿Ï·á\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:454
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
 msgid "Done\n"
 msgstr "¿Ï·á\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:474
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
 #, c-format
 msgid "Download of %s FAILED\n"
 msgstr "%s ¹Þ±â°¡ ½ÇÆÐÇß½À´Ï´Ù\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:496
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
 #, c-format
 msgid "Package %s failed to uninstall.\n"
 msgstr "%s ²Ù·¯¹Ì »èÁ¦¸¦ ½ÇÆÐÇß½À´Ï´Ù.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:498
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
 #, c-format
 msgid "Package %s failed to install.\n"
 msgstr "%s ²Ù·¯¹Ì ¼³Ä¡¸¦ ½ÇÆÐÇß½À´Ï´Ù.\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:519
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
 #, c-format
 msgid "\t· Problem : %s\n"
 msgstr ""
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:528
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
 #, c-format
 msgid "\t· Action : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:571
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
 msgid "Cancelling operation\n"
 msgstr "µ¿ÀÛ Ãë¼ÒÁß\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:582
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
 #, c-format
 msgid "About to install a total of %d packages, %dKB\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:586
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
 #, c-format
 msgid "About to uninstall a total of %d packages, %dKB\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:590
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
 #, c-format
 msgid "About to revert a total of %d packages, %d KB\n"
 msgstr ""
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:607
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
 #, c-format
 msgid "\t· %s and it's dependencies\n"
 msgstr ""
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:610
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
 #, c-format
 msgid "\t· %s\n"
 msgstr ""
@@ -2043,38 +2031,38 @@ msgstr ""
 #. If you eg. translate this to Danish : "Fortsæt (j/n) " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:638
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
 msgid "Save transaction report ? (y/n) "
 msgstr ""
 
 #. I18N note: y is the letter for the word Yes. This is
 #. used in the response for a yes/no questions. Your translation
 #. must be 1 character only.
-#: components/services/install/command-line/eazel-alt-install-corba.c:649
-#: components/services/install/command-line/eazel-alt-install-corba.c:769
-#: components/services/install/command-line/eazel-alt-install-corba.c:811
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
 msgid "y"
 msgstr "y"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:670
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
 #, c-format
 msgid "Dependency : %s needs %s\n"
 msgstr ""
 
 #. I18N note: %s is a package name
-#: components/services/install/command-line/eazel-alt-install-corba.c:688
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
 #, c-format
 msgid "Package %s failed md5 check!\n"
 msgstr ""
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:690
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
 #, c-format
 msgid "\t· server MD5 checksum is %s\n"
 msgstr ""
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:692
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
 #, c-format
 msgid "\t· actual MD5 checksum is %s\n"
 msgstr ""
@@ -2084,7 +2072,7 @@ msgstr ""
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:758
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
 msgid "Continue? (y/n) "
 msgstr "°è¼ÓÇÒ±î¿ä? (y/n) "
 
@@ -2093,83 +2081,83 @@ msgstr "°è¼ÓÇÒ±î¿ä? (y/n) "
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:799
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
 msgid "Should I delete the RPM files? (y/n) "
 msgstr "RPM ÆÄÀÏÀ» Áö¿ï±î¿ä? (y/n) "
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:831
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
 msgid "Operation ok\n"
 msgstr "¼º°øÇß½À´Ï´Ù\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:833
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
 msgid "Operation failed\n"
 msgstr "½ÇÆÐÇß½À´Ï´Ù\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:959
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
 msgid "Installing"
 msgstr "¼³Ä¡Áß"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:968
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
 msgid "Uninstalling"
 msgstr "Á¦°ÅÁß"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:983
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
 msgid "Only one operation at a time please."
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:988
-#: components/services/install/command-line/eazel-alt-install-corba.c:996
-#: components/services/install/command-line/eazel-alt-install-corba.c:1040
-#: components/services/install/command-line/eazel-alt-install-corba.c:1047
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
 #, c-format
 msgid "%s: --help for usage\n"
 msgstr "%s: »ç¿ë¹ýÀ» º¸½Ã·Á¸é --help\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
 #, c-format
 msgid "Name         : %s\n"
 msgstr "À̸§         : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
 #, c-format
 msgid "Version      : %s\n"
 msgstr "¹öÁ¯         : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1014
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
 #, c-format
 msgid "Minor        : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
 #, c-format
 msgid "Size         : %d\n"
 msgstr "Å©±â         : %d\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
 #, c-format
 msgid "Arch         : %s\n"
 msgstr "¾ÆÅ°ÅØÃÄ     : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
 #, c-format
 msgid "Distribution : %s\n"
 msgstr "¹èÆ÷         : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1019
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
 #, c-format
 msgid "Description  : %s\n"
 msgstr "¼³¸í         : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1021
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
 #, c-format
 msgid "Install root : %s\n"
 msgstr "¼³Ä¡ ·çÆ®    : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1024
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
 msgid "Provides     : \n"
 msgstr "Á¦°ø         : \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1066
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
 #, c-format
 msgid "exit code %d\n"
 msgstr "Á¾·á ÄÚµå´Â %dÀÔ´Ï´Ù\n"
@@ -2183,122 +2171,128 @@ msgid "Use specified file to generate a package list, requires --packagelist"
 msgstr ""
 "²Ù·¯¹Ì ¸ñ·ÏÀ» »ý¼ºÇϱâÀ§ÇØ ÁöÁ¤µÈ ÆÄÀÏÀ» ÀÌ¿ëÇÕ´Ï´Ù, --packagelist ÇÊ¿ä"
 
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 msgid "Softcat server to connect to"
 msgstr "¿¬°áÇÒ Softcat¼­¹ö"
 
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr "´ë½Å CGI °æ·Î »ç¿ë"
 
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr "ammonite¸¦ ÅëÇØ softcat»ç¿ëÀÚ·Î ¿¬°á"
 
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 msgid "Number of times to try the request"
 msgstr "¿äûÀ» ½ÃµµÇÒ È½¼ö"
 
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr "´Ù½Ã ½ÃµµÇÒ¶§ Áö¿¬½Ã°£(usec)"
 
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr "Eazel ²Ù·¯¹Ì id·Î ãÀ½"
 
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+#, fuzzy
+msgid "Lookup package that features a feature/file"
 msgstr "Á¦°øÇÏ´Â ±â´É°ú ÆÄÀÏ·Î ²Ù·¯¹Ì ãÀ½"
 
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr "ÁöÁ¤ÇÑ ÆǹøÈ£·Î ²Ù·¯¹Ì ãÀ½"
 
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 msgid "use check function (for debugging)"
 msgstr "È®ÀÎ ±â´É »ç¿ë(µð¹ö±ë¿ë)"
 
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 msgid "Show detailed sub-package info"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:102
+#: components/services/install/command-line/eazel-test-softcat.c:66
+msgid "enable funk parser"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "³»·Á¹Þ´Â ÆÄÀÏ Àá±×±â ½ÇÆÐ"
 
-#: components/services/install/lib/eazel-install-logic2.c:119
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "MD5°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù, ²Ù·¯¹Ì %s°¡ ¼Õ»óµÈ°Í °°½À´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-logic2.c:135
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, c-format
 msgid "No MD5 available for %s"
 msgstr "%s¿¡ ´ëÇÑ MD5°¡ ¾ø½À´Ï´Ù"
 
 #. I18N note: "%is is ok" in the sense that %s=package name and the
 #. package is intact
-#: components/services/install/lib/eazel-install-logic2.c:330
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, c-format
 msgid "%s is ok"
 msgstr "%s°¡ ÁÁ½À´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-logic2.c:436
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s ÀÇ ¹öÁ¯ %s-%s ´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-logic2.c:440
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%sÀÇ ¹öÁ¯ %s´Â  ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-logic2.c:449
-#: components/services/install/lib/eazel-install-logic2.c:454
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr "%s¸¦ %s-%s¹öÁ¯¿¡¼­ %s-%s¹öÁ¯À¸·Î ¾÷±×·¹À̵å ÇÕ´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-logic2.c:463
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr "%s¸¦ %s-%s¹öÁ¯¿¡¼­ %s-%s¹öÁ¯À¸·Î ´Ù¿î±×·¹À̵å ÇÕ´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-logic2.c:468
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr "%s¸¦ %s¹öÁ¯¿¡¼­ %s¹öÁ¯À¸·Î ´Ù¿î±×·¹À̵å ÇÕ´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-logic2.c:521
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr "%sÀÇ ¹öÁ¯ %s-%s¸¦ ¼³Ä¡ÇÕ´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-logic2.c:526
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr "%sÀÇ ¹öÁ¯ %s¸¦ ¼³Ä¡ÇÕ´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-logic2.c:693
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, c-format
 msgid "Loading package info from file %s"
 msgstr "%s ÆÄÀÏ¿¡¼­ ²Ù·¯¹Ì Á¤º¸¸¦ ¹Þ½À´Ï´Ù"
 
 #. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
-#: components/services/install/lib/eazel-install-logic2.c:1010
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "ok"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1010
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "not ok"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1176
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
 msgid "Checking dependencies for %s"
 msgstr ""
@@ -2306,107 +2300,107 @@ msgstr ""
 #. I18N note: both %s' are package names.
 #. related is in the sense that the two packages apparently
 #. are connected somehow, eg. foo and foo-devel
-#: components/services/install/lib/eazel-install-logic2.c:1800
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, c-format
 msgid "%s is related to %s"
 msgstr "%s´Â %s¿Í ¿¬°üµÇ¾î ÀÖ½À´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-logic2.c:1876
+#: components/services/install/lib/eazel-install-logic2.c:2090
 #, c-format
 msgid "updating %s to version %s-%s solves conflict"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1899
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
 msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1906
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, c-format
 msgid "could not revive %s"
 msgstr "%s¸¦ µÇ»ì¸±¼ö ¾ø½À´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-logic2.c:2061
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
 msgid "file uniqueness checking %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2082
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
 msgid "Duplicate file : %s occurs in %s and %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2094
-#: components/services/install/lib/eazel-install-logic2.c:2248
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
 msgid "... but it's ok, the packages are related"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2102
+#: components/services/install/lib/eazel-install-logic2.c:2324
 #, c-format
 msgid "(there were %d other conflicts)"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2197
+#: components/services/install/lib/eazel-install-logic2.c:2419
 #, c-format
 msgid "file conflict checking %s"
 msgstr "%s È®ÀÎÇÏ´Â Áß ÆÄÀÏ Ãæµ¹"
 
-#: components/services/install/lib/eazel-install-logic2.c:2234
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
 msgid "file conflict : package %s already provides file %s also provided by %s"
 msgstr ""
 
 #. the owner of this file is a package that we're upgrading, and the
 #. * new version no longer has this file, so everything's okay.
-#: components/services/install/lib/eazel-install-logic2.c:2244
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
 msgid "...but it is okay, we're upgrading %s and it ditched that file"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2336
+#: components/services/install/lib/eazel-install-logic2.c:2558
 #, c-format
 msgid "checking feature consistency of %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2404
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
 msgid ""
 "feature missing : %s breaks if %s is installed (feature %s would be lost"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2483
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, c-format
 msgid "downloading %d packages"
 msgstr "%d ²Ù·¯¹Ì ³»·Á¹Þ´ÂÁß"
 
-#: components/services/install/lib/eazel-install-logic2.c:2753
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, c-format
 msgid "will upgrade %s"
 msgstr "%s¸¦ ¾÷±×·¹À̵åÇÕ´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-logic2.c:2756
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, c-format
 msgid "will downgrade %s"
 msgstr "%s¸¦ ´Ù¿î±×·¹À̵åÇÕ´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-logic2.c:2759
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, c-format
 msgid "will install %s"
 msgstr "%s¸¦ ÀνºÅçÇÕ´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-logic2.c:2762
+#: components/services/install/lib/eazel-install-logic2.c:2960
 #, c-format
 msgid "will uninstall %s"
 msgstr "%s¸¦ Á¦°ÅÇÕ´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-logic2.c:2847
-#: components/services/install/lib/eazel-install-problem.c:339
+#: components/services/install/lib/eazel-install-logic2.c:3045
 #: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
 #, c-format
 msgid "%s requires %s"
 msgstr "%s´Â %s¸¦ ÇÊ¿ä·ÎÇÕ´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-logic2.c:3040
+#: components/services/install/lib/eazel-install-logic2.c:3238
 #, c-format
 msgid "failed %s"
 msgstr "%s ½ÇÆÐ"
@@ -2419,38 +2413,38 @@ msgstr "¼³Á¤ÆÄÀÏ¿¡¼­ URLÇü½ÄÀ» ¼³Á¤ÇÒ¼ö ¾ø½À´Ï´Ù!"
 msgid "Transactions are not stored, could not find home dir"
 msgstr "Æ®·£Àè¼ÇÀÌ ÀúÀåµÇÁö ¾Ê¾Ò½À´Ï´Ù, Ȩµð·ºÅ丮À» ãÀ»¼ö ¾ø½À´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-object.c:745
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr "Æ®·£Àè¼ÇÀÌ %s¿¡ ÀúÀåµÇ¾ú½À´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-object.c:1002
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "¿ø°Ý ¼­¹ö¿¡¼­ ²Ù·¯¹Ì ¸ñ·ÏÀ» ¹Þ½À´Ï´Ù ...\n"
 
-#: components/services/install/lib/eazel-install-object.c:1018
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "package-list.xml À» ¹ÞÀ»¼ö ¾ø½À´Ï´Ù!\n"
 
-#: components/services/install/lib/eazel-install-object.c:1091
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr "%s ÆÄÀÏÀ» ¾µ¼ö ¾ø½À´Ï´Ù, ±âº» ·Î±× Çڵ鷯¸¦ »ç¿ëÇÕ´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-object.c:1222
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "¼³Ä¡ ½ÇÆÐ"
 
-#: components/services/install/lib/eazel-install-object.c:1268
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "Á¦°Å ½ÇÆÐ"
 
-#: components/services/install/lib/eazel-install-object.c:1403
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "*** Æ®·£Àè¼Ç µð·ºÅ丮(%s) °¡ »ý¼ºµÇÁö ¾ÊÀ½! ***\n"
 
-#: components/services/install/lib/eazel-install-object.c:1426
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr "%s·Î Æ®·£Àè¼Ç ¾²´ÂÁß"
@@ -2461,7 +2455,7 @@ msgid "%s was cancelled"
 msgstr "%s °¡ Ãë¼ÒµÇ¾ú½À´Ï´Ù"
 
 #: components/services/install/lib/eazel-install-problem.c:168
-#: components/services/install/lib/eazel-install-problem.c:331
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
 msgid "%s is a source package, which is not yet supported"
 msgstr "%s´Â ¼Ò½º ²Ù·Á¹ÌÀÌ°í ¾ÆÁ÷ Áö¿øÀÌ µÇÁö ¾Ê½À´Ï´Ù"
@@ -2493,48 +2487,48 @@ msgid "%s requires %s, which could not be found on the server"
 msgstr "%s´Â %s¸¦ ÇÊ¿ä·ÎÇÏ°í, ±×°ÍÀº ¼­¹ö¿¡¼­ ¹ß°ßµÇÁö ¾Ê½À´Ï´Ù"
 
 #: components/services/install/lib/eazel-install-problem.c:204
-#, c-format
-msgid "%s could not be found on the server"
+#, fuzzy, c-format
+msgid "%s for %s could not be found on the server"
 msgstr "%s°¡ ¼­¹ö¿¡¼­ ¹ß°ßµÇÁö ¾Ê½À´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-problem.c:212
-#: components/services/install/lib/eazel-install-problem.c:357
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr "%s´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-problem.c:256
+#: components/services/install/lib/eazel-install-problem.c:259
 #, c-format
 msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr "%s, ÀÌ¹Ì »õ·Î¿î ÆÇÀÌ ¼³Ä¡µÇ¾î ÀÖ°í ´Ù¿î±×·¹À̵尡 µÇÁö ¾Ê½À´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-problem.c:260
+#: components/services/install/lib/eazel-install-problem.c:263
 #, c-format
 msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr "%s, ¿¹ÀüÆÇÀÌ ¼³Ä¡µÇ¾î ÀÖ°í ¾÷±×·¹À̵尡 µÇÁö ¾Ê½À´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-problem.c:350
+#: components/services/install/lib/eazel-install-problem.c:353
 #, c-format
 msgid "%s is not installed and could not be found on server"
 msgstr "%s°¡ ÀνºÅçµÇ¾î ÀÖÁö ¾Ê°í ¼­¹ö¿¡¼­µµ ãÀ» ¼ö ¾ø½À´Ï´Ù"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:917
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr "%sÀÇ »õ¹öÁ¯À» È®ÀÎÇÕ´Ï´Ù"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:928
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr "%s¿Í %s µÑ´Ù ¼³Ä¡ÇÕ´Ï´Ù"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:943
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr "½Ã½ºÅÛ¿¡¼­ %s¸¦ Á¦°ÅÇÕ´Ï´Ù"
@@ -2542,21 +2536,21 @@ msgstr "½Ã½ºÅÛ¿¡¼­ %s¸¦ Á¦°ÅÇÕ´Ï´Ù"
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:956
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr "½Ã½ºÅÛ¿¡¼­ °­Á¦·Î %s¸¦ Á¦°ÅÇÕ´Ï´Ù"
 
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:964
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr "²Ù·¯¹Ì µ¥ÀÌÅͺ£À̽º°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: components/services/install/lib/eazel-install-problem.c:1012
+#: components/services/install/lib/eazel-install-problem.c:1015
 msgid "Continue with force"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:1018
+#: components/services/install/lib/eazel-install-problem.c:1021
 msgid "Allow downgrade"
 msgstr "´Ù¿î±×·¹À̵å Çã¿ë"
 
@@ -2681,94 +2675,94 @@ msgstr ""
 msgid "*** Unknown node type '%s'"
 msgstr "*** ¾Ë¼ö¾ø´Â ³ëµå Çü½Ä '%s'"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:231
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** ²Ù·¯¹Ì ¸ñ·ÏÆÄÀÏ¿¡ µ¥ÀÌÅÍ°¡ ¾ø½À´Ï´Ù! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:236
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** Ä«Å×°í¸® xml³ëµå¸¦ ãÀ»¼ö ¾ø½À´Ï´Ù! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:237
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:243
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** Ä«Å×°í¸®°¡ ¾ø½À´Ï´Ù! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:244
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:298
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** Æ®·£Àè¼Ç xml³ëµå¸¦ ãÀ»¼ö ¾ø½À´Ï´Ù! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:300
-#: components/services/install/lib/eazel-install-xml-package-list.c:308
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:306
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** ²Ù·¯¹Ì ¾øÀ½! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:342
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** Ä«Å×°í¸® ³ëµå ¾øÀ½! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:346
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** Ä«Å×°í¸® xml³ëµå¸¦ ãÀ»¼ö ¾ø½À´Ï´Ù! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:380
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** ¾Ë¼ö¾ø´Â ³ëµå %s"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:470
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** xml ²Ù·¯¹Ì ¸ñ·ÏÀ» ¸¸µå´Âµ¥ ¿À·ù! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:517
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** ²Ù·¯¹Ì ¸ñ·ÏÀ» Àдµ¥ ¿À·ù! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:912
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** osd xml¿¡ µ¥ÀÌÅÍ°¡ ¾ø½À´Ï´Ù! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:917
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:993
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "xmlÀ» ºÐ¼®ÇÒ¼ö ¾øÀ½ (±æÀÌ %d)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:764
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr "%s ¿¡¼­ ²Ù·¯¹Ì µ¥ÀÌÅͺ£À̽º ¿­±â"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:769
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr "%s ¿¡¼­ ²Ù·¯¹Ì µ¥ÀÌÅͺ£À̽º ¿­±â ½ÇÆÐ"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:802
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr ""
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:807
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr ""
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1138
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr "%s¸¦ ¿­Áö ¸øÇÔ"
@@ -2881,7 +2875,7 @@ msgid "Now installing package \"%s\"."
 msgstr "²Ù·¯¹Ì \"%s\" ¼³Ä¡Áß ÀÔ´Ï´Ù."
 
 #: components/services/install-view/callbacks.c:407
-#: components/services/install-view/nautilus-service-install-view.c:897
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "\"%s\" ¼³Ä¡Áß "
@@ -3024,30 +3018,30 @@ msgstr "°è¼Ó"
 
 #: components/services/install-view/forms.c:482
 #: libnautilus-extensions/nautilus-drag.c:493
-#: src/file-manager/fm-directory-view.c:3551
+#: src/file-manager/fm-directory-view.c:4326
 msgid "Cancel"
 msgstr "Ãë¼Ò"
 
-#: components/services/install-view/nautilus-service-install-view.c:419
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
 msgid "%s is in GNOME (footprint) > %s"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:437
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, c-format
 msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr "%s´Â ±×³ð (¹ßÀÚ±¹) ¸Þ´º¾È¿¡ ÀÖ½À´Ï´Ù.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:452
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
 msgid "%s is in the KDE menu.\n"
 msgstr "%s´Â KDE ¸Þ´º¾È¿¡ ÀÖ½À´Ï´Ù.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:653
+#: components/services/install-view/nautilus-service-install-view.c:655
 msgid "Installation Complete"
 msgstr "¼³Ä¡ ¿Ï·á"
 
-#: components/services/install-view/nautilus-service-install-view.c:708
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
 msgid ""
 "%sTo start %s, click the Launch button below, or to create a shortcut, drag "
@@ -3055,32 +3049,32 @@ msgid ""
 msgstr ""
 
 #. couldn't find an icon
-#: components/services/install-view/nautilus-service-install-view.c:716
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
 msgid "%sTo start %s, click the Launch button below."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:771
+#: components/services/install-view/nautilus-service-install-view.c:773
 msgid "Incorrect password."
 msgstr "À߸øµÈ ¾ÏÈ£."
 
-#: components/services/install-view/nautilus-service-install-view.c:776
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr "root·Î ÀÎÁõ"
 
-#: components/services/install-view/nautilus-service-install-view.c:893
+#: components/services/install-view/nautilus-service-install-view.c:895
 msgid "Installing packages"
 msgstr "²Ù·¯¹Ì ¼³Ä¡Áß"
 
-#: components/services/install-view/nautilus-service-install-view.c:895
+#: components/services/install-view/nautilus-service-install-view.c:897
 msgid "Installing remote package"
 msgstr "¿ø°Ý ²Ù·¯¹Ì ¼³Ä¡Áß"
 
-#: components/services/install-view/nautilus-service-install-view.c:899
+#: components/services/install-view/nautilus-service-install-view.c:901
 msgid "Installing some package"
 msgstr "¸î¸î ²Ù·¯¹Ì ¼³Ä¡Áß"
 
-#: components/services/install-view/nautilus-service-install-view.c:916
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
@@ -3088,23 +3082,23 @@ msgstr ""
 "Eazel ¼³Ä¡ ¼­ºñ½º°¡ ¼³Ä¡µÇÁö ¾Ê¾Ò½À´Ï´Ù:\n"
 "¼³Ä¡°¡ µÇÁö ¾ÊÀ»°ÍÀÔ´Ï´Ù."
 
-#: components/services/install-view/nautilus-service-install-view.c:965
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr "Eazel ¼ÒÇÁÆ®¿þ¾î ¸ñ·ÏÀ¸·Î ¿¬°áÇÕ´Ï´Ù..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1023
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr "ÀÎÁõ È®ÀÎÁß..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1095
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr "²Ù·¯¹Ì ³»·Á¹Þ±â Áß´ÜÁß (Àá½Ã¸¸ ±â´Ù¸®½Ê½Ã¿À)..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1115
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "ÆÄÀÏ ³»·Á¹Þ±â Áß´Ü"
 
-#: components/services/install-view/nautilus-service-install-view.c:1116
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "Áß´Ü"
 
@@ -3384,12 +3378,12 @@ msgid "Services Login"
 msgstr "¼­ºñ½º ·Î±×ÀÎ"
 
 #: components/services/summary/nautilus-summary-dialogs.c:131
-#: libnautilus-extensions/nautilus-password-dialog.c:269
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "»ç¿ëÀÚÀ̸§: "
 
 #: components/services/summary/nautilus-summary-dialogs.c:138
-#: libnautilus-extensions/nautilus-password-dialog.c:276
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "ºñ¹Ð¹øÈ£: "
 
@@ -3459,7 +3453,7 @@ msgstr "¼­ºñ½º"
 msgid "Featured Downloads"
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:883
+#: components/services/summary/nautilus-summary-view.c:884
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
 "unavailable right now, or your computer might be configured incorrectly. "
@@ -3469,7 +3463,7 @@ msgstr ""
 "¿©·¯ºÐÀÇ ÄÄÇ»ÅÍÀÇ ¼³Á¤ÀÌ À߸øµÇ¾î ÀÖÀ»¼ö ÀÖ½À´Ï´Ù.support@eazel.comÀ¸·Î "
 "¿¬¶ôÇϽʽÿÀ."
 
-#: components/services/summary/nautilus-summary-view.c:893
+#: components/services/summary/nautilus-summary-view.c:894
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3477,14 +3471,14 @@ msgstr ""
 "Eazel ¼­¹öÀÇ ÀÚ·á¿¡ ¹®Á¦°¡ ¹ß°ßµÇ¾ú½À´Ï´Ù. support@eazel.com À¸·Î "
 "¿¬¶ôÇϽʽÿÀ."
 
-#: components/services/summary/nautilus-summary-view.c:916
+#: components/services/summary/nautilus-summary-view.c:917
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
 "contact support@eazel.com."
 msgstr ""
 "Eazel ¼­¹öÀÇ ÀÚ·á¿¡ Á¤º¸°¡ ºüÁ®ÀÖ½À´Ï´Ù. support@eazel.com À¸·Î ¿¬¶ôÇϽʽÿÀ."
 
-#: components/services/summary/nautilus-summary-view.c:958
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
 "now, or your computer might be configured incorrectly. You could try again "
@@ -3493,7 +3487,7 @@ msgstr ""
 "Eazel ¼­¹ö¿¡ ¿¬°áÇÒ¼ö ¾ø½À´Ï´Ù. ¼­¹ö¸¦ Áï½Ã »ç¿ëÇÒ¼ö ¾ø°Å³ª ¿©·¯ºÐÀÇ ÄÄÇ» "
 "ÅÍÀÇ ¼³Á¤ÀÌ À߸øµÇ¾î ÀÖÀ»¼ö ÀÖ½À´Ï´Ù. ³ªÁß¿¡ ´Ù½Ã ½Ãµµ ÇϽʽÿÀ."
 
-#: components/services/summary/nautilus-summary-view.c:968
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3501,11 +3495,11 @@ msgstr ""
 "Eazel ¼­¹öÀÇ ÀÚ·á¿¡ ¹®Á¦°¡ ¹ß°ßµÇ¾ú½À´Ï´Ù. support@eazel.com À¸·Î "
 "¿¬¶ôÇϽʽÿÀ."
 
-#: components/services/summary/nautilus-summary-view.c:985
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:1048
+#: components/services/summary/nautilus-summary-view.c:1049
 #: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr "Eazel ¼­ºñ½º"
@@ -3616,48 +3610,68 @@ msgstr ""
 msgid "Factory for the sample service"
 msgstr ""
 
-#: components/text/nautilus-text-view.c:326
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr "%s´Â ³ëÆ¿·¯½º¿¡ ¸ðµÎ ÀûÀçÇϱ⿡ ³Ê¹« Å®´Ï´Ù."
 
-#: components/text/nautilus-text-view.c:329
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr "ÆÄÀÏÀÌ ³Ê¹«Å­"
 
 #: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "±Û²Ã"
+
+#: components/text/nautilus-text-view-ui.xml.h:2
 msgid "Lucida"
 msgstr ""
 
-#: components/text/nautilus-text-view-ui.xml.h:2
+#: components/text/nautilus-text-view-ui.xml.h:3
 msgid "Use the Courier Font"
 msgstr "Courier ±Û²Ã »ç¿ë"
 
-#: components/text/nautilus-text-view-ui.xml.h:3
+#: components/text/nautilus-text-view-ui.xml.h:4
+#, fuzzy
+msgid "Use the Fixed Font"
+msgstr "Times ±Û²Ã »ç¿ë"
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+#, fuzzy
+msgid "Use the GTK System Font"
+msgstr "Times ±Û²Ã »ç¿ë"
+
+#: components/text/nautilus-text-view-ui.xml.h:6
 msgid "Use the Helvetica Font"
 msgstr "Helvetica ±Û²Ã »ç¿ë"
 
-#: components/text/nautilus-text-view-ui.xml.h:4
+#: components/text/nautilus-text-view-ui.xml.h:7
 msgid "Use the Lucida Font"
 msgstr "Lucida ±Û²Ã »ç¿ë"
 
-#: components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:8
 msgid "Use the Times Font"
 msgstr "Times ±Û²Ã »ç¿ë"
 
-#: components/text/nautilus-text-view-ui.xml.h:6
+#: components/text/nautilus-text-view-ui.xml.h:9
 msgid "_Courier"
 msgstr ""
 
-#: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
-msgstr "±Û²Ã(_F)"
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "ÆÄÀÏ(_F)"
 
-#: components/text/nautilus-text-view-ui.xml.h:8
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
 msgid "_Helvetica"
 msgstr ""
 
-#: components/text/nautilus-text-view-ui.xml.h:9
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr ""
 
@@ -3726,7 +3740,7 @@ msgid "Nautilus Tree view"
 msgstr "³ëÆ¿·¯½º Æ®¸® º¸±â"
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:638
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr ""
 
@@ -3738,7 +3752,7 @@ msgstr "Ç¥Çö"
 msgid "Azul"
 msgstr ""
 
-#: data/browser.xml.h:3 libnautilus-extensions/nautilus-font-picker.c:105
+#: data/browser.xml.h:3
 msgid "Black"
 msgstr "°ËÁ¤"
 
@@ -3850,7 +3864,7 @@ msgstr "°³Ã¼¿¡ Ãß°¡ÇÒ ²¿¸®Ç¥¸¦ ²ø¾î ³õÀ¸½Ê½Ã¿À"
 msgid "Eclipse"
 msgstr "ÀϽÄ"
 
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1607
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "²¿¸®Ç¥"
 
@@ -3947,7 +3961,7 @@ msgid "Numbers"
 msgstr "¼ýÀÚ"
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "È®ÀÎ"
 
@@ -4068,11 +4082,11 @@ msgid "The Gimp"
 msgstr "±èÇÁ"
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:554
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "¹ÙÅÁÈ­¸é"
 
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4796
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
 #: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
@@ -4107,7 +4121,7 @@ msgid "Google"
 msgstr "±¸±Û"
 
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:808
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "°Ë»ö ¿£Áø"
 
@@ -4361,101 +4375,101 @@ msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-gulim-*-r-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2261
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr "¿À´Ã %p %-I:%M "
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2266
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr "¾îÁ¦ %p %-I:%M"
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2271
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%y/%-m/%-d %A %p %-I:%M"
 
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2276
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%y/%-m/%-d %p %-I:%M"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 Ç׸ñ"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr "0 Æú´õ"
 
-#: libnautilus-extensions/nautilus-file.c:3408
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 ÆÄÀÏ"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 Ç׸ñ"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr "1 Æú´õ"
 
-#: libnautilus-extensions/nautilus-file.c:3413
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 ÆÄÀÏ"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "%u Ç׸ñ"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr "%u Æú´õ"
 
-#: libnautilus-extensions/nautilus-file.c:3417
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u ÆÄÀÏ"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3720
-#: libnautilus-extensions/nautilus-file.c:3735
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr "? Ç׸ñ"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3726
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr "? ¹ÙÀÌÆ®"
 
-#: libnautilus-extensions/nautilus-file.c:3739
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "¾Ë¼ö¾ø´Â ÇüÅÂ"
 
-#: libnautilus-extensions/nautilus-file.c:3741
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "¾Ë¼ö¾ø´Â MIME ÇüÅÂ"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3746
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "¾Ë¼ö¾øÀ½"
 
-#: libnautilus-extensions/nautilus-file.c:3782
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr "ÇÁ·Î±×·¥"
 
-#: libnautilus-extensions/nautilus-file.c:3794
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
@@ -4464,7 +4478,7 @@ msgstr ""
 "\"x-directory/normal\"¿¡ ´ëÇÑ ¼³¸íµµ ãÀ»¼ö ¾ø½À´Ï´Ù. ÀÌ°ÍÀº gnome-vfs.keys "
 "ÆÄÀÏÀÌ À߸øµÈ À§Ä¡¿¡ Àְųª ´Ù¸¥ ÀÌÀ¯·Î ãÀ»¼ö ¾ø´Ù´Â°ÍÀ» ÀǹÌÇÕ´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file.c:3798
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
@@ -4473,7 +4487,7 @@ msgstr ""
 "mime Çü½Ä \"%s\"(ÆÄÀÏÀº \"%s\")¿¡ ´ëÇÑ ¼³¸íÀ» ãÀ»¼ö ¾ø½À´Ï´Ù, "
 "aaron@eazel.com ·Î ¾Ë·ÁÁֽʽÿÀ."
 
-#: libnautilus-extensions/nautilus-file.c:3812
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "¸µÅ©"
 
@@ -4481,27 +4495,27 @@ msgstr "¸µÅ©"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1156
-#: libnautilus-extensions/nautilus-file.c:3818
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr "%s ·Î ¸µÅ©"
 
-#: libnautilus-extensions/nautilus-file.c:3832
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr "¸µÅ© (±ú¾îÁü)"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr ""
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:588
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4512,7 +4526,7 @@ msgstr ""
 "\n"
 "Àбâ Àü¿ëµð½ºÅ©À̱⠶§¹®¿¡ \"%s\"¸¦ À̵¿ÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:599
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4525,7 +4539,7 @@ msgstr ""
 "ºÎ¸ð Æú´õ¸¦ ¼öÁ¤ÇÒ¼öÀÖ´Â Çã°¡±ÇÀ» ±âÀÚ°í ÀÖÁö ¾Ê±â ¶§¹®¿¡ \"%s\"¸¦ À̵¿ÇÒ¼ö "
 "¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:605
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4536,7 +4550,7 @@ msgstr ""
 "\n"
 "Àбâ Àü¿ëµð½ºÅ©À̱⠶§¹®¿¡ \"%s\"¸¦ À̵¿ÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:636
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4549,7 +4563,7 @@ msgstr ""
 "ºÎ¸ð Æú´õ³ª ±× ÀÚ½ÅÀ»  ¼öÁ¤ÇÒ¼öÀÖ´Â Çã°¡±ÇÀ» ±âÀÚ°í ÀÖÁö ¾Ê±â ¶§¹®¿¡ "
 "\"%s\"¸¦ À̵¿ÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:643
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4562,7 +4576,7 @@ msgstr ""
 "ºÎ¸ð Æú´õ¸¦ ¼öÁ¤ÇÒ¼ö ÀÖ´Â Çã°¡±ÇÀ» °¡Áö°í ÀÖÁö ¾Ê±â ¶§¹®¿¡ \"%s\"¸¦ "
 "ÈÞÁöÅëÀ¸·Î À̵¿ÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:667
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -4573,7 +4587,7 @@ msgstr ""
 "\n"
 "ÀÐÀ»¼ö ÀÖ´Â Çã°¡±ÇÀ» °¡Áö°í ÀÖÁö ¾Ê±â ¶§¹®¿¡ \"%s\"¸¦ º¹»çÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:689
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4584,7 +4598,7 @@ msgstr ""
 "\n"
 "¸ñÇ¥¿¡ ³²Àº °ø°£ÀÌ ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:694
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4595,7 +4609,7 @@ msgstr ""
 "\n"
 "¸ñÇ¥¿¡ ³²Àº °ø°£ÀÌ ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:698
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4606,7 +4620,7 @@ msgstr ""
 "\n"
 "¸ñÇ¥¿¡ ³²Àº °ø°£ÀÌ ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:710
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4617,7 +4631,7 @@ msgstr ""
 "\n"
 "¸ñÇ¥¿¡ ¾µ¼ö ÀÖ´Â Çã°¡±ÇÀ» °¡Áö°í ÀÖÁö ¾Ê½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4628,7 +4642,7 @@ msgstr ""
 "\n"
 "¸ñÇ¥µð½ºÅ©´Â ÀбâÀü¿ë ÀÔ´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:721
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4639,7 +4653,7 @@ msgstr ""
 "\n"
 "ÀÌ Æú´õ¿¡ ¾µ¼ö ÀÖ´Â Çã°¡±ÇÀ» °¡Áö°í ÀÖÁö ¾Ê½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:725
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4650,7 +4664,7 @@ msgstr ""
 "\n"
 "¸ñÇ¥µð½ºÅ©°¡ Àбâ Àü¿ëÀÔ´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:732
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4661,7 +4675,7 @@ msgstr ""
 "\n"
 "ÀÌ Æú´õ¿¡ ¾µ¼ö ÀÖ´Â Çã°¡±ÇÀ» °¡Áö°í ÀÖÁö ¾Ê½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:736
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4672,7 +4686,7 @@ msgstr ""
 "\n"
 "¸ñÇ¥µð½ºÅ©°¡ Àбâ Àü¿ëÀÔ´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4683,7 +4697,7 @@ msgstr ""
 "\n"
 "°è¼Ó ÁøÇà ÇÏ°Ú½À´Ï±î?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4694,7 +4708,7 @@ msgstr ""
 "\n"
 "°è¼Ó ÁøÇà ÇÏ°Ú½À´Ï±î?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:773
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4705,7 +4719,7 @@ msgstr ""
 "\n"
 "°è¼Ó ÁøÇà ÇÏ°Ú½À´Ï±î?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4716,7 +4730,7 @@ msgstr ""
 "\n"
 "°è¼Ó ÁøÇà ÇÏ°Ú½À´Ï±î?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:794
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4727,7 +4741,7 @@ msgstr ""
 "\n"
 "°è¼Ó ÁøÇà ÇÏ°Ú½À´Ï±î?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4738,7 +4752,7 @@ msgstr ""
 "\n"
 "°è¼Ó ÁøÇà ÇÏ°Ú½À´Ï±î?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4749,7 +4763,7 @@ msgstr ""
 "\n"
 "°è¼Ó ÁøÇà ÇÏ°Ú½À´Ï±î?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4760,34 +4774,34 @@ msgstr ""
 "\n"
 "°è¼Ó ÁøÇà ÇÏ°Ú½À´Ï±î?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:924
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "º¹»çÁß ¿À·ù"
 
-#: libnautilus-extensions/nautilus-file-operations.c:927
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "À̵¿Áß ¿À·ù"
 
-#: libnautilus-extensions/nautilus-file-operations.c:930
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "¸µÅ©Áß ¿À·ù"
 
-#: libnautilus-extensions/nautilus-file-operations.c:935
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "»èÁ¦Áß ¿À·ù"
 
-#: libnautilus-extensions/nautilus-file-operations.c:960
-#: libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "°Ç³Ê¶Ü"
 
-#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Àç½Ãµµ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1057
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4800,7 +4814,7 @@ msgstr ""
 "\n"
 "\"%s\"¸¦ ¿Å±â°í ½Í´Ù¸é À̸§À» ¹Ù²Ù°í ´Ù½Ã ½ÃµµÇϽʽÿÀ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1063
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4813,11 +4827,11 @@ msgstr ""
 "\n"
 "\"%s\"¸¦ º¹»çÇÏ°í ½Í´Ù¸é À̸§À» ¹Ù²Ù°í ´Ù½Ã ½ÃµµÇϽʽÿÀ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "ÆÄÀÏÀ» ¹Ù²Ü¼ö ¾øÀ½."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1081
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4828,22 +4842,22 @@ msgstr ""
 "\n"
 "ÆÄÀÏÀ» ¹Ù²Ù½Ã°Ú½À´Ï±î?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1092
-#: libnautilus-extensions/nautilus-file-operations.c:1106
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "º¹»ç ÇÏ´Â Áß Ãæµ¹"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "¹Ù²Ù±â"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "¸ðµÎ ¹Ù²Ù±â"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1160
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "%s ·Î ´Ù¸¥ ¸µÅ©"
@@ -4852,25 +4866,25 @@ msgstr "%s ·Î ´Ù¸¥ ¸µÅ©"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%2$s·Î %1$d¹ø° ¿¬°á"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1180
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%2$s·Î %1$d¹ø° ¿¬°á"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1184
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%2$s·Î %1$d¹ø° ¿¬°á"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%2$s·Î %1$d¹ø° ¿¬°á"
@@ -4880,235 +4894,227 @@ msgstr "%2$s·Î %1$d¹ø° ¿¬°á"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (»çº»)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (¶Ç ´Ù¸¥ »çº»)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1212
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr "¹ø° »çº»)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr "¹ø° »çº»)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1216
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr "¹ø° »çº»)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr "¹ø° »çº»)"
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (»çº»)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (¶Ç ´Ù¸¥ »çº»)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1232
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d¹ø° »çº»)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1234
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d¹ø° »çº»)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1236
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d¹ø° »çº»)%s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s(%d¹ø° »çº»)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1322
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr ""
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1330
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1487
-#: libnautilus-extensions/nautilus-file-operations.c:2072
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1802
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "ÆÄÀÏÀ» ÈÞÁöÅëÀ¸·Î À̵¿Áß"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1804
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr "ÆÄÀÏ ¹ö¸²:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1821
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "À̵¿Áß"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1807
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "ÈÞÁöÅëÀ¸·Î À̵¿ ÁغñÁß"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1817
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "ÆÄÀÏ ¿Å±è"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "ÆÄÀÏ À̵¿µÊ:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1822
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "À̵¿ ÁغñÁß"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "À̵¿ ¿Ï·á"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "ÆÄÀÏ ¸µÅ© ÀÛ¼ºÁß"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1837
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "ÆÄÀÏ ¸µÅ©µÊ:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1839
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "¸µÅ©ÇÏ´ÂÁß"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "¸µÅ© ÀÛ¼º ÁغñÁß"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "¸µÅ© ÀÛ¼º ¿Ï·á"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1848
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "ÆÄÀÏ º¹»çÁß"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "ÆÄÀÏ º¹»çµÊ:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "º¹»çÁß"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "º¹»ç ÁغñÁß"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "¼±ÅÃÇÑ Ç׸ñÀ» ÈÞÁöÅëÀ¸·Î º¹»çÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "ÈÞÁöÅëÀ¸·Î º¹»çÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1899
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "ÈÞÁöÅëÀº ¹ÙÅÁÈ­¸é¿¡ ³²¾Æ ÀÖ¾î¾ß ÇÕ´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "ÀÌ ÈÞÁöÅë Æú´õ¸¦ À̵¿ÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1902
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "ÈÞÁöÅëÀ¸·Î º¹»çÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1903
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "ÀÌ ÈÞÁöÅë Æú´õ¸¦ º¹»çÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1905
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "ÈÞÁöÅëÀÇ À§Ä¡¸¦ ¹Ù²Ü¼ö ¾ø½À´Ï´Ù"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1906
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "ÈÞÁöÅëÀ» º¹»çÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1929
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "Æú´õ¸¦ ±× Àڽſ¡°Ô ¿Å±æ¼ö ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1930
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "Æú´õ¸¦ ±× Àڽſ¡°Ô º¹»çÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1932
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "ÀÚ½ÅÀ¸·Î À̵¿ÇÒ¼ö ¾ø½À´Ï´Ù"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1933
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "ÀÚ½ÅÀ¸·Î º¹»çÇÒ¼ö ¾ø½À´Ï´Ù"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1946
-msgid "You cannot move a file onto itself."
-msgstr "ÆÄÀÏÀ» ±× Àڽſ¡°Ô ¿Å±æ¼ö ¾ø½À´Ï´Ù."
-
-#: libnautilus-extensions/nautilus-file-operations.c:1947
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "ÆÄÀÏÀ» ±× Àڽſ¡°Ô º¹»çÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1949
-msgid "Can't Move Onto Self"
-msgstr "ÀÚ½ÅÀ¸·Î À̵¿ÇÒ¼ö ¾ø½À´Ï´Ù"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1950
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "ÀÚ½ÅÀ¸·Î º¹»çÇÒ¼ö ¾ø½À´Ï´Ù"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2001
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5118,7 +5124,7 @@ msgstr ""
 "\n"
 "¸ñÇ¥¿¡ ¾²±â Çã°¡±ÇÀ» °¡Áö°í ÀÖÁö ¾Ê½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2004
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5128,679 +5134,661 @@ msgstr ""
 "\n"
 "¸ñÇ¥¿¡ ³²Àº °ø°£ÀÌ ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2007
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "»õ Æú´õ¸¦ ¸¸µå´Âµ¥ \"%s\" ¿À·ù."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2011
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "»õ Æú´õ¸¦ ¸¸µå´ÂÁß ¿À·ù"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2098
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "À̸§¾ø´Â Æú´õ"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2131
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "ÆÄÀÏ Áö¿ì´ÂÁß"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2133
-#: libnautilus-extensions/nautilus-file-operations.c:2168
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "ÆÄÀÏ »èÁ¦µÊ:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2135
-#: libnautilus-extensions/nautilus-file-operations.c:2170
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Áö¿ì´ÂÁß"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2136
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "ÆÄÀÏÀ» Áö¿ï ÁغñÁß"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2166
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "ÈÞÁöÅë ºñ¿ì´ÂÁß"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2171
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "ÈÞÁöÅë ºñ¿ì±â ÁغñÁß"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2202
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr "ÈÞÁöÅë¿¡ ÀÖ´Â ¸ðµç Ç׸ñÀ» ¿ÏÀüÈ÷ Áö¿ì½Ã°Ú½À´Ï±î?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2204
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "ÈÞÁöÅëÀÇ ³»¿ëÀ» Áö¿ì°Ú½À´Ï±î?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2205
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "ºñ¾îÀÖÀ½"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2243
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2243
-#: libnautilus-extensions/nautilus-file-operations.c:2253
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "foo (»çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (»çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".foo (»çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "foo foo (»çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2247
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2247
-#: libnautilus-extensions/nautilus-file-operations.c:2254
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "foo (»çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2248
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2248
-#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "foo foo (»çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (»çº»).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "foo.. (»çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "foo... (»çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "foo. (»çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "foo. (¶Ç ´Ù¸¥ »çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2253
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "foo (¶Ç ´Ù¸¥ »çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2254
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "foo (¶Ç ´Ù¸¥ »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "foo (¼¼¹ø° »çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "foo (¼¼¹ø° »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (¶Ç ´Ù¸¥ »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (¼¼¹ø° »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
+#: libnautilus-extensions/nautilus-file-operations.c:2274
 msgid "foo (13th copy)"
 msgstr "foo (13¹ø° »çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
+#: libnautilus-extensions/nautilus-file-operations.c:2274
 msgid "foo (14th copy)"
 msgstr "foo (14¹ø° »çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2275
 msgid "foo (13th copy).txt"
 msgstr "foo (13¹ø° »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2275
 msgid "foo (14th copy).txt"
 msgstr "foo (14¹ø° »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2260
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "foo (21¹ø° »çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2260
-#: libnautilus-extensions/nautilus-file-operations.c:2262
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "foo (22¹ø° »çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2261
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "foo (21¹ø° »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2261
-#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "foo (22¹ø° »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2262
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "foo (23¹ø° »çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2263
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "foo (23¹ø° »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2264
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "foo (24¹ø° »çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2265
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "foo (24¹ø° »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "foo (25¹ø° »çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "foo (25¹ø° »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24¹ø° »çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25¹ø° »çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24¹ø° »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25¹ø° »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000¹ø° »çº»).txt"
 
 #. FIXME bugzilla.eazel.com 7701: These are wrong.
-#: libnautilus-extensions/nautilus-file-operations.c:2273
+#: libnautilus-extensions/nautilus-file-operations.c:2289
 msgid "foo (10th copy)"
 msgstr "foo (10¹ø° »çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2273
+#: libnautilus-extensions/nautilus-file-operations.c:2289
 msgid "foo (11st copy)"
 msgstr "foo (11¹ø° »çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2274
+#: libnautilus-extensions/nautilus-file-operations.c:2290
 msgid "foo (10th copy).txt"
 msgstr "foo (10¹ø° »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2274
+#: libnautilus-extensions/nautilus-file-operations.c:2290
 msgid "foo (11st copy).txt"
 msgstr "foo (11¹ø° »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2291
 msgid "foo (11th copy)"
 msgstr "foo (11¹ø° »çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2291
 msgid "foo (12nd copy)"
 msgstr "foo (12¹ø° »çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 msgid "foo (11th copy).txt"
 msgstr "foo (11¹ø° »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 msgid "foo (12nd copy).txt"
 msgstr "foo (12¹ø° »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2293
 msgid "foo (12th copy)"
 msgstr "foo (12¹ø° »çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2293
 msgid "foo (13rd copy)"
 msgstr "foo (13¹ø° »çº»)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 msgid "foo (12th copy).txt"
 msgstr "foo (12¹ø° »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 msgid "foo (13rd copy).txt"
 msgstr "foo (13¹ø° »çº»).txt"
 
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
 #, c-format
 msgid "%ld of %ld"
 msgstr "%2$ld Áß %1$ld"
 
-#: libnautilus-extensions/nautilus-font-picker.c:96
-msgid "Normal"
-msgstr "º¸Åë"
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
+msgid "GConf Error"
+msgstr "GConf ¿À·ù"
 
-#: libnautilus-extensions/nautilus-font-picker.c:97
-#: libnautilus-extensions/nautilus-volume-monitor.c:516
-#: libnautilus-extensions/nautilus-volume-monitor.c:535
-msgid "Unknown"
-msgstr "¾Ë¼ö¾øÀ½"
+#. Constants
+#: libnautilus-extensions/nautilus-global-preferences.c:50
+msgid "Nautilus Preferences"
+msgstr "³ëÆ¿·¯½º ¼¼ºÎ»çÇ× ¼³Á¤"
 
-#: libnautilus-extensions/nautilus-font-picker.c:103
-msgid "Bold"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "Ç×»ó"
 
-#: libnautilus-extensions/nautilus-font-picker.c:104
-msgid "Book"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "Ç×»ó"
 
-#: libnautilus-extensions/nautilus-font-picker.c:106
-msgid "Demibold"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "·ÎÄø¸"
 
-#: libnautilus-extensions/nautilus-font-picker.c:107
-msgid "Light"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "·ÎÄà ÆÄÀϸ¸"
 
-#: libnautilus-extensions/nautilus-font-picker.c:113
-msgid "Italic"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "ÀüÇô"
 
-#: libnautilus-extensions/nautilus-font-picker.c:114
-msgid "Oblique"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "ÀüÇô"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "ºÎµå·¯¿î ±×·¡ÇÈ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "´õ ºÎµå·¯¿î(±×·¯³ª ´õ ´À¸°) ±×·¡ÇÈÀ» »ç¿ëÇÕ´Ï´Ù"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "±Û²Ã"
 
-#: libnautilus-extensions/nautilus-font-picker.c:115
-msgid "Reverse Italic"
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+msgid "Font for Icon view:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-font-picker.c:116
-msgid "Reverse Oblique"
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-font-picker.c:123
-msgid "Condensed"
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "¾ÆÀÌÄÜ & ¸ñ·Ï º¸±â"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-font-picker.c:124
-msgid "Semicondensed"
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-font-picker.c:226
-msgid "Font"
-msgstr "±Û²Ã"
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "³ëÆ¿·¯½º°¡ ¹ÙÅÁÈ­¸éÀ» ±×¸³´Ï´Ù"
 
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
-msgid "GConf Error"
-msgstr "GConf ¿À·ù"
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
+msgstr "»õâÀ¸·Î ¿­±â"
 
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:956
-msgid "fixed"
-msgstr "fixed,-*-gulim-medium-r-normal-*-*-*-*-*-*-*-*-*"
-
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1427
-msgid "01/01/00, 01:00 AM"
-msgstr "00/01/01, ¿ÀÀü 01:00"
+#: libnautilus-extensions/nautilus-global-preferences.c:651
+msgid "Open each file or folder in a separate window"
+msgstr "°¢°¢ÀÇ ÆÄÀÏÀ̳ª Æú´õ¸¦ ³ª´µ¾îÁø â¿¡¼­ ¿±´Ï´Ù"
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1428
-msgid "1/1/00, 1:00 AM"
-msgstr "00/1/1, ¿ÀÀü 1:00"
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+msgid "Display toolbar in new windows"
+msgstr "»õ â¿¡ µµ±¸¸·´ë Ç¥½Ã"
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1429
-msgid " 1/ 1/00,  1:00 AM"
-msgstr "00/ 1/ 1, ¿ÀÀü  1:00"
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "»õ â¿¡ À§Ä¡¸·´ë Ç¥½Ã"
 
-#. Constants
-#: libnautilus-extensions/nautilus-global-preferences.c:50
-msgid "Nautilus Preferences"
-msgstr "³ëÆ¿·¯½º ¼¼ºÎ»çÇ× ¼³Á¤"
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "»õ â¿¡ »óŸ·´ë Ç¥½Ã"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:97
-msgid "current theme"
-msgstr "ÇöÀç Å׸¶"
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "»õ â¿¡ °¡ÀåÀÚ¸®¸·´ë º¸±â"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:100
-msgid "Open each file or folder in a separate window"
-msgstr "°¢°¢ÀÇ ÆÄÀÏÀ̳ª Æú´õ¸¦ ³ª´µ¾îÁø â¿¡¼­ ¿±´Ï´Ù"
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "ÈÞÁöÅë Çൿ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:103
-msgid "Ask before emptying the Trash"
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+#, fuzzy
+msgid "Ask before emptying the Trash or deleting files"
 msgstr "ÈÞÁöÅëÀ» ºñ¿ì±â Àü¿¡ ¹°¾îº¾´Ï´Ù"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:106
-#: libnautilus-extensions/nautilus-global-preferences.c:597
-msgid "Click Behavior"
-msgstr "¸¶¿ì½º ¹öÆ° ´©¸£±â Çൿ"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
+
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:109
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 msgid "single"
 msgstr "Çѹø"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:110
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "Çѹø ´©¸£±â·Î Ç׸ñÀÌ È°¼ºÈ­ µË´Ï´Ù"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:114
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "µÎ¹ø"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:115
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "µÎ¹ø ´©¸£±â·Î Ç׸ñÀÌ È°¼ºÈ­ µË´Ï´Ù"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:119
-#: libnautilus-extensions/nautilus-global-preferences.c:604
-msgid "Executable Text Files"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-global-preferences.c:122
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 msgid "launch"
 msgstr "½ÇÇà"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:123
+#: libnautilus-extensions/nautilus-global-preferences.c:726
 msgid "Execute files when they are clicked"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:127
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 msgid "display"
 msgstr "Ç¥½Ã"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:128
+#: libnautilus-extensions/nautilus-global-preferences.c:730
 msgid "Display files when they are clicked"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:132
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 msgid "ask"
 msgstr "¹°¾îº½"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:133
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 msgid "Ask each time"
 msgstr "½Ã°£¸¶´Ù ¹°¾îº½"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:143
-#: libnautilus-extensions/nautilus-global-preferences.c:725
-msgid "Show Text in Icons"
-msgstr "¾ÆÀÌÄܾȿ¡ ±ÛÀÚ º¸ÀÓ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:146
-#: libnautilus-extensions/nautilus-global-preferences.c:732
-msgid "Show Count of Items in Folders"
-msgstr "Æú´õÀÇ Ç׸ñ°³¼ö¸¦ º¾´Ï´Ù"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:149
-#: libnautilus-extensions/nautilus-global-preferences.c:739
-msgid "Show Thumbnails for Image Files"
-msgstr "±×¸²ÆÄÀÏÀÇ ¹Ì¸®º¸±â º¸ÀÓ"
-
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:152
-#: libnautilus-extensions/nautilus-global-preferences.c:755
-msgid "Make Folder Appearance Details Public"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-global-preferences.c:155
-#: libnautilus-extensions/nautilus-global-preferences.c:746
-msgid "Preview Sound Files"
-msgstr "»ç¿îµå ÆÄÀÏ ¹Ì¸®º¸±â"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Use smoother (but slower) graphics"
-msgstr "´õ ºÎµå·¯¿î(±×·¯³ª ´õ ´À¸°) ±×·¡ÇÈÀ» »ç¿ëÇÕ´Ï´Ù"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Use this font family to display file names:"
-msgstr "ÆÄÀÏ À̸§À» Ç¥½ÃÇÒ¶§ ±Û²Ã±ºÀ» »ç¿ëÇÕ´Ï´Ù:"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-msgid "Display toolbar in new windows"
-msgstr "»õ â¿¡ µµ±¸¸·´ë Ç¥½Ã"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:170
-msgid "Display location bar in new windows"
-msgstr "»õ â¿¡ À§Ä¡¸·´ë Ç¥½Ã"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:173
-msgid "Display status bar in new windows"
-msgstr "»õ â¿¡ »óŸ·´ë Ç¥½Ã"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:176
-msgid "Display sidebar in new windows"
-msgstr "»õ â¿¡ °¡ÀåÀÚ¸®¸·´ë º¸±â"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:179
-msgid "Use Nautilus to draw the desktop"
-msgstr "³ëÆ¿·¯½º°¡ ¹ÙÅÁÈ­¸éÀ» ±×¸³´Ï´Ù"
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "¸¶¿ì½º ¹öÆ° ´©¸£±â Çൿ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:183
-msgid "Enable fast search (indexes your hard drive)"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:186
-msgid "search type to do by default"
-msgstr "±âº»°ªÀ¸·Î ÀÛµ¿Çϴ ã±â Çü½Ä"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:189
-msgid "search by text"
-msgstr "³»¿ëÀ¸·Î ã±â"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:190
-msgid "Search for files by file name only"
-msgstr "ÆÄÀϸíÀ¸·Î¸¸ ÆÄÀÏã±â"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:194
-msgid "search by text and properties"
-msgstr "³»¿ë°ú ¼Ó¼ºÀ¸·Î ã±â"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:195
-msgid "Search for files by file name and file properties"
-msgstr "ÆÄÀϸí°ú ¼Ó¼ºÀ¸·Î ÆÄÀÏ Ã£±â"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:199
-msgid "Search Engine Location"
-msgstr "ã±â ¿£Áø À§Ä¡"
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr "¿É¼Ç º¸À̱â/¼û±â±â"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:203
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr "¼û±èÆÄÀÏ º¸ÀÓ( \".\"À¸·Î ½ÃÀÛÇÏ´Â)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:206
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr "¹é¾÷ÆÄÀÏ º¸ÀÓ(\"~\"À¸·Î ³¡³ª´Â)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:209
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr "¼³Á¤ âÀÇ Æ¯¼öÇ¥½Ã º¸±â"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:212
-msgid "Show only folders (no files) in the tree"
-msgstr "Æ®¸®¿¡ Æú´õ¸¸ º¸À̱â(ÆÄÀÏÀº º¸ÀÌÁö ¾Ê±â)"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:215
-msgid "Can add Content"
-msgstr "³»¿ë Ãß°¡"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+#, fuzzy
+msgid "Sorting Order"
+msgstr "¼ÒÀ¯ÁÖ ¼³Á¤ ¿À·ù"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:218
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
-msgstr "¸Þ´ºÀÇ ³»Àå Ã¥°¥ÇÇ¿¡ Æ÷ÇÔÇÏÁö ¾ÊÀ½"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:222
-#: libnautilus-extensions/nautilus-global-preferences.c:227
-#: src/file-manager/fm-properties-window.c:1519 src/nautilus-location-bar.c:62
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
 msgid "Location:"
 msgstr "À§Ä¡:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:226
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+msgid "HTTP Proxy Settings"
+msgstr "HTTP ÇÁ·Ï½Ã ¼³Á¤"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "HTTP ÇÁ·Ï½Ã »ç¿ë"
 
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:228
+#: libnautilus-extensions/nautilus-global-preferences.c:812
 #: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr "Æ÷Æ®:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:533
-msgid "Appearance"
-msgstr "¿Ü°ü"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:535
-msgid "Smoother Graphics"
-msgstr "ºÎµå·¯¿î ±×·¡ÇÈ"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "³»Àå Ã¥°¥ÇÇ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:552
-msgid "Windows & Desktop"
-msgstr "â & ¹ÙÅÁÈ­¸é"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "¸Þ´ºÀÇ ³»Àå Ã¥°¥ÇÇ¿¡ Æ÷ÇÔÇÏÁö ¾ÊÀ½"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:560
-msgid "Opening New Windows"
-msgstr "»õâÀ¸·Î ¿­±â"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "¾ÆÀÌÄܾȿ¡ ±ÛÀÚ º¸ÀÓ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:583
-msgid "Trash Behavior"
-msgstr "ÈÞÁöÅë Çൿ"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr "Æú´õÀÇ Ç׸ñ°³¼ö¸¦ º¾´Ï´Ù"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:595
-msgid "Icon & List Views"
-msgstr "¾ÆÀÌÄÜ & ¸ñ·Ï º¸±â"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "±×¸²ÆÄÀÏÀÇ ¹Ì¸®º¸±â º¸ÀÓ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:611
-msgid "Show/Hide Options"
-msgstr "¿É¼Ç º¸À̱â/¼û±â±â"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:632
-msgid "Sidebar Panels"
-msgstr "°¡ÀåÀÚ¸®¸·´ë ÆdzÚ"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr "»ç¿îµå ÆÄÀÏ ¹Ì¸®º¸±â"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:635
-msgid "Tabs"
-msgstr "ÅÇ"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:684
-msgid "Navigation"
-msgstr "Ž»ö"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "¿Ü°ü"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:693
-msgid "HTTP Proxy Settings"
-msgstr "HTTP ÇÁ·Ï½Ã ¼³Á¤"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr "â & ¹ÙÅÁÈ­¸é"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:712
-msgid "Built-in Bookmarks"
-msgstr "³»Àå Ã¥°¥ÇÇ"
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr "¾ÆÀÌÄÜ & ¸ñ·Ï º¸±â"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:723
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+msgid "Navigation"
+msgstr "Ž»ö"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:962
 msgid "Speed Tradeoffs"
 msgstr "¼Óµµ Á¶Á¤"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:794
-msgid "Search"
-msgstr "°Ë»ö"
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr "³»¿ëÀ¸·Î ã±â"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+msgid "Search for files by file name only"
+msgstr "ÆÄÀϸíÀ¸·Î¸¸ ÆÄÀÏã±â"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr "³»¿ë°ú ¼Ó¼ºÀ¸·Î ã±â"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+msgid "Search for files by file name and file properties"
+msgstr "ÆÄÀϸí°ú ¼Ó¼ºÀ¸·Î ÆÄÀÏ Ã£±â"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "°Ë»ö º¹Àâµµ ¼³Á¤"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:802
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "±âº»°ªÀ¸·Î ÀÛµ¿Çϴ ã±â Çü½Ä"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 msgid "Fast Search"
 msgstr "ºü¸¥ °Ë»ö"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:846
-msgid "Fonts"
-msgstr "±Û²Ã"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1026
-#, c-format
-msgid "Display %s tab in sidebar"
-msgstr "°¡ÀåÀÚ¸® ¸·´ë¿¡ %sÅÇ º¸À̱â"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1073
-msgid "always"
-msgstr "Ç×»ó"
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+msgid "Search Engine Location"
+msgstr "ã±â ¿£Áø À§Ä¡"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1074
-msgid "Always"
-msgstr "Ç×»ó"
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "°Ë»ö"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1077
-msgid "local only"
-msgstr "·ÎÄø¸"
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr "Æ®¸®¿¡ Æú´õ¸¸ º¸À̱â(ÆÄÀÏÀº º¸ÀÌÁö ¾Ê±â)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1078
-msgid "Local Files Only"
-msgstr "·ÎÄà ÆÄÀϸ¸"
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, c-format
+msgid "Display %s tab in sidebar"
+msgstr "°¡ÀåÀÚ¸® ¸·´ë¿¡ %sÅÇ º¸À̱â"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1081
-msgid "never"
-msgstr "ÀüÇô"
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "°¡ÀåÀÚ¸®¸·´ë ÆdzÚ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1082
-msgid "Never"
-msgstr "ÀüÇô"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr "ÅÇ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1145
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "currently can't be performed because the program crond, which does nightly "
@@ -5808,13 +5796,13 @@ msgid ""
 "done, turn crond on."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1152
-#: libnautilus-extensions/nautilus-global-preferences.c:1170
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
 msgid "Files May Not Be Indexed"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1153
-#: libnautilus-extensions/nautilus-global-preferences.c:1171
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
 msgid ""
 "If you are running Linux, you can log in as root and type these commands to "
 "start cron:\n"
@@ -5823,7 +5811,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1162
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "may not be performed because the program crond, which does nightly tasks on "
@@ -5832,14 +5820,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-gnome-extensions.c:640
-msgid "No image was selected.  You must click on an image to select it."
-msgstr ""
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:641
-msgid "No selection made"
-msgstr ""
-
 #. The list of characters that cause line breaks can be localized.
 #: libnautilus-extensions/nautilus-icon-canvas-item.c:70
 msgid " -_,;.?/&"
@@ -5887,56 +5867,40 @@ msgstr "¼öµ¿ ¹èÄ¡·Î Àüȯ ÇϽðڽÀ´Ï±î?"
 msgid "Switch"
 msgstr "Àüȯ"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "À̸§ ¹Ù²Þ"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1551
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr "ÀÔ·Â Ãë¼Ò"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1552
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "ÀÌÀü À̸§ ÀúÀå"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1553
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "ÀÔ·Â µÇµ¹¸²"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1554
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "º¯°æÇÑ À̸§ ÀúÀå"
 
-#: libnautilus-extensions/nautilus-password-dialog.c:306
-msgid "Remember this password"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-preferences-item.c:483
-msgid "times"
-msgstr "times,gulim"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:484
-msgid "courier"
-msgstr "courier,gulim"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:485
-msgid "lucida"
-msgstr "lucida,gulim"
-
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "ÃʱÞÀÚ"
 
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "Áß±ÞÀÚ"
 
-#: libnautilus-extensions/nautilus-preferences.c:79
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "Àü¹®°¡"
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:202
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "¼³Á¤ »óÀÚ"
 
@@ -6035,7 +5999,7 @@ msgid "Don't include in the menu for \"%s\" items"
 msgstr "\"%s\" Ç׸ñ¿¡ ¸Þ´º·Î Æ÷ÇÔÇÏÁö ¾ÊÀ½"
 
 #: libnautilus-extensions/nautilus-program-chooser.c:1209
-#: src/file-manager/fm-list-view.c:2123
+#: src/file-manager/fm-list-view.c:2182
 #: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
@@ -6381,25 +6345,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr "ÀÚ¼¼È÷"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr "ÁÖÀÇ"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr "¿À·ù"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr "Áú¹®"
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr "µð½ºÅ© °Ë»ö"
@@ -6408,7 +6353,7 @@ msgstr "µð½ºÅ© °Ë»ö"
 msgid "Nautilus is searching your disks for trash folders."
 msgstr "³ëÆ¿·¯½º°¡ ÈÞÁöÅë Æú´õ¸¦ °Ë»öÁßÀÔ´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-trash-file.c:600
+#: libnautilus-extensions/nautilus-trash-file.c:725
 msgid "on the desktop"
 msgstr ""
 
@@ -6442,47 +6387,44 @@ msgstr "%s ·Î º¸±â"
 msgid "%s Viewer"
 msgstr "%s º¸±â ÇÁ·Î±×·¥"
 
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+msgid "Unknown"
+msgstr "¾Ë¼ö¾øÀ½"
+
 #. Populate table with items we know localized names for.
-#: libnautilus-extensions/nautilus-volume-monitor.c:623
-#: libnautilus-extensions/nautilus-volume-monitor.c:1862
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr "Ç÷ÎÇÇ"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:624
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
 msgid "CD-ROM"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:625
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
 msgid "Zip Drive"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:646
-#: libnautilus-extensions/nautilus-volume-monitor.c:668
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 msgid "Audio CD"
 msgstr "À½¾Ç CD"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1547
-msgid "Mount Error"
-msgstr "¸¶¿îÆ® ¿À·ù"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1549
-msgid "Unmount Error"
-msgstr "¾ð¸¶¿îÆ® ¿À·ù"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1579
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr "¾²±â ¹æÁö°¡ µÇ¾îÀÖ½À´Ï´Ù. ÀбâÀü¿ëÀ¸·Î ¸¶¿îÆ®ÇÕ´Ï´Ù"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1582
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "´Â ¿Ã¹Ù¸¥ ºí·° ÀåÄ¡°¡ ¾Æ´Õ´Ï´Ù"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1583
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr ""
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1587
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
@@ -6491,18 +6433,18 @@ msgstr ""
 "µð½ºÅ©°¡ ¾ø´Â°Í °°½À´Ï´Ù."
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1591
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
 msgstr ""
 "³ëÆ¿·¯½º°¡ º¼·ýÀ» ¸¶¿îÆ® ÇÒ¼ö ¾ø½À´Ï´Ù. ¾Æ¸¶µµ ÀåÄ¡¿¡ ¸Åü°¡ ¾ø´Â°Í °°½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1594
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr "À߸øµÈ ÆÄÀϽýºÅÛ Çü½Ä, À߸øµÈ ¿É¼Ç, À߸øµÈ ½´ÆÛºí·°"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1597
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
@@ -6510,7 +6452,7 @@ msgstr ""
 "³ëÆ¿·¯½º°¡ ¼±ÅÃÇÑ Ç÷ÎÇÇ µå¶óÀ̺긦 ¸¶¿îÆ® ÇÒ¼ö ¾ø½À´Ï´Ù. ¾Æ¸¶µµ Ç÷ÎÇÇ°¡ "
 "¸¶¿îÆ® ÇÒ¼ö ¾ø´Â Çü½ÄÀ¸·Î µÇ¾î ÀÖ½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1600
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
@@ -6518,48 +6460,56 @@ msgstr ""
 "³ëÆ¿·¯½º°¡ ¼±ÅÃÇÑ º¼·ýÀ» ¸¶¿îÆ® ÇÒ¼ö ¾ø½À´Ï´Ù. ¾Æ¸¶µµ º¼·ýÀÌ ¸¶¿îÆ® ÇÒ¼ö "
 "¾ø´Â Çü½ÄÀ¸·Î µÇ¾î ÀÖ½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1605
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr "³ëÆ¿·¯½º°¡ ¼±ÅÃÇÑ Ç÷ÎÇÇ µå¶óÀ̺긦 ¸¶¿îÆ® ÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1607
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "³ëÆ¿·¯½º°¡ ¼±ÅÃÇÑ º¼·ýÀ» ¸¶¿îÆ® ÇÒ¼ö ¾ø½À´Ï´Ù"
 
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1612
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr "³ëÆ¿·¯½º°¡ ¼±ÅÃÇÑ º¼·ýÀ» ¾ð¸¶¿îÆ® ÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1764
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr "¸¶¿îÆ® ¿À·ù"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr "¾ð¸¶¿îÆ® ¿À·ù"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "ISO 9660 º¼·ý"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1779
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "·çÆ®"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1786
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Ext2 º¼·ý"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1801
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "MSDOS º¼·ý"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1816
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "NFS º¼·ý"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1831
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
 msgid "ReiserFS Volume"
 msgstr "ReiserFS º¼·ý"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1847
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
 msgid "UFS Volume"
 msgstr "UFS º¼·ý"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1877
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "¾Ë¼ö ¾ø´Â º¼·ý"
 
@@ -6567,31 +6517,65 @@ msgstr "¾Ë¼ö ¾ø´Â º¼·ý"
 msgid "C_lear Text"
 msgstr "ºñ¿ì±â(_l)"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "ºñ¿ì±â(_l)"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "º¹»ç(_C)"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "Ŭ¸³º¸µå¿¡¼­ ¼±ÅÃÇÑ ¹®ÀÚ¸¦ º¹»çÇÕ´Ï´Ù"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:15
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "ÀÚ¸£±â(_C)"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
 msgid "Cut _Text"
 msgstr "ÀÚ¸£±â(_C)"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "Ŭ¸³º¸µå¿¡¼­ ¼±ÅÃÇÑ ¹®ÀÚ¸¦ ÀÚ¸¨´Ï´Ù"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:5 src/nautilus-shell-ui.xml.h:46
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "ºÙÀ̱â(_P)"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "Ŭ¸³º¸µå¿¡ ÀúÀåµÈ ¹®ÀÚ¸¦ ºÙÀÔ´Ï´Ù"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:6
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "Ŭ¸³º¸µå¿¡ ¼±ÅÃµÈ ¹®ÀÚ¸¦ ±â·ÏÇÏÁö ¾Ê°í Áö¿ó´Ï´Ù"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:7 src/nautilus-shell-ui.xml.h:80
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "Àüü ¼±ÅÃ(_A)"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+msgid "Select _All"
+msgstr "Àüü ¼±ÅÃ(_A)"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "¸ðµç ¼±ÅÃÇÑ Ç׸ñÀ» ÀÌâ¿¡¼­ ¿±´Ï´Ù"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "º¹»ç(_C)"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:93
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "ºÙÀ̱â(_P)"
 
@@ -6600,7 +6584,7 @@ msgstr "ºÙÀ̱â(_P)"
 #. * to change it when we upgrade to GTK 2.0.
 #.
 #: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
-#: src/nautilus-window-menus.c:573
+#: src/nautilus-window-menus.c:610
 msgid "Nautilus"
 msgstr "³ëÆ¿·¯½º"
 
@@ -6616,78 +6600,107 @@ msgstr "³ëÆ¿·¯½º ÆÄÀÏ°ü¸®ÀÚ ¹× ±×·¡ÇÈ ½©"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:786
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr "%sÀÇ È¨"
 
-#: src/file-manager/fm-desktop-icon-view.c:1072
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "ÈÞÁöÅë ºñ¿ì±â..."
 
-#: src/file-manager/fm-desktop-icon-view.c:1074
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "ÈÞÁöÅë ºñ¿ì±â"
 
-#: src/file-manager/fm-desktop-icon-view.c:1094
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "º¼·ý ¸¶¿îÆ®ÇØÁ¦"
 
-#: src/file-manager/fm-directory-view.c:474
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr "ÀÌ°ÍÀº %d°³ÀÇ ³ª´µ¾îÁø â¿¡¼­ ¿­¸±°ÍÀÔ´Ï´Ù. Á¤¸»·Î ÀÌ°ÍÀ» ¿­°Ú½À´Ï±î?"
 
-#: src/file-manager/fm-directory-view.c:476
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d°³ÀÇ Ã¢À» ¿­±â"
 
-#: src/file-manager/fm-directory-view.c:1212
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr "ÈÞÁöÅë¿¡¼­ \"%s\"¸¦ ¿ÏÀüÈ÷ Áö¿ì½Ã°Ú½À´Ï±î?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr "ÈÞÁöÅë¿¡¼­ %dÀÇ ¼±ÅÃÇÑ Ç׸ñÀ» ¿ÏÀüÈ÷ Áö¿ì½Ã°Ú½À´Ï±î?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Áö¿ò"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Áö¿ò"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+msgid "scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" ¼±ÅõÊ"
 
-#: src/file-manager/fm-directory-view.c:1214
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "1 Æú´õ ¼±ÅõÊ"
 
-#: src/file-manager/fm-directory-view.c:1217
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "%d Æú´õ ¼±ÅõÊ"
 
-#: src/file-manager/fm-directory-view.c:1223
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr " (0 Ç׸ñ Æ÷ÇÔ)"
 
-#: src/file-manager/fm-directory-view.c:1225
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr " (1 Ç׸ñ Æ÷ÇÔ)"
 
-#: src/file-manager/fm-directory-view.c:1227
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr " (%d Ç׸ñ Æ÷ÇÔ)"
 
-#: src/file-manager/fm-directory-view.c:1238
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" ¼±ÅÃµÊ (%s)"
 
-#: src/file-manager/fm-directory-view.c:1242
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d Ç׸ñ ¼±ÅÃµÊ (%s)"
 
-#: src/file-manager/fm-directory-view.c:1249
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 ´Ù¸¥ Ç׸ñ ¼±ÅÃµÊ (%s)"
 
-#: src/file-manager/fm-directory-view.c:1252
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d ´Ù¸¥ Ç׸ñ ¼±ÅÃµÊ (%s)"
@@ -6699,7 +6712,7 @@ msgstr "%d ´Ù¸¥ Ç׸ñ ¼±ÅÃµÊ (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1281
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr ""
@@ -6708,7 +6721,7 @@ msgstr ""
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1407
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
@@ -6717,17 +6730,17 @@ msgstr ""
 "Æú´õ \"%s\"´Â ³ëÆ¿·¯½º°¡ ó¸®ÇÒ¼ö Àִ°ͺ¸´Ù ´õ¸¹Àº ÆÄÀÏÀ» Æ÷ÇÔÇÏ°í ÀÖ½À´Ï "
 "´Ù. ¸î ÆÄÀϵéÀÌ Ç¥½ÃµÇÁö ¾ÊÀ»¼ö ÀÖ½À´Ï´Ù."
 
-#: src/file-manager/fm-directory-view.c:1414
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "ÆÄÀÏÀÌ ³Ê¹« ¸¹À½"
 
-#: src/file-manager/fm-directory-view.c:2623
+#: src/file-manager/fm-directory-view.c:2752
 #, c-format
 msgid ""
 "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
 msgstr "\"%s\" ´Â ÈÞÁöÅëÀ¸·Î À̵¿ÇÒ¼ö ¾ø½À´Ï´Ù. Áö±Ý ¹Ù·Î Áö¿ö¹ö¸±±î¿ä?"
 
-#: src/file-manager/fm-directory-view.c:2628
+#: src/file-manager/fm-directory-view.c:2757
 #, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
@@ -6735,7 +6748,7 @@ msgid ""
 msgstr ""
 "%d°³ÀÇ ¼±ÅÃµÈ Ç׸ñÀº ÈÞÁöÅëÀ¸·Î À̵¿ÇÒ¼ö ¾ø½À´Ï´Ù. Áö±Ý ¹Ù·Î Áö¿ö¹ö¸±±î¿ä?"
 
-#: src/file-manager/fm-directory-view.c:2632
+#: src/file-manager/fm-directory-view.c:2761
 #, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -6744,96 +6757,228 @@ msgstr ""
 "%d°³ÀÇ ¼±ÅÃµÈ Ç׸ñÀº ÈÞÁöÅëÀ¸·Î À̵¿ÇÒ¼ö ¾ø½À´Ï´Ù. Áö±Ý ¹Ù·Î ±× %d°³ÀÇ "
 "Ç׸ñÀ» Áö¿ö¹ö¸±±î¿ä?"
 
-#: src/file-manager/fm-directory-view.c:2640
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "Áï½Ã Áö¿ö¹ö¸±±î¿ä?"
 
-#: src/file-manager/fm-directory-view.c:2641
-#: src/file-manager/fm-directory-view.c:2682
-msgid "Delete"
-msgstr "Áö¿ò"
-
-#: src/file-manager/fm-directory-view.c:2671
+#: src/file-manager/fm-directory-view.c:2799
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr "ÈÞÁöÅë¿¡¼­ \"%s\"¸¦ ¿ÏÀüÈ÷ Áö¿ì½Ã°Ú½À´Ï±î?"
 
-#: src/file-manager/fm-directory-view.c:2675
+#: src/file-manager/fm-directory-view.c:2803
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
 "Trash?"
 msgstr "ÈÞÁöÅë¿¡¼­ %dÀÇ ¼±ÅÃÇÑ Ç׸ñÀ» ¿ÏÀüÈ÷ Áö¿ì½Ã°Ú½À´Ï±î?"
 
-#: src/file-manager/fm-directory-view.c:2681
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "ÈÞÁöÅë¿¡¼­ Áö¿ì°Ú½À´Ï±î?"
 
-#: src/file-manager/fm-directory-view.c:2978
-#: src/file-manager/fm-directory-view.c:3018
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "¼±ÅÃÇÑ Ç׸ñÀ» ¿­±â À§ÇØ \"%s\" »ç¿ë"
 
-#: src/file-manager/fm-directory-view.c:3220
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "´Ù¸¥ ÇÁ·Î±×·¥(_A)..."
+
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "´Ù¸¥ ÇÁ·Î±×·¥(_A)..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "´Ù¸¥ º¸±â ÇÁ·Î±×·¥(_V)..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "´Ù¸¥ º¸±â ÇÁ·Î±×·¥(_V)..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "¼±ÅÃÇÑ Ç׸ñÀ» ¿­±â À§ÇØ \"%s\" »ç¿ë"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "³ëÆ¿·¯½º°¡ ¼±ÅÃÇÑ º¼·ýÀ» ¸¶¿îÆ® ÇÒ¼ö ¾ø½À´Ï´Ù"
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"%d°³ÀÇ ¼±ÅÃµÈ Ç׸ñÀº ÈÞÁöÅëÀ¸·Î À̵¿ÇÒ¼ö ¾ø½À´Ï´Ù. Áö±Ý ¹Ù·Î Áö¿ö¹ö¸±±î¿ä?"
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "»õ â¿¡¼­ ¿­±â(_i)"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open _in New Window"
 msgstr "»õ â¿¡¼­ ¿­±â(_i)"
 
-#: src/file-manager/fm-directory-view.c:3222
+#: src/file-manager/fm-directory-view.c:3959
 #, c-format
 msgid "Open _in %d New Windows"
 msgstr "%d°³ÀÇ »õâ¿¡¼­ ¿­±â(_i)"
 
-#: src/file-manager/fm-directory-view.c:3248
-msgid "Delete all selected items permanently"
-msgstr "¼±ÅÃÇÑ Ç׸ñÀ» ¸ðµÎ Áö¿ó´Ï´Ù"
-
-#: src/file-manager/fm-directory-view.c:3253
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "ÈÞÁöÅë¿¡¼­ Áö¿ì±â(_T)..."
 
-#: src/file-manager/fm-directory-view.c:3254
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "ÈÞÁöÅë¿¡¼­ Áö¿ì±â(_T)"
 
-#: src/file-manager/fm-directory-view.c:3258
-msgid "Move all selected items to the Trash"
-msgstr "¼±ÅÃÇÑ Ç׸ñÀ» ¸ðµÎ ÈÞÁöÅëÀ¸·Î À̵¿ÇÕ´Ï´Ù"
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "¼±ÅÃÇÑ Ç׸ñÀ» ¸ðµÎ Áö¿ó´Ï´Ù"
 
-#: src/file-manager/fm-directory-view.c:3262
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "ÈÞÁöÅëÀ¸·Î À̵¿(_T)"
 
-#: src/file-manager/fm-directory-view.c:3292
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "¼±ÅÃÇÑ Ç׸ñÀ» ¸ðµÎ ÈÞÁöÅëÀ¸·Î À̵¿ÇÕ´Ï´Ù"
+
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "Áö¿ò"
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "Áö¿ò"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "¸µÅ© »ý¼º"
 
-#: src/file-manager/fm-directory-view.c:3293
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "¸µÅ© »ý¼º"
 
-#: src/file-manager/fm-directory-view.c:3311
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "ÈÞÁöÅë ºñ¿ì±â(_E)..."
 
-#: src/file-manager/fm-directory-view.c:3312
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "ÈÞÁöÅë ºñ¿ì±â(_E)"
 
-#: src/file-manager/fm-directory-view.c:3323
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "¼³Á¤ÇÑ ¾ÆÀÌÄÜ Á¦°Å(_e)"
 
-#: src/file-manager/fm-directory-view.c:3324
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "¼³Á¤ÇÑ ¾ÆÀÌÄÜ Á¦°Å(_e)"
 
-#: src/file-manager/fm-directory-view.c:3477
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "ÆÄÀÏ(_F)"
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u ÆÄÀÏ"
+
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "º¹»ç(_C)"
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "ÆÄÀÏ º¹»çÁß"
+
+#: src/file-manager/fm-directory-view.c:4252
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
 "link in the Trash?"
@@ -6841,7 +6986,7 @@ msgstr ""
 "ÀÌ ¸µÅ©´Â °¡¸£Å°´Â ÆÄÀÏÀÌ ¾ø±â ¶§¹®¿¡ »ç¿ëÇÒ¼ö ¾ø½À´Ï´Ù. ÀÌ ¸µÅ©¸¦ ÈÞÁöÅë¿¡ "
 "¹ö¸®°Ú½À´Ï±î?"
 
-#: src/file-manager/fm-directory-view.c:3480
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
@@ -6850,49 +6995,49 @@ msgstr ""
 "ÀÌ ¸µÅ©´Â °¡¸£Å°´Â ÆÄÀÏ \"%s\"ÀÌ ¾ø±â ¶§¹®¿¡ »ç¿ëÇÒ¼ö ¾ø½À´Ï´Ù. ÀÌ ¸µÅ©¸¦ "
 "ÈÞÁöÅë¿¡ ¹ö¸®°Ú½À´Ï±î?"
 
-#: src/file-manager/fm-directory-view.c:3486
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "±úÁø ¸µÅ©"
 
-#: src/file-manager/fm-directory-view.c:3487
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr "¹ö¸²"
 
-#: src/file-manager/fm-directory-view.c:3540
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
 "contents?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3546
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr "½ÇÇà ¶Ç´Â Ç¥½Ã?"
 
-#: src/file-manager/fm-directory-view.c:3547
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "½ÇÇà"
 
-#: src/file-manager/fm-directory-view.c:3548
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "º¸±â"
 
-#: src/file-manager/fm-directory-view.c:3602
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
 msgstr "º¸¾È¹®Á¦ ¶§¹®¿¡ ¿ø°Ý»çÀÌÆ®¿¡¼­ ¸í·ÉÀ» ½ÇÇàÇÒ¼ö ¾ø½À´Ï´Ù"
 
-#: src/file-manager/fm-directory-view.c:3604
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "¿ø°Ý ÆÄÀÏ %s ½ÇÇàÇÒ¼ö ¾øÀ½"
 
-#: src/file-manager/fm-directory-view.c:3738
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr "\"%s\"¸¦ ¿©´ÂÁß"
 
-#: src/file-manager/fm-directory-view.c:3744
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "¿­±â¸¦ Ãë¼ÒÇÒ±î¿ä?"
 
@@ -6902,16 +7047,21 @@ msgid ""
 "You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "\"%s\"¸¦ º¸±âÀ§ÇÑ Æ۹̼ÇÀ» °¡ÁöÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: src/file-manager/fm-error-reporting.c:65
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "\"%s\"ÀÇ ³»¿ëÀ» Ç¥½ÃÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Ç¥½ÃÇÏ´ÂÁß ¿À·ù"
 
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
@@ -6919,18 +7069,18 @@ msgstr ""
 "\"%s\"¶ó´Â À̸§Àº ÀÌ¹Ì ÀÌ Æú´õ¿¡¼­ »ç¿ëµÇ°í ÀÖ½À´Ï´Ù. ´Ù¸¥ À̸§À» "
 "»ç¿ëÇϽʽÿÀ."
 
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "ÀÌ Æú´õ¿¡´Â \"%s\"°¡ ¾ø½À´Ï´Ù. ¿Å°ÜÁö°Å³ª Áö¿öÁöÁö ¾Ê¾Ò½À´Ï±î?"
 
-#: src/file-manager/fm-error-reporting.c:109
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "\"%s\"ÀÇ À̸§À» ¹Ù²Ù±â À§ÇÑ Çã°¡±ÇÀ» °¡ÁöÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -6939,80 +7089,80 @@ msgstr ""
 "\"%s\"¶ó´Â À̸§Àº \"/\"¸¦ Æ÷ÇÔÇÏ°í Àֱ⶧¹®¿¡ ¿Ã¹Ù¸£Áö ¾Ê½À´Ï´Ù. ´Ù¸¥ À̸§À» "
 "»ç¿ëÇϽʽÿÀ."
 
-#: src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "\"%s\"¶ó´Â À̸§Àº ¿Ã¹Ù¸£Áö ¾Ê½À´Ï´Ù. ´Ù¸¥ À̸§À» »ç¿ëÇϽʽÿÀ."
 
-#: src/file-manager/fm-error-reporting.c:124
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "Àбâ Àü¿ëµð½ºÅ©À̱⠶§¹®¿¡ \"%s\"ÀÇ À̸§À» ¹Ù²Ü¼ö ¾ø½À´Ï´Ù."
 
-#: src/file-manager/fm-error-reporting.c:133
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "\"%s\"¸¦ \"%s\"·Î ¹Ù²ÙÁö ¸øÇÕ´Ï´Ù."
 
-#: src/file-manager/fm-error-reporting.c:140
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "À̸§ ¹Ù²Þ ¿À·ù"
 
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "\"%s\"ÀÇ ±×·ìÀ» ¹Ù²Ù±â À§ÇÑ Çã°¡±ÇÀ» °¡ÁöÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr "Àбâ Àü¿ëµð½ºÅ©À̱⠶§¹®¿¡ \"%s\"ÀÇ ±×·ìÀ» ¾ø½À´Ï´Ù."
 
-#: src/file-manager/fm-error-reporting.c:172
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "\"%s\"ÀÇ ±×·ìÀ» º¯°æÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: src/file-manager/fm-error-reporting.c:176
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "±×·ì ¼³Á¤ ¿À·ù"
 
-#: src/file-manager/fm-error-reporting.c:198
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr "Àбâ Àü¿ëµð½ºÅ©À̱⠶§¹®¿¡ \"%s\"ÀÇ ¼ÒÀ¯ÁÖ¸¦ ¹Ù²Ü¼ö ¾ø½À´Ï´Ù."
 
-#: src/file-manager/fm-error-reporting.c:205
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "\"%s\"ÀÇ ¼ÒÀ¯ÁÖ¸¦ º¯°æÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "¼ÒÀ¯ÁÖ ¼³Á¤ ¿À·ù"
 
-#: src/file-manager/fm-error-reporting.c:230
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr "ÀбâÀü¿ëµð½ºÅ©À̱⠶§¹®¿¡ \"%s\"ÀÇ Çã°¡±ÇÀ» º¯°æÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: src/file-manager/fm-error-reporting.c:237
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "\"%s\"ÀÇ Çã°¡±ÇÀ» º¯°æÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "Çã°¡±Ç ¼³Á¤ ¿À·ù"
 
-#: src/file-manager/fm-error-reporting.c:306
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "\"%s\"ÀÇ À̸§À» \"%s\"·Î ¹Ù²Þ."
 
-#: src/file-manager/fm-error-reporting.c:311
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "À̸§¹Ù²ÞÀ» Ãë¼ÒÇÒ±î¿ä?"
 
@@ -7072,76 +7222,76 @@ msgstr ""
 "¾ÆÀÌÄÜ À̸§¹Ø¿¡ ³ªÅ¸³¾ Á¤º¸ÀÇ ¼ø¼­¸¦ ¼±ÅÃÇÕ´Ï´Ù. Å©°Ô È®´ëÇÒ¼ö·Ï ¸¹Àº Á¤º¸°¡ "
 "³ªÅ¸³¯°Í ÀÔ´Ï´Ù."
 
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "À̸§¼ø Á¤·Ä(_N)"
 
-#: src/file-manager/fm-icon-view.c:159
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "À̸§¼øÀ¸·Î ¾ÆÀÌÄÜÀ» Á¤·ÄÇÕ´Ï´Ù"
 
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "Å©±â¼ø Á¤·Ä(_S)"
 
-#: src/file-manager/fm-icon-view.c:166
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "Å©±â¼øÀ¸·Î ¾ÆÀÌÄÜÀ» Á¤·ÄÇÕ´Ï´Ù"
 
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "Çü½Ä¼ø Á¤·Ä(_T)"
 
-#: src/file-manager/fm-icon-view.c:173
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "ÆÄÀÏÇü½Ä¼øÀ¸·Î ¾ÆÀÌÄÜÀ» Á¤·ÄÇÕ´Ï´Ù"
 
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "º¯°æ³¯Â¥¼ø Á¤·Ä(_D)"
 
-#: src/file-manager/fm-icon-view.c:180
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "º¯°æ³¯Â¥¼øÀ¸·Î ¾ÆÀÌÄÜÀ» Á¤·ÄÇÕ´Ï´Ù"
 
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "²¿¸®Ç¥¼ø Á¤·Ä(_E)"
 
-#: src/file-manager/fm-icon-view.c:187
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "²¿¸®Ç¥¼øÀ¸·Î ¾ÆÀÌÄÜÀ» Á¤·ÄÇÕ´Ï´Ù"
 
-#: src/file-manager/fm-icon-view.c:1230
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "¿ø·¡ Å©±âÀÇ ¾ÆÀÌÄÜÀ¸·Î µÇµ¹¸²(_R)"
 
-#: src/file-manager/fm-icon-view.c:1231
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "¿ø·¡ Å©±âÀÇ ¾ÆÀÌÄÜÀ¸·Î µÇµ¹¸²(_R)"
 
-#: src/file-manager/fm-icon-view.c:1443
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "\"%s\"À» °¡¸£Å´"
 
-#: src/file-manager/fm-list-view.c:2129
+#: src/file-manager/fm-list-view.c:2188
 #: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Å©±â"
 
-#: src/file-manager/fm-list-view.c:2135
+#: src/file-manager/fm-list-view.c:2194
 #: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Çü½Ä"
 
-#: src/file-manager/fm-list-view.c:2141
+#: src/file-manager/fm-list-view.c:2200
 #: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "º¯°æ ³¯Â¥"
@@ -7198,120 +7348,126 @@ msgstr "(¸î¸î ³»¿ëÀº ÀÐÀ»¼ö ¾øÀ½)"
 msgid "Contents:"
 msgstr "³»¿ë:"
 
-#: src/file-manager/fm-properties-window.c:1433
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "񃧯"
 
-#: src/file-manager/fm-properties-window.c:1512
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Çü½Ä:"
 
-#: src/file-manager/fm-properties-window.c:1517
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "Å©±â:"
 
-#: src/file-manager/fm-properties-window.c:1521
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "¸µÅ© ¼³Á¤"
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
 msgstr "MIME Çü½Ä:"
 
-#: src/file-manager/fm-properties-window.c:1527
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "º¯°æÀÏ:"
 
-#: src/file-manager/fm-properties-window.c:1530
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "Á¢±Ù ³¯Â¥:"
 
-#: src/file-manager/fm-properties-window.c:1539
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr "»ç¿ëÀÚ ¾ÆÀÌÄÜ ¼±ÅÃ..."
 
-#: src/file-manager/fm-properties-window.c:1545
+#: src/file-manager/fm-properties-window.c:1558
 msgid "Remove Custom Icon"
 msgstr "»ç¿ëÀÚ ¾ÆÀÌÄÜ Á¦°Å"
 
-#: src/file-manager/fm-properties-window.c:1873
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "»ç¿ëÀÚ ID ¼³Á¤"
 
-#: src/file-manager/fm-properties-window.c:1878
+#: src/file-manager/fm-properties-window.c:1891
 msgid "Special Flags:"
 msgstr "Ư¼ö Ç¥½Ã:"
 
-#: src/file-manager/fm-properties-window.c:1881
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "±×·ì ID ¼³Á¤"
 
-#: src/file-manager/fm-properties-window.c:1883
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "°íÁ¤"
 
-#: src/file-manager/fm-properties-window.c:1909
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Çã°¡±Ç"
 
-#: src/file-manager/fm-properties-window.c:1915
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "´ç½ÅÀº ÀÌÆÄÀÏÀÇ ¼ÒÀ¯ÁÖ°¡ ¾Æ´Ï±â ¶§¹®¿¡ Çã°¡±ÇÀ» º¯°æÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: src/file-manager/fm-properties-window.c:1928
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "ÆÄÀÏ ¼ÒÀ¯ÁÖ:"
 
-#: src/file-manager/fm-properties-window.c:1937
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "ÆÄÀÏ ±×·ì:"
 
-#: src/file-manager/fm-properties-window.c:1955
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "¼ÒÀ¯ÁÖ:"
 
-#: src/file-manager/fm-properties-window.c:1956
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "±×·ì:"
 
-#: src/file-manager/fm-properties-window.c:1957
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "´Ù¸¥ »ç¿ëÀÚ ±ÇÇÑ:"
 
-#: src/file-manager/fm-properties-window.c:1976
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "Àбâ"
 
-#: src/file-manager/fm-properties-window.c:1980
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "¾²±â"
 
-#: src/file-manager/fm-properties-window.c:1984
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "½ÇÇà"
 
-#: src/file-manager/fm-properties-window.c:2035
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "±ÛÀÚ º¸±â:"
 
-#: src/file-manager/fm-properties-window.c:2036
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "¼ýÀÚ º¸±â:"
 
-#: src/file-manager/fm-properties-window.c:2037
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "ÃÖ±Ù º¯°æ ½Ã°£:"
 
-#: src/file-manager/fm-properties-window.c:2041
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "\"%s\"ÀÇ Çã°¡±ÇÀ» ¹Ù²Ü¼ö ¾ø½À´Ï´Ù."
 
-#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr "¼Ó¼ºÃ¢ º¸±â¸¦ Ãë¼ÒÇÒ±î¿ä?"
 
-#: src/file-manager/fm-properties-window.c:2322
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr "¼Ó¼ºÃ¢ »ý¼º"
 
-#: src/file-manager/fm-properties-window.c:2422
+#: src/file-manager/fm-properties-window.c:2435
 msgid "Select an icon:"
 msgstr "¾ÆÀÌÄÜ¿¡¼­ ¼±ÅÃ:"
 
@@ -7333,7 +7489,7 @@ msgid ""
 msgstr "¸ÞµÎ»ç ã±â ¼­ºñ½º°¡ ¼³Ä¡µÇÁö ¾Ê¾Ò±â ¶§¹®¿¡ °¡´ÉÇÏÁö ¾Ê½À´Ï´Ù"
 
 #: src/file-manager/fm-search-list-view.c:159
-#: src/file-manager/nautilus-indexing-info.c:405
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr "ã±â ¼­ºñ½º°¡ °¡´ÉÇÏÁö ¾Ê½À´Ï´Ù"
 
@@ -7505,7 +7661,7 @@ msgstr ""
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
 #: src/file-manager/fm-search-list-view.c:360
-#: src/file-manager/nautilus-indexing-info.c:340
+#: src/file-manager/nautilus-indexing-info.c:342
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
@@ -7521,7 +7677,7 @@ msgid "Fast searches are not available on your computer"
 msgstr "»¡¸® ã±â°¡ °¡´ÉÇÏÁö ¾Ê½À´Ï´Ù"
 
 #: src/file-manager/fm-search-list-view.c:373
-#: src/file-manager/nautilus-indexing-info.c:359
+#: src/file-manager/nautilus-indexing-info.c:361
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Fast search is disabled in your Search preferences, so no index is available."
@@ -7530,13 +7686,13 @@ msgstr ""
 "¼Ó¼º¿¡¼­ »¡¸® ã±â ±â´ÉÀÌ ²¨Á®À־ »öÀο¡ Á¢±ÙÇÒ¼ö ¾ø½À´Ï´Ù. "
 
 #: src/file-manager/fm-search-list-view.c:376
-#: src/file-manager/nautilus-indexing-info.c:345
-#: src/file-manager/nautilus-indexing-info.c:363
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
 msgid "Fast searches are not available on your computer."
 msgstr "»¡¸® ã±â°¡ °¡´ÉÇÏÁö ¾Ê½À´Ï´Ù"
 
 #: src/file-manager/fm-search-list-view.c:377
-#: src/file-manager/nautilus-indexing-info.c:364
+#: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
 "To enable fast search, open the Preferences menu and choose Preferences. "
 "Then select Search preferences and put a checkmark in the Enable Fast Search "
@@ -7590,7 +7746,7 @@ msgid "Change Desktop Background"
 msgstr "¹ÙÅÁÈ­¸é ¹è°æ º¯°æ"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Delete all items in the Trash"
 msgstr "ÈÞÁöÅë¿¡ ÀÖ´Â ¸ðµç Ç׸ñÀ» Áö¿ó´Ï´Ù"
 
@@ -7636,140 +7792,191 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "¼±ÅÃÇÑ Ç׸ñÀ» º¼ ´Ù¸¥ º¸±â ÇÁ·Î±×·¥À» ¼±ÅÃÇÕ´Ï´Ù"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-msgid "Create Link"
-msgstr "¸µÅ© »ý¼º"
+#, fuzzy
+msgid "Copy Files"
+msgstr "ÆÄÀÏ º¹»çÁß"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "ÀÌ Æú´õ¾È¿¡ »õ·Î¿î ºó Æú´õ¸¦ ¸¸µì´Ï´Ù"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "°¢°¢ ¼±ÅÃÇÑ Ç׸ñ¿¡ ´ëÇÑ ½É¹ú¸¯ ¸µÅ©¸¦ ¸¸µì´Ï´Ù"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u ÆÄÀÏ"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "°¢°¢ ¼±ÅÃÇÑ Ç׸ñÀ» ÈÞÁöÅëÀ¸·Î À̵¿ÇÕ´Ï´Ù"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "º¹»ç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "°¢°¢ ¼±ÅÃÇÑ Ç׸ñÀ» º¹»ç ÇÕ´Ï´Ù"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "¸µÅ© »ý¼º"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr "°¢°¢ ¼±ÅÃÇÑ Ç׸ñÀ» ÈÞÁöÅëÀ¸·Î À̵¿ÇÕ´Ï´Ù"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Move to Trash"
 msgstr "ÈÞÁöÅëÀ¸·Î À̵¿"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "»õ Æú´õ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "¿­±â"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid "Open Wit_h"
 msgstr "´Ù¸¥ ÇÁ·Î±×·¥À¸·Î ¿­±â(_h)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "´Ù¸¥ ÇÁ·Î±×·¥À¸·Î ¿­±â"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "°¢°¢ ¼±ÅÃÇÑ Ç׸ñÀ» »õâ¿¡¼­ ¿±´Ï´Ù"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr "»õâÀ¸·Î ¿­±â"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "¼±ÅÃÇÑ Ç׸ñÀ» ÀÌâ¿¡¼­ ¿±´Ï´Ù"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "´Ù¸¥ ÇÁ·Î±×·¥"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "´Ù¸¥ º¸±â ÇÁ·Î±×·¥..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Other _Application..."
-msgstr "´Ù¸¥ ÇÁ·Î±×·¥(_A)..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "ºÙÀ̱â(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-msgid "Other _Viewer..."
-msgstr "´Ù¸¥ º¸±â ÇÁ·Î±×·¥(_V)..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr "¼³Á¤ÇÑ À̹ÌÁö Á¦°Å"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr "¼±ÅÃµÈ ¾ÆÀÌÄÜÀÇ »ç¿ëÀÚ ±×¸²À» Áö¿ó´Ï´Ù"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr "ÀÌ À§Ä¡ÀÇ ¹è°æ¿¡¼­ ¾î¶°ÇÑ »ç¿ëÀÚ ÆÐÅÏÀ̳ª »ö»óÀ» Áö¿ó´Ï´Ù"
 
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "¹è°æ Àç¼³Á¤"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+msgid "Scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr "¸ðµç ÆÄÀÏ ¼±ÅÃ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Select _All Files"
 msgstr "¸ðµç ÆÄÀÏ ¼±ÅÃ(_A)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "¸ðµç ¼±ÅÃÇÑ Ç׸ñÀ» ÀÌâ¿¡¼­ ¿±´Ï´Ù"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr "¼Ó¼º º¸±â"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Show Trash"
 msgstr "ÈÞÁöÅë º¸±â"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "¼Ó¼º º¸±â(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "Show the contents of the Trash"
 msgstr "ÈÞÁöÅë ³»¿ë º¸À̱â"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "°¢°¢ ¼±ÅÃÇÑ Ç׸ñÀÇ ¼Ó¼ºÀ» º¸°Å³ª °íĨ´Ï´Ù"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "º¹»ç(_D)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_New Folder"
 msgstr "»õ Æú´õ(_N)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "¿­±â(_O)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "ºÙÀ̱â(_P)"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Show Trash"
 msgstr "ÈÞÁöÅë º¸±â(_S)"
 
@@ -7945,7 +8152,7 @@ msgstr ""
 
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr "»öÀÎ »óȲ"
 
@@ -7962,11 +8169,11 @@ msgstr ""
 msgid "Your files were last indexed at %s"
 msgstr "¸¶Áö¸·À¸·Î »öÀÎÈ­µÈ°ÍÀº %s ÀÔ´Ï´Ù"
 
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "Áö±Ý °íħ"
 
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast.  Your files are currently being indexed."
@@ -7974,11 +8181,11 @@ msgstr ""
 "ÇÏ·ç¿¡ Çѹø¾¿ ¿©·¯ºÐÀÇ ÆÄÀÏ°ú ÅؽºÆ® ³»¿ëÀÌ »öÀÎÈ­ µÇ¾î¼­ °Ë»öÀÌ »¡¶óÁý´Ï´Ù. "
 "ÆÄÀÏÀÌ ÇöÀç »öÀÎÈ­ µÇ°í ÀÖ½À´Ï´Ù."
 
-#: src/file-manager/nautilus-indexing-info.c:404
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "¸ÞµÎ»ç ã±â ¼­ºñ½º°¡ °¡´ÉÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: src/file-manager/nautilus-indexing-info.c:426
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr ""
 
@@ -8154,7 +8361,7 @@ msgstr "Ã¥°¥ÇÇ"
 msgid "Location"
 msgstr "À§Ä¡"
 
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:767
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Áö¿ì±â"
 
@@ -8313,7 +8520,7 @@ msgstr ""
 msgid "Turn fast search on when cron is enabled"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1028
+#: src/nautilus-first-time-druid.c:1027
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "currently can't be performed because the program crond, which does\n"
@@ -8327,7 +8534,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1036
+#: src/nautilus-first-time-druid.c:1035
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "may not be performed because the program crond, which does nightly tasks\n"
@@ -8341,7 +8548,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1123
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
 "Click Finish to launch Nautilus. You'll start with two\n"
 "Nautilus windows: one shows your home folder, and the\n"
@@ -8351,7 +8558,7 @@ msgid ""
 "We hope you enjoy Nautilus!"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1130
+#: src/nautilus-first-time-druid.c:1129
 msgid ""
 "Click Finish to launch Nautilus. You'll start with a\n"
 "window showing your home folder.\n"
@@ -8359,15 +8566,15 @@ msgid ""
 "We hope you enjoy Nautilus!"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1154
+#: src/nautilus-first-time-druid.c:1153
 msgid "Nautilus First Time Setup"
 msgstr "³ëÆ¿·¯½º óÀ½ ¼³Á¤"
 
-#: src/nautilus-first-time-druid.c:1184
+#: src/nautilus-first-time-druid.c:1183
 msgid "Welcome to Nautilus"
 msgstr "³ëÆ¿·¯½º¿¡ ¿À½Å°É ȯ¿µÇÕ´Ï´Ù"
 
-#: src/nautilus-first-time-druid.c:1186
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
 "Nautilus...\n"
 "    Is a great file manager for the GNOME desktop.\n"
@@ -8379,51 +8586,51 @@ msgid ""
 msgstr ""
 
 #. set up the final page
-#: src/nautilus-first-time-druid.c:1197
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "¿Ï·á"
 
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1210
+#: src/nautilus-first-time-druid.c:1209
 msgid "Choose Your User Level"
 msgstr "»ç¿ëÀÚ ¼öÁØ ¼³Á¤"
 
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1214
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr "GMC¸¦ ³ëÆ¿·¯½º º¯È¯"
 
 #. set up the `Launch Medusa' page
-#: src/nautilus-first-time-druid.c:1218
+#: src/nautilus-first-time-druid.c:1217
 msgid "Fast Searches"
 msgstr "ºü¸¥ °Ë»ö"
 
 #. set up optional page to tell the user how to run cron
-#: src/nautilus-first-time-druid.c:1226
+#: src/nautilus-first-time-druid.c:1225
 msgid "The Cron Daemon"
 msgstr ""
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1231
+#: src/nautilus-first-time-druid.c:1230
 msgid "Checking Your Internet Connection"
 msgstr ""
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1242
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "³ëÆ¿·¯½º ¾÷µ¥ÀÌÆ®Áß..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1250
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "À¥ ÇÁ·Ï½Ã ¼³Á¤"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1325
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "¾÷µ¥ÀÌÆ®¸¦ Ǫ´ÂÁß..."
 
-#: src/nautilus-first-time-druid.c:1342
+#: src/nautilus-first-time-druid.c:1341
 msgid "Update Complete. Click Next to Continue."
 msgstr "¾÷µ¥ÀÌÆ® ¿Ï·á. °è¼ÓÇÏ·Á¸é ´ÙÀ½À» ´©¸£½Ê½Ã¿À."
 
@@ -8431,7 +8638,7 @@ msgstr "¾÷µ¥ÀÌÆ® ¿Ï·á. °è¼ÓÇÏ·Á¸é ´ÙÀ½À» ´©¸£½Ê½Ã¿À."
 #. * doesn't exist. Arlo and I (jsh) and decided that the
 #. * best thing to do is silently fail
 #.
-#: src/nautilus-first-time-druid.c:1357
+#: src/nautilus-first-time-druid.c:1356
 msgid "No Update Available... Press Next to Continue."
 msgstr "¾÷µ¥ÀÌÆ®ÇÒ °Ô ¾ø½À´Ï´Ù... °è¼ÓÇÏ·Á¸é ´ÙÀ½À» ´©¸£½Ê½Ã¿À."
 
@@ -8458,47 +8665,47 @@ msgstr "ºÐ¸®µÈ â¿¡¼­ %d À§Ä¡¸¦ º¸±â¸¦ ¿øÇմϱî?"
 msgid "View in Multiple Windows?"
 msgstr "´ÙÁß Ã¢À¸·Î º¸±â?"
 
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr "°í¼Ó ÀÚ±â °Ë»ç ¼öÇà"
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "ÃʱâÈ­ âÀ» ÁÖ¾îÁø À§Ä¡¿¡¼­ ¸¸µì´Ï´Ù."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "À§Ä¡"
 
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Á¤È®ÇÏ°Ô ÁöÁ¤µÈ URI¿¡ ´ëÇؼ­¸¸ âÀ» ¸¸µì´Ï´Ù."
 
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "³ëÆ¿·¯½º Á¾·á."
 
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "³ëÆ¿·¯½º Àç½ÃÀÛ."
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "³ëÆ¿·¯½º: --check´Â URI¿Í °°ÀÌ »ç¿ëÇÒ¼ö ¾ø½À´Ï´Ù.\n"
 
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "³ëÆ¿·¯½º: --check´Â ´Ù¸¥ ¿É¼Ç°ú °°ÀÌ »ç¿ëÇÒ¼ö ¾ø½À´Ï´Ù.\n"
 
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "³ëÆ¿·¯½º: --quit´Â URI¿Í °°ÀÌ »ç¿ëÇÒ¼ö ¾ø½À´Ï´Ù.\n"
 
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "³ëÆ¿·¯½º: --restart´Â URI¿Í °°ÀÌ »ç¿ëÇÒ¼ö ¾ø½À´Ï´Ù.\n"
 
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "³ëÆ¿·¯½º: --geometry´Â ÇϳªÀÌ»óÀÇ  URI¿Í °°ÀÌ »ç¿ëÇÒ¼ö ¾ø½À´Ï´Ù.\n"
 
@@ -8991,15 +9198,18 @@ msgid "View as List"
 msgstr "¸ñ·ÏÀ¸·Î º¸±â"
 
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+#, fuzzy
+msgid " _Advanced"
 msgstr " °í±Þ"
 
 #: src/nautilus-shell-ui.xml.h:2
-msgid " Beginner"
+#, fuzzy
+msgid " _Beginner"
 msgstr " ÃʱÞ"
 
 #: src/nautilus-shell-ui.xml.h:3
-msgid " Intermediate"
+#, fuzzy
+msgid " _Intermediate"
 msgstr " Áß±Þ"
 
 #: src/nautilus-shell-ui.xml.h:4
@@ -9038,332 +9248,335 @@ msgstr "¸ðµç ³ëÆ¿·¯½º âÀ» ´Ý½À´Ï´Ù"
 msgid "Close this window"
 msgstr "ÀÌ Ã¢À» ´Ý½À´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:17
+#: src/nautilus-shell-ui.xml.h:15
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "Ã¥°¥ÇǸ¦ ÆíÁýÇÒ¼ö Àִ âÀ» Ç¥½ÃÇÕ´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr "³ëÆ¿·¯½º¸¦ ¸¸µç »ç¶÷µéÀ» Ç¥½ÃÇÕ´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr "³ëÆ¿·¯½ºÀÇ ¿Â¶óÀÎ µµ¿ò¸»À» Ç¥½ÃÇÕ´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
 msgstr "°Ñ¸ð¾çÀ» ²Ù¹Ð¼ö ÀÖ´Â ¹«´Ì ¹× »ý»ó, ±×¸®°í ²¿¸®Ç¥µîÀ» Ç¥½ÃÇÕ´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:19
 msgid "Display quick reference pages for Nautilus"
 msgstr "³ëÆ¿·¯½ºÀÇ ºü¸¥ ÂüÁ¶ ÆäÀÌÁö¸¦ Ç¥½ÃÇÕ´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:22
+#: src/nautilus-shell-ui.xml.h:20
 msgid "Display release notes for Nautilus"
 msgstr "³ëÆ¿·¯½ºÀÇ ¸±¸®ÀÌÁî ³ëÆ®¸¦ Ç¥½ÃÇÕ´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:23
+#: src/nautilus-shell-ui.xml.h:21
 msgid "Display support information for Nautilus and Eazel Services"
 msgstr "³ëÆ¿·¯½º¿Í Eazel ¼­ºñ½ºÀÇ Áö¿øÁ¤º¸¸¦ Ç¥½Ã"
 
-#: src/nautilus-shell-ui.xml.h:24
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Display the latest contents of the current location"
 msgstr "ÇöÀçÀ§Ä¡ÀÇ ÃÖ±Ù ³»¿ëÀ» Ç¥½ÃÇÕ´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:25
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr "»ç¿ëÇÒ¼ö ÀÖ´Â Å׸¶¸¦ Ç¥½ÃÇÕ´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:24
 msgid "Edit various Nautilus preferences"
 msgstr "´Ù¾çÇÑ ³ëÆ¿·¯½º ¼¼ºÎ»çÇ× ÆíÁý"
 
-#: src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "ã±â"
 
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr "¹æ¹®±â·Ï Áö¿ì±â"
 
-#: src/nautilus-shell-ui.xml.h:29
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr "Eazel ¼­ºñ½º·Î °©´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr "Ȩ À§Ä¡·Î °©´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr "ÀÌ°ÍÀÌ Æ÷ÇÔµÈ À§Ä¡·Î À̵¿ÇÕ´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:32
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr "´ÙÀ½ ¹æ¹®ÇÑ À§Ä¡·Î °©´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:33
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr "ÀÌÀü¿¡ ¹æ¹®ÇÑ À§Ä¡·Î °©´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:446
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
 msgid "Hide Location _Bar"
 msgstr "À§Ä¡¸·´ë ¼û±è(_B)"
 
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:428
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
 msgid "Hide St_atus Bar"
 msgstr "»óŸ·´ë ¼û±è(_a)"
 
-#: src/nautilus-shell-ui.xml.h:36 src/nautilus-window-menus.c:434
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
 msgid "Hide _Sidebar"
 msgstr "°¡ÀåÀÚ¸®¸·´ë ¼û±è(_S)"
 
-#: src/nautilus-shell-ui.xml.h:37 src/nautilus-window-menus.c:440
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
 msgid "Hide _Toolbar"
 msgstr "µµ±¸¸·´ë ¼û±è(_T)"
 
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:37
 msgid "Nautilus Quick _Reference"
 msgstr "³ëÆ¿·¯½º ºü¸¥ Âü°í¼­(_R)"
 
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:38
 msgid "Nautilus Release _Notes"
 msgstr "³ëÆ¿·¯½º ¸±¸®ÀÌÁî ³ëÆ®(_N)"
 
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:39
 msgid "Nautilus User _Manual"
 msgstr "³ëÆ¿·¯½º »ç¿ëÀÚ ¼³¸í¼­(_M)"
 
-#: src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "ț ̢"
 
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:41
 msgid "New _Window"
 msgstr "ț ̢(_W)"
 
-#: src/nautilus-shell-ui.xml.h:44
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "º¸Åë Å©±â"
 
-#: src/nautilus-shell-ui.xml.h:45
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Ç¥½ÃµÈ À§Ä¡¸¦ ´Ù¸¥ ³ëÆ¿·¯½ºÃ¢¿¡¼­ ¿±´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:47
-msgid "Preferences..."
-msgstr "¼¼ºÎ¼³Á¤..."
-
-#: src/nautilus-shell-ui.xml.h:48
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "´Ù½Ã Àбâ"
 
-#: src/nautilus-shell-ui.xml.h:49
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "Ŭ¸³º¸µå¿¡ ¼±ÅÃµÈ ¹®ÀÚ¸¦ ±â·ÏÇÏÁö ¾Ê°í Áö¿ó´Ï´Ù"
-
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr "À¥¿¡¼­ ã½À´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr "ÀÌ ÄÄÇ»ÅÍ¿¡¼­ ÆÄÀÏÀ» ã½À´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:54
-msgid "Select _All"
-msgstr "Àüü ¼±ÅÃ(_A)"
-
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
 msgstr ""
 "Á¦ÀÛÀÚ¿¡°Ô ³ëÆ¿·¯½º¿Í Eazel¼­ºñ½º¿¡ ´ëÇÑ Çǵå¹éÀ» º¸³¾¼ö ÀÖ´ÂÆäÀÌÁö¸¦ Ç¥½Ã"
 
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "º¸Åë Å©±âÀÇ ³»¿ëÀ¸·Î º¾´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "´ú ÀÚ¼¼ÇÏ°Ô ³»¿ëÀ» º¾´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:58
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "´õ ÀÚ¼¼ÇÑ ³»¿ëÀ» º¾´Ï´Ù"
 
-#: src/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:61
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr "ÀÌ À§Ä¡ Àб⠸ØÃã"
 
-#: src/nautilus-shell-ui.xml.h:63
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "¸¶Áö¸·À¸·Î ¹Ù²ï ±ÛÀÚ¸¦ µÇµ¹¸²"
 
-#: src/nautilus-shell-ui.xml.h:64
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "À§·Î"
 
-#: src/nautilus-shell-ui.xml.h:65
-msgid "Use Advanced settings"
-msgstr "°í±Þ ¼³Á¤ »ç¿ë"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:66
-msgid "Use Beginner settings"
-msgstr "ÃÊ±Þ ¼³Á¤ »ç¿ë"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:67
-msgid "Use Intermediate settings"
-msgstr "Áß±Þ ¼³Á¤ »ç¿ë"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:63
 msgid "We_b Search"
 msgstr "À¥ °Ë»ö(_b)"
 
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "À¥ °Ë»ö"
 
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "È®´ë"
 
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "Ãà¼Ò"
 
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "È®´ë(_I)"
 
-#: src/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "Ãà¼Ò(_O)"
 
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "³ëÆ¿·¯½º´Â (_A)"
 
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "Ã¥°¥ÇÇ Ãß°¡(_A)"
 
-#: src/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "µÚ·Î(_B)"
 
-#: src/nautilus-shell-ui.xml.h:77
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr "¹è°æ°ú ²¿¸®Ç¥(_B)..."
 
-#: src/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "Ã¥°¥ÇÇ(_B)"
 
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "⠴ݱâ(_C)"
 
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:76
 msgid "_Customer Support"
 msgstr "°í°´ Áö¿ø(_C)"
 
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "ÆíÁý(_E)"
 
-#: src/nautilus-shell-ui.xml.h:83
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "Ã¥°¥ÇÇ ÆíÁý"
 
-#: src/nautilus-shell-ui.xml.h:84
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "¼¼ºÎ¼³Á¤..."
+
+#: src/nautilus-shell-ui.xml.h:80
 msgid "_Feedback"
 msgstr "Çǵå¹é(_F)"
 
-#: src/nautilus-shell-ui.xml.h:86 src/nautilus-window-menus.c:1362
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "ã±â(_F)"
 
-#: src/nautilus-shell-ui.xml.h:87
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "¾ÕÀ¸·Î(_F)"
 
-#: src/nautilus-shell-ui.xml.h:88
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "°¡±â(_G)"
 
-#: src/nautilus-shell-ui.xml.h:89
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "µµ¿ò¸»(_H)"
 
-#: src/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "Ȩ(_H)"
 
-#: src/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "À§Ä¡"
+
+#: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr "³ëÆ¿·¯½º Å׸¶(_N)..."
 
-#: src/nautilus-shell-ui.xml.h:92
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "º¸Åë Å©±â(_N)"
 
-#: src/nautilus-shell-ui.xml.h:94
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "¼¼ºÎ»çÇ×"
+
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "´Ù½Ã Àбâ(_R)"
 
-#: src/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:100
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "µÇµ¹¸®±â(_U)"
 
-#: src/nautilus-shell-ui.xml.h:101
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "À§·Î(_U)"
 
-#: src/nautilus-shell-ui.xml.h:102
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "º¸±â(_V)"
 
-#: src/nautilus-sidebar.c:659
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -9371,11 +9584,11 @@ msgstr ""
 "Çѹø¿¡ Çϳª ÀÌ»óÀÇ »ç¿ëÀÚ ¾ÆÀÌÄÜÀ» ÇÒ´çÇÒ¼ö ¾ø½À´Ï´Ù. »ç¿ëÀÚ ¾ÆÀÌÄÜÀ¸·Î "
 "ÇϳªÀÇ ±×¸²¸¸ ²ø¾î ³õÀ¸½Ê½Ã¿À."
 
-#: src/nautilus-sidebar.c:661
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "Çϳª ÀÌ»óÀÇ ±×¸²"
 
-#: src/nautilus-sidebar.c:680
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -9383,11 +9596,11 @@ msgstr ""
 "²ø¾î ³õÀº ÆÄÀÏÀÌ ·ÎÄÿ¡ ÀÖÁö ¾Ê½À´Ï´Ù. ·ÎÄÿ¡ ÀÖ´Â ±×¸²À¸·Î¸¸ »ç¿ëÀÚ "
 "¾ÆÀÌÄÜÀ¸·Î »ç¿ëÇÒ¼ö ÀÖ½À´Ï´Ù"
 
-#: src/nautilus-sidebar.c:682
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "·ÎÄÿ¡ ÀÖ´Â ±×¸²ÆÄÀÏ"
 
-#: src/nautilus-sidebar.c:687
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -9395,22 +9608,22 @@ msgstr ""
 "²ø¾î ³õÀº ÆÄÀÏÀº ±×¸²ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù. ·ÎÄÿ¡ ÀÖ´Â ±×¸²À¸·Î¸¸ »ç¿ëÀÚ "
 "¾ÆÀÌÄÜÀ¸·Î »ç¿ëÇÒ¼ö ÀÖ½À´Ï´Ù"
 
-#: src/nautilus-sidebar.c:689
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "±×¸²ÆÄÀÏ"
 
-#: src/nautilus-sidebar.c:1247
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "%s ·Î ¿­±â"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1283
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "´Ù¸¥ ÇÁ·Î±×·¥À¸·Î ¿­±â"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1390
+#: src/nautilus-sidebar.c:1424
 msgid "  Empty Trash  "
 msgstr " ÈÞÁöÅë ºñ¿ì±â "
 
@@ -9500,16 +9713,16 @@ msgstr "Å׸¶¸¦ Áö¿ï¼ö ¾ø½À´Ï´Ù"
 msgid "No description available for the \"%s\" theme"
 msgstr "\"%s\" Å׸¶¿¡ ´ëÇÑ ¼³¸íÀÌ ¾ø½À´Ï´Ù"
 
-#: src/nautilus-window.c:584
+#: src/nautilus-window.c:637
 msgid "View as ..."
 msgstr "ÇÁ·Î±×·¥À¸·Î º¸±â"
 
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1286
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "´Ù¸¥ ÇÁ·Î±×·¥À¸·Î º¸±â"
 
-#: src/nautilus-window.c:1687
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "´Ý±â"
 
@@ -9523,11 +9736,11 @@ msgstr "´Ý±â"
 msgid "Preview Release %s: %s"
 msgstr "¹Ì¸®º¸±â ¸±¸®Áî %s: %s"
 
-#: src/nautilus-window-manage-views.c:812
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "º¸±â ½ÇÆÐ"
 
-#: src/nautilus-window-manage-views.c:823
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
@@ -9536,12 +9749,12 @@ msgstr ""
 "%s º¸±â°¡  ¿À·ù¸¦ ¹ß»ýÇÏ¿© °è¼ÓÇÒ¼ö ¾ø½À´Ï´Ù. °è¼Ó ¹ß»ýµÈ´Ù¸é ´Ù¸¥ º¸±â¸¦ "
 "¼±ÅÃÇϰųª ´Ù¸¥ À§Ä¡·Î °¥¼ö ÀÖ½À´Ï´Ù."
 
-#: src/nautilus-window-manage-views.c:834
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "%s º¸±â°¡ ½ÃÀÛÇÒ¶§ ¿À·ù°¡ ¹ß»ýÇÏ¿´½À´Ï´Ù."
 
-#: src/nautilus-window-manage-views.c:993
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
@@ -9549,7 +9762,7 @@ msgstr ""
 "°¡ÀåÀÚ¸®¸·´ë ÆгÎÁß Çϳª°¡ ¿À·ù¸¦ ¹ß»ýÇÏ¿© °è¼ÓÇÒ¼ö ¾ø½À´Ï´Ù. ºÒÇàÇÏ°Ôµµ "
 "¾î´À°ÍÀÎÁö ¾Ë¼ö ¾ø½À´Ï´Ù."
 
-#: src/nautilus-window-manage-views.c:997
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
@@ -9558,18 +9771,18 @@ msgstr ""
 "%s °¡ÀåÀÚ¸®¸·´ë ÆгÎÀÌ ¿À·ù¸¦ ¹ß»ýÇÏ¿© °è¼ÓÇÒ¼ö ¾ø½À´Ï´Ù. °è¼Ó ¹ß»ýµÈ´Ù¸é ÀÌ "
 "ÆгÎÀ» ²¨µÎ´Â ÆíÀÌ ÁÁ½À´Ï´Ù."
 
-#: src/nautilus-window-manage-views.c:1002
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "°¡ÀåÀÚ¸®¸·´ë ÆгΠ½ÇÆÐ"
 
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr ""
 "\"%s\" ¸¦ ãÀ»¼ö ¾ø½À´Ï´Ù. Á¤È®È÷ ÀÔ·ÂÇÏ¿´´ÂÁö È®ÀÎÇÏ½Ã°í ´Ù½Ã ½Ãµµ "
 "Çغ¸½Ê½Ã¿À."
 
-#: src/nautilus-window-manage-views.c:1223
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
@@ -9577,35 +9790,35 @@ msgstr ""
 "\"%s\" ´Â ¿Ã¹Ù¸¥ À§Ä¡°¡ ¾Æ´Õ´Ï´Ù.\n"
 "Á¤È®È÷ ÀÔ·ÂÇÏ¿´´ÂÁö È®ÀÎÇÏ½Ã°í ´Ù½Ã ½Ãµµ Çغ¸½Ê½Ã¿À."
 
-#: src/nautilus-window-manage-views.c:1237
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
 "it is."
 msgstr "\"%s\" ¸¦ Ç¥½ÃÇÒ¼ö ¾ø½À´Ï´Ù. ¾î¶² Çü½ÄÀÇ ÆÄÀÏÀÎÁö °áÁ¤ÇÒ¼ö ¾ø½À´Ï´Ù"
 
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr "\"%s\"¸¦ Ç¥½ÃÇÒ¼ö ÀÖ´Â º¸±â ÇÁ·Î±×·¥ÀÌ ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê¾Ò½À´Ï´Ù."
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1257
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr "\"%s\" ¸¦ Ç¥½ÃÇÒ¼ö ¾ø½À´Ï´Ù. %s: Çü½ÄÀÇ À§Ä¡¸¦ ó¸®ÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: src/nautilus-window-manage-views.c:1263
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "\"%s\" ¸¦ Ç¥½ÃÇÒ¼ö ¾ø½À´Ï´Ù. ·Î±×ÀÎ ½Ãµµ°¡ ½ÇÆÐÇÏ¿´½À´Ï´Ù.."
 
-#: src/nautilus-window-manage-views.c:1268
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "Á¢±ÙÀÌ °ÅºÎµÇ¾î \"%s\" ¸¦ Ç¥½ÃÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1287
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
@@ -9614,7 +9827,7 @@ msgstr ""
 "\"%s\"¸¦ Ç¥½ÃÇÒ¼ö ¾ø´Â µ¥, ±×°ÍÀº \"%s\" È£½ºÆ®¸¦ ãÀ» ¼ö ¾ø±â ¶§¹®ÀÔ´Ï´Ù. "
 "¸ÂÃã¹ýÀÌ ¿Ã¹Ù¸£°í ÇÁ·Ï½Ã ¼³Á¤ÀÌ ¿Ã¹Ù¸¥Áö È®ÀÎÇϽʽÿÀ."
 
-#: src/nautilus-window-manage-views.c:1287
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -9623,7 +9836,7 @@ msgstr ""
 "È£½ºÆ® À̸§ÀÌ ºñ¾î ÀÖ¾î \"%s\" ¸¦ Ç¥½ÃÇÒ¼ö ¾ø½À´Ï´Ù. ÇÁ·Ï½Ã ¼³Á¤ÀÌ ¿Ã¹Ù¸¥Áö "
 "È®ÀÎÇϽʽÿÀ."
 
-#: src/nautilus-window-manage-views.c:1299
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -9634,58 +9847,58 @@ msgstr ""
 "¾Ê±â ¶§¹®ÀÔ´Ï´Ù. ¸ÞµÎ»ç ã±â ¼­ºñ½º¸¦ ½ÃÀÛÇÏ°í, »öÀÎÀÌ ¾ø´Ù¸é ¸ÞµÎ»çÀε¦¼­¸¦ "
 "½ÇÇàÇϽʽÿÀ."
 
-#: src/nautilus-window-manage-views.c:1303
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1307
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "³ëÆ¿·¯½º°¡ \"%s\"¸¦ Ç¥½ÃÇÒ¼ö ¾ø½À´Ï´Ù."
 
-#: src/nautilus-window-manage-views.c:1312
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "À§Ä¡¸¦ Ç¥½ÃÇÒ¼ö ¾ø½À´Ï´Ù"
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:317
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
 msgstr "¹æ¹® ±â·ÏÀ» Áö¿ì½Ã°Ú½À´Ï±î? ±×·¸´Ù¸é µÇÇ®ÀÌ ÇÏÁö ¾Ê±â¸¦ º÷´Ï´Ù"
 
-#: src/nautilus-window-menus.c:320
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr "Á¤¸»·Î ³ëÆ¿·¯½º·Î ¹æ¹®ÇÏ¿´´ø À§Ä¡µéÀ» Áö¿ì½Ã°Ú½À´Ï±î?"
 
-#: src/nautilus-window-menus.c:325
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "±â·ÏÀ» Áö¿ï±î¿ä?"
 
-#: src/nautilus-window-menus.c:326
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "Áö¿ò"
 
-#: src/nautilus-window-menus.c:429
+#: src/nautilus-window-menus.c:466
 msgid "Show St_atus Bar"
 msgstr "»óŸ·´ë º¸ÀÓ(_a)"
 
-#: src/nautilus-window-menus.c:435
+#: src/nautilus-window-menus.c:472
 msgid "Show _Sidebar"
 msgstr "°¡ÀåÀÚ¸®¸·´ë º¸ÀÓ(_S)"
 
-#: src/nautilus-window-menus.c:441
+#: src/nautilus-window-menus.c:478
 msgid "Show _Toolbar"
 msgstr "µµ±¸¸·´ë º¸ÀÓ(_T)"
 
-#: src/nautilus-window-menus.c:447
+#: src/nautilus-window-menus.c:484
 msgid "Show Location _Bar"
 msgstr "À§Ä¡¸·´ë º¸ÀÓ(_B)"
 
-#: src/nautilus-window-menus.c:498
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "¼¼ºÎ»çÇ×"
 
@@ -9695,11 +9908,11 @@ msgstr "¼¼ºÎ»çÇ×"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:581
+#: src/nautilus-window-menus.c:618
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr ""
 
-#: src/nautilus-window-menus.c:583
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -9716,11 +9929,11 @@ msgstr ""
 #. * bottom of the about box to give credit
 #. * to the translator(s)
 #.
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:629
 msgid "Translator Credits"
 msgstr ""
 
-#: src/nautilus-window-menus.c:762
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -9729,27 +9942,23 @@ msgstr ""
 "\"%s\"À§Ä¡°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù. ¸ñ·Ï¿¡¼­ ÀÌ À§Ä¡¸¦ °¡Áø Ã¥°¥ÇǸ¦ "
 "Á¦°ÅÇϽðڽÀ´Ï±î?"
 
-#: src/nautilus-window-menus.c:766
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "Á¸ÀçÇÏÁö ¾Ê´Â À§Ä¡ÀÇ Ã¥°¥ÇÇ"
 
-#: src/nautilus-window-menus.c:780
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "\"%s\"À§Ä¡°¡ ´õÀÌ»ó Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù."
 
-#: src/nautilus-window-menus.c:781
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "Á¸ÀçÇÏÁö ¾Ê´Â À§Ä¡·Î °¡±â"
 
-#: src/nautilus-window-menus.c:850
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "ÀÌ Ã¥°¥ÇÇ¿¡ ÁöÁ¤µÈ À§Ä¡·Î À̵¿ÇÕ´Ï´Ù"
 
-#: src/nautilus-window-menus.c:1361
-msgid "_Browse"
-msgstr "ã¾Æº¸±â(_B)"
-
 #: src/nautilus-window-toolbars.c:402
 msgid "Back"
 msgstr "µÚ·Î"
@@ -9764,3 +9973,78 @@ msgstr "¾ÕÀ¸·Î"
 #: src/nautilus-zoom-control.c:531
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-current-medium-r-normal-*-9-*-*-*-*-*-*-*,-*-gulim-*-r-*"
+
+#~ msgid "helvetica"
+#~ msgstr "helvetica,gulim"
+
+#~ msgid "_Fonts"
+#~ msgstr "±Û²Ã(_F)"
+
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "ÆÄÀÏÀ» ±× Àڽſ¡°Ô ¿Å±æ¼ö ¾ø½À´Ï´Ù."
+
+#~ msgid "Can't Move Onto Self"
+#~ msgstr "ÀÚ½ÅÀ¸·Î À̵¿ÇÒ¼ö ¾ø½À´Ï´Ù"
+
+#~ msgid "Normal"
+#~ msgstr "º¸Åë"
+
+#~ msgid "Font"
+#~ msgstr "±Û²Ã"
+
+#~ msgid "fixed"
+#~ msgstr "fixed,-*-gulim-medium-r-normal-*-*-*-*-*-*-*-*-*"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "00/01/01, ¿ÀÀü 01:00"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "00/1/1, ¿ÀÀü 1:00"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr "00/ 1/ 1, ¿ÀÀü  1:00"
+
+#~ msgid "current theme"
+#~ msgstr "ÇöÀç Å׸¶"
+
+#~ msgid "Use this font family to display file names:"
+#~ msgstr "ÆÄÀÏ À̸§À» Ç¥½ÃÇÒ¶§ ±Û²Ã±ºÀ» »ç¿ëÇÕ´Ï´Ù:"
+
+#~ msgid "Can add Content"
+#~ msgstr "³»¿ë Ãß°¡"
+
+#~ msgid "times"
+#~ msgstr "times,gulim"
+
+#~ msgid "courier"
+#~ msgstr "courier,gulim"
+
+#~ msgid "lucida"
+#~ msgstr "lucida,gulim"
+
+#~ msgid "Details"
+#~ msgstr "ÀÚ¼¼È÷"
+
+#~ msgid "Warning"
+#~ msgstr "ÁÖÀÇ"
+
+#~ msgid "Error"
+#~ msgstr "¿À·ù"
+
+#~ msgid "Question"
+#~ msgstr "Áú¹®"
+
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "Ŭ¸³º¸µå¿¡ ¼±ÅÃµÈ ¹®ÀÚ¸¦ ±â·ÏÇÏÁö ¾Ê°í Áö¿ó´Ï´Ù"
+
+#~ msgid "Use Advanced settings"
+#~ msgstr "°í±Þ ¼³Á¤ »ç¿ë"
+
+#~ msgid "Use Beginner settings"
+#~ msgstr "ÃÊ±Þ ¼³Á¤ »ç¿ë"
+
+#~ msgid "Use Intermediate settings"
+#~ msgstr "Áß±Þ ¼³Á¤ »ç¿ë"
+
+#~ msgid "_Browse"
+#~ msgstr "ã¾Æº¸±â(_B)"
diff --git a/po/lt.po b/po/lt.po
index 0ade394c6..6f8d8f172 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -2,10 +2,15 @@
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # Mantas Kriauciunas <mantelis@centras.lt>, 2001.
 # 
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus 1.0\n"
-"POT-Creation-Date: 2001-04-02 18:47+0200\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-04-02 20:46+0200\n"
 "Last-Translator: Eglë Girinaitë <eglyte@centras.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -52,8 +57,8 @@ msgstr ""
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:3
 msgid ""
-"Factory for objects that wrap ordinary Bonobo Controls or Embeddables to look "
-"like Nautilus Views"
+"Factory for objects that wrap ordinary Bonobo Controls or Embeddables to "
+"look like Nautilus Views"
 msgstr ""
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:4
@@ -140,7 +145,7 @@ msgid "Previous"
 msgstr "Praeitas"
 
 #: components/help/converters/gnome-db2html2/gdb3html.c:721
-#: libnautilus-extensions/nautilus-global-preferences.c:788
+#: libnautilus-extensions/nautilus-global-preferences.c:789
 #: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "Namai"
@@ -330,8 +335,6 @@ msgid "Kernel Routines"
 msgstr ""
 
 #: components/help/hyperbola-filefmt.c:703
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
 msgid "Info"
 msgstr "Info"
 
@@ -412,7 +415,7 @@ msgstr "Istorijos ðoninis skydelis"
 msgid "History sidebar panel for Nautilus"
 msgstr "Istorijos ðoninis skydelis Nautiliui"
 
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "Negalëjau inicializuoti Bonobo"
 
@@ -917,7 +920,8 @@ msgid ""
 "Try viewing the page in a different web browser, such as Mozilla or Netscape."
 msgstr ""
 "JavaScript funkcija (maþa programëlë) ðitame puslapyje bando atidaryti naujà "
-"langà, bet nautilus neleidþia JavaScript programoms atidaryti naujus langus.\n"
+"langà, bet nautilus neleidþia JavaScript programoms atidaryti naujus "
+"langus.\n"
 "\n"
 "Bandyk perþiûrëti ðità puslapá kita narðykle, pvz.: Netscape ar Mozilla."
 
@@ -1007,7 +1011,6 @@ msgid "Oldies"
 msgstr ""
 
 #: components/music/mpg123.c:32
-#: libnautilus-extensions/nautilus-font-picker.c:101
 msgid "Other"
 msgstr ""
 
@@ -1616,9 +1619,10 @@ msgid ""
 "not configured properly. Try quitting any applications that may be blocking "
 "use of the sound card."
 msgstr ""
-"Atsipraðau, bet muzikos vaizdas negali dabar groti. Gal kita programa naudoja "
-"ar blokuoja garso plokðtæ arba garso korta yra blogai sukonfigûruota. "
-"Pabandyk uþdaryti visas programas, kurios gali blokuoti garso kortà."
+"Atsipraðau, bet muzikos vaizdas negali dabar groti. Gal kita programa "
+"naudoja ar blokuoja garso plokðtæ arba garso korta yra blogai "
+"sukonfigûruota. Pabandyk uþdaryti visas programas, kurios gali blokuoti "
+"garso kortà."
 
 #: components/music/nautilus-music-view.c:1178
 msgid "Unable to Play File"
@@ -1645,9 +1649,9 @@ msgid "Pause"
 msgstr "Pauzë"
 
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:984
-#: libnautilus-extensions/nautilus-file-operations.c:999
-#: libnautilus-extensions/nautilus-file-operations.c:1018
+#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 #: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Sustabdyti"
@@ -2341,8 +2345,7 @@ msgstr ""
 
 #: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
-msgid ""
-"file conflict : package %s already provides file %s also provided by %s"
+msgid "file conflict : package %s already provides file %s also provided by %s"
 msgstr ""
 
 #. the owner of this file is a package that we're upgrading, and the
@@ -2862,7 +2865,7 @@ msgid "Now installing package \"%s\"."
 msgstr ""
 
 #: components/services/install-view/callbacks.c:407
-#: components/services/install-view/nautilus-service-install-view.c:897
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "Ádiegiamas \"%s\""
@@ -3006,26 +3009,26 @@ msgstr "Tæsti"
 msgid "Cancel"
 msgstr "Nutraukti"
 
-#: components/services/install-view/nautilus-service-install-view.c:419
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
 msgid "%s is in GNOME (footprint) > %s"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:437
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, c-format
 msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:452
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
 msgid "%s is in the KDE menu.\n"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:653
+#: components/services/install-view/nautilus-service-install-view.c:655
 msgid "Installation Complete"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:708
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
 msgid ""
 "%sTo start %s, click the Launch button below, or to create a shortcut, drag "
@@ -3033,54 +3036,54 @@ msgid ""
 msgstr ""
 
 #. couldn't find an icon
-#: components/services/install-view/nautilus-service-install-view.c:716
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
 msgid "%sTo start %s, click the Launch button below."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:771
+#: components/services/install-view/nautilus-service-install-view.c:773
 msgid "Incorrect password."
 msgstr "Neteisingas slaptaþodis."
 
-#: components/services/install-view/nautilus-service-install-view.c:776
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:893
+#: components/services/install-view/nautilus-service-install-view.c:895
 msgid "Installing packages"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:895
+#: components/services/install-view/nautilus-service-install-view.c:897
 msgid "Installing remote package"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:899
+#: components/services/install-view/nautilus-service-install-view.c:901
 msgid "Installing some package"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:916
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:965
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:1023
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:1095
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:1115
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:1116
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr ""
 
@@ -3345,14 +3348,12 @@ msgid "Services Login"
 msgstr "Interneto paslaugos"
 
 #: components/services/summary/nautilus-summary-dialogs.c:131
-#: libnautilus-extensions/nautilus-global-preferences.c:826
-#: libnautilus-extensions/nautilus-password-dialog.c:269
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "Vartotojo vardas:"
 
 #: components/services/summary/nautilus-summary-dialogs.c:138
-#: libnautilus-extensions/nautilus-global-preferences.c:834
-#: libnautilus-extensions/nautilus-password-dialog.c:276
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "Slaptaþodis:"
 
@@ -3422,43 +3423,43 @@ msgstr ""
 msgid "Featured Downloads"
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:883
+#: components/services/summary/nautilus-summary-view.c:884
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
 "unavailable right now, or your computer might be configured incorrectly. "
 "Please contact support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:893
+#: components/services/summary/nautilus-summary-view.c:894
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
 "support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:916
+#: components/services/summary/nautilus-summary-view.c:917
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
 "contact support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:958
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
 "now, or your computer might be configured incorrectly. You could try again "
 "later."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:968
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
 "support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:985
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:1048
+#: components/services/summary/nautilus-summary-view.c:1049
 #: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr "Eazel paslaugos"
@@ -3702,7 +3703,7 @@ msgid "Nautilus Tree view"
 msgstr "Nautilus medþio vaizdas"
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:1049
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr "Medis"
 
@@ -3714,7 +3715,7 @@ msgstr "Vaiduoklis"
 msgid "Azul"
 msgstr ""
 
-#: data/browser.xml.h:3 libnautilus-extensions/nautilus-font-picker.c:89
+#: data/browser.xml.h:3
 msgid "Black"
 msgstr "Juodas"
 
@@ -3923,7 +3924,7 @@ msgid "Numbers"
 msgstr "Skaièiai"
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1110
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "Gerai"
 
@@ -4044,7 +4045,7 @@ msgid "The Gimp"
 msgstr ""
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:600
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "Darbastalis"
 
@@ -4083,7 +4084,7 @@ msgid "Google"
 msgstr ""
 
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:1011
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "Paieðkos sistemos"
 
@@ -4458,7 +4459,7 @@ msgstr "nuoroda"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1195
+#: libnautilus-extensions/nautilus-file-operations.c:1187
 #: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
@@ -4469,16 +4470,16 @@ msgid "link (broken)"
 msgstr "nuoroda (sugadinta)"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:424
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "Ið:"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:439
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "Á:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:627
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4489,7 +4490,7 @@ msgstr ""
 "\n"
 "\"%s\" negali bûti perkeltas, kadangi jis yra tik skaitymu skirtame diske."
 
-#: libnautilus-extensions/nautilus-file-operations.c:638
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4502,7 +4503,7 @@ msgstr ""
 "\"%s\" negalima iðtrinti, kadangi jûs neturite teisës keisti jo tëvinës "
 "direktorijos. "
 
-#: libnautilus-extensions/nautilus-file-operations.c:644
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4513,7 +4514,7 @@ msgstr ""
 "\n"
 "\"%s\" negalima iðtrinti, kadangi jis yra tik skaitymui skirtame diske."
 
-#: libnautilus-extensions/nautilus-file-operations.c:675
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4526,7 +4527,7 @@ msgstr ""
 "\"%s\" negalima perkelti, kadangi jus neturite teisës keisti jo arba jo "
 "tëvinio katalogo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:682
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4539,7 +4540,7 @@ msgstr ""
 "\"%s\" negalima perkelti á ðiukðlinæ, kadangi jûs neturite teisës keisti jo "
 "arba jo tëvinio katalogo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:706
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -4550,7 +4551,7 @@ msgstr ""
 "\n"
 "\"%s\" negalima nukopijuoti, kadangi jûs neturite teisës já skaityti."
 
-#: libnautilus-extensions/nautilus-file-operations.c:728
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4561,7 +4562,7 @@ msgstr ""
 "\n"
 "Paskirties vietoje trûksta laisvos vietos."
 
-#: libnautilus-extensions/nautilus-file-operations.c:733
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4572,7 +4573,7 @@ msgstr ""
 "\n"
 "Paskirties vietoje trûksta laisvos vietos."
 
-#: libnautilus-extensions/nautilus-file-operations.c:737
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4583,7 +4584,7 @@ msgstr ""
 "\n"
 "Trûksta laisvos vietos."
 
-#: libnautilus-extensions/nautilus-file-operations.c:749
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4594,7 +4595,7 @@ msgstr ""
 "\n"
 "Neturite teisës raðyti á ðá katalogà."
 
-#: libnautilus-extensions/nautilus-file-operations.c:753
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4605,7 +4606,7 @@ msgstr ""
 "\n"
 "Paskirties diskas skirtas tik skaitymui."
 
-#: libnautilus-extensions/nautilus-file-operations.c:760
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4616,7 +4617,7 @@ msgstr ""
 "\n"
 "Neturite teisës raðyti á ðá katalogà."
 
-#: libnautilus-extensions/nautilus-file-operations.c:764
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4627,7 +4628,7 @@ msgstr ""
 "\n"
 "Paskirties diskas skirtas tik skaitymui."
 
-#: libnautilus-extensions/nautilus-file-operations.c:771
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4638,7 +4639,7 @@ msgstr ""
 "\n"
 "Neturite teisës raðyti á ðá katalogà."
 
-#: libnautilus-extensions/nautilus-file-operations.c:775
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4649,7 +4650,7 @@ msgstr ""
 "\n"
 "Paskirties diskas skirtas tik skaitymui."
 
-#: libnautilus-extensions/nautilus-file-operations.c:804
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4660,7 +4661,7 @@ msgstr ""
 "\n"
 "Ar norite tæsti?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4671,7 +4672,7 @@ msgstr ""
 "\n"
 "Ar norite tæsti?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:812
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4682,7 +4683,7 @@ msgstr ""
 "\n"
 "Ar norite tæsti?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:818
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4693,7 +4694,7 @@ msgstr ""
 "\n"
 "Ar norite tæsti?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:833
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4704,7 +4705,7 @@ msgstr ""
 "\n"
 "Ar norite tæsti?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:837
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4715,7 +4716,7 @@ msgstr ""
 "\n"
 "Ar norite tæsti?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:841
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4726,7 +4727,7 @@ msgstr ""
 "\n"
 "Ar norite tæsti?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:847
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4737,34 +4738,34 @@ msgstr ""
 "\n"
 "Ar norite tæsti?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:963
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "Klaida kopijuojant."
 
-#: libnautilus-extensions/nautilus-file-operations.c:966
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "Klaida perkeliant."
 
-#: libnautilus-extensions/nautilus-file-operations.c:969
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "Klaida darant nuorodà."
 
-#: libnautilus-extensions/nautilus-file-operations.c:974
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "Klaida trinant."
 
-#: libnautilus-extensions/nautilus-file-operations.c:999
-#: libnautilus-extensions/nautilus-file-operations.c:1018
-#: libnautilus-extensions/nautilus-file-operations.c:1132
-#: libnautilus-extensions/nautilus-file-operations.c:1146
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "Praleisti"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1018
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Bandyti dar kartà"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1096
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4778,7 +4779,7 @@ msgstr ""
 "Jei vis tiek norite perkelti \"%s\", pakeiskite pavadinimà ir bandykite dar "
 "kartà."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1102
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4792,11 +4793,11 @@ msgstr ""
 "Jei vis tiek norite nukopijuoti \"%s\", pakeiskite pavadinimà ir bandykite "
 "dar kartà."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1110
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "Negalima pakeisti bylos."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1120
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4807,22 +4808,22 @@ msgstr ""
 "\n"
 "Ar jûs norëtumëte jà pakeisti?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1131
-#: libnautilus-extensions/nautilus-file-operations.c:1145
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "Konfliktas kopijuojant"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1132
-#: libnautilus-extensions/nautilus-file-operations.c:1146
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Pakeisti"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1146
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Pakeisti visus"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1199
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "kita nuoroda á %s"
@@ -4831,25 +4832,25 @@ msgstr "kita nuoroda á %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1215
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dst nuoroda á %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1219
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dnd nuoroda á %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1223
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%drd nuoroda á %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1227
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dth nuoroda á %s"
@@ -4859,227 +4860,227 @@ msgstr "%dth nuoroda á %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1247
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (kopija)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1249
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (kita kopija)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1251
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr "-ma kopija)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1253
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr "-ra kopija)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1255
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr "-èia kopija)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1257
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr "-ta kopija)"
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1267
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopija)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1269
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (kita kopija)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1271
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d-ma kopija)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1273
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d-ra kopija)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1275
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d-èia kopija)%s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1277
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d-ta kopija)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1361
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1369
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1526
-#: libnautilus-extensions/nautilus-file-operations.c:2096
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Neþinomas GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1830
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "Bylos perkeliamos á Ðiukðlinæ"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1832
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1834
-#: libnautilus-extensions/nautilus-file-operations.c:1849
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "Perkeliama"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "Pasiruoðiama perkëlimui á ðiukðlinæ"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1845
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "Perkeliamos bylos"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1847
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "Bylø perkelta:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "Pasiruoðiama perkëlimui..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1851
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "Baigiamas perkëlimas..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1863
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "Kuriamos nuorodos á bylas"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1865
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "Sukurta nuorodø:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1867
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "Sukuriamos nuorodos"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1868
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "Pasiruoðiama sukurti nuorodas..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1869
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "Baigiama·kurti·nuorodas..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1876
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "Kopijuojamos bylos"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1878
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "Nukopijuota bylø:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1880
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "Kopijuojama"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1881
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "Pasiruoðiama kopijavimui ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1899
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "Negalima kopijuoti elementø á Ðiukðlinæ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "Negaliu kopijuoti á Ðiukðlinæ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1927
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "Ðiukðlinë turi likti darbalaukyje."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1928
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "Negalima perkelti Ðiukðlinës katalogo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1930
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "Negalima kopijuoti Ðiukðlinës."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1931
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "Negalima kopijuoti Ðiukðlinës katalogo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1933
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Negaliu pakeisti Ðiukðlinës vietos."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1934
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Negaliu kopijuoti Ðiukðlinës."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1957
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "Tu negali perkelti katalogo á já patá."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1958
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "Tu negali nukopijuoti katalogo á já patá."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1960
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "Negalima perkelti á save patá"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1961
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "Negalima kopijuoti á save patá"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1973
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "Negali kopijuoti bylos á save paèià."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1974
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "Negalima kopijuoti ant savæs."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2025
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5089,7 +5090,7 @@ msgstr ""
 "\n"
 "Jûs neturite teisiø áraðyti á norimà vietà"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2028
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5099,485 +5100,427 @@ msgstr ""
 "\n"
 "Trûksta laisvos vietos."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2031
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Klaida \"%s\" kuriant naujà katalogà."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2035
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "Klaida kuriant naujà katalogà"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2122
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "bevardis katalogas"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2155
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "Trinamos bylos"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2157
-#: libnautilus-extensions/nautilus-file-operations.c:2192
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "Iðtrintos bylos:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2159
-#: libnautilus-extensions/nautilus-file-operations.c:2194
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Trinama"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2160
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "Ruoðiamasi trinti bylas..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2190
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Iðvaloma ðiukðlinë"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2195
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Ruoðiamasi iðvalyti ðiukðlinæ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2226
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr "Ar Jûs ið ties norite visiðkai iðtrinti visus elementus ið Ðiukðlinës?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2228
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "Iðtrinti ðiukðlinës turiná?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2229
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "Tuðèia"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
-#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "foo (kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".foo (kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "foo foo (kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2271
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2271
-#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "foo (kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2272
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2272
-#: libnautilus-extensions/nautilus-file-operations.c:2294
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "foo foo (kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2273
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2273
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (kopija).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2274
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2274
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "foo.. (kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "foo... (kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "foo. (kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "foo. (kita kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2277
-#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "foo (kita kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2278
-#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "foo (kita kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "foo (3-èia kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "foo (3-èia kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (kita kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3-èia kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2282
+#: libnautilus-extensions/nautilus-file-operations.c:2274
 msgid "foo (13th copy)"
 msgstr "foo (13-a kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2282
+#: libnautilus-extensions/nautilus-file-operations.c:2274
 msgid "foo (14th copy)"
 msgstr "foo (14-a kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2283
+#: libnautilus-extensions/nautilus-file-operations.c:2275
 msgid "foo (13th copy).txt"
 msgstr "foo (13-a kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2283
+#: libnautilus-extensions/nautilus-file-operations.c:2275
 msgid "foo (14th copy).txt"
 msgstr "foo (14-a kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2284
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "foo (21-a kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2284
-#: libnautilus-extensions/nautilus-file-operations.c:2286
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "foo (22-a kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2285
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "foo (22-a kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2285
-#: libnautilus-extensions/nautilus-file-operations.c:2287
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "foo (22-a kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2286
-#: libnautilus-extensions/nautilus-file-operations.c:2288
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "foo (23-èia kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2287
-#: libnautilus-extensions/nautilus-file-operations.c:2289
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "foo (23-èia kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2288
-#: libnautilus-extensions/nautilus-file-operations.c:2290
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "foo (24-a kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2289
-#: libnautilus-extensions/nautilus-file-operations.c:2291
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "foo (24-a kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2290
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "foo (25-a kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2291
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "foo (25-a kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2292
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "foo foo(24-a kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2292
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "foo foo(25-a kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2293
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo(24-a kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2293
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo(25-a kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2294
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000-oji kopija).txt"
 
 #. FIXME bugzilla.eazel.com 7701: These are wrong.
-#: libnautilus-extensions/nautilus-file-operations.c:2297
+#: libnautilus-extensions/nautilus-file-operations.c:2289
 msgid "foo (10th copy)"
 msgstr "foo (10-a kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2297
+#: libnautilus-extensions/nautilus-file-operations.c:2289
 msgid "foo (11st copy)"
 msgstr "foo (11-a kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2298
+#: libnautilus-extensions/nautilus-file-operations.c:2290
 msgid "foo (10th copy).txt"
 msgstr "foo (10-a kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2298
+#: libnautilus-extensions/nautilus-file-operations.c:2290
 msgid "foo (11st copy).txt"
 msgstr "foo (11-a kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2299
+#: libnautilus-extensions/nautilus-file-operations.c:2291
 msgid "foo (11th copy)"
 msgstr "foo (11-a kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2299
+#: libnautilus-extensions/nautilus-file-operations.c:2291
 msgid "foo (12nd copy)"
 msgstr "foo (12-a kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2300
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 msgid "foo (11th copy).txt"
 msgstr "foo (11-a kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2300
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 msgid "foo (12nd copy).txt"
 msgstr "foo (12-a kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2301
+#: libnautilus-extensions/nautilus-file-operations.c:2293
 msgid "foo (12th copy)"
 msgstr "foo (12-a kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2301
+#: libnautilus-extensions/nautilus-file-operations.c:2293
 msgid "foo (13rd copy)"
 msgstr "foo (13-a kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2302
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 msgid "foo (12th copy).txt"
 msgstr "foo (12-a kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2302
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 msgid "foo (13rd copy).txt"
 msgstr "foo (13-a kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld ið %ld"
 
-#: libnautilus-extensions/nautilus-font-picker.c:80
-msgid "Normal"
-msgstr "Normalus"
-
-#: libnautilus-extensions/nautilus-font-picker.c:81
-#: libnautilus-extensions/nautilus-volume-monitor.c:499
-#: libnautilus-extensions/nautilus-volume-monitor.c:518
-msgid "Unknown"
-msgstr "Neþinomas"
-
-#: libnautilus-extensions/nautilus-font-picker.c:87
-msgid "Bold"
-msgstr "Pajuodintas"
-
-#: libnautilus-extensions/nautilus-font-picker.c:88
-msgid "Book"
-msgstr "Knyga"
-
-#: libnautilus-extensions/nautilus-font-picker.c:90
-msgid "Demibold"
-msgstr "Pusjuodis"
-
-#: libnautilus-extensions/nautilus-font-picker.c:91
-msgid "Light"
-msgstr "Ðviesus"
-
-#: libnautilus-extensions/nautilus-font-picker.c:97
-msgid "Italic"
-msgstr "Kursyvinis"
-
-#: libnautilus-extensions/nautilus-font-picker.c:98
-msgid "Oblique"
-msgstr "Pakrypæs"
-
-#: libnautilus-extensions/nautilus-font-picker.c:99
-msgid "Reverse Italic"
-msgstr "Atvirkðtinis kursyvinis"
-
-#: libnautilus-extensions/nautilus-font-picker.c:100
-msgid "Reverse Oblique"
-msgstr "Atvirkðtinis·pasviræs"
-
-#: libnautilus-extensions/nautilus-font-picker.c:107
-msgid "Condensed"
-msgstr "Suspaustas"
-
-#: libnautilus-extensions/nautilus-font-picker.c:108
-msgid "Semicondensed"
-msgstr "Pusiau suspaustas"
-
-#: libnautilus-extensions/nautilus-font-picker.c:428
-msgid "More..."
-msgstr "Daugiau..."
-
 #: libnautilus-extensions/nautilus-gconf-extensions.c:90
 msgid "GConf Error"
 msgstr "GConf klaida"
 
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:1084
-msgid "fixed"
-msgstr "iðtaisytas"
-
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1444
-msgid "01/01/00, 01:00 AM"
-msgstr "01/01/00, 01:00 iki pietø"
-
-#: libnautilus-extensions/nautilus-glib-extensions.c:1445
-msgid "1/1/00, 1:00 AM"
-msgstr "1/1/00, 1:00 iki pietø"
-
-#: libnautilus-extensions/nautilus-glib-extensions.c:1446
-msgid " 1/ 1/00,  1:00 AM"
-msgstr " 1/ 1/00, 1:00 iki pietø"
-
 #. Constants
-#: libnautilus-extensions/nautilus-global-preferences.c:49
+#: libnautilus-extensions/nautilus-global-preferences.c:50
 msgid "Nautilus Preferences"
 msgstr "Nautilus nuostatos"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:470
+#: libnautilus-extensions/nautilus-global-preferences.c:471
 msgid "always"
 msgstr "visada"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:471
+#: libnautilus-extensions/nautilus-global-preferences.c:472
 msgid "Always"
 msgstr "Visada"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:474
+#: libnautilus-extensions/nautilus-global-preferences.c:475
 msgid "local only"
 msgstr "tik vietinëms"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:475
+#: libnautilus-extensions/nautilus-global-preferences.c:476
 msgid "Local Files Only"
 msgstr "Tik vietinëms bylos"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:478
+#: libnautilus-extensions/nautilus-global-preferences.c:479
 msgid "never"
 msgstr "niekada"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:479
+#: libnautilus-extensions/nautilus-global-preferences.c:480
 msgid "Never"
 msgstr "Niekada"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:575
+#: libnautilus-extensions/nautilus-global-preferences.c:576
 msgid "Smoother Graphics"
 msgstr "Lygesnë grafika"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:577
+#: libnautilus-extensions/nautilus-global-preferences.c:578
 msgid "Use smoother (but slower) graphics"
 msgstr "Naudoti lygesnæ (bet lëtesnæ) grafikà"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:582
-#: libnautilus-extensions/nautilus-global-preferences.c:589
-#: libnautilus-extensions/nautilus-global-preferences.c:699
-#: libnautilus-extensions/nautilus-global-preferences.c:706
-#: libnautilus-extensions/nautilus-global-preferences.c:713
-#: libnautilus-extensions/nautilus-global-preferences.c:723
-#: libnautilus-extensions/nautilus-global-preferences.c:730
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
 msgid "Fonts"
 msgstr "Ðriftai"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:584
-#: libnautilus-extensions/nautilus-global-preferences.c:591
-msgid "Use this font in Sidebar and some dialog boxes:"
-msgstr "Naudoti ðá ðriftà ðoniniame skydelyje ir kai kuriuose dialoguose:"
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+#, fuzzy
+msgid "Font for Icon view:"
+msgstr "Naudoti ðá ðriftà piktogramø vaizdui:"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+#, fuzzy
+msgid "Font size for Icon view at 100% zoom:"
+msgstr "Naudoti ðio dydþio ðriftà piktogramø vaizdui 100% masteliu"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "Piktogramø ir Sàraðo vaizdai"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+#, fuzzy
+msgid "Font size for List view at 100% zoom:"
+msgstr "Naudoti ðio dydþio ðriftà Sàraðo vaizdui 100% masteliu"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:602
+#: libnautilus-extensions/nautilus-global-preferences.c:644
 msgid "Use Nautilus to draw the desktop"
 msgstr "Naudoti Nautilus darbalaukiui paiðyti"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:607
-#: libnautilus-extensions/nautilus-global-preferences.c:614
-#: libnautilus-extensions/nautilus-global-preferences.c:621
-#: libnautilus-extensions/nautilus-global-preferences.c:628
-#: libnautilus-extensions/nautilus-global-preferences.c:635
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
 msgid "Opening New Windows"
 msgstr "Atidaromi nauji langai"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:609
+#: libnautilus-extensions/nautilus-global-preferences.c:651
 msgid "Open each file or folder in a separate window"
 msgstr "Atidaryti kiekvienà bylà ar katalogà atskirame lange"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:616
+#: libnautilus-extensions/nautilus-global-preferences.c:658
 msgid "Display toolbar in new windows"
 msgstr "Rodyti mygtukø juostà naujame lange"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:623
+#: libnautilus-extensions/nautilus-global-preferences.c:665
 msgid "Display location bar in new windows"
 msgstr "Rodyti adreso juostà naujame lange"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:630
+#: libnautilus-extensions/nautilus-global-preferences.c:672
 msgid "Display status bar in new windows"
 msgstr "Rodyti bûsenos juostà naujame lange"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:637
+#: libnautilus-extensions/nautilus-global-preferences.c:679
 msgid "Display sidebar in new windows"
 msgstr "Rodyti ðoniná skydelá naujame lange"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:642
-#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
 msgid "Trash Behavior"
 msgstr "Ðiukðlinës elgesys"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:644
+#: libnautilus-extensions/nautilus-global-preferences.c:686
 msgid "Ask before emptying the Trash or deleting files"
 msgstr "Paklausti prieð iðvalant ðiukðlinæ arba iðtrinant bylas"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:651
+#: libnautilus-extensions/nautilus-global-preferences.c:693
 msgid "Include a Delete command that bypasses Trash"
 msgstr "Ádëti iðtrynimo komandà kuri aplenkia ðiukðlinæ"
 
@@ -5585,269 +5528,252 @@ msgstr "Ádëti iðtrynimo komandà kuri aplenkia ðiukðlinæ"
 #. * Desktop, but there's no obviously-better place for it and
 #. * it probably doesn't deserve a pane of its own.
 #.
-#: libnautilus-extensions/nautilus-global-preferences.c:660
+#: libnautilus-extensions/nautilus-global-preferences.c:702
 msgid "Keyboard Shortcuts"
 msgstr "Klaviðø kombinacijos"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:662
+#: libnautilus-extensions/nautilus-global-preferences.c:704
 msgid "Use Emacs-style keyboard shortcuts in text fields"
 msgstr "naudoti Emacs-stiliaus klaviðø kombinacijas teksto laukeliuose"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:671
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 msgid "single"
 msgstr "viengubas"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:672
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "Aktyvuoti elementus vienu paspaudimu"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:675
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "dvigubas"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:676
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "Aktyvuoti elementus dvigubu paspaudimu."
 
-#: libnautilus-extensions/nautilus-global-preferences.c:683
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 msgid "launch"
 msgstr "paleidimas"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:726
 msgid "Execute files when they are clicked"
 msgstr "Vykdyti bylas ant jø paspaudus"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:687
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 msgid "display"
 msgstr "Vaizdas"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:688
+#: libnautilus-extensions/nautilus-global-preferences.c:730
 msgid "Display files when they are clicked"
 msgstr "Rodyti bylas ant jø paspaudus"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:691
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 msgid "ask"
 msgstr "paklausti"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:692
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 msgid "Ask each time"
 msgstr "Paklausti kiekvienà kartà"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:701
-#: libnautilus-extensions/nautilus-global-preferences.c:708
-msgid "Use this font in Icon view:"
-msgstr "Naudoti ðá ðriftà piktogramø vaizdui:"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:715
-msgid "Use this font size in Icon view at 100% zoom"
-msgstr "Naudoti ðio dydþio ðriftà piktogramø vaizdui 100% masteliu"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:725
-msgid "Use this font in List view:"
-msgstr "Naudoti ðá ðriftà Sàraðo vaizdui:"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:732
-msgid "Use this font size in List view at 100% zoom"
-msgstr "Naudoti ðio dydþio ðriftà Sàraðo vaizdui 100% masteliu"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:740
-#: libnautilus-extensions/nautilus-global-preferences.c:742
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
 msgid "Click Behavior"
 msgstr "Paspaudimo elgesys"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:748
-#: libnautilus-extensions/nautilus-global-preferences.c:750
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
 msgid "Executable Text Files"
 msgstr "Vykdomosios tekstinës bylos"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:756
-#: libnautilus-extensions/nautilus-global-preferences.c:763
-#: libnautilus-extensions/nautilus-global-preferences.c:770
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
 msgid "Show/Hide Options"
 msgstr "Parodyti/paslëpti parametrus"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:758
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr "Rodyti paslëptas bylas (bylø pavadinimai prasideda \".\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:765
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr "Rodyti atsargines bylas (bylø pavadinimai baigiasi \"~\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:772
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr "Rodyti specialias vëliavëles Savybiø lange"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:777
+#: libnautilus-extensions/nautilus-global-preferences.c:778
 msgid "Sorting Order"
 msgstr "Rikiavimo tvarka"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:779
+#: libnautilus-extensions/nautilus-global-preferences.c:780
 msgid "Always list folders before files"
 msgstr "Visada iðdëstyti katalogus prieð bylas"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:790
-#: libnautilus-extensions/nautilus-global-preferences.c:804
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
 #: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
 msgid "Location:"
 msgstr "Vieta:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:795
-#: libnautilus-extensions/nautilus-global-preferences.c:802
-#: libnautilus-extensions/nautilus-global-preferences.c:809
-#: libnautilus-extensions/nautilus-global-preferences.c:816
-#: libnautilus-extensions/nautilus-global-preferences.c:824
-#: libnautilus-extensions/nautilus-global-preferences.c:832
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
 msgid "HTTP Proxy Settings"
 msgstr "HTTP tarpinës stoties nustatymai"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:797
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "Naudoti HTTP tarpinæ stotá"
 
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:811
+#: libnautilus-extensions/nautilus-global-preferences.c:812
 #: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr "Prievadas:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:818
+#: libnautilus-extensions/nautilus-global-preferences.c:819
 msgid "Proxy requires a username and password:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:840
+#: libnautilus-extensions/nautilus-global-preferences.c:841
 msgid "Built-in Bookmarks"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:842
+#: libnautilus-extensions/nautilus-global-preferences.c:843
 msgid "Don't include the built-in bookmarks in the Bookmarks menu"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:851
+#: libnautilus-extensions/nautilus-global-preferences.c:852
 msgid "Show Text in Icons"
 msgstr "Rodyti tekstà piktogramose"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:859
+#: libnautilus-extensions/nautilus-global-preferences.c:860
 msgid "Show Count of Items in Folders"
 msgstr "Rodyti elementø skaièiø kataloguose"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:867
-#: libnautilus-extensions/nautilus-global-preferences.c:875
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
 msgid "Show Thumbnails for Image Files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:877
+#: libnautilus-extensions/nautilus-global-preferences.c:878
 msgid "Don't make thumbnails for files larger than:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:885
+#: libnautilus-extensions/nautilus-global-preferences.c:886
 msgid "Preview Sound Files"
 msgstr "Garso bylø perþiûra"
 
 #. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:895
+#: libnautilus-extensions/nautilus-global-preferences.c:896
 msgid "Make Folder Appearance Details Public"
 msgstr "Pavieðinti katalogø iðvaizdos parametrus "
 
-#: libnautilus-extensions/nautilus-global-preferences.c:935
+#: libnautilus-extensions/nautilus-global-preferences.c:936
 msgid "Appearance"
 msgstr "Iðvaizda"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:940
+#: libnautilus-extensions/nautilus-global-preferences.c:941
 msgid "Windows & Desktop"
 msgstr "Langai ir Darbastalis"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:945
+#: libnautilus-extensions/nautilus-global-preferences.c:946
 msgid "Icon & List Views"
 msgstr "Piktogramø ir Sàraðo vaizdai"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:956
+#: libnautilus-extensions/nautilus-global-preferences.c:957
 msgid "Navigation"
 msgstr "Navigacija"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:961
+#: libnautilus-extensions/nautilus-global-preferences.c:962
 msgid "Speed Tradeoffs"
 msgstr "Greièio nepakankamumai"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:984
+#: libnautilus-extensions/nautilus-global-preferences.c:985
 msgid "search by text"
 msgstr "Ieðkoti pagal tekstà"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:985
+#: libnautilus-extensions/nautilus-global-preferences.c:986
 msgid "Search for files by file name only"
 msgstr "Ieðkoti bylø tik pagal vardà"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:988
+#: libnautilus-extensions/nautilus-global-preferences.c:989
 msgid "search by text and properties"
 msgstr "Ieðkoti pagal tekstà ir savybes"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:989
+#: libnautilus-extensions/nautilus-global-preferences.c:990
 msgid "Search for files by file name and file properties"
 msgstr "Ieðkoti bylø pagal jø vardus ir savybes"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:996
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "Paieðkos sudëtingumo nustatymai"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:998
+#: libnautilus-extensions/nautilus-global-preferences.c:999
 msgid "search type to do by default"
 msgstr "áprastas paieðkos bûdas"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1004
-#: libnautilus-extensions/nautilus-global-preferences.c:1037
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 msgid "Fast Search"
 msgstr "Greita paieðka"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1006
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
 msgid "Enable fast search (indexes your hard drive)"
 msgstr "Leidþiama greita paieðka (suindeksuojamas Jûsø kietas diskas) "
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1013
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
 msgid "Search Engine Location"
 msgstr "Paieðkos variklio vieta"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1030
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
 msgid "Search"
 msgstr "Paieðka"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1051
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
 msgid "Show only folders (no files) in the tree"
 msgstr "Medyje rodyti tik katalogus (ne bylas)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1075
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
 #, c-format
 msgid "Display %s tab in sidebar"
 msgstr "ðoniniame skydelyje rodyti %s kortelæ"
 
 #. Sidebar Panels - dynamic part
-#: libnautilus-extensions/nautilus-global-preferences.c:1095
-#: libnautilus-extensions/nautilus-global-preferences.c:1103
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
 msgid "Sidebar Panels"
 msgstr "Ðoniniai skydeliai"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1097
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
 msgid "Tabs"
 msgstr "Kortelës"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1265
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "currently can't be performed because the program crond, which does nightly "
 "tasks on your computer, is turned off. To make sure fast searches can be "
 "done, turn crond on."
 msgstr ""
-"Indeksavimas yra ájungtas, greita paieðka leidþiama. Taèiau ðiuo metu negalima "
-"vykdyti indeksavimo, kadangi programa crond, kuri atlieka naktines (kai "
-"kompiuteriu nedirbama) uþduotis, yra iðjungta. Kad uþtikrinti greità paieðkà, "
-"ájunkite crond programà."
+"Indeksavimas yra ájungtas, greita paieðka leidþiama. Taèiau ðiuo metu "
+"negalima vykdyti indeksavimo, kadangi programa crond, kuri atlieka naktines "
+"(kai kompiuteriu nedirbama) uþduotis, yra iðjungta. Kad uþtikrinti greità "
+"paieðkà, ájunkite crond programà."
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1272
-#: libnautilus-extensions/nautilus-global-preferences.c:1290
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
 msgid "Files May Not Be Indexed"
 msgstr "Bylos gali bûti nesuindeksuotos"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1273
-#: libnautilus-extensions/nautilus-global-preferences.c:1291
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
 msgid ""
 "If you are running Linux, you can log in as root and type these commands to "
 "start cron:\n"
@@ -5861,7 +5787,7 @@ msgstr ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1282
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "may not be performed because the program crond, which does nightly tasks on "
@@ -5869,20 +5795,10 @@ msgid ""
 "check to make sure that crond is turned on.\n"
 "\n"
 msgstr ""
-"Indeksavimas yra ájungtas, greita paieðka leidþiama. Taèiau ðiuo metu negalima "
-"vykdyti indeksavimo, kadangi programa crond, kuri atlieka naktines (kai "
-"kompiuteriu nedirbama) uþduotis, yra iðjungta. Kad uþtikrinti greità paieðkà, "
-"ájunkite crond programà.\n"
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:640
-msgid "No image was selected.  You must click on an image to select it."
-msgstr ""
-"Nebuvo pasirinkta paveikslëliø. Jûs turite paspausti ant paveikslëlio, kad já "
-"iðsirinkti."
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:641
-msgid "No selection made"
-msgstr "Nepadaryta atranka"
+"Indeksavimas yra ájungtas, greita paieðka leidþiama. Taèiau ðiuo metu "
+"negalima vykdyti indeksavimo, kadangi programa crond, kuri atlieka naktines "
+"(kai kompiuteriu nedirbama) uþduotis, yra iðjungta. Kad uþtikrinti greità "
+"paieðkà, ájunkite crond programà.\n"
 
 #. The list of characters that cause line breaks can be localized.
 #: libnautilus-extensions/nautilus-icon-canvas-item.c:70
@@ -5891,19 +5807,19 @@ msgstr " -_,;:.?/&"
 
 #: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout and "
-"leave this item where you dropped it? This will clobber the stored manual "
-"layout."
+"This folder uses automatic layout. Do you want to switch to manual layout "
+"and leave this item where you dropped it? This will clobber the stored "
+"manual layout."
 msgstr ""
 "Ðis katalogas naudoja automatiná iðdëstymà. Ar norite perjungti á rankiná "
-"iðdëstymà ir palikti ðá elementà ten, kur já padëjote? Tai sugadins iðsaugotà "
-"rankiná iðdëstymà."
+"iðdëstymà ir palikti ðá elementà ten, kur já padëjote? Tai sugadins "
+"iðsaugotà rankiná iðdëstymà."
 
 #: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout and "
-"leave these items where you dropped them? This will clobber the stored manual "
-"layout."
+"This folder uses automatic layout. Do you want to switch to manual layout "
+"and leave these items where you dropped them? This will clobber the stored "
+"manual layout."
 msgstr ""
 "Ðis katalogas naudoja automatiná iðdëstymà. Ar norite perjungti á rankiná "
 "iðdëstymà ir palikti ðiuos elementus ten, kur juos padëjote? Tai sugadins "
@@ -5911,16 +5827,16 @@ msgstr ""
 
 #: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout and "
-"leave this item where you dropped it?"
+"This folder uses automatic layout. Do you want to switch to manual layout "
+"and leave this item where you dropped it?"
 msgstr ""
 "Ðis katalogas naudoja automatiná iðdëstymà. Ar norite perjungti á rankiná "
 "iðdëstymà ir palikti ðá elementà ten, kur já padëjote?"
 
 #: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout and "
-"leave these items where you dropped them?"
+"This folder uses automatic layout. Do you want to switch to manual layout "
+"and leave these items where you dropped them?"
 msgstr ""
 "Ðis katalogas naudoja automatiná iðdëstymà. Ar norite perjungti á rankiná "
 "iðdëstymà ir palikti ðiuos elementus ten, kur juos padëjote?"
@@ -5954,19 +5870,15 @@ msgstr "gràþinti raðymà"
 msgid "Restore the changed name"
 msgstr "Atstatyti pakeistà vardà"
 
-#: libnautilus-extensions/nautilus-password-dialog.c:306
-msgid "Remember this password"
-msgstr "Atsiminti ðá slaptaþodá"
-
-#: libnautilus-extensions/nautilus-preferences.c:91
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "Pradedantysis"
 
-#: libnautilus-extensions/nautilus-preferences.c:92
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "Vidurinis"
 
-#: libnautilus-extensions/nautilus-preferences.c:93
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "Paþengæs"
 
@@ -6148,8 +6060,8 @@ msgid ""
 "%s\n"
 "\n"
 "You can configure which programs are offered for which file types with the "
-"\"File Types and Programs\" part of the GNOME Control Center. Do you want to go "
-"there now?"
+"\"File Types and Programs\" part of the GNOME Control Center. Do you want to "
+"go there now?"
 msgstr ""
 
 #: libnautilus-extensions/nautilus-program-choosing.c:492
@@ -6412,8 +6324,8 @@ msgstr "Elementai, kurie yra paprastos bylos ir jø pavadinimuose yra \"stuff\""
 
 #: libnautilus-extensions/nautilus-search-uri.c:710
 msgid ""
-"Items containing \"stuff\" in their names, that are regular files and smaller "
-"than 2000 bytes"
+"Items containing \"stuff\" in their names, that are regular files and "
+"smaller than 2000 bytes"
 msgstr ""
 "Elementai, kurie yra paprastos bylos, maþesnës nei 2000 baitø ir jø "
 "pavadinimuose yra \"stuff\""
@@ -6422,25 +6334,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Elementai, kurie yra katalogai ir jø pavadinimuose yra \"medusa\""
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr "Detalës"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr "Áspëjimas"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr "Klaida"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr "Klausimas"
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr "Paieðka diskuose"
@@ -6483,9 +6376,14 @@ msgstr "Þiûrëti kaip %s"
 msgid "%s Viewer"
 msgstr "%s perþiûriklis"
 
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+msgid "Unknown"
+msgstr "Neþinomas"
+
 #. Populate table with items we know localized names for.
 #: libnautilus-extensions/nautilus-volume-monitor.c:606
-#: libnautilus-extensions/nautilus-volume-monitor.c:1806
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr "Diskelis"
 
@@ -6502,29 +6400,29 @@ msgstr "Zip kaupiklis"
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1515
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr "yra apsaugotas nuo áraðymo, primontuojama skaitymo reþimu"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1518
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "nëra tinkamas blokinis árenginys"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1519
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr ""
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1523
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
-"Nautilus was unable to mount the floppy drive. There is probably no floppy in "
-"the drive."
+"Nautilus was unable to mount the floppy drive. There is probably no floppy "
+"in the drive."
 msgstr ""
 "Nautilus'ui nepavyko primontuoti diskelio. Greièiausiai diskelio nëra "
 "árenginyje."
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1527
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
@@ -6532,13 +6430,13 @@ msgstr ""
 "Nautilus'ui nepavyko primontuoti skirsnio. Greièiausiai diskelio nëra "
 "árenginyje."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1530
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr ""
-"klaidingai nurodytas bylø sistemos tipas, bloga parinktis, blogas superblokas "
-""
+"klaidingai nurodytas bylø sistemos tipas, bloga parinktis, blogas "
+"superblokas "
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1533
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
@@ -6546,64 +6444,64 @@ msgstr ""
 "Nautilus'ui nepavyko primontuoti diskelio. Greièiausiai diskelio formatas "
 "toks, kurio neina primontuoti."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1536
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
-"Nautilus was unable to mount the selected volume. The volume is probably in a "
-"format that cannot be mounted."
+"Nautilus was unable to mount the selected volume. The volume is probably in "
+"a format that cannot be mounted."
 msgstr ""
 "Nautilus'ui nepavyko primontuoti skirsnio. Greièiausiai skirsnio formatas "
 "toks, kurio neina primontuoti."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1541
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr "Nautilus'ui nepavyko primontuoti nurodyto diskelio."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1543
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "Nautilus'ui nepavyko primontuoti nurodyto skirsnio."
 
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1548
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr "Nautilus'ui nepavyko numontuoti nurodyto skirsnio."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1556
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
 msgid "Mount Error"
 msgstr "Montavimo klaida"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1556
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
 msgid "Unmount Error"
 msgstr "Numontavimo klaida"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1708
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "ISO 9660 Skirsnis"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1723
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1730
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Ext2 Skirsnis"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1745
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "MSDOS Skirsnis"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1760
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "NFS Skirsnis"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1775
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
 msgid "ReiserFS Volume"
 msgstr "ReiserFS Skirsnis"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1791
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
 msgid "UFS Volume"
 msgstr "UFS Skirsnis"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1821
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "Neþinomas Skirsnis"
 
@@ -6898,8 +6796,9 @@ msgstr "Paleisti \"%s\" visiems paþymëtiems elementams"
 
 #: src/file-manager/fm-directory-view.c:3566
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. Choosing "
-"a script from the menu will run that script with any selected items as input."
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
 msgstr ""
 
 #: src/file-manager/fm-directory-view.c:3569
@@ -6908,8 +6807,8 @@ msgstr "Apie skriptus"
 
 #: src/file-manager/fm-directory-view.c:3570
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. Choosing "
-"a script from the menu will run that script.\n"
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
 "\n"
 "When executed from a local folder, scripts will be passed the selected file "
 "names. When executed from a remote folder (e.g. a folder showing web or ftp "
@@ -7062,14 +6961,14 @@ msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
 "link in the Trash?"
 msgstr ""
-"Nuorodos negalima naudoti, nes nëra paskirties. Ar norite tà nuorodà padëti á "
-"ðiukðlinæ?"
+"Nuorodos negalima naudoti, nes nëra paskirties. Ar norite tà nuorodà padëti "
+"á ðiukðlinæ?"
 
 #: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you want "
-"to put this link in the Trash?"
+"This link can't be used, because its target \"%s\" doesn't exist. Do you "
+"want to put this link in the Trash?"
 msgstr ""
 "Nuorodos negalima naudoti, nes paskirtis \"%s\" neegzistuoja. Ar norite tà "
 "nuorodà padëti á ðiukðlinæ?"
@@ -7567,8 +7466,8 @@ msgid ""
 "Search results may not include items modified after %s, when your drive was "
 "last indexed."
 msgstr ""
-"Paieðkos rezultatuose gali nebûti elementø keistø po %s, kai jûsø diskas buvo "
-"paskutiná kartà indeksuotas."
+"Paieðkos rezultatuose gali nebûti elementø keistø po %s, kai jûsø diskas "
+"buvo paskutiná kartà indeksuotas."
 
 #: src/file-manager/fm-search-list-view.c:158
 msgid ""
@@ -7607,8 +7506,8 @@ msgstr "Nekurti indekso"
 #: src/file-manager/fm-search-list-view.c:200
 msgid ""
 "Every indexed file on your computer matches the criteria you selected. You "
-"can check the spelling on your selections or add more criteria to narrow your "
-"results."
+"can check the spelling on your selections or add more criteria to narrow "
+"your results."
 msgstr ""
 "Kiekviena jûsø kompiuteryje indeksuota byla atitinka nurodytà sàlygà. Jûs "
 "galite patikrinti savo sàlygos teisingumà arba pridëti daugiau sàlygø, kad "
@@ -7671,10 +7570,10 @@ msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:283
 msgid ""
-"To do a content search, Find requires an index of the content on your system. "
-" Your computer does not have an index right now.  Would you like to create an "
-"index?  Creating an index will be done while you are not actively using your "
-"computer."
+"To do a content search, Find requires an index of the content on your "
+"system.  Your computer does not have an index right now.  Would you like to "
+"create an index?  Creating an index will be done while you are not actively "
+"using your computer."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:290
@@ -7700,9 +7599,9 @@ msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:312
 msgid ""
-"To do a content search, Find requires an index of the content on your system. "
-" Your computer is currently creating that index.  Content searches will be "
-"available when the index is complete."
+"To do a content search, Find requires an index of the content on your "
+"system.  Your computer is currently creating that index.  Content searches "
+"will be available when the index is complete."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:326
@@ -7714,14 +7613,14 @@ msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:332
 msgid ""
-"To do a content search, Find requires an index of the content on your system. "
-" An index can't be created right now."
+"To do a content search, Find requires an index of the content on your "
+"system.  An index can't be created right now."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:341
 msgid ""
-"The program that creates an index is not set up correctly.  You can create an "
-"index by hand by running \"medusa-indexd\" as root on the command line."
+"The program that creates an index is not set up correctly.  You can create "
+"an index by hand by running \"medusa-indexd\" as root on the command line."
 msgstr ""
 
 #. It is not necessary to translate this text just yet; it has not been
@@ -7729,9 +7628,9 @@ msgstr ""
 #: src/file-manager/fm-search-list-view.c:360
 #: src/file-manager/nautilus-indexing-info.c:342
 msgid ""
-"To do a fast search, Find requires an index of the files on your system. Your "
-"system administrator has disabled fast search on your computer, so no index "
-"is available."
+"To do a fast search, Find requires an index of the files on your system. "
+"Your system administrator has disabled fast search on your computer, so no "
+"index is available."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:364
@@ -7741,8 +7640,8 @@ msgstr "Greitos paieðkos Jûsø kompiuteryje negalimos"
 #: src/file-manager/fm-search-list-view.c:373
 #: src/file-manager/nautilus-indexing-info.c:361
 msgid ""
-"To do a fast search, Find requires an index of the files on your system. Fast "
-"search is disabled in your Search preferences, so no index is available."
+"To do a fast search, Find requires an index of the files on your system. "
+"Fast search is disabled in your Search preferences, so no index is available."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:376
@@ -7754,8 +7653,8 @@ msgstr "Greitos paieðkos Jûsø kompiuteryje negalimos."
 #: src/file-manager/fm-search-list-view.c:377
 #: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
-"To enable fast search, open the Preferences menu and choose Preferences. Then "
-"select Search preferences and put a checkmark in the Enable Fast Search "
+"To enable fast search, open the Preferences menu and choose Preferences. "
+"Then select Search preferences and put a checkmark in the Enable Fast Search "
 "checkbox. An index will be generated while your computer is idle, so your "
 "index won't be available immediately."
 msgstr ""
@@ -7963,13 +7862,12 @@ msgstr ""
 "pieðinëlius"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:41
-msgid ""
-"Remove any custom pattern or color from the background of this location"
+msgid "Remove any custom pattern or color from the background of this location"
 msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-directory-view-ui.xml.h:42
-#: src/nautilus-sidebar.c:524
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr ""
 
@@ -8203,8 +8101,9 @@ msgstr ""
 
 #: src/file-manager/nautilus-indexing-info.c:216
 msgid ""
-"Once a day your files and text content are indexed so your searches are fast. "
-"If you need to update your index now, click on the \"Update Now\" button."
+"Once a day your files and text content are indexed so your searches are "
+"fast. If you need to update your index now, click on the \"Update Now\" "
+"button."
 msgstr ""
 
 #: src/file-manager/nautilus-indexing-info.c:219
@@ -8216,8 +8115,8 @@ msgstr ""
 #. FIXME: Do we want to talk about the index not being available?
 #: src/file-manager/nautilus-indexing-info.c:224
 msgid ""
-"Once a day your files and text content are indexed so your searches are fast. "
-""
+"Once a day your files and text content are indexed so your searches are "
+"fast. "
 msgstr ""
 
 #: src/file-manager/nautilus-indexing-info.c:236
@@ -8231,8 +8130,8 @@ msgstr "Atnaujinti dabar"
 
 #: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
-"Once a day your files and text content are indexed so your searches are fast. "
-" Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are "
+"fast.  Your files are currently being indexed."
 msgstr ""
 "Kartà per dienà jûsø bylos ir tekstinis jø turinys yra indeksuojamos, todël "
 "jûsø paieðkos yra greitos. Jûsø bylos dabar yra indeksuojamos."
@@ -8302,8 +8201,8 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"Before running Nautilus, please create these folders, or set permissions such "
-"that Nautilus can create them."
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
 msgstr ""
 "Nautilus negali sukurti ðiø reikiamø katalogø:\n"
 "\n"
@@ -8324,9 +8223,9 @@ msgstr ""
 #.
 #: src/nautilus-application.c:407
 msgid ""
-"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" from "
-"the console may fix the problem. If not, you can try rebooting the computer "
-"or installing Nautilus again."
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again."
 msgstr ""
 "Dabar negalima naudoti Nautilus. Komandos \"nautilus-clean.sh -x\" ávykdymas "
 "ið konsolës gali iðspræsti problemà. Jei nepavyks, jûs galite pabandyti "
@@ -8335,17 +8234,17 @@ msgstr ""
 #. FIXME bugzilla.eazel.com 2536: The guesses and stuff here are lame.
 #: src/nautilus-application.c:413
 msgid ""
-"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" from "
-"the console may fix the problem. If not, you can try rebooting the computer "
-"or installing Nautilus again.\n"
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again.\n"
 "\n"
 "OAF couldn't locate the Nautilus_shell.oaf file. One cause of this seems to "
 "be an LD_LIBRARY_PATH that does not include the oaf library's directory. "
-"Another possible cause would be bad install with a missing Nautilus_Shell.oaf "
-"file.\n"
+"Another possible cause would be bad install with a missing "
+"Nautilus_Shell.oaf file.\n"
 "\n"
-"Running \"nautilus-clean.sh -x\" will kill all OAF and GConf processes, which "
-"may be needed by other applications.\n"
+"Running \"nautilus-clean.sh -x\" will kill all OAF and GConf processes, "
+"which may be needed by other applications.\n"
 "\n"
 "Sometimes killing oafd and gconfd fixes the problem, but we don't know why.\n"
 "\n"
@@ -8355,10 +8254,11 @@ msgstr ""
 "ið konsolës gali iðspræsti problemà. Jei nepavyks, jûs galite pabandyti "
 "perkrauti kompiuterá arba ádiegti Nautilus ið naujo.\n"
 "\n"
-"OAF negali rasti Nautilus_shell.oaf bylos. Viena ið prieþasèiø gali bûti, kad "
-"kintamajame LD_LIBRARY_PATH nëra oaf bibliotekos katalogo. Kita galima "
+"OAF negali rasti Nautilus_shell.oaf bylos. Viena ið prieþasèiø gali bûti, "
+"kad kintamajame LD_LIBRARY_PATH nëra oaf bibliotekos katalogo. Kita galima "
 "prieþastis - blogas Nautilus ádiegimas, neádiegiant Nautilus_Shell.oaf "
-"bylos.\n\n"
+"bylos.\n"
+"\n"
 "Komandos \"nautilus-clean.sh -x\" ávykdymas nuþudys visus OAF and GConf "
 "procesus, kurie gali bûti reikalingi kitoms programoms.\n"
 "\n"
@@ -8417,8 +8317,8 @@ msgid ""
 msgstr ""
 "Jûs ruoðiatës paleisti Nautilus su administratoriaus (root) teisëmis.\n"
 "\n"
-"Kaip administratorius (root) jûs galite pakenkti sistemai, jei bûsite nelabai "
-"atsargus arba Nautilus jûsø nesustabdys kai tai darysite."
+"Kaip administratorius (root) jûs galite pakenkti sistemai, jei bûsite "
+"nelabai atsargus arba Nautilus jûsø nesustabdys kai tai darysite."
 
 #: src/nautilus-bookmarks-window.c:127
 msgid "Bookmarks"
@@ -8447,8 +8347,8 @@ msgstr "Rasti juos!"
 
 #: src/nautilus-first-time-druid.c:191
 msgid ""
-"Existence of this file indicates that the Nautilus configuration "
-"druid\nhas been presented.\n"
+"Existence of this file indicates that the Nautilus configuration druid\n"
+"has been presented.\n"
 "\n"
 "You can manually erase this file to present the druid again.\n"
 "\n"
@@ -8550,7 +8450,8 @@ msgid ""
 "make Nautilus the default desktop.\n"
 msgstr ""
 "Jeigu jûs naudojotës GNOME Midnight Commander ðie nustatymai perkels jûsø "
-"darbalaukio piktogramas á Nautilus bei padarys Nautilus áprastu darbalaukiu.\n"
+"darbalaukio piktogramas á Nautilus bei padarys Nautilus áprastu "
+"darbalaukiu.\n"
 
 #: src/nautilus-first-time-druid.c:913
 msgid "Use Nautilus to draw the desktop."
@@ -8613,10 +8514,10 @@ msgid ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
-"Indeksavimas yra ájungtas, greita paieðka leidþiama. Taèiau ðiuo metu negalima "
-"ávykdyti indeksavimo, kadangi programa crond, kuri atlieka naktines (kai "
-"kompiuteriu nedirbama) uþduotis, yra iðjungta. Kad uþtikrinti greità paieðkà, "
-"ájunkite crond programà.\n"
+"Indeksavimas yra ájungtas, greita paieðka leidþiama. Taèiau ðiuo metu "
+"negalima ávykdyti indeksavimo, kadangi programa crond, kuri atlieka naktines "
+"(kai kompiuteriu nedirbama) uþduotis, yra iðjungta. Kad uþtikrinti greità "
+"paieðkà, ájunkite crond programà.\n"
 "\n"
 "Jei jûs dirbate su Linux, galite prisijungti kaip root ir ávesti ðias "
 "komandas, kad paleisti cron:\n"
@@ -8637,10 +8538,10 @@ msgid ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
-"Indeksavimas yra ájungtas, greita paieðka leidþiama. Taèiau ðiuo metu negalima "
-"ávykdyti indeksavimo, kadangi programa crond, kuri atlieka naktines (kai "
-"kompiuteriu nedirbama) uþduotis, yra iðjungta. Kad uþtikrinti greità paieðkà, "
-"ájunkite crond programà.\n"
+"Indeksavimas yra ájungtas, greita paieðka leidþiama. Taèiau ðiuo metu "
+"negalima ávykdyti indeksavimo, kadangi programa crond, kuri atlieka naktines "
+"(kai kompiuteriu nedirbama) uþduotis, yra iðjungta. Kad uþtikrinti greità "
+"paieðkà, ájunkite crond programà.\n"
 "\n"
 "Jei jûs dirbate su Linux, galite prisijungti kaip root ir ávesti ðias "
 "komandas, kad paleisti cron:\n"
@@ -8781,49 +8682,50 @@ msgstr "Ar jûs norite þiûrëti %d vietas atskiruose languose ?"
 msgid "View in Multiple Windows?"
 msgstr "Þiûrëti keliuose languose?"
 
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr "Atlikti greità savæs patikrinimà."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "Sukurti pradiná langà su nurodyta geometrija."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "GEOMETRIJA"
 
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "Iðeiti ið Nautilus."
 
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "Paleisti Nautilus ið naujo."
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check negali bûti naudojamas su URI.\n"
 
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check negali bûti naudojamas su kitais parametrais.\n"
 
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit negali bûti naudojamas su URI.\n"
 
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart negali bûti naudojamas su URI.\n"
 
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
-msgstr "nautilus: --geometry negali bûti naudojamas daugiau nei su viena URI.\n"
+msgstr ""
+"nautilus: --geometry negali bûti naudojamas daugiau nei su viena URI.\n"
 
 #. set the title and standard close accelerator
 #: src/nautilus-property-browser.c:265
@@ -8950,8 +8852,8 @@ msgstr ""
 #: src/nautilus-property-browser.c:1335
 #, c-format
 msgid ""
-"Sorry, but \"%s\" is an existing keyword.  Please choose a different name for "
-"it."
+"Sorry, but \"%s\" is an existing keyword.  Please choose a different name "
+"for it."
 msgstr ""
 
 #: src/nautilus-property-browser.c:1365
@@ -9252,8 +9154,7 @@ msgid ""
 msgstr ""
 
 #: src/Nautilus_shell.oaf.in.h:9
-msgid ""
-"Nautilus file manager component that shows a two-dimensional icon space"
+msgid "Nautilus file manager component that shows a two-dimensional icon space"
 msgstr ""
 
 #: src/Nautilus_shell.oaf.in.h:10
@@ -9681,7 +9582,7 @@ msgstr ""
 msgid "_View"
 msgstr "_Vaizdas"
 
-#: src/nautilus-sidebar.c:693
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -9689,42 +9590,42 @@ msgstr ""
 "Jûs negalite priskirti daugiau nei vienà papildomà piktogramà vienu metu ! "
 "Papildomos piktogramos nustatymui praðom tempti tik vienà paveikslëlá."
 
-#: src/nautilus-sidebar.c:695
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "Daugiau nei vienas paveikslëlis"
 
-#: src/nautilus-sidebar.c:714
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
 msgstr ""
 
-#: src/nautilus-sidebar.c:716
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr ""
 
-#: src/nautilus-sidebar.c:721
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
 msgstr ""
 
-#: src/nautilus-sidebar.c:723
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "Tik paveikslëlius"
 
-#: src/nautilus-sidebar.c:1280
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "Atidaryti su %s"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1316
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "Atidaryti su..."
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1423
+#: src/nautilus-sidebar.c:1424
 msgid "  Empty Trash  "
 msgstr " Iðvalyti ðiukðlinæ"
 
@@ -9791,8 +9692,8 @@ msgstr "Pridëti naujà Temà"
 
 #: src/nautilus-theme-selector.c:585
 msgid ""
-"Sorry, but you can't remove the current theme. Please change to another theme "
-"before removing this one."
+"Sorry, but you can't remove the current theme. Please change to another "
+"theme before removing this one."
 msgstr ""
 
 #: src/nautilus-theme-selector.c:587
@@ -9924,8 +9825,9 @@ msgstr ""
 #: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa search "
-"service, and if you don't have an index, that the Medusa indexer is running."
+"search service isn't running. Be sure that you have started the Medusa "
+"search service, and if you don't have an index, that the Medusa indexer is "
+"running."
 msgstr ""
 
 #: src/nautilus-window-manage-views.c:1311
@@ -10056,6 +9958,83 @@ msgstr "Pirmyn"
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 
+#~ msgid "Normal"
+#~ msgstr "Normalus"
+
+#~ msgid "Bold"
+#~ msgstr "Pajuodintas"
+
+#~ msgid "Book"
+#~ msgstr "Knyga"
+
+#~ msgid "Demibold"
+#~ msgstr "Pusjuodis"
+
+#~ msgid "Light"
+#~ msgstr "Ðviesus"
+
+#~ msgid "Italic"
+#~ msgstr "Kursyvinis"
+
+#~ msgid "Oblique"
+#~ msgstr "Pakrypæs"
+
+#~ msgid "Reverse Italic"
+#~ msgstr "Atvirkðtinis kursyvinis"
+
+#~ msgid "Reverse Oblique"
+#~ msgstr "Atvirkðtinis·pasviræs"
+
+#~ msgid "Condensed"
+#~ msgstr "Suspaustas"
+
+#~ msgid "Semicondensed"
+#~ msgstr "Pusiau suspaustas"
+
+#~ msgid "More..."
+#~ msgstr "Daugiau..."
+
+#~ msgid "fixed"
+#~ msgstr "iðtaisytas"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00 iki pietø"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00 iki pietø"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00, 1:00 iki pietø"
+
+#~ msgid "Use this font in Sidebar and some dialog boxes:"
+#~ msgstr "Naudoti ðá ðriftà ðoniniame skydelyje ir kai kuriuose dialoguose:"
+
+#~ msgid "Use this font in List view:"
+#~ msgstr "Naudoti ðá ðriftà Sàraðo vaizdui:"
+
+#~ msgid "No image was selected.  You must click on an image to select it."
+#~ msgstr ""
+#~ "Nebuvo pasirinkta paveikslëliø. Jûs turite paspausti ant paveikslëlio, kad "
+#~ "já iðsirinkti."
+
+#~ msgid "No selection made"
+#~ msgstr "Nepadaryta atranka"
+
+#~ msgid "Remember this password"
+#~ msgstr "Atsiminti ðá slaptaþodá"
+
+#~ msgid "Details"
+#~ msgstr "Detalës"
+
+#~ msgid "Warning"
+#~ msgstr "Áspëjimas"
+
+#~ msgid "Error"
+#~ msgstr "Klaida"
+
+#~ msgid "Question"
+#~ msgstr "Klausimas"
+
 #~ msgid "You cannot move a file onto itself."
 #~ msgstr "Negali perkelti bylos á save paèià."
 
diff --git a/po/nl.po b/po/nl.po
index 7d4e48640..bc1449034 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,16 +3,15 @@
 # Mendel Mobach <mendel@mobach.nl>, 2000.
 # Almer S. Tigelaar <almer1@dds.nl>, 2000. (I only did a little correcting here and there)
 #
-#: libnautilus-extensions/nautilus-search-uri.c:380
-#: libnautilus-extensions/nautilus-search-uri.c:386
-#: libnautilus-extensions/nautilus-search-uri.c:389
-#: libnautilus-extensions/nautilus-search-uri.c:392
-#: libnautilus-extensions/nautilus-search-uri.c:395
-#: libnautilus-extensions/nautilus-search-uri.c:398
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus\n"
-"POT-Creation-Date: 2000-11-04 15:53+0100\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2000-11-04 15+55+0100\n"
 "Last-Translator: Almer S. Tigelaar <almer1@dds.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -20,6 +19,234 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: applets/launcher/nautilus-launcher-applet.c:272
+msgid "Can't create nautilus-launcher-applet!"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:211
+msgid "Can't create nautilus-preferences-applet!"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:226
+#, fuzzy
+msgid "Show Desktop"
+msgstr "Bureaublad"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:230
+#, fuzzy
+msgid "Smooth Graphics"
+msgstr "Mooiere graphics"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:243
+#: src/nautilus-application.c:639
+msgid "Quit"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:251
+#, fuzzy
+msgid "Start"
+msgstr "Status"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:259
+#, fuzzy
+msgid "Restart"
+msgstr "Opnieuw"
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:1
+msgid "Factory for Nautilus component adapter factories"
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:2
+msgid "Factory for Nautilus component adapter factories "
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:3
+msgid ""
+"Factory for objects that wrap ordinary Bonobo Controls or Embeddables to "
+"look like Nautilus Views"
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:4
+msgid "Nautilus component adapter factory"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:230
+#, c-format
+msgid ""
+"%s CPU\n"
+"%s MHz\n"
+"%s cache size"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:264
+#, c-format
+msgid "%lu GB RAM"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:266
+#, c-format
+msgid "%lu MB RAM"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:324
+#, c-format
+msgid "%lu GB"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:326
+#, c-format
+msgid "%lu MB"
+msgstr ""
+
+#. set up the title
+#: components/hardware/nautilus-hardware-view.c:407
+msgid "Hardware Overview"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:520
+msgid "This is a placeholder for the CPU page."
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:545
+msgid "This is a placeholder for the RAM page."
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:570
+msgid "This is a placeholder for the IDE page."
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:2
+#: components/hardware/nautilus-hardware-view.c:631
+#: data/static_bookmarks.xml.h:16
+msgid "Hardware"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:1
+msgid "Factory for hardware view"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:3
+msgid "Hardware Viewer"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:4
+msgid "Hardware view"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:5
+#, fuzzy
+msgid "View as Hardware"
+msgstr "Bekijk als een ander"
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:6
+msgid "hardware view"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/gdb3html.c:712
+#: components/music/nautilus-music-view.c:1512
+msgid "Previous"
+msgstr "Vorige"
+
+#: components/help/converters/gnome-db2html2/gdb3html.c:721
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
+msgid "Home"
+msgstr "Thuis"
+
+#: components/help/converters/gnome-db2html2/gdb3html.c:730
+#: components/music/nautilus-music-view.c:1568
+msgid "Next"
+msgstr "Volgende"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:259
+#: components/notes/Nautilus_View_notes.oaf.in.h:2
+#, fuzzy
+msgid "Notes"
+msgstr "Geen resultaten"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:709
+#, c-format
+msgid "Table %d."
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:864
+msgid "Up to Table of Contents"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1012
+#, fuzzy, c-format
+msgid "Figure %s"
+msgstr "zijn %s"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1032
+msgid "the section here"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1034
+#, fuzzy
+msgid "the section"
+msgstr "Omschrijving"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1090
+#, c-format
+msgid "Figure %d"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1102
+msgid "IMAGE"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:2068
+#: components/help/converters/gnome-db2html2/sect-elements.c:2070
+msgid "Legal Notice"
+msgstr ""
+
+#. This 'Q' is short for 'Question:'
+#: components/help/converters/gnome-db2html2/sect-elements.c:2116
+msgid "Q"
+msgstr ""
+
+#. This 'A' is short for 'Answer'
+#: components/help/converters/gnome-db2html2/sect-elements.c:2128
+msgid "A"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:2151
+#, fuzzy
+msgid "See"
+msgstr "Stereo"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:2178
+#, fuzzy
+msgid "See also"
+msgstr "zie ook "
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:322
+msgid "GNOME Documentation"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:353
+#, fuzzy
+msgid "Copyright"
+msgstr "Kopiëren"
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:353
+msgid "by"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:355
+#, fuzzy
+msgid "Table of Contents"
+msgstr "Pakket inhoud"
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:521
+msgid "PREFACE"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:530
+msgid "APPENDIX"
+msgstr ""
+
 #. * From 'man(7)':
 #.
 #. The manual sections are traditionally defined as follows:
@@ -60,59 +287,83 @@ msgstr ""
 #. GNU Public  License  and  many  people  are
 #. working on changes to the kernel)
 #. **
-#: components/help/hyperbola-filefmt.c:396
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:537
+#: components/help/hyperbola-filefmt.c:538
+#: components/help/hyperbola-filefmt.c:539
+#: components/help/hyperbola-filefmt.c:541
+#: components/help/hyperbola-filefmt.c:543
 msgid "Manual"
 msgstr "Gebruiksaanwijzing"
 
-#: components/help/hyperbola-filefmt.c:397
-msgid "System"
-msgstr "Systeem"
-
-#: components/help/hyperbola-filefmt.c:397
-msgid "Configuration"
-msgstr "Configuratie"
-
-#: components/help/hyperbola-filefmt.c:397
-msgid "Config files"
-msgstr "Configuratie bestanden"
-
-#: components/help/hyperbola-filefmt.c:398
-#: components/help/hyperbola-filefmt.c:683
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:861 data/linksets/apps.xml.h:1
 msgid "Applications"
 msgstr "Aplicaties"
 
-#: components/help/hyperbola-filefmt.c:398
-msgid "Command Line"
-msgstr "Opdrachtregel"
-
-#: components/help/hyperbola-filefmt.c:399
-#: components/help/hyperbola-filefmt.c:400
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:543
 msgid "Development"
 msgstr "Ontwikkeling"
 
-#: components/help/hyperbola-filefmt.c:399
-#: components/help/hyperbola-filefmt.c:400
-msgid "APIs"
-msgstr "APIs"
-
-#: components/help/hyperbola-filefmt.c:399
-msgid "Miscellaneous"
-msgstr "Diversen"
-
-#: components/help/hyperbola-filefmt.c:400
+#: components/help/hyperbola-filefmt.c:532
 msgid "System Calls"
 msgstr "Systeem aanroepen"
 
-#: components/help/hyperbola-filefmt.c:556
-#: libnautilus-extensions/nautilus-stock-dialogs.c:405
+#: components/help/hyperbola-filefmt.c:534
+msgid "Library Functions"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:536
+#, fuzzy
+msgid "Devices"
+msgstr "Services"
+
+#: components/help/hyperbola-filefmt.c:537
+#, fuzzy
+msgid "Configuration Files"
+msgstr "Configuratie"
+
+#: components/help/hyperbola-filefmt.c:538
+#, fuzzy
+msgid "Games"
+msgstr "Naam"
+
+#: components/help/hyperbola-filefmt.c:539
+#, fuzzy
+msgid "Conventions"
+msgstr "Inhoud:"
+
+#: components/help/hyperbola-filefmt.c:541
+msgid "System Administration"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:543
+msgid "Kernel Routines"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:703
 msgid "Info"
 msgstr "Informatie"
 
-#: components/help/hyperbola-nav-index.c:124
+#: components/help/hyperbola-nav-tree.c:310
+msgid "Introductory Documents:"
+msgstr ""
+
+#: components/help/hyperbola-nav-tree.c:324
+msgid "Documents by Subject:"
+msgstr ""
+
+#: components/help/hyperbola-nav-index.c:121
 msgid "see "
 msgstr "zie "
 
-#: components/help/hyperbola-nav-index.c:128
+#: components/help/hyperbola-nav-index.c:125
 msgid "see also "
 msgstr "zie ook "
 
@@ -120,577 +371,1931 @@ msgstr "zie ook "
 msgid "No matches."
 msgstr "Geen resultaten"
 
-#: components/help/hyperbola-nav-index.c:479
+#: components/help/hyperbola-nav-index.c:476
 msgid " (see \""
 msgstr " (zie\""
 
-#: components/help/hyperbola-nav-index.c:484
+#: components/help/hyperbola-nav-index.c:479
 msgid " (see also \""
 msgstr " (zie ook \""
 
-#: components/image-viewer/nautilus-image-view.c:675
+#: components/help/Nautilus_View_help.oaf.in.h:1
+#: components/services/summary/nautilus-summary-dialogs.c:106
+msgid "Help"
+msgstr "Help"
+
+#: components/help/Nautilus_View_help.oaf.in.h:2
+msgid "Help Index"
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:3
+#, fuzzy
+msgid "Help Index sidebar panel"
+msgstr "Zijbalk bekijker paneel sluiten"
+
+#: components/help/Nautilus_View_help.oaf.in.h:4
+#, fuzzy
+msgid "Help Navigation Tree"
+msgstr "Navigatie"
+
+#: components/help/Nautilus_View_help.oaf.in.h:5
+#, fuzzy
+msgid "Help Search"
+msgstr "Web zoeken"
+
+#: components/help/Nautilus_View_help.oaf.in.h:6
+#, fuzzy
+msgid "Help Search sidebar panel"
+msgstr "Zijbalk bekijker paneel sluiten"
+
+#: components/help/Nautilus_View_help.oaf.in.h:7
+#, fuzzy
+msgid "Help sidebar panel"
+msgstr "Zijkant panelen"
+
+#: components/help/Nautilus_View_help.oaf.in.h:8
+msgid "Internal use only"
+msgstr ""
+
+#: components/history/Nautilus_View_history.oaf.in.h:1
+msgid "Factory for history views"
+msgstr ""
+
+#: components/history/Nautilus_View_history.oaf.in.h:2
+#, fuzzy
+msgid "History"
+msgstr "is vandaag"
+
+#: components/history/Nautilus_View_history.oaf.in.h:3
+#, fuzzy
+msgid "History sidebar panel"
+msgstr "Zijbalk bekijker paneel sluiten"
+
+#: components/history/Nautilus_View_history.oaf.in.h:4
+#, fuzzy
+msgid "History sidebar panel for Nautilus"
+msgstr "Geef Nautilus on-line help weer"
+
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "Kon Bonobo niet initialiseren"
 
-#. Setup the title
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:149
-msgid "Change your Eazel password..."
-msgstr "Verander je Eazel wachtwoord..."
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:1
+msgid "Generic Image Viewer"
+msgstr ""
 
-#. username
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:163
-msgid "User Name: "
-msgstr "Gebruikersnaam: "
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:2
+msgid "Generic image control factory"
+msgstr ""
 
-#. old password
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:182
-msgid "Current password: "
-msgstr "Huidig wachtwoord: "
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:3
+#, fuzzy
+msgid "Image"
+msgstr "Alleen plaatjes"
 
-#. new password
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:193
-msgid "New password: "
-msgstr "Nieuw wachtwoord: "
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:4
+#, fuzzy
+msgid "Image Viewer"
+msgstr "%s bekijker"
 
-#. repeat password
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:204
-msgid "New password (again): "
-msgstr "Nieuw wachtwoord (opnieuw): "
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:5
+#, fuzzy
+msgid "Nautilus Image Viewer"
+msgstr "Nautilus Thema Selecteerder"
 
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:227
-msgid " Change my password! "
-msgstr " Verander mijn wachtwoord! "
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:6
+#, fuzzy
+msgid "Nautilus Image viewer factory"
+msgstr "Nautilus Thema Selecteerder"
 
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:249
-msgid "  I need some help!  "
-msgstr "  Ik heb hulp nodig!  "
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:7
+#, fuzzy
+msgid "View as Image"
+msgstr "Bekijk als %s"
 
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:309
-msgid "Password changed!"
-msgstr "Wachtwoord veranderd!"
+#: components/loser/content/nautilus-content-loser.c:140
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"This is a Nautilus content view that fails on demand."
+msgstr ""
+"%s\n"
+"\n"
+"Dit is een Nautilus inhoudsweergave die faalt op verzoek."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: components/loser/content/nautilus-content-loser-ui.xml.h:7
+#: components/loser/content/nautilus-content-loser.c:189
+msgid "You have tried to kill the Content Loser"
+msgstr "Je hebt getracht de Inhoud bekijker te sluiten"
+
+#: components/loser/content/nautilus-content-loser-ui.xml.h:1
 msgid "Kill Content Loser"
 msgstr "Inhoud Bekijker sluiten"
 
-#: components/loser/content/nautilus-content-loser-ui.xml.h:8
+#: components/loser/content/nautilus-content-loser-ui.xml.h:2
 msgid "Kill the Loser content view"
 msgstr "Inhoud Bekijker aanzicht sluiten"
 
-#: components/loser/content/nautilus-content-loser-ui.xml.h:9
-#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:9
-#: components/mozilla/nautilus-mozilla-ui.xml.h:10
-#: components/sample/nautilus-sample-content-view-ui.xml.h:10
-#: src/nautilus-shell-ui.xml.h:80
+#: components/loser/content/nautilus-content-loser-ui.xml.h:3
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
+#: components/sample/nautilus-sample-content-view-ui.xml.h:4
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "_Bestand"
 
-#: components/loser/content/nautilus-content-loser-ui.xml.h:10
+#: components/loser/content/nautilus-content-loser-ui.xml.h:4
 msgid "_Kill Content Loser"
 msgstr "_Inhoud Bekijker afsluiten"
 
-#: components/loser/content/nautilus-content-loser.c:140
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:1
+#, fuzzy
+msgid "Content Loser"
+msgstr "Inhoud Bekijker sluiten"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:2
+#, fuzzy
+msgid "Content Loser Viewer"
+msgstr "Inhoud Bekijker sluiten"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:3
+#, fuzzy
+msgid "Nautilus Content Loser"
+msgstr "Inhoud Bekijker sluiten"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:4
+msgid "Nautilus content loser component's factory"
+msgstr ""
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:5
+#, fuzzy
+msgid "Nautilus content loser factory"
+msgstr "Nautilus Thema Selecteerder"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:6
+#, fuzzy
+msgid "Nautilus content view that fails on command"
+msgstr ""
+"%s\n"
+"\n"
+"Dit is een Nautilus inhoudsweergave die faalt op verzoek."
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:7
+#, fuzzy
+msgid "View as Content Loser"
+msgstr "Inhoud Bekijker sluiten"
+
+#: components/loser/sidebar/nautilus-sidebar-loser.c:143
 #, c-format
 msgid ""
 "%s\n"
 "\n"
-"This is a Nautilus content view that fails on demand."
+"Loser sidebar."
 msgstr ""
 "%s\n"
 "\n"
-"Dit is een Nautilus inhoudsweergave die faalt op verzoek."
+"Zijbalk bekijker."
 
-#: components/loser/content/nautilus-content-loser.c:189
-msgid "You have tried to kill the Content Loser"
-msgstr "Je hebt getracht de Inhoud bekijker te sluiten"
+#: components/loser/sidebar/nautilus-sidebar-loser.c:192
+msgid "You have tried to kill the Sidebar Loser"
+msgstr "Je hebt getracht de zijbalk bekijker af te sluiten"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:7
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:1
 msgid "Kill Sidebar Loser"
 msgstr "_Zijbalk bekijker sluiten"
 
-#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:8
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:2
 msgid "Kill the Loser sidebar panel"
 msgstr "Zijbalk bekijker paneel sluiten"
 
-#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:10
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:4
 msgid "_Kill Sidebar Loser"
 msgstr "_Zijbalk bekijker sluiten"
 
-#: components/loser/sidebar/nautilus-sidebar-loser.c:143
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus Sidebar Loser"
+msgstr "_Zijbalk bekijker sluiten"
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:2
+msgid "Nautilus sidebar loser component's factory"
+msgstr ""
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:3
+#, fuzzy
+msgid "Nautilus sidebar loser factory"
+msgstr "Nautilus Thema Selecteerder"
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:4
+#, fuzzy
+msgid "Nautilus sidebar view that fails on command"
+msgstr ""
+"%s\n"
+"\n"
+"Dit is een Nautilus inhoudsweergave die faalt op verzoek."
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:5
+#, fuzzy
+msgid "Sidebar Loser"
+msgstr "_Zijbalk bekijker sluiten"
+
+#: components/mozilla/mozilla-preferences.cpp:126
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
-"%s\n"
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf fout:\n"
+"  %s"
+
+#: components/mozilla/mozilla-preferences.cpp:133
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s\n"
+"All further errors shown only on terminal"
+msgstr ""
+"GConf fout:\n"
+"  %s\n"
+"Alle verdere worden alleen in een terminal weergegeven"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:38
+msgid "Arabic"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:39
+#, fuzzy
+msgid "Baltic"
+msgstr "Basis"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:40
+msgid "Central European"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:41
+#, fuzzy
+msgid "Chinese"
+msgstr "Kanalen"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:42
+msgid "Cyrillic"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:43
+msgid "Greek"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:44
+msgid "Hebrew"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:45
+msgid "Japanese"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:46
+#, fuzzy
+msgid "Turkish"
+msgstr "Vuilnisbak"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:47
+msgid "Unicode"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:48
+msgid "UTF"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:49
+#, fuzzy
+msgid "Vietnamese"
+msgstr "Hernoemen"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:50
+#, fuzzy
+msgid "Western"
+msgstr "Registreer"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:55
+msgid "Arabic (IBM-864)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:56
+msgid "Arabic (ISO-8859-6)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:57
+msgid "Arabic (ISO-8859-6-E)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:58
+msgid "Arabic (ISO-8859-6-I)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:59
+msgid "Arabic (Windows-1256)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:60
+msgid "Armenian (ARMSCII-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:61
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:62
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:63
+msgid "Baltic (Windows-1257)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:64
+msgid "Celtic (ISO-8859-14)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:65
+msgid "Central European (IBM-852)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:66
+msgid "Central European (ISO-8859-2)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:67
+msgid "Central European (MacCE)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:68
+msgid "Central European (Windows-1250)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:69
+msgid "Chinese Simplified (GB2312)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:70
+msgid "Chinese Simplified (GBK)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:71
+msgid "Chinese Simplified (HZ)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:72
+msgid "Chinese Traditional (Big5)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:73
+msgid "Chinese Traditional (EUC-TW)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:74
+msgid "Croatian (MacCroatian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:75
+msgid "Cyrillic (IBM-855)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:76
+msgid "Cyrillic (ISO-8859-5)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:77
+msgid "Cyrillic (ISO-IR-111)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:78
+msgid "Cyrillic (MacCyrillic)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:79
+msgid "Cyrillic (Windows-1251)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:80
+msgid "Cyrillic/Russian (IBM-866)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:81
+msgid "Cyrillic/Russian (KOI8-R)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:82
+msgid "Cyrillic/Ukrainian (KOI8-U)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:83
+msgid "Cyrillic/Ukrainian (MacUkrainian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:84
+msgid "English (US-ASCII)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:85
+msgid "Greek (ISO-8859-7)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:86
+msgid "Greek (MacGreek)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:87
+msgid "Greek (Windows-1253)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:88
+msgid "Hebrew (IBM-862)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:89
+msgid "Hebrew (ISO-8859-8-E)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:90
+msgid "Hebrew (ISO-8859-8-I)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:91
+msgid "Hebrew (Windows-1255)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:92
+msgid "Icelandic (MacIcelandic)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:93
+msgid "Japanese (EUC-JP)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:94
+msgid "Japanese (ISO-2022-JP)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:95
+msgid "Japanese (Shift_JIS)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:96
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:97
+msgid "Nordic (ISO-8859-10)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:98
+msgid "Romanian (MacRomanian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:99
+msgid "South European (ISO-8859-3)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:100
+msgid "T.61-8bit"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:101
+msgid "Thai (TIS-620)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:102
+msgid "Turkish (IBM-857)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:103
+msgid "Turkish (ISO-8859-9)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:104
+msgid "Turkish (MacTurkish)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:105
+msgid "Turkish (Windows-1254)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:106
+msgid "Unicode (UTF-7)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:107
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:108
+#, fuzzy
+msgid "User Defined"
+msgstr "Gebruikers map"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:109
+msgid "UTF-16BE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:110
+msgid "UTF-16LE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:111
+msgid "UTF-32BE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:112
+msgid "UTF-32LE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:113
+msgid "Vietnamese (TCVN)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:114
+msgid "Vietnamese (VISCII)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:115
+msgid "Vietnamese (VPS)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:116
+msgid "Vietnamese (Windows-1258)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:117
+msgid "Visual Hebrew (ISO-8859-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:118
+msgid "Western (IBM-850)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:119
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:120
+msgid "Western (ISO-8859-15)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:121
+msgid "Western (MacRoman)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:122
+msgid "Western (Windows-1252)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:123
+msgid "windows-936"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:124
+msgid "x-imap4-modified-utf7"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:125
+msgid "x-u-escaped"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-content-view.c:809
+msgid ""
+"A JavaScript function (small software program) on this page tried to open a "
+"new window, but nautilus does not support the opening of new windows by "
+"JavaScript.\n"
 "\n"
-"Loser sidebar."
+"Try viewing the page in a different web browser, such as Mozilla or Netscape."
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-content-view.c:810
+msgid "Nautilus Mozilla View Warning"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-ui.xml.h:1
+msgid "Charset Encoding"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:1
+#, fuzzy
+msgid "Mozilla Nautilus view"
+msgstr "Sluit alle Nautilus vensters"
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:2
+msgid "Mozilla Nautilus view factory"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:3
+#, fuzzy
+msgid "Mozilla content view component"
 msgstr ""
 "%s\n"
 "\n"
-"Zijbalk bekijker."
+"Dit is een voorbeeld Nautilus bekijk component."
 
-#: components/loser/sidebar/nautilus-sidebar-loser.c:192
-msgid "You have tried to kill the Sidebar Loser"
-msgstr "Je hebt getracht de zijbalk bekijker af te sluiten"
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:4
+msgid "Mozilla content view component's factory"
+msgstr ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: components/mozilla/nautilus-mozilla-ui.xml.h:7
-msgid "Mozilla Test"
-msgstr "Mozilla test"
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:5
+#, fuzzy
+msgid "View as Web Page"
+msgstr "Bekijk als een ander"
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:6
+msgid "Web Page"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:7
+msgid "Web Page Viewer"
+msgstr ""
+
+#: components/music/mpg123.c:29
+#, fuzzy
+msgid "Blues"
+msgstr "Bezig"
+
+#: components/music/mpg123.c:29
+msgid "Classic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:29
+msgid "Country"
+msgstr ""
+
+#: components/music/mpg123.c:29
+#, fuzzy
+msgid "Dance"
+msgstr "Klaar"
+
+#: components/music/mpg123.c:30
+#, fuzzy
+msgid "Disco"
+msgstr "Schijven"
+
+#: components/music/mpg123.c:30
+msgid "Funk"
+msgstr ""
+
+#: components/music/mpg123.c:30
+msgid "Grunge"
+msgstr ""
+
+#: components/music/mpg123.c:30
+msgid "Hip-Hop"
+msgstr ""
+
+#: components/music/mpg123.c:31
+msgid "Jazz"
+msgstr ""
+
+#: components/music/mpg123.c:31
+#, fuzzy
+msgid "Metal"
+msgstr "Details"
+
+#: components/music/mpg123.c:31
+msgid "New Age"
+msgstr ""
+
+#: components/music/mpg123.c:31
+msgid "Oldies"
+msgstr ""
+
+#: components/music/mpg123.c:32
+#, fuzzy
+msgid "Other"
+msgstr "Andere:"
+
+#: components/music/mpg123.c:32
+msgid "Pop"
+msgstr ""
+
+#: components/music/mpg123.c:32
+msgid "R&B"
+msgstr ""
+
+#: components/music/mpg123.c:32
+msgid "Rap"
+msgstr ""
+
+#: components/music/mpg123.c:32
+#, fuzzy
+msgid "Reggae"
+msgstr "Hernoemen"
+
+#: components/music/mpg123.c:33
+msgid "Rock"
+msgstr ""
+
+#: components/music/mpg123.c:33
+msgid "Techno"
+msgstr ""
+
+#: components/music/mpg123.c:33
+#, fuzzy
+msgid "Industrial"
+msgstr "Installeer"
+
+#: components/music/mpg123.c:33
+msgid "Alternative"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Ska"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Death Metal"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Pranks"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Soundtrack"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Euro-Techno"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Ambient"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Trip-Hop"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Vocal"
+msgstr ""
+
+#: components/music/mpg123.c:36
+msgid "Jazz+Funk"
+msgstr ""
+
+#: components/music/mpg123.c:36
+#, fuzzy
+msgid "Fusion"
+msgstr "Vraag"
+
+#: components/music/mpg123.c:36
+#, fuzzy
+msgid "Trance"
+msgstr "Volgen "
+
+#: components/music/mpg123.c:36
+msgid "Classical"
+msgstr ""
+
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "Instrumental"
+msgstr "Installeer"
+
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "Acid"
+msgstr "gekopiëerd"
+
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "House"
+msgstr "Thuis"
+
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "Game"
+msgstr "Naam"
+
+#: components/music/mpg123.c:38
+msgid "Sound Clip"
+msgstr ""
+
+#: components/music/mpg123.c:38
+msgid "Gospel"
+msgstr ""
+
+#: components/music/mpg123.c:38
+#, fuzzy
+msgid "Noise"
+msgstr "Loser"
+
+#: components/music/mpg123.c:38
+msgid "Alt"
+msgstr ""
+
+#: components/music/mpg123.c:39
+#, fuzzy
+msgid "Bass"
+msgstr "Basis"
+
+#: components/music/mpg123.c:39
+#, fuzzy
+msgid "Soul"
+msgstr "dubbel"
+
+#: components/music/mpg123.c:39
+msgid "Punk"
+msgstr ""
+
+#: components/music/mpg123.c:39
+#, fuzzy
+msgid "Space"
+msgstr "Vervangen"
+
+#: components/music/mpg123.c:40
+msgid "Meditative"
+msgstr ""
+
+#: components/music/mpg123.c:40
+msgid "Instrumental Pop"
+msgstr ""
+
+#: components/music/mpg123.c:41
+msgid "Instrumental Rock"
+msgstr ""
+
+#: components/music/mpg123.c:41
+msgid "Ethnic"
+msgstr ""
+
+#: components/music/mpg123.c:41
+#, fuzzy
+msgid "Gothic"
+msgstr "niets"
+
+#: components/music/mpg123.c:42
+msgid "Darkwave"
+msgstr ""
+
+#: components/music/mpg123.c:42
+msgid "Techno-Industrial"
+msgstr ""
+
+#: components/music/mpg123.c:42
+msgid "Electronic"
+msgstr ""
+
+#: components/music/mpg123.c:43
+msgid "Pop-Folk"
+msgstr ""
+
+#: components/music/mpg123.c:43
+msgid "Eurodance"
+msgstr ""
+
+#: components/music/mpg123.c:43
+msgid "Dream"
+msgstr ""
+
+#: components/music/mpg123.c:44
+msgid "Southern Rock"
+msgstr ""
+
+#: components/music/mpg123.c:44
+#, fuzzy
+msgid "Comedy"
+msgstr "Commentaar"
+
+#: components/music/mpg123.c:44
+msgid "Cult"
+msgstr ""
+
+#: components/music/mpg123.c:45
+msgid "Gangsta Rap"
+msgstr ""
+
+#: components/music/mpg123.c:45
+msgid "Top 40"
+msgstr ""
+
+#: components/music/mpg123.c:45
+msgid "Christian Rap"
+msgstr ""
+
+#: components/music/mpg123.c:46
+msgid "Pop/Funk"
+msgstr ""
+
+#: components/music/mpg123.c:46
+#, fuzzy
+msgid "Jungle"
+msgstr "enkel"
+
+#: components/music/mpg123.c:46
+msgid "Native American"
+msgstr ""
+
+#: components/music/mpg123.c:47
+#, fuzzy
+msgid "Cabaret"
+msgstr "Caveat"
+
+#: components/music/mpg123.c:47
+#, fuzzy
+msgid "New Wave"
+msgstr "Nooit"
+
+#: components/music/mpg123.c:47
+msgid "Psychedelic"
+msgstr ""
+
+#: components/music/mpg123.c:47
+#, fuzzy
+msgid "Rave"
+msgstr "Caveat"
+
+#: components/music/mpg123.c:48
+msgid "Showtunes"
+msgstr ""
+
+#: components/music/mpg123.c:48
+#, fuzzy
+msgid "Trailer"
+msgstr "Titel"
+
+#: components/music/mpg123.c:48
+#, fuzzy
+msgid "Lo-Fi"
+msgstr "Login"
+
+#: components/music/mpg123.c:48
+msgid "Tribal"
+msgstr ""
+
+#: components/music/mpg123.c:49
+msgid "Acid Punk"
+msgstr ""
+
+#: components/music/mpg123.c:49
+msgid "Acid Jazz"
+msgstr ""
+
+#: components/music/mpg123.c:49
+#, fuzzy
+msgid "Polka"
+msgstr "Afspelen"
+
+#: components/music/mpg123.c:49
+#, fuzzy
+msgid "Retro"
+msgstr "Opnieuw"
+
+#: components/music/mpg123.c:50
+#, fuzzy
+msgid "Musical"
+msgstr "muziek"
+
+#: components/music/mpg123.c:50
+msgid "Rock & Roll"
+msgstr ""
+
+#: components/music/mpg123.c:50
+msgid "Hard Rock"
+msgstr ""
+
+#: components/music/mpg123.c:50
+msgid "Folk"
+msgstr ""
+
+#: components/music/mpg123.c:51
+msgid "Folk/Rock"
+msgstr ""
+
+#: components/music/mpg123.c:51
+msgid "National Folk"
+msgstr ""
+
+#: components/music/mpg123.c:51
+msgid "Swing"
+msgstr ""
+
+#: components/music/mpg123.c:52
+msgid "Fast-Fusion"
+msgstr ""
+
+#: components/music/mpg123.c:52
+msgid "Bebob"
+msgstr ""
+
+#: components/music/mpg123.c:52
+#, fuzzy
+msgid "Latin"
+msgstr "Lokatie"
+
+#: components/music/mpg123.c:52
+msgid "Revival"
+msgstr ""
+
+#: components/music/mpg123.c:53
+msgid "Celtic"
+msgstr ""
+
+#: components/music/mpg123.c:53
+msgid "Bluegrass"
+msgstr ""
+
+#: components/music/mpg123.c:53
+msgid "Avantgarde"
+msgstr ""
+
+#: components/music/mpg123.c:54
+msgid "Gothic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:54
+#, fuzzy
+msgid "Progressive Rock"
+msgstr "Voortgang"
+
+#: components/music/mpg123.c:55
+msgid "Psychedelic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:55
+msgid "Symphonic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:55
+msgid "Slow Rock"
+msgstr ""
+
+#: components/music/mpg123.c:56
+#, fuzzy
+msgid "Big Band"
+msgstr " en "
+
+#: components/music/mpg123.c:56
+#, fuzzy
+msgid "Chorus"
+msgstr "Kies"
+
+#: components/music/mpg123.c:56
+msgid "Easy Listening"
+msgstr ""
+
+#: components/music/mpg123.c:57
+#, fuzzy
+msgid "Acoustic"
+msgstr "muziek"
+
+#: components/music/mpg123.c:57
+msgid "Humour"
+msgstr ""
+
+#: components/music/mpg123.c:57
+#, fuzzy
+msgid "Speech"
+msgstr "Zoeken"
+
+#: components/music/mpg123.c:57
+#, fuzzy
+msgid "Chanson"
+msgstr "Kanalen"
+
+#: components/music/mpg123.c:58
+#, fuzzy
+msgid "Opera"
+msgstr "_Open"
+
+#: components/music/mpg123.c:58
+msgid "Chamber Music"
+msgstr ""
+
+#: components/music/mpg123.c:58
+#, fuzzy
+msgid "Sonata"
+msgstr "Lettertype"
+
+#: components/music/mpg123.c:58
+msgid "Symphony"
+msgstr ""
+
+#: components/music/mpg123.c:59
+msgid "Booty Bass"
+msgstr ""
+
+#: components/music/mpg123.c:59
+#, fuzzy
+msgid "Primus"
+msgstr "Vorige"
+
+#: components/music/mpg123.c:59
+msgid "Porn Groove"
+msgstr ""
+
+#: components/music/mpg123.c:60
+#, fuzzy
+msgid "Satire"
+msgstr "Stereo"
+
+#: components/music/mpg123.c:60
+msgid "Slow Jam"
+msgstr ""
+
+#: components/music/mpg123.c:60
+msgid "Club"
+msgstr ""
+
+#: components/music/mpg123.c:60
+msgid "Tango"
+msgstr ""
+
+#: components/music/mpg123.c:61
+msgid "Samba"
+msgstr ""
+
+#: components/music/mpg123.c:61
+msgid "Folklore"
+msgstr ""
+
+#: components/music/mpg123.c:61
+msgid "Ballad"
+msgstr ""
+
+#: components/music/mpg123.c:61
+msgid "Power Ballad"
+msgstr ""
 
-#: components/mozilla/nautilus-mozilla-ui.xml.h:8
-msgid "This is a Mozilla merged menu item"
-msgstr "Dit is een geintergreerd Mozilla menu item"
+#: components/music/mpg123.c:62
+msgid "Rhythmic Soul"
+msgstr ""
+
+#: components/music/mpg123.c:62
+msgid "Freestyle"
+msgstr ""
+
+#: components/music/mpg123.c:62
+#, fuzzy
+msgid "Duet"
+msgstr "Verwijderen"
+
+#: components/music/mpg123.c:63
+msgid "Punk Rock"
+msgstr ""
+
+#: components/music/mpg123.c:63
+msgid "Drum Solo"
+msgstr ""
 
-#: components/mozilla/nautilus-mozilla-ui.xml.h:9
-msgid "This is a Mozilla merged tool bar button"
-msgstr "Dit is een geintergreerde Mozilla toolbar knop"
+#: components/music/mpg123.c:63
+msgid "A Cappella"
+msgstr ""
+
+#: components/music/mpg123.c:64
+msgid "Euro-House"
+msgstr ""
+
+#: components/music/mpg123.c:64
+msgid "Dance Hall"
+msgstr ""
+
+#: components/music/mpg123.c:64
+#, fuzzy
+msgid "Goa"
+msgstr "_Ga"
+
+#: components/music/mpg123.c:65
+msgid "Drum & Bass"
+msgstr ""
 
-#: components/mozilla/nautilus-mozilla-ui.xml.h:11
-msgid "_Mozilla Test"
-msgstr "_Mozilla Test"
+#: components/music/mpg123.c:65
+#, fuzzy
+msgid "Club-House"
+msgstr "Sluiten"
+
+#: components/music/mpg123.c:65
+#, fuzzy
+msgid "Hardcore"
+msgstr "zijn mappen"
+
+#: components/music/mpg123.c:66
+#, fuzzy
+msgid "Terror"
+msgstr "Fout"
+
+#: components/music/mpg123.c:66
+msgid "Indie"
+msgstr ""
+
+#: components/music/mpg123.c:66
+msgid "BritPop"
+msgstr ""
+
+#: components/music/mpg123.c:66
+msgid "Negerpunk"
+msgstr ""
+
+#: components/music/mpg123.c:67
+msgid "Polsk Punk"
+msgstr ""
+
+#: components/music/mpg123.c:67
+#, fuzzy
+msgid "Beat"
+msgstr "Caveat"
+
+#: components/music/mpg123.c:67
+msgid "Christian Gangsta Rap"
+msgstr ""
 
-#. FIXME: I think this is not portable. It works in gcc, but not other C compilers.
-#: components/music/nautilus-music-view.c:220
-msgid "Track "
+#: components/music/mpg123.c:68
+msgid "Heavy Metal"
+msgstr ""
+
+#: components/music/mpg123.c:68
+msgid "Black Metal"
+msgstr ""
+
+#: components/music/mpg123.c:68
+msgid "Crossover"
+msgstr ""
+
+#: components/music/mpg123.c:69
+msgid "Contemporary Christian"
+msgstr ""
+
+#: components/music/mpg123.c:69
+msgid "Christian Rock"
+msgstr ""
+
+#: components/music/mpg123.c:70
+msgid "Merengue"
+msgstr ""
+
+#: components/music/mpg123.c:70
+msgid "Salsa"
+msgstr ""
+
+#: components/music/mpg123.c:70
+#, fuzzy
+msgid "Thrash Metal"
+msgstr "Vuilnisbak Instellingen"
+
+#: components/music/mpg123.c:71
+#, fuzzy
+msgid "Anime"
+msgstr "Tijd "
+
+#: components/music/mpg123.c:71
+msgid "JPop"
+msgstr ""
+
+#: components/music/mpg123.c:71
+#, fuzzy
+msgid "Synthpop"
+msgstr "Stop"
+
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Track"
 msgstr "Volgen "
 
-#: components/music/nautilus-music-view.c:220
+#: components/music/nautilus-music-view.c:238
 msgid "Title"
 msgstr "Titel"
 
-#: components/music/nautilus-music-view.c:220
+#: components/music/nautilus-music-view.c:238
 msgid "Artist"
 msgstr "Artiest"
 
-#: components/music/nautilus-music-view.c:220
+#: components/music/nautilus-music-view.c:238
 msgid "Year"
 msgstr "Jaar"
 
-#: components/music/nautilus-music-view.c:220
-msgid "Bitrate "
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Bit Rate"
 msgstr "Bitrate "
 
-#: components/music/nautilus-music-view.c:220
-msgid "Time "
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Time"
 msgstr "Tijd "
 
-#: components/music/nautilus-music-view.c:220
+#: components/music/nautilus-music-view.c:238
 msgid "Album"
 msgstr "Album"
 
-#: components/music/nautilus-music-view.c:220
+#: components/music/nautilus-music-view.c:238
 msgid "Comment"
 msgstr "Commentaar"
 
-#: components/music/nautilus-music-view.c:220
+#: components/music/nautilus-music-view.c:238
 msgid "Channels"
 msgstr "Kanalen"
 
-#: components/music/nautilus-music-view.c:220
+#: components/music/nautilus-music-view.c:238
 msgid "Sample Rate"
 msgstr "Sample Ratio"
 
-#: components/music/nautilus-music-view.c:319
+#: components/music/nautilus-music-view.c:350
 msgid "Set Cover Image"
 msgstr "Stel Cover Afbeelding in"
 
-#: components/music/nautilus-music-view.c:478
+#: components/music/nautilus-music-view.c:694
 #, c-format
 msgid "Sorry, but '%s' is not a usable image file."
 msgstr "Sorry, maar '%s' is geen bruikbare afbeelding!"
 
-#: components/music/nautilus-music-view.c:480
-#: src/nautilus-property-browser.c:905 src/nautilus-property-browser.c:1000
+#: components/music/nautilus-music-view.c:696
+#: src/nautilus-property-browser.c:1060 src/nautilus-property-browser.c:1312
 msgid "Not an Image"
 msgstr "Geen plaatje"
 
-#: components/music/nautilus-music-view.c:528
+#: components/music/nautilus-music-view.c:744
 msgid "Select an image file for the album cover:"
 msgstr "Selecteer een afbeelding voor de album cover:"
 
-#: components/music/nautilus-music-view.c:999
+#: components/music/nautilus-music-view.c:1174
+msgid ""
+"Sorry, but the music view is unable to play back sound right now. Either "
+"another program is using or blocking the sound card, or your sound card is "
+"not configured properly. Try quitting any applications that may be blocking "
+"use of the sound card."
+msgstr ""
+
+#: components/music/nautilus-music-view.c:1178
+msgid "Unable to Play File"
+msgstr ""
+
+#: components/music/nautilus-music-view.c:1199
 msgid "Sorry, but the music view can't play non-local files yet."
 msgstr ""
 "Sorry, maar de muziek modus kan nog geen niet-lokale bestanden afspelen."
 
-#: components/music/nautilus-music-view.c:1000
+#: components/music/nautilus-music-view.c:1200
 msgid "Can't Play Remote Files"
 msgstr "Kan geen Remote bestanden afspelen"
 
-#: components/music/nautilus-music-view.c:1318
+#: components/music/nautilus-music-view.c:1486
 msgid "Drag to seek within track"
 msgstr "Sleep om te zoeken in het spoor"
 
-#: components/music/nautilus-music-view.c:1341
-msgid "Previous"
-msgstr "Vorige"
-
-#: components/music/nautilus-music-view.c:1356
+#: components/music/nautilus-music-view.c:1526
 msgid "Play"
 msgstr "Afspelen"
 
-#: components/music/nautilus-music-view.c:1371
+#: components/music/nautilus-music-view.c:1540
 msgid "Pause"
 msgstr "Pauze"
 
-#: components/music/nautilus-music-view.c:1385
-#: libnautilus-extensions/nautilus-file-operations.c:408
-#: libnautilus-extensions/nautilus-file-operations.c:426
-#: libnautilus-extensions/nautilus-file-operations.c:444
-#: src/nautilus-shell-ui.xml.h:61
+#: components/music/nautilus-music-view.c:1554
+#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Stop"
 
-#: components/music/nautilus-music-view.c:1399
-msgid "Next"
-msgstr "Volgende"
-
-#: components/music/nautilus-music-view.c:1412
-msgid "Sound hardware missing or busy!"
-msgstr "Geluidsapparatuur ontbreekt of is bezet!"
-
-#: components/music/nautilus-music-view.c:1517
+#: components/music/nautilus-music-view.c:1679
 #, c-format
 msgid "Sorry, but there was an error reading %s."
 msgstr "Sorry, maar een fout is opgetreden bij het lezen van %s."
 
-#: components/music/nautilus-music-view.c:1518
+#: components/music/nautilus-music-view.c:1680
 msgid "Can't Read Folder"
 msgstr "Kan map niet lezen"
 
-#: components/music/nautilus-music-view.c:1594
+#: components/music/nautilus-music-view.c:1750
 msgid "Stereo"
 msgstr "Stereo"
 
-#: components/music/nautilus-music-view.c:1594
+#: components/music/nautilus-music-view.c:1750
 msgid "Mono"
 msgstr "Mono"
 
-#: components/music/nautilus-music-view.c:1637
-#, c-format
-msgid "%s by %s"
+#: components/music/nautilus-music-view.c:1792
+#, fuzzy, c-format
+msgid "%s - %s"
 msgstr "%s bij %s"
 
-#. set up the window title
-#: components/rpmview/nautilus-rpm-verify-window.c:182
-#, c-format
-msgid "Verifying %s..."
-msgstr "Controleren %s..."
-
-#: components/rpmview/nautilus-rpm-view-install.c:107
-#, c-format
-msgid "%s would not work anymore\n"
-msgstr "%s werkt niet langer\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:110
-#, c-format
-msgid "%s would break other installed packages\n"
-msgstr "%s breekt met de andere geinstalleerde paketten\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:115
-#, c-format
-msgid "%s is needed, but could not be found\n"
-msgstr "%s is nodig, maar kon niet gevonden worden\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:120
-#, c-format
-msgid "%s was already installed\n"
-msgstr "%s is al geinstalleerd\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:123
-#, c-format
-msgid "%s causes a circular dependency problem\n"
-msgstr "%s zorgt voor een circulair afhankelijkheids probleem\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:142
-#, c-format
-msgid "Installing %s failed because of the following issue(s):\n"
-msgstr "Installatie van %s faalde vanwege de volgende zaken:\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:144
-#, c-format
-msgid "Uninstalling %s failed because of the following issue(s):\n"
-msgstr "Deinstallatie van %s faalde vanwege de volgende zaken:\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:241
-msgid "Uninstall failed..."
-msgstr "Deinstallatie faalde..."
-
-#: components/rpmview/nautilus-rpm-view-install.c:242
-msgid "Uninstall Failed"
-msgstr "Deinstallatie faalde"
-
-#: components/rpmview/nautilus-rpm-view-install.c:244
-msgid "Install failed..."
-msgstr "Installatie faalde"
-
-#: components/rpmview/nautilus-rpm-view-install.c:245
-msgid "Install Failed"
-msgstr "Installatie faalde"
-
-#: components/rpmview/nautilus-rpm-view-install.c:297
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1112
-msgid "Incorrect password."
-msgstr "Verkeerd wachtwoord."
-
-#: components/rpmview/nautilus-rpm-view.c:146
-msgid "Package Contents"
-msgstr "Pakket inhoud"
-
-#. allocate the name field
-#: components/rpmview/nautilus-rpm-view.c:189
-msgid "Package Title"
-msgstr "Pakket titel"
-
-#: components/rpmview/nautilus-rpm-view.c:212
-msgid "Size: "
-msgstr "Omvang: "
-
-#: components/rpmview/nautilus-rpm-view.c:218
-msgid "<size>"
-msgstr "<size>"
-
-#: components/rpmview/nautilus-rpm-view.c:224
-msgid "Install Date: "
-msgstr "Installatie Datum: "
-
-#: components/rpmview/nautilus-rpm-view.c:230
-#: components/rpmview/nautilus-rpm-view.c:242
-#: components/rpmview/nautilus-rpm-view.c:254
-#: components/rpmview/nautilus-rpm-view.c:266
-#: components/rpmview/nautilus-rpm-view.c:278
-msgid "<unknown>"
-msgstr "<onbekend>"
-
-#: components/rpmview/nautilus-rpm-view.c:236
-msgid "License: "
-msgstr "Licentie: "
-
-#: components/rpmview/nautilus-rpm-view.c:248
-msgid "Build Date: "
-msgstr "Bouw Datum: "
-
-#: components/rpmview/nautilus-rpm-view.c:260
-msgid "Distribution: "
-msgstr "Distributie: "
-
-#: components/rpmview/nautilus-rpm-view.c:272
-msgid "Vendor: "
-msgstr "Maker: "
+#: components/music/Nautilus_View_music.oaf.in.h:1
+msgid "Factory for music view"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:305
-msgid "Install"
-msgstr "Installeer"
+#: components/music/Nautilus_View_music.oaf.in.h:2
+#, fuzzy
+msgid "Music"
+msgstr "muziek"
 
-#: components/rpmview/nautilus-rpm-view.c:321
-msgid "Update"
-msgstr "Opwaarderen"
+#: components/music/Nautilus_View_music.oaf.in.h:3
+#, fuzzy
+msgid "Music Viewer"
+msgstr "%s bekijker"
 
-#: components/rpmview/nautilus-rpm-view.c:330
-msgid "Uninstall"
-msgstr "Deinstalleer"
+#: components/music/Nautilus_View_music.oaf.in.h:4
+msgid "Music view"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:346
-msgid "Verify"
-msgstr "Controleer"
+#: components/music/Nautilus_View_music.oaf.in.h:5
+msgid "Music view factory"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:382
-msgid "Go to selected file"
-msgstr "Ga naar het geselecteerde bestand"
+#: components/music/Nautilus_View_music.oaf.in.h:6
+#, fuzzy
+msgid "View as Music"
+msgstr "Bekijk als %s"
 
-#. add the description
-#: components/rpmview/nautilus-rpm-view.c:393
-msgid "Description"
-msgstr "Omschrijving"
+#: components/notes/Nautilus_View_notes.oaf.in.h:1
+msgid "Factory for annotation view"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:631
-#, c-format
-msgid "Package Contents: %d files"
-msgstr "Pakket inhoud: %d bestanden"
+#: components/notes/Nautilus_View_notes.oaf.in.h:3
+#, fuzzy
+msgid "Notes sidebar panel"
+msgstr "Zijbalk bekijker paneel sluiten"
 
-#: components/rpmview/nautilus-rpm-view.c:643
-#, c-format
-msgid "Package \"%s\" "
-msgstr "Pakket \"%s\" "
+#: components/notes/Nautilus_View_notes.oaf.in.h:4
+#, fuzzy
+msgid "Notes sidebar panel for Nautilus"
+msgstr "Geef Nautilus on-line help weer"
 
-#: components/rpmview/nautilus-rpm-view.c:708
-#, c-format
-msgid "version %s-%s"
-msgstr "versie %s-%s"
+#: components/sample/nautilus-sample-content-view.c:136
+msgid "(none)"
+msgstr "(geen)"
 
-#: components/rpmview/nautilus-rpm-view.c:865
+#: components/sample/nautilus-sample-content-view.c:189
 #, c-format
-msgid "checking %s..."
-msgstr "controleren %s..."
+msgid ""
+"%s\n"
+"\n"
+"This is a sample Nautilus content view component."
+msgstr ""
+"%s\n"
+"\n"
+"Dit is een voorbeeld Nautilus bekijk component."
 
-#: components/rpmview/nautilus-rpm-view.c:867
+#: components/sample/nautilus-sample-content-view.c:252
 #, c-format
-msgid "file %s has an error!"
-msgstr "bestand %s heeft een fout!"
-
-#: components/rpmview/nautilus-rpm-view.c:885
-msgid "Verification completed."
-msgstr "Controle compleet"
+msgid ""
+"%s\n"
+"\n"
+"You clicked the Sample toolbar button."
+msgstr ""
+"%s\n"
+"\n"
+"U klikte op de voorbeeld toolbar knop."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: components/sample/nautilus-sample-content-view-ui.xml.h:7
+#: components/sample/Nautilus_View_sample.oaf.in.h:3
+#: components/sample/nautilus-sample-content-view-ui.xml.h:1
+#: components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in.h:2
 msgid "Sample"
 msgstr "Voorbeeld"
 
-#: components/sample/nautilus-sample-content-view-ui.xml.h:8
+#: components/sample/nautilus-sample-content-view-ui.xml.h:2
 msgid "This is a sample merged menu item"
 msgstr "Dit is een voorbeeld van een verweven menucomponent"
 
-#: components/sample/nautilus-sample-content-view-ui.xml.h:9
-msgid "This is a sample merged tool bar button"
+#: components/sample/nautilus-sample-content-view-ui.xml.h:3
+#, fuzzy
+msgid "This is a sample merged toolbar button"
 msgstr "Dit is een voorbeeld van een geintergreerde toolbar knop"
 
-#: components/sample/nautilus-sample-content-view-ui.xml.h:11
+#: components/sample/nautilus-sample-content-view-ui.xml.h:5
 msgid "_Sample"
 msgstr "_Voorbeeld"
 
-#: components/sample/nautilus-sample-content-view.c:83
-msgid "(none)"
-msgstr "(geen)"
+#: components/sample/Nautilus_View_sample.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus Sample view"
+msgstr "Nautilus Thema:"
 
-#: components/sample/nautilus-sample-content-view.c:145
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"This is a sample Nautilus content view component."
+#: components/sample/Nautilus_View_sample.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Sample view factory"
+msgstr "Nautilus Thema Selecteerder"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:4
+#, fuzzy
+msgid "Sample Viewer"
+msgstr "Sample Ratio"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:5
+#, fuzzy
+msgid "Sample content view component"
 msgstr ""
 "%s\n"
 "\n"
 "Dit is een voorbeeld Nautilus bekijk component."
 
-#: components/sample/nautilus-sample-content-view.c:203
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"You clicked the Sample toolbar button."
+#: components/sample/Nautilus_View_sample.oaf.in.h:6
+#, fuzzy
+msgid "Sample content view component's factory"
 msgstr ""
 "%s\n"
 "\n"
-"U klikte op de voorbeeld toolbar knop."
+"Dit is een voorbeeld Nautilus bekijk component."
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:7
+#, fuzzy
+msgid "View as Sample"
+msgstr "Bekijk als een ander"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:89
+#: components/services/install/command-line/eazel-alt-install-corba.c:107
 msgid "Set the default answer to continue, also default delete to Yes"
 msgstr ""
 "Stel het standaardantwoord in om verder te gaan, zet ook standaard "
 "verwijderen naar Ja"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:90
+#: components/services/install/command-line/eazel-alt-install-corba.c:108
+#, fuzzy
+msgid "Specify search cgi"
+msgstr "Specificeer server"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
+#: components/services/install/command-line/eazel-test-packsys.c:590
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "Laat debug uitvoer zien"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:91
+#: components/services/install/command-line/eazel-alt-install-corba.c:110
 msgid "10 sec delay after starting service"
 msgstr "10 seconden wachten na het starten van de service"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:92
+#: components/services/install/command-line/eazel-alt-install-corba.c:111
 msgid "Allow downgrades"
 msgstr "Sta downgrades toe"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:93
+#: components/services/install/command-line/eazel-alt-install-corba.c:112
 msgid "Erase packages"
 msgstr "Haal pakketten weg"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:94
+#: components/services/install/command-line/eazel-alt-install-corba.c:113
+#, fuzzy
+msgid "enable ei2"
+msgstr "Zet debugging aan"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:114
 msgid "RPM args are filename"
 msgstr "RPM argumenten zijn een bestandsnaam"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:95
-msgid "Force install"
-msgstr "Forceer installatie"
-
-#: components/services/install/command-line/eazel-alt-install-corba.c:96
+#: components/services/install/command-line/eazel-alt-install-corba.c:115
 msgid "Use ftp"
 msgstr "Gebruik ftp"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:97
+#: components/services/install/command-line/eazel-alt-install-corba.c:116
 msgid "Use local"
 msgstr "Gebruik lokaal"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:98
+#: components/services/install/command-line/eazel-alt-install-corba.c:117
 msgid "Use http"
 msgstr "Gebruik http"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:99
+#: components/services/install/command-line/eazel-alt-install-corba.c:118
 msgid "RPM args are Eazel Ids"
 msgstr "RPM argumenten zijn Eazel Ids"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:100
+#: components/services/install/command-line/eazel-alt-install-corba.c:119
+msgid "machine readable output"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:120
+msgid "Don't print fancy percent output"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:121
+msgid "don't use eazel auth stuff"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:122
 msgid "Specify package file"
 msgstr "Specificeer een pakket bestand"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:101
-msgid "Set port numer (80)"
-msgstr "Zet het poort nummer (80)"
-
-#: components/services/install/command-line/eazel-alt-install-corba.c:102
+#: components/services/install/command-line/eazel-alt-install-corba.c:123
 msgid "RPM args are needed files"
 msgstr "RPM argumenten zijn benodigde bestanden"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:103
+#: components/services/install/command-line/eazel-alt-install-corba.c:124
 msgid "Run Query"
 msgstr "Start een zoekopdracht"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:104
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
 msgid "Revert"
 msgstr "Ongedaan maken"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:105
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr "Zet als root"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:106
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "Specificeer server"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:107
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
+msgid "Dont print too much, just problems and download"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr "Voer ssl hernoeming uit"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:108
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
+msgid "argument is a suite id"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "Test draai"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:109
-msgid "Set tmp dir (/tmp)"
-msgstr "Zet de tmp map (/tmp)"
-
-#: components/services/install/command-line/eazel-alt-install-corba.c:110
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr "Sta gebruikersnamen toe"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:111
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "Sta opwaarderingen toe"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:112
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "Laat de uitvoer zien"
 
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#, fuzzy
+msgid "Install a specific package version"
+msgstr "Installeren pakket %s ..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
+msgid "*** You cannot specify more then one protocol type.\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
+msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
+#, fuzzy, c-format
+msgid "File conflict checking %s...\n"
+msgstr "controleren %s..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
+#, fuzzy, c-format
+msgid "File uniqueness checking %s...\n"
+msgstr "controleren %s..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
+#, c-format
+msgid "Feature consistency checking %s...\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
+#, c-format
+msgid "Downloading %s..."
+msgstr "Ophalen %s..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
+msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
+#, fuzzy
+msgid "Downloading %s... (%d/%d) = %d%%"
+msgstr "Ophalen %s..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
+#, c-format
+msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
+#, fuzzy, c-format
+msgid "Downloading %s... %3.1f KB/s Done\n"
+msgstr "Ophalen %s..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
+msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
+msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
+#, fuzzy
+msgid "Done\n"
+msgstr "Klaar"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
+#, c-format
+msgid "Download of %s FAILED\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
+#, fuzzy, c-format
+msgid "Package %s failed to uninstall.\n"
+msgstr "Dit pakket is reeds geinstalleerd."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
+#, fuzzy, c-format
+msgid "Package %s failed to install.\n"
+msgstr "Dit pakket is reeds geinstalleerd."
+
+#. I18N note: \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
+#, c-format
+msgid "\t· Problem : %s\n"
+msgstr ""
+
+#. I18N note: \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
+#, c-format
+msgid "\t· Action : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
+#, fuzzy
+msgid "Cancelling operation\n"
+msgstr "Geldige operaties:"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
+#, fuzzy, c-format
+msgid "About to install a total of %d packages, %dKB\n"
+msgstr ""
+"Ik ga de volgende pakketten installeren:\n"
+"\n"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
+#, fuzzy, c-format
+msgid "About to uninstall a total of %d packages, %dKB\n"
+msgstr ""
+"Ik ga de volgende pakketten installeren:\n"
+"\n"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
+#, c-format
+msgid "About to revert a total of %d packages, %d KB\n"
+msgstr ""
+
+#. I18N note: %s is a package name, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
+#, c-format
+msgid "\t· %s and it's dependencies\n"
+msgstr ""
+
+#. I18N note: %s is a package name, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
+#, c-format
+msgid "\t· %s\n"
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n) " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
+msgid "Save transaction report ? (y/n) "
+msgstr ""
+
+#. I18N note: y is the letter for the word Yes. This is
+#. used in the response for a yes/no questions. Your translation
+#. must be 1 character only.
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
+msgid "y"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
+#, fuzzy, c-format
+msgid "Dependency : %s needs %s\n"
+msgstr "Controleren afhankelijkheden: Pakket %s heeft %s nodig"
+
+#. I18N note: %s is a package name
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
+#, c-format
+msgid "Package %s failed md5 check!\n"
+msgstr ""
+
+#. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
+#, c-format
+msgid "\t· server MD5 checksum is %s\n"
+msgstr ""
+
+#. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
+#, c-format
+msgid "\t· actual MD5 checksum is %s\n"
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
+msgid "Continue? (y/n) "
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
+msgid "Should I delete the RPM files? (y/n) "
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
+msgid "Operation ok\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
+#, fuzzy
+msgid "Operation failed\n"
+msgstr "Installatie mislukt!"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
+#, fuzzy
+msgid "Installing"
+msgstr "Installeer"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
+#, fuzzy
+msgid "Uninstalling"
+msgstr "Deinstalleer"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
+msgid "Only one operation at a time please."
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
+#, c-format
+msgid "%s: --help for usage\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
+#, c-format
+msgid "Name         : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#, fuzzy, c-format
+msgid "Version      : %s\n"
+msgstr "Versie: %s"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#, c-format
+msgid "Minor        : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
+#, c-format
+msgid "Size         : %d\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#, c-format
+msgid "Arch         : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#, fuzzy, c-format
+msgid "Distribution : %s\n"
+msgstr "Distributie: "
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#, fuzzy, c-format
+msgid "Description  : %s\n"
+msgstr "Omschrijving"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
+#, fuzzy, c-format
+msgid "Install root : %s\n"
+msgstr "Installatie Datum: "
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
+msgid "Provides     : \n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
+#, c-format
+msgid "exit code %d\n"
+msgstr ""
+
 #: components/services/install/command-line/eazel-gen-xml.c:41
 msgid "Specify package list to use (/var/eazel/service/package-list.xml)"
 msgstr ""
@@ -703,548 +2308,792 @@ msgstr ""
 "Het gebruik van een specifiek bestand voor om een pakketenlijst te maken "
 "heeft de --packagelist optie nodig"
 
-#: components/services/install/lib/eazel-install-logic.c:187
-#, c-format
-msgid "Reading the install package list %s"
-msgstr "Leest de installatie pakketlijst %s"
+#: components/services/install/command-line/eazel-test-softcat.c:54
+msgid "Softcat server to connect to"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:266
-#, c-format
-msgid "Will download %s"
-msgstr "Zal %s ophalen"
+#: components/services/install/command-line/eazel-test-softcat.c:55
+msgid "Use alternate CGI path"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:281
-#, c-format
-msgid "%s already installed"
-msgstr "%s al geinstalleerd"
+#: components/services/install/command-line/eazel-test-softcat.c:57
+msgid "Connect as a softcat user through ammonite"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:453
-#, c-format
-msgid "Category = %s"
-msgstr "Categorie = %s"
+#: components/services/install/command-line/eazel-test-softcat.c:58
+msgid "Number of times to try the request"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:729
-#, c-format
-msgid "Could not create transaction directory (%s)! ***\n"
-msgstr "Kon geen transactie map maken (%s)! ***\n"
+#: components/services/install/command-line/eazel-test-softcat.c:59
+msgid "Delay between request retries, in usec"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:752
-#, c-format
-msgid "Writing transaction to %s"
-msgstr "Schrijf transactie naar %s"
+#: components/services/install/command-line/eazel-test-softcat.c:60
+msgid "Lookup by Eazel package id"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:61
+msgid "Lookup package that features a feature/file"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:62
+msgid "Lookup package with a specific version"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:63
+msgid "(with --version) Use >= comparison"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:64
+msgid "use check function (for debugging)"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:987
+#: components/services/install/command-line/eazel-test-softcat.c:65
+msgid "Show detailed sub-package info"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:66
+msgid "enable funk parser"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "Faalde bij het vergrendelen van het opgehaalde bestand"
 
-#: components/services/install/lib/eazel-install-logic.c:1002
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "MD5 niet gelijk, pakket %s is misschien niet goed"
 
-#: components/services/install/lib/eazel-install-logic.c:1084
-#, c-format
-msgid "Preflight (%ld bytes, %ld packages)"
-msgstr "Preflight (%ld bytes, %ld pakketten)"
-
-#: components/services/install/lib/eazel-install-logic.c:1252
-#, c-format
-msgid "Removing package %s (0x%x) %s"
-msgstr "Pakket %s word verwijdert (0x%x) %s"
+#: components/services/install/lib/eazel-install-logic2.c:150
+#, fuzzy, c-format
+msgid "No MD5 available for %s"
+msgstr "Geen informatie beschikbaar voor het %s thema"
 
-#: components/services/install/lib/eazel-install-logic.c:1361
-msgid "Preparing package system"
-msgstr "Maakt het pakketsysteem gereed"
+#. I18N note: "%is is ok" in the sense that %s=package name and the
+#. package is intact
+#: components/services/install/lib/eazel-install-logic2.c:356
+#, fuzzy, c-format
+msgid "%s is ok"
+msgstr "Is dit goed ?"
 
-#: components/services/install/lib/eazel-install-logic.c:1478
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s versie %s-%s al geinstalleerd"
 
-#: components/services/install/lib/eazel-install-logic.c:1482
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s versie %s al geinstalleerd"
 
-#: components/services/install/lib/eazel-install-logic.c:1491
-#: components/services/install/lib/eazel-install-logic.c:1496
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr "%s opwaarderingen van versie %s-%s naar %s-%s"
 
-#: components/services/install/lib/eazel-install-logic.c:1505
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr "%s wordt geafwaardeerd van versie %s-%s naar %s-%s"
 
-#: components/services/install/lib/eazel-install-logic.c:1510
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr "%s wordt gedowngrade van versie %s naar %s"
 
-#: components/services/install/lib/eazel-install-logic.c:1532
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr "%s installeert versie %s-%s"
 
-#: components/services/install/lib/eazel-install-logic.c:1537
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr "%s installeert versie %s"
 
-#: components/services/install/lib/eazel-install-logic.c:2134
-msgid "Dependencies appear ok"
-msgstr "Benodigheden lijken goed"
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
+#, fuzzy, c-format
+msgid "Loading package info from file %s"
+msgstr "Ophalen pakket %s"
+
+#. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
+#: components/services/install/lib/eazel-install-logic2.c:1197
+msgid "ok"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:1197
+msgid "not ok"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:1363
+#, c-format
+msgid "Checking dependencies for %s"
+msgstr ""
+
+#. I18N note: both %s' are package names.
+#. related is in the sense that the two packages apparently
+#. are connected somehow, eg. foo and foo-devel
+#: components/services/install/lib/eazel-install-logic2.c:2014
+#, fuzzy, c-format
+msgid "%s is related to %s"
+msgstr "\"%s\" geselecteerd (%s)"
+
+#: components/services/install/lib/eazel-install-logic2.c:2090
+#, c-format
+msgid "updating %s to version %s-%s solves conflict"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2113
+#, c-format
+msgid "available update to %s (%s-%s) does not solves conflict"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2128
+#, fuzzy, c-format
+msgid "could not revive %s"
+msgstr "Kon geen URL ontvangen voor %s"
+
+#: components/services/install/lib/eazel-install-logic2.c:2284
+#, c-format
+msgid "file uniqueness checking %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:2137
-msgid "But there are file conflicts"
+#: components/services/install/lib/eazel-install-logic2.c:2305
+#, c-format
+msgid "Duplicate file : %s occurs in %s and %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
+msgid "... but it's ok, the packages are related"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2324
+#, fuzzy, c-format
+msgid "(there were %d other conflicts)"
 msgstr "Maar er zijn bestands conflicten"
 
-#: components/services/install/lib/eazel-install-metadata.c:171
+#: components/services/install/lib/eazel-install-logic2.c:2419
+#, c-format
+msgid "file conflict checking %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2456
+#, c-format
+msgid "file conflict : package %s already provides file %s also provided by %s"
+msgstr ""
+
+#. the owner of this file is a package that we're upgrading, and the
+#. * new version no longer has this file, so everything's okay.
+#: components/services/install/lib/eazel-install-logic2.c:2466
+#, c-format
+msgid "...but it is okay, we're upgrading %s and it ditched that file"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2558
+#, c-format
+msgid "checking feature consistency of %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2626
+#, c-format
+msgid ""
+"feature missing : %s breaks if %s is installed (feature %s would be lost"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2705
+#, fuzzy, c-format
+msgid "downloading %d packages"
+msgstr "Ophalen pakket %s"
+
+#: components/services/install/lib/eazel-install-logic2.c:2951
+#, fuzzy, c-format
+msgid "will upgrade %s"
+msgstr "Sta opwaarderingen toe"
+
+#: components/services/install/lib/eazel-install-logic2.c:2954
+#, fuzzy, c-format
+msgid "will downgrade %s"
+msgstr "Zal %s ophalen"
+
+#: components/services/install/lib/eazel-install-logic2.c:2957
+#, fuzzy, c-format
+msgid "will install %s"
+msgstr "Installeren \"%s\""
+
+#: components/services/install/lib/eazel-install-logic2.c:2960
+#, fuzzy, c-format
+msgid "will uninstall %s"
+msgstr "Deinstalleer"
+
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
+#, c-format
+msgid "%s requires %s"
+msgstr "%s heeft %s nodig"
+
+#: components/services/install/lib/eazel-install-logic2.c:3238
+#, fuzzy, c-format
+msgid "failed %s"
+msgstr "zijn %s"
+
+#: components/services/install/lib/eazel-install-metadata.c:174
 msgid "Could not set URLType from config file!"
 msgstr "Kan het URLtype niet lezen uit het configuratie bestand"
 
-#: components/services/install/lib/eazel-install-object.c:582
+#: components/services/install/lib/eazel-install-object.c:717
+msgid "Transactions are not stored, could not find home dir"
+msgstr "Transacties worden niet opgeslagen, kon home directory niet vinden"
+
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr "Transacties worden opgeslagen in %s"
 
-#: components/services/install/lib/eazel-install-object.c:585
-msgid "Transactions are not stored, could not find home dir"
-msgstr "Transacties worden niet opgeslagen, kon home directory niet vinden"
-
-#: components/services/install/lib/eazel-install-object.c:772
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "Bezig met ophalen pakketlijst van de server ...\n"
 
-#: components/services/install/lib/eazel-install-object.c:792
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "kan package-list.xml niet ontvangen!\n"
 
-#: components/services/install/lib/eazel-install-object.c:863
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr ""
 "Kan niet naar bestand %s schrijven bij het gebruik van de standaard log "
 "afhandelaar"
 
-#: components/services/install/lib/eazel-install-object.c:983
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "Installatie faalde"
 
-#: components/services/install/lib/eazel-install-object.c:1026
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "Deinstallatie faalde"
 
-#: components/services/install/lib/eazel-install-protocols.c:126
-#: components/services/install/lib/eazel-install-protocols.c:229
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
-msgid "Downloading %s..."
-msgstr "Ophalen %s..."
+msgid "Could not create transaction directory (%s)! ***\n"
+msgstr "Kon geen transactie map maken (%s)! ***\n"
 
-#: components/services/install/lib/eazel-install-protocols.c:137
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:421
+#: components/services/install/lib/eazel-install-object.c:1429
+#, c-format
+msgid "Writing transaction to %s"
+msgstr "Schrijf transactie naar %s"
+
+#: components/services/install/lib/eazel-install-problem.c:163
+#, fuzzy, c-format
+msgid "%s was cancelled"
+msgstr "%s is al geinstalleerd\n"
+
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
+#, fuzzy, c-format
+msgid "%s is a source package, which is not yet supported"
+msgstr "%s %s: source pakket (niet ondersteund)\n"
+
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
+#, fuzzy, c-format
+msgid "%s would break other packages"
+msgstr "%s breekt met de andere geinstalleerde paketten\n"
+
+#: components/services/install/lib/eazel-install-problem.c:185
+#, c-format
+msgid "%s would break"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:191
+#, c-format
+msgid "%s would break %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:197
+#, c-format
+msgid "%s is damaged"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:201
+#, c-format
+msgid "%s requires %s, which could not be found on the server"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:204
+#, c-format
+msgid "%s for %s could not be found on the server"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
+#, fuzzy, c-format
+msgid "%s is already installed"
+msgstr "%s al geinstalleerd"
+
+#: components/services/install/lib/eazel-install-problem.c:259
+#, c-format
+msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:263
+#, c-format
+msgid "%s, which is older, needs upgrade and upgrade is not enabled"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:353
+#, fuzzy, c-format
+msgid "%s is not installed and could not be found on server"
+msgstr "%s is nodig, maar kon niet gevonden worden\n"
+
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. %s is a package name or filename
+#: components/services/install/lib/eazel-install-problem.c:920
+#, c-format
+msgid "Check for a new version of %s"
+msgstr ""
+
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. both %s's are package names or filenames
+#: components/services/install/lib/eazel-install-problem.c:931
+#, c-format
+msgid "Install both %s and %s"
+msgstr ""
+
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. %s is a package name or filename
+#: components/services/install/lib/eazel-install-problem.c:946
+#, c-format
+msgid "Remove %s from your system"
+msgstr ""
+
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. %s is a package name or filename. "Force" is in the rpm sense of force,
+#. meaning that no dependency checking etc will be done
+#: components/services/install/lib/eazel-install-problem.c:959
+#, c-format
+msgid "Force the removal of %s from your system"
+msgstr ""
+
+#. TRANSLATORS : This string is a solution to a dependency problem
+#: components/services/install/lib/eazel-install-problem.c:967
+msgid "Package database has an inconsistency"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:1015
+msgid "Continue with force"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:1021
+#, fuzzy
+msgid "Allow downgrade"
+msgstr "Sta downgrades toe"
+
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
 #, c-format
 msgid "Could not open target file %s"
 msgstr "Kon het bestand %s niet openen"
 
-#: components/services/install/lib/eazel-install-protocols.c:144
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:355
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
 msgid "Could not create an http request !"
 msgstr "Kon geen http verzoek doen !"
 
-#: components/services/install/lib/eazel-install-protocols.c:151
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
 msgid "Proxy: Invalid uri !"
 msgstr "Proxy: ongeldige uri !"
 
-#: components/services/install/lib/eazel-install-protocols.c:156
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:360
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
 msgid "Invalid uri !"
 msgstr "Ongeldige uri !"
 
-#: components/services/install/lib/eazel-install-protocols.c:163
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:370
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
 msgid "Could not prepare http request !"
 msgstr "Kon geen http klaarmaken !"
 
-#: components/services/install/lib/eazel-install-protocols.c:168
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:375
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
 msgid "Couldn't get async mode "
 msgstr "Kan geen asynchone modus krijgen "
 
-#: components/services/install/lib/eazel-install-protocols.c:194
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:385
+#. probably out of disk space
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, c-format
-msgid "HTTP error: %d %s"
-msgstr "HTTP fout: %d %s"
+msgid "DISK FULL: could not write %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:204
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
 msgid "Could not get request body!"
 msgstr "Kon geen antwoord body krijgen!"
 
-#: components/services/install/lib/eazel-install-protocols.c:230
+#: components/services/install/lib/eazel-install-protocols.c:208
+#, c-format
+msgid "HTTP error: %d %s"
+msgstr "HTTP fout: %d %s"
+
+#: components/services/install/lib/eazel-install-protocols.c:255
 msgid "FTP not supported yet"
 msgstr "FTP is niet ondersteund"
 
-#: components/services/install/lib/eazel-install-protocols.c:427
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, c-format
 msgid "Checking local file %s..."
 msgstr "Controleerd lokaal bestand %s..."
 
-#: components/services/install/lib/eazel-install-protocols.c:488
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, c-format
 msgid "Failed to retrieve %s!"
 msgstr "Ontvangen van %s mislukt!"
 
-#: components/services/install/lib/eazel-install-protocols.c:557
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, c-format
 msgid "Could not get an URL for %s"
 msgstr "Kon geen URL krijgen voor %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:576
+#: components/services/install/lib/eazel-install-protocols.c:672
 msgid "Downloaded package does not have the correct name"
 msgstr "Opgehaald pakket heeft een ongeldige naam"
 
-#: components/services/install/lib/eazel-install-protocols.c:577
+#: components/services/install/lib/eazel-install-protocols.c:673
 #, c-format
 msgid "Package %s should have had name %s"
 msgstr "Pakket %s zou de naam %s moeten hebben"
 
-#: components/services/install/lib/eazel-install-protocols.c:584
-msgid "Downloaded package does not have the correct version"
-msgstr "Opgehaald pakket heeft een onjuiste versie"
-
-#: components/services/install/lib/eazel-install-protocols.c:585
-#, c-format
-msgid "Package %s had version %s and not %s"
-msgstr "Pakket %s had versie %s moeten hebben, en niet %s"
-
-#: components/services/install/lib/eazel-install-protocols.c:604
+#: components/services/install/lib/eazel-install-protocols.c:701
 msgid "File download failed"
 msgstr "Bestand ophalen faalde"
 
-#: components/services/install/lib/eazel-install-protocols.c:749
-#: components/services/install/lib/eazel-install-protocols.c:754
-#, c-format
-msgid "Could not retrieve a URL for %s"
-msgstr "Kon geen URL ontvangen voor %s"
-
-#: components/services/install/lib/eazel-install-protocols.c:759
-#, c-format
-msgid "Could not retrieve a URL for id %s"
-msgstr "Kon geen URL ontvangen voor id %s"
-
-#: components/services/install/lib/eazel-install-rpm-glue.c:63
-msgid "Dry Run Mode Activated.  Packages will not actually be installed ..."
-msgstr "Test Modus Geactiveerd. Pakketen worden niet geinstalleerd"
-
-#: components/services/install/lib/eazel-install-rpm-glue.c:251
-#, c-format
-msgid "Closing db for %s (open)"
-msgstr "Sluit de database voor %s (open)"
-
-#: components/services/install/lib/eazel-install-rpm-glue.c:256
-#, c-format
-msgid "Closing db for %s (not open)"
-msgstr "Sluit de database voor %s (niet open)"
-
-#: components/services/install/lib/eazel-install-rpm-glue.c:317
-#, c-format
-msgid "Opened packages database in %s"
-msgstr "Openen pakketen database in %s"
-
-#: components/services/install/lib/eazel-install-rpm-glue.c:322
-#, c-format
-msgid "Opening packages database in %s failed"
-msgstr "Openen van pakketen database in %s faalde"
-
-#. Possibly the implest case, we're installing package A, which requires
-#. B that is not installed.
-#: components/services/install/lib/eazel-install-rpm-glue.c:481
-#, c-format
-msgid "%s requires %s"
-msgstr "%s heeft %s nodig"
-
-#. If we end here, it's a conflict is going to break something
-#: components/services/install/lib/eazel-install-rpm-glue.c:617
-#, c-format
-msgid "Package %s conflicts with %s-%s"
-msgstr "Pakket %s conflicteerd met %s-%s"
-
-#: components/services/install/lib/eazel-install-rpm-glue.c:631
-#, c-format
-msgid "Processing dep for %s, requires library %s"
-msgstr "Doorwerken benodigdheden voor %s, heeft library %s nodig"
-
-#: components/services/install/lib/eazel-install-rpm-glue.c:638
-#, c-format
-msgid "Processing dep for %s, requires package %s"
-msgstr "Doorwerken benodigdheden %s, heeft pakket %s nodig"
-
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr "*** begin pakketen dump ***\n"
 
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr "*** einde pakketten dump ***\n"
 
-#: components/services/install/lib/eazel-install-types.c:462
-#, c-format
-msgid "Cannot open %s"
-msgstr "Kan %s niet openen"
-
-#: components/services/install/lib/eazel-install-xml-package-list.c:142
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 msgid "*** No package nodes! (cat has no children) ***"
 msgstr "*** Geen pakket nodes! (cat heeft geen kinderen) ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:144
-#: components/services/install/lib/eazel-install-xml-package-list.c:152
-#: components/services/install/lib/eazel-install-xml-package-list.c:167
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 msgid "*** Bailing from package parse! ***"
 msgstr "*** Gestopt met pakket ontleding! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:150
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
 msgid "*** No package nodes! ***"
 msgstr "*** Geen pakket nodes! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:156
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 msgid "*** Malformed package node!"
 msgstr "*** Foute pakket node!"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:165
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
 msgid "*** No depends nodes! ***"
 msgstr "*** Geen afhankelijkheids nodes! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr "*** Foute afhankelijkheids node!"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:195
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr "*** onbekend node type '%s'"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:212
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** de pakket lijst heeft geen informatie ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:217
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** Kan de CATAGORIES xmlnode niet vinden ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:218
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr "*** Gestopt met categorie ontleding ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:224
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** Geen Categoriëen ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:225
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr "*** Gestopt met categorie ontleding! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:279
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** Kan de xmlnode TRANSACTION niet vinden! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:281
-#: components/services/install/lib/eazel-install-xml-package-list.c:289
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr "*** Gestopt met transactie ontleding! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:287
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** Geen pakketten! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:323
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** Geen categorie nodes! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:327
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** Kan de CATEGORIES xmlnode niet vinden ! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:361
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** Onbekende node '%s'"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:454
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** Fout bij het generen van de xml pakkettenlijst! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:501
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** Fout bij het lezen van pakkettenlijst! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:719
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** The osd xml bevat geen informatie! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:724
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr "*** Gestopt met osd ontleding! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:777
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "Kon de xml niet verwerken (lengte %d)"
 
-#. Setup the title
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:112
-msgid "Easy Install"
-msgstr "Makkelijke Installatie"
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
+#, c-format
+msgid "Opened packages database in %s"
+msgstr "Openen pakketen database in %s"
 
-#. Setup the progress header
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:208
-msgid "Messages"
-msgstr "Berichten"
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
+#, c-format
+msgid "Opening packages database in %s failed"
+msgstr "Openen van pakketen database in %s faalde"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:208
-msgid "Progress"
-msgstr "Voortgang"
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
+#, c-format
+msgid "Closing db for %s (open)"
+msgstr "Sluit de database voor %s (open)"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:587
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
-msgid "Downloading package %s"
-msgstr "Ophalen pakket %s"
+msgid "Closing db for %s (not open)"
+msgstr "Sluit de database voor %s (niet open)"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:594
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
-msgid "Downloading package %s ..."
-msgstr "Ophalen pakket %s ..."
+msgid "Cannot open %s"
+msgstr "Kan %s niet openen"
 
-#. done!  turn progress bar into a label
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:599
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:812
-msgid "Complete!"
-msgstr "Compleet!"
+#. this stuff flies by so fast, it's probably enough to just say "info"
+#: components/services/install-view/callbacks.c:64
+#, fuzzy
+msgid "Getting package information ..."
+msgstr "Bezig met ophalen pakketlijst van de server ...\n"
+
+#: components/services/install-view/callbacks.c:82
+#, fuzzy, c-format
+msgid "Checking \"%s\" for conflicts..."
+msgstr "Controleerd lokaal bestand %s..."
+
+#: components/services/install-view/callbacks.c:185
+#, fuzzy, c-format
+msgid "Downloading 1 package (%s)"
+msgstr "Ophalen pakket %s"
+
+#: components/services/install-view/callbacks.c:187
+#, fuzzy, c-format
+msgid "Downloading %d packages (%s)"
+msgstr "Ophalen pakket %s"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:623
+#: components/services/install-view/callbacks.c:236
 #, c-format
-msgid "Dependency check: Package %s needs %s"
-msgstr "Controleren afhankelijkheden: Pakket %s heeft %s nodig"
+msgid "Downloading \"%s\""
+msgstr "Ophalen \"%s\""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:685
-msgid ""
-"I'm about to install the following packages:\n"
-"\n"
+#: components/services/install-view/callbacks.c:242
+#, c-format
+msgid "0K of %dK"
 msgstr ""
-"Ik ga de volgende pakketten installeren:\n"
-"\n"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:708
+#: components/services/install-view/callbacks.c:249
+#, c-format
 msgid ""
-"\n"
-"Is this okay?"
+"The package \"%s\" requires \"%s\" to run.\n"
+"Downloading \"%s\" now."
 msgstr ""
-"\n"
-"Is dit goed?"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:728
-msgid "Preparing to install 1 package"
-msgstr "Klaarmaken om 1 pakket te installeren"
+#: components/services/install-view/callbacks.c:252
+#, fuzzy, c-format
+msgid "Attempting to download package \"%s\"."
+msgstr "Ophalen pakket %s"
+
+#: components/services/install-view/callbacks.c:262
+#: components/services/install-view/callbacks.c:333
+#, fuzzy
+msgid "Complete"
+msgstr "Compleet!"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:730
+#: components/services/install-view/callbacks.c:266
 #, c-format
-msgid "Preparing to install %d packages"
-msgstr "Klaarmaken om %d pakketten te installeren"
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" has been successfully downloaded."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:269
+#, c-format
+msgid "The package \"%s\" has been successfully downloaded."
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:751
+#: components/services/install-view/callbacks.c:287
 #, c-format
-msgid "Download of package %s failed!"
+msgid "%dK of %dK"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:316
+#, fuzzy, c-format
+msgid "Download of package \"%s\" failed!"
 msgstr "Ophalen van pakket %s faalde!"
 
+#: components/services/install-view/callbacks.c:338
+#, c-format
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" has been successfully downloaded and installed."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:341
+#, c-format
+msgid "\"%s\" has been successfully downloaded and installed."
+msgstr ""
+
 #. starting a new package -- create new progress indicator
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:768
+#: components/services/install-view/callbacks.c:369
 #, c-format
 msgid "Installing package %d of %d"
 msgstr "Installatie pakket %d van %d"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:783
+#: components/services/install-view/callbacks.c:396
 #, c-format
-msgid "Installing package %s ..."
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" is now being installed."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:399
+#, fuzzy, c-format
+msgid "Now installing package \"%s\"."
 msgstr "Installeren pakket %s ..."
 
-#. first package is the main one.  update top info, now that we know it
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:791
+#: components/services/install-view/callbacks.c:407
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "Installeren \"%s\""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:800
-#, c-format
-msgid "Version: %s"
-msgstr "Versie: %s"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:853
-#, c-format
-msgid " · %s is in the KDE menu.\n"
-msgstr " · %s is in het KDE menu.\n"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:864
-#, c-format
-msgid " · %s is in the Gnome menu under %s.\n"
-msgstr " · %s is in het Gnome menu onder %s.\n"
+#: components/services/install-view/callbacks.c:415
+#: src/nautilus-zoom-control.c:592
+#, fuzzy
+msgid "%d%%"
+msgstr "%.0f%%"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:868
-#, c-format
-msgid " · %s is in the Gnome menu.\n"
-msgstr " · %s is in het Gnome menu.\n"
+#: components/services/install-view/callbacks.c:443
+#, fuzzy, c-format
+msgid "Installation failed on %s"
+msgstr ""
+"Installatie mislukt op %s\n"
+"\n"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:904
+#: components/services/install-view/callbacks.c:471
 msgid "I ran into problems while installing."
 msgstr "Probleem zijn opgetreden tijdens de installatie."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:905
+#: components/services/install-view/callbacks.c:472
 msgid "I'd like to try the following :"
 msgstr "Ik zou het volgende willen proberen :"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:914
+#: components/services/install-view/callbacks.c:481
 msgid "Is this ok ?"
 msgstr "Is dit goed ?"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:955
-msgid "Installation complete!"
-msgstr "Installatie compleet!"
+#: components/services/install-view/callbacks.c:556
+#, fuzzy
+msgid "Installation cancelled."
+msgstr "Installatie mislukt!"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:957
-msgid "Installation aborted."
-msgstr "Installatie afgebroken."
+#: components/services/install-view/callbacks.c:558
+msgid "This package has already been installed."
+msgstr "Dit pakket is reeds geinstalleerd."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:959
-msgid "Installation failed!"
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
+#, fuzzy
+msgid "Installation complete."
+msgstr "Installatie compleet!"
+
+#: components/services/install-view/callbacks.c:564
+#, fuzzy
+msgid "Installation failed."
 msgstr "Installatie mislukt!"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:972
-#, c-format
+#. some succeeded; some failed
+#: components/services/install-view/callbacks.c:568
+msgid "Some packages installed successfully:"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:577
+#, fuzzy
 msgid ""
-"%s\n"
-"%s\n"
-"Erase the leftover RPM files?"
+"\n"
+"Some packages failed:"
+msgstr "Specificeer een pakket bestand"
+
+#: components/services/install-view/callbacks.c:626
+#, fuzzy
+msgid "Erase the RPM files?"
 msgstr ""
 "%s\n"
-"%s\n"
 "De overgebleven RPM bestanden verwijderen?"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:976
-#, c-format
-msgid ""
-"%s\n"
-"Erase the leftover RPM files?"
+#: components/services/install-view/callbacks.c:628
+#, fuzzy
+msgid "Erase the leftover RPM files?"
 msgstr ""
 "%s\n"
 "De overgebleven RPM bestanden verwijderen?"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:996
+#: components/services/install-view/callbacks.c:658
+msgid "Ok"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:673
+#, fuzzy
 msgid ""
-"\n"
 "A core package of Nautilus has been\n"
-"updated, you should restart Nautilus.\n"
+"updated.  You should restart Nautilus.\n"
 "\n"
-"Do you wish to do that now ?\n"
+"Do you wish to do that now?"
 msgstr ""
 "\n"
 "Een centraal pakket van Nautilus is geupdate, eigenlijk\n"
@@ -1252,418 +3101,1946 @@ msgstr ""
 "\n"
 "Wil je dat nu doen?\n"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1072
-msgid "This package has already been installed."
+#. Setup the title
+#: components/services/install-view/forms.c:201
+msgid "Easy Install"
+msgstr "Makkelijke Installatie"
+
+#. Setup the progress header
+#. FIXME: the middle header is all fubar now, so we just say "messages", but the spec
+#. * shows "progress" over the 2nd column of the message box.  it's just too hard to get
+#. * it aligned currently.
+#.
+#: components/services/install-view/forms.c:327
+msgid "Messages"
+msgstr "Berichten"
+
+#: components/services/install-view/forms.c:358
+#: components/services/summary/nautilus-summary-view.c:647
+#, c-format
+msgid "Version: %s"
+msgstr "Versie: %s"
+
+#: components/services/install-view/forms.c:407
+#, fuzzy
+msgid "These packages are ready to be downloaded and installed:"
 msgstr "Dit pakket is reeds geinstalleerd."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1086
+#: components/services/install-view/forms.c:408
+msgid "If you wish to download and install these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:411
+#, fuzzy
+msgid "These packages are ready to be uninstalled:"
+msgstr "Dit pakket is reeds geinstalleerd."
+
+#: components/services/install-view/forms.c:412
+msgid "If you wish to uninstall these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:415
+#, fuzzy
+msgid "These packages are ready to be reverted:"
+msgstr "Dit pakket is reeds geinstalleerd."
+
+#: components/services/install-view/forms.c:416
+msgid "If you wish to revert these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:464
 #, c-format
-msgid ""
-"Installation failed on %s\n"
-"\n"
+msgid "for a total of %ld MB."
 msgstr ""
-"Installatie mislukt op %s\n"
-"\n"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1231
-msgid "Downloading remote package"
-msgstr "Ophalen van remote pakket"
+#: components/services/install-view/forms.c:466
+#, c-format
+msgid "for a total of %ld KB."
+msgstr ""
+
+#. buttons
+#: components/services/install-view/forms.c:478
+#, fuzzy
+msgid "Continue"
+msgstr "Inhoud"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1233
+#: components/services/install-view/forms.c:482
+#: libnautilus-extensions/nautilus-drag.c:493
+#: src/file-manager/fm-directory-view.c:4326
+#, fuzzy
+msgid "Cancel"
+msgstr "Kanalen"
+
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
-msgid "Downloading \"%s\""
-msgstr "Ophalen \"%s\""
+msgid "%s is in GNOME (footprint) > %s"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:439
+#, fuzzy, c-format
+msgid "%s is in the GNOME (footprint) menu.\n"
+msgstr " · %s is in het Gnome menu.\n"
+
+#: components/services/install-view/nautilus-service-install-view.c:454
+#, fuzzy, c-format
+msgid "%s is in the KDE menu.\n"
+msgstr " · %s is in het KDE menu.\n"
+
+#: components/services/install-view/nautilus-service-install-view.c:655
+#, fuzzy
+msgid "Installation Complete"
+msgstr "Installatie compleet!"
+
+#: components/services/install-view/nautilus-service-install-view.c:710
+#, c-format
+msgid ""
+"%sTo start %s, click the Launch button below, or to create a shortcut, drag "
+"the icon on the right to the GNOME panel or your desktop."
+msgstr ""
+
+#. couldn't find an icon
+#: components/services/install-view/nautilus-service-install-view.c:718
+#, c-format
+msgid "%sTo start %s, click the Launch button below."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:773
+msgid "Incorrect password."
+msgstr "Verkeerd wachtwoord."
+
+#: components/services/install-view/nautilus-service-install-view.c:778
+msgid "Authenticate as root"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:895
+#, fuzzy
+msgid "Installing packages"
+msgstr "Installeren pakket %s ..."
+
+#: components/services/install-view/nautilus-service-install-view.c:897
+#, fuzzy
+msgid "Installing remote package"
+msgstr "Ophalen van remote pakket"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1235
-msgid "Downloading some package"
+#: components/services/install-view/nautilus-service-install-view.c:901
+#, fuzzy
+msgid "Installing some package"
 msgstr "Ophalen van een pakket"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1277
-msgid "Contacting install server ..."
-msgstr "Spreekt de installatieserver aan ..."
+#: components/services/install-view/nautilus-service-install-view.c:918
+msgid ""
+"The Eazel install service is missing:\n"
+"Installs will not work."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:967
+#, fuzzy
+msgid "Contacting the Eazel Software Catalog ..."
+msgstr "Ga naar de Eazel software Catalogus"
+
+#: components/services/install-view/nautilus-service-install-view.c:1025
+#, fuzzy
+msgid "Checking for authorization..."
+msgstr "_Aanpassingen..."
+
+#: components/services/install-view/nautilus-service-install-view.c:1097
+msgid "Aborting package downloads (please wait) ..."
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1329
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "Ophalen van pakket afgebroken."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1331
-msgid "Aborted."
+#: components/services/install-view/nautilus-service-install-view.c:1118
+#, fuzzy
+msgid "Aborted"
 msgstr "Afgebroken."
 
-#: components/services/summary/lib/eazel-summary-shared.c:137
-msgid "Could not find a valid boolean value for grey_out!"
-msgstr "Kan geen geldige boolean waarde vinden voor grey_out!"
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:1
+#: components/services/install/server/Trilobite_Service_install.oaf.in.h:2
+#: components/services/summary/nautilus-summary-view.c:123
+msgid "Install"
+msgstr "Installeer"
 
-#: components/services/summary/lib/eazel-summary-shared.c:188
-msgid "There is no service data !\n"
-msgstr "Er is geen service informatie !\n"
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:2
+#, fuzzy
+msgid "Install Viewer"
+msgstr "Installatie faalde"
 
-#: components/services/summary/lib/eazel-summary-shared.c:213
-#: components/services/summary/lib/eazel-summary-shared.c:238
-msgid "There is no eazel news data !\n"
-msgstr "Er is geen eazel news informatie !\n"
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:3
+#, fuzzy
+msgid "Nautilus Service Install View"
+msgstr "_Nautilus Gebruikers Handleiding"
 
-#: components/services/summary/lib/eazel-summary-shared.c:268
-msgid "Could not fetch summary configuration !"
-msgstr "Kon geen samenvattings configuratie vinden !"
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:4
+#, fuzzy
+msgid "Nautilus Service Install View Factory"
+msgstr "Nautilus Thema Selecteerder"
 
-#: components/services/summary/lib/eazel-summary-shared.c:291
-msgid "The summary configuration contains no data!\n"
-msgstr "De samengevatte configuratie bevat geen informatie!\n"
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:5
+msgid "Service Install View Component"
+msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:296
-msgid "Cannot find the SUMMARY_DATA xmlnode!\n"
-msgstr "Kan geen SUMMARY_DATA xmlnode vinden!\n"
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:6
+msgid "Service Install View Component's Factory"
+msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:298
-msgid "Bailing from the SUMMARY_DATA parse!\n"
-msgstr "Gestopt met SUMMARY_DATA ontleding!\n"
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:7
+#, fuzzy
+msgid "View as Install"
+msgstr "Makkelijke Installatie"
 
-#: components/services/summary/lib/eazel-summary-shared.c:305
-msgid "Could not find any summary configuration data!\n"
-msgstr "Kon geen enkele beperkte configuratie vinden!\n"
+#: components/services/install/server/Trilobite_Service_install.oaf.in.h:1
+msgid "Factory for the install service"
+msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:307
-msgid "Bailing from summary configuration parse!\n"
-msgstr "Gestopt met samengevatte configuratie ontleding!\n"
+#: components/services/inventory/eazel-inventory-client.c:70
+msgid "Enable inventory upload."
+msgstr ""
 
-#. parse_summary_xml_file
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:7
-msgid "Configure your service preferences"
-msgstr "Configureer je service voorkeuren"
+#: components/services/inventory/eazel-inventory-client.c:72
+msgid "Disable inventory upload."
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:8
-msgid "Go to the Eazel Services Registration Form"
-msgstr "Ga naar het Eazel Service Registratie Formulier"
+#: components/services/inventory/eazel-inventory-client.c:73
+#, fuzzy
+msgid "Display information about current inventory settings."
+msgstr "Laat informatie zien over het Nautilus programma"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:9
-msgid "Log out from Eazel Services"
-msgstr "Log uit Eazel Services"
+#: components/services/inventory/eazel-inventory-client.c:74
+msgid "Upload inventory now, if not up to date."
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:10
-msgid "Service _Preferences"
-msgstr "Service _Voorkeuren"
+#: components/services/inventory/Trilobite_Service_inventory.oaf.in.h:1
+msgid "Factory for the inventory service"
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:11
-msgid "Show the log-in dialog box"
-msgstr "Geef het login dialoogvenster weer"
+#: components/services/inventory/Trilobite_Service_inventory.oaf.in.h:2
+msgid "Inventory"
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:12
-msgid "_Log in to Eazel Services"
-msgstr "_Log in op Eazel Services"
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:1
+msgid "Nautilus Inventory view"
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:13
-msgid "_Log out from Eazel Services"
-msgstr "_Log uit Eazel Services"
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:2
+msgid "Nautilus Inventory view factory"
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:14
-msgid "_Register for Eazel Services"
-msgstr "_Registreer voor Eazel Services"
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:3
+msgid "Nautilus System Inventory component's component's factory"
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:282
-msgid "Register"
-msgstr "Registreer"
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:4
+msgid "System Inventory"
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:283
-msgid "Login"
-msgstr "Login"
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:5
+msgid "System Inventory Viewer"
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:284
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:292
-msgid "Terms of Use"
-msgstr "Gebruiksvoorwaarden"
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:6
+msgid "System inventory view component"
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:285
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:293
-msgid "Privacy Statement"
-msgstr "Privacy Informatie"
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:7
+msgid "View as System Inventory"
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:290
-msgid "Account Preferences"
-msgstr "Account Voorkeuren"
+#. Setup the title
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:153
+#, fuzzy
+msgid "Please Change Your Eazel Password"
+msgstr "Verander je Eazel wachtwoord..."
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:291
-msgid "Logout"
-msgstr "Uitloggen"
+#. add password boxes
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:174
+#, fuzzy
+msgid "User Name:"
+msgstr "Gebruikersnaam: "
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:345
-#, c-format
-msgid "Welcome Back %s!"
-msgstr "Welkom Terug %s"
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:181
+#, fuzzy
+msgid "Current Password:"
+msgstr "Huidig wachtwoord: "
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:351
-msgid "You are not logged in!"
-msgstr "Je bent niet ingelogd!"
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:188
+#, fuzzy
+msgid "New Password:"
+msgstr "Nieuw wachtwoord: "
 
-#. add the tab
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:443
-msgid "Your Services"
-msgstr "Jouw Services"
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:195
+#, fuzzy
+msgid "Confirm New Password:"
+msgstr "Nieuw wachtwoord: "
 
-#. create the Additional Services pane
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:507
-msgid "Additional Services"
-msgstr "Extra Services"
+#. allocate the command buttons - first the change_password button
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:227
+#, fuzzy
+msgid "Change my password"
+msgstr " Verander mijn wachtwoord! "
+
+#. now allocate the account maintenance button
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:234
+msgid "I need assistance"
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:297
+#, fuzzy
+msgid "Your password has been changed!"
+msgstr "Wachtwoord veranderd!"
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:328
+msgid ""
+"I'm sorry, but that password\n"
+"is incorrect.  Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:332
+msgid ""
+"I'm sorry, but your new password\n"
+"must be at least six (6) characters long.\n"
+"Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:337
+msgid ""
+"I'm sorry, but your new password\n"
+"can't be ridiculously long.\n"
+"Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:346
+msgid ""
+"I'm sorry, but your new password must\n"
+"contain letters along with at least one\n"
+"number or symbol. Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:350
+msgid ""
+"I'm sorry, but I hit an unexpected\n"
+"error. Please try again, with\n"
+"different passwords."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:434
+msgid ""
+"I'm sorry, but I got an unexpected\n"
+"error.  Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:467
+msgid ""
+"I'm sorry, but your new password\n"
+"wasn't typed the same way twice.\n"
+"Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:1
+#, fuzzy
+msgid "Change Password"
+msgstr " Verander mijn wachtwoord! "
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:2
+#, fuzzy
+msgid "Change Password Viewer"
+msgstr " Verander mijn wachtwoord! "
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:3
+#, fuzzy
+msgid "Eazel Change Password View"
+msgstr " Verander mijn wachtwoord! "
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:4
+msgid "Eazel Change Password view component"
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:527
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:5
+msgid "Nautilus Service Login View Factory"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:6
+msgid "Service Login View Component's Factory"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:7
+#, fuzzy
+msgid "View as Change Password"
+msgstr " Verander mijn wachtwoord! "
+
+#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:295
+#, fuzzy
+msgid "Unknown Date"
+msgstr "onbekend type"
+
+#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:300
+msgid "%A, %B %d"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-callbacks.c:97
+msgid ""
+"Sorry, network problems are preventing you from connecting to Eazel Services."
+msgstr ""
+
+#. FIXME we really should use the services alert icon here, eh?
+#: components/services/summary/nautilus-summary-callbacks.c:102
 msgid ""
+"Your Eazel Services account has not yet been activated.  You can't log into "
+"Eazel Services until you activate your account.\n"
 "\n"
-"Check back here for new system management\n"
-"services that will help make Linux easier to use."
+"Please check your email for activation instructions."
 msgstr ""
+
+#. FIXME we really should use the services alert icon here, eh?
+#: components/services/summary/nautilus-summary-callbacks.c:109
+msgid ""
+"Your Eazel Service User Account has been temporarily disabled.\n"
 "\n"
-"Kom hier terug voor nieuwe systeembeheer services\n"
-"die het gebruik van Linux vergemakkelijken."
+"Please try again in a few minutes, or contact Eazel support if this problem "
+"continues."
+msgstr ""
 
-#. add the tab
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:566
-msgid "Current Updates"
-msgstr "Huidige Updates"
+#: components/services/summary/nautilus-summary-callbacks.c:131
+msgid "We're sorry, but your name and password are still not recognized."
+msgstr ""
+"Sorry, maar je gebruikersnaam en wachtwoord worden nog steeds niet herkend."
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:599
-#, c-format
-msgid "Version %s"
-msgstr "Versie %s"
+#: components/services/summary/nautilus-summary-dialogs.c:69
+#, fuzzy
+msgid "Eazel Service Login Error"
+msgstr "Service Fout"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1199
+#: components/services/summary/nautilus-summary-dialogs.c:80
 msgid "Service Error"
 msgstr "Service Fout"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1264
+#: components/services/summary/nautilus-summary-dialogs.c:104
 msgid "Register Now"
 msgstr "Registreer Nu"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1266
-msgid "Help"
-msgstr "Help"
-
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1269
+#: components/services/summary/nautilus-summary-dialogs.c:115
 msgid "Services Login"
 msgstr "Services Login"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1281
+#: components/services/summary/nautilus-summary-dialogs.c:131
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1288
+#: components/services/summary/nautilus-summary-dialogs.c:138
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1296
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1308
-msgid "Please log in to Eazel services"
+#: components/services/summary/nautilus-summary-dialogs.c:146
+#: components/services/summary/nautilus-summary-dialogs.c:155
+#, fuzzy
+msgid "Please log in to Eazel Services"
 msgstr "Log a.u.b. in op de Eazel services"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1300
+#: components/services/summary/nautilus-summary-dialogs.c:150
+msgid "Your user name or password were not correct.  Please try again."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:117
+#: libnautilus-extensions/nautilus-program-chooser.c:1361
+msgid "Go There"
+msgstr "Ga daarheen"
+
+#: components/services/summary/nautilus-summary-view.c:120
+#, fuzzy
+msgid "More Info"
+msgstr "Informatie"
+
+#: components/services/summary/nautilus-summary-view.c:131
+msgid "Account Preferences"
+msgstr "Account Voorkeuren"
+
+#: components/services/summary/nautilus-summary-view.c:132
+msgid "Logout"
+msgstr "Uitloggen"
+
+#: components/services/summary/nautilus-summary-view.c:133
+#: components/services/summary/nautilus-summary-view.c:141
+msgid "Terms of Use"
+msgstr "Gebruiksvoorwaarden"
+
+#: components/services/summary/nautilus-summary-view.c:134
+#: components/services/summary/nautilus-summary-view.c:142
+msgid "Privacy Statement"
+msgstr "Privacy Informatie"
+
+#: components/services/summary/nautilus-summary-view.c:139
+msgid "Register"
+msgstr "Registreer"
+
+#: components/services/summary/nautilus-summary-view.c:140
+msgid "Login"
+msgstr "Login"
+
+#: components/services/summary/nautilus-summary-view.c:170
+#, fuzzy, c-format
+msgid "Eazel Services - Welcome, %s!"
+msgstr "_Eazel Services"
+
+#: components/services/summary/nautilus-summary-view.c:175
+#, fuzzy
+msgid "Eazel Services - You are not logged in"
+msgstr "Je bent niet ingelogd!"
+
+#: components/services/summary/nautilus-summary-view.c:182
+#, fuzzy
+msgid "Connecting to Eazel Services..."
+msgstr "_Login op Eazel Services"
+
+#: components/services/summary/nautilus-summary-view.c:741
+#: data/linksets/home.xml.h:3 src/nautilus-service-ui.xml.h:4
+msgid "Services"
+msgstr "Services"
+
+#: components/services/summary/nautilus-summary-view.c:752
+msgid "Featured Downloads"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:884
+#, fuzzy
 msgid ""
-"Your user name or password were not correct, or you have not activated your "
-"account.  Please try again, or check your email for an account activation "
-"notice."
+"Unable to get services data from Eazel's server. The server might be "
+"unavailable right now, or your computer might be configured incorrectly. "
+"Please contact support@eazel.com."
 msgstr ""
-"Je gebruikersnaam of wachtwoord waren niet correct, of je hebt je account "
-"niet\n"
-"geactiveerd. Probeer opnieuwe, of controleer je e-mail voor een account "
-"activatie\n"
-"bericht."
+"Niet mogelijk om met de Eazel server te verbinden. De server is op dit "
+"moment waarschijnlijk onbeschikbaar, of je computer is niet goed "
+"geconfigureerd. Je zou het later opnieuw kunnen proberen."
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1304
-msgid "We're sorry, but your name and password are still not recognized."
+#: components/services/summary/nautilus-summary-view.c:894
+#, fuzzy
+msgid ""
+"Found a problem with services data on Eazel servers. Please contact "
+"support@eazel.com."
 msgstr ""
-"Sorry, maar je gebruikersnaam en wachtwoord worden nog steeds niet herkend."
+"Er is een probleem gevonden met de gegevens op de servers van Eazel. Neem "
+"contact op met support@eazel.com ."
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1504
+#: components/services/summary/nautilus-summary-view.c:917
+#, fuzzy
+msgid ""
+"Information is missing from the redirect data on Eazel servers. Please "
+"contact support@eazel.com."
+msgstr ""
+"Er is een probleem gevonden met de gegevens op de servers van Eazel. Neem "
+"contact op met support@eazel.com ."
+
+#: components/services/summary/nautilus-summary-view.c:959
+#, fuzzy
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
-"now, or your computer might be configured incorrectly.You could try again "
+"now, or your computer might be configured incorrectly. You could try again "
 "later."
 msgstr ""
 "Niet mogelijk om met de Eazel server te verbinden. De server is op dit "
 "moment waarschijnlijk onbeschikbaar, of je computer is niet goed "
 "geconfigureerd. Je zou het later opnieuw kunnen proberen."
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1522
+#: components/services/summary/nautilus-summary-view.c:969
+#, fuzzy
 msgid ""
-"Found problem with data on Eazel servers. Please contact support@eazel.com."
+"Found a problem with redirect data on Eazel servers. Please contact "
+"support@eazel.com."
 msgstr ""
 "Er is een probleem gevonden met de gegevens op de servers van Eazel. Neem "
 "contact op met support@eazel.com ."
 
-#: components/services/time/command-line/main.c:43
-msgid "display service name and such"
-msgstr "Laat service naam en zo zien"
+#: components/services/summary/nautilus-summary-view.c:986
+msgid "Failed to upload system inventory."
+msgstr ""
 
-#: components/services/time/command-line/main.c:44
-msgid "maximum allowed difference in seconds"
-msgstr "Maximum verschil in seconden toegestaan"
+#: components/services/summary/nautilus-summary-view.c:1049
+#: src/nautilus-first-time-druid.c:258
+msgid "Eazel Services"
+msgstr "Eazel Services"
 
-#: components/services/time/command-line/main.c:45
-msgid "update the system clock"
-msgstr "Zet de systeemklok goed"
+#: components/services/summary/nautilus-summary-view-ui.xml.h:1
+msgid "Configure your service preferences"
+msgstr "Configureer je service voorkeuren"
 
-#: components/services/time/command-line/main.c:46
-msgid "specify time server"
-msgstr "Specificeer tijdserver"
+#: components/services/summary/nautilus-summary-view-ui.xml.h:2
+msgid "Go to the Eazel Services Registration Form"
+msgstr "Ga naar het Eazel Service Registratie Formulier"
 
-#: components/services/time/service/trilobite-eazel-time-service.c:113
-msgid "Unable to get server time"
-msgstr "Kon geen tijdserver vinden"
+#: components/services/summary/nautilus-summary-view-ui.xml.h:3
+msgid "Log out from Eazel Services"
+msgstr "Log uit Eazel Services"
 
-#: components/services/time/service/trilobite-eazel-time-service.c:115
-#, c-format
-msgid "Time off by %d, max allowed diff is %d"
-msgstr "Tijdsverschul is %d, maximum toegstaan is %d"
+#: components/services/summary/nautilus-summary-view-ui.xml.h:4
+msgid "Service _Preferences"
+msgstr "Service _Voorkeuren"
 
-#: components/services/time/service/trilobite-eazel-time-service.c:292
-#, c-format
-msgid "Could not read time-service config from %s"
-msgstr "Kon geen tijdserver configuratie lezen vanuit %s"
+#: components/services/summary/nautilus-summary-view-ui.xml.h:5
+msgid "Show the log-in dialog box"
+msgstr "Geef het login dialoogvenster weer"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:6
+msgid "_Log in to Eazel Services"
+msgstr "_Log in op Eazel Services"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:7
+msgid "_Log out from Eazel Services"
+msgstr "_Log uit Eazel Services"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:8
+msgid "_Register for Eazel Services"
+msgstr "_Registreer voor Eazel Services"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus Service Summary View Factory"
+msgstr "Nautilus Thema Selecteerder"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Summary View"
+msgstr "Nautilus opwaardering"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:3
+msgid "Service Summary View Component's Factory"
+msgstr ""
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:465
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:4
+msgid "Service Summary view component"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:5
+msgid "Summary"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:6
+#, fuzzy
+msgid "Summary Viewer"
+msgstr "Numeriek bekijken:"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:7
+#, fuzzy
+msgid "View as Summary"
+msgstr "Bekijk als een ander"
+
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
+#, fuzzy, c-format
+msgid "HTTP error %d \"%s\" on uri %s"
+msgstr "HTTP fout: %d %s"
+
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 msgid "Could not initialize Bonobo"
 msgstr "Kan bonobo niet initializeren"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:486
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr "Kan geen logbestand %s maken -- gebruik de standaard logafhandeling"
 
-#: components/services/vault/command-line/main.c:37
-msgid "Enable debugging"
-msgstr "Zet debugging aan"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus eazel sample service view component"
+msgstr ""
+"%s\n"
+"\n"
+"Dit is een voorbeeld Nautilus bekijk component."
 
-#: components/services/vault/command-line/main.c:38
-msgid "Vault location"
-msgstr "Foute locatie"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:2
+msgid "Nautilus services startup view factory"
+msgstr ""
 
-#: components/services/vault/command-line/main.c:46
-msgid "Valid operations:"
-msgstr "Geldige operaties:"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:3
+#, fuzzy
+msgid "Service"
+msgstr "Services"
 
-#: components/services/vault/command-line/main.c:86
-msgid "Error: No operation supplied\n"
-msgstr "Fout: Geen operatie gespecificeerd\n"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:4
+#, fuzzy
+msgid "Service Viewer"
+msgstr "Service Fout"
 
-#: components/services/vault/command-line/main.c:94
-#, c-format
-msgid "Error: Invalid operation supplied (%s)\n"
-msgstr "Fout: Ongeldig operatie opgegeven (%s)\n"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:5
+msgid "Services startup view factory"
+msgstr ""
 
-#: components/services/vault/command-line/main.c:119
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:6
+#, fuzzy
+msgid "View as Service"
+msgstr "Bekijk als een ander"
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:7
+msgid "eazel sample service view"
+msgstr ""
+
+#: components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in.h:1
+msgid "Factory for the sample service"
+msgstr ""
+
+#: components/text/nautilus-text-view.c:334
 #, c-format
-msgid ""
-"Error: Invalid syntax\n"
-"Syntax: %s\n"
+msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr ""
-"Fout: ongeldinge syntax\n"
-"Syntax: %s\n"
 
-#: libnautilus-extensions/nautilus-druid-page-eazel.c:343
-msgid "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
-msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
+#: components/text/nautilus-text-view.c:337
+msgid "File too large"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "Lettertypen"
+
+#: components/text/nautilus-text-view-ui.xml.h:2
+msgid "Lucida"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:3
+msgid "Use the Courier Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:4
+msgid "Use the Fixed Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+msgid "Use the GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:6
+msgid "Use the Helvetica Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:7
+msgid "Use the Lucida Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:8
+msgid "Use the Times Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:9
+msgid "_Courier"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "_Bestand"
+
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
+msgid "_Helvetica"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:13
+#, fuzzy
+msgid "_Times"
+msgstr "Tijd "
+
+#: components/text/Nautilus_View_text.oaf.in.h:1
+msgid "Factory for text view"
+msgstr ""
+
+#: components/text/Nautilus_View_text.oaf.in.h:2
+#, fuzzy
+msgid "Text"
+msgstr "Volgende"
+
+#: components/text/Nautilus_View_text.oaf.in.h:3
+#, fuzzy
+msgid "Text Viewer"
+msgstr "Tekst bekijken:"
+
+#: components/text/Nautilus_View_text.oaf.in.h:4
+#, fuzzy
+msgid "Text view"
+msgstr "Tekst bekijken:"
+
+#: components/text/Nautilus_View_text.oaf.in.h:5
+msgid "Text view factory"
+msgstr ""
+
+#: components/text/Nautilus_View_text.oaf.in.h:6
+#, fuzzy
+msgid "View as Text"
+msgstr "Bekijk als %s"
+
+#: components/text/services/google.xml.h:1
+msgid "Search Google for Selected Text"
+msgstr ""
+
+#: components/text/services/google.xml.h:2
+msgid "Use Google to search the web for the selected text"
+msgstr ""
+
+#: components/text/services/webster.xml.h:1
+msgid "Look Up Selected Text in Dictionary"
+msgstr ""
+
+#: components/text/services/webster.xml.h:2
+#, fuzzy
+msgid "Look up the selected text in the Merriam-Webster dictionary"
+msgstr "Kopiëer de geselecteerde text naar het klembord"
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:1
+msgid "animation to indicate on-going activity"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:2
+msgid "throbber"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:3
+msgid "throbber factory"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:4
+msgid "throbber object factory"
+msgstr ""
+
+#: components/tree/Nautilus_View_tree.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus Tree sidebar panel"
+msgstr "Zijbalk bekijker paneel sluiten"
+
+#: components/tree/Nautilus_View_tree.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Tree view"
+msgstr "Nautilus Thema:"
+
+#: components/tree/Nautilus_View_tree.oaf.in.h:3
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
+msgid "Tree"
+msgstr ""
+
+#: data/browser.xml.h:1
+#, fuzzy
+msgid "Apparition"
+msgstr "Aplicaties"
+
+#: data/browser.xml.h:2
+msgid "Azul"
+msgstr ""
+
+#: data/browser.xml.h:3
+#, fuzzy
+msgid "Black"
+msgstr "Terug"
+
+#: data/browser.xml.h:4
+msgid "Blue Ridge"
+msgstr ""
+
+#: data/browser.xml.h:5
+msgid "Blue Rough"
+msgstr ""
+
+#: data/browser.xml.h:6
+#, fuzzy
+msgid "Blue Type"
+msgstr "Type"
+
+#: data/browser.xml.h:7
+msgid "Brushed Metal"
+msgstr ""
+
+#: data/browser.xml.h:8
+msgid "Bubble Gum"
+msgstr ""
+
+#: data/browser.xml.h:9
+msgid "Burlap"
+msgstr ""
+
+#: data/browser.xml.h:10
+msgid "Camouflage"
+msgstr ""
+
+#: data/browser.xml.h:11
+msgid "Certified"
+msgstr ""
+
+#: data/browser.xml.h:12
+#, fuzzy
+msgid "Chalk"
+msgstr "Kanalen"
+
+#: data/browser.xml.h:13
+msgid "Charcoal"
+msgstr ""
+
+#: data/browser.xml.h:14
+#, fuzzy
+msgid "Colors"
+msgstr "Sluiten"
+
+#: data/browser.xml.h:15
+#, fuzzy
+msgid "Concrete"
+msgstr "Inhoud"
+
+#: data/browser.xml.h:16
+#, fuzzy
+msgid "Cool"
+msgstr "Kies"
+
+#: data/browser.xml.h:17
+msgid "Cork"
+msgstr ""
+
+#: data/browser.xml.h:18
+#, fuzzy
+msgid "Countertop"
+msgstr "Inhoud"
+
+#: data/browser.xml.h:19
+#, fuzzy
+msgid "Danger"
+msgstr "Klaar"
+
+#: data/browser.xml.h:20
+#, fuzzy
+msgid "Danube"
+msgstr "Klaar"
+
+#: data/browser.xml.h:21
+msgid "Dark Cork"
+msgstr ""
+
+#: data/browser.xml.h:22
+msgid "Dark GNOME"
+msgstr ""
+
+#: data/browser.xml.h:23
+msgid "Deep Teal"
+msgstr ""
+
+#: data/browser.xml.h:24
+#, fuzzy
+msgid "Distinguished"
+msgstr "Klaar"
+
+#: data/browser.xml.h:25
+#, fuzzy
+msgid "Dots"
+msgstr "Lettertypen"
+
+#: data/browser.xml.h:26
+msgid "Draft"
+msgstr ""
+
+#: data/browser.xml.h:27
+msgid "Drag a color to an object to change it to that color"
+msgstr ""
+
+#: data/browser.xml.h:28
+msgid "Drag a pattern tile to an object to change it"
+msgstr ""
+
+#: data/browser.xml.h:29
+msgid "Drag an emblem to an object to add it to the object"
+msgstr ""
+
+#: data/browser.xml.h:30
+msgid "Eclipse"
+msgstr ""
+
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
+msgid "Emblems"
+msgstr "Emblemen"
+
+#: data/browser.xml.h:32
+msgid "Envy"
+msgstr ""
+
+#: data/browser.xml.h:33
+#, fuzzy
+msgid "Erase"
+msgstr "Vuilnisbak"
+
+#: data/browser.xml.h:34
+#, fuzzy
+msgid "Favorite"
+msgstr "Schrijf"
+
+#: data/browser.xml.h:35
+msgid "Fibers"
+msgstr ""
+
+#: data/browser.xml.h:36
+msgid "Fire Engine"
+msgstr ""
+
+#: data/browser.xml.h:37
+msgid "Fleur De Lis"
+msgstr ""
+
+#: data/browser.xml.h:38
+#, fuzzy
+msgid "Floral"
+msgstr "Voorwaarts"
+
+#: data/browser.xml.h:39
+msgid "Fossil"
+msgstr ""
+
+#: data/browser.xml.h:40 icons/gnome/gnome.xml.h:1
+msgid "GNOME"
+msgstr ""
+
+#: data/browser.xml.h:41
+#, fuzzy
+msgid "Granite"
+msgstr "Schrijf"
+
+#: data/browser.xml.h:42
+msgid "Grapefruit"
+msgstr ""
+
+#: data/browser.xml.h:43
+msgid "Green Weave"
+msgstr ""
+
+#: data/browser.xml.h:44
+msgid "Ice"
+msgstr ""
+
+#: data/browser.xml.h:45
+msgid "Important"
+msgstr ""
+
+#: data/browser.xml.h:46
+#, fuzzy
+msgid "Indigo"
+msgstr "Informatie"
+
+#: data/browser.xml.h:47
+msgid "Leaf"
+msgstr ""
+
+#: data/browser.xml.h:48
+#, fuzzy
+msgid "Lemon"
+msgstr "Login"
+
+#: data/browser.xml.h:49
+#, fuzzy
+msgid "Mango"
+msgstr "Mono"
+
+#: data/browser.xml.h:50
+msgid "Manila Paper"
+msgstr ""
+
+#: data/browser.xml.h:51
+msgid "Moss Ridge"
+msgstr ""
+
+#: data/browser.xml.h:52
+msgid "Mud"
+msgstr ""
+
+#: data/browser.xml.h:53
+msgid "New"
+msgstr ""
+
+#: data/browser.xml.h:54
+#, fuzzy
+msgid "Numbers"
+msgstr "Numeriek bekijken:"
+
+#: data/browser.xml.h:55
+#: libnautilus-extensions/nautilus-file-operations.c:1102
+msgid "OK"
+msgstr ""
+
+#: data/browser.xml.h:56
+msgid "Ocean Strips"
+msgstr ""
+
+#: data/browser.xml.h:57
+msgid "Oh No"
+msgstr ""
+
+#: data/browser.xml.h:58
+msgid "Onyx"
+msgstr ""
+
+#: data/browser.xml.h:59
+msgid "Orange"
+msgstr ""
+
+#: data/browser.xml.h:60
+msgid "Pale Blue"
+msgstr ""
+
+#: data/browser.xml.h:61
+msgid "Patterns"
+msgstr ""
+
+#: data/browser.xml.h:62
+#, fuzzy
+msgid "Personal"
+msgstr "Permissies"
+
+#: data/browser.xml.h:63
+#, fuzzy
+msgid "Purple Marble"
+msgstr "onleesbaar"
+
+#: data/browser.xml.h:64
+msgid "Ridged Paper"
+msgstr ""
+
+#: data/browser.xml.h:65
+msgid "Rough Paper"
+msgstr ""
+
+#: data/browser.xml.h:66
+msgid "Ruby"
+msgstr ""
+
+#: data/browser.xml.h:67
+#, fuzzy
+msgid "Sea Foam"
+msgstr "Zoek naar:"
+
+#: data/browser.xml.h:68
+#, fuzzy
+msgid "Shale"
+msgstr "Voorbeeld"
+
+#: data/browser.xml.h:69
+#, fuzzy
+msgid "Silver"
+msgstr "Grootte"
+
+#: data/browser.xml.h:70
+#, fuzzy
+msgid "Sky"
+msgstr "Vast"
+
+#: data/browser.xml.h:71
+msgid "Sky Ridge"
+msgstr ""
+
+#: data/browser.xml.h:72
+#, fuzzy
+msgid "Snow Ridge"
+msgstr "Laat zijbalk zien"
+
+#: data/browser.xml.h:73
+#, fuzzy
+msgid "Special"
+msgstr "Speciale vlaggen:"
+
+#: data/browser.xml.h:74
+#, fuzzy
+msgid "Stucco"
+msgstr "Stop"
+
+#: data/browser.xml.h:75
+msgid "Tangerine"
+msgstr ""
+
+#: data/browser.xml.h:76
+msgid "Terracotta"
+msgstr ""
+
+#: data/browser.xml.h:77
+#, fuzzy
+msgid "Urgent"
+msgstr "Vergeet"
+
+#: data/browser.xml.h:78
+msgid "Violet"
+msgstr ""
+
+#: data/browser.xml.h:79
+msgid "Wavy White"
+msgstr ""
+
+#: data/browser.xml.h:80
+#, fuzzy
+msgid "White"
+msgstr "Schrijf"
+
+#: data/browser.xml.h:81
+msgid "White Ribs"
+msgstr ""
+
+#: data/linksets/apps.xml.h:2
+msgid "Gnumeric"
+msgstr ""
+
+#: data/linksets/apps.xml.h:3
+msgid "Netscape"
+msgstr ""
+
+#: data/linksets/apps.xml.h:4
+msgid "The Gimp"
+msgstr ""
+
+#: data/linksets/desktop.xml.h:1
+#: libnautilus-extensions/nautilus-global-preferences.c:642
+msgid "Desktop"
+msgstr "Bureaublad"
+
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
+#: libnautilus-extensions/nautilus-trash-directory.c:301
+#: src/file-manager/fm-desktop-icon-view.c:67
+msgid "Trash"
+msgstr "Vuilnisbak"
+
+#: data/linksets/home.xml.h:1
+#, fuzzy
+msgid "Computer"
+msgstr "Compleet!"
+
+#: data/linksets/home.xml.h:2
+#, fuzzy
+msgid "Home Directory"
+msgstr "Gebruikers map"
+
+#: data/linksets/portals.xml.h:1
+#, fuzzy
+msgid "Excite"
+msgstr "Uitvoeren"
+
+#: data/linksets/portals.xml.h:2
+#, fuzzy
+msgid "Portals"
+msgstr "Poort:"
+
+#: data/linksets/portals.xml.h:3
+msgid "Yahoo"
+msgstr ""
+
+#: data/linksets/search_engines.xml.h:1
+#, fuzzy
+msgid "Alta Vista"
+msgstr "Artiest"
+
+#: data/linksets/search_engines.xml.h:2
+msgid "Google"
+msgstr ""
+
+#: data/linksets/search_engines.xml.h:3
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
+#, fuzzy
+msgid "Search Engines"
+msgstr "Zoek instellingen"
+
+#: data/static_bookmarks.xml.h:1
+msgid "Allaire"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:2
+msgid "Binary Freedom"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:3
+msgid "Borland"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:4
+msgid "CNET Computers.com"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:5
+msgid "CNET Linux Center"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:6
+msgid "CollabNet"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:7
+msgid "Compaq"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:8
+#, fuzzy
+msgid "Conectiva"
+msgstr "Inhoud"
+
+#: data/static_bookmarks.xml.h:9
+#, fuzzy
+msgid "Covalent"
+msgstr "Inhoud"
+
+#: data/static_bookmarks.xml.h:10
+msgid "Debian.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:11
+#, fuzzy
+msgid "Dell"
+msgstr "Verwijderen"
+
+#: data/static_bookmarks.xml.h:12
+msgid "Eazel"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:13
+msgid "Freshmeat.net"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:14
+msgid "GNOME.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:15
+msgid "GNU.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:17
+#, fuzzy
+msgid "International"
+msgstr "Installatie mislukt!"
+
+#: data/static_bookmarks.xml.h:18
+msgid "Linux Documentation Project"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:19
+msgid "Linux One"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:20
+msgid "Linux Online"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:21
+msgid "Linux Resources"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:22
+msgid "Linux Weekly News"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:23
+msgid "LinuxNewbie.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:24
+msgid "LinuxOrbit.com"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:25
+msgid "MandrakeSoft"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:26
+#, fuzzy
+msgid "Netraverse"
+msgstr "Nooit"
+
+#: data/static_bookmarks.xml.h:27
+msgid "News and Media"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:28
+msgid "O'Reilly"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:29
+msgid "OSDN"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:30
+msgid "Open Source Asia"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:31
+msgid "OpenOffice"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-druid-page-eazel.c:352
+#: data/static_bookmarks.xml.h:32
+msgid "Penguin Computing"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:33
+#, fuzzy
+msgid "Rackspace"
+msgstr "Vervangen"
+
+#: data/static_bookmarks.xml.h:34
+#, fuzzy
+msgid "Red Hat"
+msgstr "Herhaal bewerken"
+
+#: data/static_bookmarks.xml.h:35
+msgid "Red Hat Network"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:36
+msgid "RedFlag Linux"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:37
+#, fuzzy
+msgid "Software"
+msgstr "Software _Catalogus"
+
+#: data/static_bookmarks.xml.h:38
+msgid "SourceForge"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:39
+msgid "Sun StarOffice"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:40
+msgid "Sun Wah Linux"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:41
+#, fuzzy
+msgid "Web Services"
+msgstr "Services"
+
+#: data/static_bookmarks.xml.h:42
+msgid "ZDNet Linux Hardware Database"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:43
+msgid "ZDNet Linux Resource Center"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:44
+msgid "Zero-Knowledge"
+msgstr ""
+
+#: icons/ardmore/ardmore.xml.h:1
+#, fuzzy
+msgid "Tahoe"
+msgstr "Vuilnisbak"
+
+#: icons/ardmore/ardmore.xml.h:2
+msgid "This theme uses photo-realistic folders."
+msgstr ""
+
+#: icons/arlo/arlo.xml.h:1
+msgid "A Teal variation of the Crux theme."
+msgstr ""
+
+#: icons/arlo/arlo.xml.h:2
+msgid "Crux-Teal"
+msgstr ""
+
+#: icons/crux_eggplant/crux_eggplant.xml.h:1
+msgid "An Eggplant variation of the Crux theme."
+msgstr ""
+
+#: icons/crux_eggplant/crux_eggplant.xml.h:2
+msgid "Crux-Eggplant"
+msgstr ""
+
+#: icons/default.xml.h:1
+#, fuzzy
+msgid "Default"
+msgstr "Verwijderen"
+
+#: icons/default.xml.h:2
+#, fuzzy
+msgid "This is the default theme for Nautilus."
+msgstr "Is standaard voor \"%s\""
+
+#: icons/gnome/gnome.xml.h:2
+msgid "This theme uses the classic GNOME icons."
+msgstr ""
+
+#: icons/villanova/villanova.xml.h:1
+#, fuzzy
+msgid "Sierra"
+msgstr "Grootte"
+
+#: icons/villanova/villanova.xml.h:2
+msgid "Uses manila folders and gray-green backgrounds."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-drag.c:489
+#, fuzzy
+msgid "_Move here"
+msgstr "Ga daarheen"
+
+#: libnautilus-extensions/nautilus-drag.c:490
+#, fuzzy
+msgid "_Copy here"
+msgstr "_Kopiëer text"
+
+#: libnautilus-extensions/nautilus-drag.c:491
+#, fuzzy
+msgid "_Link here"
+msgstr "Link sets"
+
+#. Note to localizers: this font is used for text items in Druid pages
+#: libnautilus-extensions/nautilus-druid-page-eazel.c:381
 msgid "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-*"
 msgstr "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-*"
 
-#: libnautilus-extensions/nautilus-file-operations.c:205
+#. Note to localizers: this font is used for page titles in Druid pages
+#: libnautilus-extensions/nautilus-druid-page-eazel.c:560
+msgid "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
+msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
+
+#. Today, use special word.
+#. * Note to localizers: You can look at man strftime
+#. * for details on the format, but you should only use
+#. * the specifiers from the C standard, not extensions.
+#. * These include "%" followed by one of
+#. * "aAbBcdHIjmMpSUwWxXyYZ". There are two extensions
+#. * in the Nautilus version of strftime that can be
+#. * used (and match GNU extensions). Putting a "-"
+#. * between the "%" and any numeric directive will turn
+#. * off zero padding, and putting a "_" there will use
+#. * space padding instead of zero padding.
+#.
+#: libnautilus-extensions/nautilus-file.c:2277
+#, fuzzy
+msgid "today at %-I:%M %p"
+msgstr "vandaag %-I:%M %p"
+
+#. Yesterday, use special word.
+#. * Note to localizers: Same issues as "today" string.
+#.
+#: libnautilus-extensions/nautilus-file.c:2282
+#, fuzzy
+msgid "yesterday at %-I:%M %p"
+msgstr "gisteren %-I:%M %p"
+
+#. Current week, include day of week.
+#. * Note to localizers: Same issues as "today" string.
+#.
+#: libnautilus-extensions/nautilus-file.c:2287
+#, fuzzy
+msgid "%A %-m/%-d/%y at %-I:%M %p"
+msgstr "%A %-m/%-d/%y %-I:%M %p"
+
+#. Other dates.
+#. * Note to localizers: Same issues as "today" string.
+#.
+#: libnautilus-extensions/nautilus-file.c:2292
+#, fuzzy
+msgid "%-m/%-d/%y at %-I:%M %p"
+msgstr "%-m/%-d/%y %-I:%M %p"
+
+#: libnautilus-extensions/nautilus-file.c:3423
+msgid "0 items"
+msgstr "0 items"
+
+#: libnautilus-extensions/nautilus-file.c:3423
+msgid "0 folders"
+msgstr "0 mappen"
+
+#: libnautilus-extensions/nautilus-file.c:3424
+msgid "0 files"
+msgstr "0 bestanden"
+
+#: libnautilus-extensions/nautilus-file.c:3428
+msgid "1 item"
+msgstr "1 item"
+
+#: libnautilus-extensions/nautilus-file.c:3428
+msgid "1 folder"
+msgstr "1 map"
+
+#: libnautilus-extensions/nautilus-file.c:3429
+msgid "1 file"
+msgstr "1 bestand"
+
+#: libnautilus-extensions/nautilus-file.c:3432
+#, c-format
+msgid "%u items"
+msgstr "%u items"
+
+#: libnautilus-extensions/nautilus-file.c:3432
+#, c-format
+msgid "%u folders"
+msgstr "%u mappen"
+
+#: libnautilus-extensions/nautilus-file.c:3433
+#, c-format
+msgid "%u files"
+msgstr "%u bestanden"
+
+#. This means no contents at all were readable
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
+msgid "? items"
+msgstr "? items"
+
+#. This means no contents at all were readable
+#: libnautilus-extensions/nautilus-file.c:3746
+#, fuzzy
+msgid "? bytes"
+msgstr "? items"
+
+#: libnautilus-extensions/nautilus-file.c:3759
+msgid "unknown type"
+msgstr "onbekend type"
+
+#: libnautilus-extensions/nautilus-file.c:3761
+msgid "unknown MIME type"
+msgstr "onbekend MIME type"
+
+#. Fallback, use for both unknown attributes and attributes
+#. * for which we have no more appropriate default.
+#.
+#: libnautilus-extensions/nautilus-file.c:3766
+msgid "unknown"
+msgstr "onbekend"
+
+#: libnautilus-extensions/nautilus-file.c:3802
+msgid "program"
+msgstr "programma"
+
+#: libnautilus-extensions/nautilus-file.c:3814
+msgid ""
+"Can't find description even for \"x-directory/normal\". This probably means "
+"that your gnome-vfs.keys file is in the wrong place or isn't being found for "
+"some other reason."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3818
+#, c-format
+msgid ""
+"No description found for mime type \"%s\" (file is \"%s\"), tell "
+"aaron@eazel.com"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3832
+msgid "link"
+msgstr "verwijzing"
+
+#. Note to localizers: convert file type string for file
+#. * (e.g. "folder", "plain text") to file type for symbolic link
+#. * to that kind of file (e.g. "link to folder").
+#.
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
+#, c-format
+msgid "link to %s"
+msgstr "verwijzing naar %s"
+
+#: libnautilus-extensions/nautilus-file.c:3852
+msgid "link (broken)"
+msgstr "verwijzing (gebroken)"
+
+#. "From" dialog label, source path gets placed next to it in the dialog
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "Van:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:219
+#. "To" dialog label, source path gets placed next to it in the dialog
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "Naar:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:389
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
-"Error while %s.\n"
-"%s is not readable."
+"Error while moving.\n"
+"\n"
+"\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
-"Fout tijdens %s\n"
-"%s is niet leesbaar."
 
-#: libnautilus-extensions/nautilus-file-operations.c:399
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
-"Error while %s items to \"%s\".\n"
-"The destination is read-only."
+"Error while deleting.\n"
+"\n"
+"\"%s\" cannot be deleted because you do not have permissions to modify its "
+"parent folder."
 msgstr ""
-"Fout tijdens %s items naar \"%s\".\n"
-"de bestemming is alleen lezen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:408
-#: libnautilus-extensions/nautilus-file-operations.c:426
-#: libnautilus-extensions/nautilus-file-operations.c:443
-msgid "Error while Copying"
-msgstr "Fout tijdens Kopiëren"
+#: libnautilus-extensions/nautilus-file-operations.c:639
+#, c-format
+msgid ""
+"Error while deleting.\n"
+"\n"
+"\"%s\" cannot be deleted because it is on a read-only disk."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:417
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
-"Error while %s%s.\n"
-"There is no space on the destination."
+"Error while moving.\n"
+"\n"
+"\"%s\" cannot be moved because you do not have permissions to change it or "
+"its parent folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:677
+#, c-format
+msgid ""
+"Error while moving.\n"
+"\n"
+"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"change it or its parent folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:701
+#, c-format
+msgid ""
+"Error while copying.\n"
+"\n"
+"\"%s\" cannot be copied because you do not have permissions to read it."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:723
+#, fuzzy, c-format
+msgid ""
+"Error while copying to \"%s\".\n"
+"\n"
+"There is not enough space on the destination."
+msgstr ""
+"Fout tijdens %s%s.\n"
+"Er is geen ruimte op de bestemming."
+
+#: libnautilus-extensions/nautilus-file-operations.c:728
+#, fuzzy, c-format
+msgid ""
+"Error while moving to \"%s\".\n"
+"\n"
+"There is not enough space on the destination."
 msgstr ""
 "Fout tijdens %s%s.\n"
 "Er is geen ruimte op de bestemming."
 
-#: libnautilus-extensions/nautilus-file-operations.c:433
+#: libnautilus-extensions/nautilus-file-operations.c:732
+#, fuzzy, c-format
+msgid ""
+"Error while creating link in \"%s\".\n"
+"\n"
+"There is not enough space on the destination."
+msgstr ""
+"Fout tijdens %s%s.\n"
+"Er is geen ruimte op de bestemming."
+
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
-"Error \"%s\" while %s%s.\n"
+"Error while copying to \"%s\".\n"
+"\n"
+"You do not have permissions to write to this folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:748
+#, fuzzy, c-format
+msgid ""
+"Error while copying to \"%s\".\n"
+"\n"
+"The destination disk is read-only."
+msgstr ""
+"Fout tijdens %s items naar \"%s\".\n"
+"de bestemming is alleen lezen."
+
+#: libnautilus-extensions/nautilus-file-operations.c:755
+#, fuzzy, c-format
+msgid ""
+"Error while moving items to \"%s\".\n"
+"\n"
+"You do not have permissions to write to this folder."
+msgstr ""
+"Fout tijdens %s items naar \"%s\".\n"
+"de bestemming is alleen lezen."
+
+#: libnautilus-extensions/nautilus-file-operations.c:759
+#, fuzzy, c-format
+msgid ""
+"Error while moving items to \"%s\".\n"
+"\n"
+"The destination disk is read-only."
+msgstr ""
+"Fout tijdens %s items naar \"%s\".\n"
+"de bestemming is alleen lezen."
+
+#: libnautilus-extensions/nautilus-file-operations.c:766
+#, c-format
+msgid ""
+"Error while creating links in \"%s\".\n"
+"\n"
+"You do not have permissions to write to this folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:770
+#, fuzzy, c-format
+msgid ""
+"Error while creating links in \"%s\".\n"
+"\n"
+"The destination disk is read-only."
+msgstr ""
+"Fout tijdens %s items naar \"%s\".\n"
+"de bestemming is alleen lezen."
+
+#: libnautilus-extensions/nautilus-file-operations.c:799
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while copying \"%s\".\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"Fout \"%s\" tijdens %s%s.\n"
+"Wil je doorgaan?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:803
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while moving \"%s\".\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"Fout \"%s\" tijdens %s%s.\n"
+"Wil je doorgaan?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:807
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while creating a link to \"%s\".\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"Fout \"%s\" tijdens %s%s.\n"
+"Wil je doorgaan?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:813
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while deleting \"%s\".\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"Fout \"%s\" tijdens %s%s.\n"
+"Wil je doorgaan?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:828
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while copying.\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"Fout \"%s\" tijdens %s%s.\n"
+"Wil je doorgaan?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:832
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while moving.\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"Fout \"%s\" tijdens %s%s.\n"
+"Wil je doorgaan?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:836
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while linking.\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"Fout \"%s\" tijdens %s%s.\n"
+"Wil je doorgaan?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:842
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while deleting.\n"
+"\n"
 "Would you like to continue?"
 msgstr ""
 "Fout \"%s\" tijdens %s%s.\n"
 "Wil je doorgaan?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:444
-#: libnautilus-extensions/nautilus-file-operations.c:495
-#: libnautilus-extensions/nautilus-file-operations.c:509
+#: libnautilus-extensions/nautilus-file-operations.c:958
+#, fuzzy
+msgid "Error while copying."
+msgstr "Fout tijdens Kopiëren"
+
+#: libnautilus-extensions/nautilus-file-operations.c:961
+#, fuzzy
+msgid "Error while moving."
+msgstr "Fout tijdens Kopiëren"
+
+#: libnautilus-extensions/nautilus-file-operations.c:964
+#, fuzzy
+msgid "Error while linking."
+msgstr "Fout tijdens Kopiëren"
+
+#: libnautilus-extensions/nautilus-file-operations.c:969
+#, fuzzy
+msgid "Error while deleting."
+msgstr "Fout tijdens Kopiëren"
+
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "Overslaan"
 
-#: libnautilus-extensions/nautilus-file-operations.c:444
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Opnieuw"
 
-#: libnautilus-extensions/nautilus-file-operations.c:483
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
-"File %s already exists.\n"
+"\"%s\" could not be moved to the new location, because its name is already "
+"used for a special item that cannot be removed or replaced.\n"
+"\n"
+"If you still want to move \"%s\", rename it and try again."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1094
+#, c-format
+msgid ""
+"\"%s\" could not be copied to the new location, because its name is already "
+"used for a special item that cannot be removed or replaced.\n"
+"\n"
+"If you still want to copy \"%s\", rename it and try again."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1102
+#, fuzzy
+msgid "Unable to replace file."
+msgstr "Kon geen tijdserver vinden"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1112
+#, fuzzy, c-format
+msgid ""
+"File \"%s\" already exists.\n"
+"\n"
 "Would you like to replace it?"
 msgstr ""
 "bestand %s bestaat reeds.\n"
 "Wilt u het vervangen?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:494
-#: libnautilus-extensions/nautilus-file-operations.c:508
-msgid "Conflict while Copying"
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
+#, fuzzy
+msgid "Conflict while copying"
 msgstr "Conflict tijdens het kopieeren"
 
-#: libnautilus-extensions/nautilus-file-operations.c:495
-#: libnautilus-extensions/nautilus-file-operations.c:509
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Vervangen"
 
-#: libnautilus-extensions/nautilus-file-operations.c:509
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Alles vervangen"
 
-#. Note to localizers: convert file type string for file
-#. * (e.g. "folder", "plain text") to file type for symbolic link
-#. * to that kind of file (e.g. "link to folder").
-#.
-#: libnautilus-extensions/nautilus-file-operations.c:557
-#: libnautilus-extensions/nautilus-file.c:3406
-#, c-format
-msgid "link to %s"
-msgstr "verwijzing naar %s"
-
-#: libnautilus-extensions/nautilus-file-operations.c:560
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "een andere verwijzing naar %s"
@@ -1672,785 +5049,1010 @@ msgstr "een andere verwijzing naar %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:576
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dst verwijzing naar %s"
 
-#: libnautilus-extensions/nautilus-file-operations.c:579
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dnd verwijzing naar %s"
 
-#: libnautilus-extensions/nautilus-file-operations.c:582
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%drd verwijzing naar %s"
 
-#: libnautilus-extensions/nautilus-file-operations.c:585
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dth verwijzing naar %s"
 
+#. Localizers:
+#. * Feel free to leave out the st, nd, rd and th suffix or
+#. * make some or all of them match.
+#.
+#. localizers: tag used to detect the first copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
+msgid " (copy)"
+msgstr " (kopieer)"
+
+#. localizers: tag used to detect the second copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
+msgid " (another copy)"
+msgstr " (een andere kopie)"
+
+#. localizers: tag used to detect the x1st copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1243
+#, fuzzy
+msgid "st copy)"
+msgstr " (kopieer)"
+
+#. localizers: tag used to detect the x2nd copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1245
+#, fuzzy
+msgid "nd copy)"
+msgstr " (kopieer)"
+
+#. localizers: tag used to detect the x3rd copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1247
+#, fuzzy
+msgid "rd copy)"
+msgstr " (kopieer)"
+
+#. localizers: tag used to detect the xxth copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1249
+#, fuzzy
+msgid "th copy)"
+msgstr " (kopieer)"
+
+#. localizers: appended to first file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1259
+#, fuzzy, c-format
+msgid "%s (copy)%s"
+msgstr " (kopieer)"
+
+#. localizers: appended to second file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1261
+#, fuzzy, c-format
+msgid "%s (another copy)%s"
+msgstr " (een andere kopie)"
+
+#. localizers: appended to x1st file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1263
+#, fuzzy, c-format
+msgid "%s (%dst copy)%s"
+msgstr "foo (21st kopie)"
+
+#. localizers: appended to x2nd file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1265
+#, fuzzy, c-format
+msgid "%s (%dnd copy)%s"
+msgstr "foo (22e kopie)"
+
+#. localizers: appended to x3rd file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1267
+#, fuzzy, c-format
+msgid "%s (%drd copy)%s"
+msgstr "foo (3e kopie)"
+
+#. localizers: appended to xxth file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1269
+#, fuzzy, c-format
+msgid "%s (%dth copy)%s"
+msgstr "foo (25e kopie)"
+
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:692
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:700
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:859
-#: libnautilus-extensions/nautilus-file-operations.c:1350
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Nietbekende GnomeVFSXferProgressStatus %d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1185
-msgid "Moving files"
-msgstr "Verplaats bestanden"
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1822
+msgid "Moving files to the Trash"
+msgstr "Verplaatsen bestanden naar de vuilnisbak"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1186
-msgid "moved"
-msgstr "verplaatst"
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1824
+#, fuzzy
+msgid "Files thrown out:"
+msgstr "Eruit gegooid"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1187
-#: libnautilus-extensions/nautilus-file-operations.c:1477
+#. localizers: label prepended to the name of the current file moved
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "Verplaatsen"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1827
+msgid "Preparing to Move to Trash..."
+msgstr "Klaarmaken om te verplaatsen naar de vuilnisbak..."
+
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1837
+msgid "Moving files"
+msgstr "Verplaats bestanden"
+
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1839
+#, fuzzy
+msgid "Files moved:"
+msgstr "Bestands eigenaar:"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "Klaarmaken om te verplaatsen..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1189
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "Afsluiten van het verplaatsen..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1198
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "Maakt verwijzingen naar bestanden"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1199
-msgid "linked"
-msgstr "verwijzing gemaakt"
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1857
+#, fuzzy
+msgid "Files linked:"
+msgstr "Bestands eigenaar:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1200
+#. localizers: label prepended to the name of the current file linked
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "Verwijzing aan het maken"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1201
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "Klaar maar om verwijzingen te maken..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1202
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "Verwijzingen afsluiten..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1208
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "Kopiëren bestanden"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1209
-msgid "copied"
-msgstr "gekopiëerd"
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1870
+#, fuzzy
+msgid "Files copied:"
+msgstr "Bestands groep:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1210
+#. localizers: label prepended to the name of the current file copied
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "Kopiëren"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1211
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "Klaarmaken om te Kopiëren"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "Je kunt de items niet kopiëren naar de Vuilnisbak."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1231
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "Kan niet kopiëren naar de vuilnisbak"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1247
-#: libnautilus-extensions/nautilus-file-operations.c:1435
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "De vuilnisbak moet bestaan op het bureaublad."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1248
+#: libnautilus-extensions/nautilus-file-operations.c:1920
+#, fuzzy
+msgid "You cannot move this trash folder."
+msgstr "Je kunt geen map verplaatsen naar hemzelf."
+
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "Je kunt niet kopiëren naar de vuilnisbak"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1250
-#: libnautilus-extensions/nautilus-file-operations.c:1436
+#: libnautilus-extensions/nautilus-file-operations.c:1923
+#, fuzzy
+msgid "You cannot copy this trash folder."
+msgstr "Je kunt niet kopiëren naar de vuilnisbak"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Kan de lokatie van de vuilnisbak veranderen"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1251
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Kan de vuilnisbak niet kopieeren"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1269
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "Je kunt geen map verplaatsen naar hemzelf."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1270
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "Je kunt geen map kopiëren naar hemzelf."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1271
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "Kan niet verplaatsen naar zichzelf"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1373
-msgid "untitled folder"
-msgstr "naamloze map"
+#: libnautilus-extensions/nautilus-file-operations.c:1953
+#, fuzzy
+msgid "Can't Copy Into Self"
+msgstr "Kan niet verplaatsen naar zichzelf"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1443
-#, c-format
-msgid "You cannot throw \"%s\" into the Trash."
-msgstr "Je kunt \"%s\" niet in de vuilnisbak gooien"
+#: libnautilus-extensions/nautilus-file-operations.c:1965
+#, fuzzy
+msgid "You cannot copy a file over itself."
+msgstr "Je kunt geen map kopiëren naar hemzelf."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1447
-msgid "Error Moving to Trash"
-msgstr "Fout bij het verplaatsen naar de vuilnisbak"
+#: libnautilus-extensions/nautilus-file-operations.c:1966
+#, fuzzy
+msgid "Can't Copy Over Self"
+msgstr "Kan niet verplaatsen naar zichzelf"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1475
-msgid "Moving files to the Trash"
-msgstr "Verplaatsen bestanden naar de vuilnisbak"
+#: libnautilus-extensions/nautilus-file-operations.c:2017
+msgid ""
+"Error creating new folder.\n"
+"\n"
+"You do not have permissions to write to the destination."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1476
-msgid "thrown out"
-msgstr "Eruit gegooid"
+#: libnautilus-extensions/nautilus-file-operations.c:2020
+#, fuzzy
+msgid ""
+"Error creating new folder.\n"
+"\n"
+"There is no space on the destination."
+msgstr ""
+"Fout tijdens %s%s.\n"
+"Er is geen ruimte op de bestemming."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1478
-msgid "Preparing to Move to Trash..."
-msgstr "Klaarmaken om te verplaatsen naar de vuilnisbak..."
+#: libnautilus-extensions/nautilus-file-operations.c:2023
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new folder."
+msgstr "Fout tijdens veranderen eigenaar"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2027
+#, fuzzy
+msgid "Error creating new folder"
+msgstr "Fout tijdens veranderen eigenaar"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1519
+#. localizers: the initial name of a new folder
+#: libnautilus-extensions/nautilus-file-operations.c:2114
+msgid "untitled folder"
+msgstr "naamloze map"
+
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "Verwijderen van bestanden"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1520
-#: libnautilus-extensions/nautilus-file-operations.c:1567
-msgid "deleted"
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
+#, fuzzy
+msgid "Files deleted:"
 msgstr "verwijderd"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1521
-#: libnautilus-extensions/nautilus-file-operations.c:1568
+#. localizers: label prepended to the name of the current file deleted
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Verwijderen"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1522
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "Klaarmaken om te verwijderen..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1566
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Vuilnisbak aan het legen"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1569
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Klaarmaken om te vuilnisbak te legen..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1602
+#: libnautilus-extensions/nautilus-file-operations.c:2218
+#, fuzzy
 msgid ""
-"Are you sure you want to permanently delete all of the items in the trash?"
+"Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr "Weet je zeker dat je alle bestanden in de vuilnisbak wilt verwijderen?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1604
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "Vuilnisbak legen?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1605
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "Leeg"
 
-#. test the next duplicate name generator
-#: libnautilus-extensions/nautilus-file-operations.c:1659
-msgid " (copy)"
-msgstr " (kopieer)"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1659
-msgid " (another copy)"
-msgstr " (een andere kopie)"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1660
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1660
-#: libnautilus-extensions/nautilus-file-operations.c:1670
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "foo (kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1661
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1661
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopieer)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1662
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1662
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".foo (kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1663
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1663
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "foo foo (kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1664
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1664
-#: libnautilus-extensions/nautilus-file-operations.c:1671
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "foo (kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1665
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1665
-#: libnautilus-extensions/nautilus-file-operations.c:1685
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "foo foo (kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1666
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "foo foo txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1666
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (kopie).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1667
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1667
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "foo.. (kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1668
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1668
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "foo... (kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1669
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "foo. (kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1669
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "foo. (andere kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1670
-#: libnautilus-extensions/nautilus-file-operations.c:1672
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "foo (andere kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1671
-#: libnautilus-extensions/nautilus-file-operations.c:1673
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "foo (andere kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1672
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "foo (3e kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1673
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "foo (3e kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1674
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (andere kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1674
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3e kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1675
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr "foo (21st kopie)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr "foo (24e kopie)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr "foo (21st kopie).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr "foo (24e kopie).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "foo (21st kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1675
-#: libnautilus-extensions/nautilus-file-operations.c:1677
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "foo (22e kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1676
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "foo (21st kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1676
-#: libnautilus-extensions/nautilus-file-operations.c:1678
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "foo (22e kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1677
-#: libnautilus-extensions/nautilus-file-operations.c:1679
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "foo (23e kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1678
-#: libnautilus-extensions/nautilus-file-operations.c:1680
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "foo (23e kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1679
-#: libnautilus-extensions/nautilus-file-operations.c:1681
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "foo (24e kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1680
-#: libnautilus-extensions/nautilus-file-operations.c:1682
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "foo (24e kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1681
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "foo (25e kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1682
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "foo (25e kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1683
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24e kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1683
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25e kopie)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1684
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24e kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1684
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25e kopie).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1685
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000e kopie).txt"
 
-#. Today, use special word.
-#. * Note to localizers: You can look at man strftime
-#. * for details on the format, but you should only use
-#. * the specifiers from the C standard, not extensions.
-#. * These include "%" followed by one of
-#. * "aAbBcdHIjmMpSUwWxXyYZ". There are two extensions
-#. * in the Nautilus version of strftime that can be
-#. * used (and match GNU extensions). Putting a "-"
-#. * between the "%" and any numeric directive will turn
-#. * off zero padding, and putting a "_" there will use
-#. * space padding instead of zero padding.
-#.
-#: libnautilus-extensions/nautilus-file.c:1945
-msgid "today %-I:%M %p"
-msgstr "vandaag %-I:%M %p"
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (10th copy)"
+msgstr "foo (21st kopie)"
 
-#. Yesterday, use special word.
-#. * Note to localizers: Same issues as "today" string.
-#.
-#: libnautilus-extensions/nautilus-file.c:1950
-msgid "yesterday %-I:%M %p"
-msgstr "gisteren %-I:%M %p"
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (11st copy)"
+msgstr "foo (21st kopie)"
 
-#. Current week, include day of week.
-#. * Note to localizers: Same issues as "today" string.
-#.
-#: libnautilus-extensions/nautilus-file.c:1955
-msgid "%A %-m/%-d/%y %-I:%M %p"
-msgstr "%A %-m/%-d/%y %-I:%M %p"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (10th copy).txt"
+msgstr "foo (21st kopie).txt"
 
-#. Other dates.
-#. * Note to localizers: Same issues as "today" string.
-#.
-#: libnautilus-extensions/nautilus-file.c:1960
-msgid "%-m/%-d/%y %-I:%M %p"
-msgstr "%-m/%-d/%y %-I:%M %p"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (11st copy).txt"
+msgstr "foo (21st kopie).txt"
 
-#: libnautilus-extensions/nautilus-file.c:2984
-msgid "0 items"
-msgstr "0 items"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (11th copy)"
+msgstr "foo (21st kopie)"
 
-#: libnautilus-extensions/nautilus-file.c:2984
-msgid "0 folders"
-msgstr "0 mappen"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (12nd copy)"
+msgstr "foo (22e kopie)"
 
-#: libnautilus-extensions/nautilus-file.c:2985
-msgid "0 files"
-msgstr "0 bestanden"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (11th copy).txt"
+msgstr "foo (21st kopie).txt"
 
-#: libnautilus-extensions/nautilus-file.c:2989
-msgid "1 item"
-msgstr "1 item"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (12nd copy).txt"
+msgstr "foo (22e kopie).txt"
 
-#: libnautilus-extensions/nautilus-file.c:2989
-msgid "1 folder"
-msgstr "1 map"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (12th copy)"
+msgstr "foo (24e kopie)"
 
-#: libnautilus-extensions/nautilus-file.c:2990
-msgid "1 file"
-msgstr "1 bestand"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (13rd copy)"
+msgstr "foo (3e kopie)"
 
-#: libnautilus-extensions/nautilus-file.c:2993
-#, c-format
-msgid "%u items"
-msgstr "%u items"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (12th copy).txt"
+msgstr "foo (25e kopie).txt"
 
-#: libnautilus-extensions/nautilus-file.c:2993
-#, c-format
-msgid "%u folders"
-msgstr "%u mappen"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (13rd copy).txt"
+msgstr "foo (3e kopie).txt"
 
-#: libnautilus-extensions/nautilus-file.c:2994
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
 #, c-format
-msgid "%u files"
-msgstr "%u bestanden"
-
-#. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3294
-#: libnautilus-extensions/nautilus-file.c:3308
-msgid "? items"
-msgstr "? items"
-
-#: libnautilus-extensions/nautilus-file.c:3312
-msgid "unknown type"
-msgstr "onbekend type"
-
-#: libnautilus-extensions/nautilus-file.c:3314
-msgid "unknown MIME type"
-msgstr "onbekend MIME type"
-
-#. Fallback, use for both unknown attributes and attributes
-#. * for which we have no more appropriate default.
-#.
-#: libnautilus-extensions/nautilus-file.c:3319
-msgid "unknown"
-msgstr "onbekend"
-
-#: libnautilus-extensions/nautilus-file.c:3365
-msgid "folder"
-msgstr "map"
-
-#: libnautilus-extensions/nautilus-file.c:3368
-msgid "program"
-msgstr "programma"
+msgid "%ld of %ld"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3400
-msgid "link"
-msgstr "verwijzing"
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
+#, fuzzy
+msgid "GConf Error"
+msgstr ""
+"GConf fout:\n"
+"  %s"
 
-#: libnautilus-extensions/nautilus-file.c:3420
-msgid "link (broken)"
-msgstr "verwijzing (gebroken)"
+#. Constants
+#: libnautilus-extensions/nautilus-global-preferences.c:50
+#, fuzzy
+msgid "Nautilus Preferences"
+msgstr "Account Voorkeuren"
 
-#: libnautilus-extensions/nautilus-font-factory.c:321
-msgid "fixed"
-msgstr "gerepareerd"
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "altijd"
 
-#: libnautilus-extensions/nautilus-font-picker.c:131
-msgid "Font"
-msgstr "Lettertype"
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "Altijd"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:118
-msgid "Folder Views"
-msgstr "Map opties"
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "alleen lokaal"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:119
-msgid "Folder Views Settings"
-msgstr "Map opties instellingen"
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "Alleen Lokale Bestanden"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:121
-msgid "Window Behavior"
-msgstr "Venster Instellingen"
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "nooit"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:128
-msgid "Click Behavior"
-msgstr "Klik Instellingen"
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "Nooit"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:135
-msgid "Trash Behavior"
-msgstr "Vuilnisbak Instellingen"
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "Mooiere graphics"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:142
-msgid "Display"
-msgstr "Beeldscherm"
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "Gebruik mooiere (maar tragere plaatjes)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:163
-msgid "Sidebar Panels"
-msgstr "Zijkant panelen"
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "Lettertypen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Sidebar Panels Description"
-msgstr "Zijkant paneel omschijving"
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+msgid "Font for Icon view:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-msgid "Choose which panels should appear in the sidebar"
-msgstr "Kies welke panelen moeten verschijnen aan de zijkant"
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:204
-msgid "Appearance"
-msgstr "Voorkomen"
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+msgid "Font for List view:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:205
-msgid "Appearance Settings"
-msgstr "Vookomen instellingen"
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:207
-msgid "Smoother Graphics"
-msgstr "Mooiere graphics"
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:214
-msgid "Fonts"
-msgstr "Lettertypen"
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "Gebruik Nautilus om het bureablad te tekenen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:220
-msgid "Views"
-msgstr "Bekijk mogelijkheden"
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+#, fuzzy
+msgid "Opening New Windows"
+msgstr "Open in _Nieuw venster"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:238
-msgid "Desktop"
-msgstr "Bureaublad"
+#: libnautilus-extensions/nautilus-global-preferences.c:651
+#, fuzzy
+msgid "Open each file or folder in a separate window"
+msgstr "Open elk item in een nieuw scherm"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:249
-msgid "Speed Tradeoffs"
-msgstr "Snelheid Tradeoffs"
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+#, fuzzy
+msgid "Display toolbar in new windows"
+msgstr "Laat de toolbar zien in elke scherm"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:250
-msgid "Speed Tradeoffs Settings"
-msgstr "Snelheid Tradeoffs instellingen"
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "Laat de locatie balk in nieuwe vensters zien"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:252
-msgid "Show Text in Icons"
-msgstr "Laat tekst in Iconen zien"
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "Laat de statusbalk in nieuwe vensters zien"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:259
-msgid "Show Thumbnails for Image Files"
-msgstr "Laat voorbeelden zien voor grafische bestanden"
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "Laat de zijbalk zien in nieuwe vensters"
 
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:267
-msgid "Make Folder Appearance Details Public"
-msgstr "Maak de Map opties publiek."
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "Vuilnisbak Instellingen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:279
-msgid "Search"
-msgstr "Zoeken"
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+msgid "Ask before emptying the Trash or deleting files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:280
-msgid "Search Settings"
-msgstr "Zoek instellingen"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:282
-msgid "Search Complexity Options"
-msgstr "Zoek met complexe opties"
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:288
-msgid "Search Tradeoffs"
-msgstr "Zoek Tradeoffs"
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:296
-msgid "Search Locations"
-msgstr "Zoek lokaties"
+#: libnautilus-extensions/nautilus-global-preferences.c:713
+msgid "single"
+msgstr "enkel"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:306
-msgid "Navigation"
-msgstr "Navigatie"
+#: libnautilus-extensions/nautilus-global-preferences.c:714
+msgid "Activate items with a single click"
+msgstr "Activeer de items met 1 klik"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:307
-msgid "Navigation Settings"
-msgstr "Navigatie instellingen"
+#: libnautilus-extensions/nautilus-global-preferences.c:717
+msgid "double"
+msgstr "dubbel"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:309
-msgid "Home Location"
-msgstr "Thuis lokatie"
+#: libnautilus-extensions/nautilus-global-preferences.c:718
+msgid "Activate items with a double click"
+msgstr "Activeert de items met een dubbele klik"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:316
-msgid "Proxy Settings"
-msgstr "proxy instellingen"
+#: libnautilus-extensions/nautilus-global-preferences.c:725
+msgid "launch"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:335
-msgid "Built-in Bookmarks"
-msgstr "Ingebouwde Bladwijzers"
+#: libnautilus-extensions/nautilus-global-preferences.c:726
+msgid "Execute files when they are clicked"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:665
-msgid "always"
-msgstr "altijd"
+#: libnautilus-extensions/nautilus-global-preferences.c:729
+#, fuzzy
+msgid "display"
+msgstr "Beeldscherm"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:666
-msgid "Always"
-msgstr "Altijd"
+#: libnautilus-extensions/nautilus-global-preferences.c:730
+msgid "Display files when they are clicked"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:670
-msgid "local only"
-msgstr "alleen lokaal"
+#: libnautilus-extensions/nautilus-global-preferences.c:733
+msgid "ask"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:671
-msgid "Local Files Only"
-msgstr "Alleen Lokale Bestanden"
+#: libnautilus-extensions/nautilus-global-preferences.c:734
+msgid "Ask each time"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:675
-msgid "never"
-msgstr "nooit"
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "Klik Instellingen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:676
-msgid "Never"
-msgstr "Nooit"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr ""
 
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
 #: libnautilus-extensions/nautilus-global-preferences.c:771
-msgid "Use HTTP Proxy"
-msgstr "Gebruik HTTP proxy"
+msgid "Show/Hide Options"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:777
-msgid "HTTP Proxy"
-msgstr "HTTP proxy"
+#: libnautilus-extensions/nautilus-global-preferences.c:759
+#, fuzzy
+msgid "Show hidden files (file names start with \".\")"
+msgstr "Laat verborgen bestanden zien (beginnende met \".\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:783
-msgid "HTTP Proxy Port"
-msgstr "HTTP proxy poort"
+#: libnautilus-extensions/nautilus-global-preferences.c:766
+#, fuzzy
+msgid "Show backup files (file names end with \"~\")"
+msgstr "Laat backupbestanden zien (eindigend met \"~\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:837
-msgid "current theme"
-msgstr "Huidige thema"
+#: libnautilus-extensions/nautilus-global-preferences.c:773
+msgid "Show special flags in Properties window"
+msgstr "Laat speciale vlaggen zien in eigenschappen scherm"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:849
-msgid "Open each item in a new window"
-msgstr "Open elk item in een nieuw scherm"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+#, fuzzy
+msgid "Sorting Order"
+msgstr "Fout tijdens veranderen eigenaar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:856
-msgid "Ask before deleting items from the trash"
-msgstr "Vraag voordat ik bestanden in de vuilnisbak gooi."
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:863
-msgid "Click policy"
-msgstr "Klik policy"
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
+msgid "Location:"
+msgstr "Lokatie:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:869
-msgid "single"
-msgstr "enkel"
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+#, fuzzy
+msgid "HTTP Proxy Settings"
+msgstr "proxy instellingen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:870
-msgid "Activate items with a single click"
-msgstr "Activeer de items met 1 klik"
+#: libnautilus-extensions/nautilus-global-preferences.c:798
+msgid "Use HTTP Proxy"
+msgstr "Gebruik HTTP proxy"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:874
-msgid "double"
-msgstr "dubbel"
+#. allocate the proxy label, followed by the entry
+#: libnautilus-extensions/nautilus-global-preferences.c:812
+#: src/nautilus-first-time-druid.c:683
+msgid "Port:"
+msgstr "Poort:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:875
-msgid "Activate items with a double click"
-msgstr "Activeert de items met een dubbele klik"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:880
-msgid "Display text in icons"
-msgstr "Laat de tekst in de iconen zien"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "Ingebouwde Bladwijzers"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:886
-msgid "Show thumbnails for image files"
-msgstr "Laat voorbeelden voor plaatjes bestanden zien"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+#, fuzzy
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "De ingebouwde bladwijzers niet opnemen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:892
-msgid "Read and write metadata in each folder"
-msgstr "Lees en schrijf instellingen in elke map"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "Laat tekst in Iconen zien"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:902
-msgid "Use smoother (but slower) graphics"
-msgstr "Gebruik mooiere (maar tragere plaatjes)"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:908
-msgid "Font family used to display file names"
-msgstr "Lettertype familie om bestandnamen te laten zien"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "Laat voorbeelden zien voor grafische bestanden"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:915
-msgid "Display tool bar in new windows"
-msgstr "Laat de toolbar zien in elke scherm"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:921
-msgid "Display location bar in new windows"
-msgstr "Laat de locatie balk in nieuwe vensters zien"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:927
-msgid "Display status bar in new windows"
-msgstr "Laat de statusbalk in nieuwe vensters zien"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr "Maak de Map opties publiek."
 
-#: libnautilus-extensions/nautilus-global-preferences.c:933
-msgid "Display sidebar in new windows"
-msgstr "Laat de zijbalk zien in nieuwe vensters"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "Voorkomen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:939
-msgid "Use Nautilus to draw the desktop"
-msgstr "Gebruik Nautilus om het bureablad te tekenen"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr ""
 
 #: libnautilus-extensions/nautilus-global-preferences.c:946
-msgid "Always do slow, complete search"
-msgstr "Doe altijd een trage, complete zoekmethode"
+msgid "Icon & List Views"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:953
-msgid "search type to do by default"
-msgstr "Zoek type bij default"
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+msgid "Navigation"
+msgstr "Navigatie"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:962
+msgid "Speed Tradeoffs"
+msgstr "Snelheid Tradeoffs"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:959
+#: libnautilus-extensions/nautilus-global-preferences.c:985
 msgid "search by text"
 msgstr "Zoeken op tekst"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:960
-msgid "Search for files by text only"
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+#, fuzzy
+msgid "Search for files by file name only"
 msgstr "Zoek op bestanden met alleen de tekst"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:964
+#: libnautilus-extensions/nautilus-global-preferences.c:989
 msgid "search by text and properties"
 msgstr "zoek naar text en eigenschappen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:965
-msgid "Search for files by text and by their properties"
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+#, fuzzy
+msgid "Search for files by file name and file properties"
 msgstr "Zoek naar bestanden met tekst en hun eigenschappen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:970
-msgid "Search Web Location"
+#: libnautilus-extensions/nautilus-global-preferences.c:997
+msgid "Search Complexity Options"
+msgstr "Zoek met complexe opties"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "Zoek type bij default"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
+#, fuzzy
+msgid "Fast Search"
+msgstr "Zoeken"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+#, fuzzy
+msgid "Search Engine Location"
 msgstr "Zoek het internet"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:977
-msgid "Show hidden files (starting with \".\")"
-msgstr "Laat verborgen bestanden zien (beginnende met \".\")"
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Zoeken"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:983
-msgid "Show backup files (ending with \"~\")"
-msgstr "Laat backupbestanden zien (eindigend met \"~\")"
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:989
-msgid "Show special flags in Properties window"
-msgstr "Laat speciale vlaggen zien in eigenschappen scherm"
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, fuzzy, c-format
+msgid "Display %s tab in sidebar"
+msgstr "Laat de statusbalk in nieuwe vensters zien"
+
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "Zijkant panelen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:995
-msgid "Can add Content"
-msgstr "Kan geen Inhoud toevoegen"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+#, fuzzy
+msgid "Tabs"
+msgstr "Vuilnisbak"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1001
-msgid "Don't include the built-in bookmarks"
-msgstr "De ingebouwde bladwijzers niet opnemen"
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"currently can't be performed because the program crond, which does nightly "
+"tasks on your computer, is turned off. To make sure fast searches can be "
+"done, turn crond on."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
+msgid "Files May Not Be Indexed"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
+msgid ""
+"If you are running Linux, you can log in as root and type these commands to "
+"start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:731
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"may not be performed because the program crond, which does nightly tasks on "
+"your computer, may be turned off. To make sure fast searches can be done, "
+"check to make sure that crond is turned on.\n"
+"\n"
+msgstr ""
+
+#. The list of characters that cause line breaks can be localized.
+#: libnautilus-extensions/nautilus-icon-canvas-item.c:70
+msgid " -_,;.?/&"
+msgstr " -_,;.?/&"
+
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
@@ -2460,7 +6062,7 @@ msgstr ""
 "handmatige opmaak en deze items laten waar u ze neergezet heeft? Dit zal de "
 "opgeslagen handmatige opmaak rommelig maken"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:735
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
@@ -2470,7 +6072,7 @@ msgstr ""
 "handmatige opmaak en deze items laten waar u ze neergezet heeft? Dit zal de "
 "opgeslagen handmatige lay-out rommelig maken"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:741
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
@@ -2478,7 +6080,7 @@ msgstr ""
 "Deze map maakt gebruik van een automatische opmaak. Wilt u veranderen naar "
 "handmatige opmaak en deze items laten waar u ze neergezet heeft?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:744
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
@@ -2486,222 +6088,192 @@ msgstr ""
 "Deze map maakt gebruik van een automatische opmaak. Wilt u veranderen naar "
 "handmatige opmaak en deze items laten waar u ze neergezet heeft?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:749
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "Omschakelen naar handmatige opmaak?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:750
-#: src/nautilus-window-menus.c:543
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "Omschakelen"
 
-#. FIXME bugzilla.eazel.com 1102: Embedded text should use preferences to determine
-#. * the font it uses
-#.
-#: libnautilus-extensions/nautilus-icon-factory.c:2253
-msgid "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*"
-msgstr "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*"
-
-#: libnautilus-extensions/nautilus-icon-text-item.c:1498
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
+#: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "Hernoemen"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1499
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr "Typen ongedaan maken"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1500
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "Zet de oude naam terug"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1501
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "Herhaal typen"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1502
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Herstel de veranderde naam"
 
-#: libnautilus-extensions/nautilus-label.c:180
-msgid " -_,;.?/&"
-msgstr " -_,;.?/&"
-
-#: libnautilus-extensions/nautilus-preferences-dialog.c:201
-msgid "Prefs Box"
-msgstr "Voorkeuren Box"
+#: libnautilus-extensions/nautilus-preferences.c:92
+msgid "Beginner"
+msgstr "Beginner"
 
-#: libnautilus-extensions/nautilus-preferences.c:1086
-#, c-format
-msgid ""
-"GConf error:\n"
-"  %s"
-msgstr ""
-"GConf fout:\n"
-"  %s"
+#: libnautilus-extensions/nautilus-preferences.c:93
+msgid "Intermediate"
+msgstr "Gemiddeld"
 
-#: libnautilus-extensions/nautilus-preferences.c:1093
-#, c-format
-msgid ""
-"GConf error:\n"
-"  %s\n"
-"All further errors shown only on terminal"
-msgstr ""
-"GConf fout:\n"
-"  %s\n"
-"Alle verdere worden alleen in een terminal weergegeven"
+#: libnautilus-extensions/nautilus-preferences.c:94
+msgid "Advanced"
+msgstr "Geavanceerd"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:188
-#: src/nautilus-window.c:809
-#, c-format
-msgid "View as %s"
-msgstr "Bekijk als %s"
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
+msgid "Prefs Box"
+msgstr "Voorkeuren Box"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:218
+#: libnautilus-extensions/nautilus-program-chooser.c:226
 msgid "not in menu"
 msgstr "niet in het menu"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:221
+#: libnautilus-extensions/nautilus-program-chooser.c:229
 msgid "in menu for this file"
 msgstr "in het menu voor dit bestand"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:224
-#: libnautilus-extensions/nautilus-program-chooser.c:227
+#: libnautilus-extensions/nautilus-program-chooser.c:232
+#: libnautilus-extensions/nautilus-program-chooser.c:235
 #, c-format
 msgid "in menu for \"%s\""
 msgstr "in het menu voor \"%s\""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:230
+#: libnautilus-extensions/nautilus-program-chooser.c:238
 msgid "default for this file"
 msgstr "Standaard voor dit bestand"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:233
-#: libnautilus-extensions/nautilus-program-chooser.c:236
+#: libnautilus-extensions/nautilus-program-chooser.c:241
+#: libnautilus-extensions/nautilus-program-chooser.c:244
 #, c-format
 msgid "default for \"%s\""
 msgstr "standaard voor \"%s\""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:265
+#: libnautilus-extensions/nautilus-program-chooser.c:289
 #, c-format
 msgid "Is not in the menu for \"%s\" items."
 msgstr "Is niet in het menu voor \"%s\" items."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:268
+#: libnautilus-extensions/nautilus-program-chooser.c:292
 #, c-format
 msgid "Is in the menu for \"%s\"."
 msgstr "Is in het menu voor \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:271
+#: libnautilus-extensions/nautilus-program-chooser.c:295
 #, c-format
 msgid "Is in the menu for \"%s\" items."
 msgstr "Is in het menu voor \"%s\" items."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:274
+#: libnautilus-extensions/nautilus-program-chooser.c:298
 #, c-format
 msgid "Is in the menu for all \"%s\" items."
 msgstr "Is in het menu voor alle \"%s\" items."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:277
+#: libnautilus-extensions/nautilus-program-chooser.c:301
 #, c-format
 msgid "Is the default for \"%s\"."
 msgstr "Is standaard voor \"%s\""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:280
+#: libnautilus-extensions/nautilus-program-chooser.c:304
 #, c-format
 msgid "Is the default for \"%s\" items."
 msgstr "Is standaard voor \"%s\" items."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:283
+#: libnautilus-extensions/nautilus-program-chooser.c:307
 #, c-format
 msgid "Is the default for all \"%s\" items."
 msgstr "Is de standaard voor alle \"%s\" items."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:967
+#: libnautilus-extensions/nautilus-program-chooser.c:993
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Veranderd voor \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-extensions/nautilus-program-chooser.c:991
+#: libnautilus-extensions/nautilus-program-chooser.c:1018
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Zet in het menu voor \"%s\" items"
 
 #. Radio button for setting default for file type.
-#: libnautilus-extensions/nautilus-program-chooser.c:998
+#: libnautilus-extensions/nautilus-program-chooser.c:1025
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Gebruik als standaard voor \"%s\" items"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1005
+#: libnautilus-extensions/nautilus-program-chooser.c:1032
 #, c-format
 msgid "Include in the menu just for \"%s\""
 msgstr "Zet in het menu alleen voor \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1011
+#: libnautilus-extensions/nautilus-program-chooser.c:1038
 #, c-format
 msgid "Use as default just for \"%s\""
 msgstr "Gebruik als standaard voor \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1018
+#: libnautilus-extensions/nautilus-program-chooser.c:1045
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Zet niet in het menu voor \"%s\" items"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1182
-#: src/file-manager/fm-list-view.c:1890
-#: src/file-manager/fm-search-list-view.c:272
-#: src/nautilus-bookmarks-window.c:161 src/nautilus-search-bar-criterion.c:66
+#: libnautilus-extensions/nautilus-program-chooser.c:1209
+#: src/file-manager/fm-list-view.c:2182
+#: src/file-manager/fm-search-list-view.c:545
+#: src/nautilus-bookmarks-window.c:164
 msgid "Name"
 msgstr "Naam"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1185
+#: libnautilus-extensions/nautilus-program-chooser.c:1212
 msgid "Status"
 msgstr "Status"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1233
+#: libnautilus-extensions/nautilus-program-chooser.c:1260
 msgid "Open with Other"
 msgstr "Openenen met ander"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1234
+#: libnautilus-extensions/nautilus-program-chooser.c:1261
 #, c-format
 msgid "Choose an application with which to open \"%s\"."
 msgstr "Kies het programma waarmee \"%s\" te openen."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1238
+#: libnautilus-extensions/nautilus-program-chooser.c:1265
 msgid "View as Other"
 msgstr "Bekijk als een ander"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1239
+#: libnautilus-extensions/nautilus-program-chooser.c:1266
 #, c-format
 msgid "Choose a view for \"%s\"."
 msgstr "Kies een bekijker voor \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1246
+#: libnautilus-extensions/nautilus-program-chooser.c:1273
 msgid "Choose"
 msgstr "Kies"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1248
-#: src/nautilus-property-browser.c:345
+#: libnautilus-extensions/nautilus-program-chooser.c:1275
 msgid "Done"
 msgstr "Klaar"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1310
+#: libnautilus-extensions/nautilus-program-chooser.c:1338
 msgid "Modify..."
 msgstr "Verander..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-extensions/nautilus-program-chooser.c:1321
+#: libnautilus-extensions/nautilus-program-chooser.c:1349
 msgid "File Types and Programs"
 msgstr "Bestandstypen en programmas"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1330
-msgid "Go There"
-msgstr "Ga daarheen"
-
-#: libnautilus-extensions/nautilus-program-chooser.c:1339
+#: libnautilus-extensions/nautilus-program-chooser.c:1370
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "GNOME Control Center."
@@ -2709,252 +6281,325 @@ msgstr ""
 "U kunt de programmas configureren die worden aangeboden waar de "
 "bestandtypesin het GNOME Control Center zijn."
 
-#. This application can't deal with this URI,
-#. * because it can only handle local
-#. * files. Tell user. Some day we could offer
-#. * to copy it locally for the user, if we knew
-#. * where to put it, and who would delete it
-#. * when done.
+#: libnautilus-extensions/nautilus-program-chooser.c:1485
+#, fuzzy, c-format
+msgid "No viewers are available for \"%s\"."
+msgstr "Kies een bekijker voor \"%s\"."
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1486
+msgid "No Viewers Available"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1489
+#, fuzzy, c-format
+msgid "No applications are available for \"%s\"."
+msgstr "Geen informatie beschikbaar voor het %s thema"
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1490
+#, fuzzy
+msgid "No Applications Available"
+msgstr "Aplicaties"
+
+#. Note: This might be misleading in the components case, since the
+#. * user can't add components to the complete list even from the capplet.
+#. * (They can add applications though.)
 #.
-#: libnautilus-extensions/nautilus-program-choosing.c:253
+#: libnautilus-extensions/nautilus-program-chooser.c:1497
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"You can configure which programs are offered for which file types with the "
+"\"File Types and Programs\" part of the GNOME Control Center. Do you want to "
+"go there now?"
+msgstr ""
+"U kunt de programmas configureren die worden aangeboden waar de "
+"bestandtypesin het GNOME Control Center zijn."
+
+#: libnautilus-extensions/nautilus-program-choosing.c:492
 #, c-format
 msgid ""
-"Sorry, %s can only open local files, and \"%s\" is remote. If you want to "
-"open it with %s, make a local copy first."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  Would you like to choose another application?"
 msgstr ""
-"Sorry, %s can only open local files, and \"%s\" is remote. If you want to "
-"open it with %s, make a local copy first."
 
-#: libnautilus-extensions/nautilus-program-choosing.c:257
-msgid "Can't open remote file"
-msgstr "Kan remote bestand niet openen"
+#: libnautilus-extensions/nautilus-program-choosing.c:497
+#: libnautilus-extensions/nautilus-program-choosing.c:518
+#, fuzzy
+msgid "Can't Open Location"
+msgstr "Kan locatie niet laten zien"
 
-#: libnautilus-extensions/nautilus-search-uri.c:207
+#: libnautilus-extensions/nautilus-program-choosing.c:513
 #, c-format
-msgid "that have \"%s\" in the name"
-msgstr "Dat heeft \"%s\" in de naam"
+msgid ""
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  No other applications are available to view this file.  If you "
+"copy this file onto your computer, you may be able to open it."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:210
-#, c-format
-msgid "that start with \"%s\""
+#. Human readable description for a criterion in a search for
+#. files. Bracketed items are context, and are message
+#. strings elsewhere.  You don't have to translate the whole
+#. string, and only the translation for "containing '%s' will
+#. be used.  If you do translate the whole string, leave the
+#. translations of the rest of the text in brackets, so it
+#. will not be used.
+#. "%s" here is a pattern the file name
+#. matched, such as "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:212
+#, fuzzy, c-format
+msgid "[Items ]containing \"%s\" in their names"
+msgstr "Items die \"stuff\" in de naam hebben."
+
+#. "%s" here is a pattern the file name started with, such as
+#. "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:217
+#, fuzzy, c-format
+msgid "[Items ]starting with \"%s\""
 msgstr "dat start met \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:213
-#, c-format
-msgid "that end with %s"
+#. "%s" here is a pattern the file name ended with, such as
+#. "mime"
+#: libnautilus-extensions/nautilus-search-uri.c:222
+#, fuzzy, c-format
+msgid "[Items ]ending with %s"
 msgstr "dat eindigd met \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:216
-#, c-format
-msgid "that don't contain \"%s\""
-msgstr "dat bevat geen \"%s\""
+#. "%s" here is a pattern the file name did not match, such
+#. as "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:227
+#, fuzzy, c-format
+msgid "[Items ]not containing \"%s\" in their names"
+msgstr "Items die \"stuff\" in de naam hebben."
 
-#: libnautilus-extensions/nautilus-search-uri.c:219
-#, c-format
-msgid "that match the regular expression \"%s\""
+#. "%s" is a regular expression string, for example "[abc]"
+#: libnautilus-extensions/nautilus-search-uri.c:231
+#, fuzzy, c-format
+msgid "[Items ]matching the regular expression \"%s\""
 msgstr "Dat komt niet met de reguliere expressie \"%s\" over"
 
-#: libnautilus-extensions/nautilus-search-uri.c:222
-#, c-format
-msgid "that match the file pattern \"%s\""
+#. "%s" is a file glob, for example "*.txt"
+#: libnautilus-extensions/nautilus-search-uri.c:235
+#, fuzzy, c-format
+msgid "[Items ]matching the file pattern \"%s\""
 msgstr "Dat komt overeen met bestand pattern \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:235
-msgid "regular files"
-msgstr "Reguliere bestanden"
+#: libnautilus-extensions/nautilus-search-uri.c:248
+#, fuzzy
+msgid "[Items that are ]regular files"
+msgstr "Items die \"stuff\" in hun naam hebben en normale bestanden zijn."
 
-#: libnautilus-extensions/nautilus-search-uri.c:238
-msgid "text files"
-msgstr "tekst bestanden"
+#: libnautilus-extensions/nautilus-search-uri.c:251
+msgid "[Items that are ]text files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:241
-msgid "applications"
-msgstr "programmas"
+#: libnautilus-extensions/nautilus-search-uri.c:254
+msgid "[Items that are ]applications"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:244
-msgid "directories"
-msgstr "mappen"
+#: libnautilus-extensions/nautilus-search-uri.c:257
+msgid "[Items that are ]folders"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:247
-#: src/nautilus-search-bar-criterion.c:106
-msgid "music"
-msgstr "muziek"
+#: libnautilus-extensions/nautilus-search-uri.c:260
+msgid "[Items that are ]music"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:254
-#, c-format
-msgid "are not %s"
+#. "%s" here is a word describing a file type, for example
+#. "folder"
+#: libnautilus-extensions/nautilus-search-uri.c:268
+#, fuzzy, c-format
+msgid "[Items ]that are not %s"
 msgstr "zijn niet %s"
 
-#: libnautilus-extensions/nautilus-search-uri.c:258
-#, c-format
-msgid "are %s"
-msgstr "zijn %s"
+#. "%s" here is a word describing a file type, for example
+#. "folder"
+#: libnautilus-extensions/nautilus-search-uri.c:273
+#, fuzzy, c-format
+msgid "[Items ]that are %s"
+msgstr "zijn %s bytes"
 
-#: libnautilus-extensions/nautilus-search-uri.c:269
-#, c-format
-msgid "are not owned by \"%s\""
+#. "%s" here is the name of user on a Linux machine, such as
+#. "root"
+#: libnautilus-extensions/nautilus-search-uri.c:287
+#, fuzzy, c-format
+msgid "[Items ]not owned by \"%s\""
 msgstr "zijn van \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:272
-#, c-format
-msgid "are owned by \"%s\""
+#. "%s" here is the name of user on a Linux machine, such as
+#. "root"
+#: libnautilus-extensions/nautilus-search-uri.c:292
+#, fuzzy, c-format
+msgid "[Items ]owned by \"%s\""
 msgstr "zijn van \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:276
-#, c-format
-msgid "have owner UID \"%s\""
+#: libnautilus-extensions/nautilus-search-uri.c:295
+#, fuzzy, c-format
+msgid "[Items ]with owner UID \"%s\""
 msgstr "heeft eigenaar UID \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:279
-#, c-format
-msgid "have owner UID other than \"%s\""
+#: libnautilus-extensions/nautilus-search-uri.c:298
+#, fuzzy, c-format
+msgid "[Items ]with owner UID other than \"%s\""
 msgstr "heeft eigenaar UID anders dan \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:290
-#, c-format
-msgid "that are larger than %s bytes"
+#: libnautilus-extensions/nautilus-search-uri.c:309
+#, fuzzy, c-format
+msgid "[Items ]larger than %s bytes"
 msgstr "is groter dan %s bytes"
 
-#: libnautilus-extensions/nautilus-search-uri.c:293
-#, c-format
-msgid "that are smaller than %s bytes"
+#: libnautilus-extensions/nautilus-search-uri.c:312
+#, fuzzy, c-format
+msgid "[Items ]smaller than %s bytes"
 msgstr "zijn kleiner dan %s bytes"
 
-#: libnautilus-extensions/nautilus-search-uri.c:296
-#, c-format
-msgid "that are %s bytes"
-msgstr "zijn %s bytes"
+#: libnautilus-extensions/nautilus-search-uri.c:315
+#, fuzzy, c-format
+msgid "[Items ]of %s bytes"
+msgstr "Items %s %s%s"
 
-#: libnautilus-extensions/nautilus-search-uri.c:307
-msgid "modified today"
+#: libnautilus-extensions/nautilus-search-uri.c:326
+#, fuzzy
+msgid "[Items ]modified today"
 msgstr "vandaag veranderd"
 
-#: libnautilus-extensions/nautilus-search-uri.c:310
-msgid "modified yesterday"
+#: libnautilus-extensions/nautilus-search-uri.c:329
+#, fuzzy
+msgid "[Items ]modified yesterday"
 msgstr "gisteren veranderd"
 
-#: libnautilus-extensions/nautilus-search-uri.c:313
-#, c-format
-msgid "modified on %s"
-msgstr "veranderd op %s"
+#: libnautilus-extensions/nautilus-search-uri.c:332
+#, fuzzy, c-format
+msgid "[Items ]modified on %s"
+msgstr "niet veranderd op %s"
 
-#: libnautilus-extensions/nautilus-search-uri.c:316
-#, c-format
-msgid "not modified on %s"
+#: libnautilus-extensions/nautilus-search-uri.c:334
+#, fuzzy, c-format
+msgid "[Items ]not modified on %s"
 msgstr "niet veranderd op %s"
 
-#: libnautilus-extensions/nautilus-search-uri.c:319
-#, c-format
-msgid "modified before %s"
+#: libnautilus-extensions/nautilus-search-uri.c:337
+#, fuzzy, c-format
+msgid "[Items ]modified before %s"
 msgstr "veranderd voor %s"
 
-#: libnautilus-extensions/nautilus-search-uri.c:322
-#, c-format
-msgid "modified after %s"
+#: libnautilus-extensions/nautilus-search-uri.c:340
+#, fuzzy, c-format
+msgid "[Items ]modified after %s"
 msgstr "veranderd na %s"
 
-#: libnautilus-extensions/nautilus-search-uri.c:325
-#, c-format
-msgid "modified within a week of %s"
+#: libnautilus-extensions/nautilus-search-uri.c:343
+#, fuzzy, c-format
+msgid "[Items ]modified within a week of %s"
 msgstr "is binnen een week van %s veranderd"
 
-#: libnautilus-extensions/nautilus-search-uri.c:328
-#, c-format
-msgid "modified within a month of %s"
+#: libnautilus-extensions/nautilus-search-uri.c:346
+#, fuzzy, c-format
+msgid "[Items ]modified within a month of %s"
 msgstr "is binnen een maand van %s veranderd"
 
-#: libnautilus-extensions/nautilus-search-uri.c:340
-#, c-format
-msgid "marked with \"%s\""
-msgstr "gemarkeerd met \"%s\""
+#. "%s" here is the name of an Emblem
+#: libnautilus-extensions/nautilus-search-uri.c:359
+#, fuzzy, c-format
+msgid "[Items ]marked with \"%s\""
+msgstr "niet gemarkeerd met \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:343
-#, c-format
-msgid "not marked with \"%s\""
+#. "%s" here is the name of an Emblem
+#: libnautilus-extensions/nautilus-search-uri.c:363
+#, fuzzy, c-format
+msgid "[Items ]not marked with \"%s\""
 msgstr "niet gemarkeerd met \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:357
-#, c-format
-msgid "with all the words \"%s\""
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:379
+#, fuzzy, c-format
+msgid "[Items ]with all the words \"%s\""
 msgstr "met al de woorden \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:360
-#, c-format
-msgid "containing one of the words \"%s\""
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:384
+#, fuzzy, c-format
+msgid "[Items ]containing one of the words \"%s\""
 msgstr "bevat een van de woorden van \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:363
-#, c-format
-msgid "without all the words \"%s\""
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:389
+#, fuzzy, c-format
+msgid "[Items ]without all the words \"%s\""
 msgstr "zonder al de woorden \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:366
-#, c-format
-msgid "without any of the words \"%s\""
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:394
+#, fuzzy, c-format
+msgid "[Items ]without any of the words \"%s\""
 msgstr "zonder een van de woorden \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:383
-msgid "that"
-msgstr "dat"
-
-#: libnautilus-extensions/nautilus-search-uri.c:503
-msgid "are directories"
-msgstr "zijn mappen"
+#: libnautilus-extensions/nautilus-search-uri.c:556
+msgid "[Items larger than 400K] and [without all the words \"apple orange\"]"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:547
-msgid " and "
-msgstr " en "
+#. Human readable description for a criterion in a search for
+#. files. Bracketed items are context, and are message
+#. strings elsewhere.  Translate only the words "and" here.
+#: libnautilus-extensions/nautilus-search-uri.c:561
+msgid ""
+"[Items larger than 400K], [owned by root and without all the words \"apple "
+"orange\"]"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:612
-#, c-format
-msgid "Items %s%s"
+#. The beginning of the description of a search that has just been
+#. performed.  The "%s" here is a description of a single criterion,
+#. which in english might be "that contain the word 'foo'"
+#: libnautilus-extensions/nautilus-search-uri.c:591
+#, fuzzy, c-format
+msgid "Items %s"
 msgstr "Items %s%s"
 
-#: libnautilus-extensions/nautilus-search-uri.c:615
-#, c-format
-msgid "Items %s %s%s"
-msgstr "Items %s %s%s"
-
-#: libnautilus-extensions/nautilus-search-uri.c:724
-msgid "Items that have \"stuff\" in the name."
+#: libnautilus-extensions/nautilus-search-uri.c:701
+#, fuzzy
+msgid "Items containing \"stuff\" in their names"
 msgstr "Items die \"stuff\" in de naam hebben."
 
-#: libnautilus-extensions/nautilus-search-uri.c:726
-msgid "Items that have \"stuff\" in the name and are regular files."
+#: libnautilus-extensions/nautilus-search-uri.c:703
+#, fuzzy
+msgid "Items that are regular files"
 msgstr "Items die \"stuff\" in hun naam hebben en normale bestanden zijn."
 
-#: libnautilus-extensions/nautilus-search-uri.c:729
+#: libnautilus-extensions/nautilus-search-uri.c:706
+#, fuzzy
+msgid "Items containing \"stuff\" in their names and that are regular files"
+msgstr "Items die \"stuff\" in hun naam hebben en normale bestanden zijn."
+
+#: libnautilus-extensions/nautilus-search-uri.c:710
+#, fuzzy
 msgid ""
-"Items that have \"stuff\" in the name, are regular files and that are "
-"smaller than 2000 bytes."
+"Items containing \"stuff\" in their names, that are regular files and "
+"smaller than 2000 bytes"
 msgstr ""
 "Items die \"stuff\" in de naam hebben, normale bestanden zijn en kleinerdan "
 "2000 bytes."
 
-#: libnautilus-extensions/nautilus-search-uri.c:732
-msgid "Items that have \"medusa\" in the name and are directories."
+#: libnautilus-extensions/nautilus-search-uri.c:714
+#, fuzzy
+msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Items die \"medusa\" in de naam hebben en mappen zijn."
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:415
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:425
-#: libnautilus-extensions/nautilus-stock-dialogs.c:465
-msgid "Error"
-msgstr "Fout"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:467
-msgid "Details"
-msgstr "Details"
+#: libnautilus-extensions/nautilus-trash-directory.c:73
+#, fuzzy
+msgid "Searching Disks"
+msgstr "Zoek instellingen"
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:497
-msgid "Question"
-msgstr "Vraag"
+#: libnautilus-extensions/nautilus-trash-directory.c:74
+msgid "Nautilus is searching your disks for trash folders."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-trash-directory.c:286
-msgid "Trash"
-msgstr "Vuilnisbak"
+#: libnautilus-extensions/nautilus-trash-file.c:725
+msgid "on the desktop"
+msgstr ""
 
 #: libnautilus-extensions/nautilus-undo-signal-handlers.c:175
 msgid "Edit"
@@ -2976,149 +6621,337 @@ msgstr "Herhaal bewerken"
 msgid "Redo the edit"
 msgstr "Herhaal de bewerking"
 
-#: libnautilus-extensions/nautilus-user-level-manager.c:61
-msgid "Beginner"
-msgstr "Beginner"
+#: libnautilus-extensions/nautilus-view-identifier.c:61
+#, c-format
+msgid "View as %s"
+msgstr "Bekijk als %s"
 
-#: libnautilus-extensions/nautilus-user-level-manager.c:62
-msgid "Intermediate"
-msgstr "Gemiddeld"
+#: libnautilus-extensions/nautilus-view-identifier.c:64
+#, c-format
+msgid "%s Viewer"
+msgstr "%s bekijker"
 
-#: libnautilus-extensions/nautilus-user-level-manager.c:63
-msgid "Advanced"
-msgstr "Geavanceerd"
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+#, fuzzy
+msgid "Unknown"
+msgstr "onbekend"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:504
-msgid "Unknown Volume"
-msgstr "Onbekend volume"
+#. Populate table with items we know localized names for.
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
+msgid "Floppy"
+msgstr "Floppy"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1164
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
+msgid "CD-ROM"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
+msgid "Zip Drive"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
+msgid "Audio CD"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
+msgid "is write-protected, mounting read-only"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
+msgid "is not a valid block device"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
+msgid "No medium found"
+msgstr ""
+
+#. Handle floppy case
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
+msgid ""
+"Nautilus was unable to mount the floppy drive. There is probably no floppy "
+"in the drive."
+msgstr ""
+
+#. All others
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
+msgid ""
+"Nautilus was unable to mount the volume. There is probably no media in the "
+"device."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
+msgid "wrong fs type, bad option, bad superblock on"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
+msgid ""
+"Nautilus was unable to mount the floppy drive. The floppy is probably in a "
+"format that cannot be mounted."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
+msgid ""
+"Nautilus was unable to mount the selected volume. The volume is probably in "
+"a format that cannot be mounted."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
+msgid "Nautilus was unable to mount the selected floppy drive."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
+msgid "Nautilus was unable to mount the selected volume."
+msgstr ""
+
+#. FIXME: Should we parse this message and report something more meaningful?
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
+msgid "Nautilus was unable to unmount the selected volume."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+#, fuzzy
+msgid "Mount Error"
+msgstr "Fout"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Hernoem fout"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "ISO 9660 Volume"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1171
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
+#, fuzzy
+msgid "Root"
+msgstr "Uitloggen"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Ext2 Volume"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1177
-msgid "Floppy"
-msgstr "Floppy"
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
+#, fuzzy
+msgid "MSDOS Volume"
+msgstr "ISO 9660 Volume"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: libnautilus/nautilus-clipboard-ui.xml.h:7 src/nautilus-shell-ui.xml.h:13
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
+#, fuzzy
+msgid "NFS Volume"
+msgstr "Ext2 Volume"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
+msgid "ReiserFS Volume"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
+#, fuzzy
+msgid "UFS Volume"
+msgstr "Ext2 Volume"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
+msgid "Unknown Volume"
+msgstr "Onbekend volume"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:5
 msgid "C_lear Text"
 msgstr "Haal tekst weg"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:22
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "Haal tekst weg"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "_Kopiëer text"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "Kopiëer de geselecteerde text naar het klembord"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:9 src/nautilus-shell-ui.xml.h:25
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "Knip _Tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+msgid "Cut _Text"
+msgstr "Knip _Tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "Knip de geselecteerde tekst naar het klembord"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:10 src/nautilus-shell-ui.xml.h:49
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "_Plak tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "Plak de opgeslagen tekst op het klembord"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "Verwijder de geselecteerde tekst zonder deze op het klembord te zetten"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:77
-msgid "_Copy Text"
-msgstr "_Kopiëer text"
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "_Selecteer Alles"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+#, fuzzy
+msgid "Select _All"
+msgstr "_Selecteer Alles"
 
 #: libnautilus/nautilus-clipboard-ui.xml.h:13
-msgid "_Cut Text"
-msgstr "_Knip tekst"
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "Selecteer alle items in dit venster"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
+msgid "_Copy Text"
+msgstr "_Kopiëer text"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:89
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "_Plak tekst"
 
-#: src/file-manager/fm-desktop-icon-view.c:431
-msgid "Empty Trash"
-msgstr "Maak de prullenbak schoon"
+#. The copyright character in here is correct for
+#. * Latin-1 encoding, but not for UTF-8, so we have
+#. * to change it when we upgrade to GTK 2.0.
+#.
+#: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
+#: src/nautilus-window-menus.c:610
+msgid "Nautilus"
+msgstr "Nautilus"
 
-#: src/file-manager/fm-desktop-icon-view.c:460
-msgid "New Terminal"
-msgstr "Nieuwe terminal"
+#: nautilus.desktop.in.h:2
+msgid "Nautilus File Manager and Graphic Shell"
+msgstr ""
 
-#: src/file-manager/fm-desktop-icon-view.c:469
-msgid "Disks"
-msgstr "Schijven"
+#. Note to translators: If it's hard to compose a good home
+#. * icon name from the user name, you can use a string without
+#. * an "%s" here, in which case the home icon name will not
+#. * include the user's name, which should be fine. To avoid a
+#. * warning, put "%.0s" somewhere in the string, which will
+#. * match the user name string passed by the C code, but not
+#. * put the user name in the final string.
+#.
+#: src/file-manager/fm-desktop-icon-view.c:886
+#, fuzzy, c-format
+msgid "%s's Home"
+msgstr "Thuis"
 
-#: src/file-manager/fm-desktop-icon-view.c:528
-msgid "Reset Desktop Background"
-msgstr "Reset Bureaubladachtergrond"
+#: src/file-manager/fm-desktop-icon-view.c:1175
+#, fuzzy
+msgid "Empty Trash..."
+msgstr "_Leeg prullenbak"
 
-#: src/file-manager/fm-desktop-icon-view.c:536
-msgid "Change Desktop Background"
-msgstr "Verder bureaubladachtergrond"
+#: src/file-manager/fm-desktop-icon-view.c:1177
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+msgid "Empty Trash"
+msgstr "Maak de prullenbak schoon"
 
-#: src/file-manager/fm-desktop-icon-view.c:546
-msgid "Quit Nautilus Desktop"
-msgstr "Sluit Nautilus Bureablad af."
+#: src/file-manager/fm-desktop-icon-view.c:1197
+#, fuzzy
+msgid "Unmount Volume"
+msgstr "Onbekend volume"
 
-#: src/file-manager/fm-directory-view.c:417
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr ""
 "Dit opent %d verschillende vensters. Weet je zeker dat je dit wilt doen?"
 
-#: src/file-manager/fm-directory-view.c:419
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Open %d Vensters?"
 
-#: src/file-manager/fm-directory-view.c:1188
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr ""
+"Weet u zeker dat u \"%s\" permanent wilt verwijderen uit de prullenbak?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+"Weet u zeker dat u de %d items permanent wilt verwijderen uit de prullenbak?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Verwijderen"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Verwijderen"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+#, fuzzy
+msgid "scripts"
+msgstr "Omschrijving"
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" gelecteerd"
 
-#: src/file-manager/fm-directory-view.c:1190
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "1 map geselecteerd"
 
-#: src/file-manager/fm-directory-view.c:1193
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "%d mappen geselecteerd"
 
-#: src/file-manager/fm-directory-view.c:1199
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr " (bevat 0 items)"
 
-#: src/file-manager/fm-directory-view.c:1201
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr " (bevat 1 item)"
 
-#: src/file-manager/fm-directory-view.c:1203
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr " (bevat %d items)"
 
-#: src/file-manager/fm-directory-view.c:1214
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" geselecteerd (%s)"
 
-#: src/file-manager/fm-directory-view.c:1218
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d items geselecteerd (%s)"
 
-#: src/file-manager/fm-directory-view.c:1225
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 anders item geselecteerd (%s)"
 
-#: src/file-manager/fm-directory-view.c:1228
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d andere items geselecteerd (%s)"
@@ -3130,238 +6963,325 @@ msgstr "%d andere items geselecteerd (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1257
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
 
-#: src/file-manager/fm-directory-view.c:1368
+#. Note that the number of items actually displayed varies somewhat due
+#. * to the way files are collected in batches. So you can't assume that
+#. * no more than the constant limit are displayed.
+#.
+#: src/file-manager/fm-directory-view.c:1530
+#, c-format
 msgid ""
-"We're sorry, but the directory you're viewing has more files than we're able "
-"to display.  As a result, we are only able to show you the first 4000 files "
-"it contains. \n"
-"This is a temporary limitation in this Preview Release of Nautilus, and will "
-"not be present in the final shipping version.\n"
+"The folder \"%s\" contains more files than Nautilus can handle. Some files "
+"will not be displayed."
 msgstr ""
-"Het spijt ons, maar een directory die je bekijkt heeft meer bestanden dan we "
-"kunnen weergeven. We geven alleen de eerste 4000 bestanden weer. Dit is een "
-"tijdelijke limitatie in de Preview Release van Nautilus en zal niet aanwezig "
-"zijn in de uiteindelijke versie.\n"
 
-#: src/file-manager/fm-directory-view.c:1374
-msgid "Too many Files"
+#: src/file-manager/fm-directory-view.c:1537
+#, fuzzy
+msgid "Too Many Files"
 msgstr "Te veel bestanden"
 
-#: src/file-manager/fm-directory-view.c:2438
-#, c-format
+#: src/file-manager/fm-directory-view.c:2752
+#, fuzzy, c-format
 msgid ""
-"\"%s\" cannot be moved to the trash. Do you want to delete it immediately?"
+"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
 msgstr ""
 "\"%s\" kan niet naar de prullenbak worden verplaatst. Wilt u het direct "
 "verwijderen?"
 
-#: src/file-manager/fm-directory-view.c:2443
-#, c-format
+#: src/file-manager/fm-directory-view.c:2757
+#, fuzzy, c-format
 msgid ""
-"The %d selected items cannot be moved to the trash. Do you want to delete "
+"The %d selected items cannot be moved to the Trash. Do you want to delete "
 "them immediately?"
 msgstr ""
 "De %d geselecteerd items kunnen niet naar de prullenbak worden verplaatst. "
 "Wilt u ze direct verwijderen?"
 
-#: src/file-manager/fm-directory-view.c:2447
-#, c-format
+#: src/file-manager/fm-directory-view.c:2761
+#, fuzzy, c-format
 msgid ""
-"%d of the selected items cannot be moved to the trash. Do you want to delete "
+"%d of the selected items cannot be moved to the Trash. Do you want to delete "
 "those %d items immediately?"
 msgstr ""
 "%d van de geselecteerd items kunnen niet naar de prullenbak worden "
 "verplaatst. Wilt u ze deze %d items direct verwijderen?"
 
-#: src/file-manager/fm-directory-view.c:2455
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "Direct verwijderen?"
 
-#: src/file-manager/fm-directory-view.c:2456
-#: src/file-manager/fm-directory-view.c:2497
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: src/file-manager/fm-directory-view.c:2486
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
+#: src/file-manager/fm-directory-view.c:2799
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr ""
 "Weet u zeker dat u \"%s\" permanent wilt verwijderen uit de prullenbak?"
 
-#: src/file-manager/fm-directory-view.c:2490
-#, c-format
+#: src/file-manager/fm-directory-view.c:2803
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"trash?"
+"Trash?"
 msgstr ""
 "Weet u zeker dat u de %d items permanent wilt verwijderen uit de prullenbak?"
 
-#: src/file-manager/fm-directory-view.c:2496
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "Verwijderen uit de vuilnisbak?"
 
-#: src/file-manager/fm-directory-view.c:2733
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
-msgid "_Open"
-msgstr "_Open"
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
+#, fuzzy, c-format
+msgid "Use \"%s\" to open the selected item"
+msgstr "Kies een programma om de geselecteerd items mee te openen"
 
-#: src/file-manager/fm-directory-view.c:2736
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
-msgid "Open With"
-msgstr "Openen met"
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "Ander _Programma..."
 
-#: src/file-manager/fm-directory-view.c:2739
-msgid "Other Application..."
-msgstr "Ander programma..."
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "Ander _Programma..."
 
-#: src/file-manager/fm-directory-view.c:2741
-msgid "Other Viewer..."
-msgstr "Andere bekijker..."
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "Andere _Bekijker..."
 
-#: src/file-manager/fm-directory-view.c:2745
-msgid "Open in _New Window"
-msgstr "Open in _Nieuw venster"
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "Andere _Bekijker..."
 
-#: src/file-manager/fm-directory-view.c:2747
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "\"%s\" geselecteerd (%s)"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
 #, c-format
-msgid "Open in %d _New Windows"
-msgstr "Open in %d _nieuwe vensters"
+msgid "Nautilus was unable to create the directory %s."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2759
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
-msgid "New Folder"
-msgstr "Nieuwe map"
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"De %d geselecteerd items kunnen niet naar de prullenbak worden verplaatst. "
+"Wilt u ze direct verwijderen?"
 
-#: src/file-manager/fm-directory-view.c:2764
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "Open in _Nieuw venster"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#, fuzzy
+msgid "Open _in New Window"
+msgstr "_Open in Nieuw venster"
+
+#: src/file-manager/fm-directory-view.c:3959
+#, fuzzy, c-format
+msgid "Open _in %d New Windows"
+msgstr "Open in %d _nieuwe vensters"
+
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "Verwijderen uit de vuilnisbak..."
 
-#: src/file-manager/fm-directory-view.c:2766
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "Verwijderen uit de vulnisbak"
 
-#: src/file-manager/fm-directory-view.c:2769
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "Verwijder alle geselecteerd items permanent"
+
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "Verplaatsen naar de vuilnisbak"
 
-#: src/file-manager/fm-directory-view.c:2773
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
-msgid "_Duplicate"
-msgstr "_Duplicaat"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "Verplaats alle geselecteerd items naar de vuilnisbak"
 
-#: src/file-manager/fm-directory-view.c:2777
-msgid "Create _Links"
-msgstr "_Creeer verwijzingen"
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "Verwijderen"
 
-#: src/file-manager/fm-directory-view.c:2779
+#: src/file-manager/fm-directory-view.c:4015
 #: src/file-manager/nautilus-directory-view-ui.xml.h:9
-msgid "Create _Link"
-msgstr "Creer _verwijzing"
+#, fuzzy
+msgid "De_lete"
+msgstr "Verwijderen"
 
-#. No ellipses here because this command does not require further
-#. * information to be completed.
-#.
-#: src/file-manager/fm-directory-view.c:2786
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Show _Properties"
-msgstr "Laat eigenschappen zien"
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
+msgstr "_Creeer verwijzingen"
+
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
+msgstr "Creer _verwijzing"
 
-#: src/file-manager/fm-directory-view.c:2790
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "_Leeg prullenbak"
 
-#: src/file-manager/fm-directory-view.c:2792
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "_Maak prullenbak leeg"
 
-#: src/file-manager/fm-directory-view.c:2796
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
-msgid "_Select All Files"
-msgstr "_Selecteer alle bestanden"
-
-#: src/file-manager/fm-directory-view.c:2800
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "Verwijder eigen plaatjes"
 
-#: src/file-manager/fm-directory-view.c:2802
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "Verwijder eigen plaatje"
 
-#: src/file-manager/fm-directory-view.c:2806
-msgid "Reset _Background"
-msgstr "Reset achtergrond"
-
-#: src/file-manager/fm-directory-view.c:2966
-msgid "Zoom In"
-msgstr "Zoom in"
-
-#: src/file-manager/fm-directory-view.c:2968
-msgid "Zoom Out"
-msgstr "Zoom uit"
-
-#: src/file-manager/fm-directory-view.c:2970
-msgid "Normal Size"
-msgstr "Normale grootte"
-
-#: src/file-manager/fm-directory-view.c:2984
-msgid "_New Folder"
-msgstr "_Nieuwe Map"
-
-#: src/file-manager/fm-directory-view.c:3078
-#: src/file-manager/fm-directory-view.c:3309
-#, c-format
-msgid "%s Viewer"
-msgstr "%s bekijker"
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "_Bestand"
 
-#: src/file-manager/fm-directory-view.c:3345
-msgid "Delete all selected items permanently"
-msgstr "Verwijder alle geselecteerd items permanent"
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u bestanden"
 
-#: src/file-manager/fm-directory-view.c:3352
-msgid "Move all selected items to the Trash"
-msgstr "Verplaats alle geselecteerd items naar de vuilnisbak"
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "_Kopiëer text"
 
-#. NOTE to translators: DO NOT translate "Control*" part, it is a parsed string
-#. Only change the "t" part to something that makes sense in your language.
-#. This string defines Ctrl-T as "Move all selected items to the Trash"
-#: src/file-manager/fm-directory-view.c:3358
-msgid "*Control*t"
-msgstr "*Control*v"
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "Kopiëren bestanden"
 
-#: src/file-manager/fm-directory-view.c:3661
+#: src/file-manager/fm-directory-view.c:4252
+#, fuzzy
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
-"link in the trash?"
+"link in the Trash?"
 msgstr ""
 "Deze verwijzing kan niet worden gebruikt omdat er geen target is. Wilt u "
 "deze verwijzing in de vuilnisbak gooien?"
 
-#: src/file-manager/fm-directory-view.c:3664
-#, c-format
+#: src/file-manager/fm-directory-view.c:4255
+#, fuzzy, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to put this link in the trash?"
+"want to put this link in the Trash?"
 msgstr ""
 "Deze verwijzing kan niet worden gebruikt omdat \"%s\" er niet is. Wilt u "
 "deze verwijzing in de vuilnisbak gooien?"
 
-#: src/file-manager/fm-directory-view.c:3670
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "Gebroken verwijzing"
 
-#: src/file-manager/fm-directory-view.c:3671
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr "Gooi weg"
 
-#: src/file-manager/fm-directory-view.c:3733
+#: src/file-manager/fm-directory-view.c:4315
+#, c-format
+msgid ""
+"\"%s\" is an executable text file. Do you want to run it, or display its "
+"contents?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4321
+#, fuzzy
+msgid "Run or Display?"
+msgstr "Beeldscherm"
+
+#: src/file-manager/fm-directory-view.c:4322
+msgid "Run"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4323
+msgid "Display"
+msgstr "Beeldscherm"
+
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
@@ -3369,124 +7289,196 @@ msgstr ""
 "Sorry, maar je kunt geen commando's uitvoeren van een remote site als "
 "beveiligings ingreep."
 
-#: src/file-manager/fm-directory-view.c:3734
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "Kan remote links niet uitvoeren"
 
-#: src/file-manager/fm-error-reporting.c:50
+#: src/file-manager/fm-directory-view.c:4513
+#, fuzzy, c-format
+msgid "Opening \"%s\""
+msgstr "wijst naar \"%s\""
+
+#: src/file-manager/fm-directory-view.c:4519
+#, fuzzy
+msgid "Cancel Open?"
+msgstr "Hernoemen afbreken?"
+
+#: src/file-manager/fm-error-reporting.c:58
+#, fuzzy, c-format
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
+msgstr "U heeft de rechten niet om \"%s\" te bekijken."
+
+#: src/file-manager/fm-error-reporting.c:62
 #, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
+#, fuzzy, c-format
+msgid "Sorry, couldn't display all the contents of \"%s\"."
+msgstr "Sorry, kan de eigenaar van \"%s\" niet veranderen."
+
+#: src/file-manager/fm-error-reporting.c:72
+msgid "Error Displaying Folder"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:103
+#, fuzzy, c-format
 msgid ""
-"The name \"%s\" is already used in this folder.\n"
-"Please use a different name."
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "De naam \"%s\" is al ingebruik in deze map.\n"
 "Gelieve een andere naam te kiezen."
 
-#: src/file-manager/fm-error-reporting.c:55
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "You do not have the permissions necessary to rename \"%s.\""
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:113
+#, fuzzy, c-format
+msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "U heeft de rechten niet om \"%s\" te veranderen."
 
-#: src/file-manager/fm-error-reporting.c:64
+#: src/file-manager/fm-error-reporting.c:118
+#, fuzzy, c-format
+msgid ""
+"The name \"%s\" is not valid because it contains the character \"/\". Please "
+"use a different name."
+msgstr ""
+"De naam \"%s\" is al ingebruik in deze map.\n"
+"Gelieve een andere naam te kiezen."
+
+#: src/file-manager/fm-error-reporting.c:122
+#, fuzzy, c-format
+msgid "The name \"%s\" is not valid. Please use a different name."
+msgstr ""
+"De naam \"%s\" is al ingebruik in deze map.\n"
+"Gelieve een andere naam te kiezen."
+
+#: src/file-manager/fm-error-reporting.c:128
+#, c-format
+msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Sorry, kom \"%s\" niet hernoemen naar \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:69
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "Hernoem fout"
 
-#: src/file-manager/fm-error-reporting.c:85
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "U heeft de rechten niet om de groep te veranderen van \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:93
+#: src/file-manager/fm-error-reporting.c:168
+#, c-format
+msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Sorry, kan de groep iet verandere van \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:97
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "Fout tijdens zetten groep"
 
-#: src/file-manager/fm-error-reporting.c:115
+#: src/file-manager/fm-error-reporting.c:202
+#, c-format
+msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Sorry, kan de eigenaar van \"%s\" niet veranderen."
 
-#: src/file-manager/fm-error-reporting.c:119
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "Fout tijdens veranderen eigenaar"
 
-#: src/file-manager/fm-error-reporting.c:137
+#: src/file-manager/fm-error-reporting.c:234
+#, fuzzy, c-format
+msgid ""
+"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgstr "Sorry, kan de rechten van \"%s\" niet veranderen."
+
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Sorry, kan de rechten van \"%s\" niet veranderen."
 
-#: src/file-manager/fm-error-reporting.c:141
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "Fout tijdens zetten rechten"
 
-#: src/file-manager/fm-error-reporting.c:205
-#, c-format
-msgid "Renaming %s to %s."
+#: src/file-manager/fm-error-reporting.c:310
+#, fuzzy, c-format
+msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Hernoemen %s naar %s."
 
-#: src/file-manager/fm-error-reporting.c:210
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "Hernoemen afbreken?"
 
-#: src/file-manager/fm-icon-text-window.c:76
+#: src/file-manager/fm-icon-text-window.c:77
 msgid "size"
 msgstr "grootte"
 
-#: src/file-manager/fm-icon-text-window.c:77
+#: src/file-manager/fm-icon-text-window.c:78
 msgid "type"
 msgstr "type"
 
-#: src/file-manager/fm-icon-text-window.c:78
+#: src/file-manager/fm-icon-text-window.c:79
 msgid "date modified"
 msgstr "datum gemodificeerd"
 
-#: src/file-manager/fm-icon-text-window.c:79
+#: src/file-manager/fm-icon-text-window.c:80
 msgid "date changed"
 msgstr "datum veranderd"
 
-#: src/file-manager/fm-icon-text-window.c:80
+#: src/file-manager/fm-icon-text-window.c:81
 msgid "date accessed"
 msgstr "datum aangesproken"
 
-#: src/file-manager/fm-icon-text-window.c:81
+#: src/file-manager/fm-icon-text-window.c:82
 msgid "owner"
 msgstr "eigenaar"
 
-#: src/file-manager/fm-icon-text-window.c:82
+#: src/file-manager/fm-icon-text-window.c:83
 msgid "group"
 msgstr "groep"
 
-#: src/file-manager/fm-icon-text-window.c:83
+#: src/file-manager/fm-icon-text-window.c:84
 msgid "permissions"
 msgstr "permissies"
 
-#: src/file-manager/fm-icon-text-window.c:84
+#: src/file-manager/fm-icon-text-window.c:85
 msgid "octal permissions"
 msgstr "octale permissies"
 
-#: src/file-manager/fm-icon-text-window.c:85
+#: src/file-manager/fm-icon-text-window.c:86
 msgid "MIME type"
 msgstr "MIME type"
 
-#: src/file-manager/fm-icon-text-window.c:86
+#: src/file-manager/fm-icon-text-window.c:87
 msgid "none"
 msgstr "niks"
 
-#: src/file-manager/fm-icon-text-window.c:261
+#: src/file-manager/fm-icon-text-window.c:263
 msgid "Icon Captions"
 msgstr "Icoon Titels"
 
-#: src/file-manager/fm-icon-text-window.c:268
+#: src/file-manager/fm-icon-text-window.c:271
 msgid ""
 "Choose the order for information to appear beneath icon names. More "
 "information appears as you zoom in closer."
@@ -3494,167 +7486,120 @@ msgstr ""
 "Kies de manier waarop informatie beneden het icoon verschijnt. "
 "Meerinformatie verschijnt als je inzoomt."
 
-#: src/file-manager/fm-icon-view.c:152
-#: src/file-manager/nautilus-icon-view-ui.xml.h:31
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "bij _Naam"
 
-#: src/file-manager/fm-icon-view.c:153
-#: src/file-manager/nautilus-icon-view-ui.xml.h:11
+#: src/file-manager/fm-icon-view.c:169
+#: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "Houd iconen gesorteerd bij namen in regels"
 
-#: src/file-manager/fm-icon-view.c:159
-#: src/file-manager/nautilus-icon-view-ui.xml.h:32
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "bij Grootte"
 
-#: src/file-manager/fm-icon-view.c:160
-#: src/file-manager/nautilus-icon-view-ui.xml.h:12
+#: src/file-manager/fm-icon-view.c:176
+#: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "Houd iconen gesorteerd bij grootte in regels"
 
-#: src/file-manager/fm-icon-view.c:166
-#: src/file-manager/nautilus-icon-view-ui.xml.h:33
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "bij _Type"
 
-#: src/file-manager/fm-icon-view.c:167
-#: src/file-manager/nautilus-icon-view-ui.xml.h:13
+#: src/file-manager/fm-icon-view.c:183
+#: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "Houd inconen gesorteerd bij type in regels"
 
-#: src/file-manager/fm-icon-view.c:173
-#: src/file-manager/nautilus-icon-view-ui.xml.h:29
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "bij Veranderde Datum"
 
-#: src/file-manager/fm-icon-view.c:174
-#: src/file-manager/nautilus-icon-view-ui.xml.h:10
+#: src/file-manager/fm-icon-view.c:190
+#: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Houd iconen gesorteerd bij modificatie datum in regels"
 
-#: src/file-manager/fm-icon-view.c:180
-#: src/file-manager/nautilus-icon-view-ui.xml.h:30
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "by _Emblemen"
 
-#: src/file-manager/fm-icon-view.c:181
-#: src/file-manager/nautilus-icon-view-ui.xml.h:9
+#: src/file-manager/fm-icon-view.c:197
+#: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Houd iconen gesorteerd bij emblemen in regels"
 
-#: src/file-manager/fm-icon-view.c:504
-#: src/file-manager/nautilus-icon-view-ui.xml.h:26
-msgid "_Stretch Icon"
-msgstr "_Stretch Icoon"
-
-#: src/file-manager/fm-icon-view.c:513
-#: src/file-manager/nautilus-icon-view-ui.xml.h:25
+#: src/file-manager/fm-icon-view.c:1241
+#: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "He_rstel iconen originele groottes"
 
-#: src/file-manager/fm-icon-view.c:515
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "Herstel iconen originele groottes"
 
-#: src/file-manager/fm-icon-view.c:520
-#: src/file-manager/nautilus-icon-view-ui.xml.h:22
-msgid "_Icon Captions..."
-msgstr "_Icon titels..."
-
-#. Modify file name. We only allow this on a single file selection.
-#: src/file-manager/fm-icon-view.c:523
-#: src/file-manager/nautilus-icon-view-ui.xml.h:24
-msgid "_Rename"
-msgstr "He_rnoem"
-
-#: src/file-manager/fm-icon-view.c:527
-#: src/file-manager/nautilus-icon-view-ui.xml.h:21
-msgid "_Clean Up by Name"
-msgstr "Schoon op bij naam"
-
-#: src/file-manager/fm-icon-view.c:530
-msgid "_Use Tighter Layout"
-msgstr "Gebruik tighter layout"
-
-#: src/file-manager/fm-icon-view.c:534
-#: src/file-manager/nautilus-icon-view-ui.xml.h:16
-msgid "Re_versed Order"
-msgstr "Omgekeerde volgorde"
-
-#: src/file-manager/fm-icon-view.c:538
-#: src/file-manager/nautilus-icon-view-ui.xml.h:23
-msgid "_Lay out items"
-msgstr "Layout items"
-
-#: src/file-manager/fm-icon-view.c:541
-#: src/file-manager/nautilus-icon-view-ui.xml.h:28
-msgid "_manually"
-msgstr "manueel"
-
-#: src/file-manager/fm-icon-view.c:1757
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "wijst naar \"%s\""
 
-#: src/file-manager/fm-list-view.c:1896
-#: src/file-manager/fm-search-list-view.c:284
-#: src/nautilus-search-bar-criterion.c:69
+#: src/file-manager/fm-list-view.c:2188
+#: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Grootte"
 
-#: src/file-manager/fm-list-view.c:1902
-#: src/file-manager/fm-search-list-view.c:290
-#: src/nautilus-search-bar-criterion.c:68
+#: src/file-manager/fm-list-view.c:2194
+#: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Type"
 
-#: src/file-manager/fm-list-view.c:1908
-#: src/file-manager/fm-search-list-view.c:296
+#: src/file-manager/fm-list-view.c:2200
+#: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Datum gemodificeerd"
 
-#: src/file-manager/fm-properties-window.c:456
+#: src/file-manager/fm-properties-window.c:522
 #, c-format
 msgid "%s Properties"
 msgstr "%s Eigenschappen"
 
-#: src/file-manager/fm-properties-window.c:588
+#: src/file-manager/fm-properties-window.c:717
 msgid "Cancel Group Change?"
 msgstr "Annuleer groep veranderingen?"
 
-#: src/file-manager/fm-properties-window.c:589
+#: src/file-manager/fm-properties-window.c:718
 msgid "Changing group"
 msgstr "Veranderd groep"
 
-#: src/file-manager/fm-properties-window.c:734
+#: src/file-manager/fm-properties-window.c:879
 msgid "Cancel Owner Change?"
 msgstr "Annuleer eigenaar veranderen?"
 
-#: src/file-manager/fm-properties-window.c:735
+#: src/file-manager/fm-properties-window.c:880
 msgid "Changing owner"
 msgstr "Eigenaar veranderen"
 
-#: src/file-manager/fm-properties-window.c:892
+#: src/file-manager/fm-properties-window.c:1063
 msgid "nothing"
 msgstr "niets"
 
-#: src/file-manager/fm-properties-window.c:894
+#: src/file-manager/fm-properties-window.c:1065
 msgid "unreadable"
 msgstr "onleesbaar"
 
-#: src/file-manager/fm-properties-window.c:903
+#: src/file-manager/fm-properties-window.c:1074
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 item, met grootte %s"
 
-#: src/file-manager/fm-properties-window.c:905
+#: src/file-manager/fm-properties-window.c:1076
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d items, totaal %s"
 
-#: src/file-manager/fm-properties-window.c:911
+#: src/file-manager/fm-properties-window.c:1082
 msgid "(some contents unreadable)"
 msgstr "(sommige inhoud niet leesbaar)"
 
@@ -3663,116 +7608,339 @@ msgstr "(sommige inhoud niet leesbaar)"
 #. * "Contents:" title to line up with the first line of the 2-line value.
 #. * Maybe there's a better way to do this, but I couldn't think of one.
 #.
-#: src/file-manager/fm-properties-window.c:925
+#: src/file-manager/fm-properties-window.c:1096
 msgid "Contents:"
 msgstr "Inhoud:"
 
-#: src/file-manager/fm-properties-window.c:1079
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "Basis"
 
-#: src/file-manager/fm-properties-window.c:1143
-msgid "Where:"
-msgstr "Waar:"
-
-#: src/file-manager/fm-properties-window.c:1145
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Type:"
 
-#: src/file-manager/fm-properties-window.c:1151
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "Grootte:"
 
-#: src/file-manager/fm-properties-window.c:1154
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "Link sets"
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
+msgstr "MIME type:"
+
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "Gemodificeerd:"
 
-#: src/file-manager/fm-properties-window.c:1156
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "Toegang:"
 
-#: src/file-manager/fm-properties-window.c:1159
-msgid "MIME type:"
-msgstr "MIME type:"
-
-#: src/file-manager/fm-properties-window.c:1293
-msgid "Emblems"
-msgstr "Emblemen"
+#: src/file-manager/fm-properties-window.c:1552
+msgid "Select Custom Icon..."
+msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1526
-msgid "Special Flags:"
-msgstr "Speciale vlaggen:"
+#: src/file-manager/fm-properties-window.c:1558
+#, fuzzy
+msgid "Remove Custom Icon"
+msgstr "Verwijder eigen plaatje"
 
-#: src/file-manager/fm-properties-window.c:1530
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "Zet gebruiks ID"
 
-#: src/file-manager/fm-properties-window.c:1534
+#: src/file-manager/fm-properties-window.c:1891
+msgid "Special Flags:"
+msgstr "Speciale vlaggen:"
+
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "Zet groep ID"
 
-#: src/file-manager/fm-properties-window.c:1538
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "Vast"
 
-#: src/file-manager/fm-properties-window.c:1549
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Permissies"
 
-#: src/file-manager/fm-properties-window.c:1555
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "U bent niet de eigenaar en kan dus geen eigenschappen veranderen."
 
-#: src/file-manager/fm-properties-window.c:1582
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "Bestands eigenaar:"
 
-#: src/file-manager/fm-properties-window.c:1592
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "Bestands groep:"
 
-#: src/file-manager/fm-properties-window.c:1610
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "Eigenaar:"
 
-#: src/file-manager/fm-properties-window.c:1613
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "Groep:"
 
-#: src/file-manager/fm-properties-window.c:1616
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "Andere:"
 
-#: src/file-manager/fm-properties-window.c:1619
+#: src/file-manager/fm-properties-window.c:1989
+msgid "Read"
+msgstr "Lees"
+
+#: src/file-manager/fm-properties-window.c:1993
+msgid "Write"
+msgstr "Schrijf"
+
+#: src/file-manager/fm-properties-window.c:1997
+msgid "Execute"
+msgstr "Uitvoeren"
+
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "Tekst bekijken:"
 
-#: src/file-manager/fm-properties-window.c:1622
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "Numeriek bekijken:"
 
-#: src/file-manager/fm-properties-window.c:1625
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "Laatst veranderd:"
 
-#: src/file-manager/fm-properties-window.c:1629
-msgid "Read"
-msgstr "Lees"
+#: src/file-manager/fm-properties-window.c:2054
+#, c-format
+msgid "The permissions of \"%s\" could not be determined."
+msgstr "De eigenschapen van \"%s\" konden niet worden gevonden."
 
-#: src/file-manager/fm-properties-window.c:1633
-msgid "Write"
-msgstr "Schrijf"
+#: src/file-manager/fm-properties-window.c:2334
+#, fuzzy
+msgid "Cancel Showing Properties Window?"
+msgstr "Laat speciale vlaggen zien in eigenschappen scherm"
 
-#: src/file-manager/fm-properties-window.c:1637
-msgid "Execute"
-msgstr "Uitvoeren"
+#: src/file-manager/fm-properties-window.c:2335
+#, fuzzy
+msgid "Creating Properties window"
+msgstr "Laat speciale vlaggen zien in eigenschappen scherm"
 
-#: src/file-manager/fm-properties-window.c:1699
+#: src/file-manager/fm-properties-window.c:2435
+#, fuzzy
+msgid "Select an icon:"
+msgstr "Selecteer een kleur om toe te voegen:"
+
+#: src/file-manager/fm-search-list-view.c:124
+#, fuzzy
+msgid "Search Results"
+msgstr "Zoek instellingen"
+
+#: src/file-manager/fm-search-list-view.c:142
 #, c-format
-msgid "The permissions of \"%s\" could not be determined."
-msgstr "De eigenschapen van \"%s\" konden niet worden gevonden."
+msgid ""
+"Search results may not include items modified after %s, when your drive was "
+"last indexed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:158
+msgid ""
+"Sorry, but the Medusa search service is not available because it is not "
+"installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:159
+#: src/file-manager/nautilus-indexing-info.c:407
+#, fuzzy
+msgid "Search Service Not Available"
+msgstr "Zoek service niet beschikbaar"
+
+#. FIXME bugzilla.eazel.com 5058: Should be two messages, one for each of whether
+#. "slow complete search" turned on or not
+#: src/file-manager/fm-search-list-view.c:184
+msgid ""
+"The search you have selected is newer than the index on your system.  The "
+"search will return no results right now.  Would you like to create a new "
+"index now?"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:189
+#, fuzzy
+msgid "Search for items that are too new"
+msgstr "Zoek op bestanden met alleen de tekst"
+
+#: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
+msgid "Create a new index"
+msgstr "Creer een nieuw venster"
+
+#: src/file-manager/fm-search-list-view.c:191
+msgid "Don't create index"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:200
+msgid ""
+"Every indexed file on your computer matches the criteria you selected. You "
+"can check the spelling on your selections or add more criteria to narrow "
+"your results."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:204
+#: src/file-manager/fm-search-list-view.c:218
+#, fuzzy
+msgid "Error during search"
+msgstr "Fout tijdens veranderen eigenaar"
+
+#: src/file-manager/fm-search-list-view.c:213
+#, c-format
+msgid "An error occurred while loading this search's contents: %s"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:241
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Find can't access your index right now so a slower search will be performed "
+"that doesn't use the index."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:246
+msgid ""
+"To do a content search, Find requires an index of the files on your system.  "
+"Find can't access your index right now. "
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast searches are not available"
+msgstr "Zoek service niet beschikbaar"
+
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:319
+#: src/file-manager/fm-search-list-view.c:338
+#, fuzzy
+msgid "Content searches are not available"
+msgstr "Zoek service niet beschikbaar"
+
+#: src/file-manager/fm-search-list-view.c:254
+msgid ""
+"Your index files are available but the Medusa search daemon, which handles "
+"index requests, isn't running.  To start this program, log in as root and "
+"enter this command at the command line: medusa-searchd"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:274
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Your computer does not have an index right now.  Because Find cannot use an "
+"index, this search may take several minutes.  Would you like to create an "
+"index? Creating an index will be done while you are not actively using your "
+"computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:283
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  Your computer does not have an index right now.  Would you like to "
+"create an index?  Creating an index will be done while you are not actively "
+"using your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:290
+#: src/file-manager/fm-search-list-view.c:318
+#: src/file-manager/fm-search-list-view.c:337
+#, fuzzy
+msgid "Indexed searches are not available"
+msgstr "Zoek service niet beschikbaar"
+
+#: src/file-manager/fm-search-list-view.c:294
+#, fuzzy
+msgid "Create an Index"
+msgstr "Creer een nieuw venster"
 
-#: src/file-manager/fm-search-list-view.c:278
+#: src/file-manager/fm-search-list-view.c:295
+#, fuzzy
+msgid "Don't Create an Index Now"
+msgstr "Creer een nieuw venster"
+
+#: src/file-manager/fm-search-list-view.c:306
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Your computer is currently creating that index.   Because Find cannot use an "
+"index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:312
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  Your computer is currently creating that index.  Content searches "
+"will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:326
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  An "
+"index can't be created right now. When an index is not available, searches "
+"will take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:332
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  An index can't be created right now."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:341
+msgid ""
+"The program that creates an index is not set up correctly.  You can create "
+"an index by hand by running \"medusa-indexd\" as root on the command line."
+msgstr ""
+
+#. It is not necessary to translate this text just yet; it has not been
+#. edited yet, and will be replaced by a final copy in a few days.
+#: src/file-manager/fm-search-list-view.c:360
+#: src/file-manager/nautilus-indexing-info.c:342
+msgid ""
+"To do a fast search, Find requires an index of the files on your system. "
+"Your system administrator has disabled fast search on your computer, so no "
+"index is available."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:364
+msgid "Fast searches are not available on your computer"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:373
+#: src/file-manager/nautilus-indexing-info.c:361
+msgid ""
+"To do a fast search, Find requires an index of the files on your system. "
+"Fast search is disabled in your Search preferences, so no index is available."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:376
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
+msgid "Fast searches are not available on your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:377
+#: src/file-manager/nautilus-indexing-info.c:366
+msgid ""
+"To enable fast search, open the Preferences menu and choose Preferences. "
+"Then select Search preferences and put a checkmark in the Enable Fast Search "
+"checkbox. An index will be generated while your computer is idle, so your "
+"index won't be available immediately."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:551
 msgid "Where"
 msgstr "Waar"
 
@@ -3781,8 +7949,8 @@ msgstr "Waar"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:331
-#: src/file-manager/nautilus-search-list-view-ui.xml.h:10
+#: src/file-manager/fm-search-list-view.c:603
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Reveal in nieuw venster"
 
@@ -3792,248 +7960,620 @@ msgstr "_Reveal in nieuw venster"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:339
+#: src/file-manager/fm-search-list-view.c:611
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Reveal in %d nieuwe vensters"
 
+#. Note that the number of items actually displayed varies somewhat due
+#. * to the way files are collected in batches. So you can't assume that
+#. * no more than the constant limit are displayed.
 #.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/fm-search-list-view.c:723
+msgid ""
+"Nautilus found more search results than it can display. Some matching items "
+"will not be displayed. "
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:725
+#, fuzzy
+msgid "Too Many Matches"
+msgstr "Te veel bestanden"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:1
+msgid "Change Desktop Background"
+msgstr "Verder bureaubladachtergrond"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#, fuzzy
+msgid "Delete all items in the Trash"
+msgstr "Verwijder alle items in de vuilnisbak"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
+msgid "Disks"
+msgstr "Schijven"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:5
+msgid "Mount or unmount disks"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:6
+msgid "New Terminal"
+msgstr "Nieuwe terminal"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:7
+#, fuzzy
+msgid "Open a new GNOME terminal window"
+msgstr "Open elk item in een nieuw scherm"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:8
+#, fuzzy
+msgid "Remove any custom pattern or color from the desktop background"
+msgstr "Verwijder het eigen plaatje van de geselecteerde iconen"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
+msgid "Reset Desktop Background"
+msgstr "Reset Bureaubladachtergrond"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:10
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+msgid "Choose a program with which to open the selected item"
+msgstr "Kies een programma om de geselecteerd items mee te openen"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:2
 msgid "Choose another application with which to open the selected item"
 msgstr "Kies een ander programma om het geselecteerde item mee te openen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:3
 msgid "Choose another viewer with which to view the selected item"
 msgstr "Kies een andere beijker om het item mee te bekijken"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:4
+#, fuzzy
+msgid "Copy Files"
+msgstr "Kopiëren bestanden"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "Maak een nieuwe lege map in deze map"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "Maak een symbolische verwijzing naar elk item"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u bestanden"
+
 #: src/file-manager/nautilus-directory-view-ui.xml.h:12
-msgid "Delete all items in the trash"
-msgstr "Verwijder alle items in de vuilnisbak"
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "Verplaats alle geselecteerd items naar de vuilnisbak"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#, fuzzy
+msgid "Duplicate"
+msgstr "_Duplicaat"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "Dupliceer elk item"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "Gebroken verwijzing"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr "Verplaats alle geselecteerd items naar de vuilnisbak"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#, fuzzy
+msgid "Move to Trash"
+msgstr "Verplaatsen naar de vuilnisbak"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+msgid "New Folder"
+msgstr "Nieuwe map"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#, fuzzy
+msgid "Open"
+msgstr "_Open"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#, fuzzy
+msgid "Open Wit_h"
+msgstr "Openen met"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "Open With"
+msgstr "Openen met"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "Open elk geselecteerd item in een nieuw venster"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#, fuzzy
+msgid "Open in New Window"
+msgstr "Open in _Nieuw venster"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Open het geselecteerd item in dit venster"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
-msgid "Other _Application..."
-msgstr "Ander _Programma..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+msgid "Other Application..."
+msgstr "Ander programma..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
-msgid "Other _Viewer..."
-msgstr "Andere _Bekijker..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+msgid "Other Viewer..."
+msgstr "Andere bekijker..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "tekst bestanden"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#, fuzzy
+msgid "Remove Custom Images"
+msgstr "Verwijder eigen plaatjes"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr "Verwijder het eigen plaatje van de geselecteerde iconen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+msgid "Remove any custom pattern or color from the background of this location"
+msgstr ""
+
+#. add the reset background item, possibly disabled
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
+msgid "Reset Background"
+msgstr "Herstel achtergrond"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+msgid "Scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#, fuzzy
+msgid "Select All Files"
+msgstr "_Selecteer alle bestanden"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#, fuzzy
+msgid "Select _All Files"
+msgstr "_Selecteer alle bestanden"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "Selecteer alle items in dit venster"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#, fuzzy
+msgid "Show Properties"
+msgstr "Laat eigenschappen zien"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#, fuzzy
+msgid "Show Trash"
+msgstr "Vuilnisbak"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+msgid "Show _Properties"
+msgstr "Laat eigenschappen zien"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#, fuzzy
+msgid "Show the contents of the Trash"
+msgstr "Laat de inhoud zien op normale grootte"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "Bekijk of verander de eigenschappen van elk geselecteerd item"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
-msgid "_Open in New Window"
-msgstr "_Open in Nieuw venster"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+msgid "_Duplicate"
+msgstr "_Duplicaat"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+msgid "_New Folder"
+msgstr "_Nieuwe Map"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+msgid "_Open"
+msgstr "_Open"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "_Plak tekst"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
+#, fuzzy
+msgid "_Show Trash"
+msgstr "Vuilnisbak"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#, fuzzy
+msgid "By Emblems"
+msgstr "by _Emblemen"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:2
+#, fuzzy
+msgid "By Modification Date"
+msgstr "bij Veranderde Datum"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:3
+#, fuzzy
+msgid "By Modification _Date"
+msgstr "bij Veranderde Datum"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:4
+#, fuzzy
+msgid "By Name"
+msgstr "bij _Naam"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:5
+#, fuzzy
+msgid "By Size"
+msgstr "bij Grootte"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:6
+#, fuzzy
+msgid "By Type"
+msgstr "bij _Type"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
 #: src/file-manager/nautilus-icon-view-ui.xml.h:7
+#, fuzzy
+msgid "By _Emblems"
+msgstr "by _Emblemen"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:8
+#, fuzzy
+msgid "By _Name"
+msgstr "bij _Naam"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:9
+#, fuzzy
+msgid "By _Size"
+msgstr "bij Grootte"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:10
+#, fuzzy
+msgid "By _Type"
+msgstr "bij _Type"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:11
 msgid "Choose which information appears beneath each icon's name"
 msgstr "Kies welke informatie onder een icoon verschijnt"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:8
+#: src/file-manager/nautilus-icon-view-ui.xml.h:12
+#, fuzzy
+msgid "Clean Up by Name"
+msgstr "Schoon op bij naam"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:13
 msgid "Display icons in the opposite order"
 msgstr "Laat iconen zien in omgekeerde volgorde"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:14
+#, fuzzy
+msgid "Icon Captions..."
+msgstr "_Icon titels..."
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:20
+#, fuzzy
+msgid "Lay Out Items"
+msgstr "Layout items"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:21
 msgid "Leave icons wherever they are dropped"
 msgstr "Laat iconen waar ze zijn neergezet"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:15
+#: src/file-manager/nautilus-icon-view-ui.xml.h:22
 msgid "Make the selected icon stretchable"
 msgstr "Make het icoon schaalbaar"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:17
+#: src/file-manager/nautilus-icon-view-ui.xml.h:23
+#, fuzzy
+msgid "Manually"
+msgstr "Gebruiksaanwijzing"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:24
+msgid "Re_versed Order"
+msgstr "Omgekeerde volgorde"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:26
 msgid "Rename selected icon"
 msgstr "Hernoem geselecteerd icoon"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:18
+#: src/file-manager/nautilus-icon-view-ui.xml.h:27
 msgid "Reposition icons to better fit in the window and avoid overlapping"
 msgstr ""
 "Wijzig de positie van de iconen zodat ze beter in het venster passen en niet "
 "overlappen"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:19
+#: src/file-manager/nautilus-icon-view-ui.xml.h:28
+#, fuzzy
+msgid "Restore Icons' Original Sizes"
+msgstr "He_rstel iconen originele groottes"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:29
 msgid "Restore each selected icon to its original size"
 msgstr "Herstel de grootte van elke icoon naar zijn origineel"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:20
+#: src/file-manager/nautilus-icon-view-ui.xml.h:30
+#, fuzzy
+msgid "Reversed Order"
+msgstr "Omgekeerde volgorde"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:31
+#, fuzzy
+msgid "Stretch Icon"
+msgstr "_Stretch Icoon"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:32
+#, fuzzy
+msgid "Tighter Layout"
+msgstr "_Strakkere opmaak"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:33
 msgid "Toggle using a tighter layout scheme"
 msgstr "Aan/uitzetten van gebruik van een strakker opmaak schema"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:27
-msgid "_Tighter Layout"
-msgstr "_Strakkere opmaak"
+#: src/file-manager/nautilus-icon-view-ui.xml.h:34
+msgid "_Clean Up by Name"
+msgstr "Schoon op bij naam"
 
-#: src/file-manager/nautilus-indexing-info.c:106
-msgid "Busy"
-msgstr "Bezig"
+#: src/file-manager/nautilus-icon-view-ui.xml.h:35
+msgid "_Icon Captions..."
+msgstr "_Icon titels..."
 
-#: src/file-manager/nautilus-indexing-info.c:109
-msgid "No response"
-msgstr "Geen antwoord"
+#: src/file-manager/nautilus-icon-view-ui.xml.h:36
+#, fuzzy
+msgid "_Lay Out Items"
+msgstr "Layout items"
 
-#: src/file-manager/nautilus-indexing-info.c:112
-msgid "No indexer present"
-msgstr "Geen indexer aanwezig"
+#: src/file-manager/nautilus-icon-view-ui.xml.h:37
+#, fuzzy
+msgid "_Manually"
+msgstr "manueel"
 
-#: src/file-manager/nautilus-indexing-info.c:120
-#, c-format
-msgid "Error while trying to reindex: %s"
-msgstr "Fout tijdens herindexeren: %s"
+#: src/file-manager/nautilus-icon-view-ui.xml.h:38
+msgid "_Rename"
+msgstr "He_rnoem"
 
-#: src/file-manager/nautilus-indexing-info.c:163
-msgid "%I:%M %p, %x"
-msgstr "%I.%M %p, %x"
+#: src/file-manager/nautilus-icon-view-ui.xml.h:40
+msgid "_Stretch Icon"
+msgstr "_Stretch Icoon"
 
-#: src/file-manager/nautilus-indexing-info.c:179
-#, c-format
-msgid "Your files were last indexed at %s"
-msgstr "Uw bestanden zijn voor het laatst geindexeerd op %s"
+#: src/file-manager/nautilus-icon-view-ui.xml.h:41
+msgid "_Tighter Layout"
+msgstr "_Strakkere opmaak"
 
-#: src/file-manager/nautilus-indexing-info.c:190
-msgid "Update Now"
-msgstr "Nu opwaarderen"
+#: src/file-manager/nautilus-indexing-info.c:85
+msgid "Indexing is %d%% complete."
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:210
-msgid "Your files are currently being indexed:"
-msgstr "Uw bestanden worden nu geindexeerd:"
+#: src/file-manager/nautilus-indexing-info.c:175
+msgid "The indexer is currently busy."
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:270
-msgid "Search service not available"
-msgstr "Zoek service niet beschikbaar"
+#: src/file-manager/nautilus-indexing-info.c:180
+msgid ""
+"An indexer is not running, or is not responding to requests to reindex your "
+"computer."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:185
+msgid ""
+"An attempt to reindex, caused an Internal Indexer Error.  Tell "
+"rebecka@eazel.com"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:282
-msgid "Indexing Info..."
-msgstr "Indexeren Informatie..."
+#: src/file-manager/nautilus-indexing-info.c:194
+#, fuzzy
+msgid "Reindexing Failed"
+msgstr "Bekijken faalde"
 
-#: src/file-manager/nautilus-indexing-info.c:295
+#: src/file-manager/nautilus-indexing-info.c:216
+#, fuzzy
 msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast. If you need to update your index now, click on the \"Update Now\" "
+"button."
+msgstr ""
 "Once a day your files and text content are indexed so\n"
 "your searches are fast.  If you need to update your index\n"
 "now, click on the \"Update Now\" button for the\n"
 "appropriate index.\n"
+
+#: src/file-manager/nautilus-indexing-info.c:219
+#: src/file-manager/nautilus-indexing-info.c:226
+#: src/file-manager/nautilus-indexing-info.c:281
+#, fuzzy
+msgid "Indexing Status"
+msgstr "Geef _Indexeer Status weer"
+
+#. FIXME: Do we want to talk about the index not being available?
+#: src/file-manager/nautilus-indexing-info.c:224
+#, fuzzy
+msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast. "
 msgstr ""
 "Once a day your files and text content are indexed so\n"
 "your searches are fast.  If you need to update your index\n"
 "now, click on the \"Update Now\" button for the\n"
 "appropriate index.\n"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: src/file-manager/nautilus-search-list-view-ui.xml.h:7
+#: src/file-manager/nautilus-indexing-info.c:236
+#, c-format
+msgid "Your files were last indexed at %s"
+msgstr "Uw bestanden zijn voor het laatst geindexeerd op %s"
+
+#: src/file-manager/nautilus-indexing-info.c:249
+msgid "Update Now"
+msgstr "Nu opwaarderen"
+
+#: src/file-manager/nautilus-indexing-info.c:279
+#, fuzzy
+msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast.  Your files are currently being indexed."
+msgstr ""
+"Once a day your files and text content are indexed so\n"
+"your searches are fast.  If you need to update your index\n"
+"now, click on the \"Update Now\" button for the\n"
+"appropriate index.\n"
+
+#: src/file-manager/nautilus-indexing-info.c:406
+#, fuzzy
+msgid "Sorry, but the medusa search service is not available."
+msgstr "Zoek service niet beschikbaar"
+
+#: src/file-manager/nautilus-indexing-info.c:428
+msgid "%I:%M %p, %x"
+msgstr "%I.%M %p, %x"
+
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:1
 msgid "Reveal each selected item in its original folder"
 msgstr "Reveal elke geselecteerd item in zijn originele map"
 
-#: src/file-manager/nautilus-search-list-view-ui.xml.h:8
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:2
+#, fuzzy
+msgid "Reveal in New Window"
+msgstr "_Reveal in nieuw venster"
+
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:3
+#, fuzzy
+msgid "Show Indexing Status"
+msgstr "Geef _Indexeer Status weer"
+
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:4
 msgid "Show _Indexing Status"
 msgstr "Geef _Indexeer Status weer"
 
-#: src/file-manager/nautilus-search-list-view-ui.xml.h:9
-msgid "Show status of indexing used by searching"
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:5
+#, fuzzy
+msgid "Show status of indexing used when searching"
 msgstr "Geef status van indexeren weer die gebruik word bij zoeken"
 
-#. set the window title
-#: src/nautilus-about.c:139
+#. set the window title and standard close key accelerator
+#: src/nautilus-about.c:141
 msgid "About Nautilus"
 msgstr "Over Nautilus"
 
 #. draw the authors title
-#: src/nautilus-about.c:355
+#: src/nautilus-about.c:361
 msgid "Authors"
 msgstr "Auteurs"
 
-#: src/nautilus-application.c:234
-msgid "User Directory"
-msgstr "Gebruikers map"
+#: src/nautilus-application.c:275
+#, fuzzy
+msgid "Couldn't Create Required Folder"
+msgstr "Kan map niet lezen"
 
-#: src/nautilus-application.c:239
-msgid "User Main Directory"
-msgstr "Gebruikers hoofdmap"
+#: src/nautilus-application.c:276
+#, c-format
+msgid ""
+"Nautilus could not create the required folder \"%s\". Before running "
+"Nautilus, please create this folder, or set permissions such that Nautilus "
+"can create it."
+msgstr ""
 
-#: src/nautilus-application.c:244
-msgid "Desktop Directory"
-msgstr "Desktop map"
+#: src/nautilus-application.c:281
+#, fuzzy
+msgid "Couldn't Create Required Folders"
+msgstr "Kan map niet lezen"
 
-#: src/nautilus-application.c:259
-msgid "Missing Directories"
-msgstr "Missende map"
+#: src/nautilus-application.c:282
+#, c-format
+msgid ""
+"Nautilus could not create the following required folders:\n"
+"\n"
+"%s\n"
+"\n"
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
+msgstr ""
 
 #. Can't register myself due to trouble locating the
-#. * nautilus.oafinfo file. This has happened when you
+#. * Nautilus_Shell.oaf file. This has happened when you
 #. * launch Nautilus with an LD_LIBRARY_PATH that
 #. * doesn't include the directory containg the oaf
 #. * library. It could also happen if the
-#. * nautilus.oafinfo file was not present for some
+#. * Nautilus_Shell.oaf file was not present for some
 #. * reason. Sometimes killing oafd and gconfd fixes
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:358
+#: src/nautilus-application.c:407
 msgid ""
-"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
-"again may fix the problem."
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again."
 msgstr ""
-"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
-"again may fix the problem."
 
 #. FIXME bugzilla.eazel.com 2536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:362
+#: src/nautilus-application.c:413
 msgid ""
-"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
-"again may fix the problem.\n"
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again.\n"
+"\n"
+"OAF couldn't locate the Nautilus_shell.oaf file. One cause of this seems to "
+"be an LD_LIBRARY_PATH that does not include the oaf library's directory. "
+"Another possible cause would be bad install with a missing "
+"Nautilus_Shell.oaf file.\n"
 "\n"
-"OAF couldn't locate the nautilus.oafinfo file. One cause of this seems to be "
-"an LD_LIBRARY_PATH that does not include the oaf library's directory. "
-"Another possible cause would be bad install with a missing nautilus.oafinfo "
-"file.\n"
+"Running \"nautilus-clean.sh -x\" will kill all OAF and GConf processes, "
+"which may be needed by other applications.\n"
 "\n"
 "Sometimes killing oafd and gconfd fixes the problem, but we don't know why.\n"
 "\n"
-"We need a much less confusing message here for Nautilus 1.0."
+"We have also seen this error when a faulty version of oaf was installed."
 msgstr ""
 
 #. Some misc. error (can never happen with current
@@ -4045,987 +8585,1314 @@ msgstr ""
 #. * wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:387 src/nautilus-application.c:405
+#: src/nautilus-application.c:444 src/nautilus-application.c:462
+#: src/nautilus-application.c:469
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "nautilus kan niet worden gebruikt door een onherkenbare fout."
 
-#: src/nautilus-application.c:388
+#: src/nautilus-application.c:445
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
 "attempting to register the file manager view server."
 msgstr ""
 
-#: src/nautilus-application.c:406
+#: src/nautilus-application.c:463
+#, fuzzy
+msgid ""
+"Nautilus can't be used now, due to an unexpected error from OAF when "
+"attempting to locate the factory.Killing oafd and restarting Nautilus may "
+"help fix the problem."
+msgstr ""
+"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
+"again may fix the problem."
+
+#: src/nautilus-application.c:470
+#, fuzzy
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
-"attempting to locate the factory."
+"attempting to locate the shell object. Killing oafd and restarting Nautilus "
+"may help fix the problem."
 msgstr ""
+"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
+"again may fix the problem."
 
-#: src/nautilus-application.c:547
+#: src/nautilus-application.c:635
 msgid ""
-"You are running Nautilus as root.\n"
+"You are about to run Nautilus as root.\n"
 "\n"
 "As root, you can damage your system if you are not careful, and\n"
 "Nautilus will not stop you from doing it."
 msgstr ""
 
-#: src/nautilus-bookmarks-window.c:125
+#: src/nautilus-bookmarks-window.c:127
 msgid "Bookmarks"
 msgstr "Bladwijzers"
 
-#: src/nautilus-bookmarks-window.c:174
+#: src/nautilus-bookmarks-window.c:177
 msgid "Location"
 msgstr "Lokatie"
 
-#: src/nautilus-bookmarks-window.c:187 src/nautilus-window-menus.c:778
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: src/nautilus-first-time-druid.c:112
+#: src/nautilus-complex-search-bar.c:233
+#, fuzzy
+msgid "More Options"
+msgstr "Icoon Titels"
+
+#: src/nautilus-complex-search-bar.c:243
+msgid "Fewer Options"
+msgstr ""
+
+#. Create button first so we can use it for auto_click
+#: src/nautilus-complex-search-bar.c:261 src/nautilus-simple-search-bar.c:129
+msgid "Find Them!"
+msgstr "Zoek ze!"
+
+#: src/nautilus-first-time-druid.c:191
 msgid ""
-"Existence of this file indicates that the Nautilus configuration wizard\n"
+"Existence of this file indicates that the Nautilus configuration druid\n"
 "has been presented.\n"
 "\n"
-"You can manually erase this file to present the wizard again.\n"
+"You can manually erase this file to present the druid again.\n"
 "\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:348
+#: src/nautilus-first-time-druid.c:487
 msgid ""
-"User levels provide a way to adjust the software to your\n"
-"level of technical expertise.  Pick an initial level that you\n"
-"feel comfortable with; you can always change it later."
+"Your user level adjusts Nautilus to your degree of experience\n"
+"using GNOME and Linux. Choose a level that's comfortable for\n"
+"you - you can always change it later."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:358
+#: src/nautilus-first-time-druid.c:498
 msgid ""
-"For beginner users that are not yet\n"
-"familiar with the working of GNOME and Linux."
+"For users who have no previous experience with GNOME\n"
+"and Linux."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:365
+#: src/nautilus-first-time-druid.c:504
 msgid ""
-"For non-technical users that are comfortable with\n"
-"their GNOME and Linux environment."
+"For users who are comfortable with GNOME and Linux,\n"
+"but don't describe themselves as ``technical.''"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:371
+#: src/nautilus-first-time-druid.c:510
 msgid ""
-"For users that have the need to be exposed\n"
-"to every detail of their operating system."
+"For users who have GNOME and Linux experience, and\n"
+"like to see every detail of the operating system."
 msgstr ""
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:406
+#: src/nautilus-first-time-druid.c:548
 msgid ""
-"Eazel offers a growing number of services to help you\n"
-" install and maintain new software and manage your files\n"
-" across the network.  Choose an option below, and the\n"
-"information will be presented in Nautilus after you've\n"
-"finished setting up."
+"To verify your Internet connection and make sure you have\n"
+"the latest Nautilus updates, Nautilus will now connect to\n"
+"Eazel's web site. This will take seconds if your copy of\n"
+"Nautilus is recent; longer (but no more than a minute or two)\n"
+"if you need an update.\n"
+"\n"
+"If you know your computer uses a proxy connection, click\n"
+"Verify and Nautilus will use it.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:410
-msgid "Eazel Services"
-msgstr "Eazel Services"
+#: src/nautilus-first-time-druid.c:562
+#, fuzzy
+msgid "Verify my connection and check for updates"
+msgstr "Ja, Controleer mijn internetverbinding en waardeer Nautilus nu op."
+
+#: src/nautilus-first-time-druid.c:563
+msgid "Don't verify my connection or check for updates"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:418
-msgid "I want to learn more about Eazel services."
-msgstr "Ik wil meer leren over de Eazel services."
+#: src/nautilus-first-time-druid.c:628
+msgid ""
+"We are having trouble making an external web connection.\n"
+"Sometimes, firewalls require you to specify a web proxy server.\n"
+"Fill in the name or port of your proxy server, if any, below."
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:640
+msgid "No proxy server required."
+msgstr "Geen proxy server nodig."
+
+#: src/nautilus-first-time-druid.c:641
+msgid "Use this proxy server:"
+msgstr "Gebruik deze proxy server:"
 
-#: src/nautilus-first-time-druid.c:419
-msgid "I want to sign up for Eazel services now."
-msgstr "Ik wil me nu inschrijven op de Eazel services."
+#. allocate the proxy label, followed by the entry
+#: src/nautilus-first-time-druid.c:666
+msgid "Proxy address:"
+msgstr "Proxy adres:"
 
-#: src/nautilus-first-time-druid.c:420
-msgid "I've already signed up and want to login now."
-msgstr "Ik ben al ingeschreven en wil nu inloggen."
+#: src/nautilus-first-time-druid.c:728
+msgid "Verifying your Internet connection and checking for updates..."
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:421
-msgid "I don't want to learn about Eazel services at this time."
-msgstr "Ik wil niks leren over Eazel op dit moment."
+#: src/nautilus-first-time-druid.c:736
+msgid "Downloading Nautilus updates..."
+msgstr "Ophalen Nautilus updates..."
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:448
+#: src/nautilus-first-time-druid.c:906
 msgid ""
-"Nautilus will now contact Eazel services to verify your \n"
-"web connection and download the latest updates.  \n"
-"Click the Next button to continue."
+"If you have been using the GNOME Midnight Commander\n"
+"these settings move your desktop icons to Nautilus and\n"
+"make Nautilus the default desktop.\n"
 msgstr ""
-"Nautilus gebruikt het internet nu om te controleren of die bestaat\n"
-"en haalt de laatste updates binnen. \n"
-"Klik op Volgende om door te gaan."
 
-#: src/nautilus-first-time-druid.c:452
-msgid "Updating Nautilus"
-msgstr "Opwaarderen Nautilus"
+#: src/nautilus-first-time-druid.c:913
+#, fuzzy
+msgid "Use Nautilus to draw the desktop."
+msgstr "Gebruik Nautilus om het bureablad te tekenen"
 
-#: src/nautilus-first-time-druid.c:460
-msgid "Yes, verify my web connection and update Nautilus now."
-msgstr "Ja, Controleer mijn internetverbinding en waardeer Nautilus nu op."
+#: src/nautilus-first-time-druid.c:919
+msgid "Move existing desktop icons to the Nautilus desktop."
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:461
-msgid "No, I don't wish to connect and update Nautilus now."
-msgstr "Nee, ik wil niet connecten en Nautilus opwaarderen."
+#. This option is currently disabled, per bugzilla.eazel.com 7557
+#: src/nautilus-first-time-druid.c:927
+msgid "Launch Nautilus when GNOME starts up."
+msgstr ""
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:492
+#: src/nautilus-first-time-druid.c:967
 msgid ""
-"We are having troubles making an external web connection.  \n"
-"Sometimes, firewalls require you to specify a web proxy server.  \n"
-" Fill in the name of port of your proxy server, if any, below."
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties.  The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+"Fast search requires that the cron daemon on your system be running.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:496
-msgid "HTTP Proxy Configuration"
-msgstr "HTTP proxy configuratie"
+#: src/nautilus-first-time-druid.c:972
+msgid ""
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties. The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:508
-msgid "No proxy server required."
-msgstr "Geen proxy server nodig."
+#: src/nautilus-first-time-druid.c:981
+msgid "Enable fast search"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:509
-msgid "Use this proxy server:"
-msgstr "Gebruik deze proxy server:"
+#: src/nautilus-first-time-druid.c:982
+msgid "Turn fast search on when cron is enabled"
+msgstr ""
 
-#. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:534
-msgid "Proxy address:"
-msgstr "Proxy adres:"
+#: src/nautilus-first-time-druid.c:1027
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"currently can't be performed because the program crond, which does\n"
+"nightly tasks on your computer, is turned off. To make sure fast searches\n"
+"can be done, turn crond on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands \n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
 
-#. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:551
-msgid "Port:"
-msgstr "Poort:"
+#: src/nautilus-first-time-druid.c:1035
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"may not be performed because the program crond, which does nightly tasks\n"
+"on your computer, may be turned off. To make sure fast searches can be\n"
+"done, check to make sure that crond is turned on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands\n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:582
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
-"We are now contacting the Eazel service to test your \n"
-"web connection and update Nautilus."
+"Click Finish to launch Nautilus. You'll start with two\n"
+"Nautilus windows: one shows your home folder, and the\n"
+"other tells you about Eazel's services that make the life\n"
+"of a Linux user easier.\n"
+"\n"
+"We hope you enjoy Nautilus!"
 msgstr ""
-"We zijn nu Eazel service aan het connecten om je internetverbinding te "
-"testen\n"
-"en Nautilus te opwaarderen"
 
-#: src/nautilus-first-time-druid.c:587
-msgid "Downloading Nautilus updates..."
-msgstr "Ophalen Nautilus updates..."
+#: src/nautilus-first-time-druid.c:1129
+msgid ""
+"Click Finish to launch Nautilus. You'll start with a\n"
+"window showing your home folder.\n"
+"\n"
+"We hope you enjoy Nautilus!"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:678
+#: src/nautilus-first-time-druid.c:1153
 msgid "Nautilus First Time Setup"
 msgstr "Nautilus Tijd Instellingen"
 
-#. make the title label
-#: src/nautilus-first-time-druid.c:707
-msgid "Welcome to Nautilus!"
+#: src/nautilus-first-time-druid.c:1183
+#, fuzzy
+msgid "Welcome to Nautilus"
 msgstr "Welkom bij Nautilus!"
 
-#: src/nautilus-first-time-druid.c:715
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
-"Since this is the first time that you've launched\n"
-"Nautilus, we'd like to ask you a few questions\n"
-"to help personalize it for your use."
+"Nautilus...\n"
+"    Is a great file manager for the GNOME desktop.\n"
+"    Provides a simple intuitive way to access Internet services.\n"
+"    Is an extensible framework for GNOME developers.\n"
+"    Provides a powerful delivery platform for service providers.\n"
+"\n"
+"Click Next to begin customizing your Nautilus environment."
 msgstr ""
-"Dit is de eerste keer dat je Nautilus draait\n"
-"daarom stellen we je een aantal vragen om nautilus voor je in\n"
-"te stellen."
-
-#: src/nautilus-first-time-druid.c:720
-msgid "Press the next button to continue."
-msgstr "Klik op volgende om door te gaan."
 
 #. set up the final page
-#: src/nautilus-first-time-druid.c:728
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "Klaar"
 
-#: src/nautilus-first-time-druid.c:735
-msgid ""
-"Click the finish button to launch Nautilus.\n"
-"We hope that you enjoy using it!"
-msgstr ""
-"Klik op [Klaar] om Nautilus te starten.\n"
-"We hopen dat je het waardeerd."
-
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:741
-msgid "Select A User Level"
+#: src/nautilus-first-time-druid.c:1209
+#, fuzzy
+msgid "Choose Your User Level"
 msgstr "Selecteer een gebruikerslevel"
 
-#. set up the service sign-up page
-#: src/nautilus-first-time-druid.c:745
-msgid "Sign Up for Eazel Services"
-msgstr "Schrijf in op de Eazel Services"
+#. set up the GMC transition page
+#: src/nautilus-first-time-druid.c:1213
+msgid "GMC to Nautilus Transition"
+msgstr ""
+
+#. set up the `Launch Medusa' page
+#: src/nautilus-first-time-druid.c:1217
+#, fuzzy
+msgid "Fast Searches"
+msgstr "Zoeken"
+
+#. set up optional page to tell the user how to run cron
+#: src/nautilus-first-time-druid.c:1225
+msgid "The Cron Daemon"
+msgstr ""
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:749
-msgid "Nautilus Update"
-msgstr "Nautilus opwaardering"
+#: src/nautilus-first-time-druid.c:1230
+msgid "Checking Your Internet Connection"
+msgstr ""
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:757
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "Opwaarderen Nautilus..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:765
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "Web Proxy configuratie"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:833
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "Decoderen Update..."
 
-#: src/nautilus-first-time-druid.c:842
-msgid "Update Completed... Press Next to Continue."
+#: src/nautilus-first-time-druid.c:1341
+#, fuzzy
+msgid "Update Complete. Click Next to Continue."
+msgstr "Opwaarderen compleet... Klik op volgende om door te gaan."
+
+#. The update file couldn't be loaded because it
+#. * doesn't exist. Arlo and I (jsh) and decided that the
+#. * best thing to do is silently fail
+#.
+#: src/nautilus-first-time-druid.c:1356
+#, fuzzy
+msgid "No Update Available... Press Next to Continue."
 msgstr "Opwaarderen compleet... Klik op volgende om door te gaan."
 
 #. set the window title
-#: src/nautilus-link-set-window.c:192
+#: src/nautilus-link-set-window.c:189
 msgid "Link sets"
 msgstr "Link sets"
 
 #. add a descriptive label
-#: src/nautilus-link-set-window.c:204
+#: src/nautilus-link-set-window.c:202
 msgid "Add or remove sets of links by clicking on the checkboxes below."
 msgstr ""
 
-#: src/nautilus-location-bar.c:134
+#: src/nautilus-location-bar.c:63
+#, fuzzy
+msgid "Go To:"
+msgstr "   Ga naar:"
+
+#: src/nautilus-location-bar.c:153
 #, c-format
 msgid "Do you want to view these %d locations in separate windows?"
 msgstr "Wil je deze %d locaties in een apart venster bekijken?"
 
-#: src/nautilus-location-bar.c:141
+#: src/nautilus-location-bar.c:160
 msgid "View in Multiple Windows?"
 msgstr "In Meerdere Vensters Bekijken?"
 
-#: src/nautilus-location-bar.c:449 src/nautilus-location-bar.c:591
-msgid "Location:"
-msgstr "Lokatie:"
+#: src/nautilus-main.c:145
+#, fuzzy
+msgid "Perform a quick set of self-check tests."
+msgstr "Doe supersnelle zelf tests."
 
-#: src/nautilus-location-bar.c:593
-msgid "   Go To:"
-msgstr "   Ga naar:"
+#: src/nautilus-main.c:148
+msgid "Create the initial window with the given geometry."
+msgstr ""
 
-#: src/nautilus-main.c:140
-msgid "Perform high-speed self-check tests."
-msgstr "Doe supersnelle zelf tests."
+#: src/nautilus-main.c:148
+msgid "GEOMETRY"
+msgstr ""
 
-#: src/nautilus-main.c:142
+#: src/nautilus-main.c:150
+msgid "Only create windows for explicitly specified URIs."
+msgstr ""
+
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "Sluit Nautilus af."
 
-#: src/nautilus-main.c:143
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "Herstart Nautilus"
 
-#: src/nautilus-main.c:144
-msgid "Don't draw background and icons on desktop."
-msgstr "Laat geen achtergrond of iconen op het bureaublad zien."
-
-#: src/nautilus-main.c:145
-msgid "Draw background and icons on desktop."
-msgstr "Laat achtergrond en iconen zien op bureaublad."
-
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check kan niet worden gebruikt met URIs.\n"
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 "nautilus: --check kan niet worden gebruik in combinatie met andere opties\n"
 
-#: src/nautilus-main.c:204
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit kan niet worden gebruikt met URIs.\n"
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart kan niet worden gebruik met URIs.\n"
 
-#: src/nautilus-main.c:212
-msgid "nautilus: --quit and --start-desktop cannot be used together.\n"
-msgstr ""
-"nautilus: --quit en --start-desktop kunnen niet samen worden gebruikt.\n"
-
-#: src/nautilus-main.c:216
-msgid "nautilus: --restart and --start-desktop cannot be used together.\n"
-msgstr ""
-"nautilus: --restart en --start-desktop kunnen niet samen worden gebruikt.\n"
+#: src/nautilus-main.c:225
+#, fuzzy
+msgid "nautilus: --geometry cannot be used with more than one URI.\n"
+msgstr "nautilus: --restart kan niet worden gebruik met URIs.\n"
 
-#: src/nautilus-main.c:220
-msgid "nautilus: --stop-desktop and --start-desktop cannot be used together.\n"
+#. set the title and standard close accelerator
+#: src/nautilus-property-browser.c:265
+msgid "Backgrounds and Emblems"
 msgstr ""
-"nautilus: --stop-desktop en --start-desktop kunnen niet samen worden "
-"gebruikt.\n"
-
-#. set the title
-#: src/nautilus-property-browser.c:247
-msgid "Customization Options"
-msgstr "Bewerkingen Instellen"
 
-#. add the title label
-#: src/nautilus-property-browser.c:310 src/nautilus-property-browser.c:1791
-msgid "Select A Category:"
-msgstr "Selecteer een Catagorie:"
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:362 src/nautilus-theme-selector.c:267
+#, fuzzy
+msgid "  Done  "
+msgstr "Klaar"
 
-#: src/nautilus-property-browser.c:355
-msgid "Add new..."
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:373
+#, fuzzy
+msgid "  Add new...  "
 msgstr "Voeg nieuwe toe..."
 
-#: src/nautilus-property-browser.c:366
-msgid "Remove..."
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:388
+#, fuzzy
+msgid "  Remove...  "
 msgstr "Verwijder..."
 
-#: src/nautilus-property-browser.c:769
-#, c-format
-msgid "Sorry, but background %s couldn't be deleted."
+#: src/nautilus-property-browser.c:879
+#, fuzzy, c-format
+msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Sorry, maar achtergrond %s kan niet worden verwijderd."
 
-#: src/nautilus-property-browser.c:770 src/nautilus-property-browser.c:799
-msgid "Couldn't delete background"
+#: src/nautilus-property-browser.c:880 src/nautilus-property-browser.c:909
+#, fuzzy
+msgid "Couldn't delete pattern"
 msgstr "Kan achtergrond niet verwijderen."
 
-#: src/nautilus-property-browser.c:798
+#: src/nautilus-property-browser.c:908
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Sorry, maar embleem %s kon niet worden verwijderd."
 
-#: src/nautilus-property-browser.c:903 src/nautilus-property-browser.c:999
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
-msgstr "Sorry, maar '%s' is geen gebruikelijk image bestand!"
-
-#: src/nautilus-property-browser.c:930
+#: src/nautilus-property-browser.c:944
 msgid "Create a New Emblem:"
 msgstr "Creer een nieuw embleem:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:935
+#: src/nautilus-property-browser.c:949
 msgid "Keyword:"
 msgstr "Zoekwoord:"
 
-#. set up a gnome file entry to pick the image file
-#: src/nautilus-property-browser.c:952
+#. set up a gnome icon entry to pick the image file
+#: src/nautilus-property-browser.c:962
+msgid "Image:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:966
 msgid "Select an image file for the new emblem:"
 msgstr "Selecteer een plaatje voor het nieuwe embleem:"
 
-#: src/nautilus-property-browser.c:1032
-#, c-format
-msgid "Sorry, but the background %s couldn't be installed."
-msgstr "Sorry, maar achtergrond %s kon niet worden geinstalleerd."
+#: src/nautilus-property-browser.c:993
+#, fuzzy
+msgid "Create a New Color:"
+msgstr "Creer een nieuw embleem:"
+
+#. make the name label and field
+#: src/nautilus-property-browser.c:998
+#, fuzzy
+msgid "Color name:"
+msgstr "Gebruikersnaam:"
+
+#: src/nautilus-property-browser.c:1009
+msgid "Color value:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:1045
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a valid file name."
+msgstr "Sorry, maar %s is geen geldige thema map."
 
-#: src/nautilus-property-browser.c:1033
-msgid "Couldn't install background"
-msgstr "Kon de achtergrond niet installeren"
+#: src/nautilus-property-browser.c:1047
+#, fuzzy
+msgid "Sorry, but you did not supply a valid file name."
+msgstr "Sorry, maar %s is geen geldige thema map."
+
+#: src/nautilus-property-browser.c:1049 src/nautilus-property-browser.c:1092
+#, fuzzy
+msgid "Couldn't install pattern"
+msgstr "Kon thema niet installeren!"
+
+#: src/nautilus-property-browser.c:1060
+msgid "Sorry, but you can't replace the reset image."
+msgstr ""
 
-#: src/nautilus-property-browser.c:1058
-msgid "Select an image file to add as a background:"
+#: src/nautilus-property-browser.c:1091
+#, fuzzy, c-format
+msgid "Sorry, but the pattern %s couldn't be installed."
+msgstr "Sorry, maar het thema %s kon niet worden geinstalleerd."
+
+#: src/nautilus-property-browser.c:1114
+#, fuzzy
+msgid "Select an image file to add as a pattern:"
 msgstr "Selecteer een plaatjes bestand om aan de achtergrond toe te voegen:"
 
-#: src/nautilus-property-browser.c:1156
+#: src/nautilus-property-browser.c:1173
+#, fuzzy
+msgid "Sorry, but you must specify a non-blank name for the new color."
+msgstr "Sorry, maar u moet een zoekwoord voor het nieuwe embleem specificeren."
+
+#: src/nautilus-property-browser.c:1174
+#, fuzzy
+msgid "Couldn't install color"
+msgstr "Kon het embleem niet installeren"
+
+#: src/nautilus-property-browser.c:1230
 msgid "Select a color to add:"
 msgstr "Selecteer een kleur om toe te voegen:"
 
-#: src/nautilus-property-browser.c:1191
-msgid "Sorry, but you must specify a keyword for the new emblem."
+#: src/nautilus-property-browser.c:1311
+#, c-format
+msgid "Sorry, but '%s' is not a usable image file!"
+msgstr "Sorry, maar '%s' is geen gebruikelijk image bestand!"
+
+#: src/nautilus-property-browser.c:1329
+#, fuzzy
+msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Sorry, maar u moet een zoekwoord voor het nieuwe embleem specificeren."
 
-#: src/nautilus-property-browser.c:1192 src/nautilus-property-browser.c:1220
+#: src/nautilus-property-browser.c:1330 src/nautilus-property-browser.c:1333
+#: src/nautilus-property-browser.c:1337 src/nautilus-property-browser.c:1366
 msgid "Couldn't install emblem"
 msgstr "Kon het embleem niet installeren"
 
-#: src/nautilus-property-browser.c:1219
+#: src/nautilus-property-browser.c:1332
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1335
+#, fuzzy, c-format
+msgid ""
+"Sorry, but \"%s\" is an existing keyword.  Please choose a different name "
+"for it."
+msgstr ""
+"De naam \"%s\" is al ingebruik in deze map.\n"
+"Gelieve een andere naam te kiezen."
+
+#: src/nautilus-property-browser.c:1365
 #, c-format
 msgid "Sorry, but the image at %s couldn't be installed as an emblem."
 msgstr "Sorry, maar plaatje %s kon niet worden geinstalleerd als embleem."
 
-#: src/nautilus-property-browser.c:1799 src/nautilus-theme-selector.c:481
+#: src/nautilus-property-browser.c:2024
+msgid "Select A Category:"
+msgstr "Selecteer een Catagorie:"
+
+#: src/nautilus-property-browser.c:2032 src/nautilus-theme-selector.c:497
 msgid "Cancel Remove"
 msgstr "Verwijderen annuleren"
 
-#: src/nautilus-property-browser.c:1803
-msgid "Add a new background"
-msgstr "Voeg een achtergrond toe"
+#: src/nautilus-property-browser.c:2037
+msgid "  Add a New Pattern  "
+msgstr ""
 
-#: src/nautilus-property-browser.c:1806
-msgid "Add a new color"
+#: src/nautilus-property-browser.c:2040
+#, fuzzy
+msgid "  Add a New Color  "
 msgstr "Voeg een nieuwe kleur toe"
 
-#: src/nautilus-property-browser.c:1809
-msgid "Add a new emblem"
+#: src/nautilus-property-browser.c:2043
+#, fuzzy
+msgid "  Add a New Emblem  "
 msgstr "Voeg een nieuw embleem toe"
 
-#: src/nautilus-property-browser.c:1833
-msgid "Click on a background to remove it"
-msgstr "Klik op een achtergrond om het te verwijderen"
+#: src/nautilus-property-browser.c:2066
+#, fuzzy
+msgid "Click on a pattern to remove it"
+msgstr "Klik op een thema om het weg te halen."
 
-#: src/nautilus-property-browser.c:1836
+#: src/nautilus-property-browser.c:2069
 msgid "Click on a color to remove it"
 msgstr "Klik op een kleur om het te verwijderen"
 
-#: src/nautilus-property-browser.c:1839
+#: src/nautilus-property-browser.c:2072
 msgid "Click on an emblem to remove it"
 msgstr "Klik op een embleem om het weg te halen."
 
-#: src/nautilus-property-browser.c:1861
-msgid "Remove a background"
+#: src/nautilus-property-browser.c:2081
+#, fuzzy
+msgid "Patterns:"
+msgstr "Andere:"
+
+#: src/nautilus-property-browser.c:2084
+#, fuzzy
+msgid "Colors:"
+msgstr "Sluiten"
+
+#: src/nautilus-property-browser.c:2087
+#, fuzzy
+msgid "Emblems:"
+msgstr "Emblemen"
+
+#: src/nautilus-property-browser.c:2106
+#, fuzzy
+msgid "  Remove a Pattern  "
 msgstr "Verwijder een achtergrond"
 
-#: src/nautilus-property-browser.c:1864
-msgid "Remove a color"
+#: src/nautilus-property-browser.c:2109
+#, fuzzy
+msgid "  Remove a Color  "
 msgstr "Verwijder een kleur"
 
-#: src/nautilus-property-browser.c:1867
-msgid "Remove an emblem"
+#: src/nautilus-property-browser.c:2112
+#, fuzzy
+msgid "  Remove an Emblem  "
 msgstr "Verwijder een embleem"
 
-#: src/nautilus-search-bar-criterion.c:67
-msgid "Content"
-msgstr "Inhoud"
+#. Menu item in the search bar.
+#. Bracketed items are context, and are message
+#. strings elsewhere.  You don't have to translate the whole
+#. string, and only the translation for "containing '%s' will
+#. be used.  If you do translate the whole string, leave the
+#. translations of the rest of the text in brackets, so it
+#. will not be used.
+#: src/nautilus-search-bar-criterion.c:74
+msgid "[Search for] Name [contains \"fish\"]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:70
-msgid "With Emblem"
-msgstr "Met embleem"
+#: src/nautilus-search-bar-criterion.c:75
+msgid "[Search for] Content [includes all of \"fish tree\"]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:71
-msgid "Last Modified"
-msgstr "laatst gemodificeerd"
+#: src/nautilus-search-bar-criterion.c:76
+msgid "[Search for] Type [is regular file]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:72
-msgid "Owned By"
-msgstr "Eigenaar"
+#: src/nautilus-search-bar-criterion.c:77
+msgid "[Search for] Size [larger than 400K]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:78
-msgid "contains"
-msgstr "bevat"
+msgid "[Search for] With Emblem [includes \"Important\"]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:79
-msgid "starts with"
-msgstr "start met"
+msgid "[Search for] Last Modified [before yesterday]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:80
-msgid "ends with"
-msgstr "eindigd met"
-
-#: src/nautilus-search-bar-criterion.c:81
-msgid "matches glob"
-msgstr "komt globaal overeen met"
+msgid "[Search for] Owner [is not root]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:82
-msgid "matches regexp"
-msgstr "komt overeen met regexp"
+#: src/nautilus-search-bar-criterion.c:86
+msgid "[File name] contains [help]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:87
-msgid "includes all of"
-msgstr "bevat alles van"
+msgid "[File name] starts with [nautilus]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:88
-msgid "includes any of"
-msgstr "bevat een van"
+msgid "[File name] ends with [.c]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:89
-msgid "does not include all of"
-msgstr "bevat niet een van"
+msgid "[File name] matches glob [*.c]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:90
-msgid "includes none of"
-msgstr "bevat niks van"
+msgid "[File name] matches regexp [\"e??l.$\"]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:95
+msgid "[File content] includes all of [apple orange]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:96
-#: src/nautilus-search-bar-criterion.c:123
-#: src/nautilus-search-bar-criterion.c:138
-msgid "is"
-msgstr "is"
+msgid "[File content] includes any of [apply orange]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:97
-#: src/nautilus-search-bar-criterion.c:124
-#: src/nautilus-search-bar-criterion.c:139
-msgid "is not"
-msgstr "is niet"
-
-#: src/nautilus-search-bar-criterion.c:102
-msgid "regular file"
-msgstr "standaard bestand"
+#, fuzzy
+msgid "[File content] does not include all of [apple orange]"
+msgstr "bevat niet een van"
 
-#: src/nautilus-search-bar-criterion.c:103
-msgid "text file"
-msgstr "text bestand"
+#: src/nautilus-search-bar-criterion.c:98
+msgid "[File content] includes none of [apple orange]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:104
-msgid "application"
-msgstr "programma"
+msgid "[File type] is [folder]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:105
-msgid "directory"
-msgstr "map"
+msgid "[File type] is not [folder]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:110
+#, fuzzy
+msgid "[File type is] regular file"
+msgstr "standaard bestand"
 
 #: src/nautilus-search-bar-criterion.c:111
-msgid "larger than"
-msgstr "groter dan"
+msgid "[File type is] text file"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:112
-msgid "smaller than"
-msgstr "kleiner dan"
+msgid "[File type is] application"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:117
-msgid "marked with"
-msgstr "gemarkeerd met"
+#: src/nautilus-search-bar-criterion.c:113
+msgid "[File type is] folder"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:118
-msgid "not marked with"
-msgstr "niet gemarkeerd"
+#: src/nautilus-search-bar-criterion.c:114
+msgid "[File type is] music"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:125
-msgid "is after"
-msgstr "is na"
+#: src/nautilus-search-bar-criterion.c:119
+msgid "[File size is] larger than [400K]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:126
-msgid "is before"
-msgstr "is voor"
+#: src/nautilus-search-bar-criterion.c:120
+msgid "[File size is] smaller than [300K]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:128
-msgid "is today"
-msgstr "is vandaag"
+#: src/nautilus-search-bar-criterion.c:125
+msgid "[With emblem] marked with [Important]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:129
-msgid "is yesterday"
-msgstr "is gisteren"
+#: src/nautilus-search-bar-criterion.c:126
+msgid "[With emblem] not marked with [Important]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:131
-msgid "is within a week of"
-msgstr "is binnen een week van"
+msgid "[Last modified date] is [1/24/00]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:132
-msgid "is within a month of"
-msgstr "is binnen een maand van"
+msgid "[Last modified date] is not [1/24/00]"
+msgstr ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: src/nautilus-service-ui.xml.h:7
-msgid "Display support information for Eazel Services"
-msgstr "Geef ondersteunings informatie voor Eazel Services weer"
+#: src/nautilus-search-bar-criterion.c:133
+msgid "[Last modified date] is after [1/24/00]"
+msgstr ""
 
-#: src/nautilus-service-ui.xml.h:8
+#: src/nautilus-search-bar-criterion.c:134
+msgid "[Last modified date] is before [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:136
+#, fuzzy
+msgid "[Last modified date] is today"
+msgstr "vandaag veranderd"
+
+#: src/nautilus-search-bar-criterion.c:137
+#, fuzzy
+msgid "[Last modified date] is yesterday"
+msgstr "gisteren veranderd"
+
+#: src/nautilus-search-bar-criterion.c:139
+#, fuzzy
+msgid "[Last modified date] is within a week of [1/24/00]"
+msgstr "is binnen een week van %s veranderd"
+
+#: src/nautilus-search-bar-criterion.c:140
+#, fuzzy
+msgid "[Last modified date] is within a month of [1/24/00]"
+msgstr "is binnen een maand van %s veranderd"
+
+#: src/nautilus-search-bar-criterion.c:159
+msgid "[File owner] is [root]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:160
+msgid "[File owner] is not [root]"
+msgstr ""
+
+#: src/nautilus-service-ui.xml.h:1
 msgid "Go to the Eazel Services Summary Page"
 msgstr "Ga naar de Eazel Services samenvattings pagina"
 
-#: src/nautilus-service-ui.xml.h:9
+#: src/nautilus-service-ui.xml.h:2
 msgid "Go to the Eazel Software Catalog"
 msgstr "Ga naar de Eazel software Catalogus"
 
-#: src/nautilus-service-ui.xml.h:10
+#: src/nautilus-service-ui.xml.h:3
 msgid "Go to your online storage repository"
 msgstr "Ga naar je online opslag archief"
 
-#: src/nautilus-service-ui.xml.h:11
-msgid "Services"
-msgstr "Services"
-
-#: src/nautilus-service-ui.xml.h:12
+#: src/nautilus-service-ui.xml.h:5
 msgid "Software _Catalog"
 msgstr "Software _Catalogus"
 
-#: src/nautilus-service-ui.xml.h:13
+#: src/nautilus-service-ui.xml.h:6
 msgid "_Eazel Services Home"
 msgstr "_Eazel Services"
 
-#: src/nautilus-service-ui.xml.h:14
+#: src/nautilus-service-ui.xml.h:7
 msgid "_Online Storage"
 msgstr "_Online Opslag"
 
-#: src/nautilus-service-ui.xml.h:15
+#: src/nautilus-service-ui.xml.h:8
 msgid "_Services"
 msgstr "_Services"
 
-#: src/nautilus-service-ui.xml.h:16
-msgid "_Support"
-msgstr "_Ondersteuning"
+#: src/nautilus-shell.c:188
+msgid "Caveat"
+msgstr "Caveat"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: src/nautilus-shell-ui.xml.h:7
-msgid " Advanced"
+#: src/nautilus-shell.c:225
+msgid ""
+"Thank you for your interest in Nautilus.\n"
+" \n"
+"As with any software under development, you should exercise caution when "
+"using Nautilus.  Eazel does not provide any guarantee that it will work "
+"properly, or assume any liability for your use of it.  Please use it at your "
+"own risk.\n"
+"\n"
+"Please visit http://www.eazel.com/feedback.html to provide feedback, "
+"comments, and suggestions."
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:1
+msgid "Factory for Nautilus shell and file manager"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:2
+#, fuzzy
+msgid "Icons"
+msgstr "bevat"
+
+#: src/Nautilus_shell.oaf.in.h:3
+#, fuzzy
+msgid "Icons Viewer"
+msgstr "%s bekijker"
+
+#: src/Nautilus_shell.oaf.in.h:4
+#, fuzzy
+msgid "List"
+msgstr "is"
+
+#: src/Nautilus_shell.oaf.in.h:5
+#, fuzzy
+msgid "List Viewer"
+msgstr "%s bekijker"
+
+#: src/Nautilus_shell.oaf.in.h:6
+#, fuzzy
+msgid "Nautilus factory"
+msgstr "Nautilus opwaardering"
+
+#: src/Nautilus_shell.oaf.in.h:7
+msgid "Nautilus file manager component that shows a scrollable list"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:8
+msgid ""
+"Nautilus file manager component that shows a scrollable list for search "
+"results"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:9
+msgid "Nautilus file manager component that shows a two-dimensional icon space"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:10
+msgid "Nautilus file manager component that shows icons on the the desktop"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:11
+msgid "Nautilus file manager desktop icon view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:12
+msgid "Nautilus file manager icon view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:13
+msgid "Nautilus file manager list view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:14
+msgid "Nautilus file manager search results list view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:15
+#, fuzzy
+msgid "Nautilus metafile factory"
+msgstr "Nautilus Thema Selecteerder"
+
+#: src/Nautilus_shell.oaf.in.h:16
+#, fuzzy
+msgid "Nautilus shell"
+msgstr "Nautilus Thema:"
+
+#: src/Nautilus_shell.oaf.in.h:17
+msgid ""
+"Nautilus shell operations that can be done from subsequent command-line "
+"invocations"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:18
+msgid "Produces metafile objects for accessing Nautilus metadata"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:19
+#, fuzzy
+msgid "Search List"
+msgstr "Zoek lokaties"
+
+#: src/Nautilus_shell.oaf.in.h:20
+#, fuzzy
+msgid "View as Icons"
+msgstr "Bekijk als %s"
+
+#: src/Nautilus_shell.oaf.in.h:21
+#, fuzzy
+msgid "View as List"
+msgstr "Bekijk als %s"
+
+#: src/nautilus-shell-ui.xml.h:1
+#, fuzzy
+msgid " _Advanced"
 msgstr " Geavanceerd"
 
-#: src/nautilus-shell-ui.xml.h:8
-msgid " Beginner"
+#: src/nautilus-shell-ui.xml.h:2
+#, fuzzy
+msgid " _Beginner"
 msgstr " Beginner"
 
-#: src/nautilus-shell-ui.xml.h:9
-msgid " Intermediate"
+#: src/nautilus-shell-ui.xml.h:3
+#, fuzzy
+msgid " _Intermediate"
 msgstr " Gemiddeld"
 
-#: src/nautilus-shell-ui.xml.h:10
+#: src/nautilus-shell-ui.xml.h:4
 msgid "Add a bookmark for the current location to this menu"
 msgstr "Voer een bladwijzer toe voor de huiddige lokatie in dit menu"
 
-#: src/nautilus-shell-ui.xml.h:11
-msgid "Back"
-msgstr "Terug"
-
-#: src/nautilus-shell-ui.xml.h:12
-msgid "C_hange Appearance..."
-msgstr "_Voorkomen Veranderen..."
-
-#: src/nautilus-shell-ui.xml.h:14
+#: src/nautilus-shell-ui.xml.h:6
 msgid "Change the visibility of this window's location bar"
 msgstr "Verander de zichtbaarheid van het venster lokatiebalk"
 
-#: src/nautilus-shell-ui.xml.h:15
+#: src/nautilus-shell-ui.xml.h:7
 msgid "Change the visibility of this window's sidebar"
 msgstr "Verander de zichtbaarheid van de zijbalk van het venster"
 
-#: src/nautilus-shell-ui.xml.h:16
+#: src/nautilus-shell-ui.xml.h:8
 msgid "Change the visibility of this window's status bar"
 msgstr "Verander de zichtbaarheid van de statusbalk van het venster"
 
-#: src/nautilus-shell-ui.xml.h:17
-msgid "Change the visibility of this window's tool bar"
+#: src/nautilus-shell-ui.xml.h:9
+#, fuzzy
+msgid "Change the visibility of this window's toolbar"
 msgstr "Verander de zichtbaarheid van de windows toolbalk"
 
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:10
 msgid "Clear contents of Go menu and Back/Forward lists"
 msgstr "Verwijder de inhoud van het Ga menu en de terug/vooruit lijsten"
 
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:11
 msgid "Close _All Windows"
 msgstr "Sluit _Alle vensters"
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:12
 msgid "Close all Nautilus windows"
 msgstr "Sluit alle Nautilus vensters"
 
-#: src/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:13
 msgid "Close this window"
 msgstr "Sluit dit venster"
 
-#: src/nautilus-shell-ui.xml.h:23
-msgid "Custo_mization..."
-msgstr "_Aanpassingen..."
-
-#: src/nautilus-shell-ui.xml.h:24
-msgid "Cut _Text"
-msgstr "Knip _Tekst"
-
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:15
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr ""
 "Laat een scherm zien dat het bewerken van bladwijzers toestaat in dit menu"
 
-#: src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr "Geef credieten weer van de makers van Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr "Geef Nautilus on-line help weer"
 
-#: src/nautilus-shell-ui.xml.h:29
-msgid "Display the Property Browser, containing patterns, colors, and emblems"
+#: src/nautilus-shell-ui.xml.h:18
+msgid ""
+"Display patterns, colors, and emblems that can be used to customize "
+"appearance"
 msgstr ""
-"Geef de Eigenschappen Bladeraar weer, bevat patronen, kleuren en emblemen"
 
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:19
+#, fuzzy
+msgid "Display quick reference pages for Nautilus"
+msgstr "Geef Nautilus on-line help weer"
+
+#: src/nautilus-shell-ui.xml.h:20
+#, fuzzy
+msgid "Display release notes for Nautilus"
+msgstr "Geef Nautilus on-line help weer"
+
+#: src/nautilus-shell-ui.xml.h:21
+#, fuzzy
+msgid "Display support information for Nautilus and Eazel Services"
+msgstr "Geef ondersteunings informatie voor Eazel Services weer"
+
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Display the latest contents of the current location"
 msgstr "Geef de laatste inhoud weer van de huidige locatie"
 
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr "Geef de beschikbare opmaak thema's weer"
 
-#: src/nautilus-shell-ui.xml.h:32
-msgid "Edit Settings..."
-msgstr "Bewerk instellingen..."
-
-#: src/nautilus-shell-ui.xml.h:33
-msgid "Edit settings for the current user level"
-msgstr "Bewerk instellingen voor het huidige gebruikers niveau"
+#: src/nautilus-shell-ui.xml.h:24
+msgid "Edit various Nautilus preferences"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:34
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "Vinden"
 
-#: src/nautilus-shell-ui.xml.h:35
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr "Ver_geet historie"
 
-#: src/nautilus-shell-ui.xml.h:36
-msgid "Forward"
-msgstr "Voorwaarts"
-
-#: src/nautilus-shell-ui.xml.h:37
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr "Ga naar Eazel Services"
 
-#: src/nautilus-shell-ui.xml.h:38
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr "Ga naar de thuis lokatie"
 
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr "Ga naar de locatie die deze bevat"
 
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr "Ga naar de volgende lokatie"
 
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr "Ga naar de vorige lokatie"
 
-#: src/nautilus-shell-ui.xml.h:42 src/nautilus-window-menus.c:444
-msgid "Hide Location Bar"
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
+#, fuzzy
+msgid "Hide Location _Bar"
 msgstr "Verberg locatiebalk"
 
-#: src/nautilus-shell-ui.xml.h:43 src/nautilus-window-menus.c:432
-msgid "Hide Sidebar"
-msgstr "Verberg zijbalk"
-
-#: src/nautilus-shell-ui.xml.h:44 src/nautilus-window-menus.c:426
-msgid "Hide Status Bar"
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
+#, fuzzy
+msgid "Hide St_atus Bar"
 msgstr "Verberg status balk"
 
-#: src/nautilus-shell-ui.xml.h:45 src/nautilus-window-menus.c:438
-msgid "Hide Tool Bar"
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
+#, fuzzy
+msgid "Hide _Sidebar"
+msgstr "Verberg zijbalk"
+
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
+#, fuzzy
+msgid "Hide _Toolbar"
 msgstr "Verberg tool balk"
 
-#: src/nautilus-shell-ui.xml.h:46
-msgid "Home"
-msgstr "Thuis"
+#: src/nautilus-shell-ui.xml.h:37
+msgid "Nautilus Quick _Reference"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:47
-msgid "Nautilus _Feedback..."
-msgstr "Nautilus _Feedback..."
+#: src/nautilus-shell-ui.xml.h:38
+#, fuzzy
+msgid "Nautilus Release _Notes"
+msgstr "Nautilus opwaardering"
 
-#: src/nautilus-shell-ui.xml.h:48
+#: src/nautilus-shell-ui.xml.h:39
+#, fuzzy
+msgid "Nautilus User _Manual"
+msgstr "_Nautilus Gebruikers Handleiding"
+
+#: src/nautilus-shell-ui.xml.h:40
+#, fuzzy
+msgid "New Window"
+msgstr "_Nieuw Venster"
+
+#: src/nautilus-shell-ui.xml.h:41
+#, fuzzy
+msgid "New _Window"
+msgstr "_Nieuw Venster"
+
+#: src/nautilus-shell-ui.xml.h:42
+msgid "Normal Size"
+msgstr "Normale grootte"
+
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Open een nieuw Nautilus venster voor de weergegeven locatie"
 
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "Herladen"
 
-#: src/nautilus-shell-ui.xml.h:51
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr ""
-"Verwijderd de geselecteerde tekst zonder deze op het klembord te zetten"
-
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr "Rapport Profilering"
 
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr "Reset Profilering"
 
-#: src/nautilus-shell-ui.xml.h:54
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr "Zoek het World Wide Web"
 
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr "Zoek op deze computer naar bestanden"
 
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:50
+#, fuzzy
 msgid ""
-"Show a page from which you can send feedback about Nautilus to its creators"
+"Show a page from which you can send feedback about Nautilus and Eazel "
+"Services"
 msgstr ""
 "Geef een pagina weer waarvan je feedback naar de makers van Nautilus kan "
 "sturen"
 
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "Laat de inhoud zien op normale grootte"
 
-#: src/nautilus-shell-ui.xml.h:58
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "Laat de inhoud zien in minder details"
 
-#: src/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "Laat de inhoud in meer details zien"
 
-#: src/nautilus-shell-ui.xml.h:60
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr "Begin Profilering"
 
-#: src/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr "Stop Profilering"
 
-#: src/nautilus-shell-ui.xml.h:63
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr "Stop met het laden van deze locatie"
 
-#: src/nautilus-shell-ui.xml.h:64
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "Maak de laatste verandering ongedaan"
 
-#: src/nautilus-shell-ui.xml.h:65
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "Op"
 
-#: src/nautilus-shell-ui.xml.h:66
-msgid "Use Advanced settings"
-msgstr "Gebruik Geavanceerde Instellingen"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:67
-msgid "Use Beginner settings"
-msgstr "Gebruik Beginners instellingen"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:68
-msgid "Use Intermediate settings"
-msgstr "Gebruik Gemiddelde instellingen"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:63
+#, fuzzy
+msgid "We_b Search"
+msgstr "Web zoeken"
+
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "Web zoeken"
 
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:65
+msgid "Zoom In"
+msgstr "Zoom in"
+
+#: src/nautilus-shell-ui.xml.h:66
+msgid "Zoom Out"
+msgstr "Zoom uit"
+
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "Zoom _In"
 
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "Zoom _Uit"
 
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "_Over Nautilus..."
 
-#: src/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "_Voeg bladwijzer toe"
 
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "_Terug"
 
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:72
+msgid "_Backgrounds and Emblems..."
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "_Bladwijzers"
 
-#: src/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "_Sluit venster"
 
-#: src/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:76
+#, fuzzy
+msgid "_Customer Support"
+msgstr "_Ondersteuning"
+
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "_Bewerken"
 
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "_Bewerk bladwijzers..."
 
-#: src/nautilus-shell-ui.xml.h:81 src/nautilus-window-menus.c:1336
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "_Service Voorkeuren"
+
+#: src/nautilus-shell-ui.xml.h:80
+#, fuzzy
+msgid "_Feedback"
+msgstr "Nautilus _Feedback..."
+
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "Vind"
 
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "_Verder"
 
-#: src/nautilus-shell-ui.xml.h:83
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "_Ga"
 
-#: src/nautilus-shell-ui.xml.h:84
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "_Help"
 
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "_Thuis"
 
-#: src/nautilus-shell-ui.xml.h:86
-msgid "_Nautilus User Manual"
-msgstr "_Nautilus Gebruikers Handleiding"
-
 #: src/nautilus-shell-ui.xml.h:87
-msgid "_New Window"
-msgstr "_Nieuw Venster"
+#, fuzzy
+msgid "_Location..."
+msgstr "Lokatie"
 
 #: src/nautilus-shell-ui.xml.h:88
+#, fuzzy
+msgid "_Nautilus Themes..."
+msgstr "Nautilus Thema:"
+
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "_Normale grootte"
 
-#: src/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "Service _Voorkeuren"
+
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr "_Profilering"
 
-#: src/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "_Vernieuwen"
 
-#: src/nautilus-shell-ui.xml.h:92
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr "_Rapport Profilering"
 
-#: src/nautilus-shell-ui.xml.h:93
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr "_Reset Profilering"
 
-#: src/nautilus-shell-ui.xml.h:94
-msgid "_Select All"
-msgstr "_Selecteer Alles"
-
-#: src/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr "_Start Profilering"
 
-#: src/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr "_Stop Profilering"
 
-#: src/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "_Ongedaan maken"
 
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "_Een level omhoog"
 
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "_Bekijken"
 
-#: src/nautilus-shell-ui.xml.h:100
-msgid "_Web Search"
-msgstr "_Web zoeken"
-
-#: src/nautilus-shell.c:167
-msgid "Caveat"
-msgstr "Caveat"
-
-#: src/nautilus-shell.c:203
-msgid ""
-"Thank you for your interest in Nautilus.\n"
-" \n"
-"As with any software under development, you should exercise caution when "
-"using Nautilus.  Eazel does not provide any guarantee that it will work "
-"properly, or assume any liability for your use of it.  Please use it at your "
-"own risk.\n"
-"\n"
-"Please visit http://www.eazel.com/feedback.html to provide feedback, "
-"comments, and suggestions."
-msgstr ""
-
-#. add the reset background item, possibly disabled
-#: src/nautilus-sidebar.c:444
-msgid "Reset Background"
-msgstr "Herstel achtergrond"
-
-#: src/nautilus-sidebar.c:617
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -5033,11 +9900,11 @@ msgstr ""
 "U kunt niet meer dan 1 eigen icoon per keer toepassen! Sleep aub een "
 "bestandom een eigen icoon in te stellen."
 
-#: src/nautilus-sidebar.c:619
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "Meer dan een plaatje"
 
-#: src/nautilus-sidebar.c:638
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -5045,11 +9912,11 @@ msgstr ""
 "Het bestand dat u versleepte is niet lokaal. U kunt alleen lokale "
 "plaatjesals eigen iconen gebruiken."
 
-#: src/nautilus-sidebar.c:640
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "Alleen lokale bestanden"
 
-#: src/nautilus-sidebar.c:645
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -5057,127 +9924,160 @@ msgstr ""
 "Het bestand dat u versleepte is geen plaatje. U kunt alleen lokale plaatjes "
 "als eigen iconen gebruiken."
 
-#: src/nautilus-sidebar.c:647
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "Alleen plaatjes"
 
-#: src/nautilus-sidebar.c:1181
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "Open met %s"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1210
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "Openen met..."
 
-#. Create button first so we can use it for auto_click
-#: src/nautilus-simple-search-bar.c:129
-msgid "Find Them!"
-msgstr "Zoek ze!"
+#. FIXME: We don't use spaces to pad labels!
+#: src/nautilus-sidebar.c:1424
+#, fuzzy
+msgid "  Empty Trash  "
+msgstr "Maak de prullenbak schoon"
 
 #: src/nautilus-switchable-search-bar.c:132
-msgid "Search For:"
-msgstr "Zoek naar:"
+#, fuzzy
+msgid "Find:"
+msgstr "Vinden"
 
-#. set the title
-#: src/nautilus-theme-selector.c:157
+#. set the title and standard close accelerator
+#: src/nautilus-theme-selector.c:170
 msgid "Nautilus Theme Selector"
 msgstr "Nautilus Thema Selecteerder"
 
 #. add the title label
-#: src/nautilus-theme-selector.c:191
+#: src/nautilus-theme-selector.c:199
 msgid "Nautilus Theme:"
 msgstr "Nautilus Thema:"
 
-#: src/nautilus-theme-selector.c:249
-msgid "Add new theme"
-msgstr "Voeg een nieuw thema toe"
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:278
+#, fuzzy
+msgid "  Add New Theme  "
+msgstr "Voeg nieuw thema toe"
 
-#: src/nautilus-theme-selector.c:261
-msgid "Remove theme"
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:288
+#, fuzzy
+msgid "  Remove Theme  "
 msgstr "Verwijder thema"
 
-#: src/nautilus-theme-selector.c:373
-#, c-format
-msgid "Sorry, but %s is not a valid theme directory."
+#: src/nautilus-theme-selector.c:400
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a valid theme folder."
 msgstr "Sorry, maar %s is geen geldige thema map."
 
-#: src/nautilus-theme-selector.c:374
+#: src/nautilus-theme-selector.c:401
 msgid "Couldn't add theme"
 msgstr "Kon thema niet toevoegen"
 
-#: src/nautilus-theme-selector.c:402
-#, c-format
-msgid "Sorry, but the theme %s couldn't be installed."
+#: src/nautilus-theme-selector.c:429
+#, fuzzy, c-format
+msgid "Sorry, but the \"%s\" theme couldn't be installed."
 msgstr "Sorry, maar het thema %s kon niet worden geinstalleerd."
 
-#: src/nautilus-theme-selector.c:403
+#: src/nautilus-theme-selector.c:430
 msgid "Couldn't install theme"
 msgstr "Kon thema niet installeren!"
 
-#: src/nautilus-theme-selector.c:444
-msgid "Select a theme directory to add as a new theme:"
+#: src/nautilus-theme-selector.c:463
+#, fuzzy
+msgid "Select a theme folder to add as a new theme:"
 msgstr "Selecteer een thema map om als thema toe te voegen:"
 
-#: src/nautilus-theme-selector.c:477 src/nautilus-theme-selector.c:527
+#: src/nautilus-theme-selector.c:495 src/nautilus-theme-selector.c:542
 msgid "Click on a theme to remove it."
 msgstr "Klik op een thema om het weg te halen."
 
-#: src/nautilus-theme-selector.c:530
+#: src/nautilus-theme-selector.c:545
 msgid ""
 "Click on a theme to change the\n"
 "appearance of Nautilus."
 msgstr "Klik op een thema om het voorkomen vanNautilus te veranderen."
 
 #. change the add button label back to it's normal state
-#: src/nautilus-theme-selector.c:542
+#: src/nautilus-theme-selector.c:558
 msgid "Add New Theme"
 msgstr "Voeg nieuw thema toe"
 
-#: src/nautilus-theme-selector.c:570
+#: src/nautilus-theme-selector.c:585
+#, fuzzy
 msgid ""
-"Sorry, but you can't remove the current theme.  Please change to another "
-"theme before removing this one"
+"Sorry, but you can't remove the current theme. Please change to another "
+"theme before removing this one."
 msgstr ""
 "Sorry, maar kan het huidige thema niet verwijderen. Selecteer een anderthema "
 "voordat je deze weghaalt"
 
-#: src/nautilus-theme-selector.c:571
+#: src/nautilus-theme-selector.c:587
 msgid "Can't delete current theme"
 msgstr "Kan het huidige thema niet verwijderen"
 
-#: src/nautilus-theme-selector.c:592
+#: src/nautilus-theme-selector.c:608
 msgid "Sorry, but that theme could not be removed!"
 msgstr "Sorry, maar kan het thema niet verwijderen!"
 
-#: src/nautilus-theme-selector.c:593
+#: src/nautilus-theme-selector.c:609
 msgid "Couldn't remove theme"
 msgstr "Kan het thema niet verwijderen"
 
-#: src/nautilus-theme-selector.c:682
-#, c-format
-msgid "No information available for the  %s theme"
+#: src/nautilus-theme-selector.c:716
+#, fuzzy, c-format
+msgid "No description available for the \"%s\" theme"
 msgstr "Geen informatie beschikbaar voor het %s thema"
 
-#: src/nautilus-window-manage-views.c:213 src/nautilus-window-menus.c:629
-msgid "Nautilus"
-msgstr "Nautilus"
+#: src/nautilus-window.c:637
+#, fuzzy
+msgid "View as ..."
+msgstr "Bekijk als %s..."
 
-#: src/nautilus-window-manage-views.c:578
-#, c-format
-msgid "You do not have the permissions necessary to view \"%s\"."
-msgstr "U heeft de rechten niet om \"%s\" te bekijken."
+#. Add "View as Other..." extra bonus choice.
+#: src/nautilus-window.c:1317
+msgid "View as Other..."
+msgstr "Bekijk als ander..."
 
-#: src/nautilus-window-manage-views.c:580
-msgid "Inadequate Permissions"
-msgstr "Inadequate Permissies"
+#: src/nautilus-window.c:1722
+msgid "Close"
+msgstr "Sluiten"
 
-#: src/nautilus-window-manage-views.c:744
+#. FIXME bugzilla.eazel.com 5037: The text Preview
+#. * Release is hardcoded here. Are all builds with
+#. * time stamps really best described as "preview
+#. * release"?.
+#.
+#: src/nautilus-window-manage-views.c:216
+#, c-format
+msgid "Preview Release %s: %s"
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "Bekijken faalde"
 
-#: src/nautilus-window-manage-views.c:755
+#: src/nautilus-window-manage-views.c:831
+#, fuzzy, c-format
+msgid ""
+"The %s view encountered an error and can't continue. You can choose another "
+"view or go to a different location."
+msgstr ""
+"Het %s zijkant paneel heeft een fout en kan niet doorgaan. Als dit vaker "
+"gebeurt moet u het paneel misschien uitzetten."
+
+#: src/nautilus-window-manage-views.c:842
+#, c-format
+msgid "The %s view encountered an error while starting up."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
@@ -5185,7 +10085,7 @@ msgstr ""
 "een van de zijkant panelen heeft een fout en kan niet doorgaan. Jammer "
 "genoeg kan ik niet vertellen welke."
 
-#: src/nautilus-window-manage-views.c:759
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
@@ -5194,67 +10094,64 @@ msgstr ""
 "Het %s zijkant paneel heeft een fout en kan niet doorgaan. Als dit vaker "
 "gebeurt moet u het paneel misschien uitzetten."
 
-#: src/nautilus-window-manage-views.c:764
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "Zijkant Paneel faalde"
 
-#: src/nautilus-window-manage-views.c:1144
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr "Kan \"%s\" niet vinden. Controleer de spelling en probeer opnieuw."
 
-#: src/nautilus-window-manage-views.c:1150
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
 msgstr ""
 "\"%s\" is geen geldge lokatie. Controleer de spelling en probeer opnieuw."
 
-#: src/nautilus-window-manage-views.c:1164
-#, c-format
+#: src/nautilus-window-manage-views.c:1245
+#, fuzzy, c-format
 msgid ""
-"Couldn't display \"%s\", because Nautilus cannot handle items of this "
-"unknown type."
-msgstr ""
-"Kan \"%s\" niet laten zien, omdat Nautilus items van dit type niet kan "
-"afhandelen"
-
-#: src/nautilus-window-manage-views.c:1168
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot handle items of type \"%s\"."
+"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
+"it is."
 msgstr ""
 "Kan \"%s\" niet laten zien, omdat Nautilus niet weet hoe het type \"%s\" te "
 "behandelen."
 
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy, c-format
+msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+msgstr "Nautilus kan \"%s\" niet laten zien."
+
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1180
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 "Kan \"%s\" niet lanten zien, omdat nautilus \"%s\" locaties niet kan "
 "verwerken."
 
-#: src/nautilus-window-manage-views.c:1186
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "Kan \"%s\" niet laten zien, omdat de poging om in te loggen faalde."
 
-#: src/nautilus-window-manage-views.c:1191
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "Kan \"%s\" niet laten zien, omdat de toegang werd geweigerd."
 
-#: src/nautilus-window-manage-views.c:1196
-#, c-format
+#: src/nautilus-window-manage-views.c:1287
+#, fuzzy, c-format
 msgid ""
-"Couldn't display \"%s\", because the host couldn't be found. Check that your "
-"proxy settings are correct."
+"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
+"the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Kan \"%s\" niet laten zien, omdat de computer niet gevonden kon worden. "
 "Controleer je proxy instellingen."
 
-#: src/nautilus-window-manage-views.c:1202
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -5263,7 +10160,7 @@ msgstr ""
 "Kan \"%s\" niet laten zien, omdat de computernaam leeg was. Controleer je "
 "proxy instellingen."
 
-#: src/nautilus-window-manage-views.c:1214
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -5274,23 +10171,23 @@ msgstr ""
 "zoekservice niet draait. Maak zeker dat u de Medusa zoekservice heeft "
 "gestart en als je geen index hebt, dat de Medusa zoekservice draait."
 
-#: src/nautilus-window-manage-views.c:1218
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "Zoeken niet beschikbaar"
 
-#: src/nautilus-window-manage-views.c:1222
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus kan \"%s\" niet laten zien."
 
-#: src/nautilus-window-manage-views.c:1235
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "Kan locatie niet laten zien"
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:317
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
@@ -5298,66 +10195,62 @@ msgstr ""
 "Weet u zeker dat u de historie wilt vergeten? Als u dat doet bent u gedoemt "
 "dit vaker te doen."
 
-#: src/nautilus-window-menus.c:320
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
 "weet u zeker dat u Nautilus de locaties wilt laten vergeten die u heeft "
 "bezocht?"
 
-#: src/nautilus-window-menus.c:325
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "Vergeet Historie?"
 
-#: src/nautilus-window-menus.c:326
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "Vergeet"
 
-#: src/nautilus-window-menus.c:427
-msgid "Show Status Bar"
+#: src/nautilus-window-menus.c:466
+#, fuzzy
+msgid "Show St_atus Bar"
 msgstr "Laat status balk zien"
 
-#: src/nautilus-window-menus.c:433
-msgid "Show Sidebar"
+#: src/nautilus-window-menus.c:472
+#, fuzzy
+msgid "Show _Sidebar"
 msgstr "Laat zijbalk zien"
 
-#: src/nautilus-window-menus.c:439
-msgid "Show Tool Bar"
+#: src/nautilus-window-menus.c:478
+#, fuzzy
+msgid "Show _Toolbar"
 msgstr "Laat tool balk zien"
 
-#: src/nautilus-window-menus.c:445
-msgid "Show Location Bar"
+#: src/nautilus-window-menus.c:484
+#, fuzzy
+msgid "Show Location _Bar"
 msgstr "Laat lokatiebalk zien"
 
-#. Localizers: This is the message in the dialog that appears if the user chooses "Edit Beginner Settings".
-#. * The first %s is the name of the lowest user level ("Beginner"). The 2nd and 4th %s are the
-#. * names of the middle user level ("Intermediate"). The 3rd %s is the name of the highest user
-#. * level ("Advanced").
-#.
-#: src/nautilus-window-menus.c:528
-#, c-format
-msgid ""
-"None of the settings for the %s level can be edited. If you want to edit the "
-"settings you must choose the %s or %s level. Do you want to switch to the %s "
-"level now and edit its settings?"
-msgstr ""
-"None of the settings for the %s level can be edited. If you want to edit the "
-"settings you must choose the %s or %s level. Do you want to switch to the %s "
-"level now and edit its settings?"
+#: src/nautilus-window-menus.c:535
+#, fuzzy
+msgid "Preferences"
+msgstr "Account Voorkeuren"
 
-#. Localizers: This is the title of the dialog that appears if the user chooses "Edit Beginner Settings".
-#. * The %s is the name of the middle user level ("Intermediate").
+#. Localize to deal with
+#. * issues in the copyright
+#. * symbol characters -- do
+#. * not translate the
+#. * company name, please.
 #.
-#: src/nautilus-window-menus.c:540
-#, c-format
-msgid "Switch to %s Level?"
-msgstr "Verander naar Level %s?"
+#: src/nautilus-window-menus.c:618
+msgid "Copyright © 1999-2001 Eazel, Inc."
+msgstr ""
 
-#: src/nautilus-window-menus.c:633
+#: src/nautilus-window-menus.c:620
+#, fuzzy
 msgid ""
-"Nautilus is a graphical shell \n"
-"for GNOME that makes it \n"
-"easy to manage your files \n"
+"Nautilus is a graphical shell\n"
+"for GNOME that makes it\n"
+"easy to manage your files\n"
 "and the rest of your system."
 msgstr ""
 "Nautilus is een grafische shell \n"
@@ -5365,7 +10258,17 @@ msgstr ""
 "om uw bestanden makkelijk te beheren\n"
 "en ook de rest van uw systeem."
 
-#: src/nautilus-window-menus.c:773
+#. translators should localize the following
+#. * string which will be displayed at the
+#. * bottom of the about box to give credit
+#. * to the translator(s)
+#.
+#: src/nautilus-window-menus.c:629
+#, fuzzy
+msgid "Translator Credits"
+msgstr "Transacties worden opgeslagen in %s"
+
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -5374,73 +10277,737 @@ msgstr ""
 "Lokatie \"%s\" bestaat niet. Wilt deze lokatie verwijderen uit uw "
 "bladwijzers en van uw lokatielijst?"
 
-#: src/nautilus-window-menus.c:777
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "Bladwijzer voor niet bestaande lokatie"
 
-#: src/nautilus-window-menus.c:791
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "De Lokatie \"%s\" bestaat niet langer."
 
-#: src/nautilus-window-menus.c:792
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "Ga naar niet bestaande lokatie"
 
-#: src/nautilus-window-menus.c:854
-msgid "Go to the specified location"
-msgstr "Ga naar de gespecificeerde lokatie"
+#: src/nautilus-window-menus.c:877
+#, fuzzy
+msgid "Go to the location specified by this bookmark"
+msgstr "Ga naar de locatie die deze bevat"
 
-#: src/nautilus-window-menus.c:1335
-msgid "_Browse"
-msgstr "Blader"
+#: src/nautilus-window-toolbars.c:402
+msgid "Back"
+msgstr "Terug"
 
-#. Localizers: This is the title of the user-level settings
-#. * dialog. %s will be replaced with the name of a user level
-#. * ("Beginner", "Intermediate", or "Advanced").
-#.
-#: src/nautilus-window-menus.c:1531
-#, c-format
-msgid "Edit %s Settings"
-msgstr "Bewerk %s instellingen..."
+#: src/nautilus-window-toolbars.c:404
+msgid "Forward"
+msgstr "Voorwaarts"
 
-#. Localizers: This is the label for the menu item that brings
-#. * up the user-level settings dialog. %s will be replaced with
-#. * the name of a user level ("Beginner", "Intermediate", or
-#. * "Advanced").
+#. Note to localizers: this font is used for the number in the
+#. * zoom control widget.
 #.
-#: src/nautilus-window-menus.c:1553
-#, c-format
-msgid "Edit %s Settings..."
-msgstr "Bewerk %s instellingen..."
+#: src/nautilus-zoom-control.c:531
+msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
+msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 
-#: src/nautilus-window.c:1030
-#, c-format
-msgid "View as %s..."
-msgstr "Bekijk als %s..."
+#~ msgid "System"
+#~ msgstr "Systeem"
 
-#. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1052
-msgid "View as Other..."
-msgstr "Bekijk als ander..."
+#~ msgid "Config files"
+#~ msgstr "Configuratie bestanden"
 
-#: src/nautilus-window.c:1399
-msgid "Close"
-msgstr "Sluiten"
+#~ msgid "Command Line"
+#~ msgstr "Opdrachtregel"
 
-#: src/nautilus-zoom-control.c:328
-msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
-msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
+#~ msgid "APIs"
+#~ msgstr "APIs"
 
-#. This is marked for localization in case the % sign is not
-#. * appropriate in some locale. I guess that's unlikely.
-#.
-#: src/nautilus-zoom-control.c:565
-msgid "%.0f%%"
-msgstr "%.0f%%"
+#~ msgid "Miscellaneous"
+#~ msgstr "Diversen"
+
+#~ msgid "New password (again): "
+#~ msgstr "Nieuw wachtwoord (opnieuw): "
+
+#~ msgid "  I need some help!  "
+#~ msgstr "  Ik heb hulp nodig!  "
+
+#~ msgid "Mozilla Test"
+#~ msgstr "Mozilla test"
+
+#~ msgid "This is a Mozilla merged menu item"
+#~ msgstr "Dit is een geintergreerd Mozilla menu item"
+
+#~ msgid "This is a Mozilla merged tool bar button"
+#~ msgstr "Dit is een geintergreerde Mozilla toolbar knop"
+
+#~ msgid "_Mozilla Test"
+#~ msgstr "_Mozilla Test"
+
+#~ msgid "Sound hardware missing or busy!"
+#~ msgstr "Geluidsapparatuur ontbreekt of is bezet!"
+
+#~ msgid "Verifying %s..."
+#~ msgstr "Controleren %s..."
+
+#~ msgid "%s would not work anymore\n"
+#~ msgstr "%s werkt niet langer\n"
+
+#~ msgid "%s causes a circular dependency problem\n"
+#~ msgstr "%s zorgt voor een circulair afhankelijkheids probleem\n"
+
+#~ msgid "Installing %s failed because of the following issue(s):\n"
+#~ msgstr "Installatie van %s faalde vanwege de volgende zaken:\n"
+
+#~ msgid "Uninstalling %s failed because of the following issue(s):\n"
+#~ msgstr "Deinstallatie van %s faalde vanwege de volgende zaken:\n"
+
+#~ msgid "Uninstall failed..."
+#~ msgstr "Deinstallatie faalde..."
+
+#~ msgid "Uninstall Failed"
+#~ msgstr "Deinstallatie faalde"
+
+#~ msgid "Install failed..."
+#~ msgstr "Installatie faalde"
+
+#~ msgid "Package Title"
+#~ msgstr "Pakket titel"
+
+#~ msgid "Size: "
+#~ msgstr "Omvang: "
+
+#~ msgid "<size>"
+#~ msgstr "<size>"
+
+#~ msgid "<unknown>"
+#~ msgstr "<onbekend>"
+
+#~ msgid "License: "
+#~ msgstr "Licentie: "
+
+#~ msgid "Build Date: "
+#~ msgstr "Bouw Datum: "
+
+#~ msgid "Vendor: "
+#~ msgstr "Maker: "
+
+#~ msgid "Update"
+#~ msgstr "Opwaarderen"
+
+#~ msgid "Verify"
+#~ msgstr "Controleer"
+
+#~ msgid "Go to selected file"
+#~ msgstr "Ga naar het geselecteerde bestand"
+
+#~ msgid "Package Contents: %d files"
+#~ msgstr "Pakket inhoud: %d bestanden"
+
+#~ msgid "Package \"%s\" "
+#~ msgstr "Pakket \"%s\" "
+
+#~ msgid "version %s-%s"
+#~ msgstr "versie %s-%s"
+
+#~ msgid "file %s has an error!"
+#~ msgstr "bestand %s heeft een fout!"
+
+#~ msgid "Verification completed."
+#~ msgstr "Controle compleet"
+
+#~ msgid "Force install"
+#~ msgstr "Forceer installatie"
+
+#~ msgid "Set port numer (80)"
+#~ msgstr "Zet het poort nummer (80)"
+
+#~ msgid "Set tmp dir (/tmp)"
+#~ msgstr "Zet de tmp map (/tmp)"
+
+#~ msgid "Reading the install package list %s"
+#~ msgstr "Leest de installatie pakketlijst %s"
+
+#~ msgid "Category = %s"
+#~ msgstr "Categorie = %s"
+
+#~ msgid "Preflight (%ld bytes, %ld packages)"
+#~ msgstr "Preflight (%ld bytes, %ld pakketten)"
+
+#~ msgid "Removing package %s (0x%x) %s"
+#~ msgstr "Pakket %s word verwijdert (0x%x) %s"
+
+#~ msgid "Preparing package system"
+#~ msgstr "Maakt het pakketsysteem gereed"
+
+#~ msgid "Dependencies appear ok"
+#~ msgstr "Benodigheden lijken goed"
+
+#~ msgid "Downloaded package does not have the correct version"
+#~ msgstr "Opgehaald pakket heeft een onjuiste versie"
+
+#~ msgid "Package %s had version %s and not %s"
+#~ msgstr "Pakket %s had versie %s moeten hebben, en niet %s"
+
+#~ msgid "Could not retrieve a URL for id %s"
+#~ msgstr "Kon geen URL ontvangen voor id %s"
+
+#~ msgid "Dry Run Mode Activated.  Packages will not actually be installed ..."
+#~ msgstr "Test Modus Geactiveerd. Pakketen worden niet geinstalleerd"
+
+#~ msgid "Package %s conflicts with %s-%s"
+#~ msgstr "Pakket %s conflicteerd met %s-%s"
+
+#~ msgid "Processing dep for %s, requires library %s"
+#~ msgstr "Doorwerken benodigdheden voor %s, heeft library %s nodig"
+
+#~ msgid "Processing dep for %s, requires package %s"
+#~ msgstr "Doorwerken benodigdheden %s, heeft pakket %s nodig"
+
+#~ msgid "Downloading package %s ..."
+#~ msgstr "Ophalen pakket %s ..."
+
+#~ msgid ""
+#~ "\n"
+#~ "Is this okay?"
+#~ msgstr ""
+#~ "\n"
+#~ "Is dit goed?"
+
+#~ msgid "Preparing to install 1 package"
+#~ msgstr "Klaarmaken om 1 pakket te installeren"
+
+#~ msgid "Preparing to install %d packages"
+#~ msgstr "Klaarmaken om %d pakketten te installeren"
+
+#~ msgid " · %s is in the Gnome menu under %s.\n"
+#~ msgstr " · %s is in het Gnome menu onder %s.\n"
+
+#~ msgid "Installation aborted."
+#~ msgstr "Installatie afgebroken."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "%s\n"
+#~ "Erase the leftover RPM files?"
+#~ msgstr ""
+#~ "%s\n"
+#~ "%s\n"
+#~ "De overgebleven RPM bestanden verwijderen?"
+
+#~ msgid "Contacting install server ..."
+#~ msgstr "Spreekt de installatieserver aan ..."
+
+#~ msgid "Could not find a valid boolean value for grey_out!"
+#~ msgstr "Kan geen geldige boolean waarde vinden voor grey_out!"
+
+#~ msgid "There is no service data !\n"
+#~ msgstr "Er is geen service informatie !\n"
+
+#~ msgid "There is no eazel news data !\n"
+#~ msgstr "Er is geen eazel news informatie !\n"
+
+#~ msgid "Could not fetch summary configuration !"
+#~ msgstr "Kon geen samenvattings configuratie vinden !"
+
+#~ msgid "The summary configuration contains no data!\n"
+#~ msgstr "De samengevatte configuratie bevat geen informatie!\n"
+
+#~ msgid "Cannot find the SUMMARY_DATA xmlnode!\n"
+#~ msgstr "Kan geen SUMMARY_DATA xmlnode vinden!\n"
+
+#~ msgid "Bailing from the SUMMARY_DATA parse!\n"
+#~ msgstr "Gestopt met SUMMARY_DATA ontleding!\n"
+
+#~ msgid "Could not find any summary configuration data!\n"
+#~ msgstr "Kon geen enkele beperkte configuratie vinden!\n"
+
+#~ msgid "Bailing from summary configuration parse!\n"
+#~ msgstr "Gestopt met samengevatte configuratie ontleding!\n"
+
+#~ msgid "Welcome Back %s!"
+#~ msgstr "Welkom Terug %s"
+
+#~ msgid "Your Services"
+#~ msgstr "Jouw Services"
+
+#~ msgid "Additional Services"
+#~ msgstr "Extra Services"
+
+#~ msgid ""
+#~ "\n"
+#~ "Check back here for new system management\n"
+#~ "services that will help make Linux easier to use."
+#~ msgstr ""
+#~ "\n"
+#~ "Kom hier terug voor nieuwe systeembeheer services\n"
+#~ "die het gebruik van Linux vergemakkelijken."
+
+#~ msgid "Current Updates"
+#~ msgstr "Huidige Updates"
+
+#~ msgid "Version %s"
+#~ msgstr "Versie %s"
+
+#~ msgid ""
+#~ "Your user name or password were not correct, or you have not activated your "
+#~ "account.  Please try again, or check your email for an account activation "
+#~ "notice."
+#~ msgstr ""
+#~ "Je gebruikersnaam of wachtwoord waren niet correct, of je hebt je account "
+#~ "niet\n"
+#~ "geactiveerd. Probeer opnieuwe, of controleer je e-mail voor een account "
+#~ "activatie\n"
+#~ "bericht."
+
+#~ msgid "display service name and such"
+#~ msgstr "Laat service naam en zo zien"
+
+#~ msgid "maximum allowed difference in seconds"
+#~ msgstr "Maximum verschil in seconden toegestaan"
+
+#~ msgid "update the system clock"
+#~ msgstr "Zet de systeemklok goed"
+
+#~ msgid "specify time server"
+#~ msgstr "Specificeer tijdserver"
+
+#~ msgid "Time off by %d, max allowed diff is %d"
+#~ msgstr "Tijdsverschul is %d, maximum toegstaan is %d"
+
+#~ msgid "Could not read time-service config from %s"
+#~ msgstr "Kon geen tijdserver configuratie lezen vanuit %s"
+
+#~ msgid "Vault location"
+#~ msgstr "Foute locatie"
+
+#~ msgid "Error: No operation supplied\n"
+#~ msgstr "Fout: Geen operatie gespecificeerd\n"
+
+#~ msgid "Error: Invalid operation supplied (%s)\n"
+#~ msgstr "Fout: Ongeldig operatie opgegeven (%s)\n"
+
+#~ msgid ""
+#~ "Error: Invalid syntax\n"
+#~ "Syntax: %s\n"
+#~ msgstr ""
+#~ "Fout: ongeldinge syntax\n"
+#~ "Syntax: %s\n"
+
+#~ msgid ""
+#~ "Error while %s.\n"
+#~ "%s is not readable."
+#~ msgstr ""
+#~ "Fout tijdens %s\n"
+#~ "%s is niet leesbaar."
+
+#~ msgid "moved"
+#~ msgstr "verplaatst"
+
+#~ msgid "linked"
+#~ msgstr "verwijzing gemaakt"
+
+#~ msgid "You cannot throw \"%s\" into the Trash."
+#~ msgstr "Je kunt \"%s\" niet in de vuilnisbak gooien"
+
+#~ msgid "Error Moving to Trash"
+#~ msgstr "Fout bij het verplaatsen naar de vuilnisbak"
+
+#~ msgid "folder"
+#~ msgstr "map"
+
+#~ msgid "fixed"
+#~ msgstr "gerepareerd"
+
+#~ msgid "Folder Views"
+#~ msgstr "Map opties"
+
+#~ msgid "Folder Views Settings"
+#~ msgstr "Map opties instellingen"
+
+#~ msgid "Window Behavior"
+#~ msgstr "Venster Instellingen"
+
+#~ msgid "Sidebar Panels Description"
+#~ msgstr "Zijkant paneel omschijving"
 
-#~ msgid "_Service Preferences"
-#~ msgstr "_Service Voorkeuren"
+#~ msgid "Choose which panels should appear in the sidebar"
+#~ msgstr "Kies welke panelen moeten verschijnen aan de zijkant"
+
+#~ msgid "Appearance Settings"
+#~ msgstr "Vookomen instellingen"
+
+#~ msgid "Views"
+#~ msgstr "Bekijk mogelijkheden"
+
+#~ msgid "Speed Tradeoffs Settings"
+#~ msgstr "Snelheid Tradeoffs instellingen"
+
+#~ msgid "Search Tradeoffs"
+#~ msgstr "Zoek Tradeoffs"
+
+#~ msgid "Navigation Settings"
+#~ msgstr "Navigatie instellingen"
+
+#~ msgid "Home Location"
+#~ msgstr "Thuis lokatie"
+
+#~ msgid "HTTP Proxy"
+#~ msgstr "HTTP proxy"
+
+#~ msgid "HTTP Proxy Port"
+#~ msgstr "HTTP proxy poort"
+
+#~ msgid "current theme"
+#~ msgstr "Huidige thema"
+
+#~ msgid "Ask before deleting items from the trash"
+#~ msgstr "Vraag voordat ik bestanden in de vuilnisbak gooi."
+
+#~ msgid "Click policy"
+#~ msgstr "Klik policy"
+
+#~ msgid "Display text in icons"
+#~ msgstr "Laat de tekst in de iconen zien"
+
+#~ msgid "Show thumbnails for image files"
+#~ msgstr "Laat voorbeelden voor plaatjes bestanden zien"
+
+#~ msgid "Read and write metadata in each folder"
+#~ msgstr "Lees en schrijf instellingen in elke map"
+
+#~ msgid "Font family used to display file names"
+#~ msgstr "Lettertype familie om bestandnamen te laten zien"
+
+#~ msgid "Always do slow, complete search"
+#~ msgstr "Doe altijd een trage, complete zoekmethode"
+
+#~ msgid "Can add Content"
+#~ msgstr "Kan geen Inhoud toevoegen"
+
+#~ msgid "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*"
+#~ msgstr "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*"
+
+#~ msgid ""
+#~ "Sorry, %s can only open local files, and \"%s\" is remote. If you want to "
+#~ "open it with %s, make a local copy first."
+#~ msgstr ""
+#~ "Sorry, %s can only open local files, and \"%s\" is remote. If you want to "
+#~ "open it with %s, make a local copy first."
+
+#~ msgid "Can't open remote file"
+#~ msgstr "Kan remote bestand niet openen"
+
+#~ msgid "that have \"%s\" in the name"
+#~ msgstr "Dat heeft \"%s\" in de naam"
+
+#~ msgid "that don't contain \"%s\""
+#~ msgstr "dat bevat geen \"%s\""
+
+#~ msgid "regular files"
+#~ msgstr "Reguliere bestanden"
+
+#~ msgid "applications"
+#~ msgstr "programmas"
+
+#~ msgid "directories"
+#~ msgstr "mappen"
+
+#~ msgid "modified on %s"
+#~ msgstr "veranderd op %s"
+
+#~ msgid "marked with \"%s\""
+#~ msgstr "gemarkeerd met \"%s\""
+
+#~ msgid "that"
+#~ msgstr "dat"
+
+#~ msgid "Warning"
+#~ msgstr "Waarschuwing"
+
+#~ msgid "_Cut Text"
+#~ msgstr "_Knip tekst"
+
+#~ msgid "Quit Nautilus Desktop"
+#~ msgstr "Sluit Nautilus Bureablad af."
+
+#~ msgid ""
+#~ "We're sorry, but the directory you're viewing has more files than we're able "
+#~ "to display.  As a result, we are only able to show you the first 4000 files "
+#~ "it contains. \n"
+#~ "This is a temporary limitation in this Preview Release of Nautilus, and will "
+#~ "not be present in the final shipping version.\n"
+#~ msgstr ""
+#~ "Het spijt ons, maar een directory die je bekijkt heeft meer bestanden dan we "
+#~ "kunnen weergeven. We geven alleen de eerste 4000 bestanden weer. Dit is een "
+#~ "tijdelijke limitatie in de Preview Release van Nautilus en zal niet aanwezig "
+#~ "zijn in de uiteindelijke versie.\n"
+
+#~ msgid "Reset _Background"
+#~ msgstr "Reset achtergrond"
+
+#~ msgid "*Control*t"
+#~ msgstr "*Control*v"
+
+#~ msgid "_Use Tighter Layout"
+#~ msgstr "Gebruik tighter layout"
+
+#~ msgid "Where:"
+#~ msgstr "Waar:"
+
+#~ msgid "No response"
+#~ msgstr "Geen antwoord"
+
+#~ msgid "No indexer present"
+#~ msgstr "Geen indexer aanwezig"
+
+#~ msgid "Error while trying to reindex: %s"
+#~ msgstr "Fout tijdens herindexeren: %s"
+
+#~ msgid "Your files are currently being indexed:"
+#~ msgstr "Uw bestanden worden nu geindexeerd:"
+
+#~ msgid "Indexing Info..."
+#~ msgstr "Indexeren Informatie..."
+
+#~ msgid "User Main Directory"
+#~ msgstr "Gebruikers hoofdmap"
+
+#~ msgid "Desktop Directory"
+#~ msgstr "Desktop map"
+
+#~ msgid "Missing Directories"
+#~ msgstr "Missende map"
+
+#~ msgid "I want to learn more about Eazel services."
+#~ msgstr "Ik wil meer leren over de Eazel services."
+
+#~ msgid "I want to sign up for Eazel services now."
+#~ msgstr "Ik wil me nu inschrijven op de Eazel services."
+
+#~ msgid "I've already signed up and want to login now."
+#~ msgstr "Ik ben al ingeschreven en wil nu inloggen."
+
+#~ msgid "I don't want to learn about Eazel services at this time."
+#~ msgstr "Ik wil niks leren over Eazel op dit moment."
+
+#~ msgid ""
+#~ "Nautilus will now contact Eazel services to verify your \n"
+#~ "web connection and download the latest updates.  \n"
+#~ "Click the Next button to continue."
+#~ msgstr ""
+#~ "Nautilus gebruikt het internet nu om te controleren of die bestaat\n"
+#~ "en haalt de laatste updates binnen. \n"
+#~ "Klik op Volgende om door te gaan."
+
+#~ msgid "Updating Nautilus"
+#~ msgstr "Opwaarderen Nautilus"
+
+#~ msgid "No, I don't wish to connect and update Nautilus now."
+#~ msgstr "Nee, ik wil niet connecten en Nautilus opwaarderen."
+
+#~ msgid "HTTP Proxy Configuration"
+#~ msgstr "HTTP proxy configuratie"
+
+#~ msgid ""
+#~ "We are now contacting the Eazel service to test your \n"
+#~ "web connection and update Nautilus."
+#~ msgstr ""
+#~ "We zijn nu Eazel service aan het connecten om je internetverbinding te "
+#~ "testen\n"
+#~ "en Nautilus te opwaarderen"
+
+#~ msgid ""
+#~ "Since this is the first time that you've launched\n"
+#~ "Nautilus, we'd like to ask you a few questions\n"
+#~ "to help personalize it for your use."
+#~ msgstr ""
+#~ "Dit is de eerste keer dat je Nautilus draait\n"
+#~ "daarom stellen we je een aantal vragen om nautilus voor je in\n"
+#~ "te stellen."
+
+#~ msgid "Press the next button to continue."
+#~ msgstr "Klik op volgende om door te gaan."
+
+#~ msgid ""
+#~ "Click the finish button to launch Nautilus.\n"
+#~ "We hope that you enjoy using it!"
+#~ msgstr ""
+#~ "Klik op [Klaar] om Nautilus te starten.\n"
+#~ "We hopen dat je het waardeerd."
+
+#~ msgid "Sign Up for Eazel Services"
+#~ msgstr "Schrijf in op de Eazel Services"
+
+#~ msgid "Don't draw background and icons on desktop."
+#~ msgstr "Laat geen achtergrond of iconen op het bureaublad zien."
+
+#~ msgid "Draw background and icons on desktop."
+#~ msgstr "Laat achtergrond en iconen zien op bureaublad."
+
+#~ msgid "nautilus: --quit and --start-desktop cannot be used together.\n"
+#~ msgstr ""
+#~ "nautilus: --quit en --start-desktop kunnen niet samen worden gebruikt.\n"
+
+#~ msgid "nautilus: --restart and --start-desktop cannot be used together.\n"
+#~ msgstr ""
+#~ "nautilus: --restart en --start-desktop kunnen niet samen worden gebruikt.\n"
+
+#~ msgid ""
+#~ "nautilus: --stop-desktop and --start-desktop cannot be used together.\n"
+#~ msgstr ""
+#~ "nautilus: --stop-desktop en --start-desktop kunnen niet samen worden "
+#~ "gebruikt.\n"
+
+#~ msgid "Customization Options"
+#~ msgstr "Bewerkingen Instellen"
+
+#~ msgid "Sorry, but the background %s couldn't be installed."
+#~ msgstr "Sorry, maar achtergrond %s kon niet worden geinstalleerd."
+
+#~ msgid "Couldn't install background"
+#~ msgstr "Kon de achtergrond niet installeren"
+
+#~ msgid "Add a new background"
+#~ msgstr "Voeg een achtergrond toe"
+
+#~ msgid "Click on a background to remove it"
+#~ msgstr "Klik op een achtergrond om het te verwijderen"
+
+#~ msgid "With Emblem"
+#~ msgstr "Met embleem"
+
+#~ msgid "Last Modified"
+#~ msgstr "laatst gemodificeerd"
+
+#~ msgid "Owned By"
+#~ msgstr "Eigenaar"
+
+#~ msgid "starts with"
+#~ msgstr "start met"
+
+#~ msgid "ends with"
+#~ msgstr "eindigd met"
+
+#~ msgid "matches glob"
+#~ msgstr "komt globaal overeen met"
+
+#~ msgid "matches regexp"
+#~ msgstr "komt overeen met regexp"
+
+#~ msgid "includes all of"
+#~ msgstr "bevat alles van"
+
+#~ msgid "includes any of"
+#~ msgstr "bevat een van"
+
+#~ msgid "includes none of"
+#~ msgstr "bevat niks van"
+
+#~ msgid "is not"
+#~ msgstr "is niet"
+
+#~ msgid "text file"
+#~ msgstr "text bestand"
+
+#~ msgid "application"
+#~ msgstr "programma"
+
+#~ msgid "directory"
+#~ msgstr "map"
+
+#~ msgid "larger than"
+#~ msgstr "groter dan"
+
+#~ msgid "smaller than"
+#~ msgstr "kleiner dan"
+
+#~ msgid "marked with"
+#~ msgstr "gemarkeerd met"
+
+#~ msgid "not marked with"
+#~ msgstr "niet gemarkeerd"
+
+#~ msgid "is after"
+#~ msgstr "is na"
+
+#~ msgid "is before"
+#~ msgstr "is voor"
+
+#~ msgid "is yesterday"
+#~ msgstr "is gisteren"
+
+#~ msgid "is within a week of"
+#~ msgstr "is binnen een week van"
+
+#~ msgid "is within a month of"
+#~ msgstr "is binnen een maand van"
+
+#~ msgid "C_hange Appearance..."
+#~ msgstr "_Voorkomen Veranderen..."
+
+#~ msgid ""
+#~ "Display the Property Browser, containing patterns, colors, and emblems"
+#~ msgstr ""
+#~ "Geef de Eigenschappen Bladeraar weer, bevat patronen, kleuren en emblemen"
+
+#~ msgid "Edit Settings..."
+#~ msgstr "Bewerk instellingen..."
+
+#~ msgid "Edit settings for the current user level"
+#~ msgstr "Bewerk instellingen voor het huidige gebruikers niveau"
+
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr ""
+#~ "Verwijderd de geselecteerde tekst zonder deze op het klembord te zetten"
+
+#~ msgid "Use Advanced settings"
+#~ msgstr "Gebruik Geavanceerde Instellingen"
+
+#~ msgid "Use Beginner settings"
+#~ msgstr "Gebruik Beginners instellingen"
+
+#~ msgid "Use Intermediate settings"
+#~ msgstr "Gebruik Gemiddelde instellingen"
+
+#~ msgid "_Web Search"
+#~ msgstr "_Web zoeken"
+
+#~ msgid "Add new theme"
+#~ msgstr "Voeg een nieuw thema toe"
+
+#~ msgid "Inadequate Permissions"
+#~ msgstr "Inadequate Permissies"
+
+#~ msgid ""
+#~ "Couldn't display \"%s\", because Nautilus cannot handle items of this "
+#~ "unknown type."
+#~ msgstr ""
+#~ "Kan \"%s\" niet laten zien, omdat Nautilus items van dit type niet kan "
+#~ "afhandelen"
+
+#~ msgid ""
+#~ "None of the settings for the %s level can be edited. If you want to edit the "
+#~ "settings you must choose the %s or %s level. Do you want to switch to the %s "
+#~ "level now and edit its settings?"
+#~ msgstr ""
+#~ "None of the settings for the %s level can be edited. If you want to edit the "
+#~ "settings you must choose the %s or %s level. Do you want to switch to the %s "
+#~ "level now and edit its settings?"
+
+#~ msgid "Switch to %s Level?"
+#~ msgstr "Verander naar Level %s?"
+
+#~ msgid "Go to the specified location"
+#~ msgstr "Ga naar de gespecificeerde lokatie"
+
+#~ msgid "_Browse"
+#~ msgstr "Blader"
+
+#~ msgid "Edit %s Settings"
+#~ msgstr "Bewerk %s instellingen..."
+
+#~ msgid "Edit %s Settings..."
+#~ msgstr "Bewerk %s instellingen..."
 
 #~ msgid "Logout from Eazel Services"
 #~ msgstr "Log uit Eazel Services"
@@ -5448,9 +11015,6 @@ msgstr "%.0f%%"
 #~ msgid "Show the login dialog box"
 #~ msgstr "Geef login dialoogvenster weer"
 
-#~ msgid "_Login to Eazel Services"
-#~ msgstr "_Login op Eazel Services"
-
 #~ msgid "_Logout from Eazel Services"
 #~ msgstr "Log uit Eazel Services"
 
@@ -5481,9 +11045,6 @@ msgstr "%.0f%%"
 #~ "\n"
 #~ "U klikde sluit de content af."
 
-#~ msgid "Loser"
-#~ msgstr "Loser"
-
 #~ msgid "Kill the Loser sidebar view."
 #~ msgstr "Kill the Loser sidebar view."
 
@@ -5526,9 +11087,6 @@ msgstr "%.0f%%"
 #~ msgid "%s %s: couldn't find this package\n"
 #~ msgstr "%s %s: Kan dat pakket niet vinden\n"
 
-#~ msgid "%s %s: source package (not supported)\n"
-#~ msgstr "%s %s: source pakket (niet ondersteund)\n"
-
 #~ msgid "%s %s: would break other installed packages\n"
 #~ msgstr "%s %s: breekt de installatie van andere pakketten\n"
 
@@ -5538,9 +11096,6 @@ msgstr "%.0f%%"
 #~ msgid "%s %s: already installed\n"
 #~ msgstr "%s %s: al geinstalleerd\n"
 
-#~ msgid "Choose a program with which to open the selected item"
-#~ msgstr "Kies een programma om de geselecteerd items mee te openen"
-
 #~ msgid "Choose an order for the icons in this folder"
 #~ msgstr "Kies een manier om de iconen te sorteren in deze map"
 
@@ -5572,14 +11127,8 @@ msgstr "%.0f%%"
 #~ "\n"
 #~ "For more information, visit http://nautilus.eazel.com."
 
-#~ msgid "Create a new window"
-#~ msgstr "Creer een nieuw venster"
-
 #~ msgid ""
 #~ "Displays a list of alternative appearances, to allow you to change the "
 #~ "appearance"
 #~ msgstr ""
 #~ "Laat een lijst zien van voorkomens, zodat u kunt kiezen uit de voorkomens"
-
-#~ msgid "Displays information about the Nautilus program"
-#~ msgstr "Laat informatie zien over het Nautilus programma"
diff --git a/po/nn.po b/po/nn.po
index 63dddad51..074b39c33 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -2,11 +2,15 @@
 # Copyright (C) 2000 Gaute Hvoslef Kvalnes.
 # Gaute Hvoslef Kvalnes <ai98ghk@stud.hib.no>, 2000.
 # Kjartan Maraas  <kmaraas@gnome.org>, 2000.
-
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: KDE PIM/abbrowser\n"
-"POT-Creation-Date: 2001-02-13 15:30+0100\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2000-09-07 20:17+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian (Nynorsk)\n"
@@ -18,10 +22,35 @@ msgstr ""
 msgid "Can't create nautilus-launcher-applet!"
 msgstr ""
 
-#: applets/preferences-applet/nautilus-preferences-applet.c:201
+#: applets/preferences-applet/nautilus-preferences-applet.c:211
 msgid "Can't create nautilus-preferences-applet!"
 msgstr ""
 
+#: applets/preferences-applet/nautilus-preferences-applet.c:226
+#, fuzzy
+msgid "Show Desktop"
+msgstr "Skrivebord"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:230
+#, fuzzy
+msgid "Smooth Graphics"
+msgstr "Name=Grafikk"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:243
+#: src/nautilus-application.c:639
+msgid "Quit"
+msgstr "Avslutt"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:251
+#, fuzzy
+msgid "Start"
+msgstr "Status"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:259
+#, fuzzy
+msgid "Restart"
+msgstr "P&røv igjen"
+
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:1
 msgid "Factory for Nautilus component adapter factories"
 msgstr ""
@@ -73,9 +102,21 @@ msgstr "%1 MB"
 msgid "Hardware Overview"
 msgstr ""
 
+#: components/hardware/nautilus-hardware-view.c:520
+msgid "This is a placeholder for the CPU page."
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:545
+msgid "This is a placeholder for the RAM page."
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:570
+msgid "This is a placeholder for the IDE page."
+msgstr ""
+
 #: components/hardware/Nautilus_View_hardware.oaf.in.h:2
 #: components/hardware/nautilus-hardware-view.c:631
-#: data/static_bookmarks.xml.h:13
+#: data/static_bookmarks.xml.h:16
 #, fuzzy
 msgid "Hardware"
 msgstr "Vanskelege reglar"
@@ -86,119 +127,130 @@ msgstr ""
 
 #: components/hardware/Nautilus_View_hardware.oaf.in.h:3
 #, fuzzy
-msgid "Hardware view"
+msgid "Hardware Viewer"
 msgstr "Førehandsvising"
 
 #: components/hardware/Nautilus_View_hardware.oaf.in.h:4
 #, fuzzy
+msgid "Hardware view"
+msgstr "Førehandsvising"
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:5
+#, fuzzy
+msgid "View as Hardware"
+msgstr "Vanskelege reglar"
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:6
+#, fuzzy
 msgid "hardware view"
 msgstr "&Førehandsvis"
 
-#: components/help/converters/gnome-db2html2/gdb3html.c:708
-#: components/music/nautilus-music-view.c:1493
+#: components/help/converters/gnome-db2html2/gdb3html.c:712
+#: components/music/nautilus-music-view.c:1512
 msgid "Previous"
 msgstr "Førre"
 
-#: components/help/converters/gnome-db2html2/gdb3html.c:717
+#: components/help/converters/gnome-db2html2/gdb3html.c:721
+#: libnautilus-extensions/nautilus-global-preferences.c:789
 #: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "Heim"
 
-#: components/help/converters/gnome-db2html2/gdb3html.c:726
-#: components/music/nautilus-music-view.c:1549
+#: components/help/converters/gnome-db2html2/gdb3html.c:730
+#: components/music/nautilus-music-view.c:1568
 msgid "Next"
 msgstr "Neste"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:255
+#: components/help/converters/gnome-db2html2/sect-elements.c:259
 #: components/notes/Nautilus_View_notes.oaf.in.h:2
 msgid "Notes"
 msgstr "Notat"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:705
+#: components/help/converters/gnome-db2html2/sect-elements.c:709
 #, fuzzy, c-format
 msgid "Table %d."
 msgstr "Tabell %1"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:860
+#: components/help/converters/gnome-db2html2/sect-elements.c:864
 #, fuzzy
 msgid "Up to Table of Contents"
 msgstr "Innhaldsliste"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1008
+#: components/help/converters/gnome-db2html2/sect-elements.c:1012
 #, fuzzy, c-format
 msgid "Figure %s"
 msgstr "Arkiver som"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1028
+#: components/help/converters/gnome-db2html2/sect-elements.c:1032
 #, fuzzy
 msgid "the section here"
 msgstr "Andre-del"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1030
+#: components/help/converters/gnome-db2html2/sect-elements.c:1034
 #, fuzzy
 msgid "the section"
 msgstr "Andre-del"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1086
+#: components/help/converters/gnome-db2html2/sect-elements.c:1090
 #, fuzzy, c-format
 msgid "Figure %d"
 msgstr "Linje %d"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1098
+#: components/help/converters/gnome-db2html2/sect-elements.c:1102
 #, fuzzy
 msgid "IMAGE"
 msgstr "&IMAP"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:2064
-#: components/help/converters/gnome-db2html2/sect-elements.c:2066
+#: components/help/converters/gnome-db2html2/sect-elements.c:2068
+#: components/help/converters/gnome-db2html2/sect-elements.c:2070
 #, fuzzy
 msgid "Legal Notice"
 msgstr "Nivå 3 (Aspirant)"
 
 #. This 'Q' is short for 'Question:'
-#: components/help/converters/gnome-db2html2/sect-elements.c:2112
+#: components/help/converters/gnome-db2html2/sect-elements.c:2116
 #, fuzzy
 msgid "Q"
 msgstr "Qt"
 
 #. This 'A' is short for 'Answer'
-#: components/help/converters/gnome-db2html2/sect-elements.c:2124
+#: components/help/converters/gnome-db2html2/sect-elements.c:2128
 #, fuzzy
 msgid "A"
 msgstr "AM"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:2147
+#: components/help/converters/gnome-db2html2/sect-elements.c:2151
 #, fuzzy
 msgid "See"
 msgstr "Fart"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:2174
+#: components/help/converters/gnome-db2html2/sect-elements.c:2178
 #, fuzzy
 msgid "See also"
 msgstr "Senegal"
 
-#: components/help/converters/gnome-db2html2/toc-elements.c:316
+#: components/help/converters/gnome-db2html2/toc-elements.c:322
 #, fuzzy
 msgid "GNOME Documentation"
 msgstr "Hjelpetekst"
 
-#: components/help/converters/gnome-db2html2/toc-elements.c:347
+#: components/help/converters/gnome-db2html2/toc-elements.c:353
 msgid "Copyright"
 msgstr "Opphavsrett"
 
-#: components/help/converters/gnome-db2html2/toc-elements.c:347
+#: components/help/converters/gnome-db2html2/toc-elements.c:353
 msgid "by"
 msgstr "av"
 
-#: components/help/converters/gnome-db2html2/toc-elements.c:349
+#: components/help/converters/gnome-db2html2/toc-elements.c:355
 msgid "Table of Contents"
 msgstr "Innhaldsliste"
 
-#: components/help/converters/gnome-db2html2/toc-elements.c:514
+#: components/help/converters/gnome-db2html2/toc-elements.c:521
 msgid "PREFACE"
 msgstr ""
 
-#: components/help/converters/gnome-db2html2/toc-elements.c:523
+#: components/help/converters/gnome-db2html2/toc-elements.c:530
 msgid "APPENDIX"
 msgstr ""
 
@@ -242,61 +294,80 @@ msgstr ""
 #. GNU Public  License  and  many  people  are
 #. working on changes to the kernel)
 #. **
-#: components/help/hyperbola-filefmt.c:505
-#: components/help/hyperbola-filefmt.c:507
-#: components/help/hyperbola-filefmt.c:511
-#: components/help/hyperbola-filefmt.c:513
-#: components/help/hyperbola-filefmt.c:517
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:537
+#: components/help/hyperbola-filefmt.c:538
+#: components/help/hyperbola-filefmt.c:539
+#: components/help/hyperbola-filefmt.c:541
+#: components/help/hyperbola-filefmt.c:543
 msgid "Manual"
 msgstr "Manuell"
 
-#: components/help/hyperbola-filefmt.c:507
-msgid "System"
-msgstr "System"
-
-#: components/help/hyperbola-filefmt.c:507
-msgid "Configuration"
-msgstr "Oppsett"
-
-#: components/help/hyperbola-filefmt.c:507
-#, fuzzy
-msgid "Config files"
-msgstr "Rens oppsettfiler"
-
-#: components/help/hyperbola-filefmt.c:511
-#: components/help/hyperbola-filefmt.c:835 data/linksets/apps.xml.h:1
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:861 data/linksets/apps.xml.h:1
 msgid "Applications"
 msgstr "Program"
 
-#: components/help/hyperbola-filefmt.c:511
-msgid "Command Line"
-msgstr "Kommandolinje"
-
-#: components/help/hyperbola-filefmt.c:513
-#: components/help/hyperbola-filefmt.c:517
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:543
 #, fuzzy
 msgid "Development"
 msgstr "Name=Utvikling"
 
-#: components/help/hyperbola-filefmt.c:513
-#: components/help/hyperbola-filefmt.c:517
-msgid "APIs"
+#: components/help/hyperbola-filefmt.c:532
+#, fuzzy
+msgid "System Calls"
+msgstr "Systemfargar"
+
+#: components/help/hyperbola-filefmt.c:534
+msgid "Library Functions"
 msgstr ""
 
-#: components/help/hyperbola-filefmt.c:513
-msgid "Miscellaneous"
-msgstr "Ymse"
+#: components/help/hyperbola-filefmt.c:536
+#, fuzzy
+msgid "Devices"
+msgstr "Tenester"
 
-#: components/help/hyperbola-filefmt.c:517
+#: components/help/hyperbola-filefmt.c:537
 #, fuzzy
-msgid "System Calls"
-msgstr "Systemfargar"
+msgid "Configuration Files"
+msgstr "Oppsett"
+
+#: components/help/hyperbola-filefmt.c:538
+#, fuzzy
+msgid "Games"
+msgstr "S&pel"
+
+#: components/help/hyperbola-filefmt.c:539
+#, fuzzy
+msgid "Conventions"
+msgstr "Innhald"
 
-#: components/help/hyperbola-filefmt.c:677
-#: libnautilus-extensions/nautilus-stock-dialogs.c:483
+#: components/help/hyperbola-filefmt.c:541
+msgid "System Administration"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:543
+msgid "Kernel Routines"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:703
 msgid "Info"
 msgstr "Info"
 
+#: components/help/hyperbola-nav-tree.c:310
+msgid "Introductory Documents:"
+msgstr ""
+
+#: components/help/hyperbola-nav-tree.c:324
+msgid "Documents by Subject:"
+msgstr ""
+
 #: components/help/hyperbola-nav-index.c:121
 #, fuzzy
 msgid "see "
@@ -321,7 +392,7 @@ msgid " (see also \""
 msgstr ""
 
 #: components/help/Nautilus_View_help.oaf.in.h:1
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:104
+#: components/services/summary/nautilus-summary-dialogs.c:106
 msgid "Help"
 msgstr "Hjelp"
 
@@ -375,7 +446,7 @@ msgstr ""
 msgid "History sidebar panel for Nautilus"
 msgstr ""
 
-#: components/image-viewer/nautilus-image-view.c:823
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr ""
 
@@ -394,13 +465,23 @@ msgstr "Bilete"
 
 #: components/image-viewer/Nautilus_View_image.oaf.in.h:4
 #, fuzzy
-msgid "Nautilus Image Viewer"
+msgid "Image Viewer"
 msgstr "Name=Biletevisar"
 
 #: components/image-viewer/Nautilus_View_image.oaf.in.h:5
+#, fuzzy
+msgid "Nautilus Image Viewer"
+msgstr "Name=Biletevisar"
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:6
 msgid "Nautilus Image viewer factory"
 msgstr ""
 
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:7
+#, fuzzy
+msgid "View as Image"
+msgstr "Visingar"
+
 #: components/loser/content/nautilus-content-loser.c:140
 #, c-format
 msgid ""
@@ -425,9 +506,8 @@ msgstr "Lagrar dokumentet"
 
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
-#: components/mozilla/nautilus-mozilla-ui.xml.h:4
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:77
+#: src/nautilus-shell-ui.xml.h:81
 #, fuzzy
 msgid "_File"
 msgstr "Fil"
@@ -442,21 +522,31 @@ msgid "Content Loser"
 msgstr "Innhald"
 
 #: components/loser/content/Nautilus_View_content-loser.oaf.in.h:2
+#, fuzzy
+msgid "Content Loser Viewer"
+msgstr "Innhald"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:3
 msgid "Nautilus Content Loser"
 msgstr ""
 
-#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:3
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:4
 msgid "Nautilus content loser component's factory"
 msgstr ""
 
-#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:4
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:5
 msgid "Nautilus content loser factory"
 msgstr ""
 
-#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:5
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:6
 msgid "Nautilus content view that fails on command"
 msgstr ""
 
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:7
+#, fuzzy
+msgid "View as Content Loser"
+msgstr "Innhald"
+
 #: components/loser/sidebar/nautilus-sidebar-loser.c:143
 #, c-format
 msgid ""
@@ -502,8 +592,8 @@ msgstr ""
 msgid "Sidebar Loser"
 msgstr "Sierra Leone"
 
-#: components/mozilla/mozilla-preferences.cpp:118
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: components/mozilla/mozilla-preferences.cpp:126
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, fuzzy, c-format
 msgid ""
 "GConf error:\n"
@@ -512,8 +602,8 @@ msgstr ""
 "Ukjend feil\n"
 "%1"
 
-#: components/mozilla/mozilla-preferences.cpp:125
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: components/mozilla/mozilla-preferences.cpp:133
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -521,20 +611,364 @@ msgid ""
 "All further errors shown only on terminal"
 msgstr ""
 
-#: components/mozilla/nautilus-mozilla-ui.xml.h:1
-msgid "Mozilla Test"
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:38
+msgid "Arabic"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:39
+#, fuzzy
+msgid "Baltic"
+msgstr "Basis"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:40
+msgid "Central European"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:41
+#, fuzzy
+msgid "Chinese"
+msgstr "Kanalar"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:42
+msgid "Cyrillic"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:43
+msgid "Greek"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:44
+msgid "Hebrew"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:45
+msgid "Japanese"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:46
+#, fuzzy
+msgid "Turkish"
+msgstr "Sletta"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:47
+msgid "Unicode"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:48
+msgid "UTF"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:49
+#, fuzzy
+msgid "Vietnamese"
+msgstr "Endra namn"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:50
+#, fuzzy
+msgid "Western"
+msgstr "Register"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:55
+msgid "Arabic (IBM-864)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:56
+msgid "Arabic (ISO-8859-6)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:57
+msgid "Arabic (ISO-8859-6-E)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:58
+msgid "Arabic (ISO-8859-6-I)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:59
+msgid "Arabic (Windows-1256)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:60
+msgid "Armenian (ARMSCII-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:61
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:62
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:63
+msgid "Baltic (Windows-1257)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:64
+msgid "Celtic (ISO-8859-14)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:65
+msgid "Central European (IBM-852)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:66
+msgid "Central European (ISO-8859-2)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:67
+msgid "Central European (MacCE)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:68
+msgid "Central European (Windows-1250)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:69
+msgid "Chinese Simplified (GB2312)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:70
+msgid "Chinese Simplified (GBK)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:71
+msgid "Chinese Simplified (HZ)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:72
+msgid "Chinese Traditional (Big5)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:73
+msgid "Chinese Traditional (EUC-TW)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:74
+msgid "Croatian (MacCroatian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:75
+msgid "Cyrillic (IBM-855)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:76
+msgid "Cyrillic (ISO-8859-5)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:77
+msgid "Cyrillic (ISO-IR-111)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:78
+msgid "Cyrillic (MacCyrillic)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:79
+msgid "Cyrillic (Windows-1251)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:80
+msgid "Cyrillic/Russian (IBM-866)"
 msgstr ""
 
-#: components/mozilla/nautilus-mozilla-ui.xml.h:2
-msgid "This is a Mozilla merged menu item"
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:81
+msgid "Cyrillic/Russian (KOI8-R)"
 msgstr ""
 
-#: components/mozilla/nautilus-mozilla-ui.xml.h:3
-msgid "This is a Mozilla merged tool bar button"
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:82
+msgid "Cyrillic/Ukrainian (KOI8-U)"
 msgstr ""
 
-#: components/mozilla/nautilus-mozilla-ui.xml.h:5
-msgid "_Mozilla Test"
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:83
+msgid "Cyrillic/Ukrainian (MacUkrainian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:84
+msgid "English (US-ASCII)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:85
+msgid "Greek (ISO-8859-7)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:86
+msgid "Greek (MacGreek)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:87
+msgid "Greek (Windows-1253)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:88
+msgid "Hebrew (IBM-862)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:89
+msgid "Hebrew (ISO-8859-8-E)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:90
+msgid "Hebrew (ISO-8859-8-I)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:91
+msgid "Hebrew (Windows-1255)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:92
+msgid "Icelandic (MacIcelandic)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:93
+msgid "Japanese (EUC-JP)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:94
+msgid "Japanese (ISO-2022-JP)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:95
+msgid "Japanese (Shift_JIS)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:96
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:97
+msgid "Nordic (ISO-8859-10)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:98
+msgid "Romanian (MacRomanian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:99
+msgid "South European (ISO-8859-3)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:100
+msgid "T.61-8bit"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:101
+msgid "Thai (TIS-620)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:102
+msgid "Turkish (IBM-857)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:103
+msgid "Turkish (ISO-8859-9)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:104
+msgid "Turkish (MacTurkish)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:105
+msgid "Turkish (Windows-1254)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:106
+msgid "Unicode (UTF-7)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:107
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:108
+msgid "User Defined"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:109
+msgid "UTF-16BE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:110
+msgid "UTF-16LE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:111
+msgid "UTF-32BE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:112
+msgid "UTF-32LE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:113
+msgid "Vietnamese (TCVN)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:114
+msgid "Vietnamese (VISCII)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:115
+msgid "Vietnamese (VPS)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:116
+msgid "Vietnamese (Windows-1258)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:117
+msgid "Visual Hebrew (ISO-8859-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:118
+msgid "Western (IBM-850)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:119
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:120
+msgid "Western (ISO-8859-15)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:121
+msgid "Western (MacRoman)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:122
+msgid "Western (Windows-1252)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:123
+msgid "windows-936"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:124
+msgid "x-imap4-modified-utf7"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:125
+#, fuzzy
+msgid "x-u-escaped"
+msgstr "Name=Netscape"
+
+#: components/mozilla/nautilus-mozilla-content-view.c:809
+msgid ""
+"A JavaScript function (small software program) on this page tried to open a "
+"new window, but nautilus does not support the opening of new windows by "
+"JavaScript.\n"
+"\n"
+"Try viewing the page in a different web browser, such as Mozilla or Netscape."
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-content-view.c:810
+#, fuzzy
+msgid "Nautilus Mozilla View Warning"
+msgstr "Name=Biletevisar"
+
+#: components/mozilla/nautilus-mozilla-ui.xml.h:1
+msgid "Charset Encoding"
 msgstr ""
 
 #: components/mozilla/Nautilus_View_mozilla.oaf.in.h:1
@@ -554,9 +988,19 @@ msgid "Mozilla content view component's factory"
 msgstr ""
 
 #: components/mozilla/Nautilus_View_mozilla.oaf.in.h:5
+#, fuzzy
+msgid "View as Web Page"
+msgstr "Internettside"
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:6
 msgid "Web Page"
 msgstr "Internettside"
 
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:7
+#, fuzzy
+msgid "Web Page Viewer"
+msgstr "Internettside"
+
 #: components/music/mpg123.c:29
 #, fuzzy
 msgid "Blues"
@@ -1322,7 +1766,7 @@ msgstr ""
 "ser ikkje ut til å vera ei WAV-fil."
 
 #: components/music/nautilus-music-view.c:696
-#: src/nautilus-property-browser.c:1044 src/nautilus-property-browser.c:1301
+#: src/nautilus-property-browser.c:1060 src/nautilus-property-browser.c:1312
 #, fuzzy
 msgid "Not an Image"
 msgstr "Ingen nye meldingar."
@@ -1332,7 +1776,7 @@ msgstr "Ingen nye meldingar."
 msgid "Select an image file for the album cover:"
 msgstr "Vel ei biletefil"
 
-#: components/music/nautilus-music-view.c:1187
+#: components/music/nautilus-music-view.c:1174
 msgid ""
 "Sorry, but the music view is unable to play back sound right now. Either "
 "another program is using or blocking the sound card, or your sound card is "
@@ -1340,61 +1784,61 @@ msgid ""
 "use of the sound card."
 msgstr ""
 
-#: components/music/nautilus-music-view.c:1191
+#: components/music/nautilus-music-view.c:1178
 #, fuzzy
 msgid "Unable to Play File"
 msgstr "Kan ikkje lasta bilete."
 
-#: components/music/nautilus-music-view.c:1212
+#: components/music/nautilus-music-view.c:1199
 msgid "Sorry, but the music view can't play non-local files yet."
 msgstr ""
 
-#: components/music/nautilus-music-view.c:1213
+#: components/music/nautilus-music-view.c:1200
 #, fuzzy
 msgid "Can't Play Remote Files"
 msgstr "Kan ikkje lasta artikkelen"
 
-#: components/music/nautilus-music-view.c:1507
+#: components/music/nautilus-music-view.c:1486
+msgid "Drag to seek within track"
+msgstr ""
+
+#: components/music/nautilus-music-view.c:1526
 msgid "Play"
 msgstr "Spel"
 
-#: components/music/nautilus-music-view.c:1521
+#: components/music/nautilus-music-view.c:1540
 msgid "Pause"
 msgstr "Pause"
 
-#: components/music/nautilus-music-view.c:1535
-#: libnautilus-extensions/nautilus-file-operations.c:935
-#: libnautilus-extensions/nautilus-file-operations.c:950
-#: libnautilus-extensions/nautilus-file-operations.c:969
-#: src/nautilus-shell-ui.xml.h:54
+#: components/music/nautilus-music-view.c:1554
+#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Stopp"
 
-#: components/music/nautilus-music-view.c:1577
-msgid "Drag to seek within track"
-msgstr ""
-
-#: components/music/nautilus-music-view.c:1695
+#: components/music/nautilus-music-view.c:1679
 #, fuzzy, c-format
 msgid "Sorry, but there was an error reading %s."
 msgstr ""
 "Feil ved lasting av fil\n"
 "%1"
 
-#: components/music/nautilus-music-view.c:1696
+#: components/music/nautilus-music-view.c:1680
 #, fuzzy
 msgid "Can't Read Folder"
 msgstr "Kan ikkje laga mappe "
 
-#: components/music/nautilus-music-view.c:1766
+#: components/music/nautilus-music-view.c:1750
 msgid "Stereo"
 msgstr "Stereo"
 
-#: components/music/nautilus-music-view.c:1766
+#: components/music/nautilus-music-view.c:1750
 msgid "Mono"
 msgstr "Mono"
 
-#: components/music/nautilus-music-view.c:1808
+#: components/music/nautilus-music-view.c:1792
 #, c-format
 msgid "%s - %s"
 msgstr ""
@@ -1410,13 +1854,23 @@ msgstr "Speledåse"
 
 #: components/music/Nautilus_View_music.oaf.in.h:3
 #, fuzzy
-msgid "Music view"
+msgid "Music Viewer"
 msgstr "Speledåse"
 
 #: components/music/Nautilus_View_music.oaf.in.h:4
+#, fuzzy
+msgid "Music view"
+msgstr "Speledåse"
+
+#: components/music/Nautilus_View_music.oaf.in.h:5
 msgid "Music view factory"
 msgstr ""
 
+#: components/music/Nautilus_View_music.oaf.in.h:6
+#, fuzzy
+msgid "View as Music"
+msgstr "Visingar"
+
 #: components/notes/Nautilus_View_notes.oaf.in.h:1
 msgid "Factory for annotation view"
 msgstr ""
@@ -1430,202 +1884,6 @@ msgstr "Køyr &utanfor panel"
 msgid "Notes sidebar panel for Nautilus"
 msgstr ""
 
-#. set up the window title
-#: components/rpmview/nautilus-rpm-verify-window.c:183
-#, fuzzy, c-format
-msgid "Verifying %s..."
-msgstr "Kontroller ..."
-
-#: components/rpmview/nautilus-rpm-verify-window.c:207
-#, fuzzy, c-format
-msgid "Failed on \"%s\""
-msgstr "Fil opna: %s"
-
-#. TRANSLATORS: this is printed while verifying files from packages,
-#. %s is the filename, %d/%d is filenumber of total-number-of-files
-#: components/rpmview/nautilus-rpm-verify-window.c:211
-#, c-format
-msgid "Checking \"%s\" (%ld/%ld)"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view.c:124
-#, fuzzy
-msgid "Package Contents"
-msgstr "Pakke-mellomlager"
-
-#. allocate the name field
-#: components/rpmview/nautilus-rpm-view.c:171
-#, fuzzy
-msgid "Package Title"
-msgstr "Pakkefil"
-
-#: components/rpmview/nautilus-rpm-view.c:192
-msgid "Size: "
-msgstr "Storleik:"
-
-#: components/rpmview/nautilus-rpm-view.c:198
-#, fuzzy
-msgid "<size>"
-msgstr "storleik"
-
-#: components/rpmview/nautilus-rpm-view.c:204
-#, fuzzy
-msgid "Install Date: "
-msgstr "Sett inn dato"
-
-#: components/rpmview/nautilus-rpm-view.c:210
-#: components/rpmview/nautilus-rpm-view.c:222
-#: components/rpmview/nautilus-rpm-view.c:234
-#: components/rpmview/nautilus-rpm-view.c:246
-#: components/rpmview/nautilus-rpm-view.c:258
-msgid "<unknown>"
-msgstr "<ukjend>"
-
-#: components/rpmview/nautilus-rpm-view.c:216
-#, fuzzy
-msgid "License: "
-msgstr "Linje: %1"
-
-#: components/rpmview/nautilus-rpm-view.c:228
-#, fuzzy
-msgid "Build Date: "
-msgstr "Dato:"
-
-#: components/rpmview/nautilus-rpm-view.c:240
-#, fuzzy
-msgid "Distribution: "
-msgstr "Distribusjon"
-
-#: components/rpmview/nautilus-rpm-view.c:252
-#, fuzzy
-msgid "Vendor: "
-msgstr "Forhandlar"
-
-#: components/rpmview/nautilus-rpm-view.c:285
-#: components/services/install/nautilus-view/Nautilus_View_install.oaf.in.h:1
-#: components/services/install/server/Trilobite_Service_install.oaf.in.h:2
-msgid "Install"
-msgstr "Installer"
-
-#: components/rpmview/nautilus-rpm-view.c:301
-msgid "Update"
-msgstr "Oppdater"
-
-#: components/rpmview/nautilus-rpm-view.c:310
-msgid "Uninstall"
-msgstr "Avinstaller"
-
-#: components/rpmview/nautilus-rpm-view.c:326
-msgid "Verify"
-msgstr "Kontroller"
-
-#: components/rpmview/nautilus-rpm-view.c:362
-#, fuzzy
-msgid "Go to selected file"
-msgstr "flytt til valt"
-
-#. add the description
-#: components/rpmview/nautilus-rpm-view.c:373
-msgid "Description"
-msgstr "Skildring"
-
-#: components/rpmview/nautilus-rpm-view.c:492
-#, fuzzy, c-format
-msgid "Package Contents: %d files"
-msgstr "Pakkefil"
-
-#: components/rpmview/nautilus-rpm-view.c:499
-#, fuzzy, c-format
-msgid "Package \"%s\" "
-msgstr "Pakkar"
-
-#: components/rpmview/nautilus-rpm-view.c:675
-#, fuzzy
-msgid "Verification completed, package ok."
-msgstr "Stadfesting er ikkje implementert enno"
-
-#: components/rpmview/nautilus-rpm-view-install.c:104
-#, c-format
-msgid "%s would not work anymore\n"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:107
-#, fuzzy, c-format
-msgid "%s would break other installed packages\n"
-msgstr "Plassering av uinstallerte pakkar"
-
-#: components/rpmview/nautilus-rpm-view-install.c:112
-#, fuzzy, c-format
-msgid "%s is needed, but could not be found\n"
-msgstr "Fila er laga, men kunne ikkje lastast inn."
-
-#: components/rpmview/nautilus-rpm-view-install.c:117
-#, fuzzy, c-format
-msgid "%s was already installed\n"
-msgstr "Spelet er alt starta  ..."
-
-#: components/rpmview/nautilus-rpm-view-install.c:120
-#, c-format
-msgid "%s causes a circular dependency problem\n"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:138
-#, c-format
-msgid "Installing %s failed because of the following issue(s):\n"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:140
-#, c-format
-msgid "Uninstalling %s failed because of the following issue(s):\n"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:236
-#, fuzzy
-msgid "Uninstall failed..."
-msgstr "Avinstaller merka"
-
-#: components/rpmview/nautilus-rpm-view-install.c:237
-#, fuzzy
-msgid "Uninstall Failed"
-msgstr "Avinstaller merka"
-
-#: components/rpmview/nautilus-rpm-view-install.c:239
-#, fuzzy
-msgid "Install failed..."
-msgstr "Installerer filer"
-
-#: components/rpmview/nautilus-rpm-view-install.c:240
-#, fuzzy
-msgid "Install Failed"
-msgstr "Installerer filer"
-
-#: components/rpmview/nautilus-rpm-view-install.c:291
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1436
-#, fuzzy
-msgid "Incorrect password."
-msgstr "Ugyldig passord"
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:1
-msgid "Factory for rpm view"
-msgstr ""
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:2
-msgid "Package"
-msgstr "Pakke"
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:3
-msgid "RPM component"
-msgstr ""
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:4
-msgid "RPM view factory"
-msgstr ""
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:5
-#, fuzzy
-msgid "rpm view"
-msgstr "Førehandsvising"
-
 #: components/sample/nautilus-sample-content-view.c:136
 msgid "(none)"
 msgstr "(ingen)"
@@ -1657,7 +1915,7 @@ msgid "This is a sample merged menu item"
 msgstr ""
 
 #: components/sample/nautilus-sample-content-view-ui.xml.h:3
-msgid "This is a sample merged tool bar button"
+msgid "This is a sample merged toolbar button"
 msgstr ""
 
 #: components/sample/nautilus-sample-content-view-ui.xml.h:5
@@ -1675,139 +1933,431 @@ msgid "Nautilus Sample view factory"
 msgstr ""
 
 #: components/sample/Nautilus_View_sample.oaf.in.h:4
+#, fuzzy
+msgid "Sample Viewer"
+msgstr "Samplings&rate:"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:5
 msgid "Sample content view component"
 msgstr ""
 
-#: components/sample/Nautilus_View_sample.oaf.in.h:5
+#: components/sample/Nautilus_View_sample.oaf.in.h:6
 msgid "Sample content view component's factory"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:93
+#: components/sample/Nautilus_View_sample.oaf.in.h:7
+#, fuzzy
+msgid "View as Sample"
+msgstr "Visar"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:107
 msgid "Set the default answer to continue, also default delete to Yes"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:94
+#: components/services/install/command-line/eazel-alt-install-corba.c:108
 #, fuzzy
 msgid "Specify search cgi"
 msgstr "&Stopp søking"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:95
+#: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
-#: components/services/install/command-line/eazel-test-packsys.c:575
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-packsys.c:590
+#: components/services/install/command-line/eazel-test-softcat.c:56
 #, fuzzy
 msgid "Show debug output"
 msgstr "Skru på avlusingsinfo"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:96
+#: components/services/install/command-line/eazel-alt-install-corba.c:110
 msgid "10 sec delay after starting service"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:97
+#: components/services/install/command-line/eazel-alt-install-corba.c:111
 #, fuzzy
 msgid "Allow downgrades"
 msgstr "Tillat nedgradering"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:98
+#: components/services/install/command-line/eazel-alt-install-corba.c:112
 #, fuzzy
 msgid "Erase packages"
 msgstr "Name=kpackage"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:99
+#: components/services/install/command-line/eazel-alt-install-corba.c:113
 #, fuzzy
 msgid "enable ei2"
 msgstr "aktivert"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:100
+#: components/services/install/command-line/eazel-alt-install-corba.c:114
 #, fuzzy
 msgid "RPM args are filename"
 msgstr "loggfør filnamn"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:101
-#, fuzzy
-msgid "Force install"
-msgstr "Make install"
-
-#: components/services/install/command-line/eazel-alt-install-corba.c:102
+#: components/services/install/command-line/eazel-alt-install-corba.c:115
 #, fuzzy
 msgid "Use ftp"
 msgstr "Brukarinfo"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:103
+#: components/services/install/command-line/eazel-alt-install-corba.c:116
 #, fuzzy
 msgid "Use local"
 msgstr "Bruk fargar"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:104
+#: components/services/install/command-line/eazel-alt-install-corba.c:117
 msgid "Use http"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:105
+#: components/services/install/command-line/eazel-alt-install-corba.c:118
 msgid "RPM args are Eazel Ids"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:106
+#: components/services/install/command-line/eazel-alt-install-corba.c:119
+msgid "machine readable output"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:120
 msgid "Don't print fancy percent output"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:107
+#: components/services/install/command-line/eazel-alt-install-corba.c:121
 msgid "don't use eazel auth stuff"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:108
+#: components/services/install/command-line/eazel-alt-install-corba.c:122
 #, fuzzy
 msgid "Specify package file"
 msgstr "Pakkefil"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:109
+#: components/services/install/command-line/eazel-alt-install-corba.c:123
 #, fuzzy
 msgid "RPM args are needed files"
 msgstr "%1 argument trengst ikkje"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:110
+#: components/services/install/command-line/eazel-alt-install-corba.c:124
 #, fuzzy
 msgid "Run Query"
 msgstr "Spørjing"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:111
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
 msgid "Revert"
 msgstr "GÃ¥ tilbake"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:112
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 #, fuzzy
 msgid "Set root"
 msgstr "Sett skrift"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:113
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 #, fuzzy
 msgid "Specify server"
 msgstr "Oppgi redigerar:"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:114
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
+msgid "Dont print too much, just problems and download"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 #, fuzzy
 msgid "Perform ssl renaming"
 msgstr "Røyrkross-forma gradvis overgang"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:115
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
+msgid "argument is a suite id"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 #, fuzzy
 msgid "Test run"
 msgstr "Test"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:116
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 #, fuzzy
 msgid "Allow username"
 msgstr "Alle brukarar"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:117
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 #, fuzzy
 msgid "Allow upgrades"
 msgstr "Tillat nedgradering"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:118
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 #, fuzzy
 msgid "Verbose output"
 msgstr "Resultatvindauge"
 
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
+msgid "Install a specific package version"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
+msgid "*** You cannot specify more then one protocol type.\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
+msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
+#, c-format
+msgid "File conflict checking %s...\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
+#, c-format
+msgid "File uniqueness checking %s...\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
+#, c-format
+msgid "Feature consistency checking %s...\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
+#, fuzzy, c-format
+msgid "Downloading %s..."
+msgstr "Lastar ned grupper ..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
+msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
+#, fuzzy
+msgid "Downloading %s... (%d/%d) = %d%%"
+msgstr "Lastar ned grupper ..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
+#, c-format
+msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
+#, fuzzy, c-format
+msgid "Downloading %s... %3.1f KB/s Done\n"
+msgstr "Lastar ned grupper ..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
+msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
+msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
+#, fuzzy
+msgid "Done\n"
+msgstr "Ferdig"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
+#, c-format
+msgid "Download of %s FAILED\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
+#, fuzzy, c-format
+msgid "Package %s failed to uninstall.\n"
+msgstr "Denne artikkelen er alt sendt."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
+#, fuzzy, c-format
+msgid "Package %s failed to install.\n"
+msgstr "Denne artikkelen er alt sendt."
+
+#. I18N note: \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
+#, c-format
+msgid "\t· Problem : %s\n"
+msgstr ""
+
+#. I18N note: \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
+#, c-format
+msgid "\t· Action : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
+#, fuzzy
+msgid "Cancelling operation\n"
+msgstr "Stille operasjon"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
+#, c-format
+msgid "About to install a total of %d packages, %dKB\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
+#, c-format
+msgid "About to uninstall a total of %d packages, %dKB\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
+#, c-format
+msgid "About to revert a total of %d packages, %d KB\n"
+msgstr ""
+
+#. I18N note: %s is a package name, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
+#, c-format
+msgid "\t· %s and it's dependencies\n"
+msgstr ""
+
+#. I18N note: %s is a package name, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
+#, c-format
+msgid "\t· %s\n"
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n) " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
+msgid "Save transaction report ? (y/n) "
+msgstr ""
+
+#. I18N note: y is the letter for the word Yes. This is
+#. used in the response for a yes/no questions. Your translation
+#. must be 1 character only.
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
+#, fuzzy
+msgid "y"
+msgstr "av"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
+#, c-format
+msgid "Dependency : %s needs %s\n"
+msgstr ""
+
+#. I18N note: %s is a package name
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
+#, c-format
+msgid "Package %s failed md5 check!\n"
+msgstr ""
+
+#. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
+#, c-format
+msgid "\t· server MD5 checksum is %s\n"
+msgstr ""
+
+#. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
+#, c-format
+msgid "\t· actual MD5 checksum is %s\n"
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
+msgid "Continue? (y/n) "
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
+msgid "Should I delete the RPM files? (y/n) "
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
+#, fuzzy
+msgid "Operation ok\n"
+msgstr "Nautisk mil"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
+#, fuzzy
+msgid "Operation failed\n"
+msgstr "Installerer filer"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
+#, fuzzy
+msgid "Installing"
+msgstr "Installer"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
+#, fuzzy
+msgid "Uninstalling"
+msgstr "Avinstaller"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
+msgid "Only one operation at a time please."
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
+#, c-format
+msgid "%s: --help for usage\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
+#, c-format
+msgid "Name         : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#, fuzzy, c-format
+msgid "Version      : %s\n"
+msgstr "Versjon: "
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#, c-format
+msgid "Minor        : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
+#, c-format
+msgid "Size         : %d\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#, c-format
+msgid "Arch         : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#, fuzzy, c-format
+msgid "Distribution : %s\n"
+msgstr "Distribusjon"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#, fuzzy, c-format
+msgid "Description  : %s\n"
+msgstr "Skildring"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
+#, fuzzy, c-format
+msgid "Install root : %s\n"
+msgstr "Sett inn dato"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
+msgid "Provides     : \n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
+#, c-format
+msgid "exit code %d\n"
+msgstr ""
+
 #: components/services/install/command-line/eazel-gen-xml.c:41
 msgid "Specify package list to use (/var/eazel/service/package-list.xml)"
 msgstr ""
@@ -1816,235 +2366,374 @@ msgstr ""
 msgid "Use specified file to generate a package list, requires --packagelist"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 #, fuzzy
 msgid "Softcat server to connect to"
 msgstr "Veljer tenar-samband ..."
 
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 #, fuzzy
 msgid "Number of times to try the request"
 msgstr "Tal på repetisjonar"
 
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+msgid "Lookup package that features a feature/file"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 #, fuzzy
 msgid "use check function (for debugging)"
 msgstr "variabeltrevising (for avlusing)"
 
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 #, fuzzy
 msgid "Show detailed sub-package info"
 msgstr "Vis utvida tenesteinfo"
 
-#: components/services/install/lib/eazel-install-logic2.c:124
+#: components/services/install/command-line/eazel-test-softcat.c:66
+msgid "enable funk parser"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 #, fuzzy
 msgid "Failed to lock the downloaded file"
 msgstr "Kunne ikkje lasta biletefil."
 
-#: components/services/install/lib/eazel-install-logic2.c:141
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:358
+#: components/services/install/lib/eazel-install-logic2.c:150
+#, fuzzy, c-format
+msgid "No MD5 available for %s"
+msgstr "Inga skildring tilgjengeleg."
+
+#. I18N note: "%is is ok" in the sense that %s=package name and the
+#. package is intact
+#: components/services/install/lib/eazel-install-logic2.c:356
+#, fuzzy, c-format
+msgid "%s is ok"
+msgstr "Kva gjer dette?"
+
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:362
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:371
-#: components/services/install/lib/eazel-install-logic2.c:376
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:385
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:390
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:422
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:427
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1137
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
+#, fuzzy, c-format
+msgid "Loading package info from file %s"
+msgstr "Hentar pakkeinfo"
+
+#. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
+#: components/services/install/lib/eazel-install-logic2.c:1197
+#, fuzzy
+msgid "ok"
+msgstr "Arbeid"
+
+#: components/services/install/lib/eazel-install-logic2.c:1197
+msgid "not ok"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:1363
+#, c-format
+msgid "Checking dependencies for %s"
+msgstr ""
+
+#. I18N note: both %s' are package names.
+#. related is in the sense that the two packages apparently
+#. are connected somehow, eg. foo and foo-devel
+#: components/services/install/lib/eazel-install-logic2.c:2014
+#, fuzzy, c-format
+msgid "%s is related to %s"
+msgstr "Alt valt"
+
+#: components/services/install/lib/eazel-install-logic2.c:2090
+#, c-format
+msgid "updating %s to version %s-%s solves conflict"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2113
+#, c-format
+msgid "available update to %s (%s-%s) does not solves conflict"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, fuzzy, c-format
 msgid "could not revive %s"
 msgstr "kunne ikkje køyra [%s]"
 
-#: components/services/install/lib/eazel-install-metadata.c:171
+#: components/services/install/lib/eazel-install-logic2.c:2284
+#, c-format
+msgid "file uniqueness checking %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2305
+#, c-format
+msgid "Duplicate file : %s occurs in %s and %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
+msgid "... but it's ok, the packages are related"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2324
+#, c-format
+msgid "(there were %d other conflicts)"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2419
+#, fuzzy, c-format
+msgid "file conflict checking %s"
+msgstr "gir konflikt med %s-%s-%s\n"
+
+#: components/services/install/lib/eazel-install-logic2.c:2456
+#, c-format
+msgid "file conflict : package %s already provides file %s also provided by %s"
+msgstr ""
+
+#. the owner of this file is a package that we're upgrading, and the
+#. * new version no longer has this file, so everything's okay.
+#: components/services/install/lib/eazel-install-logic2.c:2466
+#, c-format
+msgid "...but it is okay, we're upgrading %s and it ditched that file"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2558
+#, c-format
+msgid "checking feature consistency of %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2626
+#, c-format
+msgid ""
+"feature missing : %s breaks if %s is installed (feature %s would be lost"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2705
+#, fuzzy, c-format
+msgid "downloading %d packages"
+msgstr "fann %1 pakkar"
+
+#: components/services/install/lib/eazel-install-logic2.c:2951
+#, fuzzy, c-format
+msgid "will upgrade %s"
+msgstr "Tillat nedgradering"
+
+#: components/services/install/lib/eazel-install-logic2.c:2954
+#, fuzzy, c-format
+msgid "will downgrade %s"
+msgstr "Tillat nedgradering"
+
+#: components/services/install/lib/eazel-install-logic2.c:2957
+#, fuzzy, c-format
+msgid "will install %s"
+msgstr "Installerer %1\n"
+
+#: components/services/install/lib/eazel-install-logic2.c:2960
+#, fuzzy, c-format
+msgid "will uninstall %s"
+msgstr "Avinstaller"
+
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
+#, fuzzy, c-format
+msgid "%s requires %s"
+msgstr "Passord kravd: %1"
+
+#: components/services/install/lib/eazel-install-logic2.c:3238
+#, fuzzy, c-format
+msgid "failed %s"
+msgstr "Fil opna: %s"
+
+#: components/services/install/lib/eazel-install-metadata.c:174
 #, fuzzy
 msgid "Could not set URLType from config file!"
 msgstr "Kunne ikkje laga den nye oppsettfila."
 
-#: components/services/install/lib/eazel-install-object.c:701
+#: components/services/install/lib/eazel-install-object.c:717
 msgid "Transactions are not stored, could not find home dir"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:729
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:986
+#: components/services/install/lib/eazel-install-object.c:1005
 #, fuzzy
 msgid "Getting package list from remote server ...\n"
 msgstr "Hentar farge frå skjermen ..."
 
-#: components/services/install/lib/eazel-install-object.c:1002
+#: components/services/install/lib/eazel-install-object.c:1021
 #, fuzzy
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "Kunne ikkje motta fil"
 
-#: components/services/install/lib/eazel-install-object.c:1075
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:1202
+#: components/services/install/lib/eazel-install-object.c:1225
 #, fuzzy
 msgid "Install failed"
 msgstr "Installer merka"
 
-#: components/services/install/lib/eazel-install-object.c:1248
+#: components/services/install/lib/eazel-install-object.c:1271
 #, fuzzy
 msgid "Uninstall failed"
 msgstr "Avinstaller merka"
 
-#: components/services/install/lib/eazel-install-object.c:1369
+#: components/services/install/lib/eazel-install-object.c:1406
 #, fuzzy, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "Kunne ikkje laga katalog\n"
 
-#: components/services/install/lib/eazel-install-object.c:1392
+#: components/services/install/lib/eazel-install-object.c:1429
 #, fuzzy, c-format
 msgid "Writing transaction to %s"
 msgstr "Val for grov omsetjing:"
 
-#: components/services/install/lib/eazel-install-problem.c:141
-#: components/services/install/lib/eazel-install-problem.c:293
+#: components/services/install/lib/eazel-install-problem.c:163
 #, fuzzy, c-format
-msgid "%s is a source package, which is not yet supported"
-msgstr "Orsak, dette formatet er ikkje støtta enno"
-
-#: components/services/install/lib/eazel-install-problem.c:146
-#, c-format
-msgid "%s had a file conflict with %s which %s required"
-msgstr ""
+msgid "%s was cancelled"
+msgstr "Spelet er alt starta  ..."
 
-#: components/services/install/lib/eazel-install-problem.c:151
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
 #, fuzzy, c-format
-msgid "%s had a file conflict with %s"
-msgstr "gir konflikt med %s-%s-%s\n"
+msgid "%s is a source package, which is not yet supported"
+msgstr "Orsak, dette formatet er ikkje støtta enno"
 
-#: components/services/install/lib/eazel-install-problem.c:163
-#: components/services/install/lib/eazel-install-problem.c:174
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
 #, c-format
 msgid "%s would break other packages"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:166
+#: components/services/install/lib/eazel-install-problem.c:185
 #, c-format
 msgid "%s would break"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:172
+#: components/services/install/lib/eazel-install-problem.c:191
 #, c-format
 msgid "%s would break %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:197
+#, c-format
+msgid "%s is damaged"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:201
 #, c-format
 msgid "%s requires %s, which could not be found on the server"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:186
+#: components/services/install/lib/eazel-install-problem.c:204
 #, fuzzy, c-format
-msgid "%s could not be found on the server"
+msgid "%s for %s could not be found on the server"
 msgstr "Fila kunne ikkje opnast for lesing"
 
-#: components/services/install/lib/eazel-install-problem.c:193
-#: components/services/install/lib/eazel-install-problem.c:318
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, fuzzy, c-format
 msgid "%s is already installed"
 msgstr "Dette namnet er alt i bruk."
 
-#: components/services/install/lib/eazel-install-problem.c:225
+#: components/services/install/lib/eazel-install-problem.c:259
 #, fuzzy, c-format
-msgid "%s, which is newer, is already installed"
+msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr "Dette namnet er alt i bruk."
 
-#: components/services/install/lib/eazel-install-problem.c:301
-#: components/services/install/lib/eazel-install-problem.c:304
+#: components/services/install/lib/eazel-install-problem.c:263
 #, fuzzy, c-format
-msgid "%s requires %s"
-msgstr "Passord kravd: %1"
+msgid "%s, which is older, needs upgrade and upgrade is not enabled"
+msgstr "Dette namnet er alt i bruk."
 
-#: components/services/install/lib/eazel-install-problem.c:312
+#: components/services/install/lib/eazel-install-problem.c:353
 #, fuzzy, c-format
-msgid "%s is not installed"
-msgstr "pakken %1 er ikkje installert"
+msgid "%s is not installed and could not be found on server"
+msgstr "Fila kunne ikkje opnast for lesing"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:813
+#: components/services/install/lib/eazel-install-problem.c:920
 #, fuzzy, c-format
 msgid "Check for a new version of %s"
 msgstr "Sjå etter nye grupper:"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:824
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr ""
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:839
+#: components/services/install/lib/eazel-install-problem.c:946
 #, fuzzy, c-format
 msgid "Remove %s from your system"
 msgstr "Fjern frå påminningsliste"
@@ -2052,482 +2741,433 @@ msgstr "Fjern frå påminningsliste"
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:852
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr ""
 
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:860
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:112
-#: components/services/install/lib/eazel-install-protocols.c:250
-#, fuzzy, c-format
-msgid "Downloading %s..."
-msgstr "Lastar ned grupper ..."
+#: components/services/install/lib/eazel-install-problem.c:1015
+msgid "Continue with force"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:125
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:166
+#: components/services/install/lib/eazel-install-problem.c:1021
+#, fuzzy
+msgid "Allow downgrade"
+msgstr "Tillat nedgradering"
+
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
 #, fuzzy, c-format
 msgid "Could not open target file %s"
 msgstr "Kunne ikkje opna fila %1"
 
-#: components/services/install/lib/eazel-install-protocols.c:132
-#: components/services/inventory/eazel-inventory-service.c:253
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:92
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
 #, fuzzy
 msgid "Could not create an http request !"
 msgstr "Kunne ikkje laga nytt dokument"
 
-#: components/services/install/lib/eazel-install-protocols.c:139
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:99
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
 msgid "Proxy: Invalid uri !"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:144
-#: components/services/inventory/eazel-inventory-service.c:258
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:105
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
 #, fuzzy
 msgid "Invalid uri !"
 msgstr "Ugyldig miksar"
 
-#: components/services/install/lib/eazel-install-protocols.c:151
-#: components/services/inventory/eazel-inventory-service.c:301
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:115
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
 #, fuzzy
 msgid "Could not prepare http request !"
 msgstr "Kunne ikkje laga nytt dokument"
 
-#: components/services/install/lib/eazel-install-protocols.c:156
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:120
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
 #, fuzzy
 msgid "Couldn't get async mode "
 msgstr "Kunne ikkje opna spelelistemodul %1."
 
 #. probably out of disk space
-#: components/services/install/lib/eazel-install-protocols.c:185
-#: components/services/install/lib/eazel-install-protocols.c:214
-#: components/services/install/lib/eazel-install-protocols.c:230
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, fuzzy, c-format
 msgid "DISK FULL: could not write %s"
 msgstr ""
 "Kunne ikkje skriva til\n"
 "%1"
 
-#: components/services/install/lib/eazel-install-protocols.c:191
-#: components/services/install/lib/eazel-install-protocols.c:219
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
 #, fuzzy
 msgid "Could not get request body!"
 msgstr "Kunne ikkje henta informasjon!"
 
-#: components/services/install/lib/eazel-install-protocols.c:204
+#: components/services/install/lib/eazel-install-protocols.c:208
 #, c-format
 msgid "HTTP error: %d %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:251
+#: components/services/install/lib/eazel-install-protocols.c:255
 #, fuzzy
 msgid "FTP not supported yet"
 msgstr "Landet er ikkje støtta."
 
-#: components/services/install/lib/eazel-install-protocols.c:446
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, fuzzy, c-format
 msgid "Checking local file %s..."
 msgstr "Lukkar alle filer ..."
 
-#: components/services/install/lib/eazel-install-protocols.c:567
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, fuzzy, c-format
 msgid "Failed to retrieve %s!"
 msgstr "Kunne ikkje motta fil"
 
-#: components/services/install/lib/eazel-install-protocols.c:633
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, fuzzy, c-format
 msgid "Could not get an URL for %s"
 msgstr "Kunne ikkje henta informasjon!"
 
-#: components/services/install/lib/eazel-install-protocols.c:648
+#: components/services/install/lib/eazel-install-protocols.c:672
 msgid "Downloaded package does not have the correct name"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:649
+#: components/services/install/lib/eazel-install-protocols.c:673
 #, c-format
 msgid "Package %s should have had name %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:656
-msgid "Downloaded package does not have the correct version"
-msgstr ""
-
-#: components/services/install/lib/eazel-install-protocols.c:657
-#, c-format
-msgid "Package %s had version %s and not %s"
-msgstr ""
-
-#: components/services/install/lib/eazel-install-protocols.c:676
+#: components/services/install/lib/eazel-install-protocols.c:701
 #, fuzzy
 msgid "File download failed"
 msgstr "Fritt nedlastbare filer:"
 
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:157
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 msgid "*** No package nodes! (cat has no children) ***"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:159
-#: components/services/install/lib/eazel-install-xml-package-list.c:167
-#: components/services/install/lib/eazel-install-xml-package-list.c:182
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 #, fuzzy
 msgid "*** Bailing from package parse! ***"
 msgstr "Byggjer pakketre"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:165
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
 #, fuzzy
 msgid "*** No package nodes! ***"
 msgstr "*** Ingen oppgåver ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 msgid "*** Malformed package node!"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:180
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
 #, fuzzy
 msgid "*** No depends nodes! ***"
 msgstr "*** Ingen oppgåver ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:186
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:210
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, fuzzy, c-format
 msgid "*** Unknown node type '%s'"
 msgstr "Ukjend pakketype: %1"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:227
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:232
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:233
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:239
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 #, fuzzy
 msgid "*** No Categories! ***\n"
 msgstr "*** Ingen oppgåver ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:240
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:294
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:296
-#: components/services/install/lib/eazel-install-xml-package-list.c:304
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:302
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 #, fuzzy
 msgid "*** No packages! ***\n"
 msgstr "*** Ingen oppgåver ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:338
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 #, fuzzy
 msgid "*** No category nodes! ***"
 msgstr "*** Ingen oppgåver ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:342
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:376
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, fuzzy, c-format
 msgid "*** Unknown node %s"
 msgstr "Ukjend rekkjefølgje %1"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:466
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 #, fuzzy
 msgid "*** Error generating xml package list! ***\n"
 msgstr "Feil ved start av nytt spel."
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:513
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 #, fuzzy
 msgid "*** Error reading package list! ***\n"
 msgstr "Spør pakkeliste: "
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:885
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:890
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:943
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, fuzzy, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "Kunne ikkje laga den nye fila."
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:668
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, fuzzy, c-format
 msgid "Opened packages database in %s"
 msgstr "Spør etter installerte pakkar i BSD-pakke-databasen"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:673
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, fuzzy, c-format
 msgid "Opening packages database in %s failed"
 msgstr "Spør etter installerte pakkar i BSD-pakke-databasen"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:696
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr ""
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:701
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr ""
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:953
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, fuzzy, c-format
 msgid "Cannot open %s"
 msgstr "kan ikkje opna %1"
 
-#. Setup the title
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:251
+#. this stuff flies by so fast, it's probably enough to just say "info"
+#: components/services/install-view/callbacks.c:64
 #, fuzzy
-msgid "Easy Install"
-msgstr "Installer"
+msgid "Getting package information ..."
+msgstr "Hentar pakkeinfo"
 
-#. Setup the progress header
-#. FIXME: the middle header is all fubar now, so we just say "messages", but the spec
-#. * shows "progress" over the 2nd column of the message box.  it's just too hard to get
-#. * it aligned currently.
-#.
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:354
-msgid "Messages"
-msgstr "Meldingar"
+#: components/services/install-view/callbacks.c:82
+#, fuzzy, c-format
+msgid "Checking \"%s\" for conflicts..."
+msgstr "Sjekkar for oppsett ..."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:651
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:542
+#: components/services/install-view/callbacks.c:185
 #, fuzzy, c-format
-msgid "Version: %s"
-msgstr "Versjon: "
+msgid "Downloading 1 package (%s)"
+msgstr "fann %1 pakkar"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:680
+#: components/services/install-view/callbacks.c:187
 #, fuzzy, c-format
-msgid "Checking \"%s\" for conflicts..."
-msgstr "Sjekkar for oppsett ..."
+msgid "Downloading %d packages (%s)"
+msgstr "fann %1 pakkar"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:723
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1557
+#: components/services/install-view/callbacks.c:236
 #, fuzzy, c-format
 msgid "Downloading \"%s\""
 msgstr "Lastar ned grupper ..."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:729
+#: components/services/install-view/callbacks.c:242
 #, c-format
 msgid "0K of %dK"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:736
+#: components/services/install-view/callbacks.c:249
 #, c-format
 msgid ""
 "The package \"%s\" requires \"%s\" to run.\n"
 "Downloading \"%s\" now."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:739
+#: components/services/install-view/callbacks.c:252
 #, c-format
 msgid "Attempting to download package \"%s\"."
 msgstr ""
 
-#. done!
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:745
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:992
+#: components/services/install-view/callbacks.c:262
+#: components/services/install-view/callbacks.c:333
 #, fuzzy
 msgid "Complete"
 msgstr "Ferdig"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:749
+#: components/services/install-view/callbacks.c:266
 #, c-format
 msgid ""
 "The package \"%s\" requires \"%s\" to run.\n"
 "\"%s\" has been successfully downloaded."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:752
+#: components/services/install-view/callbacks.c:269
 #, c-format
 msgid "The package \"%s\" has been successfully downloaded."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:770
+#: components/services/install-view/callbacks.c:287
 #, fuzzy, c-format
 msgid "%dK of %dK"
 msgstr "%1 av %2"
 
-#. this stuff flies by so fast, it's probably enough to just say "info"
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:805
-#, fuzzy
-msgid "Getting package information ..."
-msgstr "Hentar pakkeinfo"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:892
-msgid "Preparing to download packages..."
-msgstr ""
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:895
-msgid ""
-"These packages are about to be downloaded and installed:\n"
-"\n"
-msgstr ""
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:914
-#, c-format
-msgid "for a total of %ld MB."
-msgstr ""
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:917
-#, c-format
-msgid "for a total of %ld KB."
-msgstr ""
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:923
-msgid ""
-"\n"
-"Is this okay?"
-msgstr ""
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:951
-#, fuzzy, c-format
-msgid "Downloading 1 package (%s)"
-msgstr "fann %1 pakkar"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:953
-#, fuzzy, c-format
-msgid "Downloading %d packages (%s)"
-msgstr "fann %1 pakkar"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:975
+#: components/services/install-view/callbacks.c:316
 #, c-format
 msgid "Download of package \"%s\" failed!"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:997
+#: components/services/install-view/callbacks.c:338
 #, c-format
 msgid ""
 "The package \"%s\" requires \"%s\" to run.\n"
 "\"%s\" has been successfully downloaded and installed."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1000
+#: components/services/install-view/callbacks.c:341
 #, c-format
 msgid "\"%s\" has been successfully downloaded and installed."
 msgstr ""
 
 #. starting a new package -- create new progress indicator
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1028
+#: components/services/install-view/callbacks.c:369
 #, fuzzy, c-format
 msgid "Installing package %d of %d"
 msgstr "Installer pakke"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1055
+#: components/services/install-view/callbacks.c:396
 #, c-format
 msgid ""
 "The package \"%s\" requires \"%s\" to run.\n"
 "\"%s\" is now being installed."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1058
+#: components/services/install-view/callbacks.c:399
 #, fuzzy, c-format
 msgid "Now installing package \"%s\"."
 msgstr "installerer binærpakkar"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1066
+#: components/services/install-view/callbacks.c:407
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, fuzzy, c-format
 msgid "Installing \"%s\""
 msgstr "Installerer %1\n"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1074
+#: components/services/install-view/callbacks.c:415
+#: src/nautilus-zoom-control.c:592
 msgid "%d%%"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1129
-#, c-format
-msgid " · %s is in the Gnome menu under %s"
-msgstr ""
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1147
-#, c-format
-msgid " · %s is in the Gnome menu.\n"
-msgstr ""
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1174
-#, c-format
-msgid " · %s is in the KDE menu.\n"
-msgstr ""
+#: components/services/install-view/callbacks.c:443
+#, fuzzy, c-format
+msgid "Installation failed on %s"
+msgstr "Installerer filer"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1227
+#: components/services/install-view/callbacks.c:471
 msgid "I ran into problems while installing."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1228
+#: components/services/install-view/callbacks.c:472
 #, fuzzy
 msgid "I'd like to try the following :"
 msgstr "Sletta dei følgjande filene?"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1237
+#: components/services/install-view/callbacks.c:481
 #, fuzzy
 msgid "Is this ok ?"
 msgstr "Kva gjer dette?"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1282
+#: components/services/install-view/callbacks.c:556
 #, fuzzy
-msgid "Installation aborted."
-msgstr "Installasjon"
+msgid "Installation cancelled."
+msgstr "Installerer filer"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1284
+#: components/services/install-view/callbacks.c:558
 #, fuzzy
 msgid "This package has already been installed."
 msgstr "Denne artikkelen er alt sendt."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1286
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
 #, fuzzy
 msgid "Installation complete."
 msgstr "Installasjon"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1288
+#: components/services/install-view/callbacks.c:564
 #, fuzzy
 msgid "Installation failed."
 msgstr "Installerer filer"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1319
+#. some succeeded; some failed
+#: components/services/install-view/callbacks.c:568
+msgid "Some packages installed successfully:"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:577
+#, fuzzy
+msgid ""
+"\n"
+"Some packages failed:"
+msgstr "Pakkefil"
+
+#: components/services/install-view/callbacks.c:626
 #, fuzzy
 msgid "Erase the RPM files?"
 msgstr "Lag po-filene"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1321
+#: components/services/install-view/callbacks.c:628
 #, fuzzy
 msgid "Erase the leftover RPM files?"
 msgstr "Lag po-filene"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1355
+#: components/services/install-view/callbacks.c:658
+msgid "Ok"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:673
 msgid ""
 "A core package of Nautilus has been\n"
 "updated.  You should restart Nautilus.\n"
@@ -2535,136 +3175,217 @@ msgid ""
 "Do you wish to do that now?"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1409
+#. Setup the title
+#: components/services/install-view/forms.c:201
+#, fuzzy
+msgid "Easy Install"
+msgstr "Installer"
+
+#. Setup the progress header
+#. FIXME: the middle header is all fubar now, so we just say "messages", but the spec
+#. * shows "progress" over the 2nd column of the message box.  it's just too hard to get
+#. * it aligned currently.
+#.
+#: components/services/install-view/forms.c:327
+msgid "Messages"
+msgstr "Meldingar"
+
+#: components/services/install-view/forms.c:358
+#: components/services/summary/nautilus-summary-view.c:647
 #, fuzzy, c-format
-msgid "Installation failed on %s"
-msgstr "Installerer filer"
+msgid "Version: %s"
+msgstr "Versjon: "
+
+#: components/services/install-view/forms.c:407
+#, fuzzy
+msgid "These packages are ready to be downloaded and installed:"
+msgstr "Denne artikkelen er alt sendt."
+
+#: components/services/install-view/forms.c:408
+msgid "If you wish to download and install these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:411
+#, fuzzy
+msgid "These packages are ready to be uninstalled:"
+msgstr "Denne artikkelen er alt sendt."
+
+#: components/services/install-view/forms.c:412
+msgid "If you wish to uninstall these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:415
+#, fuzzy
+msgid "These packages are ready to be reverted:"
+msgstr "Denne artikkelen er alt sendt."
+
+#: components/services/install-view/forms.c:416
+msgid "If you wish to revert these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:464
+#, c-format
+msgid "for a total of %ld MB."
+msgstr ""
+
+#: components/services/install-view/forms.c:466
+#, c-format
+msgid "for a total of %ld KB."
+msgstr ""
+
+#. buttons
+#: components/services/install-view/forms.c:478
+#, fuzzy
+msgid "Continue"
+msgstr "Tilkopla"
+
+#: components/services/install-view/forms.c:482
+#: libnautilus-extensions/nautilus-drag.c:493
+#: src/file-manager/fm-directory-view.c:4326
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: components/services/install-view/nautilus-service-install-view.c:421
+#, c-format
+msgid "%s is in GNOME (footprint) > %s"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:439
+#, c-format
+msgid "%s is in the GNOME (footprint) menu.\n"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:454
+#, c-format
+msgid "%s is in the KDE menu.\n"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:655
+#, fuzzy
+msgid "Installation Complete"
+msgstr "Installasjon"
+
+#: components/services/install-view/nautilus-service-install-view.c:710
+#, c-format
+msgid ""
+"%sTo start %s, click the Launch button below, or to create a shortcut, drag "
+"the icon on the right to the GNOME panel or your desktop."
+msgstr ""
+
+#. couldn't find an icon
+#: components/services/install-view/nautilus-service-install-view.c:718
+#, c-format
+msgid "%sTo start %s, click the Launch button below."
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1555
+#: components/services/install-view/nautilus-service-install-view.c:773
 #, fuzzy
-msgid "Downloading remote package"
+msgid "Incorrect password."
+msgstr "Ugyldig passord"
+
+#: components/services/install-view/nautilus-service-install-view.c:778
+msgid "Authenticate as root"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:895
+#, fuzzy
+msgid "Installing packages"
+msgstr "Installer pakke"
+
+#: components/services/install-view/nautilus-service-install-view.c:897
+#, fuzzy
+msgid "Installing remote package"
 msgstr " Lastar ned artikkel ..."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1559
+#: components/services/install-view/nautilus-service-install-view.c:901
 #, fuzzy
-msgid "Downloading some package"
+msgid "Installing some package"
 msgstr " Lastar ned artikkel ..."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1576
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1623
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1681
+#: components/services/install-view/nautilus-service-install-view.c:1025
 #, fuzzy
 msgid "Checking for authorization..."
 msgstr "Ventar på autorisering ..."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1752
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1772
+#: components/services/install-view/nautilus-service-install-view.c:1117
 #, fuzzy
 msgid "Package download aborted."
 msgstr "Last ned markerte ..."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1773
+#: components/services/install-view/nautilus-service-install-view.c:1118
 #, fuzzy
 msgid "Aborted"
 msgstr "Avbrote."
 
-#: components/services/install/nautilus-view/Nautilus_View_install.oaf.in.h:2
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:1
+#: components/services/install/server/Trilobite_Service_install.oaf.in.h:2
+#: components/services/summary/nautilus-summary-view.c:123
+msgid "Install"
+msgstr "Installer"
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:2
+#, fuzzy
+msgid "Install Viewer"
+msgstr "Installerer filer"
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:3
 msgid "Nautilus Service Install View"
 msgstr ""
 
-#: components/services/install/nautilus-view/Nautilus_View_install.oaf.in.h:3
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:4
 msgid "Nautilus Service Install View Factory"
 msgstr ""
 
-#: components/services/install/nautilus-view/Nautilus_View_install.oaf.in.h:4
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:5
 msgid "Service Install View Component"
 msgstr ""
 
-#: components/services/install/nautilus-view/Nautilus_View_install.oaf.in.h:5
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:6
 msgid "Service Install View Component's Factory"
 msgstr ""
 
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:7
+#, fuzzy
+msgid "View as Install"
+msgstr "Installer"
+
 #: components/services/install/server/Trilobite_Service_install.oaf.in.h:1
 msgid "Factory for the install service"
 msgstr ""
 
-#: components/services/inventory/eazel-inventory-client.c:66
+#: components/services/inventory/eazel-inventory-client.c:70
 #, fuzzy
 msgid "Enable inventory upload."
 msgstr "Skrur på oppføring ..."
 
-#: components/services/inventory/eazel-inventory-client.c:68
+#: components/services/inventory/eazel-inventory-client.c:72
 #, fuzzy
 msgid "Disable inventory upload."
 msgstr "Skrur av oppføring ..."
 
-#: components/services/inventory/eazel-inventory-client.c:69
-msgid "Enable warning before each upload."
-msgstr ""
-
-#: components/services/inventory/eazel-inventory-client.c:70
-msgid "Disable warning before each upload."
-msgstr ""
-
-#: components/services/inventory/eazel-inventory-client.c:71
-#, fuzzy
-msgid "Set machine name."
-msgstr "Vel namn"
-
-#: components/services/inventory/eazel-inventory-client.c:72
+#: components/services/inventory/eazel-inventory-client.c:73
 #, fuzzy
 msgid "Display information about current inventory settings."
 msgstr "Denne plugin-en viser litt informasjon om prosjektet."
 
-#: components/services/inventory/eazel-inventory-client.c:73
+#: components/services/inventory/eazel-inventory-client.c:74
 msgid "Upload inventory now, if not up to date."
 msgstr ""
 
-#: components/services/inventory/eazel-inventory-service.c:233
-msgid "User isn't logged into ammonite yet.\n"
-msgstr ""
-
-#: components/services/inventory/eazel-inventory-service.c:236
-msgid "The supplied URL was bad.\n"
-msgstr ""
-
-#: components/services/inventory/eazel-inventory-service.c:239
-#, fuzzy
-msgid "A CORBA error occured.\n"
-msgstr ""
-"Ein feil oppstod:\n"
-"%1"
-
-#: components/services/inventory/eazel-inventory-service.c:242
-msgid "Ammonite returned an error translating the url.\n"
-msgstr ""
-
-#: components/services/inventory/eazel-inventory-service.c:263
-#, fuzzy
-msgid "Can't post !"
-msgstr "Finn ikkje skrifttype"
-
-#: components/services/inventory/eazel-inventory-service.c:276
-#, fuzzy
-msgid "can't open tempory file hell\n"
-msgstr "Kan ikkje opna fila %1"
-
-#: components/services/inventory/eazel-inventory-service.c:296
-#, fuzzy
-msgid "Can't set body !"
-msgstr "skriftstorleik meldingskropp"
-
 #: components/services/inventory/Trilobite_Service_inventory.oaf.in.h:1
 msgid "Factory for the inventory service"
 msgstr ""
@@ -2692,9 +3413,19 @@ msgid "System Inventory"
 msgstr "Name=Systemovervakar"
 
 #: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:5
+#, fuzzy
+msgid "System Inventory Viewer"
+msgstr "Name=Systemovervakar"
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:6
 msgid "System inventory view component"
 msgstr ""
 
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:7
+#, fuzzy
+msgid "View as System Inventory"
+msgstr "Name=Systemovervakar"
+
 #. Setup the title
 #: components/services/login/nautilus-view/nautilus-change-password-view.c:153
 #, fuzzy
@@ -2793,81 +3524,48 @@ msgstr "Endra passord"
 
 #: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:2
 #, fuzzy
-msgid "Eazel Change Password View"
+msgid "Change Password Viewer"
 msgstr "Name=Endra passord"
 
 #: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:3
 #, fuzzy
-msgid "Eazel Change Password view component"
+msgid "Eazel Change Password View"
 msgstr "Name=Endra passord"
 
 #: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:4
+#, fuzzy
+msgid "Eazel Change Password view component"
+msgstr "Name=Endra passord"
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:5
 msgid "Nautilus Service Login View Factory"
 msgstr ""
 
-#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:5
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:6
 msgid "Service Login View Component's Factory"
 msgstr ""
 
-#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:260
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:7
+#, fuzzy
+msgid "View as Change Password"
+msgstr "Endra passord"
+
+#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:295
 #, fuzzy
 msgid "Unknown Date"
 msgstr "Ukjend tittel"
 
-#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:265
+#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:300
 msgid "%A, %B %d"
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:136
-msgid "Could not find a valid boolean value for grey_out!"
-msgstr ""
-
-#: components/services/summary/lib/eazel-summary-shared.c:187
-#, fuzzy
-msgid "There is no service data !\n"
-msgstr "Teen er klar!"
-
-#: components/services/summary/lib/eazel-summary-shared.c:212
-#: components/services/summary/lib/eazel-summary-shared.c:237
-#, fuzzy
-msgid "There is no eazel news data !\n"
-msgstr "Det er ikkje band i stasjonen."
-
-#: components/services/summary/lib/eazel-summary-shared.c:267
-#, fuzzy
-msgid "Could not fetch summary configuration !"
-msgstr "Kunne ikkje laga den nye oppsettfila."
-
-#: components/services/summary/lib/eazel-summary-shared.c:290
-msgid "The summary configuration contains no data!\n"
-msgstr ""
-
-#: components/services/summary/lib/eazel-summary-shared.c:295
-msgid "Cannot find the SUMMARY_DATA xmlnode!\n"
-msgstr ""
-
-#: components/services/summary/lib/eazel-summary-shared.c:297
-msgid "Bailing from the SUMMARY_DATA parse!\n"
-msgstr ""
-
-#: components/services/summary/lib/eazel-summary-shared.c:304
-#, fuzzy
-msgid "Could not find any summary configuration data!\n"
-msgstr "Kunne ikkje gjera operasjonen ferdig.\n"
-
-#: components/services/summary/lib/eazel-summary-shared.c:306
-#, fuzzy
-msgid "Bailing from summary configuration parse!\n"
-msgstr "Kan ikkje lasta oppsettfila på nytt."
-
-#: components/services/summary/nautilus-view/nautilus-summary-callbacks.c:97
+#: components/services/summary/nautilus-summary-callbacks.c:97
 msgid ""
-"I'm sorry, network problems are preventing you from connecting to Eazel "
-"Services."
+"Sorry, network problems are preventing you from connecting to Eazel Services."
 msgstr ""
 
 #. FIXME we really should use the services alert icon here, eh?
-#: components/services/summary/nautilus-view/nautilus-summary-callbacks.c:102
+#: components/services/summary/nautilus-summary-callbacks.c:102
 msgid ""
 "Your Eazel Services account has not yet been activated.  You can't log into "
 "Eazel Services until you activate your account.\n"
@@ -2876,7 +3574,7 @@ msgid ""
 msgstr ""
 
 #. FIXME we really should use the services alert icon here, eh?
-#: components/services/summary/nautilus-view/nautilus-summary-callbacks.c:109
+#: components/services/summary/nautilus-summary-callbacks.c:109
 msgid ""
 "Your Eazel Service User Account has been temporarily disabled.\n"
 "\n"
@@ -2884,157 +3582,237 @@ msgid ""
 "continues."
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-callbacks.c:131
+#: components/services/summary/nautilus-summary-callbacks.c:131
 msgid "We're sorry, but your name and password are still not recognized."
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:68
+#: components/services/summary/nautilus-summary-dialogs.c:69
 msgid "Eazel Service Login Error"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:78
+#: components/services/summary/nautilus-summary-dialogs.c:80
 #, fuzzy
 msgid "Service Error"
 msgstr "Søkefeil"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:102
+#: components/services/summary/nautilus-summary-dialogs.c:104
 #, fuzzy
 msgid "Register Now"
 msgstr "Register"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:113
+#: components/services/summary/nautilus-summary-dialogs.c:115
 #, fuzzy
 msgid "Services Login"
 msgstr "Tenesta er"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:129
+#: components/services/summary/nautilus-summary-dialogs.c:131
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "Brukarnamn:"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:136
+#: components/services/summary/nautilus-summary-dialogs.c:138
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "Passord:"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:144
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:153
+#: components/services/summary/nautilus-summary-dialogs.c:146
+#: components/services/summary/nautilus-summary-dialogs.c:155
 #, fuzzy
-msgid "Please log in to Eazel services"
+msgid "Please log in to Eazel Services"
 msgstr "namn på ny teneste"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:148
+#: components/services/summary/nautilus-summary-dialogs.c:150
 #, fuzzy
 msgid "Your user name or password were not correct.  Please try again."
 msgstr "Du har oppgitt to ulike passord. Prøv igjen."
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:102
+#: components/services/summary/nautilus-summary-view.c:117
+#: libnautilus-extensions/nautilus-program-chooser.c:1361
 #, fuzzy
-msgid "Register"
-msgstr "Register"
+msgid "Go There"
+msgstr "kor"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:103
-msgid "Login"
-msgstr "Brukarnamn"
+#: components/services/summary/nautilus-summary-view.c:120
+#, fuzzy
+msgid "More Info"
+msgstr "Info"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:104
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:112
+#: components/services/summary/nautilus-summary-view.c:131
+#, fuzzy
+msgid "Account Preferences"
+msgstr "ingen referansar"
+
+#: components/services/summary/nautilus-summary-view.c:132
+msgid "Logout"
+msgstr "Logg ut"
+
+#: components/services/summary/nautilus-summary-view.c:133
+#: components/services/summary/nautilus-summary-view.c:141
 msgid "Terms of Use"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:105
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:113
+#: components/services/summary/nautilus-summary-view.c:134
+#: components/services/summary/nautilus-summary-view.c:142
 msgid "Privacy Statement"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:110
+#: components/services/summary/nautilus-summary-view.c:139
 #, fuzzy
-msgid "Account Preferences"
-msgstr "ingen referansar"
+msgid "Register"
+msgstr "Register"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:111
-msgid "Logout"
-msgstr "Logg ut"
+#: components/services/summary/nautilus-summary-view.c:140
+msgid "Login"
+msgstr "Brukarnamn"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:124
+#: components/services/summary/nautilus-summary-view.c:170
 #, fuzzy, c-format
-msgid "Welcome, %s!"
-msgstr "Velkomen til KDE!"
+msgid "Eazel Services - Welcome, %s!"
+msgstr "Meny for tenester"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:129
+#: components/services/summary/nautilus-summary-view.c:175
 #, fuzzy
-msgid "You are not logged in"
+msgid "Eazel Services - You are not logged in"
 msgstr "Du er tilkopla."
 
-#. add the tab
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:666
-#: src/nautilus-service-ui.xml.h:5
+#: components/services/summary/nautilus-summary-view.c:182
+#, fuzzy
+msgid "Connecting to Eazel Services..."
+msgstr "Stopp teneste"
+
+#: components/services/summary/nautilus-summary-view.c:741
+#: data/linksets/home.xml.h:3 src/nautilus-service-ui.xml.h:4
 msgid "Services"
 msgstr "Tenester"
 
-#. add the tab
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:702
+#: components/services/summary/nautilus-summary-view.c:752
 #, fuzzy
 msgid "Featured Downloads"
 msgstr "Gjenopprett ned"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:862
+#: components/services/summary/nautilus-summary-view.c:884
+msgid ""
+"Unable to get services data from Eazel's server. The server might be "
+"unavailable right now, or your computer might be configured incorrectly. "
+"Please contact support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:894
+msgid ""
+"Found a problem with services data on Eazel servers. Please contact "
+"support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:917
+msgid ""
+"Information is missing from the redirect data on Eazel servers. Please "
+"contact support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
-"now, or your computer might be configured incorrectly.You could try again "
+"now, or your computer might be configured incorrectly. You could try again "
 "later."
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:880
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
-"Found problem with data on Eazel servers. Please contact support@eazel.com."
+"Found a problem with redirect data on Eazel servers. Please contact "
+"support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:986
+msgid "Failed to upload system inventory."
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:1
+#: components/services/summary/nautilus-summary-view.c:1049
+#: src/nautilus-first-time-druid.c:258
+#, fuzzy
+msgid "Eazel Services"
+msgstr "Tenester"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:1
 #, fuzzy
 msgid "Configure your service preferences"
 msgstr "Feil ved lagring av innstillingar."
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:2
+#: components/services/summary/nautilus-summary-view-ui.xml.h:2
 msgid "Go to the Eazel Services Registration Form"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:3
+#: components/services/summary/nautilus-summary-view-ui.xml.h:3
 msgid "Log out from Eazel Services"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:4
+#: components/services/summary/nautilus-summary-view-ui.xml.h:4
 #, fuzzy
 msgid "Service _Preferences"
 msgstr "Føretrukken tenesterekkjefølgje"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:5
+#: components/services/summary/nautilus-summary-view-ui.xml.h:5
 #, fuzzy
 msgid "Show the log-in dialog box"
 msgstr "Viser fileigenskapane"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:6
+#: components/services/summary/nautilus-summary-view-ui.xml.h:6
 msgid "_Log in to Eazel Services"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:7
+#: components/services/summary/nautilus-summary-view-ui.xml.h:7
 msgid "_Log out from Eazel Services"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:8
+#: components/services/summary/nautilus-summary-view-ui.xml.h:8
 #, fuzzy
 msgid "_Register for Eazel Services"
 msgstr "Start teneste om att"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:130
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus Service Summary View Factory"
+msgstr "Siste oppstartskatalog"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Summary View"
+msgstr "Name=Biletevisar"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:3
+#, fuzzy
+msgid "Service Summary View Component's Factory"
+msgstr "Siste oppstartskatalog"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:4
+#, fuzzy
+msgid "Service Summary view component"
+msgstr "Siste oppstartskatalog"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:5
+msgid "Summary"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:6
+#, fuzzy
+msgid "Summary Viewer"
+msgstr "Tal:"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:7
+#, fuzzy
+msgid "View as Summary"
+msgstr "Visar"
+
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
 #, c-format
 msgid "HTTP error %d \"%s\" on uri %s"
 msgstr ""
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:200
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 #, fuzzy
 msgid "Could not initialize Bonobo"
 msgstr "Fann ikkje bilete %1"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:215
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr ""
@@ -3053,10 +3831,20 @@ msgstr "Teneste"
 
 #: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:4
 #, fuzzy
+msgid "Service Viewer"
+msgstr "Name=Biletevisar"
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:5
+#, fuzzy
 msgid "Services startup view factory"
 msgstr "Siste oppstartskatalog"
 
-#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:5
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:6
+#, fuzzy
+msgid "View as Service"
+msgstr "Visar"
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:7
 #, fuzzy
 msgid "eazel sample service view"
 msgstr "verkeleg filtrevising"
@@ -3065,85 +3853,73 @@ msgstr "verkeleg filtrevising"
 msgid "Factory for the sample service"
 msgstr ""
 
-#: components/services/vault/command-line/main.c:38
-#, fuzzy
-msgid "Enable debugging"
-msgstr "Skru på avlusingsinfo"
-
-#: components/services/vault/command-line/main.c:39
-#, fuzzy
-msgid "Vault location"
-msgstr "Dataplassering"
-
-#: components/services/vault/command-line/main.c:47
-#, fuzzy
-msgid "Valid operations:"
-msgstr "Stille operasjon"
-
-#: components/services/vault/command-line/main.c:87
-msgid "Error: No operation supplied\n"
-msgstr ""
-
-#: components/services/vault/command-line/main.c:95
-#, fuzzy, c-format
-msgid "Error: Invalid operation supplied (%s)\n"
-msgstr "Ugyldig val oppgitt."
-
-#: components/services/vault/command-line/main.c:120
-#, c-format
-msgid ""
-"Error: Invalid syntax\n"
-"Syntax: %s\n"
-msgstr ""
-
-#: components/text/nautilus-text-view.c:315
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr ""
 
-#: components/text/nautilus-text-view.c:316
+#: components/text/nautilus-text-view.c:337
 #, fuzzy
 msgid "File too large"
 msgstr "Området er for stort."
 
 #: components/text/nautilus-text-view-ui.xml.h:1
 #, fuzzy
+msgid "F_onts"
+msgstr "Skrifttypar"
+
+#: components/text/nautilus-text-view-ui.xml.h:2
+#, fuzzy
 msgid "Lucida"
 msgstr "St. Lucia"
 
-#: components/text/nautilus-text-view-ui.xml.h:2
+#: components/text/nautilus-text-view-ui.xml.h:3
 msgid "Use the Courier Font"
 msgstr ""
 
-#: components/text/nautilus-text-view-ui.xml.h:3
+#: components/text/nautilus-text-view-ui.xml.h:4
+#, fuzzy
+msgid "Use the Fixed Font"
+msgstr "Brukarar av denne kontoen"
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+#, fuzzy
+msgid "Use the GTK System Font"
+msgstr "Brukarar av denne kontoen"
+
+#: components/text/nautilus-text-view-ui.xml.h:6
 msgid "Use the Helvetica Font"
 msgstr ""
 
-#: components/text/nautilus-text-view-ui.xml.h:4
+#: components/text/nautilus-text-view-ui.xml.h:7
 msgid "Use the Lucida Font"
 msgstr ""
 
-#: components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:8
 #, fuzzy
 msgid "Use the Times Font"
 msgstr "Brukarar av denne kontoen"
 
-#: components/text/nautilus-text-view-ui.xml.h:6
+#: components/text/nautilus-text-view-ui.xml.h:9
 #, fuzzy
 msgid "_Courier"
 msgstr "Fargelegg"
 
-#: components/text/nautilus-text-view-ui.xml.h:7
+#: components/text/nautilus-text-view-ui.xml.h:10
 #, fuzzy
-msgid "_Fonts"
-msgstr "Skrifttypar"
+msgid "_Fixed"
+msgstr "Fil"
 
-#: components/text/nautilus-text-view-ui.xml.h:8
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
 #, fuzzy
 msgid "_Helvetica"
 msgstr "Opna vertikalt"
 
-#: components/text/nautilus-text-view-ui.xml.h:9
+#: components/text/nautilus-text-view-ui.xml.h:13
 #, fuzzy
 msgid "_Times"
 msgstr "Tid"
@@ -3159,14 +3935,41 @@ msgstr "Tekst"
 
 #: components/text/Nautilus_View_text.oaf.in.h:3
 #, fuzzy
-msgid "Text view"
+msgid "Text Viewer"
 msgstr "Tekstlinjer:"
 
 #: components/text/Nautilus_View_text.oaf.in.h:4
 #, fuzzy
+msgid "Text view"
+msgstr "Tekstlinjer:"
+
+#: components/text/Nautilus_View_text.oaf.in.h:5
+#, fuzzy
 msgid "Text view factory"
 msgstr "Tekstretning"
 
+#: components/text/Nautilus_View_text.oaf.in.h:6
+#, fuzzy
+msgid "View as Text"
+msgstr "Visingar"
+
+#: components/text/services/google.xml.h:1
+msgid "Search Google for Selected Text"
+msgstr ""
+
+#: components/text/services/google.xml.h:2
+msgid "Use Google to search the web for the selected text"
+msgstr ""
+
+#: components/text/services/webster.xml.h:1
+msgid "Look Up Selected Text in Dictionary"
+msgstr ""
+
+#: components/text/services/webster.xml.h:2
+#, fuzzy
+msgid "Look up the selected text in the Merriam-Webster dictionary"
+msgstr "Kopierer utvalet til utklippstavla"
+
 #: components/throbber/Nautilus_Control_throbber.oaf.in.h:1
 msgid "animation to indicate on-going activity"
 msgstr ""
@@ -3195,6 +3998,7 @@ msgid "Nautilus Tree view"
 msgstr "klassetrevising"
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr ""
 
@@ -3339,7 +4143,7 @@ msgstr ""
 msgid "Eclipse"
 msgstr "Ellipse"
 
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1585
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 #, fuzzy
 msgid "Emblems"
 msgstr "Døme"
@@ -3455,7 +4259,7 @@ msgid "Numbers"
 msgstr "Tal"
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1061
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "OK"
 
@@ -3519,78 +4323,68 @@ msgstr "Vel namn"
 
 #: data/browser.xml.h:68
 #, fuzzy
-msgid "Secret"
-msgstr "Poengsum"
-
-#: data/browser.xml.h:69
-#, fuzzy
 msgid "Shale"
 msgstr "Rull opp"
 
-#: data/browser.xml.h:70
-#, fuzzy
-msgid "Shared"
-msgstr "Øydelegg"
-
-#: data/browser.xml.h:71
+#: data/browser.xml.h:69
 #, fuzzy
 msgid "Silver"
 msgstr "Tenar"
 
-#: data/browser.xml.h:72
+#: data/browser.xml.h:70
 #, fuzzy
 msgid "Sky"
 msgstr "Sett fast"
 
-#: data/browser.xml.h:73
+#: data/browser.xml.h:71
 #, fuzzy
 msgid "Sky Ridge"
 msgstr "Dokk element"
 
-#: data/browser.xml.h:74
+#: data/browser.xml.h:72
 #, fuzzy
 msgid "Snow Ridge"
 msgstr "Vis dato"
 
-#: data/browser.xml.h:75
+#: data/browser.xml.h:73
 msgid "Special"
 msgstr "Spesiell"
 
-#: data/browser.xml.h:76
+#: data/browser.xml.h:74
 #, fuzzy
 msgid "Stucco"
 msgstr "Struktur"
 
-#: data/browser.xml.h:77
+#: data/browser.xml.h:75
 #, fuzzy
 msgid "Tangerine"
 msgstr "Avslutt"
 
-#: data/browser.xml.h:78
+#: data/browser.xml.h:76
 msgid "Terracotta"
 msgstr ""
 
-#: data/browser.xml.h:79
+#: data/browser.xml.h:77
 #, fuzzy
 msgid "Urgent"
 msgstr "&Viktig"
 
-#: data/browser.xml.h:80
+#: data/browser.xml.h:78
 #, fuzzy
 msgid "Violet"
 msgstr "Lydstyrke"
 
-#: data/browser.xml.h:81
+#: data/browser.xml.h:79
 #, fuzzy
 msgid "Wavy White"
 msgstr "Maskin kvit"
 
-#: data/browser.xml.h:82
+#: data/browser.xml.h:80
 #, fuzzy
 msgid "White"
 msgstr "Plystring"
 
-#: data/browser.xml.h:83
+#: data/browser.xml.h:81
 #, fuzzy
 msgid "White Ribs"
 msgstr "Skriv URL"
@@ -3610,16 +4404,25 @@ msgid "The Gimp"
 msgstr ""
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:567
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4741
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
-#: src/file-manager/fm-desktop-icon-view.c:65
+#: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
 msgstr "Sletta"
 
+#: data/linksets/home.xml.h:1
+#, fuzzy
+msgid "Computer"
+msgstr "Ferdig"
+
+#: data/linksets/home.xml.h:2
+msgid "Home Directory"
+msgstr ""
+
 #: data/linksets/portals.xml.h:1
 #, fuzzy
 msgid "Excite"
@@ -3646,194 +4449,212 @@ msgid "Google"
 msgstr "GÃ¥ til side"
 
 #: data/linksets/search_engines.xml.h:3
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 #, fuzzy
 msgid "Search Engines"
 msgstr "Søk i"
 
 #: data/static_bookmarks.xml.h:1
 #, fuzzy
+msgid "Allaire"
+msgstr "Stat"
+
+#: data/static_bookmarks.xml.h:2
+msgid "Binary Freedom"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:3
+#, fuzzy
 msgid "Borland"
 msgstr "Polen"
 
-#: data/static_bookmarks.xml.h:2
+#: data/static_bookmarks.xml.h:4
 #, fuzzy
 msgid "CNET Computers.com"
 msgstr "Datamaskin"
 
-#: data/static_bookmarks.xml.h:3
+#: data/static_bookmarks.xml.h:5
 #, fuzzy
 msgid "CNET Linux Center"
 msgstr "Midtstilt"
 
-#: data/static_bookmarks.xml.h:4
-#, fuzzy
-msgid "Caldera"
-msgstr "Nullstill"
-
-#: data/static_bookmarks.xml.h:5
+#: data/static_bookmarks.xml.h:6
 #, fuzzy
 msgid "CollabNet"
 msgstr "Komprimer"
 
-#: data/static_bookmarks.xml.h:6
+#: data/static_bookmarks.xml.h:7
 #, fuzzy
 msgid "Compaq"
 msgstr "Firma"
 
-#: data/static_bookmarks.xml.h:7
+#: data/static_bookmarks.xml.h:8
+msgid "Conectiva"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:9
+#, fuzzy
+msgid "Covalent"
+msgstr "Kommentar"
+
+#: data/static_bookmarks.xml.h:10
 #, fuzzy
 msgid "Debian.org"
 msgstr "KDebugDialog"
 
-#: data/static_bookmarks.xml.h:8
+#: data/static_bookmarks.xml.h:11
 #, fuzzy
 msgid "Dell"
 msgstr "Bjelle"
 
-#: data/static_bookmarks.xml.h:9
+#: data/static_bookmarks.xml.h:12
 #, fuzzy
 msgid "Eazel"
 msgstr "E-post"
 
-#: data/static_bookmarks.xml.h:10
+#: data/static_bookmarks.xml.h:13
 #, fuzzy
 msgid "Freshmeat.net"
 msgstr "Namn på rammesett"
 
-#: data/static_bookmarks.xml.h:11
-msgid "GNOME.org"
-msgstr ""
-
-#: data/static_bookmarks.xml.h:12
-msgid "GNU.org"
-msgstr ""
-
 #: data/static_bookmarks.xml.h:14
-msgid "Hewlett-Packard"
+msgid "GNOME.org"
 msgstr ""
 
 #: data/static_bookmarks.xml.h:15
-msgid "IBM"
+msgid "GNU.org"
 msgstr ""
 
-#: data/static_bookmarks.xml.h:16
+#: data/static_bookmarks.xml.h:17
 #, fuzzy
-msgid "Linux Companies"
-msgstr "Linux-fargar"
+msgid "International"
+msgstr "Intern feil"
 
-#: data/static_bookmarks.xml.h:17
+#: data/static_bookmarks.xml.h:18
 #, fuzzy
 msgid "Linux Documentation Project"
 msgstr "Hjelpeteksttre"
 
-#: data/static_bookmarks.xml.h:18
+#: data/static_bookmarks.xml.h:19
+#, fuzzy
+msgid "Linux One"
+msgstr "Kompis tilkopla"
+
+#: data/static_bookmarks.xml.h:20
 #, fuzzy
 msgid "Linux Online"
 msgstr "Kompis tilkopla"
 
-#: data/static_bookmarks.xml.h:19
+#: data/static_bookmarks.xml.h:21
 #, fuzzy
 msgid "Linux Resources"
 msgstr "Ressurs"
 
-#: data/static_bookmarks.xml.h:20
-msgid "Linux at IBM"
+#: data/static_bookmarks.xml.h:22
+msgid "Linux Weekly News"
 msgstr ""
 
-#: data/static_bookmarks.xml.h:21
+#: data/static_bookmarks.xml.h:23
 #, fuzzy
 msgid "LinuxNewbie.org"
 msgstr "Luxembourg"
 
-#: data/static_bookmarks.xml.h:22
+#: data/static_bookmarks.xml.h:24
 #, fuzzy
-msgid "Linuxcare"
-msgstr "Lineær"
+msgid "LinuxOrbit.com"
+msgstr "Luxembourg"
 
-#: data/static_bookmarks.xml.h:23
-#, fuzzy
-msgid "Myplay"
-msgstr "Mai"
+#: data/static_bookmarks.xml.h:25
+msgid "MandrakeSoft"
+msgstr ""
 
-#. The copyright character in here is correct for
-#. * Latin-1 encoding, but not for UTF-8, so we have
-#. * to change it when we upgrade to GTK 2.0.
-#.
-#: data/static_bookmarks.xml.h:24 nautilus.desktop.in.h:1
-#: src/nautilus-window-manage-views.c:245 src/nautilus-window-menus.c:553
+#: data/static_bookmarks.xml.h:26
 #, fuzzy
-msgid "Nautilus"
-msgstr "Mauritius"
+msgid "Netraverse"
+msgstr "Aldri"
 
-#: data/static_bookmarks.xml.h:25
+#: data/static_bookmarks.xml.h:27
 #, fuzzy
 msgid "News and Media"
 msgstr "Ny-Caledonia"
 
-#: data/static_bookmarks.xml.h:26
+#: data/static_bookmarks.xml.h:28
+msgid "O'Reilly"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:29
 #, fuzzy
 msgid "OSDN"
 msgstr "ISDN"
 
-#: data/static_bookmarks.xml.h:27
+#: data/static_bookmarks.xml.h:30
+msgid "Open Source Asia"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:31
 #, fuzzy
 msgid "OpenOffice"
 msgstr "Kontor"
 
-#: data/static_bookmarks.xml.h:28
+#: data/static_bookmarks.xml.h:32
+msgid "Penguin Computing"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:33
+#, fuzzy
+msgid "Rackspace"
+msgstr "Pakke"
+
+#: data/static_bookmarks.xml.h:34
 #, fuzzy
 msgid "Red Hat"
 msgstr "Les data"
 
-#: data/static_bookmarks.xml.h:29
+#: data/static_bookmarks.xml.h:35
 #, fuzzy
-msgid "Slashdot"
-msgstr "Skråstrek"
+msgid "Red Hat Network"
+msgstr "Les data"
 
-#: data/static_bookmarks.xml.h:30
+#: data/static_bookmarks.xml.h:36
+msgid "RedFlag Linux"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:37
 #, fuzzy
 msgid "Software"
 msgstr "Starta"
 
-#: data/static_bookmarks.xml.h:31
+#: data/static_bookmarks.xml.h:38
 #, fuzzy
 msgid "SourceForge"
 msgstr "Kjelde:"
 
-#: data/static_bookmarks.xml.h:32
-#, fuzzy
-msgid "SourceXchange"
-msgstr "Endringar:"
-
-#: data/static_bookmarks.xml.h:33
+#: data/static_bookmarks.xml.h:39
 #, fuzzy
 msgid "Sun StarOffice"
 msgstr "Kontor"
 
-#: data/static_bookmarks.xml.h:34
-#, fuzzy
-msgid "VA Linux"
-msgstr "&Linux"
-
-#: data/static_bookmarks.xml.h:35
-#, fuzzy
-msgid "VMWare"
-msgstr "Mar"
+#: data/static_bookmarks.xml.h:40
+msgid "Sun Wah Linux"
+msgstr ""
 
-#: data/static_bookmarks.xml.h:36
+#: data/static_bookmarks.xml.h:41
 #, fuzzy
 msgid "Web Services"
 msgstr "Tenester"
 
-#: data/static_bookmarks.xml.h:37
-#, fuzzy
-msgid "Ximian"
-msgstr "Kaiman"
+#: data/static_bookmarks.xml.h:42
+msgid "ZDNet Linux Hardware Database"
+msgstr ""
 
-#: data/static_bookmarks.xml.h:38
+#: data/static_bookmarks.xml.h:43
 msgid "ZDNet Linux Resource Center"
 msgstr ""
 
+#: data/static_bookmarks.xml.h:44
+msgid "Zero-Knowledge"
+msgstr ""
+
 #: icons/ardmore/ardmore.xml.h:1
 #, fuzzy
 msgid "Tahoe"
@@ -3881,14 +4702,31 @@ msgstr "Sierra Leone"
 msgid "Uses manila folders and gray-green backgrounds."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-druid-page-eazel.c:343
-msgid "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
-msgstr ""
+#: libnautilus-extensions/nautilus-drag.c:489
+#, fuzzy
+msgid "_Move here"
+msgstr "kor"
 
-#: libnautilus-extensions/nautilus-druid-page-eazel.c:352
+#: libnautilus-extensions/nautilus-drag.c:490
+#, fuzzy
+msgid "_Copy here"
+msgstr "&Kopier tekst"
+
+#: libnautilus-extensions/nautilus-drag.c:491
+#, fuzzy
+msgid "_Link here"
+msgstr "Linjer"
+
+#. Note to localizers: this font is used for text items in Druid pages
+#: libnautilus-extensions/nautilus-druid-page-eazel.c:381
 msgid "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-*"
 msgstr ""
 
+#. Note to localizers: this font is used for page titles in Druid pages
+#: libnautilus-extensions/nautilus-druid-page-eazel.c:560
+msgid "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
+msgstr ""
+
 #. Today, use special word.
 #. * Note to localizers: You can look at man strftime
 #. * for details on the format, but you should only use
@@ -3901,95 +4739,95 @@ msgstr ""
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2246
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr ""
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2251
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr ""
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2256
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr ""
 
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2261
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3392
+#: libnautilus-extensions/nautilus-file.c:3423
 #, fuzzy
 msgid "0 items"
 msgstr "0 byte"
 
-#: libnautilus-extensions/nautilus-file.c:3392
+#: libnautilus-extensions/nautilus-file.c:3423
 #, fuzzy
 msgid "0 folders"
 msgstr "Mapper"
 
-#: libnautilus-extensions/nautilus-file.c:3393
+#: libnautilus-extensions/nautilus-file.c:3424
 #, fuzzy
 msgid "0 files"
 msgstr " filer"
 
-#: libnautilus-extensions/nautilus-file.c:3397
+#: libnautilus-extensions/nautilus-file.c:3428
 #, fuzzy
 msgid "1 item"
 msgstr "1 ti"
 
-#: libnautilus-extensions/nautilus-file.c:3397
+#: libnautilus-extensions/nautilus-file.c:3428
 #, fuzzy
 msgid "1 folder"
 msgstr "Legg til mappe"
 
-#: libnautilus-extensions/nautilus-file.c:3398
+#: libnautilus-extensions/nautilus-file.c:3429
 #, fuzzy
 msgid "1 file"
 msgstr " filer"
 
-#: libnautilus-extensions/nautilus-file.c:3401
+#: libnautilus-extensions/nautilus-file.c:3432
 #, fuzzy, c-format
 msgid "%u items"
 msgstr "%1 element"
 
-#: libnautilus-extensions/nautilus-file.c:3401
+#: libnautilus-extensions/nautilus-file.c:3432
 #, fuzzy, c-format
 msgid "%u folders"
 msgstr "Mapper"
 
-#: libnautilus-extensions/nautilus-file.c:3402
+#: libnautilus-extensions/nautilus-file.c:3433
 #, fuzzy, c-format
 msgid "%u files"
 msgstr " filer"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3705
-#: libnautilus-extensions/nautilus-file.c:3720
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 #, fuzzy
 msgid "? items"
 msgstr " minutt"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3711
+#: libnautilus-extensions/nautilus-file.c:3746
 #, fuzzy
 msgid "? bytes"
 msgstr "byte"
 
-#: libnautilus-extensions/nautilus-file.c:3724
+#: libnautilus-extensions/nautilus-file.c:3759
 #, fuzzy
 msgid "unknown type"
 msgstr "ukjend"
 
-#: libnautilus-extensions/nautilus-file.c:3726
+#: libnautilus-extensions/nautilus-file.c:3761
 #, fuzzy
 msgid "unknown MIME type"
 msgstr "MIME-type"
@@ -3997,30 +4835,30 @@ msgstr "MIME-type"
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3731
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "ukjend"
 
-#: libnautilus-extensions/nautilus-file.c:3767
+#: libnautilus-extensions/nautilus-file.c:3802
 #, fuzzy
 msgid "program"
 msgstr "Program"
 
-#: libnautilus-extensions/nautilus-file.c:3779
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
 "some other reason."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3783
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
 "aaron@eazel.com"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3797
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "lenkje"
 
@@ -4028,28 +4866,28 @@ msgstr "lenkje"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1146
-#: libnautilus-extensions/nautilus-file.c:3803
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, fuzzy, c-format
 msgid "link to %s"
 msgstr "Klikk for fokus"
 
-#: libnautilus-extensions/nautilus-file.c:3817
+#: libnautilus-extensions/nautilus-file.c:3852
 #, fuzzy
 msgid "link (broken)"
 msgstr "Brote samband"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "Frå:"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "Til:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:578
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4057,7 +4895,7 @@ msgid ""
 "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:589
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4066,7 +4904,7 @@ msgid ""
 "parent folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:595
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4074,7 +4912,7 @@ msgid ""
 "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:626
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4083,16 +4921,18 @@ msgid ""
 "its parent folder."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:633
-#, c-format
+#: libnautilus-extensions/nautilus-file-operations.c:677
+#, fuzzy, c-format
 msgid ""
 "Error while moving.\n"
 "\n"
-"\"%s\" cannot be moved to the trash because you do not have permissions to "
+"\"%s\" cannot be moved to the Trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
+"Dette er ein priviligert kommando.\n"
+"Du har ikkje løyve til å utføra den."
 
-#: libnautilus-extensions/nautilus-file-operations.c:657
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, fuzzy, c-format
 msgid ""
 "Error while copying.\n"
@@ -4102,7 +4942,7 @@ msgstr ""
 "Dette er ein priviligert kommando.\n"
 "Du har ikkje løyve til å utføra den."
 
-#: libnautilus-extensions/nautilus-file-operations.c:679
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4110,7 +4950,7 @@ msgid ""
 "There is not enough space on the destination."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:684
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4118,7 +4958,7 @@ msgid ""
 "There is not enough space on the destination."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:688
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4126,7 +4966,7 @@ msgid ""
 "There is not enough space on the destination."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:700
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, fuzzy, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4136,7 +4976,7 @@ msgstr ""
 "Kan ikkje lagra innstillingane dine.\n"
 "Du har kanskje ikkje skriveløyve for denne fila."
 
-#: libnautilus-extensions/nautilus-file-operations.c:704
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4144,7 +4984,7 @@ msgid ""
 "The destination disk is read-only."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:711
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, fuzzy, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4154,7 +4994,7 @@ msgstr ""
 "Kan ikkje lagra innstillingane dine.\n"
 "Du har kanskje ikkje skriveløyve for denne fila."
 
-#: libnautilus-extensions/nautilus-file-operations.c:715
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4162,7 +5002,7 @@ msgid ""
 "The destination disk is read-only."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:722
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, fuzzy, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4172,7 +5012,7 @@ msgstr ""
 "Kan ikkje lagra innstillingane dine.\n"
 "Du har kanskje ikkje skriveløyve for denne fila."
 
-#: libnautilus-extensions/nautilus-file-operations.c:726
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4180,7 +5020,7 @@ msgid ""
 "The destination disk is read-only."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:755
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4188,7 +5028,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:759
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4196,7 +5036,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:763
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4204,7 +5044,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4212,7 +5052,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:784
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4220,7 +5060,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:788
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, fuzzy, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4230,7 +5070,7 @@ msgstr ""
 " er endra.\n"
 "Vil du lagra den?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:792
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4238,7 +5078,7 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4246,39 +5086,39 @@ msgid ""
 "Would you like to continue?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:914
+#: libnautilus-extensions/nautilus-file-operations.c:958
 #, fuzzy
 msgid "Error while copying."
 msgstr "Feil ved sending"
 
-#: libnautilus-extensions/nautilus-file-operations.c:917
+#: libnautilus-extensions/nautilus-file-operations.c:961
 #, fuzzy
 msgid "Error while moving."
 msgstr "Feil ved sending"
 
-#: libnautilus-extensions/nautilus-file-operations.c:920
+#: libnautilus-extensions/nautilus-file-operations.c:964
 #, fuzzy
 msgid "Error while linking."
 msgstr "Feil ved sending"
 
-#: libnautilus-extensions/nautilus-file-operations.c:925
+#: libnautilus-extensions/nautilus-file-operations.c:969
 #, fuzzy
 msgid "Error while deleting."
 msgstr "Feil ved sending"
 
-#: libnautilus-extensions/nautilus-file-operations.c:950
-#: libnautilus-extensions/nautilus-file-operations.c:969
-#: libnautilus-extensions/nautilus-file-operations.c:1083
-#: libnautilus-extensions/nautilus-file-operations.c:1097
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "Hopp over"
 
-#: libnautilus-extensions/nautilus-file-operations.c:969
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 #, fuzzy
 msgid "Retry"
 msgstr "P&røv igjen"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1047
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4287,7 +5127,7 @@ msgid ""
 "If you still want to move \"%s\", rename it and try again."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1053
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4296,12 +5136,12 @@ msgid ""
 "If you still want to copy \"%s\", rename it and try again."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1061
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 #, fuzzy
 msgid "Unable to replace file."
 msgstr "Kan ikkje døypa om fil."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, fuzzy, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4311,26 +5151,26 @@ msgstr ""
 "Fila %s finst.\n"
 "Vil du erstatta den?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1082
-#: libnautilus-extensions/nautilus-file-operations.c:1096
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 #, fuzzy
 msgid "Conflict while copying"
 msgstr ""
 "Fann ei syklisk lenkje under kopiering\n"
 "%1"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1083
-#: libnautilus-extensions/nautilus-file-operations.c:1097
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Erstatt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1097
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 #, fuzzy
 msgid "Replace All"
 msgstr "E&rstatt alle"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1150
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, fuzzy, c-format
 msgid "another link to %s"
 msgstr "Kan ikkje laga lenkje til daemon"
@@ -4339,25 +5179,25 @@ msgstr "Kan ikkje laga lenkje til daemon"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1166
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1170
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1174
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1178
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr ""
@@ -4367,272 +5207,257 @@ msgstr ""
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1198
-#: libnautilus-extensions/nautilus-file-operations.c:2341
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 #, fuzzy
 msgid " (copy)"
 msgstr " (Kopierer)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1200
-#: libnautilus-extensions/nautilus-file-operations.c:2341
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 #, fuzzy
 msgid " (another copy)"
 msgstr "E&ndå eit anna val"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1202
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 #, fuzzy
 msgid "st copy)"
 msgstr " stopp"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1204
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 #, fuzzy
 msgid "nd copy)"
 msgstr "&Angra : Kopier"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1206
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr ""
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr ""
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr ""
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1220
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr ""
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1222
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr ""
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1224
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr ""
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1226
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr ""
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr ""
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1312
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 #, fuzzy
 msgid " ("
 msgstr " "
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1320
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1477
-#: libnautilus-extensions/nautilus-file-operations.c:2056
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1792
-#: libnautilus-extensions/nautilus-file-operations.c:2185
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 #, fuzzy
 msgid "Moving files to the Trash"
 msgstr "&Flytt til papirkorga"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1794
-#: libnautilus-extensions/nautilus-file-operations.c:2187
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 #, fuzzy
 msgid "Files thrown out:"
 msgstr "Opna filer"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1796
-#: libnautilus-extensions/nautilus-file-operations.c:1811
-#: libnautilus-extensions/nautilus-file-operations.c:2189
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "Flyttar"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1797
-#: libnautilus-extensions/nautilus-file-operations.c:2190
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 #, fuzzy
 msgid "Preparing to Move to Trash..."
 msgstr "&Flytt til papirkorga"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1807
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 #, fuzzy
 msgid "Moving files"
 msgstr "Flytt filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1809
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 #, fuzzy
 msgid "Files moved:"
 msgstr "Filnamn:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1812
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 #, fuzzy
 msgid "Preparing To Move..."
 msgstr "Startar rom ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1813
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 #, fuzzy
 msgid "Finishing Move..."
 msgstr "Loggar inn ..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1825
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 #, fuzzy
 msgid "Creating links to files"
 msgstr "Lagar ny fil ..."
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1827
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 #, fuzzy
 msgid "Files linked:"
 msgstr "Filnamn:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1829
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 #, fuzzy
 msgid "Linking"
 msgstr "Blinking"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1830
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1831
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 #, fuzzy
 msgid "Finishing Creating Links..."
 msgstr " Lagar liste ..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1838
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 #, fuzzy
 msgid "Copying files"
 msgstr "Kopierer filer ..."
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 #, fuzzy
 msgid "Files copied:"
 msgstr "Fil opna."
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1842
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "Kopierer"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1843
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 #, fuzzy
 msgid "Preparing To Copy..."
 msgstr "Startar rom ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1861
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 #, fuzzy
 msgid "You cannot copy items into the Trash."
 msgstr "Du kan ikkje leggja til to profilar med det same namnet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1862
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 #, fuzzy
 msgid "Can't Copy to Trash"
 msgstr "&Flytt til papirkorga"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1889
-#: libnautilus-extensions/nautilus-file-operations.c:2147
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 #, fuzzy
 msgid "The Trash must remain on the desktop."
 msgstr "Filnamnet må slutta på .desktop."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1890
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 #, fuzzy
 msgid "You cannot move this trash folder."
 msgstr ""
 "Kan ikkje fjerna\n"
 "ei systemmappe."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1892
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1893
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 #, fuzzy
 msgid "You cannot copy this trash folder."
 msgstr "Du kan ikkje skjula den siste synlege tabellen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1895
-#: libnautilus-extensions/nautilus-file-operations.c:2148
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 #, fuzzy
 msgid "Can't Change Trash Location"
 msgstr "Endra rotering"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1896
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1913
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 #, fuzzy
 msgid "You cannot move a folder into itself."
 msgstr "Du kan ikkje sleppa ein katalog på seg sjølv"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1914
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 #, fuzzy
 msgid "You cannot copy a folder into itself."
 msgstr "Du kan ikkje sleppa ein katalog på seg sjølv"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1916
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1917
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1930
-#, fuzzy
-msgid "You cannot move a file onto itself."
-msgstr "Du kan ikkje sleppa ein katalog på seg sjølv"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1931
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 #, fuzzy
 msgid "You cannot copy a file over itself."
 msgstr "Du kan ikkje sleppa ein katalog på seg sjølv"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1933
-msgid "Can't Move Onto Self"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-file-operations.c:1934
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1985
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 #, fuzzy
 msgid ""
 "Error creating new folder.\n"
@@ -4640,970 +5465,1063 @@ msgid ""
 "You do not have permissions to write to the destination."
 msgstr "Du har ikkje løyve til å skriva til katalogen %1"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1988
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
 "There is no space on the destination."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1991
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, fuzzy, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Feil ved laging av ny signatur."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1995
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 #, fuzzy
 msgid "Error creating new folder"
 msgstr "Feil ved laging av ny signatur."
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2082
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 #, fuzzy
 msgid "untitled folder"
 msgstr "utan tittel"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2154
-#, fuzzy, c-format
-msgid "You cannot throw \"%s\" into the Trash."
-msgstr "Du kan ikkje leggja til to grupper med det same namnet."
-
-#: libnautilus-extensions/nautilus-file-operations.c:2158
-#, fuzzy
-msgid "Error Moving to Trash"
-msgstr "&Flytt til papirkorga"
-
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2230
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 #, fuzzy
 msgid "Deleting files"
 msgstr "Feil ved sletting"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2232
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 #, fuzzy
 msgid "Files deleted:"
 msgstr "0 filer valt"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2234
-#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Slettar"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2235
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 #, fuzzy
 msgid "Preparing to Delete files..."
 msgstr "Lagar ny fil ..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 #, fuzzy
 msgid "Emptying the Trash"
 msgstr "Tøm mellomlageret."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2301
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently delete all of the items in the trash?"
+"Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr "Er du sikker på at du vil sletta denne overføringa?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2303
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 #, fuzzy
 msgid "Delete Trash Contents?"
 msgstr "&Slett avtale"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2304
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "Tom"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2342
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 #, fuzzy
 msgid "foo"
 msgstr "fot"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2342
-#: libnautilus-extensions/nautilus-file-operations.c:2352
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 #, fuzzy
 msgid "foo (copy)"
 msgstr " (Kopierer)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2343
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2343
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2344
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 #, fuzzy
 msgid ".foo.txt"
 msgstr "fot"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2344
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2345
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 #, fuzzy
 msgid "foo foo"
 msgstr "skrifttype for hovuddel"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2345
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2346
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 #, fuzzy
 msgid "foo.txt"
 msgstr "fot"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2346
-#: libnautilus-extensions/nautilus-file-operations.c:2353
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2347
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2347
-#: libnautilus-extensions/nautilus-file-operations.c:2367
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2348
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2348
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2349
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 #, fuzzy
 msgid "foo...txt"
 msgstr "fot"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2349
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2350
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 #, fuzzy
 msgid "foo..."
 msgstr "&Forstørring ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2350
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2351
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2351
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2352
-#: libnautilus-extensions/nautilus-file-operations.c:2354
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2353
-#: libnautilus-extensions/nautilus-file-operations.c:2355
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2354
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2355
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2356
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2356
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2357
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr " (Kopierer)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr " (Kopierer)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr " (Kopierer)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr " (Kopierer)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2357
-#: libnautilus-extensions/nautilus-file-operations.c:2359
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2358
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2358
-#: libnautilus-extensions/nautilus-file-operations.c:2360
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2359
-#: libnautilus-extensions/nautilus-file-operations.c:2361
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2360
-#: libnautilus-extensions/nautilus-file-operations.c:2362
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2361
-#: libnautilus-extensions/nautilus-file-operations.c:2363
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2362
-#: libnautilus-extensions/nautilus-file-operations.c:2364
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2363
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2364
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2365
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2365
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2366
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2366
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:2367
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations-progress.c:345
-#, fuzzy, c-format
-msgid "%ld of %ld"
-msgstr "%1 av %2"
-
-#: libnautilus-extensions/nautilus-font-picker.c:131
-msgid "Font"
-msgstr "Skrifttype"
-
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
 #, fuzzy
-msgid "GConf Error"
-msgstr "Lydsignal ved feil"
+msgid "foo (10th copy)"
+msgstr " (Kopierer)"
 
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:638
-msgid "fixed"
-msgstr "fast"
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (11st copy)"
+msgstr " (Kopierer)"
 
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1221
-msgid "01/01/00, 01:00 AM"
-msgstr ""
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (10th copy).txt"
+msgstr " (Kopierer)"
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1222
-msgid "1/1/00, 1:00 AM"
-msgstr ""
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (11st copy).txt"
+msgstr " (Kopierer)"
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1223
-msgid " 1/ 1/00,  1:00 AM"
-msgstr ""
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (11th copy)"
+msgstr " (Kopierer)"
 
-#. Constants
-#: libnautilus-extensions/nautilus-global-preferences.c:44
+#: libnautilus-extensions/nautilus-file-operations.c:2291
 #, fuzzy
-msgid "Nautilus Preferences"
-msgstr "Kaiman-innstillingar"
+msgid "foo (12nd copy)"
+msgstr " (Kopierer)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:88
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 #, fuzzy
-msgid "current theme"
-msgstr "tid no"
+msgid "foo (11th copy).txt"
+msgstr " (Kopierer)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:92
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 #, fuzzy
-msgid "Open each item in a separate window"
-msgstr "Opna &katalogar i eigne vindauge"
+msgid "foo (12nd copy).txt"
+msgstr " (Kopierer)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:96
-msgid "Ask before deleting items from the trash"
-msgstr ""
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (12th copy)"
+msgstr " (Kopierer)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:100
+#: libnautilus-extensions/nautilus-file-operations.c:2293
 #, fuzzy
-msgid "Click behavior"
-msgstr "Val for stavekontroll"
+msgid "foo (13rd copy)"
+msgstr " (Kopierer)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:103
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 #, fuzzy
-msgid "single"
-msgstr "sidan"
+msgid "foo (12th copy).txt"
+msgstr " (Kopierer)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:104
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 #, fuzzy
-msgid "Activate items with a single click"
-msgstr "Aktiver, hev og overfør klikk"
+msgid "foo (13rd copy).txt"
+msgstr " (Kopierer)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:108
-msgid "double"
-msgstr "double"
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
+#, fuzzy, c-format
+msgid "%ld of %ld"
+msgstr "%1 av %2"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:109
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
 #, fuzzy
-msgid "Activate items with a double click"
-msgstr "Aktiver, hev og overfør klikk"
+msgid "GConf Error"
+msgstr "Lydsignal ved feil"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:114
-#: libnautilus-extensions/nautilus-global-preferences.c:624
+#. Constants
+#: libnautilus-extensions/nautilus-global-preferences.c:50
 #, fuzzy
-msgid "Activating Executable Text Files"
-msgstr "Køyrbare filer"
+msgid "Nautilus Preferences"
+msgstr "Kaiman-innstillingar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:117
+#: libnautilus-extensions/nautilus-global-preferences.c:471
 #, fuzzy
-msgid "launch"
-msgstr "Start"
+msgid "always"
+msgstr "Alltid"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:118
-#, fuzzy
-msgid "Always execute"
-msgstr "køyr"
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "Alltid"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:122
+#: libnautilus-extensions/nautilus-global-preferences.c:475
 #, fuzzy
-msgid "display"
-msgstr "Vis"
+msgid "local only"
+msgstr "Berre loddrett"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:123
+#: libnautilus-extensions/nautilus-global-preferences.c:476
 #, fuzzy
-msgid "Always display"
-msgstr "Digital vising"
+msgid "Local Files Only"
+msgstr "Lokalt filnamn"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:127
+#: libnautilus-extensions/nautilus-global-preferences.c:479
 #, fuzzy
-msgid "ask"
-msgstr "Oppgåve"
+msgid "never"
+msgstr "kvar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:128
-#, fuzzy
-msgid "Ask each time"
-msgstr "Tid for frammøte"
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "Aldri"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:135
+#: libnautilus-extensions/nautilus-global-preferences.c:576
 #, fuzzy
-msgid "Display text in icons"
-msgstr "Visingsinnstillingar"
+msgid "Smoother Graphics"
+msgstr "Name=Grafikk"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:138
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "Skrifttypar"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
 #, fuzzy
-msgid "Display item counts for folders"
-msgstr "Vis kjeldekode"
+msgid "Font for Icon view:"
+msgstr "Katalog for mellombelse filer"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:141
-msgid "Show thumbnails for image files"
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:144
-msgid "Read and write metadata in each folder"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "Katalog for mellombelse filer"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:147
-msgid "Play a sound file when the mouse is over it"
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:151
-msgid "Use smoother (but slower) graphics"
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:154
-msgid "Font family used to display file names"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+#, fuzzy
+msgid "Use Nautilus to draw the desktop"
+msgstr "Klikk på skrivebordet"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:158
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
 #, fuzzy
-msgid "Display tool bar in new windows"
+msgid "Opening New Windows"
+msgstr "&Opna i eige vindauge"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:651
+#, fuzzy
+msgid "Open each file or folder in a separate window"
+msgstr "Opna &katalogar i eigne vindauge"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+#, fuzzy
+msgid "Display toolbar in new windows"
 msgstr "Vis innhaldet i vindauga du flyttar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:161
+#: libnautilus-extensions/nautilus-global-preferences.c:665
 #, fuzzy
 msgid "Display location bar in new windows"
 msgstr "Vis innhaldet i vindauga du flyttar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:164
+#: libnautilus-extensions/nautilus-global-preferences.c:672
 #, fuzzy
 msgid "Display status bar in new windows"
 msgstr "Vis innhaldet i vindauga du flyttar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:167
+#: libnautilus-extensions/nautilus-global-preferences.c:679
 #, fuzzy
 msgid "Display sidebar in new windows"
 msgstr "Vis innhaldet i vindauga du flyttar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:170
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
 #, fuzzy
-msgid "Use Nautilus to draw the desktop"
-msgstr "Klikk på skrivebordet"
+msgid "Trash Behavior"
+msgstr "Ã…tferd"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:174
-msgid ""
-"Do slower but more complete search whenever possible\n"
-"(slower search is not available when searching by content)"
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+msgid "Ask before emptying the Trash or deleting files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:179
-msgid "search type to do by default"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:182
-#, fuzzy
-msgid "search by text"
-msgstr "Søketekst:"
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:183
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 #, fuzzy
-msgid "Search for files by text only"
-msgstr "Søk etter hjelp om"
+msgid "single"
+msgstr "sidan"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:187
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 #, fuzzy
-msgid "search by text and properties"
-msgstr "Brukareigenskapar"
+msgid "Activate items with a single click"
+msgstr "Aktiver, hev og overfør klikk"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:188
-msgid "Search for files by text and by their properties"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:717
+msgid "double"
+msgstr "double"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:193
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 #, fuzzy
-msgid "Search Web Location"
-msgstr "Arkivplassering"
+msgid "Activate items with a double click"
+msgstr "Aktiver, hev og overfør klikk"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:197
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 #, fuzzy
-msgid "Show hidden files (starting with \".\")"
-msgstr "Vis skjulte filer"
+msgid "launch"
+msgstr "Start"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:200
-msgid "Show backup files (ending with \"~\")"
+#: libnautilus-extensions/nautilus-global-preferences.c:726
+msgid "Execute files when they are clicked"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:203
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 #, fuzzy
-msgid "Show special flags in Properties window"
-msgstr "Viser fileigenskapane"
+msgid "display"
+msgstr "Vis"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:206
-msgid "Show only folders (no files) in Tree sidebar panel"
+#: libnautilus-extensions/nautilus-global-preferences.c:730
+msgid "Display files when they are clicked"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:209
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 #, fuzzy
-msgid "Can add Content"
-msgstr "Kan ikkje lesa miljø"
+msgid "ask"
+msgstr "Oppgåve"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:213
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 #, fuzzy
-msgid "Don't include the built-in bookmarks"
-msgstr "Ikkje oppdater tabulatorar"
+msgid "Ask each time"
+msgstr "Tid for frammøte"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:218
-#: libnautilus-extensions/nautilus-global-preferences.c:705
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
 #, fuzzy
-msgid "Home Location"
-msgstr "Kodeplassering"
+msgid "Click Behavior"
+msgstr "Ã…tferd"
 
-#. Proxy descriptions
-#: libnautilus-extensions/nautilus-global-preferences.c:224
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
 #, fuzzy
-msgid "Use HTTP Proxy"
-msgstr "&HTTP-proxy:"
+msgid "Executable Text Files"
+msgstr "Køyrbare filer"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:225
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
 #, fuzzy
-msgid "HTTP Proxy"
-msgstr "&HTTP-proxy:"
+msgid "Show/Hide Options"
+msgstr "Lagra val"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:226
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 #, fuzzy
-msgid "HTTP Proxy Port"
-msgstr "&HTTP-proxy:"
+msgid "Show hidden files (file names start with \".\")"
+msgstr "Vis skjulte filer"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:533
-msgid "Appearance"
-msgstr "Utsjånad"
+#: libnautilus-extensions/nautilus-global-preferences.c:766
+#, fuzzy
+msgid "Show backup files (file names end with \"~\")"
+msgstr "Vis skjulte filer"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:534
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 #, fuzzy
-msgid "Appearance Settings"
-msgstr "Tid for frammøte"
+msgid "Show special flags in Properties window"
+msgstr "Viser fileigenskapane"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:536
+#: libnautilus-extensions/nautilus-global-preferences.c:778
 #, fuzzy
-msgid "Smoother Graphics"
-msgstr "Name=Grafikk"
+msgid "Sorting Order"
+msgstr "Feil ved henting av CDDB-oppføring."
 
-#: libnautilus-extensions/nautilus-global-preferences.c:543
-msgid "Fonts"
-msgstr "Skrifttypar"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:549
-msgid "Views"
-msgstr "Visingar"
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
+msgid "Location:"
+msgstr "Stad:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:578
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
 #, fuzzy
-msgid "Folder Views"
-msgstr "Mappeliste"
+msgid "HTTP Proxy Settings"
+msgstr "Proxy-innstillingar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:579
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 #, fuzzy
-msgid "Folder Views Settings"
-msgstr "Fargeinnstillngar"
+msgid "Use HTTP Proxy"
+msgstr "&HTTP-proxy:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:581
-#, fuzzy
-msgid "Window Behavior"
-msgstr "Name=Vindaugsåtferd"
+#. allocate the proxy label, followed by the entry
+#: libnautilus-extensions/nautilus-global-preferences.c:812
+#: src/nautilus-first-time-druid.c:683
+msgid "Port:"
+msgstr "Port:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:588
-#, fuzzy
-msgid "Click Behavior"
-msgstr "Ã…tferd"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:595
+#: libnautilus-extensions/nautilus-global-preferences.c:841
 #, fuzzy
-msgid "Trash Behavior"
-msgstr "Ã…tferd"
+msgid "Built-in Bookmarks"
+msgstr "&Rediger bokmerke ..."
 
-#: libnautilus-extensions/nautilus-global-preferences.c:602
+#: libnautilus-extensions/nautilus-global-preferences.c:843
 #, fuzzy
-msgid "Show/Hide Options"
-msgstr "Lagra val"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:635
-msgid "Search"
-msgstr "Søk"
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "Ikkje oppdater tabulatorar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:636
+#: libnautilus-extensions/nautilus-global-preferences.c:852
 #, fuzzy
-msgid "Search Settings"
-msgstr "Søketekst:"
+msgid "Show Text in Icons"
+msgstr "Vis sekund"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:638
+#: libnautilus-extensions/nautilus-global-preferences.c:860
 #, fuzzy
-msgid "Search Complexity Options"
-msgstr "Søkeval"
+msgid "Show Count of Items in Folders"
+msgstr "Vis lang mappeliste"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:644
-#, fuzzy
-msgid "Search Tradeoffs"
-msgstr "Søk nyheiter"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:652
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:886
 #, fuzzy
-msgid "Search Locations"
-msgstr "Søkeval"
+msgid "Preview Sound Files"
+msgstr "Utskrift til fil"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:662
-msgid "Sidebar Panels"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:663
-#, fuzzy
-msgid "Sidebar Panels Description"
-msgstr "Detaljert signalskildring"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "Utsjånad"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:666
-msgid "Choose which panels should appear in the sidebar"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:702
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:957
 #, fuzzy
 msgid "Navigation"
 msgstr "Vis &navigeringslinje"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:703
-#, fuzzy
-msgid "Navigation Settings"
-msgstr "Handlingsinnstillingar"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:712
-msgid "Proxy Settings"
-msgstr "Proxy-innstillingar"
+#: libnautilus-extensions/nautilus-global-preferences.c:962
+msgid "Speed Tradeoffs"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:731
+#: libnautilus-extensions/nautilus-global-preferences.c:985
 #, fuzzy
-msgid "Built-in Bookmarks"
-msgstr "&Rediger bokmerke ..."
+msgid "search by text"
+msgstr "Søketekst:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:742
-msgid "Speed Tradeoffs"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+#, fuzzy
+msgid "Search for files by file name only"
+msgstr "Søk etter hjelp om"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:743
+#: libnautilus-extensions/nautilus-global-preferences.c:989
 #, fuzzy
-msgid "Speed Tradeoffs Settings"
-msgstr "Tenarinnstillingar"
+msgid "search by text and properties"
+msgstr "Brukareigenskapar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:745
+#: libnautilus-extensions/nautilus-global-preferences.c:990
 #, fuzzy
-msgid "Show Text in Icons"
-msgstr "Vis sekund"
+msgid "Search for files by file name and file properties"
+msgstr "Brukareigenskapar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:752
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 #, fuzzy
-msgid "Show Item Counts for Folders"
-msgstr "Vis lang mappeliste"
+msgid "Search Complexity Options"
+msgstr "Søkeval"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:759
-msgid "Show Thumbnails for Image Files"
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:766
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 #, fuzzy
-msgid "Previewing Sound Files"
-msgstr "Utskrift til fil"
+msgid "Fast Search"
+msgstr "Søk"
 
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:775
-msgid "Make Folder Appearance Details Public"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:983
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
 #, fuzzy
-msgid "always"
-msgstr "Alltid"
+msgid "Search Engine Location"
+msgstr "Arkivplassering"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:984
-msgid "Always"
-msgstr "Alltid"
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Søk"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:987
-#, fuzzy
-msgid "local only"
-msgstr "Berre loddrett"
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:988
-#, fuzzy
-msgid "Local Files Only"
-msgstr "Lokalt filnamn"
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, fuzzy, c-format
+msgid "Display %s tab in sidebar"
+msgstr "Vis innhaldet i vindauga du flyttar"
+
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:991
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
 #, fuzzy
-msgid "never"
-msgstr "kvar"
+msgid "Tabs"
+msgstr "Sletta"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:992
-msgid "Never"
-msgstr "Aldri"
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"currently can't be performed because the program crond, which does nightly "
+"tasks on your computer, is turned off. To make sure fast searches can be "
+"done, turn crond on."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
+msgid "Files May Not Be Indexed"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
+msgid ""
+"If you are running Linux, you can log in as root and type these commands to "
+"start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"may not be performed because the program crond, which does nightly tasks on "
+"your computer, may be turned off. To make sure fast searches can be done, "
+"check to make sure that crond is turned on.\n"
+"\n"
+msgstr ""
 
 #. The list of characters that cause line breaks can be localized.
-#: libnautilus-extensions/nautilus-icon-canvas-item.c:67
+#: libnautilus-extensions/nautilus-icon-canvas-item.c:70
 msgid " -_,;.?/&"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:733
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
 "manual layout."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:737
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
 "manual layout."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:743
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:746
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:751
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:752
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 #, fuzzy
 msgid "Switch"
 msgstr "breidd"
 
-#. FIXME bugzilla.eazel.com 1102: Embedded text should use preferences
-#. * to determine what font it uses instead of this set of constants.
-#.
-#: libnautilus-extensions/nautilus-icon-factory.c:133
-#, fuzzy
-msgid "helvetica"
-msgstr "Opna vertikalt"
-
-#: libnautilus-extensions/nautilus-icon-factory.c:134
-msgid "medium"
-msgstr "middels"
-
-#: libnautilus-extensions/nautilus-icon-text-item.c:1546
-#: src/file-manager/nautilus-icon-view-ui.xml.h:14
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
+#: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "Endra namn"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1547
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 #, fuzzy
 msgid "Undo Typing"
 msgstr "&Angra : Lenk"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1548
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 #, fuzzy
 msgid "Restore the old name"
 msgstr "Bruk %s for namnet til ringaren"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1549
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 #, fuzzy
 msgid "Redo Typing"
 msgstr "Les"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 #, fuzzy
 msgid "Restore the changed name"
 msgstr "Bruk %s for namnet til ringaren"
 
-#: libnautilus-extensions/nautilus-preferences.c:76
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "Nybyrjar"
 
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "Middels"
 
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "Avansert"
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:205
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 #, fuzzy
 msgid "Prefs Box"
 msgstr "Postboks"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:189
-#: src/nautilus-window.c:903 src/nautilus-window.c:1145
-#, fuzzy, c-format
-msgid "View as %s"
-msgstr "Visingar"
-
-#: libnautilus-extensions/nautilus-program-chooser.c:219
+#: libnautilus-extensions/nautilus-program-chooser.c:226
 #, fuzzy
 msgid "not in menu"
 msgstr "vis i meny"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:222
+#: libnautilus-extensions/nautilus-program-chooser.c:229
 #, fuzzy
 msgid "in menu for this file"
 msgstr "ingen poengsum for dette nivået"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:225
-#: libnautilus-extensions/nautilus-program-chooser.c:228
+#: libnautilus-extensions/nautilus-program-chooser.c:232
+#: libnautilus-extensions/nautilus-program-chooser.c:235
 #, c-format
 msgid "in menu for \"%s\""
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:231
+#: libnautilus-extensions/nautilus-program-chooser.c:238
 #, fuzzy
 msgid "default for this file"
 msgstr "Standard skriftstorleik"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:234
-#: libnautilus-extensions/nautilus-program-chooser.c:237
+#: libnautilus-extensions/nautilus-program-chooser.c:241
+#: libnautilus-extensions/nautilus-program-chooser.c:244
 #, fuzzy, c-format
 msgid "default for \"%s\""
 msgstr "Standard skriftstorleik"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:266
+#: libnautilus-extensions/nautilus-program-chooser.c:289
 #, c-format
 msgid "Is not in the menu for \"%s\" items."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:269
+#: libnautilus-extensions/nautilus-program-chooser.c:292
 #, c-format
 msgid "Is in the menu for \"%s\"."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:272
+#: libnautilus-extensions/nautilus-program-chooser.c:295
 #, c-format
 msgid "Is in the menu for \"%s\" items."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:275
+#: libnautilus-extensions/nautilus-program-chooser.c:298
 #, c-format
 msgid "Is in the menu for all \"%s\" items."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:278
+#: libnautilus-extensions/nautilus-program-chooser.c:301
 #, fuzzy, c-format
 msgid "Is the default for \"%s\"."
 msgstr "veljer standard framgrunnsfarge."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:281
+#: libnautilus-extensions/nautilus-program-chooser.c:304
 #, fuzzy, c-format
 msgid "Is the default for \"%s\" items."
 msgstr ""
 "\n"
 "eller standardfila av type: "
 
-#: libnautilus-extensions/nautilus-program-chooser.c:284
+#: libnautilus-extensions/nautilus-program-chooser.c:307
 #, c-format
 msgid "Is the default for all \"%s\" items."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:967
+#: libnautilus-extensions/nautilus-program-chooser.c:993
 #, fuzzy, c-format
 msgid "Modify \"%s\""
 msgstr "Endra"
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-extensions/nautilus-program-chooser.c:992
+#: libnautilus-extensions/nautilus-program-chooser.c:1018
 #, fuzzy, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "inkluder signaturen til forfattaren"
 
 #. Radio button for setting default for file type.
-#: libnautilus-extensions/nautilus-program-chooser.c:999
+#: libnautilus-extensions/nautilus-program-chooser.c:1025
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr ""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1006
+#: libnautilus-extensions/nautilus-program-chooser.c:1032
 #, c-format
 msgid "Include in the menu just for \"%s\""
 msgstr ""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1012
+#: libnautilus-extensions/nautilus-program-chooser.c:1038
 #, c-format
 msgid "Use as default just for \"%s\""
 msgstr ""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1019
+#: libnautilus-extensions/nautilus-program-chooser.c:1045
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1183
-#: src/file-manager/fm-list-view.c:1950
-#: src/file-manager/fm-search-list-view.c:493
+#: libnautilus-extensions/nautilus-program-chooser.c:1209
+#: src/file-manager/fm-list-view.c:2182
+#: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
 msgstr "Namn"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1186
+#: libnautilus-extensions/nautilus-program-chooser.c:1212
 msgid "Status"
 msgstr "Status"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1234
+#: libnautilus-extensions/nautilus-program-chooser.c:1260
 #, fuzzy
 msgid "Open with Other"
 msgstr "Opna med"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1235
+#: libnautilus-extensions/nautilus-program-chooser.c:1261
 #, fuzzy, c-format
 msgid "Choose an application with which to open \"%s\"."
 msgstr "Vel program for %1"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1239
+#: libnautilus-extensions/nautilus-program-chooser.c:1265
 #, fuzzy
 msgid "View as Other"
 msgstr "Visar"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1240
+#: libnautilus-extensions/nautilus-program-chooser.c:1266
 #, fuzzy, c-format
 msgid "Choose a view for \"%s\"."
 msgstr "Vel eit namn først."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1247
+#: libnautilus-extensions/nautilus-program-chooser.c:1273
 msgid "Choose"
 msgstr "Vel ..."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1249
+#: libnautilus-extensions/nautilus-program-chooser.c:1275
 msgid "Done"
 msgstr "Ferdig"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1312
+#: libnautilus-extensions/nautilus-program-chooser.c:1338
 msgid "Modify..."
 msgstr "Endra ..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-extensions/nautilus-program-chooser.c:1323
+#: libnautilus-extensions/nautilus-program-chooser.c:1349
 #, fuzzy
 msgid "File Types and Programs"
 msgstr "Fila er eit program"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1335
-#, fuzzy
-msgid "Go There"
-msgstr "kor"
-
-#: libnautilus-extensions/nautilus-program-chooser.c:1344
+#: libnautilus-extensions/nautilus-program-chooser.c:1370
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "GNOME Control Center."
 msgstr ""
 
-#. This application can't deal with this URI,
-#. * because it can only handle local
-#. * files. Tell user. Some day we could offer
-#. * to copy it locally for the user, if we knew
-#. * where to put it, and who would delete it
-#. * when done.
+#: libnautilus-extensions/nautilus-program-chooser.c:1485
+#, fuzzy, c-format
+msgid "No viewers are available for \"%s\"."
+msgstr "Inga skildring tilgjengeleg."
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1486
+msgid "No Viewers Available"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1489
+#, fuzzy, c-format
+msgid "No applications are available for \"%s\"."
+msgstr "Inga skildring tilgjengeleg."
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1490
+#, fuzzy
+msgid "No Applications Available"
+msgstr "Program"
+
+#. Note: This might be misleading in the components case, since the
+#. * user can't add components to the complete list even from the capplet.
+#. * (They can add applications though.)
 #.
-#: libnautilus-extensions/nautilus-program-choosing.c:446
+#: libnautilus-extensions/nautilus-program-chooser.c:1497
 #, c-format
 msgid ""
-"Sorry, %s can only open local files, and \"%s\" is remote. If you want to "
-"open it with %s, make a local copy first."
+"%s\n"
+"\n"
+"You can configure which programs are offered for which file types with the "
+"\"File Types and Programs\" part of the GNOME Control Center. Do you want to "
+"go there now?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-choosing.c:450
+#: libnautilus-extensions/nautilus-program-choosing.c:492
+#, c-format
+msgid ""
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  Would you like to choose another application?"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-choosing.c:497
+#: libnautilus-extensions/nautilus-program-choosing.c:518
 #, fuzzy
-msgid "Can't open remote file"
-msgstr "Kan ikkje opna fila %1"
+msgid "Can't Open Location"
+msgstr "Dataplassering"
+
+#: libnautilus-extensions/nautilus-program-choosing.c:513
+#, c-format
+msgid ""
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  No other applications are available to view this file.  If you "
+"copy this file onto your computer, you may be able to open it."
+msgstr ""
 
 #. Human readable description for a criterion in a search for
 #. files. Bracketed items are context, and are message
@@ -5851,24 +6769,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:493
-msgid "Warning"
-msgstr "Ã…tvaring"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:504
-#: libnautilus-extensions/nautilus-stock-dialogs.c:544
-msgid "Error"
-msgstr "Feil"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:546
-msgid "Details"
-msgstr "Detaljar"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:577
-#: libnautilus-extensions/nautilus-stock-dialogs.c:605
-msgid "Question"
-msgstr "Spørsmål"
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 #, fuzzy
 msgid "Searching Disks"
@@ -5876,10 +6776,10 @@ msgstr "Søk i filer"
 
 #: libnautilus-extensions/nautilus-trash-directory.c:74
 #, fuzzy
-msgid "Nautilus is searching for trash folders."
+msgid "Nautilus is searching your disks for trash folders."
 msgstr "Leit etter programfiler i desse katalogane."
 
-#: libnautilus-extensions/nautilus-trash-file.c:593
+#: libnautilus-extensions/nautilus-trash-file.c:725
 #, fuzzy
 msgid "on the desktop"
 msgstr "Startar skrivebordet."
@@ -5908,108 +6808,145 @@ msgstr "Gjer om-liste"
 msgid "Redo the edit"
 msgstr "Oppsett av leverandør"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:470
-#: libnautilus-extensions/nautilus-volume-monitor.c:492
+#: libnautilus-extensions/nautilus-view-identifier.c:61
+#, fuzzy, c-format
+msgid "View as %s"
+msgstr "Visingar"
+
+#: libnautilus-extensions/nautilus-view-identifier.c:64
+#, fuzzy, c-format
+msgid "%s Viewer"
+msgstr "Visar"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
 #, fuzzy
-msgid "Audio CD"
-msgstr "Lyd-CD-ar"
+msgid "Unknown"
+msgstr "ukjend"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1305
+#. Populate table with items we know localized names for.
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 #, fuzzy
-msgid "Mount Error"
-msgstr "Neste feil"
+msgid "Floppy"
+msgstr "KFloppy"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1307
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
+msgid "CD-ROM"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
+msgid "Zip Drive"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 #, fuzzy
-msgid "Unmount Error"
-msgstr "Avmonter"
+msgid "Audio CD"
+msgstr "Lyd-CD-ar"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1337
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1340
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 #, fuzzy
 msgid "is not a valid block device"
 msgstr "Dette er ikkje eit gyldig filnamn.\n"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1341
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 #, fuzzy
 msgid "No medium found"
 msgstr "Ingen bilete funne"
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1345
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
 msgstr ""
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1349
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1352
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1355
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1358
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1363
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1365
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 #, fuzzy
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "Lar deg endra den valte kontoen"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1369
+#. FIXME: Should we parse this message and report something more meaningful?
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1506
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+#, fuzzy
+msgid "Mount Error"
+msgstr "Neste feil"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Avmonter"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1521
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "Rot"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1528
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 #, fuzzy
 msgid "Ext2 Volume"
 msgstr "Lydstyrke"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1543
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 #, fuzzy
 msgid "MSDOS Volume"
 msgstr "Lydstyrke"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1558
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 #, fuzzy
 msgid "NFS Volume"
 msgstr "Lydstyrke"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1573
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
 #, fuzzy
-msgid "Floppy"
-msgstr "KFloppy"
+msgid "ReiserFS Volume"
+msgstr "Lydstyrke"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
+#, fuzzy
+msgid "UFS Volume"
+msgstr "Lydstyrke"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1588
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 #, fuzzy
 msgid "Unknown Volume"
 msgstr "Ukjend vising"
@@ -6019,40 +6956,84 @@ msgstr "Ukjend vising"
 msgid "C_lear Text"
 msgstr "Skriv tekst"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "Skriv tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "&Kopier tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 #, fuzzy
 msgid "Copy the selected text to the clipboard"
 msgstr "Kopierer utvalet til utklippstavla"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "Skriv tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+#, fuzzy
+msgid "Cut _Text"
+msgstr "Skriv tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 #, fuzzy
 msgid "Cut the selected text to the clipboard"
 msgstr "Kopierer utvalet til utklippstavla"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:41
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "Skriv tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 #, fuzzy
 msgid "Paste the text stored on the clipboard"
 msgstr "Dato/tid kopiert til utklippstavla."
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 #, fuzzy
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "Flyttar valt tekst/element til utklippstavla"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:73
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "Vel alle"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+#, fuzzy
+msgid "Select _All"
+msgstr "Vel alle"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+msgid "Select all the text in a text field"
+msgstr ""
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 #, fuzzy
 msgid "_Copy Text"
 msgstr "&Kopier tekst"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:7
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 #, fuzzy
-msgid "_Cut Text"
+msgid "_Paste Text"
 msgstr "Skriv tekst"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:87
+#. The copyright character in here is correct for
+#. * Latin-1 encoding, but not for UTF-8, so we have
+#. * to change it when we upgrade to GTK 2.0.
+#.
+#: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
+#: src/nautilus-window-menus.c:610
 #, fuzzy
-msgid "_Paste Text"
-msgstr "Skriv tekst"
+msgid "Nautilus"
+msgstr "Mauritius"
 
 #: nautilus.desktop.in.h:2
 msgid "Nautilus File Manager and Graphic Shell"
@@ -6066,86 +7047,116 @@ msgstr ""
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:727
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, fuzzy, c-format
 msgid "%s's Home"
 msgstr "Heim"
 
-#: src/file-manager/fm-desktop-icon-view.c:1010
+#: src/file-manager/fm-desktop-icon-view.c:1175
 #, fuzzy
 msgid "Empty Trash..."
 msgstr "Tøm papirkorga"
 
-#: src/file-manager/fm-desktop-icon-view.c:1012
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 #, fuzzy
 msgid "Empty Trash"
 msgstr "Tøm papirkorga"
 
-#: src/file-manager/fm-desktop-icon-view.c:1032
+#: src/file-manager/fm-desktop-icon-view.c:1197
 #, fuzzy
 msgid "Unmount Volume"
 msgstr "Avmonter band"
 
-#: src/file-manager/fm-directory-view.c:468
+#: src/file-manager/fm-directory-view.c:440
 #, fuzzy, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr ""
 "Dette avsluttar spelet.\n"
 "Er du sikker på at du vil gjera dette?"
 
-#: src/file-manager/fm-directory-view.c:470
+#: src/file-manager/fm-directory-view.c:442
 #, fuzzy, c-format
 msgid "Open %d Windows?"
 msgstr ": Opne vindauge"
 
-#: src/file-manager/fm-directory-view.c:1191
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr "Er du sikker på at du vil sletta denne overføringa?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr "Er du sikker på at du vil sletta denne mappa?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Slett"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Slett"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+#, fuzzy
+msgid "scripts"
+msgstr "Skildring"
+
+#: src/file-manager/fm-directory-view.c:1335
 #, fuzzy, c-format
 msgid "\"%s\" selected"
 msgstr "Alt valt"
 
-#: src/file-manager/fm-directory-view.c:1193
+#: src/file-manager/fm-directory-view.c:1337
 #, fuzzy
 msgid "1 folder selected"
 msgstr "Inga fil valt!"
 
-#: src/file-manager/fm-directory-view.c:1196
+#: src/file-manager/fm-directory-view.c:1340
 #, fuzzy, c-format
 msgid "%d folders selected"
 msgstr "Ingen filer valt."
 
-#: src/file-manager/fm-directory-view.c:1202
+#: src/file-manager/fm-directory-view.c:1346
 #, fuzzy
 msgid " (containing 0 items)"
 msgstr "katalog med testfiler"
 
-#: src/file-manager/fm-directory-view.c:1204
+#: src/file-manager/fm-directory-view.c:1348
 #, fuzzy
 msgid " (containing 1 item)"
 msgstr "katalog med testfiler"
 
-#: src/file-manager/fm-directory-view.c:1206
+#: src/file-manager/fm-directory-view.c:1350
 #, fuzzy, c-format
 msgid " (containing %d items)"
 msgstr "katalog med testfiler"
 
-#: src/file-manager/fm-directory-view.c:1217
+#: src/file-manager/fm-directory-view.c:1361
 #, fuzzy, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "Alt valt"
 
-#: src/file-manager/fm-directory-view.c:1221
+#: src/file-manager/fm-directory-view.c:1365
 #, fuzzy, c-format
 msgid "%d items selected (%s)"
 msgstr "Ingen element valt."
 
-#: src/file-manager/fm-directory-view.c:1228
+#: src/file-manager/fm-directory-view.c:1372
 #, fuzzy, c-format
 msgid "1 other item selected (%s)"
 msgstr "Ingen element valt."
 
-#: src/file-manager/fm-directory-view.c:1231
+#: src/file-manager/fm-directory-view.c:1375
 #, fuzzy, c-format
 msgid "%d other items selected (%s)"
 msgstr "Ingen element valt."
@@ -6157,7 +7168,7 @@ msgstr "Ingen element valt."
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1260
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr ""
@@ -6166,233 +7177,367 @@ msgstr ""
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1387
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
 "will not be displayed."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1394
+#: src/file-manager/fm-directory-view.c:1537
 #, fuzzy
 msgid "Too Many Files"
 msgstr "For mange feil"
 
-#: src/file-manager/fm-directory-view.c:2591
-#, c-format
+#: src/file-manager/fm-directory-view.c:2752
+#, fuzzy, c-format
 msgid ""
-"\"%s\" cannot be moved to the trash. Do you want to delete it immediately?"
+"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
 msgstr ""
+"Den valte fila er ikkje køyrbar.\n"
+"Vil du velja ei anna fil?"
 
-#: src/file-manager/fm-directory-view.c:2596
+#: src/file-manager/fm-directory-view.c:2757
 #, fuzzy, c-format
 msgid ""
-"The %d selected items cannot be moved to the trash. Do you want to delete "
+"The %d selected items cannot be moved to the Trash. Do you want to delete "
 "them immediately?"
 msgstr ""
 "Den valte fila er ikkje køyrbar.\n"
 "Vil du velja ei anna fil?"
 
-#: src/file-manager/fm-directory-view.c:2600
-#, c-format
+#: src/file-manager/fm-directory-view.c:2761
+#, fuzzy, c-format
 msgid ""
-"%d of the selected items cannot be moved to the trash. Do you want to delete "
+"%d of the selected items cannot be moved to the Trash. Do you want to delete "
 "those %d items immediately?"
 msgstr ""
+"Den valte fila er ikkje køyrbar.\n"
+"Vil du velja ei anna fil?"
 
-#: src/file-manager/fm-directory-view.c:2608
+#: src/file-manager/fm-directory-view.c:2769
 #, fuzzy
 msgid "Delete Immediately?"
 msgstr "Fjern oppføring"
 
-#: src/file-manager/fm-directory-view.c:2609
-#: src/file-manager/fm-directory-view.c:2650
-msgid "Delete"
-msgstr "Slett"
-
-#: src/file-manager/fm-directory-view.c:2639
+#: src/file-manager/fm-directory-view.c:2799
 #, fuzzy, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
+msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr "Er du sikker på at du vil sletta denne overføringa?"
 
-#: src/file-manager/fm-directory-view.c:2643
+#: src/file-manager/fm-directory-view.c:2803
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"trash?"
+"Trash?"
 msgstr "Er du sikker på at du vil sletta denne mappa?"
 
-#: src/file-manager/fm-directory-view.c:2649
+#: src/file-manager/fm-directory-view.c:2809
 #, fuzzy
 msgid "Delete From Trash?"
 msgstr "Fjern ramme"
 
-#: src/file-manager/fm-directory-view.c:2922
-#: src/file-manager/fm-directory-view.c:2963
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, fuzzy, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Slettar den valte fila"
 
-#: src/file-manager/fm-directory-view.c:2961
-#, fuzzy, c-format
-msgid "%s Viewer"
-msgstr "Visar"
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#, fuzzy
+msgid "Other _Application..."
+msgstr "Start program"
 
-#: src/file-manager/fm-directory-view.c:3165
+#: src/file-manager/fm-directory-view.c:3232
 #, fuzzy
-msgid "Open in _New Window"
-msgstr "&Opna i eige vindauge"
+msgid "An _Application..."
+msgstr "Start program"
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#, fuzzy
+msgid "Other _Viewer..."
+msgstr "&Postvisar ..."
 
-#: src/file-manager/fm-directory-view.c:3167
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "&Postvisar ..."
+
+#: src/file-manager/fm-directory-view.c:3451
 #, fuzzy, c-format
-msgid "Open in %d _New Windows"
+msgid "Run \"%s\" on any selected items"
+msgstr "Slettar den valte fila"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "Lar deg endra den valte kontoen"
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"Den valte fila er ikkje køyrbar.\n"
+"Vil du velja ei anna fil?"
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
 msgstr "&Opna i eige vindauge"
 
-#: src/file-manager/fm-directory-view.c:3193
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 #, fuzzy
-msgid "Delete all selected items permanently"
-msgstr "Slett den valte oppgåva eller variabelen."
+msgid "Open _in New Window"
+msgstr "&Opna i eige vindauge"
+
+#: src/file-manager/fm-directory-view.c:3959
+#, fuzzy, c-format
+msgid "Open _in %d New Windows"
+msgstr "&Opna i eige vindauge"
 
-#: src/file-manager/fm-directory-view.c:3198
+#: src/file-manager/fm-directory-view.c:3977
 #, fuzzy
 msgid "Delete from _Trash..."
 msgstr "Slett mappe ..."
 
-#: src/file-manager/fm-directory-view.c:3199
+#: src/file-manager/fm-directory-view.c:3977
 #, fuzzy
 msgid "Delete from _Trash"
 msgstr "Lag frå botnen av"
 
-#: src/file-manager/fm-directory-view.c:3203
+#: src/file-manager/fm-directory-view.c:3979
 #, fuzzy
-msgid "Move all selected items to the Trash"
-msgstr "Flyttar valt tekst/element til utklippstavla"
+msgid "Delete all selected items permanently"
+msgstr "Slett den valte oppgåva eller variabelen."
 
-#: src/file-manager/fm-directory-view.c:3207
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 #, fuzzy
 msgid "Move to _Trash"
 msgstr "&Flytt til papirkorga"
 
-#: src/file-manager/fm-directory-view.c:3237
+#: src/file-manager/fm-directory-view.c:3984
+#, fuzzy
+msgid "Move all selected items to the Trash"
+msgstr "Flyttar valt tekst/element til utklippstavla"
+
+#: src/file-manager/fm-directory-view.c:4015
 #, fuzzy
-msgid "Create _Links"
+msgid "De_lete..."
+msgstr "Slett"
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "Slett"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "Lag hyperlenkje"
 
-#: src/file-manager/fm-directory-view.c:3238
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 #, fuzzy
-msgid "Create _Link"
+msgid "Make _Link"
 msgstr "Lag hyperlenkje"
 
-#: src/file-manager/fm-directory-view.c:3256
+#: src/file-manager/fm-directory-view.c:4056
 #, fuzzy
 msgid "_Empty Trash..."
 msgstr "Tøm papirkorga"
 
-#: src/file-manager/fm-directory-view.c:3257
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Empty Trash"
 msgstr "Tøm papirkorga"
 
-#: src/file-manager/fm-directory-view.c:3268
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 #, fuzzy
 msgid "R_emove Custom Images"
 msgstr "Fjern kommando"
 
-#: src/file-manager/fm-directory-view.c:3269
+#: src/file-manager/fm-directory-view.c:4069
 #, fuzzy
 msgid "R_emove Custom Image"
 msgstr "Fjern kommando"
 
-#: src/file-manager/fm-directory-view.c:3422
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "Fil"
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr " filer"
+
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "&Kopier tekst"
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "Kopierer filer ..."
+
+#: src/file-manager/fm-directory-view.c:4252
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
-"link in the trash?"
+"link in the Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3425
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to put this link in the trash?"
+"want to put this link in the Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3431
+#: src/file-manager/fm-directory-view.c:4261
 #, fuzzy
 msgid "Broken Link"
 msgstr "Broten"
 
-#: src/file-manager/fm-directory-view.c:3432
+#: src/file-manager/fm-directory-view.c:4262
 #, fuzzy
 msgid "Throw Away"
 msgstr "Vis igjen"
 
-#: src/file-manager/fm-directory-view.c:3485
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
 "contents?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:4321
 #, fuzzy
 msgid "Run or Display?"
 msgstr "&Fjern vising"
 
-#: src/file-manager/fm-directory-view.c:3492
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "Køyr"
 
-#: src/file-manager/fm-directory-view.c:3493
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "Vis"
 
-#: src/file-manager/fm-directory-view.c:3496
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: src/file-manager/fm-directory-view.c:3542
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3543
+#: src/file-manager/fm-directory-view.c:4379
 #, fuzzy
 msgid "Can't execute remote links"
 msgstr "Kopla til nettverksvert"
 
-#: src/file-manager/fm-directory-view.c:3674
+#: src/file-manager/fm-directory-view.c:4513
 #, fuzzy, c-format
 msgid "Opening \"%s\""
 msgstr "Sender %1"
 
-#: src/file-manager/fm-directory-view.c:3680
+#: src/file-manager/fm-directory-view.c:4519
 #, fuzzy
 msgid "Cancel Open?"
 msgstr "&Avbryt operasjon"
 
-#: src/file-manager/fm-error-reporting.c:56
+#: src/file-manager/fm-error-reporting.c:58
 #, fuzzy, c-format
 msgid ""
 "You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr ""
 "Du har ikkje løyve til å endra snill-verdien for den valte prosessen.\n"
 
-#: src/file-manager/fm-error-reporting.c:63
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:66
+#: src/file-manager/fm-error-reporting.c:72
 #, fuzzy
 msgid "Error Displaying Folder"
 msgstr "Skjermbehandlar for KDE"
 
-#: src/file-manager/fm-error-reporting.c:89
+#: src/file-manager/fm-error-reporting.c:103
 #, fuzzy, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
@@ -6400,50 +7545,49 @@ msgstr ""
 "Eit filter med dette namnet finst alt.\n"
 "Bruk eit anna namn."
 
-#: src/file-manager/fm-error-reporting.c:94
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:113
 #, fuzzy, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr ""
 "Du har ikkje leseløyve til fila:\n"
 "%s"
 
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:108
+#: src/file-manager/fm-error-reporting.c:122
 #, fuzzy, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr ""
 "Eit filter med dette namnet finst alt.\n"
 "Bruk eit anna namn."
 
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#. fall through
-#: src/file-manager/fm-error-reporting.c:122
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:128
+#: src/file-manager/fm-error-reporting.c:144
 #, fuzzy
 msgid "Renaming Error"
 msgstr "Områdefeil"
 
-#: src/file-manager/fm-error-reporting.c:148
+#: src/file-manager/fm-error-reporting.c:164
 #, fuzzy, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
@@ -6451,60 +7595,60 @@ msgstr ""
 "Du har ikkje leseløyve til fila:\n"
 "%s"
 
-#: src/file-manager/fm-error-reporting.c:152
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:180
 #, fuzzy
 msgid "Error Setting Group"
 msgstr "Feil ved lesing av gruppe:"
 
-#: src/file-manager/fm-error-reporting.c:186
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:193
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:196
+#: src/file-manager/fm-error-reporting.c:212
 #, fuzzy
 msgid "Error Setting Owner"
 msgstr "Feil ved henting av CDDB-oppføring."
 
-#: src/file-manager/fm-error-reporting.c:218
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:225
+#: src/file-manager/fm-error-reporting.c:241
 #, fuzzy, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr ""
 "Kunne ikkje endra løyve for\n"
 "%1"
 
-#: src/file-manager/fm-error-reporting.c:228
+#: src/file-manager/fm-error-reporting.c:244
 #, fuzzy
 msgid "Error Setting Permissions"
 msgstr "Utilstrekkelege løyve"
 
-#: src/file-manager/fm-error-reporting.c:294
+#: src/file-manager/fm-error-reporting.c:310
 #, fuzzy, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Omdøyper til %1"
 
-#: src/file-manager/fm-error-reporting.c:299
+#: src/file-manager/fm-error-reporting.c:315
 #, fuzzy
 msgid "Cancel Rename?"
 msgstr "Endra tabellnamn"
@@ -6571,135 +7715,130 @@ msgid ""
 "information appears as you zoom in closer."
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:157
-#: src/file-manager/nautilus-icon-view-ui.xml.h:38
+#: src/file-manager/fm-icon-view.c:168
 #, fuzzy
 msgid "by _Name"
 msgstr "PÃ¥ namn"
 
-#: src/file-manager/fm-icon-view.c:158
-#: src/file-manager/nautilus-icon-view-ui.xml.h:7
+#: src/file-manager/fm-icon-view.c:169
+#: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:164
-#: src/file-manager/nautilus-icon-view-ui.xml.h:39
+#: src/file-manager/fm-icon-view.c:175
 #, fuzzy
 msgid "by _Size"
 msgstr "på storleik"
 
-#: src/file-manager/fm-icon-view.c:165
-#: src/file-manager/nautilus-icon-view-ui.xml.h:8
+#: src/file-manager/fm-icon-view.c:176
+#: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:171
-#: src/file-manager/nautilus-icon-view-ui.xml.h:40
+#: src/file-manager/fm-icon-view.c:182
 #, fuzzy
 msgid "by _Type"
 msgstr "på type"
 
-#: src/file-manager/fm-icon-view.c:172
-#: src/file-manager/nautilus-icon-view-ui.xml.h:9
+#: src/file-manager/fm-icon-view.c:183
+#: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:178
-#: src/file-manager/nautilus-icon-view-ui.xml.h:33
+#: src/file-manager/fm-icon-view.c:189
 #, fuzzy
 msgid "by Modification _Date"
 msgstr "Endringsdato"
 
-#: src/file-manager/fm-icon-view.c:179
-#: src/file-manager/nautilus-icon-view-ui.xml.h:6
+#: src/file-manager/fm-icon-view.c:190
+#: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:185
-#: src/file-manager/nautilus-icon-view-ui.xml.h:37
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:186
-#: src/file-manager/nautilus-icon-view-ui.xml.h:5
+#: src/file-manager/fm-icon-view.c:197
+#: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:1221
-#: src/file-manager/nautilus-icon-view-ui.xml.h:27
+#: src/file-manager/fm-icon-view.c:1241
+#: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:1222
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:1436
+#: src/file-manager/fm-icon-view.c:1489
 #, fuzzy, c-format
 msgid "pointing at \"%s\""
 msgstr "Koplar til: %1"
 
-#: src/file-manager/fm-list-view.c:1956
-#: src/file-manager/fm-search-list-view.c:505
+#: src/file-manager/fm-list-view.c:2188
+#: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Storleik"
 
-#: src/file-manager/fm-list-view.c:1962
-#: src/file-manager/fm-search-list-view.c:511
+#: src/file-manager/fm-list-view.c:2194
+#: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Type"
 
-#: src/file-manager/fm-list-view.c:1968
-#: src/file-manager/fm-search-list-view.c:517
+#: src/file-manager/fm-list-view.c:2200
+#: src/file-manager/fm-search-list-view.c:569
 #, fuzzy
 msgid "Date Modified"
 msgstr "Sist endra"
 
-#: src/file-manager/fm-properties-window.c:514
+#: src/file-manager/fm-properties-window.c:522
 #, fuzzy, c-format
 msgid "%s Properties"
 msgstr "Eigenskapar"
 
-#: src/file-manager/fm-properties-window.c:709
+#: src/file-manager/fm-properties-window.c:717
 msgid "Cancel Group Change?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:710
+#: src/file-manager/fm-properties-window.c:718
 #, fuzzy
 msgid "Changing group"
 msgstr "Eigargruppe"
 
-#: src/file-manager/fm-properties-window.c:871
+#: src/file-manager/fm-properties-window.c:879
 #, fuzzy
 msgid "Cancel Owner Change?"
 msgstr "&Avbryt operasjon"
 
-#: src/file-manager/fm-properties-window.c:872
+#: src/file-manager/fm-properties-window.c:880
 #, fuzzy
 msgid "Changing owner"
 msgstr "Endra skrift"
 
-#: src/file-manager/fm-properties-window.c:1047
+#: src/file-manager/fm-properties-window.c:1063
 #, fuzzy
 msgid "nothing"
 msgstr "<ingenting>"
 
-#: src/file-manager/fm-properties-window.c:1049
+#: src/file-manager/fm-properties-window.c:1065
 #, fuzzy
 msgid "unreadable"
 msgstr "utilgjengeleg"
 
-#: src/file-manager/fm-properties-window.c:1058
+#: src/file-manager/fm-properties-window.c:1074
 #, c-format
 msgid "1 item, with size %s"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1060
+#: src/file-manager/fm-properties-window.c:1076
 #, c-format
 msgid "%d items, totalling %s"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1066
+#: src/file-manager/fm-properties-window.c:1082
 msgid "(some contents unreadable)"
 msgstr ""
 
@@ -6708,246 +7847,247 @@ msgstr ""
 #. * "Contents:" title to line up with the first line of the 2-line value.
 #. * Maybe there's a better way to do this, but I couldn't think of one.
 #.
-#: src/file-manager/fm-properties-window.c:1080
+#: src/file-manager/fm-properties-window.c:1096
 #, fuzzy
 msgid "Contents:"
 msgstr "Innhald"
 
-#: src/file-manager/fm-properties-window.c:1412
+#: src/file-manager/fm-properties-window.c:1443
 #, fuzzy
 msgid "Basic"
 msgstr "Basis"
 
-#: src/file-manager/fm-properties-window.c:1491
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Type:"
 
-#: src/file-manager/fm-properties-window.c:1496
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "Storleik:"
 
-#: src/file-manager/fm-properties-window.c:1498
-msgid "Where:"
-msgstr "Kvar:"
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "Linjer"
 
-#: src/file-manager/fm-properties-window.c:1500
+#: src/file-manager/fm-properties-window.c:1534
 #, fuzzy
-msgid "MIME type:"
+msgid "MIME Type:"
 msgstr "MIME-type"
 
-#: src/file-manager/fm-properties-window.c:1506
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "Endra:"
 
-#: src/file-manager/fm-properties-window.c:1509
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "Brukt:"
 
-#: src/file-manager/fm-properties-window.c:1518
+#: src/file-manager/fm-properties-window.c:1552
 #, fuzzy
 msgid "Select Custom Icon..."
 msgstr "Vel ikon"
 
-#: src/file-manager/fm-properties-window.c:1524
+#: src/file-manager/fm-properties-window.c:1558
 #, fuzzy
 msgid "Remove Custom Icon"
 msgstr "Fjern kolonne"
 
-#: src/file-manager/fm-properties-window.c:1848
+#: src/file-manager/fm-properties-window.c:1886
 #, fuzzy
 msgid "Set User ID"
 msgstr "Set UID"
 
-#: src/file-manager/fm-properties-window.c:1853
+#: src/file-manager/fm-properties-window.c:1891
 #, fuzzy
 msgid "Special Flags:"
 msgstr "Lim inn spesiell"
 
-#: src/file-manager/fm-properties-window.c:1856
+#: src/file-manager/fm-properties-window.c:1894
 #, fuzzy
 msgid "Set Group ID"
 msgstr " Gruppe "
 
-#: src/file-manager/fm-properties-window.c:1858
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "Sett fast"
 
-#: src/file-manager/fm-properties-window.c:1884
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Rettar"
 
-#: src/file-manager/fm-properties-window.c:1890
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1903
+#: src/file-manager/fm-properties-window.c:1941
 #, fuzzy
 msgid "File Owner:"
 msgstr "Fil under:"
 
-#: src/file-manager/fm-properties-window.c:1912
+#: src/file-manager/fm-properties-window.c:1950
 #, fuzzy
 msgid "File Group:"
 msgstr "Gruppe:"
 
-#: src/file-manager/fm-properties-window.c:1930
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "Eigar:"
 
-#: src/file-manager/fm-properties-window.c:1931
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: src/file-manager/fm-properties-window.c:1932
+#: src/file-manager/fm-properties-window.c:1970
 #, fuzzy
 msgid "Others:"
 msgstr "Andre"
 
-#: src/file-manager/fm-properties-window.c:1951
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "Lest"
 
-#: src/file-manager/fm-properties-window.c:1955
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "Skriv"
 
-#: src/file-manager/fm-properties-window.c:1959
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "Køyr"
 
-#: src/file-manager/fm-properties-window.c:2010
+#: src/file-manager/fm-properties-window.c:2048
 #, fuzzy
 msgid "Text View:"
 msgstr "Tekstlinjer:"
 
-#: src/file-manager/fm-properties-window.c:2011
+#: src/file-manager/fm-properties-window.c:2049
 #, fuzzy
 msgid "Number View:"
 msgstr "Tal:"
 
-#: src/file-manager/fm-properties-window.c:2012
+#: src/file-manager/fm-properties-window.c:2050
 #, fuzzy
 msgid "Last Changed:"
 msgstr "Siste hand: "
 
-#: src/file-manager/fm-properties-window.c:2016
+#: src/file-manager/fm-properties-window.c:2054
 #, fuzzy, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Kunne ikkje lagra adresseboka."
 
-#: src/file-manager/fm-properties-window.c:2263
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2264
+#: src/file-manager/fm-properties-window.c:2335
 #, fuzzy
 msgid "Creating Properties window"
 msgstr "Lagar pot-fil i /po ..."
 
-#: src/file-manager/fm-properties-window.c:2357
+#: src/file-manager/fm-properties-window.c:2435
 #, fuzzy
 msgid "Select an icon:"
 msgstr "Utval:"
 
-#: src/file-manager/fm-search-list-view.c:125
+#: src/file-manager/fm-search-list-view.c:124
+#, fuzzy
+msgid "Search Results"
+msgstr "&Søkeresultat:"
+
+#: src/file-manager/fm-search-list-view.c:142
 #, c-format
 msgid ""
 "Search results may not include items modified after %s, when your drive was "
 "last indexed."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:140
+#: src/file-manager/fm-search-list-view.c:158
 msgid ""
 "Sorry, but the Medusa search service is not available because it is not "
 "installed."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:141
-#: src/file-manager/nautilus-indexing-info.c:332
+#: src/file-manager/fm-search-list-view.c:159
+#: src/file-manager/nautilus-indexing-info.c:407
 #, fuzzy
 msgid "Search Service Not Available"
 msgstr "artikkelen er ikkje tilgjengeleg"
 
-#: src/file-manager/fm-search-list-view.c:145
-#, fuzzy
-msgid "Search Results"
-msgstr "&Søkeresultat:"
-
 #. FIXME bugzilla.eazel.com 5058: Should be two messages, one for each of whether
 #. "slow complete search" turned on or not
-#: src/file-manager/fm-search-list-view.c:166
+#: src/file-manager/fm-search-list-view.c:184
 msgid ""
 "The search you have selected is newer than the index on your system.  The "
 "search will return no results right now.  Would you like to create a new "
 "index now?"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:171
+#: src/file-manager/fm-search-list-view.c:189
 msgid "Search for items that are too new"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:172
+#: src/file-manager/fm-search-list-view.c:190
 #, fuzzy
 msgid "Create a new index"
 msgstr "Lagar ei ny fil"
 
-#: src/file-manager/fm-search-list-view.c:173
+#: src/file-manager/fm-search-list-view.c:191
 #, fuzzy
 msgid "Don't create index"
 msgstr "Kunne ikkje laga gyldig sokkel"
 
-#: src/file-manager/fm-search-list-view.c:182
+#: src/file-manager/fm-search-list-view.c:200
 msgid ""
 "Every indexed file on your computer matches the criteria you selected. You "
 "can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:186
-#: src/file-manager/fm-search-list-view.c:198
+#: src/file-manager/fm-search-list-view.c:204
+#: src/file-manager/fm-search-list-view.c:218
 #, fuzzy
 msgid "Error during search"
 msgstr "Feil ved skriving av fil!"
 
-#: src/file-manager/fm-search-list-view.c:193
+#: src/file-manager/fm-search-list-view.c:213
 #, fuzzy, c-format
 msgid "An error occurred while loading this search's contents: %s"
 msgstr "Ein feil oppsto ved lasting av brikkesett-fila\n"
 
-#: src/file-manager/fm-search-list-view.c:221
+#: src/file-manager/fm-search-list-view.c:241
 msgid ""
 "To do a fast search, Find requires an index of the files on your system.  "
 "Find can't access your index right now so a slower search will be performed "
 "that doesn't use the index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:226
+#: src/file-manager/fm-search-list-view.c:246
 msgid ""
-"To do a content search, Find requires an index of thie files on your system. "
-" Find can't access your index right now. "
+"To do a content search, Find requires an index of the files on your system.  "
+"Find can't access your index right now. "
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:230
+#: src/file-manager/fm-search-list-view.c:250
 #, fuzzy
 msgid "Fast searches are not available"
 msgstr "artikkelen er ikkje tilgjengeleg"
 
-#: src/file-manager/fm-search-list-view.c:231
-#: src/file-manager/fm-search-list-view.c:271
-#: src/file-manager/fm-search-list-view.c:299
-#: src/file-manager/fm-search-list-view.c:318
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:319
+#: src/file-manager/fm-search-list-view.c:338
 #, fuzzy
 msgid "Content searches are not available"
 msgstr "artikkelen er ikkje tilgjengeleg"
 
-#: src/file-manager/fm-search-list-view.c:234
+#: src/file-manager/fm-search-list-view.c:254
 msgid ""
 "Your index files are available but the Medusa search daemon, which handles "
 "index requests, isn't running.  To start this program, log in as root and "
 "enter this command at the command line: medusa-searchd"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:254
+#: src/file-manager/fm-search-list-view.c:274
 msgid ""
 "To do a fast search, Find requires an index of the files on your system.  "
 "Your computer does not have an index right now.  Because Find cannot use an "
@@ -6956,7 +8096,7 @@ msgid ""
 "computer."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:263
+#: src/file-manager/fm-search-list-view.c:283
 msgid ""
 "To do a content search, Find requires an index of the content on your "
 "system.  Your computer does not have an index right now.  Would you like to "
@@ -6964,56 +8104,94 @@ msgid ""
 "using your computer."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:270
-#: src/file-manager/fm-search-list-view.c:298
-#: src/file-manager/fm-search-list-view.c:317
+#: src/file-manager/fm-search-list-view.c:290
+#: src/file-manager/fm-search-list-view.c:318
+#: src/file-manager/fm-search-list-view.c:337
 #, fuzzy
 msgid "Indexed searches are not available"
 msgstr "artikkelen er ikkje tilgjengeleg"
 
-#: src/file-manager/fm-search-list-view.c:274
+#: src/file-manager/fm-search-list-view.c:294
 #, fuzzy
 msgid "Create an Index"
 msgstr "Gjenskapar bandindeks"
 
-#: src/file-manager/fm-search-list-view.c:275
+#: src/file-manager/fm-search-list-view.c:295
 msgid "Don't Create an Index Now"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:286
+#: src/file-manager/fm-search-list-view.c:306
 msgid ""
 "To do a fast search, Find requires an index of the files on your system.  "
 "Your computer is currently creating that index.   Because Find cannot use an "
 "index, this search may take several minutes."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:292
+#: src/file-manager/fm-search-list-view.c:312
 msgid ""
 "To do a content search, Find requires an index of the content on your "
 "system.  Your computer is currently creating that index.  Content searches "
 "will be available when the index is complete."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:306
+#: src/file-manager/fm-search-list-view.c:326
 msgid ""
 "To do a fast search, Find requires an index of the files on your system.  An "
 "index can't be created right now. When an index is not available, searches "
 "will take several minutes."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:312
+#: src/file-manager/fm-search-list-view.c:332
 msgid ""
 "To do a content search, Find requires an index of the content on your "
 "system.  An index can't be created right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:321
+#: src/file-manager/fm-search-list-view.c:341
 msgid ""
 "The program that creates an index is not set up correctly.  You can create "
 "an index by hand by running \"medusa-indexd\" as root on the command line."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:499
+#. It is not necessary to translate this text just yet; it has not been
+#. edited yet, and will be replaced by a final copy in a few days.
+#: src/file-manager/fm-search-list-view.c:360
+#: src/file-manager/nautilus-indexing-info.c:342
+msgid ""
+"To do a fast search, Find requires an index of the files on your system. "
+"Your system administrator has disabled fast search on your computer, so no "
+"index is available."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:364
+#, fuzzy
+msgid "Fast searches are not available on your computer"
+msgstr "artikkelen er ikkje tilgjengeleg"
+
+#: src/file-manager/fm-search-list-view.c:373
+#: src/file-manager/nautilus-indexing-info.c:361
+msgid ""
+"To do a fast search, Find requires an index of the files on your system. "
+"Fast search is disabled in your Search preferences, so no index is available."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:376
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
+#, fuzzy
+msgid "Fast searches are not available on your computer."
+msgstr "artikkelen er ikkje tilgjengeleg"
+
+#: src/file-manager/fm-search-list-view.c:377
+#: src/file-manager/nautilus-indexing-info.c:366
+msgid ""
+"To enable fast search, open the Preferences menu and choose Preferences. "
+"Then select Search preferences and put a checkmark in the Enable Fast Search "
+"checkbox. An index will be generated while your computer is idle, so your "
+"index won't be available immediately."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:551
 #, fuzzy
 msgid "Where"
 msgstr "Kvar:"
@@ -7023,7 +8201,7 @@ msgstr "Kvar:"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:551
+#: src/file-manager/fm-search-list-view.c:603
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 #, fuzzy
 msgid "_Reveal in New Window"
@@ -7035,7 +8213,7 @@ msgstr "Name=Opna nytt vindauge"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:559
+#: src/file-manager/fm-search-list-view.c:611
 #, fuzzy, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Name=Opna nytt vindauge"
@@ -7044,13 +8222,13 @@ msgstr "Name=Opna nytt vindauge"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:671
+#: src/file-manager/fm-search-list-view.c:723
 msgid ""
 "Nautilus found more search results than it can display. Some matching items "
 "will not be displayed. "
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:673
+#: src/file-manager/fm-search-list-view.c:725
 #, fuzzy
 msgid "Too Many Matches"
 msgstr "For mange feil"
@@ -7061,9 +8239,9 @@ msgid "Change Desktop Background"
 msgstr "Endra bakgrunn"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 #, fuzzy
-msgid "Delete all items in the trash"
+msgid "Delete all items in the Trash"
 msgstr "Flytta alle meldingar til papirkorga"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
@@ -7117,372 +8295,449 @@ msgstr "Vel namnet på programmet du vil opna dei valde filene med."
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
 #, fuzzy
-msgid "Create Link"
-msgstr "Lag hyperlenkje"
+msgid "Copy Files"
+msgstr "Kopierer filer ..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
 msgid "Create a new empty folder inside this folder"
 msgstr "Lag ny bokmerkemappe i denne menyen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr " filer"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "Flyttar utvalet til høgre"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "Lag kopi"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 #, fuzzy
 msgid "Duplicate each selected item"
 msgstr "Slettar den valte fila"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 #, fuzzy
-msgid "Move each selected item to the trash"
+msgid "Make Link"
+msgstr "Lag hyperlenkje"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#, fuzzy
+msgid "Move each selected item to the Trash"
 msgstr "Flyttar utvalet til høgre"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 #, fuzzy
 msgid "Move to Trash"
 msgstr "&Flytt til papirkorga"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "Ny mappe"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
-#, fuzzy
-msgid "New _Folder"
-msgstr "Ny mappe"
-
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "Opna"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#, fuzzy
+msgid "Open Wit_h"
+msgstr "Opna med"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "Opna med"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a new window"
 msgstr "Opna filer i nytt vindauge"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in New Window"
 msgstr "&Opna i eige vindauge"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 #, fuzzy
 msgid "Open the selected item in this window"
 msgstr "Køyr den valte oppgåva no."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 #, fuzzy
 msgid "Other Application..."
 msgstr "Start program"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 #, fuzzy
 msgid "Other Viewer..."
 msgstr "&Postvisar ..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 #, fuzzy
-msgid "Other _Application..."
-msgstr "Start program"
+msgid "Paste Files"
+msgstr "Skriv tekst"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-#, fuzzy
-msgid "Other _Viewer..."
-msgstr "&Postvisar ..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 #, fuzzy
 msgid "Remove Custom Images"
 msgstr "Fjern kommando"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 #, fuzzy
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr "Her kan du velja fargen på bakgrunnen til diagrammet."
 
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 #, fuzzy
 msgid "Reset Background"
 msgstr "Sett bakgrunn"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#, fuzzy
+msgid "Scripts"
+msgstr "Poengsum"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 #, fuzzy
 msgid "Select All Files"
 msgstr "Valte filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#, fuzzy
+msgid "Select _All Files"
+msgstr "Valte filer"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #, fuzzy
 msgid "Show Properties"
 msgstr "Eigenskapar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 #, fuzzy
 msgid "Show Trash"
 msgstr "Vis t&rådar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 #, fuzzy
 msgid "Show _Properties"
 msgstr "Eigenskapar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 #, fuzzy
-msgid "Show the contents of the trash"
+msgid "Show the contents of the Trash"
 msgstr "vis alternativt innhald som vedlegg"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 #, fuzzy
 msgid "_Duplicate"
 msgstr "Lag kopi"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#, fuzzy
+msgid "_New Folder"
+msgstr "Ny mappe"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 #, fuzzy
 msgid "_Open"
 msgstr "Opna"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
-#, fuzzy
-msgid "_Open in New Window"
-msgstr "&Opna i eige vindauge"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 #, fuzzy
-msgid "_Select All Files"
-msgstr "Valte filer"
+msgid "_Paste Files"
+msgstr "Skriv tekst"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 #, fuzzy
 msgid "_Show Trash"
 msgstr "Vis t&rådar"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#, fuzzy
+msgid "By Emblems"
+msgstr "Døme"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:2
+#, fuzzy
+msgid "By Modification Date"
+msgstr "Endringsdato"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:3
+#, fuzzy
+msgid "By Modification _Date"
+msgstr "Endringsdato"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:4
+#, fuzzy
+msgid "By Name"
+msgstr "PÃ¥ namn"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:5
+#, fuzzy
+msgid "By Size"
+msgstr "på storleik"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:6
+#, fuzzy
+msgid "By Type"
+msgstr "på type"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:7
+#, fuzzy
+msgid "By _Emblems"
+msgstr "Døme"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:8
+#, fuzzy
+msgid "By _Name"
+msgstr "PÃ¥ namn"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:9
+#, fuzzy
+msgid "By _Size"
+msgstr "på storleik"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:10
+#, fuzzy
+msgid "By _Type"
+msgstr "på type"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:11
 msgid "Choose which information appears beneath each icon's name"
 msgstr ""
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:2
+#: src/file-manager/nautilus-icon-view-ui.xml.h:12
 #, fuzzy
 msgid "Clean Up by Name"
 msgstr "R&ensk mellomrom"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:3
+#: src/file-manager/nautilus-icon-view-ui.xml.h:13
 #, fuzzy
 msgid "Display icons in the opposite order"
 msgstr "Vis i &redigerar"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:4
+#: src/file-manager/nautilus-icon-view-ui.xml.h:14
 #, fuzzy
 msgid "Icon Captions..."
 msgstr "Val ..."
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:10
+#: src/file-manager/nautilus-icon-view-ui.xml.h:20
 #, fuzzy
-msgid "Lay out items"
+msgid "Lay Out Items"
 msgstr "Stil"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:11
+#: src/file-manager/nautilus-icon-view-ui.xml.h:21
 msgid "Leave icons wherever they are dropped"
 msgstr ""
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:12
+#: src/file-manager/nautilus-icon-view-ui.xml.h:22
 #, fuzzy
 msgid "Make the selected icon stretchable"
 msgstr "Flyttar utvalet til venstre"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:13
+#: src/file-manager/nautilus-icon-view-ui.xml.h:23
+#, fuzzy
+msgid "Manually"
+msgstr "Manuell"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:24
 #, fuzzy
 msgid "Re_versed Order"
 msgstr "&Omvendt rekkjefølgje"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:15
+#: src/file-manager/nautilus-icon-view-ui.xml.h:26
 #, fuzzy
 msgid "Rename selected icon"
 msgstr "Endra namn på valt profil"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:16
+#: src/file-manager/nautilus-icon-view-ui.xml.h:27
 msgid "Reposition icons to better fit in the window and avoid overlapping"
 msgstr ""
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:17
+#: src/file-manager/nautilus-icon-view-ui.xml.h:28
 msgid "Restore Icons' Original Sizes"
 msgstr ""
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:18
+#: src/file-manager/nautilus-icon-view-ui.xml.h:29
 msgid "Restore each selected icon to its original size"
 msgstr ""
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:19
+#: src/file-manager/nautilus-icon-view-ui.xml.h:30
 #, fuzzy
 msgid "Reversed Order"
 msgstr "&Omvendt rekkjefølgje"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:20
+#: src/file-manager/nautilus-icon-view-ui.xml.h:31
 #, fuzzy
 msgid "Stretch Icon"
 msgstr "Vel ikon"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:21
+#: src/file-manager/nautilus-icon-view-ui.xml.h:32
 #, fuzzy
 msgid "Tighter Layout"
 msgstr "Sideutsjånad"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:22
+#: src/file-manager/nautilus-icon-view-ui.xml.h:33
 msgid "Toggle using a tighter layout scheme"
 msgstr ""
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:23
+#: src/file-manager/nautilus-icon-view-ui.xml.h:34
 #, fuzzy
 msgid "_Clean Up by Name"
 msgstr "R&ensk mellomrom"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:24
+#: src/file-manager/nautilus-icon-view-ui.xml.h:35
 #, fuzzy
 msgid "_Icon Captions..."
 msgstr "Val ..."
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:25
+#: src/file-manager/nautilus-icon-view-ui.xml.h:36
 #, fuzzy
-msgid "_Lay out items"
+msgid "_Lay Out Items"
 msgstr "Stil"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:26
+#: src/file-manager/nautilus-icon-view-ui.xml.h:37
+#, fuzzy
+msgid "_Manually"
+msgstr "Manuell"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:38
 #, fuzzy
 msgid "_Rename"
 msgstr "Endra namn"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:28
+#: src/file-manager/nautilus-icon-view-ui.xml.h:40
 #, fuzzy
 msgid "_Stretch Icon"
 msgstr "Vel ikon"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:29
+#: src/file-manager/nautilus-icon-view-ui.xml.h:41
 #, fuzzy
 msgid "_Tighter Layout"
 msgstr "Sideutsjånad"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:30
-#, fuzzy
-msgid "_manually"
-msgstr "Manuell"
-
-#: src/file-manager/nautilus-icon-view-ui.xml.h:31
-msgid "by Emblems"
-msgstr ""
-
-#: src/file-manager/nautilus-icon-view-ui.xml.h:32
-#, fuzzy
-msgid "by Modification Date"
-msgstr "Endringsdato"
-
-#: src/file-manager/nautilus-icon-view-ui.xml.h:34
-#, fuzzy
-msgid "by Name"
-msgstr "PÃ¥ namn"
-
-#: src/file-manager/nautilus-icon-view-ui.xml.h:35
-msgid "by Size"
-msgstr "på storleik"
-
-#: src/file-manager/nautilus-icon-view-ui.xml.h:36
-msgid "by Type"
-msgstr "på type"
-
-#: src/file-manager/nautilus-icon-view-ui.xml.h:41
-#, fuzzy
-msgid "manually"
-msgstr "Manuell"
-
-#: src/file-manager/nautilus-indexing-info.c:83
+#: src/file-manager/nautilus-indexing-info.c:85
 #, fuzzy
 msgid "Indexing is %d%% complete."
 msgstr "Indeksering ferdig."
 
-#: src/file-manager/nautilus-indexing-info.c:146
+#: src/file-manager/nautilus-indexing-info.c:175
 msgid "The indexer is currently busy."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:151
+#: src/file-manager/nautilus-indexing-info.c:180
 msgid ""
 "An indexer is not running, or is not responding to requests to reindex your "
 "computer."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:156
+#: src/file-manager/nautilus-indexing-info.c:185
 msgid ""
 "An attempt to reindex, caused an Internal Indexer Error.  Tell "
 "rebecka@eazel.com"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:165
+#: src/file-manager/nautilus-indexing-info.c:194
 #, fuzzy
 msgid "Reindexing Failed"
 msgstr "Feil ved tilbakespoling av band"
 
-#: src/file-manager/nautilus-indexing-info.c:187
+#: src/file-manager/nautilus-indexing-info.c:216
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. If you need to update your index now, click on the \"Update Now\" "
 "button."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:190
-#: src/file-manager/nautilus-indexing-info.c:197
-#: src/file-manager/nautilus-indexing-info.c:251
+#: src/file-manager/nautilus-indexing-info.c:219
+#: src/file-manager/nautilus-indexing-info.c:226
+#: src/file-manager/nautilus-indexing-info.c:281
 #, fuzzy
 msgid "Indexing Status"
 msgstr "&Flygande status"
 
 #. FIXME: Do we want to talk about the index not being available?
-#: src/file-manager/nautilus-indexing-info.c:195
+#: src/file-manager/nautilus-indexing-info.c:224
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:207
+#: src/file-manager/nautilus-indexing-info.c:236
 #, c-format
 msgid "Your files were last indexed at %s"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:219
+#: src/file-manager/nautilus-indexing-info.c:249
 #, fuzzy
 msgid "Update Now"
 msgstr "Oppdater"
 
-#: src/file-manager/nautilus-indexing-info.c:249
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast.  Your files are currently being indexed."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:331
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:353
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr ""
 
@@ -7510,26 +8765,45 @@ msgid "Show status of indexing used when searching"
 msgstr ""
 
 #. set the window title and standard close key accelerator
-#: src/nautilus-about.c:139
+#: src/nautilus-about.c:141
 #, fuzzy
 msgid "About Nautilus"
 msgstr "Om KMatrix"
 
 #. draw the authors title
-#: src/nautilus-about.c:355
+#: src/nautilus-about.c:361
 msgid "Authors"
 msgstr "Forfattarar"
 
-#: src/nautilus-application.c:274
+#: src/nautilus-application.c:275
 #, fuzzy
 msgid "Couldn't Create Required Folder"
 msgstr "Kunne ikkje laga gyldig sokkel"
 
-#: src/nautilus-application.c:279
+#: src/nautilus-application.c:276
+#, c-format
+msgid ""
+"Nautilus could not create the required folder \"%s\". Before running "
+"Nautilus, please create this folder, or set permissions such that Nautilus "
+"can create it."
+msgstr ""
+
+#: src/nautilus-application.c:281
 #, fuzzy
 msgid "Couldn't Create Required Folders"
 msgstr "Kunne ikkje laga gyldig sokkel"
 
+#: src/nautilus-application.c:282
+#, c-format
+msgid ""
+"Nautilus could not create the following required folders:\n"
+"\n"
+"%s\n"
+"\n"
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
+msgstr ""
+
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.oaf file. This has happened when you
 #. * launch Nautilus with an LD_LIBRARY_PATH that
@@ -7540,23 +8814,28 @@ msgstr "Kunne ikkje laga gyldig sokkel"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:404
+#: src/nautilus-application.c:407
 msgid ""
-"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
-"again may fix the problem."
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again."
 msgstr ""
 
 #. FIXME bugzilla.eazel.com 2536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:408
+#: src/nautilus-application.c:413
 msgid ""
-"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
-"again may fix the problem.\n"
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again.\n"
 "\n"
 "OAF couldn't locate the Nautilus_shell.oaf file. One cause of this seems to "
 "be an LD_LIBRARY_PATH that does not include the oaf library's directory. "
 "Another possible cause would be bad install with a missing "
 "Nautilus_Shell.oaf file.\n"
 "\n"
+"Running \"nautilus-clean.sh -x\" will kill all OAF and GConf processes, "
+"which may be needed by other applications.\n"
+"\n"
 "Sometimes killing oafd and gconfd fixes the problem, but we don't know why.\n"
 "\n"
 "We have also seen this error when a faulty version of oaf was installed."
@@ -7571,32 +8850,32 @@ msgstr ""
 #. * wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:434 src/nautilus-application.c:452
-#: src/nautilus-application.c:459
+#: src/nautilus-application.c:444 src/nautilus-application.c:462
+#: src/nautilus-application.c:469
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr ""
 
-#: src/nautilus-application.c:435
+#: src/nautilus-application.c:445
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
 "attempting to register the file manager view server."
 msgstr ""
 
-#: src/nautilus-application.c:453
+#: src/nautilus-application.c:463
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
 "attempting to locate the factory.Killing oafd and restarting Nautilus may "
 "help fix the problem."
 msgstr ""
 
-#: src/nautilus-application.c:460
+#: src/nautilus-application.c:470
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
 "attempting to locate the shell object. Killing oafd and restarting Nautilus "
 "may help fix the problem."
 msgstr ""
 
-#: src/nautilus-application.c:625
+#: src/nautilus-application.c:635
 msgid ""
 "You are about to run Nautilus as root.\n"
 "\n"
@@ -7604,10 +8883,6 @@ msgid ""
 "Nautilus will not stop you from doing it."
 msgstr ""
 
-#: src/nautilus-application.c:629
-msgid "Quit"
-msgstr "Avslutt"
-
 #: src/nautilus-bookmarks-window.c:127
 msgid "Bookmarks"
 msgstr "Bokmerke"
@@ -7616,7 +8891,7 @@ msgstr "Bokmerke"
 msgid "Location"
 msgstr "Plassering"
 
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:725
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Fjern"
 
@@ -7636,226 +8911,262 @@ msgstr "Generelle val"
 msgid "Find Them!"
 msgstr "Finn tekst"
 
-#: src/nautilus-first-time-druid.c:175
+#: src/nautilus-first-time-druid.c:191
 msgid ""
-"Existence of this file indicates that the Nautilus configuration wizard\n"
+"Existence of this file indicates that the Nautilus configuration druid\n"
 "has been presented.\n"
 "\n"
-"You can manually erase this file to present the wizard again.\n"
+"You can manually erase this file to present the druid again.\n"
 "\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:249 src/nautilus-first-time-druid.c:512
-#, fuzzy
-msgid "Eazel Services"
-msgstr "Tenester"
-
-#: src/nautilus-first-time-druid.c:440
+#: src/nautilus-first-time-druid.c:487
 msgid ""
-"User levels provide a way to adjust the software to your\n"
-"level of technical expertise. Pick an initial level that you\n"
-"feel comfortable with; you can always change it later."
+"Your user level adjusts Nautilus to your degree of experience\n"
+"using GNOME and Linux. Choose a level that's comfortable for\n"
+"you - you can always change it later."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:453
+#: src/nautilus-first-time-druid.c:498
 msgid ""
-"For beginner users that are not yet\n"
-"familiar with the working of GNOME and Linux."
+"For users who have no previous experience with GNOME\n"
+"and Linux."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:460
+#: src/nautilus-first-time-druid.c:504
 msgid ""
-"For non-technical users that are comfortable with\n"
-"their GNOME and Linux environment."
+"For users who are comfortable with GNOME and Linux,\n"
+"but don't describe themselves as ``technical.''"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:466
+#: src/nautilus-first-time-druid.c:510
 msgid ""
-"For users that have the need to be exposed\n"
-"to every detail of their operating system."
+"For users who have GNOME and Linux experience, and\n"
+"like to see every detail of the operating system."
 msgstr ""
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:501
+#: src/nautilus-first-time-druid.c:548
 msgid ""
-"Eazel offers a growing number of services to help you\n"
-"install and maintain new software and manage your files\n"
-"across the network.  Choose an option below, and the\n"
-"information will be presented in Nautilus after you've\n"
-"finished setting up."
+"To verify your Internet connection and make sure you have\n"
+"the latest Nautilus updates, Nautilus will now connect to\n"
+"Eazel's web site. This will take seconds if your copy of\n"
+"Nautilus is recent; longer (but no more than a minute or two)\n"
+"if you need an update.\n"
+"\n"
+"If you know your computer uses a proxy connection, click\n"
+"Verify and Nautilus will use it.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:521
-msgid "I want to learn more about Eazel services."
+#: src/nautilus-first-time-druid.c:562
+msgid "Verify my connection and check for updates"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:523
-msgid "I want to sign up for Eazel services now."
+#: src/nautilus-first-time-druid.c:563
+msgid "Don't verify my connection or check for updates"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:525
-msgid "I've already signed up and want to login now."
+#: src/nautilus-first-time-druid.c:628
+msgid ""
+"We are having trouble making an external web connection.\n"
+"Sometimes, firewalls require you to specify a web proxy server.\n"
+"Fill in the name or port of your proxy server, if any, below."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:527
-msgid "I don't want to learn about Eazel services at this time."
+#: src/nautilus-first-time-druid.c:640
+msgid "No proxy server required."
 msgstr ""
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:554
-msgid ""
-"Nautilus will now contact Eazel services to quickly verify \n"
-"your web connection and download the latest updates. \n"
-"\n"
-"If you know your computer uses a proxy connection, \n"
-"click Yes and Nautilus will use it. \n"
-"\n"
-"Click the Next button to continue."
+#: src/nautilus-first-time-druid.c:641
+msgid "Use this proxy server:"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:560
+#. allocate the proxy label, followed by the entry
+#: src/nautilus-first-time-druid.c:666
 #, fuzzy
-msgid "Updating Nautilus"
-msgstr "Oppdaterer fil-liste"
+msgid "Proxy address:"
+msgstr "IP-adresse:"
 
-#: src/nautilus-first-time-druid.c:568
-msgid "Yes, verify my connection and update Nautilus now."
+#: src/nautilus-first-time-druid.c:728
+msgid "Verifying your Internet connection and checking for updates..."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:569
-msgid "No, don't contact Eazel services at this time."
-msgstr ""
+#: src/nautilus-first-time-druid.c:736
+#, fuzzy
+msgid "Downloading Nautilus updates..."
+msgstr " Lastar ned artikkel ..."
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:631
+#: src/nautilus-first-time-druid.c:906
 msgid ""
-"We are having troubles making an external web connection.  \n"
-"Sometimes, firewalls require you to specify a web proxy server.  \n"
-" Fill in the name of port of your proxy server, if any, below."
+"If you have been using the GNOME Midnight Commander\n"
+"these settings move your desktop icons to Nautilus and\n"
+"make Nautilus the default desktop.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:636
+#: src/nautilus-first-time-druid.c:913
 #, fuzzy
-msgid "HTTP Proxy Configuration"
-msgstr "Sideoppsett"
+msgid "Use Nautilus to draw the desktop."
+msgstr "Klikk på skrivebordet"
 
-#: src/nautilus-first-time-druid.c:648
-msgid "No proxy server required."
+#: src/nautilus-first-time-druid.c:919
+msgid "Move existing desktop icons to the Nautilus desktop."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:649
-msgid "Use this proxy server:"
+#. This option is currently disabled, per bugzilla.eazel.com 7557
+#: src/nautilus-first-time-druid.c:927
+msgid "Launch Nautilus when GNOME starts up."
 msgstr ""
 
-#. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:674
-#, fuzzy
-msgid "Proxy address:"
-msgstr "IP-adresse:"
-
-#. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:691
-msgid "Port:"
-msgstr "Port:"
+#: src/nautilus-first-time-druid.c:967
+msgid ""
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties.  The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+"Fast search requires that the cron daemon on your system be running.\n"
+msgstr ""
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:733
+#: src/nautilus-first-time-druid.c:972
 msgid ""
-"We are now contacting the Eazel service to test your \n"
-"web connection and update Nautilus."
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties. The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:739
-#, fuzzy
-msgid "Downloading Nautilus updates..."
-msgstr " Lastar ned artikkel ..."
+#: src/nautilus-first-time-druid.c:981
+msgid "Enable fast search"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:884
-msgid "Use Nautilus to draw desktop."
+#: src/nautilus-first-time-druid.c:982
+msgid "Turn fast search on when cron is enabled"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:889
-msgid "Transfer GMC desktop icons to Nautilus desktop."
+#: src/nautilus-first-time-druid.c:1027
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"currently can't be performed because the program crond, which does\n"
+"nightly tasks on your computer, is turned off. To make sure fast searches\n"
+"can be done, turn crond on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands \n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:894
-msgid "Launch Nautilus at Gnome session startup."
+#: src/nautilus-first-time-druid.c:1035
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"may not be performed because the program crond, which does nightly tasks\n"
+"on your computer, may be turned off. To make sure fast searches can be\n"
+"done, check to make sure that crond is turned on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands\n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1122
+msgid ""
+"Click Finish to launch Nautilus. You'll start with two\n"
+"Nautilus windows: one shows your home folder, and the\n"
+"other tells you about Eazel's services that make the life\n"
+"of a Linux user easier.\n"
+"\n"
+"We hope you enjoy Nautilus!"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1129
+msgid ""
+"Click Finish to launch Nautilus. You'll start with a\n"
+"window showing your home folder.\n"
+"\n"
+"We hope you enjoy Nautilus!"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:944
+#: src/nautilus-first-time-druid.c:1153
 msgid "Nautilus First Time Setup"
 msgstr ""
 
-#. make the title label
-#: src/nautilus-first-time-druid.c:974
+#: src/nautilus-first-time-druid.c:1183
 #, fuzzy
-msgid "Welcome to Nautilus!"
+msgid "Welcome to Nautilus"
 msgstr "Velkommen til KMail!"
 
-#: src/nautilus-first-time-druid.c:982
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
-"Since this is the first time that you've launched\n"
-"Nautilus, we'd like to ask you a few questions\n"
-"to help personalize it for your use."
+"Nautilus...\n"
+"    Is a great file manager for the GNOME desktop.\n"
+"    Provides a simple intuitive way to access Internet services.\n"
+"    Is an extensible framework for GNOME developers.\n"
+"    Provides a powerful delivery platform for service providers.\n"
+"\n"
+"Click Next to begin customizing your Nautilus environment."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:987
-#, fuzzy
-msgid "Press the next button to continue."
-msgstr "Trykk linjeskift for å fortsetja."
-
 #. set up the final page
-#: src/nautilus-first-time-druid.c:995
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "Ferdig"
 
-#: src/nautilus-first-time-druid.c:1002
-msgid ""
-"Click the finish button to launch Nautilus.\n"
-"We hope that you enjoy using it!"
-msgstr ""
-
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1008
+#: src/nautilus-first-time-druid.c:1209
 #, fuzzy
-msgid "Select A User Level"
+msgid "Choose Your User Level"
 msgstr "Vel alle"
 
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1012
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr ""
 
-#. set up the service sign-up page
-#: src/nautilus-first-time-druid.c:1016
-msgid "Sign Up for Eazel Services"
+#. set up the `Launch Medusa' page
+#: src/nautilus-first-time-druid.c:1217
+#, fuzzy
+msgid "Fast Searches"
+msgstr "Søk"
+
+#. set up optional page to tell the user how to run cron
+#: src/nautilus-first-time-druid.c:1225
+msgid "The Cron Daemon"
 msgstr ""
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1020
-msgid "Nautilus Update"
+#: src/nautilus-first-time-druid.c:1230
+msgid "Checking Your Internet Connection"
 msgstr ""
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1028
+#: src/nautilus-first-time-druid.c:1241
 #, fuzzy
 msgid "Updating Nautilus..."
 msgstr "Oppdaterer skjerm ..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1036
+#: src/nautilus-first-time-druid.c:1249
 #, fuzzy
 msgid "Web Proxy Configuration"
 msgstr "Tilbakestill oppsett"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1108
+#: src/nautilus-first-time-druid.c:1324
 #, fuzzy
 msgid "Decoding Update..."
 msgstr "Les side på nytt ..."
 
-#: src/nautilus-first-time-druid.c:1125
-msgid "Update Completed... Press Next to Continue."
+#: src/nautilus-first-time-druid.c:1341
+msgid "Update Complete. Click Next to Continue."
+msgstr ""
+
+#. The update file couldn't be loaded because it
+#. * doesn't exist. Arlo and I (jsh) and decided that the
+#. * best thing to do is silently fail
+#.
+#: src/nautilus-first-time-druid.c:1356
+msgid "No Update Available... Press Next to Continue."
 msgstr ""
 
 #. set the window title
@@ -7869,10 +9180,6 @@ msgstr "Linjer"
 msgid "Add or remove sets of links by clicking on the checkboxes below."
 msgstr ""
 
-#: src/nautilus-location-bar.c:62
-msgid "Location:"
-msgstr "Stad:"
-
 #: src/nautilus-location-bar.c:63
 #, fuzzy
 msgid "Go To:"
@@ -7888,165 +9195,172 @@ msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 msgid "View in Multiple Windows?"
 msgstr "Vis i nytt vindauge"
 
-#: src/nautilus-main.c:143
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr ""
 
-#: src/nautilus-main.c:146
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr ""
 
-#: src/nautilus-main.c:146
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr ""
 
-#: src/nautilus-main.c:148
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:150
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr ""
 
-#: src/nautilus-main.c:152
+#: src/nautilus-main.c:154
 #, fuzzy
 msgid "Restart Nautilus."
 msgstr "Gjenopprett standardinnstillingar"
 
-#: src/nautilus-main.c:207
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:211
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 
-#: src/nautilus-main.c:215
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:219
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:223
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 
 #. set the title and standard close accelerator
-#: src/nautilus-property-browser.c:262
+#: src/nautilus-property-browser.c:265
 #, fuzzy
 msgid "Backgrounds and Emblems"
 msgstr "Bakgrunnstema"
 
-#: src/nautilus-property-browser.c:357 src/nautilus-theme-selector.c:266
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:362 src/nautilus-theme-selector.c:267
 #, fuzzy
 msgid "  Done  "
 msgstr "Ferdig"
 
-#: src/nautilus-property-browser.c:367
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:373
 #, fuzzy
 msgid "  Add new...  "
 msgstr "L&egg til  ..."
 
-#: src/nautilus-property-browser.c:381
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:388
 #, fuzzy
 msgid "  Remove...  "
 msgstr "Fjern ..."
 
-#: src/nautilus-property-browser.c:872
+#: src/nautilus-property-browser.c:879
 #, fuzzy, c-format
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Orsak, denne artikkelen kan ikkje redigerast."
 
-#: src/nautilus-property-browser.c:873 src/nautilus-property-browser.c:902
+#: src/nautilus-property-browser.c:880 src/nautilus-property-browser.c:909
 #, fuzzy
 msgid "Couldn't delete pattern"
 msgstr "Kunne ikkje sletta fila %1"
 
-#: src/nautilus-property-browser.c:901
+#: src/nautilus-property-browser.c:908
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:937
+#: src/nautilus-property-browser.c:944
 #, fuzzy
 msgid "Create a New Emblem:"
 msgstr "Lagar ei ny fil"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:949
 #, fuzzy
 msgid "Keyword:"
 msgstr "Nøkkelord"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:955
+#: src/nautilus-property-browser.c:962
 #, fuzzy
 msgid "Image:"
 msgstr "Bilete"
 
-#: src/nautilus-property-browser.c:959
+#: src/nautilus-property-browser.c:966
 #, fuzzy
 msgid "Select an image file for the new emblem:"
 msgstr "Vel ei biletefil"
 
-#: src/nautilus-property-browser.c:986
+#: src/nautilus-property-browser.c:993
 #, fuzzy
 msgid "Create a New Color:"
 msgstr "Lag ny mappe"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:991
+#: src/nautilus-property-browser.c:998
 #, fuzzy
 msgid "Color name:"
 msgstr "&Fargenamn"
 
-#: src/nautilus-property-browser.c:1002
+#: src/nautilus-property-browser.c:1009
 #, fuzzy
 msgid "Color value:"
 msgstr "Fargerate:"
 
-#: src/nautilus-property-browser.c:1044
-msgid "Sorry, but you can't replace the reset image."
-msgstr ""
+#: src/nautilus-property-browser.c:1045
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a valid file name."
+msgstr "Det er inga gyldig temafil."
 
-#: src/nautilus-property-browser.c:1075
-#, c-format
-msgid "Sorry, but the pattern %s couldn't be installed."
-msgstr ""
+#: src/nautilus-property-browser.c:1047
+#, fuzzy
+msgid "Sorry, but you did not supply a valid file name."
+msgstr "Det er inga gyldig temafil."
 
-#: src/nautilus-property-browser.c:1076 src/nautilus-property-browser.c:1086
+#: src/nautilus-property-browser.c:1049 src/nautilus-property-browser.c:1092
 #, fuzzy
 msgid "Couldn't install pattern"
 msgstr "Kunne ikkje skriva ut biletet."
 
-#: src/nautilus-property-browser.c:1085
-msgid ""
-"Sorry, but ~ as a directory is not currently supported.\n"
-" Please Type the full path."
+#: src/nautilus-property-browser.c:1060
+msgid "Sorry, but you can't replace the reset image."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1091
+#, c-format
+msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1114
 #, fuzzy
 msgid "Select an image file to add as a pattern:"
 msgstr "Vel ei biletefil"
 
-#: src/nautilus-property-browser.c:1162
+#: src/nautilus-property-browser.c:1173
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1163
+#: src/nautilus-property-browser.c:1174
 #, fuzzy
 msgid "Couldn't install color"
 msgstr "Kunne ikkje skriva ut biletet."
 
-#: src/nautilus-property-browser.c:1219
+#: src/nautilus-property-browser.c:1230
 #, fuzzy
 msgid "Select a color to add:"
 msgstr "Vel katalogen du vil leggja til"
 
-#: src/nautilus-property-browser.c:1300
+#: src/nautilus-property-browser.c:1311
 #, fuzzy, c-format
 msgid "Sorry, but '%s' is not a usable image file!"
 msgstr ""
@@ -8054,22 +9368,22 @@ msgstr ""
 "%1\n"
 "ser ikkje ut til å vera ei WAV-fil."
 
-#: src/nautilus-property-browser.c:1318
+#: src/nautilus-property-browser.c:1329
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1319 src/nautilus-property-browser.c:1322
-#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1355
+#: src/nautilus-property-browser.c:1330 src/nautilus-property-browser.c:1333
+#: src/nautilus-property-browser.c:1337 src/nautilus-property-browser.c:1366
 #, fuzzy
 msgid "Couldn't install emblem"
 msgstr "Kunne ikkje setja inn dokument"
 
-#: src/nautilus-property-browser.c:1321
+#: src/nautilus-property-browser.c:1332
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1324
+#: src/nautilus-property-browser.c:1335
 #, fuzzy, c-format
 msgid ""
 "Sorry, but \"%s\" is an existing keyword.  Please choose a different name "
@@ -8078,79 +9392,79 @@ msgstr ""
 "Eit filter med dette namnet finst alt.\n"
 "Bruk eit anna namn."
 
-#: src/nautilus-property-browser.c:1354
+#: src/nautilus-property-browser.c:1365
 #, c-format
 msgid "Sorry, but the image at %s couldn't be installed as an emblem."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1970
+#: src/nautilus-property-browser.c:2024
 #, fuzzy
 msgid "Select A Category:"
 msgstr "Valte kategoriar"
 
-#: src/nautilus-property-browser.c:1978 src/nautilus-theme-selector.c:494
+#: src/nautilus-property-browser.c:2032 src/nautilus-theme-selector.c:497
 #, fuzzy
 msgid "Cancel Remove"
 msgstr "Avbryt jobb"
 
-#: src/nautilus-property-browser.c:1982
+#: src/nautilus-property-browser.c:2037
 #, fuzzy
-msgid "  Add a new pattern  "
+msgid "  Add a New Pattern  "
 msgstr "Legg til ny tekst"
 
-#: src/nautilus-property-browser.c:1985
+#: src/nautilus-property-browser.c:2040
 #, fuzzy
-msgid "  Add a new color  "
+msgid "  Add a New Color  "
 msgstr "Legg til ein farge"
 
-#: src/nautilus-property-browser.c:1988
+#: src/nautilus-property-browser.c:2043
 #, fuzzy
-msgid "  Add a new emblem  "
+msgid "  Add a New Emblem  "
 msgstr "Legg til ei ny oppføring"
 
-#: src/nautilus-property-browser.c:2011
+#: src/nautilus-property-browser.c:2066
 #, fuzzy
 msgid "Click on a pattern to remove it"
 msgstr "Trykk på dei korta du vil ha"
 
-#: src/nautilus-property-browser.c:2014
+#: src/nautilus-property-browser.c:2069
 #, fuzzy
 msgid "Click on a color to remove it"
 msgstr "Trykk på dei korta du vil ha"
 
-#: src/nautilus-property-browser.c:2017
+#: src/nautilus-property-browser.c:2072
 #, fuzzy
 msgid "Click on an emblem to remove it"
 msgstr "Kopla til nettverksvert"
 
-#: src/nautilus-property-browser.c:2026
+#: src/nautilus-property-browser.c:2081
 #, fuzzy
 msgid "Patterns:"
 msgstr "&Mønster:"
 
-#: src/nautilus-property-browser.c:2029
+#: src/nautilus-property-browser.c:2084
 #, fuzzy
 msgid "Colors:"
 msgstr "Fargar"
 
-#: src/nautilus-property-browser.c:2032
+#: src/nautilus-property-browser.c:2087
 #, fuzzy
 msgid "Emblems:"
 msgstr "Døme"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2106
 #, fuzzy
-msgid "  Remove a pattern  "
+msgid "  Remove a Pattern  "
 msgstr "R&epeter mønster"
 
-#: src/nautilus-property-browser.c:2053
+#: src/nautilus-property-browser.c:2109
 #, fuzzy
-msgid "  Remove a color  "
+msgid "  Remove a Color  "
 msgstr "Fjern ein kolonne"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2112
 #, fuzzy
-msgid "  Remove an emblem  "
+msgid "  Remove an Emblem  "
 msgstr "Fjern tabell"
 
 #. Menu item in the search bar.
@@ -8320,46 +9634,37 @@ msgid "[File owner] is not [root]"
 msgstr "Filnummer mjuk kvote"
 
 #: src/nautilus-service-ui.xml.h:1
-msgid "Display support information for Eazel Services"
-msgstr ""
-
-#: src/nautilus-service-ui.xml.h:2
 msgid "Go to the Eazel Services Summary Page"
 msgstr ""
 
-#: src/nautilus-service-ui.xml.h:3
+#: src/nautilus-service-ui.xml.h:2
 msgid "Go to the Eazel Software Catalog"
 msgstr ""
 
-#: src/nautilus-service-ui.xml.h:4
+#: src/nautilus-service-ui.xml.h:3
 msgid "Go to your online storage repository"
 msgstr ""
 
-#: src/nautilus-service-ui.xml.h:6
+#: src/nautilus-service-ui.xml.h:5
 #, fuzzy
 msgid "Software _Catalog"
 msgstr "Lagra katalog?"
 
-#: src/nautilus-service-ui.xml.h:7
+#: src/nautilus-service-ui.xml.h:6
 #, fuzzy
 msgid "_Eazel Services Home"
 msgstr "Meny for tenester"
 
-#: src/nautilus-service-ui.xml.h:8
+#: src/nautilus-service-ui.xml.h:7
 #, fuzzy
 msgid "_Online Storage"
 msgstr "linjer per side"
 
-#: src/nautilus-service-ui.xml.h:9
+#: src/nautilus-service-ui.xml.h:8
 #, fuzzy
 msgid "_Services"
 msgstr "Tenester"
 
-#: src/nautilus-service-ui.xml.h:10
-#, fuzzy
-msgid "_Support"
-msgstr "Lydstøtte"
-
 #: src/nautilus-shell.c:188
 #, fuzzy
 msgid "Caveat"
@@ -8389,84 +9694,104 @@ msgstr "Ikon:"
 
 #: src/Nautilus_shell.oaf.in.h:3
 #, fuzzy
+msgid "Icons Viewer"
+msgstr "Visar"
+
+#: src/Nautilus_shell.oaf.in.h:4
+#, fuzzy
 msgid "List"
 msgstr "&Liste"
 
-#: src/Nautilus_shell.oaf.in.h:4
+#: src/Nautilus_shell.oaf.in.h:5
+#, fuzzy
+msgid "List Viewer"
+msgstr "Visar"
+
+#: src/Nautilus_shell.oaf.in.h:6
 msgid "Nautilus factory"
 msgstr ""
 
-#: src/Nautilus_shell.oaf.in.h:5
+#: src/Nautilus_shell.oaf.in.h:7
 msgid "Nautilus file manager component that shows a scrollable list"
 msgstr ""
 
-#: src/Nautilus_shell.oaf.in.h:6
+#: src/Nautilus_shell.oaf.in.h:8
 msgid ""
 "Nautilus file manager component that shows a scrollable list for search "
 "results"
 msgstr ""
 
-#: src/Nautilus_shell.oaf.in.h:7
+#: src/Nautilus_shell.oaf.in.h:9
 msgid "Nautilus file manager component that shows a two-dimensional icon space"
 msgstr ""
 
-#: src/Nautilus_shell.oaf.in.h:8
+#: src/Nautilus_shell.oaf.in.h:10
 msgid "Nautilus file manager component that shows icons on the the desktop"
 msgstr ""
 
-#: src/Nautilus_shell.oaf.in.h:9
+#: src/Nautilus_shell.oaf.in.h:11
 msgid "Nautilus file manager desktop icon view"
 msgstr ""
 
-#: src/Nautilus_shell.oaf.in.h:10
+#: src/Nautilus_shell.oaf.in.h:12
 msgid "Nautilus file manager icon view"
 msgstr ""
 
-#: src/Nautilus_shell.oaf.in.h:11
+#: src/Nautilus_shell.oaf.in.h:13
 msgid "Nautilus file manager list view"
 msgstr ""
 
-#: src/Nautilus_shell.oaf.in.h:12
+#: src/Nautilus_shell.oaf.in.h:14
 msgid "Nautilus file manager search results list view"
 msgstr ""
 
-#: src/Nautilus_shell.oaf.in.h:13
+#: src/Nautilus_shell.oaf.in.h:15
 msgid "Nautilus metafile factory"
 msgstr ""
 
-#: src/Nautilus_shell.oaf.in.h:14
+#: src/Nautilus_shell.oaf.in.h:16
 #, fuzzy
 msgid "Nautilus shell"
 msgstr "Basis for skal"
 
-#: src/Nautilus_shell.oaf.in.h:15
+#: src/Nautilus_shell.oaf.in.h:17
 msgid ""
 "Nautilus shell operations that can be done from subsequent command-line "
 "invocations"
 msgstr ""
 
-#: src/Nautilus_shell.oaf.in.h:16
+#: src/Nautilus_shell.oaf.in.h:18
 msgid "Produces metafile objects for accessing Nautilus metadata"
 msgstr ""
 
-#: src/Nautilus_shell.oaf.in.h:17
+#: src/Nautilus_shell.oaf.in.h:19
 #, fuzzy
 msgid "Search List"
 msgstr "Søkestart"
 
+#: src/Nautilus_shell.oaf.in.h:20
+#, fuzzy
+msgid "View as Icons"
+msgstr "Visingar"
+
+#: src/Nautilus_shell.oaf.in.h:21
+#, fuzzy
+msgid "View as List"
+msgstr "Visingar"
+
 #: src/nautilus-shell-ui.xml.h:1
 #, fuzzy
-msgid " Advanced"
+msgid " _Advanced"
 msgstr " Avansert "
 
 #: src/nautilus-shell-ui.xml.h:2
 #, fuzzy
-msgid " Beginner"
+msgid " _Beginner"
 msgstr "Nybyrjar"
 
 #: src/nautilus-shell-ui.xml.h:3
 #, fuzzy
-msgid " Intermediate"
+msgid " _Intermediate"
 msgstr "Middels"
 
 #: src/nautilus-shell-ui.xml.h:4
@@ -8487,7 +9812,7 @@ msgid "Change the visibility of this window's status bar"
 msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:9
-msgid "Change the visibility of this window's tool bar"
+msgid "Change the visibility of this window's toolbar"
 msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:10
@@ -8510,37 +9835,41 @@ msgid "Close this window"
 msgstr "&Lukk vindauge"
 
 #: src/nautilus-shell-ui.xml.h:15
-#, fuzzy
-msgid "Cut _Text"
-msgstr "Skriv tekst"
-
-#: src/nautilus-shell-ui.xml.h:17
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
 msgstr ""
 
+#: src/nautilus-shell-ui.xml.h:19
+msgid "Display quick reference pages for Nautilus"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:20
+#, fuzzy
+msgid "Display release notes for Nautilus"
+msgstr "Vis kjeldekode"
+
 #: src/nautilus-shell-ui.xml.h:21
+msgid "Display support information for Nautilus and Eazel Services"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:22
 #, fuzzy
 msgid "Display the latest contents of the current location"
 msgstr "Viser klassane som arvar frå denne klassen"
 
-#: src/nautilus-shell-ui.xml.h:22
-msgid "Display the license for Nautilus"
-msgstr ""
-
 #: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr ""
@@ -8583,57 +9912,63 @@ msgstr "LÃ¥s i denne posisjonen"
 msgid "Go to the previous visited location"
 msgstr "Gå til den førre meldinga som treng ettersyn"
 
-#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:434
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
 #, fuzzy
-msgid "Hide Location Bar"
+msgid "Hide Location _Bar"
 msgstr "Kodeplassering"
 
-#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:422
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
 #, fuzzy
-msgid "Hide Sidebar"
-msgstr "Vis &sidestolpe"
+msgid "Hide St_atus Bar"
+msgstr "Statuslinje"
 
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:416
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
 #, fuzzy
-msgid "Hide Status Bar"
-msgstr "Statuslinje"
+msgid "Hide _Sidebar"
+msgstr "Vis &sidestolpe"
 
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:428
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
 #, fuzzy
-msgid "Hide Tool Bar"
+msgid "Hide _Toolbar"
 msgstr "Hovudverktøylinje"
 
 #: src/nautilus-shell-ui.xml.h:37
 #, fuzzy
-msgid "Nautilus _License"
-msgstr "Nautisk mil"
+msgid "Nautilus Quick _Reference"
+msgstr "Kaiman-innstillingar"
 
 #: src/nautilus-shell-ui.xml.h:38
+#, fuzzy
+msgid "Nautilus Release _Notes"
+msgstr "Kaiman-innstillingar"
+
+#: src/nautilus-shell-ui.xml.h:39
+#, fuzzy
+msgid "Nautilus User _Manual"
+msgstr "Brukarhandbok"
+
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "Nytt vindauge"
 
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:41
+#, fuzzy
+msgid "New _Window"
+msgstr "Nytt vindauge"
+
+#: src/nautilus-shell-ui.xml.h:42
 #, fuzzy
 msgid "Normal Size"
 msgstr "Total storleik"
 
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:42
-msgid "Preferences..."
-msgstr "Innstillingar ..."
-
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "Oppfrisk"
 
-#: src/nautilus-shell-ui.xml.h:44
-#, fuzzy
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "Flyttar valt tekst/element til utklippstavla"
-
 #: src/nautilus-shell-ui.xml.h:45
 #, fuzzy
 msgid "Report Profiling"
@@ -8654,43 +9989,43 @@ msgstr "Søk på Internett (www)"
 msgid "Search this computer for files"
 msgstr "Søk i &ei kompendiumfil"
 
-#: src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:51
 #, fuzzy
 msgid "Show the contents at the normal size"
 msgstr "vis alternativt innhald som vedlegg"
 
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:52
 #, fuzzy
 msgid "Show the contents in less detail"
 msgstr "Viser fileigenskapane"
 
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:53
 #, fuzzy
 msgid "Show the contents in more detail"
 msgstr "Viser fileigenskapane"
 
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:54
 #, fuzzy
 msgid "Start Profiling"
 msgstr "Startar fråkopla"
 
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:56
 #, fuzzy
 msgid "Stop Profiling"
 msgstr "&Stopp lasting"
 
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:57
 #, fuzzy
 msgid "Stop loading this location"
 msgstr "Stopp lastinga av dokumentet"
 
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:58
 #, fuzzy
 msgid "Undo the last text change"
 msgstr ""
@@ -8698,235 +10033,238 @@ msgstr ""
 "\n"
 "Tek tilbake det siste redigeringssteget."
 
-#: src/nautilus-shell-ui.xml.h:58
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "Opp"
 
-#: src/nautilus-shell-ui.xml.h:59
-#, fuzzy
-msgid "Use Advanced settings"
-msgstr "Avanserte innstillingar"
-
 #: src/nautilus-shell-ui.xml.h:60
-#, fuzzy
-msgid "Use Beginner settings"
-msgstr "Bruk gruppeinnstillingar"
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:61
-#, fuzzy
-msgid "Use Intermediate settings"
-msgstr "Lag innstillingar"
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:63
+#, fuzzy
+msgid "We_b Search"
+msgstr ": Søk"
+
+#: src/nautilus-shell-ui.xml.h:64
 #, fuzzy
 msgid "Web Search"
 msgstr ": Søk"
 
-#: src/nautilus-shell-ui.xml.h:63
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "Forstørr"
 
-#: src/nautilus-shell-ui.xml.h:64
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "Forminsk"
 
-#: src/nautilus-shell-ui.xml.h:65
+#: src/nautilus-shell-ui.xml.h:67
 #, fuzzy
 msgid "Zoom _In"
 msgstr "Forstørr"
 
-#: src/nautilus-shell-ui.xml.h:66
+#: src/nautilus-shell-ui.xml.h:68
 #, fuzzy
 msgid "Zoom _Out"
 msgstr "Forminsk"
 
-#: src/nautilus-shell-ui.xml.h:67
+#: src/nautilus-shell-ui.xml.h:69
 #, fuzzy
 msgid "_About Nautilus..."
 msgstr "Om kSirc ..."
 
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:70
 #, fuzzy
 msgid "_Add Bookmark"
 msgstr "Legg til bokmerke"
 
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:71
 #, fuzzy
 msgid "_Back"
 msgstr "Tilbake"
 
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:72
 #, fuzzy
 msgid "_Backgrounds and Emblems..."
 msgstr "Bakgrunnsbilete ..."
 
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:73
 #, fuzzy
 msgid "_Bookmarks"
 msgstr "Bokmerke"
 
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:74
 #, fuzzy
 msgid "_Close Window"
 msgstr "Lu&kk vindauge"
 
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:76
+#, fuzzy
+msgid "_Customer Support"
+msgstr "Lydstøtte"
+
+#: src/nautilus-shell-ui.xml.h:77
 #, fuzzy
 msgid "_Edit"
 msgstr "Rediger"
 
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:78
 #, fuzzy
 msgid "_Edit Bookmarks..."
 msgstr "&Rediger bokmerke ..."
 
-#: src/nautilus-shell-ui.xml.h:76
-msgid "_Feedback..."
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "Innstillingar ..."
+
+#: src/nautilus-shell-ui.xml.h:80
+msgid "_Feedback"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:78 src/nautilus-window-menus.c:1280
+#: src/nautilus-shell-ui.xml.h:82
 #, fuzzy
 msgid "_Find"
 msgstr "Finn"
 
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:83
 #, fuzzy
 msgid "_Forward"
 msgstr "Fram"
 
-#: src/nautilus-shell-ui.xml.h:80
+#: src/nautilus-shell-ui.xml.h:84
 #, fuzzy
 msgid "_Go"
 msgstr "GÃ¥"
 
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:85
 #, fuzzy
 msgid "_Help"
 msgstr "Hjelp"
 
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:86
 #, fuzzy
 msgid "_Home"
 msgstr "Heim"
 
-#: src/nautilus-shell-ui.xml.h:83
+#: src/nautilus-shell-ui.xml.h:87
 #, fuzzy
-msgid "_Nautilus Themes..."
-msgstr "&Lagra tema ..."
-
-#: src/nautilus-shell-ui.xml.h:84
-#, fuzzy
-msgid "_Nautilus User Manual"
-msgstr "Brukarhandbok"
+msgid "_Location..."
+msgstr "Plassering"
 
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:88
 #, fuzzy
-msgid "_New Window"
-msgstr "Nytt vindauge"
+msgid "_Nautilus Themes..."
+msgstr "&Lagra tema ..."
 
-#: src/nautilus-shell-ui.xml.h:86
+#: src/nautilus-shell-ui.xml.h:89
 #, fuzzy
 msgid "_Normal Size"
 msgstr "Total storleik"
 
-#: src/nautilus-shell-ui.xml.h:88
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "Innstillingar"
+
+#: src/nautilus-shell-ui.xml.h:92
 #, fuzzy
 msgid "_Profiler"
 msgstr "Profil"
 
-#: src/nautilus-shell-ui.xml.h:89
+#: src/nautilus-shell-ui.xml.h:93
 #, fuzzy
 msgid "_Refresh"
 msgstr "Oppfrisk"
 
-#: src/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:94
 #, fuzzy
 msgid "_Report Profiling"
 msgstr "Brukarprofilar"
 
-#: src/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:95
 #, fuzzy
 msgid "_Reset Profiling"
 msgstr "Tilbakestill kontering"
 
-#: src/nautilus-shell-ui.xml.h:92
-#, fuzzy
-msgid "_Select All"
-msgstr "Vel alle"
-
-#: src/nautilus-shell-ui.xml.h:93
+#: src/nautilus-shell-ui.xml.h:96
 #, fuzzy
 msgid "_Start Profiling"
 msgstr "Startar fråkopla"
 
-#: src/nautilus-shell-ui.xml.h:94
+#: src/nautilus-shell-ui.xml.h:97
 #, fuzzy
 msgid "_Stop Profiling"
 msgstr "&Stopp lasting"
 
-#: src/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:98
 #, fuzzy
 msgid "_Undo"
 msgstr "Angra"
 
-#: src/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:99
 #, fuzzy
 msgid "_Up a Level"
 msgstr "Toppnivå"
 
-#: src/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:100
 #, fuzzy
 msgid "_View"
 msgstr "Vis"
 
-#: src/nautilus-shell-ui.xml.h:98
-#, fuzzy
-msgid "_Web Search"
-msgstr ": Søk"
-
-#: src/nautilus-sidebar.c:663
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
 msgstr ""
 
-#: src/nautilus-sidebar.c:665
+#: src/nautilus-sidebar.c:696
 #, fuzzy
 msgid "More Than One Image"
 msgstr "Lag ny side"
 
-#: src/nautilus-sidebar.c:684
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
 msgstr ""
 
-#: src/nautilus-sidebar.c:686
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr ""
 
-#: src/nautilus-sidebar.c:691
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
 msgstr ""
 
-#: src/nautilus-sidebar.c:693
+#: src/nautilus-sidebar.c:724
 #, fuzzy
 msgid "Images Only"
 msgstr "&Bilete"
 
-#: src/nautilus-sidebar.c:1251
+#: src/nautilus-sidebar.c:1281
 #, fuzzy, c-format
 msgid "Open with %s"
 msgstr "Opna med %1"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1285
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "Opna med ..."
 
-#: src/nautilus-sidebar.c:1391
+#. FIXME: We don't use spaces to pad labels!
+#: src/nautilus-sidebar.c:1424
 #, fuzzy
 msgid "  Empty Trash  "
 msgstr "Tøm papirkorga"
@@ -8946,46 +10284,48 @@ msgstr "Fleirval"
 msgid "Nautilus Theme:"
 msgstr ""
 
-#: src/nautilus-theme-selector.c:276
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:278
 #, fuzzy
-msgid "  Add new theme  "
+msgid "  Add New Theme  "
 msgstr "Legg til nye overføringar som :"
 
-#: src/nautilus-theme-selector.c:285
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:288
 #, fuzzy
-msgid "  Remove theme  "
+msgid "  Remove Theme  "
 msgstr "Fjern tema"
 
-#: src/nautilus-theme-selector.c:397
+#: src/nautilus-theme-selector.c:400
 #, fuzzy, c-format
 msgid "Sorry, but \"%s\" is not a valid theme folder."
 msgstr "Det er inga gyldig temafil."
 
-#: src/nautilus-theme-selector.c:398
+#: src/nautilus-theme-selector.c:401
 #, fuzzy
 msgid "Couldn't add theme"
 msgstr "Kunne ikkje lasta kartet!"
 
-#: src/nautilus-theme-selector.c:426
+#: src/nautilus-theme-selector.c:429
 #, c-format
 msgid "Sorry, but the \"%s\" theme couldn't be installed."
 msgstr ""
 
-#: src/nautilus-theme-selector.c:427
+#: src/nautilus-theme-selector.c:430
 #, fuzzy
 msgid "Couldn't install theme"
 msgstr "Kunne ikkje setja inn dokument"
 
-#: src/nautilus-theme-selector.c:460
+#: src/nautilus-theme-selector.c:463
 msgid "Select a theme folder to add as a new theme:"
 msgstr ""
 
-#: src/nautilus-theme-selector.c:492 src/nautilus-theme-selector.c:539
+#: src/nautilus-theme-selector.c:495 src/nautilus-theme-selector.c:542
 #, fuzzy
 msgid "Click on a theme to remove it."
 msgstr "Klikk her for å fjerna den valte filtypen."
 
-#: src/nautilus-theme-selector.c:542
+#: src/nautilus-theme-selector.c:545
 #, fuzzy
 msgid ""
 "Click on a theme to change the\n"
@@ -8993,44 +10333,49 @@ msgid ""
 msgstr "Trykk her for å endra den valte skrifttypen."
 
 #. change the add button label back to it's normal state
-#: src/nautilus-theme-selector.c:555
+#: src/nautilus-theme-selector.c:558
 #, fuzzy
 msgid "Add New Theme"
 msgstr "Legg til eit tasteoppsett"
 
-#: src/nautilus-theme-selector.c:582
+#: src/nautilus-theme-selector.c:585
 msgid ""
 "Sorry, but you can't remove the current theme. Please change to another "
 "theme before removing this one."
 msgstr ""
 
-#: src/nautilus-theme-selector.c:584
+#: src/nautilus-theme-selector.c:587
 #, fuzzy
 msgid "Can't delete current theme"
 msgstr "Slett valt memo?"
 
-#: src/nautilus-theme-selector.c:605
+#: src/nautilus-theme-selector.c:608
 #, fuzzy
 msgid "Sorry, but that theme could not be removed!"
 msgstr "Orsak, denne artikkelen kan ikkje redigerast."
 
-#: src/nautilus-theme-selector.c:606
+#: src/nautilus-theme-selector.c:609
 #, fuzzy
 msgid "Couldn't remove theme"
 msgstr "Kan ikkje løysa vertsnamn"
 
-#: src/nautilus-theme-selector.c:709
+#: src/nautilus-theme-selector.c:716
 #, fuzzy, c-format
 msgid "No description available for the \"%s\" theme"
 msgstr "Inga skildring tilgjengeleg."
 
+#: src/nautilus-window.c:637
+#, fuzzy
+msgid "View as ..."
+msgstr "Andre ..."
+
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1167
+#: src/nautilus-window.c:1317
 #, fuzzy
 msgid "View as Other..."
 msgstr "Andre ..."
 
-#: src/nautilus-window.c:1530
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "Lukk"
 
@@ -9039,54 +10384,54 @@ msgstr "Lukk"
 #. * time stamps really best described as "preview
 #. * release"?.
 #.
-#: src/nautilus-window-manage-views.c:208
+#: src/nautilus-window-manage-views.c:216
 #, c-format
 msgid "Preview Release %s: %s"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:751
+#: src/nautilus-window-manage-views.c:820
 #, fuzzy
 msgid "View Failed"
 msgstr "Ny fil"
 
-#: src/nautilus-window-manage-views.c:762
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
 "view or go to a different location."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:773
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:922
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:926
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
 "happening, you might want to turn this panel off."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:931
+#: src/nautilus-window-manage-views.c:1010
 #, fuzzy
 msgid "Sidebar Panel Failed"
 msgstr "Søk i filer"
 
-#: src/nautilus-window-manage-views.c:1135
+#: src/nautilus-window-manage-views.c:1225
 #, fuzzy, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr ""
 "<qt>Kunne ikkje køyra <b>%1</b>.\n"
 "Rett opp kommandoen eller URL-en og prøv igjen.</qt>"
 
-#: src/nautilus-window-manage-views.c:1141
+#: src/nautilus-window-manage-views.c:1231
 #, fuzzy, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
@@ -9094,49 +10439,49 @@ msgstr ""
 "Artist- / tittelfeltet til CD-en er ikkje utfylt.\n"
 "Rett på oppføringa og prøv igjen."
 
-#: src/nautilus-window-manage-views.c:1155
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
 "it is."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1163
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr ""
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1175
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1181
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1186
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1197
+#: src/nautilus-window-manage-views.c:1287
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
 "the spelling is correct and that your proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1205
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
 "proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -9144,17 +10489,17 @@ msgid ""
 "running."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1221
+#: src/nautilus-window-manage-views.c:1311
 #, fuzzy
 msgid "Searching Unavailable"
 msgstr "Tenesta er ikkje tilgjengeleg."
 
-#: src/nautilus-window-manage-views.c:1225
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1230
+#: src/nautilus-window-manage-views.c:1320
 #, fuzzy
 msgid "Can't Display Location"
 msgstr "Dataplassering"
@@ -9162,49 +10507,49 @@ msgstr "Dataplassering"
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:307
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
 msgstr ""
 
-#: src/nautilus-window-menus.c:310
+#: src/nautilus-window-menus.c:357
 #, fuzzy
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr "Er du sikker på at du vil sletta denne attributten?"
 
-#: src/nautilus-window-menus.c:315
+#: src/nautilus-window-menus.c:362
 #, fuzzy
 msgid "Forget History?"
 msgstr "Tøm historie"
 
-#: src/nautilus-window-menus.c:316
+#: src/nautilus-window-menus.c:363
 #, fuzzy
 msgid "Forget"
 msgstr "&Forkast"
 
-#: src/nautilus-window-menus.c:417
+#: src/nautilus-window-menus.c:466
 #, fuzzy
-msgid "Show Status Bar"
+msgid "Show St_atus Bar"
 msgstr "Vis &statuslinje"
 
-#: src/nautilus-window-menus.c:423
+#: src/nautilus-window-menus.c:472
 #, fuzzy
-msgid "Show Sidebar"
+msgid "Show _Sidebar"
 msgstr "Vis &sidestolpe"
 
-#: src/nautilus-window-menus.c:429
+#: src/nautilus-window-menus.c:478
 #, fuzzy
-msgid "Show Tool Bar"
+msgid "Show _Toolbar"
 msgstr "Vis &verktøylinje"
 
-#: src/nautilus-window-menus.c:435
+#: src/nautilus-window-menus.c:484
 #, fuzzy
-msgid "Show Location Bar"
+msgid "Show Location _Bar"
 msgstr "Vis &adresselinje"
 
-#: src/nautilus-window-menus.c:484
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "Innstillingar"
 
@@ -9214,12 +10559,12 @@ msgstr "Innstillingar"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:561
+#: src/nautilus-window-menus.c:618
 #, fuzzy
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr "Opphavsrett (c), %1 1997-2000"
 
-#: src/nautilus-window-menus.c:563
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -9227,52 +10572,445 @@ msgid ""
 "and the rest of your system."
 msgstr ""
 
-#: src/nautilus-window-menus.c:720
+#. translators should localize the following
+#. * string which will be displayed at the
+#. * bottom of the about box to give credit
+#. * to the translator(s)
+#.
+#: src/nautilus-window-menus.c:629
+msgid "Translator Credits"
+msgstr ""
+
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
 "this location from your list?"
 msgstr ""
 
-#: src/nautilus-window-menus.c:724
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr ""
 
-#: src/nautilus-window-menus.c:738
+#: src/nautilus-window-menus.c:807
 #, fuzzy, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "Prosessen %1 er ikkje lenger i minnet."
 
-#: src/nautilus-window-menus.c:739
+#: src/nautilus-window-menus.c:808
 #, fuzzy
 msgid "Go to Nonexistent Location"
 msgstr "LÃ¥s i denne posisjonen"
 
-#: src/nautilus-window-menus.c:806
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr ""
 
-#: src/nautilus-window-menus.c:1279
-#, fuzzy
-msgid "_Browse"
-msgstr "Bla gjennom"
-
-#: src/nautilus-window-toolbars.c:381
+#: src/nautilus-window-toolbars.c:402
 msgid "Back"
 msgstr "Tilbake"
 
-#: src/nautilus-window-toolbars.c:383
+#: src/nautilus-window-toolbars.c:404
 msgid "Forward"
 msgstr "Fram"
 
-#: src/nautilus-zoom-control.c:528
+#. Note to localizers: this font is used for the number in the
+#. * zoom control widget.
+#.
+#: src/nautilus-zoom-control.c:531
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr ""
 
-#. This is marked for localization in case the % sign is not
-#. * appropriate in some locale. I guess that's unlikely.
-#.
-#: src/nautilus-zoom-control.c:587
-msgid "%.0f%%"
-msgstr ""
+#~ msgid "System"
+#~ msgstr "System"
+
+#, fuzzy
+#~ msgid "Config files"
+#~ msgstr "Rens oppsettfiler"
+
+#~ msgid "Command Line"
+#~ msgstr "Kommandolinje"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Ymse"
+
+#, fuzzy
+#~ msgid "Verifying %s..."
+#~ msgstr "Kontroller ..."
+
+#, fuzzy
+#~ msgid "Package Contents"
+#~ msgstr "Pakke-mellomlager"
+
+#, fuzzy
+#~ msgid "Package Title"
+#~ msgstr "Pakkefil"
+
+#~ msgid "Size: "
+#~ msgstr "Storleik:"
+
+#, fuzzy
+#~ msgid "<size>"
+#~ msgstr "storleik"
+
+#~ msgid "<unknown>"
+#~ msgstr "<ukjend>"
+
+#, fuzzy
+#~ msgid "License: "
+#~ msgstr "Linje: %1"
+
+#, fuzzy
+#~ msgid "Build Date: "
+#~ msgstr "Dato:"
+
+#, fuzzy
+#~ msgid "Vendor: "
+#~ msgstr "Forhandlar"
+
+#~ msgid "Update"
+#~ msgstr "Oppdater"
+
+#~ msgid "Verify"
+#~ msgstr "Kontroller"
 
+#, fuzzy
+#~ msgid "Go to selected file"
+#~ msgstr "flytt til valt"
+
+#, fuzzy
+#~ msgid "Package Contents: %d files"
+#~ msgstr "Pakkefil"
+
+#, fuzzy
+#~ msgid "Package \"%s\" "
+#~ msgstr "Pakkar"
+
+#, fuzzy
+#~ msgid "Verification completed, package ok."
+#~ msgstr "Stadfesting er ikkje implementert enno"
+
+#, fuzzy
+#~ msgid "%s would break other installed packages\n"
+#~ msgstr "Plassering av uinstallerte pakkar"
+
+#, fuzzy
+#~ msgid "%s is needed, but could not be found\n"
+#~ msgstr "Fila er laga, men kunne ikkje lastast inn."
+
+#, fuzzy
+#~ msgid "Uninstall failed..."
+#~ msgstr "Avinstaller merka"
+
+#, fuzzy
+#~ msgid "Uninstall Failed"
+#~ msgstr "Avinstaller merka"
+
+#, fuzzy
+#~ msgid "Install failed..."
+#~ msgstr "Installerer filer"
+
+#, fuzzy
+#~ msgid "rpm view"
+#~ msgstr "Førehandsvising"
+
+#, fuzzy
+#~ msgid "Force install"
+#~ msgstr "Make install"
+
+#, fuzzy
+#~ msgid "%s is not installed"
+#~ msgstr "pakken %1 er ikkje installert"
+
+#, fuzzy
+#~ msgid "Installation aborted."
+#~ msgstr "Installasjon"
+
+#, fuzzy
+#~ msgid "Set machine name."
+#~ msgstr "Vel namn"
+
+#, fuzzy
+#~ msgid "A CORBA error occured.\n"
+#~ msgstr ""
+#~ "Ein feil oppstod:\n"
+#~ "%1"
+
+#, fuzzy
+#~ msgid "Can't post !"
+#~ msgstr "Finn ikkje skrifttype"
+
+#, fuzzy
+#~ msgid "can't open tempory file hell\n"
+#~ msgstr "Kan ikkje opna fila %1"
+
+#, fuzzy
+#~ msgid "Can't set body !"
+#~ msgstr "skriftstorleik meldingskropp"
+
+#, fuzzy
+#~ msgid "There is no service data !\n"
+#~ msgstr "Teen er klar!"
+
+#, fuzzy
+#~ msgid "There is no eazel news data !\n"
+#~ msgstr "Det er ikkje band i stasjonen."
+
+#, fuzzy
+#~ msgid "Could not fetch summary configuration !"
+#~ msgstr "Kunne ikkje laga den nye oppsettfila."
+
+#, fuzzy
+#~ msgid "Could not find any summary configuration data!\n"
+#~ msgstr "Kunne ikkje gjera operasjonen ferdig.\n"
+
+#, fuzzy
+#~ msgid "Bailing from summary configuration parse!\n"
+#~ msgstr "Kan ikkje lasta oppsettfila på nytt."
+
+#, fuzzy
+#~ msgid "Welcome, %s!"
+#~ msgstr "Velkomen til KDE!"
+
+#, fuzzy
+#~ msgid "Enable debugging"
+#~ msgstr "Skru på avlusingsinfo"
+
+#, fuzzy
+#~ msgid "Vault location"
+#~ msgstr "Dataplassering"
+
+#, fuzzy
+#~ msgid "Error: Invalid operation supplied (%s)\n"
+#~ msgstr "Ugyldig val oppgitt."
+
+#, fuzzy
+#~ msgid "_Fonts"
+#~ msgstr "Skrifttypar"
+
+#, fuzzy
+#~ msgid "Shared"
+#~ msgstr "Øydelegg"
+
+#, fuzzy
+#~ msgid "Caldera"
+#~ msgstr "Nullstill"
+
+#, fuzzy
+#~ msgid "Linux Companies"
+#~ msgstr "Linux-fargar"
+
+#, fuzzy
+#~ msgid "Linuxcare"
+#~ msgstr "Lineær"
+
+#, fuzzy
+#~ msgid "Myplay"
+#~ msgstr "Mai"
+
+#, fuzzy
+#~ msgid "Slashdot"
+#~ msgstr "Skråstrek"
+
+#, fuzzy
+#~ msgid "SourceXchange"
+#~ msgstr "Endringar:"
+
+#, fuzzy
+#~ msgid "VA Linux"
+#~ msgstr "&Linux"
+
+#, fuzzy
+#~ msgid "VMWare"
+#~ msgstr "Mar"
+
+#, fuzzy
+#~ msgid "Ximian"
+#~ msgstr "Kaiman"
+
+#, fuzzy
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "Du kan ikkje sleppa ein katalog på seg sjølv"
+
+#, fuzzy
+#~ msgid "You cannot throw \"%s\" into the Trash."
+#~ msgstr "Du kan ikkje leggja til to grupper med det same namnet."
+
+#, fuzzy
+#~ msgid "Error Moving to Trash"
+#~ msgstr "&Flytt til papirkorga"
+
+#~ msgid "Font"
+#~ msgstr "Skrifttype"
+
+#~ msgid "fixed"
+#~ msgstr "fast"
+
+#, fuzzy
+#~ msgid "current theme"
+#~ msgstr "tid no"
+
+#, fuzzy
+#~ msgid "Click behavior"
+#~ msgstr "Val for stavekontroll"
+
+#, fuzzy
+#~ msgid "Always execute"
+#~ msgstr "køyr"
+
+#, fuzzy
+#~ msgid "Always display"
+#~ msgstr "Digital vising"
+
+#, fuzzy
+#~ msgid "Display text in icons"
+#~ msgstr "Visingsinnstillingar"
+
+#, fuzzy
+#~ msgid "Can add Content"
+#~ msgstr "Kan ikkje lesa miljø"
+
+#, fuzzy
+#~ msgid "Home Location"
+#~ msgstr "Kodeplassering"
+
+#, fuzzy
+#~ msgid "HTTP Proxy"
+#~ msgstr "&HTTP-proxy:"
+
+#, fuzzy
+#~ msgid "HTTP Proxy Port"
+#~ msgstr "&HTTP-proxy:"
+
+#, fuzzy
+#~ msgid "Appearance Settings"
+#~ msgstr "Tid for frammøte"
+
+#~ msgid "Views"
+#~ msgstr "Visingar"
+
+#, fuzzy
+#~ msgid "Folder Views"
+#~ msgstr "Mappeliste"
+
+#, fuzzy
+#~ msgid "Folder Views Settings"
+#~ msgstr "Fargeinnstillngar"
+
+#, fuzzy
+#~ msgid "Window Behavior"
+#~ msgstr "Name=Vindaugsåtferd"
+
+#, fuzzy
+#~ msgid "Search Settings"
+#~ msgstr "Søketekst:"
+
+#, fuzzy
+#~ msgid "Search Tradeoffs"
+#~ msgstr "Søk nyheiter"
+
+#, fuzzy
+#~ msgid "Search Locations"
+#~ msgstr "Søkeval"
+
+#, fuzzy
+#~ msgid "Sidebar Panels Description"
+#~ msgstr "Detaljert signalskildring"
+
+#, fuzzy
+#~ msgid "Navigation Settings"
+#~ msgstr "Handlingsinnstillingar"
+
+#, fuzzy
+#~ msgid "Speed Tradeoffs Settings"
+#~ msgstr "Tenarinnstillingar"
+
+#, fuzzy
+#~ msgid "helvetica"
+#~ msgstr "Opna vertikalt"
+
+#~ msgid "medium"
+#~ msgstr "middels"
+
+#, fuzzy
+#~ msgid "Can't open remote file"
+#~ msgstr "Kan ikkje opna fila %1"
+
+#~ msgid "Warning"
+#~ msgstr "Ã…tvaring"
+
+#~ msgid "Error"
+#~ msgstr "Feil"
+
+#~ msgid "Details"
+#~ msgstr "Detaljar"
+
+#~ msgid "Question"
+#~ msgstr "Spørsmål"
+
+#, fuzzy
+#~ msgid "_Cut Text"
+#~ msgstr "Skriv tekst"
+
+#, fuzzy
+#~ msgid "Open in _New Window"
+#~ msgstr "&Opna i eige vindauge"
+
+#~ msgid "Where:"
+#~ msgstr "Kvar:"
+
+#, fuzzy
+#~ msgid "New _Folder"
+#~ msgstr "Ny mappe"
+
+#, fuzzy
+#~ msgid "_Open in New Window"
+#~ msgstr "&Opna i eige vindauge"
+
+#, fuzzy
+#~ msgid "_Select All Files"
+#~ msgstr "Valte filer"
+
+#, fuzzy
+#~ msgid "Updating Nautilus"
+#~ msgstr "Oppdaterer fil-liste"
+
+#, fuzzy
+#~ msgid "HTTP Proxy Configuration"
+#~ msgstr "Sideoppsett"
+
+#, fuzzy
+#~ msgid "Press the next button to continue."
+#~ msgstr "Trykk linjeskift for å fortsetja."
+
+#, fuzzy
+#~ msgid "Nautilus _License"
+#~ msgstr "Nautisk mil"
+
+#, fuzzy
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "Flyttar valt tekst/element til utklippstavla"
+
+#, fuzzy
+#~ msgid "Use Advanced settings"
+#~ msgstr "Avanserte innstillingar"
+
+#, fuzzy
+#~ msgid "Use Beginner settings"
+#~ msgstr "Bruk gruppeinnstillingar"
+
+#, fuzzy
+#~ msgid "Use Intermediate settings"
+#~ msgstr "Lag innstillingar"
+
+#, fuzzy
+#~ msgid "_New Window"
+#~ msgstr "Nytt vindauge"
+
+#, fuzzy
+#~ msgid "_Web Search"
+#~ msgstr ": Søk"
+
+#, fuzzy
+#~ msgid "_Browse"
+#~ msgstr "Bla gjennom"
diff --git a/po/no.po b/po/no.po
index 6fe49e063..e6a8a91cb 100644
--- a/po/no.po
+++ b/po/no.po
@@ -2,10 +2,15 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Kjartan Maraas <kmaraas@online.no>, 2000.
 #
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus 0.2\n"
-"POT-Creation-Date: 2001-03-07 09:05-0500\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-03-07 09:48-05:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -142,8 +147,8 @@ msgid "Previous"
 msgstr "Forrige"
 
 #: components/help/converters/gnome-db2html2/gdb3html.c:721
-#: libnautilus-extensions/nautilus-global-preferences.c:686
-#: src/nautilus-shell-ui.xml.h:38
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "Hjem"
 
@@ -332,16 +337,14 @@ msgid "Kernel Routines"
 msgstr "Kjernerutiner"
 
 #: components/help/hyperbola-filefmt.c:703
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
 msgid "Info"
 msgstr "Info"
 
-#: components/help/hyperbola-nav-tree.c:279
+#: components/help/hyperbola-nav-tree.c:310
 msgid "Introductory Documents:"
 msgstr "Innledende dokumenter:"
 
-#: components/help/hyperbola-nav-tree.c:293
+#: components/help/hyperbola-nav-tree.c:324
 msgid "Documents by Subject:"
 msgstr "Dokumenter etter emne:"
 
@@ -414,7 +417,7 @@ msgstr "Historikk sidelinjepanel"
 msgid "History sidebar panel for Nautilus"
 msgstr "Historikk sidelinjepanel for Nautilus"
 
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
@@ -473,7 +476,7 @@ msgstr "Drep taperen innholdsvisning"
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "_Fil"
 
@@ -557,7 +560,7 @@ msgid "Sidebar Loser"
 msgstr "Sidelinjetaper"
 
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -567,7 +570,7 @@ msgstr ""
 "  %s"
 
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -1012,7 +1015,6 @@ msgid "Oldies"
 msgstr "Oldies"
 
 #: components/music/mpg123.c:32
-#: libnautilus-extensions/nautilus-font-picker.c:115
 msgid "Other"
 msgstr "Andre"
 
@@ -1651,10 +1653,10 @@ msgid "Pause"
 msgstr "Pause"
 
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:945
-#: libnautilus-extensions/nautilus-file-operations.c:960
 #: libnautilus-extensions/nautilus-file-operations.c:979
-#: src/nautilus-shell-ui.xml.h:60
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Stopp"
 
@@ -1704,23 +1706,6 @@ msgstr "Factory for musikkvisning"
 msgid "View as Music"
 msgstr "Vis som musikk"
 
-#. FIXME: eventually, get this from preferences
-#. set up the default font
-#: components/notes/nautilus-notes.c:200
-#: components/text/nautilus-text-view.c:186
-#: libnautilus-extensions/nautilus-global-preferences.c:1118
-#: libnautilus-extensions/nautilus-icon-container.c:3332
-#: libnautilus-extensions/nautilus-icon-container.c:3333
-#: libnautilus-extensions/nautilus-icon-container.c:3334
-#: libnautilus-extensions/nautilus-icon-container.c:3335
-#: libnautilus-extensions/nautilus-icon-container.c:3336
-#: libnautilus-extensions/nautilus-icon-container.c:3337
-#: libnautilus-extensions/nautilus-icon-container.c:3338
-#: libnautilus-extensions/nautilus-preferences-item.c:482
-#: src/nautilus-sidebar-title.c:495
-msgid "helvetica"
-msgstr "helvetica"
-
 #: components/notes/Nautilus_View_notes.oaf.in.h:1
 msgid "Factory for annotation view"
 msgstr "Factory for annotasjonsvisning"
@@ -1812,7 +1797,7 @@ msgstr "Spesifiser cgi for søk"
 #: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
 #: components/services/install/command-line/eazel-test-packsys.c:590
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "Vis avlusingsdata"
 
@@ -1876,171 +1861,174 @@ msgstr "RPM argumenter er nødvendige filnavn"
 msgid "Run Query"
 msgstr "Kjør spørring"
 
-#. Disabled for 1.0
-#. {"revert", 'r', POPT_ARG_NONE, &arg_revert, 0, N_("Revert"), NULL},
-#: components/services/install/command-line/eazel-alt-install-corba.c:127
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
+#, fuzzy
+msgid "Revert"
+msgstr "aldri"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr "Sett rot"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:128
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "Spesifiser tjener"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:129
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
 msgid "Dont print too much, just problems and download"
 msgstr "Ikke skriv ut for mye, bare problemer og nedlasting"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:130
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr "Utfør ssl-omdøping"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:131
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
 msgid "argument is a suite id"
 msgstr "argumentet er en suite-id"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "Testkjøring"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr "Tillat brukernavn"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:134
-#: components/services/install/lib/eazel-install-problem.c:1011
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "Tillat oppgraderinger"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "Utfyllende utskrift"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:136
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
 msgid "Install a specific package version"
 msgstr "Installer en spesifikk pakkeversjon"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:159
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
 msgid "*** You cannot specify more then one protocol type.\n"
 msgstr "*** Du kan ikke spesifisere mer enn én type protokoll.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:176
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
 msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
 msgstr "*** Slett og forkast? Noen har laget en bombe til oss!\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:285
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, c-format
 msgid "File conflict checking %s...\n"
 msgstr "Sjekk etter filkonflikt %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:299
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, c-format
 msgid "File uniqueness checking %s...\n"
 msgstr "Sjekker om filen er unik %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:313
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
 #, c-format
 msgid "Feature consistency checking %s...\n"
 msgstr "Sjekker etter konsistente funksjoner %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:344
-#: components/services/install/lib/eazel-install-protocols.c:110
-#: components/services/install/lib/eazel-install-protocols.c:248
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
 #, c-format
 msgid "Downloading %s..."
 msgstr "Laster ned %s..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:360
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
 msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
 msgstr "Laster ned %s... (%d/%d) = %d%% %.1f KB/s"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:368
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
 msgid "Downloading %s... (%d/%d) = %d%%"
 msgstr "Laster ned %s... (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:376
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
 #, c-format
 msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
 msgstr "Laster ned %s... (%d/%d) %.1f KB/s Ferdig     \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:381
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
 #, c-format
 msgid "Downloading %s... %3.1f KB/s Done\n"
 msgstr "Laster ned %s... %3.1f KB/s Ferdig\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:409
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "Installerer %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:417
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "Avinstallerer %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:439
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "Installerer %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Ferdig\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:446
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "Avinstallerer %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Ferdig\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:454
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
 msgid "Done\n"
 msgstr "Ferdig\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:474
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
 #, c-format
 msgid "Download of %s FAILED\n"
 msgstr "Nedlasting av %s FEILET\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:496
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
 #, c-format
 msgid "Package %s failed to uninstall.\n"
 msgstr "Feilet avinstallering for pakke %s.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:498
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
 #, c-format
 msgid "Package %s failed to install.\n"
 msgstr "Feilet installering for pakke %s.\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:519
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
 #, c-format
 msgid "\t· Problem : %s\n"
 msgstr "\t· Problem: %s\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:528
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
 #, c-format
 msgid "\t· Action : %s\n"
 msgstr "\t· Handling: %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:571
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
 msgid "Cancelling operation\n"
 msgstr "Avbryter operasjon\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:582
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
 #, c-format
 msgid "About to install a total of %d packages, %dKB\n"
 msgstr "I ferd med å installere totalt %d pakker, %dKB\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:586
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
 #, c-format
 msgid "About to uninstall a total of %d packages, %dKB\n"
 msgstr "I ferd med å avinstallere totalt %d pakker, %dKB\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:590
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
 #, c-format
 msgid "About to revert a total of %d packages, %d KB\n"
 msgstr "I ferd med å forkaste totalt %d pakker, %dKB\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:607
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
 #, c-format
 msgid "\t· %s and it's dependencies\n"
 msgstr "\t· %s med avhengigheter\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:610
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
 #, c-format
 msgid "\t· %s\n"
 msgstr "\t· %s\n"
@@ -2050,38 +2038,38 @@ msgstr "\t· %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n) " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:638
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
 msgid "Save transaction report ? (y/n) "
 msgstr "Lagre transaksjonsrapport? (j/n)"
 
 #. I18N note: y is the letter for the word Yes. This is
 #. used in the response for a yes/no questions. Your translation
 #. must be 1 character only.
-#: components/services/install/command-line/eazel-alt-install-corba.c:649
-#: components/services/install/command-line/eazel-alt-install-corba.c:769
-#: components/services/install/command-line/eazel-alt-install-corba.c:811
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
 msgid "y"
 msgstr "j"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:670
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
 #, c-format
 msgid "Dependency : %s needs %s\n"
 msgstr "Avhengighet: %s trenger %s\n"
 
 #. I18N note: %s is a package name
-#: components/services/install/command-line/eazel-alt-install-corba.c:688
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
 #, c-format
 msgid "Package %s failed md5 check!\n"
 msgstr "Pakke %s feilet md5 sjekk!\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:690
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
 #, c-format
 msgid "\t· server MD5 checksum is %s\n"
 msgstr "\t· tjeners MD5-sjekksum er %s\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:692
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
 #, c-format
 msgid "\t· actual MD5 checksum is %s\n"
 msgstr "\t· faktisk MD5-sjekksum er %s\n"
@@ -2091,7 +2079,7 @@ msgstr "\t· faktisk MD5-sjekksum er %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:758
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
 msgid "Continue? (y/n) "
 msgstr "Fortsett? (j/n) "
 
@@ -2100,83 +2088,83 @@ msgstr "Fortsett? (j/n) "
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:799
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
 msgid "Should I delete the RPM files? (y/n) "
 msgstr "Skal jeg slette RPM-filene? (y/n) "
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:831
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
 msgid "Operation ok\n"
 msgstr "Operasjon ok\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:833
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
 msgid "Operation failed\n"
 msgstr "Operasjonen feilet\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:959
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
 msgid "Installing"
 msgstr "Installerer"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:968
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
 msgid "Uninstalling"
 msgstr "Avinstallerer"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:983
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
 msgid "Only one operation at a time please."
 msgstr "Kun en operasjon om gangen er du snill."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:988
-#: components/services/install/command-line/eazel-alt-install-corba.c:996
-#: components/services/install/command-line/eazel-alt-install-corba.c:1040
-#: components/services/install/command-line/eazel-alt-install-corba.c:1047
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
 #, c-format
 msgid "%s: --help for usage\n"
 msgstr "%s: --help for bruksmelding\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
 #, c-format
 msgid "Name         : %s\n"
 msgstr "Navn         : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
 #, c-format
 msgid "Version      : %s\n"
 msgstr "Versjon      : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1014
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
 #, c-format
 msgid "Minor        : %s\n"
 msgstr "Mindre       : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
 #, c-format
 msgid "Size         : %d\n"
 msgstr "Størrelse    : %d\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
 #, c-format
 msgid "Arch         : %s\n"
 msgstr "Ark          : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
 #, c-format
 msgid "Distribution : %s\n"
 msgstr "Distribusjon : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1019
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
 #, c-format
 msgid "Description  : %s\n"
 msgstr "Beskrivelse  : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1021
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
 #, c-format
 msgid "Install root : %s\n"
 msgstr "Installasjonsrot :  %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1024
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
 msgid "Provides     : \n"
 msgstr "Tilbyr       : \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1066
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
 #, c-format
 msgid "exit code %d\n"
 msgstr "avsluttende kode %d\n"
@@ -2191,122 +2179,129 @@ msgid "Use specified file to generate a package list, requires --packagelist"
 msgstr ""
 "Bruk spesifisert fil til å generere en pakkeliste, trenger --packagelist"
 
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 msgid "Softcat server to connect to"
 msgstr "Softcat-tjener du vil koble deg til"
 
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr "Bruk alternativ CGI-sti"
 
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr "Koble til som en softcat bruker gjennom ammonite"
 
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 msgid "Number of times to try the request"
 msgstr "Antall ganger forespørselen skal forsøkes"
 
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr "Pause mellom nye forsøk på forespørsel, i mikrosekunder"
 
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr "Slå opp etter Eazel pakke-id"
 
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+#, fuzzy
+msgid "Lookup package that features a feature/file"
 msgstr "Slå opp pakke som gir en spesifikk funksjon/fil"
 
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr "Slå opp pakke med en spesifikk versjon"
 
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr "(med --version) Bruk >= sammenligning"
 
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 msgid "use check function (for debugging)"
 msgstr "bruk sjekkfunksjon (for feilsøking)"
 
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 msgid "Show detailed sub-package info"
 msgstr "Vis detaljert underpakkeinformasjon"
 
-#: components/services/install/lib/eazel-install-logic2.c:99
+#: components/services/install/command-line/eazel-test-softcat.c:66
+#, fuzzy
+msgid "enable funk parser"
+msgstr "Bruk raskt søk"
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "Kunne ikke låse nedlastingsfilen"
 
-#: components/services/install/lib/eazel-install-logic2.c:116
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "MD5-feil, pakke %s kan være tuklet med"
 
-#: components/services/install/lib/eazel-install-logic2.c:132
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, c-format
 msgid "No MD5 available for %s"
 msgstr "Ingen MD5-sum tilgjengelig for %s"
 
 #. I18N note: "%is is ok" in the sense that %s=package name and the
 #. package is intact
-#: components/services/install/lib/eazel-install-logic2.c:327
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, c-format
 msgid "%s is ok"
 msgstr "%s er ok"
 
-#: components/services/install/lib/eazel-install-logic2.c:433
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s versjon %s-%s er allerede installert"
 
-#: components/services/install/lib/eazel-install-logic2.c:437
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s versjon %s er allerede installert"
 
-#: components/services/install/lib/eazel-install-logic2.c:446
-#: components/services/install/lib/eazel-install-logic2.c:451
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr "%s oppgraderinger fra versjon %s-%s til %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:460
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr "%s nedgraderinger fra versjon %s-%s til %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:465
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr "%s nedgraderinger fra versjon %s til %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:518
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr "%s installerer versjon %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:523
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr "%s installerer versjon %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:687
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, c-format
 msgid "Loading package info from file %s"
 msgstr "Leser pakkeinformasjon fra fil %s"
 
 #. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
-#: components/services/install/lib/eazel-install-logic2.c:993
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "ok"
 msgstr "ok"
 
-#: components/services/install/lib/eazel-install-logic2.c:993
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "not ok"
 msgstr "ikke ok"
 
-#: components/services/install/lib/eazel-install-logic2.c:1159
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
 msgid "Checking dependencies for %s"
 msgstr "Sjekker avhengigheter for %s"
@@ -2314,69 +2309,69 @@ msgstr "Sjekker avhengigheter for %s"
 #. I18N note: both %s' are package names.
 #. related is in the sense that the two packages apparently
 #. are connected somehow, eg. foo and foo-devel
-#: components/services/install/lib/eazel-install-logic2.c:1766
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, c-format
 msgid "%s is related to %s"
 msgstr "%s er relatert til %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:1826
+#: components/services/install/lib/eazel-install-logic2.c:2090
 #, c-format
 msgid "updating %s to version %s-%s solves conflict"
 msgstr "oppdatering av %s til versjon %s-%s løser konflikt"
 
-#: components/services/install/lib/eazel-install-logic2.c:1842
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
 msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr "tilgjengelig oppdatering for %s (%s-%s) løser ikke konflikt"
 
-#: components/services/install/lib/eazel-install-logic2.c:1849
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, c-format
 msgid "could not revive %s"
 msgstr "kunne ikke gjenopplive %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2004
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
 msgid "file uniqueness checking %s"
 msgstr "Sjekker om filen er unik %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2025
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
 msgid "Duplicate file : %s occurs in %s and %s"
 msgstr "Duplikatfil : %s finnes i %s og %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2037
-#: components/services/install/lib/eazel-install-logic2.c:2191
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
 msgid "... but it's ok, the packages are related"
 msgstr "... men det er ok, pakkene er relatert"
 
-#: components/services/install/lib/eazel-install-logic2.c:2045
+#: components/services/install/lib/eazel-install-logic2.c:2324
 #, c-format
 msgid "(there were %d other conflicts)"
 msgstr "(fant %d andre konflikter)"
 
-#: components/services/install/lib/eazel-install-logic2.c:2140
+#: components/services/install/lib/eazel-install-logic2.c:2419
 #, c-format
 msgid "file conflict checking %s"
 msgstr "sjekk etter filkonflikt %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2177
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
 msgid "file conflict : package %s already provides file %s also provided by %s"
 msgstr "filkonflikt : pakke %s inneholder allerede fil %s som også finnes i %s"
 
 #. the owner of this file is a package that we're upgrading, and the
 #. * new version no longer has this file, so everything's okay.
-#: components/services/install/lib/eazel-install-logic2.c:2187
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
 msgid "...but it is okay, we're upgrading %s and it ditched that file"
 msgstr "...men det er ok, vi oppgraderer %s og den forkastet den filen"
 
-#: components/services/install/lib/eazel-install-logic2.c:2279
+#: components/services/install/lib/eazel-install-logic2.c:2558
 #, c-format
 msgid "checking feature consistency of %s"
 msgstr "sjekker etter konsistente funksjoner i %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2347
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
 msgid ""
 "feature missing : %s breaks if %s is installed (feature %s would be lost"
@@ -2384,167 +2379,167 @@ msgstr ""
 "manglende funksjon : %s blir ødelagt hvis %s installeres (funksjon %s ville "
 "gå tapt)"
 
-#: components/services/install/lib/eazel-install-logic2.c:2426
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, c-format
 msgid "downloading %d packages"
 msgstr "laster ned %d pakker"
 
-#: components/services/install/lib/eazel-install-logic2.c:2695
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, c-format
 msgid "will upgrade %s"
 msgstr "vil oppgradere %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2698
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, c-format
 msgid "will downgrade %s"
 msgstr "vil nedgradere %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2701
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, c-format
 msgid "will install %s"
 msgstr "vil installere %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2704
+#: components/services/install/lib/eazel-install-logic2.c:2960
 #, c-format
 msgid "will uninstall %s"
 msgstr "vil avinstallere %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2789
-#: components/services/install/lib/eazel-install-problem.c:335
-#: components/services/install/lib/eazel-install-problem.c:338
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
 #, c-format
 msgid "%s requires %s"
 msgstr "%s er avhengig av %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2982
+#: components/services/install/lib/eazel-install-logic2.c:3238
 #, c-format
 msgid "failed %s"
 msgstr "feilet %s"
 
-#: components/services/install/lib/eazel-install-metadata.c:171
+#: components/services/install/lib/eazel-install-metadata.c:174
 msgid "Could not set URLType from config file!"
 msgstr "Kunne ikke sette URLType fra konfigurasjonsfilen!"
 
-#: components/services/install/lib/eazel-install-object.c:713
+#: components/services/install/lib/eazel-install-object.c:717
 msgid "Transactions are not stored, could not find home dir"
 msgstr "Transaksjoner lagres ikke, kunne ikke finne hjemmekatalog"
 
-#: components/services/install/lib/eazel-install-object.c:741
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr "Transaksjoner lagres i %s"
 
-#: components/services/install/lib/eazel-install-object.c:998
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "Henter pakkeliste fra ekstern tjener ...\n"
 
-#: components/services/install/lib/eazel-install-object.c:1014
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "Kunne ikke hente package-list.xml!\n"
 
-#: components/services/install/lib/eazel-install-object.c:1087
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr "Kan ikke skrive til fil %s, bruker forvalgt logghåndterer"
 
-#: components/services/install/lib/eazel-install-object.c:1218
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "Installasjon feilet"
 
-#: components/services/install/lib/eazel-install-object.c:1264
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "Avinstallering feilet"
 
-#: components/services/install/lib/eazel-install-object.c:1387
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "*** Kunne ikke opprette transaksjonskatalog (%s)! ***\n"
 
-#: components/services/install/lib/eazel-install-object.c:1410
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr "Skriver transaksjon til %s"
 
-#: components/services/install/lib/eazel-install-problem.c:159
+#: components/services/install/lib/eazel-install-problem.c:163
 #, c-format
 msgid "%s was cancelled"
 msgstr "%s ble avbrutt"
 
-#: components/services/install/lib/eazel-install-problem.c:164
-#: components/services/install/lib/eazel-install-problem.c:327
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
 msgid "%s is a source package, which is not yet supported"
 msgstr "%s er en kildepakke, hvilket ikke er støttet ennå"
 
-#: components/services/install/lib/eazel-install-problem.c:178
-#: components/services/install/lib/eazel-install-problem.c:189
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
 #, c-format
 msgid "%s would break other packages"
 msgstr "%s ville ødelegge andre pakker"
 
-#: components/services/install/lib/eazel-install-problem.c:181
+#: components/services/install/lib/eazel-install-problem.c:185
 #, c-format
 msgid "%s would break"
 msgstr "%s vil ikke fungere"
 
-#: components/services/install/lib/eazel-install-problem.c:187
+#: components/services/install/lib/eazel-install-problem.c:191
 #, c-format
 msgid "%s would break %s"
 msgstr "%s vil ødelegge %s"
 
-#: components/services/install/lib/eazel-install-problem.c:193
+#: components/services/install/lib/eazel-install-problem.c:197
 #, c-format
 msgid "%s is damaged"
 msgstr "%s er skadet"
 
-#: components/services/install/lib/eazel-install-problem.c:197
+#: components/services/install/lib/eazel-install-problem.c:201
 #, c-format
 msgid "%s requires %s, which could not be found on the server"
 msgstr "%s trenger %s, som ikke kunne finnes på tjeneren"
 
-#: components/services/install/lib/eazel-install-problem.c:200
-#, c-format
-msgid "%s could not be found on the server"
+#: components/services/install/lib/eazel-install-problem.c:204
+#, fuzzy, c-format
+msgid "%s for %s could not be found on the server"
 msgstr "%s kunne ikke finnes på tjeneren"
 
-#: components/services/install/lib/eazel-install-problem.c:208
-#: components/services/install/lib/eazel-install-problem.c:353
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr "%s er allerede installert"
 
-#: components/services/install/lib/eazel-install-problem.c:252
+#: components/services/install/lib/eazel-install-problem.c:259
 #, c-format
 msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr "%s, som er nyere, må nedgraderes, og nedgradering er ikke slått på"
 
-#: components/services/install/lib/eazel-install-problem.c:256
+#: components/services/install/lib/eazel-install-problem.c:263
 #, c-format
 msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr "%s, som er eldre, må oppgraderes, og oppgradering er ikke slått på"
 
-#: components/services/install/lib/eazel-install-problem.c:346
+#: components/services/install/lib/eazel-install-problem.c:353
 #, c-format
 msgid "%s is not installed and could not be found on server"
 msgstr "%s er ikke installert kunne ikke finnes på tjeneren"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:913
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr "Sjekk etter en ny versjon av %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:924
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr "Installer både %s og %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:939
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr "Fjern %s fra ditt system"
@@ -2552,232 +2547,232 @@ msgstr "Fjern %s fra ditt system"
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:952
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr "Tvungen fjerning av %s fra ditt system"
 
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:960
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr "Pakkedatabasen er ikke konsistent"
 
-#: components/services/install/lib/eazel-install-problem.c:1008
+#: components/services/install/lib/eazel-install-problem.c:1015
 msgid "Continue with force"
 msgstr "Fortsett med tvang"
 
-#: components/services/install/lib/eazel-install-problem.c:1014
+#: components/services/install/lib/eazel-install-problem.c:1021
 msgid "Allow downgrade"
 msgstr "Tillat nedgradering"
 
-#: components/services/install/lib/eazel-install-protocols.c:123
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:166
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
 #, c-format
 msgid "Could not open target file %s"
 msgstr "Kunne ikke åpne målfil %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:130
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:92
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
 msgid "Could not create an http request !"
 msgstr "Kunne ikke lage en http forespørsel!"
 
-#: components/services/install/lib/eazel-install-protocols.c:137
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:99
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
 msgid "Proxy: Invalid uri !"
 msgstr "Proxy: Ugyldig uri!"
 
-#: components/services/install/lib/eazel-install-protocols.c:142
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:105
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
 msgid "Invalid uri !"
 msgstr "Ugyldig uri!"
 
-#: components/services/install/lib/eazel-install-protocols.c:149
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:115
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
 msgid "Could not prepare http request !"
 msgstr "Kunne ikke forberede http forespørsel!"
 
-#: components/services/install/lib/eazel-install-protocols.c:154
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:120
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
 msgid "Couldn't get async mode "
 msgstr "Kunne ikke gå over i asynkron modus"
 
 #. probably out of disk space
-#: components/services/install/lib/eazel-install-protocols.c:183
-#: components/services/install/lib/eazel-install-protocols.c:212
-#: components/services/install/lib/eazel-install-protocols.c:228
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, c-format
 msgid "DISK FULL: could not write %s"
 msgstr "DISK FULL: kunne ikke skrive %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:189
-#: components/services/install/lib/eazel-install-protocols.c:217
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
 msgid "Could not get request body!"
 msgstr "Fikk ikke forspørselens kropp!"
 
-#: components/services/install/lib/eazel-install-protocols.c:202
+#: components/services/install/lib/eazel-install-protocols.c:208
 #, c-format
 msgid "HTTP error: %d %s"
 msgstr "HTTP-feil: %d %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:249
+#: components/services/install/lib/eazel-install-protocols.c:255
 msgid "FTP not supported yet"
 msgstr "FTP er ikke støttet ennå"
 
-#: components/services/install/lib/eazel-install-protocols.c:457
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, c-format
 msgid "Checking local file %s..."
 msgstr "Sjekker lokal fil %s..."
 
-#: components/services/install/lib/eazel-install-protocols.c:578
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, c-format
 msgid "Failed to retrieve %s!"
 msgstr "Klarte ikke å hente %s!"
 
-#: components/services/install/lib/eazel-install-protocols.c:651
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, c-format
 msgid "Could not get an URL for %s"
 msgstr "Fant ikke en URL for %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:666
+#: components/services/install/lib/eazel-install-protocols.c:672
 msgid "Downloaded package does not have the correct name"
 msgstr "Nedlastet pakke har ikke korrekt navn"
 
-#: components/services/install/lib/eazel-install-protocols.c:667
+#: components/services/install/lib/eazel-install-protocols.c:673
 #, c-format
 msgid "Package %s should have had name %s"
 msgstr "Pakke %s skulle hatt navn %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:695
+#: components/services/install/lib/eazel-install-protocols.c:701
 msgid "File download failed"
 msgstr "Nedlasting av fil feilet"
 
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr "*** Start pakkedump ***\n"
 
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr "*** Slutt pakkedump ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:158
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 msgid "*** No package nodes! (cat has no children) ***"
 msgstr "*** Ingen pakkenoder! (cat har ingen barn) ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:160
-#: components/services/install/lib/eazel-install-xml-package-list.c:168
-#: components/services/install/lib/eazel-install-xml-package-list.c:183
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 msgid "*** Bailing from package parse! ***"
 msgstr "*** Hopper over lesing av pakke! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:166
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
 msgid "*** No package nodes! ***"
 msgstr "*** Ingen pakkenoder! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:172
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 msgid "*** Malformed package node!"
 msgstr "*** Feilutformet pakkenode! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:181
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
 msgid "*** No depends nodes! ***"
 msgstr "*** Ingen avhengighetsnoder! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:187
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr "*** Feilutformet avhengighetsnode!"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:211
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr "*** Ukjent nodetype '%s'"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:228
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** Pakkelistefilen inneholder ikke data! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:233
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** Kan ikke finne xmlnoden KATEGORIER! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:234
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr "*** Hopper ut av tolking av kategorier! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:240
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** Ingen kategorier! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:241
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr "*** Hopper ut fra tolking av kategorier! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:295
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** Kan ikke finne xmlnoden TRANSAKSJON! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:297
-#: components/services/install/lib/eazel-install-xml-package-list.c:305
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr "*** Hopper ut fra tolking av transaksjoner! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:303
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** Ingen pakker! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:339
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** Ingen kategorinoder! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:343
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** Kan ikke finne xmlnoden KATEGORIER! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:377
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** Ukjent node %s"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:467
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** Feil under generering av xml pakkeliste! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:514
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** Feil under lesing av pakkelisten! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:909
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** Osd xml inneholder ikke data! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:914
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr "*** Hopper ut av osd tolking! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:990
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "Kunne ikke tolke xml (lengde %d)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:763
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr "Åpnet pakkedatabasen i %s"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:768
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr "Åpning av pakkedatabasen i %s feilet"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:801
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr "Lukker db for %s (åpen)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:806
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr "Lukker db for %s (ikke åpen)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1137
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr "Kan ikke åpne %s"
@@ -2890,7 +2885,7 @@ msgid "Now installing package \"%s\"."
 msgstr "Installerer pakke \"%s\"."
 
 #: components/services/install-view/callbacks.c:407
-#: components/services/install-view/nautilus-service-install-view.c:887
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "Installerer \"%s\""
@@ -2917,29 +2912,29 @@ msgstr "Vil gjerne forsøke følgende :"
 msgid "Is this ok ?"
 msgstr "Er dette ok?"
 
-#: components/services/install-view/callbacks.c:557
+#: components/services/install-view/callbacks.c:556
 msgid "Installation cancelled."
 msgstr "Installasjon avbrutt."
 
-#: components/services/install-view/callbacks.c:559
+#: components/services/install-view/callbacks.c:558
 msgid "This package has already been installed."
 msgstr "Denne pakken er allerede installert."
 
-#: components/services/install-view/callbacks.c:561
-#: components/services/install-view/callbacks.c:658
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
 msgid "Installation complete."
 msgstr "Installasjon fullført."
 
-#: components/services/install-view/callbacks.c:565
+#: components/services/install-view/callbacks.c:564
 msgid "Installation failed."
 msgstr "Installasjonen feilet."
 
 #. some succeeded; some failed
-#: components/services/install-view/callbacks.c:569
+#: components/services/install-view/callbacks.c:568
 msgid "Some packages installed successfully:"
 msgstr "Noen pakker fullførte installasjon:"
 
-#: components/services/install-view/callbacks.c:578
+#: components/services/install-view/callbacks.c:577
 msgid ""
 "\n"
 "Some packages failed:"
@@ -2947,19 +2942,19 @@ msgstr ""
 "\n"
 "Noen pakker feilet:"
 
-#: components/services/install-view/callbacks.c:627
+#: components/services/install-view/callbacks.c:626
 msgid "Erase the RPM files?"
 msgstr "Slett RPM-filene?"
 
-#: components/services/install-view/callbacks.c:629
+#: components/services/install-view/callbacks.c:628
 msgid "Erase the leftover RPM files?"
 msgstr "Slette RPM-filene som er til overs?"
 
-#: components/services/install-view/callbacks.c:659
+#: components/services/install-view/callbacks.c:658
 msgid "Ok"
 msgstr "Ok"
 
-#: components/services/install-view/callbacks.c:674
+#: components/services/install-view/callbacks.c:673
 msgid ""
 "A core package of Nautilus has been\n"
 "updated.  You should restart Nautilus.\n"
@@ -3033,63 +3028,65 @@ msgstr "Fortsett"
 
 #: components/services/install-view/forms.c:482
 #: libnautilus-extensions/nautilus-drag.c:493
-#: src/file-manager/fm-directory-view.c:3523
+#: src/file-manager/fm-directory-view.c:4326
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: components/services/install-view/nautilus-service-install-view.c:419
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
 msgid "%s is in GNOME (footprint) > %s"
 msgstr "%s er i GNOME (fot-menyen) > %s"
 
-#: components/services/install-view/nautilus-service-install-view.c:437
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, c-format
 msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr "%s er i GNOME (fot-menyen).\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:452
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
 msgid "%s is in the KDE menu.\n"
 msgstr "%s er i KDE-menyen.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:653
+#: components/services/install-view/nautilus-service-install-view.c:655
 msgid "Installation Complete"
 msgstr "Installasjon fullført"
 
-#: components/services/install-view/nautilus-service-install-view.c:698
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
 msgid ""
 "%sTo start %s, click the Launch button below, or to create a shortcut, drag "
 "the icon on the right to the GNOME panel or your desktop."
-msgstr "%sFor å starte %s klikker du på Start knappen under, eller fra ikonet til høyre til GNOME panelet eller skrivebordet for å opprette en snarvei."
+msgstr ""
+"%sFor å starte %s klikker du på Start knappen under, eller fra ikonet til "
+"høyre til GNOME panelet eller skrivebordet for å opprette en snarvei."
 
 #. couldn't find an icon
-#: components/services/install-view/nautilus-service-install-view.c:706
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
 msgid "%sTo start %s, click the Launch button below."
 msgstr "%sFor å starte %s klikker du Start knappen under."
 
-#: components/services/install-view/nautilus-service-install-view.c:761
+#: components/services/install-view/nautilus-service-install-view.c:773
 msgid "Incorrect password."
 msgstr "Ugyldig passord."
 
-#: components/services/install-view/nautilus-service-install-view.c:766
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr "Autentiser som root"
 
-#: components/services/install-view/nautilus-service-install-view.c:883
+#: components/services/install-view/nautilus-service-install-view.c:895
 msgid "Installing packages"
 msgstr "Installerer pakker"
 
-#: components/services/install-view/nautilus-service-install-view.c:885
+#: components/services/install-view/nautilus-service-install-view.c:897
 msgid "Installing remote package"
 msgstr "Innstallerer ekstern pakke"
 
-#: components/services/install-view/nautilus-service-install-view.c:889
+#: components/services/install-view/nautilus-service-install-view.c:901
 msgid "Installing some package"
 msgstr "Innstallerer en pakke"
 
-#: components/services/install-view/nautilus-service-install-view.c:906
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
@@ -3097,23 +3094,23 @@ msgstr ""
 "Eazel installeringstjenesten mangler:\n"
 "Installering vil ikke fungere."
 
-#: components/services/install-view/nautilus-service-install-view.c:955
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr "Kontakter Eazel programvarekatalog..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1013
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr "Sjekker autorisasjon..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1085
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr "Avbryter nedlasting av pakker (vennligst vent)..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1105
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "Nedlasting av pakke avbrutt."
 
-#: components/services/install-view/nautilus-service-install-view.c:1106
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "Avbrutt"
 
@@ -3394,12 +3391,12 @@ msgid "Services Login"
 msgstr "Innlogging til tjenester"
 
 #: components/services/summary/nautilus-summary-dialogs.c:131
-#: libnautilus-extensions/nautilus-password-dialog.c:269
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "Brukernavn:"
 
 #: components/services/summary/nautilus-summary-dialogs.c:138
-#: libnautilus-extensions/nautilus-password-dialog.c:276
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "Passord:"
 
@@ -3448,12 +3445,13 @@ msgid "Login"
 msgstr "Logg inn"
 
 #: components/services/summary/nautilus-summary-view.c:170
-#, c-format
-msgid "Welcome, %s!"
-msgstr "Velkommen, %s!"
+#, fuzzy, c-format
+msgid "Eazel Services - Welcome, %s!"
+msgstr "_Eazel tjenester"
 
 #: components/services/summary/nautilus-summary-view.c:175
-msgid "You are not logged in"
+#, fuzzy
+msgid "Eazel Services - You are not logged in"
 msgstr "Du er ikke logget inn"
 
 #: components/services/summary/nautilus-summary-view.c:182
@@ -3469,7 +3467,7 @@ msgstr "Tjenester"
 msgid "Featured Downloads"
 msgstr "Inkluderte nedlastinger"
 
-#: components/services/summary/nautilus-summary-view.c:883
+#: components/services/summary/nautilus-summary-view.c:884
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
 "unavailable right now, or your computer might be configured incorrectly. "
@@ -3479,7 +3477,7 @@ msgstr ""
 "utilgjengelig akkurat nå, eller kanskje din datamaskin ikke er riktig "
 "konfigurert. Vennligst kontakt support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:893
+#: components/services/summary/nautilus-summary-view.c:894
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3487,7 +3485,7 @@ msgstr ""
 "Fant et problem med tjenestedata på Eazel's tjenere. Vennligst kontakt "
 "support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:916
+#: components/services/summary/nautilus-summary-view.c:917
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
 "contact support@eazel.com."
@@ -3495,7 +3493,7 @@ msgstr ""
 "Manglende informasjon fra omdirigeringsdata på Eazel's tjenere. Vennligst "
 "kontakt support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:958
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
 "now, or your computer might be configured incorrectly. You could try again "
@@ -3505,7 +3503,7 @@ msgstr ""
 "nå, eller kanskje din datamaskin ikke er riktig konfigurert. Du kan prøve "
 "igjen senere."
 
-#: components/services/summary/nautilus-summary-view.c:968
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3513,12 +3511,12 @@ msgstr ""
 "Fant et problem med omdirigeringsdata på Eazel's tjenere. Vennligst kontakt "
 "support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:985
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr "Feil under opplasting av systeminventar."
 
-#: components/services/summary/nautilus-summary-view.c:1048
-#: src/nautilus-first-time-druid.c:255
+#: components/services/summary/nautilus-summary-view.c:1049
+#: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr "Eazel tjenester"
 
@@ -3582,16 +3580,16 @@ msgstr "Sammendragsvisning"
 msgid "View as Summary"
 msgstr "Vis som sammendrag"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:130
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
 #, c-format
 msgid "HTTP error %d \"%s\" on uri %s"
 msgstr "HTTP-feil: %d \"%s\" på uri %s"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:200
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:215
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr "Kan ikke skrive loggfil %s -- bruker forvalgt logghåndterer"
@@ -3628,48 +3626,68 @@ msgstr "eazel visning for eksempeltjeneste"
 msgid "Factory for the sample service"
 msgstr "Factory for eksempeltjeneste"
 
-#: components/text/nautilus-text-view.c:326
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr "Beklager, men %s er for stor til at Nautilus kan lese inn alt."
 
-#: components/text/nautilus-text-view.c:329
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr "Filen er for stor"
 
 #: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "Skrifttyper"
+
+#: components/text/nautilus-text-view-ui.xml.h:2
 msgid "Lucida"
 msgstr "Lucida"
 
-#: components/text/nautilus-text-view-ui.xml.h:2
+#: components/text/nautilus-text-view-ui.xml.h:3
 msgid "Use the Courier Font"
 msgstr "Bruk Courier skrifttypen"
 
-#: components/text/nautilus-text-view-ui.xml.h:3
+#: components/text/nautilus-text-view-ui.xml.h:4
+#, fuzzy
+msgid "Use the Fixed Font"
+msgstr "Bruk Times skrifttype"
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+#, fuzzy
+msgid "Use the GTK System Font"
+msgstr "Bruk Times skrifttype"
+
+#: components/text/nautilus-text-view-ui.xml.h:6
 msgid "Use the Helvetica Font"
 msgstr "Bruk Helvetica skrifttype"
 
-#: components/text/nautilus-text-view-ui.xml.h:4
+#: components/text/nautilus-text-view-ui.xml.h:7
 msgid "Use the Lucida Font"
 msgstr "Bruk Lucida skrifttype"
 
-#: components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:8
 msgid "Use the Times Font"
 msgstr "Bruk Times skrifttype"
 
-#: components/text/nautilus-text-view-ui.xml.h:6
+#: components/text/nautilus-text-view-ui.xml.h:9
 msgid "_Courier"
 msgstr "_Courier"
 
-#: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
-msgstr "Skri_fttyper"
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "_Fil"
 
-#: components/text/nautilus-text-view-ui.xml.h:8
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
 msgid "_Helvetica"
 msgstr "_Helvetica"
 
-#: components/text/nautilus-text-view-ui.xml.h:9
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr "_Times"
 
@@ -3738,7 +3756,7 @@ msgid "Nautilus Tree view"
 msgstr "Nautilus trevisning"
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:638
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr "Tre"
 
@@ -3750,7 +3768,7 @@ msgstr "Hildring"
 msgid "Azul"
 msgstr "Azul"
 
-#: data/browser.xml.h:3 libnautilus-extensions/nautilus-font-picker.c:103
+#: data/browser.xml.h:3
 msgid "Black"
 msgstr "Sort"
 
@@ -3862,7 +3880,7 @@ msgstr "Dra et emblem til et objekt for å legge det til objektet"
 msgid "Eclipse"
 msgstr "Eklipse"
 
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1607
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "Emblemer"
 
@@ -3959,7 +3977,7 @@ msgid "Numbers"
 msgstr "Tall"
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "OK"
 
@@ -4080,13 +4098,13 @@ msgid "The Gimp"
 msgstr "GIMP"
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:554
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4796
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
-#: src/file-manager/fm-desktop-icon-view.c:65
+#: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
 msgstr "Søppelkurv"
 
@@ -4119,7 +4137,7 @@ msgid "Google"
 msgstr "Google"
 
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:808
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "Søkemotorer"
 
@@ -4373,101 +4391,101 @@ msgstr "-adobe-helvetica-fet-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2261
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr "i dag, %-I:%M %p"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2266
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr "i går, %-I:%M %p"
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2271
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%A %-m/%-d/%y, %-I:%M %p"
 
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2276
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%-m/%-d/%y, %-I:%M %p"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 oppføringer"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr "0 mapper"
 
-#: libnautilus-extensions/nautilus-file.c:3408
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 filer"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 oppføring"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: libnautilus-extensions/nautilus-file.c:3413
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 fil"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "%u oppføringer"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr "%u mapper"
 
-#: libnautilus-extensions/nautilus-file.c:3417
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u filer"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3720
-#: libnautilus-extensions/nautilus-file.c:3735
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr "? oppføringer"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3726
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr "? bytes"
 
-#: libnautilus-extensions/nautilus-file.c:3739
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "ukjent type"
 
-#: libnautilus-extensions/nautilus-file.c:3741
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "ukjent MIME-type"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3746
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "ukjent"
 
-#: libnautilus-extensions/nautilus-file.c:3782
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr "program"
 
-#: libnautilus-extensions/nautilus-file.c:3794
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
@@ -4477,7 +4495,7 @@ msgstr ""
 "sannsynligvis at din gnome-vfs.keys fil er på feilt sted eller ikke kan "
 "finnes av en eller annen grunn."
 
-#: libnautilus-extensions/nautilus-file.c:3798
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
@@ -4486,7 +4504,7 @@ msgstr ""
 "Ingen beskrivelse funnet for MIME-type \"%s\" (fil er \"%s\"), si ifra til "
 "aaron@eazel.com"
 
-#: libnautilus-extensions/nautilus-file.c:3812
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "lenke"
 
@@ -4494,27 +4512,27 @@ msgstr "lenke"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1156
-#: libnautilus-extensions/nautilus-file.c:3818
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr "lenke til %s"
 
-#: libnautilus-extensions/nautilus-file.c:3832
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr "lenke (ødelagt)"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "Fra:"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "Til:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:588
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4525,7 +4543,7 @@ msgstr ""
 "\n"
 "\"%s\" kan ikke flyttes fordi disken er skrivebeskyttet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:599
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4538,7 +4556,7 @@ msgstr ""
 "\"%s\" kan ikke slettes fordi du ikke har rettigheter til å endre "
 "opphavsmappen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:605
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4549,7 +4567,7 @@ msgstr ""
 "\n"
 "\"%s\" kan ikke slettes fordi opphavsmappen er skrivebeskyttet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:636
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4562,7 +4580,7 @@ msgstr ""
 "\"%s\" kan ikke flyttes fordi du ikke har rettigheter til å endre den "
 "opphavsmappen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:643
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4575,7 +4593,7 @@ msgstr ""
 "\"%s\" kan ikke flyttes til søppelkurven fordi du ikke har rettigheter til å "
 "endre den eller opphavsmappen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:667
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -4586,7 +4604,7 @@ msgstr ""
 "\n"
 "\"%s\" kan ikke kopieres fordi du ikke har leserettigheter."
 
-#: libnautilus-extensions/nautilus-file-operations.c:689
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4597,7 +4615,7 @@ msgstr ""
 "\n"
 "Ikke nok plass på målet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:694
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4608,7 +4626,7 @@ msgstr ""
 "\n"
 "Ikke nok plass på målet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:698
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4619,7 +4637,7 @@ msgstr ""
 "\n"
 "Ikke nok plass på målet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:710
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4630,7 +4648,7 @@ msgstr ""
 "\n"
 "Du har ikke skriverettigheter til denne mappen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4641,7 +4659,7 @@ msgstr ""
 "\n"
 "Måldisken er skrivebeskyttet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:721
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4652,7 +4670,7 @@ msgstr ""
 "\n"
 "Du har ikke skriverettigheter til denne mappen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:725
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4663,7 +4681,7 @@ msgstr ""
 "\n"
 "Måldisken er skrivebeskyttet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:732
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4674,7 +4692,7 @@ msgstr ""
 "\n"
 "Du har ikke skriverettigheter i denne mappen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:736
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4685,7 +4703,7 @@ msgstr ""
 "\n"
 "Måldisken er skrivebeskyttet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4696,7 +4714,7 @@ msgstr ""
 "\n"
 "Vil du fortsette?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4707,7 +4725,7 @@ msgstr ""
 "\n"
 "Vil du fortsette?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:773
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4718,7 +4736,7 @@ msgstr ""
 "\n"
 "Vil du fortsette?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4729,7 +4747,7 @@ msgstr ""
 "\n"
 "Vil du fortsette?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:794
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4740,7 +4758,7 @@ msgstr ""
 "\n"
 "Vil du fortsette?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4751,7 +4769,7 @@ msgstr ""
 "\n"
 "Vil du fortsette?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4762,7 +4780,7 @@ msgstr ""
 "\n"
 "Vil du fortsette?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4773,34 +4791,34 @@ msgstr ""
 "\n"
 "Vil du fortsette?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:924
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "Feil under kopiering."
 
-#: libnautilus-extensions/nautilus-file-operations.c:927
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "Feil under flytting."
 
-#: libnautilus-extensions/nautilus-file-operations.c:930
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "Feil under oppretting av lenke."
 
-#: libnautilus-extensions/nautilus-file-operations.c:935
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "Feil under sletting."
 
-#: libnautilus-extensions/nautilus-file-operations.c:960
-#: libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "Hopp over"
 
-#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1057
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4813,7 +4831,7 @@ msgstr ""
 "\n"
 "Hvis du fremdeles vil flytte \"%s\", endre navn og prøv igjen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1063
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4826,11 +4844,11 @@ msgstr ""
 "\n"
 "Hvis du fremdeles vil kopiere \"%s\", endre navn og prøv igjen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "Kan ikke erstatte fil."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1081
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4841,22 +4859,22 @@ msgstr ""
 "\n"
 "Vil du erstatte den?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1092
-#: libnautilus-extensions/nautilus-file-operations.c:1106
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "Konflikt under kopiering"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Erstatt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Erstatt alle"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1160
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "en annen lenke til %s"
@@ -4865,25 +4883,25 @@ msgstr "en annen lenke til %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dste lenke til %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1180
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dre lenke til %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1184
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%ddje lenke til %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dde lenke til %s"
@@ -4893,241 +4911,227 @@ msgstr "%dde lenke til %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
-#: libnautilus-extensions/nautilus-file-operations.c:2351
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (kopi)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
-#: libnautilus-extensions/nautilus-file-operations.c:2351
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (ny kopi)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1212
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr "ste (kopi)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr "dre (kopi)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1216
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr "dje (kopi)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr "de (kopi)"
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopi)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (ny kopi)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1232
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dste kopi)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1234
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dndre kopi)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1236
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%ddje kopi)%s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dte kopi)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1322
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1330
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1487
-#: libnautilus-extensions/nautilus-file-operations.c:2066
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Ukjent GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1802
-#: libnautilus-extensions/nautilus-file-operations.c:2195
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "Flytter filer til søppelkurv"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1804
-#: libnautilus-extensions/nautilus-file-operations.c:2197
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr "Filer kastet ut:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1821
-#: libnautilus-extensions/nautilus-file-operations.c:2199
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "Flytter"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1807
-#: libnautilus-extensions/nautilus-file-operations.c:2200
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "Forbereder flytting til søppel..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1817
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "Flytter filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "Filer flyttet:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1822
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "Forbereder flytting..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "Fullfører flytting..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "Oppretter lenker til filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1837
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "Filer lenket:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1839
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "Lenker"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "Forbereder oppretting av lenker..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "Fullfører oppretting av lenker..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1848
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "Kopierer filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "Filer kopiert:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "Kopierer"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "Forbereder kopiering..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "Du kan ikke kopiere oppføringer til søppelkurven."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "Kan ikke kopiere til søppelkurv"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1899
-#: libnautilus-extensions/nautilus-file-operations.c:2157
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "Søppelkurven må befinne seg på skrivebordet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "Du kan ikke flytte denne søppelmappen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1902
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "Du kan ikke kopiere søppelkurven."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1903
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "Du kan ikke kopiere søppelkurven."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1905
-#: libnautilus-extensions/nautilus-file-operations.c:2158
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Kan ikke endre plassering av Søppelkurven"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1906
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Kan ikke kopiere søppelkurven"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1923
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "Du kan ikke flytte en mappe til seg selv."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1924
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "Du kan ikke kopiere en mappe over seg selv."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1926
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "Kan ikke flytte til seg selv"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1927
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "Kan ikke kopiere til seg selv"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1940
-msgid "You cannot move a file onto itself."
-msgstr "Du kan ikke flytte en fil til seg selv."
-
-#: libnautilus-extensions/nautilus-file-operations.c:1941
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "Du kan ikke kopiere en fil over seg selv."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1943
-msgid "Can't Move Onto Self"
-msgstr "Kan ikke flytte over seg selv"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1944
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "Kan ikke kopiere over seg selv"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1995
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5137,7 +5141,7 @@ msgstr ""
 "\n"
 "Du har ikke skriverettigheter til målet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1998
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5147,638 +5151,697 @@ msgstr ""
 "\n"
 "Ingen plass på målet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2001
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Feil \"%s\" under oppretting av ny mappe."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2005
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "Feil under oppretting av ny mappe"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2092
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "mappe uten navn"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2164
-#, c-format
-msgid "You cannot throw \"%s\" into the Trash."
-msgstr "Du kan ikke kaste \"%s\" i søppelkurven."
-
-#: libnautilus-extensions/nautilus-file-operations.c:2168
-msgid "Error Moving to Trash"
-msgstr "Feil under flytting til søppelkurven"
-
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2240
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "Sletter filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2242
-#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "Filer slettet:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2244
-#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Sletter"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "Forbereder sletting av filer..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Tømmer søppelkurven"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Forbereder tømming av søppelkurven..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2311
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr ""
 "Er du sikker på at du vil slette alle oppføringer i søppelkurven permanent?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2313
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "Slett innhold i søppelkurv?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2314
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "Tøm"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2352
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2352
-#: libnautilus-extensions/nautilus-file-operations.c:2362
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "foo (kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2353
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2353
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2354
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2354
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".foo (kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2355
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2355
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "foo foo (kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2356
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2356
-#: libnautilus-extensions/nautilus-file-operations.c:2363
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "foo (kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2357
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2357
-#: libnautilus-extensions/nautilus-file-operations.c:2377
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "foo foo (kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2358
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2358
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (kopi).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2359
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2359
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "foo.. (kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2360
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2360
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "foo... (kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2361
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "foo. (kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2361
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "foo. (ny kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2362
-#: libnautilus-extensions/nautilus-file-operations.c:2364
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "foo (ny kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2363
-#: libnautilus-extensions/nautilus-file-operations.c:2365
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "foo (ny kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2364
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "foo (3dje kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2365
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "foo (3dje kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2366
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (ny kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2366
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3dje kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2367
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr "foo (21ste kopi)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr "foo (24de kopi)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr "foo (21ste kopi).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr "foo (24de kopi).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "foo (21ste kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2367
-#: libnautilus-extensions/nautilus-file-operations.c:2369
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "foo (22ndre kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2368
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "foo (21ste kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2368
-#: libnautilus-extensions/nautilus-file-operations.c:2370
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "foo (22ndre kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2369
-#: libnautilus-extensions/nautilus-file-operations.c:2371
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "foo (23dje kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2370
-#: libnautilus-extensions/nautilus-file-operations.c:2372
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "foo (23dje kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2371
-#: libnautilus-extensions/nautilus-file-operations.c:2373
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "foo (24de kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2372
-#: libnautilus-extensions/nautilus-file-operations.c:2374
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "foo (24de kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2373
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "foo (25te kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2374
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "foo (25te kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2375
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24de kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2375
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25te kopi)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2376
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24de kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2376
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25te kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2377
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000te kopi).txt"
 
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (10th copy)"
+msgstr "foo (21ste kopi)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (11st copy)"
+msgstr "foo (21ste kopi)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (10th copy).txt"
+msgstr "foo (21ste kopi).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (11st copy).txt"
+msgstr "foo (21ste kopi).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (11th copy)"
+msgstr "foo (21ste kopi)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (12nd copy)"
+msgstr "foo (22ndre kopi)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (11th copy).txt"
+msgstr "foo (21ste kopi).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (12nd copy).txt"
+msgstr "foo (22ndre kopi).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (12th copy)"
+msgstr "foo (24de kopi)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (13rd copy)"
+msgstr "foo (3dje kopi)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (12th copy).txt"
+msgstr "foo (25te kopi).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (13rd copy).txt"
+msgstr "foo (3dje kopi).txt"
+
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld av %ld"
 
-#: libnautilus-extensions/nautilus-font-picker.c:94
-msgid "Normal"
-msgstr "Normal"
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
+msgid "GConf Error"
+msgstr "GConf-feil"
 
-#: libnautilus-extensions/nautilus-font-picker.c:95
-#: libnautilus-extensions/nautilus-volume-monitor.c:516
-#: libnautilus-extensions/nautilus-volume-monitor.c:535
-msgid "Unknown"
-msgstr "Ukjent"
+#. Constants
+#: libnautilus-extensions/nautilus-global-preferences.c:50
+msgid "Nautilus Preferences"
+msgstr "Nautilus brukervalg"
 
-#: libnautilus-extensions/nautilus-font-picker.c:101
-msgid "Bold"
-msgstr "Uthevet"
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "alltid"
 
-#: libnautilus-extensions/nautilus-font-picker.c:102
-msgid "Book"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "Alltid"
 
-#: libnautilus-extensions/nautilus-font-picker.c:104
-msgid "Demibold"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "kun lokalt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:105
-msgid "Light"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "Kun lokale filer"
 
-#: libnautilus-extensions/nautilus-font-picker.c:111
-msgid "Italic"
-msgstr "Kursiv"
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "aldri"
 
-#: libnautilus-extensions/nautilus-font-picker.c:112
-msgid "Oblique"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "Aldri"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "Jevnere grafikk"
 
-#: libnautilus-extensions/nautilus-font-picker.c:113
-msgid "Reverse Italic"
-msgstr "Omvendt kursiv"
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "Bruk jevnere (men tregere) grafikk"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "Skrifttyper"
 
-#: libnautilus-extensions/nautilus-font-picker.c:114
-msgid "Reverse Oblique"
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+#, fuzzy
+msgid "Font for Icon view:"
+msgstr "Factory for musikkvisning"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-font-picker.c:121
-msgid "Condensed"
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "Factory for historikkvisning"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-font-picker.c:122
-msgid "Semicondensed"
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-font-picker.c:224
-msgid "Font"
-msgstr "Skrifttype"
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "Bruk Nautilus til å tegne skrivebordet"
 
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
-msgid "GConf Error"
-msgstr "GConf-feil"
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
+msgstr "Åpning av nye vinduer"
 
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:956
-msgid "fixed"
-msgstr "fast"
-
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1427
-msgid "01/01/00, 01:00 AM"
-msgstr "01/01/00, 01:00 AM"
+#: libnautilus-extensions/nautilus-global-preferences.c:651
+msgid "Open each file or folder in a separate window"
+msgstr "Åpne hver fil eller mappe i et eget vindu"
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1428
-msgid "1/1/00, 1:00 AM"
-msgstr "1/1/00, 1:00 AM"
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+msgid "Display toolbar in new windows"
+msgstr "Vis verktøylinje i nye vinduer"
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1429
-msgid " 1/ 1/00,  1:00 AM"
-msgstr "1/ 1/00, 1:00 AM"
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "Vis adresselinje i nye vinduer"
 
-#. Constants
-#: libnautilus-extensions/nautilus-global-preferences.c:50
-msgid "Nautilus Preferences"
-msgstr "Nautilus brukervalg"
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "Vis statuslinje i nye vinduer"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:97
-msgid "current theme"
-msgstr "aktivt tema"
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "Vis sidelinje i nye vinduer"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:100
-msgid "Open each file or folder in a separate window"
-msgstr "Åpne hver fil eller mappe i et eget vindu"
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "Søppel-oppførsel"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:103
-msgid "Ask before emptying the Trash"
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+#, fuzzy
+msgid "Ask before emptying the Trash or deleting files"
 msgstr "Spør før tømming av søppelkurven"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:106
-#: libnautilus-extensions/nautilus-global-preferences.c:597
-msgid "Click Behavior"
-msgstr "Klikk-oppførsel"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
+
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:109
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 msgid "single"
 msgstr "enkelt"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:110
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "Aktiver oppføringer med enkeltklikk"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:114
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "dobbelt"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:115
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "Aktiver oppføringer med dobbeltklikk"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:119
-#: libnautilus-extensions/nautilus-global-preferences.c:604
-msgid "Executable Text Files"
-msgstr "Kjørbare tekstfiler"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:122
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 msgid "launch"
 msgstr "start"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:123
+#: libnautilus-extensions/nautilus-global-preferences.c:726
 msgid "Execute files when they are clicked"
 msgstr "Kjør filer når de klikkes"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:127
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 msgid "display"
 msgstr "vis"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:128
+#: libnautilus-extensions/nautilus-global-preferences.c:730
 msgid "Display files when they are clicked"
 msgstr "Vis filer når de klikkes"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:132
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 msgid "ask"
 msgstr "spør"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:133
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 msgid "Ask each time"
 msgstr "Spør hver gang"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:143
-#: libnautilus-extensions/nautilus-global-preferences.c:725
-msgid "Show Text in Icons"
-msgstr "Vis tekst i ikoner"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:146
-#: libnautilus-extensions/nautilus-global-preferences.c:732
-msgid "Show Count of Items in Folders"
-msgstr "Vis antall oppføringer i mapper"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:149
-#: libnautilus-extensions/nautilus-global-preferences.c:739
-msgid "Show Thumbnails for Image Files"
-msgstr "Vis miniatyrer for bildefiler"
-
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:152
-#: libnautilus-extensions/nautilus-global-preferences.c:755
-msgid "Make Folder Appearance Details Public"
-msgstr "Gjør detaljer om katalogutseende offentlig"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:155
-#: libnautilus-extensions/nautilus-global-preferences.c:746
-msgid "Preview Sound Files"
-msgstr "Forhåndsvisning av lydfiler"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Use smoother (but slower) graphics"
-msgstr "Bruk jevnere (men tregere) grafikk"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Use this font family to display file names:"
-msgstr "Bruk denne skrifttypefamilien til å vise filnavn:"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-msgid "Display toolbar in new windows"
-msgstr "Vis verktøylinje i nye vinduer"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:170
-msgid "Display location bar in new windows"
-msgstr "Vis adresselinje i nye vinduer"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:173
-msgid "Display status bar in new windows"
-msgstr "Vis statuslinje i nye vinduer"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:176
-msgid "Display sidebar in new windows"
-msgstr "Vis sidelinje i nye vinduer"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:179
-msgid "Use Nautilus to draw the desktop"
-msgstr "Bruk Nautilus til å tegne skrivebordet"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:183
-msgid "Enable fast search (indexes your hard drive)"
-msgstr "Bruk raske søk (indekserer din harddisk)"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:186
-msgid "search type to do by default"
-msgstr "standard søketype"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:189
-msgid "search by text"
-msgstr "søk etter tekst"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:190
-msgid "Search for files by file name only"
-msgstr "Kun søk etter filer på navn"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:194
-msgid "search by text and properties"
-msgstr "søk etter tekst og egenskaper"
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "Klikk-oppførsel"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:195
-msgid "Search for files by file name and file properties"
-msgstr "Søk etter filer på tekstinnhold og egenskaper"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr "Kjørbare tekstfiler"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:199
-msgid "Search Engine Location"
-msgstr "Plassering for søkemotor"
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr "Vis/skjul-alternativer"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:203
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr "Vis skjulte filer (filnavn begynner med \".\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:206
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr "Vis sikkerhetskopier (filnavn slutter med \"~\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:209
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr "Velg spesielle flagg i Egenskaper-vinduet"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:212
-msgid "Show only folders (no files) in the tree"
-msgstr "Vis kun mapper (ingen filer) i treet"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:215
-msgid "Can add Content"
-msgstr "Kan legge til Innhold"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+#, fuzzy
+msgid "Sorting Order"
+msgstr "Feil under endring av eier"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:218
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
-msgstr "Ikke ta med innebygde bokmerker i bokmerkemenyen"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:222
-#: libnautilus-extensions/nautilus-global-preferences.c:227
-#: src/file-manager/fm-properties-window.c:1519 src/nautilus-location-bar.c:62
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
 msgid "Location:"
 msgstr "Plassering:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:226
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+msgid "HTTP Proxy Settings"
+msgstr "HTTP Proxy-innstillinger"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "Bruk HTTP-proxy"
 
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:228
-#: src/nautilus-first-time-druid.c:680
+#: libnautilus-extensions/nautilus-global-preferences.c:812
+#: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr "Port:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:533
-msgid "Appearance"
-msgstr "Utseende"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:535
-msgid "Smoother Graphics"
-msgstr "Jevnere grafikk"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "Innebygde bokmerker"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:552
-msgid "Windows & Desktop"
-msgstr "Vinduer og skrivebord"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "Ikke ta med innebygde bokmerker i bokmerkemenyen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:560
-msgid "Opening New Windows"
-msgstr "Åpning av nye vinduer"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "Vis tekst i ikoner"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:583
-msgid "Trash Behavior"
-msgstr "Søppel-oppførsel"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr "Vis antall oppføringer i mapper"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:595
-msgid "Icon & List Views"
-msgstr "Ikon- og listevisning"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "Vis miniatyrer for bildefiler"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:611
-msgid "Show/Hide Options"
-msgstr "Vis/skjul-alternativer"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:632
-msgid "Sidebar Panels"
-msgstr "Sidelinjepaneler"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr "Forhåndsvisning av lydfiler"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:635
-msgid "Tabs"
-msgstr "Faner"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr "Gjør detaljer om katalogutseende offentlig"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:684
-msgid "Navigation"
-msgstr "Navigasjon"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "Utseende"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:693
-msgid "HTTP Proxy Settings"
-msgstr "HTTP Proxy-innstillinger"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr "Vinduer og skrivebord"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:712
-msgid "Built-in Bookmarks"
-msgstr "Innebygde bokmerker"
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr "Ikon- og listevisning"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:723
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+msgid "Navigation"
+msgstr "Navigasjon"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:962
 msgid "Speed Tradeoffs"
 msgstr "Forsak hastighet"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:794
-msgid "Search"
-msgstr "Søk"
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr "søk etter tekst"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+msgid "Search for files by file name only"
+msgstr "Kun søk etter filer på navn"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr "søk etter tekst og egenskaper"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+msgid "Search for files by file name and file properties"
+msgstr "Søk etter filer på tekstinnhold og egenskaper"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "Alternativer for kompleksitet i søk"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:802
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "standard søketype"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 msgid "Fast Search"
 msgstr "Raskt søk"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:846
-msgid "Fonts"
-msgstr "Skrifttyper"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1026
-#, c-format
-msgid "Display %s tab in sidebar"
-msgstr "Vis fanen %s på sidelinjen"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr "Bruk raske søk (indekserer din harddisk)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1073
-msgid "always"
-msgstr "alltid"
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+msgid "Search Engine Location"
+msgstr "Plassering for søkemotor"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1074
-msgid "Always"
-msgstr "Alltid"
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Søk"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1077
-msgid "local only"
-msgstr "kun lokalt"
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr "Vis kun mapper (ingen filer) i treet"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1078
-msgid "Local Files Only"
-msgstr "Kun lokale filer"
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, c-format
+msgid "Display %s tab in sidebar"
+msgstr "Vis fanen %s på sidelinjen"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1081
-msgid "never"
-msgstr "aldri"
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "Sidelinjepaneler"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1082
-msgid "Never"
-msgstr "Aldri"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr "Faner"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1145
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "currently can't be performed because the program crond, which does nightly "
 "tasks on your computer, is turned off. To make sure fast searches can be "
 "done, turn crond on."
-msgstr "Indeksering er slått på, hvilket aktiverer raske søk. Men indeksering kan ikke utføres fordi programmet 'crond', som utfører nattlige oppgaver på din datamaskin, er deaktivert. For å forsikre at raske søk kan utføres må du aktivere crond."
+msgstr ""
+"Indeksering er slått på, hvilket aktiverer raske søk. Men indeksering kan "
+"ikke utføres fordi programmet 'crond', som utfører nattlige oppgaver på din "
+"datamaskin, er deaktivert. For å forsikre at raske søk kan utføres må du "
+"aktivere crond."
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1152
-#: libnautilus-extensions/nautilus-global-preferences.c:1170
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
 msgid "Files May Not Be Indexed"
 msgstr "Filer skal ikke indekseres"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1153
-#: libnautilus-extensions/nautilus-global-preferences.c:1171
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
 msgid ""
 "If you are running Linux, you can log in as root and type these commands to "
 "start cron:\n"
@@ -5786,34 +5849,32 @@ msgid ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
-"Hvis du kjører Linux kan du logge inn som root og skrive disse kommandoene for å starte cron:\n"
+"Hvis du kjører Linux kan du logge inn som root og skrive disse kommandoene "
+"for å starte cron:\n"
 "\n"
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1162
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "may not be performed because the program crond, which does nightly tasks on "
 "your computer, may be turned off. To make sure fast searches can be done, "
 "check to make sure that crond is turned on.\n"
 "\n"
-msgstr "Indeksering er slått på hvilket aktiverer raske søk. Men indeksering kan ikke utføres fordi programmet 'crond', som utfører nattlige oppgaver på din datamaskin, kan være deaktivert. For å forsikre deg om at raske søk kan utføres må du sjekke at crond er aktivert.\n\n"
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:640
-msgid "No image was selected.  You must click on an image to select it."
-msgstr "Ingen bilder ble valgt. Du må klikke på et bilde for å velge det."
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:641
-msgid "No selection made"
-msgstr "Ingen valgt gjort"
+msgstr ""
+"Indeksering er slått på hvilket aktiverer raske søk. Men indeksering kan "
+"ikke utføres fordi programmet 'crond', som utfører nattlige oppgaver på din "
+"datamaskin, kan være deaktivert. For å forsikre deg om at raske søk kan "
+"utføres må du sjekke at crond er aktivert.\n"
+"\n"
 
 #. The list of characters that cause line breaks can be localized.
 #: libnautilus-extensions/nautilus-icon-canvas-item.c:70
 msgid " -_,;.?/&"
 msgstr "-_,;.?/&"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:766
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
@@ -5823,7 +5884,7 @@ msgstr ""
 "plassering og la oppføringen bli hvor du slapp den? Dette vil ødelegge den "
 "lagrede manuelle plasseringen."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:770
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
@@ -5833,7 +5894,7 @@ msgstr ""
 "plassering og la disse oppføringene bli hvor du slapp dem? Dette vil "
 "ødelegge den lagrede manuelle plasseringen."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:776
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
@@ -5841,7 +5902,7 @@ msgstr ""
 "Denne katalogen bruker automatisk plassering. Ønsker du å bytte til manuell "
 "plassering og la denne oppføringen bli hvor du slapp den?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:779
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
@@ -5849,64 +5910,48 @@ msgstr ""
 "Denne katalogen bruker automatisk plassering. Ønsker du å bytte til manuell "
 "plassering og la disse oppføringene bli hvor du slapp dem?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:784
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "Bytt til manuell plassering?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:785
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "Bytt"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "Gi nytt navn"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1551
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr "Angre inntasting"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1552
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "Gjenopprett det gamle navnet"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1553
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "Gjenopprett inntasting"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1554
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Gjenopprett det endrede navnet"
 
-#: libnautilus-extensions/nautilus-password-dialog.c:306
-msgid "Remember this password"
-msgstr "Husk dette passordet"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:483
-msgid "times"
-msgstr "times"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:484
-msgid "courier"
-msgstr "courier"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:485
-msgid "lucida"
-msgstr "lucida"
-
-#: libnautilus-extensions/nautilus-preferences.c:76
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "Begynner"
 
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "Viderekommen"
 
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "Avansert"
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:202
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "Brukervalg-boks"
 
@@ -6005,7 +6050,7 @@ msgid "Don't include in the menu for \"%s\" items"
 msgstr "Ikke ta med i menyen for \"%s\"-oppføringer"
 
 #: libnautilus-extensions/nautilus-program-chooser.c:1209
-#: src/file-manager/fm-list-view.c:2122
+#: src/file-manager/fm-list-view.c:2182
 #: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
@@ -6114,7 +6159,11 @@ msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
 "locations.  No other applications are available to view this file.  If you "
 "copy this file onto your computer, you may be able to open it."
-msgstr "\"%s\" kan ikke åpne \"%s\" fordi \"%s\" ikke kan aksessere filer i \"%s\"-lokasjoner. Ingen andre applikasjoner er tilgjengelige for å vise denne filen. Hvis du kopierer denne filen til din datamaskin, vil du kanskje kunne åpne den."
+msgstr ""
+"\"%s\" kan ikke åpne \"%s\" fordi \"%s\" ikke kan aksessere filer i "
+"\"%s\"-lokasjoner. Ingen andre applikasjoner er tilgjengelige for å vise "
+"denne filen. Hvis du kopierer denne filen til din datamaskin, vil du kanskje "
+"kunne åpne den."
 
 #. Human readable description for a criterion in a search for
 #. files. Bracketed items are context, and are message
@@ -6361,25 +6410,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Oppføringer som har \"medusa\" i navnet og er mapper"
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr "Detaljer"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr "Advarsel"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr "Feil"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr "Spørsmål"
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr "Søker på diskene"
@@ -6388,7 +6418,7 @@ msgstr "Søker på diskene"
 msgid "Nautilus is searching your disks for trash folders."
 msgstr "Nautilus søker etter søppelmapper på dine disker."
 
-#: libnautilus-extensions/nautilus-trash-file.c:600
+#: libnautilus-extensions/nautilus-trash-file.c:725
 msgid "on the desktop"
 msgstr "på skrivebordet"
 
@@ -6422,47 +6452,44 @@ msgstr "Vis som %s"
 msgid "%s Viewer"
 msgstr "%s-visning"
 
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+msgid "Unknown"
+msgstr "Ukjent"
+
 #. Populate table with items we know localized names for.
-#: libnautilus-extensions/nautilus-volume-monitor.c:623
-#: libnautilus-extensions/nautilus-volume-monitor.c:1862
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr "Diskett"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:624
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:625
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
 msgid "Zip Drive"
 msgstr "Zip-disk"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:646
-#: libnautilus-extensions/nautilus-volume-monitor.c:668
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 msgid "Audio CD"
 msgstr "Lyd-CD"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1547
-msgid "Mount Error"
-msgstr "Monteringsfeil"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1549
-msgid "Unmount Error"
-msgstr "Feil under avmontering"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1579
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr "er skrivebeskyttet, monterer med lesetilgang"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1582
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "er ikke en gyldig blokkenhet"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1583
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr "Ingen media funnet"
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1587
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
@@ -6471,7 +6498,7 @@ msgstr ""
 "i stasjonen."
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1591
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
@@ -6479,11 +6506,11 @@ msgstr ""
 "Nautilus klarte ikke å montere volumet. Det er sannsynligvis ikke noe media "
 "i enheten."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1594
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr "feil fs-type, ugyldig flagg, ugyldig superblokk på"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1597
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
@@ -6491,7 +6518,7 @@ msgstr ""
 "Nautilus klarte ikke å montere diskettstasjonen. Disketten er sannsynligvis "
 "i et format som ikke kan monteres."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1600
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
@@ -6499,48 +6526,56 @@ msgstr ""
 "Nautilus klarte ikke å montere det valgte volumet. Volumet er sannsynligvis "
 "i et format som ikke kan monteres."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1605
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr "Nautilus klarte ikke å montere valgt diskettstasjon."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1607
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "Nautilus kunne ikke montere det valgte volumet."
 
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1612
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr "Nautilus kunne ikke avmontere det valgte volumet."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1764
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr "Monteringsfeil"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr "Feil under avmontering"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "ISO 9660 volum"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1779
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "Root"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1786
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Ext2 volum"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1801
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "MSDOS-volum"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1816
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "NFS-volum"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1831
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
 msgid "ReiserFS Volume"
 msgstr "ReiserFS-volum"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1847
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
 msgid "UFS Volume"
 msgstr "UFS-volum"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1877
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "Ukjent volum"
 
@@ -6548,31 +6583,65 @@ msgstr "Ukjent volum"
 msgid "C_lear Text"
 msgstr "F_jern tekst"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "F_jern tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "_Kopier tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "Kopier valgt tekst til utklippstavlen"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "Klipp ut _tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+msgid "Cut _Text"
+msgstr "Klipp ut _tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "Klipp ut valgt tekst til utklippstavlen"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:46
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "_Lim inn tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "Lim inn tekst som er lagret på utklippstavlen"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "Fjerner den valgte teksten uten å plassere den på utklippstavlen"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:80
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "Velg _alt"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+msgid "Select _All"
+msgstr "Velg _alt"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "Velg alle oppføringer i dette vinduet"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "_Kopier tekst"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:7
-msgid "_Cut Text"
-msgstr "_Klipp ut tekst"
-
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:93
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "_Lim inn tekst"
 
@@ -6581,7 +6650,7 @@ msgstr "_Lim inn tekst"
 #. * to change it when we upgrade to GTK 2.0.
 #.
 #: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
-#: src/nautilus-window-menus.c:563
+#: src/nautilus-window-menus.c:610
 msgid "Nautilus"
 msgstr "Nautilus"
 
@@ -6597,78 +6666,110 @@ msgstr "Nautilus filhåndterer og grafisk skall"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:735
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr "Hjem til %s"
 
-#: src/file-manager/fm-desktop-icon-view.c:1021
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "Tøm søppelkurv..."
 
-#: src/file-manager/fm-desktop-icon-view.c:1023
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "Tøm søppelkurv"
 
-#: src/file-manager/fm-desktop-icon-view.c:1043
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "Avmonter volum"
 
-#: src/file-manager/fm-directory-view.c:474
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr "Dette vil åpne %d separate vinduer. Er du sikker på at du vil dette?"
 
-#: src/file-manager/fm-directory-view.c:476
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Åpne %d nye vinduer?"
 
-#: src/file-manager/fm-directory-view.c:1219
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr "Er du sikker på at du vil slette \"%s\" fra søppelkurven permanent?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+"Er du sikker på at du vil slette %d valgte oppføringer i søppelkurven "
+"permanent?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Slett"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Slett"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+#, fuzzy
+msgid "scripts"
+msgstr "Beskrivelse"
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" valgt"
 
-#: src/file-manager/fm-directory-view.c:1221
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "1 mappe valgt"
 
-#: src/file-manager/fm-directory-view.c:1224
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "%d mapper valgt"
 
-#: src/file-manager/fm-directory-view.c:1230
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr " (inneholdende 0 oppføringer)"
 
-#: src/file-manager/fm-directory-view.c:1232
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr " (inneholdende 1 oppføring)"
 
-#: src/file-manager/fm-directory-view.c:1234
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr " (inneholdende %d oppføringer)"
 
-#: src/file-manager/fm-directory-view.c:1245
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" valgt (%s)"
 
-#: src/file-manager/fm-directory-view.c:1249
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d oppføringer valgt (%s)"
 
-#: src/file-manager/fm-directory-view.c:1256
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 annen oppføring valgt (%s)"
 
-#: src/file-manager/fm-directory-view.c:1259
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d andre oppføringer valgt (%s)"
@@ -6680,7 +6781,7 @@ msgstr "%d andre oppføringer valgt (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1288
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -6689,7 +6790,7 @@ msgstr "%s%s, %s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1415
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
@@ -6698,18 +6799,18 @@ msgstr ""
 "Mappen \"%s\" inneholder flere filer enn Nautilus kan håndtere. Noen filer "
 "vil ikke vises."
 
-#: src/file-manager/fm-directory-view.c:1422
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "For mange filer"
 
-#: src/file-manager/fm-directory-view.c:2619
+#: src/file-manager/fm-directory-view.c:2752
 #, c-format
 msgid ""
 "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
 msgstr ""
 "\"%s\" kan ikke flyttes til søppelkurven. Ønsker du å slette den med én gang?"
 
-#: src/file-manager/fm-directory-view.c:2624
+#: src/file-manager/fm-directory-view.c:2757
 #, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
@@ -6718,7 +6819,7 @@ msgstr ""
 "De %d valgte oppføringene kan ikke flyttes til søppelkurven. Vil du slette "
 "dem med én gang?"
 
-#: src/file-manager/fm-directory-view.c:2628
+#: src/file-manager/fm-directory-view.c:2761
 #, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -6727,21 +6828,16 @@ msgstr ""
 "%d av de valgte oppføringene kan ikke flyttes til søppelkurven. Vil du "
 "slette ddisse %d oppføringene med én gang?"
 
-#: src/file-manager/fm-directory-view.c:2636
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "Slett med én gang?"
 
-#: src/file-manager/fm-directory-view.c:2637
-#: src/file-manager/fm-directory-view.c:2678
-msgid "Delete"
-msgstr "Slett"
-
-#: src/file-manager/fm-directory-view.c:2667
+#: src/file-manager/fm-directory-view.c:2799
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr "Er du sikker på at du vil slette \"%s\" fra søppelkurven permanent?"
 
-#: src/file-manager/fm-directory-view.c:2671
+#: src/file-manager/fm-directory-view.c:2803
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
@@ -6750,75 +6846,213 @@ msgstr ""
 "Er du sikker på at du vil slette %d valgte oppføringer i søppelkurven "
 "permanent?"
 
-#: src/file-manager/fm-directory-view.c:2677
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "Slett fra søppelkurven?"
 
-#: src/file-manager/fm-directory-view.c:2950
-#: src/file-manager/fm-directory-view.c:2990
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Bruk \"%s\" til å åpne valgt oppføring"
 
-#: src/file-manager/fm-directory-view.c:3192
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "Andre _applikasjoner..."
+
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "Andre _applikasjoner..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "Annet _visningsprogram..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "Annet _visningsprogram..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "Bruk \"%s\" til å åpne valgt oppføring"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "Nautilus kunne ikke montere det valgte volumet."
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"De %d valgte oppføringene kan ikke flyttes til søppelkurven. Vil du slette "
+"dem med én gang?"
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "Åpne _i et nytt vindu"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open _in New Window"
 msgstr "Åpne _i et nytt vindu"
 
-#: src/file-manager/fm-directory-view.c:3194
+#: src/file-manager/fm-directory-view.c:3959
 #, c-format
 msgid "Open _in %d New Windows"
 msgstr "Åpne _i %d nye vinduer"
 
-#: src/file-manager/fm-directory-view.c:3220
-msgid "Delete all selected items permanently"
-msgstr "Slett alle valgte oppføringer permanent"
-
-#: src/file-manager/fm-directory-view.c:3225
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "Sle_tt fra søppelkurven..."
 
-#: src/file-manager/fm-directory-view.c:3226
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "Sle_tt fra søppelkurven"
 
-#: src/file-manager/fm-directory-view.c:3230
-msgid "Move all selected items to the Trash"
-msgstr "Flytt alle valgte oppføringer til søppelkurven"
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "Slett alle valgte oppføringer permanent"
 
-#: src/file-manager/fm-directory-view.c:3234
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "Flyt_t til søppelkurv"
 
-#: src/file-manager/fm-directory-view.c:3264
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "Flytt alle valgte oppføringer til søppelkurven"
+
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "Slett"
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "Slett"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "Opprett _lenker"
 
-#: src/file-manager/fm-directory-view.c:3265
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "Opprett _lenke"
 
-#: src/file-manager/fm-directory-view.c:3283
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "_Tøm søppelkurv..."
 
-#: src/file-manager/fm-directory-view.c:3284
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "_Tøm søppelkurv"
 
-#: src/file-manager/fm-directory-view.c:3295
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "Fje_rn egendefinerte bilder"
 
-#: src/file-manager/fm-directory-view.c:3296
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "Fj_ern egendefinert bilde"
 
-#: src/file-manager/fm-directory-view.c:3449
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "_Fil"
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u filer"
+
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "_Kopier tekst"
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "Kopierer filer"
+
+#: src/file-manager/fm-directory-view.c:4252
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
 "link in the Trash?"
@@ -6826,7 +7060,7 @@ msgstr ""
 "Denne lenken kan ikke brukes fordi den ikke har noe mål. Ønsker du å flytte "
 "denne lenken til søppelkurven?"
 
-#: src/file-manager/fm-directory-view.c:3452
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
@@ -6835,34 +7069,34 @@ msgstr ""
 "Denne lenken kan ikke brukes fordi målet, \"%s\", ikke eksisterer. Vil du "
 "legge denne lenken i søppelkurven?"
 
-#: src/file-manager/fm-directory-view.c:3458
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "Ødelagt lenke"
 
-#: src/file-manager/fm-directory-view.c:3459
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr "Kast bort"
 
-#: src/file-manager/fm-directory-view.c:3512
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
 "contents?"
 msgstr "\"%s\" er en kjørbar tekstfil. Vil du kjøre den eller vise innholdet?"
 
-#: src/file-manager/fm-directory-view.c:3518
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr "Kjør eller vis?"
 
-#: src/file-manager/fm-directory-view.c:3519
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "Kjør"
 
-#: src/file-manager/fm-directory-view.c:3520
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "Vis"
 
-#: src/file-manager/fm-directory-view.c:3574
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
@@ -6870,16 +7104,16 @@ msgstr ""
 "Beklager, men du kan ikke kjøre kommandoer fra en ekstern tjener av "
 "sikkerhetshensyn."
 
-#: src/file-manager/fm-directory-view.c:3576
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "Kunne ikke kjøre eksterne lenker"
 
-#: src/file-manager/fm-directory-view.c:3710
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr "Åpner \"%s\""
 
-#: src/file-manager/fm-directory-view.c:3716
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "Avbryt åpning?"
 
@@ -6889,16 +7123,21 @@ msgid ""
 "You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "Du har ikke nødvendige rettigheter til å vise innholdet av \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:65
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Beklager, kunne ikke vise alt innholdet for \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Feil under visning av mappe"
 
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
@@ -6906,7 +7145,7 @@ msgstr ""
 "Navnet \"%s\" er allerede i bruk i denne mappen. Vennligst bruk et annet "
 "navn."
 
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
@@ -6914,12 +7153,12 @@ msgstr ""
 "\"%s\" finnes ikke i denne mappen. Kanskje den er flyttet eller slettet "
 "nylig?"
 
-#: src/file-manager/fm-error-reporting.c:109
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Du har ikke nødvendige rettigheter til å endre navn på \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -6928,63 +7167,63 @@ msgstr ""
 "Navnet \"%s\" er ikke gyldig fordi det inneholder tegnet \"/\". Vennligst "
 "bruk et annet navn."
 
-#: src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Navnet \"%s\" er ikke gyldig. Vennligst bruk et annet navn."
 
-#: src/file-manager/fm-error-reporting.c:124
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Kunne ikke endre navn på \"%s\" fordi den er på en skrivebeskyttet disk"
 
-#: src/file-manager/fm-error-reporting.c:133
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Beklager, kunne ikke endre navn for \"%s\" til \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:140
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "Feil under endring av navn"
 
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Du har ikke nødvendige rettigheter til å endre gruppen for \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Kunne ikke endre gruppe for \"%s\" fordi den er på en skrivebeskyttet disk"
 
-#: src/file-manager/fm-error-reporting.c:172
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Beklager, kunne ikke endre gruppe for \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:176
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "Feil under setting av gruppe"
 
-#: src/file-manager/fm-error-reporting.c:198
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Kunne ikke endre eier for \"%s\" fordi den er på en skrivebeskyttet disk"
 
-#: src/file-manager/fm-error-reporting.c:205
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Beklager, kunne ikke endre eier for \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "Feil under endring av eier"
 
-#: src/file-manager/fm-error-reporting.c:230
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
@@ -6992,21 +7231,21 @@ msgstr ""
 "Kunne ikke endre rettigheter for \"%s\" fordi den er på en skrivebeskyttet "
 "disk"
 
-#: src/file-manager/fm-error-reporting.c:237
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Beklager, kunne ikke endre rettigheter for \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "Feil under setting av rettigheter"
 
-#: src/file-manager/fm-error-reporting.c:306
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Endrer navn fra \"%s\" til \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:311
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "Avbryt endring av navn?"
 
@@ -7066,76 +7305,76 @@ msgstr ""
 "Velg rekkefølgen for informasjonen som skal vises under ikonnavnene. Mer "
 "informasjon vises etter hvert som du zoomer inn."
 
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "etter _navn"
 
-#: src/file-manager/fm-icon-view.c:159
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "Behold ikoner sortert etter navn i rader"
 
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "etter _størrelse"
 
-#: src/file-manager/fm-icon-view.c:166
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "Behold ikoner sortert etter størrelse i rader"
 
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "etter _type"
 
-#: src/file-manager/fm-icon-view.c:173
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "Behold ikoner sortert etter type i rader"
 
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "etter modifikasjons_dato"
 
-#: src/file-manager/fm-icon-view.c:180
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Behold ikoner sortert etter modifikasjonsdato i rader"
 
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "etter _emblemer"
 
-#: src/file-manager/fm-icon-view.c:187
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Behold ikoner sortert etter emblemer i rader"
 
-#: src/file-manager/fm-icon-view.c:1230
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "_Gjenopprett ikonets opprinnelige størrelse"
 
-#: src/file-manager/fm-icon-view.c:1231
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "_Gjenopprett ikonets opprinnelige størrelse"
 
-#: src/file-manager/fm-icon-view.c:1443
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "peker til \"%s\""
 
-#: src/file-manager/fm-list-view.c:2128
+#: src/file-manager/fm-list-view.c:2188
 #: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/file-manager/fm-list-view.c:2134
+#: src/file-manager/fm-list-view.c:2194
 #: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Type"
 
-#: src/file-manager/fm-list-view.c:2140
+#: src/file-manager/fm-list-view.c:2200
 #: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Dato endret"
@@ -7192,120 +7431,126 @@ msgstr "(noe innhold ikke lesbart)"
 msgid "Contents:"
 msgstr "Innhold:"
 
-#: src/file-manager/fm-properties-window.c:1433
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "Grunnleggende"
 
-#: src/file-manager/fm-properties-window.c:1512
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Type:"
 
-#: src/file-manager/fm-properties-window.c:1517
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: src/file-manager/fm-properties-window.c:1521
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "Lenkesett"
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
 msgstr "MIME-type:"
 
-#: src/file-manager/fm-properties-window.c:1527
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "Endret:"
 
-#: src/file-manager/fm-properties-window.c:1530
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "Aksessert:"
 
-#: src/file-manager/fm-properties-window.c:1539
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr "Velg egendefinert ikon..."
 
-#: src/file-manager/fm-properties-window.c:1545
+#: src/file-manager/fm-properties-window.c:1558
 msgid "Remove Custom Icon"
 msgstr "Fjern egendefinert ikon"
 
-#: src/file-manager/fm-properties-window.c:1873
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "Sett bruker-ID"
 
-#: src/file-manager/fm-properties-window.c:1878
+#: src/file-manager/fm-properties-window.c:1891
 msgid "Special Flags:"
 msgstr "Spesielle flagg:"
 
-#: src/file-manager/fm-properties-window.c:1881
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "Sett gruppe-ID"
 
-#: src/file-manager/fm-properties-window.c:1883
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "Klebrig"
 
-#: src/file-manager/fm-properties-window.c:1909
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Rettigheter"
 
-#: src/file-manager/fm-properties-window.c:1915
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Du er ikke eieren, du kan derfor ikke endre disse rettighetene."
 
-#: src/file-manager/fm-properties-window.c:1928
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "Fileier:"
 
-#: src/file-manager/fm-properties-window.c:1937
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "Filgruppe:"
 
-#: src/file-manager/fm-properties-window.c:1955
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "Eier:"
 
-#: src/file-manager/fm-properties-window.c:1956
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: src/file-manager/fm-properties-window.c:1957
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "Andre:"
 
-#: src/file-manager/fm-properties-window.c:1976
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "Lese"
 
-#: src/file-manager/fm-properties-window.c:1980
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "Skrive"
 
-#: src/file-manager/fm-properties-window.c:1984
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "Kjøre"
 
-#: src/file-manager/fm-properties-window.c:2035
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "Tekstvisning:"
 
-#: src/file-manager/fm-properties-window.c:2036
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "Tallvisning:"
 
-#: src/file-manager/fm-properties-window.c:2037
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "Sist endret:"
 
-#: src/file-manager/fm-properties-window.c:2041
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Rettighetene for \"%s\" kunne ikke bestemmes."
 
-#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr "Avbryt visning av egenskaper-vinduet?"
 
-#: src/file-manager/fm-properties-window.c:2322
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr "Oppretter egenskaper-vindu"
 
-#: src/file-manager/fm-properties-window.c:2422
+#: src/file-manager/fm-properties-window.c:2435
 msgid "Select an icon:"
 msgstr "Velg et ikon:"
 
@@ -7331,7 +7576,7 @@ msgstr ""
 "installert."
 
 #: src/file-manager/fm-search-list-view.c:159
-#: src/file-manager/nautilus-indexing-info.c:405
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr "Søketjenesten ikke tilgjengelig"
 
@@ -7505,7 +7750,7 @@ msgstr ""
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
 #: src/file-manager/fm-search-list-view.c:360
-#: src/file-manager/nautilus-indexing-info.c:340
+#: src/file-manager/nautilus-indexing-info.c:342
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
@@ -7520,7 +7765,7 @@ msgid "Fast searches are not available on your computer"
 msgstr "Raskt søk er ikke tilgjengelig på din datamaskin"
 
 #: src/file-manager/fm-search-list-view.c:373
-#: src/file-manager/nautilus-indexing-info.c:359
+#: src/file-manager/nautilus-indexing-info.c:361
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Fast search is disabled in your Search preferences, so no index is available."
@@ -7530,13 +7775,13 @@ msgstr ""
 "tilgjengelig."
 
 #: src/file-manager/fm-search-list-view.c:376
-#: src/file-manager/nautilus-indexing-info.c:345
-#: src/file-manager/nautilus-indexing-info.c:363
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
 msgid "Fast searches are not available on your computer."
 msgstr "Raskt søk er ikke tilgjengelig på din datamaskin."
 
 #: src/file-manager/fm-search-list-view.c:377
-#: src/file-manager/nautilus-indexing-info.c:364
+#: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
 "To enable fast search, open the Preferences menu and choose Preferences. "
 "Then select Search preferences and put a checkmark in the Enable Fast Search "
@@ -7594,7 +7839,7 @@ msgid "Change Desktop Background"
 msgstr "Endre skrivebordsbakgrunn"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Delete all items in the Trash"
 msgstr "Slett alle oppføringer i søppelkurven"
 
@@ -7642,142 +7887,194 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Velg et annet visningsprogram du vil vise valgt oppføring med"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-msgid "Create Link"
-msgstr "Opprett lenke"
+#, fuzzy
+msgid "Copy Files"
+msgstr "Kopierer filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "Lag en ny tom mappe i denne mappen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "Opprett en symbolsk lenke for hver valgt oppføring"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u filer"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "Flytt hver valgt oppføring til søppelkurven"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "Dupliser"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "Dupliser alle valgte oppføringer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "Opprett lenke"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr "Flytt hver valgt oppføring til søppelkurven"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Move to Trash"
 msgstr "Flytt til søppelkurv"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "Ny mappe"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "Åpne"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid "Open Wit_h"
 msgstr "Å_pne med"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "Åpne med"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "Åpne hver valgt oppføring i et nytt vindu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr "Åpne i et nytt vindu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Åpne valgt oppføring i dette vinduet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "Annen applikasjon..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "Annet visningsprogram..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Other _Application..."
-msgstr "Andre _applikasjoner..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "tekstfiler"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-msgid "Other _Viewer..."
-msgstr "Annet _visningsprogram..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr "Fjern egendefinerte bilder"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr "Fjern egendefinerte bilder fra valgte ikoner"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr ""
 "Fjern ethvert egendefinert mønster eller farge fra bakgrunnen for denne "
 "plasseringen"
 
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "Nulltill bakgrunn"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#, fuzzy
+msgid "Scripts"
+msgstr "Hemmelig"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr "Velg alle filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Select _All Files"
 msgstr "Velg _alle filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "Velg alle oppføringer i dette vinduet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr "Vis egenskaper"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Show Trash"
 msgstr "Vis søppelkurv"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "Vis egenska_per"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "Show the contents of the Trash"
 msgstr "Vis innholdet i søppelkurven"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "Vis eller modifiser egenskapene for hver av de valgte oppføringene"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "_Dupliser"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "_Åpne"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "_Lim inn tekst"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Show Trash"
 msgstr "_Vis søppelkurv"
 
@@ -7959,7 +8256,7 @@ msgstr ""
 
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr "Indekseringsstatus"
 
@@ -7977,11 +8274,11 @@ msgstr ""
 msgid "Your files were last indexed at %s"
 msgstr "Dine filer ble sist indeksert %s"
 
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "Oppdater nå"
 
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast.  Your files are currently being indexed."
@@ -7989,11 +8286,11 @@ msgstr ""
 "En gang om dagen blir dine filer og tekstinnhold indeksert slik at dine søk "
 "blir raske. Dine file blir nå indeksert."
 
-#: src/file-manager/nautilus-indexing-info.c:404
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Beklager, men Medusa-søketjenesten ikke tilgjengelig."
 
-#: src/file-manager/nautilus-indexing-info.c:426
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -8181,7 +8478,7 @@ msgstr "Bokmerker"
 msgid "Location"
 msgstr "Plassering"
 
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:757
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Fjern"
 
@@ -8198,7 +8495,7 @@ msgstr "Færre alternativer"
 msgid "Find Them!"
 msgstr "Finn dem!"
 
-#: src/nautilus-first-time-druid.c:184
+#: src/nautilus-first-time-druid.c:191
 msgid ""
 "Existence of this file indicates that the Nautilus configuration druid\n"
 "has been presented.\n"
@@ -8212,7 +8509,7 @@ msgstr ""
 "Du kan slette denne filen manuelt for å vise veiviseren igjen.\n"
 "\n"
 
-#: src/nautilus-first-time-druid.c:484
+#: src/nautilus-first-time-druid.c:487
 msgid ""
 "Your user level adjusts Nautilus to your degree of experience\n"
 "using GNOME and Linux. Choose a level that's comfortable for\n"
@@ -8222,7 +8519,7 @@ msgstr ""
 "ekspertise innen bruk av GNOME og Linux. Velg et startnivå som du\n"
 "er komfortabel med - du kan alltid endre det igjen senere."
 
-#: src/nautilus-first-time-druid.c:495
+#: src/nautilus-first-time-druid.c:498
 msgid ""
 "For users who have no previous experience with GNOME\n"
 "and Linux."
@@ -8230,7 +8527,7 @@ msgstr ""
 "For bruker som ikke har tidligere erfaring med GNOME\n"
 "og Linux."
 
-#: src/nautilus-first-time-druid.c:501
+#: src/nautilus-first-time-druid.c:504
 msgid ""
 "For users who are comfortable with GNOME and Linux,\n"
 "but don't describe themselves as ``technical.''"
@@ -8238,7 +8535,7 @@ msgstr ""
 "For brukere som er komfortabel med GNOME og Linux,\n"
 "men som ikke beskriver seg selv som ``tekniske''."
 
-#: src/nautilus-first-time-druid.c:507
+#: src/nautilus-first-time-druid.c:510
 msgid ""
 "For users who have GNOME and Linux experience, and\n"
 "like to see every detail of the operating system."
@@ -8246,7 +8543,7 @@ msgstr ""
 "For brukere som har erfaring med GOME og Linux, og\n"
 "som ønsker å se alle detaljer ved operativsystemet."
 
-#: src/nautilus-first-time-druid.c:545
+#: src/nautilus-first-time-druid.c:548
 msgid ""
 "To verify your Internet connection and make sure you have\n"
 "the latest Nautilus updates, Nautilus will now connect to\n"
@@ -8266,15 +8563,15 @@ msgstr ""
 "Hvis du vet at din maskin bruker en proxy-tilkobling, klikker\n"
 "du verifiser for å la Nautilus bruke den.\n"
 
-#: src/nautilus-first-time-druid.c:559
+#: src/nautilus-first-time-druid.c:562
 msgid "Verify my connection and check for updates"
 msgstr "Verifiser min tilkobling og sjekk for oppdateringer"
 
-#: src/nautilus-first-time-druid.c:560
+#: src/nautilus-first-time-druid.c:563
 msgid "Don't verify my connection or check for updates"
 msgstr "Ikke verifiser min tilkobling eller sjekk for oppdateringer"
 
-#: src/nautilus-first-time-druid.c:625
+#: src/nautilus-first-time-druid.c:628
 msgid ""
 "We are having trouble making an external web connection.\n"
 "Sometimes, firewalls require you to specify a web proxy server.\n"
@@ -8284,28 +8581,28 @@ msgstr ""
 "Noen ganger gjør brannvegger det nødvendig å spesifisere en proxy-tjener.\n"
 "Fyll ut navn eller port for din proxy-tjener, hvis du har en, under."
 
-#: src/nautilus-first-time-druid.c:637
+#: src/nautilus-first-time-druid.c:640
 msgid "No proxy server required."
 msgstr "Ingen proxy-tjener nødvendig."
 
-#: src/nautilus-first-time-druid.c:638
+#: src/nautilus-first-time-druid.c:641
 msgid "Use this proxy server:"
 msgstr "Bruk denne proxy-tjeneren:"
 
 #. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:663
+#: src/nautilus-first-time-druid.c:666
 msgid "Proxy address:"
 msgstr "Proxy-adresse:"
 
-#: src/nautilus-first-time-druid.c:725
+#: src/nautilus-first-time-druid.c:728
 msgid "Verifying your Internet connection and checking for updates..."
 msgstr "Verifiserer din Internett-tilkobling og ser etter oppdateringer..."
 
-#: src/nautilus-first-time-druid.c:733
+#: src/nautilus-first-time-druid.c:736
 msgid "Downloading Nautilus updates..."
 msgstr "Laster ned Nautilus-oppdateringer..."
 
-#: src/nautilus-first-time-druid.c:902
+#: src/nautilus-first-time-druid.c:906
 msgid ""
 "If you have been using the GNOME Midnight Commander\n"
 "these settings move your desktop icons to Nautilus and\n"
@@ -8315,19 +8612,20 @@ msgstr ""
 "innstillingene flytte dine skrivebordsikoner til Nautilus\n"
 "og gjøre Nautilus til standard skrivebord.\n"
 
-#: src/nautilus-first-time-druid.c:909
+#: src/nautilus-first-time-druid.c:913
 msgid "Use Nautilus to draw the desktop."
 msgstr "Bruk Nautilus til å tegne skrivebordet."
 
-#: src/nautilus-first-time-druid.c:915
+#: src/nautilus-first-time-druid.c:919
 msgid "Move existing desktop icons to the Nautilus desktop."
 msgstr "Flytt eksisterende skrivebordsikoner til Nautilus-skrivebordet."
 
-#: src/nautilus-first-time-druid.c:920
+#. This option is currently disabled, per bugzilla.eazel.com 7557
+#: src/nautilus-first-time-druid.c:927
 msgid "Launch Nautilus when GNOME starts up."
 msgstr "Start Nautilus når GNOME starter opp."
 
-#: src/nautilus-first-time-druid.c:959
+#: src/nautilus-first-time-druid.c:967
 msgid ""
 "The fast search feature indexes all the items on your hard disk.\n"
 "It speeds up searching and allows you to search by file content\n"
@@ -8341,7 +8639,7 @@ msgstr ""
 "tid, men utføres kun når datamaskinen ikke er i bruk. Raske søk\n"
 "krever at cron daemonen kjører på datamaskinen din.\n"
 
-#: src/nautilus-first-time-druid.c:964
+#: src/nautilus-first-time-druid.c:972
 msgid ""
 "The fast search feature indexes all the items on your hard disk.\n"
 "It speeds up searching and allows you to search by file content\n"
@@ -8353,15 +8651,15 @@ msgstr ""
 "til filnavn, dato og andre filegenskaper. Indekseringen tar\n"
 "tid, men utføres kun når datamaskinen ikke er i bruk.\n"
 
-#: src/nautilus-first-time-druid.c:973
+#: src/nautilus-first-time-druid.c:981
 msgid "Enable fast search"
 msgstr "Bruk raskt søk"
 
-#: src/nautilus-first-time-druid.c:974
+#: src/nautilus-first-time-druid.c:982
 msgid "Turn fast search on when cron is enabled"
 msgstr "Slå på raske søk når cron er aktivert"
 
-#: src/nautilus-first-time-druid.c:1020
+#: src/nautilus-first-time-druid.c:1027
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "currently can't be performed because the program crond, which does\n"
@@ -8374,12 +8672,15 @@ msgid ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
-"Indeksering er slått på, hvilket aktiverer raske søk. Men indeksering kan ikke utføres nå fordi programmet 'crond', som utfører nattlige oppgaver på din datamaskin, er deaktivert. For å forsikre deg om at raske søk kan utføres må du aktivere cron:\n"
+"Indeksering er slått på, hvilket aktiverer raske søk. Men indeksering kan "
+"ikke utføres nå fordi programmet 'crond', som utfører nattlige oppgaver på "
+"din datamaskin, er deaktivert. For å forsikre deg om at raske søk kan "
+"utføres må du aktivere cron:\n"
 "\n"
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: src/nautilus-first-time-druid.c:1028
+#: src/nautilus-first-time-druid.c:1035
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "may not be performed because the program crond, which does nightly tasks\n"
@@ -8392,7 +8693,8 @@ msgid ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
-"Indeksering er slått på, hvilket aktiverer raske søk. Men indeksering kan ikke\n"
+"Indeksering er slått på, hvilket aktiverer raske søk. Men indeksering kan "
+"ikke\n"
 "utføres nå fordi programmet 'crond', som utfører nattlige oppgaver på din\n"
 "datamaskin, er deaktivert. For å forsikre deg om at raske søk kan utføres\n"
 "må du sjekke at crond er aktivert.\n"
@@ -8403,40 +8705,7 @@ msgstr ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: src/nautilus-first-time-druid.c:1128
-msgid "Nautilus First Time Setup"
-msgstr "Nautilus førstegangsoppsett"
-
-#: src/nautilus-first-time-druid.c:1158
-msgid "Welcome to Nautilus"
-msgstr "Velkommen til Nautilus"
-
-#: src/nautilus-first-time-druid.c:1160
-msgid ""
-"Nautilus is part of your GNOME desktop environment. It\n"
-"helps you manage your files and folders (directories),\n"
-"view documents, connect to the Internet, and do many\n"
-"other tasks.\n"
-"\n"
-"The next four screens ask about your level of Linux\n"
-"experience, and check your Internet connection. Click Next\n"
-"to continue."
-msgstr ""
-"Nautilus er en del av ditt GNOME skrivebordsmiljø. Programmet\n"
-"hjelper deg å håndtere dine filer og mapper (kataloger),\n"
-"vise dokumenter, koble til Internett, og mange andre\n"
-"oppgaver.\n"
-"\n"
-"De neste fire skjermene spør deg om ditt nivå av\n"
-"Linux erfaring, og sjekker din Internett-tilkobling. Klikk\n"
-"neste for å fortsette."
-
-#. set up the final page
-#: src/nautilus-first-time-druid.c:1172
-msgid "Finished"
-msgstr "Fullført"
-
-#: src/nautilus-first-time-druid.c:1179
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
 "Click Finish to launch Nautilus. You'll start with two\n"
 "Nautilus windows: one shows your home folder, and the\n"
@@ -8452,47 +8721,86 @@ msgstr ""
 "\n"
 "Vi håper du vil like Nautilus!"
 
+#: src/nautilus-first-time-druid.c:1129
+#, fuzzy
+msgid ""
+"Click Finish to launch Nautilus. You'll start with a\n"
+"window showing your home folder.\n"
+"\n"
+"We hope you enjoy Nautilus!"
+msgstr ""
+"Klikk Fullfør for å starte Nautilus. Du vil starte opp med\n"
+"to Nautilus-vinduer: ett viser din hjemmekatalog, og det andre\n"
+"forteller deg om Eazel's tjenester som gjør livet enklere\n"
+"for en Linux bruker.\n"
+"\n"
+"Vi håper du vil like Nautilus!"
+
+#: src/nautilus-first-time-druid.c:1153
+msgid "Nautilus First Time Setup"
+msgstr "Nautilus førstegangsoppsett"
+
+#: src/nautilus-first-time-druid.c:1183
+msgid "Welcome to Nautilus"
+msgstr "Velkommen til Nautilus"
+
+#: src/nautilus-first-time-druid.c:1185
+msgid ""
+"Nautilus...\n"
+"    Is a great file manager for the GNOME desktop.\n"
+"    Provides a simple intuitive way to access Internet services.\n"
+"    Is an extensible framework for GNOME developers.\n"
+"    Provides a powerful delivery platform for service providers.\n"
+"\n"
+"Click Next to begin customizing your Nautilus environment."
+msgstr ""
+
+#. set up the final page
+#: src/nautilus-first-time-druid.c:1196
+msgid "Finished"
+msgstr "Fullført"
+
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1188
+#: src/nautilus-first-time-druid.c:1209
 msgid "Choose Your User Level"
 msgstr "Velg ditt brukernivå"
 
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1192
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr "GMC til Nautilus overgang"
 
 #. set up the `Launch Medusa' page
-#: src/nautilus-first-time-druid.c:1196
+#: src/nautilus-first-time-druid.c:1217
 msgid "Fast Searches"
 msgstr "Raske søk"
 
 #. set up optional page to tell the user how to run cron
-#: src/nautilus-first-time-druid.c:1204
+#: src/nautilus-first-time-druid.c:1225
 msgid "The Cron Daemon"
 msgstr "Cron daemonen"
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1209
+#: src/nautilus-first-time-druid.c:1230
 msgid "Checking Your Internet Connection"
 msgstr "Sjekker din Internett-tilkobling"
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1220
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "Oppdaterer Nautilus..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1228
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "Konfigurasjon av web-proxy"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1303
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "Dekoder oppdatering..."
 
-#: src/nautilus-first-time-druid.c:1320
+#: src/nautilus-first-time-druid.c:1341
 msgid "Update Complete. Click Next to Continue."
 msgstr "Oppdatering fullført. Klikk neste for å fortsette."
 
@@ -8500,7 +8808,7 @@ msgstr "Oppdatering fullført. Klikk neste for å fortsette."
 #. * doesn't exist. Arlo and I (jsh) and decided that the
 #. * best thing to do is silently fail
 #.
-#: src/nautilus-first-time-druid.c:1333
+#: src/nautilus-first-time-druid.c:1356
 msgid "No Update Available... Press Next to Continue."
 msgstr "Ingen oppdatering tilgjengelig... Trykk neste for å fortsette."
 
@@ -8529,47 +8837,47 @@ msgstr "Vil du vise disse %d lokasjonene i forskjellige vinduer?"
 msgid "View in Multiple Windows?"
 msgstr "Vis i flere vinduer?"
 
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr "Utfør et raskt sett med selvsjekk-tester."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "Opprett startvinduet med en oppgitt geometri."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "GEOMETRI"
 
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Kun opprett Nautilus-vinduer for eksplisitt spesifiserte URIer."
 
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "Avslutt Nautilus."
 
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "Start Nautilus på nytt."
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check kan ikke brukes med URIer.\n"
 
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check kan ikke brukes med sammen med andre flagg.\n"
 
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit kan ikke brukes med URIer.\n"
 
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart kan ikke brukes med URIer.\n"
 
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry kan ikke brukes med mer enn én URI.\n"
 
@@ -9069,15 +9377,18 @@ msgid "View as List"
 msgstr "Vis som liste"
 
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+#, fuzzy
+msgid " _Advanced"
 msgstr " Avansert"
 
 #: src/nautilus-shell-ui.xml.h:2
-msgid " Beginner"
+#, fuzzy
+msgid " _Beginner"
 msgstr " Begynner"
 
 #: src/nautilus-shell-ui.xml.h:3
-msgid " Intermediate"
+#, fuzzy
+msgid " _Intermediate"
 msgstr " Viderekommen"
 
 #: src/nautilus-shell-ui.xml.h:4
@@ -9117,22 +9428,18 @@ msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
 #: src/nautilus-shell-ui.xml.h:15
-msgid "Cut _Text"
-msgstr "Klipp ut _tekst"
-
-#: src/nautilus-shell-ui.xml.h:17
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "Vis et vindu som tillater redigering av bokmerkene i denne menyen"
 
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr "Vis informasjon om dem som laget Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr "Vis hjelp for Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
@@ -9140,314 +9447,317 @@ msgstr ""
 "Vis mønstre, farger og emblemer som kan brukes for å lage et tilpasset "
 "utseende"
 
-#: src/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:19
 msgid "Display quick reference pages for Nautilus"
 msgstr "Vis hurtigreferansesider for Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:22
+#: src/nautilus-shell-ui.xml.h:20
 msgid "Display release notes for Nautilus"
 msgstr "Vis versjonsnotis for Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:23
+#: src/nautilus-shell-ui.xml.h:21
 msgid "Display support information for Nautilus and Eazel Services"
 msgstr "Vis støtteinformasjon for Nautilus og Eazel tjenester"
 
-#: src/nautilus-shell-ui.xml.h:24
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Display the latest contents of the current location"
 msgstr "Les innholdet for denne lokasjonen på nytt"
 
-#: src/nautilus-shell-ui.xml.h:25
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr "Vis tilgjengelige temaer for utseende"
 
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:24
 msgid "Edit various Nautilus preferences"
 msgstr "Rediger forskjellige brukervalg for Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "Finn"
 
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr "_Glem historikk"
 
-#: src/nautilus-shell-ui.xml.h:29
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr "Gå til Eazel tjenester"
 
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr "Gå til hovedsiden"
 
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr "Gå til lokasjonen som inneholder denne"
 
-#: src/nautilus-shell-ui.xml.h:32
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr "Gå til neste besøkte lokasjon"
 
-#: src/nautilus-shell-ui.xml.h:33
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr "Gå til forrige besøkte lokasjon"
 
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:442
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
 msgid "Hide Location _Bar"
 msgstr "Skjul a_dresselinje"
 
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:424
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
 msgid "Hide St_atus Bar"
 msgstr "Skjul st_atuslinje"
 
-#: src/nautilus-shell-ui.xml.h:36 src/nautilus-window-menus.c:430
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
 msgid "Hide _Sidebar"
 msgstr "Skjul _sidelinje"
 
-#: src/nautilus-shell-ui.xml.h:37 src/nautilus-window-menus.c:436
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
 msgid "Hide _Toolbar"
 msgstr "Skjul verk_tøylinje"
 
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:37
 msgid "Nautilus Quick _Reference"
 msgstr "Nautilus hurtig_referanse"
 
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:38
 msgid "Nautilus Release _Notes"
 msgstr "Nautilus versjons_notis"
 
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:39
 msgid "Nautilus User _Manual"
 msgstr "Nautilus bruker_håndbok"
 
-#: src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "Nytt vindu"
 
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:41
 msgid "New _Window"
 msgstr "Nytt _vindu"
 
-#: src/nautilus-shell-ui.xml.h:44
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "Normal størrelse"
 
-#: src/nautilus-shell-ui.xml.h:45
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Åpne et nytt Nautilus-vindu for vist lokasjon"
 
-#: src/nautilus-shell-ui.xml.h:47
-msgid "Preferences..."
-msgstr "Brukervalg..."
-
-#: src/nautilus-shell-ui.xml.h:48
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "Gjenoppfrisk"
 
-#: src/nautilus-shell-ui.xml.h:49
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "Fjerner den valgte teksten uten å plassere den på utklippstavlen"
-
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr "Rapporter profilering"
 
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr "Nullstill profilering"
 
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr "Søk på World Wide Web"
 
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr "Søk etter filer på denne datamaskinen"
 
-#: src/nautilus-shell-ui.xml.h:54
-msgid "Select _All"
-msgstr "Velg _alt"
-
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
 msgstr ""
 "Vis en side du kan sende tilbakemeldinger om Nautilus og Eazel tjenester"
 
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "Vis innholdet i normal størrelse"
 
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "Vis innholdet med mindre grad av detaljer"
 
-#: src/nautilus-shell-ui.xml.h:58
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "Vis innhold med større grad av detaljer"
 
-#: src/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr "Start profilering"
 
-#: src/nautilus-shell-ui.xml.h:61
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr "Stopp profilering"
 
-#: src/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr "Stopp nedlasting av denne lokasjonen"
 
-#: src/nautilus-shell-ui.xml.h:63
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "Angre siste tekstendring"
 
-#: src/nautilus-shell-ui.xml.h:64
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "Opp"
 
-#: src/nautilus-shell-ui.xml.h:65
-msgid "Use Advanced settings"
-msgstr "Bruk avanserte innstillinger"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:66
-msgid "Use Beginner settings"
-msgstr "Bruk innstillinger for begynner"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:67
-msgid "Use Intermediate settings"
-msgstr "Bruk innstillinger for viderekommen"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:63
 msgid "We_b Search"
 msgstr "We_b-søk"
 
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "Web-søk"
 
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "Zoom inn"
 
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "Zoom ut"
 
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "Zoom _inn"
 
-#: src/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "_Om Nautilus..."
 
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "_Legg til bokmerke"
 
-#: src/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "_Tilbake"
 
-#: src/nautilus-shell-ui.xml.h:77
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr "_Bakgrunner og emblemer..."
 
-#: src/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "_Bokmerker"
 
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "_Lukk vindu"
 
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:76
 msgid "_Customer Support"
 msgstr "_Kundestøtte"
 
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: src/nautilus-shell-ui.xml.h:83
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "R_ediger bokmerker..."
 
-#: src/nautilus-shell-ui.xml.h:84
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "Brukervalg..."
+
+#: src/nautilus-shell-ui.xml.h:80
 msgid "_Feedback"
 msgstr "T_ilbakemeldinger"
 
-#: src/nautilus-shell-ui.xml.h:86 src/nautilus-window-menus.c:1352
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "_Finn"
 
-#: src/nautilus-shell-ui.xml.h:87
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "_Fremover"
 
-#: src/nautilus-shell-ui.xml.h:88
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "_Gå"
 
-#: src/nautilus-shell-ui.xml.h:89
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: src/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "_Hjem"
 
-#: src/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "Plassering"
+
+#: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr "Nautilus tema..."
 
-#: src/nautilus-shell-ui.xml.h:92
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "_Normal størrelse"
 
-#: src/nautilus-shell-ui.xml.h:94
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "Brukervalg"
+
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr "_Profilering"
 
-#: src/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "Oppf_risk"
 
-#: src/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr "_Rapporter profilering"
 
-#: src/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr "_Nullstill profilering"
 
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr "_Start profilering"
 
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr "_Stopp profilering"
 
-#: src/nautilus-shell-ui.xml.h:100
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "_Angre"
 
-#: src/nautilus-shell-ui.xml.h:101
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "_Opp ett nivå"
 
-#: src/nautilus-shell-ui.xml.h:102
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "_Vis"
 
-#: src/nautilus-sidebar.c:659
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -9455,11 +9765,11 @@ msgstr ""
 "Du kan ikke tilegne mer enn ett egendefinert ikon om gangen! Vennligst dra "
 "kun ett bilde for å bestemme egendefinert ikon."
 
-#: src/nautilus-sidebar.c:661
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "Mer enn ett bilde"
 
-#: src/nautilus-sidebar.c:680
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -9467,11 +9777,11 @@ msgstr ""
 "Filen du slapp er ikke lokal. Du kan kun bruke lokale bilder som "
 "egendefinerte ikoner."
 
-#: src/nautilus-sidebar.c:682
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "Kun lokale bilder"
 
-#: src/nautilus-sidebar.c:687
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -9479,22 +9789,22 @@ msgstr ""
 "Filen du slapp er ikke et bilde. Du kan kun bruke lokale bilder som "
 "egendefinerte ikoner."
 
-#: src/nautilus-sidebar.c:689
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "Kun bilder"
 
-#: src/nautilus-sidebar.c:1247
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "Åpne med %s"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1283
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "Åpne med..."
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1390
+#: src/nautilus-sidebar.c:1424
 msgid "  Empty Trash  "
 msgstr "  Tøm søppelkurv  "
 
@@ -9586,16 +9896,16 @@ msgstr "Kunne ikke fjerne tema"
 msgid "No description available for the \"%s\" theme"
 msgstr "Ingen beskrivelse tilgjengelig for \"%s\"-temaet"
 
-#: src/nautilus-window.c:584
+#: src/nautilus-window.c:637
 msgid "View as ..."
 msgstr "Vis som ..."
 
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1286
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "Vis som annet..."
 
-#: src/nautilus-window.c:1687
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "Lukk"
 
@@ -9609,11 +9919,11 @@ msgstr "Lukk"
 msgid "Preview Release %s: %s"
 msgstr "Preview versjon %s: %s"
 
-#: src/nautilus-window-manage-views.c:812
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "Visning feilet"
 
-#: src/nautilus-window-manage-views.c:823
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
@@ -9622,12 +9932,12 @@ msgstr ""
 "%s-visningen ble utsatt for en feil og kan ikke fortsette. Du kan velge en "
 "annen visning eller gå til en annen lokasjon."
 
-#: src/nautilus-window-manage-views.c:834
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "%s-visningen ble utsatt for en feil under oppstart."
 
-#: src/nautilus-window-manage-views.c:993
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
@@ -9635,7 +9945,7 @@ msgstr ""
 "Ett av sidepanelene ble utsatt for en feil og kan ikke fortsette. "
 "Beklageligvis kan jeg ikke si hvilket dette gjelder."
 
-#: src/nautilus-window-manage-views.c:997
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
@@ -9644,23 +9954,23 @@ msgstr ""
 "Sidepanelet %s ble utsatt for en feil og kan ikke fortsette. Hvis dette "
 "fortsetter, kan du slå av dette panelet."
 
-#: src/nautilus-window-manage-views.c:1002
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "Sidelinjepanel feilet"
 
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr "Kunne ikke finne \"%s\". Vennligst sjekk stavingen og forsøk igjen."
 
-#: src/nautilus-window-manage-views.c:1223
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
 msgstr ""
 "\"%s\" er ikke en gyldig lokasjon. Vennligst sjekk stavingen og forsøk igjen."
 
-#: src/nautilus-window-manage-views.c:1237
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -9668,29 +9978,29 @@ msgid ""
 msgstr ""
 "Kunne ikke vise \"%s\" fordi Nautilus ikke fant ut hvilken filtype det er."
 
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr "Nautilus har ingen installerte visningsprogrammer som kan vise \"%s\"."
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1257
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 "Kunne ikke vise \"%s\", fordi Nautilus ikke kan håndtere %s: lokasjoner."
 
-#: src/nautilus-window-manage-views.c:1263
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "Kunne ikke vise \"%s\", fordi påloggingsforsøket feilet."
 
-#: src/nautilus-window-manage-views.c:1268
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "Kunne ikke vise \"%s\", fordi tilgang ble nektet."
 
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1287
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
@@ -9699,7 +10009,7 @@ msgstr ""
 "Kunne ikke vise \"%s\", fordi verten, \"%s\", ikke ble funnet. Sjekk at "
 "stavingen er korrekt og at proxy-innstillingene er korrekte."
 
-#: src/nautilus-window-manage-views.c:1287
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -9708,7 +10018,7 @@ msgstr ""
 "Kunne ikke vise \"%s\", fordi vertsnavnet var tomt. Sjekk at "
 "proxy-innstillingene er korrekte."
 
-#: src/nautilus-window-manage-views.c:1299
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -9720,23 +10030,23 @@ msgstr ""
 "søketjenesten Medusa, og hvis du ikke har en indeks, at Medusa "
 "indekseringsmotoren kjører."
 
-#: src/nautilus-window-manage-views.c:1303
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "Søk ikke tilgjengelig"
 
-#: src/nautilus-window-manage-views.c:1307
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus kan ikke vise \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1312
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "Kan ikke vise lokasjon"
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:313
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
@@ -9744,37 +10054,37 @@ msgstr ""
 "Er du sikker på at du ønsker å glemme historikken? Hvis det er tilfelle, vil "
 "du være dømt til å gjenta den."
 
-#: src/nautilus-window-menus.c:316
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
 "Er du sikker på at du ønsker at Nautilus skal glemme stedene du har besøkt?"
 
-#: src/nautilus-window-menus.c:321
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "Glem historikk?"
 
-#: src/nautilus-window-menus.c:322
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "Glem"
 
-#: src/nautilus-window-menus.c:425
+#: src/nautilus-window-menus.c:466
 msgid "Show St_atus Bar"
 msgstr "Vis st_atuslinje"
 
-#: src/nautilus-window-menus.c:431
+#: src/nautilus-window-menus.c:472
 msgid "Show _Sidebar"
 msgstr "Vis _sidelinje"
 
-#: src/nautilus-window-menus.c:437
+#: src/nautilus-window-menus.c:478
 msgid "Show _Toolbar"
 msgstr "Vis verk_tøylinje"
 
-#: src/nautilus-window-menus.c:443
+#: src/nautilus-window-menus.c:484
 msgid "Show Location _Bar"
 msgstr "Vis a_dresselinje"
 
-#: src/nautilus-window-menus.c:494
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "Brukervalg"
 
@@ -9784,11 +10094,11 @@ msgstr "Brukervalg"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:571
+#: src/nautilus-window-menus.c:618
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
-#: src/nautilus-window-menus.c:573
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -9805,14 +10115,14 @@ msgstr ""
 #. * bottom of the about box to give credit
 #. * to the translator(s)
 #.
-#: src/nautilus-window-menus.c:582
+#: src/nautilus-window-menus.c:629
 msgid "Translator Credits"
 msgstr ""
 "Oversatt til norsk av\n"
 "Kjartan Maraas\n"
 "<kmaraas@gnome.org>"
 
-#: src/nautilus-window-menus.c:752
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -9821,27 +10131,23 @@ msgstr ""
 "Lokasjonen \"%s\" eksisterer ikke. Ønsker du å fjerne alle bokmerker med "
 "denne lokasjonen fra din liste?"
 
-#: src/nautilus-window-menus.c:756
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "Bokmerke for ikke-eksisterende lokasjon"
 
-#: src/nautilus-window-menus.c:770
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "Lokasjonen \"%s\" eksisterer ikke lenger."
 
-#: src/nautilus-window-menus.c:771
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "Gå til ikke-eksisterende lokasjon"
 
-#: src/nautilus-window-menus.c:840
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "Gå til lokasjonen spesifisert i dette bokmerket"
 
-#: src/nautilus-window-menus.c:1351
-msgid "_Browse"
-msgstr "_Bla gjennom"
-
 #: src/nautilus-window-toolbars.c:402
 msgid "Back"
 msgstr "Tilbake"
@@ -9857,6 +10163,130 @@ msgstr "Fremover"
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 
+#~ msgid "helvetica"
+#~ msgstr "helvetica"
+
+#~ msgid "Welcome, %s!"
+#~ msgstr "Velkommen, %s!"
+
+#~ msgid "_Fonts"
+#~ msgstr "Skri_fttyper"
+
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "Du kan ikke flytte en fil til seg selv."
+
+#~ msgid "Can't Move Onto Self"
+#~ msgstr "Kan ikke flytte over seg selv"
+
+#~ msgid "You cannot throw \"%s\" into the Trash."
+#~ msgstr "Du kan ikke kaste \"%s\" i søppelkurven."
+
+#~ msgid "Error Moving to Trash"
+#~ msgstr "Feil under flytting til søppelkurven"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Bold"
+#~ msgstr "Uthevet"
+
+#~ msgid "Italic"
+#~ msgstr "Kursiv"
+
+#~ msgid "Reverse Italic"
+#~ msgstr "Omvendt kursiv"
+
+#~ msgid "Font"
+#~ msgstr "Skrifttype"
+
+#~ msgid "fixed"
+#~ msgstr "fast"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00 AM"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00 AM"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr "1/ 1/00, 1:00 AM"
+
+#~ msgid "current theme"
+#~ msgstr "aktivt tema"
+
+#~ msgid "Use this font family to display file names:"
+#~ msgstr "Bruk denne skrifttypefamilien til å vise filnavn:"
+
+#~ msgid "Can add Content"
+#~ msgstr "Kan legge til Innhold"
+
+#~ msgid "No image was selected.  You must click on an image to select it."
+#~ msgstr "Ingen bilder ble valgt. Du må klikke på et bilde for å velge det."
+
+#~ msgid "No selection made"
+#~ msgstr "Ingen valgt gjort"
+
+#~ msgid "Remember this password"
+#~ msgstr "Husk dette passordet"
+
+#~ msgid "times"
+#~ msgstr "times"
+
+#~ msgid "courier"
+#~ msgstr "courier"
+
+#~ msgid "lucida"
+#~ msgstr "lucida"
+
+#~ msgid "Details"
+#~ msgstr "Detaljer"
+
+#~ msgid "Warning"
+#~ msgstr "Advarsel"
+
+#~ msgid "Error"
+#~ msgstr "Feil"
+
+#~ msgid "Question"
+#~ msgstr "Spørsmål"
+
+#~ msgid "_Cut Text"
+#~ msgstr "_Klipp ut tekst"
+
+#~ msgid ""
+#~ "Nautilus is part of your GNOME desktop environment. It\n"
+#~ "helps you manage your files and folders (directories),\n"
+#~ "view documents, connect to the Internet, and do many\n"
+#~ "other tasks.\n"
+#~ "\n"
+#~ "The next four screens ask about your level of Linux\n"
+#~ "experience, and check your Internet connection. Click Next\n"
+#~ "to continue."
+#~ msgstr ""
+#~ "Nautilus er en del av ditt GNOME skrivebordsmiljø. Programmet\n"
+#~ "hjelper deg å håndtere dine filer og mapper (kataloger),\n"
+#~ "vise dokumenter, koble til Internett, og mange andre\n"
+#~ "oppgaver.\n"
+#~ "\n"
+#~ "De neste fire skjermene spør deg om ditt nivå av\n"
+#~ "Linux erfaring, og sjekker din Internett-tilkobling. Klikk\n"
+#~ "neste for å fortsette."
+
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "Fjerner den valgte teksten uten å plassere den på utklippstavlen"
+
+#~ msgid "Use Advanced settings"
+#~ msgstr "Bruk avanserte innstillinger"
+
+#~ msgid "Use Beginner settings"
+#~ msgstr "Bruk innstillinger for begynner"
+
+#~ msgid "Use Intermediate settings"
+#~ msgstr "Bruk innstillinger for viderekommen"
+
+#~ msgid "_Browse"
+#~ msgstr "_Bla gjennom"
+
 #~ msgid "Cyrillic (KOI8-R)"
 #~ msgstr "Kyrillisk (KOI8-R)"
 
@@ -9908,9 +10338,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 #~ msgid "Verify"
 #~ msgstr "Verifiser"
 
-#~ msgid "Description"
-#~ msgstr "Beskrivelse"
-
 #~ msgid "Package Contents: %d files"
 #~ msgstr "Pakkeinnhold: %d filer"
 
@@ -10064,9 +10491,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 #~ msgid "Force install"
 #~ msgstr "Tvungen installasjon"
 
-#~ msgid "Secret"
-#~ msgstr "Hemmelig"
-
 #~ msgid "Shared"
 #~ msgstr "Delt"
 
@@ -10597,9 +11021,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 #~ msgid "regular files"
 #~ msgstr "vanlige filer"
 
-#~ msgid "text files"
-#~ msgstr "tekstfiler"
-
 #~ msgid "applications"
 #~ msgstr "applikasjoner"
 
diff --git a/po/pl.po b/po/pl.po
index b3194e761..16b1809bf 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,10 +1,15 @@
 #
 # GNOME PL Team <translators@gnome.pl>, 2000
 #
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2001-01-12 19:44+0100\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-01-24 15:19+0100\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -12,54 +17,58 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applets/launcher/nautilus-launcher-applet.c:1
+#: applets/launcher/nautilus-launcher-applet.c:272
 msgid "Can't create nautilus-launcher-applet!"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
+#: applets/preferences-applet/nautilus-preferences-applet.c:211
+msgid "Can't create nautilus-preferences-applet!"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:226
+#, fuzzy
+msgid "Show Desktop"
+msgstr "Biurko"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:230
+#, fuzzy
+msgid "Smooth Graphics"
+msgstr "Wyg³adzanie grafiki"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:243
+#: src/nautilus-application.c:639
+msgid "Quit"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:251
+#, fuzzy
+msgid "Start"
+msgstr "Stan"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:259
+#, fuzzy
+msgid "Restart"
+msgstr "Ponów"
+
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:1
 msgid "Factory for Nautilus component adapter factories"
 msgstr ""
 
-#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:1
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:2
 msgid "Factory for Nautilus component adapter factories "
 msgstr ""
 
-#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:1
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:3
 msgid ""
 "Factory for objects that wrap ordinary Bonobo Controls or Embeddables to "
 "look like Nautilus Views"
 msgstr ""
 
-#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:1
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:4
 msgid "Nautilus component adapter factory"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: components/hardware/Nautilus_View_hardware.oaf.in.h:1
-msgid "Factory for hardware view"
-msgstr ""
-
-#: components/hardware/Nautilus_View_hardware.oaf.in.h:1
-#: data/static_bookmarks.xml.h:1
-msgid "Hardware"
-msgstr "Sprzêt"
-
-#: components/hardware/Nautilus_View_hardware.oaf.in.h:1
-msgid "Hardware view"
-msgstr "Widok sprzêtu"
-
-#: components/hardware/Nautilus_View_hardware.oaf.in.h:1
-msgid "hardware view"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:1
+#: components/hardware/nautilus-hardware-view.c:230
 #, c-format
 msgid ""
 "%s CPU\n"
@@ -70,163 +79,167 @@ msgstr ""
 "%s MHz\n"
 "Rozmiar cache: %s"
 
-#: components/hardware/nautilus-hardware-view.c:1
+#: components/hardware/nautilus-hardware-view.c:264
 #, c-format
 msgid "%lu GB RAM"
 msgstr "%lu GB RAM"
 
-#: components/hardware/nautilus-hardware-view.c:1
+#: components/hardware/nautilus-hardware-view.c:266
 #, c-format
 msgid "%lu MB RAM"
 msgstr "%lu MB RAM"
 
-#: components/hardware/nautilus-hardware-view.c:1
+#: components/hardware/nautilus-hardware-view.c:324
 #, c-format
 msgid "%lu GB"
 msgstr "%lu GB"
 
-#: components/hardware/nautilus-hardware-view.c:1
+#: components/hardware/nautilus-hardware-view.c:326
 #, c-format
 msgid "%lu MB"
 msgstr "%lu MB"
 
 #. set up the title
-#: components/hardware/nautilus-hardware-view.c:1
+#: components/hardware/nautilus-hardware-view.c:407
 msgid "Hardware Overview"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: components/help/Nautilus_View_help.oaf.in.h:1
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:1
-msgid "Help"
-msgstr "Pomoc"
-
-#: components/help/Nautilus_View_help.oaf.in.h:1
-msgid "Help Index"
+#: components/hardware/nautilus-hardware-view.c:520
+msgid "This is a placeholder for the CPU page."
 msgstr ""
 
-#: components/help/Nautilus_View_help.oaf.in.h:1
-msgid "Help Index sidebar panel"
+#: components/hardware/nautilus-hardware-view.c:545
+msgid "This is a placeholder for the RAM page."
 msgstr ""
 
-#: components/help/Nautilus_View_help.oaf.in.h:1
-msgid "Help Navigation Tree"
+#: components/hardware/nautilus-hardware-view.c:570
+msgid "This is a placeholder for the IDE page."
 msgstr ""
 
-#: components/help/Nautilus_View_help.oaf.in.h:1
-msgid "Help Search"
-msgstr ""
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:2
+#: components/hardware/nautilus-hardware-view.c:631
+#: data/static_bookmarks.xml.h:16
+msgid "Hardware"
+msgstr "Sprzêt"
 
-#: components/help/Nautilus_View_help.oaf.in.h:1
-msgid "Help Search sidebar panel"
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:1
+msgid "Factory for hardware view"
 msgstr ""
 
-#: components/help/Nautilus_View_help.oaf.in.h:1
-msgid "Help sidebar panel"
-msgstr ""
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:3
+#, fuzzy
+msgid "Hardware Viewer"
+msgstr "Widok sprzêtu"
 
-#: components/help/Nautilus_View_help.oaf.in.h:1
-msgid "Internal use only"
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:4
+msgid "Hardware view"
+msgstr "Widok sprzêtu"
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:5
+#, fuzzy
+msgid "View as Hardware"
+msgstr "Sprzêt"
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:6
+msgid "hardware view"
 msgstr ""
 
-#: components/help/converters/gnome-db2html2/gdb3html.c:1
-#: components/music/nautilus-music-view.c:1
+#: components/help/converters/gnome-db2html2/gdb3html.c:712
+#: components/music/nautilus-music-view.c:1512
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: components/help/converters/gnome-db2html2/gdb3html.c:1
-#: src/nautilus-shell-ui.xml.h:1
+#: components/help/converters/gnome-db2html2/gdb3html.c:721
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "Pocz±tek"
 
-#: components/help/converters/gnome-db2html2/gdb3html.c:1
-#: components/music/nautilus-music-view.c:1
+#: components/help/converters/gnome-db2html2/gdb3html.c:730
+#: components/music/nautilus-music-view.c:1568
 msgid "Next"
 msgstr "Nastêpny"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1
-#: components/notes/Nautilus_View_notes.oaf.in.h:1
+#: components/help/converters/gnome-db2html2/sect-elements.c:259
+#: components/notes/Nautilus_View_notes.oaf.in.h:2
 msgid "Notes"
 msgstr "notatki"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1
+#: components/help/converters/gnome-db2html2/sect-elements.c:709
 #, c-format
 msgid "Table %d."
 msgstr ""
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1
+#: components/help/converters/gnome-db2html2/sect-elements.c:864
 msgid "Up to Table of Contents"
 msgstr ""
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1
+#: components/help/converters/gnome-db2html2/sect-elements.c:1012
 #, c-format
 msgid "Figure %s"
 msgstr ""
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1
+#: components/help/converters/gnome-db2html2/sect-elements.c:1032
 msgid "the section here"
 msgstr ""
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1
+#: components/help/converters/gnome-db2html2/sect-elements.c:1034
 msgid "the section"
 msgstr ""
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1
+#: components/help/converters/gnome-db2html2/sect-elements.c:1090
 #, c-format
 msgid "Figure %d"
 msgstr ""
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1
+#: components/help/converters/gnome-db2html2/sect-elements.c:1102
 msgid "IMAGE"
 msgstr "OBRAZ"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1
-#: components/help/converters/gnome-db2html2/sect-elements.c:1
+#: components/help/converters/gnome-db2html2/sect-elements.c:2068
+#: components/help/converters/gnome-db2html2/sect-elements.c:2070
 msgid "Legal Notice"
 msgstr ""
 
 #. This 'Q' is short for 'Question:'
-#: components/help/converters/gnome-db2html2/sect-elements.c:1
+#: components/help/converters/gnome-db2html2/sect-elements.c:2116
 msgid "Q"
 msgstr ""
 
 #. This 'A' is short for 'Answer'
-#: components/help/converters/gnome-db2html2/sect-elements.c:1
+#: components/help/converters/gnome-db2html2/sect-elements.c:2128
 msgid "A"
 msgstr ""
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1
+#: components/help/converters/gnome-db2html2/sect-elements.c:2151
 msgid "See"
 msgstr "Zobacz"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1
+#: components/help/converters/gnome-db2html2/sect-elements.c:2178
 msgid "See also"
 msgstr "Zobacz te¿"
 
-#: components/help/converters/gnome-db2html2/toc-elements.c:1
+#: components/help/converters/gnome-db2html2/toc-elements.c:322
 msgid "GNOME Documentation"
 msgstr "Dokumentacja GNOME"
 
-#: components/help/converters/gnome-db2html2/toc-elements.c:1
+#: components/help/converters/gnome-db2html2/toc-elements.c:353
 msgid "Copyright"
 msgstr ""
 
-#: components/help/converters/gnome-db2html2/toc-elements.c:1
+#: components/help/converters/gnome-db2html2/toc-elements.c:353
 msgid "by"
 msgstr ""
 
-#: components/help/converters/gnome-db2html2/toc-elements.c:1
+#: components/help/converters/gnome-db2html2/toc-elements.c:355
 msgid "Table of Contents"
 msgstr ""
 
-#: components/help/converters/gnome-db2html2/toc-elements.c:1
+#: components/help/converters/gnome-db2html2/toc-elements.c:521
 msgid "PREFACE"
 msgstr ""
 
-#: components/help/converters/gnome-db2html2/toc-elements.c:1
+#: components/help/converters/gnome-db2html2/toc-elements.c:530
 msgid "APPENDIX"
 msgstr ""
 
@@ -270,264 +283,287 @@ msgstr ""
 #. GNU Public  License  and  many  people  are
 #. working on changes to the kernel)
 #. **
-#: components/help/hyperbola-filefmt.c:1
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:537
+#: components/help/hyperbola-filefmt.c:538
+#: components/help/hyperbola-filefmt.c:539
+#: components/help/hyperbola-filefmt.c:541
+#: components/help/hyperbola-filefmt.c:543
 msgid "Manual"
 msgstr "Podrêcznik"
 
-#: components/help/hyperbola-filefmt.c:1
-msgid "System"
-msgstr "System"
-
-#: components/help/hyperbola-filefmt.c:1
-msgid "Configuration"
-msgstr "Konfiguracja"
-
-#: components/help/hyperbola-filefmt.c:1
-msgid "Config files"
-msgstr "Pliki konfiguracyjne"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: components/help/hyperbola-filefmt.c:1
-#: components/help/hyperbola-filefmt.c:1 data/linksets/apps.xml.h:1
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:861 data/linksets/apps.xml.h:1
 msgid "Applications"
 msgstr "Aplikacje"
 
-#: components/help/hyperbola-filefmt.c:1
-msgid "Command Line"
-msgstr "Wiersz poleceñ"
-
-#: components/help/hyperbola-filefmt.c:1
-#: components/help/hyperbola-filefmt.c:1
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:543
 msgid "Development"
 msgstr "Programowanie"
 
-#: components/help/hyperbola-filefmt.c:1
-#: components/help/hyperbola-filefmt.c:1
-msgid "APIs"
-msgstr "Interfejsy Programistyczne (API)"
-
-#: components/help/hyperbola-filefmt.c:1
-msgid "Miscellaneous"
-msgstr "Ró¿ne"
-
-#: components/help/hyperbola-filefmt.c:1
+#: components/help/hyperbola-filefmt.c:532
 msgid "System Calls"
 msgstr "Wywo³ania systemowe"
 
-#: components/help/hyperbola-filefmt.c:1
-#: libnautilus-extensions/nautilus-stock-dialogs.c:1
+#: components/help/hyperbola-filefmt.c:534
+msgid "Library Functions"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:536
+#, fuzzy
+msgid "Devices"
+msgstr "Us³ugi"
+
+#: components/help/hyperbola-filefmt.c:537
+#, fuzzy
+msgid "Configuration Files"
+msgstr "Konfiguracja"
+
+#: components/help/hyperbola-filefmt.c:538
+#, fuzzy
+msgid "Games"
+msgstr "Nazwa"
+
+#: components/help/hyperbola-filefmt.c:539
+#, fuzzy
+msgid "Conventions"
+msgstr "Zawarto¶æ:"
+
+#: components/help/hyperbola-filefmt.c:541
+msgid "System Administration"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:543
+msgid "Kernel Routines"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:703
 msgid "Info"
 msgstr "Pliki Info"
 
-#: components/help/hyperbola-nav-index.c:1
+#: components/help/hyperbola-nav-tree.c:310
+msgid "Introductory Documents:"
+msgstr ""
+
+#: components/help/hyperbola-nav-tree.c:324
+msgid "Documents by Subject:"
+msgstr ""
+
+#: components/help/hyperbola-nav-index.c:121
 msgid "see "
 msgstr "zobacz "
 
-#: components/help/hyperbola-nav-index.c:1
+#: components/help/hyperbola-nav-index.c:125
 msgid "see also "
 msgstr "zobacz te¿ "
 
-#: components/help/hyperbola-nav-index.c:1
+#: components/help/hyperbola-nav-index.c:212
 msgid "No matches."
 msgstr ""
 
-#: components/help/hyperbola-nav-index.c:1
+#: components/help/hyperbola-nav-index.c:476
 msgid " (see \""
 msgstr " (zobacz \""
 
-#: components/help/hyperbola-nav-index.c:1
+#: components/help/hyperbola-nav-index.c:479
 msgid " (see also \""
 msgstr " (zobacz te¿ \""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
+#: components/help/Nautilus_View_help.oaf.in.h:1
+#: components/services/summary/nautilus-summary-dialogs.c:106
+msgid "Help"
+msgstr "Pomoc"
+
+#: components/help/Nautilus_View_help.oaf.in.h:2
+msgid "Help Index"
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:3
+msgid "Help Index sidebar panel"
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:4
+msgid "Help Navigation Tree"
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:5
+msgid "Help Search"
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:6
+msgid "Help Search sidebar panel"
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:7
+msgid "Help sidebar panel"
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:8
+msgid "Internal use only"
+msgstr ""
+
 #: components/history/Nautilus_View_history.oaf.in.h:1
 msgid "Factory for history views"
 msgstr ""
 
-#: components/history/Nautilus_View_history.oaf.in.h:1
+#: components/history/Nautilus_View_history.oaf.in.h:2
 msgid "History"
 msgstr "Historia"
 
-#: components/history/Nautilus_View_history.oaf.in.h:1
+#: components/history/Nautilus_View_history.oaf.in.h:3
 msgid "History sidebar panel"
 msgstr ""
 
-#: components/history/Nautilus_View_history.oaf.in.h:1
+#: components/history/Nautilus_View_history.oaf.in.h:4
 msgid "History sidebar panel for Nautilus"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
+#: components/image-viewer/nautilus-image-view.c:833
+msgid "I could not initialize Bonobo"
+msgstr "Nie mo¿na zainicjowaæ Bonobo"
+
 #: components/image-viewer/Nautilus_View_image.oaf.in.h:1
 msgid "Generic Image Viewer"
 msgstr ""
 
-#: components/image-viewer/Nautilus_View_image.oaf.in.h:1
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:2
 msgid "Generic image control factory"
 msgstr ""
 
-#: components/image-viewer/Nautilus_View_image.oaf.in.h:1
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:3
 msgid "Image"
 msgstr "Obraz"
 
-#: components/image-viewer/Nautilus_View_image.oaf.in.h:1
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:4
+#, fuzzy
+msgid "Image Viewer"
+msgstr "Przegl±darka obrazów Nautilusa"
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:5
 msgid "Nautilus Image Viewer"
 msgstr "Przegl±darka obrazów Nautilusa"
 
-#: components/image-viewer/Nautilus_View_image.oaf.in.h:1
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:6
 msgid "Nautilus Image viewer factory"
 msgstr ""
 
-#: components/image-viewer/nautilus-image-view.c:1
-msgid "I could not initialize Bonobo"
-msgstr "Nie mo¿na zainicjowaæ Bonobo"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:1
-msgid "Content Loser"
-msgstr ""
-
-#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:1
-msgid "Nautilus Content Loser"
-msgstr ""
-
-#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:1
-msgid "Nautilus content loser component's factory"
-msgstr ""
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:7
+#, fuzzy
+msgid "View as Image"
+msgstr "Wy¶wietlanie jako %s"
 
-#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:1
-msgid "Nautilus content loser factory"
+#: components/loser/content/nautilus-content-loser.c:140
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"This is a Nautilus content view that fails on demand."
 msgstr ""
 
-#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:1
-msgid "Nautilus content view that fails on command"
+#: components/loser/content/nautilus-content-loser.c:189
+msgid "You have tried to kill the Content Loser"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: components/loser/content/nautilus-content-loser-ui.xml.h:1
 msgid "Kill Content Loser"
 msgstr ""
 
-#: components/loser/content/nautilus-content-loser-ui.xml.h:1
+#: components/loser/content/nautilus-content-loser-ui.xml.h:2
 msgid "Kill the Loser content view"
 msgstr ""
 
-#: components/loser/content/nautilus-content-loser-ui.xml.h:1
-#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:1
-#: components/mozilla/nautilus-mozilla-ui.xml.h:1
-#: components/sample/nautilus-sample-content-view-ui.xml.h:1
-#: src/nautilus-shell-ui.xml.h:1
+#: components/loser/content/nautilus-content-loser-ui.xml.h:3
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
+#: components/sample/nautilus-sample-content-view-ui.xml.h:4
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "_Plik"
 
-#: components/loser/content/nautilus-content-loser-ui.xml.h:1
+#: components/loser/content/nautilus-content-loser-ui.xml.h:4
 msgid "_Kill Content Loser"
 msgstr ""
 
-#: components/loser/content/nautilus-content-loser.c:1
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"This is a Nautilus content view that fails on demand."
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:1
+msgid "Content Loser"
 msgstr ""
 
-#: components/loser/content/nautilus-content-loser.c:1
-msgid "You have tried to kill the Content Loser"
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:2
+msgid "Content Loser Viewer"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:1
-msgid "Nautilus Sidebar Loser"
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:3
+msgid "Nautilus Content Loser"
 msgstr ""
 
-#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:1
-msgid "Nautilus sidebar loser component's factory"
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:4
+msgid "Nautilus content loser component's factory"
 msgstr ""
 
-#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:1
-msgid "Nautilus sidebar loser factory"
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:5
+msgid "Nautilus content loser factory"
 msgstr ""
 
-#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:1
-msgid "Nautilus sidebar view that fails on command"
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:6
+msgid "Nautilus content view that fails on command"
 msgstr ""
 
-#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:1
-msgid "Sidebar Loser"
-msgstr ""
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:7
+#, fuzzy
+msgid "View as Content Loser"
+msgstr "Wy¶wietlanie jako inne"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:1
-msgid "Kill Sidebar Loser"
+#: components/loser/sidebar/nautilus-sidebar-loser.c:143
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Loser sidebar."
 msgstr ""
 
-#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:1
-msgid "Kill the Loser sidebar panel"
+#: components/loser/sidebar/nautilus-sidebar-loser.c:192
+msgid "You have tried to kill the Sidebar Loser"
 msgstr ""
 
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:1
-msgid "_Kill Sidebar Loser"
+msgid "Kill Sidebar Loser"
 msgstr ""
 
-#: components/loser/sidebar/nautilus-sidebar-loser.c:1
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Loser sidebar."
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:2
+msgid "Kill the Loser sidebar panel"
 msgstr ""
 
-#: components/loser/sidebar/nautilus-sidebar-loser.c:1
-msgid "You have tried to kill the Sidebar Loser"
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:4
+msgid "_Kill Sidebar Loser"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:1
-msgid "Mozilla Nautilus view"
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:1
+msgid "Nautilus Sidebar Loser"
 msgstr ""
 
-#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:1
-msgid "Mozilla Nautilus view factory"
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:2
+msgid "Nautilus sidebar loser component's factory"
 msgstr ""
 
-#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:1
-msgid "Mozilla content view component"
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:3
+msgid "Nautilus sidebar loser factory"
 msgstr ""
 
-#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:1
-msgid "Mozilla content view component's factory"
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:4
+msgid "Nautilus sidebar view that fails on command"
 msgstr ""
 
-#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:1
-msgid "Web Page"
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:5
+msgid "Sidebar Loser"
 msgstr ""
 
-#: components/mozilla/mozilla-preferences.cpp:1
-#: libnautilus-extensions/nautilus-preferences.c:1
+#: components/mozilla/mozilla-preferences.cpp:126
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -536,8 +572,8 @@ msgstr ""
 "B³±d GConf:\n"
 "  %s"
 
-#: components/mozilla/mozilla-preferences.cpp:1
-#: libnautilus-extensions/nautilus-preferences.c:1
+#: components/mozilla/mozilla-preferences.cpp:133
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -548,1358 +584,1981 @@ msgstr ""
 " %s\n"
 "Kolejne b³³êdy bêd± tylko wypisywane na terminal"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: components/mozilla/nautilus-mozilla-ui.xml.h:1
-msgid "Mozilla Test"
-msgstr "Test Mozilli"
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:38
+msgid "Arabic"
+msgstr ""
 
-#: components/mozilla/nautilus-mozilla-ui.xml.h:1
-msgid "This is a Mozilla merged menu item"
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:39
+#, fuzzy
+msgid "Baltic"
+msgstr "Proste"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:40
+msgid "Central European"
 msgstr ""
 
-#: components/mozilla/nautilus-mozilla-ui.xml.h:1
-msgid "This is a Mozilla merged tool bar button"
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:41
+#, fuzzy
+msgid "Chinese"
+msgstr "Kana³y"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:42
+msgid "Cyrillic"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:43
+#, fuzzy
+msgid "Greek"
+msgstr "Drzewo"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:44
+msgid "Hebrew"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:45
+msgid "Japanese"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:46
+#, fuzzy
+msgid "Turkish"
+msgstr "¦mietnik"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:47
+msgid "Unicode"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:48
+msgid "UTF"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:49
+#, fuzzy
+msgid "Vietnamese"
+msgstr "Zmieñ nazwê"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:50
+#, fuzzy
+msgid "Western"
+msgstr "Zarejestruj"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:55
+msgid "Arabic (IBM-864)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:56
+msgid "Arabic (ISO-8859-6)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:57
+msgid "Arabic (ISO-8859-6-E)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:58
+msgid "Arabic (ISO-8859-6-I)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:59
+msgid "Arabic (Windows-1256)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:60
+msgid "Armenian (ARMSCII-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:61
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:62
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:63
+msgid "Baltic (Windows-1257)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:64
+msgid "Celtic (ISO-8859-14)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:65
+msgid "Central European (IBM-852)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:66
+msgid "Central European (ISO-8859-2)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:67
+msgid "Central European (MacCE)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:68
+msgid "Central European (Windows-1250)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:69
+msgid "Chinese Simplified (GB2312)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:70
+msgid "Chinese Simplified (GBK)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:71
+msgid "Chinese Simplified (HZ)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:72
+msgid "Chinese Traditional (Big5)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:73
+msgid "Chinese Traditional (EUC-TW)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:74
+msgid "Croatian (MacCroatian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:75
+msgid "Cyrillic (IBM-855)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:76
+msgid "Cyrillic (ISO-8859-5)"
 msgstr ""
 
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:77
+msgid "Cyrillic (ISO-IR-111)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:78
+msgid "Cyrillic (MacCyrillic)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:79
+msgid "Cyrillic (Windows-1251)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:80
+msgid "Cyrillic/Russian (IBM-866)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:81
+msgid "Cyrillic/Russian (KOI8-R)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:82
+msgid "Cyrillic/Ukrainian (KOI8-U)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:83
+msgid "Cyrillic/Ukrainian (MacUkrainian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:84
+msgid "English (US-ASCII)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:85
+msgid "Greek (ISO-8859-7)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:86
+msgid "Greek (MacGreek)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:87
+msgid "Greek (Windows-1253)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:88
+msgid "Hebrew (IBM-862)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:89
+msgid "Hebrew (ISO-8859-8-E)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:90
+msgid "Hebrew (ISO-8859-8-I)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:91
+msgid "Hebrew (Windows-1255)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:92
+msgid "Icelandic (MacIcelandic)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:93
+msgid "Japanese (EUC-JP)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:94
+msgid "Japanese (ISO-2022-JP)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:95
+msgid "Japanese (Shift_JIS)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:96
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:97
+msgid "Nordic (ISO-8859-10)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:98
+msgid "Romanian (MacRomanian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:99
+msgid "South European (ISO-8859-3)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:100
+msgid "T.61-8bit"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:101
+msgid "Thai (TIS-620)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:102
+msgid "Turkish (IBM-857)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:103
+msgid "Turkish (ISO-8859-9)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:104
+msgid "Turkish (MacTurkish)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:105
+msgid "Turkish (Windows-1254)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:106
+msgid "Unicode (UTF-7)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:107
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:108
+msgid "User Defined"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:109
+msgid "UTF-16BE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:110
+msgid "UTF-16LE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:111
+msgid "UTF-32BE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:112
+msgid "UTF-32LE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:113
+msgid "Vietnamese (TCVN)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:114
+msgid "Vietnamese (VISCII)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:115
+msgid "Vietnamese (VPS)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:116
+msgid "Vietnamese (Windows-1258)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:117
+msgid "Visual Hebrew (ISO-8859-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:118
+msgid "Western (IBM-850)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:119
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:120
+msgid "Western (ISO-8859-15)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:121
+msgid "Western (MacRoman)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:122
+msgid "Western (Windows-1252)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:123
+msgid "windows-936"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:124
+msgid "x-imap4-modified-utf7"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:125
+#, fuzzy
+msgid "x-u-escaped"
+msgstr "Netscape"
+
+#: components/mozilla/nautilus-mozilla-content-view.c:809
+msgid ""
+"A JavaScript function (small software program) on this page tried to open a "
+"new window, but nautilus does not support the opening of new windows by "
+"JavaScript.\n"
+"\n"
+"Try viewing the page in a different web browser, such as Mozilla or Netscape."
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-content-view.c:810
+#, fuzzy
+msgid "Nautilus Mozilla View Warning"
+msgstr "Przegl±darka obrazów Nautilusa"
+
 #: components/mozilla/nautilus-mozilla-ui.xml.h:1
-msgid "_Mozilla Test"
-msgstr "Test _Mozilli"
+msgid "Charset Encoding"
+msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: components/music/Nautilus_View_music.oaf.in.h:1
-msgid "Factory for music view"
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:1
+msgid "Mozilla Nautilus view"
 msgstr ""
 
-#: components/music/Nautilus_View_music.oaf.in.h:1
-msgid "Music"
-msgstr "Muzyka"
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:2
+msgid "Mozilla Nautilus view factory"
+msgstr ""
 
-#: components/music/Nautilus_View_music.oaf.in.h:1
-msgid "Music view"
-msgstr "Widok muzyki"
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:3
+msgid "Mozilla content view component"
+msgstr ""
 
-#: components/music/Nautilus_View_music.oaf.in.h:1
-msgid "Music view factory"
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:4
+msgid "Mozilla content view component's factory"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:5
+#, fuzzy
+msgid "View as Web Page"
+msgstr "Wy¶wietlanie jako inne"
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:6
+msgid "Web Page"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:7
+#, fuzzy
+msgid "Web Page Viewer"
+msgstr "Przegl±darka obrazów Nautilusa"
+
+#: components/music/mpg123.c:29
 msgid "Blues"
 msgstr "Blues"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:29
 msgid "Classic Rock"
 msgstr "Klasyczny rock"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:29
 msgid "Country"
 msgstr "Country"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:29
 msgid "Dance"
 msgstr "Dance"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:30
 msgid "Disco"
 msgstr "Disco"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:30
 msgid "Funk"
 msgstr "Funk"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:30
 msgid "Grunge"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:30
 msgid "Hip-Hop"
 msgstr "Hip-Hop"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:31
 msgid "Jazz"
 msgstr "Jazz"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:31
 msgid "Metal"
 msgstr "Metal"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:31
 msgid "New Age"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:31
 msgid "Oldies"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:32
 msgid "Other"
 msgstr "Inne"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:32
 msgid "Pop"
 msgstr "Pop"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:32
 msgid "R&B"
 msgstr "R&B"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:32
 msgid "Rap"
 msgstr "Rap"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:32
 msgid "Reggae"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:33
 msgid "Rock"
 msgstr "Rock"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:33
 msgid "Techno"
 msgstr "Techno"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:33
 msgid "Industrial"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:33
 msgid "Alternative"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:34
 msgid "Ska"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:34
 msgid "Death Metal"
 msgstr "Death metal"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:34
 msgid "Pranks"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:34
 msgid "Soundtrack"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:35
 msgid "Euro-Techno"
 msgstr "Euro-Techno"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:35
 msgid "Ambient"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:35
 msgid "Trip-Hop"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:35
 msgid "Vocal"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:36
 msgid "Jazz+Funk"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:36
 msgid "Fusion"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:36
 msgid "Trance"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:36
 msgid "Classical"
 msgstr "Klasyczna"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:37
 msgid "Instrumental"
 msgstr "Instrumentalna"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:37
 msgid "Acid"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:37
 msgid "House"
 msgstr "House"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:37
 msgid "Game"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:38
 msgid "Sound Clip"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:38
 msgid "Gospel"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:38
 msgid "Noise"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:38
 msgid "Alt"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:39
 msgid "Bass"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:39
 msgid "Soul"
 msgstr "Soul"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:39
 msgid "Punk"
 msgstr "Punk"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:39
 msgid "Space"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:40
 msgid "Meditative"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:40
 msgid "Instrumental Pop"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:41
 msgid "Instrumental Rock"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:41
 msgid "Ethnic"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:41
 msgid "Gothic"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:42
 msgid "Darkwave"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:42
 msgid "Techno-Industrial"
 msgstr "Techno-Industrial"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:42
 msgid "Electronic"
 msgstr "Elektroniczna"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:43
 msgid "Pop-Folk"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:43
 msgid "Eurodance"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:43
 msgid "Dream"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:44
 msgid "Southern Rock"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:44
 msgid "Comedy"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:44
 msgid "Cult"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:45
 msgid "Gangsta Rap"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:45
 msgid "Top 40"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:45
 msgid "Christian Rap"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:46
 msgid "Pop/Funk"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:46
 msgid "Jungle"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:46
 msgid "Native American"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:47
 msgid "Cabaret"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:47
 msgid "New Wave"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:47
 msgid "Psychedelic"
 msgstr "Psychodeliczna"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:47
 msgid "Rave"
 msgstr "Rave"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:48
 msgid "Showtunes"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:48
 msgid "Trailer"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:48
 msgid "Lo-Fi"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:48
 msgid "Tribal"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:49
 msgid "Acid Punk"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:49
 msgid "Acid Jazz"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:49
 msgid "Polka"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:49
 msgid "Retro"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:50
 msgid "Musical"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:50
 msgid "Rock & Roll"
 msgstr "Rock & Roll"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:50
 msgid "Hard Rock"
 msgstr "Hard Rock"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:50
 msgid "Folk"
 msgstr "Folk"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:51
 msgid "Folk/Rock"
 msgstr "Folk/Rock"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:51
 msgid "National Folk"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:51
 msgid "Swing"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:52
 msgid "Fast-Fusion"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:52
 msgid "Bebob"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:52
 msgid "Latin"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:52
 msgid "Revival"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:53
 msgid "Celtic"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:53
 msgid "Bluegrass"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:53
 msgid "Avantgarde"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:54
 msgid "Gothic Rock"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:54
 msgid "Progressive Rock"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:55
 msgid "Psychedelic Rock"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:55
 msgid "Symphonic Rock"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:55
 msgid "Slow Rock"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:56
 msgid "Big Band"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:56
 msgid "Chorus"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:56
 msgid "Easy Listening"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:57
 msgid "Acoustic"
 msgstr "Akustyczna"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:57
 msgid "Humour"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:57
 msgid "Speech"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:57
 msgid "Chanson"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:58
 msgid "Opera"
 msgstr "Opera"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:58
 msgid "Chamber Music"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:58
 msgid "Sonata"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:58
 msgid "Symphony"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:59
 msgid "Booty Bass"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:59
 msgid "Primus"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:59
 msgid "Porn Groove"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:60
 msgid "Satire"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:60
 msgid "Slow Jam"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:60
 msgid "Club"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:60
 msgid "Tango"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:61
 msgid "Samba"
 msgstr "Samba"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:61
 msgid "Folklore"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:61
 msgid "Ballad"
 msgstr "Ballada"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:61
 msgid "Power Ballad"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:62
 msgid "Rhythmic Soul"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:62
 msgid "Freestyle"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:62
 msgid "Duet"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:63
 msgid "Punk Rock"
 msgstr "Punk rock"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:63
 msgid "Drum Solo"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:63
 msgid "A Cappella"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:64
 msgid "Euro-House"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:64
 msgid "Dance Hall"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:64
 msgid "Goa"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:65
 msgid "Drum & Bass"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:65
 msgid "Club-House"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:65
 msgid "Hardcore"
 msgstr "Hardcore"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:66
 msgid "Terror"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:66
 msgid "Indie"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:66
 msgid "BritPop"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:66
 msgid "Negerpunk"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:67
 msgid "Polsk Punk"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:67
 msgid "Beat"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:67
 msgid "Christian Gangsta Rap"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:68
 msgid "Heavy Metal"
 msgstr "Heavy metal"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:68
 msgid "Black Metal"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:68
 msgid "Crossover"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:69
 msgid "Contemporary Christian"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:69
 msgid "Christian Rock"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:70
 msgid "Merengue"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:70
 msgid "Salsa"
 msgstr "Salsa"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:70
 msgid "Thrash Metal"
 msgstr "Thrash Metal"
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:71
 msgid "Anime"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:71
 msgid "JPop"
 msgstr ""
 
-#: components/music/mpg123.c:1
+#: components/music/mpg123.c:71
 msgid "Synthpop"
 msgstr ""
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:238
 msgid "Track"
 msgstr "¦cie¿ka"
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:238
 msgid "Title"
 msgstr "Tytu³"
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:238
 msgid "Artist"
 msgstr "Wykonawca"
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:238
 msgid "Year"
 msgstr "Rok"
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:238
 msgid "Bit Rate"
 msgstr ""
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:238
 msgid "Time"
 msgstr "Czas"
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:238
 msgid "Album"
 msgstr "P³yta"
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:238
 msgid "Comment"
 msgstr "Komentarz"
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:238
 msgid "Channels"
 msgstr "Kana³y"
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:238
 msgid "Sample Rate"
 msgstr "Czêstotliwo¶æ próbkowania"
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:350
 msgid "Set Cover Image"
 msgstr "Wybierz obraz ok³adki"
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:694
 #, c-format
 msgid "Sorry, but '%s' is not a usable image file."
 msgstr "Niestety, %s nie jest poprawnym plikiem graficznym."
 
-#: components/music/nautilus-music-view.c:1
-#: src/file-manager/fm-properties-window.c:1
-#: src/nautilus-property-browser.c:1 src/nautilus-property-browser.c:1
-#: src/nautilus-property-browser.c:1 src/nautilus-property-browser.c:1
+#: components/music/nautilus-music-view.c:696
+#: src/nautilus-property-browser.c:1060 src/nautilus-property-browser.c:1312
 msgid "Not an Image"
 msgstr "To nie grafika"
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:744
 msgid "Select an image file for the album cover:"
 msgstr "Wybór pliku z obrazem ok³adki albumu:"
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:1174
 msgid ""
 "Sorry, but the music view is unable to play back sound right now. Either "
-"another program is using or blocking the soundcard or your soundcard is not "
-"configured properly. "
+"another program is using or blocking the sound card, or your sound card is "
+"not configured properly. Try quitting any applications that may be blocking "
+"use of the sound card."
 msgstr ""
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:1178
 msgid "Unable to Play File"
 msgstr ""
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:1199
 msgid "Sorry, but the music view can't play non-local files yet."
 msgstr ""
 "Niestety, w widoku muzyki nie mo¿na jeszcze odtwarzaæ nielokalnych plików!"
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:1200
 msgid "Can't Play Remote Files"
 msgstr "nie mo¿na odtwarzaæ zdalnych plików"
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:1486
 msgid "Drag to seek within track"
 msgstr "Przeci±gnij, aby przewin±æ wewn±trz ¶cie¿ki"
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:1526
 msgid "Play"
 msgstr "Odtwórz"
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:1540
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: components/music/nautilus-music-view.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: src/nautilus-shell-ui.xml.h:1
+#: components/music/nautilus-music-view.c:1554
+#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: components/music/nautilus-music-view.c:1
-msgid "Sound hardware missing or busy!"
-msgstr "Brak sprzêtu do odtwarzania d¼wiêku lub jest on zajêty!"
-
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:1679
 #, c-format
 msgid "Sorry, but there was an error reading %s."
 msgstr "Niestety, podczas odczytu %s wyst±pi³ b³±d."
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:1680
 msgid "Can't Read Folder"
 msgstr "Nie mo¿na odczytaæ folderu"
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:1750
 msgid "Stereo"
 msgstr "Stereo"
 
-#: components/music/nautilus-music-view.c:1
+#: components/music/nautilus-music-view.c:1750
 msgid "Mono"
 msgstr "Mono"
 
-#: components/music/nautilus-music-view.c:1
-#, c-format
-msgid "%s by %s"
+#: components/music/nautilus-music-view.c:1792
+#, fuzzy, c-format
+msgid "%s - %s"
+msgstr "%s%s, %s"
+
+#: components/music/Nautilus_View_music.oaf.in.h:1
+msgid "Factory for music view"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
+#: components/music/Nautilus_View_music.oaf.in.h:2
+msgid "Music"
+msgstr "Muzyka"
+
+#: components/music/Nautilus_View_music.oaf.in.h:3
+#, fuzzy
+msgid "Music Viewer"
+msgstr "Widok muzyki"
+
+#: components/music/Nautilus_View_music.oaf.in.h:4
+msgid "Music view"
+msgstr "Widok muzyki"
+
+#: components/music/Nautilus_View_music.oaf.in.h:5
+msgid "Music view factory"
+msgstr ""
+
+#: components/music/Nautilus_View_music.oaf.in.h:6
+#, fuzzy
+msgid "View as Music"
+msgstr "Wy¶wietlanie jako %s"
+
 #: components/notes/Nautilus_View_notes.oaf.in.h:1
 msgid "Factory for annotation view"
 msgstr ""
 
-#: components/notes/Nautilus_View_notes.oaf.in.h:1
+#: components/notes/Nautilus_View_notes.oaf.in.h:3
 msgid "Notes sidebar panel"
 msgstr ""
 
-#: components/notes/Nautilus_View_notes.oaf.in.h:1
+#: components/notes/Nautilus_View_notes.oaf.in.h:4
 msgid "Notes sidebar panel for Nautilus"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:1
-msgid "Factory for rpm view"
+#: components/sample/nautilus-sample-content-view.c:136
+msgid "(none)"
+msgstr "(brak)"
+
+#: components/sample/nautilus-sample-content-view.c:189
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"This is a sample Nautilus content view component."
+msgstr ""
+"%s\n"
+"\n"
+"Oto przyk³adowy komponent nautilusa wy¶wietlaj±cy zawarto¶æ."
+
+#: components/sample/nautilus-sample-content-view.c:252
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"You clicked the Sample toolbar button."
 msgstr ""
+"%s\n"
+"\n"
+"Zosta³ klikniêty przyk³adowy przycisk paska narzêdziowego."
 
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:1
-msgid "Package"
-msgstr "Pakiet"
+#: components/sample/Nautilus_View_sample.oaf.in.h:3
+#: components/sample/nautilus-sample-content-view-ui.xml.h:1
+#: components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in.h:2
+msgid "Sample"
+msgstr "Próbka"
+
+#: components/sample/nautilus-sample-content-view-ui.xml.h:2
+msgid "This is a sample merged menu item"
+msgstr "Oto przyk³adowy do³±czony element menu"
+
+#: components/sample/nautilus-sample-content-view-ui.xml.h:3
+#, fuzzy
+msgid "This is a sample merged toolbar button"
+msgstr "Oto przyk³adowy do³±czony przycisk paska narzêdziowego"
+
+#: components/sample/nautilus-sample-content-view-ui.xml.h:5
+msgid "_Sample"
+msgstr "_Próbka"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:1
+msgid "Nautilus Sample view"
+msgstr "Przyk³adowy widok Nautilusa"
 
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:1
-msgid "RPM component"
+#: components/sample/Nautilus_View_sample.oaf.in.h:2
+msgid "Nautilus Sample view factory"
 msgstr ""
 
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:1
-msgid "RPM view factory"
+#: components/sample/Nautilus_View_sample.oaf.in.h:4
+#, fuzzy
+msgid "Sample Viewer"
+msgstr "Czêstotliwo¶æ próbkowania"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:5
+msgid "Sample content view component"
 msgstr ""
 
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:1
-msgid "rpm view"
+#: components/sample/Nautilus_View_sample.oaf.in.h:6
+msgid "Sample content view component's factory"
 msgstr ""
 
-#. set up the window title
-#: components/rpmview/nautilus-rpm-verify-window.c:1
-#, c-format
-msgid "Verifying %s..."
-msgstr "Weryfikowanie %s..."
+#: components/sample/Nautilus_View_sample.oaf.in.h:7
+#, fuzzy
+msgid "View as Sample"
+msgstr "Wy¶wietlanie jako inne"
 
-#: components/rpmview/nautilus-rpm-verify-window.c:1
-#, c-format
-msgid "Failed on \"%s\""
-msgstr "Niepowodzenie przy \"%s\""
+#: components/services/install/command-line/eazel-alt-install-corba.c:107
+msgid "Set the default answer to continue, also default delete to Yes"
+msgstr ""
 
-#. TRANSLATORS: this is printed while verifying files from packages,
-#. %s is the filename, %d/%d is filenumber of total-number-of-files
-#: components/rpmview/nautilus-rpm-verify-window.c:1
-#, c-format
-msgid "Checking \"%s\" (%ld/%ld)"
-msgstr "Sprawdzanie \"%s\" (%ld/%ld)"
+#: components/services/install/command-line/eazel-alt-install-corba.c:108
+#, fuzzy
+msgid "Specify search cgi"
+msgstr "Okre¶l serwer"
 
-#: components/rpmview/nautilus-rpm-view-install.c:1
-#, c-format
-msgid "%s would not work anymore\n"
-msgstr "%s nie bêdzie ju¿ poprawnie dzia³a³o\n"
+#: components/services/install/command-line/eazel-alt-install-corba.c:109
+#: components/services/install/command-line/eazel-gen-xml.c:43
+#: components/services/install/command-line/eazel-test-packsys.c:590
+#: components/services/install/command-line/eazel-test-softcat.c:56
+msgid "Show debug output"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:1
-#, c-format
-msgid "%s would break other installed packages\n"
-msgstr "%s uszkodzi³by inne zainstalowane pakiety\n"
+#: components/services/install/command-line/eazel-alt-install-corba.c:110
+msgid "10 sec delay after starting service"
+msgstr "10-sekundowe opó¼nienie po uruchomieniu us³ogi"
 
-#: components/rpmview/nautilus-rpm-view-install.c:1
-#, c-format
-msgid "%s is needed, but could not be found\n"
-msgstr "%s jest wymagany, lecz nie mo¿e zostaæ odnaleziony\n"
+#: components/services/install/command-line/eazel-alt-install-corba.c:111
+msgid "Allow downgrades"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:1
-#, c-format
-msgid "%s was already installed\n"
-msgstr "%s zosta³ ju¿ zainstalowany\n"
+#: components/services/install/command-line/eazel-alt-install-corba.c:112
+msgid "Erase packages"
+msgstr "Usuñ pakiety"
 
-#: components/rpmview/nautilus-rpm-view-install.c:1
-#, c-format
-msgid "%s causes a circular dependency problem\n"
-msgstr "%s powoduje problem zwi±zany z zapêtlonymi zale¿no¶ciami\n"
+#: components/services/install/command-line/eazel-alt-install-corba.c:113
+msgid "enable ei2"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:1
-#, c-format
-msgid "Installing %s failed because of the following issue(s):\n"
-msgstr "Instalacja %s nie powiod³a siê z nastêpuj±cych powodów\n"
+#: components/services/install/command-line/eazel-alt-install-corba.c:114
+msgid "RPM args are filename"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:1
-#, c-format
-msgid "Uninstalling %s failed because of the following issue(s):\n"
-msgstr "Odinstalowanie %s nie powiod³o siê z nastêpuj±cych powodów\n"
+#: components/services/install/command-line/eazel-alt-install-corba.c:115
+msgid "Use ftp"
+msgstr "U¿ycie FTP"
 
-#: components/rpmview/nautilus-rpm-view-install.c:1
-msgid "Uninstall failed..."
-msgstr "Odinstalowanie nie powiod³o siê"
+#: components/services/install/command-line/eazel-alt-install-corba.c:116
+msgid "Use local"
+msgstr "U¿ycie lokalnych plików"
 
-#: components/rpmview/nautilus-rpm-view-install.c:1
-msgid "Uninstall Failed"
-msgstr "Odinstalowanie nie powiod³o siê"
+#: components/services/install/command-line/eazel-alt-install-corba.c:117
+msgid "Use http"
+msgstr "U¿ycie HTTP"
 
-#: components/rpmview/nautilus-rpm-view-install.c:1
-msgid "Install failed..."
-msgstr "Instalacja nie powiod³a siê..."
+#: components/services/install/command-line/eazel-alt-install-corba.c:118
+msgid "RPM args are Eazel Ids"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:1
-msgid "Install Failed"
-msgstr "Instalacja nie powiod³a siê"
+#: components/services/install/command-line/eazel-alt-install-corba.c:119
+msgid "machine readable output"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:1
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-msgid "Incorrect password."
-msgstr "Niepoprawne has³o"
+#: components/services/install/command-line/eazel-alt-install-corba.c:120
+msgid "Don't print fancy percent output"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:1
-msgid "Package Contents"
-msgstr "Zawarto¶æ pakietu"
+#: components/services/install/command-line/eazel-alt-install-corba.c:121
+msgid "don't use eazel auth stuff"
+msgstr ""
 
-#. allocate the name field
-#: components/rpmview/nautilus-rpm-view.c:1
-msgid "Package Title"
-msgstr "Tytu³ pakietu"
+#: components/services/install/command-line/eazel-alt-install-corba.c:122
+msgid "Specify package file"
+msgstr "Okre¶la plik z pakietem"
 
-#: components/rpmview/nautilus-rpm-view.c:1
-msgid "Size: "
-msgstr "Rozmiar: "
+#: components/services/install/command-line/eazel-alt-install-corba.c:123
+msgid "RPM args are needed files"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:1
-msgid "<size>"
-msgstr "<rozmiar>"
+#: components/services/install/command-line/eazel-alt-install-corba.c:124
+msgid "Run Query"
+msgstr "Uruchom zapytanie"
 
-#: components/rpmview/nautilus-rpm-view.c:1
-msgid "Install Date: "
-msgstr "Data instalacji: "
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
+msgid "Revert"
+msgstr "Przywróæ"
 
-#: components/rpmview/nautilus-rpm-view.c:1
-#: components/rpmview/nautilus-rpm-view.c:1
-#: components/rpmview/nautilus-rpm-view.c:1
-#: components/rpmview/nautilus-rpm-view.c:1
-#: components/rpmview/nautilus-rpm-view.c:1
-msgid "<unknown>"
-msgstr "<nieznane>"
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
+msgid "Set root"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:1
-msgid "License: "
-msgstr "Licencja: "
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
+msgid "Specify server"
+msgstr "Okre¶l serwer"
 
-#: components/rpmview/nautilus-rpm-view.c:1
-msgid "Build Date: "
-msgstr "Data utworzenia: "
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
+msgid "Dont print too much, just problems and download"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:1
-msgid "Distribution: "
-msgstr "Dystrybucja: "
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
+msgid "Perform ssl renaming"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:1
-msgid "Vendor: "
-msgstr "Sprzedawca: "
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
+msgid "argument is a suite id"
+msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: components/rpmview/nautilus-rpm-view.c:1
-#: components/services/install/nautilus-view/Nautilus_View_install.oaf.in.h:1
-#: components/services/install/server/Trilobite_Service_install.oaf.in.h:1
-msgid "Install"
-msgstr "Zainstaluj"
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
+msgid "Test run"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
+msgid "Allow username"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:1
-msgid "Update"
-msgstr "Uaktualnij"
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
+msgid "Allow upgrades"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:1
-msgid "Uninstall"
-msgstr "Odinstaluj"
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
+msgid "Verbose output"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:1
-msgid "Verify"
-msgstr "Zweryfikuj"
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
+msgid "Install a specific package version"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:1
-msgid "Go to selected file"
-msgstr "Przechodzi do zaznaczonego pliku"
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
+msgid "*** You cannot specify more then one protocol type.\n"
+msgstr ""
 
-#. add the description
-#: components/rpmview/nautilus-rpm-view.c:1
-msgid "Description"
-msgstr "Opis"
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
+msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:1
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, c-format
-msgid "Package Contents: %d files"
-msgstr "Zawarto¶æ pakietu: %d plików"
+msgid "File conflict checking %s...\n"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:1
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, c-format
-msgid "Package \"%s\" "
-msgstr "Pakiet \"%s\" "
+msgid "File uniqueness checking %s...\n"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:1
-msgid "Verification completed, package ok."
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
+#, c-format
+msgid "Feature consistency checking %s...\n"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: components/sample/Nautilus_View_sample.oaf.in.h:1
-msgid "Nautilus Sample view"
-msgstr "Przyk³adowy widok Nautilusa"
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
+#, c-format
+msgid "Downloading %s..."
+msgstr "Pobieranie %s..."
 
-#: components/sample/Nautilus_View_sample.oaf.in.h:1
-msgid "Nautilus Sample view factory"
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
+msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: components/sample/Nautilus_View_sample.oaf.in.h:1
-#: components/sample/nautilus-sample-content-view-ui.xml.h:1
-#: components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in.h:1
-msgid "Sample"
-msgstr "Próbka"
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
+#, fuzzy
+msgid "Downloading %s... (%d/%d) = %d%%"
+msgstr "Pobieranie %s..."
 
-#: components/sample/Nautilus_View_sample.oaf.in.h:1
-msgid "Sample content view component"
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
+#, c-format
+msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
 msgstr ""
 
-#: components/sample/Nautilus_View_sample.oaf.in.h:1
-msgid "Sample content view component's factory"
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
+#, fuzzy, c-format
+msgid "Downloading %s... %3.1f KB/s Done\n"
+msgstr "Pobieranie %s..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
+msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr ""
 
-#: components/sample/nautilus-sample-content-view-ui.xml.h:1
-msgid "This is a sample merged menu item"
-msgstr "Oto przyk³adowy do³±czony element menu"
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
+msgstr ""
 
-#: components/sample/nautilus-sample-content-view-ui.xml.h:1
-msgid "This is a sample merged tool bar button"
-msgstr "Oto przyk³adowy do³±czony przycisk paska narzêdziowego"
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
+msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+msgstr ""
 
-#: components/sample/nautilus-sample-content-view-ui.xml.h:1
-msgid "_Sample"
-msgstr "_Próbka"
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+msgstr ""
 
-#: components/sample/nautilus-sample-content-view.c:1
-msgid "(none)"
-msgstr "(brak)"
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
+#, fuzzy
+msgid "Done\n"
+msgstr "Gotowe"
 
-#: components/sample/nautilus-sample-content-view.c:1
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"This is a sample Nautilus content view component."
+msgid "Download of %s FAILED\n"
 msgstr ""
-"%s\n"
-"\n"
-"Oto przyk³adowy komponent nautilusa wy¶wietlaj±cy zawarto¶æ."
 
-#: components/sample/nautilus-sample-content-view.c:1
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
+#, fuzzy, c-format
+msgid "Package %s failed to uninstall.\n"
+msgstr "Pakiet zosta³ ju¿ zainstalowany."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
+#, fuzzy, c-format
+msgid "Package %s failed to install.\n"
+msgstr "Pakiet zosta³ ju¿ zainstalowany."
+
+#. I18N note: \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"You clicked the Sample toolbar button."
+msgid "\t· Problem : %s\n"
 msgstr ""
-"%s\n"
-"\n"
-"Zosta³ klikniêty przyk³adowy przycisk paska narzêdziowego."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Set the default answer to continue, also default delete to Yes"
+#. I18N note: \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
+#, c-format
+msgid "\t· Action : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-#: components/services/install/command-line/eazel-gen-xml.c:1
-msgid "Show debug output"
-msgstr ""
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
+#, fuzzy
+msgid "Cancelling operation\n"
+msgstr "Poprawne operacje:"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "10 sec delay after starting service"
-msgstr "10-sekundowe opó¼nienie po uruchomieniu us³ogi"
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
+#, fuzzy, c-format
+msgid "About to install a total of %d packages, %dKB\n"
+msgstr ""
+"Zostan± zainstalowane pakietu:\n"
+"\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Allow downgrades"
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
+#, fuzzy, c-format
+msgid "About to uninstall a total of %d packages, %dKB\n"
 msgstr ""
+"Zostan± zainstalowane pakietu:\n"
+"\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Erase packages"
-msgstr "Usuñ pakiety"
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
+#, c-format
+msgid "About to revert a total of %d packages, %d KB\n"
+msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "enable ei2"
+#. I18N note: %s is a package name, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
+#, c-format
+msgid "\t· %s and it's dependencies\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "RPM args are filename"
+#. I18N note: %s is a package name, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
+#, c-format
+msgid "\t· %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Force install"
-msgstr "Wymuszona instalacja"
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n) " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
+msgid "Save transaction report ? (y/n) "
+msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Use ftp"
-msgstr "U¿ycie FTP"
+#. I18N note: y is the letter for the word Yes. This is
+#. used in the response for a yes/no questions. Your translation
+#. must be 1 character only.
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
+msgid "y"
+msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Use local"
-msgstr "U¿ycie lokalnych plików"
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
+#, c-format
+msgid "Dependency : %s needs %s\n"
+msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Use http"
-msgstr "U¿ycie HTTP"
+#. I18N note: %s is a package name
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
+#, c-format
+msgid "Package %s failed md5 check!\n"
+msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "RPM args are Eazel Ids"
+#. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
+#, c-format
+msgid "\t· server MD5 checksum is %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Don't print fancy percent output"
+#. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
+#, c-format
+msgid "\t· actual MD5 checksum is %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Specify package file"
-msgstr "Okre¶la plik z pakietem"
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
+msgid "Continue? (y/n) "
+msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Set port numer (80)"
-msgstr "Ustawia numer portu (80)"
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
+msgid "Should I delete the RPM files? (y/n) "
+msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "RPM args are needed files"
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
+msgid "Operation ok\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Run Query"
-msgstr "Uruchom zapytanie"
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
+#, fuzzy
+msgid "Operation failed\n"
+msgstr "Instalacja nie powiod³a siê!"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Revert"
-msgstr "Przywróæ"
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
+#, fuzzy
+msgid "Installing"
+msgstr "Zainstaluj"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Set root"
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
+#, fuzzy
+msgid "Uninstalling"
+msgstr "Odinstaluj"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
+msgid "Only one operation at a time please."
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Specify server"
-msgstr "Okre¶l serwer"
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
+#, c-format
+msgid "%s: --help for usage\n"
+msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Perform ssl renaming"
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
+#, c-format
+msgid "Name         : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Test run"
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#, fuzzy, c-format
+msgid "Version      : %s\n"
+msgstr "Wersja: %s"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#, c-format
+msgid "Minor        : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Set tmp dir (/tmp)"
-msgstr "Ustaw katalog tymczasowy (/tmp)"
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
+#, c-format
+msgid "Size         : %d\n"
+msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Allow username"
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#, c-format
+msgid "Arch         : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Allow upgrades"
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#, fuzzy, c-format
+msgid "Distribution : %s\n"
+msgstr "Dystrybucja: "
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#, fuzzy, c-format
+msgid "Description  : %s\n"
+msgstr "Opis"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
+#, fuzzy, c-format
+msgid "Install root : %s\n"
+msgstr "Data instalacji: "
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
+msgid "Provides     : \n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1
-msgid "Verbose output"
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
+#, c-format
+msgid "exit code %d\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-gen-xml.c:1
+#: components/services/install/command-line/eazel-gen-xml.c:41
 msgid "Specify package list to use (/var/eazel/service/package-list.xml)"
 msgstr ""
 "Okre¶la wykorzystywan± listê pakietów (/var/eazel/service/package-list.xml)"
 
-#: components/services/install/command-line/eazel-gen-xml.c:1
+#: components/services/install/command-line/eazel-gen-xml.c:42
 msgid "Use specified file to generate a package list, requires --packagelist"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1
-#, c-format
-msgid "Reading the install package list %s"
+#: components/services/install/command-line/eazel-test-softcat.c:54
+msgid "Softcat server to connect to"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1
-#, c-format
-msgid "Will download %s"
-msgstr "Pobierze %s"
+#: components/services/install/command-line/eazel-test-softcat.c:55
+msgid "Use alternate CGI path"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1
-#, c-format
-msgid "%s already installed"
-msgstr "%s zosta³ ju¿ zainstalowany"
+#: components/services/install/command-line/eazel-test-softcat.c:57
+msgid "Connect as a softcat user through ammonite"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1
-#, c-format
-msgid "Category = %s"
-msgstr "Kategoria = %s"
+#: components/services/install/command-line/eazel-test-softcat.c:58
+msgid "Number of times to try the request"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1
-#, c-format
-msgid "Could not create transaction directory (%s)! ***\n"
-msgstr "Nie mo¿na utworzyæ katalogu transakcji (%s)! ***\n"
+#: components/services/install/command-line/eazel-test-softcat.c:59
+msgid "Delay between request retries, in usec"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1
-#, c-format
-msgid "Writing transaction to %s"
-msgstr "Zapisywanie transakcji do %s"
+#: components/services/install/command-line/eazel-test-softcat.c:60
+msgid "Lookup by Eazel package id"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:61
+msgid "Lookup package that features a feature/file"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:62
+msgid "Lookup package with a specific version"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:63
+msgid "(with --version) Use >= comparison"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:64
+msgid "use check function (for debugging)"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:65
+msgid "Show detailed sub-package info"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1
+#: components/services/install/command-line/eazel-test-softcat.c:66
+msgid "enable funk parser"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "Zablokowanie pobranego pliku nie powiod³o siê"
 
-#: components/services/install/lib/eazel-install-logic.c:1
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "Niezgodno¶æ MD5, pakiet %s mo¿e byæ uszkodzony"
 
-#: components/services/install/lib/eazel-install-logic.c:1
-#, c-format
-msgid "Removing package %s (0x%p) %s"
-msgstr "Usuwanie pakietu %s (0x%p) %s"
+#: components/services/install/lib/eazel-install-logic2.c:150
+#, fuzzy, c-format
+msgid "No MD5 available for %s"
+msgstr "Brak opisu motywu \"%s\""
 
-#: components/services/install/lib/eazel-install-logic.c:1
+#. I18N note: "%is is ok" in the sense that %s=package name and the
+#. package is intact
+#: components/services/install/lib/eazel-install-logic2.c:356
+#, fuzzy, c-format
+msgid "%s is ok"
+msgstr "Zgadzasz siê?"
+
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s w wersji %s-%s jest ju¿ zainstalowany"
 
-#: components/services/install/lib/eazel-install-logic.c:1
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s jest ju¿ zainstalowany w wersji %s"
 
-#: components/services/install/lib/eazel-install-logic.c:1
-#: components/services/install/lib/eazel-install-logic.c:1
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1
-msgid "Dependencies appear ok"
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
+#, fuzzy, c-format
+msgid "Loading package info from file %s"
+msgstr "Instalowanie pakietu %d z %d"
+
+#. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
+#: components/services/install/lib/eazel-install-logic2.c:1197
+#, fuzzy
+msgid "ok"
+msgstr "Folk"
+
+#: components/services/install/lib/eazel-install-logic2.c:1197
+msgid "not ok"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:1363
+#, c-format
+msgid "Checking dependencies for %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1
-msgid "But there are file conflicts"
+#. I18N note: both %s' are package names.
+#. related is in the sense that the two packages apparently
+#. are connected somehow, eg. foo and foo-devel
+#: components/services/install/lib/eazel-install-logic2.c:2014
+#, fuzzy, c-format
+msgid "%s is related to %s"
+msgstr "Zaznaczono \"%s\" (%s)"
+
+#: components/services/install/lib/eazel-install-logic2.c:2090
+#, c-format
+msgid "updating %s to version %s-%s solves conflict"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-metadata.c:1
+#: components/services/install/lib/eazel-install-logic2.c:2113
+#, c-format
+msgid "available update to %s (%s-%s) does not solves conflict"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2128
+#, fuzzy, c-format
+msgid "could not revive %s"
+msgstr "DYSK JEST ZAPE£NIONY: nie mo¿na zapisaæ %s"
+
+#: components/services/install/lib/eazel-install-logic2.c:2284
+#, c-format
+msgid "file uniqueness checking %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2305
+#, c-format
+msgid "Duplicate file : %s occurs in %s and %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
+msgid "... but it's ok, the packages are related"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2324
+#, c-format
+msgid "(there were %d other conflicts)"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2419
+#, c-format
+msgid "file conflict checking %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2456
+#, c-format
+msgid "file conflict : package %s already provides file %s also provided by %s"
+msgstr ""
+
+#. the owner of this file is a package that we're upgrading, and the
+#. * new version no longer has this file, so everything's okay.
+#: components/services/install/lib/eazel-install-logic2.c:2466
+#, c-format
+msgid "...but it is okay, we're upgrading %s and it ditched that file"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2558
+#, c-format
+msgid "checking feature consistency of %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2626
+#, c-format
+msgid ""
+"feature missing : %s breaks if %s is installed (feature %s would be lost"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2705
+#, fuzzy, c-format
+msgid "downloading %d packages"
+msgstr "Pobieranie pakietu"
+
+#: components/services/install/lib/eazel-install-logic2.c:2951
+#, c-format
+msgid "will upgrade %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2954
+#, fuzzy, c-format
+msgid "will downgrade %s"
+msgstr "Pobierze %s"
+
+#: components/services/install/lib/eazel-install-logic2.c:2957
+#, fuzzy, c-format
+msgid "will install %s"
+msgstr "Instalowanie \"%s\""
+
+#: components/services/install/lib/eazel-install-logic2.c:2960
+#, fuzzy, c-format
+msgid "will uninstall %s"
+msgstr "Odinstaluj"
+
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
+#, c-format
+msgid "%s requires %s"
+msgstr "%s wymaga %s"
+
+#: components/services/install/lib/eazel-install-logic2.c:3238
+#, fuzzy, c-format
+msgid "failed %s"
+msgstr "Niepowodzenie przy \"%s\""
+
+#: components/services/install/lib/eazel-install-metadata.c:174
 msgid "Could not set URLType from config file!"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:1
+#: components/services/install/lib/eazel-install-object.c:717
 msgid "Transactions are not stored, could not find home dir"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:1
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr "Transakcje s± zapisane w %s"
 
-#: components/services/install/lib/eazel-install-object.c:1
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "Pobieranie listy pakietów ze zdalnego serwera ...\n"
 
-#: components/services/install/lib/eazel-install-object.c:1
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "Nie mo¿na pobraæ package-list.xml!\n"
 
-#: components/services/install/lib/eazel-install-object.c:1
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr ""
 "Nie mo¿na zapisaæ do pliku dziennika %s, wykorzystanie domy¶lnej obs³ugi "
 "dziennika"
 
-#: components/services/install/lib/eazel-install-object.c:1
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "Instalacja nie powiod³a siê"
 
-#: components/services/install/lib/eazel-install-object.c:1
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "Odinstalowanie nie powiod³o siê"
 
-#: components/services/install/lib/eazel-install-problem.c:1
-#: components/services/install/lib/eazel-install-problem.c:1
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
-msgid "%s is a source package, which is not yet supported"
-msgstr ""
+msgid "Could not create transaction directory (%s)! ***\n"
+msgstr "Nie mo¿na utworzyæ katalogu transakcji (%s)! ***\n"
 
-#: components/services/install/lib/eazel-install-problem.c:1
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
-msgid "%s had a file conflict with %s which %s required"
-msgstr ""
+msgid "Writing transaction to %s"
+msgstr "Zapisywanie transakcji do %s"
+
+#: components/services/install/lib/eazel-install-problem.c:163
+#, fuzzy, c-format
+msgid "%s was cancelled"
+msgstr "%s zosta³ ju¿ zainstalowany\n"
 
-#: components/services/install/lib/eazel-install-problem.c:1
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
-msgid "%s had a file conflict with %s"
+msgid "%s is a source package, which is not yet supported"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:1
-#: components/services/install/lib/eazel-install-problem.c:1
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
 #, c-format
 msgid "%s would break other packages"
 msgstr "%s uszkodzi³by inne pakiety"
 
-#: components/services/install/lib/eazel-install-problem.c:1
+#: components/services/install/lib/eazel-install-problem.c:185
 #, c-format
 msgid "%s would break"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:1
+#: components/services/install/lib/eazel-install-problem.c:191
 #, c-format
 msgid "%s would break %s"
 msgstr "%s uszkodzi³by %s"
 
-#: components/services/install/lib/eazel-install-problem.c:1
+#: components/services/install/lib/eazel-install-problem.c:197
+#, c-format
+msgid "%s is damaged"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:201
 #, c-format
 msgid "%s requires %s, which could not be found on the server"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:1
+#: components/services/install/lib/eazel-install-problem.c:204
 #, c-format
-msgid "%s could not be found on the server"
+msgid "%s for %s could not be found on the server"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:1
-#: components/services/install/lib/eazel-install-problem.c:1
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr "%s jest ju¿ zainstalowany"
 
-#: components/services/install/lib/eazel-install-problem.c:1
+#: components/services/install/lib/eazel-install-problem.c:259
 #, c-format
-msgid "%s, which is newer, is already installed"
+msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr ""
 
-#. Possibly the implest case, we're installing package A, which requires
-#. B that is not installed.
-#: components/services/install/lib/eazel-install-problem.c:1
-#: components/services/install/lib/eazel-install-problem.c:1
-#: components/services/install/lib/eazel-install-rpm-glue.c:1
+#: components/services/install/lib/eazel-install-problem.c:263
 #, c-format
-msgid "%s requires %s"
-msgstr "%s wymaga %s"
+msgid "%s, which is older, needs upgrade and upgrade is not enabled"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:1
-#, c-format
-msgid "%s is not installed"
-msgstr "%s nie jest zainstalowany"
+#: components/services/install/lib/eazel-install-problem.c:353
+#, fuzzy, c-format
+msgid "%s is not installed and could not be found on server"
+msgstr "%s jest wymagany, lecz nie mo¿e zostaæ odnaleziony\n"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:1
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr ""
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:1
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr ""
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:1
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr ""
@@ -1907,474 +2566,415 @@ msgstr ""
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:1
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr ""
 
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:1
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:1
-#: components/services/install/lib/eazel-install-protocols.c:1
-#, c-format
-msgid "Downloading %s..."
-msgstr "Pobieranie %s..."
+#: components/services/install/lib/eazel-install-problem.c:1015
+msgid "Continue with force"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:1
+#: components/services/install/lib/eazel-install-problem.c:1021
+msgid "Allow downgrade"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
 #, c-format
 msgid "Could not open target file %s"
 msgstr "Nie mo¿na otworzyæ pliku docelowego %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:1
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
 msgid "Could not create an http request !"
 msgstr "Nie mo¿na utworzyæ ¿±dania HTTP!"
 
-#: components/services/install/lib/eazel-install-protocols.c:1
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
 msgid "Proxy: Invalid uri !"
 msgstr "Po¶rednik: Niepoprawny uri !"
 
-#: components/services/install/lib/eazel-install-protocols.c:1
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
 msgid "Invalid uri !"
 msgstr "Niepoprawny uri !"
 
-#: components/services/install/lib/eazel-install-protocols.c:1
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
 msgid "Could not prepare http request !"
 msgstr "Nie mo¿na przygotowaæ ¿±dania HTTP!"
 
-#: components/services/install/lib/eazel-install-protocols.c:1
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
 msgid "Couldn't get async mode "
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:1
-#, c-format
-msgid "HTTP error: %d %s"
-msgstr "B³±d HTTP: %d %s"
-
 #. probably out of disk space
-#: components/services/install/lib/eazel-install-protocols.c:1
-#: components/services/install/lib/eazel-install-protocols.c:1
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, c-format
 msgid "DISK FULL: could not write %s"
 msgstr "DYSK JEST ZAPE£NIONY: nie mo¿na zapisaæ %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:1
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
 msgid "Could not get request body!"
 msgstr "Nie mo¿na pobraæ tre¶ci ¿±dania!"
 
-#: components/services/install/lib/eazel-install-protocols.c:1
+#: components/services/install/lib/eazel-install-protocols.c:208
+#, c-format
+msgid "HTTP error: %d %s"
+msgstr "B³±d HTTP: %d %s"
+
+#: components/services/install/lib/eazel-install-protocols.c:255
 msgid "FTP not supported yet"
 msgstr "FTP nie jest jeszcze obs³ugiwany"
 
-#: components/services/install/lib/eazel-install-protocols.c:1
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, c-format
 msgid "Checking local file %s..."
 msgstr "Sprawdzanie lokalnego pliku %s..."
 
-#: components/services/install/lib/eazel-install-protocols.c:1
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, c-format
 msgid "Failed to retrieve %s!"
 msgstr "Nie mo¿na pobraæ %s!"
 
-#: components/services/install/lib/eazel-install-protocols.c:1
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, c-format
 msgid "Could not get an URL for %s"
 msgstr "Nie mo¿na pobraæ URL-a dla %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:1
+#: components/services/install/lib/eazel-install-protocols.c:672
 msgid "Downloaded package does not have the correct name"
 msgstr "Pobrany pakiet nie ma poprawnej nazwy"
 
-#: components/services/install/lib/eazel-install-protocols.c:1
+#: components/services/install/lib/eazel-install-protocols.c:673
 #, c-format
 msgid "Package %s should have had name %s"
 msgstr "Pakiet %s powinien mieæ nazwê %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:1
-msgid "Downloaded package does not have the correct version"
-msgstr "Pobrany pakiet nie jest w poprawnej wersji"
-
-#: components/services/install/lib/eazel-install-protocols.c:1
-#, c-format
-msgid "Package %s had version %s and not %s"
-msgstr ""
-
-#: components/services/install/lib/eazel-install-protocols.c:1
+#: components/services/install/lib/eazel-install-protocols.c:701
 msgid "File download failed"
 msgstr "Pobranie pliku nie powiod³o siê"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1
-#, c-format
-msgid "Processing dep for %s, requires library %s"
-msgstr "Przetwarzanie zale¿no¶ci %s, wymaga biblioteki %s"
-
-#: components/services/install/lib/eazel-install-rpm-glue.c:1
-#, c-format
-msgid "Processing dep for %s, requires package %s"
-msgstr "Przetwarzanie zale¿no¶ci %s, wymaga pakietu %s"
-
-#: components/services/install/lib/eazel-install-rpm-glue.c:1
-#, c-format
-msgid "package %s is already in requirements, whew!"
-msgstr ""
-
-#. If we end here, it's a conflict is going to break something
-#: components/services/install/lib/eazel-install-rpm-glue.c:1
-#, c-format
-msgid "Package %s conflicts with %s-%s"
-msgstr "Pakiet %s jest w konflikcie z %s-%s"
-
-#: components/services/install/lib/eazel-install-tests.c:1
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-tests.c:1
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 msgid "*** No package nodes! (cat has no children) ***"
 msgstr "*** Brak wêz³ów pakietów! (cat nie ma potomków) ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 msgid "*** Bailing from package parse! ***"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
 msgid "*** No package nodes! ***"
 msgstr "*** Brak wêz³ów pakietów! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 msgid "*** Malformed package node!"
 msgstr "*** Uszkodzony wêze³ pakietu!"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
 msgid "*** No depends nodes! ***"
 msgstr "*** Brak wêz³ów zale¿no¶ci! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr "*** Uszkodzony wêze³ zale¿no¶ci!"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr "*** Nieznany typ wêz³a \"%s\""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** Plik z list± pakietów nie zawiera danych! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** Nie mo¿na odnale¼æ wêz³a CATEGORIES w XML-u! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** Brak kategorii! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** Nie mo¿na odnale¼æ wêz³a TRANSACTION w XML-u! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** Brak pakietów! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** Brak wêz³ów kategorii! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** Nie mo¿na odnale¼æ wêz³a CATEGORIES w XML-u! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** Nieznany wêze³ %s"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** B³±d przy tworzeniu listy pakietów w XML-u! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** B³ad przy odczycie listy pakietów! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:1
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "nie mo¿na przeanalizowaæ pliku XML (d³ugo¶æ %d)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr "Otwarta baza danych pakietów w %s"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr "Nie powiod³o siê otwarcie bazy danych pakietów w %s"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr ""
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr ""
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr "Nie mo¿na otworzyæ %s"
 
-#: components/services/install/nautilus-view/Nautilus_View_install.oaf.in.h:1
-msgid "Nautilus Service Install View"
-msgstr ""
-
-#: components/services/install/nautilus-view/Nautilus_View_install.oaf.in.h:1
-msgid "Nautilus Service Install View Factory"
-msgstr ""
+#. this stuff flies by so fast, it's probably enough to just say "info"
+#: components/services/install-view/callbacks.c:64
+#, fuzzy
+msgid "Getting package information ..."
+msgstr "Pobieranie listy pakietów ze zdalnego serwera ...\n"
 
-#: components/services/install/nautilus-view/Nautilus_View_install.oaf.in.h:1
-msgid "Service Install View Component"
-msgstr ""
+#: components/services/install-view/callbacks.c:82
+#, fuzzy, c-format
+msgid "Checking \"%s\" for conflicts..."
+msgstr "Sprawdzanie lokalnego pliku %s..."
 
-#: components/services/install/nautilus-view/Nautilus_View_install.oaf.in.h:1
-msgid "Service Install View Component's Factory"
-msgstr ""
+#: components/services/install-view/callbacks.c:185
+#, fuzzy, c-format
+msgid "Downloading 1 package (%s)"
+msgstr "Pobieranie pakietu"
 
-#. Setup the title
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-msgid "Easy Install"
-msgstr ""
+#: components/services/install-view/callbacks.c:187
+#, fuzzy, c-format
+msgid "Downloading %d packages (%s)"
+msgstr "Pobieranie pakietu"
 
-#. Setup the progress header
-#. FIXME: the middle header is all fubar now, so we just say "messages", but the spec
-#. * shows "progress" over the 2nd column of the message box.  it's just too hard to get
-#. * it aligned currently.
-#.
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-msgid "Messages"
-msgstr "Komunikaty"
+#: components/services/install-view/callbacks.c:236
+#, c-format
+msgid "Downloading \"%s\""
+msgstr "Pobieranie \"%s\""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:242
 #, c-format
 msgid "0K of %dK"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:249
 #, c-format
 msgid ""
-"The package \"%s\" needs \"%s\" to run.\n"
-"I'm now attempting to download it."
+"The package \"%s\" requires \"%s\" to run.\n"
+"Downloading \"%s\" now."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-#, c-format
-msgid "I'm attempting to download package \"%s\"."
-msgstr ""
+#: components/services/install-view/callbacks.c:252
+#, fuzzy, c-format
+msgid "Attempting to download package \"%s\"."
+msgstr "Przygotowanie do instalacji %d pakietów"
 
-#. done!
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:262
+#: components/services/install-view/callbacks.c:333
 msgid "Complete"
 msgstr "Gotowe"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:266
 #, c-format
 msgid ""
-"The package \"%s\" needs \"%s\" to run.\n"
-"I've downloaded it successfully."
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" has been successfully downloaded."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:269
 #, c-format
-msgid "I've successfully downloaded package \"%s\"."
+msgid "The package \"%s\" has been successfully downloaded."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:287
 #, c-format
 msgid "%dK of %dK"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-msgid ""
-"I'm about to install the following packages:\n"
-"\n"
-msgstr ""
-"Zostan± zainstalowane pakietu:\n"
-"\n"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-msgid ""
-"\n"
-"Is this okay?"
-msgstr ""
-"\n"
-"Zgadzasz siê?"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-msgid "Preparing to install 1 package"
-msgstr "Przeygotowanie do instalacji jednego pakietu"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-#, c-format
-msgid "Preparing to install %d packages"
-msgstr "Przygotowanie do instalacji %d pakietów"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:316
 #, c-format
 msgid "Download of package \"%s\" failed!"
 msgstr "Pobranie pakietu \"%s\" nie powiod³o siê!"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:338
 #, c-format
 msgid ""
-"The package \"%s\" needed \"%s\" to run.\n"
-"I've downloaded and installed it."
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" has been successfully downloaded and installed."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:341
 #, c-format
-msgid "I've downloaded and installed package \"%s\"."
-msgstr "Zosta³ pobrany i zainstalowany pakiet \"%s\"."
+msgid "\"%s\" has been successfully downloaded and installed."
+msgstr ""
 
 #. starting a new package -- create new progress indicator
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:369
 #, c-format
 msgid "Installing package %d of %d"
 msgstr "Instalowanie pakietu %d z %d"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:396
 #, c-format
 msgid ""
-"The package \"%s\" needs \"%s\" to run.\n"
-"I'm now installing it."
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" is now being installed."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-#, c-format
-msgid "I'm installing package \"%s\"."
+#: components/services/install-view/callbacks.c:399
+#, fuzzy, c-format
+msgid "Now installing package \"%s\"."
 msgstr "Instalowanie pakietu \"%s\" ..."
 
-#. this package is a main one.  update package info display, now that we know it
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:407
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "Instalowanie \"%s\""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-#, c-format
-msgid "Version: %s"
-msgstr "Wersja: %s"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:415
+#: src/nautilus-zoom-control.c:592
 msgid "%d%%"
 msgstr "%d%%"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-#, c-format
-msgid " · %s is in the KDE menu.\n"
-msgstr ""
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-#, c-format
-msgid " · %s is in the Gnome menu under %s.\n"
-msgstr ""
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:443
 #, c-format
-msgid " · %s is in the Gnome menu.\n"
-msgstr ""
+msgid "Installation failed on %s"
+msgstr "Instalacja nie powiod³a siê przy %s"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:471
 msgid "I ran into problems while installing."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:472
 msgid "I'd like to try the following :"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:481
 msgid "Is this ok ?"
 msgstr "Zgadzasz siê?"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-msgid "Installation aborted."
-msgstr "Instalacja zosta³a przerwana."
+#: components/services/install-view/callbacks.c:556
+#, fuzzy
+msgid "Installation cancelled."
+msgstr "Instalacja nie powiod³a siê!"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:558
 msgid "This package has already been installed."
 msgstr "Pakiet zosta³ ju¿ zainstalowany."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-msgid "Installation complete!"
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
+#, fuzzy
+msgid "Installation complete."
 msgstr "Instalacja zosta³a zakoñczona!"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-msgid "Installation failed!"
+#: components/services/install-view/callbacks.c:564
+#, fuzzy
+msgid "Installation failed."
 msgstr "Instalacja nie powiod³a siê!"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-#, c-format
-msgid ""
-"%s\n"
-"%s\n"
-"Erase the leftover RPM files?"
+#. some succeeded; some failed
+#: components/services/install-view/callbacks.c:568
+msgid "Some packages installed successfully:"
 msgstr ""
-"%s\n"
-"%s\n"
-"Czy usun±æ pozosta³e pliki RPM?"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-#, c-format
+#: components/services/install-view/callbacks.c:577
+#, fuzzy
 msgid ""
-"%s\n"
-"Erase the RPM files?"
+"\n"
+"Some packages failed:"
+msgstr "Okre¶la plik z pakietem"
+
+#: components/services/install-view/callbacks.c:626
+#, fuzzy
+msgid "Erase the RPM files?"
 msgstr ""
 "%s\n"
 "Czy usun±æ pliki RPM?"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-#, c-format
-msgid ""
-"%s\n"
-"Erase the leftover RPM files?"
+#: components/services/install-view/callbacks.c:628
+#, fuzzy
+msgid "Erase the leftover RPM files?"
 msgstr ""
 "%s\n"
 "Czy usun±æ pozosta³e pliki RPM?"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/callbacks.c:658
+msgid "Ok"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:673
 msgid ""
 "A core package of Nautilus has been\n"
 "updated.  You should restart Nautilus.\n"
@@ -2386,1048 +2986,1604 @@ msgstr ""
 "\n"
 "Czy chcesz to zrobiæ teraz?"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#. Setup the title
+#: components/services/install-view/forms.c:201
+msgid "Easy Install"
+msgstr ""
+
+#. Setup the progress header
+#. FIXME: the middle header is all fubar now, so we just say "messages", but the spec
+#. * shows "progress" over the 2nd column of the message box.  it's just too hard to get
+#. * it aligned currently.
+#.
+#: components/services/install-view/forms.c:327
+msgid "Messages"
+msgstr "Komunikaty"
+
+#: components/services/install-view/forms.c:358
+#: components/services/summary/nautilus-summary-view.c:647
 #, c-format
-msgid "Installation failed on %s"
-msgstr "Instalacja nie powiod³a siê przy %s"
+msgid "Version: %s"
+msgstr "Wersja: %s"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-msgid "Downloading remote package"
-msgstr "Pobieranie zdalnego pakietu"
+#: components/services/install-view/forms.c:407
+#, fuzzy
+msgid "These packages are ready to be downloaded and installed:"
+msgstr "Pakiet zosta³ ju¿ zainstalowany."
+
+#: components/services/install-view/forms.c:408
+#, fuzzy
+msgid "If you wish to download and install these packages, click Continue."
+msgstr "Zosta³ pobrany i zainstalowany pakiet \"%s\"."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/forms.c:411
+#, fuzzy
+msgid "These packages are ready to be uninstalled:"
+msgstr "Pakiet zosta³ ju¿ zainstalowany."
+
+#: components/services/install-view/forms.c:412
+msgid "If you wish to uninstall these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:415
+#, fuzzy
+msgid "These packages are ready to be reverted:"
+msgstr "Pakiet zosta³ ju¿ zainstalowany."
+
+#: components/services/install-view/forms.c:416
+msgid "If you wish to revert these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:464
 #, c-format
-msgid "Downloading \"%s\""
-msgstr "Pobieranie \"%s\""
+msgid "for a total of %ld MB."
+msgstr ""
+
+#: components/services/install-view/forms.c:466
+#, c-format
+msgid "for a total of %ld KB."
+msgstr ""
+
+#. buttons
+#: components/services/install-view/forms.c:478
+#, fuzzy
+msgid "Continue"
+msgstr "Zawarto¶æ"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-msgid "Downloading some package"
+#: components/services/install-view/forms.c:482
+#: libnautilus-extensions/nautilus-drag.c:493
+#: src/file-manager/fm-directory-view.c:4326
+#, fuzzy
+msgid "Cancel"
+msgstr "Dance"
+
+#: components/services/install-view/nautilus-service-install-view.c:421
+#, c-format
+msgid "%s is in GNOME (footprint) > %s"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:439
+#, c-format
+msgid "%s is in the GNOME (footprint) menu.\n"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:454
+#, c-format
+msgid "%s is in the KDE menu.\n"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:655
+#, fuzzy
+msgid "Installation Complete"
+msgstr "Instalacja zosta³a zakoñczona!"
+
+#: components/services/install-view/nautilus-service-install-view.c:710
+#, c-format
+msgid ""
+"%sTo start %s, click the Launch button below, or to create a shortcut, drag "
+"the icon on the right to the GNOME panel or your desktop."
+msgstr ""
+
+#. couldn't find an icon
+#: components/services/install-view/nautilus-service-install-view.c:718
+#, c-format
+msgid "%sTo start %s, click the Launch button below."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:773
+msgid "Incorrect password."
+msgstr "Niepoprawne has³o"
+
+#: components/services/install-view/nautilus-service-install-view.c:778
+msgid "Authenticate as root"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:895
+#, fuzzy
+msgid "Installing packages"
+msgstr "Instalowanie pakietu \"%s\" ..."
+
+#: components/services/install-view/nautilus-service-install-view.c:897
+#, fuzzy
+msgid "Installing remote package"
+msgstr "Pobieranie zdalnego pakietu"
+
+#: components/services/install-view/nautilus-service-install-view.c:901
+#, fuzzy
+msgid "Installing some package"
 msgstr "Pobieranie pakietu"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
-msgid "Contacting install server ..."
-msgstr "Nawi±zywanie po³±czenia z serwerem instalacji ..."
+#: components/services/install-view/nautilus-service-install-view.c:967
+#, fuzzy
+msgid "Contacting the Eazel Software Catalog ..."
+msgstr "Przejd¼ do katalogu oprogramowania Eazela"
+
+#: components/services/install-view/nautilus-service-install-view.c:1025
+msgid "Checking for authorization..."
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/nautilus-service-install-view.c:1097
+msgid "Aborting package downloads (please wait) ..."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "Pobieranie pliku zosta³o przerwane."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "Przerwane"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:1
+#: components/services/install/server/Trilobite_Service_install.oaf.in.h:2
+#: components/services/summary/nautilus-summary-view.c:123
+msgid "Install"
+msgstr "Zainstaluj"
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:2
+#, fuzzy
+msgid "Install Viewer"
+msgstr "Instalacja nie powiod³a siê"
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:3
+msgid "Nautilus Service Install View"
+msgstr ""
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:4
+msgid "Nautilus Service Install View Factory"
+msgstr ""
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:5
+msgid "Service Install View Component"
+msgstr ""
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:6
+msgid "Service Install View Component's Factory"
+msgstr ""
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:7
+#, fuzzy
+msgid "View as Install"
+msgstr "Wy¶wietlanie jako %s"
+
 #: components/services/install/server/Trilobite_Service_install.oaf.in.h:1
 msgid "Factory for the install service"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:1
-msgid "Change Password"
-msgstr "Zmiana has³a"
+#: components/services/inventory/eazel-inventory-client.c:70
+msgid "Enable inventory upload."
+msgstr ""
 
-#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:1
-msgid "Eazel Change Password View"
-msgstr "Widok zmiany has³a Eazela"
+#: components/services/inventory/eazel-inventory-client.c:72
+msgid "Disable inventory upload."
+msgstr ""
 
-#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:1
-msgid "Eazel Change Password view component"
+#: components/services/inventory/eazel-inventory-client.c:73
+msgid "Display information about current inventory settings."
 msgstr ""
 
-#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:1
-msgid "Nautilus Service Login View Factory"
+#: components/services/inventory/eazel-inventory-client.c:74
+msgid "Upload inventory now, if not up to date."
 msgstr ""
 
-#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:1
-msgid "Service Login View Component's Factory"
+#: components/services/inventory/Trilobite_Service_inventory.oaf.in.h:1
+msgid "Factory for the inventory service"
+msgstr ""
+
+#: components/services/inventory/Trilobite_Service_inventory.oaf.in.h:2
+msgid "Inventory"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus Inventory view"
+msgstr "Przyk³adowy widok Nautilusa"
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Inventory view factory"
+msgstr "Przegl±darka obrazów Nautilusa"
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:3
+msgid "Nautilus System Inventory component's component's factory"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:4
+msgid "System Inventory"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:5
+msgid "System Inventory Viewer"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:6
+msgid "System inventory view component"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:7
+msgid "View as System Inventory"
 msgstr ""
 
 #. Setup the title
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:1
-msgid "Change your Eazel password..."
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:153
+#, fuzzy
+msgid "Please Change Your Eazel Password"
 msgstr "Zmiana has³a dla us³ug Eazela..."
 
-#. username
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:1
-msgid "User Name: "
+#. add password boxes
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:174
+#, fuzzy
+msgid "User Name:"
 msgstr "Nazwa u¿ytkownika: "
 
-#. old password
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:1
-msgid "Current password: "
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:181
+#, fuzzy
+msgid "Current Password:"
 msgstr "Bie¿±ce has³o: "
 
-#. new password
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:1
-msgid "New password: "
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:188
+#, fuzzy
+msgid "New Password:"
 msgstr "nowe has³o: "
 
-#. repeat password
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:1
-msgid "New password (again): "
-msgstr "Nowe has³o (ponownie): "
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:195
+#, fuzzy
+msgid "Confirm New Password:"
+msgstr "nowe has³o: "
 
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:1
-msgid " Change my password! "
+#. allocate the command buttons - first the change_password button
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:227
+#, fuzzy
+msgid "Change my password"
 msgstr " Zmieñ moje has³o! "
 
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:1
-msgid "  I need some help!  "
-msgstr "  Potrzebujê pomocy!  "
+#. now allocate the account maintenance button
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:234
+msgid "I need assistance"
+msgstr ""
 
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:1
-msgid "Password changed!"
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:297
+#, fuzzy
+msgid "Your password has been changed!"
 msgstr "Has³o uleg³o zmianie!"
 
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:1
-msgid "The new password fields don't match.  Please try again."
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:328
+msgid ""
+"I'm sorry, but that password\n"
+"is incorrect.  Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:332
+msgid ""
+"I'm sorry, but your new password\n"
+"must be at least six (6) characters long.\n"
+"Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:337
+msgid ""
+"I'm sorry, but your new password\n"
+"can't be ridiculously long.\n"
+"Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:346
+msgid ""
+"I'm sorry, but your new password must\n"
+"contain letters along with at least one\n"
+"number or symbol. Please try another one."
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:1
-msgid "Could not find a valid boolean value for grey_out!"
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:350
+msgid ""
+"I'm sorry, but I hit an unexpected\n"
+"error. Please try again, with\n"
+"different passwords."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:434
+msgid ""
+"I'm sorry, but I got an unexpected\n"
+"error.  Please try again."
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:1
-msgid "There is no service data !\n"
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:467
+msgid ""
+"I'm sorry, but your new password\n"
+"wasn't typed the same way twice.\n"
+"Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:1
+msgid "Change Password"
+msgstr "Zmiana has³a"
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:2
+#, fuzzy
+msgid "Change Password Viewer"
+msgstr "Widok zmiany has³a Eazela"
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:3
+msgid "Eazel Change Password View"
+msgstr "Widok zmiany has³a Eazela"
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:4
+msgid "Eazel Change Password view component"
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:1
-#: components/services/summary/lib/eazel-summary-shared.c:1
-msgid "There is no eazel news data !\n"
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:5
+msgid "Nautilus Service Login View Factory"
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:1
-msgid "Could not fetch summary configuration !"
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:6
+msgid "Service Login View Component's Factory"
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:1
-msgid "The summary configuration contains no data!\n"
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:7
+#, fuzzy
+msgid "View as Change Password"
+msgstr "Zmiana has³a"
+
+#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:295
+#, fuzzy
+msgid "Unknown Date"
+msgstr "nieznany typ"
+
+#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:300
+msgid "%A, %B %d"
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:1
-msgid "Cannot find the SUMMARY_DATA xmlnode!\n"
+#: components/services/summary/nautilus-summary-callbacks.c:97
+msgid ""
+"Sorry, network problems are preventing you from connecting to Eazel Services."
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:1
-msgid "Bailing from the SUMMARY_DATA parse!\n"
+#. FIXME we really should use the services alert icon here, eh?
+#: components/services/summary/nautilus-summary-callbacks.c:102
+msgid ""
+"Your Eazel Services account has not yet been activated.  You can't log into "
+"Eazel Services until you activate your account.\n"
+"\n"
+"Please check your email for activation instructions."
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:1
-msgid "Could not find any summary configuration data!\n"
+#. FIXME we really should use the services alert icon here, eh?
+#: components/services/summary/nautilus-summary-callbacks.c:109
+msgid ""
+"Your Eazel Service User Account has been temporarily disabled.\n"
+"\n"
+"Please try again in a few minutes, or contact Eazel support if this problem "
+"continues."
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:1
-msgid "Bailing from summary configuration parse!\n"
+#: components/services/summary/nautilus-summary-callbacks.c:131
+msgid "We're sorry, but your name and password are still not recognized."
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:1
+#: components/services/summary/nautilus-summary-dialogs.c:69
 msgid "Eazel Service Login Error"
 msgstr "B³±d przy logowaniu do us³ug Eazela"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:1
+#: components/services/summary/nautilus-summary-dialogs.c:80
 msgid "Service Error"
 msgstr "B³±d us³ug"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:1
+#: components/services/summary/nautilus-summary-dialogs.c:104
 msgid "Register Now"
 msgstr "Zarejestruj siê teraz"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:1
+#: components/services/summary/nautilus-summary-dialogs.c:115
 msgid "Services Login"
 msgstr "Logowanie do us³ug"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:1
+#: components/services/summary/nautilus-summary-dialogs.c:131
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "Nazwa u¿ytkownika:"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:1
+#: components/services/summary/nautilus-summary-dialogs.c:138
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "Has³o:"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:1
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:1
-msgid "Please log in to Eazel services"
+#: components/services/summary/nautilus-summary-dialogs.c:146
+#: components/services/summary/nautilus-summary-dialogs.c:155
+#, fuzzy
+msgid "Please log in to Eazel Services"
 msgstr "Zaloguj sie do us³ug Eazela"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:1
+#: components/services/summary/nautilus-summary-dialogs.c:150
 msgid "Your user name or password were not correct.  Please try again."
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:1
-msgid "Configure your service preferences"
-msgstr ""
-
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:1
-msgid "Go to the Eazel Services Registration Form"
-msgstr "Przechodzi do formularza rejestracyjnego us³ug Eazela"
-
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:1
-msgid "Log out from Eazel Services"
-msgstr "Wyloguj siê z us³ug Eazela"
+#: components/services/summary/nautilus-summary-view.c:117
+#: libnautilus-extensions/nautilus-program-chooser.c:1361
+msgid "Go There"
+msgstr "Przejd¼ tam"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:1
-msgid "Service _Preferences"
-msgstr "Preferencje _us³ugi"
+#: components/services/summary/nautilus-summary-view.c:120
+#, fuzzy
+msgid "More Info"
+msgstr "Pliki Info"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:1
-msgid "Show the log-in dialog box"
-msgstr ""
+#: components/services/summary/nautilus-summary-view.c:131
+msgid "Account Preferences"
+msgstr "Preferencje konta"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:1
-msgid "_Log in to Eazel Services"
-msgstr "_Zaloguj sie do us³ug Eazela"
+#: components/services/summary/nautilus-summary-view.c:132
+msgid "Logout"
+msgstr "Wyloguj"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:1
-msgid "_Log out from Eazel Services"
-msgstr "_Wyloguj siê z us³ug Eazela"
+#: components/services/summary/nautilus-summary-view.c:133
+#: components/services/summary/nautilus-summary-view.c:141
+msgid "Terms of Use"
+msgstr "Warunki u¿ycia"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:1
-msgid "_Register for Eazel Services"
-msgstr "Za_rejestruj siê w us³ugach Eazela"
+#: components/services/summary/nautilus-summary-view.c:134
+#: components/services/summary/nautilus-summary-view.c:142
+msgid "Privacy Statement"
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1
+#: components/services/summary/nautilus-summary-view.c:139
 msgid "Register"
 msgstr "Zarejestruj"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1
+#: components/services/summary/nautilus-summary-view.c:140
 msgid "Login"
 msgstr "Zaloguj"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1
-msgid "Terms of Use"
-msgstr "Warunki u¿ycia"
+#: components/services/summary/nautilus-summary-view.c:170
+#, fuzzy, c-format
+msgid "Eazel Services - Welcome, %s!"
+msgstr "Us³ugi Eazela"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1
-msgid "Privacy Statement"
+#: components/services/summary/nautilus-summary-view.c:175
+msgid "Eazel Services - You are not logged in"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1
-msgid "Account Preferences"
-msgstr "Preferencje konta"
-
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1
-msgid "Logout"
-msgstr "Wyloguj"
+#: components/services/summary/nautilus-summary-view.c:182
+#, fuzzy
+msgid "Connecting to Eazel Services..."
+msgstr "_Zaloguj sie do us³ug Eazela"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1
-#, c-format
-msgid "Welcome Back %s!"
-msgstr "Witaj ponownie %s!"
+#: components/services/summary/nautilus-summary-view.c:741
+#: data/linksets/home.xml.h:3 src/nautilus-service-ui.xml.h:4
+msgid "Services"
+msgstr "Us³ugi"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1
-msgid "You are not logged in!"
+#: components/services/summary/nautilus-summary-view.c:752
+msgid "Featured Downloads"
 msgstr ""
 
-#. add the tab
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1
-msgid "Your Services"
-msgstr "Twoje us³ugi"
-
-#. create the Additional Services pane
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1
-msgid "Additional Services"
-msgstr "Dodatkowe us³ugi"
-
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1
+#: components/services/summary/nautilus-summary-view.c:884
+#, fuzzy
 msgid ""
-"\n"
-"Check back here for new system management\n"
-"services that will help make Linux easier to use."
+"Unable to get services data from Eazel's server. The server might be "
+"unavailable right now, or your computer might be configured incorrectly. "
+"Please contact support@eazel.com."
 msgstr ""
+"Nie mo¿na nawi±zaæ po³±czenie z serwerem Eazela. Mo¿e on byæ aktualnie "
+"niedostêpny lub Twór komputer jest nieprawid³owo skonfigurowany. Mo¿esz "
+"spróbowaæ ponownie pó¼niej."
 
-#. add the tab
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1
-msgid "Current Updates"
-msgstr "Bie¿±ce uaktualnienia"
+#: components/services/summary/nautilus-summary-view.c:894
+#, fuzzy
+msgid ""
+"Found a problem with services data on Eazel servers. Please contact "
+"support@eazel.com."
+msgstr ""
+"Wyst±pi³ problem z danymi na serwerach Eazela. Skontaktuj siê z "
+"support@eazel.com (w jêzyku angielskim)."
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1
-#, c-format
-msgid "Version %s"
-msgstr "Wersja %s"
+#: components/services/summary/nautilus-summary-view.c:917
+#, fuzzy
+msgid ""
+"Information is missing from the redirect data on Eazel servers. Please "
+"contact support@eazel.com."
+msgstr ""
+"Wyst±pi³ problem z danymi na serwerach Eazela. Skontaktuj siê z "
+"support@eazel.com (w jêzyku angielskim)."
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1
+#: components/services/summary/nautilus-summary-view.c:959
+#, fuzzy
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
-"now, or your computer might be configured incorrectly.You could try again "
+"now, or your computer might be configured incorrectly. You could try again "
 "later."
 msgstr ""
 "Nie mo¿na nawi±zaæ po³±czenie z serwerem Eazela. Mo¿e on byæ aktualnie "
 "niedostêpny lub Twór komputer jest nieprawid³owo skonfigurowany. Mo¿esz "
 "spróbowaæ ponownie pó¼niej."
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1
+#: components/services/summary/nautilus-summary-view.c:969
+#, fuzzy
 msgid ""
-"Found problem with data on Eazel servers. Please contact support@eazel.com."
+"Found a problem with redirect data on Eazel servers. Please contact "
+"support@eazel.com."
 msgstr ""
 "Wyst±pi³ problem z danymi na serwerach Eazela. Skontaktuj siê z "
 "support@eazel.com (w jêzyku angielskim)."
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:1
+#: components/services/summary/nautilus-summary-view.c:986
+msgid "Failed to upload system inventory."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:1049
+#: src/nautilus-first-time-druid.c:258
+msgid "Eazel Services"
+msgstr "Us³ugi Eazela"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:1
+msgid "Configure your service preferences"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:2
+msgid "Go to the Eazel Services Registration Form"
+msgstr "Przechodzi do formularza rejestracyjnego us³ug Eazela"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:3
+msgid "Log out from Eazel Services"
+msgstr "Wyloguj siê z us³ug Eazela"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:4
+msgid "Service _Preferences"
+msgstr "Preferencje _us³ugi"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:5
+msgid "Show the log-in dialog box"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:6
+msgid "_Log in to Eazel Services"
+msgstr "_Zaloguj sie do us³ug Eazela"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:7
+msgid "_Log out from Eazel Services"
+msgstr "_Wyloguj siê z us³ug Eazela"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:8
+msgid "_Register for Eazel Services"
+msgstr "Za_rejestruj siê w us³ugach Eazela"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus Service Summary View Factory"
+msgstr "Wybór motywu Nautilusa"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Summary View"
+msgstr "Przegl±darka obrazów Nautilusa"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:3
+msgid "Service Summary View Component's Factory"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:4
+msgid "Service Summary view component"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:5
+msgid "Summary"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:6
+#, fuzzy
+msgid "Summary Viewer"
+msgstr "Zapis liczbowy:"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:7
+#, fuzzy
+msgid "View as Summary"
+msgstr "Wy¶wietlanie jako inne"
+
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
+#, fuzzy, c-format
+msgid "HTTP error %d \"%s\" on uri %s"
+msgstr "B³±d HTTP: %d %s"
+
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 msgid "Could not initialize Bonobo"
 msgstr "Nie mo¿na zainicjowaæ Bonobo"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:1
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr ""
 "Nie mo¿na zapisaæ do pliku dziennika %s -- wykorzystanie domy¶lnej obs³ugi "
 "dziennika"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:1
 msgid "Nautilus eazel sample service view component"
 msgstr ""
 
-#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:1
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:2
 msgid "Nautilus services startup view factory"
 msgstr ""
 
-#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:1
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:3
 msgid "Service"
 msgstr "Us³uga"
 
-#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:1
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:4
+#, fuzzy
+msgid "Service Viewer"
+msgstr "Us³uga"
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:5
 msgid "Services startup view factory"
 msgstr ""
 
-#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:1
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:6
+#, fuzzy
+msgid "View as Service"
+msgstr "Wy¶wietlanie jako inne"
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:7
 msgid "eazel sample service view"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in.h:1
 msgid "Factory for the sample service"
 msgstr ""
 
-#: components/services/vault/command-line/main.c:1
-msgid "Enable debugging"
-msgstr "Aktywuje ¶ledzenie przebiegu"
+#: components/text/nautilus-text-view.c:334
+#, c-format
+msgid "Sorry, but %s is too large for Nautilus to load all of it."
+msgstr ""
 
-#: components/services/vault/command-line/main.c:1
-msgid "Vault location"
+#: components/text/nautilus-text-view.c:337
+msgid "File too large"
 msgstr ""
 
-#: components/services/vault/command-line/main.c:1
-msgid "Valid operations:"
-msgstr "Poprawne operacje:"
+#: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "Czcionki"
 
-#: components/services/vault/command-line/main.c:1
-msgid "Error: No operation supplied\n"
-msgstr "B³±d: Nie podano operacji\n"
+#: components/text/nautilus-text-view-ui.xml.h:2
+msgid "Lucida"
+msgstr ""
 
-#: components/services/vault/command-line/main.c:1
-#, c-format
-msgid "Error: Invalid operation supplied (%s)\n"
-msgstr "B³±d: Podano niepoprawn± operacjê (%s)\n"
+#: components/text/nautilus-text-view-ui.xml.h:3
+msgid "Use the Courier Font"
+msgstr ""
 
-#: components/services/vault/command-line/main.c:1
-#, c-format
-msgid ""
-"Error: Invalid syntax\n"
-"Syntax: %s\n"
+#: components/text/nautilus-text-view-ui.xml.h:4
+msgid "Use the Fixed Font"
 msgstr ""
-"B³±d: Niepoprawna sk³adnia\n"
-"Sk³adnia: %s\n"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
+#: components/text/nautilus-text-view-ui.xml.h:5
+msgid "Use the GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:6
+msgid "Use the Helvetica Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:7
+msgid "Use the Lucida Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:8
+msgid "Use the Times Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:9
+msgid "_Courier"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "_Plik"
+
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
+msgid "_Helvetica"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:13
+#, fuzzy
+msgid "_Times"
+msgstr "Czas"
+
 #: components/text/Nautilus_View_text.oaf.in.h:1
 msgid "Factory for text view"
 msgstr ""
 
-#: components/text/Nautilus_View_text.oaf.in.h:1
+#: components/text/Nautilus_View_text.oaf.in.h:2
 msgid "Text"
 msgstr "Tekst"
 
-#: components/text/Nautilus_View_text.oaf.in.h:1
+#: components/text/Nautilus_View_text.oaf.in.h:3
+#, fuzzy
+msgid "Text Viewer"
+msgstr "Zapis tekstowy:"
+
+#: components/text/Nautilus_View_text.oaf.in.h:4
 msgid "Text view"
 msgstr "Widok tekstowy"
 
-#: components/text/Nautilus_View_text.oaf.in.h:1
+#: components/text/Nautilus_View_text.oaf.in.h:5
 msgid "Text view factory"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: components/tree/Nautilus_View_tree.oaf.in.h:1
-msgid "Nautilus Tree sidebar panel"
-msgstr ""
+#: components/text/Nautilus_View_text.oaf.in.h:6
+#, fuzzy
+msgid "View as Text"
+msgstr "Wy¶wietlanie jako %s"
 
-#: components/tree/Nautilus_View_tree.oaf.in.h:1
-msgid "Nautilus Tree view"
+#: components/text/services/google.xml.h:1
+msgid "Search Google for Selected Text"
 msgstr ""
 
-#: components/tree/Nautilus_View_tree.oaf.in.h:1
-msgid "Tree"
-msgstr "Drzewo"
+#: components/text/services/google.xml.h:2
+msgid "Use Google to search the web for the selected text"
+msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: data/browser.xml.h:1
-msgid "50s"
+#: components/text/services/webster.xml.h:1
+msgid "Look Up Selected Text in Dictionary"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Apparition"
+#: components/text/services/webster.xml.h:2
+#, fuzzy
+msgid "Look up the selected text in the Merriam-Webster dictionary"
+msgstr "Kopiuje zaznaczony tekst do schowka"
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:1
+msgid "animation to indicate on-going activity"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Azul"
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:2
+#, fuzzy
+msgid "throbber"
+msgstr "Inne"
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:3
+msgid "throbber factory"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Beige Tile"
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:4
+msgid "throbber object factory"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Black"
+#: components/tree/Nautilus_View_tree.oaf.in.h:1
+msgid "Nautilus Tree sidebar panel"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Blue Gray Rough"
+#: components/tree/Nautilus_View_tree.oaf.in.h:2
+msgid "Nautilus Tree view"
 msgstr ""
 
+#: components/tree/Nautilus_View_tree.oaf.in.h:3
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
+msgid "Tree"
+msgstr "Drzewo"
+
 #: data/browser.xml.h:1
-msgid "Blue Sky"
+msgid "Apparition"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Bricks"
+#: data/browser.xml.h:2
+msgid "Azul"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Brown Bag"
+#: data/browser.xml.h:3
+msgid "Black"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Bubble Gum"
+#: data/browser.xml.h:4
+msgid "Blue Ridge"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Bubbles"
+#: data/browser.xml.h:5
+msgid "Blue Rough"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Buffed Wood"
+#: data/browser.xml.h:6
+#, fuzzy
+msgid "Blue Type"
+msgstr "wed³ug typu"
+
+#: data/browser.xml.h:7
+#, fuzzy
+msgid "Brushed Metal"
+msgstr "Thrash Metal"
+
+#: data/browser.xml.h:8
+msgid "Bubble Gum"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:9
 msgid "Burlap"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:10
 msgid "Camouflage"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:11
 msgid "Certified"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:12
 msgid "Chalk"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:13
 msgid "Charcoal"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Clouds"
-msgstr "Chmury"
-
-#: data/browser.xml.h:1
+#: data/browser.xml.h:14
 msgid "Colors"
 msgstr "Kolory"
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:15
 msgid "Concrete"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:16
 msgid "Cool"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:17
 msgid "Cork"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:18
+#, fuzzy
+msgid "Countertop"
+msgstr "Country"
+
+#: data/browser.xml.h:19
 msgid "Danger"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:20
 msgid "Danube"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:21
 msgid "Dark Cork"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:22
 msgid "Dark GNOME"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:23
 msgid "Deep Teal"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:24
 msgid "Distinguished"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:25
+#, fuzzy
+msgid "Dots"
+msgstr "Czcionki"
+
+#: data/browser.xml.h:26
 msgid "Draft"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:27
 msgid "Drag a color to an object to change it to that color"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:28
 msgid "Drag a pattern tile to an object to change it"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:29
 msgid "Drag an emblem to an object to add it to the object"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:30
 msgid "Eclipse"
 msgstr ""
 
-#: data/browser.xml.h:1 src/file-manager/fm-properties-window.c:1
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "Symbole"
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:32
 msgid "Envy"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:33
 msgid "Erase"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:34
 msgid "Favorite"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:35
+msgid "Fibers"
+msgstr ""
+
+#: data/browser.xml.h:36
 msgid "Fire Engine"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:37
 msgid "Fleur De Lis"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Frost"
-msgstr ""
+#: data/browser.xml.h:38
+#, fuzzy
+msgid "Floral"
+msgstr "Portale"
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:39
+#, fuzzy
+msgid "Fossil"
+msgstr "Folk"
+
+#: data/browser.xml.h:40 icons/gnome/gnome.xml.h:1
 msgid "GNOME"
 msgstr "GNOME"
 
-#: data/browser.xml.h:1
-msgid "Gold"
-msgstr ""
-
-#: data/browser.xml.h:1
+#: data/browser.xml.h:41
 msgid "Granite"
 msgstr "Granit"
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:42
 msgid "Grapefruit"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:43
+msgid "Green Weave"
+msgstr ""
+
+#: data/browser.xml.h:44
 msgid "Ice"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:45
 msgid "Important"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:46
 msgid "Indigo"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Irish Spring"
-msgstr ""
-
-#: data/browser.xml.h:1
+#: data/browser.xml.h:47
 msgid "Leaf"
 msgstr "Li¶æ"
 
-#: data/browser.xml.h:1
-msgid "Leaves"
-msgstr "Li¶cie"
-
-#: data/browser.xml.h:1
+#: data/browser.xml.h:48
 msgid "Lemon"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:49
 msgid "Mango"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:50
 msgid "Manila Paper"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:51
+msgid "Moss Ridge"
+msgstr ""
+
+#: data/browser.xml.h:52
 msgid "Mud"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:53
 msgid "New"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:54
 msgid "Numbers"
 msgstr ""
 
-#: data/browser.xml.h:1 libnautilus-extensions/nautilus-file-operations.c:1
+#: data/browser.xml.h:55
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "OK"
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:56
+msgid "Ocean Strips"
+msgstr ""
+
+#: data/browser.xml.h:57
 msgid "Oh No"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:58
 msgid "Onyx"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:59
 msgid "Orange"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:60
 msgid "Pale Blue"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Pale Blue Stripe"
-msgstr ""
-
-#: data/browser.xml.h:1
-msgid "Pale Blue Wavy"
-msgstr ""
-
-#: data/browser.xml.h:1
-msgid "Pale Coins"
-msgstr ""
-
-#: data/browser.xml.h:1
+#: data/browser.xml.h:61
 msgid "Patterns"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:62
 msgid "Personal"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Pink Fabric"
-msgstr ""
-
-#: data/browser.xml.h:1
-msgid "Puzzle"
-msgstr ""
+#: data/browser.xml.h:63
+#, fuzzy
+msgid "Purple Marble"
+msgstr "Bia³y marmur"
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:64
 msgid "Ridged Paper"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:65
 msgid "Rough Paper"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:66
 msgid "Ruby"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Satin"
-msgstr ""
-
-#: data/browser.xml.h:1
+#: data/browser.xml.h:67
 msgid "Sea Foam"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Secret"
-msgstr ""
-
-#: data/browser.xml.h:1
+#: data/browser.xml.h:68
 msgid "Shale"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Shared"
-msgstr ""
-
-#: data/browser.xml.h:1
+#: data/browser.xml.h:69
 msgid "Silver"
 msgstr "Srebro"
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:70
 msgid "Sky"
 msgstr "Niebo"
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:71
+msgid "Sky Ridge"
+msgstr ""
+
+#: data/browser.xml.h:72
+msgid "Snow Ridge"
+msgstr ""
+
+#: data/browser.xml.h:73
 msgid "Special"
 msgstr "Specjalne"
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:74
 msgid "Stucco"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:75
 msgid "Tangerine"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:76
+msgid "Terracotta"
+msgstr ""
+
+#: data/browser.xml.h:77
 msgid "Urgent"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:78
 msgid "Violet"
 msgstr "Filet"
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:79
 msgid "Wavy White"
 msgstr ""
 
-#: data/browser.xml.h:1
+#: data/browser.xml.h:80
 msgid "White"
 msgstr "Bia³y"
 
-#: data/browser.xml.h:1
-msgid "White Marble"
-msgstr "Bia³y marmur"
-
-#: data/browser.xml.h:1
-msgid "White Paper"
-msgstr "Bia³y papier"
-
-#: data/browser.xml.h:1
+#: data/browser.xml.h:81
 msgid "White Ribs"
 msgstr ""
 
-#: data/browser.xml.h:1
-msgid "Yellow Paper"
-msgstr "¯ó³ty papier"
-
-#: data/linksets/apps.xml.h:1
+#: data/linksets/apps.xml.h:2
 msgid "Gnumeric"
 msgstr "Gnumeric"
 
-#: data/linksets/apps.xml.h:1
+#: data/linksets/apps.xml.h:3
 msgid "Netscape"
 msgstr "Netscape"
 
-#: data/linksets/apps.xml.h:1
+#: data/linksets/apps.xml.h:4
 msgid "The Gimp"
 msgstr "GIMP"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:1
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "Biurko"
 
-#: data/linksets/desktop.xml.h:1 libnautilus-extensions/nautilus-file.c:1
-#: libnautilus-extensions/nautilus-trash-directory.c:1
-#: src/file-manager/fm-desktop-icon-view.c:1
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
+#: libnautilus-extensions/nautilus-trash-directory.c:301
+#: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
 msgstr "¦mietnik"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
+#: data/linksets/home.xml.h:1
+#, fuzzy
+msgid "Computer"
+msgstr "Gotowe"
+
+#: data/linksets/home.xml.h:2
+msgid "Home Directory"
+msgstr ""
+
 #: data/linksets/portals.xml.h:1
 msgid "Excite"
 msgstr "Excite"
 
-#: data/linksets/portals.xml.h:1
+#: data/linksets/portals.xml.h:2
 msgid "Portals"
 msgstr "Portale"
 
-#: data/linksets/portals.xml.h:1
+#: data/linksets/portals.xml.h:3
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: data/linksets/search_engines.xml.h:1
 msgid "Alta Vista"
 msgstr "Alta Vista"
 
-#: data/linksets/search_engines.xml.h:1
+#: data/linksets/search_engines.xml.h:2
 msgid "Google"
 msgstr "Google"
 
-#: data/linksets/search_engines.xml.h:1
+#: data/linksets/search_engines.xml.h:3
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "Mechanizmy wyszukiwawcze"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: data/static_bookmarks.xml.h:1
+msgid "Allaire"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:2
+msgid "Binary Freedom"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:3
+#, fuzzy
+msgid "Borland"
+msgstr "Ballada"
+
+#: data/static_bookmarks.xml.h:4
 msgid "CNET Computers.com"
 msgstr ""
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:5
 msgid "CNET Linux Center"
 msgstr ""
 
-#: data/static_bookmarks.xml.h:1
-msgid "Caldera"
-msgstr "Caldera"
-
-#: data/static_bookmarks.xml.h:1
-msgid "Collab.net"
+#: data/static_bookmarks.xml.h:6
+#, fuzzy
+msgid "CollabNet"
 msgstr "Collab.net"
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:7
 msgid "Compaq"
 msgstr "Compaq"
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:8
+#, fuzzy
+msgid "Conectiva"
+msgstr "Zawarto¶æ"
+
+#: data/static_bookmarks.xml.h:9
+#, fuzzy
+msgid "Covalent"
+msgstr "Zawarto¶æ"
+
+#: data/static_bookmarks.xml.h:10
 msgid "Debian.org"
 msgstr "Debian.org"
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:11
 msgid "Dell"
 msgstr "Dell"
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:12
 msgid "Eazel"
 msgstr "Eazel"
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:13
 msgid "Freshmeat.net"
 msgstr "Freshmeat.net"
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:14
 msgid "GNOME.org"
 msgstr "GNOME.org"
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:15
 msgid "GNU.org"
 msgstr "GNU.org"
 
-#: data/static_bookmarks.xml.h:1
-msgid "Helix Code"
-msgstr "Helix Code"
-
-#: data/static_bookmarks.xml.h:1
-msgid "Hewlett-Packard"
-msgstr "Hewlett-Packard"
-
-#: data/static_bookmarks.xml.h:1
-msgid "IBM"
-msgstr "IBM"
-
-#: data/static_bookmarks.xml.h:1
-msgid "Inprise"
-msgstr "Inprise"
-
-#: data/static_bookmarks.xml.h:1
-msgid "Linux Companies"
-msgstr "Firmy linuksowe"
+#: data/static_bookmarks.xml.h:17
+#, fuzzy
+msgid "International"
+msgstr "Instrumentalna"
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:18
 msgid "Linux Documentation Project"
 msgstr "Projekt Dokumentowania Linuksa (LDP)"
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:19
+#, fuzzy
+msgid "Linux One"
+msgstr "Linux Online"
+
+#: data/static_bookmarks.xml.h:20
 msgid "Linux Online"
 msgstr "Linux Online"
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:21
 msgid "Linux Resources"
 msgstr "Zasoby linuksowe"
 
-#: data/static_bookmarks.xml.h:1
-msgid "Linux at IBM"
-msgstr "Linux w IBM"
+#: data/static_bookmarks.xml.h:22
+msgid "Linux Weekly News"
+msgstr ""
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:23
 msgid "LinuxNewbie.org"
 msgstr "LinuxNewbie.org"
 
-#: data/static_bookmarks.xml.h:1
-msgid "Linuxcare"
-msgstr "Linuxcare"
+#: data/static_bookmarks.xml.h:24
+#, fuzzy
+msgid "LinuxOrbit.com"
+msgstr "LinuxNewbie.org"
 
-#: data/static_bookmarks.xml.h:1
-msgid "Myplay"
-msgstr "Myplay"
+#: data/static_bookmarks.xml.h:25
+msgid "MandrakeSoft"
+msgstr ""
 
-#. The copyright character in here is correct for
-#. * Latin-1 encoding, but not for UTF-8, so we have
-#. * to change it when we upgrade to GTK 2.0.
-#.
-#: data/static_bookmarks.xml.h:1 src/nautilus-window-manage-views.c:1
-#: src/nautilus-window-menus.c:1
-msgid "Nautilus"
-msgstr "Nautilus"
+#: data/static_bookmarks.xml.h:26
+#, fuzzy
+msgid "Netraverse"
+msgstr "Nigdy"
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:27
 msgid "News and Media"
 msgstr ""
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:28
+msgid "O'Reilly"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:29
 msgid "OSDN"
 msgstr "OSDN"
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:30
+msgid "Open Source Asia"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:31
 msgid "OpenOffice"
 msgstr "OpenOffice"
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:32
+msgid "Penguin Computing"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:33
+#, fuzzy
+msgid "Rackspace"
+msgstr "Pakiet"
+
+#: data/static_bookmarks.xml.h:34
 msgid "Red Hat"
 msgstr "Red Hat"
 
-#: data/static_bookmarks.xml.h:1
-msgid "Slashdot.org"
-msgstr "Slashdot.org"
+#: data/static_bookmarks.xml.h:35
+#, fuzzy
+msgid "Red Hat Network"
+msgstr "Red Hat"
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:36
+msgid "RedFlag Linux"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:37
 msgid "Software"
 msgstr "Oprogramowanie"
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:38
 msgid "SourceForge"
 msgstr "SourceForge"
 
-#: data/static_bookmarks.xml.h:1
-msgid "SourceXchange"
-msgstr "SourceXchange"
-
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:39
 msgid "Sun StarOffice"
 msgstr "Sun StarOffice"
 
-#: data/static_bookmarks.xml.h:1
-msgid "VA Linux"
-msgstr "VA Linux"
-
-#: data/static_bookmarks.xml.h:1
-msgid "VMware"
-msgstr "VMware"
+#: data/static_bookmarks.xml.h:40
+msgid "Sun Wah Linux"
+msgstr ""
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:41
 msgid "Web Services"
 msgstr "Us³ugi w sieci WWW"
 
-#: data/static_bookmarks.xml.h:1
+#: data/static_bookmarks.xml.h:42
+msgid "ZDNet Linux Hardware Database"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:43
 msgid "ZDNet Linux Resource Center"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
+#: data/static_bookmarks.xml.h:44
+msgid "Zero-Knowledge"
+msgstr ""
+
 #: icons/ardmore/ardmore.xml.h:1
+#, fuzzy
+msgid "Tahoe"
+msgstr "Yahoo"
+
+#: icons/ardmore/ardmore.xml.h:2
 msgid "This theme uses photo-realistic folders."
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: icons/arlo/arlo.xml.h:1
-msgid "This theme is based on the teal in the Eazel logo."
+msgid "A Teal variation of the Crux theme."
+msgstr ""
+
+#: icons/arlo/arlo.xml.h:2
+msgid "Crux-Teal"
+msgstr ""
+
+#: icons/crux_eggplant/crux_eggplant.xml.h:1
+msgid "An Eggplant variation of the Crux theme."
+msgstr ""
+
+#: icons/crux_eggplant/crux_eggplant.xml.h:2
+msgid "Crux-Eggplant"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: icons/default.xml.h:1
-msgid "This simple theme uses the standard GNOME icons."
+#, fuzzy
+msgid "Default"
+msgstr "Usuñ"
+
+#: icons/default.xml.h:2
+#, fuzzy
+msgid "This is the default theme for Nautilus."
+msgstr "Jest domy¶lny dla \"%s\"."
+
+#: icons/gnome/gnome.xml.h:2
+msgid "This theme uses the classic GNOME icons."
 msgstr ""
 
+#: icons/villanova/villanova.xml.h:1
+#, fuzzy
+msgid "Sierra"
+msgstr "Srebro"
+
+#: icons/villanova/villanova.xml.h:2
+msgid "Uses manila folders and gray-green backgrounds."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-drag.c:489
+#, fuzzy
+msgid "_Move here"
+msgstr "Przejd¼ tam"
+
+#: libnautilus-extensions/nautilus-drag.c:490
+#, fuzzy
+msgid "_Copy here"
+msgstr "_Kopiuj tekst"
+
+#: libnautilus-extensions/nautilus-drag.c:491
+#, fuzzy
+msgid "_Link here"
+msgstr "Zbiory odno¶ników"
+
+#. Note to localizers: this font is used for text items in Druid pages
+#: libnautilus-extensions/nautilus-druid-page-eazel.c:381
+msgid "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-*"
+msgstr "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-2"
+
+#. Note to localizers: this font is used for page titles in Druid pages
+#: libnautilus-extensions/nautilus-druid-page-eazel.c:560
+msgid "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
+msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-2"
+
+#. Today, use special word.
+#. * Note to localizers: You can look at man strftime
+#. * for details on the format, but you should only use
+#. * the specifiers from the C standard, not extensions.
+#. * These include "%" followed by one of
+#. * "aAbBcdHIjmMpSUwWxXyYZ". There are two extensions
+#. * in the Nautilus version of strftime that can be
+#. * used (and match GNU extensions). Putting a "-"
+#. * between the "%" and any numeric directive will turn
+#. * off zero padding, and putting a "_" there will use
+#. * space padding instead of zero padding.
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
+#: libnautilus-extensions/nautilus-file.c:2277
+msgid "today at %-I:%M %p"
+msgstr "dzisiaj o %-I:%M %p"
+
+#. Yesterday, use special word.
+#. * Note to localizers: Same issues as "today" string.
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
+#: libnautilus-extensions/nautilus-file.c:2282
+msgid "yesterday at %-I:%M %p"
+msgstr "wczoraj o %-I:%M %p"
+
+#. Current week, include day of week.
+#. * Note to localizers: Same issues as "today" string.
 #.
-#: icons/gnome/gnome.xml.h:1
-msgid "This theme uses the classic GNOME icons."
-msgstr ""
+#: libnautilus-extensions/nautilus-file.c:2287
+msgid "%A %-m/%-d/%y at %-I:%M %p"
+msgstr "A %-m/%-d/%y o %-I:%M %p"
 
+#. Other dates.
+#. * Note to localizers: Same issues as "today" string.
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
+#: libnautilus-extensions/nautilus-file.c:2292
+msgid "%-m/%-d/%y at %-I:%M %p"
+msgstr "%-m/%-d/%y o %-I:%M %p"
+
+#: libnautilus-extensions/nautilus-file.c:3423
+msgid "0 items"
+msgstr "0 elementów"
+
+#: libnautilus-extensions/nautilus-file.c:3423
+msgid "0 folders"
+msgstr "0 folderów"
+
+#: libnautilus-extensions/nautilus-file.c:3424
+msgid "0 files"
+msgstr "0 plików"
+
+#: libnautilus-extensions/nautilus-file.c:3428
+msgid "1 item"
+msgstr "1 element"
+
+#: libnautilus-extensions/nautilus-file.c:3428
+msgid "1 folder"
+msgstr "1 folder"
+
+#: libnautilus-extensions/nautilus-file.c:3429
+msgid "1 file"
+msgstr "1 plik"
+
+#: libnautilus-extensions/nautilus-file.c:3432
+#, c-format
+msgid "%u items"
+msgstr "%u elementów"
+
+#: libnautilus-extensions/nautilus-file.c:3432
+#, c-format
+msgid "%u folders"
+msgstr "%u folderów"
+
+#: libnautilus-extensions/nautilus-file.c:3433
+#, c-format
+msgid "%u files"
+msgstr "%u plików"
+
+#. This means no contents at all were readable
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
+msgid "? items"
+msgstr "? elementów"
+
+#. This means no contents at all were readable
+#: libnautilus-extensions/nautilus-file.c:3746
+#, fuzzy
+msgid "? bytes"
+msgstr "? elementów"
+
+#: libnautilus-extensions/nautilus-file.c:3759
+msgid "unknown type"
+msgstr "nieznany typ"
+
+#: libnautilus-extensions/nautilus-file.c:3761
+msgid "unknown MIME type"
+msgstr "nieznany typ MIME"
+
+#. Fallback, use for both unknown attributes and attributes
+#. * for which we have no more appropriate default.
 #.
-#: icons/vector/vector.xml.h:1
-msgid "This experimental theme uses vector-based icons."
+#: libnautilus-extensions/nautilus-file.c:3766
+msgid "unknown"
+msgstr "nieznane"
+
+#: libnautilus-extensions/nautilus-file.c:3802
+msgid "program"
+msgstr "program"
+
+#: libnautilus-extensions/nautilus-file.c:3814
+msgid ""
+"Can't find description even for \"x-directory/normal\". This probably means "
+"that your gnome-vfs.keys file is in the wrong place or isn't being found for "
+"some other reason."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-druid-page-eazel.c:1
-msgid "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
-msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-2"
+#: libnautilus-extensions/nautilus-file.c:3818
+#, c-format
+msgid ""
+"No description found for mime type \"%s\" (file is \"%s\"), tell "
+"aaron@eazel.com"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-druid-page-eazel.c:1
-msgid "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-*"
-msgstr "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-2"
+#: libnautilus-extensions/nautilus-file.c:3832
+msgid "link"
+msgstr "dowi±zanie"
+
+#. Note to localizers: convert file type string for file
+#. * (e.g. "folder", "plain text") to file type for symbolic link
+#. * to that kind of file (e.g. "link to folder").
+#.
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
+#, c-format
+msgid "link to %s"
+msgstr "dowi±zanie do %s"
+
+#: libnautilus-extensions/nautilus-file.c:3852
+msgid "link (broken)"
+msgstr "dowi±zanie (uszkodzone)"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "Z:"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "Do:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -3438,7 +4594,7 @@ msgstr ""
 "\n"
 "Nie mo¿na przenie¶æ \"%s\" poniewa¿ jest on na dysku tylko do odczytu."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -3448,9 +4604,10 @@ msgid ""
 msgstr ""
 "B³±d podczas usuwania.\n"
 "\n"
-"Nie mo¿na usun±æ \"%s\" z powodu braku uprawnieñ do modyfikacji folderu nadrzêdnego."
+"Nie mo¿na usun±æ \"%s\" z powodu braku uprawnieñ do modyfikacji folderu "
+"nadrzêdnego."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -3461,7 +4618,7 @@ msgstr ""
 "\n"
 "Nie mo¿na usun±æ \"%s\" poniewa¿ jest on na dysku tylko do odczytu."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -3471,21 +4628,23 @@ msgid ""
 msgstr ""
 "B³±d podczas przenoszenia.\n"
 "\n"
-"Nie mo¿na przenie¶æ \"%s\" z powodu braku uprawnieñ do modyfikacji folderu nadrzêdnego."
+"Nie mo¿na przenie¶æ \"%s\" z powodu braku uprawnieñ do modyfikacji folderu "
+"nadrzêdnego."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#, c-format
+#: libnautilus-extensions/nautilus-file-operations.c:677
+#, fuzzy, c-format
 msgid ""
 "Error while moving.\n"
 "\n"
-"\"%s\" cannot be moved to the trash because you do not have permissions to "
+"\"%s\" cannot be moved to the Trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "B³±d podczas przenoszenia.\n"
 "\n"
-"Nie mo¿na przenie¶æ \"%s\" do kosza z powodu braku uprawnieñ do modyfikacji folderu nadrzêdnego."
+"Nie mo¿na przenie¶æ \"%s\" do kosza z powodu braku uprawnieñ do modyfikacji "
+"folderu nadrzêdnego."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -3496,7 +4655,7 @@ msgstr ""
 "\n"
 "Nie mo¿na skopiowaæ \"%s\" z powodu braku uprawnieñ do jego odczytu."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -3507,7 +4666,7 @@ msgstr ""
 "\n"
 "W miejscu docelowym brakuje miejsca."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -3518,7 +4677,7 @@ msgstr ""
 "\n"
 "W miejscu docelowym brakuje miejsca."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -3529,7 +4688,7 @@ msgstr ""
 "\n"
 "W miejscu docelowym brakuje miejsca."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -3540,7 +4699,7 @@ msgstr ""
 "\n"
 "Brak uprawnieñ do zapisu w tym folderze."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -3551,7 +4710,7 @@ msgstr ""
 "\n"
 "Dysk docelowy jest tylko do odczytu."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -3562,7 +4721,7 @@ msgstr ""
 "\n"
 "Brak uprawnieñ do zapisu w tym folderze."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -3573,7 +4732,7 @@ msgstr ""
 "\n"
 "Dysk docelowy jest tylko do odczytu."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -3584,7 +4743,7 @@ msgstr ""
 "\n"
 "Brak uprawnieñ do zapisu w tym folderze."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -3595,7 +4754,7 @@ msgstr ""
 "\n"
 "Dysk docelowy jest tylko do odczytu."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -3606,7 +4765,7 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuowaæ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -3617,7 +4776,7 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuowaæ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -3628,7 +4787,7 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuowaæ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -3639,7 +4798,7 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuowaæ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -3650,7 +4809,7 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuowaæ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -3661,7 +4820,7 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuowaæ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -3672,7 +4831,7 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuowaæ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -3683,44 +4842,56 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuowaæ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "B³±d podczas kopiowania."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "B³±d podczas przenoszenia."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "B³±d podczas dowi±zywania."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "B³±d podczas usuwania."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "Pomiñ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Ponów"
 
-#. FIXME bugzilla.eazel.com 5533 Need good dialog text for failed replace of
-#. * special desktop icons.
-#: libnautilus-extensions/nautilus-file-operations.c:1
-msgid "Could not replace file because it is special."
+#: libnautilus-extensions/nautilus-file-operations.c:1088
+#, c-format
+msgid ""
+"\"%s\" could not be moved to the new location, because its name is already "
+"used for a special item that cannot be removed or replaced.\n"
+"\n"
+"If you still want to move \"%s\", rename it and try again."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1094
+#, c-format
+msgid ""
+"\"%s\" could not be copied to the new location, because its name is already "
+"used for a special item that cannot be removed or replaced.\n"
+"\n"
+"If you still want to copy \"%s\", rename it and try again."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "Nie mo¿na zast±piæ pliku."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -3731,29 +4902,22 @@ msgstr ""
 "\n"
 "Czy chcesz go zast±piæ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "Konflikt podczas kopiowania"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Zast±p"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Zast±p wszystkie"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file.c:1
-#, c-format
-msgid "link to %s"
-msgstr "dowi±zanie do %s"
-
-#. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "kolejne dowi±zanie do %s"
@@ -3762,25 +4926,25 @@ msgstr "kolejne dowi±zanie do %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. dowi±zanie do %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. dowi±zanie do %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. dowi±zanie do %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. dowi±zanie do %s"
@@ -3790,203 +4954,230 @@ msgstr "%d. dowi±zanie do %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (kopia)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (kolejna kopia)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr ". kopia)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr ". kopia)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr ". kopia)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr ". kopia)"
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopia)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (kolejna kopia)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. kopia)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. kopia)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. kopia)%s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. kopia)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1
-msgid "Moving files"
-msgstr "Przenoszenie plików"
+#: libnautilus-extensions/nautilus-file-operations.c:1822
+msgid "Moving files to the Trash"
+msgstr "Przenoszenie plików do ¶mietnika"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1
-msgid "Files moved:"
-msgstr "Przeniesionych plików:"
+#: libnautilus-extensions/nautilus-file-operations.c:1824
+msgid "Files thrown out:"
+msgstr "Wyrzuconych plików:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "Przenoszenie"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1827
+msgid "Preparing to Move to Trash..."
+msgstr "Przygotowywanie do przeniesienia do ¶mietnika..."
+
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1837
+msgid "Moving files"
+msgstr "Przenoszenie plików"
+
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1839
+msgid "Files moved:"
+msgstr "Przeniesionych plików:"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "Przygotowanie do przeniesienia..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "Wykañczanie przeniesienia..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "Tworzenie dowi±zañ do plików"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "Dowi±zanych plików:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "Dowi±zywanie"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "Przygotowanie do tworzenia dowi±zañ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "Wykañczanie tworzenia dowi±zañ..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "Kopiowanie plików"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "Skopiowanych plików:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "Kopiowanie"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "Przygotowywanie do kopiowania..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "Nie mo¿na kopiowaæ elementów do ¶mietnika."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "Nie mo¿na kopiowaæ do ¶mietnika"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "¦mietnik musi pozostaæ na biurku."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "Nie mo¿na przenie¶æ folderu ¶mietnika."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "Nie mo¿na kopiowaæ ¶mietnika."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "Nie mo¿na kopiowaæ folderu ¶mietnika."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Nie mo¿na zmieniaæ po³o¿enia ¶mietnika"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Nie mo¿na kopiowaæ ¶mietnika"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "Nie mo¿na przenie¶æ folderu do niego samego."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "Nie mo¿na skopiowaæ katalogu do niego samego."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "Nie mo¿na przenie¶æ do siebie samego"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:1953
+#, fuzzy
+msgid "Can't Copy Into Self"
+msgstr "Nie mo¿na przenie¶æ do siebie samego"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1965
+#, fuzzy
+msgid "You cannot copy a file over itself."
+msgstr "Nie mo¿na skopiowaæ katalogu do niego samego."
+
+#: libnautilus-extensions/nautilus-file-operations.c:1966
+#, fuzzy
+msgid "Can't Copy Over Self"
+msgstr "Nie mo¿na przenie¶æ do siebie samego"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -3996,7 +5187,7 @@ msgstr ""
 "\n"
 "Brak uprawnieñ do zapisu w miejscu docelowym."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -4006,693 +5197,728 @@ msgstr ""
 "\n"
 "W miejscu docelowym brakuje miejsca."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Podczas tworzenia nowego folderu wyst±pi³ b³±d \"%s\""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "Podczas tworzenia nowego folderu wyst±pi³ b³±d"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "folder bez nazwy"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#, c-format
-msgid "You cannot throw \"%s\" into the Trash."
-msgstr "Nie mo¿na wyrzuciæ \"%s\" do ¶mietnika."
-
-#: libnautilus-extensions/nautilus-file-operations.c:1
-msgid "Error Moving to Trash"
-msgstr "B³±d przy przenoszeniu do ¶mietnika"
-
-#. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1
-msgid "Moving files to the Trash"
-msgstr "Przenoszenie plików do ¶mietnika"
-
-#. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1
-msgid "Files thrown out:"
-msgstr "Wyrzuconych plików:"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1
-msgid "Preparing to Move to Trash..."
-msgstr "Przygotowywanie do przeniesienia do ¶mietnika..."
-
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "Usuwanie plików"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "Usuniêtych plików:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Usuwanie"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "Przygotowywanie do usuniêcia plików..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Opró¿nianie ¶mietnika"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Przygotowywanie do opró¿nienia ¶mietnika..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2218
+#, fuzzy
 msgid ""
-"Are you sure you want to permanently delete all of the items in the trash?"
+"Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr "Czy na pewno chcesz trwale usun±æ wszystkie elementy ze ¶mietnika?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "Usun±æ zawarto¶æ ¶mietnika?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "Opró¿nij"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "foo (kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".foo (kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "foo foo (kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "foo (kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "foo foo (kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (kopia).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "foo.. (kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "foo... (kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "foo. (kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "foo. (kolejna kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "foo (kolejna kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "foo (kolejna kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "foo (3. kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "foo (3. kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (kolejna kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3. kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr "foo (21. kopia)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr "foo (24. kopia)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr "foo (21. kopia).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr "foo (24. kopia).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "foo (21. kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "foo (22. kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "foo (21. kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "foo (22. kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "foo (23. kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "foo (23. kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "foo (24. kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "foo (24. kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "foo (25. kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "foo (25. kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24. kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25. kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24. kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25. kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000. kopia).txt"
 
-#. Today, use special word.
-#. * Note to localizers: You can look at man strftime
-#. * for details on the format, but you should only use
-#. * the specifiers from the C standard, not extensions.
-#. * These include "%" followed by one of
-#. * "aAbBcdHIjmMpSUwWxXyYZ". There are two extensions
-#. * in the Nautilus version of strftime that can be
-#. * used (and match GNU extensions). Putting a "-"
-#. * between the "%" and any numeric directive will turn
-#. * off zero padding, and putting a "_" there will use
-#. * space padding instead of zero padding.
-#.
-#: libnautilus-extensions/nautilus-file.c:1
-msgid "today at %-I:%M %p"
-msgstr "dzisiaj o %-I:%M %p"
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (10th copy)"
+msgstr "foo (21. kopia)"
 
-#. Yesterday, use special word.
-#. * Note to localizers: Same issues as "today" string.
-#.
-#: libnautilus-extensions/nautilus-file.c:1
-msgid "yesterday at %-I:%M %p"
-msgstr "wczoraj o %-I:%M %p"
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (11st copy)"
+msgstr "foo (21. kopia)"
 
-#. Current week, include day of week.
-#. * Note to localizers: Same issues as "today" string.
-#.
-#: libnautilus-extensions/nautilus-file.c:1
-msgid "%A %-m/%-d/%y at %-I:%M %p"
-msgstr "A %-m/%-d/%y o %-I:%M %p"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (10th copy).txt"
+msgstr "foo (21. kopia).txt"
 
-#. Other dates.
-#. * Note to localizers: Same issues as "today" string.
-#.
-#: libnautilus-extensions/nautilus-file.c:1
-msgid "%-m/%-d/%y at %-I:%M %p"
-msgstr "%-m/%-d/%y o %-I:%M %p"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (11st copy).txt"
+msgstr "foo (21. kopia).txt"
 
-#: libnautilus-extensions/nautilus-file.c:1
-msgid "0 items"
-msgstr "0 elementów"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (11th copy)"
+msgstr "foo (21. kopia)"
 
-#: libnautilus-extensions/nautilus-file.c:1
-msgid "0 folders"
-msgstr "0 folderów"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (12nd copy)"
+msgstr "foo (22. kopia)"
 
-#: libnautilus-extensions/nautilus-file.c:1
-msgid "0 files"
-msgstr "0 plików"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (11th copy).txt"
+msgstr "foo (21. kopia).txt"
 
-#: libnautilus-extensions/nautilus-file.c:1
-msgid "1 item"
-msgstr "1 element"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (12nd copy).txt"
+msgstr "foo (22. kopia).txt"
 
-#: libnautilus-extensions/nautilus-file.c:1
-msgid "1 folder"
-msgstr "1 folder"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (12th copy)"
+msgstr "foo (24. kopia)"
 
-#: libnautilus-extensions/nautilus-file.c:1
-msgid "1 file"
-msgstr "1 plik"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (13rd copy)"
+msgstr "foo (3. kopia)"
 
-#: libnautilus-extensions/nautilus-file.c:1
-#, c-format
-msgid "%u items"
-msgstr "%u elementów"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (12th copy).txt"
+msgstr "foo (25. kopia).txt"
 
-#: libnautilus-extensions/nautilus-file.c:1
-#, c-format
-msgid "%u folders"
-msgstr "%u folderów"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (13rd copy).txt"
+msgstr "foo (3. kopia).txt"
 
-#: libnautilus-extensions/nautilus-file.c:1
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
 #, c-format
-msgid "%u files"
-msgstr "%u plików"
+msgid "%ld of %ld"
+msgstr ""
 
-#. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:1
-#: libnautilus-extensions/nautilus-file.c:1
-msgid "? items"
-msgstr "? elementów"
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
+#, fuzzy
+msgid "GConf Error"
+msgstr "B³±d przy montowaniu"
 
-#: libnautilus-extensions/nautilus-file.c:1
-msgid "unknown type"
-msgstr "nieznany typ"
+#. Constants
+#: libnautilus-extensions/nautilus-global-preferences.c:50
+msgid "Nautilus Preferences"
+msgstr "Preferencje Nautilusa"
 
-#: libnautilus-extensions/nautilus-file.c:1
-msgid "unknown MIME type"
-msgstr "nieznany typ MIME"
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "zawsze"
 
-#. Fallback, use for both unknown attributes and attributes
-#. * for which we have no more appropriate default.
-#.
-#: libnautilus-extensions/nautilus-file.c:1
-msgid "unknown"
-msgstr "nieznane"
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "Zawsze"
 
-#: libnautilus-extensions/nautilus-file.c:1
-msgid "program"
-msgstr "program"
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "tylko lokalne"
 
-#: libnautilus-extensions/nautilus-file.c:1
-msgid "link"
-msgstr "dowi±zanie"
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "Tylko lokalne pliki"
 
-#: libnautilus-extensions/nautilus-file.c:1
-msgid "link (broken)"
-msgstr "dowi±zanie (uszkodzone)"
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "nigdy"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "Nigdy"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "Wyg³adzanie grafiki"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "Renderowanie grafiki z wyg³adzaniem (wolniejsze)"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "Czcionki"
 
-#: libnautilus-extensions/nautilus-font-factory.c:1
-msgid "fixed"
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+msgid "Font for Icon view:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-font-picker.c:1
-msgid "Font"
-msgstr "Czcionka"
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
+msgstr ""
 
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1
-msgid "01/01/00, 01:00 AM"
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+msgid "Font for List view:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1
-msgid "1/1/00, 1:00 AM"
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1
-msgid " 1/ 1/00,  1:00 AM"
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
 msgstr ""
 
-#. Constants
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Nautilus Preferences"
-msgstr "Preferencje Nautilusa"
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "Rysowanie biurka przez Nautilusa"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Folder Views"
-msgstr "Widok folderu"
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+#, fuzzy
+msgid "Opening New Windows"
+msgstr "Otwórz w nowym oknie"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Folder Views Settings"
-msgstr "Ustawienia widoków folderów"
+#: libnautilus-extensions/nautilus-global-preferences.c:651
+#, fuzzy
+msgid "Open each file or folder in a separate window"
+msgstr "Otwieranie ka¿dego elementu w osobnym oknie"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Window Behavior"
-msgstr "Zachowanie okien"
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+#, fuzzy
+msgid "Display toolbar in new windows"
+msgstr "Wy¶wietlanie paska narzêdziowego w nowych oknach"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Click Behavior"
-msgstr "Zachowanie klikniêæ"
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "Wy¶wietlanie paska po³o¿enia w nowych oknach"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "Wy¶wietlanie paska stanu w nowych oknach"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
 msgid "Trash Behavior"
 msgstr "Zachowanie ¶mietnika"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Display"
-msgstr "Wy¶wietlanie"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Sidebar Panels"
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+msgid "Ask before emptying the Trash or deleting files"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Sidebar Panels Description"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Choose which panels should appear in the sidebar"
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Appearance"
-msgstr "Wygl±d"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Appearance Settings"
-msgstr "Ustawienia wygl±du"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Smoother Graphics"
-msgstr "Wyg³adzanie grafiki"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Fonts"
-msgstr "Czcionki"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Views"
-msgstr "Widoki"
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Speed Tradeoffs"
-msgstr "Wydajno¶æ"
+#: libnautilus-extensions/nautilus-global-preferences.c:713
+msgid "single"
+msgstr "jednokrotne"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Speed Tradeoffs Settings"
-msgstr "Ustawienia dotycz±ce wydajno¶ci"
+#: libnautilus-extensions/nautilus-global-preferences.c:714
+msgid "Activate items with a single click"
+msgstr "Uaktywnianie elementów za pomoc± pojedynczego klikniêcia"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Show Text in Icons"
-msgstr "Wy¶wietlanie tekstu wewn±trz ikon"
+#: libnautilus-extensions/nautilus-global-preferences.c:717
+msgid "double"
+msgstr "dwukrotne"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Show Thumbnails for Image Files"
-msgstr "Wy¶wietlanie miniaturek plików graficznych"
+#: libnautilus-extensions/nautilus-global-preferences.c:718
+msgid "Activate items with a double click"
+msgstr "Uaktywnianie elementów za pomoc± dwukrotnego klikniêcia"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Previewing Sound Files"
+#: libnautilus-extensions/nautilus-global-preferences.c:725
+msgid "launch"
 msgstr ""
 
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Make Folder Appearance Details Public"
+#: libnautilus-extensions/nautilus-global-preferences.c:726
+msgid "Execute files when they are clicked"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Search"
-msgstr "Wyszukiwanie"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Search Settings"
-msgstr "Ustawienia wyszukiwania"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Search Complexity Options"
-msgstr "Opcje z³o¿ono¶ci wyszukiwania"
+#: libnautilus-extensions/nautilus-global-preferences.c:729
+#, fuzzy
+msgid "display"
+msgstr "Wy¶wietlanie"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Search Tradeoffs"
-msgstr "Opcje wyszukiwania"
+#: libnautilus-extensions/nautilus-global-preferences.c:730
+msgid "Display files when they are clicked"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Search Locations"
-msgstr "Przeszukiwane po³o¿enia"
+#: libnautilus-extensions/nautilus-global-preferences.c:733
+msgid "ask"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Navigation"
-msgstr "Nawigacja"
+#: libnautilus-extensions/nautilus-global-preferences.c:734
+msgid "Ask each time"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Navigation Settings"
-msgstr "Ustawienia nawigacji"
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "Zachowanie klikniêæ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Home Location"
-msgstr "Po³o¿enie pocz±tkowe"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Proxy Settings"
-msgstr "Ustawienia po¶rednika"
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+#, fuzzy
+msgid "Show/Hide Options"
+msgstr "Wiêcej opcji"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Built-in Bookmarks"
-msgstr "Wbudowane zak³adki"
+#: libnautilus-extensions/nautilus-global-preferences.c:759
+#, fuzzy
+msgid "Show hidden files (file names start with \".\")"
+msgstr "Wy¶wietlanie ukrytych plików (rozpoczynaj±cych siê od \".\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "always"
-msgstr "zawsze"
+#: libnautilus-extensions/nautilus-global-preferences.c:766
+#, fuzzy
+msgid "Show backup files (file names end with \"~\")"
+msgstr "Wy¶wietlanie kopii zapasowych (koñcz±cych siê na \"~\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Always"
-msgstr "Zawsze"
+#: libnautilus-extensions/nautilus-global-preferences.c:773
+msgid "Show special flags in Properties window"
+msgstr "Wy¶wietlanie specjalnych znaczników w oknie w³a¶ciwo¶ci"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "local only"
-msgstr "tylko lokalne"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+#, fuzzy
+msgid "Sorting Order"
+msgstr "B³±d przy zmianie w³a¶ciciela"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Local Files Only"
-msgstr "Tylko lokalne pliki"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "never"
-msgstr "nigdy"
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
+msgid "Location:"
+msgstr "Po³o¿enie:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Never"
-msgstr "Nigdy"
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+#, fuzzy
+msgid "HTTP Proxy Settings"
+msgstr "Ustawienia po¶rednika"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "Wykorzystanie po¶rednika HTTP"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "HTTP Proxy"
-msgstr "Port po¶rednika HTTP"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "HTTP Proxy Port"
-msgstr "Port po¶rednika HTTP"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "current theme"
-msgstr "bie¿±cy motyw"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Open each item in a separate window"
-msgstr "Otwieranie ka¿dego elementu w osobnym oknie"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Ask before deleting items from the trash"
-msgstr "Pytanie przed usuwaniem elementów ze ¶mietnika"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Click policy"
-msgstr "Zachowanie siê klikniêæ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "single"
-msgstr "jednokrotne"
+#. allocate the proxy label, followed by the entry
+#: libnautilus-extensions/nautilus-global-preferences.c:812
+#: src/nautilus-first-time-druid.c:683
+msgid "Port:"
+msgstr "Port:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Activate items with a single click"
-msgstr "Uaktywnianie elementów za pomoc± pojedynczego klikniêcia"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "double"
-msgstr "dwukrotne"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "Wbudowane zak³adki"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Activate items with a double click"
-msgstr "Uaktywnianie elementów za pomoc± dwukrotnego klikniêcia"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+#, fuzzy
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "Bez do³±czania wbudowanych zak³adek do menu"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Display text in icons"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
 msgstr "Wy¶wietlanie tekstu wewn±trz ikon"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Show thumbnails for image files"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
 msgstr "Wy¶wietlanie miniaturek plików graficznych"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Read and write metadata in each folder"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Play a sound file when the mouse is over it"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
 msgstr ""
-"Odtwarzanie pliku d¼wiêkowego przy przesuniêciu nad niego wska¼nika myszy"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Use smoother (but slower) graphics"
-msgstr "Renderowanie grafiki z wyg³adzaniem (wolniejsze)"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Font family used to display file names"
-msgstr "Czcionka wykorzystywana przy wy¶wietlaniu nazw plików"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Display tool bar in new windows"
-msgstr "Wy¶wietlanie paska narzêdziowego w nowych oknach"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Display location bar in new windows"
-msgstr "Wy¶wietlanie paska po³o¿enia w nowych oknach"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Display status bar in new windows"
-msgstr "Wy¶wietlanie paska stanu w nowych oknach"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "Wygl±d"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Display sidebar in new windows"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Use Nautilus to draw the desktop"
-msgstr "Rysowanie biurka przez Nautilusa"
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Always do slow, complete search"
-msgstr "Wykonywanie zawsze powolnego, pe³nego wyszukiwania"
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+msgid "Navigation"
+msgstr "Nawigacja"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "search type to do by default"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:962
+msgid "Speed Tradeoffs"
+msgstr "Wydajno¶æ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
+#: libnautilus-extensions/nautilus-global-preferences.c:985
 msgid "search by text"
 msgstr "wyszukiwanie wed³ug tekstu"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Search for files by text only"
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+#, fuzzy
+msgid "Search for files by file name only"
 msgstr "Wyszukuje pliki wed³ug tekstu"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
+#: libnautilus-extensions/nautilus-global-preferences.c:989
 msgid "search by text and properties"
 msgstr "wyszukiwanie wed³ug tekstu i w³a¶ciwo¶ci"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Search for files by text and by their properties"
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+#, fuzzy
+msgid "Search for files by file name and file properties"
 msgstr "Wyszukiwanie plików wed³ug tekstu i ich w³a¶ciwo¶ci"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Search Web Location"
+#: libnautilus-extensions/nautilus-global-preferences.c:997
+msgid "Search Complexity Options"
+msgstr "Opcje z³o¿ono¶ci wyszukiwania"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
+#, fuzzy
+msgid "Fast Search"
+msgstr "Wyszukiwanie"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+#, fuzzy
+msgid "Search Engine Location"
 msgstr "Po³o¿enie wyszukiwarki plików"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Show hidden files (starting with \".\")"
-msgstr "Wy¶wietlanie ukrytych plików (rozpoczynaj±cych siê od \".\")"
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Wyszukiwanie"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Show backup files (ending with \"~\")"
-msgstr "Wy¶wietlanie kopii zapasowych (koñcz±cych siê na \"~\")"
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Show special flags in Properties window"
-msgstr "Wy¶wietlanie specjalnych znaczników w oknie w³a¶ciwo¶ci"
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, fuzzy, c-format
+msgid "Display %s tab in sidebar"
+msgstr "Wy¶wietlanie paska stanu w nowych oknach"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Show only folders in tree sidebar panel"
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Can add Content"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+#, fuzzy
+msgid "Tabs"
+msgstr "¦mietnik"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"currently can't be performed because the program crond, which does nightly "
+"tasks on your computer, is turned off. To make sure fast searches can be "
+"done, turn crond on."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1
-msgid "Don't include the built-in bookmarks"
-msgstr "Bez do³±czania wbudowanych zak³adek do menu"
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
+msgid "Files May Not Be Indexed"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
+msgid ""
+"If you are running Linux, you can log in as root and type these commands to "
+"start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"may not be performed because the program crond, which does nightly tasks on "
+"your computer, may be turned off. To make sure fast searches can be done, "
+"check to make sure that crond is turned on.\n"
+"\n"
+msgstr ""
 
 #. The list of characters that cause line breaks can be localized.
-#: libnautilus-extensions/nautilus-icon-canvas-item.c:1
+#: libnautilus-extensions/nautilus-icon-canvas-item.c:70
 msgid " -_,;.?/&"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:1
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
@@ -4702,7 +5928,7 @@ msgstr ""
 "na uk³ad rêczny i pozostawiæ element w opuszczonym miejscu? Spowoduje to "
 "odtworzenie zapisanego rêcznego uk³adu."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:1
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
@@ -4712,7 +5938,7 @@ msgstr ""
 "na uk³ad rêczny i pozostawiæ elementy w opuszczonym miejscu? Spowoduje to "
 "odtworzenie zapisanego rêcznego uk³adu."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:1
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
@@ -4720,7 +5946,7 @@ msgstr ""
 "Ten folder wykrzystuje automatyczny uk³ad elementów. Czy chcesz prze³±czyæ "
 "na uk³ad rêczny i pozostawiæ element w opuszczonym miejscu? "
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:1
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
@@ -4728,204 +5954,192 @@ msgstr ""
 "Ten folder wykrzystuje automatyczny uk³ad elementów. Czy chcesz prze³±czyæ "
 "na uk³ad rêczny i pozostawiæ elementy w opuszczonym miejscu? "
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:1
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "Prze³±czyæ na rêczny uk³ad?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:1
-#: src/nautilus-window-menus.c:1
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "Prze³±cz"
 
-#. FIXME bugzilla.eazel.com 1102: Embedded text should use preferences
-#. * to determine what font it uses instead of this set of constants.
-#.
-#: libnautilus-extensions/nautilus-icon-factory.c:1
-msgid "helvetica"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-icon-factory.c:1
-msgid "medium"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-icon-text-item.c:1
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
+#: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "Zmieñ nazwê"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr "Cofnij pisanie"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "Przywróæ poprzedn± nazwê"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "Ponów pisanie"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Odtwórz zmienion± nazwê"
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:1
+#: libnautilus-extensions/nautilus-preferences.c:92
+msgid "Beginner"
+msgstr "Pocz±tkuj±cy"
+
+#: libnautilus-extensions/nautilus-preferences.c:93
+msgid "Intermediate"
+msgstr "¦redniozaawansowany"
+
+#: libnautilus-extensions/nautilus-preferences.c:94
+msgid "Advanced"
+msgstr "Zaawansowany"
+
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
-#: src/nautilus-window.c:1 src/nautilus-window.c:1
-#, c-format
-msgid "View as %s"
-msgstr "Wy¶wietlanie jako %s"
-
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:226
 msgid "not in menu"
 msgstr "brak w menu"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:229
 msgid "in menu for this file"
 msgstr "w menu dla tego pliku"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:232
+#: libnautilus-extensions/nautilus-program-chooser.c:235
 #, c-format
 msgid "in menu for \"%s\""
 msgstr "w menu dla \"%s\""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:238
 msgid "default for this file"
 msgstr "domy¶lny dla tego pliku"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:241
+#: libnautilus-extensions/nautilus-program-chooser.c:244
 #, c-format
 msgid "default for \"%s\""
 msgstr "domy¶lny dla \"%s\""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:289
 #, c-format
 msgid "Is not in the menu for \"%s\" items."
 msgstr "Nie jest w menu dla elementów \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:292
 #, c-format
 msgid "Is in the menu for \"%s\"."
 msgstr "Jest w menu dla \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:295
 #, c-format
 msgid "Is in the menu for \"%s\" items."
 msgstr "Jest w menu dla elementów \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:298
 #, c-format
 msgid "Is in the menu for all \"%s\" items."
 msgstr "Jest w menu dla elementów \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:301
 #, c-format
 msgid "Is the default for \"%s\"."
 msgstr "Jest domy¶lny dla \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:304
 #, c-format
 msgid "Is the default for \"%s\" items."
 msgstr "Jest domy¶lny dla elementów \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:307
 #, c-format
 msgid "Is the default for all \"%s\" items."
 msgstr "Jest domy¶lny dla wszystkich elementów \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:993
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Zmieñ \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:1018
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Do³±czanie do menu dla elementów \"%s\""
 
 #. Radio button for setting default for file type.
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:1025
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Wykorzystanie jako domy¶lnego dla elementów \"%s\""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:1032
 #, c-format
 msgid "Include in the menu just for \"%s\""
 msgstr "Do³±czanie do menu tylko dla \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:1038
 #, c-format
 msgid "Use as default just for \"%s\""
 msgstr "Wykorzystanie jako domy¶lnego tylko dla \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:1045
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Bez do³±czania do menu dla elementów \"%s\""
 
-#. Menu item to search by file name in e.g. "Name starts with b"
-#: libnautilus-extensions/nautilus-program-chooser.c:1
-#: src/file-manager/fm-list-view.c:1
-#: src/file-manager/fm-search-list-view.c:1
-#: src/nautilus-bookmarks-window.c:1 src/nautilus-search-bar-criterion.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:1209
+#: src/file-manager/fm-list-view.c:2182
+#: src/file-manager/fm-search-list-view.c:545
+#: src/nautilus-bookmarks-window.c:164
 msgid "Name"
 msgstr "Nazwa"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:1212
 msgid "Status"
 msgstr "Stan"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:1260
 msgid "Open with Other"
 msgstr "Otwórz za pomoc± innej"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:1261
 #, c-format
 msgid "Choose an application with which to open \"%s\"."
 msgstr "Wybierz aplikacjê, za której pomoc± otworzyæ \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:1265
 msgid "View as Other"
 msgstr "Wy¶wietlanie jako inne"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:1266
 #, c-format
 msgid "Choose a view for \"%s\"."
 msgstr "Wybierz widok dla \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:1273
 msgid "Choose"
 msgstr "Wybierz"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
-#: src/nautilus-property-browser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:1275
 msgid "Done"
 msgstr "Gotowe"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:1338
 msgid "Modify..."
 msgstr "Zmieñ..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:1349
 msgid "File Types and Programs"
 msgstr "Typy plików i programy"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1
-msgid "Go There"
-msgstr "Przejd¼ tam"
-
-#: libnautilus-extensions/nautilus-program-chooser.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:1370
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "GNOME Control Center."
@@ -4933,315 +6147,300 @@ msgstr ""
 "Mo¿esz skonfigurowaæ to, które typy plików s± obs³ugiwane przez które "
 "programy, w Centrum Sterowania GNOME."
 
-#. This application can't deal with this URI,
-#. * because it can only handle local
-#. * files. Tell user. Some day we could offer
-#. * to copy it locally for the user, if we knew
-#. * where to put it, and who would delete it
-#. * when done.
+#: libnautilus-extensions/nautilus-program-chooser.c:1485
+#, fuzzy, c-format
+msgid "No viewers are available for \"%s\"."
+msgstr "Brak opisu motywu \"%s\""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1486
+msgid "No Viewers Available"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1489
+#, fuzzy, c-format
+msgid "No applications are available for \"%s\"."
+msgstr "Brak opisu motywu \"%s\""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1490
+#, fuzzy
+msgid "No Applications Available"
+msgstr "Aplikacje"
+
+#. Note: This might be misleading in the components case, since the
+#. * user can't add components to the complete list even from the capplet.
+#. * (They can add applications though.)
 #.
-#: libnautilus-extensions/nautilus-program-choosing.c:1
+#: libnautilus-extensions/nautilus-program-chooser.c:1497
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"You can configure which programs are offered for which file types with the "
+"\"File Types and Programs\" part of the GNOME Control Center. Do you want to "
+"go there now?"
+msgstr ""
+"Mo¿esz skonfigurowaæ to, które typy plików s± obs³ugiwane przez które "
+"programy, w Centrum Sterowania GNOME."
+
+#: libnautilus-extensions/nautilus-program-choosing.c:492
 #, c-format
 msgid ""
-"Sorry, %s can only open local files, and \"%s\" is remote. If you want to "
-"open it with %s, make a local copy first."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  Would you like to choose another application?"
 msgstr ""
-"Niestety, %s mo¿e otwieraæ tylko lokalne pliki, za¶ \"%s\" jest zdalny. "
-"Je¶li chcesz go otworzyæ za pomoc± %s, utwórz najpierw lokaln± kopiê."
 
-#: libnautilus-extensions/nautilus-program-choosing.c:1
-msgid "Can't open remote file"
-msgstr "Nie mo¿na otworzyæ zdalnego pliku"
+#: libnautilus-extensions/nautilus-program-choosing.c:497
+#: libnautilus-extensions/nautilus-program-choosing.c:518
+#, fuzzy
+msgid "Can't Open Location"
+msgstr "Nie mo¿na wy¶wietliæ po³o¿enia"
 
-#. Part of a window title for search results: a
-#. description of the set of files that contains a string
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#: libnautilus-extensions/nautilus-search-uri.c:1
+#: libnautilus-extensions/nautilus-program-choosing.c:513
 #, c-format
-msgid "containing \"%s\" in their names"
-msgstr "zawieraj± \"%s\" w nazwie"
+msgid ""
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  No other applications are available to view this file.  If you "
+"copy this file onto your computer, you may be able to open it."
+msgstr ""
+
+#. Human readable description for a criterion in a search for
+#. files. Bracketed items are context, and are message
+#. strings elsewhere.  You don't have to translate the whole
+#. string, and only the translation for "containing '%s' will
+#. be used.  If you do translate the whole string, leave the
+#. translations of the rest of the text in brackets, so it
+#. will not be used.
+#. "%s" here is a pattern the file name
+#. matched, such as "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:212
+#, fuzzy, c-format
+msgid "[Items ]containing \"%s\" in their names"
+msgstr "Elementy maj±ce w nazwie \"stuff\""
 
-#. Part of a window title for search results: a
-#. description of the set of files that start with a string
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "starting with \"%s\""
+#. "%s" here is a pattern the file name started with, such as
+#. "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:217
+#, fuzzy, c-format
+msgid "[Items ]starting with \"%s\""
 msgstr "rozpoczynaj± siê od \"%s\""
 
-#. Part of a window title for search results: a
-#. description of the set of files that end with a string
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "ending with %s"
+#. "%s" here is a pattern the file name ended with, such as
+#. "mime"
+#: libnautilus-extensions/nautilus-search-uri.c:222
+#, fuzzy, c-format
+msgid "[Items ]ending with %s"
 msgstr "koñcz± siê na %s"
 
-#. Part of a window title for search results: a
-#. description of the set of files that match a regular
-#. expression
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "matching the regular expression \"%s\""
+#. "%s" here is a pattern the file name did not match, such
+#. as "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:227
+#, fuzzy, c-format
+msgid "[Items ]not containing \"%s\" in their names"
+msgstr "Elementy maj±ce w nazwie \"stuff\""
+
+#. "%s" is a regular expression string, for example "[abc]"
+#: libnautilus-extensions/nautilus-search-uri.c:231
+#, fuzzy, c-format
+msgid "[Items ]matching the regular expression \"%s\""
 msgstr "pasuj± do wyra¿enia regularnego \"%s\""
 
-#. Part of a window title for search results: a
-#. description of the set of files that match a glob pattern
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "matching the file pattern \"%s\""
+#. "%s" is a file glob, for example "*.txt"
+#: libnautilus-extensions/nautilus-search-uri.c:235
+#, fuzzy, c-format
+msgid "[Items ]matching the file pattern \"%s\""
 msgstr "pasuj± do wzorca pliku \"%s\""
 
-#. Part of a window title for search results: a
-#. description of the set of files that are not directories,
-#. sockets, etc.
-#: libnautilus-extensions/nautilus-search-uri.c:1
-msgid "regular files"
+#: libnautilus-extensions/nautilus-search-uri.c:248
+#, fuzzy
+msgid "[Items that are ]regular files"
 msgstr "zwyk³e pliki"
 
-#. Part of a window title for search results: a
-#. description of the set of files that are stored as plain
-#. text
-#: libnautilus-extensions/nautilus-search-uri.c:1
-msgid "text files"
-msgstr "pliki tekstowe"
+#: libnautilus-extensions/nautilus-search-uri.c:251
+msgid "[Items that are ]text files"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:254
+msgid "[Items that are ]applications"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:257
+#, fuzzy
+msgid "[Items that are ]folders"
+msgstr "s± folderami"
 
-#. Part of a window title for search results: a
-#. description of the set of files that are binary files or
-#. applications you can run
-#: libnautilus-extensions/nautilus-search-uri.c:1
-msgid "applications"
-msgstr "aplikacje"
-
-#. Part of a window title for search results: a
-#. description of the set of items that are folders
-#. (directories)
-#: libnautilus-extensions/nautilus-search-uri.c:1
-msgid "folders"
-msgstr "foldery"
-
-#. Part of a window title for search results: a
-#. description of the set of items that are music files
-#. (mp3s, wavs)
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#: src/nautilus-search-bar-criterion.c:1
-msgid "music"
-msgstr "muzyka"
-
-#. Part of a window title for search results: way of
-#. describing the fact that files are not of a certain type
-#. (folder, music, etc).  Context is "files that are [folder,
-#. music]"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "that are %s"
+#: libnautilus-extensions/nautilus-search-uri.c:260
+#, fuzzy
+msgid "[Items that are ]music"
 msgstr "s± %s"
 
-#. Part of a window title for search results: way of
-#. describing the fact that files are not owned by someone,
-#. Context is files not ownd by xxx
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "not owned by \"%s\""
+#. "%s" here is a word describing a file type, for example
+#. "folder"
+#: libnautilus-extensions/nautilus-search-uri.c:268
+#, fuzzy, c-format
+msgid "[Items ]that are not %s"
+msgstr "s± %s"
+
+#. "%s" here is a word describing a file type, for example
+#. "folder"
+#: libnautilus-extensions/nautilus-search-uri.c:273
+#, fuzzy, c-format
+msgid "[Items ]that are %s"
+msgstr "s± %s"
+
+#. "%s" here is the name of user on a Linux machine, such as
+#. "root"
+#: libnautilus-extensions/nautilus-search-uri.c:287
+#, fuzzy, c-format
+msgid "[Items ]not owned by \"%s\""
 msgstr "nie s± w posiadaniu \"%s\""
 
-#. Part of a window title for search results: way of
-#. describing the fact that files are owned by someone.
-#. Context is files owned by root
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "owned by \"%s\""
-msgstr "s± w posiadaniu \"%s\""
+#. "%s" here is the name of user on a Linux machine, such as
+#. "root"
+#: libnautilus-extensions/nautilus-search-uri.c:292
+#, fuzzy, c-format
+msgid "[Items ]owned by \"%s\""
+msgstr "nie s± w posiadaniu \"%s\""
 
-#. Part of a window title for search results: way of
-#. describing the fact that files have a specific owner uid.
-#. Context is "files with owner UID xx"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "with owner UID \"%s\""
+#: libnautilus-extensions/nautilus-search-uri.c:295
+#, fuzzy, c-format
+msgid "[Items ]with owner UID \"%s\""
 msgstr "maj± UID w³a¶ciciela \"%s\""
 
-#. Part of a window title for search results: way of
-#. describing the fact that files have a specific owner uid
-#. other than this one.  Context is "files with owner uid
-#. other than xx"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "with owner UID other than \"%s\""
+#: libnautilus-extensions/nautilus-search-uri.c:298
+#, fuzzy, c-format
+msgid "[Items ]with owner UID other than \"%s\""
 msgstr "maj± UID w³a¶ciciela ró¿ny od \"%s\""
 
-#. Part of a window title for search results: way of
-#. describing that the files are larger than a certain size.
-#. Context is "files larger than %s bytes"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "larger than %s bytes"
+#: libnautilus-extensions/nautilus-search-uri.c:309
+#, fuzzy, c-format
+msgid "[Items ]larger than %s bytes"
 msgstr "s± wiêksze od %s bajtów"
 
-#. Part of a window title for search results: way of
-#. describing that the files are larger than a certain size.
-#. Context is "files smaller than %s bytes"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "smaller than %s bytes"
+#: libnautilus-extensions/nautilus-search-uri.c:312
+#, fuzzy, c-format
+msgid "[Items ]smaller than %s bytes"
 msgstr "s± mniejsze od %s bajtów"
 
-#. Part of a window title for search results: way of
-#. describing that the files are larger than a certain size.
-#. Context is "files of %s bytes"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "of %s bytes"
+#: libnautilus-extensions/nautilus-search-uri.c:315
+#, fuzzy, c-format
+msgid "[Items ]of %s bytes"
 msgstr "%s bajtów"
 
-#. Part of a window title for search results: way of
-#. describing that the files were modified since midnight of
-#. the current day.  Context is "files modified today"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-msgid "modified today"
+#: libnautilus-extensions/nautilus-search-uri.c:326
+#, fuzzy
+msgid "[Items ]modified today"
 msgstr "zmodyfikowane dzi¶"
 
-#. Part of a window title for search results: way of
-#. describing that the files were modified since midnight of
-#. the previous day.  Context is "files modified yesterday"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-msgid "modified yesterday"
+#: libnautilus-extensions/nautilus-search-uri.c:329
+#, fuzzy
+msgid "[Items ]modified yesterday"
 msgstr "zmodyfikowane wczoraj"
 
-#. Part of a window title for search results: way of
-#. describing that the files were modified since midnight of
-#. the date that will replace the %s.  Context is "files
-#. modified on 11/20/00"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "modified on %s"
-msgstr "zmodyfikowane dnia %s"
+#: libnautilus-extensions/nautilus-search-uri.c:332
+#, fuzzy, c-format
+msgid "[Items ]modified on %s"
+msgstr "nie zmodyfikowane dnia %s"
 
-#. Part of a window title for search results: way of
-#. describing that the files were not modified since midnight
-#. of the date that will replace the %s.  Context is "files
-#. not modified on 11/20/00"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "not modified on %s"
+#: libnautilus-extensions/nautilus-search-uri.c:334
+#, fuzzy, c-format
+msgid "[Items ]not modified on %s"
 msgstr "nie zmodyfikowane dnia %s"
 
-#. Part of a window title for search results: way of
-#. describing that the files were not modified since midnight
-#. of the date that will replace the %s. Context is "files
-#. modified before 11/20/00"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "modified before %s"
+#: libnautilus-extensions/nautilus-search-uri.c:337
+#, fuzzy, c-format
+msgid "[Items ]modified before %s"
 msgstr "zmodyfikowane przed %s"
 
-#. Part of a window title for search results: way of
-#. describing that the files were modified after midnight of
-#. the date field that will replace the %s.  Context is
-#. "files modified after 11/20/00"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "modified after %s"
+#: libnautilus-extensions/nautilus-search-uri.c:340
+#, fuzzy, c-format
+msgid "[Items ]modified after %s"
 msgstr "zmodyfikowane po %s"
 
-#. Part of a window title for search results: way of
-#. describing that the files were modified within a week of
-#. the date field that will replace the %s.  Context is
-#. "files within a week of 11/20/00"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "modified within a week of %s"
-msgstr ""
+#: libnautilus-extensions/nautilus-search-uri.c:343
+#, fuzzy, c-format
+msgid "[Items ]modified within a week of %s"
+msgstr "jest przed tygodniem"
 
-#. Part of a window title for search results: way of
-#. describing that the files were modified within a week of
-#. the date field that will replace the %s.  Context is
-#. "files within a month of 11/20/00"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "modified within a month of %s"
-msgstr ""
+#: libnautilus-extensions/nautilus-search-uri.c:346
+#, fuzzy, c-format
+msgid "[Items ]modified within a month of %s"
+msgstr "jest przed miesi±cem"
 
-#. Part of a window title for search results: way of
-#. describing that the files have emblems attached that include
-#. the one that will replace the %s.  Context is "files
-#. marked with Important"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "marked with \"%s\""
-msgstr "oznaczone symbolem \"%s\""
+#. "%s" here is the name of an Emblem
+#: libnautilus-extensions/nautilus-search-uri.c:359
+#, fuzzy, c-format
+msgid "[Items ]marked with \"%s\""
+msgstr "nie oznaczone symbolem \"%s\""
 
-#. Part of a window title for search results: way of
-#. describing that the files have emblems attached that don't
-#. include the one that will replace the %s.  Context is
-#. "files not marked with Important"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "not marked with \"%s\""
+#. "%s" here is the name of an Emblem
+#: libnautilus-extensions/nautilus-search-uri.c:363
+#, fuzzy, c-format
+msgid "[Items ]not marked with \"%s\""
 msgstr "nie oznaczone symbolem \"%s\""
 
-#. Part of a window title for search results: way of
-#. describing that the (text) files searched for contain the
-#. word or words that will replace the %s.  Context is "files
-#. with all the word "bob frank"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "with all the words \"%s\""
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:379
+#, fuzzy, c-format
+msgid "[Items ]with all the words \"%s\""
 msgstr "z ka¿dym ze s³ów \"%s\""
 
-#. Part of a window title for search results: way of
-#. describing that the (text) files searched for contain the
-#. word or one or more of the words that will replace the %s.
-#. Context is "files containing one of the words "bob frank"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "containing one of the words \"%s\""
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:384
+#, fuzzy, c-format
+msgid "[Items ]containing one of the words \"%s\""
 msgstr "z jednym ze s³ów \"%s\""
 
-#. Part of a window title for search results: way of
-#. describing that the (text) files searched for don't
-#. contain the word or all of the words that will replace the
-#. %s.  Context is "files without all the word "bob frank"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "without all the words \"%s\""
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:389
+#, fuzzy, c-format
+msgid "[Items ]without all the words \"%s\""
 msgstr "bez wszystkich s³ów \"%s\""
 
-#. Part of a window title for search results: way of
-#. describing that the (text) files searched for contain none of
-#. the word or words that will replace the %s.  Context is "files
-#. with none of the words "bob frank"
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "without any of the words \"%s\""
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:394
+#, fuzzy, c-format
+msgid "[Items ]without any of the words \"%s\""
 msgstr "bez jakiegokolwiek ze s³ów \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:1
-msgid "are folders"
-msgstr "s± folderami"
+#: libnautilus-extensions/nautilus-search-uri.c:556
+msgid "[Items larger than 400K] and [without all the words \"apple orange\"]"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:1
-msgid " and "
-msgstr " i "
+#. Human readable description for a criterion in a search for
+#. files. Bracketed items are context, and are message
+#. strings elsewhere.  Translate only the words "and" here.
+#: libnautilus-extensions/nautilus-search-uri.c:561
+msgid ""
+"[Items larger than 400K], [owned by root and without all the words \"apple "
+"orange\"]"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:1
+#. The beginning of the description of a search that has just been
+#. performed.  The "%s" here is a description of a single criterion,
+#. which in english might be "that contain the word 'foo'"
+#: libnautilus-extensions/nautilus-search-uri.c:591
 #, c-format
 msgid "Items %s"
 msgstr "Elementy %s"
 
-#: libnautilus-extensions/nautilus-search-uri.c:1
-#, c-format
-msgid "Items %s %s"
-msgstr "Elementy %s %s"
-
-#: libnautilus-extensions/nautilus-search-uri.c:1
+#: libnautilus-extensions/nautilus-search-uri.c:701
 msgid "Items containing \"stuff\" in their names"
 msgstr "Elementy maj±ce w nazwie \"stuff\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:1
+#: libnautilus-extensions/nautilus-search-uri.c:703
+#, fuzzy
+msgid "Items that are regular files"
+msgstr "zwyk³e pliki"
+
+#: libnautilus-extensions/nautilus-search-uri.c:706
 msgid "Items containing \"stuff\" in their names and that are regular files"
 msgstr "Elementy maj±ce \"stuff\" w nazwie i bêd±ce zwyk³ymi plikami"
 
-#: libnautilus-extensions/nautilus-search-uri.c:1
+#: libnautilus-extensions/nautilus-search-uri.c:710
 msgid ""
 "Items containing \"stuff\" in their names, that are regular files and "
 "smaller than 2000 bytes"
@@ -5249,340 +6448,366 @@ msgstr ""
 "Elementy maj±ce \"stuff\" w nazwie i bêd±ce zwyk³ymi plikami mniejszymi od "
 "2000 bajtów."
 
-#: libnautilus-extensions/nautilus-search-uri.c:1
+#: libnautilus-extensions/nautilus-search-uri.c:714
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Elementy maj±ce \"medusa\" w nazwie i bêd±ce folderami"
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:1
-msgid "Warning"
-msgstr "Ostrze¿enie"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:1
-#: libnautilus-extensions/nautilus-stock-dialogs.c:1
-msgid "Error"
-msgstr "B³±d"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:1
-msgid "Details"
-msgstr "Szczegó³y"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:1
-msgid "Question"
-msgstr "Pytanie"
-
-#: libnautilus-extensions/nautilus-trash-directory.c:1
+#: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr "Przeszukiwane dysków"
 
-#: libnautilus-extensions/nautilus-trash-directory.c:1
-msgid "Nautilus is searching for trash folders."
+#: libnautilus-extensions/nautilus-trash-directory.c:74
+msgid "Nautilus is searching your disks for trash folders."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-trash-file.c:725
+msgid "on the desktop"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-undo-signal-handlers.c:1
+#: libnautilus-extensions/nautilus-undo-signal-handlers.c:175
 msgid "Edit"
 msgstr "Edycja"
 
-#: libnautilus-extensions/nautilus-undo-signal-handlers.c:1
+#: libnautilus-extensions/nautilus-undo-signal-handlers.c:176
 msgid "Undo Edit"
 msgstr "Cofnij zmiany"
 
-#: libnautilus-extensions/nautilus-undo-signal-handlers.c:1
+#: libnautilus-extensions/nautilus-undo-signal-handlers.c:177
 msgid "Undo the edit"
 msgstr "Cofa zmiany"
 
-#: libnautilus-extensions/nautilus-undo-signal-handlers.c:1
+#: libnautilus-extensions/nautilus-undo-signal-handlers.c:178
 msgid "Redo Edit"
 msgstr "Ponów zmiany"
 
-#: libnautilus-extensions/nautilus-undo-signal-handlers.c:1
+#: libnautilus-extensions/nautilus-undo-signal-handlers.c:179
 msgid "Redo the edit"
 msgstr "Poniawia zmiany"
 
-#: libnautilus-extensions/nautilus-user-level-manager.c:1
-msgid "Beginner"
-msgstr "Pocz±tkuj±cy"
+#: libnautilus-extensions/nautilus-view-identifier.c:61
+#, c-format
+msgid "View as %s"
+msgstr "Wy¶wietlanie jako %s"
 
-#: libnautilus-extensions/nautilus-user-level-manager.c:1
-msgid "Intermediate"
-msgstr "¦redniozaawansowany"
+#: libnautilus-extensions/nautilus-view-identifier.c:64
+#, c-format
+msgid "%s Viewer"
+msgstr "Przegl±darka %s"
 
-#: libnautilus-extensions/nautilus-user-level-manager.c:1
-msgid "Advanced"
-msgstr "Zaawansowany"
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+#, fuzzy
+msgid "Unknown"
+msgstr "nieznane"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
-msgid "Audio CD"
+#. Populate table with items we know localized names for.
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
+msgid "Floppy"
+msgstr "Dyskietka"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
+msgid "CD-ROM"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
-msgid "Mount Error"
-msgstr "B³±d przy montowaniu"
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
+msgid "Zip Drive"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
-msgid "Unmount Error"
-msgstr "B³±d przy odmontowywaniu"
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
+msgid "Audio CD"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
+msgid "is write-protected, mounting read-only"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "nie jest poprawnym urz±dzeniem blokowym"
 
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
+msgid "No medium found"
+msgstr ""
+
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
 msgstr ""
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
+#. FIXME: Should we parse this message and report something more meaningful?
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr "B³±d przy montowaniu"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr "B³±d przy odmontowywaniu"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "Wolumin ISO 9660"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Wolumin ext2"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "Wolumin MSDOS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "Wolumin NFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
-msgid "Floppy"
-msgstr "Dyskietka"
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
+#, fuzzy
+msgid "ReiserFS Volume"
+msgstr "Wolumin NFS"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
+#, fuzzy
+msgid "UFS Volume"
+msgstr "Wolumin NFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "Nieznany wolumin"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:1
+#: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:5
 msgid "C_lear Text"
 msgstr "Wy_czy¶æ tekst"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:1
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "Wy_czy¶æ tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "_Kopiuj tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "Kopiuje zaznaczony tekst do schowka"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:1
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "_Wytnij tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+msgid "Cut _Text"
+msgstr "_Wytnij tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "Wycina zaznaczony tekst do schowka"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:1
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "Wk_lej tekst"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "Wkleja tekst zapisany w schowku"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:1
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "Usuwa zaznaczony tekst bez umieszczania go w schowku"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:1
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "Zaznacz _wszystko"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+#, fuzzy
+msgid "Select _All"
+msgstr "Zaznacz _wszystko"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "Zaznacza wszystkie elementy w bie¿±cym oknie"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "_Kopiuj tekst"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:1
-msgid "_Cut Text"
-msgstr "_Wytnij tekst"
-
-#: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:1
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "Wk_lej tekst"
 
+#. The copyright character in here is correct for
+#. * Latin-1 encoding, but not for UTF-8, so we have
+#. * to change it when we upgrade to GTK 2.0.
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: src/Nautilus_shell.oaf.in.h:1
-msgid "Factory for Nautilus shell and file manager"
-msgstr ""
-
-#: src/Nautilus_shell.oaf.in.h:1
-msgid "Icons"
-msgstr "Ikony"
-
-#: src/Nautilus_shell.oaf.in.h:1
-msgid "List"
-msgstr "Lista"
-
-#: src/Nautilus_shell.oaf.in.h:1
-msgid "Nautilus factory"
-msgstr ""
-
-#: src/Nautilus_shell.oaf.in.h:1
-msgid "Nautilus file manager component that shows a scrollable list"
-msgstr ""
-
-#: src/Nautilus_shell.oaf.in.h:1
-msgid ""
-"Nautilus file manager component that shows a scrollable list for search "
-"results"
-msgstr ""
-
-#: src/Nautilus_shell.oaf.in.h:1
-msgid "Nautilus file manager component that shows a two-dimensional icon space"
-msgstr ""
-
-#: src/Nautilus_shell.oaf.in.h:1
-msgid "Nautilus file manager component that shows icons on the the desktop"
-msgstr ""
-
-#: src/Nautilus_shell.oaf.in.h:1
-msgid "Nautilus file manager desktop icon view"
-msgstr ""
-
-#: src/Nautilus_shell.oaf.in.h:1
-msgid "Nautilus file manager icon view"
-msgstr ""
-
-#: src/Nautilus_shell.oaf.in.h:1
-msgid "Nautilus file manager list view"
-msgstr ""
-
-#: src/Nautilus_shell.oaf.in.h:1
-msgid "Nautilus file manager search results list view"
-msgstr ""
-
-#: src/Nautilus_shell.oaf.in.h:1
-msgid "Nautilus shell"
-msgstr "Pow³oka Nautilusa"
-
-#: src/Nautilus_shell.oaf.in.h:1
-msgid ""
-"Nautilus shell operations that can be done from subsequent command-line "
-"invocations"
-msgstr ""
+#: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
+#: src/nautilus-window-menus.c:610
+msgid "Nautilus"
+msgstr "Nautilus"
 
-#: src/Nautilus_shell.oaf.in.h:1
-msgid "Search List"
+#: nautilus.desktop.in.h:2
+msgid "Nautilus File Manager and Graphic Shell"
 msgstr ""
 
-#: src/file-manager/fm-desktop-icon-view.c:1
-#: src/file-manager/fm-desktop-icon-view.c:1
-#, c-format
-msgid "Link to %s"
-msgstr "dowi±zanie do %s"
-
-#: src/file-manager/fm-desktop-icon-view.c:1
-msgid "Link to Unknown"
-msgstr "Dowi±zanie do nieznanego elementu"
-
-#: src/file-manager/fm-desktop-icon-view.c:1
+#. Note to translators: If it's hard to compose a good home
+#. * icon name from the user name, you can use a string without
+#. * an "%s" here, in which case the home icon name will not
+#. * include the user's name, which should be fine. To avoid a
+#. * warning, put "%.0s" somewhere in the string, which will
+#. * match the user name string passed by the C code, but not
+#. * put the user name in the final string.
+#.
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr "Folder u¿ytkownika %s"
 
-#: src/file-manager/fm-desktop-icon-view.c:1
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "Opró¿nij ¶mietnik..."
 
-#: src/file-manager/fm-desktop-icon-view.c:1
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:1
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/fm-desktop-icon-view.c:1177
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "Opró¿nij ¶mietnik"
 
-#: src/file-manager/fm-desktop-icon-view.c:1
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "Odmontuj wolumin"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr ""
 "To spowoduje otwarcie %d niezale¿nych okien. Czy na pewno chcesz to zrobiæ?"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Otworzyæ %d okien?"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr "Czy na pewno chcesz trwale usun±æ \"%s\" ze ¶mietnika?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+"Czy na pewno chcesz trwale usun±æ %d zaznaczonych elementów ze ¶mietnika?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Usuñ"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Usuñ"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+#, fuzzy
+msgid "scripts"
+msgstr "Opis"
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "Zaznaczono \"%s\""
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "Zaznaczono 1 folder"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "Zaznaczono %d folderów"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr " (zawarto¶æ: 0 elementów)"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr " (zawarto¶æ: 1 element)"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr " (zawarto¶æ: %d elementów)"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "Zaznaczono \"%s\" (%s)"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "Zaznaczono %d elementów (%s)"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr ""
@@ -5594,168 +6819,323 @@ msgstr ""
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
 
-#: src/file-manager/fm-directory-view.c:1
+#. Note that the number of items actually displayed varies somewhat due
+#. * to the way files are collected in batches. So you can't assume that
+#. * no more than the constant limit are displayed.
+#.
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Only the "
-"first %d files will be displayed."
+"The folder \"%s\" contains more files than Nautilus can handle. Some files "
+"will not be displayed."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "Zbyt wiele plików"
 
-#: src/file-manager/fm-directory-view.c:1
-#, c-format
+#: src/file-manager/fm-directory-view.c:2752
+#, fuzzy, c-format
 msgid ""
-"\"%s\" cannot be moved to the trash. Do you want to delete it immediately?"
+"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
 msgstr ""
 "Nie mo¿na przenie¶æ \"%s\" do ¶mietnika. Czy chcesz go trwale usun±æ w tej "
 "chwili?"
 
-#: src/file-manager/fm-directory-view.c:1
-#, c-format
+#: src/file-manager/fm-directory-view.c:2757
+#, fuzzy, c-format
 msgid ""
-"The %d selected items cannot be moved to the trash. Do you want to delete "
+"The %d selected items cannot be moved to the Trash. Do you want to delete "
 "them immediately?"
 msgstr ""
 "Nie mo¿na przenie¶æ do ¶mietnika %d zaznaczonych elementów. Czy chcesz je "
 "trwale usun±æ w tej chwili?"
 
-#: src/file-manager/fm-directory-view.c:1
-#, c-format
+#: src/file-manager/fm-directory-view.c:2761
+#, fuzzy, c-format
 msgid ""
-"%d of the selected items cannot be moved to the trash. Do you want to delete "
+"%d of the selected items cannot be moved to the Trash. Do you want to delete "
 "those %d items immediately?"
 msgstr ""
 "Nie mo¿na przenie¶æ do ¶mietnika %d spo¶ród zaznaczonych elementów. Czy "
 "chcesz trwale usun±æ w tej chwili %d elementów?"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "Usun±æ w tej chwili?"
 
-#: src/file-manager/fm-directory-view.c:1
-#: src/file-manager/fm-directory-view.c:1
-msgid "Delete"
-msgstr "Usuñ"
-
-#: src/file-manager/fm-directory-view.c:1
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
+#: src/file-manager/fm-directory-view.c:2799
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr "Czy na pewno chcesz trwale usun±æ \"%s\" ze ¶mietnika?"
 
-#: src/file-manager/fm-directory-view.c:1
-#, c-format
+#: src/file-manager/fm-directory-view.c:2803
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"trash?"
+"Trash?"
 msgstr ""
 "Czy na pewno chcesz trwale usun±æ %d zaznaczonych elementów ze ¶mietnika?"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "Usun±æ ze ¶mietnika?"
 
-#: src/file-manager/fm-directory-view.c:1
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "Inna _aplikacja..."
+
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "Inna _aplikacja..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "Inna p_rzegl±darka..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "Inna p_rzegl±darka..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "Zaznaczono \"%s\" (%s)"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
 #, c-format
-msgid "%s Viewer"
-msgstr "Przegl±darka %s"
+msgid "Nautilus was unable to create the directory %s."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1
-msgid "Open in _New Window"
-msgstr "Otwórz w _nowym oknie"
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:3693
 #, c-format
-msgid "Open in %d _New Windows"
-msgstr "Otwórz w %d _nowych oknach"
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1
-msgid "Delete all selected items permanently"
-msgstr "Usuñ trwale wszystkie zaznaczone elementy"
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"Nie mo¿na przenie¶æ do ¶mietnika %d zaznaczonych elementów. Czy chcesz je "
+"trwale usun±æ w tej chwili?"
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "Otwórz w nowym oknie"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#, fuzzy
+msgid "Open _in New Window"
+msgstr "Otwórz w nowym oknie"
+
+#: src/file-manager/fm-directory-view.c:3959
+#, fuzzy, c-format
+msgid "Open _in %d New Windows"
+msgstr "Otwórz w %d _nowych oknach"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "Usuñ ze ¶_mietnika..."
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "Usuñ ze ¶_mietnika"
 
-#: src/file-manager/fm-directory-view.c:1
-msgid "Move all selected items to the Trash"
-msgstr "Przenie¶ wszystkie zaznaczone elementy do ¶mietnika"
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "Usuñ trwale wszystkie zaznaczone elementy"
 
-#: src/file-manager/fm-directory-view.c:1
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "Przenie¶ do ¶_mietnika"
 
-#: src/file-manager/fm-directory-view.c:1
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "Przenie¶ wszystkie zaznaczone elementy do ¶mietnika"
+
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "Usuñ"
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "Usuñ"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "Utwórz o_dno¶niki"
 
-#: src/file-manager/fm-directory-view.c:1
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "Utwórz o_dno¶nik"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "_Opró¿nij ¶mietnik..."
 
-#: src/file-manager/fm-directory-view.c:1
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "_Opró¿nij ¶mietnik"
 
-#: src/file-manager/fm-directory-view.c:1
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "U_suñ obrazy u¿ytkownika"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "U_suñ obraz u¿ytkownika"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "_Plik"
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u plików"
+
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "_Kopiuj tekst"
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "Kopiowanie plików"
+
+#: src/file-manager/fm-directory-view.c:4252
+#, fuzzy
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
-"link in the trash?"
+"link in the Trash?"
 msgstr ""
 "Odno¶nik nie mo¿e zostaæ u¿yty, poniewa¿ nie ma on przypisanego celu. Czy "
 "chcesz umie¶ciæ ten odno¶nik w ¶mietniku?"
 
-#: src/file-manager/fm-directory-view.c:1
-#, c-format
+#: src/file-manager/fm-directory-view.c:4255
+#, fuzzy, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to put this link in the trash?"
+"want to put this link in the Trash?"
 msgstr ""
 "Odno¶nik nie mo¿e zostaæ u¿yty, poniewa¿ przypisany mu cel \"%s\" nie "
 "istnieje. Czy chcesz umie¶ciæ ten odno¶nik w ¶mietniku?"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "Uszkodzony odno¶nik"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:4315
+#, c-format
+msgid ""
+"\"%s\" is an executable text file. Do you want to run it, or display its "
+"contents?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4321
+#, fuzzy
+msgid "Run or Display?"
+msgstr "Wy¶wietlanie"
+
+#: src/file-manager/fm-directory-view.c:4322
+msgid "Run"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4323
+msgid "Display"
+msgstr "Wy¶wietlanie"
+
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
@@ -5763,37 +7143,58 @@ msgstr ""
 "Niestety, ze wzglêdu na bezpieczeñstwo nie mo¿na wykonywaæ poleceñ ze "
 "zdalnych adresów."
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "Nie mo¿na wykonywaæ zdalnych odno¶ników"
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr "Otwieranie \"%s\""
 
-#: src/file-manager/fm-directory-view.c:1
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "Anulowaæ otwarcie?"
 
-#: src/file-manager/fm-error-reporting.c:1
+#: src/file-manager/fm-error-reporting.c:58
+#, fuzzy, c-format
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
+msgstr "Brak wymaganych uprawnieñ, aby wy¶wietliæ \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
+#, fuzzy, c-format
+msgid "Sorry, couldn't display all the contents of \"%s\"."
+msgstr "Niestety, nie mo¿na zmieniæ w³a¶ciciela \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:72
+#, fuzzy
+msgid "Error Displaying Folder"
+msgstr "Podczas tworzenia nowego folderu wyst±pi³ b³±d"
+
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "Nazwa \"%s\" zosta³a ju¿ u¿yta w folderze. U¿yj innej nazwy."
 
-#: src/file-manager/fm-error-reporting.c:1
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:1
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Brak uprawnieñ potrzebnych do zmiany nazwy \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:1
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -5802,240 +7203,260 @@ msgstr ""
 "Nazwa \"%s\" nie jest poprawna, poniewa¿ zawiera znak \"/\". U¿yj innej "
 "nazwy."
 
-#: src/file-manager/fm-error-reporting.c:1
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Nazwa \"%s\" nie jest poprawna. U¿yj innej nazwy."
 
-#. fall through
-#: src/file-manager/fm-error-reporting.c:1
+#: src/file-manager/fm-error-reporting.c:128
+#, fuzzy, c-format
+msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
+msgstr ""
+"B³±d podczas przenoszenia.\n"
+"\n"
+"Nie mo¿na przenie¶æ \"%s\" poniewa¿ jest on na dysku tylko do odczytu."
+
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Niestety, nie mo¿na zmieniæ nazwy \"%s\" na \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:1
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "B³±d przy zmianie nazwy"
 
-#: src/file-manager/fm-error-reporting.c:1
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Brak uprawnieñ do zmiany grupy \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:1
+#: src/file-manager/fm-error-reporting.c:168
+#, fuzzy, c-format
+msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
+msgstr ""
+"B³±d podczas przenoszenia.\n"
+"\n"
+"Nie mo¿na przenie¶æ \"%s\" poniewa¿ jest on na dysku tylko do odczytu."
+
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Niestety, nie mo¿na zmieniæ grupy \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:1
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "B³±d przy zmianie grupy"
 
-#: src/file-manager/fm-error-reporting.c:1
+#: src/file-manager/fm-error-reporting.c:202
+#, fuzzy, c-format
+msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
+msgstr ""
+"B³±d podczas przenoszenia.\n"
+"\n"
+"Nie mo¿na przenie¶æ \"%s\" poniewa¿ jest on na dysku tylko do odczytu."
+
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Niestety, nie mo¿na zmieniæ w³a¶ciciela \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:1
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "B³±d przy zmianie w³a¶ciciela"
 
-#: src/file-manager/fm-error-reporting.c:1
+#: src/file-manager/fm-error-reporting.c:234
+#, fuzzy, c-format
+msgid ""
+"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgstr "Niestety, nie mo¿na zmieniæ uprawnieñ \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Niestety, nie mo¿na zmieniæ uprawnieñ \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:1
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "B³±d przy zmianie uprawnieñ"
 
-#: src/file-manager/fm-error-reporting.c:1
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Zmienianie nazwy \"%s\" na \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:1
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "Anulowaæ zmianê nazwy?"
 
-#: src/file-manager/fm-icon-text-window.c:1
+#: src/file-manager/fm-icon-text-window.c:77
 msgid "size"
 msgstr "rozmiar"
 
-#: src/file-manager/fm-icon-text-window.c:1
+#: src/file-manager/fm-icon-text-window.c:78
 msgid "type"
 msgstr "typ"
 
-#: src/file-manager/fm-icon-text-window.c:1
+#: src/file-manager/fm-icon-text-window.c:79
 msgid "date modified"
 msgstr "data modyfikacji"
 
-#: src/file-manager/fm-icon-text-window.c:1
+#: src/file-manager/fm-icon-text-window.c:80
 msgid "date changed"
 msgstr "data zmiany"
 
-#: src/file-manager/fm-icon-text-window.c:1
+#: src/file-manager/fm-icon-text-window.c:81
 msgid "date accessed"
 msgstr "data dostêpu"
 
-#: src/file-manager/fm-icon-text-window.c:1
+#: src/file-manager/fm-icon-text-window.c:82
 msgid "owner"
 msgstr "w³a¶ciciel"
 
-#: src/file-manager/fm-icon-text-window.c:1
+#: src/file-manager/fm-icon-text-window.c:83
 msgid "group"
 msgstr "grupa"
 
-#: src/file-manager/fm-icon-text-window.c:1
+#: src/file-manager/fm-icon-text-window.c:84
 msgid "permissions"
 msgstr "uprawnienia"
 
-#: src/file-manager/fm-icon-text-window.c:1
+#: src/file-manager/fm-icon-text-window.c:85
 msgid "octal permissions"
 msgstr "ósemkowe uprawnienia"
 
-#: src/file-manager/fm-icon-text-window.c:1
+#: src/file-manager/fm-icon-text-window.c:86
 msgid "MIME type"
 msgstr "Typ MIME"
 
-#: src/file-manager/fm-icon-text-window.c:1
+#: src/file-manager/fm-icon-text-window.c:87
 msgid "none"
 msgstr "brak"
 
-#: src/file-manager/fm-icon-text-window.c:1
+#: src/file-manager/fm-icon-text-window.c:263
 msgid "Icon Captions"
 msgstr "Podpisy ikon"
 
-#: src/file-manager/fm-icon-text-window.c:1
+#: src/file-manager/fm-icon-text-window.c:271
 msgid ""
 "Choose the order for information to appear beneath icon names. More "
 "information appears as you zoom in closer."
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:1
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "wed³ug _nazwy"
 
-#: src/file-manager/fm-icon-view.c:1
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/fm-icon-view.c:169
+#: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "Wy¶wietla ikony uporz±dkowane w wierszach wed³ug nazw"
 
-#: src/file-manager/fm-icon-view.c:1
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "wed³ug _rozmiaru"
 
-#: src/file-manager/fm-icon-view.c:1
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/fm-icon-view.c:176
+#: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "Wy¶wietla ikony uporz±dkowane w wierszach wed³ug rozmiarów"
 
-#: src/file-manager/fm-icon-view.c:1
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "wed³ug _typu"
 
-#: src/file-manager/fm-icon-view.c:1
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/fm-icon-view.c:183
+#: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "Wy¶wietla ikony uporz±dkowane w wierszach wed³ug typów"
 
-#: src/file-manager/fm-icon-view.c:1
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "wed³ug _daty modyfikacji"
 
-#: src/file-manager/fm-icon-view.c:1
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/fm-icon-view.c:190
+#: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Wy¶wietla ikony uporz±dkowane w wierszach wed³ug dat modyfikacji"
 
-#: src/file-manager/fm-icon-view.c:1
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "wed³ug _symboli"
 
-#: src/file-manager/fm-icon-view.c:1
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/fm-icon-view.c:197
+#: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Wy¶wietla ikony uporz±dkowane w wierszach wed³ug symboli"
 
-#: src/file-manager/fm-icon-view.c:1
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/fm-icon-view.c:1241
+#: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "Przywróæ p_ierwotny rozmiar ikon"
 
-#: src/file-manager/fm-icon-view.c:1
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "Przywróæ p_ierwotny rozmiar ikony"
 
-#: src/file-manager/fm-icon-view.c:1
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "Wskazanie \"%s\""
 
-#. Menu item to search by file size in e.g. "Size larger than 500K"
-#: src/file-manager/fm-list-view.c:1
-#: src/file-manager/fm-search-list-view.c:1
-#: src/nautilus-search-bar-criterion.c:1
+#: src/file-manager/fm-list-view.c:2188
+#: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Rozmiar"
 
-#. Menu item to search by file type in e.g. "Type is music"
-#: src/file-manager/fm-list-view.c:1
-#: src/file-manager/fm-search-list-view.c:1
-#: src/nautilus-search-bar-criterion.c:1
+#: src/file-manager/fm-list-view.c:2194
+#: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Typ"
 
-#: src/file-manager/fm-list-view.c:1
-#: src/file-manager/fm-search-list-view.c:1
+#: src/file-manager/fm-list-view.c:2200
+#: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Czas modyfikacji"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:522
 #, c-format
 msgid "%s Properties"
 msgstr "W³a¶ciwo¶ci %s"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:717
 msgid "Cancel Group Change?"
 msgstr "Anuowaæ zmianê grupy?"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:718
 msgid "Changing group"
 msgstr "Zmienianie grupy"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:879
 msgid "Cancel Owner Change?"
 msgstr "Anulowaæ zmianê w³a¶ciciela?"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:880
 msgid "Changing owner"
 msgstr "Zmienianie w³a¶ciciela"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1063
 msgid "nothing"
 msgstr "nic"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1065
 msgid "unreadable"
 msgstr "nieodczytywalny"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1074
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 element o rozmiarze %s"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1076
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d elementów, ogó³em %s"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1082
 msgid "(some contents unreadable)"
 msgstr "(czê¶æ zawarto¶ci nieodczytywalna)"
 
@@ -6044,183 +7465,333 @@ msgstr "(czê¶æ zawarto¶ci nieodczytywalna)"
 #. * "Contents:" title to line up with the first line of the 2-line value.
 #. * Maybe there's a better way to do this, but I couldn't think of one.
 #.
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1096
 msgid "Contents:"
 msgstr "Zawarto¶æ:"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "Proste"
 
-#: src/file-manager/fm-properties-window.c:1
-msgid "Where:"
-msgstr "Po³o¿enie:"
-
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "Zbiory odno¶ników"
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
+msgstr "Typ MIME:"
+
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "Modyfikacja:"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "Dostêp:"
 
-#: src/file-manager/fm-properties-window.c:1
-msgid "MIME type:"
-msgstr "Typ MIME:"
-
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr "Wybierz w³asn± ikonê..."
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1558
 msgid "Remove Custom Icon"
 msgstr "Usuñ w³asn± ikonê"
 
-#: src/file-manager/fm-properties-window.c:1
-msgid "Special Flags:"
-msgstr "Specjalne znaczniki:"
-
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "Ustawianie ID u¿ytkownika"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1891
+msgid "Special Flags:"
+msgstr "Specjalne znaczniki:"
+
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "Ustawianie ID grupy"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "Przyklejone"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Nie bêd±c w³a¶cicielem nie mo¿esz zmieniæ tych uprawnieñ."
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "W³a¶ciciel pliku:"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "W³a¶ciciel grupowy:"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "W³a¶ciciel:"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "Grupa:"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "Inni:"
 
-#: src/file-manager/fm-properties-window.c:1
-msgid "Text View:"
-msgstr "Zapis tekstowy:"
-
-#: src/file-manager/fm-properties-window.c:1
-msgid "Number View:"
-msgstr "Zapis liczbowy:"
-
-#: src/file-manager/fm-properties-window.c:1
-msgid "Last Changed:"
-msgstr "Ostatnia zmiana:"
-
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "Odczyt"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "Zapis"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "Wykonanie"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:2048
+msgid "Text View:"
+msgstr "Zapis tekstowy:"
+
+#: src/file-manager/fm-properties-window.c:2049
+msgid "Number View:"
+msgstr "Zapis liczbowy:"
+
+#: src/file-manager/fm-properties-window.c:2050
+msgid "Last Changed:"
+msgstr "Ostatnia zmiana:"
+
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Nie mo¿na okre¶liæ uprawnieñ \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr "Anulowaæ wy¶wietlenie okna w³a¶ciwo¶ci?"
 
-#: src/file-manager/fm-properties-window.c:1
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr "Tworzenie okna w³a¶ciwo¶ci"
 
-#: src/file-manager/fm-properties-window.c:1
-#: src/nautilus-property-browser.c:1 src/nautilus-property-browser.c:1
-#: src/nautilus-property-browser.c:1
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
-msgstr "nistety, \"%s\" nie jest plikiem zawieraj±cym obraz!"
+#: src/file-manager/fm-properties-window.c:2435
+#, fuzzy
+msgid "Select an icon:"
+msgstr "Wybierz nowy kolor:"
 
-#: src/file-manager/fm-properties-window.c:1
-msgid "Select an image to represent the file:"
-msgstr "Wybór obrazu reprezentuj±cego plik:"
+#: src/file-manager/fm-search-list-view.c:124
+msgid "Search Results"
+msgstr "Wyniki przeszukiwania"
 
-#: src/file-manager/fm-search-list-view.c:1
+#: src/file-manager/fm-search-list-view.c:142
 #, c-format
 msgid ""
 "Search results may not include items modified after %s, when your drive was "
 "last indexed."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:1
-msgid "Search Results"
-msgstr "Wyniki przeszukiwania"
+#: src/file-manager/fm-search-list-view.c:158
+#, fuzzy
+msgid ""
+"Sorry, but the Medusa search service is not available because it is not "
+"installed."
+msgstr "Us³uga wyszukiwania nie jest dostêpna."
+
+#: src/file-manager/fm-search-list-view.c:159
+#: src/file-manager/nautilus-indexing-info.c:407
+msgid "Search Service Not Available"
+msgstr "Us³uga wyszukiwania nie jest dostêpna"
 
 #. FIXME bugzilla.eazel.com 5058: Should be two messages, one for each of whether
 #. "slow complete search" turned on or not
-#: src/file-manager/fm-search-list-view.c:1
+#: src/file-manager/fm-search-list-view.c:184
 msgid ""
 "The search you have selected is newer than the index on your system.  The "
 "search will return no results right now.  Would you like to create a new "
 "index now?"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:1
+#: src/file-manager/fm-search-list-view.c:189
 msgid "Search for items that are too new"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:1
+#: src/file-manager/fm-search-list-view.c:190
 msgid "Create a new index"
 msgstr "Utwóz nowy indeks"
 
-#: src/file-manager/fm-search-list-view.c:1
+#: src/file-manager/fm-search-list-view.c:191
 msgid "Don't create index"
 msgstr "Nie twórz indeksu"
 
-#: src/file-manager/fm-search-list-view.c:1
+#: src/file-manager/fm-search-list-view.c:200
 msgid ""
 "Every indexed file on your computer matches the criteria you selected. You "
 "can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:1
+#: src/file-manager/fm-search-list-view.c:204
+#: src/file-manager/fm-search-list-view.c:218
+#, fuzzy
+msgid "Error during search"
+msgstr "B³±d przy zmianie w³a¶ciciela"
+
+#: src/file-manager/fm-search-list-view.c:213
 #, c-format
 msgid "An error occurred while loading this search's contents: %s"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:1
+#: src/file-manager/fm-search-list-view.c:241
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Find can't access your index right now so a slower search will be performed "
+"that doesn't use the index."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:246
+msgid ""
+"To do a content search, Find requires an index of the files on your system.  "
+"Find can't access your index right now. "
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast searches are not available"
+msgstr "Us³uga wyszukiwania nie jest dostêpna"
+
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:319
+#: src/file-manager/fm-search-list-view.c:338
+#, fuzzy
+msgid "Content searches are not available"
+msgstr "Us³uga wyszukiwania nie jest dostêpna"
+
+#: src/file-manager/fm-search-list-view.c:254
+msgid ""
+"Your index files are available but the Medusa search daemon, which handles "
+"index requests, isn't running.  To start this program, log in as root and "
+"enter this command at the command line: medusa-searchd"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:274
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Your computer does not have an index right now.  Because Find cannot use an "
+"index, this search may take several minutes.  Would you like to create an "
+"index? Creating an index will be done while you are not actively using your "
+"computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:283
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  Your computer does not have an index right now.  Would you like to "
+"create an index?  Creating an index will be done while you are not actively "
+"using your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:290
+#: src/file-manager/fm-search-list-view.c:318
+#: src/file-manager/fm-search-list-view.c:337
+#, fuzzy
+msgid "Indexed searches are not available"
+msgstr "Us³uga wyszukiwania nie jest dostêpna"
+
+#: src/file-manager/fm-search-list-view.c:294
+#, fuzzy
+msgid "Create an Index"
+msgstr "Utwóz nowy indeks"
+
+#: src/file-manager/fm-search-list-view.c:295
+#, fuzzy
+msgid "Don't Create an Index Now"
+msgstr "Nie twórz indeksu"
+
+#: src/file-manager/fm-search-list-view.c:306
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Your computer is currently creating that index.   Because Find cannot use an "
+"index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:312
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  Your computer is currently creating that index.  Content searches "
+"will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:326
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  An "
+"index can't be created right now. When an index is not available, searches "
+"will take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:332
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  An index can't be created right now."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:341
+msgid ""
+"The program that creates an index is not set up correctly.  You can create "
+"an index by hand by running \"medusa-indexd\" as root on the command line."
+msgstr ""
+
+#. It is not necessary to translate this text just yet; it has not been
+#. edited yet, and will be replaced by a final copy in a few days.
+#: src/file-manager/fm-search-list-view.c:360
+#: src/file-manager/nautilus-indexing-info.c:342
+msgid ""
+"To do a fast search, Find requires an index of the files on your system. "
+"Your system administrator has disabled fast search on your computer, so no "
+"index is available."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:364
+msgid "Fast searches are not available on your computer"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:373
+#: src/file-manager/nautilus-indexing-info.c:361
+msgid ""
+"To do a fast search, Find requires an index of the files on your system. "
+"Fast search is disabled in your Search preferences, so no index is available."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:376
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
+msgid "Fast searches are not available on your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:377
+#: src/file-manager/nautilus-indexing-info.c:366
+msgid ""
+"To enable fast search, open the Preferences menu and choose Preferences. "
+"Then select Search preferences and put a checkmark in the Enable Fast Search "
+"checkbox. An index will be generated while your computer is idle, so your "
+"index won't be available immediately."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:551
 msgid "Where"
 msgstr "Po³o¿enie"
 
@@ -6229,8 +7800,8 @@ msgstr "Po³o¿enie"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:1
-#: src/file-manager/nautilus-search-list-view-ui.xml.h:1
+#: src/file-manager/fm-search-list-view.c:603
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "Wy¶wietl w nowym _oknie"
 
@@ -6240,458 +7811,588 @@ msgstr "Wy¶wietl w nowym _oknie"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:1
+#: src/file-manager/fm-search-list-view.c:611
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Wy¶wietl w %d nowych o_knach"
 
+#. Note that the number of items actually displayed varies somewhat due
+#. * to the way files are collected in batches. So you can't assume that
+#. * no more than the constant limit are displayed.
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
+#: src/file-manager/fm-search-list-view.c:723
+msgid ""
+"Nautilus found more search results than it can display. Some matching items "
+"will not be displayed. "
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:725
+#, fuzzy
+msgid "Too Many Matches"
+msgstr "Zbyt wiele plików"
+
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:1
 msgid "Change Desktop Background"
 msgstr "Zmieñ t³o biurka"
 
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:1
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
-msgid "Delete all items in the trash"
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#, fuzzy
+msgid "Delete all items in the Trash"
 msgstr "Usuwa wszystkie elementy ze ¶mietnika"
 
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
 msgid "Disks"
 msgstr "Dyski"
 
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:5
 msgid "Mount or unmount disks"
 msgstr ""
 
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:6
 msgid "New Terminal"
 msgstr "Nowy terminal"
 
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:7
 msgid "Open a new GNOME terminal window"
 msgstr "Otwiera nowe okno terminala GNOME"
 
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:8
 msgid "Remove any custom pattern or color from the desktop background"
 msgstr ""
 
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
 msgid "Reset Desktop Background"
 msgstr "Wyczy¶æ t³o biurka"
 
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:10
 msgid ""
 "Show a window that lets you set your desktop background's pattern or color"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: src/file-manager/nautilus-directory-view-ui.xml.h:1
 msgid "Choose a program with which to open the selected item"
 msgstr "Wybierz program, za pomoc± którego chcesz otworzyæ zaznaczony element"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:2
 msgid "Choose another application with which to open the selected item"
 msgstr ""
 "Wybierz inn± aplikacjê, za pomoc± której chcesz otworzyæ zaznaczony element"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:3
 msgid "Choose another viewer with which to view the selected item"
 msgstr ""
 "Wybierz inn± przegl±darkê, za pomoc± której chcesz wy¶wietliæ zaznaczony "
 "element"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
-msgid "Create Link"
-msgstr "Utwórz odno¶nik"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:4
+#, fuzzy
+msgid "Copy Files"
+msgstr "Kopiowanie plików"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "Tworzy nowy pusty folder w bie¿±cym"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "Tworzy dowi±zanie symboliczne do ka¿dego z zaznaczonych elementów"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u plików"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "Przenosi ka¿dy z zaznaczonych elementów do ¶mietnika"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "Zduplikuj"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "Duplikuje ka¿dy z zaznaczonych elementów"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
-msgid "Move each selected item to the trash"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "Utwórz odno¶nik"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#, fuzzy
+msgid "Move each selected item to the Trash"
 msgstr "Przenosi ka¿dy z zaznaczonych elementów do ¶mietnika"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Move to Trash"
 msgstr "Przenie¶ do ¶mietnika"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "Nowy folder"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
-msgid "New _Folder"
-msgstr "Nowy _folder"
-
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "Otwórz"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#, fuzzy
+msgid "Open Wit_h"
+msgstr "Otwórz za pomoc±"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "Otwórz za pomoc±"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "Otwiera ka¿dy z zaznaczonych elementów w nowym oknie"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr "Otwórz w nowym oknie"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Otwiera zaznaczony element w bie¿±cym oknie"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "Inna aplikacja..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "Inna przegl±darka..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
-msgid "Other _Application..."
-msgstr "Inna _aplikacja..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "pliki tekstowe"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
-msgid "Other _Viewer..."
-msgstr "Inna p_rzegl±darka..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr "Usuñ obrazy u¿ytkownika"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr "Usuwa jakiekolwiek obrazy u¿ytkownika przypisane zaznaczonym ikonom"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr ""
 
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
-#: src/nautilus-sidebar.c:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "Od¶wie¿ t³o"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+msgid "Scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr "Zaznacz wszystkie pliki"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#, fuzzy
+msgid "Select _All Files"
+msgstr "Zaznacz wszystkie pliki"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "Zaznacza wszystkie elementy w bie¿±cym oknie"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr "Wy¶wietl w³a¶ciwo¶ci"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Show Trash"
 msgstr "Wy¶wietl ¶mietnik"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "Wy¶wietl _w³a¶ciwo¶ci"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
-msgid "Show the contents of the trash"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#, fuzzy
+msgid "Show the contents of the Trash"
 msgstr "Wy¶wietla zawarto¶æ ¶mietnika"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "Wy¶wietla lub modyfikuje w³a¶ciwo¶ci ka¿dego z zaznaczonych elementów"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "_Zduplikuj"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#, fuzzy
+msgid "_New Folder"
+msgstr "Nowy folder"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "_Otwórz"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
-msgid "_Open in New Window"
-msgstr "_Otwórz w nowym oknie"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:1
-msgid "_Select All Files"
-msgstr "_Zaznacz wszystkie pliki"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "Wk_lej tekst"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
+#, fuzzy
+msgid "_Show Trash"
+msgstr "Wy¶wietl ¶mietnik"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#, fuzzy
+msgid "By Emblems"
+msgstr "wed³ug symboli"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:2
+#, fuzzy
+msgid "By Modification Date"
+msgstr "wed³ug daty modyfikacji"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:3
+#, fuzzy
+msgid "By Modification _Date"
+msgstr "wed³ug _daty modyfikacji"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:4
+#, fuzzy
+msgid "By Name"
+msgstr "wed³ug nazwy"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:5
+#, fuzzy
+msgid "By Size"
+msgstr "wed³ug rozmiaru"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:6
+#, fuzzy
+msgid "By Type"
+msgstr "wed³ug typu"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:7
+#, fuzzy
+msgid "By _Emblems"
+msgstr "wed³ug _symboli"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:8
+#, fuzzy
+msgid "By _Name"
+msgstr "wed³ug _nazwy"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:9
+#, fuzzy
+msgid "By _Size"
+msgstr "wed³ug _rozmiaru"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:10
+#, fuzzy
+msgid "By _Type"
+msgstr "wed³ug _typu"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:11
 msgid "Choose which information appears beneath each icon's name"
 msgstr "Wybierz informacje pojawiaj±ce siê pod nazw± ikony"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:12
 msgid "Clean Up by Name"
 msgstr "Uporz±dkuj wed³ug nazwy"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:13
 msgid "Display icons in the opposite order"
 msgstr "Wy¶wietla ikony w odwrotnym porz±dku"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:14
 msgid "Icon Captions..."
 msgstr "Podpisy ikon..."
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
-msgid "Lay out items"
+#: src/file-manager/nautilus-icon-view-ui.xml.h:20
+#, fuzzy
+msgid "Lay Out Items"
 msgstr "Uk³ad elementów"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:21
 msgid "Leave icons wherever they are dropped"
 msgstr "Pozostawia ikony w miejscu ich opuszczenia"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:22
 msgid "Make the selected icon stretchable"
 msgstr "Daje mo¿liwo¶æ zmiany rozmiaru zaznaczonej ikony"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:23
+#, fuzzy
+msgid "Manually"
+msgstr "rêcznie"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:24
 msgid "Re_versed Order"
 msgstr "Odw_rócona kolejno¶æ"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:26
 msgid "Rename selected icon"
 msgstr "Zmienia nazwê zaznaczonej ikony"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:27
 msgid "Reposition icons to better fit in the window and avoid overlapping"
 msgstr ""
 "Przemieszcza ikony, aby lepiej dopasowaæ ich ikon do okna i unikn±æ "
 "nak³adania"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:28
 msgid "Restore Icons' Original Sizes"
 msgstr "Przywróæ pierwotny rozmiar ikon"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:29
 msgid "Restore each selected icon to its original size"
 msgstr "Przywraca pierwotny rozmiar ka¿dej z ikon"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:30
 msgid "Reversed Order"
 msgstr "Odwrócona kolejno¶æ"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:31
 msgid "Stretch Icon"
 msgstr "Zmieñ rozmiar ikony"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:32
 msgid "Tighter Layout"
 msgstr "Cia¶niejszy uk³ad"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:33
 msgid "Toggle using a tighter layout scheme"
 msgstr "Prze³±cza wykorzystywanie cia¶niejszego uk³adu"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:34
 msgid "_Clean Up by Name"
 msgstr "_Uporz±dkuj wed³ug nazwy"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:35
 msgid "_Icon Captions..."
 msgstr "Podpisy _ikon..."
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
-msgid "_Lay out items"
+#: src/file-manager/nautilus-icon-view-ui.xml.h:36
+#, fuzzy
+msgid "_Lay Out Items"
 msgstr "_Uk³ad elementów"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:37
+#, fuzzy
+msgid "_Manually"
+msgstr "_rêcznie"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:38
 msgid "_Rename"
 msgstr "_Zmieñ nazwê"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:40
 msgid "_Stretch Icon"
 msgstr "Zmieñ _rozmiar ikony"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#: src/file-manager/nautilus-icon-view-ui.xml.h:41
 msgid "_Tighter Layout"
 msgstr "_Cia¶niejszy uk³ad"
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
-msgid "_manually"
-msgstr "_rêcznie"
-
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
-msgid "by Emblems"
-msgstr "wed³ug symboli"
-
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
-msgid "by Modification Date"
-msgstr "wed³ug daty modyfikacji"
-
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
-msgid "by Name"
-msgstr "wed³ug nazwy"
-
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
-msgid "by Size"
-msgstr "wed³ug rozmiaru"
+#: src/file-manager/nautilus-indexing-info.c:85
+msgid "Indexing is %d%% complete."
+msgstr ""
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
-msgid "by Type"
-msgstr "wed³ug typu"
+#: src/file-manager/nautilus-indexing-info.c:175
+msgid "The indexer is currently busy."
+msgstr ""
 
-#: src/file-manager/nautilus-icon-view-ui.xml.h:1
-msgid "manually"
-msgstr "rêcznie"
+#: src/file-manager/nautilus-indexing-info.c:180
+msgid ""
+"An indexer is not running, or is not responding to requests to reindex your "
+"computer."
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:1
-msgid "Indexing is %d%% complete."
+#: src/file-manager/nautilus-indexing-info.c:185
+msgid ""
+"An attempt to reindex, caused an Internal Indexer Error.  Tell "
+"rebecka@eazel.com"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:1
-msgid "Error while trying to reindex: Busy"
-msgstr "B³±d podczas próby przeindeksowania: Zajêty"
+#: src/file-manager/nautilus-indexing-info.c:194
+#, fuzzy
+msgid "Reindexing Failed"
+msgstr "Wy¶wietlenie nie powiod³o siê"
 
-#: src/file-manager/nautilus-indexing-info.c:1
-msgid "Error while trying to reindex: No response"
-msgstr "B³±d podczas próby przeindeksowania: Brak odpowiedzi"
+#: src/file-manager/nautilus-indexing-info.c:216
+msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast. If you need to update your index now, click on the \"Update Now\" "
+"button."
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:1
-msgid "Error while trying to reindex: No indexer present"
-msgstr "B³±d podczas próby przeindeksowania: Brak programu indeksuj±cego"
+#: src/file-manager/nautilus-indexing-info.c:219
+#: src/file-manager/nautilus-indexing-info.c:226
+#: src/file-manager/nautilus-indexing-info.c:281
+#, fuzzy
+msgid "Indexing Status"
+msgstr "Wy¶wietl stan indeksowania"
 
-#: src/file-manager/nautilus-indexing-info.c:1
-msgid "Error While Reindexing"
-msgstr "B³±d podczas przeindeksowywania"
+#. FIXME: Do we want to talk about the index not being available?
+#: src/file-manager/nautilus-indexing-info.c:224
+msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast. "
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:1
+#: src/file-manager/nautilus-indexing-info.c:236
+#, c-format
 msgid "Your files were last indexed at %s"
 msgstr "Twoje pliki by³y ostatnio indeksowane %s"
 
-#: src/file-manager/nautilus-indexing-info.c:1
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "Uaktualnij teraz"
 
-#: src/file-manager/nautilus-indexing-info.c:1
-msgid "Your files are currently being indexed:"
-msgstr "Twoje pliki s± teraz indeksowane:"
-
-#. FIXME: Should set title, maybe use nautilus stock dialogs.
-#: src/file-manager/nautilus-indexing-info.c:1
-msgid "Indexing Info"
-msgstr "Informacje o indeksowaniu"
-
-#: src/file-manager/nautilus-indexing-info.c:1
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
-"fast. If you need to update your index now, click on the \"Update Now\" "
-"button for the appropriate index."
+"fast.  Your files are currently being indexed."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:1
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Us³uga wyszukiwania nie jest dostêpna."
 
-#: src/file-manager/nautilus-indexing-info.c:1
-msgid "Search Service Not Available"
-msgstr "Us³uga wyszukiwania nie jest dostêpna"
-
-#: src/file-manager/nautilus-indexing-info.c:1
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:1
 msgid "Reveal each selected item in its original folder"
 msgstr ""
 
-#: src/file-manager/nautilus-search-list-view-ui.xml.h:1
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:2
 msgid "Reveal in New Window"
 msgstr "Wy¶wietl w nowym oknie"
 
-#: src/file-manager/nautilus-search-list-view-ui.xml.h:1
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:3
 msgid "Show Indexing Status"
 msgstr "Wy¶wietl stan indeksowania"
 
-#: src/file-manager/nautilus-search-list-view-ui.xml.h:1
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:4
 msgid "Show _Indexing Status"
 msgstr "Wy¶wietl stan indeksowania"
 
-#: src/file-manager/nautilus-search-list-view-ui.xml.h:1
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:5
 msgid "Show status of indexing used when searching"
 msgstr "Wy¶wietla stan indeksowania wykorzystywanego przy wyszukiwaniu"
 
 #. set the window title and standard close key accelerator
-#: src/nautilus-about.c:1
+#: src/nautilus-about.c:141
 msgid "About Nautilus"
 msgstr "Informacje o Nautilusie"
 
 #. draw the authors title
-#: src/nautilus-about.c:1
+#: src/nautilus-about.c:361
 msgid "Authors"
 msgstr "Autorzy"
 
-#: src/nautilus-application.c:1
+#: src/nautilus-application.c:275
 msgid "Couldn't Create Required Folder"
 msgstr "Nie mo¿na utworzyæ wymaganego folderu"
 
-#: src/nautilus-application.c:1
+#: src/nautilus-application.c:276
+#, c-format
+msgid ""
+"Nautilus could not create the required folder \"%s\". Before running "
+"Nautilus, please create this folder, or set permissions such that Nautilus "
+"can create it."
+msgstr ""
+
+#: src/nautilus-application.c:281
 msgid "Couldn't Create Required Folders"
 msgstr "Nie mo¿na utworzyæ wymaganych folderów"
 
+#: src/nautilus-application.c:282
+#, c-format
+msgid ""
+"Nautilus could not create the following required folders:\n"
+"\n"
+"%s\n"
+"\n"
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
+msgstr ""
+
 #. Can't register myself due to trouble locating the
-#. * nautilus.oafinfo file. This has happened when you
+#. * Nautilus_Shell.oaf file. This has happened when you
 #. * launch Nautilus with an LD_LIBRARY_PATH that
 #. * doesn't include the directory containg the oaf
 #. * library. It could also happen if the
-#. * nautilus.oafinfo file was not present for some
+#. * Nautilus_Shell.oaf file was not present for some
 #. * reason. Sometimes killing oafd and gconfd fixes
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:1
+#: src/nautilus-application.c:407
 msgid ""
-"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
-"again may fix the problem."
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again."
 msgstr ""
-"Nie mo¿na teraz u¿ywaæ Nautilusa. W naprawieniu problemu mo¿e pomóc ponowne "
-"uruchomienie komputera lub przeinstalowanie Nautilusa."
 
 #. FIXME bugzilla.eazel.com 2536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:1
+#: src/nautilus-application.c:413
 msgid ""
-"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
-"again may fix the problem.\n"
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again.\n"
 "\n"
-"OAF couldn't locate the nautilus.oafinfo file. One cause of this seems to be "
-"an LD_LIBRARY_PATH that does not include the oaf library's directory. "
-"Another possible cause would be bad install with a missing nautilus.oafinfo "
-"file.\n"
+"OAF couldn't locate the Nautilus_shell.oaf file. One cause of this seems to "
+"be an LD_LIBRARY_PATH that does not include the oaf library's directory. "
+"Another possible cause would be bad install with a missing "
+"Nautilus_Shell.oaf file.\n"
+"\n"
+"Running \"nautilus-clean.sh -x\" will kill all OAF and GConf processes, "
+"which may be needed by other applications.\n"
 "\n"
 "Sometimes killing oafd and gconfd fixes the problem, but we don't know why.\n"
 "\n"
-"We need a much less confusing message here for Nautilus 1.0."
+"We have also seen this error when a faulty version of oaf was installed."
 msgstr ""
 
 #. Some misc. error (can never happen with current
@@ -6703,1070 +8404,1292 @@ msgstr ""
 #. * wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:1 src/nautilus-application.c:1
+#: src/nautilus-application.c:444 src/nautilus-application.c:462
+#: src/nautilus-application.c:469
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Z powodu nieoczekiwanego b³êdu nie mo¿na teraz u¿ywaæ Nautilusa."
 
-#: src/nautilus-application.c:1
+#: src/nautilus-application.c:445
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
 "attempting to register the file manager view server."
 msgstr ""
 
-#: src/nautilus-application.c:1
+#: src/nautilus-application.c:463
+#, fuzzy
+msgid ""
+"Nautilus can't be used now, due to an unexpected error from OAF when "
+"attempting to locate the factory.Killing oafd and restarting Nautilus may "
+"help fix the problem."
+msgstr ""
+"Nie mo¿na teraz u¿ywaæ Nautilusa. W naprawieniu problemu mo¿e pomóc ponowne "
+"uruchomienie komputera lub przeinstalowanie Nautilusa."
+
+#: src/nautilus-application.c:470
+#, fuzzy
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
-"attempting to locate the factory."
+"attempting to locate the shell object. Killing oafd and restarting Nautilus "
+"may help fix the problem."
 msgstr ""
+"Nie mo¿na teraz u¿ywaæ Nautilusa. W naprawieniu problemu mo¿e pomóc ponowne "
+"uruchomienie komputera lub przeinstalowanie Nautilusa."
 
-#: src/nautilus-application.c:1
+#: src/nautilus-application.c:635
 msgid ""
-"You are running Nautilus as root.\n"
+"You are about to run Nautilus as root.\n"
 "\n"
 "As root, you can damage your system if you are not careful, and\n"
 "Nautilus will not stop you from doing it."
 msgstr ""
 
-#: src/nautilus-bookmarks-window.c:1
+#: src/nautilus-bookmarks-window.c:127
 msgid "Bookmarks"
 msgstr "Zak³adki"
 
-#: src/nautilus-bookmarks-window.c:1
+#: src/nautilus-bookmarks-window.c:177
 msgid "Location"
 msgstr "Po³o¿enie"
 
-#: src/nautilus-bookmarks-window.c:1 src/nautilus-window-menus.c:1
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Usuñ"
 
-#: src/nautilus-complex-search-bar.c:1
+#: src/nautilus-complex-search-bar.c:233
 msgid "More Options"
 msgstr "Wiêcej opcji"
 
-#: src/nautilus-complex-search-bar.c:1
+#: src/nautilus-complex-search-bar.c:243
 msgid "Fewer Options"
 msgstr "Mniej opcji"
 
 #. Create button first so we can use it for auto_click
-#: src/nautilus-complex-search-bar.c:1 src/nautilus-simple-search-bar.c:1
+#: src/nautilus-complex-search-bar.c:261 src/nautilus-simple-search-bar.c:129
 msgid "Find Them!"
 msgstr "Znajd¼ je!"
 
-#: src/nautilus-first-time-druid.c:1
+#: src/nautilus-first-time-druid.c:191
 msgid ""
-"Existence of this file indicates that the Nautilus configuration wizard\n"
+"Existence of this file indicates that the Nautilus configuration druid\n"
 "has been presented.\n"
 "\n"
-"You can manually erase this file to present the wizard again.\n"
+"You can manually erase this file to present the druid again.\n"
 "\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1
+#: src/nautilus-first-time-druid.c:487
 msgid ""
-"User levels provide a way to adjust the software to your\n"
-"level of technical expertise. Pick an initial level that you\n"
-"feel comfortable with; you can always change it later."
+"Your user level adjusts Nautilus to your degree of experience\n"
+"using GNOME and Linux. Choose a level that's comfortable for\n"
+"you - you can always change it later."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1
+#: src/nautilus-first-time-druid.c:498
 msgid ""
-"For beginner users that are not yet\n"
-"familiar with the working of GNOME and Linux."
+"For users who have no previous experience with GNOME\n"
+"and Linux."
 msgstr ""
-"Dla pocz±tkuj±cych u¿ytkowników, którzy nie s± jeszcze obeznani ze "
-"¶rodowiskiem GNOME, ani z Linuksem."
 
-#: src/nautilus-first-time-druid.c:1
+#: src/nautilus-first-time-druid.c:504
 msgid ""
-"For non-technical users that are comfortable with\n"
-"their GNOME and Linux environment."
+"For users who are comfortable with GNOME and Linux,\n"
+"but don't describe themselves as ``technical.''"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1
+#: src/nautilus-first-time-druid.c:510
+#, fuzzy
 msgid ""
-"For users that have the need to be exposed\n"
-"to every detail of their operating system."
+"For users who have GNOME and Linux experience, and\n"
+"like to see every detail of the operating system."
 msgstr ""
 "Dla u¿ytkowników, którzy chc± znaæ ka¿dy szczegó³ funkcjonowania systemu "
 "operacyjnego."
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:1
+#: src/nautilus-first-time-druid.c:548
 msgid ""
-"Eazel offers a growing number of services to help you\n"
-"install and maintain new software and manage your files\n"
-"across the network.  Choose an option below, and the\n"
-"information will be presented in Nautilus after you've\n"
-"finished setting up."
+"To verify your Internet connection and make sure you have\n"
+"the latest Nautilus updates, Nautilus will now connect to\n"
+"Eazel's web site. This will take seconds if your copy of\n"
+"Nautilus is recent; longer (but no more than a minute or two)\n"
+"if you need an update.\n"
+"\n"
+"If you know your computer uses a proxy connection, click\n"
+"Verify and Nautilus will use it.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1
-msgid "Eazel Services"
-msgstr "Us³ugi Eazela"
+#: src/nautilus-first-time-druid.c:562
+#, fuzzy
+msgid "Verify my connection and check for updates"
+msgstr "Tak, zweryfikuj po³±czenie sieciowe i uaktualnij Nautilusa."
 
-#: src/nautilus-first-time-druid.c:1
-msgid "I want to learn more about Eazel services."
-msgstr "Chcê siê dowiedzieæ wiêcej o us³ugach Eazela."
+#: src/nautilus-first-time-druid.c:563
+#, fuzzy
+msgid "Don't verify my connection or check for updates"
+msgstr "Tak, zweryfikuj po³±czenie sieciowe i uaktualnij Nautilusa."
 
-#: src/nautilus-first-time-druid.c:1
-msgid "I want to sign up for Eazel services now."
-msgstr "Chcê siê teraz zapisaæ do us³ug Eazela."
+#: src/nautilus-first-time-druid.c:628
+msgid ""
+"We are having trouble making an external web connection.\n"
+"Sometimes, firewalls require you to specify a web proxy server.\n"
+"Fill in the name or port of your proxy server, if any, below."
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:640
+msgid "No proxy server required."
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:641
+msgid "Use this proxy server:"
+msgstr ""
+
+#. allocate the proxy label, followed by the entry
+#: src/nautilus-first-time-druid.c:666
+msgid "Proxy address:"
+msgstr "Adres po¶rednika:"
 
-#: src/nautilus-first-time-druid.c:1
-msgid "I've already signed up and want to login now."
-msgstr "Ju¿ siê zapisa³em i chcê siê teraz zalogowaæ."
+#: src/nautilus-first-time-druid.c:728
+msgid "Verifying your Internet connection and checking for updates..."
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:1
-msgid "I don't want to learn about Eazel services at this time."
-msgstr "Tym razem nie chcê siê dowiedzieæ wiêcej o us³ugach Eazela."
+#: src/nautilus-first-time-druid.c:736
+msgid "Downloading Nautilus updates..."
+msgstr "Pobieranie uaktualnienia Nautilusa..."
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:1
+#: src/nautilus-first-time-druid.c:906
 msgid ""
-"Nautilus will now contact Eazel services to quickly verify \n"
-"your web connection and download the latest updates. \n"
-"Click the Next button to continue."
+"If you have been using the GNOME Midnight Commander\n"
+"these settings move your desktop icons to Nautilus and\n"
+"make Nautilus the default desktop.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1
-msgid "Updating Nautilus"
-msgstr "Aktualizowanie Nautilusa"
+#: src/nautilus-first-time-druid.c:913
+#, fuzzy
+msgid "Use Nautilus to draw the desktop."
+msgstr "Rysowanie biurka przez Nautilusa"
 
-#: src/nautilus-first-time-druid.c:1
-msgid "Yes, verify my connection and update Nautilus now."
-msgstr "Tak, zweryfikuj po³±czenie sieciowe i uaktualnij Nautilusa."
+#: src/nautilus-first-time-druid.c:919
+msgid "Move existing desktop icons to the Nautilus desktop."
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:1
-msgid "No, don't contact Eazel services at this time."
-msgstr "Nie, tym razem nie ³±cz siê z us³ugami Eazela."
+#. This option is currently disabled, per bugzilla.eazel.com 7557
+#: src/nautilus-first-time-druid.c:927
+msgid "Launch Nautilus when GNOME starts up."
+msgstr ""
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:1
+#: src/nautilus-first-time-druid.c:967
 msgid ""
-"We are having troubles making an external web connection.  \n"
-"Sometimes, firewalls require you to specify a web proxy server.  \n"
-" Fill in the name of port of your proxy server, if any, below."
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties.  The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+"Fast search requires that the cron daemon on your system be running.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1
-msgid "HTTP Proxy Configuration"
-msgstr "Konfiguracja po¶rednika HTTP"
+#: src/nautilus-first-time-druid.c:972
+msgid ""
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties. The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:1
-msgid "No proxy server required."
+#: src/nautilus-first-time-druid.c:981
+msgid "Enable fast search"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1
-msgid "Use this proxy server:"
+#: src/nautilus-first-time-druid.c:982
+msgid "Turn fast search on when cron is enabled"
 msgstr ""
 
-#. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:1
-msgid "Proxy address:"
-msgstr "Adres po¶rednika:"
+#: src/nautilus-first-time-druid.c:1027
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"currently can't be performed because the program crond, which does\n"
+"nightly tasks on your computer, is turned off. To make sure fast searches\n"
+"can be done, turn crond on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands \n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
 
-#. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:1
-msgid "Port:"
-msgstr "Port:"
+#: src/nautilus-first-time-druid.c:1035
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"may not be performed because the program crond, which does nightly tasks\n"
+"on your computer, may be turned off. To make sure fast searches can be\n"
+"done, check to make sure that crond is turned on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands\n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:1
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
-"We are now contacting the Eazel service to test your \n"
-"web connection and update Nautilus."
+"Click Finish to launch Nautilus. You'll start with two\n"
+"Nautilus windows: one shows your home folder, and the\n"
+"other tells you about Eazel's services that make the life\n"
+"of a Linux user easier.\n"
+"\n"
+"We hope you enjoy Nautilus!"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1
-msgid "Downloading Nautilus updates..."
-msgstr "Pobieranie uaktualnienia Nautilusa..."
+#: src/nautilus-first-time-druid.c:1129
+msgid ""
+"Click Finish to launch Nautilus. You'll start with a\n"
+"window showing your home folder.\n"
+"\n"
+"We hope you enjoy Nautilus!"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:1
+#: src/nautilus-first-time-druid.c:1153
 msgid "Nautilus First Time Setup"
 msgstr ""
 
-#. make the title label
-#: src/nautilus-first-time-druid.c:1
-msgid "Welcome to Nautilus!"
+#: src/nautilus-first-time-druid.c:1183
+#, fuzzy
+msgid "Welcome to Nautilus"
 msgstr "Witaj w Nautilusie!"
 
-#: src/nautilus-first-time-druid.c:1
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
-"Since this is the first time that you've launched\n"
-"Nautilus, we'd like to ask you a few questions\n"
-"to help personalize it for your use."
+"Nautilus...\n"
+"    Is a great file manager for the GNOME desktop.\n"
+"    Provides a simple intuitive way to access Internet services.\n"
+"    Is an extensible framework for GNOME developers.\n"
+"    Provides a powerful delivery platform for service providers.\n"
+"\n"
+"Click Next to begin customizing your Nautilus environment."
 msgstr ""
-"Poniewa¿ Nautilus zosta³ przez ciebie uruchomiony\n"
-"po raz pierwszy, odpowiedz na kilka pytañ, dziêki\n"
-"czemu pomo¿esz dostosowaæ program do wykorzystywanych\n"
-"zastosowañ."
-
-#: src/nautilus-first-time-druid.c:1
-msgid "Press the next button to continue."
-msgstr "Wci¶nij przycisk \"Naprzód\" aby kontynuowaæ."
 
 #. set up the final page
-#: src/nautilus-first-time-druid.c:1
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "Zakoñczone"
 
-#: src/nautilus-first-time-druid.c:1
-msgid ""
-"Click the finish button to launch Nautilus.\n"
-"We hope that you enjoy using it!"
-msgstr ""
-"Wci¶nij przycisk \"Zakoñcz\" aby uruchomiæ Nautilusa.\n"
-"Mamy nadziejê, ¿e bêdzie on ¼ród³em zadowolenia!"
-
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1
-msgid "Select A User Level"
+#: src/nautilus-first-time-druid.c:1209
+#, fuzzy
+msgid "Choose Your User Level"
 msgstr "Wybierz poziom u¿ytkownika"
 
-#. set up the service sign-up page
-#: src/nautilus-first-time-druid.c:1
-msgid "Sign Up for Eazel Services"
-msgstr "Zapisz siê do us³ug Eazela"
+#. set up the GMC transition page
+#: src/nautilus-first-time-druid.c:1213
+msgid "GMC to Nautilus Transition"
+msgstr ""
+
+#. set up the `Launch Medusa' page
+#: src/nautilus-first-time-druid.c:1217
+#, fuzzy
+msgid "Fast Searches"
+msgstr "Wyszukiwanie"
+
+#. set up optional page to tell the user how to run cron
+#: src/nautilus-first-time-druid.c:1225
+msgid "The Cron Daemon"
+msgstr ""
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1
-msgid "Nautilus Update"
-msgstr "Aktualizacja Nautilusa"
+#: src/nautilus-first-time-druid.c:1230
+msgid "Checking Your Internet Connection"
+msgstr ""
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "Aktualizowanie Nautilusa..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "Konfiguracja po¶rednika WWW"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "Dekodowanie uaktualnienia..."
 
-#: src/nautilus-first-time-druid.c:1
-msgid "Update Completed... Press Next to Continue."
+#: src/nautilus-first-time-druid.c:1341
+#, fuzzy
+msgid "Update Complete. Click Next to Continue."
+msgstr ""
+"Aktualizacja zosta³a zakoñczona... Wci¶nij przycisk \"Naprzód\" aby "
+"kontynuowaæ."
+
+#. The update file couldn't be loaded because it
+#. * doesn't exist. Arlo and I (jsh) and decided that the
+#. * best thing to do is silently fail
+#.
+#: src/nautilus-first-time-druid.c:1356
+#, fuzzy
+msgid "No Update Available... Press Next to Continue."
 msgstr ""
 "Aktualizacja zosta³a zakoñczona... Wci¶nij przycisk \"Naprzód\" aby "
 "kontynuowaæ."
 
 #. set the window title
-#: src/nautilus-link-set-window.c:1
+#: src/nautilus-link-set-window.c:189
 msgid "Link sets"
 msgstr "Zbiory odno¶ników"
 
 #. add a descriptive label
-#: src/nautilus-link-set-window.c:1
+#: src/nautilus-link-set-window.c:202
 msgid "Add or remove sets of links by clicking on the checkboxes below."
 msgstr ""
 
-#: src/nautilus-location-bar.c:1
-msgid "Location:"
-msgstr "Po³o¿enie:"
-
-#: src/nautilus-location-bar.c:1
+#: src/nautilus-location-bar.c:63
 msgid "Go To:"
 msgstr "Przejd¼ do:"
 
-#: src/nautilus-location-bar.c:1
+#: src/nautilus-location-bar.c:153
 #, c-format
 msgid "Do you want to view these %d locations in separate windows?"
 msgstr "Czy chcesz wy¶wietliæ %d po³o¿eñ w osobnych oknach"
 
-#: src/nautilus-location-bar.c:1
+#: src/nautilus-location-bar.c:160
 msgid "View in Multiple Windows?"
 msgstr "Wy¶wietliæ w osobnych oknach?"
 
-#: src/nautilus-main.c:1
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr ""
 
-#: src/nautilus-main.c:1
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "Tworzy pocz±tkowe okno z podan± geometri±"
 
-#: src/nautilus-main.c:1
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "GEOMETRIA"
 
-#: src/nautilus-main.c:1
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:1
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "Zakoñcz Nautilusa."
 
-#: src/nautilus-main.c:1
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "Uruchom ponownie Nautilusa."
 
-#: src/nautilus-main.c:1
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check nie mo¿e byæ u¿yte z URI.\n"
 
-#: src/nautilus-main.c:1
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check nie mo¿e byæ u¿yte z innymi opcjami.\n"
 
-#: src/nautilus-main.c:1
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit nie mo¿e byæ u¿yte z URI.\n"
 
-#: src/nautilus-main.c:1
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart nie mo¿e byæ u¿yte z URI.\n"
 
-#: src/nautilus-main.c:1
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry nie mo¿e byæ u¿yte z wiêcej ni¿ jednym URI.\n"
 
 #. set the title and standard close accelerator
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:265
 msgid "Backgrounds and Emblems"
 msgstr "T³a i symbole"
 
-#. add the title label
-#: src/nautilus-property-browser.c:1 src/nautilus-property-browser.c:1
-msgid "Select A Category:"
-msgstr "Wybierz kategoriê:"
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:362 src/nautilus-theme-selector.c:267
+#, fuzzy
+msgid "  Done  "
+msgstr "Gotowe"
 
-#: src/nautilus-property-browser.c:1
-msgid "Add new..."
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:373
+#, fuzzy
+msgid "  Add new...  "
 msgstr "Dodaj now±..."
 
-#: src/nautilus-property-browser.c:1
-msgid "Remove..."
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:388
+#, fuzzy
+msgid "  Remove...  "
 msgstr "Usuñ..."
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:879
 #, c-format
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Niestety, nie mo¿na usun±æ desenia %s."
 
-#: src/nautilus-property-browser.c:1 src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:880 src/nautilus-property-browser.c:909
 msgid "Couldn't delete pattern"
 msgstr "Nie mo¿na usun±æ desenia"
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:908
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Niestety, nie mo¿na usun±æ symbolu %s."
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:944
 msgid "Create a New Emblem:"
 msgstr "Tworzenie nowego symbolu"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:949
 msgid "Keyword:"
 msgstr "S³owo kluczowe:"
 
-#. set up a gnome file entry to pick the image file
-#: src/nautilus-property-browser.c:1
+#. set up a gnome icon entry to pick the image file
+#: src/nautilus-property-browser.c:962
+#, fuzzy
+msgid "Image:"
+msgstr "Obraz"
+
+#: src/nautilus-property-browser.c:966
 msgid "Select an image file for the new emblem:"
 msgstr "Wybierz plik z obrazem nowego symbolu:"
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:993
 msgid "Create a New Color:"
 msgstr ""
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:998
 msgid "Color name:"
 msgstr "Nazwa koloru:"
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:1009
 msgid "Color value:"
 msgstr "Warto¶æ koloru:"
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:1045
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a valid file name."
+msgstr "Niestety, \"%s\" nie jest poprawnym folderem motywu."
+
+#: src/nautilus-property-browser.c:1047
+#, fuzzy
+msgid "Sorry, but you did not supply a valid file name."
+msgstr "Niestety, \"%s\" nie jest poprawnym folderem motywu."
+
+#: src/nautilus-property-browser.c:1049 src/nautilus-property-browser.c:1092
+msgid "Couldn't install pattern"
+msgstr "Nie mo¿na zainstalowaæ desenia"
+
+#: src/nautilus-property-browser.c:1060
 msgid "Sorry, but you can't replace the reset image."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:1091
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Niestety, nie mo¿na zainstalowaæ desenia %s."
 
-#: src/nautilus-property-browser.c:1
-msgid "Couldn't install pattern"
-msgstr "Nie mo¿na zainstalowaæ desenia"
-
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:1114
 msgid "Select an image file to add as a pattern:"
 msgstr "Wybór pliku z obrazem nowego desenia:"
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:1173
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Niestety, nazwa nowego koloru nie mo¿e byæ pusta."
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:1174
 msgid "Couldn't install color"
 msgstr "Nie mo¿na zainstalowaæ koloru"
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:1230
 msgid "Select a color to add:"
 msgstr "Wybierz nowy kolor:"
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:1311
+#, c-format
+msgid "Sorry, but '%s' is not a usable image file!"
+msgstr "nistety, \"%s\" nie jest plikiem zawieraj±cym obraz!"
+
+#: src/nautilus-property-browser.c:1329
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Niestety, s³owo kluczowe dla nowego symbolu nie mo¿e byæ puste."
 
-#: src/nautilus-property-browser.c:1 src/nautilus-property-browser.c:1
-#: src/nautilus-property-browser.c:1 src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:1330 src/nautilus-property-browser.c:1333
+#: src/nautilus-property-browser.c:1337 src/nautilus-property-browser.c:1366
 msgid "Couldn't install emblem"
 msgstr "Nie mo¿na zainstalowaæ symbolu"
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:1332
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
 "Niestety, s³owa kluczowe sumboli mog± zawieraæ tylko litery, spacje i cyfry."
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:1335
 #, c-format
 msgid ""
 "Sorry, but \"%s\" is an existing keyword.  Please choose a different name "
 "for it."
 msgstr "Niestety, s³owo kluczowe \"%s\" zosta³o ju¿ u¿yte. U¿yj innej nazwy."
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:1365
 #, c-format
 msgid "Sorry, but the image at %s couldn't be installed as an emblem."
 msgstr "Niestety, nie mo¿na zainstalowaæ obrazu %s jako sumbolu."
 
-#: src/nautilus-property-browser.c:1 src/nautilus-theme-selector.c:1
+#: src/nautilus-property-browser.c:2024
+msgid "Select A Category:"
+msgstr "Wybierz kategoriê:"
+
+#: src/nautilus-property-browser.c:2032 src/nautilus-theme-selector.c:497
 msgid "Cancel Remove"
 msgstr "Anuluj usuniêcie"
 
-#: src/nautilus-property-browser.c:1
-msgid "Add a new pattern"
+#: src/nautilus-property-browser.c:2037
+#, fuzzy
+msgid "  Add a New Pattern  "
 msgstr "Dodaj nowy deseñ"
 
-#: src/nautilus-property-browser.c:1
-msgid "Add a new color"
+#: src/nautilus-property-browser.c:2040
+#, fuzzy
+msgid "  Add a New Color  "
 msgstr "Dodaj nowy kolor"
 
-#: src/nautilus-property-browser.c:1
-msgid "Add a new emblem"
+#: src/nautilus-property-browser.c:2043
+#, fuzzy
+msgid "  Add a New Emblem  "
 msgstr "Dodaj nowy symbol"
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:2066
 msgid "Click on a pattern to remove it"
 msgstr "Kliknij deseñ, aby go usun±æ"
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:2069
 msgid "Click on a color to remove it"
 msgstr "Kliknij kolor, aby go usun±æ"
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:2072
 msgid "Click on an emblem to remove it"
 msgstr "Kliknij symbol aby go usun±æ"
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:2081
 msgid "Patterns:"
 msgstr "Desenie:"
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:2084
 msgid "Colors:"
 msgstr "Kolory:"
 
-#: src/nautilus-property-browser.c:1
+#: src/nautilus-property-browser.c:2087
 msgid "Emblems:"
 msgstr "Symbole:"
 
-#: src/nautilus-property-browser.c:1
-msgid "Remove a pattern"
+#: src/nautilus-property-browser.c:2106
+#, fuzzy
+msgid "  Remove a Pattern  "
 msgstr "Usuñ t³o"
 
-#: src/nautilus-property-browser.c:1
-msgid "Remove a color"
+#: src/nautilus-property-browser.c:2109
+#, fuzzy
+msgid "  Remove a Color  "
 msgstr "Usuñ kolor"
 
-#: src/nautilus-property-browser.c:1
-msgid "Remove an emblem"
+#: src/nautilus-property-browser.c:2112
+#, fuzzy
+msgid "  Remove an Emblem  "
 msgstr "Usuñ symbol"
 
-#. Menu item to search by file content in e.g. "Contains contains GNU"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "Content"
-msgstr "Zawarto¶æ"
+#. Menu item in the search bar.
+#. Bracketed items are context, and are message
+#. strings elsewhere.  You don't have to translate the whole
+#. string, and only the translation for "containing '%s' will
+#. be used.  If you do translate the whole string, leave the
+#. translations of the rest of the text in brackets, so it
+#. will not be used.
+#: src/nautilus-search-bar-criterion.c:74
+msgid "[Search for] Name [contains \"fish\"]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:75
+msgid "[Search for] Content [includes all of \"fish tree\"]"
+msgstr ""
 
-#. Menu item to search for files with an emblem attached in e.g. "With emblem marked with Important"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "With Emblem"
-msgstr "Z symbolem"
-
-#. Menu item to search for files by the time they were last modified in e.g. "Last modified before [date]"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "Last Modified"
-msgstr "Ostatnio zmieniony"
-
-#. Menu item to search for files by their owner in e.g. "Owner is root"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "Owner"
-msgstr "W³a¶ciciel"
-
-#. The "contains" in a search for items where "file name contains"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "contains"
-msgstr "zawiera"
-
-#. The "starts with" in a search for items where  "file name starts with"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "starts with"
-msgstr "rozpoczyna siê od"
-
-#. The "ends with" in a search for items where "file name ends with"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "ends with"
-msgstr "koñczy siê na"
-
-#. The "matches glob" (eg *.c) in a search for items where "file name matches glob"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "matches glob"
-msgstr "pasuje do wzorca"
-
-#. The "matches regexp" (eg '[a-z]{2}+' in a search for items where "file name matches regexp"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "matches regexp"
-msgstr "pasuje do wyra¿enia regularnego"
-
-#. The "includes all of" in a search for items where "content includes all of"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "includes all of"
-msgstr "zawiera wszystkie z"
-
-#. The "includes any of" in a search for items where "content includes any of"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "includes any of"
-msgstr "zawiera którykolwiek z"
-
-#. The "does not include all of" in a search for items where "content does not include all of"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "does not include all of"
+#: src/nautilus-search-bar-criterion.c:76
+msgid "[Search for] Type [is regular file]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:77
+msgid "[Search for] Size [larger than 400K]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:78
+msgid "[Search for] With Emblem [includes \"Important\"]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:79
+msgid "[Search for] Last Modified [before yesterday]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:80
+msgid "[Search for] Owner [is not root]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:86
+msgid "[File name] contains [help]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:87
+msgid "[File name] starts with [nautilus]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:88
+msgid "[File name] ends with [.c]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:89
+msgid "[File name] matches glob [*.c]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:90
+msgid "[File name] matches regexp [\"e??l.$\"]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:95
+msgid "[File content] includes all of [apple orange]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:96
+msgid "[File content] includes any of [apply orange]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:97
+#, fuzzy
+msgid "[File content] does not include all of [apple orange]"
 msgstr "nie zawiera wszystkich z"
 
-#. The "includes none of" in a search for items where "content includes none of"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "includes none of"
-msgstr "nie zawiera ¿adnego z"
-
-#. The "is" in a search for items where "Type is"
-#: src/nautilus-search-bar-criterion.c:1
-#: src/nautilus-search-bar-criterion.c:1
-#: src/nautilus-search-bar-criterion.c:1
-msgid "is"
-msgstr "jest"
-
-#. The "is not" in a search for items where "Type is not"
-#: src/nautilus-search-bar-criterion.c:1
-#: src/nautilus-search-bar-criterion.c:1
-#: src/nautilus-search-bar-criterion.c:1
-msgid "is not"
-msgstr "nie jest"
-
-#. A type of file you can search for; context is "Type is regular file"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "regular file"
+#: src/nautilus-search-bar-criterion.c:98
+msgid "[File content] includes none of [apple orange]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:104
+msgid "[File type] is [folder]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:105
+msgid "[File type] is not [folder]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:110
+#, fuzzy
+msgid "[File type is] regular file"
 msgstr "zwyk³y plik"
 
-#. A type of file you can search for; context is "Type is text file"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "text file"
-msgstr "plik tekstowy"
-
-#. A type of file you can search for; context is "Type is application"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "application"
-msgstr "aplikacja"
-
-#. A type of file you can search for; context is "Type is folder"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "folder"
-msgstr "folder"
-
-#. In relation to file size; context is "Size larger than"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "larger than"
-msgstr "wiêkszy ni¿"
-
-#. In relation to file size; context is "Size smaller than"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "smaller than"
-msgstr "mniejszy ni¿"
-
-#. In relation to emblems; context is "With emblem marked with"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "marked with"
-msgstr "oznaczone symbolem"
-
-#. in relation to emblems; context is "With emblem not marked with"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "not marked with"
-msgstr "nie oznaczone symbolem"
-
-#. In relation to a file's last modfied time; context is "Last modified is after 11/2/00"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "is after"
-msgstr "jest po"
-
-#. In relation to a file's last modfied time; context is "Last modified is before 11/2/00"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "is before"
-msgstr "jest przed"
-
-#. In relation to a file's last modfied time; context is "Last modified is today"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "is today"
-msgstr "jest dzi¶"
-
-#. In relation to a file's last modfied time; context is "Last modified is yesterdat"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "is yesterday"
-msgstr "jest wczoraj"
-
-#. In relation to a file's last modfied time; context is "Last modified is within a week of"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "is within a week of"
-msgstr "jest przed tygodniem"
+#: src/nautilus-search-bar-criterion.c:111
+msgid "[File type is] text file"
+msgstr ""
 
-#. In relation to a file's last modfied time; context is "Last modified is within a month of"
-#: src/nautilus-search-bar-criterion.c:1
-msgid "is within a month of"
-msgstr "jest przed miesi±cem"
+#: src/nautilus-search-bar-criterion.c:112
+msgid "[File type is] application"
+msgstr ""
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: src/nautilus-service-ui.xml.h:1
-msgid "Display support information for Eazel Services"
-msgstr "Wy¶wietla informacje o wsparciu dotycz±cym us³ug Eazela"
+#: src/nautilus-search-bar-criterion.c:113
+msgid "[File type is] folder"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:114
+msgid "[File type is] music"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:119
+msgid "[File size is] larger than [400K]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:120
+msgid "[File size is] smaller than [300K]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:125
+msgid "[With emblem] marked with [Important]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:126
+msgid "[With emblem] not marked with [Important]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:131
+msgid "[Last modified date] is [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:132
+msgid "[Last modified date] is not [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:133
+msgid "[Last modified date] is after [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:134
+msgid "[Last modified date] is before [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:136
+#, fuzzy
+msgid "[Last modified date] is today"
+msgstr "zmodyfikowane dzi¶"
+
+#: src/nautilus-search-bar-criterion.c:137
+#, fuzzy
+msgid "[Last modified date] is yesterday"
+msgstr "zmodyfikowane wczoraj"
+
+#: src/nautilus-search-bar-criterion.c:139
+msgid "[Last modified date] is within a week of [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:140
+msgid "[Last modified date] is within a month of [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:159
+msgid "[File owner] is [root]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:160
+msgid "[File owner] is not [root]"
+msgstr ""
 
 #: src/nautilus-service-ui.xml.h:1
 msgid "Go to the Eazel Services Summary Page"
 msgstr "Przechodzi do strony zestawienia us³ug Eazela"
 
-#: src/nautilus-service-ui.xml.h:1
+#: src/nautilus-service-ui.xml.h:2
 msgid "Go to the Eazel Software Catalog"
 msgstr "Przejd¼ do katalogu oprogramowania Eazela"
 
-#: src/nautilus-service-ui.xml.h:1
+#: src/nautilus-service-ui.xml.h:3
 msgid "Go to your online storage repository"
 msgstr ""
 
-#: src/nautilus-service-ui.xml.h:1
-msgid "Services"
-msgstr "Us³ugi"
-
-#: src/nautilus-service-ui.xml.h:1
+#: src/nautilus-service-ui.xml.h:5
 msgid "Software _Catalog"
 msgstr "_Katalog oprogramowania"
 
-#: src/nautilus-service-ui.xml.h:1
+#: src/nautilus-service-ui.xml.h:6
 msgid "_Eazel Services Home"
 msgstr ""
 
-#: src/nautilus-service-ui.xml.h:1
+#: src/nautilus-service-ui.xml.h:7
 msgid "_Online Storage"
 msgstr ""
 
-#: src/nautilus-service-ui.xml.h:1
+#: src/nautilus-service-ui.xml.h:8
 msgid "_Services"
 msgstr "_Us³ugi"
 
-#: src/nautilus-service-ui.xml.h:1
-msgid "_Support"
-msgstr "_Wsparcie"
+#: src/nautilus-shell.c:188
+msgid "Caveat"
+msgstr ""
+
+#: src/nautilus-shell.c:225
+msgid ""
+"Thank you for your interest in Nautilus.\n"
+" \n"
+"As with any software under development, you should exercise caution when "
+"using Nautilus.  Eazel does not provide any guarantee that it will work "
+"properly, or assume any liability for your use of it.  Please use it at your "
+"own risk.\n"
+"\n"
+"Please visit http://www.eazel.com/feedback.html to provide feedback, "
+"comments, and suggestions."
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:1
+msgid "Factory for Nautilus shell and file manager"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:2
+msgid "Icons"
+msgstr "Ikony"
+
+#: src/Nautilus_shell.oaf.in.h:3
+#, fuzzy
+msgid "Icons Viewer"
+msgstr "Przegl±darka %s"
+
+#: src/Nautilus_shell.oaf.in.h:4
+msgid "List"
+msgstr "Lista"
+
+#: src/Nautilus_shell.oaf.in.h:5
+#, fuzzy
+msgid "List Viewer"
+msgstr "Przegl±darka %s"
+
+#: src/Nautilus_shell.oaf.in.h:6
+msgid "Nautilus factory"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:7
+msgid "Nautilus file manager component that shows a scrollable list"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:8
+msgid ""
+"Nautilus file manager component that shows a scrollable list for search "
+"results"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:9
+msgid "Nautilus file manager component that shows a two-dimensional icon space"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:10
+msgid "Nautilus file manager component that shows icons on the the desktop"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:11
+msgid "Nautilus file manager desktop icon view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:12
+msgid "Nautilus file manager icon view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:13
+msgid "Nautilus file manager list view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:14
+msgid "Nautilus file manager search results list view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:15
+#, fuzzy
+msgid "Nautilus metafile factory"
+msgstr "Wybór motywu Nautilusa"
+
+#: src/Nautilus_shell.oaf.in.h:16
+msgid "Nautilus shell"
+msgstr "Pow³oka Nautilusa"
+
+#: src/Nautilus_shell.oaf.in.h:17
+msgid ""
+"Nautilus shell operations that can be done from subsequent command-line "
+"invocations"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:18
+msgid "Produces metafile objects for accessing Nautilus metadata"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:19
+msgid "Search List"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:20
+#, fuzzy
+msgid "View as Icons"
+msgstr "Wy¶wietlanie jako %s"
+
+#: src/Nautilus_shell.oaf.in.h:21
+#, fuzzy
+msgid "View as List"
+msgstr "Wy¶wietlanie jako %s"
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+#, fuzzy
+msgid " _Advanced"
 msgstr " Zaawansowane"
 
-#: src/nautilus-shell-ui.xml.h:1
-msgid " Beginner"
+#: src/nautilus-shell-ui.xml.h:2
+#, fuzzy
+msgid " _Beginner"
 msgstr " Pocz±tkuj±cy"
 
-#: src/nautilus-shell-ui.xml.h:1
-msgid " Intermediate"
+#: src/nautilus-shell-ui.xml.h:3
+#, fuzzy
+msgid " _Intermediate"
 msgstr " ¦redniozaawansowany"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:4
 msgid "Add a bookmark for the current location to this menu"
 msgstr "Dodaje zak³adkê dla bie¿±cego po³o¿enia do tego menu"
 
-#: src/nautilus-shell-ui.xml.h:1
-msgid "C_hange Appearance..."
-msgstr "_Zmieñ wygl±d"
-
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:6
 msgid "Change the visibility of this window's location bar"
 msgstr "Zmienia wudoczno¶æ pasku po³o¿enia tego okna"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:7
 msgid "Change the visibility of this window's sidebar"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:8
 msgid "Change the visibility of this window's status bar"
 msgstr "Zmienia wudoczno¶æ pasku stanu tego okna"
 
-#: src/nautilus-shell-ui.xml.h:1
-msgid "Change the visibility of this window's tool bar"
+#: src/nautilus-shell-ui.xml.h:9
+#, fuzzy
+msgid "Change the visibility of this window's toolbar"
 msgstr "Zmienia widoczno¶æ paska narzêdziowego tego okna"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:10
 msgid "Clear contents of Go menu and Back/Forward lists"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:11
 msgid "Close _All Windows"
 msgstr "Zamknij _wszystkie okna"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:12
 msgid "Close all Nautilus windows"
 msgstr "Zamyka wszystkie okna Nautilusa"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:13
 msgid "Close this window"
 msgstr "Zamyka bie¿±ce okno"
 
-#: src/nautilus-shell-ui.xml.h:1
-msgid "Cut _Text"
-msgstr "_Wytnij tekst"
-
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:15
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "Wy¶wietla okno, które pozwala na modyfikacjê zak³adek w tym menu"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
-msgid "Display the latest contents of the current location"
-msgstr "Wy¶wietla ostatni± zawarto¶æ bie¿±cego po³o¿enia"
+#: src/nautilus-shell-ui.xml.h:19
+msgid "Display quick reference pages for Nautilus"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
-msgid "Display the license for Nautilus"
+#: src/nautilus-shell-ui.xml.h:20
+msgid "Display release notes for Nautilus"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:21
+#, fuzzy
+msgid "Display support information for Nautilus and Eazel Services"
+msgstr "Wy¶wietla informacje o wsparciu dotycz±cym us³ug Eazela"
+
+#: src/nautilus-shell-ui.xml.h:22
+msgid "Display the latest contents of the current location"
+msgstr "Wy¶wietla ostatni± zawarto¶æ bie¿±cego po³o¿enia"
+
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr "Wy¶wietla zbiór dostêpnych motywów wygl±du"
 
-#: src/nautilus-shell-ui.xml.h:1
-msgid "Edit Settings..."
-msgstr "Zmodyfikuj ustawienia..."
-
-#: src/nautilus-shell-ui.xml.h:1
-msgid "Edit settings for the current user level"
-msgstr "Zmienia ustawienia na bie¿±cym poziomie u¿ytkownika"
+#: src/nautilus-shell-ui.xml.h:24
+#, fuzzy
+msgid "Edit various Nautilus preferences"
+msgstr "Preferencje Nautilusa"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "Znajd¼"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr "Przejd¼ do us³ug Eazela"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr "Przechodzi do po³o¿enia pocz±tkowego"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr "Przechodzi do po³o¿enia, które zawiera bie¿±ce"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr "Przechodzi do odwiedzonego w nastêpnej kolejno¶ci po³o¿enie"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr "Przechodzi do odwiedzonego ostatnio po³o¿enie"
 
-#: src/nautilus-shell-ui.xml.h:1 src/nautilus-window-menus.c:1
-msgid "Hide Location Bar"
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
+#, fuzzy
+msgid "Hide Location _Bar"
 msgstr "Ukryj pasek po³o¿enia"
 
-#: src/nautilus-shell-ui.xml.h:1 src/nautilus-window-menus.c:1
-msgid "Hide Sidebar"
-msgstr ""
-
-#: src/nautilus-shell-ui.xml.h:1 src/nautilus-window-menus.c:1
-msgid "Hide Status Bar"
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
+#, fuzzy
+msgid "Hide St_atus Bar"
 msgstr "Ukryj pasek stanu"
 
-#: src/nautilus-shell-ui.xml.h:1 src/nautilus-window-menus.c:1
-msgid "Hide Tool Bar"
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
+msgid "Hide _Sidebar"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
+#, fuzzy
+msgid "Hide _Toolbar"
 msgstr "Ukryj pasek narzêdziowy"
 
-#: src/nautilus-shell-ui.xml.h:1
-msgid "Nautilus _License"
-msgstr "_Licencja Nautilusa"
+#: src/nautilus-shell-ui.xml.h:37
+#, fuzzy
+msgid "Nautilus Quick _Reference"
+msgstr "Preferencje Nautilusa"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:38
+#, fuzzy
+msgid "Nautilus Release _Notes"
+msgstr "Preferencje Nautilusa"
+
+#: src/nautilus-shell-ui.xml.h:39
+#, fuzzy
+msgid "Nautilus User _Manual"
+msgstr "Podrêcznik u¿ytkownika Nautilusa"
+
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "Nowe okno"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:41
+#, fuzzy
+msgid "New _Window"
+msgstr "Nowe okno"
+
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "Zwyk³y rozmiar"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Otwiera kolejne okno Nautilusa dla wy¶wietlanego po³o¿enia"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "Od¶wie¿"
 
-#: src/nautilus-shell-ui.xml.h:1
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "Usuwa zaznaczony tekst bez umieszczania go w schowku"
-
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr "Przeszukuje sieæ WWW"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr "Przeszukuje komputer w poszukiwaniu plików"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "Wy¶wietla zawarto¶æ w typowym powiêkszeniu"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "Wy¶wietla zawarto¶æ z mniejsz± ilo¶ci± szczegó³ów"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "Wy¶wietla zawarto¶æ z wiêksz± ilo¶ci± szczegó³ów"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "Wycofuje ostatni± zmianê tekstow±"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "Góra"
 
-#: src/nautilus-shell-ui.xml.h:1
-msgid "Use Advanced settings"
-msgstr "Wykorzystuje ustawienia zaawansowane"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
-msgid "Use Beginner settings"
-msgstr "Wykorzystuje ustawienia pocz±tkuj±cego"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
-msgid "Use Intermediate settings"
-msgstr "WYkorzystuje ustawienia ¶redniozaawansowane"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:63
+#, fuzzy
+msgid "We_b Search"
+msgstr "Przeszukiwanie WWW"
+
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "Przeszukiwanie WWW"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "Powiêksz"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "Pomniejsz"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "Po_wiêksz"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "Po_mniejsz"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "_Informacje o Nautilusie"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "_Dodaj zak³adkê"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "_Wstecz"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr "_T³a i symbole..."
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "_Zak³adki"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "_Zamknij okno"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:76
+#, fuzzy
+msgid "_Customer Support"
+msgstr "_Wsparcie"
+
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "_Modyfikuj zak³adki"
 
-#: src/nautilus-shell-ui.xml.h:1
-msgid "_Feedback..."
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "Preferencje konta"
+
+#: src/nautilus-shell-ui.xml.h:80
+msgid "_Feedback"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1 src/nautilus-window-menus.c:1
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "_Znajd¼"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "_Naprzód"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "P_rzejd¼"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "_Pocz±tek"
 
-#: src/nautilus-shell-ui.xml.h:1
-msgid "_Nautilus User Manual"
-msgstr "Podrêcznik u¿ytkownika Nautilusa"
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "Po³o¿enie"
 
-#: src/nautilus-shell-ui.xml.h:1
-msgid "_New Window"
-msgstr "_Nowe okno"
+#: src/nautilus-shell-ui.xml.h:88
+#, fuzzy
+msgid "_Nautilus Themes..."
+msgstr "Motyw Nautilusa:"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "_Zwyk³y rozmiar"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "Preferencje _us³ugi"
+
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr "_Profiler"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "_Od¶wie¿"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:1
-msgid "_Select All"
-msgstr "Zaznacz _wszystko"
-
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr "_Rozpocznij profilowanie"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr "_Zatrzymaj profilowanie"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "_Cofnij"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "O poziom w gó_rê"
 
-#: src/nautilus-shell-ui.xml.h:1
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "_Widok"
 
-#: src/nautilus-shell-ui.xml.h:1
-msgid "_Web Search"
-msgstr "Wyszukiwanie w _sieci WWW"
-
-#: src/nautilus-shell.c:1
-msgid "Caveat"
-msgstr ""
-
-#: src/nautilus-shell.c:1
-msgid ""
-"Thank you for your interest in Nautilus.\n"
-" \n"
-"As with any software under development, you should exercise caution when "
-"using Nautilus.  Eazel does not provide any guarantee that it will work "
-"properly, or assume any liability for your use of it.  Please use it at your "
-"own risk.\n"
-"\n"
-"Please visit http://www.eazel.com/feedback.html to provide feedback, "
-"comments, and suggestions."
-msgstr ""
-
-#: src/nautilus-sidebar.c:1
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -7774,11 +9697,11 @@ msgstr ""
 "Nie mo¿na przypisaæ wiêcej ni¿ jednego obrazu u¿ytkownika jednocze¶nie! "
 "Przeci±gnij dok³adnie jeden obraz, aby ustawiæ wygl±d ikony."
 
-#: src/nautilus-sidebar.c:1
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "Wiêcej ni¿ jeden obraz"
 
-#: src/nautilus-sidebar.c:1
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -7786,11 +9709,11 @@ msgstr ""
 "Przeci±gniêty plik nie jest lokalny. Jako ikony u¿ytkownika mog± byæ "
 "wykorzystywane tylko lokalne obrazy."
 
-#: src/nautilus-sidebar.c:1
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "Tylko lokalne obrazy"
 
-#: src/nautilus-sidebar.c:1
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -7798,69 +9721,80 @@ msgstr ""
 "Przeci±gniêty przez ciebie plik nie zawiera obrazu. Jako ikony u¿ytkownika "
 "mog± byæ wykorzystywane tylko lokalne obrazy."
 
-#: src/nautilus-sidebar.c:1
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "Tylko obrazy"
 
-#: src/nautilus-sidebar.c:1
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "Otwórz za pomoc± %s"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "Otwórz za pomoc±..."
 
-#: src/nautilus-switchable-search-bar.c:1
-msgid "Search For:"
-msgstr "Wyszukiwanie:"
+#. FIXME: We don't use spaces to pad labels!
+#: src/nautilus-sidebar.c:1424
+#, fuzzy
+msgid "  Empty Trash  "
+msgstr "Opró¿nij ¶mietnik"
+
+#: src/nautilus-switchable-search-bar.c:132
+#, fuzzy
+msgid "Find:"
+msgstr "Znajd¼"
 
 #. set the title and standard close accelerator
-#: src/nautilus-theme-selector.c:1
+#: src/nautilus-theme-selector.c:170
 msgid "Nautilus Theme Selector"
 msgstr "Wybór motywu Nautilusa"
 
 #. add the title label
-#: src/nautilus-theme-selector.c:1
+#: src/nautilus-theme-selector.c:199
 msgid "Nautilus Theme:"
 msgstr "Motyw Nautilusa:"
 
-#: src/nautilus-theme-selector.c:1
-msgid "Add new theme"
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:278
+#, fuzzy
+msgid "  Add New Theme  "
 msgstr "Dodaj nowy motyw"
 
-#: src/nautilus-theme-selector.c:1
-msgid "Remove theme"
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:288
+#, fuzzy
+msgid "  Remove Theme  "
 msgstr "Usuñ motyw"
 
-#: src/nautilus-theme-selector.c:1
+#: src/nautilus-theme-selector.c:400
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid theme folder."
 msgstr "Niestety, \"%s\" nie jest poprawnym folderem motywu."
 
-#: src/nautilus-theme-selector.c:1
+#: src/nautilus-theme-selector.c:401
 msgid "Couldn't add theme"
 msgstr "Nie mo¿na dodaæ motywu"
 
-#: src/nautilus-theme-selector.c:1
+#: src/nautilus-theme-selector.c:429
 #, c-format
 msgid "Sorry, but the \"%s\" theme couldn't be installed."
 msgstr "Niestety, nie mo¿na zainstalowaæ motywu \"%s\"."
 
-#: src/nautilus-theme-selector.c:1
+#: src/nautilus-theme-selector.c:430
 msgid "Couldn't install theme"
 msgstr "Nie mo¿na zainstalowaæ motywu"
 
-#: src/nautilus-theme-selector.c:1
+#: src/nautilus-theme-selector.c:463
 msgid "Select a theme folder to add as a new theme:"
 msgstr "Wybierz folder z motywem, który chcesz dodaæ:"
 
-#: src/nautilus-theme-selector.c:1 src/nautilus-theme-selector.c:1
+#: src/nautilus-theme-selector.c:495 src/nautilus-theme-selector.c:542
 msgid "Click on a theme to remove it."
 msgstr "Kliknij motyw, aby go usun±æ."
 
-#: src/nautilus-theme-selector.c:1
+#: src/nautilus-theme-selector.c:545
 msgid ""
 "Click on a theme to change the\n"
 "appearance of Nautilus."
@@ -7869,11 +9803,11 @@ msgstr ""
 "wygl±d Nautilusa."
 
 #. change the add button label back to it's normal state
-#: src/nautilus-theme-selector.c:1
+#: src/nautilus-theme-selector.c:558
 msgid "Add New Theme"
 msgstr "Dodaj nowy motyw"
 
-#: src/nautilus-theme-selector.c:1
+#: src/nautilus-theme-selector.c:585
 msgid ""
 "Sorry, but you can't remove the current theme. Please change to another "
 "theme before removing this one."
@@ -7881,88 +9815,93 @@ msgstr ""
 "Niestety, nie mo¿na usun±æ bie¿±cego motywu. Przed usuniêciem zmieñ motyw na "
 "inny."
 
-#: src/nautilus-theme-selector.c:1
+#: src/nautilus-theme-selector.c:587
 msgid "Can't delete current theme"
 msgstr "Nie mo¿na usun±æ bie¿±cego motywu"
 
-#: src/nautilus-theme-selector.c:1
+#: src/nautilus-theme-selector.c:608
 msgid "Sorry, but that theme could not be removed!"
 msgstr "Niestety, nie mo¿na usun±æ motywu!"
 
-#: src/nautilus-theme-selector.c:1
+#: src/nautilus-theme-selector.c:609
 msgid "Couldn't remove theme"
 msgstr "Nie mo¿na usun±æ motywu"
 
-#: src/nautilus-theme-selector.c:1
+#: src/nautilus-theme-selector.c:716
 #, c-format
 msgid "No description available for the \"%s\" theme"
 msgstr "Brak opisu motywu \"%s\""
 
+#: src/nautilus-window.c:637
+#, fuzzy
+msgid "View as ..."
+msgstr "Wy¶wietlanie jako inne..."
+
+#. Add "View as Other..." extra bonus choice.
+#: src/nautilus-window.c:1317
+msgid "View as Other..."
+msgstr "Wy¶wietlanie jako inne..."
+
+#: src/nautilus-window.c:1722
+msgid "Close"
+msgstr "Zamknij"
+
 #. FIXME bugzilla.eazel.com 5037: The text Preview
 #. * Release is hardcoded here. Are all builds with
 #. * time stamps really best described as "preview
 #. * release"?.
 #.
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:216
 #, c-format
 msgid "Preview Release %s: %s"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1
-#, c-format
-msgid "You do not have the permissions necessary to view \"%s\"."
-msgstr "Brak wymaganych uprawnieñ, aby wy¶wietliæ \"%s\"."
-
-#: src/nautilus-window-manage-views.c:1
-msgid "Inadequate Permissions"
-msgstr "Nieodpowiednie uprawnienia"
-
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "Wy¶wietlenie nie powiod³o siê"
 
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
 "view or go to a different location."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
 "happening, you might want to turn this panel off."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr "Nie mo¿na odnale¼æ \"%s\". Sprawd¼ zapis i spróbuj ponownie."
 
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
 msgstr ""
 "\"%s\" nie jest poprawnym po³o¿eniem. Sprawd¼ zapis i spróbuj ponownie."
 
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -7970,39 +9909,39 @@ msgid ""
 msgstr ""
 "Nie mo¿na wy¶wietliæ \"%s\" z powodu niemo¿no¶ci okre¶lenia typu pliku."
 
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr "Nie zainstalowano przegl±darki potrafi±cej wy¶wietlaæ \"%s\"."
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 "Nie mo¿na wy¶wietliæ \"%s\" z powodu niemo¿no¶ci obs³u¿enia przez Nautilusa "
 "%s."
 
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "Nie mo¿na wy¶wietliæ \"%s\" z powodu nieudanej próby zalogowania."
 
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "Nie mo¿na wy¶wietliæ \"%s\" z powodu braku dostêpu."
 
-#: src/nautilus-window-manage-views.c:1
-#, c-format
+#: src/nautilus-window-manage-views.c:1287
+#, fuzzy, c-format
 msgid ""
-"Couldn't display \"%s\", because the host couldn't be found. Check that your "
-"proxy settings are correct."
+"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
+"the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Nie mo¿na wy¶wietliæ \"%s\" z powodu niemo¿no¶ci odnalezienia nazwy "
 "komputera. Sprawd¼, czy ustawienia po¶rednika s± poprawne."
 
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -8011,7 +9950,7 @@ msgstr ""
 "Nie mo¿na wy¶wietliæ \"%s\" z powodu pustej nazwy komputera. Sprawd¼, czy "
 "ustawienia po¶rednika s± poprawne."
 
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -8019,77 +9958,64 @@ msgid ""
 "running."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "Wyszukiwanie jest niedostêpne"
 
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nie mo¿na wy¶wietliæ \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "Nie mo¿na wy¶wietliæ po³o¿enia"
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:1
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
 msgstr ""
 
-#: src/nautilus-window-menus.c:1
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
 
-#: src/nautilus-window-menus.c:1
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr ""
 
-#: src/nautilus-window-menus.c:1
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr ""
 
-#: src/nautilus-window-menus.c:1
-msgid "Show Status Bar"
+#: src/nautilus-window-menus.c:466
+#, fuzzy
+msgid "Show St_atus Bar"
 msgstr "Wy¶wietlanie paska stanu"
 
-#: src/nautilus-window-menus.c:1
-msgid "Show Sidebar"
+#: src/nautilus-window-menus.c:472
+msgid "Show _Sidebar"
 msgstr ""
 
-#: src/nautilus-window-menus.c:1
-msgid "Show Tool Bar"
+#: src/nautilus-window-menus.c:478
+#, fuzzy
+msgid "Show _Toolbar"
 msgstr "Wy¶wietlanie paska narzêdziowego"
 
-#: src/nautilus-window-menus.c:1
-msgid "Show Location Bar"
+#: src/nautilus-window-menus.c:484
+#, fuzzy
+msgid "Show Location _Bar"
 msgstr "Wy¶wietlanie paska po³o¿enia"
 
-#. Localizers: This is the message in the dialog that appears if the user chooses "Edit Beginner Settings".
-#. * The first %s is the name of the lowest user level ("Beginner"). The 2nd and 4th %s are the
-#. * names of the middle user level ("Intermediate"). The 3rd %s is the name of the highest user
-#. * level ("Advanced").
-#.
-#: src/nautilus-window-menus.c:1
-#, c-format
-msgid ""
-"None of the settings for the %s level can be edited. If you want to edit the "
-"settings you must choose the %s or %s level. Do you want to switch to the %s "
-"level now and edit its settings?"
-msgstr ""
-
-#. Localizers: This is the title of the dialog that appears if the user chooses "Edit Beginner Settings".
-#. * The %s is the name of the middle user level ("Intermediate").
-#.
-#: src/nautilus-window-menus.c:1
-#, c-format
-msgid "Switch to %s Level?"
-msgstr "Prze³±czyæ na poziom %s?"
+#: src/nautilus-window-menus.c:535
+#, fuzzy
+msgid "Preferences"
+msgstr "Preferencje konta"
 
 #. Localize to deal with
 #. * issues in the copyright
@@ -8097,11 +10023,11 @@ msgstr "Prze³±czyæ na poziom %s?"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:1
+#: src/nautilus-window-menus.c:618
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr ""
 
-#: src/nautilus-window-menus.c:1
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -8109,7 +10035,17 @@ msgid ""
 "and the rest of your system."
 msgstr ""
 
-#: src/nautilus-window-menus.c:1
+#. translators should localize the following
+#. * string which will be displayed at the
+#. * bottom of the about box to give credit
+#. * to the translator(s)
+#.
+#: src/nautilus-window-menus.c:629
+#, fuzzy
+msgid "Translator Credits"
+msgstr "Transakcje s± zapisane w %s"
+
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -8118,70 +10054,620 @@ msgstr ""
 "Po³o¿enie \"%s\" nie istnieje. Czy chcesz usun±æ ze swojej listy zak³adki "
 "zawieraj±ce to po³o¿enie?"
 
-#: src/nautilus-window-menus.c:1
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "Zak³adka nieistniej±cego po³o¿enia"
 
-#: src/nautilus-window-menus.c:1
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "Po³o¿enie \"%s\" ju¿ nie istnieje"
 
-#: src/nautilus-window-menus.c:1
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "Przechodzi do nieistniej±cego po³o¿enia"
 
-#: src/nautilus-window-menus.c:1
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "Przechodzi do po³o¿enia opisywanego przez tê zak³adkê"
 
-#: src/nautilus-window-menus.c:1
-msgid "_Browse"
-msgstr "_Przegl±daj"
-
-#. Localizers: This is the title of the user-level settings
-#. * dialog. %s will be replaced with the name of a user level
-#. * ("Beginner", "Intermediate", or "Advanced").
-#.
-#: src/nautilus-window-menus.c:1
-#, c-format
-msgid "Edit %s Settings"
-msgstr "Modyfikacja ustawieñ na poziomie %s"
-
-#. Localizers: This is the label for the menu item that brings
-#. * up the user-level settings dialog. %s will be replaced with
-#. * the name of a user level ("Beginner", "Intermediate", or
-#. * "Advanced").
-#.
-#: src/nautilus-window-menus.c:1
-#, c-format
-msgid "Edit %s Settings..."
-msgstr "Zmodyfikuj ustawienia na poziomie %s..."
-
-#: src/nautilus-window-toolbars.c:1
+#: src/nautilus-window-toolbars.c:402
 msgid "Back"
 msgstr "Wstecz"
 
-#: src/nautilus-window-toolbars.c:1
+#: src/nautilus-window-toolbars.c:404
 msgid "Forward"
 msgstr "Naprzód"
 
-#. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1
-msgid "View as Other..."
-msgstr "Wy¶wietlanie jako inne..."
-
-#: src/nautilus-window.c:1
-msgid "Close"
-msgstr "Zamknij"
-
-#: src/nautilus-zoom-control.c:1
+#. Note to localizers: this font is used for the number in the
+#. * zoom control widget.
+#.
+#: src/nautilus-zoom-control.c:531
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-2"
 
-#. This is marked for localization in case the % sign is not
-#. * appropriate in some locale. I guess that's unlikely.
-#.
-#: src/nautilus-zoom-control.c:1
-msgid "%.0f%%"
-msgstr "%.0f%%"
+#~ msgid "System"
+#~ msgstr "System"
+
+#~ msgid "Config files"
+#~ msgstr "Pliki konfiguracyjne"
+
+#~ msgid "Command Line"
+#~ msgstr "Wiersz poleceñ"
+
+#~ msgid "APIs"
+#~ msgstr "Interfejsy Programistyczne (API)"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Ró¿ne"
+
+#~ msgid "Mozilla Test"
+#~ msgstr "Test Mozilli"
+
+#~ msgid "_Mozilla Test"
+#~ msgstr "Test _Mozilli"
+
+#~ msgid "Sound hardware missing or busy!"
+#~ msgstr "Brak sprzêtu do odtwarzania d¼wiêku lub jest on zajêty!"
+
+#~ msgid "Verifying %s..."
+#~ msgstr "Weryfikowanie %s..."
+
+#~ msgid "Checking \"%s\" (%ld/%ld)"
+#~ msgstr "Sprawdzanie \"%s\" (%ld/%ld)"
+
+#~ msgid "%s would not work anymore\n"
+#~ msgstr "%s nie bêdzie ju¿ poprawnie dzia³a³o\n"
+
+#~ msgid "%s would break other installed packages\n"
+#~ msgstr "%s uszkodzi³by inne zainstalowane pakiety\n"
+
+#~ msgid "%s causes a circular dependency problem\n"
+#~ msgstr "%s powoduje problem zwi±zany z zapêtlonymi zale¿no¶ciami\n"
+
+#~ msgid "Installing %s failed because of the following issue(s):\n"
+#~ msgstr "Instalacja %s nie powiod³a siê z nastêpuj±cych powodów\n"
+
+#~ msgid "Uninstalling %s failed because of the following issue(s):\n"
+#~ msgstr "Odinstalowanie %s nie powiod³o siê z nastêpuj±cych powodów\n"
+
+#~ msgid "Uninstall failed..."
+#~ msgstr "Odinstalowanie nie powiod³o siê"
+
+#~ msgid "Uninstall Failed"
+#~ msgstr "Odinstalowanie nie powiod³o siê"
+
+#~ msgid "Install failed..."
+#~ msgstr "Instalacja nie powiod³a siê..."
+
+#~ msgid "Package Contents"
+#~ msgstr "Zawarto¶æ pakietu"
+
+#~ msgid "Package Title"
+#~ msgstr "Tytu³ pakietu"
+
+#~ msgid "Size: "
+#~ msgstr "Rozmiar: "
+
+#~ msgid "<size>"
+#~ msgstr "<rozmiar>"
+
+#~ msgid "<unknown>"
+#~ msgstr "<nieznane>"
+
+#~ msgid "License: "
+#~ msgstr "Licencja: "
+
+#~ msgid "Build Date: "
+#~ msgstr "Data utworzenia: "
+
+#~ msgid "Vendor: "
+#~ msgstr "Sprzedawca: "
+
+#~ msgid "Update"
+#~ msgstr "Uaktualnij"
+
+#~ msgid "Verify"
+#~ msgstr "Zweryfikuj"
+
+#~ msgid "Go to selected file"
+#~ msgstr "Przechodzi do zaznaczonego pliku"
+
+#~ msgid "Package Contents: %d files"
+#~ msgstr "Zawarto¶æ pakietu: %d plików"
+
+#~ msgid "Package \"%s\" "
+#~ msgstr "Pakiet \"%s\" "
+
+#~ msgid "Force install"
+#~ msgstr "Wymuszona instalacja"
+
+#~ msgid "Set port numer (80)"
+#~ msgstr "Ustawia numer portu (80)"
+
+#~ msgid "Set tmp dir (/tmp)"
+#~ msgstr "Ustaw katalog tymczasowy (/tmp)"
+
+#~ msgid "%s already installed"
+#~ msgstr "%s zosta³ ju¿ zainstalowany"
+
+#~ msgid "Category = %s"
+#~ msgstr "Kategoria = %s"
+
+#~ msgid "Removing package %s (0x%p) %s"
+#~ msgstr "Usuwanie pakietu %s (0x%p) %s"
+
+#~ msgid "%s is not installed"
+#~ msgstr "%s nie jest zainstalowany"
+
+#~ msgid "Downloaded package does not have the correct version"
+#~ msgstr "Pobrany pakiet nie jest w poprawnej wersji"
+
+#~ msgid "Processing dep for %s, requires library %s"
+#~ msgstr "Przetwarzanie zale¿no¶ci %s, wymaga biblioteki %s"
+
+#~ msgid "Processing dep for %s, requires package %s"
+#~ msgstr "Przetwarzanie zale¿no¶ci %s, wymaga pakietu %s"
+
+#~ msgid "Package %s conflicts with %s-%s"
+#~ msgstr "Pakiet %s jest w konflikcie z %s-%s"
+
+#~ msgid ""
+#~ "\n"
+#~ "Is this okay?"
+#~ msgstr ""
+#~ "\n"
+#~ "Zgadzasz siê?"
+
+#~ msgid "Preparing to install 1 package"
+#~ msgstr "Przeygotowanie do instalacji jednego pakietu"
+
+#~ msgid "Installation aborted."
+#~ msgstr "Instalacja zosta³a przerwana."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "%s\n"
+#~ "Erase the leftover RPM files?"
+#~ msgstr ""
+#~ "%s\n"
+#~ "%s\n"
+#~ "Czy usun±æ pozosta³e pliki RPM?"
+
+#~ msgid "Contacting install server ..."
+#~ msgstr "Nawi±zywanie po³±czenia z serwerem instalacji ..."
+
+#~ msgid "New password (again): "
+#~ msgstr "Nowe has³o (ponownie): "
+
+#~ msgid "  I need some help!  "
+#~ msgstr "  Potrzebujê pomocy!  "
+
+#~ msgid "Welcome Back %s!"
+#~ msgstr "Witaj ponownie %s!"
+
+#~ msgid "Your Services"
+#~ msgstr "Twoje us³ugi"
+
+#~ msgid "Additional Services"
+#~ msgstr "Dodatkowe us³ugi"
+
+#~ msgid "Current Updates"
+#~ msgstr "Bie¿±ce uaktualnienia"
+
+#~ msgid "Version %s"
+#~ msgstr "Wersja %s"
+
+#~ msgid "Enable debugging"
+#~ msgstr "Aktywuje ¶ledzenie przebiegu"
+
+#~ msgid "Error: No operation supplied\n"
+#~ msgstr "B³±d: Nie podano operacji\n"
+
+#~ msgid "Error: Invalid operation supplied (%s)\n"
+#~ msgstr "B³±d: Podano niepoprawn± operacjê (%s)\n"
+
+#~ msgid ""
+#~ "Error: Invalid syntax\n"
+#~ "Syntax: %s\n"
+#~ msgstr ""
+#~ "B³±d: Niepoprawna sk³adnia\n"
+#~ "Sk³adnia: %s\n"
+
+#~ msgid "Clouds"
+#~ msgstr "Chmury"
+
+#~ msgid "Leaves"
+#~ msgstr "Li¶cie"
+
+#~ msgid "White Paper"
+#~ msgstr "Bia³y papier"
+
+#~ msgid "Yellow Paper"
+#~ msgstr "¯ó³ty papier"
+
+#~ msgid "Caldera"
+#~ msgstr "Caldera"
+
+#~ msgid "Helix Code"
+#~ msgstr "Helix Code"
+
+#~ msgid "Hewlett-Packard"
+#~ msgstr "Hewlett-Packard"
+
+#~ msgid "IBM"
+#~ msgstr "IBM"
+
+#~ msgid "Inprise"
+#~ msgstr "Inprise"
+
+#~ msgid "Linux Companies"
+#~ msgstr "Firmy linuksowe"
+
+#~ msgid "Linux at IBM"
+#~ msgstr "Linux w IBM"
+
+#~ msgid "Linuxcare"
+#~ msgstr "Linuxcare"
+
+#~ msgid "Myplay"
+#~ msgstr "Myplay"
+
+#~ msgid "Slashdot.org"
+#~ msgstr "Slashdot.org"
+
+#~ msgid "SourceXchange"
+#~ msgstr "SourceXchange"
+
+#~ msgid "VA Linux"
+#~ msgstr "VA Linux"
+
+#~ msgid "VMware"
+#~ msgstr "VMware"
+
+#~ msgid "You cannot throw \"%s\" into the Trash."
+#~ msgstr "Nie mo¿na wyrzuciæ \"%s\" do ¶mietnika."
+
+#~ msgid "Error Moving to Trash"
+#~ msgstr "B³±d przy przenoszeniu do ¶mietnika"
+
+#~ msgid "Font"
+#~ msgstr "Czcionka"
+
+#~ msgid "Folder Views"
+#~ msgstr "Widok folderu"
+
+#~ msgid "Folder Views Settings"
+#~ msgstr "Ustawienia widoków folderów"
+
+#~ msgid "Window Behavior"
+#~ msgstr "Zachowanie okien"
+
+#~ msgid "Appearance Settings"
+#~ msgstr "Ustawienia wygl±du"
+
+#~ msgid "Views"
+#~ msgstr "Widoki"
+
+#~ msgid "Speed Tradeoffs Settings"
+#~ msgstr "Ustawienia dotycz±ce wydajno¶ci"
+
+#~ msgid "Search Settings"
+#~ msgstr "Ustawienia wyszukiwania"
+
+#~ msgid "Search Tradeoffs"
+#~ msgstr "Opcje wyszukiwania"
+
+#~ msgid "Search Locations"
+#~ msgstr "Przeszukiwane po³o¿enia"
+
+#~ msgid "Navigation Settings"
+#~ msgstr "Ustawienia nawigacji"
+
+#~ msgid "Home Location"
+#~ msgstr "Po³o¿enie pocz±tkowe"
+
+#~ msgid "HTTP Proxy"
+#~ msgstr "Port po¶rednika HTTP"
+
+#~ msgid "HTTP Proxy Port"
+#~ msgstr "Port po¶rednika HTTP"
+
+#~ msgid "current theme"
+#~ msgstr "bie¿±cy motyw"
+
+#~ msgid "Ask before deleting items from the trash"
+#~ msgstr "Pytanie przed usuwaniem elementów ze ¶mietnika"
+
+#~ msgid "Click policy"
+#~ msgstr "Zachowanie siê klikniêæ"
+
+#~ msgid "Display text in icons"
+#~ msgstr "Wy¶wietlanie tekstu wewn±trz ikon"
+
+#~ msgid "Show thumbnails for image files"
+#~ msgstr "Wy¶wietlanie miniaturek plików graficznych"
+
+#~ msgid "Play a sound file when the mouse is over it"
+#~ msgstr ""
+#~ "Odtwarzanie pliku d¼wiêkowego przy przesuniêciu nad niego wska¼nika myszy"
+
+#~ msgid "Font family used to display file names"
+#~ msgstr "Czcionka wykorzystywana przy wy¶wietlaniu nazw plików"
+
+#~ msgid "Always do slow, complete search"
+#~ msgstr "Wykonywanie zawsze powolnego, pe³nego wyszukiwania"
+
+#~ msgid ""
+#~ "Sorry, %s can only open local files, and \"%s\" is remote. If you want to "
+#~ "open it with %s, make a local copy first."
+#~ msgstr ""
+#~ "Niestety, %s mo¿e otwieraæ tylko lokalne pliki, za¶ \"%s\" jest zdalny. "
+#~ "Je¶li chcesz go otworzyæ za pomoc± %s, utwórz najpierw lokaln± kopiê."
+
+#~ msgid "Can't open remote file"
+#~ msgstr "Nie mo¿na otworzyæ zdalnego pliku"
+
+#~ msgid "containing \"%s\" in their names"
+#~ msgstr "zawieraj± \"%s\" w nazwie"
+
+#~ msgid "applications"
+#~ msgstr "aplikacje"
+
+#~ msgid "folders"
+#~ msgstr "foldery"
+
+#~ msgid "music"
+#~ msgstr "muzyka"
+
+#~ msgid "owned by \"%s\""
+#~ msgstr "s± w posiadaniu \"%s\""
+
+#~ msgid "modified on %s"
+#~ msgstr "zmodyfikowane dnia %s"
+
+#~ msgid "marked with \"%s\""
+#~ msgstr "oznaczone symbolem \"%s\""
+
+#~ msgid " and "
+#~ msgstr " i "
+
+#~ msgid "Items %s %s"
+#~ msgstr "Elementy %s %s"
+
+#~ msgid "Warning"
+#~ msgstr "Ostrze¿enie"
+
+#~ msgid "Error"
+#~ msgstr "B³±d"
+
+#~ msgid "Details"
+#~ msgstr "Szczegó³y"
+
+#~ msgid "Question"
+#~ msgstr "Pytanie"
+
+#~ msgid "_Cut Text"
+#~ msgstr "_Wytnij tekst"
+
+#~ msgid "Link to %s"
+#~ msgstr "dowi±zanie do %s"
+
+#~ msgid "Link to Unknown"
+#~ msgstr "Dowi±zanie do nieznanego elementu"
+
+#~ msgid "Open in _New Window"
+#~ msgstr "Otwórz w _nowym oknie"
+
+#~ msgid "Where:"
+#~ msgstr "Po³o¿enie:"
+
+#~ msgid "Select an image to represent the file:"
+#~ msgstr "Wybór obrazu reprezentuj±cego plik:"
+
+#~ msgid "New _Folder"
+#~ msgstr "Nowy _folder"
+
+#~ msgid "_Open in New Window"
+#~ msgstr "_Otwórz w nowym oknie"
+
+#~ msgid "_Select All Files"
+#~ msgstr "_Zaznacz wszystkie pliki"
+
+#~ msgid "Error while trying to reindex: Busy"
+#~ msgstr "B³±d podczas próby przeindeksowania: Zajêty"
+
+#~ msgid "Error while trying to reindex: No response"
+#~ msgstr "B³±d podczas próby przeindeksowania: Brak odpowiedzi"
+
+#~ msgid "Error while trying to reindex: No indexer present"
+#~ msgstr "B³±d podczas próby przeindeksowania: Brak programu indeksuj±cego"
+
+#~ msgid "Error While Reindexing"
+#~ msgstr "B³±d podczas przeindeksowywania"
+
+#~ msgid "Your files are currently being indexed:"
+#~ msgstr "Twoje pliki s± teraz indeksowane:"
+
+#~ msgid "Indexing Info"
+#~ msgstr "Informacje o indeksowaniu"
+
+#~ msgid ""
+#~ "For beginner users that are not yet\n"
+#~ "familiar with the working of GNOME and Linux."
+#~ msgstr ""
+#~ "Dla pocz±tkuj±cych u¿ytkowników, którzy nie s± jeszcze obeznani ze "
+#~ "¶rodowiskiem GNOME, ani z Linuksem."
+
+#~ msgid "I want to learn more about Eazel services."
+#~ msgstr "Chcê siê dowiedzieæ wiêcej o us³ugach Eazela."
+
+#~ msgid "I want to sign up for Eazel services now."
+#~ msgstr "Chcê siê teraz zapisaæ do us³ug Eazela."
+
+#~ msgid "I've already signed up and want to login now."
+#~ msgstr "Ju¿ siê zapisa³em i chcê siê teraz zalogowaæ."
+
+#~ msgid "I don't want to learn about Eazel services at this time."
+#~ msgstr "Tym razem nie chcê siê dowiedzieæ wiêcej o us³ugach Eazela."
+
+#~ msgid "Updating Nautilus"
+#~ msgstr "Aktualizowanie Nautilusa"
+
+#~ msgid "No, don't contact Eazel services at this time."
+#~ msgstr "Nie, tym razem nie ³±cz siê z us³ugami Eazela."
+
+#~ msgid "HTTP Proxy Configuration"
+#~ msgstr "Konfiguracja po¶rednika HTTP"
+
+#~ msgid ""
+#~ "Since this is the first time that you've launched\n"
+#~ "Nautilus, we'd like to ask you a few questions\n"
+#~ "to help personalize it for your use."
+#~ msgstr ""
+#~ "Poniewa¿ Nautilus zosta³ przez ciebie uruchomiony\n"
+#~ "po raz pierwszy, odpowiedz na kilka pytañ, dziêki\n"
+#~ "czemu pomo¿esz dostosowaæ program do wykorzystywanych\n"
+#~ "zastosowañ."
+
+#~ msgid "Press the next button to continue."
+#~ msgstr "Wci¶nij przycisk \"Naprzód\" aby kontynuowaæ."
+
+#~ msgid ""
+#~ "Click the finish button to launch Nautilus.\n"
+#~ "We hope that you enjoy using it!"
+#~ msgstr ""
+#~ "Wci¶nij przycisk \"Zakoñcz\" aby uruchomiæ Nautilusa.\n"
+#~ "Mamy nadziejê, ¿e bêdzie on ¼ród³em zadowolenia!"
+
+#~ msgid "Sign Up for Eazel Services"
+#~ msgstr "Zapisz siê do us³ug Eazela"
+
+#~ msgid "Nautilus Update"
+#~ msgstr "Aktualizacja Nautilusa"
+
+#~ msgid "With Emblem"
+#~ msgstr "Z symbolem"
+
+#~ msgid "Last Modified"
+#~ msgstr "Ostatnio zmieniony"
+
+#~ msgid "Owner"
+#~ msgstr "W³a¶ciciel"
+
+#~ msgid "contains"
+#~ msgstr "zawiera"
+
+#~ msgid "starts with"
+#~ msgstr "rozpoczyna siê od"
+
+#~ msgid "ends with"
+#~ msgstr "koñczy siê na"
+
+#~ msgid "matches glob"
+#~ msgstr "pasuje do wzorca"
+
+#~ msgid "matches regexp"
+#~ msgstr "pasuje do wyra¿enia regularnego"
+
+#~ msgid "includes all of"
+#~ msgstr "zawiera wszystkie z"
+
+#~ msgid "includes any of"
+#~ msgstr "zawiera którykolwiek z"
+
+#~ msgid "includes none of"
+#~ msgstr "nie zawiera ¿adnego z"
+
+#~ msgid "is"
+#~ msgstr "jest"
+
+#~ msgid "is not"
+#~ msgstr "nie jest"
+
+#~ msgid "text file"
+#~ msgstr "plik tekstowy"
+
+#~ msgid "application"
+#~ msgstr "aplikacja"
+
+#~ msgid "folder"
+#~ msgstr "folder"
+
+#~ msgid "larger than"
+#~ msgstr "wiêkszy ni¿"
+
+#~ msgid "smaller than"
+#~ msgstr "mniejszy ni¿"
+
+#~ msgid "marked with"
+#~ msgstr "oznaczone symbolem"
+
+#~ msgid "not marked with"
+#~ msgstr "nie oznaczone symbolem"
+
+#~ msgid "is after"
+#~ msgstr "jest po"
+
+#~ msgid "is before"
+#~ msgstr "jest przed"
+
+#~ msgid "is today"
+#~ msgstr "jest dzi¶"
+
+#~ msgid "is yesterday"
+#~ msgstr "jest wczoraj"
+
+#~ msgid "C_hange Appearance..."
+#~ msgstr "_Zmieñ wygl±d"
+
+#~ msgid "Edit Settings..."
+#~ msgstr "Zmodyfikuj ustawienia..."
+
+#~ msgid "Edit settings for the current user level"
+#~ msgstr "Zmienia ustawienia na bie¿±cym poziomie u¿ytkownika"
+
+#~ msgid "Nautilus _License"
+#~ msgstr "_Licencja Nautilusa"
+
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "Usuwa zaznaczony tekst bez umieszczania go w schowku"
+
+#~ msgid "Use Advanced settings"
+#~ msgstr "Wykorzystuje ustawienia zaawansowane"
+
+#~ msgid "Use Beginner settings"
+#~ msgstr "Wykorzystuje ustawienia pocz±tkuj±cego"
+
+#~ msgid "Use Intermediate settings"
+#~ msgstr "WYkorzystuje ustawienia ¶redniozaawansowane"
+
+#~ msgid "_New Window"
+#~ msgstr "_Nowe okno"
+
+#~ msgid "_Web Search"
+#~ msgstr "Wyszukiwanie w _sieci WWW"
+
+#~ msgid "Search For:"
+#~ msgstr "Wyszukiwanie:"
+
+#~ msgid "Add new theme"
+#~ msgstr "Dodaj nowy motyw"
+
+#~ msgid "Inadequate Permissions"
+#~ msgstr "Nieodpowiednie uprawnienia"
+
+#~ msgid "Switch to %s Level?"
+#~ msgstr "Prze³±czyæ na poziom %s?"
+
+#~ msgid "_Browse"
+#~ msgstr "_Przegl±daj"
+
+#~ msgid "Edit %s Settings"
+#~ msgstr "Modyfikacja ustawieñ na poziomie %s"
+
+#~ msgid "Edit %s Settings..."
+#~ msgstr "Zmodyfikuj ustawienia na poziomie %s..."
+
+#~ msgid "%.0f%%"
+#~ msgstr "%.0f%%"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 24949a9c9..5f3d2a66f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,10 +2,15 @@
 # Copyright (C) 2000-2001 Free Software Foundation, Inc.
 # Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>, 2000-2001.
 #
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 1.0\n"
-"POT-Creation-Date: 2001-03-12 14:17-0300\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-03-12 16:35-03:00\n"
 "Last-Translator: Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -142,8 +147,8 @@ msgid "Previous"
 msgstr "Anterior"
 
 #: components/help/converters/gnome-db2html2/gdb3html.c:721
-#: libnautilus-extensions/nautilus-global-preferences.c:686
-#: src/nautilus-shell-ui.xml.h:38
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "Início"
 
@@ -332,16 +337,14 @@ msgid "Kernel Routines"
 msgstr "Rotinas do kernel"
 
 #: components/help/hyperbola-filefmt.c:703
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
 msgid "Info"
 msgstr "Informação"
 
-#: components/help/hyperbola-nav-tree.c:279
+#: components/help/hyperbola-nav-tree.c:310
 msgid "Introductory Documents:"
 msgstr "Documentos introdutórios:"
 
-#: components/help/hyperbola-nav-tree.c:293
+#: components/help/hyperbola-nav-tree.c:324
 msgid "Documents by Subject:"
 msgstr "Documentos por assunto:"
 
@@ -414,7 +417,7 @@ msgstr "Painel da barra lateral de histórico"
 msgid "History sidebar panel for Nautilus"
 msgstr "Painel da barra lateral de histórico para o Nautilus"
 
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "Não foi possível iniciar Bonobo"
 
@@ -472,7 +475,7 @@ msgstr "Mata a visão de conteúdo Perdedor"
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "_Arquivo"
 
@@ -556,7 +559,7 @@ msgid "Sidebar Loser"
 msgstr "Barra lateral perdedor"
 
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -566,7 +569,7 @@ msgstr ""
 "  %s"
 
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -921,7 +924,9 @@ msgid ""
 "\n"
 "Try viewing the page in a different web browser, such as Mozilla or Netscape."
 msgstr ""
-"Uma função JavaScript (um pequeno programa) nesta página tentou abrir uma nova janela, mas o Nautilus não suporta a abertura de novas janelas por JavaScript.\n"
+"Uma função JavaScript (um pequeno programa) nesta página tentou abrir uma "
+"nova janela, mas o Nautilus não suporta a abertura de novas janelas por "
+"JavaScript.\n"
 "\n"
 "Tente ver esta página em um navegador diferente, como o Mozilla ou Netscape."
 
@@ -1010,7 +1015,6 @@ msgid "Oldies"
 msgstr "Antigas"
 
 #: components/music/mpg123.c:32
-#: libnautilus-extensions/nautilus-font-picker.c:117
 msgid "Other"
 msgstr "Outro"
 
@@ -1649,10 +1653,10 @@ msgid "Pause"
 msgstr "Pausa"
 
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:945
-#: libnautilus-extensions/nautilus-file-operations.c:960
 #: libnautilus-extensions/nautilus-file-operations.c:979
-#: src/nautilus-shell-ui.xml.h:60
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Parar"
 
@@ -1702,23 +1706,6 @@ msgstr "Fábrica de visão de música"
 msgid "View as Music"
 msgstr "Ver como música"
 
-#. FIXME: eventually, get this from preferences
-#. set up the default font
-#: components/notes/nautilus-notes.c:200
-#: components/text/nautilus-text-view.c:186
-#: libnautilus-extensions/nautilus-global-preferences.c:1118
-#: libnautilus-extensions/nautilus-icon-container.c:3332
-#: libnautilus-extensions/nautilus-icon-container.c:3333
-#: libnautilus-extensions/nautilus-icon-container.c:3334
-#: libnautilus-extensions/nautilus-icon-container.c:3335
-#: libnautilus-extensions/nautilus-icon-container.c:3336
-#: libnautilus-extensions/nautilus-icon-container.c:3337
-#: libnautilus-extensions/nautilus-icon-container.c:3338
-#: libnautilus-extensions/nautilus-preferences-item.c:482
-#: src/nautilus-sidebar-title.c:500
-msgid "helvetica"
-msgstr "helvetica"
-
 #: components/notes/Nautilus_View_notes.oaf.in.h:1
 msgid "Factory for annotation view"
 msgstr "Fábrica para visão de anotações"
@@ -1812,7 +1799,7 @@ msgstr "Especificar cgi de busca"
 #: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
 #: components/services/install/command-line/eazel-test-packsys.c:590
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "Exibir saída de depuração"
 
@@ -1876,171 +1863,174 @@ msgstr "Argumentos do RPM são arquivos necessários"
 msgid "Run Query"
 msgstr "Executar consulta"
 
-#. Disabled for 1.0
-#. {"revert", 'r', POPT_ARG_NONE, &arg_revert, 0, N_("Revert"), NULL},
-#: components/services/install/command-line/eazel-alt-install-corba.c:127
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
+#, fuzzy
+msgid "Revert"
+msgstr "nunca"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr "Configurar raiz"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:128
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "Especificar servidor"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:129
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
 msgid "Dont print too much, just problems and download"
 msgstr "Não imprima muito, apenas problemas e transferências"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:130
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr "Executar renomear ssl"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:131
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
 msgid "argument is a suite id"
 msgstr "argumento é um suite de ID"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "Execução de teste"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr "Permitir nome de usuário"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:134
-#: components/services/install/lib/eazel-install-problem.c:1011
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "Permitir atualizações"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "Saída detalhada"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:136
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
 msgid "Install a specific package version"
 msgstr "Instalar uma versão específica de pacote"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:159
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
 msgid "*** You cannot specify more then one protocol type.\n"
 msgstr "*** Você não pode especificar mais de um tipo de protocolo.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:176
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
 msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
 msgstr "*** Apagar e reverter? Somebody set up us the bomb!\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:285
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, c-format
 msgid "File conflict checking %s...\n"
 msgstr "Conflito de arquivo ao verificar %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:299
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, c-format
 msgid "File uniqueness checking %s...\n"
 msgstr "Verificando unicidade de arquivos em %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:313
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
 #, c-format
 msgid "Feature consistency checking %s...\n"
 msgstr "Verificando consistência de funcionalidade em %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:344
-#: components/services/install/lib/eazel-install-protocols.c:110
-#: components/services/install/lib/eazel-install-protocols.c:248
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
 #, c-format
 msgid "Downloading %s..."
 msgstr "Baixando %s..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:360
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
 msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
 msgstr "Baixando %s... (%d/%d) = %d%% %.1f KB/s"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:368
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
 msgid "Downloading %s... (%d/%d) = %d%%"
 msgstr "Baixando %s... (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:376
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
 #, c-format
 msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
 msgstr "Baixando %s... (%d/%d) %.1f KB/s Concluído   \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:381
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
 #, c-format
 msgid "Downloading %s... %3.1f KB/s Done\n"
 msgstr "Baixando %s... %3.1f KB/s Concluído\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:409
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "Instalando %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:417
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "Desinstalando %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:439
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "Instalando %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:446
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "Desinstalando %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:454
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
 msgid "Done\n"
 msgstr "Concluído\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:474
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
 #, c-format
 msgid "Download of %s FAILED\n"
 msgstr "Falhou a transferência de %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:496
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
 #, c-format
 msgid "Package %s failed to uninstall.\n"
 msgstr "Falhou a desinstalação do pacote %s.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:498
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
 #, c-format
 msgid "Package %s failed to install.\n"
 msgstr "Falhou a instalação do pacote %s.\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:519
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
 #, c-format
 msgid "\t· Problem : %s\n"
 msgstr "\t· Problema : %s\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:528
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
 #, c-format
 msgid "\t· Action : %s\n"
 msgstr "\t· Ação : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:571
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
 msgid "Cancelling operation\n"
 msgstr "Cancelando operação\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:582
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
 #, c-format
 msgid "About to install a total of %d packages, %dKB\n"
 msgstr "Prestes a instalar um total de %d pacotes, %dKB\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:586
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
 #, c-format
 msgid "About to uninstall a total of %d packages, %dKB\n"
 msgstr "Prestes a desinstalar um total de %d pacotes, %dKB\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:590
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
 #, c-format
 msgid "About to revert a total of %d packages, %d KB\n"
 msgstr "Prestes a reverter um total de %d pacotes, %d KB\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:607
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
 #, c-format
 msgid "\t· %s and it's dependencies\n"
 msgstr "\t· %s e suas dependências\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:610
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
 #, c-format
 msgid "\t· %s\n"
 msgstr "\t· %s\n"
@@ -2050,38 +2040,38 @@ msgstr "\t· %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n) " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:638
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
 msgid "Save transaction report ? (y/n) "
 msgstr "Salvar relatório de transação? (s/n)"
 
 #. I18N note: y is the letter for the word Yes. This is
 #. used in the response for a yes/no questions. Your translation
 #. must be 1 character only.
-#: components/services/install/command-line/eazel-alt-install-corba.c:649
-#: components/services/install/command-line/eazel-alt-install-corba.c:769
-#: components/services/install/command-line/eazel-alt-install-corba.c:811
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
 msgid "y"
 msgstr "s"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:670
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
 #, c-format
 msgid "Dependency : %s needs %s\n"
 msgstr "Dependência : %s precisa de %s\n"
 
 #. I18N note: %s is a package name
-#: components/services/install/command-line/eazel-alt-install-corba.c:688
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
 #, c-format
 msgid "Package %s failed md5 check!\n"
 msgstr "Falhou a verificação MD5 do pacote %s!\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:690
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
 #, c-format
 msgid "\t· server MD5 checksum is %s\n"
 msgstr "\t· valor MD5 do servidor é %s\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:692
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
 #, c-format
 msgid "\t· actual MD5 checksum is %s\n"
 msgstr "\t· valor MD5 real é %s\n"
@@ -2091,7 +2081,7 @@ msgstr "\t· valor MD5 real é %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:758
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
 msgid "Continue? (y/n) "
 msgstr "Continuar? (s/n) "
 
@@ -2100,83 +2090,83 @@ msgstr "Continuar? (s/n) "
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:799
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
 msgid "Should I delete the RPM files? (y/n) "
 msgstr "Devo excluir os arquivos RPM? (s/n) "
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:831
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
 msgid "Operation ok\n"
 msgstr "Operação OK\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:833
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
 msgid "Operation failed\n"
 msgstr "Falhou a operação\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:959
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
 msgid "Installing"
 msgstr "Instalando"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:968
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
 msgid "Uninstalling"
 msgstr "Desinstalando"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:983
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
 msgid "Only one operation at a time please."
 msgstr "Apenas uma operação por vez por favor."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:988
-#: components/services/install/command-line/eazel-alt-install-corba.c:996
-#: components/services/install/command-line/eazel-alt-install-corba.c:1040
-#: components/services/install/command-line/eazel-alt-install-corba.c:1047
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
 #, c-format
 msgid "%s: --help for usage\n"
 msgstr "%s: --help para uso\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
 #, c-format
 msgid "Name         : %s\n"
 msgstr "Nome         : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
 #, c-format
 msgid "Version      : %s\n"
 msgstr "Versão       : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1014
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
 #, c-format
 msgid "Minor        : %s\n"
 msgstr "Minor        : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
 #, c-format
 msgid "Size         : %d\n"
 msgstr "Tamanho      : %d\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
 #, c-format
 msgid "Arch         : %s\n"
 msgstr "Arquitetura  : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
 #, c-format
 msgid "Distribution : %s\n"
 msgstr "Distribuição : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1019
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
 #, c-format
 msgid "Description  : %s\n"
 msgstr "Descrição    : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1021
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
 #, c-format
 msgid "Install root : %s\n"
 msgstr "Raiz inst.   : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1024
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
 msgid "Provides     : \n"
 msgstr "Provê        : \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1066
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
 #, c-format
 msgid "exit code %d\n"
 msgstr "código de saída %d\n"
@@ -2191,122 +2181,129 @@ msgstr ""
 "Usar arquivo especificado para gerar uma lista de pacotes, requer "
 "--packagelist"
 
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 msgid "Softcat server to connect to"
 msgstr "Servidor softcat para onde conectar"
 
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr "Usar caminho CGI alternativo"
 
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr "Conectar como um usuário softcat através do ammonite"
 
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 msgid "Number of times to try the request"
 msgstr "Número de vezes para tentar pedido"
 
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr "Atraso entre tentativas de pedido, em usec"
 
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr "Procurar por id de pacote Eazel"
 
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+#, fuzzy
+msgid "Lookup package that features a feature/file"
 msgstr "Procurar pacote que provê uma função/arquivo"
 
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr "Procurar pacote com uma versão específica"
 
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr "(com --version) Usar comparação >="
 
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 msgid "use check function (for debugging)"
 msgstr "usar função de verificação (para depuração)"
 
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 msgid "Show detailed sub-package info"
 msgstr "Exibir informação detalhada de sub-pacote"
 
-#: components/services/install/lib/eazel-install-logic2.c:99
+#: components/services/install/command-line/eazel-test-softcat.c:66
+#, fuzzy
+msgid "enable funk parser"
+msgstr "Ativar busca rápida"
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "Falhou o bloqueio do arquivo transferido"
 
-#: components/services/install/lib/eazel-install-logic2.c:116
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "MD5 não confere, pacote %s pode ter sido comprometido"
 
-#: components/services/install/lib/eazel-install-logic2.c:132
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, c-format
 msgid "No MD5 available for %s"
 msgstr "Sem MD5 disponível para %s"
 
 #. I18N note: "%is is ok" in the sense that %s=package name and the
 #. package is intact
-#: components/services/install/lib/eazel-install-logic2.c:327
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, c-format
 msgid "%s is ok"
 msgstr "%s está OK"
 
-#: components/services/install/lib/eazel-install-logic2.c:433
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s versão %s-%s já está instalado"
 
-#: components/services/install/lib/eazel-install-logic2.c:437
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s versão %s já está instalado"
 
-#: components/services/install/lib/eazel-install-logic2.c:446
-#: components/services/install/lib/eazel-install-logic2.c:451
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr "%s atualiza da versão %s-%s para %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:460
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr "%s desatualiza da versão %s-%s para %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:465
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr "%s desatualiza da versão %s para %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:518
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr "%s instala versão %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:523
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr "%s instala versão %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:691
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, c-format
 msgid "Loading package info from file %s"
 msgstr "Carregando informações de pacote do arquivo %s"
 
 #. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
-#: components/services/install/lib/eazel-install-logic2.c:1008
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "ok"
 msgstr "OK"
 
-#: components/services/install/lib/eazel-install-logic2.c:1008
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "not ok"
 msgstr "não está OK"
 
-#: components/services/install/lib/eazel-install-logic2.c:1174
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
 msgid "Checking dependencies for %s"
 msgstr "Verificando dependências para %s"
@@ -2314,52 +2311,52 @@ msgstr "Verificando dependências para %s"
 #. I18N note: both %s' are package names.
 #. related is in the sense that the two packages apparently
 #. are connected somehow, eg. foo and foo-devel
-#: components/services/install/lib/eazel-install-logic2.c:1798
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, c-format
 msgid "%s is related to %s"
 msgstr "%s está relacionado a %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:1874
+#: components/services/install/lib/eazel-install-logic2.c:2090
 #, c-format
 msgid "updating %s to version %s-%s solves conflict"
 msgstr "atualizar %s para a versão %s-%s resolve o conflito"
 
-#: components/services/install/lib/eazel-install-logic2.c:1897
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
 msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr "atualização disponível para %s (%s-%s) não resolve o conflito"
 
-#: components/services/install/lib/eazel-install-logic2.c:1905
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, c-format
 msgid "could not revive %s"
 msgstr "não foi possível reviver %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2060
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
 msgid "file uniqueness checking %s"
 msgstr "verificando unicidade de arquivo %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2081
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
 msgid "Duplicate file : %s occurs in %s and %s"
 msgstr "Arquivo duplicado : %s ocorre em %s e em %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2093
-#: components/services/install/lib/eazel-install-logic2.c:2247
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
 msgid "... but it's ok, the packages are related"
 msgstr "... mas está tudo bem, os pacotes são relacionados"
 
-#: components/services/install/lib/eazel-install-logic2.c:2101
+#: components/services/install/lib/eazel-install-logic2.c:2324
 #, c-format
 msgid "(there were %d other conflicts)"
 msgstr "(existem outros %d conflitos)"
 
-#: components/services/install/lib/eazel-install-logic2.c:2196
+#: components/services/install/lib/eazel-install-logic2.c:2419
 #, c-format
 msgid "file conflict checking %s"
 msgstr "verificando conflito de arquivo %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2233
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
 msgid "file conflict : package %s already provides file %s also provided by %s"
 msgstr ""
@@ -2367,18 +2364,18 @@ msgstr ""
 
 #. the owner of this file is a package that we're upgrading, and the
 #. * new version no longer has this file, so everything's okay.
-#: components/services/install/lib/eazel-install-logic2.c:2243
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
 msgid "...but it is okay, we're upgrading %s and it ditched that file"
 msgstr ""
 "...mas está tudo bem, estamos atualizando %s e ele não usa mais este arquivo"
 
-#: components/services/install/lib/eazel-install-logic2.c:2335
+#: components/services/install/lib/eazel-install-logic2.c:2558
 #, c-format
 msgid "checking feature consistency of %s"
 msgstr "verificando consistência de funcionalidade de %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2403
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
 msgid ""
 "feature missing : %s breaks if %s is installed (feature %s would be lost"
@@ -2386,173 +2383,173 @@ msgstr ""
 "funcionalidade faltando : %s quebra se %s estiver instalado (funcionalidade "
 "%s seria perdida"
 
-#: components/services/install/lib/eazel-install-logic2.c:2482
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, c-format
 msgid "downloading %d packages"
 msgstr "baixando %d pacotes"
 
-#: components/services/install/lib/eazel-install-logic2.c:2752
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, c-format
 msgid "will upgrade %s"
 msgstr "atualizará %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2755
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, c-format
 msgid "will downgrade %s"
 msgstr "desatualizará %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2758
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, c-format
 msgid "will install %s"
 msgstr "instalará %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2761
+#: components/services/install/lib/eazel-install-logic2.c:2960
 #, c-format
 msgid "will uninstall %s"
 msgstr "desinstalará %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2846
-#: components/services/install/lib/eazel-install-problem.c:335
-#: components/services/install/lib/eazel-install-problem.c:338
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
 #, c-format
 msgid "%s requires %s"
 msgstr "%s requer %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:3039
+#: components/services/install/lib/eazel-install-logic2.c:3238
 #, c-format
 msgid "failed %s"
 msgstr "falhou %s"
 
-#: components/services/install/lib/eazel-install-metadata.c:171
+#: components/services/install/lib/eazel-install-metadata.c:174
 msgid "Could not set URLType from config file!"
 msgstr ""
 "Não foi possível configurar URLType a partir do arquivo de configuração!"
 
-#: components/services/install/lib/eazel-install-object.c:713
+#: components/services/install/lib/eazel-install-object.c:717
 msgid "Transactions are not stored, could not find home dir"
 msgstr ""
 "Transações não são armazenadas, não foi possível encontrar diretório pessoal"
 
-#: components/services/install/lib/eazel-install-object.c:741
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr "Transações são armazenadas em %s"
 
-#: components/services/install/lib/eazel-install-object.c:998
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "Obtendo lista de pacotes do servidor remoto ...\n"
 
-#: components/services/install/lib/eazel-install-object.c:1014
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "Impossível obter package-list.xml!\n"
 
-#: components/services/install/lib/eazel-install-object.c:1087
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr ""
 "Não é possível escrever no arquivo %s, usando o tratador de registro padrão"
 
-#: components/services/install/lib/eazel-install-object.c:1218
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "Falhou a instalação"
 
-#: components/services/install/lib/eazel-install-object.c:1264
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "Falhou a desinstalação"
 
-#: components/services/install/lib/eazel-install-object.c:1387
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "Não foi possível criar diretório de transações (%s)! ***\n"
 
-#: components/services/install/lib/eazel-install-object.c:1410
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr "Escrevendo transação para %s"
 
-#: components/services/install/lib/eazel-install-problem.c:159
+#: components/services/install/lib/eazel-install-problem.c:163
 #, c-format
 msgid "%s was cancelled"
 msgstr "%s foi cancelado"
 
-#: components/services/install/lib/eazel-install-problem.c:164
-#: components/services/install/lib/eazel-install-problem.c:327
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
 msgid "%s is a source package, which is not yet supported"
 msgstr "%s é um pacote de fontes o qual ainda não é suportado"
 
-#: components/services/install/lib/eazel-install-problem.c:178
-#: components/services/install/lib/eazel-install-problem.c:189
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
 #, c-format
 msgid "%s would break other packages"
 msgstr "%s danificaria outros pacotes"
 
-#: components/services/install/lib/eazel-install-problem.c:181
+#: components/services/install/lib/eazel-install-problem.c:185
 #, c-format
 msgid "%s would break"
 msgstr "%s danificaria"
 
-#: components/services/install/lib/eazel-install-problem.c:187
+#: components/services/install/lib/eazel-install-problem.c:191
 #, c-format
 msgid "%s would break %s"
 msgstr "%s danificaria %s"
 
-#: components/services/install/lib/eazel-install-problem.c:193
+#: components/services/install/lib/eazel-install-problem.c:197
 #, c-format
 msgid "%s is damaged"
 msgstr "%s está danificado"
 
-#: components/services/install/lib/eazel-install-problem.c:197
+#: components/services/install/lib/eazel-install-problem.c:201
 #, c-format
 msgid "%s requires %s, which could not be found on the server"
 msgstr "%s requer %s, o qual não foi encontrado no servidor"
 
-#: components/services/install/lib/eazel-install-problem.c:200
-#, c-format
-msgid "%s could not be found on the server"
+#: components/services/install/lib/eazel-install-problem.c:204
+#, fuzzy, c-format
+msgid "%s for %s could not be found on the server"
 msgstr "Não foi possível localizar %s no servidor"
 
-#: components/services/install/lib/eazel-install-problem.c:208
-#: components/services/install/lib/eazel-install-problem.c:353
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr "%s já está instalado"
 
-#: components/services/install/lib/eazel-install-problem.c:252
+#: components/services/install/lib/eazel-install-problem.c:259
 #, c-format
 msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr ""
 "%s, que é mais novo, precisa ser desatualizado e a desatualização não está "
 "ativada"
 
-#: components/services/install/lib/eazel-install-problem.c:256
+#: components/services/install/lib/eazel-install-problem.c:263
 #, c-format
 msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr ""
 "%s, que é mais velho, precisa ser atualizado e a atualização não está ativada"
 
-#: components/services/install/lib/eazel-install-problem.c:346
+#: components/services/install/lib/eazel-install-problem.c:353
 #, c-format
 msgid "%s is not installed and could not be found on server"
 msgstr "%s não está instalado e não foi possível localizá-lo no servidor"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:913
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr "Procurar uma nova versão de %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:924
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr "Instalar %s e %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:939
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr "Remover %s do seu sistema"
@@ -2560,232 +2557,232 @@ msgstr "Remover %s do seu sistema"
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:952
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr "Forçar a remoção de %s do seu sistema"
 
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:960
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr "O banco de dados de pacotes possui uma inconsistência"
 
-#: components/services/install/lib/eazel-install-problem.c:1008
+#: components/services/install/lib/eazel-install-problem.c:1015
 msgid "Continue with force"
 msgstr "Continuar usando forçar (force)"
 
-#: components/services/install/lib/eazel-install-problem.c:1014
+#: components/services/install/lib/eazel-install-problem.c:1021
 msgid "Allow downgrade"
 msgstr "Permitir desatualização"
 
-#: components/services/install/lib/eazel-install-protocols.c:123
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:166
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
 #, c-format
 msgid "Could not open target file %s"
 msgstr "Não foi possível abrir arquivo alvo %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:130
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:92
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
 msgid "Could not create an http request !"
 msgstr "Não foi possível criar um pedido http!"
 
-#: components/services/install/lib/eazel-install-protocols.c:137
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:99
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
 msgid "Proxy: Invalid uri !"
 msgstr "Proxy: URI inválida!"
 
-#: components/services/install/lib/eazel-install-protocols.c:142
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:105
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
 msgid "Invalid uri !"
 msgstr "URI inválida!"
 
-#: components/services/install/lib/eazel-install-protocols.c:149
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:115
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
 msgid "Could not prepare http request !"
 msgstr "Não foi possível preparar pedido http!"
 
-#: components/services/install/lib/eazel-install-protocols.c:154
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:120
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
 msgid "Couldn't get async mode "
 msgstr "Não foi possível ativar modo assíncrono "
 
 #. probably out of disk space
-#: components/services/install/lib/eazel-install-protocols.c:183
-#: components/services/install/lib/eazel-install-protocols.c:212
-#: components/services/install/lib/eazel-install-protocols.c:228
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, c-format
 msgid "DISK FULL: could not write %s"
 msgstr "DISCO CHEIO: não foi possível escrever %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:189
-#: components/services/install/lib/eazel-install-protocols.c:217
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
 msgid "Could not get request body!"
 msgstr "Não foi possível ler corpo do pedido!"
 
-#: components/services/install/lib/eazel-install-protocols.c:202
+#: components/services/install/lib/eazel-install-protocols.c:208
 #, c-format
 msgid "HTTP error: %d %s"
 msgstr "Erro de HTTP: %d %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:249
+#: components/services/install/lib/eazel-install-protocols.c:255
 msgid "FTP not supported yet"
 msgstr "FTP ainda não é suportado"
 
-#: components/services/install/lib/eazel-install-protocols.c:457
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, c-format
 msgid "Checking local file %s..."
 msgstr "Verificando arquivo local %s..."
 
-#: components/services/install/lib/eazel-install-protocols.c:578
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, c-format
 msgid "Failed to retrieve %s!"
 msgstr "Falha ao transferir %s!"
 
-#: components/services/install/lib/eazel-install-protocols.c:651
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, c-format
 msgid "Could not get an URL for %s"
 msgstr "Não foi possível obter uma URL para %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:666
+#: components/services/install/lib/eazel-install-protocols.c:672
 msgid "Downloaded package does not have the correct name"
 msgstr "Pacote transferido não possui o nome correto"
 
-#: components/services/install/lib/eazel-install-protocols.c:667
+#: components/services/install/lib/eazel-install-protocols.c:673
 #, c-format
 msgid "Package %s should have had name %s"
 msgstr "Pacote %s deveria ter o nome %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:695
+#: components/services/install/lib/eazel-install-protocols.c:701
 msgid "File download failed"
 msgstr "Falhou a transferência de arquivo"
 
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr "*** Inicio da descarga de pacote ***\n"
 
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr "*** Fim da descarga de pacote ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:158
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 msgid "*** No package nodes! (cat has no children) ***"
 msgstr "*** Não existem nós de pacotes! (cat não possui filhos) ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:160
-#: components/services/install/lib/eazel-install-xml-package-list.c:168
-#: components/services/install/lib/eazel-install-xml-package-list.c:183
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 msgid "*** Bailing from package parse! ***"
 msgstr "*** Interrompendo análise de pacote! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:166
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
 msgid "*** No package nodes! ***"
 msgstr "*** Não existem nós de pacotes! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:172
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 msgid "*** Malformed package node!"
 msgstr "*** Nó de pacotes inválido!"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:181
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
 msgid "*** No depends nodes! ***"
 msgstr "*** Não existem nós de dependências! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:187
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr "*** Nó de dependência inválido!"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:211
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr "*** Tipo de nó desconhecido '%s'"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:228
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** O arquivo da lista de pacotes está vazio! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:233
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** Não foi possível localizar o xmlnode CATEGORIES! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:234
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr "*** Interrompendo análise de categorias! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:240
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** Sem categorias! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:241
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr "*** Interrompendo análise de categoria! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:295
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** Não foi possível localizar o xmlnode TRANSACTION! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:297
-#: components/services/install/lib/eazel-install-xml-package-list.c:305
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr "*** Interrompendo análise de transação! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:303
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** Sem pacotes! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:339
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** Não existem nós de categoria! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:343
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** Não foi possível localizar o xmlnode CATEGORIES! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:377
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** Nó desconhecido %s"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:467
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** Erro ao gerar lista xml de pacotes! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:514
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** Erro ao ler lista de pacotes! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:909
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** O xml osd não contém dados! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:914
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr "*** Abortando a análise de OSD! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:990
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "Não foi possível analisar o xml (comprimento %d)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:763
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr "Aberto banco de dados de pacotes em %s"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:768
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr "Falha ao abrir banco de dados de pacotes em %s"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:801
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr "Fechando bd para %s (aberto)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:806
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr "Fechando bd para %s (não aberto)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1137
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr "Não é possível abrir %s"
@@ -2898,7 +2895,7 @@ msgid "Now installing package \"%s\"."
 msgstr "Instalando pacote \"%s\" agora."
 
 #: components/services/install-view/callbacks.c:407
-#: components/services/install-view/nautilus-service-install-view.c:897
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "Instalando \"%s\""
@@ -2925,47 +2922,49 @@ msgstr "Eu gostaria de tentar o seguinte:"
 msgid "Is this ok ?"
 msgstr "Tudo bem?"
 
-#: components/services/install-view/callbacks.c:557
+#: components/services/install-view/callbacks.c:556
 msgid "Installation cancelled."
 msgstr "Instalação cancelada."
 
-#: components/services/install-view/callbacks.c:559
+#: components/services/install-view/callbacks.c:558
 msgid "This package has already been installed."
 msgstr "Este pacote já foi instalado."
 
-#: components/services/install-view/callbacks.c:561
-#: components/services/install-view/callbacks.c:658
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
 msgid "Installation complete."
 msgstr "Instalação concluída."
 
-#: components/services/install-view/callbacks.c:565
+#: components/services/install-view/callbacks.c:564
 msgid "Installation failed."
 msgstr "Falhou a instalação."
 
 #. some succeeded; some failed
-#: components/services/install-view/callbacks.c:569
+#: components/services/install-view/callbacks.c:568
 msgid "Some packages installed successfully:"
 msgstr "Alguns pacotes instalaram com sucesso:"
 
-#: components/services/install-view/callbacks.c:578
+#: components/services/install-view/callbacks.c:577
 msgid ""
 "\n"
 "Some packages failed:"
-msgstr "\nAlguns pacotes falharam:"
+msgstr ""
+"\n"
+"Alguns pacotes falharam:"
 
-#: components/services/install-view/callbacks.c:627
+#: components/services/install-view/callbacks.c:626
 msgid "Erase the RPM files?"
 msgstr "Apagar os arquivos RPM?"
 
-#: components/services/install-view/callbacks.c:629
+#: components/services/install-view/callbacks.c:628
 msgid "Erase the leftover RPM files?"
 msgstr "Apagar os arquivos RPM restantes?"
 
-#: components/services/install-view/callbacks.c:659
+#: components/services/install-view/callbacks.c:658
 msgid "Ok"
 msgstr "Ok"
 
-#: components/services/install-view/callbacks.c:674
+#: components/services/install-view/callbacks.c:673
 msgid ""
 "A core package of Nautilus has been\n"
 "updated.  You should restart Nautilus.\n"
@@ -3038,63 +3037,65 @@ msgstr "Continuar"
 
 #: components/services/install-view/forms.c:482
 #: libnautilus-extensions/nautilus-drag.c:493
-#: src/file-manager/fm-directory-view.c:3551
+#: src/file-manager/fm-directory-view.c:4326
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: components/services/install-view/nautilus-service-install-view.c:419
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
 msgid "%s is in GNOME (footprint) > %s"
 msgstr "%s está em Gnome (pé) > %s"
 
-#: components/services/install-view/nautilus-service-install-view.c:437
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, c-format
 msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr "%s está no menu Gnome (pé).\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:452
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
 msgid "%s is in the KDE menu.\n"
 msgstr "%s está no menu KDE.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:653
+#: components/services/install-view/nautilus-service-install-view.c:655
 msgid "Installation Complete"
 msgstr "Instalação concluída"
 
-#: components/services/install-view/nautilus-service-install-view.c:708
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
 msgid ""
 "%sTo start %s, click the Launch button below, or to create a shortcut, drag "
 "the icon on the right to the GNOME panel or your desktop."
-msgstr "%sPara iniciar %s, clique no botão Lançar abaixo, para criar um atalho, arraste o ícone à direita para o painel Gnome ou para sua área de trabalho."
+msgstr ""
+"%sPara iniciar %s, clique no botão Lançar abaixo, para criar um atalho, "
+"arraste o ícone à direita para o painel Gnome ou para sua área de trabalho."
 
 #. couldn't find an icon
-#: components/services/install-view/nautilus-service-install-view.c:716
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
 msgid "%sTo start %s, click the Launch button below."
 msgstr "%sPara iniciar %s, clique no botão Lançar abaixo."
 
-#: components/services/install-view/nautilus-service-install-view.c:771
+#: components/services/install-view/nautilus-service-install-view.c:773
 msgid "Incorrect password."
 msgstr "Senha incorreta."
 
-#: components/services/install-view/nautilus-service-install-view.c:776
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr "Autenticar como root"
 
-#: components/services/install-view/nautilus-service-install-view.c:893
+#: components/services/install-view/nautilus-service-install-view.c:895
 msgid "Installing packages"
 msgstr "Instalando pacotes"
 
-#: components/services/install-view/nautilus-service-install-view.c:895
+#: components/services/install-view/nautilus-service-install-view.c:897
 msgid "Installing remote package"
 msgstr "Instalando pacote remoto"
 
-#: components/services/install-view/nautilus-service-install-view.c:899
+#: components/services/install-view/nautilus-service-install-view.c:901
 msgid "Installing some package"
 msgstr "Instalando algum pacote"
 
-#: components/services/install-view/nautilus-service-install-view.c:916
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
@@ -3102,23 +3103,23 @@ msgstr ""
 "Esta faltando o serviço de instalação da Eazel:\n"
 "Instalações não funcionarão."
 
-#: components/services/install-view/nautilus-service-install-view.c:965
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr "Contactando catálogo de software da Eazel..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1023
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr "Verificando a autorização..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1095
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr "Abortando transferência de pacotes (aguarde por favor) ..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1115
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "Abortada a transferência de arquivo."
 
-#: components/services/install-view/nautilus-service-install-view.c:1116
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "Abortada"
 
@@ -3401,12 +3402,12 @@ msgid "Services Login"
 msgstr "Conexão aos serviços"
 
 #: components/services/summary/nautilus-summary-dialogs.c:131
-#: libnautilus-extensions/nautilus-password-dialog.c:269
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "Nome do usuário:"
 
 #: components/services/summary/nautilus-summary-dialogs.c:138
-#: libnautilus-extensions/nautilus-password-dialog.c:276
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "Senha:"
 
@@ -3477,7 +3478,7 @@ msgstr "Serviços"
 msgid "Featured Downloads"
 msgstr "Arquivos interessantes"
 
-#: components/services/summary/nautilus-summary-view.c:883
+#: components/services/summary/nautilus-summary-view.c:884
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
 "unavailable right now, or your computer might be configured incorrectly. "
@@ -3487,7 +3488,7 @@ msgstr ""
 "estar indisponível no momento ou o seu computador pode estar configurado "
 "incorretamente. Por favor entre em contato com support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:893
+#: components/services/summary/nautilus-summary-view.c:894
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3495,7 +3496,7 @@ msgstr ""
 "Encontrado um problema com os dados de serviços nos servidores da Eazel. Por "
 "favor entre em contato com support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:916
+#: components/services/summary/nautilus-summary-view.c:917
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
 "contact support@eazel.com."
@@ -3503,7 +3504,7 @@ msgstr ""
 "Informação está faltando nos dados de redirecionamento nos servidores da "
 "Eazel. Por favor entre em contato com support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:958
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
 "now, or your computer might be configured incorrectly. You could try again "
@@ -3513,7 +3514,7 @@ msgstr ""
 "indisponível no momento ou o seu computador pode estar configurado "
 "incorretamente. Você pode tentar novamente mais tarde."
 
-#: components/services/summary/nautilus-summary-view.c:968
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3521,11 +3522,11 @@ msgstr ""
 "Encontrado um problema com dados de redirecionamento nos servidores da "
 "Eazel. Por favor entre em contato com support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:985
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr "Falhou a transferência do inventário do sistema."
 
-#: components/services/summary/nautilus-summary-view.c:1048
+#: components/services/summary/nautilus-summary-view.c:1049
 #: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr "Serviços da Eazel"
@@ -3590,16 +3591,16 @@ msgstr "Visualizador de resumo"
 msgid "View as Summary"
 msgstr "Ver como resumo"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:130
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
 #, c-format
 msgid "HTTP error %d \"%s\" on uri %s"
 msgstr "Erro HTTP %d \"%s\" na URI %s"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:200
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 msgid "Could not initialize Bonobo"
 msgstr "Não foi possível iniciar Bonobo"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:215
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr ""
@@ -3637,48 +3638,68 @@ msgstr "exemplo de visão de serviço da eazel"
 msgid "Factory for the sample service"
 msgstr "Fábrica do serviço exemplo"
 
-#: components/text/nautilus-text-view.c:326
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr "Desculpe, mas %s é grande demais para que o Nautilus carregue-o todo."
 
-#: components/text/nautilus-text-view.c:329
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr "Arquivo grande demais"
 
 #: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "Fontes"
+
+#: components/text/nautilus-text-view-ui.xml.h:2
 msgid "Lucida"
 msgstr "Lucida"
 
-#: components/text/nautilus-text-view-ui.xml.h:2
+#: components/text/nautilus-text-view-ui.xml.h:3
 msgid "Use the Courier Font"
 msgstr "Usar a fonte courier"
 
-#: components/text/nautilus-text-view-ui.xml.h:3
+#: components/text/nautilus-text-view-ui.xml.h:4
+#, fuzzy
+msgid "Use the Fixed Font"
+msgstr "Usar a fonte times"
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+#, fuzzy
+msgid "Use the GTK System Font"
+msgstr "Usar a fonte times"
+
+#: components/text/nautilus-text-view-ui.xml.h:6
 msgid "Use the Helvetica Font"
 msgstr "Usar a fonte helvetica"
 
-#: components/text/nautilus-text-view-ui.xml.h:4
+#: components/text/nautilus-text-view-ui.xml.h:7
 msgid "Use the Lucida Font"
 msgstr "Usar a fonte lucida"
 
-#: components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:8
 msgid "Use the Times Font"
 msgstr "Usar a fonte times"
 
-#: components/text/nautilus-text-view-ui.xml.h:6
+#: components/text/nautilus-text-view-ui.xml.h:9
 msgid "_Courier"
 msgstr "_Courier"
 
-#: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
-msgstr "_Fontes"
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "_Arquivo"
 
-#: components/text/nautilus-text-view-ui.xml.h:8
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
 msgid "_Helvetica"
 msgstr "_Helvetica"
 
-#: components/text/nautilus-text-view-ui.xml.h:9
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr "_Times"
 
@@ -3747,7 +3768,7 @@ msgid "Nautilus Tree view"
 msgstr "Visão de árvore do Nautilus"
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:638
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr "Árvore"
 
@@ -3759,7 +3780,7 @@ msgstr "Aparição"
 msgid "Azul"
 msgstr "Azul"
 
-#: data/browser.xml.h:3 libnautilus-extensions/nautilus-font-picker.c:105
+#: data/browser.xml.h:3
 msgid "Black"
 msgstr "Preto"
 
@@ -3871,7 +3892,7 @@ msgstr "Arraste um emblema para um objeto para adicioná-lo ao objeto"
 msgid "Eclipse"
 msgstr "Eclipse"
 
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1607
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "Emblemas"
 
@@ -3968,7 +3989,7 @@ msgid "Numbers"
 msgstr "Números"
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "OK"
 
@@ -4089,13 +4110,13 @@ msgid "The Gimp"
 msgstr "O Gimp"
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:554
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "Área de trabalho"
 
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4796
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
-#: src/file-manager/fm-desktop-icon-view.c:65
+#: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
 msgstr "Lixeira"
 
@@ -4128,7 +4149,7 @@ msgid "Google"
 msgstr "Google"
 
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:808
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "Mecanismos de busca"
 
@@ -4382,101 +4403,101 @@ msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2261
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr "hoje às %-H:%M"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2266
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr "ontem às %-H:%M"
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2271
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%A %-d/%-m/%y às %-H:%M"
 
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2276
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%-d/%-m/%y às %-H:%M"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 itens"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr "0 pastas"
 
-#: libnautilus-extensions/nautilus-file.c:3408
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 arquivos"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 item"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: libnautilus-extensions/nautilus-file.c:3413
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 arquivo"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "%u itens"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr "%u pastas"
 
-#: libnautilus-extensions/nautilus-file.c:3417
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u arquivos"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3720
-#: libnautilus-extensions/nautilus-file.c:3735
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr "? itens"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3726
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr "? bytes"
 
-#: libnautilus-extensions/nautilus-file.c:3739
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "tipo desconhecido"
 
-#: libnautilus-extensions/nautilus-file.c:3741
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "tipo MIME desconhecido"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3746
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "desconhecido"
 
-#: libnautilus-extensions/nautilus-file.c:3782
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr "programa"
 
-#: libnautilus-extensions/nautilus-file.c:3794
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
@@ -4486,7 +4507,7 @@ msgstr ""
 "provavelmente significa que o seu arquivo gnome-vfs.keys está no lugar "
 "errado ou não está sendo encontrado por uma outra razão."
 
-#: libnautilus-extensions/nautilus-file.c:3798
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
@@ -4495,7 +4516,7 @@ msgstr ""
 "Não foi encontrada descrição para o tipo MIME \"%s\" (arquivo é \"%s\"), "
 "notifique aaron@eazel.com"
 
-#: libnautilus-extensions/nautilus-file.c:3812
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "vínculo"
 
@@ -4503,27 +4524,27 @@ msgstr "vínculo"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1156
-#: libnautilus-extensions/nautilus-file.c:3818
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr "vínculo para %s"
 
-#: libnautilus-extensions/nautilus-file.c:3832
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr "vínculo (com problema)"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "De:"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "Para:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:588
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4534,7 +4555,7 @@ msgstr ""
 "\n"
 "\"%s\" não pode ser movido porque ele está em um disco de apenas leitura."
 
-#: libnautilus-extensions/nautilus-file-operations.c:599
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4547,7 +4568,7 @@ msgstr ""
 "\"%s\" não pode ser excluído porque você não possui permissões para "
 "modificar sua pasta pai."
 
-#: libnautilus-extensions/nautilus-file-operations.c:605
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4558,7 +4579,7 @@ msgstr ""
 "\n"
 "\"%s\" não pode ser excluído porque ele está em um disco de apenas leitura."
 
-#: libnautilus-extensions/nautilus-file-operations.c:636
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4571,7 +4592,7 @@ msgstr ""
 "\"%s\" não pode ser movido porque você não possui permissões para "
 "modificá-lo ou modificar a sua pasta pai."
 
-#: libnautilus-extensions/nautilus-file-operations.c:643
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4584,7 +4605,7 @@ msgstr ""
 "\"%s\" não pode ser movido para a lixeira porque você não possui permissões "
 "para modificá-lo ou modificar a sua pasta pai."
 
-#: libnautilus-extensions/nautilus-file-operations.c:667
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -4595,7 +4616,7 @@ msgstr ""
 "\n"
 "\"%s\" não pode ser copiado porque você não possui permissões para lê-lo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:689
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4606,7 +4627,7 @@ msgstr ""
 "\n"
 "Não há espaço suficiente no destino."
 
-#: libnautilus-extensions/nautilus-file-operations.c:694
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4617,7 +4638,7 @@ msgstr ""
 "\n"
 "Não há espaço suficiente no destino."
 
-#: libnautilus-extensions/nautilus-file-operations.c:698
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4628,7 +4649,7 @@ msgstr ""
 "\n"
 "Não há espaço suficiente no destino."
 
-#: libnautilus-extensions/nautilus-file-operations.c:710
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4639,7 +4660,7 @@ msgstr ""
 "\n"
 "Você não possui permissões para escrever nesta pasta."
 
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4650,7 +4671,7 @@ msgstr ""
 "\n"
 "O disco destino é apenas para leitura."
 
-#: libnautilus-extensions/nautilus-file-operations.c:721
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4661,7 +4682,7 @@ msgstr ""
 "\n"
 "Você não possui permissões para escrever nesta pasta."
 
-#: libnautilus-extensions/nautilus-file-operations.c:725
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4672,7 +4693,7 @@ msgstr ""
 "\n"
 "O disco destino é apenas para leitura."
 
-#: libnautilus-extensions/nautilus-file-operations.c:732
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4683,7 +4704,7 @@ msgstr ""
 "\n"
 "Você não possui permissões para escrever nesta pasta."
 
-#: libnautilus-extensions/nautilus-file-operations.c:736
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4694,7 +4715,7 @@ msgstr ""
 "\n"
 "O disco destino é apenas para leitura."
 
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4705,7 +4726,7 @@ msgstr ""
 "\n"
 "Você deseja continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4716,7 +4737,7 @@ msgstr ""
 "\n"
 "Você deseja continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:773
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4727,7 +4748,7 @@ msgstr ""
 "\n"
 "Você deseja continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4738,7 +4759,7 @@ msgstr ""
 "\n"
 "Você deseja continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:794
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4749,7 +4770,7 @@ msgstr ""
 "\n"
 "Você deseja continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4760,7 +4781,7 @@ msgstr ""
 "\n"
 "Você deseja continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4771,7 +4792,7 @@ msgstr ""
 "\n"
 "Você deseja continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4782,34 +4803,34 @@ msgstr ""
 "\n"
 "Você deseja continuar?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:924
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "Erro ao copiar."
 
-#: libnautilus-extensions/nautilus-file-operations.c:927
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "Erro ao mover."
 
-#: libnautilus-extensions/nautilus-file-operations.c:930
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "Erro ao criar vínculo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:935
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "Erro ao excluir."
 
-#: libnautilus-extensions/nautilus-file-operations.c:960
-#: libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "Pular"
 
-#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Repetir"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1057
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4822,7 +4843,7 @@ msgstr ""
 "\n"
 "Se você ainda quiser mover \"%s\", troque seu nome e tente novamente."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1063
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4835,11 +4856,11 @@ msgstr ""
 "\n"
 "Se você ainda quiser copiar \"%s\", troque seu nome e tente novamente."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "Não é possível substituir arquivo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1081
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4850,22 +4871,22 @@ msgstr ""
 "\n"
 "Você deseja substituí-lo?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1092
-#: libnautilus-extensions/nautilus-file-operations.c:1106
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "Conflito ao copiar"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Substituir"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Substituir todos"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1160
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "outro vínculo para %s"
@@ -4874,25 +4895,25 @@ msgstr "outro vínculo para %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dº vínculo para %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1180
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dº vínculo para %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1184
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%dº vínculo para %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dº vínculo para %s"
@@ -4902,235 +4923,227 @@ msgstr "%dº vínculo para %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (cópia)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (outra cópia)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1212
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr "ª cópia)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr "ª cópia)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1216
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr "ª cópia)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr "ª cópia)"
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (cópia)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (outra cópia)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1232
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dª cópia)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1234
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dª cópia)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1236
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%dª cópia)%s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dª cópia)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1322
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1330
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1487
-#: libnautilus-extensions/nautilus-file-operations.c:2072
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus desconhecido %d"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1802
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "Movendo arquivos para a lixeira"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1804
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr "Arquivos descartados:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1821
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "Movendo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1807
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "Preparando para mover para a lixeira..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1817
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "Movendo arquivos"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "Arquivos movidos:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1822
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "Preparando para mover..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "Concluindo mover..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "Criando vínculos para arquivos"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1837
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "Arquivos com vínculo:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1839
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "Criando vínculo para"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "Preparando para criar vínculos..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "Concluindo a criação de vínculos..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1848
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "Copiando arquivos"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "Arquivos copiados:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "Copiando"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "Preparando para copiar..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "Você não pode copiar itens para a lixeira."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "Não é possível copiar para a lixeira"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1899
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "A lixeira deve permanecer na área de trabalho."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "Você não pode mover esta pasta da lixeira."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1902
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "Você não pode copiar a lixeira."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1903
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "Você não pode copiar esta pasta da lixeira."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1905
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Não é possível mudar o local da lixeira"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1906
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Não é possível copiar a lixeira"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1929
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "Você não pode mover uma pasta para dentro dela mesma."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1930
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "Você não pode copiar uma pasta para dentro dela mesma."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1932
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "Não é possível mover para si mesmo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1933
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "Não é possível copiar para si mesmo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1946
-msgid "You cannot move a file onto itself."
-msgstr "Você não pode mover um arquivo para si mesmo."
-
-#: libnautilus-extensions/nautilus-file-operations.c:1947
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "Você não pode copiar um arquivo sobre si mesmo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1949
-msgid "Can't Move Onto Self"
-msgstr "Não é possível mover para si mesmo"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1950
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "Não é possível copiar sobre si mesmo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2001
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5140,7 +5153,7 @@ msgstr ""
 "\n"
 "Você não possui as permissões para escrever no destino."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2004
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5150,630 +5163,698 @@ msgstr ""
 "\n"
 "Não há espaço no destino."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2007
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Erro \"%s\" ao criar nova pasta."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2011
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "Erro ao criar nova pasta"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2098
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "pasta sem título"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2131
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "Excluindo arquivos"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2133
-#: libnautilus-extensions/nautilus-file-operations.c:2168
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "Arquivos excluídos:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2135
-#: libnautilus-extensions/nautilus-file-operations.c:2170
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Excluindo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2136
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "Preparando para excluir arquivos..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2166
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Esvaziando a lixeira"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2171
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Preparando para esvaziar a lixeira..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2202
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr ""
 "Você tem certeza que deseja excluir permanentemente todos os itens da "
 "lixeira?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2204
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "Excluir conteúdo da lixeira?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2205
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "Esvaziar"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2243
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2243
-#: libnautilus-extensions/nautilus-file-operations.c:2253
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "foo (cópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (cópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".foo (cópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "foo foo (cópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2247
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2247
-#: libnautilus-extensions/nautilus-file-operations.c:2254
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "foo (cópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2248
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2248
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "foo foo (cópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (cópia).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "foo.. (cópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "foo... (cópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "foo. (cópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "foo. (outra cópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2253
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "foo (outra cópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2254
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "foo (outra cópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "foo (3ª cópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "foo (3ª cópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (outra cópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3ª cópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr "foo (21ª cópia)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr "foo (24ª cópia)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr "foo (21ª cópia).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr "foo (24ª cópia).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "foo (21ª cópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
-#: libnautilus-extensions/nautilus-file-operations.c:2260
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "foo (22ª cópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "foo (21ª cópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
-#: libnautilus-extensions/nautilus-file-operations.c:2261
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "foo (22ª cópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2260
-#: libnautilus-extensions/nautilus-file-operations.c:2262
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "foo (23ª cópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2261
-#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "foo (23ª cópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2262
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "foo (24ª cópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2263
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "foo (24ª cópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "foo (25ª cópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "foo (25ª cópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24ª cópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25ª cópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24ª cópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25ª cópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000ª cópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
-#, c-format
-msgid "%ld of %ld"
-msgstr "%ld de %ld"
-
-#: libnautilus-extensions/nautilus-font-picker.c:96
-msgid "Normal"
-msgstr "Normal"
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (10th copy)"
+msgstr "foo (21ª cópia)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:97
-#: libnautilus-extensions/nautilus-volume-monitor.c:516
-#: libnautilus-extensions/nautilus-volume-monitor.c:535
-msgid "Unknown"
-msgstr "Desconhecido"
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (11st copy)"
+msgstr "foo (21ª cópia)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:103
-msgid "Bold"
-msgstr "Negrito"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (10th copy).txt"
+msgstr "foo (21ª cópia).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:104
-msgid "Book"
-msgstr "Livro"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (11st copy).txt"
+msgstr "foo (21ª cópia).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:106
-msgid "Demibold"
-msgstr "Meionegrito"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (11th copy)"
+msgstr "foo (21ª cópia)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:107
-msgid "Light"
-msgstr "Leve"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (12nd copy)"
+msgstr "foo (22ª cópia)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:113
-msgid "Italic"
-msgstr "Itálico"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (11th copy).txt"
+msgstr "foo (21ª cópia).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:114
-msgid "Oblique"
-msgstr "Oblíquo"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (12nd copy).txt"
+msgstr "foo (22ª cópia).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:115
-msgid "Reverse Italic"
-msgstr "Itálico invertido"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (12th copy)"
+msgstr "foo (24ª cópia)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:116
-msgid "Reverse Oblique"
-msgstr "Oblíquo invertido"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (13rd copy)"
+msgstr "foo (3ª cópia)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:123
-msgid "Condensed"
-msgstr "Condensado"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (12th copy).txt"
+msgstr "foo (25ª cópia).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:124
-msgid "Semicondensed"
-msgstr "Semicondensado"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (13rd copy).txt"
+msgstr "foo (3ª cópia).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:226
-msgid "Font"
-msgstr "Fonte"
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
+#, c-format
+msgid "%ld of %ld"
+msgstr "%ld de %ld"
 
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
 msgid "GConf Error"
 msgstr "Erro do GConf"
 
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:956
-msgid "fixed"
-msgstr "fixa"
-
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1427
-msgid "01/01/00, 01:00 AM"
-msgstr "01/01/00, 01:00"
-
-#: libnautilus-extensions/nautilus-glib-extensions.c:1428
-msgid "1/1/00, 1:00 AM"
-msgstr "1/1/00, 1:00"
-
-#: libnautilus-extensions/nautilus-glib-extensions.c:1429
-msgid " 1/ 1/00,  1:00 AM"
-msgstr " 1/ 1/00,  1:00"
-
 #. Constants
 #: libnautilus-extensions/nautilus-global-preferences.c:50
 msgid "Nautilus Preferences"
 msgstr "Preferências do Nautilus"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:97
-msgid "current theme"
-msgstr "tema atual"
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "sempre"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "Sempre"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:100
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "apenas local"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "Apenas arquivos locais"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "nunca"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "Nunca"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "Gráficos mais suaves"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "Usar gráficos mais suaves (porém mais lentos)"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "Fontes"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+#, fuzzy
+msgid "Font for Icon view:"
+msgstr "Fábrica para visão de música"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "Fábrica para visões de histórico"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "Usar o Nautilus para desenhar a área de trabalho."
+
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
+msgstr "Abrindo novas janelas"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:651
 msgid "Open each file or folder in a separate window"
 msgstr "Abrir cada arquivo ou pasta em uma janela separada"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:103
-msgid "Ask before emptying the Trash"
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+msgid "Display toolbar in new windows"
+msgstr "Exibir barra de ferramentas em novas janelas"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "Exibir barra de local em novas janelas"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "Exibir barra de estado em novas janelas"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "Exibir barra lateral em novas janelas"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "Comportamento da lixeira"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+#, fuzzy
+msgid "Ask before emptying the Trash or deleting files"
 msgstr "Perguntar antes de esvaziar a lixeira"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:106
-#: libnautilus-extensions/nautilus-global-preferences.c:597
-msgid "Click Behavior"
-msgstr "Comportamento dos cliques"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:109
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 msgid "single"
 msgstr "único"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:110
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "Ativar itens com um único clique"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:114
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "duplo"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:115
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "Ativar itens com um clique duplo"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:119
-#: libnautilus-extensions/nautilus-global-preferences.c:604
-msgid "Executable Text Files"
-msgstr "Arquivos texto executáveis"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:122
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 msgid "launch"
 msgstr "lançamento"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:123
+#: libnautilus-extensions/nautilus-global-preferences.c:726
 msgid "Execute files when they are clicked"
 msgstr "Executar arquivos quando eles são clicados"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:127
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 msgid "display"
 msgstr "exibição"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:128
+#: libnautilus-extensions/nautilus-global-preferences.c:730
 msgid "Display files when they are clicked"
 msgstr "Exibir arquivos quando eles são clicados"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:132
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 msgid "ask"
 msgstr "pergunta"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:133
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 msgid "Ask each time"
 msgstr "Perguntar toda vez"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:143
-#: libnautilus-extensions/nautilus-global-preferences.c:725
-msgid "Show Text in Icons"
-msgstr "Exibir texto nos ícones"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:146
-#: libnautilus-extensions/nautilus-global-preferences.c:732
-msgid "Show Count of Items in Folders"
-msgstr "Exibir a contagem de itens nas pastas"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:149
-#: libnautilus-extensions/nautilus-global-preferences.c:739
-msgid "Show Thumbnails for Image Files"
-msgstr "Exibir miniaturas para arquivos de imagem"
-
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:152
-#: libnautilus-extensions/nautilus-global-preferences.c:755
-msgid "Make Folder Appearance Details Public"
-msgstr "Tornar públicos detalhes da aparência de pasta"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:155
-#: libnautilus-extensions/nautilus-global-preferences.c:746
-msgid "Preview Sound Files"
-msgstr "Prever arquivos de som"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Use smoother (but slower) graphics"
-msgstr "Usar gráficos mais suaves (porém mais lentos)"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Use this font family to display file names:"
-msgstr "Usar esta família da fonte para exibir nomes de arquivo:"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-msgid "Display toolbar in new windows"
-msgstr "Exibir barra de ferramentas em novas janelas"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:170
-msgid "Display location bar in new windows"
-msgstr "Exibir barra de local em novas janelas"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:173
-msgid "Display status bar in new windows"
-msgstr "Exibir barra de estado em novas janelas"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:176
-msgid "Display sidebar in new windows"
-msgstr "Exibir barra lateral em novas janelas"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:179
-msgid "Use Nautilus to draw the desktop"
-msgstr "Usar o Nautilus para desenhar a área de trabalho."
-
-#: libnautilus-extensions/nautilus-global-preferences.c:183
-msgid "Enable fast search (indexes your hard drive)"
-msgstr "Ativar busca rápida (indexa o seu disco rígido)"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:186
-msgid "search type to do by default"
-msgstr "tipo de busca a ser executada por padrão"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:189
-msgid "search by text"
-msgstr "buscar por texto"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:190
-msgid "Search for files by file name only"
-msgstr "Buscar arquivos apenas por nome de arquivo"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:194
-msgid "search by text and properties"
-msgstr "buscar por texto e propriedades"
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "Comportamento dos cliques"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:195
-msgid "Search for files by file name and file properties"
-msgstr "Buscar arquivos por nome de arquivo e por propriedades de arquivo"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr "Arquivos texto executáveis"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:199
-msgid "Search Engine Location"
-msgstr "Local do mecanismo de busca"
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr "Opções exibir/esconder"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:203
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr "Exibir arquivos escondidos (nomes começam com \".\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:206
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr "Exibir arquivos de backup (nomes terminam com \"~\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:209
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr "Exibir marcadores especiais na janela Propriedades"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:212
-msgid "Show only folders (no files) in the tree"
-msgstr "Exibir apenas pastas (sem arquivos) na árvore"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:215
-msgid "Can add Content"
-msgstr "Pode adicionar conteúdo"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+#, fuzzy
+msgid "Sorting Order"
+msgstr "Erro ao atribuir dono"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:218
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
-msgstr "Não incluir os marcadores padrão no menu Marcadores"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:222
-#: libnautilus-extensions/nautilus-global-preferences.c:227
-#: src/file-manager/fm-properties-window.c:1519 src/nautilus-location-bar.c:62
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
 msgid "Location:"
 msgstr "Local:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:226
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+msgid "HTTP Proxy Settings"
+msgstr "Configurações de proxy HTTP"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "Usar proxy HTTP"
 
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:228
+#: libnautilus-extensions/nautilus-global-preferences.c:812
 #: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr "Porta:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:533
-msgid "Appearance"
-msgstr "Aparência"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:535
-msgid "Smoother Graphics"
-msgstr "Gráficos mais suaves"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "Marcadores padrão"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:552
-msgid "Windows & Desktop"
-msgstr "Janelas e área de trabalho"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "Não incluir os marcadores padrão no menu Marcadores"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:560
-msgid "Opening New Windows"
-msgstr "Abrindo novas janelas"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "Exibir texto nos ícones"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:583
-msgid "Trash Behavior"
-msgstr "Comportamento da lixeira"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr "Exibir a contagem de itens nas pastas"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:595
-msgid "Icon & List Views"
-msgstr "Visões de ícone e lista"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "Exibir miniaturas para arquivos de imagem"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:611
-msgid "Show/Hide Options"
-msgstr "Opções exibir/esconder"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:632
-msgid "Sidebar Panels"
-msgstr "Painéis da barra lateral"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr "Prever arquivos de som"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:635
-msgid "Tabs"
-msgstr "Abas"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr "Tornar públicos detalhes da aparência de pasta"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:684
-msgid "Navigation"
-msgstr "Navegação"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "Aparência"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:693
-msgid "HTTP Proxy Settings"
-msgstr "Configurações de proxy HTTP"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr "Janelas e área de trabalho"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:712
-msgid "Built-in Bookmarks"
-msgstr "Marcadores padrão"
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr "Visões de ícone e lista"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:723
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+msgid "Navigation"
+msgstr "Navegação"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:962
 msgid "Speed Tradeoffs"
 msgstr "Desempenho"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:794
-msgid "Search"
-msgstr "Buscar"
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr "buscar por texto"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+msgid "Search for files by file name only"
+msgstr "Buscar arquivos apenas por nome de arquivo"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr "buscar por texto e propriedades"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+msgid "Search for files by file name and file properties"
+msgstr "Buscar arquivos por nome de arquivo e por propriedades de arquivo"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "Opções de complexidade de busca"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:802
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "tipo de busca a ser executada por padrão"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 msgid "Fast Search"
 msgstr "Busca rápida"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:846
-msgid "Fonts"
-msgstr "Fontes"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1026
-#, c-format
-msgid "Display %s tab in sidebar"
-msgstr "Exibir aba %s na barra lateral"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr "Ativar busca rápida (indexa o seu disco rígido)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1073
-msgid "always"
-msgstr "sempre"
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+msgid "Search Engine Location"
+msgstr "Local do mecanismo de busca"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1074
-msgid "Always"
-msgstr "Sempre"
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Buscar"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1077
-msgid "local only"
-msgstr "apenas local"
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr "Exibir apenas pastas (sem arquivos) na árvore"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1078
-msgid "Local Files Only"
-msgstr "Apenas arquivos locais"
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, c-format
+msgid "Display %s tab in sidebar"
+msgstr "Exibir aba %s na barra lateral"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1081
-msgid "never"
-msgstr "nunca"
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "Painéis da barra lateral"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1082
-msgid "Never"
-msgstr "Nunca"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr "Abas"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1145
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "currently can't be performed because the program crond, which does nightly "
 "tasks on your computer, is turned off. To make sure fast searches can be "
 "done, turn crond on."
-msgstr "A indexação está ligada, ativando a função busca rápida. No entanto, a indexação não pode ser executada no momento porque o programa crond, que executa tarefas toda noite em seu computador, está desligado. Para garantir que buscas rápidas possam ser realizadas, ligue o crond."
+msgstr ""
+"A indexação está ligada, ativando a função busca rápida. No entanto, a "
+"indexação não pode ser executada no momento porque o programa crond, que "
+"executa tarefas toda noite em seu computador, está desligado. Para garantir "
+"que buscas rápidas possam ser realizadas, ligue o crond."
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1152
-#: libnautilus-extensions/nautilus-global-preferences.c:1170
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
 msgid "Files May Not Be Indexed"
 msgstr "Arquivos podem não ser indexados"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1153
-#: libnautilus-extensions/nautilus-global-preferences.c:1171
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
 msgid ""
 "If you are running Linux, you can log in as root and type these commands to "
 "start cron:\n"
@@ -5781,34 +5862,33 @@ msgid ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
-"Se você estiver usando Linux, você pode entrar como root e digitar estes comandos para iniciar o cron:\n"
+"Se você estiver usando Linux, você pode entrar como root e digitar estes "
+"comandos para iniciar o cron:\n"
 "\n"
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1162
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "may not be performed because the program crond, which does nightly tasks on "
 "your computer, may be turned off. To make sure fast searches can be done, "
 "check to make sure that crond is turned on.\n"
 "\n"
-msgstr "A indexação está ligada, ativando a função busca rápida. No entanto, a indexação não pode ser executada no momento porque o programa crond, que executa tarefas toda noite em seu computador, está desligado. Para garantir que buscas rápidas possam ser realizadas, tenha certeza que o crond está ligado.\n\n"
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:640
-msgid "No image was selected.  You must click on an image to select it."
-msgstr "Nenhuma imagem foi selecionada. Você deve clicar em uma imagem para selecioná-la."
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:641
-msgid "No selection made"
-msgstr "Nenhuma seleção foi feita"
+msgstr ""
+"A indexação está ligada, ativando a função busca rápida. No entanto, a "
+"indexação não pode ser executada no momento porque o programa crond, que "
+"executa tarefas toda noite em seu computador, está desligado. Para garantir "
+"que buscas rápidas possam ser realizadas, tenha certeza que o crond está "
+"ligado.\n"
+"\n"
 
 #. The list of characters that cause line breaks can be localized.
 #: libnautilus-extensions/nautilus-icon-canvas-item.c:70
 msgid " -_,;.?/&"
 msgstr " -_,;.?/&"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:741
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
@@ -5818,7 +5898,7 @@ msgstr ""
 "manual e deixar este item onde você o colocou? Isto vai se sobrepor a "
 "aparência manual armazenada."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:745
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
@@ -5828,7 +5908,7 @@ msgstr ""
 "manual e deixar estes itens onde você os colocou? Isto vai se sobrepor a "
 "aparência manual armazenada."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:751
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
@@ -5836,7 +5916,7 @@ msgstr ""
 "Este diretório usa aparência automática. Você que mudar para aparência "
 "manual e deixar este item onde você o colocou?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:754
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
@@ -5844,64 +5924,48 @@ msgstr ""
 "Este diretório usa aparência automática. Você que mudar para aparência "
 "manual e deixar estes itens onde você os colocou?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:759
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "Mudar para aparência manual?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:760
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "Mudar"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "Renomear"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1551
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr "Desfazer digitação"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1552
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "Recupera o nome antigo"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1553
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "Refazer digitação"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1554
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Recupera o nome modificado"
 
-#: libnautilus-extensions/nautilus-password-dialog.c:306
-msgid "Remember this password"
-msgstr "Lembrar esta senha"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:483
-msgid "times"
-msgstr "times"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:484
-msgid "courier"
-msgstr "courier"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:485
-msgid "lucida"
-msgstr "lucida"
-
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "Novato"
 
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "Intermediário"
 
-#: libnautilus-extensions/nautilus-preferences.c:79
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "Avançado"
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:202
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "Diálogo de preferências"
 
@@ -6000,7 +6064,7 @@ msgid "Don't include in the menu for \"%s\" items"
 msgstr "Não incluir no menu para itens \"%s\""
 
 #: libnautilus-extensions/nautilus-program-chooser.c:1209
-#: src/file-manager/fm-list-view.c:2123
+#: src/file-manager/fm-list-view.c:2182
 #: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
@@ -6086,14 +6150,18 @@ msgid ""
 msgstr ""
 "%s\n"
 "\n"
-"Você pode configurar quais programas são apresentados para quais tipos de arquivos com a parte \"Tipos de arquivos e programas\" da Central de Controle Gnome. Você gostaria de ir para lá agora?"
+"Você pode configurar quais programas são apresentados para quais tipos de "
+"arquivos com a parte \"Tipos de arquivos e programas\" da Central de "
+"Controle Gnome. Você gostaria de ir para lá agora?"
 
 #: libnautilus-extensions/nautilus-program-choosing.c:492
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
 "locations.  Would you like to choose another application?"
-msgstr "\"%s\" não pode abrir \"%s\" porque \"%s\" não pode acessar arquivos nos locais \"%s\". Você gostaria de escolher uma outra aplicação?"
+msgstr ""
+"\"%s\" não pode abrir \"%s\" porque \"%s\" não pode acessar arquivos nos "
+"locais \"%s\". Você gostaria de escolher uma outra aplicação?"
 
 #: libnautilus-extensions/nautilus-program-choosing.c:497
 #: libnautilus-extensions/nautilus-program-choosing.c:518
@@ -6106,7 +6174,11 @@ msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
 "locations.  No other applications are available to view this file.  If you "
 "copy this file onto your computer, you may be able to open it."
-msgstr "\"%s\" não pode abrir \"%s\" porque \"%s\" não pode acessar arquivos nos locais \"%s\". Nenhuma outra aplicação está disponível para ver este arquivo. Se você copiar este arquivo para o seu computador, você pode ser capaz de abri-lo."
+msgstr ""
+"\"%s\" não pode abrir \"%s\" porque \"%s\" não pode acessar arquivos nos "
+"locais \"%s\". Nenhuma outra aplicação está disponível para ver este "
+"arquivo. Se você copiar este arquivo para o seu computador, você pode ser "
+"capaz de abri-lo."
 
 #. Human readable description for a criterion in a search for
 #. files. Bracketed items are context, and are message
@@ -6353,25 +6425,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Itens contendo \"medusa\" em seus nomes e que são diretórios"
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr "Detalhes"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr "Alerta"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr "Erro"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr "Pergunta"
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr "Buscando nos discos"
@@ -6380,7 +6433,7 @@ msgstr "Buscando nos discos"
 msgid "Nautilus is searching your disks for trash folders."
 msgstr "O Nautilus está buscando pastas de lixeira em seus discos."
 
-#: libnautilus-extensions/nautilus-trash-file.c:600
+#: libnautilus-extensions/nautilus-trash-file.c:725
 msgid "on the desktop"
 msgstr "na área de trabalho"
 
@@ -6414,47 +6467,44 @@ msgstr "Ver como %s"
 msgid "%s Viewer"
 msgstr "Visualizador de %s"
 
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+msgid "Unknown"
+msgstr "Desconhecido"
+
 #. Populate table with items we know localized names for.
-#: libnautilus-extensions/nautilus-volume-monitor.c:623
-#: libnautilus-extensions/nautilus-volume-monitor.c:1862
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr "Disquete"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:624
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:625
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
 msgid "Zip Drive"
 msgstr "Zip Drive"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:646
-#: libnautilus-extensions/nautilus-volume-monitor.c:668
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 msgid "Audio CD"
 msgstr "CD de áudio"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1547
-msgid "Mount Error"
-msgstr "Erro ao montar"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1549
-msgid "Unmount Error"
-msgstr "Erro ao desmontar"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1579
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr "é protegido contra escrita, montando como apenas leitura"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1582
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "não é um dispositivo de blocos válido"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1583
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr "Não foi achada mídia"
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1587
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
@@ -6463,7 +6513,7 @@ msgstr ""
 "drive."
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1591
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
@@ -6471,11 +6521,11 @@ msgstr ""
 "O Nautilus não pôde montar o volume. Provavelmente não há mídia no "
 "dispositivo."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1594
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr "tipo de sa errado, opção errada, superblock defeituoso"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1597
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
@@ -6483,7 +6533,7 @@ msgstr ""
 "O Nautilus não pôde montar o disco flexível. Provavelmente o disco está em "
 "um formato que não pode ser montado."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1600
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
@@ -6491,48 +6541,56 @@ msgstr ""
 "O Nautilus não pôde montar o volume selecionado. Provavelmente o volume está "
 "em um formato que não pode ser montado."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1605
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr "O Nautilus não pôde montar o disco flexível selecionado."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1607
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "O Nautilus não pôde montar o volume selecionado."
 
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1612
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr "O Nautilus não pôde desmontar o volume selecionado."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1764
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr "Erro ao montar"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr "Erro ao desmontar"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "Volume ISO 9660"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1779
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "Root"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1786
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Volume ext2"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1801
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "Volume MSDOS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1816
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "Volume NFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1831
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
 msgid "ReiserFS Volume"
 msgstr "Volume ReiserFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1847
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
 msgid "UFS Volume"
 msgstr "Volume UFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1877
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "Volume desconhecido"
 
@@ -6540,31 +6598,65 @@ msgstr "Volume desconhecido"
 msgid "C_lear Text"
 msgstr "_Limpar texto"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "_Limpar texto"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "_Copiar texto"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "Copia o texto selecionado para a área de transferência"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "Cortar _texto"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+msgid "Cut _Text"
+msgstr "Cortar _texto"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "Corta o texto selecionado para a área de transferência"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:46
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "_Colar texto"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "Cola o texto armazenado na área de transferência"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "Remove o texto selecionado sem colocá-lo na área de transferência"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:80
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "Selecionar _todos"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+msgid "Select _All"
+msgstr "Selecionar _todos"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "Selecionar todos os itens nesta janela"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "_Copiar texto"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:7
-msgid "_Cut Text"
-msgstr "_Cortar texto"
-
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:93
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "_Colar texto"
 
@@ -6573,7 +6665,7 @@ msgstr "_Colar texto"
 #. * to change it when we upgrade to GTK 2.0.
 #.
 #: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
-#: src/nautilus-window-menus.c:569
+#: src/nautilus-window-menus.c:610
 msgid "Nautilus"
 msgstr "Nautilus"
 
@@ -6589,78 +6681,110 @@ msgstr "Gerenciador de arquivos e ambiente gráfico Nautilus"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:735
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr "Pasta pessoal de %s"
 
-#: src/file-manager/fm-desktop-icon-view.c:1021
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "Esvaziar lixeira..."
 
-#: src/file-manager/fm-desktop-icon-view.c:1023
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "Esvaziar lixeira"
 
-#: src/file-manager/fm-desktop-icon-view.c:1043
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "Desmontar volume"
 
-#: src/file-manager/fm-directory-view.c:474
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr "Isto irá abrir %d janela separadas. Você está certo que deseja isto?"
 
-#: src/file-manager/fm-directory-view.c:476
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Abrir %d janelas?"
 
-#: src/file-manager/fm-directory-view.c:1212
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr "Você tem certeza que deseja excluir permanentemente \"%s\" da lixeira?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+"Você tem certeza que deseja excluir permanentemente os %d itens selecionados "
+"da lixeira?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Excluir"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Excluir"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+#, fuzzy
+msgid "scripts"
+msgstr "Descrição"
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" selecionado"
 
-#: src/file-manager/fm-directory-view.c:1214
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "1 pasta selecionada"
 
-#: src/file-manager/fm-directory-view.c:1217
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "%d pastas selecionadas"
 
-#: src/file-manager/fm-directory-view.c:1223
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr " (contendo 0 itens)"
 
-#: src/file-manager/fm-directory-view.c:1225
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr " (contendo 1 item)"
 
-#: src/file-manager/fm-directory-view.c:1227
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr " (contendo %d itens)"
 
-#: src/file-manager/fm-directory-view.c:1238
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" selecionado (%s)"
 
-#: src/file-manager/fm-directory-view.c:1242
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d itens selecionados (%s)"
 
-#: src/file-manager/fm-directory-view.c:1249
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 outro item selecionado (%s)"
 
-#: src/file-manager/fm-directory-view.c:1252
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d outros itens selecionados (%s)"
@@ -6672,7 +6796,7 @@ msgstr "%d outros itens selecionados (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1281
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -6681,7 +6805,7 @@ msgstr "%s%s, %s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1407
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
@@ -6690,11 +6814,11 @@ msgstr ""
 "A pasta \"%s\" contém mais arquivos do que o Nautilus pode suportar. Alguns "
 "arquivos não serão exibidos."
 
-#: src/file-manager/fm-directory-view.c:1414
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "Arquivos demais"
 
-#: src/file-manager/fm-directory-view.c:2623
+#: src/file-manager/fm-directory-view.c:2752
 #, c-format
 msgid ""
 "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
@@ -6702,7 +6826,7 @@ msgstr ""
 "\"%s\" não pode ser movido para a lixeira. Você deseja excluí-lo "
 "imediatamente?"
 
-#: src/file-manager/fm-directory-view.c:2628
+#: src/file-manager/fm-directory-view.c:2757
 #, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
@@ -6711,7 +6835,7 @@ msgstr ""
 "Os %d itens selecionados não podem ser movidos para a lixeira. Você deseja "
 "excluí-los imediatamente?"
 
-#: src/file-manager/fm-directory-view.c:2632
+#: src/file-manager/fm-directory-view.c:2761
 #, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -6720,21 +6844,16 @@ msgstr ""
 "%d dos itens selecionados não podem ser movidos para a lixeira. Você deseja "
 "excluir estes %d itens imediatamente?"
 
-#: src/file-manager/fm-directory-view.c:2640
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "Excluir imediatamente?"
 
-#: src/file-manager/fm-directory-view.c:2641
-#: src/file-manager/fm-directory-view.c:2682
-msgid "Delete"
-msgstr "Excluir"
-
-#: src/file-manager/fm-directory-view.c:2671
+#: src/file-manager/fm-directory-view.c:2799
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr "Você tem certeza que deseja excluir permanentemente \"%s\" da lixeira?"
 
-#: src/file-manager/fm-directory-view.c:2675
+#: src/file-manager/fm-directory-view.c:2803
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
@@ -6743,75 +6862,213 @@ msgstr ""
 "Você tem certeza que deseja excluir permanentemente os %d itens selecionados "
 "da lixeira?"
 
-#: src/file-manager/fm-directory-view.c:2681
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "Excluir da lixeira?"
 
-#: src/file-manager/fm-directory-view.c:2978
-#: src/file-manager/fm-directory-view.c:3018
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Usar \"%s\" para abrir o item selecionado"
 
-#: src/file-manager/fm-directory-view.c:3220
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "Outro _aplicativo..."
+
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "Outro _aplicativo..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "Outro _visualizador..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "Outro _visualizador..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "Usar \"%s\" para abrir o item selecionado"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "O Nautilus não pôde montar o volume selecionado."
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"Os %d itens selecionados não podem ser movidos para a lixeira. Você deseja "
+"excluí-los imediatamente?"
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "Abrir em uma _nova janela"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open _in New Window"
 msgstr "Abrir em uma _nova janela"
 
-#: src/file-manager/fm-directory-view.c:3222
+#: src/file-manager/fm-directory-view.c:3959
 #, c-format
 msgid "Open _in %d New Windows"
 msgstr "Abrir em %d _novas janelas"
 
-#: src/file-manager/fm-directory-view.c:3248
-msgid "Delete all selected items permanently"
-msgstr "Excluir permanentemente todos os itens selecionados"
-
-#: src/file-manager/fm-directory-view.c:3253
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "Excluir da _lixeira..."
 
-#: src/file-manager/fm-directory-view.c:3254
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "Excluir da _lixeira"
 
-#: src/file-manager/fm-directory-view.c:3258
-msgid "Move all selected items to the Trash"
-msgstr "Mover todos os itens selecionados para a lixeira"
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "Excluir permanentemente todos os itens selecionados"
 
-#: src/file-manager/fm-directory-view.c:3262
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "Mover para a _lixeira"
 
-#: src/file-manager/fm-directory-view.c:3292
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "Mover todos os itens selecionados para a lixeira"
+
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "Excluir"
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "Excluir"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "Criar _vínculos"
 
-#: src/file-manager/fm-directory-view.c:3293
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "Criar _vínculo"
 
-#: src/file-manager/fm-directory-view.c:3311
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "_Esvaziar lixeira..."
 
-#: src/file-manager/fm-directory-view.c:3312
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "_Esvaziar lixeira"
 
-#: src/file-manager/fm-directory-view.c:3323
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "R_emover imagens personalizadas"
 
-#: src/file-manager/fm-directory-view.c:3324
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "R_emover imagem personalizada"
 
-#: src/file-manager/fm-directory-view.c:3477
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "_Arquivo"
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u arquivos"
+
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "_Copiar texto"
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "Copiando arquivos"
+
+#: src/file-manager/fm-directory-view.c:4252
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
 "link in the Trash?"
@@ -6819,7 +7076,7 @@ msgstr ""
 "Este vínculo não pode ser usado pois ele não possui um alvo. Você deseja "
 "colocá-lo na lixeira?"
 
-#: src/file-manager/fm-directory-view.c:3480
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
@@ -6828,15 +7085,15 @@ msgstr ""
 "Este vínculo não pode ser usado pois seu alvo \"%s\" não existe. Você deseja "
 "colocá-lo na lixeira?"
 
-#: src/file-manager/fm-directory-view.c:3486
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "Vínculo com problema"
 
-#: src/file-manager/fm-directory-view.c:3487
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr "Jogar fora"
 
-#: src/file-manager/fm-directory-view.c:3540
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
@@ -6845,19 +7102,19 @@ msgstr ""
 "\"%s\" é um arquivo texto executável. Você deseja executá-lo ou exibir o seu "
 "conteúdo?"
 
-#: src/file-manager/fm-directory-view.c:3546
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr "Executar ou exibir?"
 
-#: src/file-manager/fm-directory-view.c:3547
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "Executar"
 
-#: src/file-manager/fm-directory-view.c:3548
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "Exibir"
 
-#: src/file-manager/fm-directory-view.c:3602
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
@@ -6865,16 +7122,16 @@ msgstr ""
 "Desculpe, mas você não pode executar comandos a partir de um local remoto "
 "devido a considerações de segurança."
 
-#: src/file-manager/fm-directory-view.c:3604
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "Não é possível executar vínculos remotos"
 
-#: src/file-manager/fm-directory-view.c:3738
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr "Abrindo \"%s\""
 
-#: src/file-manager/fm-directory-view.c:3744
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "Cancelar abertura?"
 
@@ -6885,34 +7142,39 @@ msgid ""
 msgstr ""
 "Você não possui as permissões necessárias para ver o conteúdo de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:65
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Desculpe, não foi possível exibir todo o conteúdo de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Erro ao exibir pasta"
 
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "O nome \"%s\" já é usado nesta pasta. Por favor use um nome diferente."
 
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 "Não existe \"%s\" nesta pasta. Talvez ele tenha sido movido ou excluído?"
 
-#: src/file-manager/fm-error-reporting.c:109
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Você não possui as permissões necessárias para renomear \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -6921,67 +7183,67 @@ msgstr ""
 "O nome \"%s\" não é válido pois contém o caracter \"/\". Por favor use um "
 "nome diferente."
 
-#: src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "O nome \"%s\" não é válido. Por favor use um nome diferente."
 
-#: src/file-manager/fm-error-reporting.c:124
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Não foi possível mudar o nome de \"%s\" pois ele está em um disco de apenas "
 "leitura"
 
-#: src/file-manager/fm-error-reporting.c:133
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Não foi possível renomear \"%s\" para \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:140
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "Erro ao renomear"
 
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr ""
 "Você não possui as permissões necessárias para mudar o grupo de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Não foi possível mudar o grupo de \"%s\" pois ele está em um disco de apenas "
 "leitura"
 
-#: src/file-manager/fm-error-reporting.c:172
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Não foi possível mudar o grupo de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:176
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "Erro ao atribuir grupo"
 
-#: src/file-manager/fm-error-reporting.c:198
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Não foi possível mudar o dono de \"%s\" pois ele está em um disco de apenas "
 "leitura"
 
-#: src/file-manager/fm-error-reporting.c:205
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Não foi possível mudar o dono de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "Erro ao atribuir dono"
 
-#: src/file-manager/fm-error-reporting.c:230
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
@@ -6989,21 +7251,21 @@ msgstr ""
 "Não foi possível mudar as permissões de \"%s\" pois ele está em um disco de "
 "apenas leitura"
 
-#: src/file-manager/fm-error-reporting.c:237
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Não foi possível mudar as permissões de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "Erro ao atribuir permissões"
 
-#: src/file-manager/fm-error-reporting.c:306
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Renomeando \"%s\" para \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:311
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "Cancelar mudança de nome?"
 
@@ -7063,76 +7325,76 @@ msgstr ""
 "Escolha a ordem em que a informação aparecerá sob os nomes do ícones. Mais "
 "informação aparecerá a medida que a visão se aproximar."
 
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "por _nome"
 
-#: src/file-manager/fm-icon-view.c:159
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "Mantém ícones ordenados por nome nas linhas"
 
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "por _tamanho"
 
-#: src/file-manager/fm-icon-view.c:166
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "Mantém ícones ordenados por tamanho nas linhas"
 
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "por t_ipo"
 
-#: src/file-manager/fm-icon-view.c:173
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "Mantém ícones ordenados por tipo nas linhas"
 
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "por _data de modificação"
 
-#: src/file-manager/fm-icon-view.c:180
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Mantém ícones ordenados por data de modificação nas linhas"
 
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "por _emblemas"
 
-#: src/file-manager/fm-icon-view.c:187
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Mantém ícones ordenados por emblemas nas linhas"
 
-#: src/file-manager/fm-icon-view.c:1230
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "_Restaurar tamanho original dos ícones"
 
-#: src/file-manager/fm-icon-view.c:1231
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "_Restaurar tamanho original do ícone"
 
-#: src/file-manager/fm-icon-view.c:1443
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "apontando para \"%s\""
 
-#: src/file-manager/fm-list-view.c:2129
+#: src/file-manager/fm-list-view.c:2188
 #: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/file-manager/fm-list-view.c:2135
+#: src/file-manager/fm-list-view.c:2194
 #: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Tipo"
 
-#: src/file-manager/fm-list-view.c:2141
+#: src/file-manager/fm-list-view.c:2200
 #: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Data de modificação"
@@ -7189,120 +7451,126 @@ msgstr "(algumas partes ilegíveis)"
 msgid "Contents:"
 msgstr "Conteúdo:"
 
-#: src/file-manager/fm-properties-window.c:1433
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "Básico"
 
-#: src/file-manager/fm-properties-window.c:1512
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/file-manager/fm-properties-window.c:1517
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: src/file-manager/fm-properties-window.c:1521
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "Conjuntos de vínculos"
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
 msgstr "Tipo MIME:"
 
-#: src/file-manager/fm-properties-window.c:1527
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "Modificado:"
 
-#: src/file-manager/fm-properties-window.c:1530
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "Acessado:"
 
-#: src/file-manager/fm-properties-window.c:1539
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr "Selecionar ícone personalizado..."
 
-#: src/file-manager/fm-properties-window.c:1545
+#: src/file-manager/fm-properties-window.c:1558
 msgid "Remove Custom Icon"
 msgstr "Remover ícone personalizado"
 
-#: src/file-manager/fm-properties-window.c:1873
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "Set User ID"
 
-#: src/file-manager/fm-properties-window.c:1878
+#: src/file-manager/fm-properties-window.c:1891
 msgid "Special Flags:"
 msgstr "Indicadores especiais:"
 
-#: src/file-manager/fm-properties-window.c:1881
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "Set Group ID"
 
-#: src/file-manager/fm-properties-window.c:1883
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "Sticky"
 
-#: src/file-manager/fm-properties-window.c:1909
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Permissões"
 
-#: src/file-manager/fm-properties-window.c:1915
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Você não é o dono, logo você não pode alterar as permissões."
 
-#: src/file-manager/fm-properties-window.c:1928
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "Dono do arquivo:"
 
-#: src/file-manager/fm-properties-window.c:1937
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "Grupo do arquivo:"
 
-#: src/file-manager/fm-properties-window.c:1955
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "Dono:"
 
-#: src/file-manager/fm-properties-window.c:1956
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "Grupo:"
 
-#: src/file-manager/fm-properties-window.c:1957
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "Outros:"
 
-#: src/file-manager/fm-properties-window.c:1976
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "Leitura"
 
-#: src/file-manager/fm-properties-window.c:1980
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "Escrita"
 
-#: src/file-manager/fm-properties-window.c:1984
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "Execução"
 
-#: src/file-manager/fm-properties-window.c:2035
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "Como texto:"
 
-#: src/file-manager/fm-properties-window.c:2036
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "Como números:"
 
-#: src/file-manager/fm-properties-window.c:2037
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "Última alteração:"
 
-#: src/file-manager/fm-properties-window.c:2041
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "As permissões de \"%s\" não puderam ser determinadas."
 
-#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr "Cancelar exibição da janela Propriedades?"
 
-#: src/file-manager/fm-properties-window.c:2322
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr "Criando janela Propriedades"
 
-#: src/file-manager/fm-properties-window.c:2422
+#: src/file-manager/fm-properties-window.c:2435
 msgid "Select an icon:"
 msgstr "Selecione um ícone:"
 
@@ -7328,7 +7596,7 @@ msgstr ""
 "foi instalado."
 
 #: src/file-manager/fm-search-list-view.c:159
-#: src/file-manager/nautilus-indexing-info.c:405
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr "Serviço de busca não está disponível"
 
@@ -7505,7 +7773,7 @@ msgstr ""
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
 #: src/file-manager/fm-search-list-view.c:360
-#: src/file-manager/nautilus-indexing-info.c:340
+#: src/file-manager/nautilus-indexing-info.c:342
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
@@ -7520,7 +7788,7 @@ msgid "Fast searches are not available on your computer"
 msgstr "Buscas rápidas não estão disponíveis em seu computador"
 
 #: src/file-manager/fm-search-list-view.c:373
-#: src/file-manager/nautilus-indexing-info.c:359
+#: src/file-manager/nautilus-indexing-info.c:361
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Fast search is disabled in your Search preferences, so no index is available."
@@ -7530,13 +7798,13 @@ msgstr ""
 "logo não existe um índice disponível."
 
 #: src/file-manager/fm-search-list-view.c:376
-#: src/file-manager/nautilus-indexing-info.c:345
-#: src/file-manager/nautilus-indexing-info.c:363
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
 msgid "Fast searches are not available on your computer."
 msgstr "Buscas rápidas não estão disponíveis em seu computador."
 
 #: src/file-manager/fm-search-list-view.c:377
-#: src/file-manager/nautilus-indexing-info.c:364
+#: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
 "To enable fast search, open the Preferences menu and choose Preferences. "
 "Then select Search preferences and put a checkmark in the Enable Fast Search "
@@ -7594,7 +7862,7 @@ msgid "Change Desktop Background"
 msgstr "Alterar fundo da área de trabalho"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Delete all items in the Trash"
 msgstr "Excluir todos os itens na lixeira"
 
@@ -7642,140 +7910,191 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Escolher outro visualizador para ver o item selecionado"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-msgid "Create Link"
-msgstr "Criar vínculo"
+#, fuzzy
+msgid "Copy Files"
+msgstr "Copiando arquivos"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "Criar uma nova pasta vazia dentro desta pasta"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "Criar um vínculo simbólico para cada item selecionado"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u arquivos"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "Mover cada item selecionado para a lixeira"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "Duplicata"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "Duplicar cada item selecionado"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "Criar vínculo"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr "Mover cada item selecionado para a lixeira"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Move to Trash"
 msgstr "Mover para a lixeira"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "Nova pasta"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "Abrir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid "Open Wit_h"
 msgstr "Abrir _com"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "Abrir com"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "Abrir o item selecionado em uma nova janela"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr "Abrir em uma nova janela"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Abrir o item selecionado nesta janela"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "Outra aplicação..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "Outro visualizador..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Other _Application..."
-msgstr "Outro _aplicativo..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "_Colar texto"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-msgid "Other _Viewer..."
-msgstr "Outro _visualizador..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr "Remover imagens personalizadas"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr "Remover quaisquer imagens personalizadas dos ícones selecionados"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr "Remover qualquer padrão ou cor personalizada do fundo deste local"
 
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "Reconfigurar fundo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+msgid "Scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr "Selecionar todos os arquivos"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Select _All Files"
 msgstr "Selecionar _todos os arquivos"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "Selecionar todos os itens nesta janela"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr "Exibir propriedades"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Show Trash"
 msgstr "Exibir lixeira"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "Exibir _propriedades"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "Show the contents of the Trash"
 msgstr "Exibir o conteúdo da lixeira"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "Ver ou modificar as propriedades de cada item selecionado"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "_Duplicar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_New Folder"
 msgstr "_Nova pasta"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "_Colar texto"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Show Trash"
 msgstr "Exibir _lixeira"
 
@@ -7956,7 +8275,7 @@ msgstr ""
 
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr "Estado da indexação"
 
@@ -7965,28 +8284,32 @@ msgstr "Estado da indexação"
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
-msgstr "Uma vez por dia seus arquivos e conteúdo de texto são indexados para que suas buscas sejam rápidas. "
+msgstr ""
+"Uma vez por dia seus arquivos e conteúdo de texto são indexados para que "
+"suas buscas sejam rápidas. "
 
 #: src/file-manager/nautilus-indexing-info.c:236
 #, c-format
 msgid "Your files were last indexed at %s"
 msgstr "Seus arquivos foram indexados pela última vez em %s"
 
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "Atualizar agora"
 
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast.  Your files are currently being indexed."
-msgstr "Uma vez por dia seus arquivos e conteúdo de texto são indexados para que suas buscas sejam rápidas. Seus arquivos estão sendo indexados agora."
+msgstr ""
+"Uma vez por dia seus arquivos e conteúdo de texto são indexados para que "
+"suas buscas sejam rápidas. Seus arquivos estão sendo indexados agora."
 
-#: src/file-manager/nautilus-indexing-info.c:404
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Desculpe, serviço de busca Medusa não está disponível."
 
-#: src/file-manager/nautilus-indexing-info.c:426
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr "%H:%M, %x"
 
@@ -8030,7 +8353,10 @@ msgid ""
 "Nautilus could not create the required folder \"%s\". Before running "
 "Nautilus, please create this folder, or set permissions such that Nautilus "
 "can create it."
-msgstr "Nautilus não pôde criar a pasta \"%s\". Antes de executar o Nautilus, por favor crie esta pasta ou atribua permissões tais que o Nautilus possa criá-la."
+msgstr ""
+"Nautilus não pôde criar a pasta \"%s\". Antes de executar o Nautilus, por "
+"favor crie esta pasta ou atribua permissões tais que o Nautilus possa "
+"criá-la."
 
 #: src/nautilus-application.c:281
 msgid "Couldn't Create Required Folders"
@@ -8050,7 +8376,8 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"Antes de executar o Nautilus, por favor crie estas pastas ou atribua permissões tais que o Nautilus possa criá-las."
+"Antes de executar o Nautilus, por favor crie estas pastas ou atribua "
+"permissões tais que o Nautilus possa criá-las."
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.oaf file. This has happened when you
@@ -8067,7 +8394,10 @@ msgid ""
 "Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
 "from the console may fix the problem. If not, you can try rebooting the "
 "computer or installing Nautilus again."
-msgstr "Não é possível usar o Nautilus agora. Executar o comando \"nautilus-clean.sh -x\" no console pode resolver o problema. Caso contrário, você pode tentar reiniciar o computador ou reinstalar o Nautilus."
+msgstr ""
+"Não é possível usar o Nautilus agora. Executar o comando \"nautilus-clean.sh "
+"-x\" no console pode resolver o problema. Caso contrário, você pode tentar "
+"reiniciar o computador ou reinstalar o Nautilus."
 
 #. FIXME bugzilla.eazel.com 2536: The guesses and stuff here are lame.
 #: src/nautilus-application.c:413
@@ -8088,15 +8418,23 @@ msgid ""
 "\n"
 "We have also seen this error when a faulty version of oaf was installed."
 msgstr ""
-"Não é possível usar o Nautilus agora. Executar o comando \"nautilus-clean.sh -x\" no console pode resolver o problema. Caso contrário, você pode tentar reiniciar o computador ou reinstalar o Nautilus.\n"
+"Não é possível usar o Nautilus agora. Executar o comando \"nautilus-clean.sh "
+"-x\" no console pode resolver o problema. Caso contrário, você pode tentar "
+"reiniciar o computador ou reinstalar o Nautilus.\n"
 "\n"
-"OAF não pôde localizar o arquivo Nautilus_shell.oaf. Uma causa disto aparenta ser um LD_LIBRARY_PATH que não inclui o diretório de biblioteca oaf. Outra possível causa seria uma instalação defeituosa sem o arquivo Nautilus_Shell.oaf.\n"
+"OAF não pôde localizar o arquivo Nautilus_shell.oaf. Uma causa disto "
+"aparenta ser um LD_LIBRARY_PATH que não inclui o diretório de biblioteca "
+"oaf. Outra possível causa seria uma instalação defeituosa sem o arquivo "
+"Nautilus_Shell.oaf.\n"
 "\n"
-"Executar \"nautilus-clean.sh -x\" terminará todos os processos OAF e GConf que podem ser necessários para outros aplicativos.\n"
+"Executar \"nautilus-clean.sh -x\" terminará todos os processos OAF e GConf "
+"que podem ser necessários para outros aplicativos.\n"
 "\n"
-"Algumas vezes terminar oafd e gconfd resolve o problema, mas não sabemos porque.\n"
+"Algumas vezes terminar oafd e gconfd resolve o problema, mas não sabemos "
+"porque.\n"
 "\n"
-"Nós observamos este erro também quando uma versão defeituosa do oaf foi instalada. "
+"Nós observamos este erro também quando uma versão defeituosa do oaf foi "
+"instalada. "
 
 #. Some misc. error (can never happen with current
 #. * version of OAF). Show dialog and terminate the
@@ -8160,7 +8498,7 @@ msgstr "Marcadores"
 msgid "Location"
 msgstr "Local"
 
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:763
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Remover"
 
@@ -8188,7 +8526,8 @@ msgstr ""
 "A existência deste arquivo indica que o assistente de configuração do\n"
 "Nautilus já foi exibido.\n"
 "\n"
-"Você pode apagar manualmente este arquivo para exibir o assistente novamente.\n"
+"Você pode apagar manualmente este arquivo para exibir o assistente "
+"novamente.\n"
 "\n"
 
 #: src/nautilus-first-time-druid.c:487
@@ -8341,7 +8680,7 @@ msgstr "Ativar busca rápida"
 msgid "Turn fast search on when cron is enabled"
 msgstr "Liga a busca rápida quando cron está ativado"
 
-#: src/nautilus-first-time-druid.c:1028
+#: src/nautilus-first-time-druid.c:1027
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "currently can't be performed because the program crond, which does\n"
@@ -8365,7 +8704,7 @@ msgstr ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: src/nautilus-first-time-druid.c:1036
+#: src/nautilus-first-time-druid.c:1035
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "may not be performed because the program crond, which does nightly tasks\n"
@@ -8390,7 +8729,7 @@ msgstr ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: src/nautilus-first-time-druid.c:1123
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
 "Click Finish to launch Nautilus. You'll start with two\n"
 "Nautilus windows: one shows your home folder, and the\n"
@@ -8406,7 +8745,7 @@ msgstr ""
 "\n"
 "Nós esperamos que você aprecie o Nautilus!"
 
-#: src/nautilus-first-time-druid.c:1130
+#: src/nautilus-first-time-druid.c:1129
 msgid ""
 "Click Finish to launch Nautilus. You'll start with a\n"
 "window showing your home folder.\n"
@@ -8418,15 +8757,15 @@ msgstr ""
 "\n"
 "Nós esperamos que você aprecie o Nautilus!"
 
-#: src/nautilus-first-time-druid.c:1154
+#: src/nautilus-first-time-druid.c:1153
 msgid "Nautilus First Time Setup"
 msgstr "Configuração inicial do Nautilus"
 
-#: src/nautilus-first-time-druid.c:1184
+#: src/nautilus-first-time-druid.c:1183
 msgid "Welcome to Nautilus"
 msgstr "Bem-vindo ao Nautilus"
 
-#: src/nautilus-first-time-druid.c:1186
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
 "Nautilus...\n"
 "    Is a great file manager for the GNOME desktop.\n"
@@ -8445,51 +8784,51 @@ msgstr ""
 "Clique em Próximo para começar a personalizar seu ambiente Nautilus."
 
 #. set up the final page
-#: src/nautilus-first-time-druid.c:1197
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "Concluído"
 
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1210
+#: src/nautilus-first-time-druid.c:1209
 msgid "Choose Your User Level"
 msgstr "Escolha seu nível de usuário"
 
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1214
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr "Transição GMC para Nautilus"
 
 #. set up the `Launch Medusa' page
-#: src/nautilus-first-time-druid.c:1218
+#: src/nautilus-first-time-druid.c:1217
 msgid "Fast Searches"
 msgstr "Buscas rápidas"
 
 #. set up optional page to tell the user how to run cron
-#: src/nautilus-first-time-druid.c:1226
+#: src/nautilus-first-time-druid.c:1225
 msgid "The Cron Daemon"
 msgstr "O daemon cron"
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1231
+#: src/nautilus-first-time-druid.c:1230
 msgid "Checking Your Internet Connection"
 msgstr "Verificando a sua conexão à Internet"
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1242
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "Atualizando o Nautilus..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1250
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "Configuração de proxy para web"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1325
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "Decodificando atualização..."
 
-#: src/nautilus-first-time-druid.c:1342
+#: src/nautilus-first-time-druid.c:1341
 msgid "Update Complete. Click Next to Continue."
 msgstr "Atualização concluída. Pressione Próximo para continuar."
 
@@ -8497,7 +8836,7 @@ msgstr "Atualização concluída. Pressione Próximo para continuar."
 #. * doesn't exist. Arlo and I (jsh) and decided that the
 #. * best thing to do is silently fail
 #.
-#: src/nautilus-first-time-druid.c:1357
+#: src/nautilus-first-time-druid.c:1356
 msgid "No Update Available... Press Next to Continue."
 msgstr "Nenhuma atualização disponível... Pressione Próximo para continuar."
 
@@ -8524,47 +8863,47 @@ msgstr "Você deseja ver estes %d locais em janelas separadas?"
 msgid "View in Multiple Windows?"
 msgstr "Ver em várias janelas?"
 
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr "Realizar um rápido conjunto de auto testes."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "Criar a janela inicial com a geometria dada."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "GEOMETRIA"
 
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Apenas criar janelas para URIs especificadas explicitamente."
 
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "Sair do Nautilus."
 
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "Reiniciar o Nautilus."
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check não pode ser usado com URIs.\n"
 
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check não pode ser usado com outras opções.\n"
 
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit não pode ser usado com URIs.\n"
 
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart não pode ser usado com URIs.\n"
 
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry não pode ser usado com mais de uma URI.\n"
 
@@ -9074,15 +9413,18 @@ msgid "View as List"
 msgstr "Ver como lista"
 
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+#, fuzzy
+msgid " _Advanced"
 msgstr " Avançado"
 
 #: src/nautilus-shell-ui.xml.h:2
-msgid " Beginner"
+#, fuzzy
+msgid " _Beginner"
 msgstr " Novato"
 
 #: src/nautilus-shell-ui.xml.h:3
-msgid " Intermediate"
+#, fuzzy
+msgid " _Intermediate"
 msgstr " Intermediário"
 
 #: src/nautilus-shell-ui.xml.h:4
@@ -9122,22 +9464,18 @@ msgid "Close this window"
 msgstr "Fecha esta janela"
 
 #: src/nautilus-shell-ui.xml.h:15
-msgid "Cut _Text"
-msgstr "Cortar _texto"
-
-#: src/nautilus-shell-ui.xml.h:17
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "Exibe uma janela que permite editar os marcadores deste menu"
 
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr "Exibir os créditos dos criadores do Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr "Exibe ajuda sobre o Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
@@ -9145,135 +9483,123 @@ msgstr ""
 "Exibir padrões, cores e emblemas que podem ser usados para personalizar a "
 "aparência"
 
-#: src/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:19
 msgid "Display quick reference pages for Nautilus"
 msgstr "Exibe páginas de referência rápida para o Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:22
+#: src/nautilus-shell-ui.xml.h:20
 msgid "Display release notes for Nautilus"
 msgstr "Exibe notas de lançamento para o Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:23
+#: src/nautilus-shell-ui.xml.h:21
 msgid "Display support information for Nautilus and Eazel Services"
 msgstr "Exibir informações de suporte para o Nautilus e os Serviços da Eazel"
 
-#: src/nautilus-shell-ui.xml.h:24
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Display the latest contents of the current location"
 msgstr "Exibe o conteúdo mais atualizado do local atual"
 
-#: src/nautilus-shell-ui.xml.h:25
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr "Exibe o conjunto de temas disponíveis"
 
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:24
 msgid "Edit various Nautilus preferences"
 msgstr "Editar várias preferências do Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "Localizar"
 
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr "Es_quecer histórico"
 
-#: src/nautilus-shell-ui.xml.h:29
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr "Vai para os serviços da Eazel"
 
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr "Vai para o local inicial"
 
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr "Vai para o local que contém este local"
 
-#: src/nautilus-shell-ui.xml.h:32
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr "Vai para o próximo local visitado"
 
-#: src/nautilus-shell-ui.xml.h:33
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr "Vai para o último local visitado"
 
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:442
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
 msgid "Hide Location _Bar"
 msgstr "Esconder _barra de local"
 
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:424
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
 msgid "Hide St_atus Bar"
 msgstr "Esconder b_arra de estado"
 
-#: src/nautilus-shell-ui.xml.h:36 src/nautilus-window-menus.c:430
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
 msgid "Hide _Sidebar"
 msgstr "Esconder barra _lateral"
 
-#: src/nautilus-shell-ui.xml.h:37 src/nautilus-window-menus.c:436
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
 msgid "Hide _Toolbar"
 msgstr "Esconder barra de _ferramentas"
 
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:37
 msgid "Nautilus Quick _Reference"
 msgstr "_Referência rápida do Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:38
 msgid "Nautilus Release _Notes"
 msgstr "_Notas de lançamento do Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:39
 msgid "Nautilus User _Manual"
 msgstr "_Manual do usuário do Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "Nova janela"
 
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:41
 msgid "New _Window"
 msgstr "Nova _janela"
 
-#: src/nautilus-shell-ui.xml.h:44
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "Tamanho normal"
 
-#: src/nautilus-shell-ui.xml.h:45
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Abre outra janela do Nautilus para o local exibido"
 
-#: src/nautilus-shell-ui.xml.h:47
-msgid "Preferences..."
-msgstr "Preferências..."
-
-#: src/nautilus-shell-ui.xml.h:48
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: src/nautilus-shell-ui.xml.h:49
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "Remove o texto selecionado sem colocá-lo na área de transferência"
-
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr "Fazer relatório de profiling"
 
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr "Reiniciar profiling"
 
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr "Busca na web"
 
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr "Busca arquivos neste computador"
 
-#: src/nautilus-shell-ui.xml.h:54
-msgid "Select _All"
-msgstr "Selecionar _todos"
-
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
@@ -9281,179 +9607,194 @@ msgstr ""
 "Exibe uma página de onde você pode dar um retorno sobre o Nautilus e os "
 "serviços da Eazel"
 
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "Exibe os itens em tamanho normal"
 
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "Exibe os itens com menos detalhes"
 
-#: src/nautilus-shell-ui.xml.h:58
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "Exibe os itens com mais detalhes"
 
-#: src/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr "Iniciar profiling"
 
-#: src/nautilus-shell-ui.xml.h:61
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr "Parar profiling"
 
-#: src/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr "Para de carregar este local"
 
-#: src/nautilus-shell-ui.xml.h:63
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "Desfaz a última alteração"
 
-#: src/nautilus-shell-ui.xml.h:64
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "Acima"
 
-#: src/nautilus-shell-ui.xml.h:65
-msgid "Use Advanced settings"
-msgstr "Usar configurações avançadas"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:66
-msgid "Use Beginner settings"
-msgstr "Usar configurações de novato"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:67
-msgid "Use Intermediate settings"
-msgstr "Usar configurações de usuário intermediário"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:63
 msgid "We_b Search"
 msgstr "Busca _web"
 
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "Busca web"
 
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "Aproximar"
 
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "Distanciar"
 
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "_Aproximar"
 
-#: src/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "_Distanciar"
 
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "_Sobre o Nautilus..."
 
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "_Adicionar marcador"
 
-#: src/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "_Voltar"
 
-#: src/nautilus-shell-ui.xml.h:77
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr "_Fundos e emblemas..."
 
-#: src/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "_Marcadores"
 
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "_Fechar janela"
 
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:76
 msgid "_Customer Support"
 msgstr "Serviço de atendimento ao _cliente"
 
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/nautilus-shell-ui.xml.h:83
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "_Editar marcadores..."
 
-#: src/nautilus-shell-ui.xml.h:84
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "Preferências..."
+
+#: src/nautilus-shell-ui.xml.h:80
 msgid "_Feedback"
 msgstr "_Dar retorno"
 
-#: src/nautilus-shell-ui.xml.h:86 src/nautilus-window-menus.c:1358
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "_Localizar"
 
-#: src/nautilus-shell-ui.xml.h:87
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "_Avançar"
 
-#: src/nautilus-shell-ui.xml.h:88
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "_Ir"
 
-#: src/nautilus-shell-ui.xml.h:89
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: src/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "_Início"
 
-#: src/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "Local"
+
+#: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr "Temas do _Nautilus..."
 
-#: src/nautilus-shell-ui.xml.h:92
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "_Tamanho normal"
 
-#: src/nautilus-shell-ui.xml.h:94
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "Preferências"
+
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr "_Profiler"
 
-#: src/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "_Atualizar"
 
-#: src/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr "Fazer _relatório de profiling"
 
-#: src/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr "_Reiniciar profiling"
 
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr "_Iniciar profiling"
 
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr "_Parar profiling"
 
-#: src/nautilus-shell-ui.xml.h:100
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "_Desfazer"
 
-#: src/nautilus-shell-ui.xml.h:101
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "_Acima um nível"
 
-#: src/nautilus-shell-ui.xml.h:102
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "_Ver"
 
-#: src/nautilus-sidebar.c:659
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -9461,11 +9802,11 @@ msgstr ""
 "Você não pode atribuir mais de uma imagem personalizada por vez! Por favor, "
 "arraste apenas uma imagem para configurar um ícone personalizado."
 
-#: src/nautilus-sidebar.c:661
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "Mais de uma imagem"
 
-#: src/nautilus-sidebar.c:680
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -9473,11 +9814,11 @@ msgstr ""
 "O arquivo que você arrastou não é local. Você só pode usar imagens locais "
 "como ícones personalizados."
 
-#: src/nautilus-sidebar.c:682
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "Apenas imagens locais"
 
-#: src/nautilus-sidebar.c:687
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -9485,22 +9826,22 @@ msgstr ""
 "O arquivo que você arrastou não é uma imagem. Você só pode usar imagens "
 "locais como ícones personalizados."
 
-#: src/nautilus-sidebar.c:689
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "Imagens apenas"
 
-#: src/nautilus-sidebar.c:1247
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "Abrir com %s"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1283
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "Abrir com..."
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1390
+#: src/nautilus-sidebar.c:1424
 msgid "  Empty Trash  "
 msgstr "  Esvaziar lixeira  "
 
@@ -9592,16 +9933,16 @@ msgstr "Não foi possível excluir o tema"
 msgid "No description available for the \"%s\" theme"
 msgstr "Sem descrição disponível para o tema \"%s\""
 
-#: src/nautilus-window.c:584
+#: src/nautilus-window.c:637
 msgid "View as ..."
 msgstr "Ver como ..."
 
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1286
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "Ver como outro..."
 
-#: src/nautilus-window.c:1687
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "Fechar"
 
@@ -9615,11 +9956,11 @@ msgstr "Fechar"
 msgid "Preview Release %s: %s"
 msgstr "Preview Release %s: %s"
 
-#: src/nautilus-window-manage-views.c:812
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "Falhou a visão"
 
-#: src/nautilus-window-manage-views.c:823
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
@@ -9628,12 +9969,12 @@ msgstr ""
 "A visão de %s encontrou um erro e não pode continuar. Você pode escolher "
 "outra visão ou ir para um local diferente."
 
-#: src/nautilus-window-manage-views.c:834
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "A visão %s encontrou um erro ao iniciar."
 
-#: src/nautilus-window-manage-views.c:993
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
@@ -9641,7 +9982,7 @@ msgstr ""
 "Um dos painéis da barra lateral encontrou um erro e não pode continuar. "
 "Infelizmente, não é possível dizer qual deles."
 
-#: src/nautilus-window-manage-views.c:997
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
@@ -9650,25 +9991,25 @@ msgstr ""
 "O painel da barra lateral %s encontrou um erro e não pode continuar. Se isto "
 "continuar a ocorrer, você pode querer desligá-lo."
 
-#: src/nautilus-window-manage-views.c:1002
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "Falha do painel da barra lateral"
 
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr ""
 "Não foi possível localizar \"%s\". Por favor verifique a grafia e tente "
 "novamente."
 
-#: src/nautilus-window-manage-views.c:1223
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
 msgstr ""
 "\"%s\" não é um local válido. Por favor verifique a grafia e tente novamente."
 
-#: src/nautilus-window-manage-views.c:1237
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -9677,13 +10018,13 @@ msgstr ""
 "Não foi possível exibir \"%s\", pois o Nautilus não pode determinar o seu "
 "tipo de arquivo."
 
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr "Nautilus não possui um visualizador instalado capaz de exibir \"%s\"."
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1257
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
@@ -9692,17 +10033,17 @@ msgstr ""
 # Eh, vou colocar um comentário.
 # Log in aqui parece ser ao tentar acessar uma URI, estou supondo que
 # é um problema de conexão à uma máquina remota.
-#: src/nautilus-window-manage-views.c:1263
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "Não foi possível exibir \"%s\", pois falhou a tentativa de conexão."
 
-#: src/nautilus-window-manage-views.c:1268
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "Não foi possível exibir \"%s\", pois o acesso foi negado."
 
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1287
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
@@ -9712,7 +10053,7 @@ msgstr ""
 "localizada. Verifique se a grafia do nome está correta ou se as suas "
 "configurações de proxy estão corretas."
 
-#: src/nautilus-window-manage-views.c:1287
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -9721,7 +10062,7 @@ msgstr ""
 "Não foi possível exibir \"%s\", pois o nome da máquina estava vazio. "
 "Verifique se as suas configurações de proxy estão corretas."
 
-#: src/nautilus-window-manage-views.c:1299
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -9733,23 +10074,23 @@ msgstr ""
 "serviço de busca Medusa e, caso não possua um índice, que o indexador do "
 "Medusa esteja sendo executado."
 
-#: src/nautilus-window-manage-views.c:1303
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "Busca não está disponível"
 
-#: src/nautilus-window-manage-views.c:1307
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus não pode exibir \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1312
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "Não é possível exibir local"
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:313
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
@@ -9757,37 +10098,37 @@ msgstr ""
 "Você tem certeza que deseja esquecer o histórico? Se você o fizer, estará "
 "condenado a repeti-lo."
 
-#: src/nautilus-window-menus.c:316
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
 "Você tem certeza que deseja que o Nautilus esqueça quais locais você visitou?"
 
-#: src/nautilus-window-menus.c:321
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "Esquecer o histórico?"
 
-#: src/nautilus-window-menus.c:322
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "Esquecer"
 
-#: src/nautilus-window-menus.c:425
+#: src/nautilus-window-menus.c:466
 msgid "Show St_atus Bar"
 msgstr "Exibir b_arra de estado"
 
-#: src/nautilus-window-menus.c:431
+#: src/nautilus-window-menus.c:472
 msgid "Show _Sidebar"
 msgstr "Exibir barra _lateral"
 
-#: src/nautilus-window-menus.c:437
+#: src/nautilus-window-menus.c:478
 msgid "Show _Toolbar"
 msgstr "Exibir barra de _ferramentas"
 
-#: src/nautilus-window-menus.c:443
+#: src/nautilus-window-menus.c:484
 msgid "Show Location _Bar"
 msgstr "Exibir _barra de local"
 
-#: src/nautilus-window-menus.c:494
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -9797,11 +10138,11 @@ msgstr "Preferências"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:577
+#: src/nautilus-window-menus.c:618
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -9818,11 +10159,11 @@ msgstr ""
 #. * bottom of the about box to give credit
 #. * to the translator(s)
 #.
-#: src/nautilus-window-menus.c:588
+#: src/nautilus-window-menus.c:629
 msgid "Translator Credits"
 msgstr "Créditos da tradução"
 
-#: src/nautilus-window-menus.c:758
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -9831,27 +10172,23 @@ msgstr ""
 "O local \"%s\" não existe. Você gostaria de remover da sua lista todos os "
 "marcadores com este local?"
 
-#: src/nautilus-window-menus.c:762
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "Marcador para um local inexistente"
 
-#: src/nautilus-window-menus.c:776
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "O local \"%s\" não existe mais."
 
-#: src/nautilus-window-menus.c:777
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "Ir para o local inexistente"
 
-#: src/nautilus-window-menus.c:846
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "Vai para o local especificado por este marcador"
 
-#: src/nautilus-window-menus.c:1357
-msgid "_Browse"
-msgstr "_Procurar"
-
 #: src/nautilus-window-toolbars.c:402
 msgid "Back"
 msgstr "Voltar"
@@ -9867,6 +10204,125 @@ msgstr "Avançar"
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 
+#~ msgid "helvetica"
+#~ msgstr "helvetica"
+
+#~ msgid "_Fonts"
+#~ msgstr "_Fontes"
+
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "Você não pode mover um arquivo para si mesmo."
+
+#~ msgid "Can't Move Onto Self"
+#~ msgstr "Não é possível mover para si mesmo"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Bold"
+#~ msgstr "Negrito"
+
+#~ msgid "Book"
+#~ msgstr "Livro"
+
+#~ msgid "Demibold"
+#~ msgstr "Meionegrito"
+
+#~ msgid "Light"
+#~ msgstr "Leve"
+
+#~ msgid "Italic"
+#~ msgstr "Itálico"
+
+#~ msgid "Oblique"
+#~ msgstr "Oblíquo"
+
+#~ msgid "Reverse Italic"
+#~ msgstr "Itálico invertido"
+
+#~ msgid "Reverse Oblique"
+#~ msgstr "Oblíquo invertido"
+
+#~ msgid "Condensed"
+#~ msgstr "Condensado"
+
+#~ msgid "Semicondensed"
+#~ msgstr "Semicondensado"
+
+#~ msgid "Font"
+#~ msgstr "Fonte"
+
+#~ msgid "fixed"
+#~ msgstr "fixa"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00"
+
+#~ msgid "current theme"
+#~ msgstr "tema atual"
+
+#~ msgid "Use this font family to display file names:"
+#~ msgstr "Usar esta família da fonte para exibir nomes de arquivo:"
+
+#~ msgid "Can add Content"
+#~ msgstr "Pode adicionar conteúdo"
+
+#~ msgid "No image was selected.  You must click on an image to select it."
+#~ msgstr ""
+#~ "Nenhuma imagem foi selecionada. Você deve clicar em uma imagem para "
+#~ "selecioná-la."
+
+#~ msgid "No selection made"
+#~ msgstr "Nenhuma seleção foi feita"
+
+#~ msgid "Remember this password"
+#~ msgstr "Lembrar esta senha"
+
+#~ msgid "times"
+#~ msgstr "times"
+
+#~ msgid "courier"
+#~ msgstr "courier"
+
+#~ msgid "lucida"
+#~ msgstr "lucida"
+
+#~ msgid "Details"
+#~ msgstr "Detalhes"
+
+#~ msgid "Warning"
+#~ msgstr "Alerta"
+
+#~ msgid "Error"
+#~ msgstr "Erro"
+
+#~ msgid "Question"
+#~ msgstr "Pergunta"
+
+#~ msgid "_Cut Text"
+#~ msgstr "_Cortar texto"
+
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "Remove o texto selecionado sem colocá-lo na área de transferência"
+
+#~ msgid "Use Advanced settings"
+#~ msgstr "Usar configurações avançadas"
+
+#~ msgid "Use Beginner settings"
+#~ msgstr "Usar configurações de novato"
+
+#~ msgid "Use Intermediate settings"
+#~ msgstr "Usar configurações de usuário intermediário"
+
+#~ msgid "_Browse"
+#~ msgstr "_Procurar"
+
 #~ msgid "Cyrillic (KOI8-R)"
 #~ msgstr "Cirílico (KOI8-R)"
 
@@ -9918,9 +10374,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 #~ msgid "Verify"
 #~ msgstr "Verificar"
 
-#~ msgid "Description"
-#~ msgstr "Descrição"
-
 #~ msgid "Package Contents: %d files"
 #~ msgstr "Pacote contém: %d arquivos"
 
diff --git a/po/ru.po b/po/ru.po
index ff992467f..b4b9fafff 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,10 +1,15 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Valek Filippov <frob@df.ru>, 2000.
 #
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus\n"
-"POT-Creation-Date: 2001-02-28 16:36+0300\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-02-28 19:03+03:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -20,6 +25,31 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÁÐÐÌÅÔ ÐÕÓËÁÔÅÌÑ Nautilus!"
 msgid "Can't create nautilus-preferences-applet!"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÁÐÐÌÅÔ ÎÁÓÔÒÏÅË Nautilus!"
 
+#: applets/preferences-applet/nautilus-preferences-applet.c:226
+#, fuzzy
+msgid "Show Desktop"
+msgstr "òÁÂÏÞÉÊ ÓÔÏÌ"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:230
+#, fuzzy
+msgid "Smooth Graphics"
+msgstr "çÌÁÄËÁÑ ÇÒÁÆÉËÁ"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:243
+#: src/nautilus-application.c:639
+msgid "Quit"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:251
+#, fuzzy
+msgid "Start"
+msgstr "óÏÓÔÏÑÎÉÅ"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:259
+#, fuzzy
+msgid "Restart"
+msgstr "ðÏ×ÔÏÒÉÔØ"
+
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:1
 msgid "Factory for Nautilus component adapter factories"
 msgstr ""
@@ -74,6 +104,18 @@ msgstr "%lu íâ"
 msgid "Hardware Overview"
 msgstr "ïÂÚÏÒ ÏÂÏÒÕÄÏ×ÁÎÉÑ"
 
+#: components/hardware/nautilus-hardware-view.c:520
+msgid "This is a placeholder for the CPU page."
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:545
+msgid "This is a placeholder for the RAM page."
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:570
+msgid "This is a placeholder for the IDE page."
+msgstr ""
+
 #: components/hardware/Nautilus_View_hardware.oaf.in.h:2
 #: components/hardware/nautilus-hardware-view.c:631
 #: data/static_bookmarks.xml.h:16
@@ -100,18 +142,18 @@ msgstr "ëÁË ÏÂÏÒÕÄÏ×ÁÎÉÅ"
 msgid "hardware view"
 msgstr "ÐÒÏÓÍÏÔÒ ÏÂÏÒÕÄÏ×ÁÎÉÑ"
 
-#: components/help/converters/gnome-db2html2/gdb3html.c:710
+#: components/help/converters/gnome-db2html2/gdb3html.c:712
 #: components/music/nautilus-music-view.c:1512
 msgid "Previous"
 msgstr "ðÒÅÄ."
 
-#: components/help/converters/gnome-db2html2/gdb3html.c:719
-#: libnautilus-extensions/nautilus-global-preferences.c:684
-#: src/nautilus-shell-ui.xml.h:38
+#: components/help/converters/gnome-db2html2/gdb3html.c:721
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "äÏÍÏÊ"
 
-#: components/help/converters/gnome-db2html2/gdb3html.c:728
+#: components/help/converters/gnome-db2html2/gdb3html.c:730
 #: components/music/nautilus-music-view.c:1568
 msgid "Next"
 msgstr "óÌÅÄ."
@@ -239,64 +281,75 @@ msgstr "ðòéìïöåîéå"
 #. GNU Public  License  and  many  people  are
 #. working on changes to the kernel)
 #. **
-#: components/help/hyperbola-filefmt.c:504
-#: components/help/hyperbola-filefmt.c:506
-#: components/help/hyperbola-filefmt.c:510
-#: components/help/hyperbola-filefmt.c:512
-#: components/help/hyperbola-filefmt.c:516
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:537
+#: components/help/hyperbola-filefmt.c:538
+#: components/help/hyperbola-filefmt.c:539
+#: components/help/hyperbola-filefmt.c:541
+#: components/help/hyperbola-filefmt.c:543
 msgid "Manual"
 msgstr "éÎÓÔÒÕËÃÉÑ"
 
-#: components/help/hyperbola-filefmt.c:506
-msgid "System"
-msgstr "óÉÓÔÅÍÁ"
-
-#: components/help/hyperbola-filefmt.c:506
-msgid "Configuration"
-msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ"
-
-#: components/help/hyperbola-filefmt.c:506
-msgid "Config files"
-msgstr "æÁÊÌÙ ÎÁÓÔÒÏÅË"
-
-#: components/help/hyperbola-filefmt.c:510
-#: components/help/hyperbola-filefmt.c:834 data/linksets/apps.xml.h:1
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:861 data/linksets/apps.xml.h:1
 msgid "Applications"
 msgstr "ðÒÉÌÏÖÅÎÉÑ"
 
-#: components/help/hyperbola-filefmt.c:510
-msgid "Command Line"
-msgstr "ëÏÍÁÎÄÎÁÑ ÓÔÒÏËÁ"
-
-#: components/help/hyperbola-filefmt.c:512
-#: components/help/hyperbola-filefmt.c:516
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:543
 msgid "Development"
 msgstr "òÁÚÒÁÂÏÔËÁ"
 
-#: components/help/hyperbola-filefmt.c:512
-#: components/help/hyperbola-filefmt.c:516
-msgid "APIs"
-msgstr "áPI"
-
-#: components/help/hyperbola-filefmt.c:512
-msgid "Miscellaneous"
-msgstr "òÁÚÎÏÅ"
-
-#: components/help/hyperbola-filefmt.c:516
+#: components/help/hyperbola-filefmt.c:532
 msgid "System Calls"
 msgstr "óÉÓÔÅÍÎÙÅ ×ÙÚÏ×Ù"
 
-#: components/help/hyperbola-filefmt.c:676
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
+#: components/help/hyperbola-filefmt.c:534
+msgid "Library Functions"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:536
+#, fuzzy
+msgid "Devices"
+msgstr "óÅÒ×ÉÓÙ"
+
+#: components/help/hyperbola-filefmt.c:537
+#, fuzzy
+msgid "Configuration Files"
+msgstr "ëÏÎÆÉÇÕÒÁÃÉÑ"
+
+#: components/help/hyperbola-filefmt.c:538
+#, fuzzy
+msgid "Games"
+msgstr "éÇÒÁ"
+
+#: components/help/hyperbola-filefmt.c:539
+#, fuzzy
+msgid "Conventions"
+msgstr "óÏÄÅÒÖÁÎÉÅ:"
+
+#: components/help/hyperbola-filefmt.c:541
+msgid "System Administration"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:543
+msgid "Kernel Routines"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:703
 msgid "Info"
 msgstr "éÎÆÏ"
 
-#: components/help/hyperbola-nav-tree.c:277
+#: components/help/hyperbola-nav-tree.c:310
 msgid "Introductory Documents:"
 msgstr ""
 
-#: components/help/hyperbola-nav-tree.c:291
+#: components/help/hyperbola-nav-tree.c:324
 msgid "Documents by Subject:"
 msgstr "äÏËÕÍÅÎÔÙ ÐÏ ÔÅÍÅ:"
 
@@ -369,7 +422,7 @@ msgstr "âÏËÏ×ÁÑ ÐÁÎÅÌØ ÉÓÔÏÒÉÉ"
 msgid "History sidebar panel for Nautilus"
 msgstr "âÏËÏ×ÁÑ ÐÁÎÅÌØ ÉÓÔÏÒÉÉ ÄÌÑ Nautilus"
 
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "îÅ ÕÄÁÌÏÓØ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ Bonobo"
 
@@ -427,7 +480,7 @@ msgstr ""
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "æÁÊÌ"
 
@@ -509,7 +562,7 @@ msgid "Sidebar Loser"
 msgstr ""
 
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -519,7 +572,7 @@ msgstr ""
 "  %s"
 
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -675,21 +728,22 @@ msgid "Cyrillic (ISO-IR-111)"
 msgstr "ëÉÒÉÌÌÉÃÁ (ISO-IR-111)"
 
 #: components/mozilla/nautilus-mozilla-encoding-tables.c:78
-msgid "Cyrillic (KOI8-R)"
-msgstr "ëÉÒÉÌÌÉÃÁ (KOI8-R)"
-
-#: components/mozilla/nautilus-mozilla-encoding-tables.c:79
 msgid "Cyrillic (MacCyrillic)"
 msgstr "ëÉÒÉÌÌÉÃÁ (MacCyrillic)"
 
-#: components/mozilla/nautilus-mozilla-encoding-tables.c:80
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:79
 msgid "Cyrillic (Windows-1251)"
 msgstr "ëÉÒÉÌÌÉÃÁ (Windows-1251)"
 
-#: components/mozilla/nautilus-mozilla-encoding-tables.c:81
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:80
 msgid "Cyrillic/Russian (IBM-866)"
 msgstr "ëÉÒÉÌÌÉÃÁ/òÕÓÓËÉÊ (IBM-866)"
 
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:81
+#, fuzzy
+msgid "Cyrillic/Russian (KOI8-R)"
+msgstr "ëÉÒÉÌÌÉÃÁ/òÕÓÓËÉÊ (IBM-866)"
+
 #: components/mozilla/nautilus-mozilla-encoding-tables.c:82
 msgid "Cyrillic/Ukrainian (KOI8-U)"
 msgstr "ëÉÒÉÌÌÉÃÁ/õËÒÁÉÎÓËÉÊ (KOI8-U)"
@@ -1554,7 +1608,7 @@ msgid "Sorry, but '%s' is not a usable image file."
 msgstr "éÚ×ÉÎÉÔÅ, ÎÏ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÄÈÏÄÑÝÉÍ ÆÁÊÌÏÍ ÉÚÏÂÒÁÖÅÎÉÑ."
 
 #: components/music/nautilus-music-view.c:696
-#: src/nautilus-property-browser.c:1057 src/nautilus-property-browser.c:1309
+#: src/nautilus-property-browser.c:1060 src/nautilus-property-browser.c:1312
 msgid "Not an Image"
 msgstr "îÅ ÉÚÏÂÒÁÖÅÎÉÅ"
 
@@ -1600,10 +1654,10 @@ msgid "Pause"
 msgstr "ðÁÕÚÁ"
 
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:945
-#: libnautilus-extensions/nautilus-file-operations.c:960
 #: libnautilus-extensions/nautilus-file-operations.c:979
-#: src/nautilus-shell-ui.xml.h:58
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "óÔÏÐ"
 
@@ -1666,194 +1720,6 @@ msgstr ""
 msgid "Notes sidebar panel for Nautilus"
 msgstr ""
 
-#. set up the window title
-#: components/rpmview/nautilus-rpm-verify-window.c:183
-#, c-format
-msgid "Verifying %s..."
-msgstr "ðÒÏ×ÅÒËÁ %s..."
-
-#: components/rpmview/nautilus-rpm-verify-window.c:207
-#, c-format
-msgid "Failed on \"%s\""
-msgstr "óÂÏÊ ÎÁ \"%s\""
-
-#. TRANSLATORS: this is printed while verifying files from packages,
-#. %s is the filename, %d/%d is filenumber of total-number-of-files
-#: components/rpmview/nautilus-rpm-verify-window.c:211
-#, c-format
-msgid "Checking \"%s\" (%ld/%ld)"
-msgstr "ðÒÏ×ÅÒËÁ \"%s\" (%ld/%ld)"
-
-#: components/rpmview/nautilus-rpm-view.c:122
-msgid "Package Contents"
-msgstr "óÏÓÔÁ× ÐÁËÅÔÁ"
-
-#. allocate the name field
-#: components/rpmview/nautilus-rpm-view.c:169
-msgid "Package Title"
-msgstr "îÁÚ×ÁÎÉÅ ÐÁËÅÔÁ"
-
-#: components/rpmview/nautilus-rpm-view.c:190
-msgid "Installed Size: "
-msgstr "òÁÚÍÅÒ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ:"
-
-#: components/rpmview/nautilus-rpm-view.c:196
-msgid "<size>"
-msgstr "<ÒÁÚÍÅÒ>"
-
-#: components/rpmview/nautilus-rpm-view.c:202
-msgid "Install Date: "
-msgstr "äÁÔÁ ÕÓÔÁÎÏ×ËÉ:"
-
-#: components/rpmview/nautilus-rpm-view.c:208
-#: components/rpmview/nautilus-rpm-view.c:220
-#: components/rpmview/nautilus-rpm-view.c:232
-#: components/rpmview/nautilus-rpm-view.c:244
-#: components/rpmview/nautilus-rpm-view.c:256
-msgid "<unknown>"
-msgstr "<ÎÅÉÚ×ÅÓÔÎÏ>"
-
-#: components/rpmview/nautilus-rpm-view.c:214
-msgid "License: "
-msgstr "ìÉÃÅÎÚÉÑ:"
-
-#: components/rpmview/nautilus-rpm-view.c:226
-msgid "Build Date: "
-msgstr "äÁÔÁ ÓÂÏÒËÉ:"
-
-#: components/rpmview/nautilus-rpm-view.c:238
-msgid "Distribution: "
-msgstr "äÉÓÔÒÉÂÕÔÉ×:"
-
-#: components/rpmview/nautilus-rpm-view.c:250
-msgid "Vendor: "
-msgstr "ðÒÏÉÚ×ÏÄÉÔÅÌØ:"
-
-#: components/rpmview/nautilus-rpm-view.c:283
-#: components/services/install-view/Nautilus_View_install.oaf.in.h:1
-#: components/services/install/server/Trilobite_Service_install.oaf.in.h:2
-#: components/services/summary/nautilus-summary-view.c:122
-msgid "Install"
-msgstr "õÓÔÁÎÏ×ÉÔØ"
-
-#: components/rpmview/nautilus-rpm-view.c:299
-msgid "Update"
-msgstr "ïÂÎÏ×ÉÔØ"
-
-#: components/rpmview/nautilus-rpm-view.c:308
-msgid "Uninstall"
-msgstr "õÄÁÌÉÔØ"
-
-#: components/rpmview/nautilus-rpm-view.c:324
-msgid "Verify"
-msgstr "ðÒÏ×ÅÒÉÔØ"
-
-#: components/rpmview/nautilus-rpm-view.c:375
-msgid "Description"
-msgstr "ïÐÉÓÁÎÉÅ"
-
-#: components/rpmview/nautilus-rpm-view.c:570
-#, c-format
-msgid "Package Contents: %d files"
-msgstr "óÏÓÔÁ× ÐÁËÅÔÁ: %d ÆÁÊÌÏ×"
-
-#: components/rpmview/nautilus-rpm-view.c:576
-#, c-format
-msgid "Package \"%s\" "
-msgstr "ðÁËÅÔ \"%s\" "
-
-#: components/rpmview/nautilus-rpm-view.c:762
-msgid "Verification completed, package ok."
-msgstr "ðÒÏ×ÅÒËÁ ÚÁ×ÅÒÛÅÎÁ, ÐÁËÅÔ ÉÓÐÒÁ×ÅÎ."
-
-#: components/rpmview/nautilus-rpm-view-install.c:119
-#, c-format
-msgid "%s would not work anymore\n"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:122
-#, c-format
-msgid "%s would break other installed packages\n"
-msgstr "%s ÂÕÄÅÔ ÒÁÚÒÕÛÁÔØ ÄÒÕÇÉÅ ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÐÁËÅÔÙ\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:127
-#, c-format
-msgid "%s is needed, but could not be found\n"
-msgstr "%s ÎÕÖÅÎ, ÎÏ ÎÅ ÎÁÊÄÅÎ\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:132
-#, c-format
-msgid "%s was already installed\n"
-msgstr "%s ÕÖÅ ÂÙÌÏ ÕÓÔÁÎÏ×ÌÅÎÏ\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:135
-#, c-format
-msgid "%s causes a circular dependency problem\n"
-msgstr "%s ×ÙÚÙ×ÁÅÔ ÐÒÏÂÌÅÍÕ ËÒÕÇÏ×ÏÊ ÚÁ×ÉÓÉÍÏÓÔÉ\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:140
-msgid "Cannot access the local package system\n"
-msgstr ""
-
-#: components/rpmview/nautilus-rpm-view-install.c:156
-#, c-format
-msgid "Installing %s failed because of the following issue(s):\n"
-msgstr "óÂÏÊ ÕÓÔÁÎÏ×ËÉ %s ÐÏ ÓÌÅÄÕÀÝÉÍ ÐÒÉÞÉÎÁÍ:\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:158
-#, c-format
-msgid "Uninstalling %s failed because of the following issue(s):\n"
-msgstr "óÂÏÊ ÕÄÁÌÅÎÉÑ %s ÐÏ ÓÌÅÄÕÀÝÉÍ ÐÒÉÞÉÎÁÍ:\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:278
-msgid "Uninstall failed..."
-msgstr "óÂÏÊ ÕÄÁÌÅÎÉÑ..."
-
-#: components/rpmview/nautilus-rpm-view-install.c:279
-msgid "Uninstall Failed"
-msgstr "óÂÏÊ ÕÄÁÌÅÎÉÑ ÐÁËÅÔÁ"
-
-#: components/rpmview/nautilus-rpm-view-install.c:281
-msgid "Install failed..."
-msgstr "óÂÏÊ ÕÓÔÁÎÏ×ËÉ..."
-
-#: components/rpmview/nautilus-rpm-view-install.c:282
-msgid "Install Failed"
-msgstr "óÂÏÊ ÕÓÔÁÎÏ×ËÉ"
-
-#: components/rpmview/nautilus-rpm-view-install.c:342
-#: components/services/install-view/nautilus-service-install-view.c:514
-msgid "Incorrect password."
-msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ÐÁÒÏÌØ."
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:1
-msgid "Factory for rpm view"
-msgstr ""
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:2
-msgid "Package"
-msgstr "ðÁËÅÔ"
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:3
-msgid "Package Viewer"
-msgstr "ðÒÏÇÒÁÍÍÁ ÐÒÏÓÍÏÔÒÁ ÐÁËÅÔÏ×"
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:4
-msgid "RPM component"
-msgstr "ëÏÍÐÏÎÅÎÔ RPM"
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:5
-msgid "RPM view factory"
-msgstr ""
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:6
-msgid "View as Package"
-msgstr "ðÏËÁÚÁÔØ ËÁË ÐÁËÅÔ"
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:7
-msgid "rpm view"
-msgstr "ÐÒÏÓÍÏÔÒ rpm"
-
 #: components/sample/nautilus-sample-content-view.c:136
 msgid "(none)"
 msgstr "(ÎÅÔ)"
@@ -1937,7 +1803,7 @@ msgstr "õËÁÚÁÔØ cgi ÐÏÉÓËÁ"
 #: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
 #: components/services/install/command-line/eazel-test-packsys.c:590
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "ðÏËÁÚÁÔØ ÏÔÌÁÄÏÞÎÙÊ ×Ù×ÏÄ"
 
@@ -1962,239 +1828,253 @@ msgid "RPM args are filename"
 msgstr "áÒÇÕÍÅÎÔÙ RPM ÄÏÌÖÎÙ ÂÙÔØ ÉÍÅÎÁÍÉ ÆÁÊÌÏ×"
 
 #: components/services/install/command-line/eazel-alt-install-corba.c:115
-msgid "Force install"
-msgstr "ðÒÉÎÕÄÉÔÅÌØÎÁÑ ÕÓÔÁÎÏ×ËÁ"
-
-#: components/services/install/command-line/eazel-alt-install-corba.c:116
 msgid "Use ftp"
 msgstr "éÓÐÏÌØÚÏ×ÁÔØ ftp"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:117
+#: components/services/install/command-line/eazel-alt-install-corba.c:116
 msgid "Use local"
 msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÌÏËÁÌØÎÕÀ ËÏÐÉÀ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:118
+#: components/services/install/command-line/eazel-alt-install-corba.c:117
 msgid "Use http"
 msgstr "éÓÐÏÌØÚÏ×ÁÔØ http"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:119
+#: components/services/install/command-line/eazel-alt-install-corba.c:118
 msgid "RPM args are Eazel Ids"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:120
+#: components/services/install/command-line/eazel-alt-install-corba.c:119
 msgid "machine readable output"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:121
+#: components/services/install/command-line/eazel-alt-install-corba.c:120
 msgid "Don't print fancy percent output"
 msgstr "îÅ ×ÙÄÁ×ÁÔØ ×Ù×ÏÄ × ÐÒÏÃÅÎÔÁÈ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:122
+#: components/services/install/command-line/eazel-alt-install-corba.c:121
 msgid "don't use eazel auth stuff"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:123
+#: components/services/install/command-line/eazel-alt-install-corba.c:122
 msgid "Specify package file"
 msgstr "õËÁÚÁÔØ ÆÁÊÌ ÐÁËÅÔÁ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:124
+#: components/services/install/command-line/eazel-alt-install-corba.c:123
 msgid "RPM args are needed files"
 msgstr "áÒÇÕÍÅÎÔÙ RPM ÄÏÌÖÎÙ ÂÙÔØ ÆÁÊÌÁÍÉ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:125
+#: components/services/install/command-line/eazel-alt-install-corba.c:124
 msgid "Run Query"
 msgstr "úÁÐÕÓÔÉÔØ ÚÁÐÒÏÓ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:126
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
 msgid "Revert"
 msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:127
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr "õÓÔÁÎÏ×ÉÔØ ÆÏÎ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:128
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "õËÁÚÁÔØ ÓÅÒ×ÅÒ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:129
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
 msgid "Dont print too much, just problems and download"
 msgstr "îÅ ÐÅÞÁÔÁÔØ ÓÌÉÛËÏÍ ÍÎÏÇÏ, ÔÏÌØËÏ Ï ÐÒÏÂÌÅÍÁÈ É ÓËÁÞÉ×ÁÎÉÉ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:130
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr "÷ÙÐÏÌÎÉÔØ ssl ÐÅÒÅÉÍÅÎÏ×ÁÎÉÅ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:131
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
 msgid "argument is a suite id"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "úÁÐÕÓË ÔÅÓÔÁ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr "òÁÚÒÅÛÉÔØ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:134
-#: components/services/install/lib/eazel-install-problem.c:1009
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "òÁÚÒÅÛÉÔØ ÏÂÎÏ×ÌÅÎÉÑ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "ðÏÄÒÏÂÎÙÊ ×Ù×ÏÄ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:136
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
 msgid "Install a specific package version"
 msgstr "õÓÔÁÎÏ×ÉÔØ ÕËÁÚÁÎÎÕÀ ×ÅÒÓÉÀ ÐÁËÅÔÁ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:167
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
 msgid "*** You cannot specify more then one protocol type.\n"
 msgstr "*** ÷Ù ÎÅ ÍÏÖÅÔÅ ÕËÁÚÁÔØ ÂÏÌØÛÅ ÞÅÍ ÏÄÉÎ ÔÉÐ ÐÒÏÔÏËÏÌÁ.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:184
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
 msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:293
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, c-format
 msgid "File conflict checking %s...\n"
 msgstr "ðÒÏ×ÅÒËÁ ËÏÎÆÌÉËÔÁ ÆÁÊÌÏ× %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:307
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, c-format
 msgid "File uniqueness checking %s...\n"
 msgstr "ðÒÏ×ÅÒËÁ ÕÎÉËÁÌØÎÏÓÔÉ ÆÁÊÌÁ %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:321
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
 #, c-format
 msgid "Feature consistency checking %s...\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:352
-#: components/services/install/lib/eazel-install-protocols.c:110
-#: components/services/install/lib/eazel-install-protocols.c:248
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
 #, c-format
 msgid "Downloading %s..."
 msgstr "óËÁÞÉ×ÁÎÉÅ %s..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:368
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
 msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
 msgstr "óËÁÞÉ×ÁÎÉÅ %s... (%d/%d) = %d%% %.1f ëâ/Ó"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:376
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
 msgid "Downloading %s... (%d/%d) = %d%%"
 msgstr "óËÁÞÉ×ÁÎÉÅ %s... (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:384
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
 #, c-format
 msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
 msgstr "óËÁÞÉ×ÁÎÉÅ %s... (%d/%d)) %.1f ëâ/Ó óÄÅÌÁÎÏ     \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:389
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
 #, c-format
 msgid "Downloading %s... %3.1f KB/s Done\n"
 msgstr "óËÁÞÉ×ÁÎÉÅ %s... %3.1f ëâ/Ó óÄÅÌÁÎÏ\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:417
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "õÓÔÁÎÁ×ÌÉ×ÁÎÉÅ %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:425
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "õÄÁÌÅÎÉÅ %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:447
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "õÓÔÁÎÁ×ÌÉ×ÁÎÉÅ %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% ÷ÙÐÏÌÎÅÎÏ\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:454
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "õÄÁÌÅÎÉÅ %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% ÷ÙÐÏÌÎÅÎÏ\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:462
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
 msgid "Done\n"
 msgstr "óÄÅÌÁÎÏ\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:482
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
 #, c-format
 msgid "Download of %s FAILED\n"
 msgstr "óâïê ÓËÁÞÉ×ÁÎÉÑ %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:602
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
 #, c-format
 msgid "Package %s failed to uninstall.\n"
 msgstr "îÅ ÕÄÁÌÏÓØ ÕÄÁÌÉÔØ ÐÁËÅÔ %s.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:604
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
 #, c-format
 msgid "Package %s failed to install.\n"
 msgstr "îÅ ÕÄÁÌÏÓØ ÕÓÔÁÎÏ×ÉÔØ ÐÁËÅÔ %s.\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:625
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
 #, c-format
 msgid "\t· Problem : %s\n"
 msgstr "\\t· ðÒÏÂÌÅÍÁ: %s\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:634
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
 #, c-format
 msgid "\t· Action : %s\n"
 msgstr "\\t· äÅÊÓÔ×ÉÅ : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:677
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
 msgid "Cancelling operation\n"
 msgstr "ïÔÍÅÎÁ ÏÐÅÒÁÃÉÉ\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:688
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
 #, c-format
 msgid "About to install a total of %d packages, %dKB\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:692
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
 #, c-format
 msgid "About to uninstall a total of %d packages, %dKB\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:696
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
 #, c-format
 msgid "About to revert a total of %d packages, %d KB\n"
 msgstr ""
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:711
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
 #, c-format
 msgid "\t· %s and it's dependencies\n"
 msgstr ""
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:714
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
 #, c-format
 msgid "\t· %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:736
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n) " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
+msgid "Save transaction report ? (y/n) "
+msgstr ""
+
+#. I18N note: y is the letter for the word Yes. This is
+#. used in the response for a yes/no questions. Your translation
+#. must be 1 character only.
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
+msgid "y"
+msgstr "Ä"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
 #, c-format
 msgid "Dependency : %s needs %s\n"
 msgstr "úÁ×ÉÓÉÍÏÓÔØ: %s ÔÒÅÂÕÅÔ %s\n"
 
 #. I18N note: %s is a package name
-#: components/services/install/command-line/eazel-alt-install-corba.c:754
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
 #, c-format
 msgid "Package %s failed md5 check!\n"
 msgstr ""
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:756
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
 #, c-format
 msgid "\t· server MD5 checksum is %s\n"
 msgstr ""
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:758
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
 #, c-format
 msgid "\t· actual MD5 checksum is %s\n"
 msgstr ""
@@ -2204,100 +2084,92 @@ msgstr ""
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:824
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
 msgid "Continue? (y/n) "
 msgstr "ðÒÏÄÏÌÖÉÔØ? (Ä/Î) "
 
-#. I18N note: y is the letter for the word Yes. This is
-#. used in the response for a yes/no questions. Your translation
-#. must be 1 character only.
-#: components/services/install/command-line/eazel-alt-install-corba.c:835
-#: components/services/install/command-line/eazel-alt-install-corba.c:877
-msgid "y"
-msgstr "Ä"
-
 #. I18N note: the (y/n) is translateable. There is later a 1 character
 #. string with the context "y" which is the "yes" indicator.
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:865
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
 msgid "Should I delete the RPM files? (y/n) "
 msgstr "õÄÁÌÑÔØ RPM ÆÁÊÌÙ? (Ä/Î) "
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:897
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
 msgid "Operation ok\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:899
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
 msgid "Operation failed\n"
 msgstr "óÂÏÊ ÏÐÅÒÁÃÉÉ\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
 msgid "Installing"
 msgstr "õÓÔÁÎÏ×ÌÉ×ÁÅÔÓÑ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1025
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
 msgid "Uninstalling"
 msgstr "õÄÁÌÑÅÔÓÑ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1040
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
 msgid "Only one operation at a time please."
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1045
-#: components/services/install/command-line/eazel-alt-install-corba.c:1053
-#: components/services/install/command-line/eazel-alt-install-corba.c:1097
-#: components/services/install/command-line/eazel-alt-install-corba.c:1104
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
 #, c-format
 msgid "%s: --help for usage\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1069
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
 #, c-format
 msgid "Name         : %s\n"
 msgstr "îÁÚ×ÁÎÉÅ    : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1070
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
 #, c-format
 msgid "Version      : %s\n"
 msgstr "÷ÅÒÓÉÑ      : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1071
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
 #, c-format
 msgid "Minor        : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1073
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
 #, c-format
 msgid "Size         : %d\n"
 msgstr "òÁÚÍÅÒ      : %d\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1074
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
 #, c-format
 msgid "Arch         : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1075
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
 #, c-format
 msgid "Distribution : %s\n"
 msgstr "äÉÓÔÒÉÂÕÔÉ× : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1076
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
 #, c-format
 msgid "Description  : %s\n"
 msgstr "ïÐÉÓÁÎÉÅ    : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1078
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
 #, fuzzy, c-format
 msgid "Install root : %s\n"
 msgstr "õÓÔÁÎÏ×ÉÔØ É %s É %s"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1081
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
 msgid "Provides     : \n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1123
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
 #, c-format
 msgid "exit code %d\n"
 msgstr "ËÏÄ ×ÙÈÏÄÁ %d\n"
@@ -2314,122 +2186,128 @@ msgstr ""
 "éÓÐÏÌØÚÏ×ÁÔØ ÕËÁÚÁÎÎÙÊ ÆÁÊÌ ÄÌÑ ÓÏÚÄÁÎÉÑ ÓÐÉÓËÁ ÐÁËÅÔÏ×, ÔÒÅÂÕÅÔ "
 "--packagelist"
 
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 msgid "Softcat server to connect to"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 msgid "Number of times to try the request"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+msgid "Lookup package that features a feature/file"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 msgid "use check function (for debugging)"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 msgid "Show detailed sub-package info"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:143
+#: components/services/install/command-line/eazel-test-softcat.c:66
+#, fuzzy
+msgid "enable funk parser"
+msgstr "÷ËÌÀÞÉÔØ ÂÙÓÔÒÙÊ ÐÏÉÓË"
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "óÂÏÊ ÂÌÏËÉÒÏ×ËÉ ÓËÁÞÉ×ÁÅÍÏÇÏ ÆÁÊÌÁ"
 
-#: components/services/install/lib/eazel-install-logic2.c:160
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "îÅÓÏ×ÐÁÄÅÎÉÅ MD5, ÐÁËÅÔ %s ÍÏÖÅÔ ÂÙÔØ ÐÏÄÄÅÌÁÎ"
 
-#: components/services/install/lib/eazel-install-logic2.c:176
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, fuzzy, c-format
 msgid "No MD5 available for %s"
 msgstr "îÅÔ ÄÏÓÔÕÐÎÏÇÏ ÏÐÉÓÁÎÉÑ ÄÌÑ ÔÅÍÙ \"%s\""
 
 #. I18N note: "%is is ok" in the sense that %s=package name and the
 #. package is intact
-#: components/services/install/lib/eazel-install-logic2.c:360
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, fuzzy, c-format
 msgid "%s is ok"
 msgstr "üÔÏ ÐÒÁ×ÉÌØÎÏ?"
 
-#: components/services/install/lib/eazel-install-logic2.c:466
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s ×ÅÒÓÉÉ %s-%s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: components/services/install/lib/eazel-install-logic2.c:470
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s ×ÅÒÓÉÑ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: components/services/install/lib/eazel-install-logic2.c:479
-#: components/services/install/lib/eazel-install-logic2.c:484
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr "%s ÏÂÎÏ×ÌÑÅÔÓÑ Ó ×ÅÒÓÉÉ %s-%s ÄÏ %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:493
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr "%s ÚÁÍÅÎÅÎÏ ÎÁ ÂÏÌÅÅ ÓÔÁÒÕÀ ×ÅÒÓÉÀ Ó %s-%s ÎÁ %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:498
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr "%s ÚÁÍÅÎÅÎÏ ÎÁ ÂÏÌÅÅ ÓÔÁÒÕÀ ×ÅÒÓÉÀ Ó %s ÎÁ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:551
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr "%s ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ×ÅÒÓÉÑ %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:556
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr "%s ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ×ÅÒÓÉÑ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:628
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, fuzzy, c-format
 msgid "Loading package info from file %s"
 msgstr "õÓÔÁÎÏ×ËÁ ÐÁËÅÔÁ %d ÉÚ %d"
 
 #. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
-#: components/services/install/lib/eazel-install-logic2.c:996
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "ok"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:996
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "not ok"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1160
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
 msgid "Checking dependencies for %s"
 msgstr "ðÒÏ×ÅÒËÁ ÚÁ×ÉÓÉÍÏÓÔÅÊ ÄÌÑ %s"
@@ -2437,231 +2315,236 @@ msgstr "ðÒÏ×ÅÒËÁ ÚÁ×ÉÓÉÍÏÓÔÅÊ ÄÌÑ %s"
 #. I18N note: both %s' are package names.
 #. related is in the sense that the two packages apparently
 #. are connected somehow, eg. foo and foo-devel
-#: components/services/install/lib/eazel-install-logic2.c:1719
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, fuzzy, c-format
 msgid "%s is related to %s"
 msgstr "\"%s\" ×ÙÄÅÌÅÎÏ (%s)"
 
-#: components/services/install/lib/eazel-install-logic2.c:1773
+#: components/services/install/lib/eazel-install-logic2.c:2090
 #, c-format
 msgid "updating %s to version %s-%s solves conflict"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1789
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
 msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1796
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, fuzzy, c-format
 msgid "could not revive %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÃÅÌÅ×ÏÊ ÆÁÊÌ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:1932
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
 msgid "file uniqueness checking %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1953
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
 msgid "Duplicate file : %s occurs in %s and %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:1971
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
+msgid "... but it's ok, the packages are related"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2324
 #, fuzzy, c-format
 msgid "(there were %d other conflicts)"
 msgstr "îÏ ÓÕÝÅÓÔ×ÕÀÔ ÆÁÊÌÏ×ÙÅ ËÏÎÆÌÉËÔÙ"
 
-#: components/services/install/lib/eazel-install-logic2.c:2066
+#: components/services/install/lib/eazel-install-logic2.c:2419
 #, fuzzy, c-format
 msgid "file conflict checking %s"
 msgstr "ðÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó %s ÐÏ ÆÁÊÌÁÍ"
 
-#: components/services/install/lib/eazel-install-logic2.c:2103
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
 msgid "file conflict : package %s already provides file %s also provided by %s"
 msgstr ""
 
 #. the owner of this file is a package that we're upgrading, and the
 #. * new version no longer has this file, so everything's okay.
-#: components/services/install/lib/eazel-install-logic2.c:2113
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
 msgid "...but it is okay, we're upgrading %s and it ditched that file"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2203
+#: components/services/install/lib/eazel-install-logic2.c:2558
 #, c-format
 msgid "checking feature consistency of %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2271
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
 msgid ""
 "feature missing : %s breaks if %s is installed (feature %s would be lost"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2349
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, c-format
 msgid "downloading %d packages"
 msgstr "ÓËÁÞÉ×ÁÎÉÅ %d ÐÁËÅÔÏ×"
 
-#: components/services/install/lib/eazel-install-logic2.c:2614
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, c-format
 msgid "will upgrade %s"
 msgstr "ÂÕÄÅÔ ÏÂÎÏ×ÌÅÎÏ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2617
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, c-format
 msgid "will downgrade %s"
 msgstr "ÂÕÄÅÔ ÕÓÔÁÎÏ×ÌÅÎÁ ÐÒÅÄÙÄÕÝÁÑ ×ÅÒÓÉÑ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2620
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, c-format
 msgid "will install %s"
 msgstr "ÂÕÄÅÔ ÕÓÔÁÎÏ×ÌÅÎÏ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2623
+#: components/services/install/lib/eazel-install-logic2.c:2960
 #, c-format
 msgid "will uninstall %s"
 msgstr "ÂÕÄÅÔ ÕÄÁÌÅÎÏ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2706
-#: components/services/install/lib/eazel-install-problem.c:335
-#: components/services/install/lib/eazel-install-problem.c:338
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
 #, c-format
 msgid "%s requires %s"
 msgstr "%s ÔÒÅÂÕÅÔ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2870
+#: components/services/install/lib/eazel-install-logic2.c:3238
 #, c-format
 msgid "failed %s"
 msgstr "ÓÂÏÊ ÎÁ %s"
 
-#: components/services/install/lib/eazel-install-metadata.c:171
+#: components/services/install/lib/eazel-install-metadata.c:174
 msgid "Could not set URLType from config file!"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ URLType ÉÚ ÆÁÊÌÁ ÎÁÓÔÒÏÅË!"
 
-#: components/services/install/lib/eazel-install-object.c:701
+#: components/services/install/lib/eazel-install-object.c:717
 msgid "Transactions are not stored, could not find home dir"
 msgstr "ôÒÁÎÚÁËÃÉÉ ÎÅ ÓÏÈÒÁÎÅÎÙ, ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÄÏÍÁÛÎÉÊ ËÁÔÁÌÏÇ"
 
-#: components/services/install/lib/eazel-install-object.c:729
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr "ôÒÁÎÚÁËÃÉÉ ÓÏÈÒÁÎÅÎÙ × %s"
 
-#: components/services/install/lib/eazel-install-object.c:986
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "ðÏÌÕÞÅÎÉÅ ÓÐÉÓËÁ ÐÁËÅÔÏ× Ó ÕÄÁÌÅÎÎÏÇÏ ÓÅÒ×ÅÒÁ...\n"
 
-#: components/services/install/lib/eazel-install-object.c:1002
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ package-list.xml!\n"
 
-#: components/services/install/lib/eazel-install-object.c:1075
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr ""
 "îÅ×ÏÚÍÏÖÎÁ ÚÁÐÉÓØ × ÆÁÊÌ %s, ÉÓÐÏÌØÚÕÅÔÓÑ ÏÂÒÁÂÏÔÞÉË ÖÕÒÎÁÌÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: components/services/install/lib/eazel-install-object.c:1206
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "óÂÏÊ ÕÓÔÁÎÏ×ËÉ"
 
-#: components/services/install/lib/eazel-install-object.c:1252
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "óÂÏÊ ÕÄÁÌÅÎÉÑ ÐÁËÅÔÁ"
 
-#: components/services/install/lib/eazel-install-object.c:1373
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ ÔÒÁÎÚÁËÃÉÉ (%s)!\n"
 
-#: components/services/install/lib/eazel-install-object.c:1396
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr "úÁÐÉÓØ ÔÒÁÎÚÁËÃÉÉ ÎÁ %s"
 
-#: components/services/install/lib/eazel-install-problem.c:159
+#: components/services/install/lib/eazel-install-problem.c:163
 #, c-format
 msgid "%s was cancelled"
 msgstr "%s ÂÙÌÏ ÏÔÍÅÎÅÎÏ"
 
-#: components/services/install/lib/eazel-install-problem.c:164
-#: components/services/install/lib/eazel-install-problem.c:327
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
 msgid "%s is a source package, which is not yet supported"
 msgstr "%s ÜÔÏ ÐÁËÅÔ ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ×, ËÏÔÏÒÙÅ ÐÏËÁ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ"
 
-#: components/services/install/lib/eazel-install-problem.c:178
-#: components/services/install/lib/eazel-install-problem.c:189
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
 #, c-format
 msgid "%s would break other packages"
 msgstr "%s ÂÕÄÅÔ ÒÁÚÒÕÛÁÔØ ÄÒÕÇÉÅ ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÐÁËÅÔÙ"
 
-#: components/services/install/lib/eazel-install-problem.c:181
+#: components/services/install/lib/eazel-install-problem.c:185
 #, c-format
 msgid "%s would break"
 msgstr "%s ÂÕÄÅÔ ÒÁÚÒÕÛÁÔØ"
 
-#: components/services/install/lib/eazel-install-problem.c:187
+#: components/services/install/lib/eazel-install-problem.c:191
 #, c-format
 msgid "%s would break %s"
 msgstr "%s ÂÕÄÅÔ ÒÁÚÒÕÛÁÔØ %s"
 
-#: components/services/install/lib/eazel-install-problem.c:193
+#: components/services/install/lib/eazel-install-problem.c:197
 #, c-format
 msgid "%s is damaged"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:197
+#: components/services/install/lib/eazel-install-problem.c:201
 #, c-format
 msgid "%s requires %s, which could not be found on the server"
 msgstr "%s ÔÒÅÂÕÅÔ %s, ËÏÔÏÒÙÊ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÎÁÊÄÅÎ ÎÁ ÓÅÒ×ÅÒÅ"
 
-#: components/services/install/lib/eazel-install-problem.c:200
-#, c-format
-msgid "%s could not be found on the server"
+#: components/services/install/lib/eazel-install-problem.c:204
+#, fuzzy, c-format
+msgid "%s for %s could not be found on the server"
 msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÎÁÊÄÅÎ ÎÁ ÓÅÒ×ÅÒÅ"
 
-#: components/services/install/lib/eazel-install-problem.c:208
-#: components/services/install/lib/eazel-install-problem.c:352
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr "%s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎÏ"
 
-#: components/services/install/lib/eazel-install-problem.c:252
+#: components/services/install/lib/eazel-install-problem.c:259
 #, fuzzy, c-format
 msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr "%s, ËÏÔÏÒÙÊ ÎÏ×ÅÅ, ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: components/services/install/lib/eazel-install-problem.c:256
+#: components/services/install/lib/eazel-install-problem.c:263
 #, fuzzy, c-format
 msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr "%s, ËÏÔÏÒÙÊ ÎÏ×ÅÅ, ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: components/services/install/lib/eazel-install-problem.c:346
-#, c-format
-msgid "%s is not installed"
-msgstr "%s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ"
+#: components/services/install/lib/eazel-install-problem.c:353
+#, fuzzy, c-format
+msgid "%s is not installed and could not be found on server"
+msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÎÁÊÄÅÎ ÎÁ ÓÅÒ×ÅÒÅ"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:911
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr "ðÒÏ×ÅÒËÁ ÎÁÌÉÞÉÑ ÎÏ×ÏÊ ×ÅÒÓÉÉ %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:922
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr "õÓÔÁÎÏ×ÉÔØ É %s É %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:937
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr "õÄÁÌÉÔØ %s ÉÚ ×ÁÛÅÊ ÓÉÓÔÅÍÙ"
@@ -2669,300 +2552,594 @@ msgstr "õÄÁÌÉÔØ %s ÉÚ ×ÁÛÅÊ ÓÉÓÔÅÍÙ"
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:950
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr "ðÒÉÎÕÄÉÔÅÌØÎÏÅ ÕÄÁÌÅÎÉÅ %s ÉÚ ×ÁÛÅÊ ÓÉÓÔÅÍÙ"
 
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:958
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:1006
+#: components/services/install/lib/eazel-install-problem.c:1015
 msgid "Continue with force"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:1012
+#: components/services/install/lib/eazel-install-problem.c:1021
 msgid "Allow downgrade"
 msgstr "òÁÚÒÅÛÉÔØ ÕÓÔÁÎÏ×ËÕ ÐÒÅÄÙÄÕÝÉÈ ×ÅÒÓÉÊ"
 
-#: components/services/install/lib/eazel-install-protocols.c:123
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:166
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
 #, c-format
 msgid "Could not open target file %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÃÅÌÅ×ÏÊ ÆÁÊÌ %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:130
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:92
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
 msgid "Could not create an http request !"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ http-ÚÁÐÒÏÓ!"
 
-#: components/services/install/lib/eazel-install-protocols.c:137
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:99
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
 msgid "Proxy: Invalid uri !"
 msgstr "ðÒÏËÓÉ: îÅÐÒÁ×ÉÌØÎÙÊ uri!"
 
-#: components/services/install/lib/eazel-install-protocols.c:142
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:105
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
 msgid "Invalid uri !"
 msgstr "îÅÐÒÁ×ÉÌØÎÙÊ uri!"
 
-#: components/services/install/lib/eazel-install-protocols.c:149
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:115
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
 msgid "Could not prepare http request !"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÄÇÏÔÏ×ÉÔØ http-ÚÁÐÒÏÓ!"
 
-#: components/services/install/lib/eazel-install-protocols.c:154
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:120
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
 msgid "Couldn't get async mode "
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÁÓÉÎÈÒÏÎÎÙÊ ÒÅÖÉÍ"
 
 #. probably out of disk space
-#: components/services/install/lib/eazel-install-protocols.c:183
-#: components/services/install/lib/eazel-install-protocols.c:212
-#: components/services/install/lib/eazel-install-protocols.c:228
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, c-format
 msgid "DISK FULL: could not write %s"
 msgstr "äéóë ðïìïî: ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:189
-#: components/services/install/lib/eazel-install-protocols.c:217
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
 msgid "Could not get request body!"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÔÅÌÏ ÚÁÐÒÏÓÁ!"
 
-#: components/services/install/lib/eazel-install-protocols.c:202
+#: components/services/install/lib/eazel-install-protocols.c:208
 #, c-format
 msgid "HTTP error: %d %s"
 msgstr "ïÛÉÂËÁ HTTP: %d %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:249
+#: components/services/install/lib/eazel-install-protocols.c:255
 msgid "FTP not supported yet"
 msgstr "FTP ÐÏËÁ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 
-#: components/services/install/lib/eazel-install-protocols.c:457
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, c-format
 msgid "Checking local file %s..."
 msgstr "ðÒÏ×ÅÒËÁ ÌÏËÁÌØÎÏÇÏ ÆÁÊÌÁ %s..."
 
-#: components/services/install/lib/eazel-install-protocols.c:578
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, c-format
 msgid "Failed to retrieve %s!"
 msgstr "îÅ ÕÄÁÌÏÓØ ÐÏÌÕÞÉÔØ %s!"
 
-#: components/services/install/lib/eazel-install-protocols.c:651
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, c-format
 msgid "Could not get an URL for %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ URL ÄÌÑ %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:666
+#: components/services/install/lib/eazel-install-protocols.c:672
 msgid "Downloaded package does not have the correct name"
 msgstr "÷ÙËÁÞÁÎÎÙÅ ÐÁËÅÔÙ ÉÍÅÀÔ ÎÅËÏÒÒÅËÔÎÙÅ ÎÁÚ×ÁÎÉÑ"
 
-#: components/services/install/lib/eazel-install-protocols.c:667
+#: components/services/install/lib/eazel-install-protocols.c:673
 #, c-format
 msgid "Package %s should have had name %s"
 msgstr "ðÁËÅÔ %s ÄÏÌÖÅÎ ÉÍÅÔØ ÎÁÚ×ÁÎÉÅ %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:695
+#: components/services/install/lib/eazel-install-protocols.c:701
 msgid "File download failed"
 msgstr "óÂÏÊ ÓËÁÞÉ×ÁÎÉÑ ÆÁÊÌÁ"
 
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr "*** îÁÞÁÌÏ ÄÁÍÐÁ ÐÁËÅÔÁ ***\n"
 
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr "*** ëÏÎÅà ÄÁÍÐÁ ÐÁËÅÔÁ ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:158
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 msgid "*** No package nodes! (cat has no children) ***"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:160
-#: components/services/install/lib/eazel-install-xml-package-list.c:168
-#: components/services/install/lib/eazel-install-xml-package-list.c:183
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 msgid "*** Bailing from package parse! ***"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:166
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
 msgid "*** No package nodes! ***"
 msgstr "*** îÅÔ ÕÚÌÏ× ÐÁËÅÔÁ! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:172
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 msgid "*** Malformed package node!"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:181
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
 msgid "*** No depends nodes! ***"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:187
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:211
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr "*** îÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ÕÚÌÁ \"%s\""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:228
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** æÁÊÌ ÓÐÉÓËÁ ÐÁËÅÔÏ× ÎÅ ÓÏÄÅÒÖÉÔ ÄÁÎÎÙÈ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:233
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** îÅ ÕÄÁÌÏÓØ ÎÁÊÔÉ xml-ÕÚÅÌ CATEGORIES! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:234
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:240
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** îÅÔ ËÁÔÅÇÏÒÉÊ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:241
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:295
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** îÅ ÕÄÁÌÏÓØ ÎÁÊÔÉ xml-ÕÚÅÌ TRANSACTION! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:297
-#: components/services/install/lib/eazel-install-xml-package-list.c:305
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:303
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** îÅÔ ÐÁËÅÔÏ×! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:339
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** îÅÔ ÕÚÌÏ× ËÁÔÅÇÏÒÉÊ! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:343
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** îÅ ÕÄÁÌÏÓØ ÎÁÊÔÉ xml-ÕÚÅÌ CATEGORIES! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:377
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** îÅÉÚ×ÅÓÔÎÙÊ ÕÚÅÌ %s"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:467
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** ïÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÓÐÉÓËÁ xml-ÐÁËÅÔÏ×! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:514
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** ïÛÉÂËÁ ÓÞÉÔÙ×ÁÎÉÑ ÓÐÉÓËÁ ÐÁËÅÔÏ×! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:909
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** osd xml ÎÅ ÓÏÄÅÒÖÉÔ ÄÁÎÎÙÈ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:914
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:990
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÁÎÁÌÉÚÉÒÏ×ÁÔØ xml (ÄÌÉÎÁ %d)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:763
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr "ïÔËÒÙÔÅ ÂÁÚÙ ÄÁÎÎÙÈ ÐÁËÅÔÏ× × %s"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:768
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr "óÂÏÊ ÏÔËÒÙÔÉÑ ÂÁÚÙ ÄÁÎÎÙÈ ÐÁËÅÔÏ× × %s"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:801
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr "úÁËÒÙÔÉÅ db ÄÌÑ %s (ÏÔËÒÙÔÏ)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:806
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr "úÁËÒÙÔÉÅ db ÄÌÑ %s (ÎÅ ÏÔËÒÙÔÏ)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1137
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s"
 
-#: components/services/install-view/nautilus-service-install-view.c:418
+#. this stuff flies by so fast, it's probably enough to just say "info"
+#: components/services/install-view/callbacks.c:64
+#, fuzzy
+msgid "Getting package information ..."
+msgstr "ðÏÌÕÞÅÎÉÅ ÓÐÉÓËÁ ÐÁËÅÔÏ× Ó ÕÄÁÌÅÎÎÏÇÏ ÓÅÒ×ÅÒÁ...\n"
+
+#: components/services/install-view/callbacks.c:82
 #, fuzzy, c-format
-msgid " · %s is in the GNOME footprint menu under %s"
-msgstr " · %s ÅÓÔØ × ÍÅÎÀ Gnome ÄÌÑ %s"
+msgid "Checking \"%s\" for conflicts..."
+msgstr "ðÒÏ×ÅÒËÁ ÌÏËÁÌØÎÏÇÏ ÆÁÊÌÁ %s..."
+
+#: components/services/install-view/callbacks.c:185
+#, c-format
+msgid "Downloading 1 package (%s)"
+msgstr "óËÁÞÉ×ÁÎÉÅ 1 ÐÁËÅÔÁ (%s)"
+
+#: components/services/install-view/callbacks.c:187
+#, fuzzy, c-format
+msgid "Downloading %d packages (%s)"
+msgstr "óËÁÞÉ×ÁÎÉÅ 1 ÐÁËÅÔÁ (%s)"
+
+#: components/services/install-view/callbacks.c:236
+#, c-format
+msgid "Downloading \"%s\""
+msgstr "óËÁÞÉ×ÁÎÉÅ \"%s\""
+
+#: components/services/install-view/callbacks.c:242
+#, fuzzy, c-format
+msgid "0K of %dK"
+msgstr "%dK ÉÚ %dK"
+
+#: components/services/install-view/callbacks.c:249
+#, fuzzy, c-format
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"Downloading \"%s\" now."
+msgstr ""
+"ðÁËÅÔ \"%s\" ÔÒÅÂÕÅÔ \"%s\" ÄÌÑ ÚÁÐÕÓËÁ.\n"
+"óËÁÞÁÎÏ ÕÓÐÅÛÎÏ."
+
+#: components/services/install-view/callbacks.c:252
+#, fuzzy, c-format
+msgid "Attempting to download package \"%s\"."
+msgstr "ðÏÄÇÏÔÏ×ËÁ Ë ÓËÁÞÉ×ÁÎÉÀ ÐÁËÅÔÏ×..."
+
+#: components/services/install-view/callbacks.c:262
+#: components/services/install-view/callbacks.c:333
+#, fuzzy
+msgid "Complete"
+msgstr "ëÏÍÐØÀÔÅÒ"
+
+#: components/services/install-view/callbacks.c:266
+#, fuzzy, c-format
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" has been successfully downloaded."
+msgstr ""
+"ðÁËÅÔ \"%s\" ÔÒÅÂÕÅÔ \"%s\" ÄÌÑ ÚÁÐÕÓËÁ.\n"
+"óËÁÞÁÎÏ ÕÓÐÅÛÎÏ."
+
+#: components/services/install-view/callbacks.c:269
+#, c-format
+msgid "The package \"%s\" has been successfully downloaded."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:287
+#, c-format
+msgid "%dK of %dK"
+msgstr "%dK ÉÚ %dK"
+
+#: components/services/install-view/callbacks.c:316
+#, c-format
+msgid "Download of package \"%s\" failed!"
+msgstr "óËÁÞÉ×ÁÎÉÅ ÐÁËÅÔÁ %s ÎÅ ÕÄÁÌÏÓØ!"
+
+#: components/services/install-view/callbacks.c:338
+#, fuzzy, c-format
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" has been successfully downloaded and installed."
+msgstr ""
+"ðÁËÅÔÕ \"%s\" ÔÒÅÂÕÅÔÓÑ ÄÌÑ ÚÁÐÕÓËÁ \"%s\".\n"
+"ïÎÏ ÓËÁÞÉ×ÁÅÔÓÑ É ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ."
+
+#: components/services/install-view/callbacks.c:341
+#, fuzzy, c-format
+msgid "\"%s\" has been successfully downloaded and installed."
+msgstr "õÓÐÅÛÎÏ ÓËÁÞÁÎ ÐÁËÅÔ \"%s\"."
+
+#. starting a new package -- create new progress indicator
+#: components/services/install-view/callbacks.c:369
+#, fuzzy, c-format
+msgid "Installing package %d of %d"
+msgstr "õÓÔÁÎÏ×ÌÉ×ÁÀÔÓÑ ÐÁËÅÔÙ"
+
+#: components/services/install-view/callbacks.c:396
+#, fuzzy, c-format
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" is now being installed."
+msgstr ""
+"ðÁËÅÔÕ \"%s\" ÔÒÅÂÕÅÔÓÑ ÄÌÑ ÚÁÐÕÓËÁ \"%s\".\n"
+"ïÎÏ ÓËÁÞÉ×ÁÅÔÓÑ É ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ."
+
+#: components/services/install-view/callbacks.c:399
+#, fuzzy, c-format
+msgid "Now installing package \"%s\"."
+msgstr "õÓÔÁÎÏ×ÌÉ×ÁÀÔÓÑ ÐÁËÅÔÙ"
 
-#: components/services/install-view/nautilus-service-install-view.c:436
+#: components/services/install-view/callbacks.c:407
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
-msgid " · %s is in the Gnome menu.\n"
-msgstr " · %s ÅÓÔØ × ÍÅÎÀ Gnome.\n"
+msgid "Installing \"%s\""
+msgstr "õÓÔÁÎÏ×ËÁ \"%s\""
+
+#: components/services/install-view/callbacks.c:415
+#: src/nautilus-zoom-control.c:592
+msgid "%d%%"
+msgstr "%d%%"
 
-#: components/services/install-view/nautilus-service-install-view.c:463
+#: components/services/install-view/callbacks.c:443
 #, c-format
-msgid " · %s is in the KDE menu.\n"
+msgid "Installation failed on %s"
+msgstr "óÂÏÊ ÕÓÔÁÎÏ×ËÉ ÎÁ %s"
+
+#: components/services/install-view/callbacks.c:471
+msgid "I ran into problems while installing."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:472
+msgid "I'd like to try the following :"
+msgstr "ðÌÁÎÉÒÕÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ:"
+
+#: components/services/install-view/callbacks.c:481
+#, fuzzy
+msgid "Is this ok ?"
+msgstr ""
+"\n"
+"üÔÏ ÐÒÁ×ÉÌØÎÏ?"
+
+#: components/services/install-view/callbacks.c:556
+#, fuzzy
+msgid "Installation cancelled."
+msgstr "õÓÔÁÎÏ×ËÁ ÐÒÅÒ×ÁÎÁ."
+
+#: components/services/install-view/callbacks.c:558
+#, fuzzy
+msgid "This package has already been installed."
+msgstr "%s ÕÖÅ ÂÙÌÏ ÕÓÔÁÎÏ×ÌÅÎÏ\n"
+
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
+#, fuzzy
+msgid "Installation complete."
+msgstr "õÓÔÁÎÏ×ËÁ ÚÁ×ÅÒÛÅÎÁ!"
+
+#: components/services/install-view/callbacks.c:564
+#, fuzzy
+msgid "Installation failed."
+msgstr "óÂÏÊ ÕÓÔÁÎÏ×ËÉ ÎÁ %s"
+
+#. some succeeded; some failed
+#: components/services/install-view/callbacks.c:568
+msgid "Some packages installed successfully:"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:577
+#, fuzzy
+msgid ""
+"\n"
+"Some packages failed:"
+msgstr "õËÁÚÁÔØ ÆÁÊÌ ÐÁËÅÔÁ"
+
+#: components/services/install-view/callbacks.c:626
+msgid "Erase the RPM files?"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:628
+msgid "Erase the leftover RPM files?"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:658
+msgid "Ok"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:673
+msgid ""
+"A core package of Nautilus has been\n"
+"updated.  You should restart Nautilus.\n"
+"\n"
+"Do you wish to do that now?"
+msgstr ""
+"ïÓÎÏ×ÎÏÊ ÐÁËÅÔ Nautilus ÂÙÌ ÏÂÎÏ×ÌÅÎ.\n"
+"÷ÁÍ ÎÅÏÂÈÏÄÉÍÏ ÐÅÒÅÚÁÐÕÓÔÉÔØ Nautilus.\n"
+"\n"
+"èÏÔÉÔÅ ÓÄÅÌÁÔØ ÜÔÏ ÓÅÊÞÁÓ?"
+
+#. Setup the title
+#: components/services/install-view/forms.c:201
+#, fuzzy
+msgid "Easy Install"
+msgstr "ðÒÏÓÔÁÑ ÕÓÔÁÎÏ×ËÁ"
+
+#. Setup the progress header
+#. FIXME: the middle header is all fubar now, so we just say "messages", but the spec
+#. * shows "progress" over the 2nd column of the message box.  it's just too hard to get
+#. * it aligned currently.
+#.
+#: components/services/install-view/forms.c:327
+msgid "Messages"
+msgstr "óÏÏÂÝÅÎÉÑ"
+
+#: components/services/install-view/forms.c:358
+#: components/services/summary/nautilus-summary-view.c:647
+#, c-format
+msgid "Version: %s"
+msgstr "÷ÅÒÓÉÑ: %s"
+
+#: components/services/install-view/forms.c:407
+#, fuzzy
+msgid "These packages are ready to be downloaded and installed:"
+msgstr ""
+"ðÁËÅÔÕ \"%s\" ÔÒÅÂÕÅÔÓÑ ÄÌÑ ÚÁÐÕÓËÁ \"%s\".\n"
+"ïÎÏ ÓËÁÞÉ×ÁÅÔÓÑ É ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ."
+
+#: components/services/install-view/forms.c:408
+#, fuzzy
+msgid "If you wish to download and install these packages, click Continue."
+msgstr ""
+"ðÌÁÎÉÒÕÅÔÓÑ ÓËÁÞÁÔØ É ÕÓÔÁÎÏ×ÉÔØ ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ:\n"
+"\n"
+
+#: components/services/install-view/forms.c:411
+#, fuzzy
+msgid "These packages are ready to be uninstalled:"
+msgstr "îÅ ÕÄÁÌÏÓØ ÕÄÁÌÉÔØ ÐÁËÅÔ %s.\n"
+
+#: components/services/install-view/forms.c:412
+msgid "If you wish to uninstall these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:415
+msgid "These packages are ready to be reverted:"
+msgstr ""
+
+#: components/services/install-view/forms.c:416
+msgid "If you wish to revert these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:464
+#, c-format
+msgid "for a total of %ld MB."
+msgstr "×ÓÅÇÏ %ld íâ."
+
+#: components/services/install-view/forms.c:466
+#, c-format
+msgid "for a total of %ld KB."
+msgstr "×ÓÅÇÏ %ld ëâ."
+
+#. buttons
+#: components/services/install-view/forms.c:478
+#, fuzzy
+msgid "Continue"
+msgstr "ðÒÏÄÏÌÖÉÔØ? (Ä/Î) "
+
+#: components/services/install-view/forms.c:482
+#: libnautilus-extensions/nautilus-drag.c:493
+#: src/file-manager/fm-directory-view.c:4326
+msgid "Cancel"
+msgstr "ïÔÍÅÎÁ"
+
+#: components/services/install-view/nautilus-service-install-view.c:421
+#, fuzzy, c-format
+msgid "%s is in GNOME (footprint) > %s"
+msgstr " · %s ÅÓÔØ × ÍÅÎÀ Gnome ÄÌÑ %s"
+
+#: components/services/install-view/nautilus-service-install-view.c:439
+#, fuzzy, c-format
+msgid "%s is in the GNOME (footprint) menu.\n"
+msgstr " · %s ÅÓÔØ × ÍÅÎÀ Gnome ÄÌÑ %s"
+
+#: components/services/install-view/nautilus-service-install-view.c:454
+#, fuzzy, c-format
+msgid "%s is in the KDE menu.\n"
 msgstr " · %s ÅÓÔØ × ÍÅÎÀ KDE.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:519
+#: components/services/install-view/nautilus-service-install-view.c:655
+#, fuzzy
+msgid "Installation Complete"
+msgstr "õÓÔÁÎÏ×ËÁ ÚÁ×ÅÒÛÅÎÁ!"
+
+#: components/services/install-view/nautilus-service-install-view.c:710
+#, c-format
+msgid ""
+"%sTo start %s, click the Launch button below, or to create a shortcut, drag "
+"the icon on the right to the GNOME panel or your desktop."
+msgstr ""
+
+#. couldn't find an icon
+#: components/services/install-view/nautilus-service-install-view.c:718
+#, c-format
+msgid "%sTo start %s, click the Launch button below."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:773
+msgid "Incorrect password."
+msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ÐÁÒÏÌØ."
+
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:636
+#: components/services/install-view/nautilus-service-install-view.c:895
 msgid "Installing packages"
 msgstr "õÓÔÁÎÏ×ÌÉ×ÁÀÔÓÑ ÐÁËÅÔÙ"
 
-#: components/services/install-view/nautilus-service-install-view.c:638
+#: components/services/install-view/nautilus-service-install-view.c:897
 msgid "Installing remote package"
 msgstr "õÓÔÁÎÁ×ÌÉ×ÁÀÔÓÑ ÕÄÁÌÅÎÎÙÅ ÐÁËÅÔÙ"
 
-#: components/services/install-view/nautilus-service-install-view.c:640
-#, c-format
-msgid "Installing \"%s\""
-msgstr "õÓÔÁÎÏ×ËÁ \"%s\""
-
-#: components/services/install-view/nautilus-service-install-view.c:642
+#: components/services/install-view/nautilus-service-install-view.c:901
 #, fuzzy
 msgid "Installing some package"
 msgstr "óËÁÞÉ×ÁÎÉÅ ÐÁËÅÔÁ"
 
-#: components/services/install-view/nautilus-service-install-view.c:659
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:706
+#: components/services/install-view/nautilus-service-install-view.c:967
 #, fuzzy
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr "ðÏÄËÌÀÞÅÎÉÅ Ë ËÁÔÁÌÏÇÕ ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ..."
 
-#: components/services/install-view/nautilus-service-install-view.c:764
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:836
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:856
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "óËÁÞÉ×ÁÎÉÅ ÐÁËÅÔÁ ÐÒÅÒ×ÁÎÏ."
 
-#: components/services/install-view/nautilus-service-install-view.c:857
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "ðÒÅÒ×ÁÎÏ"
 
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:1
+#: components/services/install/server/Trilobite_Service_install.oaf.in.h:2
+#: components/services/summary/nautilus-summary-view.c:123
+msgid "Install"
+msgstr "õÓÔÁÎÏ×ÉÔØ"
+
 #: components/services/install-view/Nautilus_View_install.oaf.in.h:2
 #, fuzzy
 msgid "Install Viewer"
@@ -3230,10 +3407,12 @@ msgid "Services Login"
 msgstr "ðÏÄËÌÀÞÅÎÉÅ Ë ÓÅÒ×ÉÓÁÍ"
 
 #: components/services/summary/nautilus-summary-dialogs.c:131
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "éÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ:"
 
 #: components/services/summary/nautilus-summary-dialogs.c:138
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "ðÁÒÏÌØ:"
 
@@ -3247,69 +3426,65 @@ msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄËÌÀÞÉÔÅÓØ Ë ÓÅÒ×ÉÓÁÍ Eazel"
 msgid "Your user name or password were not correct.  Please try again."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:116
+#: components/services/summary/nautilus-summary-view.c:117
 #: libnautilus-extensions/nautilus-program-chooser.c:1361
 msgid "Go There"
 msgstr "ðÅÒÅÊÔÉ ÓÀÄÁ"
 
-#: components/services/summary/nautilus-summary-view.c:119
+#: components/services/summary/nautilus-summary-view.c:120
 msgid "More Info"
 msgstr "äÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ"
 
-#: components/services/summary/nautilus-summary-view.c:130
+#: components/services/summary/nautilus-summary-view.c:131
 msgid "Account Preferences"
 msgstr "îÁÓÔÒÏÊËÉ ÓÞÅÔÁ"
 
-#: components/services/summary/nautilus-summary-view.c:131
+#: components/services/summary/nautilus-summary-view.c:132
 msgid "Logout"
 msgstr "ïÔËÌÀÞÉÔØÓÑ"
 
-#: components/services/summary/nautilus-summary-view.c:132
-#: components/services/summary/nautilus-summary-view.c:140
+#: components/services/summary/nautilus-summary-view.c:133
+#: components/services/summary/nautilus-summary-view.c:141
 msgid "Terms of Use"
 msgstr "ðÒÁ×ÉÌÁ ÐÏÌØÚÏ×ÁÎÉÑ"
 
-#: components/services/summary/nautilus-summary-view.c:133
-#: components/services/summary/nautilus-summary-view.c:141
+#: components/services/summary/nautilus-summary-view.c:134
+#: components/services/summary/nautilus-summary-view.c:142
 msgid "Privacy Statement"
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:138
+#: components/services/summary/nautilus-summary-view.c:139
 msgid "Register"
 msgstr "úÁÒÅÇÉÓÔÒÉÒÏ×ÁÔØÓÑ"
 
-#: components/services/summary/nautilus-summary-view.c:139
+#: components/services/summary/nautilus-summary-view.c:140
 msgid "Login"
 msgstr "ðÏÄËÌÀÞÉÔØÓÑ"
 
-#: components/services/summary/nautilus-summary-view.c:169
-#, c-format
-msgid "Welcome, %s!"
-msgstr "äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ, %s!"
+#: components/services/summary/nautilus-summary-view.c:170
+#, fuzzy, c-format
+msgid "Eazel Services - Welcome, %s!"
+msgstr "äÏÍÁÛÎÑÑ ÓÔÒÁÎÉÃÁ ÓÅÒ×ÉÓÏ× Eazel"
 
-#: components/services/summary/nautilus-summary-view.c:174
-msgid "You are not logged in"
+#: components/services/summary/nautilus-summary-view.c:175
+#, fuzzy
+msgid "Eazel Services - You are not logged in"
 msgstr "÷Ù ÎÅ ÐÏÄËÌÀÞÅÎÙ Ë"
 
-#: components/services/summary/nautilus-summary-view.c:181
+#: components/services/summary/nautilus-summary-view.c:182
 msgid "Connecting to Eazel Services..."
 msgstr "ðÏÄËÌÀÞÅÎÉÅ Ë ÓÅÒ×ÉÓÁÍ Eazel..."
 
-#: components/services/summary/nautilus-summary-view.c:643
-#, c-format
-msgid "Version: %s"
-msgstr "÷ÅÒÓÉÑ: %s"
-
-#: components/services/summary/nautilus-summary-view.c:737
+#: components/services/summary/nautilus-summary-view.c:741
 #: data/linksets/home.xml.h:3 src/nautilus-service-ui.xml.h:4
 msgid "Services"
 msgstr "óÅÒ×ÉÓÙ"
 
-#: components/services/summary/nautilus-summary-view.c:748
+#: components/services/summary/nautilus-summary-view.c:752
 msgid "Featured Downloads"
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:875
+#: components/services/summary/nautilus-summary-view.c:884
 #, fuzzy
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
@@ -3320,7 +3495,7 @@ msgstr ""
 "ÉÌÉ ×ÁÛ ËÏÍÐØÀÔÅÒ ÎÅËÏÒÒÅËÔÎÏ ÎÁÓÔÒÏÅÎ. ÷Ù ÍÏÖÅÔÅ ÐÏÐÒÏÂÏ×ÁÔØ ÅÝÅ ÒÁÚ "
 "ÐÏÚÄÎÅÅ."
 
-#: components/services/summary/nautilus-summary-view.c:885
+#: components/services/summary/nautilus-summary-view.c:894
 #, fuzzy
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
@@ -3329,7 +3504,7 @@ msgstr ""
 "ïÂÎÁÒÕÖÅÎÁ ÐÒÏÂÌÅÍÁ Ó ÄÁÎÎÙÍÉ ÎÁ ÓÅÒ×ÅÒÁÈ Eazel. ðÏÖÁÌÕÊÓÔÁ, ÎÁÐÉÛÉÔÅ ÐÏ "
 "ÁÄÒÅÓÕ support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:908
+#: components/services/summary/nautilus-summary-view.c:917
 #, fuzzy
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
@@ -3338,7 +3513,7 @@ msgstr ""
 "ïÂÎÁÒÕÖÅÎÁ ÐÒÏÂÌÅÍÁ Ó ÄÁÎÎÙÍÉ ÎÁ ÓÅÒ×ÅÒÁÈ Eazel. ðÏÖÁÌÕÊÓÔÁ, ÎÁÐÉÛÉÔÅ ÐÏ "
 "ÁÄÒÅÓÕ support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:950
+#: components/services/summary/nautilus-summary-view.c:959
 #, fuzzy
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
@@ -3349,7 +3524,7 @@ msgstr ""
 "ÉÌÉ ×ÁÛ ËÏÍÐØÀÔÅÒ ÎÅËÏÒÒÅËÔÎÏ ÎÁÓÔÒÏÅÎ. ÷Ù ÍÏÖÅÔÅ ÐÏÐÒÏÂÏ×ÁÔØ ÅÝÅ ÒÁÚ "
 "ÐÏÚÄÎÅÅ."
 
-#: components/services/summary/nautilus-summary-view.c:960
+#: components/services/summary/nautilus-summary-view.c:969
 #, fuzzy
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
@@ -3358,12 +3533,12 @@ msgstr ""
 "ïÂÎÁÒÕÖÅÎÁ ÐÒÏÂÌÅÍÁ Ó ÄÁÎÎÙÍÉ ÎÁ ÓÅÒ×ÅÒÁÈ Eazel. ðÏÖÁÌÕÊÓÔÁ, ÎÁÐÉÛÉÔÅ ÐÏ "
 "ÁÄÒÅÓÕ support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:977
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:1040
-#: src/nautilus-first-time-druid.c:250
+#: components/services/summary/nautilus-summary-view.c:1049
+#: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr "óÅÒ×ÉÓÙ Eazel"
 
@@ -3432,16 +3607,16 @@ msgstr "ðÒÏÓÍÏÔÒ ÞÉÓÌÁ:"
 msgid "View as Summary"
 msgstr "ðÏËÁÚÁÔØ ËÁË ÄÒÕÇÏÅ"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:130
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
 #, c-format
 msgid "HTTP error %d \"%s\" on uri %s"
 msgstr "ïÛÉÂËÁ HTTP: %d \"%s\" ÎÁ uri %s"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:200
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 msgid "Could not initialize Bonobo"
 msgstr "îÅ ÕÄÁÌÏÓØ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ Bonobo"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:215
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr ""
@@ -3480,48 +3655,68 @@ msgstr ""
 msgid "Factory for the sample service"
 msgstr ""
 
-#: components/text/nautilus-text-view.c:329
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr ""
 
-#: components/text/nautilus-text-view.c:330
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr "æÁÊÌ ÓÌÉÛËÏÍ ×ÅÌÉË"
 
 #: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "ûÒÉÆÔÙ"
+
+#: components/text/nautilus-text-view-ui.xml.h:2
 msgid "Lucida"
 msgstr "ìÀÃÉÄÁ"
 
-#: components/text/nautilus-text-view-ui.xml.h:2
+#: components/text/nautilus-text-view-ui.xml.h:3
 msgid "Use the Courier Font"
 msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÛÒÉÆÔ ëÕÒØÅÒ"
 
-#: components/text/nautilus-text-view-ui.xml.h:3
+#: components/text/nautilus-text-view-ui.xml.h:4
+#, fuzzy
+msgid "Use the Fixed Font"
+msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÛÒÉÆÔ ôÁÊÍÓ"
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+#, fuzzy
+msgid "Use the GTK System Font"
+msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÛÒÉÆÔ ôÁÊÍÓ"
+
+#: components/text/nautilus-text-view-ui.xml.h:6
 msgid "Use the Helvetica Font"
 msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÛÒÉÆÔ çÅÌØ×ÅÔÉËÁ"
 
-#: components/text/nautilus-text-view-ui.xml.h:4
+#: components/text/nautilus-text-view-ui.xml.h:7
 msgid "Use the Lucida Font"
 msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÛÒÉÆÔ ìÀÃÉÄÁ"
 
-#: components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:8
 msgid "Use the Times Font"
 msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÛÒÉÆÔ ôÁÊÍÓ"
 
-#: components/text/nautilus-text-view-ui.xml.h:6
+#: components/text/nautilus-text-view-ui.xml.h:9
 msgid "_Courier"
 msgstr "ëÕÒØÅÒ"
 
-#: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
-msgstr "ûÒÉÆÔÙ"
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "æÁÊÌ"
 
-#: components/text/nautilus-text-view-ui.xml.h:8
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
 msgid "_Helvetica"
 msgstr "çÅÌØ×ÅÔÉËÁ"
 
-#: components/text/nautilus-text-view-ui.xml.h:9
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr "ôÁÊÍÓ"
 
@@ -3591,7 +3786,7 @@ msgid "Nautilus Tree view"
 msgstr "ðÒÏÓÍÏÔÒ ÄÅÒÅ×Á Nautilus"
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:635
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr "äÅÒÅ×Ï"
 
@@ -3715,7 +3910,7 @@ msgstr "ðÅÒÅÔÁÝÉÔÅ ÜÍÂÌÅÍÕ ÎÁ ÏÂßÅËÔ, ÞÔÏÂÙ ÄÏÂÁ×ÉÔØ ÅÅ Ë ÏÂßÅËÔÕ"
 msgid "Eclipse"
 msgstr "úÁÔÍÅÎÉÅ"
 
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1594
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "üÍÂÌÅÍÙ"
 
@@ -3812,7 +4007,7 @@ msgid "Numbers"
 msgstr "þÉÓÌÁ"
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "Ok"
 
@@ -3933,13 +4128,13 @@ msgid "The Gimp"
 msgstr "Gimp"
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:549
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "òÁÂÏÞÉÊ ÓÔÏÌ"
 
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4740
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
-#: src/file-manager/fm-desktop-icon-view.c:65
+#: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
 msgstr "íÕÓÏÒÎÁÑ ËÏÒÚÉÎÁ"
 
@@ -3972,7 +4167,7 @@ msgid "Google"
 msgstr "Google"
 
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:808
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "ðÏÉÓËÏ×ÙÅ ÓÉÓÔÅÍÙ"
 
@@ -4044,25 +4239,25 @@ msgid "International"
 msgstr "íÅÖÄÕÎÁÒÏÄÎÏÅ"
 
 #: data/static_bookmarks.xml.h:18
-msgid "LWN.net"
-msgstr "LWN.net"
-
-#: data/static_bookmarks.xml.h:19
 msgid "Linux Documentation Project"
 msgstr "ðÒÏÅËÔ ÄÏËÕÍÅÎÔÉÒÏ×ÁÎÉÑ Linux"
 
-#: data/static_bookmarks.xml.h:20
+#: data/static_bookmarks.xml.h:19
 msgid "Linux One"
 msgstr "Linux One"
 
-#: data/static_bookmarks.xml.h:21
+#: data/static_bookmarks.xml.h:20
 msgid "Linux Online"
 msgstr "Linux Online"
 
-#: data/static_bookmarks.xml.h:22
+#: data/static_bookmarks.xml.h:21
 msgid "Linux Resources"
 msgstr "Linux Resources"
 
+#: data/static_bookmarks.xml.h:22
+msgid "Linux Weekly News"
+msgstr ""
+
 #: data/static_bookmarks.xml.h:23
 msgid "LinuxNewbie.org"
 msgstr "LinuxNewbie.org"
@@ -4072,78 +4267,82 @@ msgid "LinuxOrbit.com"
 msgstr "LinuxOrbit.com"
 
 #: data/static_bookmarks.xml.h:25
+msgid "MandrakeSoft"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:26
 msgid "Netraverse"
 msgstr "Netraverse"
 
-#: data/static_bookmarks.xml.h:26
+#: data/static_bookmarks.xml.h:27
 msgid "News and Media"
 msgstr "îÏ×ÏÓÔÉ É ËÁÎÁÌÙ"
 
-#: data/static_bookmarks.xml.h:27
+#: data/static_bookmarks.xml.h:28
 msgid "O'Reilly"
 msgstr "O'Reilly"
 
-#: data/static_bookmarks.xml.h:28
+#: data/static_bookmarks.xml.h:29
 msgid "OSDN"
 msgstr "OSDN"
 
-#: data/static_bookmarks.xml.h:29
+#: data/static_bookmarks.xml.h:30
 msgid "Open Source Asia"
 msgstr "Open Source Asia"
 
-#: data/static_bookmarks.xml.h:30
+#: data/static_bookmarks.xml.h:31
 msgid "OpenOffice"
 msgstr "OpenOffice"
 
-#: data/static_bookmarks.xml.h:31
+#: data/static_bookmarks.xml.h:32
 msgid "Penguin Computing"
 msgstr "Penguin Computing"
 
-#: data/static_bookmarks.xml.h:32
+#: data/static_bookmarks.xml.h:33
 msgid "Rackspace"
 msgstr "Rackspace"
 
-#: data/static_bookmarks.xml.h:33
+#: data/static_bookmarks.xml.h:34
 msgid "Red Hat"
 msgstr "Red Hat"
 
-#: data/static_bookmarks.xml.h:34
+#: data/static_bookmarks.xml.h:35
 msgid "Red Hat Network"
 msgstr "Red Hat Network"
 
-#: data/static_bookmarks.xml.h:35
+#: data/static_bookmarks.xml.h:36
 msgid "RedFlag Linux"
 msgstr "RedFlag Linux"
 
-#: data/static_bookmarks.xml.h:36
+#: data/static_bookmarks.xml.h:37
 msgid "Software"
 msgstr "ðÒÏÇÒÁÍÍÙ"
 
-#: data/static_bookmarks.xml.h:37
+#: data/static_bookmarks.xml.h:38
 msgid "SourceForge"
 msgstr "SourceForge"
 
-#: data/static_bookmarks.xml.h:38
+#: data/static_bookmarks.xml.h:39
 msgid "Sun StarOffice"
 msgstr "Sun StarOffice"
 
-#: data/static_bookmarks.xml.h:39
+#: data/static_bookmarks.xml.h:40
 msgid "Sun Wah Linux"
 msgstr "Sun Wah Linux"
 
-#: data/static_bookmarks.xml.h:40
+#: data/static_bookmarks.xml.h:41
 msgid "Web Services"
 msgstr "÷ÅÂ-ÕÓÌÕÇÉ"
 
-#: data/static_bookmarks.xml.h:41
+#: data/static_bookmarks.xml.h:42
 msgid "ZDNet Linux Hardware Database"
 msgstr "ZDNet Linux Hardware Database"
 
-#: data/static_bookmarks.xml.h:42
+#: data/static_bookmarks.xml.h:43
 msgid "ZDNet Linux Resource Center"
 msgstr "ZDNet Linux Resource Center"
 
-#: data/static_bookmarks.xml.h:43
+#: data/static_bookmarks.xml.h:44
 msgid "Zero-Knowledge"
 msgstr ""
 
@@ -4203,11 +4402,6 @@ msgstr "óËÏÐÉÒÏ×ÁÔØ ÓÀÄÁ"
 msgid "_Link here"
 msgstr "óÓÙÌËÁ ÓÀÄÁ"
 
-#: libnautilus-extensions/nautilus-drag.c:493
-#: src/file-manager/fm-directory-view.c:3503
-msgid "Cancel"
-msgstr "ïÔÍÅÎÁ"
-
 #. Note to localizers: this font is used for text items in Druid pages
 #: libnautilus-extensions/nautilus-druid-page-eazel.c:381
 msgid "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-*"
@@ -4230,115 +4424,115 @@ msgstr "-*-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2217
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr "ÓÅÇÏÄÎÑ × %-I:%M %p"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2222
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr "×ÞÅÒÁ × %-I:%M %p"
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2227
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%A %-m/%-d/%y × %-I:%M %p"
 
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2232
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%-m/%-d/%y × %-I:%M %p"
 
-#: libnautilus-extensions/nautilus-file.c:3363
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 ÜÌÅÍÅÎÔÏ×"
 
-#: libnautilus-extensions/nautilus-file.c:3363
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr "0 ÐÁÐÏË"
 
-#: libnautilus-extensions/nautilus-file.c:3364
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 ÆÁÊÌÏ×"
 
-#: libnautilus-extensions/nautilus-file.c:3368
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 ÜÌÅÍÅÎÔ"
 
-#: libnautilus-extensions/nautilus-file.c:3368
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr "1 ÐÁÐËÁ"
 
-#: libnautilus-extensions/nautilus-file.c:3369
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 ÆÁÊÌ"
 
-#: libnautilus-extensions/nautilus-file.c:3372
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "%u ÜÌÅÍÅÎÔÏ×"
 
-#: libnautilus-extensions/nautilus-file.c:3372
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr "%u ÐÁÐÏË"
 
-#: libnautilus-extensions/nautilus-file.c:3373
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u ÆÁÊÌÏ×"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3676
-#: libnautilus-extensions/nautilus-file.c:3691
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr "? ÜÌÅÍÅÎÔÏ×"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3682
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr "? ÂÁÊÔ"
 
-#: libnautilus-extensions/nautilus-file.c:3695
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ"
 
-#: libnautilus-extensions/nautilus-file.c:3697
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ MIME-ÔÉÐ"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3702
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "ÎÅÉÚ×ÅÓÔÎÏ"
 
-#: libnautilus-extensions/nautilus-file.c:3738
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr "ÐÒÏÇÒÁÍÍÁ"
 
-#: libnautilus-extensions/nautilus-file.c:3750
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
 "some other reason."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3754
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
 "aaron@eazel.com"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3768
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "ÓÓÙÌËÁ"
 
@@ -4346,27 +4540,27 @@ msgstr "ÓÓÙÌËÁ"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1156
-#: libnautilus-extensions/nautilus-file.c:3774
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr "ÓÓÙÌËÁ ÎÁ %s"
 
-#: libnautilus-extensions/nautilus-file.c:3788
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr "ÓÓÙÌËÁ (ÉÓÐÏÒÞÅÎÎÁÑ)"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "ó:"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "ðÏ:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:588
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4377,7 +4571,7 @@ msgstr ""
 "\n"
 "\"%s\" ÎÅÌØÚÑ ÐÅÒÅÍÅÓÔÉÔØ, ÐÏÔÏÍÕ ÞÔÏ ÜÔÏ ÄÉÓË ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:599
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4390,7 +4584,7 @@ msgstr ""
 "\"%s\" ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÄÁÌÅÎ, ÐÏÔÏÍÕ ÞÔÏ Õ ×ÁÓ ÎÅÄÏÓÔÁÔÏÞÎÏ ÐÒÁ× ÄÌÑ "
 "ÉÚÍÅÎÅÎÉÑ ÅÇÏ ÒÏÄÉÔÅÌØÓËÏÊ ÐÁÐËÉ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:605
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4401,7 +4595,7 @@ msgstr ""
 "\n"
 "\"%s\" ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÄÁÌÅÎ, ÐÏÔÏÍÕ ÞÔÏ ÜÔÏ ÄÉÓË ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:636
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4414,7 +4608,7 @@ msgstr ""
 "\"%s\" ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅÍÅÝÅÎ, ÐÏÔÏÍÕ ÞÔÏ Õ ×ÁÓ ÎÅÄÏÓÔÁÔÏÞÎÏ ÐÒÁ× ÄÌÑ "
 "ÉÚÍÅÎÅÎÉÑ ÅÇÏ ÉÌÉ ÅÇÏ ÒÏÄÉÔÅÌØÓËÏÊ ÐÁÐËÉ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:643
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4426,7 +4620,7 @@ msgstr ""
 "\"%s\" ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅÍÅÝÅÎÁ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ, ÐÏÔÏÍÕ ÞÔÏ ×Ù ÎÅ ÉÍÅÅÔÅ "
 "ÄÏÓÔÁÔÏÞÎÙÈ ÐÒÁ× ÄÌÑ ÉÚÍÅÎÅÎÉÑ ÅÅ ÉÌÉ ÅÅ ÒÏÄÉÔÅÌØÓËÏÊ ÐÁÐËÉ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:667
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -4438,7 +4632,7 @@ msgstr ""
 "\"%s\" ÎÅ ÍÏÖÅÔ ÂÙÔØ ÓËÏÐÉÒÏ×ÁÎÏ, ÐÏÔÏÍÕ ÞÔÏ Õ ×ÁÓ ÎÅÄÏÓÔÁÔÏÞÎÏ ÐÒÁ× ÄÌÑ "
 "ÞÔÅÎÉÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:689
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4449,7 +4643,7 @@ msgstr ""
 "\n"
 "îÅ ÄÏÓÔÁÔÏÞÎÏ ÍÅÓÔÁ ÎÁ ÕÓÔÒÏÊÓÔ×Å ÎÁÚÎÁÞÅÎÉÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:694
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4460,7 +4654,7 @@ msgstr ""
 "\n"
 "îÅ ÄÏÓÔÁÔÏÞÎÏ ÍÅÓÔÁ ÎÁ ÕÓÔÒÏÊÓÔ×Å ÎÁÚÎÁÞÅÎÉÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:698
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4471,7 +4665,7 @@ msgstr ""
 "\n"
 "îÅ ÄÏÓÔÁÔÏÞÎÏ ÍÅÓÔÁ ÎÁ ÕÓÔÒÏÊÓÔ×Å ÎÁÚÎÁÞÅÎÉÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:710
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4482,7 +4676,7 @@ msgstr ""
 "\n"
 "õ ×ÁÓ ÎÅÄÏÓÔÁÔÏÞÎÏ ÐÒÁ× ÄÌÑ ÚÁÐÉÓÉ × ÜÔÕ ÐÁÐËÕ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4493,7 +4687,7 @@ msgstr ""
 "\n"
 "äÉÓË ÎÁÚÎÁÞÅÎÉÑ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:721
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4504,7 +4698,7 @@ msgstr ""
 "\n"
 "õ ×ÁÓ ÎÅÄÏÓÔÁÔÏÞÎÏ ÐÒÁ× ÄÌÑ ÚÁÐÉÓÉ × ÜÔÕ ÐÁÐËÕ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:725
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4515,7 +4709,7 @@ msgstr ""
 "\n"
 "äÉÓË ÎÁÚÎÁÞÅÎÉÑ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:732
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4526,7 +4720,7 @@ msgstr ""
 "\n"
 "õ ×ÁÓ ÎÅÄÏÓÔÁÔÏÞÎÏ ÐÒÁ× ÄÌÑ ÚÁÐÉÓÉ × ÜÔÕ ÐÁÐËÕ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:736
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4537,7 +4731,7 @@ msgstr ""
 "\n"
 "äÉÓË ÎÁÚÎÁÞÅÎÉÑ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4548,7 +4742,7 @@ msgstr ""
 "\n"
 "èÏÔÉÔÅ ÐÒÏÄÏÌÖÉÔØ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4559,7 +4753,7 @@ msgstr ""
 "\n"
 "èÏÔÉÔÅ ÐÒÏÄÏÌÖÉÔØ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:773
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4570,7 +4764,7 @@ msgstr ""
 "\n"
 "èÏÔÉÔÅ ÐÒÏÄÏÌÖÉÔØ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4581,7 +4775,7 @@ msgstr ""
 "\n"
 "èÏÔÉÔÅ ÐÒÏÄÏÌÖÉÔØ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:794
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4592,7 +4786,7 @@ msgstr ""
 "\n"
 "èÏÔÉÔÅ ÐÒÏÄÏÌÖÉÔØ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4603,7 +4797,7 @@ msgstr ""
 "\n"
 "èÏÔÉÔÅ ÐÒÏÄÏÌÖÉÔØ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4614,7 +4808,7 @@ msgstr ""
 "\n"
 "èÏÔÉÔÅ ÐÒÏÄÏÌÖÉÔØ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4625,34 +4819,34 @@ msgstr ""
 "\n"
 "èÏÔÉÔÅ ÐÒÏÄÏÌÖÉÔØ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:924
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "ïÛÉÂËÁ ÐÒÉ ËÏÐÉÒÏ×ÁÎÉÉ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:927
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "ïÛÉÂËÁ ÐÒÉ ÐÅÒÅÍÅÝÅÎÉÉ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:930
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "ïÛÉÂËÁ ÐÒÉ Ó×ÑÚÙ×ÁÎÉÉ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:935
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "ïÛÉÂËÁ ÐÒÉ ÕÄÁÌÅÎÉÉ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:960
-#: libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "ðÒÏÐÕÓÔÉÔØ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "ðÏ×ÔÏÒÉÔØ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1057
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4661,7 +4855,7 @@ msgid ""
 "If you still want to move \"%s\", rename it and try again."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1063
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4670,11 +4864,11 @@ msgid ""
 "If you still want to copy \"%s\", rename it and try again."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÆÁÊÌ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1081
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4685,22 +4879,22 @@ msgstr ""
 "\n"
 "èÏÔÉÔÅ ÚÁÍÅÎÉÔØ ÅÇÏ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1092
-#: libnautilus-extensions/nautilus-file-operations.c:1106
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "ëÏÎÆÌÉËÔ ÐÒÉ ËÏÐÉÒÏ×ÁÎÉÉ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "úÁÍÅÎÉÔØ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "úÁÍÅÎÉÔØ ×ÓÅ"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1160
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "ÄÒÕÇÁÑ ÓÓÙÌËÁ ÎÁ %s"
@@ -4709,25 +4903,25 @@ msgstr "ÄÒÕÇÁÑ ÓÓÙÌËÁ ÎÁ %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d-ÁÑ ÓÓÙÌËÁ ÎÁ %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1180
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d-ÁÑ ÓÓÙÌËÁ ÎÁ %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1184
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d-ØÑ ÓÓÙÌËÁ ÎÁ %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d-ÁÑ ÓÓÙÌËÁ ÎÁ %s"
@@ -4737,241 +4931,227 @@ msgstr "%d-ÁÑ ÓÓÙÌËÁ ÎÁ %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
-#: libnautilus-extensions/nautilus-file-operations.c:2351
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (ËÏÐÉÑ)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
-#: libnautilus-extensions/nautilus-file-operations.c:2351
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (ÄÒÕÇÁÑ ËÏÐÉÑ)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1212
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr "ÁÑ ËÏÐÉÑ)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr "ÁÑ ËÏÐÉÑ)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1216
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr "ÁÑ ËÏÐÉÑ)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr "ÁÑ ËÏÐÉÑ)"
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (ËÏÐÉÑ)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (ÄÒÕÇÁÑ ËÏÐÉÑ)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1232
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d-ÁÑ ËÏÐÉÑ)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1234
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d-ÁÑ ËÏÐÉÑ)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1236
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d-ØÑ ËÏÐÉÑ)%s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d-ÁÑ ËÏÐÉÑ)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1322
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1330
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1487
-#: libnautilus-extensions/nautilus-file-operations.c:2066
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1802
-#: libnautilus-extensions/nautilus-file-operations.c:2195
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "ðÅÒÅÍÅÝÅÎÉÅ ÆÁÊÌÏ× × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1804
-#: libnautilus-extensions/nautilus-file-operations.c:2197
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1821
-#: libnautilus-extensions/nautilus-file-operations.c:2199
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "ðÅÒÅÍÅÝÅÎÉÅ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1807
-#: libnautilus-extensions/nautilus-file-operations.c:2200
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "ðÏÄÇÏÔÏ×ËÁ Ë ÐÅÒÅÍÅÝÅÎÉÀ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1817
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "ðÅÒÅÍÅÝÅÎÉÅ ÆÁÊÌÏ×"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "æÁÊÌÙ ÐÅÒÅÍÅÝÅÎÙ:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1822
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "ðÏÄÇÏÔÏ×ËÁ Ë ÐÅÒÅÍÅÝÅÎÉÀ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "úÁ×ÅÒÛÅÎÉÅ ÐÅÒÅÍÅÝÅÎÉÑ..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "óÏÚÄÁÎÉÅ ÓÓÙÌÏË ÎÁ ÆÁÊÌÙ"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1837
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "æÁÊÌÙ Ó×ÑÚÁÎÙ:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1839
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "ó×ÑÚÙ×ÁÎÉÅ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "ðÏÄÇÏÔÏ×ËÁ Ë ÓÏÚÄÁÎÉÀ ÓÓÙÌÏË..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "úÁ×ÅÒÛÅÎÉÅ ÓÏÚÄÁÎÉÑ ÓÓÙÌÏË..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1848
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "ëÏÐÉÒÏ×ÁÎÉÅ ÆÁÊÌÏ×"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "æÁÊÌÙ ÓËÏÐÉÒÏ×ÁÎÙ:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "ëÏÐÉÒÏ×ÁÎÉÅ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "ðÏÄÇÏÔÏ×ËÁ Ë ËÏÐÉÒÏ×ÁÎÉÀ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ËÏÐÉÒÏ×ÁÔØ ÜÌÅÍÅÎÔÙ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓËÏÐÉÒÏ×ÁÔØ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1899
-#: libnautilus-extensions/nautilus-file-operations.c:2157
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "íÕÓÏÒÎÁÑ ËÏÒÚÉÎÁ ÄÏÌÖÎÁ ÏÓÔÁ×ÁÔØÓÑ ÎÁ ÒÁÂÏÞÅÍ ÓÔÏÌÅ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÐÅÒÅÍÅÓÔÉÔØ ÜÔÏ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1902
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ËÏÐÉÒÏ×ÁÔØ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1903
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ cËÏÐÉÒÏ×ÁÔØ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1905
-#: libnautilus-extensions/nautilus-file-operations.c:2158
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÒÁÓÐÏÌÏÖÅÎÉÅ ÍÕÓÏÒÎÏÊ ËÏÒÚÉÎÙ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1906
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓËÏÐÉÒÏ×ÁÔØ ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1923
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÐÅÒÅÍÅÓÔÉÔØ ÐÁÐËÕ ÓÁÍÕ × ÓÅÂÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1924
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÓËÏÐÉÒÏ×ÁÔØ ÐÁÐËÕ ÓÁÍÕ × ÓÅÂÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1926
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÍÅÓÔÉÔØ × ÓÅÂÑ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1927
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓËÏÐÉÒÏ×ÁÔØ × ÓÅÂÑ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1940
-msgid "You cannot move a file onto itself."
-msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÐÅÒÅÍÅÓÔÉÔØ ÆÁÊÌ ÓÁÍ × ÓÅÂÑ."
-
-#: libnautilus-extensions/nautilus-file-operations.c:1941
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÓËÏÐÉÒÏ×ÁÔØ ÆÁÊÌ ÓÁÍ × ÓÅÂÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1943
-msgid "Can't Move Onto Self"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÍÅÓÔÉÔØ × ÓÅÂÑ"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1944
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓËÏÐÉÒÏ×ÁÔØ × ÓÅÂÑ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1995
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -4981,7 +5161,7 @@ msgstr ""
 "\n"
 "õ ×ÁÓ ÎÅ ÄÏÓÔÁÔÏÞÎÏ ÐÒÁ× ÎÁ ÚÁÐÉÓØ ÎÁ ÕÓÔÒÏÊÓÔ×Ï ÎÁÚÎÁÞÅÎÉÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1998
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -4991,611 +5171,717 @@ msgstr ""
 "\n"
 "îÅÔ ÍÅÓÔÁ ÎÁ ÕÓÔÒÏÊÓÔ×Å ÎÁÚÎÁÞÅÎÉÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2001
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "ïÛÉÂËÁ \"%s\" ÓÏÚÄÁÎÉÑ ÎÏ×ÏÊ ÐÁÐËÉ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2005
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "ïÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÎÏ×ÏÊ ÐÁÐËÉ"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2092
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "ÎÅÏÚÁÇÌÁ×ÌÅÎÎÁÑ ÐÁÐËÁ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2164
-#, c-format
-msgid "You cannot throw \"%s\" into the Trash."
-msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÐÏÍÅÓÔÉÔØ \"%s\" × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ."
-
-#: libnautilus-extensions/nautilus-file-operations.c:2168
-msgid "Error Moving to Trash"
-msgstr "ïÛÉÂËÁ ÐÅÒÅÍÅÝÅÎÉÑ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ"
-
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2240
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "õÄÁÌÅÎÉÅ ÆÁÊÌÏ×"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2242
-#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "æÁÊÌÏ× ÕÄÁÌÅÎÏ:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2244
-#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "õÄÁÌÅÎÉÅ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "ðÏÄÇÏÔÏ×ËÁ Ë ÕÄÁÌÅÎÉÀ ÆÁÊÌÏ×..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "ïÞÉÓÔËÁ ÍÕÓÏÒÎÏÊ ËÏÒÚÉÎÙ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "ðÏÄÇÏÔÏ×ËÁ Ë ÏÞÉÓÔËÅ ÍÕÓÏÒÎÏÊ ËÏÒÚÉÎÙ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2311
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr ""
 "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÏËÏÎÞÁÔÅÌØÎÏ ÕÄÁÌÉÔØ ×ÓÅ ÜÔÉ ÜÌÅÍÅÎÔÙ × ÍÕÓÏÒÎÏÊ "
 "ËÏÒÚÉÎÅ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2313
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "õÄÁÌÉÔØ ÓÏÄÅÒÖÉÍÏÅ ÍÕÓÏÒÎÏÊ ËÏÒÚÉÎÙ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2314
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "ðÕÓÔÏ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2352
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2352
-#: libnautilus-extensions/nautilus-file-operations.c:2362
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "foo (ËÏÐÉÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2353
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2353
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (ËÏÐÉÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2354
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2354
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".foo (ËÏÐÉÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2355
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2355
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "foo foo (ËÏÐÉÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2356
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2356
-#: libnautilus-extensions/nautilus-file-operations.c:2363
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "foo (ËÏÐÉÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2357
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2357
-#: libnautilus-extensions/nautilus-file-operations.c:2377
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "foo foo (ËÏÐÉÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2358
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2358
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (ËÏÐÉÑ).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2359
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2359
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "foo...(ËÏÐÉÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2360
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2360
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "foo... (ËÏÐÉÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2361
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "foo. (ËÏÐÉÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2361
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "foo. (ÄÒÕÇÁÑ ËÏÐÉÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2362
-#: libnautilus-extensions/nautilus-file-operations.c:2364
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "foo (ÄÒÕÇÁÑ ËÏÐÉÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2363
-#: libnautilus-extensions/nautilus-file-operations.c:2365
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "foo (ÄÒÕÇÁÑ ËÏÐÉÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2364
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "foo (3-ØÑ ËÏÐÉÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2365
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "foo (3-ØÑ ËÏÐÉÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2366
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (ÄÒÕÇÁÑ ËÏÐÉÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2366
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3-ØÑ ËÏÐÉÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2367
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr "foo (21-ÁÑ ËÏÐÉÑ)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr "foo (24-ÁÑ ËÏÐÉÑ)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr "foo (21-ÁÑ ËÏÐÉÑ).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr "foo (24-ÁÑ ËÏÐÉÑ).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "foo (21-ÁÑ ËÏÐÉÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2367
-#: libnautilus-extensions/nautilus-file-operations.c:2369
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "foo (22-ÁÑ ËÏÐÉÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2368
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "foo (21-ÁÑ ËÏÐÉÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2368
-#: libnautilus-extensions/nautilus-file-operations.c:2370
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "foo (22-ÁÑ ËÏÐÉÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2369
-#: libnautilus-extensions/nautilus-file-operations.c:2371
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "foo (23-ØÑ ËÏÐÉÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2370
-#: libnautilus-extensions/nautilus-file-operations.c:2372
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "foo (23-ØÑ ËÏÐÉÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2371
-#: libnautilus-extensions/nautilus-file-operations.c:2373
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "foo (24-ÁÑ ËÏÐÉÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2372
-#: libnautilus-extensions/nautilus-file-operations.c:2374
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "foo (24-ÁÑ ËÏÐÉÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2373
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "foo (25-ÁÑ ËÏÐÉÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2374
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "25 (25-ÁÑ ËÏÐÉÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2375
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24-ÁÑ ËÏÐÉÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2375
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25-ÁÑ ËÏÐÉÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2376
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24-ÁÑ ËÏÐÉÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2376
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25-ÁÑ ËÏÐÉÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2377
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000-ÁÑ ËÏÐÉÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (10th copy)"
+msgstr "foo (21-ÁÑ ËÏÐÉÑ)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (11st copy)"
+msgstr "foo (21-ÁÑ ËÏÐÉÑ)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (10th copy).txt"
+msgstr "foo (21-ÁÑ ËÏÐÉÑ).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (11st copy).txt"
+msgstr "foo (21-ÁÑ ËÏÐÉÑ).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (11th copy)"
+msgstr "foo (21-ÁÑ ËÏÐÉÑ)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (12nd copy)"
+msgstr "foo (22-ÁÑ ËÏÐÉÑ)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (11th copy).txt"
+msgstr "foo (21-ÁÑ ËÏÐÉÑ).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (12nd copy).txt"
+msgstr "foo (22-ÁÑ ËÏÐÉÑ).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (12th copy)"
+msgstr "foo (24-ÁÑ ËÏÐÉÑ)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (13rd copy)"
+msgstr "foo (3-ØÑ ËÏÐÉÑ)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (12th copy).txt"
+msgstr "25 (25-ÁÑ ËÏÐÉÑ).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (13rd copy).txt"
+msgstr "foo (3-ØÑ ËÏÐÉÑ).txt"
+
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld ÉÚ %ld"
 
-#: libnautilus-extensions/nautilus-font-picker.c:131
-msgid "Font"
-msgstr "ûÒÉÆÔ"
-
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
 msgid "GConf Error"
 msgstr "ïÛÉÂËÁ GConf"
 
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:880
-msgid "fixed"
-msgstr "ÆÉËÓÉÒÏ×ÁÎÎÙÊ"
-
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1359
-msgid "01/01/00, 01:00 AM"
-msgstr "01/01/00, 01:00 äð"
-
-#: libnautilus-extensions/nautilus-glib-extensions.c:1360
-msgid "1/1/00, 1:00 AM"
-msgstr "1/1/00, 1:00 äð"
-
-#: libnautilus-extensions/nautilus-glib-extensions.c:1361
-msgid " 1/ 1/00,  1:00 AM"
-msgstr " 1/ 1/00,  1:00 äð"
-
 #. Constants
-#: libnautilus-extensions/nautilus-global-preferences.c:45
+#: libnautilus-extensions/nautilus-global-preferences.c:50
 msgid "Nautilus Preferences"
 msgstr "îÁÓÔÒÏÊËÉ Nautilus"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:90
-msgid "current theme"
-msgstr "ÔÅËÕÝÁÑ ÔÅÍÁ"
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "×ÓÅÇÄÁ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "÷ÓÅÇÄÁ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "ÔÏÌØËÏ ÌÏËÁÌØÎÏ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "ôÏÌØËÏ ÌÏËÁÌØÎÙÅ ÆÁÊÌÙ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "ÎÉËÏÇÄÁ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "îÉËÏÇÄÁ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "çÌÁÄËÁÑ ÇÒÁÆÉËÁ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÇÌÁÄËÕÀ (ÎÏ ÍÅÄÌÅÎÎÕÀ) ÇÒÁÆÉËÕ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "ûÒÉÆÔÙ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+msgid "Font for Icon view:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "æÁÂÒÉËÁ ÄÌÑ ÐÒÏÓÍÏÔÒÁ ÉÓÔÏÒÉÉ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "éÓÐÏÌØÚÏ×ÁÔØ Nautilus ÄÌÑ ÏÔÒÉÓÏ×ËÉ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
+msgstr "ïÔËÒÙÔÉÅ ÎÏ×ÙÈ ÏËÏÎ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:93
+#: libnautilus-extensions/nautilus-global-preferences.c:651
 #, fuzzy
 msgid "Open each file or folder in a separate window"
 msgstr "ïÔËÒÙÔØ ËÁÖÄÙÊ ÜÌÅÍÅÎÔ × ÎÏ×ÏÍ ÏËÎÅ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:96
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+msgid "Display toolbar in new windows"
+msgstr "ðÏËÁÚÁÔØ ÐÁÎÅÌØ ÉÎÓÔÒÕÍÅÎÔÏ× × ÎÏ×ÙÈ ÏËÎÁÈ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "ðÏËÁÚÁÔØ ÓÔÒÏËÕ ÒÁÓÐÏÌÏÖÅÎÉÑ × ÎÏ×ÙÈ ÏËÎÁÈ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "ðÏËÁÚÁÔØ ÓÔÒÏËÕ ÓÏÓÔÏÑÎÉÑ × ÎÏ×ÙÈ ÏËÎÁÈ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "ðÏËÁÚÁÔØ ÂÏËÏ×ÕÀ ÐÁÎÅÌØ × ÎÏ×ÙÈ ÏËÎÁÈ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "ðÏ×ÅÄÅÎÉÅ ÍÕÓÏÒÎÏÊ ËÏÒÚÉÎÙ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:686
 #, fuzzy
-msgid "Ask before emptying the Trash"
+msgid "Ask before emptying the Trash or deleting files"
 msgstr "óÐÒÁÛÉ×ÁÔØ ÐÒÅÖÄÅ ÞÅÍ ÕÄÁÌÑÔØ ÜÌÅÍÅÎÔÙ ÉÚ  ÍÕÓÏÒÎÏÊ ËÏÒÚÉÎÙ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:99
-#: libnautilus-extensions/nautilus-global-preferences.c:593
-msgid "Click Behavior"
-msgstr "ðÏ×ÅÄÅÎÉÅ ÝÅÌÞËÁ"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
+
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:102
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 msgid "single"
 msgstr "ÏÄÉÎÏÞÎÙÊ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:103
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "áËÔÉ×ÉÒÏ×ÁÔØ ÜÌÅÍÅÎÔÙ ÏÄÎÉÍ ÝÅÌÞËÏÍ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:107
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "Ä×ÏÊÎÏÊ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:108
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "áËÔÉ×ÉÒÏ×ÁÔØ ÜÌÅÍÅÎÔÙ Ä×ÏÊÎÙÍ ÝÅÌÞËÏÍ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:112
-#: libnautilus-extensions/nautilus-global-preferences.c:600
-msgid "Executable Text Files"
-msgstr "éÓÐÏÌÎÑÅÍÙÅ ÔÅËÓÔÏ×ÙÅ ÆÁÊÌÙ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:115
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 msgid "launch"
 msgstr "ÚÁÐÕÓÔÉÔØ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:116
+#: libnautilus-extensions/nautilus-global-preferences.c:726
 msgid "Execute files when they are clicked"
 msgstr "÷ÙÐÏÌÎÉÔØ ÆÁÊÌÙ ËÏÇÄÁ ÎÁ ÎÉÈ ÝÅÌËÎÕÔ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:120
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 msgid "display"
 msgstr "ÐÏËÁÚÁÔØ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:121
+#: libnautilus-extensions/nautilus-global-preferences.c:730
 msgid "Display files when they are clicked"
 msgstr "ðÏËÁÚÁÔØ ÆÁÊÌÙ ËÏÇÄÁ ÎÁ ÎÉÈ ÝÅÌËÎÕÔ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:125
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 msgid "ask"
 msgstr "ÓÐÒÏÓÉÔØ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:126
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 msgid "Ask each time"
 msgstr "ëÁÖÄÙÊ ÒÁÚ ÓÐÒÁÛÉ×ÁÔØ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:136
-#: libnautilus-extensions/nautilus-global-preferences.c:724
-msgid "Show Text in Icons"
-msgstr "ðÏËÁÚÙ×ÁÔØ ÔÅËÓÔ ÎÁ ÐÉËÔÏÇÒÁÍÍÁÈ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:139
-#: libnautilus-extensions/nautilus-global-preferences.c:731
-msgid "Show Count of Items in Folders"
-msgstr "ðÏËÁÚÁÔØ ÞÉÓÌÏ ÜÌÅÍÅÎÔÏ× × ÐÁÐËÁÈ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:142
-#: libnautilus-extensions/nautilus-global-preferences.c:738
-msgid "Show Thumbnails for Image Files"
-msgstr "ðÏËÁÚÙ×ÁÔØ ÍÉÎÉÁÔÀÒÙ ÄÌÑ ÆÁÊÌÏ× ÉÚÏÂÒÁÖÅÎÉÊ"
-
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:145
-#: libnautilus-extensions/nautilus-global-preferences.c:754
-msgid "Make Folder Appearance Details Public"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-global-preferences.c:148
-#: libnautilus-extensions/nautilus-global-preferences.c:745
-msgid "Preview Sound Files"
-msgstr "ðÒÏÓÌÕÛÉ×ÁÎÉÅ Ú×ÕËÏ×ÙÈ ÆÁÊÌÏ×"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:151
-msgid "Use smoother (but slower) graphics"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÇÌÁÄËÕÀ (ÎÏ ÍÅÄÌÅÎÎÕÀ) ÇÒÁÆÉËÕ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:154
-msgid "Use this font family to display file names:"
-msgstr "óÅÍÅÊÓÔ×Ï ÛÒÉÆÔÁ ÉÓÐÏÌØÚÕÅÍÏÇÏ ÄÌÑ ÏÔÏÂÒÁÖÅÎÉÑ ÎÁÚ×ÁÎÉÊ ÆÁÊÌÏ×:"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Display toolbar in new windows"
-msgstr "ðÏËÁÚÁÔØ ÐÁÎÅÌØ ÉÎÓÔÒÕÍÅÎÔÏ× × ÎÏ×ÙÈ ÏËÎÁÈ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-msgid "Display location bar in new windows"
-msgstr "ðÏËÁÚÁÔØ ÓÔÒÏËÕ ÒÁÓÐÏÌÏÖÅÎÉÑ × ÎÏ×ÙÈ ÏËÎÁÈ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Display status bar in new windows"
-msgstr "ðÏËÁÚÁÔØ ÓÔÒÏËÕ ÓÏÓÔÏÑÎÉÑ × ÎÏ×ÙÈ ÏËÎÁÈ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-msgid "Display sidebar in new windows"
-msgstr "ðÏËÁÚÁÔØ ÂÏËÏ×ÕÀ ÐÁÎÅÌØ × ÎÏ×ÙÈ ÏËÎÁÈ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:170
-msgid "Use Nautilus to draw the desktop"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ Nautilus ÄÌÑ ÏÔÒÉÓÏ×ËÉ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:174
-msgid "Enable fast search (indexes your hard drive)"
-msgstr "÷ËÌÀÞÉÔØ ÂÙÓÔÒÙÊ ÐÏÉÓË (ÉÎÄÅËÓÉÒÕÅÔ ×ÁÛ ÖÅÓÔËÉÊ ÄÉÓË)"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:177
-msgid "search type to do by default"
-msgstr "ÔÉÐ ÐÏÉÓËÁ ÉÓÐÏÌØÚÕÅÍÙÊ ÐÏ ÕÍÏÌÞÁÎÉÀ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:180
-msgid "search by text"
-msgstr "ÐÏÉÓË ÐÏ ÔÅËÓÔÕ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:181
-msgid "Search for files by file name only"
-msgstr "ðÏÉÓË ÆÁÊÌÏ× ÔÏÌØËÏ ÐÏ ÎÁÚ×ÁÎÉÀ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:185
-msgid "search by text and properties"
-msgstr "ÐÏÉÓË ÐÏ ÔÅËÓÔÕ É Ó×ÏÊÓÔ×ÁÍ"
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "ðÏ×ÅÄÅÎÉÅ ÝÅÌÞËÁ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:186
-msgid "Search for files by file name and file properties"
-msgstr "ðÏÉÓË ÆÁÊÌÏ× ÐÏ ÎÁÚ×ÁÎÉÀ É Ó×ÏÊÓÔ×ÁÍ"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr "éÓÐÏÌÎÑÅÍÙÅ ÔÅËÓÔÏ×ÙÅ ÆÁÊÌÙ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:190
-msgid "Search Engine Location"
-msgstr "òÁÓÐÏÌÏÖÅÎÉÅ ÐÏÉÓËÏ×ÏÊ ÍÁÛÉÎÙ"
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr "ðÏËÁÚÁÔØ/óËÒÙÔØ ÐÁÒÁÍÅÔÒÙ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:194
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr "ðÏËÁÚÁÔØ ÓËÒÙÔÙÅ ÆÁÊÌÙ (ÎÁÞÉÎÁÀÝÉÅÓÑ Ó \".\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:197
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr "ðÏËÁÚÁÔØ ÒÅÚÅÒ×ÎÙÅ ÆÁÊÌÙ (ÚÁËÁÎÞÉ×ÁÀÝÉÅÓÑ ÎÁ \"~\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:200
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr "ðÏËÁÚÁÔØ ÓÐÅÃÉÁÌØÎÙÅ ÆÌÁÇÉ × ÏËÎÅ Ó×ÏÊÓÔ×"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:203
-msgid "Show only folders (no files) in the tree"
-msgstr "ðÏËÁÚÙ×ÁÔØ ÔÏÌØËÏ ÐÁÐËÉ × ÄÅÒÅ×Å"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:206
-msgid "Can add Content"
-msgstr "íÏÖÎÏ ÄÏÂÁ×ÉÔØ ÓÏÄÅÒÖÉÍÏÅ"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+#, fuzzy
+msgid "Sorting Order"
+msgstr "ïÛÉÂËÁ ÕÓÔÁÎÏ×ËÉ ×ÌÁÄÅÌØÃÁ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:209
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
-msgstr "îÅ ×ËÌÀÞÁÔØ ×ÓÔÒÏÅÎÎÙÅ ÚÁËÌÁÄËÉ × ÍÅÎÀ ÚÁËÌÁÄÏË"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:213
-#: libnautilus-extensions/nautilus-global-preferences.c:218
-#: src/file-manager/fm-properties-window.c:1506 src/nautilus-location-bar.c:62
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
 msgid "Location:"
 msgstr "òÁÓÐÏÌÏÖÅÎÉÅ:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:217
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+msgid "HTTP Proxy Settings"
+msgstr "îÁÓÔÒÏÊËÉ HTTP-proxy"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "éÓÐÏÌØÚÏ×ÁÔØ HTTP-ÐÒÏËÓÉ"
 
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:219
-#: src/nautilus-first-time-druid.c:667
+#: libnautilus-extensions/nautilus-global-preferences.c:812
+#: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr "ðÏÒÔ:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:525
-msgid "Appearance"
-msgstr "÷ÎÅÛÎÉÊ ×ÉÄ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:526
-msgid "Appearance Settings"
-msgstr "îÁÓÔÒÏÊËÉ ×ÎÅÛÎÅÇÏ ×ÉÄÁ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:528
-msgid "Smoother Graphics"
-msgstr "çÌÁÄËÁÑ ÇÒÁÆÉËÁ"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:535
-msgid "Fonts"
-msgstr "ûÒÉÆÔÙ"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "÷ÓÔÒÏÅÎÎÙÅ ÚÁËÌÁÄËÉ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:546
-msgid "Windows & Desktop"
-msgstr "ïËÎÁ É ÒÁÂÏÞÉÊ ÓÔÏÌ"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "îÅ ×ËÌÀÞÁÔØ ×ÓÔÒÏÅÎÎÙÅ ÚÁËÌÁÄËÉ × ÍÅÎÀ ÚÁËÌÁÄÏË"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:547
-msgid "Windows & Desktop Settings"
-msgstr "õÓÔÁÎÏ×ËÉ ÏËÏÎ É ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "ðÏËÁÚÙ×ÁÔØ ÔÅËÓÔ ÎÁ ÐÉËÔÏÇÒÁÍÍÁÈ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:555
-msgid "Opening New Windows"
-msgstr "ïÔËÒÙÔÉÅ ÎÏ×ÙÈ ÏËÏÎ"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr "ðÏËÁÚÁÔØ ÞÉÓÌÏ ÜÌÅÍÅÎÔÏ× × ÐÁÐËÁÈ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:578
-msgid "Trash Behavior"
-msgstr "ðÏ×ÅÄÅÎÉÅ ÍÕÓÏÒÎÏÊ ËÏÒÚÉÎÙ"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "ðÏËÁÚÙ×ÁÔØ ÍÉÎÉÁÔÀÒÙ ÄÌÑ ÆÁÊÌÏ× ÉÚÏÂÒÁÖÅÎÉÊ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:590
-msgid "Icon & List Views"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:591
-#, fuzzy
-msgid "Icon & List Views Settings"
-msgstr "õÓÔÁÎÏ×ËÉ ÐÒÏÓÍÏÔÒÁ ËÁÔÁÌÏÇÁ"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr "ðÒÏÓÌÕÛÉ×ÁÎÉÅ Ú×ÕËÏ×ÙÈ ÆÁÊÌÏ×"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:607
-msgid "Show/Hide Options"
-msgstr "ðÏËÁÚÁÔØ/óËÒÙÔØ ÐÁÒÁÍÅÔÒÙ"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:628
-msgid "Sidebar Panels"
-msgstr "âÏËÏ×ÙÅ ÐÁÎÅÌÉ"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "÷ÎÅÛÎÉÊ ×ÉÄ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:629
-#, fuzzy
-msgid "Sidebar Panels Settings"
-msgstr "ïÐÉÓÁÎÉÅ ÂÏËÏ×ÏÊ ÐÁÎÅÌÉ"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr "ïËÎÁ É ÒÁÂÏÞÉÊ ÓÔÏÌ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:632
-msgid "Tabs"
-msgstr "ôÁÂÕÌÑÔÏÒÙ"
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:681
+#: libnautilus-extensions/nautilus-global-preferences.c:957
 msgid "Navigation"
 msgstr "îÁ×ÉÇÁÃÉÑ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:682
-msgid "Navigation Settings"
-msgstr "îÁÓÔÒÏÊËÉ ÎÁ×ÉÇÁÃÉÉ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:691
-msgid "HTTP Proxy Settings"
-msgstr "îÁÓÔÒÏÊËÉ HTTP-proxy"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:710
-msgid "Built-in Bookmarks"
-msgstr "÷ÓÔÒÏÅÎÎÙÅ ÚÁËÌÁÄËÉ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:721
+#: libnautilus-extensions/nautilus-global-preferences.c:962
 msgid "Speed Tradeoffs"
 msgstr "îÅÄÏÓÔÁÔÏË ÓËÏÒÏÓÔÉ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:722
-msgid "Speed Tradeoffs Settings"
-msgstr "îÁÓÔÒÏÊËÁ ÎÅÄÏÓÔÁÔËÁ ÓËÏÒÏÓÔÉ"
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr "ÐÏÉÓË ÐÏ ÔÅËÓÔÕ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:793
-msgid "Search"
-msgstr "ðÏÉÓË"
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+msgid "Search for files by file name only"
+msgstr "ðÏÉÓË ÆÁÊÌÏ× ÔÏÌØËÏ ÐÏ ÎÁÚ×ÁÎÉÀ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:794
-msgid "Search Settings"
-msgstr "îÁÓÔÒÏÊËÉ ÐÏÉÓËÁ"
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr "ÐÏÉÓË ÐÏ ÔÅËÓÔÕ É Ó×ÏÊÓÔ×ÁÍ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+msgid "Search for files by file name and file properties"
+msgstr "ðÏÉÓË ÆÁÊÌÏ× ÐÏ ÎÁÚ×ÁÎÉÀ É Ó×ÏÊÓÔ×ÁÍ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "ðÁÒÁÍÅÔÒÙ ÓÌÏÖÎÏÓÔÉ ÐÏÉÓËÁ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:802
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "ÔÉÐ ÐÏÉÓËÁ ÉÓÐÏÌØÚÕÅÍÙÊ ÐÏ ÕÍÏÌÞÁÎÉÀ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 msgid "Fast Search"
 msgstr "âÙÓÔÒÙÊ ÐÏÉÓË"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:975
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr "÷ËÌÀÞÉÔØ ÂÙÓÔÒÙÊ ÐÏÉÓË (ÉÎÄÅËÓÉÒÕÅÔ ×ÁÛ ÖÅÓÔËÉÊ ÄÉÓË)"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+msgid "Search Engine Location"
+msgstr "òÁÓÐÏÌÏÖÅÎÉÅ ÐÏÉÓËÏ×ÏÊ ÍÁÛÉÎÙ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "ðÏÉÓË"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr "ðÏËÁÚÙ×ÁÔØ ÔÏÌØËÏ ÐÁÐËÉ × ÄÅÒÅ×Å"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
 #, fuzzy, c-format
 msgid "Display %s tab in sidebar"
 msgstr "ðÏËÁÚÁÔØ ÓÔÒÏËÕ ÓÏÓÔÏÑÎÉÑ × ÎÏ×ÙÈ ÏËÎÁÈ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1022
-msgid "always"
-msgstr "×ÓÅÇÄÁ"
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "âÏËÏ×ÙÅ ÐÁÎÅÌÉ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1023
-msgid "Always"
-msgstr "÷ÓÅÇÄÁ"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr "ôÁÂÕÌÑÔÏÒÙ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1026
-msgid "local only"
-msgstr "ÔÏÌØËÏ ÌÏËÁÌØÎÏ"
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"currently can't be performed because the program crond, which does nightly "
+"tasks on your computer, is turned off. To make sure fast searches can be "
+"done, turn crond on."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1027
-msgid "Local Files Only"
-msgstr "ôÏÌØËÏ ÌÏËÁÌØÎÙÅ ÆÁÊÌÙ"
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
+msgid "Files May Not Be Indexed"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1030
-msgid "never"
-msgstr "ÎÉËÏÇÄÁ"
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
+msgid ""
+"If you are running Linux, you can log in as root and type these commands to "
+"start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1031
-msgid "Never"
-msgstr "îÉËÏÇÄÁ"
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"may not be performed because the program crond, which does nightly tasks on "
+"your computer, may be turned off. To make sure fast searches can be done, "
+"check to make sure that crond is turned on.\n"
+"\n"
+msgstr ""
 
 #. The list of characters that cause line breaks can be localized.
-#: libnautilus-extensions/nautilus-icon-canvas-item.c:69
+#: libnautilus-extensions/nautilus-icon-canvas-item.c:70
 msgid " -_,;.?/&"
 msgstr " -_,;.?/&"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:741
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
@@ -5604,7 +5890,7 @@ msgstr ""
 "üÔÏÔ ËÁÔÁÌÏÇ ÉÓÐÏÌØÚÕÅÔ Á×ÔÏÍÁÔÉÞÅÓËÏÅ ÒÁÚÍÅÝÅÎÉÅ. èÏÔÉÔÅ ÐÅÒÅËÌÀÞÉÔØÓÑ × "
 "ÒÕÞÎÏÅ ÒÁÚÍÅÝÅÎÉÅ É ÏÓÔÁ×ÉÔØ ÜÔÏÔ ÜÌÅÍÅÎÔ ÔÁÍ ÇÄÅ ×Ù ÅÇÏ ÐÏÍÅÓÔÉÌÉ?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:745
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
@@ -5613,7 +5899,7 @@ msgstr ""
 "üÔÏÔ ËÁÔÁÌÏÇ ÉÓÐÏÌØÚÕÅÔ Á×ÔÏÍÁÔÉÞÅÓËÏÅ ÒÁÚÍÅÝÅÎÉÅ. èÏÔÉÔÅ ÐÅÒÅËÌÀÞÉÔØÓÑ × "
 "ÒÕÞÎÏÅ ÒÁÚÍÅÝÅÎÉÅ É ÏÓÔÁ×ÉÔØ ÜÔÉ ÜÌÅÍÅÎÔÙ ÔÁÍ ÇÄÅ ×Ù ÉÈ ÐÏÍÅÓÔÉÌÉ?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:751
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
@@ -5621,7 +5907,7 @@ msgstr ""
 "üÔÏÔ ËÁÔÁÌÏÇ ÉÓÐÏÌØÚÕÅÔ Á×ÔÏÍÁÔÉÞÅÓËÏÅ ÒÁÚÍÅÝÅÎÉÅ. èÏÔÉÔÅ ÐÅÒÅËÌÀÞÉÔØÓÑ × "
 "ÒÕÞÎÏÅ ÒÁÚÍÅÝÅÎÉÅ É ÏÓÔÁ×ÉÔØ ÜÔÏÔ ÜÌÅÍÅÎÔ ÔÁÍ ÇÄÅ ×Ù ÅÇÏ ÐÏÍÅÓÔÉÌÉ?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:754
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
@@ -5629,48 +5915,48 @@ msgstr ""
 "üÔÏÔ ËÁÔÁÌÏÇ ÉÓÐÏÌØÚÕÅÔ Á×ÔÏÍÁÔÉÞÅÓËÏÅ ÒÁÚÍÅÝÅÎÉÅ. èÏÔÉÔÅ ÐÅÒÅËÌÀÞÉÔØÓÑ × "
 "ÒÕÞÎÏÅ ÒÁÚÍÅÝÅÎÉÅ É ÏÓÔÁ×ÉÔØ ÜÔÉ ÜÌÅÍÅÎÔÙ ÔÁÍ ÇÄÅ ×Ù ÉÈ ÐÏÍÅÓÔÉÌÉ?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:759
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "ðÅÒÅËÌÀÞÉÔØÓÑ ÎÁ ÒÁÚÍÅÝÅÎÉÅ ×ÒÕÞÎÕÀ?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:760
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "ðÅÒÅËÌÀÞÉÔØ"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1551
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr "ïÔËÁÔ ÐÅÞÁÔÉ"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1552
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ ÓÔÁÒÏÅ ÎÁÚ×ÁÎÉÅ"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1553
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "÷ÏÚ×ÒÁÔ ÐÅÞÁÔÉ"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1554
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ ÉÚÍÅÎÅÎÎÏÅ ÎÁÚ×ÁÎÉÅ"
 
-#: libnautilus-extensions/nautilus-preferences.c:76
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "îÏ×ÉÞÏË"
 
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "ðÒÏÍÅÖÕÔÏÞÎÙÊ"
 
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "òÁÚ×ÉÔÙÊ"
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:205
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "ïËÎÏ ÎÁÓÔÒÏÅË"
 
@@ -5769,7 +6055,7 @@ msgid "Don't include in the menu for \"%s\" items"
 msgstr "îÅÔ ×ËÌÀÞÁÔØ × ÍÅÎÀ ÄÌÑ ÜÌÅÍÅÎÔÏ× \"%s\""
 
 #: libnautilus-extensions/nautilus-program-chooser.c:1209
-#: src/file-manager/fm-list-view.c:2122
+#: src/file-manager/fm-list-view.c:2182
 #: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
@@ -5822,24 +6108,59 @@ msgstr ""
 "÷Ù ÍÏÖÅÔÅ ÎÁÓÔÒÏÉÔØ ÓÏÏÔ×ÅÔÓÔ×ÉÅ ÍÅÖÄÕ ÐÒÏÇÒÁÍÍÁÍÉ É ÔÉÐÁÍÉ ÆÁÊÌÏ× × ãÅÎÔÒÅ "
 "ÕÐÒÁ×ÌÅÎÉÑ Gnome."
 
-#: libnautilus-extensions/nautilus-program-choosing.c:516
+#: libnautilus-extensions/nautilus-program-chooser.c:1485
+#, fuzzy, c-format
+msgid "No viewers are available for \"%s\"."
+msgstr "îÅÔ ÄÏÓÔÕÐÎÏÇÏ ÏÐÉÓÁÎÉÑ ÄÌÑ ÔÅÍÙ \"%s\""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1486
+msgid "No Viewers Available"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1489
+#, fuzzy, c-format
+msgid "No applications are available for \"%s\"."
+msgstr "îÅÔ ÄÏÓÔÕÐÎÏÇÏ ÏÐÉÓÁÎÉÑ ÄÌÑ ÔÅÍÙ \"%s\""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1490
+#, fuzzy
+msgid "No Applications Available"
+msgstr "ðÒÉÌÏÖÅÎÉÑ"
+
+#. Note: This might be misleading in the components case, since the
+#. * user can't add components to the complete list even from the capplet.
+#. * (They can add applications though.)
+#.
+#: libnautilus-extensions/nautilus-program-chooser.c:1497
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"You can configure which programs are offered for which file types with the "
+"\"File Types and Programs\" part of the GNOME Control Center. Do you want to "
+"go there now?"
+msgstr ""
+"÷Ù ÍÏÖÅÔÅ ÎÁÓÔÒÏÉÔØ ÓÏÏÔ×ÅÔÓÔ×ÉÅ ÍÅÖÄÕ ÐÒÏÇÒÁÍÍÁÍÉ É ÔÉÐÁÍÉ ÆÁÊÌÏ× × ãÅÎÔÒÅ "
+"ÕÐÒÁ×ÌÅÎÉÑ Gnome."
+
+#: libnautilus-extensions/nautilus-program-choosing.c:492
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
 "locations.  Would you like to choose another application?"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-program-choosing.c:521
-#: libnautilus-extensions/nautilus-program-choosing.c:542
+#: libnautilus-extensions/nautilus-program-choosing.c:497
+#: libnautilus-extensions/nautilus-program-choosing.c:518
 msgid "Can't Open Location"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÏÌÏÖÅÎÉÅ"
 
-#: libnautilus-extensions/nautilus-program-choosing.c:537
+#: libnautilus-extensions/nautilus-program-choosing.c:513
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
 "locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you will be able to open it."
+"copy this file onto your computer, you may be able to open it."
 msgstr ""
 
 #. Human readable description for a criterion in a search for
@@ -6086,25 +6407,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "üÌÅÍÅÎÔÙ, ÉÍÅÎÁ ËÏÔÏÒÙÈ ÓÏÄÅÒÖÁÔ \"medusa\" Ñ×ÌÑÀÝÉÅÓÑ ËÁÔÁÌÏÇÁÍÉ."
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr "äÅÔÁÌÉ"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr "ïÛÉÂËÁ"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr "÷ÏÐÒÏÓ"
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr "ðÏÉÓË ÎÁ ÄÉÓËÁÈ"
@@ -6113,7 +6415,7 @@ msgstr "ðÏÉÓË ÎÁ ÄÉÓËÁÈ"
 msgid "Nautilus is searching your disks for trash folders."
 msgstr "Nautilus ÉÝÅÔ ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ ÎÁ ×ÁÛÉÈ ÄÉÓËÁÈ."
 
-#: libnautilus-extensions/nautilus-trash-file.c:593
+#: libnautilus-extensions/nautilus-trash-file.c:725
 msgid "on the desktop"
 msgstr "ÎÁ ÒÁÂÏÞÅÍ ÓÔÏÌÅ"
 
@@ -6137,75 +6439,77 @@ msgstr "÷ÏÚ×ÒÁÔ ÐÒÁ×ËÉ"
 msgid "Redo the edit"
 msgstr "÷ÅÒÎÕÔØ ÏÔÍÅÎÅÎÎÙÅ ÉÚÍÅÎÅÎÉÑ"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:514
-#: libnautilus-extensions/nautilus-volume-monitor.c:533
+#: libnautilus-extensions/nautilus-view-identifier.c:61
+#, fuzzy, c-format
+msgid "View as %s"
+msgstr "ðÏËÁÚÁÔØ ËÁË ÓÐÉÓÏË"
+
+#: libnautilus-extensions/nautilus-view-identifier.c:64
+#, fuzzy, c-format
+msgid "%s Viewer"
+msgstr "%s ÐÒÏÓÍÁÔÒÉ×ÁÔÅÌØ"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
 msgid "Unknown"
 msgstr "îÅÉÚ×ÅÓÔÎÏ"
 
 #. Populate table with items we know localized names for.
-#: libnautilus-extensions/nautilus-volume-monitor.c:619
-#: libnautilus-extensions/nautilus-volume-monitor.c:1807
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr "äÉÓËÅÔÁ"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:620
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:621
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
 msgid "Zip Drive"
 msgstr "ZIP-ÄÉÓËÏ×ÏÄ"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:642
-#: libnautilus-extensions/nautilus-volume-monitor.c:664
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 msgid "Audio CD"
 msgstr "áÕÄÉÏ ËÏÍÐÁËÔ-ÄÉÓË"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1523
-msgid "Mount Error"
-msgstr "ïÛÉÂËÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1525
-msgid "Unmount Error"
-msgstr "ïÛÉÂËÁ ÒÁÚÍÏÎÔÉÒÏ×ÁÎÉÑ"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1555
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr "ÚÁÝÉÝÅÎ ÏÔ ÚÁÐÉÓÉ, ÐÏÄËÌÀÞÅÎ × ÒÅÖÉÍÅ \"ÔÏÌØËÏ-ÞÔÅÎÉÅ\""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1558
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "ÎÅ Ñ×ÌÑÅÔÓÑ ÄÏÐÕÓÔÉÍÙÍ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr ""
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1563
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
 msgstr ""
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1567
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1570
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1573
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1576
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
@@ -6213,40 +6517,58 @@ msgstr ""
 "Nautilus ÎÅ ÕÄÁÌÏÓØ ÐÏÄËÌÀÞÉÔØ ÕËÁÚÁÎÎÙÊ ÒÁÚÄÅÌ. òÁÚÄÅÌ ×ÏÚÍÏÖÎÏ ÉÍÅÅÔ "
 "ÆÏÒÍÁÔ ËÏÔÏÒÙÊ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÏÄËÌÀÞÅÎ."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1581
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr "Nautilus ÎÅ ÕÄÁÌÏÓØ ÐÏÄËÌÀÞÉÔØ ÕËÁÚÁÎÎÙÊ ÄÉÓËÏ×ÏÄ."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1583
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "Nautilus ÎÅ ÕÄÁÌÏÓØ ÐÏÄËÌÀÞÉÔØ ÕËÁÚÁÎÎÙÊ ÒÁÚÄÅÌ."
 
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1588
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr "Nautilus ÎÅ ÕÄÁÌÏÓØ ÏÔËÌÀÞÉÔØ ÕËÁÚÁÎÎÙÊ ÒÁÚÄÅÌ."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1740
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr "ïÛÉÂËÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr "ïÛÉÂËÁ ÒÁÚÍÏÎÔÉÒÏ×ÁÎÉÑ"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "òÁÚÄÅÌ ISO 9660"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1755
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "ëÏÒÅÎØ"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1762
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "òÁÚÄÅÌ Ext2"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1777
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "òÁÚÄÅÌ MSDOS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1792
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "òÁÚÄÅÌ NFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1822
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
+#, fuzzy
+msgid "ReiserFS Volume"
+msgstr "òÁÚÄÅÌ NFS"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
+#, fuzzy
+msgid "UFS Volume"
+msgstr "òÁÚÄÅÌ NFS"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÒÁÚÄÅÌ"
 
@@ -6254,31 +6576,66 @@ msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÒÁÚÄÅÌ"
 msgid "C_lear Text"
 msgstr "ïÞÉÓÔÉÔØ ÔÅËÓÔ"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "ïÞÉÓÔÉÔØ ÔÅËÓÔ"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "óËÏÐÉÒÏ×ÁÔØ ÔÅËÓÔ"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "óËÏÐÉÒÏ×ÁÔØ ×ÙÄÅÌÅÎÎÙÊ ÔÅËÓÔ × ÂÕÆÅÒ ÏÂÍÅÎÁ"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "÷ÙÒÅÚÁÔØ ÔÅËÓÔ"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+msgid "Cut _Text"
+msgstr "÷ÙÒÅÚÁÔØ ÔÅËÓÔ"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "÷ÙÒÅÚÁÔØ ×ÙÄÅÌÅÎÎÙÊ ÔÅËÓÔ × ÂÕÆÅÒ ÏÂÍÅÎÁ"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:45
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "÷ÓÔÁ×ÉÔØ ÔÅËÓÔ"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "÷ÓÔÁ×ÉÔØ ÔÅËÓÔ ÓÏÈÒÁÎÅÎÎÙÊ × ÂÕÆÅÒÅ ÏÂÍÅÎÁ"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "õÄÁÌÉÔØ ×ÙÄÅÌÅÎÎÙÊ ÔÅËÓÔ ÎÅ ÐÏÍÅÝÁÑ ÅÇÏ × ÂÕÆÅÒ ÏÂÍÅÎÁ"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:77
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "÷ÙÄÅÌÉÔØ ×ÓÅ"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+#, fuzzy
+msgid "Select _All"
+msgstr "÷ÙÄÅÌÉÔØ ×ÓÅ"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "÷ÙÄÅÌÉÔØ ×ÓÅ ÜÌÅÍÅÎÔÙ × ÜÔÏÍ ÏËÎÅ"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "óËÏÐÉÒÏ×ÁÔØ ÔÅËÓÔ"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:7
-msgid "_Cut Text"
-msgstr "÷ÙÒÅÚÁÔØ ÔÅËÓÔ"
-
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:91
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "÷ÓÔÁ×ÉÔØ ÔÅËÓÔ"
 
@@ -6287,7 +6644,7 @@ msgstr "÷ÓÔÁ×ÉÔØ ÔÅËÓÔ"
 #. * to change it when we upgrade to GTK 2.0.
 #.
 #: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
-#: src/nautilus-window-menus.c:563
+#: src/nautilus-window-menus.c:610
 msgid "Nautilus"
 msgstr "îÁÕÔÉÌÕÓ"
 
@@ -6303,78 +6660,112 @@ msgstr ""
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:735
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr "äÏÍÁÛÎÉÊ ËÁÔÁÌÏÇ %s"
 
-#: src/file-manager/fm-desktop-icon-view.c:1021
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "ïÞÉÓÔÉÔØ ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ..."
 
-#: src/file-manager/fm-desktop-icon-view.c:1023
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "ïÞÉÓÔÉÔØ ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ"
 
-#: src/file-manager/fm-desktop-icon-view.c:1043
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "ïÔÍÏÎÔÉÒÏ×ÁÔØ ÒÁÚÄÅÌ"
 
-#: src/file-manager/fm-directory-view.c:474
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr "âÕÄÅÔ ÏÔËÒÙÔÏ %d ÏÔÄÅÌØÎÙÈ ÏËÏÎ. ÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÓÄÅÌÁÔØ ÜÔÏ?"
 
-#: src/file-manager/fm-directory-view.c:476
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "ïÔËÒÙÔØ %d ÏËÏÎ?"
 
-#: src/file-manager/fm-directory-view.c:1199
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr ""
+"÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÏËÏÎÞÁÔÅÌØÎÏ ÕÄÁÌÉÔØ \"%s\" ÜÌÅÍÅÎÔÏ× ÉÚ ÍÕÓÏÒÎÏÊ "
+"ËÏÒÚÉÎÙ?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+"÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÏËÏÎÞÁÔÅÌØÎÏ ÕÄÁÌÉÔØ %d ×ÙÄÅÌÅÎÎÙÈ ÜÌÅÍÅÎÔÏ× ÉÚ "
+"ÍÕÓÏÒÎÏÊ ËÏÒÚÉÎÙ?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "õÄÁÌÉÔØ"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "õÄÁÌÉÔØ"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+#, fuzzy
+msgid "scripts"
+msgstr "ïÐÉÓÁÎÉÅ"
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" ×ÙÄÅÌÅÎÏ"
 
-#: src/file-manager/fm-directory-view.c:1201
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "1 ÐÁÐËÁ ×ÙÄÅÌÅÎÁ"
 
-#: src/file-manager/fm-directory-view.c:1204
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "%d ÐÁÐÏË ×ÙÄÅÌÅÎÏ"
 
-#: src/file-manager/fm-directory-view.c:1210
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr " (ÓÏÄÅÒÖÁÝÉÊ 0 ÜÌÅÍÅÎÔÏ×)"
 
-#: src/file-manager/fm-directory-view.c:1212
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr " (ÓÏÄÅÒÖÁÝÉÊ 1 ÜÌÅÍÅÎÔ)"
 
-#: src/file-manager/fm-directory-view.c:1214
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr " (ÓÏÄÅÒÖÁÝÉÊ %d ÜÌÅÍÅÎÔÏ×)"
 
-#: src/file-manager/fm-directory-view.c:1225
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" ×ÙÄÅÌÅÎÏ (%s)"
 
-#: src/file-manager/fm-directory-view.c:1229
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d ÜÌÅÍÅÎÔÏ× ×ÙÄÅÌÅÎÏ (%s)"
 
-#: src/file-manager/fm-directory-view.c:1236
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 ÄÒÕÇÏÊ ÜÌÅÍÅÎÔ ×ÙÄÅÌÅÎ (%s)"
 
-#: src/file-manager/fm-directory-view.c:1239
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d ÄÒÕÇÉÈ ÜÌÅÍÅÎÔÏ× ×ÙÄÅÌÅÎÏ (%s)"
@@ -6386,7 +6777,7 @@ msgstr "%d ÄÒÕÇÉÈ ÜÌÅÍÅÎÔÏ× ×ÙÄÅÌÅÎÏ (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1268
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -6395,18 +6786,18 @@ msgstr "%s%s, %s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1395
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
 "will not be displayed."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1402
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÆÁÊÌÏ×"
 
-#: src/file-manager/fm-directory-view.c:2599
+#: src/file-manager/fm-directory-view.c:2752
 #, fuzzy, c-format
 msgid ""
 "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
@@ -6414,7 +6805,7 @@ msgstr ""
 "\"%s\" ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅÍÅÝÅÎÏ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ. èÏÔÉÔÅ ÕÄÁÌÉÔØ "
 "ÎÅÍÅÄÌÅÎÎÏ?"
 
-#: src/file-manager/fm-directory-view.c:2604
+#: src/file-manager/fm-directory-view.c:2757
 #, fuzzy, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
@@ -6423,7 +6814,7 @@ msgstr ""
 "%d ×ÙÂÒÁÎÎÙÈ ÜÌÅÍÅÎÔÏ× ÎÅ ÍÏÇÕÔ ÂÙÔØ ÐÅÒÅÍÅÝÅÎÙ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ. èÏÔÉÔÅ "
 "ÕÄÁÌÉÔØ ÉÈ ÎÅÍÅÄÌÅÎÎÏ?"
 
-#: src/file-manager/fm-directory-view.c:2608
+#: src/file-manager/fm-directory-view.c:2761
 #, fuzzy, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -6432,23 +6823,18 @@ msgstr ""
 "%d ×ÙÂÒÁÎÎÙÈ ÜÌÅÍÅÎÔÏ× ÎÅ ÍÏÇÕÔ ÂÙÔØ ÐÅÒÅÍÅÝÅÎÙ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ. èÏÔÉÔÅ "
 "ÕÄÁÌÉÔØ ÜÔÉ %d ÜÌÅÍÅÎÔÏ× ÎÅÍÅÄÌÅÎÎÏ?"
 
-#: src/file-manager/fm-directory-view.c:2616
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "õÄÁÌÉÔØ ÎÅÍÅÄÌÅÎÎÏ?"
 
-#: src/file-manager/fm-directory-view.c:2617
-#: src/file-manager/fm-directory-view.c:2658
-msgid "Delete"
-msgstr "õÄÁÌÉÔØ"
-
-#: src/file-manager/fm-directory-view.c:2647
+#: src/file-manager/fm-directory-view.c:2799
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr ""
 "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÏËÏÎÞÁÔÅÌØÎÏ ÕÄÁÌÉÔØ \"%s\" ÜÌÅÍÅÎÔÏ× ÉÚ ÍÕÓÏÒÎÏÊ "
 "ËÏÒÚÉÎÙ?"
 
-#: src/file-manager/fm-directory-view.c:2651
+#: src/file-manager/fm-directory-view.c:2803
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
@@ -6457,74 +6843,214 @@ msgstr ""
 "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÏËÏÎÞÁÔÅÌØÎÏ ÕÄÁÌÉÔØ %d ×ÙÄÅÌÅÎÎÙÈ ÜÌÅÍÅÎÔÏ× ÉÚ "
 "ÍÕÓÏÒÎÏÊ ËÏÒÚÉÎÙ?"
 
-#: src/file-manager/fm-directory-view.c:2657
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "õÄÁÌÉÔØ ÉÚ ÍÕÓÏÒÎÏÊ ËÏÒÚÉÎÙ?"
 
-#: src/file-manager/fm-directory-view.c:2930
-#: src/file-manager/fm-directory-view.c:2970
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "éÓÐÏÌØÚÏ×ÁÔØ \"%s\" ÄÌÑ ÏÔËÒÙÔÉÑ ×ÙÂÒÁÎÎÏÇÏ ÜÌÅÍÅÎÔÁ"
 
-#: src/file-manager/fm-directory-view.c:3172
-msgid "Open in _New Window"
-msgstr "ïÔËÒÙÔØ × ÎÏ×ÏÍ ÏËÎÅ"
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "äÒÕÇÏÅ ÐÒÉÌÏÖÅÎÉÅ..."
+
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "äÒÕÇÏÅ ÐÒÉÌÏÖÅÎÉÅ..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "äÒÕÇÁÑ ÐÒÏÇÒÁÍÍÁ ÐÒÏÓÍÏÔÒÁ..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "äÒÕÇÁÑ ÐÒÏÇÒÁÍÍÁ ÐÒÏÓÍÏÔÒÁ..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "éÓÐÏÌØÚÏ×ÁÔØ \"%s\" ÄÌÑ ÏÔËÒÙÔÉÑ ×ÙÂÒÁÎÎÏÇÏ ÜÌÅÍÅÎÔÁ"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "Nautilus ÎÅ ÕÄÁÌÏÓØ ÐÏÄËÌÀÞÉÔØ ÕËÁÚÁÎÎÙÊ ÒÁÚÄÅÌ."
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3174
+#: src/file-manager/fm-directory-view.c:3693
 #, c-format
-msgid "Open in %d _New Windows"
-msgstr "ïÔËÒÙÔØ × %d ÎÏ×ÙÈ ÏËÎÁÈ"
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3200
-msgid "Delete all selected items permanently"
-msgstr "ïËÏÎÞÁÔÅÌØÎÏ ÕÄÁÌÉÔØ ×ÓÅ ×ÙÄÅÌÅÎÎÙÅ ÜÌÅÍÅÎÔÙ"
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"%d ×ÙÂÒÁÎÎÙÈ ÜÌÅÍÅÎÔÏ× ÎÅ ÍÏÇÕÔ ÂÙÔØ ÐÅÒÅÍÅÝÅÎÙ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ. èÏÔÉÔÅ "
+"ÕÄÁÌÉÔØ ÉÈ ÎÅÍÅÄÌÅÎÎÏ?"
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "ïÔËÒÙÔØ × ÎÏ×ÏÍ ÏËÎÅ"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#, fuzzy
+msgid "Open _in New Window"
+msgstr "ïÔËÒÙÔØ × ÎÏ×ÏÍ ÏËÎÅ"
+
+#: src/file-manager/fm-directory-view.c:3959
+#, fuzzy, c-format
+msgid "Open _in %d New Windows"
+msgstr "ïÔËÒÙÔØ × %d ÎÏ×ÙÈ ÏËÎÁÈ"
 
-#: src/file-manager/fm-directory-view.c:3205
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "õÄÁÌÉÔØ ÉÚ ÍÕÓÏÒÎÏÊ ËÏÒÚÉÎÙ..."
 
-#: src/file-manager/fm-directory-view.c:3206
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "õÄÁÌÉÔØ ÉÚ ÍÕÓÏÒÎÏÊ ËÏÒÚÉÎÙ"
 
-#: src/file-manager/fm-directory-view.c:3210
-msgid "Move all selected items to the Trash"
-msgstr "ðÅÒÅÍÅÓÔÉÔØ ×ÓÅ ×ÙÄÅÌÅÎÎÙÅ ÜÌÅÍÅÎÔÙ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ"
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "ïËÏÎÞÁÔÅÌØÎÏ ÕÄÁÌÉÔØ ×ÓÅ ×ÙÄÅÌÅÎÎÙÅ ÜÌÅÍÅÎÔÙ"
 
-#: src/file-manager/fm-directory-view.c:3214
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ"
 
-#: src/file-manager/fm-directory-view.c:3244
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "ðÅÒÅÍÅÓÔÉÔØ ×ÓÅ ×ÙÄÅÌÅÎÎÙÅ ÜÌÅÍÅÎÔÙ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ"
+
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "õÄÁÌÉÔØ"
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "õÄÁÌÉÔØ"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "óÏÚÄÁÔØ ÓÓÙÌËÉ"
 
-#: src/file-manager/fm-directory-view.c:3245
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "óÏÚÄÁÔØ ÓÓÙÌËÕ"
 
-#: src/file-manager/fm-directory-view.c:3263
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "ïÞÉÓÔÉÔØ ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ..."
 
-#: src/file-manager/fm-directory-view.c:3264
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "ïÞÉÓÔÉÔØ ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ"
 
-#: src/file-manager/fm-directory-view.c:3275
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "õÄÁÌÉÔØ ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÅ ÉÚÏÂÒÁÖÅÎÉÑ"
 
-#: src/file-manager/fm-directory-view.c:3276
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "õÄÁÌÉÔØ ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÅ ÉÚÏÂÒÁÖÅÎÉÅ"
 
-#: src/file-manager/fm-directory-view.c:3429
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "æÁÊÌ"
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u ÆÁÊÌÏ×"
+
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "óËÏÐÉÒÏ×ÁÔØ ÔÅËÓÔ"
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "ëÏÐÉÒÏ×ÁÎÉÅ ÆÁÊÌÏ×"
+
+#: src/file-manager/fm-directory-view.c:4252
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
 "link in the Trash?"
@@ -6532,41 +7058,43 @@ msgstr ""
 "üÔÁ ÓÓÙÌËÁ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ, ÐÏÓËÏÌØËÕ ÏÎÁ ÎÅ ÉÍÅÅÔ ÃÅÌÉ. èÏÔÉÔÅ "
 "ÐÅÒÅÍÅÓÔÉÔØ ÅÅ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ?"
 
-#: src/file-manager/fm-directory-view.c:3432
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
 "want to put this link in the Trash?"
-msgstr "üÔÁ ÓÓÙÌËÁ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ, ÐÏÓËÏÌØËÕ ÃÅÌØ \"%s\" ÎÅ ÓÕÝÅÓÔ×ÕÅÔ. èÏÔÉÔÅ ÐÅÒÅÍÅÓÔÉÔØ ÅÅ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ?"
+msgstr ""
+"üÔÁ ÓÓÙÌËÁ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ, ÐÏÓËÏÌØËÕ ÃÅÌØ \"%s\" ÎÅ ÓÕÝÅÓÔ×ÕÅÔ. "
+"èÏÔÉÔÅ ÐÅÒÅÍÅÓÔÉÔØ ÅÅ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ?"
 
-#: src/file-manager/fm-directory-view.c:3438
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "éÓÐÏÒÞÅÎÎÁÑ ÓÓÙÌËÁ"
 
-#: src/file-manager/fm-directory-view.c:3439
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3492
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
 "contents?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3498
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr "úÁÐÕÓÔÉÔØ ÉÌÉ ÐÏËÁÚÁÔØ?"
 
-#: src/file-manager/fm-directory-view.c:3499
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "úÁÐÕÓÔÉÔØ"
 
-#: src/file-manager/fm-directory-view.c:3500
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "ðÏËÁÚÁÔØ"
 
-#: src/file-manager/fm-directory-view.c:3554
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
@@ -6574,16 +7102,16 @@ msgstr ""
 "éÚ×ÉÎÉÔÅ, ÎÏ ×Ù ÎÅ ÍÏÖÅÔÅ ×ÙÐÏÌÎÑÔØ ËÏÍÁÎÄÙ Ó ÕÄÁÌÅÎÎÏÊ ÓÔÏÒÏÎÙ ÉÚ-ÚÁ "
 "ÓÏÇÌÁÛÅÎÉÊ ÂÅÚÏÐÁÓÎÏÓÔÉ."
 
-#: src/file-manager/fm-directory-view.c:3556
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ ÕÄÁÌÅÎÎÙÅ ÓÓÙÌËÉ"
 
-#: src/file-manager/fm-directory-view.c:3690
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr "ïÔËÒÙÔÉÅ \"%s\""
 
-#: src/file-manager/fm-directory-view.c:3696
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "ïÔÍÅÎÉÔØ ÏÔËÒÙÔÉÅ?"
 
@@ -6593,16 +7121,21 @@ msgid ""
 "You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "õ ×ÁÓ ÎÅÄÏÓÔÁÔÏÞÎÏ ÐÒÁ× ÄÌÑ ÐÒÏÓÍÏÔÒÁ ÓÏÄÅÒÖÉÍÏÇÏ \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:65
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "éÚ×ÉÎÉÔÅ, ÎÅ×ÏÚÍÏÖÎÏ ÐÏËÁÚÁÔØ ×ÓÅ ÓÏÄÅÒÖÉÍÏÅ \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "ïÛÉÂËÁ ÏÔÏÂÒÁÖÅÎÉÑ ÐÁÐËÉ"
 
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
@@ -6610,19 +7143,19 @@ msgstr ""
 "îÁÚ×ÁÎÉÅ \"%s\" ÕÖÅ ÉÓÐÏÌØÚÕÅÔÓÑ × ÜÔÏÍ ËÁÔÁÌÏÇÅ. ðÏÖÁÌÕÊÓÔÁ, ×ÙÂÅÒÉÔÅ "
 "ÄÒÕÇÏÅ ÎÁÚ×ÁÎÉÅ."
 
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 "îÅÔ \"%s\" × ÜÔÏÊ ÐÁÐËÅ. ÷ÏÚÍÏÖÎÏ ÏÎ ÂÙÌ ÔÏÌØËÏ ÞÔÏ ÐÅÒÅÍÅÝÅÎ ÉÌÉ ÕÄÁÌÅÎ?"
 
-#: src/file-manager/fm-error-reporting.c:109
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "õ ×ÁÓ ÎÅÄÏÓÔÁÔÏÞÎÏ ÐÒÁ× ÄÌÑ ÐÅÒÅÉÍÅÎÏ×ÁÎÉÑ \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -6631,67 +7164,67 @@ msgstr ""
 "îÁÚ×ÁÎÉÅ \"%s\" ÎÅ ÄÏÐÕÓÔÉÍÏ, ÐÏÔÏÍÕ ÞÔÏ ÏÎ ÓÏÄÅÒÖÉÔ ÓÉÍ×ÏÌ \"/\".\n"
 "ðÏÖÁÌÕÊÓÔÁ, ×ÙÂÅÒÉÔÅ ÄÒÕÇÏÅ ÎÁÚ×ÁÎÉÅ."
 
-#: src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr ""
 "îÁÚ×ÁÎÉÅ \"%s\" ÎÅ ÄÏÐÕÓÔÉÍÏ.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ×ÙÂÅÒÉÔÅ ÄÒÕÇÏÅ ÎÁÚ×ÁÎÉÅ."
 
-#: src/file-manager/fm-error-reporting.c:124
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "îÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÎÁÚ×ÁÎÉÅ ÄÌÑ \"%s\", ÐÏÔÏÍÕ ÞÔÏ ÜÔÏ ÄÉÓË ÔÏÌØËÏ ÄÌÑ "
 "ÞÔÅÎÉÑ."
 
-#: src/file-manager/fm-error-reporting.c:133
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "éÚ×ÉÎÉÔÅ, ÎÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÉÍÅÎÏ×ÁÔØ \"%s\" × \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:140
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "ïÛÉÂËÁ ÐÅÒÅÉÍÅÎÏ×ÁÎÉÑ"
 
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "õ ×ÁÓ ÎÅÄÏÓÔÁÔÏÞÎÏ ÐÒÁ× ÄÌÑ ÉÚÍÅÎÅÎÉÑ ÇÒÕÐÐÙ \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
 "îÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÇÒÕÐÐÕ ÄÌÑ \"%s\", ÐÏÔÏÍÕ ÞÔÏ ÜÔÏ ÄÉÓË ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ."
 
-#: src/file-manager/fm-error-reporting.c:172
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "éÚ×ÉÎÉÔÅ, ÎÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÇÒÕÐÐÕ ÄÌÑ \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:176
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "ïÛÉÂËÁ ÕÓÔÁÎÏ×ËÉ ÇÒÕÐÐÙ"
 
-#: src/file-manager/fm-error-reporting.c:198
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
 "îÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ×ÌÁÄÅÌØÃÁ ÄÌÑ \"%s\", ÐÏÔÏÍÕ ÞÔÏ ÜÔÏ ÄÉÓË ÔÏÌØËÏ ÄÌÑ "
 "ÞÔÅÎÉÑ."
 
-#: src/file-manager/fm-error-reporting.c:205
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "éÚ×ÉÎÉÔÅ, ÎÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ×ÌÁÄÅÌØÃÁ ÄÌÑ \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "ïÛÉÂËÁ ÕÓÔÁÎÏ×ËÉ ×ÌÁÄÅÌØÃÁ"
 
-#: src/file-manager/fm-error-reporting.c:230
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
@@ -6699,21 +7232,21 @@ msgstr ""
 "éÚ×ÉÎÉÔÅ, ÎÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÐÒÁ×Á ÄÌÑ \"%s\", ÐÏÔÏÍÕ ÞÔÏ ÜÔÏ ÄÉÓË ÔÏÌØËÏ "
 "ÄÌÑ ÞÔÅÎÉÑ"
 
-#: src/file-manager/fm-error-reporting.c:237
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "éÚ×ÉÎÉÔÅ, ÎÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÐÒÁ×Á ÄÌÑ \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "ïÛÉÂËÁ ÕÓÔÁÎÏ×ËÉ ÐÒÁ×"
 
-#: src/file-manager/fm-error-reporting.c:306
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "ðÅÒÅÉÍÅÎÏ×ÁÎÉÅ \"%s\" × \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:311
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "ïÔÍÅÎÉÔØ ÐÅÒÅÉÍÅÎÏ×ÁÎÉÅ?"
 
@@ -6773,120 +7306,120 @@ msgstr ""
 "÷ÙÂÅÒÉÔÅ ÐÏÒÑÄÏË, × ËÏÔÏÒÏÍ ÉÎÆÏÒÍÁÃÉÑ ÂÕÄÅÔ ×ÏÚÎÉËÁÔØ ÐÏÄ ÎÁÚ×ÁÎÉÑÍÉ "
 "ÐÉËÔÏÇÒÁÍÍ. ðÒÉ Õ×ÅÌÉÞÅÎÉÉ ÍÁÓÛÔÁÂÁ ÂÕÄÅÔ ÐÏÑ×ÌÑÔØÓÑ ÂÏÌØÛÅ ÉÎÆÏÒÍÁÃÉÉ."
 
-#: src/file-manager/fm-icon-view.c:157
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "ÐÏ ÉÍÅÎÉ"
 
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "óÏÈÒÁÎÉÔØ ÐÉËÔÏÇÒÁÍÍÙ ÏÔÓÏÒÔÉÒÏ×ÁÎÎÙÍÉ ÐÏ ÉÍÅÎÉ × ÓÔÒÏËÁÈ"
 
-#: src/file-manager/fm-icon-view.c:164
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "ÐÏ ÒÁÚÍÅÒÕ"
 
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "óÏÈÒÁÎÉÔØ ÐÉËÔÏÇÒÁÍÍÙ ÏÔÓÏÒÔÉÒÏ×ÁÎÎÙÍÉ ÐÏ ÒÁÚÍÅÒÕ × ÓÔÒÏËÁÈ"
 
-#: src/file-manager/fm-icon-view.c:171
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "ÐÏ ÔÉÐÕ"
 
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "óÏÈÒÁÎÉÔØ ÐÉËÔÏÇÒÁÍÍÙ ÏÔÓÏÒÔÉÒÏ×ÁÎÎÙÍÉ ÐÏ ÔÉÐÕ × ÓÔÒÏËÁÈ"
 
-#: src/file-manager/fm-icon-view.c:178
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "ÐÏ ÄÁÔÅ ÉÚÍÅÎÅÎÉÑ"
 
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "óÏÈÒÁÎÉÔØ ÐÉËÔÏÇÒÁÍÍÙ ÏÔÓÏÒÔÉÒÏ×ÁÎÎÙÍÉ ÐÏ ÄÁÔÅ ÉÚÍÅÎÅÎÉÑ × ÓÔÒÏËÁÈ"
 
-#: src/file-manager/fm-icon-view.c:185
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "ÐÏ ÜÍÂÌÅÍÁÍ"
 
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "óÏÈÒÁÎÉÔØ ÐÉËÔÏÇÒÁÍÍÙ ÏÔÓÏÒÔÉÒÏ×ÁÎÎÙÍÉ ÐÏ ÜÍÂÌÅÍÁÍ × ÓÔÒÏËÁÈ"
 
-#: src/file-manager/fm-icon-view.c:1229
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ ÉÓÈÏÄÎÙÅ ÒÁÚÍÅÒÙ ÐÉËÔÏÇÒÁÍÍ"
 
-#: src/file-manager/fm-icon-view.c:1230
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ ÉÓÈÏÄÎÙÊ ÒÁÚÍÅÒ ÐÉËÔÏÇÒÁÍÍÙ"
 
-#: src/file-manager/fm-icon-view.c:1442
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "ÕËÁÚÁÎÉÅ ÎÁ \"%s\""
 
-#: src/file-manager/fm-list-view.c:2128
+#: src/file-manager/fm-list-view.c:2188
 #: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "òÁÚÍÅÒ"
 
-#: src/file-manager/fm-list-view.c:2134
+#: src/file-manager/fm-list-view.c:2194
 #: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "ôÉÐ"
 
-#: src/file-manager/fm-list-view.c:2140
+#: src/file-manager/fm-list-view.c:2200
 #: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "äÁÔÁ ÍÏÄÉÆÉËÁÃÉÉ"
 
-#: src/file-manager/fm-properties-window.c:521
+#: src/file-manager/fm-properties-window.c:522
 #, c-format
 msgid "%s Properties"
 msgstr "%s Ó×ÏÊÓÔ×Á"
 
-#: src/file-manager/fm-properties-window.c:716
+#: src/file-manager/fm-properties-window.c:717
 msgid "Cancel Group Change?"
 msgstr "ïÔÍÅÎÉÔØ ÓÍÅÎÕ ÇÒÕÐÐÙ?"
 
-#: src/file-manager/fm-properties-window.c:717
+#: src/file-manager/fm-properties-window.c:718
 msgid "Changing group"
 msgstr "éÚÍÅÎÅÎÉÅ ÇÒÕÐÐÙ"
 
-#: src/file-manager/fm-properties-window.c:878
+#: src/file-manager/fm-properties-window.c:879
 msgid "Cancel Owner Change?"
 msgstr "ïÔÍÅÎÉÔØ ÓÍÅÎÕ ×ÌÁÄÅÌØÃÁ?"
 
-#: src/file-manager/fm-properties-window.c:879
+#: src/file-manager/fm-properties-window.c:880
 msgid "Changing owner"
 msgstr "éÚÍÅÎÅÎÉÅ ×ÌÁÄÅÌØÃÁ"
 
-#: src/file-manager/fm-properties-window.c:1054
+#: src/file-manager/fm-properties-window.c:1063
 msgid "nothing"
 msgstr "ÎÉÞÅÇÏ"
 
-#: src/file-manager/fm-properties-window.c:1056
+#: src/file-manager/fm-properties-window.c:1065
 msgid "unreadable"
 msgstr "ÎÅÞÉÔÁÅÍÏÅ"
 
-#: src/file-manager/fm-properties-window.c:1065
+#: src/file-manager/fm-properties-window.c:1074
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 ÜÌÅÍÅÎÔ, ÒÁÚÍÅÒ %s"
 
-#: src/file-manager/fm-properties-window.c:1067
+#: src/file-manager/fm-properties-window.c:1076
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d ÜÌÅÍÅÎÔÏ×, Ó ÏÂÝÉÍ ÒÁÚÍÅÒÏÍ %s"
 
-#: src/file-manager/fm-properties-window.c:1073
+#: src/file-manager/fm-properties-window.c:1082
 msgid "(some contents unreadable)"
 msgstr "(ÎÅËÏÔÏÒÏÅ ÓÏÄÅÒÖÁÎÉÅ ÎÅ ÞÉÔÁÅÍÏ)"
 
@@ -6895,124 +7428,130 @@ msgstr "(ÎÅËÏÔÏÒÏÅ ÓÏÄÅÒÖÁÎÉÅ ÎÅ ÞÉÔÁÅÍÏ)"
 #. * "Contents:" title to line up with the first line of the 2-line value.
 #. * Maybe there's a better way to do this, but I couldn't think of one.
 #.
-#: src/file-manager/fm-properties-window.c:1087
+#: src/file-manager/fm-properties-window.c:1096
 msgid "Contents:"
 msgstr "óÏÄÅÒÖÁÎÉÅ:"
 
-#: src/file-manager/fm-properties-window.c:1420
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "ïÓÎÏ×Á"
 
-#: src/file-manager/fm-properties-window.c:1499
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "ôÉÐ:"
 
-#: src/file-manager/fm-properties-window.c:1504
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "òÁÚÍÅÒ:"
 
-#: src/file-manager/fm-properties-window.c:1508
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "îÁÂÏÒÙ ÓÓÙÌÏË"
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
 msgstr "MIME-ÔÉÐ:"
 
-#: src/file-manager/fm-properties-window.c:1514
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "éÚÍÅÎÅÎÏ:"
 
-#: src/file-manager/fm-properties-window.c:1517
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "äÁÔÁ ÄÏÓÔÕÐÁ:"
 
-#: src/file-manager/fm-properties-window.c:1526
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr "÷ÙÂÒÁÔØ ÄÒÕÇÕÀ ÐÉËÔÏÇÒÁÍÍÕ..."
 
-#: src/file-manager/fm-properties-window.c:1532
+#: src/file-manager/fm-properties-window.c:1558
 msgid "Remove Custom Icon"
 msgstr "õÄÁÌÉÔØ ÄÒÕÇÕÀ ÐÉËÔÏÇÒÁÍÍÕ"
 
-#: src/file-manager/fm-properties-window.c:1860
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "õÓÔÁÎÏ×ÉÔØ ID ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: src/file-manager/fm-properties-window.c:1865
+#: src/file-manager/fm-properties-window.c:1891
 msgid "Special Flags:"
 msgstr "ïÓÏÂÙÅ ÆÌÁÇÉ:"
 
-#: src/file-manager/fm-properties-window.c:1868
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "õÓÔÁÎÏ×ÉÔØ ID ÇÒÕÐÐÙ"
 
-#: src/file-manager/fm-properties-window.c:1870
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "Sticky"
 
-#: src/file-manager/fm-properties-window.c:1896
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "ðÒÁ×Á"
 
-#: src/file-manager/fm-properties-window.c:1902
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "÷Ù ÎÅ Ñ×ÌÑÅÔÅÓØ ×ÌÁÄÅÌØÃÅÍ, ÐÏÜÔÏÍÕ ×Ù ÎÅ ÍÏÖÅÔÅ ÉÚÍÅÎÉÔØ ÜÔÉ ÐÒÁ×Á."
 
-#: src/file-manager/fm-properties-window.c:1915
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "÷ÌÁÄÅÌÅà ÆÁÊÌÁ:"
 
-#: src/file-manager/fm-properties-window.c:1924
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "çÒÕÐÐÁ ÆÁÊÌÁ:"
 
-#: src/file-manager/fm-properties-window.c:1942
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "÷ÌÁÄÅÌÅÃ:"
 
-#: src/file-manager/fm-properties-window.c:1943
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "çÒÕÐÐÁ:"
 
-#: src/file-manager/fm-properties-window.c:1944
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "ïÓÔÁÌØÎÙÅ:"
 
-#: src/file-manager/fm-properties-window.c:1963
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "ðÒÏÞÅÓÔØ"
 
-#: src/file-manager/fm-properties-window.c:1967
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "úÁÐÉÓÁÔØ"
 
-#: src/file-manager/fm-properties-window.c:1971
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "÷ÙÐÏÌÎÉÔØ"
 
-#: src/file-manager/fm-properties-window.c:2022
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "ðÒÏÓÍÏÔÒ ÔÅËÓÔÁ:"
 
-#: src/file-manager/fm-properties-window.c:2023
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "ðÒÏÓÍÏÔÒ ÞÉÓÌÁ:"
 
-#: src/file-manager/fm-properties-window.c:2024
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "ðÏÓÌÅÄÎÉÅ ÉÚÍÅÎÅÎÉÑ:"
 
-#: src/file-manager/fm-properties-window.c:2028
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "ðÒÁ×Á ÄÌÑ \"%s\" ÎÅ ÍÏÇÕÔ ÂÙÔØ ÏÐÒÅÄÅÌÅÎÙ."
 
-#: src/file-manager/fm-properties-window.c:2308
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr "ïÔÍÅÎÉÔØ ÐÏËÁÚ ÏËÎÁ Ó×ÏÊÓÔ×?"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr "óÏÚÄÁÎÉÅ ÏËÎÁ Ó×ÏÊÓÔ×"
 
-#: src/file-manager/fm-properties-window.c:2409
+#: src/file-manager/fm-properties-window.c:2435
 msgid "Select an icon:"
 msgstr "÷ÙÂÅÒÉÔÅ ÐÉËÔÏÇÒÁÍÍÕ:"
 
@@ -7038,7 +7577,7 @@ msgstr ""
 "ÕÓÔÁÎÏ×ÌÅÎ."
 
 #: src/file-manager/fm-search-list-view.c:159
-#: src/file-manager/nautilus-indexing-info.c:405
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr "óÅÒ×ÉÓ ÐÏÉÓËÁ ÎÅÄÏÓÔÕÐÅÎ"
 
@@ -7178,7 +7717,7 @@ msgstr ""
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
 #: src/file-manager/fm-search-list-view.c:360
-#: src/file-manager/nautilus-indexing-info.c:340
+#: src/file-manager/nautilus-indexing-info.c:342
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
@@ -7190,20 +7729,20 @@ msgid "Fast searches are not available on your computer"
 msgstr "âÙÓÔÒÙÊ ÐÏÉÓË ÎÅÄÏÓÔÕÐÅÎ ÎÁ ×ÁÛÅÍ ËÏÍÐØÀÔÅÒÅ"
 
 #: src/file-manager/fm-search-list-view.c:373
-#: src/file-manager/nautilus-indexing-info.c:359
+#: src/file-manager/nautilus-indexing-info.c:361
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Fast search is disabled in your Search preferences, so no index is available."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:376
-#: src/file-manager/nautilus-indexing-info.c:345
-#: src/file-manager/nautilus-indexing-info.c:363
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
 msgid "Fast searches are not available on your computer."
 msgstr "âÙÓÔÒÙÊ ÐÏÉÓË ÎÅÄÏÓÔÕÐÅÎ ÎÁ ×ÁÛÅÍ ËÏÍÐØÀÔÅÒÅ."
 
 #: src/file-manager/fm-search-list-view.c:377
-#: src/file-manager/nautilus-indexing-info.c:364
+#: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
 "To enable fast search, open the Preferences menu and choose Preferences. "
 "Then select Search preferences and put a checkmark in the Enable Fast Search "
@@ -7255,7 +7794,7 @@ msgid "Change Desktop Background"
 msgstr "éÚÍÅÎÉÔØ ÆÏÎ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Delete all items in the Trash"
 msgstr "õÄÁÌÉÔØ ×ÓÅ ÜÌÅÍÅÎÔÙ ÉÚ ÍÕÓÏÒÎÏÊ ËÏÒÚÉÎÙ"
 
@@ -7303,140 +7842,195 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "÷ÙÂÅÒÉÔÅ ÄÒÕÇÕÀ ÐÒÏÇÒÁÍÍÕ ÐÒÏÓÍÏÔÒÁ ÄÌÑ ÏÔËÒÙÔÉÑ ×ÙÂÒÁÎÎÏÇÏ ÜÌÅÍÅÎÔÁ"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-msgid "Create Link"
-msgstr "óÏÚÄÁÔØ ÓÓÙÌËÕ"
+#, fuzzy
+msgid "Copy Files"
+msgstr "ëÏÐÉÒÏ×ÁÎÉÅ ÆÁÊÌÏ×"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "óÏÚÄÁÔØ ÎÏ×ÕÀ ÐÕÓÔÕÀ ÐÁÐËÕ × ÜÔÏÊ ÐÁÐËÅ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "óÏÚÄÁÔØ ÓÉÍ×ÏÌÉÞÅÓËÕÀ ÓÓÙÌËÕ ÄÌÑ ËÁÖÄÏÇÏ ×ÙÄÅÌÅÎÎÏÇÏ ÜÌÅÍÅÎÔÁ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u ÆÁÊÌÏ×"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "ðÅÒÅÍÅÓÔÉÔØ ËÁÖÄÙÊ ×ÙÄÅÌÅÎÎÙÊ ÜÌÅÍÅÎÔ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "ðÒÏÄÕÂÌÉÒÏ×ÁÔØ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "ðÒÏÄÕÂÌÉÒÏ×ÁÔØ ËÁÖÄÙÊ ×ÙÄÅÌÅÎÎÙÊ ÜÌÅÍÅÎÔ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "óÏÚÄÁÔØ ÓÓÙÌËÕ"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ ËÁÖÄÙÊ ×ÙÄÅÌÅÎÎÙÊ ÜÌÅÍÅÎÔ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Move to Trash"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "îÏ×ÁÑ ÐÁÐËÁ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
-msgid "New _Folder"
-msgstr "îÏ×ÁÑ ÐÁÐËÁ"
-
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "ïÔËÒÙÔØ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#, fuzzy
+msgid "Open Wit_h"
+msgstr "ïÔËÒÙÔØ Ó ÐÏÍÏÝØÀ"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "ïÔËÒÙÔØ Ó ÐÏÍÏÝØÀ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "ïÔËÒÙÔØ ËÁÖÄÙÊ ×ÙÄÅÌÅÎÎÙÊ ÜÌÅÍÅÎÔ × ÎÏ×ÏÍ ÏËÎÅ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr "ïÔËÒÙÔØ × ÎÏ×ÏÍ ÏËÎÅ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "ïÔËÒÙÔØ ×ÙÂÒÁÎÎÙÊ ÜÌÅÍÅÎÔ × ÜÔÏÍ ÏËÎÅ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "äÒÕÇÉÅ ÐÒÉÌÏÖÅÎÉÑ..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "äÒÕÇÉÅ ÐÒÏÇÒÁÍÍÙ ÐÒÏÓÍÏÔÒÁ..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
-msgid "Other _Application..."
-msgstr "äÒÕÇÏÅ ÐÒÉÌÏÖÅÎÉÅ..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "ÔÅËÓÔÏ×ÙÅ ÆÁÊÌÙ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Other _Viewer..."
-msgstr "äÒÕÇÁÑ ÐÒÏÇÒÁÍÍÁ ÐÒÏÓÍÏÔÒÁ..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr "õÄÁÌÉÔØ ÄÒÕÇÉÅ ÉÚÏÂÒÁÖÅÎÉÑ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr "õÄÁÌÉÔØ ÄÒÕÇÉÅ ÉÚÏÂÒÁÖÅÎÉÑ ÉÚ ×ÙÂÒÁÎÎÙÈ ÐÉËÔÏÇÒÁÍÍ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr ""
 
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "óÂÒÏÓÉÔØ ÆÏÎ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#, fuzzy
+msgid "Scripts"
+msgstr "óÅËÒÅÔ"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr "÷ÙÄÅÌÉÔØ ×ÓÅ ÆÁÊÌÙ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#, fuzzy
+msgid "Select _All Files"
+msgstr "÷ÙÄÅÌÉÔØ ×ÓÅ ÆÁÊÌÙ"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "÷ÙÄÅÌÉÔØ ×ÓÅ ÜÌÅÍÅÎÔÙ × ÜÔÏÍ ÏËÎÅ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr "ðÏËÁÚÁÔØ Ó×ÏÊÓÔ×Á"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Show Trash"
 msgstr "ðÏËÁÚÁÔØ ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "ðÏËÁÚÁÔØ Ó×ÏÊÓÔ×Á"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "Show the contents of the Trash"
 msgstr "ðÏËÁÚÁÔØ ÓÏÄÅÒÖÉÍÏÅ ÍÕÓÏÒÎÏÊ ËÏÒÚÉÎÙ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "ðÒÏÓÍÏÔÒ ÉÌÉ ÉÚÍÅÎÅÎÉÅ Ó×ÏÊÓÔ× ËÁÖÄÏÇÏ ×ÙÄÅÌÅÎÎÏÇÏ ÜÌÅÍÅÎÔÁ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "ðÒÏÄÕÂÌÉÒÏ×ÁÔØ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#, fuzzy
+msgid "_New Folder"
+msgstr "îÏ×ÁÑ ÐÁÐËÁ"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "ïÔËÒÙÔØ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
-msgid "_Open in New Window"
-msgstr "ïÔËÒÙÔØ × ÎÏ×ÏÍ ÏËÎÅ"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
-msgid "_Select All Files"
-msgstr "÷ÙÄÅÌÉÔØ ×ÓÅ ÆÁÊÌÙ"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "÷ÓÔÁ×ÉÔØ ÔÅËÓÔ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Show Trash"
 msgstr "ðÏËÁÚÁÔØ ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ"
 
@@ -7591,7 +8185,9 @@ msgstr "éÎÄÅËÓÁÔÏÒ ÚÁÎÑÔ."
 msgid ""
 "An indexer is not running, or is not responding to requests to reindex your "
 "computer."
-msgstr "éÎÄÅËÓÁÔÏÒ ÎÅ ÚÁÐÕÝÅÎ ÉÌÉ ÎÅ ÏÔ×ÅÞÁÅÔ ÎÁ ÚÁÐÒÏÓÙ ÒÅÉÎÄÅËÓÉÒÏ×ÁÎÉÑ ×ÁÛÅÇÏ ËÏÍÐØÀÔÅÒÁ."
+msgstr ""
+"éÎÄÅËÓÁÔÏÒ ÎÅ ÚÁÐÕÝÅÎ ÉÌÉ ÎÅ ÏÔ×ÅÞÁÅÔ ÎÁ ÚÁÐÒÏÓÙ ÒÅÉÎÄÅËÓÉÒÏ×ÁÎÉÑ ×ÁÛÅÇÏ "
+"ËÏÍÐØÀÔÅÒÁ."
 
 #: src/file-manager/nautilus-indexing-info.c:185
 msgid ""
@@ -7610,11 +8206,14 @@ msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. If you need to update your index now, click on the \"Update Now\" "
 "button."
-msgstr "òÁÚ × ÄÅÎØ ×ÁÛÉ ÆÁÊÌÙ É ÔÅËÓÔÏ×ÏÅ ÓÏÄÅÒÖÉÍÏÅ ÉÎÄÅËÓÉÒÕÀÔÓÑ ÄÌÑ ÕÓËÏÒÅÎÉÑ ÐÏÉÓËÁ. åÓÌÉ ×ÁÍ ÎÁÄÏ ÏÂÎÏ×ÉÔØ ÉÎÄÅËÓ ÓÅÊÞÁÓ, ÎÁÖÍÉÔÅ ËÎÏÐËÕ \"ïÂÎÏ×ÉÔØ ÓÅÊÞÁÓ\"."
+msgstr ""
+"òÁÚ × ÄÅÎØ ×ÁÛÉ ÆÁÊÌÙ É ÔÅËÓÔÏ×ÏÅ ÓÏÄÅÒÖÉÍÏÅ ÉÎÄÅËÓÉÒÕÀÔÓÑ ÄÌÑ ÕÓËÏÒÅÎÉÑ "
+"ÐÏÉÓËÁ. åÓÌÉ ×ÁÍ ÎÁÄÏ ÏÂÎÏ×ÉÔØ ÉÎÄÅËÓ ÓÅÊÞÁÓ, ÎÁÖÍÉÔÅ ËÎÏÐËÕ \"ïÂÎÏ×ÉÔØ "
+"ÓÅÊÞÁÓ\"."
 
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr "óÏÓÔÏÑÎÉÅ ÉÎÄÅËÓÉÒÏ×ÁÎÉÑ"
 
@@ -7623,18 +8222,20 @@ msgstr "óÏÓÔÏÑÎÉÅ ÉÎÄÅËÓÉÒÏ×ÁÎÉÑ"
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
-msgstr "òÁÚ × ÄÅÎØ ×ÁÛÉ ÆÁÊÌÙ É ÔÅËÓÔÏ×ÏÅ ÓÏÄÅÒÖÉÍÏÅ ÉÎÄÅËÓÉÒÕÀÔÓÑ ÄÌÑ ÕÓËÏÒÅÎÉÑ ÐÏÉÓËÁ."
+msgstr ""
+"òÁÚ × ÄÅÎØ ×ÁÛÉ ÆÁÊÌÙ É ÔÅËÓÔÏ×ÏÅ ÓÏÄÅÒÖÉÍÏÅ ÉÎÄÅËÓÉÒÕÀÔÓÑ ÄÌÑ ÕÓËÏÒÅÎÉÑ "
+"ÐÏÉÓËÁ."
 
 #: src/file-manager/nautilus-indexing-info.c:236
 #, c-format
 msgid "Your files were last indexed at %s"
 msgstr "÷ÁÛÉ ÆÁÊÌÙ ÂÙÌÉ × ÐÏÓÌÅÄÎÉÊ ÒÁÚ ÐÒÏÉÎÄÅËÓÉÒÏ×ÁÎÙ %s"
 
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "ïÂÎÏ×ÉÔØ ÓÅÊÞÁÓ"
 
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 #, fuzzy
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
@@ -7645,11 +8246,11 @@ msgstr ""
 "ÓÅÊÞÁÓ\"\n"
 "ÄÌÑ ÐÏÄÈÏÄÑÝÅÇÏ ÉÎÄÅËÓÁ."
 
-#: src/file-manager/nautilus-indexing-info.c:404
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "éÚ×ÉÎÉÔÅ, ÎÏ ÓÅÒ×ÉÓ ÐÏÉÓËÁ \"Medusa\" ÎÅÄÏÓÔÕÐÅÎ."
 
-#: src/file-manager/nautilus-indexing-info.c:426
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -7683,14 +8284,33 @@ msgstr "ï ÐÒÏÇÒÁÍÍÅ Nautilus"
 msgid "Authors"
 msgstr "á×ÔÏÒÙ"
 
-#: src/nautilus-application.c:274
+#: src/nautilus-application.c:275
 msgid "Couldn't Create Required Folder"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÔÒÅÂÕÅÍÕÀ ÐÁÐËÕ"
 
-#: src/nautilus-application.c:279
+#: src/nautilus-application.c:276
+#, c-format
+msgid ""
+"Nautilus could not create the required folder \"%s\". Before running "
+"Nautilus, please create this folder, or set permissions such that Nautilus "
+"can create it."
+msgstr ""
+
+#: src/nautilus-application.c:281
 msgid "Couldn't Create Required Folders"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÔÒÅÂÕÅÍÙÅ ÐÁÐËÉ"
 
+#: src/nautilus-application.c:282
+#, c-format
+msgid ""
+"Nautilus could not create the following required folders:\n"
+"\n"
+"%s\n"
+"\n"
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
+msgstr ""
+
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.oaf file. This has happened when you
 #. * launch Nautilus with an LD_LIBRARY_PATH that
@@ -7701,7 +8321,7 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÔÒÅÂÕÅÍÙÅ ÐÁÐËÉ"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:404
+#: src/nautilus-application.c:407
 msgid ""
 "Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
 "from the console may fix the problem. If not, you can try rebooting the "
@@ -7709,7 +8329,7 @@ msgid ""
 msgstr ""
 
 #. FIXME bugzilla.eazel.com 2536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:410
+#: src/nautilus-application.c:413
 msgid ""
 "Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
 "from the console may fix the problem. If not, you can try rebooting the "
@@ -7737,12 +8357,12 @@ msgstr ""
 #. * wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:441 src/nautilus-application.c:459
-#: src/nautilus-application.c:466
+#: src/nautilus-application.c:444 src/nautilus-application.c:462
+#: src/nautilus-application.c:469
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "îÁÕÔÉÌÕÓ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÓÅÊÞÁÓ ÉÚ-ÚÁ ÎÅÏÖÉÄÁÎÎÏÊ ÏÛÉÂËÉ."
 
-#: src/nautilus-application.c:442
+#: src/nautilus-application.c:445
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
 "attempting to register the file manager view server."
@@ -7750,7 +8370,7 @@ msgstr ""
 "îÁÕÔÉÌÕÓ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÓÅÊÞÁÓ ÉÚ-ÚÁ ÎÅÏÖÉÄÁÎÎÏÊ ÏÛÉÂËÉ × OAF ÐÒÉ "
 "ÐÏÐÙÔËÅ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÔØ ÓÅÒ×ÅÒ ÐÒÏÓÍÏÔÒÁ ÄÉÓÐÅÔÞÅÒÁ ÆÁÊÌÏ×."
 
-#: src/nautilus-application.c:460
+#: src/nautilus-application.c:463
 #, fuzzy
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
@@ -7760,7 +8380,7 @@ msgstr ""
 "îÁÕÔÉÌÕÓ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÓÅÊÞÁÓ ÉÚ-ÚÁ ÎÅÏÖÉÄÁÎÎÏÊ ÏÛÉÂËÉ × OAF ÐÒÉ "
 "ÐÏÐÙÔËÅ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÔØ ÓÅÒ×ÅÒ ÐÒÏÓÍÏÔÒÁ ÄÉÓÐÅÔÞÅÒÁ ÆÁÊÌÏ×."
 
-#: src/nautilus-application.c:467
+#: src/nautilus-application.c:470
 #, fuzzy
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
@@ -7770,7 +8390,7 @@ msgstr ""
 "îÁÕÔÉÌÕÓ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÓÅÊÞÁÓ ÉÚ-ÚÁ ÎÅÏÖÉÄÁÎÎÏÊ ÏÛÉÂËÉ × OAF ÐÒÉ "
 "ÐÏÐÙÔËÅ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÔØ ÓÅÒ×ÅÒ ÐÒÏÓÍÏÔÒÁ ÄÉÓÐÅÔÞÅÒÁ ÆÁÊÌÏ×."
 
-#: src/nautilus-application.c:632
+#: src/nautilus-application.c:635
 #, fuzzy
 msgid ""
 "You are about to run Nautilus as root.\n"
@@ -7783,10 +8403,6 @@ msgstr ""
 "ëÁË root, ×Ù ÍÏÖÅÔÅ ÒÁÚÒÕÛÉÔØ ×ÁÛÕ ÓÉÓÔÅÍÕ ÅÓÌÉ ×Ù ÎÅ ÏÓÔÏÒÏÖÎÙ É\n"
 "îÁÕÔÉÌÕÓ ÎÅ ÏÓÔÁÎÏ×ÉÔ ×ÁÓ."
 
-#: src/nautilus-application.c:636
-msgid "Quit"
-msgstr ""
-
 #: src/nautilus-bookmarks-window.c:127
 msgid "Bookmarks"
 msgstr "úÁËÌÁÄËÉ"
@@ -7795,7 +8411,7 @@ msgstr "úÁËÌÁÄËÉ"
 msgid "Location"
 msgstr "òÁÓÐÏÌÏÖÅÎÉÅ"
 
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:757
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "õÄÁÌÉÔØ"
 
@@ -7812,12 +8428,13 @@ msgstr "íÅÎØÛÅ ÐÁÒÁÍÅÔÒÏ×"
 msgid "Find Them!"
 msgstr "îÁÊÔÉ ÉÈ!"
 
-#: src/nautilus-first-time-druid.c:180
+#: src/nautilus-first-time-druid.c:191
+#, fuzzy
 msgid ""
-"Existence of this file indicates that the Nautilus configuration wizard\n"
+"Existence of this file indicates that the Nautilus configuration druid\n"
 "has been presented.\n"
 "\n"
-"You can manually erase this file to present the wizard again.\n"
+"You can manually erase this file to present the druid again.\n"
 "\n"
 msgstr ""
 "îÁÌÉÞÉÅ ÜÔÏÇÏ ÆÁÊÌÁ ÕËÁÚÙ×ÁÅÔ ÎÁ ÔÏ, ÞÔÏ ÐÏÍÏÝÎÉË ÐÏ ÎÁÓÔÒÏÊËÅ Nautilus\n"
@@ -7826,17 +8443,7 @@ msgstr ""
 "÷Ù ÍÏÖÅÔÅ ÕÄÁÌÉÔØ ÜÔÏÔ ÆÁÊÌ ×ÒÕÞÎÕÀ, ÞÔÏÂÙ ÓÎÏ×Á ÚÁÐÕÓÔÉÔØ ÐÏÍÏÝÎÉËÁ.\n"
 "\n"
 
-#. Note to localizers: this font is used for title text in
-#. * the first time druid
-#: src/nautilus-first-time-druid.c:342
-msgid "helvetica"
-msgstr "ÇÅÌØ×ÅÔÉËÁ"
-
-#: src/nautilus-first-time-druid.c:342
-msgid "medium"
-msgstr "ÓÒÅÄÎÉÊ"
-
-#: src/nautilus-first-time-druid.c:471
+#: src/nautilus-first-time-druid.c:487
 #, fuzzy
 msgid ""
 "Your user level adjusts Nautilus to your degree of experience\n"
@@ -7847,13 +8454,13 @@ msgstr ""
 "ÕÒÏ×ÅÎØ ÔÅÈÎÉÞÅÓËÉÈ ÚÎÁÎÉÊ. ÷ÙÂÅÒÉÔÅ ÎÁÞÁÌØÎÙÊ ÕÒÏ×ÅÎØ, ÕÄÏÂÎÙÊ ÄÌÑ ×ÁÓ; ×Ù "
 "ÓÍÏÖÅÔÅ ÉÚÍÅÎÉÔØ ÅÇÏ ÐÏÚÄÎÅÅ."
 
-#: src/nautilus-first-time-druid.c:482
+#: src/nautilus-first-time-druid.c:498
 msgid ""
 "For users who have no previous experience with GNOME\n"
 "and Linux."
 msgstr "äÌÑ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÎÅ ÉÍÅÀÝÉÈ ÏÐÙÔÁ ÒÁÂÏÔÙ Ó GNOME É Linux."
 
-#: src/nautilus-first-time-druid.c:488
+#: src/nautilus-first-time-druid.c:504
 msgid ""
 "For users who are comfortable with GNOME and Linux,\n"
 "but don't describe themselves as ``technical.''"
@@ -7861,7 +8468,7 @@ msgstr ""
 "äÌÑ ÎÅÔÅÈÎÉÞÅÓËÉÈ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÐÒÉ×ÙÞÎÙÈ Ë\n"
 "ÉÈ ÓÒÅÄÅ GNOME É Linux."
 
-#: src/nautilus-first-time-druid.c:494
+#: src/nautilus-first-time-druid.c:510
 msgid ""
 "For users who have GNOME and Linux experience, and\n"
 "like to see every detail of the operating system."
@@ -7869,7 +8476,7 @@ msgstr ""
 "äÌÑ ÐÏÌØÚÏ×ÁÔÅÌÅÊ, ËÏÔÏÒÙÍ ÎÁÄÏ ÐÒÅÄÓÔÁ×ÌÑÔØ\n"
 "ÓÅÂÅ ×ÓÅ ÐÏÄÒÏÂÎÏÓÔÉ ÉÈ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ."
 
-#: src/nautilus-first-time-druid.c:532
+#: src/nautilus-first-time-druid.c:548
 msgid ""
 "To verify your Internet connection and make sure you have\n"
 "the latest Nautilus updates, Nautilus will now connect to\n"
@@ -7881,15 +8488,15 @@ msgid ""
 "Verify and Nautilus will use it.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:546
+#: src/nautilus-first-time-druid.c:562
 msgid "Verify my connection and check for updates"
 msgstr "ðÒÏ×ÅÒÉÔØ ÍÏÅ ÐÏÄËÌÀÞÅÎÉÅ É ÎÁÌÉÞÉÅ ÏÂÎÏ×ÌÅÎÉÊ."
 
-#: src/nautilus-first-time-druid.c:547
+#: src/nautilus-first-time-druid.c:563
 msgid "Don't verify my connection or check for updates"
 msgstr "îÅ ÐÒÏ×ÅÒÑÔØ ÍÏÅ ÐÏÄËÌÀÞÅÎÉÅ É ÎÁÌÉÞÉÅ ÏÂÎÏ×ÌÅÎÉÊ."
 
-#: src/nautilus-first-time-druid.c:612
+#: src/nautilus-first-time-druid.c:628
 #, fuzzy
 msgid ""
 "We are having trouble making an external web connection.\n"
@@ -7900,47 +8507,58 @@ msgstr ""
 "éÎÏÇÄÁ ÍÅÖÓÅÔÅ×ÏÊ ÜËÒÁÎ ÔÒÅÂÕÅÔ ÞÔÏÂÙ ×Ù ÕËÁÚÁÌÉ ×ÅÂ-ÐÒÏËÓÉ ÓÅÒ×ÅÒ.\n"
 "÷×ÅÄÉÔÅ ÎÉÖÅ ÉÍÑ É ÐÏÒÔ ×ÁÛÅÇÏ ÐÒÏËÓÉ ÓÅÒ×ÅÒÁ, ÅÓÌÉ ÅÓÔØ."
 
-#: src/nautilus-first-time-druid.c:624
+#: src/nautilus-first-time-druid.c:640
 msgid "No proxy server required."
 msgstr "ðÒÏËÓÉ-ÓÅÒ×ÅÒ ÎÅ ÔÒÅÂÕÅÔÓÑ."
 
-#: src/nautilus-first-time-druid.c:625
+#: src/nautilus-first-time-druid.c:641
 msgid "Use this proxy server:"
 msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÜÔÏÔ ÐÒÏËÓÉ-ÓÅÒ×ÅÒ:"
 
 #. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:650
+#: src/nautilus-first-time-druid.c:666
 msgid "Proxy address:"
 msgstr "áÄÒÅÓ ÐÒÏËÓÉ:"
 
-#: src/nautilus-first-time-druid.c:712
+#: src/nautilus-first-time-druid.c:728
 msgid "Verifying your Internet connection and checking for updates..."
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:720
+#: src/nautilus-first-time-druid.c:736
 msgid "Downloading Nautilus updates..."
 msgstr "óËÁÞÉ×ÁÎÉÅ ÏÂÎÏ×ÌÅÎÉÊ Nautilus..."
 
-#: src/nautilus-first-time-druid.c:873
+#: src/nautilus-first-time-druid.c:906
 msgid ""
 "If you have been using the GNOME Midnight Commander\n"
 "these settings move your desktop icons to Nautilus and\n"
 "make Nautilus the default desktop.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:880
+#: src/nautilus-first-time-druid.c:913
 msgid "Use Nautilus to draw the desktop."
 msgstr "éÓÐÏÌØÚÏ×ÁÔØ Nautilus ÄÌÑ ÏÔÒÉÓÏ×ËÉ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ"
 
-#: src/nautilus-first-time-druid.c:886
+#: src/nautilus-first-time-druid.c:919
 msgid "Move existing desktop icons to the Nautilus desktop."
-msgstr "ðÅÒÅÍÅÓÔÉÔØ ÓÕÝÅÓÔ×ÕÀÝÉÅ ÐÉËÔÏÇÒÁÍÍÙ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ ÎÁ ÒÁÂÏÞÉÊ ÓÔÏÌ Nautilus."
+msgstr ""
+"ðÅÒÅÍÅÓÔÉÔØ ÓÕÝÅÓÔ×ÕÀÝÉÅ ÐÉËÔÏÇÒÁÍÍÙ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ ÎÁ ÒÁÂÏÞÉÊ ÓÔÏÌ Nautilus."
 
-#: src/nautilus-first-time-druid.c:891
+#. This option is currently disabled, per bugzilla.eazel.com 7557
+#: src/nautilus-first-time-druid.c:927
 msgid "Launch Nautilus when GNOME starts up."
 msgstr "úÁÐÕÓËÁÔØ Nautilus ÐÒÉ ÚÁÐÕÓËÅ GNOME."
 
-#: src/nautilus-first-time-druid.c:926
+#: src/nautilus-first-time-druid.c:967
+msgid ""
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties.  The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+"Fast search requires that the cron daemon on your system be running.\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:972
 msgid ""
 "The fast search feature indexes all the items on your hard disk.\n"
 "It speeds up searching and allows you to search by file content\n"
@@ -7948,36 +8566,43 @@ msgid ""
 "takes time but is performed only when your computer is idle.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:934
+#: src/nautilus-first-time-druid.c:981
 msgid "Enable fast search"
 msgstr "÷ËÌÀÞÉÔØ ÂÙÓÔÒÙÊ ÐÏÉÓË"
 
-#: src/nautilus-first-time-druid.c:1028
-msgid "Nautilus First Time Setup"
-msgstr "ðÅÒ×ÏÎÁÞÁÌØÎÁÑ ÕÓÔÁÎÏ×ËÁ Nautilus"
-
-#: src/nautilus-first-time-druid.c:1058
-msgid "Welcome to Nautilus"
-msgstr "äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ × Nautilus!"
+#: src/nautilus-first-time-druid.c:982
+msgid "Turn fast search on when cron is enabled"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:1060
+#: src/nautilus-first-time-druid.c:1027
 msgid ""
-"Nautilus is part of your GNOME desktop environment. It\n"
-"helps you manage your files and folders (directories),\n"
-"view documents, connect to the Internet, and do many\n"
-"other tasks.\n"
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"currently can't be performed because the program crond, which does\n"
+"nightly tasks on your computer, is turned off. To make sure fast searches\n"
+"can be done, turn crond on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands \n"
+"to start cron:\n"
 "\n"
-"The next four screens ask about your level of Linux\n"
-"experience, and check your Internet connection. Click Next\n"
-"to continue."
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#. set up the final page
-#: src/nautilus-first-time-druid.c:1072
-msgid "Finished"
-msgstr "úÁ×ÅÒÛÅÎÏ"
+#: src/nautilus-first-time-druid.c:1035
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"may not be performed because the program crond, which does nightly tasks\n"
+"on your computer, may be turned off. To make sure fast searches can be\n"
+"done, check to make sure that crond is turned on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands\n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:1079
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
 "Click Finish to launch Nautilus. You'll start with two\n"
 "Nautilus windows: one shows your home folder, and the\n"
@@ -7987,42 +8612,79 @@ msgid ""
 "We hope you enjoy Nautilus!"
 msgstr ""
 
+#: src/nautilus-first-time-druid.c:1129
+msgid ""
+"Click Finish to launch Nautilus. You'll start with a\n"
+"window showing your home folder.\n"
+"\n"
+"We hope you enjoy Nautilus!"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1153
+msgid "Nautilus First Time Setup"
+msgstr "ðÅÒ×ÏÎÁÞÁÌØÎÁÑ ÕÓÔÁÎÏ×ËÁ Nautilus"
+
+#: src/nautilus-first-time-druid.c:1183
+msgid "Welcome to Nautilus"
+msgstr "äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ × Nautilus!"
+
+#: src/nautilus-first-time-druid.c:1185
+msgid ""
+"Nautilus...\n"
+"    Is a great file manager for the GNOME desktop.\n"
+"    Provides a simple intuitive way to access Internet services.\n"
+"    Is an extensible framework for GNOME developers.\n"
+"    Provides a powerful delivery platform for service providers.\n"
+"\n"
+"Click Next to begin customizing your Nautilus environment."
+msgstr ""
+
+#. set up the final page
+#: src/nautilus-first-time-druid.c:1196
+msgid "Finished"
+msgstr "úÁ×ÅÒÛÅÎÏ"
+
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1088
+#: src/nautilus-first-time-druid.c:1209
 msgid "Choose Your User Level"
 msgstr "õÓÔÁÎÏ×ÉÔØ ÕÒÏ×ÅÎØ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1092
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr "ðÅÒÅÈÏÄ ÉÚ GMC × Nautilus"
 
 #. set up the `Launch Medusa' page
-#: src/nautilus-first-time-druid.c:1096
+#: src/nautilus-first-time-druid.c:1217
 msgid "Fast Searches"
 msgstr "âÙÓÔÒÙÊ ÐÏÉÓË"
 
+#. set up optional page to tell the user how to run cron
+#: src/nautilus-first-time-druid.c:1225
+msgid "The Cron Daemon"
+msgstr ""
+
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1100
+#: src/nautilus-first-time-druid.c:1230
 msgid "Checking Your Internet Connection"
 msgstr "ðÒÏ×ÅÒËÁ ×ÁÛÅÇÏ ÐÏÄËÌÀÞÅÎÉÑ Ë Internet"
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1108
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "ïÂÎÏ×ÌÅÎÉÅ Nautilus..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1116
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "îÁÓÔÒÏÊËÁ ×ÅÂ-ÐÒÏËÓÉ"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1191
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "äÅËÏÄÉÒÏ×ÁÎÉÅ ÏÂÎÏ×ÌÅÎÉÊ..."
 
-#: src/nautilus-first-time-druid.c:1208
+#: src/nautilus-first-time-druid.c:1341
 msgid "Update Complete. Click Next to Continue."
 msgstr "ïÂÎÏ×ÌÅÎÉÅ ÚÁ×ÅÒÛÅÎÏ. îÁÖÍÉÔÅ \"óÌÅÄÕÀÝÉÊ\" ÄÌÑ ÐÒÏÄÏÌÖÅÎÉÑ."
 
@@ -8030,7 +8692,7 @@ msgstr "ïÂÎÏ×ÌÅÎÉÅ ÚÁ×ÅÒÛÅÎÏ. îÁÖÍÉÔÅ \"óÌÅÄÕÀÝÉÊ\" ÄÌÑ ÐÒÏÄÏÌÖÅÎÉÑ."
 #. * doesn't exist. Arlo and I (jsh) and decided that the
 #. * best thing to do is silently fail
 #.
-#: src/nautilus-first-time-druid.c:1221
+#: src/nautilus-first-time-druid.c:1356
 msgid "No Update Available... Press Next to Continue."
 msgstr "ïÂÎÏ×ÌÅÎÉÅ ÎÅÄÏÓÔÕÐÎÏ... îÁÖÍÉÔÅ \"óÌÅÄÕÀÝÉÊ\" ÄÌÑ ÐÒÏÄÏÌÖÅÎÉÑ."
 
@@ -8059,48 +8721,48 @@ msgstr "÷Ù ÈÏÔÉÔÅ ÐÒÏÓÍÏÔÒÅÔØ ÜÔÉ %d ÐÏÌÏÖÅÎÉÊ × ÏÔÄÅÌØÎÙÈ ÏËÎÁÈ?"
 msgid "View in Multiple Windows?"
 msgstr "ðÒÏÓÍÏÔÒ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÙÈ ÏËÎÁÈ?"
 
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr ""
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "óÏÚÄÁÔØ ÐÅÒ×ÏÎÁÞÁÌØÎÏÅ ÏËÎÏ Ó ÚÁÄÁÎÎÏÊ ÇÅÏÍÅÔÒÉÅÊ."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "çåïíåôòéñ"
 
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "÷ÙÊÔÉ ÉÚ îÁÕÔÉÌÕÓ."
 
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "ðÅÒÅÚÁÐÕÓÔÉÔØ Nautilus."
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ×ÍÅÓÔÅ Ó URI.\n"
 
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 "nautilus: --check ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ×ÍÅÓÔÅ Ó ÄÒÕÇÉÍÉ ÐÁÒÁÍÅÔÒÁÍÉ.\n"
 
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ×ÍÅÓÔÅ Ó URI.\n"
 
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus:  --restart ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ×ÍÅÓÔÅ Ó URI.\n"
 
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 "nautilus:  --geometry ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ×ÍÅÓÔÅ ÂÏÌØÛÅ ÞÅÍ Ó ÏÄÎÉÍ "
@@ -8111,124 +8773,127 @@ msgstr ""
 msgid "Backgrounds and Emblems"
 msgstr "æÏÎ É ÜÍÂÌÅÍÙ"
 
-#: src/nautilus-property-browser.c:361 src/nautilus-theme-selector.c:266
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:362 src/nautilus-theme-selector.c:267
 msgid "  Done  "
 msgstr " óÄÅÌÁÎÏ "
 
-#: src/nautilus-property-browser.c:371
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:373
 msgid "  Add new...  "
 msgstr " äÏÂÁ×ÉÔØ ÎÏ×ÙÊ... "
 
-#: src/nautilus-property-browser.c:385
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:388
 msgid "  Remove...  "
 msgstr " õÄÁÌÉÔØ... "
 
-#: src/nautilus-property-browser.c:876
+#: src/nautilus-property-browser.c:879
 #, c-format
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "éÚ×ÉÎÉÔÅ, ÎÏ ÛÁÂÌÏÎ %s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÄÁÌÅÎ."
 
-#: src/nautilus-property-browser.c:877 src/nautilus-property-browser.c:906
+#: src/nautilus-property-browser.c:880 src/nautilus-property-browser.c:909
 msgid "Couldn't delete pattern"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÛÁÂÌÏÎ"
 
-#: src/nautilus-property-browser.c:905
+#: src/nautilus-property-browser.c:908
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "éÚ×ÉÎÉÔÅ, ÎÏ ÜÍÂÌÅÍÁ %s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÄÁÌÅÎ."
 
-#: src/nautilus-property-browser.c:941
+#: src/nautilus-property-browser.c:944
 msgid "Create a New Emblem:"
 msgstr "óÏÚÄÁÔØ ÎÏ×ÕÀ ÜÍÂÌÅÍÕ:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:946
+#: src/nautilus-property-browser.c:949
 msgid "Keyword:"
 msgstr "ëÌÀÞÅ×ÏÅ ÓÌÏ×Ï:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:959
+#: src/nautilus-property-browser.c:962
 msgid "Image:"
 msgstr "éÚÏÂÒÁÖÅÎÉÅ:"
 
-#: src/nautilus-property-browser.c:963
+#: src/nautilus-property-browser.c:966
 msgid "Select an image file for the new emblem:"
 msgstr "÷ÙÂÅÒÉÔÅ ÆÁÊÌ ÉÚÏÂÒÁÖÅÎÉÑ ÄÌÑ ÎÏ×ÏÊ ÜÍÂÌÅÍÙ:"
 
-#: src/nautilus-property-browser.c:990
+#: src/nautilus-property-browser.c:993
 msgid "Create a New Color:"
 msgstr "óÏÚÄÁÔØ ÎÏ×ÙÊ Ã×ÅÔ:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:995
+#: src/nautilus-property-browser.c:998
 msgid "Color name:"
 msgstr "îÁÚ×ÁÎÉÅ Ã×ÅÔÁ:"
 
-#: src/nautilus-property-browser.c:1006
+#: src/nautilus-property-browser.c:1009
 msgid "Color value:"
 msgstr "úÎÁÞÅÎÉÅ Ã×ÅÔÁ:"
 
-#: src/nautilus-property-browser.c:1042
+#: src/nautilus-property-browser.c:1045
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "éÚ×ÉÎÉÔÅ, ÎÏ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÄÈÏÄÑÝÉÍ ÎÁÚ×ÁÎÉÅÍ ÆÁÊÌÁ."
 
-#: src/nautilus-property-browser.c:1044
+#: src/nautilus-property-browser.c:1047
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "éÚ×ÉÎÉÔÅ, ÎÏ ×Ù ÎÅ ÕËÁÚÁÌÉ ÐÏÄÈÏÄÑÝÅÇÏ ÎÁÚ×ÁÎÉÑ ÆÁÊÌÁ."
 
-#: src/nautilus-property-browser.c:1046 src/nautilus-property-browser.c:1089
+#: src/nautilus-property-browser.c:1049 src/nautilus-property-browser.c:1092
 msgid "Couldn't install pattern"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÛÁÂÌÏÎ"
 
-#: src/nautilus-property-browser.c:1057
+#: src/nautilus-property-browser.c:1060
 msgid "Sorry, but you can't replace the reset image."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1088
+#: src/nautilus-property-browser.c:1091
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "éÚ×ÉÎÉÔÅ, ÎÏ ÛÁÂÌÏÎ %s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ."
 
-#: src/nautilus-property-browser.c:1111
+#: src/nautilus-property-browser.c:1114
 msgid "Select an image file to add as a pattern:"
 msgstr "÷ÙÂÅÒÉÔÅ ÆÁÊÌ ÉÚÏÂÒÁÖÅÎÉÑ ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ × ËÁÞÅÓÔ×Å ÛÁÂÌÏÎÁ:"
 
-#: src/nautilus-property-browser.c:1170
+#: src/nautilus-property-browser.c:1173
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "éÚ×ÉÎÉÔÅ, ÎÏ ×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ ÎÅ ÐÕÓÔÏÅ ÎÁÚ×ÁÎÉÅ ÄÌÑ ÎÏ×ÏÇÏ Ã×ÅÔÁ."
 
-#: src/nautilus-property-browser.c:1171
+#: src/nautilus-property-browser.c:1174
 msgid "Couldn't install color"
 msgstr "îÅ ÕÄÁÌÏÓØ ÕÓÔÁÎÏ×ÉÔØ Ã×ÅÔ"
 
-#: src/nautilus-property-browser.c:1227
+#: src/nautilus-property-browser.c:1230
 msgid "Select a color to add:"
 msgstr "÷ÙÂÅÒÉÔÅ Ã×ÅÔ ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ:"
 
-#: src/nautilus-property-browser.c:1308
+#: src/nautilus-property-browser.c:1311
 #, c-format
 msgid "Sorry, but '%s' is not a usable image file!"
 msgstr "éÚ×ÉÎÉÔÅ, ÎÏ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÄÈÏÄÑÝÉÍ ÆÁÊÌÏÍ ÉÚÏÂÒÁÖÅÎÉÑ!"
 
-#: src/nautilus-property-browser.c:1326
+#: src/nautilus-property-browser.c:1329
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 "éÚ×ÉÎÉÔÅ, ÎÏ ×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ ÎÅ ÐÕÓÔÏÅ ËÌÀÞÅ×ÏÅ ÓÌÏ×Ï ÄÌÑ ÎÏ×ÏÊ ÜÍÂÌÅÍÙ."
 
-#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1330
-#: src/nautilus-property-browser.c:1334 src/nautilus-property-browser.c:1363
+#: src/nautilus-property-browser.c:1330 src/nautilus-property-browser.c:1333
+#: src/nautilus-property-browser.c:1337 src/nautilus-property-browser.c:1366
 msgid "Couldn't install emblem"
 msgstr "îÅ ÕÄÁÌÏÓØ ÕÓÔÁÎÏ×ÉÔØ ÜÍÂÌÅÍÕ"
 
-#: src/nautilus-property-browser.c:1329
+#: src/nautilus-property-browser.c:1332
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
 "éÚ×ÉÎÉÔÅ, ÎÏ ËÌÀÞÅ×ÙÅ ÓÌÏ×Á ÜÍÂÌÅÍÙ ÍÏÇÕÔ ÓÏÄÅÒÖÁÔØ ÔÏÌØËÏ ÂÕË×Ù, ÐÒÏÂÅÌ É "
 "ÃÉÆÒÙ."
 
-#: src/nautilus-property-browser.c:1332
+#: src/nautilus-property-browser.c:1335
 #, c-format
 msgid ""
 "Sorry, but \"%s\" is an existing keyword.  Please choose a different name "
@@ -8236,64 +8901,64 @@ msgid ""
 msgstr ""
 "ëÌÀÞÅ×ÏÅ ÓÌÏ×Ï \"%s\" ÕÖÅ ÉÓÐÏÌØÚÕÅÔÓÑ. ðÏÖÁÌÕÊÓÔÁ, ×ÙÂÅÒÉÔÅ ÄÒÕÇÏÅ ÎÁÚ×ÁÎÉÅ."
 
-#: src/nautilus-property-browser.c:1362
+#: src/nautilus-property-browser.c:1365
 #, c-format
 msgid "Sorry, but the image at %s couldn't be installed as an emblem."
 msgstr "éÚ×ÉÎÉÔÅ, ÎÏ ÉÚÏÂÒÁÖÅÎÉÅ %s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎÏ ËÁË ÜÍÂÌÅÍÁ."
 
-#: src/nautilus-property-browser.c:2021
+#: src/nautilus-property-browser.c:2024
 msgid "Select A Category:"
 msgstr "÷ÙÂÅÒÉÔÅ ËÁÔÅÇÏÒÉÀ:"
 
-#: src/nautilus-property-browser.c:2029 src/nautilus-theme-selector.c:494
+#: src/nautilus-property-browser.c:2032 src/nautilus-theme-selector.c:497
 msgid "Cancel Remove"
 msgstr "ïÔÍÅÎÉÔØ ÕÄÁÌÅÎÉÅ"
 
-#: src/nautilus-property-browser.c:2033
+#: src/nautilus-property-browser.c:2037
 msgid "  Add a New Pattern  "
 msgstr " äÏÂÁ×ÉÔØ ÎÏ×ÙÊ ÛÁÂÌÏÎ "
 
-#: src/nautilus-property-browser.c:2036
+#: src/nautilus-property-browser.c:2040
 msgid "  Add a New Color  "
 msgstr " äÏÂÁ×ÉÔØ ÎÏ×ÙÊ Ã×ÅÔ "
 
-#: src/nautilus-property-browser.c:2039
+#: src/nautilus-property-browser.c:2043
 msgid "  Add a New Emblem  "
 msgstr " äÏÂÁ×ÉÔØ ÎÏ×ÕÀ ÜÍÂÌÅÍÕ "
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2066
 msgid "Click on a pattern to remove it"
 msgstr "ýÅÌËÎÉÔÅ ÎÁ ÛÁÂÌÏÎÅ, ÞÔÏÂÙ ÕÄÁÌÉÔØ ÅÇÏ."
 
-#: src/nautilus-property-browser.c:2065
+#: src/nautilus-property-browser.c:2069
 msgid "Click on a color to remove it"
 msgstr "ýÅÌËÎÉÔÅ ÎÁ Ã×ÅÔÅ, ÞÔÏÂÙ ÕÄÁÌÉÔØ ÅÇÏ"
 
-#: src/nautilus-property-browser.c:2068
+#: src/nautilus-property-browser.c:2072
 msgid "Click on an emblem to remove it"
 msgstr "ýÅÌËÎÉÔÅ ÎÁ ÜÍÂÌÅÍÅ, ÞÔÏÂÙ ÕÄÁÌÉÔØ ÅÅ."
 
-#: src/nautilus-property-browser.c:2077
+#: src/nautilus-property-browser.c:2081
 msgid "Patterns:"
 msgstr "ûÁÂÏÎÙ:"
 
-#: src/nautilus-property-browser.c:2080
+#: src/nautilus-property-browser.c:2084
 msgid "Colors:"
 msgstr "ã×ÅÔÁ:"
 
-#: src/nautilus-property-browser.c:2083
+#: src/nautilus-property-browser.c:2087
 msgid "Emblems:"
 msgstr "üÍÂÌÅÍÙ:"
 
-#: src/nautilus-property-browser.c:2101
+#: src/nautilus-property-browser.c:2106
 msgid "  Remove a Pattern  "
 msgstr " õÄÁÌÉÔØ ÛÁÂÌÏÎ "
 
-#: src/nautilus-property-browser.c:2104
+#: src/nautilus-property-browser.c:2109
 msgid "  Remove a Color  "
 msgstr " õÄÁÌÉÔØ Ã×ÅÔ "
 
-#: src/nautilus-property-browser.c:2107
+#: src/nautilus-property-browser.c:2112
 msgid "  Remove an Emblem  "
 msgstr " õÄÁÌÉÔØ ÜÍÂÌÅÍÕ "
 
@@ -8592,15 +9257,18 @@ msgid "View as List"
 msgstr "ðÏËÁÚÁÔØ ËÁË ÓÐÉÓÏË"
 
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+#, fuzzy
+msgid " _Advanced"
 msgstr "òÁÚ×ÉÔÙÊ"
 
 #: src/nautilus-shell-ui.xml.h:2
-msgid " Beginner"
+#, fuzzy
+msgid " _Beginner"
 msgstr "îÏ×ÉÞÏË"
 
 #: src/nautilus-shell-ui.xml.h:3
-msgid " Intermediate"
+#, fuzzy
+msgid " _Intermediate"
 msgstr "ðÒÏÍÅÖÕÔÏÞÎÙÊ"
 
 #: src/nautilus-shell-ui.xml.h:4
@@ -8640,22 +9308,18 @@ msgid "Close this window"
 msgstr "úÁËÒÙÔØ ÜÔÏ ÏËÎÏ"
 
 #: src/nautilus-shell-ui.xml.h:15
-msgid "Cut _Text"
-msgstr "÷ÙÒÅÚÁÔØ ÔÅËÓÔ"
-
-#: src/nautilus-shell-ui.xml.h:17
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "ðÏËÁÚÁÔØ ÏËÎÏ, × ËÏÔÏÒÏÍ ÍÏÖÎÏ ÂÕÄÅÔ ÐÒÁ×ÉÔØ ÚÁËÌÁÄËÉ ÜÔÏÇÏ ÍÅÎÀ."
 
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr "ðÏËÁÚÁÔØ ÏÎÌÁÊÎÏ×ÕÀ ÓÐÒÁ×ËÕ Ï Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
@@ -8663,268 +9327,285 @@ msgstr ""
 "ðÏËÁÚÁÔØ ÛÁÂÌÏÎÙ, Ã×ÅÔÁ É ÜÍÂÌÅÍÙ, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÙ ÄÌÑ "
 "ÎÁÓÔÒÏÊËÉ ×ÎÅÛÎÅÇÏ ×ÉÄÁ"
 
-#: src/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:19
 msgid "Display quick reference pages for Nautilus"
 msgstr "ðÏËÁÚÁÔØ ÓÔÒÁÎÉÃÙ ÂÙÓÔÒÙÈ ÓÓÌÙÌÏË Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:22
+#: src/nautilus-shell-ui.xml.h:20
 msgid "Display release notes for Nautilus"
 msgstr "ðÏËÁÚÁÔØ Ó×ÅÄÅÎÉÑ Ï ×ÙÐÕÓËÅ Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:23
+#: src/nautilus-shell-ui.xml.h:21
 msgid "Display support information for Nautilus and Eazel Services"
 msgstr "ðÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÐÏÄÄÅÒÖËÅ Nautilus É ÓÅÒ×ÉÓÏ× Eazel"
 
-#: src/nautilus-shell-ui.xml.h:24
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Display the latest contents of the current location"
 msgstr "ðÏËÁÚÁÔØ ÐÏÓÌÅÄÎÅÅ ÓÏÄÅÒÖÉÍÏÅ ÔÅËÕÝÅÇÏ ÐÏÌÏÖÅÎÉÑ"
 
-#: src/nautilus-shell-ui.xml.h:25
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr "ðÏËÁÚÁÔØ ÎÁÂÏÒ ÄÏÓÔÕÐÎÙÈ ×ÁÒÉÁÎÔÏ× ×ÎÅÛÎÅÇÏ ×ÉÄÁ"
 
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:24
 msgid "Edit various Nautilus preferences"
 msgstr "ðÒÁ×ËÁ ÒÁÚÌÉÞÎÙÈ ÎÁÓÔÒÏÅË Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "îÁÊÔÉ"
 
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr "úÁÂÙÔØ ÉÓÔÏÒÉÀ"
 
-#: src/nautilus-shell-ui.xml.h:29
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr "ðÅÒÅÊÔÉ Ë ÓÅÒ×ÉÓÁÍ Eazel"
 
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr "ðÅÒÅÊÔÉ Ë ÄÏÍÁÛÎÅÍÕ ËÁÔÁÌÏÇÕ"
 
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr "ðÅÒÅÊÔÉ Ë ÍÅÓÔÕ, ËÏÔÏÒÏÅ ÓÏÄÅÒÖÉÔ ÜÔÏ"
 
-#: src/nautilus-shell-ui.xml.h:32
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr "ðÅÒÅÊÔÉ Ë ÓÌÅÄÕÀÝÅÍÕ ÐÏÓÅÝÅÎÎÏÍÕ ÍÅÓÔÕ"
 
-#: src/nautilus-shell-ui.xml.h:33
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr "ðÅÒÅÊÔÉ Ë ÐÒÅÄÙÄÕÝÅÍÕ ÐÏÓÅÝÅÎÎÏÍÕ ÍÅÓÔÕ"
 
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:442
-msgid "Hide Location Bar"
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
+#, fuzzy
+msgid "Hide Location _Bar"
 msgstr "óËÒÙÔØ ÓÔÒÏËÕ ÒÁÓÐÏÌÏÖÅÎÉÑ"
 
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:430
-msgid "Hide Sidebar"
-msgstr "óËÒÙÔØ ÂÏËÏ×ÕÀ ÐÁÎÅÌØ"
-
-#: src/nautilus-shell-ui.xml.h:36 src/nautilus-window-menus.c:424
-msgid "Hide Status Bar"
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
+#, fuzzy
+msgid "Hide St_atus Bar"
 msgstr "óËÒÙÔØ ÓÔÒÏËÕ ÓÏÓÔÏÑÎÉÑ"
 
-#: src/nautilus-shell-ui.xml.h:37 src/nautilus-window-menus.c:436
-msgid "Hide Toolbar"
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
+#, fuzzy
+msgid "Hide _Sidebar"
+msgstr "óËÒÙÔØ ÂÏËÏ×ÕÀ ÐÁÎÅÌØ"
+
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
+#, fuzzy
+msgid "Hide _Toolbar"
 msgstr "óËÒÙÔØ ÐÁÎÅÌØ ÉÎÓÔÒÕÍÅÎÔÏ×"
 
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:37
 msgid "Nautilus Quick _Reference"
 msgstr "ëÒÁÔËÏÅ ÒÕËÏ×ÏÄÓÔ×Ï Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:38
 msgid "Nautilus Release _Notes"
 msgstr "ó×ÅÄÅÎÉÑ Ï ×ÙÐÕÓËÅ Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:39
 msgid "Nautilus User _Manual"
 msgstr "òÕËÏ×ÏÄÓÔ×Ï ÐÏÌØÚÏ×ÁÔÅÌÑ Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "îÏ×ÏÅ ÏËÎÏ"
 
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:41
+#, fuzzy
+msgid "New _Window"
+msgstr "îÏ×ÏÅ ÏËÎÏ"
+
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "îÏÒÍÁÌØÎÙÊ ÒÁÚÍÅÒ"
 
-#: src/nautilus-shell-ui.xml.h:44
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "ïÔËÒÙÔØ ÄÒÕÇÏÅ ÏËÎÏ Nautilus ÄÌÑ ÏÔÏÂÒÁÖÁÅÍÏÇÏ ÍÅÓÔÁ"
 
-#: src/nautilus-shell-ui.xml.h:46
-msgid "Preferences..."
-msgstr "îÁÓÔÒÏÊËÉ..."
-
-#: src/nautilus-shell-ui.xml.h:47
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "ïÂÎÏ×ÉÔØ"
 
-#: src/nautilus-shell-ui.xml.h:48
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "õÄÁÌÉÔØ ×ÙÄÅÌÅÎÎÙÊ ÔÅËÓÔ ÎÅ ÐÏÍÅÝÁÑ ÅÇÏ × ÂÕÆÅÒ ÏÂÍÅÎÁ"
-
-#: src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr "ðÏÉÓË × éÎÔÅÒÎÅÔ"
 
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr "ðÏÉÓË ÆÁÊÌÏ× ÎÁ ÜÔÏÍ ËÏÍÐØÀÔÅÒÅ"
 
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:54
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "ðÏËÁÚÁÔØ ÓÏÄÅÒÖÉÍÏÅ ÎÏÒÍÁÌØÎÏÇÏ ÒÁÚÍÅÒÁ"
 
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "ðÏËÁÚÁÔØ ÓÏÄÅÒÖÉÍÏÅ × ÍÅÎØÛÉÈ ÐÏÄÒÏÂÎÏÓÔÑÈ"
 
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "ðÏËÁÚÁÔØ ÓÏÄÅÒÖÉÍÏÅ × ÂÏÌØÛÉÈ ÐÏÄÒÏÂÎÏÓÔÑÈ"
 
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:60
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÚÁÇÒÕÚËÕ ÜÔÏÇÏ ÍÅÓÔÁ"
 
-#: src/nautilus-shell-ui.xml.h:61
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "ïÔÍÅÎÁ ÐÏÓÌÅÄÎÅÇÏ ÉÚÍÅÎÅÎÉÑ ÔÅËÓÔÁ"
 
-#: src/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "÷×ÅÒÈ"
 
-#: src/nautilus-shell-ui.xml.h:63
-msgid "Use Advanced settings"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÒÁÓÛÉÒÅÎÎÙÅ ÎÁÓÔÒÏÊËÉ"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:64
-msgid "Use Beginner settings"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÎÁÓÔÒÏÊËÉ ÎÏ×ÉÞËÁ"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:65
-msgid "Use Intermediate settings"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÐÒÏÍÅÖÕÔÏÞÎÙÅ ÎÁÓÔÒÏÊËÉ"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:66
+#: src/nautilus-shell-ui.xml.h:63
+#, fuzzy
+msgid "We_b Search"
+msgstr "ðÏÉÓË × Web"
+
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "ðÏÉÓË × Web"
 
-#: src/nautilus-shell-ui.xml.h:67
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "íÁÓÛÔÁ +"
 
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "íÁÓÛÔÁ -"
 
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "íÁÓÛÔÁ +"
 
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "íÁÓÛÔÁ -"
 
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "ï ÐÒÏÇÒÁÍÍÅ îÁÕÔÉÌÕÓ..."
 
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "äÏÂÁ×ÉÔØ ÚÁËÌÁÄËÕ"
 
-#: src/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "îÁÚÁÄ"
 
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr "æÏÎ É ÜÍÂÌÅÍÙ..."
 
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "úÁËÌÁÄËÉ"
 
-#: src/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "úÁËÒÙÔØ ÏËÎÏ"
 
-#: src/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:76
 msgid "_Customer Support"
 msgstr "ðÏÄÄÅÒÖËÁ ÐÏÌØÚÏ×ÁÔÅÌÅÊ"
 
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "ðÒÁ×ËÁ"
 
-#: src/nautilus-shell-ui.xml.h:80
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "ðÒÁ×ËÁ ÚÁËÌÁÄÏË..."
 
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "îÁÓÔÒÏÊËÉ..."
+
+#: src/nautilus-shell-ui.xml.h:80
 msgid "_Feedback"
 msgstr "ïÔÚÙ×Ù"
 
-#: src/nautilus-shell-ui.xml.h:83 src/nautilus-window-menus.c:1352
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "îÁÊÔÉ"
 
-#: src/nautilus-shell-ui.xml.h:84
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "÷ÐÅÒÅÄ"
 
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "ðÅÒÅÊÔÉ"
 
-#: src/nautilus-shell-ui.xml.h:86
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "óÐÒÁ×ËÁ"
 
-#: src/nautilus-shell-ui.xml.h:87
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "äÏÍÏÊ"
 
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "òÁÓÐÏÌÏÖÅÎÉÅ"
+
 #: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr "ôÅÍÙ Nautilus..."
 
 #: src/nautilus-shell-ui.xml.h:89
-msgid "_New Window"
-msgstr "îÏ×ÏÅ ÏËÎÏ"
-
-#: src/nautilus-shell-ui.xml.h:90
 msgid "_Normal Size"
 msgstr "îÏÒÍÁÌØÎÙÊ ÒÁÚÍÅÒ"
 
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "îÁÓÔÒÏÊËÉ"
+
 #: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr ""
@@ -8942,34 +9623,26 @@ msgid "_Reset Profiling"
 msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:96
-msgid "_Select All"
-msgstr "÷ÙÄÅÌÉÔØ ×ÓÅ"
-
-#: src/nautilus-shell-ui.xml.h:97
 msgid "_Start Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "ïÔËÁÔ"
 
-#: src/nautilus-shell-ui.xml.h:100
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "ðÏÄÎÑÔØ ÕÒÏ×ÅÎØ"
 
-#: src/nautilus-shell-ui.xml.h:101
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "ðÒÏÓÍÏÔÒ"
 
-#: src/nautilus-shell-ui.xml.h:102
-msgid "_Web Search"
-msgstr "ðÏÉÓË × Web"
-
-#: src/nautilus-sidebar.c:659
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -8978,11 +9651,11 @@ msgstr ""
 "ðÏÖÁÌÕÊÓÔÁ, ÐÅÒÅÔÁÝÉÔÅ ÔÏÌØËÏ ÏÄÎÏ ÉÚÏÂÒÁÖÅÎÉÅ, ÞÔÏÂÙ ÕÓÔÁÎÏ×ÉÔØ ÄÒÕÇÕÀ "
 "ÐÉËÔÏÇÒÁÍÍÕ."
 
-#: src/nautilus-sidebar.c:661
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "âÏÌÅÅ ÏÄÎÏÇÏ ÉÚÏÂÒÁÖÅÎÉÑ"
 
-#: src/nautilus-sidebar.c:680
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -8990,11 +9663,11 @@ msgstr ""
 "æÁÊÌ, ËÏÔÏÒÙÊ ×Ù ÕËÁÚÁÌÉ ÎÅ ÌÏËÁÌØÎÙÊ. ÷Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ "
 "ÌÏËÁÌØÎÙÅ ÉÚÏÂÒÁÖÅÎÉÑ × ËÁÞÅÓÔ×Å ÄÒÕÇÉÈ ÐÉËÔÏÇÒÁÍÍ."
 
-#: src/nautilus-sidebar.c:682
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "ôÏÌØËÏ ÌÏËÁÌØÎÙÅ ÉÚÏÂÒÁÖÅÎÉÑ"
 
-#: src/nautilus-sidebar.c:687
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -9002,22 +9675,22 @@ msgstr ""
 "æÁÊÌ, ËÏÔÏÒÙÊ ×Ù ÕËÁÚÁÌÉ ÎÅ Ñ×ÌÑÅÔÓÑ ÉÚÏÂÒÁÖÅÎÉÅÍ. ÷Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ "
 "ÔÏÌØËÏ ÌÏËÁÌØÎÙÅ ÉÚÏÂÒÁÖÅÎÉÑ × ËÁÞÅÓÔ×Å ÄÒÕÇÉÈ ÐÉËÔÏÇÒÁÍÍ."
 
-#: src/nautilus-sidebar.c:689
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "ôÏÌØËÏ ÉÚÏÂÒÁÖÅÎÉÑ"
 
-#: src/nautilus-sidebar.c:1247
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "ïÔËÒÙÔØ Ó ÐÏÍÏÝØÀ %s"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1283
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "ïÔËÒÙÔØ Ó ÐÏÍÏÝØÀ..."
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1390
+#: src/nautilus-sidebar.c:1424
 #, fuzzy
 msgid "  Empty Trash  "
 msgstr "ïÞÉÓÔÉÔØ ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ"
@@ -9037,43 +9710,45 @@ msgstr "ðÅÒÅËÌÀÞÁÔÅÌØ ÔÅÍ Nautilus"
 msgid "Nautilus Theme:"
 msgstr "ôÅÍÁ Nautilus:"
 
-#: src/nautilus-theme-selector.c:276
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:278
 #, fuzzy
 msgid "  Add New Theme  "
 msgstr " äÏÂÁ×ÉÔØ ÎÏ×ÕÀ ÔÅÍÕ "
 
-#: src/nautilus-theme-selector.c:285
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:288
 #, fuzzy
 msgid "  Remove Theme  "
 msgstr " õÄÁÌÉÔØ ÔÅÍÕ "
 
-#: src/nautilus-theme-selector.c:397
+#: src/nautilus-theme-selector.c:400
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid theme folder."
 msgstr "éÚ×ÉÎÉÔÅ, ÎÏ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÄÈÏÄÑÝÉÍ ËÁÔÁÌÏÇÏÍ ÔÅÍ."
 
-#: src/nautilus-theme-selector.c:398
+#: src/nautilus-theme-selector.c:401
 msgid "Couldn't add theme"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÔÅÍÕ"
 
-#: src/nautilus-theme-selector.c:426
+#: src/nautilus-theme-selector.c:429
 #, c-format
 msgid "Sorry, but the \"%s\" theme couldn't be installed."
 msgstr "éÚ×ÉÎÉÔÅ, ÎÏ ÔÅÍÁ %s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎÁ."
 
-#: src/nautilus-theme-selector.c:427
+#: src/nautilus-theme-selector.c:430
 msgid "Couldn't install theme"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÔÅÍÕ"
 
-#: src/nautilus-theme-selector.c:460
+#: src/nautilus-theme-selector.c:463
 msgid "Select a theme folder to add as a new theme:"
 msgstr "÷ÙÂÅÒÉÔÅ ËÁÔÁÌÏÇ ÔÅÍ ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ ÎÏ×ÏÊ ÔÅÍÙ:"
 
-#: src/nautilus-theme-selector.c:492 src/nautilus-theme-selector.c:539
+#: src/nautilus-theme-selector.c:495 src/nautilus-theme-selector.c:542
 msgid "Click on a theme to remove it."
 msgstr "ýÅÌËÎÉÔÅ ÎÁ ÔÅÍÅ, ÞÔÏÂÙ ÕÄÁÌÉÔØ ÅÅ."
 
-#: src/nautilus-theme-selector.c:542
+#: src/nautilus-theme-selector.c:545
 msgid ""
 "Click on a theme to change the\n"
 "appearance of Nautilus."
@@ -9082,11 +9757,11 @@ msgstr ""
 "×ÎÅÛÎÅÇÏ ×ÉÄÁ Nautilus."
 
 #. change the add button label back to it's normal state
-#: src/nautilus-theme-selector.c:555
+#: src/nautilus-theme-selector.c:558
 msgid "Add New Theme"
 msgstr "äÏÂÁ×ÉÔØ ÎÏ×ÕÀ ÔÅÍÕ"
 
-#: src/nautilus-theme-selector.c:582
+#: src/nautilus-theme-selector.c:585
 msgid ""
 "Sorry, but you can't remove the current theme. Please change to another "
 "theme before removing this one."
@@ -9094,34 +9769,34 @@ msgstr ""
 "éÚ×ÉÎÉÔÅ, ×Ù ÎÅ ÍÏÖÅÔÅ ÕÄÁÌÉÔØ ÔÅËÕÝÕÀ ÔÅÍÕ. ðÏÖÁÌÕÊÓÔÁ ÐÅÒÅËÌÀÞÉÔÅÓØ ÎÁ "
 "ÄÒÕÇÕÀ ÔÅÍÕ ÄÏ ÕÄÁÌÅÎÉÑ ÜÔÏÊ."
 
-#: src/nautilus-theme-selector.c:584
+#: src/nautilus-theme-selector.c:587
 msgid "Can't delete current theme"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÔÅËÕÝÕÀ ÔÅÍÕ"
 
-#: src/nautilus-theme-selector.c:605
+#: src/nautilus-theme-selector.c:608
 msgid "Sorry, but that theme could not be removed!"
 msgstr "éÚ×ÉÎÉÔÅ, ÎÏ ÜÔÕ ÔÅÍÕ ÎÅ ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ!"
 
-#: src/nautilus-theme-selector.c:606
+#: src/nautilus-theme-selector.c:609
 msgid "Couldn't remove theme"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÔÅÍÕ"
 
-#: src/nautilus-theme-selector.c:713
+#: src/nautilus-theme-selector.c:716
 #, c-format
 msgid "No description available for the \"%s\" theme"
 msgstr "îÅÔ ÄÏÓÔÕÐÎÏÇÏ ÏÐÉÓÁÎÉÑ ÄÌÑ ÔÅÍÙ \"%s\""
 
-#: src/nautilus-window.c:582
+#: src/nautilus-window.c:637
 #, fuzzy
 msgid "View as ..."
 msgstr "ðÏËÁÚÁÔØ ËÁË ÄÒÕÇÏÅ..."
 
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1276
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "ðÏËÁÚÁÔØ ËÁË ÄÒÕÇÏÅ..."
 
-#: src/nautilus-window.c:1677
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "úÁËÒÙÔØ"
 
@@ -9135,23 +9810,23 @@ msgstr "úÁËÒÙÔØ"
 msgid "Preview Release %s: %s"
 msgstr "ðÒÅÄ×ÁÒÉÔÅÌØÎÙÊ ×ÙÐÕÓË %s: %s"
 
-#: src/nautilus-window-manage-views.c:812
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "óÂÏÊ ÐÒÏÓÍÏÔÒÁ"
 
-#: src/nautilus-window-manage-views.c:823
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
 "view or go to a different location."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:834
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:993
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
@@ -9159,30 +9834,30 @@ msgstr ""
 "ïÄÎÁ ÉÚ ÂÏËÏ×ÙÈ ÐÁÎÅÌÅÊ ×ÙÚ×ÁÌÁ ÏÛÉÂËÕ É ÎÅ ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÄÁÌØÛÅ.\n"
 "ë ÓÏÖÁÌÅÎÉÀ ÎÅ×ÏÚÍÏÖÎÏ ÓËÁÚÁÔØ ËÁËÁÑ ÉÍÅÎÎÏ."
 
-#: src/nautilus-window-manage-views.c:997
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
 "happening, you might want to turn this panel off."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1002
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "óÂÏÊ ÂÏËÏ×ÏÊ ÐÁÎÅÌÉ"
 
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr "îÅ ÕÄÁÌÏÓØ ÎÁÊÔÉ \"%s\". ðÏÖÁÌÕÊÓÔÁ ÐÒÏ×ÅÒØÔÅ ××ÏÄ É ÐÏÐÒÏÂÕÊÔÅ ÓÎÏ×Á."
 
-#: src/nautilus-window-manage-views.c:1223
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
 msgstr ""
 "\"%s\" ÎÅ ÐÒÁ×ÉÌØÎÏÅ ÍÅÓÔÏ. ðÏÖÁÌÕÊÓÔÁ ÐÒÏ×ÅÒØÔÅ ××ÏÄ É ÐÏÐÒÏÂÕÊÔÅ ÓÎÏ×Á."
 
-#: src/nautilus-window-manage-views.c:1237
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -9191,7 +9866,7 @@ msgstr ""
 "îÅ×ÏÚÍÏÖÎÏ ÐÏËÁÚÁÔØ \"%s\", ÐÏÔÏÍÕ ÞÔÏ îÁÕÔÉÌÕÓ ÎÅ ÍÏÖÅÔ ÏÂÒÁÂÁÔÙ×ÁÔØ ÆÁÊÌÙ "
 "ÔÁËÏÇÏ ÔÉÐÁ."
 
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr ""
@@ -9199,26 +9874,26 @@ msgstr ""
 "\"%s\"."
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1257
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 "îÅ×ÏÚÍÏÖÎÏ ÐÏËÁÚÁÔØ \"%s\", ÐÏÔÏÍÕ ÞÔÏ îÁÕÔÉÌÕÓ ÎÅ ÍÏÖÅÔ ÏÂÒÁÂÁÔÙ×ÁÔØ %s: "
 "ÐÏÌÏÖÅÎÉÑ."
 
-#: src/nautilus-window-manage-views.c:1263
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr ""
 "îÅ×ÏÚÍÏÖÎÏ ÐÏËÁÚÁÔØ \"%s\", ÐÏÔÏÍÕ ÞÔÏ îÁÕÔÉÌÕÓ ÎÅ ÕÄÁÌÁÓØ ÐÏÐÙÔËÁ "
 "ÒÅÇÉÓÔÒÁÃÉÉ."
 
-#: src/nautilus-window-manage-views.c:1268
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏËÁÚÁÔØ \"%s\", ÉÚ-ÚÁ ÏÔËÁÚÁ × ÄÏÓÔÕÐÅ."
 
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1287
 #, fuzzy, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
@@ -9227,7 +9902,7 @@ msgstr ""
 "îÅ×ÏÚÍÏÖÎÏ ÐÏËÁÚÁÔØ \"%s\", ÐÏÔÏÍÕ ÞÔÏ ÈÏÓÔ ÎÅ ÎÁÊÄÅÎ. õÂÅÄÉÔÅÓØ, ÞÔÏ Õ ×ÁÓ "
 "ÐÒÁ×ÉÌØÎÏ ÎÁÓÔÒÏÅÎ ÐÒÏËÓÉ."
 
-#: src/nautilus-window-manage-views.c:1287
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -9236,7 +9911,7 @@ msgstr ""
 "îÅ×ÏÚÍÏÖÎÏ ÐÏËÁÚÁÔØ \"%s\", ÐÏÔÏÍÕ ÞÔÏ ÉÍÑ ÈÏÓÔÁ ÂÙÌÏ ÐÕÓÔÙÍ. õÂÅÄÉÔÅÓØ, ÞÔÏ "
 "Õ ×ÁÓ ÐÒÁ×ÉÌØÎÏ ÎÁÓÔÒÏÅÎ ÐÒÏËÓÉ."
 
-#: src/nautilus-window-manage-views.c:1299
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -9244,23 +9919,23 @@ msgid ""
 "running."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1303
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "ðÏÉÓË ÎÅÄÏÓÔÕÐÅÎ"
 
-#: src/nautilus-window-manage-views.c:1307
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "îÁÕÔÉÌÕÓ ÎÅ ÍÏÖÅÔ ÐÏËÁÚÁÔØ \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1312
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏËÁÚÁÔØ ÐÏÌÏÖÅÎÉÅ"
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:313
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
@@ -9268,39 +9943,42 @@ msgstr ""
 "÷Ù Õ×ÅÒÅÎÙ × ÔÏÍ ÞÔÏ ÈÏÔÉÔÅ ÓÔÅÒÅÔØ ÉÓÔÏÒÉÀ? åÓÌÉ ×Ù ÜÔÏ ÓÄÅÌÁÅÔÅ, ÔÏ ÎÅ "
 "ÓÍÏÖÅÔÅ ×ÏÓÐÒÏÉÚ×ÅÓÔÉ ÅÅ."
 
-#: src/nautilus-window-menus.c:316
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
 "÷Ù Õ×ÅÒÅÎÙ × ÔÏÍ ÞÔÏ ÈÏÔÉÔÅ ÞÔÏÂÙ Nautilus ÕÄÁÌÉÌ ÉÎÆÏÒÍÁÃÉÀ Ï ÔÏÍ ËÁËÉÅ "
 "ÍÅÓÔÁ ×Ù ÐÏÓÅÔÉÌÉ?"
 
-#: src/nautilus-window-menus.c:321
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "úÁÂÙÔØ ÉÓÔÏÒÉÀ?"
 
-#: src/nautilus-window-menus.c:322
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "úÁÂÙÔØ"
 
-#: src/nautilus-window-menus.c:425
-msgid "Show Status Bar"
+#: src/nautilus-window-menus.c:466
+#, fuzzy
+msgid "Show St_atus Bar"
 msgstr "ðÏËÁÚÁÔØ ÓÔÒÏËÕ ÓÏÓÔÏÑÎÉÑ"
 
-#: src/nautilus-window-menus.c:431
-msgid "Show Sidebar"
+#: src/nautilus-window-menus.c:472
+#, fuzzy
+msgid "Show _Sidebar"
 msgstr "ðÏËÁÚÁÔØ ÂÏËÏ×ÕÀ ÐÁÎÅÌØ"
 
-#: src/nautilus-window-menus.c:437
+#: src/nautilus-window-menus.c:478
 #, fuzzy
-msgid "Show Toolbar"
+msgid "Show _Toolbar"
 msgstr "ðÏËÁÚÁÔØ ÐÁÎÅÌØ ÉÎÓÔÒÕÍÅÎÔÏ×"
 
-#: src/nautilus-window-menus.c:443
-msgid "Show Location Bar"
+#: src/nautilus-window-menus.c:484
+#, fuzzy
+msgid "Show Location _Bar"
 msgstr "ðÏËÁÚÁÔØ ÓÔÒÏËÕ ÒÁÓÐÏÌÏÖÅÎÉÑ"
 
-#: src/nautilus-window-menus.c:494
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "îÁÓÔÒÏÊËÉ"
 
@@ -9310,11 +9988,11 @@ msgstr "îÁÓÔÒÏÊËÉ"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:571
+#: src/nautilus-window-menus.c:618
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr "á×ÔÏÒÓËÏÅ ÐÒÁ×Ï (Ó) 1999-2001 Eazel, Inc."
 
-#: src/nautilus-window-menus.c:573
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -9331,12 +10009,12 @@ msgstr ""
 #. * bottom of the about box to give credit
 #. * to the translator(s)
 #.
-#: src/nautilus-window-menus.c:582
+#: src/nautilus-window-menus.c:629
 #, fuzzy
 msgid "Translator Credits"
 msgstr "ôÒÁÎÚÁËÃÉÉ ÓÏÈÒÁÎÅÎÙ × %s"
 
-#: src/nautilus-window-menus.c:752
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -9345,32 +10023,28 @@ msgstr ""
 "òÁÓÐÏÌÏÖÅÎÉÅ \"%s\" ÎÅ ÓÕÝÅÓÔ×ÕÅÔ. èÏÔÉÔÅ ÕÄÁÌÉÔØ ×ÓÅ ÚÁËÌÁÄËÉ Ó ÜÔÉÍ "
 "ÐÏÌÏÖÅÎÉÅÍ ÉÚ ×ÁÛÅÇÏ ÓÐÉÓËÁ?"
 
-#: src/nautilus-window-menus.c:756
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "úÁËÌÁÄËÁ ÄÌÑ ÎÅÓÕÝÅÓÔ×ÕÀÝÅÇÏ ÒÁÓÐÏÌÏÖÅÎÉÑ"
 
-#: src/nautilus-window-menus.c:770
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "òÁÓÐÏÌÏÖÅÎÉÅ \"%s\" ÂÏÌØÛÅ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ."
 
-#: src/nautilus-window-menus.c:771
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "ðÅÒÅÊÔÉ Ë ÎÅÓÕÝÅÓÔ×ÕÀÝÅÍÕ ÒÁÓÐÏÌÏÖÅÎÉÀ"
 
-#: src/nautilus-window-menus.c:840
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "ðÅÒÅÊÔÉ Ë ÍÅÓÔÕ ÕËÁÚÁÎÎÏÍÕ ÚÁËÌÁÄËÏÊ"
 
-#: src/nautilus-window-menus.c:1351
-msgid "_Browse"
-msgstr "ðÒÏÓÍÏÔÒÅÔØ"
-
-#: src/nautilus-window-toolbars.c:395
+#: src/nautilus-window-toolbars.c:402
 msgid "Back"
 msgstr "îÁÚÁÄ"
 
-#: src/nautilus-window-toolbars.c:397
+#: src/nautilus-window-toolbars.c:404
 msgid "Forward"
 msgstr "÷ÐÅÒÅÄ"
 
@@ -9381,9 +10055,253 @@ msgstr "÷ÐÅÒÅÄ"
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 
-#: src/nautilus-zoom-control.c:592
-msgid "%d%%"
-msgstr "%d%%"
+#~ msgid "System"
+#~ msgstr "óÉÓÔÅÍÁ"
+
+#~ msgid "Config files"
+#~ msgstr "æÁÊÌÙ ÎÁÓÔÒÏÅË"
+
+#~ msgid "Command Line"
+#~ msgstr "ëÏÍÁÎÄÎÁÑ ÓÔÒÏËÁ"
+
+#~ msgid "APIs"
+#~ msgstr "áPI"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "òÁÚÎÏÅ"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "ëÉÒÉÌÌÉÃÁ (KOI8-R)"
+
+#~ msgid "Verifying %s..."
+#~ msgstr "ðÒÏ×ÅÒËÁ %s..."
+
+#~ msgid "Failed on \"%s\""
+#~ msgstr "óÂÏÊ ÎÁ \"%s\""
+
+#~ msgid "Checking \"%s\" (%ld/%ld)"
+#~ msgstr "ðÒÏ×ÅÒËÁ \"%s\" (%ld/%ld)"
+
+#~ msgid "Package Contents"
+#~ msgstr "óÏÓÔÁ× ÐÁËÅÔÁ"
+
+#~ msgid "Package Title"
+#~ msgstr "îÁÚ×ÁÎÉÅ ÐÁËÅÔÁ"
+
+#~ msgid "Installed Size: "
+#~ msgstr "òÁÚÍÅÒ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ:"
+
+#~ msgid "<size>"
+#~ msgstr "<ÒÁÚÍÅÒ>"
+
+#~ msgid "Install Date: "
+#~ msgstr "äÁÔÁ ÕÓÔÁÎÏ×ËÉ:"
+
+#~ msgid "<unknown>"
+#~ msgstr "<ÎÅÉÚ×ÅÓÔÎÏ>"
+
+#~ msgid "License: "
+#~ msgstr "ìÉÃÅÎÚÉÑ:"
+
+#~ msgid "Build Date: "
+#~ msgstr "äÁÔÁ ÓÂÏÒËÉ:"
+
+#~ msgid "Distribution: "
+#~ msgstr "äÉÓÔÒÉÂÕÔÉ×:"
+
+#~ msgid "Vendor: "
+#~ msgstr "ðÒÏÉÚ×ÏÄÉÔÅÌØ:"
+
+#~ msgid "Update"
+#~ msgstr "ïÂÎÏ×ÉÔØ"
+
+#~ msgid "Uninstall"
+#~ msgstr "õÄÁÌÉÔØ"
+
+#~ msgid "Verify"
+#~ msgstr "ðÒÏ×ÅÒÉÔØ"
+
+#~ msgid "Package Contents: %d files"
+#~ msgstr "óÏÓÔÁ× ÐÁËÅÔÁ: %d ÆÁÊÌÏ×"
+
+#~ msgid "Package \"%s\" "
+#~ msgstr "ðÁËÅÔ \"%s\" "
+
+#~ msgid "Verification completed, package ok."
+#~ msgstr "ðÒÏ×ÅÒËÁ ÚÁ×ÅÒÛÅÎÁ, ÐÁËÅÔ ÉÓÐÒÁ×ÅÎ."
+
+#~ msgid "%s would break other installed packages\n"
+#~ msgstr "%s ÂÕÄÅÔ ÒÁÚÒÕÛÁÔØ ÄÒÕÇÉÅ ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÐÁËÅÔÙ\n"
+
+#~ msgid "%s is needed, but could not be found\n"
+#~ msgstr "%s ÎÕÖÅÎ, ÎÏ ÎÅ ÎÁÊÄÅÎ\n"
+
+#~ msgid "%s causes a circular dependency problem\n"
+#~ msgstr "%s ×ÙÚÙ×ÁÅÔ ÐÒÏÂÌÅÍÕ ËÒÕÇÏ×ÏÊ ÚÁ×ÉÓÉÍÏÓÔÉ\n"
+
+#~ msgid "Installing %s failed because of the following issue(s):\n"
+#~ msgstr "óÂÏÊ ÕÓÔÁÎÏ×ËÉ %s ÐÏ ÓÌÅÄÕÀÝÉÍ ÐÒÉÞÉÎÁÍ:\n"
+
+#~ msgid "Uninstalling %s failed because of the following issue(s):\n"
+#~ msgstr "óÂÏÊ ÕÄÁÌÅÎÉÑ %s ÐÏ ÓÌÅÄÕÀÝÉÍ ÐÒÉÞÉÎÁÍ:\n"
+
+#~ msgid "Uninstall failed..."
+#~ msgstr "óÂÏÊ ÕÄÁÌÅÎÉÑ..."
+
+#~ msgid "Uninstall Failed"
+#~ msgstr "óÂÏÊ ÕÄÁÌÅÎÉÑ ÐÁËÅÔÁ"
+
+#~ msgid "Install failed..."
+#~ msgstr "óÂÏÊ ÕÓÔÁÎÏ×ËÉ..."
+
+#~ msgid "Install Failed"
+#~ msgstr "óÂÏÊ ÕÓÔÁÎÏ×ËÉ"
+
+#~ msgid "Package"
+#~ msgstr "ðÁËÅÔ"
+
+#~ msgid "Package Viewer"
+#~ msgstr "ðÒÏÇÒÁÍÍÁ ÐÒÏÓÍÏÔÒÁ ÐÁËÅÔÏ×"
+
+#~ msgid "RPM component"
+#~ msgstr "ëÏÍÐÏÎÅÎÔ RPM"
+
+#~ msgid "View as Package"
+#~ msgstr "ðÏËÁÚÁÔØ ËÁË ÐÁËÅÔ"
+
+#~ msgid "rpm view"
+#~ msgstr "ÐÒÏÓÍÏÔÒ rpm"
+
+#~ msgid "Force install"
+#~ msgstr "ðÒÉÎÕÄÉÔÅÌØÎÁÑ ÕÓÔÁÎÏ×ËÁ"
+
+#~ msgid "%s is not installed"
+#~ msgstr "%s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ"
+
+#~ msgid " · %s is in the Gnome menu.\n"
+#~ msgstr " · %s ÅÓÔØ × ÍÅÎÀ Gnome.\n"
+
+#~ msgid "Welcome, %s!"
+#~ msgstr "äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ, %s!"
+
+#~ msgid "_Fonts"
+#~ msgstr "ûÒÉÆÔÙ"
+
+#~ msgid "LWN.net"
+#~ msgstr "LWN.net"
+
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÐÅÒÅÍÅÓÔÉÔØ ÆÁÊÌ ÓÁÍ × ÓÅÂÑ."
+
+#~ msgid "Can't Move Onto Self"
+#~ msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÍÅÓÔÉÔØ × ÓÅÂÑ"
+
+#~ msgid "You cannot throw \"%s\" into the Trash."
+#~ msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÐÏÍÅÓÔÉÔØ \"%s\" × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ."
+
+#~ msgid "Error Moving to Trash"
+#~ msgstr "ïÛÉÂËÁ ÐÅÒÅÍÅÝÅÎÉÑ × ÍÕÓÏÒÎÕÀ ËÏÒÚÉÎÕ"
+
+#~ msgid "Font"
+#~ msgstr "ûÒÉÆÔ"
+
+#~ msgid "fixed"
+#~ msgstr "ÆÉËÓÉÒÏ×ÁÎÎÙÊ"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00 äð"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00 äð"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00 äð"
+
+#~ msgid "current theme"
+#~ msgstr "ÔÅËÕÝÁÑ ÔÅÍÁ"
+
+#~ msgid "Use this font family to display file names:"
+#~ msgstr "óÅÍÅÊÓÔ×Ï ÛÒÉÆÔÁ ÉÓÐÏÌØÚÕÅÍÏÇÏ ÄÌÑ ÏÔÏÂÒÁÖÅÎÉÑ ÎÁÚ×ÁÎÉÊ ÆÁÊÌÏ×:"
+
+#~ msgid "Can add Content"
+#~ msgstr "íÏÖÎÏ ÄÏÂÁ×ÉÔØ ÓÏÄÅÒÖÉÍÏÅ"
+
+#~ msgid "Appearance Settings"
+#~ msgstr "îÁÓÔÒÏÊËÉ ×ÎÅÛÎÅÇÏ ×ÉÄÁ"
+
+#~ msgid "Windows & Desktop Settings"
+#~ msgstr "õÓÔÁÎÏ×ËÉ ÏËÏÎ É ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ"
+
+#, fuzzy
+#~ msgid "Icon & List Views Settings"
+#~ msgstr "õÓÔÁÎÏ×ËÉ ÐÒÏÓÍÏÔÒÁ ËÁÔÁÌÏÇÁ"
+
+#, fuzzy
+#~ msgid "Sidebar Panels Settings"
+#~ msgstr "ïÐÉÓÁÎÉÅ ÂÏËÏ×ÏÊ ÐÁÎÅÌÉ"
+
+#~ msgid "Navigation Settings"
+#~ msgstr "îÁÓÔÒÏÊËÉ ÎÁ×ÉÇÁÃÉÉ"
+
+#~ msgid "Speed Tradeoffs Settings"
+#~ msgstr "îÁÓÔÒÏÊËÁ ÎÅÄÏÓÔÁÔËÁ ÓËÏÒÏÓÔÉ"
+
+#~ msgid "Search Settings"
+#~ msgstr "îÁÓÔÒÏÊËÉ ÐÏÉÓËÁ"
+
+#~ msgid "Details"
+#~ msgstr "äÅÔÁÌÉ"
+
+#~ msgid "Warning"
+#~ msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ"
+
+#~ msgid "Error"
+#~ msgstr "ïÛÉÂËÁ"
+
+#~ msgid "Question"
+#~ msgstr "÷ÏÐÒÏÓ"
+
+#~ msgid "_Cut Text"
+#~ msgstr "÷ÙÒÅÚÁÔØ ÔÅËÓÔ"
+
+#~ msgid "Open in _New Window"
+#~ msgstr "ïÔËÒÙÔØ × ÎÏ×ÏÍ ÏËÎÅ"
+
+#~ msgid "New _Folder"
+#~ msgstr "îÏ×ÁÑ ÐÁÐËÁ"
+
+#~ msgid "_Open in New Window"
+#~ msgstr "ïÔËÒÙÔØ × ÎÏ×ÏÍ ÏËÎÅ"
+
+#~ msgid "_Select All Files"
+#~ msgstr "÷ÙÄÅÌÉÔØ ×ÓÅ ÆÁÊÌÙ"
+
+#~ msgid "helvetica"
+#~ msgstr "ÇÅÌØ×ÅÔÉËÁ"
+
+#~ msgid "medium"
+#~ msgstr "ÓÒÅÄÎÉÊ"
+
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "õÄÁÌÉÔØ ×ÙÄÅÌÅÎÎÙÊ ÔÅËÓÔ ÎÅ ÐÏÍÅÝÁÑ ÅÇÏ × ÂÕÆÅÒ ÏÂÍÅÎÁ"
+
+#~ msgid "Use Advanced settings"
+#~ msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÒÁÓÛÉÒÅÎÎÙÅ ÎÁÓÔÒÏÊËÉ"
+
+#~ msgid "Use Beginner settings"
+#~ msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÎÁÓÔÒÏÊËÉ ÎÏ×ÉÞËÁ"
+
+#~ msgid "Use Intermediate settings"
+#~ msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÐÒÏÍÅÖÕÔÏÞÎÙÅ ÎÁÓÔÒÏÊËÉ"
+
+#~ msgid "_New Window"
+#~ msgstr "îÏ×ÏÅ ÏËÎÏ"
+
+#~ msgid "_Web Search"
+#~ msgstr "ðÏÉÓË × Web"
+
+#~ msgid "_Browse"
+#~ msgstr "ðÒÏÓÍÏÔÒÅÔØ"
 
 #~ msgid "Mozilla Test"
 #~ msgstr "ôÅÓÔ Mozilla"
@@ -9439,90 +10357,12 @@ msgstr "%d%%"
 #~ msgid "Package %s conflicts with %s-%s"
 #~ msgstr "ðÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó %s-%s"
 
-#~ msgid "Messages"
-#~ msgstr "óÏÏÂÝÅÎÉÑ"
-
-#~ msgid "Downloading \"%s\""
-#~ msgstr "óËÁÞÉ×ÁÎÉÅ \"%s\""
-
-#~ msgid ""
-#~ "The package \"%s\" needs \"%s\" to run.\n"
-#~ "I've downloaded it successfully."
-#~ msgstr ""
-#~ "ðÁËÅÔ \"%s\" ÔÒÅÂÕÅÔ \"%s\" ÄÌÑ ÚÁÐÕÓËÁ.\n"
-#~ "óËÁÞÁÎÏ ÕÓÐÅÛÎÏ."
-
-#~ msgid "I've successfully downloaded package \"%s\"."
-#~ msgstr "õÓÐÅÛÎÏ ÓËÁÞÁÎ ÐÁËÅÔ \"%s\"."
-
-#~ msgid "%dK of %dK"
-#~ msgstr "%dK ÉÚ %dK"
-
 #~ msgid "Getting information about package \"%s\" ..."
 #~ msgstr "ðÏÌÕÞÅÎÉÅ ÉÎÆÏÒÍÁÃÉÉ Ï ÐÁËÅÔÅ \"%s\"..."
 
-#~ msgid "Preparing to download packages..."
-#~ msgstr "ðÏÄÇÏÔÏ×ËÁ Ë ÓËÁÞÉ×ÁÎÉÀ ÐÁËÅÔÏ×..."
-
-#~ msgid ""
-#~ "I'm about to download and install the following packages:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "ðÌÁÎÉÒÕÅÔÓÑ ÓËÁÞÁÔØ É ÕÓÔÁÎÏ×ÉÔØ ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ:\n"
-#~ "\n"
-
-#~ msgid "for a total of %ld MB."
-#~ msgstr "×ÓÅÇÏ %ld íâ."
-
-#~ msgid "for a total of %ld KB."
-#~ msgstr "×ÓÅÇÏ %ld ëâ."
-
-#~ msgid ""
-#~ "\n"
-#~ "Is this okay?"
-#~ msgstr ""
-#~ "\n"
-#~ "üÔÏ ÐÒÁ×ÉÌØÎÏ?"
-
-#~ msgid "Downloading 1 package (%s)"
-#~ msgstr "óËÁÞÉ×ÁÎÉÅ 1 ÐÁËÅÔÁ (%s)"
-
-#~ msgid "Download of package \"%s\" failed!"
-#~ msgstr "óËÁÞÉ×ÁÎÉÅ ÐÁËÅÔÁ %s ÎÅ ÕÄÁÌÏÓØ!"
-
-#~ msgid ""
-#~ "The package \"%s\" needed \"%s\" to run.\n"
-#~ "I've downloaded and installed it."
-#~ msgstr ""
-#~ "ðÁËÅÔÕ \"%s\" ÔÒÅÂÕÅÔÓÑ ÄÌÑ ÚÁÐÕÓËÁ \"%s\".\n"
-#~ "ïÎÏ ÓËÁÞÉ×ÁÅÔÓÑ É ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ."
-
 #~ msgid "I've downloaded and installed package \"%s\"."
 #~ msgstr "óËÁÞÁÎ É ÕÓÔÁÎÏ×ÌÅÎ ÐÁËÅÔ %s."
 
-#~ msgid "I'd like to try the following :"
-#~ msgstr "ðÌÁÎÉÒÕÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ:"
-
-#~ msgid "Installation aborted."
-#~ msgstr "õÓÔÁÎÏ×ËÁ ÐÒÅÒ×ÁÎÁ."
-
-#~ msgid "Installation complete!"
-#~ msgstr "õÓÔÁÎÏ×ËÁ ÚÁ×ÅÒÛÅÎÁ!"
-
-#~ msgid ""
-#~ "A core package of Nautilus has been\n"
-#~ "updated.  You should restart Nautilus.\n"
-#~ "\n"
-#~ "Do you wish to do that now?"
-#~ msgstr ""
-#~ "ïÓÎÏ×ÎÏÊ ÐÁËÅÔ Nautilus ÂÙÌ ÏÂÎÏ×ÌÅÎ.\n"
-#~ "÷ÁÍ ÎÅÏÂÈÏÄÉÍÏ ÐÅÒÅÚÁÐÕÓÔÉÔØ Nautilus.\n"
-#~ "\n"
-#~ "èÏÔÉÔÅ ÓÄÅÌÁÔØ ÜÔÏ ÓÅÊÞÁÓ?"
-
-#~ msgid "Installation failed on %s"
-#~ msgstr "óÂÏÊ ÕÓÔÁÎÏ×ËÉ ÎÁ %s"
-
 #~ msgid "Enable warning before each upload."
 #~ msgstr "÷ËÌÀÞÉÔØ ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ ÐÅÒÅÄ ËÁÖÄÙÍ ×ÙËÁÞÉ×ÁÎÉÅÍ."
 
@@ -9569,9 +10409,6 @@ msgstr "%d%%"
 #~ "ïÛÉÂËÁ: îÅÐÒÁ×ÉÌØÎÙÊ ÓÉÎÔÁËÓÉÓ\n"
 #~ "óÉÎÔÁËÓÉÓ: %s\n"
 
-#~ msgid "Secret"
-#~ msgstr "óÅËÒÅÔ"
-
 #~ msgid "Caldera"
 #~ msgstr "Caldera"
 
@@ -9791,9 +10628,6 @@ msgstr "%d%%"
 #~ msgid "regular files"
 #~ msgstr "ÏÂÙÞÎÙÅ ÆÁÊÌÙ"
 
-#~ msgid "text files"
-#~ msgstr "ÔÅËÓÔÏ×ÙÅ ÆÁÊÌÙ"
-
 #~ msgid "applications"
 #~ msgstr "ÐÒÉÌÏÖÅÎÉÑ"
 
diff --git a/po/sk.po b/po/sk.po
index 7b7a51a43..d490c1c49 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,10 +1,15 @@
 # Nautilus Slovak translation.
 # Copyright (C) 2000-2001 Free Software Foundation, Inc.
 # Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>, 2000-1.
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 1.0\n"
-"POT-Creation-Date: 2001-03-15 16:23+0100\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-03-15 17:02CET\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -146,8 +151,8 @@ msgid "Previous"
 msgstr "Predchádzajúca"
 
 #: components/help/converters/gnome-db2html2/gdb3html.c:721
-#: libnautilus-extensions/nautilus-global-preferences.c:686
-#: src/nautilus-shell-ui.xml.h:38
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "Domov"
 
@@ -336,16 +341,14 @@ msgid "Kernel Routines"
 msgstr "Slu¾by jadra"
 
 #: components/help/hyperbola-filefmt.c:703
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
 msgid "Info"
 msgstr "Info"
 
-#: components/help/hyperbola-nav-tree.c:279
+#: components/help/hyperbola-nav-tree.c:310
 msgid "Introductory Documents:"
 msgstr "Dokumenty pre zaèiatoèníkov:"
 
-#: components/help/hyperbola-nav-tree.c:293
+#: components/help/hyperbola-nav-tree.c:324
 msgid "Documents by Subject:"
 msgstr "Dokumenty podµa predmetu:"
 
@@ -418,7 +421,7 @@ msgstr "Panel histórie pre boèný panel"
 msgid "History sidebar panel for Nautilus"
 msgstr "Panel histórie pre boèný panel Nautilu"
 
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "Nie je mo¾né inicializova» Bonobo"
 
@@ -476,7 +479,7 @@ msgstr "Zabi» pohµad zábudlivca obsahu"
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "_Súbor"
 
@@ -545,7 +548,8 @@ msgstr "Zábudlivec pre boèný panel pre Nautilus"
 
 #: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:2
 msgid "Nautilus sidebar loser component's factory"
-msgstr "Vytváracie rozhranie pre komponent Zábudlivec pre boèný panel pre Nautilus"
+msgstr ""
+"Vytváracie rozhranie pre komponent Zábudlivec pre boèný panel pre Nautilus"
 
 #: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:3
 msgid "Nautilus sidebar loser factory"
@@ -560,7 +564,7 @@ msgid "Sidebar Loser"
 msgstr "Zábudlivec pre boèný panel"
 
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -570,7 +574,7 @@ msgstr ""
 "  %s"
 
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -1016,7 +1020,6 @@ msgid "Oldies"
 msgstr "Oldies"
 
 #: components/music/mpg123.c:32
-#: libnautilus-extensions/nautilus-font-picker.c:117
 msgid "Other"
 msgstr "Iná"
 
@@ -1636,7 +1639,8 @@ msgstr "Nie je mo¾né prehra» súbor"
 
 #: components/music/nautilus-music-view.c:1199
 msgid "Sorry, but the music view can't play non-local files yet."
-msgstr "Je mi µúto, ale pohµad Hudba nepodporuje prehrávanie vzdialených súborov."
+msgstr ""
+"Je mi µúto, ale pohµad Hudba nepodporuje prehrávanie vzdialených súborov."
 
 #: components/music/nautilus-music-view.c:1200
 msgid "Can't Play Remote Files"
@@ -1655,10 +1659,10 @@ msgid "Pause"
 msgstr "Pauza"
 
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:945
-#: libnautilus-extensions/nautilus-file-operations.c:960
 #: libnautilus-extensions/nautilus-file-operations.c:979
-#: src/nautilus-shell-ui.xml.h:60
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Stop"
 
@@ -1708,23 +1712,6 @@ msgstr "Vytváracie rozhranie pre hudobný pohµad"
 msgid "View as Music"
 msgstr "Zobrazi» ako hudbu"
 
-#. FIXME: eventually, get this from preferences
-#. set up the default font
-#: components/notes/nautilus-notes.c:200
-#: components/text/nautilus-text-view.c:186
-#: libnautilus-extensions/nautilus-global-preferences.c:1118
-#: libnautilus-extensions/nautilus-icon-container.c:3333
-#: libnautilus-extensions/nautilus-icon-container.c:3334
-#: libnautilus-extensions/nautilus-icon-container.c:3335
-#: libnautilus-extensions/nautilus-icon-container.c:3336
-#: libnautilus-extensions/nautilus-icon-container.c:3337
-#: libnautilus-extensions/nautilus-icon-container.c:3338
-#: libnautilus-extensions/nautilus-icon-container.c:3339
-#: libnautilus-extensions/nautilus-preferences-item.c:482
-#: src/nautilus-sidebar-title.c:500
-msgid "helvetica"
-msgstr "helvetica"
-
 #: components/notes/Nautilus_View_notes.oaf.in.h:1
 msgid "Factory for annotation view"
 msgstr "Vytváracie rozhranie pre pohµad Poznámky"
@@ -1807,7 +1794,8 @@ msgstr "Zobrazi» ako uká¾ku"
 
 #: components/services/install/command-line/eazel-alt-install-corba.c:107
 msgid "Set the default answer to continue, also default delete to Yes"
-msgstr "Nastavi» ¹tandardnú odpoveï na Pokraèova», èo znamená pri odstraòovaní Áno."
+msgstr ""
+"Nastavi» ¹tandardnú odpoveï na Pokraèova», èo znamená pri odstraòovaní Áno."
 
 #: components/services/install/command-line/eazel-alt-install-corba.c:108
 msgid "Specify search cgi"
@@ -1816,7 +1804,7 @@ msgstr "Zadajte cgi pre hµadanie"
 #: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
 #: components/services/install/command-line/eazel-test-packsys.c:590
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "Ukáza» ladiaci výstup"
 
@@ -1880,171 +1868,174 @@ msgstr "RPM argumenty sú potrebné súbory"
 msgid "Run Query"
 msgstr "Spusti» otázku"
 
-#. Disabled for 1.0
-#. {"revert", 'r', POPT_ARG_NONE, &arg_revert, 0, N_("Revert"), NULL},
-#: components/services/install/command-line/eazel-alt-install-corba.c:127
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
+#, fuzzy
+msgid "Revert"
+msgstr "nikdy"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr "Nastavi» koreò"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:128
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "Nastavi» server"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:129
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
 msgid "Dont print too much, just problems and download"
 msgstr "Nevypisova» príli¹ veµa, iba problémy a s»ahovanie"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:130
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr "Vykona» premenovanie ssl"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:131
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
 msgid "argument is a suite id"
 msgstr "argument je id sady"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "Test"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr "Povoli» pou¾ívateµské meno"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:134
-#: components/services/install/lib/eazel-install-problem.c:1015
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "Povoli» aktualizácie"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "Výstup s viac informáciami"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:136
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
 msgid "Install a specific package version"
 msgstr "In¹talova» danú verziu balíka"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:159
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
 msgid "*** You cannot specify more then one protocol type.\n"
 msgstr "*** Nie je mo¾né zada» viac ako jeden typ protokolu.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:176
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
 msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
 msgstr "*** Odstráni» alebo vráti»? Niekto vytvoril bombu!\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:285
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, c-format
 msgid "File conflict checking %s...\n"
 msgstr "Kontrola konfliktov súborov %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:299
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, c-format
 msgid "File uniqueness checking %s...\n"
 msgstr "Kontrola jednoznaènosti súborov %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:313
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
 #, c-format
 msgid "Feature consistency checking %s...\n"
 msgstr "Kontrola konzistencie funkcíí %s...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:344
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
 #: components/services/install/lib/eazel-install-protocols.c:116
 #: components/services/install/lib/eazel-install-protocols.c:254
 #, c-format
 msgid "Downloading %s..."
 msgstr "S»ahujem %s..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:360
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
 msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
 msgstr "S»ahujem %s... (%d/%d) = %d%% %.1f KB/s"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:368
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
 msgid "Downloading %s... (%d/%d) = %d%%"
 msgstr "S»ahujem %s... (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:376
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
 #, c-format
 msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
 msgstr "S»ahujem %s... (%d/%d) %.1f KB/s Hotovo      \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:381
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
 #, c-format
 msgid "Downloading %s... %3.1f KB/s Done\n"
 msgstr "S»ahujem %s... %3.1f KB/s Hotovo\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:409
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "In¹talujem %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:417
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "Odin¹talovávam %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:439
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "In¹talujem %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Hotovo\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:446
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "Odin¹talovávam %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Hotovo\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:454
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
 msgid "Done\n"
 msgstr "Hotovo\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:474
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
 #, c-format
 msgid "Download of %s FAILED\n"
 msgstr "Stiahnutie %s ZLYHALO\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:496
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
 #, c-format
 msgid "Package %s failed to uninstall.\n"
 msgstr "Zlyhalo odin¹talovanie balíka %s.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:498
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
 #, c-format
 msgid "Package %s failed to install.\n"
 msgstr "Zlyhala in¹talácia balíka %s.\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:519
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
 #, c-format
 msgid "\t· Problem : %s\n"
 msgstr "\t· Problém : %s\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:528
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
 #, c-format
 msgid "\t· Action : %s\n"
 msgstr "\t· Akcia : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:571
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
 msgid "Cancelling operation\n"
 msgstr "Ru¹ím operáciu\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:582
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
 #, c-format
 msgid "About to install a total of %d packages, %dKB\n"
 msgstr "Celkom sa chystám nain¹talova» %d balíkov, %dkB\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:586
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
 #, c-format
 msgid "About to uninstall a total of %d packages, %dKB\n"
 msgstr "Celkom sa chystám odin¹talova» %d balíkov, %dkB\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:590
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
 #, c-format
 msgid "About to revert a total of %d packages, %d KB\n"
 msgstr "Celkom sa chystám vráti» %d balíkov, %dkB\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:607
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
 #, c-format
 msgid "\t· %s and it's dependencies\n"
 msgstr "\t· %s a jeho závislosti\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:610
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
 #, c-format
 msgid "\t· %s\n"
 msgstr "\t· %s\n"
@@ -2054,38 +2045,38 @@ msgstr "\t· %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n) " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:638
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
 msgid "Save transaction report ? (y/n) "
 msgstr "Ulo¾i» správu o transakcii? (a/n) "
 
 #. I18N note: y is the letter for the word Yes. This is
 #. used in the response for a yes/no questions. Your translation
 #. must be 1 character only.
-#: components/services/install/command-line/eazel-alt-install-corba.c:649
-#: components/services/install/command-line/eazel-alt-install-corba.c:769
-#: components/services/install/command-line/eazel-alt-install-corba.c:811
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
 msgid "y"
 msgstr "a"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:670
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
 #, c-format
 msgid "Dependency : %s needs %s\n"
 msgstr "Závislos»: %s vy¾aduje %s\n"
 
 #. I18N note: %s is a package name
-#: components/services/install/command-line/eazel-alt-install-corba.c:688
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
 #, c-format
 msgid "Package %s failed md5 check!\n"
 msgstr "Zlyhala kontrola MD5 pre balík %s!\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:690
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
 #, c-format
 msgid "\t· server MD5 checksum is %s\n"
 msgstr "\t· kontrolný súèet MD5 serveru je %s\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:692
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
 #, c-format
 msgid "\t· actual MD5 checksum is %s\n"
 msgstr "\t· skutoèný kontrolný súèet MD5 je %s\n"
@@ -2095,7 +2086,7 @@ msgstr "\t· skutoèný kontrolný súèet MD5 je %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:758
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
 msgid "Continue? (y/n) "
 msgstr "Pokraèova»? (a/n)"
 
@@ -2104,83 +2095,83 @@ msgstr "Pokraèova»? (a/n)"
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:799
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
 msgid "Should I delete the RPM files? (y/n) "
 msgstr "Mám odstráni» súbory RPM? (a/n)"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:831
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
 msgid "Operation ok\n"
 msgstr "Operácia úspe¹ná\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:833
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
 msgid "Operation failed\n"
 msgstr "Operácia zlyhala\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:959
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
 msgid "Installing"
 msgstr "In¹talujem"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:968
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
 msgid "Uninstalling"
 msgstr "Odin¹talovávam"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:983
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
 msgid "Only one operation at a time please."
 msgstr "Naraz iba jednu operáciu, prosím."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:988
-#: components/services/install/command-line/eazel-alt-install-corba.c:996
-#: components/services/install/command-line/eazel-alt-install-corba.c:1040
-#: components/services/install/command-line/eazel-alt-install-corba.c:1047
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
 #, c-format
 msgid "%s: --help for usage\n"
 msgstr "%s: --help pre pou¾itie\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
 #, c-format
 msgid "Name         : %s\n"
 msgstr "Meno: %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
 #, c-format
 msgid "Version      : %s\n"
 msgstr "Verzia: %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1014
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
 #, c-format
 msgid "Minor        : %s\n"
 msgstr "Podverzia: %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
 #, c-format
 msgid "Size         : %d\n"
 msgstr "Veµkos»: %d\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
 #, c-format
 msgid "Arch         : %s\n"
 msgstr "Arch: %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
 #, c-format
 msgid "Distribution : %s\n"
 msgstr "Distribúcia:  %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1019
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
 #, c-format
 msgid "Description  : %s\n"
 msgstr "Popis: %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1021
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
 #, c-format
 msgid "Install root : %s\n"
 msgstr "Koreò in¹talácie: %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1024
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
 msgid "Provides     : \n"
 msgstr "Poskytuje:\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1066
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
 #, c-format
 msgid "exit code %d\n"
 msgstr "kód ukonèenia %d\n"
@@ -2193,124 +2184,132 @@ msgstr ""
 
 #: components/services/install/command-line/eazel-gen-xml.c:42
 msgid "Use specified file to generate a package list, requires --packagelist"
-msgstr "Pou¾i» uvedený súbor pre generovanie zoznamu balíkov, vy¾aduje --packagelist"
+msgstr ""
+"Pou¾i» uvedený súbor pre generovanie zoznamu balíkov, vy¾aduje --packagelist"
 
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 msgid "Softcat server to connect to"
 msgstr "Softcat server, s ktorým sa spoji»"
 
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr "Pou¾i» inú cestu pre CGI"
 
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr "Pripoji» sa ako pou¾ívateµ softcat pomocou ammonite"
 
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 msgid "Number of times to try the request"
 msgstr "Poèet opakovaní pri pokuse o po¾iadavku"
 
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr "Pauza medzi pokusmi, v mikrosekundách"
 
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr "Hµada» podµa ID balíka Eazel"
 
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+#, fuzzy
+msgid "Lookup package that features a feature/file"
 msgstr "Hµada» balík, ktorý poskytuje tento súbor"
 
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr "Hµada» balík s danou verziu"
 
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr "(s --version) Pou¾i» porovnanie >="
 
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 msgid "use check function (for debugging)"
 msgstr "pou¾i» testovaciu funkciu (pre ladenie)"
 
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 msgid "Show detailed sub-package info"
 msgstr "Zobrazi» detailné informácie o pod-balíku"
 
-#: components/services/install/lib/eazel-install-logic2.c:102
+#: components/services/install/command-line/eazel-test-softcat.c:66
+#, fuzzy
+msgid "enable funk parser"
+msgstr "Povoli» rýchle hµadanie"
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "Nepodarilo sa zamknú» stiahnutý súbor"
 
-#: components/services/install/lib/eazel-install-logic2.c:119
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "MD5 nesúhlasí, balík %s je mo¾no naru¹ený"
 
-#: components/services/install/lib/eazel-install-logic2.c:135
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, c-format
 msgid "No MD5 available for %s"
 msgstr "Pre %s nie je k dispozícii súèet MD5"
 
 #. I18N note: "%is is ok" in the sense that %s=package name and the
 #. package is intact
-#: components/services/install/lib/eazel-install-logic2.c:330
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, c-format
 msgid "%s is ok"
 msgstr "%s je v poriadku"
 
-#: components/services/install/lib/eazel-install-logic2.c:436
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s verzia %s-%s je u¾ nain¹talovaný"
 
-#: components/services/install/lib/eazel-install-logic2.c:440
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s verzia %s je u¾ nain¹talovaný"
 
-#: components/services/install/lib/eazel-install-logic2.c:449
-#: components/services/install/lib/eazel-install-logic2.c:454
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr "%s aktualizuje z verzie %s-%s na %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:463
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr "%s prejde na ni¾¹iu verziu z verzie %s-%s na %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:468
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr "%s prejde na ni¾¹iu verziu z verzie %s na %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:521
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr "%s nain¹taluje verziu %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:526
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr "%s nain¹taluje verziu %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:693
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, c-format
 msgid "Loading package info from file %s"
 msgstr "Naèítavam informácie o balíku zo súboru %s"
 
 #. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
-#: components/services/install/lib/eazel-install-logic2.c:1010
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "ok"
 msgstr "v poriadku"
 
-#: components/services/install/lib/eazel-install-logic2.c:1010
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "not ok"
 msgstr "nie je v poriadku"
 
-#: components/services/install/lib/eazel-install-logic2.c:1176
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
 msgid "Checking dependencies for %s"
 msgstr "Kontrola závislostí pre %s"
@@ -2318,108 +2317,110 @@ msgstr "Kontrola závislostí pre %s"
 #. I18N note: both %s' are package names.
 #. related is in the sense that the two packages apparently
 #. are connected somehow, eg. foo and foo-devel
-#: components/services/install/lib/eazel-install-logic2.c:1800
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, c-format
 msgid "%s is related to %s"
 msgstr "%s má vz»ah k %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:1876
+#: components/services/install/lib/eazel-install-logic2.c:2090
 #, c-format
 msgid "updating %s to version %s-%s solves conflict"
 msgstr "aktualizácia %s na verziu %s-%s rie¹i konflikt"
 
-#: components/services/install/lib/eazel-install-logic2.c:1899
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
 msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr "aktualizácia k dispozícii %s (%s-%s) nerie¹i konflikt"
 
-#: components/services/install/lib/eazel-install-logic2.c:1906
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, c-format
 msgid "could not revive %s"
 msgstr "Nie je mo¾né o¾ivi» %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2061
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
 msgid "file uniqueness checking %s"
 msgstr "kontrola jednoznaènosti súborov %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2082
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
 msgid "Duplicate file : %s occurs in %s and %s"
 msgstr "Duplikát súboru: %s je v %s a %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2094
-#: components/services/install/lib/eazel-install-logic2.c:2248
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
 msgid "... but it's ok, the packages are related"
 msgstr "...ale to je v poriadku, balíky majú vzájomný vz»ah"
 
-#: components/services/install/lib/eazel-install-logic2.c:2102
+#: components/services/install/lib/eazel-install-logic2.c:2324
 #, c-format
 msgid "(there were %d other conflicts)"
 msgstr "(nastalo ïal¹ích %d konfliktov)"
 
-#: components/services/install/lib/eazel-install-logic2.c:2197
+#: components/services/install/lib/eazel-install-logic2.c:2419
 #, c-format
 msgid "file conflict checking %s"
 msgstr "kontrola konfliktov súborov %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2234
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
 msgid "file conflict : package %s already provides file %s also provided by %s"
-msgstr "konflikt súborov: balík %s u¾ poskytuje súbor %s, ktorý poskytuje aj %s"
+msgstr ""
+"konflikt súborov: balík %s u¾ poskytuje súbor %s, ktorý poskytuje aj %s"
 
 #. the owner of this file is a package that we're upgrading, and the
 #. * new version no longer has this file, so everything's okay.
-#: components/services/install/lib/eazel-install-logic2.c:2244
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
 msgid "...but it is okay, we're upgrading %s and it ditched that file"
 msgstr "...ale to v poriadku, aktualizujeme %s a tento súbor u¾ neobsahuje"
 
-#: components/services/install/lib/eazel-install-logic2.c:2336
+#: components/services/install/lib/eazel-install-logic2.c:2558
 #, c-format
 msgid "checking feature consistency of %s"
 msgstr "kontrola konzistencie funkcií balíka %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2404
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
-msgid "feature missing : %s breaks if %s is installed (feature %s would be lost"
+msgid ""
+"feature missing : %s breaks if %s is installed (feature %s would be lost"
 msgstr ""
 "chýbajúca funkcia: %s nefunguje ak %s je nain¹talovaný (funkcia %s by bola "
 "stratená"
 
-#: components/services/install/lib/eazel-install-logic2.c:2483
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, c-format
 msgid "downloading %d packages"
 msgstr "s»ahume %d balíkov"
 
-#: components/services/install/lib/eazel-install-logic2.c:2753
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, c-format
 msgid "will upgrade %s"
 msgstr "aktualizuje %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2756
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, c-format
 msgid "will downgrade %s"
 msgstr "prejde na star¹iu verziu %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2759
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, c-format
 msgid "will install %s"
 msgstr "in¹taluje %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2762
+#: components/services/install/lib/eazel-install-logic2.c:2960
 #, c-format
 msgid "will uninstall %s"
 msgstr "odin¹taluje %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2847
-#: components/services/install/lib/eazel-install-problem.c:339
+#: components/services/install/lib/eazel-install-logic2.c:3045
 #: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
 #, c-format
 msgid "%s requires %s"
 msgstr "%s vy¾aduje %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:3040
+#: components/services/install/lib/eazel-install-logic2.c:3238
 #, c-format
 msgid "failed %s"
 msgstr "zlyhal %s"
@@ -2432,38 +2433,38 @@ msgstr "Nie je mo¾né nastavi» URLType z konfiguraèného súboru!"
 msgid "Transactions are not stored, could not find home dir"
 msgstr "Transakcie nie sú ulo¾ené, nie je mo¾né nájs» domovský prieèinok"
 
-#: components/services/install/lib/eazel-install-object.c:745
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr "Transakcie sú ulo¾ené v %s"
 
-#: components/services/install/lib/eazel-install-object.c:1002
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "Získavam zoznam balíkov zo vzdialeného serveru...\n"
 
-#: components/services/install/lib/eazel-install-object.c:1018
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "Nepodarilo sa získa» zoznam package-list.xml!\n"
 
-#: components/services/install/lib/eazel-install-object.c:1091
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr "Nie je mo¾né zapisova» do súboru %s, pou¾ijem ¹tandardnú obsluhu logu"
 
-#: components/services/install/lib/eazel-install-object.c:1222
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "In¹talácia zlyhala"
 
-#: components/services/install/lib/eazel-install-object.c:1268
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "Odin¹talácia zlyhala"
 
-#: components/services/install/lib/eazel-install-object.c:1403
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "Nie je mo¾né vytvori» prieèinok transakcií (%s)! ***\n"
 
-#: components/services/install/lib/eazel-install-object.c:1426
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr "Zapisujem transakciu do %s"
@@ -2474,7 +2475,7 @@ msgid "%s was cancelled"
 msgstr "%s bol zru¹ený"
 
 #: components/services/install/lib/eazel-install-problem.c:168
-#: components/services/install/lib/eazel-install-problem.c:331
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
 msgid "%s is a source package, which is not yet supported"
 msgstr "%s je zdrojový balík, tie zatiaµ nie sú podporované"
@@ -2506,48 +2507,49 @@ msgid "%s requires %s, which could not be found on the server"
 msgstr "%s vy¾aduje %s, ktorý sa nepodarilo na serveri nájs»"
 
 #: components/services/install/lib/eazel-install-problem.c:204
-#, c-format
-msgid "%s could not be found on the server"
+#, fuzzy, c-format
+msgid "%s for %s could not be found on the server"
 msgstr "%s nebol na serveri nájdený"
 
-#: components/services/install/lib/eazel-install-problem.c:212
-#: components/services/install/lib/eazel-install-problem.c:357
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr "%s je u¾ nain¹talovaný"
 
-#: components/services/install/lib/eazel-install-problem.c:256
+#: components/services/install/lib/eazel-install-problem.c:259
 #, c-format
 msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
-msgstr "%s, ktorý je nov¹í, vy¾aduje prechod na star¹iu verziu, èo nie je povolené"
+msgstr ""
+"%s, ktorý je nov¹í, vy¾aduje prechod na star¹iu verziu, èo nie je povolené"
 
-#: components/services/install/lib/eazel-install-problem.c:260
+#: components/services/install/lib/eazel-install-problem.c:263
 #, c-format
 msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr "%s, ktorý je star¹í, vy¾aduje aktualizáciu, a tá nie je povolená"
 
-#: components/services/install/lib/eazel-install-problem.c:350
+#: components/services/install/lib/eazel-install-problem.c:353
 #, c-format
 msgid "%s is not installed and could not be found on server"
 msgstr "%s nie je nain¹talovaný a nebol na serveri nájdený"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:917
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr "Skontrolova» novú verziu %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:928
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr "In¹talova» obidva %s aj %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:943
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr "Odstráni» %s zo systému"
@@ -2555,21 +2557,21 @@ msgstr "Odstráni» %s zo systému"
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:956
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr "Vynúti» odstránenie %s zo systému"
 
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:964
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr "Databáza balíkov nie je konzistentná"
 
-#: components/services/install/lib/eazel-install-problem.c:1012
+#: components/services/install/lib/eazel-install-problem.c:1015
 msgid "Continue with force"
 msgstr "Pokraèova» silou"
 
-#: components/services/install/lib/eazel-install-problem.c:1018
+#: components/services/install/lib/eazel-install-problem.c:1021
 msgid "Allow downgrade"
 msgstr "Povoli» prechod na star¹ie verzie"
 
@@ -2693,94 +2695,94 @@ msgstr "*** Neplatný uzol závislostí!"
 msgid "*** Unknown node type '%s'"
 msgstr "*** Neznámy typ uzlu '%s'"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:231
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** Súbor so zoznamom balíkov neobsahuje dáta! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:236
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** Nenájdený xml uzol CATEGORIES! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:237
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr "*** Vyskakujem zo spracovania kategórií! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:243
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** ®iadne kategórie! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:244
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr "*** Vyskakujem zo spracovania kategórie! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:298
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** Nenájdený xml uzol TRANSACTION! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:300
-#: components/services/install/lib/eazel-install-xml-package-list.c:308
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr "*** Vyskakujem zo spracovania transakcie! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:306
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** ®iadne balíky! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:342
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** ®iadne uzly kategórií! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:346
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** Nenájdený xml uzol CATEGORIES! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:380
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** Neznámy uzol %s"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:470
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** Chyba pri generovaní xml zoznamu balíkov! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:517
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** Chyba pri èítaní zoznamu balíkov! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:912
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** Osd XML neobsahuje dáta! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:917
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr "*** Vyskakujem zo spracovania osd! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:993
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "Nie je mo¾né spracova» XML (då¾ka %d)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:764
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr "Otvorená databáza balíkov v %s"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:769
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr "Otvorenie databáze balíkov v %s zlyhalo"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:802
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr "Zatváram databázu pre %s (otvorená)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:807
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr "Zatváram databázu pre %s (neotvorená)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1138
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr "Nie je mo¾né otvori» %s"
@@ -2893,7 +2895,7 @@ msgid "Now installing package \"%s\"."
 msgstr "Teraz in¹talujem balík \"%s\"."
 
 #: components/services/install-view/callbacks.c:407
-#: components/services/install-view/nautilus-service-install-view.c:897
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "In¹talujem \"%s\""
@@ -3035,30 +3037,30 @@ msgstr "Pokraèova»"
 
 #: components/services/install-view/forms.c:482
 #: libnautilus-extensions/nautilus-drag.c:493
-#: src/file-manager/fm-directory-view.c:3551
+#: src/file-manager/fm-directory-view.c:4326
 msgid "Cancel"
 msgstr "Zru¹i»"
 
-#: components/services/install-view/nautilus-service-install-view.c:419
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
 msgid "%s is in GNOME (footprint) > %s"
 msgstr "%s je v menu Gnome > %s"
 
-#: components/services/install-view/nautilus-service-install-view.c:437
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, c-format
 msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr "%s je v menu Gnome.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:452
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
 msgid "%s is in the KDE menu.\n"
 msgstr "%s je v menu KDE.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:653
+#: components/services/install-view/nautilus-service-install-view.c:655
 msgid "Installation Complete"
 msgstr "In¹talácia dokonèená"
 
-#: components/services/install-view/nautilus-service-install-view.c:708
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
 msgid ""
 "%sTo start %s, click the Launch button below, or to create a shortcut, drag "
@@ -3068,32 +3070,32 @@ msgstr ""
 "ikony na panel GNOME alebo na plochu."
 
 #. couldn't find an icon
-#: components/services/install-view/nautilus-service-install-view.c:716
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
 msgid "%sTo start %s, click the Launch button below."
 msgstr "%sPre spustenie %s, stlaète tlaèidlo Spusti»."
 
-#: components/services/install-view/nautilus-service-install-view.c:771
+#: components/services/install-view/nautilus-service-install-view.c:773
 msgid "Incorrect password."
 msgstr "Neplatné heslo."
 
-#: components/services/install-view/nautilus-service-install-view.c:776
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr "Prihlási» sa ako root"
 
-#: components/services/install-view/nautilus-service-install-view.c:893
+#: components/services/install-view/nautilus-service-install-view.c:895
 msgid "Installing packages"
 msgstr "In¹talujem balíky"
 
-#: components/services/install-view/nautilus-service-install-view.c:895
+#: components/services/install-view/nautilus-service-install-view.c:897
 msgid "Installing remote package"
 msgstr "In¹talujem vzdialený balík"
 
-#: components/services/install-view/nautilus-service-install-view.c:899
+#: components/services/install-view/nautilus-service-install-view.c:901
 msgid "Installing some package"
 msgstr "In¹talujem nejaký balík"
 
-#: components/services/install-view/nautilus-service-install-view.c:916
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
@@ -3101,23 +3103,23 @@ msgstr ""
 "Chýba in¹talaèná slu¾ba Eazel:\n"
 "In¹talácia nebude fungova»."
 
-#: components/services/install-view/nautilus-service-install-view.c:965
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr "Kontaktujem softvérový katalóg Eazel..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1023
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr "Kontrolujem pre overenie..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1095
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr "Ru¹ím prenos balíkov (prosím, èakajte)..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1115
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "S»ahovanie balíku preru¹ené."
 
-#: components/services/install-view/nautilus-service-install-view.c:1116
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "Preru¹ené"
 
@@ -3347,7 +3349,8 @@ msgid "%A, %B %d"
 msgstr "%A, %d. %B"
 
 #: components/services/summary/nautilus-summary-callbacks.c:97
-msgid "Sorry, network problems are preventing you from connecting to Eazel Services."
+msgid ""
+"Sorry, network problems are preventing you from connecting to Eazel Services."
 msgstr "¥utujem, ale problémy so sie»ou neumo¾nili spojenie so Slu¾bami Eazel."
 
 #. FIXME we really should use the services alert icon here, eh?
@@ -3397,12 +3400,12 @@ msgid "Services Login"
 msgstr "Prihlásenie k slu¾bám"
 
 #: components/services/summary/nautilus-summary-dialogs.c:131
-#: libnautilus-extensions/nautilus-password-dialog.c:269
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "Pou¾ívateµské meno:"
 
 #: components/services/summary/nautilus-summary-dialogs.c:138
-#: libnautilus-extensions/nautilus-password-dialog.c:276
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "Heslo:"
 
@@ -3472,7 +3475,7 @@ msgstr "Slu¾by"
 msgid "Featured Downloads"
 msgstr "Reklamné odkazy"
 
-#: components/services/summary/nautilus-summary-view.c:883
+#: components/services/summary/nautilus-summary-view.c:884
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
 "unavailable right now, or your computer might be configured incorrectly. "
@@ -3482,7 +3485,7 @@ msgstr ""
 "mo¾no nie je momentálne k dispozícii alebo vá¹ poèítaè nefunguje správne. "
 "Prosím, kontaktujte support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:893
+#: components/services/summary/nautilus-summary-view.c:894
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3490,7 +3493,7 @@ msgstr ""
 "Bol nájdený problém dát slu¾ieb na serveroch firmy Eazel. Prosím, "
 "kontaktujte support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:916
+#: components/services/summary/nautilus-summary-view.c:917
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
 "contact support@eazel.com."
@@ -3498,7 +3501,7 @@ msgstr ""
 "V dátach presmerovania na serveroch firmy Eazel chýba informácia. Prosím, "
 "kontaktujte support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:958
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
 "now, or your computer might be configured incorrectly. You could try again "
@@ -3508,7 +3511,7 @@ msgstr ""
 "momentálne k dispozícii alebo vá¹ poèítaè nefunguje správne. Mô¾ete to tie¾ "
 "skúsi» neskôr."
 
-#: components/services/summary/nautilus-summary-view.c:968
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3516,11 +3519,11 @@ msgstr ""
 "Bol nájdený problém s presmerovaním dát na serveroch firmy Eazel. Prosím, "
 "kontaktujte support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:985
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr "Nepodarilo sa posla» inventár."
 
-#: components/services/summary/nautilus-summary-view.c:1048
+#: components/services/summary/nautilus-summary-view.c:1049
 #: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr "Slu¾by Eazel Services"
@@ -3633,48 +3636,69 @@ msgstr "Pohµad Uká¾ková slu¾ba Eazel"
 msgid "Factory for the sample service"
 msgstr "Vytváracie rozhranie pre uká¾kovú slu¾bu"
 
-#: components/text/nautilus-text-view.c:326
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
-msgstr "¥utujem, ale %s je príli¹ veµký, tak¾e ho Nautilus nedoká¾e naèíta» celý."
+msgstr ""
+"¥utujem, ale %s je príli¹ veµký, tak¾e ho Nautilus nedoká¾e naèíta» celý."
 
-#: components/text/nautilus-text-view.c:329
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr "Súbor príli¹ veµký"
 
 #: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "Písma"
+
+#: components/text/nautilus-text-view-ui.xml.h:2
 msgid "Lucida"
 msgstr "Lucida"
 
-#: components/text/nautilus-text-view-ui.xml.h:2
+#: components/text/nautilus-text-view-ui.xml.h:3
 msgid "Use the Courier Font"
 msgstr "Pou¾i» písmo Courier"
 
-#: components/text/nautilus-text-view-ui.xml.h:3
+#: components/text/nautilus-text-view-ui.xml.h:4
+#, fuzzy
+msgid "Use the Fixed Font"
+msgstr "Pou¾i» písmo Times"
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+#, fuzzy
+msgid "Use the GTK System Font"
+msgstr "Pou¾i» písmo Times"
+
+#: components/text/nautilus-text-view-ui.xml.h:6
 msgid "Use the Helvetica Font"
 msgstr "Pou¾i» písmo Helvetica"
 
-#: components/text/nautilus-text-view-ui.xml.h:4
+#: components/text/nautilus-text-view-ui.xml.h:7
 msgid "Use the Lucida Font"
 msgstr "Pou¾i» písmo Lucida"
 
-#: components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:8
 msgid "Use the Times Font"
 msgstr "Pou¾i» písmo Times"
 
-#: components/text/nautilus-text-view-ui.xml.h:6
+#: components/text/nautilus-text-view-ui.xml.h:9
 msgid "_Courier"
 msgstr "_Courier"
 
-#: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
-msgstr "_Písma"
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "_Súbor"
 
-#: components/text/nautilus-text-view-ui.xml.h:8
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
 msgid "_Helvetica"
 msgstr "_Helvetica"
 
-#: components/text/nautilus-text-view-ui.xml.h:9
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr "_Times"
 
@@ -3743,7 +3767,7 @@ msgid "Nautilus Tree view"
 msgstr "Stromový pohµad pre Nautilus"
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:638
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr "Strom"
 
@@ -3755,7 +3779,7 @@ msgstr "Zhmotnenie"
 msgid "Azul"
 msgstr "Azul"
 
-#: data/browser.xml.h:3 libnautilus-extensions/nautilus-font-picker.c:105
+#: data/browser.xml.h:3
 msgid "Black"
 msgstr "Èierna"
 
@@ -3867,7 +3891,7 @@ msgstr "«ahajte emblém na objekt, ktorý chcete zmeni»"
 msgid "Eclipse"
 msgstr "Zatmenie"
 
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1607
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "Emblémy"
 
@@ -3964,7 +3988,7 @@ msgid "Numbers"
 msgstr "Èísla"
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "OK"
 
@@ -4085,11 +4109,11 @@ msgid "The Gimp"
 msgstr "Gimp"
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:554
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "Plocha"
 
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4796
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
 #: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
@@ -4124,7 +4148,7 @@ msgid "Google"
 msgstr "Google"
 
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:808
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "Vyhµadávacie slu¾by"
 
@@ -4378,101 +4402,101 @@ msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2261
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr "dnes o %-I:%M %p"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2266
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr "vèera o %-I:%M %p"
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2271
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%A %-d.%-m.%y o %-I:%M %p"
 
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2276
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%-d.%-m.%y o %-I:%M %p"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 polo¾iek"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr "0 prieèinkov"
 
-#: libnautilus-extensions/nautilus-file.c:3408
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 súborov"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 polo¾ka"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr "1 prieèinok"
 
-#: libnautilus-extensions/nautilus-file.c:3413
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 súbor"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "%u polo¾iek"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr "%u prieèinkov"
 
-#: libnautilus-extensions/nautilus-file.c:3417
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u súborov"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3720
-#: libnautilus-extensions/nautilus-file.c:3735
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr "? polo¾iek"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3726
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr "? bajtov"
 
-#: libnautilus-extensions/nautilus-file.c:3739
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "neznámy typ"
 
-#: libnautilus-extensions/nautilus-file.c:3741
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "neznámy typ MIME"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3746
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "neznámy"
 
-#: libnautilus-extensions/nautilus-file.c:3782
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr "program"
 
-#: libnautilus-extensions/nautilus-file.c:3794
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
@@ -4482,7 +4506,7 @@ msgstr ""
 "súbor gnome-vfs.keys nie je na správnom mieste alebo z nejakého iného dôvodu "
 "sa nedá nájs»."
 
-#: libnautilus-extensions/nautilus-file.c:3798
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
@@ -4491,7 +4515,7 @@ msgstr ""
 "Pre typ MIME \"%s\" (súbor je \"%s\") nebol nájdený ¾iadny popis. Oznámte to "
 "na adresu aaron@eazel.com"
 
-#: libnautilus-extensions/nautilus-file.c:3812
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "odkaz"
 
@@ -4499,27 +4523,27 @@ msgstr "odkaz"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1156
-#: libnautilus-extensions/nautilus-file.c:3818
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr "odkaz na %s"
 
-#: libnautilus-extensions/nautilus-file.c:3832
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr "odkaz (neplatný)"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "Z:"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "Do:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:588
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4530,7 +4554,7 @@ msgstr ""
 "\n"
 "\"%s\" nie je mo¾né presunú», preto¾e je na disku len pre èítanie."
 
-#: libnautilus-extensions/nautilus-file-operations.c:599
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4543,7 +4567,7 @@ msgstr ""
 "\"%s\" nie je mo¾né odstráni», preto¾e nemáte právo meni» jeho rodièovský "
 "prieèinok."
 
-#: libnautilus-extensions/nautilus-file-operations.c:605
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4554,7 +4578,7 @@ msgstr ""
 "\n"
 "\"%s\" nie je mo¾né odstráni», preto¾e je na disku len na èítanie."
 
-#: libnautilus-extensions/nautilus-file-operations.c:636
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4567,7 +4591,7 @@ msgstr ""
 "\"%s\" nie je mo¾né presunú», preto¾e nemáte právo meni» jeho rodièovský "
 "prieèinok."
 
-#: libnautilus-extensions/nautilus-file-operations.c:643
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4580,7 +4604,7 @@ msgstr ""
 "\"%s\" nie je mo¾né presunú» do Odpadkov, preto¾e nemáte právo ho zmeni» "
 "alebo zmeni» jeho rodièovský prieèinok."
 
-#: libnautilus-extensions/nautilus-file-operations.c:667
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -4591,7 +4615,7 @@ msgstr ""
 "\n"
 "\"%s\" nie je mo¾né skopírova», preto¾e nemáte právo ho èíta»."
 
-#: libnautilus-extensions/nautilus-file-operations.c:689
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4602,7 +4626,7 @@ msgstr ""
 "\n"
 "V cieli nie je dos» miesta."
 
-#: libnautilus-extensions/nautilus-file-operations.c:694
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4613,7 +4637,7 @@ msgstr ""
 "\n"
 "V cieli nie je dos» miesta."
 
-#: libnautilus-extensions/nautilus-file-operations.c:698
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4624,7 +4648,7 @@ msgstr ""
 "\n"
 "V cieli nie je dos» miesta."
 
-#: libnautilus-extensions/nautilus-file-operations.c:710
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4635,7 +4659,7 @@ msgstr ""
 "\n"
 "Nemáte právo zápisu do tohto prieèinku."
 
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4646,7 +4670,7 @@ msgstr ""
 "\n"
 "Cieµový disk je len na èítanie."
 
-#: libnautilus-extensions/nautilus-file-operations.c:721
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4657,7 +4681,7 @@ msgstr ""
 "\n"
 "Nemáte právo zápisu do tohto prieèinku."
 
-#: libnautilus-extensions/nautilus-file-operations.c:725
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4668,7 +4692,7 @@ msgstr ""
 "\n"
 "Cieµový disk je len na èítanie."
 
-#: libnautilus-extensions/nautilus-file-operations.c:732
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4679,7 +4703,7 @@ msgstr ""
 "\n"
 "Nemáte právo zápisu do tohto prieèinku."
 
-#: libnautilus-extensions/nautilus-file-operations.c:736
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4690,7 +4714,7 @@ msgstr ""
 "\n"
 "Cieµový disk je len na èítanie."
 
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4701,7 +4725,7 @@ msgstr ""
 "\n"
 "Chcete pokraèova»?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4712,7 +4736,7 @@ msgstr ""
 "\n"
 "Chcete pokraèova»?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:773
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4723,7 +4747,7 @@ msgstr ""
 "\n"
 "Chcete pokraèova»?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4734,7 +4758,7 @@ msgstr ""
 "\n"
 "Chcete pokraèova»?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:794
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4745,7 +4769,7 @@ msgstr ""
 "\n"
 "Chcete pokraèova»?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4756,7 +4780,7 @@ msgstr ""
 "\n"
 "Chcete pokraèova»?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4767,7 +4791,7 @@ msgstr ""
 "\n"
 "Chcete pokraèova»?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4778,34 +4802,34 @@ msgstr ""
 "\n"
 "Chcete pokraèova»?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:924
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "Chyba pri kopírovaní."
 
-#: libnautilus-extensions/nautilus-file-operations.c:927
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "Chyba pri presune."
 
-#: libnautilus-extensions/nautilus-file-operations.c:930
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "Chyba pri vytváraní odkazu."
 
-#: libnautilus-extensions/nautilus-file-operations.c:935
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "Chyba pri odstraòovaní."
 
-#: libnautilus-extensions/nautilus-file-operations.c:960
-#: libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "Preskoèi»"
 
-#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Znovu"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1057
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4818,7 +4842,7 @@ msgstr ""
 "\n"
 "Ak chcete \"%s\" aj tak presunú», premenujte ho a skúste to znovu."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1063
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4831,11 +4855,11 @@ msgstr ""
 "\n"
 "Ak chcete \"%s\" aj tak skopírova», premenujte ho a skúste to znovu."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "Nepodarilo sa nahradi» súbor."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1081
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4846,22 +4870,22 @@ msgstr ""
 "\n"
 "Chcete ho nahradi»?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1092
-#: libnautilus-extensions/nautilus-file-operations.c:1106
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "Konflikt pri kopírovaní"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Nahradi»"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Nahradi» v¹etky"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1160
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "ïal¹í odkaz na %s"
@@ -4870,25 +4894,25 @@ msgstr "ïal¹í odkaz na %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. odkaz na %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1180
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. odkaz na %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1184
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. odkaz na %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. odkaz na %s"
@@ -4898,235 +4922,227 @@ msgstr "%d. odkaz na %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (kópia)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (ïal¹ia kópia)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1212
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr ". kópia)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr ". kópia)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1216
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr ". kópia)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr ". kópia)"
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kópia)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (ïal¹ia kópia)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1232
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. kópia)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1234
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. kópia)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1236
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. kópia)%s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. kópia)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1322
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1330
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1487
-#: libnautilus-extensions/nautilus-file-operations.c:2072
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Neznámy GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1802
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "Presúvam súbory do Odpadkov"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1804
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr "Vyhodených súborov:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1821
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "Presúvam"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1807
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "Pripravujem presun do Odpadkov..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1817
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "Presúvam súbory"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "Presunuté súbory:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1822
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "Pripravujem presun..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "Dokonèujem presun..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "Vytváram odkazy na súbory"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1837
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "Vytvorených odkazov:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1839
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "Vytváram odkaz"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "Pripravujem vytvorenie odkazov..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "Dokonèujem vytvorenie odkazov..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1848
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "Kopírujem súbory"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "Skopírovaných súborov:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "Kopírujem"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "Pripravujem kopírovanie..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "Nie je mo¾né kopírova» polo¾ky do Odpadkov."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "Nie je mo¾né kopírova» do Odpadkov"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1899
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "Prieèinok Odpadky musí zosta» na ploche."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "Toto nie je mo¾né presunú» do prieèinku s odpadkami."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1902
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "Nie je mo¾né kopírova» Odpadky."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1903
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "Nemô¾ete kopírova» tento prieèinok s odpadkami."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1905
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Nie je mo¾né zmeni» umiestnenie Odpadkov"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1906
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Nie je mo¾né kopírova» Odpadky"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1929
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "Nie je mo¾né presunú» prieèinok do seba samého."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1930
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "Nie je mo¾né kopírova» prieèinok do seba samého."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1932
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "Nie je mo¾ný presun"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1933
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "Nie je mo¾né kopírova» do seba samého"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1946
-msgid "You cannot move a file onto itself."
-msgstr "Nie je mo¾né presunú» súbor do seba samého."
-
-#: libnautilus-extensions/nautilus-file-operations.c:1947
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "Nie je mo¾né kopírova» súbor do seba samého."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1949
-msgid "Can't Move Onto Self"
-msgstr "Nie je mo¾ný presun do seba samého"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1950
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "Nie je mo¾né kopírova» do seba samého"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2001
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5136,7 +5152,7 @@ msgstr ""
 "\n"
 "Nemáte práva na zápis."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2004
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5146,630 +5162,695 @@ msgstr ""
 "\n"
 "Nedostatok miesta."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2007
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Chyba \"%s\" pri vytváraní nového prieèinku."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2011
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "Chyba pri vytváraní nového prieèinku"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2098
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "prieèinok bez mena"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2131
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "Odstraòujem súbory"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2133
-#: libnautilus-extensions/nautilus-file-operations.c:2168
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "Odstránených súborov:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2135
-#: libnautilus-extensions/nautilus-file-operations.c:2170
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Odstraòujem"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2136
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "Pripravujem odstránenie súborov..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2166
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Vyprázdòujem Odpadky"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2171
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Pripravujem vyprázdnenie Odpadkov..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2202
-msgid "Are you sure you want to permanently delete all of the items in the Trash?"
+#: libnautilus-extensions/nautilus-file-operations.c:2218
+msgid ""
+"Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr "Naozaj chcete nav¾dy odstráni» v¹etky polo¾ky v Odpadkoch?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2204
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "Odstráni» Odpadky?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2205
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "Vyprázdni»"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2243
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "bla"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2243
-#: libnautilus-extensions/nautilus-file-operations.c:2253
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "bla (kópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".bla.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".bla (kópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "bla bla"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "bla bla (kópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2247
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "bla.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2247
-#: libnautilus-extensions/nautilus-file-operations.c:2254
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "bla (kópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2248
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "bla bla.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2248
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "bla bla (kópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "bla bla.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "bla bla (kópia).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "bla...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "bla.. (kópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "bla..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "bla...(kópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "bla. (kópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "bla. (ïal¹ia kópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2253
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "bla (ïal¹ia kópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2254
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "bla (ïal¹ia kópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "bla (3. kópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "bla (3. kópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "bla bla (ïal¹ia kópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "bla bla (3. kópia).txt3."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr "bla (21. kópia)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr "bla (24. kópia)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr "bla (21. kópia).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr "bla (24. kópia).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "bla (21. kópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
-#: libnautilus-extensions/nautilus-file-operations.c:2260
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "bla (22. kópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "bla (21. kópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
-#: libnautilus-extensions/nautilus-file-operations.c:2261
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "bla (22. kópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2260
-#: libnautilus-extensions/nautilus-file-operations.c:2262
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "bla (23. kópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2261
-#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "bla (23. kópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2262
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "bla (24. kópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2263
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "bla (24. kópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "bla (25. kópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "bla (25. kópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "bla bla (24. kópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "bla bla (25. kópia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "bla bla (24. kópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "bla bla (25. kópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "bla bla (100000000000000. kópia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
-#, c-format
-msgid "%ld of %ld"
-msgstr "%ld z %ld"
-
-#: libnautilus-extensions/nautilus-font-picker.c:96
-msgid "Normal"
-msgstr "Normálne"
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (10th copy)"
+msgstr "bla (21. kópia)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:97
-#: libnautilus-extensions/nautilus-volume-monitor.c:516
-#: libnautilus-extensions/nautilus-volume-monitor.c:535
-msgid "Unknown"
-msgstr "Neznámy"
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (11st copy)"
+msgstr "bla (21. kópia)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:103
-msgid "Bold"
-msgstr "Tuèné"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (10th copy).txt"
+msgstr "bla (21. kópia).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:104
-msgid "Book"
-msgstr "Book"
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (11st copy).txt"
+msgstr "bla (21. kópia).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:106
-msgid "Demibold"
-msgstr "Polotuèné"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (11th copy)"
+msgstr "bla (21. kópia)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:107
-msgid "Light"
-msgstr "Tenké"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (12nd copy)"
+msgstr "bla (22. kópia)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:113
-msgid "Italic"
-msgstr "Kurzíva"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (11th copy).txt"
+msgstr "bla (21. kópia).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:114
-msgid "Oblique"
-msgstr "©ikmé"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (12nd copy).txt"
+msgstr "bla (22. kópia).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:115
-msgid "Reverse Italic"
-msgstr "Opaèná kurzíva"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (12th copy)"
+msgstr "bla (24. kópia)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:116
-msgid "Reverse Oblique"
-msgstr "Opaèné ¹ikmé"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (13rd copy)"
+msgstr "bla (3. kópia)"
 
-#: libnautilus-extensions/nautilus-font-picker.c:123
-msgid "Condensed"
-msgstr "Zhustené"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (12th copy).txt"
+msgstr "bla (25. kópia).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:124
-msgid "Semicondensed"
-msgstr "Polozhustené"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (13rd copy).txt"
+msgstr "bla (3. kópia).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:226
-msgid "Font"
-msgstr "Písmo"
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
+#, c-format
+msgid "%ld of %ld"
+msgstr "%ld z %ld"
 
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
 msgid "GConf Error"
 msgstr "Chyba GConf"
 
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:956
-msgid "fixed"
-msgstr "pevná ¹írka"
-
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1427
-msgid "01/01/00, 01:00 AM"
-msgstr "01/01/00, 01:00"
-
-#: libnautilus-extensions/nautilus-glib-extensions.c:1428
-msgid "1/1/00, 1:00 AM"
-msgstr "1/1/00, 1:00"
-
-#: libnautilus-extensions/nautilus-glib-extensions.c:1429
-msgid " 1/ 1/00,  1:00 AM"
-msgstr " 1/ 1/00,  1:00"
-
 #. Constants
 #: libnautilus-extensions/nautilus-global-preferences.c:50
 msgid "Nautilus Preferences"
 msgstr "Nastavenie Nautilus"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:97
-msgid "current theme"
-msgstr "aktuálna téma"
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "v¾dy"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "V¾dy"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "len lokálne"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "Len lokálne súbory"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "nikdy"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "Nikdy"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "Jemnej¹ia grafika"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "Pou¾i» jemnej¹iu (ale pomal¹iu) grafiku"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "Písma"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+#, fuzzy
+msgid "Font for Icon view:"
+msgstr "Vytváracie rozhranie pre hudobný pohµad"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "Vytváracie rozhranie pre pohµady História"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "Pou¾i» Nautilus pre kreslenie plochy"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:100
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
+msgstr "Otvára» nové okná"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:651
 msgid "Open each file or folder in a separate window"
 msgstr "Otvori» ka¾dý súbor alebo prieèinok v samostatnom okne"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:103
-msgid "Ask before emptying the Trash"
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+msgid "Display toolbar in new windows"
+msgstr "Zobrazi» nástrojový panel v nových oknách"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "Zobrazi» panel umiestnenia v nových oknách"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "Zobrazi» stavový riadok v nových oknách"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "Zobrazi» boèný panel v nových oknách"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "Chovanie Odpadkov"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+#, fuzzy
+msgid "Ask before emptying the Trash or deleting files"
 msgstr "Pýta» sa pred odstránením polo¾iek z Odpadkov"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:106
-#: libnautilus-extensions/nautilus-global-preferences.c:597
-msgid "Click Behavior"
-msgstr "Chovanie pri kliknutí"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
+
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:109
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 msgid "single"
 msgstr "jednoduché"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:110
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "Aktivova» polo¾ky jednoduchým kliknutím"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:114
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "dvojité"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:115
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "Aktivova» polo¾ky dvojitým kliknutím"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:119
-#: libnautilus-extensions/nautilus-global-preferences.c:604
-msgid "Executable Text Files"
-msgstr "Spustiteµné textové súbory"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:122
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 msgid "launch"
 msgstr "Spusti»"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:123
+#: libnautilus-extensions/nautilus-global-preferences.c:726
 msgid "Execute files when they are clicked"
 msgstr "Spustit súbory pri kliknutí"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:127
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 msgid "display"
 msgstr "Zobrazenie"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:128
+#: libnautilus-extensions/nautilus-global-preferences.c:730
 msgid "Display files when they are clicked"
 msgstr "Zobrazi» súbory pri kliknutí"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:132
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 msgid "ask"
 msgstr "Pýta» sa"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:133
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 msgid "Ask each time"
 msgstr "V¾dy sa pýta»"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:143
-#: libnautilus-extensions/nautilus-global-preferences.c:725
-msgid "Show Text in Icons"
-msgstr "Ukáza» text v ikonách"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:146
-#: libnautilus-extensions/nautilus-global-preferences.c:732
-msgid "Show Count of Items in Folders"
-msgstr "Ukáza» poèet polo¾iek v prieèinkoch"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:149
-#: libnautilus-extensions/nautilus-global-preferences.c:739
-msgid "Show Thumbnails for Image Files"
-msgstr "Ukáza» miniatúry pre obrázky"
-
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:152
-#: libnautilus-extensions/nautilus-global-preferences.c:755
-msgid "Make Folder Appearance Details Public"
-msgstr "Detaily vzhµadu prieèinku sú verejné"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:155
-#: libnautilus-extensions/nautilus-global-preferences.c:746
-msgid "Preview Sound Files"
-msgstr "Uká¾ka zvukových súborov"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Use smoother (but slower) graphics"
-msgstr "Pou¾i» jemnej¹iu (ale pomal¹iu) grafiku"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Use this font family to display file names:"
-msgstr "Pou¾i» túto rodinu písiem pre zobrazenie mien súborov:"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-msgid "Display toolbar in new windows"
-msgstr "Zobrazi» nástrojový panel v nových oknách"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:170
-msgid "Display location bar in new windows"
-msgstr "Zobrazi» panel umiestnenia v nových oknách"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:173
-msgid "Display status bar in new windows"
-msgstr "Zobrazi» stavový riadok v nových oknách"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:176
-msgid "Display sidebar in new windows"
-msgstr "Zobrazi» boèný panel v nových oknách"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:179
-msgid "Use Nautilus to draw the desktop"
-msgstr "Pou¾i» Nautilus pre kreslenie plochy"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:183
-msgid "Enable fast search (indexes your hard drive)"
-msgstr "Povoli» rýchle hµadanie (vytvorí index vá¹ho disku)"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:186
-msgid "search type to do by default"
-msgstr "©tandardný typ hµadania"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:189
-msgid "search by text"
-msgstr "Hµada» podµa obsahu"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:190
-msgid "Search for files by file name only"
-msgstr "Hµada» súbory len podµa obsahu"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:194
-msgid "search by text and properties"
-msgstr "Hµada» podµa obsahu a vlastností"
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "Chovanie pri kliknutí"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:195
-msgid "Search for files by file name and file properties"
-msgstr "Hµada» súbory podµa obsahu a vlastností"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr "Spustiteµné textové súbory"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:199
-msgid "Search Engine Location"
-msgstr "Miesto pre prehµadávanie WWW"
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr "Ukáza»/Skry» mo¾nosti"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:203
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr "Ukáza» skryté súbory (mená súborov zaèínajúce \".\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:206
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr "Ukáza» súbory zálohy (mená súborov konèiace \"~\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:209
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr "Ukáza» ¹peciálne príznaky v okne Vlastnosti"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:212
-msgid "Show only folders (no files) in the tree"
-msgstr "Ukáza» iba prieèinky (nie súbory) v strome"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:215
-msgid "Can add Content"
-msgstr "Mô¾e pridáva» obsah"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+#, fuzzy
+msgid "Sorting Order"
+msgstr "Chyba pri nastavovaní vlastníka"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:218
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
-msgstr "Neuvádza» zabudované zálo¾ky v menu Zálo¾ky"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:222
-#: libnautilus-extensions/nautilus-global-preferences.c:227
-#: src/file-manager/fm-properties-window.c:1519 src/nautilus-location-bar.c:62
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
 msgid "Location:"
 msgstr "Umiestnenie:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:226
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+msgid "HTTP Proxy Settings"
+msgstr "Nastavenie proxy HTTP"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "Pou¾i» HTTP proxy"
 
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:228
+#: libnautilus-extensions/nautilus-global-preferences.c:812
 #: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr "Port:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:533
-msgid "Appearance"
-msgstr "Vzhµad"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:535
-msgid "Smoother Graphics"
-msgstr "Jemnej¹ia grafika"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "Zabudované zálo¾ky"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:552
-msgid "Windows & Desktop"
-msgstr "Okná a plocha"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "Neuvádza» zabudované zálo¾ky v menu Zálo¾ky"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:560
-msgid "Opening New Windows"
-msgstr "Otvára» nové okná"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "Ukáza» text v ikonách"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:583
-msgid "Trash Behavior"
-msgstr "Chovanie Odpadkov"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr "Ukáza» poèet polo¾iek v prieèinkoch"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:595
-msgid "Icon & List Views"
-msgstr "Ikony a zoznamy"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "Ukáza» miniatúry pre obrázky"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:611
-msgid "Show/Hide Options"
-msgstr "Ukáza»/Skry» mo¾nosti"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:632
-msgid "Sidebar Panels"
-msgstr "Boèný panel"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr "Uká¾ka zvukových súborov"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:635
-msgid "Tabs"
-msgstr "Zálo¾ky"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr "Detaily vzhµadu prieèinku sú verejné"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:684
-msgid "Navigation"
-msgstr "Navigácia"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "Vzhµad"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:693
-msgid "HTTP Proxy Settings"
-msgstr "Nastavenie proxy HTTP"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr "Okná a plocha"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:712
-msgid "Built-in Bookmarks"
-msgstr "Zabudované zálo¾ky"
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr "Ikony a zoznamy"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+msgid "Navigation"
+msgstr "Navigácia"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:723
+#: libnautilus-extensions/nautilus-global-preferences.c:962
 msgid "Speed Tradeoffs"
 msgstr "Rýchlostné kompromisy"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:794
-msgid "Search"
-msgstr "Hµadanie"
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr "Hµada» podµa obsahu"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+msgid "Search for files by file name only"
+msgstr "Hµada» súbory len podµa obsahu"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr "Hµada» podµa obsahu a vlastností"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+msgid "Search for files by file name and file properties"
+msgstr "Hµada» súbory podµa obsahu a vlastností"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "Nastavenie zlo¾itosti hµadania"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:802
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "©tandardný typ hµadania"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 msgid "Fast Search"
 msgstr "Rýchle hµadanie"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:846
-msgid "Fonts"
-msgstr "Písma"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1026
-#, c-format
-msgid "Display %s tab in sidebar"
-msgstr "Zobrazi» zálo¾ku %s v boènom paneli"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr "Povoli» rýchle hµadanie (vytvorí index vá¹ho disku)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1073
-msgid "always"
-msgstr "v¾dy"
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+msgid "Search Engine Location"
+msgstr "Miesto pre prehµadávanie WWW"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1074
-msgid "Always"
-msgstr "V¾dy"
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Hµadanie"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1077
-msgid "local only"
-msgstr "len lokálne"
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr "Ukáza» iba prieèinky (nie súbory) v strome"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1078
-msgid "Local Files Only"
-msgstr "Len lokálne súbory"
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, c-format
+msgid "Display %s tab in sidebar"
+msgstr "Zobrazi» zálo¾ku %s v boènom paneli"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1081
-msgid "never"
-msgstr "nikdy"
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "Boèný panel"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1082
-msgid "Never"
-msgstr "Nikdy"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr "Zálo¾ky"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1145
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "currently can't be performed because the program crond, which does nightly "
 "tasks on your computer, is turned off. To make sure fast searches can be "
 "done, turn crond on."
 msgstr ""
-"Indexovanie je zapnuté, povoµujem rýchle hµadanie. Momentálne ale nie "
-"je mo¾né vytvori» index, preto¾e program crond, ktorý spú¹»a noèné úlohy "
-"na va¹om poèítaèi, je vypnutý. Pre povolenie rýchleho hµadania zapnite crond."
+"Indexovanie je zapnuté, povoµujem rýchle hµadanie. Momentálne ale nie je "
+"mo¾né vytvori» index, preto¾e program crond, ktorý spú¹»a noèné úlohy na "
+"va¹om poèítaèi, je vypnutý. Pre povolenie rýchleho hµadania zapnite crond."
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1152
-#: libnautilus-extensions/nautilus-global-preferences.c:1170
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
 msgid "Files May Not Be Indexed"
 msgstr "Nie je mo¾né vytvori» index súborov"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1153
-#: libnautilus-extensions/nautilus-global-preferences.c:1171
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
 msgid ""
 "If you are running Linux, you can log in as root and type these commands to "
 "start cron:\n"
@@ -5777,12 +5858,13 @@ msgid ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
-"Ak pou¾ívate Linux, prihláste sa ako root a zadajte tieto príkazy pre spustenie crond.\n"
+"Ak pou¾ívate Linux, prihláste sa ako root a zadajte tieto príkazy pre "
+"spustenie crond.\n"
 "\n"
 "sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1162
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "may not be performed because the program crond, which does nightly tasks on "
@@ -5790,20 +5872,12 @@ msgid ""
 "check to make sure that crond is turned on.\n"
 "\n"
 msgstr ""
-"Indexovanie je zapnuté, povoµujem rýchle hµadanie. Momentálne ale nie "
-"je mo¾né vytvori» index, preto¾e program crond, ktorý spú¹»a noèné úlohy "
-"na va¹om poèítaèi, je asi vypnutý. Pre povolenie rýchleho hµadania overte, "
-"èi je crond zapnutý.\n"
+"Indexovanie je zapnuté, povoµujem rýchle hµadanie. Momentálne ale nie je "
+"mo¾né vytvori» index, preto¾e program crond, ktorý spú¹»a noèné úlohy na "
+"va¹om poèítaèi, je asi vypnutý. Pre povolenie rýchleho hµadania overte, èi "
+"je crond zapnutý.\n"
 "\n"
 
-#: libnautilus-extensions/nautilus-gnome-extensions.c:640
-msgid "No image was selected.  You must click on an image to select it."
-msgstr "Nebol vybraný ¾iadny obrázok. Musíte naò kliknú»."
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:641
-msgid "No selection made"
-msgstr "Nie je niè vybrané"
-
 #. The list of characters that cause line breaks can be localized.
 #: libnautilus-extensions/nautilus-icon-canvas-item.c:70
 msgid " -_,;.?/&"
@@ -5853,56 +5927,40 @@ msgstr "Prepnú» do ruèného rozmiestnenia?"
 msgid "Switch"
 msgstr "Prepnú»"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "Premenova»"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1551
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr "Vráti» spä» Písanie"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1552
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "Obnovi» staré meno"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1553
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "Opakova» vrátené Písanie"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1554
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Obnovi» zmenené meno"
 
-#: libnautilus-extensions/nautilus-password-dialog.c:306
-msgid "Remember this password"
-msgstr "Ulo¾i» toto heslo"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:483
-msgid "times"
-msgstr "times"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:484
-msgid "courier"
-msgstr "courier"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:485
-msgid "lucida"
-msgstr "lucida"
-
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "Zaèiatoèník"
 
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "Priemerný"
 
-#: libnautilus-extensions/nautilus-preferences.c:79
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "Pokroèilý"
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:202
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "Nastavenie"
 
@@ -6001,7 +6059,7 @@ msgid "Don't include in the menu for \"%s\" items"
 msgstr "Nevlo¾i» do menu pre polo¾ky \"%s\"."
 
 #: libnautilus-extensions/nautilus-program-chooser.c:1209
-#: src/file-manager/fm-list-view.c:2123
+#: src/file-manager/fm-list-view.c:2182
 #: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
@@ -6347,7 +6405,8 @@ msgstr "Polo¾ky sú normálne súbory"
 
 #: libnautilus-extensions/nautilus-search-uri.c:706
 msgid "Items containing \"stuff\" in their names and that are regular files"
-msgstr "Polo¾ky obsahujúce \"informáciu\" v svojich menách a sú to normálne súbory"
+msgstr ""
+"Polo¾ky obsahujúce \"informáciu\" v svojich menách a sú to normálne súbory"
 
 #: libnautilus-extensions/nautilus-search-uri.c:710
 msgid ""
@@ -6361,25 +6420,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Polo¾ky obsahujúce \"medusa\" v svojich menách a sú prieèinky"
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr "Detaily"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr "Varovanie"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr "Chyba"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr "Otázka"
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr "Prehµadávam disky"
@@ -6388,7 +6428,7 @@ msgstr "Prehµadávam disky"
 msgid "Nautilus is searching your disks for trash folders."
 msgstr "Nautilus hµadá na disku prieèinky s Odpadkami."
 
-#: libnautilus-extensions/nautilus-trash-file.c:600
+#: libnautilus-extensions/nautilus-trash-file.c:725
 msgid "on the desktop"
 msgstr "na ploche"
 
@@ -6422,64 +6462,62 @@ msgstr "Zobrazi» ako %s"
 msgid "%s Viewer"
 msgstr "Prehliadaè %s"
 
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+msgid "Unknown"
+msgstr "Neznámy"
+
 #. Populate table with items we know localized names for.
-#: libnautilus-extensions/nautilus-volume-monitor.c:623
-#: libnautilus-extensions/nautilus-volume-monitor.c:1862
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr "Disketa"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:624
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:625
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
 msgid "Zip Drive"
 msgstr "Zip disk"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:646
-#: libnautilus-extensions/nautilus-volume-monitor.c:668
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1547
-msgid "Mount Error"
-msgstr "Chyba pripojenia"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1549
-msgid "Unmount Error"
-msgstr "Chyba odpojenia"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1579
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr "je chránený proti zápisu, pripojený len pre èítanie"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1582
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "nie je platné blokové zariadenie"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1583
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr "Médium nenájdené"
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1587
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
-msgstr "Nautilus nemohol pripoji» disketovú mechaniku. Mo¾no v nej nie je disketa."
+msgstr ""
+"Nautilus nemohol pripoji» disketovú mechaniku. Mo¾no v nej nie je disketa."
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1591
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
 msgstr "Nautilus nemohol pripoji» disk. Mo¾no v òom nie je médium."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1594
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr "nesprávny typ súborového systému, nesprávna voµba, chybný superblok na"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1597
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
@@ -6487,7 +6525,7 @@ msgstr ""
 "Nautilus nemohol pripoji» disketovú mechaniku. Disketa asi obsahuje systém "
 "súborov, ktorý sa nedá pripoji»."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1600
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
@@ -6495,48 +6533,56 @@ msgstr ""
 "Nautilus nemohol pripoji» vybraný disk. Disk asi obsahuje systém súborov, "
 "ktorý sa nedá pripoji»."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1605
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr "Nautilus nemohol pripoji» vybranú disketovú mechaniku."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1607
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "Nautilus nemohol pripoji» vybraný disk."
 
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1612
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr "Nautilus nemohol odpoji» vybraný disk."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1764
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr "Chyba pripojenia"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr "Chyba odpojenia"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "Disk ISO 9660"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1779
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "Koreò"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1786
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Disk ext2"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1801
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "Disk MSDOS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1816
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "Disk NFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1831
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
 msgid "ReiserFS Volume"
 msgstr "Disk ReiserFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1847
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
 msgid "UFS Volume"
 msgstr "Disk UFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1877
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "Neznámy disk"
 
@@ -6544,31 +6590,65 @@ msgstr "Neznámy disk"
 msgid "C_lear Text"
 msgstr "Vy_maza» text"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "Vy_maza» text"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "_Kopírova» text"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "Kopíruje vybraný text do schránky"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:15
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "Vystrihnú» _text"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
 msgid "Cut _Text"
 msgstr "Vystrihnú» _text"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "Vystrihne vybraný text do schránky"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:5 src/nautilus-shell-ui.xml.h:46
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "V_lo¾i» text"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "Vlo¾í text ulo¾ený v schránke"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:6
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "Odstráni» vybraný text bez vlo¾enia do schránky"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:7 src/nautilus-shell-ui.xml.h:80
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "Vybra» v¹etk_o"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+msgid "Select _All"
+msgstr "Vybra» v¹etk_o"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "Vyberie v¹etky polo¾ky v tomto okne"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "_Kopírova» text"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:93
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "V_lo¾i» text"
 
@@ -6577,7 +6657,7 @@ msgstr "V_lo¾i» text"
 #. * to change it when we upgrade to GTK 2.0.
 #.
 #: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
-#: src/nautilus-window-menus.c:573
+#: src/nautilus-window-menus.c:610
 msgid "Nautilus"
 msgstr "Nautilus"
 
@@ -6593,80 +6673,109 @@ msgstr "Správca súborov a grafický shell Nautilus"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:786
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr ""
 "Domovský\n"
 "prieèinok %.0s"
 
-#: src/file-manager/fm-desktop-icon-view.c:1072
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "Vyprázdni» odpadky..."
 
-#: src/file-manager/fm-desktop-icon-view.c:1074
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "Vyprázdni» odpadky"
 
-#: src/file-manager/fm-desktop-icon-view.c:1094
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "Odpoji» disk"
 
-#: src/file-manager/fm-directory-view.c:474
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr "Toto otvorí %d samostatných okien. Naozaj to chcete urobi»?"
 
-#: src/file-manager/fm-directory-view.c:476
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Otvori» %d okien?"
 
-#: src/file-manager/fm-directory-view.c:1212
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr "Naozaj chcete úplne odstráni» \"%s\" z Odpadkov?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr "Naozaj chcete úplne odstráni» %d vybraných polo¾iek z Odpadkov?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Odstráni»"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Odstráni»"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+msgid "scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" vybraných"
 
-#: src/file-manager/fm-directory-view.c:1214
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "vybraný 1 prieèinok"
 
-#: src/file-manager/fm-directory-view.c:1217
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "vybraných %d prieèinkov"
 
-#: src/file-manager/fm-directory-view.c:1223
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr " (obsahujú 0 polo¾iek)"
 
-#: src/file-manager/fm-directory-view.c:1225
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr " (obsahujú 1 polo¾ku)"
 
-#: src/file-manager/fm-directory-view.c:1227
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr " (obsahujú %d polo¾iek)"
 
-#: src/file-manager/fm-directory-view.c:1238
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" vybraných (%s)"
 
-#: src/file-manager/fm-directory-view.c:1242
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d vybraných polo¾iek (%s)"
 
-#: src/file-manager/fm-directory-view.c:1249
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 iná vybraná polo¾ka (%s)"
 
-#: src/file-manager/fm-directory-view.c:1252
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d iných vybraných polo¾iek (%s)"
@@ -6678,7 +6787,7 @@ msgstr "%d iných vybraných polo¾iek (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1281
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -6687,7 +6796,7 @@ msgstr "%s%s, %s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1407
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
@@ -6696,16 +6805,17 @@ msgstr ""
 "Prieèinok \"%s\" obsahuje viac súborov, ne¾ doká¾e Nautilus spracova». "
 "Niektoré súbory nebudú zobrazené."
 
-#: src/file-manager/fm-directory-view.c:1414
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "Príli¹ veµa súborov"
 
-#: src/file-manager/fm-directory-view.c:2623
+#: src/file-manager/fm-directory-view.c:2752
 #, c-format
-msgid "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+msgid ""
+"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
 msgstr "Nie je mo¾né presunú» \"%s\" do Odpadkov. Chcete ho odstráni» úplne?"
 
-#: src/file-manager/fm-directory-view.c:2628
+#: src/file-manager/fm-directory-view.c:2757
 #, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
@@ -6714,7 +6824,7 @@ msgstr ""
 "%d vybraných polo¾iek nie je mo¾né presunú» do Odpadkov. Chcete ich "
 "odstráni» úplne?"
 
-#: src/file-manager/fm-directory-view.c:2632
+#: src/file-manager/fm-directory-view.c:2761
 #, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -6723,96 +6833,229 @@ msgstr ""
 "%d z vybraných polo¾iek nie je mo¾né presunú» do Odpadkov. Chcete týchto %d "
 "polo¾iek odstráni» úplne?"
 
-#: src/file-manager/fm-directory-view.c:2640
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "Odstráni» okam¾ite?"
 
-#: src/file-manager/fm-directory-view.c:2641
-#: src/file-manager/fm-directory-view.c:2682
-msgid "Delete"
-msgstr "Odstráni»"
-
-#: src/file-manager/fm-directory-view.c:2671
+#: src/file-manager/fm-directory-view.c:2799
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr "Naozaj chcete úplne odstráni» \"%s\" z Odpadkov?"
 
-#: src/file-manager/fm-directory-view.c:2675
+#: src/file-manager/fm-directory-view.c:2803
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
 "Trash?"
 msgstr "Naozaj chcete úplne odstráni» %d vybraných polo¾iek z Odpadkov?"
 
-#: src/file-manager/fm-directory-view.c:2681
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "Odstráni» z Odpadkov?"
 
-#: src/file-manager/fm-directory-view.c:2978
-#: src/file-manager/fm-directory-view.c:3018
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Pou¾i» \"%s\" pre otvorenie vybranej polo¾ky"
 
-#: src/file-manager/fm-directory-view.c:3220
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "Iná _aplikácia..."
+
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "Iná _aplikácia..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "Iný program pre _zobrazenie..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "Iný program pre _zobrazenie..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "Pou¾i» \"%s\" pre otvorenie vybranej polo¾ky"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "Nautilus nemohol pripoji» vybraný disk."
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"%d vybraných polo¾iek nie je mo¾né presunú» do Odpadkov. Chcete ich "
+"odstráni» úplne?"
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "Otvori» v _novom okne"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open _in New Window"
 msgstr "Otvori» v _novom okne"
 
-#: src/file-manager/fm-directory-view.c:3222
+#: src/file-manager/fm-directory-view.c:3959
 #, c-format
 msgid "Open _in %d New Windows"
 msgstr "Otvori» _v %d nových oknách"
 
-#: src/file-manager/fm-directory-view.c:3248
-msgid "Delete all selected items permanently"
-msgstr "Odstráni» úplne v¹etky vybrané polo¾ky"
-
-#: src/file-manager/fm-directory-view.c:3253
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "Odstráni» z _Odpadkov..."
 
-#: src/file-manager/fm-directory-view.c:3254
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "Odstráni» z _Odpadkov"
 
-#: src/file-manager/fm-directory-view.c:3258
-msgid "Move all selected items to the Trash"
-msgstr "Presunú» v¹etky vybrané polo¾ky do Odpadkov"
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "Odstráni» úplne v¹etky vybrané polo¾ky"
 
-#: src/file-manager/fm-directory-view.c:3262
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "Presunú» do _Odpadkov"
 
-#: src/file-manager/fm-directory-view.c:3292
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "Presunú» v¹etky vybrané polo¾ky do Odpadkov"
+
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "Odstráni»"
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "Odstráni»"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "Vytvori» _odkazy"
 
-#: src/file-manager/fm-directory-view.c:3293
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "Vytvori» _odkaz"
 
-#: src/file-manager/fm-directory-view.c:3311
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "_Vyprázdni» Odpadky..."
 
-#: src/file-manager/fm-directory-view.c:3312
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "_Vyprázdni» Odpadky"
 
-#: src/file-manager/fm-directory-view.c:3323
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "Odstráni» _vlastné obrázky"
 
-#: src/file-manager/fm-directory-view.c:3324
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "Odstráni» _vlastný obrázok"
 
-#: src/file-manager/fm-directory-view.c:3477
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "_Súbor"
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u súborov"
+
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "_Kopírova» text"
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "Kopírujem súbory"
+
+#: src/file-manager/fm-directory-view.c:4252
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
 "link in the Trash?"
@@ -6820,7 +7063,7 @@ msgstr ""
 "Tento odkaz nie je mo¾né pou¾i», preto¾e nemá cieµ. Chcete tento odkaz hodi» "
 "do Odpadkov?"
 
-#: src/file-manager/fm-directory-view.c:3480
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
@@ -6829,15 +7072,15 @@ msgstr ""
 "Tento odkaz nie je mo¾né pou¾i», preto¾e jeho cieµ \"%s\" neexistuje. Chcete "
 "tento odkaz hodi» do Odpadkov?"
 
-#: src/file-manager/fm-directory-view.c:3486
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "Neplatný odkaz"
 
-#: src/file-manager/fm-directory-view.c:3487
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr "Zahodi»"
 
-#: src/file-manager/fm-directory-view.c:3540
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
@@ -6846,19 +7089,19 @@ msgstr ""
 "\"%s\" je spustiteµný textový súbor. Chcete ho spusti» alebo zobrazi» jeho "
 "obsah?"
 
-#: src/file-manager/fm-directory-view.c:3546
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr "Spusti» alebo zobrazi»?"
 
-#: src/file-manager/fm-directory-view.c:3547
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "Spusti»"
 
-#: src/file-manager/fm-directory-view.c:3548
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "Displej"
 
-#: src/file-manager/fm-directory-view.c:3602
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
@@ -6866,49 +7109,57 @@ msgstr ""
 "¥utujem, ale nie je mo¾né vykonáva» príkazy zo vzdialených poèítaèov kvôli "
 "bezpeènosti."
 
-#: src/file-manager/fm-directory-view.c:3604
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "Nie je mo¾né vykona» vzdialené odkazy"
 
-#: src/file-manager/fm-directory-view.c:3738
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr "Otváram \"%s\""
 
-#: src/file-manager/fm-directory-view.c:3744
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "Zru¹i» otvorenie?"
 
 #: src/file-manager/fm-error-reporting.c:58
 #, c-format
-msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "Nemáte dostatoèné práva pre zobrazenie obsahu \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:65
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "¥utujem, nie je mo¾né zobrazi» celý obsah \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Chyba pri zobrazovaní prieèinku"
 
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
-msgid "The name \"%s\" is already used in this folder. Please use a different name."
+msgid ""
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "Meno \"%s\" u¾ je v tomto prieèinku pou¾ité. Prosím, vyberte iné meno."
 
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid ""
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "V prieèinku nie je \"%s\". Mo¾no bol práve presunutý alebo odstránený."
 
-#: src/file-manager/fm-error-reporting.c:109
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Nemáte práva nutné pre premenovanie \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -6917,86 +7168,88 @@ msgstr ""
 "Meno \"%s\" nie je platné, preto¾e obsahuje znak \"/\". Prosím, pou¾ite iné "
 "meno."
 
-#: src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Meno \"%s\" nie je platné. Prosím, vyberte iné meno."
 
-#: src/file-manager/fm-error-reporting.c:124
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Nie je mo¾né zmeni» meno  \"%s\", preto¾e je na disku pripojenom len pre "
 "èítanie."
 
-#: src/file-manager/fm-error-reporting.c:133
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "¥utujem, nie je mo¾né premenova»  \"%s\" na \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:140
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "Chyba pri premenovaní"
 
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
-msgid "You do not have the permissions necessary to change the group of \"%s\"."
+msgid ""
+"You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Nemáte práva nutné pre zmenu skupiny pre \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Nie je mo¾né zmeni» skupinu pre \"%s\", preto¾e je na disku pripojenom iba "
 "pre èítanie."
 
-#: src/file-manager/fm-error-reporting.c:172
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "¥utujem, nie je mo¾né zmeni» skupinu pre \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:176
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "Chyba pri nastavovaní skupiny"
 
-#: src/file-manager/fm-error-reporting.c:198
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Nie je mo¾né zmeni» vlastníka pre \"%s\", preto¾e je na disku pripojenom iba "
 "pre èítanie."
 
-#: src/file-manager/fm-error-reporting.c:205
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "¥utujem, nie je mo¾né zmeni» vlastníka pre \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "Chyba pri nastavovaní vlastníka"
 
-#: src/file-manager/fm-error-reporting.c:230
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
-msgid "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgid ""
+"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Nie je mo¾né zmeni» práva pre \"%s\", preto¾e je na disku pripojenom iba pre "
 "èítanie."
 
-#: src/file-manager/fm-error-reporting.c:237
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "¥utujem, nie je mo¾né zmeni» práva pre \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "Chyba pri nastavovaní práv"
 
-#: src/file-manager/fm-error-reporting.c:306
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Premenovávam \"%s\" na \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:311
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "Zru¹i» premenovanie?"
 
@@ -7056,76 +7309,76 @@ msgstr ""
 "Vyberte poradie, v akom sa budú zobrazova» informácie pod menami ikon. "
 "Ïal¹ie informácie sa zobrazia pri priblí¾ení."
 
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "podµa _mena"
 
-#: src/file-manager/fm-icon-view.c:159
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "Udr¾iava» ikony zoradené podµa mena v riadkoch"
 
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "podµa _veµkosti"
 
-#: src/file-manager/fm-icon-view.c:166
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "Udr¾iava» ikony zoradené podµa veµkosti v riadkoch"
 
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "podµa _typu"
 
-#: src/file-manager/fm-icon-view.c:173
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "Udr¾iava» ikony zoradené podµa typu v riadkoch"
 
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "podµa dátumu _zmeny"
 
-#: src/file-manager/fm-icon-view.c:180
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Udr¾iava» ikony zoradené podµa dátum zmeny v riadkoch"
 
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "podµa _emblémov"
 
-#: src/file-manager/fm-icon-view.c:187
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Udr¾iava» ikony zoradené podµa emblémov v riadkoch"
 
-#: src/file-manager/fm-icon-view.c:1230
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "_Obnovi» pôvodnú veµkos» ikon"
 
-#: src/file-manager/fm-icon-view.c:1231
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "_Obnovi» pôvodnú veµkos» ikony"
 
-#: src/file-manager/fm-icon-view.c:1443
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "ukazujúci na \"%s\""
 
-#: src/file-manager/fm-list-view.c:2129
+#: src/file-manager/fm-list-view.c:2188
 #: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Veµkos»"
 
-#: src/file-manager/fm-list-view.c:2135
+#: src/file-manager/fm-list-view.c:2194
 #: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Typ"
 
-#: src/file-manager/fm-list-view.c:2141
+#: src/file-manager/fm-list-view.c:2200
 #: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Dátum zmeny"
@@ -7182,120 +7435,126 @@ msgstr "(niektorý obsah neèitateµný)"
 msgid "Contents:"
 msgstr "Obsah:"
 
-#: src/file-manager/fm-properties-window.c:1433
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "Základné"
 
-#: src/file-manager/fm-properties-window.c:1512
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/file-manager/fm-properties-window.c:1517
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "Veµkos»:"
 
-#: src/file-manager/fm-properties-window.c:1521
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "Sady odkazov"
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
 msgstr "MIME typ:"
 
-#: src/file-manager/fm-properties-window.c:1527
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "Zmenený:"
 
-#: src/file-manager/fm-properties-window.c:1530
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "Pou¾itý:"
 
-#: src/file-manager/fm-properties-window.c:1539
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr "Vybra» vlastnú ikonu..."
 
-#: src/file-manager/fm-properties-window.c:1545
+#: src/file-manager/fm-properties-window.c:1558
 msgid "Remove Custom Icon"
 msgstr "Odstráni» vlastnú ikonu"
 
-#: src/file-manager/fm-properties-window.c:1873
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "Set User ID"
 
-#: src/file-manager/fm-properties-window.c:1878
+#: src/file-manager/fm-properties-window.c:1891
 msgid "Special Flags:"
 msgstr "©peciálne:"
 
-#: src/file-manager/fm-properties-window.c:1881
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "Set Group ID"
 
-#: src/file-manager/fm-properties-window.c:1883
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "Sticky"
 
-#: src/file-manager/fm-properties-window.c:1909
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Práva"
 
-#: src/file-manager/fm-properties-window.c:1915
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Nie ste vlastník, tak¾e nemô¾ete meni» tieto práva."
 
-#: src/file-manager/fm-properties-window.c:1928
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "Vlastník súboru:"
 
-#: src/file-manager/fm-properties-window.c:1937
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "Skupina súboru:"
 
-#: src/file-manager/fm-properties-window.c:1955
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "Vlastník:"
 
-#: src/file-manager/fm-properties-window.c:1956
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "Skupina:"
 
-#: src/file-manager/fm-properties-window.c:1957
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "Ostatní:"
 
-#: src/file-manager/fm-properties-window.c:1976
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "Èítanie"
 
-#: src/file-manager/fm-properties-window.c:1980
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "Zápis"
 
-#: src/file-manager/fm-properties-window.c:1984
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "Spustenie"
 
-#: src/file-manager/fm-properties-window.c:2035
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "Textový pohµad:"
 
-#: src/file-manager/fm-properties-window.c:2036
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "Èíselný pohµad:"
 
-#: src/file-manager/fm-properties-window.c:2037
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "Posledná zmena:"
 
-#: src/file-manager/fm-properties-window.c:2041
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Práva pre \"%s\" nie je mo¾né urèi»."
 
-#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr "Zru¹i» zobrazovanie okna s vlastnos»ami?"
 
-#: src/file-manager/fm-properties-window.c:2322
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr "Vytváram okno Vlastnosti"
 
-#: src/file-manager/fm-properties-window.c:2422
+#: src/file-manager/fm-properties-window.c:2435
 msgid "Select an icon:"
 msgstr "Vyberte ikonu:"
 
@@ -7321,7 +7580,7 @@ msgstr ""
 "nain¹talovaná."
 
 #: src/file-manager/fm-search-list-view.c:159
-#: src/file-manager/nautilus-indexing-info.c:405
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr "Vyhµadávacia slu¾ba nie je k dispozícii"
 
@@ -7494,7 +7753,7 @@ msgstr ""
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
 #: src/file-manager/fm-search-list-view.c:360
-#: src/file-manager/nautilus-indexing-info.c:340
+#: src/file-manager/nautilus-indexing-info.c:342
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
@@ -7508,7 +7767,7 @@ msgid "Fast searches are not available on your computer"
 msgstr "Rýchle hµadanie nie je k dispozícii na va¹om poèítaèi"
 
 #: src/file-manager/fm-search-list-view.c:373
-#: src/file-manager/nautilus-indexing-info.c:359
+#: src/file-manager/nautilus-indexing-info.c:361
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Fast search is disabled in your Search preferences, so no index is available."
@@ -7518,13 +7777,13 @@ msgstr ""
 "dispozícii."
 
 #: src/file-manager/fm-search-list-view.c:376
-#: src/file-manager/nautilus-indexing-info.c:345
-#: src/file-manager/nautilus-indexing-info.c:363
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
 msgid "Fast searches are not available on your computer."
 msgstr "Rýchle hµadanie nie je na va¹om poèítaèi k dispozícii."
 
 #: src/file-manager/fm-search-list-view.c:377
-#: src/file-manager/nautilus-indexing-info.c:364
+#: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
 "To enable fast search, open the Preferences menu and choose Preferences. "
 "Then select Search preferences and put a checkmark in the Enable Fast Search "
@@ -7582,7 +7841,7 @@ msgid "Change Desktop Background"
 msgstr "Zmeni» pozadie plochy"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Delete all items in the Trash"
 msgstr "Odstráni v¹etky polo¾ky v Odpadkoch"
 
@@ -7611,7 +7870,8 @@ msgid "Reset Desktop Background"
 msgstr "Nastavi» ¹tandardné pozadie"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:10
-msgid "Show a window that lets you set your desktop background's pattern or color"
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
 msgstr "Zobrazí okno,ktoré umo¾ní nastavi» vzorku alebo farbu pozadia plochy"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:1
@@ -7627,140 +7887,191 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Vyberte iný program, ktorým chcete zobrazi» vybranú polo¾ku"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-msgid "Create Link"
-msgstr "Vytvori» odkaz"
+#, fuzzy
+msgid "Copy Files"
+msgstr "Kopírujem súbory"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "Vytvorí nový prázdny prieèinok v tomto prieèinku"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "Vytvorí symbolický odkaz pre ka¾dú vybranú polo¾ku"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u súborov"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "Presunie ka¾dú vybranú polo¾ku do Odpadkov"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "Duplikova»"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "Vytvorí kópiu ka¾dej vybranej polo¾ky"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "Vytvori» odkaz"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr "Presunie ka¾dú vybranú polo¾ku do Odpadkov"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Move to Trash"
 msgstr "Presunú» do Odpadkov"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "Nový prieèinok"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "Otvori»"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid "Open Wit_h"
 msgstr "Otvori» _pomocou"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "Otvori» s "
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "Otvorí ka¾dú vybranú polo¾ku v novom okne"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr "Otvori» v novom okne"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Otvorí vybranú polo¾ku v tomto okne"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "Iná aplikácia..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "Iný program pre zobrazenie..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Other _Application..."
-msgstr "Iná _aplikácia..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "V_lo¾i» text"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-msgid "Other _Viewer..."
-msgstr "Iný program pre _zobrazenie..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr "Odstráni» vlastné obrázky"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr "Odstráni v¹etky vlastné obrázky z vybraných ikon"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr "Odstráni v¹etky vlastné vzorky alebo farby z pozadia tohoto miesta"
 
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "©tandardné pozadie"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+msgid "Scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr "Vybra» v¹etky súbory"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Select _All Files"
 msgstr "Vybra» v¹e_tky súbory"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "Vyberie v¹etky polo¾ky v tomto okne"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr "Zobrazi» Vlastnosti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Show Trash"
 msgstr "Zobrazi» Odpadky"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "Zobrazi» _Vlastnosti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "Show the contents of the Trash"
 msgstr "Zobrazí obsah Odpadkov"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "Zobrazí alebo upraví vlastnosti ka¾dej vybranej polo¾ky"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "_Duplikova»"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_New Folder"
 msgstr "Nový _prieèinok"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "_Otvori»"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "V_lo¾i» text"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Show Trash"
 msgstr "_Zobrazi» Odpadky"
 
@@ -7846,7 +8157,8 @@ msgstr "Premenova» vybranú ikonu"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:27
 msgid "Reposition icons to better fit in the window and avoid overlapping"
-msgstr "Popresúva» ikony tak, aby lep¹ie odpovedali oknu a zabránili prekrývaniu sa"
+msgstr ""
+"Popresúva» ikony tak, aby lep¹ie odpovedali oknu a zabránili prekrývaniu sa"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:28
 msgid "Restore Icons' Original Sizes"
@@ -7912,13 +8224,15 @@ msgstr "Indexovací stroj momentálne pracuje."
 msgid ""
 "An indexer is not running, or is not responding to requests to reindex your "
 "computer."
-msgstr "Nebe¾í indexovací stroj alebo neodpovedá na po¾iadavky o novú indexáciu."
+msgstr ""
+"Nebe¾í indexovací stroj alebo neodpovedá na po¾iadavky o novú indexáciu."
 
 #: src/file-manager/nautilus-indexing-info.c:185
 msgid ""
 "An attempt to reindex, caused an Internal Indexer Error.  Tell "
 "rebecka@eazel.com"
-msgstr "Pokus o novú indexáciu spôsobil internú chybu. Oznámte ju rebecka@eazel.com"
+msgstr ""
+"Pokus o novú indexáciu spôsobil internú chybu. Oznámte ju rebecka@eazel.com"
 
 #: src/file-manager/nautilus-indexing-info.c:194
 msgid "Reindexing Failed"
@@ -7936,7 +8250,7 @@ msgstr ""
 
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr "Stav indexácie"
 
@@ -7945,18 +8259,19 @@ msgstr "Stav indexácie"
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
-msgstr "Raz za deò sú va¹e súbory a ich obsah indexované, tak¾e hµadanie je rýchle. "
+msgstr ""
+"Raz za deò sú va¹e súbory a ich obsah indexované, tak¾e hµadanie je rýchle. "
 
 #: src/file-manager/nautilus-indexing-info.c:236
 #, c-format
 msgid "Your files were last indexed at %s"
 msgstr "Va¹e súbory naposledy indexované %s"
 
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "Obnovi» teraz"
 
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast.  Your files are currently being indexed."
@@ -7964,11 +8279,11 @@ msgstr ""
 "Raz za deò sú va¹e súbory a ich obsah indexované, tak¾e hµadanie je rýchle. "
 "Momentálne prebieha indexácia va¹ich súborov."
 
-#: src/file-manager/nautilus-indexing-info.c:404
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "¥utujem, ale vyhµadávacia slu¾by medusa nie je k dispozícii."
 
-#: src/file-manager/nautilus-indexing-info.c:426
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -8013,8 +8328,9 @@ msgid ""
 "Nautilus, please create this folder, or set permissions such that Nautilus "
 "can create it."
 msgstr ""
-"Nautilus nemohol vytvori» po¾adovaný prieèinok \"%s\". Pred spustením Nautilusu "
-"vytvorte tento prieèinok, alebo nastavte práva tak, aby ho Nautilus mohol vytvori»."
+"Nautilus nemohol vytvori» po¾adovaný prieèinok \"%s\". Pred spustením "
+"Nautilusu vytvorte tento prieèinok, alebo nastavte práva tak, aby ho "
+"Nautilus mohol vytvori»."
 
 #: src/nautilus-application.c:281
 msgid "Couldn't Create Required Folders"
@@ -8153,7 +8469,7 @@ msgstr "Zálo¾ky"
 msgid "Location"
 msgstr "Umiestnenie"
 
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:767
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Odstráni»"
 
@@ -8337,7 +8653,7 @@ msgstr "Povoli» rýchle hµadanie"
 msgid "Turn fast search on when cron is enabled"
 msgstr "Povoli» rýchle hµadanie keï je spustený cron."
 
-#: src/nautilus-first-time-druid.c:1028
+#: src/nautilus-first-time-druid.c:1027
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "currently can't be performed because the program crond, which does\n"
@@ -8352,14 +8668,16 @@ msgid ""
 msgstr ""
 "Indexovanie je zapnuté, povoµujem rýchle hµadanie. Momentálne ale nie\n"
 "je mo¾né vytvori» index, preto¾e program crond, ktorý spú¹»a noèné úlohy\n"
-"na va¹om poèítaèi, je vypnutý. Pre povolenie rýchleho hµadania zapnite crond.\n"
+"na va¹om poèítaèi, je vypnutý. Pre povolenie rýchleho hµadania zapnite "
+"crond.\n"
 "\n"
-"Ak pou¾ívate Linux, prihláste sa ako root a zadajte tieto príkazy pre spustenie crond.\n"
+"Ak pou¾ívate Linux, prihláste sa ako root a zadajte tieto príkazy pre "
+"spustenie crond.\n"
 "\n"
 "sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: src/nautilus-first-time-druid.c:1036
+#: src/nautilus-first-time-druid.c:1035
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "may not be performed because the program crond, which does nightly tasks\n"
@@ -8374,15 +8692,17 @@ msgid ""
 msgstr ""
 "Indexovanie je zapnuté, povoµujem rýchle hµadanie. Momentálne ale nie\n"
 "je mo¾né vytvori» index, preto¾e program crond, ktorý spú¹»a noèné úlohy\n"
-"na va¹om poèítaèi, je mo¾no vypnutý. Pre povolenie rýchleho hµadania overte,\n"
+"na va¹om poèítaèi, je mo¾no vypnutý. Pre povolenie rýchleho hµadania "
+"overte,\n"
 "¾e je crond zapnutý.\n"
 "\n"
-"Ak pou¾ívate Linux, prihláste sa ako root a zadajte tieto príkazy pre spustenie crond.\n"
+"Ak pou¾ívate Linux, prihláste sa ako root a zadajte tieto príkazy pre "
+"spustenie crond.\n"
 "\n"
 "sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: src/nautilus-first-time-druid.c:1123
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
 "Click Finish to launch Nautilus. You'll start with two\n"
 "Nautilus windows: one shows your home folder, and the\n"
@@ -8398,7 +8718,7 @@ msgstr ""
 "\n"
 "Dufáme, ¾e sa vám bude Nautilus páèi»!"
 
-#: src/nautilus-first-time-druid.c:1130
+#: src/nautilus-first-time-druid.c:1129
 msgid ""
 "Click Finish to launch Nautilus. You'll start with a\n"
 "window showing your home folder.\n"
@@ -8410,15 +8730,15 @@ msgstr ""
 "\n"
 "Dufáme, ¾e sa vám bude Nautilus páèi»!"
 
-#: src/nautilus-first-time-druid.c:1154
+#: src/nautilus-first-time-druid.c:1153
 msgid "Nautilus First Time Setup"
 msgstr "Poèiatoèné nastavenie programu Nautilus"
 
-#: src/nautilus-first-time-druid.c:1184
+#: src/nautilus-first-time-druid.c:1183
 msgid "Welcome to Nautilus"
 msgstr "Víta vás Nautilus"
 
-#: src/nautilus-first-time-druid.c:1186
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
 "Nautilus...\n"
 "    Is a great file manager for the GNOME desktop.\n"
@@ -8437,51 +8757,51 @@ msgstr ""
 "Stlaèením Nasledujúci zaènite prispôsobenie vá¹ho prostredia Nautilus."
 
 #. set up the final page
-#: src/nautilus-first-time-druid.c:1197
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "Dokonèené"
 
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1210
+#: src/nautilus-first-time-druid.c:1209
 msgid "Choose Your User Level"
 msgstr "Vyberte pou¾ívateµskú úroveò"
 
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1214
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr "Prechod od GMC k Nautilusu"
 
 #. set up the `Launch Medusa' page
-#: src/nautilus-first-time-druid.c:1218
+#: src/nautilus-first-time-druid.c:1217
 msgid "Fast Searches"
 msgstr "Rýchle hµadania"
 
 #. set up optional page to tell the user how to run cron
-#: src/nautilus-first-time-druid.c:1226
+#: src/nautilus-first-time-druid.c:1225
 msgid "The Cron Daemon"
 msgstr "Démon Cron"
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1231
+#: src/nautilus-first-time-druid.c:1230
 msgid "Checking Your Internet Connection"
 msgstr "Overujem pripojenie na Internet"
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1242
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "Aktualizujem Nautilus..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1250
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "Nastavenie proxy pre WWW"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1325
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "Dekódujem aktualizáciu..."
 
-#: src/nautilus-first-time-druid.c:1342
+#: src/nautilus-first-time-druid.c:1341
 msgid "Update Complete. Click Next to Continue."
 msgstr "Aktualizácia dokonèená. Pre pokraèovanie stlaète Nasledujúci."
 
@@ -8489,9 +8809,10 @@ msgstr "Aktualizácia dokonèená. Pre pokraèovanie stlaète Nasledujúci."
 #. * doesn't exist. Arlo and I (jsh) and decided that the
 #. * best thing to do is silently fail
 #.
-#: src/nautilus-first-time-druid.c:1357
+#: src/nautilus-first-time-druid.c:1356
 msgid "No Update Available... Press Next to Continue."
-msgstr "Aktualizácia nie je k dispozícii. Pre pokraèovanie stlaète Nasledujúci."
+msgstr ""
+"Aktualizácia nie je k dispozícii. Pre pokraèovanie stlaète Nasledujúci."
 
 #. set the window title
 #: src/nautilus-link-set-window.c:189
@@ -8501,7 +8822,8 @@ msgstr "Sady odkazov"
 #. add a descriptive label
 #: src/nautilus-link-set-window.c:202
 msgid "Add or remove sets of links by clicking on the checkboxes below."
-msgstr "Pridajte alebo odstráòte sady odkazov kliknutím na za¹krtávacích tlaèidlách."
+msgstr ""
+"Pridajte alebo odstráòte sady odkazov kliknutím na za¹krtávacích tlaèidlách."
 
 #: src/nautilus-location-bar.c:63
 msgid "Go To:"
@@ -8516,47 +8838,47 @@ msgstr "Chcete zobrazi» týchto %d miest v samostatných oknách?"
 msgid "View in Multiple Windows?"
 msgstr "Zobrazi» vo viacerých oknách?"
 
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr "Vykona» rýchlu sadu testov."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "Vytvori» poèiatoèné okno s danou geometriou."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "GEOMETRIA"
 
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Vytvára» okná Nautilus len pre explicitne zadané URI."
 
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "Ukonèi» Nautilus."
 
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "Re¹tartova» Nautilus."
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check nie je mo¾né pou¾i» s URI.\n"
 
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check nie je mo¾né pou¾i» s inými mo¾nos»ami.\n"
 
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit nie je mo¾né pou¾i» s URI.\n"
 
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart nie je mo¾né pou¾i» s URI.\n"
 
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry nie je mo¾né pou¾i» s viac ako jedným URI.\n"
 
@@ -8678,7 +9000,8 @@ msgid "Couldn't install emblem"
 msgstr "Nie je mo¾né nain¹talova» emblém"
 
 #: src/nautilus-property-browser.c:1332
-msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
 "¥utujem, ale kµúèové slová pre emblémy mô¾u obsahova» iba písmená, medzery a "
 "èíslice."
@@ -8688,7 +9011,8 @@ msgstr ""
 msgid ""
 "Sorry, but \"%s\" is an existing keyword.  Please choose a different name "
 "for it."
-msgstr "¥utujem, ale \"%s\" je u¾ existujúce kµúèové slovo. Prosím, vyberte iné meno."
+msgstr ""
+"¥utujem, ale \"%s\" je u¾ existujúce kµúèové slovo. Prosím, vyberte iné meno."
 
 #: src/nautilus-property-browser.c:1365
 #, c-format
@@ -9032,7 +9356,8 @@ msgstr "Nautilus shell"
 msgid ""
 "Nautilus shell operations that can be done from subsequent command-line "
 "invocations"
-msgstr "Operácie shellu Nautilus, ktoré je mo¾né neskôr vykona» z príkazového riadku."
+msgstr ""
+"Operácie shellu Nautilus, ktoré je mo¾né neskôr vykona» z príkazového riadku."
 
 #: src/Nautilus_shell.oaf.in.h:18
 msgid "Produces metafile objects for accessing Nautilus metadata"
@@ -9051,15 +9376,18 @@ msgid "View as List"
 msgstr "Zobrazi» ako zoznam"
 
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+#, fuzzy
+msgid " _Advanced"
 msgstr " Pokroèilý"
 
 #: src/nautilus-shell-ui.xml.h:2
-msgid " Beginner"
+#, fuzzy
+msgid " _Beginner"
 msgstr " Zaèiatoèník"
 
 #: src/nautilus-shell-ui.xml.h:3
-msgid " Intermediate"
+#, fuzzy
+msgid " _Intermediate"
 msgstr " Priemerný"
 
 #: src/nautilus-shell-ui.xml.h:4
@@ -9098,19 +9426,19 @@ msgstr "Zatvorí v¹etky okná programu Nautilus"
 msgid "Close this window"
 msgstr "Zavrie» toto okno"
 
-#: src/nautilus-shell-ui.xml.h:17
+#: src/nautilus-shell-ui.xml.h:15
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "Zobrazí okno, ktoré umo¾òuje upravi» zálo¾ky v tomto menu"
 
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr "Zobrazí zoznam tvorcov programu Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr "Zobrazí on-line pomocníka pre Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
@@ -9118,135 +9446,123 @@ msgstr ""
 "Zobrazí vzorky, farby a emblémy, ktoré je mo¾né pou¾i» pre prispôsobenie "
 "vzhµadu"
 
-#: src/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:19
 msgid "Display quick reference pages for Nautilus"
 msgstr "Zobrazí rýchlu referenènú príruèku programu Nautilus"
 
-#: src/nautilus-shell-ui.xml.h:22
+#: src/nautilus-shell-ui.xml.h:20
 msgid "Display release notes for Nautilus"
 msgstr "Zobrazí poznámky Nautilusu"
 
-#: src/nautilus-shell-ui.xml.h:23
+#: src/nautilus-shell-ui.xml.h:21
 msgid "Display support information for Nautilus and Eazel Services"
 msgstr "Zobrazí informácie o podpore pre Nautilus a Slu¾by Eazel"
 
-#: src/nautilus-shell-ui.xml.h:24
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Display the latest contents of the current location"
 msgstr "Zobrazí najnov¹í obsah aktuálneho miesta"
 
-#: src/nautilus-shell-ui.xml.h:25
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr "Zobrazí tém vzhµadu, ktoré sú k dispozícii"
 
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:24
 msgid "Edit various Nautilus preferences"
 msgstr "Upraví rôzne nastavenia Nautilu"
 
-#: src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "Nájs»"
 
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr "Za_budnú» históriu"
 
-#: src/nautilus-shell-ui.xml.h:29
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr "Prejs» na Eazel Services"
 
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr "Prejs» domov"
 
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr "Prejs» na miesto, ktoré obsahuje toto"
 
-#: src/nautilus-shell-ui.xml.h:32
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr "Prejs» na nasledujúce nav¹tívené miesto"
 
-#: src/nautilus-shell-ui.xml.h:33
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr "Prejs» na predchádzajúce nav¹tívené miesto"
 
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:446
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
 msgid "Hide Location _Bar"
 msgstr "Skry» pruh _umiestnenia"
 
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:428
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
 msgid "Hide St_atus Bar"
 msgstr "Skry» _stavový riadok"
 
-#: src/nautilus-shell-ui.xml.h:36 src/nautilus-window-menus.c:434
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
 msgid "Hide _Sidebar"
 msgstr "Skry» _boèný panel"
 
-#: src/nautilus-shell-ui.xml.h:37 src/nautilus-window-menus.c:440
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
 msgid "Hide _Toolbar"
 msgstr "Skry» panel _nástrojov"
 
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:37
 msgid "Nautilus Quick _Reference"
 msgstr "Rýchla _referenèná príruèka Nautilusu"
 
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:38
 msgid "Nautilus Release _Notes"
 msgstr "Po_známky Nautilusu"
 
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:39
 msgid "Nautilus User _Manual"
 msgstr "_Pou¾ívateµský manuál Nautilusu"
 
-#: src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "Nové okno"
 
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:41
 msgid "New _Window"
 msgstr "Nové _okno"
 
-#: src/nautilus-shell-ui.xml.h:44
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "Normálna veµkos»"
 
-#: src/nautilus-shell-ui.xml.h:45
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Otvorí ïal¹ie okno pre zobrazené miesto"
 
-#: src/nautilus-shell-ui.xml.h:47
-msgid "Preferences..."
-msgstr "Nastavenie..."
-
-#: src/nautilus-shell-ui.xml.h:48
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "Obnovi»"
 
-#: src/nautilus-shell-ui.xml.h:49
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "Odstráni vybraný text bez vlo¾enia do schránky"
-
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr "Oznámi» výsledky profilovania"
 
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr "Vyèisti» výsledky profilovania"
 
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr "Nájs» na WWW"
 
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr "Nájs» súbory na tomto poèítaèi"
 
-#: src/nautilus-shell-ui.xml.h:54
-msgid "Select _All"
-msgstr "Vybra» v¹etk_o"
-
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
@@ -9254,179 +9570,194 @@ msgstr ""
 "Zobrazí stránku, z ktorej je mo¾né posla» komentáre o programe Nautilus a o "
 "Eazel Services"
 
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "Zobrazí obsah v normálnej veµkosti"
 
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "Zobrazí obsah s menej detailami"
 
-#: src/nautilus-shell-ui.xml.h:58
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "Zobrazí obsah detailnej¹ie"
 
-#: src/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr "Spusti» profilovanie"
 
-#: src/nautilus-shell-ui.xml.h:61
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr "Zastavi» profilovanie"
 
-#: src/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr "Zastaví naèítavanie tohoto miesta"
 
-#: src/nautilus-shell-ui.xml.h:63
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "Vráti spä» poslednú zmenu textu"
 
-#: src/nautilus-shell-ui.xml.h:64
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "Hore"
 
-#: src/nautilus-shell-ui.xml.h:65
-msgid "Use Advanced settings"
-msgstr "Pou¾i» nastavenie Pokroèilý"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:66
-msgid "Use Beginner settings"
-msgstr "Pou¾i» nastavenie Zaèiatoèník"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:67
-msgid "Use Intermediate settings"
-msgstr "Pou¾i» nastavenie Priemerný"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:63
 msgid "We_b Search"
 msgstr "Nájs» na _WWW"
 
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "Nájs» na WWW"
 
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "Zväè¹i»"
 
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "Zmen¹i»"
 
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "Z_väè¹i»"
 
-#: src/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "Z_men¹i»"
 
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "_O programe Nautilus..."
 
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "_Prida» zálo¾ku"
 
-#: src/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "_Dozadu"
 
-#: src/nautilus-shell-ui.xml.h:77
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr "_Pozadia a emblémy..."
 
-#: src/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "_Zálo¾ky"
 
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "_Zavrie» okno"
 
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:76
 msgid "_Customer Support"
 msgstr "_Podpora zákazníkov"
 
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "_Upravi»"
 
-#: src/nautilus-shell-ui.xml.h:83
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "_Upravi» zálo¾ky..."
 
-#: src/nautilus-shell-ui.xml.h:84
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "Nastavenie..."
+
+#: src/nautilus-shell-ui.xml.h:80
 msgid "_Feedback"
 msgstr "_Komentáre"
 
-#: src/nautilus-shell-ui.xml.h:86 src/nautilus-window-menus.c:1362
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "_Nájs»"
 
-#: src/nautilus-shell-ui.xml.h:87
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "_Dopredu"
 
-#: src/nautilus-shell-ui.xml.h:88
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "_Prejs» na"
 
-#: src/nautilus-shell-ui.xml.h:89
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "_Pomocník"
 
-#: src/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "_Domov"
 
-#: src/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "Umiestnenie"
+
+#: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr "_Nautilus témy..."
 
-#: src/nautilus-shell-ui.xml.h:92
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "_Normálna veµkos»"
 
-#: src/nautilus-shell-ui.xml.h:94
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "Nastavenie"
+
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr "_Profiler"
 
-#: src/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "_Obnovi»"
 
-#: src/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr "_Oznámi» výsledky profilovania"
 
-#: src/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr "_Vyèisti» výsledky profilovania"
 
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr "_Spusti» profilovanie"
 
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr "_Zastavi» profilovanie"
 
-#: src/nautilus-shell-ui.xml.h:100
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "_Spä»"
 
-#: src/nautilus-shell-ui.xml.h:101
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "O jednu úroveò v_y¹¹ie"
 
-#: src/nautilus-shell-ui.xml.h:102
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "_Zobrazi»"
 
-#: src/nautilus-sidebar.c:659
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -9434,11 +9765,11 @@ msgstr ""
 "Nie je mo¾né priradi» viac ako jednu vlastnú ikonu! Prosím, pritiahnite a "
 "pustite iba jeden obrázok pre nastavenie vlastnej ikony."
 
-#: src/nautilus-sidebar.c:661
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "Viac ako jeden obrázok"
 
-#: src/nautilus-sidebar.c:680
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -9446,11 +9777,11 @@ msgstr ""
 "Súbor, ktorý ste pustili, nie je lokálny. Ako vlastné ikony mô¾ete pou¾i» "
 "iba lokálne obrázky."
 
-#: src/nautilus-sidebar.c:682
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "Len lokálne obrázky"
 
-#: src/nautilus-sidebar.c:687
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -9458,22 +9789,22 @@ msgstr ""
 "Súbor, ktorý ste pustili, nie je obrázok. Ako vlastné ikony mô¾ete pou¾i» "
 "iba lokálne obrázky."
 
-#: src/nautilus-sidebar.c:689
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "Len obrázky"
 
-#: src/nautilus-sidebar.c:1247
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "Otvori» s %s"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1283
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "Otvori» s..."
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1390
+#: src/nautilus-sidebar.c:1424
 msgid "  Empty Trash  "
 msgstr " Vyprázdni» odpadky "
 
@@ -9565,16 +9896,16 @@ msgstr "Nie je mo¾né odstráni» tému"
 msgid "No description available for the \"%s\" theme"
 msgstr "Pre tému \"%s\" nie je k dispozícii ¾iadny popis"
 
-#: src/nautilus-window.c:584
+#: src/nautilus-window.c:637
 msgid "View as ..."
 msgstr "Zobrazi» ako..."
 
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1286
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "Zobrazi» inak..."
 
-#: src/nautilus-window.c:1687
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "Zavrie»"
 
@@ -9588,11 +9919,11 @@ msgstr "Zavrie»"
 msgid "Preview Release %s: %s"
 msgstr "Uká¾ková verzia %s: %s"
 
-#: src/nautilus-window-manage-views.c:812
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "Zobrazenie zlyhalo"
 
-#: src/nautilus-window-manage-views.c:823
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
@@ -9601,12 +9932,12 @@ msgstr ""
 "Pohµad %s zaznamenal chybu a nie je schopný pokraèova» v èinnosti. Mô¾ete "
 "vybra» iný pohµad alebo prejs» na iné miesto."
 
-#: src/nautilus-window-manage-views.c:834
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "Pohµad %s zaznamenal chybu pri spú¹taní."
 
-#: src/nautilus-window-manage-views.c:993
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
@@ -9614,7 +9945,7 @@ msgstr ""
 "Jeden z boèných panelov narazil na chybu a nie je schopný pokraèova» v "
 "èinnosti. Bohu¾iaµ, nie je mo¾né poveda», ktorý."
 
-#: src/nautilus-window-manage-views.c:997
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
@@ -9623,21 +9954,24 @@ msgstr ""
 "Boèný panel %s zaznamenal chybu a nie je schopný pokraèova» v èinnosti. Ak "
 "sa to bude opakova», mo¾no budete chcie» tento panel vypnú»."
 
-#: src/nautilus-window-manage-views.c:1002
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "Boèný panel zlyhal"
 
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "Nie je mo¾né nájs» \"%s\". Prosím, overte zadaný text a skúste to znovu."
+msgstr ""
+"Nie je mo¾né nájs» \"%s\". Prosím, overte zadaný text a skúste to znovu."
 
-#: src/nautilus-window-manage-views.c:1223
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
-msgid "\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr "\"%s\" nie je platné miesto. Prosím, overte zadaný text a skúste to znovu."
+msgid ""
+"\"%s\" is not a valid location. Please check the spelling and try again."
+msgstr ""
+"\"%s\" nie je platné miesto. Prosím, overte zadaný text a skúste to znovu."
 
-#: src/nautilus-window-manage-views.c:1237
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -9646,30 +9980,30 @@ msgstr ""
 "Nie je mo¾né zobrazi» \"%s\", preto¾e Nautilus nie je schopný urèi» typ "
 "súboru."
 
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr "Nautilus nemá nain¹talovaný ¾iadny program schopný zobrazi» \"%s\"."
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1257
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 "Nie je mo¾né zobrazi» \"%s\", preto¾e Nautilus nie je schopný pracova» s "
 "miestami %s:."
 
-#: src/nautilus-window-manage-views.c:1263
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "Nie je mo¾né zobrazi» \"%s\", preto¾e pokus o prihlásenie zlyhal."
 
-#: src/nautilus-window-manage-views.c:1268
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "Nie je mo¾né zobrazi» \"%s\", preto¾e bol prístup odmietnutý."
 
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1287
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
@@ -9678,7 +10012,7 @@ msgstr ""
 "Nie je mo¾né zobrazi» \"%s\", preto¾e hostiteµ \"%s\" nebol nájdený. Overte, "
 "èi ste správne zadali meno a máte správne nastavené proxy."
 
-#: src/nautilus-window-manage-views.c:1287
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -9687,7 +10021,7 @@ msgstr ""
 "Nie je mo¾né zobrazi» \"%s\", preto¾e meno hostiteµa je prázdne. Overte, ¾e "
 "máte správne nastavené proxy."
 
-#: src/nautilus-window-manage-views.c:1299
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -9698,23 +10032,23 @@ msgstr ""
 "vyhµadávacia slu¾ba nefunguje. Overte, ¾e ste spustili vyhµadávaciu slu¾bu "
 "Medusa a ak nemáte index, ¾e be¾í indexaèný program pre slu¾bu Medusa."
 
-#: src/nautilus-window-manage-views.c:1303
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "Hµadanie nie je k dispozícii"
 
-#: src/nautilus-window-manage-views.c:1307
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus nemô¾e zobrazi» \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1312
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "Nie je mo¾né zobrazi» miesto"
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:317
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
@@ -9722,35 +10056,36 @@ msgstr ""
 "Naozaj chcete zabudnú» históriu? Ak áno, budete ju musie» nabudúce ruène "
 "obnovi»."
 
-#: src/nautilus-window-menus.c:320
-msgid "Are you sure you want Nautilus to forget which locations you have visited?"
+#: src/nautilus-window-menus.c:357
+msgid ""
+"Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr "Naozaj chcete aby Nautilus zabudol, ktoré miesta ste nav¹tívili?"
 
-#: src/nautilus-window-menus.c:325
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "Zabudnú» históriu?"
 
-#: src/nautilus-window-menus.c:326
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "Zabudnú»"
 
-#: src/nautilus-window-menus.c:429
+#: src/nautilus-window-menus.c:466
 msgid "Show St_atus Bar"
 msgstr "Zobrazi» _stavový riadok"
 
-#: src/nautilus-window-menus.c:435
+#: src/nautilus-window-menus.c:472
 msgid "Show _Sidebar"
 msgstr "Zobrazi» _boèný panel"
 
-#: src/nautilus-window-menus.c:441
+#: src/nautilus-window-menus.c:478
 msgid "Show _Toolbar"
 msgstr "Zobrazi» panel _nástrojov"
 
-#: src/nautilus-window-menus.c:447
+#: src/nautilus-window-menus.c:484
 msgid "Show Location _Bar"
 msgstr "Zobrazi» pruh u_miestnenia"
 
-#: src/nautilus-window-menus.c:498
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "Nastavenie"
 
@@ -9760,11 +10095,11 @@ msgstr "Nastavenie"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:581
+#: src/nautilus-window-menus.c:618
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr "Copyright 1999-2001 Eazel, Inc."
 
-#: src/nautilus-window-menus.c:583
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -9782,11 +10117,11 @@ msgstr ""
 #. * bottom of the about box to give credit
 #. * to the translator(s)
 #.
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:629
 msgid "Translator Credits"
 msgstr "Nautilus prelo¾il Stanislav Vi¹òovský"
 
-#: src/nautilus-window-menus.c:762
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -9795,27 +10130,23 @@ msgstr ""
 "Umiestnenie \"%s\" neexistuje. Naozaj chcete odstráni» zálo¾ky s týmto "
 "miestom z vá¹ho zoznamu?"
 
-#: src/nautilus-window-menus.c:766
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "Zálo¾ka pre neexistujúce miesto"
 
-#: src/nautilus-window-menus.c:780
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "Miesto \"%s\" u¾ neexistuje."
 
-#: src/nautilus-window-menus.c:781
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "Prejs» na neexistujúce miesto"
 
-#: src/nautilus-window-menus.c:850
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "Prejs» na miesto definované touto zálo¾kou"
 
-#: src/nautilus-window-menus.c:1361
-msgid "_Browse"
-msgstr "_Prechádza»"
-
 #: src/nautilus-window-toolbars.c:402
 msgid "Back"
 msgstr "Dozadu"
@@ -9831,3 +10162,116 @@ msgstr "Dopredu"
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 
+#~ msgid "helvetica"
+#~ msgstr "helvetica"
+
+#~ msgid "_Fonts"
+#~ msgstr "_Písma"
+
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "Nie je mo¾né presunú» súbor do seba samého."
+
+#~ msgid "Can't Move Onto Self"
+#~ msgstr "Nie je mo¾ný presun do seba samého"
+
+#~ msgid "Normal"
+#~ msgstr "Normálne"
+
+#~ msgid "Bold"
+#~ msgstr "Tuèné"
+
+#~ msgid "Book"
+#~ msgstr "Book"
+
+#~ msgid "Demibold"
+#~ msgstr "Polotuèné"
+
+#~ msgid "Light"
+#~ msgstr "Tenké"
+
+#~ msgid "Italic"
+#~ msgstr "Kurzíva"
+
+#~ msgid "Oblique"
+#~ msgstr "©ikmé"
+
+#~ msgid "Reverse Italic"
+#~ msgstr "Opaèná kurzíva"
+
+#~ msgid "Reverse Oblique"
+#~ msgstr "Opaèné ¹ikmé"
+
+#~ msgid "Condensed"
+#~ msgstr "Zhustené"
+
+#~ msgid "Semicondensed"
+#~ msgstr "Polozhustené"
+
+#~ msgid "Font"
+#~ msgstr "Písmo"
+
+#~ msgid "fixed"
+#~ msgstr "pevná ¹írka"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00"
+
+#~ msgid "current theme"
+#~ msgstr "aktuálna téma"
+
+#~ msgid "Use this font family to display file names:"
+#~ msgstr "Pou¾i» túto rodinu písiem pre zobrazenie mien súborov:"
+
+#~ msgid "Can add Content"
+#~ msgstr "Mô¾e pridáva» obsah"
+
+#~ msgid "No image was selected.  You must click on an image to select it."
+#~ msgstr "Nebol vybraný ¾iadny obrázok. Musíte naò kliknú»."
+
+#~ msgid "No selection made"
+#~ msgstr "Nie je niè vybrané"
+
+#~ msgid "Remember this password"
+#~ msgstr "Ulo¾i» toto heslo"
+
+#~ msgid "times"
+#~ msgstr "times"
+
+#~ msgid "courier"
+#~ msgstr "courier"
+
+#~ msgid "lucida"
+#~ msgstr "lucida"
+
+#~ msgid "Details"
+#~ msgstr "Detaily"
+
+#~ msgid "Warning"
+#~ msgstr "Varovanie"
+
+#~ msgid "Error"
+#~ msgstr "Chyba"
+
+#~ msgid "Question"
+#~ msgstr "Otázka"
+
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "Odstráni vybraný text bez vlo¾enia do schránky"
+
+#~ msgid "Use Advanced settings"
+#~ msgstr "Pou¾i» nastavenie Pokroèilý"
+
+#~ msgid "Use Beginner settings"
+#~ msgstr "Pou¾i» nastavenie Zaèiatoèník"
+
+#~ msgid "Use Intermediate settings"
+#~ msgstr "Pou¾i» nastavenie Priemerný"
+
+#~ msgid "_Browse"
+#~ msgstr "_Prechádza»"
diff --git a/po/sl.po b/po/sl.po
index cc33d83fb..00dbbf17a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,10 +4,15 @@
 #
 #
 #
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2001-02-19 23:56+0100\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2000-07-07 12:30+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -19,11 +24,36 @@ msgstr ""
 msgid "Can't create nautilus-launcher-applet!"
 msgstr "Nisem mogel ustvariti vstavka Nautilus zaganjalnik!"
 
-#: applets/preferences-applet/nautilus-preferences-applet.c:201
+#: applets/preferences-applet/nautilus-preferences-applet.c:211
 msgid "Can't create nautilus-preferences-applet!"
 msgstr ""
 "Ne morem ustvariti vstavka nautilus-nastavitve (nautilus-preferences-applet)!"
 
+#: applets/preferences-applet/nautilus-preferences-applet.c:226
+#, fuzzy
+msgid "Show Desktop"
+msgstr "Namizje"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:230
+#, fuzzy
+msgid "Smooth Graphics"
+msgstr "Lep¹a grafika"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:243
+#: src/nautilus-application.c:639
+msgid "Quit"
+msgstr "Izhod"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:251
+#, fuzzy
+msgid "Start"
+msgstr "Stanje"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:259
+#, fuzzy
+msgid "Restart"
+msgstr "Poskusi znova"
+
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:1
 msgid "Factory for Nautilus component adapter factories"
 msgstr "Tovarna za tovarne adapterjev Nautilusovih komponent"
@@ -80,9 +110,21 @@ msgstr "%lu MB"
 msgid "Hardware Overview"
 msgstr "Pregled strojne opreme"
 
+#: components/hardware/nautilus-hardware-view.c:520
+msgid "This is a placeholder for the CPU page."
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:545
+msgid "This is a placeholder for the RAM page."
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:570
+msgid "This is a placeholder for the IDE page."
+msgstr ""
+
 #: components/hardware/Nautilus_View_hardware.oaf.in.h:2
 #: components/hardware/nautilus-hardware-view.c:631
-#: data/static_bookmarks.xml.h:13
+#: data/static_bookmarks.xml.h:16
 msgid "Hardware"
 msgstr "Storjna oprema"
 
@@ -91,109 +133,119 @@ msgid "Factory for hardware view"
 msgstr "Tovarna za pogled strojne opreme"
 
 #: components/hardware/Nautilus_View_hardware.oaf.in.h:3
-msgid "Hardware view"
+#, fuzzy
+msgid "Hardware Viewer"
 msgstr "Pregled strojne opreme"
 
 #: components/hardware/Nautilus_View_hardware.oaf.in.h:4
+msgid "Hardware view"
+msgstr "Pregled strojne opreme"
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:5
+#, fuzzy
+msgid "View as Hardware"
+msgstr "Storjna oprema"
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:6
 msgid "hardware view"
 msgstr "pregled strojne opreme"
 
-#: components/help/converters/gnome-db2html2/gdb3html.c:708
-#: components/music/nautilus-music-view.c:1493
+#: components/help/converters/gnome-db2html2/gdb3html.c:712
+#: components/music/nautilus-music-view.c:1512
 msgid "Previous"
 msgstr "Nazaj"
 
-#: components/help/converters/gnome-db2html2/gdb3html.c:717
-#: libnautilus-extensions/nautilus-global-preferences.c:706
+#: components/help/converters/gnome-db2html2/gdb3html.c:721
+#: libnautilus-extensions/nautilus-global-preferences.c:789
 #: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "Dom"
 
-#: components/help/converters/gnome-db2html2/gdb3html.c:726
-#: components/music/nautilus-music-view.c:1549
+#: components/help/converters/gnome-db2html2/gdb3html.c:730
+#: components/music/nautilus-music-view.c:1568
 msgid "Next"
 msgstr "Naprej"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:255
+#: components/help/converters/gnome-db2html2/sect-elements.c:259
 #: components/notes/Nautilus_View_notes.oaf.in.h:2
 msgid "Notes"
 msgstr "Opombe"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:705
+#: components/help/converters/gnome-db2html2/sect-elements.c:709
 #, c-format
 msgid "Table %d."
 msgstr "Tabla %d."
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:860
+#: components/help/converters/gnome-db2html2/sect-elements.c:864
 msgid "Up to Table of Contents"
 msgstr "Nazaj do kazala"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1008
+#: components/help/converters/gnome-db2html2/sect-elements.c:1012
 #, c-format
 msgid "Figure %s"
 msgstr "Skica %s"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1028
+#: components/help/converters/gnome-db2html2/sect-elements.c:1032
 msgid "the section here"
 msgstr "odsek tukaj"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1030
+#: components/help/converters/gnome-db2html2/sect-elements.c:1034
 msgid "the section"
 msgstr "odsek"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1086
+#: components/help/converters/gnome-db2html2/sect-elements.c:1090
 #, c-format
 msgid "Figure %d"
 msgstr "Skica %d"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:1098
+#: components/help/converters/gnome-db2html2/sect-elements.c:1102
 msgid "IMAGE"
 msgstr "SLIKA"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:2064
-#: components/help/converters/gnome-db2html2/sect-elements.c:2066
+#: components/help/converters/gnome-db2html2/sect-elements.c:2068
+#: components/help/converters/gnome-db2html2/sect-elements.c:2070
 msgid "Legal Notice"
 msgstr "Pravna opomba"
 
 #. This 'Q' is short for 'Question:'
-#: components/help/converters/gnome-db2html2/sect-elements.c:2112
+#: components/help/converters/gnome-db2html2/sect-elements.c:2116
 msgid "Q"
 msgstr "V"
 
 #. This 'A' is short for 'Answer'
-#: components/help/converters/gnome-db2html2/sect-elements.c:2124
+#: components/help/converters/gnome-db2html2/sect-elements.c:2128
 msgid "A"
 msgstr "O"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:2147
+#: components/help/converters/gnome-db2html2/sect-elements.c:2151
 msgid "See"
 msgstr "Poglej"
 
-#: components/help/converters/gnome-db2html2/sect-elements.c:2174
+#: components/help/converters/gnome-db2html2/sect-elements.c:2178
 msgid "See also"
 msgstr "Glej tudi"
 
-#: components/help/converters/gnome-db2html2/toc-elements.c:319
+#: components/help/converters/gnome-db2html2/toc-elements.c:322
 msgid "GNOME Documentation"
 msgstr "Dokumentacija GNOME"
 
-#: components/help/converters/gnome-db2html2/toc-elements.c:350
+#: components/help/converters/gnome-db2html2/toc-elements.c:353
 msgid "Copyright"
 msgstr "Avtorske pravice pridr¾ane"
 
-#: components/help/converters/gnome-db2html2/toc-elements.c:350
+#: components/help/converters/gnome-db2html2/toc-elements.c:353
 msgid "by"
 msgstr "od"
 
-#: components/help/converters/gnome-db2html2/toc-elements.c:352
+#: components/help/converters/gnome-db2html2/toc-elements.c:355
 msgid "Table of Contents"
 msgstr "Kazalo vsebine"
 
-#: components/help/converters/gnome-db2html2/toc-elements.c:518
+#: components/help/converters/gnome-db2html2/toc-elements.c:521
 msgid "PREFACE"
 msgstr "UVOD"
 
-#: components/help/converters/gnome-db2html2/toc-elements.c:527
+#: components/help/converters/gnome-db2html2/toc-elements.c:530
 msgid "APPENDIX"
 msgstr "DODATEK"
 
@@ -237,58 +289,78 @@ msgstr "DODATEK"
 #. GNU Public  License  and  many  people  are
 #. working on changes to the kernel)
 #. **
-#: components/help/hyperbola-filefmt.c:503
-#: components/help/hyperbola-filefmt.c:505
-#: components/help/hyperbola-filefmt.c:509
-#: components/help/hyperbola-filefmt.c:511
-#: components/help/hyperbola-filefmt.c:515
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:537
+#: components/help/hyperbola-filefmt.c:538
+#: components/help/hyperbola-filefmt.c:539
+#: components/help/hyperbola-filefmt.c:541
+#: components/help/hyperbola-filefmt.c:543
 msgid "Manual"
 msgstr "Priroènik"
 
-#: components/help/hyperbola-filefmt.c:505
-msgid "System"
-msgstr "Sistem"
-
-#: components/help/hyperbola-filefmt.c:505
-msgid "Configuration"
-msgstr "Nastavitev"
-
-#: components/help/hyperbola-filefmt.c:505
-msgid "Config files"
-msgstr "Nastavitvene datoteke"
-
-#: components/help/hyperbola-filefmt.c:509
-#: components/help/hyperbola-filefmt.c:833 data/linksets/apps.xml.h:1
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:861 data/linksets/apps.xml.h:1
 msgid "Applications"
 msgstr "Programi"
 
-#: components/help/hyperbola-filefmt.c:509
-msgid "Command Line"
-msgstr "Ukazna vrstica"
-
-#: components/help/hyperbola-filefmt.c:511
-#: components/help/hyperbola-filefmt.c:515
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:543
 msgid "Development"
 msgstr "Razvoj"
 
-#: components/help/hyperbola-filefmt.c:511
-#: components/help/hyperbola-filefmt.c:515
-msgid "APIs"
-msgstr "Programski vmesniki"
-
-#: components/help/hyperbola-filefmt.c:511
-msgid "Miscellaneous"
-msgstr "Razno"
-
-#: components/help/hyperbola-filefmt.c:515
+#: components/help/hyperbola-filefmt.c:532
 msgid "System Calls"
 msgstr "Sistemski klici"
 
-#: components/help/hyperbola-filefmt.c:675
-#: libnautilus-extensions/nautilus-stock-dialogs.c:509
+#: components/help/hyperbola-filefmt.c:534
+msgid "Library Functions"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:536
+#, fuzzy
+msgid "Devices"
+msgstr "Storitve"
+
+#: components/help/hyperbola-filefmt.c:537
+#, fuzzy
+msgid "Configuration Files"
+msgstr "Nastavitev"
+
+#: components/help/hyperbola-filefmt.c:538
+#, fuzzy
+msgid "Games"
+msgstr "Igra"
+
+#: components/help/hyperbola-filefmt.c:539
+#, fuzzy
+msgid "Conventions"
+msgstr "Vsebina:"
+
+#: components/help/hyperbola-filefmt.c:541
+msgid "System Administration"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:543
+msgid "Kernel Routines"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:703
 msgid "Info"
 msgstr "Podatki"
 
+#: components/help/hyperbola-nav-tree.c:310
+msgid "Introductory Documents:"
+msgstr ""
+
+#: components/help/hyperbola-nav-tree.c:324
+msgid "Documents by Subject:"
+msgstr ""
+
 #: components/help/hyperbola-nav-index.c:121
 msgid "see "
 msgstr "poglej "
@@ -310,7 +382,7 @@ msgid " (see also \""
 msgstr " (gelj tudi \""
 
 #: components/help/Nautilus_View_help.oaf.in.h:1
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:104
+#: components/services/summary/nautilus-summary-dialogs.c:106
 msgid "Help"
 msgstr "Pomoè"
 
@@ -358,7 +430,7 @@ msgstr "Stranski pult zgodovine"
 msgid "History sidebar panel for Nautilus"
 msgstr "Stranski pult zgodovine za Nautilusa"
 
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
 
@@ -375,13 +447,23 @@ msgid "Image"
 msgstr "Slika"
 
 #: components/image-viewer/Nautilus_View_image.oaf.in.h:4
+#, fuzzy
+msgid "Image Viewer"
+msgstr "Splo¹en pregledovalnik slik"
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:5
 msgid "Nautilus Image Viewer"
 msgstr "Nautilusov pregledovalnik slik"
 
-#: components/image-viewer/Nautilus_View_image.oaf.in.h:5
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:6
 msgid "Nautilus Image viewer factory"
 msgstr "Tovarna nautilusovega pregledovalnika slik"
 
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:7
+#, fuzzy
+msgid "View as Image"
+msgstr "Poglej kot %s"
+
 #: components/loser/content/nautilus-content-loser.c:140
 #, c-format
 msgid ""
@@ -408,7 +490,7 @@ msgstr "Ubij pogled izgubljalca vsebine"
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:77
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "_Datoteka"
 
@@ -421,21 +503,31 @@ msgid "Content Loser"
 msgstr "Izgubljalnik vsebine"
 
 #: components/loser/content/Nautilus_View_content-loser.oaf.in.h:2
+#, fuzzy
+msgid "Content Loser Viewer"
+msgstr "Izgubljalnik vsebine"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:3
 msgid "Nautilus Content Loser"
 msgstr "Nautilusov izgubljalnik vsebine"
 
-#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:3
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:4
 msgid "Nautilus content loser component's factory"
 msgstr "Tovarna komponent Nautilusovega izgubljalnika vsebine"
 
-#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:4
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:5
 msgid "Nautilus content loser factory"
 msgstr "Tovarna Nautilusovega izgubljalnika vsebine"
 
-#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:5
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:6
 msgid "Nautilus content view that fails on command"
 msgstr "Nautilusov pogled vsebine, ki ne uspe ob ukazu"
 
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:7
+#, fuzzy
+msgid "View as Content Loser"
+msgstr "Ubij izgubljalca vsebine"
+
 #: components/loser/sidebar/nautilus-sidebar-loser.c:143
 #, c-format
 msgid ""
@@ -484,7 +576,7 @@ msgid "Sidebar Loser"
 msgstr "Izgubljalnik stranskega pulta"
 
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -494,7 +586,7 @@ msgstr ""
 "  %s"
 
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -505,342 +597,357 @@ msgstr ""
 "  %s\n"
 "Nadaljne napake so vidne le v terminalu"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:321
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:38
 msgid "Arabic"
 msgstr "Arabski"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:322
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:39
 msgid "Baltic"
 msgstr "Baltski"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:323
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:40
 msgid "Central European"
 msgstr "Srednjeevropski"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:324
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:41
 msgid "Chinese"
 msgstr "Kitajski"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:325
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:42
 msgid "Cyrillic"
 msgstr "Cirilica"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:326
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:43
 msgid "Greek"
 msgstr "Gr¹ki"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:327
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:44
 msgid "Hebrew"
 msgstr "Hebrejski"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:328
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:45
 msgid "Japanese"
 msgstr "Japonski"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:329
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:46
 msgid "Turkish"
 msgstr "Tur¹ki"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:330
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:47
 msgid "Unicode"
 msgstr "Unicode"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:331
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:48
 msgid "UTF"
 msgstr "UTF"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:332
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:49
 msgid "Vietnamese"
 msgstr "Vietnamski"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:333
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:50
 msgid "Western"
 msgstr "Zahodnja¹ki"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:387
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:55
 msgid "Arabic (IBM-864)"
 msgstr "Arabski (IBM-854)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:388
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:56
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabski (ISO-8859-6)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:389
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:57
 msgid "Arabic (ISO-8859-6-E)"
 msgstr "Arabski (ISO-8859-6-E)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:390
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:58
 msgid "Arabic (ISO-8859-6-I)"
 msgstr "Arabski (ISO-8859-6-I)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:391
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:59
 msgid "Arabic (Windows-1256)"
 msgstr "Arabski (Windows-1256)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:392
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:60
 msgid "Armenian (ARMSCII-8)"
 msgstr "Armenski (ARMSCII-8)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:393
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:61
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltski (ISO-8859-13)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:394
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:62
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltski (ISO-8849-4)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:395
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:63
 msgid "Baltic (Windows-1257)"
 msgstr "Baltski (Windows-1257)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:396
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:64
 msgid "Celtic (ISO-8859-14)"
 msgstr "Keltski (ISO-8859-14)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:397
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:65
 msgid "Central European (IBM-852)"
 msgstr "Srednjeevropski (IBM-852)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:398
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:66
 msgid "Central European (ISO-8859-2)"
 msgstr "Srednjeevorpski (ISO-8859-2)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:399
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:67
 msgid "Central European (MacCE)"
 msgstr "Srednjeevropski (MacCE)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:400
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:68
 msgid "Central European (Windows-1250)"
 msgstr "Srednjeevropski (Windows-1250)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:401
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:69
 msgid "Chinese Simplified (GB2312)"
 msgstr "Poenostavljen kitajski (GB2312)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:402
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:70
 msgid "Chinese Simplified (GBK)"
 msgstr "Poenostavljen kitajski (GBK)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:403
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:71
 msgid "Chinese Simplified (HZ)"
 msgstr "Poenostavljen kitajski (HZ)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:404
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:72
 msgid "Chinese Traditional (Big5)"
 msgstr "Tradicionalni kitajski (Big5)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:405
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:73
 msgid "Chinese Traditional (EUC-TW)"
 msgstr "Tradicionalni kitajski (EUC-TW)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:406
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:74
 msgid "Croatian (MacCroatian)"
 msgstr "Hrva¹ki (MacCroatian)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:407
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:75
 msgid "Cyrillic (IBM-855)"
 msgstr "Cirilica (IBM-855)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:408
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:76
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirilica (ISO-8859-5"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:409
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:77
 msgid "Cyrillic (ISO-IR-111)"
 msgstr "Cirilica (ISO-IR-111)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:410
-msgid "Cyrillic (KOI8-R)"
-msgstr "Cirilica (KOI8-R)"
-
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:411
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:78
 msgid "Cyrillic (MacCyrillic)"
 msgstr "Cirilica (MacCyrillic)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:412
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:79
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirilica (Windows-1251)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:413
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:80
 msgid "Cyrillic/Russian (IBM-866)"
 msgstr "Cirilica/Ruski (IBM-886)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:414
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:81
+#, fuzzy
+msgid "Cyrillic/Russian (KOI8-R)"
+msgstr "Cirilica/Ruski (IBM-886)"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:82
 msgid "Cyrillic/Ukrainian (KOI8-U)"
 msgstr "Cirilica/Ukrajinski (KOI8-U)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:415
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:83
 msgid "Cyrillic/Ukrainian (MacUkrainian)"
 msgstr "Cirilica/Ukrajinski (MacUkrainian)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:416
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:84
 msgid "English (US-ASCII)"
 msgstr "Angle¹ki (US-ASCII)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:417
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:85
 msgid "Greek (ISO-8859-7)"
 msgstr "Gr¹ki (ISO-8859-7)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:418
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:86
 msgid "Greek (MacGreek)"
 msgstr "Gr¹ki (MacGreek)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:419
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:87
 msgid "Greek (Windows-1253)"
 msgstr "Gr¹ki (Windows-1253)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:420
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:88
 msgid "Hebrew (IBM-862)"
 msgstr "Hebrejski (IBM-862)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:421
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:89
 msgid "Hebrew (ISO-8859-8-E)"
 msgstr "Hebrejski (ISO-8859-8-E)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:422
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:90
 msgid "Hebrew (ISO-8859-8-I)"
 msgstr "Hebrejski (ISO-8859-8-I)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:423
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:91
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrejski (Windows-1255)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:424
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:92
 msgid "Icelandic (MacIcelandic)"
 msgstr "Islandski (MacIcelandic)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:425
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:93
 msgid "Japanese (EUC-JP)"
 msgstr "Japonski (EUC-JP)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:426
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:94
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonski (ISO-2022-JP)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:427
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:95
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonski (Shift_JIS)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:428
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:96
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:429
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:97
 msgid "Nordic (ISO-8859-10)"
 msgstr "Nordijski (ISO-8859-10)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:430
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:98
 msgid "Romanian (MacRomanian)"
 msgstr "Romunski (MacRomanian)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:431
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:99
 msgid "South European (ISO-8859-3)"
 msgstr "Ju¾noevropski (ISO-8859-3)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:432
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:100
 msgid "T.61-8bit"
 msgstr "T.61-8bit"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:433
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:101
 msgid "Thai (TIS-620)"
 msgstr "Tajski (TIS-620)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:434
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:102
 msgid "Turkish (IBM-857)"
 msgstr "Tur¹ki (IBM-857)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:435
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:103
 msgid "Turkish (ISO-8859-9)"
 msgstr "Tur¹ki (ISO-8859-9)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:436
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:104
 msgid "Turkish (MacTurkish)"
 msgstr "Tur¹ki (MacTurkish)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:437
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:105
 msgid "Turkish (Windows-1254)"
 msgstr "Tur¹ki (Windows-1254)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:438
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:106
 msgid "Unicode (UTF-7)"
 msgstr "Unicode (UTF-7)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:439
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:107
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:440
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:108
 msgid "User Defined"
 msgstr "Prikorjen"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:441
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:109
 msgid "UTF-16BE"
 msgstr "UTF-16BE"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:442
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:110
 msgid "UTF-16LE"
 msgstr "UTF-16LE"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:443
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:111
 msgid "UTF-32BE"
 msgstr "UTF-32BE"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:444
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:112
 msgid "UTF-32LE"
 msgstr "UTF-32LE"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:445
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:113
 msgid "Vietnamese (TCVN)"
 msgstr "Vietnamski (TCVN)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:446
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:114
 msgid "Vietnamese (VISCII)"
 msgstr "Vietnamski (VISCII)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:447
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:115
 msgid "Vietnamese (VPS)"
 msgstr "Vietnamski (VPS)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:448
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:116
 msgid "Vietnamese (Windows-1258)"
 msgstr "Vietnamski (Windows-1258)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:449
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:117
 msgid "Visual Hebrew (ISO-8859-8)"
 msgstr "Vidni hebrejski (ISO-8859-8)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:450
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:118
 msgid "Western (IBM-850)"
 msgstr "Zahodnja¹ki (IBM-850)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:451
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:119
 msgid "Western (ISO-8859-1)"
 msgstr "Zahodnja¹ki (ISO-8859-1)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:452
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:120
 msgid "Western (ISO-8859-15)"
 msgstr "Zahodnja¹ki (ISO-8859-15)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:453
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:121
 msgid "Western (MacRoman)"
 msgstr "Zahodnja¹ki (MacRoman)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:454
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:122
 msgid "Western (Windows-1252)"
 msgstr "Zahodnja¹ki (Windows-1252)"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:455
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:123
 msgid "windows-936"
 msgstr "windows-936"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:456
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:124
 msgid "x-imap4-modified-utf7"
 msgstr "x-imap4-modified-utf7"
 
-#: components/mozilla/nautilus-mozilla-embed-extensions.cpp:457
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:125
 msgid "x-u-escaped"
 msgstr "x-u-escaped"
 
+#: components/mozilla/nautilus-mozilla-content-view.c:809
+msgid ""
+"A JavaScript function (small software program) on this page tried to open a "
+"new window, but nautilus does not support the opening of new windows by "
+"JavaScript.\n"
+"\n"
+"Try viewing the page in a different web browser, such as Mozilla or Netscape."
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-content-view.c:810
+#, fuzzy
+msgid "Nautilus Mozilla View Warning"
+msgstr "Nautilusov pregledovalnik slik"
+
 #: components/mozilla/nautilus-mozilla-ui.xml.h:1
 msgid "Charset Encoding"
 msgstr "Nabor znakov"
@@ -862,9 +969,19 @@ msgid "Mozilla content view component's factory"
 msgstr "Tovarna komponent pogleda vsebine Mozille"
 
 #: components/mozilla/Nautilus_View_mozilla.oaf.in.h:5
+#, fuzzy
+msgid "View as Web Page"
+msgstr "Spletna stran"
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:6
 msgid "Web Page"
 msgstr "Spletna stran"
 
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:7
+#, fuzzy
+msgid "Web Page Viewer"
+msgstr "Spletna stran"
+
 #: components/music/mpg123.c:29
 msgid "Blues"
 msgstr "Bluz"
@@ -1507,7 +1624,7 @@ msgid "Sorry, but '%s' is not a usable image file."
 msgstr "Oprostite, ampak '%s' ni uporabna datoteka s sliko."
 
 #: components/music/nautilus-music-view.c:696
-#: src/nautilus-property-browser.c:1055 src/nautilus-property-browser.c:1307
+#: src/nautilus-property-browser.c:1060 src/nautilus-property-browser.c:1312
 msgid "Not an Image"
 msgstr "Ni slika"
 
@@ -1515,7 +1632,7 @@ msgstr "Ni slika"
 msgid "Select an image file for the album cover:"
 msgstr "Izberite datoteko s sliko za naslovnico albuma:"
 
-#: components/music/nautilus-music-view.c:1187
+#: components/music/nautilus-music-view.c:1174
 msgid ""
 "Sorry, but the music view is unable to play back sound right now. Either "
 "another program is using or blocking the sound card, or your sound card is "
@@ -1527,56 +1644,56 @@ msgstr ""
 "Poskusite zapreti vse programe, ki bi lahko prepreèevali uporabo zvoène "
 "kartice."
 
-#: components/music/nautilus-music-view.c:1191
+#: components/music/nautilus-music-view.c:1178
 msgid "Unable to Play File"
 msgstr "Ne morem predvajati datoteke"
 
-#: components/music/nautilus-music-view.c:1212
+#: components/music/nautilus-music-view.c:1199
 msgid "Sorry, but the music view can't play non-local files yet."
 msgstr "Oprostite, glasbeni pogled (¹e) ne zna igrati ne-krajevnih datotek."
 
-#: components/music/nautilus-music-view.c:1213
+#: components/music/nautilus-music-view.c:1200
 msgid "Can't Play Remote Files"
 msgstr "Ne morem igrati oddaljenih datotek"
 
-#: components/music/nautilus-music-view.c:1507
+#: components/music/nautilus-music-view.c:1486
+msgid "Drag to seek within track"
+msgstr "Spusti za nastavitev mesta znotraj sledi"
+
+#: components/music/nautilus-music-view.c:1526
 msgid "Play"
 msgstr "Predvajaj"
 
-#: components/music/nautilus-music-view.c:1521
+#: components/music/nautilus-music-view.c:1540
 msgid "Pause"
 msgstr "Premor"
 
-#: components/music/nautilus-music-view.c:1535
-#: libnautilus-extensions/nautilus-file-operations.c:945
-#: libnautilus-extensions/nautilus-file-operations.c:960
+#: components/music/nautilus-music-view.c:1554
 #: libnautilus-extensions/nautilus-file-operations.c:979
-#: src/nautilus-shell-ui.xml.h:54
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Ustavi"
 
-#: components/music/nautilus-music-view.c:1576
-msgid "Drag to seek within track"
-msgstr "Spusti za nastavitev mesta znotraj sledi"
-
-#: components/music/nautilus-music-view.c:1694
+#: components/music/nautilus-music-view.c:1679
 #, c-format
 msgid "Sorry, but there was an error reading %s."
 msgstr "Oprostite, pri¹lo je do napake pri branju %s."
 
-#: components/music/nautilus-music-view.c:1695
+#: components/music/nautilus-music-view.c:1680
 msgid "Can't Read Folder"
 msgstr "Ne morem prebrati mape"
 
-#: components/music/nautilus-music-view.c:1765
+#: components/music/nautilus-music-view.c:1750
 msgid "Stereo"
 msgstr "Stereo"
 
-#: components/music/nautilus-music-view.c:1765
+#: components/music/nautilus-music-view.c:1750
 msgid "Mono"
 msgstr "Mono"
 
-#: components/music/nautilus-music-view.c:1807
+#: components/music/nautilus-music-view.c:1792
 #, c-format
 msgid "%s - %s"
 msgstr "%s - %s"
@@ -1590,13 +1707,23 @@ msgid "Music"
 msgstr "Glasba"
 
 #: components/music/Nautilus_View_music.oaf.in.h:3
-msgid "Music view"
+#, fuzzy
+msgid "Music Viewer"
 msgstr "Glasbeni pogled"
 
 #: components/music/Nautilus_View_music.oaf.in.h:4
+msgid "Music view"
+msgstr "Glasbeni pogled"
+
+#: components/music/Nautilus_View_music.oaf.in.h:5
 msgid "Music view factory"
 msgstr "Tovarna glasbenih pogledov"
 
+#: components/music/Nautilus_View_music.oaf.in.h:6
+#, fuzzy
+msgid "View as Music"
+msgstr "Poglej kot %s"
+
 #: components/notes/Nautilus_View_notes.oaf.in.h:1
 msgid "Factory for annotation view"
 msgstr "Tovarna za pogled opomb"
@@ -1609,186 +1736,6 @@ msgstr "Stranski pult opomb"
 msgid "Notes sidebar panel for Nautilus"
 msgstr "Stranski pult opomb za Nautilusa"
 
-#. set up the window title
-#: components/rpmview/nautilus-rpm-verify-window.c:183
-#, c-format
-msgid "Verifying %s..."
-msgstr "Preverjam %s..."
-
-#: components/rpmview/nautilus-rpm-verify-window.c:207
-#, c-format
-msgid "Failed on \"%s\""
-msgstr "Nisem uspel nad \"%s\""
-
-#. TRANSLATORS: this is printed while verifying files from packages,
-#. %s is the filename, %d/%d is filenumber of total-number-of-files
-#: components/rpmview/nautilus-rpm-verify-window.c:211
-#, c-format
-msgid "Checking \"%s\" (%ld/%ld)"
-msgstr "Preverjam \"%s\" (%ld/%ld)"
-
-#: components/rpmview/nautilus-rpm-view.c:124
-msgid "Package Contents"
-msgstr "Vsebina paketa"
-
-#. allocate the name field
-#: components/rpmview/nautilus-rpm-view.c:171
-msgid "Package Title"
-msgstr "Naziv paketa"
-
-#: components/rpmview/nautilus-rpm-view.c:192
-msgid "Size: "
-msgstr "Velikost: "
-
-#: components/rpmview/nautilus-rpm-view.c:198
-msgid "<size>"
-msgstr "<velikost>"
-
-#: components/rpmview/nautilus-rpm-view.c:204
-msgid "Install Date: "
-msgstr "Datum namestitve: "
-
-#: components/rpmview/nautilus-rpm-view.c:210
-#: components/rpmview/nautilus-rpm-view.c:222
-#: components/rpmview/nautilus-rpm-view.c:234
-#: components/rpmview/nautilus-rpm-view.c:246
-#: components/rpmview/nautilus-rpm-view.c:258
-msgid "<unknown>"
-msgstr "<neznan>"
-
-#: components/rpmview/nautilus-rpm-view.c:216
-msgid "License: "
-msgstr "Vrstica %d: "
-
-#: components/rpmview/nautilus-rpm-view.c:228
-msgid "Build Date: "
-msgstr "Datum prevajanja: "
-
-#: components/rpmview/nautilus-rpm-view.c:240
-msgid "Distribution: "
-msgstr "Distribucija: "
-
-#: components/rpmview/nautilus-rpm-view.c:252
-msgid "Vendor: "
-msgstr "Opisna vrstica izdelovalca: "
-
-#: components/rpmview/nautilus-rpm-view.c:285
-#: components/services/install/nautilus-view/Nautilus_View_install.oaf.in.h:1
-#: components/services/install/server/Trilobite_Service_install.oaf.in.h:2
-msgid "Install"
-msgstr "Namesti"
-
-#: components/rpmview/nautilus-rpm-view.c:301
-msgid "Update"
-msgstr "Posodobi"
-
-#: components/rpmview/nautilus-rpm-view.c:310
-msgid "Uninstall"
-msgstr "Odstrani"
-
-#: components/rpmview/nautilus-rpm-view.c:326
-msgid "Verify"
-msgstr "Preveri"
-
-#: components/rpmview/nautilus-rpm-view.c:362
-msgid "Go to selected file"
-msgstr "Pojdi na izbrano datoteko"
-
-#. add the description
-#: components/rpmview/nautilus-rpm-view.c:373
-msgid "Description"
-msgstr "Opis"
-
-#: components/rpmview/nautilus-rpm-view.c:492
-#, c-format
-msgid "Package Contents: %d files"
-msgstr "Paket vsebuje: %d datotek"
-
-#: components/rpmview/nautilus-rpm-view.c:499
-#, c-format
-msgid "Package \"%s\" "
-msgstr "Paket \"%s\" "
-
-#: components/rpmview/nautilus-rpm-view.c:675
-msgid "Verification completed, package ok."
-msgstr "Preverjanje opravljeno, paket je v redu."
-
-#: components/rpmview/nautilus-rpm-view-install.c:104
-#, c-format
-msgid "%s would not work anymore\n"
-msgstr "%s ne bi veè delal\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:107
-#, c-format
-msgid "%s would break other installed packages\n"
-msgstr "%s bi pokvaril druge name¹èene pakete\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:112
-#, c-format
-msgid "%s is needed, but could not be found\n"
-msgstr "%s je potrebovan, a ni najden\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:117
-#, c-format
-msgid "%s was already installed\n"
-msgstr "%s je bil ¾e name¹èen\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:120
-#, c-format
-msgid "%s causes a circular dependency problem\n"
-msgstr "%s povzroèa problem kro¾ne odvisnosti\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:138
-#, c-format
-msgid "Installing %s failed because of the following issue(s):\n"
-msgstr "Name¹èanje %s ni uspelo zaradi sledeèih problemov:\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:140
-#, c-format
-msgid "Uninstalling %s failed because of the following issue(s):\n"
-msgstr "Odstranjevanje %s ni uspelo zaradi sledeèih problemov:\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:236
-msgid "Uninstall failed..."
-msgstr "Odstranitev ni uspelo..."
-
-#: components/rpmview/nautilus-rpm-view-install.c:237
-msgid "Uninstall Failed"
-msgstr "Odstranitev ni uspela"
-
-#: components/rpmview/nautilus-rpm-view-install.c:239
-msgid "Install failed..."
-msgstr "Namestitev ni uspela..."
-
-#: components/rpmview/nautilus-rpm-view-install.c:240
-msgid "Install Failed"
-msgstr "Namestitev ni uspela"
-
-#: components/rpmview/nautilus-rpm-view-install.c:291
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1491
-msgid "Incorrect password."
-msgstr "Napaèno geslo."
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:1
-msgid "Factory for rpm view"
-msgstr "Tovarna pogledov RPM"
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:2
-msgid "Package"
-msgstr "Paket"
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:3
-msgid "RPM component"
-msgstr "Komponenta RPM"
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:4
-msgid "RPM view factory"
-msgstr "Tovarna pogledov RPM"
-
-#: components/rpmview/Nautilus_View_rpm.oaf.in.h:5
-msgid "rpm view"
-msgstr "pogled rpm"
-
 #: components/sample/nautilus-sample-content-view.c:136
 msgid "(none)"
 msgstr "(brez)"
@@ -1826,7 +1773,8 @@ msgid "This is a sample merged menu item"
 msgstr "To je vzorec pridru¾enega predmeta menuja"
 
 #: components/sample/nautilus-sample-content-view-ui.xml.h:3
-msgid "This is a sample merged tool bar button"
+#, fuzzy
+msgid "This is a sample merged toolbar button"
 msgstr "To je vzorec pridru¾enega gumba orodne vrstice"
 
 #: components/sample/nautilus-sample-content-view-ui.xml.h:5
@@ -1842,140 +1790,413 @@ msgid "Nautilus Sample view factory"
 msgstr "Tovarna Nautilusovih vzorènih pogledov"
 
 #: components/sample/Nautilus_View_sample.oaf.in.h:4
+#, fuzzy
+msgid "Sample Viewer"
+msgstr "Frekvenca vzorèenja"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:5
 msgid "Sample content view component"
 msgstr "Vzorèna komponenta pogleda vsebine"
 
-#: components/sample/Nautilus_View_sample.oaf.in.h:5
+#: components/sample/Nautilus_View_sample.oaf.in.h:6
 msgid "Sample content view component's factory"
 msgstr "Tovarna vzorènih komponent pogleda vsebine"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:95
+#: components/sample/Nautilus_View_sample.oaf.in.h:7
+#, fuzzy
+msgid "View as Sample"
+msgstr "Poglej z neèim drugim"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:107
 msgid "Set the default answer to continue, also default delete to Yes"
 msgstr "Nastavi privzet odgovor na nadaljevanje in brisanje na Da"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:96
+#: components/services/install/command-line/eazel-alt-install-corba.c:108
 msgid "Specify search cgi"
 msgstr "Dolièi iskalni cgi"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:97
+#: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
-#: components/services/install/command-line/eazel-test-packsys.c:575
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-packsys.c:590
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "Ka¾i razhro¹èevalni izhod"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:98
+#: components/services/install/command-line/eazel-alt-install-corba.c:110
 msgid "10 sec delay after starting service"
 msgstr "Premor 10 sekund po zagonu storitve"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:99
+#: components/services/install/command-line/eazel-alt-install-corba.c:111
 msgid "Allow downgrades"
 msgstr "Dovoli prehod na starej¹o razlièico"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:100
+#: components/services/install/command-line/eazel-alt-install-corba.c:112
 msgid "Erase packages"
 msgstr "Bri¹i pakete"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:101
+#: components/services/install/command-line/eazel-alt-install-corba.c:113
 msgid "enable ei2"
 msgstr "vkluèi ei2"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:102
+#: components/services/install/command-line/eazel-alt-install-corba.c:114
 msgid "RPM args are filename"
 msgstr "RPM argumenti so ime datoteke"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:103
-msgid "Force install"
-msgstr "Nasilna namestitev"
-
-#: components/services/install/command-line/eazel-alt-install-corba.c:104
+#: components/services/install/command-line/eazel-alt-install-corba.c:115
 msgid "Use ftp"
 msgstr "Uporabi ftp"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:105
+#: components/services/install/command-line/eazel-alt-install-corba.c:116
 msgid "Use local"
 msgstr "Uporabi krajevne datoteke"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:106
+#: components/services/install/command-line/eazel-alt-install-corba.c:117
 msgid "Use http"
 msgstr "Uporabi http"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:107
+#: components/services/install/command-line/eazel-alt-install-corba.c:118
 msgid "RPM args are Eazel Ids"
 msgstr "RPM argumenti so IDji Eazela"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:108
+#: components/services/install/command-line/eazel-alt-install-corba.c:119
+msgid "machine readable output"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:120
 msgid "Don't print fancy percent output"
 msgstr "Ne izpisuj olep¹anega metra procentov"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:109
+#: components/services/install/command-line/eazel-alt-install-corba.c:121
 msgid "don't use eazel auth stuff"
 msgstr "ne uporabi eazel avtentifikacije"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:110
+#: components/services/install/command-line/eazel-alt-install-corba.c:122
 msgid "Specify package file"
 msgstr "Doloèi datoteko paketa"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:111
+#: components/services/install/command-line/eazel-alt-install-corba.c:123
 msgid "RPM args are needed files"
 msgstr "RPM argumenti so potrebne datoteke"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:112
+#: components/services/install/command-line/eazel-alt-install-corba.c:124
 msgid "Run Query"
 msgstr "Po¾eni poizvedbo"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:113
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
 msgid "Revert"
 msgstr "Povrni"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:114
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr "Nastavi korenski imenik"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:115
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "Navedi stre¾nik"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:116
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
 msgid "Dont print too much, just problems and download"
 msgstr "Ne tiskaj preveè, samo problemi in prenosi"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:117
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr "Naredi preimenovanje ssl"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:118
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
+msgid "argument is a suite id"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "Poskusni zagon"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:119
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr "Dovoli uporabni¹ko ime"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:120
-#: components/services/install/lib/eazel-install-problem.c:969
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "Dovoli nadgraditve"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:121
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "Zgovoren izhod"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:582
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
+msgid "Install a specific package version"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
+msgid "*** You cannot specify more then one protocol type.\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
+msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, c-format
-msgid "About to install a total of %d packages, %dKb\n"
-msgstr "Namestil bom skupno %d paketov, %dKb\n"
+msgid "File conflict checking %s...\n"
+msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:586
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, c-format
-msgid "About to uninstall a total of %d packages, %dKb\n"
-msgstr "Odnamestil bom skupno %d paketov, %dKb\n"
+msgid "File uniqueness checking %s...\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
+#, c-format
+msgid "Feature consistency checking %s...\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
+#, c-format
+msgid "Downloading %s..."
+msgstr "Prena¹am %s..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
+msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
+#, fuzzy
+msgid "Downloading %s... (%d/%d) = %d%%"
+msgstr "Prena¹am %s..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
+#, c-format
+msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
+#, fuzzy, c-format
+msgid "Downloading %s... %3.1f KB/s Done\n"
+msgstr "Prena¹am %s..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
+msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
+msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
+#, fuzzy
+msgid "Done\n"
+msgstr "Opravljeno"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
+#, c-format
+msgid "Download of %s FAILED\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
+#, fuzzy, c-format
+msgid "Package %s failed to uninstall.\n"
+msgstr "Ta paket je bil ¾e name¹èen."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:590
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
+#, fuzzy, c-format
+msgid "Package %s failed to install.\n"
+msgstr "Ta paket je bil ¾e name¹èen."
+
+#. I18N note: \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
+#, c-format
+msgid "\t· Problem : %s\n"
+msgstr ""
+
+#. I18N note: \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
 #, c-format
-msgid "About to revert a total of %d packages, %dKb\n"
+msgid "\t· Action : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
+#, fuzzy
+msgid "Cancelling operation\n"
+msgstr "Veljavne operacije:"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
+#, fuzzy, c-format
+msgid "About to install a total of %d packages, %dKB\n"
+msgstr "Namestil bom skupno %d paketov, %dKb\n"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
+#, fuzzy, c-format
+msgid "About to uninstall a total of %d packages, %dKB\n"
+msgstr "Odnamestil bom skupno %d paketov, %dKb\n"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
+#, fuzzy, c-format
+msgid "About to revert a total of %d packages, %d KB\n"
 msgstr "Navzdol nadgradil bom skupno %d paketov, %dKb\n"
 
+#. I18N note: %s is a package name, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
+#, c-format
+msgid "\t· %s and it's dependencies\n"
+msgstr ""
+
+#. I18N note: %s is a package name, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
+#, c-format
+msgid "\t· %s\n"
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n) " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
+msgid "Save transaction report ? (y/n) "
+msgstr ""
+
+#. I18N note: y is the letter for the word Yes. This is
+#. used in the response for a yes/no questions. Your translation
+#. must be 1 character only.
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
+#, fuzzy
+msgid "y"
+msgstr "od"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
+#, c-format
+msgid "Dependency : %s needs %s\n"
+msgstr ""
+
+#. I18N note: %s is a package name
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
+#, c-format
+msgid "Package %s failed md5 check!\n"
+msgstr ""
+
+#. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
+#, c-format
+msgid "\t· server MD5 checksum is %s\n"
+msgstr ""
+
+#. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
+#, c-format
+msgid "\t· actual MD5 checksum is %s\n"
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
+msgid "Continue? (y/n) "
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
+msgid "Should I delete the RPM files? (y/n) "
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
+#, fuzzy
+msgid "Operation ok\n"
+msgstr "Nacionalna folk"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
+#, fuzzy
+msgid "Operation failed\n"
+msgstr "Namestitev ni uspela."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
+#, fuzzy
+msgid "Installing"
+msgstr "Namesti"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
+#, fuzzy
+msgid "Uninstalling"
+msgstr "Odstrani"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
+msgid "Only one operation at a time please."
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
+#, c-format
+msgid "%s: --help for usage\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
+#, c-format
+msgid "Name         : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#, fuzzy, c-format
+msgid "Version      : %s\n"
+msgstr "Razlièica: %s"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#, c-format
+msgid "Minor        : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
+#, c-format
+msgid "Size         : %d\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#, c-format
+msgid "Arch         : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#, fuzzy, c-format
+msgid "Distribution : %s\n"
+msgstr "Distribucija: "
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#, fuzzy, c-format
+msgid "Description  : %s\n"
+msgstr "Opis"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
+#, fuzzy, c-format
+msgid "Install root : %s\n"
+msgstr "Namesti oba %s in %s"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
+msgid "Provides     : \n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
+#, c-format
+msgid "exit code %d\n"
+msgstr ""
+
 #: components/services/install/command-line/eazel-gen-xml.c:41
 msgid "Specify package list to use (/var/eazel/service/package-list.xml)"
 msgstr "Navedi seznam paketov za uporabo (/var/eazel/service/package-list.xml)"
@@ -1986,242 +2207,367 @@ msgstr ""
 "Uporabi navedeno datoteko za generiranje seznama paketov, potrebuje "
 "--packagelist"
 
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 msgid "Softcat server to connect to"
 msgstr "Stre¾nik softcat kamor naj se pove¾e"
 
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr "Uporabi drugo pot CGI"
 
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr "Pove¾i se kot uporabnik softcat-a skozi ammonite"
 
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 msgid "Number of times to try the request"
 msgstr "©tevilo poskusov zahtevka"
 
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr "Premor med zahtevki, v usec"
 
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr "Poizvej po IDju Eazelovega paketa"
 
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+#, fuzzy
+msgid "Lookup package that features a feature/file"
 msgstr "Poizvej po paketu, ki nudi mo¾nost/datoteko"
 
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr "Poizvej po paketu doloèene razlièice"
 
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr "(uporabi --version) Uporabi >= primerjavo"
 
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 msgid "use check function (for debugging)"
 msgstr "uporabi preverjalno funkcijo (za razhro¹èevanje)"
 
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 msgid "Show detailed sub-package info"
 msgstr "Ka¾i podrobne podpaketne podatke"
 
-#: components/services/install/lib/eazel-install-logic2.c:137
+#: components/services/install/command-line/eazel-test-softcat.c:66
+msgid "enable funk parser"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "Nisem uspel zakleniti prene¹ene datoteke"
 
-#: components/services/install/lib/eazel-install-logic2.c:154
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "MD5 ne ustreza, paket %s je morda zlonamerno spremenjen"
 
-#: components/services/install/lib/eazel-install-logic2.c:408
+#: components/services/install/lib/eazel-install-logic2.c:150
+#, fuzzy, c-format
+msgid "No MD5 available for %s"
+msgstr "Opis za temo \"%s\" ni na voljo"
+
+#. I18N note: "%is is ok" in the sense that %s=package name and the
+#. package is intact
+#: components/services/install/lib/eazel-install-logic2.c:356
+#, fuzzy, c-format
+msgid "%s is ok"
+msgstr "Je to v redu ?"
+
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s razlièica %s-%s je ¾e name¹èena"
 
-#: components/services/install/lib/eazel-install-logic2.c:412
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s razlièica %s je ¾e name¹èena"
 
-#: components/services/install/lib/eazel-install-logic2.c:421
-#: components/services/install/lib/eazel-install-logic2.c:426
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr "%s nadgradi iz razlièice %s-%s na %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:435
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr "%s navzdol nadgradi iz razlièice %s-%s na %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:440
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr "%s navzodl nadgradi iz razlièice %s na %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:494
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr "%s namesti razlièico %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:499
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr "%s namesti razlièico %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:1239
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
+#, fuzzy, c-format
+msgid "Loading package info from file %s"
+msgstr "Dobivam podatke o paketu ..."
+
+#. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
+#: components/services/install/lib/eazel-install-logic2.c:1197
+#, fuzzy
+msgid "ok"
+msgstr "Folk"
+
+#: components/services/install/lib/eazel-install-logic2.c:1197
+msgid "not ok"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:1363
+#, c-format
+msgid "Checking dependencies for %s"
+msgstr ""
+
+#. I18N note: both %s' are package names.
+#. related is in the sense that the two packages apparently
+#. are connected somehow, eg. foo and foo-devel
+#: components/services/install/lib/eazel-install-logic2.c:2014
+#, fuzzy, c-format
+msgid "%s is related to %s"
+msgstr "izbran \"%s\" (%s)"
+
+#: components/services/install/lib/eazel-install-logic2.c:2090
+#, c-format
+msgid "updating %s to version %s-%s solves conflict"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2113
+#, c-format
+msgid "available update to %s (%s-%s) does not solves conflict"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, c-format
 msgid "could not revive %s"
 msgstr "nisem mogel odkriti %s"
 
-#: components/services/install/lib/eazel-install-metadata.c:171
+#: components/services/install/lib/eazel-install-logic2.c:2284
+#, c-format
+msgid "file uniqueness checking %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2305
+#, c-format
+msgid "Duplicate file : %s occurs in %s and %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
+msgid "... but it's ok, the packages are related"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2324
+#, fuzzy, c-format
+msgid "(there were %d other conflicts)"
+msgstr "A obstajajo konfliktne datoteke"
+
+#: components/services/install/lib/eazel-install-logic2.c:2419
+#, fuzzy, c-format
+msgid "file conflict checking %s"
+msgstr "%s je imel datoteèni konflikt z %s"
+
+#: components/services/install/lib/eazel-install-logic2.c:2456
+#, c-format
+msgid "file conflict : package %s already provides file %s also provided by %s"
+msgstr ""
+
+#. the owner of this file is a package that we're upgrading, and the
+#. * new version no longer has this file, so everything's okay.
+#: components/services/install/lib/eazel-install-logic2.c:2466
+#, c-format
+msgid "...but it is okay, we're upgrading %s and it ditched that file"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2558
+#, c-format
+msgid "checking feature consistency of %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2626
+#, c-format
+msgid ""
+"feature missing : %s breaks if %s is installed (feature %s would be lost"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2705
+#, fuzzy, c-format
+msgid "downloading %d packages"
+msgstr "Prena¹am pakete"
+
+#: components/services/install/lib/eazel-install-logic2.c:2951
+#, fuzzy, c-format
+msgid "will upgrade %s"
+msgstr "Dovoli nadgraditve"
+
+#: components/services/install/lib/eazel-install-logic2.c:2954
+#, fuzzy, c-format
+msgid "will downgrade %s"
+msgstr "Sprejel bom %s"
+
+#: components/services/install/lib/eazel-install-logic2.c:2957
+#, fuzzy, c-format
+msgid "will install %s"
+msgstr "Name¹èam \"%s\""
+
+#: components/services/install/lib/eazel-install-logic2.c:2960
+#, fuzzy, c-format
+msgid "will uninstall %s"
+msgstr "Odstrani"
+
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
+#, c-format
+msgid "%s requires %s"
+msgstr "%s potrebuje %s"
+
+#: components/services/install/lib/eazel-install-logic2.c:3238
+#, fuzzy, c-format
+msgid "failed %s"
+msgstr "Nisem uspel nad \"%s\""
+
+#: components/services/install/lib/eazel-install-metadata.c:174
 msgid "Could not set URLType from config file!"
 msgstr "Nisem mogel nastaviti vrste URLja iz nastavitvene datoteke!"
 
-#: components/services/install/lib/eazel-install-object.c:701
+#: components/services/install/lib/eazel-install-object.c:717
 msgid "Transactions are not stored, could not find home dir"
 msgstr "Transakcije niso hranjene, nisem na¹el domaèega imenika"
 
-#: components/services/install/lib/eazel-install-object.c:729
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr "Transakcije so shranjene v %s"
 
-#: components/services/install/lib/eazel-install-object.c:986
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "Z oddaljenega stre¾nika dobivam seznam paketov ...\n"
 
-#: components/services/install/lib/eazel-install-object.c:1002
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "Nisem uspel prenesti package-list.xml!\n"
 
-#: components/services/install/lib/eazel-install-object.c:1075
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr ""
 "Nisem mogel pisati v datoteko %s, uporabljam privzet obravnavalnik dnevnika"
 
-#: components/services/install/lib/eazel-install-object.c:1206
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "Namestitev ni uspela"
 
-#: components/services/install/lib/eazel-install-object.c:1252
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "Odstranitev ni uspela"
 
-#: components/services/install/lib/eazel-install-object.c:1373
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "Nisem mogel ustvariti transakcijskega imenika (%s)! ***\n"
 
-#: components/services/install/lib/eazel-install-object.c:1396
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr "Zapisujem transakcijo v %s"
 
-#: components/services/install/lib/eazel-install-problem.c:141
+#: components/services/install/lib/eazel-install-problem.c:163
 #, c-format
 msgid "%s was cancelled"
 msgstr "%s je bil zavrnjen"
 
-#: components/services/install/lib/eazel-install-problem.c:145
-#: components/services/install/lib/eazel-install-problem.c:304
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
 msgid "%s is a source package, which is not yet supported"
 msgstr "%s je paket izvorne kode, kar ¹e ni podprto"
 
-#: components/services/install/lib/eazel-install-problem.c:150
-#, c-format
-msgid "%s had a file conflict with %s which %s required"
-msgstr "%s je imel datoteèni konflikt z %s, ki ga je potreboval %s"
-
-#: components/services/install/lib/eazel-install-problem.c:155
-#, c-format
-msgid "%s had a file conflict with %s"
-msgstr "%s je imel datoteèni konflikt z %s"
-
-#: components/services/install/lib/eazel-install-problem.c:167
-#: components/services/install/lib/eazel-install-problem.c:178
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
 #, c-format
 msgid "%s would break other packages"
 msgstr "%s bi pokvaril druge pakete"
 
-#: components/services/install/lib/eazel-install-problem.c:170
+#: components/services/install/lib/eazel-install-problem.c:185
 #, c-format
 msgid "%s would break"
 msgstr "%s bi pokvaril"
 
-#: components/services/install/lib/eazel-install-problem.c:176
+#: components/services/install/lib/eazel-install-problem.c:191
 #, c-format
 msgid "%s would break %s"
 msgstr "%s bi pokvaril %s"
 
-#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:197
 #, c-format
 msgid "%s is damaged"
 msgstr "%s je po¹kodovan"
 
-#: components/services/install/lib/eazel-install-problem.c:187
+#: components/services/install/lib/eazel-install-problem.c:201
 #, c-format
 msgid "%s requires %s, which could not be found on the server"
 msgstr "%s potrebuje %s, ki ga ni mogoèe najti na stre¾niku"
 
-#: components/services/install/lib/eazel-install-problem.c:191
-#, c-format
-msgid "%s could not be found on the server"
+#: components/services/install/lib/eazel-install-problem.c:204
+#, fuzzy, c-format
+msgid "%s for %s could not be found on the server"
 msgstr "%s ni bil najden na stre¾niku"
 
-#: components/services/install/lib/eazel-install-problem.c:199
-#: components/services/install/lib/eazel-install-problem.c:329
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr "%s je ¾e name¹èen"
 
-#: components/services/install/lib/eazel-install-problem.c:230
-#, c-format
-msgid "%s, which is newer, is already installed and downgrade is not enabled"
+#: components/services/install/lib/eazel-install-problem.c:259
+#, fuzzy, c-format
+msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr ""
 "%s, ki je novej¹i, je ¾e name¹èen in nadgrajevanje navzdol ni vkljuèeno"
 
-#: components/services/install/lib/eazel-install-problem.c:234
-#, c-format
-msgid "%s, which is older, is already installed and upgrade is not enabled"
+#: components/services/install/lib/eazel-install-problem.c:263
+#, fuzzy, c-format
+msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr "%s, ki je novej¹i, je ¾e name¹èen in nadgrajevanje ni vkljuèeno"
 
-#: components/services/install/lib/eazel-install-problem.c:312
-#: components/services/install/lib/eazel-install-problem.c:315
-#, c-format
-msgid "%s requires %s"
-msgstr "%s potrebuje %s"
-
-#: components/services/install/lib/eazel-install-problem.c:323
-#, c-format
-msgid "%s is not installed"
-msgstr "%s ni name¹èen"
+#: components/services/install/lib/eazel-install-problem.c:353
+#, fuzzy, c-format
+msgid "%s is not installed and could not be found on server"
+msgstr "%s ni bil najden na stre¾niku"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:871
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr "Preveri za novo verzijo paketa %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:882
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr "Namesti oba %s in %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:897
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr "Odstrani %s z va¹ega sistema"
@@ -2229,291 +2575,267 @@ msgstr "Odstrani %s z va¹ega sistema"
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:910
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr "Prisilno odstrani %s s sistema"
 
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:918
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr "Podatkovna zbirka paketov vsebuje neskladnosti"
 
-#: components/services/install/lib/eazel-install-problem.c:966
+#: components/services/install/lib/eazel-install-problem.c:1015
 msgid "Continue with force"
 msgstr "Na silo nadaljuj"
 
-#: components/services/install/lib/eazel-install-problem.c:972
+#: components/services/install/lib/eazel-install-problem.c:1021
 msgid "Allow downgrade"
 msgstr "Dovoli prehod na starej¹o razlièico"
 
-#: components/services/install/lib/eazel-install-protocols.c:112
-#: components/services/install/lib/eazel-install-protocols.c:250
-#, c-format
-msgid "Downloading %s..."
-msgstr "Prena¹am %s..."
-
-#: components/services/install/lib/eazel-install-protocols.c:125
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:166
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
 #, c-format
 msgid "Could not open target file %s"
 msgstr "Nisem uspel opdreti ciljne datoteke %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:132
-#: components/services/inventory/eazel-inventory-service.c:253
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:92
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
 msgid "Could not create an http request !"
 msgstr "Nisem uspel ustvariti zahtevka http !"
 
-#: components/services/install/lib/eazel-install-protocols.c:139
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:99
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
 msgid "Proxy: Invalid uri !"
 msgstr "Posrednik: Neveljaven uri!"
 
-#: components/services/install/lib/eazel-install-protocols.c:144
-#: components/services/inventory/eazel-inventory-service.c:258
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:105
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
 msgid "Invalid uri !"
 msgstr "Neveljaven uri !"
 
-#: components/services/install/lib/eazel-install-protocols.c:151
-#: components/services/inventory/eazel-inventory-service.c:301
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:115
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
 msgid "Could not prepare http request !"
 msgstr "Nisem uspel pripraviti zahtevka http !"
 
-#: components/services/install/lib/eazel-install-protocols.c:156
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:120
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
 msgid "Couldn't get async mode "
 msgstr "Nisem uspel dobiti asinhronskega naèina"
 
 #. probably out of disk space
-#: components/services/install/lib/eazel-install-protocols.c:185
-#: components/services/install/lib/eazel-install-protocols.c:214
-#: components/services/install/lib/eazel-install-protocols.c:230
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, c-format
 msgid "DISK FULL: could not write %s"
 msgstr "DISK JE POLN: ne morem zapisati %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:191
-#: components/services/install/lib/eazel-install-protocols.c:219
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
 msgid "Could not get request body!"
 msgstr "Nisem uspel dobiti telesa zahtevka!"
 
-#: components/services/install/lib/eazel-install-protocols.c:204
+#: components/services/install/lib/eazel-install-protocols.c:208
 #, c-format
 msgid "HTTP error: %d %s"
 msgstr "HTTP napaka: %d %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:251
+#: components/services/install/lib/eazel-install-protocols.c:255
 msgid "FTP not supported yet"
 msgstr "FTP ¹e ni podprt"
 
-#: components/services/install/lib/eazel-install-protocols.c:446
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, c-format
 msgid "Checking local file %s..."
 msgstr "Preverjam krajevno datoteko %s..."
 
-#: components/services/install/lib/eazel-install-protocols.c:567
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, c-format
 msgid "Failed to retrieve %s!"
 msgstr "Nisem uspel prenesti %s!"
 
-#: components/services/install/lib/eazel-install-protocols.c:633
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, c-format
 msgid "Could not get an URL for %s"
 msgstr "Nisem uspel dobiti URLja za %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:648
+#: components/services/install/lib/eazel-install-protocols.c:672
 msgid "Downloaded package does not have the correct name"
 msgstr "Sprejet paket nima pravega imena"
 
-#: components/services/install/lib/eazel-install-protocols.c:649
+#: components/services/install/lib/eazel-install-protocols.c:673
 #, c-format
 msgid "Package %s should have had name %s"
 msgstr "Paket %s bi se moral imenovati %s"
 
-#: components/services/install/lib/eazel-install-protocols.c:656
-msgid "Downloaded package does not have the correct version"
-msgstr "Sprejet paket ni pravilne razlièice"
-
-#: components/services/install/lib/eazel-install-protocols.c:657
-#, c-format
-msgid "Package %s had version %s and not %s"
-msgstr "Paket %s je razlièice %s in ne %s"
-
-#: components/services/install/lib/eazel-install-protocols.c:676
+#: components/services/install/lib/eazel-install-protocols.c:701
 msgid "File download failed"
 msgstr "Sprejem datoteke ni uspel"
 
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr "*** Zaèetek paketa ***\n"
 
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr "*** Koned paketa ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:157
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 msgid "*** No package nodes! (cat has no children) ***"
 msgstr "*** Paket nima vozli¹è! (cat nima otrok) ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:159
-#: components/services/install/lib/eazel-install-xml-package-list.c:167
-#: components/services/install/lib/eazel-install-xml-package-list.c:182
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 msgid "*** Bailing from package parse! ***"
 msgstr "*** Odstopam od razèlenjevanja paketa! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:165
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
 msgid "*** No package nodes! ***"
 msgstr "*** Ni vozli¹è paketa! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 msgid "*** Malformed package node!"
 msgstr "*** Napaèno oblikovano vozli¹èe paketa!"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:180
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
 msgid "*** No depends nodes! ***"
 msgstr "*** Ni vozli¹è odvisnosti! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:186
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr "*** Napaèno oblikovano vozli¹èe odvisnosti!"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:210
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr "*** Neznana vrsta vozli¹èa '%s'"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:227
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** Seznam datotek paketa ne vsebuje nobene datoteke!***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:232
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** Ne najdem xml vozli¹èa CATEGORIES! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:233
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr "*** Odstopam od razèlenjevanja kategorij ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:239
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** Ni kategorij! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:240
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr "*** Odstopam od razèlenitve kategorije ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:294
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** Ne najdem xml vozli¹èa TRANSACTION! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:296
-#: components/services/install/lib/eazel-install-xml-package-list.c:304
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr "*** Odstopam od razèlenjevanja transakcije! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:302
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** Ni paketov! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:338
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** Ni vozli¹è kategorij! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:342
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** Ne najdem xml vozli¹èa CATEGORIES! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:376
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** Neznano vozli¹èe %s"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:466
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** Napaka ob generiranju xml seznama paketov! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:513
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** Napaka ob branju seznama paketov! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:892
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** Osd xml ne vsebuje podatkov! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:897
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr "*** Odstopam od razèlenjevanja osd! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:958
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "Nisem mogel razèleniti xml-ja (dol¾ina %d)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:668
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr "Odpru zbirko podatkov paketov v %s"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:673
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr "Odpiranje zbirke podatkov paketov v %s ni uspelo"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:696
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr "Zapiram zbirko podatkov za %s (odprta)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:701
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr "Zapiram zbirko podatkov %s (ni odprta)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:953
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr "Ne morem odpreti %s"
 
-#. Setup the title
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:252
-msgid "Easy Install"
-msgstr "Enostavna namestitev"
+#. this stuff flies by so fast, it's probably enough to just say "info"
+#: components/services/install-view/callbacks.c:64
+msgid "Getting package information ..."
+msgstr "Dobivam podatke o paketu ..."
 
-#. Setup the progress header
-#. FIXME: the middle header is all fubar now, so we just say "messages", but the spec
-#. * shows "progress" over the 2nd column of the message box.  it's just too hard to get
-#. * it aligned currently.
-#.
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:355
-msgid "Messages"
-msgstr "Sporoèila"
+#: components/services/install-view/callbacks.c:82
+#, c-format
+msgid "Checking \"%s\" for conflicts..."
+msgstr "Preverjam \"%s\" za konflikte..."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:655
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:542
+#: components/services/install-view/callbacks.c:185
 #, c-format
-msgid "Version: %s"
-msgstr "Razlièica: %s"
+msgid "Downloading 1 package (%s)"
+msgstr "Prena¹am 1 paket (%s)"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:684
+#: components/services/install-view/callbacks.c:187
 #, c-format
-msgid "Checking \"%s\" for conflicts..."
-msgstr "Preverjam \"%s\" za konflikte..."
+msgid "Downloading %d packages (%s)"
+msgstr "Prena¹am %d paketov (%s)"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:727
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1618
+#: components/services/install-view/callbacks.c:236
 #, c-format
 msgid "Downloading \"%s\""
 msgstr "Prena¹am %s\""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:733
+#: components/services/install-view/callbacks.c:242
 #, c-format
 msgid "0K of %dK"
 msgstr "0K od %dK"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:740
+#: components/services/install-view/callbacks.c:249
 #, c-format
 msgid ""
 "The package \"%s\" requires \"%s\" to run.\n"
@@ -2522,18 +2844,17 @@ msgstr ""
 "Paket \"%s\" za delovanje potrebuje \"%s\".\n"
 "Sedaj prena¹am \"%s\""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:743
+#: components/services/install-view/callbacks.c:252
 #, c-format
 msgid "Attempting to download package \"%s\"."
 msgstr "Posku¹am prenesti paket \"%s\"."
 
-#. done!
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:749
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1014
+#: components/services/install-view/callbacks.c:262
+#: components/services/install-view/callbacks.c:333
 msgid "Complete"
 msgstr "Konèano"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:753
+#: components/services/install-view/callbacks.c:266
 #, c-format
 msgid ""
 "The package \"%s\" requires \"%s\" to run.\n"
@@ -2542,82 +2863,22 @@ msgstr ""
 "Paket \"%s\" za delovanje potrebuje \"%s\".\n"
 "\"%s\" je bil uspe¹no prene¹en."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:756
+#: components/services/install-view/callbacks.c:269
 #, c-format
 msgid "The package \"%s\" has been successfully downloaded."
 msgstr "Paket \"%s\" je bil uspe¹no prene¹en."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:774
+#: components/services/install-view/callbacks.c:287
 #, c-format
 msgid "%dK of %dK"
 msgstr "%dK od %dK"
 
-#. this stuff flies by so fast, it's probably enough to just say "info"
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:809
-msgid "Getting package information ..."
-msgstr "Dobivam podatke o paketu ..."
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:899
-msgid "Preparing to download packages..."
-msgstr "Pripravljam se na sprejem paketov..."
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:906
-msgid ""
-"These packages are about to be downloaded and installed:\n"
-"\n"
-msgstr ""
-"Sledeèi paketi bodo preneseni in name¹èeni:\n"
-"\n"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:910
-msgid ""
-"These packages are about to be uninstalled:\n"
-"\n"
-msgstr "Sledeèi paketi bodo odstranjeni:\n"
-"\n"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:914
-msgid ""
-"These packages are about to be reverted:\n"
-"\n"
-msgstr ""
-"Sledeèi paketi bodo nadgrajeni na starej¹e razlièice:\n"
-"\n"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:936
-#, c-format
-msgid "for a total of %ld MB."
-msgstr "skupno %ld MB."
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:939
-#, c-format
-msgid "for a total of %ld KB."
-msgstr "skupno %ld KB."
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:945
-msgid ""
-"\n"
-"Is this okay?"
-msgstr ""
-"\n"
-"Je to v redu?"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:973
-#, c-format
-msgid "Downloading 1 package (%s)"
-msgstr "Prena¹am 1 paket (%s)"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:975
-#, c-format
-msgid "Downloading %d packages (%s)"
-msgstr "Prena¹am %d paketov (%s)"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:997
+#: components/services/install-view/callbacks.c:316
 #, c-format
 msgid "Download of package \"%s\" failed!"
 msgstr "Prenos pakeata \"%s\" ni uspel!"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1019
+#: components/services/install-view/callbacks.c:338
 #, c-format
 msgid ""
 "The package \"%s\" requires \"%s\" to run.\n"
@@ -2626,18 +2887,18 @@ msgstr ""
 "Paket \"%s\" za delovanje potrebuje \"%s\".\n"
 "\"%s\" je bil uspe¹no prenesen in name¹èen."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1022
+#: components/services/install-view/callbacks.c:341
 #, c-format
 msgid "\"%s\" has been successfully downloaded and installed."
 msgstr "\"%s\" je bil uspe¹no sem prenesen in name¹èen."
 
 #. starting a new package -- create new progress indicator
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1050
+#: components/services/install-view/callbacks.c:369
 #, c-format
 msgid "Installing package %d of %d"
 msgstr "Name¹èam paket %d od %d"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1077
+#: components/services/install-view/callbacks.c:396
 #, c-format
 msgid ""
 "The package \"%s\" requires \"%s\" to run.\n"
@@ -2646,70 +2907,63 @@ msgstr ""
 "Paket \"%s\" za delovanje potrebuje \"%s\".\n"
 "\"%s\" se trenutno name¹èa."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1080
+#: components/services/install-view/callbacks.c:399
 #, c-format
 msgid "Now installing package \"%s\"."
 msgstr "Sedaj name¹èam paket \"%s\"."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1088
+#: components/services/install-view/callbacks.c:407
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "Name¹èam \"%s\""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1096
-#: src/nautilus-zoom-control.c:589
+#: components/services/install-view/callbacks.c:415
+#: src/nautilus-zoom-control.c:592
 msgid "%d%%"
 msgstr "%d%%"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1151
-#, c-format
-msgid " · %s is in the Gnome menu under %s"
-msgstr " · %s je v Gnomeovem menuju pod %s"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1169
+#: components/services/install-view/callbacks.c:443
 #, c-format
-msgid " · %s is in the Gnome menu.\n"
-msgstr " · %s je v Gnomeovem menuju.\n"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1196
-#, c-format
-msgid " · %s is in the KDE menu.\n"
-msgstr " · %s je v KDE menuju.\n"
+msgid "Installation failed on %s"
+msgstr "Namestitev pri %s ni uspela"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1249
+#: components/services/install-view/callbacks.c:471
 msgid "I ran into problems while installing."
 msgstr "Med namestitvijo sem naletel na probleme."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1250
+#: components/services/install-view/callbacks.c:472
 msgid "I'd like to try the following :"
 msgstr "Poskusil bi sledeèe :"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1259
+#: components/services/install-view/callbacks.c:481
 msgid "Is this ok ?"
 msgstr "Je to v redu ?"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1312
-msgid "Installation aborted."
-msgstr "Namestitev prekinjena."
+#: components/services/install-view/callbacks.c:556
+#, fuzzy
+msgid "Installation cancelled."
+msgstr "Namestitev ni uspela."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1314
+#: components/services/install-view/callbacks.c:558
 msgid "This package has already been installed."
 msgstr "Ta paket je bil ¾e name¹èen."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1316
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
 msgid "Installation complete."
 msgstr "Namestitev konèana."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1319
+#: components/services/install-view/callbacks.c:564
 msgid "Installation failed."
 msgstr "Namestitev ni uspela."
 
 #. some succeeded; some failed
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1323
+#: components/services/install-view/callbacks.c:568
 msgid "Some packages installed successfully:"
 msgstr "Nekateri paketi so bili name¹èeni uspe¹no:"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1332
+#: components/services/install-view/callbacks.c:577
 msgid ""
 "\n"
 "Some packages failed:"
@@ -2717,15 +2971,19 @@ msgstr ""
 "\n"
 "Nekateri paketi niso bili uspe¹ni:"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1375
+#: components/services/install-view/callbacks.c:626
 msgid "Erase the RPM files?"
 msgstr "Zbri¹i datoteke RPM?"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1377
+#: components/services/install-view/callbacks.c:628
 msgid "Erase the leftover RPM files?"
 msgstr "Zbri¹i preostale datoteke RPM?"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1411
+#: components/services/install-view/callbacks.c:658
+msgid "Ok"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:673
 msgid ""
 "A core package of Nautilus has been\n"
 "updated.  You should restart Nautilus.\n"
@@ -2737,28 +2995,141 @@ msgstr ""
 "\n"
 "®elite to storiti takoj?"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1465
+#. Setup the title
+#: components/services/install-view/forms.c:201
+msgid "Easy Install"
+msgstr "Enostavna namestitev"
+
+#. Setup the progress header
+#. FIXME: the middle header is all fubar now, so we just say "messages", but the spec
+#. * shows "progress" over the 2nd column of the message box.  it's just too hard to get
+#. * it aligned currently.
+#.
+#: components/services/install-view/forms.c:327
+msgid "Messages"
+msgstr "Sporoèila"
+
+#: components/services/install-view/forms.c:358
+#: components/services/summary/nautilus-summary-view.c:647
 #, c-format
-msgid "Installation failed on %s"
-msgstr "Namestitev pri %s ni uspela"
+msgid "Version: %s"
+msgstr "Razlièica: %s"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1496
+#: components/services/install-view/forms.c:407
+#, fuzzy
+msgid "These packages are ready to be downloaded and installed:"
+msgstr ""
+"Sledeèi paketi bodo preneseni in name¹èeni:\n"
+"\n"
+
+#: components/services/install-view/forms.c:408
+#, fuzzy
+msgid "If you wish to download and install these packages, click Continue."
+msgstr ""
+"Sedaj bom prenesel in namestil naslednje pakete:\n"
+"\n"
+
+#: components/services/install-view/forms.c:411
+#, fuzzy
+msgid "These packages are ready to be uninstalled:"
+msgstr ""
+"Sledeèi paketi bodo odstranjeni:\n"
+"\n"
+
+#: components/services/install-view/forms.c:412
+msgid "If you wish to uninstall these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:415
+#, fuzzy
+msgid "These packages are ready to be reverted:"
+msgstr ""
+"Sledeèi paketi bodo nadgrajeni na starej¹e razlièice:\n"
+"\n"
+
+#: components/services/install-view/forms.c:416
+msgid "If you wish to revert these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:464
+#, c-format
+msgid "for a total of %ld MB."
+msgstr "skupno %ld MB."
+
+#: components/services/install-view/forms.c:466
+#, c-format
+msgid "for a total of %ld KB."
+msgstr "skupno %ld KB."
+
+#. buttons
+#: components/services/install-view/forms.c:478
+#, fuzzy
+msgid "Continue"
+msgstr "Vsebina"
+
+#: components/services/install-view/forms.c:482
+#: libnautilus-extensions/nautilus-drag.c:493
+#: src/file-manager/fm-directory-view.c:4326
+msgid "Cancel"
+msgstr "Preklièi"
+
+#: components/services/install-view/nautilus-service-install-view.c:421
+#, c-format
+msgid "%s is in GNOME (footprint) > %s"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:439
+#, fuzzy, c-format
+msgid "%s is in the GNOME (footprint) menu.\n"
+msgstr " · %s je v Gnomeovem menuju.\n"
+
+#: components/services/install-view/nautilus-service-install-view.c:454
+#, fuzzy, c-format
+msgid "%s is in the KDE menu.\n"
+msgstr " · %s je v KDE menuju.\n"
+
+#: components/services/install-view/nautilus-service-install-view.c:655
+#, fuzzy
+msgid "Installation Complete"
+msgstr "Namestitev konèana."
+
+#: components/services/install-view/nautilus-service-install-view.c:710
+#, c-format
+msgid ""
+"%sTo start %s, click the Launch button below, or to create a shortcut, drag "
+"the icon on the right to the GNOME panel or your desktop."
+msgstr ""
+
+#. couldn't find an icon
+#: components/services/install-view/nautilus-service-install-view.c:718
+#, c-format
+msgid "%sTo start %s, click the Launch button below."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:773
+msgid "Incorrect password."
+msgstr "Napaèno geslo."
+
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr "Avtentificiraj se kot administrator (root)"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1614
-msgid "Downloading packages"
-msgstr "Prena¹am pakete"
+#: components/services/install-view/nautilus-service-install-view.c:895
+#, fuzzy
+msgid "Installing packages"
+msgstr "Name¹èam paket %d od %d"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1616
-msgid "Downloading remote package"
+#: components/services/install-view/nautilus-service-install-view.c:897
+#, fuzzy
+msgid "Installing remote package"
 msgstr "Prena¹am oddaljen paket"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1620
-msgid "Downloading some package"
+#: components/services/install-view/nautilus-service-install-view.c:901
+#, fuzzy
+msgid "Installing some package"
 msgstr "Prena¹am nek paket"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1637
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
@@ -2766,102 +3137,78 @@ msgstr ""
 "Ni Eazel namestitvene storitve:\n"
 "Name¹èanja ne bodo delovala."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1684
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr "Povezujem se s katalogom programja Eazel ..."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1742
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr "Preverjam avtorizacijo..."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1813
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr "Prekinjam prenos paketov (prosim poèakajte) ..."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1833
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "Prenos paketov prekinjen."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1834
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "Prekinjen"
 
-#: components/services/install/nautilus-view/Nautilus_View_install.oaf.in.h:2
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:1
+#: components/services/install/server/Trilobite_Service_install.oaf.in.h:2
+#: components/services/summary/nautilus-summary-view.c:123
+msgid "Install"
+msgstr "Namesti"
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:2
+#, fuzzy
+msgid "Install Viewer"
+msgstr "Namestitev ni uspela"
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:3
 msgid "Nautilus Service Install View"
 msgstr "Pogled nautilusovih namestitvenih storitev"
 
-#: components/services/install/nautilus-view/Nautilus_View_install.oaf.in.h:3
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:4
 msgid "Nautilus Service Install View Factory"
 msgstr "Tovarna pogledov Nautilusovih namestitvenih storitev"
 
-#: components/services/install/nautilus-view/Nautilus_View_install.oaf.in.h:4
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:5
 msgid "Service Install View Component"
 msgstr "Pogled komponente namestitvenih storitev"
 
-#: components/services/install/nautilus-view/Nautilus_View_install.oaf.in.h:5
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:6
 msgid "Service Install View Component's Factory"
 msgstr "Tovarna pogledov komponente namestitvenih storitev"
 
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:7
+#, fuzzy
+msgid "View as Install"
+msgstr "Enostavna namestitev"
+
 #: components/services/install/server/Trilobite_Service_install.oaf.in.h:1
 msgid "Factory for the install service"
 msgstr "Tovarna za namestitvene storive"
 
-#: components/services/inventory/eazel-inventory-client.c:66
+#: components/services/inventory/eazel-inventory-client.c:70
 msgid "Enable inventory upload."
 msgstr "Vkljuèi po¹iljanje inventarja."
 
-#: components/services/inventory/eazel-inventory-client.c:68
+#: components/services/inventory/eazel-inventory-client.c:72
 msgid "Disable inventory upload."
 msgstr "Izkljuèi po¹iljanje inventarja."
 
-#: components/services/inventory/eazel-inventory-client.c:69
-msgid "Enable warning before each upload."
-msgstr "Vkljuèi opozorilo pred vsakim po¹iljanjem."
-
-#: components/services/inventory/eazel-inventory-client.c:70
-msgid "Disable warning before each upload."
-msgstr "Izkljuèi opozorilo pred vsakim po¹iljanjem."
-
-#: components/services/inventory/eazel-inventory-client.c:71
-msgid "Set machine name."
-msgstr "Nastavi ime raèunalnika."
-
-#: components/services/inventory/eazel-inventory-client.c:72
+#: components/services/inventory/eazel-inventory-client.c:73
 msgid "Display information about current inventory settings."
 msgstr "Ka¾i podatke o trenutnih nastavitvah inventarja."
 
-#: components/services/inventory/eazel-inventory-client.c:73
+#: components/services/inventory/eazel-inventory-client.c:74
 msgid "Upload inventory now, if not up to date."
 msgstr "Po¹iljam inventar, èe ni ¾e osve¾en."
 
-#: components/services/inventory/eazel-inventory-service.c:233
-msgid "User isn't logged into ammonite yet.\n"
-msgstr "Uporabnik ¹e ni prijavljen v ammonite.\n"
-
-#: components/services/inventory/eazel-inventory-service.c:236
-msgid "The supplied URL was bad.\n"
-msgstr "Naveden je bil slab URL.\n"
-
-#: components/services/inventory/eazel-inventory-service.c:239
-msgid "A CORBA error occured.\n"
-msgstr "Zgodila se je napaka CORBAe.\n"
-
-#: components/services/inventory/eazel-inventory-service.c:242
-msgid "Ammonite returned an error translating the url.\n"
-msgstr "Ammonite je vrnil napako ob prevajanju url-ja.\n"
-
-#: components/services/inventory/eazel-inventory-service.c:263
-msgid "Can't post !"
-msgstr "Ne morem poslati !"
-
-#: components/services/inventory/eazel-inventory-service.c:276
-msgid "can't open tempory file hell\n"
-msgstr "ne morem odpreti zaèasne datoteke hell\n"
-
-#: components/services/inventory/eazel-inventory-service.c:296
-msgid "Can't set body !"
-msgstr "Ne morem nastaviti telesa !"
-
 #: components/services/inventory/Trilobite_Service_inventory.oaf.in.h:1
 msgid "Factory for the inventory service"
 msgstr "Tovarna za storitve inventarja"
@@ -2887,9 +3234,19 @@ msgid "System Inventory"
 msgstr "Sistemski inventar"
 
 #: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:5
+#, fuzzy
+msgid "System Inventory Viewer"
+msgstr "Sistemski inventar"
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:6
 msgid "System inventory view component"
 msgstr "Komponenta pogleda sistemskega inventarja"
 
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:7
+#, fuzzy
+msgid "View as System Inventory"
+msgstr "Sistemski inventar"
+
 #. Setup the title
 #: components/services/login/nautilus-view/nautilus-change-password-view.c:153
 msgid "Please Change Your Eazel Password"
@@ -2996,74 +3353,47 @@ msgid "Change Password"
 msgstr "Spremeni geslo"
 
 #: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:2
-msgid "Eazel Change Password View"
+#, fuzzy
+msgid "Change Password Viewer"
 msgstr "Pogled spremembe gesla Eazel"
 
 #: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:3
+msgid "Eazel Change Password View"
+msgstr "Pogled spremembe gesla Eazel"
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:4
 msgid "Eazel Change Password view component"
 msgstr "Komponenta pogleda spremembe gesla Eazel"
 
-#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:4
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:5
 msgid "Nautilus Service Login View Factory"
 msgstr "Tovarna pogledov prijav v storitev"
 
-#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:5
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:6
 msgid "Service Login View Component's Factory"
 msgstr "Tovarna komponent pogledov prijav v storitev"
 
-#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:260
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:7
+#, fuzzy
+msgid "View as Change Password"
+msgstr "Spremeni geslo"
+
+#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:295
 msgid "Unknown Date"
 msgstr "Neznan datum"
 
-#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:265
+#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:300
 msgid "%A, %B %d"
 msgstr "%A, %d %B"
 
-#: components/services/summary/lib/eazel-summary-shared.c:136
-msgid "Could not find a valid boolean value for grey_out!"
-msgstr "Nisem mogel najti veljavne vrednosti za grey_out!"
-
-#: components/services/summary/lib/eazel-summary-shared.c:187
-msgid "There is no service data !\n"
-msgstr "Ni podatkov o storitvi !\n"
-
-#: components/services/summary/lib/eazel-summary-shared.c:212
-#: components/services/summary/lib/eazel-summary-shared.c:237
-msgid "There is no eazel news data !\n"
-msgstr "Ni podatkov o novicah Eazel !\n"
-
-#: components/services/summary/lib/eazel-summary-shared.c:267
-msgid "Could not fetch summary configuration !"
-msgstr "Nisem uspel prinesti nastavitve povzetka !"
-
-#: components/services/summary/lib/eazel-summary-shared.c:290
-msgid "The summary configuration contains no data!\n"
-msgstr "Nastavitve povzetka ne vsebujejo podatkov!\n"
-
-#: components/services/summary/lib/eazel-summary-shared.c:295
-msgid "Cannot find the SUMMARY_DATA xmlnode!\n"
-msgstr "Ne najdem xml vozli¹èa SUMMARY_DATA!\n"
-
-#: components/services/summary/lib/eazel-summary-shared.c:297
-msgid "Bailing from the SUMMARY_DATA parse!\n"
-msgstr "Odstopam od razèlenjevanja SUMMARY_DATA!\n"
-
-#: components/services/summary/lib/eazel-summary-shared.c:304
-msgid "Could not find any summary configuration data!\n"
-msgstr "Nisem na¹el podatkov o nastavitvah povzetka!\n"
-
-#: components/services/summary/lib/eazel-summary-shared.c:306
-msgid "Bailing from summary configuration parse!\n"
-msgstr "Odstopam od razèlenjevanja nastavitev povzetka!\n"
-
-#: components/services/summary/nautilus-view/nautilus-summary-callbacks.c:97
+#: components/services/summary/nautilus-summary-callbacks.c:97
+#, fuzzy
 msgid ""
-"I'm sorry, network problems are preventing you from connecting to Eazel "
-"Services."
+"Sorry, network problems are preventing you from connecting to Eazel Services."
 msgstr "Problemi z mre¾o vam prepreèujejo povezavo do storitev Eazel."
 
 #. FIXME we really should use the services alert icon here, eh?
-#: components/services/summary/nautilus-view/nautilus-summary-callbacks.c:102
+#: components/services/summary/nautilus-summary-callbacks.c:102
 msgid ""
 "Your Eazel Services account has not yet been activated.  You can't log into "
 "Eazel Services until you activate your account.\n"
@@ -3076,7 +3406,7 @@ msgstr ""
 "Prosimo, poglejte svojo e-po¹to za navodila za aktivacijo"
 
 #. FIXME we really should use the services alert icon here, eh?
-#: components/services/summary/nautilus-view/nautilus-summary-callbacks.c:109
+#: components/services/summary/nautilus-summary-callbacks.c:109
 msgid ""
 "Your Eazel Service User Account has been temporarily disabled.\n"
 "\n"
@@ -3087,148 +3417,240 @@ msgstr ""
 "Prosimo, poskusite znova v nekaj minutah ali stopite v stip s podporo Eazel, "
 "èe se ta problem nadaljuje."
 
-#: components/services/summary/nautilus-view/nautilus-summary-callbacks.c:131
+#: components/services/summary/nautilus-summary-callbacks.c:131
 msgid "We're sorry, but your name and password are still not recognized."
 msgstr "Va¹e ime in geslo ¹e vedno nista prepoznana."
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:68
+#: components/services/summary/nautilus-summary-dialogs.c:69
 msgid "Eazel Service Login Error"
 msgstr "Napaka ob prijavljanju na storitve Eazel"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:78
+#: components/services/summary/nautilus-summary-dialogs.c:80
 msgid "Service Error"
 msgstr "Napaka storitev"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:102
+#: components/services/summary/nautilus-summary-dialogs.c:104
 msgid "Register Now"
 msgstr "Takoj se registriraj"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:113
+#: components/services/summary/nautilus-summary-dialogs.c:115
 msgid "Services Login"
 msgstr "Prijava na storitve"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:129
+#: components/services/summary/nautilus-summary-dialogs.c:131
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "Uporabni¹ko ime:"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:136
+#: components/services/summary/nautilus-summary-dialogs.c:138
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "Geslo:"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:144
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:153
-msgid "Please log in to Eazel services"
+#: components/services/summary/nautilus-summary-dialogs.c:146
+#: components/services/summary/nautilus-summary-dialogs.c:155
+#, fuzzy
+msgid "Please log in to Eazel Services"
 msgstr "Prosim prijavite se na storitve Eazel"
 
-#: components/services/summary/nautilus-view/nautilus-summary-dialogs.c:148
+#: components/services/summary/nautilus-summary-dialogs.c:150
 msgid "Your user name or password were not correct.  Please try again."
 msgstr "Va¹e ime in geslo nista bila pravilna.  Prosimo poskusite znova."
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:102
-msgid "Register"
-msgstr "Registriraj se"
+#: components/services/summary/nautilus-summary-view.c:117
+#: libnautilus-extensions/nautilus-program-chooser.c:1361
+msgid "Go There"
+msgstr "Pojdi tja"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:103
-msgid "Login"
-msgstr "Prijava"
+#: components/services/summary/nautilus-summary-view.c:120
+#, fuzzy
+msgid "More Info"
+msgstr "Podatki"
+
+#: components/services/summary/nautilus-summary-view.c:131
+msgid "Account Preferences"
+msgstr "Nastavitve raèuna"
+
+#: components/services/summary/nautilus-summary-view.c:132
+msgid "Logout"
+msgstr "Odjava"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:104
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:112
+#: components/services/summary/nautilus-summary-view.c:133
+#: components/services/summary/nautilus-summary-view.c:141
 msgid "Terms of Use"
 msgstr "Pogoji uporabe"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:105
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:113
+#: components/services/summary/nautilus-summary-view.c:134
+#: components/services/summary/nautilus-summary-view.c:142
 msgid "Privacy Statement"
 msgstr "Izjava o zasebnosti"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:110
-msgid "Account Preferences"
-msgstr "Nastavitve raèuna"
+#: components/services/summary/nautilus-summary-view.c:139
+msgid "Register"
+msgstr "Registriraj se"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:111
-msgid "Logout"
-msgstr "Odjava"
+#: components/services/summary/nautilus-summary-view.c:140
+msgid "Login"
+msgstr "Prijava"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:124
-#, c-format
-msgid "Welcome, %s!"
-msgstr "Dobrodo¹li, %s!"
+#: components/services/summary/nautilus-summary-view.c:170
+#, fuzzy, c-format
+msgid "Eazel Services - Welcome, %s!"
+msgstr "Dom storitev _Eazel"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:129
-msgid "You are not logged in"
+#: components/services/summary/nautilus-summary-view.c:175
+#, fuzzy
+msgid "Eazel Services - You are not logged in"
 msgstr "Niste prijavljeni"
 
-#. add the tab
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:666
-#: data/linksets/home.xml.h:3 src/nautilus-service-ui.xml.h:5
+#: components/services/summary/nautilus-summary-view.c:182
+#, fuzzy
+msgid "Connecting to Eazel Services..."
+msgstr "_Prijavi se na storitve Eazel"
+
+#: components/services/summary/nautilus-summary-view.c:741
+#: data/linksets/home.xml.h:3 src/nautilus-service-ui.xml.h:4
 msgid "Services"
 msgstr "Storitve"
 
-#. add the tab
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:702
+#: components/services/summary/nautilus-summary-view.c:752
 msgid "Featured Downloads"
 msgstr "Priporoèene datoteke"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:862
+#: components/services/summary/nautilus-summary-view.c:884
+#, fuzzy
+msgid ""
+"Unable to get services data from Eazel's server. The server might be "
+"unavailable right now, or your computer might be configured incorrectly. "
+"Please contact support@eazel.com."
+msgstr ""
+"Nisem se mogel povezati s stre¾nikom Eazel. Lahko da, stre¾nik trenutno ni "
+"dosegljiv ali pa je va¹ raènalnik narobe nastavljen. Kasneje lahko poskusite "
+"znova."
+
+#: components/services/summary/nautilus-summary-view.c:894
+#, fuzzy
+msgid ""
+"Found a problem with services data on Eazel servers. Please contact "
+"support@eazel.com."
+msgstr ""
+"Na¹el sem problem v podatkih stre¾nikov Eazel. Prosimo stopite v stik s "
+"support@eazel.com."
+
+#: components/services/summary/nautilus-summary-view.c:917
+#, fuzzy
+msgid ""
+"Information is missing from the redirect data on Eazel servers. Please "
+"contact support@eazel.com."
+msgstr ""
+"Na¹el sem problem v podatkih stre¾nikov Eazel. Prosimo stopite v stik s "
+"support@eazel.com."
+
+#: components/services/summary/nautilus-summary-view.c:959
+#, fuzzy
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
-"now, or your computer might be configured incorrectly.You could try again "
+"now, or your computer might be configured incorrectly. You could try again "
 "later."
 msgstr ""
 "Nisem se mogel povezati s stre¾nikom Eazel. Lahko da, stre¾nik trenutno ni "
 "dosegljiv ali pa je va¹ raènalnik narobe nastavljen. Kasneje lahko poskusite "
 "znova."
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:880
+#: components/services/summary/nautilus-summary-view.c:969
+#, fuzzy
 msgid ""
-"Found problem with data on Eazel servers. Please contact support@eazel.com."
+"Found a problem with redirect data on Eazel servers. Please contact "
+"support@eazel.com."
 msgstr ""
 "Na¹el sem problem v podatkih stre¾nikov Eazel. Prosimo stopite v stik s "
 "support@eazel.com."
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:1
+#: components/services/summary/nautilus-summary-view.c:986
+msgid "Failed to upload system inventory."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:1049
+#: src/nautilus-first-time-druid.c:258
+msgid "Eazel Services"
+msgstr "Storitve Eazel"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:1
 msgid "Configure your service preferences"
 msgstr "Nastavi svoje nastavitve storitev"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:2
+#: components/services/summary/nautilus-summary-view-ui.xml.h:2
 msgid "Go to the Eazel Services Registration Form"
 msgstr "Pojdi na obrazec za registracijo Eazel storitev"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:3
+#: components/services/summary/nautilus-summary-view-ui.xml.h:3
 msgid "Log out from Eazel Services"
 msgstr "Odjavi se od storitv Eazel"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:4
+#: components/services/summary/nautilus-summary-view-ui.xml.h:4
 msgid "Service _Preferences"
 msgstr "_Nastavitve storitev"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:5
+#: components/services/summary/nautilus-summary-view-ui.xml.h:5
 msgid "Show the log-in dialog box"
 msgstr "Ka¾i dialog za prijavo"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:6
+#: components/services/summary/nautilus-summary-view-ui.xml.h:6
 msgid "_Log in to Eazel Services"
 msgstr "_Prijavi se na storitve Eazel"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:7
+#: components/services/summary/nautilus-summary-view-ui.xml.h:7
 msgid "_Log out from Eazel Services"
 msgstr "_Odjavi se od storitev eazel"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:8
+#: components/services/summary/nautilus-summary-view-ui.xml.h:8
 msgid "_Register for Eazel Services"
 msgstr "_Registriraj se za storitve Eazel"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:130
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus Service Summary View Factory"
+msgstr "Tovarna pogledov Nautilusovih namestitvenih storitev"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Summary View"
+msgstr "Nautilusov pregledovalnik slik"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:3
+#, fuzzy
+msgid "Service Summary View Component's Factory"
+msgstr "Tovarna pogledov komponente namestitvenih storitev"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:4
+#, fuzzy
+msgid "Service Summary view component"
+msgstr "Pogled komponente namestitvenih storitev"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:5
+msgid "Summary"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:6
+#, fuzzy
+msgid "Summary Viewer"
+msgstr "Pogled ¹tevilk:"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:7
+#, fuzzy
+msgid "View as Summary"
+msgstr "Poglej z neèim drugim"
+
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
 #, c-format
 msgid "HTTP error %d \"%s\" on uri %s"
 msgstr "HTTP napaka %d \"%s\" na urlju %s"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:200
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:215
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr ""
@@ -3248,10 +3670,20 @@ msgid "Service"
 msgstr "Storitev"
 
 #: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:4
+#, fuzzy
+msgid "Service Viewer"
+msgstr "Splo¹en pregledovalnik slik"
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:5
 msgid "Services startup view factory"
 msgstr "Tovarna pogledov zaèetkov storitev"
 
-#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:5
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:6
+#, fuzzy
+msgid "View as Service"
+msgstr "Poglej z neèim drugim"
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:7
 msgid "eazel sample service view"
 msgstr "eazel vzorèni pogled storitev"
 
@@ -3259,78 +3691,68 @@ msgstr "eazel vzorèni pogled storitev"
 msgid "Factory for the sample service"
 msgstr "Tovarna za vzorène storitve"
 
-#: components/services/vault/command-line/main.c:38
-msgid "Enable debugging"
-msgstr "Vkljuèi razhro¹èevanje"
-
-#: components/services/vault/command-line/main.c:39
-msgid "Vault location"
-msgstr "Polo¾aj valute"
-
-#: components/services/vault/command-line/main.c:47
-msgid "Valid operations:"
-msgstr "Veljavne operacije:"
-
-#: components/services/vault/command-line/main.c:87
-msgid "Error: No operation supplied\n"
-msgstr "Napaka: Operacija ni podana\n"
-
-#: components/services/vault/command-line/main.c:95
-#, c-format
-msgid "Error: Invalid operation supplied (%s)\n"
-msgstr "Napaka: Podana neveljavna operacija (%s)\n"
-
-#: components/services/vault/command-line/main.c:120
-#, c-format
-msgid ""
-"Error: Invalid syntax\n"
-"Syntax: %s\n"
-msgstr ""
-"Napaka: Napaèna sintaksa\n"
-"Sintaksa: %s\n"
-
-#: components/text/nautilus-text-view.c:316
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr "Oprostite, %s je prevelika, da bi jo Nautilus v celoti nalo¾il."
 
-#: components/text/nautilus-text-view.c:317
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr "Datoteka prevelika"
 
 #: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "Pisave"
+
+#: components/text/nautilus-text-view-ui.xml.h:2
 msgid "Lucida"
 msgstr "Lucida"
 
-#: components/text/nautilus-text-view-ui.xml.h:2
+#: components/text/nautilus-text-view-ui.xml.h:3
 msgid "Use the Courier Font"
 msgstr "Uporabi pisavo Courier"
 
-#: components/text/nautilus-text-view-ui.xml.h:3
+#: components/text/nautilus-text-view-ui.xml.h:4
+#, fuzzy
+msgid "Use the Fixed Font"
+msgstr "Uporabi pisavo Times"
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+#, fuzzy
+msgid "Use the GTK System Font"
+msgstr "Uporabi pisavo Times"
+
+#: components/text/nautilus-text-view-ui.xml.h:6
 msgid "Use the Helvetica Font"
 msgstr "Uporabi pisavo Helvetica"
 
-#: components/text/nautilus-text-view-ui.xml.h:4
+#: components/text/nautilus-text-view-ui.xml.h:7
 msgid "Use the Lucida Font"
 msgstr "Uporabi pisavo Lucida"
 
-#: components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:8
 msgid "Use the Times Font"
 msgstr "Uporabi pisavo Times"
 
-#: components/text/nautilus-text-view-ui.xml.h:6
+#: components/text/nautilus-text-view-ui.xml.h:9
 msgid "_Courier"
 msgstr "_Courier"
 
-#: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
-msgstr "_Pisave"
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "_Datoteka"
 
-#: components/text/nautilus-text-view-ui.xml.h:8
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
 msgid "_Helvetica"
 msgstr "_Helvetica"
 
-#: components/text/nautilus-text-view-ui.xml.h:9
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr "_Times"
 
@@ -3343,13 +3765,23 @@ msgid "Text"
 msgstr "Besedilo"
 
 #: components/text/Nautilus_View_text.oaf.in.h:3
+#, fuzzy
+msgid "Text Viewer"
+msgstr "Pogled besedila:"
+
+#: components/text/Nautilus_View_text.oaf.in.h:4
 msgid "Text view"
 msgstr "Pogled besedila"
 
-#: components/text/Nautilus_View_text.oaf.in.h:4
+#: components/text/Nautilus_View_text.oaf.in.h:5
 msgid "Text view factory"
 msgstr "Tovarna pogleda besedila"
 
+#: components/text/Nautilus_View_text.oaf.in.h:6
+#, fuzzy
+msgid "View as Text"
+msgstr "Poglej kot %s"
+
 #: components/text/services/google.xml.h:1
 msgid "Search Google for Selected Text"
 msgstr "Izbrano besedilo i¹èi na Google-u"
@@ -3391,7 +3823,7 @@ msgid "Nautilus Tree view"
 msgstr "Nautilusov pogled drevesa"
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:635
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr "Drevo"
 
@@ -3515,7 +3947,7 @@ msgstr "Za dodajanje emblema na predmet, nanj spustite emblem"
 msgid "Eclipse"
 msgstr "Eklipsa"
 
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1592
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "Emblemi"
 
@@ -3612,7 +4044,7 @@ msgid "Numbers"
 msgstr "©tevila"
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "V redu"
 
@@ -3665,66 +4097,58 @@ msgid "Sea Foam"
 msgstr "Morska pena"
 
 #: data/browser.xml.h:68
-msgid "Secret"
-msgstr "Zaupno"
-
-#: data/browser.xml.h:69
 msgid "Shale"
 msgstr ""
 
-#: data/browser.xml.h:70
-msgid "Shared"
-msgstr "Deljen"
-
-#: data/browser.xml.h:71
+#: data/browser.xml.h:69
 msgid "Silver"
 msgstr "Srebrna"
 
-#: data/browser.xml.h:72
+#: data/browser.xml.h:70
 msgid "Sky"
 msgstr "Nebo"
 
-#: data/browser.xml.h:73
+#: data/browser.xml.h:71
 msgid "Sky Ridge"
 msgstr ""
 
-#: data/browser.xml.h:74
+#: data/browser.xml.h:72
 msgid "Snow Ridge"
 msgstr ""
 
-#: data/browser.xml.h:75
+#: data/browser.xml.h:73
 msgid "Special"
 msgstr "Posebno"
 
-#: data/browser.xml.h:76
+#: data/browser.xml.h:74
 msgid "Stucco"
 msgstr ""
 
-#: data/browser.xml.h:77
+#: data/browser.xml.h:75
 msgid "Tangerine"
 msgstr ""
 
-#: data/browser.xml.h:78
+#: data/browser.xml.h:76
 msgid "Terracotta"
 msgstr ""
 
-#: data/browser.xml.h:79
+#: data/browser.xml.h:77
 msgid "Urgent"
 msgstr "Nujno"
 
-#: data/browser.xml.h:80
+#: data/browser.xml.h:78
 msgid "Violet"
 msgstr "Vijolièna"
 
-#: data/browser.xml.h:81
+#: data/browser.xml.h:79
 msgid "Wavy White"
 msgstr "Beli valovi"
 
-#: data/browser.xml.h:82
+#: data/browser.xml.h:80
 msgid "White"
 msgstr "Bela"
 
-#: data/browser.xml.h:83
+#: data/browser.xml.h:81
 msgid "White Ribs"
 msgstr ""
 
@@ -3741,13 +4165,13 @@ msgid "The Gimp"
 msgstr "Gimp"
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:548
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "Namizje"
 
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4751
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
-#: src/file-manager/fm-desktop-icon-view.c:65
+#: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
 msgstr "Smeti"
 
@@ -3780,162 +4204,192 @@ msgid "Google"
 msgstr "Google"
 
 #: data/linksets/search_engines.xml.h:3
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "Iskalniki"
 
 #: data/static_bookmarks.xml.h:1
+#, fuzzy
+msgid "Allaire"
+msgstr "Satira"
+
+#: data/static_bookmarks.xml.h:2
+msgid "Binary Freedom"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:3
 msgid "Borland"
 msgstr "Borland"
 
-#: data/static_bookmarks.xml.h:2
+#: data/static_bookmarks.xml.h:4
 msgid "CNET Computers.com"
 msgstr "CNETov computers.com"
 
-#: data/static_bookmarks.xml.h:3
+#: data/static_bookmarks.xml.h:5
 msgid "CNET Linux Center"
 msgstr "Linux center CNET"
 
-#: data/static_bookmarks.xml.h:4
-msgid "Caldera"
-msgstr "Caldera"
-
-#: data/static_bookmarks.xml.h:5
+#: data/static_bookmarks.xml.h:6
 msgid "CollabNet"
 msgstr "CollabNet"
 
-#: data/static_bookmarks.xml.h:6
+#: data/static_bookmarks.xml.h:7
 msgid "Compaq"
 msgstr "Compaq"
 
-#: data/static_bookmarks.xml.h:7
+#: data/static_bookmarks.xml.h:8
+#, fuzzy
+msgid "Conectiva"
+msgstr "Vsebina"
+
+#: data/static_bookmarks.xml.h:9
+#, fuzzy
+msgid "Covalent"
+msgstr "Vsebina"
+
+#: data/static_bookmarks.xml.h:10
 msgid "Debian.org"
 msgstr "debian.org"
 
-#: data/static_bookmarks.xml.h:8
+#: data/static_bookmarks.xml.h:11
 msgid "Dell"
 msgstr "Dell"
 
-#: data/static_bookmarks.xml.h:9
+#: data/static_bookmarks.xml.h:12
 msgid "Eazel"
 msgstr "Eazel"
 
-#: data/static_bookmarks.xml.h:10
+#: data/static_bookmarks.xml.h:13
 msgid "Freshmeat.net"
 msgstr "Freshmeat.net"
 
-#: data/static_bookmarks.xml.h:11
+#: data/static_bookmarks.xml.h:14
 msgid "GNOME.org"
 msgstr "gnome.org"
 
-#: data/static_bookmarks.xml.h:12
+#: data/static_bookmarks.xml.h:15
 msgid "GNU.org"
 msgstr "gnu.org"
 
-#: data/static_bookmarks.xml.h:14
-msgid "Hewlett-Packard"
-msgstr "Hewlett-Packard"
-
-#: data/static_bookmarks.xml.h:15
-msgid "IBM"
-msgstr "IBM"
-
-#: data/static_bookmarks.xml.h:16
-msgid "Linux Companies"
-msgstr "Podjetja Linux"
-
 #: data/static_bookmarks.xml.h:17
+#, fuzzy
+msgid "International"
+msgstr "Le notranja uporaba"
+
+#: data/static_bookmarks.xml.h:18
 msgid "Linux Documentation Project"
 msgstr "Projekt dokumentacije za Linux"
 
-#: data/static_bookmarks.xml.h:18
+#: data/static_bookmarks.xml.h:19
+#, fuzzy
+msgid "Linux One"
+msgstr "Linux Online"
+
+#: data/static_bookmarks.xml.h:20
 msgid "Linux Online"
 msgstr "Linux Online"
 
-#: data/static_bookmarks.xml.h:19
+#: data/static_bookmarks.xml.h:21
 msgid "Linux Resources"
 msgstr "viri o Linuxu"
 
-#: data/static_bookmarks.xml.h:20
-msgid "Linux at IBM"
-msgstr "Linux na IBMju"
+#: data/static_bookmarks.xml.h:22
+msgid "Linux Weekly News"
+msgstr ""
 
-#: data/static_bookmarks.xml.h:21
+#: data/static_bookmarks.xml.h:23
 msgid "LinuxNewbie.org"
 msgstr "linuxnewbie.org"
 
-#: data/static_bookmarks.xml.h:22
-msgid "Linuxcare"
-msgstr "Linuxcare"
+#: data/static_bookmarks.xml.h:24
+#, fuzzy
+msgid "LinuxOrbit.com"
+msgstr "linuxnewbie.org"
 
-#: data/static_bookmarks.xml.h:23
-msgid "Myplay"
-msgstr "Myplay"
+#: data/static_bookmarks.xml.h:25
+msgid "MandrakeSoft"
+msgstr ""
 
-#. The copyright character in here is correct for
-#. * Latin-1 encoding, but not for UTF-8, so we have
-#. * to change it when we upgrade to GTK 2.0.
-#.
-#: data/static_bookmarks.xml.h:24 nautilus.desktop.in.h:1
-#: src/nautilus-window-manage-views.c:246 src/nautilus-window-menus.c:553
-msgid "Nautilus"
-msgstr "Nautilus"
+#: data/static_bookmarks.xml.h:26
+#, fuzzy
+msgid "Netraverse"
+msgstr "Nikoli"
 
-#: data/static_bookmarks.xml.h:25
+#: data/static_bookmarks.xml.h:27
 msgid "News and Media"
 msgstr "Novice in mediji"
 
-#: data/static_bookmarks.xml.h:26
+#: data/static_bookmarks.xml.h:28
+msgid "O'Reilly"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:29
 msgid "OSDN"
 msgstr "OSDN"
 
-#: data/static_bookmarks.xml.h:27
+#: data/static_bookmarks.xml.h:30
+msgid "Open Source Asia"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:31
 msgid "OpenOffice"
 msgstr "OpenOffice"
 
-#: data/static_bookmarks.xml.h:28
+#: data/static_bookmarks.xml.h:32
+msgid "Penguin Computing"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:33
+#, fuzzy
+msgid "Rackspace"
+msgstr "Paket"
+
+#: data/static_bookmarks.xml.h:34
 msgid "Red Hat"
 msgstr "Red Hat"
 
-#: data/static_bookmarks.xml.h:29
-msgid "Slashdot"
-msgstr "Slashdot"
+#: data/static_bookmarks.xml.h:35
+#, fuzzy
+msgid "Red Hat Network"
+msgstr "Red Hat"
 
-#: data/static_bookmarks.xml.h:30
+#: data/static_bookmarks.xml.h:36
+msgid "RedFlag Linux"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:37
 msgid "Software"
 msgstr "Programje"
 
-#: data/static_bookmarks.xml.h:31
+#: data/static_bookmarks.xml.h:38
 msgid "SourceForge"
 msgstr "SourceForge"
 
-#: data/static_bookmarks.xml.h:32
-msgid "SourceXchange"
-msgstr "SourceXchange"
-
-#: data/static_bookmarks.xml.h:33
+#: data/static_bookmarks.xml.h:39
 msgid "Sun StarOffice"
 msgstr "Sun StarOffice"
 
-#: data/static_bookmarks.xml.h:34
-msgid "VA Linux"
-msgstr "VA Linux"
-
-#: data/static_bookmarks.xml.h:35
-msgid "VMWare"
-msgstr "VMWare"
+#: data/static_bookmarks.xml.h:40
+msgid "Sun Wah Linux"
+msgstr ""
 
-#: data/static_bookmarks.xml.h:36
+#: data/static_bookmarks.xml.h:41
 msgid "Web Services"
 msgstr "Spletne storitve"
 
-#: data/static_bookmarks.xml.h:37
-msgid "Ximian"
-msgstr "Ximian"
+#: data/static_bookmarks.xml.h:42
+#, fuzzy
+msgid "ZDNet Linux Hardware Database"
+msgstr "Center virov o Linuxu ZDNET"
 
-#: data/static_bookmarks.xml.h:38
+#: data/static_bookmarks.xml.h:43
 msgid "ZDNet Linux Resource Center"
 msgstr "Center virov o Linuxu ZDNET"
 
+#: data/static_bookmarks.xml.h:44
+msgid "Zero-Knowledge"
+msgstr ""
+
 #: icons/ardmore/ardmore.xml.h:1
 msgid "Tahoe"
 msgstr "Tahoe"
@@ -3980,14 +4434,31 @@ msgstr ""
 msgid "Uses manila folders and gray-green backgrounds."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-druid-page-eazel.c:343
-msgid "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
-msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-iso8859-2,*-r-*"
+#: libnautilus-extensions/nautilus-drag.c:489
+#, fuzzy
+msgid "_Move here"
+msgstr "Pojdi tja"
+
+#: libnautilus-extensions/nautilus-drag.c:490
+#, fuzzy
+msgid "_Copy here"
+msgstr "_Kopiraj besedilo"
 
-#: libnautilus-extensions/nautilus-druid-page-eazel.c:352
+#: libnautilus-extensions/nautilus-drag.c:491
+#, fuzzy
+msgid "_Link here"
+msgstr "Mno¾ice povezav"
+
+#. Note to localizers: this font is used for text items in Druid pages
+#: libnautilus-extensions/nautilus-druid-page-eazel.c:381
 msgid "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-*"
 msgstr "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-iso8859-2,*-r-*"
 
+#. Note to localizers: this font is used for page titles in Druid pages
+#: libnautilus-extensions/nautilus-druid-page-eazel.c:560
+msgid "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
+msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-iso8859-2,*-r-*"
+
 #. Today, use special word.
 #. * Note to localizers: You can look at man strftime
 #. * for details on the format, but you should only use
@@ -4000,101 +4471,101 @@ msgstr "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-iso8859-2,*-r-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2246
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr "danes ob %-I:%M %p"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2251
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr "vèeraj ob %-I:%M %p"
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2256
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%A %-d/%-m/%y at %-I:%M %p"
 
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2261
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%-d/%-m/%y at %-I:%M %p"
 
-#: libnautilus-extensions/nautilus-file.c:3392
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 predmetov"
 
-#: libnautilus-extensions/nautilus-file.c:3392
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr "0 map"
 
-#: libnautilus-extensions/nautilus-file.c:3393
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 datotek"
 
-#: libnautilus-extensions/nautilus-file.c:3397
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 predmet"
 
-#: libnautilus-extensions/nautilus-file.c:3397
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr "1 mapa"
 
-#: libnautilus-extensions/nautilus-file.c:3398
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 datoteka"
 
-#: libnautilus-extensions/nautilus-file.c:3401
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "%u predmetov"
 
-#: libnautilus-extensions/nautilus-file.c:3401
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr "%u map"
 
-#: libnautilus-extensions/nautilus-file.c:3402
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u datotek"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3705
-#: libnautilus-extensions/nautilus-file.c:3720
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr "? predmetov"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3711
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr "? bajtov"
 
-#: libnautilus-extensions/nautilus-file.c:3724
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "neznan tip"
 
-#: libnautilus-extensions/nautilus-file.c:3726
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "neznan tip MIME"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3731
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "neznan"
 
-#: libnautilus-extensions/nautilus-file.c:3767
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr "program"
 
-#: libnautilus-extensions/nautilus-file.c:3779
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
@@ -4104,7 +4575,7 @@ msgstr ""
 "va¹a datoteka gnome-vfs.keys ni na pravem mestu ali ni najdena zaradi kakega "
 "drugega razloga."
 
-#: libnautilus-extensions/nautilus-file.c:3783
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
@@ -4113,7 +4584,7 @@ msgstr ""
 "Opis za tip mime \"%s\" (datoteka je \"%s\") ni bil najden, pi¹ite na "
 "aaron@eazel.com"
 
-#: libnautilus-extensions/nautilus-file.c:3797
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "povezava"
 
@@ -4121,27 +4592,27 @@ msgstr "povezava"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1156
-#: libnautilus-extensions/nautilus-file.c:3803
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr "pove¾i na %s"
 
-#: libnautilus-extensions/nautilus-file.c:3817
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr "povezava (prekinjena)"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "Iz:"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "V:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:588
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4152,7 +4623,7 @@ msgstr ""
 "\n"
 "\"%s\" ne more biti prestavljena, ker je na disku, ki je le berljiv."
 
-#: libnautilus-extensions/nautilus-file-operations.c:599
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4165,7 +4636,7 @@ msgstr ""
 "\"%s\" ne more biti zbrisana, ker nimate dovoljenja za spremembo njegove "
 "star¹evske mape."
 
-#: libnautilus-extensions/nautilus-file-operations.c:605
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4176,7 +4647,7 @@ msgstr ""
 "\n"
 "\"%s\" ne more biti zbrisana, ker je na disku, ki je le berljiv.."
 
-#: libnautilus-extensions/nautilus-file-operations.c:636
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4189,12 +4660,12 @@ msgstr ""
 "\"%s\" ne more biti prestavljena, ker nimate dovoljenja za spremembo nje ali "
 "njene star¹evske mape."
 
-#: libnautilus-extensions/nautilus-file-operations.c:643
-#, c-format
+#: libnautilus-extensions/nautilus-file-operations.c:677
+#, fuzzy, c-format
 msgid ""
 "Error while moving.\n"
 "\n"
-"\"%s\" cannot be moved to the trash because you do not have permissions to "
+"\"%s\" cannot be moved to the Trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Napaka ob prestavljanju.\n"
@@ -4202,7 +4673,7 @@ msgstr ""
 "\"%s\" ne more biti prestavljena, ker nimate dovoljenja za spremembo nje ali "
 "njene star¹evske mape."
 
-#: libnautilus-extensions/nautilus-file-operations.c:667
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -4213,7 +4684,7 @@ msgstr ""
 "\n"
 "\"%s\" ne more biti kopirana, ker nimate dovoljenja, da bi jo prebrali."
 
-#: libnautilus-extensions/nautilus-file-operations.c:689
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4224,7 +4695,7 @@ msgstr ""
 "\n"
 "Na cilju ni dovolj prostora."
 
-#: libnautilus-extensions/nautilus-file-operations.c:694
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4235,7 +4706,7 @@ msgstr ""
 "\n"
 "Na cilju ni dovolj prostora."
 
-#: libnautilus-extensions/nautilus-file-operations.c:698
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4246,7 +4717,7 @@ msgstr ""
 "\n"
 "Na cilju ni dovolj prostora."
 
-#: libnautilus-extensions/nautilus-file-operations.c:710
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4257,7 +4728,7 @@ msgstr ""
 "\n"
 "Nimate dovoljenj za pisanje v to mapo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4268,7 +4739,7 @@ msgstr ""
 "\n"
 "Ciljni disk je le berljiv."
 
-#: libnautilus-extensions/nautilus-file-operations.c:721
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4279,7 +4750,7 @@ msgstr ""
 "\n"
 "Nimate dovoljenj za pisanje v to mapo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:725
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4290,7 +4761,7 @@ msgstr ""
 "\n"
 "Ciljni disk je le berljiv."
 
-#: libnautilus-extensions/nautilus-file-operations.c:732
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4301,7 +4772,7 @@ msgstr ""
 "\n"
 "Nimate dovoljenja za pisanje v to mapo."
 
-#: libnautilus-extensions/nautilus-file-operations.c:736
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4312,7 +4783,7 @@ msgstr ""
 "\n"
 "Ciljni disk je le berljiv."
 
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4323,7 +4794,7 @@ msgstr ""
 "\n"
 "®elite nadaljevati?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4334,7 +4805,7 @@ msgstr ""
 "\n"
 "®elite nadaljevati?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:773
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4345,7 +4816,7 @@ msgstr ""
 "\n"
 "®elite nadaljevati?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4356,7 +4827,7 @@ msgstr ""
 "\n"
 "®elite nadaljevati?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:794
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4367,7 +4838,7 @@ msgstr ""
 "\n"
 "®elite nadaljevati?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4378,7 +4849,7 @@ msgstr ""
 "\n"
 "®elite nadaljevati?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4389,7 +4860,7 @@ msgstr ""
 "\n"
 "®elite nadaljevati?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4400,34 +4871,34 @@ msgstr ""
 "\n"
 "®elite nadaljevati?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:924
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "Napaka ob kopiranju."
 
-#: libnautilus-extensions/nautilus-file-operations.c:927
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "Napaka ob prestavljanju."
 
-#: libnautilus-extensions/nautilus-file-operations.c:930
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "Napaka ob povezovanu."
 
-#: libnautilus-extensions/nautilus-file-operations.c:935
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "Napaka ob brisanju."
 
-#: libnautilus-extensions/nautilus-file-operations.c:960
-#: libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "Preskoèi"
 
-#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Poskusi znova"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1057
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4440,7 +4911,7 @@ msgstr ""
 "\n"
 "Èe ¹e vedno ¾elite prestaviti \"%s\", jo preimenujte in poskusite znova."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1063
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4453,11 +4924,11 @@ msgstr ""
 "\n"
 "Èe ¹e vedno ¾elite kopirati \"%s\", jo preimenujte in poskusite znova."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "Nisem mogel zamenjati datoteke."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1081
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4468,22 +4939,22 @@ msgstr ""
 "\n"
 "Jo ¾elite zamenjati?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1092
-#: libnautilus-extensions/nautilus-file-operations.c:1106
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "Konflikt ob kopiranju"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Zamenjaj"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Zamenjaj vse"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1160
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "¹e ena povezava na %s"
@@ -4492,25 +4963,25 @@ msgstr "¹e ena povezava na %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. povezava na %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1180
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. povezava na %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1184
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. povezava na %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. povezava na %s"
@@ -4520,241 +4991,227 @@ msgstr "%d. povezava na %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
-#: libnautilus-extensions/nautilus-file-operations.c:2351
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (kopija)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
-#: libnautilus-extensions/nautilus-file-operations.c:2351
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (¹e ena kopija)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1212
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr "kopija)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr "kopija)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1216
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr "kopija)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr "kopija)"
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopija)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (¹e ena kopija)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1232
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. kopija)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1234
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. kopija)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1236
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. kopija)%s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. kopija)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1322
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1330
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1487
-#: libnautilus-extensions/nautilus-file-operations.c:2066
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Neznan GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1802
-#: libnautilus-extensions/nautilus-file-operations.c:2195
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "Prestavljam datoteke v Smeti"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1804
-#: libnautilus-extensions/nautilus-file-operations.c:2197
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr "Datoteke vr¾ene ven:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1821
-#: libnautilus-extensions/nautilus-file-operations.c:2199
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1807
-#: libnautilus-extensions/nautilus-file-operations.c:2200
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "Pripravljam se na prestavljanje v Smeti..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1817
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "Prestavljam datoteke"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "Prestavljenih datotek:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1822
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "Pripravljam na prestavitev..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "Konèujem prestavitev..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "Ustvarjam povezave na datoteke"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1837
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "Povezanih datotek:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1839
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "Povezujem"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "Pripravljam se na ustvarjanje povezav..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "Konèujem ustvarjanje povezav..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1848
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "Kopiram datoteke"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "Skopiranih datotek:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "Kopiram"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "Pripravljam se na kopiranje..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "Ne morete skopirati predmetov v Smeti."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "Ne morem kopirati v Smeti"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1899
-#: libnautilus-extensions/nautilus-file-operations.c:2157
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "Smeti morajo ostati na namizju."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "Ne morete prestaviti te mape Smeti."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1902
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "Ne morete kopirati Smeti."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1903
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "Ne morete kopirati te mape Smeti."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1905
-#: libnautilus-extensions/nautilus-file-operations.c:2158
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Ne morete spremeniti lokacije Smeti"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1906
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Ne morete kopirati Smeti"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1923
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "Imenika ne morete prestaviti samega vase."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1924
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "Imenika ne morete kopirati samega vase."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1926
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "Ne morem prestaviti vase"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1927
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "Ne morem kopirati vase"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1940
-msgid "You cannot move a file onto itself."
-msgstr "Datoteke ne morete prestaviti samo nase"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1941
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "Datoteke ne morete kopirati samo nase."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1943
-msgid "Can't Move Onto Self"
-msgstr "Ne morem prestaviti nase"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1944
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "Ne morem kopirati nase"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1995
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -4764,7 +5221,7 @@ msgstr ""
 "\n"
 "Nimate dovoljenja za pisanje v cilj."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1998
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -4774,610 +5231,724 @@ msgstr ""
 "\n"
 "Na cilju ni prostora."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2001
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Napaka \"%s\" ob ustvarjanju nove mape."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2005
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "Napaka ob ustvarjanju nove mape"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2092
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "neimenovana mapa"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2164
-#, c-format
-msgid "You cannot throw \"%s\" into the Trash."
-msgstr "Ne morete vreèi \"%s\" v Smeti."
-
-#: libnautilus-extensions/nautilus-file-operations.c:2168
-msgid "Error Moving to Trash"
-msgstr "Napaka ob prestavljanju v Smeti"
-
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2240
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "Bri¹em datoteke"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2242
-#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "Zbrisanih datotek:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2244
-#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Bri¹em"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "Pripravljam se na brisanje datotek..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Praznim Smeti"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Pripravljam se na praznjenje Smeti..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2311
+#: libnautilus-extensions/nautilus-file-operations.c:2218
+#, fuzzy
 msgid ""
-"Are you sure you want to permanently delete all of the items in the trash?"
+"Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr "Ste preprièani, da ¾elite trajno zbrisati vse predmete v Smeteh?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2313
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "Zbri¹i vsebino Smeti?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2314
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "Izprazni"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2352
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2352
-#: libnautilus-extensions/nautilus-file-operations.c:2362
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "foo (kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2353
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2353
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2354
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2354
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".foo (kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2355
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2355
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "foo foo (kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2356
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2356
-#: libnautilus-extensions/nautilus-file-operations.c:2363
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "foo (kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2357
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2357
-#: libnautilus-extensions/nautilus-file-operations.c:2377
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "foo foo (kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2358
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2358
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (kopija).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2359
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2359
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "foo.. (kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2360
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2360
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "foo... (kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2361
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "foo (kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2361
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "foo. (¹e ena kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2362
-#: libnautilus-extensions/nautilus-file-operations.c:2364
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "foo (¹e ena kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2363
-#: libnautilus-extensions/nautilus-file-operations.c:2365
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "foo (¹e ena kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2364
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "foo (tretja kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2365
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "foo (tretja kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2366
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (¹e ena kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2366
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (tretja kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2367
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr "foo (21. kopija)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr "foo (24. kopija)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr "foo (21. kopija).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr "foo (24. kopija).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "foo (21. kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2367
-#: libnautilus-extensions/nautilus-file-operations.c:2369
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "foo (22. kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2368
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "foo (21. kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2368
-#: libnautilus-extensions/nautilus-file-operations.c:2370
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "foo (22. kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2369
-#: libnautilus-extensions/nautilus-file-operations.c:2371
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "foo (23. kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2370
-#: libnautilus-extensions/nautilus-file-operations.c:2372
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "foo (23. kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2371
-#: libnautilus-extensions/nautilus-file-operations.c:2373
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "foo (24. kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2372
-#: libnautilus-extensions/nautilus-file-operations.c:2374
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "foo (24. kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2373
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "foo (25. kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2374
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "foo (25. kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2375
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24. kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2375
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25. kopija)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2376
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24. kopija.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2376
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25. kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2377
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000. kopija).txt"
 
-#: libnautilus-extensions/nautilus-file-operations-progress.c:345
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (10th copy)"
+msgstr "foo (21. kopija)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (11st copy)"
+msgstr "foo (21. kopija)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (10th copy).txt"
+msgstr "foo (21. kopija).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (11st copy).txt"
+msgstr "foo (21. kopija).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (11th copy)"
+msgstr "foo (21. kopija)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (12nd copy)"
+msgstr "foo (22. kopija)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (11th copy).txt"
+msgstr "foo (21. kopija).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (12nd copy).txt"
+msgstr "foo (22. kopija).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (12th copy)"
+msgstr "foo (24. kopija)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (13rd copy)"
+msgstr "foo (tretja kopija)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (12th copy).txt"
+msgstr "foo (25. kopija).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (13rd copy).txt"
+msgstr "foo (tretja kopija).txt"
+
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld od %ld"
 
-#: libnautilus-extensions/nautilus-font-picker.c:131
-msgid "Font"
-msgstr "Pisava"
-
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
 msgid "GConf Error"
 msgstr "Napaka GConf"
 
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:638
-msgid "fixed"
-msgstr "nespremenljiv"
+#. Constants
+#: libnautilus-extensions/nautilus-global-preferences.c:50
+msgid "Nautilus Preferences"
+msgstr "Nastavitve Nautilusa"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "vedno"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "Vedno"
 
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1221
-msgid "01/01/00, 01:00 AM"
-msgstr "01/01/00, 01:00"
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "le krajevno"
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1222
-msgid "1/1/00, 1:00 AM"
-msgstr "1/1/00, 1:00"
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "le krajevne datoteke"
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1223
-msgid " 1/ 1/00,  1:00 AM"
-msgstr " 1/ 1/00,  1:00"
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "nikoli"
 
-#. Constants
-#: libnautilus-extensions/nautilus-global-preferences.c:44
-msgid "Nautilus Preferences"
-msgstr "Nastavitve Nautilusa"
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "Nikoli"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "Lep¹a grafika"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:87
-msgid "current theme"
-msgstr "trenutna tema"
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "Uporabljaj lep¹o (a poèasnej¹o) grafiko"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:90
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "Pisave"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+#, fuzzy
+msgid "Font for Icon view:"
+msgstr "Tovarna za gasbene poglede"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "Tovarna za poglede zgodovine"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "Uporabi Nautilus za risanje namizja"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
+msgstr "Odpiranje novih oken"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:651
 msgid "Open each file or folder in a separate window"
 msgstr "Odpri vsako datoteko ali mapo v svojem oknu"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:93
-msgid "Ask before emptying the Trash"
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+#, fuzzy
+msgid "Display toolbar in new windows"
+msgstr "V novih oknih ka¾i orodne vrstice"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "V novih oknih ka¾i vrstico z lokacijo"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "V novih oknih ka¾i vrstico stanja"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "V novih oknih ka¾i stranski pult"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "Obna¹anje Smeti"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+#, fuzzy
+msgid "Ask before emptying the Trash or deleting files"
 msgstr "Vpra¹aj pred praznjenjem Smeti"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:96
-#: libnautilus-extensions/nautilus-global-preferences.c:593
-msgid "Click Behavior"
-msgstr "Obna¹anje ob kliku"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
+
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:99
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 msgid "single"
 msgstr "enojni"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:100
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "Aktiviraj predmet z enojnim klikom"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:104
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "dvojni"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:105
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "Aktiviraj predmet z dvojnim klikom"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:109
-#: libnautilus-extensions/nautilus-global-preferences.c:600
-msgid "Executable Text Files"
-msgstr "Izvr¹ljive datoteke z besedilom"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:112
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 msgid "launch"
 msgstr "za¾eni"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:113
+#: libnautilus-extensions/nautilus-global-preferences.c:726
 msgid "Execute files when they are clicked"
 msgstr "Za¾eni datoteke kadar so kliknjene"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:117
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 msgid "display"
 msgstr "porikaz"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:118
+#: libnautilus-extensions/nautilus-global-preferences.c:730
 msgid "Display files when they are clicked"
 msgstr "Prika¾i datoteke kadar so kliknjene"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:122
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 msgid "ask"
 msgstr "vpra¹aj"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:123
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 msgid "Ask each time"
 msgstr "Vsakiè vpra¹aj"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:133
-#: libnautilus-extensions/nautilus-global-preferences.c:746
-msgid "Show Text in Icons"
-msgstr "Ka¾i besedilo v ikonah"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:136
-#: libnautilus-extensions/nautilus-global-preferences.c:753
-msgid "Show Count of Items in Folders"
-msgstr "Ka¾i ¹tevilo predmetov v mapah"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:139
-#: libnautilus-extensions/nautilus-global-preferences.c:760
-msgid "Show Thumbnails for Image Files"
-msgstr "Ka¾i slièice za datoteke slik"
-
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:142
-#: libnautilus-extensions/nautilus-global-preferences.c:776
-msgid "Make Folder Appearance Details Public"
-msgstr "Naredi podrobnosti izgleda map javne"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:145
-#: libnautilus-extensions/nautilus-global-preferences.c:767
-msgid "Preview Sound Files"
-msgstr "Predposlu¹anje zvoènih datotek"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:148
-msgid "Use smoother (but slower) graphics"
-msgstr "Uporabljaj lep¹o (a poèasnej¹o) grafiko"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:151
-msgid "Use this font family to display file names:"
-msgstr "Uporabi to dru¾ino pisav za prikaz imen datotek:"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:155
-msgid "Display tool bar in new windows"
-msgstr "V novih oknih ka¾i orodne vrstice"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Display location bar in new windows"
-msgstr "V novih oknih ka¾i vrstico z lokacijo"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-msgid "Display status bar in new windows"
-msgstr "V novih oknih ka¾i vrstico stanja"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Display sidebar in new windows"
-msgstr "V novih oknih ka¾i stranski pult"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-msgid "Use Nautilus to draw the desktop"
-msgstr "Uporabi Nautilus za risanje namizja"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:170
-msgid ""
-"Do slower but more complete search whenever possible\n"
-"(slower search is not available when searching by content)"
-msgstr ""
-"Kadar je mo¾no opravi poèasnej¹e, a popolnej¹e iskanje\n"
-"(poèasnej¹e iskanje ni na voljo kadar se i¹èe po vsebini)"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:174
-msgid "search type to do by default"
-msgstr "na moj privzet naèin iskanja"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:177
-msgid "search by text"
-msgstr "i¹èi po besedilu"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:178
-msgid "Search for files by text only"
-msgstr "Datoteke i¹èi le po besedilu"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:182
-msgid "search by text and properties"
-msgstr "i¹èi po besedilu in lastnostih"
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "Obna¹anje ob kliku"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:183
-msgid "Search for files by text and by their properties"
-msgstr "Datoteke i¹èi po besedilu in njihovih lastnostih"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr "Izvr¹ljive datoteke z besedilom"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:187
-msgid "Search Web Location"
-msgstr "I¹èi spletne naslove"
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr "Ka¾i/Skrij mo¾nosti"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:191
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr "Ka¾i skrite datoteke (imena datotek, ki se zaènejo z \".\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:194
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr "Ka¾i varnostne kopije datotek (imena datotek, ki se konèajo z \"~\".)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:197
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr "Ka¾i posebne zastavice v oknu lasnosti"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:200
-msgid "Show only folders (no files) in the Tree"
-msgstr "V drevesu ka¾i le mape (ne datotek)"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+#, fuzzy
+msgid "Sorting Order"
+msgstr "Napaka ob nastavljanju lastnika"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:203
-msgid "Can add Content"
-msgstr "Lahko doda vsebino"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:206
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
-msgstr "Ne vkljuèuj vgrajenih zaznamkov v menuju zaznamkov"
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
+msgid "Location:"
+msgstr "Lokacija:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:210
-msgid "Home location:"
-msgstr "Domaèa lokacija:"
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+#, fuzzy
+msgid "HTTP Proxy Settings"
+msgstr "Nastavitve namestnika"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:214
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "Uporabi posrednik za HTTP"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:215
-msgid "HTTP Proxy:"
-msgstr "Posrednik za HTTP:"
+#. allocate the proxy label, followed by the entry
+#: libnautilus-extensions/nautilus-global-preferences.c:812
+#: src/nautilus-first-time-druid.c:683
+msgid "Port:"
+msgstr "Vrata:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:216
-msgid "HTTP Proxy Port:"
-msgstr "Vrata posrednika za HTTP:"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:524
-msgid "Appearance"
-msgstr "Videz"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "Vgrajeni zaznamki"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:525
-msgid "Appearance Settings"
-msgstr "Nastavitve videza"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "Ne vkljuèuj vgrajenih zaznamkov v menuju zaznamkov"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:527
-msgid "Smoother Graphics"
-msgstr "Lep¹a grafika"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "Ka¾i besedilo v ikonah"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:534
-msgid "Fonts"
-msgstr "Pisave"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr "Ka¾i ¹tevilo predmetov v mapah"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:545
-msgid "Windows & Desktop"
-msgstr "Okna in namizja"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "Ka¾i slièice za datoteke slik"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:546
-msgid "Windows & Desktop Settings"
-msgstr "Nastavitve oken in namizij"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:554
-msgid "Opening New Windows"
-msgstr "Odpiranje novih oken"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr "Predposlu¹anje zvoènih datotek"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:577
-msgid "Trash Behavior"
-msgstr "Obna¹anje Smeti"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr "Naredi podrobnosti izgleda map javne"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "Videz"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr "Okna in namizja"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:589
+#: libnautilus-extensions/nautilus-global-preferences.c:946
 msgid "Icon & List Views"
 msgstr "Ikonski in seznamski pogledi"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:590
-msgid "Icon & List Views Settings"
-msgstr "Nastavitve ikonskih in seznamskih pogledov"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:607
-msgid "Show/Hide Options"
-msgstr "Ka¾i/Skrij mo¾nosti"
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+msgid "Navigation"
+msgstr "Navigacija"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:628
-msgid "Sidebar Panels"
-msgstr "Stranski pulti"
+#: libnautilus-extensions/nautilus-global-preferences.c:962
+msgid "Speed Tradeoffs"
+msgstr "¾rtvovanje za hitrosti"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:629
-msgid "Sidebar Panels Settings"
-msgstr "Nastavitve stranskih pultov"
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr "i¹èi po besedilu"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:632
-msgid "Tabs"
-msgstr "Uhlji"
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+#, fuzzy
+msgid "Search for files by file name only"
+msgstr "Datoteke i¹èi le po besedilu"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:676
-msgid "Search"
-msgstr "Iskanje"
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr "i¹èi po besedilu in lastnostih"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:677
-msgid "Search Settings"
-msgstr "Nastavitve iskanja"
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+#, fuzzy
+msgid "Search for files by file name and file properties"
+msgstr "Datoteke i¹èi po besedilu in njihovih lastnostih"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:679
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "Mo¾nosti kompleksnega iskanja"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:685
-msgid "Search Tradeoffs"
-msgstr "®rtvovanja pri iskanju"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:693
-msgid "Search Locations"
-msgstr "Lokacije iskanja"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:703
-msgid "Navigation"
-msgstr "Navigacija"
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "na moj privzet naèin iskanja"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:704
-msgid "Navigation Settings"
-msgstr "Nastavitve navigacije"
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
+#, fuzzy
+msgid "Fast Search"
+msgstr "Iskanje"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:713
-msgid "Proxy Settings"
-msgstr "Nastavitve namestnika"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:732
-msgid "Built-in Bookmarks"
-msgstr "Vgrajeni zaznamki"
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+#, fuzzy
+msgid "Search Engine Location"
+msgstr "I¹èi spletne naslove"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:743
-msgid "Speed Tradeoffs"
-msgstr "¾rtvovanje za hitrosti"
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Iskanje"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:744
-msgid "Speed Tradeoffs Settings"
-msgstr "Nastavitve ¾rtvovanja za hitrost"
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+#, fuzzy
+msgid "Show only folders (no files) in the tree"
+msgstr "V drevesu ka¾i le mape (ne datotek)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:939
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
 #, c-format
 msgid "Display %s tab in sidebar"
 msgstr "Ka¾i uhelj %s v stranskem pultu"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:986
-msgid "always"
-msgstr "vedno"
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "Stranski pulti"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:987
-msgid "Always"
-msgstr "Vedno"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr "Uhlji"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:990
-msgid "local only"
-msgstr "le krajevno"
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"currently can't be performed because the program crond, which does nightly "
+"tasks on your computer, is turned off. To make sure fast searches can be "
+"done, turn crond on."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:991
-msgid "Local Files Only"
-msgstr "le krajevne datoteke"
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
+msgid "Files May Not Be Indexed"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:994
-msgid "never"
-msgstr "nikoli"
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
+msgid ""
+"If you are running Linux, you can log in as root and type these commands to "
+"start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:995
-msgid "Never"
-msgstr "Nikoli"
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"may not be performed because the program crond, which does nightly tasks on "
+"your computer, may be turned off. To make sure fast searches can be done, "
+"check to make sure that crond is turned on.\n"
+"\n"
+msgstr ""
 
 #. The list of characters that cause line breaks can be localized.
-#: libnautilus-extensions/nautilus-icon-canvas-item.c:68
+#: libnautilus-extensions/nautilus-icon-canvas-item.c:70
 msgid " -_,;.?/&"
 msgstr " -_,;.?/&"
 
 # FIXXXXX
-#: libnautilus-extensions/nautilus-icon-dnd.c:733
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
@@ -5387,7 +5958,7 @@ msgstr ""
 "postavitev in pustiti ta predmet tam, kjer ste ga spustili? To bo pokvarilo "
 "shranjen roèni izgled."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:737
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
@@ -5397,7 +5968,7 @@ msgstr ""
 "postavitev in pustiti te predmete tam, kjer ste jih spustili? To bo "
 "pokvarilo shranjen roèni izgled."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:743
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
@@ -5405,7 +5976,7 @@ msgstr ""
 "Ta mapa uporablja samodejeno postavitev. ®elite preklopiti na roèno "
 "postavitev in pustiti ta predmet tam, kjer ste ga spustili?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:746
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
@@ -5413,213 +5984,192 @@ msgstr ""
 "Ta mapa uporablja samodejeno postavitev. ®elite preklopiti na roèno "
 "postavitev in pustiti te predmete tam, kjer ste jih spustili?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:751
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "Preklopi na roèno postavitev?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:752
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "Preklopi"
 
-#. FIXME bugzilla.eazel.com 1102: Embedded text should use preferences
-#. * to determine what font it uses instead of this set of constants.
-#.
-#: libnautilus-extensions/nautilus-icon-factory.c:133
-msgid "helvetica"
-msgstr "helvetica"
-
-#: libnautilus-extensions/nautilus-icon-factory.c:134
-msgid "medium"
-msgstr "srednje"
-
-#: libnautilus-extensions/nautilus-icon-text-item.c:1546
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1547
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr "Razveljavi tipkanje"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1548
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "Obnovi staro ime"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1549
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "Obnovi tipkanje"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Obnovi spremenjeno ime"
 
-#: libnautilus-extensions/nautilus-preferences.c:76
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "Zaèetna"
 
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "Vmesna"
 
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "Napredna"
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:205
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "©katla nastavitev"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:189
-#: src/nautilus-window.c:903 src/nautilus-window.c:1145
-#, c-format
-msgid "View as %s"
-msgstr "Poglej kot %s"
-
-#: libnautilus-extensions/nautilus-program-chooser.c:219
+#: libnautilus-extensions/nautilus-program-chooser.c:226
 msgid "not in menu"
 msgstr "ni v menuju"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:222
+#: libnautilus-extensions/nautilus-program-chooser.c:229
 msgid "in menu for this file"
 msgstr "v menuju za to datoteko"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:225
-#: libnautilus-extensions/nautilus-program-chooser.c:228
+#: libnautilus-extensions/nautilus-program-chooser.c:232
+#: libnautilus-extensions/nautilus-program-chooser.c:235
 #, c-format
 msgid "in menu for \"%s\""
 msgstr "v menuju za \"%s\""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:231
+#: libnautilus-extensions/nautilus-program-chooser.c:238
 msgid "default for this file"
 msgstr "privzeto za to datoteko"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:234
-#: libnautilus-extensions/nautilus-program-chooser.c:237
+#: libnautilus-extensions/nautilus-program-chooser.c:241
+#: libnautilus-extensions/nautilus-program-chooser.c:244
 #, c-format
 msgid "default for \"%s\""
 msgstr "privzeto za \"%s\""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:266
+#: libnautilus-extensions/nautilus-program-chooser.c:289
 #, c-format
 msgid "Is not in the menu for \"%s\" items."
 msgstr "Ni v menuju za predmete \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:269
+#: libnautilus-extensions/nautilus-program-chooser.c:292
 #, c-format
 msgid "Is in the menu for \"%s\"."
 msgstr "V menuju za \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:272
+#: libnautilus-extensions/nautilus-program-chooser.c:295
 #, c-format
 msgid "Is in the menu for \"%s\" items."
 msgstr "V menuju za predmete \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:275
+#: libnautilus-extensions/nautilus-program-chooser.c:298
 #, c-format
 msgid "Is in the menu for all \"%s\" items."
 msgstr "V menuju za vse predmete \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:278
+#: libnautilus-extensions/nautilus-program-chooser.c:301
 #, c-format
 msgid "Is the default for \"%s\"."
 msgstr "Je privzeto za \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:281
+#: libnautilus-extensions/nautilus-program-chooser.c:304
 #, c-format
 msgid "Is the default for \"%s\" items."
 msgstr "Je privzeto za predmete \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:284
+#: libnautilus-extensions/nautilus-program-chooser.c:307
 #, c-format
 msgid "Is the default for all \"%s\" items."
 msgstr "Je privzeto za vse predmete \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:970
+#: libnautilus-extensions/nautilus-program-chooser.c:993
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Spremeni \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-extensions/nautilus-program-chooser.c:995
+#: libnautilus-extensions/nautilus-program-chooser.c:1018
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Vkljuèi v menu za predmete \"%s\""
 
 #. Radio button for setting default for file type.
-#: libnautilus-extensions/nautilus-program-chooser.c:1002
+#: libnautilus-extensions/nautilus-program-chooser.c:1025
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Uporabi kot privzeto za predmete \"%s\""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1009
+#: libnautilus-extensions/nautilus-program-chooser.c:1032
 #, c-format
 msgid "Include in the menu just for \"%s\""
 msgstr "Vkljuèi v menu samo za \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1015
+#: libnautilus-extensions/nautilus-program-chooser.c:1038
 #, c-format
 msgid "Use as default just for \"%s\""
 msgstr "Uporabi kot privzeto samo za \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1022
+#: libnautilus-extensions/nautilus-program-chooser.c:1045
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Ne vkljuèuj v menuju za predmete \"%s\""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1186
-#: src/file-manager/fm-list-view.c:1970
-#: src/file-manager/fm-search-list-view.c:549
+#: libnautilus-extensions/nautilus-program-chooser.c:1209
+#: src/file-manager/fm-list-view.c:2182
+#: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
 msgstr "Ime"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1189
+#: libnautilus-extensions/nautilus-program-chooser.c:1212
 msgid "Status"
 msgstr "Stanje"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1237
+#: libnautilus-extensions/nautilus-program-chooser.c:1260
 msgid "Open with Other"
 msgstr "Odpri z neèim drugim"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1238
+#: libnautilus-extensions/nautilus-program-chooser.c:1261
 #, c-format
 msgid "Choose an application with which to open \"%s\"."
 msgstr "Izberi program s katerim naj se odpre \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1242
+#: libnautilus-extensions/nautilus-program-chooser.c:1265
 msgid "View as Other"
 msgstr "Poglej z neèim drugim"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1243
+#: libnautilus-extensions/nautilus-program-chooser.c:1266
 #, c-format
 msgid "Choose a view for \"%s\"."
 msgstr "Izberite pogled za \"%s\"."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1250
+#: libnautilus-extensions/nautilus-program-chooser.c:1273
 msgid "Choose"
 msgstr "Izberi"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1252
+#: libnautilus-extensions/nautilus-program-chooser.c:1275
 msgid "Done"
 msgstr "Opravljeno"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1315
+#: libnautilus-extensions/nautilus-program-chooser.c:1338
 msgid "Modify..."
 msgstr "Spremeni..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-extensions/nautilus-program-chooser.c:1326
+#: libnautilus-extensions/nautilus-program-chooser.c:1349
 msgid "File Types and Programs"
 msgstr "Vrste datotek in programi"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1338
-msgid "Go There"
-msgstr "Pojdi tja"
-
-#: libnautilus-extensions/nautilus-program-chooser.c:1347
+#: libnautilus-extensions/nautilus-program-chooser.c:1370
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "GNOME Control Center."
@@ -5627,25 +6177,61 @@ msgstr ""
 "Nastavitve kateri programi so ponujeni za katere tipe datotek lahko "
 "spremenite v Kontrolnem centru GNOME."
 
-#. This application can't deal with this URI,
-#. * because it can only handle local
-#. * files. Tell user. Some day we could offer
-#. * to copy it locally for the user, if we knew
-#. * where to put it, and who would delete it
-#. * when done.
+#: libnautilus-extensions/nautilus-program-chooser.c:1485
+#, fuzzy, c-format
+msgid "No viewers are available for \"%s\"."
+msgstr "Opis za temo \"%s\" ni na voljo"
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1486
+msgid "No Viewers Available"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1489
+#, fuzzy, c-format
+msgid "No applications are available for \"%s\"."
+msgstr "Opis za temo \"%s\" ni na voljo"
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1490
+#, fuzzy
+msgid "No Applications Available"
+msgstr "Programi"
+
+#. Note: This might be misleading in the components case, since the
+#. * user can't add components to the complete list even from the capplet.
+#. * (They can add applications though.)
 #.
-#: libnautilus-extensions/nautilus-program-choosing.c:446
+#: libnautilus-extensions/nautilus-program-chooser.c:1497
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"You can configure which programs are offered for which file types with the "
+"\"File Types and Programs\" part of the GNOME Control Center. Do you want to "
+"go there now?"
+msgstr ""
+"Nastavitve kateri programi so ponujeni za katere tipe datotek lahko "
+"spremenite v Kontrolnem centru GNOME."
+
+#: libnautilus-extensions/nautilus-program-choosing.c:492
 #, c-format
 msgid ""
-"Sorry, %s can only open local files, and \"%s\" is remote. If you want to "
-"open it with %s, make a local copy first."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  Would you like to choose another application?"
 msgstr ""
-"%s lahko odpre le krajevne datoteke in \"%s\" je oddaljena. Èe jo ¾elite "
-"odpreti z %s potem najprej naredite krajevno kopijo."
 
-#: libnautilus-extensions/nautilus-program-choosing.c:450
-msgid "Can't open remote file"
-msgstr "Ne morem odpreti oddaljene datoteke"
+#: libnautilus-extensions/nautilus-program-choosing.c:497
+#: libnautilus-extensions/nautilus-program-choosing.c:518
+#, fuzzy
+msgid "Can't Open Location"
+msgstr "Ne morem prikazati lokacije"
+
+#: libnautilus-extensions/nautilus-program-choosing.c:513
+#, c-format
+msgid ""
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  No other applications are available to view this file.  If you "
+"copy this file onto your computer, you may be able to open it."
+msgstr ""
 
 #. Human readable description for a criterion in a search for
 #. files. Bracketed items are context, and are message
@@ -5892,33 +6478,16 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Predmeti, ki vsebujejo \"medusa\" v njihovih imenih in so mape"
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:519
-msgid "Warning"
-msgstr "Opozorilo"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:530
-#: libnautilus-extensions/nautilus-stock-dialogs.c:570
-msgid "Error"
-msgstr "Napaka"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:572
-msgid "Details"
-msgstr "Podrobnosti"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-#: libnautilus-extensions/nautilus-stock-dialogs.c:631
-msgid "Question"
-msgstr "Vpra¹anje"
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr "Preiskujem diske"
 
 #: libnautilus-extensions/nautilus-trash-directory.c:74
-msgid "Nautilus is searching for trash folders."
+#, fuzzy
+msgid "Nautilus is searching your disks for trash folders."
 msgstr "Nautilus i¹èe mapo Smeti."
 
-#: libnautilus-extensions/nautilus-trash-file.c:593
+#: libnautilus-extensions/nautilus-trash-file.c:725
 msgid "on the desktop"
 msgstr "na namizju"
 
@@ -5942,51 +6511,73 @@ msgstr "Obnovi urejanje"
 msgid "Redo the edit"
 msgstr "Obnovi urejanje"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:475
-#: libnautilus-extensions/nautilus-volume-monitor.c:497
-msgid "Audio CD"
-msgstr "Glasbeni CD"
+#: libnautilus-extensions/nautilus-view-identifier.c:61
+#, c-format
+msgid "View as %s"
+msgstr "Poglej kot %s"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1306
-msgid "Mount Error"
-msgstr "Napaka ob priklopu"
+#: libnautilus-extensions/nautilus-view-identifier.c:64
+#, c-format
+msgid "%s Viewer"
+msgstr "Pregledovalnik %s"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1308
-msgid "Unmount Error"
-msgstr "Napaka ob odklopu"
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+#, fuzzy
+msgid "Unknown"
+msgstr "neznan"
+
+#. Populate table with items we know localized names for.
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
+msgid "Floppy"
+msgstr "Disketa"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
+msgid "CD-ROM"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
+msgid "Zip Drive"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
+msgid "Audio CD"
+msgstr "Glasbeni CD"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1338
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr "je za¹èitena proti pisanju, priklapljam le za branje"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1341
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "ni veljavna blokovna naprava"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1342
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr "Medij ni bil najden"
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1346
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
 msgstr "Nautilus ni mogel priklopiti disketnika. Verjetno v njem ni diskete."
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1350
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
 msgstr "Nautilus ni mogel priklopiti te naprave. Verjetno v napravi ni medija."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1353
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr ""
 "napaèna vrsta datoteènega sistema, neveljavna mo¾nost, slab superblok na"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1356
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
@@ -5994,7 +6585,7 @@ msgstr ""
 "Nautilus ni mogel priklopiti disketnika. Disketa je verjetno formata, ki ga "
 "ne zna priklopiti."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1359
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
@@ -6002,44 +6593,58 @@ msgstr ""
 "Nautilus ni mogel priklopiti izbrane naprave. Verjetno se formata na mediju "
 "ne da priklopiti."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1364
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr "Nautilus ni mogel priklopiti izbranega disketnika."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1366
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "Nautilus ni mogel priklopiti izbranih naprav."
 
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1371
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr "Nautilus ni mogel priklopiti izbrane naprave."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1508
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr "Napaka ob priklopu"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr "Napaka ob odklopu"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "Zapis ISO 9660"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1523
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "Koren"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1530
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Zapis ext2"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1545
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "Zapis MSDOS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1560
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "Zapis NFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1575
-msgid "Floppy"
-msgstr "Disketa"
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
+#, fuzzy
+msgid "ReiserFS Volume"
+msgstr "Zapis NFS"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
+#, fuzzy
+msgid "UFS Volume"
+msgstr "Zapis NFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1590
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "Neznan zapis"
 
@@ -6047,34 +6652,78 @@ msgstr "Neznan zapis"
 msgid "C_lear Text"
 msgstr "P_oèisti besedilo"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "P_oèisti besedilo"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "_Kopiraj besedilo"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "Kopiraj izbrano besedilo na odlo¾i¹èe"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "Izre¾i _besedilo"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+msgid "Cut _Text"
+msgstr "Izre¾i _besedilo"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "Izre¾i izbrano besedilo na odlo¾i¹èe"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:41
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "_Prilepi besedilo"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "Prilepi besedilo shranjeno na odlo¾i¹èu"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "Odstrani izbrano besedilo, brez da bi ga dal na odlo¾i¹èe"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:73
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "_Izberi vse"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+#, fuzzy
+msgid "Select _All"
+msgstr "_Izberi vse"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "Izberi vse predmete v tem oknu"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "_Kopiraj besedilo"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:7
-msgid "_Cut Text"
-msgstr "_Izre¾i besedilo"
-
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:87
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "_Prilepi besedilo"
 
+#. The copyright character in here is correct for
+#. * Latin-1 encoding, but not for UTF-8, so we have
+#. * to change it when we upgrade to GTK 2.0.
+#.
+#: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
+#: src/nautilus-window-menus.c:610
+msgid "Nautilus"
+msgstr "Nautilus"
+
 #: nautilus.desktop.in.h:2
 msgid "Nautilus File Manager and Graphic Shell"
 msgstr "Upravljalnik datotek in grafièna ¹koljka Nautilus"
@@ -6087,78 +6736,109 @@ msgstr "Upravljalnik datotek in grafièna ¹koljka Nautilus"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:731
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr "Dom %s"
 
-#: src/file-manager/fm-desktop-icon-view.c:1020
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "Sprazni Smeti..."
 
-#: src/file-manager/fm-desktop-icon-view.c:1022
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "Sprazni Smeti"
 
-#: src/file-manager/fm-desktop-icon-view.c:1042
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "Odklopi napravo"
 
-#: src/file-manager/fm-directory-view.c:466
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr "To bo odprlo %d loèenih oken. Ste preprièani, da to ¾elite?"
 
-#: src/file-manager/fm-directory-view.c:468
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Odpri %d oken?"
 
-#: src/file-manager/fm-directory-view.c:1189
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr "Ste preprièani, da ¾elite iz Smeti trajno zbrisati \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+"Ste preprièani, da ¾elite iz Smeti trajno izbrisati %d izbranih predmetov?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Zbri¹i"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Zbri¹i"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+#, fuzzy
+msgid "scripts"
+msgstr "Opis"
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "Izbran \"%s\""
 
-#: src/file-manager/fm-directory-view.c:1191
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "1 izbrana mapa"
 
-#: src/file-manager/fm-directory-view.c:1194
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "%d izbranih map"
 
-#: src/file-manager/fm-directory-view.c:1200
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr " (vsebuje 0 predmetov)"
 
-#: src/file-manager/fm-directory-view.c:1202
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr " (vsebuje 1 predmet)"
 
-#: src/file-manager/fm-directory-view.c:1204
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr " (vsebuje %d predmetov)"
 
-#: src/file-manager/fm-directory-view.c:1215
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "izbran \"%s\" (%s)"
 
-#: src/file-manager/fm-directory-view.c:1219
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d izbranih predmetov (%s)"
 
-#: src/file-manager/fm-directory-view.c:1226
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 drug izbran predmet (%s)"
 
-#: src/file-manager/fm-directory-view.c:1229
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d drugih predmetov izbranih (%s)"
@@ -6170,7 +6850,7 @@ msgstr "%d drugih predmetov izbranih (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1258
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -6179,7 +6859,7 @@ msgstr "%s%s, %s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1385
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
@@ -6188,154 +6868,285 @@ msgstr ""
 "Mapa \"%s\" vsebuje veè datotek kot jih zmore obvladati Nautilus. Nekatere "
 "datoteke ne bodo prikazane."
 
-#: src/file-manager/fm-directory-view.c:1392
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "Preveè datotek"
 
-#: src/file-manager/fm-directory-view.c:2589
-#, c-format
+#: src/file-manager/fm-directory-view.c:2752
+#, fuzzy, c-format
 msgid ""
-"\"%s\" cannot be moved to the trash. Do you want to delete it immediately?"
+"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
 msgstr "\"%s\" ne more biti prestavljenih v Smeti. Ga ¾elite zbrisati takoj?"
 
-#: src/file-manager/fm-directory-view.c:2594
-#, c-format
+#: src/file-manager/fm-directory-view.c:2757
+#, fuzzy, c-format
 msgid ""
-"The %d selected items cannot be moved to the trash. Do you want to delete "
+"The %d selected items cannot be moved to the Trash. Do you want to delete "
 "them immediately?"
 msgstr ""
 "%d izbranih predmetov ne more biti prestavljenih v Smeti. Jih ¾elite "
 "zbrisati takoj?"
 
-#: src/file-manager/fm-directory-view.c:2598
-#, c-format
+#: src/file-manager/fm-directory-view.c:2761
+#, fuzzy, c-format
 msgid ""
-"%d of the selected items cannot be moved to the trash. Do you want to delete "
+"%d of the selected items cannot be moved to the Trash. Do you want to delete "
 "those %d items immediately?"
 msgstr ""
 "%d od izbranih predmetov ne more biti prestavljenih v Smeti. ®elite teh %d "
 "predmetov izbrisati takoj?"
 
-#: src/file-manager/fm-directory-view.c:2606
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "Takoj zbri¹i?"
 
-#: src/file-manager/fm-directory-view.c:2607
-#: src/file-manager/fm-directory-view.c:2648
-msgid "Delete"
-msgstr "Zbri¹i"
-
-#: src/file-manager/fm-directory-view.c:2637
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
+#: src/file-manager/fm-directory-view.c:2799
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr "Ste preprièani, da ¾elite iz Smeti trajno zbrisati \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:2641
-#, c-format
+#: src/file-manager/fm-directory-view.c:2803
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"trash?"
+"Trash?"
 msgstr ""
 "Ste preprièani, da ¾elite iz Smeti trajno izbrisati %d izbranih predmetov?"
 
-#: src/file-manager/fm-directory-view.c:2647
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "Zbri¹i iz smeti?"
 
-#: src/file-manager/fm-directory-view.c:2920
-#: src/file-manager/fm-directory-view.c:2961
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Uporabi \"%s\" za odprtje izbranega predmeta"
 
-#: src/file-manager/fm-directory-view.c:2959
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "Drug _program..."
+
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "Drug _program..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "Drug p_regledovalnik..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "Drug p_regledovalnik..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "Uporabi \"%s\" za odprtje izbranega predmeta"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "Nautilus ni mogel priklopiti izbranih naprav."
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
 #, c-format
-msgid "%s Viewer"
-msgstr "Pregledovalnik %s"
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3163
-msgid "Open in _New Window"
-msgstr "Odpri v _novem oknu"
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"%d izbranih predmetov ne more biti prestavljenih v Smeti. Jih ¾elite "
+"zbrisati takoj?"
 
-#: src/file-manager/fm-directory-view.c:3165
+#: src/file-manager/fm-directory-view.c:3708
 #, c-format
-msgid "Open in %d _New Windows"
-msgstr "Odpri v %d _novih oknih"
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3191
-msgid "Delete all selected items permanently"
-msgstr "Trajno zbri¹i vse izbrane predmete"
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "Odpri v novem oknu"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#, fuzzy
+msgid "Open _in New Window"
+msgstr "Odpri v novem oknu"
+
+#: src/file-manager/fm-directory-view.c:3959
+#, fuzzy, c-format
+msgid "Open _in %d New Windows"
+msgstr "Odpri v %d _novih oknih"
 
-#: src/file-manager/fm-directory-view.c:3196
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "Zbri¹i iz _Smeti..."
 
-#: src/file-manager/fm-directory-view.c:3197
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "Zbri¹i iz _Smeti"
 
-#: src/file-manager/fm-directory-view.c:3201
-msgid "Move all selected items to the Trash"
-msgstr "Prestavi vse izbrane predmete v Smeti"
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "Trajno zbri¹i vse izbrane predmete"
 
-#: src/file-manager/fm-directory-view.c:3205
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "Vrzi v smeti"
 
-#: src/file-manager/fm-directory-view.c:3235
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "Prestavi vse izbrane predmete v Smeti"
+
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "Zbri¹i"
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "Zbri¹i"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "Ustvari _povezave"
 
-#: src/file-manager/fm-directory-view.c:3236
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "Ustvari _povezavo"
 
-#: src/file-manager/fm-directory-view.c:3254
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "_Sprazni smeti..."
 
-#: src/file-manager/fm-directory-view.c:3255
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "_Sprazni smeti"
 
-#: src/file-manager/fm-directory-view.c:3266
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "_Odstrani prikrojene slike"
 
-#: src/file-manager/fm-directory-view.c:3267
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "_Odstrani prikorejeno sliko"
 
-#: src/file-manager/fm-directory-view.c:3420
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "_Datoteka"
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u datotek"
+
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "_Kopiraj besedilo"
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "Kopiram datoteke"
+
+#: src/file-manager/fm-directory-view.c:4252
+#, fuzzy
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
-"link in the trash?"
+"link in the Trash?"
 msgstr ""
 "Te povezave se ne da uporabiti, ker nima tarèe. ®elite dati to povezavo v "
 "smeti?"
 
-#: src/file-manager/fm-directory-view.c:3423
-#, c-format
+#: src/file-manager/fm-directory-view.c:4255
+#, fuzzy, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to put this link in the trash?"
+"want to put this link in the Trash?"
 msgstr ""
 "Te povezave se ne da uporabiti, ker njena tarèa \"%s\" ne obstaja. ®elite "
 "dati to povezavo v smeti?"
 
-#: src/file-manager/fm-directory-view.c:3429
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "Pokvarjena povezava"
 
-#: src/file-manager/fm-directory-view.c:3430
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr "Vrzi stran"
 
-#: src/file-manager/fm-directory-view.c:3483
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
@@ -6344,76 +7155,77 @@ msgstr ""
 "\"%s\" je izvr¹ljiva datoteka z besedilom. Jo ¾elite pognati ali prikazati  "
 "njeno vsebino?"
 
-#: src/file-manager/fm-directory-view.c:3489
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr "Po¾eni ali prika¾i?"
 
-#: src/file-manager/fm-directory-view.c:3490
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "Po¾eni"
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "Prikaz"
 
-#: src/file-manager/fm-directory-view.c:3494
-msgid "Cancel"
-msgstr "Preklièi"
-
-#: src/file-manager/fm-directory-view.c:3540
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
 msgstr ""
 "Ukazov na oddaljenem sistemu ne morete izvr¹evati zaradi varnostnih razlogov."
 
-#: src/file-manager/fm-directory-view.c:3541
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "Ne morem izvesti oddaljenih povezav"
 
-#: src/file-manager/fm-directory-view.c:3672
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr "Odpiram \"%s\""
 
-#: src/file-manager/fm-directory-view.c:3678
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "Preklièi odpiranje?"
 
-#: src/file-manager/fm-error-reporting.c:56
+#: src/file-manager/fm-error-reporting.c:58
 #, c-format
 msgid ""
 "You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "Nimate ustreznih dovoljenj za pogled vsebine \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:63
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Nisem mogel prikazati vsebine \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:66
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Napaka ob prikazovanju mape"
 
-#: src/file-manager/fm-error-reporting.c:89
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "Ime \"%s\" je v tej mapi ¾e uporabljeno. Prosim uporabite drugaèno ime."
 
-#: src/file-manager/fm-error-reporting.c:94
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "V tej mapi ni \"%s\". Morda je bila le prestavljena ali zbrisana?"
 
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Nimate ustreznih dovoljenj za preimenovanje \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -6422,82 +7234,81 @@ msgstr ""
 "Ime \"%s\" ni veljavno, ker vsebuje znak \"/\". Prosim uporabite drugaèno "
 "ime."
 
-#: src/file-manager/fm-error-reporting.c:108
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Ime \"%s\" ni veljavno. Prosim uporabite drgaèno ime."
 
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "Nisem mogel spremeniti imena \"%s\", ker je na le berljivem disku"
 
-#. fall through
-#: src/file-manager/fm-error-reporting.c:122
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Nisem mogel preimenovati \"%s\" v \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:128
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "Napaka ob preimenovanju"
 
-#: src/file-manager/fm-error-reporting.c:148
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Nimate potrebnih dovoljenj za spremenitev skupine od \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:152
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr "Nisem mogel spremeniti skupine od \"%s\", ker je na le berljivem disku"
 
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Nisem mogel spremeniti skupine od \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "Napaka ob nastavljanju skupine"
 
-#: src/file-manager/fm-error-reporting.c:186
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr "Nisem mogel spremeniti lastnika \"%s\", ker je na le berljivem disku"
 
-#: src/file-manager/fm-error-reporting.c:193
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Nisem mogel premeniti lastnika \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:196
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "Napaka ob nastavljanju lastnika"
 
-#: src/file-manager/fm-error-reporting.c:218
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Nisem mogel spremeniti dovoljenj za \"%s\", ker je na le berljivem disku"
 
-#: src/file-manager/fm-error-reporting.c:225
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Nisem mogel spremeniti dovoljenj za \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:228
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "Napaka ob nastavljanju dovoljenj"
 
-#: src/file-manager/fm-error-reporting.c:294
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Preimenujem \"%s\" v \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:299
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "Preklièi preimenovanje?"
 
@@ -6557,120 +7368,120 @@ msgstr ""
 "Izberite vrstni red podatkov, ki naj se pojavijo pod imeni ikon. Veè "
 "podatkov se pojavi, ko poveèate."
 
-#: src/file-manager/fm-icon-view.c:157
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "po ime_nu"
 
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "Ikone naj bodo urejene po imenu v vrsticah"
 
-#: src/file-manager/fm-icon-view.c:164
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "po veliko_sti"
 
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "Ikone naj bodo urejene po velikosti v vrsticah"
 
-#: src/file-manager/fm-icon-view.c:171
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "po _vrsti"
 
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "Ikone naj bodo urejene po tipu v vrsticah"
 
-#: src/file-manager/fm-icon-view.c:178
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "po _datumu spremembe"
 
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Ikone naj bodo urejene po datumu spremembe v vrsticah"
 
-#: src/file-manager/fm-icon-view.c:185
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "po _emblemih"
 
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Ikone naj bodo sortirane po emblemih"
 
-#: src/file-manager/fm-icon-view.c:1225
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "_Povrni izvirne velikosti ikon"
 
-#: src/file-manager/fm-icon-view.c:1226
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "_Povrni izvirno velikost ikone"
 
-#: src/file-manager/fm-icon-view.c:1440
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "ka¾e na \"%s\""
 
-#: src/file-manager/fm-list-view.c:1976
-#: src/file-manager/fm-search-list-view.c:561
+#: src/file-manager/fm-list-view.c:2188
+#: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Velikost"
 
-#: src/file-manager/fm-list-view.c:1982
-#: src/file-manager/fm-search-list-view.c:567
+#: src/file-manager/fm-list-view.c:2194
+#: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Vrsta"
 
-#: src/file-manager/fm-list-view.c:1988
-#: src/file-manager/fm-search-list-view.c:573
+#: src/file-manager/fm-list-view.c:2200
+#: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Datum modifikacije"
 
-#: src/file-manager/fm-properties-window.c:519
+#: src/file-manager/fm-properties-window.c:522
 #, c-format
 msgid "%s Properties"
 msgstr "Lastnosti %s"
 
-#: src/file-manager/fm-properties-window.c:714
+#: src/file-manager/fm-properties-window.c:717
 msgid "Cancel Group Change?"
 msgstr "Preklièi spremembo skupine?"
 
-#: src/file-manager/fm-properties-window.c:715
+#: src/file-manager/fm-properties-window.c:718
 msgid "Changing group"
 msgstr "Spreminjam skupino"
 
-#: src/file-manager/fm-properties-window.c:876
+#: src/file-manager/fm-properties-window.c:879
 msgid "Cancel Owner Change?"
 msgstr "Preklièi spremembo lastnika"
 
-#: src/file-manager/fm-properties-window.c:877
+#: src/file-manager/fm-properties-window.c:880
 msgid "Changing owner"
 msgstr "Spreminjam lastnika"
 
-#: src/file-manager/fm-properties-window.c:1052
+#: src/file-manager/fm-properties-window.c:1063
 msgid "nothing"
 msgstr "niè"
 
-#: src/file-manager/fm-properties-window.c:1054
+#: src/file-manager/fm-properties-window.c:1065
 msgid "unreadable"
 msgstr "neberljiva"
 
-#: src/file-manager/fm-properties-window.c:1063
+#: src/file-manager/fm-properties-window.c:1074
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 predmet z velikostjo %s"
 
-#: src/file-manager/fm-properties-window.c:1065
+#: src/file-manager/fm-properties-window.c:1076
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d predmetov v skupni velikosti %s"
 
-#: src/file-manager/fm-properties-window.c:1071
+#: src/file-manager/fm-properties-window.c:1082
 msgid "(some contents unreadable)"
 msgstr "(nekaj vsebine ni berljive)"
 
@@ -6679,128 +7490,130 @@ msgstr "(nekaj vsebine ni berljive)"
 #. * "Contents:" title to line up with the first line of the 2-line value.
 #. * Maybe there's a better way to do this, but I couldn't think of one.
 #.
-#: src/file-manager/fm-properties-window.c:1085
+#: src/file-manager/fm-properties-window.c:1096
 msgid "Contents:"
 msgstr "Vsebina:"
 
-#: src/file-manager/fm-properties-window.c:1418
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "Osnovno"
 
-#: src/file-manager/fm-properties-window.c:1497
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Vrsta:"
 
-#: src/file-manager/fm-properties-window.c:1502
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "Velikost:"
 
-#: src/file-manager/fm-properties-window.c:1504
-msgid "Where:"
-msgstr "Kje:"
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "Mno¾ice povezav"
 
-#: src/file-manager/fm-properties-window.c:1506
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
 msgstr "Tip MIME:"
 
-#: src/file-manager/fm-properties-window.c:1512
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "Spremenjena:"
 
-#: src/file-manager/fm-properties-window.c:1515
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "Dostopana:"
 
-#: src/file-manager/fm-properties-window.c:1524
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr "Izberi prikrojeno ikono..."
 
-#: src/file-manager/fm-properties-window.c:1530
+#: src/file-manager/fm-properties-window.c:1558
 msgid "Remove Custom Icon"
 msgstr "Odstrani prikorjeno ikono"
 
-#: src/file-manager/fm-properties-window.c:1855
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "Nastavi ID uporabnika"
 
-#: src/file-manager/fm-properties-window.c:1860
+#: src/file-manager/fm-properties-window.c:1891
 msgid "Special Flags:"
 msgstr "Posebne zastavice:"
 
-#: src/file-manager/fm-properties-window.c:1863
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "Nastavi ID skupine"
 
-#: src/file-manager/fm-properties-window.c:1865
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "Lepljiv"
 
-#: src/file-manager/fm-properties-window.c:1891
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Dovoljenja"
 
-#: src/file-manager/fm-properties-window.c:1897
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Niste lastnik, zato ne morete spremeniti teh dovoljenj."
 
-#: src/file-manager/fm-properties-window.c:1910
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "Lastnik datoteke:"
 
-#: src/file-manager/fm-properties-window.c:1919
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "Skupina datoteke:"
 
-#: src/file-manager/fm-properties-window.c:1937
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "Lastnik:"
 
-#: src/file-manager/fm-properties-window.c:1938
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "Skupina:"
 
-#: src/file-manager/fm-properties-window.c:1939
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "Drugo:"
 
-#: src/file-manager/fm-properties-window.c:1958
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "Beriljiva"
 
-#: src/file-manager/fm-properties-window.c:1962
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "Pisljiva"
 
-#: src/file-manager/fm-properties-window.c:1966
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "Izvr¹ljiva"
 
-#: src/file-manager/fm-properties-window.c:2017
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "Pogled besedila:"
 
-#: src/file-manager/fm-properties-window.c:2018
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "Pogled ¹tevilk:"
 
-#: src/file-manager/fm-properties-window.c:2019
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "Nazadnje spremenjena:"
 
-#: src/file-manager/fm-properties-window.c:2023
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Dovoljenja za \"%s\" niso bila ugotovljena."
 
-#: src/file-manager/fm-properties-window.c:2303
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr "Prekini okno z lastnostmi?"
 
-#: src/file-manager/fm-properties-window.c:2304
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr "Ustvarjam okno z lastnostmi"
 
-#: src/file-manager/fm-properties-window.c:2401
+#: src/file-manager/fm-properties-window.c:2435
 msgid "Select an icon:"
 msgstr "Izberite ikono:"
 
@@ -6808,7 +7621,7 @@ msgstr "Izberite ikono:"
 msgid "Search Results"
 msgstr "Rezultati iskanja"
 
-#: src/file-manager/fm-search-list-view.c:143
+#: src/file-manager/fm-search-list-view.c:142
 #, c-format
 msgid ""
 "Search results may not include items modified after %s, when your drive was "
@@ -6817,20 +7630,20 @@ msgstr ""
 "Rezultati iskanja ne bodo vkljuèevali predmetov spremenjenih po %s, ko je "
 "bilo nazadnje ustvarjeno kazalo va¹ega diska."
 
-#: src/file-manager/fm-search-list-view.c:159
+#: src/file-manager/fm-search-list-view.c:158
 msgid ""
 "Sorry, but the Medusa search service is not available because it is not "
 "installed."
 msgstr "Storitev iskanja Medusa ni na voljo, ker ni name¹èena."
 
-#: src/file-manager/fm-search-list-view.c:160
-#: src/file-manager/nautilus-indexing-info.c:397
+#: src/file-manager/fm-search-list-view.c:159
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr "Storitev iskanja ni na voljo"
 
 #. FIXME bugzilla.eazel.com 5058: Should be two messages, one for each of whether
 #. "slow complete search" turned on or not
-#: src/file-manager/fm-search-list-view.c:185
+#: src/file-manager/fm-search-list-view.c:184
 msgid ""
 "The search you have selected is newer than the index on your system.  The "
 "search will return no results right now.  Would you like to create a new "
@@ -6839,19 +7652,19 @@ msgstr ""
 "Iskanje, ki ste ga izbrali je novej¹e kot seznam datotek va¹ega sistema. "
 "Iskanje zdaj ne bo vrnilo nobenih zadetkov. ®elite ustvariti novo kazalo? "
 
-#: src/file-manager/fm-search-list-view.c:190
+#: src/file-manager/fm-search-list-view.c:189
 msgid "Search for items that are too new"
 msgstr "I¹èi za predmeti, ki so preveè novi"
 
-#: src/file-manager/fm-search-list-view.c:191
+#: src/file-manager/fm-search-list-view.c:190
 msgid "Create a new index"
 msgstr "Ustvari novo kazalo"
 
-#: src/file-manager/fm-search-list-view.c:192
+#: src/file-manager/fm-search-list-view.c:191
 msgid "Don't create index"
 msgstr "Ne ustvari kazala"
 
-#: src/file-manager/fm-search-list-view.c:201
+#: src/file-manager/fm-search-list-view.c:200
 msgid ""
 "Every indexed file on your computer matches the criteria you selected. You "
 "can check the spelling on your selections or add more criteria to narrow "
@@ -6861,17 +7674,17 @@ msgstr ""
 "Lahko preverite èrkovanje izbire ali dodate nove kriterije, ki bodo "
 "zmanj¹ali ¹tevilo zadetkov."
 
-#: src/file-manager/fm-search-list-view.c:205
-#: src/file-manager/fm-search-list-view.c:219
+#: src/file-manager/fm-search-list-view.c:204
+#: src/file-manager/fm-search-list-view.c:218
 msgid "Error during search"
 msgstr "Napaka med iskanjem"
 
-#: src/file-manager/fm-search-list-view.c:214
+#: src/file-manager/fm-search-list-view.c:213
 #, c-format
 msgid "An error occurred while loading this search's contents: %s"
 msgstr "Ob nalaganju vsebine iskanja se je zgodila napaka: %s"
 
-#: src/file-manager/fm-search-list-view.c:242
+#: src/file-manager/fm-search-list-view.c:241
 msgid ""
 "To do a fast search, Find requires an index of the files on your system.  "
 "Find can't access your index right now so a slower search will be performed "
@@ -6881,7 +7694,7 @@ msgstr ""
 "trenutno ne more dostopoati do kazala, zato bo opravljeno poèasno iskanje, "
 "ki ne uporablja kazala."
 
-#: src/file-manager/fm-search-list-view.c:247
+#: src/file-manager/fm-search-list-view.c:246
 msgid ""
 "To do a content search, Find requires an index of the files on your system.  "
 "Find can't access your index right now. "
@@ -6889,18 +7702,18 @@ msgstr ""
 "Za iskanje po vsebini potrebuje program Find kazalo datotek va¹ega sistema.  "
 "Kazalo trenutno ni dostopno. "
 
-#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:250
 msgid "Fast searches are not available"
 msgstr "Hitra iskanja niso na voljo"
 
-#: src/file-manager/fm-search-list-view.c:252
-#: src/file-manager/fm-search-list-view.c:292
-#: src/file-manager/fm-search-list-view.c:320
-#: src/file-manager/fm-search-list-view.c:339
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:319
+#: src/file-manager/fm-search-list-view.c:338
 msgid "Content searches are not available"
 msgstr "Iskanja po vsebini niso na voljo"
 
-#: src/file-manager/fm-search-list-view.c:255
+#: src/file-manager/fm-search-list-view.c:254
 msgid ""
 "Your index files are available but the Medusa search daemon, which handles "
 "index requests, isn't running.  To start this program, log in as root and "
@@ -6910,7 +7723,7 @@ msgstr ""
 "imenika, ne teèe. Za zagon tega programa se prijavite kot administrator "
 "(root) in v ukazni vrstici vpi¹ite ta ukaz: \"medusa-searchd\""
 
-#: src/file-manager/fm-search-list-view.c:275
+#: src/file-manager/fm-search-list-view.c:274
 msgid ""
 "To do a fast search, Find requires an index of the files on your system.  "
 "Your computer does not have an index right now.  Because Find cannot use an "
@@ -6923,7 +7736,7 @@ msgstr ""
 "lahko to iskanje traja veè minut. ®elite ustvariti kazalo? Ustvarjanje "
 "kazala bo opravljeno medtem, ko raèunalnika ne boste aktivno uporabljali."
 
-#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:283
 msgid ""
 "To do a content search, Find requires an index of the content on your "
 "system.  Your computer does not have an index right now.  Would you like to "
@@ -6935,21 +7748,21 @@ msgstr ""
 "Ustvarjanje kazala bo opravljeno medtem, ko raèunalnika ne boste aktivno "
 "uporabljali."
 
-#: src/file-manager/fm-search-list-view.c:291
-#: src/file-manager/fm-search-list-view.c:319
-#: src/file-manager/fm-search-list-view.c:338
+#: src/file-manager/fm-search-list-view.c:290
+#: src/file-manager/fm-search-list-view.c:318
+#: src/file-manager/fm-search-list-view.c:337
 msgid "Indexed searches are not available"
 msgstr "Iskanja po kazalu niso na voljo"
 
-#: src/file-manager/fm-search-list-view.c:295
+#: src/file-manager/fm-search-list-view.c:294
 msgid "Create an Index"
 msgstr "Ustvari kazalo"
 
-#: src/file-manager/fm-search-list-view.c:296
+#: src/file-manager/fm-search-list-view.c:295
 msgid "Don't Create an Index Now"
 msgstr "Sedaj ne ustvari kazala"
 
-#: src/file-manager/fm-search-list-view.c:307
+#: src/file-manager/fm-search-list-view.c:306
 msgid ""
 "To do a fast search, Find requires an index of the files on your system.  "
 "Your computer is currently creating that index.   Because Find cannot use an "
@@ -6959,7 +7772,7 @@ msgstr ""
 "raèunalnik trenutno ustvarja to kazalo. Ker Find ne more uporabiti kazala, "
 "lahko iskanje traja veè minut."
 
-#: src/file-manager/fm-search-list-view.c:313
+#: src/file-manager/fm-search-list-view.c:312
 msgid ""
 "To do a content search, Find requires an index of the content on your "
 "system.  Your computer is currently creating that index.  Content searches "
@@ -6969,7 +7782,7 @@ msgstr ""
 "Va¹ raèunalnik trenutno ustvarja to kazalo.  Iskanje po vsebini bo na voljo, "
 "ko bo kazalo pripravljeno."
 
-#: src/file-manager/fm-search-list-view.c:327
+#: src/file-manager/fm-search-list-view.c:326
 msgid ""
 "To do a fast search, Find requires an index of the files on your system.  An "
 "index can't be created right now. When an index is not available, searches "
@@ -6979,7 +7792,7 @@ msgstr ""
 "kazalo trenutno ne more biti narejeno. Kadar ni kazala,lahko iskanja trajajo "
 "veè minut."
 
-#: src/file-manager/fm-search-list-view.c:333
+#: src/file-manager/fm-search-list-view.c:332
 msgid ""
 "To do a content search, Find requires an index of the content on your "
 "system.  An index can't be created right now."
@@ -6987,7 +7800,7 @@ msgstr ""
 "Za iskanje po vsebini potrebuje program Find kazalo vsebine va¹ega sistema. "
 "Kazalo trenutno ni dostopno."
 
-#: src/file-manager/fm-search-list-view.c:342
+#: src/file-manager/fm-search-list-view.c:341
 msgid ""
 "The program that creates an index is not set up correctly.  You can create "
 "an index by hand by running \"medusa-indexd\" as root on the command line."
@@ -6998,40 +7811,51 @@ msgstr ""
 
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
-#: src/file-manager/fm-search-list-view.c:361
+#: src/file-manager/fm-search-list-view.c:360
+#: src/file-manager/nautilus-indexing-info.c:342
+#, fuzzy
 msgid ""
-"To do a fast search, Find requires an index of the files on your system.  "
-"Your system administrator has turned off indexing so your computer does not "
-"have an index right now.  Because Find cannot use an index, this search may "
-"take several minutes.  "
+"To do a fast search, Find requires an index of the files on your system. "
+"Your system administrator has disabled fast search on your computer, so no "
+"index is available."
 msgstr ""
 "Za hitro iskanje potrebuje program Find kazalo datotek va¹ega sistema. Va¹ "
 "raèunalnik trenutno ustvarja to kazalo. Va¹ sistemski administrator je "
 "ustvarjanje kazala izklopljeno, va¹ raèunalnik trenutno nima kazala. Ker "
 "Find ne more uporabiti kazala, lahko iskanje traja veè minut."
 
-#: src/file-manager/fm-search-list-view.c:368
-msgid "Indexing is Blocked on Your Computer"
-msgstr "Ustvarjanje kazala je na va¹em raèunalniku blokirano."
+#: src/file-manager/fm-search-list-view.c:364
+#, fuzzy
+msgid "Fast searches are not available on your computer"
+msgstr "Hitra iskanja niso na voljo"
 
-#. It is not necessary to translate this text just yet; it has not been
-#. edited yet, and will be replaced by a final copy in a few days.
-#: src/file-manager/fm-search-list-view.c:378
+#: src/file-manager/fm-search-list-view.c:373
+#: src/file-manager/nautilus-indexing-info.c:361
+#, fuzzy
 msgid ""
-"To do a fast search, Find requires an index of the files on your system.  "
-"You have elected not to index your computer so it does not have an index "
-"right now.  Because Find cannot use an index, this search may take several "
-"minutes.  "
+"To do a fast search, Find requires an index of the files on your system. "
+"Fast search is disabled in your Search preferences, so no index is available."
 msgstr ""
-"Za hitro iskanje potrebuje program Find kazalo datotek va¹ega sistema. Va¹ "
-"raèunalnik ima ustvarjanje kazala izkljuèeno ali pa kazala trenutno nima. "
-"Ker Find ne more uporabiti kazala, lahko iskanje traja veè minut."
+"Za iskanje po vsebini potrebuje program Find kazalo datotek va¹ega sistema.  "
+"Kazalo trenutno ni dostopno. "
+
+#: src/file-manager/fm-search-list-view.c:376
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
+#, fuzzy
+msgid "Fast searches are not available on your computer."
+msgstr "Hitra iskanja niso na voljo"
 
-#: src/file-manager/fm-search-list-view.c:385
-msgid "Indexing is Disabled on Your Computer"
-msgstr "Ustvarjanje kazala je na va¹em raèunalniku izkljuèeno."
+#: src/file-manager/fm-search-list-view.c:377
+#: src/file-manager/nautilus-indexing-info.c:366
+msgid ""
+"To enable fast search, open the Preferences menu and choose Preferences. "
+"Then select Search preferences and put a checkmark in the Enable Fast Search "
+"checkbox. An index will be generated while your computer is idle, so your "
+"index won't be available immediately."
+msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:555
+#: src/file-manager/fm-search-list-view.c:551
 msgid "Where"
 msgstr "Kje"
 
@@ -7040,7 +7864,7 @@ msgstr "Kje"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:607
+#: src/file-manager/fm-search-list-view.c:603
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Odkrij v novem oknu"
@@ -7051,7 +7875,7 @@ msgstr "_Odkrij v novem oknu"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:615
+#: src/file-manager/fm-search-list-view.c:611
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Odkrij v %d _novih oknih"
@@ -7060,7 +7884,7 @@ msgstr "Odkrij v %d _novih oknih"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:727
+#: src/file-manager/fm-search-list-view.c:723
 msgid ""
 "Nautilus found more search results than it can display. Some matching items "
 "will not be displayed. "
@@ -7068,7 +7892,7 @@ msgstr ""
 "Nautilus je na¹el veè zadetkov iskanja kot jih lahko prika¾e. Nekateri "
 "najdeni predmeti ne bodo prikazani."
 
-#: src/file-manager/fm-search-list-view.c:729
+#: src/file-manager/fm-search-list-view.c:725
 msgid "Too Many Matches"
 msgstr "Preveè zadetkov"
 
@@ -7077,8 +7901,9 @@ msgid "Change Desktop Background"
 msgstr "Spremeni ozadje namizja"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
-msgid "Delete all items in the trash"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#, fuzzy
+msgid "Delete all items in the Trash"
 msgstr "Zbri¹i vse predmete v Smeteh"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
@@ -7124,140 +7949,197 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Izberi drug pregledovalnik s katerim naj se pogleda izbran predmet"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-msgid "Create Link"
-msgstr "Ustvari povezavo"
+#, fuzzy
+msgid "Copy Files"
+msgstr "Kopiram datoteke"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "Znotraj te mape ustvari novo prazno mapo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "Ustvari simbolièno povezavo za vsak izbran predmet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u datotek"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "Prestavi vsak izbran predmet v Smeti"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "Podvoji"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "Podvoji vsak izbran predmet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
-msgid "Move each selected item to the trash"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "Ustvari povezavo"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#, fuzzy
+msgid "Move each selected item to the Trash"
 msgstr "Prestavi vsak izbran predmet v Smeti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Move to Trash"
 msgstr "Vrzi v smeti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "Nova mapa"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
-msgid "New _Folder"
-msgstr "Nova _mapa"
-
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "Odpri"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#, fuzzy
+msgid "Open Wit_h"
+msgstr "Odpri z"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "Odpri z"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "Odpri vsak izbran predmet v novem oknu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr "Odpri v novem oknu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Odpri izbran predmet v tem oknu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "Drug program..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "Drug pregledovalnik..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
-msgid "Other _Application..."
-msgstr "Drug _program..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "datoteke z besedili"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Other _Viewer..."
-msgstr "Drug p_regledovalnik..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr "Odstrani prikrojene slike"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr "Odstrani vse prikrojene slike iz izbranih ikon"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr "Odstrani vse prikrojene vzorce ali barve z ozadja te lokacije"
 
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "Ponastavi ozadje"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#, fuzzy
+msgid "Scripts"
+msgstr "Zaupno"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr "Izberi vse datoteke"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#, fuzzy
+msgid "Select _All Files"
+msgstr "Izberi vse datoteke"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "Izberi vse predmete v tem oknu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr "Ka¾i lastnosti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Show Trash"
 msgstr "Ka¾i Smeti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "Ka¾i lastnosti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
-msgid "Show the contents of the trash"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#, fuzzy
+msgid "Show the contents of the Trash"
 msgstr "Ka¾i vsebino Smeti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "Poglej ali spremeni lastnosti vsakega izbranega predmeta"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "_Podvoji"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#, fuzzy
+msgid "_New Folder"
+msgstr "Nova mapa"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "_Odpri"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
-msgid "_Open in New Window"
-msgstr "_Odpri v novem oknu"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
-msgid "_Select All Files"
-msgstr "_Izberi vse datoteke"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "_Prilepi besedilo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Show Trash"
 msgstr "_Ka¾i Smeti"
 
@@ -7437,7 +8319,7 @@ msgstr ""
 
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr "Stanje ustvarjanja kazala"
 
@@ -7455,11 +8337,11 @@ msgstr ""
 msgid "Your files were last indexed at %s"
 msgstr "Kazalo datotek je bilo nazadnje ustvarjeno %s"
 
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "Posodobi zdaj"
 
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast.  Your files are currently being indexed."
@@ -7467,34 +8349,11 @@ msgstr ""
 "Enkrat na dan se ustvari kazalo va¹ih datotek in vsebin (besedil), tako da "
 "so va¹a iskanja hitra. Kazalo se trenutno ustvarja."
 
-#: src/file-manager/nautilus-indexing-info.c:340
-msgid ""
-"An index of your files is not available because creating a nightly index of "
-"files has been disabled by your system administrator."
-msgstr ""
-"Kazalo va¹ih datotek ni na voljo, ker je bilo kreiranje vsakonoènega kazalo "
-"datotek izkljuèeno s strani administratorja sistema."
-
-#: src/file-manager/nautilus-indexing-info.c:343
-#: src/file-manager/nautilus-indexing-info.c:361
-msgid "No index of your system is available"
-msgstr "Kazalo datotek na va¹em sistemu ni na voljo"
-
-#: src/file-manager/nautilus-indexing-info.c:357
-msgid ""
-"An index of your files is not available, because you have elected to turn "
-"the indexing feature off.  You can set your computer up to index your files "
-"nightly by changing your search preferences."
-msgstr ""
-"Kazalo va¹ih datotek ni na voljo, ker ste se odloèili ustvarjanje kazala "
-"izklopitiVa¹ raèunalnik lahko nastavite, da bo vsakonoèno ustvarjal kazalo "
-"datotek s spremembo va¹ih nastavitev iskanja."
-
-#: src/file-manager/nautilus-indexing-info.c:396
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Storitev iskanja Medusa ni na voljo."
 
-#: src/file-manager/nautilus-indexing-info.c:418
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -7519,23 +8378,42 @@ msgid "Show status of indexing used when searching"
 msgstr "Ka¾i status ustvarjanja kazala, ki se uporablja pri iskanjih"
 
 #. set the window title and standard close key accelerator
-#: src/nautilus-about.c:139
+#: src/nautilus-about.c:141
 msgid "About Nautilus"
 msgstr "O Nautilusu"
 
 #. draw the authors title
-#: src/nautilus-about.c:355
+#: src/nautilus-about.c:361
 msgid "Authors"
 msgstr "Avtorji"
 
-#: src/nautilus-application.c:274
+#: src/nautilus-application.c:275
 msgid "Couldn't Create Required Folder"
 msgstr "Nisem mogel ustvariti zahtevane mape"
 
-#: src/nautilus-application.c:279
+#: src/nautilus-application.c:276
+#, c-format
+msgid ""
+"Nautilus could not create the required folder \"%s\". Before running "
+"Nautilus, please create this folder, or set permissions such that Nautilus "
+"can create it."
+msgstr ""
+
+#: src/nautilus-application.c:281
 msgid "Couldn't Create Required Folders"
 msgstr "Nisem mogel ustvariti zahtevanih map"
 
+#: src/nautilus-application.c:282
+#, c-format
+msgid ""
+"Nautilus could not create the following required folders:\n"
+"\n"
+"%s\n"
+"\n"
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
+msgstr ""
+
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.oaf file. This has happened when you
 #. * launch Nautilus with an LD_LIBRARY_PATH that
@@ -7546,25 +8424,29 @@ msgstr "Nisem mogel ustvariti zahtevanih map"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:404
+#: src/nautilus-application.c:407
 msgid ""
-"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
-"again may fix the problem."
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again."
 msgstr ""
-"Nautilus trenutno ne bo deloval. Vnovièen zagon raèunalnika ali ponovna "
-"namestitev Nautilusa lahko pomagata odpraviti problem."
 
 #. FIXME bugzilla.eazel.com 2536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:408
+#: src/nautilus-application.c:413
+#, fuzzy
 msgid ""
-"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
-"again may fix the problem.\n"
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again.\n"
 "\n"
 "OAF couldn't locate the Nautilus_shell.oaf file. One cause of this seems to "
 "be an LD_LIBRARY_PATH that does not include the oaf library's directory. "
 "Another possible cause would be bad install with a missing "
 "Nautilus_Shell.oaf file.\n"
 "\n"
+"Running \"nautilus-clean.sh -x\" will kill all OAF and GConf processes, "
+"which may be needed by other applications.\n"
+"\n"
 "Sometimes killing oafd and gconfd fixes the problem, but we don't know why.\n"
 "\n"
 "We have also seen this error when a faulty version of oaf was installed."
@@ -7589,12 +8471,12 @@ msgstr ""
 #. * wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:434 src/nautilus-application.c:452
-#: src/nautilus-application.c:459
+#: src/nautilus-application.c:444 src/nautilus-application.c:462
+#: src/nautilus-application.c:469
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautlusa trenutno ni mogoèe uporabljati zaradi neprièakovane napake."
 
-#: src/nautilus-application.c:435
+#: src/nautilus-application.c:445
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
 "attempting to register the file manager view server."
@@ -7603,7 +8485,7 @@ msgstr ""
 "OAF-a, ko se je posku¹alo registrirati stre¾nik pogleda upravljalnika "
 "datotek."
 
-#: src/nautilus-application.c:453
+#: src/nautilus-application.c:463
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
 "attempting to locate the factory.Killing oafd and restarting Nautilus may "
@@ -7613,7 +8495,7 @@ msgstr ""
 "OAF-a, ko se je posku¹alo najti tovarno. Ubitje oafd-ja in vnovièen "
 "zagonNautilusa lahko morda odpravita problem."
 
-#: src/nautilus-application.c:460
+#: src/nautilus-application.c:470
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
 "attempting to locate the shell object. Killing oafd and restarting Nautilus "
@@ -7623,7 +8505,7 @@ msgstr ""
 "OAF-a, ko je posku¹al najti predmet ¹koljke. Ubitje oafd-ja in vnovièen "
 "zagon Nautilusa lahko morda odpravita problem."
 
-#: src/nautilus-application.c:625
+#: src/nautilus-application.c:635
 msgid ""
 "You are about to run Nautilus as root.\n"
 "\n"
@@ -7635,10 +8517,6 @@ msgstr ""
 "Kot administrator lahko, èe niste pazljivi, po¹kodujete sistem in\n"
 "Nautilus vam tega ne bo posku¹al prepreèiti."
 
-#: src/nautilus-application.c:629
-msgid "Quit"
-msgstr "Izhod"
-
 #: src/nautilus-bookmarks-window.c:127
 msgid "Bookmarks"
 msgstr "Zaznamki"
@@ -7647,7 +8525,7 @@ msgstr "Zaznamki"
 msgid "Location"
 msgstr "Lokacija"
 
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:725
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Odstrani"
 
@@ -7664,12 +8542,13 @@ msgstr "Manj mo¾nosti"
 msgid "Find Them!"
 msgstr "Poi¹èi jih!"
 
-#: src/nautilus-first-time-druid.c:174
+#: src/nautilus-first-time-druid.c:191
+#, fuzzy
 msgid ""
-"Existence of this file indicates that the Nautilus configuration wizard\n"
+"Existence of this file indicates that the Nautilus configuration druid\n"
 "has been presented.\n"
 "\n"
-"You can manually erase this file to present the wizard again.\n"
+"You can manually erase this file to present the druid again.\n"
 "\n"
 msgstr ""
 "Obstoj te datoteke ka¾e, da je bil  Nautilus nastavitveni èarovnik\n"
@@ -7678,237 +8557,268 @@ msgstr ""
 "To datoteko lahko roèno zbri¹ete, èe ¾elite vnovièno pojavitev èarovnika.\n"
 "\n"
 
-#: src/nautilus-first-time-druid.c:248 src/nautilus-first-time-druid.c:511
-msgid "Eazel Services"
-msgstr "Storitve Eazel"
-
-#: src/nautilus-first-time-druid.c:439
+#: src/nautilus-first-time-druid.c:487
+#, fuzzy
 msgid ""
-"User levels provide a way to adjust the software to your\n"
-"level of technical expertise. Pick an initial level that you\n"
-"feel comfortable with; you can always change it later."
+"Your user level adjusts Nautilus to your degree of experience\n"
+"using GNOME and Linux. Choose a level that's comfortable for\n"
+"you - you can always change it later."
 msgstr ""
 "Uporabni¹ke stopnje nudijo naèin kako prilagoditi programje\n"
 "va¹i stopnji tehniènega znanja. Izberite zaèetno stopnjo;\n"
 "vedno jo lahko kasneje spremenite."
 
-#: src/nautilus-first-time-druid.c:452
+#: src/nautilus-first-time-druid.c:498
 msgid ""
-"For beginner users that are not yet\n"
-"familiar with the working of GNOME and Linux."
+"For users who have no previous experience with GNOME\n"
+"and Linux."
 msgstr ""
-"Za zaèetnike, ki ¹e niso domaèi z delom \n"
-"v GNOMEu in Linuxu."
 
-#: src/nautilus-first-time-druid.c:459
+#: src/nautilus-first-time-druid.c:504
+#, fuzzy
 msgid ""
-"For non-technical users that are comfortable with\n"
-"their GNOME and Linux environment."
+"For users who are comfortable with GNOME and Linux,\n"
+"but don't describe themselves as ``technical.''"
 msgstr ""
 "Za ne-tehniène uporabnike, ki so domaèi z delom \n"
 "v GNOME in Linux okolju."
 
-#: src/nautilus-first-time-druid.c:465
+#: src/nautilus-first-time-druid.c:510
+#, fuzzy
 msgid ""
-"For users that have the need to be exposed\n"
-"to every detail of their operating system."
+"For users who have GNOME and Linux experience, and\n"
+"like to see every detail of the operating system."
 msgstr ""
 "Za uporabnike, ki potrebujejo dostop do vsake \n"
 "podrobnosti operacijskega sistema."
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:500
-msgid ""
-"Eazel offers a growing number of services to help you\n"
-"install and maintain new software and manage your files\n"
-"across the network.  Choose an option below, and the\n"
-"information will be presented in Nautilus after you've\n"
-"finished setting up."
-msgstr ""
-"Eazel ponuja vse veè storitev, ki vam pomagajo namestiti\n"
-"in vzdr¾evati novo programje ter upravljati z datotekami\n"
-"preko mre¾e.  Izberite mo¾nosti spodaj in podatki\n"
-"bodo dostopni v Nautilusu, ko boste konèali z\n"
-"nastavljanjem."
-
-#: src/nautilus-first-time-druid.c:520
-msgid "I want to learn more about Eazel services."
-msgstr "®elim izvedeti veè o storitvah Eazel."
-
-#: src/nautilus-first-time-druid.c:522
-msgid "I want to sign up for Eazel services now."
-msgstr "®elim se naroèiti na storitve Eazel."
-
-#: src/nautilus-first-time-druid.c:524
-msgid "I've already signed up and want to login now."
-msgstr "Na storitve sem se ¾e naroèil in se sedaj ¾elim prijaviti."
-
-#: src/nautilus-first-time-druid.c:526
-msgid "I don't want to learn about Eazel services at this time."
-msgstr "Trenutno ne ¾elim podatkov o storitvah Eazel."
-
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:553
+#: src/nautilus-first-time-druid.c:548
 msgid ""
-"Nautilus will now contact Eazel services to quickly verify \n"
-"your web connection and download the latest updates. \n"
+"To verify your Internet connection and make sure you have\n"
+"the latest Nautilus updates, Nautilus will now connect to\n"
+"Eazel's web site. This will take seconds if your copy of\n"
+"Nautilus is recent; longer (but no more than a minute or two)\n"
+"if you need an update.\n"
 "\n"
-"If you know your computer uses a proxy connection, \n"
-"click Yes and Nautilus will use it. \n"
-"\n"
-"Click the Next button to continue."
+"If you know your computer uses a proxy connection, click\n"
+"Verify and Nautilus will use it.\n"
 msgstr ""
-"Nautilus se bo sedaj povezal s storitvami Eazel,\n"
-"hitro preveril va¹o spletno povezavo in prenesel najnovej¹e posodobitve. \n"
-"\n"
-"Èe veste, da va¹ raèunalnik uporablja posredovano povezavo, \n"
-"kliknite Da in Nautilus jo bo uporabil. \n"
-"\n"
-"Za nadaljevanje kliknite gumb \"Naprej\"."
-
-#: src/nautilus-first-time-druid.c:559
-msgid "Updating Nautilus"
-msgstr "Nadgrajujem Nautilus"
 
-#: src/nautilus-first-time-druid.c:567
-msgid "Yes, verify my connection and update Nautilus now."
+#: src/nautilus-first-time-druid.c:562
+#, fuzzy
+msgid "Verify my connection and check for updates"
 msgstr "Da, sedaj preveri mojo povezavo in posodobiti Nautilusa."
 
-#: src/nautilus-first-time-druid.c:568
-msgid "No, don't contact Eazel services at this time."
-msgstr "Ne, trenutno se ne ¾elim povezati s storitvami Eazel."
+#: src/nautilus-first-time-druid.c:563
+#, fuzzy
+msgid "Don't verify my connection or check for updates"
+msgstr "Da, sedaj preveri mojo povezavo in posodobiti Nautilusa."
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:630
+#: src/nautilus-first-time-druid.c:628
+#, fuzzy
 msgid ""
-"We are having troubles making an external web connection.  \n"
-"Sometimes, firewalls require you to specify a web proxy server.  \n"
-" Fill in the name of port of your proxy server, if any, below."
+"We are having trouble making an external web connection.\n"
+"Sometimes, firewalls require you to specify a web proxy server.\n"
+"Fill in the name or port of your proxy server, if any, below."
 msgstr ""
 "Imamo te¾ave z vzpostavljanjem spletne povezave navzven.  \n"
 "Vèasih po¾arni zidovi zahtevajo navedbo spletnega posrednika.  \n"
 " Vpi¹ite ime in vrata va¹ega spletnega posrednika, èe ga imate:."
 
-#: src/nautilus-first-time-druid.c:635
-msgid "HTTP Proxy Configuration"
-msgstr "Nastavitev HTTP posrednika"
-
-#: src/nautilus-first-time-druid.c:647
+#: src/nautilus-first-time-druid.c:640
 msgid "No proxy server required."
 msgstr "Spletni posrednik ni potreben."
 
-#: src/nautilus-first-time-druid.c:648
+#: src/nautilus-first-time-druid.c:641
 msgid "Use this proxy server:"
 msgstr "Uporabi spletnega posrednika:"
 
 #. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:673
+#: src/nautilus-first-time-druid.c:666
 msgid "Proxy address:"
 msgstr "Naslov posrednika:"
 
-#. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:690
-msgid "Port:"
-msgstr "Vrata:"
-
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:732
-msgid ""
-"We are now contacting the Eazel service to test your \n"
-"web connection and update Nautilus."
+#: src/nautilus-first-time-druid.c:728
+msgid "Verifying your Internet connection and checking for updates..."
 msgstr ""
-"Sedaj vzpostavljamo povezavo s storitvami Eazel, preverjamo \n"
-"va¹o spletno povezavo in posodabljamo Nautilusa."
 
-#: src/nautilus-first-time-druid.c:738
+#: src/nautilus-first-time-druid.c:736
 msgid "Downloading Nautilus updates..."
 msgstr "Prena¹am posodobitev Natuilusa..."
 
-#: src/nautilus-first-time-druid.c:884
-msgid "Use Nautilus to draw desktop."
+#: src/nautilus-first-time-druid.c:906
+msgid ""
+"If you have been using the GNOME Midnight Commander\n"
+"these settings move your desktop icons to Nautilus and\n"
+"make Nautilus the default desktop.\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:913
+#, fuzzy
+msgid "Use Nautilus to draw the desktop."
 msgstr "Uporabi Nautilus za risanje namizja"
 
-#: src/nautilus-first-time-druid.c:889
-msgid "Transfer GMC desktop icons to Nautilus desktop."
+#: src/nautilus-first-time-druid.c:919
+#, fuzzy
+msgid "Move existing desktop icons to the Nautilus desktop."
 msgstr "Prenesi namizne ikone GMC v Nautilusovo namizje."
 
-#: src/nautilus-first-time-druid.c:894
-msgid "Launch Nautilus at Gnome session startup."
+#. This option is currently disabled, per bugzilla.eazel.com 7557
+#: src/nautilus-first-time-druid.c:927
+#, fuzzy
+msgid "Launch Nautilus when GNOME starts up."
 msgstr "Ob zaèetku seje GNOME po¾eni Nautilusa."
 
-#: src/nautilus-first-time-druid.c:944
+#: src/nautilus-first-time-druid.c:967
+msgid ""
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties.  The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+"Fast search requires that the cron daemon on your system be running.\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:972
+msgid ""
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties. The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:981
+msgid "Enable fast search"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:982
+msgid "Turn fast search on when cron is enabled"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1027
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"currently can't be performed because the program crond, which does\n"
+"nightly tasks on your computer, is turned off. To make sure fast searches\n"
+"can be done, turn crond on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands \n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1035
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"may not be performed because the program crond, which does nightly tasks\n"
+"on your computer, may be turned off. To make sure fast searches can be\n"
+"done, check to make sure that crond is turned on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands\n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1122
+msgid ""
+"Click Finish to launch Nautilus. You'll start with two\n"
+"Nautilus windows: one shows your home folder, and the\n"
+"other tells you about Eazel's services that make the life\n"
+"of a Linux user easier.\n"
+"\n"
+"We hope you enjoy Nautilus!"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1129
+msgid ""
+"Click Finish to launch Nautilus. You'll start with a\n"
+"window showing your home folder.\n"
+"\n"
+"We hope you enjoy Nautilus!"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1153
 msgid "Nautilus First Time Setup"
 msgstr "Nastavitev Nautilusa ob prvem zagonu"
 
-#. make the title label
-#: src/nautilus-first-time-druid.c:974
-msgid "Welcome to Nautilus!"
+#: src/nautilus-first-time-druid.c:1183
+#, fuzzy
+msgid "Welcome to Nautilus"
 msgstr "Dobrodo¹li v Nautilus!"
 
-#: src/nautilus-first-time-druid.c:982
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
-"Since this is the first time that you've launched\n"
-"Nautilus, we'd like to ask you a few questions\n"
-"to help personalize it for your use."
+"Nautilus...\n"
+"    Is a great file manager for the GNOME desktop.\n"
+"    Provides a simple intuitive way to access Internet services.\n"
+"    Is an extensible framework for GNOME developers.\n"
+"    Provides a powerful delivery platform for service providers.\n"
+"\n"
+"Click Next to begin customizing your Nautilus environment."
 msgstr ""
-"Ker je to va¹ prvi zagon Nautilusa,\n"
-"vam ¾elimo zastaviti nekaj vpra¹anj,\n"
-"ki bodo pomagala prilagoditi ga va¹i uporabi."
-
-#: src/nautilus-first-time-druid.c:987
-msgid "Press the next button to continue."
-msgstr "Za nadaljevanje kliknite gumb \"Naprej\"."
 
 #. set up the final page
-#: src/nautilus-first-time-druid.c:995
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "Konèano"
 
-#: src/nautilus-first-time-druid.c:1002
-msgid ""
-"Click the finish button to launch Nautilus.\n"
-"We hope that you enjoy using it!"
-msgstr ""
-"Kliknite gumb \"Konèano\" za zagon Nautilusa.\n"
-"Upamo, da vam bo uporaba prijala!"
-
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1008
-msgid "Select A User Level"
+#: src/nautilus-first-time-druid.c:1209
+#, fuzzy
+msgid "Choose Your User Level"
 msgstr "Izberite uporabni¹ki nivo"
 
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1012
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr "Prehod iz GMC v Nautilusa"
 
-#. set up the service sign-up page
-#: src/nautilus-first-time-druid.c:1016
-msgid "Sign Up for Eazel Services"
-msgstr "Naroèi se na storitve Eazel"
+#. set up the `Launch Medusa' page
+#: src/nautilus-first-time-druid.c:1217
+#, fuzzy
+msgid "Fast Searches"
+msgstr "Iskanje"
+
+#. set up optional page to tell the user how to run cron
+#: src/nautilus-first-time-druid.c:1225
+msgid "The Cron Daemon"
+msgstr ""
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1020
-msgid "Nautilus Update"
-msgstr "Posodobitev Nautilusa"
+#: src/nautilus-first-time-druid.c:1230
+msgid "Checking Your Internet Connection"
+msgstr ""
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1028
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "Posodabljam Nautilus..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1036
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "Nastavitev spletnega posrednika"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1108
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "Dekodiram posodobitev..."
 
-#: src/nautilus-first-time-druid.c:1125
-msgid "Update Completed... Press Next to Continue."
+#: src/nautilus-first-time-druid.c:1341
+#, fuzzy
+msgid "Update Complete. Click Next to Continue."
+msgstr "Posodobitev konèana... Za nadaljevanje pritisnite \"Naprej\"."
+
+#. The update file couldn't be loaded because it
+#. * doesn't exist. Arlo and I (jsh) and decided that the
+#. * best thing to do is silently fail
+#.
+#: src/nautilus-first-time-druid.c:1356
+#, fuzzy
+msgid "No Update Available... Press Next to Continue."
 msgstr "Posodobitev konèana... Za nadaljevanje pritisnite \"Naprej\"."
 
 #. set the window title
@@ -7921,10 +8831,6 @@ msgstr "Mno¾ice povezav"
 msgid "Add or remove sets of links by clicking on the checkboxes below."
 msgstr "Dodaj ali odstrani mno¾ice povezav."
 
-#: src/nautilus-location-bar.c:62
-msgid "Location:"
-msgstr "Lokacija:"
-
 #: src/nautilus-location-bar.c:63
 msgid "Go To:"
 msgstr "Pojdi na:"
@@ -7938,235 +8844,244 @@ msgstr "®elite pogledati teh %d lokacij v loèenih oknih?"
 msgid "View in Multiple Windows?"
 msgstr "Glej v veèih oknih?"
 
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr "Opravi hitra samo-preverjanja."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "Ustvari zaèetno okno s podano geometrijo."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "GEOMETRIJA"
 
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Ustvari le okna za eksplicitno navedene URIje."
 
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "Izhod iz Nautilusa."
 
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "Nov zagon Nautilusa."
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilsu: --check ne more biti uporabljen z URIji.\n"
 
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check ne mroe biti uporabljen z drugimi mo¾nostmi.\n"
 
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit ne more biti uporabljen z URIji.\n"
 
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart ne more biti uporabljen z URIji.\n"
 
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry ne more biti uporabljen z veè kot enim URIjem.\n"
 
 #. set the title and standard close accelerator
-#: src/nautilus-property-browser.c:263
+#: src/nautilus-property-browser.c:265
 msgid "Backgrounds and Emblems"
 msgstr "Ozadja in emblemi"
 
-#: src/nautilus-property-browser.c:359 src/nautilus-theme-selector.c:266
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:362 src/nautilus-theme-selector.c:267
 msgid "  Done  "
 msgstr "  Opravljeno  "
 
-#: src/nautilus-property-browser.c:369
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:373
 msgid "  Add new...  "
 msgstr "  Dodaj novo...  "
 
-#: src/nautilus-property-browser.c:383
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:388
 msgid "  Remove...  "
 msgstr "  Odstrani...  "
 
-#: src/nautilus-property-browser.c:874
+#: src/nautilus-property-browser.c:879
 #, c-format
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Vzorca %s ni mogoèe zbrisati."
 
-#: src/nautilus-property-browser.c:875 src/nautilus-property-browser.c:904
+#: src/nautilus-property-browser.c:880 src/nautilus-property-browser.c:909
 msgid "Couldn't delete pattern"
 msgstr "Nisem mogel zbrisati vzorca"
 
-#: src/nautilus-property-browser.c:903
+#: src/nautilus-property-browser.c:908
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Emblema %s ni mogoèe zbrisati."
 
-#: src/nautilus-property-browser.c:939
+#: src/nautilus-property-browser.c:944
 msgid "Create a New Emblem:"
 msgstr "Ustvari nov emblem:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:944
+#: src/nautilus-property-browser.c:949
 msgid "Keyword:"
 msgstr "Kljuèna beseda:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:957
+#: src/nautilus-property-browser.c:962
 msgid "Image:"
 msgstr "Slika:"
 
-#: src/nautilus-property-browser.c:961
+#: src/nautilus-property-browser.c:966
 msgid "Select an image file for the new emblem:"
 msgstr "Izberi slikovno datoteko za nov emblem:"
 
-#: src/nautilus-property-browser.c:988
+#: src/nautilus-property-browser.c:993
 msgid "Create a New Color:"
 msgstr "Ustvari novo barvo:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:993
+#: src/nautilus-property-browser.c:998
 msgid "Color name:"
 msgstr "Ime barve:"
 
-#: src/nautilus-property-browser.c:1004
+#: src/nautilus-property-browser.c:1009
 msgid "Color value:"
 msgstr "Vrednost barve:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1045
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "\"%s\" ni veljavno ime datoteke."
 
-#: src/nautilus-property-browser.c:1042
+#: src/nautilus-property-browser.c:1047
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Niste navedli veljavnega imena datoteke."
 
-#: src/nautilus-property-browser.c:1044 src/nautilus-property-browser.c:1087
+#: src/nautilus-property-browser.c:1049 src/nautilus-property-browser.c:1092
 msgid "Couldn't install pattern"
 msgstr "Nisem mogel namestiti vzorca"
 
-#: src/nautilus-property-browser.c:1055
+#: src/nautilus-property-browser.c:1060
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Ne morete zamenjati slike za ponovni zagon."
 
-#: src/nautilus-property-browser.c:1086
+#: src/nautilus-property-browser.c:1091
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Vzorca %s ni mogoèe namestiti."
 
-#: src/nautilus-property-browser.c:1109
+#: src/nautilus-property-browser.c:1114
 msgid "Select an image file to add as a pattern:"
 msgstr "Izberite slikovno datoteko, ki naj se doda kot vzorec:"
 
-#: src/nautilus-property-browser.c:1168
+#: src/nautilus-property-browser.c:1173
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Izbrati morate ime za novo barvo."
 
-#: src/nautilus-property-browser.c:1169
+#: src/nautilus-property-browser.c:1174
 msgid "Couldn't install color"
 msgstr "Nisem mogel namestiti barve"
 
-#: src/nautilus-property-browser.c:1225
+#: src/nautilus-property-browser.c:1230
 msgid "Select a color to add:"
 msgstr "Izberite barvo, ki naj se doda:"
 
-#: src/nautilus-property-browser.c:1306
+#: src/nautilus-property-browser.c:1311
 #, c-format
 msgid "Sorry, but '%s' is not a usable image file!"
 msgstr "'%s' ni uporabna datoteka s sliko!"
 
-#: src/nautilus-property-browser.c:1324
+#: src/nautilus-property-browser.c:1329
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Izbrati morate ime za nov emblem."
 
-#: src/nautilus-property-browser.c:1325 src/nautilus-property-browser.c:1328
-#: src/nautilus-property-browser.c:1332 src/nautilus-property-browser.c:1361
+#: src/nautilus-property-browser.c:1330 src/nautilus-property-browser.c:1333
+#: src/nautilus-property-browser.c:1337 src/nautilus-property-browser.c:1366
 msgid "Couldn't install emblem"
 msgstr "Nisem mogel namestiti emblema"
 
-#: src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1332
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "Ime emblema lahko vsebuje le èrke, presledke in ¹tevilke."
 
-#: src/nautilus-property-browser.c:1330
+#: src/nautilus-property-browser.c:1335
 #, c-format
 msgid ""
 "Sorry, but \"%s\" is an existing keyword.  Please choose a different name "
 "for it."
 msgstr "Ime emblema \"%s\" ¾e obstaja. Prosimo, izberite drugo ime. "
 
-#: src/nautilus-property-browser.c:1360
+#: src/nautilus-property-browser.c:1365
 #, c-format
 msgid "Sorry, but the image at %s couldn't be installed as an emblem."
 msgstr "Slika %s ne more biti name¹èena kot emblem."
 
-#: src/nautilus-property-browser.c:2012
+#: src/nautilus-property-browser.c:2024
 msgid "Select A Category:"
 msgstr "Izberi kategorijo:"
 
-#: src/nautilus-property-browser.c:2020 src/nautilus-theme-selector.c:494
+#: src/nautilus-property-browser.c:2032 src/nautilus-theme-selector.c:497
 msgid "Cancel Remove"
 msgstr "Preklièi odstranitev"
 
-#: src/nautilus-property-browser.c:2024
-msgid "  Add a new pattern  "
+#: src/nautilus-property-browser.c:2037
+#, fuzzy
+msgid "  Add a New Pattern  "
 msgstr "  Dodaj nov vzorec   "
 
-#: src/nautilus-property-browser.c:2027
-msgid "  Add a new color  "
+#: src/nautilus-property-browser.c:2040
+#, fuzzy
+msgid "  Add a New Color  "
 msgstr "  Dodaj novo barvo  "
 
-#: src/nautilus-property-browser.c:2030
-msgid "  Add a new emblem  "
+#: src/nautilus-property-browser.c:2043
+#, fuzzy
+msgid "  Add a New Emblem  "
 msgstr "  Dodaj nov emblem  "
 
-#: src/nautilus-property-browser.c:2053
+#: src/nautilus-property-browser.c:2066
 msgid "Click on a pattern to remove it"
 msgstr "Kliknte na vzorec za njegovo odstranitev"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2069
 msgid "Click on a color to remove it"
 msgstr "Kliknte na barvo za njeno odstranitev"
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2072
 msgid "Click on an emblem to remove it"
 msgstr "Kliknite na emblem za njegovo odstranitev"
 
-#: src/nautilus-property-browser.c:2068
+#: src/nautilus-property-browser.c:2081
 msgid "Patterns:"
 msgstr "Vzorci:"
 
-#: src/nautilus-property-browser.c:2071
+#: src/nautilus-property-browser.c:2084
 msgid "Colors:"
 msgstr "Barve:"
 
-#: src/nautilus-property-browser.c:2074
+#: src/nautilus-property-browser.c:2087
 msgid "Emblems:"
 msgstr "Emblemi:"
 
-#: src/nautilus-property-browser.c:2092
-msgid "  Remove a pattern  "
+#: src/nautilus-property-browser.c:2106
+#, fuzzy
+msgid "  Remove a Pattern  "
 msgstr "  Odstrani vzorec   "
 
-#: src/nautilus-property-browser.c:2095
-msgid "  Remove a color  "
+#: src/nautilus-property-browser.c:2109
+#, fuzzy
+msgid "  Remove a Color  "
 msgstr "  Odstrani barvo  "
 
-#: src/nautilus-property-browser.c:2098
-msgid "  Remove an emblem  "
+#: src/nautilus-property-browser.c:2112
+#, fuzzy
+msgid "  Remove an Emblem  "
 msgstr "  Odstrani emblem   "
 
 #. Menu item in the search bar.
@@ -8325,41 +9240,33 @@ msgid "[File owner] is not [root]"
 msgstr "[Lastnik datoteke] ni [root]"
 
 #: src/nautilus-service-ui.xml.h:1
-msgid "Display support information for Eazel Services"
-msgstr "Ka¾i podporne podatke za storitve Eazel"
-
-#: src/nautilus-service-ui.xml.h:2
 msgid "Go to the Eazel Services Summary Page"
 msgstr "Pojdi na povzetek strani storitev Eazel"
 
-#: src/nautilus-service-ui.xml.h:3
+#: src/nautilus-service-ui.xml.h:2
 msgid "Go to the Eazel Software Catalog"
 msgstr "Pojdi na katalog programske opreme Eazel"
 
-#: src/nautilus-service-ui.xml.h:4
+#: src/nautilus-service-ui.xml.h:3
 msgid "Go to your online storage repository"
 msgstr "Pojdi v va¹o internetno shrambo"
 
-#: src/nautilus-service-ui.xml.h:6
+#: src/nautilus-service-ui.xml.h:5
 msgid "Software _Catalog"
 msgstr "_Katalog programske opreme"
 
-#: src/nautilus-service-ui.xml.h:7
+#: src/nautilus-service-ui.xml.h:6
 msgid "_Eazel Services Home"
 msgstr "Dom storitev _Eazel"
 
-#: src/nautilus-service-ui.xml.h:8
+#: src/nautilus-service-ui.xml.h:7
 msgid "_Online Storage"
 msgstr "_Internetna shramba"
 
-#: src/nautilus-service-ui.xml.h:9
+#: src/nautilus-service-ui.xml.h:8
 msgid "_Services"
 msgstr "_Storitve"
 
-#: src/nautilus-service-ui.xml.h:10
-msgid "_Support"
-msgstr "_Podpora"
-
 #: src/nautilus-shell.c:188
 msgid "Caveat"
 msgstr ""
@@ -8394,18 +9301,28 @@ msgid "Icons"
 msgstr "Ikone"
 
 #: src/Nautilus_shell.oaf.in.h:3
+#, fuzzy
+msgid "Icons Viewer"
+msgstr "Pregledovalnik %s"
+
+#: src/Nautilus_shell.oaf.in.h:4
 msgid "List"
 msgstr "Seznam"
 
-#: src/Nautilus_shell.oaf.in.h:4
+#: src/Nautilus_shell.oaf.in.h:5
+#, fuzzy
+msgid "List Viewer"
+msgstr "Pregledovalnik %s"
+
+#: src/Nautilus_shell.oaf.in.h:6
 msgid "Nautilus factory"
 msgstr "Tovarna Nautilusa"
 
-#: src/Nautilus_shell.oaf.in.h:5
+#: src/Nautilus_shell.oaf.in.h:7
 msgid "Nautilus file manager component that shows a scrollable list"
 msgstr "Komponenta Nautilusovega upravljalnika datotek, ki ka¾e drsni seznam"
 
-#: src/Nautilus_shell.oaf.in.h:6
+#: src/Nautilus_shell.oaf.in.h:8
 msgid ""
 "Nautilus file manager component that shows a scrollable list for search "
 "results"
@@ -8413,42 +9330,42 @@ msgstr ""
 "Komponenta Nautilusovega upravljalnika datotek, ki ka¾e drsni seznam za "
 "zadetke iskanja"
 
-#: src/Nautilus_shell.oaf.in.h:7
+#: src/Nautilus_shell.oaf.in.h:9
 msgid "Nautilus file manager component that shows a two-dimensional icon space"
 msgstr ""
 "Komponenta Nautilusovega upravljalnika datotek, ki ka¾e dvodimenzionalni "
 "ikonski prostor"
 
-#: src/Nautilus_shell.oaf.in.h:8
+#: src/Nautilus_shell.oaf.in.h:10
 msgid "Nautilus file manager component that shows icons on the the desktop"
 msgstr ""
 "Komponenta Nautilusovega upravljalnika datotek, ki ka¾e ikone na namizju"
 
-#: src/Nautilus_shell.oaf.in.h:9
+#: src/Nautilus_shell.oaf.in.h:11
 msgid "Nautilus file manager desktop icon view"
 msgstr "Ikonski pogled namizja Nautilusovega upravljalnika datotek"
 
-#: src/Nautilus_shell.oaf.in.h:10
+#: src/Nautilus_shell.oaf.in.h:12
 msgid "Nautilus file manager icon view"
 msgstr "Ikonski pogled Nautilusovega upravljalnika datotek"
 
-#: src/Nautilus_shell.oaf.in.h:11
+#: src/Nautilus_shell.oaf.in.h:13
 msgid "Nautilus file manager list view"
 msgstr "Seznamski pogled nautilusovega upravljalnika datotek"
 
-#: src/Nautilus_shell.oaf.in.h:12
+#: src/Nautilus_shell.oaf.in.h:14
 msgid "Nautilus file manager search results list view"
 msgstr "Seznamski pogled zadetkov iskanja Nautilusovega upravljalnika datotek"
 
-#: src/Nautilus_shell.oaf.in.h:13
+#: src/Nautilus_shell.oaf.in.h:15
 msgid "Nautilus metafile factory"
 msgstr "Tovarna Nautilusovih meta datotek"
 
-#: src/Nautilus_shell.oaf.in.h:14
+#: src/Nautilus_shell.oaf.in.h:16
 msgid "Nautilus shell"
 msgstr "Natuilusova ¹koljka"
 
-#: src/Nautilus_shell.oaf.in.h:15
+#: src/Nautilus_shell.oaf.in.h:17
 msgid ""
 "Nautilus shell operations that can be done from subsequent command-line "
 "invocations"
@@ -8456,24 +9373,37 @@ msgstr ""
 "Operacije Nautilusove ¹koljke, ki so lahko izvedene z veèimi izvr¹bami "
 "ukazne vrstice"
 
-#: src/Nautilus_shell.oaf.in.h:16
+#: src/Nautilus_shell.oaf.in.h:18
 msgid "Produces metafile objects for accessing Nautilus metadata"
 msgstr "Ustvari predmete meta datotek za dostop do Nautilusovih meta datotek"
 
-#: src/Nautilus_shell.oaf.in.h:17
+#: src/Nautilus_shell.oaf.in.h:19
 msgid "Search List"
 msgstr "Seznam iskanja"
 
+#: src/Nautilus_shell.oaf.in.h:20
+#, fuzzy
+msgid "View as Icons"
+msgstr "Poglej kot %s"
+
+#: src/Nautilus_shell.oaf.in.h:21
+#, fuzzy
+msgid "View as List"
+msgstr "Poglej kot %s"
+
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+#, fuzzy
+msgid " _Advanced"
 msgstr " Napredna"
 
 #: src/nautilus-shell-ui.xml.h:2
-msgid " Beginner"
+#, fuzzy
+msgid " _Beginner"
 msgstr " Zaèetna"
 
 #: src/nautilus-shell-ui.xml.h:3
-msgid " Intermediate"
+#, fuzzy
+msgid " _Intermediate"
 msgstr " Vmesna"
 
 #: src/nautilus-shell-ui.xml.h:4
@@ -8493,7 +9423,8 @@ msgid "Change the visibility of this window's status bar"
 msgstr "Spremeni vidnost vrstice stanja v tem oknu"
 
 #: src/nautilus-shell-ui.xml.h:9
-msgid "Change the visibility of this window's tool bar"
+#, fuzzy
+msgid "Change the visibility of this window's toolbar"
 msgstr "Spremeni vidnost vrstice orodij v tem oknu"
 
 #: src/nautilus-shell-ui.xml.h:10
@@ -8513,35 +9444,42 @@ msgid "Close this window"
 msgstr "Zapri to okno"
 
 #: src/nautilus-shell-ui.xml.h:15
-msgid "Cut _Text"
-msgstr "Izre¾i _besedilo"
-
-#: src/nautilus-shell-ui.xml.h:17
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "Ka¾i okno, ki omogoèa urejanje zaznamkov v tem menuju"
 
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr "Ka¾i zahvale avtorjem Nautilusa"
 
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr "Ka¾i Nautilusovo spletno pomoè"
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
 msgstr ""
 "Ka¾i vzorce, barve in embleme, ki se jih lahko uporabi za prikrojitev izgleda"
 
+#: src/nautilus-shell-ui.xml.h:19
+#, fuzzy
+msgid "Display quick reference pages for Nautilus"
+msgstr "Ka¾i Nautilusovo licenco"
+
+#: src/nautilus-shell-ui.xml.h:20
+#, fuzzy
+msgid "Display release notes for Nautilus"
+msgstr "Ka¾i Nautilusovo licenco"
+
 #: src/nautilus-shell-ui.xml.h:21
-msgid "Display the latest contents of the current location"
-msgstr "Ka¾i zadnjo vsebino trenutne lokacije"
+#, fuzzy
+msgid "Display support information for Nautilus and Eazel Services"
+msgstr "Ka¾i podporne podatke za storitve Eazel"
 
 #: src/nautilus-shell-ui.xml.h:22
-msgid "Display the license for Nautilus"
-msgstr "Ka¾i Nautilusovo licenco"
+msgid "Display the latest contents of the current location"
+msgstr "Ka¾i zadnjo vsebino trenutne lokacije"
 
 #: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
@@ -8579,50 +9517,62 @@ msgstr "Pojdi na naslednjo obiskano lokacijo"
 msgid "Go to the previous visited location"
 msgstr "Pojdi na prej¹njo obiskano lokacijo"
 
-#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:434
-msgid "Hide Location Bar"
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
+#, fuzzy
+msgid "Hide Location _Bar"
 msgstr "Skrij vrstico lokacije"
 
-#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:422
-msgid "Hide Sidebar"
-msgstr "Skrij stranski pult"
-
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:416
-msgid "Hide Status Bar"
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
+#, fuzzy
+msgid "Hide St_atus Bar"
 msgstr "Skrij vrstico stanja"
 
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:428
-msgid "Hide Tool Bar"
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
+#, fuzzy
+msgid "Hide _Sidebar"
+msgstr "Skrij stranski pult"
+
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
+#, fuzzy
+msgid "Hide _Toolbar"
 msgstr "Skrij orodjarno"
 
 #: src/nautilus-shell-ui.xml.h:37
-msgid "Nautilus _License"
-msgstr "Nautilusova _licenca"
+#, fuzzy
+msgid "Nautilus Quick _Reference"
+msgstr "Nastavitve Nautilusa"
 
 #: src/nautilus-shell-ui.xml.h:38
+#, fuzzy
+msgid "Nautilus Release _Notes"
+msgstr "Nastavitve Nautilusa"
+
+#: src/nautilus-shell-ui.xml.h:39
+#, fuzzy
+msgid "Nautilus User _Manual"
+msgstr "_Nautilusov uporabni¹ki priroènik"
+
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "Novo okno"
 
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:41
+#, fuzzy
+msgid "New _Window"
+msgstr "Novo okno"
+
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "Obièajna velikost"
 
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Odpri ¹e eno Nautilusovo okno za prikazano lokacijo"
 
-#: src/nautilus-shell-ui.xml.h:42
-msgid "Preferences..."
-msgstr "Nastavitve..."
-
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "Osve¾i"
 
-#: src/nautilus-shell-ui.xml.h:44
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "Odstrani izbrano besedilo brez, da bi ga dal na odlo¾i¹èe"
-
 #: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr "Poroèaj o profiliranju"
@@ -8639,7 +9589,7 @@ msgstr "I¹èi po svetovnem spletu"
 msgid "Search this computer for files"
 msgstr "I¹èi po raèunalniku za datotekami"
 
-#: src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
@@ -8647,187 +9597,197 @@ msgstr ""
 "Ka¾i stran kjer lahko po¹ljete povratne podatke o Nautilusu in storitvah "
 "Eazel"
 
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "Ka¾i vsebino ob normalni velikosti"
 
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "Ka¾i vsebino manj podrobno"
 
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "Ka¾i vsebino podrobneje"
 
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr "Zaèni profilirati"
 
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr "Ustavi profiliranje"
 
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr "Ustavi nalaganje te lokacije"
 
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "Razveljavi zadnjo spremembo besedila"
 
-#: src/nautilus-shell-ui.xml.h:58
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "Gor"
 
-#: src/nautilus-shell-ui.xml.h:59
-msgid "Use Advanced settings"
-msgstr "Uporabi napredne nastavitve"
-
 #: src/nautilus-shell-ui.xml.h:60
-msgid "Use Beginner settings"
-msgstr "Uporabi zaèetne nastavitve"
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:61
-msgid "Use Intermediate settings"
-msgstr "Uporabi vmesne nastavitve"
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:63
+#, fuzzy
+msgid "We_b Search"
+msgstr "Spletno iskanje"
+
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "Spletno iskanje"
 
-#: src/nautilus-shell-ui.xml.h:63
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "Poveèaj"
 
-#: src/nautilus-shell-ui.xml.h:64
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "Pomanj¹aj"
 
-#: src/nautilus-shell-ui.xml.h:65
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "Po_veèaj"
 
-#: src/nautilus-shell-ui.xml.h:66
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "Po_manj¹aj"
 
-#: src/nautilus-shell-ui.xml.h:67
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "_O Nautilusu..."
 
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "_Dodaj zaznamek"
 
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "Na_zaj"
 
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr "O_zadja in emblemi..."
 
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "_Zaznamki"
 
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "_Zapri okno"
 
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:76
+#, fuzzy
+msgid "_Customer Support"
+msgstr "_Podpora"
+
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "_Uredi zaznamke..."
 
-#: src/nautilus-shell-ui.xml.h:76
-msgid "_Feedback..."
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "Nastavitve..."
+
+#: src/nautilus-shell-ui.xml.h:80
+#, fuzzy
+msgid "_Feedback"
 msgstr "_Povratni podatki..."
 
-#: src/nautilus-shell-ui.xml.h:78 src/nautilus-window-menus.c:1280
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "_Poi¹èi"
 
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "Na_prej"
 
-#: src/nautilus-shell-ui.xml.h:80
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "_Pojdi"
 
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "_Pomoè"
 
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "_Dom"
 
-#: src/nautilus-shell-ui.xml.h:83
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "Lokacija"
+
+#: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr "_Natuilusove teme..."
 
-#: src/nautilus-shell-ui.xml.h:84
-msgid "_Nautilus User Manual"
-msgstr "_Nautilusov uporabni¹ki priroènik"
-
-#: src/nautilus-shell-ui.xml.h:85
-msgid "_New Window"
-msgstr "_Novo okno"
-
-#: src/nautilus-shell-ui.xml.h:86
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "_Obièajna velikost"
 
-#: src/nautilus-shell-ui.xml.h:88
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "Nastavitve"
+
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr "_Profiler"
 
-#: src/nautilus-shell-ui.xml.h:89
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "_Osve¾i"
 
-#: src/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr "_Poroèaj o profiliranju"
 
-#: src/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr "_Ponastavi profiliranje"
 
-#: src/nautilus-shell-ui.xml.h:92
-msgid "_Select All"
-msgstr "_Izberi vse"
-
-#: src/nautilus-shell-ui.xml.h:93
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr "_Zaèni profiliranje"
 
-#: src/nautilus-shell-ui.xml.h:94
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr "_Ustavi profiliranje"
 
-#: src/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "_Razveljavi"
 
-#: src/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "Stopnjo navz_gor"
 
-#: src/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "_Pogled"
 
-#: src/nautilus-shell-ui.xml.h:98
-msgid "_Web Search"
-msgstr "_Spletno iskanje"
-
-#: src/nautilus-sidebar.c:663
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -8835,11 +9795,11 @@ msgstr ""
 "Ne morete prirediti veè kot eno prikrojeno ikono naenkrat! Prosim spustite "
 "le eno sliko za nastavitev ikone po meri."
 
-#: src/nautilus-sidebar.c:665
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "Veè kot ena slika"
 
-#: src/nautilus-sidebar.c:684
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -8847,11 +9807,11 @@ msgstr ""
 "Datoteka, ki ste jo spustili ni krajevna. Kot prikrojene ikone lahko "
 "uporabljate le krajevne slike."
 
-#: src/nautilus-sidebar.c:686
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "Le krajevne slike"
 
-#: src/nautilus-sidebar.c:691
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -8859,21 +9819,22 @@ msgstr ""
 "Datoteka, ki ste jo spustili ni slika. Kot prikorjene ikone lahko "
 "uporabljate le krajevne slike."
 
-#: src/nautilus-sidebar.c:693
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "Le slike"
 
-#: src/nautilus-sidebar.c:1251
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "Odpri z %s"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1287
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "Odpri z..."
 
-#: src/nautilus-sidebar.c:1393
+#. FIXME: We don't use spaces to pad labels!
+#: src/nautilus-sidebar.c:1424
 msgid "  Empty Trash  "
 msgstr "  Sprazni Smeti  "
 
@@ -8891,41 +9852,45 @@ msgstr "Nautilusov izbirnik tem"
 msgid "Nautilus Theme:"
 msgstr "Natuilusova tema:"
 
-#: src/nautilus-theme-selector.c:276
-msgid "  Add new theme  "
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:278
+#, fuzzy
+msgid "  Add New Theme  "
 msgstr "  Dodaj novo temo "
 
-#: src/nautilus-theme-selector.c:285
-msgid "  Remove theme  "
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:288
+#, fuzzy
+msgid "  Remove Theme  "
 msgstr "  Odstran temo  "
 
-#: src/nautilus-theme-selector.c:397
+#: src/nautilus-theme-selector.c:400
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid theme folder."
 msgstr "\"%s\" ni veljavna mapa tem."
 
-#: src/nautilus-theme-selector.c:398
+#: src/nautilus-theme-selector.c:401
 msgid "Couldn't add theme"
 msgstr "Nisem mogel dodati teme"
 
-#: src/nautilus-theme-selector.c:426
+#: src/nautilus-theme-selector.c:429
 #, c-format
 msgid "Sorry, but the \"%s\" theme couldn't be installed."
 msgstr "Teme \"%s\" ni bilo mogoèe namestiti."
 
-#: src/nautilus-theme-selector.c:427
+#: src/nautilus-theme-selector.c:430
 msgid "Couldn't install theme"
 msgstr "Nisem mogel namestiti teme"
 
-#: src/nautilus-theme-selector.c:460
+#: src/nautilus-theme-selector.c:463
 msgid "Select a theme folder to add as a new theme:"
 msgstr "Izberite mapo s temo, ki naj se doda kot nova tema:"
 
-#: src/nautilus-theme-selector.c:492 src/nautilus-theme-selector.c:539
+#: src/nautilus-theme-selector.c:495 src/nautilus-theme-selector.c:542
 msgid "Click on a theme to remove it."
 msgstr "Kliknite na temo za njeno odstranitev."
 
-#: src/nautilus-theme-selector.c:542
+#: src/nautilus-theme-selector.c:545
 msgid ""
 "Click on a theme to change the\n"
 "appearance of Nautilus."
@@ -8934,11 +9899,11 @@ msgstr ""
 "Nautilusovega izgleda."
 
 #. change the add button label back to it's normal state
-#: src/nautilus-theme-selector.c:555
+#: src/nautilus-theme-selector.c:558
 msgid "Add New Theme"
 msgstr "Dodaj novo temo"
 
-#: src/nautilus-theme-selector.c:582
+#: src/nautilus-theme-selector.c:585
 msgid ""
 "Sorry, but you can't remove the current theme. Please change to another "
 "theme before removing this one."
@@ -8946,29 +9911,34 @@ msgstr ""
 "Trenutne teme ne morete odstraniti. Spremenite temo pred odstranjevanjem "
 "trenutne."
 
-#: src/nautilus-theme-selector.c:584
+#: src/nautilus-theme-selector.c:587
 msgid "Can't delete current theme"
 msgstr "Ne morem izbrisati trenutne teme"
 
-#: src/nautilus-theme-selector.c:605
+#: src/nautilus-theme-selector.c:608
 msgid "Sorry, but that theme could not be removed!"
 msgstr "Tema ne more biti odstranjena!"
 
-#: src/nautilus-theme-selector.c:606
+#: src/nautilus-theme-selector.c:609
 msgid "Couldn't remove theme"
 msgstr "Nisem mogel odstraniti teme"
 
-#: src/nautilus-theme-selector.c:709
+#: src/nautilus-theme-selector.c:716
 #, c-format
 msgid "No description available for the \"%s\" theme"
 msgstr "Opis za temo \"%s\" ni na voljo"
 
+#: src/nautilus-window.c:637
+#, fuzzy
+msgid "View as ..."
+msgstr "Poglej kot drugo..."
+
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1167
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "Poglej kot drugo..."
 
-#: src/nautilus-window.c:1530
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "Zapri"
 
@@ -8977,16 +9947,16 @@ msgstr "Zapri"
 #. * time stamps really best described as "preview
 #. * release"?.
 #.
-#: src/nautilus-window-manage-views.c:209
+#: src/nautilus-window-manage-views.c:216
 #, c-format
 msgid "Preview Release %s: %s"
 msgstr "Predogledna razlièica %s: %s"
 
-#: src/nautilus-window-manage-views.c:754
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "Pogled ni uspel"
 
-#: src/nautilus-window-manage-views.c:765
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
@@ -8995,12 +9965,12 @@ msgstr ""
 "Pogled %s je naletel na napako in se ne more nadaljevat. Lahko izberete drug "
 "pogled ali pojdite na drugo lokacijo."
 
-#: src/nautilus-window-manage-views.c:776
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "Pogled %s je naletel na napako ob zagonu."
 
-#: src/nautilus-window-manage-views.c:925
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
@@ -9008,7 +9978,7 @@ msgstr ""
 "Eden od stranskih pultov je naletel na napako in ne more nadaljevati. Na "
 "¾alost ne morem ugotoviti katera."
 
-#: src/nautilus-window-manage-views.c:929
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
@@ -9017,24 +9987,24 @@ msgstr ""
 "Stranski pult %s je naletel na napako in ne more nadaljevati. Èe se to "
 "ponavlja boste morda ¾eleli izklopiti ta pult."
 
-#: src/nautilus-window-manage-views.c:934
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "Polje stranskega pulta"
 
-#: src/nautilus-window-manage-views.c:1151
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr ""
 "Nisem mogel najti \"%s\". Prosim preverite èrkovanje in poskusite znova."
 
-#: src/nautilus-window-manage-views.c:1157
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
 msgstr ""
 "\"%s\" ni veljavna lokacija. Prosim preverite èrkovanje in poskusite znova. "
 
-#: src/nautilus-window-manage-views.c:1171
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -9043,29 +10013,29 @@ msgstr ""
 "Nisem mogel prikazati \"%s\", ker Nautilus ne more ugotoviti katera vrsta "
 "datoteke to je."
 
-#: src/nautilus-window-manage-views.c:1179
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr "Nautilus nima name¹èenga pregledovalnika sposobnega prikaza \"%s\"."
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1191
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 "Nisem mogel prikazati \"%s\", ker nautilus ne zna obravnavati %s: lokacij."
 
-#: src/nautilus-window-manage-views.c:1197
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "Nisem mogel prikazati \"%s\", ker je poskus prijave spodletel."
 
-#: src/nautilus-window-manage-views.c:1202
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "Nisem mogel prikazati \"%s\", ker je bil dostop zavrnjen."
 
-#: src/nautilus-window-manage-views.c:1213
+#: src/nautilus-window-manage-views.c:1287
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
@@ -9074,7 +10044,7 @@ msgstr ""
 "Nisem mogel prikazati \"%s\", ker gostitelj \"%s\" ni bil najden. Preverite, "
 "èe so èrkovanje in nastavitve posrednika pravilne."
 
-#: src/nautilus-window-manage-views.c:1221
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -9083,7 +10053,7 @@ msgstr ""
 "Nisem mogel pokazati \"%s\", ker je ime gostitelja prazno. Preverite, èe so "
 "nastavitve posrednika pravilne."
 
-#: src/nautilus-window-manage-views.c:1233
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -9094,23 +10064,23 @@ msgstr ""
 "teèe. Preprièajte se, da ste pognali storitev iskanja Medusa in, èe nimate "
 "kazala, da Medusin ustvarjalec kazala teèe. "
 
-#: src/nautilus-window-manage-views.c:1237
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "Iskanje ni na voljo"
 
-#: src/nautilus-window-manage-views.c:1241
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus ne more prikazati \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1246
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "Ne morem prikazati lokacije"
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:307
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
@@ -9118,37 +10088,41 @@ msgstr ""
 "Ste preprièani, da ¾elite pozabiti zgodovino? Èe jo, potem ste obsojeni, da "
 "jo ponovite."
 
-#: src/nautilus-window-menus.c:310
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
 "Ste preprièani, da ¾elite, da Nautilus pozabi katere lokacije ste obiskali?"
 
-#: src/nautilus-window-menus.c:315
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "Pozabi zgodovino?"
 
-#: src/nautilus-window-menus.c:316
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "Pozabi"
 
-#: src/nautilus-window-menus.c:417
-msgid "Show Status Bar"
+#: src/nautilus-window-menus.c:466
+#, fuzzy
+msgid "Show St_atus Bar"
 msgstr "Ka¾i vrstico stanja"
 
-#: src/nautilus-window-menus.c:423
-msgid "Show Sidebar"
+#: src/nautilus-window-menus.c:472
+#, fuzzy
+msgid "Show _Sidebar"
 msgstr "Ka¾i glavo"
 
-#: src/nautilus-window-menus.c:429
-msgid "Show Tool Bar"
+#: src/nautilus-window-menus.c:478
+#, fuzzy
+msgid "Show _Toolbar"
 msgstr "Ka¾i orodno vrstico"
 
-#: src/nautilus-window-menus.c:435
-msgid "Show Location Bar"
+#: src/nautilus-window-menus.c:484
+#, fuzzy
+msgid "Show Location _Bar"
 msgstr "Ka¾i vrstico lokacije"
 
-#: src/nautilus-window-menus.c:484
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "Nastavitve"
 
@@ -9158,11 +10132,11 @@ msgstr "Nastavitve"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:561
+#: src/nautilus-window-menus.c:618
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr "Avtorske pravice pridr¾ane © 1999-2001 Eazel, Inc."
 
-#: src/nautilus-window-menus.c:563
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -9173,7 +10147,17 @@ msgstr ""
 "za upravljanje va¹ih datotek\n"
 "in preostanka va¹ega sistema."
 
-#: src/nautilus-window-menus.c:720
+#. translators should localize the following
+#. * string which will be displayed at the
+#. * bottom of the about box to give credit
+#. * to the translator(s)
+#.
+#: src/nautilus-window-menus.c:629
+#, fuzzy
+msgid "Translator Credits"
+msgstr "Transakcije so shranjene v %s"
+
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -9182,39 +10166,585 @@ msgstr ""
 "Lokacija \"%s ne obstaja. ®elite zbrisati vse zaznamke te lokacije z va¹ega "
 "seznama?"
 
-#: src/nautilus-window-menus.c:724
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "Zaznamek za neobstojeèo lokacijo"
 
-#: src/nautilus-window-menus.c:738
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "Lokacija \"%s\" ne obstaja veè."
 
-#: src/nautilus-window-menus.c:739
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "Pojdi na neobstojeèo lokacijo"
 
-#: src/nautilus-window-menus.c:806
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "Pojdi na lokacijo navedeno s tem zaznamkom"
 
-#: src/nautilus-window-menus.c:1279
-msgid "_Browse"
-msgstr "_Brskaj"
-
-#: src/nautilus-window-toolbars.c:381
+#: src/nautilus-window-toolbars.c:402
 msgid "Back"
 msgstr "Nazaj"
 
-#: src/nautilus-window-toolbars.c:383
+#: src/nautilus-window-toolbars.c:404
 msgid "Forward"
 msgstr "Naprej"
 
-#: src/nautilus-zoom-control.c:528
+#. Note to localizers: this font is used for the number in the
+#. * zoom control widget.
+#.
+#: src/nautilus-zoom-control.c:531
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-iso8859-2"
 
+#~ msgid "System"
+#~ msgstr "Sistem"
+
+#~ msgid "Config files"
+#~ msgstr "Nastavitvene datoteke"
+
+#~ msgid "Command Line"
+#~ msgstr "Ukazna vrstica"
+
+#~ msgid "APIs"
+#~ msgstr "Programski vmesniki"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Razno"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Cirilica (KOI8-R)"
+
+#~ msgid "Verifying %s..."
+#~ msgstr "Preverjam %s..."
+
+#~ msgid "Checking \"%s\" (%ld/%ld)"
+#~ msgstr "Preverjam \"%s\" (%ld/%ld)"
+
+#~ msgid "Package Contents"
+#~ msgstr "Vsebina paketa"
+
+#~ msgid "Package Title"
+#~ msgstr "Naziv paketa"
+
+#~ msgid "Size: "
+#~ msgstr "Velikost: "
+
+#~ msgid "<size>"
+#~ msgstr "<velikost>"
+
+#~ msgid "Install Date: "
+#~ msgstr "Datum namestitve: "
+
+#~ msgid "<unknown>"
+#~ msgstr "<neznan>"
+
+#~ msgid "License: "
+#~ msgstr "Vrstica %d: "
+
+#~ msgid "Build Date: "
+#~ msgstr "Datum prevajanja: "
+
+#~ msgid "Vendor: "
+#~ msgstr "Opisna vrstica izdelovalca: "
+
+#~ msgid "Update"
+#~ msgstr "Posodobi"
+
+#~ msgid "Verify"
+#~ msgstr "Preveri"
+
+#~ msgid "Go to selected file"
+#~ msgstr "Pojdi na izbrano datoteko"
+
+#~ msgid "Package Contents: %d files"
+#~ msgstr "Paket vsebuje: %d datotek"
+
+#~ msgid "Package \"%s\" "
+#~ msgstr "Paket \"%s\" "
+
+#~ msgid "Verification completed, package ok."
+#~ msgstr "Preverjanje opravljeno, paket je v redu."
+
+#~ msgid "%s would not work anymore\n"
+#~ msgstr "%s ne bi veè delal\n"
+
+#~ msgid "%s would break other installed packages\n"
+#~ msgstr "%s bi pokvaril druge name¹èene pakete\n"
+
+#~ msgid "%s is needed, but could not be found\n"
+#~ msgstr "%s je potrebovan, a ni najden\n"
+
+#~ msgid "%s was already installed\n"
+#~ msgstr "%s je bil ¾e name¹èen\n"
+
+#~ msgid "%s causes a circular dependency problem\n"
+#~ msgstr "%s povzroèa problem kro¾ne odvisnosti\n"
+
+#~ msgid "Installing %s failed because of the following issue(s):\n"
+#~ msgstr "Name¹èanje %s ni uspelo zaradi sledeèih problemov:\n"
+
+#~ msgid "Uninstalling %s failed because of the following issue(s):\n"
+#~ msgstr "Odstranjevanje %s ni uspelo zaradi sledeèih problemov:\n"
+
+#~ msgid "Uninstall failed..."
+#~ msgstr "Odstranitev ni uspelo..."
+
+#~ msgid "Uninstall Failed"
+#~ msgstr "Odstranitev ni uspela"
+
+#~ msgid "Install failed..."
+#~ msgstr "Namestitev ni uspela..."
+
+#~ msgid "Factory for rpm view"
+#~ msgstr "Tovarna pogledov RPM"
+
+#~ msgid "RPM component"
+#~ msgstr "Komponenta RPM"
+
+#~ msgid "RPM view factory"
+#~ msgstr "Tovarna pogledov RPM"
+
+#~ msgid "rpm view"
+#~ msgstr "pogled rpm"
+
+#~ msgid "Force install"
+#~ msgstr "Nasilna namestitev"
+
+#~ msgid "%s had a file conflict with %s which %s required"
+#~ msgstr "%s je imel datoteèni konflikt z %s, ki ga je potreboval %s"
+
+#~ msgid "%s is not installed"
+#~ msgstr "%s ni name¹èen"
+
+#~ msgid "Downloaded package does not have the correct version"
+#~ msgstr "Sprejet paket ni pravilne razlièice"
+
+#~ msgid "Package %s had version %s and not %s"
+#~ msgstr "Paket %s je razlièice %s in ne %s"
+
+#~ msgid "Preparing to download packages..."
+#~ msgstr "Pripravljam se na sprejem paketov..."
+
+#~ msgid ""
+#~ "\n"
+#~ "Is this okay?"
+#~ msgstr ""
+#~ "\n"
+#~ "Je to v redu?"
+
+#~ msgid " · %s is in the Gnome menu under %s"
+#~ msgstr " · %s je v Gnomeovem menuju pod %s"
+
+#~ msgid "Installation aborted."
+#~ msgstr "Namestitev prekinjena."
+
+#~ msgid "Enable warning before each upload."
+#~ msgstr "Vkljuèi opozorilo pred vsakim po¹iljanjem."
+
+#~ msgid "Disable warning before each upload."
+#~ msgstr "Izkljuèi opozorilo pred vsakim po¹iljanjem."
+
+#~ msgid "Set machine name."
+#~ msgstr "Nastavi ime raèunalnika."
+
+#~ msgid "User isn't logged into ammonite yet.\n"
+#~ msgstr "Uporabnik ¹e ni prijavljen v ammonite.\n"
+
+#~ msgid "The supplied URL was bad.\n"
+#~ msgstr "Naveden je bil slab URL.\n"
+
+#~ msgid "A CORBA error occured.\n"
+#~ msgstr "Zgodila se je napaka CORBAe.\n"
+
+#~ msgid "Ammonite returned an error translating the url.\n"
+#~ msgstr "Ammonite je vrnil napako ob prevajanju url-ja.\n"
+
+#~ msgid "Can't post !"
+#~ msgstr "Ne morem poslati !"
+
+#~ msgid "can't open tempory file hell\n"
+#~ msgstr "ne morem odpreti zaèasne datoteke hell\n"
+
+#~ msgid "Can't set body !"
+#~ msgstr "Ne morem nastaviti telesa !"
+
+#~ msgid "Could not find a valid boolean value for grey_out!"
+#~ msgstr "Nisem mogel najti veljavne vrednosti za grey_out!"
+
+#~ msgid "There is no service data !\n"
+#~ msgstr "Ni podatkov o storitvi !\n"
+
+#~ msgid "There is no eazel news data !\n"
+#~ msgstr "Ni podatkov o novicah Eazel !\n"
+
+#~ msgid "Could not fetch summary configuration !"
+#~ msgstr "Nisem uspel prinesti nastavitve povzetka !"
+
+#~ msgid "The summary configuration contains no data!\n"
+#~ msgstr "Nastavitve povzetka ne vsebujejo podatkov!\n"
+
+#~ msgid "Cannot find the SUMMARY_DATA xmlnode!\n"
+#~ msgstr "Ne najdem xml vozli¹èa SUMMARY_DATA!\n"
+
+#~ msgid "Bailing from the SUMMARY_DATA parse!\n"
+#~ msgstr "Odstopam od razèlenjevanja SUMMARY_DATA!\n"
+
+#~ msgid "Could not find any summary configuration data!\n"
+#~ msgstr "Nisem na¹el podatkov o nastavitvah povzetka!\n"
+
+#~ msgid "Bailing from summary configuration parse!\n"
+#~ msgstr "Odstopam od razèlenjevanja nastavitev povzetka!\n"
+
+#~ msgid "Welcome, %s!"
+#~ msgstr "Dobrodo¹li, %s!"
+
+#~ msgid "Enable debugging"
+#~ msgstr "Vkljuèi razhro¹èevanje"
+
+#~ msgid "Vault location"
+#~ msgstr "Polo¾aj valute"
+
+#~ msgid "Error: No operation supplied\n"
+#~ msgstr "Napaka: Operacija ni podana\n"
+
+#~ msgid "Error: Invalid operation supplied (%s)\n"
+#~ msgstr "Napaka: Podana neveljavna operacija (%s)\n"
+
+#~ msgid ""
+#~ "Error: Invalid syntax\n"
+#~ "Syntax: %s\n"
+#~ msgstr ""
+#~ "Napaka: Napaèna sintaksa\n"
+#~ "Sintaksa: %s\n"
+
+#~ msgid "_Fonts"
+#~ msgstr "_Pisave"
+
+#~ msgid "Shared"
+#~ msgstr "Deljen"
+
+#~ msgid "Caldera"
+#~ msgstr "Caldera"
+
+#~ msgid "Hewlett-Packard"
+#~ msgstr "Hewlett-Packard"
+
+#~ msgid "IBM"
+#~ msgstr "IBM"
+
+#~ msgid "Linux Companies"
+#~ msgstr "Podjetja Linux"
+
+#~ msgid "Linux at IBM"
+#~ msgstr "Linux na IBMju"
+
+#~ msgid "Linuxcare"
+#~ msgstr "Linuxcare"
+
+#~ msgid "Myplay"
+#~ msgstr "Myplay"
+
+#~ msgid "Slashdot"
+#~ msgstr "Slashdot"
+
+#~ msgid "SourceXchange"
+#~ msgstr "SourceXchange"
+
+#~ msgid "VA Linux"
+#~ msgstr "VA Linux"
+
+#~ msgid "VMWare"
+#~ msgstr "VMWare"
+
+#~ msgid "Ximian"
+#~ msgstr "Ximian"
+
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "Datoteke ne morete prestaviti samo nase"
+
+#~ msgid "Can't Move Onto Self"
+#~ msgstr "Ne morem prestaviti nase"
+
+#~ msgid "You cannot throw \"%s\" into the Trash."
+#~ msgstr "Ne morete vreèi \"%s\" v Smeti."
+
+#~ msgid "Error Moving to Trash"
+#~ msgstr "Napaka ob prestavljanju v Smeti"
+
+#~ msgid "Font"
+#~ msgstr "Pisava"
+
+#~ msgid "fixed"
+#~ msgstr "nespremenljiv"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00"
+
+#~ msgid "current theme"
+#~ msgstr "trenutna tema"
+
+#~ msgid "Use this font family to display file names:"
+#~ msgstr "Uporabi to dru¾ino pisav za prikaz imen datotek:"
+
+#~ msgid ""
+#~ "Do slower but more complete search whenever possible\n"
+#~ "(slower search is not available when searching by content)"
+#~ msgstr ""
+#~ "Kadar je mo¾no opravi poèasnej¹e, a popolnej¹e iskanje\n"
+#~ "(poèasnej¹e iskanje ni na voljo kadar se i¹èe po vsebini)"
+
+#~ msgid "Can add Content"
+#~ msgstr "Lahko doda vsebino"
+
+#~ msgid "Home location:"
+#~ msgstr "Domaèa lokacija:"
+
+#~ msgid "HTTP Proxy:"
+#~ msgstr "Posrednik za HTTP:"
+
+#~ msgid "HTTP Proxy Port:"
+#~ msgstr "Vrata posrednika za HTTP:"
+
+#~ msgid "Appearance Settings"
+#~ msgstr "Nastavitve videza"
+
+#~ msgid "Windows & Desktop Settings"
+#~ msgstr "Nastavitve oken in namizij"
+
+#~ msgid "Icon & List Views Settings"
+#~ msgstr "Nastavitve ikonskih in seznamskih pogledov"
+
+#~ msgid "Sidebar Panels Settings"
+#~ msgstr "Nastavitve stranskih pultov"
+
+#~ msgid "Search Settings"
+#~ msgstr "Nastavitve iskanja"
+
+#~ msgid "Search Tradeoffs"
+#~ msgstr "®rtvovanja pri iskanju"
+
+#~ msgid "Search Locations"
+#~ msgstr "Lokacije iskanja"
+
+#~ msgid "Navigation Settings"
+#~ msgstr "Nastavitve navigacije"
+
+#~ msgid "Speed Tradeoffs Settings"
+#~ msgstr "Nastavitve ¾rtvovanja za hitrost"
+
+#~ msgid "helvetica"
+#~ msgstr "helvetica"
+
+#~ msgid "medium"
+#~ msgstr "srednje"
+
+#~ msgid ""
+#~ "Sorry, %s can only open local files, and \"%s\" is remote. If you want to "
+#~ "open it with %s, make a local copy first."
+#~ msgstr ""
+#~ "%s lahko odpre le krajevne datoteke in \"%s\" je oddaljena. Èe jo ¾elite "
+#~ "odpreti z %s potem najprej naredite krajevno kopijo."
+
+#~ msgid "Can't open remote file"
+#~ msgstr "Ne morem odpreti oddaljene datoteke"
+
+#~ msgid "Warning"
+#~ msgstr "Opozorilo"
+
+#~ msgid "Error"
+#~ msgstr "Napaka"
+
+#~ msgid "Details"
+#~ msgstr "Podrobnosti"
+
+#~ msgid "Question"
+#~ msgstr "Vpra¹anje"
+
+#~ msgid "_Cut Text"
+#~ msgstr "_Izre¾i besedilo"
+
+#~ msgid "Open in _New Window"
+#~ msgstr "Odpri v _novem oknu"
+
+#~ msgid "Where:"
+#~ msgstr "Kje:"
+
+#~ msgid "Indexing is Blocked on Your Computer"
+#~ msgstr "Ustvarjanje kazala je na va¹em raèunalniku blokirano."
+
+#~ msgid ""
+#~ "To do a fast search, Find requires an index of the files on your system.  "
+#~ "You have elected not to index your computer so it does not have an index "
+#~ "right now.  Because Find cannot use an index, this search may take several "
+#~ "minutes.  "
+#~ msgstr ""
+#~ "Za hitro iskanje potrebuje program Find kazalo datotek va¹ega sistema. Va¹ "
+#~ "raèunalnik ima ustvarjanje kazala izkljuèeno ali pa kazala trenutno nima. "
+#~ "Ker Find ne more uporabiti kazala, lahko iskanje traja veè minut."
+
+#~ msgid "Indexing is Disabled on Your Computer"
+#~ msgstr "Ustvarjanje kazala je na va¹em raèunalniku izkljuèeno."
+
+#~ msgid "New _Folder"
+#~ msgstr "Nova _mapa"
+
+#~ msgid "_Open in New Window"
+#~ msgstr "_Odpri v novem oknu"
+
+#~ msgid "_Select All Files"
+#~ msgstr "_Izberi vse datoteke"
+
+#~ msgid ""
+#~ "An index of your files is not available because creating a nightly index of "
+#~ "files has been disabled by your system administrator."
+#~ msgstr ""
+#~ "Kazalo va¹ih datotek ni na voljo, ker je bilo kreiranje vsakonoènega kazalo "
+#~ "datotek izkljuèeno s strani administratorja sistema."
+
+#~ msgid "No index of your system is available"
+#~ msgstr "Kazalo datotek na va¹em sistemu ni na voljo"
+
+#~ msgid ""
+#~ "An index of your files is not available, because you have elected to turn "
+#~ "the indexing feature off.  You can set your computer up to index your files "
+#~ "nightly by changing your search preferences."
+#~ msgstr ""
+#~ "Kazalo va¹ih datotek ni na voljo, ker ste se odloèili ustvarjanje kazala "
+#~ "izklopitiVa¹ raèunalnik lahko nastavite, da bo vsakonoèno ustvarjal kazalo "
+#~ "datotek s spremembo va¹ih nastavitev iskanja."
+
+#~ msgid ""
+#~ "Nautilus can't be used now. Rebooting the computer or installing Nautilus "
+#~ "again may fix the problem."
+#~ msgstr ""
+#~ "Nautilus trenutno ne bo deloval. Vnovièen zagon raèunalnika ali ponovna "
+#~ "namestitev Nautilusa lahko pomagata odpraviti problem."
+
+#~ msgid ""
+#~ "For beginner users that are not yet\n"
+#~ "familiar with the working of GNOME and Linux."
+#~ msgstr ""
+#~ "Za zaèetnike, ki ¹e niso domaèi z delom \n"
+#~ "v GNOMEu in Linuxu."
+
+#~ msgid ""
+#~ "Eazel offers a growing number of services to help you\n"
+#~ "install and maintain new software and manage your files\n"
+#~ "across the network.  Choose an option below, and the\n"
+#~ "information will be presented in Nautilus after you've\n"
+#~ "finished setting up."
+#~ msgstr ""
+#~ "Eazel ponuja vse veè storitev, ki vam pomagajo namestiti\n"
+#~ "in vzdr¾evati novo programje ter upravljati z datotekami\n"
+#~ "preko mre¾e.  Izberite mo¾nosti spodaj in podatki\n"
+#~ "bodo dostopni v Nautilusu, ko boste konèali z\n"
+#~ "nastavljanjem."
+
+#~ msgid "I want to learn more about Eazel services."
+#~ msgstr "®elim izvedeti veè o storitvah Eazel."
+
+#~ msgid "I want to sign up for Eazel services now."
+#~ msgstr "®elim se naroèiti na storitve Eazel."
+
+#~ msgid "I've already signed up and want to login now."
+#~ msgstr "Na storitve sem se ¾e naroèil in se sedaj ¾elim prijaviti."
+
+#~ msgid "I don't want to learn about Eazel services at this time."
+#~ msgstr "Trenutno ne ¾elim podatkov o storitvah Eazel."
+
+#~ msgid ""
+#~ "Nautilus will now contact Eazel services to quickly verify \n"
+#~ "your web connection and download the latest updates. \n"
+#~ "\n"
+#~ "If you know your computer uses a proxy connection, \n"
+#~ "click Yes and Nautilus will use it. \n"
+#~ "\n"
+#~ "Click the Next button to continue."
+#~ msgstr ""
+#~ "Nautilus se bo sedaj povezal s storitvami Eazel,\n"
+#~ "hitro preveril va¹o spletno povezavo in prenesel najnovej¹e posodobitve. \n"
+#~ "\n"
+#~ "Èe veste, da va¹ raèunalnik uporablja posredovano povezavo, \n"
+#~ "kliknite Da in Nautilus jo bo uporabil. \n"
+#~ "\n"
+#~ "Za nadaljevanje kliknite gumb \"Naprej\"."
+
+#~ msgid "Updating Nautilus"
+#~ msgstr "Nadgrajujem Nautilus"
+
+#~ msgid "No, don't contact Eazel services at this time."
+#~ msgstr "Ne, trenutno se ne ¾elim povezati s storitvami Eazel."
+
+#~ msgid "HTTP Proxy Configuration"
+#~ msgstr "Nastavitev HTTP posrednika"
+
+#~ msgid ""
+#~ "We are now contacting the Eazel service to test your \n"
+#~ "web connection and update Nautilus."
+#~ msgstr ""
+#~ "Sedaj vzpostavljamo povezavo s storitvami Eazel, preverjamo \n"
+#~ "va¹o spletno povezavo in posodabljamo Nautilusa."
+
+#~ msgid "Use Nautilus to draw desktop."
+#~ msgstr "Uporabi Nautilus za risanje namizja"
+
+#~ msgid ""
+#~ "Since this is the first time that you've launched\n"
+#~ "Nautilus, we'd like to ask you a few questions\n"
+#~ "to help personalize it for your use."
+#~ msgstr ""
+#~ "Ker je to va¹ prvi zagon Nautilusa,\n"
+#~ "vam ¾elimo zastaviti nekaj vpra¹anj,\n"
+#~ "ki bodo pomagala prilagoditi ga va¹i uporabi."
+
+#~ msgid "Press the next button to continue."
+#~ msgstr "Za nadaljevanje kliknite gumb \"Naprej\"."
+
+#~ msgid ""
+#~ "Click the finish button to launch Nautilus.\n"
+#~ "We hope that you enjoy using it!"
+#~ msgstr ""
+#~ "Kliknite gumb \"Konèano\" za zagon Nautilusa.\n"
+#~ "Upamo, da vam bo uporaba prijala!"
+
+#~ msgid "Sign Up for Eazel Services"
+#~ msgstr "Naroèi se na storitve Eazel"
+
+#~ msgid "Nautilus Update"
+#~ msgstr "Posodobitev Nautilusa"
+
+#~ msgid "Nautilus _License"
+#~ msgstr "Nautilusova _licenca"
+
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "Odstrani izbrano besedilo brez, da bi ga dal na odlo¾i¹èe"
+
+#~ msgid "Use Advanced settings"
+#~ msgstr "Uporabi napredne nastavitve"
+
+#~ msgid "Use Beginner settings"
+#~ msgstr "Uporabi zaèetne nastavitve"
+
+#~ msgid "Use Intermediate settings"
+#~ msgstr "Uporabi vmesne nastavitve"
+
+#~ msgid "_New Window"
+#~ msgstr "_Novo okno"
+
+#~ msgid "_Web Search"
+#~ msgstr "_Spletno iskanje"
+
+#~ msgid "_Browse"
+#~ msgstr "_Brskaj"
+
 #~ msgid "Mozilla Test"
 #~ msgstr "Preizkus Mozille"
 
@@ -9233,9 +10763,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-iso8859-2"
 #~ msgid "Reading the install package list %s"
 #~ msgstr "Berem seznam paketov za namestitev %s"
 
-#~ msgid "Will download %s"
-#~ msgstr "Sprejel bom %s"
-
 #~ msgid "%s already installed"
 #~ msgstr "%s je ¾e name¹èen"
 
@@ -9248,9 +10775,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-iso8859-2"
 #~ msgid "Dependencies appear ok"
 #~ msgstr "Odvisnosti se zdijo v redu"
 
-#~ msgid "But there are file conflicts"
-#~ msgstr "A obstajajo konfliktne datoteke"
-
 #~ msgid "Processing dep for %s, requires library %s"
 #~ msgstr "Obdelujem odvisnosti paketa %s, potrebuje knji¾nico %s"
 
@@ -9273,13 +10797,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-iso8859-2"
 #~ msgid "Getting information about package \"%s\" ..."
 #~ msgstr "Dobivam podatke o paketu \"%s\" ..."
 
-#~ msgid ""
-#~ "I'm about to download and install the following packages:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Sedaj bom prenesel in namestil naslednje pakete:\n"
-#~ "\n"
-
 #~ msgid "for a total of %ld kB."
 #~ msgstr "skupno %ld kB."
 
@@ -9352,9 +10869,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-iso8859-2"
 #~ msgid "regular files"
 #~ msgstr "obièajne datoteke"
 
-#~ msgid "text files"
-#~ msgstr "datoteke z besedili"
-
 #~ msgid "applications"
 #~ msgstr "programi"
 
@@ -9411,9 +10925,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-iso8859-2"
 #~ msgid "Indexing Info"
 #~ msgstr "Podatki o kazalu"
 
-#~ msgid "Content"
-#~ msgstr "Vsebina"
-
 #~ msgid "With Emblem"
 #~ msgstr "Z emblemom"
 
diff --git a/po/sv.po b/po/sv.po
index 52a7966b2..e840fc998 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2001-04-03 10:48+0200\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-04-03 10:57+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -342,8 +342,6 @@ msgid "Kernel Routines"
 msgstr "Kärnrutiner"
 
 #: components/help/hyperbola-filefmt.c:703
-#: libnautilus-extensions/nautilus-stock-dialogs.c:511
-#: libnautilus-extensions/nautilus-stock-dialogs.c:549
 msgid "Info"
 msgstr "Info"
 
@@ -1023,7 +1021,6 @@ msgid "Oldies"
 msgstr "Oldies"
 
 #: components/music/mpg123.c:32
-#: libnautilus-extensions/nautilus-font-picker.c:101
 msgid "Other"
 msgstr "Annat"
 
@@ -1662,9 +1659,9 @@ msgid "Pause"
 msgstr "Paus"
 
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:978
-#: libnautilus-extensions/nautilus-file-operations.c:993
-#: libnautilus-extensions/nautilus-file-operations.c:1012
+#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 #: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Stopp"
@@ -3403,13 +3400,11 @@ msgstr "Tjänstinloggning"
 
 #: components/services/summary/nautilus-summary-dialogs.c:131
 #: libnautilus-extensions/nautilus-global-preferences.c:827
-#: libnautilus-extensions/nautilus-password-dialog.c:269
 msgid "Username:"
 msgstr "Användarnamn:"
 
 #: components/services/summary/nautilus-summary-dialogs.c:138
 #: libnautilus-extensions/nautilus-global-preferences.c:835
-#: libnautilus-extensions/nautilus-password-dialog.c:276
 msgid "Password:"
 msgstr "Lösenord:"
 
@@ -3777,7 +3772,7 @@ msgstr "Spöke"
 msgid "Azul"
 msgstr "Azul"
 
-#: data/browser.xml.h:3 libnautilus-extensions/nautilus-font-picker.c:89
+#: data/browser.xml.h:3
 msgid "Black"
 msgstr "Svart"
 
@@ -3986,7 +3981,7 @@ msgid "Numbers"
 msgstr "Tal"
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1101
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "OK"
 
@@ -4521,7 +4516,7 @@ msgstr "länk"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1186
+#: libnautilus-extensions/nautilus-file-operations.c:1187
 #: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
@@ -4532,16 +4527,16 @@ msgid "link (broken)"
 msgstr "länk (trasig)"
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:424
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "Från:"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:439
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "Till:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:621
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4552,7 +4547,7 @@ msgstr ""
 "\n"
 "\"%s\" kan inte flyttas eftersom den är på en skrivskyddad disk."
 
-#: libnautilus-extensions/nautilus-file-operations.c:632
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4565,7 +4560,7 @@ msgstr ""
 "\"%s\" kan inte tas bort eftersom du inte har de nödvändiga rättigheterna "
 "för att ändra dess föräldermapp."
 
-#: libnautilus-extensions/nautilus-file-operations.c:638
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4576,7 +4571,7 @@ msgstr ""
 "\n"
 "\"%s\" kan inte tas bort eftersom den är på en skrivskyddad disk."
 
-#: libnautilus-extensions/nautilus-file-operations.c:669
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4589,7 +4584,7 @@ msgstr ""
 "\"%s\" kan inte flyttas eftersom du inte har de nödvändiga rättigheterna för "
 "att ändra den eller dess föräldermapp."
 
-#: libnautilus-extensions/nautilus-file-operations.c:676
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4602,7 +4597,7 @@ msgstr ""
 "\"%s\" kan inte flyttas till papperskorgen eftersom du inte har de "
 "nödvändiga rättigheterna för att ändra den eller dess föräldermapp."
 
-#: libnautilus-extensions/nautilus-file-operations.c:700
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -4614,7 +4609,7 @@ msgstr ""
 "\"%s\" kan inte kopieras eftersom du inte har de nödvändiga rättigheterna "
 "för att läsa den."
 
-#: libnautilus-extensions/nautilus-file-operations.c:722
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4625,7 +4620,7 @@ msgstr ""
 "\n"
 "Det finns inte tillräckligt med utrymme på målet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:727
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4636,7 +4631,7 @@ msgstr ""
 "\n"
 "Det finns inte tillräckligt med utrymme på målet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:731
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4647,7 +4642,7 @@ msgstr ""
 "\n"
 "Det finns inte tillräckligt med utrymme på målet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:743
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4658,7 +4653,7 @@ msgstr ""
 "\n"
 "Du har inte de nödvändiga rättigheterna för att skriva i denna mapp."
 
-#: libnautilus-extensions/nautilus-file-operations.c:747
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4669,7 +4664,7 @@ msgstr ""
 "\n"
 "Målet är skrivskyddat."
 
-#: libnautilus-extensions/nautilus-file-operations.c:754
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4680,7 +4675,7 @@ msgstr ""
 "\n"
 "Du har inte de nödvändiga rättigheterna för att skriva i denna mapp."
 
-#: libnautilus-extensions/nautilus-file-operations.c:758
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4691,7 +4686,7 @@ msgstr ""
 "\n"
 "Måldisken är skrivskyddad."
 
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4702,7 +4697,7 @@ msgstr ""
 "\n"
 "Du har inte de nödvändiga rättigheterna för att skriva i denna mapp."
 
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4713,7 +4708,7 @@ msgstr ""
 "\n"
 "Måldisken är skrivskyddad."
 
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4724,7 +4719,7 @@ msgstr ""
 "\n"
 "Vill du fortsätta?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4735,7 +4730,7 @@ msgstr ""
 "\n"
 "Vill du fortsätta?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:806
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4746,7 +4741,7 @@ msgstr ""
 "\n"
 "Vill du fortsätta?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:812
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4757,7 +4752,7 @@ msgstr ""
 "\n"
 "Vill du fortsätta?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:827
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4768,7 +4763,7 @@ msgstr ""
 "\n"
 "Vill du fortsätta?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:831
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4779,7 +4774,7 @@ msgstr ""
 "\n"
 "Vill du fortsätta?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:835
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4790,7 +4785,7 @@ msgstr ""
 "\n"
 "Vill du fortsätta?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:841
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4801,34 +4796,34 @@ msgstr ""
 "\n"
 "Vill du fortsätta?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:957
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "Fel vid kopiering."
 
-#: libnautilus-extensions/nautilus-file-operations.c:960
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "Fel vid flyttning."
 
-#: libnautilus-extensions/nautilus-file-operations.c:963
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "Fel vid länkning."
 
-#: libnautilus-extensions/nautilus-file-operations.c:968
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "Fel vid borttagning."
 
-#: libnautilus-extensions/nautilus-file-operations.c:993
-#: libnautilus-extensions/nautilus-file-operations.c:1012
-#: libnautilus-extensions/nautilus-file-operations.c:1123
-#: libnautilus-extensions/nautilus-file-operations.c:1137
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "Hoppa över"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1012
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Försök igen"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1087
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4841,7 +4836,7 @@ msgstr ""
 "\n"
 "Om du fortfarande vill flytta \"%s\" bör du döpa om det och försöka igen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1093
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4854,11 +4849,11 @@ msgstr ""
 "\n"
 "Om du fortfarande vill kopiera \"%s\" bör du döpa om det och försöka igen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1101
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "Kan inte ersätta fil."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1111
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4869,22 +4864,22 @@ msgstr ""
 "\n"
 "Vill du ersätta den?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1122
-#: libnautilus-extensions/nautilus-file-operations.c:1136
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "Konflikt vid kopiering"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1123
-#: libnautilus-extensions/nautilus-file-operations.c:1137
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Ersätt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1137
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Ersätt alla"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1190
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "ytterligare en länk till %s"
@@ -4893,25 +4888,25 @@ msgstr "ytterligare en länk till %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1206
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d:a länken till %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d:a länken till %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d:e länken till %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d:e länken till %s"
@@ -4921,227 +4916,227 @@ msgstr "%d:e länken till %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1238
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (kopia)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1240
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (ytterligare en kopia)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1242
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr ":a kopian)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1244
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr ":a kopian)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1246
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr ":e kopian)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1248
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr ":e kopian)"
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1258
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopia)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1260
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (ytterligare en kopia)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1262
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d:a kopian)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1264
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d:a kopian)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1266
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d:e kopian)%s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1268
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d:e kopian)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1352
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1360
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1517
-#: libnautilus-extensions/nautilus-file-operations.c:2087
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Okänd GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1821
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "Flyttar filer till papperskorgen"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr "Filer som kastats:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1825
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "Flyttar"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "Förbereder flyttning till papperskorgen..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1836
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "Flyttar filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1838
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "Filer som flyttats:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "Förbereder flyttning..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1842
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "Slutför flyttning..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1854
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "Skapar länkar till filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1856
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "Filer som länkats:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1858
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "Länkar"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1859
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "Förbereder skapande av länkar..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1860
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "Slutför skapande av länkar..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1867
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "Kopierar filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1869
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "Filer som kopierats:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "Kopierar"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "Förbereder kopiering..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1890
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "Du kan inte kopiera objekt till papperskorgen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1891
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "Kan inte kopiera till papperskorgen"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1918
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "Papperskorgen måste finnas kvar på skrivbordet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1919
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "Du kan inte flytta denna papperskorgsmapp."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1921
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "Du kan inte kopiera papperskorgen."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1922
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "Du kan inte kopiera denna papperskorgsmapp."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1924
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Kan inte byta plats på papperskorgen"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1925
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Kan inte kopiera papperskorgen"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1948
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "Du kan inte flytta en mapp in i sig själv."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1949
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "Du kan inte kopiera en mapp in i sig själv."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1951
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "Kan inte flytta in i sig själv"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1952
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "Kan inte kopiera in i sig själv"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1964
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "Du kan inte kopiera en fil över sig själv."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1965
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "Kan inte kopiera över sig själv"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2016
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5151,7 +5146,7 @@ msgstr ""
 "\n"
 "Du har inte de nödvändiga rättigheterna för att skriva till målet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2019
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5161,300 +5156,300 @@ msgstr ""
 "\n"
 "Det finns inget utrymme på målet."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2022
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Fel \"%s\" vid skapande av ny mapp."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2026
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "Fel vid skapande av ny mapp"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2113
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "namnlös mapp"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2146
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "Tar bort filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2148
-#: libnautilus-extensions/nautilus-file-operations.c:2183
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "Filer som tagits bort:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2150
-#: libnautilus-extensions/nautilus-file-operations.c:2185
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Tar bort"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "Förbereder borttagning av filer..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2181
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Tömmer papperskorgen"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2186
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Förbereder tömning av papperskorgen..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2217
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr "Är du säker att du vill ta bort alla objekt i papperskorgen permanent?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2219
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "Ta bort innehållet i papperskorgen?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2220
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "Töm"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "apa"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "apa (kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2260
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".apa.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2260
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".apa (kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2261
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "apa apa"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2261
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "apa apa (kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2262
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "apa.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2262
-#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "apa (kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "apa apa.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2263
-#: libnautilus-extensions/nautilus-file-operations.c:2285
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "apa apa (kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "apa apa.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "apa apa (kopia).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "apa...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "apa.. (kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "apa..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "apa... (kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "apa. (kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "apa. (ytterligare en kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2268
-#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "apa (ytterligare en kopia)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2269
-#: libnautilus-extensions/nautilus-file-operations.c:2271
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "apa (ytterligare en kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "apa (tredje kopian)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2271
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "apa (tredje kopian).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2272
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "apa apa (ytterligare en kopia).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2272
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "apa apa (tredje kopian).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2273
+#: libnautilus-extensions/nautilus-file-operations.c:2274
 msgid "foo (13th copy)"
 msgstr "apa (13:e kopian)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2273
+#: libnautilus-extensions/nautilus-file-operations.c:2274
 msgid "foo (14th copy)"
 msgstr "apa (14:e kopian)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2274
+#: libnautilus-extensions/nautilus-file-operations.c:2275
 msgid "foo (13th copy).txt"
 msgstr "apa (13:e kopian).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2274
+#: libnautilus-extensions/nautilus-file-operations.c:2275
 msgid "foo (14th copy).txt"
 msgstr "apa (14:e kopian).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "apa (21:a kopian)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2275
-#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "apa (22:a kopian)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "apa (21:a kopian).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2276
-#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "apa (22:a kopian).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2277
-#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "apa (23:e kopian)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2278
-#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "apa (23:e kopian).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2279
-#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "apa (24:e kopian)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2280
-#: libnautilus-extensions/nautilus-file-operations.c:2282
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "apa (24:e kopian).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "apa (25:e kopian)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2282
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "apa (25:e kopian).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2283
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "apa apa (24:e kopian)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2283
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "apa apa (25:e kopian)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2284
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "apa apa (24:e kopian).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2284
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "apa apa (25:e kopian).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2285
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "apa apa (100000000000000:e kopian).txt"
 
 #. FIXME bugzilla.eazel.com 7701: These are wrong.
-#: libnautilus-extensions/nautilus-file-operations.c:2288
+#: libnautilus-extensions/nautilus-file-operations.c:2289
 msgid "foo (10th copy)"
 msgstr "apa (10:e kopian)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2288
+#: libnautilus-extensions/nautilus-file-operations.c:2289
 msgid "foo (11st copy)"
 msgstr "apa (11:e kopian)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2289
+#: libnautilus-extensions/nautilus-file-operations.c:2290
 msgid "foo (10th copy).txt"
 msgstr "apa (10:e kopian).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2289
+#: libnautilus-extensions/nautilus-file-operations.c:2290
 msgid "foo (11st copy).txt"
 msgstr "apa (11:e kopian).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2290
+#: libnautilus-extensions/nautilus-file-operations.c:2291
 msgid "foo (11th copy)"
 msgstr "apa (11:e kopian)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2290
+#: libnautilus-extensions/nautilus-file-operations.c:2291
 msgid "foo (12nd copy)"
 msgstr "apa (12:e kopian)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2291
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 msgid "foo (11th copy).txt"
 msgstr "apa (11:e kopian).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2291
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 msgid "foo (12nd copy).txt"
 msgstr "apa (12:e kopian).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2292
+#: libnautilus-extensions/nautilus-file-operations.c:2293
 msgid "foo (12th copy)"
 msgstr "apa (12:e kopian)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2292
+#: libnautilus-extensions/nautilus-file-operations.c:2293
 msgid "foo (13rd copy)"
 msgstr "apa (13:e kopian)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2293
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 msgid "foo (12th copy).txt"
 msgstr "apa (12:e kopian).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2293
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 msgid "foo (13rd copy).txt"
 msgstr "apa (13:e kopian).txt"
 
@@ -5463,89 +5458,10 @@ msgstr "apa (13:e kopian).txt"
 msgid "%ld of %ld"
 msgstr "%ld av %ld"
 
-#: libnautilus-extensions/nautilus-font-picker.c:80
-msgid "Normal"
-msgstr "Normal"
-
-#: libnautilus-extensions/nautilus-font-picker.c:81
-#: libnautilus-extensions/nautilus-volume-monitor.c:499
-#: libnautilus-extensions/nautilus-volume-monitor.c:518
-msgid "Unknown"
-msgstr "Okänd"
-
-#: libnautilus-extensions/nautilus-font-picker.c:87
-msgid "Bold"
-msgstr "Fet"
-
-#: libnautilus-extensions/nautilus-font-picker.c:88
-msgid "Book"
-msgstr "Bok"
-
-#: libnautilus-extensions/nautilus-font-picker.c:90
-msgid "Demibold"
-msgstr "Halvfet"
-
-#: libnautilus-extensions/nautilus-font-picker.c:91
-msgid "Light"
-msgstr "Tunn"
-
-#: libnautilus-extensions/nautilus-font-picker.c:97
-msgid "Italic"
-msgstr "Kursiv"
-
-#: libnautilus-extensions/nautilus-font-picker.c:98
-msgid "Oblique"
-msgstr "Lutande"
-
-#: libnautilus-extensions/nautilus-font-picker.c:99
-msgid "Reverse Italic"
-msgstr "Omvänd kursiv"
-
-#: libnautilus-extensions/nautilus-font-picker.c:100
-msgid "Reverse Oblique"
-msgstr "Omvänd lutande"
-
-#: libnautilus-extensions/nautilus-font-picker.c:107
-msgid "Condensed"
-msgstr "Kondenserad"
-
-#: libnautilus-extensions/nautilus-font-picker.c:108
-msgid "Semicondensed"
-msgstr "Halvkondenserad"
-
-#: libnautilus-extensions/nautilus-font-picker.c:428
-msgid "More..."
-msgstr "Mer..."
-
 #: libnautilus-extensions/nautilus-gconf-extensions.c:90
 msgid "GConf Error"
 msgstr "GConf-fel"
 
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:1083
-msgid "fixed"
-msgstr "fast bredd"
-
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1444
-msgid "01/01/00, 01:00 AM"
-msgstr "01/01/00, 01:00"
-
-#: libnautilus-extensions/nautilus-glib-extensions.c:1445
-msgid "1/1/00, 1:00 AM"
-msgstr "1/1/00, 1:00"
-
-#: libnautilus-extensions/nautilus-glib-extensions.c:1446
-msgid " 1/ 1/00,  1:00 AM"
-msgstr " 1/ 1/00,  1:00"
-
 #. Constants
 #: libnautilus-extensions/nautilus-global-preferences.c:50
 msgid "Nautilus Preferences"
@@ -5936,14 +5852,6 @@ msgstr ""
 "på din dator, kan vara avstängt. För att försäkra dig om att snabbsökningar "
 "kan genomföras bör du kontrollera att crond är påslaget.\n"
 
-#: libnautilus-extensions/nautilus-gnome-extensions.c:640
-msgid "No image was selected.  You must click on an image to select it."
-msgstr "Ingen bild markerades. Du måste klicka på en bild för att markera den."
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:641
-msgid "No selection made"
-msgstr "Ingen markering gjord"
-
 #. The list of characters that cause line breaks can be localized.
 #: libnautilus-extensions/nautilus-icon-canvas-item.c:70
 msgid " -_,;.?/&"
@@ -6014,19 +5922,15 @@ msgstr "Gör om inmatning"
 msgid "Restore the changed name"
 msgstr "Återställ det ändrade namnet"
 
-#: libnautilus-extensions/nautilus-password-dialog.c:306
-msgid "Remember this password"
-msgstr "Kom ihåg detta lösenord"
-
-#: libnautilus-extensions/nautilus-preferences.c:91
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "Nybörjare"
 
-#: libnautilus-extensions/nautilus-preferences.c:92
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "Mellan"
 
-#: libnautilus-extensions/nautilus-preferences.c:93
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "Avancerad"
 
@@ -6489,25 +6393,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Objekt som har \"medusa\" i sina namn och som är mappar"
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:551
-#: libnautilus-extensions/nautilus-stock-dialogs.c:604
-msgid "Details"
-msgstr "Detaljer"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:569
-msgid "Warning"
-msgstr "Varning"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:580
-#: libnautilus-extensions/nautilus-stock-dialogs.c:602
-msgid "Error"
-msgstr "Fel"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:635
-#: libnautilus-extensions/nautilus-stock-dialogs.c:663
-msgid "Question"
-msgstr "Fråga"
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr "Söker på diskar"
@@ -6550,6 +6435,11 @@ msgstr "Visa som %s"
 msgid "%s Viewer"
 msgstr "%s-visare"
 
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+msgid "Unknown"
+msgstr "Okänd"
+
 #. Populate table with items we know localized names for.
 #: libnautilus-extensions/nautilus-volume-monitor.c:606
 #: libnautilus-extensions/nautilus-volume-monitor.c:1809
@@ -8936,47 +8826,47 @@ msgstr "Vill du se dessa %d platser i separata fönster?"
 msgid "View in Multiple Windows?"
 msgstr "Visa i flera fönster?"
 
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr "Utför ett antal snabba självtester."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "Skapa det första fönstret med den angivna geometrin."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "GEOMETRI"
 
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Skapa endast fönster för explicit angivna URI:er."
 
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "Avsluta Nautilus."
 
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "Starta om Nautilus."
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check kan inte användas med URI:er.\n"
 
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check kan inte användas med andra flaggor.\n"
 
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit kan inte användas med URI:er.\n"
 
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart kan inte användas med URI:er.\n"
 
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry kan inte användas med mer än en URI.\n"
 
@@ -10260,6 +10150,76 @@ msgstr "Framåt"
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Bold"
+#~ msgstr "Fet"
+
+#~ msgid "Book"
+#~ msgstr "Bok"
+
+#~ msgid "Demibold"
+#~ msgstr "Halvfet"
+
+#~ msgid "Light"
+#~ msgstr "Tunn"
+
+#~ msgid "Italic"
+#~ msgstr "Kursiv"
+
+#~ msgid "Oblique"
+#~ msgstr "Lutande"
+
+#~ msgid "Reverse Italic"
+#~ msgstr "Omvänd kursiv"
+
+#~ msgid "Reverse Oblique"
+#~ msgstr "Omvänd lutande"
+
+#~ msgid "Condensed"
+#~ msgstr "Kondenserad"
+
+#~ msgid "Semicondensed"
+#~ msgstr "Halvkondenserad"
+
+#~ msgid "More..."
+#~ msgstr "Mer..."
+
+#~ msgid "fixed"
+#~ msgstr "fast bredd"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00"
+
+#~ msgid "No image was selected.  You must click on an image to select it."
+#~ msgstr ""
+#~ "Ingen bild markerades. Du måste klicka på en bild för att markera den."
+
+#~ msgid "No selection made"
+#~ msgstr "Ingen markering gjord"
+
+#~ msgid "Remember this password"
+#~ msgstr "Kom ihåg detta lösenord"
+
+#~ msgid "Details"
+#~ msgstr "Detaljer"
+
+#~ msgid "Warning"
+#~ msgstr "Varning"
+
+#~ msgid "Error"
+#~ msgstr "Fel"
+
+#~ msgid "Question"
+#~ msgstr "Fråga"
+
 #~ msgid "helvetica"
 #~ msgstr "helvetica"
 
diff --git a/po/ta.po b/po/ta.po
index 879e3593c..4e24b0ff0 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -2,16 +2,15 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Veeravanallore Madhavan <vbmadhu@hotmail.com>
 #
-#: libnautilus-extensions/nautilus-search-uri.c:380
-#: libnautilus-extensions/nautilus-search-uri.c:386
-#: libnautilus-extensions/nautilus-search-uri.c:389
-#: libnautilus-extensions/nautilus-search-uri.c:392
-#: libnautilus-extensions/nautilus-search-uri.c:395
-#: libnautilus-extensions/nautilus-search-uri.c:398
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus CVS\n"
-"POT-Creation-Date: 2000-12-02 18:02+0000\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2000-12-02 17:59+0000\n"
 "Last-Translator: Veeravanallore Madhavan <vbmadhu@hotmail.com>\n"
 "Language-Team: Tamil\n"
@@ -19,6 +18,233 @@ msgstr ""
 "Content-Type: text/plain; charset=TSCII\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: applets/launcher/nautilus-launcher-applet.c:272
+msgid "Can't create nautilus-launcher-applet!"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:211
+msgid "Can't create nautilus-preferences-applet!"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:226
+msgid "Show Desktop"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:230
+#, fuzzy
+msgid "Smooth Graphics"
+msgstr "º£Ã¡É ŨÃÀ¼í¸û"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:243
+#: src/nautilus-application.c:639
+msgid "Quit"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:251
+#, fuzzy
+msgid "Start"
+msgstr "¿¢¸ú¿¢¨Ä"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:259
+#, fuzzy
+msgid "Restart"
+msgstr "ÁÚÓÂüº¢"
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:1
+msgid "Factory for Nautilus component adapter factories"
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:2
+msgid "Factory for Nautilus component adapter factories "
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:3
+msgid ""
+"Factory for objects that wrap ordinary Bonobo Controls or Embeddables to "
+"look like Nautilus Views"
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:4
+msgid "Nautilus component adapter factory"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:230
+#, c-format
+msgid ""
+"%s CPU\n"
+"%s MHz\n"
+"%s cache size"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:264
+#, c-format
+msgid "%lu GB RAM"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:266
+#, c-format
+msgid "%lu MB RAM"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:324
+#, c-format
+msgid "%lu GB"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:326
+#, c-format
+msgid "%lu MB"
+msgstr ""
+
+#. set up the title
+#: components/hardware/nautilus-hardware-view.c:407
+msgid "Hardware Overview"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:520
+msgid "This is a placeholder for the CPU page."
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:545
+msgid "This is a placeholder for the RAM page."
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:570
+msgid "This is a placeholder for the IDE page."
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:2
+#: components/hardware/nautilus-hardware-view.c:631
+#: data/static_bookmarks.xml.h:16
+msgid "Hardware"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:1
+msgid "Factory for hardware view"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:3
+msgid "Hardware Viewer"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:4
+msgid "Hardware view"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:5
+#, fuzzy
+msgid "View as Hardware"
+msgstr "ÁüȨŠ§À¡ø À¡÷ì¸"
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:6
+msgid "hardware view"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/gdb3html.c:712
+#: components/music/nautilus-music-view.c:1512
+msgid "Previous"
+msgstr "ÓýÒ"
+
+#: components/help/converters/gnome-db2html2/gdb3html.c:721
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
+msgid "Home"
+msgstr "­øÄõ"
+
+#: components/help/converters/gnome-db2html2/gdb3html.c:730
+#: components/music/nautilus-music-view.c:1568
+msgid "Next"
+msgstr "«ÎòÐ"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:259
+#: components/notes/Nautilus_View_notes.oaf.in.h:2
+#, fuzzy
+msgid "Notes"
+msgstr "¦À¡Õò¾í¸û ­ø¨Ä"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:709
+#, c-format
+msgid "Table %d."
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:864
+msgid "Up to Table of Contents"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1012
+#, fuzzy, c-format
+msgid "Figure %s"
+msgstr "%s ­ø¨Ä"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1032
+msgid "the section here"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1034
+#, fuzzy
+msgid "the section"
+msgstr "Å¢Çì¸õ"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1090
+#, c-format
+msgid "Figure %d"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1102
+msgid "IMAGE"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:2068
+#: components/help/converters/gnome-db2html2/sect-elements.c:2070
+msgid "Legal Notice"
+msgstr ""
+
+#. This 'Q' is short for 'Question:'
+#: components/help/converters/gnome-db2html2/sect-elements.c:2116
+msgid "Q"
+msgstr ""
+
+#. This 'A' is short for 'Answer'
+#: components/help/converters/gnome-db2html2/sect-elements.c:2128
+msgid "A"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:2151
+#, fuzzy
+msgid "See"
+msgstr "¿¢ÚòÐ"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:2178
+#, fuzzy
+msgid "See also"
+msgstr "­¨¾Ôõ À¡÷"
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:322
+msgid "GNOME Documentation"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:353
+#, fuzzy
+msgid "Copyright"
+msgstr "¿¸¦ÄÎì¸ôÀθ¢ÈÐ"
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:353
+msgid "by"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:355
+#, fuzzy
+msgid "Table of Contents"
+msgstr "¦À¡¾¢ ¦Áý¦À¡Õû «¼ì¸õ"
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:521
+msgid "PREFACE"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:530
+msgid "APPENDIX"
+msgstr ""
+
 #. * From 'man(7)':
 #.
 #. The manual sections are traditionally defined as follows:
@@ -59,64 +285,83 @@ msgstr ""
 #. GNU Public  License  and  many  people  are
 #. working on changes to the kernel)
 #. **
-#: components/help/hyperbola-filefmt.c:396
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:537
+#: components/help/hyperbola-filefmt.c:538
+#: components/help/hyperbola-filefmt.c:539
+#: components/help/hyperbola-filefmt.c:541
+#: components/help/hyperbola-filefmt.c:543
 msgid "Manual"
 msgstr ""
 
-#: components/help/hyperbola-filefmt.c:397
-msgid "System"
-msgstr "«¨ÁôÒ"
-
-#: components/help/hyperbola-filefmt.c:397
-msgid "Configuration"
-msgstr "ÅÊÅõ"
-
-#: components/help/hyperbola-filefmt.c:397
-msgid "Config files"
-msgstr "ÅÊÅì §¸¡ôÒ¸û"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: components/help/hyperbola-filefmt.c:398
-#: components/help/hyperbola-filefmt.c:683 po/tmp/apps.xml.h:7
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:861 data/linksets/apps.xml.h:1
 msgid "Applications"
 msgstr "ÀÂýÀ¡Î¸û"
 
-#: components/help/hyperbola-filefmt.c:398
-msgid "Command Line"
-msgstr "¬¨½Åâ¸û"
-
-#: components/help/hyperbola-filefmt.c:399
-#: components/help/hyperbola-filefmt.c:400
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:543
 msgid "Development"
 msgstr "¯ÕÅ¡ì¸õ"
 
-#: components/help/hyperbola-filefmt.c:399
-#: components/help/hyperbola-filefmt.c:400
-msgid "APIs"
-msgstr "²À¢³"
-
-#: components/help/hyperbola-filefmt.c:399
-msgid "Miscellaneous"
-msgstr "ÀÄŨ¸"
-
-#: components/help/hyperbola-filefmt.c:400
+#: components/help/hyperbola-filefmt.c:532
 msgid "System Calls"
 msgstr "«¨ÁôÀ¢ý «¨ÆôÒ¸û"
 
-#: components/help/hyperbola-filefmt.c:556
-#: libnautilus-extensions/nautilus-stock-dialogs.c:405
+#: components/help/hyperbola-filefmt.c:534
+msgid "Library Functions"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:536
+#, fuzzy
+msgid "Devices"
+msgstr "§º¨Å¸û"
+
+#: components/help/hyperbola-filefmt.c:537
+#, fuzzy
+msgid "Configuration Files"
+msgstr "ÅÊÅõ"
+
+#: components/help/hyperbola-filefmt.c:538
+#, fuzzy
+msgid "Games"
+msgstr "¦ÀÂ÷"
+
+#: components/help/hyperbola-filefmt.c:539
+#, fuzzy
+msgid "Conventions"
+msgstr "¯ûǼì¸õ:"
+
+#: components/help/hyperbola-filefmt.c:541
+msgid "System Administration"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:543
+msgid "Kernel Routines"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:703
 msgid "Info"
 msgstr "¾¸Åø"
 
-#: components/help/hyperbola-nav-index.c:124
+#: components/help/hyperbola-nav-tree.c:310
+msgid "Introductory Documents:"
+msgstr ""
+
+#: components/help/hyperbola-nav-tree.c:324
+msgid "Documents by Subject:"
+msgstr ""
+
+#: components/help/hyperbola-nav-index.c:121
 msgid "see "
 msgstr "À¡÷"
 
-#: components/help/hyperbola-nav-index.c:128
+#: components/help/hyperbola-nav-index.c:125
 msgid "see also "
 msgstr "­¨¾Ôõ À¡÷"
 
@@ -124,43 +369,108 @@ msgstr "­¨¾Ôõ À¡÷"
 msgid "No matches."
 msgstr "¦À¡Õò¾í¸û ­ø¨Ä"
 
-#: components/help/hyperbola-nav-index.c:479
+#: components/help/hyperbola-nav-index.c:476
 msgid " (see \""
 msgstr "(À¡÷ \""
 
-#: components/help/hyperbola-nav-index.c:484
+#: components/help/hyperbola-nav-index.c:479
 msgid " (see also \""
 msgstr "(­¨¾Ôõ À¡÷\""
 
-#: components/image-viewer/nautilus-image-view.c:766
+#: components/help/Nautilus_View_help.oaf.in.h:1
+#: components/services/summary/nautilus-summary-dialogs.c:106
+#, fuzzy
+msgid "Help"
+msgstr "_¯¾Å¢"
+
+#: components/help/Nautilus_View_help.oaf.in.h:2
+msgid "Help Index"
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:3
+#, fuzzy
+msgid "Help Index sidebar panel"
+msgstr "­ÆôÀ÷ µÃôÀð¨¼ì ¸¡ðº¢¨Âì ¦¸¡¨Ä ¦ºö"
+
+#: components/help/Nautilus_View_help.oaf.in.h:4
+#, fuzzy
+msgid "Help Navigation Tree"
+msgstr "¯Ä¡×¾ø"
+
+#: components/help/Nautilus_View_help.oaf.in.h:5
+#, fuzzy
+msgid "Help Search"
+msgstr "ŨÄò §¾¼ø"
+
+#: components/help/Nautilus_View_help.oaf.in.h:6
+#, fuzzy
+msgid "Help Search sidebar panel"
+msgstr "­ÆôÀ÷ µÃôÀð¨¼ì ¸¡ðº¢¨Âì ¦¸¡¨Ä ¦ºö"
+
+#: components/help/Nautilus_View_help.oaf.in.h:7
+#, fuzzy
+msgid "Help sidebar panel"
+msgstr "µÃôÀð¨¼ô Àĸí¸û"
+
+#: components/help/Nautilus_View_help.oaf.in.h:8
+msgid "Internal use only"
+msgstr ""
+
+#: components/history/Nautilus_View_history.oaf.in.h:1
+msgid "Factory for history views"
+msgstr ""
+
+#: components/history/Nautilus_View_history.oaf.in.h:2
+#, fuzzy
+msgid "History"
+msgstr "­ýÚ"
+
+#: components/history/Nautilus_View_history.oaf.in.h:3
+#, fuzzy
+msgid "History sidebar panel"
+msgstr "­ÆôÀ÷ µÃôÀð¨¼ì ¸¡ðº¢¨Âì ¦¸¡¨Ä ¦ºö"
+
+#: components/history/Nautilus_View_history.oaf.in.h:4
+#, fuzzy
+msgid "History sidebar panel for Nautilus"
+msgstr "ÌÚõÀ¼ò¾¢ø ¯ûÇ ¯¨Ã¨Âì ¸¡ðÎ"
+
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "¦À¡§É¡§À¡¨Å ±ýÉ¡ø ¦¾¡¼ì¸ ÓÊÂÅ¢ø¨Ä"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: po/tmp/nautilus-content-loser-ui.xml.h:7
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:1
+msgid "Generic Image Viewer"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:2
+msgid "Generic image control factory"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:3
 #, fuzzy
-msgid "Kill Content Loser"
-msgstr "¦À¡ÕǼì¸ì ¸¡ðº¢¨Âì ¦¸¡¨Ä¦ºö"
+msgid "Image"
+msgstr "¯ÕÅí¸û ÁðÎõ"
 
-#: po/tmp/nautilus-content-loser-ui.xml.h:8
-msgid "Kill the Loser content view"
-msgstr "­ÆôÀ÷ ¦À¡Õû «¼ì¸ì ¸¡ðº¢¨Âì ¦¸¡¨Ä¦ºö"
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:4
+#, fuzzy
+msgid "Image Viewer"
+msgstr "%s ¸¡ðÊ"
 
-#: po/tmp/nautilus-content-loser-ui.xml.h:9
-#: po/tmp/nautilus-mozilla-ui.xml.h:10
-#: po/tmp/nautilus-sample-content-view-ui.xml.h:10
-#: po/tmp/nautilus-shell-ui.xml.h:84 po/tmp/nautilus-sidebar-loser-ui.xml.h:9
-msgid "_File"
-msgstr "_§¸¡ôÒ"
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:5
+#, fuzzy
+msgid "Nautilus Image Viewer"
+msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ §¾÷ó¦¾ÎôÀ¡ý"
 
-#: po/tmp/nautilus-content-loser-ui.xml.h:10
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:6
 #, fuzzy
-msgid "_Kill Content Loser"
-msgstr "_¦À¡Õû «¼ì¸ì ¸¡ðº¢¨Âì ¦¸¡¨Ä¦ºö"
+msgid "Nautilus Image viewer factory"
+msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ §¾÷ó¦¾ÎôÀ¡ý"
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:7
+#, fuzzy
+msgid "View as Image"
+msgstr "%s §À¡ýÈ ¸¡ðº¢ "
 
 #: components/loser/content/nautilus-content-loser.c:140
 #, c-format
@@ -177,25 +487,63 @@ msgstr ""
 msgid "You have tried to kill the Content Loser"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: po/tmp/nautilus-sidebar-loser-ui.xml.h:7
+#: components/loser/content/nautilus-content-loser-ui.xml.h:1
 #, fuzzy
-msgid "Kill Sidebar Loser"
-msgstr "_µÃôÀð¨¼ì ¸¡ðº¢¨Âì ¦¸¡¨Ä¦ºö"
+msgid "Kill Content Loser"
+msgstr "¦À¡ÕǼì¸ì ¸¡ðº¢¨Âì ¦¸¡¨Ä¦ºö"
+
+#: components/loser/content/nautilus-content-loser-ui.xml.h:2
+msgid "Kill the Loser content view"
+msgstr "­ÆôÀ÷ ¦À¡Õû «¼ì¸ì ¸¡ðº¢¨Âì ¦¸¡¨Ä¦ºö"
+
+#: components/loser/content/nautilus-content-loser-ui.xml.h:3
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
+#: components/sample/nautilus-sample-content-view-ui.xml.h:4
+#: src/nautilus-shell-ui.xml.h:81
+msgid "_File"
+msgstr "_§¸¡ôÒ"
 
-#: po/tmp/nautilus-sidebar-loser-ui.xml.h:8
+#: components/loser/content/nautilus-content-loser-ui.xml.h:4
 #, fuzzy
-msgid "Kill the Loser sidebar panel"
-msgstr "­ÆôÀ÷ µÃôÀð¨¼ì ¸¡ðº¢¨Âì ¦¸¡¨Ä ¦ºö"
+msgid "_Kill Content Loser"
+msgstr "_¦À¡Õû «¼ì¸ì ¸¡ðº¢¨Âì ¦¸¡¨Ä¦ºö"
 
-#: po/tmp/nautilus-sidebar-loser-ui.xml.h:10
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:1
 #, fuzzy
-msgid "_Kill Sidebar Loser"
-msgstr "_µÃôÀð¨¼ì ¸¡ðº¢¨Âì ¦¸¡¨Ä¦ºö"
+msgid "Content Loser"
+msgstr "¦À¡ÕǼì¸ì ¸¡ðº¢¨Âì ¦¸¡¨Ä¦ºö"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:2
+#, fuzzy
+msgid "Content Loser Viewer"
+msgstr "¦À¡ÕǼì¸ì ¸¡ðº¢¨Âì ¦¸¡¨Ä¦ºö"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:3
+#, fuzzy
+msgid "Nautilus Content Loser"
+msgstr "¦À¡ÕǼì¸ì ¸¡ðº¢¨Âì ¦¸¡¨Ä¦ºö"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:4
+msgid "Nautilus content loser component's factory"
+msgstr ""
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:5
+#, fuzzy
+msgid "Nautilus content loser factory"
+msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ §¾÷ó¦¾ÎôÀ¡ý"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:6
+#, fuzzy
+msgid "Nautilus content view that fails on command"
+msgstr ""
+"%s\n"
+"\n"
+"§¸ðÌõ §À¡Ð §¾¡üÌõ ¿¡ÊÄŠ ¦À¡Õû «¼ì¸ì ¸¡ðº¢"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:7
+#, fuzzy
+msgid "View as Content Loser"
+msgstr "¦À¡ÕǼì¸ì ¸¡ðº¢¨Âì ¦¸¡¨Ä¦ºö"
 
 #: components/loser/sidebar/nautilus-sidebar-loser.c:143
 #, fuzzy, c-format
@@ -209,469 +557,1754 @@ msgstr "­ÆôÀ÷ µÃôÀð¨¼"
 msgid "You have tried to kill the Sidebar Loser"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: po/tmp/nautilus-mozilla-ui.xml.h:7
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:1
+#, fuzzy
+msgid "Kill Sidebar Loser"
+msgstr "_µÃôÀð¨¼ì ¸¡ðº¢¨Âì ¦¸¡¨Ä¦ºö"
+
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:2
 #, fuzzy
-msgid "Mozilla Test"
-msgstr "§Á¡º¢øÄ¡"
+msgid "Kill the Loser sidebar panel"
+msgstr "­ÆôÀ÷ µÃôÀð¨¼ì ¸¡ðº¢¨Âì ¦¸¡¨Ä ¦ºö"
 
-#: po/tmp/nautilus-mozilla-ui.xml.h:8
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:4
 #, fuzzy
-msgid "This is a Mozilla merged menu item"
-msgstr "­Ð ´Õ §Á¡º¢øÄ¡ ­¨½ó¾ ÀðÊ ¯ÕôÀÊ"
+msgid "_Kill Sidebar Loser"
+msgstr "_µÃôÀð¨¼ì ¸¡ðº¢¨Âì ¦¸¡¨Ä¦ºö"
 
-#: po/tmp/nautilus-mozilla-ui.xml.h:9
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:1
 #, fuzzy
-msgid "This is a Mozilla merged tool bar button"
-msgstr "­Ð ´Õ §Á¡º¢øÄ¡ ­¨½ó¾ ¸ÕÅ¢ôÀ𨼠¦À¡ò¾¡ý"
+msgid "Nautilus Sidebar Loser"
+msgstr "_µÃôÀð¨¼ì ¸¡ðº¢¨Âì ¦¸¡¨Ä¦ºö"
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:2
+msgid "Nautilus sidebar loser component's factory"
+msgstr ""
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:3
+#, fuzzy
+msgid "Nautilus sidebar loser factory"
+msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ §¾÷ó¦¾ÎôÀ¡ý"
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:4
+#, fuzzy
+msgid "Nautilus sidebar view that fails on command"
+msgstr ""
+"%s\n"
+"\n"
+"§¸ðÌõ §À¡Ð §¾¡üÌõ ¿¡ÊÄŠ ¦À¡Õû «¼ì¸ì ¸¡ðº¢"
 
-#: po/tmp/nautilus-mozilla-ui.xml.h:11
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:5
 #, fuzzy
-msgid "_Mozilla Test"
-msgstr "_§Á¡º¢øÄ¡"
+msgid "Sidebar Loser"
+msgstr "_µÃôÀð¨¼ì ¸¡ðº¢¨Âì ¦¸¡¨Ä¦ºö"
+
+#: components/mozilla/mozilla-preferences.cpp:126
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr ""
+"GConf À¢¨Æ:\n"
+" %s"
+
+#: components/mozilla/mozilla-preferences.cpp:133
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s\n"
+"All further errors shown only on terminal"
+msgstr ""
+"GConf À¢¨Æ:\n"
+"  %s\n"
+"­É¢ ²üÀÎõ À¢¨Æ¸û Ó¨ÉÂò¾¢ø ÁðΧÁ ¸¡ð¼ôÀÎõ"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:38
+msgid "Arabic"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:39
+#, fuzzy
+msgid "Baltic"
+msgstr "À¢ýÒ"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:40
+msgid "Central European"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:41
+#, fuzzy
+msgid "Chinese"
+msgstr "¾¼í¸û"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:42
+msgid "Cyrillic"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:43
+msgid "Greek"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:44
+msgid "Hebrew"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:45
+msgid "Japanese"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:46
+#, fuzzy
+msgid "Turkish"
+msgstr "Ìô¨Àò ¦¾¡ðÊ"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:47
+msgid "Unicode"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:48
+msgid "UTF"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:49
+#, fuzzy
+msgid "Vietnamese"
+msgstr "¦ÀÂ÷ Á¡üÚ"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:50
+#, fuzzy
+msgid "Western"
+msgstr "¦¾¡¼íÌ¿÷"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:55
+msgid "Arabic (IBM-864)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:56
+msgid "Arabic (ISO-8859-6)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:57
+msgid "Arabic (ISO-8859-6-E)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:58
+msgid "Arabic (ISO-8859-6-I)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:59
+msgid "Arabic (Windows-1256)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:60
+msgid "Armenian (ARMSCII-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:61
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:62
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:63
+msgid "Baltic (Windows-1257)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:64
+msgid "Celtic (ISO-8859-14)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:65
+msgid "Central European (IBM-852)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:66
+msgid "Central European (ISO-8859-2)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:67
+msgid "Central European (MacCE)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:68
+msgid "Central European (Windows-1250)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:69
+msgid "Chinese Simplified (GB2312)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:70
+msgid "Chinese Simplified (GBK)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:71
+msgid "Chinese Simplified (HZ)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:72
+msgid "Chinese Traditional (Big5)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:73
+msgid "Chinese Traditional (EUC-TW)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:74
+msgid "Croatian (MacCroatian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:75
+msgid "Cyrillic (IBM-855)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:76
+msgid "Cyrillic (ISO-8859-5)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:77
+msgid "Cyrillic (ISO-IR-111)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:78
+msgid "Cyrillic (MacCyrillic)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:79
+msgid "Cyrillic (Windows-1251)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:80
+msgid "Cyrillic/Russian (IBM-866)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:81
+msgid "Cyrillic/Russian (KOI8-R)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:82
+msgid "Cyrillic/Ukrainian (KOI8-U)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:83
+msgid "Cyrillic/Ukrainian (MacUkrainian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:84
+msgid "English (US-ASCII)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:85
+msgid "Greek (ISO-8859-7)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:86
+msgid "Greek (MacGreek)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:87
+msgid "Greek (Windows-1253)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:88
+msgid "Hebrew (IBM-862)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:89
+msgid "Hebrew (ISO-8859-8-E)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:90
+msgid "Hebrew (ISO-8859-8-I)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:91
+msgid "Hebrew (Windows-1255)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:92
+msgid "Icelandic (MacIcelandic)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:93
+msgid "Japanese (EUC-JP)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:94
+msgid "Japanese (ISO-2022-JP)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:95
+msgid "Japanese (Shift_JIS)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:96
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:97
+msgid "Nordic (ISO-8859-10)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:98
+msgid "Romanian (MacRomanian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:99
+msgid "South European (ISO-8859-3)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:100
+msgid "T.61-8bit"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:101
+msgid "Thai (TIS-620)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:102
+msgid "Turkish (IBM-857)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:103
+msgid "Turkish (ISO-8859-9)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:104
+msgid "Turkish (MacTurkish)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:105
+msgid "Turkish (Windows-1254)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:106
+msgid "Unicode (UTF-7)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:107
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:108
+#, fuzzy
+msgid "User Defined"
+msgstr "ÀÂÉ÷ «¨¼×"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:109
+msgid "UTF-16BE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:110
+msgid "UTF-16LE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:111
+msgid "UTF-32BE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:112
+msgid "UTF-32LE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:113
+msgid "Vietnamese (TCVN)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:114
+msgid "Vietnamese (VISCII)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:115
+msgid "Vietnamese (VPS)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:116
+msgid "Vietnamese (Windows-1258)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:117
+msgid "Visual Hebrew (ISO-8859-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:118
+msgid "Western (IBM-850)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:119
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:120
+msgid "Western (ISO-8859-15)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:121
+msgid "Western (MacRoman)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:122
+msgid "Western (Windows-1252)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:123
+msgid "windows-936"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:124
+msgid "x-imap4-modified-utf7"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:125
+msgid "x-u-escaped"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-content-view.c:809
+msgid ""
+"A JavaScript function (small software program) on this page tried to open a "
+"new window, but nautilus does not support the opening of new windows by "
+"JavaScript.\n"
+"\n"
+"Try viewing the page in a different web browser, such as Mozilla or Netscape."
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-content-view.c:810
+msgid "Nautilus Mozilla View Warning"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-ui.xml.h:1
+msgid "Charset Encoding"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:1
+#, fuzzy
+msgid "Mozilla Nautilus view"
+msgstr "±øÄ¡ ¿¡ÊÄŠ º¡ÇÃí¸¨ÇÔõ ãÎ"
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:2
+msgid "Mozilla Nautilus view factory"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:3
+#, fuzzy
+msgid "Mozilla content view component"
+msgstr ""
+"%s\n"
+"\n"
+"­ó¾ Á¡¾¢Ã¢ ¿¡ÊÄŠ ¦À¡ÕÇ¼ì¸ ¸¡ðº¢ì ÜÚ."
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:4
+msgid "Mozilla content view component's factory"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:5
+#, fuzzy
+msgid "View as Web Page"
+msgstr "ÁüȨŠ§À¡ø À¡÷ì¸"
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:6
+msgid "Web Page"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:7
+msgid "Web Page Viewer"
+msgstr ""
+
+#: components/music/mpg123.c:29
+#, fuzzy
+msgid "Blues"
+msgstr "À½¢Â¢ø"
+
+#: components/music/mpg123.c:29
+msgid "Classic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:29
+msgid "Country"
+msgstr ""
+
+#: components/music/mpg123.c:29
+#, fuzzy
+msgid "Dance"
+msgstr "ÓÊó¾Ð"
+
+#: components/music/mpg123.c:30
+#, fuzzy
+msgid "Disco"
+msgstr "Åðθû"
+
+#: components/music/mpg123.c:30
+msgid "Funk"
+msgstr ""
+
+#: components/music/mpg123.c:30
+#, fuzzy
+msgid "Grunge"
+msgstr "±ØÐ"
+
+#: components/music/mpg123.c:30
+msgid "Hip-Hop"
+msgstr ""
+
+#: components/music/mpg123.c:31
+msgid "Jazz"
+msgstr ""
+
+#: components/music/mpg123.c:31
+#, fuzzy
+msgid "Metal"
+msgstr "Å¢ÅÃí¸û"
+
+#: components/music/mpg123.c:31
+msgid "New Age"
+msgstr ""
+
+#: components/music/mpg123.c:31
+msgid "Oldies"
+msgstr ""
+
+#: components/music/mpg123.c:32
+#, fuzzy
+msgid "Other"
+msgstr "ÁüȨÅ:"
+
+#: components/music/mpg123.c:32
+msgid "Pop"
+msgstr ""
+
+#: components/music/mpg123.c:32
+msgid "R&B"
+msgstr ""
+
+#: components/music/mpg123.c:32
+msgid "Rap"
+msgstr ""
+
+#: components/music/mpg123.c:32
+#, fuzzy
+msgid "Reggae"
+msgstr "¦ÀÂ÷ Á¡üÚ"
+
+#: components/music/mpg123.c:33
+msgid "Rock"
+msgstr ""
+
+#: components/music/mpg123.c:33
+msgid "Techno"
+msgstr ""
+
+#: components/music/mpg123.c:33
+#, fuzzy
+msgid "Industrial"
+msgstr "¿¢ÚÅø"
+
+#: components/music/mpg123.c:33
+msgid "Alternative"
+msgstr ""
 
-#. FIXME: I think this is not portable. It works in gcc, but not other C compilers.
-#: components/music/nautilus-music-view.c:212
-msgid "Track "
+#: components/music/mpg123.c:34
+#, fuzzy
+msgid "Ska"
+msgstr "´ðÎõ"
+
+#: components/music/mpg123.c:34
+msgid "Death Metal"
+msgstr ""
+
+#: components/music/mpg123.c:34
+#, fuzzy
+msgid "Pranks"
+msgstr "ШÈ:"
+
+#: components/music/mpg123.c:34
+msgid "Soundtrack"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Euro-Techno"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Ambient"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Trip-Hop"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Vocal"
+msgstr ""
+
+#: components/music/mpg123.c:36
+msgid "Jazz+Funk"
+msgstr ""
+
+#: components/music/mpg123.c:36
+#, fuzzy
+msgid "Fusion"
+msgstr "Ţɡì¸û"
+
+#: components/music/mpg123.c:36
+#, fuzzy
+msgid "Trance"
+msgstr "¾¼õ"
+
+#: components/music/mpg123.c:36
+msgid "Classical"
+msgstr ""
+
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "Instrumental"
+msgstr "¿¢ÚÅø"
+
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "Acid"
+msgstr "¿¸¦ÄÎì¸ôÀð¼Ð"
+
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "House"
+msgstr "­øÄõ"
+
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "Game"
+msgstr "¦ÀÂ÷"
+
+#: components/music/mpg123.c:38
+msgid "Sound Clip"
+msgstr ""
+
+#: components/music/mpg123.c:38
+msgid "Gospel"
+msgstr ""
+
+#: components/music/mpg123.c:38
+#, fuzzy
+msgid "Noise"
+msgstr "­ÆôÀ÷"
+
+#: components/music/mpg123.c:38
+msgid "Alt"
+msgstr ""
+
+#: components/music/mpg123.c:39
+#, fuzzy
+msgid "Bass"
+msgstr "À¢ýÒ"
+
+#: components/music/mpg123.c:39
+#, fuzzy
+msgid "Soul"
+msgstr "­Ãð¨¼"
+
+#: components/music/mpg123.c:39
+msgid "Punk"
+msgstr ""
+
+#: components/music/mpg123.c:39
+#, fuzzy
+msgid "Space"
+msgstr "Á¡üÚ"
+
+#: components/music/mpg123.c:40
+msgid "Meditative"
+msgstr ""
+
+#: components/music/mpg123.c:40
+msgid "Instrumental Pop"
+msgstr ""
+
+#: components/music/mpg123.c:41
+msgid "Instrumental Rock"
+msgstr ""
+
+#: components/music/mpg123.c:41
+msgid "Ethnic"
+msgstr ""
+
+#: components/music/mpg123.c:41
+#, fuzzy
+msgid "Gothic"
+msgstr "´ýÚÁ¢ø¨Ä"
+
+#: components/music/mpg123.c:42
+msgid "Darkwave"
+msgstr ""
+
+#: components/music/mpg123.c:42
+msgid "Techno-Industrial"
+msgstr ""
+
+#: components/music/mpg123.c:42
+msgid "Electronic"
+msgstr ""
+
+#: components/music/mpg123.c:43
+msgid "Pop-Folk"
+msgstr ""
+
+#: components/music/mpg123.c:43
+msgid "Eurodance"
+msgstr ""
+
+#: components/music/mpg123.c:43
+msgid "Dream"
+msgstr ""
+
+#: components/music/mpg123.c:44
+msgid "Southern Rock"
+msgstr ""
+
+#: components/music/mpg123.c:44
+#, fuzzy
+msgid "Comedy"
+msgstr "ÌÈ¢ôÒ¨Ã"
+
+#: components/music/mpg123.c:44
+msgid "Cult"
+msgstr ""
+
+#: components/music/mpg123.c:45
+msgid "Gangsta Rap"
+msgstr ""
+
+#: components/music/mpg123.c:45
+msgid "Top 40"
+msgstr ""
+
+#: components/music/mpg123.c:45
+msgid "Christian Rap"
+msgstr ""
+
+#: components/music/mpg123.c:46
+msgid "Pop/Funk"
+msgstr ""
+
+#: components/music/mpg123.c:46
+#, fuzzy
+msgid "Jungle"
+msgstr "´ü¨È"
+
+#: components/music/mpg123.c:46
+msgid "Native American"
+msgstr ""
+
+#: components/music/mpg123.c:47
+#, fuzzy
+msgid "Cabaret"
+msgstr "¸Å¢Âð"
+
+#: components/music/mpg123.c:47
+#, fuzzy
+msgid "New Wave"
+msgstr "±ýÚõ ­ø¨Ä"
+
+#: components/music/mpg123.c:47
+msgid "Psychedelic"
+msgstr ""
+
+#: components/music/mpg123.c:47
+#, fuzzy
+msgid "Rave"
+msgstr "¸Å¢Âð"
+
+#: components/music/mpg123.c:48
+msgid "Showtunes"
+msgstr ""
+
+#: components/music/mpg123.c:48
+#, fuzzy
+msgid "Trailer"
+msgstr "¾¨ÄôÒ"
+
+#: components/music/mpg123.c:48
+#, fuzzy
+msgid "Lo-Fi"
+msgstr "­¼õ"
+
+#: components/music/mpg123.c:48
+msgid "Tribal"
+msgstr ""
+
+#: components/music/mpg123.c:49
+msgid "Acid Punk"
+msgstr ""
+
+#: components/music/mpg123.c:49
+msgid "Acid Jazz"
+msgstr ""
+
+#: components/music/mpg123.c:49
+#, fuzzy
+msgid "Polka"
+msgstr "­ÂìÌ"
+
+#: components/music/mpg123.c:49
+#, fuzzy
+msgid "Retro"
+msgstr "ÁÚÓÂüº¢"
+
+#: components/music/mpg123.c:50
+#, fuzzy
+msgid "Musical"
+msgstr "­¨º"
+
+#: components/music/mpg123.c:50
+msgid "Rock & Roll"
+msgstr ""
+
+#: components/music/mpg123.c:50
+msgid "Hard Rock"
+msgstr ""
+
+#: components/music/mpg123.c:50
+msgid "Folk"
+msgstr ""
+
+#: components/music/mpg123.c:51
+msgid "Folk/Rock"
+msgstr ""
+
+#: components/music/mpg123.c:51
+msgid "National Folk"
+msgstr ""
+
+#: components/music/mpg123.c:51
+msgid "Swing"
+msgstr ""
+
+#: components/music/mpg123.c:52
+msgid "Fast-Fusion"
+msgstr ""
+
+#: components/music/mpg123.c:52
+msgid "Bebob"
+msgstr ""
+
+#: components/music/mpg123.c:52
+#, fuzzy
+msgid "Latin"
+msgstr "­¼õ"
+
+#: components/music/mpg123.c:52
+msgid "Revival"
+msgstr ""
+
+#: components/music/mpg123.c:53
+msgid "Celtic"
+msgstr ""
+
+#: components/music/mpg123.c:53
+msgid "Bluegrass"
+msgstr ""
+
+#: components/music/mpg123.c:53
+msgid "Avantgarde"
+msgstr ""
+
+#: components/music/mpg123.c:54
+msgid "Gothic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:54
+#, fuzzy
+msgid "Progressive Rock"
+msgstr "Óý§ÉüÈõ"
+
+#: components/music/mpg123.c:55
+msgid "Psychedelic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:55
+msgid "Symphonic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:55
+msgid "Slow Rock"
+msgstr ""
+
+#: components/music/mpg123.c:56
+#, fuzzy
+msgid "Big Band"
+msgstr "ÁüÚõ"
+
+#: components/music/mpg123.c:56
+#, fuzzy
+msgid "Chorus"
+msgstr "¦¾Ã¢× ¦ºö"
+
+#: components/music/mpg123.c:56
+msgid "Easy Listening"
+msgstr ""
+
+#: components/music/mpg123.c:57
+#, fuzzy
+msgid "Acoustic"
+msgstr "­¨º"
+
+#: components/music/mpg123.c:57
+msgid "Humour"
+msgstr ""
+
+#: components/music/mpg123.c:57
+#, fuzzy
+msgid "Speech"
+msgstr "§¾Î"
+
+#: components/music/mpg123.c:57
+#, fuzzy
+msgid "Chanson"
+msgstr "¾¼í¸û"
+
+#: components/music/mpg123.c:58
+#, fuzzy
+msgid "Opera"
+msgstr "¾¢È"
+
+#: components/music/mpg123.c:58
+msgid "Chamber Music"
+msgstr ""
+
+#: components/music/mpg123.c:58
+#, fuzzy
+msgid "Sonata"
+msgstr "±ØòРŨ¸"
+
+#: components/music/mpg123.c:58
+msgid "Symphony"
+msgstr ""
+
+#: components/music/mpg123.c:59
+msgid "Booty Bass"
+msgstr ""
+
+#: components/music/mpg123.c:59
+#, fuzzy
+msgid "Primus"
+msgstr "ÓýÒ"
+
+#: components/music/mpg123.c:59
+msgid "Porn Groove"
+msgstr ""
+
+#: components/music/mpg123.c:60
+#, fuzzy
+msgid "Satire"
+msgstr "¿¢ÚòÐ"
+
+#: components/music/mpg123.c:60
+msgid "Slow Jam"
+msgstr ""
+
+#: components/music/mpg123.c:60
+msgid "Club"
+msgstr ""
+
+#: components/music/mpg123.c:60
+msgid "Tango"
+msgstr ""
+
+#: components/music/mpg123.c:61
+msgid "Samba"
+msgstr ""
+
+#: components/music/mpg123.c:61
+msgid "Folklore"
+msgstr ""
+
+#: components/music/mpg123.c:61
+msgid "Ballad"
+msgstr ""
+
+#: components/music/mpg123.c:61
+msgid "Power Ballad"
+msgstr ""
+
+#: components/music/mpg123.c:62
+msgid "Rhythmic Soul"
+msgstr ""
+
+#: components/music/mpg123.c:62
+msgid "Freestyle"
+msgstr ""
+
+#: components/music/mpg123.c:62
+#, fuzzy
+msgid "Duet"
+msgstr "«Æ¢ò¾ø"
+
+#: components/music/mpg123.c:63
+msgid "Punk Rock"
+msgstr ""
+
+#: components/music/mpg123.c:63
+msgid "Drum Solo"
+msgstr ""
+
+#: components/music/mpg123.c:63
+msgid "A Cappella"
+msgstr ""
+
+#: components/music/mpg123.c:64
+msgid "Euro-House"
+msgstr ""
+
+#: components/music/mpg123.c:64
+msgid "Dance Hall"
+msgstr ""
+
+#: components/music/mpg123.c:64
+#, fuzzy
+msgid "Goa"
+msgstr "_¦ºø"
+
+#: components/music/mpg123.c:65
+msgid "Drum & Bass"
+msgstr ""
+
+#: components/music/mpg123.c:65
+#, fuzzy
+msgid "Club-House"
+msgstr "ãÎ"
+
+#: components/music/mpg123.c:65
+#, fuzzy
+msgid "Hardcore"
+msgstr "«¨Å «¨¼×¸û"
+
+#: components/music/mpg123.c:66
+msgid "Terror"
+msgstr ""
+
+#: components/music/mpg123.c:66
+#, fuzzy
+msgid "Indie"
+msgstr "¾¸Åø"
+
+#: components/music/mpg123.c:66
+msgid "BritPop"
+msgstr ""
+
+#: components/music/mpg123.c:66
+msgid "Negerpunk"
+msgstr ""
+
+#: components/music/mpg123.c:67
+msgid "Polsk Punk"
+msgstr ""
+
+#: components/music/mpg123.c:67
+#, fuzzy
+msgid "Beat"
+msgstr "¸Å¢Âð"
+
+#: components/music/mpg123.c:67
+msgid "Christian Gangsta Rap"
+msgstr ""
+
+#: components/music/mpg123.c:68
+msgid "Heavy Metal"
+msgstr ""
+
+#: components/music/mpg123.c:68
+#, fuzzy
+msgid "Black Metal"
+msgstr "À¢ýÒ"
+
+#: components/music/mpg123.c:68
+msgid "Crossover"
+msgstr ""
+
+#: components/music/mpg123.c:69
+msgid "Contemporary Christian"
+msgstr ""
+
+#: components/music/mpg123.c:69
+msgid "Christian Rock"
+msgstr ""
+
+#: components/music/mpg123.c:70
+msgid "Merengue"
+msgstr ""
+
+#: components/music/mpg123.c:70
+#, fuzzy
+msgid "Salsa"
+msgstr "Á¡¾¢Ã¢"
+
+#: components/music/mpg123.c:70
+#, fuzzy
+msgid "Thrash Metal"
+msgstr "¿¼ò¨¾¨Âì Ìô¨À¢ø ¾ûÙ¸"
+
+#: components/music/mpg123.c:71
+#, fuzzy
+msgid "Anime"
+msgstr "¸¡Äõ"
+
+#: components/music/mpg123.c:71
+msgid "JPop"
+msgstr ""
+
+#: components/music/mpg123.c:71
+#, fuzzy
+msgid "Synthpop"
+msgstr "¿¢ÚòÐ"
+
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Track"
 msgstr "¾¼õ"
 
-#: components/music/nautilus-music-view.c:212
+#: components/music/nautilus-music-view.c:238
 msgid "Title"
 msgstr "¾¨ÄôÒ"
 
-#: components/music/nautilus-music-view.c:212
+#: components/music/nautilus-music-view.c:238
 msgid "Artist"
 msgstr "¸¨Ä»ý"
 
-#: components/music/nautilus-music-view.c:212
+#: components/music/nautilus-music-view.c:238
 msgid "Year"
 msgstr "¬ñÎ"
 
-#: components/music/nautilus-music-view.c:212
-msgid "Bitrate "
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Bit Rate"
 msgstr "н¢ÐÊôÀ£Î"
 
-#: components/music/nautilus-music-view.c:212
-msgid "Time "
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Time"
 msgstr "¸¡Äõ"
 
-#: components/music/nautilus-music-view.c:212
+#: components/music/nautilus-music-view.c:238
 msgid "Album"
 msgstr "¾¢ÃðÎ"
 
-#: components/music/nautilus-music-view.c:212
+#: components/music/nautilus-music-view.c:238
 msgid "Comment"
 msgstr "ÌÈ¢ôÒ¨Ã"
 
-#: components/music/nautilus-music-view.c:212
+#: components/music/nautilus-music-view.c:238
 msgid "Channels"
 msgstr "¾¼í¸û"
 
-#: components/music/nautilus-music-view.c:212
+#: components/music/nautilus-music-view.c:238
 msgid "Sample Rate"
 msgstr "Á¡¾¢Ã¢òÐÊôÀ£Î"
 
-#: components/music/nautilus-music-view.c:310
+#: components/music/nautilus-music-view.c:350
 #, fuzzy
 msgid "Set Cover Image"
 msgstr "ÀÂÉ÷ «¨¼Â¡Çò¨¾ «¨Á"
 
-#: components/music/nautilus-music-view.c:469
+#: components/music/nautilus-music-view.c:694
 #, fuzzy, c-format
 msgid "Sorry, but '%s' is not a usable image file."
 msgstr "ÁýÉ¢ì¸×õ, ¬É¡ø '%s' ´Õ ¯ÕÅõ «øÄ!"
 
-#: components/music/nautilus-music-view.c:471
-#: src/nautilus-property-browser.c:980 src/nautilus-property-browser.c:1116
+#: components/music/nautilus-music-view.c:696
+#: src/nautilus-property-browser.c:1060 src/nautilus-property-browser.c:1312
 msgid "Not an Image"
 msgstr "¯ÕÅõ «øÄ"
 
-#: components/music/nautilus-music-view.c:519
+#: components/music/nautilus-music-view.c:744
 #, fuzzy
 msgid "Select an image file for the album cover:"
 msgstr "Ò¾¢Â º¢ýÉò¾¢üÌ , ¯ÕÅì §¸¡ôÒ  ´ý¨Èò ¦¾Ã¢× ¦ºö"
 
-#: components/music/nautilus-music-view.c:1023
+#: components/music/nautilus-music-view.c:1174
+msgid ""
+"Sorry, but the music view is unable to play back sound right now. Either "
+"another program is using or blocking the sound card, or your sound card is "
+"not configured properly. Try quitting any applications that may be blocking "
+"use of the sound card."
+msgstr ""
+
+#: components/music/nautilus-music-view.c:1178
+msgid "Unable to Play File"
+msgstr ""
+
+#: components/music/nautilus-music-view.c:1199
 #, fuzzy
 msgid "Sorry, but the music view can't play non-local files yet."
 msgstr "ÁýÉ¢ì¸, ¬É¡ø ­¨ºì ¸¡ðº¢ «ñ¨Á¢ø ­øÄ¡¾ §¸¡ôÒ¸¨Ç ­Âì¸Å¢ÂÄ¡Ð!"
 
-#: components/music/nautilus-music-view.c:1024
+#: components/music/nautilus-music-view.c:1200
 msgid "Can't Play Remote Files"
 msgstr "¦¾¡¨ÄÅ¢ø ¿¢Ä×õ §¸¡ôÒ¸¨Ç ­Âì¸Å¢ÂÄ¡Ð!"
 
-#: components/music/nautilus-music-view.c:1360
+#: components/music/nautilus-music-view.c:1486
 msgid "Drag to seek within track"
 msgstr ""
 
-#: components/music/nautilus-music-view.c:1383
-msgid "Previous"
-msgstr "ÓýÒ"
-
-#: components/music/nautilus-music-view.c:1398
+#: components/music/nautilus-music-view.c:1526
 msgid "Play"
 msgstr "­ÂìÌ"
 
-#: components/music/nautilus-music-view.c:1413
+#: components/music/nautilus-music-view.c:1540
 msgid "Pause"
 msgstr "ºüÚ ó¢ÚòÐ"
 
-#: components/music/nautilus-music-view.c:1427
-#: libnautilus-extensions/nautilus-file-operations.c:586
-#: libnautilus-extensions/nautilus-file-operations.c:643
-#: libnautilus-extensions/nautilus-file-operations.c:714
-#: po/tmp/nautilus-shell-ui.xml.h:63
+#: components/music/nautilus-music-view.c:1554
+#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "¿¢ÚòÐ"
 
-#: components/music/nautilus-music-view.c:1441
-msgid "Next"
-msgstr "«ÎòÐ"
-
-#: components/music/nautilus-music-view.c:1454
-msgid "Sound hardware missing or busy!"
-msgstr "´Ä¢ Åý¦À¡Õû ¸¡ñÅ¢ø¨Ä «øÄÐ À½¢Â¢ø!"
-
-#: components/music/nautilus-music-view.c:1558
+#: components/music/nautilus-music-view.c:1679
 #, c-format
 msgid "Sorry, but there was an error reading %s."
 msgstr "ÁýÉ¢ì¸, ¬Â¢ý %s ³ô ÀÊì¸ ÓÂÖõ§À¡Ð À¢¨Æ"
 
-#: components/music/nautilus-music-view.c:1559
+#: components/music/nautilus-music-view.c:1680
 #, fuzzy
 msgid "Can't Read Folder"
 msgstr "¾¨ÄôÀ¢Ä¡ «¨¼×"
 
-#: components/music/nautilus-music-view.c:1634
+#: components/music/nautilus-music-view.c:1750
 #, fuzzy
 msgid "Stereo"
 msgstr "¿¢ÚòÐ"
 
-#: components/music/nautilus-music-view.c:1634
+#: components/music/nautilus-music-view.c:1750
 #, fuzzy
 msgid "Mono"
 msgstr "¿¸÷ò¾ôÀθ¢ÈÐ"
 
-#: components/music/nautilus-music-view.c:1676
+#: components/music/nautilus-music-view.c:1792
 #, fuzzy, c-format
-msgid "%s by %s"
+msgid "%s - %s"
 msgstr "%s%s, %s"
 
-#. set up the window title
-#: components/rpmview/nautilus-rpm-verify-window.c:182
-#, c-format
-msgid "Verifying %s..."
-msgstr "%s  ºÃ¢ôÀ¡÷ì¸Àθ¢ÈÐ..."
-
-#: components/rpmview/nautilus-rpm-view-install.c:107
-#, c-format
-msgid "%s would not work anymore\n"
-msgstr "%s ­É¢ À½¢ì̾šÐ\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:110
-#, c-format
-msgid "%s would break other installed packages\n"
-msgstr "%s ÁüÈ ¿¢ÚŢ ¦Áý¦À¡¾¢¸¨Çò ¾¨¼ ¦ºöÔõ\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:115
-#, c-format
-msgid "%s is needed, but could not be found\n"
-msgstr "%s §¾¨Å, ¬É¡ø ¸¡½Å¢ø¨Ä\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:120
-#, c-format
-msgid "%s was already installed\n"
-msgstr "%s ²ü¸É§Å óiÚÅôÀðÎûÇÐ\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:123
-#, c-format
-msgid "%s causes a circular dependency problem\n"
+#: components/music/Nautilus_View_music.oaf.in.h:1
+msgid "Factory for music view"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:142
-#, c-format
-msgid "Installing %s failed because of the following issue(s):\n"
-msgstr "%s ¿¢Úר¸ ¸£ú측Ïõ ¸¡Ã½í¸Ç¡ø §¾¡üÈÐ:\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:144
-#, c-format
-msgid "Uninstalling %s failed because of the following issue(s):\n"
-msgstr "%s ¿¢ÚÅ¡¨Á ¸£ú측Ïõ ¸¡Ã½í¸Ç¡ø §¾¡üÈÐ:\n"
-
-#: components/rpmview/nautilus-rpm-view-install.c:241
-msgid "Uninstall failed..."
-msgstr "¿¢ÚÅ¡¨Á §¾¡üÈÐ..."
-
-#: components/rpmview/nautilus-rpm-view-install.c:242
-msgid "Uninstall Failed"
-msgstr "¿¢ÚÅ¡¨Á §¾¡üÈÐ"
-
-#: components/rpmview/nautilus-rpm-view-install.c:244
-msgid "Install failed..."
-msgstr "¿¢Úר¸ §¾¡üÈÐ..."
-
-#: components/rpmview/nautilus-rpm-view-install.c:245
-msgid "Install Failed"
-msgstr "¿¢Úר¸ §¾¡üÈÐ"
-
-#: components/rpmview/nautilus-rpm-view-install.c:297
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1115
-msgid "Incorrect password."
-msgstr "ºÃ¢ÂüÈ ¸¼×¡ø."
-
-#: components/rpmview/nautilus-rpm-view.c:139
-msgid "Package Contents"
-msgstr "¦À¡¾¢ ¦Áý¦À¡Õû «¼ì¸õ"
-
-#. allocate the name field
-#: components/rpmview/nautilus-rpm-view.c:182
-msgid "Package Title"
-msgstr "¦À¡¾¢ ¦Áý¦À¡Õû ¾¨ÄôÒ"
-
-#: components/rpmview/nautilus-rpm-view.c:205
-msgid "Size: "
-msgstr "«Ç×:"
-
-#: components/rpmview/nautilus-rpm-view.c:211
-msgid "<size>"
-msgstr "<«Ç×>"
-
-#: components/rpmview/nautilus-rpm-view.c:217
-msgid "Install Date: "
-msgstr "óÚ× ¿¡û:"
-
-#: components/rpmview/nautilus-rpm-view.c:223
-#: components/rpmview/nautilus-rpm-view.c:235
-#: components/rpmview/nautilus-rpm-view.c:247
-#: components/rpmview/nautilus-rpm-view.c:259
-#: components/rpmview/nautilus-rpm-view.c:271
-msgid "<unknown>"
-msgstr "<«È¢ÂôÀ¼¡¾Ð>"
-
-#: components/rpmview/nautilus-rpm-view.c:229
-msgid "License: "
-msgstr "¯Ã¢Áõ:"
-
-#: components/rpmview/nautilus-rpm-view.c:241
-msgid "Build Date: "
-msgstr "¸ðÊ ¿¡û:"
-
-#: components/rpmview/nautilus-rpm-view.c:253
-msgid "Distribution: "
-msgstr "À¸¢÷ó¾Ç¢ôÒ:"
-
-#: components/rpmview/nautilus-rpm-view.c:265
-msgid "Vendor: "
-msgstr "ÅÆíÌ¿÷:"
-
-#: components/rpmview/nautilus-rpm-view.c:298
-msgid "Install"
-msgstr "¿¢ÚÅø"
-
-#: components/rpmview/nautilus-rpm-view.c:314
-msgid "Update"
-msgstr "ÒÐôÀ¢"
+#: components/music/Nautilus_View_music.oaf.in.h:2
+#, fuzzy
+msgid "Music"
+msgstr "­¨º"
 
-#: components/rpmview/nautilus-rpm-view.c:323
-msgid "Uninstall"
-msgstr "¿¢ÚÅü¸"
+#: components/music/Nautilus_View_music.oaf.in.h:3
+#, fuzzy
+msgid "Music Viewer"
+msgstr "%s ¸¡ðÊ"
 
-#: components/rpmview/nautilus-rpm-view.c:339
-msgid "Verify"
-msgstr "ºÃ¢À¡÷"
+#: components/music/Nautilus_View_music.oaf.in.h:4
+msgid "Music view"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:375
-msgid "Go to selected file"
-msgstr "¦ºÃ¢× ¦ºöÂôÀð¼ §¸¡ôÀ¢üÌî ¦ºø"
+#: components/music/Nautilus_View_music.oaf.in.h:5
+msgid "Music view factory"
+msgstr ""
 
-#. add the description
-#: components/rpmview/nautilus-rpm-view.c:386
-msgid "Description"
-msgstr "Å¢Çì¸õ"
+#: components/music/Nautilus_View_music.oaf.in.h:6
+#, fuzzy
+msgid "View as Music"
+msgstr "%s §À¡ýÈ ¸¡ðº¢ "
 
-#: components/rpmview/nautilus-rpm-view.c:624
-#, c-format
-msgid "Package Contents: %d files"
-msgstr "¦Áý¦À¡¾¢ô ¦À¡ÕǼì¸õ: %d §¸¡ôÒ¸û"
+#: components/notes/Nautilus_View_notes.oaf.in.h:1
+msgid "Factory for annotation view"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:636
-#, c-format
-msgid "Package \"%s\" "
-msgstr "¦Áý¦À¡¾¢ \"%s\""
+#: components/notes/Nautilus_View_notes.oaf.in.h:3
+#, fuzzy
+msgid "Notes sidebar panel"
+msgstr "­ÆôÀ÷ µÃôÀð¨¼ì ¸¡ðº¢¨Âì ¦¸¡¨Ä ¦ºö"
 
-#: components/rpmview/nautilus-rpm-view.c:701
-#, c-format
-msgid "version %s-%s"
-msgstr "À¾¢ôÒ %s-%s"
+#: components/notes/Nautilus_View_notes.oaf.in.h:4
+#, fuzzy
+msgid "Notes sidebar panel for Nautilus"
+msgstr "ÌÚõÀ¼ò¾¢ø ¯ûÇ ¯¨Ã¨Âì ¸¡ðÎ"
 
-#: components/rpmview/nautilus-rpm-view.c:858
-#, c-format
-msgid "checking %s..."
-msgstr "%s ºÃ¢À¡÷ì¸ôÀθ¢ÈÐ..."
+#: components/sample/nautilus-sample-content-view.c:136
+msgid "(none)"
+msgstr "(­ø¨Ä)"
 
-#: components/rpmview/nautilus-rpm-view.c:860
+#: components/sample/nautilus-sample-content-view.c:189
 #, c-format
-msgid "file %s has an error!"
-msgstr "§¸¡ôÒ %s -ø À¢¨ÆÔÇÐ!"
+msgid ""
+"%s\n"
+"\n"
+"This is a sample Nautilus content view component."
+msgstr ""
+"%s\n"
+"\n"
+"­ó¾ Á¡¾¢Ã¢ ¿¡ÊÄŠ ¦À¡ÕÇ¼ì¸ ¸¡ðº¢ì ÜÚ."
 
-#: components/rpmview/nautilus-rpm-view.c:878
-msgid "Verification completed."
-msgstr "ºÃ¢À¡÷ò¾ø ÓÊ×üÈÐ."
+#: components/sample/nautilus-sample-content-view.c:252
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"You clicked the Sample toolbar button."
+msgstr "Á¡¾¢Ã¢ ¸ÕÅ¢ô À𨼠¦À¡ò¾¡¨É ¸¢Ç¢ì ¦ºöÐûÇ£÷¸û."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: po/tmp/nautilus-sample-content-view-ui.xml.h:7
+#: components/sample/Nautilus_View_sample.oaf.in.h:3
+#: components/sample/nautilus-sample-content-view-ui.xml.h:1
+#: components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in.h:2
 msgid "Sample"
 msgstr "Á¡¾¢Ã¢"
 
-#: po/tmp/nautilus-sample-content-view-ui.xml.h:8
+#: components/sample/nautilus-sample-content-view-ui.xml.h:2
 msgid "This is a sample merged menu item"
 msgstr "­Ð ´Õ §º÷× ÀðÊ ¯ÕôÀÊ"
 
-#: po/tmp/nautilus-sample-content-view-ui.xml.h:9
+#: components/sample/nautilus-sample-content-view-ui.xml.h:3
 #, fuzzy
-msgid "This is a sample merged tool bar button"
+msgid "This is a sample merged toolbar button"
 msgstr "­Ð ´Õ Á¡¾¢Ã¢ §º÷× ¸ÕÅ¢ôÀðÊ ¦À¡ò¾¡ý"
 
-#: po/tmp/nautilus-sample-content-view-ui.xml.h:11
+#: components/sample/nautilus-sample-content-view-ui.xml.h:5
 msgid "_Sample"
 msgstr "_Á¡¾¢Ã¢"
 
-#: components/sample/nautilus-sample-content-view.c:83
-msgid "(none)"
-msgstr "(­ø¨Ä)"
+#: components/sample/Nautilus_View_sample.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus Sample view"
+msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ:"
 
-#: components/sample/nautilus-sample-content-view.c:145
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"This is a sample Nautilus content view component."
+#: components/sample/Nautilus_View_sample.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Sample view factory"
+msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ §¾÷ó¦¾ÎôÀ¡ý"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:4
+#, fuzzy
+msgid "Sample Viewer"
+msgstr "Á¡¾¢Ã¢òÐÊôÀ£Î"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:5
+#, fuzzy
+msgid "Sample content view component"
 msgstr ""
 "%s\n"
 "\n"
 "­ó¾ Á¡¾¢Ã¢ ¿¡ÊÄŠ ¦À¡ÕÇ¼ì¸ ¸¡ðº¢ì ÜÚ."
 
-#: components/sample/nautilus-sample-content-view.c:203
-#, fuzzy, c-format
-msgid ""
+#: components/sample/Nautilus_View_sample.oaf.in.h:6
+#, fuzzy
+msgid "Sample content view component's factory"
+msgstr ""
 "%s\n"
 "\n"
-"You clicked the Sample toolbar button."
-msgstr "Á¡¾¢Ã¢ ¸ÕÅ¢ô À𨼠¦À¡ò¾¡¨É ¸¢Ç¢ì ¦ºöÐûÇ£÷¸û."
+"­ó¾ Á¡¾¢Ã¢ ¿¡ÊÄŠ ¦À¡ÕÇ¼ì¸ ¸¡ðº¢ì ÜÚ."
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:7
+#, fuzzy
+msgid "View as Sample"
+msgstr "ÁüȨŠ§À¡ø À¡÷ì¸"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:91
+#: components/services/install/command-line/eazel-alt-install-corba.c:107
 msgid "Set the default answer to continue, also default delete to Yes"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:92
+#: components/services/install/command-line/eazel-alt-install-corba.c:108
+#, fuzzy
+msgid "Specify search cgi"
+msgstr "§º¨Å¸ò¨¾ì ÌÈ¢ôÀ¢Î"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
+#: components/services/install/command-line/eazel-test-packsys.c:590
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "À¢¨Æ¿££ì¸ ¦ÅǢ£ð¼õ ¸¡ðθ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:93
+#: components/services/install/command-line/eazel-alt-install-corba.c:110
 msgid "10 sec delay after starting service"
 msgstr "10 ¦¿¡Ê ¾¡Á¾ò¾¢üÌô À¢ý §º¨Å¢¨Éò ¦¾¡¼í̸"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:94
+#: components/services/install/command-line/eazel-alt-install-corba.c:111
 msgid "Allow downgrades"
 msgstr "­Èì¸õ ¾ØÅ«ÛÁ¾¢"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:95
+#: components/services/install/command-line/eazel-alt-install-corba.c:112
 msgid "Erase packages"
 msgstr "¦Áý¦À¡¾¢¸¨Ç «Æ¢ò¾¢Î¸"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:96
+#: components/services/install/command-line/eazel-alt-install-corba.c:113
+#, fuzzy
+msgid "enable ei2"
+msgstr "À¢¨Æ¿£ì¸ò¨¾ ­ÂÖ¨ÁôÀÊòи"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:114
 msgid "RPM args are filename"
 msgstr "¬÷À¢±õ ¦ºÖò¾í¸û §¸¡ôҸǡõ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:97
-msgid "Force install"
-msgstr "ÅĢ ¿¢Úר¸"
-
-#: components/services/install/command-line/eazel-alt-install-corba.c:98
+#: components/services/install/command-line/eazel-alt-install-corba.c:115
 msgid "Use ftp"
 msgstr "±ô.Ê.À¢. ³ ¯À§Â¡¸¢"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:99
+#: components/services/install/command-line/eazel-alt-install-corba.c:116
 msgid "Use local"
 msgstr "«ñ¨Á ¯À§Â¡¸¢"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:100
+#: components/services/install/command-line/eazel-alt-install-corba.c:117
 msgid "Use http"
 msgstr "±î.Ê.Ê.À¢ ³ ¯À§Â¡¸¢"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:101
+#: components/services/install/command-line/eazel-alt-install-corba.c:118
 #, fuzzy
 msgid "RPM args are Eazel Ids"
 msgstr "¬÷À¢±õ ¦ºÖò¾í¸û §¸¡ôҸǡõ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:102
+#: components/services/install/command-line/eazel-alt-install-corba.c:119
+msgid "machine readable output"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:120
 msgid "Don't print fancy percent output"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:103
+#: components/services/install/command-line/eazel-alt-install-corba.c:121
+msgid "don't use eazel auth stuff"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:122
 msgid "Specify package file"
 msgstr "¦Áý¦À¡¾¢ §¸¡ôÀ¢¨Éì ÌÈ¢ôÀ¢Î"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:104
-msgid "Set port numer (80)"
-msgstr "Ó¸ôÒ ±ñ¨½ 80 ¬ìÌ"
-
-#: components/services/install/command-line/eazel-alt-install-corba.c:105
+#: components/services/install/command-line/eazel-alt-install-corba.c:123
 #, fuzzy
 msgid "RPM args are needed files"
 msgstr "¬÷À¢±õ ¦ºÖò¾í¸û §¸¡ôҸǡõ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:106
+#: components/services/install/command-line/eazel-alt-install-corba.c:124
 msgid "Run Query"
 msgstr "Å¢ÉÅø µðÎ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:107
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
 msgid "Revert"
 msgstr "À¢ý§É¡ì¸¢î¦ºø"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:108
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr "§ÅèÁ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:109
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "§º¨Å¸ò¨¾ì ÌÈ¢ôÀ¢Î"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:110
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
+msgid "Dont print too much, just problems and download"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:111
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
+msgid "argument is a suite id"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "§º¡¾¨É µð¼õ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:112
-#, fuzzy
-msgid "Set tmp dir (/tmp)"
-msgstr "¾üºÁ «¨¼× (/tmp/eazel-install)"
-
-#: components/services/install/command-line/eazel-alt-install-corba.c:113
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 #, fuzzy
 msgid "Allow username"
 msgstr "²üÈò¾ØÅø «ÛÁ¾¢"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:114
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "²üÈò¾ØÅø «ÛÁ¾¢"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:115
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "¦¾¡¼÷ ¦º¡ø ¦ÅǢ£ð¼õ"
 
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#, fuzzy
+msgid "Install a specific package version"
+msgstr "¦Áý¦À¡¾¢ %s ¿¢ÚÅôÀθ¢ÈÐ..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
+msgid "*** You cannot specify more then one protocol type.\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
+msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
+#, fuzzy, c-format
+msgid "File conflict checking %s...\n"
+msgstr "%s ºÃ¢À¡÷ì¸ôÀθ¢ÈÐ..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
+#, fuzzy, c-format
+msgid "File uniqueness checking %s...\n"
+msgstr "%s ºÃ¢À¡÷ì¸ôÀθ¢ÈÐ..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
+#, c-format
+msgid "Feature consistency checking %s...\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
+#, c-format
+msgid "Downloading %s..."
+msgstr "%s ­ÈìÌÁ¾¢Â¡¸¢ÈÐ..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
+msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
+#, fuzzy
+msgid "Downloading %s... (%d/%d) = %d%%"
+msgstr "%s ­ÈìÌÁ¾¢Â¡¸¢ÈÐ..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
+#, c-format
+msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
+#, fuzzy, c-format
+msgid "Downloading %s... %3.1f KB/s Done\n"
+msgstr "%s ­ÈìÌÁ¾¢Â¡¸¢ÈÐ..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
+msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
+msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
+#, fuzzy
+msgid "Done\n"
+msgstr "ÓÊó¾Ð"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
+#, c-format
+msgid "Download of %s FAILED\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
+#, fuzzy, c-format
+msgid "Package %s failed to uninstall.\n"
+msgstr "­õ ¦Áý¦À¡¾¢ Óý§À ¿¢ÚÅôÀð¼Ð."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
+#, fuzzy, c-format
+msgid "Package %s failed to install.\n"
+msgstr "­õ ¦Áý¦À¡¾¢ Óý§À ¿¢ÚÅôÀð¼Ð."
+
+#. I18N note: \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
+#, c-format
+msgid "\t· Problem : %s\n"
+msgstr ""
+
+#. I18N note: \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
+#, c-format
+msgid "\t· Action : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
+#, fuzzy
+msgid "Cancelling operation\n"
+msgstr "¦ºøÖÀÊ¡Ìõ ¦ºÂø¸û:"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
+#, fuzzy, c-format
+msgid "About to install a total of %d packages, %dKB\n"
+msgstr ""
+"¸£ú측Ïõ ¦Áý¦À¡¾¢ ¨Â ­ÈìÌÁ¾¢¦ºö ¯û§Çý:\n"
+"\n"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
+#, fuzzy, c-format
+msgid "About to uninstall a total of %d packages, %dKB\n"
+msgstr ""
+"¸£ú측Ïõ ¦Áý¦À¡¾¢ ¨Â ­ÈìÌÁ¾¢¦ºö ¯û§Çý:\n"
+"\n"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
+#, c-format
+msgid "About to revert a total of %d packages, %d KB\n"
+msgstr ""
+
+#. I18N note: %s is a package name, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
+#, c-format
+msgid "\t· %s and it's dependencies\n"
+msgstr ""
+
+#. I18N note: %s is a package name, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
+#, c-format
+msgid "\t· %s\n"
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n) " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
+msgid "Save transaction report ? (y/n) "
+msgstr ""
+
+#. I18N note: y is the letter for the word Yes. This is
+#. used in the response for a yes/no questions. Your translation
+#. must be 1 character only.
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
+msgid "y"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
+#, fuzzy, c-format
+msgid "Dependency : %s needs %s\n"
+msgstr "º¡÷Òî §º¡¾¨É: ¦Áý¦À¡¾¢ %s ìÌ %s §¾¨Å"
+
+#. I18N note: %s is a package name
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
+#, c-format
+msgid "Package %s failed md5 check!\n"
+msgstr ""
+
+#. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
+#, c-format
+msgid "\t· server MD5 checksum is %s\n"
+msgstr ""
+
+#. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
+#, c-format
+msgid "\t· actual MD5 checksum is %s\n"
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
+msgid "Continue? (y/n) "
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
+msgid "Should I delete the RPM files? (y/n) "
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
+msgid "Operation ok\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
+#, fuzzy
+msgid "Operation failed\n"
+msgstr "¿¢Ú×¾ø §¾¡üÈÐ!"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
+#, fuzzy
+msgid "Installing"
+msgstr "¿¢ÚÅø"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
+#, fuzzy
+msgid "Uninstalling"
+msgstr "¿¢ÚÅü¸"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
+msgid "Only one operation at a time please."
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
+#, c-format
+msgid "%s: --help for usage\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
+#, c-format
+msgid "Name         : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#, fuzzy, c-format
+msgid "Version      : %s\n"
+msgstr "À¾¢ôÒ: %s"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#, c-format
+msgid "Minor        : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
+#, c-format
+msgid "Size         : %d\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#, c-format
+msgid "Arch         : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#, fuzzy, c-format
+msgid "Distribution : %s\n"
+msgstr "À¸¢÷ó¾Ç¢ôÒ:"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#, fuzzy, c-format
+msgid "Description  : %s\n"
+msgstr "Å¢Çì¸õ"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
+#, fuzzy, c-format
+msgid "Install root : %s\n"
+msgstr "óÚ× ¿¡û:"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
+msgid "Provides     : \n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
+#, c-format
+msgid "exit code %d\n"
+msgstr ""
+
 #: components/services/install/command-line/eazel-gen-xml.c:41
 msgid "Specify package list to use (/var/eazel/service/package-list.xml)"
 msgstr ""
@@ -683,545 +2316,790 @@ msgstr ""
 "¦Áý¦À¡¾¢ô ÀðÊ嬀 ¯Õš츢¼ ÌÈ¢ôÀ¢ð¼ §¸¡ôÀ¢¨Éô ÀÂý¦ºö¸  -  ¦Áý¦À¡¾¢ôÀðÊÂø "
 "ôÀθ¢ÈÐ "
 
-#: components/services/install/lib/eazel-install-logic.c:187
-#, c-format
-msgid "Reading the install package list %s"
-msgstr "¦Áý¦À¡Õû ¿¢Ú× ÀðÊÂø %s ÀÊì¸ôÀθ¢ÈÐ"
+#: components/services/install/command-line/eazel-test-softcat.c:54
+msgid "Softcat server to connect to"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:266
-#, c-format
-msgid "Will download %s"
-msgstr "%s ­ÈìÌÁ¾¢ ¦ºöÂôÀÎõ"
+#: components/services/install/command-line/eazel-test-softcat.c:55
+msgid "Use alternate CGI path"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:281
-#, c-format
-msgid "%s already installed"
-msgstr "%s ²ü¸É§Å ¿¢ÚÅôÀðÎûÇÐ"
+#: components/services/install/command-line/eazel-test-softcat.c:57
+msgid "Connect as a softcat user through ammonite"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:472
-#, c-format
-msgid "Category = %s"
-msgstr "À¢Ã¢× = %s"
+#: components/services/install/command-line/eazel-test-softcat.c:58
+msgid "Number of times to try the request"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:750
-#, c-format
-msgid "Could not create transaction directory (%s)! ***\n"
-msgstr "*** ÀâÁ¡üÈ «¨¼Å¢¨Éô À¨¼ì¸ ­ÂÄÅ¢ø¨Ä(%s)***\n"
+#: components/services/install/command-line/eazel-test-softcat.c:59
+msgid "Delay between request retries, in usec"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:773
-#, c-format
-msgid "Writing transaction to %s"
-msgstr "ÀâÁ¡üÈõ %s ­ø ±Ø¾ôÀθ¢ÈÐ"
+#: components/services/install/command-line/eazel-test-softcat.c:60
+msgid "Lookup by Eazel package id"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:61
+msgid "Lookup package that features a feature/file"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:62
+msgid "Lookup package with a specific version"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:63
+msgid "(with --version) Use >= comparison"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:64
+msgid "use check function (for debugging)"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:65
+msgid "Show detailed sub-package info"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:66
+msgid "enable funk parser"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:1021
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "­ÈìÌÁ¾¢ ¦ºöÂôÀð¼ §¸¡ôÀ¢¨Éô âðÎõ ÓÂüº¢ §¾¡üÈÐ "
 
-#: components/services/install/lib/eazel-install-logic.c:1036
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "MD5 ¦À¡Õó¾¡ôÀ¢¨Æ, ¦Áý¦À¡¾¢ %s ¸¡ôèÁŠ ¦ºöÂôÀ¼Ä¡õ"
 
-#: components/services/install/lib/eazel-install-logic.c:1120
-#, c-format
-msgid "Preflight (%ld bytes, %ld packages)"
-msgstr "À½¢ìÌÓý (%ld ¨Àðθû %ld ¦Áý¦À¡¾¢¸û )"
-
-#: components/services/install/lib/eazel-install-logic.c:1287
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, fuzzy, c-format
-msgid "Removing package %s (0x%p) %s"
-msgstr "%s %s ¦Áý¦À¡¾¢ ¿£ì¸ôÀθ¢ÈÐ "
+msgid "No MD5 available for %s"
+msgstr "%s ±ýÈ ±ñ½ì¸Õ×ìÌò ¾¸Åø¸û ¸¢¨¼ì¸Å¢ø¨Ä"
 
-#: components/services/install/lib/eazel-install-logic.c:1396
-msgid "Preparing package system"
-msgstr "¦Áý¦À¡¾¢ «¨ÁôÒ ¯ÕÅ¡ì¸ôÀθ¢ÈÐ"
+#. I18N note: "%is is ok" in the sense that %s=package name and the
+#. package is intact
+#: components/services/install/lib/eazel-install-logic2.c:356
+#, fuzzy, c-format
+msgid "%s is ok"
+msgstr ""
+"\n"
+"­Ð ºÃ¢Â¡ ?"
 
-#: components/services/install/lib/eazel-install-logic.c:1514
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, fuzzy, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s À¾¢ôÒ %s Óý§À ¿¢ÚÅôÀð¼Ð"
 
-#: components/services/install/lib/eazel-install-logic.c:1518
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s À¾¢ôÒ %s Óý§À ¿¢ÚÅôÀð¼Ð"
 
-#: components/services/install/lib/eazel-install-logic.c:1527
-#: components/services/install/lib/eazel-install-logic.c:1532
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, fuzzy, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr "%s , %s ­Ä¢ÕóÐ %s ìÌ ²üÈò¾ØÅø «¨¼¸¢ÈÐ"
 
-#: components/services/install/lib/eazel-install-logic.c:1541
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, fuzzy, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr "%s , %s ­Ä¢ÕóÐ %s ìÌ ­Èì¸ò¾ØÅø «¨¼¸¢ÈÐ"
 
-#: components/services/install/lib/eazel-install-logic.c:1546
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr "%s , %s ­Ä¢ÕóÐ %s ìÌ ­Èì¸ò¾ØÅø «¨¼¸¢ÈÐ"
 
-#: components/services/install/lib/eazel-install-logic.c:1571
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, fuzzy, c-format
 msgid "%s installs version %s-%s"
 msgstr "À¾¢ôÒ %s-%s"
 
-#: components/services/install/lib/eazel-install-logic.c:1576
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:2186
-#, fuzzy
-msgid "Dependencies appear ok"
-msgstr "º¡÷Ò¸û ºÃ¢Â¡¸ ¯ûÇÉ"
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
+#, fuzzy, c-format
+msgid "Loading package info from file %s"
+msgstr "¦Áý¦À¡¾¢ %s ­ÈìÌÁ¾¢ ¦ºö¾ø"
+
+#. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
+#: components/services/install/lib/eazel-install-logic2.c:1197
+msgid "ok"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:1197
+msgid "not ok"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:1363
+#, c-format
+msgid "Checking dependencies for %s"
+msgstr ""
+
+#. I18N note: both %s' are package names.
+#. related is in the sense that the two packages apparently
+#. are connected somehow, eg. foo and foo-devel
+#: components/services/install/lib/eazel-install-logic2.c:2014
+#, fuzzy, c-format
+msgid "%s is related to %s"
+msgstr "\"%s\" ¦¾Ã¢×¦ºöÂôÀð¼É (%s)"
+
+#: components/services/install/lib/eazel-install-logic2.c:2090
+#, c-format
+msgid "updating %s to version %s-%s solves conflict"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2113
+#, c-format
+msgid "available update to %s (%s-%s) does not solves conflict"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2128
+#, fuzzy, c-format
+msgid "could not revive %s"
+msgstr "%s ìÌ ´Õ Ô.¬÷.±ø ³ Á£ð¸ ­ÂÄÅ¢ø¨Ä"
+
+#: components/services/install/lib/eazel-install-logic2.c:2284
+#, c-format
+msgid "file uniqueness checking %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2305
+#, c-format
+msgid "Duplicate file : %s occurs in %s and %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
+msgid "... but it's ok, the packages are related"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2324
+#, c-format
+msgid "(there were %d other conflicts)"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2419
+#, c-format
+msgid "file conflict checking %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2456
+#, c-format
+msgid "file conflict : package %s already provides file %s also provided by %s"
+msgstr ""
+
+#. the owner of this file is a package that we're upgrading, and the
+#. * new version no longer has this file, so everything's okay.
+#: components/services/install/lib/eazel-install-logic2.c:2466
+#, c-format
+msgid "...but it is okay, we're upgrading %s and it ditched that file"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-logic.c:2189
-msgid "But there are file conflicts"
+#: components/services/install/lib/eazel-install-logic2.c:2558
+#, c-format
+msgid "checking feature consistency of %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-metadata.c:171
+#: components/services/install/lib/eazel-install-logic2.c:2626
+#, c-format
+msgid ""
+"feature missing : %s breaks if %s is installed (feature %s would be lost"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2705
+#, fuzzy, c-format
+msgid "downloading %d packages"
+msgstr "¦Áý¦À¡¾¢ %s ­ÈìÌÁ¾¢ ¦ºö¾ø"
+
+#: components/services/install/lib/eazel-install-logic2.c:2951
+#, fuzzy, c-format
+msgid "will upgrade %s"
+msgstr "²üÈò¾ØÅø «ÛÁ¾¢"
+
+#: components/services/install/lib/eazel-install-logic2.c:2954
+#, fuzzy, c-format
+msgid "will downgrade %s"
+msgstr "%s ­ÈìÌÁ¾¢ ¦ºöÂôÀÎõ"
+
+#: components/services/install/lib/eazel-install-logic2.c:2957
+#, fuzzy, c-format
+msgid "will install %s"
+msgstr "\"%s\" ¿¢ÚÅôÀθ¢ÈÐ"
+
+#: components/services/install/lib/eazel-install-logic2.c:2960
+#, fuzzy, c-format
+msgid "will uninstall %s"
+msgstr "¿¢ÚÅü¸"
+
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
+#, c-format
+msgid "%s requires %s"
+msgstr "%s ìÌ  %s §¾¨Å"
+
+#: components/services/install/lib/eazel-install-logic2.c:3238
+#, fuzzy, c-format
+msgid "failed %s"
+msgstr "%s ­ø¨Ä"
+
+#: components/services/install/lib/eazel-install-metadata.c:174
 msgid "Could not set URLType from config file!"
 msgstr "Ô¬¦Ãø Ũ¸ ÅÊÅ째¡ôÀ¢É¢ýÚ «¨Áì¸ ­ÂÄ¡Ð!"
 
-#: components/services/install/lib/eazel-install-object.c:597
+#: components/services/install/lib/eazel-install-object.c:717
 msgid "Transactions are not stored, could not find home dir"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:621
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:798
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "¦¾¡¨ÄàÃî §º¨Å¸ò¾¢É¢ýÚ ¦Áý¦À¡¾¢ ¦ÀÈôÀθ¢ÈÐ...\n"
 
-#: components/services/install/lib/eazel-install-object.c:818
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "package-list.xml ³  Á£ð¸ ­ÂÄÅ¢ø¨Ä\n"
 
-#: components/services/install/lib/eazel-install-object.c:891
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr "%s ±ýÈ §¸¡ôÀ¢üÌ ±Ø¾ ÓÊÂÅ¢ø¨Ä, ¦¸¡¼¡¿¢¨Äô À¾¢Å¡¸¢ ÀÂýÀÎò¾ôÀθ¢ÈÐ"
 
-#: components/services/install/lib/eazel-install-object.c:1017
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "¿¢Úר¸ §¾¡üÈÐ"
 
-#: components/services/install/lib/eazel-install-object.c:1060
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "¿¢ÚÅ¡¨Á §¾¡üÈÐ"
 
-#: components/services/install/lib/eazel-install-protocols.c:101
-#: components/services/install/lib/eazel-install-protocols.c:220
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
-msgid "Downloading %s..."
-msgstr "%s ­ÈìÌÁ¾¢Â¡¸¢ÈÐ..."
+msgid "Could not create transaction directory (%s)! ***\n"
+msgstr "*** ÀâÁ¡üÈ «¨¼Å¢¨Éô À¨¼ì¸ ­ÂÄÅ¢ø¨Ä(%s)***\n"
+
+#: components/services/install/lib/eazel-install-object.c:1429
+#, c-format
+msgid "Writing transaction to %s"
+msgstr "ÀâÁ¡üÈõ %s ­ø ±Ø¾ôÀθ¢ÈÐ"
+
+#: components/services/install/lib/eazel-install-problem.c:163
+#, fuzzy, c-format
+msgid "%s was cancelled"
+msgstr "%s ²ü¸É§Å óiÚÅôÀðÎûÇÐ\n"
+
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
+#, fuzzy, c-format
+msgid "%s is a source package, which is not yet supported"
+msgstr "%s %s: ãÄ ¦Áý¦À¡¾¢ (¬¾Ã× «Ç¢ì¸ôÀ¼¡Ð)\n"
+
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
+#, fuzzy, c-format
+msgid "%s would break other packages"
+msgstr "%s ÁüÈ ¿¢ÚŢ ¦Áý¦À¡¾¢¸¨Çò ¾¨¼ ¦ºöÔõ\n"
+
+#: components/services/install/lib/eazel-install-problem.c:185
+#, c-format
+msgid "%s would break"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:191
+#, c-format
+msgid "%s would break %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:197
+#, c-format
+msgid "%s is damaged"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:201
+#, c-format
+msgid "%s requires %s, which could not be found on the server"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:204
+#, c-format
+msgid "%s for %s could not be found on the server"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
+#, fuzzy, c-format
+msgid "%s is already installed"
+msgstr "%s ²ü¸É§Å ¿¢ÚÅôÀðÎûÇÐ"
+
+#: components/services/install/lib/eazel-install-problem.c:259
+#, c-format
+msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:263
+#, c-format
+msgid "%s, which is older, needs upgrade and upgrade is not enabled"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:353
+#, fuzzy, c-format
+msgid "%s is not installed and could not be found on server"
+msgstr "%s §¾¨Å, ¬É¡ø ¸¡½Å¢ø¨Ä\n"
+
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. %s is a package name or filename
+#: components/services/install/lib/eazel-install-problem.c:920
+#, c-format
+msgid "Check for a new version of %s"
+msgstr ""
+
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. both %s's are package names or filenames
+#: components/services/install/lib/eazel-install-problem.c:931
+#, c-format
+msgid "Install both %s and %s"
+msgstr ""
+
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. %s is a package name or filename
+#: components/services/install/lib/eazel-install-problem.c:946
+#, c-format
+msgid "Remove %s from your system"
+msgstr ""
+
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. %s is a package name or filename. "Force" is in the rpm sense of force,
+#. meaning that no dependency checking etc will be done
+#: components/services/install/lib/eazel-install-problem.c:959
+#, c-format
+msgid "Force the removal of %s from your system"
+msgstr ""
+
+#. TRANSLATORS : This string is a solution to a dependency problem
+#: components/services/install/lib/eazel-install-problem.c:967
+msgid "Package database has an inconsistency"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:1015
+msgid "Continue with force"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:114
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:432
+#: components/services/install/lib/eazel-install-problem.c:1021
+#, fuzzy
+msgid "Allow downgrade"
+msgstr "­Èì¸õ ¾ØÅ«ÛÁ¾¢"
+
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
 #, c-format
 msgid "Could not open target file %s"
 msgstr "­ÄìÌ째¡ôÒ %s ³ò ¾¢Èì¸ ­ÂÄÅ¢ø¨Ä"
 
-#: components/services/install/lib/eazel-install-protocols.c:121
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:356
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
 msgid "Could not create an http request !"
 msgstr "±îÊÊÀ¢ §ÅñΧ¸¡û ¯ÕùÅ¡ì¸ ­ÂÄÅ¢ø¨Ä!"
 
-#: components/services/install/lib/eazel-install-protocols.c:128
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:363
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
 msgid "Proxy: Invalid uri !"
 msgstr "Òá셢: ¦ºøÖÀÊ¡¸¡¾ Ô.¬÷.³!"
 
-#: components/services/install/lib/eazel-install-protocols.c:133
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:369
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
 msgid "Invalid uri !"
 msgstr "¦ºøÖÀÊ¡¸¡¾ Ô.¬÷.³!"
 
-#: components/services/install/lib/eazel-install-protocols.c:140
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:379
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
 msgid "Could not prepare http request !"
 msgstr "±îÊÊÀ¢ §ÅñΧ¸¡û ¯ÕÅ¡ì¸ ­ÂÄÅ¢ø¨Ä!"
 
-#: components/services/install/lib/eazel-install-protocols.c:145
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:384
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
 msgid "Couldn't get async mode "
 msgstr "´ò¾¢Âí¸¡î ¦ºÖò¾ ¿¢¨Ä¨Âô ¦ÀÈ ­ÂÄÅ¢øÄ"
 
-#: components/services/install/lib/eazel-install-protocols.c:171
-#, c-format
-msgid "HTTP error: %d %s"
-msgstr "±î.Ê.Ê.À¢. À¢¨Æ:%d %s"
-
 #. probably out of disk space
-#: components/services/install/lib/eazel-install-protocols.c:181
-#: components/services/install/lib/eazel-install-protocols.c:197
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, c-format
 msgid "DISK FULL: could not write %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:186
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
 msgid "Could not get request body!"
 msgstr "§ÅñΧ¸¡û ¯¼¨Äô ¦ÀÈÓÊÂÅ¢ø¨Ä"
 
-#: components/services/install/lib/eazel-install-protocols.c:221
+#: components/services/install/lib/eazel-install-protocols.c:208
+#, c-format
+msgid "HTTP error: %d %s"
+msgstr "±î.Ê.Ê.À¢. À¢¨Æ:%d %s"
+
+#: components/services/install/lib/eazel-install-protocols.c:255
 msgid "FTP not supported yet"
 msgstr "±ô.Ê.À¢ ¬¾Ã× , ­Ð Ũà ­ø¨Ä"
 
-#: components/services/install/lib/eazel-install-protocols.c:418
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, c-format
 msgid "Checking local file %s..."
 msgstr "«ñ¨Áì §¸¡ôÀ¢¨Éî %s §º¡¾¨É ¦ºöÂôÀθ¢ÈÐ..."
 
-#: components/services/install/lib/eazel-install-protocols.c:479
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, fuzzy, c-format
 msgid "Failed to retrieve %s!"
 msgstr "%s Á£ðÌõ ÓÂüº¢ §¾¡üÈÐ!"
 
-#: components/services/install/lib/eazel-install-protocols.c:545
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, fuzzy, c-format
 msgid "Could not get an URL for %s"
 msgstr "%s ý Ô.¬÷.±ø ¦ÀÈ ÓÊÂÅ¢ø¨Ä"
 
-#: components/services/install/lib/eazel-install-protocols.c:564
+#: components/services/install/lib/eazel-install-protocols.c:672
 msgid "Downloaded package does not have the correct name"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:565
+#: components/services/install/lib/eazel-install-protocols.c:673
 #, c-format
 msgid "Package %s should have had name %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:572
-msgid "Downloaded package does not have the correct version"
-msgstr ""
-
-#: components/services/install/lib/eazel-install-protocols.c:573
-#, fuzzy, c-format
-msgid "Package %s had version %s and not %s"
-msgstr "%s , %s ­Ä¢ÕóÐ %s ìÌ ²üÈò¾ØÅø «¨¼¸¢ÈÐ"
-
-#: components/services/install/lib/eazel-install-protocols.c:592
+#: components/services/install/lib/eazel-install-protocols.c:701
 msgid "File download failed"
 msgstr "§¸¡ôÒ ­ÈìÌÁ¾¢ §¾¡üÈÐ"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:63
-msgid "Dry Run Mode Activated.  Packages will not actually be installed ..."
-msgstr "ÅÈñ¼ µð¼õ ¦ºÂøÀÎò¾ôÀð¼Ð. ¦Áý¦À¡¾¢¸û ¿¢ÚÅôÀ¼¡..."
-
-#: components/services/install/lib/eazel-install-rpm-glue.c:253
-#, c-format
-msgid "Closing db for %s (open)"
-msgstr "%s ¦À¡ÕðÎ db ã¼ôÀθ¢ÈÐ (¾¢Èó¾)"
-
-#: components/services/install/lib/eazel-install-rpm-glue.c:258
-#, c-format
-msgid "Closing db for %s (not open)"
-msgstr "%s ¦À¡ÕðÎ db ã¼ôÀθ¢ÈÐ"
-
-#: components/services/install/lib/eazel-install-rpm-glue.c:329
-#, c-format
-msgid "Opened packages database in %s"
-msgstr "¦Áý¦À¡¾¢ ¾Ã×ò¾Çõ %s ­ø ¾¢Èì¸ôÀð¼Ð"
-
-#: components/services/install/lib/eazel-install-rpm-glue.c:334
-#, c-format
-msgid "Opening packages database in %s failed"
-msgstr "¦Áý¦À¡¾¢ ¾Ã×ò¾Çò¾¢¨É %s ­ø ¾¢ÈìÌõ ÓÂüº¢ §¾¡üÈÐ"
-
-#: components/services/install/lib/eazel-install-rpm-glue.c:526
-#, c-format
-msgid "Processing dep for %s, requires library %s"
-msgstr "%s -ý º¡÷Ò  ¿¢¨Ä «ÄºôÀθ¢ÈÐ, áĸõ %s §¾¨Å"
-
-#: components/services/install/lib/eazel-install-rpm-glue.c:533
-#, c-format
-msgid "Processing dep for %s, requires package %s"
-msgstr "%s ý º¡÷Ò ¿¢¨Ä «ÄºôÀθ¢ÈÐ ¦Áý¦À¡¾¢ %s §¾¨Å"
-
-#: components/services/install/lib/eazel-install-rpm-glue.c:559
-#, c-format
-msgid "package %s is already in requirements, whew!"
-msgstr ""
-
-#. Possibly the implest case, we're installing package A, which requires
-#. B that is not installed.
-#: components/services/install/lib/eazel-install-rpm-glue.c:571
-#, c-format
-msgid "%s requires %s"
-msgstr "%s ìÌ  %s §¾¨Å"
-
-#. If we end here, it's a conflict is going to break something
-#: components/services/install/lib/eazel-install-rpm-glue.c:707
-#, c-format
-msgid "Package %s conflicts with %s-%s"
-msgstr "¦Áý¦À¡¾¢ %s , %s-%s ¯¼ý ´ùÅ¡ôÀ¢¨Æ "
-
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr "***pkg ¦¸¡ð¼¨Äò ¦¾¡¼í̸***\n"
 
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr "*** pkg ¦¸¡ð¼¨Ä ÓÊò¾¢Î¸***\n"
 
-#: components/services/install/lib/eazel-install-types.c:467
-#, fuzzy, c-format
-msgid "Cannot open %s"
-msgstr "Ìô¨À¨Â ¿¸ø ±Îì¸ÓÊ¡Ð"
-
-#: components/services/install/lib/eazel-install-xml-package-list.c:156
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 #, fuzzy
 msgid "*** No package nodes! (cat has no children) ***"
 msgstr "*** ¦Áý¦À¡¾¢ ¸Ïì¸û ­ø¨Ä***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:158
-#: components/services/install/lib/eazel-install-xml-package-list.c:166
-#: components/services/install/lib/eazel-install-xml-package-list.c:181
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 msgid "*** Bailing from package parse! ***"
 msgstr "***¦Áý¦À¡¾¢ «Ä¸¢Î¾Ä¢É¢ýÚ ±È¢ÂôÀθ¢ÈÐ*** "
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:164
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
 msgid "*** No package nodes! ***"
 msgstr "*** ¦Áý¦À¡¾¢ ¸Ïì¸û ­ø¨Ä***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:170
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 msgid "*** Malformed package node!"
 msgstr "*** º¢¨¾×üÈ ¦Áý¦À¡¾¢ì¸Ï***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:179
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
 #, fuzzy
 msgid "*** No depends nodes! ***"
 msgstr "*** ¦Áý¦À¡¾¢ ¸Ïì¸û ­ø¨Ä***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:185
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr "*** º¢¨¾×üÈ º¡÷Òì¸Ï! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:209
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr "*** «È¢ÂôÀ¼¡¾ ¸Ï Ũ¸ '%s'"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:226
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** pkg ÀðÊÂø §¸¡ôÀ¢ø ¾ÃÅ¢ø¨Ä!***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:231
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "***À¢Ã¢×¸û xml ¸ÏÅ¢¨Éì ¸¡½Å¢ø¨Ä\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:232
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr "À¢Ã¢Å¢¸û «Ä¸£ðÊÄ¢ÕóÐ ±È¢ÂôÀθ¢ÈÐ\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:238
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** À¢Ã¢×¸û ­ø¨Ä***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:239
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr "*** À¢Ã¢× «Ä¸£ðÊÉ¢ýÚ ±È¢ÂôÀθ¢ÈÐ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:293
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** ÀâÁ¡üÈ xml ¸Ï¨Å측½Å¢ø¨Ä! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:295
-#: components/services/install/lib/eazel-install-xml-package-list.c:303
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr "*** ÀâÁ¡üÈ «Ä¸£ðÊÉ¢ýÚ ±È¢ÂôÀθ¢ÈÐ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** ¦Áý¦À¡¾¢¸û ­ø¨Ä! *** \n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:337
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** À¢Ã¢×ì ¸Ïì¸û ­ø¨Ä! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:341
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** À¢Ã¢×¸û xml ¸Ï¨Å측½Å¢ø¨Ä!***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:375
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** «È¢ÂôÀ¼¡¾ ¸Ï %s"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:468
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** xml ¦Áý¦À¡¾¢ôÀðʨÄô À¨¼ìÌõ §À¡Ð À¢¨Æ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:515
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** ¦Áý¦À¡¾¢¸¨Çô ÀÊìÌõ §À¡Ð À¢¨Æ! *** \n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:802
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** osd xml ¾ÃÅ¢¨É ¯ð¦¸¡ûÇÅ¢øÄ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:807
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr "*** osd «Ä¸£ðÊÄ¢ÕóÐ ±È¢ÂôÀθ¢ÈÐ! *** \n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:856
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "xml «Ä¸£Î ¦ºö ­ÂÄÅ¢ø¨Ä (¿£Çõ %d)"
 
-#. Setup the title
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:112
-msgid "Easy Install"
-msgstr "ÍÄÀ ¿¢ÚÅø"
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
+#, c-format
+msgid "Opened packages database in %s"
+msgstr "¦Áý¦À¡¾¢ ¾Ã×ò¾Çõ %s ­ø ¾¢Èì¸ôÀð¼Ð"
 
-#. Setup the progress header
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:208
-msgid "Messages"
-msgstr "¾¸Åø¸û"
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
+#, c-format
+msgid "Opening packages database in %s failed"
+msgstr "¦Áý¦À¡¾¢ ¾Ã×ò¾Çò¾¢¨É %s ­ø ¾¢ÈìÌõ ÓÂüº¢ §¾¡üÈÐ"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:208
-msgid "Progress"
-msgstr "Óý§ÉüÈõ"
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
+#, c-format
+msgid "Closing db for %s (open)"
+msgstr "%s ¦À¡ÕðÎ db ã¼ôÀθ¢ÈÐ (¾¢Èó¾)"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:587
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
-msgid "Downloading package %s"
+msgid "Closing db for %s (not open)"
+msgstr "%s ¦À¡ÕðÎ db ã¼ôÀθ¢ÈÐ"
+
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
+#, fuzzy, c-format
+msgid "Cannot open %s"
+msgstr "Ìô¨À¨Â ¿¸ø ±Îì¸ÓÊ¡Ð"
+
+#. this stuff flies by so fast, it's probably enough to just say "info"
+#: components/services/install-view/callbacks.c:64
+#, fuzzy
+msgid "Getting package information ..."
+msgstr "¦¾¡¨ÄàÃî §º¨Å¸ò¾¢É¢ýÚ ¦Áý¦À¡¾¢ ¦ÀÈôÀθ¢ÈÐ...\n"
+
+#: components/services/install-view/callbacks.c:82
+#, fuzzy, c-format
+msgid "Checking \"%s\" for conflicts..."
+msgstr "«ñ¨Áì §¸¡ôÀ¢¨Éî %s §º¡¾¨É ¦ºöÂôÀθ¢ÈÐ..."
+
+#: components/services/install-view/callbacks.c:185
+#, fuzzy, c-format
+msgid "Downloading 1 package (%s)"
 msgstr "¦Áý¦À¡¾¢ %s ­ÈìÌÁ¾¢ ¦ºö¾ø"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:594
-#, c-format
-msgid "Downloading package %s ..."
-msgstr "¦Áý¦À¡¾¢ %s ­ÈìÌÁ¾¢Â¡¸¢ÈÐ..."
+#: components/services/install-view/callbacks.c:187
+#, fuzzy, c-format
+msgid "Downloading %d packages (%s)"
+msgstr "¦Áý¦À¡¾¢ %s ­ÈìÌÁ¾¢ ¦ºö¾ø"
 
-#. done!  turn progress bar into a label
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:599
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:812
-msgid "Complete!"
-msgstr "ÓüÚõ"
+#: components/services/install-view/callbacks.c:236
+#, c-format
+msgid "Downloading \"%s\""
+msgstr "\"%s\" ­ÈìÌÁ¾¢ "
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:623
+#: components/services/install-view/callbacks.c:242
 #, c-format
-msgid "Dependency check: Package %s needs %s"
-msgstr "º¡÷Òî §º¡¾¨É: ¦Áý¦À¡¾¢ %s ìÌ %s §¾¨Å"
+msgid "0K of %dK"
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:685
+#: components/services/install-view/callbacks.c:249
+#, c-format
 msgid ""
-"I'm about to install the following packages:\n"
-"\n"
+"The package \"%s\" requires \"%s\" to run.\n"
+"Downloading \"%s\" now."
 msgstr ""
-"¸£ú측Ïõ ¦Áý¦À¡¾¢ ¨Â ­ÈìÌÁ¾¢¦ºö ¯û§Çý:\n"
-"\n"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:708
+#: components/services/install-view/callbacks.c:252
+#, fuzzy, c-format
+msgid "Attempting to download package \"%s\"."
+msgstr "¦Áý¦À¡¾¢ %s ­ÈìÌÁ¾¢ ¦ºö¾ø"
+
+#: components/services/install-view/callbacks.c:262
+#: components/services/install-view/callbacks.c:333
+#, fuzzy
+msgid "Complete"
+msgstr "ÓüÚõ"
+
+#: components/services/install-view/callbacks.c:266
+#, c-format
 msgid ""
-"\n"
-"Is this okay?"
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" has been successfully downloaded."
 msgstr ""
-"\n"
-"­Ð ºÃ¢Â¡ ?"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:728
-msgid "Preparing to install 1 package"
-msgstr "´Õ ¦Áý¦À¡¾¢Â¢¨É ¿¢ÚÅ¢¼ ²üÀ¡Î ¦ºöÂôÀθ¢ÈÐ"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:730
+#: components/services/install-view/callbacks.c:269
 #, c-format
-msgid "Preparing to install %d packages"
-msgstr "%d ¦Áý¦À¡¾¢¸¨Ç ¿¢ÚÅ¢¼ ²üÀ¡Î ¦ºöÂÀθ¢ÈÐ"
+msgid "The package \"%s\" has been successfully downloaded."
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:751
+#: components/services/install-view/callbacks.c:287
 #, c-format
-msgid "Download of package %s failed!"
+msgid "%dK of %dK"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:316
+#, fuzzy, c-format
+msgid "Download of package \"%s\" failed!"
 msgstr "¦Áý¦À¡¾¢ %s ¢ý ­ÈìÌÁ¾¢ §¾¡üÈÐ!"
 
+#: components/services/install-view/callbacks.c:338
+#, c-format
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" has been successfully downloaded and installed."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:341
+#, c-format
+msgid "\"%s\" has been successfully downloaded and installed."
+msgstr ""
+
 #. starting a new package -- create new progress indicator
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:768
+#: components/services/install-view/callbacks.c:369
 #, c-format
 msgid "Installing package %d of %d"
 msgstr "%d -ÅÐ ¦Áý¦À¡¾¢ (¦Á¡ò¾õ %d) ¿¢ÚÅôÀθ¢ÈÐ"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:783
+#: components/services/install-view/callbacks.c:396
 #, c-format
-msgid "Installing package %s ..."
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" is now being installed."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:399
+#, fuzzy, c-format
+msgid "Now installing package \"%s\"."
 msgstr "¦Áý¦À¡¾¢ %s ¿¢ÚÅôÀθ¢ÈÐ..."
 
-#. first package is the main one.  update top info, now that we know it
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:791
+#: components/services/install-view/callbacks.c:407
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "\"%s\" ¿¢ÚÅôÀθ¢ÈÐ"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:800
-#, c-format
-msgid "Version: %s"
-msgstr "À¾¢ôÒ: %s"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:853
-#, c-format
-msgid " · %s is in the KDE menu.\n"
-msgstr ""
+#: components/services/install-view/callbacks.c:415
+#: src/nautilus-zoom-control.c:592
+#, fuzzy
+msgid "%d%%"
+msgstr "%.0f%%"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:864
+#: components/services/install-view/callbacks.c:443
 #, fuzzy, c-format
-msgid " · %s is in the Gnome menu under %s.\n"
-msgstr "\"%s\"  ìÌ ÀðÊ¢ø ¯ñÎ "
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:868
-#, c-format
-msgid " · %s is in the Gnome menu.\n"
+msgid "Installation failed on %s"
 msgstr ""
+"¿¢ÚÅø §¾¡üÈÐ!\n"
+"\n"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:904
+#: components/services/install-view/callbacks.c:471
 msgid "I ran into problems while installing."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:905
+#: components/services/install-view/callbacks.c:472
 #, fuzzy
 msgid "I'd like to try the following :"
 msgstr ""
 "¸£ú측Ïõ ¦Áý¦À¡¾¢ ¨Â ­ÈìÌÁ¾¢¦ºö ¯û§Çý:\n"
 "\n"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:914
+#: components/services/install-view/callbacks.c:481
 #, fuzzy
 msgid "Is this ok ?"
 msgstr ""
 "\n"
 "­Ð ºÃ¢Â¡ ?"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:955
-msgid "Installation complete!"
-msgstr "¿¢Ú×¾ø ÓÊ×üÈÐ!"
+#: components/services/install-view/callbacks.c:556
+#, fuzzy
+msgid "Installation cancelled."
+msgstr "¿¢Ú×¾ø §¾¡üÈÐ!"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:957
-msgid "Installation aborted."
-msgstr "¿¢Ú×¾ø ÓÈ¢×üÈÐ!"
+#: components/services/install-view/callbacks.c:558
+msgid "This package has already been installed."
+msgstr "­õ ¦Áý¦À¡¾¢ Óý§À ¿¢ÚÅôÀð¼Ð."
+
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
+#, fuzzy
+msgid "Installation complete."
+msgstr "¿¢Ú×¾ø ÓÊ×üÈÐ!"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:959
-msgid "Installation failed!"
+#: components/services/install-view/callbacks.c:564
+#, fuzzy
+msgid "Installation failed."
 msgstr "¿¢Ú×¾ø §¾¡üÈÐ!"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:974
-#, fuzzy, c-format
+#. some succeeded; some failed
+#: components/services/install-view/callbacks.c:568
+msgid "Some packages installed successfully:"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:577
+#, fuzzy
 msgid ""
-"%s\n"
-"%s\n"
-"Erase the leftover RPM files?"
+"\n"
+"Some packages failed:"
+msgstr "¦Áý¦À¡¾¢ §¸¡ôÀ¢¨Éì ÌÈ¢ôÀ¢Î"
+
+#: components/services/install-view/callbacks.c:626
+#, fuzzy
+msgid "Erase the RPM files?"
 msgstr "Å¢¼ôÀð¼ §¸¡ôÒ¸¨Ç «Æ¢ì¸ðÎÁ¡?"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:978
-#, fuzzy, c-format
-msgid ""
-"%s\n"
-"Erase the leftover RPM files?"
+#: components/services/install-view/callbacks.c:628
+#, fuzzy
+msgid "Erase the leftover RPM files?"
 msgstr "Å¢¼ôÀð¼ §¸¡ôÒ¸¨Ç «Æ¢ì¸ðÎÁ¡?"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:998
+#: components/services/install-view/callbacks.c:658
+msgid "Ok"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:673
 msgid ""
 "A core package of Nautilus has been\n"
 "updated.  You should restart Nautilus.\n"
@@ -1229,1028 +3107,1942 @@ msgid ""
 "Do you wish to do that now?"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1074
-msgid "This package has already been installed."
+#. Setup the title
+#: components/services/install-view/forms.c:201
+msgid "Easy Install"
+msgstr "ÍÄÀ ¿¢ÚÅø"
+
+#. Setup the progress header
+#. FIXME: the middle header is all fubar now, so we just say "messages", but the spec
+#. * shows "progress" over the 2nd column of the message box.  it's just too hard to get
+#. * it aligned currently.
+#.
+#: components/services/install-view/forms.c:327
+msgid "Messages"
+msgstr "¾¸Åø¸û"
+
+#: components/services/install-view/forms.c:358
+#: components/services/summary/nautilus-summary-view.c:647
+#, c-format
+msgid "Version: %s"
+msgstr "À¾¢ôÒ: %s"
+
+#: components/services/install-view/forms.c:407
+#, fuzzy
+msgid "These packages are ready to be downloaded and installed:"
+msgstr "­õ ¦Áý¦À¡¾¢ Óý§À ¿¢ÚÅôÀð¼Ð."
+
+#: components/services/install-view/forms.c:408
+msgid "If you wish to download and install these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:411
+#, fuzzy
+msgid "These packages are ready to be uninstalled:"
 msgstr "­õ ¦Áý¦À¡¾¢ Óý§À ¿¢ÚÅôÀð¼Ð."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1088
+#: components/services/install-view/forms.c:412
+msgid "If you wish to uninstall these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:415
+#, fuzzy
+msgid "These packages are ready to be reverted:"
+msgstr "­õ ¦Áý¦À¡¾¢ Óý§À ¿¢ÚÅôÀð¼Ð."
+
+#: components/services/install-view/forms.c:416
+msgid "If you wish to revert these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:464
+#, c-format
+msgid "for a total of %ld MB."
+msgstr ""
+
+#: components/services/install-view/forms.c:466
+#, c-format
+msgid "for a total of %ld KB."
+msgstr ""
+
+#. buttons
+#: components/services/install-view/forms.c:478
+#, fuzzy
+msgid "Continue"
+msgstr "¦À¡Õû «¼ì¸õ"
+
+#: components/services/install-view/forms.c:482
+#: libnautilus-extensions/nautilus-drag.c:493
+#: src/file-manager/fm-directory-view.c:4326
+#, fuzzy
+msgid "Cancel"
+msgstr "¾¼í¸û"
+
+#: components/services/install-view/nautilus-service-install-view.c:421
+#, c-format
+msgid "%s is in GNOME (footprint) > %s"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:439
+#, c-format
+msgid "%s is in the GNOME (footprint) menu.\n"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, fuzzy, c-format
+msgid "%s is in the KDE menu.\n"
+msgstr "\"%s\"  ìÌ ÀðÊ¢ø ¯ñÎ "
+
+#: components/services/install-view/nautilus-service-install-view.c:655
+#, fuzzy
+msgid "Installation Complete"
+msgstr "¿¢Ú×¾ø ÓÊ×üÈÐ!"
+
+#: components/services/install-view/nautilus-service-install-view.c:710
+#, c-format
 msgid ""
-"Installation failed on %s\n"
-"\n"
+"%sTo start %s, click the Launch button below, or to create a shortcut, drag "
+"the icon on the right to the GNOME panel or your desktop."
 msgstr ""
-"¿¢ÚÅø §¾¡üÈÐ!\n"
-"\n"
-
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1233
-msgid "Downloading remote package"
-msgstr "¦¾¡¨ÄÅ¢ÖûÇ ¦Áý¦À¡¾¢ ­ÈìÌÁ¾¢"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1235
+#. couldn't find an icon
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
-msgid "Downloading \"%s\""
-msgstr "\"%s\" ­ÈìÌÁ¾¢ "
+msgid "%sTo start %s, click the Launch button below."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:773
+msgid "Incorrect password."
+msgstr "ºÃ¢ÂüÈ ¸¼×¡ø."
+
+#: components/services/install-view/nautilus-service-install-view.c:778
+msgid "Authenticate as root"
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1237
+#: components/services/install-view/nautilus-service-install-view.c:895
 #, fuzzy
-msgid "Downloading some package"
+msgid "Installing packages"
+msgstr "¦Áý¦À¡¾¢ %s ¿¢ÚÅôÀθ¢ÈÐ..."
+
+#: components/services/install-view/nautilus-service-install-view.c:897
+#, fuzzy
+msgid "Installing remote package"
+msgstr "¦¾¡¨ÄÅ¢ÖûÇ ¦Áý¦À¡¾¢ ­ÈìÌÁ¾¢"
+
+#: components/services/install-view/nautilus-service-install-view.c:901
+#, fuzzy
+msgid "Installing some package"
 msgstr "¦¾¡¨ÄÅ¢ÖûÇ ¦Áý¦À¡¾¢ ­ÈìÌÁ¾¢"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1281
-msgid "Contacting install server ..."
+#: components/services/install-view/nautilus-service-install-view.c:918
+msgid ""
+"The Eazel install service is missing:\n"
+"Installs will not work."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:967
+#, fuzzy
+msgid "Contacting the Eazel Software Catalog ..."
 msgstr "¿¢Ú× §º¨Å¸õ ¦¾¡¼÷Ò ¦¸¡ûÇôÀθ¢ÈÐ ..."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1333
+#: components/services/install-view/nautilus-service-install-view.c:1025
+#, fuzzy
+msgid "Checking for authorization..."
+msgstr "_¾É¢ôÀÂÉ¡ì¸õ..."
+
+#: components/services/install-view/nautilus-service-install-view.c:1097
+msgid "Aborting package downloads (please wait) ..."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:1117
 #, fuzzy
 msgid "Package download aborted."
 msgstr "§¸¡ôÒ ­ÈìÌÁ¾¢ §¾¡üÈÐ"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1335
-msgid "Aborted."
+#: components/services/install-view/nautilus-service-install-view.c:1118
+msgid "Aborted"
 msgstr ""
 
-#. Setup the title
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:149
-msgid "Change your Eazel password..."
-msgstr ""
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:1
+#: components/services/install/server/Trilobite_Service_install.oaf.in.h:2
+#: components/services/summary/nautilus-summary-view.c:123
+msgid "Install"
+msgstr "¿¢ÚÅø"
 
-#. username
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:163
-msgid "User Name: "
-msgstr ""
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:2
+#, fuzzy
+msgid "Install Viewer"
+msgstr "¿¢Úר¸ §¾¡üÈÐ"
 
-#. old password
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:182
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:3
 #, fuzzy
-msgid "Current password: "
-msgstr "ºÃ¢ÂüÈ ¸¼×¡ø."
+msgid "Nautilus Service Install View"
+msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ:"
 
-#. new password
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:193
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:4
 #, fuzzy
-msgid "New password: "
-msgstr "ºÃ¢ÂüÈ ¸¼×¡ø."
+msgid "Nautilus Service Install View Factory"
+msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ §¾÷ó¦¾ÎôÀ¡ý"
 
-#. repeat password
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:204
-msgid "New password (again): "
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:5
+msgid "Service Install View Component"
 msgstr ""
 
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:227
-msgid " Change my password! "
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:6
+msgid "Service Install View Component's Factory"
+msgstr ""
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:7
+#, fuzzy
+msgid "View as Install"
+msgstr "ÍÄÀ ¿¢ÚÅø"
+
+#: components/services/install/server/Trilobite_Service_install.oaf.in.h:1
+msgid "Factory for the install service"
+msgstr ""
+
+#: components/services/inventory/eazel-inventory-client.c:70
+msgid "Enable inventory upload."
 msgstr ""
 
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:249
-msgid "  I need some help!  "
+#: components/services/inventory/eazel-inventory-client.c:72
+msgid "Disable inventory upload."
 msgstr ""
 
-#: components/services/login/nautilus-view/nautilus-change-password-view.c:309
+#: components/services/inventory/eazel-inventory-client.c:73
 #, fuzzy
-msgid "Password changed!"
-msgstr "Á¡üÈôÀð¼ ¿¡û"
+msgid "Display information about current inventory settings."
+msgstr "¿¡ÊÄŠ ¿¢Ã¨Äô ÀüȢ ¾¸Å¨Äì ¸¡ðθ¢ÈÐ"
 
-#: components/services/summary/lib/eazel-summary-shared.c:137
-msgid "Could not find a valid boolean value for grey_out!"
-msgstr "º¡õÀÄ¡ìÌ (grey_out) ±ýÀ¾ý ºÃ¢Â¡É âÄ¢Âý Á¾¢ôÀ¢¨Éì ¸¡½Å¢ø¨Ä!"
+#: components/services/inventory/eazel-inventory-client.c:74
+msgid "Upload inventory now, if not up to date."
+msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:188
-msgid "There is no service data !\n"
-msgstr "§º¨Åò¾Ã× ­ø¨Ä! \n"
+#: components/services/inventory/Trilobite_Service_inventory.oaf.in.h:1
+msgid "Factory for the inventory service"
+msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:213
-#: components/services/summary/lib/eazel-summary-shared.c:238
-msgid "There is no eazel news data !\n"
-msgstr "®ƒø ¦ºö¾¢ò ¾Ã× ­ø¨Ä! \n"
+#: components/services/inventory/Trilobite_Service_inventory.oaf.in.h:2
+msgid "Inventory"
+msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:268
-msgid "Could not fetch summary configuration !"
-msgstr "ÅÊÅ¡ì¸ò¾¢ý ­Ú¾¢îÍÕì¸ò¨¾ì ¦¸¡½Ã ÓÊÂÅ¢ø¨Ä! "
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus Inventory view"
+msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ:"
 
-#: components/services/summary/lib/eazel-summary-shared.c:291
-msgid "The summary configuration contains no data!\n"
-msgstr "­Ú¾¢îÍÕì¸ò¾¢ø ¾Ã× ­ø¨Ä!\n"
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:2
+msgid "Nautilus Inventory view factory"
+msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:296
-msgid "Cannot find the SUMMARY_DATA xmlnode!\n"
-msgstr "­Ú¾¢îÍÕì¸ò¾Ã× xml ¸ÏÅ¢ø ¸¡½Å¢ø¨Ä\n"
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:3
+msgid "Nautilus System Inventory component's component's factory"
+msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:298
-msgid "Bailing from the SUMMARY_DATA parse!\n"
-msgstr "­Ú¾¢îÍÕì¸ò¾Ã¨Å «Ä¸£ðÊÉ¢ýÚ ±È¢ÂôÀθ¢ÈÐ! \n"
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:4
+msgid "System Inventory"
+msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:305
-msgid "Could not find any summary configuration data!\n"
-msgstr "­Ú¾¢îÍÕì¸ ÅÊÅ¡ì¸ò¾ÃÅ¢¨Éì ¸¡½Å¢ø¨Ä! \n"
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:5
+msgid "System Inventory Viewer"
+msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:307
-msgid "Bailing from summary configuration parse!\n"
-msgstr "­Ú¾¢î ÍÕì¸ ÅÊÅ¡ì¸ «Ä¸£ðÊÉ¢ýÚ ±È¢ÂôÀθ¢ÈÐ!\n"
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:6
+msgid "System inventory view component"
+msgstr ""
 
-#. parse_summary_xml_file
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: po/tmp/nautilus-summary-view-ui.xml.h:7
-msgid "Configure your service preferences"
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:7
+msgid "View as System Inventory"
 msgstr ""
 
-#: po/tmp/nautilus-summary-view-ui.xml.h:8
-msgid "Go to the Eazel Services Registration Form"
+#. Setup the title
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:153
+msgid "Please Change Your Eazel Password"
 msgstr ""
 
-#: po/tmp/nautilus-summary-view-ui.xml.h:9
+#. add password boxes
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:174
 #, fuzzy
-msgid "Log out from Eazel Services"
-msgstr "®ƒø §º¨Å¢ø §º÷ó¾¢Î¸"
+msgid "User Name:"
+msgstr "¦ÀÂ÷ Á¡üÚ"
 
-#: po/tmp/nautilus-summary-view-ui.xml.h:10
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:181
 #, fuzzy
-msgid "Service _Preferences"
-msgstr "¦¾¡¼ì¸ Å¢ÕôÀí¸û"
+msgid "Current Password:"
+msgstr "ºÃ¢ÂüÈ ¸¼×¡ø."
 
-#: po/tmp/nautilus-summary-view-ui.xml.h:11
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:188
 #, fuzzy
-msgid "Show the log-in dialog box"
-msgstr "Íð¼ø ¾¸Åø ¦¸¡ñ¼ ¯¨Ã¡¼ø ¦ÀðʨÂ측ðÎ "
+msgid "New Password:"
+msgstr "ºÃ¢ÂüÈ ¸¼×¡ø."
 
-#: po/tmp/nautilus-summary-view-ui.xml.h:12
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:195
 #, fuzzy
-msgid "_Log in to Eazel Services"
-msgstr "®ƒø §º¨Å¢ø §º÷ó¾¢Î¸"
+msgid "Confirm New Password:"
+msgstr "ºÃ¢ÂüÈ ¸¼×¡ø."
 
-#: po/tmp/nautilus-summary-view-ui.xml.h:13
+#. allocate the command buttons - first the change_password button
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:227
 #, fuzzy
-msgid "_Log out from Eazel Services"
-msgstr "®ƒø §º¨Å¢ø §º÷ó¾¢Î¸"
+msgid "Change my password"
+msgstr "ºÃ¢ÂüÈ ¸¼×¡ø."
 
-#: po/tmp/nautilus-summary-view-ui.xml.h:14
-#, fuzzy
-msgid "_Register for Eazel Services"
-msgstr "®ƒø §º¨Å¢ø §º÷ó¾¢Î¸"
+#. now allocate the account maintenance button
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:234
+msgid "I need assistance"
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:282
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:297
 #, fuzzy
-msgid "Register"
-msgstr "¦¾¡¼íÌ¿÷"
+msgid "Your password has been changed!"
+msgstr "Á¡üÈôÀð¼ ¿¡û"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:283
-#, fuzzy
-msgid "Login"
-msgstr "­¼õ"
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:328
+msgid ""
+"I'm sorry, but that password\n"
+"is incorrect.  Please try again."
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:284
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:292
-msgid "Terms of Use"
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:332
+msgid ""
+"I'm sorry, but your new password\n"
+"must be at least six (6) characters long.\n"
+"Please try another one."
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:285
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:293
-msgid "Privacy Statement"
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:337
+msgid ""
+"I'm sorry, but your new password\n"
+"can't be ridiculously long.\n"
+"Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:346
+msgid ""
+"I'm sorry, but your new password must\n"
+"contain letters along with at least one\n"
+"number or symbol. Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:350
+msgid ""
+"I'm sorry, but I hit an unexpected\n"
+"error. Please try again, with\n"
+"different passwords."
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:290
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:434
+msgid ""
+"I'm sorry, but I got an unexpected\n"
+"error.  Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:467
+msgid ""
+"I'm sorry, but your new password\n"
+"wasn't typed the same way twice.\n"
+"Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:1
 #, fuzzy
-msgid "Account Preferences"
-msgstr "¦¾¡¼ì¸ Å¢ÕôÀí¸û"
+msgid "Change Password"
+msgstr "ºÃ¢ÂüÈ ¸¼×¡ø."
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:291
-msgid "Logout"
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:2
+msgid "Change Password Viewer"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:345
-#, fuzzy, c-format
-msgid "Welcome Back %s!"
-msgstr "¿¡ÊÄÍìÌ ¿øÅÃ×!"
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:3
+msgid "Eazel Change Password View"
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:351
-msgid "You are not logged in!"
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:4
+msgid "Eazel Change Password view component"
 msgstr ""
 
-#. add the tab
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:443
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:5
+msgid "Nautilus Service Login View Factory"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:6
+msgid "Service Login View Component's Factory"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:7
 #, fuzzy
-msgid "Your Services"
-msgstr "§º¨Å¸û"
+msgid "View as Change Password"
+msgstr "ÁüȨŠ§À¡ø À¡÷ì¸"
 
-#. create the Additional Services pane
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:507
+#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:295
 #, fuzzy
-msgid "Additional Services"
-msgstr "®ƒø §º¨Å¸û"
+msgid "Unknown Date"
+msgstr "«È¢ÂôÀ¼¡¾ Ũ¸"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:527
+#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:300
+msgid "%A, %B %d"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-callbacks.c:97
+msgid ""
+"Sorry, network problems are preventing you from connecting to Eazel Services."
+msgstr ""
+
+#. FIXME we really should use the services alert icon here, eh?
+#: components/services/summary/nautilus-summary-callbacks.c:102
 msgid ""
+"Your Eazel Services account has not yet been activated.  You can't log into "
+"Eazel Services until you activate your account.\n"
 "\n"
-"Check back here for new system management\n"
-"services that will help make Linux easier to use."
+"Please check your email for activation instructions."
 msgstr ""
 
-#. add the tab
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:566
-#, fuzzy
-msgid "Current Updates"
-msgstr "¾ü§À¡¨¾Â ±ñ½ì¸Õ"
+#. FIXME we really should use the services alert icon here, eh?
+#: components/services/summary/nautilus-summary-callbacks.c:109
+msgid ""
+"Your Eazel Service User Account has been temporarily disabled.\n"
+"\n"
+"Please try again in a few minutes, or contact Eazel support if this problem "
+"continues."
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:599
-#, fuzzy, c-format
-msgid "Version %s"
-msgstr "À¾¢ôÒ: %s"
+#: components/services/summary/nautilus-summary-callbacks.c:131
+msgid "We're sorry, but your name and password are still not recognized."
+msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1199
+#: components/services/summary/nautilus-summary-dialogs.c:69
+#, fuzzy
+msgid "Eazel Service Login Error"
+msgstr "§º¨Å¸û"
+
+#: components/services/summary/nautilus-summary-dialogs.c:80
 #, fuzzy
 msgid "Service Error"
 msgstr "§º¨Å¸û"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1264
+#: components/services/summary/nautilus-summary-dialogs.c:104
 msgid "Register Now"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1266
-#, fuzzy
-msgid "Help"
-msgstr "_¯¾Å¢"
-
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1269
+#: components/services/summary/nautilus-summary-dialogs.c:115
 #, fuzzy
 msgid "Services Login"
 msgstr "§º¨Å¸û"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1281
+#: components/services/summary/nautilus-summary-dialogs.c:131
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 #, fuzzy
 msgid "Username:"
 msgstr "¦ÀÂ÷ Á¡üÚ"
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1288
+#: components/services/summary/nautilus-summary-dialogs.c:138
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1296
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1308
+#: components/services/summary/nautilus-summary-dialogs.c:146
+#: components/services/summary/nautilus-summary-dialogs.c:155
 #, fuzzy
-msgid "Please log in to Eazel services"
+msgid "Please log in to Eazel Services"
 msgstr "®ƒø §º¨Å¸Ç¢ø  §ºÃ Å¢ÕõÒ¸¢§Èý."
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1300
+#: components/services/summary/nautilus-summary-dialogs.c:150
+msgid "Your user name or password were not correct.  Please try again."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:117
+#: libnautilus-extensions/nautilus-program-chooser.c:1361
+msgid "Go There"
+msgstr "«íÌ ¦ºø"
+
+#: components/services/summary/nautilus-summary-view.c:120
+#, fuzzy
+msgid "More Info"
+msgstr "¾¸Åø"
+
+#: components/services/summary/nautilus-summary-view.c:131
+#, fuzzy
+msgid "Account Preferences"
+msgstr "¦¾¡¼ì¸ Å¢ÕôÀí¸û"
+
+#: components/services/summary/nautilus-summary-view.c:132
+msgid "Logout"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:133
+#: components/services/summary/nautilus-summary-view.c:141
+msgid "Terms of Use"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:134
+#: components/services/summary/nautilus-summary-view.c:142
+msgid "Privacy Statement"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:139
+#, fuzzy
+msgid "Register"
+msgstr "¦¾¡¼íÌ¿÷"
+
+#: components/services/summary/nautilus-summary-view.c:140
+#, fuzzy
+msgid "Login"
+msgstr "­¼õ"
+
+#: components/services/summary/nautilus-summary-view.c:170
+#, fuzzy, c-format
+msgid "Eazel Services - Welcome, %s!"
+msgstr "®ƒø §º¨Å¸û"
+
+#: components/services/summary/nautilus-summary-view.c:175
+msgid "Eazel Services - You are not logged in"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:182
+#, fuzzy
+msgid "Connecting to Eazel Services..."
+msgstr "®ƒø §º¨Å¢ø §º÷ó¾¢Î¸"
+
+#: components/services/summary/nautilus-summary-view.c:741
+#: data/linksets/home.xml.h:3 src/nautilus-service-ui.xml.h:4
+msgid "Services"
+msgstr "§º¨Å¸û"
+
+#: components/services/summary/nautilus-summary-view.c:752
+msgid "Featured Downloads"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:884
 msgid ""
-"Your user name or password were not correct, or you have not activated your "
-"account.  Please try again, or check your email for an account activation "
-"notice."
+"Unable to get services data from Eazel's server. The server might be "
+"unavailable right now, or your computer might be configured incorrectly. "
+"Please contact support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1304
-msgid "We're sorry, but your name and password are still not recognized."
+#: components/services/summary/nautilus-summary-view.c:894
+msgid ""
+"Found a problem with services data on Eazel servers. Please contact "
+"support@eazel.com."
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1504
+#: components/services/summary/nautilus-summary-view.c:917
+msgid ""
+"Information is missing from the redirect data on Eazel servers. Please "
+"contact support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
-"now, or your computer might be configured incorrectly.You could try again "
+"now, or your computer might be configured incorrectly. You could try again "
 "later."
 msgstr ""
 
-#: components/services/summary/nautilus-view/nautilus-summary-view.c:1522
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
-"Found problem with data on Eazel servers. Please contact support@eazel.com."
+"Found a problem with redirect data on Eazel servers. Please contact "
+"support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:986
+msgid "Failed to upload system inventory."
 msgstr ""
 
-#: components/services/time/command-line/main.c:43
-msgid "display service name and such"
-msgstr "§º¨Åô ¦ÀÂâ¨Éì ¸¡ðθ"
+#: components/services/summary/nautilus-summary-view.c:1049
+#: src/nautilus-first-time-druid.c:258
+msgid "Eazel Services"
+msgstr "®ƒø §º¨Å¸û"
 
-#: components/services/time/command-line/main.c:44
-msgid "maximum allowed difference in seconds"
-msgstr "«ÛÁ¾¢ì¸ôÀð¼ ¦ÀÕÁ §ÅÚÀ¡Î ¦¿¡Ê¸Ç¢ø"
+#: components/services/summary/nautilus-summary-view-ui.xml.h:1
+msgid "Configure your service preferences"
+msgstr ""
 
-#: components/services/time/command-line/main.c:45
-msgid "update the system clock"
-msgstr "¸½¢É¢Â¢ý ¸Ê¨¸¨Âô ÒÐôÀ¢"
+#: components/services/summary/nautilus-summary-view-ui.xml.h:2
+msgid "Go to the Eazel Services Registration Form"
+msgstr ""
 
-#: components/services/time/command-line/main.c:46
+#: components/services/summary/nautilus-summary-view-ui.xml.h:3
 #, fuzzy
-msgid "specify time server"
-msgstr "§¿Ãõ Ô.¬÷.±ø. (time url) ¾¨Éì ÌÈ¢ôÀ¢Î¸"
+msgid "Log out from Eazel Services"
+msgstr "®ƒø §º¨Å¢ø §º÷ó¾¢Î¸"
 
-#: components/services/time/service/trilobite-eazel-time-service.c:113
-msgid "Unable to get server time"
-msgstr "§º¨Å¸ò¾¢ý §¿Ãò¨¾ô ¦ÀÈ ­ÂÄÅ¢ø¨Ä"
+#: components/services/summary/nautilus-summary-view-ui.xml.h:4
+#, fuzzy
+msgid "Service _Preferences"
+msgstr "¦¾¡¼ì¸ Å¢ÕôÀí¸û"
 
-#: components/services/time/service/trilobite-eazel-time-service.c:115
-#, c-format
-msgid "Time off by %d, max allowed diff is %d"
-msgstr "§¿Ãõ %d «Ç× Á¡ÚÀθ¢ÈÐ , «ÛÁ¾¢ì¸ôÀð¼ ¦ÀÕÁ §ÅÚÀ¡Î (max diff) %d"
+#: components/services/summary/nautilus-summary-view-ui.xml.h:5
+#, fuzzy
+msgid "Show the log-in dialog box"
+msgstr "Íð¼ø ¾¸Åø ¦¸¡ñ¼ ¯¨Ã¡¼ø ¦ÀðʨÂ측ðÎ "
 
-#: components/services/time/service/trilobite-eazel-time-service.c:292
-#, c-format
-msgid "Could not read time-service config from %s"
-msgstr "%s ±Ûõ ¸¡Äî §º¨Å ÅÊÅ¡ì¸ò¾¢¨Éô ÀÊì¸ ÓÊÂÅ¢ø¨Ä"
+#: components/services/summary/nautilus-summary-view-ui.xml.h:6
+#, fuzzy
+msgid "_Log in to Eazel Services"
+msgstr "®ƒø §º¨Å¢ø §º÷ó¾¢Î¸"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:7
+#, fuzzy
+msgid "_Log out from Eazel Services"
+msgstr "®ƒø §º¨Å¢ø §º÷ó¾¢Î¸"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:8
+#, fuzzy
+msgid "_Register for Eazel Services"
+msgstr "®ƒø §º¨Å¢ø §º÷ó¾¢Î¸"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus Service Summary View Factory"
+msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ §¾÷ó¦¾ÎôÀ¡ý"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Summary View"
+msgstr "¿¡ÊÄŠ ÒÐôÀ¢ò¾ø"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:3
+msgid "Service Summary View Component's Factory"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:4
+msgid "Service Summary view component"
+msgstr ""
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:394
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:5
+msgid "Summary"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:6
+#, fuzzy
+msgid "Summary Viewer"
+msgstr "±ñ ¸¡ðº¢:"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:7
+#, fuzzy
+msgid "View as Summary"
+msgstr "ÁüȨŠ§À¡ø À¡÷ì¸"
+
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
 #, fuzzy, c-format
 msgid "HTTP error %d \"%s\" on uri %s"
 msgstr "±î.Ê.Ê.À¢. À¢¨Æ:%d %s"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:478
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 msgid "Could not initialize Bonobo"
 msgstr "¦À¡§É¡§À¡Å¢ý ¦¾¡¼ì¸Á¾¢ôÀÇ¢ì¸ ÓÊÂÅ¢ø¨Ä"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:493
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr "%s ±Ûõ À¾¢×째¡ôÀ¢¨É ±Ø¾ ÓÊÂÅ¢ø¨Ä - ¦¸¡¼¡ ¿¢¨Äì ¨¸Â¡Ù¿¨Ãô ÀÂý¦ºö¸¢§Èý"
 
-#: components/services/vault/command-line/main.c:38
-msgid "Enable debugging"
-msgstr "À¢¨Æ¿£ì¸ò¨¾ ­ÂÖ¨ÁôÀÊòи"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus eazel sample service view component"
+msgstr ""
+"%s\n"
+"\n"
+"­ó¾ Á¡¾¢Ã¢ ¿¡ÊÄŠ ¦À¡ÕÇ¼ì¸ ¸¡ðº¢ì ÜÚ."
 
-#: components/services/vault/command-line/main.c:39
-msgid "Vault location"
-msgstr "Å¡øð ­¼õ"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:2
+msgid "Nautilus services startup view factory"
+msgstr ""
 
-#: components/services/vault/command-line/main.c:47
-msgid "Valid operations:"
-msgstr "¦ºøÖÀÊ¡Ìõ ¦ºÂø¸û:"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:3
+#, fuzzy
+msgid "Service"
+msgstr "§º¨Å¸û"
 
-#: components/services/vault/command-line/main.c:87
-msgid "Error: No operation supplied\n"
-msgstr "À¢¨Æ: ¦ºÂø ²Ðõ ÅÆí¸ôÀ¼Å¢ø¨Ä\n"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:4
+#, fuzzy
+msgid "Service Viewer"
+msgstr "§º¨Å¸û"
 
-#: components/services/vault/command-line/main.c:95
-#, c-format
-msgid "Error: Invalid operation supplied (%s)\n"
-msgstr "À¢¨Æ: ¦ºøÖÀÊ¡¸¡¾ ¦ºÂø ÅÆí¸ôÀð¼Ð(%s)\n"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:5
+msgid "Services startup view factory"
+msgstr ""
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:6
+#, fuzzy
+msgid "View as Service"
+msgstr "ÁüȨŠ§À¡ø À¡÷ì¸"
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:7
+msgid "eazel sample service view"
+msgstr ""
+
+#: components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in.h:1
+msgid "Factory for the sample service"
+msgstr ""
 
-#: components/services/vault/command-line/main.c:120
+#: components/text/nautilus-text-view.c:334
 #, c-format
-msgid ""
-"Error: Invalid syntax\n"
-"Syntax: %s\n"
+msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr ""
-"À¢¨Æ: ¦ºøÖÀÊ¡¸¡¾ ¦¾¡¼÷ \n"
-"¦¾¡¼÷: %s\n"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: po/tmp/browser.xml.h:7
+#: components/text/nautilus-text-view.c:337
+msgid "File too large"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "±ØòРŨ¸¸û"
+
+#: components/text/nautilus-text-view-ui.xml.h:2
+msgid "Lucida"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:3
+msgid "Use the Courier Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:4
+msgid "Use the Fixed Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+msgid "Use the GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:6
+msgid "Use the Helvetica Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:7
+msgid "Use the Lucida Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:8
+msgid "Use the Times Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:9
+msgid "_Courier"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "_§¸¡ôÒ"
+
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
+msgid "_Helvetica"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:13
+#, fuzzy
+msgid "_Times"
+msgstr "¸¡Äõ"
+
+#: components/text/Nautilus_View_text.oaf.in.h:1
+msgid "Factory for text view"
+msgstr ""
+
+#: components/text/Nautilus_View_text.oaf.in.h:2
+#, fuzzy
+msgid "Text"
+msgstr "«ÎòÐ"
+
+#: components/text/Nautilus_View_text.oaf.in.h:3
+#, fuzzy
+msgid "Text Viewer"
+msgstr "¯¨Ãì ¸¡ðº¢:"
+
+#: components/text/Nautilus_View_text.oaf.in.h:4
+#, fuzzy
+msgid "Text view"
+msgstr "¯¨Ãì ¸¡ðº¢:"
+
+#: components/text/Nautilus_View_text.oaf.in.h:5
+msgid "Text view factory"
+msgstr ""
+
+#: components/text/Nautilus_View_text.oaf.in.h:6
+#, fuzzy
+msgid "View as Text"
+msgstr "%s §À¡ýÈ ¸¡ðº¢ "
+
+#: components/text/services/google.xml.h:1
+msgid "Search Google for Selected Text"
+msgstr ""
+
+#: components/text/services/google.xml.h:2
+msgid "Use Google to search the web for the selected text"
+msgstr ""
+
+#: components/text/services/webster.xml.h:1
+msgid "Look Up Selected Text in Dictionary"
+msgstr ""
+
+#: components/text/services/webster.xml.h:2
+#, fuzzy
+msgid "Look up the selected text in the Merriam-Webster dictionary"
+msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ¯¨Ã ¿¸ø¾¨É, À¢¨½ôÀĨ¸Â¢ø ­Î¸¢ÈÐ"
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:1
+msgid "animation to indicate on-going activity"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:2
+msgid "throbber"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:3
+msgid "throbber factory"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:4
+msgid "throbber object factory"
+msgstr ""
+
+#: components/tree/Nautilus_View_tree.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus Tree sidebar panel"
+msgstr "­ÆôÀ÷ µÃôÀð¨¼ì ¸¡ðº¢¨Âì ¦¸¡¨Ä ¦ºö"
+
+#: components/tree/Nautilus_View_tree.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Tree view"
+msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ:"
+
+#: components/tree/Nautilus_View_tree.oaf.in.h:3
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
+msgid "Tree"
+msgstr ""
+
+#: data/browser.xml.h:1
 #, fuzzy
 msgid "Apparition"
 msgstr "ÀÂýÀ¡Î¸û"
 
-#: po/tmp/browser.xml.h:8
+#: data/browser.xml.h:2
 msgid "Azul"
 msgstr ""
 
-#: po/tmp/browser.xml.h:9
-#, fuzzy
-msgid "Backgrounds"
-msgstr "À¢ýɽ¢¨Â ¿¢¨Ä Á£ðÎ"
-
-#: po/tmp/browser.xml.h:10
+#: data/browser.xml.h:3
 #, fuzzy
 msgid "Black"
 msgstr "À¢ýÒ"
 
-#: po/tmp/browser.xml.h:11
+#: data/browser.xml.h:4
+msgid "Blue Ridge"
+msgstr ""
+
+#: data/browser.xml.h:5
+msgid "Blue Rough"
+msgstr ""
+
+#: data/browser.xml.h:6
+#, fuzzy
+msgid "Blue Type"
+msgstr "_Ũ¸¨Â즸¡ñÎ"
+
+#: data/browser.xml.h:7
+msgid "Brushed Metal"
+msgstr ""
+
+#: data/browser.xml.h:8
 msgid "Bubble Gum"
 msgstr ""
 
-#: po/tmp/browser.xml.h:12
+#: data/browser.xml.h:9
+msgid "Burlap"
+msgstr ""
+
+#: data/browser.xml.h:10
+msgid "Camouflage"
+msgstr ""
+
+#: data/browser.xml.h:11
+msgid "Certified"
+msgstr ""
+
+#: data/browser.xml.h:12
+#, fuzzy
+msgid "Chalk"
+msgstr "¾¼í¸û"
+
+#: data/browser.xml.h:13
 msgid "Charcoal"
 msgstr ""
 
-#: po/tmp/browser.xml.h:13
+#: data/browser.xml.h:14
 #, fuzzy
 msgid "Colors"
 msgstr "ãÎ"
 
-#: po/tmp/browser.xml.h:14
+#: data/browser.xml.h:15
 #, fuzzy
 msgid "Concrete"
 msgstr "¦À¡Õû «¼ì¸õ"
 
-#: po/tmp/browser.xml.h:15
+#: data/browser.xml.h:16
+#, fuzzy
+msgid "Cool"
+msgstr "¦¾Ã¢× ¦ºö"
+
+#: data/browser.xml.h:17
+#, fuzzy
+msgid "Cork"
+msgstr "ãÎ"
+
+#: data/browser.xml.h:18
+#, fuzzy
+msgid "Countertop"
+msgstr "¦À¡Õû «¼ì¸õ"
+
+#: data/browser.xml.h:19
+#, fuzzy
+msgid "Danger"
+msgstr "ÓÊó¾Ð"
+
+#: data/browser.xml.h:20
 #, fuzzy
 msgid "Danube"
 msgstr "ÓÊó¾Ð"
 
-#: po/tmp/browser.xml.h:16
+#: data/browser.xml.h:21
 msgid "Dark Cork"
 msgstr ""
 
-#: po/tmp/browser.xml.h:17
+#: data/browser.xml.h:22
+msgid "Dark GNOME"
+msgstr ""
+
+#: data/browser.xml.h:23
 msgid "Deep Teal"
 msgstr ""
 
-#: po/tmp/browser.xml.h:18
-msgid "Drag a background tile to an object to change it"
+#: data/browser.xml.h:24
+#, fuzzy
+msgid "Distinguished"
+msgstr "ÓÊó¾Ð"
+
+#: data/browser.xml.h:25
+#, fuzzy
+msgid "Dots"
+msgstr "±ØòРŨ¸¸û"
+
+#: data/browser.xml.h:26
+msgid "Draft"
 msgstr ""
 
-#: po/tmp/browser.xml.h:19
+#: data/browser.xml.h:27
 msgid "Drag a color to an object to change it to that color"
 msgstr ""
 
-#: po/tmp/browser.xml.h:20
+#: data/browser.xml.h:28
+msgid "Drag a pattern tile to an object to change it"
+msgstr ""
+
+#: data/browser.xml.h:29
 msgid "Drag an emblem to an object to add it to the object"
 msgstr ""
 
-#: po/tmp/browser.xml.h:21
+#: data/browser.xml.h:30
 msgid "Eclipse"
 msgstr ""
 
-#: po/tmp/browser.xml.h:22 src/file-manager/fm-properties-window.c:1355
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "º¢ýÉí¸û"
 
-#: po/tmp/browser.xml.h:23
+#: data/browser.xml.h:32
 msgid "Envy"
 msgstr ""
 
-#: po/tmp/browser.xml.h:24
+#: data/browser.xml.h:33
+#, fuzzy
+msgid "Erase"
+msgstr "Ìô¨Àò ¦¾¡ðÊ"
+
+#: data/browser.xml.h:34
+#, fuzzy
+msgid "Favorite"
+msgstr "±ØÐ"
+
+#: data/browser.xml.h:35
+msgid "Fibers"
+msgstr ""
+
+#: data/browser.xml.h:36
 msgid "Fire Engine"
 msgstr ""
 
-#: po/tmp/browser.xml.h:25
+#: data/browser.xml.h:37
+msgid "Fleur De Lis"
+msgstr ""
+
+#: data/browser.xml.h:38
+#, fuzzy
+msgid "Floral"
+msgstr "ШÈ:"
+
+#: data/browser.xml.h:39
+msgid "Fossil"
+msgstr ""
+
+#: data/browser.xml.h:40 icons/gnome/gnome.xml.h:1
+msgid "GNOME"
+msgstr ""
+
+#: data/browser.xml.h:41
 #, fuzzy
 msgid "Granite"
 msgstr "±ØÐ"
 
-#: po/tmp/browser.xml.h:26
+#: data/browser.xml.h:42
 msgid "Grapefruit"
 msgstr ""
 
-#: po/tmp/browser.xml.h:27
+#: data/browser.xml.h:43
+msgid "Green Weave"
+msgstr ""
+
+#: data/browser.xml.h:44
+msgid "Ice"
+msgstr ""
+
+#: data/browser.xml.h:45
+msgid "Important"
+msgstr ""
+
+#: data/browser.xml.h:46
 #, fuzzy
 msgid "Indigo"
 msgstr "¾¸Åø"
 
-#: po/tmp/browser.xml.h:28
+#: data/browser.xml.h:47
 msgid "Leaf"
 msgstr ""
 
-#: po/tmp/browser.xml.h:29
+#: data/browser.xml.h:48
 msgid "Lemon"
 msgstr ""
 
-#: po/tmp/browser.xml.h:30
+#: data/browser.xml.h:49
 msgid "Mango"
 msgstr ""
 
-#: po/tmp/browser.xml.h:31
+#: data/browser.xml.h:50
+msgid "Manila Paper"
+msgstr ""
+
+#: data/browser.xml.h:51
+msgid "Moss Ridge"
+msgstr ""
+
+#: data/browser.xml.h:52
 msgid "Mud"
 msgstr ""
 
-#: po/tmp/browser.xml.h:32
+#: data/browser.xml.h:53
+msgid "New"
+msgstr ""
+
+#: data/browser.xml.h:54
+#, fuzzy
+msgid "Numbers"
+msgstr "±ñ ¸¡ðº¢:"
+
+#: data/browser.xml.h:55
+#: libnautilus-extensions/nautilus-file-operations.c:1102
+msgid "OK"
+msgstr ""
+
+#: data/browser.xml.h:56
+msgid "Ocean Strips"
+msgstr ""
+
+#: data/browser.xml.h:57
+msgid "Oh No"
+msgstr ""
+
+#: data/browser.xml.h:58
 msgid "Onyx"
 msgstr ""
 
-#: po/tmp/browser.xml.h:33
+#: data/browser.xml.h:59
 msgid "Orange"
 msgstr ""
 
-#: po/tmp/browser.xml.h:34
+#: data/browser.xml.h:60
 msgid "Pale Blue"
 msgstr ""
 
-#: po/tmp/browser.xml.h:35
+#: data/browser.xml.h:61
+msgid "Patterns"
+msgstr ""
+
+#: data/browser.xml.h:62
+#, fuzzy
+msgid "Personal"
+msgstr "«ÛÁ¾¢¸û"
+
+#: data/browser.xml.h:63
+#, fuzzy
+msgid "Purple Marble"
+msgstr "ÀÊì¸ÓÊÂÅ¢ø¨Ä"
+
+#: data/browser.xml.h:64
+msgid "Ridged Paper"
+msgstr ""
+
+#: data/browser.xml.h:65
+msgid "Rough Paper"
+msgstr ""
+
+#: data/browser.xml.h:66
 msgid "Ruby"
 msgstr ""
 
-#: po/tmp/browser.xml.h:36
+#: data/browser.xml.h:67
 #, fuzzy
 msgid "Sea Foam"
 msgstr "§¾Î¸:"
 
-#: po/tmp/browser.xml.h:37
+#: data/browser.xml.h:68
 #, fuzzy
 msgid "Shale"
 msgstr "Á¡¾¢Ã¢"
 
-#: po/tmp/browser.xml.h:38
+#: data/browser.xml.h:69
 #, fuzzy
 msgid "Silver"
 msgstr "«Ç×"
 
-#: po/tmp/browser.xml.h:39
+#: data/browser.xml.h:70
 #, fuzzy
 msgid "Sky"
 msgstr "´ðÎõ"
 
-#: po/tmp/browser.xml.h:40
+#: data/browser.xml.h:71
+msgid "Sky Ridge"
+msgstr ""
+
+#: data/browser.xml.h:72
+#, fuzzy
+msgid "Snow Ridge"
+msgstr "µÃôÀ𨼨Âì ¸¡ñÀ¢"
+
+#: data/browser.xml.h:73
+#, fuzzy
+msgid "Special"
+msgstr "º¢ÈôÒì ¦¸¡Ê¸û:"
+
+#: data/browser.xml.h:74
+#, fuzzy
+msgid "Stucco"
+msgstr "¿¢ÚòÐ"
+
+#: data/browser.xml.h:75
 msgid "Tangerine"
 msgstr ""
 
-#: po/tmp/browser.xml.h:41
+#: data/browser.xml.h:76
+msgid "Terracotta"
+msgstr ""
+
+#: data/browser.xml.h:77
+#, fuzzy
+msgid "Urgent"
+msgstr "ÁÈ"
+
+#: data/browser.xml.h:78
 msgid "Violet"
 msgstr ""
 
-#: po/tmp/browser.xml.h:42
+#: data/browser.xml.h:79
+#, fuzzy
+msgid "Wavy White"
+msgstr "±ØÐ"
+
+#: data/browser.xml.h:80
 #, fuzzy
 msgid "White"
 msgstr "±ØÐ"
 
-#: po/tmp/apps.xml.h:8
+#: data/browser.xml.h:81
+#, fuzzy
+msgid "White Ribs"
+msgstr "±ØÐ"
+
+#: data/linksets/apps.xml.h:2
 msgid "Gnumeric"
 msgstr ""
 
-#: po/tmp/apps.xml.h:9
+#: data/linksets/apps.xml.h:3
 msgid "Netscape"
 msgstr ""
 
-#: po/tmp/apps.xml.h:10
+#: data/linksets/apps.xml.h:4
 msgid "The Gimp"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: libnautilus-extensions/nautilus-global-preferences.c:243
-#: po/tmp/desktop.xml.h:7
+#: data/linksets/desktop.xml.h:1
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:4702
-#: libnautilus-extensions/nautilus-trash-directory.c:286
-#: po/tmp/desktop.xml.h:8
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
+#: libnautilus-extensions/nautilus-trash-directory.c:301
+#: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
 msgstr "Ìô¨Àò ¦¾¡ðÊ"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: po/tmp/portals.xml.h:7
+#: data/linksets/home.xml.h:1
+#, fuzzy
+msgid "Computer"
+msgstr "ÓüÚõ"
+
+#: data/linksets/home.xml.h:2
+#, fuzzy
+msgid "Home Directory"
+msgstr "ÀÂÉ÷ «¨¼×"
+
+#: data/linksets/portals.xml.h:1
 #, fuzzy
 msgid "Excite"
 msgstr "¦ºÂøÀÎòÐ"
 
-#: po/tmp/portals.xml.h:8
+#: data/linksets/portals.xml.h:2
 #, fuzzy
 msgid "Portals"
 msgstr "ШÈ:"
 
-#: po/tmp/portals.xml.h:9
+#: data/linksets/portals.xml.h:3
 msgid "Yahoo"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: po/tmp/search_engines.xml.h:7
+#: data/linksets/search_engines.xml.h:1
 #, fuzzy
 msgid "Alta Vista"
 msgstr "¸¨Ä»ý"
 
-#: po/tmp/search_engines.xml.h:8
+#: data/linksets/search_engines.xml.h:2
 msgid "Google"
 msgstr ""
 
-#: po/tmp/search_engines.xml.h:9
+#: data/linksets/search_engines.xml.h:3
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 #, fuzzy
 msgid "Search Engines"
 msgstr "«¨ÁôÒ¸¨Çò §¾Î"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: po/tmp/static_bookmarks.xml.h:7
+#: data/static_bookmarks.xml.h:1
+msgid "Allaire"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:2
+msgid "Binary Freedom"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:3
+msgid "Borland"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:4
 msgid "CNET Computers.com"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:8
+#: data/static_bookmarks.xml.h:5
 msgid "CNET Linux Center"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:9
-#, fuzzy
-msgid "Caldera"
-msgstr "¸Å¢Âð"
-
-#: po/tmp/static_bookmarks.xml.h:10
-msgid "Collab.net"
+#: data/static_bookmarks.xml.h:6
+msgid "CollabNet"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:11
+#: data/static_bookmarks.xml.h:7
 msgid "Compaq"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:12
+#: data/static_bookmarks.xml.h:8
+#, fuzzy
+msgid "Conectiva"
+msgstr "¦À¡Õû «¼ì¸õ"
+
+#: data/static_bookmarks.xml.h:9
+#, fuzzy
+msgid "Covalent"
+msgstr "¦À¡Õû «¼ì¸õ"
+
+#: data/static_bookmarks.xml.h:10
 msgid "Debian.org"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:13
+#: data/static_bookmarks.xml.h:11
 #, fuzzy
 msgid "Dell"
 msgstr "«Æ¢ò¾ø"
 
-#: po/tmp/static_bookmarks.xml.h:14
+#: data/static_bookmarks.xml.h:12
 msgid "Eazel"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:15
+#: data/static_bookmarks.xml.h:13
 msgid "Freshmeat.net"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:16
+#: data/static_bookmarks.xml.h:14
 msgid "GNOME.org"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:17
+#: data/static_bookmarks.xml.h:15
 msgid "GNU.org"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:18
-msgid "Hardware"
-msgstr ""
-
-#: po/tmp/static_bookmarks.xml.h:19
-msgid "Helix Code"
-msgstr ""
-
-#: po/tmp/static_bookmarks.xml.h:20
-msgid "Hewlett-Packard"
-msgstr ""
-
-#: po/tmp/static_bookmarks.xml.h:21
-msgid "IBM"
-msgstr ""
-
-#: po/tmp/static_bookmarks.xml.h:22
-msgid "Inprise"
-msgstr ""
+#: data/static_bookmarks.xml.h:17
+#, fuzzy
+msgid "International"
+msgstr "¿¢Ú×¾ø §¾¡üÈÐ!"
 
-#: po/tmp/static_bookmarks.xml.h:23
-msgid "Linux Companies"
+#: data/static_bookmarks.xml.h:18
+msgid "Linux Documentation Project"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:24
-msgid "Linux Documentation Project"
+#: data/static_bookmarks.xml.h:19
+msgid "Linux One"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:25
+#: data/static_bookmarks.xml.h:20
 msgid "Linux Online"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:26
+#: data/static_bookmarks.xml.h:21
 msgid "Linux Resources"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:27
-msgid "Linux at IBM"
+#: data/static_bookmarks.xml.h:22
+msgid "Linux Weekly News"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:28
+#: data/static_bookmarks.xml.h:23
 msgid "LinuxNewbie.org"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:29
-msgid "Linuxcare"
+#: data/static_bookmarks.xml.h:24
+msgid "LinuxOrbit.com"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:30
-#, fuzzy
-msgid "Myplay"
-msgstr "¸¡ðº¢"
+#: data/static_bookmarks.xml.h:25
+msgid "MandrakeSoft"
+msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:31 src/nautilus-window-manage-views.c:219
-#: src/nautilus-window-menus.c:629
-msgid "Nautilus"
-msgstr "¿¡ÊÄŠ"
+#: data/static_bookmarks.xml.h:26
+#, fuzzy
+msgid "Netraverse"
+msgstr "±ýÚõ ­ø¨Ä"
 
-#: po/tmp/static_bookmarks.xml.h:32
+#: data/static_bookmarks.xml.h:27
 msgid "News and Media"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:33
+#: data/static_bookmarks.xml.h:28
+msgid "O'Reilly"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:29
 msgid "OSDN"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:34
+#: data/static_bookmarks.xml.h:30
+msgid "Open Source Asia"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:31
 msgid "OpenOffice"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:35
+#: data/static_bookmarks.xml.h:32
+msgid "Penguin Computing"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:33
+#, fuzzy
+msgid "Rackspace"
+msgstr "Á¡üÚ"
+
+#: data/static_bookmarks.xml.h:34
 #, fuzzy
 msgid "Red Hat"
 msgstr "Á£ñÎõ À¾¢ì¸"
 
-#: po/tmp/static_bookmarks.xml.h:36
-msgid "Slashdot.org"
+#: data/static_bookmarks.xml.h:35
+#, fuzzy
+msgid "Red Hat Network"
+msgstr "Á£ñÎõ À¾¢ì¸"
+
+#: data/static_bookmarks.xml.h:36
+msgid "RedFlag Linux"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:37
+#: data/static_bookmarks.xml.h:37
 msgid "Software"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:38
+#: data/static_bookmarks.xml.h:38
 msgid "SourceForge"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:39
-msgid "SourceXchange"
-msgstr ""
-
-#: po/tmp/static_bookmarks.xml.h:40
+#: data/static_bookmarks.xml.h:39
 msgid "Sun StarOffice"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:41
-msgid "VA Linux"
-msgstr ""
-
-#: po/tmp/static_bookmarks.xml.h:42
-msgid "VMware"
+#: data/static_bookmarks.xml.h:40
+msgid "Sun Wah Linux"
 msgstr ""
 
-#: po/tmp/static_bookmarks.xml.h:43
+#: data/static_bookmarks.xml.h:41
 #, fuzzy
 msgid "Web Services"
 msgstr "§º¨Å¸û"
 
-#: po/tmp/static_bookmarks.xml.h:44
+#: data/static_bookmarks.xml.h:42
+msgid "ZDNet Linux Hardware Database"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:43
 msgid "ZDNet Linux Resource Center"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-druid-page-eazel.c:343
-msgid "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
-msgstr "-adobe-helvetica-¾Êò¾-r-­ÂøÒ-*-*-180-*-*-p-*-*-*,*-r-*"
+#: data/static_bookmarks.xml.h:44
+msgid "Zero-Knowledge"
+msgstr ""
+
+#: icons/ardmore/ardmore.xml.h:1
+#, fuzzy
+msgid "Tahoe"
+msgstr "Ìô¨Àò ¦¾¡ðÊ"
+
+#: icons/ardmore/ardmore.xml.h:2
+msgid "This theme uses photo-realistic folders."
+msgstr ""
+
+#: icons/arlo/arlo.xml.h:1
+msgid "A Teal variation of the Crux theme."
+msgstr ""
+
+#: icons/arlo/arlo.xml.h:2
+msgid "Crux-Teal"
+msgstr ""
+
+#: icons/crux_eggplant/crux_eggplant.xml.h:1
+msgid "An Eggplant variation of the Crux theme."
+msgstr ""
+
+#: icons/crux_eggplant/crux_eggplant.xml.h:2
+msgid "Crux-Eggplant"
+msgstr ""
+
+#: icons/default.xml.h:1
+#, fuzzy
+msgid "Default"
+msgstr "«Æ¢ò¾ø"
+
+#: icons/default.xml.h:2
+#, fuzzy
+msgid "This is the default theme for Nautilus."
+msgstr "ÌÚõÀ¼ò¾¢ø ¯ûÇ ¯¨Ã¨Âì ¸¡ðÎ"
+
+#: icons/gnome/gnome.xml.h:2
+msgid "This theme uses the classic GNOME icons."
+msgstr ""
+
+#: icons/villanova/villanova.xml.h:1
+#, fuzzy
+msgid "Sierra"
+msgstr "«Ç×"
+
+#: icons/villanova/villanova.xml.h:2
+msgid "Uses manila folders and gray-green backgrounds."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-druid-page-eazel.c:352
+#: libnautilus-extensions/nautilus-drag.c:489
+#, fuzzy
+msgid "_Move here"
+msgstr "«íÌ ¦ºø"
+
+#: libnautilus-extensions/nautilus-drag.c:490
+#, fuzzy
+msgid "_Copy here"
+msgstr "_¯¨Ã ¿¸ø"
+
+#: libnautilus-extensions/nautilus-drag.c:491
+#, fuzzy
+msgid "_Link here"
+msgstr "­¨½ôÒò ¦¾¡Ì¾¢"
+
+#. Note to localizers: this font is used for text items in Druid pages
+#: libnautilus-extensions/nautilus-druid-page-eazel.c:381
 msgid "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-*"
 msgstr "-adobe-helvetica-¾Êò¾-r-­ÂøÒ-*-*-120-*-*-p-*-*-*,*-r-*"
 
-#. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:321
-msgid "From:"
-msgstr "Ţο÷:"
+#. Note to localizers: this font is used for page titles in Druid pages
+#: libnautilus-extensions/nautilus-druid-page-eazel.c:560
+msgid "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
+msgstr "-adobe-helvetica-¾Êò¾-r-­ÂøÒ-*-*-180-*-*-p-*-*-*,*-r-*"
 
-#. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:336
-msgid "To:"
-msgstr "¦ÀÚ¿÷:"
+#. Today, use special word.
+#. * Note to localizers: You can look at man strftime
+#. * for details on the format, but you should only use
+#. * the specifiers from the C standard, not extensions.
+#. * These include "%" followed by one of
+#. * "aAbBcdHIjmMpSUwWxXyYZ". There are two extensions
+#. * in the Nautilus version of strftime that can be
+#. * used (and match GNU extensions). Putting a "-"
+#. * between the "%" and any numeric directive will turn
+#. * off zero padding, and putting a "_" there will use
+#. * space padding instead of zero padding.
+#.
+#: libnautilus-extensions/nautilus-file.c:2277
+#, fuzzy
+msgid "today at %-I:%M %p"
+msgstr "­ýÚ %-I:%M %ô"
 
-#: libnautilus-extensions/nautilus-file-operations.c:502
+#. Yesterday, use special word.
+#. * Note to localizers: Same issues as "today" string.
+#.
+#: libnautilus-extensions/nautilus-file.c:2282
 #, fuzzy
-msgid "Error while copying."
-msgstr "¿¸ø ±ÎìÌõ§À¡Ð À¢¨Æ"
+msgid "yesterday at %-I:%M %p"
+msgstr "§¿üÚ %-I:%M %p"
 
-#: libnautilus-extensions/nautilus-file-operations.c:505
+#. Current week, include day of week.
+#. * Note to localizers: Same issues as "today" string.
+#.
+#: libnautilus-extensions/nautilus-file.c:2287
 #, fuzzy
-msgid "Error while moving."
-msgstr "¿¸ø ±ÎìÌõ§À¡Ð À¢¨Æ"
+msgid "%A %-m/%-d/%y at %-I:%M %p"
+msgstr "%A %-Á¡/%-¿¡/%Å %-I:%M %p"
 
-#: libnautilus-extensions/nautilus-file-operations.c:508
+#. Other dates.
+#. * Note to localizers: Same issues as "today" string.
+#.
+#: libnautilus-extensions/nautilus-file.c:2292
 #, fuzzy
-msgid "Error while linking."
-msgstr "¿¸ø ±ÎìÌõ§À¡Ð À¢¨Æ"
+msgid "%-m/%-d/%y at %-I:%M %p"
+msgstr "%-Á¡/%-¿¡/%Å %-I:%M %p"
+
+#: libnautilus-extensions/nautilus-file.c:3423
+msgid "0 items"
+msgstr "0 ¯ÕôÀʸû"
+
+#: libnautilus-extensions/nautilus-file.c:3423
+msgid "0 folders"
+msgstr "0 «¨¼×¸û"
+
+#: libnautilus-extensions/nautilus-file.c:3424
+msgid "0 files"
+msgstr "0 §¸¡ôÒ¸û"
+
+#: libnautilus-extensions/nautilus-file.c:3428
+msgid "1 item"
+msgstr "1 ¯ÕôÀÊ"
+
+#: libnautilus-extensions/nautilus-file.c:3428
+msgid "1 folder"
+msgstr "1 «¨¼×"
 
-#: libnautilus-extensions/nautilus-file-operations.c:513
+#: libnautilus-extensions/nautilus-file.c:3429
+msgid "1 file"
+msgstr "1 §¸¡ôÒ"
+
+#: libnautilus-extensions/nautilus-file.c:3432
+#, c-format
+msgid "%u items"
+msgstr "%u ¯ÕôÀʸû"
+
+#: libnautilus-extensions/nautilus-file.c:3432
+#, c-format
+msgid "%u folders"
+msgstr "%u «¨¼×¸û"
+
+#: libnautilus-extensions/nautilus-file.c:3433
+#, c-format
+msgid "%u files"
+msgstr "%u §¸¡ôÒ¸û"
+
+#. This means no contents at all were readable
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 #, fuzzy
-msgid "Error while deleting."
-msgstr "¿¸ø ±ÎìÌõ§À¡Ð À¢¨Æ"
+msgid "? items"
+msgstr "0 ¯ÕôÀʸû"
 
-#: libnautilus-extensions/nautilus-file-operations.c:531
-#, fuzzy, c-format
+#. This means no contents at all were readable
+#: libnautilus-extensions/nautilus-file.c:3746
+#, fuzzy
+msgid "? bytes"
+msgstr "%s ¨Àðθû ¦¸¡ñ¼É"
+
+#: libnautilus-extensions/nautilus-file.c:3759
+msgid "unknown type"
+msgstr "«È¢ÂôÀ¼¡¾ Ũ¸"
+
+#: libnautilus-extensions/nautilus-file.c:3761
+msgid "unknown MIME type"
+msgstr "«È¢ÂôÀ¼¡¾ MIME Ũ¸"
+
+#. Fallback, use for both unknown attributes and attributes
+#. * for which we have no more appropriate default.
+#.
+#: libnautilus-extensions/nautilus-file.c:3766
+msgid "unknown"
+msgstr "«È¢ÂôÀ¼¡¾Ð"
+
+#: libnautilus-extensions/nautilus-file.c:3802
+msgid "program"
+msgstr "¿¢Ãø"
+
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
-"Error while copying.\n"
-"%s is not readable."
+"Can't find description even for \"x-directory/normal\". This probably means "
+"that your gnome-vfs.keys file is in the wrong place or isn't being found for "
+"some other reason."
 msgstr ""
-"¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
-"§ºÕÁ¢¼õ ÀÊì¸-ÁðΧÁ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:535
-#, fuzzy, c-format
+#: libnautilus-extensions/nautilus-file.c:3818
+#, c-format
+msgid ""
+"No description found for mime type \"%s\" (file is \"%s\"), tell "
+"aaron@eazel.com"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3832
+#, fuzzy
+msgid "link"
+msgstr "­¨½ì¸ôÀð¼Ð"
+
+#. Note to localizers: convert file type string for file
+#. * (e.g. "folder", "plain text") to file type for symbolic link
+#. * to that kind of file (e.g. "link to folder").
+#.
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
+#, c-format
+msgid "link to %s"
+msgstr "%s - ìÌ ­¨½"
+
+#: libnautilus-extensions/nautilus-file.c:3852
+msgid "link (broken)"
+msgstr "­¨½ôÒ(¯¨¼ó¾Ð)"
+
+#. "From" dialog label, source path gets placed next to it in the dialog
+#: libnautilus-extensions/nautilus-file-operations.c:425
+msgid "From:"
+msgstr "Ţο÷:"
+
+#. "To" dialog label, source path gets placed next to it in the dialog
+#: libnautilus-extensions/nautilus-file-operations.c:440
+msgid "To:"
+msgstr "¦ÀÚ¿÷:"
+
+#: libnautilus-extensions/nautilus-file-operations.c:622
+#, c-format
 msgid ""
 "Error while moving.\n"
-"%s is not readable."
+"\n"
+"\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
-"¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
-"§ºÕÁ¢¼õ ÀÊì¸-ÁðΧÁ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:539
-#, fuzzy, c-format
+#: libnautilus-extensions/nautilus-file-operations.c:633
+#, c-format
 msgid ""
-"Error while linking.\n"
-"%s is not readable."
+"Error while deleting.\n"
+"\n"
+"\"%s\" cannot be deleted because you do not have permissions to modify its "
+"parent folder."
 msgstr ""
-"¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
-"§ºÕÁ¢¼õ ÀÊì¸-ÁðΧÁ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:545
-#, fuzzy, c-format
+#: libnautilus-extensions/nautilus-file-operations.c:639
+#, c-format
 msgid ""
 "Error while deleting.\n"
-"%s is not readable."
+"\n"
+"\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
-"¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
-"§ºÕÁ¢¼õ ÀÊì¸-ÁðΧÁ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:557
-#, fuzzy, c-format
+#: libnautilus-extensions/nautilus-file-operations.c:670
+#, c-format
 msgid ""
-"Error while copying items to \"%s\".\n"
-"The destination is not writable."
+"Error while moving.\n"
+"\n"
+"\"%s\" cannot be moved because you do not have permissions to change it or "
+"its parent folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:677
+#, c-format
+msgid ""
+"Error while moving.\n"
+"\n"
+"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"change it or its parent folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:701
+#, c-format
+msgid ""
+"Error while copying.\n"
+"\n"
+"\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
-"¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
-"§ºÕÁ¢¼õ ÀÊì¸-ÁðΧÁ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:562
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, fuzzy, c-format
 msgid ""
-"Error while moving items to \"%s\".\n"
-"The destination is not writable."
+"Error while copying to \"%s\".\n"
+"\n"
+"There is not enough space on the destination."
 msgstr ""
 "¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
-"§ºÕÁ¢¼õ ÀÊì¸-ÁðΧÁ."
+"§ºÕÁ¢¼ò¾¢ø ´Æ¢Å¢¼õ ­ø¨Ä."
 
-#: libnautilus-extensions/nautilus-file-operations.c:566
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, fuzzy, c-format
 msgid ""
-"Error while linking items to \"%s\".\n"
-"The destination is not writable."
+"Error while moving to \"%s\".\n"
+"\n"
+"There is not enough space on the destination."
 msgstr ""
 "¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
-"§ºÕÁ¢¼õ ÀÊì¸-ÁðΧÁ."
+"§ºÕÁ¢¼ò¾¢ø ´Æ¢Å¢¼õ ­ø¨Ä."
 
-#: libnautilus-extensions/nautilus-file-operations.c:598
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, fuzzy, c-format
 msgid ""
-"Error while copying \"%s\".\n"
-"There is no space on the destination."
+"Error while creating link in \"%s\".\n"
+"\n"
+"There is not enough space on the destination."
 msgstr ""
 "¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
 "§ºÕÁ¢¼ò¾¢ø ´Æ¢Å¢¼õ ­ø¨Ä."
 
-#: libnautilus-extensions/nautilus-file-operations.c:603
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, fuzzy, c-format
 msgid ""
-"Error while moving \"%s\".\n"
-"There is no space on the destination."
+"Error while copying to \"%s\".\n"
+"\n"
+"You do not have permissions to write to this folder."
 msgstr ""
 "¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
-"§ºÕÁ¢¼ò¾¢ø ´Æ¢Å¢¼õ ­ø¨Ä."
+"§ºÕÁ¢¼õ ÀÊì¸-ÁðΧÁ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:607
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, fuzzy, c-format
 msgid ""
-"Error while linking \"%s\".\n"
-"There is no space on the destination."
+"Error while copying to \"%s\".\n"
+"\n"
+"The destination disk is read-only."
 msgstr ""
 "¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
-"§ºÕÁ¢¼ò¾¢ø ´Æ¢Å¢¼õ ­ø¨Ä."
+"§ºÕÁ¢¼õ ÀÊì¸-ÁðΧÁ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:620
-#, fuzzy
+#: libnautilus-extensions/nautilus-file-operations.c:755
+#, fuzzy, c-format
 msgid ""
-"Error while copying.\n"
-"There is no space on the destination."
+"Error while moving items to \"%s\".\n"
+"\n"
+"You do not have permissions to write to this folder."
 msgstr ""
 "¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
-"§ºÕÁ¢¼ò¾¢ø ´Æ¢Å¢¼õ ­ø¨Ä."
+"§ºÕÁ¢¼õ ÀÊì¸-ÁðΧÁ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:625
-#, fuzzy
+#: libnautilus-extensions/nautilus-file-operations.c:759
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"There is no space on the destination."
+"Error while moving items to \"%s\".\n"
+"\n"
+"The destination disk is read-only."
 msgstr ""
 "¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
-"§ºÕÁ¢¼ò¾¢ø ´Æ¢Å¢¼õ ­ø¨Ä."
+"§ºÕÁ¢¼õ ÀÊì¸-ÁðΧÁ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:629
-#, fuzzy
+#: libnautilus-extensions/nautilus-file-operations.c:766
+#, c-format
 msgid ""
-"Error while linking.\n"
-"There is no space on the destination."
+"Error while creating links in \"%s\".\n"
+"\n"
+"You do not have permissions to write to this folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:770
+#, fuzzy, c-format
+msgid ""
+"Error while creating links in \"%s\".\n"
+"\n"
+"The destination disk is read-only."
 msgstr ""
 "¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
-"§ºÕÁ¢¼ò¾¢ø ´Æ¢Å¢¼õ ­ø¨Ä."
+"§ºÕÁ¢¼õ ÀÊì¸-ÁðΧÁ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:654
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, fuzzy, c-format
 msgid ""
-"Error \"%s\" while copying.\n"
+"Error \"%s\" while copying \"%s\".\n"
+"\n"
 "Would you like to continue?"
 msgstr ""
 "À¢¨Æ:\" %s\" %s%s ¦ºöÔõ §À¡Ð .\n"
 "¦¾¡¼Ã Å¢ÕõÒ¸¢È£÷¸Ç¡?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:658
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, fuzzy, c-format
 msgid ""
-"Error \"%s\" while moving.\n"
+"Error \"%s\" while moving \"%s\".\n"
+"\n"
 "Would you like to continue?"
 msgstr ""
 "À¢¨Æ:\" %s\" %s%s ¦ºöÔõ §À¡Ð .\n"
 "¦¾¡¼Ã Å¢ÕõÒ¸¢È£÷¸Ç¡?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:662
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, fuzzy, c-format
 msgid ""
-"Error \"%s\" while linking.\n"
+"Error \"%s\" while creating a link to \"%s\".\n"
+"\n"
 "Would you like to continue?"
 msgstr ""
 "À¢¨Æ:\" %s\" %s%s ¦ºöÔõ §À¡Ð .\n"
 "¦¾¡¼Ã Å¢ÕõÒ¸¢È£÷¸Ç¡?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:668
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, fuzzy, c-format
 msgid ""
-"Error \"%s\" while deleting.\n"
+"Error \"%s\" while deleting \"%s\".\n"
+"\n"
 "Would you like to continue?"
 msgstr ""
 "À¢¨Æ:\" %s\" %s%s ¦ºöÔõ §À¡Ð .\n"
 "¦¾¡¼Ã Å¢ÕõÒ¸¢È£÷¸Ç¡?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:683
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, fuzzy, c-format
 msgid ""
-"Error \"%s\" while copying \"%s\".\n"
+"Error \"%s\" while copying.\n"
+"\n"
 "Would you like to continue?"
 msgstr ""
 "À¢¨Æ:\" %s\" %s%s ¦ºöÔõ §À¡Ð .\n"
 "¦¾¡¼Ã Å¢ÕõÒ¸¢È£÷¸Ç¡?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:687
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, fuzzy, c-format
 msgid ""
-"Error \"%s\" while moving \"%s\".\n"
+"Error \"%s\" while moving.\n"
+"\n"
 "Would you like to continue?"
 msgstr ""
 "À¢¨Æ:\" %s\" %s%s ¦ºöÔõ §À¡Ð .\n"
 "¦¾¡¼Ã Å¢ÕõÒ¸¢È£÷¸Ç¡?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:691
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, fuzzy, c-format
 msgid ""
-"Error \"%s\" while linking \"%s\".\n"
+"Error \"%s\" while linking.\n"
+"\n"
 "Would you like to continue?"
 msgstr ""
 "À¢¨Æ:\" %s\" %s%s ¦ºöÔõ §À¡Ð .\n"
 "¦¾¡¼Ã Å¢ÕõÒ¸¢È£÷¸Ç¡?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:697
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, fuzzy, c-format
 msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
+"Error \"%s\" while deleting.\n"
+"\n"
 "Would you like to continue?"
 msgstr ""
 "À¢¨Æ:\" %s\" %s%s ¦ºöÔõ §À¡Ð .\n"
 "¦¾¡¼Ã Å¢ÕõÒ¸¢È£÷¸Ç¡?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:714
-#: libnautilus-extensions/nautilus-file-operations.c:766
-#: libnautilus-extensions/nautilus-file-operations.c:780
+#: libnautilus-extensions/nautilus-file-operations.c:958
+#, fuzzy
+msgid "Error while copying."
+msgstr "¿¸ø ±ÎìÌõ§À¡Ð À¢¨Æ"
+
+#: libnautilus-extensions/nautilus-file-operations.c:961
+#, fuzzy
+msgid "Error while moving."
+msgstr "¿¸ø ±ÎìÌõ§À¡Ð À¢¨Æ"
+
+#: libnautilus-extensions/nautilus-file-operations.c:964
+#, fuzzy
+msgid "Error while linking."
+msgstr "¿¸ø ±ÎìÌõ§À¡Ð À¢¨Æ"
+
+#: libnautilus-extensions/nautilus-file-operations.c:969
+#, fuzzy
+msgid "Error while deleting."
+msgstr "¿¸ø ±ÎìÌõ§À¡Ð À¢¨Æ"
+
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "ÁÚÓÂüº¢"
 
-#: libnautilus-extensions/nautilus-file-operations.c:754
+#: libnautilus-extensions/nautilus-file-operations.c:1088
+#, c-format
+msgid ""
+"\"%s\" could not be moved to the new location, because its name is already "
+"used for a special item that cannot be removed or replaced.\n"
+"\n"
+"If you still want to move \"%s\", rename it and try again."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1094
+#, c-format
+msgid ""
+"\"%s\" could not be copied to the new location, because its name is already "
+"used for a special item that cannot be removed or replaced.\n"
+"\n"
+"If you still want to copy \"%s\", rename it and try again."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1102
+#, fuzzy
+msgid "Unable to replace file."
+msgstr "§º¨Å¸ò¾¢ý §¿Ãò¨¾ô ¦ÀÈ ­ÂÄÅ¢ø¨Ä"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, fuzzy, c-format
 msgid ""
 "File \"%s\" already exists.\n"
+"\n"
 "Would you like to replace it?"
 msgstr ""
 "%s ±Ûõ §¸¡ôÒ Óý§À ¯ûÇÐ.\n"
 "Would you like to replace it?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:765
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 #, fuzzy
 msgid "Conflict while copying"
 msgstr "¿¸ø ±Î쨸¢ø ´ùÅ¡ôÀ¢¨Æ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:766
-#: libnautilus-extensions/nautilus-file-operations.c:780
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Á¡üÚ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:780
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "«¨Éò¾Ôõ Á¡üÚ"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:829
-#: libnautilus-extensions/nautilus-file.c:3688
-#, c-format
-msgid "link to %s"
-msgstr "%s - ìÌ ­¨½"
-
-#. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:833
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "%s ìÌ ­ýÛ¦Á¡Õ ­¨½ôÒ"
@@ -2259,830 +5051,1015 @@ msgstr "%s ìÌ ­ýÛ¦Á¡Õ ­¨½ôÒ"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:849
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d ¬ÅÐ ­¨½ôÒ %s ¯¼ý"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:853
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d ¬ÅÐ ­¨½ôÒ %s ¯¼ý"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:857
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d ¬ÅÐ ­¨½ôÒ %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:861
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d ¬ÅÐ ­¨½ôÒ %s ¯¼ý"
 
+#. Localizers:
+#. * Feel free to leave out the st, nd, rd and th suffix or
+#. * make some or all of them match.
+#.
+#. localizers: tag used to detect the first copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
+msgid " (copy)"
+msgstr "(¿¸ø)"
+
+#. localizers: tag used to detect the second copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
+msgid " (another copy)"
+msgstr "(­ý¦É¡Õ ¿¸ø)"
+
+#. localizers: tag used to detect the x1st copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1243
+#, fuzzy
+msgid "st copy)"
+msgstr "(¿¸ø)"
+
+#. localizers: tag used to detect the x2nd copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1245
+#, fuzzy
+msgid "nd copy)"
+msgstr "(¿¸ø)"
+
+#. localizers: tag used to detect the x3rd copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1247
+#, fuzzy
+msgid "rd copy)"
+msgstr "(¿¸ø)"
+
+#. localizers: tag used to detect the xxth copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1249
+#, fuzzy
+msgid "th copy)"
+msgstr "(¿¸ø)"
+
+#. localizers: appended to first file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1259
+#, fuzzy, c-format
+msgid "%s (copy)%s"
+msgstr "(¿¸ø)"
+
+#. localizers: appended to second file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1261
+#, fuzzy, c-format
+msgid "%s (another copy)%s"
+msgstr "(­ý¦É¡Õ ¿¸ø)"
+
+#. localizers: appended to x1st file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1263
+#, fuzzy, c-format
+msgid "%s (%dst copy)%s"
+msgstr "foo (21st copy)"
+
+#. localizers: appended to x2nd file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1265
+#, fuzzy, c-format
+msgid "%s (%dnd copy)%s"
+msgstr "foo (22nd copy)"
+
+#. localizers: appended to x3rd file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1267
+#, fuzzy, c-format
+msgid "%s (%drd copy)%s"
+msgstr "foo(3rd copy)"
+
+#. localizers: appended to xxth file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1269
+#, fuzzy, c-format
+msgid "%s (%dth copy)%s"
+msgstr "foo (25th copy)"
+
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:980
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr "("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:988
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr "(%d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1147
-#: libnautilus-extensions/nautilus-file-operations.c:1645
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "«È¢ÂôÀ¼¡¾ ̧ɡõ VFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1472
-msgid "Moving files"
-msgstr "§¸¡ôÒ¸¨Ç ¿¸÷òоø"
+#: libnautilus-extensions/nautilus-file-operations.c:1822
+msgid "Moving files to the Trash"
+msgstr "Ìô¨ÀìÌû §¸¡ôÒ¸û ¿¸÷ò¾ôÀθ¢ÈÐ"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1474
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 #, fuzzy
-msgid "Files moved:"
-msgstr "§¸¡ôÀ¢ý ¯Ã¢§Â¡ý:"
+msgid "Files thrown out:"
+msgstr "±È¢ÂôÀð¼É"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1476
-#: libnautilus-extensions/nautilus-file-operations.c:1776
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "¿¸÷ò¾ôÀθ¢ÈÐ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1477
+#: libnautilus-extensions/nautilus-file-operations.c:1827
+msgid "Preparing to Move to Trash..."
+msgstr "Ìô¨ÀìÌû ¿¸÷ò¾ ²üÀ¡¼¡¸¢ÈÐ..."
+
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1837
+msgid "Moving files"
+msgstr "§¸¡ôÒ¸¨Ç ¿¸÷òоø"
+
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1839
+#, fuzzy
+msgid "Files moved:"
+msgstr "§¸¡ôÀ¢ý ¯Ã¢§Â¡ý:"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "¿¸÷ò¾ ²üÀ¡Î ¦ºöÂôÀθ¢ÈÐ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1478
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "¿¸÷ò¾ø ÓüÚô¦ÀÚ¸¢ÈÐ..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1488
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "­¨½ôÒì §¸¡ôÒ¸¨Çô À¨¼ò¾ø"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1490
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 #, fuzzy
 msgid "Files linked:"
 msgstr "§¸¡ôÀ¢ý ¯Ã¢§Â¡ý:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1492
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "­¨½ì¸ôÀθ¢ÈÐ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1493
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "­¨½ôÒ¸û À¨¼ì¸ ²üÀ¡Î ¿¼ì¸¢ÈÐ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1494
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "­¨½ôÒ¸û À¨¼ò¾ø ÓÊ×Ú¸¢ÈÐ..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1501
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "§¸¡ôÒ¸û ¿¸Ä¡ì¸õ"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1503
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 #, fuzzy
 msgid "Files copied:"
 msgstr "§¸¡ôÒò ¦¾¡Ì¾¢:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1505
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "¿¸¦ÄÎì¸ôÀθ¢ÈÐ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1506
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "¿¸ø ¦ºö ²üÀ¡Î ¿¼ì¸¢ÈÐ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1525
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "¯ÕôÀʸ¨Çì Ìô¨ÀìÌû ¿¸ø ±Îì¸ÓÊ¡Ð."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1526
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "Ìô¨ÀìÌû ¿¸¦ÄÎì¸ÓÊ¡Ð"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1542
-#: libnautilus-extensions/nautilus-file-operations.c:1731
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "¸½¢§Á¨º §Áø Ìô¨À ­¼õ¦ÀÈ §ÅñÎõ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1543
+#: libnautilus-extensions/nautilus-file-operations.c:1920
+#, fuzzy
+msgid "You cannot move this trash folder."
+msgstr "´Õ «¨¼Å¢¨É «¾üÌû ¿¸÷ò¾ ÓÊ¡Ð"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "Ìô¨À¨Â ¿¸ø ±Îì¸ÓÊ¡Ð"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1545
-#: libnautilus-extensions/nautilus-file-operations.c:1732
+#: libnautilus-extensions/nautilus-file-operations.c:1923
+#, fuzzy
+msgid "You cannot copy this trash folder."
+msgstr "Ìô¨À¨Â ¿¸ø ±Îì¸ÓÊ¡Ð"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Ìô¨À ­ÕìÌõ ­¼ò¨¾ Á¡üÈ ÓÊ¡Ð"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1546
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Ìô¨À¨Â ¿¸ø ±Îì¸ÓÊ¡Ð"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1564
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "´Õ «¨¼Å¢¨É «¾üÌû ¿¸÷ò¾ ÓÊ¡Ð"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1565
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "«¨¼Å¢¨É «¨¼×ìÌû ¿¸¦ÄÎì¸ ÓÊ¡Ð."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1566
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "¾ÉìÌû ¿¸÷òоø ÓÊ¡Ð"
 
-#. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:1669
-msgid "untitled folder"
-msgstr "¾¨ÄôÀ¢Ä¡ «¨¼×"
+#: libnautilus-extensions/nautilus-file-operations.c:1953
+#, fuzzy
+msgid "Can't Copy Into Self"
+msgstr "¾ÉìÌû ¿¸÷òоø ÓÊ¡Ð"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1739
-#, c-format
-msgid "You cannot throw \"%s\" into the Trash."
-msgstr "\"%s\" ³ Ìô¨ÀìÌû ±È¢Â ÓÊ¡Ð."
+#: libnautilus-extensions/nautilus-file-operations.c:1965
+#, fuzzy
+msgid "You cannot copy a file over itself."
+msgstr "«¨¼Å¢¨É «¨¼×ìÌû ¿¸¦ÄÎì¸ ÓÊ¡Ð."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1743
-msgid "Error Moving to Trash"
-msgstr "Ìô¨ÀìÌû ¿¸÷òШ¸Â¢ø À¢¨Æ"
+#: libnautilus-extensions/nautilus-file-operations.c:1966
+#, fuzzy
+msgid "Can't Copy Over Self"
+msgstr "¾ÉìÌû ¿¸÷òоø ÓÊ¡Ð"
 
-#. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1772
-msgid "Moving files to the Trash"
-msgstr "Ìô¨ÀìÌû §¸¡ôÒ¸û ¿¸÷ò¾ôÀθ¢ÈÐ"
+#: libnautilus-extensions/nautilus-file-operations.c:2017
+msgid ""
+"Error creating new folder.\n"
+"\n"
+"You do not have permissions to write to the destination."
+msgstr ""
 
-#. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1774
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 #, fuzzy
-msgid "Files thrown out:"
-msgstr "±È¢ÂôÀð¼É"
+msgid ""
+"Error creating new folder.\n"
+"\n"
+"There is no space on the destination."
+msgstr ""
+"¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
+"§ºÕÁ¢¼ò¾¢ø ´Æ¢Å¢¼õ ­ø¨Ä."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1777
-msgid "Preparing to Move to Trash..."
-msgstr "Ìô¨ÀìÌû ¿¸÷ò¾ ²üÀ¡¼¡¸¢ÈÐ..."
+#: libnautilus-extensions/nautilus-file-operations.c:2023
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new folder."
+msgstr "¯Ã¢¨Á¡Ǩà «¨Á쨸¢ø À¢¨Æ"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2027
+#, fuzzy
+msgid "Error creating new folder"
+msgstr "¯Ã¢¨Á¡Ǩà «¨Á쨸¢ø À¢¨Æ"
+
+#. localizers: the initial name of a new folder
+#: libnautilus-extensions/nautilus-file-operations.c:2114
+msgid "untitled folder"
+msgstr "¾¨ÄôÀ¢Ä¡ «¨¼×"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "§¸¡ôÒ¸¨Ç «¨Æò¾ø"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1821
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 #, fuzzy
 msgid "Files deleted:"
 msgstr "«Æ¢ì¸ôÀð¼Ð"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:1823
-#: libnautilus-extensions/nautilus-file-operations.c:1873
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "«Æ¢ì¸ôÀθ¢ÈÐ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1824
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "§¸¡ôÒ¸¨Ç «Æ¢ì¸ ²üÀ¡¼¡¸¢ÈÐ..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1869
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Ìô¨Àò ¦¾¡ðÊ ¦ÅüÈ¢¼Á¡ì¸ø"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1874
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Ìô¨Àò ¦¾¡ðʨ ¦ÅüÈ¢¼õ ¦ºö ²üÀ¡¼¡¸¢ÈÐ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1907
+#: libnautilus-extensions/nautilus-file-operations.c:2218
+#, fuzzy
 msgid ""
-"Are you sure you want to permanently delete all of the items in the trash?"
+"Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr "¯Ú¾¢Â¡¸ - ¦¾¡ðÊìÌû ¯ûÇ ±øÄ¡ ¯ÕôÀʸ¨ÇÔõ ¿¢Ãó¾ÃÁ¡¸ «Æ¢ì¸ §ÅñÎÁ¡?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1909
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "¦¾¡ðÊìÌû ­ÕôÀÅü¨È «Æ¢ò¾ø"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1910
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "¦ÅüÈ¢¼õ"
 
-#. test the next duplicate name generator
-#: libnautilus-extensions/nautilus-file-operations.c:1964
-msgid " (copy)"
-msgstr "(¿¸ø)"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1964
-msgid " (another copy)"
-msgstr "(­ý¦É¡Õ ¿¸ø)"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1965
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "â"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1965
-#: libnautilus-extensions/nautilus-file-operations.c:1975
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "â(¿¸ø)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1966
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1966
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 #, fuzzy
 msgid ".bashrc (copy)"
 msgstr "(¿¸ø)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1967
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 #, fuzzy
 msgid ".foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1967
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 #, fuzzy
 msgid ".foo (copy).txt"
 msgstr "foo (copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1968
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "â â"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1968
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "â â(¿¸ø)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1969
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1969
-#: libnautilus-extensions/nautilus-file-operations.c:1976
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "foo (copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1970
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1970
-#: libnautilus-extensions/nautilus-file-operations.c:1990
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "foo foo (copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1971
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1971
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (copy).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1972
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1972
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "foo..(copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1973
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1973
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "foo...(copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1974
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "foo.(copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1974
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "foo.(another copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1975
-#: libnautilus-extensions/nautilus-file-operations.c:1977
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "foo (another copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1976
-#: libnautilus-extensions/nautilus-file-operations.c:1978
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "foo (another copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1977
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "foo(3rd copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1978
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "foo (3rd copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1979
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (another copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1979
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3rd copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1980
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr "foo (21st copy)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr "foo (24th copy)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr "foo (21st copy).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr "foo (24th copy).txt"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "foo (21st copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1980
-#: libnautilus-extensions/nautilus-file-operations.c:1982
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "foo (22nd copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1981
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "foo (21st copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1981
-#: libnautilus-extensions/nautilus-file-operations.c:1983
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "foo (22nd copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1982
-#: libnautilus-extensions/nautilus-file-operations.c:1984
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "foo (23rd copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1983
-#: libnautilus-extensions/nautilus-file-operations.c:1985
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "foo (23rd copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1984
-#: libnautilus-extensions/nautilus-file-operations.c:1986
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "foo (24th copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1985
-#: libnautilus-extensions/nautilus-file-operations.c:1987
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "foo (24th copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1986
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "foo (25th copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1987
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "foo (25th copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1988
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24th copy)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1988
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1989
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1989
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo(25th copy).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1990
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000th copy).txt"
 
-#. Today, use special word.
-#. * Note to localizers: You can look at man strftime
-#. * for details on the format, but you should only use
-#. * the specifiers from the C standard, not extensions.
-#. * These include "%" followed by one of
-#. * "aAbBcdHIjmMpSUwWxXyYZ". There are two extensions
-#. * in the Nautilus version of strftime that can be
-#. * used (and match GNU extensions). Putting a "-"
-#. * between the "%" and any numeric directive will turn
-#. * off zero padding, and putting a "_" there will use
-#. * space padding instead of zero padding.
-#.
-#: libnautilus-extensions/nautilus-file.c:2214
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
 #, fuzzy
-msgid "today at %-I:%M %p"
-msgstr "­ýÚ %-I:%M %ô"
+msgid "foo (10th copy)"
+msgstr "foo (21st copy)"
 
-#. Yesterday, use special word.
-#. * Note to localizers: Same issues as "today" string.
-#.
-#: libnautilus-extensions/nautilus-file.c:2219
+#: libnautilus-extensions/nautilus-file-operations.c:2289
 #, fuzzy
-msgid "yesterday at %-I:%M %p"
-msgstr "§¿üÚ %-I:%M %p"
+msgid "foo (11st copy)"
+msgstr "foo (21st copy)"
 
-#. Current week, include day of week.
-#. * Note to localizers: Same issues as "today" string.
-#.
-#: libnautilus-extensions/nautilus-file.c:2224
+#: libnautilus-extensions/nautilus-file-operations.c:2290
 #, fuzzy
-msgid "%A %-m/%-d/%y at %-I:%M %p"
-msgstr "%A %-Á¡/%-¿¡/%Å %-I:%M %p"
+msgid "foo (10th copy).txt"
+msgstr "foo (21st copy).txt"
 
-#. Other dates.
-#. * Note to localizers: Same issues as "today" string.
-#.
-#: libnautilus-extensions/nautilus-file.c:2229
+#: libnautilus-extensions/nautilus-file-operations.c:2290
 #, fuzzy
-msgid "%-m/%-d/%y at %-I:%M %p"
-msgstr "%-Á¡/%-¿¡/%Å %-I:%M %p"
+msgid "foo (11st copy).txt"
+msgstr "foo (21st copy).txt"
 
-#: libnautilus-extensions/nautilus-file.c:3266
-msgid "0 items"
-msgstr "0 ¯ÕôÀʸû"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (11th copy)"
+msgstr "foo (21st copy)"
 
-#: libnautilus-extensions/nautilus-file.c:3266
-msgid "0 folders"
-msgstr "0 «¨¼×¸û"
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (12nd copy)"
+msgstr "foo (22nd copy)"
 
-#: libnautilus-extensions/nautilus-file.c:3267
-msgid "0 files"
-msgstr "0 §¸¡ôÒ¸û"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (11th copy).txt"
+msgstr "foo (21st copy).txt"
 
-#: libnautilus-extensions/nautilus-file.c:3271
-msgid "1 item"
-msgstr "1 ¯ÕôÀÊ"
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (12nd copy).txt"
+msgstr "foo (22nd copy).txt"
 
-#: libnautilus-extensions/nautilus-file.c:3271
-msgid "1 folder"
-msgstr "1 «¨¼×"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (12th copy)"
+msgstr "foo (24th copy)"
 
-#: libnautilus-extensions/nautilus-file.c:3272
-msgid "1 file"
-msgstr "1 §¸¡ôÒ"
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (13rd copy)"
+msgstr "foo(3rd copy)"
 
-#: libnautilus-extensions/nautilus-file.c:3275
-#, c-format
-msgid "%u items"
-msgstr "%u ¯ÕôÀʸû"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (12th copy).txt"
+msgstr "foo (25th copy).txt"
 
-#: libnautilus-extensions/nautilus-file.c:3275
-#, c-format
-msgid "%u folders"
-msgstr "%u «¨¼×¸û"
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (13rd copy).txt"
+msgstr "foo (3rd copy).txt"
 
-#: libnautilus-extensions/nautilus-file.c:3276
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
 #, c-format
-msgid "%u files"
-msgstr "%u §¸¡ôÒ¸û"
+msgid "%ld of %ld"
+msgstr ""
 
-#. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3576
-#: libnautilus-extensions/nautilus-file.c:3590
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
 #, fuzzy
-msgid "? items"
-msgstr "0 ¯ÕôÀʸû"
-
-#: libnautilus-extensions/nautilus-file.c:3594
-msgid "unknown type"
-msgstr "«È¢ÂôÀ¼¡¾ Ũ¸"
-
-#: libnautilus-extensions/nautilus-file.c:3596
-msgid "unknown MIME type"
-msgstr "«È¢ÂôÀ¼¡¾ MIME Ũ¸"
-
-#. Fallback, use for both unknown attributes and attributes
-#. * for which we have no more appropriate default.
-#.
-#: libnautilus-extensions/nautilus-file.c:3601
-msgid "unknown"
-msgstr "«È¢ÂôÀ¼¡¾Ð"
+msgid "GConf Error"
+msgstr ""
+"GConf À¢¨Æ:\n"
+" %s"
 
-#: libnautilus-extensions/nautilus-file.c:3647
+#. Constants
+#: libnautilus-extensions/nautilus-global-preferences.c:50
 #, fuzzy
-msgid "folder"
-msgstr "1 «¨¼×"
-
-#: libnautilus-extensions/nautilus-file.c:3650
-msgid "program"
-msgstr "¿¢Ãø"
+msgid "Nautilus Preferences"
+msgstr "¦¾¡¼ì¸ Å¢ÕôÀí¸û"
 
-#: libnautilus-extensions/nautilus-file.c:3682
-#, fuzzy
-msgid "link"
-msgstr "­¨½ì¸ôÀð¼Ð"
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "±ô§À¡Ðõ"
 
-#: libnautilus-extensions/nautilus-file.c:3702
-msgid "link (broken)"
-msgstr "­¨½ôÒ(¯¨¼ó¾Ð)"
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "±ô§À¡Ðõ"
 
-#: libnautilus-extensions/nautilus-font-factory.c:321
-msgid "fixed"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "«ñ¨ÁÁðÎõ"
 
-#: libnautilus-extensions/nautilus-font-picker.c:131
-msgid "Font"
-msgstr "±ØòРŨ¸"
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "«ñ¨Á째¡ôÒ¸û ÁðÎõ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:118
-msgid "Folder Views"
-msgstr "«¨¼× ¸¡ðº¢"
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "±ýÚõ ­ø¨Ä"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:119
-msgid "Folder Views Settings"
-msgstr "«¨¼× ¸¡ðº¢ «¨ÁôÒ¸û"
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "±ýÚõ ­ø¨Ä"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:121
-msgid "Window Behavior"
-msgstr "º¡ÇÃò¾¢ý ¿¼ò¨¾"
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "º£Ã¡É ŨÃÀ¼í¸û"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:128
-msgid "Click Behavior"
-msgstr "¿¼ò¨¾¨Â ¸¢Ç¢ì ¦ºö¸"
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "º£Ã¡É (¬É¡ø ¦ÁÐÅ¡É) Ũþ¨Äô  ÀÂýÀÎòÐ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:135
-msgid "Trash Behavior"
-msgstr "¿¼ò¨¾¨Âì Ìô¨À¢ø ¾ûÙ¸"
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "±ØòРŨ¸¸û"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:142
-msgid "Display"
-msgstr "¸¡ðº¢"
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+msgid "Font for Icon view:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:168
-msgid "Sidebar Panels"
-msgstr "µÃôÀð¨¼ô Àĸí¸û"
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:169
-msgid "Sidebar Panels Description"
-msgstr "µÃôÀð¨¼ô Àĸí¸û - Å¢Çì¸õ"
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+msgid "Font for List view:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:172
-msgid "Choose which panels should appear in the sidebar"
-msgstr "µÃôÀð¨¼Â¢ø §¾¡ýȧÅñÊ Àĸò¨¾ò ¦¾Ã¢× ¦ºö¸"
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:209
-msgid "Appearance"
-msgstr "§¾¡üÈõ"
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:210
-msgid "Appearance Settings"
-msgstr "§¾¡üÈ «¨ÁôÒ¸û"
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+#, fuzzy
+msgid "Use Nautilus to draw the desktop"
+msgstr "¸½¢§Á¨º §Áø Ìô¨À ­¼õ¦ÀÈ §ÅñÎõ."
 
-#: libnautilus-extensions/nautilus-global-preferences.c:212
-msgid "Smoother Graphics"
-msgstr "º£Ã¡É ŨÃÀ¼í¸û"
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+#, fuzzy
+msgid "Opening New Windows"
+msgstr "_Ò¾¢Â º¡ÇÃò¾¢ø ¾¢È"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:219
-msgid "Fonts"
-msgstr "±ØòРŨ¸¸û"
+#: libnautilus-extensions/nautilus-global-preferences.c:651
+#, fuzzy
+msgid "Open each file or folder in a separate window"
+msgstr "´ù¦Å¡Õ ¯ÕôÀʨÂÔõ ´Õ Ò¾¢Â º¡ÇÃò¾¢ø ¾¢Èì¸×õ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:225
-msgid "Views"
-msgstr "¸¡ðº¢¸û"
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+#, fuzzy
+msgid "Display toolbar in new windows"
+msgstr "¸ÕÅ¢ôÀ𨼨Âô Ò¾¢Â º¡ÇÃò¾¢ø ¸¡ðÎ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:254
-msgid "Speed Tradeoffs"
-msgstr "§Å¸ò¾¢ø ­ÆôÒ¸û"
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "­¼ôÀ𨼨 Ҿ¢Âº¡ÇÃò¾¢ø ¸¡ðÎ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:255
-msgid "Speed Tradeoffs Settings"
-msgstr "§Å¸ ­ÆôÒ «¨ÁôÒ¸û"
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "¿¢¸ú¿¢¨Äô À𨼨Âô Ò¾¢Â º¡ÇÃò¾¢ø ¸¡ðÎ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:257
-msgid "Show Text in Icons"
-msgstr "ÌÚõÀ¼ò¾¢ø ¯¨Ã ¸¡ðÎ"
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "µÃôÀ𨼨Âô Ò¾¢Â º¡ÇÃò¾¢ø ¸¡ðÎ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:264
-msgid "Show Thumbnails for Image Files"
-msgstr "¯ÕÅì §¸¡ôÒ¸¨Ç ¸ð¨¼Å¢Ãø ¿¸ «ÇÅ¢ø ¸¡ðÎ"
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "¿¼ò¨¾¨Âì Ìô¨À¢ø ¾ûÙ¸"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:271
-msgid "Previewing Sound Files"
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+msgid "Ask before emptying the Trash or deleting files"
 msgstr ""
 
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:280
-msgid "Make Folder Appearance Details Public"
-msgstr "«¨¼Å¢ý §¾¡üÈ Å¢ÅÃí¸¨Ç ¦À¡Ð¨Á¡ìÌ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:292
-msgid "Search"
-msgstr "§¾Î"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:293
-msgid "Search Settings"
-msgstr "«¨ÁôÒ¸¨Çò §¾Î"
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:295
-msgid "Search Complexity Options"
-msgstr "º¢ì¸ø Å¢ÕôÀí¸¨Çò §¾Î"
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:301
-msgid "Search Tradeoffs"
-msgstr "§¾Î¾ø ­ÆôÒ"
+#: libnautilus-extensions/nautilus-global-preferences.c:713
+msgid "single"
+msgstr "´ü¨È"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:309
-msgid "Search Locations"
-msgstr "­¼í¸¨Çò§¾Î"
+#: libnautilus-extensions/nautilus-global-preferences.c:714
+msgid "Activate items with a single click"
+msgstr "¯ÕôÀʸ¨Ç ´§Ã ¸¢Ç¢ì¸¢ø ¦ºÂø ÀÎòи"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:319
-msgid "Navigation"
-msgstr "¯Ä¡×¾ø"
+#: libnautilus-extensions/nautilus-global-preferences.c:717
+msgid "double"
+msgstr "­Ãð¨¼"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:320
-msgid "Navigation Settings"
-msgstr "¯Ä¡Åø «¨ÁôÒ¸û"
+#: libnautilus-extensions/nautilus-global-preferences.c:718
+msgid "Activate items with a double click"
+msgstr "¯ÕôÀʸ¨Ç ­ÃñÎ ¸¢Ç¢ì¸¢ø ¦ºÂø ÀÎòи"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:322
-msgid "Home Location"
-msgstr "Å£ðÊý ­¼õ"
+#: libnautilus-extensions/nautilus-global-preferences.c:725
+msgid "launch"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:329
-msgid "Proxy Settings"
-msgstr "Òá캢¢ý ­¼í¸û"
+#: libnautilus-extensions/nautilus-global-preferences.c:726
+msgid "Execute files when they are clicked"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:348
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 #, fuzzy
-msgid "Built-in Bookmarks"
-msgstr "Òò¾¸ «¨¼Â¡Çõ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:675
-msgid "always"
-msgstr "±ô§À¡Ðõ"
+msgid "display"
+msgstr "¸¡ðº¢"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:676
-msgid "Always"
-msgstr "±ô§À¡Ðõ"
+#: libnautilus-extensions/nautilus-global-preferences.c:730
+msgid "Display files when they are clicked"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:680
-msgid "local only"
-msgstr "«ñ¨ÁÁðÎõ"
+#: libnautilus-extensions/nautilus-global-preferences.c:733
+msgid "ask"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:681
-msgid "Local Files Only"
-msgstr "«ñ¨Á째¡ôÒ¸û ÁðÎõ"
+#: libnautilus-extensions/nautilus-global-preferences.c:734
+msgid "Ask each time"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:685
-msgid "never"
-msgstr "±ýÚõ ­ø¨Ä"
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "¿¼ò¨¾¨Â ¸¢Ç¢ì ¦ºö¸"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:686
-msgid "Never"
-msgstr "±ýÚõ ­ø¨Ä"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:781
-msgid "Use HTTP Proxy"
-msgstr "±î.Ê.Ê.À¢ ³ ¯À§Â¡¸¢"
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:787
-msgid "HTTP Proxy"
-msgstr "±î.Ê.Ê.À¢. Òá캢"
+#: libnautilus-extensions/nautilus-global-preferences.c:759
+#, fuzzy
+msgid "Show hidden files (file names start with \".\")"
+msgstr "(\".\") ­ø ¦¾¡¼íÌõ Á¨Èó¾ §¸¡ôÒ¸¨Çì ¸¡ðθ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:793
-msgid "HTTP Proxy Port"
-msgstr "±î.Ê.Ê.À¢ Òá캢 ШÈ"
+#: libnautilus-extensions/nautilus-global-preferences.c:766
+#, fuzzy
+msgid "Show backup files (file names end with \"~\")"
+msgstr "\"~\" ­ø ÓÊÔõ ¸¡ôÒ ¿¸ø §¸¡ôÒ¸¨Çì ¸¡ðθ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:847
-msgid "current theme"
-msgstr "¾ü§À¡¨¾Â ±ñ½ì¸Õ"
+#: libnautilus-extensions/nautilus-global-preferences.c:773
+msgid "Show special flags in Properties window"
+msgstr "ÀñÒ¸û º¡ÇÃò¾¢ø º¢ÈôÒì ¦¸¡Ê¸¨Çì ¸¡ðθ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:859
-msgid "Open each item in a new window"
-msgstr "´ù¦Å¡Õ ¯ÕôÀʨÂÔõ ´Õ Ò¾¢Â º¡ÇÃò¾¢ø ¾¢Èì¸×õ"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+#, fuzzy
+msgid "Sorting Order"
+msgstr "¯Ã¢¨Á¡Ǩà «¨Á쨸¢ø À¢¨Æ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:866
-msgid "Ask before deleting items from the trash"
-msgstr "Ìô¨Àò¦¾¡ðÊ¢ɢýÚ ¯ÕÀʸ¨Ç «Æ¢ìÌÓý §¸ð¸×õ"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:873
-msgid "Click policy"
-msgstr "¸¢Ç¢ì ¦¸¡û¨¸"
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
+msgid "Location:"
+msgstr "­¼õ:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:879
-msgid "single"
-msgstr "´ü¨È"
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+#, fuzzy
+msgid "HTTP Proxy Settings"
+msgstr "Òá캢¢ý ­¼í¸û"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:880
-msgid "Activate items with a single click"
-msgstr "¯ÕôÀʸ¨Ç ´§Ã ¸¢Ç¢ì¸¢ø ¦ºÂø ÀÎòи"
+#: libnautilus-extensions/nautilus-global-preferences.c:798
+msgid "Use HTTP Proxy"
+msgstr "±î.Ê.Ê.À¢ ³ ¯À§Â¡¸¢"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:884
-msgid "double"
-msgstr "­Ãð¨¼"
+#. allocate the proxy label, followed by the entry
+#: libnautilus-extensions/nautilus-global-preferences.c:812
+#: src/nautilus-first-time-druid.c:683
+msgid "Port:"
+msgstr "ШÈ:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:885
-msgid "Activate items with a double click"
-msgstr "¯ÕôÀʸ¨Ç ­ÃñÎ ¸¢Ç¢ì¸¢ø ¦ºÂø ÀÎòи"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:890
-msgid "Display text in icons"
-msgstr "ÌÚõÀ¼ò¾¢ø ¯ûÇ ¯¨Ã¨Âì ¸¡ðÎ"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+#, fuzzy
+msgid "Built-in Bookmarks"
+msgstr "Òò¾¸ «¨¼Â¡Çõ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:896
-msgid "Show thumbnails for image files"
-msgstr "¯ÕÅ째¡ôÒ¸¨Ç ¸ð¨¼ Å¢Ãø ¿¸ «ÇÅ¢ø ¸¡ðθ"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+#, fuzzy
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "ÀðÊ¢ø ¯ûÇ¼í¸¢Â Òò¾¸ «¨¼Â¡Çò¨¾î §º÷ì¸"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:902
-msgid "Read and write metadata in each folder"
-msgstr "´ù¦Å¡Õ «¨¼Å¢Öõ ­¨¼ò ¾Ã¨Å ±Øи ÁüÚõ ÀÊì¸"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "ÌÚõÀ¼ò¾¢ø ¯¨Ã ¸¡ðÎ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:908
-msgid "Play a sound file when the mouse is over it"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:918
-msgid "Use smoother (but slower) graphics"
-msgstr "º£Ã¡É (¬É¡ø ¦ÁÐÅ¡É) Ũþ¨Äô  ÀÂýÀÎòÐ"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "¯ÕÅì §¸¡ôÒ¸¨Ç ¸ð¨¼Å¢Ãø ¿¸ «ÇÅ¢ø ¸¡ðÎ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:924
-msgid "Font family used to display file names"
-msgstr "§¸¡ôÀ¢ý ¦ÀÂ÷¸¨Ç ¸¡ðʼ ÀýÀÎòÐõ ±ØòÐŨ¸ì ÌÎõÀõ"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:931
-msgid "Display tool bar in new windows"
-msgstr "¸ÕÅ¢ôÀ𨼨Âô Ò¾¢Â º¡ÇÃò¾¢ø ¸¡ðÎ"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:937
-msgid "Display location bar in new windows"
-msgstr "­¼ôÀ𨼨 Ҿ¢Âº¡ÇÃò¾¢ø ¸¡ðÎ"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr "«¨¼Å¢ý §¾¡üÈ Å¢ÅÃí¸¨Ç ¦À¡Ð¨Á¡ìÌ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:943
-msgid "Display status bar in new windows"
-msgstr "¿¢¸ú¿¢¨Äô À𨼨Âô Ò¾¢Â º¡ÇÃò¾¢ø ¸¡ðÎ"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "§¾¡üÈõ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:949
-msgid "Display sidebar in new windows"
-msgstr "µÃôÀ𨼨Âô Ò¾¢Â º¡ÇÃò¾¢ø ¸¡ðÎ"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:955
-#, fuzzy
-msgid "Use Nautilus to draw the desktop"
-msgstr "¸½¢§Á¨º §Áø Ìô¨À ­¼õ¦ÀÈ §ÅñÎõ."
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:962
-msgid "Always do slow, complete search"
-msgstr "±ô§À¡Ðõ ¦ÁÐÅ¡É , ÓبÁÂ¡É §¾Î¾Äî ¦ºö"
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+msgid "Navigation"
+msgstr "¯Ä¡×¾ø"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:969
-msgid "search type to do by default"
-msgstr "¦¸¡¼¡ ¿¢¨Äò §¾Îõ Ũ¸"
+#: libnautilus-extensions/nautilus-global-preferences.c:962
+msgid "Speed Tradeoffs"
+msgstr "§Å¸ò¾¢ø ­ÆôÒ¸û"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:975
+#: libnautilus-extensions/nautilus-global-preferences.c:985
 msgid "search by text"
 msgstr "¯¨Ã¨Â ¨ÅòÐò §¾Î¸"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:976
-msgid "Search for files by text only"
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+#, fuzzy
+msgid "Search for files by file name only"
 msgstr "§¸¡ôÒ¸¨Ç ¯¨Ã¨Â ¨ÅòÐò §¾Î¸"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:980
+#: libnautilus-extensions/nautilus-global-preferences.c:989
 msgid "search by text and properties"
 msgstr "¯¨Ã ÁüÚõ ÀñÒ¸¨Ç ¨ÅòÐò §¾Î¸"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:981
-msgid "Search for files by text and by their properties"
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+#, fuzzy
+msgid "Search for files by file name and file properties"
 msgstr "¯¨Ã ÁüÚõ ÀñÒ¸¨Ç ¨ÅòÐì §¸¡ôÒ¸Çò §¾Î¸"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:986
-msgid "Search Web Location"
-msgstr "Å¨Ä ­¼ò¨¾ò §¾Î¸"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:993
-msgid "Show hidden files (starting with \".\")"
-msgstr "(\".\") ­ø ¦¾¡¼íÌõ Á¨Èó¾ §¸¡ôÒ¸¨Çì ¸¡ðθ"
+#: libnautilus-extensions/nautilus-global-preferences.c:997
+msgid "Search Complexity Options"
+msgstr "º¢ì¸ø Å¢ÕôÀí¸¨Çò §¾Î"
 
 #: libnautilus-extensions/nautilus-global-preferences.c:999
-msgid "Show backup files (ending with \"~\")"
-msgstr "\"~\" ­ø ÓÊÔõ ¸¡ôÒ ¿¸ø §¸¡ôÒ¸¨Çì ¸¡ðθ"
+msgid "search type to do by default"
+msgstr "¦¸¡¼¡ ¿¢¨Äò §¾Îõ Ũ¸"
 
 #: libnautilus-extensions/nautilus-global-preferences.c:1005
-msgid "Show special flags in Properties window"
-msgstr "ÀñÒ¸û º¡ÇÃò¾¢ø º¢ÈôÒì ¦¸¡Ê¸¨Çì ¸¡ðθ"
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
+#, fuzzy
+msgid "Fast Search"
+msgstr "§¾Î"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1011
-msgid "Show only folders in tree sidebar panel"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1017
-msgid "Can add Content"
-msgstr "¯ð¦À¡Õ¨Çî §º÷ì¸ ÓÊÔõ"
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+#, fuzzy
+msgid "Search Engine Location"
+msgstr "Å¨Ä ­¼ò¨¾ò §¾Î¸"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "§¾Î"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, fuzzy, c-format
+msgid "Display %s tab in sidebar"
+msgstr "¿¢¸ú¿¢¨Äô À𨼨Âô Ò¾¢Â º¡ÇÃò¾¢ø ¸¡ðÎ"
+
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "µÃôÀð¨¼ô Àĸí¸û"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1023
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
 #, fuzzy
-msgid "Don't include the built-in bookmarks"
-msgstr "ÀðÊ¢ø ¯ûÇ¼í¸¢Â Òò¾¸ «¨¼Â¡Çò¨¾î §º÷ì¸"
+msgid "Tabs"
+msgstr "Ìô¨Àò ¦¾¡ðÊ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"currently can't be performed because the program crond, which does nightly "
+"tasks on your computer, is turned off. To make sure fast searches can be "
+"done, turn crond on."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
+msgid "Files May Not Be Indexed"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
+msgid ""
+"If you are running Linux, you can log in as root and type these commands to "
+"start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"may not be performed because the program crond, which does nightly tasks on "
+"your computer, may be turned off. To make sure fast searches can be done, "
+"check to make sure that crond is turned on.\n"
+"\n"
+msgstr ""
+
+#. The list of characters that cause line breaks can be localized.
+#: libnautilus-extensions/nautilus-icon-canvas-item.c:70
+msgid " -_,;.?/&"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:722
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
@@ -3092,7 +6069,7 @@ msgstr ""
 "«¨Á×ìÌÁ¡üÈ¢ ­ó¾ ¯ÕôÀʨ ¨Åò¾ ­¼ò¾¢ø Å¢ðʼ Å¢ÕõÒ¸¢È£÷¸Ç¡? «ùÅ¡Ú ¦ºö¾¡ø ÓýÒ "
 "§¾ì¸¢¨Åò¾ ¨¸Ó¨Èì §¸¡ôÒ ­¼ «¨ÁÅ¢¨Éì ̾ȢŢÎõ."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:726
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
@@ -3102,7 +6079,7 @@ msgstr ""
 "«¨Á×ìÌÁ¡üÈ¢ ­ó¾ ¯ÕôÀʨ ¨Åò¾ ­¼ò¾¢ø Å¢ðʼ Å¢ÕõÒ¸¢È£÷¸Ç¡? «ùÅ¡Ú ¦ºö¾¡ø ÓýÒ "
 "§¾ì¸¢¨Åò¾ ¨¸Ó¨Èì §¸¡ôÒ ­¼ «¨ÁÅ¢¨Éì ̾ȢŢÎõ."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:732
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
@@ -3110,7 +6087,7 @@ msgstr ""
 "­ó¾ «¨¼× ¾¡É¢ÂíÌ §¸¡ôÒ ­¼Å¨Á× ¾¢ð¼ò¨¾ô ÀÂýÀÎòÐõ. ¿£í¸û ¨¸Ó¨È §¸¡ôÒ ­¼ "
 "«¨Á×ìÌÁ¡üÈ¢ ­ó¾ ¯ÕôÀʨ ¨Åò¾ ­¼ò¾¢ø Å¢ðʼ Å¢ÕõÒ¸¢È£÷¸Ç¡?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:735
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
@@ -3118,223 +6095,192 @@ msgstr ""
 "­ó¾ «¨¼× ¾¡É¢ÂíÌ §¸¡ôÒ ­¼Å¨Á× ¾¢ð¼ò¨¾ô ÀÂýÀÎòÐõ. ¿£í¸û ¨¸Ó¨È §¸¡ôÒ ­¼ "
 "«¨Á×ìÌÁ¡üÈ¢ ­ó¾ ¯ÕôÀʸ¨Ç ¨Åò¾ ­¼ò¾¢ø Å¢ðʼ Å¢ÕõÒ¸¢È£÷¸Ç¡?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:740
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "¨¸Ó¨È ­¼Å¨Á×ìÌ Á¡üȧÅñÎÁ¡?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:741
-#: src/nautilus-window-menus.c:543
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "Á¡üÚ"
 
-#. FIXME bugzilla.eazel.com 1102: Embedded text should use preferences to determine
-#. * the font it uses
-#.
-#: libnautilus-extensions/nautilus-icon-factory.c:2258
-msgid "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*"
-msgstr "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*"
-
-#: libnautilus-extensions/nautilus-icon-text-item.c:1547
-#: po/tmp/nautilus-icon-view-ui.xml.h:20
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
+#: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "¦ÀÂ÷ Á¡üÚ"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1548
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr " ¦ºöÂü¸"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1549
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "À¨Æ ¦À¨à Á£ð¸"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "Á£ñÎõ ¦ºö¸"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1551
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Á¡üÈôÀð¼ ¦À¨à Á£ð¸"
 
-#: libnautilus-extensions/nautilus-label.c:180
-msgid " -_,;.?/&"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-preferences-dialog.c:201
-msgid "Prefs Box"
-msgstr "À¢Ãò¾¢§Â¸ «¨ÁôÒ¸û ¦ÀðÊ"
+#: libnautilus-extensions/nautilus-preferences.c:92
+msgid "Beginner"
+msgstr "¦¾¡¼íÌ¿÷"
 
-#: libnautilus-extensions/nautilus-preferences.c:1086
-#, c-format
-msgid ""
-"GConf error:\n"
-"  %s"
-msgstr ""
-"GConf À¢¨Æ:\n"
-" %s"
+#: libnautilus-extensions/nautilus-preferences.c:93
+msgid "Intermediate"
+msgstr "­¨¼¿¢¨Ä"
 
-#: libnautilus-extensions/nautilus-preferences.c:1093
-#, c-format
-msgid ""
-"GConf error:\n"
-"  %s\n"
-"All further errors shown only on terminal"
-msgstr ""
-"GConf À¢¨Æ:\n"
-"  %s\n"
-"­É¢ ²üÀÎõ À¢¨Æ¸û Ó¨ÉÂò¾¢ø ÁðΧÁ ¸¡ð¼ôÀÎõ"
+#: libnautilus-extensions/nautilus-preferences.c:94
+msgid "Advanced"
+msgstr "Óý§É¡Ê"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:186
-#: src/nautilus-window.c:855
-#, c-format
-msgid "View as %s"
-msgstr "%s §À¡ýÈ ¸¡ðº¢ "
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
+msgid "Prefs Box"
+msgstr "À¢Ãò¾¢§Â¸ «¨ÁôÒ¸û ¦ÀðÊ"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:216
+#: libnautilus-extensions/nautilus-program-chooser.c:226
 msgid "not in menu"
 msgstr "ÀðÊ¢ø ­ø¨Ä"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:219
+#: libnautilus-extensions/nautilus-program-chooser.c:229
 msgid "in menu for this file"
 msgstr "ÀðÊ¢ø ­ó¾ §¸¡ôÀ¢ü¸¡¸"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:222
-#: libnautilus-extensions/nautilus-program-chooser.c:225
+#: libnautilus-extensions/nautilus-program-chooser.c:232
+#: libnautilus-extensions/nautilus-program-chooser.c:235
 #, c-format
 msgid "in menu for \"%s\""
 msgstr "\"%s\" ìÌ ÀðÊ¢ø"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:228
+#: libnautilus-extensions/nautilus-program-chooser.c:238
 msgid "default for this file"
 msgstr "­ó¾ §¸¡ôÀ¢üÌ ¦¸¡¼¡¿¢¨Ä"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:231
-#: libnautilus-extensions/nautilus-program-chooser.c:234
+#: libnautilus-extensions/nautilus-program-chooser.c:241
+#: libnautilus-extensions/nautilus-program-chooser.c:244
 #, c-format
 msgid "default for \"%s\""
 msgstr "\"%s\" ìÌ ¦¸¡¼¡¿¢¨Ä "
 
-#: libnautilus-extensions/nautilus-program-chooser.c:263
+#: libnautilus-extensions/nautilus-program-chooser.c:289
 #, c-format
 msgid "Is not in the menu for \"%s\" items."
 msgstr "\"%s\" ¯ÕôÀʸÙìÌ , ÀðÊ¢ø ­ø¨Ä"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:266
+#: libnautilus-extensions/nautilus-program-chooser.c:292
 #, c-format
 msgid "Is in the menu for \"%s\"."
 msgstr "\"%s\"  ìÌ ÀðÊ¢ø ¯ñÎ "
 
-#: libnautilus-extensions/nautilus-program-chooser.c:269
+#: libnautilus-extensions/nautilus-program-chooser.c:295
 #, c-format
 msgid "Is in the menu for \"%s\" items."
 msgstr "\"%s\" ¯ÕôÀʸÙìÌ , ÀðÊ¢ø ¯ñÎ"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:272
+#: libnautilus-extensions/nautilus-program-chooser.c:298
 #, c-format
 msgid "Is in the menu for all \"%s\" items."
 msgstr "±øÄ¡ \"%s\" ¯ÕôÀʸÙìÌ , ÀðÊ¢ø ¯ñÎ"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:275
+#: libnautilus-extensions/nautilus-program-chooser.c:301
 #, c-format
 msgid "Is the default for \"%s\"."
 msgstr "\"%s\" ìÌ ­Ð ¦¸¡¼¡¿¢¨Ä"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:278
+#: libnautilus-extensions/nautilus-program-chooser.c:304
 #, c-format
 msgid "Is the default for \"%s\" items."
 msgstr "\"%s\" ¯ÕôÀʸÙìÌ ­Ð ¦¸¡¼¡ ¿¢¨Ä¡Ìõ"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:281
+#: libnautilus-extensions/nautilus-program-chooser.c:307
 #, c-format
 msgid "Is the default for all \"%s\" items."
 msgstr "±øÄ¡ \"%s\" ¯ÕôÀʸÙìÌ ­Ð ¦¸¡¼¡ ¿¢¨Ä¡Ìõ"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:949
+#: libnautilus-extensions/nautilus-program-chooser.c:993
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Á¡üÚ \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-extensions/nautilus-program-chooser.c:973
+#: libnautilus-extensions/nautilus-program-chooser.c:1018
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "\"%s\" ¯ÕôÀʸÙìÌ , ÀðÊ¢ø §º÷ì¸"
 
 #. Radio button for setting default for file type.
-#: libnautilus-extensions/nautilus-program-chooser.c:980
+#: libnautilus-extensions/nautilus-program-chooser.c:1025
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "\"%s\" ¯ÕôÀʸÙìÌ , ¦¸¡¼¡¿¢¨Ä¡¸ô ÀÂýÀÎòи"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-extensions/nautilus-program-chooser.c:987
+#: libnautilus-extensions/nautilus-program-chooser.c:1032
 #, c-format
 msgid "Include in the menu just for \"%s\""
 msgstr "\"%s\" ìÌ , ÀðÊ¢ø §º÷ì¸"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-extensions/nautilus-program-chooser.c:993
+#: libnautilus-extensions/nautilus-program-chooser.c:1038
 #, c-format
 msgid "Use as default just for \"%s\""
 msgstr "\"%s\" ìÌ ÁðÎõ, ¦¸¡¼¡¿¢¨Ä¡¸ô ÀÂýÀÎòи"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1000
+#: libnautilus-extensions/nautilus-program-chooser.c:1045
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "\"%s\" ¯ÕôÀʸÙìÌ ÀðÊ¢ø §º÷ì¸ §Åñ¼¡õ"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1164
-#: src/file-manager/fm-list-view.c:1905
-#: src/file-manager/fm-search-list-view.c:316
-#: src/nautilus-bookmarks-window.c:161 src/nautilus-search-bar-criterion.c:67
+#: libnautilus-extensions/nautilus-program-chooser.c:1209
+#: src/file-manager/fm-list-view.c:2182
+#: src/file-manager/fm-search-list-view.c:545
+#: src/nautilus-bookmarks-window.c:164
 msgid "Name"
 msgstr "¦ÀÂ÷"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1167
+#: libnautilus-extensions/nautilus-program-chooser.c:1212
 msgid "Status"
 msgstr "¿¢¸ú¿¢¨Ä"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1215
+#: libnautilus-extensions/nautilus-program-chooser.c:1260
 msgid "Open with Other"
 msgstr "ÁüÈÅüÚ¼ý ¾¢Èì¸"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1216
+#: libnautilus-extensions/nautilus-program-chooser.c:1261
 #, c-format
 msgid "Choose an application with which to open \"%s\"."
 msgstr "\"%s\" ³ò ¾¢È츧ÅñÊ ÀÂýÀ¡ðʨÉò ¦¾Ã¢× ¦ºö¸"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1220
+#: libnautilus-extensions/nautilus-program-chooser.c:1265
 msgid "View as Other"
 msgstr "ÁüȨŠ§À¡ø À¡÷ì¸"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1221
+#: libnautilus-extensions/nautilus-program-chooser.c:1266
 #, c-format
 msgid "Choose a view for \"%s\"."
 msgstr "\"%s\" ìÌ ¸¡ðº¢¨Âò ¦¾Ã¢× ¦ºö¸."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1228
+#: libnautilus-extensions/nautilus-program-chooser.c:1273
 msgid "Choose"
 msgstr "¦¾Ã¢× ¦ºö"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1230
-#: src/nautilus-property-browser.c:358
+#: libnautilus-extensions/nautilus-program-chooser.c:1275
 msgid "Done"
 msgstr "ÓÊó¾Ð"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1292
+#: libnautilus-extensions/nautilus-program-chooser.c:1338
 msgid "Modify..."
 msgstr "Á¡üÚ..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-extensions/nautilus-program-chooser.c:1303
+#: libnautilus-extensions/nautilus-program-chooser.c:1349
 msgid "File Types and Programs"
 msgstr "§¸¡ôÀ¢ý Ũ¸¸û ÁüÚõ ¿¢Ãø¸û"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1312
-msgid "Go There"
-msgstr "«íÌ ¦ºø"
-
-#: libnautilus-extensions/nautilus-program-chooser.c:1321
+#: libnautilus-extensions/nautilus-program-chooser.c:1370
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "GNOME Control Center."
@@ -3342,254 +6288,325 @@ msgstr ""
 "±ó¾ §¸¡ôÒ¸ÙìÌ ±ó¾ ¿¢Ãø¸û ÅÆí¸ôÀÎõ ±ýÚ Ì§É¡õ ¸ðÎôÀ¡ðÎ ¨ÁÂò¾¢ø ¿£÷ ÅÊÅ¡ì¸õ "
 "¦ºöÂÄ¡õ"
 
-#. This application can't deal with this URI,
-#. * because it can only handle local
-#. * files. Tell user. Some day we could offer
-#. * to copy it locally for the user, if we knew
-#. * where to put it, and who would delete it
-#. * when done.
+#: libnautilus-extensions/nautilus-program-chooser.c:1485
+#, fuzzy, c-format
+msgid "No viewers are available for \"%s\"."
+msgstr "\"%s\" ìÌ ¸¡ðº¢¨Âò ¦¾Ã¢× ¦ºö¸."
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1486
+msgid "No Viewers Available"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1489
+#, fuzzy, c-format
+msgid "No applications are available for \"%s\"."
+msgstr "%s ±ýÈ ±ñ½ì¸Õ×ìÌò ¾¸Åø¸û ¸¢¨¼ì¸Å¢ø¨Ä"
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1490
+#, fuzzy
+msgid "No Applications Available"
+msgstr "ÀÂýÀ¡Î¸û"
+
+#. Note: This might be misleading in the components case, since the
+#. * user can't add components to the complete list even from the capplet.
+#. * (They can add applications though.)
 #.
-#: libnautilus-extensions/nautilus-program-choosing.c:444
+#: libnautilus-extensions/nautilus-program-chooser.c:1497
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"You can configure which programs are offered for which file types with the "
+"\"File Types and Programs\" part of the GNOME Control Center. Do you want to "
+"go there now?"
+msgstr ""
+"±ó¾ §¸¡ôÒ¸ÙìÌ ±ó¾ ¿¢Ãø¸û ÅÆí¸ôÀÎõ ±ýÚ Ì§É¡õ ¸ðÎôÀ¡ðÎ ¨ÁÂò¾¢ø ¿£÷ ÅÊÅ¡ì¸õ "
+"¦ºöÂÄ¡õ"
+
+#: libnautilus-extensions/nautilus-program-choosing.c:492
 #, c-format
 msgid ""
-"Sorry, %s can only open local files, and \"%s\" is remote. If you want to "
-"open it with %s, make a local copy first."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  Would you like to choose another application?"
 msgstr ""
-"ÁýÉ¢ì¸×õ, %s «ñ¨Á¢ÖûÇ §¸¡ôÒ¸¨ÇÁðÎõ ¾¢ÈìÌõ,ÁüÚõ \"%s\" ¦¾¡¨ÄÅ¢ÖûÇÐ. %s ³ì "
-"¦¸¡ñÎ ¾¢Èì¸ Å¢ÕõÀ¢É¡ø, «ñ¨Á¢ø ´Õ ¿¸ø ±ÎòÐ즸¡ûÇ×õ."
 
-#: libnautilus-extensions/nautilus-program-choosing.c:448
-msgid "Can't open remote file"
-msgstr "¦¾¡¨ÄÅ¢ÖûÇ §¸¡ô¨Àò ¾¢Èì¸ ÓÊ¡Ð"
+#: libnautilus-extensions/nautilus-program-choosing.c:497
+#: libnautilus-extensions/nautilus-program-choosing.c:518
+#, fuzzy
+msgid "Can't Open Location"
+msgstr "­¼ò¨¾ì ¸¡ñÀ¢ì¸ ­ÂÄ¡Ð"
 
-#: libnautilus-extensions/nautilus-search-uri.c:207
+#: libnautilus-extensions/nautilus-program-choosing.c:513
+#, c-format
+msgid ""
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  No other applications are available to view this file.  If you "
+"copy this file onto your computer, you may be able to open it."
+msgstr ""
+
+#. Human readable description for a criterion in a search for
+#. files. Bracketed items are context, and are message
+#. strings elsewhere.  You don't have to translate the whole
+#. string, and only the translation for "containing '%s' will
+#. be used.  If you do translate the whole string, leave the
+#. translations of the rest of the text in brackets, so it
+#. will not be used.
+#. "%s" here is a pattern the file name
+#. matched, such as "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:212
 #, fuzzy, c-format
-msgid "with \"%s\" in the name"
+msgid "[Items ]containing \"%s\" in their names"
 msgstr "¦ÀÂâÛû \"%s\" ¯ûÇÐ "
 
-#: libnautilus-extensions/nautilus-search-uri.c:210
+#. "%s" here is a pattern the file name started with, such as
+#. "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:217
 #, fuzzy, c-format
-msgid "starting with \"%s\""
+msgid "[Items ]starting with \"%s\""
 msgstr "\"%s\" ³ì¦¸¡ñÎ ¦¾¡¼í̸"
 
-#: libnautilus-extensions/nautilus-search-uri.c:213
+#. "%s" here is a pattern the file name ended with, such as
+#. "mime"
+#: libnautilus-extensions/nautilus-search-uri.c:222
 #, fuzzy, c-format
-msgid "ending with %s"
+msgid "[Items ]ending with %s"
 msgstr "%s ³ì ¦¸¡ñÎ ¾¢È"
 
-#: libnautilus-extensions/nautilus-search-uri.c:216
+#. "%s" here is a pattern the file name did not match, such
+#. as "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:227
 #, fuzzy, c-format
-msgid "without \"%s\" in their name"
+msgid "[Items ]not containing \"%s\" in their names"
 msgstr "¦ÀÂâÛû \"%s\" ¯ûÇÐ "
 
-#: libnautilus-extensions/nautilus-search-uri.c:219
+#. "%s" is a regular expression string, for example "[abc]"
+#: libnautilus-extensions/nautilus-search-uri.c:231
 #, fuzzy, c-format
-msgid "matching the regular expression \"%s\""
+msgid "[Items ]matching the regular expression \"%s\""
 msgstr "Ó¨ÈÂ¡É ¦¾¡¼Õ¼ý ¦À¡ÕóÐõ \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:222
+#. "%s" is a file glob, for example "*.txt"
+#: libnautilus-extensions/nautilus-search-uri.c:235
 #, fuzzy, c-format
-msgid "matching the file pattern \"%s\""
+msgid "[Items ]matching the file pattern \"%s\""
 msgstr "§¸¡ôÀ¢ý ¯ÕŨ¸Ô¼ý ¦À¡ÕóÐõ \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:235
-msgid "regular files"
-msgstr "Ó¨ÈÂ¡É §¸¡ôÒ¸û"
+#: libnautilus-extensions/nautilus-search-uri.c:248
+#, fuzzy
+msgid "[Items that are ]regular files"
+msgstr "¦ÀÂâø \"¦À¡Õû\" ¯ûÇ ¯ÕôÀʸû ÁüÚõ Ó¨ÈÂ¡É §¸¡ôÒ¸û"
 
-#: libnautilus-extensions/nautilus-search-uri.c:238
-msgid "text files"
-msgstr "¯¨Ãì §¸¡ôÒ¸û"
+#: libnautilus-extensions/nautilus-search-uri.c:251
+msgid "[Items that are ]text files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:241
-msgid "applications"
-msgstr "ÀÂýÀ¡Î¸û"
+#: libnautilus-extensions/nautilus-search-uri.c:254
+msgid "[Items that are ]applications"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:244
-msgid "directories"
-msgstr "«¨¼×¸û"
+#: libnautilus-extensions/nautilus-search-uri.c:257
+msgid "[Items that are ]folders"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:247
-#: src/nautilus-search-bar-criterion.c:107
-msgid "music"
-msgstr "­¨º"
+#: libnautilus-extensions/nautilus-search-uri.c:260
+msgid "[Items that are ]music"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:254
-#, c-format
-msgid "are not %s"
+#. "%s" here is a word describing a file type, for example
+#. "folder"
+#: libnautilus-extensions/nautilus-search-uri.c:268
+#, fuzzy, c-format
+msgid "[Items ]that are not %s"
 msgstr "%s ­ø¨Ä"
 
-#: libnautilus-extensions/nautilus-search-uri.c:258
+#. "%s" here is a word describing a file type, for example
+#. "folder"
+#: libnautilus-extensions/nautilus-search-uri.c:273
 #, c-format
-msgid "are %s"
-msgstr "%s ­ø¨Ä"
+msgid "[Items ]that are %s"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:269
+#. "%s" here is the name of user on a Linux machine, such as
+#. "root"
+#: libnautilus-extensions/nautilus-search-uri.c:287
 #, fuzzy, c-format
-msgid "not owned by \"%s\""
+msgid "[Items ]not owned by \"%s\""
 msgstr "\"%s\" ìÌ ¯Ã¢¨Á ­ø¨Ä"
 
-#: libnautilus-extensions/nautilus-search-uri.c:272
+#. "%s" here is the name of user on a Linux machine, such as
+#. "root"
+#: libnautilus-extensions/nautilus-search-uri.c:292
 #, fuzzy, c-format
-msgid "owned by \"%s\""
-msgstr "\"%s\" ìÌ ¯Ã¢¨Á ¯ñÎ"
+msgid "[Items ]owned by \"%s\""
+msgstr "\"%s\" ìÌ ¯Ã¢¨Á ­ø¨Ä"
 
-#: libnautilus-extensions/nautilus-search-uri.c:276
+#: libnautilus-extensions/nautilus-search-uri.c:295
 #, fuzzy, c-format
-msgid "with owner UID \"%s\""
+msgid "[Items ]with owner UID \"%s\""
 msgstr "¯Ã¢Á «¨¼Â¡Ç ±ñ \"%s\" ¦¸¡ñ¼É"
 
-#: libnautilus-extensions/nautilus-search-uri.c:279
+#: libnautilus-extensions/nautilus-search-uri.c:298
 #, fuzzy, c-format
-msgid "with owner UID other than \"%s\""
+msgid "[Items ]with owner UID other than \"%s\""
 msgstr "\"%s\" ¾Å¢Ã ­¾Ã ¯Ã¢Á «¨¼Â¡Ç ±ñ ¦¸¡ñ¼É"
 
-#: libnautilus-extensions/nautilus-search-uri.c:290
+#: libnautilus-extensions/nautilus-search-uri.c:309
 #, fuzzy, c-format
-msgid "larger than %s bytes"
+msgid "[Items ]larger than %s bytes"
 msgstr "³ Å¢¼ %s ¨Àðθû ¦ÀâÂÉ"
 
-#: libnautilus-extensions/nautilus-search-uri.c:293
+#: libnautilus-extensions/nautilus-search-uri.c:312
 #, fuzzy, c-format
-msgid "smaller than %s bytes"
+msgid "[Items ]smaller than %s bytes"
 msgstr "³ Å¢¼ %s ¨Àðθû º¢È¢ÂÉ"
 
-#: libnautilus-extensions/nautilus-search-uri.c:296
+#: libnautilus-extensions/nautilus-search-uri.c:315
 #, fuzzy, c-format
-msgid "%s bytes"
-msgstr "%s ¨Àðθû ¦¸¡ñ¼É"
+msgid "[Items ]of %s bytes"
+msgstr "¯ÕôÀʸû %s%s%s"
 
-#: libnautilus-extensions/nautilus-search-uri.c:307
+#: libnautilus-extensions/nautilus-search-uri.c:326
 #, fuzzy
-msgid "modified today"
+msgid "[Items ]modified today"
 msgstr "%s ìÌô À¢ý Á¡üÈôÀð¼¨Å "
 
-#: libnautilus-extensions/nautilus-search-uri.c:310
+#: libnautilus-extensions/nautilus-search-uri.c:329
 #, fuzzy
-msgid "modified yesterday"
+msgid "[Items ]modified yesterday"
 msgstr "§¿üÚ"
 
-#: libnautilus-extensions/nautilus-search-uri.c:313
+#: libnautilus-extensions/nautilus-search-uri.c:332
 #, fuzzy, c-format
-msgid "modified on %s"
+msgid "[Items ]modified on %s"
 msgstr "%s ìÌô À¢ý Á¡üÈôÀð¼¨Å "
 
-#: libnautilus-extensions/nautilus-search-uri.c:316
+#: libnautilus-extensions/nautilus-search-uri.c:334
 #, fuzzy, c-format
-msgid "not modified on %s"
+msgid "[Items ]not modified on %s"
 msgstr "%s ìÌô À¢ý Á¡üÈôÀð¼¨Å "
 
-#: libnautilus-extensions/nautilus-search-uri.c:319
-#, c-format
-msgid "modified before %s"
-msgstr ""
+#: libnautilus-extensions/nautilus-search-uri.c:337
+#, fuzzy, c-format
+msgid "[Items ]modified before %s"
+msgstr "%s ìÌô À¢ý Á¡üÈôÀð¼¨Å "
 
-#: libnautilus-extensions/nautilus-search-uri.c:322
-#, c-format
-msgid "modified after %s"
+#: libnautilus-extensions/nautilus-search-uri.c:340
+#, fuzzy, c-format
+msgid "[Items ]modified after %s"
 msgstr "%s ìÌô À¢ý Á¡üÈôÀð¼¨Å "
 
-#: libnautilus-extensions/nautilus-search-uri.c:325
+#: libnautilus-extensions/nautilus-search-uri.c:343
 #, fuzzy, c-format
-msgid "modified within a week of %s"
+msgid "[Items ]modified within a week of %s"
 msgstr "­ùÅ¡Ãò¾¢üÌû"
 
-#: libnautilus-extensions/nautilus-search-uri.c:328
+#: libnautilus-extensions/nautilus-search-uri.c:346
 #, fuzzy, c-format
-msgid "modified within a month of %s"
+msgid "[Items ]modified within a month of %s"
 msgstr "Á¡¾¾¢üÌû"
 
-#: libnautilus-extensions/nautilus-search-uri.c:340
-#, c-format
-msgid "marked with \"%s\""
-msgstr "\"%s\" ³ì ¦¸¡ñÎ ÌÈ¢ì¸ôÀð¼¨Å"
+#. "%s" here is the name of an Emblem
+#: libnautilus-extensions/nautilus-search-uri.c:359
+#, fuzzy, c-format
+msgid "[Items ]marked with \"%s\""
+msgstr "\"%s\" ³ì¦¸¡ñÎ ÌÈ¢ì¸ôÀ¼¡¾¨Å"
 
-#: libnautilus-extensions/nautilus-search-uri.c:343
-#, c-format
-msgid "not marked with \"%s\""
+#. "%s" here is the name of an Emblem
+#: libnautilus-extensions/nautilus-search-uri.c:363
+#, fuzzy, c-format
+msgid "[Items ]not marked with \"%s\""
 msgstr "\"%s\" ³ì¦¸¡ñÎ ÌÈ¢ì¸ôÀ¼¡¾¨Å"
 
-#: libnautilus-extensions/nautilus-search-uri.c:357
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:379
 #, fuzzy, c-format
-msgid "with all the words \"%s\""
+msgid "[Items ]with all the words \"%s\""
 msgstr "±øÄ¡ ¦º¡ü¸Ù¼ý %s"
 
-#: libnautilus-extensions/nautilus-search-uri.c:360
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:384
 #, fuzzy, c-format
-msgid "containing one of the words \"%s\""
+msgid "[Items ]containing one of the words \"%s\""
 msgstr "¦º¡ü¸Ùû ´ýÚ %s ¦¸¡ñ¼"
 
-#: libnautilus-extensions/nautilus-search-uri.c:363
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:389
 #, fuzzy, c-format
-msgid "without all the words \"%s\""
+msgid "[Items ]without all the words \"%s\""
 msgstr "±øÄ¡ %s ¦º¡ü¸Ùõ ­øÄ¡Áø"
 
-#: libnautilus-extensions/nautilus-search-uri.c:366
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:394
 #, fuzzy, c-format
-msgid "without any of the words \"%s\""
+msgid "[Items ]without any of the words \"%s\""
 msgstr "±ó¾ ´Õ %s ¦º¡ü¸Ùõ ­øÄ¡Áø"
 
-#: libnautilus-extensions/nautilus-search-uri.c:383
-msgid "that"
-msgstr "«ó¾"
-
-#: libnautilus-extensions/nautilus-search-uri.c:503
-msgid "are directories"
-msgstr "«¨Å «¨¼×¸û"
+#: libnautilus-extensions/nautilus-search-uri.c:556
+msgid "[Items larger than 400K] and [without all the words \"apple orange\"]"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:547
-msgid " and "
-msgstr "ÁüÚõ"
+#. Human readable description for a criterion in a search for
+#. files. Bracketed items are context, and are message
+#. strings elsewhere.  Translate only the words "and" here.
+#: libnautilus-extensions/nautilus-search-uri.c:561
+msgid ""
+"[Items larger than 400K], [owned by root and without all the words \"apple "
+"orange\"]"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:612
-#, c-format
-msgid "Items %s%s"
+#. The beginning of the description of a search that has just been
+#. performed.  The "%s" here is a description of a single criterion,
+#. which in english might be "that contain the word 'foo'"
+#: libnautilus-extensions/nautilus-search-uri.c:591
+#, fuzzy, c-format
+msgid "Items %s"
 msgstr "¯ÕôÀʸû %s%s"
 
-#: libnautilus-extensions/nautilus-search-uri.c:615
-#, c-format
-msgid "Items %s %s%s"
-msgstr "¯ÕôÀʸû %s%s%s"
-
-#: libnautilus-extensions/nautilus-search-uri.c:724
+#: libnautilus-extensions/nautilus-search-uri.c:701
 #, fuzzy
-msgid "Items with \"stuff\" in the name."
+msgid "Items containing \"stuff\" in their names"
 msgstr "¦ÀÂâø \"¦À¡Õû\" ¯ûÇ ¯ÕôÀʸû"
 
-#: libnautilus-extensions/nautilus-search-uri.c:726
+#: libnautilus-extensions/nautilus-search-uri.c:703
+#, fuzzy
+msgid "Items that are regular files"
+msgstr "¦ÀÂâø \"¦À¡Õû\" ¯ûÇ ¯ÕôÀʸû ÁüÚõ Ó¨ÈÂ¡É §¸¡ôÒ¸û"
+
+#: libnautilus-extensions/nautilus-search-uri.c:706
 #, fuzzy
-msgid "Items with \"stuff\" in the name and are regular files."
+msgid "Items containing \"stuff\" in their names and that are regular files"
 msgstr "¦ÀÂâø \"¦À¡Õû\" ¯ûÇ ¯ÕôÀʸû ÁüÚõ Ó¨ÈÂ¡É §¸¡ôÒ¸û"
 
-#: libnautilus-extensions/nautilus-search-uri.c:729
+#: libnautilus-extensions/nautilus-search-uri.c:710
 #, fuzzy
 msgid ""
-"Items with \"stuff\" in the name, are regular files and smaller than 2000 "
-"bytes."
+"Items containing \"stuff\" in their names, that are regular files and "
+"smaller than 2000 bytes"
 msgstr ""
 "¦ÀÂâø \"¦À¡Õû\" ¯ûÇ ¯ÕôÀʸû, Ó¨ÈÂ¡É §¸¡ôÒ¸û ÁüÚõ 2000 ¨ÀðθÙìÌ츣ØûÇ "
 "§¸¡ôÒ¸û."
 
-#: libnautilus-extensions/nautilus-search-uri.c:732
+#: libnautilus-extensions/nautilus-search-uri.c:714
 #, fuzzy
-msgid "Items with \"medusa\" in the name and are directories."
+msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "¦ÀÂâÖõ «¨¼×¸Ç¢Öõ \"¦Áκ¡\" ±ýÈ ¦º¡ø ¦¸¡ñ¼ ¯ÕôÀʸû"
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:415
-msgid "Warning"
-msgstr "±îºÃ¢ì¨¸"
+#: libnautilus-extensions/nautilus-trash-directory.c:73
+#, fuzzy
+msgid "Searching Disks"
+msgstr "«¨ÁôÒ¸¨Çò §¾Î"
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:425
-#: libnautilus-extensions/nautilus-stock-dialogs.c:465
-msgid "Error"
+#: libnautilus-extensions/nautilus-trash-directory.c:74
+msgid "Nautilus is searching your disks for trash folders."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:467
-msgid "Details"
-msgstr "Å¢ÅÃí¸û"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:497
-msgid "Question"
-msgstr "Ţɡì¸û"
+#: libnautilus-extensions/nautilus-trash-file.c:725
+msgid "on the desktop"
+msgstr ""
 
 #: libnautilus-extensions/nautilus-undo-signal-handlers.c:175
 msgid "Edit"
@@ -3611,149 +6628,339 @@ msgstr "Á£ñÎõ À¾¢ì¸"
 msgid "Redo the edit"
 msgstr "À¾¢ò¾¨Ä Á£ñÎõ ¦ºö¸"
 
-#: libnautilus-extensions/nautilus-user-level-manager.c:56
-msgid "Beginner"
-msgstr "¦¾¡¼íÌ¿÷"
+#: libnautilus-extensions/nautilus-view-identifier.c:61
+#, c-format
+msgid "View as %s"
+msgstr "%s §À¡ýÈ ¸¡ðº¢ "
 
-#: libnautilus-extensions/nautilus-user-level-manager.c:57
-msgid "Intermediate"
-msgstr "­¨¼¿¢¨Ä"
+#: libnautilus-extensions/nautilus-view-identifier.c:64
+#, c-format
+msgid "%s Viewer"
+msgstr "%s ¸¡ðÊ"
 
-#: libnautilus-extensions/nautilus-user-level-manager.c:58
-msgid "Advanced"
-msgstr "Óý§É¡Ê"
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+#, fuzzy
+msgid "Unknown"
+msgstr "«È¢ÂôÀ¼¡¾Ð"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:474
-msgid "Unknown Volume"
-msgstr "«È¢ó¾¢Ä¡ò ¦¾¡Ì¾¢"
+#. Populate table with items we know localized names for.
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
+msgid "Floppy"
+msgstr "¦¿¸¢úÅðÎ"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
+msgid "CD-ROM"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
+msgid "Zip Drive"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
+msgid "Audio CD"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
+msgid "is write-protected, mounting read-only"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
+msgid "is not a valid block device"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1140
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
+msgid "No medium found"
+msgstr ""
+
+#. Handle floppy case
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
+msgid ""
+"Nautilus was unable to mount the floppy drive. There is probably no floppy "
+"in the drive."
+msgstr ""
+
+#. All others
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
+msgid ""
+"Nautilus was unable to mount the volume. There is probably no media in the "
+"device."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
+msgid "wrong fs type, bad option, bad superblock on"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
+msgid ""
+"Nautilus was unable to mount the floppy drive. The floppy is probably in a "
+"format that cannot be mounted."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
+msgid ""
+"Nautilus was unable to mount the selected volume. The volume is probably in "
+"a format that cannot be mounted."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
+msgid "Nautilus was unable to mount the selected floppy drive."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
+msgid "Nautilus was unable to mount the selected volume."
+msgstr ""
+
+#. FIXME: Should we parse this message and report something more meaningful?
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
+msgid "Nautilus was unable to unmount the selected volume."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+#, fuzzy
+msgid "Unmount Error"
+msgstr "¦ÀÂ÷Á¡üÈô À¢¨Æ"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "³§º¡ 9660 ¦¾¡Ì¾¢"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1147
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
+msgid "Root"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "±ìŠ2 ¦¾¡Ì¾¢"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1153
-msgid "Floppy"
-msgstr "¦¿¸¢úÅðÎ"
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
+#, fuzzy
+msgid "MSDOS Volume"
+msgstr "³§º¡ 9660 ¦¾¡Ì¾¢"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: po/tmp/nautilus-clipboard-ui.xml.h:7 po/tmp/nautilus-shell-ui.xml.h:13
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
+#, fuzzy
+msgid "NFS Volume"
+msgstr "±ìŠ2 ¦¾¡Ì¾¢"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
+msgid "ReiserFS Volume"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
+#, fuzzy
+msgid "UFS Volume"
+msgstr "±ìŠ2 ¦¾¡Ì¾¢"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
+msgid "Unknown Volume"
+msgstr "«È¢ó¾¢Ä¡ò ¦¾¡Ì¾¢"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:5
 msgid "C_lear Text"
 msgstr "¯¨Ã¨Âò Ð_¨¼"
 
-#: po/tmp/nautilus-clipboard-ui.xml.h:8 po/tmp/nautilus-shell-ui.xml.h:22
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "¯¨Ã¨Âò Ð_¨¼"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "_¯¨Ã ¿¸ø"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 #, fuzzy
 msgid "Copy the selected text to the clipboard"
 msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ¯¨Ã ¿¸ø¾¨É, À¢¨½ôÀĨ¸Â¢ø ­Î¸¢ÈÐ"
 
-#: po/tmp/nautilus-clipboard-ui.xml.h:9 po/tmp/nautilus-shell-ui.xml.h:25
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "_¯¨Ã ¦ÅðÎ"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+#, fuzzy
+msgid "Cut _Text"
+msgstr "_¯¨Ã ¦ÅðÎ"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 #, fuzzy
 msgid "Cut the selected text to the clipboard"
 msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ¯¨Ã¢¨É ¦ÅðÊ, À¢¨½ôÀĨ¸Â¢ø ­Î¸¢ÈÐ"
 
-#: po/tmp/nautilus-clipboard-ui.xml.h:10 po/tmp/nautilus-shell-ui.xml.h:51
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "_¯¨Ã ´ðÎ"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 #, fuzzy
 msgid "Paste the text stored on the clipboard"
 msgstr "À¢¨½ôÀĨ¸Â¢ø §¾ì¸¢¨Åò¾ ¯¨Ã¢¨É , ´ðÎ"
 
-#: po/tmp/nautilus-clipboard-ui.xml.h:11
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 #, fuzzy
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ¯¨Ã¨Â À¢¨½ôÀĨ¸Â¢ø ­¼¡Áø,  ¿£ì̸¢ÈÐ"
 
-#: po/tmp/nautilus-clipboard-ui.xml.h:12 po/tmp/nautilus-shell-ui.xml.h:81
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "_«¨ÉòÐõ §¾÷צºö"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+#, fuzzy
+msgid "Select _All"
+msgstr "_«¨ÉòÐõ §¾÷צºö"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "­ó¾ º¡ÇÃò¾¢ø ¯ûÇ ±øÄ¡ ¯ÕôÀʨÇÔõ §¾÷ó¦¾Î"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "_¯¨Ã ¿¸ø"
 
-#: po/tmp/nautilus-clipboard-ui.xml.h:13
-msgid "_Cut Text"
-msgstr "_¯¨Ã ¦ÅðÎ"
-
-#: po/tmp/nautilus-clipboard-ui.xml.h:14 po/tmp/nautilus-shell-ui.xml.h:94
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "_¯¨Ã ´ðÎ"
 
-#: src/file-manager/fm-desktop-icon-view.c:589
-#: src/file-manager/fm-desktop-icon-view.c:594
-#, fuzzy
-msgid "Link to"
-msgstr "­¨½ôÒò ¦¾¡Ì¾¢"
+#. The copyright character in here is correct for
+#. * Latin-1 encoding, but not for UTF-8, so we have
+#. * to change it when we upgrade to GTK 2.0.
+#.
+#: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
+#: src/nautilus-window-menus.c:610
+msgid "Nautilus"
+msgstr "¿¡ÊÄŠ"
 
-#: src/file-manager/fm-desktop-icon-view.c:591
-msgid "Link to Unknown"
+#: nautilus.desktop.in.h:2
+msgid "Nautilus File Manager and Graphic Shell"
 msgstr ""
 
-#: src/file-manager/fm-desktop-icon-view.c:1088
+#. Note to translators: If it's hard to compose a good home
+#. * icon name from the user name, you can use a string without
+#. * an "%s" here, in which case the home icon name will not
+#. * include the user's name, which should be fine. To avoid a
+#. * warning, put "%.0s" somewhere in the string, which will
+#. * match the user name string passed by the C code, but not
+#. * put the user name in the final string.
+#.
+#: src/file-manager/fm-desktop-icon-view.c:886
+#, fuzzy, c-format
+msgid "%s's Home"
+msgstr "­øÄõ"
+
+#: src/file-manager/fm-desktop-icon-view.c:1175
 #, fuzzy
 msgid "Empty Trash..."
 msgstr "¦ÅüÚì Ìô¨Àò¦¾¡ðÊ..."
 
-#: po/tmp/nautilus-desktop-icon-view-ui.xml.h:10
-#: po/tmp/nautilus-directory-view-ui.xml.h:17
-#: src/file-manager/fm-desktop-icon-view.c:1090
+#: src/file-manager/fm-desktop-icon-view.c:1177
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "¦ÅüÚò ¦¾¡ðÊ"
 
-#: src/file-manager/fm-directory-view.c:417
+#: src/file-manager/fm-desktop-icon-view.c:1197
+#, fuzzy
+msgid "Unmount Volume"
+msgstr "«È¢ó¾¢Ä¡ò ¦¾¡Ì¾¢"
+
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr "­Ð %d ¾É¢ò¾É¢ º¡ÇÃí¸¨Çò ¾¢ÈìÌõ"
 
-#: src/file-manager/fm-directory-view.c:419
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d º¡ÇÃí¸¨Çò ¾¢Èì¸Å¡?"
 
-#: src/file-manager/fm-directory-view.c:1173
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr "Ìô¨Àò¦¾¡ðÊ¢ĢÕôÀÅü¨È ¿¢Ãó¾ÃÁ¡¸ «Æ¢ì¸§ÅñΦÁýÀÐ ¯Ú¾¢Â¡?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+"%d ¯ÕôÀʸÇÔõ Ìô¨Àò¦¾¡ðÊ¢ĢÕóÐ ¿¢Ãó¾ÃÁ¡¸ «Æ¢ì¸§ÅñÎÁ¡ ?¿¢îºÂÁ¡¸Å¡?Are you "
+"sure you want to permanently delete the %d selected items from the trash?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "«Æ¢ò¾ø"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "«Æ¢ò¾ø"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+#, fuzzy
+msgid "scripts"
+msgstr "Å¢Çì¸õ"
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" ¦¾Ã¢× ¦ºöÂôÀð¼É"
 
-#: src/file-manager/fm-directory-view.c:1175
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "1 «¨¼× ¦¾Ã¢× ¦ºöÂôÀð¼Ð"
 
-#: src/file-manager/fm-directory-view.c:1178
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "%d «¨¼×¸û ¦¾Ã¢× ¦ºöÂôÀð¼É"
 
-#: src/file-manager/fm-directory-view.c:1184
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr "(0 ¯ÕôÀʸû ¯ûÇ¼í¸¢ÂÐ)"
 
-#: src/file-manager/fm-directory-view.c:1186
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr "(1 ¯ÕôÀÊ ¯ûÇ¼í¸¢ÂÐ)"
 
-#: src/file-manager/fm-directory-view.c:1188
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr "(%d ¯ÕôÀʸû ¯ûÇ¼í¸¢ÂÐ)"
 
-#: src/file-manager/fm-directory-view.c:1199
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" ¦¾Ã¢×¦ºöÂôÀð¼É (%s)"
 
-#: src/file-manager/fm-directory-view.c:1203
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d ¯ÕôÀʸû ¦¾Ã¢× ¦ºöÂôÀð¼É (%s)"
 
-#: src/file-manager/fm-directory-view.c:1210
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 ­¾Ã ¯ÕôÀÊ ¦¾Ã¢× ¦ºöÂôÀð¼Ð (%s)"
 
-#: src/file-manager/fm-directory-view.c:1213
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d ­¾Ã ¯ÕôÀʸû ¦¾Ã¢× ¦ºöÂôÀð¼É (%s)"
@@ -3765,298 +6972,516 @@ msgstr "%d ­¾Ã ¯ÕôÀʸû ¦¾Ã¢× ¦ºöÂôÀð¼É (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1242
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
 
-#: src/file-manager/fm-directory-view.c:1353
+#. Note that the number of items actually displayed varies somewhat due
+#. * to the way files are collected in batches. So you can't assume that
+#. * no more than the constant limit are displayed.
+#.
+#: src/file-manager/fm-directory-view.c:1530
+#, c-format
 msgid ""
-"We're sorry, but the directory you're viewing has more files than we're able "
-"to display.  As a result, we are only able to show you the first 4000 files "
-"it contains. \n"
-"This is a temporary limitation in this Preview Release of Nautilus, and will "
-"not be present in the final shipping version.\n"
+"The folder \"%s\" contains more files than Nautilus can handle. Some files "
+"will not be displayed."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1359
-msgid "Too many Files"
+#: src/file-manager/fm-directory-view.c:1537
+msgid "Too Many Files"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2447
-#, c-format
+#: src/file-manager/fm-directory-view.c:2752
+#, fuzzy, c-format
 msgid ""
-"\"%s\" cannot be moved to the trash. Do you want to delete it immediately?"
+"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
 msgstr "\"%s\" Ìô¨Àò¦¾¡ðÊìÌû ¿¸÷ò¾ ÓÊ¡Ð. ¯¼§É§Â «Æ¢ì¸ §ÅñÎÁ¡?"
 
-#: src/file-manager/fm-directory-view.c:2452
-#, c-format
+#: src/file-manager/fm-directory-view.c:2757
+#, fuzzy, c-format
 msgid ""
-"The %d selected items cannot be moved to the trash. Do you want to delete "
+"The %d selected items cannot be moved to the Trash. Do you want to delete "
 "them immediately?"
 msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ %d ¯ÕôÀʸû Ìô¨Àò¦¾¡ðÊìÌ ¿¸÷ò¾ ÓÊ¡Ð. «Æ¢ì¸ §ÅñÎÁ¡?"
 
-#: src/file-manager/fm-directory-view.c:2456
-#, c-format
+#: src/file-manager/fm-directory-view.c:2761
+#, fuzzy, c-format
 msgid ""
-"%d of the selected items cannot be moved to the trash. Do you want to delete "
+"%d of the selected items cannot be moved to the Trash. Do you want to delete "
 "those %d items immediately?"
 msgstr ""
 "¦¾Ã¢× ¦ºöÂôÀð¼ %d ¯ÕôÀʸ¨Çì Ìô¨Àò¦¾¡ðÊìÌû ¿¸÷ò¾ ÓÊ¡Ð.«ó¾ %d ¯ÕôÀʸ¨Ç "
 "¯¼ÉÊ¡¸ «Æ¢ì¸§ÅñÎÁ¡?"
 
-#: src/file-manager/fm-directory-view.c:2464
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "¯¼§É «Æ¢ì¸Å¡?"
 
-#: src/file-manager/fm-directory-view.c:2465
-#: src/file-manager/fm-directory-view.c:2506
-msgid "Delete"
-msgstr "«Æ¢ò¾ø"
-
-#: src/file-manager/fm-directory-view.c:2495
+#: src/file-manager/fm-directory-view.c:2799
 #, fuzzy, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
+msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr "Ìô¨Àò¦¾¡ðÊ¢ĢÕôÀÅü¨È ¿¢Ãó¾ÃÁ¡¸ «Æ¢ì¸§ÅñΦÁýÀÐ ¯Ú¾¢Â¡?"
 
-#: src/file-manager/fm-directory-view.c:2499
+#: src/file-manager/fm-directory-view.c:2803
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"trash?"
+"Trash?"
 msgstr ""
 "%d ¯ÕôÀʸÇÔõ Ìô¨Àò¦¾¡ðÊ¢ĢÕóÐ ¿¢Ãó¾ÃÁ¡¸ «Æ¢ì¸§ÅñÎÁ¡ ?¿¢îºÂÁ¡¸Å¡?Are you "
 "sure you want to permanently delete the %d selected items from the trash?"
 
-#: src/file-manager/fm-directory-view.c:2505
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "Ìô¨Àò¦¾¡ðÊ¢ĢÕóÐ «Æ¢?"
 
-#: src/file-manager/fm-directory-view.c:2776
-#: src/file-manager/fm-directory-view.c:2817
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, fuzzy, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ¯ÕôÀʨÂò ¾¢È츧ÅñÊ ¿¢Ã¨Äò §¾÷ó¦¾Î"
 
-#: src/file-manager/fm-directory-view.c:2815
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#, fuzzy
+msgid "Other _Application..."
+msgstr "§ÅÚ ÀÂýÀ¡Î"
+
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "§ÅÚ ÀÂýÀ¡Î"
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#, fuzzy
+msgid "Other _Viewer..."
+msgstr "­¾Ã ¸¡ðÊ..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "­¾Ã ¸¡ðÊ..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ¯ÕôÀʨÂò ¾¢È츧ÅñÊ ¿¢Ã¨Äò §¾÷ó¦¾Î"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
 #, c-format
-msgid "%s Viewer"
-msgstr "%s ¸¡ðÊ"
+msgid "Nautilus was unable to create the directory %s."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3003
-msgid "Open in _New Window"
-msgstr "_Ò¾¢Â º¡ÇÃò¾¢ø ¾¢È"
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3005
+#: src/file-manager/fm-directory-view.c:3693
 #, c-format
-msgid "Open in %d _New Windows"
-msgstr "%d _Ò¾¢Â º¡ÇÃò¾¢ø ¾¢È"
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3031
-msgid "Delete all selected items permanently"
-msgstr "±øÄ¡ ¯ÕôÀʸ¨ÇÔõ ¿¢Ãó¾ÃÁ¡¸ «Æ¢"
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ %d ¯ÕôÀʸû Ìô¨Àò¦¾¡ðÊìÌ ¿¸÷ò¾ ÓÊ¡Ð. «Æ¢ì¸ §ÅñÎÁ¡?"
 
-#: src/file-manager/fm-directory-view.c:3036
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "_Ò¾¢Â º¡ÇÃò¾¢ø ¾¢È"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#, fuzzy
+msgid "Open _in New Window"
+msgstr "_Ò¾¢Â º¡ÇÃò¾¢ø ¾¢È"
+
+#: src/file-manager/fm-directory-view.c:3959
+#, fuzzy, c-format
+msgid "Open _in %d New Windows"
+msgstr "%d _Ò¾¢Â º¡ÇÃò¾¢ø ¾¢È"
+
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "_¦¾¡ðÊ¢ĢÕóÐ «Æ¢..."
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "_¦¾¡ðÊ¢ĢÕóÐ «Æ¢"
 
-#: src/file-manager/fm-directory-view.c:3041
-msgid "Move all selected items to the Trash"
-msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ¯ÕôÀʸ¨Çò ¦¾¡ðÊìÌû ¿¸÷òÐ"
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "±øÄ¡ ¯ÕôÀʸ¨ÇÔõ ¿¢Ãó¾ÃÁ¡¸ «Æ¢"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:20
-#: src/file-manager/fm-directory-view.c:3045
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "_¦¾¡ðÊìÌ ¿¸÷òÐ"
 
-#: src/file-manager/fm-directory-view.c:3074
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ¯ÕôÀʸ¨Çò ¦¾¡ðÊìÌû ¿¸÷òÐ"
+
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "«Æ¢ò¾ø"
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "«Æ¢ò¾ø"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "_­¨½ôÒ¸¨Çô À¨¼"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:11
-#: src/file-manager/fm-directory-view.c:3075
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "­¨½ô¨Àô À¨¼"
 
-#: src/file-manager/fm-directory-view.c:3093
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "¦ÅüÚì Ìô¨Àò¦¾¡ðÊ..."
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:45
-#: src/file-manager/fm-directory-view.c:3094
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "¦ÅüÚì Ìô¨Àò¦¾¡ðÊ"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:32
-#: src/file-manager/fm-directory-view.c:3105
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "¾É¢ôÀÂý ¯ÕÅí¸¨Ç ¿£_ìÌ"
 
-#: src/file-manager/fm-directory-view.c:3106
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "¾É¢ôÀÂý ¯ÕÅò¨¾ ¿£_ìÌ"
 
-#: src/file-manager/fm-directory-view.c:3237
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "_§¸¡ôÒ"
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u §¸¡ôÒ¸û"
+
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "_¯¨Ã ¿¸ø"
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "§¸¡ôÒ¸û ¿¸Ä¡ì¸õ"
+
+#: src/file-manager/fm-directory-view.c:4252
+#, fuzzy
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
-"link in the trash?"
+"link in the Trash?"
 msgstr ""
 "­ó¾ ­¨½ô¨Àô ÀÂýÀÎò¾ ÓÊ¡Ð, ²¦ÉÉ¢ø «¾üÌ ­ÄìÌ ­ø¨Ä. ­ó¾ ­¨½ô¨ÀÌô¨Àò¦¾¡ðÊ¢ø "
 "­¼§ÅñÎÁ¡?"
 
-#: src/file-manager/fm-directory-view.c:3240
-#, c-format
+#: src/file-manager/fm-directory-view.c:4255
+#, fuzzy, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to put this link in the trash?"
+"want to put this link in the Trash?"
 msgstr ""
 "­ó¾ ­¨½ô¨À ÀÂýÀÎò¾ ÓÊ¡Ð,²¦ÉýÈ¡ø ­¾ý ­ÄìÌ \"%s\" ­ø¨Ä.­ó¾ ­¨½ô¨Àì Ìô¨Àò "
 "¦¾¡ðÊ¢ø ­¼§ÅñÎÁ¡?"
 
-#: src/file-manager/fm-directory-view.c:3246
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3247
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr "àà Ţð¦¼È¢"
 
-#: src/file-manager/fm-directory-view.c:3309
+#: src/file-manager/fm-directory-view.c:4315
+#, c-format
+msgid ""
+"\"%s\" is an executable text file. Do you want to run it, or display its "
+"contents?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4321
+#, fuzzy
+msgid "Run or Display?"
+msgstr "¸¡ðº¢"
+
+#: src/file-manager/fm-directory-view.c:4322
+msgid "Run"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4323
+msgid "Display"
+msgstr "¸¡ðº¢"
+
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
 msgstr ""
 "ÁýÉ¢ì¸×õ, ¬É¡ø ­ùÅ¡¨½¸¨Ç ¸¡Åø ¸¡Ã½í¸Ç¡ø ¦¾¡¨Ä×ò ¾Çò¾¢Ä¢ÕóÐ  ¦ºÂøÀÎò¾ ÓÊ¡Ð."
 
-#: src/file-manager/fm-directory-view.c:3310
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "¦¾¡¨Ä× ­¨½ôÒ¸¨Çî ¦ºÂøÀÎò¾ ÓÊ¡Ð"
 
-#: src/file-manager/fm-error-reporting.c:54
+#: src/file-manager/fm-directory-view.c:4513
+#, fuzzy, c-format
+msgid "Opening \"%s\""
+msgstr "\"%s\" ³î ÍðÊ측ðθ¢ÈÐ"
+
+#: src/file-manager/fm-directory-view.c:4519
+#, fuzzy
+msgid "Cancel Open?"
+msgstr "¦ÀÂ÷ Á¡üÈò¨¾ ÃòÐ ¦ºö§ÅñÎÁ¡?"
+
+#: src/file-manager/fm-error-reporting.c:58
+#, fuzzy, c-format
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
+msgstr "\"%s\" ³ì ¸¡½ò §¾¨ÅÂ¡É «ÛÁ¾¢ ¯í¸ÙìÌ ­ø¨Ä"
+
+#: src/file-manager/fm-error-reporting.c:62
 #, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
+#, fuzzy, c-format
+msgid "Sorry, couldn't display all the contents of \"%s\"."
+msgstr "\"%s\" ­ý ¯Ã¢¨Á¡Ǩà Á¡üÈ ­ÂÄ¡Ð , ÁýÉ¢ì¸×õ"
+
+#: src/file-manager/fm-error-reporting.c:72
+msgid "Error Displaying Folder"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:103
+#, fuzzy, c-format
 msgid ""
-"The name \"%s\" is already used in this folder.\n"
-"Please use a different name."
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "­ó¾ ¦ÀÂ÷ \"%s\" Óý§À ­ó¾ «¨¼Å¢ø ¯À§Â¡¸ò¾¢ø ¯ûÇÐ.\n"
 "¾Â× ¦ºöÐ §Å¦È¡Õ ¦À¨à ¯À§Â¡¸¢ì¸×õ."
 
-#: src/file-manager/fm-error-reporting.c:58
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:62
-#, c-format
-msgid "You do not have the permissions necessary to rename \"%s.\""
+#: src/file-manager/fm-error-reporting.c:113
+#, fuzzy, c-format
+msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr " \"%s.\" ³ô ¦ÀÂ÷Á¡üÈõ ¦ºöžüÌò §¾¨ÅÂ¡É «ÛÁ¾¢ ¯Á츢ø¨Ä"
 
-#. fall through
-#: src/file-manager/fm-error-reporting.c:69
+#: src/file-manager/fm-error-reporting.c:118
+#, fuzzy, c-format
+msgid ""
+"The name \"%s\" is not valid because it contains the character \"/\". Please "
+"use a different name."
+msgstr ""
+"­ó¾ ¦ÀÂ÷ \"%s\" Óý§À ­ó¾ «¨¼Å¢ø ¯À§Â¡¸ò¾¢ø ¯ûÇÐ.\n"
+"¾Â× ¦ºöÐ §Å¦È¡Õ ¦À¨à ¯À§Â¡¸¢ì¸×õ."
+
+#: src/file-manager/fm-error-reporting.c:122
+#, fuzzy, c-format
+msgid "The name \"%s\" is not valid. Please use a different name."
+msgstr ""
+"­ó¾ ¦ÀÂ÷ \"%s\" Óý§À ­ó¾ «¨¼Å¢ø ¯À§Â¡¸ò¾¢ø ¯ûÇÐ.\n"
+"¾Â× ¦ºöÐ §Å¦È¡Õ ¦À¨à ¯À§Â¡¸¢ì¸×õ."
+
+#: src/file-manager/fm-error-reporting.c:128
+#, c-format
+msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "\"%s\" Ä¢ÕóÐ  \"%s\" ìÌô ¦ÀÂ÷Á¡üÈõ ¦ºöÂÓÊÂÅ¢ø¨Ä. ÁýÉ¢ì¸×õ"
 
-#: src/file-manager/fm-error-reporting.c:74
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "¦ÀÂ÷Á¡üÈô À¢¨Æ"
 
-#: src/file-manager/fm-error-reporting.c:90
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "\"%s\". ±ýÈ ¦¾¡Ì¾¢¨Âô ¦ÀÂ÷ Á¡üÈõ ¦ºöÂò§¾¨ÅÂ¡É «ÛÀÐ ¯Á츢ø¨Ä"
 
-#: src/file-manager/fm-error-reporting.c:98
+#: src/file-manager/fm-error-reporting.c:168
+#, c-format
+msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "  \"%s\". ±ý¸¢È ¦¾¡Ì¾¢¨Â Á¡üÈ ÓÊÂÅ¢ø¨Ä, ÁýÉ¢ì¸×õ "
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "¦¾¡Ì¾¢ «¨Á쨸¢ø À¢¨Æ"
 
-#: src/file-manager/fm-error-reporting.c:120
+#: src/file-manager/fm-error-reporting.c:202
+#, c-format
+msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "\"%s\" ­ý ¯Ã¢¨Á¡Ǩà Á¡üÈ ­ÂÄ¡Ð , ÁýÉ¢ì¸×õ"
 
-#: src/file-manager/fm-error-reporting.c:124
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "¯Ã¢¨Á¡Ǩà «¨Á쨸¢ø À¢¨Æ"
 
-#: src/file-manager/fm-error-reporting.c:142
+#: src/file-manager/fm-error-reporting.c:234
+#, fuzzy, c-format
+msgid ""
+"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgstr "\"%s\" ­ý «ÛÁ¾¢¸¨Ç Á¡üÈ ­ÂÄ¡Ð, ÁýÉ¢ì¸×õ "
+
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "\"%s\" ­ý «ÛÁ¾¢¸¨Ç Á¡üÈ ­ÂÄ¡Ð, ÁýÉ¢ì¸×õ "
 
-#: src/file-manager/fm-error-reporting.c:146
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "«ÛÁ¾¢¸¨Ç «¨Á쨸¢ø À¢¨Æ"
 
-#: src/file-manager/fm-error-reporting.c:210
-#, c-format
-msgid "Renaming %s to %s."
+#: src/file-manager/fm-error-reporting.c:310
+#, fuzzy, c-format
+msgid "Renaming \"%s\" to \"%s\"."
 msgstr "%s ­Ä¢ÕóÐ %s ìÌô ¦ÀÂ÷Á¡üÈôÀθ¢ÈÐ."
 
-#: src/file-manager/fm-error-reporting.c:215
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "¦ÀÂ÷ Á¡üÈò¨¾ ÃòÐ ¦ºö§ÅñÎÁ¡?"
 
-#: src/file-manager/fm-icon-text-window.c:76
+#: src/file-manager/fm-icon-text-window.c:77
 msgid "size"
 msgstr "«Ç×"
 
-#: src/file-manager/fm-icon-text-window.c:77
+#: src/file-manager/fm-icon-text-window.c:78
 msgid "type"
 msgstr "Ũ¸"
 
-#: src/file-manager/fm-icon-text-window.c:78
+#: src/file-manager/fm-icon-text-window.c:79
 msgid "date modified"
 msgstr "Á¡üÈôÀð¼ ¿¡û"
 
-#: src/file-manager/fm-icon-text-window.c:79
+#: src/file-manager/fm-icon-text-window.c:80
 msgid "date changed"
 msgstr "Á¡üÈôÀð¼ ¿¡û"
 
-#: src/file-manager/fm-icon-text-window.c:80
+#: src/file-manager/fm-icon-text-window.c:81
 msgid "date accessed"
 msgstr "«Ï¸ôÀð¼ ¿¡û"
 
-#: src/file-manager/fm-icon-text-window.c:81
+#: src/file-manager/fm-icon-text-window.c:82
 msgid "owner"
 msgstr "¯Ã¢§Â¡ý"
 
-#: src/file-manager/fm-icon-text-window.c:82
+#: src/file-manager/fm-icon-text-window.c:83
 msgid "group"
 msgstr "¦¾¡Ì¾¢"
 
-#: src/file-manager/fm-icon-text-window.c:83
+#: src/file-manager/fm-icon-text-window.c:84
 msgid "permissions"
 msgstr "«ÛÁ¾¢¸û"
 
-#: src/file-manager/fm-icon-text-window.c:84
+#: src/file-manager/fm-icon-text-window.c:85
 msgid "octal permissions"
 msgstr "±ñÁ «ÛÁ¾¢¸û"
 
-#: src/file-manager/fm-icon-text-window.c:85
+#: src/file-manager/fm-icon-text-window.c:86
 msgid "MIME type"
 msgstr "±õ.³.±õ.® Ũ¸"
 
-#: src/file-manager/fm-icon-text-window.c:86
+#: src/file-manager/fm-icon-text-window.c:87
 msgid "none"
 msgstr "­ø¨Ä"
 
-#: src/file-manager/fm-icon-text-window.c:261
+#: src/file-manager/fm-icon-text-window.c:263
 msgid "Icon Captions"
 msgstr "ÌÚõÀ¼ò ¾¨ÄôÒ"
 
-#: src/file-manager/fm-icon-text-window.c:268
+#: src/file-manager/fm-icon-text-window.c:271
 msgid ""
 "Choose the order for information to appear beneath icon names. More "
 "information appears as you zoom in closer."
@@ -4064,116 +7489,120 @@ msgstr ""
 "ÌÚõÀ¼í¸ÙìÌì ¸£ú §¾¡ýÚõ ¾¸Åø¸Ç¢ý Å⨺¨Âò §¾÷צºö¸.§ÁÖõ ¾¸Åø¸û ¦À⾡į̀¸Â¢ø "
 "§¾¡ýÚõ."
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:44 src/file-manager/fm-icon-view.c:155
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "_¦À¨Ã즸¡ñÎ"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:13 src/file-manager/fm-icon-view.c:156
+#: src/file-manager/fm-icon-view.c:169
+#: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "ÌÚõÀ¼í¸¨Ç Åâ¸Ç¢ø ¦ÀÂ÷¦¸¡ñÎ Å⨺ôÀÎò¾¢ ¨Å"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:45 src/file-manager/fm-icon-view.c:162
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "_«Ç¨Åì ¦¸¡ñÎ"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:14 src/file-manager/fm-icon-view.c:163
+#: src/file-manager/fm-icon-view.c:176
+#: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "ÌÚõÀ¼í¸¨Ç Åâ¸Ç¢ø «Ç¨Å즸¡ñÎ Å⨺ôÀÎò¾¢ ¨Å"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:46 src/file-manager/fm-icon-view.c:169
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "_Ũ¸¨Â즸¡ñÎ"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:15 src/file-manager/fm-icon-view.c:170
+#: src/file-manager/fm-icon-view.c:183
+#: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "ÌÚõÀ¼í¸¨Ç Åâ¸Ç¢ø Ũ¸¨Â즸¡ñÎ Å⨺ôÀÎò¾¢ ¨Å"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:39 src/file-manager/fm-icon-view.c:176
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "Á¡üÈôÀð¼ _¿¡¨Çì ¦¸¡ñÎ"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:12 src/file-manager/fm-icon-view.c:177
+#: src/file-manager/fm-icon-view.c:190
+#: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "ÌÚõÀ¼í¸¨Ç Åâ¸Ç¢ø Á¡üȢ ¿¡¨Çì ¦¸¡ñÎ Å⨺ôÀÎò¾¢ ¨Å"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:43 src/file-manager/fm-icon-view.c:183
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "_º¢ýÉí¸¨Çì ¦¸¡ñÎ"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:11 src/file-manager/fm-icon-view.c:184
+#: src/file-manager/fm-icon-view.c:197
+#: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "ÌÚõÀ¼í¸¨Ç Åâ¸Ç¢ø º¢ýÉí¸¨Çì ¦¸¡ñÎ Å⨺ôÀÎò¾¢ ¨Å"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:33 src/file-manager/fm-icon-view.c:1201
+#: src/file-manager/fm-icon-view.c:1241
+#: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "ãÄ «Ç׸Ǣø ÌÚõÀ¼í¸¨Ç _Á£ðÀ¢"
 
-#: src/file-manager/fm-icon-view.c:1202
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "ÌÚõÀ¼ò¾¢ý ãÄ «ÇÅ¢¨É _Á£ðÀ¢"
 
-#: src/file-manager/fm-icon-view.c:1414
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "\"%s\" ³î ÍðÊ측ðθ¢ÈÐ"
 
-#: src/file-manager/fm-list-view.c:1911
-#: src/file-manager/fm-search-list-view.c:328
-#: src/nautilus-search-bar-criterion.c:70
+#: src/file-manager/fm-list-view.c:2188
+#: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "«Ç×"
 
-#: src/file-manager/fm-list-view.c:1917
-#: src/file-manager/fm-search-list-view.c:334
-#: src/nautilus-search-bar-criterion.c:69
+#: src/file-manager/fm-list-view.c:2194
+#: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Ũ¸"
 
-#: src/file-manager/fm-list-view.c:1923
-#: src/file-manager/fm-search-list-view.c:340
+#: src/file-manager/fm-list-view.c:2200
+#: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Á¡üÈôÀð¼ ¿¡û"
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:522
 #, c-format
 msgid "%s Properties"
 msgstr "%s ÀñÒ¸û"
 
-#: src/file-manager/fm-properties-window.c:626
+#: src/file-manager/fm-properties-window.c:717
 msgid "Cancel Group Change?"
 msgstr "¦¾¡Ì¾¢ Á¡üÈò¨¾ ÃòÐ ¦ºöÂÅ¡?"
 
-#: src/file-manager/fm-properties-window.c:627
+#: src/file-manager/fm-properties-window.c:718
 msgid "Changing group"
 msgstr "¦¾¡Ì¾¢ Á¡üÈôÀθ¢ÈÐ"
 
-#: src/file-manager/fm-properties-window.c:786
+#: src/file-manager/fm-properties-window.c:879
 msgid "Cancel Owner Change?"
 msgstr "¯Ã¢§Â¡ý Á¡üÈò¨¾ ÃòÐ ¦ºöÂÅ¡?"
 
-#: src/file-manager/fm-properties-window.c:787
+#: src/file-manager/fm-properties-window.c:880
 msgid "Changing owner"
 msgstr "¯Ã¢§Â¡ý Á¡üÈõ"
 
-#: src/file-manager/fm-properties-window.c:946
+#: src/file-manager/fm-properties-window.c:1063
 msgid "nothing"
 msgstr "´ýÚÁ¢ø¨Ä"
 
-#: src/file-manager/fm-properties-window.c:948
+#: src/file-manager/fm-properties-window.c:1065
 msgid "unreadable"
 msgstr "ÀÊì¸ÓÊÂÅ¢ø¨Ä"
 
-#: src/file-manager/fm-properties-window.c:957
+#: src/file-manager/fm-properties-window.c:1074
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 ¯ÕôÀÊ, %s «Ç×¼ý"
 
-#: src/file-manager/fm-properties-window.c:959
+#: src/file-manager/fm-properties-window.c:1076
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d ¯ÕôÀʸû, ¦Á¡ò¾õ %s"
 
-#: src/file-manager/fm-properties-window.c:965
+#: src/file-manager/fm-properties-window.c:1082
 msgid "(some contents unreadable)"
 msgstr "(º¢Ä «¼ì¸í¸¨Ç ÀÊì¸ ÓÊÂÅ¢ø¨Ä"
 
@@ -4182,141 +7611,340 @@ msgstr "(º¢Ä «¼ì¸í¸¨Ç ÀÊì¸ ÓÊÂÅ¢ø¨Ä"
 #. * "Contents:" title to line up with the first line of the 2-line value.
 #. * Maybe there's a better way to do this, but I couldn't think of one.
 #.
-#: src/file-manager/fm-properties-window.c:979
+#: src/file-manager/fm-properties-window.c:1096
 msgid "Contents:"
 msgstr "¯ûǼì¸õ:"
 
-#: src/file-manager/fm-properties-window.c:1121
+#: src/file-manager/fm-properties-window.c:1443
 #, fuzzy
 msgid "Basic"
 msgstr "À¢ýÒ"
 
-#: src/file-manager/fm-properties-window.c:1198
-msgid "Where:"
-msgstr "±í§¸:"
-
-#: src/file-manager/fm-properties-window.c:1200
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Ũ¸"
 
-#: src/file-manager/fm-properties-window.c:1206
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "«Ç×:"
 
-#: src/file-manager/fm-properties-window.c:1213
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "­¨½ôÒò ¦¾¡Ì¾¢"
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
+msgstr "±õ.³.±õ.® Ũ¸:"
+
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "Á¡üÈôÀð¼Ð:"
 
-#: src/file-manager/fm-properties-window.c:1215
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "«Ï¸ôÀð¼Ð:"
 
-#: src/file-manager/fm-properties-window.c:1218
-msgid "MIME type:"
-msgstr "±õ.³.±õ.® Ũ¸:"
+#: src/file-manager/fm-properties-window.c:1552
+msgid "Select Custom Icon..."
+msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1587
-msgid "Special Flags:"
-msgstr "º¢ÈôÒì ¦¸¡Ê¸û:"
+#: src/file-manager/fm-properties-window.c:1558
+#, fuzzy
+msgid "Remove Custom Icon"
+msgstr "¾É¢ôÀÂý ¯ÕÅò¨¾ ¿£_ìÌ"
 
-#: src/file-manager/fm-properties-window.c:1591
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "ÀÂÉ÷ «¨¼Â¡Çò¨¾ «¨Á"
 
-#: src/file-manager/fm-properties-window.c:1595
+#: src/file-manager/fm-properties-window.c:1891
+msgid "Special Flags:"
+msgstr "º¢ÈôÒì ¦¸¡Ê¸û:"
+
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "¦¾¡Ì¾¢ «¨¼Â¡Çò¾¢¨É «¨Á"
 
-#: src/file-manager/fm-properties-window.c:1599
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "´ðÎõ"
 
-#: src/file-manager/fm-properties-window.c:1628
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "«ÛÁ¾¢¸û"
 
-#: src/file-manager/fm-properties-window.c:1634
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "¿£÷ ¯Ã¢§Â¡ý «øÄ, ±É§Å «ÛÁ¾¢¸¨Ç Á¡üÈ ­ÂÄ¡Ð."
 
-#: src/file-manager/fm-properties-window.c:1668
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "§¸¡ôÀ¢ý ¯Ã¢§Â¡ý:"
 
-#: src/file-manager/fm-properties-window.c:1683
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "§¸¡ôÒò ¦¾¡Ì¾¢:"
 
-#: src/file-manager/fm-properties-window.c:1710
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "¯Ã¢§Â¡ý:"
 
-#: src/file-manager/fm-properties-window.c:1714
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "¦¾¡Ì¾¢:"
 
-#: src/file-manager/fm-properties-window.c:1718
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "ÁüȨÅ:"
 
-#: src/file-manager/fm-properties-window.c:1725
+#: src/file-manager/fm-properties-window.c:1989
+msgid "Read"
+msgstr "ÀÊ"
+
+#: src/file-manager/fm-properties-window.c:1993
+msgid "Write"
+msgstr "±ØÐ"
+
+#: src/file-manager/fm-properties-window.c:1997
+msgid "Execute"
+msgstr "¦ºÂøÀÎòÐ"
+
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "¯¨Ãì ¸¡ðº¢:"
 
-#: src/file-manager/fm-properties-window.c:1729
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "±ñ ¸¡ðº¢:"
 
-#: src/file-manager/fm-properties-window.c:1733
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "¸¼º¢Â¢ø Á¡üÈôÀð¼Ð:"
 
-#: src/file-manager/fm-properties-window.c:1737
-msgid "Read"
-msgstr "ÀÊ"
+#: src/file-manager/fm-properties-window.c:2054
+#, c-format
+msgid "The permissions of \"%s\" could not be determined."
+msgstr "\"%s\" ­ý «ÛÁ¾¢¸¨Ç ¿¢÷½Âõ ¦ºöÂÓÊÂÅ¢ø¨Ä"
 
-#: src/file-manager/fm-properties-window.c:1741
-msgid "Write"
-msgstr "±ØÐ"
+#: src/file-manager/fm-properties-window.c:2334
+#, fuzzy
+msgid "Cancel Showing Properties Window?"
+msgstr "ÀñÒ¸û º¡ÇÃò¾¢ø º¢ÈôÒì ¦¸¡Ê¸¨Çì ¸¡ðθ"
 
-#: src/file-manager/fm-properties-window.c:1745
-msgid "Execute"
-msgstr "¦ºÂøÀÎòÐ"
+#: src/file-manager/fm-properties-window.c:2335
+#, fuzzy
+msgid "Creating Properties window"
+msgstr "ÀñÒ¸û º¡ÇÃò¾¢ø º¢ÈôÒì ¦¸¡Ê¸¨Çì ¸¡ðθ"
 
-#: src/file-manager/fm-properties-window.c:1802
+#: src/file-manager/fm-properties-window.c:2435
+#, fuzzy
+msgid "Select an icon:"
+msgstr "¿¢Èõ ´ý¨Èò ¦¾Ã¢× ¦ºö¸:"
+
+#: src/file-manager/fm-search-list-view.c:124
+#, fuzzy
+msgid "Search Results"
+msgstr "«¨ÁôÒ¸¨Çò §¾Î"
+
+#: src/file-manager/fm-search-list-view.c:142
 #, c-format
-msgid "The permissions of \"%s\" could not be determined."
-msgstr "\"%s\" ­ý «ÛÁ¾¢¸¨Ç ¿¢÷½Âõ ¦ºöÂÓÊÂÅ¢ø¨Ä"
+msgid ""
+"Search results may not include items modified after %s, when your drive was "
+"last indexed."
+msgstr ""
 
-#. FIXME: Shoudl be two messages, one for each of whether
+#: src/file-manager/fm-search-list-view.c:158
+msgid ""
+"Sorry, but the Medusa search service is not available because it is not "
+"installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:159
+#: src/file-manager/nautilus-indexing-info.c:407
+#, fuzzy
+msgid "Search Service Not Available"
+msgstr "§¾Îõ §º¨Å ¸¢¨¼Â¡Ð"
+
+#. FIXME bugzilla.eazel.com 5058: Should be two messages, one for each of whether
 #. "slow complete search" turned on or not
-#: src/file-manager/fm-search-list-view.c:129
+#: src/file-manager/fm-search-list-view.c:184
 msgid ""
 "The search you have selected is newer than the index on your system.  The "
 "search will return no results right now.  Would you like to create a new "
 "index now?"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:134
+#: src/file-manager/fm-search-list-view.c:189
 #, fuzzy
 msgid "Search for items that are too new"
 msgstr "§¸¡ôÒ¸¨Ç ¯¨Ã¨Â ¨ÅòÐò §¾Î¸"
 
-#: src/file-manager/fm-search-list-view.c:135
+#: src/file-manager/fm-search-list-view.c:190
 #, fuzzy
 msgid "Create a new index"
 msgstr "ÒÐî º¡ÇÃò¨¾ô À¨¼"
 
-#: src/file-manager/fm-search-list-view.c:136
+#: src/file-manager/fm-search-list-view.c:191
 msgid "Don't create index"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:146
+#: src/file-manager/fm-search-list-view.c:200
+msgid ""
+"Every indexed file on your computer matches the criteria you selected. You "
+"can check the spelling on your selections or add more criteria to narrow "
+"your results."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:204
+#: src/file-manager/fm-search-list-view.c:218
+#, fuzzy
+msgid "Error during search"
+msgstr "¯Ã¢¨Á¡Ǩà «¨Á쨸¢ø À¢¨Æ"
+
+#: src/file-manager/fm-search-list-view.c:213
 #, c-format
 msgid "An error occurred while loading this search's contents: %s"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:322
+#: src/file-manager/fm-search-list-view.c:241
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Find can't access your index right now so a slower search will be performed "
+"that doesn't use the index."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:246
+msgid ""
+"To do a content search, Find requires an index of the files on your system.  "
+"Find can't access your index right now. "
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast searches are not available"
+msgstr "§¾Îõ §º¨Å ¸¢¨¼Â¡Ð"
+
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:319
+#: src/file-manager/fm-search-list-view.c:338
+#, fuzzy
+msgid "Content searches are not available"
+msgstr "§¾Îõ §º¨Å ¸¢¨¼Â¡Ð"
+
+#: src/file-manager/fm-search-list-view.c:254
+msgid ""
+"Your index files are available but the Medusa search daemon, which handles "
+"index requests, isn't running.  To start this program, log in as root and "
+"enter this command at the command line: medusa-searchd"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:274
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Your computer does not have an index right now.  Because Find cannot use an "
+"index, this search may take several minutes.  Would you like to create an "
+"index? Creating an index will be done while you are not actively using your "
+"computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:283
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  Your computer does not have an index right now.  Would you like to "
+"create an index?  Creating an index will be done while you are not actively "
+"using your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:290
+#: src/file-manager/fm-search-list-view.c:318
+#: src/file-manager/fm-search-list-view.c:337
+#, fuzzy
+msgid "Indexed searches are not available"
+msgstr "§¾Îõ §º¨Å ¸¢¨¼Â¡Ð"
+
+#: src/file-manager/fm-search-list-view.c:294
+#, fuzzy
+msgid "Create an Index"
+msgstr "ÒÐî º¡ÇÃò¨¾ô À¨¼"
+
+#: src/file-manager/fm-search-list-view.c:295
+#, fuzzy
+msgid "Don't Create an Index Now"
+msgstr "ÒÐî º¡ÇÃò¨¾ô À¨¼"
+
+#: src/file-manager/fm-search-list-view.c:306
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Your computer is currently creating that index.   Because Find cannot use an "
+"index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:312
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  Your computer is currently creating that index.  Content searches "
+"will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:326
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  An "
+"index can't be created right now. When an index is not available, searches "
+"will take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:332
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  An index can't be created right now."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:341
+msgid ""
+"The program that creates an index is not set up correctly.  You can create "
+"an index by hand by running \"medusa-indexd\" as root on the command line."
+msgstr ""
+
+#. It is not necessary to translate this text just yet; it has not been
+#. edited yet, and will be replaced by a final copy in a few days.
+#: src/file-manager/fm-search-list-view.c:360
+#: src/file-manager/nautilus-indexing-info.c:342
+msgid ""
+"To do a fast search, Find requires an index of the files on your system. "
+"Your system administrator has disabled fast search on your computer, so no "
+"index is available."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:364
+msgid "Fast searches are not available on your computer"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:373
+#: src/file-manager/nautilus-indexing-info.c:361
+msgid ""
+"To do a fast search, Find requires an index of the files on your system. "
+"Fast search is disabled in your Search preferences, so no index is available."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:376
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
+msgid "Fast searches are not available on your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:377
+#: src/file-manager/nautilus-indexing-info.c:366
+msgid ""
+"To enable fast search, open the Preferences menu and choose Preferences. "
+"Then select Search preferences and put a checkmark in the Enable Fast Search "
+"checkbox. An index will be generated while your computer is idle, so your "
+"index won't be available immediately."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:551
 msgid "Where"
 msgstr "±í§¸"
 
@@ -4325,8 +7953,8 @@ msgstr "±í§¸"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: po/tmp/nautilus-search-list-view-ui.xml.h:12
-#: src/file-manager/fm-search-list-view.c:374
+#: src/file-manager/fm-search-list-view.c:603
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "´Õ Ò¾¢Â º¡ÇÃò¾¢ø _¦ÅÇ¢ôÀÎòÐ "
 
@@ -4336,508 +7964,621 @@ msgstr "´Õ Ò¾¢Â º¡ÇÃò¾¢ø _¦ÅÇ¢ôÀÎòÐ "
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:382
+#: src/file-manager/fm-search-list-view.c:611
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "%d Ò¾¢Â º¡ÇÃí¸Ç¢ø _¦ÅÇ¢ôÀÎòÐ"
 
+#. Note that the number of items actually displayed varies somewhat due
+#. * to the way files are collected in batches. So you can't assume that
+#. * no more than the constant limit are displayed.
 #.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: po/tmp/nautilus-desktop-icon-view-ui.xml.h:7
+#: src/file-manager/fm-search-list-view.c:723
+msgid ""
+"Nautilus found more search results than it can display. Some matching items "
+"will not be displayed. "
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:725
+msgid "Too Many Matches"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:1
 msgid "Change Desktop Background"
 msgstr "¸½¢§Á¨ºô À¢ýɽ¢¨Â Á¡üÚ"
 
-#: po/tmp/nautilus-desktop-icon-view-ui.xml.h:8
-#: po/tmp/nautilus-directory-view-ui.xml.h:14
-msgid "Delete all items in the trash"
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#, fuzzy
+msgid "Delete all items in the Trash"
 msgstr "¦¾¡ðÊ¢ø ¯ûÇ ±øÄ¡ ¯ÕôÀʸ¨ÇÔõ «Æ¢"
 
-#: po/tmp/nautilus-desktop-icon-view-ui.xml.h:9
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
 msgid "Disks"
 msgstr "Åðθû"
 
-#: po/tmp/nautilus-desktop-icon-view-ui.xml.h:11
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:5
 msgid "Mount or unmount disks"
 msgstr ""
 
-#: po/tmp/nautilus-desktop-icon-view-ui.xml.h:12
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:6
 msgid "New Terminal"
 msgstr "Ò¾¢Â Ó¨ÉÂõ"
 
-#: po/tmp/nautilus-desktop-icon-view-ui.xml.h:13
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:7
 #, fuzzy
 msgid "Open a new GNOME terminal window"
 msgstr "´ù¦Å¡Õ ¯ÕôÀʨÂÔõ ´Õ Ò¾¢Â º¡ÇÃò¾¢ø ¾¢Èì¸×õ"
 
-#: po/tmp/nautilus-desktop-icon-view-ui.xml.h:14
-#, fuzzy
-msgid "Quit Nautilus Desktop"
-msgstr "¿¡ÊĨº Å¢ðÎ ¦ÅÇ¢§ÂÚ."
-
-#: po/tmp/nautilus-desktop-icon-view-ui.xml.h:15
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:8
 msgid "Remove any custom pattern or color from the desktop background"
 msgstr ""
 
-#: po/tmp/nautilus-desktop-icon-view-ui.xml.h:16
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
 msgid "Reset Desktop Background"
 msgstr "¸½¢§Á¨ºô À¢ýɽ¢ ¿¢¨Ä Á£ðÎ"
 
-#: po/tmp/nautilus-desktop-icon-view-ui.xml.h:17
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:10
 msgid ""
 "Show a window that lets you set your desktop background's pattern or color"
 msgstr ""
 
-#: po/tmp/nautilus-desktop-icon-view-ui.xml.h:18
-msgid "Stop letting Nautilus draw the desktop"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: po/tmp/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:1
 msgid "Choose a program with which to open the selected item"
 msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ¯ÕôÀʨÂò ¾¢È츧ÅñÊ ¿¢Ã¨Äò §¾÷ó¦¾Î"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:2
 msgid "Choose another application with which to open the selected item"
 msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ¯ÕôÀʨÂò ¾¢È츧ÅñÊ ­ý¦É¡Õ ÀÂýÀ¡ð¨¼ §¾÷ó¦¾Î"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:3
 msgid "Choose another viewer with which to view the selected item"
 msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ¯ÕôÀʨÂì ¸¡½ ­ý¦É¡Õ ¸¡ðʨÂò §¾÷ó¦¾Î"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:4
 #, fuzzy
-msgid "Create Link"
-msgstr "­¨½ô¨Àô À¨¼"
+msgid "Copy Files"
+msgstr "§¸¡ôÒ¸û ¿¸Ä¡ì¸õ"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
 msgid "Create a new empty folder inside this folder"
 msgstr "´Õ Ò¾¢Â «¨¼¨Åô À¨¼"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "§¾÷ó¦¾Îì¸ôÀð¼ ´ù¦Å¡Õ ¯ÕôÀÊìÌõ ´Õ «¨¼Â¡Ç ­¨½ô¨Àô À¨¼"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u §¸¡ôÒ¸û"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ¯ÕôÀʸ¨Çò ¦¾¡ðÊìÌû ¿¸÷òÐ"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 #, fuzzy
 msgid "Duplicate"
 msgstr "_¿¸¦ÄÎ"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "§¾÷ó¦¾Îì¸ôÀð¼ ´ù¦Å¡Õ ¯ÕôÀʨÂÔõ ¿¸ø ±Î"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 #, fuzzy
-msgid "Move each selected item to the trash"
+msgid "Make Link"
+msgstr "­¨½ô¨Àô À¨¼"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#, fuzzy
+msgid "Move each selected item to the Trash"
 msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ¯ÕôÀʸ¨Çò ¦¾¡ðÊìÌû ¿¸÷òÐ"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 #, fuzzy
 msgid "Move to Trash"
 msgstr "_¦¾¡ðÊìÌ ¿¸÷òÐ"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "Ò¾¢Â «¨¼×"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:22
-#, fuzzy
-msgid "New _Folder"
-msgstr "Ò¾¢Â «¨¼×"
-
-#: po/tmp/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 #, fuzzy
 msgid "Open"
 msgstr "¾¢È"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#, fuzzy
+msgid "Open Wit_h"
+msgstr "­¨¾ì ¦¸¡ñÎ ¾¢È"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "­¨¾ì ¦¸¡ñÎ ¾¢È"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ¯ÕôÀʸ¨Ç ´Õ Ò¾¢Â º¡ÇÃò¾¢ø ¾¢È"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in New Window"
 msgstr "_Ò¾¢Â º¡ÇÃò¾¢ø ¾¢È"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ¯ÕôÀʸ¨Ç ­ó¾ º¡ÇÃò¾¢ø ¾¢È"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "§ÅÚ ÀÂýÀ¡Î"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "­¾Ã ¸¡ðÊ..."
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 #, fuzzy
-msgid "Other _Application..."
-msgstr "§ÅÚ ÀÂýÀ¡Î"
+msgid "Paste Files"
+msgstr "¯¨Ãì §¸¡ôÒ¸û"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:31
-#, fuzzy
-msgid "Other _Viewer..."
-msgstr "­¾Ã ¸¡ðÊ..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 #, fuzzy
 msgid "Remove Custom Images"
 msgstr "¾É¢ôÀÂý ¯ÕÅí¸¨Ç ¿£_ìÌ"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 #, fuzzy
 msgid "Remove any custom images from selected icons"
 msgstr "§¾÷ó¦¾Îì¸ôÀð¼ ´ù¦Å¡Õ ÌÚõÀ¼ò¾¢Ä¢ÕóÐõ ¾É¢ôÀÂý ¯ÕÅò¨¾ ¿£ì̸"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr ""
 
 #. add the reset background item, possibly disabled
-#: po/tmp/nautilus-directory-view-ui.xml.h:36 src/nautilus-sidebar.c:446
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "À¢ýɽ¢¨Â ¿¢¨Ä Á£ðÎ"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+msgid "Scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 #, fuzzy
 msgid "Select All Files"
 msgstr "±øÄ¡ì §¸¡ôÒ¸¨ÇÔõ ¦¾Ã¢×¦ºö"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#, fuzzy
+msgid "Select _All Files"
+msgstr "±øÄ¡ì §¸¡ôÒ¸¨ÇÔõ ¦¾Ã¢×¦ºö"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "­ó¾ º¡ÇÃò¾¢ø ¯ûÇ ±øÄ¡ ¯ÕôÀʨÇÔõ §¾÷ó¦¾Î"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #, fuzzy
 msgid "Show Properties"
 msgstr "_ÀñÒ¸¨Çì ¸¡ðÎ"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 #, fuzzy
 msgid "Show Trash"
 msgstr "Ìô¨Àò ¦¾¡ðÊ"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "_ÀñÒ¸¨Çì ¸¡ðÎ"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 #, fuzzy
-msgid "Show the contents of the trash"
+msgid "Show the contents of the Trash"
 msgstr "¦À¡ÕǼì¸ò¨¾î º¡¾¡Ã½Á¡É «ÇŢɢø ¸¡ðÎ"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 #, fuzzy
 msgid "View or modify the properties of each selected item"
 msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ¯ÕôÀʸǢý ÀñÒ¸¨Çô À¡÷ «øÄÐ Á¡üÚ"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "_¿¸¦ÄÎ"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+msgid "_New Folder"
+msgstr "ÒÐ «¨¼×"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "¾¢È"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 #, fuzzy
-msgid "_Open in New Window"
-msgstr "_Ò¾¢Â º¡ÇÃò¾¢ø ¾¢È"
+msgid "_Paste Files"
+msgstr "_¯¨Ã ´ðÎ"
 
-#: po/tmp/nautilus-directory-view-ui.xml.h:48
-msgid "_Select All Files"
-msgstr "±øÄ¡ì §¸¡ôÒ¸¨ÇÔõ ¦¾Ã¢×¦ºö"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
+#, fuzzy
+msgid "_Show Trash"
+msgstr "Ìô¨Àò ¦¾¡ðÊ"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: po/tmp/nautilus-icon-view-ui.xml.h:7
+#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#, fuzzy
+msgid "By Emblems"
+msgstr "_º¢ýÉí¸¨Çì ¦¸¡ñÎ"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:2
+#, fuzzy
+msgid "By Modification Date"
+msgstr "Á¡üÈôÀð¼ _¿¡¨Çì ¦¸¡ñÎ"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:3
+#, fuzzy
+msgid "By Modification _Date"
+msgstr "Á¡üÈôÀð¼ _¿¡¨Çì ¦¸¡ñÎ"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:4
+#, fuzzy
+msgid "By Name"
+msgstr "_¦À¨Ã즸¡ñÎ"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:5
+#, fuzzy
+msgid "By Size"
+msgstr "_«Ç¨Åì ¦¸¡ñÎ"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:6
+#, fuzzy
+msgid "By Type"
+msgstr "_Ũ¸¨Â즸¡ñÎ"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:7
+#, fuzzy
+msgid "By _Emblems"
+msgstr "_º¢ýÉí¸¨Çì ¦¸¡ñÎ"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:8
+#, fuzzy
+msgid "By _Name"
+msgstr "_¦À¨Ã즸¡ñÎ"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:9
+#, fuzzy
+msgid "By _Size"
+msgstr "_«Ç¨Åì ¦¸¡ñÎ"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:10
+#, fuzzy
+msgid "By _Type"
+msgstr "_Ũ¸¨Â즸¡ñÎ"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:11
 msgid "Choose which information appears beneath each icon's name"
 msgstr "´ù¦Å¡Õ ÌÚõÀ¼ò¾¢ý ¸£Øõ ±ýÉ ¾¸Åø §¾¡ýȧÅñÎõ ±ýÀ¨¾ò ¦¾Ã¢× ¦ºö"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:8
+#: src/file-manager/nautilus-icon-view-ui.xml.h:12
 #, fuzzy
 msgid "Clean Up by Name"
 msgstr "¦À¨Ãì ¦¸¡ñÎ _Íò¾õ ¦ºö"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:9
+#: src/file-manager/nautilus-icon-view-ui.xml.h:13
 msgid "Display icons in the opposite order"
 msgstr "§¿÷ ±¾¢÷ Å⨺¢ø ÌÚõÀ¼í¸¨Çì ¸¡ðÎ"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:10
+#: src/file-manager/nautilus-icon-view-ui.xml.h:14
 #, fuzzy
 msgid "Icon Captions..."
 msgstr "_ÌÚõÀ¼ò¾¢ý ¾¨ÄôÒ¸û..."
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:16
+#: src/file-manager/nautilus-icon-view-ui.xml.h:20
 #, fuzzy
-msgid "Lay out items"
+msgid "Lay Out Items"
 msgstr "¯ÕôÀʸǢý «¨ÁôÒ"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:17
+#: src/file-manager/nautilus-icon-view-ui.xml.h:21
 msgid "Leave icons wherever they are dropped"
 msgstr "ÌÚõÀ¼í¸¨Ç ±í§¸ §À¡¼ôÀð¼É§Å¡ ,«ó¾ ­¼ò¾¢§Ä§Â Å¢Î"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:18
+#: src/file-manager/nautilus-icon-view-ui.xml.h:22
 msgid "Make the selected icon stretchable"
 msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ÌÚõÀ¼ò¨¾ ­Øì¸ÓÊÔõÀÊî ¦ºö"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:19
+#: src/file-manager/nautilus-icon-view-ui.xml.h:23
+#, fuzzy
+msgid "Manually"
+msgstr "_¨¸Ó¨È¡¸"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:24
 msgid "Re_versed Order"
 msgstr "§¿_¦Ã¾¢÷ Å⨺ôÀÎòÐ"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:21
+#: src/file-manager/nautilus-icon-view-ui.xml.h:26
 #, fuzzy
 msgid "Rename selected icon"
 msgstr "§¾÷× ¦ºöÂôÀð¼ ¯ÕôÀʨÂô ¦ÀÂ÷Á¡üÚ"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:22
+#: src/file-manager/nautilus-icon-view-ui.xml.h:27
 msgid "Reposition icons to better fit in the window and avoid overlapping"
 msgstr ""
 "ÌÚõÀ¼í¸¨Çî º¡ÇÃò¾¢Ûû ¿ýÌ ¦À¡ÕóÐÁ¡Úõ, ´ýÈý Á£Ð ´ýÚ ­øÄ¡¾Å¡Úõ ­¼Á¡üÚî ¦ºö"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:23
+#: src/file-manager/nautilus-icon-view-ui.xml.h:28
 #, fuzzy
 msgid "Restore Icons' Original Sizes"
 msgstr "ãÄ «Ç׸Ǣø ÌÚõÀ¼í¸¨Ç _Á£ðÀ¢"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:24
+#: src/file-manager/nautilus-icon-view-ui.xml.h:29
 msgid "Restore each selected icon to its original size"
 msgstr "§¾÷ó¦¾Îò¾ ´ù¦Å¡Õ ÌÚõÀ¼ò¨¾Ôõ ãÄ «Ç×ìÌ Á£ðÀ¢"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:25
+#: src/file-manager/nautilus-icon-view-ui.xml.h:30
 #, fuzzy
 msgid "Reversed Order"
 msgstr "§¿_¦Ã¾¢÷ Å⨺ôÀÎòÐ"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:26
+#: src/file-manager/nautilus-icon-view-ui.xml.h:31
 #, fuzzy
 msgid "Stretch Icon"
 msgstr "ÌÚõÀ¼ò¨¾ _­Ø"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:27
+#: src/file-manager/nautilus-icon-view-ui.xml.h:32
 #, fuzzy
 msgid "Tighter Layout"
 msgstr "­Úì¸Á¡É «¨Áô¨Àô _ÀÂýÀÎòÐ"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:28
+#: src/file-manager/nautilus-icon-view-ui.xml.h:33
 msgid "Toggle using a tighter layout scheme"
 msgstr "­Úì¸À¡É ¯ûǨÁ ¾¢ð¼Ó¨È¨Âô ÀÂýÀÎò¾¢, ¿¢¨ÄÁ¡üÚ"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:29
+#: src/file-manager/nautilus-icon-view-ui.xml.h:34
 msgid "_Clean Up by Name"
 msgstr "¦À¨Ãì ¦¸¡ñÎ _Íò¾õ ¦ºö"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:30
+#: src/file-manager/nautilus-icon-view-ui.xml.h:35
 msgid "_Icon Captions..."
 msgstr "_ÌÚõÀ¼ò¾¢ý ¾¨ÄôÒ¸û..."
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:31
-msgid "_Lay out items"
+#: src/file-manager/nautilus-icon-view-ui.xml.h:36
+#, fuzzy
+msgid "_Lay Out Items"
 msgstr "¯ÕôÀʸǢý «¨ÁôÒ"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:32
+#: src/file-manager/nautilus-icon-view-ui.xml.h:37
+#, fuzzy
+msgid "_Manually"
+msgstr "_¨¸Ó¨È¡¸"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:38
 msgid "_Rename"
 msgstr "_¦ÀÂ÷ Á¡üÚ"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:34
+#: src/file-manager/nautilus-icon-view-ui.xml.h:40
 msgid "_Stretch Icon"
 msgstr "ÌÚõÀ¼ò¨¾ _­Ø"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:35
+#: src/file-manager/nautilus-icon-view-ui.xml.h:41
 #, fuzzy
 msgid "_Tighter Layout"
 msgstr "­Úì¸Á¡É «¨Áô¨Àô _ÀÂýÀÎòÐ"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:36
-msgid "_manually"
-msgstr "_¨¸Ó¨È¡¸"
+#: src/file-manager/nautilus-indexing-info.c:85
+msgid "Indexing is %d%% complete."
+msgstr ""
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:37
-#, fuzzy
-msgid "by Emblems"
-msgstr "_º¢ýÉí¸¨Çì ¦¸¡ñÎ"
+#: src/file-manager/nautilus-indexing-info.c:175
+msgid "The indexer is currently busy."
+msgstr ""
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:38
-#, fuzzy
-msgid "by Modification Date"
-msgstr "Á¡üÈôÀð¼ _¿¡¨Çì ¦¸¡ñÎ"
+#: src/file-manager/nautilus-indexing-info.c:180
+msgid ""
+"An indexer is not running, or is not responding to requests to reindex your "
+"computer."
+msgstr ""
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:40
-#, fuzzy
-msgid "by Name"
-msgstr "_¦À¨Ã즸¡ñÎ"
+#: src/file-manager/nautilus-indexing-info.c:185
+msgid ""
+"An attempt to reindex, caused an Internal Indexer Error.  Tell "
+"rebecka@eazel.com"
+msgstr ""
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:41
+#: src/file-manager/nautilus-indexing-info.c:194
 #, fuzzy
-msgid "by Size"
-msgstr "_«Ç¨Åì ¦¸¡ñÎ"
+msgid "Reindexing Failed"
+msgstr "¸¡ðº¢ §¾¡üÈÐ"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:42
+#: src/file-manager/nautilus-indexing-info.c:216
 #, fuzzy
-msgid "by Type"
-msgstr "_Ũ¸¨Â즸¡ñÎ"
+msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast. If you need to update your index now, click on the \"Update Now\" "
+"button."
+msgstr ""
+"¿¡û§¾¡Úõ ´ÕÓ¨È ¯í¸û §¸¡ôÒ¸Ùõ ÁüÚõ ¯¨Ã¸Óõ Íð¼¡ì¸ô Àð¼Ð ±É§Å \n"
+"¯ÁÐ §¾Îõ À½¢ «¾¢§Å¸Á¡¸ ¿¨¼¦ÀÚõ. ¯ÁÐ ÍðʨÉô ­ô§À¡Ð ÒÐôÀ¢ì¸\n"
+"\"­ô¦À¡ØÐ ÒÐôÀ¢\" ±ýÈ ¦À¡ò¾¡É¢ý Á£Ð ¸¢Ç¢ì ¦ºöÂ×õ\n"
 
-#: po/tmp/nautilus-icon-view-ui.xml.h:47
+#: src/file-manager/nautilus-indexing-info.c:219
+#: src/file-manager/nautilus-indexing-info.c:226
+#: src/file-manager/nautilus-indexing-info.c:281
 #, fuzzy
-msgid "manually"
-msgstr "_¨¸Ó¨È¡¸"
-
-#: src/file-manager/nautilus-indexing-info.c:106
-msgid "Busy"
-msgstr "À½¢Â¢ø"
-
-#: src/file-manager/nautilus-indexing-info.c:109
-msgid "No response"
-msgstr "Å¢¨¼ ­ø¨Ä"
-
-#: src/file-manager/nautilus-indexing-info.c:112
-msgid "No indexer present"
-msgstr "Íð¼ý ­ø¨Ä"
-
-#: src/file-manager/nautilus-indexing-info.c:120
-#, c-format
-msgid "Error while trying to reindex: %s"
-msgstr "ÁÚÍð¼ø ÓÂüº¢ ¦ºö¨¸Â¢ø À¢¨Æ:%s"
+msgid "Indexing Status"
+msgstr "¿¢¨Äô À𨼨Âì ¸¡ñÀ¢"
 
-#: src/file-manager/nautilus-indexing-info.c:163
-msgid "%I:%M %p, %x"
-msgstr "%I:%M %p, %x"
+#. FIXME: Do we want to talk about the index not being available?
+#: src/file-manager/nautilus-indexing-info.c:224
+#, fuzzy
+msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast. "
+msgstr ""
+"¿¡û§¾¡Úõ ´ÕÓ¨È ¯í¸û §¸¡ôÒ¸Ùõ ÁüÚõ ¯¨Ã¸Óõ Íð¼¡ì¸ô Àð¼Ð ±É§Å \n"
+"¯ÁÐ §¾Îõ À½¢ «¾¢§Å¸Á¡¸ ¿¨¼¦ÀÚõ. ¯ÁÐ ÍðʨÉô ­ô§À¡Ð ÒÐôÀ¢ì¸\n"
+"\"­ô¦À¡ØÐ ÒÐôÀ¢\" ±ýÈ ¦À¡ò¾¡É¢ý Á£Ð ¸¢Ç¢ì ¦ºöÂ×õ\n"
 
-#: src/file-manager/nautilus-indexing-info.c:179
+#: src/file-manager/nautilus-indexing-info.c:236
 #, c-format
 msgid "Your files were last indexed at %s"
 msgstr "¯õ §¸¡ôÒ¸û ¸¨¼º¢Â¢ø Íð¼¡ì¸ôÀð¼Ð %s"
 
-#: src/file-manager/nautilus-indexing-info.c:190
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "­ô§À¡Ð ÒÐôÀ¢"
 
-#: src/file-manager/nautilus-indexing-info.c:210
-msgid "Your files are currently being indexed:"
-msgstr "¯ÁÐ §¸¡ôÒ¸û Íð¼¡ì¸ôÀθ¢ÈÐ:"
-
-#: src/file-manager/nautilus-indexing-info.c:276
-msgid "Search service not available"
-msgstr "§¾Îõ §º¨Å ¸¢¨¼Â¡Ð"
-
-#: src/file-manager/nautilus-indexing-info.c:288
-msgid "Indexing Info..."
-msgstr "Íð¼ø ¾¸Åø¸û..."
-
-#: src/file-manager/nautilus-indexing-info.c:301
+#: src/file-manager/nautilus-indexing-info.c:279
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so\n"
-"your searches are fast.  If you need to update your index\n"
-"now, click on the \"Update Now\" button for the\n"
-"appropriate index.\n"
+"Once a day your files and text content are indexed so your searches are "
+"fast.  Your files are currently being indexed."
 msgstr ""
 "¿¡û§¾¡Úõ ´ÕÓ¨È ¯í¸û §¸¡ôÒ¸Ùõ ÁüÚõ ¯¨Ã¸Óõ Íð¼¡ì¸ô Àð¼Ð ±É§Å \n"
 "¯ÁÐ §¾Îõ À½¢ «¾¢§Å¸Á¡¸ ¿¨¼¦ÀÚõ. ¯ÁÐ ÍðʨÉô ­ô§À¡Ð ÒÐôÀ¢ì¸\n"
 "\"­ô¦À¡ØÐ ÒÐôÀ¢\" ±ýÈ ¦À¡ò¾¡É¢ý Á£Ð ¸¢Ç¢ì ¦ºöÂ×õ\n"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: po/tmp/nautilus-search-list-view-ui.xml.h:7
+#: src/file-manager/nautilus-indexing-info.c:406
+#, fuzzy
+msgid "Sorry, but the medusa search service is not available."
+msgstr "§¾Îõ §º¨Å ¸¢¨¼Â¡Ð"
+
+#: src/file-manager/nautilus-indexing-info.c:428
+msgid "%I:%M %p, %x"
+msgstr "%I:%M %p, %x"
+
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:1
 msgid "Reveal each selected item in its original folder"
 msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ´ù¦Å¡Õ ¯ÕôÀʨÂÔõ ¦ÅÇ¢ôÀÎòÐ"
 
-#: po/tmp/nautilus-search-list-view-ui.xml.h:8
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:2
 #, fuzzy
 msgid "Reveal in New Window"
 msgstr "´Õ Ò¾¢Â º¡ÇÃò¾¢ø _¦ÅÇ¢ôÀÎòÐ "
 
-#: po/tmp/nautilus-search-list-view-ui.xml.h:9
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:3
 #, fuzzy
 msgid "Show Indexing Status"
 msgstr "¿¢¨Äô À𨼨Âì ¸¡ñÀ¢"
 
-#: po/tmp/nautilus-search-list-view-ui.xml.h:10
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:4
 #, fuzzy
 msgid "Show _Indexing Status"
 msgstr "¿¢¨Äô À𨼨Âì ¸¡ñÀ¢"
 
-#: po/tmp/nautilus-search-list-view-ui.xml.h:11
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:5
 msgid "Show status of indexing used when searching"
 msgstr ""
 
-#. set the window title
-#: src/nautilus-about.c:139
+#. set the window title and standard close key accelerator
+#: src/nautilus-about.c:141
 msgid "About Nautilus"
 msgstr "¿¡ÊÄŠ ÀüÈ¢"
 
 #. draw the authors title
-#: src/nautilus-about.c:355
+#: src/nautilus-about.c:361
 msgid "Authors"
 msgstr ""
 
-#: src/nautilus-application.c:234
-msgid "User Directory"
-msgstr "ÀÂÉ÷ «¨¼×"
+#: src/nautilus-application.c:275
+#, fuzzy
+msgid "Couldn't Create Required Folder"
+msgstr "«¨¼Å¢¨Éô ÀÊì¸ ÓÊÂÅ¢ø¨Ä"
 
-#: src/nautilus-application.c:239
-msgid "User Main Directory"
-msgstr "ÀÂÉ÷ Ó¾ý¨Á «¨¼×"
+#: src/nautilus-application.c:276
+#, c-format
+msgid ""
+"Nautilus could not create the required folder \"%s\". Before running "
+"Nautilus, please create this folder, or set permissions such that Nautilus "
+"can create it."
+msgstr ""
 
-#: src/nautilus-application.c:244
-msgid "Desktop Directory"
-msgstr "¸½¢§Á¨º «¨¼×"
+#: src/nautilus-application.c:281
+#, fuzzy
+msgid "Couldn't Create Required Folders"
+msgstr "«¨¼Å¢¨Éô ÀÊì¸ ÓÊÂÅ¢ø¨Ä"
 
-#: src/nautilus-application.c:259
-msgid "Missing Directories"
-msgstr "¸¡½¡¾ «¨¼×¸û"
+#: src/nautilus-application.c:282
+#, c-format
+msgid ""
+"Nautilus could not create the following required folders:\n"
+"\n"
+"%s\n"
+"\n"
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
+msgstr ""
 
 #. Can't register myself due to trouble locating the
-#. * nautilus.oafinfo file. This has happened when you
+#. * Nautilus_Shell.oaf file. This has happened when you
 #. * launch Nautilus with an LD_LIBRARY_PATH that
 #. * doesn't include the directory containg the oaf
 #. * library. It could also happen if the
-#. * nautilus.oafinfo file was not present for some
+#. * Nautilus_Shell.oaf file was not present for some
 #. * reason. Sometimes killing oafd and gconfd fixes
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:358
+#: src/nautilus-application.c:407
 msgid ""
-"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
-"again may fix the problem."
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again."
 msgstr ""
-"¿¡ÊÄŠ ³ ­ô§À¡Ð ÀÂýÀÎò¾ ÓÊ¡Ð. ¸½¢É¢¨Â ÁÚÓ¨È ¦¾¡¼ì¸õ ¦ºöЫøÄÐ ¿¡ÊÄŠ ³ ¿¢ÚÅ¢ "
-"«¾ý ãÄõ À¢Ã¨ÉìÌ ¾£÷× ¸¡ñ¸."
 
 #. FIXME bugzilla.eazel.com 2536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:362
+#: src/nautilus-application.c:413
+#, fuzzy
 msgid ""
-"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
-"again may fix the problem.\n"
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again.\n"
+"\n"
+"OAF couldn't locate the Nautilus_shell.oaf file. One cause of this seems to "
+"be an LD_LIBRARY_PATH that does not include the oaf library's directory. "
+"Another possible cause would be bad install with a missing "
+"Nautilus_Shell.oaf file.\n"
 "\n"
-"OAF couldn't locate the nautilus.oafinfo file. One cause of this seems to be "
-"an LD_LIBRARY_PATH that does not include the oaf library's directory. "
-"Another possible cause would be bad install with a missing nautilus.oafinfo "
-"file.\n"
+"Running \"nautilus-clean.sh -x\" will kill all OAF and GConf processes, "
+"which may be needed by other applications.\n"
 "\n"
 "Sometimes killing oafd and gconfd fixes the problem, but we don't know why.\n"
 "\n"
-"We need a much less confusing message here for Nautilus 1.0."
+"We have also seen this error when a faulty version of oaf was installed."
 msgstr ""
 "¿¡ÊÄŠ ³ ­ô§À¡Ð ÀÂýÀÎò¾ ÓÊ¡Ð. ¸½¢É¢¨Â ÁÚÓ¨È ¦¾¡¼ì¸õ ¦ºöЫøÄÐ ¿¡ÊÄŠ ³ ¿¢ÚÅ¢ "
 "«¾ý ãÄõ À¢Ã¨ÉìÌ ¾£÷× ¸¡ñ¸.\n"
@@ -4859,11 +8600,12 @@ msgstr ""
 #. * wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:387 src/nautilus-application.c:405
+#: src/nautilus-application.c:444 src/nautilus-application.c:462
+#: src/nautilus-application.c:469
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "±¾¢÷À¡Ã¡¾ À¢¨Æ¡ø , ¿¡ÊÄŠ ³ ­ô§À¡Ð ÀÂýÀÎò¾ ÓÊ¡Ð."
 
-#: src/nautilus-application.c:388
+#: src/nautilus-application.c:445
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
 "attempting to register the file manager view server."
@@ -4871,17 +8613,30 @@ msgstr ""
 "§¸¡ôÒ §ÁÄ¡ñ¨Áì ¸¡ðº¢î §º¨Å¸ò¨¾ô À¾¢× ¦ºö ÓüÀÎõ §À¡Ð OAF -ø ²üÀð¼ "
 "À¢¨Æ¿¡ÊĨ…  ­ô§À¡Ð ÀÂýÀÎò¾ ÓÊ¡Ð"
 
-#: src/nautilus-application.c:406
+#: src/nautilus-application.c:463
+#, fuzzy
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
-"attempting to locate the factory."
+"attempting to locate the factory.Killing oafd and restarting Nautilus may "
+"help fix the problem."
 msgstr ""
 "¦¾¡Æ¢üº¡¨Ä ¯ûÇ ­¼ò¨¾ ¸ñÎÀ¢Êì¸ ÓüÀÎõ §À¡Ð OAF -ø ²üÀð¼ À¢¨Æ¿¡ÊĨ…  ­ô§À¡Ð "
 "ÀÂýÀÎò¾ ÓÊ¡Ð"
 
-#: src/nautilus-application.c:547
+#: src/nautilus-application.c:470
+#, fuzzy
+msgid ""
+"Nautilus can't be used now, due to an unexpected error from OAF when "
+"attempting to locate the shell object. Killing oafd and restarting Nautilus "
+"may help fix the problem."
+msgstr ""
+"¦¾¡Æ¢üº¡¨Ä ¯ûÇ ­¼ò¨¾ ¸ñÎÀ¢Êì¸ ÓüÀÎõ §À¡Ð OAF -ø ²üÀð¼ À¢¨Æ¿¡ÊĨ…  ­ô§À¡Ð "
+"ÀÂýÀÎò¾ ÓÊ¡Ð"
+
+#: src/nautilus-application.c:635
+#, fuzzy
 msgid ""
-"You are running Nautilus as root.\n"
+"You are about to run Nautilus as root.\n"
 "\n"
 "As root, you can damage your system if you are not careful, and\n"
 "Nautilus will not stop you from doing it."
@@ -4892,24 +8647,39 @@ msgstr ""
 "²üÀÎò¾ìÜÎõ, §ÁÖõ\n"
 "«ôÀʦºöž¢Ä¢ÕóÐ ¿¡ÊÄŠ ¯í¸¨Ç ¿¢Úò¾¡Ð."
 
-#: src/nautilus-bookmarks-window.c:125
+#: src/nautilus-bookmarks-window.c:127
 msgid "Bookmarks"
 msgstr "Òò¾¸ «¨¼Â¡Çõ"
 
-#: src/nautilus-bookmarks-window.c:174
+#: src/nautilus-bookmarks-window.c:177
 msgid "Location"
 msgstr "­¼õ"
 
-#: src/nautilus-bookmarks-window.c:187 src/nautilus-window-menus.c:789
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "¿£ìÌ"
 
-#: src/nautilus-first-time-druid.c:158
+#: src/nautilus-complex-search-bar.c:233
+#, fuzzy
+msgid "More Options"
+msgstr "ÌÚõÀ¼ò ¾¨ÄôÒ"
+
+#: src/nautilus-complex-search-bar.c:243
+msgid "Fewer Options"
+msgstr ""
+
+#. Create button first so we can use it for auto_click
+#: src/nautilus-complex-search-bar.c:261 src/nautilus-simple-search-bar.c:129
+msgid "Find Them!"
+msgstr "«Åü¨Èì ¸ñÎÀ¢Ê!"
+
+#: src/nautilus-first-time-druid.c:191
+#, fuzzy
 msgid ""
-"Existence of this file indicates that the Nautilus configuration wizard\n"
+"Existence of this file indicates that the Nautilus configuration druid\n"
 "has been presented.\n"
 "\n"
-"You can manually erase this file to present the wizard again.\n"
+"You can manually erase this file to present the druid again.\n"
 "\n"
 msgstr ""
 "­ì§¸¡ôÒ ¯ûǦ¾É¢ý «Ð Nautilus ÅÊÅ¡ì¸õ Á¡Â¡Å¢ìÌ «Ç¢ì¸ôÀð¼Ð.\n"
@@ -4918,397 +8688,472 @@ msgstr ""
 "¿£÷ ¨¸Ó¨È¢ø ­ì§¸¡ôÀ¢¨É «Æ¢òÐô À¢ý Á¡Â¡Å¢ìÌ ÁÚÓ¨È «Ç¢ì¸Ä¡õ.\n"
 "\n"
 
-#: src/nautilus-first-time-druid.c:409
+#: src/nautilus-first-time-druid.c:487
 #, fuzzy
 msgid ""
-"User levels provide a way to adjust the software to your\n"
-"level of technical expertise. Pick an initial level that you\n"
-"feel comfortable with; you can always change it later."
+"Your user level adjusts Nautilus to your degree of experience\n"
+"using GNOME and Linux. Choose a level that's comfortable for\n"
+"you - you can always change it later."
 msgstr ""
 "¯ÁÐ ¦¾¡Æ¢ø ÑÏì¸ ÅøĨÁ ¿¢¨ÄìÌ ²üÀ ¦Áý¸Ä¨Éî ºÃ¢ ¦ºöÂ\n"
 "ÀÂÉ÷ ¿¢¨Ä¸û  ÅÆ¢ÅÌ츢ýÈÉ. ¯í¸ÙìÌ º×¸Ã¢ÂÁ¡É ¿¢¨Ä¨Âò §¾÷ó¦¾Îì¸×õ; \n"
 "¿£í¸û ­¾¨Éô À¢üÀ¡Î ±ô§À¡Ð §ÅñÎÁ¡É¡Öõ Á¡üÈ¢¦¸¡ûÇÄ¡õ."
 
-#: src/nautilus-first-time-druid.c:422
+#: src/nautilus-first-time-druid.c:498
 msgid ""
-"For beginner users that are not yet\n"
-"familiar with the working of GNOME and Linux."
+"For users who have no previous experience with GNOME\n"
+"and Linux."
 msgstr ""
-"̧ɡõ ÁüÚõ Ä¢É캢ø ­ýÛõ \n"
-"ÀâîºÂÁ¢øÄ¡¾ ¬ÃõÀ ¿¢¨Äô ÀÂÉ÷¸ÙìÌ."
 
-#: src/nautilus-first-time-druid.c:429
+#: src/nautilus-first-time-druid.c:504
+#, fuzzy
 msgid ""
-"For non-technical users that are comfortable with\n"
-"their GNOME and Linux environment."
+"For users who are comfortable with GNOME and Linux,\n"
+"but don't describe themselves as ``technical.''"
 msgstr ""
 "̧ɡõ ÁüÚõ Ä¢ÉìŠ Ýú¿¢¨Ä¢ø  ͸ÓÚõ, ¸½¢É¢ ÑÏì¸õ\n"
 "«È¢Â¡ô ÀÂÉ÷¸ÙìÌ."
 
-#: src/nautilus-first-time-druid.c:435
-msgid ""
-"For users that have the need to be exposed\n"
-"to every detail of their operating system."
-msgstr "­Âì¸ «¨ÁôÀ¢ý ´ù¦Å¡Õ Å¢ÅÃò¨¾Ôõ «È¢Â §ÅñÊ ÀÂÉ÷¸ÙìÌ ÁðÎõ"
-
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:470
+#: src/nautilus-first-time-druid.c:510
 #, fuzzy
 msgid ""
-"Eazel offers a growing number of services to help you\n"
-"install and maintain new software and manage your files\n"
-"across the network.  Choose an option below, and the\n"
-"information will be presented in Nautilus after you've\n"
-"finished setting up."
-msgstr ""
-"®ƒø, Ò¾¢Â ¦Áý¦À¡Õ¨Ç ¿¢ÚÅ ÁüÚõ ¯í¸û §¸¡ôÒ¸¨Ç ŨÄ¢ø ÀáÁâòÐ\n"
-" ¯¾Å ÅÇ÷óÐ ÅÕõ ÀüÀÄ §º¨Å¸¨Ç ¯í¸ÙìÌ ÅÆí̸¢ÈÐ.\n"
-"®ƒÄ¢ý §º¨Å¸¨Çô ÀüÈ¢ §ÁÖõ ¸¡½ Å¢ÕõÀ¢É¡ø '«ÎòÐ' ±ýÈ ¦À¡ò¾¡¨É \n"
-"«Øò¾×õ. "
-
-#: src/nautilus-first-time-druid.c:478
-msgid "Eazel Services"
-msgstr "®ƒø §º¨Å¸û"
-
-#: src/nautilus-first-time-druid.c:487
-msgid "I want to learn more about Eazel services."
-msgstr "¿¡ý ®ƒø §º¨Å¸¨ÇôÀüÈ¢ §ÁÖõ «È¢Â Å¢ÕõÒ¸¢§Èý"
-
-#: src/nautilus-first-time-druid.c:489
-msgid "I want to sign up for Eazel services now."
-msgstr "®ƒø §º¨Å¸Ç¢ø  §ºÃ Å¢ÕõÒ¸¢§Èý."
-
-#: src/nautilus-first-time-druid.c:491
-msgid "I've already signed up and want to login now."
-msgstr "¿¡ý Óý§À §º÷óÐÅ¢ð§¼ý ÁüÚõ ѨÆÀ¾¢× ¦ºö ŢÕõÒ¸¢§Èý"
-
-#: src/nautilus-first-time-druid.c:493
-msgid "I don't want to learn about Eazel services at this time."
-msgstr "®ƒø §º¨Å¸û ÀüÈ¢ ¦¾Ã¢óÐ ¦¸¡ûÇ ­ô§À¡Ð Å¢ÕõÀÅ¢ø¨Ä"
+"For users who have GNOME and Linux experience, and\n"
+"like to see every detail of the operating system."
+msgstr "­Âì¸ «¨ÁôÀ¢ý ´ù¦Å¡Õ Å¢ÅÃò¨¾Ôõ «È¢Â §ÅñÊ ÀÂÉ÷¸ÙìÌ ÁðÎõ"
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:520
+#: src/nautilus-first-time-druid.c:548
 msgid ""
-"Nautilus will now contact Eazel services to verify your \n"
-"web connection and download the latest updates.  \n"
-"Click the Next button to continue."
+"To verify your Internet connection and make sure you have\n"
+"the latest Nautilus updates, Nautilus will now connect to\n"
+"Eazel's web site. This will take seconds if your copy of\n"
+"Nautilus is recent; longer (but no more than a minute or two)\n"
+"if you need an update.\n"
+"\n"
+"If you know your computer uses a proxy connection, click\n"
+"Verify and Nautilus will use it.\n"
 msgstr ""
-"¯ÁÐ  Å¨Ä ­¨½ô¨Àî ºÃ¢À¡÷òÐ ºÁ£Àò¾¢ø ÒÐôÀ¢ò¾¨Å¸¨Ç ­ÈìÌÁ¾¢ ¦ºö \n"
-" ¿¡ÊÄŠ ­ô§À¡Ð ®ƒø §º¨Å¸Ù¼ý ¦¾¡¼÷Ò ¦¸¡ûÙõ\n"
-" §Á§Ä ¦¾¡¼÷ó¾¢¼,  «ÎòÐ ±ýÈ ¦À¡ò¾¡¨É ¸¢Ç¢ì ¦ºöÂ×õ."
 
-#: src/nautilus-first-time-druid.c:524
-msgid "Updating Nautilus"
-msgstr "¿¡ÊÄŠ ÒÐôÀ¢ò¾ø"
-
-#: src/nautilus-first-time-druid.c:532
-msgid "Yes, verify my web connection and update Nautilus now."
+#: src/nautilus-first-time-druid.c:562
+#, fuzzy
+msgid "Verify my connection and check for updates"
 msgstr "¬õ, ±ÉÐ ­¨½ô¨Àî ºÃ¢À¡÷òÐ ¿¡ÊĨ…ô ÒÐôÀ¢ì¸×õ."
 
-#: src/nautilus-first-time-druid.c:533
-msgid "No, I don't wish to connect and update Nautilus now."
-msgstr "­ø¨Ä,  ŨÄ¢ø ­¨½óÐ ,¿¡ÊĨ…ô ÒÐì¸ ¿¡ý Å¢ÕõÀÅ¢ø¨Ä."
+#: src/nautilus-first-time-druid.c:563
+msgid "Don't verify my connection or check for updates"
+msgstr ""
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:564
+#: src/nautilus-first-time-druid.c:628
+#, fuzzy
 msgid ""
-"We are having troubles making an external web connection.  \n"
-"Sometimes, firewalls require you to specify a web proxy server.  \n"
-" Fill in the name of port of your proxy server, if any, below."
+"We are having trouble making an external web connection.\n"
+"Sometimes, firewalls require you to specify a web proxy server.\n"
+"Fill in the name or port of your proxy server, if any, below."
 msgstr ""
 "¦ÅÇ¢Ôĸ Å¨Ä ­¨½ô¨Àô¦ÀÚž¢ø ¿ÁìÌ º¢ÃÁõ ²üÀðÎûÇÐ. \n"
 "º¢Ä §¿Ãí¸Ç¢ø, ¿£í¸û Å¨Ä Å¢¨¼î§º¨Å¸ò¨¾ì ÌÈ¢ôÀ¢ÎŨ¾ ¾£îÍÅ÷¸û §Åñθ¢ýÈÉ. \n"
 "Å¢¨¼î§º¨Å¸ò ШÈ¢ý ¦À¨à , «ôÀÊ ´ýÚ ­ÕôÀ¢ý, ¸£§Æ ¿¢ÃôÒ¸. "
 
-#: src/nautilus-first-time-druid.c:568
-msgid "HTTP Proxy Configuration"
-msgstr "±î.Ê.Ê.À¢ Å¢¨¼ ÅÊŨÁôÒ"
-
-#: src/nautilus-first-time-druid.c:580
+#: src/nautilus-first-time-druid.c:640
 msgid "No proxy server required."
 msgstr "Å¢¨¼î§º¨Å¸õ §¾¨Å¢ø¨Ä"
 
-#: src/nautilus-first-time-druid.c:581
+#: src/nautilus-first-time-druid.c:641
 msgid "Use this proxy server:"
 msgstr "­ó¾ Å¢¨¼î§º¨Å¸ò¨¾ô ÀÂý¦ºö¸"
 
 #. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:606
+#: src/nautilus-first-time-druid.c:666
 msgid "Proxy address:"
 msgstr "Å¢¨¼¦ÀÚõ Ó¸Åâ:"
 
-#. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:623
-msgid "Port:"
-msgstr "ШÈ:"
-
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:654
-msgid ""
-"We are now contacting the Eazel service to test your \n"
-"web connection and update Nautilus."
+#: src/nautilus-first-time-druid.c:728
+msgid "Verifying your Internet connection and checking for updates..."
 msgstr ""
-"¯ÁÐ Å¨Ä ­¨½ô¨Àô À⧺¡¾¨É ¦ºöÐ À¢ýÒ ¿¡ÊĨ…ô ÒÐôÀ¢ì¸ \n"
-"­ô§À¡Ð ¿¡õ ®ƒø §º¨ÅÔ¼ý ¦¾¡¼÷Ò ¦¸¡û¸¢§È¡õ."
 
-#: src/nautilus-first-time-druid.c:659
+#: src/nautilus-first-time-druid.c:736
 msgid "Downloading Nautilus updates..."
 msgstr "¿¡ÊÄ…¢ý Ò¾¢Â¨Å ­ÈìÌÁ¾¢Â¡¸¢ÈÐ..."
 
-#: src/nautilus-first-time-druid.c:760
+#: src/nautilus-first-time-druid.c:906
+msgid ""
+"If you have been using the GNOME Midnight Commander\n"
+"these settings move your desktop icons to Nautilus and\n"
+"make Nautilus the default desktop.\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:913
+#, fuzzy
+msgid "Use Nautilus to draw the desktop."
+msgstr "¸½¢§Á¨º §Áø Ìô¨À ­¼õ¦ÀÈ §ÅñÎõ."
+
+#: src/nautilus-first-time-druid.c:919
+msgid "Move existing desktop icons to the Nautilus desktop."
+msgstr ""
+
+#. This option is currently disabled, per bugzilla.eazel.com 7557
+#: src/nautilus-first-time-druid.c:927
+msgid "Launch Nautilus when GNOME starts up."
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:967
+msgid ""
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties.  The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+"Fast search requires that the cron daemon on your system be running.\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:972
+msgid ""
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties. The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:981
+msgid "Enable fast search"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:982
+msgid "Turn fast search on when cron is enabled"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1027
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"currently can't be performed because the program crond, which does\n"
+"nightly tasks on your computer, is turned off. To make sure fast searches\n"
+"can be done, turn crond on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands \n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1035
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"may not be performed because the program crond, which does nightly tasks\n"
+"on your computer, may be turned off. To make sure fast searches can be\n"
+"done, check to make sure that crond is turned on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands\n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1122
+msgid ""
+"Click Finish to launch Nautilus. You'll start with two\n"
+"Nautilus windows: one shows your home folder, and the\n"
+"other tells you about Eazel's services that make the life\n"
+"of a Linux user easier.\n"
+"\n"
+"We hope you enjoy Nautilus!"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1129
+msgid ""
+"Click Finish to launch Nautilus. You'll start with a\n"
+"window showing your home folder.\n"
+"\n"
+"We hope you enjoy Nautilus!"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:1153
 #, fuzzy
 msgid "Nautilus First Time Setup"
 msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ §¾÷ó¦¾ÎôÀ¡ý"
 
-#. make the title label
-#: src/nautilus-first-time-druid.c:789
-msgid "Welcome to Nautilus!"
+#: src/nautilus-first-time-druid.c:1183
+#, fuzzy
+msgid "Welcome to Nautilus"
 msgstr "¿¡ÊÄÍìÌ ¿øÅÃ×!"
 
-#: src/nautilus-first-time-druid.c:797
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
-"Since this is the first time that you've launched\n"
-"Nautilus, we'd like to ask you a few questions\n"
-"to help personalize it for your use."
+"Nautilus...\n"
+"    Is a great file manager for the GNOME desktop.\n"
+"    Provides a simple intuitive way to access Internet services.\n"
+"    Is an extensible framework for GNOME developers.\n"
+"    Provides a powerful delivery platform for service providers.\n"
+"\n"
+"Click Next to begin customizing your Nautilus environment."
 msgstr ""
-"¿£í¸û ¿¡ÊĨºò ¦¾¡¼ìÌÅÐ ­Ð§Å Ó¾ýӨȡž¡ø\n"
-"¯í¸ÙìÌô ÀÂýÀÎõ ¦À¡ÕðÎ , ¾ýÅÆ¢ôÀÎò¾¢ ¯¾Å¢¼ º¢Ä §¸ûÅ¢¸û §¸ð¸¢§È¡õ."
-
-#: src/nautilus-first-time-druid.c:802
-msgid "Press the next button to continue."
-msgstr "§Á§Ä ¦¾¡¼Ã, «ÎòÐ ±ýÈ ¦À¡ò¾¡¨É «Øò¾×õ."
 
 #. set up the final page
-#: src/nautilus-first-time-druid.c:810
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "ÓÊó¾Ð"
 
-#: src/nautilus-first-time-druid.c:817
-msgid ""
-"Click the finish button to launch Nautilus.\n"
-"We hope that you enjoy using it!"
-msgstr ""
-"¿¡ÊĨºò ¦¾¡¼í¸, \"ÓÊó¾Ð\" ±ýÈ ¦À¡ò¾¡¨Éì ¸¢Ç¢ì ¦ºöÂ×õ.\n"
-"¿£í¸û ­¾¨É ¯À§Â¡¸¢òÐ Á¸¢ú×ÚÅ£÷¸û ±É ¿õÒ¸¢§È¡õ!"
-
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:823
-msgid "Select A User Level"
+#: src/nautilus-first-time-druid.c:1209
+#, fuzzy
+msgid "Choose Your User Level"
 msgstr "ÀÂÉ÷ ¿¢¨Ä¨Âò ¦¾Ã¢× ¦ºö¸"
 
-#. set up the service sign-up page
-#: src/nautilus-first-time-druid.c:827
-msgid "Sign Up for Eazel Services"
-msgstr "®ƒø §º¨Å¢ø §º÷ó¾¢Î¸"
+#. set up the GMC transition page
+#: src/nautilus-first-time-druid.c:1213
+msgid "GMC to Nautilus Transition"
+msgstr ""
+
+#. set up the `Launch Medusa' page
+#: src/nautilus-first-time-druid.c:1217
+#, fuzzy
+msgid "Fast Searches"
+msgstr "§¾Î"
+
+#. set up optional page to tell the user how to run cron
+#: src/nautilus-first-time-druid.c:1225
+msgid "The Cron Daemon"
+msgstr ""
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:831
-msgid "Nautilus Update"
-msgstr "¿¡ÊÄŠ ÒÐôÀ¢ò¾ø"
+#: src/nautilus-first-time-druid.c:1230
+msgid "Checking Your Internet Connection"
+msgstr ""
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:839
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "¿¡ÊøŠ Ó¾¢ôÀ¢ì¸ôÀθ¢ÈÐ..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:847
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "Å¨Ä Å¢¨¼î (§º¨Å¸) ÅÊŨÁ×"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:922
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "ÒÐôÀ¢ò¾ø ÌÈ¢Ó¨È ¿£ì¸ôÀθ¢ÈÐ..."
 
-#: src/nautilus-first-time-druid.c:939
-msgid "Update Completed... Press Next to Continue."
+#: src/nautilus-first-time-druid.c:1341
+#, fuzzy
+msgid "Update Complete. Click Next to Continue."
+msgstr "ÒÐôÀ¢ò¾ø ÓüÚõ... ¦¾¡¼Ã '«ÎòÐ'  ±ýÀ¨¾ «Øò¾×õ"
+
+#. The update file couldn't be loaded because it
+#. * doesn't exist. Arlo and I (jsh) and decided that the
+#. * best thing to do is silently fail
+#.
+#: src/nautilus-first-time-druid.c:1356
+#, fuzzy
+msgid "No Update Available... Press Next to Continue."
 msgstr "ÒÐôÀ¢ò¾ø ÓüÚõ... ¦¾¡¼Ã '«ÎòÐ'  ±ýÀ¨¾ «Øò¾×õ"
 
 #. set the window title
-#: src/nautilus-link-set-window.c:191
+#: src/nautilus-link-set-window.c:189
 msgid "Link sets"
 msgstr "­¨½ôÒò ¦¾¡Ì¾¢"
 
 #. add a descriptive label
-#: src/nautilus-link-set-window.c:203
+#: src/nautilus-link-set-window.c:202
 msgid "Add or remove sets of links by clicking on the checkboxes below."
 msgstr "¸£ú측Ïõ ÌÚìÌô¦Àðʸ¨Ç ¸¢Ç¢ì ¦ºöÐ ­¨½ôÒò ¦¾¡Ì¾¢¸¨Ç §º÷ì¸ «øÄÐ ¿£ì̸"
 
-#: src/nautilus-location-bar.c:134
+#: src/nautilus-location-bar.c:63
+#, fuzzy
+msgid "Go To:"
+msgstr "  ¦ºø¸:"
+
+#: src/nautilus-location-bar.c:153
 #, c-format
 msgid "Do you want to view these %d locations in separate windows?"
 msgstr "­ó¾ %d ­¼í¸¨Çò ¾É¢ º¡ÇÃò¾¢ø ¸¡½ ¯í¸ÙìÌ Å¢ÕôÀÁ¡?"
 
-#: src/nautilus-location-bar.c:141
+#: src/nautilus-location-bar.c:160
 msgid "View in Multiple Windows?"
 msgstr "ÀüÀÄ º¡ÇÃí¸Ç¢ø ¸¡½ø"
 
-#: src/nautilus-location-bar.c:449 src/nautilus-location-bar.c:592
-msgid "Location:"
-msgstr "­¼õ:"
+#: src/nautilus-main.c:145
+#, fuzzy
+msgid "Perform a quick set of self-check tests."
+msgstr "«¾¢ §Å¸ Í ºÃ¢À¡÷ôÒî §º¡¾¨É¸¨Ç ¿¼òи"
 
-#: src/nautilus-location-bar.c:594
-msgid "   Go To:"
-msgstr "  ¦ºø¸:"
+#: src/nautilus-main.c:148
+msgid "Create the initial window with the given geometry."
+msgstr ""
 
-#: src/nautilus-main.c:140
-msgid "Perform high-speed self-check tests."
-msgstr "«¾¢ §Å¸ Í ºÃ¢À¡÷ôÒî §º¡¾¨É¸¨Ç ¿¼òи"
+#: src/nautilus-main.c:148
+msgid "GEOMETRY"
+msgstr ""
+
+#: src/nautilus-main.c:150
+msgid "Only create windows for explicitly specified URIs."
+msgstr ""
 
-#: src/nautilus-main.c:142
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "¿¡ÊĨº Å¢ðÎ ¦ÅÇ¢§ÂÚ."
 
-#: src/nautilus-main.c:143
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "ÁÚÓ¨È ¿¡ÊĨºò ¦¾¡¼íÌ"
 
-#: src/nautilus-main.c:144
-msgid "Don't draw background and icons on desktop."
-msgstr "¸½¢§Á¨º Á£Ð ÌÚõÀ¼í¸¨ÇÔõ À¢ýɽ¢¨ÂÔõ ŨÃÂü¸"
-
-#: src/nautilus-main.c:145
-msgid "Draw background and icons on desktop."
-msgstr "¸½¢§Á¨º Á£Ð À¢ýɽ¢¨ÂÔõ ÌÚõÀ¼í¸¨ÇÔõ Ũø."
-
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "¿¡ÊÄŠ:-À⧺¡¾¨É¨Â Ô.¬÷.³ Ô¼ý ÀÂý ¦ºö ÓÊ¡Ð.\n"
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "¿¡ÊÄŠ: --À⧺¡¾¨É¨Â ­¾Ã Å¢ÕôÀí¸Ù¼ý ÀÂý ¦ºöÂÓÊ¡Ð.\n"
 
-#: src/nautilus-main.c:204
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "¿¡ÊÄŠ: --¦ÅÇ¢§ÂüÈò¨¾ Ô.¬÷.³ Ô¼ý ÀÂý ¦ºö ÓÊ¡Ð.\n"
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "¿¡ÊÄŠ: --ÁÚ¦¾¡¼í¸ø Ô.¬÷.³ Ô¼ý ÀÂý ¦ºö ÓÊ¡Ð.\n"
 
-#: src/nautilus-main.c:212
-msgid "nautilus: --quit and --start-desktop cannot be used together.\n"
-msgstr "¿¡ÊÄŠ:-¦ÅÇ¢§Â ÁüÚõ --¸½¢§Á¨ºò ¦¾¡¼í¸ø ­½óÐ ÀÂý ¦ºö ÓÊ¡Ð.\n"
-
-#: src/nautilus-main.c:216
-msgid "nautilus: --restart and --start-desktop cannot be used together.\n"
-msgstr "¿¡ÊÄŠ: --ÁÚ¦¾¡¼ì¸õ ÁüÚõ --¸½¢§Á¨ºò ¦¾¡¼í¸ø ­½óÐ ÀÂý ¦ºö ÓÊ¡Ð.\n"
-
-#: src/nautilus-main.c:220
-msgid "nautilus: --stop-desktop and --start-desktop cannot be used together.\n"
-msgstr "¿¡ÊÄŠ:-¸½¢§Á¨º ¿¢Úò¾õ --ÁÚ¦¾¡¼ì¸õ  ­½óÐ ÀÂý ¦ºö ÓÊ¡Ð.\n"
+#: src/nautilus-main.c:225
+#, fuzzy
+msgid "nautilus: --geometry cannot be used with more than one URI.\n"
+msgstr "¿¡ÊÄŠ: --ÁÚ¦¾¡¼í¸ø Ô.¬÷.³ Ô¼ý ÀÂý ¦ºö ÓÊ¡Ð.\n"
 
-#. set the title
-#: src/nautilus-property-browser.c:252
-msgid "Customization Options"
-msgstr "¾É¢ôÀÂÉ¡ì¸ Å¢ÕôÀí¸û"
+#. set the title and standard close accelerator
+#: src/nautilus-property-browser.c:265
+#, fuzzy
+msgid "Backgrounds and Emblems"
+msgstr "À¢ýɽ¢¨Â ¿¢¨Ä Á£ðÎ"
 
-#. add the title label
-#: src/nautilus-property-browser.c:321 src/nautilus-property-browser.c:2072
-msgid "Select A Category:"
-msgstr "´Õ À¢Ã¢×¾¨Éò ¦¾Ã¢× ¦ºö¸:"
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:362 src/nautilus-theme-selector.c:267
+#, fuzzy
+msgid "  Done  "
+msgstr "ÓÊó¾Ð"
 
-#: src/nautilus-property-browser.c:368
-msgid "Add new..."
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:373
+#, fuzzy
+msgid "  Add new...  "
 msgstr "Ò¾¢Â¦¾¡ý¨Èî §º÷..."
 
-#: src/nautilus-property-browser.c:382
-msgid "Remove..."
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:388
+#, fuzzy
+msgid "  Remove...  "
 msgstr "¿£ìÌ..."
 
-#: src/nautilus-property-browser.c:875
-#, c-format
-msgid "Sorry, but background %s couldn't be deleted."
+#: src/nautilus-property-browser.c:879
+#, fuzzy, c-format
+msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "ÁýÉ¢ì¸×õ, ¬Â¢ý À¢ýɽ¢ %s ³ «Æ¢ì¸ ÓÊ¡Ð."
 
-#: src/nautilus-property-browser.c:876 src/nautilus-property-browser.c:905
-msgid "Couldn't delete background"
+#: src/nautilus-property-browser.c:880 src/nautilus-property-browser.c:909
+#, fuzzy
+msgid "Couldn't delete pattern"
 msgstr "À¢ýɽ¢¨Â «Æ¢ì¸ ÓÊ¡Ð"
 
-#: src/nautilus-property-browser.c:904
+#: src/nautilus-property-browser.c:908
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "ÁýÉ¢ì¸×õ, %s º¢ýÉò¨¾ «Æ¢ì¸ ÓÊ¡Ð."
 
-#: src/nautilus-property-browser.c:978 src/nautilus-property-browser.c:1115
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
-msgstr "ÁýÉ¢ì¸×õ, ¬É¡ø '%s' ´Õ ¯ÕÅõ «øÄ!"
-
-#: src/nautilus-property-browser.c:1005
+#: src/nautilus-property-browser.c:944
 msgid "Create a New Emblem:"
 msgstr "Ò¾¢Â º¢ýÉõ ´ý¨ÈôÀ¨¼:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:1010
+#: src/nautilus-property-browser.c:949
 msgid "Keyword:"
 msgstr "º¡Å¢î¦º¡ø:"
 
-#. set up a gnome file entry to pick the image file
-#: src/nautilus-property-browser.c:1027
+#. set up a gnome icon entry to pick the image file
+#: src/nautilus-property-browser.c:962
+msgid "Image:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:966
 msgid "Select an image file for the new emblem:"
 msgstr "Ò¾¢Â º¢ýÉò¾¢üÌ , ¯ÕÅì §¸¡ôÒ  ´ý¨Èò ¦¾Ã¢× ¦ºö"
 
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:993
 #, fuzzy
 msgid "Create a New Color:"
 msgstr "Ò¾¢Â º¢ýÉõ ´ý¨ÈôÀ¨¼:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1059
+#: src/nautilus-property-browser.c:998
 msgid "Color name:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1009
 msgid "Color value:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1144
-#, c-format
-msgid "Sorry, but the background %s couldn't be installed."
-msgstr "ÁýÉ¢ì¸×õ, ¬Â¢ý À¢ýɽ¢ %s ¨Â ¿¢ÚÅ ÓÊ¡Ð"
+#: src/nautilus-property-browser.c:1045
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a valid file name."
+msgstr "ÁýÉ¢ì¸×õ, ¬Â¢ý %s ´Õ ºÃ¢Â¡É ±ñ½ì¸Õ «¨¼ÅøÄ."
+
+#: src/nautilus-property-browser.c:1047
+#, fuzzy
+msgid "Sorry, but you did not supply a valid file name."
+msgstr "ÁýÉ¢ì¸×õ, ¬Â¢ý %s ´Õ ºÃ¢Â¡É ±ñ½ì¸Õ «¨¼ÅøÄ."
+
+#: src/nautilus-property-browser.c:1049 src/nautilus-property-browser.c:1092
+#, fuzzy
+msgid "Couldn't install pattern"
+msgstr "±ñ½ì¸Õ¨Å ¿¢ÚÅÓÊÂÅ¢ø¨Ä"
+
+#: src/nautilus-property-browser.c:1060
+msgid "Sorry, but you can't replace the reset image."
+msgstr ""
 
-#: src/nautilus-property-browser.c:1145
-msgid "Couldn't install background"
-msgstr "À¢ýɽ¢¨Â ¿¢ÚÅ ÓÊ¡Ð"
+#: src/nautilus-property-browser.c:1091
+#, fuzzy, c-format
+msgid "Sorry, but the pattern %s couldn't be installed."
+msgstr "ÁýÉ¢ì¸×õ, %s ±ñ½ì¸Õ¨Å ¿¢ÚÅ ÓÊÂÅ¢ø¨Ä"
 
-#: src/nautilus-property-browser.c:1170
-msgid "Select an image file to add as a background:"
+#: src/nautilus-property-browser.c:1114
+#, fuzzy
+msgid "Select an image file to add as a pattern:"
 msgstr "§º÷ì¸ §ÅñÊ ´Õ À¢ýɽ¢ ¯ÕÅì §¸¡ôÀ¢¨Éò  ¦¾Ã¢× ¦ºö¸:"
 
-#: src/nautilus-property-browser.c:1240
+#: src/nautilus-property-browser.c:1173
 #, fuzzy
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "ÁýÉ¢ì¸×õ, ¬Â¢ý ¿£í¸û Ò¾¢Â º¢ýÉò¾¢üÌ ´Õ º¡Å¢î¦º¡ø¨Äì ÌÈ¢ôÀ¢¼ §ÅñÎõ."
 
-#: src/nautilus-property-browser.c:1241
+#: src/nautilus-property-browser.c:1174
 #, fuzzy
 msgid "Couldn't install color"
 msgstr "º¢ýÉò¨¾ ¿¢ÚÅ ÓÊÂÅ¢ø¨Ä"
 
-#: src/nautilus-property-browser.c:1298
+#: src/nautilus-property-browser.c:1230
 msgid "Select a color to add:"
 msgstr "¿¢Èõ ´ý¨Èò ¦¾Ã¢× ¦ºö¸:"
 
-#: src/nautilus-property-browser.c:1377
+#: src/nautilus-property-browser.c:1311
+#, c-format
+msgid "Sorry, but '%s' is not a usable image file!"
+msgstr "ÁýÉ¢ì¸×õ, ¬É¡ø '%s' ´Õ ¯ÕÅõ «øÄ!"
+
+#: src/nautilus-property-browser.c:1329
 #, fuzzy
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "ÁýÉ¢ì¸×õ, ¬Â¢ý ¿£í¸û Ò¾¢Â º¢ýÉò¾¢üÌ ´Õ º¡Å¢î¦º¡ø¨Äì ÌÈ¢ôÀ¢¼ §ÅñÎõ."
 
-#: src/nautilus-property-browser.c:1378 src/nautilus-property-browser.c:1381
-#: src/nautilus-property-browser.c:1385 src/nautilus-property-browser.c:1414
+#: src/nautilus-property-browser.c:1330 src/nautilus-property-browser.c:1333
+#: src/nautilus-property-browser.c:1337 src/nautilus-property-browser.c:1366
 msgid "Couldn't install emblem"
 msgstr "º¢ýÉò¨¾ ¿¢ÚÅ ÓÊÂÅ¢ø¨Ä"
 
-#: src/nautilus-property-browser.c:1380
+#: src/nautilus-property-browser.c:1332
 #, fuzzy
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "ÁýÉ¢ì¸×õ, %s º¢ýÉò¨¾ «Æ¢ì¸ ÓÊ¡Ð."
 
-#: src/nautilus-property-browser.c:1383
+#: src/nautilus-property-browser.c:1335
 #, fuzzy, c-format
 msgid ""
 "Sorry, but \"%s\" is an existing keyword.  Please choose a different name "
@@ -5317,640 +9162,792 @@ msgstr ""
 "­ó¾ ¦ÀÂ÷ \"%s\" Óý§À ­ó¾ «¨¼Å¢ø ¯À§Â¡¸ò¾¢ø ¯ûÇÐ.\n"
 "¾Â× ¦ºöÐ §Å¦È¡Õ ¦À¨à ¯À§Â¡¸¢ì¸×õ."
 
-#: src/nautilus-property-browser.c:1413
+#: src/nautilus-property-browser.c:1365
 #, c-format
 msgid "Sorry, but the image at %s couldn't be installed as an emblem."
 msgstr "ÁýÉ¢ì¸×õ, ¬Â¢ý %s ­ø ¯ûÇ ¯ÕÅò¨¾î º¢ýÉÁ¡¸ ¿¢ÚÅ ÓÊ¡Ð."
 
-#: src/nautilus-property-browser.c:2080 src/nautilus-theme-selector.c:481
+#: src/nautilus-property-browser.c:2024
+msgid "Select A Category:"
+msgstr "´Õ À¢Ã¢×¾¨Éò ¦¾Ã¢× ¦ºö¸:"
+
+#: src/nautilus-property-browser.c:2032 src/nautilus-theme-selector.c:497
 msgid "Cancel Remove"
 msgstr "¿£ì̾¨Ä ÃòÐ ¦ºö"
 
-#: src/nautilus-property-browser.c:2084
-msgid "Add a new background"
-msgstr "Ò¾¢Â À¢ýɽ¢¨Âî §º÷:"
+#: src/nautilus-property-browser.c:2037
+msgid "  Add a New Pattern  "
+msgstr ""
 
-#: src/nautilus-property-browser.c:2087
-msgid "Add a new color"
+#: src/nautilus-property-browser.c:2040
+#, fuzzy
+msgid "  Add a New Color  "
 msgstr "Ò¾¢Â ¿¢Èò¨¾î §º÷"
 
-#: src/nautilus-property-browser.c:2090
-msgid "Add a new emblem"
+#: src/nautilus-property-browser.c:2043
+#, fuzzy
+msgid "  Add a New Emblem  "
 msgstr "Ò¾¢Â º¢ýÉò¨¾î §º÷"
 
-#: src/nautilus-property-browser.c:2120
-msgid "Click on a background to remove it"
-msgstr "¿£ì¸ §ÅñÎÁ¡Â¢ý À¢ýɽ¢Â¢ø ¸¢Ç¢ì ¦ºöÂ×õ"
+#: src/nautilus-property-browser.c:2066
+#, fuzzy
+msgid "Click on a pattern to remove it"
+msgstr "±ñ½ì¸Õ¨Å ¿£ì¸ «¾ý §Áø ¸¢Ç¢ì ¦ºö¸"
 
-#: src/nautilus-property-browser.c:2123
+#: src/nautilus-property-browser.c:2069
 msgid "Click on a color to remove it"
 msgstr "¿£ì¸ §ÅñÊ ¿¢Èò¾¢ý Á£Ð ¸¢Ç¢ì ¦ºöÂ×õ"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2072
 msgid "Click on an emblem to remove it"
 msgstr "¿£ì¸ §ÅñÊ º¢ýÉò¾¢ý Á£Ð ¸¢Ç¢ì ¦ºöÂ×õ"
 
-#: src/nautilus-property-browser.c:2154
-msgid "Remove a background"
+#: src/nautilus-property-browser.c:2081
+#, fuzzy
+msgid "Patterns:"
+msgstr "ÁüȨÅ:"
+
+#: src/nautilus-property-browser.c:2084
+#, fuzzy
+msgid "Colors:"
+msgstr "ãÎ"
+
+#: src/nautilus-property-browser.c:2087
+#, fuzzy
+msgid "Emblems:"
+msgstr "º¢ýÉí¸û"
+
+#: src/nautilus-property-browser.c:2106
+#, fuzzy
+msgid "  Remove a Pattern  "
 msgstr "À¢ýɽ¢¨Â ¿£ì̸"
 
-#: src/nautilus-property-browser.c:2157
-msgid "Remove a color"
+#: src/nautilus-property-browser.c:2109
+#, fuzzy
+msgid "  Remove a Color  "
 msgstr "¿¢Èò¨¾ ¿£ì̸"
 
-#: src/nautilus-property-browser.c:2160
-msgid "Remove an emblem"
+#: src/nautilus-property-browser.c:2112
+#, fuzzy
+msgid "  Remove an Emblem  "
 msgstr "º¢ýÉò¨¾ ¿£ì̸"
 
-#: src/nautilus-search-bar-criterion.c:68
-msgid "Content"
-msgstr "¦À¡Õû «¼ì¸õ"
+#. Menu item in the search bar.
+#. Bracketed items are context, and are message
+#. strings elsewhere.  You don't have to translate the whole
+#. string, and only the translation for "containing '%s' will
+#. be used.  If you do translate the whole string, leave the
+#. translations of the rest of the text in brackets, so it
+#. will not be used.
+#: src/nautilus-search-bar-criterion.c:74
+msgid "[Search for] Name [contains \"fish\"]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:71
-msgid "With Emblem"
-msgstr "º¢ýÉòмý"
+#: src/nautilus-search-bar-criterion.c:75
+msgid "[Search for] Content [includes all of \"fish tree\"]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:72
-msgid "Last Modified"
-msgstr "Á¡üÈôÀð¼ ¸¨¼º¢ ¿¡û"
+#: src/nautilus-search-bar-criterion.c:76
+msgid "[Search for] Type [is regular file]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:73
-#, fuzzy
-msgid "Owner"
-msgstr "¯Ã¢§Â¡ý:"
+#: src/nautilus-search-bar-criterion.c:77
+msgid "[Search for] Size [larger than 400K]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:78
+msgid "[Search for] With Emblem [includes \"Important\"]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:79
-msgid "contains"
-msgstr "¯ð¦¸¡ñ¼Ð"
+msgid "[Search for] Last Modified [before yesterday]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:80
-msgid "starts with"
-msgstr "¯¼ý ¦¾¡¼í̸¢ÈÐ"
-
-#: src/nautilus-search-bar-criterion.c:81
-msgid "ends with"
-msgstr "¯¼ý Óʸ¢ÈÐ"
+msgid "[Search for] Owner [is not root]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:82
-msgid "matches glob"
-msgstr "glob ¯ðý ¦À¡Õóи¢ÈÐ"
+#: src/nautilus-search-bar-criterion.c:86
+msgid "[File name] contains [help]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:83
-msgid "matches regexp"
-msgstr "regexp ¯¼ý ¦À¡Õóи¢ÈÐ"
+#: src/nautilus-search-bar-criterion.c:87
+msgid "[File name] starts with [nautilus]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:88
-msgid "includes all of"
-msgstr "±øÄ¡õ §º÷òÐ"
+msgid "[File name] ends with [.c]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:89
-msgid "includes any of"
-msgstr "²¾¡ÅÐ ´ý¨Èî §º÷òÐ"
+msgid "[File name] matches glob [*.c]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:90
-msgid "does not include all of"
-msgstr "±øÄ¡ÅüÈÔõ §º÷측Áø"
+msgid "[File name] matches regexp [\"e??l.$\"]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:91
-msgid "includes none of"
-msgstr "´ýÚõ §º÷측Áø"
+#: src/nautilus-search-bar-criterion.c:95
+msgid "[File content] includes all of [apple orange]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:96
+msgid "[File content] includes any of [apply orange]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:97
-#: src/nautilus-search-bar-criterion.c:124
-#: src/nautilus-search-bar-criterion.c:152
-msgid "is"
-msgstr "¯ñÎ"
+#, fuzzy
+msgid "[File content] does not include all of [apple orange]"
+msgstr "±øÄ¡ÅüÈÔõ §º÷측Áø"
 
 #: src/nautilus-search-bar-criterion.c:98
-#: src/nautilus-search-bar-criterion.c:125
-#: src/nautilus-search-bar-criterion.c:153
-msgid "is not"
-msgstr "­ø¨Ä"
-
-#: src/nautilus-search-bar-criterion.c:103
-msgid "regular file"
-msgstr "Ó¨ÈÂ¡É §¸¡ôÒ"
+msgid "[File content] includes none of [apple orange]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:104
-msgid "text file"
-msgstr "¯¨Ãì §¸¡ôÒ"
+msgid "[File type] is [folder]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:105
-msgid "application"
-msgstr "ÀÂýÀ¡Î"
+msgid "[File type] is not [folder]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:110
+#, fuzzy
+msgid "[File type is] regular file"
+msgstr "Ó¨ÈÂ¡É §¸¡ôÒ"
 
-#: src/nautilus-search-bar-criterion.c:106
-msgid "directory"
-msgstr "«¨¼×"
+#: src/nautilus-search-bar-criterion.c:111
+msgid "[File type is] text file"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:112
-msgid "larger than"
-msgstr "Å¢¼ô ¦ÀâÐ"
+msgid "[File type is] application"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:113
-msgid "smaller than"
-msgstr "Å¢¼î º¢È¢Ð"
+msgid "[File type is] folder"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:118
-msgid "marked with"
-msgstr "¯¼ý ÌÈ¢ì¸ôÀð¼Ð"
+#: src/nautilus-search-bar-criterion.c:114
+msgid "[File type is] music"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:119
-msgid "not marked with"
-msgstr "¯¼ý ÌÈ¢ì¸ôÀ¼Å¢ø¨Ä"
+msgid "[File size is] larger than [400K]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:120
+msgid "[File size is] smaller than [300K]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:125
+msgid "[With emblem] marked with [Important]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:126
-msgid "is after"
-msgstr "À¢ýÒ"
+msgid "[With emblem] not marked with [Important]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:127
-msgid "is before"
-msgstr "ÓýÒ"
+#: src/nautilus-search-bar-criterion.c:131
+msgid "[Last modified date] is [1/24/00]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:129
-msgid "is today"
-msgstr "­ýÚ"
+#: src/nautilus-search-bar-criterion.c:132
+msgid "[Last modified date] is not [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:133
+msgid "[Last modified date] is after [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:134
+msgid "[Last modified date] is before [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:136
+#, fuzzy
+msgid "[Last modified date] is today"
+msgstr "%s ìÌô À¢ý Á¡üÈôÀð¼¨Å "
 
-#: src/nautilus-search-bar-criterion.c:130
-msgid "is yesterday"
+#: src/nautilus-search-bar-criterion.c:137
+#, fuzzy
+msgid "[Last modified date] is yesterday"
 msgstr "§¿üÚ"
 
-#: src/nautilus-search-bar-criterion.c:132
-msgid "is within a week of"
+#: src/nautilus-search-bar-criterion.c:139
+#, fuzzy
+msgid "[Last modified date] is within a week of [1/24/00]"
 msgstr "­ùÅ¡Ãò¾¢üÌû"
 
-#: src/nautilus-search-bar-criterion.c:133
-msgid "is within a month of"
+#: src/nautilus-search-bar-criterion.c:140
+#, fuzzy
+msgid "[Last modified date] is within a month of [1/24/00]"
 msgstr "Á¡¾¾¢üÌû"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: po/tmp/nautilus-service-ui.xml.h:7
-#, fuzzy
-msgid "Display support information for Eazel Services"
-msgstr "®ƒø §º¨Å¢ø §º÷ó¾¢Î¸"
+#: src/nautilus-search-bar-criterion.c:159
+msgid "[File owner] is [root]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:160
+msgid "[File owner] is not [root]"
+msgstr ""
 
-#: po/tmp/nautilus-service-ui.xml.h:8
+#: src/nautilus-service-ui.xml.h:1
 msgid "Go to the Eazel Services Summary Page"
 msgstr ""
 
-#: po/tmp/nautilus-service-ui.xml.h:9
+#: src/nautilus-service-ui.xml.h:2
 msgid "Go to the Eazel Software Catalog"
 msgstr ""
 
-#: po/tmp/nautilus-service-ui.xml.h:10
+#: src/nautilus-service-ui.xml.h:3
 msgid "Go to your online storage repository"
 msgstr ""
 
-#: po/tmp/nautilus-service-ui.xml.h:11
-msgid "Services"
-msgstr "§º¨Å¸û"
-
-#: po/tmp/nautilus-service-ui.xml.h:12
+#: src/nautilus-service-ui.xml.h:5
 msgid "Software _Catalog"
 msgstr ""
 
-#: po/tmp/nautilus-service-ui.xml.h:13
+#: src/nautilus-service-ui.xml.h:6
 #, fuzzy
 msgid "_Eazel Services Home"
 msgstr "®ƒø §º¨Å¸û"
 
-#: po/tmp/nautilus-service-ui.xml.h:14
+#: src/nautilus-service-ui.xml.h:7
 msgid "_Online Storage"
 msgstr ""
 
-#: po/tmp/nautilus-service-ui.xml.h:15
+#: src/nautilus-service-ui.xml.h:8
 #, fuzzy
 msgid "_Services"
 msgstr "§º¨Å¸û"
 
-#: po/tmp/nautilus-service-ui.xml.h:16
-msgid "_Support"
+#: src/nautilus-shell.c:188
+msgid "Caveat"
+msgstr "¸Å¢Âð"
+
+#: src/nautilus-shell.c:225
+msgid ""
+"Thank you for your interest in Nautilus.\n"
+" \n"
+"As with any software under development, you should exercise caution when "
+"using Nautilus.  Eazel does not provide any guarantee that it will work "
+"properly, or assume any liability for your use of it.  Please use it at your "
+"own risk.\n"
+"\n"
+"Please visit http://www.eazel.com/feedback.html to provide feedback, "
+"comments, and suggestions."
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:1
+msgid "Factory for Nautilus shell and file manager"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: po/tmp/nautilus-shell-ui.xml.h:7
+#: src/Nautilus_shell.oaf.in.h:2
+#, fuzzy
+msgid "Icons"
+msgstr "¯ð¦¸¡ñ¼Ð"
+
+#: src/Nautilus_shell.oaf.in.h:3
+#, fuzzy
+msgid "Icons Viewer"
+msgstr "%s ¸¡ðÊ"
+
+#: src/Nautilus_shell.oaf.in.h:4
+#, fuzzy
+msgid "List"
+msgstr "¯ñÎ"
+
+#: src/Nautilus_shell.oaf.in.h:5
+#, fuzzy
+msgid "List Viewer"
+msgstr "%s ¸¡ðÊ"
+
+#: src/Nautilus_shell.oaf.in.h:6
+#, fuzzy
+msgid "Nautilus factory"
+msgstr "¿¡ÊÄŠ ÒÐôÀ¢ò¾ø"
+
+#: src/Nautilus_shell.oaf.in.h:7
+msgid "Nautilus file manager component that shows a scrollable list"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:8
+msgid ""
+"Nautilus file manager component that shows a scrollable list for search "
+"results"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:9
+msgid "Nautilus file manager component that shows a two-dimensional icon space"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:10
+msgid "Nautilus file manager component that shows icons on the the desktop"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:11
+msgid "Nautilus file manager desktop icon view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:12
+msgid "Nautilus file manager icon view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:13
+msgid "Nautilus file manager list view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:14
+msgid "Nautilus file manager search results list view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:15
+#, fuzzy
+msgid "Nautilus metafile factory"
+msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ §¾÷ó¦¾ÎôÀ¡ý"
+
+#: src/Nautilus_shell.oaf.in.h:16
+#, fuzzy
+msgid "Nautilus shell"
+msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ:"
+
+#: src/Nautilus_shell.oaf.in.h:17
+msgid ""
+"Nautilus shell operations that can be done from subsequent command-line "
+"invocations"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:18
+msgid "Produces metafile objects for accessing Nautilus metadata"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:19
 #, fuzzy
-msgid " Advanced"
+msgid "Search List"
+msgstr "­¼í¸¨Çò§¾Î"
+
+#: src/Nautilus_shell.oaf.in.h:20
+#, fuzzy
+msgid "View as Icons"
+msgstr "%s §À¡ýÈ ¸¡ðº¢ "
+
+#: src/Nautilus_shell.oaf.in.h:21
+#, fuzzy
+msgid "View as List"
+msgstr "%s §À¡ýÈ ¸¡ðº¢ "
+
+#: src/nautilus-shell-ui.xml.h:1
+#, fuzzy
+msgid " _Advanced"
 msgstr "Óý§É¡Ê"
 
-#: po/tmp/nautilus-shell-ui.xml.h:8
+#: src/nautilus-shell-ui.xml.h:2
 #, fuzzy
-msgid " Beginner"
+msgid " _Beginner"
 msgstr "¦¾¡¼íÌ¿÷"
 
-#: po/tmp/nautilus-shell-ui.xml.h:9
+#: src/nautilus-shell-ui.xml.h:3
 #, fuzzy
-msgid " Intermediate"
+msgid " _Intermediate"
 msgstr "­¨¼¿¢¨Ä"
 
-#: po/tmp/nautilus-shell-ui.xml.h:10
+#: src/nautilus-shell-ui.xml.h:4
 msgid "Add a bookmark for the current location to this menu"
 msgstr "­ùÅ¢¼ò¾¢üÌ áüÌÈ¢¨Âî ­ó¾ ÀðÊ¢ø §º÷"
 
-#: po/tmp/nautilus-shell-ui.xml.h:11
-msgid "Back"
-msgstr "À¢ýÒ"
-
-#: po/tmp/nautilus-shell-ui.xml.h:12
-#, fuzzy
-msgid "C_hange Appearance..."
-msgstr "_§¾¡üÈò¨¾ Á¡üÚ¸"
-
-#: po/tmp/nautilus-shell-ui.xml.h:14
+#: src/nautilus-shell-ui.xml.h:6
 msgid "Change the visibility of this window's location bar"
 msgstr "­ó¾ º¡ÇÃò¾¢ý ­¼ôÀð¨¼Â¢ý ÒÄôÀ¡ð¨¼ Á¡üÚ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:15
+#: src/nautilus-shell-ui.xml.h:7
 msgid "Change the visibility of this window's sidebar"
 msgstr "­ó¾ º¡ÇÃò¾¢ý µÃôÀð¨¼Â¢ý ÒÄôÀ¡ð¨¼ Á¡üÚ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:16
+#: src/nautilus-shell-ui.xml.h:8
 msgid "Change the visibility of this window's status bar"
 msgstr "­ó¾ º¡ÇÃò¾¢ý ¿¢¨ÄôÀð¨¼Â¢ý ÒÄôÀ¡ð¨¼ Á¡üÚ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:17
-msgid "Change the visibility of this window's tool bar"
+#: src/nautilus-shell-ui.xml.h:9
+#, fuzzy
+msgid "Change the visibility of this window's toolbar"
 msgstr "­ó¾ º¡ÇÃò¾¢ý ¸ÕÅ¢ôÀð¨¼Â¢ý ÒÄôÀ¡ð¨¼ Á¡üÚ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:10
 msgid "Clear contents of Go menu and Back/Forward lists"
 msgstr "ÀðÊìÌî ¦ºø ÁüÚõ ÓýÒ/À¢ýÒ ÀðÊÂø¸Ç¢ý ¦À¡ÕǼì¸ò¨¾ò Ш¼"
 
-#: po/tmp/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:11
 msgid "Close _All Windows"
 msgstr "_±øÄ¡î º¡ÇÃò¨¾Ôõ ãÎ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:12
 msgid "Close all Nautilus windows"
 msgstr "±øÄ¡ ¿¡ÊÄŠ º¡ÇÃí¸¨ÇÔõ ãÎ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:13
 msgid "Close this window"
 msgstr "­ó¾î º¡ÇÃò¨¾ ÓÎ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:23
-#, fuzzy
-msgid "Custo_mization..."
-msgstr "_¾É¢ôÀÂÉ¡ì¸õ..."
-
-#: po/tmp/nautilus-shell-ui.xml.h:24
-#, fuzzy
-msgid "Cut _Text"
-msgstr "_¯¨Ã ¦ÅðÎ"
-
-#: po/tmp/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:15
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "­ó¾ ÀðÊ¢ø ¯ûÇ áüÌÈ¢¸¨Ç Á¡üÈ «ÛÁ¾¢ìÌõ º¡ÇÃò¨¾ì ¸¡ðÎ "
 
-#: po/tmp/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:29
-#, fuzzy
-msgid "Display the Property Browser, containing patterns, colors, and emblems"
+#: src/nautilus-shell-ui.xml.h:18
+msgid ""
+"Display patterns, colors, and emblems that can be used to customize "
+"appearance"
 msgstr ""
-"¦À¡Õð¸ÙìÌô ÀñÒ¸¨Çî §º÷ì¸×õ  ÁüÚõ §¾¡üÈò¨¾ò ¾É¢ôÀÂÉ¡ì¸×õ ¯Ä¡Å¢ô ÀñÒ¸¨Çì "
-"¸¡ñÀ¢ì¸¢ÈÐ. "
 
-#: po/tmp/nautilus-shell-ui.xml.h:30
-msgid "Display the latest contents of the current location"
-msgstr ""
+#: src/nautilus-shell-ui.xml.h:19
+#, fuzzy
+msgid "Display quick reference pages for Nautilus"
+msgstr "ÌÚõÀ¼ò¾¢ø ¯ûÇ ¯¨Ã¨Âì ¸¡ðÎ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:20
 #, fuzzy
-msgid "Display the license for Nautilus"
+msgid "Display release notes for Nautilus"
 msgstr "ÌÚõÀ¼ò¾¢ø ¯ûÇ ¯¨Ã¨Âì ¸¡ðÎ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:32
-msgid "Display the set of available appearance themes"
+#: src/nautilus-shell-ui.xml.h:21
+#, fuzzy
+msgid "Display support information for Nautilus and Eazel Services"
+msgstr "®ƒø §º¨Å¢ø §º÷ó¾¢Î¸"
+
+#: src/nautilus-shell-ui.xml.h:22
+msgid "Display the latest contents of the current location"
 msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:33
-msgid "Edit Settings..."
-msgstr "«¨ÁôÒ¸¨Ç Á¡üÚ..."
+#: src/nautilus-shell-ui.xml.h:23
+msgid "Display the set of available appearance themes"
+msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:34
-#, fuzzy
-msgid "Edit settings for the current user level"
-msgstr "ÀÂÉ÷ ¿¢¨Ä «¨ÁôÒ¸¨Ç Á¡üÚ"
+#: src/nautilus-shell-ui.xml.h:24
+msgid "Edit various Nautilus preferences"
+msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:35
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "¸ñÎÀ¢Ê"
 
-#: po/tmp/nautilus-shell-ui.xml.h:36
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr "ÅÃÄ¡ü¨È _ÁÈ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:37
-msgid "Forward"
-msgstr "ÓýÒ"
-
-#: po/tmp/nautilus-shell-ui.xml.h:38
+#: src/nautilus-shell-ui.xml.h:27
 #, fuzzy
 msgid "Go to Eazel Services"
 msgstr "®ƒø §º¨Å¸û"
 
-#: po/tmp/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:28
 #, fuzzy
 msgid "Go to the home location"
 msgstr "ÌÈ¢ôÀ¢ð¼ ­¼ò¾¢üÌî ¦ºø¸"
 
-#: po/tmp/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:30
 #, fuzzy
 msgid "Go to the next visited location"
 msgstr "ÌÈ¢ôÀ¢ð¼ ­¼ò¾¢üÌî ¦ºø¸"
 
-#: po/tmp/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:31
 #, fuzzy
 msgid "Go to the previous visited location"
 msgstr "ÌÈ¢ôÀ¢ð¼ ­¼ò¾¢üÌî ¦ºø¸"
 
-#: po/tmp/nautilus-shell-ui.xml.h:43 src/nautilus-window-menus.c:444
-msgid "Hide Location Bar"
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
+#, fuzzy
+msgid "Hide Location _Bar"
 msgstr "­¼ôÀ𨼨 ´Ç¢"
 
-#: po/tmp/nautilus-shell-ui.xml.h:44 src/nautilus-window-menus.c:432
-msgid "Hide Sidebar"
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
+#, fuzzy
+msgid "Hide St_atus Bar"
 msgstr "µÃôÀ𨼨 ´Ç¢"
 
-#: po/tmp/nautilus-shell-ui.xml.h:45 src/nautilus-window-menus.c:426
-msgid "Hide Status Bar"
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
+#, fuzzy
+msgid "Hide _Sidebar"
 msgstr "µÃôÀ𨼨 ´Ç¢"
 
-#: po/tmp/nautilus-shell-ui.xml.h:46 src/nautilus-window-menus.c:438
-msgid "Hide Tool Bar"
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
+#, fuzzy
+msgid "Hide _Toolbar"
 msgstr "¸ÕÅ¢ôÀ𨼨 ´Ç¢"
 
-#: po/tmp/nautilus-shell-ui.xml.h:47
-msgid "Home"
-msgstr "­øÄõ"
+#: src/nautilus-shell-ui.xml.h:37
+#, fuzzy
+msgid "Nautilus Quick _Reference"
+msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ:"
+
+#: src/nautilus-shell-ui.xml.h:38
+#, fuzzy
+msgid "Nautilus Release _Notes"
+msgstr "¿¡ÊÄŠ ÒÐôÀ¢ò¾ø"
 
-#: po/tmp/nautilus-shell-ui.xml.h:48
+#: src/nautilus-shell-ui.xml.h:39
 #, fuzzy
-msgid "Nautilus _Feedback..."
+msgid "Nautilus User _Manual"
 msgstr "¿¡ÊÄŠ ÒÐôÀ¢ò¾ø"
 
-#: po/tmp/nautilus-shell-ui.xml.h:49
+#: src/nautilus-shell-ui.xml.h:40
+#, fuzzy
+msgid "New Window"
+msgstr "_ÒÐî º¡ÇÃõ"
+
+#: src/nautilus-shell-ui.xml.h:41
+#, fuzzy
+msgid "New _Window"
+msgstr "_ÒÐî º¡ÇÃõ"
+
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "­ÂøÀ¡É «Ç×"
 
-#: po/tmp/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "ÒÐôÀ¢"
 
-#: po/tmp/nautilus-shell-ui.xml.h:53
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ¯¨Ã¨Â À¢¨½ôÀĨ¸Â¢ø ­¼¡Áø,  ¿£ì̸¢ÈÐ"
-
-#: po/tmp/nautilus-shell-ui.xml.h:54
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:58
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
-"Show a page from which you can send feedback about Nautilus to its creators"
+"Show a page from which you can send feedback about Nautilus and Eazel "
+"Services"
 msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "¦À¡ÕǼì¸ò¨¾î º¡¾¡Ã½Á¡É «ÇŢɢø ¸¡ðÎ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:60
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "¦À¡ÕǼì¸ò¨¾ì ̨ÈÅ¡É Å¢ÅÃòмý ¸¡ðÎ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:61
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "­ýÛõ Å¢ÅÃí¸Ù¼ý ¦À¡ÕǼì¸ò¨¾ì ¸¡ðÎ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:64
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:65
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:66
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "¸¨¼º¢ ¯¨Ã Á¡üÈò¨¾î ¦ºöÂü¸"
 
-#: po/tmp/nautilus-shell-ui.xml.h:67
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "§Áø"
 
-#: po/tmp/nautilus-shell-ui.xml.h:68
-#, fuzzy
-msgid "Use Advanced settings"
-msgstr "%s «¨ÁôÒ¸¨Ç ¯À§Â¡¸¢"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:69
-#, fuzzy
-msgid "Use Beginner settings"
-msgstr "%s «¨ÁôÒ¸¨Ç ¯À§Â¡¸¢"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:63
 #, fuzzy
-msgid "Use Intermediate settings"
-msgstr "%s «¨ÁôÒ¸¨Ç ¯À§Â¡¸¢"
+msgid "We_b Search"
+msgstr "ŨÄò §¾¼ø"
 
-#: po/tmp/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "ŨÄò §¾¼ø"
 
-#: po/tmp/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "¦À⾡ìÌ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "º¢È¢Â¾¡ìÌ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "_¦À⾡ìÌ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "_º¢È¢Â¾¡ìÌ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "_¿¡ÊÄŠ ÀüÈ¢..."
 
-#: po/tmp/nautilus-shell-ui.xml.h:77
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "_áüÌÈ¢¨Âî §º÷"
 
-#: po/tmp/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "_À¢ýÒ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:72
+msgid "_Backgrounds and Emblems..."
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "_áüÌÈ¢"
 
-#: po/tmp/nautilus-shell-ui.xml.h:80
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "º¡ÇÃò¨¾ _ãÎ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:76
+msgid "_Customer Support"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "_Á¡üÚ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:83
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "áüÌÈ¢¸¨Ç _Á¡üÚ..."
 
-#: po/tmp/nautilus-shell-ui.xml.h:85 src/nautilus-window-menus.c:1348
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "¦¾¡¼ì¸ Å¢ÕôÀí¸û"
+
+#: src/nautilus-shell-ui.xml.h:80
+#, fuzzy
+msgid "_Feedback"
+msgstr "¿¡ÊÄŠ ÒÐôÀ¢ò¾ø"
+
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "_¸ñÎÀ¢Ê"
 
-#: po/tmp/nautilus-shell-ui.xml.h:86
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "_ÓýÒ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:87
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "_¦ºø"
 
-#: po/tmp/nautilus-shell-ui.xml.h:88
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "_¯¾Å¢"
 
-#: po/tmp/nautilus-shell-ui.xml.h:89
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "_­øÄõ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:87
 #, fuzzy
-msgid "_Nautilus License"
-msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ:"
+msgid "_Location..."
+msgstr "­¼õ"
 
-#: po/tmp/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:88
 #, fuzzy
-msgid "_Nautilus User Manual"
-msgstr "¿¡ÊÄŠ ÒÐôÀ¢ò¾ø"
-
-#: po/tmp/nautilus-shell-ui.xml.h:92
-msgid "_New Window"
-msgstr "_ÒÐî º¡ÇÃõ"
+msgid "_Nautilus Themes..."
+msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ:"
 
-#: po/tmp/nautilus-shell-ui.xml.h:93
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "_º¡¾¡Ã½ «Ç×"
 
-#: po/tmp/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "¦¾¡¼ì¸ Å¢ÕôÀí¸û"
+
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "_ÒÐôÀ¢"
 
-#: po/tmp/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:99
-msgid "_Select All"
-msgstr "_«¨ÉòÐõ §¾÷צºö"
-
-#: po/tmp/nautilus-shell-ui.xml.h:100
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:101
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr ""
 
-#: po/tmp/nautilus-shell-ui.xml.h:102
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "_¦ºöÂü¸"
 
-#: po/tmp/nautilus-shell-ui.xml.h:103
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "_´Õ ¿¢¨Ä §Áø"
 
-#: po/tmp/nautilus-shell-ui.xml.h:104
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "_¸¡ñÀ¢"
 
-#: po/tmp/nautilus-shell-ui.xml.h:105
-msgid "_Web Search"
-msgstr "_ŨÄò §¾¼ø"
-
-#: src/nautilus-shell.c:167
-msgid "Caveat"
-msgstr "¸Å¢Âð"
-
-#: src/nautilus-shell.c:203
-msgid ""
-"Thank you for your interest in Nautilus.\n"
-" \n"
-"As with any software under development, you should exercise caution when "
-"using Nautilus.  Eazel does not provide any guarantee that it will work "
-"properly, or assume any liability for your use of it.  Please use it at your "
-"own risk.\n"
-"\n"
-"Please visit http://www.eazel.com/feedback.html to provide feedback, "
-"comments, and suggestions."
-msgstr ""
-
-#: src/nautilus-sidebar.c:619
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
 msgstr ""
 "´ý¨È ÁðÎõ ­Øì¸×õ. ´ýÚìÌ §ÁüÀ𼠾ɢôÀÂý ÌÚõÀ¼ò¾¢¨É ´§Ã §¿Ãò¾¢ø «Ç¢ì¸ ÓÊ¡Ð!"
 
-#: src/nautilus-sidebar.c:621
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "´ýÚìÌ §ÁüÀð¼ ¯ÕÅõ"
 
-#: src/nautilus-sidebar.c:640
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -5958,11 +9955,11 @@ msgstr ""
 "¿£í¸û ­ð¼ §¸¡ôÒ , «ñ¨Á째¡ôÀøÄ. «ñ¨Á ¯ÕÅí¸¨Ç ÁðΧÁ  ¾É¢ôÀÂý ÌÚõÀ¼Á¡¸ô "
 "ÀÂý¦ºö ÓÊÔõ."
 
-#: src/nautilus-sidebar.c:642
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "«ñ¨Á ¯ÕÅí¸û ÁðÎõ"
 
-#: src/nautilus-sidebar.c:647
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -5970,123 +9967,160 @@ msgstr ""
 "¿£í¸û ­ð¼ §¸¡ôÒ , ¯ÕÅõ «øÄ. «ñ¨Á ¯ÕÅí¸¨Ç ÁðΧÁ  ¾É¢ôÀÂý ÌÚõÀ¼Á¡¸ô ÀÂý¦ºö "
 "ÓÊÔõ."
 
-#: src/nautilus-sidebar.c:649
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "¯ÕÅí¸û ÁðÎõ"
 
-#: src/nautilus-sidebar.c:1212
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "%s ³ì ¦¸¡ñÎ ¾¢È"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1246
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "...³ì ¦¸¡ñÎ ¾¢È"
 
-#. Create button first so we can use it for auto_click
-#: src/nautilus-simple-search-bar.c:129
-msgid "Find Them!"
-msgstr "«Åü¨Èì ¸ñÎÀ¢Ê!"
+#. FIXME: We don't use spaces to pad labels!
+#: src/nautilus-sidebar.c:1424
+#, fuzzy
+msgid "  Empty Trash  "
+msgstr "¦ÅüÚò ¦¾¡ðÊ"
 
 #: src/nautilus-switchable-search-bar.c:132
-msgid "Search For:"
-msgstr "§¾Î¸:"
+#, fuzzy
+msgid "Find:"
+msgstr "¸ñÎÀ¢Ê"
 
-#. set the title
-#: src/nautilus-theme-selector.c:157
+#. set the title and standard close accelerator
+#: src/nautilus-theme-selector.c:170
 msgid "Nautilus Theme Selector"
 msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ §¾÷ó¦¾ÎôÀ¡ý"
 
 #. add the title label
-#: src/nautilus-theme-selector.c:191
+#: src/nautilus-theme-selector.c:199
 msgid "Nautilus Theme:"
 msgstr "¿¡ÊÄŠ ±ñ½ì¸Õ:"
 
-#: src/nautilus-theme-selector.c:249
-msgid "Add new theme"
-msgstr "Ò¾¢Â ±ñ½ì¸Õ¨Åî §º÷ì¸×õ"
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:278
+#, fuzzy
+msgid "  Add New Theme  "
+msgstr "Ò¾¢Â ±ñ½ì¸ÕÅ¢¨Éî §º÷ì¸"
 
-#: src/nautilus-theme-selector.c:261
-msgid "Remove theme"
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:288
+#, fuzzy
+msgid "  Remove Theme  "
 msgstr "±ñ½ì¸Õ¨Å ¿£ì¸×õ"
 
-#: src/nautilus-theme-selector.c:373
-#, c-format
-msgid "Sorry, but %s is not a valid theme directory."
+#: src/nautilus-theme-selector.c:400
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a valid theme folder."
 msgstr "ÁýÉ¢ì¸×õ, ¬Â¢ý %s ´Õ ºÃ¢Â¡É ±ñ½ì¸Õ «¨¼ÅøÄ."
 
-#: src/nautilus-theme-selector.c:374
+#: src/nautilus-theme-selector.c:401
 msgid "Couldn't add theme"
 msgstr "±ñ½ì¸Õ¨Åî §º÷ì¸ ÓÊÂÅ¢ø¨Ä"
 
-#: src/nautilus-theme-selector.c:402
-#, c-format
-msgid "Sorry, but the theme %s couldn't be installed."
+#: src/nautilus-theme-selector.c:429
+#, fuzzy, c-format
+msgid "Sorry, but the \"%s\" theme couldn't be installed."
 msgstr "ÁýÉ¢ì¸×õ, %s ±ñ½ì¸Õ¨Å ¿¢ÚÅ ÓÊÂÅ¢ø¨Ä"
 
-#: src/nautilus-theme-selector.c:403
+#: src/nautilus-theme-selector.c:430
 msgid "Couldn't install theme"
 msgstr "±ñ½ì¸Õ¨Å ¿¢ÚÅÓÊÂÅ¢ø¨Ä"
 
-#: src/nautilus-theme-selector.c:444
-msgid "Select a theme directory to add as a new theme:"
+#: src/nautilus-theme-selector.c:463
+#, fuzzy
+msgid "Select a theme folder to add as a new theme:"
 msgstr "Ò¾¢Â ±ñ½ì¸ÕÅ¢¨Éî §º÷ì¸, ±ñ½ì¸Õ «¨¼¦Å¡ý¨Èò §¾÷צºö"
 
-#: src/nautilus-theme-selector.c:477 src/nautilus-theme-selector.c:527
+#: src/nautilus-theme-selector.c:495 src/nautilus-theme-selector.c:542
 msgid "Click on a theme to remove it."
 msgstr "±ñ½ì¸Õ¨Å ¿£ì¸ «¾ý §Áø ¸¢Ç¢ì ¦ºö¸"
 
-#: src/nautilus-theme-selector.c:530
+#: src/nautilus-theme-selector.c:545
 msgid ""
 "Click on a theme to change the\n"
 "appearance of Nautilus."
 msgstr "¿¡Êĺ¢ý §¾¡üÈõ."
 
 #. change the add button label back to it's normal state
-#: src/nautilus-theme-selector.c:542
+#: src/nautilus-theme-selector.c:558
 msgid "Add New Theme"
 msgstr "Ò¾¢Â ±ñ½ì¸ÕÅ¢¨Éî §º÷ì¸"
 
-#: src/nautilus-theme-selector.c:570
+#: src/nautilus-theme-selector.c:585
+#, fuzzy
 msgid ""
-"Sorry, but you can't remove the current theme.  Please change to another "
-"theme before removing this one"
+"Sorry, but you can't remove the current theme. Please change to another "
+"theme before removing this one."
 msgstr ""
 "ÁýÉ¢ì¸×õ , ¬Â¢ý ­ó¾ ±ñ½ì¸Õ¨Å ¿£ì¸ ÓÊ¡Ð. ¾Â× ¦ºöÐ ­¨¾ ¿£ìÌÓý ­ý¦É¡Õ "
 "±ñ½ì¸Õ×ìÌ Á¡üÚ¸ "
 
-#: src/nautilus-theme-selector.c:571
+#: src/nautilus-theme-selector.c:587
 msgid "Can't delete current theme"
 msgstr "¾ü§À¡¨¾Â ±ñ½ì¸ÕÅ¢¨É «Æ¢ì¸ ÓÊ¡Ð"
 
-#: src/nautilus-theme-selector.c:592
+#: src/nautilus-theme-selector.c:608
 msgid "Sorry, but that theme could not be removed!"
 msgstr "ÁýÉ¢ì¸×õ, ¬Â¢ý «ó¾ ±ñ½ì¸Õ¨Å ¿£ì¸ ÓÊ¡Ð"
 
-#: src/nautilus-theme-selector.c:593
+#: src/nautilus-theme-selector.c:609
 msgid "Couldn't remove theme"
 msgstr "±ñ½ì¸Õ¨Å «Æ¢ì¸ ÓÊÂÅ¢ø¨Ä"
 
-#: src/nautilus-theme-selector.c:682
-#, c-format
-msgid "No information available for the  %s theme"
+#: src/nautilus-theme-selector.c:716
+#, fuzzy, c-format
+msgid "No description available for the \"%s\" theme"
 msgstr "%s ±ýÈ ±ñ½ì¸Õ×ìÌò ¾¸Åø¸û ¸¢¨¼ì¸Å¢ø¨Ä"
 
-#: src/nautilus-window-manage-views.c:585
-#, c-format
-msgid "You do not have the permissions necessary to view \"%s\"."
-msgstr "\"%s\" ³ì ¸¡½ò §¾¨ÅÂ¡É «ÛÁ¾¢ ¯í¸ÙìÌ ­ø¨Ä"
+#: src/nautilus-window.c:637
+#, fuzzy
+msgid "View as ..."
+msgstr "%s §À¡ýÚ ¸¡ñ¸..."
 
-#: src/nautilus-window-manage-views.c:587
-msgid "Inadequate Permissions"
-msgstr "«ÛÁ¾¢¸û §¾¨Åį̀È×"
+#. Add "View as Other..." extra bonus choice.
+#: src/nautilus-window.c:1317
+msgid "View as Other..."
+msgstr "ÁüȨŠ§À¡ýÚ ¸¡ñ¸..."
+
+#: src/nautilus-window.c:1722
+msgid "Close"
+msgstr "ãÎ"
+
+#. FIXME bugzilla.eazel.com 5037: The text Preview
+#. * Release is hardcoded here. Are all builds with
+#. * time stamps really best described as "preview
+#. * release"?.
+#.
+#: src/nautilus-window-manage-views.c:216
+#, c-format
+msgid "Preview Release %s: %s"
+msgstr ""
 
-#: src/nautilus-window-manage-views.c:679
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "¸¡ðº¢ §¾¡üÈÐ"
 
-#: src/nautilus-window-manage-views.c:768
+#: src/nautilus-window-manage-views.c:831
+#, fuzzy, c-format
+msgid ""
+"The %s view encountered an error and can't continue. You can choose another "
+"view or go to a different location."
+msgstr ""
+"The %s µÃôÀð¨¼ô Àĸõ À¢¨Æ¦Â¡ý¨È ±¾¢÷¦¸¡ñ¼Ð ±É§Å ¦¾¡¼Ã ÓÊ¡Ð. ­Ð ÁÚÀÊ "
+"¿¼ìÌÁ¡É¡ø , ¿£í¸û Àĸò¨¾ «¨½òÐÅ¢¼ Å¢ÕõÀìÜÎõ."
+
+#: src/nautilus-window-manage-views.c:842
+#, c-format
+msgid "The %s view encountered an error while starting up."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
@@ -6095,7 +10129,7 @@ msgstr ""
 "Àĸõ ´ýÚ À¢¨Æ¦Â¡ý¨È ±¾¢÷¦¸¡ñ¼Ð, ¦¾¡¼Ã ÓÊ¡Ð.Ðþ¢Õ‰¼ÅºÁ¡¸ , «Ð ±Ð ±ýÚ ±ýÉ¡ø "
 "¦º¡øÄÓÊÂÅ¢ø¨Ä."
 
-#: src/nautilus-window-manage-views.c:772
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
@@ -6104,69 +10138,67 @@ msgstr ""
 "The %s µÃôÀð¨¼ô Àĸõ À¢¨Æ¦Â¡ý¨È ±¾¢÷¦¸¡ñ¼Ð ±É§Å ¦¾¡¼Ã ÓÊ¡Ð. ­Ð ÁÚÀÊ "
 "¿¼ìÌÁ¡É¡ø , ¿£í¸û Àĸò¨¾ «¨½òÐÅ¢¼ Å¢ÕõÀìÜÎõ."
 
-#: src/nautilus-window-manage-views.c:777
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "µÃôÀð¨¼ô Àĸõ §¾¡üÈÐ"
 
-#: src/nautilus-window-manage-views.c:1180
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr ""
 "\"%s\" ³ì ¸¡½Å¢ø¨Ä. ¾Â× ¦ºöÐ ±ØòÐ째¡¨Å¨Âî ºÃ¢À¡÷òÐ Á£ñÎõ ÓÂüº¢ ¦ºöÂ×õ."
 
-#: src/nautilus-window-manage-views.c:1186
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
 msgstr " \"%s\" ´Õ ºÃ¢Â¡É ­¼õ «øÄ. ±Ø¾¢Â¨¾î ºÃ¢À¡÷òÐ Á£ñÎõ ÓÂÄ×õ."
 
-#: src/nautilus-window-manage-views.c:1200
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot handle items of this "
-"unknown type."
-msgstr ""
-"\"%s\" ³ì ¸¡ð¼ÓÊÂÅ¢ø¨Ä, ²¦ÉÉ¢ø «È¢ÂôÀ¼¡¾ ­¾ý ¯ÕôÀʸ¨Çì ¨¸Â¡Ç ¿¡ÊÄ…¡ø ÓÊ¡Ð."
-
-#: src/nautilus-window-manage-views.c:1204
-#, c-format
+#: src/nautilus-window-manage-views.c:1245
+#, fuzzy, c-format
 msgid ""
-"Couldn't display \"%s\", because Nautilus cannot handle items of type \"%s\"."
+"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
+"it is."
 msgstr ""
 "\"%s\" ³ì¸¡ñÀ¢¸ ÓÊÂÅ¢ø¨Ä ²¦ÉÉ¢ø \"%s\" ±ýÈ Å¨¸Â¢ý ¯ÕôÀʸ¨Ç ¿¡ÊÄ…¡ø ¨¸Â¡Ç "
 "ÓÊ¡Ð."
 
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy, c-format
+msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+msgstr "\"%s\" ³ ¿¡ÊÄŠ ¸¡ñÀ¢ì¸¡Ð."
+
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1216
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr "\"%s\"  ³ì¸¡ñÀ¢ì¸ ÓÊÂÅ¢ø¨Ä , ²¦ÉÉ¢ø %s: ­¼í¸¨Çì ¨¸Â¡Ç ¿¡ÊÄ…¡ø ÓÊ¡Ð."
 
-#: src/nautilus-window-manage-views.c:1222
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "\"%s\" ³¸¡ñÀ¢ì¸ ÓÊÂÅ¢ø¨Ä , ²¦ÉÉ¢ø ѨÆÀ¾¢× ÓÂüº¢ §¾¡üÈÐ."
 
-#: src/nautilus-window-manage-views.c:1227
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "\"%s\" ³ì ¸¡ñÀ¢ì¸ ÓÊÂÅ¢ø¨Ä, ²¦ÉÉ¢ø «Ïì¸õ ÁÚì¸ôÀð¼Ð."
 
-#: src/nautilus-window-manage-views.c:1232
+#: src/nautilus-window-manage-views.c:1287
 #, fuzzy, c-format
 msgid ""
-"Couldn't display \"%s\", because the host couldn't be found. Check that your "
-"proxy settings are correct."
+"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
+"the spelling is correct and that your proxy settings are correct."
 msgstr "\"%s\" ³¸¡ñÀ¢ì¸ ÓÊÂÅ¢ø¨Ä , ²¦ÉÉ¢ø ѨÆÀ¾¢× ÓÂüº¢ §¾¡üÈÐ."
 
-#: src/nautilus-window-manage-views.c:1238
+#: src/nautilus-window-manage-views.c:1295
 #, fuzzy, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
 "proxy settings are correct."
 msgstr "\"%s\" ³¸¡ñÀ¢ì¸ ÓÊÂÅ¢ø¨Ä , ²¦ÉÉ¢ø ѨÆÀ¾¢× ÓÂüº¢ §¾¡üÈÐ."
 
-#: src/nautilus-window-manage-views.c:1250
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -6177,23 +10209,23 @@ msgstr ""
 "­Âí¸Å¢ø¨Ä.¿¢í¸û ¦Áκ¡ §¾Îõ§º¨Å¨Âò ¦¾¡¼í¸¢Å¢ðË÷¸Ç¡ ±ýÀ¨¾Ôõ ,¯í¸Ç¢¼õ ÍðÎ "
 "­ø¨Ä¦ÂýÈ¡ø ¦Áκ¡Å¢ý Íð¼ý ­Âí¸¢ì¦¸¡ñÊÕ츢ýȾ¡¦ÅýÀ¨¾Ôõ¯Ú¾¢ôÀÎò¾×õ."
 
-#: src/nautilus-window-manage-views.c:1254
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "§¾¼ø ¸¢¨¼ì¸¡Ð"
 
-#: src/nautilus-window-manage-views.c:1258
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "\"%s\" ³ ¿¡ÊÄŠ ¸¡ñÀ¢ì¸¡Ð."
 
-#: src/nautilus-window-manage-views.c:1271
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "­¼ò¨¾ì ¸¡ñÀ¢ì¸ ­ÂÄ¡Ð"
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:317
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
@@ -6201,63 +10233,60 @@ msgstr ""
 "¯Ú¾¢Â¡¸ ÅÃÄ¡ü¨È ÁÈì¸ §ÅñÎÁ¡? «ùÅ¡¦ÈýÈ¡ø , ±øÄ¡Åü¨ÈÔõ Á£ñÎõ ¦ºö§ÅñʸºôÀ¡É "
 "¿¢¨Ä ¯ñ¼¡Ìõ"
 
-#: src/nautilus-window-menus.c:320
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr "¯Ú¾¢Â¡¸ , ¿£÷ ¦ºýÚÅó¾ ¾ó¾ ­¼í¸¨Ç ¿¡ÊÄŠ ÁÈì¸ §ÅñΦÁýÚ Å¢ÕõÒ¸¢ýȣá?"
 
-#: src/nautilus-window-menus.c:325
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "ÅÃÄ¡ü¨È ÁÈì¸ðÎÁ¡?"
 
-#: src/nautilus-window-menus.c:326
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "ÁÈ"
 
-#: src/nautilus-window-menus.c:427
-msgid "Show Status Bar"
+#: src/nautilus-window-menus.c:466
+#, fuzzy
+msgid "Show St_atus Bar"
 msgstr "¿¢¨Äô À𨼨Âì ¸¡ñÀ¢"
 
-#: src/nautilus-window-menus.c:433
-msgid "Show Sidebar"
+#: src/nautilus-window-menus.c:472
+#, fuzzy
+msgid "Show _Sidebar"
 msgstr "µÃôÀ𨼨Âì ¸¡ñÀ¢"
 
-#: src/nautilus-window-menus.c:439
-msgid "Show Tool Bar"
+#: src/nautilus-window-menus.c:478
+#, fuzzy
+msgid "Show _Toolbar"
 msgstr "¸ÕÅ¢ôÀ𨼨Âì ¸¡ñÀ¢"
 
-#: src/nautilus-window-menus.c:445
-msgid "Show Location Bar"
+#: src/nautilus-window-menus.c:484
+#, fuzzy
+msgid "Show Location _Bar"
 msgstr "­¼ôÀ𨼨Âì ¸¡ñÀ¢"
 
-#. Localizers: This is the message in the dialog that appears if the user chooses "Edit Beginner Settings".
-#. * The first %s is the name of the lowest user level ("Beginner"). The 2nd and 4th %s are the
-#. * names of the middle user level ("Intermediate"). The 3rd %s is the name of the highest user
-#. * level ("Advanced").
-#.
-#: src/nautilus-window-menus.c:528
-#, c-format
-msgid ""
-"None of the settings for the %s level can be edited. If you want to edit the "
-"settings you must choose the %s or %s level. Do you want to switch to the %s "
-"level now and edit its settings?"
-msgstr ""
-"%s ¿¢¨Äì ¸¡É «¨ÁôÒ¸û ´ý¨ÈÔõ Á¡üÈ ­ÂġЫ¨ÁôÒ¸¨Ç Á¡üÈ ¿£í¸û Å¢ÕõÀ¢É¡ø %s  «øÄÐ "
-"%s ¿¢¨Ä¨Âò ¦¾Ã¢× ¦ºö§ÅñÎõ%s ¿¢¨ÄìÌ Á¡È¢ «¨ÁôÒ¸¨Ç Á¡üÈ §ÅñÎÁ¡?"
+#: src/nautilus-window-menus.c:535
+#, fuzzy
+msgid "Preferences"
+msgstr "¦¾¡¼ì¸ Å¢ÕôÀí¸û"
 
-#. Localizers: This is the title of the dialog that appears if the user chooses "Edit Beginner Settings".
-#. * The %s is the name of the middle user level ("Intermediate").
+#. Localize to deal with
+#. * issues in the copyright
+#. * symbol characters -- do
+#. * not translate the
+#. * company name, please.
 #.
-#: src/nautilus-window-menus.c:540
-#, c-format
-msgid "Switch to %s Level?"
-msgstr "%s ìÌ ¿¢¨Ä Á¡È §ÅñÎÁ¡?"
+#: src/nautilus-window-menus.c:618
+msgid "Copyright © 1999-2001 Eazel, Inc."
+msgstr ""
 
-#: src/nautilus-window-menus.c:633
+#: src/nautilus-window-menus.c:620
+#, fuzzy
 msgid ""
-"Nautilus is a graphical shell \n"
-"for GNOME that makes it \n"
-"easy to manage your files \n"
+"Nautilus is a graphical shell\n"
+"for GNOME that makes it\n"
+"easy to manage your files\n"
 "and the rest of your system."
 msgstr ""
 "¿¡ÊÄŠ ±ýÀÐ , ¯í¸û §¸¡ôÒ¸¨ÇÔõ, \n"
@@ -6265,7 +10294,16 @@ msgstr ""
 "±Ç¢¾¢ø §ÁÄ¡ñ¨Á ¦ºö¨ÅìÌõ \n"
 "̧ɡÓ즸ýÚ ²üÀÎò¾ôÀð¼ ´Õ Å¨Ã§Å¡Î."
 
-#: src/nautilus-window-menus.c:784
+#. translators should localize the following
+#. * string which will be displayed at the
+#. * bottom of the about box to give credit
+#. * to the translator(s)
+#.
+#: src/nautilus-window-menus.c:629
+msgid "Translator Credits"
+msgstr ""
+
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -6274,75 +10312,795 @@ msgstr ""
 "\"%s\" ±ýÈ ­¼õ ­ø¨Ä. ¿£í¸û ÓýÒ ¨Åò¾  áüÌÈ¢¸û ÀðÊÂĢĢÕóÐ ­ùÅ¢¼ò¨¾ ¿£ì¸ "
 "§ÅñÎÁ¡?"
 
-#: src/nautilus-window-menus.c:788
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "­øÄ¡¾ ­¼òÐìÌ áüÌÈ¢"
 
-#: src/nautilus-window-menus.c:802
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "\"%s\" ±ýÈ ­¼õ ­ø¨Ä"
 
-#: src/nautilus-window-menus.c:803
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "­øÄ¡¾ ­¼ò¾¢üÌî ¦ºø¸"
 
-#: src/nautilus-window-menus.c:870
+#: src/nautilus-window-menus.c:877
 #, fuzzy
 msgid "Go to the location specified by this bookmark"
 msgstr "ÌÈ¢ôÀ¢ð¼ ­¼ò¾¢üÌî ¦ºø¸"
 
-#: src/nautilus-window-menus.c:1347
-msgid "_Browse"
-msgstr "_¯Ä×"
+#: src/nautilus-window-toolbars.c:402
+msgid "Back"
+msgstr "À¢ýÒ"
 
-#. Localizers: This is the title of the user-level settings
-#. * dialog. %s will be replaced with the name of a user level
-#. * ("Beginner", "Intermediate", or "Advanced").
-#.
-#: src/nautilus-window-menus.c:1535
-#, fuzzy, c-format
-msgid "Edit %s Settings"
-msgstr "«¨ÁôÒ¸¨Ç Á¡üÚ..."
+#: src/nautilus-window-toolbars.c:404
+msgid "Forward"
+msgstr "ÓýÒ"
 
-#. Localizers: This is the label for the menu item that brings
-#. * up the user-level settings dialog. %s will be replaced with
-#. * the name of a user level ("Beginner", "Intermediate", or
-#. * "Advanced").
+#. Note to localizers: this font is used for the number in the
+#. * zoom control widget.
 #.
-#: src/nautilus-window-menus.c:1557
-#, fuzzy, c-format
-msgid "Edit %s Settings..."
-msgstr "«¨ÁôÒ¸¨Ç Á¡üÚ..."
+#: src/nautilus-zoom-control.c:531
+#, fuzzy
+msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
+msgstr "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*"
 
-#: src/nautilus-window.c:1088
-#, c-format
-msgid "View as %s..."
-msgstr "%s §À¡ýÚ ¸¡ñ¸..."
+#~ msgid "System"
+#~ msgstr "«¨ÁôÒ"
 
-#. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1110
-msgid "View as Other..."
-msgstr "ÁüȨŠ§À¡ýÚ ¸¡ñ¸..."
+#~ msgid "Config files"
+#~ msgstr "ÅÊÅì §¸¡ôÒ¸û"
 
-#: src/nautilus-window.c:1466
-msgid "Close"
-msgstr "ãÎ"
+#~ msgid "Command Line"
+#~ msgstr "¬¨½Åâ¸û"
+
+#~ msgid "APIs"
+#~ msgstr "²À¢³"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "ÀÄŨ¸"
 
-#: src/nautilus-zoom-control.c:332
 #, fuzzy
-msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
-msgstr "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*"
+#~ msgid "Mozilla Test"
+#~ msgstr "§Á¡º¢øÄ¡"
 
-#. This is marked for localization in case the % sign is not
-#. * appropriate in some locale. I guess that's unlikely.
-#.
-#: src/nautilus-zoom-control.c:579
-msgid "%.0f%%"
-msgstr "%.0f%%"
+#, fuzzy
+#~ msgid "This is a Mozilla merged menu item"
+#~ msgstr "­Ð ´Õ §Á¡º¢øÄ¡ ­¨½ó¾ ÀðÊ ¯ÕôÀÊ"
+
+#, fuzzy
+#~ msgid "This is a Mozilla merged tool bar button"
+#~ msgstr "­Ð ´Õ §Á¡º¢øÄ¡ ­¨½ó¾ ¸ÕÅ¢ôÀ𨼠¦À¡ò¾¡ý"
+
+#, fuzzy
+#~ msgid "_Mozilla Test"
+#~ msgstr "_§Á¡º¢øÄ¡"
+
+#~ msgid "Sound hardware missing or busy!"
+#~ msgstr "´Ä¢ Åý¦À¡Õû ¸¡ñÅ¢ø¨Ä «øÄÐ À½¢Â¢ø!"
+
+#~ msgid "Verifying %s..."
+#~ msgstr "%s  ºÃ¢ôÀ¡÷ì¸Àθ¢ÈÐ..."
+
+#~ msgid "%s would not work anymore\n"
+#~ msgstr "%s ­É¢ À½¢ì̾šÐ\n"
+
+#~ msgid "Installing %s failed because of the following issue(s):\n"
+#~ msgstr "%s ¿¢Úר¸ ¸£ú측Ïõ ¸¡Ã½í¸Ç¡ø §¾¡üÈÐ:\n"
+
+#~ msgid "Uninstalling %s failed because of the following issue(s):\n"
+#~ msgstr "%s ¿¢ÚÅ¡¨Á ¸£ú측Ïõ ¸¡Ã½í¸Ç¡ø §¾¡üÈÐ:\n"
+
+#~ msgid "Uninstall failed..."
+#~ msgstr "¿¢ÚÅ¡¨Á §¾¡üÈÐ..."
+
+#~ msgid "Uninstall Failed"
+#~ msgstr "¿¢ÚÅ¡¨Á §¾¡üÈÐ"
+
+#~ msgid "Install failed..."
+#~ msgstr "¿¢Úר¸ §¾¡üÈÐ..."
+
+#~ msgid "Package Title"
+#~ msgstr "¦À¡¾¢ ¦Áý¦À¡Õû ¾¨ÄôÒ"
+
+#~ msgid "Size: "
+#~ msgstr "«Ç×:"
+
+#~ msgid "<size>"
+#~ msgstr "<«Ç×>"
+
+#~ msgid "<unknown>"
+#~ msgstr "<«È¢ÂôÀ¼¡¾Ð>"
+
+#~ msgid "License: "
+#~ msgstr "¯Ã¢Áõ:"
+
+#~ msgid "Build Date: "
+#~ msgstr "¸ðÊ ¿¡û:"
+
+#~ msgid "Vendor: "
+#~ msgstr "ÅÆíÌ¿÷:"
+
+#~ msgid "Update"
+#~ msgstr "ÒÐôÀ¢"
+
+#~ msgid "Verify"
+#~ msgstr "ºÃ¢À¡÷"
+
+#~ msgid "Go to selected file"
+#~ msgstr "¦ºÃ¢× ¦ºöÂôÀð¼ §¸¡ôÀ¢üÌî ¦ºø"
 
-#~ msgid "Could not retrieve a URL for %s"
-#~ msgstr "%s ìÌ ´Õ Ô.¬÷.±ø ³ Á£ð¸ ­ÂÄÅ¢ø¨Ä"
+#~ msgid "Package Contents: %d files"
+#~ msgstr "¦Áý¦À¡¾¢ô ¦À¡ÕǼì¸õ: %d §¸¡ôÒ¸û"
+
+#~ msgid "Package \"%s\" "
+#~ msgstr "¦Áý¦À¡¾¢ \"%s\""
+
+#~ msgid "version %s-%s"
+#~ msgstr "À¾¢ôÒ %s-%s"
+
+#~ msgid "file %s has an error!"
+#~ msgstr "§¸¡ôÒ %s -ø À¢¨ÆÔÇÐ!"
+
+#~ msgid "Verification completed."
+#~ msgstr "ºÃ¢À¡÷ò¾ø ÓÊ×üÈÐ."
+
+#~ msgid "Force install"
+#~ msgstr "ÅĢ ¿¢Úר¸"
+
+#~ msgid "Set port numer (80)"
+#~ msgstr "Ó¸ôÒ ±ñ¨½ 80 ¬ìÌ"
+
+#, fuzzy
+#~ msgid "Set tmp dir (/tmp)"
+#~ msgstr "¾üºÁ «¨¼× (/tmp/eazel-install)"
+
+#~ msgid "Reading the install package list %s"
+#~ msgstr "¦Áý¦À¡Õû ¿¢Ú× ÀðÊÂø %s ÀÊì¸ôÀθ¢ÈÐ"
+
+#~ msgid "Category = %s"
+#~ msgstr "À¢Ã¢× = %s"
+
+#~ msgid "Preflight (%ld bytes, %ld packages)"
+#~ msgstr "À½¢ìÌÓý (%ld ¨Àðθû %ld ¦Áý¦À¡¾¢¸û )"
+
+#, fuzzy
+#~ msgid "Removing package %s (0x%p) %s"
+#~ msgstr "%s %s ¦Áý¦À¡¾¢ ¿£ì¸ôÀθ¢ÈÐ "
+
+#~ msgid "Preparing package system"
+#~ msgstr "¦Áý¦À¡¾¢ «¨ÁôÒ ¯ÕÅ¡ì¸ôÀθ¢ÈÐ"
+
+#, fuzzy
+#~ msgid "Dependencies appear ok"
+#~ msgstr "º¡÷Ò¸û ºÃ¢Â¡¸ ¯ûÇÉ"
+
+#, fuzzy
+#~ msgid "Package %s had version %s and not %s"
+#~ msgstr "%s , %s ­Ä¢ÕóÐ %s ìÌ ²üÈò¾ØÅø «¨¼¸¢ÈÐ"
+
+#~ msgid "Dry Run Mode Activated.  Packages will not actually be installed ..."
+#~ msgstr "ÅÈñ¼ µð¼õ ¦ºÂøÀÎò¾ôÀð¼Ð. ¦Áý¦À¡¾¢¸û ¿¢ÚÅôÀ¼¡..."
+
+#~ msgid "Processing dep for %s, requires library %s"
+#~ msgstr "%s -ý º¡÷Ò  ¿¢¨Ä «ÄºôÀθ¢ÈÐ, áĸõ %s §¾¨Å"
+
+#~ msgid "Processing dep for %s, requires package %s"
+#~ msgstr "%s ý º¡÷Ò ¿¢¨Ä «ÄºôÀθ¢ÈÐ ¦Áý¦À¡¾¢ %s §¾¨Å"
+
+#~ msgid "Package %s conflicts with %s-%s"
+#~ msgstr "¦Áý¦À¡¾¢ %s , %s-%s ¯¼ý ´ùÅ¡ôÀ¢¨Æ "
+
+#~ msgid "Downloading package %s ..."
+#~ msgstr "¦Áý¦À¡¾¢ %s ­ÈìÌÁ¾¢Â¡¸¢ÈÐ..."
+
+#~ msgid ""
+#~ "\n"
+#~ "Is this okay?"
+#~ msgstr ""
+#~ "\n"
+#~ "­Ð ºÃ¢Â¡ ?"
+
+#~ msgid "Preparing to install 1 package"
+#~ msgstr "´Õ ¦Áý¦À¡¾¢Â¢¨É ¿¢ÚÅ¢¼ ²üÀ¡Î ¦ºöÂôÀθ¢ÈÐ"
+
+#~ msgid "Preparing to install %d packages"
+#~ msgstr "%d ¦Áý¦À¡¾¢¸¨Ç ¿¢ÚÅ¢¼ ²üÀ¡Î ¦ºöÂÀθ¢ÈÐ"
+
+#~ msgid "Installation aborted."
+#~ msgstr "¿¢Ú×¾ø ÓÈ¢×üÈÐ!"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s\n"
+#~ "%s\n"
+#~ "Erase the leftover RPM files?"
+#~ msgstr "Å¢¼ôÀð¼ §¸¡ôÒ¸¨Ç «Æ¢ì¸ðÎÁ¡?"
+
+#~ msgid "Could not find a valid boolean value for grey_out!"
+#~ msgstr "º¡õÀÄ¡ìÌ (grey_out) ±ýÀ¾ý ºÃ¢Â¡É âÄ¢Âý Á¾¢ôÀ¢¨Éì ¸¡½Å¢ø¨Ä!"
+
+#~ msgid "There is no service data !\n"
+#~ msgstr "§º¨Åò¾Ã× ­ø¨Ä! \n"
+
+#~ msgid "There is no eazel news data !\n"
+#~ msgstr "®ƒø ¦ºö¾¢ò ¾Ã× ­ø¨Ä! \n"
+
+#~ msgid "Could not fetch summary configuration !"
+#~ msgstr "ÅÊÅ¡ì¸ò¾¢ý ­Ú¾¢îÍÕì¸ò¨¾ì ¦¸¡½Ã ÓÊÂÅ¢ø¨Ä! "
+
+#~ msgid "The summary configuration contains no data!\n"
+#~ msgstr "­Ú¾¢îÍÕì¸ò¾¢ø ¾Ã× ­ø¨Ä!\n"
+
+#~ msgid "Cannot find the SUMMARY_DATA xmlnode!\n"
+#~ msgstr "­Ú¾¢îÍÕì¸ò¾Ã× xml ¸ÏÅ¢ø ¸¡½Å¢ø¨Ä\n"
+
+#~ msgid "Bailing from the SUMMARY_DATA parse!\n"
+#~ msgstr "­Ú¾¢îÍÕì¸ò¾Ã¨Å «Ä¸£ðÊÉ¢ýÚ ±È¢ÂôÀθ¢ÈÐ! \n"
+
+#~ msgid "Could not find any summary configuration data!\n"
+#~ msgstr "­Ú¾¢îÍÕì¸ ÅÊÅ¡ì¸ò¾ÃÅ¢¨Éì ¸¡½Å¢ø¨Ä! \n"
+
+#~ msgid "Bailing from summary configuration parse!\n"
+#~ msgstr "­Ú¾¢î ÍÕì¸ ÅÊÅ¡ì¸ «Ä¸£ðÊÉ¢ýÚ ±È¢ÂôÀθ¢ÈÐ!\n"
+
+#, fuzzy
+#~ msgid "Welcome Back %s!"
+#~ msgstr "¿¡ÊÄÍìÌ ¿øÅÃ×!"
+
+#, fuzzy
+#~ msgid "Your Services"
+#~ msgstr "§º¨Å¸û"
+
+#, fuzzy
+#~ msgid "Additional Services"
+#~ msgstr "®ƒø §º¨Å¸û"
+
+#, fuzzy
+#~ msgid "Current Updates"
+#~ msgstr "¾ü§À¡¨¾Â ±ñ½ì¸Õ"
+
+#, fuzzy
+#~ msgid "Version %s"
+#~ msgstr "À¾¢ôÒ: %s"
+
+#~ msgid "display service name and such"
+#~ msgstr "§º¨Åô ¦ÀÂâ¨Éì ¸¡ðθ"
+
+#~ msgid "maximum allowed difference in seconds"
+#~ msgstr "«ÛÁ¾¢ì¸ôÀð¼ ¦ÀÕÁ §ÅÚÀ¡Î ¦¿¡Ê¸Ç¢ø"
+
+#~ msgid "update the system clock"
+#~ msgstr "¸½¢É¢Â¢ý ¸Ê¨¸¨Âô ÒÐôÀ¢"
+
+#, fuzzy
+#~ msgid "specify time server"
+#~ msgstr "§¿Ãõ Ô.¬÷.±ø. (time url) ¾¨Éì ÌÈ¢ôÀ¢Î¸"
+
+#~ msgid "Time off by %d, max allowed diff is %d"
+#~ msgstr "§¿Ãõ %d «Ç× Á¡ÚÀθ¢ÈÐ , «ÛÁ¾¢ì¸ôÀð¼ ¦ÀÕÁ §ÅÚÀ¡Î (max diff) %d"
+
+#~ msgid "Could not read time-service config from %s"
+#~ msgstr "%s ±Ûõ ¸¡Äî §º¨Å ÅÊÅ¡ì¸ò¾¢¨Éô ÀÊì¸ ÓÊÂÅ¢ø¨Ä"
+
+#~ msgid "Vault location"
+#~ msgstr "Å¡øð ­¼õ"
+
+#~ msgid "Error: No operation supplied\n"
+#~ msgstr "À¢¨Æ: ¦ºÂø ²Ðõ ÅÆí¸ôÀ¼Å¢ø¨Ä\n"
+
+#~ msgid "Error: Invalid operation supplied (%s)\n"
+#~ msgstr "À¢¨Æ: ¦ºøÖÀÊ¡¸¡¾ ¦ºÂø ÅÆí¸ôÀð¼Ð(%s)\n"
+
+#~ msgid ""
+#~ "Error: Invalid syntax\n"
+#~ "Syntax: %s\n"
+#~ msgstr ""
+#~ "À¢¨Æ: ¦ºøÖÀÊ¡¸¡¾ ¦¾¡¼÷ \n"
+#~ "¦¾¡¼÷: %s\n"
+
+#, fuzzy
+#~ msgid "Caldera"
+#~ msgstr "¸Å¢Âð"
+
+#, fuzzy
+#~ msgid "Myplay"
+#~ msgstr "¸¡ðº¢"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error while copying.\n"
+#~ "%s is not readable."
+#~ msgstr ""
+#~ "¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
+#~ "§ºÕÁ¢¼õ ÀÊì¸-ÁðΧÁ."
+
+#, fuzzy
+#~ msgid ""
+#~ "Error while moving.\n"
+#~ "%s is not readable."
+#~ msgstr ""
+#~ "¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
+#~ "§ºÕÁ¢¼õ ÀÊì¸-ÁðΧÁ."
+
+#, fuzzy
+#~ msgid ""
+#~ "Error while linking.\n"
+#~ "%s is not readable."
+#~ msgstr ""
+#~ "¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
+#~ "§ºÕÁ¢¼õ ÀÊì¸-ÁðΧÁ."
+
+#, fuzzy
+#~ msgid ""
+#~ "Error while deleting.\n"
+#~ "%s is not readable."
+#~ msgstr ""
+#~ "¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
+#~ "§ºÕÁ¢¼õ ÀÊì¸-ÁðΧÁ."
+
+#, fuzzy
+#~ msgid ""
+#~ "Error while linking items to \"%s\".\n"
+#~ "The destination is not writable."
+#~ msgstr ""
+#~ "¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
+#~ "§ºÕÁ¢¼õ ÀÊì¸-ÁðΧÁ."
+
+#, fuzzy
+#~ msgid ""
+#~ "Error while copying.\n"
+#~ "There is no space on the destination."
+#~ msgstr ""
+#~ "¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
+#~ "§ºÕÁ¢¼ò¾¢ø ´Æ¢Å¢¼õ ­ø¨Ä."
+
+#, fuzzy
+#~ msgid ""
+#~ "Error while linking.\n"
+#~ "There is no space on the destination."
+#~ msgstr ""
+#~ "¦ºöÔõ §À¡Ð À¢¨Æ: %s%s .\n"
+#~ "§ºÕÁ¢¼ò¾¢ø ´Æ¢Å¢¼õ ­ø¨Ä."
+
+#, fuzzy
+#~ msgid ""
+#~ "Error \"%s\" while linking \"%s\".\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "À¢¨Æ:\" %s\" %s%s ¦ºöÔõ §À¡Ð .\n"
+#~ "¦¾¡¼Ã Å¢ÕõÒ¸¢È£÷¸Ç¡?"
+
+#~ msgid "You cannot throw \"%s\" into the Trash."
+#~ msgstr "\"%s\" ³ Ìô¨ÀìÌû ±È¢Â ÓÊ¡Ð."
+
+#~ msgid "Error Moving to Trash"
+#~ msgstr "Ìô¨ÀìÌû ¿¸÷òШ¸Â¢ø À¢¨Æ"
+
+#, fuzzy
+#~ msgid "folder"
+#~ msgstr "1 «¨¼×"
+
+#~ msgid "Folder Views"
+#~ msgstr "«¨¼× ¸¡ðº¢"
+
+#~ msgid "Folder Views Settings"
+#~ msgstr "«¨¼× ¸¡ðº¢ «¨ÁôÒ¸û"
+
+#~ msgid "Window Behavior"
+#~ msgstr "º¡ÇÃò¾¢ý ¿¼ò¨¾"
+
+#~ msgid "Sidebar Panels Description"
+#~ msgstr "µÃôÀð¨¼ô Àĸí¸û - Å¢Çì¸õ"
+
+#~ msgid "Choose which panels should appear in the sidebar"
+#~ msgstr "µÃôÀð¨¼Â¢ø §¾¡ýȧÅñÊ Àĸò¨¾ò ¦¾Ã¢× ¦ºö¸"
+
+#~ msgid "Appearance Settings"
+#~ msgstr "§¾¡üÈ «¨ÁôÒ¸û"
+
+#~ msgid "Views"
+#~ msgstr "¸¡ðº¢¸û"
+
+#~ msgid "Speed Tradeoffs Settings"
+#~ msgstr "§Å¸ ­ÆôÒ «¨ÁôÒ¸û"
+
+#~ msgid "Search Tradeoffs"
+#~ msgstr "§¾Î¾ø ­ÆôÒ"
+
+#~ msgid "Navigation Settings"
+#~ msgstr "¯Ä¡Åø «¨ÁôÒ¸û"
+
+#~ msgid "Home Location"
+#~ msgstr "Å£ðÊý ­¼õ"
+
+#~ msgid "HTTP Proxy"
+#~ msgstr "±î.Ê.Ê.À¢. Òá캢"
+
+#~ msgid "HTTP Proxy Port"
+#~ msgstr "±î.Ê.Ê.À¢ Òá캢 ШÈ"
+
+#~ msgid "current theme"
+#~ msgstr "¾ü§À¡¨¾Â ±ñ½ì¸Õ"
+
+#~ msgid "Ask before deleting items from the trash"
+#~ msgstr "Ìô¨Àò¦¾¡ðÊ¢ɢýÚ ¯ÕÀʸ¨Ç «Æ¢ìÌÓý §¸ð¸×õ"
+
+#~ msgid "Click policy"
+#~ msgstr "¸¢Ç¢ì ¦¸¡û¨¸"
+
+#~ msgid "Display text in icons"
+#~ msgstr "ÌÚõÀ¼ò¾¢ø ¯ûÇ ¯¨Ã¨Âì ¸¡ðÎ"
+
+#~ msgid "Show thumbnails for image files"
+#~ msgstr "¯ÕÅ째¡ôÒ¸¨Ç ¸ð¨¼ Å¢Ãø ¿¸ «ÇÅ¢ø ¸¡ðθ"
+
+#~ msgid "Read and write metadata in each folder"
+#~ msgstr "´ù¦Å¡Õ «¨¼Å¢Öõ ­¨¼ò ¾Ã¨Å ±Øи ÁüÚõ ÀÊì¸"
+
+#~ msgid "Font family used to display file names"
+#~ msgstr "§¸¡ôÀ¢ý ¦ÀÂ÷¸¨Ç ¸¡ðʼ ÀýÀÎòÐõ ±ØòÐŨ¸ì ÌÎõÀõ"
+
+#~ msgid "Always do slow, complete search"
+#~ msgstr "±ô§À¡Ðõ ¦ÁÐÅ¡É , ÓبÁÂ¡É §¾Î¾Äî ¦ºö"
+
+#~ msgid "Can add Content"
+#~ msgstr "¯ð¦À¡Õ¨Çî §º÷ì¸ ÓÊÔõ"
+
+#~ msgid "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*"
+#~ msgstr "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*"
+
+#~ msgid ""
+#~ "Sorry, %s can only open local files, and \"%s\" is remote. If you want to "
+#~ "open it with %s, make a local copy first."
+#~ msgstr ""
+#~ "ÁýÉ¢ì¸×õ, %s «ñ¨Á¢ÖûÇ §¸¡ôÒ¸¨ÇÁðÎõ ¾¢ÈìÌõ,ÁüÚõ \"%s\" ¦¾¡¨ÄÅ¢ÖûÇÐ. %s ³ì "
+#~ "¦¸¡ñÎ ¾¢Èì¸ Å¢ÕõÀ¢É¡ø, «ñ¨Á¢ø ´Õ ¿¸ø ±ÎòÐ즸¡ûÇ×õ."
+
+#~ msgid "Can't open remote file"
+#~ msgstr "¦¾¡¨ÄÅ¢ÖûÇ §¸¡ô¨Àò ¾¢Èì¸ ÓÊ¡Ð"
+
+#, fuzzy
+#~ msgid "with \"%s\" in the name"
+#~ msgstr "¦ÀÂâÛû \"%s\" ¯ûÇÐ "
+
+#~ msgid "regular files"
+#~ msgstr "Ó¨ÈÂ¡É §¸¡ôÒ¸û"
+
+#~ msgid "applications"
+#~ msgstr "ÀÂýÀ¡Î¸û"
+
+#~ msgid "directories"
+#~ msgstr "«¨¼×¸û"
+
+#, fuzzy
+#~ msgid "owned by \"%s\""
+#~ msgstr "\"%s\" ìÌ ¯Ã¢¨Á ¯ñÎ"
+
+#, fuzzy
+#~ msgid "modified on %s"
+#~ msgstr "%s ìÌô À¢ý Á¡üÈôÀð¼¨Å "
+
+#~ msgid "marked with \"%s\""
+#~ msgstr "\"%s\" ³ì ¦¸¡ñÎ ÌÈ¢ì¸ôÀð¼¨Å"
+
+#~ msgid "that"
+#~ msgstr "«ó¾"
+
+#~ msgid "Warning"
+#~ msgstr "±îºÃ¢ì¨¸"
+
+#~ msgid "_Cut Text"
+#~ msgstr "_¯¨Ã ¦ÅðÎ"
+
+#, fuzzy
+#~ msgid "Link to"
+#~ msgstr "­¨½ôÒò ¦¾¡Ì¾¢"
+
+#~ msgid "Open in _New Window"
+#~ msgstr "_Ò¾¢Â º¡ÇÃò¾¢ø ¾¢È"
+
+#~ msgid "Where:"
+#~ msgstr "±í§¸:"
+
+#, fuzzy
+#~ msgid "Quit Nautilus Desktop"
+#~ msgstr "¿¡ÊĨº Å¢ðÎ ¦ÅÇ¢§ÂÚ."
+
+#, fuzzy
+#~ msgid "New _Folder"
+#~ msgstr "Ò¾¢Â «¨¼×"
+
+#, fuzzy
+#~ msgid "_Open in New Window"
+#~ msgstr "_Ò¾¢Â º¡ÇÃò¾¢ø ¾¢È"
+
+#~ msgid "_Select All Files"
+#~ msgstr "±øÄ¡ì §¸¡ôÒ¸¨ÇÔõ ¦¾Ã¢×¦ºö"
+
+#~ msgid "No response"
+#~ msgstr "Å¢¨¼ ­ø¨Ä"
+
+#~ msgid "No indexer present"
+#~ msgstr "Íð¼ý ­ø¨Ä"
+
+#~ msgid "Error while trying to reindex: %s"
+#~ msgstr "ÁÚÍð¼ø ÓÂüº¢ ¦ºö¨¸Â¢ø À¢¨Æ:%s"
+
+#~ msgid "Your files are currently being indexed:"
+#~ msgstr "¯ÁÐ §¸¡ôÒ¸û Íð¼¡ì¸ôÀθ¢ÈÐ:"
+
+#~ msgid "Indexing Info..."
+#~ msgstr "Íð¼ø ¾¸Åø¸û..."
+
+#~ msgid "User Main Directory"
+#~ msgstr "ÀÂÉ÷ Ó¾ý¨Á «¨¼×"
+
+#~ msgid "Desktop Directory"
+#~ msgstr "¸½¢§Á¨º «¨¼×"
+
+#~ msgid "Missing Directories"
+#~ msgstr "¸¡½¡¾ «¨¼×¸û"
+
+#~ msgid ""
+#~ "Nautilus can't be used now. Rebooting the computer or installing Nautilus "
+#~ "again may fix the problem."
+#~ msgstr ""
+#~ "¿¡ÊÄŠ ³ ­ô§À¡Ð ÀÂýÀÎò¾ ÓÊ¡Ð. ¸½¢É¢¨Â ÁÚÓ¨È ¦¾¡¼ì¸õ ¦ºöЫøÄÐ ¿¡ÊÄŠ ³ ¿¢ÚÅ¢ "
+#~ "«¾ý ãÄõ À¢Ã¨ÉìÌ ¾£÷× ¸¡ñ¸."
+
+#~ msgid ""
+#~ "For beginner users that are not yet\n"
+#~ "familiar with the working of GNOME and Linux."
+#~ msgstr ""
+#~ "̧ɡõ ÁüÚõ Ä¢É캢ø ­ýÛõ \n"
+#~ "ÀâîºÂÁ¢øÄ¡¾ ¬ÃõÀ ¿¢¨Äô ÀÂÉ÷¸ÙìÌ."
+
+#, fuzzy
+#~ msgid ""
+#~ "Eazel offers a growing number of services to help you\n"
+#~ "install and maintain new software and manage your files\n"
+#~ "across the network.  Choose an option below, and the\n"
+#~ "information will be presented in Nautilus after you've\n"
+#~ "finished setting up."
+#~ msgstr ""
+#~ "®ƒø, Ò¾¢Â ¦Áý¦À¡Õ¨Ç ¿¢ÚÅ ÁüÚõ ¯í¸û §¸¡ôÒ¸¨Ç ŨÄ¢ø ÀáÁâòÐ\n"
+#~ " ¯¾Å ÅÇ÷óÐ ÅÕõ ÀüÀÄ §º¨Å¸¨Ç ¯í¸ÙìÌ ÅÆí̸¢ÈÐ.\n"
+#~ "®ƒÄ¢ý §º¨Å¸¨Çô ÀüÈ¢ §ÁÖõ ¸¡½ Å¢ÕõÀ¢É¡ø '«ÎòÐ' ±ýÈ ¦À¡ò¾¡¨É \n"
+#~ "«Øò¾×õ. "
+
+#~ msgid "I want to learn more about Eazel services."
+#~ msgstr "¿¡ý ®ƒø §º¨Å¸¨ÇôÀüÈ¢ §ÁÖõ «È¢Â Å¢ÕõÒ¸¢§Èý"
+
+#~ msgid "I want to sign up for Eazel services now."
+#~ msgstr "®ƒø §º¨Å¸Ç¢ø  §ºÃ Å¢ÕõÒ¸¢§Èý."
+
+#~ msgid "I've already signed up and want to login now."
+#~ msgstr "¿¡ý Óý§À §º÷óÐÅ¢ð§¼ý ÁüÚõ ѨÆÀ¾¢× ¦ºö ŢÕõÒ¸¢§Èý"
+
+#~ msgid "I don't want to learn about Eazel services at this time."
+#~ msgstr "®ƒø §º¨Å¸û ÀüÈ¢ ¦¾Ã¢óÐ ¦¸¡ûÇ ­ô§À¡Ð Å¢ÕõÀÅ¢ø¨Ä"
+
+#~ msgid ""
+#~ "Nautilus will now contact Eazel services to verify your \n"
+#~ "web connection and download the latest updates.  \n"
+#~ "Click the Next button to continue."
+#~ msgstr ""
+#~ "¯ÁÐ  Å¨Ä ­¨½ô¨Àî ºÃ¢À¡÷òÐ ºÁ£Àò¾¢ø ÒÐôÀ¢ò¾¨Å¸¨Ç ­ÈìÌÁ¾¢ ¦ºö \n"
+#~ " ¿¡ÊÄŠ ­ô§À¡Ð ®ƒø §º¨Å¸Ù¼ý ¦¾¡¼÷Ò ¦¸¡ûÙõ\n"
+#~ " §Á§Ä ¦¾¡¼÷ó¾¢¼,  «ÎòÐ ±ýÈ ¦À¡ò¾¡¨É ¸¢Ç¢ì ¦ºöÂ×õ."
+
+#~ msgid "Updating Nautilus"
+#~ msgstr "¿¡ÊÄŠ ÒÐôÀ¢ò¾ø"
+
+#~ msgid "No, I don't wish to connect and update Nautilus now."
+#~ msgstr "­ø¨Ä,  ŨÄ¢ø ­¨½óÐ ,¿¡ÊĨ…ô ÒÐì¸ ¿¡ý Å¢ÕõÀÅ¢ø¨Ä."
+
+#~ msgid "HTTP Proxy Configuration"
+#~ msgstr "±î.Ê.Ê.À¢ Å¢¨¼ ÅÊŨÁôÒ"
+
+#~ msgid ""
+#~ "We are now contacting the Eazel service to test your \n"
+#~ "web connection and update Nautilus."
+#~ msgstr ""
+#~ "¯ÁÐ Å¨Ä ­¨½ô¨Àô À⧺¡¾¨É ¦ºöÐ À¢ýÒ ¿¡ÊĨ…ô ÒÐôÀ¢ì¸ \n"
+#~ "­ô§À¡Ð ¿¡õ ®ƒø §º¨ÅÔ¼ý ¦¾¡¼÷Ò ¦¸¡û¸¢§È¡õ."
+
+#~ msgid ""
+#~ "Since this is the first time that you've launched\n"
+#~ "Nautilus, we'd like to ask you a few questions\n"
+#~ "to help personalize it for your use."
+#~ msgstr ""
+#~ "¿£í¸û ¿¡ÊĨºò ¦¾¡¼ìÌÅÐ ­Ð§Å Ó¾ýӨȡž¡ø\n"
+#~ "¯í¸ÙìÌô ÀÂýÀÎõ ¦À¡ÕðÎ , ¾ýÅÆ¢ôÀÎò¾¢ ¯¾Å¢¼ º¢Ä §¸ûÅ¢¸û §¸ð¸¢§È¡õ."
+
+#~ msgid "Press the next button to continue."
+#~ msgstr "§Á§Ä ¦¾¡¼Ã, «ÎòÐ ±ýÈ ¦À¡ò¾¡¨É «Øò¾×õ."
+
+#~ msgid ""
+#~ "Click the finish button to launch Nautilus.\n"
+#~ "We hope that you enjoy using it!"
+#~ msgstr ""
+#~ "¿¡ÊĨºò ¦¾¡¼í¸, \"ÓÊó¾Ð\" ±ýÈ ¦À¡ò¾¡¨Éì ¸¢Ç¢ì ¦ºöÂ×õ.\n"
+#~ "¿£í¸û ­¾¨É ¯À§Â¡¸¢òÐ Á¸¢ú×ÚÅ£÷¸û ±É ¿õÒ¸¢§È¡õ!"
+
+#~ msgid "Sign Up for Eazel Services"
+#~ msgstr "®ƒø §º¨Å¢ø §º÷ó¾¢Î¸"
+
+#~ msgid "Don't draw background and icons on desktop."
+#~ msgstr "¸½¢§Á¨º Á£Ð ÌÚõÀ¼í¸¨ÇÔõ À¢ýɽ¢¨ÂÔõ ŨÃÂü¸"
+
+#~ msgid "Draw background and icons on desktop."
+#~ msgstr "¸½¢§Á¨º Á£Ð À¢ýɽ¢¨ÂÔõ ÌÚõÀ¼í¸¨ÇÔõ Ũø."
+
+#~ msgid "nautilus: --quit and --start-desktop cannot be used together.\n"
+#~ msgstr "¿¡ÊÄŠ:-¦ÅÇ¢§Â ÁüÚõ --¸½¢§Á¨ºò ¦¾¡¼í¸ø ­½óÐ ÀÂý ¦ºö ÓÊ¡Ð.\n"
+
+#~ msgid "nautilus: --restart and --start-desktop cannot be used together.\n"
+#~ msgstr "¿¡ÊÄŠ: --ÁÚ¦¾¡¼ì¸õ ÁüÚõ --¸½¢§Á¨ºò ¦¾¡¼í¸ø ­½óÐ ÀÂý ¦ºö ÓÊ¡Ð.\n"
+
+#~ msgid ""
+#~ "nautilus: --stop-desktop and --start-desktop cannot be used together.\n"
+#~ msgstr "¿¡ÊÄŠ:-¸½¢§Á¨º ¿¢Úò¾õ --ÁÚ¦¾¡¼ì¸õ  ­½óÐ ÀÂý ¦ºö ÓÊ¡Ð.\n"
+
+#~ msgid "Customization Options"
+#~ msgstr "¾É¢ôÀÂÉ¡ì¸ Å¢ÕôÀí¸û"
+
+#~ msgid "Sorry, but the background %s couldn't be installed."
+#~ msgstr "ÁýÉ¢ì¸×õ, ¬Â¢ý À¢ýɽ¢ %s ¨Â ¿¢ÚÅ ÓÊ¡Ð"
+
+#~ msgid "Couldn't install background"
+#~ msgstr "À¢ýɽ¢¨Â ¿¢ÚÅ ÓÊ¡Ð"
+
+#~ msgid "Add a new background"
+#~ msgstr "Ò¾¢Â À¢ýɽ¢¨Âî §º÷:"
+
+#~ msgid "Click on a background to remove it"
+#~ msgstr "¿£ì¸ §ÅñÎÁ¡Â¢ý À¢ýɽ¢Â¢ø ¸¢Ç¢ì ¦ºöÂ×õ"
+
+#~ msgid "With Emblem"
+#~ msgstr "º¢ýÉòмý"
+
+#~ msgid "Last Modified"
+#~ msgstr "Á¡üÈôÀð¼ ¸¨¼º¢ ¿¡û"
+
+#, fuzzy
+#~ msgid "Owner"
+#~ msgstr "¯Ã¢§Â¡ý:"
+
+#~ msgid "starts with"
+#~ msgstr "¯¼ý ¦¾¡¼í̸¢ÈÐ"
+
+#~ msgid "ends with"
+#~ msgstr "¯¼ý Óʸ¢ÈÐ"
+
+#~ msgid "matches glob"
+#~ msgstr "glob ¯ðý ¦À¡Õóи¢ÈÐ"
+
+#~ msgid "matches regexp"
+#~ msgstr "regexp ¯¼ý ¦À¡Õóи¢ÈÐ"
+
+#~ msgid "includes all of"
+#~ msgstr "±øÄ¡õ §º÷òÐ"
+
+#~ msgid "includes any of"
+#~ msgstr "²¾¡ÅÐ ´ý¨Èî §º÷òÐ"
+
+#~ msgid "includes none of"
+#~ msgstr "´ýÚõ §º÷측Áø"
+
+#~ msgid "is not"
+#~ msgstr "­ø¨Ä"
+
+#~ msgid "text file"
+#~ msgstr "¯¨Ãì §¸¡ôÒ"
+
+#~ msgid "application"
+#~ msgstr "ÀÂýÀ¡Î"
+
+#~ msgid "directory"
+#~ msgstr "«¨¼×"
+
+#~ msgid "larger than"
+#~ msgstr "Å¢¼ô ¦ÀâÐ"
+
+#~ msgid "smaller than"
+#~ msgstr "Å¢¼î º¢È¢Ð"
+
+#~ msgid "marked with"
+#~ msgstr "¯¼ý ÌÈ¢ì¸ôÀð¼Ð"
+
+#~ msgid "not marked with"
+#~ msgstr "¯¼ý ÌÈ¢ì¸ôÀ¼Å¢ø¨Ä"
+
+#~ msgid "is after"
+#~ msgstr "À¢ýÒ"
+
+#~ msgid "is before"
+#~ msgstr "ÓýÒ"
+
+#~ msgid "is yesterday"
+#~ msgstr "§¿üÚ"
+
+#~ msgid "is within a week of"
+#~ msgstr "­ùÅ¡Ãò¾¢üÌû"
+
+#~ msgid "is within a month of"
+#~ msgstr "Á¡¾¾¢üÌû"
+
+#, fuzzy
+#~ msgid "C_hange Appearance..."
+#~ msgstr "_§¾¡üÈò¨¾ Á¡üÚ¸"
+
+#, fuzzy
+#~ msgid ""
+#~ "Display the Property Browser, containing patterns, colors, and emblems"
+#~ msgstr ""
+#~ "¦À¡Õð¸ÙìÌô ÀñÒ¸¨Çî §º÷ì¸×õ  ÁüÚõ §¾¡üÈò¨¾ò ¾É¢ôÀÂÉ¡ì¸×õ ¯Ä¡Å¢ô ÀñÒ¸¨Çì "
+#~ "¸¡ñÀ¢ì¸¢ÈÐ. "
+
+#~ msgid "Edit Settings..."
+#~ msgstr "«¨ÁôÒ¸¨Ç Á¡üÚ..."
+
+#, fuzzy
+#~ msgid "Edit settings for the current user level"
+#~ msgstr "ÀÂÉ÷ ¿¢¨Ä «¨ÁôÒ¸¨Ç Á¡üÚ"
+
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "¦¾Ã¢× ¦ºöÂôÀð¼ ¯¨Ã¨Â À¢¨½ôÀĨ¸Â¢ø ­¼¡Áø,  ¿£ì̸¢ÈÐ"
+
+#, fuzzy
+#~ msgid "Use Advanced settings"
+#~ msgstr "%s «¨ÁôÒ¸¨Ç ¯À§Â¡¸¢"
+
+#, fuzzy
+#~ msgid "Use Beginner settings"
+#~ msgstr "%s «¨ÁôÒ¸¨Ç ¯À§Â¡¸¢"
+
+#, fuzzy
+#~ msgid "Use Intermediate settings"
+#~ msgstr "%s «¨ÁôÒ¸¨Ç ¯À§Â¡¸¢"
+
+#~ msgid "_Web Search"
+#~ msgstr "_ŨÄò §¾¼ø"
+
+#~ msgid "Search For:"
+#~ msgstr "§¾Î¸:"
+
+#~ msgid "Add new theme"
+#~ msgstr "Ò¾¢Â ±ñ½ì¸Õ¨Åî §º÷ì¸×õ"
+
+#~ msgid "Inadequate Permissions"
+#~ msgstr "«ÛÁ¾¢¸û §¾¨Åį̀È×"
+
+#~ msgid ""
+#~ "Couldn't display \"%s\", because Nautilus cannot handle items of this "
+#~ "unknown type."
+#~ msgstr ""
+#~ "\"%s\" ³ì ¸¡ð¼ÓÊÂÅ¢ø¨Ä, ²¦ÉÉ¢ø «È¢ÂôÀ¼¡¾ ­¾ý ¯ÕôÀʸ¨Çì ¨¸Â¡Ç ¿¡ÊÄ…¡ø ÓÊ¡Ð."
+
+#~ msgid ""
+#~ "None of the settings for the %s level can be edited. If you want to edit the "
+#~ "settings you must choose the %s or %s level. Do you want to switch to the %s "
+#~ "level now and edit its settings?"
+#~ msgstr ""
+#~ "%s ¿¢¨Äì ¸¡É «¨ÁôÒ¸û ´ý¨ÈÔõ Á¡üÈ ­ÂġЫ¨ÁôÒ¸¨Ç Á¡üÈ ¿£í¸û Å¢ÕõÀ¢É¡ø %s  «øÄÐ "
+#~ "%s ¿¢¨Ä¨Âò ¦¾Ã¢× ¦ºö§ÅñÎõ%s ¿¢¨ÄìÌ Á¡È¢ «¨ÁôÒ¸¨Ç Á¡üÈ §ÅñÎÁ¡?"
+
+#~ msgid "Switch to %s Level?"
+#~ msgstr "%s ìÌ ¿¢¨Ä Á¡È §ÅñÎÁ¡?"
+
+#~ msgid "_Browse"
+#~ msgstr "_¯Ä×"
+
+#, fuzzy
+#~ msgid "Edit %s Settings"
+#~ msgstr "«¨ÁôÒ¸¨Ç Á¡üÚ..."
+
+#, fuzzy
+#~ msgid "Edit %s Settings..."
+#~ msgstr "«¨ÁôÒ¸¨Ç Á¡üÚ..."
 
 #~ msgid "Could not retrieve a URL for id %s"
 #~ msgstr "%s ìÌ ´Õ Ô.¬÷.±ø «¨¼Â¡Çò¨¾ Á£ð¸ ­ÂÄÅ¢ø¨Ä"
@@ -6353,9 +11111,6 @@ msgstr "%.0f%%"
 #~ msgid "linked"
 #~ msgstr "­¨½ì¸ôÀð¼Ð"
 
-#~ msgid "copied"
-#~ msgstr "¿¸¦ÄÎì¸ôÀð¼Ð"
-
 #, fuzzy
 #~ msgid "Sorry, but \"%s\" is a reserved keyword"
 #~ msgstr "ÁýÉ¢ì¸×õ, ¬Â¢ý %s ´Õ ºÃ¢Â¡É ±ñ½ì¸Õ «¨¼ÅøÄ."
@@ -6384,15 +11139,9 @@ msgstr "%.0f%%"
 #~ "\n"
 #~ "µÃôÀð¨¼ì ¸¡ðº¢ ¸ÕÅ¢ôÀ𨼠¦À¡ò¾¡¨É ¸¢Ç¢ì ¦ºö¾£÷"
 
-#~ msgid "Loser"
-#~ msgstr "­ÆôÀ÷"
-
 #~ msgid "Kill the Loser sidebar view."
 #~ msgstr "­ÆôÀ÷ µÃôÀð¨¼ì ¸¡ðº¢¨Â즸¡¨Ä ¦ºö"
 
-#~ msgid "Couldn't read directory"
-#~ msgstr "«¨¼Å¢¨Éô ÀÊì¸ ÓÊÂÅ¢ø¨Ä"
-
 #~ msgid "Creating temporary download directory ...\n"
 #~ msgstr "­ÈìÌÁ¾¢¦ºö§ÅñÊ ¾ü¸¡Ä¢¸ «¨¼× À¨¼ì¸ôÀθ¢ÈÐ...\n"
 
@@ -6420,9 +11169,6 @@ msgstr "%.0f%%"
 #~ msgid "%s %s: couldn't find this package\n"
 #~ msgstr "%s %s: ¦Áý¦À¡¾¢¨Âì ¸¡½Å¢ø¨Ä\n"
 
-#~ msgid "%s %s: source package (not supported)\n"
-#~ msgstr "%s %s: ãÄ ¦Áý¦À¡¾¢ (¬¾Ã× «Ç¢ì¸ôÀ¼¡Ð)\n"
-
 #~ msgid "%s %s: would break other installed packages\n"
 #~ msgstr "%s %s: (ÓýÒ) ¿¢ÚÅôÀð¼ ­¾Ã ¦Áý¦À¡¾¢¸¨Ç ÓÈ¢ìÌõ\n"
 
@@ -6441,9 +11187,6 @@ msgstr "%.0f%%"
 #~ msgid "Reset _Background"
 #~ msgstr "_À¢ýɽ¢¨Â Á£ðÀ¢"
 
-#~ msgid "_New Folder"
-#~ msgstr "ÒÐ «¨¼×"
-
 #~ msgid "Choose an order for the icons in this folder"
 #~ msgstr "­ó¾ «¨¼Å¢ø ¯ûÇ ÌÚõÀ¼í¸ÙìÌ Å⨺¨Âò §¾÷ó¦¾Î"
 
@@ -6476,6 +11219,3 @@ msgstr "%.0f%%"
 #~ "Displays a list of alternative appearances, to allow you to change the "
 #~ "appearance"
 #~ msgstr "§¾¡üÈõ"
-
-#~ msgid "Displays information about the Nautilus program"
-#~ msgstr "¿¡ÊÄŠ ¿¢Ã¨Äô ÀüȢ ¾¸Å¨Äì ¸¡ðθ¢ÈÐ"
diff --git a/po/tr.po b/po/tr.po
index f0458d87c..d2c6da17a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,10 +2,15 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Fatih Demir <kabalak@gmx.net>, 2000.
 # 
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 1.0\n"
-"POT-Creation-Date: 2001-03-20 13:16+0100\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-03-07 13:17+0100\n"
 "Last-Translator: Görkem Cetin <gorkem@gelecek.com.tr>\n"
 "Language-Team: GNOME Turk <gnome-turk@gnome.org>\n"
@@ -169,8 +174,8 @@ msgstr "Geri"
 # components/help/converters/gnome-db2html2/gdb3html.c:717
 # src/nautilus-shell-ui.xml.h:37
 #: components/help/converters/gnome-db2html2/gdb3html.c:721
-#: libnautilus-extensions/nautilus-global-preferences.c:686
-#: src/nautilus-shell-ui.xml.h:38
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "Baþlangýç"
 
@@ -394,16 +399,14 @@ msgstr "Çekirdek Yordamlarý"
 # components/help/hyperbola-filefmt.c:630
 # libnautilus-extensions/nautilus-stock-dialogs.c:446
 #: components/help/hyperbola-filefmt.c:703
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
 msgid "Info"
 msgstr "Bilgi"
 
-#: components/help/hyperbola-nav-tree.c:279
+#: components/help/hyperbola-nav-tree.c:310
 msgid "Introductory Documents:"
 msgstr "Giriþ Belgeleri:"
 
-#: components/help/hyperbola-nav-tree.c:293
+#: components/help/hyperbola-nav-tree.c:324
 msgid "Documents by Subject:"
 msgstr "Konularýna Göre Belgeler:"
 
@@ -495,7 +498,7 @@ msgid "History sidebar panel for Nautilus"
 msgstr "Nautilus için geçmiþ yan çubuk paneli"
 
 # components/image-viewer/nautilus-image-view.c:829
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "Bonobo baþlatýlamadý"
 
@@ -570,7 +573,7 @@ msgstr "Ýçerik izleme görüntüsünü öldür"
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "_Dosya"
 
@@ -674,7 +677,7 @@ msgstr "Yançubuk Ýzleyici"
 
 # components/mozilla/mozilla-preferences.cpp:118
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -685,7 +688,7 @@ msgstr ""
 
 # components/mozilla/mozilla-preferences.cpp:125
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -1161,7 +1164,6 @@ msgstr "Eskiler"
 
 # components/music/mpg123.c:32
 #: components/music/mpg123.c:32
-#: libnautilus-extensions/nautilus-font-picker.c:117
 msgid "Other"
 msgstr "Diðer"
 
@@ -1964,10 +1966,10 @@ msgstr "Beklet"
 # libnautilus-extensions/nautilus-file-operations.c:929
 # src/nautilus-shell-ui.xml.h:55
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:945
-#: libnautilus-extensions/nautilus-file-operations.c:960
 #: libnautilus-extensions/nautilus-file-operations.c:979
-#: src/nautilus-shell-ui.xml.h:60
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "Dur"
 
@@ -2029,24 +2031,6 @@ msgstr "Müzik görünüm mimarisi"
 msgid "View as Music"
 msgstr "Müzik olarak göster"
 
-# libnautilus-extensions/nautilus-icon-factory.c:133
-#. FIXME: eventually, get this from preferences
-#. set up the default font
-#: components/notes/nautilus-notes.c:200
-#: components/text/nautilus-text-view.c:186
-#: libnautilus-extensions/nautilus-global-preferences.c:1118
-#: libnautilus-extensions/nautilus-icon-container.c:3332
-#: libnautilus-extensions/nautilus-icon-container.c:3333
-#: libnautilus-extensions/nautilus-icon-container.c:3334
-#: libnautilus-extensions/nautilus-icon-container.c:3335
-#: libnautilus-extensions/nautilus-icon-container.c:3336
-#: libnautilus-extensions/nautilus-icon-container.c:3337
-#: libnautilus-extensions/nautilus-icon-container.c:3338
-#: libnautilus-extensions/nautilus-preferences-item.c:482
-#: src/nautilus-sidebar-title.c:500
-msgid "helvetica"
-msgstr "helvetica"
-
 # components/notes/Nautilus_View_notes.oaf.in.h:1
 #: components/notes/Nautilus_View_notes.oaf.in.h:1
 msgid "Factory for annotation view"
@@ -2164,7 +2148,7 @@ msgstr "Arama CGI tanýmla"
 #: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
 #: components/services/install/command-line/eazel-test-packsys.c:590
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "Hata bilgilerini göster"
 
@@ -2242,188 +2226,192 @@ msgstr "RPM argümanlarý gereken dosya isimleridir"
 msgid "Run Query"
 msgstr "Aramayý Baþlat"
 
+# libnautilus-extensions/nautilus-global-preferences.c:893
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
+#, fuzzy
+msgid "Revert"
+msgstr "hiç bir zaman"
+
 # components/services/install/command-line/eazel-alt-install-corba.c:115
-#. Disabled for 1.0
-#. {"revert", 'r', POPT_ARG_NONE, &arg_revert, 0, N_("Revert"), NULL},
-#: components/services/install/command-line/eazel-alt-install-corba.c:127
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr "root tanýmla"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:116
-#: components/services/install/command-line/eazel-alt-install-corba.c:128
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "Sunucuyu belirle"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:129
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
 msgid "Dont print too much, just problems and download"
 msgstr "Fazla bilgi aktarma. Sadece problemleri yaz ve indir"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:117
-#: components/services/install/command-line/eazel-alt-install-corba.c:130
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr "ssl isimlendirmesi yap"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:131
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
 msgid "argument is a suite id"
 msgstr ""
 
 # components/services/install/command-line/eazel-alt-install-corba.c:118
-#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "Deneme turlarýný dön"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:120
-#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr "Kullanýcý adýna izin ver"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:121
-#: components/services/install/command-line/eazel-alt-install-corba.c:134
-#: components/services/install/lib/eazel-install-problem.c:1011
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "Yenilemelere izin ver"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:122
-#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "Detaylý bilgi ver"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:960
-#: components/services/install/command-line/eazel-alt-install-corba.c:136
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
 msgid "Install a specific package version"
 msgstr "Belli bir paket sürümünü kur"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:159
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
 msgid "*** You cannot specify more then one protocol type.\n"
 msgstr "*** Birden fazla protokol türü belirtemezsiniz.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:176
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
 msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
 msgstr "*** Hem sil, hem de geri al? :-) \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:285
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, c-format
 msgid "File conflict checking %s...\n"
 msgstr "Dosya çakýþmalarý denetleniyor (%s)...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:299
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, c-format
 msgid "File uniqueness checking %s...\n"
 msgstr "Dosyalarýn doðruluðu denetleniyor (%s)...\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:313
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
 #, c-format
 msgid "Feature consistency checking %s...\n"
 msgstr "Özelliklerin bütünlüðü denetleniyor (%s)...\n"
 
 # components/services/install/lib/eazel-install-protocols.c:108
 # components/services/install/lib/eazel-install-protocols.c:249
-#: components/services/install/command-line/eazel-alt-install-corba.c:344
-#: components/services/install/lib/eazel-install-protocols.c:110
-#: components/services/install/lib/eazel-install-protocols.c:248
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
 #, c-format
 msgid "Downloading %s..."
 msgstr "%s indiriliyor..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:360
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
 msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
 msgstr "%s indiriliyor... (%d/%d) = %d%% %.1f KB/s"
 
 # components/services/install/lib/eazel-install-protocols.c:108
 # components/services/install/lib/eazel-install-protocols.c:249
-#: components/services/install/command-line/eazel-alt-install-corba.c:368
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
 msgid "Downloading %s... (%d/%d) = %d%%"
 msgstr "%s indiriliyor... (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:376
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
 #, c-format
 msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
 msgstr "%s indiriliyor... (%d/%d) %.1f KB/s Tamamlandý\n"
 
 # components/services/install/lib/eazel-install-protocols.c:108
 # components/services/install/lib/eazel-install-protocols.c:249
-#: components/services/install/command-line/eazel-alt-install-corba.c:381
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
 #, c-format
 msgid "Downloading %s... %3.1f KB/s Done\n"
 msgstr "%s tamamlandý... %3.1f KB/s Tamamlandý\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:409
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "%s kuruluyor (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:417
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "%s siliniyor (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:439
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "%s kuruluyor (%d/%d), (%d/%d)b - (%d/%d) = %d%% Tamamlandý\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:446
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Tamamlandý\n"
 
 # libnautilus-extensions/nautilus-program-chooser.c:1231
 # src/nautilus-property-browser.c:365
-#: components/services/install/command-line/eazel-alt-install-corba.c:454
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
 msgid "Done\n"
 msgstr "Bitti\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:474
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
 #, c-format
 msgid "Download of %s FAILED\n"
 msgstr "%s paketinin alýnmasýnda HATA\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:496
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
 #, c-format
 msgid "Package %s failed to uninstall.\n"
 msgstr "%s paketi silinemedi.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:498
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
 #, c-format
 msgid "Package %s failed to install.\n"
 msgstr "%s paketi kurulamadý.\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:519
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
 #, c-format
 msgid "\t· Problem : %s\n"
 msgstr "\t· Sorun : %s\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:528
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
 #, c-format
 msgid "\t· Action : %s\n"
 msgstr "\t· Ýþlem : %s\n"
 
 # components/services/vault/command-line/main.c:47
-#: components/services/install/command-line/eazel-alt-install-corba.c:571
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
 msgid "Cancelling operation\n"
 msgstr "Ýþlem durduruluyor\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:582
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
 #, c-format
 msgid "About to install a total of %d packages, %dKB\n"
 msgstr "Toplam %d paket, %dKb kurulmak üzere hazýr\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:586
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
 #, c-format
 msgid "About to uninstall a total of %d packages, %dKB\n"
 msgstr "Toplam %d paket, %dKB silinmek üzere hazýr\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:590
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
 #, c-format
 msgid "About to revert a total of %d packages, %d KB\n"
 msgstr "%d paket ve %d KB geri alýnmak üzere\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:607
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
 #, c-format
 msgid "\t· %s and it's dependencies\n"
 msgstr "\t· %s ve baðýmlýlýklarý\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:610
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
 #, c-format
 msgid "\t· %s\n"
 msgstr "\t· %s\n"
@@ -2433,7 +2421,7 @@ msgstr "\t· %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n) " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:638
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
 msgid "Save transaction report ? (y/n) "
 msgstr "Rapor kaydedilsin mi ? (e/h) "
 
@@ -2441,31 +2429,31 @@ msgstr "Rapor kaydedilsin mi ? (e/h) "
 #. I18N note: y is the letter for the word Yes. This is
 #. used in the response for a yes/no questions. Your translation
 #. must be 1 character only.
-#: components/services/install/command-line/eazel-alt-install-corba.c:649
-#: components/services/install/command-line/eazel-alt-install-corba.c:769
-#: components/services/install/command-line/eazel-alt-install-corba.c:811
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
 msgid "y"
 msgstr "e"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:670
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
 #, c-format
 msgid "Dependency : %s needs %s\n"
 msgstr "Baðýmlýlýk: %s paketinin %s'e ihtiyacý var\n"
 
 #. I18N note: %s is a package name
-#: components/services/install/command-line/eazel-alt-install-corba.c:688
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
 #, c-format
 msgid "Package %s failed md5 check!\n"
 msgstr "%s paketinde md5 hatasý!\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:690
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
 #, c-format
 msgid "\t· server MD5 checksum is %s\n"
 msgstr "\t· sunucu MD5 deðeri %s\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:692
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
 #, c-format
 msgid "\t· actual MD5 checksum is %s\n"
 msgstr "\t· gerçek MD5 deðeri %s\n"
@@ -2475,7 +2463,7 @@ msgstr "\t· gerçek MD5 deðeri %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:758
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
 msgid "Continue? (y/n) "
 msgstr "Devam? (e/h) "
 
@@ -2484,93 +2472,93 @@ msgstr "Devam? (e/h) "
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:799
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
 msgid "Should I delete the RPM files? (y/n) "
 msgstr "RPM dosyalarý silinsin mi? (e/h) "
 
 # components/music/mpg123.c:51
-#: components/services/install/command-line/eazel-alt-install-corba.c:831
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
 msgid "Operation ok\n"
 msgstr "Ýþlem tamamlandý\n"
 
 # data/browser.xml.h:15
-#: components/services/install/command-line/eazel-alt-install-corba.c:833
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
 msgid "Operation failed\n"
 msgstr "Ýþlem hata verdi\n"
 
 # components/rpmview/nautilus-rpm-view.c:284
 # components/services/install/nautilus-view/Nautilus_View_install.oaf.in.h:1
 # components/services/install/server/Trilobite_Service_install.oaf.in.h:2
-#: components/services/install/command-line/eazel-alt-install-corba.c:959
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
 msgid "Installing"
 msgstr "Kuruluyor"
 
 # components/rpmview/nautilus-rpm-view.c:309
-#: components/services/install/command-line/eazel-alt-install-corba.c:968
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
 msgid "Uninstalling"
 msgstr "Siliniyor"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:983
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
 msgid "Only one operation at a time please."
 msgstr "Ayný anda tek bir iþlem yapýlabilir."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:988
-#: components/services/install/command-line/eazel-alt-install-corba.c:996
-#: components/services/install/command-line/eazel-alt-install-corba.c:1040
-#: components/services/install/command-line/eazel-alt-install-corba.c:1047
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
 #, c-format
 msgid "%s: --help for usage\n"
 msgstr "%s: yardým için --help\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
 #, c-format
 msgid "Name         : %s\n"
 msgstr "Ýsim         : %s\n"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:979
-#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
 #, c-format
 msgid "Version      : %s\n"
 msgstr "Sürüm        : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1014
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
 #, c-format
 msgid "Minor        : %s\n"
 msgstr "Alt sürüm    : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
 #, c-format
 msgid "Size         : %d\n"
 msgstr "Boy          : %d\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
 #, c-format
 msgid "Arch         : %s\n"
 msgstr "Mimari       : %s\n"
 
 # components/rpmview/nautilus-rpm-view.c:239
-#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
 #, c-format
 msgid "Distribution : %s\n"
 msgstr "Daðýtým      : %s\n"
 
 # components/rpmview/nautilus-rpm-view.c:372
-#: components/services/install/command-line/eazel-alt-install-corba.c:1019
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
 #, c-format
 msgid "Description  : %s\n"
 msgstr "Açýklama     : %s\n"
 
 # components/services/install/lib/eazel-install-problem.c:740
-#: components/services/install/command-line/eazel-alt-install-corba.c:1021
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
 #, c-format
 msgid "Install root : %s\n"
 msgstr "Kur. dizini  : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1024
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
 msgid "Provides     : \n"
 msgstr "Saðlar       : \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1066
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
 #, c-format
 msgid "exit code %d\n"
 msgstr "çýkýþ kodu %d\n"
@@ -2589,139 +2577,147 @@ msgstr ""
 "gerektirir)"
 
 # components/services/install/command-line/eazel-test-softcat.c:43
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 msgid "Softcat server to connect to"
 msgstr "Baðlantý yapýlacak softcat sunucusu"
 
 # components/services/install/command-line/eazel-test-softcat.c:44
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr "Farklý CGI yolu kullan"
 
 # components/services/install/command-line/eazel-test-softcat.c:46
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr "Ammonite üzerinden softcat kullanýcýsý olarak baðlan"
 
 # components/services/install/command-line/eazel-test-softcat.c:47
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 msgid "Number of times to try the request"
 msgstr "Ýsteði yeniden deneme sayýsý"
 
 # components/services/install/command-line/eazel-test-softcat.c:48
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr "Yeniden denemeler arasýnda geçen süre (usec cinsinden)"
 
 # components/services/install/command-line/eazel-test-softcat.c:49
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr "Eazel paket bilgisine göre ara"
 
 # components/services/install/command-line/eazel-test-softcat.c:50
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+#, fuzzy
+msgid "Lookup package that features a feature/file"
 msgstr "Bir özellik/dosya belirten pakete göre ara"
 
 # components/services/install/command-line/eazel-test-softcat.c:51
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr "Belirli bir paket sürüm bilgisine göre ara"
 
 # components/services/install/command-line/eazel-test-softcat.c:52
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr "(--version ile) >= karþýlaþtýrmasý kullan"
 
 # components/services/install/command-line/eazel-test-softcat.c:53
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 msgid "use check function (for debugging)"
 msgstr "denetleme fonksiyonunu kullan (hata ayýklama amaçlý)"
 
 # components/services/install/command-line/eazel-test-softcat.c:54
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 msgid "Show detailed sub-package info"
 msgstr "Detaylý alt paket bilgisini göster"
 
+# libnautilus-extensions/nautilus-global-preferences.c:636
+#: components/services/install/command-line/eazel-test-softcat.c:66
+#, fuzzy
+msgid "enable funk parser"
+msgstr "Hýzlý aramayý etkinleþtir"
+
 # components/services/install/lib/eazel-install-protocols.c:669
-#: components/services/install/lib/eazel-install-logic2.c:99
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "Alýnan dosya kilitlenemedi"
 
-#: components/services/install/lib/eazel-install-logic2.c:116
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "MD5 hatasý, %s paketi yetkisiz kiþilerce paketlenmiþ olabilir"
 
 # src/nautilus-theme-selector.c:720
-#: components/services/install/lib/eazel-install-logic2.c:132
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, c-format
 msgid "No MD5 available for %s"
 msgstr "%s için MD5 bilgisi bulunamadý"
 
 #. I18N note: "%is is ok" in the sense that %s=package name and the
 #. package is intact
-#: components/services/install/lib/eazel-install-logic2.c:327
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, c-format
 msgid "%s is ok"
 msgstr "%s tamam"
 
 # components/services/install/lib/eazel-install-problem.c:140
 # components/services/install/lib/eazel-install-problem.c:254
-#: components/services/install/lib/eazel-install-logic2.c:433
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s sürüm %s-%s zaten kurulu durumda"
 
 # components/services/install/lib/eazel-install-problem.c:140
 # components/services/install/lib/eazel-install-problem.c:254
-#: components/services/install/lib/eazel-install-logic2.c:437
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s sürüm %s kurulu durumda"
 
-#: components/services/install/lib/eazel-install-logic2.c:446
-#: components/services/install/lib/eazel-install-logic2.c:451
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr "%s sürüm %s-%s'ten sürüm %s-%s'e günceller"
 
-#: components/services/install/lib/eazel-install-logic2.c:460
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr "%s sürüm %s-%s'ten sürüm %s-%s'e geriye günceller"
 
-#: components/services/install/lib/eazel-install-logic2.c:465
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr "%s sürüm %s'ten sürüm %s'e geriye günceller"
 
-#: components/services/install/lib/eazel-install-logic2.c:518
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr "%s sürüm %s-%s kurar"
 
-#: components/services/install/lib/eazel-install-logic2.c:523
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr "%s sürüm %s kurar"
 
-#: components/services/install/lib/eazel-install-logic2.c:691
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, c-format
 msgid "Loading package info from file %s"
 msgstr "%s dosyasýndan paket bilgisi okunuyor"
 
 # components/music/mpg123.c:33
 #. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
-#: components/services/install/lib/eazel-install-logic2.c:1008
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "ok"
 msgstr "tamam"
 
-#: components/services/install/lib/eazel-install-logic2.c:1008
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "not ok"
 msgstr "sorunlu"
 
-#: components/services/install/lib/eazel-install-logic2.c:1174
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
 msgid "Checking dependencies for %s"
 msgstr "%s için paket baðýmlýlýklarý denetleniyor"
@@ -2730,103 +2726,106 @@ msgstr "%s için paket baðýmlýlýklarý denetleniyor"
 #. I18N note: both %s' are package names.
 #. related is in the sense that the two packages apparently
 #. are connected somehow, eg. foo and foo-devel
-#: components/services/install/lib/eazel-install-logic2.c:1798
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, c-format
 msgid "%s is related to %s"
 msgstr "%s, %s paketine baðlý"
 
-#: components/services/install/lib/eazel-install-logic2.c:1874
+#: components/services/install/lib/eazel-install-logic2.c:2090
 #, c-format
 msgid "updating %s to version %s-%s solves conflict"
 msgstr "%s paketini %s-%s sürümüne güncellemek çakýþmayý engelleyecektir"
 
-#: components/services/install/lib/eazel-install-logic2.c:1897
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
 msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr "%s (%s-%s) paketine güncellemek çakýþmayý engellemeyecektir"
 
 # components/services/install/lib/eazel-install-protocols.c:121
-#: components/services/install/lib/eazel-install-logic2.c:1905
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, c-format
 msgid "could not revive %s"
 msgstr "%s açýlamadý"
 
-#: components/services/install/lib/eazel-install-logic2.c:2060
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
 msgid "file uniqueness checking %s"
 msgstr "dosya adý uyumu denetleniyor %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2081
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
 msgid "Duplicate file : %s occurs in %s and %s"
 msgstr "Çift dosya : %s ayný anda %s ve %s içinde bulunuyor"
 
-#: components/services/install/lib/eazel-install-logic2.c:2093
-#: components/services/install/lib/eazel-install-logic2.c:2247
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
 msgid "... but it's ok, the packages are related"
 msgstr "... ancak bir sorun yaratmýyor, çünkü paketler iliþkili"
 
-#: components/services/install/lib/eazel-install-logic2.c:2101
+#: components/services/install/lib/eazel-install-logic2.c:2324
 #, c-format
 msgid "(there were %d other conflicts)"
 msgstr "(%d çakýþma daha var)"
 
 # components/services/install/lib/eazel-install-problem.c:98
-#: components/services/install/lib/eazel-install-logic2.c:2196
+#: components/services/install/lib/eazel-install-logic2.c:2419
 #, c-format
 msgid "file conflict checking %s"
 msgstr "dosya çakýþmasý denetleniyor (%s)"
 
-#: components/services/install/lib/eazel-install-logic2.c:2233
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
 msgid "file conflict : package %s already provides file %s also provided by %s"
-msgstr "dosya çakýþmasý : %s paketi %s'i saðlýyor (ayný zamanda %s tarafýndan saðlanýyor)"
+msgstr ""
+"dosya çakýþmasý : %s paketi %s'i saðlýyor (ayný zamanda %s tarafýndan "
+"saðlanýyor)"
 
 #. the owner of this file is a package that we're upgrading, and the
 #. * new version no longer has this file, so everything's okay.
-#: components/services/install/lib/eazel-install-logic2.c:2243
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
 msgid "...but it is okay, we're upgrading %s and it ditched that file"
 msgstr "... ancak sorun deðil, %s paketini de güncelliyoruz."
 
-#: components/services/install/lib/eazel-install-logic2.c:2335
+#: components/services/install/lib/eazel-install-logic2.c:2558
 #, c-format
 msgid "checking feature consistency of %s"
 msgstr "%s özellikleri denetleniyor"
 
-#: components/services/install/lib/eazel-install-logic2.c:2403
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
 msgid ""
 "feature missing : %s breaks if %s is installed (feature %s would be lost"
 msgstr ""
-"eksik özellik : %s paketi, %s kurulursa sorun çýkaracaktýr (%s özelliði kaybolacaktýr)"
+"eksik özellik : %s paketi, %s kurulursa sorun çýkaracaktýr (%s özelliði "
+"kaybolacaktýr)"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:960
-#: components/services/install/lib/eazel-install-logic2.c:2482
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, c-format
 msgid "downloading %d packages"
 msgstr "%d paket indiriliyor"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:121
-#: components/services/install/lib/eazel-install-logic2.c:2752
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, c-format
 msgid "will upgrade %s"
 msgstr "%s güncellenecek"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:99
-#: components/services/install/lib/eazel-install-logic2.c:2755
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, c-format
 msgid "will downgrade %s"
 msgstr "%s geriye dönük güncellenecek"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:969
-#: components/services/install/lib/eazel-install-logic2.c:2758
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, c-format
 msgid "will install %s"
 msgstr "%s kurulacak"
 
 # components/rpmview/nautilus-rpm-view.c:309
-#: components/services/install/lib/eazel-install-logic2.c:2761
+#: components/services/install/lib/eazel-install-logic2.c:2960
 #, c-format
 msgid "will uninstall %s"
 msgstr "%s silinecek"
@@ -2834,134 +2833,134 @@ msgstr "%s silinecek"
 # components/services/install/lib/eazel-install-problem.c:237
 # components/services/install/lib/eazel-install-problem.c:240
 # components/services/install/lib/eazel-install-rpm-glue.c:311
-#: components/services/install/lib/eazel-install-logic2.c:2846
-#: components/services/install/lib/eazel-install-problem.c:335
-#: components/services/install/lib/eazel-install-problem.c:338
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
 #, c-format
 msgid "%s requires %s"
 msgstr "%s paketinin %s paketine ihtiyacý var."
 
 # components/rpmview/nautilus-rpm-verify-window.c:207
-#: components/services/install/lib/eazel-install-logic2.c:3039
+#: components/services/install/lib/eazel-install-logic2.c:3238
 #, c-format
 msgid "failed %s"
 msgstr "%s hatasý"
 
 # components/services/install/lib/eazel-install-metadata.c:171
-#: components/services/install/lib/eazel-install-metadata.c:171
+#: components/services/install/lib/eazel-install-metadata.c:174
 msgid "Could not set URLType from config file!"
 msgstr "Ayar dosyasýndan URL tipi belirlenemedi!"
 
 # components/services/install/lib/eazel-install-object.c:597
-#: components/services/install/lib/eazel-install-object.c:713
+#: components/services/install/lib/eazel-install-object.c:717
 msgid "Transactions are not stored, could not find home dir"
 msgstr "Ýletiþim kaydedilemedi, ev dizini bulunamadý"
 
 # components/services/install/lib/eazel-install-object.c:624
-#: components/services/install/lib/eazel-install-object.c:741
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr "Ýletiþim %s içine kaydediliyor"
 
 # components/services/install/lib/eazel-install-object.c:878
-#: components/services/install/lib/eazel-install-object.c:998
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "Sunucudan paket listesi alýnýyor...\n"
 
 # components/services/install/lib/eazel-install-object.c:898
-#: components/services/install/lib/eazel-install-object.c:1014
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "package-list.xml alýnamadý!\n"
 
 # components/services/install/lib/eazel-install-object.c:971
-#: components/services/install/lib/eazel-install-object.c:1087
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr "%s dosyasýna yazýlamadý, öntanýmlý kayýt yöneticisi kullanýlýyor"
 
 # components/services/install/lib/eazel-install-object.c:1098
-#: components/services/install/lib/eazel-install-object.c:1218
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "Kurulum baþarýsýz oldu"
 
 # components/services/install/lib/eazel-install-object.c:1153
-#: components/services/install/lib/eazel-install-object.c:1264
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "Silme baþarýsýz oldu"
 
 # components/services/install/lib/eazel-install-logic.c:649
-#: components/services/install/lib/eazel-install-object.c:1387
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "Ýletiþim dizi %s yaratýlamadý! ***\n"
 
 # components/services/install/lib/eazel-install-logic.c:672
-#: components/services/install/lib/eazel-install-object.c:1410
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr "Ýletiþim %s'e yazýlýyor"
 
 # components/rpmview/nautilus-rpm-view-install.c:120
-#: components/services/install/lib/eazel-install-problem.c:159
+#: components/services/install/lib/eazel-install-problem.c:163
 #, c-format
 msgid "%s was cancelled"
 msgstr "%s iptal edildi"
 
 # components/services/install/lib/eazel-install-problem.c:88
 # components/services/install/lib/eazel-install-problem.c:229
-#: components/services/install/lib/eazel-install-problem.c:164
-#: components/services/install/lib/eazel-install-problem.c:327
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
 msgid "%s is a source package, which is not yet supported"
 msgstr "%s bir kaynak paketidir ve desteklenmemektedir."
 
 # components/services/install/lib/eazel-install-problem.c:110
 # components/services/install/lib/eazel-install-problem.c:121
-#: components/services/install/lib/eazel-install-problem.c:178
-#: components/services/install/lib/eazel-install-problem.c:189
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
 #, c-format
 msgid "%s would break other packages"
 msgstr "%s diðer paketleri bozacaktýr."
 
 # components/services/install/lib/eazel-install-problem.c:113
-#: components/services/install/lib/eazel-install-problem.c:181
+#: components/services/install/lib/eazel-install-problem.c:185
 #, c-format
 msgid "%s would break"
 msgstr "%s'in bozacaðý paketler:"
 
 # components/services/install/lib/eazel-install-problem.c:119
-#: components/services/install/lib/eazel-install-problem.c:187
+#: components/services/install/lib/eazel-install-problem.c:191
 #, c-format
 msgid "%s would break %s"
 msgstr "%s'in bozacaðý paket: %s "
 
-#: components/services/install/lib/eazel-install-problem.c:193
+#: components/services/install/lib/eazel-install-problem.c:197
 #, c-format
 msgid "%s is damaged"
 msgstr "%s bozuk"
 
 # components/services/install/lib/eazel-install-problem.c:129
-#: components/services/install/lib/eazel-install-problem.c:197
+#: components/services/install/lib/eazel-install-problem.c:201
 #, c-format
 msgid "%s requires %s, which could not be found on the server"
 msgstr "%s paketi sunucu üzerinde bulunamayan %s paketine ihtiyaç duyuyor"
 
 # components/services/install/lib/eazel-install-problem.c:133
-#: components/services/install/lib/eazel-install-problem.c:200
-#, c-format
-msgid "%s could not be found on the server"
+#: components/services/install/lib/eazel-install-problem.c:204
+#, fuzzy, c-format
+msgid "%s for %s could not be found on the server"
 msgstr "%s sunucu üzerinde bulunamadý"
 
 # components/services/install/lib/eazel-install-problem.c:140
 # components/services/install/lib/eazel-install-problem.c:254
-#: components/services/install/lib/eazel-install-problem.c:208
-#: components/services/install/lib/eazel-install-problem.c:353
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr "%s zaten kurulu durumda"
 
 # components/services/install/lib/eazel-install-problem.c:172
-#: components/services/install/lib/eazel-install-problem.c:252
+#: components/services/install/lib/eazel-install-problem.c:259
 #, c-format
 msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr ""
@@ -2969,13 +2968,13 @@ msgstr ""
 "deðil"
 
 # components/services/install/lib/eazel-install-problem.c:172
-#: components/services/install/lib/eazel-install-problem.c:256
+#: components/services/install/lib/eazel-install-problem.c:263
 #, c-format
 msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr "Daha yeni olan %s güncelleme istiyor, ancak güncelleme etkin deðil"
 
 # components/services/install/lib/eazel-install-problem.c:133
-#: components/services/install/lib/eazel-install-problem.c:346
+#: components/services/install/lib/eazel-install-problem.c:353
 #, c-format
 msgid "%s is not installed and could not be found on server"
 msgstr "%s kurulu deðil ve sunucu üzerinde bulunamadý"
@@ -2983,7 +2982,7 @@ msgstr "%s kurulu deðil ve sunucu üzerinde bulunamadý"
 # components/services/install/lib/eazel-install-problem.c:729
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:913
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr "%s paketinin yeni sürümünü ara"
@@ -2991,7 +2990,7 @@ msgstr "%s paketinin yeni sürümünü ara"
 # components/services/install/lib/eazel-install-problem.c:740
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:924
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr "Hem %s, hem de %s paketini kur"
@@ -2999,7 +2998,7 @@ msgstr "Hem %s, hem de %s paketini kur"
 # components/services/install/lib/eazel-install-problem.c:755
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:939
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr "Sistemden %s paketini kaldýr"
@@ -3008,63 +3007,63 @@ msgstr "Sistemden %s paketini kaldýr"
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:952
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr "%s paketinin silinmesini zorla"
 
 # components/services/install/lib/eazel-install-problem.c:776
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:960
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr "Paket veritabanýnda tutarsýzlýk var"
 
-#: components/services/install/lib/eazel-install-problem.c:1008
+#: components/services/install/lib/eazel-install-problem.c:1015
 msgid "Continue with force"
 msgstr "Zorlama ile devam et"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:99
-#: components/services/install/lib/eazel-install-problem.c:1014
+#: components/services/install/lib/eazel-install-problem.c:1021
 msgid "Allow downgrade"
 msgstr "Geriye dönük güncellemelere izin ver"
 
 # components/services/install/lib/eazel-install-protocols.c:121
-#: components/services/install/lib/eazel-install-protocols.c:123
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:166
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
 #, c-format
 msgid "Could not open target file %s"
 msgstr "Hedef dosya %s açýlamadý"
 
 # components/services/install/lib/eazel-install-protocols.c:128
 # components/services/inventory/eazel-inventory-service.c:246
-#: components/services/install/lib/eazel-install-protocols.c:130
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:92
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
 msgid "Could not create an http request !"
 msgstr "Bir http isteði yaratýlamadý!"
 
 # components/services/install/lib/eazel-install-protocols.c:135
-#: components/services/install/lib/eazel-install-protocols.c:137
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:99
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
 msgid "Proxy: Invalid uri !"
 msgstr "Vekil: Geçersiz uri !"
 
 # components/services/install/lib/eazel-install-protocols.c:140
 # components/services/inventory/eazel-inventory-service.c:251
-#: components/services/install/lib/eazel-install-protocols.c:142
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:105
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
 msgid "Invalid uri !"
 msgstr "Geçersiz URI !"
 
 # components/services/install/lib/eazel-install-protocols.c:147
 # components/services/inventory/eazel-inventory-service.c:294
-#: components/services/install/lib/eazel-install-protocols.c:149
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:115
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
 msgid "Could not prepare http request !"
 msgstr "Http isteði hazýrlanamadý!"
 
 # components/services/install/lib/eazel-install-protocols.c:152
-#: components/services/install/lib/eazel-install-protocols.c:154
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:120
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
 msgid "Couldn't get async mode "
 msgstr "Asenkron kip bilgisi alýnamadý"
 
@@ -3072,225 +3071,225 @@ msgstr "Asenkron kip bilgisi alýnamadý"
 # components/services/install/lib/eazel-install-protocols.c:210
 # components/services/install/lib/eazel-install-protocols.c:226
 #. probably out of disk space
-#: components/services/install/lib/eazel-install-protocols.c:183
-#: components/services/install/lib/eazel-install-protocols.c:212
-#: components/services/install/lib/eazel-install-protocols.c:228
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, c-format
 msgid "DISK FULL: could not write %s"
 msgstr "DÝSK DOLU: %s yazýlamadý"
 
 # components/services/install/lib/eazel-install-protocols.c:187
 # components/services/install/lib/eazel-install-protocols.c:215
-#: components/services/install/lib/eazel-install-protocols.c:189
-#: components/services/install/lib/eazel-install-protocols.c:217
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
 msgid "Could not get request body!"
 msgstr "Ýstek içeriði alýnamadý!"
 
 # components/services/install/lib/eazel-install-protocols.c:200
-#: components/services/install/lib/eazel-install-protocols.c:202
+#: components/services/install/lib/eazel-install-protocols.c:208
 #, c-format
 msgid "HTTP error: %d %s"
 msgstr "HTTP hatasý: %d %s"
 
 # components/services/install/lib/eazel-install-protocols.c:250
-#: components/services/install/lib/eazel-install-protocols.c:249
+#: components/services/install/lib/eazel-install-protocols.c:255
 msgid "FTP not supported yet"
 msgstr "FTP þimdilik desteklenmiyor"
 
 # components/services/install/lib/eazel-install-protocols.c:444
-#: components/services/install/lib/eazel-install-protocols.c:457
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, c-format
 msgid "Checking local file %s..."
 msgstr "Yerel dosya %s gözden geçiriliyor..."
 
 # components/services/install/lib/eazel-install-protocols.c:563
-#: components/services/install/lib/eazel-install-protocols.c:578
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, c-format
 msgid "Failed to retrieve %s!"
 msgstr "%s alýnýrken bir hata oldu!"
 
 # components/services/install/lib/eazel-install-protocols.c:626
-#: components/services/install/lib/eazel-install-protocols.c:651
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, c-format
 msgid "Could not get an URL for %s"
 msgstr "%s için bir adres alýnamadý"
 
 # components/services/install/lib/eazel-install-protocols.c:641
-#: components/services/install/lib/eazel-install-protocols.c:666
+#: components/services/install/lib/eazel-install-protocols.c:672
 msgid "Downloaded package does not have the correct name"
 msgstr "Ýndirilen paketin adý doðru deðil"
 
 # components/services/install/lib/eazel-install-protocols.c:642
-#: components/services/install/lib/eazel-install-protocols.c:667
+#: components/services/install/lib/eazel-install-protocols.c:673
 #, c-format
 msgid "Package %s should have had name %s"
 msgstr "%s paketinin adý %s olmalý"
 
 # components/services/install/lib/eazel-install-protocols.c:669
-#: components/services/install/lib/eazel-install-protocols.c:695
+#: components/services/install/lib/eazel-install-protocols.c:701
 msgid "File download failed"
 msgstr "Dosya alýmýnda hata"
 
 # components/services/install/lib/eazel-install-tests.c:33
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr "*** Paket dökümüne baþlanýyor ***\n"
 
 # components/services/install/lib/eazel-install-tests.c:40
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr "*** Paket dökümü sonu ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:159
-#: components/services/install/lib/eazel-install-xml-package-list.c:158
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 msgid "*** No package nodes! (cat has no children) ***"
 msgstr "*** Paket içerikleri yok! ***"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:161
 # components/services/install/lib/eazel-install-xml-package-list.c:169
 # components/services/install/lib/eazel-install-xml-package-list.c:184
-#: components/services/install/lib/eazel-install-xml-package-list.c:160
-#: components/services/install/lib/eazel-install-xml-package-list.c:168
-#: components/services/install/lib/eazel-install-xml-package-list.c:183
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 msgid "*** Bailing from package parse! ***"
 msgstr "*** Paket taramasý sýrasýnda hata! ***"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:167
-#: components/services/install/lib/eazel-install-xml-package-list.c:166
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
 msgid "*** No package nodes! ***"
 msgstr "*** Paket içerikleri yok! ***"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:173
-#: components/services/install/lib/eazel-install-xml-package-list.c:172
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 msgid "*** Malformed package node!"
 msgstr "*** Bozuk paket içerikleri! ***"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:182
-#: components/services/install/lib/eazel-install-xml-package-list.c:181
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
 msgid "*** No depends nodes! ***"
 msgstr "*** Paket baðýmlýlýklarý yok! ***"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:188
-#: components/services/install/lib/eazel-install-xml-package-list.c:187
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr "*** Bozuk baðýmlýlýklar!"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:212
-#: components/services/install/lib/eazel-install-xml-package-list.c:211
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr "*** Bilinmeyen düðüm türü `%s'"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:229
-#: components/services/install/lib/eazel-install-xml-package-list.c:228
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** Paket liste dosyasý bilgi içermiyor! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:234
-#: components/services/install/lib/eazel-install-xml-package-list.c:233
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** CATEGORIES xml içeriðini bulamadým ! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:235
-#: components/services/install/lib/eazel-install-xml-package-list.c:234
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr "*** Kategori taramasýný hatalardan dolayý býrakýyorum! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:241
-#: components/services/install/lib/eazel-install-xml-package-list.c:240
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** Kategoriler Bulunamadý! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:242
-#: components/services/install/lib/eazel-install-xml-package-list.c:241
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr "*** Kategori taramasýný hatalardan dolayý býrakýyorum ! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:296
-#: components/services/install/lib/eazel-install-xml-package-list.c:295
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** TRANSACTIONS xml içeriðini bulamadým ! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:298
 # components/services/install/lib/eazel-install-xml-package-list.c:306
-#: components/services/install/lib/eazel-install-xml-package-list.c:297
-#: components/services/install/lib/eazel-install-xml-package-list.c:305
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr "*** Iletiþim taramasýný hatalardan dolayý býrakýyorum ! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:304
-#: components/services/install/lib/eazel-install-xml-package-list.c:303
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** Paketler bulunamadý! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:340
-#: components/services/install/lib/eazel-install-xml-package-list.c:339
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** Kategoriler bulunamadý! ***"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:344
-#: components/services/install/lib/eazel-install-xml-package-list.c:343
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** CATEGORIES xmlnode bulunamadý! ***"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:378
-#: components/services/install/lib/eazel-install-xml-package-list.c:377
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** Bilinmeyen düðüm %s"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:468
-#: components/services/install/lib/eazel-install-xml-package-list.c:467
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** Xml paket listesi yaratýlýrken bir hata oluþtu! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:515
-#: components/services/install/lib/eazel-install-xml-package-list.c:514
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** Paket listesi okurken hata oldu ! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:859
-#: components/services/install/lib/eazel-install-xml-package-list.c:909
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** osd xml hiç bir bilgi içermiyor! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:864
-#: components/services/install/lib/eazel-install-xml-package-list.c:914
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr "*** osd hatasý! ***\n"
 
 # components/services/install/lib/eazel-install-xml-package-list.c:913
-#: components/services/install/lib/eazel-install-xml-package-list.c:990
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "xml ayrýþtýrýlamadý (uzunluk %d)"
 
 # components/services/install/lib/eazel-package-system-rpm3.c:416
-#: components/services/install/lib/eazel-package-system-rpm3.c:763
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr "Paket veritabaný açýlamadý (%s)"
 
 # components/services/install/lib/eazel-package-system-rpm3.c:421
-#: components/services/install/lib/eazel-package-system-rpm3.c:768
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr "%s üzerinde paket veritabaný açýlamadý!"
 
 # components/services/install/lib/eazel-package-system-rpm3.c:444
-#: components/services/install/lib/eazel-package-system-rpm3.c:801
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr "%s için veritabaný kapatýlýyor (açýk)"
 
 # components/services/install/lib/eazel-package-system-rpm3.c:449
-#: components/services/install/lib/eazel-package-system-rpm3.c:806
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr "%s için veritabaný kapatýlýyor (açýk deðil)"
 
 # components/services/install/lib/eazel-package-system-rpm3.c:622
-#: components/services/install/lib/eazel-package-system-rpm3.c:1137
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr "%s açýlamadý"
@@ -3409,7 +3408,6 @@ msgstr ""
 "\"%s\" paketinin çalýþmasý için \"%s\" paketine\n"
 "ihtiyacý var. \"%s\" þimdi kuruluyor."
 
-
 # components/services/install/nautilus-view/nautilus-service-install-view.c:960
 #: components/services/install-view/callbacks.c:399
 #, c-format
@@ -3418,7 +3416,7 @@ msgstr "\"%s\" paketi kuruluyor."
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:969
 #: components/services/install-view/callbacks.c:407
-#: components/services/install-view/nautilus-service-install-view.c:897
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "\"%s\" kuruluyor"
@@ -3448,33 +3446,33 @@ msgid "Is this ok ?"
 msgstr "Devam edeyim mi ?"
 
 # components/rpmview/nautilus-rpm-view-install.c:244
-#: components/services/install-view/callbacks.c:557
+#: components/services/install-view/callbacks.c:556
 msgid "Installation cancelled."
 msgstr "Kurulum iptal edildi."
 
 # components/rpmview/nautilus-rpm-view-install.c:120
-#: components/services/install-view/callbacks.c:559
+#: components/services/install-view/callbacks.c:558
 msgid "This package has already been installed."
 msgstr "Bu paket sistemde zaten kurulu."
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1435
-#: components/services/install-view/callbacks.c:561
-#: components/services/install-view/callbacks.c:658
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
 msgid "Installation complete."
 msgstr "Kurulum tamamlandý."
 
 # components/services/install/lib/eazel-install-object.c:1098
-#: components/services/install-view/callbacks.c:565
+#: components/services/install-view/callbacks.c:564
 msgid "Installation failed."
 msgstr "Kurulum baþarýsýz oldu."
 
 #. some succeeded; some failed
-#: components/services/install-view/callbacks.c:569
+#: components/services/install-view/callbacks.c:568
 msgid "Some packages installed successfully:"
 msgstr "Bazý paketler baþarýyla kuruldu:"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:110
-#: components/services/install-view/callbacks.c:578
+#: components/services/install-view/callbacks.c:577
 msgid ""
 "\n"
 "Some packages failed:"
@@ -3482,19 +3480,19 @@ msgstr ""
 "\n"
 "Bazý paketlerde hata var:"
 
-#: components/services/install-view/callbacks.c:627
+#: components/services/install-view/callbacks.c:626
 msgid "Erase the RPM files?"
 msgstr "RPM dosyalarý silinsin mi?"
 
-#: components/services/install-view/callbacks.c:629
+#: components/services/install-view/callbacks.c:628
 msgid "Erase the leftover RPM files?"
 msgstr "Kalan RPM dosyalarý silinsin mi?"
 
-#: components/services/install-view/callbacks.c:659
+#: components/services/install-view/callbacks.c:658
 msgid "Ok"
 msgstr "Tamam"
 
-#: components/services/install-view/callbacks.c:674
+#: components/services/install-view/callbacks.c:673
 msgid ""
 "A core package of Nautilus has been\n"
 "updated.  You should restart Nautilus.\n"
@@ -3575,34 +3573,34 @@ msgstr "Devam"
 # components/music/mpg123.c:29
 #: components/services/install-view/forms.c:482
 #: libnautilus-extensions/nautilus-drag.c:493
-#: src/file-manager/fm-directory-view.c:3551
+#: src/file-manager/fm-directory-view.c:4326
 msgid "Cancel"
 msgstr "Ýptal"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1044
-#: components/services/install-view/nautilus-service-install-view.c:419
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
 msgid "%s is in GNOME (footprint) > %s"
 msgstr "%s Gnome menüsünde > %s"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1044
-#: components/services/install-view/nautilus-service-install-view.c:437
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, c-format
 msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr "%s Gnome menüsünde\n"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1089
-#: components/services/install-view/nautilus-service-install-view.c:452
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
 msgid "%s is in the KDE menu.\n"
 msgstr "%s KDE menüsünde.\n"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1435
-#: components/services/install-view/nautilus-service-install-view.c:653
+#: components/services/install-view/nautilus-service-install-view.c:655
 msgid "Installation Complete"
 msgstr "Kurulum Tamamlandý"
 
-#: components/services/install-view/nautilus-service-install-view.c:708
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
 msgid ""
 "%sTo start %s, click the Launch button below, or to create a shortcut, drag "
@@ -3613,38 +3611,38 @@ msgstr ""
 "masaüstüne sürükleyin."
 
 #. couldn't find an icon
-#: components/services/install-view/nautilus-service-install-view.c:716
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
 msgid "%sTo start %s, click the Launch button below."
 msgstr "%s%s'i baþlatmak için, aþaðýdaki Baþlat tuþuna týklayýn."
 
 # components/rpmview/nautilus-rpm-view-install.c:297
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1312
-#: components/services/install-view/nautilus-service-install-view.c:771
+#: components/services/install-view/nautilus-service-install-view.c:773
 msgid "Incorrect password."
 msgstr "Hatalý parola."
 
-#: components/services/install-view/nautilus-service-install-view.c:776
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr "Root ile kimlik denetimi yap"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:960
-#: components/services/install-view/nautilus-service-install-view.c:893
+#: components/services/install-view/nautilus-service-install-view.c:895
 msgid "Installing packages"
 msgstr "Paketler kuruluyor"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1431
-#: components/services/install-view/nautilus-service-install-view.c:895
+#: components/services/install-view/nautilus-service-install-view.c:897
 msgid "Installing remote package"
 msgstr "Uzaktaki paketler kuruluyor"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1435
-#: components/services/install-view/nautilus-service-install-view.c:899
+#: components/services/install-view/nautilus-service-install-view.c:901
 msgid "Installing some package"
 msgstr "Bazý paketler kuruluyor"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1449
-#: components/services/install-view/nautilus-service-install-view.c:916
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
@@ -3653,25 +3651,25 @@ msgstr ""
 "Kurulum iþlemi çalýþmayacaktýr!"
 
 # src/nautilus-service-ui.xml.h:3
-#: components/services/install-view/nautilus-service-install-view.c:965
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr "Eazel Yazýlým Kataloðuyla Baðlantý Kuruluyor..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1023
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr "Kimlik denetimi yapýlýyor..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1095
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr "Paket alýmý iptal ediliyor (lütfen bekleyiniz) ..."
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1564
-#: components/services/install-view/nautilus-service-install-view.c:1115
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "Paket indirme durduruldu."
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:1566
-#: components/services/install-view/nautilus-service-install-view.c:1116
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "Durduruldu"
 
@@ -4006,13 +4004,13 @@ msgstr "Servis Giriþi"
 
 # components/services/summary/nautilus-view/nautilus-summary-dialogs.c:129
 #: components/services/summary/nautilus-summary-dialogs.c:131
-#: libnautilus-extensions/nautilus-password-dialog.c:269
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "Kullanýcý adý:"
 
 # components/services/summary/nautilus-view/nautilus-summary-dialogs.c:136
 #: components/services/summary/nautilus-summary-dialogs.c:138
-#: libnautilus-extensions/nautilus-password-dialog.c:276
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "Parola:"
 
@@ -4076,6 +4074,7 @@ msgstr "Giriþ"
 
 # src/nautilus-service-ui.xml.h:7
 #: components/services/summary/nautilus-summary-view.c:170
+#, c-format
 msgid "Eazel Services - Welcome, %s!"
 msgstr "Eazel Servisleri - Hoþgeldin %s!"
 
@@ -4100,7 +4099,7 @@ msgid "Featured Downloads"
 msgstr "Önemli Programlar"
 
 # components/services/summary/nautilus-view/nautilus-summary-view.c:949
-#: components/services/summary/nautilus-summary-view.c:883
+#: components/services/summary/nautilus-summary-view.c:884
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
 "unavailable right now, or your computer might be configured incorrectly. "
@@ -4111,7 +4110,7 @@ msgstr ""
 "baþvurun."
 
 # components/services/summary/nautilus-view/nautilus-summary-view.c:967
-#: components/services/summary/nautilus-summary-view.c:893
+#: components/services/summary/nautilus-summary-view.c:894
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -4120,7 +4119,7 @@ msgstr ""
 "adresine bilgi verin."
 
 # components/services/summary/nautilus-view/nautilus-summary-view.c:967
-#: components/services/summary/nautilus-summary-view.c:916
+#: components/services/summary/nautilus-summary-view.c:917
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
 "contact support@eazel.com."
@@ -4129,7 +4128,7 @@ msgstr ""
 "adresine bilgi verin."
 
 # components/services/summary/nautilus-view/nautilus-summary-view.c:949
-#: components/services/summary/nautilus-summary-view.c:958
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
 "now, or your computer might be configured incorrectly. You could try again "
@@ -4139,7 +4138,7 @@ msgstr ""
 "ayarlarýnýzda bir hata var. Daha sonra yeniden deneyiniz."
 
 # components/services/summary/nautilus-view/nautilus-summary-view.c:967
-#: components/services/summary/nautilus-summary-view.c:968
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -4147,12 +4146,12 @@ msgstr ""
 "Eazel sunucularýndaki verilerde bir hata var. Lütfen contact@eazel.com "
 "adresine bilgi verin."
 
-#: components/services/summary/nautilus-summary-view.c:985
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr "Sistem eþyalarý sunucuya aktarýlamadý."
 
 # src/nautilus-first-time-druid.c:222 src/nautilus-first-time-druid.c:477
-#: components/services/summary/nautilus-summary-view.c:1048
+#: components/services/summary/nautilus-summary-view.c:1049
 #: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr "Eazel Hizmetleri"
@@ -4232,18 +4231,18 @@ msgid "View as Summary"
 msgstr "Özet Olarak Görüntüle"
 
 # components/services/install/lib/eazel-install-protocols.c:200
-#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:130
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
 #, c-format
 msgid "HTTP error %d \"%s\" on uri %s"
 msgstr "HTTP hatasý %d \"%s\" on uri %s"
 
 # components/services/trilobite/libtrilobite/trilobite-core-utils.c:195
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:200
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo baþlatýlamadý"
 
 # components/services/trilobite/libtrilobite/trilobite-core-utils.c:210
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:215
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr ""
@@ -4290,58 +4289,85 @@ msgid "Factory for the sample service"
 msgstr "Örnek servis için mimari"
 
 # components/text/nautilus-text-view.c:316
-#: components/text/nautilus-text-view.c:326
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr "Üzgünüm, ancak Nautilus'un yüklemesi için %s çok büyük."
 
 # components/text/nautilus-text-view.c:317
-#: components/text/nautilus-text-view.c:329
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr "Dosya çok büyük"
 
-# components/text/nautilus-text-view-ui.xml.h:1
+# libnautilus-extensions/nautilus-global-preferences.c:564
 #: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "Yazýtipleri"
+
+# components/text/nautilus-text-view-ui.xml.h:1
+#: components/text/nautilus-text-view-ui.xml.h:2
 msgid "Lucida"
 msgstr "Lucida"
 
 # components/text/nautilus-text-view-ui.xml.h:2
-#: components/text/nautilus-text-view-ui.xml.h:2
+#: components/text/nautilus-text-view-ui.xml.h:3
 msgid "Use the Courier Font"
 msgstr "Courier Yazýtipi kullan"
 
+# components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:4
+#, fuzzy
+msgid "Use the Fixed Font"
+msgstr "Times Yazýtipi Kullan"
+
+# components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:5
+#, fuzzy
+msgid "Use the GTK System Font"
+msgstr "Times Yazýtipi Kullan"
+
 # components/text/nautilus-text-view-ui.xml.h:3
-#: components/text/nautilus-text-view-ui.xml.h:3
+#: components/text/nautilus-text-view-ui.xml.h:6
 msgid "Use the Helvetica Font"
 msgstr "Helvetica Yazýtipi Kullan"
 
 # components/text/nautilus-text-view-ui.xml.h:4
-#: components/text/nautilus-text-view-ui.xml.h:4
+#: components/text/nautilus-text-view-ui.xml.h:7
 msgid "Use the Lucida Font"
 msgstr "Lucida Yazýtipi Kullan"
 
 # components/text/nautilus-text-view-ui.xml.h:5
-#: components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:8
 msgid "Use the Times Font"
 msgstr "Times Yazýtipi Kullan"
 
 # components/text/nautilus-text-view-ui.xml.h:6
-#: components/text/nautilus-text-view-ui.xml.h:6
+#: components/text/nautilus-text-view-ui.xml.h:9
 msgid "_Courier"
 msgstr "_Courier"
 
-# components/text/nautilus-text-view-ui.xml.h:7
-#: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
-msgstr "_Yazýtipleri"
+# components/loser/content/nautilus-content-loser-ui.xml.h:3
+# components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
+# components/mozilla/nautilus-mozilla-ui.xml.h:4
+# components/sample/nautilus-sample-content-view-ui.xml.h:4
+# src/nautilus-shell-ui.xml.h:78
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "_Dosya"
+
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
 
 # components/text/nautilus-text-view-ui.xml.h:8
-#: components/text/nautilus-text-view-ui.xml.h:8
+#: components/text/nautilus-text-view-ui.xml.h:12
 msgid "_Helvetica"
 msgstr "_Helvetica"
 
 # components/text/nautilus-text-view-ui.xml.h:9
-#: components/text/nautilus-text-view-ui.xml.h:9
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr "_Times"
 
@@ -4425,7 +4451,7 @@ msgstr "Nautilus Aðaç görünümü"
 
 # components/tree/Nautilus_View_tree.oaf.in.h:3
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:638
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr "Aðaç"
 
@@ -4440,7 +4466,7 @@ msgid "Azul"
 msgstr "Azul"
 
 # data/browser.xml.h:5
-#: data/browser.xml.h:3 libnautilus-extensions/nautilus-font-picker.c:105
+#: data/browser.xml.h:3
 msgid "Black"
 msgstr "Siyah"
 
@@ -4580,7 +4606,7 @@ msgid "Eclipse"
 msgstr "Karartý"
 
 # data/browser.xml.h:34 src/file-manager/fm-properties-window.c:1376
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1607
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "Logolar"
 
@@ -4701,7 +4727,7 @@ msgstr "Sayýlar"
 # data/browser.xml.h:57
 # libnautilus-extensions/nautilus-file-operations.c:1021
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "Tamam"
 
@@ -4851,16 +4877,16 @@ msgstr "Gimp"
 # data/linksets/desktop.xml.h:1
 # libnautilus-extensions/nautilus-global-preferences.c:588
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:554
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "Masaüstü"
 
 # data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4642
 # libnautilus-extensions/nautilus-trash-directory.c:301
 # src/file-manager/fm-desktop-icon-view.c:66
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4796
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
-#: src/file-manager/fm-desktop-icon-view.c:65
+#: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
 msgstr "Çöp"
 
@@ -4901,7 +4927,7 @@ msgstr "Google"
 
 # data/linksets/search_engines.xml.h:3
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:808
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "Tarama Motorlarý"
 
@@ -5184,7 +5210,7 @@ msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2261
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr "bugün %-I:%M %p"
 
@@ -5192,7 +5218,7 @@ msgstr "bugün %-I:%M %p"
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2266
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr "dün saat %-H:%M'de %p"
 
@@ -5200,7 +5226,7 @@ msgstr "dün saat %-H:%M'de %p"
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2271
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%-d/%-m/%y %A %-H:%M %p"
 
@@ -5208,54 +5234,54 @@ msgstr "%-d/%-m/%y %A %-H:%M %p"
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2276
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%-d/%-m/%y %-H:%M %p"
 
 # libnautilus-extensions/nautilus-file.c:3294
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 öðe"
 
 # libnautilus-extensions/nautilus-file.c:3294
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr "0 dosya"
 
 # libnautilus-extensions/nautilus-file.c:3295
-#: libnautilus-extensions/nautilus-file.c:3408
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 dosya"
 
 # libnautilus-extensions/nautilus-file.c:3299
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 öðe"
 
 # libnautilus-extensions/nautilus-file.c:3299
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr "1 dizin"
 
 # libnautilus-extensions/nautilus-file.c:3300
-#: libnautilus-extensions/nautilus-file.c:3413
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 dosya"
 
 # libnautilus-extensions/nautilus-file.c:3303
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "Toplam %u"
 
 # libnautilus-extensions/nautilus-file.c:3303
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr "%u dizin"
 
 # libnautilus-extensions/nautilus-file.c:3304
-#: libnautilus-extensions/nautilus-file.c:3417
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u dosya"
@@ -5263,25 +5289,25 @@ msgstr "%u dosya"
 # libnautilus-extensions/nautilus-file.c:3604
 # libnautilus-extensions/nautilus-file.c:3618
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3720
-#: libnautilus-extensions/nautilus-file.c:3735
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr "? öðe"
 
 # libnautilus-extensions/nautilus-file.c:3604
 # libnautilus-extensions/nautilus-file.c:3618
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3726
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr "? bayt"
 
 # libnautilus-extensions/nautilus-file.c:3622
-#: libnautilus-extensions/nautilus-file.c:3739
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "bilinmeyen tip"
 
 # libnautilus-extensions/nautilus-file.c:3624
-#: libnautilus-extensions/nautilus-file.c:3741
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "bilinmeyen MIME türü"
 
@@ -5289,16 +5315,16 @@ msgstr "bilinmeyen MIME türü"
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3746
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "bilinmiyor"
 
 # libnautilus-extensions/nautilus-file.c:3664
-#: libnautilus-extensions/nautilus-file.c:3782
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr "program"
 
-#: libnautilus-extensions/nautilus-file.c:3794
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
@@ -5307,8 +5333,7 @@ msgstr ""
 "\"x-directory/normal\" için bir açýklama bulunamadý. Bunun anlamý, "
 "gnome-vfs.keys dosyasýnýn bulunamamasý ya da hatalý bir yerde bulunmasýdýr."
 
-
-#: libnautilus-extensions/nautilus-file.c:3798
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
@@ -5318,7 +5343,7 @@ msgstr ""
 "aaron@azel.com adresine iletin."
 
 # libnautilus-extensions/nautilus-file.c:3693
-#: libnautilus-extensions/nautilus-file.c:3812
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "baðlantý"
 
@@ -5328,31 +5353,31 @@ msgstr "baðlantý"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1156
-#: libnautilus-extensions/nautilus-file.c:3818
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr "%s'e baðlantý yap"
 
 # libnautilus-extensions/nautilus-file.c:3713
-#: libnautilus-extensions/nautilus-file.c:3832
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr "link (kýrýk)"
 
 # libnautilus-extensions/nautilus-file-operations.c:342
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "Kaynak:"
 
 # libnautilus-extensions/nautilus-file-operations.c:357
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "Hedef:"
 
 # libnautilus-extensions/nautilus-file-operations.c:538
-#: libnautilus-extensions/nautilus-file-operations.c:588
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -5364,7 +5389,7 @@ msgstr ""
 "\"%s\" dosyasý, salt-oku bir disk üzerinde bulunduðu için taþýnamadý."
 
 # libnautilus-extensions/nautilus-file-operations.c:549
-#: libnautilus-extensions/nautilus-file-operations.c:599
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -5377,7 +5402,7 @@ msgstr ""
 "\"%s\" silinemedi. Üst dizine yazma hakkýnýz bulunmuyor."
 
 # libnautilus-extensions/nautilus-file-operations.c:555
-#: libnautilus-extensions/nautilus-file-operations.c:605
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -5389,7 +5414,7 @@ msgstr ""
 "\"%s\" silinemedi. Bu dosya salt okunur bir disk üzerinde bulunuyor."
 
 # libnautilus-extensions/nautilus-file-operations.c:586
-#: libnautilus-extensions/nautilus-file-operations.c:636
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -5403,7 +5428,7 @@ msgstr ""
 "bulunmuyor."
 
 # libnautilus-extensions/nautilus-file-operations.c:593
-#: libnautilus-extensions/nautilus-file-operations.c:643
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -5417,7 +5442,7 @@ msgstr ""
 "için yeterli hakkýnýz bulunmuyor."
 
 # libnautilus-extensions/nautilus-file-operations.c:617
-#: libnautilus-extensions/nautilus-file-operations.c:667
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -5429,7 +5454,7 @@ msgstr ""
 "\"%s\" dosyasýný okumak için yeterli haklarýnýz bulunmuyor."
 
 # libnautilus-extensions/nautilus-file-operations.c:639
-#: libnautilus-extensions/nautilus-file-operations.c:689
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -5441,7 +5466,7 @@ msgstr ""
 "Hedef bölgede yeterli disk alaný bulunmuyor."
 
 # libnautilus-extensions/nautilus-file-operations.c:644
-#: libnautilus-extensions/nautilus-file-operations.c:694
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -5453,7 +5478,7 @@ msgstr ""
 "Hedef bölgede yeterli disk alaný bulunmuyor."
 
 # libnautilus-extensions/nautilus-file-operations.c:648
-#: libnautilus-extensions/nautilus-file-operations.c:698
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -5465,7 +5490,7 @@ msgstr ""
 "Hedef dizinde yeterli disk alaný bulunmuyor."
 
 # libnautilus-extensions/nautilus-file-operations.c:660
-#: libnautilus-extensions/nautilus-file-operations.c:710
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -5477,7 +5502,7 @@ msgstr ""
 "Bu dizine yazma hakkýnýz bulunmuyor."
 
 # libnautilus-extensions/nautilus-file-operations.c:664
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -5489,7 +5514,7 @@ msgstr ""
 "Hedef disk alaný salt-oku durumda."
 
 # libnautilus-extensions/nautilus-file-operations.c:671
-#: libnautilus-extensions/nautilus-file-operations.c:721
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -5498,7 +5523,7 @@ msgid ""
 msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:675
-#: libnautilus-extensions/nautilus-file-operations.c:725
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -5510,7 +5535,7 @@ msgstr ""
 "Hedef bölge salt-okunur."
 
 # libnautilus-extensions/nautilus-file-operations.c:682
-#: libnautilus-extensions/nautilus-file-operations.c:732
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -5522,7 +5547,7 @@ msgstr ""
 "Bu dizine yazmak için yeterli haklarýnýz bulunmuyor."
 
 # libnautilus-extensions/nautilus-file-operations.c:686
-#: libnautilus-extensions/nautilus-file-operations.c:736
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -5534,7 +5559,7 @@ msgstr ""
 "Hedef disk salt-okunur."
 
 # libnautilus-extensions/nautilus-file-operations.c:715
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -5546,7 +5571,7 @@ msgstr ""
 "Devam etmek ister misiniz?"
 
 # libnautilus-extensions/nautilus-file-operations.c:719
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -5558,7 +5583,7 @@ msgstr ""
 "Devam etmek istiyor musunuz?"
 
 # libnautilus-extensions/nautilus-file-operations.c:723
-#: libnautilus-extensions/nautilus-file-operations.c:773
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -5570,7 +5595,7 @@ msgstr ""
 "Devam etmek istiyor musunuz?"
 
 # libnautilus-extensions/nautilus-file-operations.c:729
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -5582,7 +5607,7 @@ msgstr ""
 "Devam etmek istiyor musunuz?"
 
 # libnautilus-extensions/nautilus-file-operations.c:744
-#: libnautilus-extensions/nautilus-file-operations.c:794
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -5594,7 +5619,7 @@ msgstr ""
 "Devam etmek istiyor musunuz?"
 
 # libnautilus-extensions/nautilus-file-operations.c:748
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -5606,7 +5631,7 @@ msgstr ""
 "Devam etmek istiyor musunuz?"
 
 # libnautilus-extensions/nautilus-file-operations.c:752
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -5618,7 +5643,7 @@ msgstr ""
 "Devam etmek istiyor musunuz?"
 
 # libnautilus-extensions/nautilus-file-operations.c:758
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -5630,22 +5655,22 @@ msgstr ""
 "Devam etmek istiyor musunuz?"
 
 # libnautilus-extensions/nautilus-file-operations.c:874
-#: libnautilus-extensions/nautilus-file-operations.c:924
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "Kopyalarken hata oluþtu."
 
 # libnautilus-extensions/nautilus-file-operations.c:877
-#: libnautilus-extensions/nautilus-file-operations.c:927
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "Taþýnýrken hata oluþtu."
 
 # libnautilus-extensions/nautilus-file-operations.c:880
-#: libnautilus-extensions/nautilus-file-operations.c:930
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "Baðlantý yapýlýrken hata oluþtu"
 
 # libnautilus-extensions/nautilus-file-operations.c:885
-#: libnautilus-extensions/nautilus-file-operations.c:935
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "Silinirken hata oluþtu."
 
@@ -5653,20 +5678,20 @@ msgstr "Silinirken hata oluþtu."
 # libnautilus-extensions/nautilus-file-operations.c:929
 # libnautilus-extensions/nautilus-file-operations.c:1043
 # libnautilus-extensions/nautilus-file-operations.c:1057
-#: libnautilus-extensions/nautilus-file-operations.c:960
-#: libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "Atla"
 
 # libnautilus-extensions/nautilus-file-operations.c:929
-#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "Yeniden dene"
 
 # libnautilus-extensions/nautilus-file-operations.c:1007
-#: libnautilus-extensions/nautilus-file-operations.c:1057
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -5681,7 +5706,7 @@ msgstr ""
 "daha sonra yeniden deneyin."
 
 # libnautilus-extensions/nautilus-file-operations.c:1013
-#: libnautilus-extensions/nautilus-file-operations.c:1063
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -5696,12 +5721,12 @@ msgstr ""
 "deðiþtirin, daha sonra yeniden deneyin."
 
 # libnautilus-extensions/nautilus-file-operations.c:1021
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "Dosyanýn üzerine yazýlamýyor."
 
 # libnautilus-extensions/nautilus-file-operations.c:1031
-#: libnautilus-extensions/nautilus-file-operations.c:1081
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -5714,26 +5739,26 @@ msgstr ""
 
 # libnautilus-extensions/nautilus-file-operations.c:1042
 # libnautilus-extensions/nautilus-file-operations.c:1056
-#: libnautilus-extensions/nautilus-file-operations.c:1092
-#: libnautilus-extensions/nautilus-file-operations.c:1106
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "Kopyalama sýrasýnda çakýþma hatasý"
 
 # libnautilus-extensions/nautilus-file-operations.c:1043
 # libnautilus-extensions/nautilus-file-operations.c:1057
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "Üstüne yaz"
 
 # libnautilus-extensions/nautilus-file-operations.c:1057
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "Hepsinin üstüne yaz"
 
 # libnautilus-extensions/nautilus-file-operations.c:1110
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1160
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "%s'e diðer baðlantý"
@@ -5743,28 +5768,28 @@ msgstr "%s'e diðer baðlantý"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%2$s dosyasýna %1$d. baðlantý"
 
 # libnautilus-extensions/nautilus-file-operations.c:1130
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1180
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%2$s dosyasýna %1$d. baðlantý"
 
 # libnautilus-extensions/nautilus-file-operations.c:1134
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1184
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%2$s dosyasýna %1$d. baðlantý"
 
 # libnautilus-extensions/nautilus-file-operations.c:1138
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%2$s dosyasýna %1$d. baðlantý"
@@ -5776,288 +5801,278 @@ msgstr "%2$s dosyasýna %1$d. baðlantý"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:1160
 # libnautilus-extensions/nautilus-file-operations.c:2259
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (diðer kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:1162
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1212
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr ". kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:1164
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr ". kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:1166
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1216
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr ". kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:1168
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr ". kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:1178
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopya)%s"
 
 # libnautilus-extensions/nautilus-file-operations.c:1180
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (diðer kopya)%s"
 
 # libnautilus-extensions/nautilus-file-operations.c:1182
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1232
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. kopya)%s"
 
 # libnautilus-extensions/nautilus-file-operations.c:1184
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1234
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. kopya)%s"
 
 # libnautilus-extensions/nautilus-file-operations.c:1186
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1236
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. kopya)%s"
 
 # libnautilus-extensions/nautilus-file-operations.c:1188
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. kopya)%s"
 
 # libnautilus-extensions/nautilus-file-operations.c:1272
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1322
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 # libnautilus-extensions/nautilus-file-operations.c:1280
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1330
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
 # libnautilus-extensions/nautilus-file-operations.c:1437
 # libnautilus-extensions/nautilus-file-operations.c:1969
-#: libnautilus-extensions/nautilus-file-operations.c:1487
-#: libnautilus-extensions/nautilus-file-operations.c:2072
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Bilinmeyen GnomeVFSXferProgressStatus %d"
 
 # libnautilus-extensions/nautilus-file-operations.c:2099
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1802
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "Dosyalar çöp kutusuna taþýnýyor"
 
 # libnautilus-extensions/nautilus-file-operations.c:2101
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1804
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr "Silinen dosyalar:"
 
 # libnautilus-extensions/nautilus-file-operations.c:1757
 # libnautilus-extensions/nautilus-file-operations.c:2103
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1821
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "Taþýnýyor"
 
 # libnautilus-extensions/nautilus-file-operations.c:2104
-#: libnautilus-extensions/nautilus-file-operations.c:1807
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "Çöp Kutusuna Taþýmaya Hazýrlýk Yapýlýyor..."
 
 # libnautilus-extensions/nautilus-file-operations.c:1753
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1817
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "Dosyalar taþýnýyor"
 
 # libnautilus-extensions/nautilus-file-operations.c:1755
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "Taþýnan dosyalar:"
 
 # libnautilus-extensions/nautilus-file-operations.c:1758
-#: libnautilus-extensions/nautilus-file-operations.c:1822
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "Taþýmaya Hazýrlanýyor..."
 
 # libnautilus-extensions/nautilus-file-operations.c:1759
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "Taþýma Bitiriliyor..."
 
 # libnautilus-extensions/nautilus-file-operations.c:1769
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "Dosyalara baðlantý kuruluyor"
 
 # libnautilus-extensions/nautilus-file-operations.c:1771
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1837
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "Baðlantý kurulan dosyalar: "
 
 # libnautilus-extensions/nautilus-file-operations.c:1773
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1839
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "Baðlanýyor"
 
 # libnautilus-extensions/nautilus-file-operations.c:1774
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "Baðlantýlarý Yaratmaya Hazýrlanýyorum..."
 
 # libnautilus-extensions/nautilus-file-operations.c:1775
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "Baðlantý Oluþturma Tamamlanýyor..."
 
 # libnautilus-extensions/nautilus-file-operations.c:1782
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1848
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "Dosyalar kopyalanýyor"
 
 # libnautilus-extensions/nautilus-file-operations.c:1784
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "Kopyalanan dosyalar:"
 
 # libnautilus-extensions/nautilus-file-operations.c:1786
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "Kopyalanýyor"
 
 # libnautilus-extensions/nautilus-file-operations.c:1787
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "Kopyalamaya Hazýrlýyorum..."
 
 # libnautilus-extensions/nautilus-file-operations.c:1805
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "Dosyalarý çöp kutusuna kopyalayamazsýnýz."
 
 # libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "Çöpe Kopyalanamýyor."
 
 # libnautilus-extensions/nautilus-file-operations.c:1829
 # libnautilus-extensions/nautilus-file-operations.c:2059
-#: libnautilus-extensions/nautilus-file-operations.c:1899
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "Çöp kutusu masaüstünde kalmalýdýr."
 
 # libnautilus-extensions/nautilus-file-operations.c:1830
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "Çöp kutusu taþýnamaz."
 
 # libnautilus-extensions/nautilus-file-operations.c:1832
-#: libnautilus-extensions/nautilus-file-operations.c:1902
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "Çöp kutusu kopyalanamaz."
 
 # libnautilus-extensions/nautilus-file-operations.c:1833
-#: libnautilus-extensions/nautilus-file-operations.c:1903
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "Bu çöp kutusunu kopyalayamazsýnýz."
 
 # libnautilus-extensions/nautilus-file-operations.c:1835
 # libnautilus-extensions/nautilus-file-operations.c:2060
-#: libnautilus-extensions/nautilus-file-operations.c:1905
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "Çöpün Yeri Deðiþtirilemiyor"
 
 # libnautilus-extensions/nautilus-file-operations.c:1836
-#: libnautilus-extensions/nautilus-file-operations.c:1906
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "Çöp Kutusuna Kopyalanamýyor"
 
 # libnautilus-extensions/nautilus-file-operations.c:1854
-#: libnautilus-extensions/nautilus-file-operations.c:1929
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "Bir dizini kendi üzerine taþýyamazsýnýz."
 
 # libnautilus-extensions/nautilus-file-operations.c:1855
-#: libnautilus-extensions/nautilus-file-operations.c:1930
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "Bir dizini kendi üzerine kopyalayamazsýnýz."
 
 # libnautilus-extensions/nautilus-file-operations.c:1856
-#: libnautilus-extensions/nautilus-file-operations.c:1932
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "Üzerine Taþýnamaz"
 
 # libnautilus-extensions/nautilus-file-operations.c:1856
-#: libnautilus-extensions/nautilus-file-operations.c:1933
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "Üzerine Kopyalanamaz"
 
-# libnautilus-extensions/nautilus-file-operations.c:1854
-#: libnautilus-extensions/nautilus-file-operations.c:1946
-msgid "You cannot move a file onto itself."
-msgstr "Bir dosyayý kendi üzerine taþýyamazsýnýz."
-
 # libnautilus-extensions/nautilus-file-operations.c:1855
-#: libnautilus-extensions/nautilus-file-operations.c:1947
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "Bir dosyayý kendi üzerine kopyalayamazsýnýz."
 
 # libnautilus-extensions/nautilus-file-operations.c:1856
-#: libnautilus-extensions/nautilus-file-operations.c:1949
-msgid "Can't Move Onto Self"
-msgstr "Üzerine Taþýnamaz"
-
-# libnautilus-extensions/nautilus-file-operations.c:1856
-#: libnautilus-extensions/nautilus-file-operations.c:1950
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "Üzerine Kopyalanamaz"
 
 # libnautilus-extensions/nautilus-file-operations.c:1907
-#: libnautilus-extensions/nautilus-file-operations.c:2001
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -6068,7 +6083,7 @@ msgstr ""
 "Hedef bölgeye yazma hakkýnýz yok"
 
 # libnautilus-extensions/nautilus-file-operations.c:1910
-#: libnautilus-extensions/nautilus-file-operations.c:2004
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -6079,756 +6094,826 @@ msgstr ""
 "Hedef bölgede yeterli disk alaný yok."
 
 # libnautilus-extensions/nautilus-file-operations.c:1913
-#: libnautilus-extensions/nautilus-file-operations.c:2007
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Yeni dizin oluþturulurken hata: \"%s\""
 
 # libnautilus-extensions/nautilus-file-operations.c:1917
-#: libnautilus-extensions/nautilus-file-operations.c:2011
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "Yeni dizin oluþturulurken hata"
 
 # libnautilus-extensions/nautilus-file-operations.c:1994
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2098
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "isimsiz dizin"
 
 # libnautilus-extensions/nautilus-file-operations.c:2146
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2131
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "Dosyalarý siliyorum"
 
 # libnautilus-extensions/nautilus-file-operations.c:2148
 # libnautilus-extensions/nautilus-file-operations.c:2185
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2133
-#: libnautilus-extensions/nautilus-file-operations.c:2168
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "Silinen dosyalar:"
 
 # libnautilus-extensions/nautilus-file-operations.c:2150
 # libnautilus-extensions/nautilus-file-operations.c:2187
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2135
-#: libnautilus-extensions/nautilus-file-operations.c:2170
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "Siliniyor"
 
 # libnautilus-extensions/nautilus-file-operations.c:2151
-#: libnautilus-extensions/nautilus-file-operations.c:2136
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "Dosyalar Silinmek Üzere Hazýrlanýyor..."
 
 # libnautilus-extensions/nautilus-file-operations.c:2183
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2166
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "Çöp kutusu boþaltýlýyor"
 
 # libnautilus-extensions/nautilus-file-operations.c:2188
-#: libnautilus-extensions/nautilus-file-operations.c:2171
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "Çöp kutusunu boþaltmaya hazýrlanýyorum..."
 
 # libnautilus-extensions/nautilus-file-operations.c:2219
-#: libnautilus-extensions/nautilus-file-operations.c:2202
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr "Gerçekten çöp kutusundaki herþeyi tümüyle silmek istiyor musunuz?"
 
 # libnautilus-extensions/nautilus-file-operations.c:2221
-#: libnautilus-extensions/nautilus-file-operations.c:2204
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "Çöp Kutusu Silinsin mi?"
 
 # libnautilus-extensions/nautilus-file-operations.c:2222
-#: libnautilus-extensions/nautilus-file-operations.c:2205
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "Boþ"
 
 # libnautilus-extensions/nautilus-file-operations.c:2260
-#: libnautilus-extensions/nautilus-file-operations.c:2243
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "dosya"
 
 # libnautilus-extensions/nautilus-file-operations.c:2260
 # libnautilus-extensions/nautilus-file-operations.c:2270
-#: libnautilus-extensions/nautilus-file-operations.c:2243
-#: libnautilus-extensions/nautilus-file-operations.c:2253
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "dosya (kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2261
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
 # libnautilus-extensions/nautilus-file-operations.c:2261
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2262
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".dosya.txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2262
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".dosya (kopya).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2263
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "dosya2"
 
 # libnautilus-extensions/nautilus-file-operations.c:2263
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "dosya2 (kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2264
-#: libnautilus-extensions/nautilus-file-operations.c:2247
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "dosya.txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2264
 # libnautilus-extensions/nautilus-file-operations.c:2271
-#: libnautilus-extensions/nautilus-file-operations.c:2247
-#: libnautilus-extensions/nautilus-file-operations.c:2254
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "dosya (kopya).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2265
-#: libnautilus-extensions/nautilus-file-operations.c:2248
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "dosya2.txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2265
 # libnautilus-extensions/nautilus-file-operations.c:2285
-#: libnautilus-extensions/nautilus-file-operations.c:2248
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "dosya2 (kopya).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2266
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "dosya2.txt txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2266
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "dosya2 (kopya).txt txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2267
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "dosya...txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2267
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "dosya... (kopya).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2268
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "dosya..."
 
 # libnautilus-extensions/nautilus-file-operations.c:2268
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "dosya... (kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2269
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "dosya. (kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2269
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "dosya. (diðer kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2270
 # libnautilus-extensions/nautilus-file-operations.c:2272
-#: libnautilus-extensions/nautilus-file-operations.c:2253
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "dosya (diðer kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2271
 # libnautilus-extensions/nautilus-file-operations.c:2273
-#: libnautilus-extensions/nautilus-file-operations.c:2254
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "dosya (diðer kopya).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2272
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "dosya (3. kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2273
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "dosya (3. kopya).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2274
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "dosya2 (diðer kopya).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2274
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "dosya2 (3. kopya).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2275
-#: libnautilus-extensions/nautilus-file-operations.c:2258
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr "dosya (21. kopya)"
+
+# libnautilus-extensions/nautilus-file-operations.c:2279
+# libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr "dosya (24. kopya)"
+
+# libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr "dosya (21. kopya).txt"
+
+# libnautilus-extensions/nautilus-file-operations.c:2280
+# libnautilus-extensions/nautilus-file-operations.c:2282
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr "dosya (24. kopya).txt"
+
+# libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "dosya (21. kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2275
 # libnautilus-extensions/nautilus-file-operations.c:2277
-#: libnautilus-extensions/nautilus-file-operations.c:2258
-#: libnautilus-extensions/nautilus-file-operations.c:2260
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "dosya (22. kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2276
-#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "dosya (21. kopya).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2276
 # libnautilus-extensions/nautilus-file-operations.c:2278
-#: libnautilus-extensions/nautilus-file-operations.c:2259
-#: libnautilus-extensions/nautilus-file-operations.c:2261
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "dosya (22. kopya).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2277
 # libnautilus-extensions/nautilus-file-operations.c:2279
-#: libnautilus-extensions/nautilus-file-operations.c:2260
-#: libnautilus-extensions/nautilus-file-operations.c:2262
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "dosya (23. kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2278
 # libnautilus-extensions/nautilus-file-operations.c:2280
-#: libnautilus-extensions/nautilus-file-operations.c:2261
-#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "dosya (23. kopya).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2279
 # libnautilus-extensions/nautilus-file-operations.c:2281
-#: libnautilus-extensions/nautilus-file-operations.c:2262
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "dosya (24. kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2280
 # libnautilus-extensions/nautilus-file-operations.c:2282
-#: libnautilus-extensions/nautilus-file-operations.c:2263
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "dosya (24. kopya).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2281
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "dosya (25. kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2282
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "dosya (25. kopya).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2283
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "dosya2 (24. kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2283
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "dosya (25. kopya)"
 
 # libnautilus-extensions/nautilus-file-operations.c:2284
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "dosya (24. kopya).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2284
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "dosya (25. kopya).txt"
 
 # libnautilus-extensions/nautilus-file-operations.c:2285
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "dosya (100000000000000. kopya).txt"
 
-# components/services/install/nautilus-view/nautilus-service-install-view.c:734
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
-#, c-format
-msgid "%ld of %ld"
-msgstr "%ld / %ld"
-
-# src/nautilus-shell-ui.xml.h:40
-#: libnautilus-extensions/nautilus-font-picker.c:96
-msgid "Normal"
-msgstr "Normal"
+# libnautilus-extensions/nautilus-file-operations.c:2275
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (10th copy)"
+msgstr "dosya (21. kopya)"
 
-# libnautilus-extensions/nautilus-file.c:3629
-#: libnautilus-extensions/nautilus-font-picker.c:97
-#: libnautilus-extensions/nautilus-volume-monitor.c:516
-#: libnautilus-extensions/nautilus-volume-monitor.c:535
-msgid "Unknown"
-msgstr "Bilinmiyor"
+# libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2289
+#, fuzzy
+msgid "foo (11st copy)"
+msgstr "dosya (21. kopya)"
 
-# components/music/mpg123.c:61
-#: libnautilus-extensions/nautilus-font-picker.c:103
-msgid "Bold"
-msgstr "Kalýn"
+# libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (10th copy).txt"
+msgstr "dosya (21. kopya).txt"
 
-# src/nautilus-bookmarks-window.c:127
-#: libnautilus-extensions/nautilus-font-picker.c:104
-msgid "Book"
-msgstr "Kitap"
+# libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2290
+#, fuzzy
+msgid "foo (11st copy).txt"
+msgstr "dosya (21. kopya).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:106
-msgid "Demibold"
-msgstr "Yarý Kalýn"
+# libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (11th copy)"
+msgstr "dosya (21. kopya)"
 
-# src/Nautilus_shell.oaf.in.h:3
-#: libnautilus-extensions/nautilus-font-picker.c:107
-msgid "Light"
-msgstr "Hafif"
+# libnautilus-extensions/nautilus-file-operations.c:2275
+# libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2291
+#, fuzzy
+msgid "foo (12nd copy)"
+msgstr "dosya (22. kopya)"
 
-# src/file-manager/fm-properties-window.c:1200
-#: libnautilus-extensions/nautilus-font-picker.c:113
-msgid "Italic"
-msgstr "Yatýk"
+# libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (11th copy).txt"
+msgstr "dosya (21. kopya).txt"
 
-# components/music/mpg123.c:31
-#: libnautilus-extensions/nautilus-font-picker.c:114
-msgid "Oblique"
-msgstr "Eðimli"
+# libnautilus-extensions/nautilus-file-operations.c:2276
+# libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2292
+#, fuzzy
+msgid "foo (12nd copy).txt"
+msgstr "dosya (22. kopya).txt"
 
-# components/services/install/command-line/eazel-alt-install-corba.c:114
-#: libnautilus-extensions/nautilus-font-picker.c:115
-msgid "Reverse Italic"
-msgstr "Ters Yatýk"
+# libnautilus-extensions/nautilus-file-operations.c:2279
+# libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (12th copy)"
+msgstr "dosya (24. kopya)"
 
-# src/file-manager/nautilus-icon-view-ui.xml.h:19
-#: libnautilus-extensions/nautilus-font-picker.c:116
-msgid "Reverse Oblique"
-msgstr "Ters Eðimli"
+# libnautilus-extensions/nautilus-file-operations.c:2272
+#: libnautilus-extensions/nautilus-file-operations.c:2293
+#, fuzzy
+msgid "foo (13rd copy)"
+msgstr "dosya (3. kopya)"
 
-# src/file-manager/fm-properties-window.c:983
-#: libnautilus-extensions/nautilus-font-picker.c:123
-msgid "Condensed"
-msgstr "Sýký"
+# libnautilus-extensions/nautilus-file-operations.c:2282
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (12th copy).txt"
+msgstr "dosya (25. kopya).txt"
 
-#: libnautilus-extensions/nautilus-font-picker.c:124
-msgid "Semicondensed"
-msgstr "Yarý sýký"
+# libnautilus-extensions/nautilus-file-operations.c:2273
+#: libnautilus-extensions/nautilus-file-operations.c:2294
+#, fuzzy
+msgid "foo (13rd copy).txt"
+msgstr "dosya (3. kopya).txt"
 
-# libnautilus-extensions/nautilus-font-picker.c:131
-#: libnautilus-extensions/nautilus-font-picker.c:226
-msgid "Font"
-msgstr "Yazýtipi"
+# components/services/install/nautilus-view/nautilus-service-install-view.c:734
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
+#, c-format
+msgid "%ld of %ld"
+msgstr "%ld / %ld"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1121
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
 msgid "GConf Error"
 msgstr "GConf Hatasý"
 
-# libnautilus-extensions/nautilus-font-factory.c:321
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:956
-msgid "fixed"
-msgstr "düzeltilmiþ"
-
-# libnautilus-extensions/nautilus-glib-extensions.c:1192
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1427
-msgid "01/01/00, 01:00 AM"
-msgstr "01/01/00, 01:00"
-
-# libnautilus-extensions/nautilus-glib-extensions.c:1193
-#: libnautilus-extensions/nautilus-glib-extensions.c:1428
-msgid "1/1/00, 1:00 AM"
-msgstr "1/1/00, 1:00"
-
-# libnautilus-extensions/nautilus-glib-extensions.c:1194
-#: libnautilus-extensions/nautilus-glib-extensions.c:1429
-msgid " 1/ 1/00,  1:00 AM"
-msgstr " 1/ 1/00,  1:00"
-
 # libnautilus-extensions/nautilus-global-preferences.c:44
 #. Constants
 #: libnautilus-extensions/nautilus-global-preferences.c:50
 msgid "Nautilus Preferences"
 msgstr "Nautilus Tercihleri"
 
-# libnautilus-extensions/nautilus-global-preferences.c:88
-#: libnautilus-extensions/nautilus-global-preferences.c:97
-msgid "current theme"
-msgstr "geçerli tema"
+# libnautilus-extensions/nautilus-global-preferences.c:885
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "her zaman"
+
+# libnautilus-extensions/nautilus-global-preferences.c:886
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "Her zaman"
+
+# libnautilus-extensions/nautilus-global-preferences.c:889
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "sadece yerel"
+
+# libnautilus-extensions/nautilus-global-preferences.c:890
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "Sadece Yerel Dosyalarda"
+
+# libnautilus-extensions/nautilus-global-preferences.c:893
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "hiç bir zaman"
+
+# libnautilus-extensions/nautilus-global-preferences.c:894
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "Hiç bir zaman"
+
+# libnautilus-extensions/nautilus-global-preferences.c:557
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "Daha Düzgün Grafikler"
+
+# libnautilus-extensions/nautilus-global-preferences.c:129
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "Daha kaliteli (fakat daha yavaþ) grafik kullan"
+
+# libnautilus-extensions/nautilus-global-preferences.c:564
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "Yazýtipleri"
+
+# components/music/Nautilus_View_music.oaf.in.h:1
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+#, fuzzy
+msgid "Font for Icon view:"
+msgstr "Müzik görüntüsü için mimari"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
+msgstr ""
+
+# components/history/Nautilus_View_history.oaf.in.h:1
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "Geçmiþ görünümleri için mimari"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
+
+# libnautilus-extensions/nautilus-global-preferences.c:148
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "Masaüstünü çizmek için Nautilus kullan"
+
+# src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
+msgstr "Yeni Pencere Açýlýyor"
 
 # libnautilus-extensions/nautilus-global-preferences.c:92
-#: libnautilus-extensions/nautilus-global-preferences.c:100
+#: libnautilus-extensions/nautilus-global-preferences.c:651
 msgid "Open each file or folder in a separate window"
 msgstr "Her dizin ya da dosyayý ayrý pencerede aç"
 
+# libnautilus-extensions/nautilus-global-preferences.c:136
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+msgid "Display toolbar in new windows"
+msgstr "Araç çubuðunu yeni pencerede göster"
+
+# libnautilus-extensions/nautilus-global-preferences.c:139
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "Yeni pencerelerde konum çubuðunu göster"
+
+# libnautilus-extensions/nautilus-global-preferences.c:142
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "Yeni pencerelerde durum çubuðunu göster"
+
+# libnautilus-extensions/nautilus-global-preferences.c:145
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "Yeni pencerelerde yan çubuðu göster"
+
+# libnautilus-extensions/nautilus-global-preferences.c:481
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "Çöp Davranýþý"
+
 # libnautilus-extensions/nautilus-global-preferences.c:96
-#: libnautilus-extensions/nautilus-global-preferences.c:103
-msgid "Ask before emptying the Trash"
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+#, fuzzy
+msgid "Ask before emptying the Trash or deleting files"
 msgstr "Çöp kutusunu silmeden önce sor"
 
-# libnautilus-extensions/nautilus-global-preferences.c:474
-#: libnautilus-extensions/nautilus-global-preferences.c:106
-#: libnautilus-extensions/nautilus-global-preferences.c:597
-msgid "Click Behavior"
-msgstr "Týklama Yöntemi"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
+
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
 
 # libnautilus-extensions/nautilus-global-preferences.c:103
-#: libnautilus-extensions/nautilus-global-preferences.c:109
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 msgid "single"
 msgstr "tek týklama"
 
 # libnautilus-extensions/nautilus-global-preferences.c:104
-#: libnautilus-extensions/nautilus-global-preferences.c:110
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "Öðeleri tek týklamayla etkinleþtir"
 
 # libnautilus-extensions/nautilus-global-preferences.c:108
-#: libnautilus-extensions/nautilus-global-preferences.c:114
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "çift týklama"
 
 # libnautilus-extensions/nautilus-global-preferences.c:109
-#: libnautilus-extensions/nautilus-global-preferences.c:115
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "Öðeleri çift týklamayla etkinleþtir"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:119
-#: libnautilus-extensions/nautilus-global-preferences.c:604
-msgid "Executable Text Files"
-msgstr "Çalýþtýrýlabilir Metin Dosyalarý"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:122
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 msgid "launch"
 msgstr "çalýþtýr"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:123
+#: libnautilus-extensions/nautilus-global-preferences.c:726
 msgid "Execute files when they are clicked"
 msgstr "Týklandýðý zaman dosyalarý çalýþtýr"
 
 # libnautilus-extensions/nautilus-global-preferences.c:488
-#: libnautilus-extensions/nautilus-global-preferences.c:127
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 msgid "display"
 msgstr "göster"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:128
+#: libnautilus-extensions/nautilus-global-preferences.c:730
 msgid "Display files when they are clicked"
 msgstr "Týklandýðýnda dosyalarýn içeriðini göster"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:132
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 msgid "ask"
 msgstr "sor"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:133
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 msgid "Ask each time"
 msgstr "Her zaman sor"
 
-# libnautilus-extensions/nautilus-global-preferences.c:602
-#: libnautilus-extensions/nautilus-global-preferences.c:143
-#: libnautilus-extensions/nautilus-global-preferences.c:725
-msgid "Show Text in Icons"
-msgstr "Simgelerde Metni Göster"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:146
-#: libnautilus-extensions/nautilus-global-preferences.c:732
-msgid "Show Count of Items in Folders"
-msgstr "Dizinlerdeki Öðe Sayýsýný Göster"
-
-# libnautilus-extensions/nautilus-global-preferences.c:609
-#: libnautilus-extensions/nautilus-global-preferences.c:149
-#: libnautilus-extensions/nautilus-global-preferences.c:739
-msgid "Show Thumbnails for Image Files"
-msgstr "Resim Dosyalarý Ýçin Küçükleri Göster"
-
-# libnautilus-extensions/nautilus-global-preferences.c:625
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:152
-#: libnautilus-extensions/nautilus-global-preferences.c:755
-msgid "Make Folder Appearance Details Public"
-msgstr "Dizin Görünüm Detaylarýný Aç"
-
-# libnautilus-extensions/nautilus-global-preferences.c:616
-#: libnautilus-extensions/nautilus-global-preferences.c:155
-#: libnautilus-extensions/nautilus-global-preferences.c:746
-msgid "Preview Sound Files"
-msgstr "Ses Dosyalarý Önizleme"
-
-# libnautilus-extensions/nautilus-global-preferences.c:129
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Use smoother (but slower) graphics"
-msgstr "Daha kaliteli (fakat daha yavaþ) grafik kullan"
-
-# libnautilus-extensions/nautilus-global-preferences.c:132
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Use this font family to display file names:"
-msgstr "Dosya isimlerinde kullanýlan yazýtipi ailesi:"
-
-# libnautilus-extensions/nautilus-global-preferences.c:136
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-msgid "Display toolbar in new windows"
-msgstr "Araç çubuðunu yeni pencerede göster"
-
-# libnautilus-extensions/nautilus-global-preferences.c:139
-#: libnautilus-extensions/nautilus-global-preferences.c:170
-msgid "Display location bar in new windows"
-msgstr "Yeni pencerelerde konum çubuðunu göster"
-
-# libnautilus-extensions/nautilus-global-preferences.c:142
-#: libnautilus-extensions/nautilus-global-preferences.c:173
-msgid "Display status bar in new windows"
-msgstr "Yeni pencerelerde durum çubuðunu göster"
-
-# libnautilus-extensions/nautilus-global-preferences.c:145
-#: libnautilus-extensions/nautilus-global-preferences.c:176
-msgid "Display sidebar in new windows"
-msgstr "Yeni pencerelerde yan çubuðu göster"
-
-# libnautilus-extensions/nautilus-global-preferences.c:148
-#: libnautilus-extensions/nautilus-global-preferences.c:179
-msgid "Use Nautilus to draw the desktop"
-msgstr "Masaüstünü çizmek için Nautilus kullan"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:183
-msgid "Enable fast search (indexes your hard drive)"
-msgstr "Hýzlý taramayý etkinleþtir (sabit diski indeksler)"
-
-# libnautilus-extensions/nautilus-global-preferences.c:156
-#: libnautilus-extensions/nautilus-global-preferences.c:186
-msgid "search type to do by default"
-msgstr "öntanýmlý arama tipi"
-
-# libnautilus-extensions/nautilus-global-preferences.c:159
-#: libnautilus-extensions/nautilus-global-preferences.c:189
-msgid "search by text"
-msgstr "Metin üzerinden ara"
-
-# libnautilus-extensions/nautilus-global-preferences.c:160
-#: libnautilus-extensions/nautilus-global-preferences.c:190
-msgid "Search for files by file name only"
-msgstr "Dosyalarý sadece isme göre ara"
-
-# libnautilus-extensions/nautilus-global-preferences.c:164
-#: libnautilus-extensions/nautilus-global-preferences.c:194
-msgid "search by text and properties"
-msgstr "metin ve özelliklere göre ara"
+# libnautilus-extensions/nautilus-global-preferences.c:474
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "Týklama Yöntemi"
 
-# libnautilus-extensions/nautilus-global-preferences.c:165
-#: libnautilus-extensions/nautilus-global-preferences.c:195
-msgid "Search for files by file name and file properties"
-msgstr "Dosyalarý isme ve dosya özelliklerine göre ara"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr "Çalýþtýrýlabilir Metin Dosyalarý"
 
-# libnautilus-extensions/nautilus-global-preferences.c:170
-#: libnautilus-extensions/nautilus-global-preferences.c:199
-msgid "Search Engine Location"
-msgstr "Arama Motoru Yeri"
+# src/nautilus-complex-search-bar.c:233
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr "Seçenekleri Göster/Gizle"
 
 # libnautilus-extensions/nautilus-global-preferences.c:174
-#: libnautilus-extensions/nautilus-global-preferences.c:203
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr "\".\" ile biten gizli dosyalarý göster"
 
 # libnautilus-extensions/nautilus-global-preferences.c:177
-#: libnautilus-extensions/nautilus-global-preferences.c:206
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr "\"~\" ile biten yedekleme dosyalarýný göster"
 
 # libnautilus-extensions/nautilus-global-preferences.c:180
-#: libnautilus-extensions/nautilus-global-preferences.c:209
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr "Özellikler penceresinde özel iþaretleri göster"
 
-# libnautilus-extensions/nautilus-global-preferences.c:183
-#: libnautilus-extensions/nautilus-global-preferences.c:212
-msgid "Show only folders (no files) in the tree"
-msgstr "Aðaç panelinde sadece dizinleri göster"
-
-# libnautilus-extensions/nautilus-global-preferences.c:186
-#: libnautilus-extensions/nautilus-global-preferences.c:215
-msgid "Can add Content"
-msgstr "Eklenebilir içerik"
+# src/file-manager/fm-error-reporting.c:157
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+#, fuzzy
+msgid "Sorting Order"
+msgstr "Sahibi Deðiþtirilirken Hata"
 
-# libnautilus-extensions/nautilus-global-preferences.c:190
-#: libnautilus-extensions/nautilus-global-preferences.c:218
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
-msgstr "Yer imleri menüsünde Nautilus ile birlikte gelen baðlantýlarý içerme"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
 # src/nautilus-location-bar.c:60
-#: libnautilus-extensions/nautilus-global-preferences.c:222
-#: libnautilus-extensions/nautilus-global-preferences.c:227
-#: src/file-manager/fm-properties-window.c:1519 src/nautilus-location-bar.c:62
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
 msgid "Location:"
 msgstr "Adres:"
 
+# libnautilus-extensions/nautilus-global-preferences.c:673
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+msgid "HTTP Proxy Settings"
+msgstr "Vekil Sunucu Ayarlarý"
+
 # libnautilus-extensions/nautilus-global-preferences.c:911
-#: libnautilus-extensions/nautilus-global-preferences.c:226
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "HTTP vekili kullan"
 
 # src/nautilus-first-time-druid.c:621
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:228
+#: libnautilus-extensions/nautilus-global-preferences.c:812
 #: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr "Port:"
 
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
+
+# libnautilus-extensions/nautilus-global-preferences.c:692
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "Ýç Yer Ýmleri"
+
+# libnautilus-extensions/nautilus-global-preferences.c:190
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "Yer imleri menüsünde Nautilus ile birlikte gelen baðlantýlarý içerme"
+
+# libnautilus-extensions/nautilus-global-preferences.c:602
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "Simgelerde Metni Göster"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr "Dizinlerdeki Öðe Sayýsýný Göster"
+
+# libnautilus-extensions/nautilus-global-preferences.c:609
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "Resim Dosyalarý Ýçin Küçükleri Göster"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
+
+# libnautilus-extensions/nautilus-global-preferences.c:616
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr "Ses Dosyalarý Önizleme"
+
+# libnautilus-extensions/nautilus-global-preferences.c:625
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr "Dizin Görünüm Detaylarýný Aç"
+
 # libnautilus-extensions/nautilus-global-preferences.c:554
-#: libnautilus-extensions/nautilus-global-preferences.c:533
+#: libnautilus-extensions/nautilus-global-preferences.c:936
 msgid "Appearance"
 msgstr "Görünüm"
 
-# libnautilus-extensions/nautilus-global-preferences.c:557
-#: libnautilus-extensions/nautilus-global-preferences.c:535
-msgid "Smoother Graphics"
-msgstr "Daha Düzgün Grafikler"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:552
+#: libnautilus-extensions/nautilus-global-preferences.c:941
 msgid "Windows & Desktop"
 msgstr "Pencereler & Masaüstü"
 
-# src/file-manager/nautilus-directory-view-ui.xml.h:20
-#: libnautilus-extensions/nautilus-global-preferences.c:560
-msgid "Opening New Windows"
-msgstr "Yeni Pencere Açýlýyor"
-
-# libnautilus-extensions/nautilus-global-preferences.c:481
-#: libnautilus-extensions/nautilus-global-preferences.c:583
-msgid "Trash Behavior"
-msgstr "Çöp Davranýþý"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:595
+#: libnautilus-extensions/nautilus-global-preferences.c:946
 msgid "Icon & List Views"
 msgstr "Simge & Liste Görünümleri"
 
-# src/nautilus-complex-search-bar.c:233
-#: libnautilus-extensions/nautilus-global-preferences.c:611
-msgid "Show/Hide Options"
-msgstr "Seçenekleri Göster/Gizle"
-
-# libnautilus-extensions/nautilus-global-preferences.c:514
-#: libnautilus-extensions/nautilus-global-preferences.c:632
-msgid "Sidebar Panels"
-msgstr "Yan Paneller"
-
-# data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4642
-# libnautilus-extensions/nautilus-trash-directory.c:301
-# src/file-manager/fm-desktop-icon-view.c:66
-#: libnautilus-extensions/nautilus-global-preferences.c:635
-msgid "Tabs"
-msgstr "Sekmeler"
-
 # libnautilus-extensions/nautilus-global-preferences.c:663
-#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:957
 msgid "Navigation"
 msgstr "Gezme"
 
-# libnautilus-extensions/nautilus-global-preferences.c:673
-#: libnautilus-extensions/nautilus-global-preferences.c:693
-msgid "HTTP Proxy Settings"
-msgstr "Vekil Sunucu Ayarlarý"
-
-# libnautilus-extensions/nautilus-global-preferences.c:692
-#: libnautilus-extensions/nautilus-global-preferences.c:712
-msgid "Built-in Bookmarks"
-msgstr "Ýç Yer Ýmleri"
-
 # libnautilus-extensions/nautilus-global-preferences.c:599
-#: libnautilus-extensions/nautilus-global-preferences.c:723
+#: libnautilus-extensions/nautilus-global-preferences.c:962
 msgid "Speed Tradeoffs"
 msgstr "Hýzlamalar"
 
-# libnautilus-extensions/nautilus-global-preferences.c:636
-#: libnautilus-extensions/nautilus-global-preferences.c:794
-msgid "Search"
-msgstr "Ara"
+# libnautilus-extensions/nautilus-global-preferences.c:159
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr "Metin üzerinden ara"
+
+# libnautilus-extensions/nautilus-global-preferences.c:160
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+msgid "Search for files by file name only"
+msgstr "Dosyalarý sadece isme göre ara"
+
+# libnautilus-extensions/nautilus-global-preferences.c:164
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr "metin ve özelliklere göre ara"
+
+# libnautilus-extensions/nautilus-global-preferences.c:165
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+msgid "Search for files by file name and file properties"
+msgstr "Dosyalarý isme ve dosya özelliklerine göre ara"
 
 # libnautilus-extensions/nautilus-global-preferences.c:639
-#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "Arama Detay Seçenekleri"
 
+# libnautilus-extensions/nautilus-global-preferences.c:156
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "öntanýmlý arama tipi"
+
 # libnautilus-extensions/nautilus-global-preferences.c:636
-#: libnautilus-extensions/nautilus-global-preferences.c:802
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 msgid "Fast Search"
 msgstr "Hýzlý Ara"
 
-# libnautilus-extensions/nautilus-global-preferences.c:564
-#: libnautilus-extensions/nautilus-global-preferences.c:846
-msgid "Fonts"
-msgstr "Yazýtipleri"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr "Hýzlý taramayý etkinleþtir (sabit diski indeksler)"
+
+# libnautilus-extensions/nautilus-global-preferences.c:170
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+msgid "Search Engine Location"
+msgstr "Arama Motoru Yeri"
+
+# libnautilus-extensions/nautilus-global-preferences.c:636
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "Ara"
+
+# libnautilus-extensions/nautilus-global-preferences.c:183
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr "Aðaç panelinde sadece dizinleri göster"
 
 # libnautilus-extensions/nautilus-global-preferences.c:142
-#: libnautilus-extensions/nautilus-global-preferences.c:1026
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
 #, c-format
 msgid "Display %s tab in sidebar"
 msgstr "Yan çubukta %s sekmesini göster"
 
-# libnautilus-extensions/nautilus-global-preferences.c:885
-#: libnautilus-extensions/nautilus-global-preferences.c:1073
-msgid "always"
-msgstr "her zaman"
-
-# libnautilus-extensions/nautilus-global-preferences.c:886
-#: libnautilus-extensions/nautilus-global-preferences.c:1074
-msgid "Always"
-msgstr "Her zaman"
-
-# libnautilus-extensions/nautilus-global-preferences.c:889
-#: libnautilus-extensions/nautilus-global-preferences.c:1077
-msgid "local only"
-msgstr "sadece yerel"
-
-# libnautilus-extensions/nautilus-global-preferences.c:890
-#: libnautilus-extensions/nautilus-global-preferences.c:1078
-msgid "Local Files Only"
-msgstr "Sadece Yerel Dosyalarda"
-
-# libnautilus-extensions/nautilus-global-preferences.c:893
-#: libnautilus-extensions/nautilus-global-preferences.c:1081
-msgid "never"
-msgstr "hiç bir zaman"
+# libnautilus-extensions/nautilus-global-preferences.c:514
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "Yan Paneller"
 
-# libnautilus-extensions/nautilus-global-preferences.c:894
-#: libnautilus-extensions/nautilus-global-preferences.c:1082
-msgid "Never"
-msgstr "Hiç bir zaman"
+# data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4642
+# libnautilus-extensions/nautilus-trash-directory.c:301
+# src/file-manager/fm-desktop-icon-view.c:66
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr "Sekmeler"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1145
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "currently can't be performed because the program crond, which does nightly "
@@ -6836,17 +6921,16 @@ msgid ""
 "done, turn crond on."
 msgstr ""
 "Ýndeksleme açýk ve hýzlý arama özelliði etkin. Ancak crond programýnýn "
-"kapalý olmasý nedeniyle indeksleme yapýlamýyor. Eðer hýzlý aramalarýn "
-"etkin olmasýný istiyorsaniz crond programýný çalýþtýrýn."
-
+"kapalý olmasý nedeniyle indeksleme yapýlamýyor. Eðer hýzlý aramalarýn etkin "
+"olmasýný istiyorsaniz crond programýný çalýþtýrýn."
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1152
-#: libnautilus-extensions/nautilus-global-preferences.c:1170
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
 msgid "Files May Not Be Indexed"
 msgstr "Dosyalar Ýndekslenmeyebilir"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1153
-#: libnautilus-extensions/nautilus-global-preferences.c:1171
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
 msgid ""
 "If you are running Linux, you can log in as root and type these commands to "
 "start cron:\n"
@@ -6854,13 +6938,13 @@ msgid ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
-"Eðer Linux kullanýyorsanýz, root kullanýcýsý ile sisteme girin ve "
-"cron'u çalýþtýrmak için aþaðýdaki komutlarý yazýn:\n"
+"Eðer Linux kullanýyorsanýz, root kullanýcýsý ile sisteme girin ve cron'u "
+"çalýþtýrmak için aþaðýdaki komutlarý yazýn:\n"
 "\n"
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1162
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "may not be performed because the program crond, which does nightly tasks on "
@@ -6869,17 +6953,8 @@ msgid ""
 "\n"
 msgstr ""
 "Ýndeksleme açýk ve hýzlý arama özelliði etkin. Ancak crond programýnýn "
-"kapalý olmasý nedeniyle indeksleme yapýlamýyor. Eðer hýzlý aramalarýn "
-"etkin olmasýný istiyorsaniz crond programýný çalýþtýrýn.\n"
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:640
-msgid "No image was selected.  You must click on an image to select it."
-msgstr "Hiç resim seçilmedi. Bir resmi üzerine týklayarak seçmelisiniz."
-
-# components/help/converters/gnome-db2html2/sect-elements.c:1027
-#: libnautilus-extensions/nautilus-gnome-extensions.c:641
-msgid "No selection made"
-msgstr "seçim yapýlmadý"
+"kapalý olmasý nedeniyle indeksleme yapýlamýyor. Eðer hýzlý aramalarýn etkin "
+"olmasýný istiyorsaniz crond programýný çalýþtýrýn.\n"
 
 # libnautilus-extensions/nautilus-icon-canvas-item.c:67
 #. The list of characters that cause line breaks can be localized.
@@ -6888,7 +6963,7 @@ msgid " -_,;.?/&"
 msgstr " -_,;.?/&"
 
 # libnautilus-extensions/nautilus-icon-dnd.c:720
-#: libnautilus-extensions/nautilus-icon-dnd.c:741
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
@@ -6898,7 +6973,7 @@ msgstr ""
 "býraktýðýnýz yerde durmasýný istiyor musunuz?"
 
 # libnautilus-extensions/nautilus-icon-dnd.c:724
-#: libnautilus-extensions/nautilus-icon-dnd.c:745
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
@@ -6908,7 +6983,7 @@ msgstr ""
 "býraktýðýnýz yerde durmasýný istiyor musunuz?"
 
 # libnautilus-extensions/nautilus-icon-dnd.c:730
-#: libnautilus-extensions/nautilus-icon-dnd.c:751
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
@@ -6917,7 +6992,7 @@ msgstr ""
 "býraktýðýnýz yerde durmasýný istiyor musunuz?"
 
 # libnautilus-extensions/nautilus-icon-dnd.c:733
-#: libnautilus-extensions/nautilus-icon-dnd.c:754
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
 msgid ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
@@ -6926,78 +7001,59 @@ msgstr ""
 "býraktýðýnýz yerde durmasýný istiyor musunuz?"
 
 # libnautilus-extensions/nautilus-icon-dnd.c:738
-#: libnautilus-extensions/nautilus-icon-dnd.c:759
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "Elle Düzenlemeye Geçeyim Mi?"
 
 # libnautilus-extensions/nautilus-icon-dnd.c:739
-#: libnautilus-extensions/nautilus-icon-dnd.c:760
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "Geç"
 
 # libnautilus-extensions/nautilus-icon-text-item.c:1546
 # src/file-manager/nautilus-icon-view-ui.xml.h:14
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "Yeniden adlandýr"
 
 # libnautilus-extensions/nautilus-icon-text-item.c:1547
-#: libnautilus-extensions/nautilus-icon-text-item.c:1551
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr "Yazdýrmayý Geri Al"
 
 # libnautilus-extensions/nautilus-icon-text-item.c:1548
-#: libnautilus-extensions/nautilus-icon-text-item.c:1552
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "Eski adýna geri dön"
 
 # libnautilus-extensions/nautilus-icon-text-item.c:1549
-#: libnautilus-extensions/nautilus-icon-text-item.c:1553
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "Yazýrmayý Ýleri Al"
 
 # libnautilus-extensions/nautilus-icon-text-item.c:1550
-#: libnautilus-extensions/nautilus-icon-text-item.c:1554
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Deðiþtirilmiþ ada geç"
 
-#: libnautilus-extensions/nautilus-password-dialog.c:306
-msgid "Remember this password"
-msgstr "Bu parolayý hatýrla"
-
-# components/text/nautilus-text-view-ui.xml.h:9
-#: libnautilus-extensions/nautilus-preferences-item.c:483
-msgid "times"
-msgstr "times"
-
-# components/text/nautilus-text-view-ui.xml.h:6
-#: libnautilus-extensions/nautilus-preferences-item.c:484
-msgid "courier"
-msgstr "courier"
-
-# components/text/nautilus-text-view-ui.xml.h:1
-#: libnautilus-extensions/nautilus-preferences-item.c:485
-msgid "lucida"
-msgstr "lucida"
-
 # libnautilus-extensions/nautilus-preferences.c:76
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "Baþlangýç"
 
 # libnautilus-extensions/nautilus-preferences.c:77
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "Normal"
 
 # libnautilus-extensions/nautilus-preferences.c:78
-#: libnautilus-extensions/nautilus-preferences.c:79
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "Uzman"
 
 # libnautilus-extensions/nautilus-preferences-dialog.c:207
-#: libnautilus-extensions/nautilus-preferences-dialog.c:202
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "Ayarlar Kutusu"
 
@@ -7120,7 +7176,7 @@ msgstr "Tüm \"%s\" için menülerde bulunmasýn"
 # src/file-manager/fm-search-list-view.c:334
 # src/nautilus-bookmarks-window.c:164 src/nautilus-search-bar-criterion.c:67
 #: libnautilus-extensions/nautilus-program-chooser.c:1209
-#: src/file-manager/fm-list-view.c:2123
+#: src/file-manager/fm-list-view.c:2182
 #: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
@@ -7529,30 +7585,6 @@ msgstr "Ýçinde \"elma\" geçen ve 2000 bayttan küçük olan normal dosyalar"
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Ýçinde \"medusa\" geçen dizinler"
 
-# libnautilus-extensions/nautilus-stock-dialogs.c:508
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr "Ayrýntýlar"
-
-# libnautilus-extensions/nautilus-stock-dialogs.c:456
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr "Uyarý"
-
-# libnautilus-extensions/nautilus-stock-dialogs.c:466
-# libnautilus-extensions/nautilus-stock-dialogs.c:506
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr "Hata"
-
-# libnautilus-extensions/nautilus-stock-dialogs.c:538
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr "Soru"
-
 # libnautilus-extensions/nautilus-trash-directory.c:73
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
@@ -7563,7 +7595,7 @@ msgstr "Diskler Taranýyor"
 msgid "Nautilus is searching your disks for trash folders."
 msgstr "Nautilus diskinizdeki çöp kutularýný araþtýrýyor"
 
-#: libnautilus-extensions/nautilus-trash-file.c:600
+#: libnautilus-extensions/nautilus-trash-file.c:725
 msgid "on the desktop"
 msgstr "masaüstünde"
 
@@ -7605,55 +7637,51 @@ msgstr "%s olarak göster"
 msgid "%s Viewer"
 msgstr "%s Ýzleyici"
 
+# libnautilus-extensions/nautilus-file.c:3629
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+msgid "Unknown"
+msgstr "Bilinmiyor"
+
 # libnautilus-extensions/nautilus-volume-monitor.c:1328
 #. Populate table with items we know localized names for.
-#: libnautilus-extensions/nautilus-volume-monitor.c:623
-#: libnautilus-extensions/nautilus-volume-monitor.c:1862
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr "Disket"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:624
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:625
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
 msgid "Zip Drive"
 msgstr "Zip Sürücü"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:398
 # libnautilus-extensions/nautilus-volume-monitor.c:420
-#: libnautilus-extensions/nautilus-volume-monitor.c:646
-#: libnautilus-extensions/nautilus-volume-monitor.c:668
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 msgid "Audio CD"
 msgstr "Ses CD'si"
 
-# libnautilus-extensions/nautilus-volume-monitor.c:1121
-#: libnautilus-extensions/nautilus-volume-monitor.c:1547
-msgid "Mount Error"
-msgstr "Baðlama Hatasý"
-
-# libnautilus-extensions/nautilus-volume-monitor.c:1123
-#: libnautilus-extensions/nautilus-volume-monitor.c:1549
-msgid "Unmount Error"
-msgstr "Ayýrma Hatasý"
-
 # libnautilus-extensions/nautilus-volume-monitor.c:1150
-#: libnautilus-extensions/nautilus-volume-monitor.c:1579
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr "yazma korumalý, salt-oku olarak baðlanýyor"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1153
-#: libnautilus-extensions/nautilus-volume-monitor.c:1582
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "geçerli bir blok aygýt deðildir"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1583
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr "Disket/CD bulunamadý"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1157
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1587
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
@@ -7661,19 +7689,19 @@ msgstr "Nautilus disketi baðlayamýyor. Sürücüde disket bulunmayabilir"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1161
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1591
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
 msgstr "Nautilus aygýtý baðlayamýyor. Lütfen yeniden kontrol edin."
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1164
-#: libnautilus-extensions/nautilus-volume-monitor.c:1594
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr "hatalý dosya sistemi, hatalý seçenek ya da hatalý blok içeren bölüm: "
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1167
-#: libnautilus-extensions/nautilus-volume-monitor.c:1597
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
@@ -7682,65 +7710,75 @@ msgstr ""
 "bir biçimde olabilir."
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1170
-#: libnautilus-extensions/nautilus-volume-monitor.c:1600
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
 msgstr "Nautilus seçilen aygýtý baðlayamýyor. Lütfen yeniden deneyiniz."
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1175
-#: libnautilus-extensions/nautilus-volume-monitor.c:1605
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr "Nautilus seçilen disket sürücüyü baðlayamadý"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1177
-#: libnautilus-extensions/nautilus-volume-monitor.c:1607
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "Nautilus seçilen aygýtý baðlayamadý."
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1181
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1612
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr "Nautilus seçilen aygýtý ayýramadý."
 
+# libnautilus-extensions/nautilus-volume-monitor.c:1121
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr "Baðlama Hatasý"
+
+# libnautilus-extensions/nautilus-volume-monitor.c:1123
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr "Ayýrma Hatasý"
+
 # libnautilus-extensions/nautilus-volume-monitor.c:1267
-#: libnautilus-extensions/nautilus-volume-monitor.c:1764
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "ISO 9660 Formatý"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1280
-#: libnautilus-extensions/nautilus-volume-monitor.c:1779
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "Root"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1286
-#: libnautilus-extensions/nautilus-volume-monitor.c:1786
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "Ext2 Formatý"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1300
-#: libnautilus-extensions/nautilus-volume-monitor.c:1801
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "MSDOS Formatý"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1314
-#: libnautilus-extensions/nautilus-volume-monitor.c:1816
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "NFS Formatý"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1314
-#: libnautilus-extensions/nautilus-volume-monitor.c:1831
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
 msgid "ReiserFS Volume"
 msgstr "ReiserFS Formatý"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1314
-#: libnautilus-extensions/nautilus-volume-monitor.c:1847
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
 msgid "UFS Volume"
 msgstr "UFS Formatý"
 
 # libnautilus-extensions/nautilus-volume-monitor.c:1342
-#: libnautilus-extensions/nautilus-volume-monitor.c:1877
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "Bilinmeyen Biçim"
 
@@ -7749,38 +7787,79 @@ msgstr "Bilinmeyen Biçim"
 msgid "C_lear Text"
 msgstr "Metni _Temizle"
 
+# libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:6
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "Metni _Temizle"
+
+# libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:74
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "Metni K_opyala"
+
 # libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:15
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "Seçili metni panoya kopyala"
 
+# src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "Metni _Kes"
+
+# src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+msgid "Cut _Text"
+msgstr "Metni _Kes"
+
 # libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:17
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "Seçili metni panoya kes"
 
+# libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:87
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "Metni _Yapýþtýr"
+
 # libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:42
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:46
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "Panoda seçilen metni yapýþtýr"
 
 # libnautilus/nautilus-clipboard-ui.xml.h:5
-#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "Seçili metni panoya yerleþtirmeden sil"
 
+# src/nautilus-shell-ui.xml.h:92
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "_Hepsini Seç"
+
+# src/nautilus-shell-ui.xml.h:92
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+msgid "Select _All"
+msgstr "_Hepsini Seç"
+
+# src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "Bu penceredeki tüm öðeleri seç"
+
 # libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:74
-#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:80
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "Metni K_opyala"
 
-# libnautilus/nautilus-clipboard-ui.xml.h:7
-#: libnautilus/nautilus-clipboard-ui.xml.h:7
-msgid "_Cut Text"
-msgstr "Metni _Kes"
-
 # libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:87
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:93
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "Metni _Yapýþtýr"
 
@@ -7791,7 +7870,7 @@ msgstr "Metni _Yapýþtýr"
 #. * to change it when we upgrade to GTK 2.0.
 #.
 #: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
-#: src/nautilus-window-menus.c:569
+#: src/nautilus-window-menus.c:610
 msgid "Nautilus"
 msgstr "Nautilus"
 
@@ -7809,95 +7888,131 @@ msgstr "Nautilus Dosya Yöneticisi Grafiksel Kabuðu"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:735
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr "%.0s Baþlangýç"
 
 # src/file-manager/fm-desktop-icon-view.c:1091
-#: src/file-manager/fm-desktop-icon-view.c:1021
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "Çöp Kutusunu Boþalt..."
 
 # src/file-manager/fm-desktop-icon-view.c:1093
 # src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
 # src/file-manager/nautilus-directory-view-ui.xml.h:11
-#: src/file-manager/fm-desktop-icon-view.c:1023
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "Çöpü Boþalt"
 
 # src/file-manager/fm-desktop-icon-view.c:1113
-#: src/file-manager/fm-desktop-icon-view.c:1043
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "Diski Ayýr"
 
 # src/file-manager/fm-directory-view.c:455
-#: src/file-manager/fm-directory-view.c:474
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr "Bu iþlem %d pencere açacaktýr. Gerçekten yapmak istiyor musunuz?"
 
 # src/file-manager/fm-directory-view.c:457
-#: src/file-manager/fm-directory-view.c:476
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d Yeni Pencere Açýlsýn mý?"
 
+# src/file-manager/fm-directory-view.c:2639
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr ""
+"\"%s\" dosyasýný çöp kutusundan tamamen silmek istediðinize emin misiniz?"
+
+# src/file-manager/fm-directory-view.c:2643
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr "Seçili %d dosyayý çöp kutusundan tamamen silmek istiyor musunuz?"
+
+# src/file-manager/fm-directory-view.c:2609
+# src/file-manager/fm-directory-view.c:2650
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "Sil"
+
+# src/file-manager/fm-directory-view.c:2609
+# src/file-manager/fm-directory-view.c:2650
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "Sil"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+msgid "scripts"
+msgstr ""
+
 # src/file-manager/fm-directory-view.c:1211
-#: src/file-manager/fm-directory-view.c:1212
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" seçili"
 
 # src/file-manager/fm-directory-view.c:1213
-#: src/file-manager/fm-directory-view.c:1214
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "1 dizin seçildi"
 
 # src/file-manager/fm-directory-view.c:1216
-#: src/file-manager/fm-directory-view.c:1217
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "%d dizin seçildi"
 
 # src/file-manager/fm-directory-view.c:1222
-#: src/file-manager/fm-directory-view.c:1223
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr " (0 öðe içeriyor)"
 
 # src/file-manager/fm-directory-view.c:1224
-#: src/file-manager/fm-directory-view.c:1225
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr " (1 öðe içeriyor)"
 
 # src/file-manager/fm-directory-view.c:1226
-#: src/file-manager/fm-directory-view.c:1227
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr " (%d öðe içeriyor)"
 
 # src/file-manager/fm-directory-view.c:1237
-#: src/file-manager/fm-directory-view.c:1238
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" seçili (%s)"
 
 # src/file-manager/fm-directory-view.c:1241
-#: src/file-manager/fm-directory-view.c:1242
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d öðe seçili (%s)"
 
 # src/file-manager/fm-directory-view.c:1248
-#: src/file-manager/fm-directory-view.c:1249
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 baþka öðe seçili (%s)"
 
 # src/file-manager/fm-directory-view.c:1251
-#: src/file-manager/fm-directory-view.c:1252
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d baþka öðe seçili (%s)"
@@ -7910,7 +8025,7 @@ msgstr "%d baþka öðe seçili (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1281
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -7920,7 +8035,7 @@ msgstr "%s%s, %s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1407
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
@@ -7930,19 +8045,19 @@ msgstr ""
 "Bazý dosyalar gösterilmeyecektir."
 
 # src/file-manager/fm-directory-view.c:1410
-#: src/file-manager/fm-directory-view.c:1414
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "Çok Fazla Dosya"
 
 # src/file-manager/fm-directory-view.c:2591
-#: src/file-manager/fm-directory-view.c:2623
+#: src/file-manager/fm-directory-view.c:2752
 #, c-format
 msgid ""
 "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
 msgstr "\"%s\" çöpe gönderilemiyor. Bunu hemen silmek istiyor musunuz?"
 
 # src/file-manager/fm-directory-view.c:2596
-#: src/file-manager/fm-directory-view.c:2628
+#: src/file-manager/fm-directory-view.c:2757
 #, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
@@ -7951,7 +8066,7 @@ msgstr ""
 "Seçili %d dosya çöpe gönderilemiyor. Bunlarý hemen silmek ister misiniz?"
 
 # src/file-manager/fm-directory-view.c:2600
-#: src/file-manager/fm-directory-view.c:2632
+#: src/file-manager/fm-directory-view.c:2761
 #, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -7961,26 +8076,19 @@ msgstr ""
 "ister misiniz?"
 
 # src/file-manager/fm-directory-view.c:2608
-#: src/file-manager/fm-directory-view.c:2640
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "Hemen Sil?"
 
-# src/file-manager/fm-directory-view.c:2609
-# src/file-manager/fm-directory-view.c:2650
-#: src/file-manager/fm-directory-view.c:2641
-#: src/file-manager/fm-directory-view.c:2682
-msgid "Delete"
-msgstr "Sil"
-
 # src/file-manager/fm-directory-view.c:2639
-#: src/file-manager/fm-directory-view.c:2671
+#: src/file-manager/fm-directory-view.c:2799
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr ""
 "\"%s\" dosyasýný çöp kutusundan tamamen silmek istediðinize emin misiniz?"
 
 # src/file-manager/fm-directory-view.c:2643
-#: src/file-manager/fm-directory-view.c:2675
+#: src/file-manager/fm-directory-view.c:2803
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
@@ -7988,95 +8096,253 @@ msgid ""
 msgstr "Seçili %d dosyayý çöp kutusundan tamamen silmek istiyor musunuz?"
 
 # src/file-manager/fm-directory-view.c:2649
-#: src/file-manager/fm-directory-view.c:2681
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "Çöpten Silinsin mi?"
 
 # src/file-manager/fm-directory-view.c:2922
 # src/file-manager/fm-directory-view.c:2963
-#: src/file-manager/fm-directory-view.c:2978
-#: src/file-manager/fm-directory-view.c:3018
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Seçili dosyayý açmak için \"%s\" kullan"
 
+# src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "Baþka _Uygulama..."
+
+# src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "Baþka _Uygulama..."
+
+# src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "Baþka Ý_zleyici..."
+
+# src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "Baþka Ý_zleyici..."
+
+# src/file-manager/fm-directory-view.c:2922
+# src/file-manager/fm-directory-view.c:2963
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "Seçili dosyayý açmak için \"%s\" kullan"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+# libnautilus-extensions/nautilus-volume-monitor.c:1177
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "Nautilus seçilen aygýtý baðlayamadý."
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+# src/file-manager/fm-directory-view.c:2596
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"Seçili %d dosya çöpe gönderilemiyor. Bunlarý hemen silmek ister misiniz?"
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
 # src/file-manager/nautilus-directory-view-ui.xml.h:20
-#: src/file-manager/fm-directory-view.c:3220
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "_Yeni Pencerede Aç"
+
+# src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open _in New Window"
 msgstr "_Yeni Pencerede Aç"
 
 # src/file-manager/fm-directory-view.c:3150
-#: src/file-manager/fm-directory-view.c:3222
+#: src/file-manager/fm-directory-view.c:3959
 #, c-format
 msgid "Open _in %d New Windows"
 msgstr "%d Yeni _Pencerede Aç"
 
-# src/file-manager/fm-directory-view.c:3176
-#: src/file-manager/fm-directory-view.c:3248
-msgid "Delete all selected items permanently"
-msgstr "Seçili öðeleri tamamen sil"
-
 # src/file-manager/fm-directory-view.c:3181
-#: src/file-manager/fm-directory-view.c:3253
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "Çöp Kutusundan _Sil..."
 
 # src/file-manager/fm-directory-view.c:3182
-#: src/file-manager/fm-directory-view.c:3254
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "Çöp Kutusundan _Sil"
 
-# src/file-manager/fm-directory-view.c:3186
-#: src/file-manager/fm-directory-view.c:3258
-msgid "Move all selected items to the Trash"
-msgstr "Tüm seçili öðeleri çöp kutusuna taþý"
+# src/file-manager/fm-directory-view.c:3176
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "Seçili öðeleri tamamen sil"
 
 # src/file-manager/fm-directory-view.c:3190
 # src/file-manager/nautilus-directory-view-ui.xml.h:14
-#: src/file-manager/fm-directory-view.c:3262
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "Çöp _Kutusuna Taþý"
 
+# src/file-manager/fm-directory-view.c:3186
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "Tüm seçili öðeleri çöp kutusuna taþý"
+
+# src/file-manager/fm-directory-view.c:2609
+# src/file-manager/fm-directory-view.c:2650
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "Sil"
+
+# src/file-manager/fm-directory-view.c:2609
+# src/file-manager/fm-directory-view.c:2650
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "Sil"
+
 # src/file-manager/fm-directory-view.c:3219
-#: src/file-manager/fm-directory-view.c:3292
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "_Baðlantýlarý Yarat"
 
 # src/file-manager/fm-directory-view.c:3220
 # src/file-manager/nautilus-directory-view-ui.xml.h:5
-#: src/file-manager/fm-directory-view.c:3293
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "_Baðlantý Yarat"
 
 # src/file-manager/fm-directory-view.c:3238
-#: src/file-manager/fm-directory-view.c:3311
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "Çöp _Kutusunu Boþalt..."
 
 # src/file-manager/fm-directory-view.c:3239
 # src/file-manager/nautilus-directory-view-ui.xml.h:39
-#: src/file-manager/fm-directory-view.c:3312
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "Çöp _Kutusunu Boþalt"
 
 # src/file-manager/fm-directory-view.c:3250
 # src/file-manager/nautilus-directory-view-ui.xml.h:26
-#: src/file-manager/fm-directory-view.c:3323
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "Özel _Resimleri Sil"
 
 # src/file-manager/fm-directory-view.c:3251
-#: src/file-manager/fm-directory-view.c:3324
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "Özel _Resmi Sil"
 
+# components/loser/content/nautilus-content-loser-ui.xml.h:3
+# components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
+# components/mozilla/nautilus-mozilla-ui.xml.h:4
+# components/sample/nautilus-sample-content-view-ui.xml.h:4
+# src/nautilus-shell-ui.xml.h:78
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "_Dosya"
+
+# libnautilus-extensions/nautilus-file.c:3304
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "%u dosya"
+
+# libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:74
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "Metni K_opyala"
+
+# libnautilus-extensions/nautilus-file-operations.c:1782
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "Dosyalar kopyalanýyor"
+
 # src/file-manager/fm-directory-view.c:3390
-#: src/file-manager/fm-directory-view.c:3477
+#: src/file-manager/fm-directory-view.c:4252
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
 "link in the Trash?"
@@ -8085,7 +8351,7 @@ msgstr ""
 "ister misiniz?"
 
 # src/file-manager/fm-directory-view.c:3393
-#: src/file-manager/fm-directory-view.c:3480
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
@@ -8095,16 +8361,16 @@ msgstr ""
 "göndermek ister misiniz?"
 
 # src/file-manager/fm-directory-view.c:3399
-#: src/file-manager/fm-directory-view.c:3486
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "Kýrýk Baðlantý"
 
 # src/file-manager/fm-directory-view.c:3400
-#: src/file-manager/fm-directory-view.c:3487
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr "Sil"
 
-#: src/file-manager/fm-directory-view.c:3540
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
@@ -8114,21 +8380,21 @@ msgstr ""
 "içindekileri görmek mi istiyorsunuz?"
 
 # libnautilus-extensions/nautilus-global-preferences.c:488
-#: src/file-manager/fm-directory-view.c:3546
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr "Çalýþtýr / Göster?"
 
-#: src/file-manager/fm-directory-view.c:3547
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "Çalýþtýr"
 
 # libnautilus-extensions/nautilus-global-preferences.c:488
-#: src/file-manager/fm-directory-view.c:3548
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "Göster"
 
 # src/file-manager/fm-directory-view.c:3456
-#: src/file-manager/fm-directory-view.c:3602
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
@@ -8137,18 +8403,18 @@ msgstr ""
 "çalýþtýramazsýnýz."
 
 # src/file-manager/fm-directory-view.c:3457
-#: src/file-manager/fm-directory-view.c:3604
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "Uzaktaki baðlantýlar çalýþtýrýlamaz"
 
 # src/file-manager/fm-directory-view.c:3577
-#: src/file-manager/fm-directory-view.c:3738
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr "\"%s\" açýlýyor"
 
 # src/file-manager/fm-directory-view.c:3583
-#: src/file-manager/fm-directory-view.c:3744
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "Açma Ýþlemi Ýptal Edilsin mi?"
 
@@ -8160,26 +8426,31 @@ msgid ""
 msgstr ""
 "\"%s\" içeriðine bakmak için gerekli eriþim haklarýna sahip deðilsiniz."
 
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
 # src/file-manager/fm-error-reporting.c:154
-#: src/file-manager/fm-error-reporting.c:65
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "\"%s\" dosyasýnýn içeriði gösterilemiyor."
 
 # libnautilus-extensions/nautilus-file-operations.c:1917
-#: src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Dizin Gösterilmesinde Hata"
 
 # src/file-manager/fm-error-reporting.c:55
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "\"%s\" adý bu dizinde kullanýlýyor. Lütfen baþka bir isim giriniz."
 
 # src/file-manager/fm-error-reporting.c:60
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
@@ -8187,7 +8458,7 @@ msgstr ""
 "Bu dizinde \"%s\" bulunamadý. Silinmiþ, ya da yerdeðiþtirilmiþ olabilir mi?"
 
 # src/file-manager/fm-error-reporting.c:65
-#: src/file-manager/fm-error-reporting.c:109
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr ""
@@ -8195,7 +8466,7 @@ msgstr ""
 "deðilsiniz."
 
 # src/file-manager/fm-error-reporting.c:70
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -8205,30 +8476,30 @@ msgstr ""
 "ismini kullanýn."
 
 # src/file-manager/fm-error-reporting.c:74
-#: src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "\"%s\" geçerli bir ad deðil. Lütfen baþka bir dosya ismini kullanýn."
 
 # src/file-manager/fm-error-reporting.c:80
-#: src/file-manager/fm-error-reporting.c:124
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "\"%s\" deðiþtirilemez, çünkü bu öðe salt-oku bir disk üzerindedir."
 
 # src/file-manager/fm-error-reporting.c:87
-#: src/file-manager/fm-error-reporting.c:133
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "\"%s\" ismi \"%s\"e deðiþtirilemedi."
 
 # src/file-manager/fm-error-reporting.c:93
-#: src/file-manager/fm-error-reporting.c:140
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "Yeniden Adlandýrma Hatasý"
 
 # src/file-manager/fm-error-reporting.c:112
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
@@ -8237,13 +8508,13 @@ msgstr ""
 "deðilsiniz."
 
 # src/file-manager/fm-error-reporting.c:116
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr "\"%s\" öðesinin grubu deðiþtirilemez, çünkü salt-oku disk üzerinde."
 
 # src/file-manager/fm-error-reporting.c:123
-#: src/file-manager/fm-error-reporting.c:172
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr ""
@@ -8251,12 +8522,12 @@ msgstr ""
 "yeralýyor."
 
 # src/file-manager/fm-error-reporting.c:127
-#: src/file-manager/fm-error-reporting.c:176
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "Grup Bilgisi Deðiþtirilirken Hata"
 
 # src/file-manager/fm-error-reporting.c:148
-#: src/file-manager/fm-error-reporting.c:198
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
@@ -8264,18 +8535,18 @@ msgstr ""
 "yeralýyor."
 
 # src/file-manager/fm-error-reporting.c:154
-#: src/file-manager/fm-error-reporting.c:205
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "\"%s\" dosyasýnýn sahibi deðiþtirilemedi."
 
 # src/file-manager/fm-error-reporting.c:157
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "Sahibi Deðiþtirilirken Hata"
 
 # src/file-manager/fm-error-reporting.c:178
-#: src/file-manager/fm-error-reporting.c:230
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
@@ -8284,24 +8555,24 @@ msgstr ""
 "üzerinde yeralýyor."
 
 # src/file-manager/fm-error-reporting.c:184
-#: src/file-manager/fm-error-reporting.c:237
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "\"%s\"nin eriþim haklarý deðiþtirilemedi."
 
 # src/file-manager/fm-error-reporting.c:187
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "Eriþim Haklarý Düzenlenirken Hata"
 
 # src/file-manager/fm-error-reporting.c:253
-#: src/file-manager/fm-error-reporting.c:306
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "%s'nin adý %s'ye deðiþtiriliyor."
 
 # src/file-manager/fm-error-reporting.c:258
-#: src/file-manager/fm-error-reporting.c:311
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "Yeniden adlandýrmayý iptal edeyim mi ?"
 
@@ -8376,83 +8647,83 @@ msgstr ""
 
 # src/file-manager/fm-icon-view.c:156
 # src/file-manager/nautilus-icon-view-ui.xml.h:38
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "Ý_sme göre"
 
 # src/file-manager/fm-icon-view.c:157
 # src/file-manager/nautilus-icon-view-ui.xml.h:7
-#: src/file-manager/fm-icon-view.c:159
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "Simgeleri isimlerine göre sýrala"
 
 # src/file-manager/fm-icon-view.c:163
 # src/file-manager/nautilus-icon-view-ui.xml.h:39
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "_Büyüklüðe göre"
 
 # src/file-manager/fm-icon-view.c:164
 # src/file-manager/nautilus-icon-view-ui.xml.h:8
-#: src/file-manager/fm-icon-view.c:166
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "Simgeleri büyüklüklerine göre sýrala"
 
 # src/file-manager/fm-icon-view.c:170
 # src/file-manager/nautilus-icon-view-ui.xml.h:40
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "_Türe göre"
 
 # src/file-manager/fm-icon-view.c:171
 # src/file-manager/nautilus-icon-view-ui.xml.h:9
-#: src/file-manager/fm-icon-view.c:173
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "Simgeleri tiplerine göre sýrala"
 
 # src/file-manager/fm-icon-view.c:177
 # src/file-manager/nautilus-icon-view-ui.xml.h:33
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "_Deðiþim tarihine göre"
 
 # src/file-manager/fm-icon-view.c:178
 # src/file-manager/nautilus-icon-view-ui.xml.h:6
-#: src/file-manager/fm-icon-view.c:180
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Simgeleri deðiþim tarihlerine göre sýrala"
 
 # src/file-manager/fm-icon-view.c:184
 # src/file-manager/nautilus-icon-view-ui.xml.h:37
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "_Logolara Göre"
 
 # src/file-manager/fm-icon-view.c:185
 # src/file-manager/nautilus-icon-view-ui.xml.h:5
-#: src/file-manager/fm-icon-view.c:187
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Simgeleri logolara göre sýrala"
 
 # src/file-manager/fm-icon-view.c:1241
 # src/file-manager/nautilus-icon-view-ui.xml.h:27
-#: src/file-manager/fm-icon-view.c:1230
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "_Simgeleri Asýl Boyutlarýna Getir"
 
 # src/file-manager/fm-icon-view.c:1242
-#: src/file-manager/fm-icon-view.c:1231
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "_Simgeleri Asýl Boyutlarýna Getir"
 
 # src/file-manager/fm-icon-view.c:1457
-#: src/file-manager/fm-icon-view.c:1443
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "\"%s\" gösteriliyor"
@@ -8460,7 +8731,7 @@ msgstr "\"%s\" gösteriliyor"
 # src/file-manager/fm-list-view.c:1924
 # src/file-manager/fm-search-list-view.c:346
 # src/nautilus-search-bar-criterion.c:73
-#: src/file-manager/fm-list-view.c:2129
+#: src/file-manager/fm-list-view.c:2188
 #: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "Boyut"
@@ -8468,14 +8739,14 @@ msgstr "Boyut"
 # src/file-manager/fm-list-view.c:1930
 # src/file-manager/fm-search-list-view.c:352
 # src/nautilus-search-bar-criterion.c:71
-#: src/file-manager/fm-list-view.c:2135
+#: src/file-manager/fm-list-view.c:2194
 #: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "Tip"
 
 # src/file-manager/fm-list-view.c:1936
 # src/file-manager/fm-search-list-view.c:358
-#: src/file-manager/fm-list-view.c:2141
+#: src/file-manager/fm-list-view.c:2200
 #: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "Deðiþim tarihi"
@@ -8544,148 +8815,155 @@ msgid "Contents:"
 msgstr "Ýçerik:"
 
 # src/file-manager/fm-properties-window.c:1200
-#: src/file-manager/fm-properties-window.c:1433
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "Temel"
 
 # src/file-manager/fm-properties-window.c:1273
-#: src/file-manager/fm-properties-window.c:1512
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "Tür:"
 
 # src/file-manager/fm-properties-window.c:1278
-#: src/file-manager/fm-properties-window.c:1517
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "Büyüklük:"
 
+# src/nautilus-link-set-window.c:191
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "Baðlantý kümeleri"
+
 # src/file-manager/fm-properties-window.c:1282
-#: src/file-manager/fm-properties-window.c:1521
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
 msgstr "MIME türü:"
 
 # src/file-manager/fm-properties-window.c:1288
-#: src/file-manager/fm-properties-window.c:1527
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "Deðiþim:"
 
 # src/file-manager/fm-properties-window.c:1289
-#: src/file-manager/fm-properties-window.c:1530
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "Eriþim:"
 
 # src/file-manager/fm-properties-window.c:1297
-#: src/file-manager/fm-properties-window.c:1539
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr "Özel Simge Seç..."
 
 # src/file-manager/fm-properties-window.c:1303
-#: src/file-manager/fm-properties-window.c:1545
+#: src/file-manager/fm-properties-window.c:1558
 msgid "Remove Custom Icon"
 msgstr "Özel Simgeyi Sil"
 
 # src/file-manager/fm-properties-window.c:1636
-#: src/file-manager/fm-properties-window.c:1873
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "Kullanýcý Numarasýný Belirt"
 
 # src/file-manager/fm-properties-window.c:1637
-#: src/file-manager/fm-properties-window.c:1878
+#: src/file-manager/fm-properties-window.c:1891
 msgid "Special Flags:"
 msgstr "Özel Bayraklar:"
 
 # src/file-manager/fm-properties-window.c:1639
-#: src/file-manager/fm-properties-window.c:1881
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "Grup Numarasýný Belirt"
 
 # src/file-manager/fm-properties-window.c:1640
-#: src/file-manager/fm-properties-window.c:1883
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "Yapýþýk"
 
 # src/file-manager/fm-properties-window.c:1658
-#: src/file-manager/fm-properties-window.c:1909
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Eriþim haklarý"
 
 # src/file-manager/fm-properties-window.c:1664
-#: src/file-manager/fm-properties-window.c:1915
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Dosyanýn sahibi olmadýðýnýz için bu ayarlarý deðiþtiremezsiniz."
 
 # src/file-manager/fm-properties-window.c:1677
-#: src/file-manager/fm-properties-window.c:1928
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "Dosya Sahibi:"
 
 # src/file-manager/fm-properties-window.c:1686
-#: src/file-manager/fm-properties-window.c:1937
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "Dosya Grubu:"
 
 # src/file-manager/fm-properties-window.c:1704
-#: src/file-manager/fm-properties-window.c:1955
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "Sahibi:"
 
 # src/file-manager/fm-properties-window.c:1705
-#: src/file-manager/fm-properties-window.c:1956
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "Grubu:"
 
 # src/file-manager/fm-properties-window.c:1706
-#: src/file-manager/fm-properties-window.c:1957
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "Diðerleri:"
 
 # src/file-manager/fm-properties-window.c:1725
-#: src/file-manager/fm-properties-window.c:1976
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "Okuma"
 
 # src/file-manager/fm-properties-window.c:1729
-#: src/file-manager/fm-properties-window.c:1980
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "Yazma"
 
 # src/file-manager/fm-properties-window.c:1733
-#: src/file-manager/fm-properties-window.c:1984
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "Çalýþtýrma"
 
 # src/file-manager/fm-properties-window.c:1790
-#: src/file-manager/fm-properties-window.c:2035
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "Metin Görünüm:"
 
 # src/file-manager/fm-properties-window.c:1791
-#: src/file-manager/fm-properties-window.c:2036
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "Sayýsal Görünüm:"
 
 # src/file-manager/fm-properties-window.c:1792
-#: src/file-manager/fm-properties-window.c:2037
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "Son Deðiþim:"
 
 # src/file-manager/fm-properties-window.c:1796
-#: src/file-manager/fm-properties-window.c:2041
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "\"%s\"nin eriþim haklarý belirlenemedi."
 
 # src/file-manager/fm-properties-window.c:2043
-#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr "Özellikler Penceresi Kapatýlsýn Mý?"
 
 # src/file-manager/fm-properties-window.c:2044
-#: src/file-manager/fm-properties-window.c:2322
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr "Özellikler Penceresi Oluþturuluyor"
 
 # src/nautilus-property-browser.c:1319
-#: src/file-manager/fm-properties-window.c:2422
+#: src/file-manager/fm-properties-window.c:2435
 msgid "Select an icon:"
 msgstr "Bir simge seçin:"
 
@@ -8713,7 +8991,7 @@ msgstr "Üzgünüm, ancak medusa arama servisi kurulmadýðý için arama yapýlamaz."
 
 # src/file-manager/nautilus-indexing-info.c:255
 #: src/file-manager/fm-search-list-view.c:159
-#: src/file-manager/nautilus-indexing-info.c:405
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr "Arama Servisi Kullanýlamaz"
 
@@ -8902,7 +9180,7 @@ msgstr ""
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
 #: src/file-manager/fm-search-list-view.c:360
-#: src/file-manager/nautilus-indexing-info.c:340
+#: src/file-manager/nautilus-indexing-info.c:342
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
@@ -8918,7 +9196,7 @@ msgid "Fast searches are not available on your computer"
 msgstr "Hýzlý arama servisi bu bilgisayarda kullanýlamaz"
 
 #: src/file-manager/fm-search-list-view.c:373
-#: src/file-manager/nautilus-indexing-info.c:359
+#: src/file-manager/nautilus-indexing-info.c:361
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Fast search is disabled in your Search preferences, so no index is available."
@@ -8929,13 +9207,13 @@ msgstr ""
 
 # src/file-manager/nautilus-indexing-info.c:255
 #: src/file-manager/fm-search-list-view.c:376
-#: src/file-manager/nautilus-indexing-info.c:345
-#: src/file-manager/nautilus-indexing-info.c:363
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
 msgid "Fast searches are not available on your computer."
 msgstr "Bu bilgisayarda hýzlý arama servisi kullanýlamaz."
 
 #: src/file-manager/fm-search-list-view.c:377
-#: src/file-manager/nautilus-indexing-info.c:364
+#: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
 "To enable fast search, open the Preferences menu and choose Preferences. "
 "Then select Search preferences and put a checkmark in the Enable Fast Search "
@@ -9002,7 +9280,7 @@ msgstr "Masaüstü Arkaplanýný Deðiþtir"
 # src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
 # src/file-manager/nautilus-directory-view-ui.xml.h:8
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Delete all items in the Trash"
 msgstr "Çöp kutusundaki tüm öðeleri sil"
 
@@ -9057,176 +9335,230 @@ msgstr "Seçili dosyayý açacak baþka bir uygulamayý seç"
 msgid "Choose another viewer with which to view the selected item"
 msgstr "Seçili dosyayý gösterecek baþka bir izleyici seç"
 
-# src/file-manager/nautilus-directory-view-ui.xml.h:4
+# libnautilus-extensions/nautilus-file-operations.c:1782
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-msgid "Create Link"
-msgstr "Baðlantý Yarat"
+#, fuzzy
+msgid "Copy Files"
+msgstr "Dosyalar kopyalanýyor"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:6
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "Bu dizin içinde boþ bir dizin yarat"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:7
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "Seçilen her dosya için sembolik baðlantý yarat"
 
+# libnautilus-extensions/nautilus-file.c:3304
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u dosya"
+
+# src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "Tüm seçilenleri çöp kutusuna taþý"
+
 # src/file-manager/nautilus-directory-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "Ýkizle"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:10
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "Her seçili öðeyi ikizle"
 
+# src/file-manager/nautilus-directory-view-ui.xml.h:4
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "Baðlantý Yarat"
+
 # src/file-manager/nautilus-directory-view-ui.xml.h:12
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr "Tüm seçilenleri çöp kutusuna taþý"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
 # src/file-manager/nautilus-directory-view-ui.xml.h:13
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Move to Trash"
 msgstr "Çöpe _Taþý"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:15
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "Yeni Dizin"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:17
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "Aç"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
 # src/file-manager/nautilus-directory-view-ui.xml.h:18
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid "Open Wit_h"
 msgstr "_Birlikte Aç"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:18
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "Birlikte Aç"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:19
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "Seçili her dosyayý yeni pencerede aç"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:20
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr "Yeni Pencerede Aç"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:21
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Seçili dosyayý bu pencerede aç"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:22
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "Baþka Uygulama..."
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:23
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "Baþka Görüntüleyici..."
 
-# src/file-manager/nautilus-directory-view-ui.xml.h:24
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Other _Application..."
-msgstr "Baþka _Uygulama..."
+# libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:87
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "Metni _Yapýþtýr"
 
-# src/file-manager/nautilus-directory-view-ui.xml.h:25
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-msgid "Other _Viewer..."
-msgstr "Baþka Ý_zleyici..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:27
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr "Özel Resimleri Sil"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:28
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr "Seçili simgelerden özel resimleri sil"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:29
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr "Bu konumun arkaplanýnda yeralan desen ya da renkleri kaldýr"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:30
 # src/nautilus-sidebar.c:482
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "Arkaplaný Sýfýrla"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+msgid "Scripts"
+msgstr ""
+
 # src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr "Tüm Dosyalarý Seç"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Select _All Files"
 msgstr "_Tüm Dosyalarý Seç"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:32
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "Bu penceredeki tüm öðeleri seç"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:33
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr "Özellikleri Göster"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:34
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Show Trash"
 msgstr "Çöpü Göster"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:35
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "Özellikleri _Göster"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:36
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "Show the contents of the Trash"
 msgstr "Çöp kutusunun içeriðini göster"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
 # src/file-manager/nautilus-directory-view-ui.xml.h:37
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "Seçili her öðenin özelliklerini göster ya da deðiþtir"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:38
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "Ý_kizle"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:15
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_New Folder"
 msgstr "_Yeni Dizin"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:40
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "_Aç"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+# libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:87
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "Metni _Yapýþtýr"
+
 # src/file-manager/nautilus-directory-view-ui.xml.h:34
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Show Trash"
 msgstr "Çöpü _Göster"
 
@@ -9450,7 +9782,7 @@ msgstr ""
 # src/file-manager/nautilus-search-list-view-ui.xml.h:3
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr "Ýndeksleme Durumu"
 
@@ -9471,12 +9803,12 @@ msgid "Your files were last indexed at %s"
 msgstr "Dosyalarýnýz en son %s tarihinde indekslendi"
 
 # src/file-manager/nautilus-indexing-info.c:133
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "Þimdi Güncelle"
 
 # src/file-manager/nautilus-indexing-info.c:230
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast.  Your files are currently being indexed."
@@ -9486,12 +9818,12 @@ msgstr ""
 "\"Þimdi Güncelle\" düðmesine týklayýn."
 
 # src/file-manager/nautilus-indexing-info.c:254
-#: src/file-manager/nautilus-indexing-info.c:404
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Üzgünüm, ancak medusa arama servisi kullanýlamaz."
 
 # src/file-manager/nautilus-indexing-info.c:274
-#: src/file-manager/nautilus-indexing-info.c:426
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -9688,7 +10020,7 @@ msgid "Location"
 msgstr "Adres"
 
 # src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:721
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:763
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "Sil"
 
@@ -9883,7 +10215,7 @@ msgstr "Hýzlý aramayý etkinleþtir"
 msgid "Turn fast search on when cron is enabled"
 msgstr "Cron etkin iken hýzlý aramalarý aç"
 
-#: src/nautilus-first-time-druid.c:1028
+#: src/nautilus-first-time-druid.c:1027
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "currently can't be performed because the program crond, which does\n"
@@ -9908,7 +10240,7 @@ msgstr ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: src/nautilus-first-time-druid.c:1036
+#: src/nautilus-first-time-druid.c:1035
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "may not be performed because the program crond, which does nightly tasks\n"
@@ -9933,7 +10265,7 @@ msgstr ""
 "/sbin/chkconfig --level 345 crond on\n"
 "/etc/rc.d/init.d/cron start\n"
 
-#: src/nautilus-first-time-druid.c:1123
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
 "Click Finish to launch Nautilus. You'll start with two\n"
 "Nautilus windows: one shows your home folder, and the\n"
@@ -9949,7 +10281,7 @@ msgstr ""
 "\n"
 "Nautilus'u çok seveceðinize eminiz."
 
-#: src/nautilus-first-time-druid.c:1130
+#: src/nautilus-first-time-druid.c:1129
 msgid ""
 "Click Finish to launch Nautilus. You'll start with a\n"
 "window showing your home folder.\n"
@@ -9963,16 +10295,16 @@ msgstr ""
 "Nautilus'u çok seveceðinize eminiz."
 
 # src/nautilus-first-time-druid.c:756
-#: src/nautilus-first-time-druid.c:1154
+#: src/nautilus-first-time-druid.c:1153
 msgid "Nautilus First Time Setup"
 msgstr "Nautilus Baþlangýç Ayarlarý"
 
 # src/nautilus-first-time-druid.c:786
-#: src/nautilus-first-time-druid.c:1184
+#: src/nautilus-first-time-druid.c:1183
 msgid "Welcome to Nautilus"
 msgstr "Nautilus'a Hoþgeldiniz"
 
-#: src/nautilus-first-time-druid.c:1186
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
 "Nautilus...\n"
 "    Is a great file manager for the GNOME desktop.\n"
@@ -9990,60 +10322,59 @@ msgstr ""
 "\n"
 "Nautilus'u ayarlamak için Ýleri tuþuna týklayýn."
 
-
 # src/nautilus-first-time-druid.c:807
 #. set up the final page
-#: src/nautilus-first-time-druid.c:1197
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "Tamamlandý"
 
 # src/nautilus-first-time-druid.c:820
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1210
+#: src/nautilus-first-time-druid.c:1209
 msgid "Choose Your User Level"
 msgstr "Kullanýcý Seviyenizi Seçin"
 
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1214
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr "GMC'den Nautilus'a Geçiþ"
 
 # libnautilus-extensions/nautilus-global-preferences.c:636
 #. set up the `Launch Medusa' page
-#: src/nautilus-first-time-druid.c:1218
+#: src/nautilus-first-time-druid.c:1217
 msgid "Fast Searches"
 msgstr "Hýzlý Aramalar"
 
 #. set up optional page to tell the user how to run cron
-#: src/nautilus-first-time-druid.c:1226
+#: src/nautilus-first-time-druid.c:1225
 msgid "The Cron Daemon"
 msgstr "Cron Programý"
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1231
+#: src/nautilus-first-time-druid.c:1230
 msgid "Checking Your Internet Connection"
 msgstr "Ýnternet Baðlantýsý Denetleniyor"
 
 # src/nautilus-first-time-druid.c:836
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1242
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "Nautilus Güncelleniyor..."
 
 # src/nautilus-first-time-druid.c:844
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1250
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "Vekil Sunucu Ayarlarý"
 
 # src/nautilus-first-time-druid.c:919
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1325
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "Güncelleme Kodlanýyor..."
 
 # src/nautilus-first-time-druid.c:936
-#: src/nautilus-first-time-druid.c:1342
+#: src/nautilus-first-time-druid.c:1341
 msgid "Update Complete. Click Next to Continue."
 msgstr "Güncelleme Tamamlandý. Devam Etmek Ýçin Ýleri Tuþuna Týklayýn."
 
@@ -10052,7 +10383,7 @@ msgstr "Güncelleme Tamamlandý. Devam Etmek Ýçin Ýleri Tuþuna Týklayýn."
 #. * doesn't exist. Arlo and I (jsh) and decided that the
 #. * best thing to do is silently fail
 #.
-#: src/nautilus-first-time-druid.c:1357
+#: src/nautilus-first-time-druid.c:1356
 msgid "No Update Available... Press Next to Continue."
 msgstr "Güncelleme Yapýlamýyor... Lütfen Ýleri Tuþuna Týklayýn."
 
@@ -10086,57 +10417,57 @@ msgid "View in Multiple Windows?"
 msgstr "Farklý pencerelerde görüntülensin mi?"
 
 # src/nautilus-main.c:143
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr "Nautilus'un hýzlý iç testini gerçekleþtir."
 
 # src/nautilus-main.c:146
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "Verilen boyutlarda pencere oluþtur."
 
 # src/nautilus-main.c:146
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "GEOMETRY"
 
 # src/nautilus-main.c:148
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Sadece açýk olarak belirtilen URL'ler için pencere oluþtur."
 
 # src/nautilus-main.c:150
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "Nautilus'tan çýk."
 
 # src/nautilus-main.c:152
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "Nautilus'u yeniden baþlat"
 
 # src/nautilus-main.c:205
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check URI'lerle beraber kullanýlamaz.\n"
 
 # src/nautilus-main.c:209
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check diðer seçeneklerle beraber kullanýlamaz.\n"
 
 # src/nautilus-main.c:213
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit URI'lerle beraber kullanýlamaz.\n"
 
 # src/nautilus-main.c:217
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart URI'lerle beraber kullanýlamaz.\n"
 
 # src/nautilus-main.c:221
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry bir URI'den fazla beraber kullanýlamaz.\n"
 
@@ -10717,17 +11048,20 @@ msgstr "Liste olarak göster"
 
 # src/nautilus-shell-ui.xml.h:1
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+#, fuzzy
+msgid " _Advanced"
 msgstr " Uzman"
 
 # src/nautilus-shell-ui.xml.h:2
 #: src/nautilus-shell-ui.xml.h:2
-msgid " Beginner"
+#, fuzzy
+msgid " _Beginner"
 msgstr " Baþlangýç"
 
 # src/nautilus-shell-ui.xml.h:3
 #: src/nautilus-shell-ui.xml.h:3
-msgid " Intermediate"
+#, fuzzy
+msgid " _Intermediate"
 msgstr " Normal"
 
 # src/nautilus-shell-ui.xml.h:4
@@ -10775,195 +11109,175 @@ msgstr "Tüm Nautilus pencerelerini kapat"
 msgid "Close this window"
 msgstr "Bu pencereyi kapat"
 
-# src/nautilus-shell-ui.xml.h:16
-#: src/nautilus-shell-ui.xml.h:15
-msgid "Cut _Text"
-msgstr "Metni _Kes"
-
 # src/nautilus-shell-ui.xml.h:18
-#: src/nautilus-shell-ui.xml.h:17
+#: src/nautilus-shell-ui.xml.h:15
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "Bu menüdeki yer imlerini düzenlemek için pencere göster"
 
 # src/nautilus-shell-ui.xml.h:19
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr "Nautilus'u yazanlar hakkýnda bilgi ver"
 
 # src/nautilus-shell-ui.xml.h:20
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr "Nautilus için yardým bilgilerini ver"
 
 # src/nautilus-shell-ui.xml.h:21
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
 msgstr "Görünümü deðiþtirmeye yarayan desen, renk ve logolarý gösterir."
 
 # src/nautilus-shell-ui.xml.h:23
-#: src/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:19
 msgid "Display quick reference pages for Nautilus"
 msgstr "Nautilus için hýzlý yardým sayfalarýný göster"
 
 # src/nautilus-shell-ui.xml.h:20
-#: src/nautilus-shell-ui.xml.h:22
+#: src/nautilus-shell-ui.xml.h:20
 msgid "Display release notes for Nautilus"
 msgstr "Nautilus için sürüm bilgilerini göster"
 
 # src/nautilus-service-ui.xml.h:1
-#: src/nautilus-shell-ui.xml.h:23
+#: src/nautilus-shell-ui.xml.h:21
 msgid "Display support information for Nautilus and Eazel Services"
 msgstr "Nautilus ve Eazel Servisleri destek bilgisini göster"
 
 # src/nautilus-shell-ui.xml.h:22
-#: src/nautilus-shell-ui.xml.h:24
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Display the latest contents of the current location"
 msgstr "Güncel konum için son içeriði görüntüle"
 
 # src/nautilus-shell-ui.xml.h:24
-#: src/nautilus-shell-ui.xml.h:25
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr "Kullanýlabilir görünüm temalarýný göster"
 
 # src/nautilus-shell-ui.xml.h:25
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:24
 msgid "Edit various Nautilus preferences"
 msgstr "Çeþitli Nautilus tercihlerini düzenle"
 
 # src/nautilus-shell-ui.xml.h:26
-#: src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "Bul"
 
 # src/nautilus-shell-ui.xml.h:27
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr "_Geçmiþi Unut"
 
 # src/nautilus-shell-ui.xml.h:28
-#: src/nautilus-shell-ui.xml.h:29
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr "Eazel Servislerine Git"
 
 # src/nautilus-shell-ui.xml.h:29
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr "Baþlangýç dizinine git"
 
 # src/nautilus-shell-ui.xml.h:30
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr "Bunu içeren yere git"
 
 # src/nautilus-shell-ui.xml.h:31
-#: src/nautilus-shell-ui.xml.h:32
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr "Ýlerideki yere git"
 
 # src/nautilus-shell-ui.xml.h:32
-#: src/nautilus-shell-ui.xml.h:33
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr "Önceki yere git"
 
 # src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:433
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:442
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
 msgid "Hide Location _Bar"
 msgstr "_Konum Çubuðunu Gizle"
 
 # src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:415
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:424
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
 msgid "Hide St_atus Bar"
 msgstr "_Durum Çubuðunu Gizle"
 
 # src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:421
-#: src/nautilus-shell-ui.xml.h:36 src/nautilus-window-menus.c:430
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
 msgid "Hide _Sidebar"
 msgstr "_Yan Çubuðunu Gizle"
 
 # src/nautilus-shell-ui.xml.h:36 src/nautilus-window-menus.c:427
-#: src/nautilus-shell-ui.xml.h:37 src/nautilus-window-menus.c:436
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
 msgid "Hide _Toolbar"
 msgstr "_Araç Çubuðunu Gizle"
 
 # libnautilus-extensions/nautilus-global-preferences.c:44
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:37
 msgid "Nautilus Quick _Reference"
 msgstr "_Nautilus için Hýzlý Yardým"
 
 # libnautilus-extensions/nautilus-global-preferences.c:44
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:38
 msgid "Nautilus Release _Notes"
 msgstr "Nautilus _Sürüm Notlarý"
 
 # src/nautilus-shell-ui.xml.h:84
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:39
 msgid "Nautilus User _Manual"
 msgstr "N_autilus Kullanýcý Kýlavuzu"
 
 # src/nautilus-shell-ui.xml.h:39
-#: src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "_Yeni Pencere"
 
 # src/nautilus-shell-ui.xml.h:39
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:41
 msgid "New _Window"
 msgstr "Yeni _Pencere"
 
 # src/nautilus-shell-ui.xml.h:40
-#: src/nautilus-shell-ui.xml.h:44
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "Normal Boyut"
 
 # src/nautilus-shell-ui.xml.h:41
-#: src/nautilus-shell-ui.xml.h:45
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Görüntülenen konum için baþka bir Nautilus penceresi aç"
 
-# src/nautilus-shell-ui.xml.h:43
-#: src/nautilus-shell-ui.xml.h:47
-msgid "Preferences..."
-msgstr "Tercihler..."
-
 # src/nautilus-shell-ui.xml.h:44
-#: src/nautilus-shell-ui.xml.h:48
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "Yeniden yükle"
 
-# src/nautilus-shell-ui.xml.h:45
-#: src/nautilus-shell-ui.xml.h:49
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "Seçili metni arabelleðe yerleþtirmeden siler"
-
 # src/nautilus-shell-ui.xml.h:46
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr "Profil Oluþtur"
 
 # src/nautilus-shell-ui.xml.h:47
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr "Profili Sýfýrla"
 
 # src/nautilus-shell-ui.xml.h:48
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr "Web üzerinde ara"
 
 # src/nautilus-shell-ui.xml.h:49
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr "Dosyalarý bu bilgisayarda ara"
 
-# src/nautilus-shell-ui.xml.h:92
-#: src/nautilus-shell-ui.xml.h:54
-msgid "Select _All"
-msgstr "_Hepsini Seç"
-
 # src/nautilus-shell-ui.xml.h:50
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
@@ -10972,222 +11286,237 @@ msgstr ""
 "kullanýlabilecek bir pencere göster"
 
 # src/nautilus-shell-ui.xml.h:51
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "Ýçeriði normal boyutta göster"
 
 # src/nautilus-shell-ui.xml.h:52
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "Ýçeriði az detay ile göster"
 
 # src/nautilus-shell-ui.xml.h:53
-#: src/nautilus-shell-ui.xml.h:58
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "Ýçeriði detaylý göster"
 
 # src/nautilus-shell-ui.xml.h:54
-#: src/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr "Profili Kapat"
 
 # src/nautilus-shell-ui.xml.h:56
-#: src/nautilus-shell-ui.xml.h:61
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr "Profili Baþlat"
 
 # src/nautilus-shell-ui.xml.h:57
-#: src/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr "Bu konumu yüklemeyi durdur"
 
 # src/nautilus-shell-ui.xml.h:58
-#: src/nautilus-shell-ui.xml.h:63
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "Son metin deðiþikliðini geri al"
 
 # src/nautilus-shell-ui.xml.h:59
-#: src/nautilus-shell-ui.xml.h:64
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "Yukarý"
 
-# src/nautilus-shell-ui.xml.h:60
-#: src/nautilus-shell-ui.xml.h:65
-msgid "Use Advanced settings"
-msgstr "Uzman kullanýcý ayarlarý"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-# src/nautilus-shell-ui.xml.h:61
-#: src/nautilus-shell-ui.xml.h:66
-msgid "Use Beginner settings"
-msgstr "Baþlangýç kullanýcý ayarlarý"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
-# src/nautilus-shell-ui.xml.h:62
-#: src/nautilus-shell-ui.xml.h:67
-msgid "Use Intermediate settings"
-msgstr "Normal kullanýcý ayarlarý"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
 # src/nautilus-shell-ui.xml.h:63
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:63
 msgid "We_b Search"
 msgstr "Web'de _Ara"
 
 # src/nautilus-shell-ui.xml.h:63
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "Web'de Ara"
 
 # src/nautilus-shell-ui.xml.h:64
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "Yakýnlaþ"
 
 # src/nautilus-shell-ui.xml.h:65
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "Uzaklaþ"
 
 # src/nautilus-shell-ui.xml.h:66
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "_Yakýnlaþ"
 
 # src/nautilus-shell-ui.xml.h:67
-#: src/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "_Uzaklaþ"
 
 # src/nautilus-shell-ui.xml.h:68
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "_Nautilus Hakkýnda..."
 
 # src/nautilus-shell-ui.xml.h:69
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "_Yer imi ekle"
 
 # src/nautilus-shell-ui.xml.h:70
-#: src/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "_Geri"
 
 # src/nautilus-shell-ui.xml.h:71
-#: src/nautilus-shell-ui.xml.h:77
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr "_Arkaplanlar..."
 
 # src/nautilus-shell-ui.xml.h:72
-#: src/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "_Yer imleri"
 
 # src/nautilus-shell-ui.xml.h:73
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "Pencereyi _Kapat"
 
 # src/nautilus-service-ui.xml.h:10
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:76
 msgid "_Customer Support"
 msgstr "_Müþteri Destek Hattý"
 
 # src/nautilus-shell-ui.xml.h:75
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "_Deðiþtir"
 
 # src/nautilus-shell-ui.xml.h:76
-#: src/nautilus-shell-ui.xml.h:83
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "Yer imlerini _düzenle..."
 
+# src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "Tercihler..."
+
 # src/nautilus-shell-ui.xml.h:77
-#: src/nautilus-shell-ui.xml.h:84
+#: src/nautilus-shell-ui.xml.h:80
 msgid "_Feedback"
 msgstr "_Geribildirim"
 
 # src/nautilus-shell-ui.xml.h:79 src/nautilus-window-menus.c:1239
-#: src/nautilus-shell-ui.xml.h:86 src/nautilus-window-menus.c:1358
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "_Bul"
 
 # src/nautilus-shell-ui.xml.h:80
-#: src/nautilus-shell-ui.xml.h:87
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "_Ýleri"
 
 # src/nautilus-shell-ui.xml.h:81
-#: src/nautilus-shell-ui.xml.h:88
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "G_it"
 
 # src/nautilus-shell-ui.xml.h:82
-#: src/nautilus-shell-ui.xml.h:89
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "_Yardým"
 
 # src/nautilus-shell-ui.xml.h:83
-#: src/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "_Baþlangýç"
 
+# src/nautilus-bookmarks-window.c:177
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "Adres"
+
 # src/nautilus-theme-selector.c:206
-#: src/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr "N_autilus Temalarý..."
 
 # src/nautilus-shell-ui.xml.h:86
-#: src/nautilus-shell-ui.xml.h:92
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "_Mönüyü Boyut"
 
+# src/nautilus-window-menus.c:483
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "Tercihler"
+
 # src/nautilus-shell-ui.xml.h:88
-#: src/nautilus-shell-ui.xml.h:94
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr "_Profiller"
 
 # src/nautilus-shell-ui.xml.h:89
-#: src/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "_Yeniden Yükle"
 
 # src/nautilus-shell-ui.xml.h:90
-#: src/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr "Profil _Oluþtur"
 
 # src/nautilus-shell-ui.xml.h:91
-#: src/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr "Profillleri _Sýfýrla"
 
 # src/nautilus-shell-ui.xml.h:93
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr "Profile _Baþlat"
 
 # src/nautilus-shell-ui.xml.h:94
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr "Profil _Durdur"
 
 # src/nautilus-shell-ui.xml.h:95
-#: src/nautilus-shell-ui.xml.h:100
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "_Geri Al"
 
 # src/nautilus-shell-ui.xml.h:96
-#: src/nautilus-shell-ui.xml.h:101
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "_Bir Seviye Yukarý"
 
 # src/nautilus-shell-ui.xml.h:97
-#: src/nautilus-shell-ui.xml.h:102
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "_Bakýþ"
 
 # src/nautilus-sidebar.c:655
-#: src/nautilus-sidebar.c:659
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -11196,12 +11525,12 @@ msgstr ""
 "için tek bir resmi sürükleyiniz."
 
 # src/nautilus-sidebar.c:657
-#: src/nautilus-sidebar.c:661
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "Birden Fazla Resim"
 
 # src/nautilus-sidebar.c:676
-#: src/nautilus-sidebar.c:680
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -11210,12 +11539,12 @@ msgstr ""
 "kullanýlabilir."
 
 # src/nautilus-sidebar.c:678
-#: src/nautilus-sidebar.c:682
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "Sadece Yerel Resimler"
 
 # src/nautilus-sidebar.c:683
-#: src/nautilus-sidebar.c:687
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -11224,19 +11553,19 @@ msgstr ""
 "alýnan resimler kullanýlabilir."
 
 # src/nautilus-sidebar.c:685
-#: src/nautilus-sidebar.c:689
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "Sadece Resimler"
 
 # src/nautilus-sidebar.c:1237
-#: src/nautilus-sidebar.c:1247
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "%s ile aç"
 
 # src/nautilus-sidebar.c:1271
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1283
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "Birlikte aç..."
 
@@ -11244,7 +11573,7 @@ msgstr "Birlikte aç..."
 # src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
 # src/file-manager/nautilus-directory-view-ui.xml.h:11
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1390
+#: src/nautilus-sidebar.c:1424
 msgid "  Empty Trash  "
 msgstr "  Çöpü Boþalt  "
 
@@ -11354,18 +11683,18 @@ msgid "No description available for the \"%s\" theme"
 msgstr "\"%s\" temasý için açýklama bulunamadý"
 
 # src/nautilus-window.c:1118
-#: src/nautilus-window.c:584
+#: src/nautilus-window.c:637
 msgid "View as ..."
 msgstr "Farklý göster ..."
 
 # src/nautilus-window.c:1118
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1286
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "Diðerlerini Göster..."
 
 # src/nautilus-window.c:1483
-#: src/nautilus-window.c:1687
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "Kapat"
 
@@ -11381,12 +11710,12 @@ msgid "Preview Release %s: %s"
 msgstr "Deneme Sürümü %s: %s"
 
 # src/nautilus-window-manage-views.c:777
-#: src/nautilus-window-manage-views.c:812
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "Ýzleme Baþarýsýz"
 
 # src/nautilus-window-manage-views.c:788
-#: src/nautilus-window-manage-views.c:823
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
@@ -11396,20 +11725,20 @@ msgstr ""
 "seçebilir, ya da baþka bir konuma gidebilirsiniz."
 
 # src/nautilus-window-manage-views.c:799
-#: src/nautilus-window-manage-views.c:834
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "Baþlatýlýrken %s görünümü bir hata saptadý."
 
 # src/nautilus-window-manage-views.c:899
-#: src/nautilus-window-manage-views.c:993
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
 msgstr "Yan çubuk panellerinden birisinde hata oluþtu ve devam edilemiyor. "
 
 # src/nautilus-window-manage-views.c:903
-#: src/nautilus-window-manage-views.c:997
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
@@ -11419,25 +11748,25 @@ msgstr ""
 "yinelenirse paneli tamamen kapatmanýzda fayda var."
 
 # src/nautilus-window-manage-views.c:908
-#: src/nautilus-window-manage-views.c:1002
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "Kenar Çubuðu Hatasý"
 
 # src/nautilus-window-manage-views.c:1302
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr "\"%s\" bulunamadý. Lütfen yazdýðýnýzý yeniden gözden geçirin."
 
 # src/nautilus-window-manage-views.c:1308
-#: src/nautilus-window-manage-views.c:1223
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
 msgstr "\"%s\" geçerli bir konum deðil. Yazdýklarýnýzý yeniden gözden geçirin."
 
 # src/nautilus-window-manage-views.c:1322
-#: src/nautilus-window-manage-views.c:1237
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -11446,41 +11775,42 @@ msgstr ""
 "\"%s\" gösterilemedi, Nautilus bunun ne tür bir dosya olduðunu bulamadý."
 
 # src/nautilus-window-manage-views.c:1330
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr "\"%s\" Nautilus tarafýndan gösterilemiyor."
 
 # src/nautilus-window-manage-views.c:1342
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1257
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr "\"%s\" gösterilemiyor, çünkü Nautilus %s: konumunu tanýyamýyor."
 
 # src/nautilus-window-manage-views.c:1348
-#: src/nautilus-window-manage-views.c:1263
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "\"%s\" gösterilemiyor, çünkü giriþ iþleminde hata var."
 
 # src/nautilus-window-manage-views.c:1353
-#: src/nautilus-window-manage-views.c:1268
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "\"%s\" gösterilemedi, çünkü eriþim engellendi"
 
 # src/nautilus-window-manage-views.c:1358
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1287
+#, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
 "the spelling is correct and that your proxy settings are correct."
 msgstr ""
-"\"%s\" gösterilemedi, çünkü \"%s\" makine adý bulunamadý. Að "
-"ayarlarýnýzýn doðru yapýldýðýna emin misiniz?"
+"\"%s\" gösterilemedi, çünkü \"%s\" makine adý bulunamadý. Að ayarlarýnýzýn "
+"doðru yapýldýðýna emin misiniz?"
 
 # src/nautilus-window-manage-views.c:1364
-#: src/nautilus-window-manage-views.c:1287
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -11490,7 +11820,7 @@ msgstr ""
 "yapýldýðýna emin misiniz?"
 
 # src/nautilus-window-manage-views.c:1376
-#: src/nautilus-window-manage-views.c:1299
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -11502,18 +11832,18 @@ msgstr ""
 "oluþturmadýysanýz þimdi Medusa Indexer'ý çalýþtýrýn."
 
 # src/nautilus-window-manage-views.c:1380
-#: src/nautilus-window-manage-views.c:1303
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "Arama Yapýlamaz"
 
 # src/nautilus-window-manage-views.c:1384
-#: src/nautilus-window-manage-views.c:1307
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "\"%s\" Nautilus tarafýndan gösterilemiyor."
 
 # src/nautilus-window-manage-views.c:1397
-#: src/nautilus-window-manage-views.c:1312
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "Adres Gösterilemiyor"
 
@@ -11521,7 +11851,7 @@ msgstr "Adres Gösterilemiyor"
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:313
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
@@ -11530,43 +11860,43 @@ msgstr ""
 ":-)"
 
 # src/nautilus-window-menus.c:309
-#: src/nautilus-window-menus.c:316
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr "Daha önce ziyaret edilen konumlarý silmek istediðinize emin misiniz?"
 
 # src/nautilus-window-menus.c:314
-#: src/nautilus-window-menus.c:321
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "Geçmiþ Silinsin Mi?"
 
 # src/nautilus-window-menus.c:315
-#: src/nautilus-window-menus.c:322
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "Sil"
 
 # src/nautilus-window-menus.c:416
-#: src/nautilus-window-menus.c:425
+#: src/nautilus-window-menus.c:466
 msgid "Show St_atus Bar"
 msgstr "_Durum Çubuðunu Göster"
 
 # src/nautilus-window-menus.c:422
-#: src/nautilus-window-menus.c:431
+#: src/nautilus-window-menus.c:472
 msgid "Show _Sidebar"
 msgstr "_Yan Çubuðu Göster"
 
 # src/nautilus-window-menus.c:428
-#: src/nautilus-window-menus.c:437
+#: src/nautilus-window-menus.c:478
 msgid "Show _Toolbar"
 msgstr "_Araç Çubuðunu Göster"
 
 # src/nautilus-window-menus.c:434
-#: src/nautilus-window-menus.c:443
+#: src/nautilus-window-menus.c:484
 msgid "Show Location _Bar"
 msgstr "_Konum Çubuðunu Göster"
 
 # src/nautilus-window-menus.c:483
-#: src/nautilus-window-menus.c:494
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "Tercihler"
 
@@ -11577,12 +11907,12 @@ msgstr "Tercihler"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:577
+#: src/nautilus-window-menus.c:618
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
 # src/nautilus-window-menus.c:562
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -11601,12 +11931,12 @@ msgstr ""
 #. * bottom of the about box to give credit
 #. * to the translator(s)
 #.
-#: src/nautilus-window-menus.c:588
+#: src/nautilus-window-menus.c:629
 msgid "Translator Credits"
 msgstr "Çeviri: Görkem Çetin"
 
 # src/nautilus-window-menus.c:716
-#: src/nautilus-window-menus.c:758
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -11616,31 +11946,26 @@ msgstr ""
 "sileyim mi?"
 
 # src/nautilus-window-menus.c:720
-#: src/nautilus-window-menus.c:762
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "Bulunmayan Adres Ýçin Yer Ými"
 
 # src/nautilus-window-menus.c:734
-#: src/nautilus-window-menus.c:776
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "\"%s\" için yer bilgisi bulunamadý."
 
 # src/nautilus-window-menus.c:735
-#: src/nautilus-window-menus.c:777
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "Bulunmayan Adrese Git"
 
 # src/nautilus-window-menus.c:802
-#: src/nautilus-window-menus.c:846
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "Bu yer imi tarafýndan belirtilen konuma git"
 
-# src/nautilus-window-menus.c:1238
-#: src/nautilus-window-menus.c:1357
-msgid "_Browse"
-msgstr "_Gözat"
-
 # src/nautilus-window-toolbars.c:381
 #: src/nautilus-window-toolbars.c:402
 msgid "Back"
@@ -11659,6 +11984,159 @@ msgstr "Ýleri"
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 
+# libnautilus-extensions/nautilus-icon-factory.c:133
+#~ msgid "helvetica"
+#~ msgstr "helvetica"
+
+# components/text/nautilus-text-view-ui.xml.h:7
+#~ msgid "_Fonts"
+#~ msgstr "_Yazýtipleri"
+
+# libnautilus-extensions/nautilus-file-operations.c:1854
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "Bir dosyayý kendi üzerine taþýyamazsýnýz."
+
+# libnautilus-extensions/nautilus-file-operations.c:1856
+#~ msgid "Can't Move Onto Self"
+#~ msgstr "Üzerine Taþýnamaz"
+
+# src/nautilus-shell-ui.xml.h:40
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+# components/music/mpg123.c:61
+#~ msgid "Bold"
+#~ msgstr "Kalýn"
+
+# src/nautilus-bookmarks-window.c:127
+#~ msgid "Book"
+#~ msgstr "Kitap"
+
+#~ msgid "Demibold"
+#~ msgstr "Yarý Kalýn"
+
+# src/Nautilus_shell.oaf.in.h:3
+#~ msgid "Light"
+#~ msgstr "Hafif"
+
+# src/file-manager/fm-properties-window.c:1200
+#~ msgid "Italic"
+#~ msgstr "Yatýk"
+
+# components/music/mpg123.c:31
+#~ msgid "Oblique"
+#~ msgstr "Eðimli"
+
+# components/services/install/command-line/eazel-alt-install-corba.c:114
+#~ msgid "Reverse Italic"
+#~ msgstr "Ters Yatýk"
+
+# src/file-manager/nautilus-icon-view-ui.xml.h:19
+#~ msgid "Reverse Oblique"
+#~ msgstr "Ters Eðimli"
+
+# src/file-manager/fm-properties-window.c:983
+#~ msgid "Condensed"
+#~ msgstr "Sýký"
+
+#~ msgid "Semicondensed"
+#~ msgstr "Yarý sýký"
+
+# libnautilus-extensions/nautilus-font-picker.c:131
+#~ msgid "Font"
+#~ msgstr "Yazýtipi"
+
+# libnautilus-extensions/nautilus-font-factory.c:321
+#~ msgid "fixed"
+#~ msgstr "düzeltilmiþ"
+
+# libnautilus-extensions/nautilus-glib-extensions.c:1192
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00"
+
+# libnautilus-extensions/nautilus-glib-extensions.c:1193
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00"
+
+# libnautilus-extensions/nautilus-glib-extensions.c:1194
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00"
+
+# libnautilus-extensions/nautilus-global-preferences.c:88
+#~ msgid "current theme"
+#~ msgstr "geçerli tema"
+
+# libnautilus-extensions/nautilus-global-preferences.c:132
+#~ msgid "Use this font family to display file names:"
+#~ msgstr "Dosya isimlerinde kullanýlan yazýtipi ailesi:"
+
+# libnautilus-extensions/nautilus-global-preferences.c:186
+#~ msgid "Can add Content"
+#~ msgstr "Eklenebilir içerik"
+
+#~ msgid "No image was selected.  You must click on an image to select it."
+#~ msgstr "Hiç resim seçilmedi. Bir resmi üzerine týklayarak seçmelisiniz."
+
+# components/help/converters/gnome-db2html2/sect-elements.c:1027
+#~ msgid "No selection made"
+#~ msgstr "seçim yapýlmadý"
+
+#~ msgid "Remember this password"
+#~ msgstr "Bu parolayý hatýrla"
+
+# components/text/nautilus-text-view-ui.xml.h:9
+#~ msgid "times"
+#~ msgstr "times"
+
+# components/text/nautilus-text-view-ui.xml.h:6
+#~ msgid "courier"
+#~ msgstr "courier"
+
+# components/text/nautilus-text-view-ui.xml.h:1
+#~ msgid "lucida"
+#~ msgstr "lucida"
+
+# libnautilus-extensions/nautilus-stock-dialogs.c:508
+#~ msgid "Details"
+#~ msgstr "Ayrýntýlar"
+
+# libnautilus-extensions/nautilus-stock-dialogs.c:456
+#~ msgid "Warning"
+#~ msgstr "Uyarý"
+
+# libnautilus-extensions/nautilus-stock-dialogs.c:466
+# libnautilus-extensions/nautilus-stock-dialogs.c:506
+#~ msgid "Error"
+#~ msgstr "Hata"
+
+# libnautilus-extensions/nautilus-stock-dialogs.c:538
+#~ msgid "Question"
+#~ msgstr "Soru"
+
+# libnautilus/nautilus-clipboard-ui.xml.h:7
+#~ msgid "_Cut Text"
+#~ msgstr "Metni _Kes"
+
+# src/nautilus-shell-ui.xml.h:45
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "Seçili metni arabelleðe yerleþtirmeden siler"
+
+# src/nautilus-shell-ui.xml.h:60
+#~ msgid "Use Advanced settings"
+#~ msgstr "Uzman kullanýcý ayarlarý"
+
+# src/nautilus-shell-ui.xml.h:61
+#~ msgid "Use Beginner settings"
+#~ msgstr "Baþlangýç kullanýcý ayarlarý"
+
+# src/nautilus-shell-ui.xml.h:62
+#~ msgid "Use Intermediate settings"
+#~ msgstr "Normal kullanýcý ayarlarý"
+
+# src/nautilus-window-menus.c:1238
+#~ msgid "_Browse"
+#~ msgstr "_Gözat"
+
 # components/services/summary/nautilus-view/nautilus-summary-view.c:163
 #~ msgid "Welcome, %s!"
 #~ msgstr "Hoþgeldin, %s!"
diff --git a/po/uk.po b/po/uk.po
index c4d13ffbf..97b19381f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,10 +1,15 @@
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # Yuri Syrota <rasta@renome.rovno.ua>, 2000.
 #
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus \n"
-"POT-Creation-Date: 2001-03-16 12:03+0100\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2001-01-30 16:27+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -139,8 +144,8 @@ msgid "Previous"
 msgstr "ðÏÐÅÒÅÄÎÑ"
 
 #: components/help/converters/gnome-db2html2/gdb3html.c:721
-#: libnautilus-extensions/nautilus-global-preferences.c:686
-#: src/nautilus-shell-ui.xml.h:38
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Home"
 msgstr "äÏͦ×ËÁ"
 
@@ -329,16 +334,14 @@ msgid "Kernel Routines"
 msgstr "ð¦ÄÐÒÏÇÒÁÍÉ ÑÄÒÁ"
 
 #: components/help/hyperbola-filefmt.c:703
-#: libnautilus-extensions/nautilus-stock-dialogs.c:510
-#: libnautilus-extensions/nautilus-stock-dialogs.c:548
 msgid "Info"
 msgstr "¶ÎÆÏÒÍÁæÑ"
 
-#: components/help/hyperbola-nav-tree.c:279
+#: components/help/hyperbola-nav-tree.c:310
 msgid "Introductory Documents:"
 msgstr ""
 
-#: components/help/hyperbola-nav-tree.c:293
+#: components/help/hyperbola-nav-tree.c:324
 msgid "Documents by Subject:"
 msgstr "äÏËÕÍÅÎÔÉ ÚÁ ÔÅÍÏÀ:"
 
@@ -411,7 +414,7 @@ msgstr "â¦ÞÎÁ ÐÁÎÅÌØ ¦ÓÔÏÒ¦§"
 msgid "History sidebar panel for Nautilus"
 msgstr "â¦ÞÎÁ ÐÁÎÅÌØ ¦ÓÔÏÒ¦§ ÄÌÑ îÁÕÔ¦ÌÕÓÁ"
 
-#: components/image-viewer/nautilus-image-view.c:831
+#: components/image-viewer/nautilus-image-view.c:833
 msgid "I could not initialize Bonobo"
 msgstr "îÅ ×ÄÁÌÏÓÑ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ Bonobo"
 
@@ -466,7 +469,7 @@ msgstr ""
 #: components/loser/content/nautilus-content-loser-ui.xml.h:3
 #: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 #: components/sample/nautilus-sample-content-view-ui.xml.h:4
-#: src/nautilus-shell-ui.xml.h:85
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_File"
 msgstr "æÁÊÌ"
 
@@ -547,7 +550,7 @@ msgid "Sidebar Loser"
 msgstr ""
 
 #: components/mozilla/mozilla-preferences.cpp:126
-#: libnautilus-extensions/nautilus-gconf-extensions.c:80
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -557,7 +560,7 @@ msgstr ""
 "  %s"
 
 #: components/mozilla/mozilla-preferences.cpp:133
-#: libnautilus-extensions/nautilus-gconf-extensions.c:84
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -1004,7 +1007,6 @@ msgid "Oldies"
 msgstr "óÔÁÒÁ"
 
 #: components/music/mpg123.c:32
-#: libnautilus-extensions/nautilus-font-picker.c:117
 msgid "Other"
 msgstr "¶ÎÛÁ"
 
@@ -1639,10 +1641,10 @@ msgid "Pause"
 msgstr "ðÁÕÚÁ"
 
 #: components/music/nautilus-music-view.c:1554
-#: libnautilus-extensions/nautilus-file-operations.c:945
-#: libnautilus-extensions/nautilus-file-operations.c:960
 #: libnautilus-extensions/nautilus-file-operations.c:979
-#: src/nautilus-shell-ui.xml.h:60
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
 msgid "Stop"
 msgstr "úÕÐÉÎËÁ"
 
@@ -1692,23 +1694,6 @@ msgstr "æÁÂÒÉËÁ ÐÅÒÅÇÌÑÄÕ ÍÕÚÉËÉ"
 msgid "View as Music"
 msgstr "ðÏËÁÚÁÔÉ ÑË ÍÕÚÉËÕ"
 
-#. FIXME: eventually, get this from preferences
-#. set up the default font
-#: components/notes/nautilus-notes.c:200
-#: components/text/nautilus-text-view.c:186
-#: libnautilus-extensions/nautilus-global-preferences.c:1118
-#: libnautilus-extensions/nautilus-icon-container.c:3333
-#: libnautilus-extensions/nautilus-icon-container.c:3334
-#: libnautilus-extensions/nautilus-icon-container.c:3335
-#: libnautilus-extensions/nautilus-icon-container.c:3336
-#: libnautilus-extensions/nautilus-icon-container.c:3337
-#: libnautilus-extensions/nautilus-icon-container.c:3338
-#: libnautilus-extensions/nautilus-icon-container.c:3339
-#: libnautilus-extensions/nautilus-preferences-item.c:482
-#: src/nautilus-sidebar-title.c:500
-msgid "helvetica"
-msgstr "ÇÅÌ×ÅÔÉËÁ"
-
 #: components/notes/Nautilus_View_notes.oaf.in.h:1
 msgid "Factory for annotation view"
 msgstr "æÁÂÒÉËÁ ÄÌÑ ÐÅÒÅÇÌÑÄÕ ÁÎÏÔÁæ§"
@@ -1795,7 +1780,7 @@ msgstr "÷ËÁÚÁÔÉ CGI ÐÏÛÕËÕ"
 #: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
 #: components/services/install/command-line/eazel-test-packsys.c:590
-#: components/services/install/command-line/eazel-test-softcat.c:45
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "ðÏËÁÚÕ×ÁÔÉ ×É×¦Ä ÎÁÌÁÇÏÄÖÕ×ÁÎÎÑ"
 
@@ -1859,171 +1844,174 @@ msgstr ""
 msgid "Run Query"
 msgstr "÷ÉËÏÎÁÔÉ ÚÁÐÉÔ"
 
-#. Disabled for 1.0
-#. {"revert", 'r', POPT_ARG_NONE, &arg_revert, 0, N_("Revert"), NULL},
-#: components/services/install/command-line/eazel-alt-install-corba.c:127
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
+#, fuzzy
+msgid "Revert"
+msgstr "ΦËÏÌÉ"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 msgid "Set root"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:128
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "÷ËÁÚÁÔÉ ÓÅÒ×ÅÒ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:129
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
 msgid "Dont print too much, just problems and download"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:130
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
 msgid "Perform ssl renaming"
 msgstr "úĦÊÓÎÉÔÉ ÐÅÒÅÊÍÅÎÕ×ÁÎÎÑ SSL"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:131
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
 msgid "argument is a suite id"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "úÁÐÕÓ ÔÅÓÔÕ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
 msgid "Allow username"
 msgstr "äÏÚ×ÏÌÉÔÉ ¦Í'Ñ ËÏÒÉÓÔÕ×ÁÞÁ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:134
-#: components/services/install/lib/eazel-install-problem.c:1015
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "äÏÚ×ÏÌÉÔÉ ÐÏÎÏ×ÌÅÎÎÑ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr "äÅÔÁÌØÎÉÊ ×ÉצÄ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:136
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
 msgid "Install a specific package version"
 msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÐÅ×ÎÕ ×ÅÒÓ¦À ÐÁËÅÔÕ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:159
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
 msgid "*** You cannot specify more then one protocol type.\n"
 msgstr "*** ÷É ÎÅ ÍÏÖÅÔÅ ×ÓÔÁÎÏ×ÌÀ×ÁÔÉ Â¦ÌØÛÅ ÏÄÎÏÇÏ ÔÉÐÕ ÐÒÏÔÏËÏÌÕ.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:176
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
 msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
 msgstr "*** óÔÅÒÔÉ ¦ צÄÎÏ×ÉÔÉ?  èÔÏÓØ Ð¦ÄÇÏÔÕ×Á× ÎÁÍ ÂÏÍÂÕ!\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:285
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
 #, c-format
 msgid "File conflict checking %s...\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:299
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
 #, c-format
 msgid "File uniqueness checking %s...\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:313
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
 #, c-format
 msgid "Feature consistency checking %s...\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:344
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
 #: components/services/install/lib/eazel-install-protocols.c:116
 #: components/services/install/lib/eazel-install-protocols.c:254
 #, c-format
 msgid "Downloading %s..."
 msgstr "ú×ÁÎÔÁÖÅÎÎÑ %s..."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:360
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
 msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
 msgstr "ú×ÁÎÔÁÖÅÎÎÑ %s... (%d/%d) = %d%% %.1f ëÂ/Ó"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:368
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
 msgid "Downloading %s... (%d/%d) = %d%%"
 msgstr "ú×ÁÎÔÁÖÅÎÎÑ %s... (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:376
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
 #, c-format
 msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
 msgstr "ú×ÁÎÔÁÖÅÎÎÑ %s... (%d/%d) %.1f ëÂ/Ó úÒÏÂÌÅÎÏ  \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:381
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
 #, c-format
 msgid "Downloading %s... %3.1f KB/s Done\n"
 msgstr "ú×ÁÎÔÁÖÅÎÎÑ %s... %3.1f ëÂ/Ó úÒÏÂÌÅÎÏ\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:409
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "÷ÓÔÁÎÏ×ÌÅÎÎÑ %s (%d/%d), (%d/%d) - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:417
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
 msgstr "÷ÉÄÁÌÅÎÎÑ %s (%d/%d), (%d/%d) - (%d/%d) = %d%%"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:439
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
 msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "÷ÓÔÁÎÏ×ÌÅÎÎÑ %s (%d/%d), (%d/%d) - (%d/%d) = %d%% úÒÏÂÌÅÎÏ\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:446
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
 msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
 msgstr "÷ÉÄÁÌÅÎÎÑ %s (%d/%d), (%d/%d) - (%d/%d) = %d%% úÒÏÂÌÅÎÏ\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:454
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
 msgid "Done\n"
 msgstr "úÒÏÂÌÅÎÏ\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:474
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
 #, c-format
 msgid "Download of %s FAILED\n"
 msgstr "úÂ¦Ê Ú×ÁÎÔÁÖÅÎÎÑ %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:496
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
 #, c-format
 msgid "Package %s failed to uninstall.\n"
 msgstr "îÅ ×ÄÁÌÏÓØ ×ÉÄÁÌÉÔÉ ÐÁËÅÔ %s.\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:498
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
 #, c-format
 msgid "Package %s failed to install.\n"
 msgstr "îÅ ×ÓÔÁÎÏ×ÉÔÉ ÐÁËÅÔ %s.\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:519
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
 #, c-format
 msgid "\t· Problem : %s\n"
 msgstr "\t- ðÒÏÂÌÅÍÁ: %s\n"
 
 #. I18N note: \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:528
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
 #, c-format
 msgid "\t· Action : %s\n"
 msgstr "\t- ä¦Ñ: %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:571
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
 msgid "Cancelling operation\n"
 msgstr "÷¦ÄͦÎÁ ÏÐÅÒÁæ§\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:582
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
 #, c-format
 msgid "About to install a total of %d packages, %dKB\n"
 msgstr "çÏÔÏצ ÄÏ ×ÓÔÁÎÏ×ÌÅÎÎÑ %d ÐÁËÅÔ¦×, %d ëÂ\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:586
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
 #, c-format
 msgid "About to uninstall a total of %d packages, %dKB\n"
 msgstr "çÏÔÏצ ÄÏ ×ÉÄÁÌÅÎÎÑ %d ÐÁËÅÔ¦×, %d ëÂ\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:590
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
 #, c-format
 msgid "About to revert a total of %d packages, %d KB\n"
 msgstr "çÏÔÏצ ÄÏ ×¦ÄÎÏ×ÌÅÎÎÑ %d ÐÁËÅÔ¦×, %d ëÂ\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:607
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
 #, c-format
 msgid "\t· %s and it's dependencies\n"
 msgstr "\t- %s ÔÁ ÊÏÇÏ ÚÁÌÅÖÎÏÓÔ¦\n"
 
 #. I18N note: %s is a package name, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:610
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
 #, c-format
 msgid "\t· %s\n"
 msgstr "\t- %s\n"
@@ -2033,38 +2021,38 @@ msgstr "\t- %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n) " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:638
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
 msgid "Save transaction report ? (y/n) "
 msgstr ""
 
 #. I18N note: y is the letter for the word Yes. This is
 #. used in the response for a yes/no questions. Your translation
 #. must be 1 character only.
-#: components/services/install/command-line/eazel-alt-install-corba.c:649
-#: components/services/install/command-line/eazel-alt-install-corba.c:769
-#: components/services/install/command-line/eazel-alt-install-corba.c:811
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
 msgid "y"
 msgstr "Ô"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:670
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
 #, c-format
 msgid "Dependency : %s needs %s\n"
 msgstr "úÁÌÅÖΦÓÔØ : %s ×ÉÍÁÇÁ¤ %s\n"
 
 #. I18N note: %s is a package name
-#: components/services/install/command-line/eazel-alt-install-corba.c:688
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
 #, c-format
 msgid "Package %s failed md5 check!\n"
 msgstr "îÅ ÐÒÏÊÛÌÁ ÐÅÒÅצÒËÁ MD5 ÐÁËÅÔÕ %s!\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:690
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
 #, c-format
 msgid "\t· server MD5 checksum is %s\n"
 msgstr "\t- ÓÅÒ×ÅÒÎÁ ËÏÎÔÒÏÌØÎÁ ÓÕÍÁ MD5 - %s\n"
 
 #. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
-#: components/services/install/command-line/eazel-alt-install-corba.c:692
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
 #, c-format
 msgid "\t· actual MD5 checksum is %s\n"
 msgstr "\t- ÁËÔÕÁÌØÎÁ ËÏÎÔÒÏÌØÎÁ ÓÕÍÁ MD5 - %s\n"
@@ -2074,7 +2062,7 @@ msgstr "\t- ÁËÔÕÁÌØÎÁ ËÏÎÔÒÏÌØÎÁ ÓÕÍÁ MD5 - %s\n"
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:758
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
 msgid "Continue? (y/n) "
 msgstr "óÐÒÏÄÏ×ÖÉÔÉ? (Ô/Î) "
 
@@ -2083,83 +2071,83 @@ msgstr "óÐÒÏÄÏ×ÖÉÔÉ? (Ô/Î) "
 #. If you eg. translate this to Danish : "Fortsæt (j/n " and
 #. translated the "y" later to "j", da_DK users can respond with
 #. "j" "ja" "JA" etc.
-#: components/services/install/command-line/eazel-alt-install-corba.c:799
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
 msgid "Should I delete the RPM files? (y/n) "
 msgstr "óÔÅÒÔÉ Ã¦ ÆÁÊÌÉ RPM? (Ô/Î) "
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:831
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
 msgid "Operation ok\n"
 msgstr "ïÐÅÒÁæÀ ×ÉËÏÎÁÎÏ\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:833
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
 msgid "Operation failed\n"
 msgstr "úÂ¦Ê ÏÐÅÒÁæ§\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:959
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
 msgid "Installing"
 msgstr "÷ÓÔÁÎÏ×ÌÅÎÎÑ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:968
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
 msgid "Uninstalling"
 msgstr "÷ÉÄÁÌÅÎÎÑ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:983
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
 msgid "Only one operation at a time please."
 msgstr "ìÉÛÅ ÏÄÎÁ ÏÐÅÒÁÃ¦Ñ ÚÁ ÒÁÚ, ÂÕÄØ ÌÁÓËÁ."
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:988
-#: components/services/install/command-line/eazel-alt-install-corba.c:996
-#: components/services/install/command-line/eazel-alt-install-corba.c:1040
-#: components/services/install/command-line/eazel-alt-install-corba.c:1047
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
 #, c-format
 msgid "%s: --help for usage\n"
 msgstr "%s: --help ÄÌÑ ×¦ÄÏÂÒÁÖÅÎÎÑ ÐÒÁ×ÉÌ ×ÉËÏÒÉÓÔÁÎÎÑ\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
 #, c-format
 msgid "Name         : %s\n"
 msgstr "îÁÚ×Á        : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
 #, c-format
 msgid "Version      : %s\n"
 msgstr "÷ÅÒÓ¦Ñ       : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1014
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
 #, c-format
 msgid "Minor        : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
 #, c-format
 msgid "Size         : %d\n"
 msgstr "òÏÚÍ¦Ò       : %d\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
 #, c-format
 msgid "Arch         : %s\n"
 msgstr ""
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
 #, c-format
 msgid "Distribution : %s\n"
 msgstr "äÉÓÔÒÉÂÕÃ¦Ñ :  %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1019
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
 #, c-format
 msgid "Description  : %s\n"
 msgstr "ïÐÉÓ         : %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1021
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
 #, c-format
 msgid "Install root : %s\n"
 msgstr "ëÏÒ¦ÎØ ×ÓÔÁÎÏ×ÌÅÎÎÑ: %s\n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1024
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
 msgid "Provides     : \n"
 msgstr "îÁÄÁ¤       : \n"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:1066
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
 #, c-format
 msgid "exit code %d\n"
 msgstr "ËÏÄ ×ÉÈÏÄÕ %d\n"
@@ -2174,122 +2162,129 @@ msgid "Use specified file to generate a package list, requires --packagelist"
 msgstr ""
 "÷ÉËÏÒÉÓÔÁÔÉ ×ËÁÚÁÎÉÊ ÆÁÊÌ ÄÌÑ ÓÔ×ÏÒÅÎÎÑ ÓÐÉÓËÕ ÐÁËÅÔ¦×, ×ÉÍÁÇÁ¤ --packagelist"
 
-#: components/services/install/command-line/eazel-test-softcat.c:43
+#: components/services/install/command-line/eazel-test-softcat.c:54
 msgid "Softcat server to connect to"
 msgstr "óÅÒ×ÅÒ Softcat"
 
-#: components/services/install/command-line/eazel-test-softcat.c:44
+#: components/services/install/command-line/eazel-test-softcat.c:55
 msgid "Use alternate CGI path"
 msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÁÌØÔÅÒÎÁÔÉ×ÎÉÊ ÛÌÑÈ ÄÏ CGI"
 
-#: components/services/install/command-line/eazel-test-softcat.c:46
+#: components/services/install/command-line/eazel-test-softcat.c:57
 msgid "Connect as a softcat user through ammonite"
 msgstr "ú'¤ÄÎÁÔÉÓØ ËÏÒÉÓÔÕ×ÁÞÅÍ Softcat ÞÅÒÅÚ Ammonite"
 
-#: components/services/install/command-line/eazel-test-softcat.c:47
+#: components/services/install/command-line/eazel-test-softcat.c:58
 msgid "Number of times to try the request"
 msgstr "ë¦ÌØ˦ÓÔØ ÓÐÒÏ ÚÁÐÉÔÕ"
 
-#: components/services/install/command-line/eazel-test-softcat.c:48
+#: components/services/install/command-line/eazel-test-softcat.c:59
 msgid "Delay between request retries, in usec"
 msgstr "ðÁÕÚÁ Í¦Ö ÓÐÒÏÂÁÍÉ ÚÁÐÉÔÕ (× ÍÓ)"
 
-#: components/services/install/command-line/eazel-test-softcat.c:49
+#: components/services/install/command-line/eazel-test-softcat.c:60
 msgid "Lookup by Eazel package id"
 msgstr "úÎÁÊÔÉ ÚÁ ¦ÄÅÎÔÉƦËÁÔÏÒÏÍ Eazel ÐÁËÅÔÕ"
 
-#: components/services/install/command-line/eazel-test-softcat.c:50
-msgid "Lookup package that provides a feature/file"
+#: components/services/install/command-line/eazel-test-softcat.c:61
+#, fuzzy
+msgid "Lookup package that features a feature/file"
 msgstr "úÎÁÊÔÉ ÐÁËÅÔ ÑËÉÊ Í¦ÓÔÉÔØ ÏÓÏÂÌÉצÓÔØ ÞÉ ÆÁÊÌ"
 
-#: components/services/install/command-line/eazel-test-softcat.c:51
+#: components/services/install/command-line/eazel-test-softcat.c:62
 msgid "Lookup package with a specific version"
 msgstr "úÎÁÊÔÉ ÐÁËÅÔ ×ËÁÚÁÎϧ ×ÅÒÓ¦§"
 
-#: components/services/install/command-line/eazel-test-softcat.c:52
+#: components/services/install/command-line/eazel-test-softcat.c:63
 msgid "(with --version) Use >= comparison"
 msgstr ""
 
-#: components/services/install/command-line/eazel-test-softcat.c:53
+#: components/services/install/command-line/eazel-test-softcat.c:64
 msgid "use check function (for debugging)"
 msgstr "×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÆÕÎËæÀ ÐÅÒÅצÒËÉ (ÄÌÑ ÎÁÌÁÇÏÄÖÅÎÎÑ)"
 
-#: components/services/install/command-line/eazel-test-softcat.c:54
+#: components/services/install/command-line/eazel-test-softcat.c:65
 msgid "Show detailed sub-package info"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:102
+#: components/services/install/command-line/eazel-test-softcat.c:66
+#, fuzzy
+msgid "enable funk parser"
+msgstr "õצÍËÎÕÔÉ Û×ÉÄËÉÊ ÐÏÛÕË"
+
+#: components/services/install/lib/eazel-install-logic2.c:117
 msgid "Failed to lock the downloaded file"
 msgstr "úÂ¦Ê ÂÌÏËÕ×ÁÎÎÑ Ú×ÁÎÔÁÖÅÎÏÇÏ ÆÁÊÌÕ"
 
-#: components/services/install/lib/eazel-install-logic2.c:119
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
 msgid "MD5 mismatch, package %s may be compromised"
 msgstr "÷¦ÄÓÕÔÎ¦Ê MD5, ÐÁËÅÔ %s ÍÏÖÅ ÂÕÔÉ Ð¦ÄÒÏÂÌÅÎÏ"
 
-#: components/services/install/lib/eazel-install-logic2.c:135
+#: components/services/install/lib/eazel-install-logic2.c:150
 #, c-format
 msgid "No MD5 available for %s"
 msgstr "îÅÍÁ¤ MD5 ÄÌÑ %s"
 
 #. I18N note: "%is is ok" in the sense that %s=package name and the
 #. package is intact
-#: components/services/install/lib/eazel-install-logic2.c:330
+#: components/services/install/lib/eazel-install-logic2.c:356
 #, c-format
 msgid "%s is ok"
 msgstr "%s ¤ ÄÏÂÒÉÍ"
 
-#: components/services/install/lib/eazel-install-logic2.c:436
+#: components/services/install/lib/eazel-install-logic2.c:462
 #, c-format
 msgid "%s-%s version %s-%s already installed"
 msgstr "%s-%s ×ÅÒÓ¦§ %s-%s ×ÖÅ ×ÓÔÁÎÏ×ÌÅÎÏ"
 
-#: components/services/install/lib/eazel-install-logic2.c:440
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
 msgid "%s version %s already installed"
 msgstr "%s ×ÅÒÓ¦§ %s ×ÖÅ ×ÓÔÁÎÏ×ÌÅÎÏ"
 
-#: components/services/install/lib/eazel-install-logic2.c:449
-#: components/services/install/lib/eazel-install-logic2.c:454
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
 msgid "%s upgrades from version %s-%s to %s-%s"
 msgstr "%s ÐÏÎÏ×ÌÀ¤ÔØÓÑ Ú ×ÅÒÓ¦§ %s-%s ÄÏ %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:463
+#: components/services/install/lib/eazel-install-logic2.c:489
 #, c-format
 msgid "%s downgrades from version %s-%s to %s-%s"
 msgstr "%s ÚÁͦÎÀ¤ÔØÓÑ Ú ×ÅÒÓ¦§ %s-%s ÎÁ %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:468
+#: components/services/install/lib/eazel-install-logic2.c:494
 #, c-format
 msgid "%s downgrades from version %s to %s"
 msgstr "%s ÚÁͦÎÀ¤ÔØÓÑ Ú ×ÅÒÓ¦§ %s ÎÁ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:521
+#: components/services/install/lib/eazel-install-logic2.c:547
 #, c-format
 msgid "%s installs version %s-%s"
 msgstr "%s ×ÓÔÁÎÏ×ÌÀ¤ ×ÅÒÓ¦À %s-%s"
 
-#: components/services/install/lib/eazel-install-logic2.c:526
+#: components/services/install/lib/eazel-install-logic2.c:552
 #, c-format
 msgid "%s installs version %s"
 msgstr "%s ×ÓÔÁÎÏ×ÌÀ¤ ×ÅÒÓ¦À %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:693
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
 #, c-format
 msgid "Loading package info from file %s"
 msgstr "úÁ×ÁÎÔÁÖÅÎÎÑ ¦ÎÆÏÒÍÁæÀ ÐÒÏ ÐÁËÅÔ Ú ÆÁÊÌÕ %s"
 
 #. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
-#: components/services/install/lib/eazel-install-logic2.c:1010
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "ok"
 msgstr "ÇÁÒÁÚÄ"
 
-#: components/services/install/lib/eazel-install-logic2.c:1010
+#: components/services/install/lib/eazel-install-logic2.c:1197
 msgid "not ok"
 msgstr "ÎÅÇÁÒÁÚÄ"
 
-#: components/services/install/lib/eazel-install-logic2.c:1176
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
 msgid "Checking dependencies for %s"
 msgstr "ðÅÒÅצÒËÁ ÚÁÌÅÖÎÏÓÔÅÊ ÄÌÑ %s"
@@ -2297,107 +2292,107 @@ msgstr "ðÅÒÅצÒËÁ ÚÁÌÅÖÎÏÓÔÅÊ ÄÌÑ %s"
 #. I18N note: both %s' are package names.
 #. related is in the sense that the two packages apparently
 #. are connected somehow, eg. foo and foo-devel
-#: components/services/install/lib/eazel-install-logic2.c:1800
+#: components/services/install/lib/eazel-install-logic2.c:2014
 #, c-format
 msgid "%s is related to %s"
 msgstr "%s ÓÔÏÓÕ¤ÔØÓÑ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:1876
+#: components/services/install/lib/eazel-install-logic2.c:2090
 #, c-format
 msgid "updating %s to version %s-%s solves conflict"
 msgstr "ÐÏÎÏ×ÌÅÎÎÑ %s ÄÏ ×ÅÒÓ¦§ %s-%s ×ÉÒ¦ÛÕ¤ ËÏÎÆ̦ËÔ"
 
-#: components/services/install/lib/eazel-install-logic2.c:1899
+#: components/services/install/lib/eazel-install-logic2.c:2113
 #, c-format
 msgid "available update to %s (%s-%s) does not solves conflict"
 msgstr "ÄÏÓÔÕÐÎÅ ÐÏÎÏ×ÌÅÎÎÑ ÄÏ %s (%s-%s) ÎÅ ×ÉÒ¦ÛÕ¤ ËÏÎÆ̦ËÔ"
 
-#: components/services/install/lib/eazel-install-logic2.c:1906
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, c-format
 msgid "could not revive %s"
 msgstr "ÎÅ ×ÄÁÌÏÓØ ×¦ÄÎÏ×ÉÔÉ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2061
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
 msgid "file uniqueness checking %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2082
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
 msgid "Duplicate file : %s occurs in %s and %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2094
-#: components/services/install/lib/eazel-install-logic2.c:2248
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
 msgid "... but it's ok, the packages are related"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2102
+#: components/services/install/lib/eazel-install-logic2.c:2324
 #, c-format
 msgid "(there were %d other conflicts)"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2197
+#: components/services/install/lib/eazel-install-logic2.c:2419
 #, c-format
 msgid "file conflict checking %s"
 msgstr "ÐÅÒÅצÒËÁ ÎÁÑ×ÎÏÓÔ¦ ÆÁÊÌÏ×ÉÈ ËÏÎÆ̦ËÔ¦× %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2234
+#: components/services/install/lib/eazel-install-logic2.c:2456
 #, c-format
 msgid "file conflict : package %s already provides file %s also provided by %s"
 msgstr ""
 
 #. the owner of this file is a package that we're upgrading, and the
 #. * new version no longer has this file, so everything's okay.
-#: components/services/install/lib/eazel-install-logic2.c:2244
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
 msgid "...but it is okay, we're upgrading %s and it ditched that file"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2336
+#: components/services/install/lib/eazel-install-logic2.c:2558
 #, c-format
 msgid "checking feature consistency of %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2404
+#: components/services/install/lib/eazel-install-logic2.c:2626
 #, c-format
 msgid ""
 "feature missing : %s breaks if %s is installed (feature %s would be lost"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-logic2.c:2483
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, c-format
 msgid "downloading %d packages"
 msgstr "Ú×ÁÎÔÁÖÅÎÎÑ %d ÐÁËÅÔ¦×"
 
-#: components/services/install/lib/eazel-install-logic2.c:2753
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, c-format
 msgid "will upgrade %s"
 msgstr "ÂÕÄÅ ÐÏÎÏ×ÌÅÎÏ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2756
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, c-format
 msgid "will downgrade %s"
 msgstr "ÂÕÄÅ ÚÁͦÎÅÎÏ ÓÔÁÒ¦ÛÏÀ ×ÅÒÓ¦¤À %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2759
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, c-format
 msgid "will install %s"
 msgstr "ÂÕÄÅ ×ÓÔÁÎÏ×ÌÅÎÏ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2762
+#: components/services/install/lib/eazel-install-logic2.c:2960
 #, c-format
 msgid "will uninstall %s"
 msgstr "ÂÕÄÅ ×ÉÄÁÌÅÎÏ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:2847
-#: components/services/install/lib/eazel-install-problem.c:339
+#: components/services/install/lib/eazel-install-logic2.c:3045
 #: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
 #, c-format
 msgid "%s requires %s"
 msgstr "%s ×ÉÍÁÇÁ¤ %s"
 
-#: components/services/install/lib/eazel-install-logic2.c:3040
+#: components/services/install/lib/eazel-install-logic2.c:3238
 #, c-format
 msgid "failed %s"
 msgstr "ÚÂ¦Ê %s"
@@ -2410,39 +2405,39 @@ msgstr "îÅ ×ÄÁÌÏÓÑ ×ÓÔÁÎÏ×ÉÔÉ ÔÉÐ URL Ú ËÏÎƦ­ÕÒÁæÊÎÏÇÏ ÆÁÊÌÕ!"
 msgid "Transactions are not stored, could not find home dir"
 msgstr "ôÒÁÎÚÁËæ§ ÎÅ ÚÂÅÒÅÖÅÎÏ, ÎÅ ×ÄÁÌÏÓÑ ÚÎÁÊÔÉ ÄÏÍÁÛÎ¦Ê ËÁÔÁÌÏÇ"
 
-#: components/services/install/lib/eazel-install-object.c:745
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
 msgid "Transactions are stored in %s"
 msgstr "ôÒÁÎÚÁËæ§ ÚÂÅÒÅÖÅÎÏ Õ %s"
 
-#: components/services/install/lib/eazel-install-object.c:1002
+#: components/services/install/lib/eazel-install-object.c:1005
 msgid "Getting package list from remote server ...\n"
 msgstr "ïÔÒÉÍÁÎÎÑ ÓÐÉÓËÕ ÐÁËÅÔ¦× Ú ×¦ÄÄÁÌÅÎÏÇÏ ÓÅÒ×ÅÒÁ...\n"
 
-#: components/services/install/lib/eazel-install-object.c:1018
+#: components/services/install/lib/eazel-install-object.c:1021
 msgid "Unable to retrieve package-list.xml!\n"
 msgstr "îÅ ×ÄÁÌÏÓÑ ÏÔÒÉÍÁÔÉ package-list.xml!\n"
 
-#: components/services/install/lib/eazel-install-object.c:1091
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
 msgid "Cannot write to file %s, using default log handler"
 msgstr ""
 "îÅÍÏÖÌÉ×Ï ÚÁÐÉÓÕ×ÁÔÉ Õ ÆÁÊÌ %s, ×ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ ÔÉÐÏ×ÉÊ ÏÂÒÏÂÎÉË ÖÕÒÎÁÌÕ"
 
-#: components/services/install/lib/eazel-install-object.c:1222
+#: components/services/install/lib/eazel-install-object.c:1225
 msgid "Install failed"
 msgstr "úÂ¦Ê ×ÓÔÁÎÏ×ÌÅÎÎÑ"
 
-#: components/services/install/lib/eazel-install-object.c:1268
+#: components/services/install/lib/eazel-install-object.c:1271
 msgid "Uninstall failed"
 msgstr "úÂ¦Ê ×ÉÄÁÌÅÎÎÑ"
 
-#: components/services/install/lib/eazel-install-object.c:1403
+#: components/services/install/lib/eazel-install-object.c:1406
 #, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ËÁÔÁÌÏÇ ÔÒÁÎÚÁËæ§ (%s)!\n"
 
-#: components/services/install/lib/eazel-install-object.c:1426
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr "úÁÐÉÓ ÔÒÁÎÚÁËæ§ Õ %s"
@@ -2453,7 +2448,7 @@ msgid "%s was cancelled"
 msgstr "%s ÂÕÌÏ ×¦ÄͦÎÅÎÏ"
 
 #: components/services/install/lib/eazel-install-problem.c:168
-#: components/services/install/lib/eazel-install-problem.c:331
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
 msgid "%s is a source package, which is not yet supported"
 msgstr "%s - ÐÁËÅÔ ×ÉȦÄÎÉÈ ÔÅËÓÔ¦×, Ñ˦ ÝŠΊЦÄÔÒÉÍÕÀÔØÓÑ"
@@ -2485,49 +2480,49 @@ msgid "%s requires %s, which could not be found on the server"
 msgstr "ðÁËÅÔÕ %s ÐÏÔÒ¦ÂÎÉÊ %s ÑËÏÇÏ ÎÅ ×ÄÁÌÏÓÑ ÚÎÁÊÔÉ ÎÁ ÓÅÒ×ÅÒ¦"
 
 #: components/services/install/lib/eazel-install-problem.c:204
-#, c-format
-msgid "%s could not be found on the server"
+#, fuzzy, c-format
+msgid "%s for %s could not be found on the server"
 msgstr "%s ÎÅ ×ÄÁÌÏÓÑ ÚÎÁÊÔÉ ÎÁ ÓÅÒ×ÅÒ¦"
 
-#: components/services/install/lib/eazel-install-problem.c:212
-#: components/services/install/lib/eazel-install-problem.c:357
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, c-format
 msgid "%s is already installed"
 msgstr "%s ×ÖÅ ×ÓÔÁÎÏ×ÌÅÎÏ"
 
-#: components/services/install/lib/eazel-install-problem.c:256
+#: components/services/install/lib/eazel-install-problem.c:259
 #, c-format
 msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 msgstr ""
 "%s, ÝÏ ¤ ÎÏצÛÉÍ, ×ÖÅ ×ÓÔÁÎÏ×ÌÅÎÏ, Á ÚÁͦÎÕ ÎÁ ÐÏÐÅÒÅÄΦ ×ÅÒÓ¦§ ÚÁÂÏÒÏÎÅÎÏ"
 
-#: components/services/install/lib/eazel-install-problem.c:260
+#: components/services/install/lib/eazel-install-problem.c:263
 #, c-format
 msgid "%s, which is older, needs upgrade and upgrade is not enabled"
 msgstr "%s, ÝÏ ¤ ÓÔÁÒ¦ÛÉÍ, ×ÖÅ ×ÓÔÁÎÏ×ÌÅÎÏ, Á ÐÏÎÏ×ÌÅÎÎÑ ÚÁÂÏÒÏÎÅÎÏ"
 
-#: components/services/install/lib/eazel-install-problem.c:350
+#: components/services/install/lib/eazel-install-problem.c:353
 #, fuzzy, c-format
 msgid "%s is not installed and could not be found on server"
 msgstr "%s ÎÅ ×ÄÁÌÏÓÑ ÚÎÁÊÔÉ ÎÁ ÓÅÒ×ÅÒ¦"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:917
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
 msgid "Check for a new version of %s"
 msgstr "ðÏÛÕËÁÔÉ ÎÏ×Õ ×ÅÒÓ¦À %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. both %s's are package names or filenames
-#: components/services/install/lib/eazel-install-problem.c:928
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
 msgid "Install both %s and %s"
 msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÑË %s, ÔÁË ¦ %s"
 
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename
-#: components/services/install/lib/eazel-install-problem.c:943
+#: components/services/install/lib/eazel-install-problem.c:946
 #, c-format
 msgid "Remove %s from your system"
 msgstr "÷ÉÄÁÌÉÔÉ %s Ú ×ÁÛϧ ÓÉÓÔÅÍÉ"
@@ -2535,21 +2530,21 @@ msgstr "÷ÉÄÁÌÉÔÉ %s Ú ×ÁÛϧ ÓÉÓÔÅÍÉ"
 #. TRANSLATORS : This string is a solution to a dependency problem,
 #. %s is a package name or filename. "Force" is in the rpm sense of force,
 #. meaning that no dependency checking etc will be done
-#: components/services/install/lib/eazel-install-problem.c:956
+#: components/services/install/lib/eazel-install-problem.c:959
 #, c-format
 msgid "Force the removal of %s from your system"
 msgstr "ðÒÉÍÕÓÏ×Å ×ÉÄÁÌÅÎÎÑ %s Ú ×ÁÛÏÀ ÓÉÓÔÅÍÉ"
 
 #. TRANSLATORS : This string is a solution to a dependency problem
-#: components/services/install/lib/eazel-install-problem.c:964
+#: components/services/install/lib/eazel-install-problem.c:967
 msgid "Package database has an inconsistency"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-problem.c:1012
+#: components/services/install/lib/eazel-install-problem.c:1015
 msgid "Continue with force"
 msgstr "ðÒÏÄÏ×ÖÉÔÉ ÐÒÉÍÕÓÏ×Ï"
 
-#: components/services/install/lib/eazel-install-problem.c:1018
+#: components/services/install/lib/eazel-install-problem.c:1021
 msgid "Allow downgrade"
 msgstr "äÏÚ×ÏÌÉÔÉ ×ÓÔÁÎÏ×ÌÅÎÎÑ ÐÏÐÅÒÅÄÎ¦È ×ÅÒÓ¦Ê"
 
@@ -2673,94 +2668,94 @@ msgstr ""
 msgid "*** Unknown node type '%s'"
 msgstr "*** îÅצÄÏÍÉÊ ÔÉÐ ×ÕÚÌÁ \"%s\""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:231
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** óÐÉÓÏË ÐÁËÅÔ¦× ÎŠͦÓÔÉÔØ ÄÁÎÉÈ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:236
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** îÅÍÏÖÌÉ×Ï ÚÎÁÊÔÉ xml-×ÕÚÏÌ CATEGORIES! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:237
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:243
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** îÅÍÁ¤ ËÁÔÅÇÏÒ¦Ê! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:244
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:298
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** îÅÍÏÖÌÉ×Ï ÚÎÁÊÔÉ xml-×ÕÚÏÌ TRANSACTION! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:300
-#: components/services/install/lib/eazel-install-xml-package-list.c:308
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:306
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 msgid "*** No packages! ***\n"
 msgstr "*** îÅÍÁ¤ ÐÁËÅÔ¦×! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:342
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
 msgid "*** No category nodes! ***"
 msgstr "*** îÅÍÁ¤ ×ÕÚÌ¦× ËÁÔÅÇÏÒ¦Ê! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:346
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
 msgid "*** Cannot find the CATEGORIES xmlnode! ***"
 msgstr "*** îÅÍÏÖÌÉ×Ï ÚÎÁÊÔÉ xml-×ÕÚÏÌ CATEGORIES! ***"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:380
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
 #, c-format
 msgid "*** Unknown node %s"
 msgstr "*** îÅצÄÏÍÉÊ ×ÕÚÏÌ %s"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:470
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:517
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** ðÏÍÉÌËÁ ÚÞÉÔÕ×ÁÎÎÑ ÓÐÉÓËÕ ÐÁËÅÔ¦×! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:912
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 msgid "*** The osd xml contains no data! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:917
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 msgid "*** Bailing from osd parse! ***\n"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:993
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "îÅ ×ÄÁÌÏÓÑ ÐÒÏÁÎÁ̦ÚÕ×ÁÔÉ XML (ÄÏ×ÖÉÎÁ %d)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:764
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
 #, c-format
 msgid "Opened packages database in %s"
 msgstr "÷¦ÄËÒÉÔÏ ÂÁÚÕ ÄÁÎÉÈ ÐÁËÅÔ¦× Õ %s"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:769
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
 #, c-format
 msgid "Opening packages database in %s failed"
 msgstr "úÂ¦Ê ×¦ÄËÒÉ×ÁÎÎÑ ÂÁÚÉ ÄÎÁÉÈ ÐÁËÅÔ¦× Õ %s"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:802
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
 #, c-format
 msgid "Closing db for %s (open)"
 msgstr "úÁËÒÉ×ÁÎÎÑ ÂÁÚÉ ÄÁÎÉÈ ÄÌÑ %s (צÄËÒÉÔÏ)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:807
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
 #, c-format
 msgid "Closing db for %s (not open)"
 msgstr "úÁËÒÉ×ÁÎÎÑ ÂÁÚÉ ÄÁÎÉÈ ÄÌÑ %s (ΊצÄËÒÉÔÏ)"
 
-#: components/services/install/lib/eazel-package-system-rpm3.c:1138
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
 #, c-format
 msgid "Cannot open %s"
 msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ %s"
@@ -2873,7 +2868,7 @@ msgid "Now installing package \"%s\"."
 msgstr "÷ÓÔÁÎÏ×ÌÅÎÎÑ ÐÁËÅÔÕ \"%s\"."
 
 #: components/services/install-view/callbacks.c:407
-#: components/services/install-view/nautilus-service-install-view.c:897
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, c-format
 msgid "Installing \"%s\""
 msgstr "÷ÓÔÁÎÏ×ÌÅÎÎÑ \"%s\""
@@ -3016,30 +3011,30 @@ msgstr "óÐÒÏÄÏ×ÖÉÔÉ"
 
 #: components/services/install-view/forms.c:482
 #: libnautilus-extensions/nautilus-drag.c:493
-#: src/file-manager/fm-directory-view.c:3551
+#: src/file-manager/fm-directory-view.c:4326
 msgid "Cancel"
 msgstr "÷¦ÄͦÎÉÔÉ"
 
-#: components/services/install-view/nautilus-service-install-view.c:419
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
 msgid "%s is in GNOME (footprint) > %s"
 msgstr "%s ¤ × GNOME (footprint) > %s"
 
-#: components/services/install-view/nautilus-service-install-view.c:437
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, c-format
 msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr "%s ¤ × ÍÅÎÀ GNOME (footprint).\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:452
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
 msgid "%s is in the KDE menu.\n"
 msgstr "%s ¤ × ÍÅÎÀ KDE.\n"
 
-#: components/services/install-view/nautilus-service-install-view.c:653
+#: components/services/install-view/nautilus-service-install-view.c:655
 msgid "Installation Complete"
 msgstr "÷ÓÔÁÎÏ×ÌÅÎÎÑ ÚÁ×ÅÒÛÅÎÏ"
 
-#: components/services/install-view/nautilus-service-install-view.c:708
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
 msgid ""
 "%sTo start %s, click the Launch button below, or to create a shortcut, drag "
@@ -3047,32 +3042,32 @@ msgid ""
 msgstr ""
 
 #. couldn't find an icon
-#: components/services/install-view/nautilus-service-install-view.c:716
+#: components/services/install-view/nautilus-service-install-view.c:718
 #, c-format
 msgid "%sTo start %s, click the Launch button below."
 msgstr "%säÌÑ ÚÁÐÕÓËÕ %s, ËÌÁÃΦÔØ ËÎÏÐËÕ ÚÁÐÕÓËÕ ÎÉÖÞÅ."
 
-#: components/services/install-view/nautilus-service-install-view.c:771
+#: components/services/install-view/nautilus-service-install-view.c:773
 msgid "Incorrect password."
 msgstr "îÅצÒÎÉÊ ÐÁÒÏÌØ."
 
-#: components/services/install-view/nautilus-service-install-view.c:776
+#: components/services/install-view/nautilus-service-install-view.c:778
 msgid "Authenticate as root"
 msgstr ""
 
-#: components/services/install-view/nautilus-service-install-view.c:893
+#: components/services/install-view/nautilus-service-install-view.c:895
 msgid "Installing packages"
 msgstr "÷ÓÔÁÎÏ×ÌÅÎÎÑ ÐÁËÅÔ¦×"
 
-#: components/services/install-view/nautilus-service-install-view.c:895
+#: components/services/install-view/nautilus-service-install-view.c:897
 msgid "Installing remote package"
 msgstr "÷ÓÔÁÎÏ×ÌÅÎÎÑ ×¦ÄÄÁÌÅÎÏÇÏ ÐÁËÅÔÕ"
 
-#: components/services/install-view/nautilus-service-install-view.c:899
+#: components/services/install-view/nautilus-service-install-view.c:901
 msgid "Installing some package"
 msgstr "÷ÓÔÁÎÏ×ÌÅÎÎÑ ÐÁËÅÔÕ"
 
-#: components/services/install-view/nautilus-service-install-view.c:916
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
 "The Eazel install service is missing:\n"
 "Installs will not work."
@@ -3080,23 +3075,23 @@ msgstr ""
 "ðÏÓÌÕÇÁ ×ÓÔÁÎÏ×ÌÅÎÎÑ Eazel צÄÓÕÔÎÑ:\n"
 "÷ÓÔÁÎÏ×ÌÅÎÎÑ ÎÅ ÐÒÁÃÀ×ÁÔÉÍÅ."
 
-#: components/services/install-view/nautilus-service-install-view.c:965
+#: components/services/install-view/nautilus-service-install-view.c:967
 msgid "Contacting the Eazel Software Catalog ..."
 msgstr "ú'¤ÄÎÁÎÎÑ Ú ËÁÔÁÌÏÇÏÍ ÐÒÏÇÒÁÍÎÏÇÏ ÚÁÂÅÚÐÅÞÅÎÎÑ Eazel..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1023
+#: components/services/install-view/nautilus-service-install-view.c:1025
 msgid "Checking for authorization..."
 msgstr "ðÅÒÅצÒËÁ Á×ÔÏÒÉÚÁæ§..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1095
+#: components/services/install-view/nautilus-service-install-view.c:1097
 msgid "Aborting package downloads (please wait) ..."
 msgstr "óËÁÓÕ×ÁÎÎÑ Ú×ÁÎÔÁÖÕ×ÁÎÎÑ ÐÁËÅÔ¦× (ÂÕÄØ ÌÁÓËÁ, ÚÁÞÅËÁÊÔÅ)..."
 
-#: components/services/install-view/nautilus-service-install-view.c:1115
+#: components/services/install-view/nautilus-service-install-view.c:1117
 msgid "Package download aborted."
 msgstr "óËÁÓÏ×ÁÎÏ Ú×ÁÎÔÁÖÅÎÎÑ ÐÁËÅÔ¦×."
 
-#: components/services/install-view/nautilus-service-install-view.c:1116
+#: components/services/install-view/nautilus-service-install-view.c:1118
 msgid "Aborted"
 msgstr "óËÁÓÏ×ÁÎÏ"
 
@@ -3354,12 +3349,12 @@ msgid "Services Login"
 msgstr "÷È¦Ä × ÐÏÓÌÕÇÉ"
 
 #: components/services/summary/nautilus-summary-dialogs.c:131
-#: libnautilus-extensions/nautilus-password-dialog.c:269
+#: libnautilus-extensions/nautilus-global-preferences.c:827
 msgid "Username:"
 msgstr "¶Í'Ñ ËÏÒÉÓÔÕ×ÁÞÁ:"
 
 #: components/services/summary/nautilus-summary-dialogs.c:138
-#: libnautilus-extensions/nautilus-password-dialog.c:276
+#: libnautilus-extensions/nautilus-global-preferences.c:835
 msgid "Password:"
 msgstr "ðÁÒÏÌØ:"
 
@@ -3430,7 +3425,7 @@ msgstr "óÅÒצÓÉ"
 msgid "Featured Downloads"
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:883
+#: components/services/summary/nautilus-summary-view.c:884
 msgid ""
 "Unable to get services data from Eazel's server. The server might be "
 "unavailable right now, or your computer might be configured incorrectly. "
@@ -3440,7 +3435,7 @@ msgstr ""
 "ÄÏÓÔÕÐÎÉÊ ÞÉ ×ÁÛ ËÏÍÐ'ÀÔÅÒ ÎÅËÏÒÅËÔÎÏ ÎÁÌÁÛÔÏ×ÁÎÏ. âÕÄØ ÌÁÓËÁ, Ú×'ÑÖ¦ÔØÓÑ Ú "
 "support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:893
+#: components/services/summary/nautilus-summary-view.c:894
 msgid ""
 "Found a problem with services data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3448,7 +3443,7 @@ msgstr ""
 "÷ÉÑ×ÌÅÎÏ ÐÒÏÂÌÅÍÕ Ú ÓÅÒצÓÎÉÍÉ ÄÁÎÉÍÉ ÎÁ ÓÅÒ×ÅÒÁÈ Eazel. âÕÄØ ÌÁÓËÁ, "
 "Ú×'ÑÖ¦ÔØÓÑ Ú support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:916
+#: components/services/summary/nautilus-summary-view.c:917
 msgid ""
 "Information is missing from the redirect data on Eazel servers. Please "
 "contact support@eazel.com."
@@ -3456,7 +3451,7 @@ msgstr ""
 "÷¦ÄÓÕÔÎÑ ¦ÎÆÏÒÍÁÃ¦Ñ Ú ÄÁÎÉÈ ÐÅÒÅÁÄÒÅÓÁæ§ ÎÁ ÐÏÓÌÕÇÁÈ Eazel. âÕÄØ ÌÁÓËÁ, "
 "Ú×'ÑÖ¦ÔØÓÑ Ú support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:958
+#: components/services/summary/nautilus-summary-view.c:959
 msgid ""
 "Unable to connect to Eazel's server. The server might be unavailable right "
 "now, or your computer might be configured incorrectly. You could try again "
@@ -3465,7 +3460,7 @@ msgstr ""
 "îÅÍÏÖÌÉ×Ï ÚÄ'¤ÄÎÁÔÉÓØ Ú ÓÅÒ×ÅÒÏÍ Eazel. íÏÖÌÉ×Ï ÓÅÒ×ÅÒ ÚÁÒÁÚ ÎÅ ÄÏÓÔÕÐÎÉÊ ÞÉ "
 "×ÁÛ ËÏÍÐ'ÀÔÅÒ ÎÅËÏÒÅËÔÎÏ ÎÁÌÁÛÔÏ×ÁÎÏ. ÷É ÍÏÖÅÔÅ ÓÐÒÏÂÕ×ÁÔÉ ÝÅ ÒÁÚ Ð¦ÚΦÛÅ."
 
-#: components/services/summary/nautilus-summary-view.c:968
+#: components/services/summary/nautilus-summary-view.c:969
 msgid ""
 "Found a problem with redirect data on Eazel servers. Please contact "
 "support@eazel.com."
@@ -3473,11 +3468,11 @@ msgstr ""
 "÷ÉÑ×ÌÅÎÏ ÐÒÏÂÌÅÍÕ Ú ÄÁÎÉÍÉ ÐÅÒÅÁÄÒÅÓÁæ§ ÎÁ ÓÅÒ×ÅÒÁÈ Eazel. âÕÄØ ÌÁÓËÁ, "
 "Ú×'ÑÖ¦ÔØÓÑ Ú support@eazel.com."
 
-#: components/services/summary/nautilus-summary-view.c:985
+#: components/services/summary/nautilus-summary-view.c:986
 msgid "Failed to upload system inventory."
 msgstr ""
 
-#: components/services/summary/nautilus-summary-view.c:1048
+#: components/services/summary/nautilus-summary-view.c:1049
 #: src/nautilus-first-time-druid.c:258
 msgid "Eazel Services"
 msgstr "ðÏÓÌÕÇÉ Eazel"
@@ -3588,48 +3583,68 @@ msgstr "ÐÏËÁÚ ÚÒÁÚËÁ ÐÏÓÌÕÇÉ eazel"
 msgid "Factory for the sample service"
 msgstr "æÁÂÒÉËÁ ÄÌÑ ÚÒÁÚËÁ ÐÏÓÌÕÇÉ"
 
-#: components/text/nautilus-text-view.c:326
+#: components/text/nautilus-text-view.c:334
 #, c-format
 msgid "Sorry, but %s is too large for Nautilus to load all of it."
 msgstr "îÁÖÁÌØ ÆÁÊÌ %s ÎÁÄÔÏ ×ÅÌÉËÉÊ ÄÌÑ ÚÁ×ÁÎÔÁÖÅÎÎÑ × îÁÕÔ¦ÌÕÓ."
 
-#: components/text/nautilus-text-view.c:329
+#: components/text/nautilus-text-view.c:337
 msgid "File too large"
 msgstr "æÁÊÌ ÎÁÄÔÏ ×ÅÌÉËÉÊ"
 
 #: components/text/nautilus-text-view-ui.xml.h:1
+#, fuzzy
+msgid "F_onts"
+msgstr "ûÒÉÆÔÉ"
+
+#: components/text/nautilus-text-view-ui.xml.h:2
 msgid "Lucida"
 msgstr "ìÀæÄÁ"
 
-#: components/text/nautilus-text-view-ui.xml.h:2
+#: components/text/nautilus-text-view-ui.xml.h:3
 msgid "Use the Courier Font"
 msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÛÒÉÆÔ ëÕÒ'¤Ò"
 
-#: components/text/nautilus-text-view-ui.xml.h:3
+#: components/text/nautilus-text-view-ui.xml.h:4
+#, fuzzy
+msgid "Use the Fixed Font"
+msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÛÒÉÆÔ ôÁÊÍÓ"
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+#, fuzzy
+msgid "Use the GTK System Font"
+msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÛÒÉÆÔ ôÁÊÍÓ"
+
+#: components/text/nautilus-text-view-ui.xml.h:6
 msgid "Use the Helvetica Font"
 msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÛÒÉÆÔ çÅÌ×ÅÔÉËÁ"
 
-#: components/text/nautilus-text-view-ui.xml.h:4
+#: components/text/nautilus-text-view-ui.xml.h:7
 msgid "Use the Lucida Font"
 msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÛÒÉÆÔ ìÀæÄÁ"
 
-#: components/text/nautilus-text-view-ui.xml.h:5
+#: components/text/nautilus-text-view-ui.xml.h:8
 msgid "Use the Times Font"
 msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÛÒÉÆÔ ôÁÊÍÓ"
 
-#: components/text/nautilus-text-view-ui.xml.h:6
+#: components/text/nautilus-text-view-ui.xml.h:9
 msgid "_Courier"
 msgstr "ëÕÒ'¤Ò"
 
-#: components/text/nautilus-text-view-ui.xml.h:7
-msgid "_Fonts"
-msgstr "ûÒÉÆÔÉ"
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "æÁÊÌ"
 
-#: components/text/nautilus-text-view-ui.xml.h:8
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
 msgid "_Helvetica"
 msgstr "çÅÌ×ÅÔÉËÁ"
 
-#: components/text/nautilus-text-view-ui.xml.h:9
+#: components/text/nautilus-text-view-ui.xml.h:13
 msgid "_Times"
 msgstr "ôÁÊÍÓ"
 
@@ -3698,7 +3713,7 @@ msgid "Nautilus Tree view"
 msgstr "ðÅÒÅÇÌÑÄ ÄÅÒÅ×Á îÁÕÔ¦ÌÕÓÁ"
 
 #: components/tree/Nautilus_View_tree.oaf.in.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:638
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
 msgid "Tree"
 msgstr "äÅÒÅ×Ï"
 
@@ -3710,7 +3725,7 @@ msgstr "ðÒÉ×ÉÄ"
 msgid "Azul"
 msgstr ""
 
-#: data/browser.xml.h:3 libnautilus-extensions/nautilus-font-picker.c:105
+#: data/browser.xml.h:3
 msgid "Black"
 msgstr "þÏÒÎÉÊ"
 
@@ -3822,7 +3837,7 @@ msgstr "ðÅÒÅÔÑÇΦÔØ ÅÍÂÌÅÍÕ ÎÁ ÏÂ'¤ËÔ, ÝÏ ÄÏÄÁÔÉ §§ ÄÏ ÏÂ'¤ËÔÕ"
 msgid "Eclipse"
 msgstr "úÁÔÅÍÎÅÎÎÑ"
 
-#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1607
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
 msgid "Emblems"
 msgstr "åÍÂÌÅÍÉ"
 
@@ -3919,7 +3934,7 @@ msgid "Numbers"
 msgstr "þÉÓÌÁ"
 
 #: data/browser.xml.h:55
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "OK"
 msgstr "çÁÒÁÚÄ"
 
@@ -4040,11 +4055,11 @@ msgid "The Gimp"
 msgstr "GIMP"
 
 #: data/linksets/desktop.xml.h:1
-#: libnautilus-extensions/nautilus-global-preferences.c:554
+#: libnautilus-extensions/nautilus-global-preferences.c:642
 msgid "Desktop"
 msgstr "òÏÂÏÞÉÊ ÓÔ¦Ì"
 
-#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4796
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
 #: libnautilus-extensions/nautilus-trash-directory.c:301
 #: src/file-manager/fm-desktop-icon-view.c:67
 msgid "Trash"
@@ -4079,7 +4094,7 @@ msgid "Google"
 msgstr "Google"
 
 #: data/linksets/search_engines.xml.h:3
-#: libnautilus-extensions/nautilus-global-preferences.c:808
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
 msgid "Search Engines"
 msgstr "ðÏÛÕËÏצ ÍÁÛÉÎÉ"
 
@@ -4333,101 +4348,101 @@ msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:2261
+#: libnautilus-extensions/nautilus-file.c:2277
 msgid "today at %-I:%M %p"
 msgstr "ÓØÏÇÏÄΦ × %-I:%M %p"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2266
+#: libnautilus-extensions/nautilus-file.c:2282
 msgid "yesterday at %-I:%M %p"
 msgstr "×ÞÏÒÁ × %-I:%M %p"
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2271
+#: libnautilus-extensions/nautilus-file.c:2287
 msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%A %-d/%-m/%y × %-I:%M %p"
 
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:2276
+#: libnautilus-extensions/nautilus-file.c:2292
 msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%-d/%-m/%y × %-I:%M %p"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 ÅÌÅÍÅÎÔ¦×"
 
-#: libnautilus-extensions/nautilus-file.c:3407
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 folders"
 msgstr "0 ÔÅË"
 
-#: libnautilus-extensions/nautilus-file.c:3408
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 ÆÁÊ̦×"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 ÅÌÅÍÅÎÔ"
 
-#: libnautilus-extensions/nautilus-file.c:3412
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 folder"
 msgstr "1 ÔÅËÁ"
 
-#: libnautilus-extensions/nautilus-file.c:3413
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 ÆÁÊÌ"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "ÅÌÅÍÅÎÔ¦×: %u"
 
-#: libnautilus-extensions/nautilus-file.c:3416
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u folders"
 msgstr "ÔÅË: %u"
 
-#: libnautilus-extensions/nautilus-file.c:3417
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "ÆÁÊ̦×: %u"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3720
-#: libnautilus-extensions/nautilus-file.c:3735
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
 msgid "? items"
 msgstr "? ÅÌÅÍÅÎÔ¦×"
 
 #. This means no contents at all were readable
-#: libnautilus-extensions/nautilus-file.c:3726
+#: libnautilus-extensions/nautilus-file.c:3746
 msgid "? bytes"
 msgstr "? ÂÁÊÔ¦×"
 
-#: libnautilus-extensions/nautilus-file.c:3739
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "ÎÅצÄÏÍÉÊ ÔÉÐ"
 
-#: libnautilus-extensions/nautilus-file.c:3741
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "ÎÅצÄÏÍÉÊ ÔÉÐ MIME"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3746
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "ÎÅצÄÏÍÏ"
 
-#: libnautilus-extensions/nautilus-file.c:3782
+#: libnautilus-extensions/nautilus-file.c:3802
 msgid "program"
 msgstr "ÐÒÏÇÒÁÍÁ"
 
-#: libnautilus-extensions/nautilus-file.c:3794
+#: libnautilus-extensions/nautilus-file.c:3814
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
@@ -4437,7 +4452,7 @@ msgstr ""
 "ÝÏ ÆÁÊÌ gnome-vfs.keys ÚÎÁÈÏÄÉÔØÓÑ Õ ÎÅצÒÎÏÍÕ Í¦Óæ, ÁÂÏ ÊÏÇÏ ÎÅ ÍÏÖÎÁ "
 "ÚÎÁÊÔÉ Ú ¦ÎÛÉÈ ÐÒÉÞÉÎ."
 
-#: libnautilus-extensions/nautilus-file.c:3798
+#: libnautilus-extensions/nautilus-file.c:3818
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), tell "
@@ -4446,7 +4461,7 @@ msgstr ""
 "îÅ ÚÎÁÊÄÅÎÏ ÏÐÉÓÕ ÄÌÑ ÔÉÐÕ MIME \"%s\" (ÆÁÊÌ \"%s\"), ÐÏצÄÏÍÔÅ ÐÒÏ ÃÅ ÎÁ "
 "aaron@eazel.com"
 
-#: libnautilus-extensions/nautilus-file.c:3812
+#: libnautilus-extensions/nautilus-file.c:3832
 msgid "link"
 msgstr "ÐÏÓÉÌÁÎÎÑ"
 
@@ -4454,27 +4469,27 @@ msgstr "ÐÏÓÉÌÁÎÎÑ"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1156
-#: libnautilus-extensions/nautilus-file.c:3818
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, c-format
 msgid "link to %s"
 msgstr "ÐÏÓÉÌÁÎÎÑ ÎÁ %s"
 
-#: libnautilus-extensions/nautilus-file.c:3832
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr ""
 
 #. "From" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:385
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "÷¦Ä:"
 
 #. "To" dialog label, source path gets placed next to it in the dialog
-#: libnautilus-extensions/nautilus-file-operations.c:400
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "äÏ:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:588
+#: libnautilus-extensions/nautilus-file-operations.c:622
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4485,7 +4500,7 @@ msgstr ""
 "\n"
 "\"%s\", ÝÏ ÚÎÁÈÏÄÉÔØÓÑ ÎÁ ÄÉÓËÕ ÌÉÛÅ ÄÌÑ ÚÞÉÔÕ×ÁÎÎÑ, ÎÅ ÍÏÖÅ ÂÕÔÉ ÐÅÒÅÎÅÓÅÎÏ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:599
+#: libnautilus-extensions/nautilus-file-operations.c:633
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4498,7 +4513,7 @@ msgstr ""
 "\"%s\" ÎÅ ÍÏÖÅ ÂÕÔÉ ÓÔÅÒÔÏ ÔÏÍÕ, ÝÏ ×É ÎÅ ÍÁ¤ÔÅ ÐÒÁ× ÎÁ ÍÏÄÉƦËÁæÀ "
 "ÂÁÔØ˦×ÓØËϧ ÔÅËÉ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:605
+#: libnautilus-extensions/nautilus-file-operations.c:639
 #, c-format
 msgid ""
 "Error while deleting.\n"
@@ -4509,7 +4524,7 @@ msgstr ""
 "\n"
 "\"%s\", ÝÏ ÚÎÁÈÏÄÉÔØÓÑ ÎÁ ÄÉÓËÕ ÌÉÛÅ ÄÌÑ ÚÞÉÔÕ×ÁÎÎÑ, ÎÅ ÍÏÖÅ ÂÕÔÉ ÓÔÅÒÔÏ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:636
+#: libnautilus-extensions/nautilus-file-operations.c:670
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4522,7 +4537,7 @@ msgstr ""
 "\"%s\" ÎÅ ÍÏÖÅ ÂÕÔÉ ÐÅÒÅÎÅÓÅÎÏ ÔÏÍÕ, ÝÏ ×É ÎÅ ÍÁ¤ÔÅ ÐÒÁ× ÎÁ ÍÏÄÉƦËÁæÀ "
 "ÂÁÔØ˦×ÓØËϧ ÔÅËÉ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:643
+#: libnautilus-extensions/nautilus-file-operations.c:677
 #, c-format
 msgid ""
 "Error while moving.\n"
@@ -4535,7 +4550,7 @@ msgstr ""
 "\"%s\" ÎÅ ÍÏÖÅ ÂÕÔÉ ÐÅÒÅÎÅÓÅÎÏ × ÓͦÔÎÉË ÔÏÍÕ, ÝÏ ×É ÎÅ ÍÁ¤ÔÅ ÐÒÁ× ÎÁ "
 "ÍÏÄÉƦËÁæÀ ÆÁÊÌÕ ÞÉ ÂÁÔØ˦×ÓØËϧ ÔÅËÉ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:667
+#: libnautilus-extensions/nautilus-file-operations.c:701
 #, c-format
 msgid ""
 "Error while copying.\n"
@@ -4546,7 +4561,7 @@ msgstr ""
 "\n"
 "\"%s\" ÎÅ ÍÏÖÅ ÂÕÔÉ ÓËÏЦÊÏ×ÁÎÏ ÔÏÍÕ, ÝÏ ×É ÎÅÍÁ¤ÔÅ ÐÒÁ× ÎÁ ÚÞÉÔÕ×ÁÎÎÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:689
+#: libnautilus-extensions/nautilus-file-operations.c:723
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4557,7 +4572,7 @@ msgstr ""
 "\n"
 "îÅ ×ÉÓÔÁÞÁ¤ ͦÓÃÑ ÚÁ ͦÓÃÅÍ ÐÒÉÚÎÁÞÅÎÎÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:694
+#: libnautilus-extensions/nautilus-file-operations.c:728
 #, c-format
 msgid ""
 "Error while moving to \"%s\".\n"
@@ -4568,7 +4583,7 @@ msgstr ""
 "\n"
 "îÅ ×ÉÓÔÁÞÁ¤ ͦÓÃÑ ÚÁ ͦÓÃÅÍ ÐÒÉÚÎÁÞÅÎÎÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:698
+#: libnautilus-extensions/nautilus-file-operations.c:732
 #, c-format
 msgid ""
 "Error while creating link in \"%s\".\n"
@@ -4579,7 +4594,7 @@ msgstr ""
 "\n"
 "îÅ ×ÉÓÔÁÞÁ¤ ͦÓÃÑ ÚÁ ͦÓÃÅÍ ÐÒÉÚÎÁÞÅÎÎÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:710
+#: libnautilus-extensions/nautilus-file-operations.c:744
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4590,7 +4605,7 @@ msgstr ""
 "\n"
 "÷É ÎÅ ÍÁ¤ÅÔÅ ÐÒÁ× ÎÁ ÚÁÐÉÓ Õ ÃÀ ÔÅËÕ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:714
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, c-format
 msgid ""
 "Error while copying to \"%s\".\n"
@@ -4601,7 +4616,7 @@ msgstr ""
 "\n"
 "äÉÓË ÐÒÉÚÎÁÞÅÎÎÑ ÌÉÛÅ ÄÌÑ ÚÞÉÔÕ×ÁÎÎÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:721
+#: libnautilus-extensions/nautilus-file-operations.c:755
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4612,7 +4627,7 @@ msgstr ""
 "\n"
 "÷É ÎÅ ÍÁ¤ÅÔÅ ÐÒÁ× ÎÁ ÚÁÐÉÓ Õ ÃÀ ÔÅËÕ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:725
+#: libnautilus-extensions/nautilus-file-operations.c:759
 #, c-format
 msgid ""
 "Error while moving items to \"%s\".\n"
@@ -4623,7 +4638,7 @@ msgstr ""
 "\n"
 "äÉÓË ÐÒÉÚÎÁÞÅÎÎÑ ÌÉÛÅ ÄÌÑ ÚÞÉÔÕ×ÁÎÎÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:732
+#: libnautilus-extensions/nautilus-file-operations.c:766
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4634,7 +4649,7 @@ msgstr ""
 "\n"
 "÷É ÎÅ ÍÁ¤ÔÅ ÐÒÁ× ÎÁ ÚÁÐÉÓ Õ ÃÀ ÔÅËÕ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:736
+#: libnautilus-extensions/nautilus-file-operations.c:770
 #, c-format
 msgid ""
 "Error while creating links in \"%s\".\n"
@@ -4645,7 +4660,7 @@ msgstr ""
 "\n"
 "äÉÓË ÐÒÉÚÎÁÞÅÎÎÑ ÌÉÛÅ ÄÌÑ ÚÞÉÔÕ×ÁÎÎÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:765
+#: libnautilus-extensions/nautilus-file-operations.c:799
 #, c-format
 msgid ""
 "Error \"%s\" while copying \"%s\".\n"
@@ -4656,7 +4671,7 @@ msgstr ""
 "\n"
 "âÁÖÁ¤ÔÅ ÐÒÏÄÏ×ÖÉÔÉ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:769
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, c-format
 msgid ""
 "Error \"%s\" while moving \"%s\".\n"
@@ -4667,7 +4682,7 @@ msgstr ""
 "\n"
 "âÁÖÁ¤ÔÅ ÐÒÏÄÏ×ÖÉÔÉ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:773
+#: libnautilus-extensions/nautilus-file-operations.c:807
 #, c-format
 msgid ""
 "Error \"%s\" while creating a link to \"%s\".\n"
@@ -4678,7 +4693,7 @@ msgstr ""
 "\n"
 "âÁÖÁ¤ÔÅ ÐÒÏÄÏ×ÖÉÔÉ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:779
+#: libnautilus-extensions/nautilus-file-operations.c:813
 #, c-format
 msgid ""
 "Error \"%s\" while deleting \"%s\".\n"
@@ -4689,7 +4704,7 @@ msgstr ""
 "\n"
 "âÁÖÁ¤ÔÅ ÐÒÏÄÏ×ÖÉÔÉ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:794
+#: libnautilus-extensions/nautilus-file-operations.c:828
 #, c-format
 msgid ""
 "Error \"%s\" while copying.\n"
@@ -4700,7 +4715,7 @@ msgstr ""
 "\n"
 "âÁÖÁ¤ÔÅ ÐÒÏÄÏ×ÖÉÔÉ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:798
+#: libnautilus-extensions/nautilus-file-operations.c:832
 #, c-format
 msgid ""
 "Error \"%s\" while moving.\n"
@@ -4711,7 +4726,7 @@ msgstr ""
 "\n"
 "âÁÖÁ¤ÔÅ ÐÒÏÄÏ×ÖÉÔÉ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:802
+#: libnautilus-extensions/nautilus-file-operations.c:836
 #, c-format
 msgid ""
 "Error \"%s\" while linking.\n"
@@ -4722,7 +4737,7 @@ msgstr ""
 "\n"
 "âÁÖÁ¤ÔÅ ÐÒÏÄÏ×ÖÉÔÉ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:808
+#: libnautilus-extensions/nautilus-file-operations.c:842
 #, c-format
 msgid ""
 "Error \"%s\" while deleting.\n"
@@ -4733,34 +4748,34 @@ msgstr ""
 "\n"
 "âÁÖÁ¤ÔÅ ÐÒÏÄÏ×ÖÉÔÉ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:924
+#: libnautilus-extensions/nautilus-file-operations.c:958
 msgid "Error while copying."
 msgstr "ðÏÍÉÌËÁ Ð¦Ä ÞÁÓ ËÏЦÀ×ÁÎÎÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:927
+#: libnautilus-extensions/nautilus-file-operations.c:961
 msgid "Error while moving."
 msgstr "ðÏÍÉÌËÁ Ð¦Ä ÞÁÓ ÐÅÒÅÎÏÓÕ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:930
+#: libnautilus-extensions/nautilus-file-operations.c:964
 msgid "Error while linking."
 msgstr "ðÏÍÉÌËÁ Ð¦Ä ÞÁÓ ÓÔ×ÏÒÅÎÎÑ ÐÏÓÉÌÁÎÎÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:935
+#: libnautilus-extensions/nautilus-file-operations.c:969
 msgid "Error while deleting."
 msgstr "ðÏÍÉÌËÁ Ð¦Ä ÞÁÓ ÓÔÉÒÁÎÎÑ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:960
-#: libnautilus-extensions/nautilus-file-operations.c:979
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Skip"
 msgstr "ðÒÏÐÕÓÔÉÔÉ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "ðÏ×ÔÏÒÉÔÉ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1057
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
 "\"%s\" could not be moved to the new location, because its name is already "
@@ -4769,7 +4784,7 @@ msgid ""
 "If you still want to move \"%s\", rename it and try again."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1063
+#: libnautilus-extensions/nautilus-file-operations.c:1094
 #, c-format
 msgid ""
 "\"%s\" could not be copied to the new location, because its name is already "
@@ -4778,11 +4793,11 @@ msgid ""
 "If you still want to copy \"%s\", rename it and try again."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1071
+#: libnautilus-extensions/nautilus-file-operations.c:1102
 msgid "Unable to replace file."
 msgstr "îÅÍÏÖÌÉ×Ï ÚÁͦÎÉÔÉ ÆÁÊÌ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1081
+#: libnautilus-extensions/nautilus-file-operations.c:1112
 #, c-format
 msgid ""
 "File \"%s\" already exists.\n"
@@ -4793,22 +4808,22 @@ msgstr ""
 "\n"
 "âÁÖÁ¤ÔÅ ÚÁͦÎÉÔÉ ÊÏÇÏ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1092
-#: libnautilus-extensions/nautilus-file-operations.c:1106
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
 msgid "Conflict while copying"
 msgstr "ëÏÎÆ̦ËÔ Ð¦Ä ÞÁÓ ËÏЦÀ×ÁÎÎÑ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1093
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "úÁͦÎÉÔÉ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "úÁͦÎÉÔÉ ×ÓÅ"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1160
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "¦ÎÛÅ ÐÏÓÉÌÁÎÎÑ ÎÁ %s"
@@ -4817,25 +4832,25 @@ msgstr "¦ÎÛÅ ÐÏÓÉÌÁÎÎÑ ÎÁ %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d ÐÏÓÉÌÁÎÎÑ ÎÁ %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1180
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d ÐÏÓÉÌÁÎÎÑ ÎÁ %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1184
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d ÐÏÓÉÌÁÎÎÑ ÎÁ %s"
 
 #. appended to new link file
-#: libnautilus-extensions/nautilus-file-operations.c:1188
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d ÐÏÓÉÌÁÎÎÑ ÎÁ %s"
@@ -4845,235 +4860,227 @@ msgstr "%d ÐÏÓÉÌÁÎÎÑ ÎÁ %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1208
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (copy)"
 msgstr " (ËÏЦÑ)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1210
-#: libnautilus-extensions/nautilus-file-operations.c:2242
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
 msgid " (another copy)"
 msgstr " (¦ÎÛÁ ËÏЦÑ)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1212
+#: libnautilus-extensions/nautilus-file-operations.c:1243
 msgid "st copy)"
 msgstr " ËÏЦÑ)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1214
+#: libnautilus-extensions/nautilus-file-operations.c:1245
 msgid "nd copy)"
 msgstr " ËÏЦÑ)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1216
+#: libnautilus-extensions/nautilus-file-operations.c:1247
 msgid "rd copy)"
 msgstr " ËÏЦÑ)"
 
 #. localizers: tag used to detect the xxth copy of a file
-#: libnautilus-extensions/nautilus-file-operations.c:1218
+#: libnautilus-extensions/nautilus-file-operations.c:1249
 msgid "th copy)"
 msgstr " ËÏЦÑ)"
 
 #. localizers: appended to first file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1228
+#: libnautilus-extensions/nautilus-file-operations.c:1259
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (ËÏЦÑ)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1230
+#: libnautilus-extensions/nautilus-file-operations.c:1261
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (¦ÎÛÁ ËÏЦÑ)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1232
+#: libnautilus-extensions/nautilus-file-operations.c:1263
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d ËÏЦÑ)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1234
+#: libnautilus-extensions/nautilus-file-operations.c:1265
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d ËÏЦÑ)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1236
+#: libnautilus-extensions/nautilus-file-operations.c:1267
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d ËÏЦÑ)%s"
 
 #. localizers: appended to xxth file copy
-#: libnautilus-extensions/nautilus-file-operations.c:1238
+#: libnautilus-extensions/nautilus-file-operations.c:1269
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d ËÏЦÑ)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1322
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:1330
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1487
-#: libnautilus-extensions/nautilus-file-operations.c:2072
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "îÅצÄÏÍÅ ÚÎÁÞÅÎÎÑ GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1802
+#: libnautilus-extensions/nautilus-file-operations.c:1822
 msgid "Moving files to the Trash"
 msgstr "ðÅÒÅÎÅÓÅÎÎÑ ÆÁÊÌ¦× Õ ÓͦÔÎÉË"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1804
+#: libnautilus-extensions/nautilus-file-operations.c:1824
 msgid "Files thrown out:"
 msgstr "æÁÊÌ¦× ×ÉËÉÎÕÔÏ:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-extensions/nautilus-file-operations.c:1806
-#: libnautilus-extensions/nautilus-file-operations.c:1821
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "ðÅÒÅÎÅÓÅÎÎÑ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1807
+#: libnautilus-extensions/nautilus-file-operations.c:1827
 msgid "Preparing to Move to Trash..."
 msgstr "ð¦ÄÇÏÔÏ×ËÁ ÄÏ ÐÅÒÅÎÅÓÅÎÎÑ Õ ÓͦÔÎÉË..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1817
+#: libnautilus-extensions/nautilus-file-operations.c:1837
 msgid "Moving files"
 msgstr "ðÅÒÅÎÅÓÅÎÎÑ ÆÁÊ̦×"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1819
+#: libnautilus-extensions/nautilus-file-operations.c:1839
 msgid "Files moved:"
 msgstr "ðÅÒÅÎÅÓÅÎÏ ÆÁÊÌÉ:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1822
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "ð¦ÄÇÏÔÏ×ËÁ ÄÏ ÐÅÒÅÎÅÓÅÎÎÑ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1823
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "úÁ×ÅÒÛÅÎÎÑ ÐÅÒÅÎÅÓÅÎÎÑ..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1835
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 msgid "Creating links to files"
 msgstr "óÔ×ÏÒÅÎÎÑ ÐÏÓÉÌÁÎØ ÎÁ ÆÁÊÌÉ"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1837
+#: libnautilus-extensions/nautilus-file-operations.c:1857
 msgid "Files linked:"
 msgstr "óÔ×ÏÒÅÎÎÏ ÐÏÓÉÌÁÐÎÎÑ ÎÁ ÆÁÊÌÉ:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-extensions/nautilus-file-operations.c:1839
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 msgid "Linking"
 msgstr "óÔ×ÏÒÅÎÎÑ ÐÏÓÉÌÁÎØ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1840
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 msgid "Preparing to Create Links..."
 msgstr "ð¦ÄÇÏÔÏ×ËÁ ÄÏ ÓÔ×ÏÒÅÎÎÑ ÐÏÓÉÌÁÎØ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1841
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 msgid "Finishing Creating Links..."
 msgstr "úÁ×ÅÒÛÅÎÎÑ ÓÔ×ÏÒÅÎÎÑ ÐÏÓÉÌÁÎØ..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:1848
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "ëÏЦÀ×ÁÎÎÑ ÆÁÊ̦×"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:1850
+#: libnautilus-extensions/nautilus-file-operations.c:1870
 msgid "Files copied:"
 msgstr "óËÏЦÊÏ×ÁÎÏ ÆÁÊÌÉ:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-extensions/nautilus-file-operations.c:1852
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "ëÏЦÀ×ÁÎÎÑ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1853
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "ð¦ÄÇÏÔÏ×ËÁ ÄÏ ËÏЦÀ×ÁÎÎÑ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1871
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "÷É ÎÅ ÍÏÖÅÔÅ ËÏЦÀ×ÁÔÉ Õ ÓͦÔÎÉË"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1872
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 msgid "Can't Copy to Trash"
 msgstr "îÅÍÏÖÌÉ×Ï ËÏЦÀ×ÁÔÉ Õ ÓͦÔÎÉË"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1899
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr "óͦÔÎÉË ÍÁ¤ ÌÉÛÁÔÉÓÑ ÎÁ ÒÏÂÏÞÏÍÕ ÓÔÏ̦."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1900
+#: libnautilus-extensions/nautilus-file-operations.c:1920
 msgid "You cannot move this trash folder."
 msgstr "÷É ÎÅ ÍÏÖÅÔÅ ÐÅÒÅÎÏÓÉÔÉ ÃÅÊ ÓͦÔÎÉË."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1902
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "÷É ÎÅ ÍÏÖÎÔÎ ËÏЦÀ×ÁÔÉ ÓͦÔÎÉË."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1903
+#: libnautilus-extensions/nautilus-file-operations.c:1923
 msgid "You cannot copy this trash folder."
 msgstr "÷É ÎÅ ÍÏÖÅÔÅ ËÏЦÀ×ÁÔÉ ÃÀ ÔÅËÕ ÓͦÔÎÉËÁ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1905
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr "îÅÍÏÖÌÉ×Ï ÚͦÎÀ×ÁÔÉ ÒÏÚͦÝÅÎÎÑ ÓͦÔÎÉËÁ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1906
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 msgid "Can't Copy Trash"
 msgstr "îÅÍÏÖÌÉ×Ï ËÏЦÀ×ÁÔÉ × ÓͦÔÎÉË"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1929
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 msgid "You cannot move a folder into itself."
 msgstr "îÅÍÏÖÌÉ×Ï ÐÅÒÅÎÏÓÉÔÉ ÔÅËÕ × ÓÅÂÅ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1930
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 msgid "You cannot copy a folder into itself."
 msgstr "îÅÍÏÖÌÉ×Ï ËÏЦÀ×ÁÔÉ ÔÅËÕ × ÓÅÂÅ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1932
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 msgid "Can't Move Into Self"
 msgstr "îÅÍÏÖÌÉ×Ï ÐÅÒÅÎÏÓÉÔÉ × ÓÅÂÅ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1933
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 msgid "Can't Copy Into Self"
 msgstr "îÅÍÏÖÌÉ×Ï ËÏЦÀ×ÁÔÉ × ÓÅÂÅ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1946
-msgid "You cannot move a file onto itself."
-msgstr "îÅÍÏÖÌÉ×Ï ÐÅÒÅÎÏÓÉÔÉ ÆÁÊÌ × ÓÅÂÅ."
-
-#: libnautilus-extensions/nautilus-file-operations.c:1947
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 msgid "You cannot copy a file over itself."
 msgstr "îÅÍÏÖÌÉ×Ï ËÏЦÀ×ÁÔÉ ÆÁÊÌ × ÓÅÂÅ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1949
-msgid "Can't Move Onto Self"
-msgstr "îÅÍÏÖÉ×Ï ÐÅÒÅÎÏÓÉÔÉ × ÓÅÂÅ"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1950
+#: libnautilus-extensions/nautilus-file-operations.c:1966
 msgid "Can't Copy Over Self"
 msgstr "îÅÍÏÖÌÉ×Ï ËÏЦÀ×ÁÔÉ × ÓÅÂÅ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2001
+#: libnautilus-extensions/nautilus-file-operations.c:2017
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5083,7 +5090,7 @@ msgstr ""
 "\n"
 "÷É ÎÅ ÍÁ¤ÔÅ ÐÒÁ× ÄÌÑ ÚÁÐÉÓÕ ÚÁ ÐÒÉÚÎÁÞÅÎÎÑÍ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2004
+#: libnautilus-extensions/nautilus-file-operations.c:2020
 msgid ""
 "Error creating new folder.\n"
 "\n"
@@ -5093,704 +5100,678 @@ msgstr ""
 "\n"
 "îÅ×ÉÓÔÁÞÁ¤ ͦÓÃÑ ÚÁ ÐÒÉÚÎÁÞÅÎÎÑÍ."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2007
+#: libnautilus-extensions/nautilus-file-operations.c:2023
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "ðÏÍÉÌËÁ ÓÔ×ÏÒÅÎÎÑ ÎÏ×ϧ ÔÅËÉ \"%s\"."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2011
+#: libnautilus-extensions/nautilus-file-operations.c:2027
 msgid "Error creating new folder"
 msgstr "ðÏÍÉÌËÁ ÓÔ×ÏÒÅÎÎÑ ÎÏ×ϧ ÔÅËÉ"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-extensions/nautilus-file-operations.c:2098
+#: libnautilus-extensions/nautilus-file-operations.c:2114
 msgid "untitled folder"
 msgstr "ÎÅÎÁÚ×ÁÎÁ ÔÅËÁ"
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2131
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "óÔÉÒÁÎÎÑ ÆÁÊ̦×"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-extensions/nautilus-file-operations.c:2133
-#: libnautilus-extensions/nautilus-file-operations.c:2168
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
 msgid "Files deleted:"
 msgstr "óÔÅÒÔÏ ÆÁÊÌÉ:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-extensions/nautilus-file-operations.c:2135
-#: libnautilus-extensions/nautilus-file-operations.c:2170
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "óÔÉÒÁÎÎÑ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2136
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "ð¦ÄÇÏÔÏ×ËÁ ÄÏ ÓÔÉÒÁÎÎÑ ÆÁÊ̦×..."
 
 #. localizers: progress dialog title
-#: libnautilus-extensions/nautilus-file-operations.c:2166
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "óÐÏÒÏÖÎÅÎÎÑ ÓͦÔÎÉËÁ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2171
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "ð¦ÄÇÏÔÏ×ËÁ ÄÏ ÓÐÏÒÏÖÎÅÎÎÑ ÓͦÔÎÉËÁ..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2202
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 msgid ""
 "Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr "÷É ÐÅÒÅËÏÎÁΦ × ÔÏÍÕ, ÝÏ ÈÏÞÅÔÅ ÐÏÓÔ¦ÊÎÏ ÓÔÉÒÁÔÉ ×ÓÅ Ú ÓͦÔÎÉËÁ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2204
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "óÔÉÒÔÉ ×ͦÓÔ ÓͦÔÎÉËÁ?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2205
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "ðÏÒÏÖÎØÏ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2243
+#: libnautilus-extensions/nautilus-file-operations.c:2259
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2243
-#: libnautilus-extensions/nautilus-file-operations.c:2253
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 msgid "foo (copy)"
 msgstr "foo (ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2244
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 msgid ".bashrc (copy)"
 msgstr ".bashrc (ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2245
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 msgid ".foo (copy).txt"
 msgstr ".foo (ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2246
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo (copy)"
 msgstr "foo foo (ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2247
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2247
-#: libnautilus-extensions/nautilus-file-operations.c:2254
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 msgid "foo (copy).txt"
 msgstr "foo (ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2248
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2248
-#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr "foo foo (ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2249
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (ËÏЦÑ).txt txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2250
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr "foo.. (ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:2251
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo... (copy)"
 msgstr "foo... (ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (copy)"
 msgstr "foo. (ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2252
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 msgid "foo. (another copy)"
 msgstr "foo. (¦ÎÛÁ ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2253
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (another copy)"
 msgstr "foo (¦ÎÛÁ ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2254
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (another copy).txt"
 msgstr "foo (¦ÎÛÁ ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2255
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 msgid "foo (3rd copy)"
 msgstr "foo (3 ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2256
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 msgid "foo (3rd copy).txt"
 msgstr "foo (3 ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (¦ÎÛÉ ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2257
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3 ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
+#: libnautilus-extensions/nautilus-file-operations.c:2274
 #, fuzzy
 msgid "foo (13th copy)"
 msgstr "foo (21 ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2258
+#: libnautilus-extensions/nautilus-file-operations.c:2274
 #, fuzzy
 msgid "foo (14th copy)"
 msgstr "foo (24 ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2275
 #, fuzzy
 msgid "foo (13th copy).txt"
 msgstr "foo (21 ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2275
 #, fuzzy
 msgid "foo (14th copy).txt"
 msgstr "foo (24 ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2260
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 msgid "foo (21st copy)"
 msgstr "foo (21 ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2260
-#: libnautilus-extensions/nautilus-file-operations.c:2262
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 msgid "foo (22nd copy)"
 msgstr "foo (22 ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2261
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 msgid "foo (21st copy).txt"
 msgstr "foo (21 ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2261
-#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 msgid "foo (22nd copy).txt"
 msgstr "foo (22 ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2262
-#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 msgid "foo (23rd copy)"
 msgstr "foo (23 ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2263
-#: libnautilus-extensions/nautilus-file-operations.c:2265
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 msgid "foo (23rd copy).txt"
 msgstr "foo (23 ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2264
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (24th copy)"
 msgstr "foo (24 ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2265
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (24th copy).txt"
 msgstr "foo (24 ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2266
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 msgid "foo (25th copy)"
 msgstr "foo (25 ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2267
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 msgid "foo (25th copy).txt"
 msgstr "foo (25 ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24 ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2268
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25 ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24 ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25 ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000 ËÏЦÑ).txt"
 
 #. FIXME bugzilla.eazel.com 7701: These are wrong.
-#: libnautilus-extensions/nautilus-file-operations.c:2273
+#: libnautilus-extensions/nautilus-file-operations.c:2289
 #, fuzzy
 msgid "foo (10th copy)"
 msgstr "foo (21 ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2273
+#: libnautilus-extensions/nautilus-file-operations.c:2289
 #, fuzzy
 msgid "foo (11st copy)"
 msgstr "foo (21 ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2274
+#: libnautilus-extensions/nautilus-file-operations.c:2290
 #, fuzzy
 msgid "foo (10th copy).txt"
 msgstr "foo (21 ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2274
+#: libnautilus-extensions/nautilus-file-operations.c:2290
 #, fuzzy
 msgid "foo (11st copy).txt"
 msgstr "foo (21 ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2291
 #, fuzzy
 msgid "foo (11th copy)"
 msgstr "foo (21 ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2275
+#: libnautilus-extensions/nautilus-file-operations.c:2291
 #, fuzzy
 msgid "foo (12nd copy)"
 msgstr "foo (22 ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 #, fuzzy
 msgid "foo (11th copy).txt"
 msgstr "foo (21 ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 #, fuzzy
 msgid "foo (12nd copy).txt"
 msgstr "foo (22 ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2293
 #, fuzzy
 msgid "foo (12th copy)"
 msgstr "foo (24 ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2293
 #, fuzzy
 msgid "foo (13rd copy)"
 msgstr "foo (3 ËÏЦÑ)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 #, fuzzy
 msgid "foo (12th copy).txt"
 msgstr "foo (24 ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 #, fuzzy
 msgid "foo (13rd copy).txt"
 msgstr "foo (3 ËÏЦÑ).txt"
 
-#: libnautilus-extensions/nautilus-file-operations-progress.c:346
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld Ú %ld"
 
-#: libnautilus-extensions/nautilus-font-picker.c:96
-#, fuzzy
-msgid "Normal"
-msgstr "ú×ÉÞÁÊÎÉÊ ÒÏÚͦÒ"
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
+msgid "GConf Error"
+msgstr "ðÏÍÉÌËÁ GConf"
 
-#: libnautilus-extensions/nautilus-font-picker.c:97
-#: libnautilus-extensions/nautilus-volume-monitor.c:516
-#: libnautilus-extensions/nautilus-volume-monitor.c:535
-msgid "Unknown"
-msgstr "îÅצÄÏÍÏ"
+#. Constants
+#: libnautilus-extensions/nautilus-global-preferences.c:50
+msgid "Nautilus Preferences"
+msgstr "ðÁÒÁÍÅÔÒÉ îÁÕÔ¦ÌÕÓÁ"
 
-#: libnautilus-extensions/nautilus-font-picker.c:103
-#, fuzzy
-msgid "Bold"
-msgstr "Borland"
+#: libnautilus-extensions/nautilus-global-preferences.c:471
+msgid "always"
+msgstr "ÚÁ×ÖÄÉ"
 
-#: libnautilus-extensions/nautilus-font-picker.c:104
-#, fuzzy
-msgid "Book"
-msgstr "ÇÁÒÁÚÄ"
+#: libnautilus-extensions/nautilus-global-preferences.c:472
+msgid "Always"
+msgstr "úÁ×ÖÄÉ"
 
-#: libnautilus-extensions/nautilus-font-picker.c:106
-msgid "Demibold"
-msgstr ""
+#: libnautilus-extensions/nautilus-global-preferences.c:475
+msgid "local only"
+msgstr "ÌÉÛÅ ÌÏËÁÌØΦ"
 
-#: libnautilus-extensions/nautilus-font-picker.c:107
-#, fuzzy
-msgid "Light"
-msgstr "óÐÉÓÏË"
+#: libnautilus-extensions/nautilus-global-preferences.c:476
+msgid "Local Files Only"
+msgstr "ìÉÛÅ ÌÏËÁÌØΦ ÆÁÊÌÉ"
 
-#: libnautilus-extensions/nautilus-font-picker.c:113
-#, fuzzy
-msgid "Italic"
-msgstr "âÁÌÔ¦ÊÓØËÉÊ"
+#: libnautilus-extensions/nautilus-global-preferences.c:479
+msgid "never"
+msgstr "ΦËÏÌÉ"
 
-#: libnautilus-extensions/nautilus-font-picker.c:114
-#, fuzzy
-msgid "Oblique"
-msgstr "óÔÁÒÁ"
+#: libnautilus-extensions/nautilus-global-preferences.c:480
+msgid "Never"
+msgstr "î¦ËÏÌÉ"
 
-#: libnautilus-extensions/nautilus-font-picker.c:115
-#, fuzzy
-msgid "Reverse Italic"
-msgstr "÷¦ÄÎÏ×ÉÔÉ"
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "úÇÌÁÄÖÅÎÁ ÇÒÁƦËÁ"
 
-#: libnautilus-extensions/nautilus-font-picker.c:116
-#, fuzzy
-msgid "Reverse Oblique"
-msgstr "ú×ÏÒÏÔÎ¦Ê ÐÏÒÑÄÏË"
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÚÇÌÁÄÖÅÎÕ (ÁÌÅ ÐÏצÌØÎÕ) ÇÒÁƦËÕ"
 
-#: libnautilus-extensions/nautilus-font-picker.c:123
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+msgid "Fonts"
+msgstr "ûÒÉÆÔÉ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
 #, fuzzy
-msgid "Condensed"
-msgstr "÷ͦÓÔ:"
+msgid "Font for Icon view:"
+msgstr "æÁÂÒÉËÁ ÄÌÑ ÐÅÒÅÇÌÑÄÕ ÍÕÚÉËÉ"
 
-#: libnautilus-extensions/nautilus-font-picker.c:124
-msgid "Semicondensed"
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-font-picker.c:226
-msgid "Font"
-msgstr "ûÒÉÆÔ"
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+#, fuzzy
+msgid "Font for List view:"
+msgstr "æÁÂÒÉËÁ ÄÌÑ ÐÅÒÅÇÌÑÄ¦× ¦ÓÔÏÒ¦§"
 
-#: libnautilus-extensions/nautilus-gconf-extensions.c:88
-msgid "GConf Error"
-msgstr "ðÏÍÉÌËÁ GConf"
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
+msgstr ""
 
-#. Note to localizers: This is the name of the font used
-#. * when no other font can be found. It must be guaranteed
-#. * to exist, * even in the most limited user environment
-#.
-#: libnautilus-extensions/nautilus-gdk-font-extensions.c:956
-msgid "fixed"
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
 msgstr ""
 
-#. localizers: These strings are part of the strftime
-#. * self-check code and must be changed to match what strtfime
-#. * yields -- usually just omitting the AM part is all that's
-#. * needed.
-#.
-#: libnautilus-extensions/nautilus-glib-extensions.c:1427
-msgid "01/01/00, 01:00 AM"
-msgstr "01/01/00, 01:00 äð"
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+msgid "Use Nautilus to draw the desktop"
+msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ îÁÕÔ¦ÌÕÓ ÄÌÑ ÍÁÌÀ×ÁÎÎÑ ÒÏÂÏÞÏÇÏ ÓÔÏÌÕ"
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1428
-msgid "1/1/00, 1:00 AM"
-msgstr "1/1/00, 1:00 äð"
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
+msgid "Opening New Windows"
+msgstr "÷¦ÄËÒÉ×ÁÎÎÑ ÎÏ×ÉÈ ×¦ËÏÎ"
 
-#: libnautilus-extensions/nautilus-glib-extensions.c:1429
-msgid " 1/ 1/00,  1:00 AM"
-msgstr " 1/ 1/00,  1:00 äð"
+#: libnautilus-extensions/nautilus-global-preferences.c:651
+msgid "Open each file or folder in a separate window"
+msgstr "÷¦ÄËÒÉ×ÁÔÉ ËÏÖÅÎ ÆÁÊÌ ÞÉ ÔÅËÕ Õ ÏËÒÅÍÏÍÕ ×¦ËΦ"
 
-#. Constants
-#: libnautilus-extensions/nautilus-global-preferences.c:50
-msgid "Nautilus Preferences"
-msgstr "ðÁÒÁÍÅÔÒÉ îÁÕÔ¦ÌÕÓÁ"
+#: libnautilus-extensions/nautilus-global-preferences.c:658
+msgid "Display toolbar in new windows"
+msgstr "ðÏËÁÚÕ×ÁÔÉ ÐÁÎÅÌØ ¦ÎÓÔÒÕÍÅÎÔ¦× Õ ÎÏ×ÉÈ ×¦ËÎÁÈ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:97
-msgid "current theme"
-msgstr "ÐÏÔÏÞÎÁ ÔÅÍÁ"
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+msgid "Display location bar in new windows"
+msgstr "ðÏËÁÚÕ×ÁÔÉ ÐÁÎÅÌØ ÒÏÚͦÝÅÎÎÑ Õ ÎÏ×ÉÈ ×¦ËÎÁÈ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:100
-msgid "Open each file or folder in a separate window"
-msgstr "÷¦ÄËÒÉ×ÁÔÉ ËÏÖÅÎ ÆÁÊÌ ÞÉ ÔÅËÕ Õ ÏËÒÅÍÏÍÕ ×¦ËΦ"
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+msgid "Display status bar in new windows"
+msgstr "ðÏËÁÚÕ×ÁÔÉ ÐÁÎÅÌØ ÓÔÁÎÕ × ÎÏ×ÉÈ ×¦ËÎÁÈ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+msgid "Display sidebar in new windows"
+msgstr "ðÏËÁÚÕ×ÁÔÉ Â¦ÞÎÕ ÐÁÎÅÌØ Õ ÎÏ×ÉÈ ×¦ËÎÁÈ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+msgid "Trash Behavior"
+msgstr "ðÏ×ÅĦÎËÁ ÓͦÔÎÉËÁ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:103
-msgid "Ask before emptying the Trash"
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+#, fuzzy
+msgid "Ask before emptying the Trash or deleting files"
 msgstr "ðÅÒÅÐÉÔÕ×ÁÔÉ ÐÅÒÅÄ ÓÐÏÒÏÖÎÅÎÎÑÍ ÓͦÔÎÉËÁ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:106
-#: libnautilus-extensions/nautilus-global-preferences.c:597
-msgid "Click Behavior"
-msgstr "ðÏ×ÅĦÎËÁ ËÌÁÃÁÎÎÑ"
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:109
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 msgid "single"
 msgstr "ÏÄÉÎÁÒÎÅ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:110
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "áËÔÉצÚÁÃ¦Ñ ÅÌÅÍÅÎÔ¦× ÏÄÉÎÁÒÎÉÍ ËÌÁÃÁÎÎÑÍ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:114
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "ÐÏÄצÊÎÅ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:115
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "áËÔÉ×ÁÃ¦Ñ ÅÌÅÍÅÎÔ¦× ÐÏÄצÊÎÉÍ ËÌÁÃÁÎÎÑÍ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:119
-#: libnautilus-extensions/nautilus-global-preferences.c:604
-msgid "Executable Text Files"
-msgstr "÷ÉËÏÎÁ×Þ¦ ÔÅËÓÔÏצ ÆÁÊÌÉ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:122
+#: libnautilus-extensions/nautilus-global-preferences.c:725
 msgid "launch"
 msgstr "ÚÁÐÕÓËÁÔÉ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:123
+#: libnautilus-extensions/nautilus-global-preferences.c:726
 msgid "Execute files when they are clicked"
 msgstr "÷ÉËÏÎÕ×ÁÔÉ ÆÁÊÌÉ Ð¦Ä ÞÁÓ ËÌÁÃÁÎÎÑ ÎÁ ÎÉÈ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:127
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 msgid "display"
 msgstr "ÐÏËÁÚÕ×ÁÔÉ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:128
+#: libnautilus-extensions/nautilus-global-preferences.c:730
 msgid "Display files when they are clicked"
 msgstr "ðÏËÁÚÕ×ÁÔÉ ÆÁÊÌÉ Ð¦Ä ÞÁÓ ËÌÁÃÁÎÎÑ ÎÁ ÎÉÈ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:132
+#: libnautilus-extensions/nautilus-global-preferences.c:733
 msgid "ask"
 msgstr "ÐÉÔÁÔÉ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:133
+#: libnautilus-extensions/nautilus-global-preferences.c:734
 msgid "Ask each time"
 msgstr "úÁÐÉÔÕ×ÁÔÉ ÝÏÒÁÚÕ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:143
-#: libnautilus-extensions/nautilus-global-preferences.c:725
-msgid "Show Text in Icons"
-msgstr "ðÏËÁÚÕ×ÁÔÉ ÔÅËÓÔ × Ð¦ËÔÏÇÒÁÍÉÈ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:146
-#: libnautilus-extensions/nautilus-global-preferences.c:732
-msgid "Show Count of Items in Folders"
-msgstr "ðÏËÁÚÕ×ÁÔÉ Ë¦ÌØ˦ÓÔØ ÅÌÅÍÅÎÔ¦× × ÔÅËÁÈ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:149
-#: libnautilus-extensions/nautilus-global-preferences.c:739
-msgid "Show Thumbnails for Image Files"
-msgstr "ðÏËÁÚÕ×ÁÔÉ Í¦Î¦ÁÔÀÒÉ ÄÌÑ ÆÁÌ¦× ÚÏÂÒÁÖÅÎØ"
-
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:152
-#: libnautilus-extensions/nautilus-global-preferences.c:755
-msgid "Make Folder Appearance Details Public"
-msgstr ""
-
-#: libnautilus-extensions/nautilus-global-preferences.c:155
-#: libnautilus-extensions/nautilus-global-preferences.c:746
-msgid "Preview Sound Files"
-msgstr "ðÏÐÅÒÅÄÎ¦Ê ÐÅÒÅÇÌÑÄ Ú×ÕËÏ×ÉÈ ÆÁÊ̦×"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Use smoother (but slower) graphics"
-msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÚÇÌÁÄÖÅÎÕ (ÁÌÅ ÐÏצÌØÎÕ) ÇÒÁƦËÕ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-#: libnautilus-extensions/nautilus-global-preferences.c:164
-msgid "Use this font family to display file names:"
-msgstr "÷ÉËÏÒÉÓÔÁÔÉ ÃÀ ­ÁÒΦÔÕÒÕ ÄÌÑ ×¦ÄÏÂÒÁÖÅÎÎÑ ÎÁÚ× ÆÁÊ̦×:"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:167
-msgid "Display toolbar in new windows"
-msgstr "ðÏËÁÚÕ×ÁÔÉ ÐÁÎÅÌØ ¦ÎÓÔÒÕÍÅÎÔ¦× Õ ÎÏ×ÉÈ ×¦ËÎÁÈ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:170
-msgid "Display location bar in new windows"
-msgstr "ðÏËÁÚÕ×ÁÔÉ ÐÁÎÅÌØ ÒÏÚͦÝÅÎÎÑ Õ ÎÏ×ÉÈ ×¦ËÎÁÈ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:173
-msgid "Display status bar in new windows"
-msgstr "ðÏËÁÚÕ×ÁÔÉ ÐÁÎÅÌØ ÓÔÁÎÕ × ÎÏ×ÉÈ ×¦ËÎÁÈ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:176
-msgid "Display sidebar in new windows"
-msgstr "ðÏËÁÚÕ×ÁÔÉ Â¦ÞÎÕ ÐÁÎÅÌØ Õ ÎÏ×ÉÈ ×¦ËÎÁÈ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:179
-msgid "Use Nautilus to draw the desktop"
-msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ îÁÕÔ¦ÌÕÓ ÄÌÑ ÍÁÌÀ×ÁÎÎÑ ÒÏÂÏÞÏÇÏ ÓÔÏÌÕ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:183
-msgid "Enable fast search (indexes your hard drive)"
-msgstr "õצÍËÎÕÔÉ Û×ÉÄËÉÊ ÐÏÛÕË (¦ÎÄÅËÓÕ¤ ×ÁÛ ÖÏÒÓÔËÉÊ ÄÉÓË)"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:186
-msgid "search type to do by default"
-msgstr "ÔÉÐÏ×ÉÊ ÔÉÐ ÐÏÛÕËÕ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:189
-msgid "search by text"
-msgstr "ÐÏÛÕË ÚÁ ÔÅËÓÔÏÍ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:190
-msgid "Search for files by file name only"
-msgstr "ðÏÛÕË ÆÁÊÌ¦× ÌÉÛÅ ÚÁ ÎÁÚ×ÏÀ ÆÁÊÌÕ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:194
-msgid "search by text and properties"
-msgstr "ÐÏÛÕË ÚÁ ÔÅËÔÓÏÍ ¦ ×ÌÁÓÔÉ×ÏÓÔÑÍÉ"
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "ðÏ×ÅĦÎËÁ ËÌÁÃÁÎÎÑ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:195
-msgid "Search for files by file name and file properties"
-msgstr "ðÏÛÕË ÆÁÊÌ¦× ÚÁ ÎÁÚ×ÏÀ ÔÁ ×ÌÁÓÔÉ×ÏÓÔÑÍÉ"
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr "÷ÉËÏÎÁ×Þ¦ ÔÅËÓÔÏצ ÆÁÊÌÉ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:199
-msgid "Search Engine Location"
-msgstr "ðÏÌÏÖÅÎÎÑ ÐÏÛÕËÏ×ϧ ÍÁÛÉÎÉ"
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+msgid "Show/Hide Options"
+msgstr "ðÏËÁÚÁÔÉ/ÐÒÉÂÒÁÔÉ ÐÁÒÁÍÅÔÒÉ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:203
+#: libnautilus-extensions/nautilus-global-preferences.c:759
 msgid "Show hidden files (file names start with \".\")"
 msgstr "ðÏËÁÚÕ×ÁÔÉ ÐÒÉÈÏ×ÁΦ ÆÁÊÌÉ (ÝÏ ÐÏÞÉÎÁÀÔØÓÑ Ú \".\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:206
+#: libnautilus-extensions/nautilus-global-preferences.c:766
 msgid "Show backup files (file names end with \"~\")"
 msgstr "ðÏËÁÚÕ×ÁÔÉ ÒÅÚÅÒ×Φ ÆÁÊÌÉ (ÝÏ ÚÁ˦ÎÞÕÀÔØÓÑ ÎÁ \"~\")"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:209
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 msgid "Show special flags in Properties window"
 msgstr "ðÏËÁÚÕ×ÁÔÉ ÏÓÏÂÌÉצ ÏÚÎÁËÉ Õ ×¦ËΦ ×ÌÁÓÔÉ×ÏÓÔÅÊ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:212
-msgid "Show only folders (no files) in the tree"
-msgstr "ðÏËÁÚÕ×ÁÔÉ ÌÉÛÅ ÔÅËÉ (ÂÅÚ ÆÁÊ̦×) Õ ÄÅÒÅצ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:215
-msgid "Can add Content"
-msgstr "íÏÖÎÁ ÄÏÄÁÔÉ ×ͦÓÔ"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+#, fuzzy
+msgid "Sorting Order"
+msgstr "ðÏÍÉÌËÁ ×ÓÔÁÎÏ×ÌÅÎÎÑ ×ÌÁÓÎÉËÁ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:218
-msgid "Don't include the built-in bookmarks in the Bookmarks menu"
-msgstr "îÅ ×ËÌÀÞÁÔÉ ×ÌÁÄÎÁΦ ÚÁËÌÁÄËÉ Õ ÍÅÎÀ ÚÁËÌÁÄÏË"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:222
-#: libnautilus-extensions/nautilus-global-preferences.c:227
-#: src/file-manager/fm-properties-window.c:1519 src/nautilus-location-bar.c:62
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
 msgid "Location:"
 msgstr "í¦ÓÃÅ:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:226
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
+msgid "HTTP Proxy Settings"
+msgstr "ðÁÒÁÍÅÔÒÉ ÐÒÏËÓ¦ HTTP"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:798
 msgid "Use HTTP Proxy"
 msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÐÒÏËÓ¦ HTTP"
 
 #. allocate the proxy label, followed by the entry
-#: libnautilus-extensions/nautilus-global-preferences.c:228
+#: libnautilus-extensions/nautilus-global-preferences.c:812
 #: src/nautilus-first-time-druid.c:683
 msgid "Port:"
 msgstr "ðÏÒÔ:"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:533
-msgid "Appearance"
-msgstr "úÏ×ΦÛÎ¦Ê ×ÉÇÌÑÄ"
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:535
-msgid "Smoother Graphics"
-msgstr "úÇÌÁÄÖÅÎÁ ÇÒÁƦËÁ"
+#: libnautilus-extensions/nautilus-global-preferences.c:841
+msgid "Built-in Bookmarks"
+msgstr "÷ÌÁÄÎÁΦ ÚÁËÌÁÄËÉ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:552
-msgid "Windows & Desktop"
-msgstr "÷¦ËÎÁ ¦ ÒÏÂÏÞÉÊ ÓÔ¦Ì"
+#: libnautilus-extensions/nautilus-global-preferences.c:843
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "îÅ ×ËÌÀÞÁÔÉ ×ÌÁÄÎÁΦ ÚÁËÌÁÄËÉ Õ ÍÅÎÀ ÚÁËÌÁÄÏË"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:560
-msgid "Opening New Windows"
-msgstr "÷¦ÄËÒÉ×ÁÎÎÑ ÎÏ×ÉÈ ×¦ËÏÎ"
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "ðÏËÁÚÕ×ÁÔÉ ÔÅËÓÔ × Ð¦ËÔÏÇÒÁÍÉÈ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:583
-msgid "Trash Behavior"
-msgstr "ðÏ×ÅĦÎËÁ ÓͦÔÎÉËÁ"
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr "ðÏËÁÚÕ×ÁÔÉ Ë¦ÌØ˦ÓÔØ ÅÌÅÍÅÎÔ¦× × ÔÅËÁÈ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:595
-msgid "Icon & List Views"
-msgstr "ð¦ËÔÏÇÒÁÍΦ ¦ ÓÐÉÓËÏצ ÐÅÒÅÇÌÑÄÉ"
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "ðÏËÁÚÕ×ÁÔÉ Í¦Î¦ÁÔÀÒÉ ÄÌÑ ÆÁÌ¦× ÚÏÂÒÁÖÅÎØ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:611
-msgid "Show/Hide Options"
-msgstr "ðÏËÁÚÁÔÉ/ÐÒÉÂÒÁÔÉ ÐÁÒÁÍÅÔÒÉ"
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:632
-msgid "Sidebar Panels"
-msgstr "â¦ÞΦ ÐÁÎÅ̦"
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr "ðÏÐÅÒÅÄÎ¦Ê ÐÅÒÅÇÌÑÄ Ú×ÕËÏ×ÉÈ ÆÁÊ̦×"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:635
-msgid "Tabs"
-msgstr "úÁËÌÁÄËÉ"
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
+msgid "Make Folder Appearance Details Public"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:684
-msgid "Navigation"
-msgstr "îÁצ­ÁæÑ"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "úÏ×ΦÛÎ¦Ê ×ÉÇÌÑÄ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:693
-msgid "HTTP Proxy Settings"
-msgstr "ðÁÒÁÍÅÔÒÉ ÐÒÏËÓ¦ HTTP"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr "÷¦ËÎÁ ¦ ÒÏÂÏÞÉÊ ÓÔ¦Ì"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:712
-msgid "Built-in Bookmarks"
-msgstr "÷ÌÁÄÎÁΦ ÚÁËÌÁÄËÉ"
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr "ð¦ËÔÏÇÒÁÍΦ ¦ ÓÐÉÓËÏצ ÐÅÒÅÇÌÑÄÉ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+msgid "Navigation"
+msgstr "îÁצ­ÁæÑ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:723
+#: libnautilus-extensions/nautilus-global-preferences.c:962
 msgid "Speed Tradeoffs"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:794
-msgid "Search"
-msgstr "ðÏÛÕË"
+#: libnautilus-extensions/nautilus-global-preferences.c:985
+msgid "search by text"
+msgstr "ÐÏÛÕË ÚÁ ÔÅËÓÔÏÍ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+msgid "Search for files by file name only"
+msgstr "ðÏÛÕË ÆÁÊÌ¦× ÌÉÛÅ ÚÁ ÎÁÚ×ÏÀ ÆÁÊÌÕ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:989
+msgid "search by text and properties"
+msgstr "ÐÏÛÕË ÚÁ ÔÅËÔÓÏÍ ¦ ×ÌÁÓÔÉ×ÏÓÔÑÍÉ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+msgid "Search for files by file name and file properties"
+msgstr "ðÏÛÕË ÆÁÊÌ¦× ÚÁ ÎÁÚ×ÏÀ ÔÁ ×ÌÁÓÔÉ×ÏÓÔÑÍÉ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:997
 msgid "Search Complexity Options"
 msgstr "ðÁÒÁÍÅÔÒÉ ÓËÌÁÄÎÏÓÔ¦ ÐÏÛÕËÕ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:802
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "ÔÉÐÏ×ÉÊ ÔÉÐ ÐÏÛÕËÕ"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 msgid "Fast Search"
 msgstr "û×ÉÄËÉÊ ÐÏÛÕË"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:846
-msgid "Fonts"
-msgstr "ûÒÉÆÔÉ"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:1026
-#, c-format
-msgid "Display %s tab in sidebar"
-msgstr "ðÏËÁÚÁÔÉ ÚÁËÌÁÄËÕ %s Õ Â¦ÞÎ¦Ê ÐÁÎÅ̦"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
+msgstr "õצÍËÎÕÔÉ Û×ÉÄËÉÊ ÐÏÛÕË (¦ÎÄÅËÓÕ¤ ×ÁÛ ÖÏÒÓÔËÉÊ ÄÉÓË)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1073
-msgid "always"
-msgstr "ÚÁ×ÖÄÉ"
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
+msgid "Search Engine Location"
+msgstr "ðÏÌÏÖÅÎÎÑ ÐÏÛÕËÏ×ϧ ÍÁÛÉÎÉ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1074
-msgid "Always"
-msgstr "úÁ×ÖÄÉ"
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "ðÏÛÕË"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1077
-msgid "local only"
-msgstr "ÌÉÛÅ ÌÏËÁÌØΦ"
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr "ðÏËÁÚÕ×ÁÔÉ ÌÉÛÅ ÔÅËÉ (ÂÅÚ ÆÁÊ̦×) Õ ÄÅÒÅצ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1078
-msgid "Local Files Only"
-msgstr "ìÉÛÅ ÌÏËÁÌØΦ ÆÁÊÌÉ"
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, c-format
+msgid "Display %s tab in sidebar"
+msgstr "ðÏËÁÚÁÔÉ ÚÁËÌÁÄËÕ %s Õ Â¦ÞÎ¦Ê ÐÁÎÅ̦"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1081
-msgid "never"
-msgstr "ΦËÏÌÉ"
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
+msgid "Sidebar Panels"
+msgstr "â¦ÞΦ ÐÁÎÅ̦"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1082
-msgid "Never"
-msgstr "î¦ËÏÌÉ"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr "úÁËÌÁÄËÉ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1145
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "currently can't be performed because the program crond, which does nightly "
@@ -5798,13 +5779,13 @@ msgid ""
 "done, turn crond on."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1152
-#: libnautilus-extensions/nautilus-global-preferences.c:1170
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
 msgid "Files May Not Be Indexed"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1153
-#: libnautilus-extensions/nautilus-global-preferences.c:1171
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
 msgid ""
 "If you are running Linux, you can log in as root and type these commands to "
 "start cron:\n"
@@ -5813,7 +5794,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:1162
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing "
 "may not be performed because the program crond, which does nightly tasks on "
@@ -5822,15 +5803,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-gnome-extensions.c:640
-msgid "No image was selected.  You must click on an image to select it."
-msgstr ""
-"îÅ ×ÉÂÒÁÎÏ ÚÏÂÒÁÖÅÎÎÑ.  ðÏÔÒ¦ÂÎÏ ËÌÁÃÎÕÔÉ ÎÁ ÚÏÂÒÁÖÅÎΦ, ÝÏ ×ÉÂÒÁÔÉ ÊÏÇÏ."
-
-#: libnautilus-extensions/nautilus-gnome-extensions.c:641
-msgid "No selection made"
-msgstr "÷ÉÂÏÒÕ ÎÅ ÚÒÏÂÌÅÎÏ"
-
 #. The list of characters that cause line breaks can be localized.
 #: libnautilus-extensions/nautilus-icon-canvas-item.c:70
 msgid " -_,;.?/&"
@@ -5880,56 +5852,40 @@ msgstr "ðÅÒÅÍÉËÎÕÔÉÓØ ÎÁ ÒÕÞÎÅ ÒÏÚͦÝÅÎÎÑ?"
 msgid "Switch"
 msgstr "ðÅÒÅÍÉËÎÕÔÉ"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1550
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1551
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 msgid "Undo Typing"
 msgstr "÷¦ÄËÁÔ ÄÒÕËÕ"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1552
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "÷¦ÄÎÏ×ÉÔÉ ÓÔÁÒÕ ÎÁÚ×Õ"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1553
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 msgid "Redo Typing"
 msgstr "÷¦ÄÎÏ×ÌÅÎÎÑ ÄÒÕËÕ"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1554
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "÷¦ÄÎÏ×ÉÔÉ ÚͦÎÅÎÕ ÎÁÚ×Õ"
 
-#: libnautilus-extensions/nautilus-password-dialog.c:306
-msgid "Remember this password"
-msgstr "úÁÐÁÍ'ÑÔÁÔÉ ÃÅ ÐÁÒÏÌØ"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:483
-msgid "times"
-msgstr "ÔÁÊÍÓ"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:484
-msgid "courier"
-msgstr "ËÕÒ'¤Ò"
-
-#: libnautilus-extensions/nautilus-preferences-item.c:485
-msgid "lucida"
-msgstr "ÌÀæÄÁ"
-
-#: libnautilus-extensions/nautilus-preferences.c:77
+#: libnautilus-extensions/nautilus-preferences.c:92
 msgid "Beginner"
 msgstr "ðÏÞÁÔËÏ×ÉÊ"
 
-#: libnautilus-extensions/nautilus-preferences.c:78
+#: libnautilus-extensions/nautilus-preferences.c:93
 msgid "Intermediate"
 msgstr "ðÒÏͦÖËÏ×ÉÊ"
 
-#: libnautilus-extensions/nautilus-preferences.c:79
+#: libnautilus-extensions/nautilus-preferences.c:94
 msgid "Advanced"
 msgstr "òÏÚ×ÉÎÕÔÉÊ"
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:202
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "âÌÏË ÕÓÔÁÎÏ×ÏË"
 
@@ -6028,7 +5984,7 @@ msgid "Don't include in the menu for \"%s\" items"
 msgstr "îÅ ×ËÌÀÞÁÔÉ × ÍÅÎÀ ÄÌÑ ÅÌÅÍÅÎÔ¦× \"%s\""
 
 #: libnautilus-extensions/nautilus-program-chooser.c:1209
-#: src/file-manager/fm-list-view.c:2123
+#: src/file-manager/fm-list-view.c:2182
 #: src/file-manager/fm-search-list-view.c:545
 #: src/nautilus-bookmarks-window.c:164
 msgid "Name"
@@ -6387,25 +6343,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "åÌÅÍÅÎÔÉ, ÝÏ Í¦ÓÔÑÔØ \"medusa\" Õ ÎÁÚ×ÁÈ ¦ ¤ ÔÅËÁÍÉ"
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:550
-#: libnautilus-extensions/nautilus-stock-dialogs.c:603
-msgid "Details"
-msgstr "ðÏÄÒÏÂÉæ"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:568
-msgid "Warning"
-msgstr "ðÏÐÅÒÅÄÖÅÎÎÑ"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:579
-#: libnautilus-extensions/nautilus-stock-dialogs.c:601
-msgid "Error"
-msgstr "ðÏÍÉÌËÁ"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:634
-#: libnautilus-extensions/nautilus-stock-dialogs.c:662
-msgid "Question"
-msgstr "úÁÐÉÔÁÎÎÑ"
-
 #: libnautilus-extensions/nautilus-trash-directory.c:73
 msgid "Searching Disks"
 msgstr "äÉÓËÉ ÐÏÛÕËÕ"
@@ -6414,7 +6351,7 @@ msgstr "äÉÓËÉ ÐÏÛÕËÕ"
 msgid "Nautilus is searching your disks for trash folders."
 msgstr "îÁÕÔ¦ÌÕÓ ÛÕËÁ¤ ÔÅËÉ ÓͦÔÎÉË¦× ÎÁ ×ÁÛÉÈ ÄÉÓËÁÈ."
 
-#: libnautilus-extensions/nautilus-trash-file.c:600
+#: libnautilus-extensions/nautilus-trash-file.c:725
 msgid "on the desktop"
 msgstr "ÎÁ ÒÏÂÏÞÏÍÕ ÓÔÏ̦"
 
@@ -6448,47 +6385,44 @@ msgstr "ðÏËÁÚÁÔÉ ÑË %s"
 msgid "%s Viewer"
 msgstr "ðÅÒÅÇÌÑÄÁÞ %s"
 
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
+msgid "Unknown"
+msgstr "îÅצÄÏÍÏ"
+
 #. Populate table with items we know localized names for.
-#: libnautilus-extensions/nautilus-volume-monitor.c:623
-#: libnautilus-extensions/nautilus-volume-monitor.c:1862
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
 msgid "Floppy"
 msgstr "äÉÓËÅÔÁ"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:624
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:625
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
 msgid "Zip Drive"
 msgstr "ðÒÉÓÔÒ¦Ê Zip"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:646
-#: libnautilus-extensions/nautilus-volume-monitor.c:668
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
 msgid "Audio CD"
 msgstr "áÕÄ¦Ï ëä"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1547
-msgid "Mount Error"
-msgstr "ðÏÍÉÌËÁ ÍÏÎÔÕ×ÁÎÎÑ"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1549
-msgid "Unmount Error"
-msgstr "ðÏÍÉÌËÁ ÄÅÍÏÎÔÕ×ÁÎÎÑ"
-
-#: libnautilus-extensions/nautilus-volume-monitor.c:1579
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
 msgid "is write-protected, mounting read-only"
 msgstr "ÚÁÈÉÝÅÎÏ ×¦Ä ÚÁÐÉÓÕ, ÍÏÎÔÕ×ÁÎÎÑ ÌÉÛÅ ÄÌÑ ÚÞÉÔÕ×ÁÎÎÑ"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1582
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
 msgid "is not a valid block device"
 msgstr "ΊצÒÎÉÊ ÂÌÏËÏ×ÉÊ ÐÒÉÓÔÒ¦Ê"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1583
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
 msgid "No medium found"
 msgstr "îÅ ÚÎÁÊÄÅÎÏ ÎÏÓ¦Ñ"
 
 #. Handle floppy case
-#: libnautilus-extensions/nautilus-volume-monitor.c:1587
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
 msgid ""
 "Nautilus was unable to mount the floppy drive. There is probably no floppy "
 "in the drive."
@@ -6497,17 +6431,17 @@ msgstr ""
 "ÄÉÓËÅÔÉ."
 
 #. All others
-#: libnautilus-extensions/nautilus-volume-monitor.c:1591
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
 msgid ""
 "Nautilus was unable to mount the volume. There is probably no media in the "
 "device."
 msgstr "îÁÕÔ¦ÌÕÓÕ ÎÅ ×ÄÁÌÏÓÑ ÚÍÏÎÔÕ×ÁÎÉ ÒÏÚĦÌ. óÈÏÖÅ, × ÐÒÉÓÔÒϧ ÎÅÍÁ¤ ÎÏÓ¦Ñ."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1594
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
 msgid "wrong fs type, bad option, bad superblock on"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1597
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
 msgid ""
 "Nautilus was unable to mount the floppy drive. The floppy is probably in a "
 "format that cannot be mounted."
@@ -6515,7 +6449,7 @@ msgstr ""
 "îÁÕÔ¦ÌÕÓÕ ÎÅ ×ÄÁÌÏÓÑ ÚÍÏÎÔÕ×ÁÔÉ ÐÒÉÓÔÒ¦Ê ÄÉÓËÏ×ÏÄÁ. óÈÏÖÅ, ÄÉÓËÅÔÉ ÃØÏÇÏ "
 "ÆÏÒÍÁÔÕ ÎÅÍÏÖÌÉ×Ï ÚÍÏÎÔÕ×ÁÔÉ."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1600
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
 msgid ""
 "Nautilus was unable to mount the selected volume. The volume is probably in "
 "a format that cannot be mounted."
@@ -6523,48 +6457,56 @@ msgstr ""
 "îÁÕÔ¦ÌÕÓÕ ÎÅ ×ÄÁÌÏÓÑ ÚÍÏÎÔÕ×ÁÔÉ ×ÉÂÒÁÎÉÊ ÒÏÚĦÌ. óÈÏÖÅ, ÒÏÚĦÌÉ ÃØÏÇÏ "
 "ÆÏÒÍÁÔÕ ÎÅÍÏÖÌÉ×Ï ÚÍÏÎÔÕ×ÁÔÉ."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1605
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
 msgid "Nautilus was unable to mount the selected floppy drive."
 msgstr "îÁÕÔ¦ÌÕÓÕ ÎÅ ×ÄÁÌÏÓÑ ÚÍÏÎÔÕ×ÁÔÉ ×ÉÂÒÁÎÉÊ ÐÒÉÓÔÒ¦Ê ÄÉÓËÏ×ÏÄÁ."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1607
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
 msgid "Nautilus was unable to mount the selected volume."
 msgstr "îÁÕÔ¦ÌÕÓÕ ÎÅ ×ÄÁÌÏÓÑ ÚÍÏÎÔÕ×ÁÔÉ ×ÉÂÒÁÎÉÊ ÒÏÚĦÌ."
 
 #. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-extensions/nautilus-volume-monitor.c:1612
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
 msgid "Nautilus was unable to unmount the selected volume."
 msgstr "îÁÕÔ¦ÌÕÓÕ ÎÅ ×ÄÁÌÏÓÑ ÄÅÍÏÎÔÕ×ÁÔÉ ×ÉÂÒÁÎÉÊ ÒÏÚĦÌ."
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1764
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr "ðÏÍÉÌËÁ ÍÏÎÔÕ×ÁÎÎÑ"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Unmount Error"
+msgstr "ðÏÍÉÌËÁ ÄÅÍÏÎÔÕ×ÁÎÎÑ"
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr "òÏÚÄ¦Ì ISO 9660"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1779
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
 msgid "Root"
 msgstr "ëÏÒ¦ÎØ"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1786
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr "òÏÚÄ¦Ì Ext2"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1801
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
 msgid "MSDOS Volume"
 msgstr "òÏÚÄ¦Ì MSDOS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1816
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
 msgid "NFS Volume"
 msgstr "òÏÚÄ¦Ì NFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1831
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
 msgid "ReiserFS Volume"
 msgstr "òÏÚÄ¦Ì ReiserFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1847
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
 msgid "UFS Volume"
 msgstr "òÏÚÄ¦Ì UFS"
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1877
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
 msgid "Unknown Volume"
 msgstr "îÅצÄÏÍÉÊ ÒÏÚĦÌ"
 
@@ -6572,31 +6514,66 @@ msgstr "îÅצÄÏÍÉÊ ÒÏÚĦÌ"
 msgid "C_lear Text"
 msgstr "óÔÅÒÔÉ ÔÅËÓÔ"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:2 src/nautilus-shell-ui.xml.h:14
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "óÔÅÒÔÉ ÔÅËÓÔ"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
+msgstr "óËÏЦÀ×ÁÔÉ ÔÅËÓÔ"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
 msgid "Copy the selected text to the clipboard"
 msgstr "óËÏЦÀ×ÁÔÉ ×ÉÂÒÁÎÉÊ ÔÅËÓÔ Õ ÂÕÆÅÒ ÏÂͦÎÕ"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:3 src/nautilus-shell-ui.xml.h:15
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "÷ÉÒ¦ÚÁÔÉ ÔÅËÓÔ"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
 msgid "Cut _Text"
 msgstr "÷ÉÒ¦ÚÁÔÉ ÔÅËÓÔ"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:16
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
 msgid "Cut the selected text to the clipboard"
 msgstr "÷ÉÒ¦ÚÁÔÉ ×ÉÂÒÁÎÉÊ ÔÅËÓÔ Õ ÂÕÆÅÒ ÏÂͦÎÕ"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:5 src/nautilus-shell-ui.xml.h:46
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
+msgstr "÷ÓÔÁ×ÉÔÉ ÔÅËÓÔ"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
 msgid "Paste the text stored on the clipboard"
 msgstr "÷ÓÔÁ×ÉÔÉ ÔÅËÓÔ Ú ÂÕÆÅÒÕ ÏÂͦÎÕ"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:6
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "÷ÉÄÁÌÉÔÉ ×ÉÂÒÁÎÉÊ ÔÅËÓÔ ÂÅÚ ÐÏͦÝÅÎÎÑ ÊÏÇÏ × ÂÕÆÅÒ ÏÂͦÎÕ"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:7 src/nautilus-shell-ui.xml.h:80
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
+#, fuzzy
+msgid "Select All"
+msgstr "÷ÉÂÒÁÔÉ ×ÓÅ"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+#, fuzzy
+msgid "Select _All"
+msgstr "÷ÉÂÒÁÔÉ ×ÓÅ"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "ðÏËÁÚÁÔÉ ×Ó¦ ×ÌÁÓÔÉ×ÏÓÔ¦ Õ ÃØÏÍÕ ×¦ËΦ"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
 msgid "_Copy Text"
 msgstr "óËÏЦÀ×ÁÔÉ ÔÅËÓÔ"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:93
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
 msgid "_Paste Text"
 msgstr "÷ÓÔÁ×ÉÔÉ ÔÅËÓÔ"
 
@@ -6605,7 +6582,7 @@ msgstr "÷ÓÔÁ×ÉÔÉ ÔÅËÓÔ"
 #. * to change it when we upgrade to GTK 2.0.
 #.
 #: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
-#: src/nautilus-window-menus.c:573
+#: src/nautilus-window-menus.c:610
 msgid "Nautilus"
 msgstr "îÁÕÔ¦ÌÕÓ"
 
@@ -6621,80 +6598,111 @@ msgstr "æÁÊÌÏ×ÉÊ ÍÅÎÅÄÖÅÒ ¦ ÇÒÁƦÞÎÁ ÏÂÏÌÏÎËÁ îÁÕÔ¦ÌÕÓÁ"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: src/file-manager/fm-desktop-icon-view.c:786
+#: src/file-manager/fm-desktop-icon-view.c:886
 #, c-format
 msgid "%s's Home"
 msgstr "äÏͦ×ËÁ ËÏÒÉÓÔÕ×ÁÞÁ %s"
 
-#: src/file-manager/fm-desktop-icon-view.c:1072
+#: src/file-manager/fm-desktop-icon-view.c:1175
 msgid "Empty Trash..."
 msgstr "óÐÏÒÏÖÎÉÔÉ ÓͦÔÎÉË..."
 
-#: src/file-manager/fm-desktop-icon-view.c:1074
+#: src/file-manager/fm-desktop-icon-view.c:1177
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Empty Trash"
 msgstr "óÐÏÒÏÖÎÉÔÉ ÓͦÔÎÉË"
 
-#: src/file-manager/fm-desktop-icon-view.c:1094
+#: src/file-manager/fm-desktop-icon-view.c:1197
 msgid "Unmount Volume"
 msgstr "äÅÍÏÎÔÕ×ÁÔÉ ÒÏÚĦÌ"
 
-#: src/file-manager/fm-directory-view.c:474
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr ""
 "ãÅ ÐÒÉÚ×ÅÄÅ ÄÏ ×¦ÄËÒÉ×ÁÎÎÑ %d ÏËÒÅÍÉÈ ×¦ËÏÎ. ÷É ÐÅÒÅËÏÎÁΦ × ÔÏÍÕ, ÝÏ ÈÏÞÅÔÅ "
 "ÃÅ ×ÉËÏÎÁÔÉ?"
 
-#: src/file-manager/fm-directory-view.c:476
+#: src/file-manager/fm-directory-view.c:442
 #, c-format
 msgid "Open %d Windows?"
 msgstr "÷¦ÄËÒÉÔÉ %d צËÏÎ?"
 
-#: src/file-manager/fm-directory-view.c:1212
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr "÷É ×ÐÅ×ÎÅΦ, ÝÏ ÈÏÞÅÔÅ ÐÏÓÔ¦ÊÎÏ ÓÔÉÒÁÔÉ \"%s\" Ú ÓͦÔÎÉËÁ?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr ""
+"÷É ×ÐÅ×ÎÅΦ, ÝÏ ÈÏÞÅÔÅ ÐÏÓÔ¦ÊÎÏ ÓÔÉÒÁÔÉ Ã¦ %d ×ÉÂÒÁÎÉÈ ÅÌÅÍÅÎÔ¦× Ú ÓͦÔÎÉËÁ?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "óÔÅÒÔÉ"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "óÔÅÒÔÉ"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+#, fuzzy
+msgid "scripts"
+msgstr "ïÐÉÓ"
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "÷ÉÂÒÁÎÏ \"%s\""
 
-#: src/file-manager/fm-directory-view.c:1214
+#: src/file-manager/fm-directory-view.c:1337
 msgid "1 folder selected"
 msgstr "÷ÉÂÒÁÎÏ 1 ÔÅËÕ"
 
-#: src/file-manager/fm-directory-view.c:1217
+#: src/file-manager/fm-directory-view.c:1340
 #, c-format
 msgid "%d folders selected"
 msgstr "÷ÉÂÒÁÎÏ ÔÅË: %d"
 
-#: src/file-manager/fm-directory-view.c:1223
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr " (ͦÓÔÉÔØ 0 ÅÌÅÍÅÎÔ¦×)"
 
-#: src/file-manager/fm-directory-view.c:1225
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr " (ͦÓÔÉÔØ 1 ÅÌÅÍÅÎÔ)"
 
-#: src/file-manager/fm-directory-view.c:1227
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr " (ͦÓÔÉÔØ ÅÌÅÍÅÎÔ¦×: %d)"
 
-#: src/file-manager/fm-directory-view.c:1238
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "÷ÉÂÒÁÎÏ \"%s\" (%s)"
 
-#: src/file-manager/fm-directory-view.c:1242
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "÷ÉÂÒÁÎÏ ÅÌÅÍÅÎÔ¦×: %d (%s)"
 
-#: src/file-manager/fm-directory-view.c:1249
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "÷ÉÂÒÁÎÏ 1 ÅÌÅÍÅÎÔ (%s)"
 
-#: src/file-manager/fm-directory-view.c:1252
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d ¦ÎÛÉÈ ÅÌÅÍÅÎÔ¦× ×ÉÂÒÁÎÏ (%s)"
@@ -6706,7 +6714,7 @@ msgstr "%d ¦ÎÛÉÈ ÅÌÅÍÅÎÔ¦× ×ÉÂÒÁÎÏ (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1281
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -6715,7 +6723,7 @@ msgstr "%s%s, %s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1407
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
@@ -6724,17 +6732,17 @@ msgstr ""
 "ôÅËÁ \"%s\" ͦÓÔÉÔØ Â¦ÌØÛÅ ÂÁÊÌ¦× Î¦Ö îÁÕÔ¦ÌÕÓ × ÚÍÏÚ¦ ÏÂÒÏÂÉÔÉ. äÅÑ˦ ÆÁÊÌÉ "
 "ÎÅ ÂÕÄŠצÄÏÂÒÁÖÅÎÏ."
 
-#: src/file-manager/fm-directory-view.c:1414
+#: src/file-manager/fm-directory-view.c:1537
 msgid "Too Many Files"
 msgstr "îÁÄÔÏ ÂÁÇÁÔÏ ÆÁÊ̦×"
 
-#: src/file-manager/fm-directory-view.c:2623
+#: src/file-manager/fm-directory-view.c:2752
 #, c-format
 msgid ""
 "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
 msgstr "\"%s\" ÎÅ ÍÏÖÎÁ ÐÅÒÅÎÏÓÉÔÉ × ÓͦÔÎÉË. óÔÅÒÔÉ ÎÅÇÁÊÎÏ?"
 
-#: src/file-manager/fm-directory-view.c:2628
+#: src/file-manager/fm-directory-view.c:2757
 #, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
@@ -6743,7 +6751,7 @@ msgstr ""
 "%d ×ÉÂÒÁÎÉÈ ÅÌÅÍÅÎÔ¦× ÎÅ ÍÏÖÕÔØ ÂÕÔÉ ÐÅÒÅÎÅÓÅΦ Õ ÓͦÔÎÉË. èÏÞÅÔÅ ÓÔÅÒÔÉ §È "
 "ÎÅÇÁÊÎÏ?"
 
-#: src/file-manager/fm-directory-view.c:2632
+#: src/file-manager/fm-directory-view.c:2761
 #, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -6752,21 +6760,16 @@ msgstr ""
 "%d Ú ×ÉÂÒÁÎÉÈ ÅÌÅÍÅÎÔ¦× ÎÅ ÍÏÖÕÔØ ÂÕÔÉ ÐÅÒÅÎÅÓÅΦ Õ ÓͦÔÎÉË. èÏÞÅÔÅ ÓÔÅÒÔÉ "
 "æ %d ÅÌÅÍÅÎÔ¦× ÎÅÇÁÊÎÏ?"
 
-#: src/file-manager/fm-directory-view.c:2640
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr "óÔÅÒÔÉ ÎÅÇÁÊÎÏ?"
 
-#: src/file-manager/fm-directory-view.c:2641
-#: src/file-manager/fm-directory-view.c:2682
-msgid "Delete"
-msgstr "óÔÅÒÔÉ"
-
-#: src/file-manager/fm-directory-view.c:2671
+#: src/file-manager/fm-directory-view.c:2799
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr "÷É ×ÐÅ×ÎÅΦ, ÝÏ ÈÏÞÅÔÅ ÐÏÓÔ¦ÊÎÏ ÓÔÉÒÁÔÉ \"%s\" Ú ÓͦÔÎÉËÁ?"
 
-#: src/file-manager/fm-directory-view.c:2675
+#: src/file-manager/fm-directory-view.c:2803
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
@@ -6774,76 +6777,214 @@ msgid ""
 msgstr ""
 "÷É ×ÐÅ×ÎÅΦ, ÝÏ ÈÏÞÅÔÅ ÐÏÓÔ¦ÊÎÏ ÓÔÉÒÁÔÉ Ã¦ %d ×ÉÂÒÁÎÉÈ ÅÌÅÍÅÎÔ¦× Ú ÓͦÔÎÉËÁ?"
 
-#: src/file-manager/fm-directory-view.c:2681
+#: src/file-manager/fm-directory-view.c:2809
 msgid "Delete From Trash?"
 msgstr "óÔÁÒÔÉ Ú ÓͦÔÎÉËÁ?"
 
-#: src/file-manager/fm-directory-view.c:2978
-#: src/file-manager/fm-directory-view.c:3018
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "÷ÉËÏÒÉÓÔÁÔÉ \"%s\" ÄÌÑ ×¦ÄËÒÉ×ÁÎÎÑ ×ÉÂÒÁÎÏÇÏ ÅÌÅÍÅÎÔÕ"
 
-#: src/file-manager/fm-directory-view.c:3220
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+msgid "Other _Application..."
+msgstr "¶ÎÛÁ ÐÒÏÇÒÁÍÁ..."
+
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
+msgstr "¶ÎÛÁ ÐÒÏÇÒÁÍÁ..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+msgid "Other _Viewer..."
+msgstr "¶ÎÛÉÊ ÐÅÒÅÇÌÑÄÁÞ..."
+
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "¶ÎÛÉÊ ÐÅÒÅÇÌÑÄÁÞ..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "÷ÉËÏÒÉÓÔÁÔÉ \"%s\" ÄÌÑ ×¦ÄËÒÉ×ÁÎÎÑ ×ÉÂÒÁÎÏÇÏ ÅÌÅÍÅÎÔÕ"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
+#, fuzzy, c-format
+msgid "Nautilus was unable to create the directory %s."
+msgstr "îÁÕÔ¦ÌÕÓÕ ÎÅ ×ÄÁÌÏÓÑ ÚÍÏÎÔÕ×ÁÔÉ ×ÉÂÒÁÎÉÊ ÒÏÚĦÌ."
+
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"%d ×ÉÂÒÁÎÉÈ ÅÌÅÍÅÎÔ¦× ÎÅ ÍÏÖÕÔØ ÂÕÔÉ ÐÅÒÅÎÅÓÅΦ Õ ÓͦÔÎÉË. èÏÞÅÔÅ ÓÔÅÒÔÉ §È "
+"ÎÅÇÁÊÎÏ?"
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "÷¦ÄËÒÉÔÉ Õ ÎÏ×ÏÍÕ ×¦ËΦ"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 #, fuzzy
 msgid "Open _in New Window"
 msgstr "÷¦ÄËÒÉÔÉ Õ ÎÏ×ÏÍÕ ×¦ËΦ"
 
-#: src/file-manager/fm-directory-view.c:3222
+#: src/file-manager/fm-directory-view.c:3959
 #, fuzzy, c-format
 msgid "Open _in %d New Windows"
 msgstr "÷¦ÄËÒÉÔÉ × %d ÎÏ×ÉÈ ×¦ËÎÁÈ"
 
-#: src/file-manager/fm-directory-view.c:3248
-msgid "Delete all selected items permanently"
-msgstr "óÔÉÒÁÔÉ ×Ó¦ ×ÉÂÒÁΦ ÅÌÅÍÅÎÔÉ ÐÏÓÔ¦ÊÎÏ"
-
-#: src/file-manager/fm-directory-view.c:3253
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash..."
 msgstr "óÔÅÒÔÉ Ú ÓͦÔÎÉËÁ..."
 
-#: src/file-manager/fm-directory-view.c:3254
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "óÔÅÒÔÉ Ú ÓͦÔÎÉËÁ"
 
-#: src/file-manager/fm-directory-view.c:3258
-msgid "Move all selected items to the Trash"
-msgstr "ðÅÒÅÎÅÓÔÉ ×Ó¦ ×ÉÂÒÁΦ ÅÌÅÍÅÎÔÉ × ÓͦÔÎÉË"
+#: src/file-manager/fm-directory-view.c:3979
+msgid "Delete all selected items permanently"
+msgstr "óÔÉÒÁÔÉ ×Ó¦ ×ÉÂÒÁΦ ÅÌÅÍÅÎÔÉ ÐÏÓÔ¦ÊÎÏ"
 
-#: src/file-manager/fm-directory-view.c:3262
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move to _Trash"
 msgstr "ðÅÒÅÎÅÓÔÉ Õ ÓͦÔÎÉË"
 
-#: src/file-manager/fm-directory-view.c:3292
-msgid "Create _Links"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "ðÅÒÅÎÅÓÔÉ ×Ó¦ ×ÉÂÒÁΦ ÅÌÅÍÅÎÔÉ × ÓͦÔÎÉË"
+
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "óÔÅÒÔÉ"
+
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "óÔÅÒÔÉ"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "óÔ×ÏÒÉÔÉ ÐÏÓÉÌÁÎÎÑ"
 
-#: src/file-manager/fm-directory-view.c:3293
-#: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
 msgstr "óÔ×ÏÒÉÔÉ ÐÏÓÉÌÁÎÎÑ"
 
-#: src/file-manager/fm-directory-view.c:3311
+#: src/file-manager/fm-directory-view.c:4056
 msgid "_Empty Trash..."
 msgstr "óÐÏÒÏÖÎÉÔÉ ÓͦÔÎÉË..."
 
-#: src/file-manager/fm-directory-view.c:3312
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "óÐÏÒÏÖÎÉÔÉ ÓͦÔÎÉË"
 
-#: src/file-manager/fm-directory-view.c:3323
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "÷ÉÄÁÌÉÔÉ ËÏÒÉÓÔÕ×ÁÃØ˦ ÚÏÂÒÁÖÅÎÎÑ"
 
-#: src/file-manager/fm-directory-view.c:3324
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "÷ÉÄÁÌÉÔÉ ËÏÒÉÓÔÕ×ÁÃØËÅ ÚÏÂÒÁÖÅÎÎÑ"
 
-#: src/file-manager/fm-directory-view.c:3477
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "æÁÊÌ"
+
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "ÆÁÊ̦×: %u"
+
+#: src/file-manager/fm-directory-view.c:4094
+#, fuzzy
+msgid "_Copy File"
+msgstr "óËÏЦÀ×ÁÔÉ ÔÅËÓÔ"
+
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#, fuzzy
+msgid "_Copy Files"
+msgstr "ëÏЦÀ×ÁÎÎÑ ÆÁÊ̦×"
+
+#: src/file-manager/fm-directory-view.c:4252
 msgid ""
 "This link can't be used, because it has no target. Do you want to put this "
 "link in the Trash?"
@@ -6851,7 +6992,7 @@ msgstr ""
 "ãÅ ÐÏÓÉÌÁÎÎÑ ÎÅ ÍÏÖÅ ÂÕÔÉ ×ÉËÏÒÉÓÔÁÎÅ ÔÏÍÕ, ÝÏ ×ÏÎÏ ÎÅ ÍÁ¤ æ̦. èÏÞÅÔÅ "
 "ÚÁÎÅÓÔÉ ÊÏÇÏ × ÓͦÔÎÉË?"
 
-#: src/file-manager/fm-directory-view.c:3480
+#: src/file-manager/fm-directory-view.c:4255
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
@@ -6860,15 +7001,15 @@ msgstr ""
 "ãÅ ÐÏÓÉÌÁÎÎÑ ÎÅ ÍÏÖÅ ÂÕÔÉ ×ÉËÏÒÉÓÔÁÎÅ ÔÏÍÕ, ÝÏ Ã¦Ì¦ \"%s\" ÎÅ ¦ÓÎÕ¤. èÏÞÅÔÅ "
 "ÚÁÎÅÓÔÉ ÊÏÇÏ Õ ÓͦÔÎÉË?"
 
-#: src/file-manager/fm-directory-view.c:3486
+#: src/file-manager/fm-directory-view.c:4261
 msgid "Broken Link"
 msgstr "ú¦ÐÓÏ×ÁÎÅ ÐÏÓÉÌÁÎÎÑ"
 
-#: src/file-manager/fm-directory-view.c:3487
+#: src/file-manager/fm-directory-view.c:4262
 msgid "Throw Away"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3540
+#: src/file-manager/fm-directory-view.c:4315
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
@@ -6877,19 +7018,19 @@ msgstr ""
 "\"%s\" -- ×ÉËÏÎÁ×ÞÉÊ ÔÅËÓÔÏ×ÉÊ ÆÁÊÌ. ÷É ÈÏÞÅÔÅ ÚÁÐÕÓÔÉÔÉ ÊÏÇÏ, ÞÉ "
 "צÄÏÂÒÁÚÉÔÉ ×ͦÓÔ?"
 
-#: src/file-manager/fm-directory-view.c:3546
+#: src/file-manager/fm-directory-view.c:4321
 msgid "Run or Display?"
 msgstr "úÁÐÕÓÔÉÔÉ ÞÉ ÐÏËÁÚÁÔÉ?"
 
-#: src/file-manager/fm-directory-view.c:3547
+#: src/file-manager/fm-directory-view.c:4322
 msgid "Run"
 msgstr "úÁÐÕÓÔÉÔÉ"
 
-#: src/file-manager/fm-directory-view.c:3548
+#: src/file-manager/fm-directory-view.c:4323
 msgid "Display"
 msgstr "ðÏËÁÚÁÔÉ"
 
-#: src/file-manager/fm-directory-view.c:3602
+#: src/file-manager/fm-directory-view.c:4377
 msgid ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
@@ -6897,16 +7038,16 @@ msgstr ""
 "÷ÉÂÁÞÔÅ, ÁÌÅ ×É ÎÅ ÍÏÖÅÔÅ ×ÉËÏÎÕ×ÁÔÉ ËÏÍÁÎÄÉ Ú ×¦ÄÄÁÌÅÎÏÇÏ ÓÁÊÔÕ Ú Í¦ÒËÕ×ÁÎØ "
 "ÂÅÚÐÅËÉ."
 
-#: src/file-manager/fm-directory-view.c:3604
+#: src/file-manager/fm-directory-view.c:4379
 msgid "Can't execute remote links"
 msgstr "îÅÍÏÖÌÉ×Ï ×ÉËÏÎÕ×ÁÔÉ ×¦ÄÄÁÌÅΦ ÐÏÓÉÌÁÎÎÑ"
 
-#: src/file-manager/fm-directory-view.c:3738
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "Opening \"%s\""
 msgstr "÷¦ÄËÒÉ×ÁÎÎÑ \"%s\""
 
-#: src/file-manager/fm-directory-view.c:3744
+#: src/file-manager/fm-directory-view.c:4519
 msgid "Cancel Open?"
 msgstr "÷¦ÄͦÎÉÔÉ ×¦ÄËÒÉ×ÁÎÎÑ?"
 
@@ -6916,34 +7057,39 @@ msgid ""
 "You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "÷É ÎÅ ÍÁ¤ÔÅ ÐÒÁ×, ÎÅÏÂȦÄÎÉÈ ÄÌÑ ÐÅÒÅÇÌÑÄÕ ×ͦÓÔÕ \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:65
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:69
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "îÁÖÁÌØ ÎÅ ×ÄÁÌÏÓÑ ÐÏËÁÚÁÔÉ ×ÅÓØ ×ͦÓÔ \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:68
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "ðÏÍÉÌËÁ צÄÏÂÒÁÖÅÎÎÑ ÔÅËÉ"
 
-#: src/file-manager/fm-error-reporting.c:99
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "îÁÚ×Á \"%s\" ×ÖÅ ×ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ Õ Ã¦Ê ÔÅæ. âÕÄØ ÌÁÓËÁ, ×ÉÂÅÒ¦ÔØ ¦ÎÛÕ."
 
-#: src/file-manager/fm-error-reporting.c:104
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "õ Ã¦Ê ÔÅæ ÎÅÍÁ¤ \"%s\". íÏÖÅ ÐÅÒÅÎÅÓÅÎÏ ÞÉ ÓÔÅÒÔÏ?"
 
-#: src/file-manager/fm-error-reporting.c:109
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "÷É ÎÅ ÍÁ¤ÔÅ ÐÒÁ× ÎÅÏÂȦÄÎÉÈ ÄÌÑ ÚͦÎÉ ÎÁÚ×É \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:114
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -6952,84 +7098,84 @@ msgstr ""
 "îÁÚ×Á \"%s\" ΊצÒÎÁ ÔÏÍÕ, ÝÏ Í¦ÓÔÉÔØ ÓÉÍ×ÏÌ \"/\". âÕÄØ ÌÁÓËÁ, "
 "×ÉËÏÒÉÓÔÁÊÔÅ ¦ÎÛÕ ÎÁÚ×Õ."
 
-#: src/file-manager/fm-error-reporting.c:118
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "îÁÚ×Á \"%s\" ΊצÒÎÁ. âÕÄØ ÌÁÓËÁ, ×ÉÂÅÒ¦ÔØ ¦ÎÛÕ ÎÁÚ×Õ."
 
-#: src/file-manager/fm-error-reporting.c:124
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "îÅ ×ÄÁÌÏÓÑ ÚͦÎÉÔÉ ÎÁÚ×Õ \"%s\" ÞÅÒÅÚ ÔÅ, ÝÏ ÃÅÊ ÄÉÓË ÌÉÛÅ ÄÌÑ ÚÞÉÔÕ×ÁÎÎÑ."
 
-#: src/file-manager/fm-error-reporting.c:133
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "îÁÖÁÌØ ÎÅ ×ÄÁÌÏÓÑ ÐÅÒÅÊÍÅÎÕ×ÁÔÉ \"%s\" ÎÁ \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:140
+#: src/file-manager/fm-error-reporting.c:144
 msgid "Renaming Error"
 msgstr "ðÏÍÉÌËÁ ÐÅÒÅÊÍÅÎÕ×ÁÎÎÑ"
 
-#: src/file-manager/fm-error-reporting.c:160
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "÷É ÎÅ ÍÁ¤ÔÅ ÄÏÓÔÁÔÎØÏ ÐÒÁ× ÄÌÑ ÚͦÎÉ ÇÒÕÐÉ \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:164
+#: src/file-manager/fm-error-reporting.c:168
 #, c-format
 msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
 msgstr ""
 "îÅ ×ÄÁÌÏÓÑ ÚͦÎÉÔÉ ÇÒÕÐÕ \"%s\" ÞÅÒÅÚ ÔÅ, ÝÏ ÃÅÊ ÄÉÓË ÌÉÛÅ ÄÌÑ ÚÞÉÔÕ×ÁÎÎÑ."
 
-#: src/file-manager/fm-error-reporting.c:172
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "îÁÖÁÌØ ÎÅ ×ÄÁÌÏÓÑ ÚͦÎÉÔÉ ÇÒÕÐÕ \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:176
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr "ðÏÍÉÌËÁ ×ÓÔÁÎÏ×ÌÅÎÎÑ ÇÒÕÐÉ"
 
-#: src/file-manager/fm-error-reporting.c:198
+#: src/file-manager/fm-error-reporting.c:202
 #, c-format
 msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 msgstr ""
 "îÅ ×ÄÁÌÏÓÑ ÚͦÎÉÔÉ ×ÌÁÓÎÉËÁ \"%s\" ÞÅÒÅÚ ÔÅ, ÝÏ ÃÅÊ ÄÉÓË ÌÉÛÅ ÄÌÑ ÚÞÉÔÕ×ÁÎÎÑ."
 
-#: src/file-manager/fm-error-reporting.c:205
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "îÁÖÁÌØ ÎÅ ×ÄÁÌÏÓÑ ÚͦÎÉÔÉ ×ÌÁÓÎÉËÁ \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr "ðÏÍÉÌËÁ ×ÓÔÁÎÏ×ÌÅÎÎÑ ×ÌÁÓÎÉËÁ"
 
-#: src/file-manager/fm-error-reporting.c:230
+#: src/file-manager/fm-error-reporting.c:234
 #, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr ""
 "îÅ ×ÄÁÌÏÓÑ ÚͦÎÉÔÉ ÐÒÁ×Á \"%s\" ÞÅÒÅÚ ÔÅ, ÝÏ ÃÅÊ ÄÉÓË ÌÉÛÅ ÄÌÑ ÚÞÉÔÕ×ÁÎÎÑ."
 
-#: src/file-manager/fm-error-reporting.c:237
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "îÁÖÁÌØ ÎÅ ×ÄÁÌÏÓÑ ÚͦÎÉÔÉ ÐÒÁ×Á \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:244
 msgid "Error Setting Permissions"
 msgstr "ðÏÍÉÌËÁ ×ÓÔÁÎÏ×ÌÅÎÎÑ ÐÒÁ×"
 
-#: src/file-manager/fm-error-reporting.c:306
+#: src/file-manager/fm-error-reporting.c:310
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÎÎÑ \"%s\" ÎÁ \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:311
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "÷¦ÄͦÎÉÔÉ ÐÅÒÅÊÍÅÎÕ×ÁÎÎÑ"
 
@@ -7089,76 +7235,76 @@ msgstr ""
 "÷ÉÂÅÒ¦ÔØ ÐÏÒÑÄÏË, × ÑËÏÍÕ ¦ÎÆÏÒÍÁÃ¦Ñ ÂÕÄÅ ×ÉÎÉËÁÔÉ Ð¦Ä ÎÁÚ×ÁÍÉ Ð¦ËÔÏÇÒÁÍ. "
 "ðÒÉ Ú¦ÌØÛÅÎΦ ÍÁÓÛÔÁÂÕ ÂÕÄÅ Ú'Ñ×ÌÑÔÉÓÑ Â¦ÌØÛÅ ¦ÎÆÏÒÍÁæ§."
 
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:168
 msgid "by _Name"
 msgstr "ÚÁ ÎÁÚ×ÏÀ"
 
-#: src/file-manager/fm-icon-view.c:159
+#: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "ìÉÛÉÔÉ Ð¦ËÔÏÇÒÁÍÉ ÓÏÒÔÏ×ÁÎÉÍÉ ÚÁ ÎÁÚ×ÏÀ × ÒÑÄËÁÈ"
 
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:175
 msgid "by _Size"
 msgstr "ÚÁ ÒÏÚͦÒÏÍ"
 
-#: src/file-manager/fm-icon-view.c:166
+#: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "ìÉÛÉÔÉ Ð¦ËÔÏÇÒÁÍÉ ÓÏÒÔÏ×ÁÎÉÍÉ ÚÁ ÒÏÚͦÒÏÍ × ÒÑÄËÁÈ"
 
-#: src/file-manager/fm-icon-view.c:172
+#: src/file-manager/fm-icon-view.c:182
 msgid "by _Type"
 msgstr "ÚÁ ÔÉÐÏÍ"
 
-#: src/file-manager/fm-icon-view.c:173
+#: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "ìÉÛÉÔÉ Ð¦ËÔÏÇÒÁÍÉ ÓÏÒÔÏ×ÁÎÉÍÉ ÚÁ ÔÉÐÏÍ × ÒÑÄËÁÈ"
 
-#: src/file-manager/fm-icon-view.c:179
+#: src/file-manager/fm-icon-view.c:189
 msgid "by Modification _Date"
 msgstr "ÚÁ ÄÁÔÏÀ ÍÏÄÉƦËÁæ§"
 
-#: src/file-manager/fm-icon-view.c:180
+#: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "ìÉÛÉÔÉ Ð¦ËÔÏÇÒÁÍÉ ÓÏÒÔÏ×ÁÎÉÍÉ ÚÁ ÄÁÔÏÀ ÍÏÄÉƦËÁæ§ × ÒÑÄËÁÈ"
 
-#: src/file-manager/fm-icon-view.c:186
+#: src/file-manager/fm-icon-view.c:196
 msgid "by _Emblems"
 msgstr "ÚÁ ÅÍÂÌÅÍÁÍÉ"
 
-#: src/file-manager/fm-icon-view.c:187
+#: src/file-manager/fm-icon-view.c:197
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "ìÉÛÉÔÉ Ð¦ËÔÏÇÒÁÍÉ ÓÏÒÔÏ×ÁÎÉÍÉ ÚÁ ÅÍÂÌÅÍÁÍÉ × ÒÑÄËÁÈ"
 
-#: src/file-manager/fm-icon-view.c:1230
+#: src/file-manager/fm-icon-view.c:1241
 #: src/file-manager/nautilus-icon-view-ui.xml.h:39
 msgid "_Restore Icons' Original Sizes"
 msgstr "÷¦ÄÎÏ×ÉÔÉ ÐÏÞÁÔËÏצ ÒÏÚͦÒÉ Ð¦ËÔÏÇÒÁÍ"
 
-#: src/file-manager/fm-icon-view.c:1231
+#: src/file-manager/fm-icon-view.c:1242
 msgid "_Restore Icon's Original Size"
 msgstr "÷¦ÄÎÏ×ÉÔÉ ÐÏÞÁÔËÏ×ÉÊ ÒÏÚÍ¦Ò Ð¦ËÔÏÇÒÁÍÉ"
 
-#: src/file-manager/fm-icon-view.c:1443
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "×ËÁÚÁÎÎÑ ÎÁ \"%s\""
 
-#: src/file-manager/fm-list-view.c:2129
+#: src/file-manager/fm-list-view.c:2188
 #: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "òÏÚͦÒ"
 
-#: src/file-manager/fm-list-view.c:2135
+#: src/file-manager/fm-list-view.c:2194
 #: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "ôÉÐ"
 
-#: src/file-manager/fm-list-view.c:2141
+#: src/file-manager/fm-list-view.c:2200
 #: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "äÁÔÁ ÍÏÄÉƦËÁæ§"
@@ -7215,120 +7361,126 @@ msgstr "(ÄÅÑËÉÊ ×ͦÓÔ ÎÅ ÚÞÉÔÕ×ÁÌØÎÉÊ)"
 msgid "Contents:"
 msgstr "÷ͦÓÔ:"
 
-#: src/file-manager/fm-properties-window.c:1433
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "ïÓÎÏ×Á"
 
-#: src/file-manager/fm-properties-window.c:1512
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "ôÉÐ:"
 
-#: src/file-manager/fm-properties-window.c:1517
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "òÏÚͦÒ:"
 
-#: src/file-manager/fm-properties-window.c:1521
-msgid "MIME type:"
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "îÁÂÏÒÉ ÐÏÓÉÌÁÎØ"
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
 msgstr "ôÉÐ MIME:"
 
-#: src/file-manager/fm-properties-window.c:1527
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "íÏÄÉƦËÏ×ÁÎÏ:"
 
-#: src/file-manager/fm-properties-window.c:1530
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "äÏÓÔÕÐ:"
 
-#: src/file-manager/fm-properties-window.c:1539
+#: src/file-manager/fm-properties-window.c:1552
 msgid "Select Custom Icon..."
 msgstr "÷ÉÂÒÁÔÉ ÎÅÔÉÐÏ×Õ Ð¦ËÔÏÇÒÁÍÕ..."
 
-#: src/file-manager/fm-properties-window.c:1545
+#: src/file-manager/fm-properties-window.c:1558
 msgid "Remove Custom Icon"
 msgstr "÷ÉÄÁÌÉÔÉ ÎÅÔÉÐÏ×Õ Ð¦ËÔÏÇÒÁÍÕ"
 
-#: src/file-manager/fm-properties-window.c:1873
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "÷ÓÔÁÎÏ×ÉÔÉ ¦ÄÅÎÔÉƦËÁÔÏÒ ËÏÒÉÓÔÕ×ÁÞÁ"
 
-#: src/file-manager/fm-properties-window.c:1878
+#: src/file-manager/fm-properties-window.c:1891
 msgid "Special Flags:"
 msgstr "ïÓÏÂÌÉצ ÏÚÎÁËÉ:"
 
-#: src/file-manager/fm-properties-window.c:1881
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "÷ÓÔÁÎÏ×ÉÔÉ ¦ÄÅÎÔÉƦËÁÔÏÒ ÇÒÕÐÉ"
 
-#: src/file-manager/fm-properties-window.c:1883
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1909
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "ðÒÁ×Á"
 
-#: src/file-manager/fm-properties-window.c:1915
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "÷É ÎÅ ×ÌÁÓÎÉË, ÔÏ Ö ÎÅ ÍÏÖÅÔÅ ÚͦÎÀ×ÁÔÉ Ã¦ ÐÒÁ×Á."
 
-#: src/file-manager/fm-properties-window.c:1928
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "÷ÌÁÓÎÉË ÆÁÊÌÕ:"
 
-#: src/file-manager/fm-properties-window.c:1937
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "çÒÕÐÁ ÆÁÊÌÕ:"
 
-#: src/file-manager/fm-properties-window.c:1955
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "÷ÌÁÓÎÉË:"
 
-#: src/file-manager/fm-properties-window.c:1956
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "çÒÕÐÁ:"
 
-#: src/file-manager/fm-properties-window.c:1957
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "¶ÎÛ¦:"
 
-#: src/file-manager/fm-properties-window.c:1976
+#: src/file-manager/fm-properties-window.c:1989
 msgid "Read"
 msgstr "úÞÉÔÕ×ÁÎÎÑ"
 
-#: src/file-manager/fm-properties-window.c:1980
+#: src/file-manager/fm-properties-window.c:1993
 msgid "Write"
 msgstr "úÁÐÉÓ"
 
-#: src/file-manager/fm-properties-window.c:1984
+#: src/file-manager/fm-properties-window.c:1997
 msgid "Execute"
 msgstr "÷ÉËÏÎÁÎÎÑ"
 
-#: src/file-manager/fm-properties-window.c:2035
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2036
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2037
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "ïÓÔÁÎÎÑ ÚͦÎÁ:"
 
-#: src/file-manager/fm-properties-window.c:2041
+#: src/file-manager/fm-properties-window.c:2054
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "îÅ ×ÄÁÌÏÓÑ ×ÉÚÎÁÞÉÔÉ ÐÒÁ×Á ÄÏÓÔÕÐÕ \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2334
 msgid "Cancel Showing Properties Window?"
 msgstr "÷¦ÄͦÎÉÔÉ ÐÏËÁÚ ×¦ËÎÁ ×ÌÁÓÔÉ×ÏÓÔÅÊ?"
 
-#: src/file-manager/fm-properties-window.c:2322
+#: src/file-manager/fm-properties-window.c:2335
 msgid "Creating Properties window"
 msgstr "óÔ×ÏÒÅÎÎÑ ×¦ËÎÁ ×ÌÁÓÔÉ×ÏÓÔÅÊ"
 
-#: src/file-manager/fm-properties-window.c:2422
+#: src/file-manager/fm-properties-window.c:2435
 msgid "Select an icon:"
 msgstr "÷ÉÂÅÒ¦ÔØ Ð¦ËÔÏÇÒÁÍÕ:"
 
@@ -7350,7 +7502,7 @@ msgid ""
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:159
-#: src/file-manager/nautilus-indexing-info.c:405
+#: src/file-manager/nautilus-indexing-info.c:407
 msgid "Search Service Not Available"
 msgstr "ðÏÓÌÕÇÁ ÐÏÛÕËÕ ÎÅ ÄÏÓÔÕÐÎÁ"
 
@@ -7490,7 +7642,7 @@ msgstr ""
 #. It is not necessary to translate this text just yet; it has not been
 #. edited yet, and will be replaced by a final copy in a few days.
 #: src/file-manager/fm-search-list-view.c:360
-#: src/file-manager/nautilus-indexing-info.c:340
+#: src/file-manager/nautilus-indexing-info.c:342
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
@@ -7502,20 +7654,20 @@ msgid "Fast searches are not available on your computer"
 msgstr "û×ÉÄ˦ ÐÏÛÕËÉ ÎÅ ÄÏÓÔÕÐΦ ÎÁ ×ÁÛÏÍÕ ËÏÍÐ'ÀÔÅÒ¦"
 
 #: src/file-manager/fm-search-list-view.c:373
-#: src/file-manager/nautilus-indexing-info.c:359
+#: src/file-manager/nautilus-indexing-info.c:361
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Fast search is disabled in your Search preferences, so no index is available."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:376
-#: src/file-manager/nautilus-indexing-info.c:345
-#: src/file-manager/nautilus-indexing-info.c:363
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
 msgid "Fast searches are not available on your computer."
 msgstr "û×ÉÄ˦ ÐÏÛÕËÉ ÎÅ ÄÏÓÔÕÐΦ ÎÁ ×ÁÛÏÍÕ ËÏÍÐ'ÀÔÅÒ¦."
 
 #: src/file-manager/fm-search-list-view.c:377
-#: src/file-manager/nautilus-indexing-info.c:364
+#: src/file-manager/nautilus-indexing-info.c:366
 msgid ""
 "To enable fast search, open the Preferences menu and choose Preferences. "
 "Then select Search preferences and put a checkmark in the Enable Fast Search "
@@ -7569,7 +7721,7 @@ msgid "Change Desktop Background"
 msgstr "úͦÎÉÔÉ ÔÌÏ ÒÏÂÏÞÏÇÏ ÓÔÏÌÕ"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Delete all items in the Trash"
 msgstr "óÔÅÒÔÉ ×Ó¦ ÅÌÅÍÅÎÔÉ Õ ÓͦÔÎÉËÕ"
 
@@ -7615,143 +7767,194 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "÷ÉÂÅÒ¦ÔØ ¦ÎÛÕ ÐÒÏÇÒÁÍÕ ÄÌÑ ÐÅÒÅÇÌÑÄÕ ×ÉÂÒÁÎÏÇÏ ÅÌÅÍÅÎÔÕ"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-msgid "Create Link"
-msgstr "óÔ×ÏÒÉÔÉ ÐÏÓÉÌÁÎÎÑ"
+#, fuzzy
+msgid "Copy Files"
+msgstr "ëÏЦÀ×ÁÎÎÑ ÆÁÊ̦×"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
 msgid "Create a new empty folder inside this folder"
 msgstr "óÔ×ÏÒÉÔÉ ÎÏ×Õ ÐÏÒÏÖÎÀ ÔÅËÕ × Ã¦Ê"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a symbolic link for each selected item"
 msgstr "óÔ×ÏÒÉÔÉ ÓÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ ÄÌÑ ËÏÖÎÏÇÏ ×ÉÂÒÁÎÏÇÏ ÅÌÅÍÅÎÔÕ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "ÆÁÊ̦×: %u"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "ðÅÒÅÎÅÓÔÉ ×Ó¦ ×ÉÂÒÁΦ ÅÌÅÍÅÎÔÉ Õ ÓͦÔÎÉË"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Duplicate"
 msgstr "äÕÂÌÀ×ÁÔÉ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Duplicate each selected item"
 msgstr "äÕÂÌÀ×ÁÔÉ ËÏÖÅÎ ×ÉÂÒÁÎÉÊ ÅÌÅÍÅÎÔ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "óÔ×ÏÒÉÔÉ ÐÏÓÉÌÁÎÎÑ"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr "ðÅÒÅÎÅÓÔÉ ×Ó¦ ×ÉÂÒÁΦ ÅÌÅÍÅÎÔÉ Õ ÓͦÔÎÉË"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Move to Trash"
 msgstr "ðÅÒÅÎÅÓÔÉ Õ ÓͦÔÎÉË"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "New Folder"
 msgstr "îÏ×Á ÔÅËÁ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Open"
 msgstr "÷¦ÄËÒÉÔÉ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 #, fuzzy
 msgid "Open Wit_h"
 msgstr "÷¦ÄËÒÉÔÉ ÚÁ ÄÏÐÏÍÏÇÏÀ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Open With"
 msgstr "÷¦ÄËÒÉÔÉ ÚÁ ÄÏÐÏÍÏÇÏÀ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a new window"
 msgstr "÷ÉÂÒÁÔÉ ËÏÖÅÎ ×ÉÂÒÁÎÉÊ ÅÌÅÍÅÎÔ Õ ÎÏ×ÏÍÕ ×¦ËΦ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in New Window"
 msgstr "÷¦ÄËÒÉÔÉ Õ ÎÏ×ÏÍÕ ×¦ËΦ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "÷¦ÄËÒÉÔÉ ×ÉÂÒÁÎÉÊ ÅÌÅÍÅÎÔ Õ ÃØÏÍÕ ×¦ËΦ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other Application..."
 msgstr "¶ÎÛ¦ ÐÒÏÇÒÁÍÉ..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other Viewer..."
 msgstr "¶ÎÛÉÊ ÐÅÒÅÇÌÑÄÁÞ..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-msgid "Other _Application..."
-msgstr "¶ÎÛÁ ÐÒÏÇÒÁÍÁ..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "÷ÓÔÁ×ÉÔÉ ÔÅËÓÔ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-msgid "Other _Viewer..."
-msgstr "¶ÎÛÉÊ ÐÅÒÅÇÌÑÄÁÞ..."
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Remove Custom Images"
 msgstr "÷ÉÄÁÌÉÔÉ ÎÅÔÉÐÏצ ÚÏÂÒÁÖÅÎÎÑ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Remove any custom images from selected icons"
 msgstr "÷ÉÄÁÌÉÔÉ ×Ó¦ ÎÅÔÉÐÏצ ÚÏÂÒÁÖÅÎÎÑ Ú ×ÉÂÒÁÎÉÈ Ð¦ËÔÏÇÒÁÍ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Remove any custom pattern or color from the background of this location"
 msgstr ""
 
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/nautilus-sidebar.c:490
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
 msgid "Reset Background"
 msgstr "ïÂÎÕÌÉÔÉ ÔÌÏ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+msgid "Scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Select All Files"
 msgstr "÷ÉÂÒÁÔÉ ×Ó¦ ÆÁÊÌÉ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 #, fuzzy
 msgid "Select _All Files"
 msgstr "÷ÉÂÒÁÔÉ ×Ó¦ ÆÁÊÌÉ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Select all items in this window"
 msgstr "ðÏËÁÚÁÔÉ ×Ó¦ ×ÌÁÓÔÉ×ÏÓÔ¦ Õ ÃØÏÍÕ ×¦ËΦ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "Show Properties"
 msgstr "ðÏËÁÚÁÔÉ ×ÌÁÓÔÉ×ÏÓÔ¦"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Show Trash"
 msgstr "ðÏËÁÚÁÔÉ ÓͦÔÎÉË"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "Show _Properties"
 msgstr "ðÏËÁÚÁÔÉ ×ÌÁÓÔÉ×ÏÓÔ¦"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "Show the contents of the Trash"
 msgstr "ðÏËÁÚÁÔÉ ×ͦÓÔ ÓͦÔÎÉËÁ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "View or modify the properties of each selected item"
 msgstr "ðÏËÁÚÁÔÉ ÞÁ ÍÏÄÉƦËÕ×ÁÔÉ ×ÌÁÓÔÉ×ÏÓÔ¦ ËÏÖÎÏÇÏ ×ÉÂÒÁÎÏÇÏ ÅÌÅÍÅÎÔÕ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Duplicate"
 msgstr "äÕÂÌÀ×ÁÔÉ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 #, fuzzy
 msgid "_New Folder"
 msgstr "îÏ×Á ÔÅËÁ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open"
 msgstr "÷¦ÄËÒÉÔÉ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "÷ÓÔÁ×ÉÔÉ ÔÅËÓÔ"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Show Trash"
 msgstr "ðÏËÁÚÁÔÉ ÓͦÔÎÉË"
 
@@ -7926,7 +8129,7 @@ msgstr ""
 
 #: src/file-manager/nautilus-indexing-info.c:219
 #: src/file-manager/nautilus-indexing-info.c:226
-#: src/file-manager/nautilus-indexing-info.c:280
+#: src/file-manager/nautilus-indexing-info.c:281
 msgid "Indexing Status"
 msgstr "óÔÁÎ ¦ÎÄÅËÓÁæ§"
 
@@ -7942,21 +8145,21 @@ msgstr ""
 msgid "Your files were last indexed at %s"
 msgstr "÷ÁÛ¦ ÆÁÊÌÉ ÂÕÌÏ ×ÏÓÔÁÎΤ ÐÒϦÎÄÅËÓÏ×ÁÎÏ %s"
 
-#: src/file-manager/nautilus-indexing-info.c:248
+#: src/file-manager/nautilus-indexing-info.c:249
 msgid "Update Now"
 msgstr "ïÎÏ×ÉÔÉ ÎÅÇÁÊÎÏ"
 
-#: src/file-manager/nautilus-indexing-info.c:278
+#: src/file-manager/nautilus-indexing-info.c:279
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast.  Your files are currently being indexed."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:404
+#: src/file-manager/nautilus-indexing-info.c:406
 msgid "Sorry, but the medusa search service is not available."
 msgstr "÷ÉÂÁÞÔÅ, ÁÌÅ ÐÏÓÌÕÇÁ ÐÏÛÕËÕ \"Medusa\" ÎÅ ÄÏÓÔÕÐÎÁ."
 
-#: src/file-manager/nautilus-indexing-info.c:426
+#: src/file-manager/nautilus-indexing-info.c:428
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -8110,7 +8313,7 @@ msgstr "úÁËÌÁÄËÉ"
 msgid "Location"
 msgstr "ðÏÌÏÖÅÎÎÑ"
 
-#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:767
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "÷ÉÄÁÌÉÔÉ"
 
@@ -8254,7 +8457,7 @@ msgstr "õצÍËÎÕÔÉ Û×ÉÄËÉÊ ÐÏÛÕË"
 msgid "Turn fast search on when cron is enabled"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1028
+#: src/nautilus-first-time-druid.c:1027
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "currently can't be performed because the program crond, which does\n"
@@ -8268,7 +8471,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1036
+#: src/nautilus-first-time-druid.c:1035
 msgid ""
 "Indexing is turned on, enabling the fast search feature. However, indexing\n"
 "may not be performed because the program crond, which does nightly tasks\n"
@@ -8282,7 +8485,7 @@ msgid ""
 "/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1123
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
 "Click Finish to launch Nautilus. You'll start with two\n"
 "Nautilus windows: one shows your home folder, and the\n"
@@ -8292,7 +8495,7 @@ msgid ""
 "We hope you enjoy Nautilus!"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1130
+#: src/nautilus-first-time-druid.c:1129
 msgid ""
 "Click Finish to launch Nautilus. You'll start with a\n"
 "window showing your home folder.\n"
@@ -8300,15 +8503,15 @@ msgid ""
 "We hope you enjoy Nautilus!"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:1154
+#: src/nautilus-first-time-druid.c:1153
 msgid "Nautilus First Time Setup"
 msgstr "ðÏÞÁÔËÏ×Å ×ÓÔÁÎÏ×ÌÅÎÎÑ îÁÕÔ¦ÌÕÓÁ"
 
-#: src/nautilus-first-time-druid.c:1184
+#: src/nautilus-first-time-druid.c:1183
 msgid "Welcome to Nautilus"
 msgstr "ìÁÓËÁ×Ï ÐÒÏÓÉÍÏ Õ îÁÕÔ¦ÌÕÓ"
 
-#: src/nautilus-first-time-druid.c:1186
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
 "Nautilus...\n"
 "    Is a great file manager for the GNOME desktop.\n"
@@ -8320,51 +8523,51 @@ msgid ""
 msgstr ""
 
 #. set up the final page
-#: src/nautilus-first-time-druid.c:1197
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "úÁ×ÅÒÛÅÎÏ"
 
 #. set up the user level page
-#: src/nautilus-first-time-druid.c:1210
+#: src/nautilus-first-time-druid.c:1209
 msgid "Choose Your User Level"
 msgstr "÷ÉÂÅÒ¦ÔØ ×ÁÛ Ò¦×ÅÎØ ËÏÒÉÓÔÕ×ÁÞÁ"
 
 #. set up the GMC transition page
-#: src/nautilus-first-time-druid.c:1214
+#: src/nautilus-first-time-druid.c:1213
 msgid "GMC to Nautilus Transition"
 msgstr ""
 
 #. set up the `Launch Medusa' page
-#: src/nautilus-first-time-druid.c:1218
+#: src/nautilus-first-time-druid.c:1217
 msgid "Fast Searches"
 msgstr "û×ÉÄ˦ ÐÏÛÕËÉ"
 
 #. set up optional page to tell the user how to run cron
-#: src/nautilus-first-time-druid.c:1226
+#: src/nautilus-first-time-druid.c:1225
 msgid "The Cron Daemon"
 msgstr ""
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:1231
+#: src/nautilus-first-time-druid.c:1230
 msgid "Checking Your Internet Connection"
 msgstr "ðÅÒÅצÒËÁ ×ÁÛÏÇÏ Ú'¤ÄÎÁÎÎÑ Ú ¶ÎÔÅÒÎÅÔÏÍ"
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:1242
+#: src/nautilus-first-time-druid.c:1241
 msgid "Updating Nautilus..."
 msgstr "ïÎÏ×ÌÅÎÎÑ îÁÕÔ¦ÌÕÓ..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:1250
+#: src/nautilus-first-time-druid.c:1249
 msgid "Web Proxy Configuration"
 msgstr "ëÏÎƦ­ÕÒÁÃ¦Ñ ÐÒÏËÓ¦ HTTP"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:1325
+#: src/nautilus-first-time-druid.c:1324
 msgid "Decoding Update..."
 msgstr "äÅËÏÄÕ×ÁÎÎÑ ÐÏÎÏ×ÌÅÎØ..."
 
-#: src/nautilus-first-time-druid.c:1342
+#: src/nautilus-first-time-druid.c:1341
 msgid "Update Complete. Click Next to Continue."
 msgstr "ðÏÎÏ×ÌÅÎÎÑ ÚÁ×ÅÒÛÅÎÏ... îÁÔÉÓΦÔØ \"äÁ̦\" ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ."
 
@@ -8372,7 +8575,7 @@ msgstr "ðÏÎÏ×ÌÅÎÎÑ ÚÁ×ÅÒÛÅÎÏ... îÁÔÉÓΦÔØ \"äÁ̦\" ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ."
 #. * doesn't exist. Arlo and I (jsh) and decided that the
 #. * best thing to do is silently fail
 #.
-#: src/nautilus-first-time-druid.c:1357
+#: src/nautilus-first-time-druid.c:1356
 msgid "No Update Available... Press Next to Continue."
 msgstr "ðÏÎÏ×ÌÅÎÎÑ ÎÅ ÄÏÓÔÕÐÎÅ... îÁÔÉÓΦÔØ \"äÁ̦\" ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ."
 
@@ -8401,47 +8604,47 @@ msgstr "÷É ÈÏÞÅÔÅ ÐÒÏÄÉ×ÉÔÉÓØ Ã¦ %d ͦÓÃØ × ÏËÒÅÍÉÈ ×¦ËÎÁÈ?"
 msgid "View in Multiple Windows?"
 msgstr "ðÅÒÅÇÌÑÄ Õ ÂÁÇÁÔØÏÈ ×¦ËÎÁÈ?"
 
-#: src/nautilus-main.c:144
+#: src/nautilus-main.c:145
 msgid "Perform a quick set of self-check tests."
 msgstr ""
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "Create the initial window with the given geometry."
 msgstr "óÔ×ÏÒÉÔÉ ÐÏÞÁÔËÏ׊צËÎÏ Ú ×ËÁÚÁÎÏÀ ÇÅÏÍÅÔÒ¦¤À."
 
-#: src/nautilus-main.c:147
+#: src/nautilus-main.c:148
 msgid "GEOMETRY"
 msgstr "çåïíåôò¶ñ"
 
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:150
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:151
+#: src/nautilus-main.c:152
 msgid "Quit Nautilus."
 msgstr "÷ÉÊÔÉ Ú îÁÕÔ¦ÌÕÓÁ."
 
-#: src/nautilus-main.c:153
+#: src/nautilus-main.c:154
 msgid "Restart Nautilus."
 msgstr "ðÅÒÅÚÁÐÕÓÔÉÔÉ îÁÕÔ¦ÌÕÓ."
 
-#: src/nautilus-main.c:208
+#: src/nautilus-main.c:209
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check ÎÅ ÍÏÖÅ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉÓØ Ú URI.\n"
 
-#: src/nautilus-main.c:212
+#: src/nautilus-main.c:213
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check ÎÅ ÍÏÖÅ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉÓØ Ú ¦ÎÛÉÍÉ ÐÁÒÁÍÅÔÒÁÍÉ.\n"
 
-#: src/nautilus-main.c:216
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit ÎÅ ÍÏÖÅ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉÓØ ÒÁÚÏÍ Ú URI.\n"
 
-#: src/nautilus-main.c:220
+#: src/nautilus-main.c:221
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart ÎÅ ÍÏÖÅ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉÓØ Ú URI.\n"
 
-#: src/nautilus-main.c:224
+#: src/nautilus-main.c:225
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 "nautilus: --geometry ÎÅ ÍÏÖÅ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉÓØ Ú Â¦ÌØÛ Î¦Ö ÏÄÎÉÍ URI.\n"
@@ -8933,15 +9136,18 @@ msgid "View as List"
 msgstr "ðÏËÁÚÁÔÉ ÑË ÓÐÉÓÏË"
 
 #: src/nautilus-shell-ui.xml.h:1
-msgid " Advanced"
+#, fuzzy
+msgid " _Advanced"
 msgstr " òÏÚ×ÉÎÕÔÉÊ"
 
 #: src/nautilus-shell-ui.xml.h:2
-msgid " Beginner"
+#, fuzzy
+msgid " _Beginner"
 msgstr " ðÏÞÁÔ˦×ÅÃØ"
 
 #: src/nautilus-shell-ui.xml.h:3
-msgid " Intermediate"
+#, fuzzy
+msgid " _Intermediate"
 msgstr " ðÒÏͦÖËÏ×ÉÊ"
 
 #: src/nautilus-shell-ui.xml.h:4
@@ -8980,19 +9186,19 @@ msgstr "úÁËÒÉÔÉ ×Ó¦ צËÎÁ îÁÕÔ¦ÌÕÓÁ"
 msgid "Close this window"
 msgstr "úÁËÒÉÔÉ ÃŠצËÎÏ"
 
-#: src/nautilus-shell-ui.xml.h:17
+#: src/nautilus-shell-ui.xml.h:15
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "ðÏËÁÚÁÔÉ ×¦ËÎÏ, × ÑËÏÍÕ ÍÏÖÎÁ ÂÕÄÅ ×ÉÐÒÁ×ÉÔÉ ÚÁËÌÁÄËÉ ÃØÏÇÏ ÍÅÎÀ"
 
-#: src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr "ðÏËÁÚÁÔÉ ¦ÎÆÏÒÍÁæÀ ÐÒÏ Ô×ÏÒÃ¦× îÁÕÔ¦ÌÕÓÁ"
 
-#: src/nautilus-shell-ui.xml.h:19
+#: src/nautilus-shell-ui.xml.h:17
 msgid "Display on-line help for Nautilus"
 msgstr "ðÏËÁÚÁÔÉ ÍÅÒÅÖÅ×Õ ÄÏצÄËÕ îÁÕÔ¦ÌÕÓÁ"
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:18
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
@@ -9000,141 +9206,128 @@ msgstr ""
 "ðÏËÁÚÁÔÉ ×¦ÚÅÒÕÎËÉ, ËÏÌØÏÒÉ ¦ ÅÍÂÌÅÍÉ, Ñ˦ ÍÏÖÕÔØ ÂÕÔÉ ×ÉËÏÒÉÓÔÁΦ ÄÌÑ "
 "ÎÁÌÁÛÔÕ×ÁÎÎÑ ÚÏ×ΦÛÎØÏÇÏ ×ÉÇÌÑÄÕ"
 
-#: src/nautilus-shell-ui.xml.h:21
+#: src/nautilus-shell-ui.xml.h:19
 msgid "Display quick reference pages for Nautilus"
 msgstr "ðÏËÁÚÁÔÉ ÓÔÏÒ¦ÎËÉ ÄÏצÄËÉ ÐÒÏ îÁÕÔ¦ÌÕÓ"
 
-#: src/nautilus-shell-ui.xml.h:22
+#: src/nautilus-shell-ui.xml.h:20
 msgid "Display release notes for Nautilus"
 msgstr "ðÏËÁÚÁÔÉ ÎÏÔÁÔËÉ ÝÏÄÏ ×ÉÐÕÓËÕ îÁÕÔ¦ÌÕÓÁ"
 
-#: src/nautilus-shell-ui.xml.h:23
+#: src/nautilus-shell-ui.xml.h:21
 msgid "Display support information for Nautilus and Eazel Services"
 msgstr "ðÏËÁÚÁÔÉ ¦ÎÆÏÒÍÁæÀ ÐÒÏ Ð¦ÄÔÒÉÍËÕ îÁÕÔ¦ÌÕÓÁ ÔÁ ÐÏÓÌÕÇ Eazel"
 
-#: src/nautilus-shell-ui.xml.h:24
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Display the latest contents of the current location"
 msgstr "ðÏËÁÚÁÔÉ ÏÓÔÁÎÎ¦Ê ×ͦÓÔ ÐÏÔÏÞÎÏÇÏ Í¦ÓÃÑ"
 
-#: src/nautilus-shell-ui.xml.h:25
+#: src/nautilus-shell-ui.xml.h:23
 msgid "Display the set of available appearance themes"
 msgstr "ðÏËÁÚÁÔÉ ÎÁÂ¦Ò ÄÏÓÔÕÐÎÉÈ ÔÅÍ ÚÏ×ΦÛÎØÏÇÏ ×ÉÇÌÑÄÕ"
 
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:24
 msgid "Edit various Nautilus preferences"
 msgstr "÷ÉÐÒÁ×ÌÅÎÎÑ Ò¦ÚÎÉÈ ÐÁÒÁÍÅÔÒ¦× îÁÕÔ¦ÌÕÓÁ"
 
-#: src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-shell-ui.xml.h:25
 msgid "Find"
 msgstr "úÎÁÊÔÉ"
 
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:26
 msgid "For_get History"
 msgstr "úÁÂÕÔÉ ¦ÓÔÏÒ¦À"
 
-#: src/nautilus-shell-ui.xml.h:29
+#: src/nautilus-shell-ui.xml.h:27
 msgid "Go to Eazel Services"
 msgstr "ðÅÒÅÊÔÉ ÄÏ ÐÏÓÌÕÇ Eazel"
 
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go to the home location"
 msgstr "ðÅÒÅÊÔÉ ÄÏ ÄÏÍÕ"
 
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:29
 msgid "Go to the location that contains this one"
 msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:32
+#: src/nautilus-shell-ui.xml.h:30
 msgid "Go to the next visited location"
 msgstr "ðÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎÏÇÏ ×¦ÄצÄÁÎÏÇÏ Í¦ÓÃÑ"
 
-#: src/nautilus-shell-ui.xml.h:33
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Go to the previous visited location"
 msgstr "ðÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØÏÇÏ ×¦ÄצÄÁÎÏÇÏ Í¦ÓÃÑ"
 
-#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:446
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
 #, fuzzy
 msgid "Hide Location _Bar"
 msgstr "ðÒÉÂÒÁÔÉ ÐÁÎÅÌØ ÒÏÚͦÝÅÎÎÑ"
 
-#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:428
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
 #, fuzzy
 msgid "Hide St_atus Bar"
 msgstr "ðÒÉÂÒÁÔÉ ÐÁÎÅÌØ ÓÔÁÎÕ"
 
-#: src/nautilus-shell-ui.xml.h:36 src/nautilus-window-menus.c:434
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
 #, fuzzy
 msgid "Hide _Sidebar"
 msgstr "ðÒÉÂÒÁÔÉ Â¦ÞÎÕ ÐÁÎÅÌØ"
 
-#: src/nautilus-shell-ui.xml.h:37 src/nautilus-window-menus.c:440
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
 #, fuzzy
 msgid "Hide _Toolbar"
 msgstr "ðÒÉÂÒÁÔÉ ÐÁÎÅÌØ ¦ÎÓÔÒÕÍÅÎÔ¦×"
 
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:37
 msgid "Nautilus Quick _Reference"
 msgstr "äÏצÄËÁ ÐÒÏ îÁÕÔ¦ÌÕÓ"
 
-#: src/nautilus-shell-ui.xml.h:40
+#: src/nautilus-shell-ui.xml.h:38
 msgid "Nautilus Release _Notes"
 msgstr "îÏÔÁÔËÉ ÝÏÄÏ ×ÉÐÕÓËÕ îÁÕÔ¦ÌÕÓÁ"
 
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:39
 msgid "Nautilus User _Manual"
 msgstr "¶ÎÓÔÒÕËÃ¦Ñ ËÏÒÉÓÔÕ×ÁÞÁ îÁÕÔ¦ÌÕÓÁ"
 
-#: src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:40
 msgid "New Window"
 msgstr "îÏ׊צËÎÏ"
 
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:41
 #, fuzzy
 msgid "New _Window"
 msgstr "îÏ׊צËÎÏ"
 
-#: src/nautilus-shell-ui.xml.h:44
+#: src/nautilus-shell-ui.xml.h:42
 msgid "Normal Size"
 msgstr "ú×ÉÞÁÊÎÉÊ ÒÏÚͦÒ"
 
-#: src/nautilus-shell-ui.xml.h:45
+#: src/nautilus-shell-ui.xml.h:43
 msgid "Open another Nautilus window for the displayed location"
 msgstr "÷¦ÄËÒÉÔÉ ¦ÎÛŠצËÎÏ îÁÕÔ¦ÌÕÓÁ ÄÌÑ ÐÏËÁÚÁÎÏÇÏ Í¦ÓÃÑ"
 
-#: src/nautilus-shell-ui.xml.h:47
-msgid "Preferences..."
-msgstr "ðÁÒÁÍÅÔÒÉ..."
-
-#: src/nautilus-shell-ui.xml.h:48
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Refresh"
 msgstr "ïÎÏ×ÉÔÉ"
 
-#: src/nautilus-shell-ui.xml.h:49
-msgid "Removes the selected text without putting it on the clipboard"
-msgstr "÷ÉÄÁÌÉÔÉ ×ÉÂÒÁÎÉÊ ÔÅËÓÔ ÂÅÚ ÒÏÚͦÝÅÎÎÑ ÊÏÇÏ × ÂÕÆÅÒ¦ ÏÂͦÎÕ"
-
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:45
 msgid "Report Profiling"
 msgstr "ú×¦Ô ÐÒÏƦÌÀ×ÁÎÎÑ"
 
-#: src/nautilus-shell-ui.xml.h:51
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Reset Profiling"
 msgstr "óËÉÎÕÔÉ ÐÒÏƦÌÀ×ÁÎÎÑ"
 
-#: src/nautilus-shell-ui.xml.h:52
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Search the World Wide Web"
 msgstr "ðÏÛÕË × ¶ÎÔÅÒÎÅÔ¦"
 
-#: src/nautilus-shell-ui.xml.h:53
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Search this computer for files"
 msgstr "ðÏÛÕË ÆÁÊÌ¦× ÎÁ ÃØÏÍÕ ËÏÍÐ'ÀÔÅÒ¦"
 
-#: src/nautilus-shell-ui.xml.h:54
-#, fuzzy
-msgid "Select _All"
-msgstr "÷ÉÂÒÁÔÉ ×ÓÅ"
-
-#: src/nautilus-shell-ui.xml.h:55
+#: src/nautilus-shell-ui.xml.h:50
 msgid ""
 "Show a page from which you can send feedback about Nautilus and Eazel "
 "Services"
@@ -9142,221 +9335,236 @@ msgstr ""
 "ðÏËÁÚÁÔÉ ÓÔÏÒ¦ÎËÕ Ú ÑËϧ ×É ÚÍÏÖÅÔŠצĦÓÌÁÔÉ ×¦ÄÇÕË ÐÒÏ îÁÕÔ¦ÌÕÓ ÔÁ Eazel "
 "Services"
 
-#: src/nautilus-shell-ui.xml.h:56
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Show the contents at the normal size"
 msgstr "ðÏËÁÚÁÔÉ ×ͦÓÔ × Ú×ÉÞÁÊÎÏÍÕ ÏÂÓÑÚ¦"
 
-#: src/nautilus-shell-ui.xml.h:57
+#: src/nautilus-shell-ui.xml.h:52
 msgid "Show the contents in less detail"
 msgstr "ðÏËÁÚÁÔÉ ×ͦÓÔ × ÍÅÎÛ ÄÏËÌÁÄÎÏ"
 
-#: src/nautilus-shell-ui.xml.h:58
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Show the contents in more detail"
 msgstr "ðÏËÁÚÁÔÉ ×ͦÓÔ ÄÏËÌÁÄΦÛÅ"
 
-#: src/nautilus-shell-ui.xml.h:59
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Start Profiling"
 msgstr "òÏÚÐÏÞÁÔÉ ÐÒÏƦÌÀ×ÁÎÎÑ"
 
-#: src/nautilus-shell-ui.xml.h:61
+#: src/nautilus-shell-ui.xml.h:56
 msgid "Stop Profiling"
 msgstr "úÕÐÉÎÉÔÉ ÐÒÏƦÌÀ×ÁÎÎÑ"
 
-#: src/nautilus-shell-ui.xml.h:62
+#: src/nautilus-shell-ui.xml.h:57
 msgid "Stop loading this location"
 msgstr "úÕÐÉÎÉÔÉ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÃØÏÇÏ Í¦ÓÃÑ"
 
-#: src/nautilus-shell-ui.xml.h:63
+#: src/nautilus-shell-ui.xml.h:58
 msgid "Undo the last text change"
 msgstr "÷¦ÄͦÎÉÔÉ ÏÓÔÁÎÎÀ ÚͦÎÕ ÔÅËÓÔÕ"
 
-#: src/nautilus-shell-ui.xml.h:64
+#: src/nautilus-shell-ui.xml.h:59
 msgid "Up"
 msgstr "÷ÇÏÒÕ"
 
-#: src/nautilus-shell-ui.xml.h:65
-msgid "Use Advanced settings"
-msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÒÏÚ×ÉÎÕÔ¦ ÕÓÔÁÎÏ×ËÉ"
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:66
-msgid "Use Beginner settings"
-msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÕÓÔÁÎÏ×ËÉ ÐÏÞÁÔ˦×ÃÑ"
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:67
-msgid "Use Intermediate settings"
-msgstr "÷ÉËÏÒÉÔÏ×Õ×ÁÔÉ ÐÒÏͦÖËÏצ ÕÓÔÁÎÏ×ËÉ"
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
 
-#: src/nautilus-shell-ui.xml.h:68
+#: src/nautilus-shell-ui.xml.h:63
 #, fuzzy
 msgid "We_b Search"
 msgstr "ðÏÛÕË Õ WWW"
 
-#: src/nautilus-shell-ui.xml.h:69
+#: src/nautilus-shell-ui.xml.h:64
 msgid "Web Search"
 msgstr "ðÏÛÕË Õ WWW"
 
-#: src/nautilus-shell-ui.xml.h:70
+#: src/nautilus-shell-ui.xml.h:65
 msgid "Zoom In"
 msgstr "ú¦ÌØÛÉÔÉ"
 
-#: src/nautilus-shell-ui.xml.h:71
+#: src/nautilus-shell-ui.xml.h:66
 msgid "Zoom Out"
 msgstr "úÍÅÎÛÉÔÉ"
 
-#: src/nautilus-shell-ui.xml.h:72
+#: src/nautilus-shell-ui.xml.h:67
 msgid "Zoom _In"
 msgstr "ú¦ÌØÛÉÔÉ"
 
-#: src/nautilus-shell-ui.xml.h:73
+#: src/nautilus-shell-ui.xml.h:68
 msgid "Zoom _Out"
 msgstr "úÍÅÎÛÉÔÉ"
 
-#: src/nautilus-shell-ui.xml.h:74
+#: src/nautilus-shell-ui.xml.h:69
 msgid "_About Nautilus..."
 msgstr "ðÒÏ îÁÕÔ¦ÌÕÓ..."
 
-#: src/nautilus-shell-ui.xml.h:75
+#: src/nautilus-shell-ui.xml.h:70
 msgid "_Add Bookmark"
 msgstr "äÏÄÁÔÉ ÚÁËÌÁÄËÕ"
 
-#: src/nautilus-shell-ui.xml.h:76
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Back"
 msgstr "îÁÚÁÄ"
 
-#: src/nautilus-shell-ui.xml.h:77
+#: src/nautilus-shell-ui.xml.h:72
 msgid "_Backgrounds and Emblems..."
 msgstr "ôÌÏ ÔÁ ÅÍÂÌÅÍÉ..."
 
-#: src/nautilus-shell-ui.xml.h:78
+#: src/nautilus-shell-ui.xml.h:73
 msgid "_Bookmarks"
 msgstr "úÁËÌÁÄËÉ"
 
-#: src/nautilus-shell-ui.xml.h:79
+#: src/nautilus-shell-ui.xml.h:74
 msgid "_Close Window"
 msgstr "úÁËÒÉÔÉ ×¦ËÎÏ"
 
-#: src/nautilus-shell-ui.xml.h:81
+#: src/nautilus-shell-ui.xml.h:76
 msgid "_Customer Support"
 msgstr "ð¦ÄÔÒÉÍËÁ Ë̦¤ÎÔ¦×"
 
-#: src/nautilus-shell-ui.xml.h:82
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Edit"
 msgstr "òÅÄÁÇÕ×ÁÎÎÑ"
 
-#: src/nautilus-shell-ui.xml.h:83
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Edit Bookmarks..."
 msgstr "òÅÄÁÇÕ×ÁÎÎÑ ÚÁËÌÁÄÏË..."
 
-#: src/nautilus-shell-ui.xml.h:84
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "ðÁÒÁÍÅÔÒÉ..."
+
+#: src/nautilus-shell-ui.xml.h:80
 msgid "_Feedback"
 msgstr "ú×ÏÒÏÔÎ¦Ê Ú×'ÑÚÏË"
 
-#: src/nautilus-shell-ui.xml.h:86 src/nautilus-window-menus.c:1362
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Find"
 msgstr "úÎÁÊÔÉ"
 
-#: src/nautilus-shell-ui.xml.h:87
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Forward"
 msgstr "÷ÐÅÒÅÄ"
 
-#: src/nautilus-shell-ui.xml.h:88
+#: src/nautilus-shell-ui.xml.h:84
 msgid "_Go"
 msgstr "ðÅÒÅÊÔÉ"
 
-#: src/nautilus-shell-ui.xml.h:89
+#: src/nautilus-shell-ui.xml.h:85
 msgid "_Help"
 msgstr "äÏצÄËÁ"
 
-#: src/nautilus-shell-ui.xml.h:90
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Home"
 msgstr "äÏͦ×ËÁ"
 
-#: src/nautilus-shell-ui.xml.h:91
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "ðÏÌÏÖÅÎÎÑ"
+
+#: src/nautilus-shell-ui.xml.h:88
 msgid "_Nautilus Themes..."
 msgstr "ôÅÍÉ îÁÕÔ¦ÌÕÓÁ..."
 
-#: src/nautilus-shell-ui.xml.h:92
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_Normal Size"
 msgstr "ú×ÉÞÁÊÎÉÊ ÒÏÚͦÒ"
 
-#: src/nautilus-shell-ui.xml.h:94
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "ðÁÒÁÍÅÔÒÉ"
+
+#: src/nautilus-shell-ui.xml.h:92
 msgid "_Profiler"
 msgstr "ðÒÏƦÌÀ×ÁÌØÎÉË"
 
-#: src/nautilus-shell-ui.xml.h:95
+#: src/nautilus-shell-ui.xml.h:93
 msgid "_Refresh"
 msgstr "ïÎÏ×ÉÔÉ"
 
-#: src/nautilus-shell-ui.xml.h:96
+#: src/nautilus-shell-ui.xml.h:94
 msgid "_Report Profiling"
 msgstr "ú×¦Ô ÐÒÏƦÌÀ×ÁÎÎÑ"
 
-#: src/nautilus-shell-ui.xml.h:97
+#: src/nautilus-shell-ui.xml.h:95
 msgid "_Reset Profiling"
 msgstr "óËÉÎÕÔÉ ÐÒÏƦÌÀ×ÁÎÎÑ"
 
-#: src/nautilus-shell-ui.xml.h:98
+#: src/nautilus-shell-ui.xml.h:96
 msgid "_Start Profiling"
 msgstr "òÏÚÐÏÞÁÔÉ ÐÒÏƦÌÀ×ÁÎÎÑ"
 
-#: src/nautilus-shell-ui.xml.h:99
+#: src/nautilus-shell-ui.xml.h:97
 msgid "_Stop Profiling"
 msgstr "úÕÐÉÎÉÔÉ ÐÒÏƦÌÀ×ÁÎÎÑ"
 
-#: src/nautilus-shell-ui.xml.h:100
+#: src/nautilus-shell-ui.xml.h:98
 msgid "_Undo"
 msgstr "÷¦ÄͦÎÉÔÉ"
 
-#: src/nautilus-shell-ui.xml.h:101
+#: src/nautilus-shell-ui.xml.h:99
 msgid "_Up a Level"
 msgstr "ð¦ÄÎÑÔÉ Ò¦×ÅÎØ"
 
-#: src/nautilus-shell-ui.xml.h:102
+#: src/nautilus-shell-ui.xml.h:100
 msgid "_View"
 msgstr "ðÅÒÅÇÌÑÄ"
 
-#: src/nautilus-sidebar.c:659
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
 msgstr ""
 
-#: src/nautilus-sidebar.c:661
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr "â¦ÌØÛ Î¦Ö ÏÄÎÅ ÚÏÂÒÁÖÅÎÎÑ"
 
-#: src/nautilus-sidebar.c:680
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
 msgstr ""
 
-#: src/nautilus-sidebar.c:682
+#: src/nautilus-sidebar.c:717
 msgid "Local Images Only"
 msgstr "ìÉÛÅ ÌÏËÁÌØΦ ÚÏÂÒÁÖÅÎÎÑ"
 
-#: src/nautilus-sidebar.c:687
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
 msgstr ""
 
-#: src/nautilus-sidebar.c:689
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr "ìÉÛÅ ÚÏÂÒÁÖÅÎÎÑ"
 
-#: src/nautilus-sidebar.c:1247
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "÷¦ÄËÒÉÔÉ ÚÁ ÄÏÐÏÍÏÇÏÀ %s"
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1283
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "÷¦ÄËÒÉÔÉ Õ..."
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-sidebar.c:1390
+#: src/nautilus-sidebar.c:1424
 msgid "  Empty Trash  "
 msgstr "  óÐÏÒÏÖÎÉÔÉ ÓͦÔÎÉË  "
 
@@ -9448,16 +9656,16 @@ msgstr "îÅ ×ÄÁÌÏÓÑ ×ÉÄÁÌÉÔÉ ÔÅÍÕ"
 msgid "No description available for the \"%s\" theme"
 msgstr "îÅÍÁ¤ ÏÐÉÓÕ ÔÅÍÉ %s"
 
-#: src/nautilus-window.c:584
+#: src/nautilus-window.c:637
 msgid "View as ..."
 msgstr "ðÏËÁÚÁÔÉ ÑË..."
 
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:1286
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "ðÏËÁÚÁÔÉ ÑË ¦ÎÛÅ..."
 
-#: src/nautilus-window.c:1687
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "úÁËÒÉÔÉ"
 
@@ -9471,23 +9679,23 @@ msgstr "úÁËÒÉÔÉ"
 msgid "Preview Release %s: %s"
 msgstr "ðÏÐÅÒÅÄÎ¦Ê ×ÉÐÕÓË %s: %s"
 
-#: src/nautilus-window-manage-views.c:812
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr "úÂ¦Ê ÐÅÒÅÇÌÑÄÕ"
 
-#: src/nautilus-window-manage-views.c:823
+#: src/nautilus-window-manage-views.c:831
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
 "view or go to a different location."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:834
+#: src/nautilus-window-manage-views.c:842
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "÷ÉÑ×ÌÅÎÏ ÐÏÍÉÌËÕ ÐÅÒÅÇÌÑÄÕ %s Ð¦Ä ÞÁÓ ÚÁÐÕÓËÕ."
 
-#: src/nautilus-window-manage-views.c:993
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
@@ -9495,32 +9703,32 @@ msgstr ""
 "ïÄÎÁ Ú ÂÏËÏ×ÉÈ ÐÁÎÅÌÅÊ ×ÉËÌÉËÁÌÁ ÐÏÍÉÌËÕ ¦ ÎÅ ÍÏÖÅ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉÓØ ÄÁ̦.\n"
 "îÁÖÁÌØ ÎÅÍÏÖÌÉ×Ï ÓËÁÚÁÔÉ ÑËÁ ÓÁÍÅ."
 
-#: src/nautilus-window-manage-views.c:997
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
 "happening, you might want to turn this panel off."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1002
+#: src/nautilus-window-manage-views.c:1010
 msgid "Sidebar Panel Failed"
 msgstr "úÂ¦Ê Â¦ÞÎϧ ÐÁÎÅ̦"
 
-#: src/nautilus-window-manage-views.c:1217
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr ""
 "îÅ ×ÄÁÌÏÓÑ ÚÎÁÊÔÉ \"%s\". âÕÄØ ÌÁÓËÁ, ÐÅÒÅצÒÔÅ ÏÒÆÏÇÒÁƦÀ, ÔÁ ÓÐÒÏÂÕÊÔÅ "
 "ÚÎÏ×Õ."
 
-#: src/nautilus-window-manage-views.c:1223
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
 msgstr ""
 "\"%s\" ΊצÒΊͦÓÃÅ. âÕÄØ ÌÁÓËÁ, ÐÅÒÅצÒÔÅ ××ÅÄÅÎÅ ¦ ÓÐÒÏÂÕÊÔÅ ÚÎÏ×Õ."
 
-#: src/nautilus-window-manage-views.c:1237
+#: src/nautilus-window-manage-views.c:1245
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -9529,31 +9737,31 @@ msgstr ""
 "îÅÍÏÖÌÉ×Ï ÐÏËÁÚÁÔÉ \"%s\" ÔÏÍÕ, ÝÏ îÁÕÔ¦ÌÕÓ ÎÅ ÍÏÖÅ ÏÂÒÏÂÌÑÔÉ ÆÁÊÌÉ ÔÁËÏÇÏ "
 "ÔÉÐÕ."
 
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr ""
 "îÁÕÔ¦ÌÕÓ ÎÅ ÍÁ¤ ×ÓÔÁÎÏ×ÌÅÎϧ ÐÒÏÇÒÁÍÉ ÐÅÒÅÇÌÑÄÕ, ÑËÁ ÍÏÖÅ ÐÏËÁÚÁÔÉ \"%s\"."
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1257
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 "îÅÍÏÖÌÉ×Ï ÐÏËÁÚÁÔÉ \"%s\" ÔÏÍÕ, ÝÏ îÁÕÔ¦ÌÕÓ ÎÅ ÍÏÖÅ ÏÂÒÏÂÌÑÔÉ ÁÄÒÅÓÉ %s:."
 
-#: src/nautilus-window-manage-views.c:1263
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr ""
 "îÅÍÏÖÌÉ×Ï ÐÏËÁÚÁÔÉ \"%s\" ÔÏÍÕ, ÝÏ îÁÕÔ¦ÌÕÓÕ ÎÅ ×ÄÁÌÁÓØ ÓÐÒÏÂÁ ÒŤÓÔÒÁæ§."
 
-#: src/nautilus-window-manage-views.c:1268
+#: src/nautilus-window-manage-views.c:1276
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "îÅ ×ÄÁÌÏÓÑ ×¦ÄÏÂÒÁÚÉÔÉ \"%s\" ÞÅÒÅÚ ×¦ÄÍÏ×Õ × ÄÏÓÔÕЦ."
 
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1287
 #, fuzzy, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
@@ -9562,7 +9770,7 @@ msgstr ""
 "îÅÍÏÖÌÉ×Ï ÐÏËÁÚÁÔÉ \"%s\" ÔÏÍÕ, ÝÏ ÈÏÓÔÁ ÎÅ ÚÎÁÊÄÅÎÏ. ðÅÒÅËÏÎÁÊÔÅÓØ, ÝÏ Õ "
 "×ÁÓ ×¦ÒÎÏ ÎÁÌÁÛÔÏ×ÁÎÏ ÐÒÏËÓÉ."
 
-#: src/nautilus-window-manage-views.c:1287
+#: src/nautilus-window-manage-views.c:1295
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
@@ -9571,7 +9779,7 @@ msgstr ""
 "îÅÍÏÖÌÉ×Ï ÐÏËÁÚÁÔÉ \"%s\" ÔÏÍÕ, ÝÏ ÎÁÚ×Á ÈÏÓÔÁ ÐÏÒÏÖÎÑ. ðÅÒÅËÏÎÁÊÔÅÓØ, ÝÏ Õ "
 "×ÁÓ ×¦ÒÎÏ ÎÁÌÁÛÔÏ×ÁÎÏ ÐÒÏËÓ¦."
 
-#: src/nautilus-window-manage-views.c:1299
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -9579,23 +9787,23 @@ msgid ""
 "running."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1303
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr "ðÏÛÕË ÎÅ ÄÏÓÔÕÐÎÉÊ"
 
-#: src/nautilus-window-manage-views.c:1307
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄÏÂÒÁÚÉÔÉ \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1312
+#: src/nautilus-window-manage-views.c:1320
 msgid "Can't Display Location"
 msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄÏÂÒÁÚÉÔÉ ÐÏÌÏÖÅÎÎÑ."
 
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:317
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
@@ -9603,42 +9811,42 @@ msgstr ""
 "÷É ÐÅÒÅËÏÎÁΦ × ÔÏÍÕ, ÝÏ ÈÏÞÅÔÅ ÓÔÅÒÔÉ ¦ÓÔÏÒ¦À? ñËÝÏ ×É ÚÒÏÂÉÔÅ ÃÅ, ÔÏ ÎÅ "
 "ÚÍÏÖÅÔŠצÄÎÏ×ÉÔÉ §§."
 
-#: src/nautilus-window-menus.c:320
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
 "÷É ÐÅÒÅËÏÎÁΦ × ÔÏÍÕ, ÝÏ ÈÏÞÅÔÅ ÝÏ îÁÕÔ¦ÌÕÓ ÚÎÉÝÉ× ¦ÎÆÏÒÍÁæÀ ÐÒÏ ×¦ÄצÄÁΦ "
 "×ÁÍÉ Í¦ÓÃÑ?"
 
-#: src/nautilus-window-menus.c:325
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr "úÁÂÕÔÉ ¦ÓÔÏÒ¦À?"
 
-#: src/nautilus-window-menus.c:326
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr "úÁÂÕÔÉ"
 
-#: src/nautilus-window-menus.c:429
+#: src/nautilus-window-menus.c:466
 #, fuzzy
 msgid "Show St_atus Bar"
 msgstr "ðÏËÁÚÁÔÉ ÐÁÎÅÌØ ÓÔÁÎÕ"
 
-#: src/nautilus-window-menus.c:435
+#: src/nautilus-window-menus.c:472
 #, fuzzy
 msgid "Show _Sidebar"
 msgstr "ðÏËÁÚÁÔÉ Â¦ÞÎÕ ÐÁÎÅÌØ"
 
-#: src/nautilus-window-menus.c:441
+#: src/nautilus-window-menus.c:478
 #, fuzzy
 msgid "Show _Toolbar"
 msgstr "ðÏËÁÚÁÔÉ ÐÁÎÅÌØ ¦ÎÓÔÒÕÍÅÎÔ¦×"
 
-#: src/nautilus-window-menus.c:447
+#: src/nautilus-window-menus.c:484
 #, fuzzy
 msgid "Show Location _Bar"
 msgstr "ðÏËÁÚÁÔÉ ÐÁÎÅÌØ ÒÏÚͦÝÅÎÎÑ"
 
-#: src/nautilus-window-menus.c:498
+#: src/nautilus-window-menus.c:535
 msgid "Preferences"
 msgstr "ðÁÒÁÍÅÔÒÉ"
 
@@ -9648,11 +9856,11 @@ msgstr "ðÁÒÁÍÅÔÒÉ"
 #. * not translate the
 #. * company name, please.
 #.
-#: src/nautilus-window-menus.c:581
+#: src/nautilus-window-menus.c:618
 msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr "á×ÔÏÒÓØ˦ ÐÒÁ×Á ¿ 1999-2001 Eazel, Inc."
 
-#: src/nautilus-window-menus.c:583
+#: src/nautilus-window-menus.c:620
 msgid ""
 "Nautilus is a graphical shell\n"
 "for GNOME that makes it\n"
@@ -9668,11 +9876,11 @@ msgstr ""
 #. * bottom of the about box to give credit
 #. * to the translator(s)
 #.
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:629
 msgid "Translator Credits"
 msgstr "ðÅÒÅËÌÁÄ ÚĦÊÓÎÅÎÏ àÒ¦¤Í óÉÒÏÔÏÀ <yuri@renome.rovno.ua>"
 
-#: src/nautilus-window-menus.c:762
+#: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
@@ -9681,27 +9889,23 @@ msgstr ""
 "í¦ÓÃÑ \"%s\" ÎÅ ¦ÓÎÕ¤. èÏÞÅÔÅ ×ÉÄÁÌÉÔÉ ×Ó¦ ÚÁËÌÁÄËÉ Ó ÃÉÍ Í¦ÓÃÅÍ Ú ×ÁÛÏÇÏ "
 "ÓÐÉÓËÕ?"
 
-#: src/nautilus-window-menus.c:766
+#: src/nautilus-window-menus.c:793
 msgid "Bookmark for Nonexistent Location"
 msgstr "úÁËÌÁÄËÁ ÎÁ ͦÓÃÅ, ÝÏ ÎÅ ¦ÓÎÕ¤"
 
-#: src/nautilus-window-menus.c:780
+#: src/nautilus-window-menus.c:807
 #, c-format
 msgid "The location \"%s\" no longer exists."
 msgstr "í¦ÓÃÑ \"%s\" ¦ÌØÛÅ ÎÅ ¦ÓÎÕ¤."
 
-#: src/nautilus-window-menus.c:781
+#: src/nautilus-window-menus.c:808
 msgid "Go to Nonexistent Location"
 msgstr "ðÅÒÅÊÔÉ ÄÏ Í¦ÓÃÑ, ÝÏ ÎÅ ¦ÓÎÕ¤"
 
-#: src/nautilus-window-menus.c:850
+#: src/nautilus-window-menus.c:877
 msgid "Go to the location specified by this bookmark"
 msgstr "ðÅÒÅÊÔÉ ÄÏ Í¦ÓÃÑ ×ËÁÚÁÎÏÇÏ ÚÁËÌÁÄËÏÀ"
 
-#: src/nautilus-window-menus.c:1361
-msgid "_Browse"
-msgstr "ðÅÒÅÇÌÑÎÕÔÉ"
-
 #: src/nautilus-window-toolbars.c:402
 msgid "Back"
 msgstr "îÁÚÁÄ"
@@ -9717,6 +9921,121 @@ msgstr "÷ÐÅÒÅÄ"
 msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 
+#~ msgid "helvetica"
+#~ msgstr "ÇÅÌ×ÅÔÉËÁ"
+
+#~ msgid "_Fonts"
+#~ msgstr "ûÒÉÆÔÉ"
+
+#~ msgid "You cannot move a file onto itself."
+#~ msgstr "îÅÍÏÖÌÉ×Ï ÐÅÒÅÎÏÓÉÔÉ ÆÁÊÌ × ÓÅÂÅ."
+
+#~ msgid "Can't Move Onto Self"
+#~ msgstr "îÅÍÏÖÉ×Ï ÐÅÒÅÎÏÓÉÔÉ × ÓÅÂÅ"
+
+#, fuzzy
+#~ msgid "Normal"
+#~ msgstr "ú×ÉÞÁÊÎÉÊ ÒÏÚͦÒ"
+
+#, fuzzy
+#~ msgid "Bold"
+#~ msgstr "Borland"
+
+#, fuzzy
+#~ msgid "Book"
+#~ msgstr "ÇÁÒÁÚÄ"
+
+#, fuzzy
+#~ msgid "Light"
+#~ msgstr "óÐÉÓÏË"
+
+#, fuzzy
+#~ msgid "Italic"
+#~ msgstr "âÁÌÔ¦ÊÓØËÉÊ"
+
+#, fuzzy
+#~ msgid "Oblique"
+#~ msgstr "óÔÁÒÁ"
+
+#, fuzzy
+#~ msgid "Reverse Italic"
+#~ msgstr "÷¦ÄÎÏ×ÉÔÉ"
+
+#, fuzzy
+#~ msgid "Reverse Oblique"
+#~ msgstr "ú×ÏÒÏÔÎ¦Ê ÐÏÒÑÄÏË"
+
+#, fuzzy
+#~ msgid "Condensed"
+#~ msgstr "÷ͦÓÔ:"
+
+#~ msgid "Font"
+#~ msgstr "ûÒÉÆÔ"
+
+#~ msgid "01/01/00, 01:00 AM"
+#~ msgstr "01/01/00, 01:00 äð"
+
+#~ msgid "1/1/00, 1:00 AM"
+#~ msgstr "1/1/00, 1:00 äð"
+
+#~ msgid " 1/ 1/00,  1:00 AM"
+#~ msgstr " 1/ 1/00,  1:00 äð"
+
+#~ msgid "current theme"
+#~ msgstr "ÐÏÔÏÞÎÁ ÔÅÍÁ"
+
+#~ msgid "Use this font family to display file names:"
+#~ msgstr "÷ÉËÏÒÉÓÔÁÔÉ ÃÀ ­ÁÒΦÔÕÒÕ ÄÌÑ ×¦ÄÏÂÒÁÖÅÎÎÑ ÎÁÚ× ÆÁÊ̦×:"
+
+#~ msgid "Can add Content"
+#~ msgstr "íÏÖÎÁ ÄÏÄÁÔÉ ×ͦÓÔ"
+
+#~ msgid "No image was selected.  You must click on an image to select it."
+#~ msgstr ""
+#~ "îÅ ×ÉÂÒÁÎÏ ÚÏÂÒÁÖÅÎÎÑ.  ðÏÔÒ¦ÂÎÏ ËÌÁÃÎÕÔÉ ÎÁ ÚÏÂÒÁÖÅÎΦ, ÝÏ ×ÉÂÒÁÔÉ ÊÏÇÏ."
+
+#~ msgid "No selection made"
+#~ msgstr "÷ÉÂÏÒÕ ÎÅ ÚÒÏÂÌÅÎÏ"
+
+#~ msgid "Remember this password"
+#~ msgstr "úÁÐÁÍ'ÑÔÁÔÉ ÃÅ ÐÁÒÏÌØ"
+
+#~ msgid "times"
+#~ msgstr "ÔÁÊÍÓ"
+
+#~ msgid "courier"
+#~ msgstr "ËÕÒ'¤Ò"
+
+#~ msgid "lucida"
+#~ msgstr "ÌÀæÄÁ"
+
+#~ msgid "Details"
+#~ msgstr "ðÏÄÒÏÂÉæ"
+
+#~ msgid "Warning"
+#~ msgstr "ðÏÐÅÒÅÄÖÅÎÎÑ"
+
+#~ msgid "Error"
+#~ msgstr "ðÏÍÉÌËÁ"
+
+#~ msgid "Question"
+#~ msgstr "úÁÐÉÔÁÎÎÑ"
+
+#~ msgid "Removes the selected text without putting it on the clipboard"
+#~ msgstr "÷ÉÄÁÌÉÔÉ ×ÉÂÒÁÎÉÊ ÔÅËÓÔ ÂÅÚ ÒÏÚͦÝÅÎÎÑ ÊÏÇÏ × ÂÕÆÅÒ¦ ÏÂͦÎÕ"
+
+#~ msgid "Use Advanced settings"
+#~ msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÒÏÚ×ÉÎÕÔ¦ ÕÓÔÁÎÏ×ËÉ"
+
+#~ msgid "Use Beginner settings"
+#~ msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÕÓÔÁÎÏ×ËÉ ÐÏÞÁÔ˦×ÃÑ"
+
+#~ msgid "Use Intermediate settings"
+#~ msgstr "÷ÉËÏÒÉÔÏ×Õ×ÁÔÉ ÐÒÏͦÖËÏצ ÕÓÔÁÎÏ×ËÉ"
+
+#~ msgid "_Browse"
+#~ msgstr "ðÅÒÅÇÌÑÎÕÔÉ"
+
 #~ msgid "Verifying %s..."
 #~ msgstr "ðÅÒÅצÒËÁ %s..."
 
@@ -9765,9 +10084,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 #~ msgid "Verify"
 #~ msgstr "ðÅÒÅצÒÉÔÉ"
 
-#~ msgid "Description"
-#~ msgstr "ïÐÉÓ"
-
 #~ msgid "Package Contents: %d files"
 #~ msgstr "÷ͦÓÔ ÐÁËÅÔÕ: %d ÆÁÊ̦×"
 
@@ -9837,9 +10153,6 @@ msgstr "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
 #~ msgid "Error Moving to Trash"
 #~ msgstr "ðÏÍÉÌËÁ ÐÅÒÅÎÅÓÅÎÎÑ Õ ÓͦÔÎÉË"
 
-#~ msgid "_Cut Text"
-#~ msgstr "÷ÉÒ¦ÚÁÔÉ ÔÅËÓÔ"
-
 #~ msgid "Open in _New Window"
 #~ msgstr "÷¦ÄËÒÉÔÉ Õ ÎÏ×ÏÍÕ ×¦ËΦ"
 
diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index 9eade7a5d..9cebd4902 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -2,16 +2,15 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Gong Yi LIAO <granziliao@sinamail.com>, 2000.
 #
-#: libnautilus-extensions/nautilus-search-uri.c:362
-#: libnautilus-extensions/nautilus-search-uri.c:368
-#: libnautilus-extensions/nautilus-search-uri.c:371
-#: libnautilus-extensions/nautilus-search-uri.c:374
-#: libnautilus-extensions/nautilus-search-uri.c:377
-#: libnautilus-extensions/nautilus-search-uri.c:380
+#: libnautilus-extensions/nautilus-global-preferences.c:854
+#: libnautilus-extensions/nautilus-global-preferences.c:862
+#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:888
+#: libnautilus-extensions/nautilus-global-preferences.c:898
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus CVS-20000722\n"
-"POT-Creation-Date: 2000-09-28 20:44+0200\n"
+"POT-Creation-Date: 2001-04-03 02:42-0700\n"
 "PO-Revision-Date: 2000-08-04 03:25+0800\n"
 "Last-Translator: Gong Yi LIAO <granziliao@sinamail.com>\n"
 "Language-Team: Taiwanese <granziliao@sinamail.com>\n"
@@ -19,6 +18,236 @@ msgstr ""
 "Content-Type: text/plain; charset=big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: applets/launcher/nautilus-launcher-applet.c:272
+msgid "Can't create nautilus-launcher-applet!"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:211
+msgid "Can't create nautilus-preferences-applet!"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:226
+msgid "Show Desktop"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:230
+#, fuzzy
+msgid "Smooth Graphics"
+msgstr "¶ê¼í¼Ò¦¡"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:243
+#: src/nautilus-application.c:639
+msgid "Quit"
+msgstr ""
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:251
+#, fuzzy
+msgid "Start"
+msgstr "ª¬ºA"
+
+#: applets/preferences-applet/nautilus-preferences-applet.c:259
+#, fuzzy
+msgid "Restart"
+msgstr "­«¸Õ"
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:1
+msgid "Factory for Nautilus component adapter factories"
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:2
+msgid "Factory for Nautilus component adapter factories "
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:3
+msgid ""
+"Factory for objects that wrap ordinary Bonobo Controls or Embeddables to "
+"look like Nautilus Views"
+msgstr ""
+
+#: components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in.h:4
+msgid "Nautilus component adapter factory"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:230
+#, c-format
+msgid ""
+"%s CPU\n"
+"%s MHz\n"
+"%s cache size"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:264
+#, c-format
+msgid "%lu GB RAM"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:266
+#, c-format
+msgid "%lu MB RAM"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:324
+#, c-format
+msgid "%lu GB"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:326
+#, fuzzy, c-format
+msgid "%lu MB"
+msgstr "1 MB"
+
+#. set up the title
+#: components/hardware/nautilus-hardware-view.c:407
+msgid "Hardware Overview"
+msgstr ""
+
+#: components/hardware/nautilus-hardware-view.c:520
+#, fuzzy
+msgid "This is a placeholder for the CPU page."
+msgstr "³o¬O¹w§i,·q½Ð´Á«Ý."
+
+#: components/hardware/nautilus-hardware-view.c:545
+#, fuzzy
+msgid "This is a placeholder for the RAM page."
+msgstr "³o¬O¹w§i,·q½Ð´Á«Ý."
+
+#: components/hardware/nautilus-hardware-view.c:570
+#, fuzzy
+msgid "This is a placeholder for the IDE page."
+msgstr "³o¬O¹w§i,·q½Ð´Á«Ý."
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:2
+#: components/hardware/nautilus-hardware-view.c:631
+#: data/static_bookmarks.xml.h:16
+msgid "Hardware"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:1
+msgid "Factory for hardware view"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:3
+msgid "Hardware Viewer"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:4
+msgid "Hardware view"
+msgstr ""
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:5
+#, fuzzy
+msgid "View as Hardware"
+msgstr "¥H¨ä¥LÂsÄý..."
+
+#: components/hardware/Nautilus_View_hardware.oaf.in.h:6
+msgid "hardware view"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/gdb3html.c:712
+#: components/music/nautilus-music-view.c:1512
+msgid "Previous"
+msgstr "¿ï¨ú"
+
+#: components/help/converters/gnome-db2html2/gdb3html.c:721
+#: libnautilus-extensions/nautilus-global-preferences.c:789
+#: src/nautilus-shell-ui.xml.h:36
+msgid "Home"
+msgstr "®a¥Ø¿ý"
+
+#: components/help/converters/gnome-db2html2/gdb3html.c:730
+#: components/music/nautilus-music-view.c:1568
+msgid "Next"
+msgstr "¤U¤@­º"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:259
+#: components/notes/Nautilus_View_notes.oaf.in.h:2
+#, fuzzy
+msgid "Notes"
+msgstr "¨S¦³²Å¦X¤ñ¹ï±ø¥óªº¶µ¥Ø"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:709
+#, c-format
+msgid "Table %d."
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:864
+msgid "Up to Table of Contents"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1012
+#, fuzzy, c-format
+msgid "Figure %s"
+msgstr "¬O %s"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1032
+msgid "the section here"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1034
+#, fuzzy
+msgid "the section"
+msgstr "´y­z"
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1090
+#, c-format
+msgid "Figure %d"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:1102
+msgid "IMAGE"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:2068
+#: components/help/converters/gnome-db2html2/sect-elements.c:2070
+#, fuzzy
+msgid "Legal Notice"
+msgstr "·s¤â"
+
+#. This 'Q' is short for 'Question:'
+#: components/help/converters/gnome-db2html2/sect-elements.c:2116
+msgid "Q"
+msgstr ""
+
+#. This 'A' is short for 'Answer'
+#: components/help/converters/gnome-db2html2/sect-elements.c:2128
+msgid "A"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:2151
+msgid "See"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/sect-elements.c:2178
+#, fuzzy
+msgid "See also"
+msgstr "©Î°Ñ¦Ò "
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:322
+msgid "GNOME Documentation"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:353
+#, fuzzy
+msgid "Copyright"
+msgstr "½Æ»s"
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:353
+msgid "by"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:355
+#, fuzzy
+msgid "Table of Contents"
+msgstr "®M¥ó¥Ø¿ý"
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:521
+msgid "PREFACE"
+msgstr ""
+
+#: components/help/converters/gnome-db2html2/toc-elements.c:530
+msgid "APPENDIX"
+msgstr ""
+
 #. * From 'man(7)':
 #.
 #. The manual sections are traditionally defined as follows:
@@ -59,59 +288,83 @@ msgstr ""
 #. GNU Public  License  and  many  people  are
 #. working on changes to the kernel)
 #. **
-#: components/help/hyperbola-filefmt.c:396
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:537
+#: components/help/hyperbola-filefmt.c:538
+#: components/help/hyperbola-filefmt.c:539
+#: components/help/hyperbola-filefmt.c:541
+#: components/help/hyperbola-filefmt.c:543
 msgid "Manual"
 msgstr "»¡©ú"
 
-#: components/help/hyperbola-filefmt.c:397
-msgid "System"
-msgstr "¨t²Î"
-
-#: components/help/hyperbola-filefmt.c:397
-msgid "Configuration"
-msgstr "³]©w"
-
-#: components/help/hyperbola-filefmt.c:397
-msgid "Config files"
-msgstr "³]©wÀÉ®×"
-
-#: components/help/hyperbola-filefmt.c:398
-#: components/help/hyperbola-filefmt.c:671
+#: components/help/hyperbola-filefmt.c:530
+#: components/help/hyperbola-filefmt.c:861 data/linksets/apps.xml.h:1
 msgid "Applications"
 msgstr "À³¥Îµ{¦¡"
 
-#: components/help/hyperbola-filefmt.c:398
-msgid "Command Line"
-msgstr "«ü¥O¦C"
-
-#: components/help/hyperbola-filefmt.c:399
-#: components/help/hyperbola-filefmt.c:400
+#: components/help/hyperbola-filefmt.c:532
+#: components/help/hyperbola-filefmt.c:534
+#: components/help/hyperbola-filefmt.c:536
+#: components/help/hyperbola-filefmt.c:543
 msgid "Development"
 msgstr "µ{¦¡¶}µo"
 
-#: components/help/hyperbola-filefmt.c:399
-#: components/help/hyperbola-filefmt.c:400
-msgid "APIs"
-msgstr "API"
-
-#: components/help/hyperbola-filefmt.c:399
-msgid "Miscellaneous"
-msgstr "¨ä¥L"
-
-#: components/help/hyperbola-filefmt.c:400
+#: components/help/hyperbola-filefmt.c:532
 msgid "System Calls"
 msgstr "¨t²Î©I¥s"
 
-#: components/help/hyperbola-filefmt.c:556
-#: libnautilus-extensions/nautilus-stock-dialogs.c:365
+#: components/help/hyperbola-filefmt.c:534
+msgid "Library Functions"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:536
+#, fuzzy
+msgid "Devices"
+msgstr "Services"
+
+#: components/help/hyperbola-filefmt.c:537
+#, fuzzy
+msgid "Configuration Files"
+msgstr "³]©w"
+
+#: components/help/hyperbola-filefmt.c:538
+#, fuzzy
+msgid "Games"
+msgstr "¦WºÙ"
+
+#: components/help/hyperbola-filefmt.c:539
+#, fuzzy
+msgid "Conventions"
+msgstr "¥Ø¿ý:"
+
+#: components/help/hyperbola-filefmt.c:541
+msgid "System Administration"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:543
+msgid "Kernel Routines"
+msgstr ""
+
+#: components/help/hyperbola-filefmt.c:703
 msgid "Info"
 msgstr "°T®§"
 
-#: components/help/hyperbola-nav-index.c:124
+#: components/help/hyperbola-nav-tree.c:310
+msgid "Introductory Documents:"
+msgstr ""
+
+#: components/help/hyperbola-nav-tree.c:324
+msgid "Documents by Subject:"
+msgstr ""
+
+#: components/help/hyperbola-nav-index.c:121
 msgid "see "
 msgstr "°Ñ¦Ò "
 
-#: components/help/hyperbola-nav-index.c:128
+#: components/help/hyperbola-nav-index.c:125
 msgid "see also "
 msgstr "©Î°Ñ¦Ò "
 
@@ -119,19 +372,107 @@ msgstr "©Î°Ñ¦Ò "
 msgid "No matches."
 msgstr "¨S¦³²Å¦X¤ñ¹ï±ø¥óªº¶µ¥Ø"
 
-#: components/help/hyperbola-nav-index.c:479
+#: components/help/hyperbola-nav-index.c:476
 msgid " (see \""
 msgstr " (°Ñ¦Ò \""
 
-#: components/help/hyperbola-nav-index.c:484
+#: components/help/hyperbola-nav-index.c:479
 msgid " (see also \""
 msgstr "(©Î°Ñ¦Ò \""
 
-#: components/image-viewer/nautilus-image-view.c:698
+#: components/help/Nautilus_View_help.oaf.in.h:1
+#: components/services/summary/nautilus-summary-dialogs.c:106
+#, fuzzy
+msgid "Help"
+msgstr "»¡©ú"
+
+#: components/help/Nautilus_View_help.oaf.in.h:2
+msgid "Help Index"
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:3
+msgid "Help Index sidebar panel"
+msgstr ""
+
+#: components/help/Nautilus_View_help.oaf.in.h:4
+#, fuzzy
+msgid "Help Navigation Tree"
+msgstr "¾É´M"
+
+#: components/help/Nautilus_View_help.oaf.in.h:5
+#, fuzzy
+msgid "Help Search"
+msgstr "·j´Mºô¯¸"
+
+#: components/help/Nautilus_View_help.oaf.in.h:6
+#, fuzzy
+msgid "Help Search sidebar panel"
+msgstr "°¼¦C"
+
+#: components/help/Nautilus_View_help.oaf.in.h:7
+#, fuzzy
+msgid "Help sidebar panel"
+msgstr "°¼¦C"
+
+#: components/help/Nautilus_View_help.oaf.in.h:8
+msgid "Internal use only"
+msgstr ""
+
+#: components/history/Nautilus_View_history.oaf.in.h:1
+msgid "Factory for history views"
+msgstr ""
+
+#: components/history/Nautilus_View_history.oaf.in.h:2
+#, fuzzy
+msgid "History"
+msgstr "¤µ¤é"
+
+#: components/history/Nautilus_View_history.oaf.in.h:3
+#, fuzzy
+msgid "History sidebar panel"
+msgstr "°¼¦C"
+
+#: components/history/Nautilus_View_history.oaf.in.h:4
+msgid "History sidebar panel for Nautilus"
+msgstr ""
+
+#: components/image-viewer/nautilus-image-view.c:833
 #, fuzzy
 msgid "I could not initialize Bonobo"
 msgstr "µLªk±N Bonoboªì©l¤Æ"
 
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:1
+msgid "Generic Image Viewer"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:2
+msgid "Generic image control factory"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:3
+msgid "Image"
+msgstr ""
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:4
+#, fuzzy
+msgid "Image Viewer"
+msgstr "¥Î %s "
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:5
+#, fuzzy
+msgid "Nautilus Image Viewer"
+msgstr "Nautilus: ½Ð¥H¨ä¥Lµ{¦¡ÂsÄý"
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:6
+#, fuzzy
+msgid "Nautilus Image viewer factory"
+msgstr "Nautilus: ³qª¾"
+
+#: components/image-viewer/Nautilus_View_image.oaf.in.h:7
+#, fuzzy
+msgid "View as Image"
+msgstr "¥H %s ÂsÄý"
+
 #: components/loser/content/nautilus-content-loser.c:140
 #, c-format
 msgid ""
@@ -143,38 +484,67 @@ msgstr ""
 "\n"
 "³o¬O Nautilus ªº½Ð¨D¿ù»~²M³æ."
 
-#: components/loser/content/nautilus-content-loser.c:199
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"You clicked the Kill Content View toolbar button."
+#: components/loser/content/nautilus-content-loser.c:189
+msgid "You have tried to kill the Content Loser"
 msgstr ""
-"%s\n"
-"\n"
-"±z«ö¤U¤F¥Ø¿ý¤u§@¦Cªº²M°£«ö¶s."
 
-#. BonoboUIHandler
-#. menu item path, must start with /some-existing-menu-path and be otherwise unique
-#: components/loser/content/nautilus-content-loser.c:247
-msgid "_Kill Content View"
+#: components/loser/content/nautilus-content-loser-ui.xml.h:1
+#, fuzzy
+msgid "Kill Content Loser"
 msgstr "²M°£¤º®e¹wÄý"
 
-#. menu item user-displayed label
-#: components/loser/content/nautilus-content-loser.c:248
+#: components/loser/content/nautilus-content-loser-ui.xml.h:2
 msgid "Kill the Loser content view"
 msgstr "²M°£½Õ¾ã¤º®e¹wÄý"
 
-#. BonoboUIHandler
-#. button path, must start with /some-existing-toolbar-path and be otherwise unique
-#: components/loser/content/nautilus-content-loser.c:267
-msgid "Kill Content View"
+#: components/loser/content/nautilus-content-loser-ui.xml.h:3
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
+#: components/sample/nautilus-sample-content-view-ui.xml.h:4
+#: src/nautilus-shell-ui.xml.h:81
+msgid "_File"
+msgstr "ÀÉ®×"
+
+#: components/loser/content/nautilus-content-loser-ui.xml.h:4
+#, fuzzy
+msgid "_Kill Content Loser"
 msgstr "²M°£¤º®e¹wÄý"
 
-#. button user-displayed label
-#: components/loser/content/nautilus-content-loser.c:268
-msgid "Kill the Loser content view."
-msgstr "²M°£½Õ¾ã¤º®e¹wÄý"
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:1
+#, fuzzy
+msgid "Content Loser"
+msgstr "¥Ø¿ý:"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:2
+#, fuzzy
+msgid "Content Loser Viewer"
+msgstr "²M°£¤º®e¹wÄý"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:3
+#, fuzzy
+msgid "Nautilus Content Loser"
+msgstr "Nautilus: ©Ê½èÂsÄý¾¹"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:4
+msgid "Nautilus content loser component's factory"
+msgstr ""
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:5
+#, fuzzy
+msgid "Nautilus content loser factory"
+msgstr "Nautilus: ©Ê½èÂsÄý¾¹"
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:6
+#, fuzzy
+msgid "Nautilus content view that fails on command"
+msgstr ""
+"%s\n"
+"\n"
+"³o¬O Nautilus ªº½Ð¨D¿ù»~²M³æ."
+
+#: components/loser/content/Nautilus_View_content-loser.oaf.in.h:7
+#, fuzzy
+msgid "View as Content Loser"
+msgstr "¥H¨ä¥LÂsÄý..."
 
 #: components/loser/sidebar/nautilus-sidebar-loser.c:143
 #, c-format
@@ -187,320 +557,1275 @@ msgstr ""
 "\n"
 "ÁôÂû²§U¤u¨ã¦C."
 
-#: components/loser/sidebar/nautilus-sidebar-loser.c:202
+#: components/loser/sidebar/nautilus-sidebar-loser.c:192
+msgid "You have tried to kill the Sidebar Loser"
+msgstr ""
+
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:1
+#, fuzzy
+msgid "Kill Sidebar Loser"
+msgstr "²M°£»²§U¤u¨ã"
+
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:2
+#, fuzzy
+msgid "Kill the Loser sidebar panel"
+msgstr "²M°£ÁôÂû²§U¤u¨ã"
+
+#: components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:4
+#, fuzzy
+msgid "_Kill Sidebar Loser"
+msgstr "²M°£»²§U¤u¨ã"
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus Sidebar Loser"
+msgstr "Nautilus: ©Ê½èÂsÄý¾¹"
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:2
+msgid "Nautilus sidebar loser component's factory"
+msgstr ""
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:3
+#, fuzzy
+msgid "Nautilus sidebar loser factory"
+msgstr "Nautilus: ½Ð¥H¨ä¥Lµ{¦¡ÂsÄý"
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:4
+#, fuzzy
+msgid "Nautilus sidebar view that fails on command"
+msgstr ""
+"%s\n"
+"\n"
+"³o¬O Nautilus ªº½Ð¨D¿ù»~²M³æ."
+
+#: components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in.h:5
+#, fuzzy
+msgid "Sidebar Loser"
+msgstr "°¼¦C"
+
+#: components/mozilla/mozilla-preferences.cpp:126
+#: libnautilus-extensions/nautilus-gconf-extensions.c:82
+#, fuzzy, c-format
+msgid ""
+"GConf error:\n"
+"  %s"
+msgstr "³]©wÀÉ®×"
+
+#: components/mozilla/mozilla-preferences.cpp:133
+#: libnautilus-extensions/nautilus-gconf-extensions.c:86
 #, c-format
 msgid ""
-"%s\n"
+"GConf error:\n"
+"  %s\n"
+"All further errors shown only on terminal"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:38
+msgid "Arabic"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:39
+#, fuzzy
+msgid "Baltic"
+msgstr "°ò¦"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:40
+msgid "Central European"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:41
+#, fuzzy
+msgid "Chinese"
+msgstr "ÀW¹D"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:42
+msgid "Cyrillic"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:43
+msgid "Greek"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:44
+msgid "Hebrew"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:45
+msgid "Japanese"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:46
+msgid "Turkish"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:47
+msgid "Unicode"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:48
+msgid "UTF"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:49
+#, fuzzy
+msgid "Vietnamese"
+msgstr "­«·s©R¦W"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:50
+#, fuzzy
+msgid "Western"
+msgstr "´ú¸Õ"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:55
+msgid "Arabic (IBM-864)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:56
+msgid "Arabic (ISO-8859-6)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:57
+msgid "Arabic (ISO-8859-6-E)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:58
+msgid "Arabic (ISO-8859-6-I)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:59
+msgid "Arabic (Windows-1256)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:60
+msgid "Armenian (ARMSCII-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:61
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:62
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:63
+msgid "Baltic (Windows-1257)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:64
+msgid "Celtic (ISO-8859-14)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:65
+msgid "Central European (IBM-852)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:66
+msgid "Central European (ISO-8859-2)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:67
+msgid "Central European (MacCE)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:68
+msgid "Central European (Windows-1250)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:69
+msgid "Chinese Simplified (GB2312)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:70
+msgid "Chinese Simplified (GBK)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:71
+msgid "Chinese Simplified (HZ)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:72
+msgid "Chinese Traditional (Big5)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:73
+msgid "Chinese Traditional (EUC-TW)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:74
+msgid "Croatian (MacCroatian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:75
+msgid "Cyrillic (IBM-855)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:76
+msgid "Cyrillic (ISO-8859-5)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:77
+msgid "Cyrillic (ISO-IR-111)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:78
+msgid "Cyrillic (MacCyrillic)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:79
+msgid "Cyrillic (Windows-1251)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:80
+msgid "Cyrillic/Russian (IBM-866)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:81
+msgid "Cyrillic/Russian (KOI8-R)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:82
+msgid "Cyrillic/Ukrainian (KOI8-U)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:83
+msgid "Cyrillic/Ukrainian (MacUkrainian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:84
+msgid "English (US-ASCII)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:85
+msgid "Greek (ISO-8859-7)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:86
+msgid "Greek (MacGreek)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:87
+msgid "Greek (Windows-1253)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:88
+msgid "Hebrew (IBM-862)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:89
+msgid "Hebrew (ISO-8859-8-E)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:90
+msgid "Hebrew (ISO-8859-8-I)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:91
+msgid "Hebrew (Windows-1255)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:92
+msgid "Icelandic (MacIcelandic)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:93
+msgid "Japanese (EUC-JP)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:94
+msgid "Japanese (ISO-2022-JP)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:95
+msgid "Japanese (Shift_JIS)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:96
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:97
+msgid "Nordic (ISO-8859-10)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:98
+msgid "Romanian (MacRomanian)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:99
+msgid "South European (ISO-8859-3)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:100
+msgid "T.61-8bit"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:101
+msgid "Thai (TIS-620)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:102
+msgid "Turkish (IBM-857)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:103
+msgid "Turkish (ISO-8859-9)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:104
+msgid "Turkish (MacTurkish)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:105
+msgid "Turkish (Windows-1254)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:106
+msgid "Unicode (UTF-7)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:107
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:108
+#, fuzzy
+msgid "User Defined"
+msgstr "¥Ø¿ý"
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:109
+msgid "UTF-16BE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:110
+msgid "UTF-16LE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:111
+msgid "UTF-32BE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:112
+msgid "UTF-32LE"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:113
+msgid "Vietnamese (TCVN)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:114
+msgid "Vietnamese (VISCII)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:115
+msgid "Vietnamese (VPS)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:116
+msgid "Vietnamese (Windows-1258)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:117
+msgid "Visual Hebrew (ISO-8859-8)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:118
+msgid "Western (IBM-850)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:119
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:120
+msgid "Western (ISO-8859-15)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:121
+msgid "Western (MacRoman)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:122
+msgid "Western (Windows-1252)"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:123
+msgid "windows-936"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:124
+msgid "x-imap4-modified-utf7"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-encoding-tables.c:125
+msgid "x-u-escaped"
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-content-view.c:809
+msgid ""
+"A JavaScript function (small software program) on this page tried to open a "
+"new window, but nautilus does not support the opening of new windows by "
+"JavaScript.\n"
 "\n"
-"You clicked the Kill Sidebar View toolbar button."
+"Try viewing the page in a different web browser, such as Mozilla or Netscape."
+msgstr ""
+
+#: components/mozilla/nautilus-mozilla-content-view.c:810
+#, fuzzy
+msgid "Nautilus Mozilla View Warning"
+msgstr "Nautilus: ½Ð¥H¨ä¥Lµ{¦¡ÂsÄý"
+
+#: components/mozilla/nautilus-mozilla-ui.xml.h:1
+msgid "Charset Encoding"
+msgstr ""
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:1
+#, fuzzy
+msgid "Mozilla Nautilus view"
+msgstr "Ãö³¬³o­Óµøµ¡"
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:2
+#, fuzzy
+msgid "Mozilla Nautilus view factory"
+msgstr "Nautilus: ½Ð¥H¨ä¥Lµ{¦¡ÂsÄý"
+
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:3
+#, fuzzy
+msgid "Mozilla content view component"
 msgstr ""
 "%s\n"
 "\n"
-"±z«ö¤U¤F²M°£»²§U¤u¨ã¦C«ö¶s."
+"³o¬O¤@­Ó Nautilus ½d¨Ò¥Ø¿ý "
 
-#. BonoboUIHandler
-#. menu item path, must start with /some-existing-menu-path and be otherwise unique
-#: components/loser/sidebar/nautilus-sidebar-loser.c:250
-msgid "_Kill Sidebar View"
-msgstr "²M°£»²§U¤u¨ã"
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:4
+msgid "Mozilla content view component's factory"
+msgstr ""
 
-#. menu item user-displayed label
-#: components/loser/sidebar/nautilus-sidebar-loser.c:251
-msgid "Kill the Loser sidebar view"
-msgstr "²M°£ÁôÂû²§U¤u¨ã"
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:5
+#, fuzzy
+msgid "View as Web Page"
+msgstr "¥H¨ä¥LÂsÄý..."
 
-#. BonoboUIHandler
-#. button path, must start with /some-existing-toolbar-path and be otherwise unique
-#: components/loser/sidebar/nautilus-sidebar-loser.c:270
-msgid "Loser"
-msgstr "ÁôÂÃ"
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:6
+msgid "Web Page"
+msgstr ""
 
-#. button user-displayed label
-#: components/loser/sidebar/nautilus-sidebar-loser.c:271
-msgid "Kill the Loser sidebar view."
-msgstr "²M°£ÁôÂû²§U¤u¨ã"
+#: components/mozilla/Nautilus_View_mozilla.oaf.in.h:7
+msgid "Web Page Viewer"
+msgstr ""
 
-#.
-#. * Create our mozilla menu item.
-#. *
-#. * Note that it's sorta bogus that we know Nautilus has a menu whose
-#. * path is "/File", and also that we know a sensible position to use within
-#. * that menu. Nautilus should publish this information somehow.
-#.
-#. BonoboUIHandler
-#. menu item path, must start with /some-existing-menu-path and be otherwise unique
-#: components/mozilla/nautilus-mozilla-content-view.c:525
-msgid "_Mozilla"
-msgstr "Mozilla"
-
-#. menu item user-displayed label
-#: components/mozilla/nautilus-mozilla-content-view.c:526
-msgid "This is a mozilla merged menu item"
-msgstr "³o¬O¤@­Ó mozilla ¤º´O¿ï¶µ"
-
-#. hint that appears in status bar
-#. position within menu; -1 means last
-#. pixmap type
-#. pixmap data
-#. accelerator key, couldn't bear the thought of using Control-S for anything except Save
-#. accelerator key modifiers
-#. callback function
-#. callback function data
-#.
-#. * Create our mozilla toolbar button.
-#. *
-#. * Note that it's sorta bogus that we know Nautilus has a toolbar whose
-#. * path is "/Main". Nautilus should publish this information somehow.
-#.
-#. BonoboUIHandler
-#. button path, must start with /Main/ and be otherwise unique
-#: components/mozilla/nautilus-mozilla-content-view.c:543
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#. button user-displayed label
-#: components/mozilla/nautilus-mozilla-content-view.c:544
-msgid "This is a mozilla merged toolbar button"
-msgstr "³o¬O¤@­Ó mozilla ¤º´O¤u¨ã¦C«ö¶s"
-
-#: components/music/nautilus-music-view.c:201
-msgid "Track "
-msgstr "¸ô®|"
+#: components/music/mpg123.c:29
+msgid "Blues"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:201
-msgid "Title"
-msgstr "¼ÐÃD"
+#: components/music/mpg123.c:29
+msgid "Classic Rock"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:201
-msgid "Artist"
-msgstr "ÃÀ¤H"
+#: components/music/mpg123.c:29
+msgid "Country"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:201
-msgid "Year"
-msgstr "¦~«×"
+#: components/music/mpg123.c:29
+#, fuzzy
+msgid "Dance"
+msgstr "¨ú®ø"
 
-#: components/music/nautilus-music-view.c:201
-msgid "Bitrate "
-msgstr "­º¿ï"
+#: components/music/mpg123.c:30
+#, fuzzy
+msgid "Disco"
+msgstr "ºÏºÐ"
 
-#: components/music/nautilus-music-view.c:201
-msgid "Time "
-msgstr "®É¶¡"
+#: components/music/mpg123.c:30
+msgid "Funk"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:201
-msgid "Album"
-msgstr "±M¿è"
+#: components/music/mpg123.c:30
+msgid "Grunge"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:201
-msgid "Comment"
+#: components/music/mpg123.c:30
+msgid "Hip-Hop"
+msgstr ""
+
+#: components/music/mpg123.c:31
+msgid "Jazz"
+msgstr ""
+
+#: components/music/mpg123.c:31
+#, fuzzy
+msgid "Metal"
+msgstr "²Ó¸`"
+
+#: components/music/mpg123.c:31
+msgid "New Age"
+msgstr ""
+
+#: components/music/mpg123.c:31
+msgid "Oldies"
+msgstr ""
+
+#: components/music/mpg123.c:32
+#, fuzzy
+msgid "Other"
+msgstr "¨ä¥L:"
+
+#: components/music/mpg123.c:32
+msgid "Pop"
+msgstr ""
+
+#: components/music/mpg123.c:32
+msgid "R&B"
+msgstr ""
+
+#: components/music/mpg123.c:32
+msgid "Rap"
+msgstr ""
+
+#: components/music/mpg123.c:32
+#, fuzzy
+msgid "Reggae"
+msgstr "­«·s©R¦W"
+
+#: components/music/mpg123.c:33
+msgid "Rock"
+msgstr ""
+
+#: components/music/mpg123.c:33
+msgid "Techno"
+msgstr ""
+
+#: components/music/mpg123.c:33
+#, fuzzy
+msgid "Industrial"
+msgstr "¦w¸Ë"
+
+#: components/music/mpg123.c:33
+msgid "Alternative"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Ska"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Death Metal"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Pranks"
+msgstr ""
+
+#: components/music/mpg123.c:34
+msgid "Soundtrack"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Euro-Techno"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Ambient"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Trip-Hop"
+msgstr ""
+
+#: components/music/mpg123.c:35
+msgid "Vocal"
+msgstr ""
+
+#: components/music/mpg123.c:36
+msgid "Jazz+Funk"
+msgstr ""
+
+#: components/music/mpg123.c:36
+#, fuzzy
+msgid "Fusion"
+msgstr "´y­z"
+
+#: components/music/mpg123.c:36
+#, fuzzy
+msgid "Trance"
+msgstr "¨ú®ø"
+
+#: components/music/mpg123.c:36
+msgid "Classical"
+msgstr ""
+
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "Instrumental"
+msgstr "¦w¸Ë"
+
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "Acid"
+msgstr "¤w½Æ»s"
+
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "House"
+msgstr "®a¥Ø¿ý"
+
+#: components/music/mpg123.c:37
+#, fuzzy
+msgid "Game"
+msgstr "¦WºÙ"
+
+#: components/music/mpg123.c:38
+msgid "Sound Clip"
+msgstr ""
+
+#: components/music/mpg123.c:38
+msgid "Gospel"
+msgstr ""
+
+#: components/music/mpg123.c:38
+#, fuzzy
+msgid "Noise"
+msgstr "·s¤â«ü«n"
+
+#: components/music/mpg123.c:38
+msgid "Alt"
+msgstr ""
+
+#: components/music/mpg123.c:39
+#, fuzzy
+msgid "Bass"
+msgstr "°ò¦"
+
+#: components/music/mpg123.c:39
+#, fuzzy
+msgid "Soul"
+msgstr "¨â¤U"
+
+#: components/music/mpg123.c:39
+msgid "Punk"
+msgstr ""
+
+#: components/music/mpg123.c:39
+#, fuzzy
+msgid "Space"
+msgstr "¨ú¥N"
+
+#: components/music/mpg123.c:40
+msgid "Meditative"
+msgstr ""
+
+#: components/music/mpg123.c:40
+msgid "Instrumental Pop"
+msgstr ""
+
+#: components/music/mpg123.c:41
+msgid "Instrumental Rock"
+msgstr ""
+
+#: components/music/mpg123.c:41
+msgid "Ethnic"
+msgstr ""
+
+#: components/music/mpg123.c:41
+#, fuzzy
+msgid "Gothic"
+msgstr "¨S¨Æ"
+
+#: components/music/mpg123.c:42
+msgid "Darkwave"
+msgstr ""
+
+#: components/music/mpg123.c:42
+msgid "Techno-Industrial"
+msgstr ""
+
+#: components/music/mpg123.c:42
+msgid "Electronic"
+msgstr ""
+
+#: components/music/mpg123.c:43
+msgid "Pop-Folk"
+msgstr ""
+
+#: components/music/mpg123.c:43
+msgid "Eurodance"
+msgstr ""
+
+#: components/music/mpg123.c:43
+msgid "Dream"
+msgstr ""
+
+#: components/music/mpg123.c:44
+msgid "Southern Rock"
+msgstr ""
+
+#: components/music/mpg123.c:44
+#, fuzzy
+msgid "Comedy"
 msgstr "µù¸Ñ"
 
-#: components/music/nautilus-music-view.c:201
-msgid "Channels"
+#: components/music/mpg123.c:44
+#, fuzzy
+msgid "Cult"
+msgstr " °Å¤U"
+
+#: components/music/mpg123.c:45
+msgid "Gangsta Rap"
+msgstr ""
+
+#: components/music/mpg123.c:45
+msgid "Top 40"
+msgstr ""
+
+#: components/music/mpg123.c:45
+msgid "Christian Rap"
+msgstr ""
+
+#: components/music/mpg123.c:46
+msgid "Pop/Funk"
+msgstr ""
+
+#: components/music/mpg123.c:46
+#, fuzzy
+msgid "Jungle"
+msgstr "¤@¤U"
+
+#: components/music/mpg123.c:46
+msgid "Native American"
+msgstr ""
+
+#: components/music/mpg123.c:47
+msgid "Cabaret"
+msgstr ""
+
+#: components/music/mpg123.c:47
+#, fuzzy
+msgid "New Wave"
+msgstr "Never"
+
+#: components/music/mpg123.c:47
+msgid "Psychedelic"
+msgstr ""
+
+#: components/music/mpg123.c:47
+#, fuzzy
+msgid "Rave"
+msgstr "§R°£"
+
+#: components/music/mpg123.c:48
+msgid "Showtunes"
+msgstr ""
+
+#: components/music/mpg123.c:48
+#, fuzzy
+msgid "Trailer"
+msgstr "¼ÐÃD"
+
+#: components/music/mpg123.c:48
+msgid "Lo-Fi"
+msgstr ""
+
+#: components/music/mpg123.c:48
+msgid "Tribal"
+msgstr ""
+
+#: components/music/mpg123.c:49
+msgid "Acid Punk"
+msgstr ""
+
+#: components/music/mpg123.c:49
+msgid "Acid Jazz"
+msgstr ""
+
+#: components/music/mpg123.c:49
+#, fuzzy
+msgid "Polka"
+msgstr "¼½©ñ"
+
+#: components/music/mpg123.c:49
+#, fuzzy
+msgid "Retro"
+msgstr "­«¸Õ"
+
+#: components/music/mpg123.c:50
+#, fuzzy
+msgid "Musical"
+msgstr "­µ¼Ö"
+
+#: components/music/mpg123.c:50
+msgid "Rock & Roll"
+msgstr ""
+
+#: components/music/mpg123.c:50
+msgid "Hard Rock"
+msgstr ""
+
+#: components/music/mpg123.c:50
+msgid "Folk"
+msgstr ""
+
+#: components/music/mpg123.c:51
+msgid "Folk/Rock"
+msgstr ""
+
+#: components/music/mpg123.c:51
+msgid "National Folk"
+msgstr ""
+
+#: components/music/mpg123.c:51
+msgid "Swing"
+msgstr ""
+
+#: components/music/mpg123.c:52
+msgid "Fast-Fusion"
+msgstr ""
+
+#: components/music/mpg123.c:52
+msgid "Bebob"
+msgstr ""
+
+#: components/music/mpg123.c:52
+#, fuzzy
+msgid "Latin"
+msgstr "¦ì¸m"
+
+#: components/music/mpg123.c:52
+msgid "Revival"
+msgstr ""
+
+#: components/music/mpg123.c:53
+msgid "Celtic"
+msgstr ""
+
+#: components/music/mpg123.c:53
+msgid "Bluegrass"
+msgstr ""
+
+#: components/music/mpg123.c:53
+msgid "Avantgarde"
+msgstr ""
+
+#: components/music/mpg123.c:54
+msgid "Gothic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:54
+#, fuzzy
+msgid "Progressive Rock"
+msgstr "µ{§Ç..."
+
+#: components/music/mpg123.c:55
+msgid "Psychedelic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:55
+msgid "Symphonic Rock"
+msgstr ""
+
+#: components/music/mpg123.c:55
+msgid "Slow Rock"
+msgstr ""
+
+#: components/music/mpg123.c:56
+#, fuzzy
+msgid "Big Band"
+msgstr " ©M "
+
+#: components/music/mpg123.c:56
+#, fuzzy
+msgid "Chorus"
+msgstr "¿ï¾Ü"
+
+#: components/music/mpg123.c:56
+msgid "Easy Listening"
+msgstr ""
+
+#: components/music/mpg123.c:57
+#, fuzzy
+msgid "Acoustic"
+msgstr "­µ¼Ö"
+
+#: components/music/mpg123.c:57
+msgid "Humour"
+msgstr ""
+
+#: components/music/mpg123.c:57
+#, fuzzy
+msgid "Speech"
+msgstr "·j´M"
+
+#: components/music/mpg123.c:57
+#, fuzzy
+msgid "Chanson"
 msgstr "ÀW¹D"
 
-#: components/music/nautilus-music-view.c:201
-msgid "Sample Rate"
-msgstr "µûŲµ¥¯Å"
+#: components/music/mpg123.c:58
+#, fuzzy
+msgid "Opera"
+msgstr "¶}±Ò"
 
-#: components/music/nautilus-music-view.c:845
-msgid "Sorry, but the music view can't play non-local files yet! "
+#: components/music/mpg123.c:58
+msgid "Chamber Music"
 msgstr ""
 
-#: components/music/nautilus-music-view.c:846
+#: components/music/mpg123.c:58
 #, fuzzy
-msgid "Can't Play Remote Files"
-msgstr "µLªk¶}±Ò»·ºÝÀÉ®×"
+msgid "Sonata"
+msgstr "¦r«¬"
 
-#: components/music/nautilus-music-view.c:1157
-msgid "Previous"
+#: components/music/mpg123.c:58
+msgid "Symphony"
+msgstr ""
+
+#: components/music/mpg123.c:59
+msgid "Booty Bass"
+msgstr ""
+
+#: components/music/mpg123.c:59
+#, fuzzy
+msgid "Primus"
 msgstr "¿ï¨ú"
 
-#: components/music/nautilus-music-view.c:1169
-msgid "Play"
-msgstr "¼½©ñ"
+#: components/music/mpg123.c:59
+msgid "Porn Groove"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:1181
-msgid "Pause"
-msgstr "¼È°±"
+#: components/music/mpg123.c:60
+#, fuzzy
+msgid "Satire"
+msgstr "Àx¦s"
 
-#: components/music/nautilus-music-view.c:1193
-#: libnautilus-extensions/nautilus-file-operations.c:385
-#: libnautilus-extensions/nautilus-file-operations.c:412
-#: src/nautilus-window-toolbars.c:148
-msgid "Stop"
-msgstr "°±¤î"
+#: components/music/mpg123.c:60
+msgid "Slow Jam"
+msgstr ""
 
-#: components/music/nautilus-music-view.c:1205
-msgid "Next"
-msgstr "¤U¤@­º"
+#: components/music/mpg123.c:60
+msgid "Club"
+msgstr ""
 
-#. set up the window title
-#: components/rpmview/nautilus-rpm-verify-window.c:182
-#, fuzzy, c-format
-msgid "Verifying %s..."
-msgstr "¼g¤J¤¤..."
+#: components/music/mpg123.c:60
+msgid "Tango"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:146
-msgid "Package Contents"
-msgstr "®M¥ó¥Ø¿ý"
+#: components/music/mpg123.c:61
+msgid "Samba"
+msgstr ""
 
-#. allocate the name field
-#: components/rpmview/nautilus-rpm-view.c:189
-msgid "Package Title"
-msgstr "®M¥ó¼ÐÃD"
+#: components/music/mpg123.c:61
+msgid "Folklore"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:212
-msgid "Size: "
-msgstr "¤j¤p: "
+#: components/music/mpg123.c:61
+msgid "Ballad"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:218
-msgid "<size>"
-msgstr "<size>"
+#: components/music/mpg123.c:61
+msgid "Power Ballad"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:224
-msgid "Install Date: "
-msgstr "¦w¸Ë®É¶¡: "
+#: components/music/mpg123.c:62
+msgid "Rhythmic Soul"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:230
-#: components/rpmview/nautilus-rpm-view.c:242
-#: components/rpmview/nautilus-rpm-view.c:254
-#: components/rpmview/nautilus-rpm-view.c:266
-#: components/rpmview/nautilus-rpm-view.c:278
-msgid "<unknown>"
-msgstr "<¥¼ª¾>"
+#: components/music/mpg123.c:62
+msgid "Freestyle"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:236
-msgid "License: "
-msgstr "ª©Åv: "
+#: components/music/mpg123.c:62
+#, fuzzy
+msgid "Duet"
+msgstr "§R°£"
 
-#: components/rpmview/nautilus-rpm-view.c:248
-msgid "Build Date: "
-msgstr "«Ø¨î®É¶¡: "
+#: components/music/mpg123.c:63
+msgid "Punk Rock"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:260
-msgid "Distribution: "
-msgstr "µo¦æ³æ¦ì: "
+#: components/music/mpg123.c:63
+msgid "Drum Solo"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:272
-msgid "Vendor: "
-msgstr "´£¨ÑªÌ: "
+#: components/music/mpg123.c:63
+msgid "A Cappella"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:305
-msgid "Install"
-msgstr "¦w¸Ë"
+#: components/music/mpg123.c:64
+msgid "Euro-House"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:321
-msgid "Update"
-msgstr "¤É¯Å"
+#: components/music/mpg123.c:64
+#, fuzzy
+msgid "Dance Hall"
+msgstr "¨ú®ø"
 
-#: components/rpmview/nautilus-rpm-view.c:330
-msgid "Uninstall"
-msgstr "²¾°£"
+#: components/music/mpg123.c:64
+#, fuzzy
+msgid "Goa"
+msgstr "¨ì..."
 
-#: components/rpmview/nautilus-rpm-view.c:346
-msgid "Verify"
+#: components/music/mpg123.c:65
+msgid "Drum & Bass"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:382
-msgid "Go to selected file"
-msgstr "³B²z¤w¿ï¾ÜªºÀÉ®×"
+#: components/music/mpg123.c:65
+#, fuzzy
+msgid "Club-House"
+msgstr "Ãö³¬"
 
-#. add the description
-#: components/rpmview/nautilus-rpm-view.c:393
-msgid "Description"
-msgstr "´y­z"
+#: components/music/mpg123.c:65
+#, fuzzy
+msgid "Hardcore"
+msgstr "¬O¥Ø¿ý"
 
-#: components/rpmview/nautilus-rpm-view.c:582
-#, c-format
-msgid "Package \"%s\" "
-msgstr "®M¥ó \"%s\" "
+#: components/music/mpg123.c:66
+msgid "Terror"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:647
-#, c-format
-msgid "version %s-%s"
-msgstr "ª©¥» %s-%s"
+#: components/music/mpg123.c:66
+msgid "Indie"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:727
-#, c-format
-msgid "Package Contents: %d files"
-msgstr "®M¥ó¥Ø¿ý: %d ­ÓÀÉ®×"
+#: components/music/mpg123.c:66
+msgid "BritPop"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:852
-#, fuzzy, c-format
-msgid "checking %s..."
-msgstr "À˵ø¥»¾÷Àɮפ¤..."
+#: components/music/mpg123.c:66
+msgid "Negerpunk"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:854
-#, c-format
-msgid "file %s has an error!"
+#: components/music/mpg123.c:67
+msgid "Polsk Punk"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view.c:872
-msgid "Verification completed."
+#: components/music/mpg123.c:67
+msgid "Beat"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:108
-#, c-format
-msgid "%s would not work anymore\n"
+#: components/music/mpg123.c:67
+msgid "Christian Gangsta Rap"
+msgstr ""
+
+#: components/music/mpg123.c:68
+msgid "Heavy Metal"
+msgstr ""
+
+#: components/music/mpg123.c:68
+msgid "Black Metal"
+msgstr ""
+
+#: components/music/mpg123.c:68
+msgid "Crossover"
+msgstr ""
+
+#: components/music/mpg123.c:69
+msgid "Contemporary Christian"
+msgstr ""
+
+#: components/music/mpg123.c:69
+msgid "Christian Rock"
+msgstr ""
+
+#: components/music/mpg123.c:70
+msgid "Merengue"
+msgstr ""
+
+#: components/music/mpg123.c:70
+msgid "Salsa"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:111
+#: components/music/mpg123.c:70
+#, fuzzy
+msgid "Thrash Metal"
+msgstr "·Æ¹«¨Ï¥Î¼Ò¦¡"
+
+#: components/music/mpg123.c:71
+#, fuzzy
+msgid "Anime"
+msgstr "®É¶¡"
+
+#: components/music/mpg123.c:71
+msgid "JPop"
+msgstr ""
+
+#: components/music/mpg123.c:71
+#, fuzzy
+msgid "Synthpop"
+msgstr "°±¤î"
+
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Track"
+msgstr "¸ô®|"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Title"
+msgstr "¼ÐÃD"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Artist"
+msgstr "ÃÀ¤H"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Year"
+msgstr "¦~«×"
+
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Bit Rate"
+msgstr "­º¿ï"
+
+#: components/music/nautilus-music-view.c:238
+#, fuzzy
+msgid "Time"
+msgstr "®É¶¡"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Album"
+msgstr "±M¿è"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Comment"
+msgstr "µù¸Ñ"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Channels"
+msgstr "ÀW¹D"
+
+#: components/music/nautilus-music-view.c:238
+msgid "Sample Rate"
+msgstr "µûŲµ¥¯Å"
+
+#: components/music/nautilus-music-view.c:350
+#, fuzzy
+msgid "Set Cover Image"
+msgstr "³]©w¨Ï¥ÎªÌ ID"
+
+#: components/music/nautilus-music-view.c:694
 #, fuzzy, c-format
-msgid "%s would break other installed packages\n"
-msgstr "Ū¨ú¦w¸Ë®M¥ó¦Cªí¤¤..."
+msgid "Sorry, but '%s' is not a usable image file."
+msgstr "©êºp , '%s' ¨Ã¤£¬O¤@­Ó¼v¹³ÀÉ®×"
 
-#: components/rpmview/nautilus-rpm-view-install.c:116
-#, c-format
-msgid "%s is needed, but could not be found\n"
+#: components/music/nautilus-music-view.c:696
+#: src/nautilus-property-browser.c:1060 src/nautilus-property-browser.c:1312
+#, fuzzy
+msgid "Not an Image"
+msgstr "¤£¦b¦W³æ¤º"
+
+#: components/music/nautilus-music-view.c:744
+#, fuzzy
+msgid "Select an image file for the album cover:"
+msgstr "½Ð¬°³o­Ó¹Ï¥Ü¿ï¨ú¤@­Ó·sªº¹Ï³¹:"
+
+#: components/music/nautilus-music-view.c:1174
+msgid ""
+"Sorry, but the music view is unable to play back sound right now. Either "
+"another program is using or blocking the sound card, or your sound card is "
+"not configured properly. Try quitting any applications that may be blocking "
+"use of the sound card."
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:121
-#, c-format
-msgid "%s was already installed\n"
+#: components/music/nautilus-music-view.c:1178
+msgid "Unable to Play File"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:140
-#, c-format
-msgid "Installing %s failed because of the following issue(s):\n"
+#: components/music/nautilus-music-view.c:1199
+msgid "Sorry, but the music view can't play non-local files yet."
+msgstr ""
+
+#: components/music/nautilus-music-view.c:1200
+#, fuzzy
+msgid "Can't Play Remote Files"
+msgstr "µLªk¶}±Ò»·ºÝÀÉ®×"
+
+#: components/music/nautilus-music-view.c:1486
+msgid "Drag to seek within track"
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:142
+#: components/music/nautilus-music-view.c:1526
+msgid "Play"
+msgstr "¼½©ñ"
+
+#: components/music/nautilus-music-view.c:1540
+msgid "Pause"
+msgstr "¼È°±"
+
+#: components/music/nautilus-music-view.c:1554
+#: libnautilus-extensions/nautilus-file-operations.c:979
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: src/nautilus-shell-ui.xml.h:55
+msgid "Stop"
+msgstr "°±¤î"
+
+#: components/music/nautilus-music-view.c:1679
 #, c-format
-msgid "Uninstalling %s failed because of the following issue(s):\n"
+msgid "Sorry, but there was an error reading %s."
 msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:219
+#: components/music/nautilus-music-view.c:1680
 #, fuzzy
-msgid "Uninstall failed..."
-msgstr "²¾°£¥¢±Ñ"
+msgid "Can't Read Folder"
+msgstr "(¥¼©R¦W)"
 
-#: components/rpmview/nautilus-rpm-view-install.c:220
+#: components/music/nautilus-music-view.c:1750
 #, fuzzy
-msgid "Uninstall Failed"
-msgstr "²¾°£¥¢±Ñ"
+msgid "Stereo"
+msgstr "Àx¦s"
 
-#: components/rpmview/nautilus-rpm-view-install.c:222
+#: components/music/nautilus-music-view.c:1750
 #, fuzzy
-msgid "Install failed..."
-msgstr "¦w¸Ë¥¢±Ñ"
+msgid "Mono"
+msgstr "²¾°Ê¤¤"
+
+#: components/music/nautilus-music-view.c:1792
+#, fuzzy, c-format
+msgid "%s - %s"
+msgstr "%s%s"
+
+#: components/music/Nautilus_View_music.oaf.in.h:1
+msgid "Factory for music view"
+msgstr ""
 
-#: components/rpmview/nautilus-rpm-view-install.c:223
+#: components/music/Nautilus_View_music.oaf.in.h:2
 #, fuzzy
-msgid "Install Failed"
-msgstr "¦w¸Ë¥¢±Ñ"
+msgid "Music"
+msgstr "­µ¼Ö"
 
-#: components/rpmview/nautilus-rpm-view-install.c:267
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:899
+#: components/music/Nautilus_View_music.oaf.in.h:3
 #, fuzzy
-msgid "Incorrect password."
-msgstr "¿é¤J±K½X"
+msgid "Music Viewer"
+msgstr "¥Î %s "
+
+#: components/music/Nautilus_View_music.oaf.in.h:4
+msgid "Music view"
+msgstr ""
+
+#: components/music/Nautilus_View_music.oaf.in.h:5
+msgid "Music view factory"
+msgstr ""
 
-#: components/sample/nautilus-sample-content-view.c:86
+#: components/music/Nautilus_View_music.oaf.in.h:6
+#, fuzzy
+msgid "View as Music"
+msgstr "¥H %s ÂsÄý"
+
+#: components/notes/Nautilus_View_notes.oaf.in.h:1
+msgid "Factory for annotation view"
+msgstr ""
+
+#: components/notes/Nautilus_View_notes.oaf.in.h:3
+#, fuzzy
+msgid "Notes sidebar panel"
+msgstr "°¼¦C"
+
+#: components/notes/Nautilus_View_notes.oaf.in.h:4
+msgid "Notes sidebar panel for Nautilus"
+msgstr ""
+
+#: components/sample/nautilus-sample-content-view.c:136
 msgid "(none)"
 msgstr "(ªÅ)"
 
-#: components/sample/nautilus-sample-content-view.c:148
+#: components/sample/nautilus-sample-content-view.c:189
 #, c-format
 msgid ""
 "%s\n"
@@ -511,7 +1836,7 @@ msgstr ""
 "\n"
 "³o¬O¤@­Ó Nautilus ½d¨Ò¥Ø¿ý "
 
-#: components/sample/nautilus-sample-content-view.c:206
+#: components/sample/nautilus-sample-content-view.c:252
 #, c-format
 msgid ""
 "%s\n"
@@ -522,107 +1847,458 @@ msgstr ""
 "\n"
 "½Ð«ö¤U½d¨Ò¤u¨ã¦C«ö¶s"
 
-#. menu item path, must start with /some-existing-menu-path and be otherwise unique
-#: components/sample/nautilus-sample-content-view.c:246
-msgid "_Sample"
+#: components/sample/Nautilus_View_sample.oaf.in.h:3
+#: components/sample/nautilus-sample-content-view-ui.xml.h:1
+#: components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in.h:2
+msgid "Sample"
 msgstr "½d¨Ò"
 
-#. menu item user-displayed label
-#: components/sample/nautilus-sample-content-view.c:247
+#: components/sample/nautilus-sample-content-view-ui.xml.h:2
 msgid "This is a sample merged menu item"
 msgstr "³o¬O¤@­Ó¦X¨Ö¿ï³æitem½d¨Ò"
 
-#. button path, must start with /some-existing-toolbar-path and be otherwise unique
-#: components/sample/nautilus-sample-content-view.c:262
-msgid "Sample"
-msgstr "½d¨Ò"
-
-#. button user-displayed label
-#: components/sample/nautilus-sample-content-view.c:263
+#: components/sample/nautilus-sample-content-view-ui.xml.h:3
 msgid "This is a sample merged toolbar button"
 msgstr "³o¬O¤@­Ó¦X¨Ö¤u¨ã¦C button ½d¨Ò"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:79
+#: components/sample/nautilus-sample-content-view-ui.xml.h:5
+msgid "_Sample"
+msgstr "½d¨Ò"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus Sample view"
+msgstr "Nautilus: ³qª¾"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Sample view factory"
+msgstr "Nautilus: ³qª¾"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:4
+#, fuzzy
+msgid "Sample Viewer"
+msgstr "µûŲµ¥¯Å"
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:5
+#, fuzzy
+msgid "Sample content view component"
+msgstr ""
+"%s\n"
+"\n"
+"³o¬O¤@­Ó Nautilus ½d¨Ò¥Ø¿ý "
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:6
+#, fuzzy
+msgid "Sample content view component's factory"
+msgstr ""
+"%s\n"
+"\n"
+"³o¬O¤@­Ó Nautilus ½d¨Ò¥Ø¿ý "
+
+#: components/sample/Nautilus_View_sample.oaf.in.h:7
+#, fuzzy
+msgid "View as Sample"
+msgstr "¥H¨ä¥LÂsÄý..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:107
+msgid "Set the default answer to continue, also default delete to Yes"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:108
+#, fuzzy
+msgid "Specify search cgi"
+msgstr "«ü©w¦øªA¾¹§Î¦¡"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:109
 #: components/services/install/command-line/eazel-gen-xml.c:43
+#: components/services/install/command-line/eazel-test-packsys.c:590
+#: components/services/install/command-line/eazel-test-softcat.c:56
 msgid "Show debug output"
 msgstr "Åã¥Ü°£¿ùµ²ªG"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:80
+#: components/services/install/command-line/eazel-alt-install-corba.c:110
 msgid "10 sec delay after starting service"
 msgstr "¤Q¬í«á¶i¦æªA°È"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:81
+#: components/services/install/command-line/eazel-alt-install-corba.c:111
 #, fuzzy
 msgid "Allow downgrades"
 msgstr "­ã³\\¤É¯Å¨ìªºª©¥»"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:82
+#: components/services/install/command-line/eazel-alt-install-corba.c:112
 msgid "Erase packages"
 msgstr "²¾°£®M¥ó"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:83
+#: components/services/install/command-line/eazel-alt-install-corba.c:113
+#, fuzzy
+msgid "enable ei2"
+msgstr "±Ò°Ê°£¿ù¥\\¯à"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:114
 msgid "RPM args are filename"
 msgstr "RPM ¤Þ¼Æ¬°ÀɮצWºÙ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:84
-msgid "Force install"
-msgstr "±j¨î¦w¸Ë"
-
-#: components/services/install/command-line/eazel-alt-install-corba.c:85
+#: components/services/install/command-line/eazel-alt-install-corba.c:115
 msgid "Use ftp"
 msgstr "¨Ï¥ÎFTP¶Ç¿é¨ó©w"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:86
+#: components/services/install/command-line/eazel-alt-install-corba.c:116
 msgid "Use local"
 msgstr "¨Ï¥Î¥»¾÷¸ê®Æ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:87
+#: components/services/install/command-line/eazel-alt-install-corba.c:117
 msgid "Use http"
 msgstr "¨Ï¥ÎHTTP¶Ç¿é¨ó©w"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:88
+#: components/services/install/command-line/eazel-alt-install-corba.c:118
+#, fuzzy
+msgid "RPM args are Eazel Ids"
+msgstr "RPM ¤Þ¼Æ¬°ÀɮצWºÙ"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:119
+msgid "machine readable output"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:120
+msgid "Don't print fancy percent output"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:121
+msgid "don't use eazel auth stuff"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:122
 #, fuzzy
 msgid "Specify package file"
 msgstr "®M¥ó¼ÐÃD"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:89
-msgid "Set port numer (80)"
-msgstr "³]©w¶Ç¿é°ð (¹w³] 80)"
+#: components/services/install/command-line/eazel-alt-install-corba.c:123
+#, fuzzy
+msgid "RPM args are needed files"
+msgstr "RPM ¤Þ¼Æ¬°ÀɮצWºÙ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:90
+#: components/services/install/command-line/eazel-alt-install-corba.c:124
 msgid "Run Query"
 msgstr "°õ¦æ¬d¸ß"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:91
+#: components/services/install/command-line/eazel-alt-install-corba.c:125
 #, fuzzy
 msgid "Revert"
 msgstr "§R°£"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:92
+#: components/services/install/command-line/eazel-alt-install-corba.c:126
 #, fuzzy
 msgid "Set root"
 msgstr "³]©w¸s²Õ ID"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:93
+#: components/services/install/command-line/eazel-alt-install-corba.c:127
 msgid "Specify server"
 msgstr "«ü©w¦øªA¾¹§Î¦¡"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:94
+#: components/services/install/command-line/eazel-alt-install-corba.c:128
+msgid "Dont print too much, just problems and download"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:129
+msgid "Perform ssl renaming"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:130
+msgid "argument is a suite id"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:131
 msgid "Test run"
 msgstr "´ú¸Õ"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:95
-msgid "Set tmp dir (/tmp/eazel-install)"
-msgstr "³]©w¼È¦sÀɮץؿý (¹w³] /tmp/eazel-install)"
+#: components/services/install/command-line/eazel-alt-install-corba.c:132
+#, fuzzy
+msgid "Allow username"
+msgstr "­ã³\\¤É¯Å"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:96
+#: components/services/install/command-line/eazel-alt-install-corba.c:133
+#: components/services/install/lib/eazel-install-problem.c:1018
 msgid "Allow upgrades"
 msgstr "­ã³\\¤É¯Å"
 
-#: components/services/install/command-line/eazel-alt-install-corba.c:97
+#: components/services/install/command-line/eazel-alt-install-corba.c:134
 msgid "Verbose output"
 msgstr ""
 
+#: components/services/install/command-line/eazel-alt-install-corba.c:135
+#, fuzzy
+msgid "Install a specific package version"
+msgstr "¦w¸Ë \"%s\" ¤¤ "
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:158
+msgid "*** You cannot specify more then one protocol type.\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:175
+msgid "*** Erase and revert ?  Somebody set up us the bomb!\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:284
+#, fuzzy, c-format
+msgid "File conflict checking %s...\n"
+msgstr "À˵ø¥»¾÷Àɮפ¤..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:298
+#, fuzzy, c-format
+msgid "File uniqueness checking %s...\n"
+msgstr "À˵ø¥»¾÷Àɮפ¤..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:312
+#, c-format
+msgid "Feature consistency checking %s...\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:343
+#: components/services/install/lib/eazel-install-protocols.c:116
+#: components/services/install/lib/eazel-install-protocols.c:254
+#, c-format
+msgid "Downloading %s..."
+msgstr "¤U¸ü %s ¤¤..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:359
+msgid "Downloading %s... (%d/%d) = %d%% %.1f KB/s"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:367
+#, fuzzy
+msgid "Downloading %s... (%d/%d) = %d%%"
+msgstr "¤U¸ü %s ¤¤..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:375
+#, c-format
+msgid "Downloading %s... (%d/%d) %.1f KB/s Done      \n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:380
+#, fuzzy, c-format
+msgid "Downloading %s... %3.1f KB/s Done\n"
+msgstr "¤U¸ü %s ¤¤..."
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:408
+msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:416
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%%"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:438
+msgid "Installing %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:445
+msgid "Uninstalling %s (%d/%d), (%d/%d)b - (%d/%d) = %d%% Done\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:453
+#, fuzzy
+msgid "Done\n"
+msgstr "§¹¦¨"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:473
+#, c-format
+msgid "Download of %s FAILED\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:495
+#, fuzzy, c-format
+msgid "Package %s failed to uninstall.\n"
+msgstr "®M¥ó %s ©|¥¼¦w¸Ë "
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:497
+#, fuzzy, c-format
+msgid "Package %s failed to install.\n"
+msgstr "®M¥ó %s ©|¥¼¦w¸Ë "
+
+#. I18N note: \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:518
+#, c-format
+msgid "\t· Problem : %s\n"
+msgstr ""
+
+#. I18N note: \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:527
+#, c-format
+msgid "\t· Action : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:570
+#, fuzzy
+msgid "Cancelling operation\n"
+msgstr "½T¹ê¾Þ§@"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:581
+#, c-format
+msgid "About to install a total of %d packages, %dKB\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:585
+#, c-format
+msgid "About to uninstall a total of %d packages, %dKB\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:589
+#, c-format
+msgid "About to revert a total of %d packages, %d KB\n"
+msgstr ""
+
+#. I18N note: %s is a package name, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:606
+#, c-format
+msgid "\t· %s and it's dependencies\n"
+msgstr ""
+
+#. I18N note: %s is a package name, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:609
+#, c-format
+msgid "\t· %s\n"
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n) " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:637
+msgid "Save transaction report ? (y/n) "
+msgstr ""
+
+#. I18N note: y is the letter for the word Yes. This is
+#. used in the response for a yes/no questions. Your translation
+#. must be 1 character only.
+#: components/services/install/command-line/eazel-alt-install-corba.c:648
+#: components/services/install/command-line/eazel-alt-install-corba.c:768
+#: components/services/install/command-line/eazel-alt-install-corba.c:810
+msgid "y"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:669
+#, fuzzy, c-format
+msgid "Dependency : %s needs %s\n"
+msgstr "À˹î¬Û¨Ì©Ê¥¢±Ñ"
+
+#. I18N note: %s is a package name
+#: components/services/install/command-line/eazel-alt-install-corba.c:687
+#, c-format
+msgid "Package %s failed md5 check!\n"
+msgstr ""
+
+#. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:689
+#, c-format
+msgid "\t· server MD5 checksum is %s\n"
+msgstr ""
+
+#. I18N note: %s is a 32 bytes hex numbers, \xB7 is a dot
+#: components/services/install/command-line/eazel-alt-install-corba.c:691
+#, c-format
+msgid "\t· actual MD5 checksum is %s\n"
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:757
+msgid "Continue? (y/n) "
+msgstr ""
+
+#. I18N note: the (y/n) is translateable. There is later a 1 character
+#. string with the context "y" which is the "yes" indicator.
+#. If you eg. translate this to Danish : "Fortsæt (j/n " and
+#. translated the "y" later to "j", da_DK users can respond with
+#. "j" "ja" "JA" etc.
+#: components/services/install/command-line/eazel-alt-install-corba.c:798
+msgid "Should I delete the RPM files? (y/n) "
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:830
+msgid "Operation ok\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:832
+#, fuzzy
+msgid "Operation failed\n"
+msgstr "¦w¸Ë¥¢±Ñ"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:958
+#, fuzzy
+msgid "Installing"
+msgstr "¦w¸Ë"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:967
+#, fuzzy
+msgid "Uninstalling"
+msgstr "²¾°£"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:982
+msgid "Only one operation at a time please."
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:987
+#: components/services/install/command-line/eazel-alt-install-corba.c:995
+#: components/services/install/command-line/eazel-alt-install-corba.c:1039
+#: components/services/install/command-line/eazel-alt-install-corba.c:1046
+#, c-format
+msgid "%s: --help for usage\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1011
+#, c-format
+msgid "Name         : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1012
+#, fuzzy, c-format
+msgid "Version      : %s\n"
+msgstr "ª©¥» %s-%s"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1013
+#, c-format
+msgid "Minor        : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1015
+#, c-format
+msgid "Size         : %d\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1016
+#, c-format
+msgid "Arch         : %s\n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1017
+#, fuzzy, c-format
+msgid "Distribution : %s\n"
+msgstr "µo¦æ³æ¦ì: "
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1018
+#, fuzzy, c-format
+msgid "Description  : %s\n"
+msgstr "´y­z"
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1020
+#, fuzzy, c-format
+msgid "Install root : %s\n"
+msgstr "¦w¸Ë®É¶¡: "
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1023
+msgid "Provides     : \n"
+msgstr ""
+
+#: components/services/install/command-line/eazel-alt-install-corba.c:1065
+#, c-format
+msgid "exit code %d\n"
+msgstr ""
+
 #: components/services/install/command-line/eazel-gen-xml.c:41
 msgid "Specify package list to use (/var/eazel/service/package-list.xml)"
 msgstr "«ü©w­n¨Ï¥Îªº®M¥ó¦Cªí (/var/eazel/service/package-list.xml)"
@@ -631,662 +2307,2270 @@ msgstr "«ü©w­n¨Ï¥Îªº®M¥ó¦Cªí (/var/eazel/service/package-list.xml)"
 msgid "Use specified file to generate a package list, requires --packagelist"
 msgstr "¨Ï¥Î«ü©wªºÀɮרӦC¥X®M¥óªí,½Ð¨Ï¥Î¤Þ¼Æ --packagrlist "
 
-#: components/services/install/lib/eazel-install-metadata.c:172
-msgid "Could not set URLType from config file!"
-msgstr "µLªk±q¸Õ©wÀÉŪ¨úURLType !"
+#: components/services/install/command-line/eazel-test-softcat.c:54
+msgid "Softcat server to connect to"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:672
-msgid "Creating temporary download directory ...\n"
-msgstr "³]¸m¤U¸üÀɮ׼Ȧs¥Ø¿ý...\n"
+#: components/services/install/command-line/eazel-test-softcat.c:55
+msgid "Use alternate CGI path"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:677
-msgid "Could not create temporary directory!\n"
-msgstr "µLªk«Ø¨î¼È¦s¥Ø¿ý!\n"
+#: components/services/install/command-line/eazel-test-softcat.c:57
+msgid "Connect as a softcat user through ammonite"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:691
-msgid "Getting package list from remote server ...\n"
-msgstr "¥¿±q»·ºÝ¦øªA¾¹¤U¸ü«Ê¥]¤¤...\n"
+#: components/services/install/command-line/eazel-test-softcat.c:58
+msgid "Number of times to try the request"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:711
-msgid "Unable to retrieve package-list.xml!\n"
-msgstr "µLªk¨ú±o package-list.xml!\n"
+#: components/services/install/command-line/eazel-test-softcat.c:59
+msgid "Delay between request retries, in usec"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:756
+#: components/services/install/command-line/eazel-test-softcat.c:60
+#, fuzzy
+msgid "Lookup by Eazel package id"
+msgstr "¦b¸ê®Æ®w¤¤´M§ä®M¥ó"
+
+#: components/services/install/command-line/eazel-test-softcat.c:61
+msgid "Lookup package that features a feature/file"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:62
+#, fuzzy
+msgid "Lookup package with a specific version"
+msgstr "¦b¸ê®Æ®w¤¤´M§ä®M¥ó"
+
+#: components/services/install/command-line/eazel-test-softcat.c:63
+msgid "(with --version) Use >= comparison"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:64
+msgid "use check function (for debugging)"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:65
+msgid "Show detailed sub-package info"
+msgstr ""
+
+#: components/services/install/command-line/eazel-test-softcat.c:66
+msgid "enable funk parser"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:117
+msgid "Failed to lock the downloaded file"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:134
 #, c-format
-msgid "Cannot write to file %s, using default log handler"
-msgstr "µLªk¼g¤JÀÉ®×%s,¨Ï¥Î¹w³]¬ö¿ýhandler"
+msgid "MD5 mismatch, package %s may be compromised"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:856
-msgid "Install failed"
-msgstr "¦w¸Ë¥¢±Ñ"
+#: components/services/install/lib/eazel-install-logic2.c:150
+#, c-format
+msgid "No MD5 available for %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-object.c:887
-msgid "Uninstall failed"
-msgstr "²¾°£¥¢±Ñ"
+#. I18N note: "%is is ok" in the sense that %s=package name and the
+#. package is intact
+#: components/services/install/lib/eazel-install-logic2.c:356
+#, c-format
+msgid "%s is ok"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:122
-#: components/services/install/lib/eazel-install-protocols.c:223
+#: components/services/install/lib/eazel-install-logic2.c:462
+#, fuzzy, c-format
+msgid "%s-%s version %s-%s already installed"
+msgstr "±j¨î¦w¸Ë"
+
+#: components/services/install/lib/eazel-install-logic2.c:466
 #, c-format
-msgid "Downloading %s..."
-msgstr "¤U¸ü %s ¤¤..."
+msgid "%s version %s already installed"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:133
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:399
+#: components/services/install/lib/eazel-install-logic2.c:475
+#: components/services/install/lib/eazel-install-logic2.c:480
 #, c-format
-msgid "Could not open target file %s"
-msgstr "µLªk³B²z¥Ø¼ÐÀÉ®× %s "
+msgid "%s upgrades from version %s-%s to %s-%s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:140
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:333
-msgid "Could not create an http request !"
-msgstr "µLªk°µ¥XHTTP½Ð¨D!"
+#: components/services/install/lib/eazel-install-logic2.c:489
+#, c-format
+msgid "%s downgrades from version %s-%s to %s-%s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:147
-#, fuzzy
-msgid "Proxy: Invalid uri !"
-msgstr "µL®Ä URI !"
+#: components/services/install/lib/eazel-install-logic2.c:494
+#, c-format
+msgid "%s downgrades from version %s to %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:152
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:338
-msgid "Invalid uri !"
-msgstr "µL®Ä URI !"
+#: components/services/install/lib/eazel-install-logic2.c:547
+#, fuzzy, c-format
+msgid "%s installs version %s-%s"
+msgstr "ª©¥» %s-%s"
 
-#: components/services/install/lib/eazel-install-protocols.c:159
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:348
-msgid "Could not prepare http request !"
-msgstr "µLªk·Ç³ÆHTTP½Ð¨D!"
+#: components/services/install/lib/eazel-install-logic2.c:552
+#, c-format
+msgid "%s installs version %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:163
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:353
-msgid "Couldn't get async mode "
-msgstr "µLªk¶i¤J«D¦P¨B¶Ç¿é¼Ò¦¡"
+#: components/services/install/lib/eazel-install-logic2.c:733
+#: components/services/install/lib/eazel-install-logic2.c:915
+#, fuzzy, c-format
+msgid "Loading package info from file %s"
+msgstr "µLªk«Ø¥ßÂI°}¹ÏÀÉ®×±qÀÉ®×: %s "
+
+#. I18N note: ok is for "package dependencies are ok", "not ok".. well guess...
+#: components/services/install/lib/eazel-install-logic2.c:1197
+msgid "ok"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:1197
+msgid "not ok"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:188
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:363
+#: components/services/install/lib/eazel-install-logic2.c:1363
 #, c-format
-msgid "HTTP error: %d %s"
-msgstr "HTTP error: %d %s"
+msgid "Checking dependencies for %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:198
-msgid "Could not get request body!"
-msgstr "µLªk¶i¦æHTTP½Ð¨D!"
+#. I18N note: both %s' are package names.
+#. related is in the sense that the two packages apparently
+#. are connected somehow, eg. foo and foo-devel
+#: components/services/install/lib/eazel-install-logic2.c:2014
+#, fuzzy, c-format
+msgid "%s is related to %s"
+msgstr "\"%s\" ¤w¿ï (%s)"
 
-#: components/services/install/lib/eazel-install-protocols.c:224
-msgid "FTP not supported yet"
-msgstr "µLªk¤ä´©FTP"
+#: components/services/install/lib/eazel-install-logic2.c:2090
+#, c-format
+msgid "updating %s to version %s-%s solves conflict"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:409
+#: components/services/install/lib/eazel-install-logic2.c:2113
+#, c-format
+msgid "available update to %s (%s-%s) does not solves conflict"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-logic2.c:2128
 #, fuzzy, c-format
-msgid "Checking local file %s..."
-msgstr "À˵ø¥»¾÷Àɮפ¤..."
+msgid "could not revive %s"
+msgstr "µLªk«ì´_ %s ªºURL"
 
-#: components/services/install/lib/eazel-install-protocols.c:481
+#: components/services/install/lib/eazel-install-logic2.c:2284
 #, c-format
-msgid "Failed to retreive %s!"
-msgstr "µLªkÁÙ­ì %s!"
+msgid "file uniqueness checking %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:539
-#: components/services/install/lib/eazel-install-protocols.c:593
+#: components/services/install/lib/eazel-install-logic2.c:2305
 #, c-format
-msgid "Could not get a URL for %s"
-msgstr "µLªk¨ú±o %s ªºURL"
+msgid "Duplicate file : %s occurs in %s and %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:557
-#: components/services/install/lib/eazel-install-protocols.c:606
-#: components/services/install/lib/eazel-install-protocols.c:655
-msgid "File download failed"
+#: components/services/install/lib/eazel-install-logic2.c:2316
+#: components/services/install/lib/eazel-install-logic2.c:2470
+msgid "... but it's ok, the packages are related"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:587
-msgid "Using local protocol cannot resolve library dependencies"
-msgstr "µLªk¥H¥»¾÷¨ó©w¸Ñ¨M¨ç¦¡®w¬Û¨Ì©Ê°ÝÃD"
+#: components/services/install/lib/eazel-install-logic2.c:2324
+#, c-format
+msgid "(there were %d other conflicts)"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:636
-#, fuzzy
-msgid "Using local protocol cannot fetch by id"
-msgstr "µLªk¥H¥»¾÷¨ó©w¸Ñ¨M¨ç¦¡®w¬Û¨Ì©Ê°ÝÃD"
+#: components/services/install/lib/eazel-install-logic2.c:2419
+#, c-format
+msgid "file conflict checking %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:642
-#, fuzzy, c-format
-msgid "Could not get a URL for package id %s"
-msgstr "µLªk¨ú±o %s ªºURL"
+#: components/services/install/lib/eazel-install-logic2.c:2456
+#, c-format
+msgid "file conflict : package %s already provides file %s also provided by %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:742
-#: components/services/install/lib/eazel-install-protocols.c:746
+#. the owner of this file is a package that we're upgrading, and the
+#. * new version no longer has this file, so everything's okay.
+#: components/services/install/lib/eazel-install-logic2.c:2466
 #, c-format
-msgid "Could not retrieve a URL for %s"
-msgstr "µLªk«ì´_ %s ªºURL"
+msgid "...but it is okay, we're upgrading %s and it ditched that file"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-protocols.c:750
-#, fuzzy, c-format
-msgid "Could not retrieve a URL for id %s"
-msgstr "µLªk«ì´_ %s ªºURL"
+#: components/services/install/lib/eazel-install-logic2.c:2558
+#, c-format
+msgid "checking feature consistency of %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:135
-#: components/services/install/lib/eazel-install-rpm-glue.c:464
-msgid "Dry Run Mode Activated.  Packages will not actually be installed ..."
-msgstr "Dry Run ¼Ò¦¡±Ò°Ê,®M¥ó²{¦bµLªk¦w¸Ë......"
+#: components/services/install/lib/eazel-install-logic2.c:2626
+#, c-format
+msgid ""
+"feature missing : %s breaks if %s is installed (feature %s would be lost"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:166
+#: components/services/install/lib/eazel-install-logic2.c:2705
 #, fuzzy, c-format
-msgid "*** Could not create tmp directory (%s)! ***\n"
-msgstr "*** µLªk³]¸mªA°È¥Ø¿ý! ***\n"
+msgid "downloading %d packages"
+msgstr "§R°£®M¥ó %s "
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:173
+#: components/services/install/lib/eazel-install-logic2.c:2951
 #, fuzzy, c-format
-msgid "Reading the install package list %s"
-msgstr "Ū¨ú¦w¸Ë®M¥ó¦Cªí¤¤..."
+msgid "will upgrade %s"
+msgstr "­ã³\\¤É¯Å"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:245
+#: components/services/install/lib/eazel-install-logic2.c:2954
 #, fuzzy, c-format
-msgid "Will download %s"
+msgid "will downgrade %s"
 msgstr "­ã³\\¤É¯Å¨ìªºª©¥»"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:258
+#: components/services/install/lib/eazel-install-logic2.c:2957
 #, fuzzy, c-format
-msgid "%s already installed"
-msgstr "±j¨î¦w¸Ë"
+msgid "will install %s"
+msgstr "Nautilus ¦w¸Ë¤u¨ã"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:373
-#, c-format
-msgid "%s..."
+#: components/services/install/lib/eazel-install-logic2.c:2960
+#, fuzzy, c-format
+msgid "will uninstall %s"
+msgstr "²¾°£"
+
+#: components/services/install/lib/eazel-install-logic2.c:3045
+#: components/services/install/lib/eazel-install-problem.c:342
+#: components/services/install/lib/eazel-install-problem.c:345
+#, fuzzy, c-format
+msgid "%s requires %s"
+msgstr "%s %s »P %s ¬Û½Ä"
+
+#: components/services/install/lib/eazel-install-logic2.c:3238
+#, fuzzy, c-format
+msgid "failed %s"
+msgstr "¬O %s"
+
+#: components/services/install/lib/eazel-install-metadata.c:174
+msgid "Could not set URLType from config file!"
+msgstr "µLªk±q¸Õ©wÀÉŪ¨úURLType !"
+
+#: components/services/install/lib/eazel-install-object.c:717
+msgid "Transactions are not stored, could not find home dir"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:382
+#: components/services/install/lib/eazel-install-object.c:748
 #, c-format
-msgid "Skipping %s..."
+msgid "Transactions are stored in %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:437
+#: components/services/install/lib/eazel-install-object.c:1005
+msgid "Getting package list from remote server ...\n"
+msgstr "¥¿±q»·ºÝ¦øªA¾¹¤U¸ü«Ê¥]¤¤...\n"
+
+#: components/services/install/lib/eazel-install-object.c:1021
+msgid "Unable to retrieve package-list.xml!\n"
+msgstr "µLªk¨ú±o package-list.xml!\n"
+
+#: components/services/install/lib/eazel-install-object.c:1094
 #, c-format
-msgid "Category = %s"
-msgstr "¶µ¥Ø = %s"
+msgid "Cannot write to file %s, using default log handler"
+msgstr "µLªk¼g¤JÀÉ®×%s,¨Ï¥Î¹w³]¬ö¿ýhandler"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:750
+#: components/services/install/lib/eazel-install-object.c:1225
+msgid "Install failed"
+msgstr "¦w¸Ë¥¢±Ñ"
+
+#: components/services/install/lib/eazel-install-object.c:1271
+msgid "Uninstall failed"
+msgstr "²¾°£¥¢±Ñ"
+
+#: components/services/install/lib/eazel-install-object.c:1406
 #, fuzzy, c-format
 msgid "Could not create transaction directory (%s)! ***\n"
 msgstr "*** µLªk«Ø¥ß°õ¦æ¥Ø¿ý (%s)! ***\n"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:772
+#: components/services/install/lib/eazel-install-object.c:1429
 #, c-format
 msgid "Writing transaction to %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:970
-msgid "Failed to lock the downloaded file"
+#: components/services/install/lib/eazel-install-problem.c:163
+#, c-format
+msgid "%s was cancelled"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:985
+#: components/services/install/lib/eazel-install-problem.c:168
+#: components/services/install/lib/eazel-install-problem.c:334
 #, c-format
-msgid "MD5 mismatch, package %s may be compromised"
+msgid "%s is a source package, which is not yet supported"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1043
+#: components/services/install/lib/eazel-install-problem.c:182
+#: components/services/install/lib/eazel-install-problem.c:193
 #, fuzzy, c-format
-msgid "Preflight (%d bytes, %d packages)"
-msgstr "¶µ¥Ø = %s, %d ­Ó®M¥ó"
+msgid "%s would break other packages"
+msgstr "Ū¨ú¦w¸Ë®M¥ó¦Cªí¤¤..."
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1081
-msgid "rpm running..."
+#: components/services/install/lib/eazel-install-problem.c:185
+#, c-format
+msgid "%s would break"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1173
-#, fuzzy, c-format
-msgid "Removing package %s %s"
-msgstr "§R°£®M¥ó %s "
-
-#: components/services/install/lib/eazel-install-rpm-glue.c:1294
+#: components/services/install/lib/eazel-install-problem.c:191
 #, c-format
-msgid "Cannot open %s"
-msgstr "µLªk¶}±Ò %s "
+msgid "%s would break %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1356
+#: components/services/install/lib/eazel-install-problem.c:197
 #, c-format
-msgid "Closing db for %s (open)"
+msgid "%s is damaged"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1361
+#: components/services/install/lib/eazel-install-problem.c:201
 #, c-format
-msgid "Closing db for %s (not open)"
+msgid "%s requires %s, which could not be found on the server"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1417
-msgid "RPM package database query failed !"
-msgstr "µLªk¨ú±oRPM®M¥ó¸ê®Æ®w¸ê®Æ!"
+#: components/services/install/lib/eazel-install-problem.c:204
+#, c-format
+msgid "%s for %s could not be found on the server"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1420
+#: components/services/install/lib/eazel-install-problem.c:215
+#: components/services/install/lib/eazel-install-problem.c:360
 #, fuzzy, c-format
-msgid "Opened packages database in %s"
-msgstr "µLªk¨ú±oRPM®M¥ó¸ê®Æ®w¸ê®Æ!"
+msgid "%s is already installed"
+msgstr "±j¨î¦w¸Ë"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1422
-#, fuzzy, c-format
-msgid "Opening packages database in %s failed"
-msgstr "µLªk¨ú±o®M¥ó¸ê®Æ®w¸ê®Æ!"
+#: components/services/install/lib/eazel-install-problem.c:259
+#, c-format
+msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1439
-#, fuzzy
-msgid "Preparing package system"
-msgstr "§R°£®M¥ó %s "
+#: components/services/install/lib/eazel-install-problem.c:263
+#, c-format
+msgid "%s, which is older, needs upgrade and upgrade is not enabled"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1693
+#: components/services/install/lib/eazel-install-problem.c:353
 #, c-format
-msgid "%s upgrades from version %s to %s"
+msgid "%s is not installed and could not be found on server"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1698
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. %s is a package name or filename
+#: components/services/install/lib/eazel-install-problem.c:920
 #, c-format
-msgid "%s downgrades from version %s to %s"
+msgid "Check for a new version of %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1705
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. both %s's are package names or filenames
+#: components/services/install/lib/eazel-install-problem.c:931
 #, c-format
-msgid "%s version %s already installed"
+msgid "Install both %s and %s"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1828
-#, fuzzy, c-format
-msgid "%s requires %s"
-msgstr "%s %s »P %s ¬Û½Ä"
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. %s is a package name or filename
+#: components/services/install/lib/eazel-install-problem.c:946
+#, c-format
+msgid "Remove %s from your system"
+msgstr ""
+
+#. TRANSLATORS : This string is a solution to a dependency problem,
+#. %s is a package name or filename. "Force" is in the rpm sense of force,
+#. meaning that no dependency checking etc will be done
+#: components/services/install/lib/eazel-install-problem.c:959
+#, c-format
+msgid "Force the removal of %s from your system"
+msgstr ""
+
+#. TRANSLATORS : This string is a solution to a dependency problem
+#: components/services/install/lib/eazel-install-problem.c:967
+msgid "Package database has an inconsistency"
+msgstr ""
 
-#. If we end here, it's a conflict is going to break something
-#. FIXME bugzilla.eazel.com 1514:
-#. Need to handle this more intelligently
-#: components/services/install/lib/eazel-install-rpm-glue.c:1885
+#: components/services/install/lib/eazel-install-problem.c:1015
+msgid "Continue with force"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-problem.c:1021
+#, fuzzy
+msgid "Allow downgrade"
+msgstr "­ã³\\¤É¯Å¨ìªºª©¥»"
+
+#: components/services/install/lib/eazel-install-protocols.c:129
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:169
+#, c-format
+msgid "Could not open target file %s"
+msgstr "µLªk³B²z¥Ø¼ÐÀÉ®× %s "
+
+#: components/services/install/lib/eazel-install-protocols.c:136
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:95
+msgid "Could not create an http request !"
+msgstr "µLªk°µ¥XHTTP½Ð¨D!"
+
+#: components/services/install/lib/eazel-install-protocols.c:143
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:102
+#, fuzzy
+msgid "Proxy: Invalid uri !"
+msgstr "µL®Ä URI !"
+
+#: components/services/install/lib/eazel-install-protocols.c:148
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:108
+msgid "Invalid uri !"
+msgstr "µL®Ä URI !"
+
+#: components/services/install/lib/eazel-install-protocols.c:155
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:118
+msgid "Could not prepare http request !"
+msgstr "µLªk·Ç³ÆHTTP½Ð¨D!"
+
+#: components/services/install/lib/eazel-install-protocols.c:160
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:123
+msgid "Couldn't get async mode "
+msgstr "µLªk¶i¤J«D¦P¨B¶Ç¿é¼Ò¦¡"
+
+#. probably out of disk space
+#: components/services/install/lib/eazel-install-protocols.c:189
+#: components/services/install/lib/eazel-install-protocols.c:218
+#: components/services/install/lib/eazel-install-protocols.c:234
 #, c-format
-msgid "%s conflicts %s-%s"
-msgstr "%s »P %s-%s ¬Û½Ä"
+msgid "DISK FULL: could not write %s"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1899
+#: components/services/install/lib/eazel-install-protocols.c:195
+#: components/services/install/lib/eazel-install-protocols.c:223
+msgid "Could not get request body!"
+msgstr "µLªk¶i¦æHTTP½Ð¨D!"
+
+#: components/services/install/lib/eazel-install-protocols.c:208
+#, c-format
+msgid "HTTP error: %d %s"
+msgstr "HTTP error: %d %s"
+
+#: components/services/install/lib/eazel-install-protocols.c:255
+msgid "FTP not supported yet"
+msgstr "µLªk¤ä´©FTP"
+
+#: components/services/install/lib/eazel-install-protocols.c:463
 #, fuzzy, c-format
-msgid "Processing dep for %s, requires library %s"
-msgstr "À˹î %s ªº¬Û¨Ì©Ê : »Ý­n %s"
+msgid "Checking local file %s..."
+msgstr "À˵ø¥»¾÷Àɮפ¤..."
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:1908
+#: components/services/install/lib/eazel-install-protocols.c:584
 #, fuzzy, c-format
-msgid "Processing dep for %s, requires package %s"
-msgstr "À˹î %s ªº¬Û¨Ì©Ê : »Ý­n %s"
+msgid "Failed to retrieve %s!"
+msgstr "µLªkÁÙ­ì %s!"
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:2190
+#: components/services/install/lib/eazel-install-protocols.c:657
 #, fuzzy, c-format
-msgid "%d dependency failure(s)"
-msgstr "%d ¨Ì¦s©Ê¥¢±Ñ!"
+msgid "Could not get an URL for %s"
+msgstr "µLªk¨ú±o %s ªºURL"
+
+#: components/services/install/lib/eazel-install-protocols.c:672
+msgid "Downloaded package does not have the correct name"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-rpm-glue.c:2254
-msgid "Dependencies are ok"
-msgstr "¨Ì¦s©Ê¥¿½TµL»~"
+#: components/services/install/lib/eazel-install-protocols.c:673
+#, c-format
+msgid "Package %s should have had name %s"
+msgstr ""
+
+#: components/services/install/lib/eazel-install-protocols.c:701
+msgid "File download failed"
+msgstr ""
 
-#: components/services/install/lib/eazel-install-tests.c:33
+#: components/services/install/lib/eazel-install-tests.c:34
 msgid "*** Begin pkg dump ***\n"
 msgstr "*** ¶}©l pkg dump ***\n"
 
-#: components/services/install/lib/eazel-install-tests.c:40
+#: components/services/install/lib/eazel-install-tests.c:41
 msgid "*** End pkg dump ***\n"
 msgstr "*** §¹¦¨ pkg dump ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:129
-#: components/services/install/lib/eazel-install-xml-package-list.c:136
+#: components/services/install/lib/eazel-install-xml-package-list.c:161
 #, fuzzy
-msgid "*** No package nodes! ***"
+msgid "*** No package nodes! (cat has no children) ***"
 msgstr "*** §ä¤£¨ì®M¥ónodes! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:131
-#: components/services/install/lib/eazel-install-xml-package-list.c:138
+#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:171
+#: components/services/install/lib/eazel-install-xml-package-list.c:186
 #, fuzzy
 msgid "*** Bailing from package parse! ***"
 msgstr "*** ¥Ñ package ¸õ¥X ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:143
+#: components/services/install/lib/eazel-install-xml-package-list.c:169
+#, fuzzy
+msgid "*** No package nodes! ***"
+msgstr "*** §ä¤£¨ì®M¥ónodes! ***\n"
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:175
 #, fuzzy
 msgid "*** Malformed package node!"
 msgstr "*** §ä¤£¨ì®M¥ónodes! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:153
+#: components/services/install/lib/eazel-install-xml-package-list.c:184
+#, fuzzy
+msgid "*** No depends nodes! ***"
+msgstr "*** §ä¤£¨ì®M¥ónodes! ***\n"
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:190
 msgid "*** Malformed depends node!"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:163
+#: components/services/install/lib/eazel-install-xml-package-list.c:214
 #, c-format
 msgid "*** Unknown node type '%s'"
 msgstr ""
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:182
+#: components/services/install/lib/eazel-install-xml-package-list.c:232
 msgid "*** The pkg list file contains no data! ***\n"
 msgstr "*** ®M¥ó¦Cªí¤¤¨S¦³¸ê®Æ ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:187
+#: components/services/install/lib/eazel-install-xml-package-list.c:237
 msgid "*** Cannot find the CATEGORIES xmlnode! ***\n"
 msgstr "*** §ä¤£¨ì CATEGORIES xmnode! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:189
+#: components/services/install/lib/eazel-install-xml-package-list.c:238
 msgid "*** Bailing from categories parse! ***\n"
 msgstr "*** ±q category parse ¸õ¥X ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:195
+#: components/services/install/lib/eazel-install-xml-package-list.c:244
 msgid "*** No Categories! ***\n"
 msgstr "*** ¨S¦³¶µ¥Ø ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:197
+#: components/services/install/lib/eazel-install-xml-package-list.c:245
 msgid "*** Bailing from category parse! ***\n"
 msgstr "*** ±q category parse ¸õ¥X ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:248
+#: components/services/install/lib/eazel-install-xml-package-list.c:299
 #, fuzzy
 msgid "*** Cannot find the TRANSACTION xmlnode! ***\n"
 msgstr "*** §ä¤£¨ì CATEGORIES xmnode! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:250
-#: components/services/install/lib/eazel-install-xml-package-list.c:258
+#: components/services/install/lib/eazel-install-xml-package-list.c:301
+#: components/services/install/lib/eazel-install-xml-package-list.c:309
 #, fuzzy
 msgid "*** Bailing from transaction parse! ***\n"
 msgstr "*** ±q category parse ¸õ¥X ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:256
+#: components/services/install/lib/eazel-install-xml-package-list.c:307
 #, fuzzy
 msgid "*** No packages! ***\n"
 msgstr "*** §ä¤£¨ì®M¥ónodes! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:364
+#: components/services/install/lib/eazel-install-xml-package-list.c:343
+#, fuzzy
+msgid "*** No category nodes! ***"
+msgstr "*** §ä¤£¨ì®M¥ónodes! ***\n"
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:347
+#, fuzzy
+msgid "*** Cannot find the CATEGORIES xmlnode! ***"
+msgstr "*** §ä¤£¨ì CATEGORIES xmnode! ***\n"
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:381
+#, fuzzy, c-format
+msgid "*** Unknown node %s"
+msgstr "¥¼ª¾"
+
+#: components/services/install/lib/eazel-install-xml-package-list.c:471
 msgid "*** Error generating xml package list! ***\n"
 msgstr "*** xml ®M¥ó¦Cªí¿ù»~ ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:411
+#: components/services/install/lib/eazel-install-xml-package-list.c:518
 msgid "*** Error reading package list! ***\n"
 msgstr "*** ®M¥ó¦CªíŪ¨ú¿ù»~ ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:590
+#: components/services/install/lib/eazel-install-xml-package-list.c:921
 #, fuzzy
 msgid "*** The osd xml contains no data! ***\n"
 msgstr "*** ³]©wÀɵL¸ê®Æ! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:595
+#: components/services/install/lib/eazel-install-xml-package-list.c:926
 #, fuzzy
 msgid "*** Bailing from osd parse! ***\n"
 msgstr "xmlparse ¸õ¥X! ***\n"
 
-#: components/services/install/lib/eazel-install-xml-package-list.c:648
+#: components/services/install/lib/eazel-install-xml-package-list.c:1002
 #, fuzzy, c-format
 msgid "Could not parse the xml (length %d)"
 msgstr "µLªk³B²z¥Ø¼ÐÀÉ®× %s "
 
-#. Setup the title
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:103
-#, fuzzy
-msgid "Easy Install"
-msgstr "¦w¸Ë"
+#: components/services/install/lib/eazel-package-system-rpm3.c:786
+#, fuzzy, c-format
+msgid "Opened packages database in %s"
+msgstr "µLªk¨ú±oRPM®M¥ó¸ê®Æ®w¸ê®Æ!"
 
-#. Setup the progress header
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:198
-msgid "Messages"
+#: components/services/install/lib/eazel-package-system-rpm3.c:791
+#, fuzzy, c-format
+msgid "Opening packages database in %s failed"
+msgstr "µLªk¨ú±o®M¥ó¸ê®Æ®w¸ê®Æ!"
+
+#: components/services/install/lib/eazel-package-system-rpm3.c:824
+#, c-format
+msgid "Closing db for %s (open)"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:198
-#, fuzzy
-msgid "Progress"
-msgstr "µ{§Ç..."
+#: components/services/install/lib/eazel-package-system-rpm3.c:829
+#, c-format
+msgid "Closing db for %s (not open)"
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:498
+#: components/services/install/lib/eazel-package-system-rpm3.c:1160
+#, c-format
+msgid "Cannot open %s"
+msgstr "µLªk¶}±Ò %s "
+
+#. this stuff flies by so fast, it's probably enough to just say "info"
+#: components/services/install-view/callbacks.c:64
 #, fuzzy
-msgid "Complete!"
-msgstr "µù¸Ñ"
+msgid "Getting package information ..."
+msgstr "¥¿±q»·ºÝ¦øªA¾¹¤U¸ü«Ê¥]¤¤...\n"
+
+#: components/services/install-view/callbacks.c:82
+#, fuzzy, c-format
+msgid "Checking \"%s\" for conflicts..."
+msgstr "À˵ø¥»¾÷Àɮפ¤..."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:544
+#: components/services/install-view/callbacks.c:185
 #, fuzzy, c-format
-msgid "Downloading package %s"
+msgid "Downloading 1 package (%s)"
 msgstr "§R°£®M¥ó %s "
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:551
+#: components/services/install-view/callbacks.c:187
 #, fuzzy, c-format
-msgid "Downloading package %s ..."
-msgstr "¤U¸ü %s ¤¤..."
+msgid "Downloading %d packages (%s)"
+msgstr "§R°£®M¥ó %s "
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:576
+#: components/services/install-view/callbacks.c:236
 #, fuzzy, c-format
-msgid "Dependency check: Package %s needs %s"
-msgstr "À˹î¬Û¨Ì©Ê¥¢±Ñ"
+msgid "Downloading \"%s\""
+msgstr "¤U¸ü %s ¤¤..."
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:617
-msgid ""
-"I'm about to install the following packages:\n"
-"\n"
+#: components/services/install-view/callbacks.c:242
+#, c-format
+msgid "0K of %dK"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:635
+#: components/services/install-view/callbacks.c:249
+#, c-format
 msgid ""
-"\n"
-"Is this okay?"
+"The package \"%s\" requires \"%s\" to run.\n"
+"Downloading \"%s\" now."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:655
+#: components/services/install-view/callbacks.c:252
+#, fuzzy, c-format
+msgid "Attempting to download package \"%s\"."
+msgstr "§R°£®M¥ó %s "
+
+#: components/services/install-view/callbacks.c:262
+#: components/services/install-view/callbacks.c:333
 #, fuzzy
-msgid "Preparing to install 1 package"
-msgstr "Ū¨ú¦w¸Ë®M¥ó¦Cªí¤¤..."
+msgid "Complete"
+msgstr "µù¸Ñ"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:657
+#: components/services/install-view/callbacks.c:266
+#, c-format
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" has been successfully downloaded."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:269
 #, fuzzy, c-format
-msgid "Preparing to install %d packages"
-msgstr "Ū¨ú¦w¸Ë®M¥ó¦Cªí¤¤..."
+msgid "The package \"%s\" has been successfully downloaded."
+msgstr "XML ®M¥óªí¤w¦¨¥\\²£¥Í...\n"
+
+#: components/services/install-view/callbacks.c:287
+#, c-format
+msgid "%dK of %dK"
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:678
+#: components/services/install-view/callbacks.c:316
+#, fuzzy, c-format
+msgid "Download of package \"%s\" failed!"
+msgstr "§R°£®M¥ó %s "
+
+#: components/services/install-view/callbacks.c:338
 #, c-format
-msgid "Download of package %s failed!"
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" has been successfully downloaded and installed."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:341
+#, c-format
+msgid "\"%s\" has been successfully downloaded and installed."
 msgstr ""
 
 #. starting a new package -- create new progress indicator
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:695
+#: components/services/install-view/callbacks.c:369
 #, fuzzy, c-format
 msgid "Installing package %d of %d"
 msgstr "¦w¸Ë \"%s\" ¤¤ "
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:701
+#: components/services/install-view/callbacks.c:396
+#, c-format
+msgid ""
+"The package \"%s\" requires \"%s\" to run.\n"
+"\"%s\" is now being installed."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:399
 #, fuzzy, c-format
-msgid "Installing package %s ..."
+msgid "Now installing package \"%s\"."
 msgstr "¦w¸Ë \"%s\" ¤¤ "
 
-#. first package is the main one.  update top info, now that we know it
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:709
+#: components/services/install-view/callbacks.c:407
+#: components/services/install-view/nautilus-service-install-view.c:899
 #, fuzzy, c-format
 msgid "Installing \"%s\""
 msgstr "¦w¸Ë \"%s\" ¤¤ "
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:716
+#: components/services/install-view/callbacks.c:415
+#: src/nautilus-zoom-control.c:592
+#, fuzzy
+msgid "%d%%"
+msgstr "%.0f%%"
+
+#: components/services/install-view/callbacks.c:443
 #, fuzzy, c-format
-msgid "Version: %s"
-msgstr "ª©¥» %s-%s"
+msgid "Installation failed on %s"
+msgstr "¦w¸Ë¥¢±Ñ"
+
+#: components/services/install-view/callbacks.c:471
+msgid "I ran into problems while installing."
+msgstr ""
+
+#: components/services/install-view/callbacks.c:472
+msgid "I'd like to try the following :"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:481
+msgid "Is this ok ?"
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:772
+#: components/services/install-view/callbacks.c:556
 #, fuzzy
-msgid "Installation complete!"
+msgid "Installation cancelled."
 msgstr "¦w¸Ë¥¢±Ñ"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:774
+#: components/services/install-view/callbacks.c:558
 #, fuzzy
-msgid "Installation aborted."
-msgstr "¦w¸Ë®É¶¡: "
+msgid "This package has already been installed."
+msgstr "®M¥ó %s ©|¥¼¦w¸Ë "
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:776
+#: components/services/install-view/callbacks.c:560
+#: components/services/install-view/callbacks.c:657
 #, fuzzy
-msgid "Installation failed!"
+msgid "Installation complete."
 msgstr "¦w¸Ë¥¢±Ñ"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:790
+#: components/services/install-view/callbacks.c:564
+#, fuzzy
+msgid "Installation failed."
+msgstr "¦w¸Ë¥¢±Ñ"
+
+#. some succeeded; some failed
+#: components/services/install-view/callbacks.c:568
+#, fuzzy
+msgid "Some packages installed successfully:"
+msgstr "XML ®M¥óªí¤w¦¨¥\\²£¥Í...\n"
+
+#: components/services/install-view/callbacks.c:577
+#, fuzzy
+msgid ""
+"\n"
+"Some packages failed:"
+msgstr "®M¥ó¼ÐÃD"
+
+#: components/services/install-view/callbacks.c:626
+msgid "Erase the RPM files?"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:628
+msgid "Erase the leftover RPM files?"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:658
+msgid "Ok"
+msgstr ""
+
+#: components/services/install-view/callbacks.c:673
+msgid ""
+"A core package of Nautilus has been\n"
+"updated.  You should restart Nautilus.\n"
+"\n"
+"Do you wish to do that now?"
+msgstr ""
+
+#. Setup the title
+#: components/services/install-view/forms.c:201
+#, fuzzy
+msgid "Easy Install"
+msgstr "¦w¸Ë"
+
+#. Setup the progress header
+#. FIXME: the middle header is all fubar now, so we just say "messages", but the spec
+#. * shows "progress" over the 2nd column of the message box.  it's just too hard to get
+#. * it aligned currently.
+#.
+#: components/services/install-view/forms.c:327
+msgid "Messages"
+msgstr ""
+
+#: components/services/install-view/forms.c:358
+#: components/services/summary/nautilus-summary-view.c:647
+#, fuzzy, c-format
+msgid "Version: %s"
+msgstr "ª©¥» %s-%s"
+
+#: components/services/install-view/forms.c:407
+#, fuzzy
+msgid "These packages are ready to be downloaded and installed:"
+msgstr "®M¥ó %s ©|¥¼¦w¸Ë "
+
+#: components/services/install-view/forms.c:408
+msgid "If you wish to download and install these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:411
+#, fuzzy
+msgid "These packages are ready to be uninstalled:"
+msgstr "®M¥ó %s ©|¥¼¦w¸Ë "
+
+#: components/services/install-view/forms.c:412
+msgid "If you wish to uninstall these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:415
+#, fuzzy
+msgid "These packages are ready to be reverted:"
+msgstr "®M¥ó %s ©|¥¼¦w¸Ë "
+
+#: components/services/install-view/forms.c:416
+msgid "If you wish to revert these packages, click Continue."
+msgstr ""
+
+#: components/services/install-view/forms.c:464
 #, c-format
-msgid "%s %s: would not work anymore\n"
+msgid "for a total of %ld MB."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:793
+#: components/services/install-view/forms.c:466
 #, c-format
-msgid "%s %s: couldn't find this package\n"
+msgid "for a total of %ld KB."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:796
+#. buttons
+#: components/services/install-view/forms.c:478
+#, fuzzy
+msgid "Continue"
+msgstr "¤º®e"
+
+#: components/services/install-view/forms.c:482
+#: libnautilus-extensions/nautilus-drag.c:493
+#: src/file-manager/fm-directory-view.c:4326
+msgid "Cancel"
+msgstr "¨ú®ø"
+
+#: components/services/install-view/nautilus-service-install-view.c:421
 #, c-format
-msgid "%s %s: source package (not supported)\n"
+msgid "%s is in GNOME (footprint) > %s"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:799
+#: components/services/install-view/nautilus-service-install-view.c:439
 #, c-format
-msgid "%s %s: would break other installed packages\n"
+msgid "%s is in the GNOME (footprint) menu.\n"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:803
+#: components/services/install-view/nautilus-service-install-view.c:454
 #, c-format
-msgid "%s %s: conflicts with installed files\n"
+msgid "%s is in the KDE menu.\n"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:806
+#: components/services/install-view/nautilus-service-install-view.c:655
+#, fuzzy
+msgid "Installation Complete"
+msgstr "¦w¸Ë¥¢±Ñ"
+
+#: components/services/install-view/nautilus-service-install-view.c:710
 #, c-format
-msgid "%s %s: already installed\n"
+msgid ""
+"%sTo start %s, click the Launch button below, or to create a shortcut, drag "
+"the icon on the right to the GNOME panel or your desktop."
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:837
+#. couldn't find an icon
+#: components/services/install-view/nautilus-service-install-view.c:718
+#, c-format
+msgid "%sTo start %s, click the Launch button below."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:773
 #, fuzzy
-msgid "This package has already been installed."
-msgstr "®M¥ó %s ©|¥¼¦w¸Ë "
+msgid "Incorrect password."
+msgstr "¿é¤J±K½X"
+
+#: components/services/install-view/nautilus-service-install-view.c:778
+msgid "Authenticate as root"
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:895
+#, fuzzy
+msgid "Installing packages"
+msgstr "¦w¸Ë \"%s\" ¤¤ "
+
+#: components/services/install-view/nautilus-service-install-view.c:897
+#, fuzzy
+msgid "Installing remote package"
+msgstr "¦w¸Ë \"%s\" ¤¤ "
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:844
+#: components/services/install-view/nautilus-service-install-view.c:901
 #, fuzzy
+msgid "Installing some package"
+msgstr "¦w¸Ë \"%s\" ¤¤ "
+
+#: components/services/install-view/nautilus-service-install-view.c:918
 msgid ""
-"Installation Failed!\n"
-"\n"
+"The Eazel install service is missing:\n"
+"Installs will not work."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:967
+msgid "Contacting the Eazel Software Catalog ..."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:1025
+#, fuzzy
+msgid "Checking for authorization..."
+msgstr "µ¥«Ý³s±µ¤¤..."
+
+#: components/services/install-view/nautilus-service-install-view.c:1097
+msgid "Aborting package downloads (please wait) ..."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:1117
+msgid "Package download aborted."
+msgstr ""
+
+#: components/services/install-view/nautilus-service-install-view.c:1118
+#, fuzzy
+msgid "Aborted"
+msgstr "Àx¦s"
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:1
+#: components/services/install/server/Trilobite_Service_install.oaf.in.h:2
+#: components/services/summary/nautilus-summary-view.c:123
+msgid "Install"
+msgstr "¦w¸Ë"
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:2
+#, fuzzy
+msgid "Install Viewer"
 msgstr "¦w¸Ë¥¢±Ñ"
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:863
-msgid "Should I delete the leftover RPM files?"
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:3
+#, fuzzy
+msgid "Nautilus Service Install View"
+msgstr "Nautilus ¦w¸Ë¤u¨ã"
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:4
+#, fuzzy
+msgid "Nautilus Service Install View Factory"
+msgstr "Nautilus ¦w¸Ë¤u¨ã"
+
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:5
+msgid "Service Install View Component"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1010
-msgid "Downloading remote package"
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:6
+msgid "Service Install View Component's Factory"
 msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1012
-#, fuzzy, c-format
-msgid "Downloading \"%s\""
-msgstr "¤U¸ü %s ¤¤..."
+#: components/services/install-view/Nautilus_View_install.oaf.in.h:7
+#, fuzzy
+msgid "View as Install"
+msgstr "¦w¸Ë"
+
+#: components/services/install/server/Trilobite_Service_install.oaf.in.h:1
+msgid "Factory for the install service"
+msgstr ""
+
+#: components/services/inventory/eazel-inventory-client.c:70
+msgid "Enable inventory upload."
+msgstr ""
 
-#: components/services/install/nautilus-view/nautilus-service-install-view.c:1047
-msgid "Contacting install server ..."
+#: components/services/inventory/eazel-inventory-client.c:72
+msgid "Disable inventory upload."
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:135
-msgid "Could not find a valid boolean value for grey_out!"
+#: components/services/inventory/eazel-inventory-client.c:73
+#, fuzzy
+msgid "Display information about current inventory settings."
+msgstr "Åã¥Ü Nautilus ªº¬ÛÃö°T®§"
+
+#: components/services/inventory/eazel-inventory-client.c:74
+msgid "Upload inventory now, if not up to date."
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:184
-msgid "There is no service data !\n"
+#: components/services/inventory/Trilobite_Service_inventory.oaf.in.h:1
+msgid "Factory for the inventory service"
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:209
-#: components/services/summary/lib/eazel-summary-shared.c:234
-msgid "There is no eazel news data !\n"
+#: components/services/inventory/Trilobite_Service_inventory.oaf.in.h:2
+msgid "Inventory"
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:264
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:1
 #, fuzzy
-msgid "Could not fetch summary configuration !"
-msgstr "*** µLªk«Ø¨î¹w³]³]©wÀÉ®×! ***\n"
+msgid "Nautilus Inventory view"
+msgstr "Nautilus: ³qª¾"
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:2
+msgid "Nautilus Inventory view factory"
+msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:287
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:3
+msgid "Nautilus System Inventory component's component's factory"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:4
+msgid "System Inventory"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:5
+msgid "System Inventory Viewer"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:6
+msgid "System inventory view component"
+msgstr ""
+
+#: components/services/inventory-view/Nautilus_View_inventory.oaf.in.h:7
+msgid "View as System Inventory"
+msgstr ""
+
+#. Setup the title
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:153
+msgid "Please Change Your Eazel Password"
+msgstr ""
+
+#. add password boxes
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:174
+msgid "User Name:"
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:181
 #, fuzzy
-msgid "The summary configuration contains no data!\n"
-msgstr "*** ³]©wÀɵL¸ê®Æ! ***\n"
+msgid "Current Password:"
+msgstr "¿é¤J±K½X"
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:188
+msgid "New Password:"
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:195
+msgid "Confirm New Password:"
+msgstr ""
+
+#. allocate the command buttons - first the change_password button
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:227
+msgid "Change my password"
+msgstr ""
+
+#. now allocate the account maintenance button
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:234
+msgid "I need assistance"
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:297
+msgid "Your password has been changed!"
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:328
+msgid ""
+"I'm sorry, but that password\n"
+"is incorrect.  Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:332
+msgid ""
+"I'm sorry, but your new password\n"
+"must be at least six (6) characters long.\n"
+"Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:337
+msgid ""
+"I'm sorry, but your new password\n"
+"can't be ridiculously long.\n"
+"Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:346
+msgid ""
+"I'm sorry, but your new password must\n"
+"contain letters along with at least one\n"
+"number or symbol. Please try another one."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:350
+msgid ""
+"I'm sorry, but I hit an unexpected\n"
+"error. Please try again, with\n"
+"different passwords."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:434
+msgid ""
+"I'm sorry, but I got an unexpected\n"
+"error.  Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/nautilus-change-password-view.c:467
+msgid ""
+"I'm sorry, but your new password\n"
+"wasn't typed the same way twice.\n"
+"Please try again."
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:1
+msgid "Change Password"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:2
+msgid "Change Password Viewer"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:3
+msgid "Eazel Change Password View"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:4
+msgid "Eazel Change Password view component"
+msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:292
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:5
+msgid "Nautilus Service Login View Factory"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:6
+msgid "Service Login View Component's Factory"
+msgstr ""
+
+#: components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in.h:7
 #, fuzzy
-msgid "Cannot find the SUMMARY_DATA xmlnode!\n"
-msgstr "*** §ä¤£¨ì CATEGORIES xmnode! ***\n"
+msgid "View as Change Password"
+msgstr "¥H¨ä¥LÂsÄý..."
 
-#: components/services/summary/lib/eazel-summary-shared.c:294
+#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:295
 #, fuzzy
-msgid "Bailing from the SUMMARY_DATA parse!\n"
-msgstr "*** ±q category parse ¸õ¥X ! ***\n"
+msgid "Unknown Date"
+msgstr "¥¼ª¾®æ¦¡"
+
+#: components/services/nautilus-dependent-shared/eazel-services-extensions.c:300
+msgid "%A, %B %d"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-callbacks.c:97
+msgid ""
+"Sorry, network problems are preventing you from connecting to Eazel Services."
+msgstr ""
+
+#. FIXME we really should use the services alert icon here, eh?
+#: components/services/summary/nautilus-summary-callbacks.c:102
+msgid ""
+"Your Eazel Services account has not yet been activated.  You can't log into "
+"Eazel Services until you activate your account.\n"
+"\n"
+"Please check your email for activation instructions."
+msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:301
-msgid "Could not find any summary configuration data!\n"
+#. FIXME we really should use the services alert icon here, eh?
+#: components/services/summary/nautilus-summary-callbacks.c:109
+msgid ""
+"Your Eazel Service User Account has been temporarily disabled.\n"
+"\n"
+"Please try again in a few minutes, or contact Eazel support if this problem "
+"continues."
 msgstr ""
 
-#: components/services/summary/lib/eazel-summary-shared.c:303
+#: components/services/summary/nautilus-summary-callbacks.c:131
+msgid "We're sorry, but your name and password are still not recognized."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-dialogs.c:69
 #, fuzzy
-msgid "Bailing from summary configuration parse!\n"
-msgstr "*** ±q category parse ¸õ¥X ! ***\n"
+msgid "Eazel Service Login Error"
+msgstr "Eazel ªA°È"
 
-#: components/services/time/command-line/main.c:43
-msgid "display service name and such"
-msgstr "¦C¥XªA°È¦WºÙ"
+#: components/services/summary/nautilus-summary-dialogs.c:80
+#, fuzzy
+msgid "Service Error"
+msgstr "Services"
 
-#: components/services/time/command-line/main.c:44
-msgid "maximum allowed difference in seconds"
-msgstr "maximum alowed difference in seconds"
+#: components/services/summary/nautilus-summary-dialogs.c:104
+msgid "Register Now"
+msgstr ""
 
-#: components/services/time/command-line/main.c:45
-msgid "update the system clock"
-msgstr "§ó·s¨t²Î®É¶¡"
+#: components/services/summary/nautilus-summary-dialogs.c:115
+#, fuzzy
+msgid "Services Login"
+msgstr "Services"
 
-#: components/services/time/command-line/main.c:46
-msgid "specify time url"
-msgstr "»¡©ú URL ®É¶¡"
+#: components/services/summary/nautilus-summary-dialogs.c:131
+#: libnautilus-extensions/nautilus-global-preferences.c:827
+#, fuzzy
+msgid "Username:"
+msgstr "­«·s©R¦W"
 
-#: components/services/time/service/trilobite-eazel-time-service.c:103
-msgid "Unable to get server time"
+#: components/services/summary/nautilus-summary-dialogs.c:138
+#: libnautilus-extensions/nautilus-global-preferences.c:835
+msgid "Password:"
 msgstr ""
 
-#: components/services/time/service/trilobite-eazel-time-service.c:105
-#, c-format
-msgid "Time off by %d, max allowed diff is %d"
+#: components/services/summary/nautilus-summary-dialogs.c:146
+#: components/services/summary/nautilus-summary-dialogs.c:155
+#, fuzzy
+msgid "Please log in to Eazel Services"
+msgstr "¥[¤J Eazel ªA°È"
+
+#: components/services/summary/nautilus-summary-dialogs.c:150
+msgid "Your user name or password were not correct.  Please try again."
 msgstr ""
 
-#: components/services/time/service/trilobite-eazel-time-service.c:282
+#: components/services/summary/nautilus-summary-view.c:117
+#: libnautilus-extensions/nautilus-program-chooser.c:1361
+msgid "Go There"
+msgstr "Go There"
+
+#: components/services/summary/nautilus-summary-view.c:120
+#, fuzzy
+msgid "More Info"
+msgstr "°T®§"
+
+#: components/services/summary/nautilus-summary-view.c:131
+#, fuzzy
+msgid "Account Preferences"
+msgstr "Nautilus: ªì©l¤Æ°Ñ¼Æ³]©w"
+
+#: components/services/summary/nautilus-summary-view.c:132
+msgid "Logout"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:133
+#: components/services/summary/nautilus-summary-view.c:141
+msgid "Terms of Use"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:134
+#: components/services/summary/nautilus-summary-view.c:142
+msgid "Privacy Statement"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:139
+#, fuzzy
+msgid "Register"
+msgstr "¶}©l"
+
+#: components/services/summary/nautilus-summary-view.c:140
+#, fuzzy
+msgid "Login"
+msgstr "¦ì¸m"
+
+#: components/services/summary/nautilus-summary-view.c:170
 #, fuzzy, c-format
-msgid "Could not read time-service config from %s"
-msgstr "µLªk«ì´_ %s ªºURL"
+msgid "Eazel Services - Welcome, %s!"
+msgstr "Eazel ªA°È"
+
+#: components/services/summary/nautilus-summary-view.c:175
+msgid "Eazel Services - You are not logged in"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:182
+#, fuzzy
+msgid "Connecting to Eazel Services..."
+msgstr "¥[¤J Eazel ªA°È"
+
+#: components/services/summary/nautilus-summary-view.c:741
+#: data/linksets/home.xml.h:3 src/nautilus-service-ui.xml.h:4
+msgid "Services"
+msgstr "Services"
+
+#: components/services/summary/nautilus-summary-view.c:752
+msgid "Featured Downloads"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:884
+msgid ""
+"Unable to get services data from Eazel's server. The server might be "
+"unavailable right now, or your computer might be configured incorrectly. "
+"Please contact support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:894
+msgid ""
+"Found a problem with services data on Eazel servers. Please contact "
+"support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:917
+msgid ""
+"Information is missing from the redirect data on Eazel servers. Please "
+"contact support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:959
+msgid ""
+"Unable to connect to Eazel's server. The server might be unavailable right "
+"now, or your computer might be configured incorrectly. You could try again "
+"later."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:969
+msgid ""
+"Found a problem with redirect data on Eazel servers. Please contact "
+"support@eazel.com."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:986
+msgid "Failed to upload system inventory."
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view.c:1049
+#: src/nautilus-first-time-druid.c:258
+msgid "Eazel Services"
+msgstr "Eazel ªA°È"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:1
+msgid "Configure your service preferences"
+msgstr ""
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:2
+msgid "Go to the Eazel Services Registration Form"
+msgstr ""
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:442
+#: components/services/summary/nautilus-summary-view-ui.xml.h:3
+#, fuzzy
+msgid "Log out from Eazel Services"
+msgstr "¥[¤J Eazel ªA°È"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:4
+#, fuzzy
+msgid "Service _Preferences"
+msgstr "Nautilus: ªì©l¤Æ°Ñ¼Æ³]©w"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:5
+#, fuzzy
+msgid "Show the log-in dialog box"
+msgstr "Åã¥Ü±Æ§Ç¸ê°T¹ï¸Üµøµ¡"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:6
+#, fuzzy
+msgid "_Log in to Eazel Services"
+msgstr "¥[¤J Eazel ªA°È"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:7
+#, fuzzy
+msgid "_Log out from Eazel Services"
+msgstr "¥[¤J Eazel ªA°È"
+
+#: components/services/summary/nautilus-summary-view-ui.xml.h:8
+#, fuzzy
+msgid "_Register for Eazel Services"
+msgstr "¥[¤J Eazel ªA°È"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:1
+msgid "Nautilus Service Summary View Factory"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Summary View"
+msgstr "Nautilus: ¤É¯Å"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:3
+msgid "Service Summary View Component's Factory"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:4
+msgid "Service Summary view component"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:5
+msgid "Summary"
+msgstr ""
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:6
+#, fuzzy
+msgid "Summary Viewer"
+msgstr "¼Æ¦rÂsÄý:"
+
+#: components/services/summary/Nautilus_View_services-summary.oaf.in.h:7
+#, fuzzy
+msgid "View as Summary"
+msgstr "¥H¨ä¥LÂsÄý..."
+
+#: components/services/trilobite/libtrilobite/trilobite-core-network-slim.c:133
+#, fuzzy, c-format
+msgid "HTTP error %d \"%s\" on uri %s"
+msgstr "HTTP error: %d %s"
+
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:202
 msgid "Could not initialize Bonobo"
 msgstr "µLªk±N Bonoboªì©l¤Æ"
 
-#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:457
+#: components/services/trilobite/libtrilobite/trilobite-core-utils.c:217
 #, c-format
 msgid "Can't write logfile %s -- using default log handler"
 msgstr "µLªk¼g¤J¬ö¿ýÀÉ %s -- ¨Ï¥Î¹w³]¬ö¿ý³B²z¾¹"
 
-#: components/services/vault/command-line/main.c:37
-msgid "Enable debugging"
-msgstr "±Ò°Ê°£¿ù¥\\¯à"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:1
+#, fuzzy
+msgid "Nautilus eazel sample service view component"
+msgstr ""
+"%s\n"
+"\n"
+"³o¬O¤@­Ó Nautilus ½d¨Ò¥Ø¿ý "
 
-#: components/services/vault/command-line/main.c:38
-msgid "Vault location"
-msgstr "Àx¦s¦ì¸m"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:2
+msgid "Nautilus services startup view factory"
+msgstr ""
 
-#: components/services/vault/command-line/main.c:46
-msgid "Valid operations:"
-msgstr "½T¹ê¾Þ§@"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:3
+#, fuzzy
+msgid "Service"
+msgstr "Services"
 
-#: components/services/vault/command-line/main.c:86
-msgid "Error: No operation supplied\n"
-msgstr "¿ù»~:¨S¦³¥i¤ä´©ªº¾Þ§@¼Ò¦¡\n"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:4
+#, fuzzy
+msgid "Service Viewer"
+msgstr "Services"
 
-#: components/services/vault/command-line/main.c:94
-#, c-format
-msgid "Error: Invalid operation supplied (%s)\n"
-msgstr "¿ù»~:¤£½T¹êªº¾Þ§@¼Ò¦¡(%s)\n"
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:5
+msgid "Services startup view factory"
+msgstr ""
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:6
+#, fuzzy
+msgid "View as Service"
+msgstr "¥H¨ä¥LÂsÄý..."
+
+#: components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in.h:7
+msgid "eazel sample service view"
+msgstr ""
 
-#: components/services/vault/command-line/main.c:119
+#: components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in.h:1
+msgid "Factory for the sample service"
+msgstr ""
+
+#: components/text/nautilus-text-view.c:334
 #, c-format
-msgid ""
-"Error: Invalid syntax\n"
-"Syntax: %s\n"
-msgstr "¿ù»~:¥¼ª¾ªí¥Üªk: %s\n"
+msgid "Sorry, but %s is too large for Nautilus to load all of it."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-druid-page-eazel.c:343
+#: components/text/nautilus-text-view.c:337
+msgid "File too large"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:1
 #, fuzzy
-msgid "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
-msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*"
+msgid "F_onts"
+msgstr "¦r«¬"
 
-#: libnautilus-extensions/nautilus-druid-page-eazel.c:352
+#: components/text/nautilus-text-view-ui.xml.h:2
+msgid "Lucida"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:3
+msgid "Use the Courier Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:4
+msgid "Use the Fixed Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:5
+msgid "Use the GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:6
+msgid "Use the Helvetica Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:7
+msgid "Use the Lucida Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:8
+msgid "Use the Times Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:9
+msgid "_Courier"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:10
+#, fuzzy
+msgid "_Fixed"
+msgstr "ÀÉ®×"
+
+#: components/text/nautilus-text-view-ui.xml.h:11
+msgid "_GTK System Font"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:12
+msgid "_Helvetica"
+msgstr ""
+
+#: components/text/nautilus-text-view-ui.xml.h:13
+#, fuzzy
+msgid "_Times"
+msgstr "®É¶¡"
+
+#: components/text/Nautilus_View_text.oaf.in.h:1
+msgid "Factory for text view"
+msgstr ""
+
+#: components/text/Nautilus_View_text.oaf.in.h:2
+#, fuzzy
+msgid "Text"
+msgstr "¤U¤@­º"
+
+#: components/text/Nautilus_View_text.oaf.in.h:3
+#, fuzzy
+msgid "Text Viewer"
+msgstr "¤å¥»ÂsÄý:"
+
+#: components/text/Nautilus_View_text.oaf.in.h:4
+#, fuzzy
+msgid "Text view"
+msgstr "¤å¥»ÂsÄý:"
+
+#: components/text/Nautilus_View_text.oaf.in.h:5
+msgid "Text view factory"
+msgstr ""
+
+#: components/text/Nautilus_View_text.oaf.in.h:6
+#, fuzzy
+msgid "View as Text"
+msgstr "¥H %s ÂsÄý"
+
+#: components/text/services/google.xml.h:1
+msgid "Search Google for Selected Text"
+msgstr ""
+
+#: components/text/services/google.xml.h:2
+msgid "Use Google to search the web for the selected text"
+msgstr ""
+
+#: components/text/services/webster.xml.h:1
+#, fuzzy
+msgid "Look Up Selected Text in Dictionary"
+msgstr "±N¿ï¾Üªº¤å¦r½Æ»s¨ì°Å¶Kï"
+
+#: components/text/services/webster.xml.h:2
+#, fuzzy
+msgid "Look up the selected text in the Merriam-Webster dictionary"
+msgstr "½Æ»s¤w¿ï¤å¥»¨ì°Å¶Kï"
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:1
+msgid "animation to indicate on-going activity"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:2
+msgid "throbber"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:3
+msgid "throbber factory"
+msgstr ""
+
+#: components/throbber/Nautilus_Control_throbber.oaf.in.h:4
+msgid "throbber object factory"
+msgstr ""
+
+#: components/tree/Nautilus_View_tree.oaf.in.h:1
+msgid "Nautilus Tree sidebar panel"
+msgstr ""
+
+#: components/tree/Nautilus_View_tree.oaf.in.h:2
+#, fuzzy
+msgid "Nautilus Tree view"
+msgstr "Nautilus"
+
+#: components/tree/Nautilus_View_tree.oaf.in.h:3
+#: libnautilus-extensions/nautilus-global-preferences.c:1050
+msgid "Tree"
+msgstr ""
+
+#: data/browser.xml.h:1
+#, fuzzy
+msgid "Apparition"
+msgstr "À³¥Îµ{¦¡"
+
+#: data/browser.xml.h:2
+msgid "Azul"
+msgstr ""
+
+#: data/browser.xml.h:3
+#, fuzzy
+msgid "Black"
+msgstr "«e¤@­¶"
+
+#: data/browser.xml.h:4
+msgid "Blue Ridge"
+msgstr ""
+
+#: data/browser.xml.h:5
+msgid "Blue Rough"
+msgstr ""
+
+#: data/browser.xml.h:6
+#, fuzzy
+msgid "Blue Type"
+msgstr "®æ¦¡"
+
+#: data/browser.xml.h:7
+msgid "Brushed Metal"
+msgstr ""
+
+#: data/browser.xml.h:8
+msgid "Bubble Gum"
+msgstr ""
+
+#: data/browser.xml.h:9
+msgid "Burlap"
+msgstr ""
+
+#: data/browser.xml.h:10
+msgid "Camouflage"
+msgstr ""
+
+#: data/browser.xml.h:11
+msgid "Certified"
+msgstr ""
+
+#: data/browser.xml.h:12
+#, fuzzy
+msgid "Chalk"
+msgstr "ÀW¹D"
+
+#: data/browser.xml.h:13
+msgid "Charcoal"
+msgstr ""
+
+#: data/browser.xml.h:14
+#, fuzzy
+msgid "Colors"
+msgstr "Ãö³¬"
+
+#: data/browser.xml.h:15
+#, fuzzy
+msgid "Concrete"
+msgstr "¤º®e"
+
+#: data/browser.xml.h:16
+#, fuzzy
+msgid "Cool"
+msgstr "¿ï¾Ü"
+
+#: data/browser.xml.h:17
+msgid "Cork"
+msgstr ""
+
+#: data/browser.xml.h:18
+#, fuzzy
+msgid "Countertop"
+msgstr "¤º®e"
+
+#: data/browser.xml.h:19
+#, fuzzy
+msgid "Danger"
+msgstr "§¹¦¨"
+
+#: data/browser.xml.h:20
+#, fuzzy
+msgid "Danube"
+msgstr "§¹¦¨"
+
+#: data/browser.xml.h:21
+msgid "Dark Cork"
+msgstr ""
+
+#: data/browser.xml.h:22
+msgid "Dark GNOME"
+msgstr ""
+
+#: data/browser.xml.h:23
+msgid "Deep Teal"
+msgstr ""
+
+#: data/browser.xml.h:24
+#, fuzzy
+msgid "Distinguished"
+msgstr "§¹¦¨"
+
+#: data/browser.xml.h:25
+#, fuzzy
+msgid "Dots"
+msgstr "¦r«¬"
+
+#: data/browser.xml.h:26
+msgid "Draft"
+msgstr ""
+
+#: data/browser.xml.h:27
+msgid "Drag a color to an object to change it to that color"
+msgstr ""
+
+#: data/browser.xml.h:28
+msgid "Drag a pattern tile to an object to change it"
+msgstr ""
+
+#: data/browser.xml.h:29
+msgid "Drag an emblem to an object to add it to the object"
+msgstr ""
+
+#: data/browser.xml.h:30
+msgid "Eclipse"
+msgstr ""
+
+#: data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1620
+msgid "Emblems"
+msgstr "¶H¼x"
+
+#: data/browser.xml.h:32
+msgid "Envy"
+msgstr ""
+
+#: data/browser.xml.h:33
+#, fuzzy
+msgid "Erase"
+msgstr "¼È°±"
+
+#: data/browser.xml.h:34
+#, fuzzy
+msgid "Favorite"
+msgstr "¼g¤J"
+
+#: data/browser.xml.h:35
+msgid "Fibers"
+msgstr ""
+
+#: data/browser.xml.h:36
+msgid "Fire Engine"
+msgstr ""
+
+#: data/browser.xml.h:37
+msgid "Fleur De Lis"
+msgstr ""
+
+#: data/browser.xml.h:38
+#, fuzzy
+msgid "Floral"
+msgstr "¤U¤@­¶"
+
+#: data/browser.xml.h:39
+msgid "Fossil"
+msgstr ""
+
+#: data/browser.xml.h:40 icons/gnome/gnome.xml.h:1
+msgid "GNOME"
+msgstr ""
+
+#: data/browser.xml.h:41
+#, fuzzy
+msgid "Granite"
+msgstr "¼g¤J"
+
+#: data/browser.xml.h:42
+msgid "Grapefruit"
+msgstr ""
+
+#: data/browser.xml.h:43
+msgid "Green Weave"
+msgstr ""
+
+#: data/browser.xml.h:44
+msgid "Ice"
+msgstr ""
+
+#: data/browser.xml.h:45
+msgid "Important"
+msgstr ""
+
+#: data/browser.xml.h:46
+#, fuzzy
+msgid "Indigo"
+msgstr "°T®§"
+
+#: data/browser.xml.h:47
+msgid "Leaf"
+msgstr ""
+
+#: data/browser.xml.h:48
+msgid "Lemon"
+msgstr ""
+
+#: data/browser.xml.h:49
+msgid "Mango"
+msgstr ""
+
+#: data/browser.xml.h:50
+msgid "Manila Paper"
+msgstr ""
+
+#: data/browser.xml.h:51
+msgid "Moss Ridge"
+msgstr ""
+
+#: data/browser.xml.h:52
+msgid "Mud"
+msgstr ""
+
+#: data/browser.xml.h:53
+msgid "New"
+msgstr ""
+
+#: data/browser.xml.h:54
+#, fuzzy
+msgid "Numbers"
+msgstr "¼Æ¦rÂsÄý:"
+
+#: data/browser.xml.h:55
+#: libnautilus-extensions/nautilus-file-operations.c:1102
+msgid "OK"
+msgstr "OK"
+
+#: data/browser.xml.h:56
+msgid "Ocean Strips"
+msgstr ""
+
+#: data/browser.xml.h:57
+msgid "Oh No"
+msgstr ""
+
+#: data/browser.xml.h:58
+msgid "Onyx"
+msgstr ""
+
+#: data/browser.xml.h:59
+msgid "Orange"
+msgstr ""
+
+#: data/browser.xml.h:60
+msgid "Pale Blue"
+msgstr ""
+
+#: data/browser.xml.h:61
+msgid "Patterns"
+msgstr ""
+
+#: data/browser.xml.h:62
+#, fuzzy
+msgid "Personal"
+msgstr "Åv­­"
+
+#: data/browser.xml.h:63
+#, fuzzy
+msgid "Purple Marble"
+msgstr "µLªkŪ¨ú"
+
+#: data/browser.xml.h:64
+msgid "Ridged Paper"
+msgstr ""
+
+#: data/browser.xml.h:65
+msgid "Rough Paper"
+msgstr ""
+
+#: data/browser.xml.h:66
+msgid "Ruby"
+msgstr ""
+
+#: data/browser.xml.h:67
+#, fuzzy
+msgid "Sea Foam"
+msgstr "·j´M¥Ø¼Ð:"
+
+#: data/browser.xml.h:68
+#, fuzzy
+msgid "Shale"
+msgstr "½d¨Ò"
+
+#: data/browser.xml.h:69
+#, fuzzy
+msgid "Silver"
+msgstr "¤j¤p"
+
+#: data/browser.xml.h:70
+#, fuzzy
+msgid "Sky"
+msgstr "ÂHªþ"
+
+#: data/browser.xml.h:71
+msgid "Sky Ridge"
+msgstr ""
+
+#: data/browser.xml.h:72
+#, fuzzy
+msgid "Snow Ridge"
+msgstr "°¼¦C"
+
+#: data/browser.xml.h:73
+#, fuzzy
+msgid "Special"
+msgstr "¯S®íºX¼Ð:"
+
+#: data/browser.xml.h:74
+#, fuzzy
+msgid "Stucco"
+msgstr "°±¤î"
+
+#: data/browser.xml.h:75
+msgid "Tangerine"
+msgstr ""
+
+#: data/browser.xml.h:76
+msgid "Terracotta"
+msgstr ""
+
+#: data/browser.xml.h:77
+msgid "Urgent"
+msgstr ""
+
+#: data/browser.xml.h:78
+msgid "Violet"
+msgstr ""
+
+#: data/browser.xml.h:79
+msgid "Wavy White"
+msgstr ""
+
+#: data/browser.xml.h:80
+#, fuzzy
+msgid "White"
+msgstr "¼g¤J"
+
+#: data/browser.xml.h:81
+msgid "White Ribs"
+msgstr ""
+
+#: data/linksets/apps.xml.h:2
+msgid "Gnumeric"
+msgstr ""
+
+#: data/linksets/apps.xml.h:3
+msgid "Netscape"
+msgstr ""
+
+#: data/linksets/apps.xml.h:4
+msgid "The Gimp"
+msgstr ""
+
+#: data/linksets/desktop.xml.h:1
+#: libnautilus-extensions/nautilus-global-preferences.c:642
+msgid "Desktop"
+msgstr ""
+
+#: data/linksets/desktop.xml.h:2 libnautilus-extensions/nautilus-file.c:4834
+#: libnautilus-extensions/nautilus-trash-directory.c:301
+#: src/file-manager/fm-desktop-icon-view.c:67
+msgid "Trash"
+msgstr ""
+
+#: data/linksets/home.xml.h:1
+#, fuzzy
+msgid "Computer"
+msgstr "µù¸Ñ"
+
+#: data/linksets/home.xml.h:2
+#, fuzzy
+msgid "Home Directory"
+msgstr "¥Ø¿ý"
+
+#: data/linksets/portals.xml.h:1
+#, fuzzy
+msgid "Excite"
+msgstr "°õ¦æ"
+
+#: data/linksets/portals.xml.h:2
+msgid "Portals"
+msgstr ""
+
+#: data/linksets/portals.xml.h:3
+msgid "Yahoo"
+msgstr ""
+
+#: data/linksets/search_engines.xml.h:1
+#, fuzzy
+msgid "Alta Vista"
+msgstr "ÃÀ¤H"
+
+#: data/linksets/search_engines.xml.h:2
+msgid "Google"
+msgstr ""
+
+#: data/linksets/search_engines.xml.h:3
+#: libnautilus-extensions/nautilus-global-preferences.c:1012
+#, fuzzy
+msgid "Search Engines"
+msgstr "·j´M³]©w"
+
+#: data/static_bookmarks.xml.h:1
+msgid "Allaire"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:2
+msgid "Binary Freedom"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:3
+msgid "Borland"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:4
+msgid "CNET Computers.com"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:5
+msgid "CNET Linux Center"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:6
+msgid "CollabNet"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:7
+msgid "Compaq"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:8
+#, fuzzy
+msgid "Conectiva"
+msgstr "¤º®e"
+
+#: data/static_bookmarks.xml.h:9
+#, fuzzy
+msgid "Covalent"
+msgstr "¤º®e"
+
+#: data/static_bookmarks.xml.h:10
+msgid "Debian.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:11
+#, fuzzy
+msgid "Dell"
+msgstr "§R°£"
+
+#: data/static_bookmarks.xml.h:12
+msgid "Eazel"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:13
+msgid "Freshmeat.net"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:14
+msgid "GNOME.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:15
+msgid "GNU.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:17
+#, fuzzy
+msgid "International"
+msgstr "¦w¸Ë¥¢±Ñ"
+
+#: data/static_bookmarks.xml.h:18
+msgid "Linux Documentation Project"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:19
+msgid "Linux One"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:20
+msgid "Linux Online"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:21
+msgid "Linux Resources"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:22
+msgid "Linux Weekly News"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:23
+msgid "LinuxNewbie.org"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:24
+msgid "LinuxOrbit.com"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:25
+msgid "MandrakeSoft"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:26
+#, fuzzy
+msgid "Netraverse"
+msgstr "Never"
+
+#: data/static_bookmarks.xml.h:27
+msgid "News and Media"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:28
+msgid "O'Reilly"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:29
+msgid "OSDN"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:30
+msgid "Open Source Asia"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:31
+msgid "OpenOffice"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:32
+msgid "Penguin Computing"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:33
+#, fuzzy
+msgid "Rackspace"
+msgstr "¨ú¥N"
+
+#: data/static_bookmarks.xml.h:34
+#, fuzzy
+msgid "Red Hat"
+msgstr "­«·s½s¿è"
+
+#: data/static_bookmarks.xml.h:35
+msgid "Red Hat Network"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:36
+msgid "RedFlag Linux"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:37
+msgid "Software"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:38
+msgid "SourceForge"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:39
+msgid "Sun StarOffice"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:40
+msgid "Sun Wah Linux"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:41
+#, fuzzy
+msgid "Web Services"
+msgstr "Services"
+
+#: data/static_bookmarks.xml.h:42
+msgid "ZDNet Linux Hardware Database"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:43
+msgid "ZDNet Linux Resource Center"
+msgstr ""
+
+#: data/static_bookmarks.xml.h:44
+msgid "Zero-Knowledge"
+msgstr ""
+
+#: icons/ardmore/ardmore.xml.h:1
+#, fuzzy
+msgid "Tahoe"
+msgstr "½Öªº"
+
+#: icons/ardmore/ardmore.xml.h:2
+msgid "This theme uses photo-realistic folders."
+msgstr ""
+
+#: icons/arlo/arlo.xml.h:1
+msgid "A Teal variation of the Crux theme."
+msgstr ""
+
+#: icons/arlo/arlo.xml.h:2
+msgid "Crux-Teal"
+msgstr ""
+
+#: icons/crux_eggplant/crux_eggplant.xml.h:1
+msgid "An Eggplant variation of the Crux theme."
+msgstr ""
+
+#: icons/crux_eggplant/crux_eggplant.xml.h:2
+msgid "Crux-Eggplant"
+msgstr ""
+
+#: icons/default.xml.h:1
+#, fuzzy
+msgid "Default"
+msgstr "¨Ï¥Î¹w³]¤Ø¤o"
+
+#: icons/default.xml.h:2
+#, fuzzy
+msgid "This is the default theme for Nautilus."
+msgstr "¬O \"%s\" ªº¹w³]"
+
+#: icons/gnome/gnome.xml.h:2
+msgid "This theme uses the classic GNOME icons."
+msgstr ""
+
+#: icons/villanova/villanova.xml.h:1
+#, fuzzy
+msgid "Sierra"
+msgstr "¤j¤p"
+
+#: icons/villanova/villanova.xml.h:2
+msgid "Uses manila folders and gray-green backgrounds."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-drag.c:489
+#, fuzzy
+msgid "_Move here"
+msgstr "Go There"
+
+#: libnautilus-extensions/nautilus-drag.c:490
+#, fuzzy
+msgid "_Copy here"
+msgstr "½Æ»s¤å¥»"
+
+#: libnautilus-extensions/nautilus-drag.c:491
+#, fuzzy
+msgid "_Link here"
+msgstr "³sµ²¶°¦X"
+
+#. Note to localizers: this font is used for text items in Druid pages
+#: libnautilus-extensions/nautilus-druid-page-eazel.c:381
 #, fuzzy
 msgid "-adobe-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*,*-r-*"
 msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*"
 
+#. Note to localizers: this font is used for page titles in Druid pages
+#: libnautilus-extensions/nautilus-druid-page-eazel.c:560
+#, fuzzy
+msgid "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*,*-r-*"
+msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*"
+
 #. Today, use special word.
 #. * Note to localizers: You can look at man strftime
 #. * for details on the format, but you should only use
@@ -1299,173 +4583,441 @@ msgstr "-adobe-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-extensions/nautilus-file.c:1765
-msgid "today %-I:%M %p"
+#: libnautilus-extensions/nautilus-file.c:2277
+#, fuzzy
+msgid "today at %-I:%M %p"
 msgstr "¤µ¤Ñ  %-I:%M %p"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:1770
-msgid "yesterday %-I:%M %p"
+#: libnautilus-extensions/nautilus-file.c:2282
+#, fuzzy
+msgid "yesterday at %-I:%M %p"
 msgstr "©ú¤Ñ %-I:%M %p"
 
 #. Current week, include day of week.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:1775
-msgid "%A %-m/%-d/%y %-I:%M %p"
+#: libnautilus-extensions/nautilus-file.c:2287
+#, fuzzy
+msgid "%A %-m/%-d/%y at %-I:%M %p"
 msgstr "%A %-m/%-d/%y %-I:%M %p"
 
 #. Other dates.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-extensions/nautilus-file.c:1780
-msgid "%-m/%-d/%y %-I:%M %p"
+#: libnautilus-extensions/nautilus-file.c:2292
+#, fuzzy
+msgid "%-m/%-d/%y at %-I:%M %p"
 msgstr "%-m/%-d/%y %-I:%M %p"
 
-#: libnautilus-extensions/nautilus-file.c:2783
+#: libnautilus-extensions/nautilus-file.c:3423
 msgid "0 items"
 msgstr "0 ­Ó¶µ¥Ø"
 
-#: libnautilus-extensions/nautilus-file.c:2783
+#: libnautilus-extensions/nautilus-file.c:3423
 #, fuzzy
 msgid "0 folders"
 msgstr "0 ­ÓÀÉ®×"
 
-#: libnautilus-extensions/nautilus-file.c:2784
+#: libnautilus-extensions/nautilus-file.c:3424
 msgid "0 files"
 msgstr "0 ­ÓÀÉ®×"
 
-#: libnautilus-extensions/nautilus-file.c:2788
+#: libnautilus-extensions/nautilus-file.c:3428
 msgid "1 item"
 msgstr "1 ­Ó¶µ¥Ø"
 
-#: libnautilus-extensions/nautilus-file.c:2788
+#: libnautilus-extensions/nautilus-file.c:3428
 #, fuzzy
 msgid "1 folder"
 msgstr "1 ÀÉ®×"
 
-#: libnautilus-extensions/nautilus-file.c:2789
+#: libnautilus-extensions/nautilus-file.c:3429
 msgid "1 file"
 msgstr "1 ÀÉ®×"
 
-#: libnautilus-extensions/nautilus-file.c:2792
+#: libnautilus-extensions/nautilus-file.c:3432
 #, c-format
 msgid "%u items"
 msgstr "%u ­Ó¶µ¥Ø"
 
-#: libnautilus-extensions/nautilus-file.c:2792
+#: libnautilus-extensions/nautilus-file.c:3432
 #, fuzzy, c-format
 msgid "%u folders"
 msgstr "%u ­ÓÀÉ®×"
 
-#: libnautilus-extensions/nautilus-file.c:2793
+#: libnautilus-extensions/nautilus-file.c:3433
 #, c-format
 msgid "%u files"
 msgstr "%u ­ÓÀÉ®×"
 
-#: libnautilus-extensions/nautilus-file.c:3122
+#. This means no contents at all were readable
+#: libnautilus-extensions/nautilus-file.c:3740
+#: libnautilus-extensions/nautilus-file.c:3755
+#, fuzzy
+msgid "? items"
+msgstr "0 ­Ó¶µ¥Ø"
+
+#. This means no contents at all were readable
+#: libnautilus-extensions/nautilus-file.c:3746
+#, fuzzy
+msgid "? bytes"
+msgstr "¤wŪ¨ú %d bytes"
+
+#: libnautilus-extensions/nautilus-file.c:3759
 msgid "unknown type"
 msgstr "¥¼ª¾®æ¦¡"
 
-#: libnautilus-extensions/nautilus-file.c:3124
+#: libnautilus-extensions/nautilus-file.c:3761
 msgid "unknown MIME type"
 msgstr "¥¼ª¾ MIME ®æ¦¡"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-extensions/nautilus-file.c:3129
+#: libnautilus-extensions/nautilus-file.c:3766
 msgid "unknown"
 msgstr "¥¼ª¾"
 
+#: libnautilus-extensions/nautilus-file.c:3802
+msgid "program"
+msgstr "µ{¦¡"
+
+#: libnautilus-extensions/nautilus-file.c:3814
+msgid ""
+"Can't find description even for \"x-directory/normal\". This probably means "
+"that your gnome-vfs.keys file is in the wrong place or isn't being found for "
+"some other reason."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3818
+#, c-format
+msgid ""
+"No description found for mime type \"%s\" (file is \"%s\"), tell "
+"aaron@eazel.com"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file.c:3832
+#, fuzzy
+msgid "link"
+msgstr "¤w³sµ²"
+
 #. Note to localizers: convert file type string for file
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:519
-#: libnautilus-extensions/nautilus-file.c:3145
+#: libnautilus-extensions/nautilus-file-operations.c:1187
+#: libnautilus-extensions/nautilus-file.c:3838
 #, fuzzy, c-format
 msgid "link to %s"
 msgstr "³sµ²¶°¦X"
 
-#: libnautilus-extensions/nautilus-file.c:3168
+#: libnautilus-extensions/nautilus-file.c:3852
 msgid "link (broken)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file.c:3177
-msgid "program"
-msgstr "µ{¦¡"
-
-#: libnautilus-extensions/nautilus-file-operations.c:202
+#. "From" dialog label, source path gets placed next to it in the dialog
+#: libnautilus-extensions/nautilus-file-operations.c:425
 msgid "From:"
 msgstr "±q:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:216
+#. "To" dialog label, source path gets placed next to it in the dialog
+#: libnautilus-extensions/nautilus-file-operations.c:440
 msgid "To:"
 msgstr "¨ì:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:366
-#: libnautilus-extensions/nautilus-file-operations.c:373
+#: libnautilus-extensions/nautilus-file-operations.c:622
+#, c-format
+msgid ""
+"Error while moving.\n"
+"\n"
+"\"%s\" cannot be moved because it is on a read-only disk."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:633
+#, c-format
+msgid ""
+"Error while deleting.\n"
+"\n"
+"\"%s\" cannot be deleted because you do not have permissions to modify its "
+"parent folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:639
+#, c-format
+msgid ""
+"Error while deleting.\n"
+"\n"
+"\"%s\" cannot be deleted because it is on a read-only disk."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:670
+#, c-format
+msgid ""
+"Error while moving.\n"
+"\n"
+"\"%s\" cannot be moved because you do not have permissions to change it or "
+"its parent folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:677
+#, c-format
+msgid ""
+"Error while moving.\n"
+"\n"
+"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"change it or its parent folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:701
+#, c-format
+msgid ""
+"Error while copying.\n"
+"\n"
+"\"%s\" cannot be copied because you do not have permissions to read it."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:723
+#, c-format
+msgid ""
+"Error while copying to \"%s\".\n"
+"\n"
+"There is not enough space on the destination."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:728
+#, c-format
+msgid ""
+"Error while moving to \"%s\".\n"
+"\n"
+"There is not enough space on the destination."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:732
+#, c-format
+msgid ""
+"Error while creating link in \"%s\".\n"
+"\n"
+"There is not enough space on the destination."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:744
+#, c-format
+msgid ""
+"Error while copying to \"%s\".\n"
+"\n"
+"You do not have permissions to write to this folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:748
 #, fuzzy, c-format
 msgid ""
-"Error while %s \"%s\".\n"
-"The destination is read-only. Would you like to continue?"
+"Error while copying to \"%s\".\n"
+"\n"
+"The destination disk is read-only."
 msgstr ""
 "·í %s ®Éµo¥Í¿ù»~ %s \n"
 "½T©w­nÄ~Äò¶Ü?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:384
-#: libnautilus-extensions/nautilus-file-operations.c:411
-#, fuzzy
-msgid "Error while Copying"
-msgstr "½Æ»s¿ù»~"
+#: libnautilus-extensions/nautilus-file-operations.c:755
+#, c-format
+msgid ""
+"Error while moving items to \"%s\".\n"
+"\n"
+"You do not have permissions to write to this folder."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:385
-#: libnautilus-extensions/nautilus-file-operations.c:412
-#: libnautilus-extensions/nautilus-file-operations.c:463
-#: libnautilus-extensions/nautilus-file-operations.c:477
-msgid "Skip"
-msgstr "¸õ¹L"
+#: libnautilus-extensions/nautilus-file-operations.c:759
+#, fuzzy, c-format
+msgid ""
+"Error while moving items to \"%s\".\n"
+"\n"
+"The destination disk is read-only."
+msgstr ""
+"·í %s ®Éµo¥Í¿ù»~ %s \n"
+"½T©w­nÄ~Äò¶Ü?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:766
+#, c-format
+msgid ""
+"Error while creating links in \"%s\".\n"
+"\n"
+"You do not have permissions to write to this folder."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:770
+#, fuzzy, c-format
+msgid ""
+"Error while creating links in \"%s\".\n"
+"\n"
+"The destination disk is read-only."
+msgstr ""
+"·í %s ®Éµo¥Í¿ù»~ %s \n"
+"½T©w­nÄ~Äò¶Ü?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:799
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while copying \"%s\".\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"·í %s ®Éµo¥Í¿ù»~ %s \n"
+"½T©w­nÄ~Äò¶Ü?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:401
+#: libnautilus-extensions/nautilus-file-operations.c:803
 #, fuzzy, c-format
 msgid ""
-"Error \"%s\" while %s \"%s\".\n"
+"Error \"%s\" while moving \"%s\".\n"
+"\n"
 "Would you like to continue?"
 msgstr ""
 "·í %s ®Éµo¥Í¿ù»~ %s \n"
 "½T©w­nÄ~Äò¶Ü?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:412
+#: libnautilus-extensions/nautilus-file-operations.c:807
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while creating a link to \"%s\".\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"·í %s ®Éµo¥Í¿ù»~ %s \n"
+"½T©w­nÄ~Äò¶Ü?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:813
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while deleting \"%s\".\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"·í %s ®Éµo¥Í¿ù»~ %s \n"
+"½T©w­nÄ~Äò¶Ü?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:828
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while copying.\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"¿ù»~ \"%s\" ½Æ»sÀÉ®× %s.\n"
+"½T©w­nÄ~Äò¶Ü?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:832
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while moving.\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"·í %s ®Éµo¥Í¿ù»~ %s \n"
+"½T©w­nÄ~Äò¶Ü?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:836
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while linking.\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"·í %s ®Éµo¥Í¿ù»~ %s \n"
+"½T©w­nÄ~Äò¶Ü?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:842
+#, fuzzy, c-format
+msgid ""
+"Error \"%s\" while deleting.\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"·í %s ®Éµo¥Í¿ù»~ %s \n"
+"½T©w­nÄ~Äò¶Ü?"
+
+#: libnautilus-extensions/nautilus-file-operations.c:958
+#, fuzzy
+msgid "Error while copying."
+msgstr "½Æ»s¿ù»~"
+
+#: libnautilus-extensions/nautilus-file-operations.c:961
+#, fuzzy
+msgid "Error while moving."
+msgstr "½Æ»s¿ù»~"
+
+#: libnautilus-extensions/nautilus-file-operations.c:964
+#, fuzzy
+msgid "Error while linking."
+msgstr "½Æ»s¿ù»~"
+
+#: libnautilus-extensions/nautilus-file-operations.c:969
+#, fuzzy
+msgid "Error while deleting."
+msgstr "½Æ»s¿ù»~"
+
+#: libnautilus-extensions/nautilus-file-operations.c:994
+#: libnautilus-extensions/nautilus-file-operations.c:1013
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
+msgid "Skip"
+msgstr "¸õ¹L"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1013
 msgid "Retry"
 msgstr "­«¸Õ"
 
-#: libnautilus-extensions/nautilus-file-operations.c:451
+#: libnautilus-extensions/nautilus-file-operations.c:1088
 #, c-format
 msgid ""
-"File %s already exists.\n"
+"\"%s\" could not be moved to the new location, because its name is already "
+"used for a special item that cannot be removed or replaced.\n"
+"\n"
+"If you still want to move \"%s\", rename it and try again."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1094
+#, c-format
+msgid ""
+"\"%s\" could not be copied to the new location, because its name is already "
+"used for a special item that cannot be removed or replaced.\n"
+"\n"
+"If you still want to copy \"%s\", rename it and try again."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:1102
+#, fuzzy
+msgid "Unable to replace file."
+msgstr "³B²z¤w¿ï¾ÜªºÀÉ®×"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1112
+#, fuzzy, c-format
+msgid ""
+"File \"%s\" already exists.\n"
+"\n"
 "Would you like to replace it?"
 msgstr ""
 "ÀÉ®× %s ¤w¸g¦s¦b \n"
 "§A­n¥Î²{¦b³o­ÓÀɮרӨú¥N¶Ü?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:462
-#: libnautilus-extensions/nautilus-file-operations.c:476
-msgid "Conflict while Copying"
-msgstr ""
+#: libnautilus-extensions/nautilus-file-operations.c:1123
+#: libnautilus-extensions/nautilus-file-operations.c:1137
+#, fuzzy
+msgid "Conflict while copying"
+msgstr "½Æ»s¿ù»~"
 
-#: libnautilus-extensions/nautilus-file-operations.c:463
-#: libnautilus-extensions/nautilus-file-operations.c:477
+#: libnautilus-extensions/nautilus-file-operations.c:1124
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace"
 msgstr "¨ú¥N"
 
-#: libnautilus-extensions/nautilus-file-operations.c:477
+#: libnautilus-extensions/nautilus-file-operations.c:1138
 msgid "Replace All"
 msgstr "¥þ³¡¨ú¥N"
 
-#: libnautilus-extensions/nautilus-file-operations.c:522
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1191
 #, c-format
 msgid "another link to %s"
 msgstr "¥t¤@­Ó¨ì %s ªº³sµ²"
@@ -1474,1170 +5026,1595 @@ msgstr "¥t¤@­Ó¨ì %s ªº³sµ²"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-extensions/nautilus-file-operations.c:538
+#: libnautilus-extensions/nautilus-file-operations.c:1207
 #, c-format
 msgid "%dst link to %s"
 msgstr "²Ä %d ­Ó¨ì %s ªº³sµ²"
 
-#: libnautilus-extensions/nautilus-file-operations.c:541
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1211
 #, c-format
 msgid "%dnd link to %s"
 msgstr "²Ä %d ­Ó¨ì %s ªº³sµ²"
 
-#: libnautilus-extensions/nautilus-file-operations.c:544
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1215
 #, c-format
 msgid "%drd link to %s"
 msgstr "²Ä %d ­Ó¨ì %s ªº³sµ²"
 
-#: libnautilus-extensions/nautilus-file-operations.c:547
+#. appended to new link file
+#: libnautilus-extensions/nautilus-file-operations.c:1219
 #, c-format
 msgid "%dth link to %s"
 msgstr "²Ä %d ­Ó¨ì %s ªº³sµ²"
 
+#. Localizers:
+#. * Feel free to leave out the st, nd, rd and th suffix or
+#. * make some or all of them match.
+#.
+#. localizers: tag used to detect the first copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1239
+#: libnautilus-extensions/nautilus-file-operations.c:2258
+#, fuzzy
+msgid " (copy)"
+msgstr "%s (½Æ»s)"
+
+#. localizers: tag used to detect the second copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1241
+#: libnautilus-extensions/nautilus-file-operations.c:2258
+#, fuzzy
+msgid " (another copy)"
+msgstr "%s (¥t¥~½Æ»s)"
+
+#. localizers: tag used to detect the x1st copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1243
+#, fuzzy
+msgid "st copy)"
+msgstr "%s (½Æ»s)"
+
+#. localizers: tag used to detect the x2nd copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1245
+#, fuzzy
+msgid "nd copy)"
+msgstr "%s (½Æ»s)"
+
+#. localizers: tag used to detect the x3rd copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1247
+#, fuzzy
+msgid "rd copy)"
+msgstr "%s (½Æ»s)"
+
+#. localizers: tag used to detect the xxth copy of a file
+#: libnautilus-extensions/nautilus-file-operations.c:1249
+#, fuzzy
+msgid "th copy)"
+msgstr "%s (½Æ»s)"
+
+#. localizers: appended to first file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1259
+#, fuzzy, c-format
+msgid "%s (copy)%s"
+msgstr "%s (½Æ»s)"
+
+#. localizers: appended to second file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1261
+#, fuzzy, c-format
+msgid "%s (another copy)%s"
+msgstr "%s (¥t¥~½Æ»s)"
+
+#. localizers: appended to x1st file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1263
+#, fuzzy, c-format
+msgid "%s (%dst copy)%s"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
+
+#. localizers: appended to x2nd file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1265
+#, fuzzy, c-format
+msgid "%s (%dnd copy)%s"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
+
+#. localizers: appended to x3rd file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1267
+#, fuzzy, c-format
+msgid "%s (%drd copy)%s"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
+
+#. localizers: appended to xxth file copy
+#: libnautilus-extensions/nautilus-file-operations.c:1269
+#, fuzzy, c-format
+msgid "%s (%dth copy)%s"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
+
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:648
+#: libnautilus-extensions/nautilus-file-operations.c:1353
 msgid " ("
 msgstr ""
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-extensions/nautilus-file-operations.c:656
+#: libnautilus-extensions/nautilus-file-operations.c:1361
 #, c-format
 msgid " (%d"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:806
-#: libnautilus-extensions/nautilus-file-operations.c:1249
+#: libnautilus-extensions/nautilus-file-operations.c:1518
+#: libnautilus-extensions/nautilus-file-operations.c:2088
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "¥¼ª¾ GnomeVFSXferProgressStatus %d "
 
-#: libnautilus-extensions/nautilus-file-operations.c:1094
-msgid "Moving files"
-msgstr "²¾°ÊÀɮפ¤"
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1822
+msgid "Moving files to the Trash"
+msgstr "¥á¨ì©U§£±í"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1095
-msgid "moved"
-msgstr "¤w²¾°Ê"
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1824
+#, fuzzy
+msgid "Files thrown out:"
+msgstr "²M°£©U§£±í"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1096
-#: libnautilus-extensions/nautilus-file-operations.c:1375
+#. localizers: label prepended to the name of the current file moved
+#: libnautilus-extensions/nautilus-file-operations.c:1826
+#: libnautilus-extensions/nautilus-file-operations.c:1841
 msgid "Moving"
 msgstr "²¾°Ê¤¤"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1097
+#: libnautilus-extensions/nautilus-file-operations.c:1827
+msgid "Preparing to Move to Trash..."
+msgstr "¥´¶}©U§£±í»\\¤¤..."
+
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1837
+msgid "Moving files"
+msgstr "²¾°ÊÀɮפ¤"
+
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1839
+#, fuzzy
+msgid "Files moved:"
+msgstr "ÀɮשҦ³ªÌ:"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1842
 msgid "Preparing To Move..."
 msgstr "·Ç³Æ²¾°Ê¤¤..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1098
+#: libnautilus-extensions/nautilus-file-operations.c:1843
 msgid "Finishing Move..."
 msgstr "§¹¦¨²¾°Ê¤¤..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1107
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1855
 #, fuzzy
 msgid "Creating links to files"
 msgstr "·Ç³Æ§R°£ÀÉ®×..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1108
-msgid "linked"
-msgstr "¤w³sµ²"
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1857
+#, fuzzy
+msgid "Files linked:"
+msgstr "ÀɮשҦ³ªÌ:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1109
+#. localizers: label prepended to the name of the current file linked
+#: libnautilus-extensions/nautilus-file-operations.c:1859
 #, fuzzy
 msgid "Linking"
 msgstr "³sµ²¤¤"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1110
+#: libnautilus-extensions/nautilus-file-operations.c:1860
 #, fuzzy
 msgid "Preparing to Create Links..."
 msgstr "·Ç³Æ²£¥Í³sµ²..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1111
+#: libnautilus-extensions/nautilus-file-operations.c:1861
 #, fuzzy
 msgid "Finishing Creating Links..."
 msgstr "§¹¦¨³sµ²¤¤..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1117
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:1868
 msgid "Copying files"
 msgstr "½Æ»sÀɮפ¤"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1118
-msgid "copied"
-msgstr "¤w½Æ»s"
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:1870
+#, fuzzy
+msgid "Files copied:"
+msgstr "Àɮ׸s²Õ:"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1119
+#. localizers: label prepended to the name of the current file copied
+#: libnautilus-extensions/nautilus-file-operations.c:1872
 msgid "Copying"
 msgstr "½Æ»s"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1120
+#: libnautilus-extensions/nautilus-file-operations.c:1873
 msgid "Preparing To Copy..."
 msgstr "·Ç³Æ½Æ»s¤¤..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1138
+#: libnautilus-extensions/nautilus-file-operations.c:1891
 msgid "You cannot copy items into the Trash."
 msgstr "§A¤£¯à§â³o­ÓªF¦è½Æ»s¨ì©U§£±í"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1139
+#: libnautilus-extensions/nautilus-file-operations.c:1892
 #, fuzzy
 msgid "Can't Copy to Trash"
 msgstr "¥á¨ì©U§£±í"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1154
-#: libnautilus-extensions/nautilus-file-operations.c:1333
+#: libnautilus-extensions/nautilus-file-operations.c:1919
 msgid "The Trash must remain on the desktop."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1155
+#: libnautilus-extensions/nautilus-file-operations.c:1920
+#, fuzzy
+msgid "You cannot move this trash folder."
+msgstr "§A¤£¯à²¾°Ê©U§£±í"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1922
 msgid "You cannot copy the Trash."
 msgstr "§A¤£¯à½Æ»s©U§£±í"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1157
-#: libnautilus-extensions/nautilus-file-operations.c:1334
+#: libnautilus-extensions/nautilus-file-operations.c:1923
+#, fuzzy
+msgid "You cannot copy this trash folder."
+msgstr "§A¤£¯à½Æ»s©U§£±í"
+
+#: libnautilus-extensions/nautilus-file-operations.c:1925
 msgid "Can't Change Trash Location"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1158
+#: libnautilus-extensions/nautilus-file-operations.c:1926
 #, fuzzy
 msgid "Can't Copy Trash"
 msgstr "¥á¨ì©U§£±í"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1175
+#: libnautilus-extensions/nautilus-file-operations.c:1949
 #, fuzzy
 msgid "You cannot move a folder into itself."
 msgstr "±z¤£¯à±N¬Y­Ó¶µ¥Ø²¾°Ê¨ì¨ä¦Û¤v¥»¨­."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1176
+#: libnautilus-extensions/nautilus-file-operations.c:1950
 #, fuzzy
 msgid "You cannot copy a folder into itself."
 msgstr "±z¤£¯à²¾°Ê¬Y­Ó¶µ¥Ø¨ì¨ä¦Û¤v¥»¨­"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1177
+#: libnautilus-extensions/nautilus-file-operations.c:1952
 #, fuzzy
 msgid "Can't Move Into Self"
 msgstr "¥á¨ì©U§£±í"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1272
+#: libnautilus-extensions/nautilus-file-operations.c:1953
 #, fuzzy
-msgid "untitled folder"
-msgstr "(¥¼©R¦W)"
-
-#: libnautilus-extensions/nautilus-file-operations.c:1341
-#, c-format
-msgid "You cannot throw \"%s\" into the Trash."
-msgstr "§A¤£¯à§â \"%s\" ¥á¨ì©U§£±í "
+msgid "Can't Copy Into Self"
+msgstr "¥á¨ì©U§£±í"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1345
+#: libnautilus-extensions/nautilus-file-operations.c:1965
 #, fuzzy
-msgid "Error Moving to Trash"
-msgstr "½Æ»s¨ì©U§£±í®Éµo¥Í¿ù»~"
+msgid "You cannot copy a file over itself."
+msgstr "±z¤£¯à²¾°Ê¬Y­Ó¶µ¥Ø¨ì¨ä¦Û¤v¥»¨­"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1373
-msgid "Moving files to the Trash"
+#: libnautilus-extensions/nautilus-file-operations.c:1966
+#, fuzzy
+msgid "Can't Copy Over Self"
 msgstr "¥á¨ì©U§£±í"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1374
-msgid "thrown out"
-msgstr "²M°£©U§£±í"
+#: libnautilus-extensions/nautilus-file-operations.c:2017
+msgid ""
+"Error creating new folder.\n"
+"\n"
+"You do not have permissions to write to the destination."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1376
-msgid "Preparing to Move to Trash..."
-msgstr "¥´¶}©U§£±í»\\¤¤..."
+#: libnautilus-extensions/nautilus-file-operations.c:2020
+msgid ""
+"Error creating new folder.\n"
+"\n"
+"There is no space on the destination."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2023
+#, c-format
+msgid "Error \"%s\" creating new folder."
+msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1417
+#: libnautilus-extensions/nautilus-file-operations.c:2027
+msgid "Error creating new folder"
+msgstr ""
+
+#. localizers: the initial name of a new folder
+#: libnautilus-extensions/nautilus-file-operations.c:2114
+#, fuzzy
+msgid "untitled folder"
+msgstr "(¥¼©R¦W)"
+
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:2147
 msgid "Deleting files"
 msgstr "§R°£Àɮפ¤"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1418
-#: libnautilus-extensions/nautilus-file-operations.c:1467
-msgid "deleted"
+#. localizers: label prepended to the progress count
+#: libnautilus-extensions/nautilus-file-operations.c:2149
+#: libnautilus-extensions/nautilus-file-operations.c:2184
+#, fuzzy
+msgid "Files deleted:"
 msgstr "¤w§R°£"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1419
-#: libnautilus-extensions/nautilus-file-operations.c:1468
+#. localizers: label prepended to the name of the current file deleted
+#: libnautilus-extensions/nautilus-file-operations.c:2151
+#: libnautilus-extensions/nautilus-file-operations.c:2186
 msgid "Deleting"
 msgstr "§R°£¤¤"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1420
+#: libnautilus-extensions/nautilus-file-operations.c:2152
 msgid "Preparing to Delete files..."
 msgstr "·Ç³Æ§R°£ÀÉ®×..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1466
+#. localizers: progress dialog title
+#: libnautilus-extensions/nautilus-file-operations.c:2182
 msgid "Emptying the Trash"
 msgstr "­Ë©U§£"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1469
+#: libnautilus-extensions/nautilus-file-operations.c:2187
 msgid "Preparing to Empty the Trash..."
 msgstr "¥´¥]¤¤..."
 
-#: libnautilus-extensions/nautilus-file-operations.c:1503
+#: libnautilus-extensions/nautilus-file-operations.c:2218
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently delete all of the items in the trash?"
+"Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr "§A½T©w­n§â \"%s\" ¥Ã¤[§R°£¶Ü?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1505
+#: libnautilus-extensions/nautilus-file-operations.c:2220
 msgid "Delete Trash Contents?"
 msgstr "§R°£©U§£±í¤ºªº©Ò¦³ÀÉ®×?"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1506
+#: libnautilus-extensions/nautilus-file-operations.c:2221
 msgid "Empty"
 msgstr "ªÅ"
 
-#. test the next duplicate name generator
-#: libnautilus-extensions/nautilus-file-operations.c:1560
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+msgid "foo"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2259
+#: libnautilus-extensions/nautilus-file-operations.c:2269
 #, fuzzy
-msgid " (copy)"
+msgid "foo (copy)"
 msgstr "%s (½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1560
+#: libnautilus-extensions/nautilus-file-operations.c:2260
+msgid ".bashrc"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-file-operations.c:2260
 #, fuzzy
-msgid " (another copy)"
-msgstr "%s (¥t¥~½Æ»s)"
+msgid ".bashrc (copy)"
+msgstr "%s (½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1561
-msgid "foo"
-msgstr ""
+#: libnautilus-extensions/nautilus-file-operations.c:2261
+#, fuzzy
+msgid ".foo.txt"
+msgstr "%s (½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1561
-#: libnautilus-extensions/nautilus-file-operations.c:1569
+#: libnautilus-extensions/nautilus-file-operations.c:2261
 #, fuzzy
-msgid "foo (copy)"
+msgid ".foo (copy).txt"
 msgstr "%s (½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1562
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 msgid "foo foo"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1562
+#: libnautilus-extensions/nautilus-file-operations.c:2262
 #, fuzzy
 msgid "foo foo (copy)"
 msgstr "%s (½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1563
+#: libnautilus-extensions/nautilus-file-operations.c:2263
 msgid "foo.txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1563
-#: libnautilus-extensions/nautilus-file-operations.c:1570
+#: libnautilus-extensions/nautilus-file-operations.c:2263
+#: libnautilus-extensions/nautilus-file-operations.c:2270
 #, fuzzy
 msgid "foo (copy).txt"
 msgstr "%s (½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1564
+#: libnautilus-extensions/nautilus-file-operations.c:2264
 msgid "foo foo.txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1564
-#: libnautilus-extensions/nautilus-file-operations.c:1584
+#: libnautilus-extensions/nautilus-file-operations.c:2264
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1565
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo.txt txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1565
+#: libnautilus-extensions/nautilus-file-operations.c:2265
 msgid "foo foo (copy).txt txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1566
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo...txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1566
+#: libnautilus-extensions/nautilus-file-operations.c:2266
 msgid "foo.. (copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1567
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 msgid "foo..."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1567
+#: libnautilus-extensions/nautilus-file-operations.c:2267
 #, fuzzy
 msgid "foo... (copy)"
 msgstr "%s (½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1568
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 #, fuzzy
 msgid "foo. (copy)"
 msgstr "%s (½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1568
+#: libnautilus-extensions/nautilus-file-operations.c:2268
 #, fuzzy
 msgid "foo. (another copy)"
 msgstr "%s (¥t¥~½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1569
-#: libnautilus-extensions/nautilus-file-operations.c:1571
+#: libnautilus-extensions/nautilus-file-operations.c:2269
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 #, fuzzy
 msgid "foo (another copy)"
 msgstr "%s (¥t¥~½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1570
-#: libnautilus-extensions/nautilus-file-operations.c:1572
+#: libnautilus-extensions/nautilus-file-operations.c:2270
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 #, fuzzy
 msgid "foo (another copy).txt"
 msgstr "%s (¥t¥~½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1571
+#: libnautilus-extensions/nautilus-file-operations.c:2271
 #, fuzzy
 msgid "foo (3rd copy)"
 msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1572
+#: libnautilus-extensions/nautilus-file-operations.c:2272
 #, fuzzy
 msgid "foo (3rd copy).txt"
 msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1573
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 #, fuzzy
 msgid "foo foo (another copy).txt"
 msgstr "%s (¥t¥~½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1573
+#: libnautilus-extensions/nautilus-file-operations.c:2273
 msgid "foo foo (3rd copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1574
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (13th copy)"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2274
+#, fuzzy
+msgid "foo (14th copy)"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (13th copy).txt"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2275
+#, fuzzy
+msgid "foo (14th copy).txt"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
+
+#: libnautilus-extensions/nautilus-file-operations.c:2276
 #, fuzzy
 msgid "foo (21st copy)"
 msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1574
-#: libnautilus-extensions/nautilus-file-operations.c:1576
+#: libnautilus-extensions/nautilus-file-operations.c:2276
+#: libnautilus-extensions/nautilus-file-operations.c:2278
 #, fuzzy
 msgid "foo (22nd copy)"
 msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1575
+#: libnautilus-extensions/nautilus-file-operations.c:2277
 #, fuzzy
 msgid "foo (21st copy).txt"
 msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1575
-#: libnautilus-extensions/nautilus-file-operations.c:1577
+#: libnautilus-extensions/nautilus-file-operations.c:2277
+#: libnautilus-extensions/nautilus-file-operations.c:2279
 #, fuzzy
 msgid "foo (22nd copy).txt"
 msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1576
-#: libnautilus-extensions/nautilus-file-operations.c:1578
+#: libnautilus-extensions/nautilus-file-operations.c:2278
+#: libnautilus-extensions/nautilus-file-operations.c:2280
 #, fuzzy
 msgid "foo (23rd copy)"
 msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1577
-#: libnautilus-extensions/nautilus-file-operations.c:1579
+#: libnautilus-extensions/nautilus-file-operations.c:2279
+#: libnautilus-extensions/nautilus-file-operations.c:2281
 #, fuzzy
 msgid "foo (23rd copy).txt"
 msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1578
-#: libnautilus-extensions/nautilus-file-operations.c:1580
+#: libnautilus-extensions/nautilus-file-operations.c:2280
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 #, fuzzy
 msgid "foo (24th copy)"
 msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1579
-#: libnautilus-extensions/nautilus-file-operations.c:1581
+#: libnautilus-extensions/nautilus-file-operations.c:2281
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 #, fuzzy
 msgid "foo (24th copy).txt"
 msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1580
+#: libnautilus-extensions/nautilus-file-operations.c:2282
 #, fuzzy
 msgid "foo (25th copy)"
 msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1581
+#: libnautilus-extensions/nautilus-file-operations.c:2283
 #, fuzzy
 msgid "foo (25th copy).txt"
 msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1582
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 #, fuzzy
 msgid "foo foo (24th copy)"
 msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1582
+#: libnautilus-extensions/nautilus-file-operations.c:2284
 #, fuzzy
 msgid "foo foo (25th copy)"
 msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-file-operations.c:1583
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (24th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1583
+#: libnautilus-extensions/nautilus-file-operations.c:2285
 msgid "foo foo (25th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-file-operations.c:1584
+#: libnautilus-extensions/nautilus-file-operations.c:2286
 msgid "foo foo (100000000000000th copy).txt"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-font-picker.c:128
+#. FIXME bugzilla.eazel.com 7701: These are wrong.
+#: libnautilus-extensions/nautilus-file-operations.c:2289
 #, fuzzy
-msgid "Font"
-msgstr "¦r«¬"
+msgid "foo (10th copy)"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:112
+#: libnautilus-extensions/nautilus-file-operations.c:2289
 #, fuzzy
-msgid "Folder Views"
-msgstr "²M°£»²§U¤u¨ã"
+msgid "foo (11st copy)"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:113
+#: libnautilus-extensions/nautilus-file-operations.c:2290
 #, fuzzy
-msgid "Folder Views Settings"
-msgstr "¥Ø¿ýÂsÄý³]©w"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:115
-msgid "Window Behavior"
-msgstr "µøµ¡¦æ¬°"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:122
-msgid "Click Behavior"
-msgstr "·Æ¹«¨Ï¥Î¼Ò¦¡"
+msgid "foo (10th copy).txt"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:129
+#: libnautilus-extensions/nautilus-file-operations.c:2290
 #, fuzzy
-msgid "Trash Behavior"
-msgstr "·Æ¹«¨Ï¥Î¼Ò¦¡"
+msgid "foo (11st copy).txt"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:136
+#: libnautilus-extensions/nautilus-file-operations.c:2291
 #, fuzzy
-msgid "Display"
-msgstr "Åã¥Ü"
+msgid "foo (11th copy)"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:157
+#: libnautilus-extensions/nautilus-file-operations.c:2291
 #, fuzzy
-msgid "Sidebar Panels"
-msgstr "°¼¦C"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:158
-msgid "Sidebar Panels Description"
-msgstr "»²§U¤u¨ã»¡©ú"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:161
-msgid "Choose which panels should appear in the sidebar"
-msgstr "¿ï¾Ü»²§U¤u¨ã¤º®e"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:198
-msgid "Appearance"
-msgstr "Åã¥Ü¼Ò¦¡"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:199
-msgid "Appearance Settings"
-msgstr "Åã¥Ü¼Ò¦¡³]©w"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:201
-msgid "Smoother Graphics"
-msgstr "¶ê¼í¼Ò¦¡"
+msgid "foo (12nd copy)"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:208
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 #, fuzzy
-msgid "Fonts"
-msgstr "¦r«¬"
+msgid "foo (11th copy).txt"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:214
+#: libnautilus-extensions/nautilus-file-operations.c:2292
 #, fuzzy
-msgid "Views"
-msgstr "ÂsÄý"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:238
-msgid "Speed Tradeoffs"
-msgstr "§Ö³tÂsÄý"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:239
-msgid "Speed Tradeoffs Settings"
-msgstr "§Ö³tÂsÄý³]©w"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:241
-msgid "Show Text in Icons"
-msgstr "¦b¹Ï¥Ü¤ºÅã¥Ü¤å¦r"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:248
-msgid "Show Thumbnails for Image Files"
-msgstr "¹wÄý¹Ï¹³ÀÉ®×"
+msgid "foo (12nd copy).txt"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
-#: libnautilus-extensions/nautilus-global-preferences.c:256
+#: libnautilus-extensions/nautilus-file-operations.c:2293
 #, fuzzy
-msgid "Make Folder Appearance Details Public"
-msgstr "±N¥Ø¿ý²Ó¸`¤½¶}Åã¥Ü"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:268
-msgid "Search"
-msgstr "·j´M"
+msgid "foo (12th copy)"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:269
+#: libnautilus-extensions/nautilus-file-operations.c:2293
 #, fuzzy
-msgid "Search Settings"
-msgstr "·j´M³]©w"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:271
-msgid "Search Complexity Options"
-msgstr "·j´M½Æ¦X±ø¥ó"
-
-#: libnautilus-extensions/nautilus-global-preferences.c:277
-msgid "Search Tradeoffs"
-msgstr "§Ö³t·j´M"
+msgid "foo (13rd copy)"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:285
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 #, fuzzy
-msgid "Search Locations"
-msgstr "·j´M¦ì¸m"
+msgid "foo (12th copy).txt"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:295
+#: libnautilus-extensions/nautilus-file-operations.c:2294
 #, fuzzy
-msgid "Navigation"
-msgstr "¾É´M"
+msgid "foo (13rd copy).txt"
+msgstr "%s (²Ä %d ­Ó½Æ»s)"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:296
-#, fuzzy
-msgid "Navigation Settings"
-msgstr "¾É´M³]©w..."
+#: libnautilus-extensions/nautilus-file-operations-progress.c:362
+#, fuzzy, c-format
+msgid "%ld of %ld"
+msgstr "¤wŪ¨ú %d%%%% of %ld"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:298
+#: libnautilus-extensions/nautilus-gconf-extensions.c:90
 #, fuzzy
-msgid "Home Location"
-msgstr "§A®a¦í§}"
+msgid "GConf Error"
+msgstr "³]©wÀÉ®×"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:305
+#. Constants
+#: libnautilus-extensions/nautilus-global-preferences.c:50
 #, fuzzy
-msgid "Proxy Settings"
-msgstr "·j´M³]©w"
+msgid "Nautilus Preferences"
+msgstr "Nautilus: ªì©l¤Æ°Ñ¼Æ³]©w"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:665
+#: libnautilus-extensions/nautilus-global-preferences.c:471
 #, fuzzy
 msgid "always"
 msgstr "always"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:666
+#: libnautilus-extensions/nautilus-global-preferences.c:472
 #, fuzzy
 msgid "Always"
 msgstr "Always"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:475
 msgid "local only"
 msgstr "¥u¦b³o¥x¹q¸£¤W"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:671
+#: libnautilus-extensions/nautilus-global-preferences.c:476
 msgid "Local Files Only"
 msgstr "¥u§ä³o¥x¹q¸£¤WªºÀÉ®×"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:675
+#: libnautilus-extensions/nautilus-global-preferences.c:479
 #, fuzzy
 msgid "never"
 msgstr "never"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:676
+#: libnautilus-extensions/nautilus-global-preferences.c:480
 msgid "Never"
 msgstr "Never"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:717
-msgid "current theme"
-msgstr "¥Ø«e­·®æ"
+#: libnautilus-extensions/nautilus-global-preferences.c:576
+msgid "Smoother Graphics"
+msgstr "¶ê¼í¼Ò¦¡"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:729
+#: libnautilus-extensions/nautilus-global-preferences.c:578
+msgid "Use smoother (but slower) graphics"
+msgstr "¨Ï¥Î¶ê¼í¼Ò¦¡¡]¤ñ±ÐºC¡^"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:583
+#: libnautilus-extensions/nautilus-global-preferences.c:590
+#: libnautilus-extensions/nautilus-global-preferences.c:597
+#: libnautilus-extensions/nautilus-global-preferences.c:607
+#: libnautilus-extensions/nautilus-global-preferences.c:614
+#: libnautilus-extensions/nautilus-global-preferences.c:624
+#: libnautilus-extensions/nautilus-global-preferences.c:631
+#, fuzzy
+msgid "Fonts"
+msgstr "¦r«¬"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:585
+#: libnautilus-extensions/nautilus-global-preferences.c:592
+msgid "Font for Icon view:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:599
+msgid "Font size for Icon view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:609
+msgid "Font for List view:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:616
+msgid "Font size for List view at 100% zoom:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:626
+#: libnautilus-extensions/nautilus-global-preferences.c:633
+msgid "Font for elsewhere in Nautilus:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:644
+#, fuzzy
+msgid "Use Nautilus to draw the desktop"
+msgstr "µ²§ô Nautilus Desktop"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:649
+#: libnautilus-extensions/nautilus-global-preferences.c:656
+#: libnautilus-extensions/nautilus-global-preferences.c:663
+#: libnautilus-extensions/nautilus-global-preferences.c:670
+#: libnautilus-extensions/nautilus-global-preferences.c:677
 #, fuzzy
-msgid "Open each item in a new window"
+msgid "Opening New Windows"
+msgstr "¥Î·sµøµ¡¶}±Ò"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:651
+#, fuzzy
+msgid "Open each file or folder in a separate window"
 msgstr "¥Î·sµøµ¡¶}±Ò¨C¤@­Ó¤w¿ï¶µ¥Ø"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:736
+#: libnautilus-extensions/nautilus-global-preferences.c:658
 #, fuzzy
-msgid "Ask before deleting items from the trash"
-msgstr "±N¤w¿ï¶µ¥Ø¥á¨ì©U§£±í"
+msgid "Display toolbar in new windows"
+msgstr "Åã¥Ü¤u¨ã¦C"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:743
-msgid "Click policy"
-msgstr "ÂI¿ï¼Ò¦¡"
+#: libnautilus-extensions/nautilus-global-preferences.c:665
+#, fuzzy
+msgid "Display location bar in new windows"
+msgstr "Åã¥Ü¦ì¸m¦C"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:672
+#, fuzzy
+msgid "Display status bar in new windows"
+msgstr "Åã¥Üª¬ºA¦C"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:679
+#, fuzzy
+msgid "Display sidebar in new windows"
+msgstr "¥Î·sµøµ¡¶}±Ò¨C¤@­Ó¤w¿ï¶µ¥Ø"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:684
+#: libnautilus-extensions/nautilus-global-preferences.c:691
+#, fuzzy
+msgid "Trash Behavior"
+msgstr "·Æ¹«¨Ï¥Î¼Ò¦¡"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:686
+msgid "Ask before emptying the Trash or deleting files"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:693
+msgid "Include a Delete command that bypasses Trash"
+msgstr ""
+
+#. FIXME: This group clearly doesn't belong in Windows &
+#. * Desktop, but there's no obviously-better place for it and
+#. * it probably doesn't deserve a pane of its own.
+#.
+#: libnautilus-extensions/nautilus-global-preferences.c:702
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:704
+msgid "Use Emacs-style keyboard shortcuts in text fields"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:713
 #, fuzzy
 msgid "single"
 msgstr "¤@¤U"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:750
+#: libnautilus-extensions/nautilus-global-preferences.c:714
 msgid "Activate items with a single click"
 msgstr "ÂI¤@¤U«K¶}±Ò"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:754
+#: libnautilus-extensions/nautilus-global-preferences.c:717
 msgid "double"
 msgstr "¨â¤U"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:755
+#: libnautilus-extensions/nautilus-global-preferences.c:718
 msgid "Activate items with a double click"
 msgstr "ÂI¨â¤U«K¶}±Ò"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:760
+#: libnautilus-extensions/nautilus-global-preferences.c:725
+msgid "launch"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:726
+msgid "Execute files when they are clicked"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:729
 #, fuzzy
-msgid "Display text in icons"
-msgstr "¦b¹Ï¥Ü¤ºÅã¥Ü¤å¦r"
+msgid "display"
+msgstr "Åã¥Ü"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:730
+msgid "Display files when they are clicked"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:733
+msgid "ask"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:734
+msgid "Ask each time"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:741
+#: libnautilus-extensions/nautilus-global-preferences.c:743
+msgid "Click Behavior"
+msgstr "·Æ¹«¨Ï¥Î¼Ò¦¡"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:749
+#: libnautilus-extensions/nautilus-global-preferences.c:751
+msgid "Executable Text Files"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:757
+#: libnautilus-extensions/nautilus-global-preferences.c:764
+#: libnautilus-extensions/nautilus-global-preferences.c:771
+#, fuzzy
+msgid "Show/Hide Options"
+msgstr "Åã¥Ü/ÁôÂà ­n¥ó"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:759
+#, fuzzy
+msgid "Show hidden files (file names start with \".\")"
+msgstr "Åã¥ÜÁôÂÃÀÉ"
 
 #: libnautilus-extensions/nautilus-global-preferences.c:766
 #, fuzzy
-msgid "Show thumbnails for image files"
-msgstr "¹wÄý¹Ï¹³ÀÉ®×"
+msgid "Show backup files (file names end with \"~\")"
+msgstr "Åã¥ÜÁôÂÃÀÉ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:772
+#: libnautilus-extensions/nautilus-global-preferences.c:773
 #, fuzzy
-msgid "Read and write metadata in each folder"
-msgstr "Ū¼g¨C¤@­Ó¥Ø¿ýªºmetadata"
+msgid "Show special flags in Properties window"
+msgstr "Åã¥ÜÄݩʵøµ¡ªº¯S®íºX¼Ð"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:782
-msgid "Use smoother (but slower) graphics"
-msgstr "¨Ï¥Î¶ê¼í¼Ò¦¡¡]¤ñ±ÐºC¡^"
+#: libnautilus-extensions/nautilus-global-preferences.c:778
+msgid "Sorting Order"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:788
-msgid "Font family used to display file names"
-msgstr "Åã¥ÜÀɮשҭn¥Îªº¦r§Î"
+#: libnautilus-extensions/nautilus-global-preferences.c:780
+msgid "Always list folders before files"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:791
+#: libnautilus-extensions/nautilus-global-preferences.c:805
+#: src/file-manager/fm-properties-window.c:1529 src/nautilus-location-bar.c:62
+msgid "Location:"
+msgstr "¦ì¸m :"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:795
+#: libnautilus-extensions/nautilus-global-preferences.c:796
+#: libnautilus-extensions/nautilus-global-preferences.c:803
+#: libnautilus-extensions/nautilus-global-preferences.c:810
+#: libnautilus-extensions/nautilus-global-preferences.c:817
+#: libnautilus-extensions/nautilus-global-preferences.c:825
+#: libnautilus-extensions/nautilus-global-preferences.c:833
 #, fuzzy
-msgid "Display tool bar in new windows"
-msgstr "Åã¥Ü¤u¨ã¦C"
+msgid "HTTP Proxy Settings"
+msgstr "·j´M³]©w"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:798
+msgid "Use HTTP Proxy"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:801
+#. allocate the proxy label, followed by the entry
+#: libnautilus-extensions/nautilus-global-preferences.c:812
+#: src/nautilus-first-time-druid.c:683
+msgid "Port:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:819
+msgid "Proxy requires a username and password:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:841
 #, fuzzy
-msgid "Display location bar in new windows"
-msgstr "Åã¥Ü¦ì¸m¦C"
+msgid "Built-in Bookmarks"
+msgstr "Nautilus: ®ÑÅÒ"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:807
+#: libnautilus-extensions/nautilus-global-preferences.c:843
 #, fuzzy
-msgid "Display status bar in new windows"
-msgstr "Åã¥Üª¬ºA¦C"
+msgid "Don't include the built-in bookmarks in the Bookmarks menu"
+msgstr "±N¤º«Ø®ÑÅÒ¥[¤J¿ï³æ¤º"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:813
+#: libnautilus-extensions/nautilus-global-preferences.c:852
+msgid "Show Text in Icons"
+msgstr "¦b¹Ï¥Ü¤ºÅã¥Ü¤å¦r"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:860
+msgid "Show Count of Items in Folders"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:868
+#: libnautilus-extensions/nautilus-global-preferences.c:876
+msgid "Show Thumbnails for Image Files"
+msgstr "¹wÄý¹Ï¹³ÀÉ®×"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:878
+msgid "Don't make thumbnails for files larger than:"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:886
+msgid "Preview Sound Files"
+msgstr ""
+
+#. FIXME bugzilla.eazel.com 2560: This title phrase needs improvement.
+#: libnautilus-extensions/nautilus-global-preferences.c:896
 #, fuzzy
-msgid "Display sidebar in new windows"
-msgstr "¥Î·sµøµ¡¶}±Ò¨C¤@­Ó¤w¿ï¶µ¥Ø"
+msgid "Make Folder Appearance Details Public"
+msgstr "±N¥Ø¿ý²Ó¸`¤½¶}Åã¥Ü"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:821
-msgid "Always do slow, complete search"
-msgstr "¥Ã»·¨Ï¥Î¦a´à¦¡·j´M"
+#: libnautilus-extensions/nautilus-global-preferences.c:936
+msgid "Appearance"
+msgstr "Åã¥Ü¼Ò¦¡"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:828
-msgid "search type to do by default"
-msgstr "¨Ï¥Î¹w³]¤è¦¡·j´M"
+#: libnautilus-extensions/nautilus-global-preferences.c:941
+msgid "Windows & Desktop"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:946
+msgid "Icon & List Views"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:957
+#, fuzzy
+msgid "Navigation"
+msgstr "¾É´M"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:962
+msgid "Speed Tradeoffs"
+msgstr "§Ö³tÂsÄý"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:834
+#: libnautilus-extensions/nautilus-global-preferences.c:985
 msgid "search by text"
 msgstr "¥H¤å¦r·j´M"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:835
-msgid "Search for files by text only"
+#: libnautilus-extensions/nautilus-global-preferences.c:986
+#, fuzzy
+msgid "Search for files by file name only"
 msgstr "¥u¥H¤å¦r·j´MÀÉ®×"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:839
+#: libnautilus-extensions/nautilus-global-preferences.c:989
 msgid "search by text and properties"
 msgstr "¥H¤å¦r©MÄÝ©Ê·j´M"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:840
-msgid "Search for files by text and by their properties"
+#: libnautilus-extensions/nautilus-global-preferences.c:990
+#, fuzzy
+msgid "Search for files by file name and file properties"
 msgstr "¥H¤å¦r©MÄÝ©Ê·j´MÀÉ®×"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:845
-msgid "Search Web Location"
-msgstr "·j´Mºô¯¸"
+#: libnautilus-extensions/nautilus-global-preferences.c:997
+msgid "Search Complexity Options"
+msgstr "·j´M½Æ¦X±ø¥ó"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:852
+#: libnautilus-extensions/nautilus-global-preferences.c:999
+msgid "search type to do by default"
+msgstr "¨Ï¥Î¹w³]¤è¦¡·j´M"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1005
+#: libnautilus-extensions/nautilus-global-preferences.c:1038
 #, fuzzy
-msgid "Show hidden files (starting with \".\")"
-msgstr "Åã¥ÜÁôÂÃÀÉ"
+msgid "Fast Search"
+msgstr "·j´M"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:858
-msgid "Show backup files (ending with \"~\")"
+#: libnautilus-extensions/nautilus-global-preferences.c:1007
+msgid "Enable fast search (indexes your hard drive)"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:864
+#: libnautilus-extensions/nautilus-global-preferences.c:1014
 #, fuzzy
-msgid "Show special flags in Properties window"
-msgstr "Åã¥ÜÄݩʵøµ¡ªº¯S®íºX¼Ð"
+msgid "Search Engine Location"
+msgstr "·j´Mºô¯¸"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:870
+#: libnautilus-extensions/nautilus-global-preferences.c:1031
+msgid "Search"
+msgstr "·j´M"
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1052
+msgid "Show only folders (no files) in the tree"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1076
+#, fuzzy, c-format
+msgid "Display %s tab in sidebar"
+msgstr "Åã¥Ü»²§U¤u¨ã"
+
+#. Sidebar Panels - dynamic part
+#: libnautilus-extensions/nautilus-global-preferences.c:1096
+#: libnautilus-extensions/nautilus-global-preferences.c:1104
 #, fuzzy
-msgid "Can add Content"
-msgstr "¥i¼W¥[¤º®e"
+msgid "Sidebar Panels"
+msgstr "°¼¦C"
 
-#: libnautilus-extensions/nautilus-global-preferences.c:903
-msgid "Use HTTP Proxy"
+#: libnautilus-extensions/nautilus-global-preferences.c:1098
+msgid "Tabs"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1266
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"currently can't be performed because the program crond, which does nightly "
+"tasks on your computer, is turned off. To make sure fast searches can be "
+"done, turn crond on."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:909
-msgid "HTTP Proxy"
+#: libnautilus-extensions/nautilus-global-preferences.c:1273
+#: libnautilus-extensions/nautilus-global-preferences.c:1291
+msgid "Files May Not Be Indexed"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-global-preferences.c:1274
+#: libnautilus-extensions/nautilus-global-preferences.c:1292
+msgid ""
+"If you are running Linux, you can log in as root and type these commands to "
+"start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-global-preferences.c:915
-msgid "HTTP Proxy Port"
+#: libnautilus-extensions/nautilus-global-preferences.c:1283
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing "
+"may not be performed because the program crond, which does nightly tasks on "
+"your computer, may be turned off. To make sure fast searches can be done, "
+"check to make sure that crond is turned on.\n"
+"\n"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:676
+#. The list of characters that cause line breaks can be localized.
+#: libnautilus-extensions/nautilus-icon-canvas-item.c:70
+msgid " -_,;.?/&"
+msgstr " -_,;.?/&"
+
+#: libnautilus-extensions/nautilus-icon-dnd.c:755
+#, fuzzy
 msgid ""
-"This directory uses automatic layout. Do you want to switch to manual layout "
+"This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
 "manual layout."
 msgstr "³o­Ó¥Ø¿ý±Ä¥Î¦Û°Ê³W¹º,§A·Q¤Á´«¨ì¦Û­q³W¹º¶Ü? ³o±N·|§ï¼g§Aªº¤w¦s³]©w."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:680
+#: libnautilus-extensions/nautilus-icon-dnd.c:759
+#, fuzzy
 msgid ""
-"This directory uses automatic layout. Do you want to switch to manual layout "
+"This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
 "manual layout."
 msgstr "³o­Ó¥Ø¿ý±Ä¥Î¦Û°Ê³W¹º,§A·Q¤Á´«¨ì¦Û­q³W¹º¶Ü? ³o±N·|§ï¼g§Aªº­ì¨Ó³]©w."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:686
+#: libnautilus-extensions/nautilus-icon-dnd.c:765
+#, fuzzy
 msgid ""
-"This directory uses automatic layout. Do you want to switch to manual layout "
+"This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
 msgstr "³o­Ó¥Ø¿ý±Ä¥Î¦Û°Ê³W¹º,§A·Q¤Á´«¨ì¦Û­q³W¹º¶Ü? ³o±N·|§ï¼g§Aªº¤w¦s³]©w."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:689
+#: libnautilus-extensions/nautilus-icon-dnd.c:768
+#, fuzzy
 msgid ""
-"This directory uses automatic layout. Do you want to switch to manual layout "
+"This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
 msgstr "³o­Ó¥Ø¿ý±Ä¥Î¦Û°Ê³W¹º,§A·Q¤Á´«¨ì¦Û­q³W¹º¶Ü? ³o±N·|§ï¼g§Aªº¤w¦s³]©w."
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:696
+#: libnautilus-extensions/nautilus-icon-dnd.c:773
 msgid "Switch to Manual Layout?"
 msgstr "¤Á´«¨ì¦Û­q³W¹º?"
 
-#: libnautilus-extensions/nautilus-icon-dnd.c:697
-#: src/nautilus-window-menus.c:584
+#: libnautilus-extensions/nautilus-icon-dnd.c:774
 msgid "Switch"
 msgstr "¤Á´«"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1506
+#: libnautilus-extensions/nautilus-icon-text-item.c:1584
+#: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "Rename"
 msgstr "­«·s©R¦W"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1507
+#: libnautilus-extensions/nautilus-icon-text-item.c:1585
 #, fuzzy
 msgid "Undo Typing"
 msgstr "¨ú®ø½s¿è"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1508
+#: libnautilus-extensions/nautilus-icon-text-item.c:1586
 msgid "Restore the old name"
 msgstr "Àx¦s­ì¨Ó¦WºÙ"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1509
+#: libnautilus-extensions/nautilus-icon-text-item.c:1587
 #, fuzzy
 msgid "Redo Typing"
 msgstr "­«·s½s¿è"
 
-#: libnautilus-extensions/nautilus-icon-text-item.c:1510
+#: libnautilus-extensions/nautilus-icon-text-item.c:1588
 msgid "Restore the changed name"
 msgstr "Àx¦s·sªº¦WºÙ"
 
-#. FIXME bugzilla.eazel.com 1102: Embedded text should use preferences to determine
-#. * the font it uses
-#.
-#: libnautilus-extensions/nautilus-icon-factory.c:2190
+#: libnautilus-extensions/nautilus-preferences.c:92
 #, fuzzy
-msgid "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*"
-msgstr "-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-*-*"
+msgid "Beginner"
+msgstr "¶}©l"
 
-#: libnautilus-extensions/nautilus-preferences.c:1093
-#, fuzzy, c-format
-msgid ""
-"GConf error:\n"
-"  %s"
-msgstr "³]©wÀÉ®×"
+#: libnautilus-extensions/nautilus-preferences.c:93
+msgid "Intermediate"
+msgstr "¶i¶¥"
 
-#: libnautilus-extensions/nautilus-preferences.c:1100
-#, c-format
-msgid ""
-"GConf error:\n"
-"  %s\n"
-"All further errors shown only on terminal"
-msgstr ""
+#: libnautilus-extensions/nautilus-preferences.c:94
+msgid "Advanced"
+msgstr "¼F®`³Ã¥ë"
 
-#: libnautilus-extensions/nautilus-preferences-dialog.c:201
+#: libnautilus-extensions/nautilus-preferences-dialog.c:203
 msgid "Prefs Box"
 msgstr "Prefs Box"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:188
-#: src/nautilus-window.c:734
-#, c-format
-msgid "View as %s"
-msgstr "¥H %s ÂsÄý"
-
-#: libnautilus-extensions/nautilus-program-chooser.c:218
+#: libnautilus-extensions/nautilus-program-chooser.c:226
 msgid "not in menu"
 msgstr "¤£¦b¦W³æ¤º"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:221
+#: libnautilus-extensions/nautilus-program-chooser.c:229
 msgid "in menu for this file"
 msgstr "¦¹Àɮתº¿ï³æ¤¤"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:224
-#: libnautilus-extensions/nautilus-program-chooser.c:227
+#: libnautilus-extensions/nautilus-program-chooser.c:232
+#: libnautilus-extensions/nautilus-program-chooser.c:235
 #, c-format
 msgid "in menu for \"%s\""
 msgstr "¦b \"%s\" ªº¿ï³æ¤¤ "
 
-#: libnautilus-extensions/nautilus-program-chooser.c:230
+#: libnautilus-extensions/nautilus-program-chooser.c:238
 msgid "default for this file"
 msgstr "¦¹Àɮתº¹w³]"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:233
-#: libnautilus-extensions/nautilus-program-chooser.c:236
+#: libnautilus-extensions/nautilus-program-chooser.c:241
+#: libnautilus-extensions/nautilus-program-chooser.c:244
 #, c-format
 msgid "default for \"%s\""
 msgstr "\"%s\" ªº¹w³]"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:265
+#: libnautilus-extensions/nautilus-program-chooser.c:289
 #, c-format
 msgid "Is not in the menu for \"%s\" items."
 msgstr " ¤£¦b¿ï³æ¤¤ \"%s\" ªº¿ï¶µ"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:268
+#: libnautilus-extensions/nautilus-program-chooser.c:292
 #, c-format
 msgid "Is in the menu for \"%s\"."
 msgstr "¦b \"%s\" ªº¿ï³æ¤¤"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:271
+#: libnautilus-extensions/nautilus-program-chooser.c:295
 #, c-format
 msgid "Is in the menu for \"%s\" items."
 msgstr " ¦b¿ï³æ¤¤ \"%s\" ªº¿ï¶µ"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:274
+#: libnautilus-extensions/nautilus-program-chooser.c:298
 #, c-format
 msgid "Is in the menu for all \"%s\" items."
 msgstr "¦b¹ï©Ò¦³ \"%s\" ­Ó¿ï¶µªº¿ï³æ¤¤ "
 
-#: libnautilus-extensions/nautilus-program-chooser.c:277
+#: libnautilus-extensions/nautilus-program-chooser.c:301
 #, c-format
 msgid "Is the default for \"%s\"."
 msgstr "¬O \"%s\" ªº¹w³]"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:280
+#: libnautilus-extensions/nautilus-program-chooser.c:304
 #, c-format
 msgid "Is the default for \"%s\" items."
 msgstr "¬O \"%s\" ­Ó¿ï¶µªº¹w³]"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:283
+#: libnautilus-extensions/nautilus-program-chooser.c:307
 #, c-format
 msgid "Is the default for all \"%s\" items."
 msgstr "¬O©Ò¦³ \"%s\" ¿ï¶µªº¹w³]"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1040
+#: libnautilus-extensions/nautilus-program-chooser.c:993
 #, c-format
 msgid "Modify \"%s\""
 msgstr "­×§ï \"%s\" "
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-extensions/nautilus-program-chooser.c:1064
+#: libnautilus-extensions/nautilus-program-chooser.c:1018
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "¥]§t¦b \"%s\" ¿ï¶µªº¿ï³æ¤¤ "
 
 #. Radio button for setting default for file type.
-#: libnautilus-extensions/nautilus-program-chooser.c:1071
+#: libnautilus-extensions/nautilus-program-chooser.c:1025
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "§@¬° \"%s\" ­Ó¿ï¶µªº¹w³]"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1078
+#: libnautilus-extensions/nautilus-program-chooser.c:1032
 #, c-format
 msgid "Include in the menu just for \"%s\""
 msgstr "¥u¥]§t¦b \"%s\" ªº¿ï³æ¤¤"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1084
+#: libnautilus-extensions/nautilus-program-chooser.c:1038
 #, c-format
 msgid "Use as default just for \"%s\""
 msgstr "¥u§@¬° \"%s\" ªº¹w³] "
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-extensions/nautilus-program-chooser.c:1091
+#: libnautilus-extensions/nautilus-program-chooser.c:1045
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "¤£­n¥]§t¦b \"%s\" ¿ï¶µªº¿ï³æ¤¤"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1255
-#: src/file-manager/fm-list-view.c:1757
-#: src/file-manager/fm-search-list-view.c:238
-#: src/nautilus-bookmarks-window.c:169 src/nautilus-search-bar-criterion.c:66
+#: libnautilus-extensions/nautilus-program-chooser.c:1209
+#: src/file-manager/fm-list-view.c:2182
+#: src/file-manager/fm-search-list-view.c:545
+#: src/nautilus-bookmarks-window.c:164
 msgid "Name"
 msgstr "¦WºÙ"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1258
+#: libnautilus-extensions/nautilus-program-chooser.c:1212
 msgid "Status"
 msgstr "ª¬ºA"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1306
+#: libnautilus-extensions/nautilus-program-chooser.c:1260
 #, fuzzy
 msgid "Open with Other"
 msgstr "Nautilus: ½Ð¥H¨ä¥Lµ{¦¡¶}±Ò"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1307
+#: libnautilus-extensions/nautilus-program-chooser.c:1261
 #, c-format
 msgid "Choose an application with which to open \"%s\"."
 msgstr "½Ð¿ï¾Ü¤@­ÓÀ³¥Îµ{¦¡¨Ó¶}±Ò \"%s\""
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1311
+#: libnautilus-extensions/nautilus-program-chooser.c:1265
 #, fuzzy
 msgid "View as Other"
 msgstr "¥H¨ä¥LÂsÄý..."
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1312
+#: libnautilus-extensions/nautilus-program-chooser.c:1266
 #, c-format
 msgid "Choose a view for \"%s\"."
 msgstr "½Ð¬° \"%s\" ¿ï¾Ü¤@­Óµ{¦¡"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1319
+#: libnautilus-extensions/nautilus-program-chooser.c:1273
 msgid "Choose"
 msgstr "¿ï¾Ü"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1321
+#: libnautilus-extensions/nautilus-program-chooser.c:1275
 msgid "Done"
 msgstr "§¹¦¨"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1383
+#: libnautilus-extensions/nautilus-program-chooser.c:1338
 msgid "Modify..."
 msgstr "­×§ï..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-extensions/nautilus-program-chooser.c:1394
+#: libnautilus-extensions/nautilus-program-chooser.c:1349
 msgid "File Types and Programs"
 msgstr "Àɮ׮榡©Mµ{¦¡"
 
-#: libnautilus-extensions/nautilus-program-chooser.c:1403
-msgid "Go There"
-msgstr "Go There"
-
-#: libnautilus-extensions/nautilus-program-chooser.c:1412
+#: libnautilus-extensions/nautilus-program-chooser.c:1370
 #, fuzzy
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "GNOME Control Center."
 msgstr "½Ð¦b±±¨î¥x¿ï¾Ü¨CºØÀɮ׮榡¹ïÀ³ªº³B²zµ{¦¡"
 
-#. This application can't deal with this URI,
-#. * because it can only handle local
-#. * files. Tell user. Some day we could offer
-#. * to copy it locally for the user, if we knew
-#. * where to put it, and who would delete it
-#. * when done.
+#: libnautilus-extensions/nautilus-program-chooser.c:1485
+#, fuzzy, c-format
+msgid "No viewers are available for \"%s\"."
+msgstr "½Ð¬° \"%s\" ¿ï¾Ü¤@­Óµ{¦¡"
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1486
+msgid "No Viewers Available"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1489
+#, fuzzy, c-format
+msgid "No applications are available for \"%s\"."
+msgstr "½Ð¬° \"%s\" ¿ï¾Ü¤@­Óµ{¦¡"
+
+#: libnautilus-extensions/nautilus-program-chooser.c:1490
+#, fuzzy
+msgid "No Applications Available"
+msgstr "À³¥Îµ{¦¡"
+
+#. Note: This might be misleading in the components case, since the
+#. * user can't add components to the complete list even from the capplet.
+#. * (They can add applications though.)
 #.
-#: libnautilus-extensions/nautilus-program-choosing.c:259
+#: libnautilus-extensions/nautilus-program-chooser.c:1497
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"You can configure which programs are offered for which file types with the "
+"\"File Types and Programs\" part of the GNOME Control Center. Do you want to "
+"go there now?"
+msgstr "½Ð¦b±±¨î¥x¿ï¾Ü¨CºØÀɮ׮榡¹ïÀ³ªº³B²zµ{¦¡"
+
+#: libnautilus-extensions/nautilus-program-choosing.c:492
 #, c-format
 msgid ""
-"Sorry, %s can only open local files, and \"%s\" is remote. If you want to "
-"open it with %s, make a local copy first."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  Would you like to choose another application?"
 msgstr ""
-"©êºp, %s ¥u¯à¶}±Ò³o¥x¹q¸£¤WªºÀÉ®×,¦ý¬O \"%s\" ¦b»·ºÝ¹q¸£¤W.¦pªG±z­n¥H %s "
-"¶}±Ò³o­ÓÀÉ®×,½Ð¥ý±N½Æ»s¤@¥÷¨ì±zªº¹q¸£¤W."
 
-#: libnautilus-extensions/nautilus-program-choosing.c:263
-msgid "Can't open remote file"
-msgstr "µLªk¶}±Ò»·ºÝÀÉ®×"
+#: libnautilus-extensions/nautilus-program-choosing.c:497
+#: libnautilus-extensions/nautilus-program-choosing.c:518
+#, fuzzy
+msgid "Can't Open Location"
+msgstr "Àx¦s¦ì¸m"
 
-#: libnautilus-extensions/nautilus-search-uri.c:207
+#: libnautilus-extensions/nautilus-program-choosing.c:513
 #, c-format
-msgid "that have \"%s\" in the name"
-msgstr ""
+msgid ""
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  No other applications are available to view this file.  If you "
+"copy this file onto your computer, you may be able to open it."
+msgstr ""
+
+#. Human readable description for a criterion in a search for
+#. files. Bracketed items are context, and are message
+#. strings elsewhere.  You don't have to translate the whole
+#. string, and only the translation for "containing '%s' will
+#. be used.  If you do translate the whole string, leave the
+#. translations of the rest of the text in brackets, so it
+#. will not be used.
+#. "%s" here is a pattern the file name
+#. matched, such as "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:212
+#, fuzzy, c-format
+msgid "[Items ]containing \"%s\" in their names"
+msgstr "(¥]§t %d ­Ó¤¸¥ó)"
 
-#: libnautilus-extensions/nautilus-search-uri.c:210
+#. "%s" here is a pattern the file name started with, such as
+#. "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:217
 #, fuzzy, c-format
-msgid "that start with \"%s\""
+msgid "[Items ]starting with \"%s\""
 msgstr "¥H...¶}©l"
 
-#: libnautilus-extensions/nautilus-search-uri.c:213
+#. "%s" here is a pattern the file name ended with, such as
+#. "mime"
+#: libnautilus-extensions/nautilus-search-uri.c:222
 #, fuzzy, c-format
-msgid "that end with %s"
+msgid "[Items ]ending with %s"
 msgstr "¥H %s ¶}±Ò "
 
-#: libnautilus-extensions/nautilus-search-uri.c:216
-#, fuzzy, c-format
-msgid "that don't contain \"%s\""
-msgstr "¦WºÙ¤£¥]§t \"%s\""
+#. "%s" here is a pattern the file name did not match, such
+#. as "nautilus"
+#: libnautilus-extensions/nautilus-search-uri.c:227
+#, c-format
+msgid "[Items ]not containing \"%s\" in their names"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:219
+#. "%s" is a regular expression string, for example "[abc]"
+#: libnautilus-extensions/nautilus-search-uri.c:231
 #, fuzzy, c-format
-msgid "that match the regular expression \"%s\""
+msgid "[Items ]matching the regular expression \"%s\""
 msgstr "¦WºÙ¤ñ¹ï²Å¦X¥¿³W regexp \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:222
+#. "%s" is a file glob, for example "*.txt"
+#: libnautilus-extensions/nautilus-search-uri.c:235
 #, fuzzy, c-format
-msgid "that match the file pattern \"%s\""
+msgid "[Items ]matching the file pattern \"%s\""
 msgstr "¦WºÙ¤ñ¹ï²Å¦XÀɮ׮榡"
 
-#: libnautilus-extensions/nautilus-search-uri.c:235
+#: libnautilus-extensions/nautilus-search-uri.c:248
 #, fuzzy
-msgid "regular files"
-msgstr "¼Ð·ÇÀÉ®×"
+msgid "[Items that are ]regular files"
+msgstr "±ø¥ó¬°¼Ð·ÇÀɮצWºÙ¥]§t \"stuff\" ªº·j´Mµ²ªG"
 
-#: libnautilus-extensions/nautilus-search-uri.c:238
-#, fuzzy
-msgid "text files"
-msgstr "¯Â¤å¦rÀÉ®×"
+#: libnautilus-extensions/nautilus-search-uri.c:251
+msgid "[Items that are ]text files"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:241
-#, fuzzy
-msgid "applications"
-msgstr "À³¥Îµ{¦¡"
+#: libnautilus-extensions/nautilus-search-uri.c:254
+msgid "[Items that are ]applications"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:244
-#, fuzzy
-msgid "directories"
-msgstr "0 ­Ó¥Ø¿ý"
+#: libnautilus-extensions/nautilus-search-uri.c:257
+msgid "[Items that are ]folders"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:247
-#: src/nautilus-search-bar-criterion.c:106
-msgid "music"
-msgstr "­µ¼Ö"
+#: libnautilus-extensions/nautilus-search-uri.c:260
+msgid "[Items that are ]music"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:254
-#, c-format
-msgid "are not %s"
+#. "%s" here is a word describing a file type, for example
+#. "folder"
+#: libnautilus-extensions/nautilus-search-uri.c:268
+#, fuzzy, c-format
+msgid "[Items ]that are not %s"
 msgstr "«D %s "
 
-#: libnautilus-extensions/nautilus-search-uri.c:258
+#. "%s" here is a word describing a file type, for example
+#. "folder"
+#: libnautilus-extensions/nautilus-search-uri.c:273
 #, fuzzy, c-format
-msgid "are %s"
-msgstr "¬O %s"
+msgid "[Items ]that are %s"
+msgstr "¤j¤p¬° %s kilobytes"
 
-#: libnautilus-extensions/nautilus-search-uri.c:269
+#. "%s" here is the name of user on a Linux machine, such as
+#. "root"
+#: libnautilus-extensions/nautilus-search-uri.c:287
 #, fuzzy, c-format
-msgid "are not owned by \"%s\""
+msgid "[Items ]not owned by \"%s\""
 msgstr "«D %s "
 
-#: libnautilus-extensions/nautilus-search-uri.c:272
+#. "%s" here is the name of user on a Linux machine, such as
+#. "root"
+#: libnautilus-extensions/nautilus-search-uri.c:292
 #, fuzzy, c-format
-msgid "are owned by \"%s\""
+msgid "[Items ]owned by \"%s\""
 msgstr "©Ò¦³ªÌ¬° \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:276
+#: libnautilus-extensions/nautilus-search-uri.c:295
 #, fuzzy, c-format
-msgid "have owner UID \"%s\""
+msgid "[Items ]with owner UID \"%s\""
 msgstr "©Ò¦³ªÌ¬° \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:279
+#: libnautilus-extensions/nautilus-search-uri.c:298
 #, fuzzy, c-format
-msgid "have owner UID other than \"%s\""
+msgid "[Items ]with owner UID other than \"%s\""
 msgstr "¦WºÙ¤£¥]§t \"%s\""
 
-#: libnautilus-extensions/nautilus-search-uri.c:290
+#: libnautilus-extensions/nautilus-search-uri.c:309
 #, fuzzy, c-format
-msgid "that are larger than %s bytes"
+msgid "[Items ]larger than %s bytes"
 msgstr "¤j %s bytes "
 
-#: libnautilus-extensions/nautilus-search-uri.c:293
+#: libnautilus-extensions/nautilus-search-uri.c:312
 #, fuzzy, c-format
-msgid "that are smaller than %s bytes"
+msgid "[Items ]smaller than %s bytes"
 msgstr "¤p  %s bytes"
 
-#: libnautilus-extensions/nautilus-search-uri.c:296
+#: libnautilus-extensions/nautilus-search-uri.c:315
 #, fuzzy, c-format
-msgid "that are %s bytes"
-msgstr "¤j¤p¬° %s kilobytes"
+msgid "[Items ]of %s bytes"
+msgstr "ª©¥» %s-%s"
+
+#: libnautilus-extensions/nautilus-search-uri.c:326
+#, fuzzy
+msgid "[Items ]modified today"
+msgstr "¤é´Á¤w­×§ï"
 
-#: libnautilus-extensions/nautilus-search-uri.c:307
+#: libnautilus-extensions/nautilus-search-uri.c:329
+msgid "[Items ]modified yesterday"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-search-uri.c:332
 #, fuzzy, c-format
-msgid "modified after %s"
-msgstr "­×§ï:"
+msgid "[Items ]modified on %s"
+msgstr "¤§«e­×§ï"
+
+#: libnautilus-extensions/nautilus-search-uri.c:334
+#, c-format
+msgid "[Items ]not modified on %s"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:310
+#: libnautilus-extensions/nautilus-search-uri.c:337
 #, fuzzy, c-format
-msgid "modified before %s"
+msgid "[Items ]modified before %s"
 msgstr "¤§«e­×§ï"
 
-#: libnautilus-extensions/nautilus-search-uri.c:322
+#: libnautilus-extensions/nautilus-search-uri.c:340
 #, fuzzy, c-format
-msgid "marked with \"%s\""
-msgstr "¥H...¼Ð°O"
+msgid "[Items ]modified after %s"
+msgstr "­×§ï:"
 
-#: libnautilus-extensions/nautilus-search-uri.c:325
+#: libnautilus-extensions/nautilus-search-uri.c:343
 #, fuzzy, c-format
-msgid "not marked with \"%s\""
+msgid "[Items ]modified within a week of %s"
+msgstr "¤@¶g¤º"
+
+#: libnautilus-extensions/nautilus-search-uri.c:346
+#, fuzzy, c-format
+msgid "[Items ]modified within a month of %s"
+msgstr "³o­Ó¤ë"
+
+#. "%s" here is the name of an Emblem
+#: libnautilus-extensions/nautilus-search-uri.c:359
+#, fuzzy, c-format
+msgid "[Items ]marked with \"%s\""
 msgstr "¤£¥H...¼Ð°O"
 
-#: libnautilus-extensions/nautilus-search-uri.c:339
+#. "%s" here is the name of an Emblem
+#: libnautilus-extensions/nautilus-search-uri.c:363
 #, fuzzy, c-format
-msgid "with all the words %s"
-msgstr "¥H¦r®Ú..."
+msgid "[Items ]not marked with \"%s\""
+msgstr "¤£¥H...¼Ð°O"
 
-#: libnautilus-extensions/nautilus-search-uri.c:342
-#, c-format
-msgid "containing one of the words %s"
-msgstr ""
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:379
+#, fuzzy, c-format
+msgid "[Items ]with all the words \"%s\""
+msgstr "¥H¦r®Ú..."
 
-#: libnautilus-extensions/nautilus-search-uri.c:345
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:384
 #, fuzzy, c-format
-msgid "without all the words %s"
+msgid "[Items ]containing one of the words \"%s\""
 msgstr "¤£¥H¦r®Ú..."
 
-#: libnautilus-extensions/nautilus-search-uri.c:348
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:389
 #, fuzzy, c-format
-msgid "without any of the words %s"
+msgid "[Items ]without all the words \"%s\""
 msgstr "¤£¥H¦r®Ú..."
 
-#: libnautilus-extensions/nautilus-search-uri.c:365
-#, fuzzy
-msgid "that"
-msgstr "ª¬ºA"
+#. "%s" here is a word or words present in the file, for
+#. example "nautilus" or "apple orange"
+#: libnautilus-extensions/nautilus-search-uri.c:394
+#, fuzzy, c-format
+msgid "[Items ]without any of the words \"%s\""
+msgstr "¤£¥H¦r®Ú..."
 
-#: libnautilus-extensions/nautilus-search-uri.c:485
-#, fuzzy
-msgid "are directories"
-msgstr "¬O¥Ø¿ý"
+#: libnautilus-extensions/nautilus-search-uri.c:556
+msgid "[Items larger than 400K] and [without all the words \"apple orange\"]"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:529
-msgid " and "
-msgstr " ©M "
+#. Human readable description for a criterion in a search for
+#. files. Bracketed items are context, and are message
+#. strings elsewhere.  Translate only the words "and" here.
+#: libnautilus-extensions/nautilus-search-uri.c:561
+msgid ""
+"[Items larger than 400K], [owned by root and without all the words \"apple "
+"orange\"]"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-search-uri.c:594
+#. The beginning of the description of a search that has just been
+#. performed.  The "%s" here is a description of a single criterion,
+#. which in english might be "that contain the word 'foo'"
+#: libnautilus-extensions/nautilus-search-uri.c:591
 #, fuzzy, c-format
-msgid "Items %s%s"
+msgid "Items %s"
 msgstr "ª©¥» %s-%s"
 
-#: libnautilus-extensions/nautilus-search-uri.c:597
-#, c-format
-msgid "Items %s %s%s"
-msgstr ""
+#: libnautilus-extensions/nautilus-search-uri.c:701
+#, fuzzy
+msgid "Items containing \"stuff\" in their names"
+msgstr "(¥]§t 0 ­Ó¤¸¥ó)"
 
-#: libnautilus-extensions/nautilus-search-uri.c:706
-msgid "Items that have \"stuff\" in the name."
-msgstr ""
+#: libnautilus-extensions/nautilus-search-uri.c:703
+#, fuzzy
+msgid "Items that are regular files"
+msgstr "±ø¥ó¬°¼Ð·ÇÀɮצWºÙ¥]§t \"stuff\" ªº·j´Mµ²ªG"
 
-#: libnautilus-extensions/nautilus-search-uri.c:708
+#: libnautilus-extensions/nautilus-search-uri.c:706
 #, fuzzy
-msgid "Items that have \"stuff\" in the name and are regular files."
+msgid "Items containing \"stuff\" in their names and that are regular files"
 msgstr "±ø¥ó¬°¼Ð·ÇÀɮצWºÙ¥]§t \"stuff\" ªº·j´Mµ²ªG"
 
-#: libnautilus-extensions/nautilus-search-uri.c:711
+#: libnautilus-extensions/nautilus-search-uri.c:710
 #, fuzzy
 msgid ""
-"Items that have \"stuff\" in the name, are regular files and that are "
-"smaller than 2000 bytes."
+"Items containing \"stuff\" in their names, that are regular files and "
+"smaller than 2000 bytes"
 msgstr "±ø¥ó¬°¼Ð·ÇÀɮצWºÙ¥]§t \"stuff\" ¥B¤p©ó 2000 bytes ªº·j´Mµ²ªG"
 
 #: libnautilus-extensions/nautilus-search-uri.c:714
-msgid "Items that have \"medusa\" in the name and are directories."
-msgstr ""
+#, fuzzy
+msgid "Items containing \"medusa\" in their names and that are folders"
+msgstr "±ø¥ó¬°¼Ð·ÇÀɮצWºÙ¥]§t \"stuff\" ªº·j´Mµ²ªG"
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:375
-msgid "Warning"
-msgstr ""
+#: libnautilus-extensions/nautilus-trash-directory.c:73
+#, fuzzy
+msgid "Searching Disks"
+msgstr "·j´M³]©w"
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:385
-#: libnautilus-extensions/nautilus-stock-dialogs.c:425
-msgid "Error"
+#: libnautilus-extensions/nautilus-trash-directory.c:74
+msgid "Nautilus is searching your disks for trash folders."
 msgstr ""
 
-#: libnautilus-extensions/nautilus-stock-dialogs.c:427
-msgid "Details"
-msgstr "²Ó¸`"
-
-#: libnautilus-extensions/nautilus-stock-dialogs.c:457
-#, fuzzy
-msgid "Question"
-msgstr "´y­z"
-
-#: libnautilus-extensions/nautilus-trash-directory.c:285
-msgid "Trash"
+#: libnautilus-extensions/nautilus-trash-file.c:725
+msgid "on the desktop"
 msgstr ""
 
 #: libnautilus-extensions/nautilus-undo-signal-handlers.c:175
@@ -2660,146 +6637,339 @@ msgstr "­«·s½s¿è"
 msgid "Redo the edit"
 msgstr "­«§@¦¹¦¸½s¿è"
 
-#: libnautilus-extensions/nautilus-user-level-manager.c:59
+#: libnautilus-extensions/nautilus-view-identifier.c:61
+#, c-format
+msgid "View as %s"
+msgstr "¥H %s ÂsÄý"
+
+#: libnautilus-extensions/nautilus-view-identifier.c:64
+#, c-format
+msgid "%s Viewer"
+msgstr "¥Î %s "
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:499
+#: libnautilus-extensions/nautilus-volume-monitor.c:518
 #, fuzzy
-msgid "Beginner"
-msgstr "¶}©l"
+msgid "Unknown"
+msgstr "¥¼ª¾"
 
-#: libnautilus-extensions/nautilus-user-level-manager.c:60
-msgid "Intermediate"
-msgstr "¶i¶¥"
+#. Populate table with items we know localized names for.
+#: libnautilus-extensions/nautilus-volume-monitor.c:606
+#: libnautilus-extensions/nautilus-volume-monitor.c:1809
+#, fuzzy
+msgid "Floppy"
+msgstr "À˵ø³nºÐ"
 
-#: libnautilus-extensions/nautilus-user-level-manager.c:61
-msgid "Advanced"
-msgstr "¼F®`³Ã¥ë"
+#: libnautilus-extensions/nautilus-volume-monitor.c:607
+msgid "CD-ROM"
+msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:505
+#: libnautilus-extensions/nautilus-volume-monitor.c:608
+msgid "Zip Drive"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:627
+#: libnautilus-extensions/nautilus-volume-monitor.c:649
+msgid "Audio CD"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1518
+msgid "is write-protected, mounting read-only"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1521
+msgid "is not a valid block device"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1522
+msgid "No medium found"
+msgstr ""
+
+#. Handle floppy case
+#: libnautilus-extensions/nautilus-volume-monitor.c:1526
+msgid ""
+"Nautilus was unable to mount the floppy drive. There is probably no floppy "
+"in the drive."
+msgstr ""
+
+#. All others
+#: libnautilus-extensions/nautilus-volume-monitor.c:1530
+msgid ""
+"Nautilus was unable to mount the volume. There is probably no media in the "
+"device."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1533
+msgid "wrong fs type, bad option, bad superblock on"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1536
+msgid ""
+"Nautilus was unable to mount the floppy drive. The floppy is probably in a "
+"format that cannot be mounted."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1539
+msgid ""
+"Nautilus was unable to mount the selected volume. The volume is probably in "
+"a format that cannot be mounted."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1544
+msgid "Nautilus was unable to mount the selected floppy drive."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1546
+msgid "Nautilus was unable to mount the selected volume."
+msgstr ""
+
+#. FIXME: Should we parse this message and report something more meaningful?
+#: libnautilus-extensions/nautilus-volume-monitor.c:1551
+msgid "Nautilus was unable to unmount the selected volume."
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
+msgid "Mount Error"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1559
 #, fuzzy
-msgid "Unknown Volume"
-msgstr "¥¼ª¾"
+msgid "Unmount Error"
+msgstr "±N %s §ïÅܦWºÙ¬° %s "
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1165
+#: libnautilus-extensions/nautilus-volume-monitor.c:1711
 msgid "ISO 9660 Volume"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1172
+#: libnautilus-extensions/nautilus-volume-monitor.c:1726
+msgid "Root"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1733
 msgid "Ext2 Volume"
 msgstr ""
 
-#: libnautilus-extensions/nautilus-volume-monitor.c:1178
+#: libnautilus-extensions/nautilus-volume-monitor.c:1748
+msgid "MSDOS Volume"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1763
+msgid "NFS Volume"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1778
+msgid "ReiserFS Volume"
+msgstr ""
+
+#: libnautilus-extensions/nautilus-volume-monitor.c:1794
 #, fuzzy
-msgid "Floppy"
-msgstr "À˵ø³nºÐ"
+msgid "UFS Volume"
+msgstr "¥¼ª¾"
 
-#: libnautilus/nautilus-clipboard.c:135 src/nautilus-window-menus.c:1461
-msgid "_Cut Text"
-msgstr "°Å¤U¤å¥»"
+#: libnautilus-extensions/nautilus-volume-monitor.c:1824
+#, fuzzy
+msgid "Unknown Volume"
+msgstr "¥¼ª¾"
 
-#: libnautilus/nautilus-clipboard.c:136 src/nautilus-window-menus.c:1462
-msgid "Cuts the selected text to the clipboard"
-msgstr "°Å¤U¤w¿ï¤å¥»¨ì°Å¶Kï"
+#: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:5
+msgid "C_lear Text"
+msgstr "²M°£¤å¥»"
 
-#: libnautilus/nautilus-clipboard.c:140 src/nautilus-window-menus.c:1473
-msgid "_Copy Text"
+#: libnautilus/nautilus-clipboard-ui.xml.h:2
+#, fuzzy
+msgid "Clear Text"
+msgstr "²M°£¤å¥»"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:3
+#, fuzzy
+msgid "Copy Text"
 msgstr "½Æ»s¤å¥»"
 
-#: libnautilus/nautilus-clipboard.c:141 src/nautilus-window-menus.c:1474
-msgid "Copies the selected text to the clipboard"
+#: libnautilus/nautilus-clipboard-ui.xml.h:4
+#, fuzzy
+msgid "Copy the selected text to the clipboard"
 msgstr "½Æ»s¤w¿ï¤å¥»¨ì°Å¶Kï"
 
-#: libnautilus/nautilus-clipboard.c:145 src/nautilus-window-menus.c:1485
-msgid "_Paste Text"
+#: libnautilus/nautilus-clipboard-ui.xml.h:5
+#, fuzzy
+msgid "Cut Text"
+msgstr "°Å¤U¤å¥»"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:14
+#, fuzzy
+msgid "Cut _Text"
+msgstr "°Å¤U¤å¥»"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:7
+#, fuzzy
+msgid "Cut the selected text to the clipboard"
+msgstr "°Å¤U¤w¿ï¤å¥»¨ì°Å¶Kï"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:8
+#, fuzzy
+msgid "Paste Text"
 msgstr "¶K¤W¤å¥»"
 
-#: libnautilus/nautilus-clipboard.c:146 src/nautilus-window-menus.c:1486
-msgid "Pastes the text stored on the clipboard"
+#: libnautilus/nautilus-clipboard-ui.xml.h:9
+#, fuzzy
+msgid "Paste the text stored on the clipboard"
 msgstr "±N°Å¶K鷺ªº¤å¥»¶K¤W"
 
-#: libnautilus/nautilus-clipboard.c:150 src/nautilus-window-menus.c:1497
-msgid "C_lear Text"
-msgstr "²M°£¤å¥»"
-
-#: libnautilus/nautilus-clipboard.c:151 src/nautilus-window-menus.c:1498
-msgid "Removes the selected text without putting it on the clipboard"
+#: libnautilus/nautilus-clipboard-ui.xml.h:10
+#, fuzzy
+msgid "Remove the selected text without putting it on the clipboard"
 msgstr "²M°£¤w¿ï¤å¥»¦Ó¤£°e¨ì°Å¶Kï"
 
-#: src/file-manager/fm-desktop-icon-view.c:399
+#: libnautilus/nautilus-clipboard-ui.xml.h:11
 #, fuzzy
-msgid "Empty Trash"
-msgstr "²M²z©U§£±í"
+msgid "Select All"
+msgstr "¥þ¿ï"
 
-#: src/file-manager/fm-desktop-icon-view.c:428
-msgid "New Terminal"
-msgstr "·sªº²×ºÝ¾÷"
+#: libnautilus/nautilus-clipboard-ui.xml.h:12 src/nautilus-shell-ui.xml.h:49
+#, fuzzy
+msgid "Select _All"
+msgstr "¥þ¿ï"
 
-#: src/file-manager/fm-desktop-icon-view.c:437
-msgid "Disks"
-msgstr "ºÏºÐ"
+#: libnautilus/nautilus-clipboard-ui.xml.h:13
+#, fuzzy
+msgid "Select all the text in a text field"
+msgstr "¿ï¾Ü³o­Óµøµ¡¤¤ªº©Ò¦³¶µ¥Ø"
 
-#: src/file-manager/fm-desktop-icon-view.c:496
+#: libnautilus/nautilus-clipboard-ui.xml.h:14 src/nautilus-shell-ui.xml.h:75
+msgid "_Copy Text"
+msgstr "½Æ»s¤å¥»"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:15 src/nautilus-shell-ui.xml.h:90
+msgid "_Paste Text"
+msgstr "¶K¤W¤å¥»"
+
+#. The copyright character in here is correct for
+#. * Latin-1 encoding, but not for UTF-8, so we have
+#. * to change it when we upgrade to GTK 2.0.
+#.
+#: nautilus.desktop.in.h:1 src/nautilus-window-manage-views.c:254
+#: src/nautilus-window-menus.c:610
+msgid "Nautilus"
+msgstr "Nautilus"
+
+#: nautilus.desktop.in.h:2
+msgid "Nautilus File Manager and Graphic Shell"
+msgstr ""
+
+#. Note to translators: If it's hard to compose a good home
+#. * icon name from the user name, you can use a string without
+#. * an "%s" here, in which case the home icon name will not
+#. * include the user's name, which should be fine. To avoid a
+#. * warning, put "%.0s" somewhere in the string, which will
+#. * match the user name string passed by the C code, but not
+#. * put the user name in the final string.
+#.
+#: src/file-manager/fm-desktop-icon-view.c:886
+#, fuzzy, c-format
+msgid "%s's Home"
+msgstr "®a¥Ø¿ý"
+
+#: src/file-manager/fm-desktop-icon-view.c:1175
 #, fuzzy
-msgid "Reset Desktop Background"
-msgstr "­«³]­I´º"
+msgid "Empty Trash..."
+msgstr "²M²z©U§£±í"
 
-#: src/file-manager/fm-desktop-icon-view.c:504
+#: src/file-manager/fm-desktop-icon-view.c:1177
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 #, fuzzy
-msgid "Change Desktop Background"
-msgstr "­«³]­I´º"
+msgid "Empty Trash"
+msgstr "²M²z©U§£±í"
 
-#: src/file-manager/fm-directory-view.c:401
+#: src/file-manager/fm-desktop-icon-view.c:1197
+#, fuzzy
+msgid "Unmount Volume"
+msgstr "¥¼ª¾"
+
+#: src/file-manager/fm-directory-view.c:440
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:403
+#: src/file-manager/fm-directory-view.c:442
 #, fuzzy, c-format
 msgid "Open %d Windows?"
 msgstr "¥Î %d ­Ó·sµøµ¡¶}±Ò "
 
-#: src/file-manager/fm-directory-view.c:1183
+#: src/file-manager/fm-directory-view.c:748
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\"?"
+msgstr "§A½T©w­n§â \"%s\" ¥Ã¤[§R°£¶Ü?"
+
+#: src/file-manager/fm-directory-view.c:752
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the %d selected items?"
+msgstr "§A½T©w­n§â³o %d ­ÓªF¦è¥Ã¤[§R°£¶Ü?"
+
+#: src/file-manager/fm-directory-view.c:758
+#, fuzzy
+msgid "Delete?"
+msgstr "§R°£"
+
+#: src/file-manager/fm-directory-view.c:759
+#: src/file-manager/fm-directory-view.c:2770
+#: src/file-manager/fm-directory-view.c:2810
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+msgid "Delete"
+msgstr "§R°£"
+
+#. Localizers: This is the name of a directory that's created in ~/Nautilus, and
+#. * stores the scripts that appear in the Scripts submenu.
+#.
+#: src/file-manager/fm-directory-view.c:1026
+#, fuzzy
+msgid "scripts"
+msgstr "´y­z"
+
+#: src/file-manager/fm-directory-view.c:1335
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" ¤w¿ï"
 
-#: src/file-manager/fm-directory-view.c:1185
+#: src/file-manager/fm-directory-view.c:1337
 #, fuzzy
 msgid "1 folder selected"
 msgstr "1 ­Ó¥Ø¿ý¤w¿ï"
 
-#: src/file-manager/fm-directory-view.c:1188
+#: src/file-manager/fm-directory-view.c:1340
 #, fuzzy, c-format
 msgid "%d folders selected"
 msgstr "%d ­Ó¥Ø¿ý¤w¿ï"
 
-#: src/file-manager/fm-directory-view.c:1194
+#: src/file-manager/fm-directory-view.c:1346
 msgid " (containing 0 items)"
 msgstr "(¥]§t 0 ­Ó¤¸¥ó)"
 
-#: src/file-manager/fm-directory-view.c:1196
+#: src/file-manager/fm-directory-view.c:1348
 msgid " (containing 1 item)"
 msgstr "(¥]§t 1 ­Ó¤¸¥ó)"
 
-#: src/file-manager/fm-directory-view.c:1198
+#: src/file-manager/fm-directory-view.c:1350
 #, c-format
 msgid " (containing %d items)"
 msgstr "(¥]§t %d ­Ó¤¸¥ó)"
 
-#: src/file-manager/fm-directory-view.c:1209
+#: src/file-manager/fm-directory-view.c:1361
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" ¤w¿ï (%s)"
 
-#: src/file-manager/fm-directory-view.c:1213
+#: src/file-manager/fm-directory-view.c:1365
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d ­Ó¤¸¥ó¤w¿ï (%s)"
 
-#: src/file-manager/fm-directory-view.c:1220
+#: src/file-manager/fm-directory-view.c:1372
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "ÁÙ¦³ 1 ­Ó¤¸¥ó¤w¿ï  (%s)"
 
-#: src/file-manager/fm-directory-view.c:1223
+#: src/file-manager/fm-directory-view.c:1375
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "ÁÙ¦³ %d ­Ó¤¸¥ó¤w¿ï(%s)"
@@ -2811,564 +6981,649 @@ msgstr "ÁÙ¦³ %d ­Ó¤¸¥ó¤w¿ï(%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1252
+#: src/file-manager/fm-directory-view.c:1404
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
 
-#: src/file-manager/fm-directory-view.c:2237
+#. Note that the number of items actually displayed varies somewhat due
+#. * to the way files are collected in batches. So you can't assume that
+#. * no more than the constant limit are displayed.
+#.
+#: src/file-manager/fm-directory-view.c:1530
 #, c-format
 msgid ""
-"\"%s\" cannot be moved to the trash. Do you want to delete it immediately?"
+"The folder \"%s\" contains more files than Nautilus can handle. Some files "
+"will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1537
+msgid "Too Many Files"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:2752
+#, fuzzy, c-format
+msgid ""
+"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
 msgstr "µLªk±N \"%s\" ²¾¨ì©U§£±í,±z­n¥ß¨è¥Ã¤[§R°£¶Ü ? "
 
-#: src/file-manager/fm-directory-view.c:2242
-#, c-format
+#: src/file-manager/fm-directory-view.c:2757
+#, fuzzy, c-format
 msgid ""
-"The %d selected items cannot be moved to the trash. Do you want to delete "
+"The %d selected items cannot be moved to the Trash. Do you want to delete "
 "them immediately?"
 msgstr ""
 "µLªk±N±z©Ò¿ïªº %d ­Ó¶µ¥Ø²¾¨ì©U§£±í,\n"
 "±z­n¥ß¨è¥Ã¤[§R°£¶Ü ? "
 
-#: src/file-manager/fm-directory-view.c:2246
-#, c-format
+#: src/file-manager/fm-directory-view.c:2761
+#, fuzzy, c-format
 msgid ""
-"%d of the selected items cannot be moved to the trash. Do you want to delete "
+"%d of the selected items cannot be moved to the Trash. Do you want to delete "
 "those %d items immediately?"
 msgstr ""
 "µLªk±N±z©Ò¿ïªº¶µ¥Ø¤¤ªº %d ­Ó¶µ¥Ø²¾¨ì©U§£±í,\n"
 "±z­n¥ß¨è±N³o %d ­Ó¶µ¥Ø¥Ã¤[§R°£¶Ü ?"
 
-#: src/file-manager/fm-directory-view.c:2254
+#: src/file-manager/fm-directory-view.c:2769
 msgid "Delete Immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2255
-#: src/file-manager/fm-directory-view.c:2296
-msgid "Delete"
-msgstr "§R°£"
-
-#: src/file-manager/fm-directory-view.c:2285
+#: src/file-manager/fm-directory-view.c:2799
 #, fuzzy, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
+msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr "§A½T©w­n§â \"%s\" ¥Ã¤[§R°£¶Ü?"
 
-#: src/file-manager/fm-directory-view.c:2289
+#: src/file-manager/fm-directory-view.c:2803
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"trash?"
+"Trash?"
 msgstr "§A½T©w­n§â \"%s\" ¥Ã¤[§R°£¶Ü?"
 
-#: src/file-manager/fm-directory-view.c:2295
+#: src/file-manager/fm-directory-view.c:2809
 #, fuzzy
 msgid "Delete From Trash?"
 msgstr "±q _©U§£±í§R°£"
 
-#: src/file-manager/fm-directory-view.c:2551
-msgid "_Open"
-msgstr "¶}±Ò"
+#: src/file-manager/fm-directory-view.c:3108
+#: src/file-manager/fm-directory-view.c:3150
+#, fuzzy, c-format
+msgid "Use \"%s\" to open the selected item"
+msgstr "½Ð¿ï¾Ü¤@­Óµ{¦¡¨Ó¶}±Ò¤w¿ï¶µ¥Ø"
 
-#: src/file-manager/fm-directory-view.c:2554
-msgid "Open With"
-msgstr "¥H..¶}±Ò"
+#: src/file-manager/fm-directory-view.c:3232
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#, fuzzy
+msgid "Other _Application..."
+msgstr "¨ä¥LÀ³¥Îµ{¦¡..."
 
-#: src/file-manager/fm-directory-view.c:2557
-msgid "Other Application..."
+#: src/file-manager/fm-directory-view.c:3232
+#, fuzzy
+msgid "An _Application..."
 msgstr "¨ä¥LÀ³¥Îµ{¦¡..."
 
-#: src/file-manager/fm-directory-view.c:2559
-msgid "Other Viewer..."
+#: src/file-manager/fm-directory-view.c:3238
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#, fuzzy
+msgid "Other _Viewer..."
 msgstr "¨ä¥LÂsÄýµ{¦¡..."
 
-#: src/file-manager/fm-directory-view.c:2563
-msgid "Open in _New Window"
-msgstr "¥Î·sµøµ¡¶}±Ò"
+#: src/file-manager/fm-directory-view.c:3238
+#, fuzzy
+msgid "A _Viewer..."
+msgstr "¨ä¥LÂsÄýµ{¦¡..."
+
+#: src/file-manager/fm-directory-view.c:3451
+#, fuzzy, c-format
+msgid "Run \"%s\" on any selected items"
+msgstr "±N¤w¿ï¶µ¥Ø­«·s©R¦W"
+
+#: src/file-manager/fm-directory-view.c:3566
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2565
+#: src/file-manager/fm-directory-view.c:3569
+msgid "About Scripts"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3570
+msgid ""
+"All executable files in this folder will appear in the Scripts menu. "
+"Choosing a script from the menu will run that script.\n"
+"\n"
+"When executed from a local folder, scripts will be passed the selected file "
+"names. When executed from a remote folder (e.g. a folder showing web or ftp "
+"content), scripts will be passed no parameters.\n"
+"\n"
+"In all cases, the following environment variables will be set by Nautilus, "
+"which the scripts may use:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+"files (only if local)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+msgstr ""
+
+#. This shouldn't happen. If it does, get_scripts_directory was unable to
+#. * mkdir the scripts directory, and this case should be debugged.
+#.
+#: src/file-manager/fm-directory-view.c:3637
 #, c-format
-msgid "Open in %d _New Windows"
-msgstr "¥Î %d ­Ó·sµøµ¡¶}±Ò "
+msgid "Nautilus was unable to create the directory %s."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2577
-msgid "New Folder"
-msgstr "·s¤å¥ó"
+#: src/file-manager/fm-directory-view.c:3638
+msgid "No Scripts Folder"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3693
+#, c-format
+msgid "\"%s\" will be moved if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3697
+#, c-format
+msgid "\"%s\" will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3704
+#, fuzzy, c-format
+msgid ""
+"The %d selected items will be moved if you select the Paste Files command"
+msgstr ""
+"µLªk±N±z©Ò¿ïªº %d ­Ó¶µ¥Ø²¾¨ì©U§£±í,\n"
+"±z­n¥ß¨è¥Ã¤[§R°£¶Ü ? "
+
+#: src/file-manager/fm-directory-view.c:3708
+#, c-format
+msgid ""
+"The %d selected items will be copied if you select the Paste Files command"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3854
+msgid "There is nothing on the clipboard to paste."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:2581
+#: src/file-manager/fm-directory-view.c:3954
+#, fuzzy
+msgid "Open _in This Window"
+msgstr "¥Î·sµøµ¡¶}±Ò"
+
+#: src/file-manager/fm-directory-view.c:3957
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#, fuzzy
+msgid "Open _in New Window"
+msgstr "¥Î·sµøµ¡¶}±Ò"
+
+#: src/file-manager/fm-directory-view.c:3959
+#, fuzzy, c-format
+msgid "Open _in %d New Windows"
+msgstr "¥Î %d ­Ó·sµøµ¡¶}±Ò "
+
+#: src/file-manager/fm-directory-view.c:3977
 #, fuzzy
 msgid "Delete from _Trash..."
 msgstr "±q _©U§£±í§R°£"
 
-#: src/file-manager/fm-directory-view.c:2583
+#: src/file-manager/fm-directory-view.c:3977
 msgid "Delete from _Trash"
 msgstr "±q _©U§£±í§R°£"
 
-#: src/file-manager/fm-directory-view.c:2587
+#: src/file-manager/fm-directory-view.c:3979
+#, fuzzy
+msgid "Delete all selected items permanently"
+msgstr "§R°£¤w¿ï¶µ¥Ø"
+
+#: src/file-manager/fm-directory-view.c:3982
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 #, fuzzy
 msgid "Move to _Trash"
 msgstr "¥á¨ì _©U§£±í"
 
-#: src/file-manager/fm-directory-view.c:2590
-msgid "_Duplicate"
-msgstr "½Æ»s"
+#: src/file-manager/fm-directory-view.c:3984
+msgid "Move all selected items to the Trash"
+msgstr "±N¤w¿ï¶µ¥Ø¥á¨ì©U§£±í"
 
-#: src/file-manager/fm-directory-view.c:2594
-msgid "Create _Links"
-msgstr "«Ø¥ß _³sµ²"
+#: src/file-manager/fm-directory-view.c:4015
+#, fuzzy
+msgid "De_lete..."
+msgstr "§R°£..."
 
-#: src/file-manager/fm-directory-view.c:2596
-msgid "Create _Link"
+#: src/file-manager/fm-directory-view.c:4015
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#, fuzzy
+msgid "De_lete"
+msgstr "§R°£"
+
+#: src/file-manager/fm-directory-view.c:4038
+#, fuzzy
+msgid "Make _Links"
 msgstr "«Ø¥ß _³sµ²"
 
-#. No ellipses here because this command does not require further
-#. * information to be completed.
-#.
-#: src/file-manager/fm-directory-view.c:2603
-msgid "Show _Properties"
-msgstr "À˵ø°ÝÃD"
+#: src/file-manager/fm-directory-view.c:4039
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#, fuzzy
+msgid "Make _Link"
+msgstr "«Ø¥ß _³sµ²"
 
-#: src/file-manager/fm-directory-view.c:2607
+#: src/file-manager/fm-directory-view.c:4056
 #, fuzzy
 msgid "_Empty Trash..."
 msgstr "²M²z©U§£±í"
 
-#: src/file-manager/fm-directory-view.c:2609
+#: src/file-manager/fm-directory-view.c:4057
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Empty Trash"
 msgstr "²M²z©U§£±í"
 
-#: src/file-manager/fm-directory-view.c:2613
-#, fuzzy
-msgid "_Select All Files"
-msgstr "¥þ¿ï"
-
-#: src/file-manager/fm-directory-view.c:2617
+#: src/file-manager/fm-directory-view.c:4068
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "R_emove Custom Images"
 msgstr "§R°£¦Û­q¼v¹³"
 
-#: src/file-manager/fm-directory-view.c:2619
+#: src/file-manager/fm-directory-view.c:4069
 msgid "R_emove Custom Image"
 msgstr "§R°£¦Û­q¼v¹³"
 
-#: src/file-manager/fm-directory-view.c:2623
-msgid "Reset _Background"
-msgstr "­«³]­I´º"
-
-#: src/file-manager/fm-directory-view.c:2778
-msgid "Zoom In"
-msgstr "©ñ¤j"
+#: src/file-manager/fm-directory-view.c:4083
+#, fuzzy
+msgid "Cu_t File"
+msgstr "ÀÉ®×"
 
-#: src/file-manager/fm-directory-view.c:2780
-msgid "Zoom Out"
-msgstr "ÁY¤p"
+#: src/file-manager/fm-directory-view.c:4084
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Cu_t Files"
+msgstr "ÀÉ®×"
 
-#: src/file-manager/fm-directory-view.c:2782
+#: src/file-manager/fm-directory-view.c:4094
 #, fuzzy
-msgid "Normal Size"
-msgstr "¤@¯ë¿ï³æ"
+msgid "_Copy File"
+msgstr "½Æ»s¤å¥»"
 
-#: src/file-manager/fm-directory-view.c:2796
+#: src/file-manager/fm-directory-view.c:4095
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 #, fuzzy
-msgid "_New Folder"
-msgstr "·s¤å¥ó"
+msgid "_Copy Files"
+msgstr "½Æ»sÀɮפ¤"
 
-#: src/file-manager/fm-directory-view.c:2889
-#: src/file-manager/fm-directory-view.c:3153
-#, c-format
-msgid "%s Viewer"
-msgstr "¥Î %s "
+#: src/file-manager/fm-directory-view.c:4252
+msgid ""
+"This link can't be used, because it has no target. Do you want to put this "
+"link in the Trash?"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3182
-msgid "Move all selected items to the Trash"
-msgstr "±N¤w¿ï¶µ¥Ø¥á¨ì©U§£±í"
+#: src/file-manager/fm-directory-view.c:4255
+#, c-format
+msgid ""
+"This link can't be used, because its target \"%s\" doesn't exist. Do you "
+"want to put this link in the Trash?"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3191
+#: src/file-manager/fm-directory-view.c:4261
 #, fuzzy
-msgid "Delete all selected items permanently"
-msgstr "§R°£¤w¿ï¶µ¥Ø"
-
-#: src/file-manager/fm-directory-view.c:3214
-msgid "Choose a program with which to open the selected item"
-msgstr "½Ð¿ï¾Ü¤@­Óµ{¦¡¨Ó¶}±Ò¤w¿ï¶µ¥Ø"
+msgid "Broken Link"
+msgstr "«Ø¥ß _³sµ²"
 
-#: src/file-manager/fm-directory-view.c:3235
-msgid "Choose another application with which to open the selected item"
-msgstr "½Ð¿ï¾Ü¥t¤@­ÓÀ³¥Îµ{¦¡¨Ó¶}±Ò¤w¿ï¶µ¥Ø"
+#: src/file-manager/fm-directory-view.c:4262
+msgid "Throw Away"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3257
-msgid "Choose another viewer with which to view the selected item"
-msgstr "½Ð¿ï¾Ü¥t¤@­Óµ{¦¡¨ÓÂsÄý¤w¿ï¶µ¥Ø"
+#: src/file-manager/fm-directory-view.c:4315
+#, c-format
+msgid ""
+"\"%s\" is an executable text file. Do you want to run it, or display its "
+"contents?"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3281
-msgid "Create a new folder in this window"
-msgstr "¦b³o­Óµøµ¡¤¤¶}±Ò·s¤å¥ó"
+#: src/file-manager/fm-directory-view.c:4321
+#, fuzzy
+msgid "Run or Display?"
+msgstr "Åã¥Ü"
 
-#: src/file-manager/fm-directory-view.c:3289
-msgid "Open the selected item in this window"
-msgstr "¦b³o­Óµøµ¡¤¤¶}±Ò¤w¿ï¶µ¥Ø"
+#: src/file-manager/fm-directory-view.c:4322
+msgid "Run"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3297
-msgid "Open each selected item in a new window"
-msgstr "¥Î·sµøµ¡¶}±Ò¨C¤@­Ó¤w¿ï¶µ¥Ø"
+#: src/file-manager/fm-directory-view.c:4323
+#, fuzzy
+msgid "Display"
+msgstr "Åã¥Ü"
 
-#: src/file-manager/fm-directory-view.c:3312
-msgid "View or modify the properties of the selected items"
-msgstr "À˵ø©ÎªÌ­×§ï¤w¿ï¶µ¥Øªº©Ê½è"
+#: src/file-manager/fm-directory-view.c:4377
+msgid ""
+"Sorry, but you can't execute commands from a remote site due to security "
+"considerations."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3323
+#: src/file-manager/fm-directory-view.c:4379
 #, fuzzy
-msgid "Duplicate each selected item"
-msgstr "´_­ì©Ò¦³¤w¿ï¶µ¥Ø"
+msgid "Can't execute remote links"
+msgstr "µLªk¶}±Ò»·ºÝÀÉ®×"
+
+#: src/file-manager/fm-directory-view.c:4513
+#, fuzzy, c-format
+msgid "Opening \"%s\""
+msgstr "¥H %s ¦C¦L"
 
-#: src/file-manager/fm-directory-view.c:3331
+#: src/file-manager/fm-directory-view.c:4519
 #, fuzzy
-msgid "Create a symbolic link for each selected item"
-msgstr "§R°£¤w¿ï¶µ¥Ø"
+msgid "Cancel Open?"
+msgstr "¨ú®ø­«·s©R¦W?"
 
-#: src/file-manager/fm-directory-view.c:3345
-msgid "Delete all items in the trash"
-msgstr "²M²z©U§£±í"
+#: src/file-manager/fm-error-reporting.c:58
+#, fuzzy, c-format
+msgid ""
+"You do not have the permissions necessary to view the contents of \"%s\"."
+msgstr "±z¨S¦³ÂsÄý \"%s\" ªºÅv­­"
 
-#: src/file-manager/fm-directory-view.c:3353
-msgid "Select all items in this window"
-msgstr "¿ï¾Ü³o­Óµøµ¡¤¤ªº©Ò¦³¶µ¥Ø"
+#: src/file-manager/fm-error-reporting.c:62
+#, c-format
+msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3367
-msgid "Remove the custom image from each selected icon"
-msgstr "§R°£©Ò¦³¹Ï¥Üªº¦Û­q¼v¹³"
+#: src/file-manager/fm-error-reporting.c:69
+#, fuzzy, c-format
+msgid "Sorry, couldn't display all the contents of \"%s\"."
+msgstr "©êºp,µLªk§ïÅÜ \"%s\" ªº©Ò¦³ªÌ"
+
+#: src/file-manager/fm-error-reporting.c:72
+msgid "Error Displaying Folder"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3601
+#: src/file-manager/fm-error-reporting.c:103
+#, fuzzy, c-format
 msgid ""
-"This link can't be used, because it has no target. Do you want to put this "
-"link in the trash?"
+"The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
+"\"%s\" ³o­Ó¦WºÙ¦b³o­Ó¥Ø¿ý¤º¤w¸g¦s¦b\n"
+"½Ð¨Ï¥Î¥t¤@­Ó¦WºÙ"
 
-#: src/file-manager/fm-directory-view.c:3604
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to put this link in the trash?"
+"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3610
-#, fuzzy
-msgid "Broken Link"
-msgstr "«Ø¥ß _³sµ²"
+#: src/file-manager/fm-error-reporting.c:113
+#, fuzzy, c-format
+msgid "You do not have the permissions necessary to rename \"%s\"."
+msgstr "±z¨Ã¨S¦³­«·s©R¦W \"%s\" ªºÅv­­"
 
-#: src/file-manager/fm-directory-view.c:3611
-msgid "Throw Away"
+#: src/file-manager/fm-error-reporting.c:118
+#, fuzzy, c-format
+msgid ""
+"The name \"%s\" is not valid because it contains the character \"/\". Please "
+"use a different name."
 msgstr ""
+"\"%s\" ³o­Ó¦WºÙ¦b³o­Ó¥Ø¿ý¤º¤w¸g¦s¦b\n"
+"½Ð¨Ï¥Î¥t¤@­Ó¦WºÙ"
 
-#: src/file-manager/fm-error-reporting.c:50
+#: src/file-manager/fm-error-reporting.c:122
 #, fuzzy, c-format
-msgid ""
-"The name \"%s\" is already used in this folder.\n"
-"Please use a different name."
+msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr ""
 "\"%s\" ³o­Ó¦WºÙ¦b³o­Ó¥Ø¿ý¤º¤w¸g¦s¦b\n"
 "½Ð¨Ï¥Î¥t¤@­Ó¦WºÙ"
 
-#: src/file-manager/fm-error-reporting.c:55
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
-msgid "You do not have the permissions necessary to rename \"%s.\""
-msgstr "±z¨Ã¨S¦³­«·s©R¦W \"%s\" ªºÅv­­"
+msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
+msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:64
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "©êºp µLªk±N\"%s\" ­«·s©R¦W¬° \"%s\" "
 
-#: src/file-manager/fm-error-reporting.c:69
+#: src/file-manager/fm-error-reporting.c:144
 #, fuzzy
 msgid "Renaming Error"
 msgstr "±N %s §ïÅܦWºÙ¬° %s "
 
-#: src/file-manager/fm-error-reporting.c:85
+#: src/file-manager/fm-error-reporting.c:164
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "±z¨S¦³§ïÅÜ \"%s\" ¸s²ÕªºÅv­­"
 
-#: src/file-manager/fm-error-reporting.c:93
+#: src/file-manager/fm-error-reporting.c:168
+#, c-format
+msgid "Couldn't change the group of \"%s\" because it is on a read-only disk"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:176
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "©êºp,µLªk§ïÅÜ \"%s\" ªº¸s²Õ"
 
-#: src/file-manager/fm-error-reporting.c:97
+#: src/file-manager/fm-error-reporting.c:180
 msgid "Error Setting Group"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:115
+#: src/file-manager/fm-error-reporting.c:202
+#, c-format
+msgid "Couldn't change the owner of \"%s\" because it is on a read-only disk"
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:209
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "©êºp,µLªk§ïÅÜ \"%s\" ªº©Ò¦³ªÌ"
 
-#: src/file-manager/fm-error-reporting.c:119
+#: src/file-manager/fm-error-reporting.c:212
 msgid "Error Setting Owner"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:137
+#: src/file-manager/fm-error-reporting.c:234
+#, fuzzy, c-format
+msgid ""
+"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgstr "©êºp,µLªk§ïÅÜ \"%s\" ªºÅv­­"
+
+#: src/file-manager/fm-error-reporting.c:241
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "©êºp,µLªk§ïÅÜ \"%s\" ªºÅv­­"
 
-#: src/file-manager/fm-error-reporting.c:141
+#: src/file-manager/fm-error-reporting.c:244
 #, fuzzy
 msgid "Error Setting Permissions"
 msgstr "8¶i¦ì¨îÅv­­(-rxa--...)"
 
-#: src/file-manager/fm-error-reporting.c:214
-#, c-format
-msgid "Renaming %s to %s."
+#: src/file-manager/fm-error-reporting.c:310
+#, fuzzy, c-format
+msgid "Renaming \"%s\" to \"%s\"."
 msgstr "±N %s §ïÅܦWºÙ¬° %s "
 
-#: src/file-manager/fm-error-reporting.c:226
+#: src/file-manager/fm-error-reporting.c:315
 msgid "Cancel Rename?"
 msgstr "¨ú®ø­«·s©R¦W?"
 
-#: src/file-manager/fm-icon-text-window.c:75
+#: src/file-manager/fm-icon-text-window.c:77
 msgid "size"
 msgstr "¤j¤p"
 
-#: src/file-manager/fm-icon-text-window.c:76
+#: src/file-manager/fm-icon-text-window.c:78
 msgid "type"
 msgstr "®æ¦¡"
 
-#: src/file-manager/fm-icon-text-window.c:77
+#: src/file-manager/fm-icon-text-window.c:79
 msgid "date modified"
 msgstr "¤é´Á¤w­×§ï"
 
-#: src/file-manager/fm-icon-text-window.c:78
+#: src/file-manager/fm-icon-text-window.c:80
 msgid "date changed"
 msgstr "¤é´Á¤w§ïÅÜ"
 
-#: src/file-manager/fm-icon-text-window.c:79
+#: src/file-manager/fm-icon-text-window.c:81
 msgid "date accessed"
 msgstr "¤é´Á¤wµn¤J"
 
-#: src/file-manager/fm-icon-text-window.c:80
+#: src/file-manager/fm-icon-text-window.c:82
 msgid "owner"
 msgstr "©Ò¦³ªÌ"
 
-#: src/file-manager/fm-icon-text-window.c:81
+#: src/file-manager/fm-icon-text-window.c:83
 msgid "group"
 msgstr "¸s²Õ"
 
-#: src/file-manager/fm-icon-text-window.c:82
+#: src/file-manager/fm-icon-text-window.c:84
 msgid "permissions"
 msgstr "Åv­­"
 
-#: src/file-manager/fm-icon-text-window.c:83
+#: src/file-manager/fm-icon-text-window.c:85
 msgid "octal permissions"
 msgstr "8¶i¦ì¨îÅv­­(-rxa--...)"
 
-#: src/file-manager/fm-icon-text-window.c:84
+#: src/file-manager/fm-icon-text-window.c:86
 msgid "MIME type"
 msgstr "MIME ®æ¦¡"
 
-#: src/file-manager/fm-icon-text-window.c:85
+#: src/file-manager/fm-icon-text-window.c:87
 msgid "none"
 msgstr "ªÅ"
 
-#: src/file-manager/fm-icon-text-window.c:260
+#: src/file-manager/fm-icon-text-window.c:263
 #, fuzzy
 msgid "Icon Captions"
 msgstr "¹Ï¥Ü»¡©ú..."
 
-#: src/file-manager/fm-icon-text-window.c:267
+#: src/file-manager/fm-icon-text-window.c:271
 msgid ""
 "Choose the order for information to appear beneath icon names. More "
 "information appears as you zoom in closer."
 msgstr "½Ð¿ï¾Ü¹Ï¥Ü¤U¤èªº¸ê°Tªº«Y¼Æ·í±z©ñ¤j®É±N·|¦³§ó¦h°T®§"
 
-#: src/file-manager/fm-icon-view.c:137
+#: src/file-manager/fm-icon-view.c:168
 #, fuzzy
 msgid "by _Name"
 msgstr "¥H¦WºÙ±Æ¦C"
 
-#: src/file-manager/fm-icon-view.c:138
+#: src/file-manager/fm-icon-view.c:169
+#: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Keep icons sorted by name in rows"
 msgstr "«O«ù¥H¦WºÙ±Æ¦C¨C¤@¦æªº¹Ï¥Ü"
 
-#: src/file-manager/fm-icon-view.c:144
+#: src/file-manager/fm-icon-view.c:175
 #, fuzzy
 msgid "by _Size"
 msgstr "¥H¤j¤p±Æ¦C"
 
-#: src/file-manager/fm-icon-view.c:145
+#: src/file-manager/fm-icon-view.c:176
+#: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Keep icons sorted by size in rows"
 msgstr "«O«ù¥H¤j¤p±Æ¦C¨C¤@¦æ±o¹Ï¥Ü"
 
-#: src/file-manager/fm-icon-view.c:151
+#: src/file-manager/fm-icon-view.c:182
 #, fuzzy
 msgid "by _Type"
 msgstr "¥H®æ¦¡±Æ¦C"
 
-#: src/file-manager/fm-icon-view.c:152
+#: src/file-manager/fm-icon-view.c:183
+#: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Keep icons sorted by type in rows"
 msgstr "«O«ù¥H®æ¦¡±Æ¦C¨C¤@¦æªº¹Ï¥Ü"
 
-#: src/file-manager/fm-icon-view.c:158
+#: src/file-manager/fm-icon-view.c:189
 #, fuzzy
 msgid "by Modification _Date"
 msgstr "¥H­×§ï¤é´Á±Æ¦C"
 
-#: src/file-manager/fm-icon-view.c:159
+#: src/file-manager/fm-icon-view.c:190
+#: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Keep icons sorted by modification date in rows"
 msgstr "«O«ù¥H­×§ï¤é´Á±Æ¦C¨C¤@¦æªº¹Ï¥Ü"
 
-#: src/file-manager/fm-icon-view.c:165
+#: src/file-manager/fm-icon-view.c:196
 #, fuzzy
 msgid "by _Emblems"
 msgstr "¥H¹Ï³¹±Æ¦C"
 
-#: src/file-manager/fm-icon-view.c:166
+#: src/file-manager/fm-icon-view.c:197
+#: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by emblems in rows"
 msgstr "«O«ù¥H¹Ï³¹±Æ¦C¨C¤@¦æªº¹Ï¥Ü"
 
-#: src/file-manager/fm-icon-view.c:435
-msgid "_Stretch Icon"
-msgstr "©ñ¤j¹Ï¥Ü"
-
-#: src/file-manager/fm-icon-view.c:443
+#: src/file-manager/fm-icon-view.c:1241
+#: src/file-manager/nautilus-icon-view-ui.xml.h:39
 #, fuzzy
 msgid "_Restore Icons' Original Sizes"
 msgstr "±N¹Ï¥Ü¥H¥¼©ñ¤j«eªº¤j¤pÀx¦s"
 
-#: src/file-manager/fm-icon-view.c:445
+#: src/file-manager/fm-icon-view.c:1242
 #, fuzzy
 msgid "_Restore Icon's Original Size"
 msgstr "±N¹Ï¥Ü¥H¥¼©ñ¤j«eªº¤j¤pÀx¦s"
 
-#: src/file-manager/fm-icon-view.c:449
-msgid "_Icon Captions..."
-msgstr "¹Ï¥Ü»¡©ú..."
-
-#. Modify file name. We only allow this on a single file selection.
-#: src/file-manager/fm-icon-view.c:452
-msgid "_Rename"
-msgstr "­«·s©R¦W"
-
-#: src/file-manager/fm-icon-view.c:456
-msgid "_Clean Up by Name"
-msgstr "¨Ì·Ó¦WºÙ²M²z"
-
-#: src/file-manager/fm-icon-view.c:459
-msgid "_Use Tighter Layout"
-msgstr "¨Ï¥Î²«K®æ¦¡"
-
-#: src/file-manager/fm-icon-view.c:463
-msgid "Re_versed Order"
-msgstr ""
-
-#: src/file-manager/fm-icon-view.c:467
-#, fuzzy
-msgid "_Lay out items"
-msgstr "³W¹º"
-
-#: src/file-manager/fm-icon-view.c:470
-#, fuzzy
-msgid "_manually"
-msgstr "¤â°Ê"
-
-#: src/file-manager/fm-icon-view.c:1542
-msgid "Choose which information appears beneath each icon's name"
-msgstr "½Ð¿ï¾Ü­n¦b¹Ï¥Ü¤U¤è¥X²{ªº°T®§"
-
-#: src/file-manager/fm-icon-view.c:1548
-msgid "Make the selected icon stretchable"
-msgstr "±N¤w¿ï¹Ï¥Ü¥i¦ù®i¤Æ"
-
-#: src/file-manager/fm-icon-view.c:1554
-msgid "Restore each selected icon to its original size"
-msgstr "±N¨C­Ó¤w¿ï¹Ï¥Ü¥H­ì¤j¤pÀx¦s"
-
-#: src/file-manager/fm-icon-view.c:1571
-msgid "Choose an order for the icons in this folder"
-msgstr "¿ï¾Ü¦¹¨÷©v¤¤¹Ï¥Üªº±Æ¦C¤è¦¡"
-
-#: src/file-manager/fm-icon-view.c:1577
-msgid "Leave icons wherever they are dropped"
-msgstr "¯d¤U¤w©ñ±óªº¹Ï¥Ü"
-
-#: src/file-manager/fm-icon-view.c:1600
-msgid "Toggle using a tighter layout scheme"
-msgstr "¨Ï¥Î²«K®æ¦¡"
-
-#: src/file-manager/fm-icon-view.c:1607
-msgid "Display icons in the opposite order"
-msgstr ""
-
-#: src/file-manager/fm-icon-view.c:1616
-msgid "Reposition icons to better fit in the window and avoid overlapping"
-msgstr "¥H³Ì¨Î¤è¦¡±Æ¦C¹Ï¥Ü¥H§K¶W¥Xµøµ¡"
-
-#: src/file-manager/fm-icon-view.c:1625
-msgid "Rename selected item"
-msgstr "±N¤w¿ï¶µ¥Ø­«·s©R¦W"
-
-#: src/file-manager/fm-icon-view.c:1836
+#: src/file-manager/fm-icon-view.c:1489
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "¥H %s ¦C¦L"
 
-#: src/file-manager/fm-list-view.c:1763
-#: src/file-manager/fm-search-list-view.c:250
-#: src/nautilus-search-bar-criterion.c:69
+#: src/file-manager/fm-list-view.c:2188
+#: src/file-manager/fm-search-list-view.c:557
 msgid "Size"
 msgstr "¤j¤p"
 
-#: src/file-manager/fm-list-view.c:1769
-#: src/file-manager/fm-search-list-view.c:256
-#: src/nautilus-search-bar-criterion.c:68
+#: src/file-manager/fm-list-view.c:2194
+#: src/file-manager/fm-search-list-view.c:563
 msgid "Type"
 msgstr "®æ¦¡"
 
-#: src/file-manager/fm-list-view.c:1775
-#: src/file-manager/fm-search-list-view.c:262
+#: src/file-manager/fm-list-view.c:2200
+#: src/file-manager/fm-search-list-view.c:569
 msgid "Date Modified"
 msgstr "³Ì«á­×§ï¤é´Á"
 
-#: src/file-manager/fm-properties-window.c:458
+#: src/file-manager/fm-properties-window.c:522
 #, fuzzy, c-format
 msgid "%s Properties"
 msgstr "À˵ø°ÝÃD"
 
-#: src/file-manager/fm-properties-window.c:590
+#: src/file-manager/fm-properties-window.c:717
 msgid "Cancel Group Change?"
 msgstr "¨ú®ø§ïÅܸs²Õ?"
 
-#: src/file-manager/fm-properties-window.c:591
+#: src/file-manager/fm-properties-window.c:718
 msgid "Changing group"
 msgstr "§ïÅܸs²Õ¤¤"
 
-#: src/file-manager/fm-properties-window.c:736
+#: src/file-manager/fm-properties-window.c:879
 msgid "Cancel Owner Change?"
 msgstr "¨ú®ø§ïÅÜ©Ò¦³ªÌ?"
 
-#: src/file-manager/fm-properties-window.c:737
+#: src/file-manager/fm-properties-window.c:880
 msgid "Changing owner"
 msgstr "§ïÅÜ©Ò¦³ªÌ¤¤"
 
-#: src/file-manager/fm-properties-window.c:894
+#: src/file-manager/fm-properties-window.c:1063
 msgid "nothing"
 msgstr "¨S¨Æ"
 
-#: src/file-manager/fm-properties-window.c:896
+#: src/file-manager/fm-properties-window.c:1065
 msgid "unreadable"
 msgstr "µLªkŪ¨ú"
 
-#: src/file-manager/fm-properties-window.c:905
+#: src/file-manager/fm-properties-window.c:1074
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 ­Ó¶µ¥Ø,¤j¤p %s"
 
-#: src/file-manager/fm-properties-window.c:907
+#: src/file-manager/fm-properties-window.c:1076
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d ­Ó¶µ¥Ø,Á`¦@ %s"
 
-#: src/file-manager/fm-properties-window.c:913
+#: src/file-manager/fm-properties-window.c:1082
 msgid "(some contents unreadable)"
 msgstr "(¦³¨Ç¥Ø¿ýµLªkŪ¨ú)"
 
@@ -3377,116 +7632,335 @@ msgstr "(¦³¨Ç¥Ø¿ýµLªkŪ¨ú)"
 #. * "Contents:" title to line up with the first line of the 2-line value.
 #. * Maybe there's a better way to do this, but I couldn't think of one.
 #.
-#: src/file-manager/fm-properties-window.c:927
+#: src/file-manager/fm-properties-window.c:1096
 msgid "Contents:"
 msgstr "¥Ø¿ý:"
 
-#: src/file-manager/fm-properties-window.c:1081
+#: src/file-manager/fm-properties-window.c:1443
 msgid "Basic"
 msgstr "°ò¦"
 
-#: src/file-manager/fm-properties-window.c:1145
-msgid "Where:"
-msgstr "¥X³B:"
-
-#: src/file-manager/fm-properties-window.c:1147
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Type:"
 msgstr "®æ¦¡:"
 
-#: src/file-manager/fm-properties-window.c:1153
+#: src/file-manager/fm-properties-window.c:1527
 msgid "Size:"
 msgstr "¤j¤p:"
 
-#: src/file-manager/fm-properties-window.c:1156
+#: src/file-manager/fm-properties-window.c:1531
+#, fuzzy
+msgid "Link Target:"
+msgstr "³sµ²¶°¦X"
+
+#: src/file-manager/fm-properties-window.c:1534
+#, fuzzy
+msgid "MIME Type:"
+msgstr "MIME ®æ¦¡:"
+
+#: src/file-manager/fm-properties-window.c:1540
 msgid "Modified:"
 msgstr "­×§ï:"
 
-#: src/file-manager/fm-properties-window.c:1158
+#: src/file-manager/fm-properties-window.c:1543
 msgid "Accessed:"
 msgstr "©w¦ì:"
 
-#: src/file-manager/fm-properties-window.c:1161
-msgid "MIME type:"
-msgstr "MIME ®æ¦¡:"
-
-#: src/file-manager/fm-properties-window.c:1290
-msgid "Emblems"
-msgstr "¶H¼x"
+#: src/file-manager/fm-properties-window.c:1552
+msgid "Select Custom Icon..."
+msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1523
-msgid "Special Flags:"
-msgstr "¯S®íºX¼Ð:"
+#: src/file-manager/fm-properties-window.c:1558
+#, fuzzy
+msgid "Remove Custom Icon"
+msgstr "§R°£¦Û­q¼v¹³"
 
-#: src/file-manager/fm-properties-window.c:1527
+#: src/file-manager/fm-properties-window.c:1886
 msgid "Set User ID"
 msgstr "³]©w¨Ï¥ÎªÌ ID"
 
-#: src/file-manager/fm-properties-window.c:1531
+#: src/file-manager/fm-properties-window.c:1891
+msgid "Special Flags:"
+msgstr "¯S®íºX¼Ð:"
+
+#: src/file-manager/fm-properties-window.c:1894
 msgid "Set Group ID"
 msgstr "³]©w¸s²Õ ID"
 
-#: src/file-manager/fm-properties-window.c:1535
+#: src/file-manager/fm-properties-window.c:1896
 msgid "Sticky"
 msgstr "ÂHªþ"
 
-#: src/file-manager/fm-properties-window.c:1546
+#: src/file-manager/fm-properties-window.c:1922
 msgid "Permissions"
 msgstr "Åv­­"
 
-#: src/file-manager/fm-properties-window.c:1552
+#: src/file-manager/fm-properties-window.c:1928
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "±z¨Ã«D©Ò¦³¤H,±z¤£¯à§ïÅܳo¨ÇÅv­­"
 
-#: src/file-manager/fm-properties-window.c:1579
+#: src/file-manager/fm-properties-window.c:1941
 msgid "File Owner:"
 msgstr "ÀɮשҦ³ªÌ:"
 
-#: src/file-manager/fm-properties-window.c:1589
+#: src/file-manager/fm-properties-window.c:1950
 msgid "File Group:"
 msgstr "Àɮ׸s²Õ:"
 
-#: src/file-manager/fm-properties-window.c:1607
+#: src/file-manager/fm-properties-window.c:1968
 msgid "Owner:"
 msgstr "©Ò¦³ªÌ:"
 
-#: src/file-manager/fm-properties-window.c:1610
+#: src/file-manager/fm-properties-window.c:1969
 msgid "Group:"
 msgstr "¸s²Õ:"
 
-#: src/file-manager/fm-properties-window.c:1613
+#: src/file-manager/fm-properties-window.c:1970
 msgid "Others:"
 msgstr "¨ä¥L:"
 
-#: src/file-manager/fm-properties-window.c:1616
+#: src/file-manager/fm-properties-window.c:1989
+msgid "Read"
+msgstr "Ū¨ú"
+
+#: src/file-manager/fm-properties-window.c:1993
+msgid "Write"
+msgstr "¼g¤J"
+
+#: src/file-manager/fm-properties-window.c:1997
+msgid "Execute"
+msgstr "°õ¦æ"
+
+#: src/file-manager/fm-properties-window.c:2048
 msgid "Text View:"
 msgstr "¤å¥»ÂsÄý:"
 
-#: src/file-manager/fm-properties-window.c:1619
+#: src/file-manager/fm-properties-window.c:2049
 msgid "Number View:"
 msgstr "¼Æ¦rÂsÄý:"
 
-#: src/file-manager/fm-properties-window.c:1622
+#: src/file-manager/fm-properties-window.c:2050
 msgid "Last Changed:"
 msgstr "³Ì«á­×§ï:"
 
-#: src/file-manager/fm-properties-window.c:1626
-msgid "Read"
-msgstr "Ū¨ú"
+#: src/file-manager/fm-properties-window.c:2054
+#, c-format
+msgid "The permissions of \"%s\" could not be determined."
+msgstr "\"%s\" ªºÅv­­¤£¯à§R°£"
 
-#: src/file-manager/fm-properties-window.c:1630
-msgid "Write"
-msgstr "¼g¤J"
+#: src/file-manager/fm-properties-window.c:2334
+#, fuzzy
+msgid "Cancel Showing Properties Window?"
+msgstr "Åã¥ÜÄݩʵøµ¡ªº¯S®íºX¼Ð"
 
-#: src/file-manager/fm-properties-window.c:1634
-msgid "Execute"
-msgstr "°õ¦æ"
+#: src/file-manager/fm-properties-window.c:2335
+#, fuzzy
+msgid "Creating Properties window"
+msgstr "Åã¥ÜÄݩʵøµ¡ªº¯S®íºX¼Ð"
+
+#: src/file-manager/fm-properties-window.c:2435
+#, fuzzy
+msgid "Select an icon:"
+msgstr "½Ð¿ï¾Ü·sªºÃC¦â¨Ó¥[¤J :"
 
-#: src/file-manager/fm-properties-window.c:1696
+#: src/file-manager/fm-search-list-view.c:124
+#, fuzzy
+msgid "Search Results"
+msgstr "·j´M³]©w"
+
+#: src/file-manager/fm-search-list-view.c:142
 #, c-format
-msgid "The permissions of \"%s\" could not be determined."
-msgstr "\"%s\" ªºÅv­­¤£¯à§R°£"
+msgid ""
+"Search results may not include items modified after %s, when your drive was "
+"last indexed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:158
+msgid ""
+"Sorry, but the Medusa search service is not available because it is not "
+"installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:159
+#: src/file-manager/nautilus-indexing-info.c:407
+msgid "Search Service Not Available"
+msgstr ""
+
+#. FIXME bugzilla.eazel.com 5058: Should be two messages, one for each of whether
+#. "slow complete search" turned on or not
+#: src/file-manager/fm-search-list-view.c:184
+msgid ""
+"The search you have selected is newer than the index on your system.  The "
+"search will return no results right now.  Would you like to create a new "
+"index now?"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:189
+#, fuzzy
+msgid "Search for items that are too new"
+msgstr "¥u¥H¤å¦r·j´MÀÉ®×"
+
+#: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
+msgid "Create a new index"
+msgstr "»s³y·sµøµ¡"
+
+#: src/file-manager/fm-search-list-view.c:191
+msgid "Don't create index"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:200
+msgid ""
+"Every indexed file on your computer matches the criteria you selected. You "
+"can check the spelling on your selections or add more criteria to narrow "
+"your results."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:204
+#: src/file-manager/fm-search-list-view.c:218
+#, fuzzy
+msgid "Error during search"
+msgstr "½Æ»s¨ì©U§£±í®Éµo¥Í¿ù»~"
+
+#: src/file-manager/fm-search-list-view.c:213
+#, c-format
+msgid "An error occurred while loading this search's contents: %s"
+msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:241
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Find can't access your index right now so a slower search will be performed "
+"that doesn't use the index."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:246
+msgid ""
+"To do a content search, Find requires an index of the files on your system.  "
+"Find can't access your index right now. "
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast searches are not available"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:319
+#: src/file-manager/fm-search-list-view.c:338
+msgid "Content searches are not available"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:254
+msgid ""
+"Your index files are available but the Medusa search daemon, which handles "
+"index requests, isn't running.  To start this program, log in as root and "
+"enter this command at the command line: medusa-searchd"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:274
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Your computer does not have an index right now.  Because Find cannot use an "
+"index, this search may take several minutes.  Would you like to create an "
+"index? Creating an index will be done while you are not actively using your "
+"computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:283
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  Your computer does not have an index right now.  Would you like to "
+"create an index?  Creating an index will be done while you are not actively "
+"using your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:290
+#: src/file-manager/fm-search-list-view.c:318
+#: src/file-manager/fm-search-list-view.c:337
+msgid "Indexed searches are not available"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:294
+#, fuzzy
+msgid "Create an Index"
+msgstr "»s³y·sµøµ¡"
+
+#: src/file-manager/fm-search-list-view.c:295
+#, fuzzy
+msgid "Don't Create an Index Now"
+msgstr "»s³y·sµøµ¡"
+
+#: src/file-manager/fm-search-list-view.c:306
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  "
+"Your computer is currently creating that index.   Because Find cannot use an "
+"index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:312
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  Your computer is currently creating that index.  Content searches "
+"will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:326
+msgid ""
+"To do a fast search, Find requires an index of the files on your system.  An "
+"index can't be created right now. When an index is not available, searches "
+"will take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:332
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  An index can't be created right now."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:341
+msgid ""
+"The program that creates an index is not set up correctly.  You can create "
+"an index by hand by running \"medusa-indexd\" as root on the command line."
+msgstr ""
+
+#. It is not necessary to translate this text just yet; it has not been
+#. edited yet, and will be replaced by a final copy in a few days.
+#: src/file-manager/fm-search-list-view.c:360
+#: src/file-manager/nautilus-indexing-info.c:342
+msgid ""
+"To do a fast search, Find requires an index of the files on your system. "
+"Your system administrator has disabled fast search on your computer, so no "
+"index is available."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:364
+msgid "Fast searches are not available on your computer"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:373
+#: src/file-manager/nautilus-indexing-info.c:361
+msgid ""
+"To do a fast search, Find requires an index of the files on your system. "
+"Fast search is disabled in your Search preferences, so no index is available."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:376
+#: src/file-manager/nautilus-indexing-info.c:347
+#: src/file-manager/nautilus-indexing-info.c:365
+msgid "Fast searches are not available on your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:377
+#: src/file-manager/nautilus-indexing-info.c:366
+msgid ""
+"To enable fast search, open the Preferences menu and choose Preferences. "
+"Then select Search preferences and put a checkmark in the Enable Fast Search "
+"checkbox. An index will be generated while your computer is idle, so your "
+"index won't be available immediately."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:551
 #, fuzzy
 msgid "Where"
 msgstr "¥X³B:"
@@ -3496,7 +7970,8 @@ msgstr "¥X³B:"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:297
+#: src/file-manager/fm-search-list-view.c:603
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 #, fuzzy
 msgid "_Reveal in New Window"
 msgstr "¥Î·sµøµ¡¶}±Ò"
@@ -3507,129 +7982,614 @@ msgstr "¥Î·sµøµ¡¶}±Ò"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:305
+#: src/file-manager/fm-search-list-view.c:611
 #, fuzzy, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "¥Î %d ­Ó·sµøµ¡¶}±Ò "
 
-#: src/file-manager/fm-search-list-view.c:451
-#: src/file-manager/nautilus-indexing-info.c:282
-msgid "Indexing Info..."
-msgstr "±Æ§Ç¸ê°T..."
+#. Note that the number of items actually displayed varies somewhat due
+#. * to the way files are collected in batches. So you can't assume that
+#. * no more than the constant limit are displayed.
+#.
+#: src/file-manager/fm-search-list-view.c:723
+msgid ""
+"Nautilus found more search results than it can display. Some matching items "
+"will not be displayed. "
+msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:452
-msgid "Show indexing info dialog"
-msgstr "Åã¥Ü±Æ§Ç¸ê°T¹ï¸Üµøµ¡"
+#: src/file-manager/fm-search-list-view.c:725
+msgid "Too Many Matches"
+msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:464
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:1
 #, fuzzy
-msgid "Reveal each selected item in its original folder"
+msgid "Change Desktop Background"
+msgstr "­«³]­I´º"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#, fuzzy
+msgid "Delete all items in the Trash"
+msgstr "²M²z©U§£±í"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
+msgid "Disks"
+msgstr "ºÏºÐ"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:5
+msgid "Mount or unmount disks"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:6
+msgid "New Terminal"
+msgstr "·sªº²×ºÝ¾÷"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:7
+#, fuzzy
+msgid "Open a new GNOME terminal window"
+msgstr "¥Î·sµøµ¡¶}±Ò¨C¤@­Ó¤w¿ï¶µ¥Ø"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:8
+msgid "Remove any custom pattern or color from the desktop background"
+msgstr ""
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
+#, fuzzy
+msgid "Reset Desktop Background"
+msgstr "­«³]­I´º"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:10
+msgid ""
+"Show a window that lets you set your desktop background's pattern or color"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:1
+msgid "Choose a program with which to open the selected item"
+msgstr "½Ð¿ï¾Ü¤@­Óµ{¦¡¨Ó¶}±Ò¤w¿ï¶µ¥Ø"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:2
+msgid "Choose another application with which to open the selected item"
+msgstr "½Ð¿ï¾Ü¥t¤@­ÓÀ³¥Îµ{¦¡¨Ó¶}±Ò¤w¿ï¶µ¥Ø"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:3
+msgid "Choose another viewer with which to view the selected item"
+msgstr "½Ð¿ï¾Ü¥t¤@­Óµ{¦¡¨ÓÂsÄý¤w¿ï¶µ¥Ø"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:4
+#, fuzzy
+msgid "Copy Files"
+msgstr "½Æ»sÀɮפ¤"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:5
+#, fuzzy
+msgid "Create a new empty folder inside this folder"
+msgstr "¦b³o­Óµøµ¡¤¤¶}±Ò·s¤å¥ó"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#, fuzzy
+msgid "Create a symbolic link for each selected item"
+msgstr "§R°£¤w¿ï¶µ¥Ø"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#, fuzzy
+msgid "Cut Files"
+msgstr "%u ­ÓÀÉ®×"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#, fuzzy
+msgid "Delete each selected item, without moving to the Trash"
+msgstr "±N¤w¿ï¶µ¥Ø¥á¨ì©U§£±í"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#, fuzzy
+msgid "Duplicate"
+msgstr "½Æ»s"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#, fuzzy
+msgid "Duplicate each selected item"
+msgstr "´_­ì©Ò¦³¤w¿ï¶µ¥Ø"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#, fuzzy
+msgid "Make Link"
+msgstr "«Ø¥ß _³sµ²"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#, fuzzy
+msgid "Move each selected item to the Trash"
+msgstr "±N¤w¿ï¶µ¥Ø¥á¨ì©U§£±í"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid ""
+"Move or copy files previously selected by a Cut Files or Copy Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#, fuzzy
+msgid "Move to Trash"
+msgstr "¥á¨ì _©U§£±í"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+msgid "New Folder"
+msgstr "·s¤å¥ó"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#, fuzzy
+msgid "Open"
+msgstr "¶}±Ò"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#, fuzzy
+msgid "Open Wit_h"
+msgstr "¥H..¶}±Ò"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "Open With"
+msgstr "¥H..¶}±Ò"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+msgid "Open each selected item in a new window"
+msgstr "¥Î·sµøµ¡¶}±Ò¨C¤@­Ó¤w¿ï¶µ¥Ø"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#, fuzzy
+msgid "Open in New Window"
+msgstr "¥Î·sµøµ¡¶}±Ò"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+msgid "Open the selected item in this window"
+msgstr "¦b³o­Óµøµ¡¤¤¶}±Ò¤w¿ï¶µ¥Ø"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+msgid "Other Application..."
+msgstr "¨ä¥LÀ³¥Îµ{¦¡..."
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+msgid "Other Viewer..."
+msgstr "¨ä¥LÂsÄýµ{¦¡..."
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#, fuzzy
+msgid "Paste Files"
+msgstr "¯Â¤å¦rÀÉ®×"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Prepare the selected files to be copied with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+msgid "Prepare the selected files to be moved with a Paste Files command"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#, fuzzy
+msgid "Remove Custom Images"
+msgstr "§R°£¦Û­q¼v¹³"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#, fuzzy
+msgid "Remove any custom images from selected icons"
+msgstr "§R°£©Ò¦³¹Ï¥Üªº¦Û­q¼v¹³"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+msgid "Remove any custom pattern or color from the background of this location"
+msgstr ""
+
+#. add the reset background item, possibly disabled
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/nautilus-sidebar.c:525
+msgid "Reset Background"
+msgstr "­«³]­I´º"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+msgid "Run or manage scripts from ~/Nautilus/scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+msgid "Scripts"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#, fuzzy
+msgid "Select All Files"
+msgstr "¥þ¿ï"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#, fuzzy
+msgid "Select _All Files"
+msgstr "¥þ¿ï"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+msgid "Select all items in this window"
+msgstr "¿ï¾Ü³o­Óµøµ¡¤¤ªº©Ò¦³¶µ¥Ø"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#, fuzzy
+msgid "Show Properties"
+msgstr "À˵ø°ÝÃD"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#, fuzzy
+msgid "Show Trash"
+msgstr "¤u¨ã¦C"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+msgid "Show _Properties"
+msgstr "À˵ø°ÝÃD"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#, fuzzy
+msgid "Show the contents of the Trash"
+msgstr "¥H¥¿±`¤j¤pÅã¥Ü"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+msgid "Show the folder containing the scripts that appear in this menu"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "View or modify the properties of each selected item"
+msgstr "À˵ø©ÎªÌ­×§ï¤w¿ï¶µ¥Øªº©Ê½è"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+msgid "_Duplicate"
+msgstr "½Æ»s"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#, fuzzy
+msgid "_New Folder"
+msgstr "·s¤å¥ó"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+msgid "_Open"
+msgstr "¶}±Ò"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+msgid "_Open Scripts Folder"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#, fuzzy
+msgid "_Paste Files"
+msgstr "¶K¤W¤å¥»"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
+#, fuzzy
+msgid "_Show Trash"
+msgstr "²M²z©U§£±í"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:1
+#, fuzzy
+msgid "By Emblems"
+msgstr "¥H¹Ï³¹±Æ¦C"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:2
+#, fuzzy
+msgid "By Modification Date"
+msgstr "¥H­×§ï¤é´Á±Æ¦C"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:3
+#, fuzzy
+msgid "By Modification _Date"
+msgstr "¥H­×§ï¤é´Á±Æ¦C"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:4
+#, fuzzy
+msgid "By Name"
+msgstr "¥H¦WºÙ±Æ¦C"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:5
+#, fuzzy
+msgid "By Size"
+msgstr "¥H¤j¤p±Æ¦C"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:6
+#, fuzzy
+msgid "By Type"
+msgstr "¥H®æ¦¡±Æ¦C"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:7
+#, fuzzy
+msgid "By _Emblems"
+msgstr "¥H¹Ï³¹±Æ¦C"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:8
+#, fuzzy
+msgid "By _Name"
+msgstr "¥H¦WºÙ±Æ¦C"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:9
+#, fuzzy
+msgid "By _Size"
+msgstr "¥H¤j¤p±Æ¦C"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:10
+#, fuzzy
+msgid "By _Type"
+msgstr "¥H®æ¦¡±Æ¦C"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:11
+msgid "Choose which information appears beneath each icon's name"
+msgstr "½Ð¿ï¾Ü­n¦b¹Ï¥Ü¤U¤è¥X²{ªº°T®§"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:12
+#, fuzzy
+msgid "Clean Up by Name"
+msgstr "¨Ì·Ó¦WºÙ²M²z"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:13
+msgid "Display icons in the opposite order"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:14
+#, fuzzy
+msgid "Icon Captions..."
+msgstr "¹Ï¥Ü»¡©ú..."
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:20
+#, fuzzy
+msgid "Lay Out Items"
+msgstr "³W¹º"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:21
+msgid "Leave icons wherever they are dropped"
+msgstr "¯d¤U¤w©ñ±óªº¹Ï¥Ü"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:22
+msgid "Make the selected icon stretchable"
+msgstr "±N¤w¿ï¹Ï¥Ü¥i¦ù®i¤Æ"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:23
+#, fuzzy
+msgid "Manually"
+msgstr "»¡©ú"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:24
+msgid "Re_versed Order"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:26
+#, fuzzy
+msgid "Rename selected icon"
+msgstr "±N¤w¿ï¶µ¥Ø­«·s©R¦W"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:27
+msgid "Reposition icons to better fit in the window and avoid overlapping"
+msgstr "¥H³Ì¨Î¤è¦¡±Æ¦C¹Ï¥Ü¥H§K¶W¥Xµøµ¡"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:28
+#, fuzzy
+msgid "Restore Icons' Original Sizes"
+msgstr "±N¹Ï¥Ü¥H¥¼©ñ¤j«eªº¤j¤pÀx¦s"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:29
+msgid "Restore each selected icon to its original size"
 msgstr "±N¨C­Ó¤w¿ï¹Ï¥Ü¥H­ì¤j¤pÀx¦s"
 
-#: src/file-manager/nautilus-indexing-info.c:106
-msgid "Busy"
+#: src/file-manager/nautilus-icon-view-ui.xml.h:30
+msgid "Reversed Order"
+msgstr ""
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:31
+#, fuzzy
+msgid "Stretch Icon"
+msgstr "©ñ¤j¹Ï¥Ü"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:32
+#, fuzzy
+msgid "Tighter Layout"
+msgstr "¨Ï¥Î²«K®æ¦¡"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:33
+msgid "Toggle using a tighter layout scheme"
+msgstr "¨Ï¥Î²«K®æ¦¡"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:34
+msgid "_Clean Up by Name"
+msgstr "¨Ì·Ó¦WºÙ²M²z"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:35
+msgid "_Icon Captions..."
+msgstr "¹Ï¥Ü»¡©ú..."
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:36
+#, fuzzy
+msgid "_Lay Out Items"
+msgstr "³W¹º"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:37
+#, fuzzy
+msgid "_Manually"
+msgstr "¤â°Ê"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:38
+msgid "_Rename"
+msgstr "­«·s©R¦W"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:40
+msgid "_Stretch Icon"
+msgstr "©ñ¤j¹Ï¥Ü"
+
+#: src/file-manager/nautilus-icon-view-ui.xml.h:41
+#, fuzzy
+msgid "_Tighter Layout"
+msgstr "¨Ï¥Î²«K®æ¦¡"
+
+#: src/file-manager/nautilus-indexing-info.c:85
+msgid "Indexing is %d%% complete."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:109
-msgid "No response"
+#: src/file-manager/nautilus-indexing-info.c:175
+msgid "The indexer is currently busy."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:112
-msgid "No indexer present"
+#: src/file-manager/nautilus-indexing-info.c:180
+msgid ""
+"An indexer is not running, or is not responding to requests to reindex your "
+"computer."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:120
-#, fuzzy, c-format
-msgid "Error while trying to reindex: %s"
-msgstr "%s ªº¯Á¤Þ·j´M¿ù»~"
+#: src/file-manager/nautilus-indexing-info.c:185
+msgid ""
+"An attempt to reindex, caused an Internal Indexer Error.  Tell "
+"rebecka@eazel.com"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:163
-msgid "%I:%M %p, %x"
+#: src/file-manager/nautilus-indexing-info.c:194
+#, fuzzy
+msgid "Reindexing Failed"
+msgstr "²¾°£¥¢±Ñ"
+
+#: src/file-manager/nautilus-indexing-info.c:216
+msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast. If you need to update your index now, click on the \"Update Now\" "
+"button."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:179
+#: src/file-manager/nautilus-indexing-info.c:219
+#: src/file-manager/nautilus-indexing-info.c:226
+#: src/file-manager/nautilus-indexing-info.c:281
+#, fuzzy
+msgid "Indexing Status"
+msgstr "ª¬ºA¦C"
+
+#. FIXME: Do we want to talk about the index not being available?
+#: src/file-manager/nautilus-indexing-info.c:224
+msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast. "
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:236
 #, c-format
 msgid "Your files were last indexed at %s"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:190
+#: src/file-manager/nautilus-indexing-info.c:249
 #, fuzzy
 msgid "Update Now"
 msgstr "¤É¯Å"
 
-#: src/file-manager/nautilus-indexing-info.c:210
-msgid "Your files are currently being indexed:"
+#: src/file-manager/nautilus-indexing-info.c:279
+msgid ""
+"Once a day your files and text content are indexed so your searches are "
+"fast.  Your files are currently being indexed."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:270
-msgid "Search service not available"
+#: src/file-manager/nautilus-indexing-info.c:406
+msgid "Sorry, but the medusa search service is not available."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:295
-msgid ""
-"Once a day your files and text content are indexed so\n"
-"your searches are fast.  If you need to update your index\n"
-"now, click on the \"Update Now\" button for the\n"
-"appropriate index.\n"
+#: src/file-manager/nautilus-indexing-info.c:428
+msgid "%I:%M %p, %x"
 msgstr ""
 
-#. set the window title
-#: src/nautilus-about.c:142
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:1
 #, fuzzy
-msgid "About Nautilus"
-msgstr "¦³Ãö Nautilus..."
+msgid "Reveal each selected item in its original folder"
+msgstr "±N¨C­Ó¤w¿ï¹Ï¥Ü¥H­ì¤j¤pÀx¦s"
 
-#: src/nautilus-application.c:217
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:2
 #, fuzzy
-msgid "User Directory"
-msgstr "¥Ø¿ý"
+msgid "Reveal in New Window"
+msgstr "¥Î·sµøµ¡¶}±Ò"
 
-#: src/nautilus-application.c:222
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:3
 #, fuzzy
-msgid "User Main Directory"
-msgstr "¥Ø¿ý"
+msgid "Show Indexing Status"
+msgstr "ª¬ºA¦C"
 
-#: src/nautilus-application.c:227
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:4
 #, fuzzy
-msgid "Desktop Directory"
-msgstr "¥Ø¿ý"
+msgid "Show _Indexing Status"
+msgstr "ª¬ºA¦C"
 
-#: src/nautilus-application.c:242
+#: src/file-manager/nautilus-search-list-view-ui.xml.h:5
+msgid "Show status of indexing used when searching"
+msgstr ""
+
+#. set the window title and standard close key accelerator
+#: src/nautilus-about.c:141
+#, fuzzy
+msgid "About Nautilus"
+msgstr "¦³Ãö Nautilus..."
+
+#. draw the authors title
+#: src/nautilus-about.c:361
+msgid "Authors"
+msgstr ""
+
+#: src/nautilus-application.c:275
+#, fuzzy
+msgid "Couldn't Create Required Folder"
+msgstr "µLªk¶i¦æHTTP½Ð¨D!"
+
+#: src/nautilus-application.c:276
+#, c-format
+msgid ""
+"Nautilus could not create the required folder \"%s\". Before running "
+"Nautilus, please create this folder, or set permissions such that Nautilus "
+"can create it."
+msgstr ""
+
+#: src/nautilus-application.c:281
 #, fuzzy
-msgid "Missing Directories"
-msgstr "0 ­Ó¥Ø¿ý"
+msgid "Couldn't Create Required Folders"
+msgstr "µLªk«Ø¥ßÂI°}¹ÏÀÉ®×±qÀÉ®×: %s "
+
+#: src/nautilus-application.c:282
+#, c-format
+msgid ""
+"Nautilus could not create the following required folders:\n"
+"\n"
+"%s\n"
+"\n"
+"Before running Nautilus, please create these folders, or set permissions "
+"such that Nautilus can create them."
+msgstr ""
 
 #. Can't register myself due to trouble locating the
-#. * nautilus.oafinfo file. This has happened when you
+#. * Nautilus_Shell.oaf file. This has happened when you
 #. * launch Nautilus with an LD_LIBRARY_PATH that
 #. * doesn't include the directory containg the oaf
 #. * library. It could also happen if the
-#. * nautilus.oafinfo file was not present for some
+#. * Nautilus_Shell.oaf file was not present for some
 #. * reason. Sometimes killing oafd and gconfd fixes
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:338
+#: src/nautilus-application.c:407
 msgid ""
-"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
-"again may fix the problem."
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again."
 msgstr ""
-"Nautilus ²{¦bµLªk¨Ï¥Î,­«·s¶}¾÷©ÎªÌ­«·s¦w¸Ë Nautilis ©Î³\\¥i¥H¸Ñ¨M³o­Ó°ÝÃD."
 
 #. FIXME bugzilla.eazel.com 2536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:342
+#: src/nautilus-application.c:413
+#, fuzzy
 msgid ""
-"Nautilus can't be used now. Rebooting the computer or installing Nautilus "
-"again may fix the problem.\n"
+"Nautilus can't be used now. Running the command \"nautilus-clean.sh -x\" "
+"from the console may fix the problem. If not, you can try rebooting the "
+"computer or installing Nautilus again.\n"
+"\n"
+"OAF couldn't locate the Nautilus_shell.oaf file. One cause of this seems to "
+"be an LD_LIBRARY_PATH that does not include the oaf library's directory. "
+"Another possible cause would be bad install with a missing "
+"Nautilus_Shell.oaf file.\n"
 "\n"
-"OAF couldn't locate the nautilus.oafinfo file. One cause of this seems to be "
-"an LD_LIBRARY_PATH that does not include the oaf library's directory. "
-"Another possible cause would be bad install with a missing nautilus.oafinfo "
-"file.\n"
+"Running \"nautilus-clean.sh -x\" will kill all OAF and GConf processes, "
+"which may be needed by other applications.\n"
 "\n"
 "Sometimes killing oafd and gconfd fixes the problem, but we don't know why.\n"
 "\n"
-"We need a much less confusing message here for Nautilus 1.0."
+"We have also seen this error when a faulty version of oaf was installed."
 msgstr ""
 "Nautilus ²{¦bµLªk¨Ï¥Î,­«·s¶}¾÷©ÎªÌ­«·s¦w¸Ë Nautilus ©Î³\\¥i¥H¸Ñ¨M³o­Ó°ÝÃD.\n"
 "\n"
@@ -3648,25 +8608,37 @@ msgstr ""
 #. * wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:367 src/nautilus-application.c:385
+#: src/nautilus-application.c:444 src/nautilus-application.c:462
+#: src/nautilus-application.c:469
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "¦]¬°¥¼ª¾¿ù»~,±z²{¦bµLªk¨Ï¥Î Nautilus "
 
-#: src/nautilus-application.c:368
+#: src/nautilus-application.c:445
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
 "attempting to register the file manager view server."
 msgstr " OAF «ü¦VÀÉ®×ÂsÄý¦øªA¾¹®Éµo¥Í¥¼ª¾¿ù»~±z²{¦b±NµLªk¨Ï¥Î Nautilus "
 
-#: src/nautilus-application.c:386
+#: src/nautilus-application.c:463
+#, fuzzy
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from OAF when "
-"attempting to locate the factory."
+"attempting to locate the factory.Killing oafd and restarting Nautilus may "
+"help fix the problem."
 msgstr " OAF «ü¦V¸ô®|®Éµo¥Í¥¼ª¾¿ù»~©O²{¦b±NµLªk¨Ï¥Î Nautilus "
 
-#: src/nautilus-application.c:527
+#: src/nautilus-application.c:470
+#, fuzzy
 msgid ""
-"You are running Nautilus as root.\n"
+"Nautilus can't be used now, due to an unexpected error from OAF when "
+"attempting to locate the shell object. Killing oafd and restarting Nautilus "
+"may help fix the problem."
+msgstr " OAF «ü¦V¸ô®|®Éµo¥Í¥¼ª¾¿ù»~©O²{¦b±NµLªk¨Ï¥Î Nautilus "
+
+#: src/nautilus-application.c:635
+#, fuzzy
+msgid ""
+"You are about to run Nautilus as root.\n"
 "\n"
 "As root, you can damage your system if you are not careful, and\n"
 "Nautilus will not stop you from doing it."
@@ -3676,29 +8648,40 @@ msgstr ""
 "§@¬°¨t²ÎºÞ²zªÌ,±z¥i¯à¦]¬°¤@¨Ç²¨©¿¦Ó·´·l¨t²Î,\n"
 "Nautilus ±Nĵ§i±z¨Ã¾¨¶qÁקK³o¨Ç±¡ªpµo¥Í."
 
-#: src/nautilus-bookmarks-window.c:133
+#: src/nautilus-bookmarks-window.c:127
 #, fuzzy
 msgid "Bookmarks"
 msgstr "®ÑÅÒ"
 
-#: src/nautilus-bookmarks-window.c:182
+#: src/nautilus-bookmarks-window.c:177
 msgid "Location"
 msgstr "¦ì¸m"
 
-#: src/nautilus-bookmarks-window.c:195 src/nautilus-window-menus.c:794
+#: src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:794
 msgid "Remove"
 msgstr "§R°£"
 
-#: src/nautilus-bookmarks-window.c:200
-msgid "Include built-in bookmarks in menu"
-msgstr "±N¤º«Ø®ÑÅÒ¥[¤J¿ï³æ¤º"
+#: src/nautilus-complex-search-bar.c:233
+#, fuzzy
+msgid "More Options"
+msgstr "¹Ï¥Ü»¡©ú..."
+
+#: src/nautilus-complex-search-bar.c:243
+msgid "Fewer Options"
+msgstr ""
+
+#. Create button first so we can use it for auto_click
+#: src/nautilus-complex-search-bar.c:261 src/nautilus-simple-search-bar.c:129
+msgid "Find Them!"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:112
+#: src/nautilus-first-time-druid.c:191
+#, fuzzy
 msgid ""
-"Existence of this file indicates that the Nautilus configuration wizard\n"
+"Existence of this file indicates that the Nautilus configuration druid\n"
 "has been presented.\n"
 "\n"
-"You can manually erase this file to present the wizard again.\n"
+"You can manually erase this file to present the druid again.\n"
 "\n"
 msgstr ""
 "³o­ÓÀɮתº¦s¦bªí¥Ü±z¤w¸g¨Ï¥Î¹LNautilus¦w¸ËºëÆF¤F;\n"
@@ -3706,577 +8689,1264 @@ msgstr ""
 "±z¥i¥H¤â°Ê§R°£³o­ÓÀÉ®×¥H­Ú­«·s¨Ï¥Î¦w¸ËºëÆF\n"
 "\n"
 
-#: src/nautilus-first-time-druid.c:348
+#: src/nautilus-first-time-druid.c:487
 #, fuzzy
 msgid ""
-"User levels provide a way to adjust the software to\n"
-"your level of technical expertise.  Pick an initial level that you\n"
-"feel comfortable with; you can always change it later."
+"Your user level adjusts Nautilus to your degree of experience\n"
+"using GNOME and Linux. Choose a level that's comfortable for\n"
+"you - you can always change it later."
 msgstr ""
 "¨Ï¥ÎªÌµ¥¯Å´£¨Ñ±z§ä¥X±zªº§Þ³N¯à¤Oµ{«×,\n"
 "½Ð¿ï¥X¾A¦X±zªºµ¥¯Å,\n"
 "±zÀH®É¥i¥H§ïÅܳo¶µ³]©w."
 
-#: src/nautilus-first-time-druid.c:358
+#: src/nautilus-first-time-druid.c:498
 msgid ""
-"For beginner users that are not yet\n"
-"familiar with the working of GNOME and Linux."
-msgstr "¬°Linux¤ÎGNOMEªº·s¤âªÌ"
+"For users who have no previous experience with GNOME\n"
+"and Linux."
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:365
+#: src/nautilus-first-time-druid.c:504
 #, fuzzy
 msgid ""
-"For non-technical users that are comfortable with\n"
-"their GNOME and Linux environment."
+"For users who are comfortable with GNOME and Linux,\n"
+"but don't describe themselves as ``technical.''"
 msgstr "¬°«Dlinux¤ÎGNOMEªº±M®aªÌ"
 
-#: src/nautilus-first-time-druid.c:371
+#: src/nautilus-first-time-druid.c:510
 #, fuzzy
 msgid ""
-"For users that have the need to be exposed\n"
-"to every detail of their operating system."
+"For users who have GNOME and Linux experience, and\n"
+"like to see every detail of the operating system."
 msgstr "¬°¤p¤ß¥J²Óªº¨t²Î¼ô¤âªÌ"
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:406
+#: src/nautilus-first-time-druid.c:548
+msgid ""
+"To verify your Internet connection and make sure you have\n"
+"the latest Nautilus updates, Nautilus will now connect to\n"
+"Eazel's web site. This will take seconds if your copy of\n"
+"Nautilus is recent; longer (but no more than a minute or two)\n"
+"if you need an update.\n"
+"\n"
+"If you know your computer uses a proxy connection, click\n"
+"Verify and Nautilus will use it.\n"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:562
 #, fuzzy
+msgid "Verify my connection and check for updates"
+msgstr "¬O,¥ß¨è³sµ²ºô¯¸À°§Ú¤É¯Å"
+
+#: src/nautilus-first-time-druid.c:563
+msgid "Don't verify my connection or check for updates"
+msgstr ""
+
+#: src/nautilus-first-time-druid.c:628
 msgid ""
-"Eazel offers a growing number of services to \n"
-"help you install and maintain new software and manage \n"
-"your files across the network.  If you want to find out more \n"
-"about Eazel services, just press the 'Next' button. "
+"We are having trouble making an external web connection.\n"
+"Sometimes, firewalls require you to specify a web proxy server.\n"
+"Fill in the name or port of your proxy server, if any, below."
 msgstr ""
-" Eazel ´£¨Ñ§ó¦hªº¸óºô¸ôªº³nÅé¦w¸Ë¤Î¨Ï¥ÎªA°È.\n"
-"¦pªG±z·Qª¾¹D§ó¦h¦³ÃöEazelªºªA°È¸ê°T,\n"
-"½Ð«ö¤U'¤U¤@¨B'"
 
-#: src/nautilus-first-time-druid.c:410
-msgid "Eazel Services"
-msgstr "Eazel ªA°È"
+#: src/nautilus-first-time-druid.c:640
+msgid "No proxy server required."
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:418
-msgid "I want to learn more about Eazel services."
-msgstr "§Ú·Qª¾¹D§ó¦hªº Eazel ªºªA°È¸ê°T."
+#: src/nautilus-first-time-druid.c:641
+msgid "Use this proxy server:"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:419
-msgid "I want to sign up for Eazel services now."
-msgstr "§Ú·Q¥ß§Y¨ú±oEazelªºªA°È."
+#. allocate the proxy label, followed by the entry
+#: src/nautilus-first-time-druid.c:666
+msgid "Proxy address:"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:420
-msgid "I've already signed up and want to login now."
-msgstr "§Ú¤w¸gµù¥U¦Ó¥B·Q¥ß¨èµn¤J"
+#: src/nautilus-first-time-druid.c:728
+msgid "Verifying your Internet connection and checking for updates..."
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:421
+#: src/nautilus-first-time-druid.c:736
 #, fuzzy
-msgid "I don't want to learn about Eazel services at this time."
-msgstr "§Ú²{¦b¤£·Q¨ú±oEazelªºªA°È."
+msgid "Downloading Nautilus updates..."
+msgstr "¤U¸ü %s ¤¤..."
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:448
-#, fuzzy
+#: src/nautilus-first-time-druid.c:906
 msgid ""
-"Nautilus will now contact Eazel services to verify your \n"
-"web connection and download the latest updates.  \n"
-"Click the Next button to continue."
+"If you have been using the GNOME Midnight Commander\n"
+"these settings move your desktop icons to Nautilus and\n"
+"make Nautilus the default desktop.\n"
 msgstr ""
-"Nautilus ²{¦b¥¿¦b³sµ²eazelªº¦øªA¾¹;\n"
-"À°±z¤É¯Å©Î­×¥¿¯äÂÎ,\n"
-"½Ð«ö¤U'¤U¤@¨B',Ä~Äò°õ¦æµ{¦¡."
 
-#: src/nautilus-first-time-druid.c:452
+#: src/nautilus-first-time-druid.c:913
 #, fuzzy
-msgid "Updating Nautilus"
-msgstr "¦³Ãö Nautilus..."
+msgid "Use Nautilus to draw the desktop."
+msgstr "µ²§ô Nautilus Desktop"
 
-#: src/nautilus-first-time-druid.c:460
-msgid "Yes, verify my web connection and update Nautilus now."
-msgstr "¬O,¥ß¨è³sµ²ºô¯¸À°§Ú¤É¯Å"
+#: src/nautilus-first-time-druid.c:919
+msgid "Move existing desktop icons to the Nautilus desktop."
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:461
-#, fuzzy
-msgid "No, I don't wish to connect and update Nautilus now."
-msgstr "¤£,§Ú¤é«á¦A³B²z"
+#. This option is currently disabled, per bugzilla.eazel.com 7557
+#: src/nautilus-first-time-druid.c:927
+msgid "Launch Nautilus when GNOME starts up."
+msgstr ""
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:492
+#: src/nautilus-first-time-druid.c:967
 msgid ""
-"We are having troubles making an external web connection.  \n"
-"Sometimes, firewalls require you to specify a web proxy server.  \n"
-" Fill in the name of port of your proxy server, if any, below."
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties.  The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+"Fast search requires that the cron daemon on your system be running.\n"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:496
-#, fuzzy
-msgid "HTTP Proxy Configuration"
-msgstr "³]©w"
+#: src/nautilus-first-time-druid.c:972
+msgid ""
+"The fast search feature indexes all the items on your hard disk.\n"
+"It speeds up searching and allows you to search by file content\n"
+"as well as filename, date, and other file properties. The indexing\n"
+"takes time but is performed only when your computer is idle.\n"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:508
-msgid "No proxy server required."
+#: src/nautilus-first-time-druid.c:981
+msgid "Enable fast search"
 msgstr ""
 
-#: src/nautilus-first-time-druid.c:509
-msgid "Use this proxy server:"
+#: src/nautilus-first-time-druid.c:982
+msgid "Turn fast search on when cron is enabled"
 msgstr ""
 
-#. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:534
-msgid "Proxy address:"
+#: src/nautilus-first-time-druid.c:1027
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"currently can't be performed because the program crond, which does\n"
+"nightly tasks on your computer, is turned off. To make sure fast searches\n"
+"can be done, turn crond on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands \n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#. allocate the proxy label, followed by the entry
-#: src/nautilus-first-time-druid.c:551
-msgid "Port:"
+#: src/nautilus-first-time-druid.c:1035
+msgid ""
+"Indexing is turned on, enabling the fast search feature. However, indexing\n"
+"may not be performed because the program crond, which does nightly tasks\n"
+"on your computer, may be turned off. To make sure fast searches can be\n"
+"done, check to make sure that crond is turned on.\n"
+"\n"
+"If you are running Linux, you can log in as root and type these commands\n"
+"to start cron:\n"
+"\n"
+"/sbin/chkconfig --level 345 crond on\n"
+"/etc/rc.d/init.d/cron start\n"
 msgstr ""
 
-#. allocate a descriptive label
-#: src/nautilus-first-time-druid.c:582
-#, fuzzy
+#: src/nautilus-first-time-druid.c:1122
 msgid ""
-"We are now contacting the Eazel service to test your \n"
-"web connection and update Nautilus."
+"Click Finish to launch Nautilus. You'll start with two\n"
+"Nautilus windows: one shows your home folder, and the\n"
+"other tells you about Eazel's services that make the life\n"
+"of a Linux user easier.\n"
+"\n"
+"We hope you enjoy Nautilus!"
 msgstr ""
-"²{¦b¥¿¦b¬°±zªºNautilus¤É¯Å,\n"
-"·íµ{¦¡§¹¦¨³o­Ó°Ê§@®É,±N·|¦Û°Ê¶i¤J¤U¤@­¶."
 
-#: src/nautilus-first-time-druid.c:587
-#, fuzzy
-msgid "Downloading Nautilus updates..."
-msgstr "¤U¸ü %s ¤¤..."
+#: src/nautilus-first-time-druid.c:1129
+msgid ""
+"Click Finish to launch Nautilus. You'll start with a\n"
+"window showing your home folder.\n"
+"\n"
+"We hope you enjoy Nautilus!"
+msgstr ""
 
-#: src/nautilus-first-time-druid.c:678
+#: src/nautilus-first-time-druid.c:1153
 #, fuzzy
-msgid "Initial Preferences"
-msgstr "Nautilus: ªì©l¤Æ°Ñ¼Æ³]©w"
+msgid "Nautilus First Time Setup"
+msgstr "Nautilus ¦w¸Ë¤u¨ã"
 
-#. make the title label
-#: src/nautilus-first-time-druid.c:707
-msgid "Welcome to Nautilus!"
+#: src/nautilus-first-time-druid.c:1183
+#, fuzzy
+msgid "Welcome to Nautilus"
 msgstr "Åwªï¨Ï¥Î Nautilus !"
 
-#: src/nautilus-first-time-druid.c:715
-#, fuzzy
+#: src/nautilus-first-time-druid.c:1185
 msgid ""
-"Since this is the first time that you've launched\n"
-"Nautilus, we'd like to ask you a few questions\n"
-"to help personalize it for your use."
-msgstr ""
-"Åwªï¨Ï¥Î Nautilus!\n"
-"¦b±z²Ä¤@¦¸¨Ï¥Î®É,\n"
-"§Ú­Ì§Æ±æ¯à¥H¤¬°Êªº¤è¦¡À°±z§@¤@¨Ç­Ó¤H¤Æ³]©w.\n"
+"Nautilus...\n"
+"    Is a great file manager for the GNOME desktop.\n"
+"    Provides a simple intuitive way to access Internet services.\n"
+"    Is an extensible framework for GNOME developers.\n"
+"    Provides a powerful delivery platform for service providers.\n"
 "\n"
-"½Ð«ö¤Unext«ö¶sÄ~Äò"
-
-#: src/nautilus-first-time-druid.c:720
-msgid "Press the next button to continue."
+"Click Next to begin customizing your Nautilus environment."
 msgstr ""
 
 #. set up the final page
-#: src/nautilus-first-time-druid.c:728
+#: src/nautilus-first-time-druid.c:1196
 msgid "Finished"
 msgstr "§¹¦¨"
 
-#: src/nautilus-first-time-druid.c:735
+#. set up the user level page
+#: src/nautilus-first-time-druid.c:1209
 #, fuzzy
-msgid ""
-"Click the finish button to launch Nautilus.\n"
-"We hope that you enjoy using it!"
-msgstr ""
-"½Ð«ö¤U§¹¦¨«ö¶s,°õ¦æNautilus.\n"
-"\n"
-"§Æ±æ±z¨Ï¥Î´r§Ö"
+msgid "Choose Your User Level"
+msgstr "µæ³¾µ¥¯Å"
 
-#. set up the user level page
-#: src/nautilus-first-time-druid.c:741
+#. set up the GMC transition page
+#: src/nautilus-first-time-druid.c:1213
 #, fuzzy
-msgid "Select A User Level"
-msgstr "¿ï¾Ü¨Ï¥ÎªÌµ¥¯Å"
+msgid "GMC to Nautilus Transition"
+msgstr "µ²§ô Nautilus Desktop"
 
-#. set up the service sign-up page
-#: src/nautilus-first-time-druid.c:745
+#. set up the `Launch Medusa' page
+#: src/nautilus-first-time-druid.c:1217
 #, fuzzy
-msgid "Sign Up for Eazel Services"
-msgstr "¥[¤J Eazel ªA°È"
+msgid "Fast Searches"
+msgstr "·j´M"
+
+#. set up optional page to tell the user how to run cron
+#: src/nautilus-first-time-druid.c:1225
+msgid "The Cron Daemon"
+msgstr ""
 
 #. set up the update page
-#: src/nautilus-first-time-druid.c:749
-#, fuzzy
-msgid "Nautilus Update"
-msgstr "Nautilus: ¤É¯Å"
+#: src/nautilus-first-time-druid.c:1230
+msgid "Checking Your Internet Connection"
+msgstr ""
 
 #. set up the update feedback page
-#: src/nautilus-first-time-druid.c:757
+#: src/nautilus-first-time-druid.c:1241
 #, fuzzy
 msgid "Updating Nautilus..."
 msgstr "¤É¯Å Nautilus..."
 
 #. set up the (optional) proxy configuration page
-#: src/nautilus-first-time-druid.c:765
+#: src/nautilus-first-time-druid.c:1249
 #, fuzzy
 msgid "Web Proxy Configuration"
 msgstr "³]©w"
 
 #. change the message to expanding file
-#: src/nautilus-first-time-druid.c:833
+#: src/nautilus-first-time-druid.c:1324
 #, fuzzy
 msgid "Decoding Update..."
 msgstr "¤U¸ü %s ¤¤..."
 
-#: src/nautilus-first-time-druid.c:842
-msgid "Update Completed... Press Next to Continue."
+#: src/nautilus-first-time-druid.c:1341
+msgid "Update Complete. Click Next to Continue."
+msgstr ""
+
+#. The update file couldn't be loaded because it
+#. * doesn't exist. Arlo and I (jsh) and decided that the
+#. * best thing to do is silently fail
+#.
+#: src/nautilus-first-time-druid.c:1356
+msgid "No Update Available... Press Next to Continue."
 msgstr ""
 
 #. set the window title
-#: src/nautilus-link-set-window.c:188
+#: src/nautilus-link-set-window.c:189
 msgid "Link sets"
 msgstr "³sµ²¶°¦X"
 
 #. add a descriptive label
-#: src/nautilus-link-set-window.c:200
+#: src/nautilus-link-set-window.c:202
 msgid "Add or remove sets of links by clicking on the checkboxes below."
 msgstr "¦b¤U­±½T©w®Ø¤º¥[¤J©ÎªÌ§R°£³sµ²¶°¦X"
 
-#: src/nautilus-location-bar.c:131
+#: src/nautilus-location-bar.c:63
+#, fuzzy
+msgid "Go To:"
+msgstr "¨ì:"
+
+#: src/nautilus-location-bar.c:153
 #, c-format
 msgid "Do you want to view these %d locations in separate windows?"
 msgstr "±z·Q¦b¤À³Îµøµ¡¤¤ÂsÄý³o %d ­Ó¦ì¸m¶Ü ?"
 
-#: src/nautilus-location-bar.c:137
+#: src/nautilus-location-bar.c:160
 msgid "View in Multiple Windows?"
 msgstr "¥H¦hµøµ¡ÂsÄý ?"
 
-#: src/nautilus-location-bar.c:445 src/nautilus-location-bar.c:572
-msgid "Location:"
-msgstr "¦ì¸m :"
+#: src/nautilus-main.c:145
+#, fuzzy
+msgid "Perform a quick set of self-check tests."
+msgstr "°õ¦æ§Ö³t¦Û°ÊÀ˹î´ú¸Õ"
 
-#: src/nautilus-location-bar.c:574
-msgid "   Go To:"
+#: src/nautilus-main.c:148
+msgid "Create the initial window with the given geometry."
 msgstr ""
 
-#: src/nautilus-main.c:139
-msgid "Perform high-speed self-check tests."
-msgstr "°õ¦æ§Ö³t¦Û°ÊÀ˹î´ú¸Õ"
+#: src/nautilus-main.c:148
+msgid "GEOMETRY"
+msgstr ""
 
-#: src/nautilus-main.c:141
+#: src/nautilus-main.c:150
+msgid "Only create windows for explicitly specified URIs."
+msgstr ""
+
+#: src/nautilus-main.c:152
 #, fuzzy
 msgid "Quit Nautilus."
 msgstr "¦³Ãö Nautilus..."
 
-#: src/nautilus-main.c:142
+#: src/nautilus-main.c:154
 #, fuzzy
 msgid "Restart Nautilus."
 msgstr "¦³Ãö Nautilus..."
 
-#: src/nautilus-main.c:143
-#, fuzzy
-msgid "Don't draw background and icons on desktop."
-msgstr "¦b®à­±¤W¹º¤W¹Ï¥Ü©M­I´º"
-
-#: src/nautilus-main.c:144
-msgid "Draw background and icons on desktop."
-msgstr "¦b®à­±¤W¹º¤W¹Ï¥Ü©M­I´º"
-
-#: src/nautilus-main.c:177
+#: src/nautilus-main.c:209
 #, fuzzy
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: µLªk¥H --quit ¨Ï¥Î URIs.\n"
 
-#: src/nautilus-main.c:181
+#: src/nautilus-main.c:213
 #, fuzzy
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: µLªk¥H --quit ¨Ï¥Î URIs.\n"
 
-#: src/nautilus-main.c:185
+#: src/nautilus-main.c:217
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: µLªk¥H --quit ¨Ï¥Î URIs.\n"
 
-#: src/nautilus-main.c:189
+#: src/nautilus-main.c:221
 #, fuzzy
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: µLªk¥H --quit ¨Ï¥Î URIs.\n"
 
-#: src/nautilus-main.c:193
+#: src/nautilus-main.c:225
 #, fuzzy
-msgid "nautilus: --quit and --start-desktop cannot be used together.\n"
-msgstr "nauitlus: ¤£¯à±N --quit ©M--start-desktop ¤@°_¨Ï¥Î.\n"
+msgid "nautilus: --geometry cannot be used with more than one URI.\n"
+msgstr "nautilus: µLªk¥H --quit ¨Ï¥Î URIs.\n"
 
-#: src/nautilus-main.c:197
-#, fuzzy
-msgid "nautilus: --restart and --start-desktop cannot be used together.\n"
-msgstr "nauitlus: ¤£¯à±N --quit ©M--start-desktop ¤@°_¨Ï¥Î.\n"
+#. set the title and standard close accelerator
+#: src/nautilus-property-browser.c:265
+msgid "Backgrounds and Emblems"
+msgstr ""
 
-#: src/nautilus-main.c:201
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:362 src/nautilus-theme-selector.c:267
 #, fuzzy
-msgid "nautilus: --stop-desktop and --start-desktop cannot be used together.\n"
-msgstr "nautilus: ¤£¯à±N --stop-desktop ©M --start-desktop ¤@°_¨Ï¥Î.\n"
-
-#. set the title
-#: src/nautilus-property-browser.c:217
-msgid "Nautilus Property Browser"
-msgstr "Nautilus: ©Ê½èÂsÄý¾¹"
-
-#. add the title label
-#: src/nautilus-property-browser.c:280 src/nautilus-property-browser.c:1705
-msgid "Select A Category:"
-msgstr "¿ï¾Ü¤@­ÓºØÃþ :"
+msgid "  Done  "
+msgstr "§¹¦¨"
 
-#: src/nautilus-property-browser.c:315
-msgid "Add new..."
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:373
+#, fuzzy
+msgid "  Add new...  "
 msgstr "¥[¤J·sªº..."
 
-#: src/nautilus-property-browser.c:326
-msgid "Remove..."
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-property-browser.c:388
+#, fuzzy
+msgid "  Remove...  "
 msgstr "§R°£..."
 
-#: src/nautilus-property-browser.c:725
+#: src/nautilus-property-browser.c:879
 #, c-format
-msgid "Sorry, but background %s couldn't be deleted."
+msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:726 src/nautilus-property-browser.c:755
+#: src/nautilus-property-browser.c:880 src/nautilus-property-browser.c:909
 #, fuzzy
-msgid "Couldn't delete background"
+msgid "Couldn't delete pattern"
 msgstr "µLªk¶i¤J«D¦P¨B¶Ç¿é¼Ò¦¡"
 
-#: src/nautilus-property-browser.c:754
+#: src/nautilus-property-browser.c:908
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:854 src/nautilus-property-browser.c:950
-#, fuzzy, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
-msgstr "©êºp , '%s' ¨Ã¤£¬O¤@­Ó¼v¹³ÀÉ®×"
-
-#: src/nautilus-property-browser.c:856 src/nautilus-property-browser.c:951
-#, fuzzy
-msgid "Not an Image"
-msgstr "¤£¦b¦W³æ¤º"
-
-#: src/nautilus-property-browser.c:881
+#: src/nautilus-property-browser.c:944
 msgid "Create a New Emblem:"
 msgstr "¶}±Ò·sªº¹Ï³¹:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:886
+#: src/nautilus-property-browser.c:949
 msgid "Keyword:"
 msgstr "ÃöÁä¦r:"
 
-#. set up a gnome file entry to pick the image file
-#: src/nautilus-property-browser.c:903
+#. set up a gnome icon entry to pick the image file
+#: src/nautilus-property-browser.c:962
+msgid "Image:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:966
 msgid "Select an image file for the new emblem:"
 msgstr "½Ð¬°³o­Ó¹Ï¥Ü¿ï¨ú¤@­Ó·sªº¹Ï³¹:"
 
-#: src/nautilus-property-browser.c:983
-#, c-format
-msgid "Sorry, but the background %s couldn't be installed."
-msgstr ""
+#: src/nautilus-property-browser.c:993
+#, fuzzy
+msgid "Create a New Color:"
+msgstr "¶}±Ò·sªº¹Ï³¹:"
 
-#: src/nautilus-property-browser.c:984
-msgid "Couldn't install background"
+#. make the name label and field
+#: src/nautilus-property-browser.c:998
+msgid "Color name:"
 msgstr ""
 
 #: src/nautilus-property-browser.c:1009
-msgid "Select an image file to add as a background:"
+msgid "Color value:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:1045
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a valid file name."
+msgstr "©êºp , '%s' ¨Ã¤£¬O¤@­Ó¼v¹³ÀÉ®×"
+
+#: src/nautilus-property-browser.c:1047
+#, fuzzy
+msgid "Sorry, but you did not supply a valid file name."
+msgstr "©êºp , '%s' ¨Ã¤£¬O¤@­Ó¼v¹³ÀÉ®×"
+
+#: src/nautilus-property-browser.c:1049 src/nautilus-property-browser.c:1092
+#, fuzzy
+msgid "Couldn't install pattern"
+msgstr "µLªk¶i¤J«D¦P¨B¶Ç¿é¼Ò¦¡"
+
+#: src/nautilus-property-browser.c:1060
+msgid "Sorry, but you can't replace the reset image."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1091
+#, c-format
+msgid "Sorry, but the pattern %s couldn't be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1114
+#, fuzzy
+msgid "Select an image file to add as a pattern:"
 msgstr "½Ð¿ï¾Ü¤@­Ó¼v¹³Àɮק@¬°­I´º :"
 
-#: src/nautilus-property-browser.c:1107
+#: src/nautilus-property-browser.c:1173
+msgid "Sorry, but you must specify a non-blank name for the new color."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1174
+#, fuzzy
+msgid "Couldn't install color"
+msgstr "µLªk±N Bonoboªì©l¤Æ"
+
+#: src/nautilus-property-browser.c:1230
 msgid "Select a color to add:"
 msgstr "½Ð¿ï¾Ü·sªºÃC¦â¨Ó¥[¤J :"
 
-#: src/nautilus-property-browser.c:1142
-msgid "Sorry, but you must specify a keyword for the new emblem."
+#: src/nautilus-property-browser.c:1311
+#, fuzzy, c-format
+msgid "Sorry, but '%s' is not a usable image file!"
+msgstr "©êºp , '%s' ¨Ã¤£¬O¤@­Ó¼v¹³ÀÉ®×"
+
+#: src/nautilus-property-browser.c:1329
+msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1143 src/nautilus-property-browser.c:1171
+#: src/nautilus-property-browser.c:1330 src/nautilus-property-browser.c:1333
+#: src/nautilus-property-browser.c:1337 src/nautilus-property-browser.c:1366
 #, fuzzy
 msgid "Couldn't install emblem"
 msgstr "µLªk±N Bonoboªì©l¤Æ"
 
-#: src/nautilus-property-browser.c:1170
+#: src/nautilus-property-browser.c:1332
+msgid ""
+"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1335
+#, fuzzy, c-format
+msgid ""
+"Sorry, but \"%s\" is an existing keyword.  Please choose a different name "
+"for it."
+msgstr ""
+"\"%s\" ³o­Ó¦WºÙ¦b³o­Ó¥Ø¿ý¤º¤w¸g¦s¦b\n"
+"½Ð¨Ï¥Î¥t¤@­Ó¦WºÙ"
+
+#: src/nautilus-property-browser.c:1365
 #, c-format
 msgid "Sorry, but the image at %s couldn't be installed as an emblem."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1713 src/nautilus-theme-selector.c:491
+#: src/nautilus-property-browser.c:2024
+msgid "Select A Category:"
+msgstr "¿ï¾Ü¤@­ÓºØÃþ :"
+
+#: src/nautilus-property-browser.c:2032 src/nautilus-theme-selector.c:497
 msgid "Cancel Remove"
 msgstr "¨ú®ø§R°£"
 
-#: src/nautilus-property-browser.c:1715
-#, c-format
-msgid "Add a new %s"
-msgstr "¥[¤J·sªº %s "
+#: src/nautilus-property-browser.c:2037
+msgid "  Add a New Pattern  "
+msgstr ""
 
-#. strip trailing s
-#: src/nautilus-property-browser.c:1730
-#, c-format
-msgid "Click on a %s to remove it"
+#: src/nautilus-property-browser.c:2040
+msgid "  Add a New Color  "
+msgstr ""
+
+#: src/nautilus-property-browser.c:2043
+#, fuzzy
+msgid "  Add a New Emblem  "
+msgstr "¶}±Ò·sªº¹Ï³¹:"
+
+#: src/nautilus-property-browser.c:2066
+#, fuzzy
+msgid "Click on a pattern to remove it"
 msgstr "¿ï¾Ü­n§R°£ªº %s"
 
-#: src/nautilus-property-browser.c:1742
-#, c-format
-msgid "Remove a %s"
-msgstr "§R°£¤@­Ó %s"
+#: src/nautilus-property-browser.c:2069
+#, fuzzy
+msgid "Click on a color to remove it"
+msgstr "¿ï¾Ü­n§R°£ªº %s"
 
-#: src/nautilus-search-bar-criterion.c:67
-msgid "Content"
-msgstr "¤º®e"
+#: src/nautilus-property-browser.c:2072
+#, fuzzy
+msgid "Click on an emblem to remove it"
+msgstr "¿ï¾Ü­n§R°£ªº %s"
+
+#: src/nautilus-property-browser.c:2081
+#, fuzzy
+msgid "Patterns:"
+msgstr "¨ä¥L:"
 
-#: src/nautilus-search-bar-criterion.c:70
-msgid "With Emblem"
+#: src/nautilus-property-browser.c:2084
+#, fuzzy
+msgid "Colors:"
+msgstr "Ãö³¬"
+
+#: src/nautilus-property-browser.c:2087
+#, fuzzy
+msgid "Emblems:"
 msgstr "¶H¼x"
 
-#: src/nautilus-search-bar-criterion.c:71
-msgid "Last Modified"
-msgstr "³Ì«á­×§ï¤é´Á"
+#: src/nautilus-property-browser.c:2106
+msgid "  Remove a Pattern  "
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:72
-msgid "Owned By"
-msgstr "©Ò¦³ªÌ"
+#: src/nautilus-property-browser.c:2109
+#, fuzzy
+msgid "  Remove a Color  "
+msgstr "§R°£¤@­Ó %s"
+
+#: src/nautilus-property-browser.c:2112
+msgid "  Remove an Emblem  "
+msgstr ""
+
+#. Menu item in the search bar.
+#. Bracketed items are context, and are message
+#. strings elsewhere.  You don't have to translate the whole
+#. string, and only the translation for "containing '%s' will
+#. be used.  If you do translate the whole string, leave the
+#. translations of the rest of the text in brackets, so it
+#. will not be used.
+#: src/nautilus-search-bar-criterion.c:74
+#, fuzzy
+msgid "[Search for] Name [contains \"fish\"]"
+msgstr "¦WºÙ±ø¥ó¥]§t \"stuff\" ªº·j´Mµ²ªG"
+
+#: src/nautilus-search-bar-criterion.c:75
+msgid "[Search for] Content [includes all of \"fish tree\"]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:76
+msgid "[Search for] Type [is regular file]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:77
+msgid "[Search for] Size [larger than 400K]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:78
-msgid "contains"
-msgstr "¥]§t"
+msgid "[Search for] With Emblem [includes \"Important\"]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:79
-msgid "starts with"
-msgstr "¥H...¶}©l"
+msgid "[Search for] Last Modified [before yesterday]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:80
-msgid "ends with"
-msgstr "¥H...µ²§ô"
-
-#: src/nautilus-search-bar-criterion.c:81
-msgid "matches glob"
-msgstr "¤ñ¹ï glob"
+msgid "[Search for] Owner [is not root]"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:82
-msgid "matches regexp"
-msgstr "¤ñ¹ï²Å¦X¬ö¿ý"
+#: src/nautilus-search-bar-criterion.c:86
+msgid "[File name] contains [help]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:87
-#, fuzzy
-msgid "includes all of"
-msgstr "¥]§t"
+msgid "[File name] starts with [nautilus]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:88
-#, fuzzy
-msgid "includes any of"
-msgstr "¥]§t"
+msgid "[File name] ends with [.c]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:89
 #, fuzzy
-msgid "does not include all of"
-msgstr "¤£¥]§t"
+msgid "[File name] matches glob [*.c]"
+msgstr "¦WºÙ¤ñ¹ï²Å¦X glob"
 
 #: src/nautilus-search-bar-criterion.c:90
-#, fuzzy
-msgid "includes none of"
-msgstr "¥]§t"
+msgid "[File name] matches regexp [\"e??l.$\"]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:95
+msgid "[File content] includes all of [apple orange]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:96
-#: src/nautilus-search-bar-criterion.c:123
-#: src/nautilus-search-bar-criterion.c:138
-msgid "is"
-msgstr "¬O"
+msgid "[File content] includes any of [apply orange]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:97
-#: src/nautilus-search-bar-criterion.c:124
-#: src/nautilus-search-bar-criterion.c:139
-msgid "is not"
-msgstr "¤£¬O"
-
-#: src/nautilus-search-bar-criterion.c:102
-msgid "regular file"
-msgstr "¼Ð·ÇÀÉ®×"
+#, fuzzy
+msgid "[File content] does not include all of [apple orange]"
+msgstr "¤£¥]§t"
 
-#: src/nautilus-search-bar-criterion.c:103
-msgid "text file"
-msgstr "¯Â¤å¦rÀÉ®×"
+#: src/nautilus-search-bar-criterion.c:98
+msgid "[File content] includes none of [apple orange]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:104
-msgid "application"
-msgstr "À³¥Îµ{¦¡"
+msgid "[File type] is [folder]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:105
-msgid "directory"
-msgstr "¥Ø¿ý"
+msgid "[File type] is not [folder]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:110
+#, fuzzy
+msgid "[File type is] regular file"
+msgstr "¼Ð·ÇÀÉ®×"
 
 #: src/nautilus-search-bar-criterion.c:111
-msgid "larger than"
-msgstr "¤j©ó..."
+msgid "[File type is] text file"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:112
-msgid "smaller than"
-msgstr "¤p©ó..."
+msgid "[File type is] application"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:117
-msgid "marked with"
-msgstr "¥H...¼Ð°O"
+#: src/nautilus-search-bar-criterion.c:113
+msgid "[File type is] folder"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:118
-msgid "not marked with"
-msgstr "¤£¥H...¼Ð°O"
+#: src/nautilus-search-bar-criterion.c:114
+msgid "[File type is] music"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:119
+msgid "[File size is] larger than [400K]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:120
+msgid "[File size is] smaller than [300K]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:125
-#, fuzzy
-msgid "is after"
-msgstr "¤§«á"
+msgid "[With emblem] marked with [Important]"
+msgstr ""
 
 #: src/nautilus-search-bar-criterion.c:126
+msgid "[With emblem] not marked with [Important]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:131
+msgid "[Last modified date] is [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:132
+msgid "[Last modified date] is not [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:133
+msgid "[Last modified date] is after [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:134
+msgid "[Last modified date] is before [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:136
 #, fuzzy
-msgid "is before"
-msgstr "¤§«e"
+msgid "[Last modified date] is today"
+msgstr "­×§ï:"
 
-#: src/nautilus-search-bar-criterion.c:128
+#: src/nautilus-search-bar-criterion.c:137
+msgid "[Last modified date] is yesterday"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:139
+msgid "[Last modified date] is within a week of [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:140
+msgid "[Last modified date] is within a month of [1/24/00]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:159
+msgid "[File owner] is [root]"
+msgstr ""
+
+#: src/nautilus-search-bar-criterion.c:160
 #, fuzzy
-msgid "is today"
-msgstr "¤µ¤é"
+msgid "[File owner] is not [root]"
+msgstr "¥H %s ¦C¦L"
 
-#: src/nautilus-search-bar-criterion.c:129
-msgid "is yesterday"
-msgstr "¬Q¤é"
+#: src/nautilus-service-ui.xml.h:1
+msgid "Go to the Eazel Services Summary Page"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:131
-msgid "is within a week of"
-msgstr "¤@¶g¤º"
+#: src/nautilus-service-ui.xml.h:2
+msgid "Go to the Eazel Software Catalog"
+msgstr ""
 
-#: src/nautilus-search-bar-criterion.c:132
+#: src/nautilus-service-ui.xml.h:3
 #, fuzzy
-msgid "is within a month of"
-msgstr "³o­Ó¤ë"
+msgid "Go to your online storage repository"
+msgstr "¨ì®a¥Ø¿ý"
 
-#: src/nautilus-shell.c:165
-msgid "Caveat"
+#: src/nautilus-service-ui.xml.h:5
+msgid "Software _Catalog"
+msgstr ""
+
+#: src/nautilus-service-ui.xml.h:6
+#, fuzzy
+msgid "_Eazel Services Home"
+msgstr "Eazel ªA°È"
+
+#: src/nautilus-service-ui.xml.h:7
+msgid "_Online Storage"
 msgstr ""
 
-#: src/nautilus-shell.c:201
+#: src/nautilus-service-ui.xml.h:8
 #, fuzzy
+msgid "_Services"
+msgstr "Services"
+
+#: src/nautilus-shell.c:188
+msgid "Caveat"
+msgstr ""
+
+#: src/nautilus-shell.c:225
 msgid ""
-"The Nautilus shell is under development; it's not\n"
-"ready for daily use. Some features are not yet done,\n"
-"partly done, or unstable. The program doesn't look\n"
-"or act exactly the way it will in version 1.0.\n"
+"Thank you for your interest in Nautilus.\n"
+" \n"
+"As with any software under development, you should exercise caution when "
+"using Nautilus.  Eazel does not provide any guarantee that it will work "
+"properly, or assume any liability for your use of it.  Please use it at your "
+"own risk.\n"
 "\n"
-"If you do decide to test this version of Nautilus, \n"
-"beware. The program could do something \n"
-"unpredictable and may even delete or overwrite \n"
-"files on your computer.\n"
-"\n"
-"For more information, visit http://nautilus.eazel.com."
+"Please visit http://www.eazel.com/feedback.html to provide feedback, "
+"comments, and suggestions."
 msgstr ""
-" Nautilus Shell ÁÙ¦b«Ø¸m¤¤,®£©ÈÁÙ¤£¯à¥¿±`¨Ï¥Î.\n"
-"³\\¦h¥\\¯à,¥]¬A³\\¦h«Ü´Îªº¥\\¯à,ÁÙ¤£¯à¨Ï¥Î.\n"
-"½Ðµ¥«Ý1.0ª©ªºNautilus.\n"
-"\n"
-"¦pªG±z°í«ù¨Ï¥Î,¨º½Ð°È¥²¤p¤ß.\n"
-"¦pªG±z»Ý­n§ó¦h¸ê°T,½Ð¨ì http://natilus.eazel.com "
 
-#. add the reset background item, possibly disabled
-#: src/nautilus-sidebar.c:431
-msgid "Reset Background"
-msgstr "­«³]­I´º"
+#: src/Nautilus_shell.oaf.in.h:1
+msgid "Factory for Nautilus shell and file manager"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:2
+#, fuzzy
+msgid "Icons"
+msgstr "¥]§t"
+
+#: src/Nautilus_shell.oaf.in.h:3
+#, fuzzy
+msgid "Icons Viewer"
+msgstr "¥Î %s "
+
+#: src/Nautilus_shell.oaf.in.h:4
+#, fuzzy
+msgid "List"
+msgstr "¬O"
+
+#: src/Nautilus_shell.oaf.in.h:5
+#, fuzzy
+msgid "List Viewer"
+msgstr "¥Î %s "
+
+#: src/Nautilus_shell.oaf.in.h:6
+#, fuzzy
+msgid "Nautilus factory"
+msgstr "Nautilus: ¤É¯Å"
+
+#: src/Nautilus_shell.oaf.in.h:7
+msgid "Nautilus file manager component that shows a scrollable list"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:8
+msgid ""
+"Nautilus file manager component that shows a scrollable list for search "
+"results"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:9
+msgid "Nautilus file manager component that shows a two-dimensional icon space"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:10
+msgid "Nautilus file manager component that shows icons on the the desktop"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:11
+msgid "Nautilus file manager desktop icon view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:12
+msgid "Nautilus file manager icon view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:13
+msgid "Nautilus file manager list view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:14
+msgid "Nautilus file manager search results list view"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:15
+#, fuzzy
+msgid "Nautilus metafile factory"
+msgstr "Nautilus ¦w¸Ë¤u¨ã"
+
+#: src/Nautilus_shell.oaf.in.h:16
+#, fuzzy
+msgid "Nautilus shell"
+msgstr "Nautilus: %s"
+
+#: src/Nautilus_shell.oaf.in.h:17
+msgid ""
+"Nautilus shell operations that can be done from subsequent command-line "
+"invocations"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:18
+msgid "Produces metafile objects for accessing Nautilus metadata"
+msgstr ""
+
+#: src/Nautilus_shell.oaf.in.h:19
+#, fuzzy
+msgid "Search List"
+msgstr "·j´M¦ì¸m"
+
+#: src/Nautilus_shell.oaf.in.h:20
+#, fuzzy
+msgid "View as Icons"
+msgstr "¥H %s ÂsÄý"
+
+#: src/Nautilus_shell.oaf.in.h:21
+#, fuzzy
+msgid "View as List"
+msgstr "¥H %s ÂsÄý"
+
+#: src/nautilus-shell-ui.xml.h:1
+#, fuzzy
+msgid " _Advanced"
+msgstr "¼F®`³Ã¥ë"
+
+#: src/nautilus-shell-ui.xml.h:2
+#, fuzzy
+msgid " _Beginner"
+msgstr "¶}©l"
+
+#: src/nautilus-shell-ui.xml.h:3
+#, fuzzy
+msgid " _Intermediate"
+msgstr "¶i¶¥"
+
+#: src/nautilus-shell-ui.xml.h:4
+msgid "Add a bookmark for the current location to this menu"
+msgstr "±N¦¹­¶¥[¤J®ÑÅÒ"
+
+#: src/nautilus-shell-ui.xml.h:6
+msgid "Change the visibility of this window's location bar"
+msgstr "Åã¥Ü©ÎÁôÂóo­Óµøµ¡ªº¦ì¸m¦C"
+
+#: src/nautilus-shell-ui.xml.h:7
+msgid "Change the visibility of this window's sidebar"
+msgstr "Åã¥Ü©ÎÁôÂóo­Óµøµ¡ªº»²§U¤u¨ã¦C"
+
+#: src/nautilus-shell-ui.xml.h:8
+msgid "Change the visibility of this window's status bar"
+msgstr "Åã¥Ü©ÎÁôÂóo­Óµøµ¡ªºª¬ºA¦C"
+
+#: src/nautilus-shell-ui.xml.h:9
+#, fuzzy
+msgid "Change the visibility of this window's toolbar"
+msgstr "Åã¥Ü©ÎÁôÂóo­Óµøµ¡ªº¤u¨ã¦C"
+
+#: src/nautilus-shell-ui.xml.h:10
+msgid "Clear contents of Go menu and Back/Forward lists"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:11
+#, fuzzy
+msgid "Close _All Windows"
+msgstr "Ãö³¬µøµ¡"
+
+#: src/nautilus-shell-ui.xml.h:12
+#, fuzzy
+msgid "Close all Nautilus windows"
+msgstr "Ãö³¬³o­Óµøµ¡"
+
+#: src/nautilus-shell-ui.xml.h:13
+msgid "Close this window"
+msgstr "Ãö³¬³o­Óµøµ¡"
 
-#: src/nautilus-sidebar.c:605
+#: src/nautilus-shell-ui.xml.h:15
+msgid "Display a window that allows editing the bookmarks in this menu"
+msgstr "¦b¦¹¿ï³æ¤¤½s¿è²{¦³®ÑÅÒ"
+
+#: src/nautilus-shell-ui.xml.h:16
+msgid "Display credits for the creators of Nautilus"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:17
+msgid "Display on-line help for Nautilus"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:18
+#, fuzzy
+msgid ""
+"Display patterns, colors, and emblems that can be used to customize "
+"appearance"
+msgstr "Åã¥Ü¯S©ÊÂsÄý¾¹,¥[¤Jª«¥ó©M¼Ò¦¡"
+
+#: src/nautilus-shell-ui.xml.h:19
+msgid "Display quick reference pages for Nautilus"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:20
+msgid "Display release notes for Nautilus"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:21
+#, fuzzy
+msgid "Display support information for Nautilus and Eazel Services"
+msgstr "Åã¥Ü Nautilus ªº¬ÛÃö°T®§"
+
+#: src/nautilus-shell-ui.xml.h:22
+msgid "Display the latest contents of the current location"
+msgstr "Åã¥Ü³o­Ó¦ì¸mªº³Ì·s¤º®e"
+
+#: src/nautilus-shell-ui.xml.h:23
+msgid "Display the set of available appearance themes"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:24
+#, fuzzy
+msgid "Edit various Nautilus preferences"
+msgstr "Nautilus: ªì©l¤Æ°Ñ¼Æ³]©w"
+
+#: src/nautilus-shell-ui.xml.h:25
+#, fuzzy
+msgid "Find"
+msgstr "§¹¦¨"
+
+#: src/nautilus-shell-ui.xml.h:26
+msgid "For_get History"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:27
+#, fuzzy
+msgid "Go to Eazel Services"
+msgstr "Eazel ªA°È"
+
+#: src/nautilus-shell-ui.xml.h:28
+msgid "Go to the home location"
+msgstr "¨ì­º­¶"
+
+#: src/nautilus-shell-ui.xml.h:29
+msgid "Go to the location that contains this one"
+msgstr "¨ì¥]§t³o­Ó¦ì¸mªº¦a¤è"
+
+#: src/nautilus-shell-ui.xml.h:30
+#, fuzzy
+msgid "Go to the next visited location"
+msgstr "¨ì«e¤@­Ó¦ì¸m"
+
+#: src/nautilus-shell-ui.xml.h:31
+msgid "Go to the previous visited location"
+msgstr "¨ì«e¤@­Ó¦ì¸m"
+
+#: src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:483
+#, fuzzy
+msgid "Hide Location _Bar"
+msgstr "§A®a¦í§}"
+
+#: src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:465
+#, fuzzy
+msgid "Hide St_atus Bar"
+msgstr "ª¬ºA¦C"
+
+#: src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:471
+#, fuzzy
+msgid "Hide _Sidebar"
+msgstr "°¼¦C"
+
+#: src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:477
+#, fuzzy
+msgid "Hide _Toolbar"
+msgstr "¤u¨ã¦C"
+
+#: src/nautilus-shell-ui.xml.h:37
+msgid "Nautilus Quick _Reference"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:38
+#, fuzzy
+msgid "Nautilus Release _Notes"
+msgstr "Nautilus: ½Ð¥H¨ä¥Lµ{¦¡ÂsÄý"
+
+#: src/nautilus-shell-ui.xml.h:39
+#, fuzzy
+msgid "Nautilus User _Manual"
+msgstr "Nautilus: ¤É¯Å"
+
+#: src/nautilus-shell-ui.xml.h:40
+#, fuzzy
+msgid "New Window"
+msgstr "·sµøµ¡"
+
+#: src/nautilus-shell-ui.xml.h:41
+#, fuzzy
+msgid "New _Window"
+msgstr "·sµøµ¡"
+
+#: src/nautilus-shell-ui.xml.h:42
+#, fuzzy
+msgid "Normal Size"
+msgstr "¤@¯ë¿ï³æ"
+
+#: src/nautilus-shell-ui.xml.h:43
+msgid "Open another Nautilus window for the displayed location"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:44
+#, fuzzy
+msgid "Refresh"
+msgstr "¤§«e"
+
+#: src/nautilus-shell-ui.xml.h:45
+msgid "Report Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:46
+msgid "Reset Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:47
+#, fuzzy
+msgid "Search the World Wide Web"
+msgstr "·j´M³o­Óºô¯¸"
+
+#: src/nautilus-shell-ui.xml.h:48
+msgid "Search this computer for files"
+msgstr "¦b³o¥x¹q¸£¤W·j´M"
+
+#: src/nautilus-shell-ui.xml.h:50
+msgid ""
+"Show a page from which you can send feedback about Nautilus and Eazel "
+"Services"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:51
+msgid "Show the contents at the normal size"
+msgstr "¥H¥¿±`¤j¤pÅã¥Ü"
+
+#: src/nautilus-shell-ui.xml.h:52
+msgid "Show the contents in less detail"
+msgstr "Åã¥Ü¤@¨Ç²Ó¸`"
+
+#: src/nautilus-shell-ui.xml.h:53
+#, fuzzy
+msgid "Show the contents in more detail"
+msgstr "(¦³¨Ç¥Ø¿ýµLªkŪ¨ú)"
+
+#: src/nautilus-shell-ui.xml.h:54
+msgid "Start Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:56
+msgid "Stop Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:57
+#, fuzzy
+msgid "Stop loading this location"
+msgstr "¨ì­º­¶"
+
+#: src/nautilus-shell-ui.xml.h:58
+msgid "Undo the last text change"
+msgstr "´_­ì³Ì«á¤å¦r­×§ï"
+
+#: src/nautilus-shell-ui.xml.h:59
+msgid "Up"
+msgstr "Up"
+
+#: src/nautilus-shell-ui.xml.h:60
+msgid "Use preferences appropriate for beginners"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:61
+msgid "Use preferences appropriate for experts"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:62
+msgid "Use preferences appropriate for most people"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:63
+#, fuzzy
+msgid "We_b Search"
+msgstr "·j´Mºô¯¸"
+
+#: src/nautilus-shell-ui.xml.h:64
+msgid "Web Search"
+msgstr "·j´Mºô¯¸"
+
+#: src/nautilus-shell-ui.xml.h:65
+msgid "Zoom In"
+msgstr "©ñ¤j"
+
+#: src/nautilus-shell-ui.xml.h:66
+msgid "Zoom Out"
+msgstr "ÁY¤p"
+
+#: src/nautilus-shell-ui.xml.h:67
+#, fuzzy
+msgid "Zoom _In"
+msgstr "©ñ¤j"
+
+#: src/nautilus-shell-ui.xml.h:68
+#, fuzzy
+msgid "Zoom _Out"
+msgstr "ÁY¤p"
+
+#: src/nautilus-shell-ui.xml.h:69
+msgid "_About Nautilus..."
+msgstr "¦³Ãö Nautilus..."
+
+#: src/nautilus-shell-ui.xml.h:70
+msgid "_Add Bookmark"
+msgstr "·s¼W®ÑÅÒ"
+
+#: src/nautilus-shell-ui.xml.h:71
+msgid "_Back"
+msgstr "«e¤@­¶"
+
+#: src/nautilus-shell-ui.xml.h:72
+msgid "_Backgrounds and Emblems..."
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:73
+msgid "_Bookmarks"
+msgstr "®ÑÅÒ"
+
+#: src/nautilus-shell-ui.xml.h:74
+msgid "_Close Window"
+msgstr "Ãö³¬µøµ¡"
+
+#: src/nautilus-shell-ui.xml.h:76
+msgid "_Customer Support"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:77
+msgid "_Edit"
+msgstr "½s¿è"
+
+#: src/nautilus-shell-ui.xml.h:78
+msgid "_Edit Bookmarks..."
+msgstr "½s¿è®ÑÅÒ..."
+
+#: src/nautilus-shell-ui.xml.h:79
+#, fuzzy
+msgid "_Edit Preferences..."
+msgstr "Nautilus: ªì©l¤Æ°Ñ¼Æ³]©w"
+
+#: src/nautilus-shell-ui.xml.h:80
+msgid "_Feedback"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:82
+#, fuzzy
+msgid "_Find"
+msgstr "§¹¦¨"
+
+#: src/nautilus-shell-ui.xml.h:83
+msgid "_Forward"
+msgstr "¤U¤@­¶"
+
+#: src/nautilus-shell-ui.xml.h:84
+msgid "_Go"
+msgstr "¨ì..."
+
+#: src/nautilus-shell-ui.xml.h:85
+msgid "_Help"
+msgstr "»¡©ú"
+
+#: src/nautilus-shell-ui.xml.h:86
+msgid "_Home"
+msgstr "­º­¶"
+
+#: src/nautilus-shell-ui.xml.h:87
+#, fuzzy
+msgid "_Location..."
+msgstr "¦ì¸m"
+
+#: src/nautilus-shell-ui.xml.h:88
+#, fuzzy
+msgid "_Nautilus Themes..."
+msgstr "Nautilus"
+
+#: src/nautilus-shell-ui.xml.h:89
+#, fuzzy
+msgid "_Normal Size"
+msgstr "¤@¯ë¿ï³æ"
+
+#: src/nautilus-shell-ui.xml.h:91
+#, fuzzy
+msgid "_Preferences"
+msgstr "Nautilus: ªì©l¤Æ°Ñ¼Æ³]©w"
+
+#: src/nautilus-shell-ui.xml.h:92
+msgid "_Profiler"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:93
+msgid "_Refresh"
+msgstr "§ó·s"
+
+#: src/nautilus-shell-ui.xml.h:94
+msgid "_Report Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:95
+msgid "_Reset Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:96
+msgid "_Start Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:97
+msgid "_Stop Profiling"
+msgstr ""
+
+#: src/nautilus-shell-ui.xml.h:98
+msgid "_Undo"
+msgstr "´_­ì"
+
+#: src/nautilus-shell-ui.xml.h:99
+#, fuzzy
+msgid "_Up a Level"
+msgstr "¨Ï¥ÎªÌµ¥¯Å"
+
+#: src/nautilus-shell-ui.xml.h:100
+#, fuzzy
+msgid "_View"
+msgstr "ÂsÄý"
+
+#: src/nautilus-sidebar.c:694
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
@@ -4284,11 +9954,11 @@ msgstr ""
 "±z¤£¯à¦P®É¿ï¾Ü¤@­Ó¥H¤Wªº¹Ï¥Ü,\n"
 "½Ð¿ï¾Ü¤@­Ó¼v¹³§@¬°¹Ï¥Ü"
 
-#: src/nautilus-sidebar.c:607
+#: src/nautilus-sidebar.c:696
 msgid "More Than One Image"
 msgstr ""
 
-#: src/nautilus-sidebar.c:629
+#: src/nautilus-sidebar.c:715
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
@@ -4296,12 +9966,12 @@ msgstr ""
 "±z©Ò¿ï¾ÜªºÀɮר䣦b³o¥x¹q¸£¤W,\n"
 "½Ð¿ï¾Ü³o¥x¹q¸£¤WªºÀÉ®×"
 
-#: src/nautilus-sidebar.c:631
+#: src/nautilus-sidebar.c:717
 #, fuzzy
 msgid "Local Images Only"
 msgstr "¥u§ä³o¥x¹q¸£¤WªºÀÉ®×"
 
-#: src/nautilus-sidebar.c:636
+#: src/nautilus-sidebar.c:722
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
 "custom icons."
@@ -4309,98 +9979,102 @@ msgstr ""
 "±z©Ò¿ï¾ÜªºÀɮרëD¼v¹³ÀÉ,\n"
 "½Ð¿ï¾Ü³o¥x¹q¸£¤Wªº¼v¹³ÀÉ"
 
-#: src/nautilus-sidebar.c:638
+#: src/nautilus-sidebar.c:724
 msgid "Images Only"
 msgstr ""
 
-#: src/nautilus-sidebar.c:1193
+#: src/nautilus-sidebar.c:1281
 #, c-format
 msgid "Open with %s"
 msgstr "¥H %s ¶}±Ò "
 
 #. Catch-all button after all the others.
-#: src/nautilus-sidebar.c:1222
+#: src/nautilus-sidebar.c:1317
 msgid "Open with..."
 msgstr "¥H...¶}±Ò"
 
-#. Create button first so we can use it for auto_click
-#: src/nautilus-simple-search-bar.c:101
-msgid "Find Them!"
-msgstr ""
+#. FIXME: We don't use spaces to pad labels!
+#: src/nautilus-sidebar.c:1424
+#, fuzzy
+msgid "  Empty Trash  "
+msgstr "²M²z©U§£±í"
 
-#: src/nautilus-switchable-search-bar.c:105
-msgid "Search For:"
-msgstr "·j´M¥Ø¼Ð:"
+#: src/nautilus-switchable-search-bar.c:132
+#, fuzzy
+msgid "Find:"
+msgstr "§¹¦¨"
 
-#. set the title
-#: src/nautilus-theme-selector.c:146
+#. set the title and standard close accelerator
+#: src/nautilus-theme-selector.c:170
 msgid "Nautilus Theme Selector"
 msgstr ""
 
 #. add the title label
-#: src/nautilus-theme-selector.c:180
+#: src/nautilus-theme-selector.c:199
 #, fuzzy
 msgid "Nautilus Theme:"
 msgstr "Nautilus"
 
-#: src/nautilus-theme-selector.c:238
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:278
 #, fuzzy
-msgid "Add new theme"
+msgid "  Add New Theme  "
 msgstr "¥[¤J·sªº %s "
 
-#: src/nautilus-theme-selector.c:250
+#. FIXME: Using spaces to add padding is not good design.
+#: src/nautilus-theme-selector.c:288
 #, fuzzy
-msgid "Remove theme"
+msgid "  Remove Theme  "
 msgstr "§R°£"
 
-#: src/nautilus-theme-selector.c:383
+#: src/nautilus-theme-selector.c:400
 #, fuzzy, c-format
-msgid "Sorry, but %s is not a valid theme directory."
+msgid "Sorry, but \"%s\" is not a valid theme folder."
 msgstr "©êºp , '%s' ¨Ã¤£¬O¤@­Ó¼v¹³ÀÉ®×"
 
-#: src/nautilus-theme-selector.c:384
+#: src/nautilus-theme-selector.c:401
 #, fuzzy
 msgid "Couldn't add theme"
 msgstr "µLªk¶i¤J«D¦P¨B¶Ç¿é¼Ò¦¡"
 
-#: src/nautilus-theme-selector.c:412
+#: src/nautilus-theme-selector.c:429
 #, c-format
-msgid "Sorry, but the theme %s couldn't be installed."
+msgid "Sorry, but the \"%s\" theme couldn't be installed."
 msgstr ""
 
-#: src/nautilus-theme-selector.c:413
+#: src/nautilus-theme-selector.c:430
 #, fuzzy
 msgid "Couldn't install theme"
 msgstr "µLªk¶i¤J«D¦P¨B¶Ç¿é¼Ò¦¡"
 
-#: src/nautilus-theme-selector.c:454
+#: src/nautilus-theme-selector.c:463
 #, fuzzy
-msgid "Select a theme directory to add as a new theme:"
+msgid "Select a theme folder to add as a new theme:"
 msgstr "½Ð¿ï¾Ü¤@­Ó¼v¹³Àɮק@¬°­I´º :"
 
-#: src/nautilus-theme-selector.c:487 src/nautilus-theme-selector.c:537
+#: src/nautilus-theme-selector.c:495 src/nautilus-theme-selector.c:542
 #, fuzzy
 msgid "Click on a theme to remove it."
 msgstr "¿ï¾Ü­n§R°£ªº %s"
 
-#: src/nautilus-theme-selector.c:540
+#: src/nautilus-theme-selector.c:545
 msgid ""
 "Click on a theme to change the\n"
 "appearance of Nautilus."
 msgstr ""
 
 #. change the add button label back to it's normal state
-#: src/nautilus-theme-selector.c:552
+#: src/nautilus-theme-selector.c:558
 msgid "Add New Theme"
 msgstr ""
 
-#: src/nautilus-theme-selector.c:580
+#: src/nautilus-theme-selector.c:585
 msgid ""
-"Sorry, but you can't remove the current theme.  Please change to another "
-"theme before removing this one"
+"Sorry, but you can't remove the current theme. Please change to another "
+"theme before removing this one."
 msgstr ""
 
-#: src/nautilus-theme-selector.c:581
+#: src/nautilus-theme-selector.c:587
 #, fuzzy
 msgid "Can't delete current theme"
 msgstr "¥Ø«e­·®æ"
@@ -4414,114 +10088,140 @@ msgstr ""
 msgid "Couldn't remove theme"
 msgstr "µLªk¶i¤J«D¦P¨B¶Ç¿é¼Ò¦¡"
 
-#: src/nautilus-theme-selector.c:698
+#: src/nautilus-theme-selector.c:716
 #, c-format
-msgid "No information available for the  %s theme"
+msgid "No description available for the \"%s\" theme"
 msgstr ""
 
-#: src/nautilus-window.c:967
-#, c-format
-msgid "View as %s..."
+#: src/nautilus-window.c:637
+#, fuzzy
+msgid "View as ..."
 msgstr "ÂsÄý %s..."
 
 #. Add "View as Other..." extra bonus choice.
-#: src/nautilus-window.c:989
+#: src/nautilus-window.c:1317
 msgid "View as Other..."
 msgstr "¥H¨ä¥LÂsÄý..."
 
-#: src/nautilus-window.c:1540
+#: src/nautilus-window.c:1722
 msgid "Close"
 msgstr "Ãö³¬"
 
-#: src/nautilus-window-manage-views.c:242 src/nautilus-window-menus.c:656
-msgid "Nautilus"
-msgstr "Nautilus"
-
-#: src/nautilus-window-manage-views.c:719
+#. FIXME bugzilla.eazel.com 5037: The text Preview
+#. * Release is hardcoded here. Are all builds with
+#. * time stamps really best described as "preview
+#. * release"?.
+#.
+#: src/nautilus-window-manage-views.c:216
 #, c-format
-msgid "You do not have the permissions necessary to view \"%s\"."
-msgstr "±z¨S¦³ÂsÄý \"%s\" ªºÅv­­"
-
-#: src/nautilus-window-manage-views.c:721
-#, fuzzy
-msgid "Inadequate Permissions"
-msgstr "Åv­­"
+msgid "Preview Release %s: %s"
+msgstr ""
 
-#: src/nautilus-window-manage-views.c:916
+#: src/nautilus-window-manage-views.c:820
 msgid "View Failed"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:929
+#: src/nautilus-window-manage-views.c:831
+#, c-format
+msgid ""
+"The %s view encountered an error and can't continue. You can choose another "
+"view or go to a different location."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:842
+#, c-format
+msgid "The %s view encountered an error while starting up."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1001
 msgid ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:933
+#: src/nautilus-window-manage-views.c:1005
 #, c-format
 msgid ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
 "happening, you might want to turn this panel off."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:940
+#: src/nautilus-window-manage-views.c:1010
 #, fuzzy
 msgid "Sidebar Panel Failed"
 msgstr "°¼¦C"
 
-#: src/nautilus-window-manage-views.c:1339
+#: src/nautilus-window-manage-views.c:1225
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr "µLªk§ä¨ì \"%s\" ½ÐÀ˹µL«÷¿ù¦r"
 
-#: src/nautilus-window-manage-views.c:1345
+#: src/nautilus-window-manage-views.c:1231
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
 msgstr "\"%s\" ¤£¬O­Ó§¹¾ã¦ì¸m,½ÐÀ˹î"
 
-#: src/nautilus-window-manage-views.c:1363
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot handle items of this type."
-msgstr "µLªk®i¥Ü \"%s\" Nautilus µLªk³B²z³oºØ®æ¦¡"
-
-#: src/nautilus-window-manage-views.c:1367
-#, c-format
+#: src/nautilus-window-manage-views.c:1245
+#, fuzzy, c-format
 msgid ""
-"Couldn't display \"%s\", because Nautilus cannot handle items of type \"%s\"."
+"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
+"it is."
 msgstr "µLªk®i¥Ü\"%s\",Nautilus ©|¥¼¤ä´© \"%s\" ®æ¦¡"
 
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy, c-format
+msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+msgstr "Nautilus µLªk®i¥Ü \"%s\""
+
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1379
+#: src/nautilus-window-manage-views.c:1265
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr "µLªk®i¥Ü \"%s\" ,Nautilus µLªk³B²z  %s ¦ì¸m"
 
-#: src/nautilus-window-manage-views.c:1385
+#: src/nautilus-window-manage-views.c:1271
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "µLªk®i¥Ü \"%s\" ,µn¿ý¥¢±Ñ "
 
-#. FIXME bugzilla.eazel.com 2458: Need to give the user some advice about what to do here.
-#: src/nautilus-window-manage-views.c:1392
+#: src/nautilus-window-manage-views.c:1276
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because access was denied."
+msgstr "µLªk®i¥Ü \"%s\" ,µn¿ý¥¢±Ñ "
+
+#: src/nautilus-window-manage-views.c:1287
+#, c-format
+msgid ""
+"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
+"the spelling is correct and that your proxy settings are correct."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1295
+#, fuzzy, c-format
+msgid ""
+"Couldn't display \"%s\", because the host name was empty. Check that your "
+"proxy settings are correct."
+msgstr "µLªk®i¥Ü \"%s\" ,µn¿ý¥¢±Ñ "
+
+#: src/nautilus-window-manage-views.c:1307
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running.  Be sure that you have started the Medusa "
+"search service isn't running. Be sure that you have started the Medusa "
 "search service, and if you don't have an index, that the Medusa indexer is "
 "running."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1393
+#: src/nautilus-window-manage-views.c:1311
 msgid "Searching Unavailable"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1397
+#: src/nautilus-window-manage-views.c:1315
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus µLªk®i¥Ü \"%s\""
 
-#: src/nautilus-window-manage-views.c:1409
+#: src/nautilus-window-manage-views.c:1320
 #, fuzzy
 msgid "Can't Display Location"
 msgstr "Àx¦s¦ì¸m"
@@ -4529,94 +10229,77 @@ msgstr "Àx¦s¦ì¸m"
 #. This is a little joke, shows up occasionally. I only
 #. * implemented this feature so I could use this joke.
 #.
-#: src/nautilus-window-menus.c:353
+#: src/nautilus-window-menus.c:354
 msgid ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
 msgstr ""
 
-#: src/nautilus-window-menus.c:356
+#: src/nautilus-window-menus.c:357
 msgid ""
 "Are you sure you want Nautilus to forget which locations you have visited?"
 msgstr ""
 
-#: src/nautilus-window-menus.c:361
+#: src/nautilus-window-menus.c:362
 msgid "Forget History?"
 msgstr ""
 
-#: src/nautilus-window-menus.c:362
+#: src/nautilus-window-menus.c:363
 msgid "Forget"
 msgstr ""
 
-#: src/nautilus-window-menus.c:463
+#: src/nautilus-window-menus.c:466
 #, fuzzy
-msgid "Hide Status Bar"
+msgid "Show St_atus Bar"
 msgstr "ª¬ºA¦C"
 
-#: src/nautilus-window-menus.c:464
+#: src/nautilus-window-menus.c:472
 #, fuzzy
-msgid "Show Status Bar"
-msgstr "ª¬ºA¦C"
-
-#: src/nautilus-window-menus.c:470
-#, fuzzy
-msgid "Hide Sidebar"
+msgid "Show _Sidebar"
 msgstr "°¼¦C"
 
-#: src/nautilus-window-menus.c:471
-#, fuzzy
-msgid "Show Sidebar"
-msgstr "°¼¦C"
-
-#: src/nautilus-window-menus.c:477
-#, fuzzy
-msgid "Hide Tool Bar"
-msgstr "¤u¨ã¦C"
-
 #: src/nautilus-window-menus.c:478
 #, fuzzy
-msgid "Show Tool Bar"
+msgid "Show _Toolbar"
 msgstr "¤u¨ã¦C"
 
 #: src/nautilus-window-menus.c:484
 #, fuzzy
-msgid "Hide Location Bar"
-msgstr "§A®a¦í§}"
+msgid "Show Location _Bar"
+msgstr "¦ì¸m¦C"
 
-#: src/nautilus-window-menus.c:485
+#: src/nautilus-window-menus.c:535
 #, fuzzy
-msgid "Show Location Bar"
-msgstr "¦ì¸m¦C"
+msgid "Preferences"
+msgstr "Nautilus: ªì©l¤Æ°Ñ¼Æ³]©w"
 
-#. Localizers: This is the message in the dialog that appears if the user chooses "Edit Beginner Settings".
-#. * The first %s is the name of the lowest user level ("Beginner"). The 2nd and 4th %s are the
-#. * names of the middle user level ("Intermediate"). The 3rd %s is the name of the highest user
-#. * level ("Advanced").
+#. Localize to deal with
+#. * issues in the copyright
+#. * symbol characters -- do
+#. * not translate the
+#. * company name, please.
 #.
-#: src/nautilus-window-menus.c:569
-#, c-format
-msgid ""
-"None of the settings for the %s level can be edited. If you want to edit the "
-"settings you must choose the %s or %s level. Do you want to switch to the %s "
-"level now and edit its settings?"
+#: src/nautilus-window-menus.c:618
+msgid "Copyright © 1999-2001 Eazel, Inc."
 msgstr ""
 
-#. Localizers: This is the title of the dialog that appears if the user chooses "Edit Beginner Settings".
-#. * The %s is the name of the middle user level ("Intermediate").
-#.
-#: src/nautilus-window-menus.c:581
-#, fuzzy, c-format
-msgid "Switch to %s Level?"
-msgstr "¤Á´«¨ì¦Û­q³W¹º?"
-
-#: src/nautilus-window-menus.c:660
+#: src/nautilus-window-menus.c:620
 msgid ""
-"Nautilus is a graphical shell \n"
-"for GNOME that makes it \n"
-"easy to manage your files \n"
+"Nautilus is a graphical shell\n"
+"for GNOME that makes it\n"
+"easy to manage your files\n"
 "and the rest of your system."
 msgstr ""
 
+#. translators should localize the following
+#. * string which will be displayed at the
+#. * bottom of the about box to give credit
+#. * to the translator(s)
+#.
+#: src/nautilus-window-menus.c:629
+msgid "Translator Credits"
+msgstr ""
+
 #: src/nautilus-window-menus.c:789
 #, c-format
 msgid ""
@@ -4639,266 +10322,653 @@ msgstr " ¦ì¸m \"%s\" ¤£¦s¦b  ¥i¯à¤w§ï¦W©ÎªÌ¤w§R°£"
 msgid "Go to Nonexistent Location"
 msgstr "¨ì¤U¤@­Ó¦ì¸m"
 
-#: src/nautilus-window-menus.c:883
-msgid "Go to the specified location"
-msgstr "¨ì«ü©w¦ì¸m"
+#: src/nautilus-window-menus.c:877
+#, fuzzy
+msgid "Go to the location specified by this bookmark"
+msgstr "¨ì¥]§t³o­Ó¦ì¸mªº¦a¤è"
 
-#: src/nautilus-window-menus.c:1144
-msgid "_File"
-msgstr "ÀÉ®×"
+#: src/nautilus-window-toolbars.c:402
+msgid "Back"
+msgstr "«e¤@­¶"
 
-#: src/nautilus-window-menus.c:1148
-msgid "_Edit"
-msgstr "½s¿è"
+#: src/nautilus-window-toolbars.c:404
+msgid "Forward"
+msgstr "¤U¤@­¶"
 
-#: src/nautilus-window-menus.c:1152
+#. Note to localizers: this font is used for the number in the
+#. * zoom control widget.
+#.
+#: src/nautilus-zoom-control.c:531
 #, fuzzy
-msgid "_View"
-msgstr "ÂsÄý"
+msgid "-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*"
+msgstr "-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-*-*"
 
-#: src/nautilus-window-menus.c:1156
-msgid "_Go"
-msgstr "¨ì..."
+#~ msgid "System"
+#~ msgstr "¨t²Î"
 
-#: src/nautilus-window-menus.c:1160
-msgid "_Bookmarks"
-msgstr "®ÑÅÒ"
+#~ msgid "Config files"
+#~ msgstr "³]©wÀÉ®×"
 
-#: src/nautilus-window-menus.c:1164
-msgid "_Help"
-msgstr "»¡©ú"
+#~ msgid "Command Line"
+#~ msgstr "«ü¥O¦C"
 
-#. Localizers: This is the menu hint for the user-level setting (%s is name of user
-#. * level, "Beginner", "Intermediate", or "Advanced")
-#.
-#: src/nautilus-window-menus.c:1334
-#, fuzzy, c-format
-msgid "Use %s settings"
-msgstr "·j´M³]©w"
+#~ msgid "APIs"
+#~ msgstr "API"
 
-#: src/nautilus-window-menus.c:1376
-msgid "_New Window"
-msgstr "·sµøµ¡"
+#~ msgid "Miscellaneous"
+#~ msgstr "¨ä¥L"
 
-#: src/nautilus-window-menus.c:1377
-msgid "Create a new window"
-msgstr "»s³y·sµøµ¡"
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "You clicked the Kill Content View toolbar button."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "±z«ö¤U¤F¥Ø¿ý¤u§@¦Cªº²M°£«ö¶s."
 
-#: src/nautilus-window-menus.c:1391
-msgid "_Close Window"
-msgstr "Ãö³¬µøµ¡"
+#~ msgid "Kill the Loser content view."
+#~ msgstr "²M°£½Õ¾ã¤º®e¹wÄý"
 
-#: src/nautilus-window-menus.c:1392
-msgid "Close this window"
-msgstr "Ãö³¬³o­Óµøµ¡"
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "You clicked the Kill Sidebar View toolbar button."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "±z«ö¤U¤F²M°£»²§U¤u¨ã¦C«ö¶s."
+
+#~ msgid "Loser"
+#~ msgstr "ÁôÂÃ"
+
+#~ msgid "Kill the Loser sidebar view."
+#~ msgstr "²M°£ÁôÂû²§U¤u¨ã"
+
+#~ msgid "_Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "This is a mozilla merged menu item"
+#~ msgstr "³o¬O¤@­Ó mozilla ¤º´O¿ï¶µ"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "This is a mozilla merged toolbar button"
+#~ msgstr "³o¬O¤@­Ó mozilla ¤º´O¤u¨ã¦C«ö¶s"
 
-#: src/nautilus-window-menus.c:1403
 #, fuzzy
-msgid "Close _All Windows"
-msgstr "Ãö³¬µøµ¡"
+#~ msgid "Verifying %s..."
+#~ msgstr "¼g¤J¤¤..."
+
+#~ msgid "Package Title"
+#~ msgstr "®M¥ó¼ÐÃD"
+
+#~ msgid "Size: "
+#~ msgstr "¤j¤p: "
+
+#~ msgid "<size>"
+#~ msgstr "<size>"
+
+#~ msgid "<unknown>"
+#~ msgstr "<¥¼ª¾>"
+
+#~ msgid "License: "
+#~ msgstr "ª©Åv: "
+
+#~ msgid "Build Date: "
+#~ msgstr "«Ø¨î®É¶¡: "
+
+#~ msgid "Vendor: "
+#~ msgstr "´£¨ÑªÌ: "
+
+#~ msgid "Update"
+#~ msgstr "¤É¯Å"
+
+#~ msgid "Package \"%s\" "
+#~ msgstr "®M¥ó \"%s\" "
+
+#~ msgid "Package Contents: %d files"
+#~ msgstr "®M¥ó¥Ø¿ý: %d ­ÓÀÉ®×"
 
-#: src/nautilus-window-menus.c:1404
 #, fuzzy
-msgid "Close all Nautilus windows"
-msgstr "Ãö³¬³o­Óµøµ¡"
+#~ msgid "Uninstall failed..."
+#~ msgstr "²¾°£¥¢±Ñ"
 
-#: src/nautilus-window-menus.c:1432
 #, fuzzy
-msgid "_Web Search"
-msgstr "·j´Mºô¯¸"
+#~ msgid "Install failed..."
+#~ msgstr "¦w¸Ë¥¢±Ñ"
 
-#: src/nautilus-window-menus.c:1447 src/nautilus-window-menus.c:1833
-msgid "_Undo"
-msgstr "´_­ì"
+#~ msgid "Force install"
+#~ msgstr "±j¨î¦w¸Ë"
 
-#: src/nautilus-window-menus.c:1448 src/nautilus-window-menus.c:1833
-msgid "Undo the last text change"
-msgstr "´_­ì³Ì«á¤å¦r­×§ï"
+#~ msgid "Set port numer (80)"
+#~ msgstr "³]©w¶Ç¿é°ð (¹w³] 80)"
 
-#: src/nautilus-window-menus.c:1524
-msgid "_Select All"
-msgstr "¥þ¿ï"
+#~ msgid "Set tmp dir (/tmp/eazel-install)"
+#~ msgstr "³]©w¼È¦sÀɮץؿý (¹w³] /tmp/eazel-install)"
 
-#: src/nautilus-window-menus.c:1538
-msgid "_Customize..."
-msgstr "­×§ï..."
+#~ msgid "Creating temporary download directory ...\n"
+#~ msgstr "³]¸m¤U¸üÀɮ׼Ȧs¥Ø¿ý...\n"
 
-#: src/nautilus-window-menus.c:1539
-msgid ""
-"Displays the Property Browser, to add properties to objects and customize "
-"appearance"
-msgstr "Åã¥Ü¯S©ÊÂsÄý¾¹,¥[¤Jª«¥ó©M¼Ò¦¡"
+#~ msgid "Could not create temporary directory!\n"
+#~ msgstr "µLªk«Ø¨î¼È¦s¥Ø¿ý!\n"
 
-#: src/nautilus-window-menus.c:1550
-msgid "_Change Appearance..."
-msgstr "§ïÅÜÅã¥Ü¤è¦¡..."
+#~ msgid "Using local protocol cannot resolve library dependencies"
+#~ msgstr "µLªk¥H¥»¾÷¨ó©w¸Ñ¨M¨ç¦¡®w¬Û¨Ì©Ê°ÝÃD"
 
-#: src/nautilus-window-menus.c:1551
-msgid ""
-"Displays a list of alternative appearances, to allow you to change the "
-"appearance"
-msgstr ""
-"±N¥i¨Ï¥ÎªºÅã¥Ü¤è¦¡¦C¥X,\n"
-"Åý±z§ïÅÜÅã¥Ü¤è¦¡."
+#, fuzzy
+#~ msgid "Using local protocol cannot fetch by id"
+#~ msgstr "µLªk¥H¥»¾÷¨ó©w¸Ñ¨M¨ç¦¡®w¬Û¨Ì©Ê°ÝÃD"
 
-#: src/nautilus-window-menus.c:1567
-msgid "_Refresh"
-msgstr "§ó·s"
+#, fuzzy
+#~ msgid "Could not get a URL for package id %s"
+#~ msgstr "µLªk¨ú±o %s ªºURL"
 
-#. Title computed dynamically
-#: src/nautilus-window-menus.c:1581
-msgid "Change the visibility of this window's sidebar"
-msgstr "Åã¥Ü©ÎÁôÂóo­Óµøµ¡ªº»²§U¤u¨ã¦C"
+#, fuzzy
+#~ msgid "Could not retrieve a URL for id %s"
+#~ msgstr "µLªk«ì´_ %s ªºURL"
 
-#. Title computed dynamically
-#: src/nautilus-window-menus.c:1592
-msgid "Change the visibility of this window's tool bar"
-msgstr "Åã¥Ü©ÎÁôÂóo­Óµøµ¡ªº¤u¨ã¦C"
+#~ msgid "Dry Run Mode Activated.  Packages will not actually be installed ..."
+#~ msgstr "Dry Run ¼Ò¦¡±Ò°Ê,®M¥ó²{¦bµLªk¦w¸Ë......"
 
-#. Title computed dynamically
-#: src/nautilus-window-menus.c:1603
-msgid "Change the visibility of this window's location bar"
-msgstr "Åã¥Ü©ÎÁôÂóo­Óµøµ¡ªº¦ì¸m¦C"
+#, fuzzy
+#~ msgid "*** Could not create tmp directory (%s)! ***\n"
+#~ msgstr "*** µLªk³]¸mªA°È¥Ø¿ý! ***\n"
 
-#. Title computed dynamically
-#: src/nautilus-window-menus.c:1614
-msgid "Change the visibility of this window's status bar"
-msgstr "Åã¥Ü©ÎÁôÂóo­Óµøµ¡ªºª¬ºA¦C"
+#, fuzzy
+#~ msgid "Reading the install package list %s"
+#~ msgstr "Ū¨ú¦w¸Ë®M¥ó¦Cªí¤¤..."
+
+#~ msgid "Category = %s"
+#~ msgstr "¶µ¥Ø = %s"
 
-#: src/nautilus-window-menus.c:1630
 #, fuzzy
-msgid "Zoom _In"
-msgstr "©ñ¤j"
+#~ msgid "Preflight (%d bytes, %d packages)"
+#~ msgstr "¶µ¥Ø = %s, %d ­Ó®M¥ó"
 
-#: src/nautilus-window-menus.c:1631
 #, fuzzy
-msgid "Show the contents in more detail"
-msgstr "(¦³¨Ç¥Ø¿ýµLªkŪ¨ú)"
+#~ msgid "Removing package %s %s"
+#~ msgstr "§R°£®M¥ó %s "
+
+#~ msgid "RPM package database query failed !"
+#~ msgstr "µLªk¨ú±oRPM®M¥ó¸ê®Æ®w¸ê®Æ!"
 
-#: src/nautilus-window-menus.c:1642
 #, fuzzy
-msgid "Zoom _Out"
-msgstr "ÁY¤p"
+#~ msgid "Preparing package system"
+#~ msgstr "§R°£®M¥ó %s "
 
-#: src/nautilus-window-menus.c:1643
-msgid "Show the contents in less detail"
-msgstr "Åã¥Ü¤@¨Ç²Ó¸`"
+#~ msgid "%s conflicts %s-%s"
+#~ msgstr "%s »P %s-%s ¬Û½Ä"
 
-#: src/nautilus-window-menus.c:1654
 #, fuzzy
-msgid "_Normal Size"
-msgstr "¤@¯ë¿ï³æ"
+#~ msgid "Processing dep for %s, requires library %s"
+#~ msgstr "À˹î %s ªº¬Û¨Ì©Ê : »Ý­n %s"
 
-#: src/nautilus-window-menus.c:1655
-msgid "Show the contents at the normal size"
-msgstr "¥H¥¿±`¤j¤pÅã¥Ü"
+#, fuzzy
+#~ msgid "Processing dep for %s, requires package %s"
+#~ msgstr "À˹î %s ªº¬Û¨Ì©Ê : »Ý­n %s"
 
-#: src/nautilus-window-menus.c:1670
-msgid "_Back"
-msgstr "«e¤@­¶"
+#, fuzzy
+#~ msgid "%d dependency failure(s)"
+#~ msgstr "%d ¨Ì¦s©Ê¥¢±Ñ!"
 
-#: src/nautilus-window-menus.c:1682
-msgid "_Forward"
-msgstr "¤U¤@­¶"
+#~ msgid "Dependencies are ok"
+#~ msgstr "¨Ì¦s©Ê¥¿½TµL»~"
 
-#: src/nautilus-window-menus.c:1694
 #, fuzzy
-msgid "_Up a Level"
-msgstr "¨Ï¥ÎªÌµ¥¯Å"
+#~ msgid "Downloading package %s ..."
+#~ msgstr "¤U¸ü %s ¤¤..."
 
-#: src/nautilus-window-menus.c:1706
-msgid "_Home"
-msgstr "­º­¶"
+#, fuzzy
+#~ msgid "Preparing to install 1 package"
+#~ msgstr "Ū¨ú¦w¸Ë®M¥ó¦Cªí¤¤..."
 
-#: src/nautilus-window-menus.c:1719
-msgid "For_get History"
-msgstr ""
+#, fuzzy
+#~ msgid "Preparing to install %d packages"
+#~ msgstr "Ū¨ú¦w¸Ë®M¥ó¦Cªí¤¤..."
 
-#: src/nautilus-window-menus.c:1720
-msgid "Clear contents of Go menu and Back/Forward lists"
-msgstr ""
+#, fuzzy
+#~ msgid "Installation aborted."
+#~ msgstr "¦w¸Ë®É¶¡: "
 
-#: src/nautilus-window-menus.c:1735
-msgid "_Add Bookmark"
-msgstr "·s¼W®ÑÅÒ"
+#, fuzzy
+#~ msgid ""
+#~ "Installation Failed!\n"
+#~ "\n"
+#~ msgstr "¦w¸Ë¥¢±Ñ"
 
-#: src/nautilus-window-menus.c:1736
-msgid "Add a bookmark for the current location to this menu"
-msgstr "±N¦¹­¶¥[¤J®ÑÅÒ"
+#, fuzzy
+#~ msgid "Could not fetch summary configuration !"
+#~ msgstr "*** µLªk«Ø¨î¹w³]³]©wÀÉ®×! ***\n"
 
-#: src/nautilus-window-menus.c:1747
-msgid "_Edit Bookmarks..."
-msgstr "½s¿è®ÑÅÒ..."
+#, fuzzy
+#~ msgid "The summary configuration contains no data!\n"
+#~ msgstr "*** ³]©wÀɵL¸ê®Æ! ***\n"
 
-#: src/nautilus-window-menus.c:1748
-msgid "Display a window that allows editing the bookmarks in this menu"
-msgstr "¦b¦¹¿ï³æ¤¤½s¿è²{¦³®ÑÅÒ"
+#, fuzzy
+#~ msgid "Cannot find the SUMMARY_DATA xmlnode!\n"
+#~ msgstr "*** §ä¤£¨ì CATEGORIES xmnode! ***\n"
 
-#: src/nautilus-window-menus.c:1763
-msgid "_About Nautilus..."
-msgstr "¦³Ãö Nautilus..."
+#, fuzzy
+#~ msgid "Bailing from the SUMMARY_DATA parse!\n"
+#~ msgstr "*** ±q category parse ¸õ¥X ! ***\n"
 
-#: src/nautilus-window-menus.c:1764
-msgid "Displays information about the Nautilus program"
-msgstr "Åã¥Ü Nautilus ªº¬ÛÃö°T®§"
+#, fuzzy
+#~ msgid "Bailing from summary configuration parse!\n"
+#~ msgstr "*** ±q category parse ¸õ¥X ! ***\n"
+
+#~ msgid "display service name and such"
+#~ msgstr "¦C¥XªA°È¦WºÙ"
 
-#: src/nautilus-window-menus.c:1817
-msgid "Edit Settings..."
-msgstr "½s¿è³]©w..."
+#~ msgid "maximum allowed difference in seconds"
+#~ msgstr "maximum alowed difference in seconds"
 
-#: src/nautilus-window-menus.c:1818
-msgid "Edit Settings for the Current User Level"
-msgstr "§ï¬°¥Ø«eµ¥¯Åªº³]©w"
+#~ msgid "update the system clock"
+#~ msgstr "§ó·s¨t²Î®É¶¡"
 
-#: src/nautilus-window-menus.c:1882
-msgid "_Browse"
-msgstr " ÂsÄý"
+#~ msgid "specify time url"
+#~ msgstr "»¡©ú URL ®É¶¡"
 
-#: src/nautilus-window-menus.c:1883
 #, fuzzy
-msgid "_Find"
-msgstr "§¹¦¨"
+#~ msgid "Could not read time-service config from %s"
+#~ msgstr "µLªk«ì´_ %s ªºURL"
 
-#: src/nautilus-window-toolbars.c:109
-msgid "Back"
-msgstr "«e¤@­¶"
+#~ msgid "Vault location"
+#~ msgstr "Àx¦s¦ì¸m"
 
-#: src/nautilus-window-toolbars.c:114
-msgid "Forward"
-msgstr "¤U¤@­¶"
+#~ msgid "Error: No operation supplied\n"
+#~ msgstr "¿ù»~:¨S¦³¥i¤ä´©ªº¾Þ§@¼Ò¦¡\n"
 
-#: src/nautilus-window-toolbars.c:119
-msgid "Up"
-msgstr "Up"
+#~ msgid "Error: Invalid operation supplied (%s)\n"
+#~ msgstr "¿ù»~:¤£½T¹êªº¾Þ§@¼Ò¦¡(%s)\n"
+
+#~ msgid ""
+#~ "Error: Invalid syntax\n"
+#~ "Syntax: %s\n"
+#~ msgstr "¿ù»~:¥¼ª¾ªí¥Üªk: %s\n"
+
+#~ msgid "moved"
+#~ msgstr "¤w²¾°Ê"
+
+#~ msgid "You cannot throw \"%s\" into the Trash."
+#~ msgstr "§A¤£¯à§â \"%s\" ¥á¨ì©U§£±í "
 
-#: src/nautilus-window-toolbars.c:124
 #, fuzzy
-msgid "Refresh"
-msgstr "¤§«e"
+#~ msgid "Folder Views"
+#~ msgstr "²M°£»²§U¤u¨ã"
 
-#: src/nautilus-window-toolbars.c:131
-msgid "Home"
-msgstr "®a¥Ø¿ý"
+#, fuzzy
+#~ msgid "Folder Views Settings"
+#~ msgstr "¥Ø¿ýÂsÄý³]©w"
+
+#~ msgid "Window Behavior"
+#~ msgstr "µøµ¡¦æ¬°"
+
+#~ msgid "Sidebar Panels Description"
+#~ msgstr "»²§U¤u¨ã»¡©ú"
+
+#~ msgid "Choose which panels should appear in the sidebar"
+#~ msgstr "¿ï¾Ü»²§U¤u¨ã¤º®e"
+
+#~ msgid "Appearance Settings"
+#~ msgstr "Åã¥Ü¼Ò¦¡³]©w"
 
-#: src/nautilus-window-toolbars.c:136
 #, fuzzy
-msgid "Find"
-msgstr "§¹¦¨"
+#~ msgid "Views"
+#~ msgstr "ÂsÄý"
 
-#: src/nautilus-window-toolbars.c:141
-msgid "Web Search"
-msgstr "·j´Mºô¯¸"
+#~ msgid "Speed Tradeoffs Settings"
+#~ msgstr "§Ö³tÂsÄý³]©w"
 
-#: src/nautilus-window-toolbars.c:154
-msgid "Services"
-msgstr "Services"
+#~ msgid "Search Tradeoffs"
+#~ msgstr "§Ö³t·j´M"
 
-#. This is marked for localization in case the % sign is not
-#. * appropriate in some locale. I guess that's unlikely.
-#.
-#: src/nautilus-zoom-control.c:565
-msgid "%.0f%%"
-msgstr "%.0f%%"
+#, fuzzy
+#~ msgid "Navigation Settings"
+#~ msgstr "¾É´M³]©w..."
+
+#, fuzzy
+#~ msgid "Home Location"
+#~ msgstr "§A®a¦í§}"
+
+#~ msgid "current theme"
+#~ msgstr "¥Ø«e­·®æ"
+
+#, fuzzy
+#~ msgid "Ask before deleting items from the trash"
+#~ msgstr "±N¤w¿ï¶µ¥Ø¥á¨ì©U§£±í"
+
+#~ msgid "Click policy"
+#~ msgstr "ÂI¿ï¼Ò¦¡"
+
+#, fuzzy
+#~ msgid "Display text in icons"
+#~ msgstr "¦b¹Ï¥Ü¤ºÅã¥Ü¤å¦r"
+
+#, fuzzy
+#~ msgid "Show thumbnails for image files"
+#~ msgstr "¹wÄý¹Ï¹³ÀÉ®×"
+
+#, fuzzy
+#~ msgid "Read and write metadata in each folder"
+#~ msgstr "Ū¼g¨C¤@­Ó¥Ø¿ýªºmetadata"
+
+#~ msgid "Font family used to display file names"
+#~ msgstr "Åã¥ÜÀɮשҭn¥Îªº¦r§Î"
+
+#~ msgid "Always do slow, complete search"
+#~ msgstr "¥Ã»·¨Ï¥Î¦a´à¦¡·j´M"
+
+#, fuzzy
+#~ msgid "Can add Content"
+#~ msgstr "¥i¼W¥[¤º®e"
+
+#~ msgid ""
+#~ "Sorry, %s can only open local files, and \"%s\" is remote. If you want to "
+#~ "open it with %s, make a local copy first."
+#~ msgstr ""
+#~ "©êºp, %s ¥u¯à¶}±Ò³o¥x¹q¸£¤WªºÀÉ®×,¦ý¬O \"%s\" ¦b»·ºÝ¹q¸£¤W.¦pªG±z­n¥H %s "
+#~ "¶}±Ò³o­ÓÀÉ®×,½Ð¥ý±N½Æ»s¤@¥÷¨ì±zªº¹q¸£¤W."
+
+#, fuzzy
+#~ msgid "that don't contain \"%s\""
+#~ msgstr "¦WºÙ¤£¥]§t \"%s\""
+
+#, fuzzy
+#~ msgid "regular files"
+#~ msgstr "¼Ð·ÇÀÉ®×"
+
+#, fuzzy
+#~ msgid "applications"
+#~ msgstr "À³¥Îµ{¦¡"
+
+#, fuzzy
+#~ msgid "directories"
+#~ msgstr "0 ­Ó¥Ø¿ý"
+
+#, fuzzy
+#~ msgid "marked with \"%s\""
+#~ msgstr "¥H...¼Ð°O"
+
+#, fuzzy
+#~ msgid "that"
+#~ msgstr "ª¬ºA"
+
+#~ msgid "Reset _Background"
+#~ msgstr "­«³]­I´º"
+
+#~ msgid "Choose an order for the icons in this folder"
+#~ msgstr "¿ï¾Ü¦¹¨÷©v¤¤¹Ï¥Üªº±Æ¦C¤è¦¡"
+
+#~ msgid "Where:"
+#~ msgstr "¥X³B:"
+
+#~ msgid "Indexing Info..."
+#~ msgstr "±Æ§Ç¸ê°T..."
+
+#, fuzzy
+#~ msgid "Error while trying to reindex: %s"
+#~ msgstr "%s ªº¯Á¤Þ·j´M¿ù»~"
+
+#, fuzzy
+#~ msgid "User Main Directory"
+#~ msgstr "¥Ø¿ý"
+
+#, fuzzy
+#~ msgid "Desktop Directory"
+#~ msgstr "¥Ø¿ý"
+
+#, fuzzy
+#~ msgid "Missing Directories"
+#~ msgstr "0 ­Ó¥Ø¿ý"
+
+#~ msgid ""
+#~ "Nautilus can't be used now. Rebooting the computer or installing Nautilus "
+#~ "again may fix the problem."
+#~ msgstr ""
+#~ "Nautilus ²{¦bµLªk¨Ï¥Î,­«·s¶}¾÷©ÎªÌ­«·s¦w¸Ë Nautilis ©Î³\\¥i¥H¸Ñ¨M³o­Ó°ÝÃD."
+
+#~ msgid ""
+#~ "For beginner users that are not yet\n"
+#~ "familiar with the working of GNOME and Linux."
+#~ msgstr "¬°Linux¤ÎGNOMEªº·s¤âªÌ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Eazel offers a growing number of services to \n"
+#~ "help you install and maintain new software and manage \n"
+#~ "your files across the network.  If you want to find out more \n"
+#~ "about Eazel services, just press the 'Next' button. "
+#~ msgstr ""
+#~ " Eazel ´£¨Ñ§ó¦hªº¸óºô¸ôªº³nÅé¦w¸Ë¤Î¨Ï¥ÎªA°È.\n"
+#~ "¦pªG±z·Qª¾¹D§ó¦h¦³ÃöEazelªºªA°È¸ê°T,\n"
+#~ "½Ð«ö¤U'¤U¤@¨B'"
+
+#~ msgid "I want to learn more about Eazel services."
+#~ msgstr "§Ú·Qª¾¹D§ó¦hªº Eazel ªºªA°È¸ê°T."
+
+#~ msgid "I want to sign up for Eazel services now."
+#~ msgstr "§Ú·Q¥ß§Y¨ú±oEazelªºªA°È."
+
+#~ msgid "I've already signed up and want to login now."
+#~ msgstr "§Ú¤w¸gµù¥U¦Ó¥B·Q¥ß¨èµn¤J"
+
+#, fuzzy
+#~ msgid "I don't want to learn about Eazel services at this time."
+#~ msgstr "§Ú²{¦b¤£·Q¨ú±oEazelªºªA°È."
+
+#, fuzzy
+#~ msgid ""
+#~ "Nautilus will now contact Eazel services to verify your \n"
+#~ "web connection and download the latest updates.  \n"
+#~ "Click the Next button to continue."
+#~ msgstr ""
+#~ "Nautilus ²{¦b¥¿¦b³sµ²eazelªº¦øªA¾¹;\n"
+#~ "À°±z¤É¯Å©Î­×¥¿¯äÂÎ,\n"
+#~ "½Ð«ö¤U'¤U¤@¨B',Ä~Äò°õ¦æµ{¦¡."
+
+#, fuzzy
+#~ msgid "Updating Nautilus"
+#~ msgstr "¦³Ãö Nautilus..."
+
+#, fuzzy
+#~ msgid "No, I don't wish to connect and update Nautilus now."
+#~ msgstr "¤£,§Ú¤é«á¦A³B²z"
+
+#, fuzzy
+#~ msgid "HTTP Proxy Configuration"
+#~ msgstr "³]©w"
+
+#, fuzzy
+#~ msgid ""
+#~ "We are now contacting the Eazel service to test your \n"
+#~ "web connection and update Nautilus."
+#~ msgstr ""
+#~ "²{¦b¥¿¦b¬°±zªºNautilus¤É¯Å,\n"
+#~ "·íµ{¦¡§¹¦¨³o­Ó°Ê§@®É,±N·|¦Û°Ê¶i¤J¤U¤@­¶."
+
+#, fuzzy
+#~ msgid ""
+#~ "Since this is the first time that you've launched\n"
+#~ "Nautilus, we'd like to ask you a few questions\n"
+#~ "to help personalize it for your use."
+#~ msgstr ""
+#~ "Åwªï¨Ï¥Î Nautilus!\n"
+#~ "¦b±z²Ä¤@¦¸¨Ï¥Î®É,\n"
+#~ "§Ú­Ì§Æ±æ¯à¥H¤¬°Êªº¤è¦¡À°±z§@¤@¨Ç­Ó¤H¤Æ³]©w.\n"
+#~ "\n"
+#~ "½Ð«ö¤Unext«ö¶sÄ~Äò"
+
+#, fuzzy
+#~ msgid ""
+#~ "Click the finish button to launch Nautilus.\n"
+#~ "We hope that you enjoy using it!"
+#~ msgstr ""
+#~ "½Ð«ö¤U§¹¦¨«ö¶s,°õ¦æNautilus.\n"
+#~ "\n"
+#~ "§Æ±æ±z¨Ï¥Î´r§Ö"
+
+#, fuzzy
+#~ msgid "Select A User Level"
+#~ msgstr "¿ï¾Ü¨Ï¥ÎªÌµ¥¯Å"
+
+#, fuzzy
+#~ msgid "Don't draw background and icons on desktop."
+#~ msgstr "¦b®à­±¤W¹º¤W¹Ï¥Ü©M­I´º"
+
+#~ msgid "Draw background and icons on desktop."
+#~ msgstr "¦b®à­±¤W¹º¤W¹Ï¥Ü©M­I´º"
+
+#, fuzzy
+#~ msgid "nautilus: --quit and --start-desktop cannot be used together.\n"
+#~ msgstr "nauitlus: ¤£¯à±N --quit ©M--start-desktop ¤@°_¨Ï¥Î.\n"
+
+#, fuzzy
+#~ msgid "nautilus: --restart and --start-desktop cannot be used together.\n"
+#~ msgstr "nauitlus: ¤£¯à±N --quit ©M--start-desktop ¤@°_¨Ï¥Î.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "nautilus: --stop-desktop and --start-desktop cannot be used together.\n"
+#~ msgstr "nautilus: ¤£¯à±N --stop-desktop ©M --start-desktop ¤@°_¨Ï¥Î.\n"
+
+#~ msgid "Add a new %s"
+#~ msgstr "¥[¤J·sªº %s "
+
+#~ msgid "With Emblem"
+#~ msgstr "¶H¼x"
+
+#~ msgid "Last Modified"
+#~ msgstr "³Ì«á­×§ï¤é´Á"
+
+#~ msgid "Owned By"
+#~ msgstr "©Ò¦³ªÌ"
+
+#~ msgid "starts with"
+#~ msgstr "¥H...¶}©l"
+
+#~ msgid "ends with"
+#~ msgstr "¥H...µ²§ô"
+
+#~ msgid "matches glob"
+#~ msgstr "¤ñ¹ï glob"
+
+#~ msgid "matches regexp"
+#~ msgstr "¤ñ¹ï²Å¦X¬ö¿ý"
+
+#, fuzzy
+#~ msgid "includes all of"
+#~ msgstr "¥]§t"
+
+#, fuzzy
+#~ msgid "includes any of"
+#~ msgstr "¥]§t"
+
+#, fuzzy
+#~ msgid "includes none of"
+#~ msgstr "¥]§t"
+
+#~ msgid "is not"
+#~ msgstr "¤£¬O"
+
+#~ msgid "text file"
+#~ msgstr "¯Â¤å¦rÀÉ®×"
+
+#~ msgid "application"
+#~ msgstr "À³¥Îµ{¦¡"
+
+#~ msgid "directory"
+#~ msgstr "¥Ø¿ý"
+
+#~ msgid "larger than"
+#~ msgstr "¤j©ó..."
+
+#~ msgid "smaller than"
+#~ msgstr "¤p©ó..."
+
+#~ msgid "marked with"
+#~ msgstr "¥H...¼Ð°O"
+
+#~ msgid "not marked with"
+#~ msgstr "¤£¥H...¼Ð°O"
+
+#, fuzzy
+#~ msgid "is after"
+#~ msgstr "¤§«á"
+
+#, fuzzy
+#~ msgid "is before"
+#~ msgstr "¤§«e"
+
+#~ msgid "is yesterday"
+#~ msgstr "¬Q¤é"
+
+#, fuzzy
+#~ msgid ""
+#~ "The Nautilus shell is under development; it's not\n"
+#~ "ready for daily use. Some features are not yet done,\n"
+#~ "partly done, or unstable. The program doesn't look\n"
+#~ "or act exactly the way it will in version 1.0.\n"
+#~ "\n"
+#~ "If you do decide to test this version of Nautilus, \n"
+#~ "beware. The program could do something \n"
+#~ "unpredictable and may even delete or overwrite \n"
+#~ "files on your computer.\n"
+#~ "\n"
+#~ "For more information, visit http://nautilus.eazel.com."
+#~ msgstr ""
+#~ " Nautilus Shell ÁÙ¦b«Ø¸m¤¤,®£©ÈÁÙ¤£¯à¥¿±`¨Ï¥Î.\n"
+#~ "³\\¦h¥\\¯à,¥]¬A³\\¦h«Ü´Îªº¥\\¯à,ÁÙ¤£¯à¨Ï¥Î.\n"
+#~ "½Ðµ¥«Ý1.0ª©ªºNautilus.\n"
+#~ "\n"
+#~ "¦pªG±z°í«ù¨Ï¥Î,¨º½Ð°È¥²¤p¤ß.\n"
+#~ "¦pªG±z»Ý­n§ó¦h¸ê°T,½Ð¨ì http://natilus.eazel.com "
+
+#, fuzzy
+#~ msgid "Inadequate Permissions"
+#~ msgstr "Åv­­"
+
+#~ msgid ""
+#~ "Couldn't display \"%s\", because Nautilus cannot handle items of this type."
+#~ msgstr "µLªk®i¥Ü \"%s\" Nautilus µLªk³B²z³oºØ®æ¦¡"
+
+#, fuzzy
+#~ msgid "Switch to %s Level?"
+#~ msgstr "¤Á´«¨ì¦Û­q³W¹º?"
+
+#~ msgid "Go to the specified location"
+#~ msgstr "¨ì«ü©w¦ì¸m"
+
+#, fuzzy
+#~ msgid "Use %s settings"
+#~ msgstr "·j´M³]©w"
+
+#, fuzzy
+#~ msgid "_Web Search"
+#~ msgstr "·j´Mºô¯¸"
+
+#~ msgid "_Customize..."
+#~ msgstr "­×§ï..."
+
+#~ msgid "_Change Appearance..."
+#~ msgstr "§ïÅÜÅã¥Ü¤è¦¡..."
+
+#~ msgid ""
+#~ "Displays a list of alternative appearances, to allow you to change the "
+#~ "appearance"
+#~ msgstr ""
+#~ "±N¥i¨Ï¥ÎªºÅã¥Ü¤è¦¡¦C¥X,\n"
+#~ "Åý±z§ïÅÜÅã¥Ü¤è¦¡."
+
+#~ msgid "Edit Settings..."
+#~ msgstr "½s¿è³]©w..."
+
+#~ msgid "Edit Settings for the Current User Level"
+#~ msgstr "§ï¬°¥Ø«eµ¥¯Åªº³]©w"
+
+#~ msgid "_Browse"
+#~ msgstr " ÂsÄý"
 
 #~ msgid "Specify config file (/var/eazel/services/eazel-services-config.xml)"
 #~ msgstr "«ü©w³]©wÀÉ (¹w³] /var/eazel/services/eazel-services-config.xml)"
@@ -4906,9 +10976,6 @@ msgstr "%.0f%%"
 #~ msgid "*** Could not generate xml package list! ***\n"
 #~ msgstr "*** µLªk²£¥Í xml ®M¥ó¦Cªí! ***\n"
 
-#~ msgid "XML package list successfully generated ...\n"
-#~ msgstr "XML ®M¥óªí¤w¦¨¥\\²£¥Í...\n"
-
 #~ msgid "*** Could not create temporary directory! ***\n"
 #~ msgstr "µLªk«Ø¥ß¼È¦s¥Ø¿ý!\n"
 
@@ -4942,9 +11009,6 @@ msgstr "%.0f%%"
 #~ msgid "Transaction completed normally...\n"
 #~ msgstr "Àɮ׶ǿé¤w¥¿±`§¹¦¨...\n"
 
-#~ msgid "Lookup package in the db"
-#~ msgstr "¦b¸ê®Æ®w¤¤´M§ä®M¥ó"
-
 #~ msgid "Who owns specified files"
 #~ msgstr "¾Ö¦³«ü©wÀɮתÌ"
 
@@ -4963,9 +11027,6 @@ msgstr "%.0f%%"
 #~ msgid "Finish"
 #~ msgstr "§¹¦¨"
 
-#~ msgid "Stored"
-#~ msgstr "Àx¦s"
-
 #~ msgid "on this computer"
 #~ msgstr "¦b³o¥x¹q¸£¤W·j´M"
 
@@ -5057,9 +11118,6 @@ msgstr "%.0f%%"
 #~ "\n"
 #~ "¯¬±z°·±d§Ö¼Ö."
 
-#~ msgid "Nautilus install tool"
-#~ msgstr "Nautilus ¦w¸Ë¤u¨ã"
-
 #~ msgid "Step one:"
 #~ msgstr "¨BÆJ¤@"
 
@@ -5091,16 +11149,10 @@ msgstr "%.0f%%"
 #~ msgid "Couldn't find pixmap file: %s"
 #~ msgstr "µLªk§ä¨ìÂI°}¹ÏÀÉ®×: %s "
 
-#~ msgid "Couldn't create pixmap from file: %s"
-#~ msgstr "µLªk«Ø¥ßÂI°}¹ÏÀÉ®×±qÀÉ®×: %s "
-
 #, fuzzy
 #~ msgid "Nautilus Update Progress"
 #~ msgstr "Nautilus ¤É¯Åµ{¦¡"
 
-#~ msgid "Nautilus: caveat"
-#~ msgstr "Nautilus: ³qª¾"
-
 #~ msgid "Transfer Progress"
 #~ msgstr "¶Ç¿é¶i«×"
 
@@ -5110,21 +11162,12 @@ msgstr "%.0f%%"
 #~ msgid "Contacting %s"
 #~ msgstr "Ápô %s"
 
-#~ msgid "Waiting for a connection..."
-#~ msgstr "µ¥«Ý³s±µ¤¤..."
-
 #~ msgid "Logging in..."
 #~ msgstr "µn¤J..."
 
-#~ msgid "Read %d%%%% of %ld"
-#~ msgstr "¤wŪ¨ú %d%%%% of %ld"
-
 #~ msgid "Read %ld bytes"
 #~ msgstr "¤wŪ¨ú %ld bytes"
 
-#~ msgid "Read %d bytes"
-#~ msgstr "¤wŪ¨ú %d bytes"
-
 #~ msgid "Reading..."
 #~ msgstr "Ū¨ú¤¤..."
 
@@ -5206,27 +11249,12 @@ msgstr "%.0f%%"
 #~ msgid "Search results for items %s %s%s"
 #~ msgstr " %s %s%s ªº·j´Mµ²ªG"
 
-#~ msgid "Search results for items whose name contains \"stuff\"."
-#~ msgstr "¦WºÙ±ø¥ó¥]§t \"stuff\" ªº·j´Mµ²ªG"
-
-#~ msgid " -_,;.?/&"
-#~ msgstr " -_,;.?/&"
-
-#~ msgid "Nautilus: View as Other"
-#~ msgstr "Nautilus: ½Ð¥H¨ä¥Lµ{¦¡ÂsÄý"
-
-#~ msgid "_Cut"
-#~ msgstr " °Å¤U"
-
 #~ msgid "Remove selected text from selection"
 #~ msgstr "§R°£¿ï¾Ü°Ï¬q¤ºªº¤å¦r"
 
 #~ msgid "_Copy"
 #~ msgstr " ½Æ»s"
 
-#~ msgid "Copy selected text to the clipboard"
-#~ msgstr "±N¿ï¾Üªº¤å¦r½Æ»s¨ì°Å¶Kï"
-
 #~ msgid "_Paste"
 #~ msgstr " ¶K¤W"
 
@@ -5248,13 +11276,6 @@ msgstr "%.0f%%"
 #~ msgid "File copy error"
 #~ msgstr "Àɮ׽ƻs¿ù»~"
 
-#~ msgid ""
-#~ "Error \"%s\" copying file %s.\n"
-#~ "Would you like to continue?"
-#~ msgstr ""
-#~ "¿ù»~ \"%s\" ½Æ»sÀÉ®× %s.\n"
-#~ "½T©w­nÄ~Äò¶Ü?"
-
 #~ msgid "File copy conflict"
 #~ msgstr "Àɮ׽ƻs®Éµo¥Í¤£¬Û®eªº°ÝÃD"
 
@@ -5275,21 +11296,9 @@ msgstr "%.0f%%"
 #~ msgid "Bug alert!"
 #~ msgstr "·í±¼¤F...:-( !"
 
-#~ msgid "OK"
-#~ msgstr "OK"
-
-#~ msgid "You cannot move the Trash."
-#~ msgstr "§A¤£¯à²¾°Ê©U§£±í"
-
 #~ msgid "You cannot throw away the Trash."
 #~ msgstr "§A¥u¯à¥á¨ì©U§£±í"
 
-#~ msgid "%s%s"
-#~ msgstr "%s%s"
-
-#~ msgid "Cancel"
-#~ msgstr "¨ú®ø"
-
 #~ msgid "Nautilus: Icon Captions"
 #~ msgstr "Nautilus: ¹Ï¥Ü»¡©ú"
 
@@ -5310,12 +11319,6 @@ msgstr "%.0f%%"
 #~ msgid "Nautilus: %s Properties"
 #~ msgstr "Nautilus: %s ©Ê½è"
 
-#~ msgid "Nautilus: Bookmarks"
-#~ msgstr "Nautilus: ®ÑÅÒ"
-
-#~ msgid "Nautilus: %s"
-#~ msgstr "Nautilus: %s"
-
 #~ msgid ""
 #~ "Sorry, searching can't be used now. In the future this message will be more "
 #~ "helpful."
@@ -5335,31 +11338,6 @@ msgstr "%.0f%%"
 #~ msgid "Show the searching controls instead of the location"
 #~ msgstr "¥H¾±±±¨î¨ú¥N¦ì¸m"
 
-#, fuzzy
-#~ msgid "Search the World Wide Web"
-#~ msgstr "·j´M³o­Óºô¯¸"
-
-#~ msgid "Display the latest contents of the current location"
-#~ msgstr "Åã¥Ü³o­Ó¦ì¸mªº³Ì·s¤º®e"
-
-#~ msgid "Go to the previous visited location"
-#~ msgstr "¨ì«e¤@­Ó¦ì¸m"
-
-#~ msgid "Go to the location that contains this one"
-#~ msgstr "¨ì¥]§t³o­Ó¦ì¸mªº¦a¤è"
-
-#~ msgid "Go to the home location"
-#~ msgstr "¨ì­º­¶"
-
-#~ msgid " Novice"
-#~ msgstr "·s¤â"
-
-#~ msgid "Set Novice User Level"
-#~ msgstr "µæ³¾µ¥¯Å"
-
-#~ msgid " Intermediate"
-#~ msgstr "¶i¶¥"
-
 #~ msgid "Set Intermediate User Level"
 #~ msgstr "¶i¶¥µ¥¯Å"
 
@@ -5378,12 +11356,6 @@ msgstr "%.0f%%"
 #~ msgid "Go up a level in the directory hierarchy"
 #~ msgstr "¨ì¤W¤@¼h¥Ø¿ý"
 
-#~ msgid "Go to your home directory"
-#~ msgstr "¨ì®a¥Ø¿ý"
-
-#~ msgid "Search this computer for files"
-#~ msgstr "¦b³o¥x¹q¸£¤W·j´M"
-
 #~ msgid "Search the web"
 #~ msgstr "·j´M³o­Óºô¯¸"
 
@@ -5396,9 +11368,6 @@ msgstr "%.0f%%"
 #~ msgid "this week"
 #~ msgstr "¥»¶g"
 
-#~ msgid "Novice"
-#~ msgstr "·s¤â«ü«n"
-
 #~ msgid "Hacker"
 #~ msgstr "Àb«È"
 
@@ -5411,20 +11380,6 @@ msgstr "%.0f%%"
 #~ msgid "For expert users"
 #~ msgstr "±M®aµ¥¯Å"
 
-#~ msgid "This is a placeholder - the real thing is coming soon"
-#~ msgstr "³o¬O¹w§i,·q½Ð´Á«Ý."
-
-#~ msgid "Display Sidebar"
-#~ msgstr "Åã¥Ü»²§U¤u¨ã"
-
-#, fuzzy
-#~ msgid "name matches glob \"%s\""
-#~ msgstr "¦WºÙ¤ñ¹ï²Å¦X glob"
-
-#, fuzzy
-#~ msgid "owner is not \"%s\""
-#~ msgstr "¥H %s ¦C¦L"
-
 #~ msgid "owner has uid of \"%s\""
 #~ msgstr "©Ò¦³ªÌuid¬° \"%s\""
 
@@ -5432,10 +11387,6 @@ msgstr "%.0f%%"
 #~ msgid "does not have UID"
 #~ msgstr "¨S¦³ UID"
 
-#, fuzzy
-#~ msgid "whose"
-#~ msgstr "½Öªº"
-
 #~ msgid "who"
 #~ msgstr "½Ö"
 
@@ -5445,18 +11396,12 @@ msgstr "%.0f%%"
 #~ msgid "Redo Rename"
 #~ msgstr "Ä~Äò­«·s©R¦W"
 
-#~ msgid "Zoom to Default"
-#~ msgstr "¨Ï¥Î¹w³]¤Ø¤o"
-
 #~ msgid "_Manual Layout"
 #~ msgstr "¤â°Ê³W¹º"
 
 #~ msgid "_Up"
 #~ msgstr " Up"
 
-#~ msgid "Show/Hide Stuff"
-#~ msgstr "Åã¥Ü/ÁôÂà ­n¥ó"
-
 #~ msgid "Reload"
 #~ msgstr "±q·s¸ü¤J"
 
@@ -5472,9 +11417,6 @@ msgstr "%.0f%%"
 #~ msgid "100 KB"
 #~ msgstr "100 KB"
 
-#~ msgid "1 MB"
-#~ msgstr "1 MB"
-
 #~ msgid "10 MB"
 #~ msgstr "10 MB"
 
@@ -5492,15 +11434,9 @@ msgstr "%.0f%%"
 #~ msgid "ftp install not supported"
 #~ msgstr "µLªk¶i¦æFTP¼Ò¦¡¦w¸Ë"
 
-#~ msgid "Are you sure you want to permanently remove the %d selected items?"
-#~ msgstr "§A½T©w­n§â³o %d ­ÓªF¦è¥Ã¤[§R°£¶Ü?"
-
 #~ msgid "Deleting items"
 #~ msgstr "§R°£¤¸¥ó"
 
-#~ msgid "_Delete..."
-#~ msgstr "§R°£..."
-
 #~ msgid "_Restore Icon to Unstretched Size"
 #~ msgstr "±N¹Ï¥Ü¥H¥¼©ñ¤j«eªº¤j¤pÀx¦s"
 
@@ -5510,9 +11446,6 @@ msgstr "%.0f%%"
 #~ msgid "not including"
 #~ msgstr "¤£¥]§t"
 
-#~ msgid "Close Nautilus Desktop"
-#~ msgstr "µ²§ô Nautilus Desktop"
-
 #~ msgid "_Exit"
 #~ msgstr "Â÷¶}"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 30e18c842..09ef4277e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,9 @@ INCLUDES =\
 	-I$(top_builddir) \
 	-I$(top_srcdir)/cut-n-paste-code \
 	-I$(top_builddir)/cut-n-paste-code \
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
+	$(OAF_CFLAGS) \
 	$(BONOBO_CFLAGS) \
 	$(OAF_CFLAGS) \
 	$(GCONF_CFLAGS) \
@@ -32,6 +35,8 @@ LDADD =\
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-adapter/libnautilus-adapter.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la  \
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS) \
 	$(OAF_LIBS) \
 	$(GCONF_LIBS) \
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index b952bc7f0..a42de2c74 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -44,16 +44,16 @@
 #include <libnautilus-extensions/nautilus-file-changes-queue.h>
 #include <libnautilus-extensions/nautilus-file-operations.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-link.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-program-choosing.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-trash-monitor.h>
 #include <libnautilus-extensions/nautilus-volume-monitor.h>
 #include <limits.h>
@@ -116,7 +116,7 @@ static void     free_volume_black_list                            (FMDesktopIcon
 static gboolean	volume_link_is_selection 			  (FMDirectoryView 	  *view);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (FMDesktopIconView,
+EEL_DEFINE_CLASS_BOILERPLATE (FMDesktopIconView,
 				   fm_desktop_icon_view,
 				   FM_TYPE_ICON_VIEW)
 
@@ -233,7 +233,7 @@ fm_desktop_icon_view_destroy (GtkObject *object)
 	
 	g_free (icon_view->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -298,7 +298,7 @@ fm_desktop_icon_view_handle_middle_click (NautilusIconContainer *icon_container,
 static void
 free_volume_black_list (FMDesktopIconView *icon_view)
 {
-	nautilus_g_list_free_deep (icon_view->details->mount_black_list);
+	eel_g_list_free_deep (icon_view->details->mount_black_list);
 	icon_view->details->mount_black_list = NULL;
 }
 
@@ -465,8 +465,8 @@ fm_desktop_icon_view_initialize (FMDesktopIconView *desktop_icon_view)
 	hadj = GTK_LAYOUT (icon_container)->hadjustment;
 	vadj = GTK_LAYOUT (icon_container)->vadjustment;
 
-	nautilus_gtk_adjustment_set_value (hadj, 0);
-	nautilus_gtk_adjustment_set_value (vadj, 0);
+	eel_gtk_adjustment_set_value (hadj, 0);
+	eel_gtk_adjustment_set_value (vadj, 0);
 
 	fm_directory_view_ignore_hidden_file_preferences
 		(FM_DIRECTORY_VIEW (desktop_icon_view));
@@ -539,7 +539,7 @@ fm_desktop_icon_view_initialize (FMDesktopIconView *desktop_icon_view)
 static void
 new_terminal_callback (BonoboUIComponent *component, gpointer data, const char *verb)
 {
-	nautilus_gnome_open_terminal (NULL);
+	eel_gnome_open_terminal (NULL);
 }
 
 static void
@@ -547,7 +547,7 @@ change_background_callback (BonoboUIComponent *component,
 	  		    gpointer data, 
 			    const char *verb)
 {
-	nautilus_launch_application_from_command 
+	eel_launch_application_from_command 
 		("background-properties-capplet", NULL, FALSE);
 }
 
@@ -566,7 +566,7 @@ reset_background_callback (BonoboUIComponent *component,
 			   gpointer data, 
 			   const char *verb)
 {
-	nautilus_background_reset 
+	eel_background_reset 
 		(fm_directory_view_get_background (FM_DIRECTORY_VIEW (data)));
 }
 
@@ -618,7 +618,7 @@ trash_link_is_selection (FMDirectoryView *view)
 	
 	selection = fm_directory_view_get_selection (view);
 
-	if (nautilus_g_list_exactly_one_item (selection)
+	if (eel_g_list_exactly_one_item (selection)
 	    && nautilus_file_is_nautilus_link (NAUTILUS_FILE (selection->data))) {
 		uri = nautilus_file_get_uri (NAUTILUS_FILE (selection->data));
 		/* It's probably OK that this only works for local
@@ -648,7 +648,7 @@ volume_link_is_selection (FMDirectoryView *view)
 	
 	selection = fm_directory_view_get_selection (view);
 
-	if (nautilus_g_list_exactly_one_item (selection)
+	if (eel_g_list_exactly_one_item (selection)
 	    && nautilus_file_is_nautilus_link (NAUTILUS_FILE (selection->data))) {
 		uri = nautilus_file_get_uri (NAUTILUS_FILE (selection->data));
 		/* It's probably OK that this only works for local
@@ -770,9 +770,9 @@ icon_view_handle_uri_list (NautilusIconContainer *container, const char *item_ur
 		stripped_uri = NULL;
 		made_entry_link = FALSE;
 			
-		if (nautilus_istr_has_prefix (uri, "file://")) {
-			local_path = nautilus_str_get_after_prefix (uri, "file://");
-		} else if (nautilus_istr_has_prefix (uri, "file:")) {
+		if (eel_istr_has_prefix (uri, "file://")) {
+			local_path = eel_str_get_after_prefix (uri, "file://");
+		} else if (eel_istr_has_prefix (uri, "file:")) {
 			local_path = g_strdup (uri += strlen ("file:"));
 		}
 		
@@ -791,8 +791,8 @@ icon_view_handle_uri_list (NautilusIconContainer *container, const char *item_ur
 			/* We have some type of URI. Create a Nautilus link for it.
 			 * Generate the file name by extracting the basename of the URI.
 			 */							
-			if (nautilus_str_has_suffix (uri, "/")) {
-				stripped_uri = nautilus_str_strip_trailing_chr (uri, '/');
+			if (eel_str_has_suffix (uri, "/")) {
+				stripped_uri = eel_str_strip_trailing_chr (uri, '/');
 				linkname = strrchr (stripped_uri, '/');
 			} else {
 				linkname = strrchr (uri, '/');
@@ -1032,7 +1032,7 @@ mount_parameters_new (FMDesktopIconView *view, const char *mount_path)
 	MountParameters *new_parameters;
 
 	g_assert (FM_IS_DESKTOP_ICON_VIEW (view));
-	g_assert (!nautilus_str_is_empty (mount_path)); 
+	g_assert (!eel_str_is_empty (mount_path)); 
 
 	new_parameters = g_new (MountParameters, 1);
 	gtk_object_ref (GTK_OBJECT (view));
@@ -1148,7 +1148,7 @@ real_update_menus (FMDirectoryView *view)
 	
 	g_assert (FM_IS_DESKTOP_ICON_VIEW (view));
 
-	NAUTILUS_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, update_menus, (view));
+	EEL_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, update_menus, (view));
 
 	desktop_view = FM_DESKTOP_ICON_VIEW (view);
 
@@ -1221,7 +1221,7 @@ real_merge_menus (FMDirectoryView *view)
 		BONOBO_UI_VERB_END
 	};
 
-	NAUTILUS_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, merge_menus, (view));
+	EEL_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, merge_menus, (view));
 
 	desktop_view = FM_DESKTOP_ICON_VIEW (view);
 
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index b81edb6f8..a9ddfbe03 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -49,7 +49,7 @@
 #include <libgnomevfs/gnome-vfs-result.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
 #include <libnautilus-extensions/nautilus-directory-background.h>
 #include <libnautilus-extensions/nautilus-directory.h>
@@ -57,18 +57,18 @@
 #include <libnautilus-extensions/nautilus-file-attributes.h>
 #include <libnautilus-extensions/nautilus-file-operations.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
 #include <libnautilus-extensions/nautilus-link.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-mime-actions.h>
 #include <libnautilus-extensions/nautilus-program-choosing.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-trash-monitor.h>
 #include <libnautilus-extensions/nautilus-view-identifier.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
@@ -300,21 +300,21 @@ static void                monitor_file_for_open_with
 static void                monitor_file_for_activation                            (FMDirectoryView      *view,
 										   NautilusFile         *file);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (FMDirectoryView, fm_directory_view, GTK_TYPE_SCROLLED_WINDOW)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, add_file)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, bump_zoom_level)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, zoom_to_level)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, restore_default_zoom_level)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, can_zoom_in)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, can_zoom_out)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_background_widget)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, clear)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, file_changed)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_selection)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, is_empty)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, select_all)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, set_selection)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_selected_icon_locations)
+EEL_DEFINE_CLASS_BOILERPLATE (FMDirectoryView, fm_directory_view, GTK_TYPE_SCROLLED_WINDOW)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, add_file)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, bump_zoom_level)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, zoom_to_level)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, restore_default_zoom_level)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, can_zoom_in)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, can_zoom_out)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_background_widget)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, clear)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, file_changed)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_selection)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, is_empty)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, select_all)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, set_selection)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_selected_icon_locations)
 
 typedef struct {
 	GnomeVFSMimeApplication *application;
@@ -440,7 +440,7 @@ fm_directory_view_confirm_multiple_windows (FMDirectoryView *view, int count)
 	prompt = g_strdup_printf (_("This will open %d separate windows. "
 				    "Are you sure you want to do this?"), count);
 	title = g_strdup_printf (_("Open %d Windows?"), count);
-	dialog = nautilus_show_yes_no_dialog (prompt, title, 
+	dialog = eel_show_yes_no_dialog (prompt, title, 
 					      GNOME_STOCK_BUTTON_OK, 
 					      GNOME_STOCK_BUTTON_CANCEL, 
 					      fm_directory_view_get_containing_window (view));
@@ -453,7 +453,7 @@ fm_directory_view_confirm_multiple_windows (FMDirectoryView *view, int count)
 static gboolean
 selection_contains_one_item_in_menu_callback (FMDirectoryView *view, GList *selection)
 {
-	if (nautilus_g_list_exactly_one_item (selection)) {
+	if (eel_g_list_exactly_one_item (selection)) {
 		return TRUE;
 	}
 
@@ -753,7 +753,7 @@ confirm_delete_directly (FMDirectoryView *view,
 		  			    "the %d selected items?"), uri_count);
 	}
 
-	dialog = nautilus_show_yes_no_dialog
+	dialog = eel_show_yes_no_dialog
 		(prompt,
 		 _("Delete?"),
 		 _("Delete"),
@@ -789,7 +789,7 @@ delete_callback (BonoboUIComponent *component, gpointer callback_data, const cha
 			nautilus_file_operations_delete (file_uris, GTK_WIDGET (view));
 		}
 
-		nautilus_g_list_free_deep (file_uris);
+		eel_g_list_free_deep (file_uris);
 	}
 
         nautilus_file_list_free (selection);
@@ -936,7 +936,7 @@ text_attribute_names_changed_callback (gpointer callback_data)
 
 	view = FM_DIRECTORY_VIEW (callback_data);
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 text_attribute_names_changed, (view));
 }
@@ -948,7 +948,7 @@ image_display_policy_changed_callback (gpointer callback_data)
 
 	view = FM_DIRECTORY_VIEW (callback_data);
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 image_display_policy_changed, (view));
 }
@@ -960,7 +960,7 @@ click_policy_changed_callback (gpointer callback_data)
 
 	view = FM_DIRECTORY_VIEW (callback_data);
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 click_policy_changed, (view));
 }
@@ -972,7 +972,7 @@ smooth_graphics_mode_changed_callback (gpointer callback_data)
 
 	view = FM_DIRECTORY_VIEW (callback_data);
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 smooth_graphics_mode_changed, (view));
 }
@@ -996,7 +996,7 @@ sort_directories_first_changed_callback (gpointer callback_data)
 
 	if (preference_value != view->details->sort_directories_first) {
 		view->details->sort_directories_first = preference_value;
-		NAUTILUS_CALL_METHOD
+		EEL_CALL_METHOD
 			(FM_DIRECTORY_VIEW_CLASS, view,
 			 sort_directories_first_changed, (view));
 	}
@@ -1108,7 +1108,7 @@ fm_directory_view_initialize (FMDirectoryView *view)
 	bonobo_zoomable_set_parameters_full (view->details->zoomable,
 					     0.0, .25, 4.0, TRUE, TRUE, FALSE,
 					     fm_directory_view_preferred_zoom_levels, NULL,
-					     NAUTILUS_N_ELEMENTS (fm_directory_view_preferred_zoom_levels));
+					     EEL_N_ELEMENTS (fm_directory_view_preferred_zoom_levels));
 	bonobo_object_add_interface (BONOBO_OBJECT (view->details->nautilus_view),
 				     BONOBO_OBJECT (view->details->zoomable));
 
@@ -1264,7 +1264,7 @@ fm_directory_view_destroy (GtkObject *object)
 
 	g_free (view->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /**
@@ -1435,7 +1435,7 @@ fm_directory_view_send_selection_change (FMDirectoryView *view)
 					       uris);
 
 	/* Free the URIs. */
-	nautilus_g_list_free_deep (uris);
+	eel_g_list_free_deep (uris);
 
 	view->details->send_selection_change_to_shell = FALSE;
 }
@@ -1474,7 +1474,7 @@ selection_changed_callback (NautilusView *nautilus_view,
 	GList *selection;
 
 	if (view->details->loading) {
-		nautilus_g_list_free_deep (view->details->pending_uris_selected);
+		eel_g_list_free_deep (view->details->pending_uris_selected);
 		view->details->pending_uris_selected = NULL;
 	}
 
@@ -1489,7 +1489,7 @@ selection_changed_callback (NautilusView *nautilus_view,
 		/* If we are still loading, add to the list of pending URIs instead. */
 		view->details->pending_uris_selected =
 			g_list_concat (view->details->pending_uris_selected,
-				       nautilus_g_str_list_copy (selection_uris));
+				       eel_g_str_list_copy (selection_uris));
 	}
 }
 
@@ -1505,7 +1505,7 @@ fm_directory_view_file_limit_reached (FMDirectoryView *view)
 {
 	g_assert (FM_IS_DIRECTORY_VIEW (view));
 
-	NAUTILUS_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view,
+	EEL_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view,
 		 	       file_limit_reached, (view));
 }
 
@@ -1533,7 +1533,7 @@ real_file_limit_reached (FMDirectoryView *view)
 			           directory_name);
 	g_free (directory_name);
 
-	dialog = nautilus_show_warning_dialog (message,
+	dialog = eel_show_warning_dialog (message,
 					       _("Too Many Files"),
 					       fm_directory_view_get_containing_window (view));
 	g_free (message);
@@ -1570,7 +1570,7 @@ done_loading (FMDirectoryView *view)
 			view->details->pending_uris_selected = NULL;
 			
 			selection = file_list_from_uri_list (uris_selected);
-			nautilus_g_list_free_deep (uris_selected);
+			eel_g_list_free_deep (uris_selected);
 			
 			view->details->selection_change_is_due_to_shell = TRUE;
 			fm_directory_view_set_selection (view, selection);
@@ -1591,7 +1591,7 @@ reset_background_callback (BonoboUIComponent *component, gpointer callback_data,
 {
 	g_assert (FM_IS_DIRECTORY_VIEW (callback_data));
 
-	nautilus_background_reset 
+	eel_background_reset 
 		(fm_directory_view_get_background 
 			(FM_DIRECTORY_VIEW (callback_data)));
 }
@@ -1654,8 +1654,8 @@ static void
 debuting_uri_data_free (DebutingUriData *data)
 {
 	if (data != NULL) {
-		nautilus_g_hash_table_destroy_deep (data->debuting_uris);
-		nautilus_g_list_free_deep_custom (data->added_files, (GFunc) gtk_object_unref, NULL);
+		eel_g_hash_table_destroy_deep (data->debuting_uris);
+		eel_g_list_free_deep_custom (data->added_files, (GFunc) gtk_object_unref, NULL);
 		g_free (data);
 	}
 }
@@ -1671,7 +1671,7 @@ debuting_uri_add_file_callback (FMDirectoryView *view, NautilusFile *new_file, D
 
 	uri = nautilus_file_get_uri (new_file);
 
-	if (nautilus_g_hash_table_remove_deep (data->debuting_uris, uri)) {
+	if (eel_g_hash_table_remove_deep (data->debuting_uris, uri)) {
 		gtk_object_ref (GTK_OBJECT (new_file));
 		data->added_files = g_list_prepend (data->added_files, new_file);
 
@@ -1695,8 +1695,8 @@ copy_move_done_data_free (CopyMoveDoneData *data)
 {
 	g_assert (data != NULL);
 	
-	nautilus_nullify_cancel (&data->directory_view);
-	nautilus_g_list_free_deep_custom (data->added_files, (GFunc) gtk_object_unref, NULL);
+	eel_nullify_cancel (&data->directory_view);
+	eel_g_list_free_deep_custom (data->added_files, (GFunc) gtk_object_unref, NULL);
 	g_free (data);
 }
 
@@ -1720,7 +1720,7 @@ pre_copy_move (FMDirectoryView *directory_view)
 	copy_move_done_data = g_new0 (CopyMoveDoneData, 1);
 	copy_move_done_data->directory_view = directory_view;
 
-	nautilus_nullify_when_destroyed (&copy_move_done_data->directory_view);
+	eel_nullify_when_destroyed (&copy_move_done_data->directory_view);
 
 	/* We need to run after the default handler adds the folder we want to
 	 * operate on. The ADD_FILE signal is registered as GTK_RUN_LAST, so we
@@ -1745,7 +1745,7 @@ copy_move_done_partition_func (gpointer data, gpointer callback_data)
  	
 	uri = nautilus_file_get_uri (NAUTILUS_FILE (data));
 
-	result = nautilus_g_hash_table_remove_deep ((GHashTable *) callback_data, uri);
+	result = eel_g_hash_table_remove_deep ((GHashTable *) callback_data, uri);
 	
 	g_free (uri);
 
@@ -1774,7 +1774,7 @@ copy_move_done_callback (GHashTable *debuting_uris, gpointer data)
 	
 		debuting_uri_data = g_new (DebutingUriData, 1);
 		debuting_uri_data->debuting_uris = debuting_uris;
-		debuting_uri_data->added_files	 = nautilus_g_list_partition (copy_move_done_data->added_files,
+		debuting_uri_data->added_files	 = eel_g_list_partition (copy_move_done_data->added_files,
 									      copy_move_done_partition_func,
 									      debuting_uris,
 									      &copy_move_done_data->added_files);
@@ -1830,7 +1830,7 @@ display_pending_files (FMDirectoryView *view)
 
 	g_assert (FM_IS_DIRECTORY_VIEW (view));
 
-	call_timeout_again = NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	call_timeout_again = EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 display_pending_files, 
 		 (view, &view->details->pending_files_added, 
@@ -1888,7 +1888,7 @@ real_display_pending_files (FMDirectoryView *view,
 
 		if (files_changed != NULL) {
 			selection = fm_directory_view_get_selection (view);
-			send_selection_change = nautilus_g_lists_sort_and_check_for_intersection
+			send_selection_change = eel_g_lists_sort_and_check_for_intersection
 				(&files_changed, &selection);
 			nautilus_file_list_free (selection);
 		}
@@ -2235,7 +2235,7 @@ fm_directory_view_bump_zoom_level (FMDirectoryView *view, int zoom_increment)
 		return;
 	}
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 bump_zoom_level, (view, zoom_increment));
 }
@@ -2255,7 +2255,7 @@ fm_directory_view_zoom_to_level (FMDirectoryView *view, int zoom_level)
 		return;
 	}
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 zoom_to_level, (view, zoom_level));
 }
@@ -2293,7 +2293,7 @@ fm_directory_view_restore_default_zoom_level (FMDirectoryView *view)
 		return;
 	}
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 restore_default_zoom_level, (view));
 }
@@ -2316,7 +2316,7 @@ fm_directory_view_can_zoom_in (FMDirectoryView *view)
 		return FALSE;
 	}
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 can_zoom_in, (view));
 }
@@ -2339,7 +2339,7 @@ fm_directory_view_can_zoom_out (FMDirectoryView *view)
 		return FALSE;
 	}
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 can_zoom_out, (view));
 }
@@ -2349,15 +2349,15 @@ fm_directory_view_get_background_widget (FMDirectoryView *view)
 {
 	g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), NULL);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 get_background_widget, (view));
 }
 
-NautilusBackground *
+EelBackground *
 fm_directory_view_get_background (FMDirectoryView *view)
 {
-	return nautilus_get_widget_background (fm_directory_view_get_background_widget (view));
+	return eel_get_widget_background (fm_directory_view_get_background_widget (view));
 }
 
 /**
@@ -2377,7 +2377,7 @@ fm_directory_view_get_selection (FMDirectoryView *view)
 {
 	g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), NULL);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 get_selection, (view));
 }
@@ -2515,7 +2515,7 @@ fm_directory_view_create_links_for_files (FMDirectoryView *view, GList *files,
         copy_move_done_data = pre_copy_move (view);
 	nautilus_file_operations_copy_move (uris, relative_item_points, NULL, GDK_ACTION_LINK, 
 		GTK_WIDGET (view), copy_move_done_callback, copy_move_done_data);
-	nautilus_g_list_free_deep (uris);
+	eel_g_list_free_deep (uris);
 }
 
 static void
@@ -2546,7 +2546,7 @@ fm_directory_view_duplicate_selection (FMDirectoryView *view, GList *files,
         copy_move_done_data = pre_copy_move (view);
 	nautilus_file_operations_copy_move (uris, relative_item_points, NULL, GDK_ACTION_COPY,
 		GTK_WIDGET (view), copy_move_done_callback, copy_move_done_data);
-	nautilus_g_list_free_deep (uris);
+	eel_g_list_free_deep (uris);
 }
 
 static gboolean
@@ -2764,7 +2764,7 @@ fm_directory_view_confirm_deletion (FMDirectoryView *view, GList *uris, gboolean
 		}
 	}
 
-	dialog = nautilus_show_yes_no_dialog
+	dialog = eel_show_yes_no_dialog
 		(prompt,
 		 _("Delete Immediately?"),
 		 _("Delete"),
@@ -2804,7 +2804,7 @@ confirm_delete_from_trash (FMDirectoryView *view, GList *uris)
 		  			    "the %d selected items from the Trash?"), uri_count);
 	}
 
-	dialog = nautilus_show_yes_no_dialog (
+	dialog = eel_show_yes_no_dialog (
 		prompt,
 		_("Delete From Trash?"),
 		_("Delete"),
@@ -2877,9 +2877,9 @@ trash_or_delete_files_common (const GList *file_uris,
 		}
 	}
 	
-	nautilus_g_list_free_deep (moveable_uris);
-	nautilus_g_list_free_deep (unmoveable_uris);
-	nautilus_g_list_free_deep (in_trash_uris);
+	eel_g_list_free_deep (moveable_uris);
+	eel_g_list_free_deep (unmoveable_uris);
+	eel_g_list_free_deep (in_trash_uris);
 }
 
 static void
@@ -2898,7 +2898,7 @@ fm_directory_view_trash_or_delete_files (const GList *files,
 	file_uris = g_list_reverse (file_uris);
 	trash_or_delete_files_common (file_uris, NULL, NAUTILUS_TRASH_URI,
 				      GDK_ACTION_MOVE, view);					 
-	nautilus_g_list_free_deep (file_uris);
+	eel_g_list_free_deep (file_uris);
 }
 
 static void
@@ -2919,7 +2919,7 @@ reveal_newly_added_folder (FMDirectoryView *view, NautilusFile *new_file, char*
 		/* no need to select because start_renaming_item selects
 		 * fm_directory_view_select_file (view, new_file);
 		 */
-		NAUTILUS_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, start_renaming_item, (view, target_uri));
+		EEL_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, start_renaming_item, (view, target_uri));
 		fm_directory_view_reveal_selection (view);
 	}
 }
@@ -3072,7 +3072,7 @@ add_numbered_menu_item (BonoboUIComponent *ui,
 {
 	char *escaped_label, *verb_name, *item_path;
 	
-	escaped_label = nautilus_str_double_underscores (label);
+	escaped_label = eel_str_double_underscores (label);
 
 	nautilus_bonobo_add_numbered_menu_item 
 		(ui, 
@@ -3197,7 +3197,7 @@ reset_bonobo_open_with_menu (FMDirectoryView *view, GList *selection)
 		(view->details->ui, FM_DIRECTORY_VIEW_POPUP_PATH_VIEWERS_PLACEHOLDER);
 	
 	/* This menu is only displayed when there's one selected item. */
-	if (!nautilus_g_list_exactly_one_item (selection)) {
+	if (!eel_g_list_exactly_one_item (selection)) {
 		sensitive = FALSE;
 		monitor_file_for_open_with (view, NULL);
 	} else {
@@ -3285,7 +3285,7 @@ get_file_names_as_parameter_string (GList *selection)
 	parameter_string = g_string_new ("");
 	for (node = selection; node != NULL; node = node->next) {
 		name = nautilus_file_get_name (NAUTILUS_FILE (node->data));
-		quoted_name = nautilus_shell_quote (name);
+		quoted_name = eel_shell_quote (name);
 		g_string_append (parameter_string, quoted_name);
 		g_string_append (parameter_string, " ");
 		g_free (name);
@@ -3357,20 +3357,20 @@ set_script_environment_variables (FMDirectoryView *view, GList *selected_files)
 	} else {
 		file_paths = g_strdup ("");
 	}
-	nautilus_setenv ("NAUTILUS_SCRIPT_SELECTED_FILE_PATHS", file_paths, TRUE);
+	eel_setenv ("NAUTILUS_SCRIPT_SELECTED_FILE_PATHS", file_paths, TRUE);
 	g_free (file_paths);
 
 	uris = get_file_uris_as_newline_delimited_string (selected_files);
-	nautilus_setenv ("NAUTILUS_SCRIPT_SELECTED_URIS", uris, TRUE);
+	eel_setenv ("NAUTILUS_SCRIPT_SELECTED_URIS", uris, TRUE);
 	g_free (uris);
 
 	uri = nautilus_directory_get_uri (view->details->model);
-	nautilus_setenv ("NAUTILUS_SCRIPT_CURRENT_URI", uri, TRUE);
+	eel_setenv ("NAUTILUS_SCRIPT_CURRENT_URI", uri, TRUE);
 	g_free (uri);
 
 	geometry_string = gnome_geometry_string 
 		(GTK_WIDGET (fm_directory_view_get_containing_window (view))->window);
-	nautilus_setenv ("NAUTILUS_SCRIPT_WINDOW_GEOMETRY", geometry_string, TRUE);
+	eel_setenv ("NAUTILUS_SCRIPT_WINDOW_GEOMETRY", geometry_string, TRUE);
 	g_free (geometry_string);
 }
 
@@ -3378,10 +3378,10 @@ set_script_environment_variables (FMDirectoryView *view, GList *selected_files)
 static void
 unset_script_environment_variables (void)
 {
-	nautilus_unsetenv ("NAUTILUS_SCRIPT_SELECTED_FILE_PATHS");
-	nautilus_unsetenv ("NAUTILUS_SCRIPT_SELECTED_URIS");
-	nautilus_unsetenv ("NAUTILUS_SCRIPT_CURRENT_URI");
-	nautilus_unsetenv ("NAUTILUS_SCRIPT_WINDOW_GEOMETRY");
+	eel_unsetenv ("NAUTILUS_SCRIPT_SELECTED_FILE_PATHS");
+	eel_unsetenv ("NAUTILUS_SCRIPT_SELECTED_URIS");
+	eel_unsetenv ("NAUTILUS_SCRIPT_CURRENT_URI");
+	eel_unsetenv ("NAUTILUS_SCRIPT_WINDOW_GEOMETRY");
 }
 
 static void
@@ -3402,7 +3402,7 @@ run_script_callback (BonoboUIComponent *component, gpointer callback_data, const
 	g_assert (local_file_path != NULL);
 	g_free (file_uri);
 
-	quoted_path = nautilus_shell_quote (local_file_path);
+	quoted_path = eel_shell_quote (local_file_path);
 	g_free (local_file_path);
 
 	old_working_dir = change_to_view_directory (launch_parameters->directory_view);
@@ -3413,7 +3413,7 @@ run_script_callback (BonoboUIComponent *component, gpointer callback_data, const
 	if (nautilus_directory_is_local (launch_parameters->directory_view->details->model)) {
 		parameters = get_file_names_as_parameter_string (selected_files);
 
-		/* FIXME: must append command and parameters here, because nautilus_launch_application_from_command
+		/* FIXME: must append command and parameters here, because eel_launch_application_from_command
 		 * quotes all parameters as if they are a single parameter. Should add or change API in
 		 * nautilus-program-choosing.c to support multiple parameters.
 		 */
@@ -3427,7 +3427,7 @@ run_script_callback (BonoboUIComponent *component, gpointer callback_data, const
 	}
 
 	/* FIXME: handle errors with dialog? Or leave up to each script? */
-	nautilus_launch_application_from_command (command, NULL, FALSE);
+	eel_launch_application_from_command (command, NULL, FALSE);
 	g_free (command);
 
 	nautilus_file_list_free (selected_files);
@@ -3562,7 +3562,7 @@ notify_user_if_no_scripts_callback (NautilusDirectory *directory,
 		return;
 	}
 
-	nautilus_show_info_dialog_with_details 
+	eel_show_info_dialog_with_details 
 		(_("All executable files in this folder will appear in the "
 		   "Scripts menu. Choosing a script from the menu will run "
 		   "that script with any selected items as input."), 
@@ -3634,7 +3634,7 @@ open_scripts_folder_callback (BonoboUIComponent *component,
 		/* This shouldn't happen. If it does, get_scripts_directory was unable to
 		 * mkdir the scripts directory, and this case should be debugged.
 		 */
-		nautilus_show_error_dialog (_("Nautilus was unable to create the directory %s."),
+		eel_show_error_dialog (_("Nautilus was unable to create the directory %s."),
 					    _("No Scripts Folder"),
 					    fm_directory_view_get_containing_window (view));
 	}
@@ -3677,7 +3677,7 @@ copy_or_cut_files (FMDirectoryView *view,
 
 	if (!gtk_selection_owner_set (GTK_WIDGET (view),
 				      clipboard_atom,
-				      nautilus_get_current_event_time ())) {
+				      eel_get_current_event_time ())) {
 		return;
 	}
 
@@ -3739,7 +3739,7 @@ paste_files_callback (BonoboUIComponent *component,
 	gtk_selection_convert (GTK_WIDGET (callback_data), 
 			       clipboard_atom, 
 			       copied_files_atom,
-			       nautilus_get_current_event_time ());
+			       eel_get_current_event_time ());
 }
 
 static gboolean
@@ -3859,7 +3859,7 @@ real_selection_received (GtkWidget *widget,
 						   view);
 	}
 
-	nautilus_g_list_free_deep (item_uris);
+	eel_g_list_free_deep (item_uris);
 	g_free (view_uri);
 }
 
@@ -3927,7 +3927,7 @@ real_update_menus (FMDirectoryView *view)
 	gboolean can_link_files;
 	gboolean can_duplicate_files;
 	gboolean show_separate_delete_command;
-	NautilusBackground *background;
+	EelBackground *background;
 	
 	selection = fm_directory_view_get_selection (view);
 	selection_count = g_list_length (selection);
@@ -4139,10 +4139,10 @@ fm_directory_view_pop_up_selection_context_menu  (FMDirectoryView *view,
 	 */
 	update_menus_if_pending (view);
 
-	nautilus_pop_up_context_menu (create_popup_menu 
+	eel_pop_up_context_menu (create_popup_menu 
 				      	(view, FM_DIRECTORY_VIEW_POPUP_PATH_SELECTION),
-				      NAUTILUS_DEFAULT_POPUP_MENU_DISPLACEMENT,
-				      NAUTILUS_DEFAULT_POPUP_MENU_DISPLACEMENT,
+				      EEL_DEFAULT_POPUP_MENU_DISPLACEMENT,
+				      EEL_DEFAULT_POPUP_MENU_DISPLACEMENT,
 				      event);
 }
 
@@ -4166,10 +4166,10 @@ fm_directory_view_pop_up_background_context_menu (FMDirectoryView *view,
 	 */
 	update_menus_if_pending (view);
 
-	nautilus_pop_up_context_menu (create_popup_menu 
+	eel_pop_up_context_menu (create_popup_menu 
 				      (view, FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND),
-				      NAUTILUS_DEFAULT_POPUP_MENU_DISPLACEMENT,
-				      NAUTILUS_DEFAULT_POPUP_MENU_DISPLACEMENT,
+				      EEL_DEFAULT_POPUP_MENU_DISPLACEMENT,
+				      EEL_DEFAULT_POPUP_MENU_DISPLACEMENT,
 				      event);
 }
 
@@ -4264,7 +4264,7 @@ report_broken_symbolic_link (FMDirectoryView *view, NautilusFile *file)
 					  target_path);
 	}
 
-	dialog = nautilus_show_yes_no_dialog (prompt,
+	dialog = eel_show_yes_no_dialog (prompt,
 				  	      _("Broken Link"),
 					      _("Throw Away"),
 					      GNOME_STOCK_BUTTON_CANCEL,
@@ -4324,7 +4324,7 @@ get_executable_text_file_action (FMDirectoryView *view, NautilusFile *file)
 				  file_name);
 	g_free (file_name);
 
-	dialog = nautilus_create_question_dialog (prompt,
+	dialog = eel_create_question_dialog (prompt,
 					 	  _("Run or Display?"),
 					 	  _("Run"),
 					 	  _("Display"),
@@ -4359,7 +4359,7 @@ activate_callback (NautilusFile *file, gpointer callback_data)
 
 	need_to_continue_monitoring_file_for_activation = FALSE;
 
-	nautilus_timed_wait_stop (cancel_activate_callback, parameters);
+	eel_timed_wait_stop (cancel_activate_callback, parameters);
 
 	view = FM_DIRECTORY_VIEW (parameters->view);
 
@@ -4374,13 +4374,13 @@ activate_callback (NautilusFile *file, gpointer callback_data)
 	if (nautilus_file_is_broken_symbolic_link (file)) {
 		report_broken_symbolic_link (view, file);
 		action = ACTIVATION_ACTION_DO_NOTHING;
-	} else if (nautilus_istr_has_prefix (uri, NAUTILUS_COMMAND_SPECIFIER)) {
+	} else if (eel_istr_has_prefix (uri, NAUTILUS_COMMAND_SPECIFIER)) {
 		/* Don't allow command execution from remote locations
 		 * to partially mitigate the security risk of
 		 * executing arbitrary commands.
 		 */
 		if (!nautilus_file_is_local (file)) {
-			nautilus_show_error_dialog
+			eel_show_error_dialog
 				(_("Sorry, but you can't execute commands from "
 				   "a remote site due to security considerations."), 
 				 _("Can't execute remote links"),
@@ -4393,7 +4393,7 @@ activate_callback (NautilusFile *file, gpointer callback_data)
 			 * fork/execlp instead of system.
 			 */
 			command = uri + strlen (NAUTILUS_COMMAND_SPECIFIER);
-			nautilus_gnome_shell_execute (command);
+			eel_gnome_shell_execute (command);
 			action = ACTIVATION_ACTION_DO_NOTHING;
 		}
 	}
@@ -4423,12 +4423,12 @@ activate_callback (NautilusFile *file, gpointer callback_data)
 		}
 
 		if (action == ACTIVATION_ACTION_LAUNCH) {
-			quoted_path = nautilus_shell_quote (executable_path);
+			quoted_path = eel_shell_quote (executable_path);
 			/* FIXME bugzilla.eazel.com 1773: This is a
 			 * lame way to run command-line tools, since
 			 * there's no terminal for the output.
 			 */
-			nautilus_launch_application_from_command (quoted_path, NULL, FALSE);
+			eel_launch_application_from_command (quoted_path, NULL, FALSE);
 			g_free (quoted_path);
 		}
 		
@@ -4520,7 +4520,7 @@ fm_directory_view_activate_file (FMDirectoryView *view,
 	timed_wait_prompt = g_strdup_printf (_("Opening \"%s\""), file_name);
 	g_free (file_name);
 	
-	nautilus_timed_wait_start
+	eel_timed_wait_start
 		(cancel_activate_callback,
 		 parameters,
 		 _("Cancel Open?"),
@@ -4759,22 +4759,22 @@ metadata_for_files_in_directory_ready_callback (NautilusDirectory *directory,
 	finish_loading_if_all_metadata_loaded (view);
 }
 
-NautilusStringList *
+EelStringList *
 fm_directory_view_get_emblem_names_to_exclude (FMDirectoryView *view)
 {
 	g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), NULL);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 get_emblem_names_to_exclude, (view));
 }
 
-static NautilusStringList *
+static EelStringList *
 real_get_emblem_names_to_exclude (FMDirectoryView *view)
 {
 	g_assert (FM_IS_DIRECTORY_VIEW (view));
 
-	return nautilus_string_list_new_from_string (NAUTILUS_FILE_EMBLEM_NAME_TRASH, TRUE);
+	return eel_string_list_new_from_string (NAUTILUS_FILE_EMBLEM_NAME_TRASH, TRUE);
 }
 
 /**
@@ -4793,7 +4793,7 @@ fm_directory_view_merge_menus (FMDirectoryView *view)
 	 */
 	view->details->menus_merged = TRUE;
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 merge_menus, (view));
 }
@@ -4881,7 +4881,7 @@ fm_directory_view_select_all (FMDirectoryView *view)
 {
 	g_return_if_fail (FM_IS_DIRECTORY_VIEW (view));
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 select_all, (view));
 }
@@ -4898,7 +4898,7 @@ fm_directory_view_set_selection (FMDirectoryView *view, GList *selection)
 {
 	g_return_if_fail (FM_IS_DIRECTORY_VIEW (view));
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 set_selection, (view, selection));
 }
@@ -4926,7 +4926,7 @@ fm_directory_get_selected_icon_locations (FMDirectoryView *view)
 {
 	g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), NULL);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 get_selected_icon_locations, (view));
 }
@@ -4941,7 +4941,7 @@ fm_directory_view_reveal_selection (FMDirectoryView *view)
 {
 	g_return_if_fail (FM_IS_DIRECTORY_VIEW (view));
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 reveal_selection, (view));
 }
@@ -4965,7 +4965,7 @@ fm_directory_view_stop (FMDirectoryView *view)
 	view->details->pending_files_added = NULL;
 	nautilus_file_list_free (view->details->pending_files_changed);
 	view->details->pending_files_changed = NULL;
-	nautilus_g_list_free_deep (view->details->pending_uris_selected);
+	eel_g_list_free_deep (view->details->pending_uris_selected);
 	view->details->pending_uris_selected = NULL;
 
 	if (view->details->model != NULL) {
@@ -4979,7 +4979,7 @@ fm_directory_view_is_read_only (FMDirectoryView *view)
 {
 	g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), FALSE);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 is_read_only, (view));
 }
@@ -4989,7 +4989,7 @@ fm_directory_view_is_empty (FMDirectoryView *view)
 {
 	g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), FALSE);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 is_empty, (view));
 }
@@ -5005,7 +5005,7 @@ fm_directory_view_supports_creating_files (FMDirectoryView *view)
 {
 	g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), FALSE);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 supports_creating_files, (view));
 }
@@ -5015,7 +5015,7 @@ fm_directory_view_accepts_dragged_files (FMDirectoryView *view)
 {
 	g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), FALSE);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 accepts_dragged_files, (view));
 }
@@ -5061,7 +5061,7 @@ fm_directory_view_supports_properties (FMDirectoryView *view)
 {
 	g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), FALSE);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 supports_properties, (view));
 }
@@ -5079,7 +5079,7 @@ fm_directory_view_supports_zooming (FMDirectoryView *view)
 {
 	g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), FALSE);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 supports_zooming, (view));
 }
@@ -5103,7 +5103,7 @@ fm_directory_view_update_menus (FMDirectoryView *view)
 {
 	g_return_if_fail (FM_IS_DIRECTORY_VIEW (view));
 
-	NAUTILUS_CALL_METHOD
+	EEL_CALL_METHOD
 		(FM_DIRECTORY_VIEW_CLASS, view,
 		 update_menus, (view));
 
@@ -5196,7 +5196,7 @@ fm_directory_view_move_copy_items (const GList *item_uris,
 	offset_drop_points (relative_item_points, x, y);
 
 	/* special-case "command:" here instead of starting a move/copy */
-	if (nautilus_str_has_prefix (target_uri, NAUTILUS_COMMAND_SPECIFIER)) {
+	if (eel_str_has_prefix (target_uri, NAUTILUS_COMMAND_SPECIFIER)) {
 		/* execute command, passing it the dragged uris */
 		
 		/* strip the leading "command:" */
@@ -5222,7 +5222,7 @@ fm_directory_view_move_copy_items (const GList *item_uris,
 		}
 		
 		/* execute the command */
-		nautilus_gnome_shell_execute (command_string);
+		eel_gnome_shell_execute (command_string);
 		
 		g_free (command_string);
 		return;
@@ -5402,7 +5402,7 @@ real_size_allocate (GtkWidget *widget,
 	allocation_to_fool_scrolled_window.y = 0;
 	allocation_to_fool_scrolled_window.width = allocation->width;
 	allocation_to_fool_scrolled_window.height = allocation->height;
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate,
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate,
 			      (widget, &allocation_to_fool_scrolled_window));
 
 	/* The rest of this is just identical to what GtkWidget does. */
@@ -5510,20 +5510,20 @@ fm_directory_view_initialize_class (FMDirectoryViewClass *klass)
 	klass->reveal_selection = NULL;
 
 	/* Function pointers that subclasses must override */
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, add_file);
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, bump_zoom_level);
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, zoom_to_level);
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, restore_default_zoom_level);
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, can_zoom_in);
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, can_zoom_out);
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_background_widget);
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, clear);
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, file_changed);
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_selection);
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, is_empty);
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, select_all);
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, set_selection);
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_selected_icon_locations);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, add_file);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, bump_zoom_level);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, zoom_to_level);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, restore_default_zoom_level);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, can_zoom_in);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, can_zoom_out);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_background_widget);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, clear);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, file_changed);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_selection);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, is_empty);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, select_all);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, set_selection);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_selected_icon_locations);
 
 	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
 
diff --git a/src/file-manager/fm-directory-view.h b/src/file-manager/fm-directory-view.h
index e33679824..4b1d85aa4 100644
--- a/src/file-manager/fm-directory-view.h
+++ b/src/file-manager/fm-directory-view.h
@@ -32,12 +32,12 @@
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkwindow.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-directory.h>
 #include <libnautilus-extensions/nautilus-file.h>
 #include <libnautilus-extensions/nautilus-icon-container.h>
 #include <libnautilus-extensions/nautilus-link.h>
-#include <libnautilus-extensions/nautilus-string-list.h>
+#include <eel/eel-string-list.h>
 #include <libnautilus/nautilus-view.h>
 
 typedef struct FMDirectoryView FMDirectoryView;
@@ -172,7 +172,7 @@ struct FMDirectoryViewClass {
         void     (* reveal_selection)	 	(FMDirectoryView *view);
 
         /* get_background is a function pointer that subclasses must
-         * override to return the NautilusBackground for this view.
+         * override to return the EelBackground for this view.
          */
         GtkWidget * (* get_background_widget)	(FMDirectoryView *view);
 
@@ -203,7 +203,7 @@ struct FMDirectoryViewClass {
 	 * be displayed with each file. By default, all emblems returned by
 	 * NautilusFile are displayed.
 	 */
-	NautilusStringList * (* get_emblem_names_to_exclude)	(FMDirectoryView *view);
+	EelStringList * (* get_emblem_names_to_exclude)	(FMDirectoryView *view);
 
 	/* file_limit_reached is a function pointer that subclasses may
 	 * override to control what happens when a directory is loaded
@@ -337,11 +337,11 @@ void                fm_directory_view_queue_file_change                (FMDirect
 void                fm_directory_view_notify_selection_changed         (FMDirectoryView  *view);
 Bonobo_UIContainer  fm_directory_view_get_bonobo_ui_container          (FMDirectoryView  *view);
 BonoboControl *     fm_directory_view_get_bonobo_control               (FMDirectoryView  *view);
-NautilusStringList *fm_directory_view_get_emblem_names_to_exclude      (FMDirectoryView  *view);
+EelStringList *fm_directory_view_get_emblem_names_to_exclude      (FMDirectoryView  *view);
 NautilusDirectory  *fm_directory_view_get_model                        (FMDirectoryView  *view);
 GtkWindow	   *fm_directory_view_get_containing_window	       (FMDirectoryView  *view);
 NautilusFile       *fm_directory_view_get_directory_as_file            (FMDirectoryView  *view);
-NautilusBackground *fm_directory_view_get_background                   (FMDirectoryView  *view);
+EelBackground *fm_directory_view_get_background                   (FMDirectoryView  *view);
 void                fm_directory_view_pop_up_background_context_menu   (FMDirectoryView  *view,
 									GdkEventButton   *event);
 void                fm_directory_view_pop_up_selection_context_menu    (FMDirectoryView  *view,
diff --git a/src/file-manager/fm-error-reporting.c b/src/file-manager/fm-error-reporting.c
index 7462c6249..425a8f6bc 100644
--- a/src/file-manager/fm-error-reporting.c
+++ b/src/file-manager/fm-error-reporting.c
@@ -31,8 +31,8 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomevfs/gnome-vfs-result.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-string.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-stock-dialogs.h>
 
 #define NEW_NAME_TAG "Nautilus: new name"
 #define MAXIMUM_DISPLAYED_FILE_NAME_LENGTH	50
@@ -69,7 +69,7 @@ fm_report_error_loading_directory (NautilusFile *file,
 		message = g_strdup_printf (_("Sorry, couldn't display all the contents of \"%s\"."), file_name);
 	}
 
-	nautilus_show_error_dialog (message, _("Error Displaying Folder"), parent_window);
+	eel_show_error_dialog (message, _("Error Displaying Folder"), parent_window);
 
 	g_free (file_name);
 	g_free (message);
@@ -93,10 +93,10 @@ fm_report_error_renaming_file (NautilusFile *file,
 	 * in them won't get wrapped, and can create insanely wide dialog boxes.
 	 */
 	original_name = nautilus_file_get_name (file);
-	original_name_truncated = nautilus_str_middle_truncate (original_name, MAXIMUM_DISPLAYED_FILE_NAME_LENGTH);
+	original_name_truncated = eel_str_middle_truncate (original_name, MAXIMUM_DISPLAYED_FILE_NAME_LENGTH);
 	g_free (original_name);
 	
-	new_name_truncated = nautilus_str_middle_truncate (new_name, MAXIMUM_DISPLAYED_FILE_NAME_LENGTH);
+	new_name_truncated = eel_str_middle_truncate (new_name, MAXIMUM_DISPLAYED_FILE_NAME_LENGTH);
 	
 	switch (error) {
 	case GNOME_VFS_ERROR_FILE_EXISTS:
@@ -141,7 +141,7 @@ fm_report_error_renaming_file (NautilusFile *file,
 	g_free (original_name_truncated);
 	g_free (new_name_truncated);
 
-	nautilus_show_error_dialog (message, _("Renaming Error"), parent_window);
+	eel_show_error_dialog (message, _("Renaming Error"), parent_window);
 	g_free (message);
 }
 
@@ -177,7 +177,7 @@ fm_report_error_setting_group (NautilusFile *file,
 		g_free (file_name);
 	}
 
-	nautilus_show_error_dialog (message, _("Error Setting Group"), parent_window);
+	eel_show_error_dialog (message, _("Error Setting Group"), parent_window);
 
 	g_free (file_name);
 	g_free (message);
@@ -209,7 +209,7 @@ fm_report_error_setting_owner (NautilusFile *file,
 		message = g_strdup_printf (_("Sorry, couldn't change the owner of \"%s\"."), file_name);
 	}
 
-	nautilus_show_error_dialog (message, _("Error Setting Owner"), parent_window);
+	eel_show_error_dialog (message, _("Error Setting Owner"), parent_window);
 
 	g_free (file_name);
 	g_free (message);
@@ -241,7 +241,7 @@ fm_report_error_setting_permissions (NautilusFile *file,
 		message = g_strdup_printf (_("Sorry, couldn't change the permissions of \"%s\"."), file_name);
 	}
 
-	nautilus_show_error_dialog (message, _("Error Setting Permissions"), parent_window);
+	eel_show_error_dialog (message, _("Error Setting Permissions"), parent_window);
 
 	g_free (file_name);
 	g_free (message);
@@ -281,7 +281,7 @@ cancel_rename (NautilusFile *file)
 
 	/* Cancel both the rename and the timed wait. */
 	nautilus_file_cancel (file, rename_callback, NULL);
-	nautilus_timed_wait_stop (cancel_rename_callback, file);
+	eel_timed_wait_stop (cancel_rename_callback, file);
 
 	/* Let go of file name. */
 	gtk_object_remove_data (GTK_OBJECT (file), NEW_NAME_TAG);
@@ -311,7 +311,7 @@ fm_rename_file (NautilusFile *file,
 					old_name,
 					new_name);
 	g_free (old_name);
-	nautilus_timed_wait_start (cancel_rename_callback, file,
+	eel_timed_wait_start (cancel_rename_callback, file,
 				   _("Cancel Rename?"), wait_message,
 				   NULL); /* FIXME bugzilla.eazel.com 2395: Parent this? */
 	g_free (wait_message);
diff --git a/src/file-manager/fm-icon-text-window.c b/src/file-manager/fm-icon-text-window.c
index 340b17071..a9d3dd0f6 100644
--- a/src/file-manager/fm-icon-text-window.c
+++ b/src/file-manager/fm-icon-text-window.c
@@ -40,10 +40,10 @@
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-string.h>
 
 static void     ensure_unique_attributes                  (int        menu_index);
 static gboolean fm_icon_text_window_delete_event_callback (GtkWidget *widget,
@@ -112,13 +112,13 @@ attribute_names_string_is_good (const char *string)
 		}
 
 		/* Check for unknown attributes. */
-		string_index = nautilus_g_strv_find (attribute_names, text_array[i]);
+		string_index = eel_g_strv_find (attribute_names, text_array[i]);
 		if (string_index < 0) {
 			break;
 		}
 
 		/* Check for repeated attributes (except for none, which is allowed to repeat. */
-		if (nautilus_strcmp (text_array[i], "none")) {
+		if (eel_strcmp (text_array[i], "none")) {
 			for (j = 0; j < i; j++) {
 				if (index_array[j] == string_index) {
 					goto bad;
@@ -150,7 +150,7 @@ synch_menus_with_preference (gpointer user_data)
 	
 	for (i = 0; i < MENU_COUNT; ++i) {
 		g_assert (text_array[i] != NULL);
-		string_index = nautilus_g_strv_find (attribute_names, text_array[i]);
+		string_index = eel_g_strv_find (attribute_names, text_array[i]);
 		g_assert (string_index >= 0);
 		gtk_option_menu_set_history (option_menus[i], string_index);
 	}
@@ -258,7 +258,7 @@ create_icon_text_window (void)
   	int index;
 
   	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	nautilus_gtk_window_set_up_close_accelerator (GTK_WINDOW (window));
+	eel_gtk_window_set_up_close_accelerator (GTK_WINDOW (window));
   	gtk_container_set_border_width (GTK_CONTAINER (window), 8);
   	gtk_window_set_title (GTK_WINDOW (window), _("Icon Captions"));
 	gtk_window_set_wmclass (GTK_WINDOW (window), "icon_captions", "Nautilus");
@@ -333,7 +333,7 @@ ensure_unique_attributes (int chosen_menu)
 	chosen_value = get_attribute_index_from_option_menu (option_menus[chosen_menu]);
 	
 	/* allow the "none" value to be chosen multiple times */
-	if (!nautilus_strcmp (attribute_names[chosen_value], "none")) {
+	if (!eel_strcmp (attribute_names[chosen_value], "none")) {
 		return;
 	}	
 	
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index c317ef1c3..51fb9a0aa 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -44,22 +44,22 @@
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomevfs/gnome-vfs-xfer.h>
 #include <libnautilus-extensions/nautilus-audio-player.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
 #include <libnautilus-extensions/nautilus-directory-background.h>
 #include <libnautilus-extensions/nautilus-directory.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-font-factory.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-icon-container.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
 #include <libnautilus-extensions/nautilus-link.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-sound.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
 #include <libnautilus/nautilus-clipboard.h>
 #include <locale.h>
@@ -152,7 +152,7 @@ static void standard_font_size_changed_callback (gpointer callback_data);
 
 static int preview_sound_auto_value;
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (FMIconView,
+EEL_DEFINE_CLASS_BOILERPLATE (FMIconView,
 				   fm_icon_view,
 				   FM_TYPE_DIRECTORY_VIEW)
 
@@ -244,7 +244,7 @@ fm_icon_view_destroy (GtkObject *object)
 	nautilus_file_list_free (icon_view->details->icons_not_positioned);
 	g_free (icon_view->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static NautilusIconContainer *
@@ -355,7 +355,7 @@ unstretch_icons_callback (BonoboUIComponent *component, gpointer callback_data,
 static void
 fm_icon_view_clean_up (FMIconView *icon_view)
 {
-	NAUTILUS_CALL_METHOD (FM_ICON_VIEW_CLASS, icon_view, clean_up, (icon_view));
+	EEL_CALL_METHOD (FM_ICON_VIEW_CLASS, icon_view, clean_up, (icon_view));
 }
 
 static void
@@ -458,7 +458,7 @@ handle_radio_item (FMIconView *view,
 static void
 customize_icon_text_callback (BonoboUIComponent *component, gpointer callback_data, const char *verb)
 {
-	nautilus_gtk_window_present (fm_icon_text_window_get_or_create ());
+	eel_gtk_window_present (fm_icon_text_window_get_or_create ());
 }
 
 static void
@@ -574,7 +574,7 @@ fm_icon_view_get_directory_sort_by (FMIconView *icon_view,
 		return g_strdup ("name");
 	}
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_ICON_VIEW_CLASS, icon_view,
 		 get_directory_sort_by, (icon_view, file));
 }
@@ -597,7 +597,7 @@ fm_icon_view_set_directory_sort_by (FMIconView *icon_view,
 		return;
 	}
 
-	NAUTILUS_CALL_METHOD (FM_ICON_VIEW_CLASS, icon_view,
+	EEL_CALL_METHOD (FM_ICON_VIEW_CLASS, icon_view,
 			       set_directory_sort_by, (icon_view, file, sort_by));
 }
 
@@ -620,7 +620,7 @@ fm_icon_view_get_directory_sort_reversed (FMIconView *icon_view,
 		return FALSE;
 	}
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_ICON_VIEW_CLASS, icon_view,
 		 get_directory_sort_reversed, (icon_view, file));
 }
@@ -642,7 +642,7 @@ fm_icon_view_set_directory_sort_reversed (FMIconView *icon_view,
 		return;
 	}
 
-	NAUTILUS_CALL_METHOD (FM_ICON_VIEW_CLASS, icon_view,
+	EEL_CALL_METHOD (FM_ICON_VIEW_CLASS, icon_view,
 			       set_directory_sort_reversed,
 			       (icon_view, file, sort_reversed));
 }
@@ -667,7 +667,7 @@ fm_icon_view_get_directory_auto_layout (FMIconView *icon_view,
 		return FALSE;
 	}
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_ICON_VIEW_CLASS, icon_view,
 		 get_directory_auto_layout, (icon_view, file));
 }
@@ -689,7 +689,7 @@ fm_icon_view_set_directory_auto_layout (FMIconView *icon_view,
 		return;
 	}
 
-	NAUTILUS_CALL_METHOD (FM_ICON_VIEW_CLASS, icon_view,
+	EEL_CALL_METHOD (FM_ICON_VIEW_CLASS, icon_view,
 			       set_directory_auto_layout, (icon_view, file, auto_layout));
 }
 
@@ -708,7 +708,7 @@ static gboolean
 fm_icon_view_get_directory_tighter_layout (FMIconView *icon_view,
 					   NautilusFile *file)
 {
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_ICON_VIEW_CLASS, icon_view,
 		 get_directory_tighter_layout, (icon_view, file));
 }
@@ -726,7 +726,7 @@ fm_icon_view_set_directory_tighter_layout (FMIconView *icon_view,
 					   NautilusFile *file,
 					   gboolean tighter_layout)
 {
-	NAUTILUS_CALL_METHOD (FM_ICON_VIEW_CLASS, icon_view,
+	EEL_CALL_METHOD (FM_ICON_VIEW_CLASS, icon_view,
 			       set_directory_tighter_layout, (icon_view, file, tighter_layout));
 }
 
@@ -745,7 +745,7 @@ fm_icon_view_supports_auto_layout (FMIconView *view)
 {
 	g_return_val_if_fail (FM_IS_ICON_VIEW (view), FALSE);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_ICON_VIEW_CLASS, view,
 		 supports_auto_layout, (view));
 }
@@ -781,7 +781,7 @@ get_sort_criterion_by_metadata_text (const char *metadata_text)
 	guint i;
 
 	/* Figure out what the new sort setting should be. */
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (sort_criteria); i++) {
+	for (i = 0; i < EEL_N_ELEMENTS (sort_criteria); i++) {
 		if (strcmp (sort_criteria[i].metadata_text, metadata_text) == 0) {
 			return &sort_criteria[i];
 		}
@@ -795,7 +795,7 @@ get_sort_criterion_by_id (const char *id)
 	guint i;
 
 	/* Figure out what the new sort setting should be. */
-	for (i = 0; i < NAUTILUS_N_ELEMENTS (sort_criteria); i++) {
+	for (i = 0; i < EEL_N_ELEMENTS (sort_criteria); i++) {
 		if (strcmp (sort_criteria[i].id, id) == 0) {
 			return &sort_criteria[i];
 		}
@@ -1135,7 +1135,7 @@ static void
 fm_icon_view_start_renaming_item  (FMDirectoryView *view, const char *uri)
 {
 	/* call parent class to make sure the right icon is selected */
-	NAUTILUS_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, start_renaming_item, (view, uri));
+	EEL_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, start_renaming_item, (view, uri));
 	/* start renaming */
 	nautilus_icon_container_start_renaming_selected_item
 		(get_icon_container (FM_ICON_VIEW (view)));
@@ -1169,7 +1169,7 @@ fm_icon_view_merge_menus (FMDirectoryView *view)
 	
         g_assert (FM_IS_ICON_VIEW (view));
 
-	NAUTILUS_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, merge_menus, (view));
+	EEL_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, merge_menus, (view));
 
 	icon_view = FM_ICON_VIEW (view);
 
@@ -1219,7 +1219,7 @@ fm_icon_view_update_menus (FMDirectoryView *view)
 		return;
 	}
 	
-	NAUTILUS_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, update_menus, (view));
+	EEL_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, update_menus, (view));
 
         selection = fm_directory_view_get_selection (view);
         selection_count = g_list_length (selection);
@@ -1237,7 +1237,7 @@ fm_icon_view_update_menus (FMDirectoryView *view)
 		(icon_view->details->ui,
 		 MENU_PATH_UNSTRETCH_ICONS,
 		 COMMAND_UNSTRETCH_ICONS,
-		 nautilus_g_list_more_than_one_item (selection)
+		 eel_g_list_more_than_one_item (selection)
 		 	? _("_Restore Icons' Original Sizes")
 		 	: _("_Restore Icon's Original Size"));
 	nautilus_bonobo_set_sensitive (icon_view->details->ui, 
@@ -1353,7 +1353,7 @@ play_file (gpointer callback_data)
 	file_uri = nautilus_file_get_uri (file);
 	file_path = gnome_vfs_get_local_path_from_uri (file_uri);
 	mime_type = nautilus_file_get_mime_type (file);
-	is_mp3 = nautilus_strcasecmp (mime_type, "audio/x-mp3") == 0;
+	is_mp3 = eel_strcasecmp (mime_type, "audio/x-mp3") == 0;
 			
 	if (file_path != NULL) {
 		mp3_pid = fork ();
@@ -1390,7 +1390,7 @@ play_file (gpointer callback_data)
 	file_path = gnome_vfs_get_local_path_from_uri (file_uri);
 	mime_type = nautilus_file_get_mime_type (icon_view->details->audio_preview_file);
 
-	is_mp3 = nautilus_strcasecmp (mime_type, "audio/x-mp3") == 0;
+	is_mp3 = eel_strcasecmp (mime_type, "audio/x-mp3") == 0;
 
 	if (file_path != NULL && !is_mp3) {
 		icon_view->details->audio_player_data = nautilus_audio_player_play (file_path);
@@ -1472,8 +1472,8 @@ icon_container_preview_callback (NautilusIconContainer *container,
 	/* at first, we just handle sounds */
 	if (should_preview_sound (file)) {
 		mime_type = nautilus_file_get_mime_type (file);
-		if (nautilus_istr_has_prefix (mime_type, "audio/") &&
-				nautilus_strcasecmp (mime_type, "audio/x-pn-realaudio") != 0) {
+		if (eel_istr_has_prefix (mime_type, "audio/") &&
+				eel_strcasecmp (mime_type, "audio/x-pn-realaudio") != 0) {
 			if (nautilus_sound_can_play_sound ()) {
 				result = 1;
 				preview_audio (icon_view, file, start_flag);
@@ -1701,7 +1701,7 @@ get_icon_images_callback (NautilusIconContainer *container,
 			  FMIconView *icon_view)
 {
 	gboolean smooth_graphics;
-	NautilusStringList *emblems_to_ignore;
+	EelStringList *emblems_to_ignore;
 	
 	g_assert (NAUTILUS_IS_ICON_CONTAINER (container));
 	g_assert (NAUTILUS_IS_FILE (file));
@@ -1712,7 +1712,7 @@ get_icon_images_callback (NautilusIconContainer *container,
 		emblems_to_ignore = fm_directory_view_get_emblem_names_to_exclude 
 			(FM_DIRECTORY_VIEW (icon_view));
 		*emblem_icons = nautilus_icon_factory_get_emblem_icons_for_file (file, smooth_graphics, emblems_to_ignore);
-		nautilus_string_list_free (emblems_to_ignore);
+		eel_string_list_free (emblems_to_ignore);
 	}
 	return nautilus_icon_factory_get_icon_for_file (file, modifier, smooth_graphics);
 }
@@ -1810,7 +1810,7 @@ get_icon_text_callback (NautilusIconContainer *container,
 	/* Get the attributes. */
 	for (i = 0; text_array[i] != NULL; i++)	{
 		/* if the attribute is "none", delete the array slot */
-		while (nautilus_strcmp (text_array[i], "none") == 0) {
+		while (eel_strcmp (text_array[i], "none") == 0) {
 			g_free (text_array[i]);
 			text_array[i] = NULL;
 			slot_index = i + 1;			
@@ -2083,13 +2083,13 @@ static void
 fm_icon_view_update_icon_container_smooth_font (FMIconView *icon_view)
 {
 	NautilusIconContainer *icon_container;
-	NautilusScalableFont *scalable_font;
+	EelScalableFont *scalable_font;
 
 	icon_container = get_icon_container (icon_view);
 	g_assert (icon_container != NULL);
 	
 	scalable_font = nautilus_global_preferences_get_icon_view_smooth_font ();
-	g_assert (NAUTILUS_IS_SCALABLE_FONT (scalable_font));
+	g_assert (EEL_IS_SCALABLE_FONT (scalable_font));
 
 	nautilus_icon_container_set_smooth_label_font (icon_container,
 						       scalable_font);
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index e926812d7..385756421 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -32,20 +32,20 @@
 #include <gtk/gtkmenuitem.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <libnautilus-extensions/nautilus-art-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-art-extensions.h>
+#include <eel/eel-art-gtk-extensions.h>
+#include <eel/eel-art-extensions.h>
 #include <libnautilus-extensions/nautilus-directory-background.h>
 #include <libnautilus-extensions/nautilus-drag.h>
 #include <libnautilus-extensions/nautilus-font-factory.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
 #include <libnautilus-extensions/nautilus-list.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 
 struct FMListViewDetails {
 	int sort_column;
@@ -189,7 +189,7 @@ static void                 real_start_renaming_item                  (FMDirecto
 								       const char         *uri);
 static void                 font_or_font_size_changed_callback        (gpointer            callback_data);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (FMListView,
+EEL_DEFINE_CLASS_BOILERPLATE (FMListView,
 				   fm_list_view,
 				   FM_TYPE_DIRECTORY_VIEW)
 
@@ -294,7 +294,7 @@ static void
 fm_list_view_destroy (GtkObject *object)
 {
 	g_free (FM_LIST_VIEW (object)->details);
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void 
@@ -318,7 +318,7 @@ column_clicked_callback (NautilusCList *clist, int column, gpointer user_data)
 	fm_list_view_sort_items (list_view, column, reversed);
 }
 
-/* NautilusCompareFunction-style compare function */
+/* EelCompareFunction-style compare function */
 static int
 list_view_compare_files_for_sort (gconstpointer a, gconstpointer b, gpointer callback_data)
 {
@@ -454,10 +454,10 @@ make_sorted_row_array (GtkWidget *widget)
 		return NULL;
 		
 	/* build an array of rows */
-	array = nautilus_g_ptr_array_new_from_list (NAUTILUS_CLIST (widget)->row_list);
+	array = eel_g_ptr_array_new_from_list (NAUTILUS_CLIST (widget)->row_list);
 
 	/* sort the array by the names of the NautilusFile objects */
-	nautilus_g_ptr_array_sort (array, compare_rows_by_name, NULL);
+	eel_g_ptr_array_sort (array, compare_rows_by_name, NULL);
 
 	return array;
 }
@@ -502,7 +502,7 @@ select_matching_name_callback (GtkWidget *widget, const char *pattern, FMListVie
 	/* Find the row that matches our search pattern or one after the
 	 * closest match if the pattern does not match exactly.
 	 */
-	array_row_index = nautilus_g_ptr_array_search (array, match_row_name, 
+	array_row_index = eel_g_ptr_array_search (array, match_row_name, 
 						       (char *) pattern, FALSE);
 
 	g_assert (array_row_index >= 0);
@@ -529,7 +529,7 @@ select_previous_next_common (GtkWidget *widget, FMListView *list_view, gboolean
 		return;
 
 	/* sort the array by the names of the NautilusFile objects */
-	nautilus_g_ptr_array_sort (array, compare_rows_by_name, NULL);
+	eel_g_ptr_array_sort (array, compare_rows_by_name, NULL);
 
 	/* find the index of the first and the last selected row */
 	first_selected_row = -1;
@@ -863,17 +863,17 @@ row_get_data_binder (NautilusCListRow *row, int row_index, gpointer data)
 	nautilus_list_get_initial_drag_offset (context->list, &drag_offset_x, &drag_offset_y);
 
 	/* adjust the icons to be vertically relative to the initial mouse click position */
-	icon_rect = nautilus_art_irect_offset_by (nautilus_gdk_rectangle_to_art_irect (&cell_rectangle),
+	icon_rect = eel_art_irect_offset_by (eel_gdk_rectangle_to_art_irect (&cell_rectangle),
 		0, -drag_offset_y);
 
 	/* horizontally just center the outline rectangles -- this will make the outlines align with
 	 * the drag icon
 	 */
-	icon_rect = nautilus_art_irect_offset_to (icon_rect,
+	icon_rect = eel_art_irect_offset_to (icon_rect,
 		- (icon_rect.x1 - icon_rect.x0) / 2, icon_rect.y0);
 	
 	/* add some extra spacing in between the icon outline rects */
-	icon_rect = nautilus_art_irect_inset (icon_rect, 2, 2);
+	icon_rect = eel_art_irect_inset (icon_rect, 2, 2);
 
 	/* pass the uri */
 	(* context->iteratee) (uri,
@@ -1054,7 +1054,7 @@ fm_list_view_update_font (FMListView *list_view)
 
 	font = nautilus_font_factory_get_font_by_family (font_name, font_size);
 	g_assert (font != NULL);
-	nautilus_gtk_widget_set_font (GTK_WIDGET (get_list (list_view)), font);
+	eel_gtk_widget_set_font (GTK_WIDGET (get_list (list_view)), font);
 	gdk_font_unref (font);
 	g_free (font_name);
 }
@@ -1468,7 +1468,7 @@ real_adding_file (FMListView *view, NautilusFile *file)
 static void
 fm_list_view_adding_file (FMListView *view, NautilusFile *file)
 {
-	NAUTILUS_CALL_METHOD (FM_LIST_VIEW_CLASS, view,
+	EEL_CALL_METHOD (FM_LIST_VIEW_CLASS, view,
 			       adding_file, (view, file));
 }
 
@@ -1481,14 +1481,14 @@ real_removing_file (FMListView *view, NautilusFile *file)
 static void
 fm_list_view_removing_file (FMListView *view, NautilusFile *file)
 {
-	NAUTILUS_CALL_METHOD (FM_LIST_VIEW_CLASS, view,
+	EEL_CALL_METHOD (FM_LIST_VIEW_CLASS, view,
 			      removing_file, (view, file));
 }
 
 static gboolean
 fm_list_view_file_still_belongs (FMListView *view, NautilusFile *file)
 {
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_LIST_VIEW_CLASS, view,
 		 file_still_belongs, (view, file));
 }
@@ -1571,7 +1571,7 @@ real_start_renaming_item  (FMDirectoryView *view, const char *uri)
 	NautilusFile *file;
 
 	/* call parent class to make sure the right icon is selected */
-	NAUTILUS_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, start_renaming_item, (view, uri));
+	EEL_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, start_renaming_item, (view, uri));
 	/* Show properties window since we don't do in-place renaming here */
 	file = nautilus_file_get (uri);
 	fm_properties_window_present (file, view);
@@ -1753,8 +1753,8 @@ fm_list_view_display_pending_files (FMDirectoryView *view,
 
 	/* Sort the added items before displaying them, so that they'll be added in order,
 	   and items won't move around.  */
-	*pending_files_added = nautilus_g_list_sort_custom (*pending_files_added,
-							    (NautilusCompareFunction) list_view_compare_files_for_sort,
+	*pending_files_added = eel_g_list_sort_custom (*pending_files_added,
+							    (EelCompareFunction) list_view_compare_files_for_sort,
 							    FM_LIST_VIEW (view));
 
 	files_added = g_list_split_off_first_n (pending_files_added,
@@ -1787,7 +1787,7 @@ fm_list_view_display_pending_files (FMDirectoryView *view,
 
 		if (files_changed != NULL) {
 			selection = fm_directory_view_get_selection (view);
-			send_selection_change = nautilus_g_lists_sort_and_check_for_intersection
+			send_selection_change = eel_g_lists_sort_and_check_for_intersection
 				(&files_changed, &selection);
 			nautilus_file_list_free (selection);
 		}
@@ -1927,7 +1927,7 @@ fm_list_view_get_emblem_pixbufs_for_file (FMListView *list_view,
 	GList *emblem_icons, *emblem_pixbufs, *p;
 	GdkPixbuf *emblem_pixbuf;
 	int emblem_size;
-	NautilusStringList *emblems_to_ignore;
+	EelStringList *emblems_to_ignore;
 	gboolean anti_aliased;
 
 	anti_aliased = nautilus_list_is_anti_aliased (get_list (list_view));
@@ -1935,7 +1935,7 @@ fm_list_view_get_emblem_pixbufs_for_file (FMListView *list_view,
 	emblems_to_ignore =  fm_directory_view_get_emblem_names_to_exclude 
 		(FM_DIRECTORY_VIEW (list_view));
 	emblem_icons = nautilus_icon_factory_get_emblem_icons_for_file (file, anti_aliased, emblems_to_ignore);
-	nautilus_string_list_free (emblems_to_ignore);
+	eel_string_list_free (emblems_to_ignore);
 	
 	emblem_pixbufs = NULL;
 	emblem_size = MAX (LIST_VIEW_MINIMUM_EMBLEM_SIZE, 
@@ -1953,7 +1953,7 @@ fm_list_view_get_emblem_pixbufs_for_file (FMListView *list_view,
 	}
 	emblem_pixbufs = g_list_reverse (emblem_pixbufs);
 
-	nautilus_scalable_icon_list_free (emblem_icons);
+	eel_scalable_icon_list_free (emblem_icons);
 
 	return emblem_pixbufs;
 }
@@ -2035,7 +2035,7 @@ fm_list_view_image_display_policy_changed (FMDirectoryView *view)
 static int
 get_number_of_columns (FMListView *list_view)
 {
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_LIST_VIEW_CLASS, list_view,
 		 get_number_of_columns, (list_view));
 }
@@ -2043,7 +2043,7 @@ get_number_of_columns (FMListView *list_view)
 static int
 get_link_column (FMListView *list_view)
 {
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_LIST_VIEW_CLASS, list_view,
 		 get_link_column, (list_view));
 }
@@ -2051,7 +2051,7 @@ get_link_column (FMListView *list_view)
 static char *
 get_default_sort_attribute (FMListView *list_view)
 {
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(FM_LIST_VIEW_CLASS, list_view,
 		 get_default_sort_attribute, (list_view));
 }
@@ -2063,7 +2063,7 @@ get_column_specification (FMListView *list_view,
 {
 	guint icon_size;
 
-	NAUTILUS_CALL_METHOD (FM_LIST_VIEW_CLASS, list_view,
+	EEL_CALL_METHOD (FM_LIST_VIEW_CLASS, list_view,
 			      get_column_specification,
 			      (list_view, column_number, specification));
 	
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index ccbe10f8d..0c25dafe1 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -46,27 +46,27 @@
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libnautilus-extensions/nautilus-customization-data.h>
-#include <libnautilus-extensions/nautilus-ellipsizing-label.h>
+#include <eel/eel-ellipsizing-label.h>
 #include <libnautilus-extensions/nautilus-entry.h>
 #include <libnautilus-extensions/nautilus-file-attributes.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
-#include <libnautilus-extensions/nautilus-image.h>
+#include <eel/eel-image.h>
 #include <libnautilus-extensions/nautilus-link.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-undo-signal-handlers.h>
 #include <libnautilus/nautilus-undo.h>
-#include <libnautilus-extensions/nautilus-wrap-table.h>
-#include <libnautilus-extensions/nautilus-labeled-image.h>
-#include <libnautilus-extensions/nautilus-viewport.h>
+#include <eel/eel-wrap-table.h>
+#include <eel/eel-labeled-image.h>
+#include <eel/eel-viewport.h>
 #include <string.h>
 
 static GHashTable *windows;
@@ -153,7 +153,7 @@ static void remove_pending_file                   (StartupData             *data
 						   gboolean                 cancel_timed_wait,
 						   gboolean                 cancel_destroy_handler);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (FMPropertiesWindow, fm_properties_window, GTK_TYPE_WINDOW)
+EEL_DEFINE_CLASS_BOILERPLATE (FMPropertiesWindow, fm_properties_window, GTK_TYPE_WINDOW)
 
 static void
 fm_properties_window_initialize_class (FMPropertiesWindowClass *class)
@@ -172,7 +172,7 @@ fm_properties_window_initialize (FMPropertiesWindow *window)
 {
 	window->details = g_new0 (FMPropertiesWindowDetails, 1);
 
-	nautilus_gtk_window_set_up_close_accelerator (GTK_WINDOW (window));
+	eel_gtk_window_set_up_close_accelerator (GTK_WINDOW (window));
 }
 
 typedef struct {
@@ -240,12 +240,12 @@ get_pixbuf_for_properties_window (NautilusFile *file)
 }
 
 static void
-update_properties_window_icon (NautilusImage *image)
+update_properties_window_icon (EelImage *image)
 {
 	GdkPixbuf	*pixbuf;
 	NautilusFile	*file;
 
-	g_assert (NAUTILUS_IS_IMAGE (image));
+	g_assert (EEL_IS_IMAGE (image));
 
 	file = gtk_object_get_data (GTK_OBJECT (image), "nautilus_file");
 
@@ -253,7 +253,7 @@ update_properties_window_icon (NautilusImage *image)
 	
 	pixbuf = get_pixbuf_for_properties_window (file);
 
-	nautilus_image_set_pixbuf (image, pixbuf);
+	eel_image_set_pixbuf (image, pixbuf);
 	
 	gdk_pixbuf_unref (pixbuf);
 }
@@ -266,9 +266,9 @@ create_image_widget_for_file (NautilusFile *file)
 	
 	pixbuf = get_pixbuf_for_properties_window (file);
 	
-	image = nautilus_image_new (NULL);
+	image = eel_image_new (NULL);
 
-	nautilus_image_set_pixbuf (NAUTILUS_IMAGE (image), pixbuf);
+	eel_image_set_pixbuf (EEL_IMAGE (image), pixbuf);
 
 	gdk_pixbuf_unref (pixbuf);
 
@@ -316,7 +316,7 @@ name_field_update_to_match_file (NautilusEntry *name_field)
 	 * aspect of the file might have), then don't clobber changes.
 	 */
 	current_name = nautilus_file_get_name (file);
-	if (nautilus_strcmp (original_name, current_name) != 0) {
+	if (eel_strcmp (original_name, current_name) != 0) {
 		gtk_object_set_data_full (GTK_OBJECT (name_field),
 					  "original_name",
 					  current_name,
@@ -503,11 +503,11 @@ property_button_toggled (GtkToggleButton *button)
 	} else {
 		if (word != NULL) {
 			keywords = g_list_remove_link (keywords, word);
-			nautilus_g_list_free_deep (word);
+			eel_g_list_free_deep (word);
 		}
 	}
 	nautilus_file_set_keywords (file, keywords);
-	nautilus_g_list_free_deep (keywords);
+	eel_g_list_free_deep (keywords);
 }
 
 static void
@@ -549,13 +549,13 @@ value_field_update_internal (GtkLabel *label,
 
 	g_assert (GTK_IS_LABEL (label));
 	g_assert (NAUTILUS_IS_FILE (file));
-	g_assert (!ellipsize_text || NAUTILUS_IS_ELLIPSIZING_LABEL (label));
+	g_assert (!ellipsize_text || EEL_IS_ELLIPSIZING_LABEL (label));
 
 	attribute_name = gtk_object_get_data (GTK_OBJECT (label), "file_attribute");
 	attribute_value = nautilus_file_get_string_attribute_with_default (file, attribute_name);
 
 	if (ellipsize_text) {
-		nautilus_ellipsizing_label_set_text (NAUTILUS_ELLIPSIZING_LABEL (label), 
+		eel_ellipsizing_label_set_text (EEL_ELLIPSIZING_LABEL (label), 
 						     attribute_value);
 	} else {
 		gtk_label_set_text (label, attribute_value);
@@ -587,11 +587,11 @@ attach_label (GtkTable *table,
 	GtkWidget *label_field;
 
 	label_field = ellipsize_text
-		? nautilus_ellipsizing_label_new (initial_text)
+		? eel_ellipsizing_label_new (initial_text)
 		: gtk_label_new (initial_text);	
 
 	if (bold) {
-		nautilus_gtk_label_make_bold (GTK_LABEL (label_field));
+		eel_gtk_label_make_bold (GTK_LABEL (label_field));
 	}
 	gtk_misc_set_alignment (GTK_MISC (label_field), right_aligned ? 1 : 0, 0.5);
 	gtk_widget_show (label_field);
@@ -689,7 +689,7 @@ group_change_callback (NautilusFile *file, GnomeVFSResult result, gpointer callb
 	g_assert (callback_data == NULL);
 	
 	/* Report the error if it's an error. */
-	nautilus_timed_wait_stop (cancel_group_change_callback, file);
+	eel_timed_wait_stop (cancel_group_change_callback, file);
 	fm_report_error_setting_group (file, result, NULL);
 	nautilus_file_unref (file);
 }
@@ -711,7 +711,7 @@ activate_group_callback (GtkMenuItem *menu_item, FileNamePair *pair)
 
 	/* Try to change file group. If this fails, complain to user. */
 	nautilus_file_ref (pair->file);
-	nautilus_timed_wait_start
+	eel_timed_wait_start
 		(cancel_group_change_callback,
 		 pair->file,
 		 _("Cancel Group Change?"),
@@ -733,7 +733,7 @@ create_group_menu_item (NautilusFile *file, const char *group_name)
 	menu_item = gtk_menu_item_new_with_label (group_name);
 	gtk_widget_show (menu_item);
 
-	nautilus_gtk_signal_connect_free_data_custom (GTK_OBJECT (menu_item),
+	eel_gtk_signal_connect_free_data_custom (GTK_OBJECT (menu_item),
 			    		       	      "activate",
 			    		       	      activate_group_callback,
 			    		       	      file_name_pair_new (file, group_name),
@@ -795,7 +795,7 @@ synch_groups_menu (GtkOptionMenu *option_menu, NautilusFile *file)
 	gtk_option_menu_set_history (option_menu, current_group_index);
 
 	g_free (current_group_name);
-	nautilus_g_list_free_deep (groups);
+	eel_g_list_free_deep (groups);
 }
 
 static GtkOptionMenu *
@@ -848,7 +848,7 @@ owner_change_callback (NautilusFile *file, GnomeVFSResult result, gpointer callb
 	g_assert (callback_data == NULL);
 	
 	/* Report the error if it's an error. */
-	nautilus_timed_wait_stop (cancel_owner_change_callback, file);
+	eel_timed_wait_stop (cancel_owner_change_callback, file);
 	fm_report_error_setting_owner (file, result, NULL);
 	nautilus_file_unref (file);
 }
@@ -873,7 +873,7 @@ activate_owner_callback (GtkMenuItem *menu_item, FileNamePair *pair)
 
 	/* Try to change file owner. If this fails, complain to user. */
 	nautilus_file_ref (pair->file);
-	nautilus_timed_wait_start
+	eel_timed_wait_start
 		(cancel_owner_change_callback,
 		 pair->file,
 		 _("Cancel Owner Change?"),
@@ -906,7 +906,7 @@ create_owner_menu_item (NautilusFile *file, const char *user_name)
 
 	gtk_widget_show (menu_item);
 
-	nautilus_gtk_signal_connect_free_data_custom (GTK_OBJECT (menu_item),
+	eel_gtk_signal_connect_free_data_custom (GTK_OBJECT (menu_item),
 			    		       	      "activate",
 			    		       	      activate_owner_callback,
 			    		       	      file_name_pair_new (file, name_array[0]),
@@ -968,7 +968,7 @@ synch_user_menu (GtkOptionMenu *option_menu, NautilusFile *file)
 	gtk_option_menu_set_history (option_menu, owner_index);
 
 	g_free (owner_name);
-	nautilus_g_list_free_deep (users);
+	eel_g_list_free_deep (users);
 }	
 
 static void
@@ -1552,13 +1552,13 @@ create_basic_page (FMPropertiesWindow *window)
 	 	temp_button = gtk_button_new_with_label (_("Select Custom Icon..."));
 		gtk_widget_show (temp_button);
 		gtk_box_pack_start (GTK_BOX (button_box), temp_button, FALSE, FALSE, 4);  
-		nautilus_gtk_button_set_standard_padding (GTK_BUTTON (temp_button));
+		eel_gtk_button_set_standard_padding (GTK_BUTTON (temp_button));
 		gtk_signal_connect(GTK_OBJECT (temp_button), "clicked", GTK_SIGNAL_FUNC (select_image_button_callback), window);
 	 	
 	 	temp_button = gtk_button_new_with_label (_("Remove Custom Icon"));
 		gtk_widget_show (temp_button);
 		gtk_box_pack_start (GTK_BOX(button_box), temp_button, FALSE, FALSE, 4);  
-		nautilus_gtk_button_set_standard_padding (GTK_BUTTON (temp_button));
+		eel_gtk_button_set_standard_padding (GTK_BUTTON (temp_button));
 	 	gtk_signal_connect (GTK_OBJECT (temp_button), "clicked", GTK_SIGNAL_FUNC (remove_image_button_callback), window);
 
 		window->details->remove_image_button = temp_button;
@@ -1592,7 +1592,7 @@ create_emblems_page (FMPropertiesWindow *window)
 	file = window->details->target_file;
 
 	/* The emblems wrapped table */
-	emblems_table = nautilus_wrap_table_new (TRUE);
+	emblems_table = eel_wrap_table_new (TRUE);
 
 	gtk_widget_show (emblems_table);
 	gtk_container_set_border_width (GTK_CONTAINER (emblems_table), GNOME_PAD);
@@ -1642,9 +1642,9 @@ create_emblems_page (FMPropertiesWindow *window)
 			continue;
 		}
 		
-		button = nautilus_labeled_image_check_button_new (label, pixbuf);
-		nautilus_labeled_image_set_fixed_image_height (NAUTILUS_LABELED_IMAGE (GTK_BIN (button)->child), STANDARD_EMBLEM_HEIGHT);
-		nautilus_labeled_image_set_spacing (NAUTILUS_LABELED_IMAGE (GTK_BIN (button)->child), EMBLEM_LABEL_SPACING);
+		button = eel_labeled_image_check_button_new (label, pixbuf);
+		eel_labeled_image_set_fixed_image_height (EEL_LABELED_IMAGE (GTK_BIN (button)->child), STANDARD_EMBLEM_HEIGHT);
+		eel_labeled_image_set_spacing (EEL_LABELED_IMAGE (GTK_BIN (button)->child), EMBLEM_LABEL_SPACING);
 		
 		g_free (label);
 		gdk_pixbuf_unref (pixbuf);
@@ -1689,7 +1689,7 @@ add_permissions_column_label (GtkTable *table,
 	GtkWidget *label;
 
 	label = gtk_label_new (title_text);
-	nautilus_gtk_label_make_bold (GTK_LABEL (label));
+	eel_gtk_label_make_bold (GTK_LABEL (label));
 	gtk_widget_set_sensitive (GTK_WIDGET (label), 
 				  nautilus_file_can_set_permissions (file));
 
@@ -2238,7 +2238,7 @@ create_properties_window_callback (NautilusFile *file, gpointer callback_data)
 	nautilus_undo_share_undo_manager (GTK_OBJECT (new_window),
 					  GTK_OBJECT (callback_data));
 #endif	
-	nautilus_gtk_window_present (GTK_WINDOW (new_window));
+	eel_gtk_window_present (GTK_WINDOW (new_window));
 }
 
 static void
@@ -2266,7 +2266,7 @@ remove_pending_file (StartupData *startup_data,
 			(startup_data->target_file, create_properties_window_callback, startup_data);
 	}
 	if (cancel_timed_wait) {
-		nautilus_timed_wait_stop 
+		eel_timed_wait_stop 
 			(cancel_create_properties_window_callback, startup_data);
 	}
 	if (cancel_destroy_handler) {
@@ -2292,19 +2292,19 @@ fm_properties_window_present (NautilusFile *original_file, FMDirectoryView *dire
 
 	/* Create the hash tables first time through. */
 	if (windows == NULL) {
-		windows = nautilus_g_hash_table_new_free_at_exit
+		windows = eel_g_hash_table_new_free_at_exit
 			(NULL, NULL, "property windows");
 	}
 	
 	if (pending_files == NULL) {
-		pending_files = nautilus_g_hash_table_new_free_at_exit
+		pending_files = eel_g_hash_table_new_free_at_exit
 			(NULL, NULL, "pending property window files");
 	}
 	
 	/* Look to see if there's already a window for this file. */
 	existing_window = g_hash_table_lookup (windows, original_file);
 	if (existing_window != NULL) {
-		nautilus_gtk_window_present (existing_window);
+		eel_gtk_window_present (existing_window);
 		return;
 	}
 
@@ -2328,7 +2328,7 @@ fm_properties_window_present (NautilusFile *original_file, FMDirectoryView *dire
 			    startup_data);
 
 	parent_window = gtk_widget_get_ancestor (GTK_WIDGET (directory_view), GTK_TYPE_WINDOW);
-	nautilus_timed_wait_start
+	eel_timed_wait_start
 		(cancel_create_properties_window_callback,
 		 startup_data,
 		 _("Cancel Showing Properties Window?"),
@@ -2355,7 +2355,7 @@ real_shutdown (GtkObject *object)
 	gtk_signal_disconnect (GTK_OBJECT (window->details->target_file), 
 			       window->details->file_changed_handler_id);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, shutdown, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, shutdown, (object));
 }
 
 static void
@@ -2384,7 +2384,7 @@ real_destroy (GtkObject *object)
 	/* Note that file_changed_handler_id is disconnected in shutdown,
 	 * and details are freed in finalize 
 	 */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -2398,7 +2398,7 @@ real_finalize (GtkObject *object)
 	g_free (window->details->pending_name);
 	g_free (window->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
 }
 
 /* icon selection callback to set the image of the file object to the selected file */
@@ -2432,10 +2432,10 @@ select_image_button_callback (GtkWidget *widget, FMPropertiesWindow *properties_
 
 	g_assert (FM_IS_PROPERTIES_WINDOW (properties_window));
 
-	dialog = nautilus_gnome_icon_selector_new (_("Select an icon:"),
+	dialog = eel_gnome_icon_selector_new (_("Select an icon:"),
 						   NULL,
 						   GTK_WINDOW (properties_window),
-						   (NautilusIconSelectionFunction) set_icon_callback,
+						   (EelIconSelectionFunction) set_icon_callback,
 						   properties_window);						   
 }
 
diff --git a/src/file-manager/fm-search-list-view.c b/src/file-manager/fm-search-list-view.c
index b0c1ff480..f994954d8 100644
--- a/src/file-manager/fm-search-list-view.c
+++ b/src/file-manager/fm-search-list-view.c
@@ -44,12 +44,12 @@
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
 #include <libnautilus-extensions/nautilus-file-attributes.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-search-uri.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 
 /* FIXME bugzilla.eazel.com 2815: This code uses part of the
  * NautilusSearchBarCriterion class, which is really for complex
@@ -88,7 +88,7 @@ static char *   real_get_default_sort_attribute      	 (FMListView       *view);
 static void 	real_get_column_specification        	 (FMListView       *list_view,
 						      	  int               column_number,
 						      	  FMListViewColumn *specification);
-static NautilusStringList * real_get_emblem_names_to_exclude         (FMDirectoryView  *view);
+static EelStringList * real_get_emblem_names_to_exclude         (FMDirectoryView  *view);
 static void	real_file_limit_reached 		 (FMDirectoryView  *view);
 static void	real_merge_menus 		     	 (FMDirectoryView  *view);
 static gboolean real_supports_creating_files		 (FMDirectoryView  *view);
@@ -107,7 +107,7 @@ static void	reveal_selected_items_callback 		 (BonoboUIComponent *component,
 							  const char 	   *verb);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (FMSearchListView,
+EEL_DEFINE_CLASS_BOILERPLATE (FMSearchListView,
 				   fm_search_list_view,
 				   FM_TYPE_LIST_VIEW)
 
@@ -155,7 +155,7 @@ load_location_callback (NautilusView *nautilus_view, char *location)
 		}
 	}
 #else
-	nautilus_show_error_dialog (_("Sorry, but the Medusa search service is not available because it is not installed."),
+	eel_show_error_dialog (_("Sorry, but the Medusa search service is not available because it is not installed."),
 			            _("Search Service Not Available"),
 			            NULL);
 #endif
@@ -181,7 +181,7 @@ real_load_error (FMDirectoryView *nautilus_view,
 	case GNOME_VFS_ERROR_SERVICE_OBSOLETE:
 		/* FIXME bugzilla.eazel.com 5058: Should be two messages, one for each of whether
 		   "slow complete search" turned on or not */
-		load_error_dialog = nautilus_show_yes_no_dialog (_("The search you have selected "
+		load_error_dialog = eel_show_yes_no_dialog (_("The search you have selected "
 							           "is newer than the index on your "
 							           "system.  The search will return "
 							           "no results right now.  Would you like "
@@ -190,14 +190,14 @@ real_load_error (FMDirectoryView *nautilus_view,
 							         _("Create a new index"),
 							         _("Don't create index"),
 							         NULL);
-		gtk_signal_connect (GTK_OBJECT (nautilus_gnome_dialog_get_button_by_index
+		gtk_signal_connect (GTK_OBJECT (eel_gnome_dialog_get_button_by_index
 						(load_error_dialog, GNOME_OK)),
 				    "clicked",
 				    nautilus_indexing_info_request_reindex,
 				    NULL);
 		break;
 	case GNOME_VFS_ERROR_TOO_BIG:
-		nautilus_show_error_dialog (_("Every indexed file on your computer "
+		eel_show_error_dialog (_("Every indexed file on your computer "
 					      "matches the criteria you selected. "
 					      "You can check the spelling on your selections "
 					      "or add more criteria to narrow your results."),
@@ -214,7 +214,7 @@ real_load_error (FMDirectoryView *nautilus_view,
 							  "this search's contents: "
 							  "%s"),
 							gnome_vfs_result_to_string (result));
-		nautilus_show_error_dialog (error_string,
+		eel_show_error_dialog (error_string,
 				            _("Error during search"),
 				            NULL);
 		g_free (error_string);
@@ -249,7 +249,7 @@ display_indexed_search_problems_dialog (gboolean backup_search_is_available)
 		title_string = backup_search_is_available 
 			?  N_("Fast searches are not available")
 			:  N_("Content searches are not available");
-		nautilus_show_error_dialog_with_details (error_string,
+		eel_show_error_dialog_with_details (error_string,
 						         title_string,
 						         _("Your index files are available "
 						           "but the Medusa search daemon, which handles "
@@ -289,12 +289,12 @@ display_indexed_search_problems_dialog (gboolean backup_search_is_available)
 			title_string = backup_search_is_available
 				? N_("Indexed searches are not available")
 				: N_("Content searches are not available");
-			index_problem_dialog = nautilus_show_yes_no_dialog (error_string,
+			index_problem_dialog = eel_show_yes_no_dialog (error_string,
 								            title_string,
 								            _("Create an Index"),
 								            _("Don't Create an Index Now"),
 								            NULL);
-			create_index_button = nautilus_gnome_dialog_get_button_by_index (index_problem_dialog,
+			create_index_button = eel_gnome_dialog_get_button_by_index (index_problem_dialog,
 											  GNOME_OK);
 			gtk_signal_connect (GTK_OBJECT (create_index_button),
 					    "clicked",
@@ -317,7 +317,7 @@ display_indexed_search_problems_dialog (gboolean backup_search_is_available)
 			title_string = backup_search_is_available
 				? N_("Indexed searches are not available")
 				: N_("Content searches are not available");
-			nautilus_show_error_dialog (error_string,
+			eel_show_error_dialog (error_string,
 					            title_string,
 					            NULL);
 			break;
@@ -336,7 +336,7 @@ display_indexed_search_problems_dialog (gboolean backup_search_is_available)
 			title_string = backup_search_is_available
 				? N_("Indexed searches are not available")
 				: N_("Content searches are not available");
-			nautilus_show_error_dialog_with_details (error_string,
+			eel_show_error_dialog_with_details (error_string,
 							         title_string,
 							         _("The program that creates an index "
 							           "is not set up correctly.  You can "
@@ -357,7 +357,7 @@ display_system_services_are_blocked_dialog (gboolean unindexed_search_is_availab
 
 	/* It is not necessary to translate this text just yet; it has not been
 	   edited yet, and will be replaced by a final copy in a few days. */
-	dialog_shown = nautilus_show_info_dialog (_("To do a fast search, Find requires an index of "
+	dialog_shown = eel_show_info_dialog (_("To do a fast search, Find requires an index of "
 						    "the files on your system. Your system administrator "
 						    "has disabled fast search on your computer, so no index "
 						    "is available."),
@@ -370,7 +370,7 @@ display_system_services_are_blocked_dialog (gboolean unindexed_search_is_availab
 static void     
 display_system_services_are_disabled_dialog (gboolean unindexed_search_is_available)
 {
-	nautilus_show_info_dialog_with_details (_("To do a fast search, Find requires an index of "
+	eel_show_info_dialog_with_details (_("To do a fast search, Find requires an index of "
 						  "the files on your system. Fast search is disabled "
 						  "in your Search preferences, so no index is available."),
 						_("Fast searches are not available on your computer."),
@@ -456,7 +456,7 @@ real_destroy (GtkObject *object)
 	}
 	g_free (search_view->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static int
@@ -507,7 +507,7 @@ real_get_default_sort_attribute (FMListView *view)
 	return sort_attribute;
 }
 
-static NautilusStringList *
+static EelStringList *
 real_get_emblem_names_to_exclude (FMDirectoryView *view)
 {
 	g_assert (FM_IS_DIRECTORY_VIEW (view));
@@ -614,7 +614,7 @@ compute_reveal_item_name_and_sensitivity (GList *selected_files,
 	*return_sensitivity = selected_files != NULL;
 	
         if (return_name_no_underscore != NULL) {
-        	*return_name_no_underscore = nautilus_str_strip_chr (name_with_underscore, '_');
+        	*return_name_no_underscore = eel_str_strip_chr (name_with_underscore, '_');
         }
 
         if (return_name_with_underscore != NULL) {
@@ -648,7 +648,7 @@ real_add_file (FMDirectoryView *view, NautilusFile *file)
 		/* Tell the normal list-view code to add this file. It will add
 		 * and ref it only if it's not already in the list.
 		 */ 
-		NAUTILUS_CALL_PARENT 
+		EEL_CALL_PARENT 
 			(FM_DIRECTORY_VIEW_CLASS, add_file, (view, real_file));
 	}
 
@@ -665,7 +665,7 @@ real_adding_file (FMListView *view, NautilusFile *file)
 	g_assert (FM_IS_SEARCH_LIST_VIEW (view));
 	g_assert (NAUTILUS_IS_FILE (file));
 
-	NAUTILUS_CALL_PARENT (FM_LIST_VIEW_CLASS, adding_file, (view, file));
+	EEL_CALL_PARENT (FM_LIST_VIEW_CLASS, adding_file, (view, file));
 
 	/* FIXME bugzilla.eazel.com 5059: this implies that positioning, custom icon, icon
 	 * stretching, etc, will be based on the real directory the file is in,
@@ -699,7 +699,7 @@ real_removing_file (FMListView *view, NautilusFile *file)
 	nautilus_file_monitor_remove (file, view);
 	gtk_signal_disconnect_by_func 
 		(GTK_OBJECT (file), fm_directory_view_queue_file_change, view);
-	NAUTILUS_CALL_PARENT (FM_LIST_VIEW_CLASS, removing_file, (view, file));
+	EEL_CALL_PARENT (FM_LIST_VIEW_CLASS, removing_file, (view, file));
 }
 
 static gboolean
@@ -720,7 +720,7 @@ real_file_limit_reached (FMDirectoryView *view)
 	 * to the way files are collected in batches. So you can't assume that
 	 * no more than the constant limit are displayed.
 	 */
-	nautilus_show_warning_dialog (_("Nautilus found more search results than it can display. "
+	eel_show_warning_dialog (_("Nautilus found more search results than it can display. "
 				        "Some matching items will not be displayed. "), 
 				      _("Too Many Matches"),
 				      fm_directory_view_get_containing_window (view));
@@ -762,7 +762,7 @@ real_merge_menus (FMDirectoryView *view)
 		BONOBO_UI_VERB_END
 	};
 
-	NAUTILUS_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, merge_menus, (view));
+	EEL_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, merge_menus, (view));
 
 	search_view = FM_SEARCH_LIST_VIEW (view);
 
@@ -811,7 +811,7 @@ real_update_menus (FMDirectoryView *view)
 {
 	g_assert (FM_IS_SEARCH_LIST_VIEW (view));
 
-	NAUTILUS_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, update_menus, (view));
+	EEL_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, update_menus, (view));
 
 	update_reveal_item (FM_SEARCH_LIST_VIEW (view));
 }
@@ -842,7 +842,7 @@ reveal_selected_items_callback (BonoboUIComponent *component, gpointer user_data
 					(fm_directory_view_get_nautilus_view (directory_view), 
 					 parent_uri,
 					 file_as_list);
-				nautilus_g_list_free_deep (file_as_list);
+				eel_g_list_free_deep (file_as_list);
 			}
 			g_free (parent_uri);
 		}
diff --git a/src/file-manager/nautilus-indexing-info.c b/src/file-manager/nautilus-indexing-info.c
index 78005d377..ee96c044a 100644
--- a/src/file-manager/nautilus-indexing-info.c
+++ b/src/file-manager/nautilus-indexing-info.c
@@ -33,12 +33,12 @@
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-preferences.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
+#include <eel/eel-stock-dialogs.h>
 
 #ifdef HAVE_MEDUSA
 
@@ -50,7 +50,7 @@
 #define PROGRESS_UPDATE_INTERVAL 5000
 
 typedef struct {
-        NautilusLabel *progress_label;
+        EelLabel *progress_label;
         GtkProgress *progress_bar;
 } ProgressChangeData;
 
@@ -89,15 +89,15 @@ get_text_for_progress_label (void)
 static gboolean
 update_progress_display (gpointer callback_data)
 {
-        NautilusLabel *progress_label;
+        EelLabel *progress_label;
         ProgressChangeData *progress_change_data;
         char *progress_string;
 
         progress_change_data = (ProgressChangeData *) callback_data;
 
-        progress_label = NAUTILUS_LABEL (progress_change_data->progress_label);
+        progress_label = EEL_LABEL (progress_change_data->progress_label);
         progress_string = get_text_for_progress_label ();
-        nautilus_label_set_text (progress_label, progress_string);
+        eel_label_set_text (progress_label, progress_string);
         g_free (progress_string);
         gtk_progress_set_value (progress_change_data->progress_bar, get_index_percentage_complete ());
 
@@ -190,7 +190,7 @@ update_file_index_callback (GtkWidget *widget, gpointer data)
 	}
         if (error) {
                 /* FIXME: Maybe we should include details here? */
-                nautilus_show_error_dialog (error,
+                eel_show_error_dialog (error,
                                             _("Reindexing Failed"),
                                             NULL);
         }
@@ -213,7 +213,7 @@ last_index_time_and_reindex_button_dialog_new (void)
                 /* Fall through, we won't be showing this in the above case, anyways. */
         case MEDUSA_INDEXER_READY_TO_INDEX:
                 
-                dialog = nautilus_create_info_dialog (_("Once a day your files and text content are indexed so "
+                dialog = eel_create_info_dialog (_("Once a day your files and text content are indexed so "
                                                         "your searches are fast. If you need to update your index "
                                                         "now, click on the \"Update Now\" button."),
                                                       _("Indexing Status"),
@@ -221,7 +221,7 @@ last_index_time_and_reindex_button_dialog_new (void)
                 break;
         case MEDUSA_INDEXER_NOT_AVAILABLE:
                 /* FIXME: Do we want to talk about the index not being available? */
-                dialog = nautilus_create_info_dialog (_("Once a day your files and text content are indexed so "
+                dialog = eel_create_info_dialog (_("Once a day your files and text content are indexed so "
                                                         "your searches are fast. "),
                                                       _("Indexing Status"),
                                                       NULL);
@@ -237,10 +237,10 @@ last_index_time_and_reindex_button_dialog_new (void)
                                      time_str);
         g_free (time_str);
         
-        label = nautilus_label_new (label_str);
-        nautilus_label_set_never_smooth (NAUTILUS_LABEL (label), TRUE);
-        nautilus_label_set_justify (NAUTILUS_LABEL (label), GTK_JUSTIFY_LEFT);
-        nautilus_label_make_bold (NAUTILUS_LABEL (label));
+        label = eel_label_new (label_str);
+        eel_label_set_never_smooth (EEL_LABEL (label), TRUE);
+        eel_label_set_justify (EEL_LABEL (label), GTK_JUSTIFY_LEFT);
+        eel_label_make_bold (EEL_LABEL (label));
         gtk_box_pack_start (GTK_BOX (dialog->vbox), label,
                             FALSE, FALSE, 0);
 
@@ -276,7 +276,7 @@ index_progress_dialog_new (void)
         ProgressChangeData *progress_data;
         guint timeout_id;
                 
-        dialog = nautilus_create_info_dialog (_("Once a day your files and text content are indexed so "
+        dialog = eel_create_info_dialog (_("Once a day your files and text content are indexed so "
                                                 "your searches are fast.  Your files are currently being indexed."),
                                               _("Indexing Status"), NULL);
         initialize_dialog (dialog);        
@@ -291,10 +291,10 @@ index_progress_dialog_new (void)
         gtk_box_pack_start (GTK_BOX (embedded_vbox), indexing_progress_bar, FALSE, FALSE, 0);
 
         progress_string = get_text_for_progress_label ();
-        progress_label = nautilus_label_new (progress_string);
-        nautilus_label_set_never_smooth (NAUTILUS_LABEL (progress_label), TRUE);
+        progress_label = eel_label_new (progress_string);
+        eel_label_set_never_smooth (EEL_LABEL (progress_label), TRUE);
         g_free (progress_string);
-        nautilus_label_set_justify (NAUTILUS_LABEL (progress_label), GTK_JUSTIFY_LEFT);
+        eel_label_set_justify (EEL_LABEL (progress_label), GTK_JUSTIFY_LEFT);
         gtk_box_pack_start (GTK_BOX (embedded_vbox), progress_label, FALSE, FALSE, 0);
 
         progress_bar_hbox = gtk_hbox_new (FALSE, 0);
@@ -306,7 +306,7 @@ index_progress_dialog_new (void)
 
         /* Keep the dialog current with actual indexing progress */
         progress_data = g_new (ProgressChangeData, 1);
-        progress_data->progress_label = NAUTILUS_LABEL (progress_label);
+        progress_data->progress_label = EEL_LABEL (progress_label);
         progress_data->progress_bar = GTK_PROGRESS (indexing_progress_bar);
         timeout_id = gtk_timeout_add_full (PROGRESS_UPDATE_INTERVAL,
                                            update_progress_display,
@@ -339,7 +339,7 @@ show_indexing_info_dialog (void)
         int callback_id;
         
         if (medusa_system_services_are_blocked ()) {
-                dialog_shown = nautilus_show_info_dialog (_("To do a fast search, Find requires "
+                dialog_shown = eel_show_info_dialog (_("To do a fast search, Find requires "
                                                             "an index of the files on your system. "
                                                             "Your system administrator has disabled "
                                                             "fast search on your computer, so no "
@@ -358,7 +358,7 @@ show_indexing_info_dialog (void)
         }
 
         if (!medusa_system_services_are_enabled ()) {
-                dialog_shown = nautilus_show_info_dialog_with_details (_("To do a fast search, Find requires an index "
+                dialog_shown = eel_show_info_dialog_with_details (_("To do a fast search, Find requires an index "
                                                                          "of the files on your system. Fast search is "
                                                                          "disabled in your Search preferences, so no "
                                                                          "index is available."),
@@ -403,7 +403,7 @@ show_indexing_info_dialog (void)
 static void
 show_search_service_not_available_dialog (void)
 {
-        nautilus_show_error_dialog (_("Sorry, but the medusa search service is not available."),
+        eel_show_error_dialog (_("Sorry, but the medusa search service is not available."),
                                     _("Search Service Not Available"),
                                     NULL);
 }
@@ -425,7 +425,7 @@ nautilus_indexing_info_get_last_index_time (void)
         
 	update_time = medusa_index_service_get_last_index_update_time ();
         if (update_time) {
-                return nautilus_strdup_strftime (_("%I:%M %p, %x"),
+                return eel_strdup_strftime (_("%I:%M %p, %x"),
                                                  localtime (&update_time));
         } else {
                 return NULL;
diff --git a/src/nautilus-about.c b/src/nautilus-about.c
index 4d7706af7..95f732319 100644
--- a/src/nautilus-about.c
+++ b/src/nautilus-about.c
@@ -39,16 +39,16 @@
 #include <gtk/gtkmenuitem.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-pixmap.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-scalable-font.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-scalable-font.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-theme.h>
 
 struct NautilusAboutDetails {
@@ -89,7 +89,7 @@ static int      update_authors_if_necessary     (gpointer             callback_d
 #define UPDATE_TIME_INTERVAL 8
 
 /* gtk class definition boilerplate */
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAbout, nautilus_about, GNOME_TYPE_DIALOG)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAbout, nautilus_about, GNOME_TYPE_DIALOG)
 
 static void
 nautilus_about_initialize_class (NautilusAboutClass *about_class)
@@ -119,7 +119,7 @@ nautilus_about_destroy (GtkObject *object)
 	
 	g_free (about->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
@@ -140,7 +140,7 @@ nautilus_about_initialize (NautilusAbout *about)
 	/* set the window title and standard close key accelerator */
 	gtk_window_set_title (GTK_WINDOW (about), _("About Nautilus"));
 	gtk_window_set_wmclass (GTK_WINDOW (about), "about", "Nautilus");
-	nautilus_gtk_window_set_up_close_accelerator (GTK_WINDOW (about));
+	eel_gtk_window_set_up_close_accelerator (GTK_WINDOW (about));
 	
 	/* allocate a frame to hold the drawing area */
 	frame = gtk_frame_new (NULL);
@@ -231,7 +231,7 @@ nautilus_about_repaint (GtkWidget *widget,
 
 /* utility routine to draw a string at a position */
 static void
-draw_aa_string (NautilusScalableFont *font,
+draw_aa_string (EelScalableFont *font,
 		GdkPixbuf *pixbuf,
 		int font_size,
 		int x_pos,
@@ -242,17 +242,17 @@ draw_aa_string (NautilusScalableFont *font,
 		int shadow_offset)
 {
 	if (shadow_offset != 0) {
-		nautilus_scalable_font_draw_text (font, pixbuf,
+		eel_scalable_font_draw_text (font, pixbuf,
 						  x_pos + shadow_offset, y_pos + shadow_offset,
 						  NULL,
 						  font_size,
 						  text, strlen (text),
-						  shadow_color, NAUTILUS_OPACITY_FULLY_OPAQUE);	
+						  shadow_color, EEL_OPACITY_FULLY_OPAQUE);	
 	}
 	
-	nautilus_scalable_font_draw_text (font, pixbuf, x_pos, y_pos, NULL,
+	eel_scalable_font_draw_text (font, pixbuf, x_pos, y_pos, NULL,
 					  font_size,
-					  text, strlen (text), color, NAUTILUS_OPACITY_FULLY_OPAQUE);
+					  text, strlen (text), color, EEL_OPACITY_FULLY_OPAQUE);
 }
 
 /* randomize_authors randomizes the order array so different names get displayed in different positions each time */
@@ -290,7 +290,7 @@ randomize_authors (NautilusAbout *about)
 static void
 draw_author_list (NautilusAbout *about,
 		  GdkPixbuf *pixbuf,
-		  NautilusScalableFont *plain_font)
+		  EelScalableFont *plain_font)
 {
 	int index, column_count;
 	int xpos, ypos;
@@ -302,7 +302,7 @@ draw_author_list (NautilusAbout *about,
 	xpos = AUTHOR_LEFT_POS; ypos = AUTHOR_TOP_POS;
 	while (about->details->authors[about->details->order_array[index]] != NULL) {
 		draw_aa_string (plain_font, pixbuf, 12, xpos, ypos,
-				NAUTILUS_RGB_COLOR_BLACK, NAUTILUS_RGB_COLOR_BLACK,
+				EEL_RGB_COLOR_BLACK, EEL_RGB_COLOR_BLACK,
 				about->details->authors[about->details->order_array[index]],
 				0);
 		ypos += AUTHOR_LINE_HEIGHT;
@@ -333,21 +333,21 @@ nautilus_about_draw_info (NautilusAbout	*about,
 {
 	char *display_str, *temp_str;
 	char **comment_array;
-	NautilusScalableFont *plain_font, *bold_font;
+	EelScalableFont *plain_font, *bold_font;
 	GdkPixbuf *pixbuf;
 	uint	black, white, grey;
 	int xpos, ypos, total_height;
 	int index;
 
-	plain_font = nautilus_scalable_font_get_default_font ();
-	bold_font  = nautilus_scalable_font_make_bold (plain_font);
+	plain_font = eel_scalable_font_get_default_font ();
+	bold_font  = eel_scalable_font_make_bold (plain_font);
 
 	pixbuf = about->details->background_pixbuf;
 	total_height = gdk_pixbuf_get_height (pixbuf);
 	
-	black = NAUTILUS_RGBA_COLOR_PACK (0, 0, 0, 255);
-	white = NAUTILUS_RGBA_COLOR_PACK (255, 255, 255, 255);
-	grey = NAUTILUS_RGBA_COLOR_PACK (153, 153, 153, 255);
+	black = EEL_RGBA_COLOR_PACK (0, 0, 0, 255);
+	white = EEL_RGBA_COLOR_PACK (255, 255, 255, 255);
+	grey = EEL_RGBA_COLOR_PACK (153, 153, 153, 255);
 	
 	/* draw the name and version */
 	display_str = g_strdup_printf ("%s %s", title, version);
@@ -364,7 +364,7 @@ nautilus_about_draw_info (NautilusAbout	*about,
 	draw_aa_string (plain_font, pixbuf, 11, 284, total_height - 14, grey, black, time_stamp, 0);
 
 	/* draw the translator's credit, if necessary */
-	if (nautilus_strcmp (translators, "Translator Credits") != 0) {
+	if (eel_strcmp (translators, "Translator Credits") != 0) {
 		comment_array = g_strsplit (translators, "\n", 10);
 		index = 0;
 		while (comment_array[index] != NULL) {
@@ -416,25 +416,25 @@ void
 nautilus_about_update_authors (NautilusAbout *about)
 {
 	ArtIRect author_area;
-	NautilusScalableFont *plain_font;
+	EelScalableFont *plain_font;
 	
 	/* clear the author area */
-	nautilus_art_irect_assign (&author_area,
+	eel_art_irect_assign (&author_area,
 				   AUTHOR_LEFT_POS - 24,
 				   AUTHOR_TOP_POS,
 				   2 * AUTHOR_COLUMN_WIDTH,
 				   AUTHOR_LINE_HEIGHT * ITEMS_PER_COLUMN);
 	
-	nautilus_gdk_pixbuf_fill_rectangle_with_color
+	eel_gdk_pixbuf_fill_rectangle_with_color
 		(about->details->background_pixbuf,
 		 &author_area,
-		 NAUTILUS_RGBA_COLOR_PACK (255, 255, 255, 255));
+		 EEL_RGBA_COLOR_PACK (255, 255, 255, 255));
 
 	/* randomize the author array */
 	randomize_authors (about);
 	
 	/* redraw the authors */
-	plain_font = nautilus_scalable_font_get_default_font ();
+	plain_font = eel_scalable_font_get_default_font ();
 	draw_author_list (about, about->details->background_pixbuf, plain_font);
 	gtk_object_unref (GTK_OBJECT(plain_font));
 	
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 39873a841..147bfb889 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -50,12 +50,12 @@
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
 #include <libnautilus-extensions/nautilus-sound.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
-#include <libnautilus-extensions/nautilus-string-list.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-string-list.h>
 #include <libnautilus-extensions/nautilus-undo-manager.h>
 #include <libnautilus-extensions/nautilus-volume-monitor.h>
 #include <libnautilus-extensions/nautilus-metafile-factory.h>
@@ -88,7 +88,7 @@ static void          volume_unmounted_callback             (NautilusVolumeMonito
 							    NautilusApplication      *application);
 static void	     init_session 			    (void);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusApplication, nautilus_application, BONOBO_OBJECT_TYPE)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusApplication, nautilus_application, BONOBO_OBJECT_TYPE)
 
 static POA_GNOME_ObjectFactory__epv factory_epv = {
 	NULL,
@@ -227,7 +227,7 @@ nautilus_application_destroy (GtkObject *object)
 	
 	bonobo_object_unref (BONOBO_OBJECT (application->undo_manager));
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static gboolean
@@ -236,7 +236,7 @@ check_required_directories (NautilusApplication *application)
 	char			*user_directory;
 	char			*user_main_directory;
 	char			*desktop_directory;
-	NautilusStringList	*dir_list;
+	EelStringList	*dir_list;
 	char 			*dir_list_concatenated;
 	char 			*error_string;
 	char 			*dialog_title;
@@ -249,27 +249,27 @@ check_required_directories (NautilusApplication *application)
 	user_main_directory = nautilus_get_user_main_directory ();
 	desktop_directory = nautilus_get_desktop_directory ();
 
-	dir_list = nautilus_string_list_new (TRUE);
+	dir_list = eel_string_list_new (TRUE);
 	
 	if (!g_file_test (user_directory, G_FILE_TEST_ISDIR)) {
-		nautilus_string_list_insert (dir_list, user_directory);
+		eel_string_list_insert (dir_list, user_directory);
 	}
 	g_free (user_directory);
 	    
 	if (!g_file_test (user_main_directory, G_FILE_TEST_ISDIR)) {
-		nautilus_string_list_insert (dir_list, user_main_directory);
+		eel_string_list_insert (dir_list, user_main_directory);
 	}
 	g_free (user_main_directory);
 	    
 	if (!g_file_test (desktop_directory, G_FILE_TEST_ISDIR)) {
-		nautilus_string_list_insert (dir_list, desktop_directory);
+		eel_string_list_insert (dir_list, desktop_directory);
 	}
 	g_free (desktop_directory);
 
-	failed_count = nautilus_string_list_get_length (dir_list);
+	failed_count = eel_string_list_get_length (dir_list);
 
 	if (failed_count != 0) {
-		dir_list_concatenated = nautilus_string_list_as_concatenated_string (dir_list, "\n");
+		dir_list_concatenated = eel_string_list_as_concatenated_string (dir_list, "\n");
 
 		if (failed_count == 1) {
 			dialog_title = g_strdup (_("Couldn't Create Required Folder"));
@@ -286,7 +286,7 @@ check_required_directories (NautilusApplication *application)
 							dir_list_concatenated);
 		}
 		
-		dialog = nautilus_show_error_dialog (error_string, dialog_title, NULL);
+		dialog = eel_show_error_dialog (error_string, dialog_title, NULL);
 		/* We need the main event loop so the user has a chance to see the dialog. */
 		nautilus_main_event_loop_register (GTK_OBJECT (dialog));
 
@@ -295,7 +295,7 @@ check_required_directories (NautilusApplication *application)
 		g_free (dialog_title);
 	}
 
-	nautilus_string_list_free (dir_list);
+	eel_string_list_free (dir_list);
 
 	return failed_count == 0;
 }
@@ -476,7 +476,7 @@ nautilus_application_startup (NautilusApplication *application,
 		}
 
 		if (message != NULL) {
-			dialog = nautilus_show_error_dialog_with_details (message, NULL, detailed_message, NULL);
+			dialog = eel_show_error_dialog_with_details (message, NULL, detailed_message, NULL);
 			/* We need the main event loop so the user has a chance to see the dialog. */
 			nautilus_main_event_loop_register (GTK_OBJECT (dialog));
 			goto out;
@@ -767,7 +767,7 @@ volume_unmounted_callback (NautilusVolumeMonitor *monitor, NautilusVolume *volum
 		if (window != NULL && window_can_be_closed (window)) {
 			uri = nautilus_window_get_location (window);
 			path = gnome_vfs_get_local_path_from_uri (uri);
-			if (nautilus_str_has_prefix (path, volume->mount_path)) {
+			if (eel_str_has_prefix (path, volume->mount_path)) {
 				close_list = g_list_prepend (close_list, window);
 			}
 			g_free (path);
diff --git a/src/nautilus-bookmark-list.c b/src/nautilus-bookmark-list.c
index d8fbf8586..a3b28c3b6 100644
--- a/src/nautilus-bookmark-list.c
+++ b/src/nautilus-bookmark-list.c
@@ -35,11 +35,11 @@
 #include <gtk/gtksignal.h>
 
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
-#include <libnautilus-extensions/nautilus-string.h>
-#include <libnautilus-extensions/nautilus-xml-extensions.h>
+#include <eel/eel-string.h>
+#include <eel/eel-xml-extensions.h>
 
 #include <gnome-xml/parser.h>
 #include <gnome-xml/tree.h>
@@ -95,7 +95,7 @@ nautilus_bookmark_list_initialize (NautilusBookmarkList *bookmarks)
 	nautilus_bookmark_list_load_file (bookmarks);
 }
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusBookmarkList, nautilus_bookmark_list, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusBookmarkList, nautilus_bookmark_list, GTK_TYPE_OBJECT)
 
 static void
 stop_monitoring_one (gpointer data, gpointer user_data)
@@ -111,7 +111,7 @@ static void
 clear (NautilusBookmarkList *bookmarks)
 {
 	g_list_foreach (bookmarks->list, stop_monitoring_one, bookmarks);
-	nautilus_gtk_object_list_free (bookmarks->list);
+	eel_gtk_object_list_free (bookmarks->list);
 	bookmarks->list = NULL;
 }
 
@@ -155,10 +155,10 @@ append_bookmark_node (gpointer data, gpointer user_data)
 	icon = nautilus_bookmark_get_icon (bookmark);
 	if (icon != NULL) {
 		/* Don't bother storing modifier or embedded text for bookmarks. */
-		nautilus_scalable_icon_get_text_pieces (icon, &icon_uri, &icon_name, NULL, NULL);
+		eel_scalable_icon_get_text_pieces (icon, &icon_uri, &icon_name, NULL, NULL);
 		xmlSetProp (bookmark_node, "icon_uri", icon_uri);
 		xmlSetProp (bookmark_node, "icon_name", icon_name);
-		nautilus_scalable_icon_unref (icon);
+		eel_scalable_icon_unref (icon);
 		g_free (icon_uri);
 		g_free (icon_name);
 	}
@@ -315,7 +315,7 @@ nautilus_bookmark_list_delete_items_with_uri (NautilusBookmarkList *bookmarks,
 		next = node->next;
 
 		bookmark_uri = nautilus_bookmark_get_uri (NAUTILUS_BOOKMARK (node->data));
-		if (nautilus_strcmp (bookmark_uri, uri) == 0) {
+		if (eel_strcmp (bookmark_uri, uri) == 0) {
 			bookmarks->list = g_list_remove_link (bookmarks->list, node);
 			stop_monitoring_bookmark (bookmarks, NAUTILUS_BOOKMARK (node->data));
 			gtk_object_unref (GTK_OBJECT (node->data));
@@ -439,7 +439,7 @@ nautilus_bookmark_list_load_file (NautilusBookmarkList *bookmarks)
 
 	/* Read new list from file */
 	doc = xmlParseFile (nautilus_bookmark_list_get_file_path (bookmarks));
-	for (node = nautilus_xml_get_root_children (doc);
+	for (node = eel_xml_get_root_children (doc);
 	     node != NULL;
 	     node = node->next) {
 
diff --git a/src/nautilus-bookmark-parsing.c b/src/nautilus-bookmark-parsing.c
index 6ba5fa19c..65092106b 100644
--- a/src/nautilus-bookmark-parsing.c
+++ b/src/nautilus-bookmark-parsing.c
@@ -30,7 +30,7 @@
 
 #include <gnome-xml/xmlmemory.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
-#include <libnautilus-extensions/nautilus-xml-extensions.h>
+#include <eel/eel-xml-extensions.h>
 
 NautilusBookmark *
 nautilus_bookmark_new_from_node (xmlNodePtr node)
@@ -43,7 +43,7 @@ nautilus_bookmark_new_from_node (xmlNodePtr node)
 	NautilusBookmark *new_bookmark;
 
 	/* Maybe should only accept bookmarks with both a name and uri? */
-	name = nautilus_xml_get_property_translated (node, "name");
+	name = eel_xml_get_property_translated (node, "name");
 	uri = xmlGetProp (node, "uri");
 	icon_uri = xmlGetProp (node, "icon_uri");
 	icon_name = xmlGetProp (node, "icon_name");
@@ -51,12 +51,12 @@ nautilus_bookmark_new_from_node (xmlNodePtr node)
 	if (icon_uri == NULL && icon_name == NULL) {
 		icon = NULL;
 	} else {
-		icon = nautilus_scalable_icon_new_from_text_pieces
+		icon = eel_scalable_icon_new_from_text_pieces
 			(icon_uri, icon_name, NULL, NULL, FALSE);
 	}
 	new_bookmark = nautilus_bookmark_new_with_icon (uri, name, icon);
 	if (icon != NULL) {
-		nautilus_scalable_icon_unref (icon);
+		eel_scalable_icon_unref (icon);
 	}
 
 	xmlFree (name);
diff --git a/src/nautilus-bookmarks-window.c b/src/nautilus-bookmarks-window.c
index 6969e7ada..8bb897c06 100644
--- a/src/nautilus-bookmarks-window.c
+++ b/src/nautilus-bookmarks-window.c
@@ -29,7 +29,7 @@
 #include "nautilus-bookmarks-window.h"
 #include <libnautilus/nautilus-undo.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
 #include <libnautilus-extensions/nautilus-undo-signal-handlers.h>
 #include <gnome.h>
@@ -188,7 +188,7 @@ create_bookmarks_window (NautilusBookmarkList *list, GtkObject *undo_manager_sou
 	gtk_box_pack_start (GTK_BOX (right_side), hbox2, FALSE, FALSE, 0);
 
 	remove_button = gtk_button_new_with_label (_("Remove"));
-	nautilus_gtk_button_set_standard_padding (GTK_BUTTON (remove_button));
+	eel_gtk_button_set_standard_padding (GTK_BUTTON (remove_button));
 	gtk_widget_show (remove_button);
 	gtk_box_pack_start (GTK_BOX (hbox2), remove_button, TRUE, FALSE, 0);
 
@@ -321,7 +321,7 @@ nautilus_bookmarks_window_restore_geometry (GtkWidget *window)
 
 	if (window_geometry != NULL) 
 	{	
-		nautilus_gtk_window_set_initial_geometry_from_string 
+		eel_gtk_window_set_initial_geometry_from_string 
 			(GTK_WINDOW (window), window_geometry, 
 			 BOOKMARKS_WINDOW_MIN_WIDTH, BOOKMARKS_WINDOW_MIN_HEIGHT);
 
@@ -647,7 +647,7 @@ handle_close_accelerator (GtkWindow *window,
 	g_assert (event != NULL);
 	g_assert (user_data == NULL);
 
-	if (nautilus_gtk_window_event_is_close_accelerator (window, event)) {		
+	if (eel_gtk_window_event_is_close_accelerator (window, event)) {		
 		save_geometry_and_hide (window);
 		gtk_signal_emit_stop_by_name 
 			(GTK_OBJECT (window), "key_press_event");
@@ -660,7 +660,7 @@ handle_close_accelerator (GtkWindow *window,
 static void
 set_up_close_accelerator (GtkWidget *window)
 {
-	/* Note that we don't call nautilus_gtk_window_set_up_close_accelerator
+	/* Note that we don't call eel_gtk_window_set_up_close_accelerator
 	 * here because we have to handle saving geometry before hiding the
 	 * window.
 	 */
diff --git a/src/nautilus-complex-search-bar.c b/src/nautilus-complex-search-bar.c
index 8d87811eb..d40d9d071 100644
--- a/src/nautilus-complex-search-bar.c
+++ b/src/nautilus-complex-search-bar.c
@@ -41,11 +41,11 @@
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus/nautilus-clipboard.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-undo-signal-handlers.h>
 #include <widgets/gimphwrapbox/gtkhwrapbox.h>
 
@@ -90,7 +90,7 @@ static void	   update_dynamic_buttons_state 	  (NautilusComplexSearchBar *bar);
 static void        update_criteria_choices                (gpointer list_item,
 							   gpointer data);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusComplexSearchBar, nautilus_complex_search_bar, NAUTILUS_TYPE_SEARCH_BAR)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusComplexSearchBar, nautilus_complex_search_bar, NAUTILUS_TYPE_SEARCH_BAR)
 
 /* called by the criterion when the user chooses
    a new criterion type */
@@ -291,7 +291,7 @@ static void
 nautilus_complex_search_bar_destroy (GtkObject *object)
 {
 	g_free (NAUTILUS_COMPLEX_SEARCH_BAR (object)->details);
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static GtkWidget *
@@ -350,7 +350,7 @@ nautilus_complex_search_bar_get_location (NautilusNavigationBar *navigation_bar)
 		criteria_text = temp_criterion;
 	}
 
-	trimmed_fragment = nautilus_str_strip_trailing_str (criteria_text, " & ");
+	trimmed_fragment = eel_str_strip_trailing_str (criteria_text, " & ");
 	g_free (criteria_text);
 
 	escaped_fragment = gnome_vfs_escape_string (trimmed_fragment);
@@ -428,7 +428,7 @@ attach_criterion_to_search_bar (NautilusComplexSearchBar *bar,
 		g_assert (GTK_IS_BUTTON (bar->details->find_them));
 		gtk_signal_connect_object (GTK_OBJECT (criterion->details->value_entry), 
 					   "activate",
-					   nautilus_gtk_button_auto_click, 
+					   eel_gtk_button_auto_click, 
 					   GTK_OBJECT (bar->details->find_them));
 	}
 	nautilus_complex_search_bar_queue_resize (bar);
@@ -457,7 +457,7 @@ load_find_them_pixmap_widget (void)
 	
 	pixbuf = gdk_pixbuf_new_from_file (NAUTILUS_PIXMAPDIR "/search.png");
 	if (pixmap != NULL) {
-		gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
+		gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, EEL_STANDARD_ALPHA_THRESHHOLD);
 		gdk_pixbuf_unref (pixbuf);
 		return gtk_pixmap_new (pixmap, mask);
 	} else {
@@ -604,9 +604,9 @@ criteria_invalid (NautilusComplexSearchBar *bar)
 			text = gtk_editable_get_chars 
 				(GTK_EDITABLE (criterion->details->value_entry),
 				0, -1);
-			text_is_empty = nautilus_str_is_empty (text);
+			text_is_empty = eel_str_is_empty (text);
 			if (criterion->details->type == NAUTILUS_SIZE_SEARCH_CRITERION) {
-				if (!nautilus_str_to_int (text, &size)) {
+				if (!eel_str_to_int (text, &size)) {
 					g_free (text);
 					return TRUE;
 				}
diff --git a/src/nautilus-component-adapter-factory.c b/src/nautilus-component-adapter-factory.c
index 0445b7dbb..7ddf9ee96 100644
--- a/src/nautilus-component-adapter-factory.c
+++ b/src/nautilus-component-adapter-factory.c
@@ -31,7 +31,7 @@
 
 #include <libnautilus-adapter/nautilus-adapter-factory.h>
 
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 
 
 
@@ -48,7 +48,7 @@ static void nautilus_component_adapter_factory_initialize       (NautilusCompone
 static void nautilus_component_adapter_factory_destroy          (GtkObject                            *object);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusComponentAdapterFactory, nautilus_component_adapter_factory, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusComponentAdapterFactory, nautilus_component_adapter_factory, GTK_TYPE_OBJECT)
 
 static void
 nautilus_component_adapter_factory_initialize_class  (NautilusComponentAdapterFactoryClass *klass)
diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c
index dbc1fc9bd..b0e498bba 100644
--- a/src/nautilus-desktop-window.c
+++ b/src/nautilus-desktop-window.c
@@ -33,8 +33,8 @@
 #include <libgnomeui/gnome-winhints.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-link.h>
 #include <X11/Xatom.h>
@@ -50,7 +50,7 @@ static void destroy                                  (GtkObject
 static void realize                                  (GtkWidget                  *widget);
 static void real_add_current_location_to_history_list (NautilusWindow		 *window);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusDesktopWindow, nautilus_desktop_window, NAUTILUS_TYPE_WINDOW)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusDesktopWindow, nautilus_desktop_window, NAUTILUS_TYPE_WINDOW)
 
 static void
 nautilus_desktop_window_initialize_class (NautilusDesktopWindowClass *klass)
@@ -153,10 +153,10 @@ destroy (GtkObject *object)
 
 	gdk_property_delete (NULL, gdk_atom_intern ("NAUTILUS_DESKTOP_WINDOW_ID", TRUE));
 
-	nautilus_gtk_object_list_free (window->details->unref_list);
+	eel_gtk_object_list_free (window->details->unref_list);
 	g_free (window->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -171,7 +171,7 @@ realize (GtkWidget *widget)
 			      | GDK_KEY_PRESS_MASK | GDK_KEY_PRESS_MASK);
 			      
 	/* Do the work of realizing. */
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
 
 	/* FIXME bugzilla.eazel.com 1253: 
 	 * Looking at the gnome_win_hints implementation,
diff --git a/src/nautilus-first-time-druid.c b/src/nautilus-first-time-druid.c
index 61c5608b4..da652a59a 100644
--- a/src/nautilus-first-time-druid.c
+++ b/src/nautilus-first-time-druid.c
@@ -31,23 +31,23 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-druid-page-eazel.h>
 #include <libnautilus-extensions/nautilus-druid.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-image.h>
+#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-link.h>
 #include <libnautilus-extensions/nautilus-medusa-support.h>
 #include <libnautilus-extensions/nautilus-preferences.h>
-#include <libnautilus-extensions/nautilus-radio-button-group.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-radio-button-group.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
+#include <eel/eel-stock-dialogs.h>
 #include <nautilus-main.h>
 #include <netdb.h>
 #include <signal.h>
@@ -58,7 +58,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#define SIZE_BODY_LABEL(l)  nautilus_label_make_smaller (NAUTILUS_LABEL (l), 1)
+#define SIZE_BODY_LABEL(l)  eel_label_make_smaller (EEL_LABEL (l), 1)
 
 #define SERVICE_UPDATE_ARCHIVE_PATH "/tmp/nautilus_update.tgz"
 #define WELCOME_PACKAGE_URI "http://services.eazel.com/downloads/eazel/updates.tgz"
@@ -273,12 +273,12 @@ static GtkWidget *
 set_up_background (NautilusDruidPageEazel *page, const char *background_color)
 {
 	GtkWidget *event_box;
-	NautilusBackground *background;
+	EelBackground *background;
 	
 	event_box = gtk_event_box_new ();
 	
-	background = nautilus_get_widget_background (event_box);
-	nautilus_background_set_color (background, background_color);
+	background = eel_get_widget_background (event_box);
+	eel_background_set_color (background, background_color);
 	
 	gtk_widget_show (event_box);
 
@@ -312,13 +312,13 @@ user_level_selection_changed (GtkWidget *radio_button, gpointer user_data)
 static void
 update_selection_changed (GtkWidget *radio_buttons, gpointer user_data)
 {
-	last_update_choice = nautilus_radio_button_group_get_active_index (NAUTILUS_RADIO_BUTTON_GROUP (radio_buttons));
+	last_update_choice = eel_radio_button_group_get_active_index (EEL_RADIO_BUTTON_GROUP (radio_buttons));
 }
 
 static void
 proxy_selection_changed (GtkWidget *radio_buttons, gpointer user_data)
 {
-	last_proxy_choice = nautilus_radio_button_group_get_active_index (NAUTILUS_RADIO_BUTTON_GROUP (radio_buttons));
+	last_proxy_choice = eel_radio_button_group_get_active_index (EEL_RADIO_BUTTON_GROUP (radio_buttons));
 }
 
 
@@ -330,9 +330,9 @@ label_new_left_justified (const char *text)
 {
 	GtkWidget *label;
 	
-	label = nautilus_label_new (text);
-	nautilus_label_set_justify (NAUTILUS_LABEL (label), GTK_JUSTIFY_LEFT);
-	nautilus_label_set_is_smooth (NAUTILUS_LABEL (label), FALSE);
+	label = eel_label_new (text);
+	eel_label_set_justify (EEL_LABEL (label), GTK_JUSTIFY_LEFT);
+	eel_label_set_is_smooth (EEL_LABEL (label), FALSE);
 
 	return label;
 }
@@ -341,11 +341,11 @@ static GtkWidget *
 new_title_label (const char *text)
 {
 	GtkWidget *label;
-	NautilusScalableFont *font;
+	EelScalableFont *font;
 
 	label = label_new_left_justified (text);
 
-	font = nautilus_scalable_font_get_default_font ();
+	font = eel_scalable_font_get_default_font ();
 
 	/* Force the label into smooth mode only if our locale is not
 	 * multibyte.  The problem is that for multibyte locales it is
@@ -354,14 +354,14 @@ new_title_label (const char *text)
 	 * multi bytes locales, we make the first time druid work in more
 	 * systems.
 	 */
-	nautilus_label_set_is_smooth (NAUTILUS_LABEL (label), 
-				      !nautilus_dumb_down_for_multi_byte_locale_hack ());
-
-	nautilus_label_set_smooth_font (NAUTILUS_LABEL (label), font);
-	nautilus_label_make_larger (NAUTILUS_LABEL (label), 10);
-	nautilus_label_set_smooth_drop_shadow_offset (NAUTILUS_LABEL (label), 2);
-	nautilus_label_set_smooth_drop_shadow_color (NAUTILUS_LABEL (label),
-						     NAUTILUS_RGBA_COLOR_PACK
+	eel_label_set_is_smooth (EEL_LABEL (label), 
+				      !eel_dumb_down_for_multi_byte_locale_hack ());
+
+	eel_label_set_smooth_font (EEL_LABEL (label), font);
+	eel_label_make_larger (EEL_LABEL (label), 10);
+	eel_label_set_smooth_drop_shadow_offset (EEL_LABEL (label), 2);
+	eel_label_set_smooth_drop_shadow_color (EEL_LABEL (label),
+						     EEL_RGBA_COLOR_PACK
 						     (191, 191, 191, 255));
 	return label;
 }
@@ -429,13 +429,13 @@ make_hbox_user_level_radio_button (int index, GtkWidget *radio_buttons[],
 	label_box = gtk_hbox_new (FALSE, 5);
 
 	icon_pixbuf = create_named_pixbuf (icon_name);
-	icon = nautilus_image_new (NULL);
+	icon = eel_image_new (NULL);
 	if (icon_pixbuf != NULL) {
-		nautilus_image_set_pixbuf (NAUTILUS_IMAGE (icon), icon_pixbuf);
+		eel_image_set_pixbuf (EEL_IMAGE (icon), icon_pixbuf);
 	}
 	gtk_box_pack_start (GTK_BOX (label_box), icon, FALSE, FALSE, 0);
 	label = new_body_label (user_level_name);
-	nautilus_gtk_label_make_bold (GTK_LABEL (label));
+	eel_gtk_label_make_bold (GTK_LABEL (label));
 	g_free (user_level_name);
 
 	/* extra vbox to help with alignment */
@@ -556,11 +556,11 @@ set_up_update_page (NautilusDruidPageEazel *page)
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 	
-	radio_buttons = nautilus_radio_button_group_new (FALSE);
+	radio_buttons = eel_radio_button_group_new (FALSE);
 	gtk_box_pack_start (GTK_BOX (main_box), radio_buttons, FALSE, FALSE, 0);
 
-	nautilus_radio_button_group_insert (NAUTILUS_RADIO_BUTTON_GROUP (radio_buttons), _("Verify my connection and check for updates"));
-	nautilus_radio_button_group_insert (NAUTILUS_RADIO_BUTTON_GROUP (radio_buttons), _("Don't verify my connection or check for updates"));	
+	eel_radio_button_group_insert (EEL_RADIO_BUTTON_GROUP (radio_buttons), _("Verify my connection and check for updates"));
+	eel_radio_button_group_insert (EEL_RADIO_BUTTON_GROUP (radio_buttons), _("Don't verify my connection or check for updates"));	
 
 	gtk_signal_connect (GTK_OBJECT (radio_buttons),
 			    "changed",
@@ -635,12 +635,12 @@ set_up_proxy_config_page (NautilusDruidPageEazel *page)
 	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (vbox);
 
-	radio_buttons = nautilus_radio_button_group_new (FALSE);
+	radio_buttons = eel_radio_button_group_new (FALSE);
 
-	nautilus_radio_button_group_insert (NAUTILUS_RADIO_BUTTON_GROUP (radio_buttons), _("No proxy server required."));
-	nautilus_radio_button_group_insert (NAUTILUS_RADIO_BUTTON_GROUP (radio_buttons), _("Use this proxy server:"));	
+	eel_radio_button_group_insert (EEL_RADIO_BUTTON_GROUP (radio_buttons), _("No proxy server required."));
+	eel_radio_button_group_insert (EEL_RADIO_BUTTON_GROUP (radio_buttons), _("Use this proxy server:"));	
 	
-	nautilus_radio_button_group_set_active_index (NAUTILUS_RADIO_BUTTON_GROUP (radio_buttons), 1);
+	eel_radio_button_group_set_active_index (EEL_RADIO_BUTTON_GROUP (radio_buttons), 1);
 
 	gtk_signal_connect (GTK_OBJECT (radio_buttons),
 			    "changed",
@@ -663,7 +663,7 @@ set_up_proxy_config_page (NautilusDruidPageEazel *page)
 	gtk_box_pack_start (GTK_BOX (hbox), alignment, FALSE, FALSE, 0);
 	
 	/* allocate the proxy label, followed by the entry */
-	label = nautilus_label_new (_("Proxy address:"));
+	label = eel_label_new (_("Proxy address:"));
 	gtk_widget_show (label);
 	SIZE_BODY_LABEL (label);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 2);
@@ -680,7 +680,7 @@ set_up_proxy_config_page (NautilusDruidPageEazel *page)
 	gtk_widget_set_usize (alignment, 8, -1);
 	
 	/* allocate the proxy label, followed by the entry */
-	label = nautilus_label_new (_("Port:"));
+	label = eel_label_new (_("Port:"));
 	SIZE_BODY_LABEL (label);
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 2);
@@ -796,7 +796,7 @@ next_proxy_configuration_page_callback (GtkWidget *button, GnomeDruid *druid)
 	port_text = gtk_entry_get_text (GTK_ENTRY (port_number_entry));
 
 	/* Update the http proxy only if there is some user input */
-	if (nautilus_strlen (proxy_text) > 0 && nautilus_strlen (port_text) > 0) {
+	if (eel_strlen (proxy_text) > 0 && eel_strlen (port_text) > 0) {
 		proxy_url = g_strdup_printf ("http://%s:%s", proxy_text, port_text);
 		set_http_proxy (proxy_url);
 		g_free (proxy_url);
@@ -1100,11 +1100,11 @@ make_title_page_icon_box (void)
 	for (i = 0; i < 4; i++) {
 		filename = nautilus_pixmap_file (names[i]);
 		if (filename != NULL) {
-			image = nautilus_image_new (filename);
+			image = eel_image_new (filename);
 			g_free (filename);
 			if (image != NULL) {
-				nautilus_image_set_is_smooth (NAUTILUS_IMAGE (image), TRUE);
-				nautilus_image_set_pixbuf_opacity (NAUTILUS_IMAGE (image), 128);
+				eel_image_set_is_smooth (EEL_IMAGE (image), TRUE);
+				eel_image_set_pixbuf_opacity (EEL_IMAGE (image), 128);
 				gtk_box_pack_start (GTK_BOX (hbox), image, TRUE, TRUE, 0);
 			}
 		}
@@ -1466,7 +1466,7 @@ set_http_proxy (const char *proxy_url)
 	}
 
 	/* set the "http_proxy" environment variable */
-	nautilus_setenv ("http_proxy", proxy_url, TRUE);
+	eel_setenv ("http_proxy", proxy_url, TRUE);
 
 	/* The variable is expected to be in the form host:port */
 	if (0 != strncmp (proxy_url, "http://", strlen ("http://"))) {
diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c
index 01250208b..0b9b0fea9 100644
--- a/src/nautilus-information-panel.c
+++ b/src/nautilus-information-panel.c
@@ -46,24 +46,24 @@
 #include <libgnomevfs/gnome-vfs-types.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-directory.h>
 #include <libnautilus-extensions/nautilus-drag.h>
 #include <libnautilus-extensions/nautilus-file.h>
 #include <libnautilus-extensions/nautilus-file-operations.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-keep-last-vertical-box.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-mime-actions.h>
 #include <libnautilus-extensions/nautilus-preferences.h>
 #include <libnautilus-extensions/nautilus-program-choosing.h>
 #include <libnautilus-extensions/nautilus-sidebar-functions.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-theme.h>
 #include <libnautilus-extensions/nautilus-trash-monitor.h>
 #include <math.h>
@@ -160,7 +160,7 @@ typedef enum {
 } SidebarPart;
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSidebar, nautilus_sidebar, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusSidebar, nautilus_sidebar, GTK_TYPE_EVENT_BOX)
 
 /* initializing the class object by installing the operations we override */
 static void
@@ -280,7 +280,7 @@ nautilus_sidebar_initialize (GtkObject *object)
 	/* prepare ourselves to receive dropped objects */
 	gtk_drag_dest_set (GTK_WIDGET (sidebar),
 			   GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, 
-			   target_table, NAUTILUS_N_ELEMENTS (target_table),
+			   target_table, EEL_N_ELEMENTS (target_table),
 			   GDK_ACTION_COPY | GDK_ACTION_MOVE);
 }
 
@@ -311,18 +311,18 @@ nautilus_sidebar_destroy (GtkObject *object)
 					      sidebar);
 
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* callback to handle resetting the background */
 static void
 reset_background_callback (GtkWidget *menu_item, GtkWidget *sidebar)
 {
-	NautilusBackground *background;
+	EelBackground *background;
 
-	background = nautilus_get_widget_background(sidebar);
+	background = eel_get_widget_background(sidebar);
 	if (background != NULL) { 
-		nautilus_background_reset (background); 
+		eel_background_reset (background); 
 	}
 }
 
@@ -357,7 +357,7 @@ nautilus_sidebar_active_panel_matches_id_or_is_damaged (NautilusSidebar *sidebar
 	if (current_iid == NULL) {
 		return TRUE;
 	}
-	return nautilus_strcmp (current_iid, id) == 0;	
+	return eel_strcmp (current_iid, id) == 0;	
 }
 
 /* if the active panel matches the passed in id, hide it. */
@@ -513,10 +513,10 @@ GtkWidget *
 nautilus_sidebar_create_context_menu (NautilusSidebar *sidebar)
 {
 	GtkWidget *menu, *menu_item;
-	NautilusBackground *background;
+	EelBackground *background;
 	gboolean has_background;
 
-	background = nautilus_get_widget_background (GTK_WIDGET(sidebar));
+	background = eel_get_widget_background (GTK_WIDGET(sidebar));
 	has_background = background && !nautilus_sidebar_background_is_default (sidebar);
 	
 	menu = gtk_menu_new ();
@@ -550,9 +550,9 @@ static char*
 map_local_data_file (char *file_name)
 {
 	char *temp_str;
-	if (file_name && !nautilus_istr_has_prefix (file_name, "file://")) {
+	if (file_name && !eel_istr_has_prefix (file_name, "file://")) {
 
-		if (nautilus_str_has_prefix (file_name, "./")) {
+		if (eel_str_has_prefix (file_name, "./")) {
 			temp_str = nautilus_theme_get_image_path (file_name + 2);
 		} else {
 			temp_str = g_strdup_printf ("%s/%s", NAUTILUS_DATADIR, file_name);
@@ -613,11 +613,11 @@ static SidebarPart
 hit_test (NautilusSidebar *sidebar,
 	  int x, int y)
 {
-	if (nautilus_point_in_widget (GTK_WIDGET (sidebar->details->sidebar_tabs), x, y)) {
+	if (eel_point_in_widget (GTK_WIDGET (sidebar->details->sidebar_tabs), x, y)) {
 		return TABS_PART;
 	}
 	
-	if (nautilus_point_in_widget (GTK_WIDGET (sidebar->details->title_tab), x, y)) {
+	if (eel_point_in_widget (GTK_WIDGET (sidebar->details->title_tab), x, y)) {
 		return TITLE_TAB_PART;
 	}
 	
@@ -625,7 +625,7 @@ hit_test (NautilusSidebar *sidebar,
 		return ICON_PART;
 	}
 	
-	if (nautilus_point_in_widget (GTK_WIDGET (sidebar), x, y)) {
+	if (eel_point_in_widget (GTK_WIDGET (sidebar), x, y)) {
 		return BACKGROUND_PART;
 	}
 
@@ -674,8 +674,8 @@ receive_dropped_uri_list (NautilusSidebar *sidebar,
 		 * Other views handle background images differently from other URIs.
 		 */
 		if (exactly_one && uri_is_local_image (uris[0])) {
-			nautilus_background_receive_dropped_background_image
-				(nautilus_get_widget_background (GTK_WIDGET (sidebar)),
+			eel_background_receive_dropped_background_image
+				(eel_get_widget_background (GTK_WIDGET (sidebar)),
 				 uris[0]);
 		} else if (exactly_one) {
 			gtk_signal_emit (GTK_OBJECT (sidebar),
@@ -690,7 +690,7 @@ receive_dropped_uri_list (NautilusSidebar *sidebar,
 		/* handle images dropped on the logo specially */
 		
 		if (!exactly_one) {
-			nautilus_show_error_dialog (
+			eel_show_error_dialog (
 				_("You can't assign more than one custom icon at a time! "
 				  "Please drag just one image to set a custom icon."), 
 				_("More Than One Image"),
@@ -711,14 +711,14 @@ receive_dropped_uri_list (NautilusSidebar *sidebar,
 			}
 		} else {	
 			if (nautilus_is_remote_uri (uris[0])) {
-				nautilus_show_error_dialog (
+				eel_show_error_dialog (
 					_("The file that you dropped is not local.  "
 					  "You can only use local images as custom icons."), 
 					_("Local Images Only"),
 					window);
 			
 			} else {
-				nautilus_show_error_dialog (
+				eel_show_error_dialog (
 					_("The file that you dropped is not an image.  "
 					  "You can only use local images as custom icons."),
 					_("Images Only"),
@@ -798,8 +798,8 @@ receive_dropped_color (NautilusSidebar *sidebar,
 	case ICON_PART:
 	case BACKGROUND_PART:
 		/* Let the background change based on the dropped color. */
-		nautilus_background_receive_dropped_color
-			(nautilus_get_widget_background (GTK_WIDGET (sidebar)),
+		eel_background_receive_dropped_color
+			(eel_get_widget_background (GTK_WIDGET (sidebar)),
 			 GTK_WIDGET (sidebar), x, y, selection_data);
 		break;
 	}
@@ -1044,9 +1044,9 @@ nautilus_sidebar_press_event (GtkWidget *widget, GdkEventButton *event)
 	/* handle the context menu */
 	if (event->button == CONTEXTUAL_MENU_BUTTON) {
 		menu = nautilus_sidebar_create_context_menu (sidebar);	
-		nautilus_pop_up_context_menu (GTK_MENU(menu),
-				      NAUTILUS_DEFAULT_POPUP_MENU_DISPLACEMENT,
-				      NAUTILUS_DEFAULT_POPUP_MENU_DISPLACEMENT,
+		eel_pop_up_context_menu (GTK_MENU(menu),
+				      EEL_DEFAULT_POPUP_MENU_DISPLACEMENT,
+				      EEL_DEFAULT_POPUP_MENU_DISPLACEMENT,
 				      event);
 	}	
 	return TRUE;
@@ -1105,12 +1105,12 @@ nautilus_sidebar_release_event (GtkWidget *widget, GdkEventButton *event)
 /* Handle the background changed signal by writing out the settings to metadata.
  */
 static void
-background_settings_changed_callback (NautilusBackground *background, NautilusSidebar *sidebar)
+background_settings_changed_callback (EelBackground *background, NautilusSidebar *sidebar)
 {
 	char *image;
 	char *color;
 
-	g_assert (NAUTILUS_IS_BACKGROUND (background));
+	g_assert (EEL_IS_BACKGROUND (background));
 	g_assert (NAUTILUS_IS_SIDEBAR (sidebar));
 
 	if (sidebar->details->file == NULL) {
@@ -1123,8 +1123,8 @@ background_settings_changed_callback (NautilusBackground *background, NautilusSi
 					  background_metadata_changed_callback,
 					  sidebar);
 
-	color = nautilus_background_get_color (background);
-	image = nautilus_background_get_image_uri (background);
+	color = eel_background_get_color (background);
+	image = eel_background_get_image_uri (background);
 	
 	nautilus_file_set_metadata (sidebar->details->file,
 				    NAUTILUS_METADATA_KEY_SIDEBAR_BACKGROUND_COLOR,
@@ -1147,9 +1147,9 @@ background_settings_changed_callback (NautilusBackground *background, NautilusSi
 /* handle the background reset signal by writing out NULL to metadata and setting the backgrounds
    fields to their default values */
 static void
-background_reset_callback (NautilusBackground *background, NautilusSidebar *sidebar)
+background_reset_callback (EelBackground *background, NautilusSidebar *sidebar)
 {
-	g_assert (NAUTILUS_IS_BACKGROUND (background));
+	g_assert (EEL_IS_BACKGROUND (background));
 	g_assert (NAUTILUS_IS_SIDEBAR (sidebar));
 
 	if (sidebar->details->file == NULL) {
@@ -1299,12 +1299,12 @@ add_command_buttons (NautilusSidebar *sidebar, GList *application_list)
 			file_path = g_strdup (sidebar->details->uri);
 		} 
 
-		temp_str = nautilus_shell_quote (file_path);		
+		temp_str = eel_shell_quote (file_path);		
 		id_string = g_strdup_printf (application->id, temp_str); 		
 		g_free (file_path);
 		g_free (temp_str);
 
-		nautilus_gtk_signal_connect_free_data 
+		eel_gtk_signal_connect_free_data 
 			(GTK_OBJECT (temp_button), "clicked",
 			 GTK_SIGNAL_FUNC (command_button_callback), id_string);
 
@@ -1358,7 +1358,7 @@ add_buttons_from_metadata (NautilusSidebar *sidebar, const char *button_data)
 					command_string = g_strdup (temp_str + 1);
 					g_free (button_name);
 					
-					nautilus_gtk_signal_connect_free_data 
+					eel_gtk_signal_connect_free_data 
 						(GTK_OBJECT (temp_button), "clicked",
 						 GTK_SIGNAL_FUNC (metadata_button_callback), command_string);
 		                	gtk_object_set_user_data (GTK_OBJECT (temp_button), sidebar);
@@ -1419,7 +1419,7 @@ nautilus_sidebar_update_buttons (NautilusSidebar *sidebar)
 
 	/* here is a hack to provide an "empty trash" button when displaying the trash.  Eventually, we
 	 * need a framework to allow protocols to add commands buttons */
-	if (nautilus_istr_has_prefix (sidebar->details->uri, "trash:")) {
+	if (eel_istr_has_prefix (sidebar->details->uri, "trash:")) {
 		/* FIXME: We don't use spaces to pad labels! */
 		temp_button = gtk_button_new_with_label (_("  Empty Trash  "));		    
 		gtk_box_pack_start (GTK_BOX (sidebar->details->button_box), 
@@ -1462,7 +1462,7 @@ nautilus_sidebar_update_buttons (NautilusSidebar *sidebar)
 static void
 nautilus_sidebar_update_appearance (NautilusSidebar *sidebar)
 {
-	NautilusBackground *background;
+	EelBackground *background;
 	char *color_spec;
 	char *background_color;
 	char *background_image;
@@ -1470,7 +1470,7 @@ nautilus_sidebar_update_appearance (NautilusSidebar *sidebar)
 	g_return_if_fail (NAUTILUS_IS_SIDEBAR (sidebar));
 	
 	/* Connect the background changed signal to code that writes the color. */
-	background = nautilus_get_widget_background (GTK_WIDGET (sidebar));
+	background = eel_get_widget_background (GTK_WIDGET (sidebar));
 	if (!sidebar->details->background_connected) {
 		sidebar->details->background_connected = TRUE;
 		gtk_signal_connect (GTK_OBJECT (background),
@@ -1502,8 +1502,8 @@ nautilus_sidebar_update_appearance (NautilusSidebar *sidebar)
 					  background_settings_changed_callback,
 					  sidebar);
 
-	nautilus_background_set_image_uri (background, background_image);
-	nautilus_background_set_color (background, background_color);
+	eel_background_set_image_uri (background, background_image);
+	eel_background_set_color (background, background_color);
 
 	g_free (background_color);
 	g_free (background_image);
@@ -1559,7 +1559,7 @@ nautilus_sidebar_set_uri (NautilusSidebar *sidebar,
 	g_return_if_fail (initial_title != NULL);
 
 	/* there's nothing to do if the uri is the same as the current one */ 
-	if (nautilus_strcmp (sidebar->details->uri, new_uri) == 0) {
+	if (eel_strcmp (sidebar->details->uri, new_uri) == 0) {
 		return;
 	}
 	
@@ -1614,7 +1614,7 @@ nautilus_sidebar_size_allocate (GtkWidget *widget,
 {
 	NautilusSidebar *sidebar = NAUTILUS_SIDEBAR(widget);
 	
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
 	
 	/* remember the size if it changed */
 	
@@ -1631,7 +1631,7 @@ nautilus_sidebar_realize (GtkWidget *widget)
 	g_return_if_fail (NAUTILUS_IS_SIDEBAR (widget));
 	
 	/* Superclass does the actual realize */
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
 	
 	/* Tell X not to erase the window contents when resizing */
 	gdk_window_set_static_gravities (widget->window, TRUE);
diff --git a/src/nautilus-link-set-window.c b/src/nautilus-link-set-window.c
index 450f5e1d6..50679e107 100644
--- a/src/nautilus-link-set-window.c
+++ b/src/nautilus-link-set-window.c
@@ -43,14 +43,14 @@
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
 #include <libnautilus-extensions/nautilus-link-set.h>
 #include <libnautilus-extensions/nautilus-link.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-preferences.h>
-#include <libnautilus-extensions/nautilus-string.h>
-#include <libnautilus-extensions/nautilus-xml-extensions.h>
+#include <eel/eel-string.h>
+#include <eel/eel-xml-extensions.h>
 #include <stdlib.h>
 
 /* global to hold the currently allocated link set window, if any */
@@ -228,7 +228,7 @@ nautilus_link_set_configure_window (const char *directory_path, GtkWindow *windo
 						index++, temp_str, window_to_update);	
 	}
 		
-	nautilus_g_list_free_deep (link_set_names);
+	eel_g_list_free_deep (link_set_names);
 
 	/* show the window */
 	gtk_window_set_position(window, GTK_WIN_POS_CENTER);
diff --git a/src/nautilus-location-bar.c b/src/nautilus-location-bar.c
index 9bfb038a7..f95ac00ea 100644
--- a/src/nautilus-location-bar.c
+++ b/src/nautilus-location-bar.c
@@ -48,10 +48,10 @@
 #include <libnautilus/nautilus-clipboard.h>
 #include <libnautilus-extensions/nautilus-entry.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -103,7 +103,7 @@ static void  nautilus_location_bar_initialize_class (NautilusLocationBarClass *c
 static void  nautilus_location_bar_initialize       (NautilusLocationBar      *bar);
 static void  nautilus_location_bar_update_label     (NautilusLocationBar      *bar);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusLocationBar,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusLocationBar,
 				   nautilus_location_bar,
 				   NAUTILUS_TYPE_NAVIGATION_BAR)
 
@@ -153,7 +153,7 @@ drag_data_received_callback (GtkWidget *widget,
 		prompt = g_strdup_printf (_("Do you want to view these %d locations "
 					  "in separate windows?"), 
 					  name_count);
-		new_windows_for_extras = nautilus_run_simple_dialog 
+		new_windows_for_extras = eel_run_simple_dialog 
 			(GTK_WIDGET (nautilus_location_bar_get_window (widget)),
 			 TRUE,
 			 prompt,
@@ -210,7 +210,7 @@ drag_data_get_callback (GtkWidget *widget,
 		gtk_selection_data_set (selection_data,
 					selection_data->target,
 					8, (guchar *) entry_text,
-					nautilus_strlen (entry_text));
+					eel_strlen (entry_text));
 		break;
 	default:
 		g_assert_not_reached ();
@@ -249,7 +249,7 @@ accumulate_name(char *full_name, char *candidate_name)
 		result_name = g_strdup (candidate_name);
 	else {
 		result_name = full_name;
-		if (!nautilus_str_has_prefix (full_name, candidate_name)) {
+		if (!eel_str_has_prefix (full_name, candidate_name)) {
 			str1 = full_name;
 			str2 = candidate_name;
 			while ((*str1++ == *str2++)) { }
@@ -265,7 +265,7 @@ static void
 get_file_info_list (NautilusLocationBar *bar, const char* dir_name)
 {
 	GnomeVFSResult result;
-	if (nautilus_strcmp (bar->details->current_directory, dir_name) != 0) {
+	if (eel_strcmp (bar->details->current_directory, dir_name) != 0) {
 		g_free (bar->details->current_directory);
 		if (bar->details->file_info_list) {
 			gnome_vfs_file_info_list_free (bar->details->file_info_list);	
@@ -316,14 +316,14 @@ try_to_expand_path (gpointer callback_data)
 	bar->details->idle_id = 0;
 	
 	/* if it's just '~' or '~/', don't expand because slash shouldn't be appended */
-	if (nautilus_strcmp (user_location, "~") == 0
-	    || nautilus_strcmp (user_location, "~/") == 0) {
+	if (eel_strcmp (user_location, "~") == 0
+	    || eel_strcmp (user_location, "~/") == 0) {
 		g_free (user_location);
 		return FALSE;
 	}
 	current_path = nautilus_make_uri_from_input (user_location);
 
-	if (!nautilus_istr_has_prefix (current_path, "file://")) {
+	if (!eel_istr_has_prefix (current_path, "file://")) {
 		g_free (user_location);
 		g_free (current_path);
 		return FALSE;
@@ -368,7 +368,7 @@ try_to_expand_path (gpointer callback_data)
 	expand_text = NULL;
 	for (element = bar->details->file_info_list; element != NULL; element = element->next) {
 		current_file_info = element->data;
-		if (nautilus_str_has_prefix (current_file_info->name, base_name)) {
+		if (eel_str_has_prefix (current_file_info->name, base_name)) {
 			if (current_file_info->type == GNOME_VFS_FILE_TYPE_DIRECTORY) {
 				expand_name = g_strconcat (current_file_info->name, "/", NULL);
 			} else {
@@ -381,7 +381,7 @@ try_to_expand_path (gpointer callback_data)
 	
 	/* if we've got something, add it to the entry */	
 	if (expand_text != NULL
-	    && !nautilus_str_has_suffix (current_path, expand_text)
+	    && !eel_str_has_suffix (current_path, expand_text)
 	    && base_length < strlen (expand_text)) {
 		gtk_entry_append_text (GTK_ENTRY (editable), expand_text + base_length);
 		gtk_entry_select_region (GTK_ENTRY (editable),
@@ -595,7 +595,7 @@ destroy (GtkObject *object)
 	g_free (bar->details->last_location);
 	g_free (bar->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -662,7 +662,7 @@ nautilus_location_bar_initialize (NautilusLocationBar *bar)
 	/* Drag source */
 	gtk_drag_source_set (GTK_WIDGET (event_box), 
 			     GDK_BUTTON1_MASK | GDK_BUTTON3_MASK,
-			     drag_types, NAUTILUS_N_ELEMENTS (drag_types),
+			     drag_types, EEL_N_ELEMENTS (drag_types),
 			     GDK_ACTION_LINK);
 	gtk_signal_connect  (GTK_OBJECT (event_box), "drag_data_get",
 			     GTK_SIGNAL_FUNC (drag_data_get_callback),
@@ -671,7 +671,7 @@ nautilus_location_bar_initialize (NautilusLocationBar *bar)
 	/* Drag dest. */
 	gtk_drag_dest_set  (GTK_WIDGET (bar),
 			    GTK_DEST_DEFAULT_ALL,
-			    drop_types, NAUTILUS_N_ELEMENTS (drop_types),
+			    drop_types, EEL_N_ELEMENTS (drop_types),
 			    GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
 	gtk_signal_connect (GTK_OBJECT (bar), "drag_data_received",
 			    GTK_SIGNAL_FUNC (drag_data_received_callback),
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index 3df499c6b..463059a22 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -42,11 +42,12 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-init.h>
 #include <libgnomevfs/gnome-vfs-init.h>
-#include <libnautilus-extensions/nautilus-debug.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-global-preferences.h>
+#include <eel/eel-debug.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-lib-self-check-functions.h>
-#include <libnautilus-extensions/nautilus-self-checks.h>
+#include <libnautilus-extensions/nautilus-global-preferences.h>
+#include <eel/eel-lib-self-check-functions.h>
+#include <eel/eel-self-checks.h>
 #include <libnautilus-extensions/nautilus-directory-metafile.h>
 #include <liboaf/liboaf.h>
 #include <popt.h>
@@ -82,7 +83,7 @@ quit_if_in_main_loop (gpointer callback_data)
 }
 
 static void
-nautilus_gtk_main_quit_all (void)
+eel_gtk_main_quit_all (void)
 {
 	/* Calling gtk_main_quit directly only kills the current/top event loop.
 	 * This idler will be run by the current event loop, killing it, and then
@@ -97,7 +98,7 @@ event_loop_unregister (GtkObject* object)
 	g_assert (g_slist_find (event_loop_registrants, object) != NULL);
 	event_loop_registrants = g_slist_remove (event_loop_registrants, object);
 	if (!is_event_loop_needed ()) {
-		nautilus_gtk_main_quit_all ();
+		eel_gtk_main_quit_all ();
 	}
 }
 
@@ -159,7 +160,7 @@ main (int argc, char *argv[])
 	 * explicitly for each domain.
 	 */
 	if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
-		nautilus_make_warnings_and_criticals_stop_in_debugger
+		eel_make_warnings_and_criticals_stop_in_debugger
 			(G_LOG_DOMAIN, g_log_domain_glib,
 			 "Bonobo",
 			 "Gdk",
@@ -184,7 +185,7 @@ main (int argc, char *argv[])
 	textdomain (PACKAGE);
 #endif
 	/* Disable bug-buddy for now. */
-	nautilus_setenv ("GNOME_DISABLE_CRASH_DIALOG", "1", TRUE);
+	eel_setenv ("GNOME_DISABLE_CRASH_DIALOG", "1", TRUE);
 
 	/* Get parameters. */
 	geometry = NULL;
@@ -248,14 +249,24 @@ main (int argc, char *argv[])
 	/* Do either the self-check or the real work. */
 	if (perform_self_check) {
 #ifndef NAUTILUS_OMIT_SELF_CHECK
-		/* Run the checks for nautilus and libnautilus (each twice). */
+		/* Run the checks (each twice) for:
+		 *
+		 * nautilus
+		 * eel
+		 * libnautilus-extensions
+		 *
+		 */
 		nautilus_directory_use_self_contained_metafile_factory ();
+
 		nautilus_run_self_checks ();
+		eel_run_lib_self_checks ();
 		nautilus_run_lib_self_checks ();
-		nautilus_exit_if_self_checks_failed ();
+		eel_exit_if_self_checks_failed ();
+
 		nautilus_run_self_checks ();
+		eel_run_lib_self_checks ();
 		nautilus_run_lib_self_checks ();
-		nautilus_exit_if_self_checks_failed ();
+		eel_exit_if_self_checks_failed ();
 #endif
 	} else {
 		/* Run the nautilus application. */
@@ -281,7 +292,7 @@ main (int argc, char *argv[])
 	 */
 
 	if (g_getenv ("_NAUTILUS_RESTART") != NULL) {
-		nautilus_unsetenv ("_NAUTILUS_RESTART");
+		eel_unsetenv ("_NAUTILUS_RESTART");
 		
 		/* Might eventually want to copy all the parameters
 		 * from argv into the new exec. For now, though, that
diff --git a/src/nautilus-navigation-bar.c b/src/nautilus-navigation-bar.c
index 7c78d174f..e7302b626 100644
--- a/src/nautilus-navigation-bar.c
+++ b/src/nautilus-navigation-bar.c
@@ -34,7 +34,7 @@
 #include "nautilus-navigation-bar.h"
 
 #include <gtk/gtksignal.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 
 enum {
 	ACTIVATE,
@@ -46,10 +46,10 @@ static guint signals[LAST_SIGNAL];
 static void nautilus_navigation_bar_initialize_class (NautilusNavigationBarClass *class);
 static void nautilus_navigation_bar_initialize       (NautilusNavigationBar      *bar);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusNavigationBar, nautilus_navigation_bar, NAUTILUS_TYPE_GENEROUS_BIN)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusNavigationBar, nautilus_navigation_bar, NAUTILUS_TYPE_GENEROUS_BIN)
 
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_navigation_bar, get_location)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_navigation_bar, set_location)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_navigation_bar, get_location)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_navigation_bar, set_location)
 
 static void
 nautilus_navigation_bar_initialize_class (NautilusNavigationBarClass *klass)
@@ -80,8 +80,8 @@ nautilus_navigation_bar_initialize_class (NautilusNavigationBarClass *klass)
 
 	klass->activate = NULL;
 
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_navigation_bar, get_location);
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_navigation_bar, set_location);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_navigation_bar, get_location);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_navigation_bar, set_location);
 }
 
 static void
@@ -117,7 +117,7 @@ nautilus_navigation_bar_get_location (NautilusNavigationBar *bar)
 {
 	g_return_val_if_fail (NAUTILUS_IS_NAVIGATION_BAR (bar), NULL);
 
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_NAVIGATION_BAR_CLASS, bar,
 		 get_location, (bar));
 }
@@ -136,7 +136,7 @@ nautilus_navigation_bar_set_location (NautilusNavigationBar *bar,
 {
 	g_return_if_fail (NAUTILUS_IS_NAVIGATION_BAR (bar));
 
-	NAUTILUS_CALL_METHOD (NAUTILUS_NAVIGATION_BAR_CLASS, bar,
+	EEL_CALL_METHOD (NAUTILUS_NAVIGATION_BAR_CLASS, bar,
 			      set_location, (bar, location));
 }
 
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 67c04e17b..5fcddf519 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -48,17 +48,17 @@
 #include <libgnomevfs/gnome-vfs-file-info.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
-#include <libnautilus-extensions/nautilus-debug.h>
+#include <eel/eel-debug.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-undo-manager.h>
-#include <libnautilus-extensions/nautilus-xml-extensions.h>
+#include <eel/eel-xml-extensions.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
 
 #ifdef ENABLE_PROFILER
@@ -358,7 +358,7 @@ forget_history_if_confirmed (NautilusWindow *window)
 				     "which locations you have visited?"));
 	}
 					   
-	dialog = nautilus_show_yes_no_dialog (prompt,
+	dialog = eel_show_yes_no_dialog (prompt,
 					      _("Forget History?"),
 					      _("Forget"),
 					      GNOME_STOCK_BUTTON_CANCEL,
@@ -366,7 +366,7 @@ forget_history_if_confirmed (NautilusWindow *window)
 	g_free (prompt);					 
 
 	gtk_signal_connect
-		(GTK_OBJECT (nautilus_gnome_dialog_get_button_by_index
+		(GTK_OBJECT (eel_gnome_dialog_get_button_by_index
 			     (dialog, GNOME_OK)),
 		 "clicked",
 		 nautilus_forget_history,
@@ -634,7 +634,7 @@ help_menu_about_nautilus_callback (BonoboUIComponent *component,
 		nautilus_about_update_authors (NAUTILUS_ABOUT (about));
 	}
 	
-	nautilus_gtk_window_present (GTK_WINDOW (about));
+	eel_gtk_window_present (GTK_WINDOW (about));
 }
 
 static void
@@ -789,14 +789,14 @@ show_bogus_bookmark_window (BookmarkHolder *holder)
 		prompt = g_strdup_printf (_("The location \"%s\" does not exist. Do you "
 					    "want to remove any bookmarks with this "
 					    "location from your list?"), uri_for_display);
-		dialog = nautilus_show_yes_no_dialog (prompt,
+		dialog = eel_show_yes_no_dialog (prompt,
 						      _("Bookmark for Nonexistent Location"),
 						      _("Remove"),
 						      GNOME_STOCK_BUTTON_CANCEL,
 						      GTK_WINDOW (holder->window));
 
-		nautilus_gtk_signal_connect_free_data
-			(GTK_OBJECT (nautilus_gnome_dialog_get_button_by_index
+		eel_gtk_signal_connect_free_data
+			(GTK_OBJECT (eel_gnome_dialog_get_button_by_index
 				     (dialog, GNOME_OK)),
 			 "clicked",
 			 remove_bookmarks_for_uri,
@@ -805,7 +805,7 @@ show_bogus_bookmark_window (BookmarkHolder *holder)
 		gnome_dialog_set_default (dialog, GNOME_CANCEL);
 	} else {
 		prompt = g_strdup_printf (_("The location \"%s\" no longer exists."), uri_for_display);
-		dialog = nautilus_show_info_dialog (prompt, _("Go to Nonexistent Location"), GTK_WINDOW (holder->window));
+		dialog = eel_show_info_dialog (prompt, _("Go to Nonexistent Location"), GTK_WINDOW (holder->window));
 	}
 
 	g_free (uri);
@@ -855,8 +855,8 @@ append_bookmark_to_menu (NautilusWindow *window,
 	 * instead of a string utility. (Like maybe escaping control characters.)
 	 */
 	raw_name = nautilus_bookmark_get_name (bookmark);
-	truncated_name = nautilus_truncate_text_for_menu_item (raw_name);
-	display_name = nautilus_str_double_underscores (truncated_name);
+	truncated_name = eel_truncate_text_for_menu_item (raw_name);
+	display_name = eel_str_double_underscores (truncated_name);
 	g_free (raw_name);
 	g_free (truncated_name);
 
@@ -984,7 +984,7 @@ create_menu_item_from_node (NautilusWindow *window,
 	} else if (strcmp (node->name, "separator") == 0) {
 		append_separator (window, menu_path);
 	} else if (strcmp (node->name, "folder") == 0) {
-		xml_folder_name = nautilus_xml_get_property_translated (node, "name");
+		xml_folder_name = eel_xml_get_property_translated (node, "name");
 		nautilus_bonobo_add_submenu (window->details->shell_ui, menu_path, xml_folder_name);
 
 		/* Construct path and make sure it is escaped properly */
@@ -992,7 +992,7 @@ create_menu_item_from_node (NautilusWindow *window,
 		sub_menu_path = g_strdup_printf ("%s/%s", menu_path, escaped_name);
 		g_free (escaped_name);
 				
-		for (node = nautilus_xml_get_children (node), sub_index = 0;
+		for (node = eel_xml_get_children (node), sub_index = 0;
 		     node != NULL;
 		     node = node->next, ++sub_index) {
 			create_menu_item_from_node (window, node, sub_menu_path, sub_index);
@@ -1024,7 +1024,7 @@ append_static_bookmarks (NautilusWindow *window, const char *menu_path)
 	doc = xmlParseFile (file_path);
 	g_free (file_path);
 
-	node = nautilus_xml_get_root_children (doc);
+	node = eel_xml_get_root_children (doc);
 	index = 0;
 
 	for (index = 0; node != NULL; node = node->next, ++index) {
@@ -1093,7 +1093,7 @@ add_bookmark_for_current_location (NautilusWindow *window)
 static void
 edit_bookmarks (NautilusWindow *window)
 {
-        nautilus_gtk_window_present
+        eel_gtk_window_present
 		(get_or_create_bookmarks_window (GTK_OBJECT (window)));
 }
 
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index a565562dc..9fceb61de 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -60,19 +60,19 @@
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
 #include <libnautilus-extensions/nautilus-drag-window.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
 #include <libnautilus-extensions/nautilus-generous-bin.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-horizontal-splitter.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-mime-actions.h>
 #include <libnautilus-extensions/nautilus-program-choosing.h>
 #include <libnautilus-extensions/nautilus-sidebar-functions.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
 #include <libnautilus/nautilus-clipboard.h>
 #include <libnautilus/nautilus-undo.h>
@@ -127,7 +127,7 @@ static void nautilus_window_show                   (GtkWidget           *widget)
 static void cancel_view_as_callback                (NautilusWindow      *window);
 static void real_add_current_location_to_history_list (NautilusWindow   *window);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusWindow,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusWindow,
 				   nautilus_window,
 				   BONOBO_TYPE_WINDOW)
 
@@ -178,7 +178,7 @@ nautilus_window_initialize_class (NautilusWindowClass *klass)
                 if (pixbuf != NULL) {
                         gdk_pixbuf_render_pixmap_and_mask
 				(pixbuf, &mini_icon_pixmap, &mini_icon_mask,
-				 NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
+				 EEL_STANDARD_ALPHA_THRESHHOLD);
 			gdk_pixbuf_unref (pixbuf);
 			g_atexit (unref_mini_icon);
 		}
@@ -561,7 +561,7 @@ menu_bar_no_resize_hack (NautilusWindow *window)
 	
 	menu_bar = NULL;
 	
-	nautilus_gtk_container_foreach_deep (GTK_CONTAINER (window),
+	eel_gtk_container_foreach_deep (GTK_CONTAINER (window),
 					     menu_bar_no_resize_hack_menu_bar_finder,
 					     &menu_bar);
 
@@ -920,8 +920,8 @@ nautilus_window_destroy (GtkObject *object)
 	nautilus_view_identifier_free (window->content_view_id);
 	
 	g_free (window->details->location);
-	nautilus_g_list_free_deep (window->details->selection);
-	nautilus_g_list_free_deep (window->details->pending_selection);
+	eel_g_list_free_deep (window->details->selection);
+	eel_g_list_free_deep (window->details->pending_selection);
 
 	nautilus_window_clear_back_list (window);
 	nautilus_window_clear_forward_list (window);
@@ -961,7 +961,7 @@ nautilus_window_destroy (GtkObject *object)
 
 	g_free (window->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (GTK_OBJECT (window)));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (GTK_OBJECT (window)));
 }
 
 static void
@@ -1021,11 +1021,11 @@ nautilus_window_realize (GtkWidget *widget)
 	char *filename;
 
         /* Create our GdkWindow */
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
 
         /* Set the mini icon */
 	if (mini_icon_pixmap != NULL) {
-		nautilus_set_mini_icon (widget->window, mini_icon_pixmap, mini_icon_mask);
+		eel_set_mini_icon (widget->window, mini_icon_pixmap, mini_icon_mask);
 	}
 
 	/* Set the maxi icon */
@@ -1050,7 +1050,7 @@ nautilus_window_size_request (GtkWidget		*widget,
 	g_return_if_fail (NAUTILUS_IS_WINDOW (widget));
 	g_return_if_fail (requisition != NULL);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_request, (widget, requisition));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_request, (widget, requisition));
 
 	/* Limit the requisition to be within 90% of the available screen 
 	 * real state.
@@ -1157,7 +1157,7 @@ replace_special_current_view_in_view_as_menu (NautilusWindow *window)
 	gtk_widget_ref (menu);
 	gtk_option_menu_remove_menu (GTK_OPTION_MENU (window->view_as_option_menu));
 
-	first_menu_item = nautilus_gtk_container_get_first_child (GTK_CONTAINER (menu));
+	first_menu_item = eel_gtk_container_get_first_child (GTK_CONTAINER (menu));
 	g_assert (first_menu_item != NULL);
 
 	if (GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (first_menu_item), "current content view"))) {
@@ -1428,7 +1428,7 @@ nautilus_window_go_up (NautilusWindow *window)
 	nautilus_window_open_location_with_selection (window, parent_uri_string, selection);
 	
 	g_free (parent_uri_string);
-	nautilus_g_list_free_deep (selection);
+	eel_g_list_free_deep (selection);
 }
 
 void
@@ -1574,7 +1574,7 @@ nautilus_send_history_list_changed (void)
 static void
 free_history_list (void)
 {
-	nautilus_gtk_object_list_free (history_list);
+	eel_gtk_object_list_free (history_list);
 	history_list = NULL;
 }
 
@@ -1660,21 +1660,21 @@ nautilus_window_add_current_location_to_history_list (NautilusWindow *window)
 {
 	g_assert (NAUTILUS_IS_WINDOW (window));
 
-	NAUTILUS_CALL_METHOD (NAUTILUS_WINDOW_CLASS, window,
+	EEL_CALL_METHOD (NAUTILUS_WINDOW_CLASS, window,
 			      add_current_location_to_history_list, (window));
 }
 
 void
 nautilus_window_clear_forward_list (NautilusWindow *window)
 {
-	nautilus_gtk_object_list_free (window->forward_list);
+	eel_gtk_object_list_free (window->forward_list);
 	window->forward_list = NULL;
 }
 
 void
 nautilus_window_clear_back_list (NautilusWindow *window)
 {
-	nautilus_gtk_object_list_free (window->back_list);
+	eel_gtk_object_list_free (window->back_list);
 	window->back_list = NULL;
 }
 
@@ -1996,7 +1996,7 @@ nautilus_window_show (GtkWidget *widget)
 
 	window = NAUTILUS_WINDOW (widget);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, show, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, show, (widget));
 	
 	/* Initially show or hide views based on preferences; once the window is displayed
 	 * these can be controlled on a per-window basis from View menu items. 
diff --git a/src/nautilus-navigation-window.h b/src/nautilus-navigation-window.h
index 0d02f0e9e..f17348f47 100644
--- a/src/nautilus-navigation-window.h
+++ b/src/nautilus-navigation-window.h
@@ -30,7 +30,7 @@
 #define NAUTILUS_WINDOW_H
 
 #include <bonobo/bonobo-win.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-bookmark.h>
 #include <libnautilus-extensions/nautilus-view-identifier.h>
 #include "nautilus-applicable-views.h"
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c
index a565562dc..9fceb61de 100644
--- a/src/nautilus-object-window.c
+++ b/src/nautilus-object-window.c
@@ -60,19 +60,19 @@
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
 #include <libnautilus-extensions/nautilus-drag-window.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
 #include <libnautilus-extensions/nautilus-generous-bin.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-horizontal-splitter.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-mime-actions.h>
 #include <libnautilus-extensions/nautilus-program-choosing.h>
 #include <libnautilus-extensions/nautilus-sidebar-functions.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
 #include <libnautilus/nautilus-clipboard.h>
 #include <libnautilus/nautilus-undo.h>
@@ -127,7 +127,7 @@ static void nautilus_window_show                   (GtkWidget           *widget)
 static void cancel_view_as_callback                (NautilusWindow      *window);
 static void real_add_current_location_to_history_list (NautilusWindow   *window);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusWindow,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusWindow,
 				   nautilus_window,
 				   BONOBO_TYPE_WINDOW)
 
@@ -178,7 +178,7 @@ nautilus_window_initialize_class (NautilusWindowClass *klass)
                 if (pixbuf != NULL) {
                         gdk_pixbuf_render_pixmap_and_mask
 				(pixbuf, &mini_icon_pixmap, &mini_icon_mask,
-				 NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
+				 EEL_STANDARD_ALPHA_THRESHHOLD);
 			gdk_pixbuf_unref (pixbuf);
 			g_atexit (unref_mini_icon);
 		}
@@ -561,7 +561,7 @@ menu_bar_no_resize_hack (NautilusWindow *window)
 	
 	menu_bar = NULL;
 	
-	nautilus_gtk_container_foreach_deep (GTK_CONTAINER (window),
+	eel_gtk_container_foreach_deep (GTK_CONTAINER (window),
 					     menu_bar_no_resize_hack_menu_bar_finder,
 					     &menu_bar);
 
@@ -920,8 +920,8 @@ nautilus_window_destroy (GtkObject *object)
 	nautilus_view_identifier_free (window->content_view_id);
 	
 	g_free (window->details->location);
-	nautilus_g_list_free_deep (window->details->selection);
-	nautilus_g_list_free_deep (window->details->pending_selection);
+	eel_g_list_free_deep (window->details->selection);
+	eel_g_list_free_deep (window->details->pending_selection);
 
 	nautilus_window_clear_back_list (window);
 	nautilus_window_clear_forward_list (window);
@@ -961,7 +961,7 @@ nautilus_window_destroy (GtkObject *object)
 
 	g_free (window->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (GTK_OBJECT (window)));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (GTK_OBJECT (window)));
 }
 
 static void
@@ -1021,11 +1021,11 @@ nautilus_window_realize (GtkWidget *widget)
 	char *filename;
 
         /* Create our GdkWindow */
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
 
         /* Set the mini icon */
 	if (mini_icon_pixmap != NULL) {
-		nautilus_set_mini_icon (widget->window, mini_icon_pixmap, mini_icon_mask);
+		eel_set_mini_icon (widget->window, mini_icon_pixmap, mini_icon_mask);
 	}
 
 	/* Set the maxi icon */
@@ -1050,7 +1050,7 @@ nautilus_window_size_request (GtkWidget		*widget,
 	g_return_if_fail (NAUTILUS_IS_WINDOW (widget));
 	g_return_if_fail (requisition != NULL);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_request, (widget, requisition));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_request, (widget, requisition));
 
 	/* Limit the requisition to be within 90% of the available screen 
 	 * real state.
@@ -1157,7 +1157,7 @@ replace_special_current_view_in_view_as_menu (NautilusWindow *window)
 	gtk_widget_ref (menu);
 	gtk_option_menu_remove_menu (GTK_OPTION_MENU (window->view_as_option_menu));
 
-	first_menu_item = nautilus_gtk_container_get_first_child (GTK_CONTAINER (menu));
+	first_menu_item = eel_gtk_container_get_first_child (GTK_CONTAINER (menu));
 	g_assert (first_menu_item != NULL);
 
 	if (GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (first_menu_item), "current content view"))) {
@@ -1428,7 +1428,7 @@ nautilus_window_go_up (NautilusWindow *window)
 	nautilus_window_open_location_with_selection (window, parent_uri_string, selection);
 	
 	g_free (parent_uri_string);
-	nautilus_g_list_free_deep (selection);
+	eel_g_list_free_deep (selection);
 }
 
 void
@@ -1574,7 +1574,7 @@ nautilus_send_history_list_changed (void)
 static void
 free_history_list (void)
 {
-	nautilus_gtk_object_list_free (history_list);
+	eel_gtk_object_list_free (history_list);
 	history_list = NULL;
 }
 
@@ -1660,21 +1660,21 @@ nautilus_window_add_current_location_to_history_list (NautilusWindow *window)
 {
 	g_assert (NAUTILUS_IS_WINDOW (window));
 
-	NAUTILUS_CALL_METHOD (NAUTILUS_WINDOW_CLASS, window,
+	EEL_CALL_METHOD (NAUTILUS_WINDOW_CLASS, window,
 			      add_current_location_to_history_list, (window));
 }
 
 void
 nautilus_window_clear_forward_list (NautilusWindow *window)
 {
-	nautilus_gtk_object_list_free (window->forward_list);
+	eel_gtk_object_list_free (window->forward_list);
 	window->forward_list = NULL;
 }
 
 void
 nautilus_window_clear_back_list (NautilusWindow *window)
 {
-	nautilus_gtk_object_list_free (window->back_list);
+	eel_gtk_object_list_free (window->back_list);
 	window->back_list = NULL;
 }
 
@@ -1996,7 +1996,7 @@ nautilus_window_show (GtkWidget *widget)
 
 	window = NAUTILUS_WINDOW (widget);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, show, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, show, (widget));
 	
 	/* Initially show or hide views based on preferences; once the window is displayed
 	 * these can be controlled on a per-window basis from View menu items. 
diff --git a/src/nautilus-object-window.h b/src/nautilus-object-window.h
index 0d02f0e9e..f17348f47 100644
--- a/src/nautilus-object-window.h
+++ b/src/nautilus-object-window.h
@@ -30,7 +30,7 @@
 #define NAUTILUS_WINDOW_H
 
 #include <bonobo/bonobo-win.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-bookmark.h>
 #include <libnautilus-extensions/nautilus-view-identifier.h>
 #include "nautilus-applicable-views.h"
diff --git a/src/nautilus-profiler.c b/src/nautilus-profiler.c
index 163d15253..b8fed6e67 100644
--- a/src/nautilus-profiler.c
+++ b/src/nautilus-profiler.c
@@ -45,7 +45,7 @@
 #include <gtk/gtkvscrollbar.h>
 
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 
 /* These are defined in eazel-tools/profiler/profiler.C */
 extern void profile_on (void);
@@ -182,7 +182,7 @@ dump_dialog_new (const char *title)
 	dump_dialog = g_new (DumpDialog, 1);
 	
 	dump_dialog->window = gtk_window_new (GTK_WINDOW_DIALOG);
-	nautilus_gtk_window_set_up_close_accelerator 
+	eel_gtk_window_set_up_close_accelerator 
 		(GTK_WINDOW (dump_dialog->window));
 	gtk_signal_connect (GTK_OBJECT (dump_dialog->window),
 			    "delete_event", 
diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c
index 9c8426fd6..83da7a345 100644
--- a/src/nautilus-property-browser.c
+++ b/src/nautilus-property-browser.c
@@ -57,30 +57,30 @@
 #include <libgnomeui/gnome-stock.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomevfs/gnome-vfs.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-customization-data.h>
 #include <libnautilus-extensions/nautilus-directory.h>
 #include <libnautilus-extensions/nautilus-drag-window.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-file.h>
 #include <libnautilus-extensions/nautilus-font-factory.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-image.h>
+#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-theme.h>
-#include <libnautilus-extensions/nautilus-xml-extensions.h>
-#include <libnautilus-extensions/nautilus-labeled-image.h>
-#include <libnautilus-extensions/nautilus-image-table.h>
-#include <libnautilus-extensions/nautilus-viewport.h>
+#include <eel/eel-xml-extensions.h>
+#include <eel/eel-labeled-image.h>
+#include <eel/eel-image-table.h>
+#include <eel/eel-viewport.h>
 #include <math.h>
 
 /* property types */
@@ -180,7 +180,7 @@ static void     emit_emblems_changed_signal                     (void);
 static char *   strip_extension                                 (const char                    *string_to_strip);
 static void     element_clicked_callback                        (GtkWidget                     *image_table,
 								 GtkWidget                     *child,
-								 const NautilusImageTableEvent *event,
+								 const EelImageTableEvent *event,
 								 gpointer                       callback_data);
 
 
@@ -215,7 +215,7 @@ static GtkTargetEntry drag_types[] = {
 
 static NautilusPropertyBrowser *main_browser = NULL;
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusPropertyBrowser,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusPropertyBrowser,
 				   nautilus_property_browser,
 				   GTK_TYPE_WINDOW)
 
@@ -264,7 +264,7 @@ nautilus_property_browser_initialize (GtkObject *object)
 	/* set the title and standard close accelerator */
 	gtk_window_set_title (GTK_WINDOW (widget), _("Backgrounds and Emblems"));
 	gtk_window_set_wmclass (GTK_WINDOW (widget), "property_browser", "Nautilus");
-	nautilus_gtk_window_set_up_close_accelerator (GTK_WINDOW (widget));
+	eel_gtk_window_set_up_close_accelerator (GTK_WINDOW (widget));
 		
 	/* create the container box */  
   	property_browser->details->container = GTK_HBOX (gtk_hbox_new (FALSE, 0));
@@ -278,8 +278,8 @@ nautilus_property_browser_initialize (GtkObject *object)
 	gtk_container_set_border_width (GTK_CONTAINER (property_browser->details->category_container), 0);
  	property_browser->details->category_position = -1;	
  	
- 	viewport = nautilus_viewport_new (NULL, NULL);	
-	nautilus_viewport_set_never_smooth (NAUTILUS_VIEWPORT (viewport), FALSE);
+ 	viewport = eel_viewport_new (NULL, NULL);	
+	eel_viewport_set_never_smooth (EEL_VIEWPORT (viewport), FALSE);
 	gtk_widget_show (viewport);
 	gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_NONE);
 
@@ -324,17 +324,17 @@ nautilus_property_browser_initialize (GtkObject *object)
   	gtk_container_add(GTK_CONTAINER(temp_frame), temp_hbox);
  	
 	/* add the title label */
-	property_browser->details->title_label = nautilus_label_new ("");
-	nautilus_label_make_larger (NAUTILUS_LABEL (property_browser->details->title_label), 4);
-	nautilus_label_make_bold   (NAUTILUS_LABEL (property_browser->details->title_label));
+	property_browser->details->title_label = eel_label_new ("");
+	eel_label_make_larger (EEL_LABEL (property_browser->details->title_label), 4);
+	eel_label_make_bold   (EEL_LABEL (property_browser->details->title_label));
  	
 	gtk_widget_show(property_browser->details->title_label);
 	gtk_box_pack_start (GTK_BOX(temp_hbox), property_browser->details->title_label, FALSE, FALSE, 8);
  
  	/* add the help label */
-	property_browser->details->help_label = nautilus_label_new  ("");
+	property_browser->details->help_label = eel_label_new  ("");
 	gtk_widget_show(property_browser->details->help_label);
-	nautilus_label_make_smaller (NAUTILUS_LABEL (property_browser->details->help_label), 2);
+	eel_label_make_smaller (EEL_LABEL (property_browser->details->help_label), 2);
 	gtk_box_pack_end (GTK_BOX(temp_hbox), property_browser->details->help_label, FALSE, FALSE, 8);
  	 	
   	/* add the bottom box to hold the command buttons */
@@ -438,14 +438,14 @@ nautilus_property_browser_destroy (GtkObject *object)
 	
 	property_browser = NAUTILUS_PROPERTY_BROWSER (object);
 
-	nautilus_nullify_cancel (&property_browser->details->dialog);
+	eel_nullify_cancel (&property_browser->details->dialog);
 	
 	g_free (property_browser->details->path);
 	g_free (property_browser->details->category);
 	g_free (property_browser->details->dragged_file);
 	g_free (property_browser->details->drag_type);
 
-	nautilus_g_list_free_deep (property_browser->details->keywords);
+	eel_g_list_free_deep (property_browser->details->keywords);
 		
 	if (property_browser->details->property_chit) {
 		gdk_pixbuf_unref (property_browser->details->property_chit);
@@ -462,7 +462,7 @@ nautilus_property_browser_destroy (GtkObject *object)
 	if (object == GTK_OBJECT (main_browser))
 		main_browser = NULL;
 		
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 
 }
 
@@ -490,7 +490,7 @@ nautilus_property_browser_show (void)
 	if (main_browser == NULL) {
 		main_browser = nautilus_property_browser_new ();
 	} else {
-		nautilus_gtk_window_present (GTK_WINDOW (main_browser));
+		eel_gtk_window_present (GTK_WINDOW (main_browser));
 	}
 }
 
@@ -563,7 +563,7 @@ nautilus_property_browser_drag_data_get (GtkWidget *widget,
 			guint16 colorArray[4];
 			
 			/* handle the "reset" case as an image */
-			if (nautilus_strcmp (property_browser->details->dragged_file, RESET_IMAGE_NAME) != 0) {
+			if (eel_strcmp (property_browser->details->dragged_file, RESET_IMAGE_NAME) != 0) {
 				gdk_color_parse(property_browser->details->dragged_file, &color);
 				colorArray[0] = color.red;
 				colorArray[1] = color.green;
@@ -632,7 +632,7 @@ ensure_uri_is_image (const char *uri)
 		(uri, file_info,
 		 GNOME_VFS_FILE_INFO_GET_MIME_TYPE
 		 | GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
-        is_image = nautilus_istr_has_prefix (file_info->mime_type, "image/") && (nautilus_strcmp (file_info->mime_type, "image/svg") != 0);
+        is_image = eel_istr_has_prefix (file_info->mime_type, "image/") && (eel_strcmp (file_info->mime_type, "image/svg") != 0);
 	gnome_vfs_file_info_unref (file_info);
 	return is_image;
 }
@@ -669,7 +669,7 @@ make_drag_image (NautilusPropertyBrowser *property_browser, const char* file_nam
 	if (!strcmp(property_browser->details->category, "patterns")) {
 		pixbuf = nautilus_customization_make_pattern_chit (orig_pixbuf, property_browser->details->property_chit, TRUE);
 	} else {
-		pixbuf = nautilus_gdk_pixbuf_scale_down_to_fit (orig_pixbuf, MAX_ICON_WIDTH, MAX_ICON_HEIGHT);
+		pixbuf = eel_gdk_pixbuf_scale_down_to_fit (orig_pixbuf, MAX_ICON_WIDTH, MAX_ICON_HEIGHT);
 		gdk_pixbuf_unref (orig_pixbuf);
 	}
 
@@ -808,7 +808,7 @@ write_browser_xml (NautilusPropertyBrowser *property_browser,
 static xmlNodePtr
 get_color_category (xmlDocPtr document)
 {
-	return nautilus_xml_get_root_child_by_name_and_property (document, "category", "name", "colors");
+	return eel_xml_get_root_child_by_name_and_property (document, "category", "name", "colors");
 }
 
 /* routines to remove specific category types.  First, handle colors */
@@ -833,7 +833,7 @@ remove_color (NautilusPropertyBrowser *property_browser, const char* color_value
 	cur_node = get_color_category (document);
 	if (cur_node != NULL) {
 		/* loop through the colors to find one that matches */
-		for (color_node = nautilus_xml_get_children (cur_node);
+		for (color_node = eel_xml_get_children (cur_node);
 		     color_node != NULL;
 		     color_node = color_node->next) {
 			color_content = xmlNodeGetContent(color_node);
@@ -877,7 +877,7 @@ remove_pattern(NautilusPropertyBrowser *property_browser, const char* pattern_na
 	/* delete the pattern from the pattern directory */
 	if (gnome_vfs_unlink (pattern_uri) != GNOME_VFS_OK) {
 		char *message = g_strdup_printf (_("Sorry, but pattern %s couldn't be deleted."), pattern_name);
-		nautilus_show_error_dialog (message, _("Couldn't delete pattern"), GTK_WINDOW (property_browser));
+		eel_show_error_dialog (message, _("Couldn't delete pattern"), GTK_WINDOW (property_browser));
 		g_free (message);
 	}
 	
@@ -906,7 +906,7 @@ remove_emblem (NautilusPropertyBrowser *property_browser, const char* emblem_nam
 	/* delete the emblem from the emblem directory */
 	if (gnome_vfs_unlink (emblem_uri) != GNOME_VFS_OK) {
 		char *message = g_strdup_printf (_("Sorry, but emblem %s couldn't be deleted."), emblem_name);
-		nautilus_show_error_dialog (message, _("Couldn't delete pattern"), GTK_WINDOW (property_browser));
+		eel_show_error_dialog (message, _("Couldn't delete pattern"), GTK_WINDOW (property_browser));
 		g_free (message);
 	}
 	else {
@@ -1046,7 +1046,7 @@ add_pattern_to_browser (const char *path_name, gpointer *data)
 		} else {
 			message = g_strdup (_("Sorry, but you did not supply a valid file name."));
 		}
-		nautilus_show_error_dialog (message, _("Couldn't install pattern"), GTK_WINDOW (property_browser));
+		eel_show_error_dialog (message, _("Couldn't install pattern"), GTK_WINDOW (property_browser));
 		g_free (message);
 		return;
 	}
@@ -1056,8 +1056,8 @@ add_pattern_to_browser (const char *path_name, gpointer *data)
 
 	/* don't allow the user to change the reset image */
 	basename = nautilus_uri_get_basename (path_uri);
-	if (basename && nautilus_strcmp (basename, RESET_IMAGE_NAME) == 0) {
-		nautilus_show_error_dialog (_("Sorry, but you can't replace the reset image."), _("Not an Image"), NULL);
+	if (basename && eel_strcmp (basename, RESET_IMAGE_NAME) == 0) {
+		eel_show_error_dialog (_("Sorry, but you can't replace the reset image."), _("Not an Image"), NULL);
 		g_free (path_uri);
 		g_free (basename);
 		return;
@@ -1089,7 +1089,7 @@ add_pattern_to_browser (const char *path_name, gpointer *data)
 	result = nautilus_copy_uri_simple (path_name, destination_name);		
 	if (result != GNOME_VFS_OK) {
 		char *message = g_strdup_printf (_("Sorry, but the pattern %s couldn't be installed."), path_name);
-		nautilus_show_error_dialog (message, _("Couldn't install pattern"), GTK_WINDOW (property_browser));
+		eel_show_error_dialog (message, _("Couldn't install pattern"), GTK_WINDOW (property_browser));
 		g_free (message);
 	}
 		
@@ -1111,13 +1111,13 @@ add_new_pattern (NautilusPropertyBrowser *property_browser)
 		}
 	} else {
 		property_browser->details->dialog = 
-			nautilus_gnome_icon_selector_new (_("Select an image file to add as a pattern:"),
+			eel_gnome_icon_selector_new (_("Select an image file to add as a pattern:"),
 				DATADIR "/pixmaps/tiles/",
 				GTK_WINDOW (property_browser),
-				(NautilusIconSelectionFunction) add_pattern_to_browser,
+				(EelIconSelectionFunction) add_pattern_to_browser,
 				property_browser);						   
 
-		nautilus_nullify_when_destroyed (&property_browser->details->dialog);		
+		eel_nullify_when_destroyed (&property_browser->details->dialog);		
 	}
 }
 
@@ -1170,7 +1170,7 @@ add_color_to_browser (GtkWidget *widget, int which_button, gpointer *data)
 		color_name = gtk_entry_get_text (GTK_ENTRY (property_browser->details->color_name));
 		stripped_color_name = g_strstrip (g_strdup (color_name));
 		if (strlen (stripped_color_name) == 0) {
-			nautilus_show_error_dialog (_("Sorry, but you must specify a non-blank name for the new color."), 
+			eel_show_error_dialog (_("Sorry, but you must specify a non-blank name for the new color."), 
 						    _("Couldn't install color"), GTK_WINDOW (property_browser));
 		
 		} else {
@@ -1203,7 +1203,7 @@ show_color_selection_window (GtkWidget *widget, gpointer *data)
 	
 	/* connect the signals to the new dialog */
 	
-	nautilus_nullify_when_destroyed (&property_browser->details->dialog);
+	eel_nullify_when_destroyed (&property_browser->details->dialog);
 
 	gtk_signal_connect (GTK_OBJECT (property_browser->details->dialog),
 				 "clicked",
@@ -1230,7 +1230,7 @@ add_new_color (NautilusPropertyBrowser *property_browser)
 		property_browser->details->dialog = gtk_color_selection_dialog_new (_("Select a color to add:"));
 		color_dialog = GTK_COLOR_SELECTION_DIALOG (property_browser->details->dialog);
 		
-		nautilus_nullify_when_destroyed (&property_browser->details->dialog);
+		eel_nullify_when_destroyed (&property_browser->details->dialog);
 
 		gtk_signal_connect (GTK_OBJECT (color_dialog->ok_button),
 				    "clicked",
@@ -1268,20 +1268,20 @@ static gboolean
 is_reserved_keyword (NautilusPropertyBrowser *property_browser, const char *keyword)
 {	
 	/* check intrinsic emblems */
-	if (nautilus_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_TRASH) == 0) {
+	if (eel_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_TRASH) == 0) {
 		return TRUE;
 	}
-	if (nautilus_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_CANT_READ) == 0) {
+	if (eel_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_CANT_READ) == 0) {
 		return TRUE;
 	}
-	if (nautilus_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_CANT_WRITE) == 0) {
+	if (eel_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_CANT_WRITE) == 0) {
 		return TRUE;
 	}
 	
 	/* see if the keyword already exists */
 	return g_list_find_custom (property_browser->details->keywords,
 				   (char *) keyword,
-				   (GCompareFunc) nautilus_strcasecmp) != NULL;				
+				   (GCompareFunc) eel_strcasecmp) != NULL;				
 }
 
 /* here's where we handle clicks in the emblem dialog buttons */
@@ -1309,7 +1309,7 @@ emblem_dialog_clicked (GtkWidget *dialog, int which_button, NautilusPropertyBrow
 				} else {
 					char *message = g_strdup_printf
 						(_("Sorry, but '%s' is not a usable image file!"), emblem_path);
-					nautilus_show_error_dialog (message, _("Not an Image"), GTK_WINDOW (property_browser));
+					eel_show_error_dialog (message, _("Not an Image"), GTK_WINDOW (property_browser));
 					g_free (message);
 					g_free (emblem_path);
 					return;
@@ -1326,14 +1326,14 @@ emblem_dialog_clicked (GtkWidget *dialog, int which_button, NautilusPropertyBrow
 		}
 		
 		if (stripped_keyword == NULL || strlen (stripped_keyword) == 0) {
-			nautilus_show_error_dialog (_("Sorry, but you must specify a non-blank keyword for the new emblem."), 
+			eel_show_error_dialog (_("Sorry, but you must specify a non-blank keyword for the new emblem."), 
 						    _("Couldn't install emblem"), GTK_WINDOW (property_browser));
 		} else if (!emblem_keyword_valid (stripped_keyword)) {
-			nautilus_show_error_dialog (_("Sorry, but emblem keywords can only contain letters, spaces and numbers."), 
+			eel_show_error_dialog (_("Sorry, but emblem keywords can only contain letters, spaces and numbers."), 
 						    _("Couldn't install emblem"), GTK_WINDOW (property_browser));
 		} else if (is_reserved_keyword (property_browser, stripped_keyword)) {
 			error_string = g_strdup_printf (_("Sorry, but \"%s\" is an existing keyword.  Please choose a different name for it."), stripped_keyword);
-			nautilus_show_error_dialog (error_string, 
+			eel_show_error_dialog (error_string, 
 						    _("Couldn't install emblem"), GTK_WINDOW (property_browser));
 			g_free (error_string);
 		} else {		
@@ -1363,7 +1363,7 @@ emblem_dialog_clicked (GtkWidget *dialog, int which_button, NautilusPropertyBrow
 		
 			if (result != GNOME_VFS_OK) {
 				char *message = g_strdup_printf (_("Sorry, but the image at %s couldn't be installed as an emblem."), property_browser->details->image_path);
-				nautilus_show_error_dialog (message, _("Couldn't install emblem"), GTK_WINDOW (property_browser));
+				eel_show_error_dialog (message, _("Couldn't install emblem"), GTK_WINDOW (property_browser));
 				g_free (message);
 			} else {
 				emit_emblems_changed_signal ();	
@@ -1396,7 +1396,7 @@ add_new_emblem (NautilusPropertyBrowser *property_browser)
 	} else {
 		property_browser->details->dialog = nautilus_emblem_dialog_new (property_browser);		
 
-		nautilus_nullify_when_destroyed (&property_browser->details->dialog);
+		eel_nullify_when_destroyed (&property_browser->details->dialog);
 
 		gtk_signal_connect (GTK_OBJECT (property_browser->details->dialog),
 				    "clicked",
@@ -1469,7 +1469,7 @@ remove_button_callback(GtkWidget *widget, NautilusPropertyBrowser *property_brow
 static void
 element_clicked_callback (GtkWidget *image_table,
 			  GtkWidget *child,
-			  const NautilusImageTableEvent *event,
+			  const EelImageTableEvent *event,
 			  gpointer callback_data)
 {
 	NautilusPropertyBrowser *property_browser;
@@ -1480,10 +1480,10 @@ element_clicked_callback (GtkWidget *image_table,
 	GdkBitmap *mask_for_dragged_file;
 	int x_delta, y_delta;
 	const char *element_name;
-	NautilusArtIPoint scroll_offset;
+	EelArtIPoint scroll_offset;
 
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (child));
+	g_return_if_fail (EEL_IS_IMAGE_TABLE (image_table));
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (child));
 	g_return_if_fail (event != NULL);
 	g_return_if_fail (NAUTILUS_IS_PROPERTY_BROWSER (callback_data));
 	g_return_if_fail (gtk_object_get_data (GTK_OBJECT (child), "property-name") != NULL);
@@ -1505,11 +1505,11 @@ element_clicked_callback (GtkWidget *image_table,
 	
 	/* treat the reset property in the colors section specially */	
 	if (strcmp (property_browser->details->drag_type, "application/x-color") == 0 &&
-		nautilus_strcmp (element_name, RESET_IMAGE_NAME) == 0) {
+		eel_strcmp (element_name, RESET_IMAGE_NAME) == 0) {
 		drag_types[0].target = "property/bgimage";	
 	}
 	
-	target_list = gtk_target_list_new (drag_types, NAUTILUS_N_ELEMENTS (drag_types));	
+	target_list = gtk_target_list_new (drag_types, EEL_N_ELEMENTS (drag_types));	
 	nautilus_property_browser_set_dragged_file(property_browser, element_name);
 	
 	context = gtk_drag_begin (GTK_WIDGET (property_browser),
@@ -1519,13 +1519,13 @@ element_clicked_callback (GtkWidget *image_table,
 				  NULL);
 
 	/* compute the offsets for dragging */
-	scroll_offset = nautilus_viewport_get_scroll_offset (NAUTILUS_VIEWPORT (image_table->parent));
+	scroll_offset = eel_viewport_get_scroll_offset (EEL_VIEWPORT (image_table->parent));
 
 	if (strcmp(drag_types[0].target, "application/x-color")) {
 		/*it's not a color, so, for now, it must be an image */
 		/* fiddle with the category to handle the "reset" case properly */
 		char * save_category = property_browser->details->category;
-		if (nautilus_strcmp (property_browser->details->category, "colors") == 0) {
+		if (eel_strcmp (property_browser->details->category, "colors") == 0) {
 			property_browser->details->category = "patterns";
 		}
 		pixbuf = make_drag_image (property_browser, element_name);
@@ -1544,7 +1544,7 @@ element_clicked_callback (GtkWidget *image_table,
 			(pixbuf,
 			 &pixmap_for_dragged_file,
 			 &mask_for_dragged_file,
-			 NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
+			 EEL_STANDARD_ALPHA_THRESHHOLD);
 
 		gdk_pixbuf_unref (pixbuf);	
 		gtk_drag_set_icon_pixmap
@@ -1586,15 +1586,15 @@ nautilus_property_browser_preferences_changed (NautilusPropertyBrowser *property
 }
 
 static void
-labeled_image_configure (NautilusLabeledImage *labeled_image)
+labeled_image_configure (EelLabeledImage *labeled_image)
 {
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (labeled_image));
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));
 
-	nautilus_labeled_image_set_background_mode (labeled_image,
-						    NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	nautilus_labeled_image_set_solid_background_color (labeled_image,
-							   NAUTILUS_RGB_COLOR_WHITE);		
-	nautilus_labeled_image_set_spacing (labeled_image, LABELED_IMAGE_SPACING);
+	eel_labeled_image_set_background_mode (labeled_image,
+						    EEL_SMOOTH_BACKGROUND_SOLID_COLOR);
+	eel_labeled_image_set_solid_background_color (labeled_image,
+							   EEL_RGB_COLOR_WHITE);		
+	eel_labeled_image_set_spacing (labeled_image, LABELED_IMAGE_SPACING);
 }
 
 /* Make a color tile for a property */
@@ -1606,10 +1606,10 @@ labeled_image_new (const char *text,
 {
 	GtkWidget *labeled_image;
 	
-	labeled_image = nautilus_labeled_image_new (text, pixbuf);
-	labeled_image_configure (NAUTILUS_LABELED_IMAGE (labeled_image));
+	labeled_image = eel_labeled_image_new (text, pixbuf);
+	labeled_image_configure (EEL_LABELED_IMAGE (labeled_image));
 	if (num_smaller > 0) {
-		nautilus_labeled_image_make_smaller (NAUTILUS_LABELED_IMAGE (labeled_image),
+		eel_labeled_image_make_smaller (EEL_LABELED_IMAGE (labeled_image),
 						     num_smaller);
 	}
 
@@ -1630,17 +1630,17 @@ make_properties_from_directories (NautilusPropertyBrowser *property_browser)
 	char *object_name;
 	char *object_label;
 	GdkPixbuf *object_pixbuf;
-	NautilusImageTable *image_table;
+	EelImageTable *image_table;
 	GtkWidget *reset_object = NULL;
 	GtkWidget *erase_object = NULL;
 
 	g_return_if_fail (NAUTILUS_IS_PROPERTY_BROWSER (property_browser));
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (property_browser->details->content_table));
+	g_return_if_fail (EEL_IS_IMAGE_TABLE (property_browser->details->content_table));
 	
-	image_table = NAUTILUS_IMAGE_TABLE (property_browser->details->content_table);
+	image_table = EEL_IMAGE_TABLE (property_browser->details->content_table);
 	
 	if (property_browser->details->category_type == NAUTILUS_PROPERTY_EMBLEM) {
-		nautilus_g_list_free_deep (property_browser->details->keywords);	
+		eel_g_list_free_deep (property_browser->details->keywords);	
 		property_browser->details->keywords = NULL;
 	}
 	
@@ -1669,7 +1669,7 @@ make_properties_from_directories (NautilusPropertyBrowser *property_browser)
 			keyword = g_strdup (object_name);
 			extension = strchr (keyword, '.');
 
-			nautilus_labeled_image_set_fixed_image_height (NAUTILUS_LABELED_IMAGE (property_image), MAX_EMBLEM_HEIGHT);
+			eel_labeled_image_set_fixed_image_height (EEL_LABELED_IMAGE (property_image), MAX_EMBLEM_HEIGHT);
 
 			if (extension) {
 				*extension = '\0';
@@ -1684,12 +1684,12 @@ make_properties_from_directories (NautilusPropertyBrowser *property_browser)
 
 		/* Keep track of ERASE objects to place them prominently later */
 		if (property_browser->details->category_type == NAUTILUS_PROPERTY_EMBLEM
-		    && nautilus_str_is_equal (object_name, ERASE_OBJECT_NAME)) {
+		    && eel_str_is_equal (object_name, ERASE_OBJECT_NAME)) {
 			g_assert (erase_object == NULL);
 			erase_object = property_image;
 		/* Keep track of RESET objects to place them prominently later */
 		} else if (property_browser->details->category_type == NAUTILUS_PROPERTY_PATTERN
-			   && nautilus_str_is_equal (object_name, RESET_IMAGE_NAME)) {
+			   && eel_str_is_equal (object_name, RESET_IMAGE_NAME)) {
 			g_assert (reset_object == NULL);
 			reset_object = property_image;
 		}
@@ -1708,19 +1708,19 @@ make_properties_from_directories (NautilusPropertyBrowser *property_browser)
 		GtkWidget *blank;
 		guint num_images;
 
-		g_assert (NAUTILUS_IS_LABELED_IMAGE (erase_object));
+		g_assert (EEL_IS_LABELED_IMAGE (erase_object));
 
-		blank = nautilus_image_table_add_empty_image (image_table);
-		labeled_image_configure (NAUTILUS_LABELED_IMAGE (blank));
+		blank = eel_image_table_add_empty_image (image_table);
+		labeled_image_configure (EEL_LABELED_IMAGE (blank));
 		
-		num_images = nautilus_wrap_table_get_num_children (NAUTILUS_WRAP_TABLE (image_table));
+		num_images = eel_wrap_table_get_num_children (EEL_WRAP_TABLE (image_table));
 		g_assert (num_images > 0);
-		nautilus_wrap_table_reorder_child (NAUTILUS_WRAP_TABLE (image_table),
+		eel_wrap_table_reorder_child (EEL_WRAP_TABLE (image_table),
 						   blank,
 						   num_images - 1);
 		
 		gtk_widget_show (blank);
-		nautilus_wrap_table_reorder_child (NAUTILUS_WRAP_TABLE (image_table),
+		eel_wrap_table_reorder_child (EEL_WRAP_TABLE (image_table),
 						   erase_object,
 						   -1);
 	}
@@ -1729,8 +1729,8 @@ make_properties_from_directories (NautilusPropertyBrowser *property_browser)
 	 * We place RESET objects (for colors and patterns) at the beginning.
 	 */
 	if (reset_object != NULL) {
-		g_assert (NAUTILUS_IS_LABELED_IMAGE (reset_object));
-		nautilus_wrap_table_reorder_child (NAUTILUS_WRAP_TABLE (image_table),
+		g_assert (EEL_IS_LABELED_IMAGE (reset_object));
+		eel_wrap_table_reorder_child (EEL_WRAP_TABLE (image_table),
 						   reset_object,
 						   0);
 	}
@@ -1755,7 +1755,7 @@ add_reset_property (NautilusPropertyBrowser *property_browser)
 
 	reset_image = labeled_image_new (NULL, reset_chit, RESET_IMAGE_NAME, 0);
 	gtk_container_add (GTK_CONTAINER (property_browser->details->content_table), reset_image);
-	nautilus_wrap_table_reorder_child (NAUTILUS_WRAP_TABLE (property_browser->details->content_table),
+	eel_wrap_table_reorder_child (EEL_WRAP_TABLE (property_browser->details->content_table),
 					   reset_image,
 					   0);
 	gtk_widget_show (reset_image);
@@ -1782,7 +1782,7 @@ make_properties_from_xml_node (NautilusPropertyBrowser *property_browser,
 	
 	property_browser->details->has_local = FALSE;
 	
-	for (child_node = nautilus_xml_get_children (node);
+	for (child_node = eel_xml_get_children (node);
 	     child_node != NULL;
 	     child_node = child_node->next) {
 		deleted = xmlGetProp (child_node, "deleted");
@@ -1794,7 +1794,7 @@ make_properties_from_xml_node (NautilusPropertyBrowser *property_browser,
 			}
 			
 			color = xmlNodeGetContent (child_node);
-			name = nautilus_xml_get_property_translated (child_node, "name");
+			name = eel_xml_get_property_translated (child_node, "name");
 			
 			/* make the image from the color spec */
 			pixbuf = make_color_drag_image (property_browser, color, FALSE);			
@@ -1832,7 +1832,7 @@ make_category(NautilusPropertyBrowser *property_browser, const char* path, const
 {
 
 	/* set up the description in the help label */
-	nautilus_label_set_text (NAUTILUS_LABEL (property_browser->details->help_label), description);
+	eel_label_set_text (EEL_LABEL (property_browser->details->help_label), description);
 	
 	/* case out on the mode */
 	if (strcmp(mode, "directory") == 0)
@@ -1856,14 +1856,14 @@ property_browser_category_button_new (const char *display_name,
 	file_name = nautilus_pixmap_file (image); 
 	g_return_val_if_fail (file_name != NULL, NULL);
 
-	button = nautilus_labeled_image_toggle_button_new_from_file_name (display_name,
+	button = eel_labeled_image_toggle_button_new_from_file_name (display_name,
 									  file_name);
 
 	/* We want the label to never be smooth */
-	nautilus_labeled_image_set_label_never_smooth (NAUTILUS_LABELED_IMAGE (GTK_BIN (button)->child), TRUE);
+	eel_labeled_image_set_label_never_smooth (EEL_LABELED_IMAGE (GTK_BIN (button)->child), TRUE);
 
 	/* We also want all of the buttons to be the same height */
-	nautilus_labeled_image_set_fixed_image_height (NAUTILUS_LABELED_IMAGE (GTK_BIN (button)->child), STANDARD_BUTTON_IMAGE_HEIGHT);
+	eel_labeled_image_set_fixed_image_height (EEL_LABELED_IMAGE (GTK_BIN (button)->child), STANDARD_BUTTON_IMAGE_HEIGHT);
 
 	g_free (file_name);
 
@@ -1918,7 +1918,7 @@ nautilus_property_browser_update_contents (NautilusPropertyBrowser *property_bro
 {
 	xmlNodePtr cur_node;
  	xmlDocPtr document;
- 	NautilusBackground *background;
+ 	EelBackground *background;
 	GtkWidget *viewport;
 	gboolean show_buttons, got_categories;
 	char *name, *image, *type, *description, *display_name, *path, *mode;
@@ -1938,21 +1938,21 @@ nautilus_property_browser_update_contents (NautilusPropertyBrowser *property_bro
 	/* allocate a new container, with a scrollwindow and viewport */
 	property_browser->details->content_frame = gtk_scrolled_window_new (NULL, NULL);
 	gtk_container_set_border_width (GTK_CONTAINER (property_browser->details->content_frame), 0);				
- 	viewport = nautilus_viewport_new (NULL, NULL);
-	nautilus_viewport_set_never_smooth (NAUTILUS_VIEWPORT (viewport), FALSE);
+ 	viewport = eel_viewport_new (NULL, NULL);
+	eel_viewport_set_never_smooth (EEL_VIEWPORT (viewport), FALSE);
 	gtk_widget_show(viewport);
 	gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_IN);
-	background = nautilus_get_widget_background (viewport);
-	nautilus_background_set_color (background, BROWSER_BACKGROUND_COLOR);	
+	background = eel_get_widget_background (viewport);
+	eel_background_set_color (background, BROWSER_BACKGROUND_COLOR);	
 	gtk_container_add (GTK_CONTAINER (property_browser->details->content_container), property_browser->details->content_frame);
 	gtk_widget_show (property_browser->details->content_frame);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (property_browser->details->content_frame), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 
 	/* allocate a table to hold the content widgets */
-  	property_browser->details->content_table = nautilus_image_table_new (TRUE);
-	nautilus_wrap_table_set_x_spacing (NAUTILUS_WRAP_TABLE (property_browser->details->content_table),
+  	property_browser->details->content_table = eel_image_table_new (TRUE);
+	eel_wrap_table_set_x_spacing (EEL_WRAP_TABLE (property_browser->details->content_table),
 					   IMAGE_TABLE_X_SPACING);
-	nautilus_wrap_table_set_y_spacing (NAUTILUS_WRAP_TABLE (property_browser->details->content_table),
+	eel_wrap_table_set_y_spacing (EEL_WRAP_TABLE (property_browser->details->content_table),
 					   IMAGE_TABLE_Y_SPACING);
 	
 	gtk_signal_connect (GTK_OBJECT (property_browser->details->content_table),
@@ -1970,7 +1970,7 @@ nautilus_property_browser_update_contents (NautilusPropertyBrowser *property_bro
 		property_browser->details->category_position = 0;
 	}
 	
-	for (cur_node = nautilus_xml_get_children (xmlDocGetRootElement (document));
+	for (cur_node = eel_xml_get_children (xmlDocGetRootElement (document));
 	     cur_node != NULL;
 	     cur_node = cur_node->next) {
 		if (strcmp (cur_node->name, "category") == 0) {
@@ -1980,7 +1980,7 @@ nautilus_property_browser_update_contents (NautilusPropertyBrowser *property_bro
 			    && strcmp (property_browser->details->category, name) == 0) {
 				path = xmlGetProp (cur_node, "path");
 				mode = xmlGetProp (cur_node, "mode");
-				description = nautilus_xml_get_property_translated (cur_node, "description");
+				description = eel_xml_get_property_translated (cur_node, "description");
 				type = xmlGetProp (cur_node, "type");
 				
 				make_category (property_browser,
@@ -1997,7 +1997,7 @@ nautilus_property_browser_update_contents (NautilusPropertyBrowser *property_bro
 			}
 			
 			if (!got_categories) {
-				display_name = nautilus_xml_get_property_translated (cur_node, "display_name");
+				display_name = eel_xml_get_property_translated (cur_node, "display_name");
 				image = xmlGetProp (cur_node, "image");
 
 				make_category_link (property_browser,
@@ -2021,7 +2021,7 @@ nautilus_property_browser_update_contents (NautilusPropertyBrowser *property_bro
 	show_buttons = nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_CAN_ADD_CONTENT);
 
 	if (property_browser->details->category == NULL) {
-		nautilus_label_set_text(NAUTILUS_LABEL (property_browser->details->title_label), _("Select A Category:"));
+		eel_label_set_text(EEL_LABEL (property_browser->details->title_label), _("Select A Category:"));
 		gtk_widget_hide(property_browser->details->add_button);
 		gtk_widget_hide(property_browser->details->remove_button);
 	
@@ -2093,7 +2093,7 @@ nautilus_property_browser_update_contents (NautilusPropertyBrowser *property_bro
 		}
 		
 		if (label_text) {
-			nautilus_label_set_text (NAUTILUS_LABEL (property_browser->details->title_label), label_text);
+			eel_label_set_text (EEL_LABEL (property_browser->details->title_label), label_text);
 		}
 		g_free(label_text);
 
@@ -2135,7 +2135,7 @@ nautilus_property_browser_set_category (NautilusPropertyBrowser *property_browse
 					const char *new_category)
 {       
 	/* there's nothing to do if the category is the same as the current one */ 
-	if (nautilus_strcmp (property_browser->details->category, new_category) == 0) {
+	if (eel_strcmp (property_browser->details->category, new_category) == 0) {
 		return;
 	}
 	
@@ -2143,11 +2143,11 @@ nautilus_property_browser_set_category (NautilusPropertyBrowser *property_browse
 	property_browser->details->category = g_strdup (new_category);
 	
 	/* set up the property type enum */
-	if (nautilus_strcmp (new_category, "patterns") == 0) {
+	if (eel_strcmp (new_category, "patterns") == 0) {
 		property_browser->details->category_type = NAUTILUS_PROPERTY_PATTERN;
-	} else if (nautilus_strcmp (new_category, "colors") == 0) {	
+	} else if (eel_strcmp (new_category, "colors") == 0) {	
 		property_browser->details->category_type = NAUTILUS_PROPERTY_COLOR;
-	} else if (nautilus_strcmp (new_category, "emblems") == 0) {	
+	} else if (eel_strcmp (new_category, "emblems") == 0) {	
 		property_browser->details->category_type = NAUTILUS_PROPERTY_EMBLEM;
 	} else {
 		property_browser->details->category_type = NAUTILUS_PROPERTY_NONE;
@@ -2166,7 +2166,7 @@ nautilus_property_browser_set_path (NautilusPropertyBrowser *property_browser,
 				    const char *new_path)
 {       
 	/* there's nothing to do if the uri is the same as the current one */ 
-	if (nautilus_strcmp (property_browser->details->path, new_path) == 0) {
+	if (eel_strcmp (property_browser->details->path, new_path) == 0) {
 		return;
 	}
 	
diff --git a/src/nautilus-search-bar-criterion.c b/src/nautilus-search-bar-criterion.c
index 5dc88daab..eb1b9cf91 100644
--- a/src/nautilus-search-bar-criterion.c
+++ b/src/nautilus-search-bar-criterion.c
@@ -44,13 +44,13 @@
 #include <libnautilus-extensions/nautilus-customization-data.h>
 #include <libnautilus-extensions/nautilus-dateedit-extensions.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
 #include <libnautilus-extensions/nautilus-entry.h>
 #include <libnautilus-extensions/nautilus-search-uri.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-undo-signal-handlers.h>
-#include <libnautilus-extensions/nautilus-labeled-image.h>
+#include <eel/eel-labeled-image.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
@@ -207,7 +207,7 @@ static NautilusSearchBarCriterionType      get_next_criterion_type
 										   GSList *displayed_criteria);
 static void                                nautilus_search_bar_criterion_destroy  (GtkObject *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSearchBarCriterion, nautilus_search_bar_criterion, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusSearchBarCriterion, nautilus_search_bar_criterion, GTK_TYPE_EVENT_BOX)
 
      static void
 nautilus_search_bar_criterion_initialize_class (NautilusSearchBarCriterionClass *klass)
@@ -245,7 +245,7 @@ nautilus_search_bar_criterion_destroy (GtkObject *object)
 	*/
 	g_free (criterion->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
@@ -318,7 +318,7 @@ nautilus_search_bar_criterion_new_from_values (NautilusSearchBarCriterionType ty
 
 	for (i = 0; criteria_titles[i] != NULL; i++) {
 		GtkWidget *item;
-		context_stripped_criteria_title = nautilus_str_remove_bracketed_text (_(criteria_titles[i]));
+		context_stripped_criteria_title = eel_str_remove_bracketed_text (_(criteria_titles[i]));
 		item = gtk_menu_item_new_with_label (context_stripped_criteria_title);
 		g_free (context_stripped_criteria_title);
 
@@ -346,12 +346,12 @@ nautilus_search_bar_criterion_new_from_values (NautilusSearchBarCriterionType ty
 	relation_menu = gtk_menu_new ();
 	for (i = 0; relation_options[i] != NULL; i++) {
 		GtkWidget *item;
-		if (nautilus_str_is_empty (relation_options[i])) {
+		if (eel_str_is_empty (relation_options[i])) {
 			/* Empty text; make unselectable separator */
 			item = gtk_menu_item_new ();
 			gtk_widget_set_sensitive (item, FALSE);
 		} else {
-			context_stripped_relation = nautilus_str_remove_bracketed_text (_(relation_options[i]));
+			context_stripped_relation = eel_str_remove_bracketed_text (_(relation_options[i]));
 			item = gtk_menu_item_new_with_label (context_stripped_relation);
 			g_free (context_stripped_relation);
 		}
@@ -407,7 +407,7 @@ nautilus_search_bar_criterion_new_from_values (NautilusSearchBarCriterionType ty
 		value_menu = gtk_menu_new ();
 		for (i = 0; value_options[i] != NULL; i++) {
 			GtkWidget *item;
-			context_stripped_value = nautilus_str_remove_bracketed_text (_(value_options[i]));
+			context_stripped_value = eel_str_remove_bracketed_text (_(value_options[i]));
 			item = gtk_menu_item_new_with_label (context_stripped_value);
 			g_free (context_stripped_value);
 			gtk_widget_show (item);
@@ -617,7 +617,7 @@ nautilus_search_bar_criterion_get_location (NautilusSearchBarCriterion *criterio
 	} else if (criterion->details->use_value_entry) {
 		value_text = gtk_entry_get_text (GTK_ENTRY (criterion->details->value_entry));
 	} else if (criterion->details->type == NAUTILUS_DATE_MODIFIED_SEARCH_CRITERION) {
-		value_text = nautilus_gnome_date_edit_get_date_as_string (criterion->details->date);
+		value_text = eel_gnome_date_edit_get_date_as_string (criterion->details->date);
 	}
 
 	switch (name_number) {
@@ -725,7 +725,7 @@ nautilus_search_bar_criterion_update_valid_criteria_choices (NautilusSearchBarCr
 	/* We remove the whole menu and put in a new one. */
 	new_menu = gtk_menu_new ();
 	for (i = 0; criteria_titles[i] != NULL; i++) {
-		context_stripped_criteria_title = nautilus_str_remove_bracketed_text (_(criteria_titles[i]));
+		context_stripped_criteria_title = eel_str_remove_bracketed_text (_(criteria_titles[i]));
 		item = gtk_menu_item_new_with_label (context_stripped_criteria_title);
 		g_free (context_stripped_criteria_title);
 		
@@ -890,7 +890,7 @@ get_size_location_for (int relation_number,
 	g_assert (relation_number == 0 || relation_number == 1);
 	/* We put a 'K' after the size, so multiply what the user
 	   entered by 1000 */
-	int_conversion_success = nautilus_str_to_int (size_text, 
+	int_conversion_success = eel_str_to_int (size_text, 
 						      &entered_size);
 	
 	if (int_conversion_success) {
@@ -1022,10 +1022,10 @@ make_emblem_value_menu (NautilusSearchBarCriterion *criterion)
 					  g_strdup (emblem_name), (GtkDestroyNotify) g_free);
 
 		
-		image = nautilus_labeled_image_new (label, pixbuf);
-		nautilus_labeled_image_set_label_position (NAUTILUS_LABELED_IMAGE (image), GTK_POS_RIGHT);
-		nautilus_labeled_image_set_x_alignment (NAUTILUS_LABELED_IMAGE (image), 0.0);
-		nautilus_labeled_image_set_spacing (NAUTILUS_LABELED_IMAGE (image), 4);
+		image = eel_labeled_image_new (label, pixbuf);
+		eel_labeled_image_set_label_position (EEL_LABELED_IMAGE (image), GTK_POS_RIGHT);
+		eel_labeled_image_set_x_alignment (EEL_LABELED_IMAGE (image), 0.0);
+		eel_labeled_image_set_spacing (EEL_LABELED_IMAGE (image), 4);
 
 		gtk_container_add (GTK_CONTAINER (menu_item), image);
 		gtk_widget_show_all (menu_item);
diff --git a/src/nautilus-search-bar.c b/src/nautilus-search-bar.c
index 0c359436c..a6d8f053c 100644
--- a/src/nautilus-search-bar.c
+++ b/src/nautilus-search-bar.c
@@ -30,7 +30,7 @@
 #include <config.h>
 #include "nautilus-search-bar.h"
 
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 
 /* FIXME bugzilla.eazel.com 2516: This adds nothing to NautilusNavigationBar.
  * Perhaps we can remove it.
@@ -39,7 +39,7 @@
 static void nautilus_search_bar_initialize_class (NautilusSearchBarClass *class);
 static void nautilus_search_bar_initialize       (NautilusSearchBar      *bar);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSearchBar, nautilus_search_bar, NAUTILUS_TYPE_NAVIGATION_BAR)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusSearchBar, nautilus_search_bar, NAUTILUS_TYPE_NAVIGATION_BAR)
 
 static void
 nautilus_search_bar_initialize_class (NautilusSearchBarClass *klass)
diff --git a/src/nautilus-shell.c b/src/nautilus-shell.c
index 0a0cfd221..f5917d143 100644
--- a/src/nautilus-shell.c
+++ b/src/nautilus-shell.c
@@ -40,13 +40,13 @@
 #include <libgnomeui/gnome-stock.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-preferences.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <libnautilus/nautilus-bonobo-workarounds.h>
 #include <stdlib.h>
 
@@ -85,7 +85,7 @@ static void     corba_restart                   (PortableServer_Servant  servant
 						 CORBA_Environment      *ev);
 static gboolean restore_window_states           (NautilusShell          *shell);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusShell,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusShell,
 				   nautilus_shell,
 				   BONOBO_OBJECT_TYPE)
 
@@ -159,7 +159,7 @@ destroy (GtkObject *object)
 	shell = NAUTILUS_SHELL (object);
 	g_free (shell->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 NautilusShell *
@@ -221,7 +221,7 @@ display_caveat (GtkWindow *parent_window)
 		}
 	}
 
-  	text = nautilus_label_new
+  	text = eel_label_new
 		(_("Thank you for your interest in Nautilus.\n "
 		   "\n"
 		   "As with any software under development, you should exercise caution when "
@@ -231,9 +231,9 @@ display_caveat (GtkWindow *parent_window)
 		   "\n"
 		   "Please visit http://www.eazel.com/feedback.html to provide feedback, "
 		   "comments, and suggestions."));
-	nautilus_label_make_larger (NAUTILUS_LABEL (text), 1);
-	nautilus_label_set_justify (NAUTILUS_LABEL (text), GTK_JUSTIFY_LEFT);
-	nautilus_label_set_wrap (NAUTILUS_LABEL (text), TRUE);
+	eel_label_make_larger (EEL_LABEL (text), 1);
+	eel_label_set_justify (EEL_LABEL (text), GTK_JUSTIFY_LEFT);
+	eel_label_set_wrap (EEL_LABEL (text), TRUE);
 	gtk_widget_show (text);
   	gtk_box_pack_start (GTK_BOX (hbox), text, FALSE, FALSE, 0);
 
@@ -274,7 +274,7 @@ open_window (NautilusShell *shell, const char *uri, const char *geometry)
 	window = nautilus_application_create_window (shell->details->application);
 
 	if (geometry != NULL) {
-		nautilus_gtk_window_set_initial_geometry_from_string (GTK_WINDOW (window),
+		eel_gtk_window_set_initial_geometry_from_string (GTK_WINDOW (window),
 								      geometry,
 								      APPLICATION_WINDOW_MIN_WIDTH,
 								      APPLICATION_WINDOW_MIN_HEIGHT);
@@ -386,7 +386,7 @@ save_window_states (void)
 		   at some point. This ensures that when eazel-install:nautilus
 		   restarts nautilus, it doesn't go to eazel-install:nautilus but
 		   to eazel: instead */
-		if (nautilus_istr_has_prefix (location, "eazel-install:")) {
+		if (eel_istr_has_prefix (location, "eazel-install:")) {
 			g_free (location);
 			location = g_strdup ("eazel:");
 		}
@@ -402,7 +402,7 @@ save_window_states (void)
 	}
 
 	nautilus_preferences_set_string_list (START_STATE_CONFIG, out);
-	nautilus_g_list_free_deep (out);
+	eel_g_list_free_deep (out);
 }
 
 /* returns TRUE if there was state info which has been used to create new windows */
@@ -453,7 +453,7 @@ restore_window_states (NautilusShell *shell)
 		gtk_widget_set_usize (GTK_WIDGET (window), width, height);
 		display_caveat_first_time (shell, window);
 	}
-	nautilus_g_list_free_deep (start_state);
+	eel_g_list_free_deep (start_state);
 	nautilus_preferences_set_string_list (START_STATE_CONFIG, NULL);
 	return TRUE;
 }
@@ -465,5 +465,5 @@ corba_restart (PortableServer_Servant servant,
 	save_window_states ();
 
 	nautilus_main_event_loop_quit ();
-	nautilus_setenv ("_NAUTILUS_RESTART", "yes", 1);
+	eel_setenv ("_NAUTILUS_RESTART", "yes", 1);
 }
diff --git a/src/nautilus-sidebar-tabs.c b/src/nautilus-sidebar-tabs.c
index 3ade8eb41..b1a2cfa65 100644
--- a/src/nautilus-sidebar-tabs.c
+++ b/src/nautilus-sidebar-tabs.c
@@ -35,15 +35,15 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-scalable-font.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-scalable-font.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-theme.h>
 #include <math.h>
 #include <stdio.h>
@@ -95,7 +95,7 @@ struct NautilusSidebarTabsDetails {
 	int total_height;
 	gboolean title_mode;
 	GdkRectangle title_rect;
-	NautilusScalableFont *tab_font;	
+	EelScalableFont *tab_font;	
 	int font_size;
 	GdkColor tab_color;
 	GdkColor background_color;
@@ -141,7 +141,7 @@ static TabItem* tab_item_find_by_name                   (NautilusSidebarTabs
 							 const char               *name);
 static void     smooth_font_changed_callback            (gpointer                  callback_data);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSidebarTabs, nautilus_sidebar_tabs, GTK_TYPE_WIDGET)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusSidebarTabs, nautilus_sidebar_tabs, GTK_TYPE_WIDGET)
 
 static void
 nautilus_sidebar_tabs_initialize_class (NautilusSidebarTabsClass *class)
@@ -198,7 +198,7 @@ nautilus_sidebar_tabs_load_theme_data (NautilusSidebarTabs *sidebar_tabs)
 	
 	if (tab_pieces) {
 		/* check for "none" to force non-bitmap tabs, necessary since the default has bitmap ones now */
-		if (nautilus_strcmp (tab_pieces, "none") == 0) {
+		if (eel_strcmp (tab_pieces, "none") == 0) {
 			tab_piece_path = NULL;	
 		}  else {
 			if (tab_piece_theme) {
@@ -224,7 +224,7 @@ nautilus_sidebar_tabs_load_theme_data (NautilusSidebarTabs *sidebar_tabs)
 				sidebar_tabs->details->tab_height = gdk_pixbuf_get_height (sidebar_tabs->details->tab_piece_images[0]);
 				
 				/* set the text color according to the pixbuf */
-				nautilus_gdk_pixbuf_average_value (sidebar_tabs->details->tab_piece_images[TAB_NORMAL_FILL], &color);
+				eel_gdk_pixbuf_average_value (sidebar_tabs->details->tab_piece_images[TAB_NORMAL_FILL], &color);
 				intensity = (((color.red >> 8) * 77) + ((color.green >> 8) * 150) + ((color.blue >> 8) * 28)) >> 8;	
 
 				if (intensity < 160) {
@@ -252,7 +252,7 @@ nautilus_sidebar_tabs_load_theme_data (NautilusSidebarTabs *sidebar_tabs)
 static void
 smooth_font_changed_callback (gpointer callback_data)
 {
-	NautilusScalableFont *new_font;
+	EelScalableFont *new_font;
 	NautilusSidebarTabs *sidebar_tabs;
 
 	g_return_if_fail (NAUTILUS_IS_SIDEBAR_TABS (callback_data));
@@ -375,7 +375,7 @@ nautilus_sidebar_tabs_destroy (GtkObject *object)
 	}
 	
 	/* release the tab list, if any */
-	nautilus_g_list_free_deep_custom (sidebar_tabs->details->tab_items,
+	eel_g_list_free_deep_custom (sidebar_tabs->details->tab_items,
 					  tab_item_destroy_cover,
 					  NULL);
 	
@@ -388,7 +388,7 @@ nautilus_sidebar_tabs_destroy (GtkObject *object)
 		
 	g_free (sidebar_tabs->details);
   	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* unload the tab piece images, if any */
@@ -531,7 +531,7 @@ nautilus_sidebar_tabs_size_allocate(GtkWidget *widget, GtkAllocation *allocation
 {
 	NautilusSidebarTabs *sidebar_tabs = NAUTILUS_SIDEBAR_TABS(widget);
 	
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
 	
 	/* layout tabs to make sure height measurement is valid */
 	measure_total_height (sidebar_tabs);
@@ -578,7 +578,7 @@ draw_one_tab_plain (NautilusSidebarTabs *sidebar_tabs, GdkGC *gc, char *tab_name
 	int tab_bottom;
 	int tab_right;
 	int indicator_width;
-	NautilusDimensions name_dimensions;
+	EelDimensions name_dimensions;
 	int total_width;
 	GtkWidget *widget;
 	GdkPixbuf *temp_pixbuf;
@@ -593,7 +593,7 @@ draw_one_tab_plain (NautilusSidebarTabs *sidebar_tabs, GdkGC *gc, char *tab_name
 	}
 
 	/* measure the name and compute the bounding box */
-	name_dimensions = nautilus_scalable_font_measure_text (sidebar_tabs->details->tab_font, 
+	name_dimensions = eel_scalable_font_measure_text (sidebar_tabs->details->tab_font, 
 							       sidebar_tabs->details->font_size,
 							       tab_name,
 							       strlen (tab_name));
@@ -634,7 +634,7 @@ draw_one_tab_plain (NautilusSidebarTabs *sidebar_tabs, GdkGC *gc, char *tab_name
 	
 	/* allocate the pixbuf and fill it with the background color */
 	temp_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, name_dimensions.width + indicator_width + 1, name_dimensions.height + 1);
-	nautilus_gdk_pixbuf_fill_rectangle_with_color (temp_pixbuf, NULL, nautilus_gdk_color_to_rgb (foreground_color));
+	eel_gdk_pixbuf_fill_rectangle_with_color (temp_pixbuf, NULL, eel_gdk_color_to_rgb (foreground_color));
 
 	/* draw the indicator if necessary */
 	if (indicator_pixbuf) {
@@ -642,21 +642,21 @@ draw_one_tab_plain (NautilusSidebarTabs *sidebar_tabs, GdkGC *gc, char *tab_name
 	}
 	
 	/* draw the name into the pixbuf using anti-aliased text */
-	nautilus_scalable_font_draw_text (sidebar_tabs->details->tab_font, temp_pixbuf, 
+	eel_scalable_font_draw_text (sidebar_tabs->details->tab_font, temp_pixbuf, 
 					  1 + indicator_width, 1, 
 					  NULL,
 					  sidebar_tabs->details->font_size,
 					  tab_name, strlen (tab_name),
-					  prelight_flag ? NAUTILUS_RGB_COLOR_WHITE : NAUTILUS_RGB_COLOR_BLACK,
-					  NAUTILUS_OPACITY_FULLY_OPAQUE);
+					  prelight_flag ? EEL_RGB_COLOR_WHITE : EEL_RGB_COLOR_BLACK,
+					  EEL_OPACITY_FULLY_OPAQUE);
 	
-	nautilus_scalable_font_draw_text (sidebar_tabs->details->tab_font, temp_pixbuf, 
+	eel_scalable_font_draw_text (sidebar_tabs->details->tab_font, temp_pixbuf, 
 					  indicator_width, 0,
 					  NULL,
 					  sidebar_tabs->details->font_size,
 					  tab_name, strlen (tab_name),
-					  prelight_flag ? NAUTILUS_RGB_COLOR_BLACK : NAUTILUS_RGB_COLOR_WHITE,
-					  NAUTILUS_OPACITY_FULLY_OPAQUE);
+					  prelight_flag ? EEL_RGB_COLOR_BLACK : EEL_RGB_COLOR_WHITE,
+					  EEL_OPACITY_FULLY_OPAQUE);
 	
 	/* blit the pixbuf to the drawable, then release it */
 
@@ -747,7 +747,7 @@ draw_one_tab_themed (NautilusSidebarTabs *sidebar_tabs, GdkPixbuf *tab_pixbuf, G
 	      		GdkRectangle *tab_rect)
 {  
 	GtkWidget *widget;
-	NautilusDimensions name_dimensions;
+	EelDimensions name_dimensions;
 	int piece_width, tab_width;
 	int current_pos, right_edge_pos;
 	int text_x_pos, left_width;
@@ -774,7 +774,7 @@ draw_one_tab_themed (NautilusSidebarTabs *sidebar_tabs, GdkPixbuf *tab_pixbuf, G
 	}
 	
 	/* measure the size of the name */
-	name_dimensions = nautilus_scalable_font_measure_text (sidebar_tabs->details->tab_font,
+	name_dimensions = eel_scalable_font_measure_text (sidebar_tabs->details->tab_font,
 							       sidebar_tabs->details->font_size,
 							       tab_name,
 							       strlen (tab_name));
@@ -810,23 +810,23 @@ draw_one_tab_themed (NautilusSidebarTabs *sidebar_tabs, GdkPixbuf *tab_pixbuf, G
 			text_x += indicator_width;
 		} 
 
-		nautilus_scalable_font_draw_text (sidebar_tabs->details->tab_font, tab_pixbuf, 
+		eel_scalable_font_draw_text (sidebar_tabs->details->tab_font, tab_pixbuf, 
 					  text_x, text_y,
 					  NULL,
 					  sidebar_tabs->details->font_size,
 					  tab_name, strlen (tab_name),
-					  NAUTILUS_RGB_COLOR_BLACK,
-					  NAUTILUS_OPACITY_FULLY_OPAQUE);
+					  EEL_RGB_COLOR_BLACK,
+					  EEL_OPACITY_FULLY_OPAQUE);
 		text_x -= 1;
 		text_y -= 1;
 
-		nautilus_scalable_font_draw_text (sidebar_tabs->details->tab_font, tab_pixbuf,
+		eel_scalable_font_draw_text (sidebar_tabs->details->tab_font, tab_pixbuf,
 					  text_x, text_y,
 					  NULL,
 					  sidebar_tabs->details->font_size,
 					  tab_name, strlen (tab_name),
-					  NAUTILUS_RGB_COLOR_WHITE,
-					  NAUTILUS_OPACITY_FULLY_OPAQUE);
+					  EEL_RGB_COLOR_WHITE,
+					  EEL_OPACITY_FULLY_OPAQUE);
 	}
 	
 	/* set up the bounds rectangle for later hit-testing */
@@ -864,7 +864,7 @@ static int
 get_tab_width (NautilusSidebarTabs *sidebar_tabs, TabItem *this_tab, gboolean is_themed, gboolean first_flag)
 {
 	int edge_width, indicator_width;
-	NautilusDimensions name_dimensions;
+	EelDimensions name_dimensions;
 	
 	if (this_tab == NULL)
 		return 0;
@@ -882,7 +882,7 @@ get_tab_width (NautilusSidebarTabs *sidebar_tabs, TabItem *this_tab, gboolean is
 			edge_width = 0;
 		}
 
-		name_dimensions = nautilus_scalable_font_measure_text (sidebar_tabs->details->tab_font,
+		name_dimensions = eel_scalable_font_measure_text (sidebar_tabs->details->tab_font,
 								       sidebar_tabs->details->font_size,
 								       this_tab->tab_text,
 								       strlen (this_tab->tab_text));
@@ -1319,7 +1319,7 @@ nautilus_sidebar_tabs_update_tab_item (NautilusSidebarTabs *sidebar_tabs, TabIte
 			bonobo_object_release_unref (property_bag, &ev);	
 
 			/* see if the indicator icon changed; if so, fetch the new one */
-			if (nautilus_strcmp (tab_image_name, tab_item->indicator_pixbuf_name) != 0) {
+			if (eel_strcmp (tab_image_name, tab_item->indicator_pixbuf_name) != 0) {
 				g_free (tab_item->indicator_pixbuf_name);
 
 				if (tab_item->indicator_pixbuf != NULL) {
diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c
index a8d0ef350..36d7511e5 100644
--- a/src/nautilus-sidebar-title.c
+++ b/src/nautilus-sidebar-title.c
@@ -36,22 +36,22 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomevfs/gnome-vfs-types.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-file-attributes.h>
 #include <libnautilus-extensions/nautilus-font-factory.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-font-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-font-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
-#include <libnautilus-extensions/nautilus-image-with-background.h>
-#include <libnautilus-extensions/nautilus-label-with-background.h>
+#include <eel/eel-image-with-background.h>
+#include <eel/eel-label-with-background.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-search-uri.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-theme.h>
 #include <math.h>
 #include <string.h>
@@ -70,7 +70,7 @@ static GtkWidget *         sidebar_title_create_title_label        (void);
 static GtkWidget *         sidebar_title_create_more_info_label    (void);
 static void                update_all_cover   			   (gpointer                   callback_data);
 static void		   update_all 				   (NautilusSidebarTitle      *sidebar_title);
-static NautilusBackground *nautilus_sidebar_title_background       (NautilusSidebarTitle      *sidebar_title);
+static EelBackground *nautilus_sidebar_title_background       (NautilusSidebarTitle      *sidebar_title);
 
 struct NautilusSidebarTitleDetails {
 	NautilusFile		*file;
@@ -86,7 +86,7 @@ struct NautilusSidebarTitleDetails {
 	gboolean		determined_icon;
 };
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSidebarTitle, nautilus_sidebar_title, gtk_vbox_get_type ())
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusSidebarTitle, nautilus_sidebar_title, gtk_vbox_get_type ())
 
 static void
 nautilus_sidebar_title_initialize_class (NautilusSidebarTitleClass *class)
@@ -102,7 +102,7 @@ nautilus_sidebar_title_initialize_class (NautilusSidebarTitleClass *class)
 }
 
 static void
-appearance_changed_callback (NautilusBackground *background, NautilusSidebarTitle *sidebar_title)
+appearance_changed_callback (EelBackground *background, NautilusSidebarTitle *sidebar_title)
 {
 	nautilus_sidebar_title_select_text_color (sidebar_title);
 }		
@@ -110,7 +110,7 @@ appearance_changed_callback (NautilusBackground *background, NautilusSidebarTitl
 static void
 realize_callback (NautilusSidebarTitle *sidebar_title)
 {
-	NautilusBackground *background;
+	EelBackground *background;
 	
 	background = nautilus_sidebar_title_background (sidebar_title);
 
@@ -126,8 +126,8 @@ realize_callback (NautilusSidebarTitle *sidebar_title)
 static void
 smooth_font_changed_callback (gpointer callback_data)
 {
-	NautilusScalableFont *new_font;
-	NautilusScalableFont *new_bold_font;
+	EelScalableFont *new_font;
+	EelScalableFont *new_bold_font;
 	NautilusSidebarTitle *sidebar_title;
 
 	g_return_if_fail (NAUTILUS_IS_SIDEBAR_TITLE (callback_data));
@@ -137,8 +137,8 @@ smooth_font_changed_callback (gpointer callback_data)
 	new_font = nautilus_global_preferences_get_default_smooth_font ();
 	new_bold_font = nautilus_global_preferences_get_default_smooth_bold_font ();
 
-	nautilus_label_set_smooth_font (NAUTILUS_LABEL (sidebar_title->details->title_label), new_bold_font);
-	nautilus_label_set_smooth_font (NAUTILUS_LABEL (sidebar_title->details->more_info_label), new_font);
+	eel_label_set_smooth_font (EEL_LABEL (sidebar_title->details->title_label), new_bold_font);
+	eel_label_set_smooth_font (EEL_LABEL (sidebar_title->details->more_info_label), new_font);
 
 	gtk_object_unref (GTK_OBJECT (new_font));
 	gtk_object_unref (GTK_OBJECT (new_bold_font));
@@ -157,7 +157,7 @@ nautilus_sidebar_title_initialize (NautilusSidebarTitle *sidebar_title)
 	gtk_signal_connect (GTK_OBJECT (sidebar_title), "realize", realize_callback, NULL);
 
 	/* Create the icon */
-	sidebar_title->details->icon = nautilus_image_new_with_background (NULL);
+	sidebar_title->details->icon = eel_image_new_with_background (NULL);
 	gtk_box_pack_start (GTK_BOX (sidebar_title), sidebar_title->details->icon, 0, 0, 0);
 	gtk_widget_show (sidebar_title->details->icon);
 
@@ -175,7 +175,7 @@ nautilus_sidebar_title_initialize (NautilusSidebarTitle *sidebar_title)
 	gtk_widget_show (sidebar_title->details->emblem_box);
 	gtk_box_pack_start (GTK_BOX (sidebar_title), sidebar_title->details->emblem_box, 0, 0, 0);
 
-	/* FIXME: This should use NautilusLabel like the other displayed text.
+	/* FIXME: This should use EelLabel like the other displayed text.
 	 * But I don't think this feature is ever used? Someone should consult
 	 * with Andy about this. (This is not the same as the info in the Notes
 	 * sidebar panel.)
@@ -239,7 +239,7 @@ nautilus_sidebar_title_destroy (GtkObject *object)
 	g_free (sidebar_title->details->title_text);
 	g_free (sidebar_title->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* return a new index title object */
@@ -250,12 +250,12 @@ nautilus_sidebar_title_new (void)
 	return gtk_widget_new (nautilus_sidebar_title_get_type (), NULL);
 }
 
-static NautilusBackground *
+static EelBackground *
 nautilus_sidebar_title_background (NautilusSidebarTitle *sidebar_title)
 {
 	GtkWidget *widget;
 	GtkWidget *sidebar;
-	NautilusBackground *background;
+	EelBackground *background;
 
 	g_return_val_if_fail (NAUTILUS_IS_SIDEBAR_TITLE (sidebar_title), NULL);
 	
@@ -265,8 +265,8 @@ nautilus_sidebar_title_background (NautilusSidebarTitle *sidebar_title)
 	if (widget != NULL) {
 		sidebar = widget->parent;
 		g_return_val_if_fail (NAUTILUS_IS_SIDEBAR (sidebar), NULL);
-		background = nautilus_get_widget_background (sidebar);
-		g_return_val_if_fail (NAUTILUS_IS_BACKGROUND (background), NULL);
+		background = eel_get_widget_background (sidebar);
+		g_return_val_if_fail (EEL_IS_BACKGROUND (background), NULL);
 		return background;
 	} else {
 		/* FIXME bugzilla.eazel.com 5042
@@ -306,7 +306,7 @@ nautilus_sidebar_title_background_is_default (NautilusSidebarTitle *sidebar_titl
 void
 nautilus_sidebar_title_select_text_color (NautilusSidebarTitle *sidebar_title)
 {
-	NautilusBackground *background;
+	EelBackground *background;
 	char *sidebar_title_color;
 	char *sidebar_info_title_color;
 	char *sidebar_title_shadow_color;
@@ -328,7 +328,7 @@ nautilus_sidebar_title_select_text_color (NautilusSidebarTitle *sidebar_title)
 		
 		if (sidebar_title_color == NULL) {
 			/* FIXME bugzilla.eazel.com 2496: for now, both the title and info colors are the same */
-			if (nautilus_background_is_dark (background)) {
+			if (eel_background_is_dark (background)) {
 				sidebar_title_color = g_strdup("rgb:FFFF/FFFF/FFFF");
 				sidebar_info_title_color = g_strdup("rgb:FFFF/FFFF/FFFF");
 				sidebar_title_shadow_color = g_strdup("rgb:0000/0000/0000");
@@ -347,22 +347,22 @@ nautilus_sidebar_title_select_text_color (NautilusSidebarTitle *sidebar_title)
 			}
 		}
 
-		nautilus_label_set_text_color (NAUTILUS_LABEL (sidebar_title->details->title_label),
-						       nautilus_parse_rgb_with_white_default (sidebar_title_color));
+		eel_label_set_text_color (EEL_LABEL (sidebar_title->details->title_label),
+						       eel_parse_rgb_with_white_default (sidebar_title_color));
 		
-		nautilus_label_set_smooth_drop_shadow_color (NAUTILUS_LABEL (sidebar_title->details->title_label),
-							      nautilus_parse_rgb_with_white_default (sidebar_title_shadow_color));
+		eel_label_set_smooth_drop_shadow_color (EEL_LABEL (sidebar_title->details->title_label),
+							      eel_parse_rgb_with_white_default (sidebar_title_shadow_color));
 		
-		nautilus_label_set_smooth_drop_shadow_offset (NAUTILUS_LABEL (sidebar_title->details->title_label),
+		eel_label_set_smooth_drop_shadow_offset (EEL_LABEL (sidebar_title->details->title_label),
 							       sidebar_title->details->shadow_offset);
 		
-		nautilus_label_set_text_color (NAUTILUS_LABEL (sidebar_title->details->more_info_label),
-						       nautilus_parse_rgb_with_white_default (sidebar_info_title_color));
+		eel_label_set_text_color (EEL_LABEL (sidebar_title->details->more_info_label),
+						       eel_parse_rgb_with_white_default (sidebar_info_title_color));
 		
-		nautilus_label_set_smooth_drop_shadow_color (NAUTILUS_LABEL (sidebar_title->details->more_info_label),
-							      nautilus_parse_rgb_with_white_default (sidebar_title_shadow_color));
+		eel_label_set_smooth_drop_shadow_color (EEL_LABEL (sidebar_title->details->more_info_label),
+							      eel_parse_rgb_with_white_default (sidebar_title_shadow_color));
 		
-		nautilus_label_set_smooth_drop_shadow_offset (NAUTILUS_LABEL (sidebar_title->details->more_info_label),
+		eel_label_set_smooth_drop_shadow_offset (EEL_LABEL (sidebar_title->details->more_info_label),
 							       sidebar_title->details->shadow_offset);
 		
 		g_free (sidebar_title_color);	
@@ -410,13 +410,13 @@ update_icon (NautilusSidebarTitle *sidebar_title)
 		uri = nautilus_file_get_uri (sidebar_title->details->file);
 	}	
 	
-	if (nautilus_istr_has_prefix (uri, "eazel:") || nautilus_istr_has_prefix (uri, "eazel-services:")) {
+	if (eel_istr_has_prefix (uri, "eazel:") || eel_istr_has_prefix (uri, "eazel-services:")) {
 		icon_path = nautilus_theme_get_image_path ("big_services_icon.png");
-	} else if (nautilus_istr_has_prefix (uri, "http:")) {
+	} else if (eel_istr_has_prefix (uri, "http:")) {
 		icon_path = nautilus_theme_get_image_path ("i-web-72.png");
-	} else if (nautilus_istr_has_prefix (uri, "man:")) {
+	} else if (eel_istr_has_prefix (uri, "man:")) {
 		icon_path = nautilus_theme_get_image_path ("manual.png");
-	} else if (nautilus_istr_has_prefix (uri, "hardware:")) {
+	} else if (eel_istr_has_prefix (uri, "hardware:")) {
 		icon_path = nautilus_theme_get_image_path ("computer.svg");
 	}
 
@@ -446,7 +446,7 @@ update_icon (NautilusSidebarTitle *sidebar_title)
 	}
 
 	if (!leave_pixbuf_unchanged) {
-		nautilus_image_set_pixbuf (NAUTILUS_IMAGE (sidebar_title->details->icon), pixbuf);
+		eel_image_set_pixbuf (EEL_IMAGE (sidebar_title->details->icon), pixbuf);
 	}
 }
 
@@ -462,11 +462,11 @@ update_font (NautilusSidebarTitle *sidebar_title)
 	GdkFont *bold_template_font;
 	GdkFont *largest_fitting_font;
 	int largest_fitting_smooth_font_size;
-	NautilusScalableFont *smooth_font;
+	EelScalableFont *smooth_font;
 	char *font_name;
 
 	/* Make sure theres work to do */
-	if (nautilus_strlen (sidebar_title->details->title_text) < 1) {
+	if (eel_strlen (sidebar_title->details->title_text) < 1) {
 		return;
 	}
 
@@ -479,15 +479,15 @@ update_font (NautilusSidebarTitle *sidebar_title)
 	
 	/* Update the smooth font */
 	smooth_font = nautilus_global_preferences_get_default_smooth_font ();
-	largest_fitting_smooth_font_size = nautilus_scalable_font_largest_fitting_font_size
+	largest_fitting_smooth_font_size = eel_scalable_font_largest_fitting_font_size
 		(smooth_font,
 		 sidebar_title->details->title_text,
 		 available_width,
 		 minimum_acceptable_font_size,
 		 maximum_acceptable_font_size);
 	
-	nautilus_label_set_smooth_font (NAUTILUS_LABEL (sidebar_title->details->title_label), smooth_font);
-	nautilus_label_set_smooth_font_size (NAUTILUS_LABEL (sidebar_title->details->title_label), largest_fitting_smooth_font_size);
+	eel_label_set_smooth_font (EEL_LABEL (sidebar_title->details->title_label), smooth_font);
+	eel_label_set_smooth_font_size (EEL_LABEL (sidebar_title->details->title_label), largest_fitting_smooth_font_size);
 	
 	gtk_object_unref (GTK_OBJECT (smooth_font));
 
@@ -497,9 +497,9 @@ update_font (NautilusSidebarTitle *sidebar_title)
 	g_free (font_name);
 	g_assert (template_font != NULL);
 
-	bold_template_font = nautilus_gdk_font_get_bold (template_font);
+	bold_template_font = eel_gdk_font_get_bold (template_font);
 	
-	largest_fitting_font = nautilus_gdk_font_get_largest_fitting
+	largest_fitting_font = eel_gdk_font_get_largest_fitting
 		(template_font,
 		 sidebar_title->details->title_text,
 		 available_width,
@@ -507,10 +507,10 @@ update_font (NautilusSidebarTitle *sidebar_title)
 		 maximum_acceptable_font_size);
 	
 	if (largest_fitting_font == NULL) {
-		largest_fitting_font = nautilus_gdk_font_get_fixed ();
+		largest_fitting_font = eel_gdk_font_get_fixed ();
 	}
 	
-	nautilus_gtk_widget_set_font (sidebar_title->details->title_label,
+	eel_gtk_widget_set_font (sidebar_title->details->title_label,
 				      largest_fitting_font);
 	
 	gdk_font_unref (largest_fitting_font);
@@ -522,7 +522,7 @@ static void
 update_title (NautilusSidebarTitle *sidebar_title)
 {
 	/* FIXME bugzilla.eazel.com 2500: We could defer showing the title until the icon is ready. */
-	if (nautilus_label_set_text (NAUTILUS_LABEL (sidebar_title->details->title_label),
+	if (eel_label_set_text (EEL_LABEL (sidebar_title->details->title_label),
 				     sidebar_title->details->title_text)) {
 		update_font (sidebar_title);
 	}
@@ -590,7 +590,7 @@ update_more_info (NautilusSidebarTitle *sidebar_title)
 		g_string_append_c (info_string, '\0');
 	}
 
-	nautilus_label_set_text (NAUTILUS_LABEL (sidebar_title->details->more_info_label),
+	eel_label_set_text (EEL_LABEL (sidebar_title->details->more_info_label),
 				 info_string->str);
 
 	g_string_free (info_string, TRUE);
@@ -602,8 +602,8 @@ add_emblem (NautilusSidebarTitle *sidebar_title, GdkPixbuf *pixbuf)
 {
 	GtkWidget *image_widget;
 
-	image_widget = nautilus_image_new_with_background (NULL);
-	nautilus_image_set_pixbuf (NAUTILUS_IMAGE (image_widget), pixbuf);	
+	image_widget = eel_image_new_with_background (NULL);
+	eel_image_set_pixbuf (EEL_IMAGE (image_widget), pixbuf);	
   	gtk_widget_show (image_widget);
 	gtk_container_add (GTK_CONTAINER (sidebar_title->details->emblem_box), image_widget);	
 }
@@ -645,7 +645,7 @@ update_emblems (NautilusSidebarTitle *sidebar_title)
 		}
 	}
 	
-	nautilus_scalable_icon_list_free (icons);
+	eel_scalable_icon_list_free (icons);
 }
 
 static void
@@ -750,7 +750,7 @@ nautilus_sidebar_title_size_allocate (GtkWidget *widget,
 
 	old_width = widget->allocation.width;
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
 
 	if (old_width != widget->allocation.width) {
 		/* Need to update the font if the width changes. */
@@ -763,7 +763,7 @@ nautilus_sidebar_title_hit_test_icon (NautilusSidebarTitle *sidebar_title, int x
 {
 	g_return_val_if_fail (NAUTILUS_IS_SIDEBAR_TITLE (sidebar_title), FALSE);
 
-	return nautilus_point_in_widget (sidebar_title->details->icon, x, y);
+	return eel_point_in_widget (sidebar_title->details->icon, x, y);
 }
 
 static GtkWidget *
@@ -771,10 +771,10 @@ sidebar_title_create_title_label (void)
 { 
 	GtkWidget *title_label;
 
-	title_label = nautilus_label_new_with_background ("");
-	nautilus_label_make_bold (NAUTILUS_LABEL (title_label));
-	nautilus_label_set_wrap (NAUTILUS_LABEL (title_label), TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (title_label), GTK_JUSTIFY_CENTER);
+	title_label = eel_label_new_with_background ("");
+	eel_label_make_bold (EEL_LABEL (title_label));
+	eel_label_set_wrap (EEL_LABEL (title_label), TRUE);
+	eel_label_set_justify (EEL_LABEL (title_label), GTK_JUSTIFY_CENTER);
 
 	return title_label;
 }
@@ -784,9 +784,9 @@ sidebar_title_create_more_info_label (void)
 {
 	GtkWidget *more_info_label;
 
-	more_info_label = nautilus_label_new_with_background ("");
-	nautilus_label_make_smaller (NAUTILUS_LABEL (more_info_label), 2);
-	nautilus_label_set_justify (NAUTILUS_LABEL (more_info_label), GTK_JUSTIFY_CENTER);
+	more_info_label = eel_label_new_with_background ("");
+	eel_label_make_smaller (EEL_LABEL (more_info_label), 2);
+	eel_label_set_justify (EEL_LABEL (more_info_label), GTK_JUSTIFY_CENTER);
 	
 	return more_info_label;
 }
diff --git a/src/nautilus-sidebar.c b/src/nautilus-sidebar.c
index 01250208b..0b9b0fea9 100644
--- a/src/nautilus-sidebar.c
+++ b/src/nautilus-sidebar.c
@@ -46,24 +46,24 @@
 #include <libgnomevfs/gnome-vfs-types.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-directory.h>
 #include <libnautilus-extensions/nautilus-drag.h>
 #include <libnautilus-extensions/nautilus-file.h>
 #include <libnautilus-extensions/nautilus-file-operations.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-keep-last-vertical-box.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-mime-actions.h>
 #include <libnautilus-extensions/nautilus-preferences.h>
 #include <libnautilus-extensions/nautilus-program-choosing.h>
 #include <libnautilus-extensions/nautilus-sidebar-functions.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-theme.h>
 #include <libnautilus-extensions/nautilus-trash-monitor.h>
 #include <math.h>
@@ -160,7 +160,7 @@ typedef enum {
 } SidebarPart;
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSidebar, nautilus_sidebar, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusSidebar, nautilus_sidebar, GTK_TYPE_EVENT_BOX)
 
 /* initializing the class object by installing the operations we override */
 static void
@@ -280,7 +280,7 @@ nautilus_sidebar_initialize (GtkObject *object)
 	/* prepare ourselves to receive dropped objects */
 	gtk_drag_dest_set (GTK_WIDGET (sidebar),
 			   GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, 
-			   target_table, NAUTILUS_N_ELEMENTS (target_table),
+			   target_table, EEL_N_ELEMENTS (target_table),
 			   GDK_ACTION_COPY | GDK_ACTION_MOVE);
 }
 
@@ -311,18 +311,18 @@ nautilus_sidebar_destroy (GtkObject *object)
 					      sidebar);
 
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* callback to handle resetting the background */
 static void
 reset_background_callback (GtkWidget *menu_item, GtkWidget *sidebar)
 {
-	NautilusBackground *background;
+	EelBackground *background;
 
-	background = nautilus_get_widget_background(sidebar);
+	background = eel_get_widget_background(sidebar);
 	if (background != NULL) { 
-		nautilus_background_reset (background); 
+		eel_background_reset (background); 
 	}
 }
 
@@ -357,7 +357,7 @@ nautilus_sidebar_active_panel_matches_id_or_is_damaged (NautilusSidebar *sidebar
 	if (current_iid == NULL) {
 		return TRUE;
 	}
-	return nautilus_strcmp (current_iid, id) == 0;	
+	return eel_strcmp (current_iid, id) == 0;	
 }
 
 /* if the active panel matches the passed in id, hide it. */
@@ -513,10 +513,10 @@ GtkWidget *
 nautilus_sidebar_create_context_menu (NautilusSidebar *sidebar)
 {
 	GtkWidget *menu, *menu_item;
-	NautilusBackground *background;
+	EelBackground *background;
 	gboolean has_background;
 
-	background = nautilus_get_widget_background (GTK_WIDGET(sidebar));
+	background = eel_get_widget_background (GTK_WIDGET(sidebar));
 	has_background = background && !nautilus_sidebar_background_is_default (sidebar);
 	
 	menu = gtk_menu_new ();
@@ -550,9 +550,9 @@ static char*
 map_local_data_file (char *file_name)
 {
 	char *temp_str;
-	if (file_name && !nautilus_istr_has_prefix (file_name, "file://")) {
+	if (file_name && !eel_istr_has_prefix (file_name, "file://")) {
 
-		if (nautilus_str_has_prefix (file_name, "./")) {
+		if (eel_str_has_prefix (file_name, "./")) {
 			temp_str = nautilus_theme_get_image_path (file_name + 2);
 		} else {
 			temp_str = g_strdup_printf ("%s/%s", NAUTILUS_DATADIR, file_name);
@@ -613,11 +613,11 @@ static SidebarPart
 hit_test (NautilusSidebar *sidebar,
 	  int x, int y)
 {
-	if (nautilus_point_in_widget (GTK_WIDGET (sidebar->details->sidebar_tabs), x, y)) {
+	if (eel_point_in_widget (GTK_WIDGET (sidebar->details->sidebar_tabs), x, y)) {
 		return TABS_PART;
 	}
 	
-	if (nautilus_point_in_widget (GTK_WIDGET (sidebar->details->title_tab), x, y)) {
+	if (eel_point_in_widget (GTK_WIDGET (sidebar->details->title_tab), x, y)) {
 		return TITLE_TAB_PART;
 	}
 	
@@ -625,7 +625,7 @@ hit_test (NautilusSidebar *sidebar,
 		return ICON_PART;
 	}
 	
-	if (nautilus_point_in_widget (GTK_WIDGET (sidebar), x, y)) {
+	if (eel_point_in_widget (GTK_WIDGET (sidebar), x, y)) {
 		return BACKGROUND_PART;
 	}
 
@@ -674,8 +674,8 @@ receive_dropped_uri_list (NautilusSidebar *sidebar,
 		 * Other views handle background images differently from other URIs.
 		 */
 		if (exactly_one && uri_is_local_image (uris[0])) {
-			nautilus_background_receive_dropped_background_image
-				(nautilus_get_widget_background (GTK_WIDGET (sidebar)),
+			eel_background_receive_dropped_background_image
+				(eel_get_widget_background (GTK_WIDGET (sidebar)),
 				 uris[0]);
 		} else if (exactly_one) {
 			gtk_signal_emit (GTK_OBJECT (sidebar),
@@ -690,7 +690,7 @@ receive_dropped_uri_list (NautilusSidebar *sidebar,
 		/* handle images dropped on the logo specially */
 		
 		if (!exactly_one) {
-			nautilus_show_error_dialog (
+			eel_show_error_dialog (
 				_("You can't assign more than one custom icon at a time! "
 				  "Please drag just one image to set a custom icon."), 
 				_("More Than One Image"),
@@ -711,14 +711,14 @@ receive_dropped_uri_list (NautilusSidebar *sidebar,
 			}
 		} else {	
 			if (nautilus_is_remote_uri (uris[0])) {
-				nautilus_show_error_dialog (
+				eel_show_error_dialog (
 					_("The file that you dropped is not local.  "
 					  "You can only use local images as custom icons."), 
 					_("Local Images Only"),
 					window);
 			
 			} else {
-				nautilus_show_error_dialog (
+				eel_show_error_dialog (
 					_("The file that you dropped is not an image.  "
 					  "You can only use local images as custom icons."),
 					_("Images Only"),
@@ -798,8 +798,8 @@ receive_dropped_color (NautilusSidebar *sidebar,
 	case ICON_PART:
 	case BACKGROUND_PART:
 		/* Let the background change based on the dropped color. */
-		nautilus_background_receive_dropped_color
-			(nautilus_get_widget_background (GTK_WIDGET (sidebar)),
+		eel_background_receive_dropped_color
+			(eel_get_widget_background (GTK_WIDGET (sidebar)),
 			 GTK_WIDGET (sidebar), x, y, selection_data);
 		break;
 	}
@@ -1044,9 +1044,9 @@ nautilus_sidebar_press_event (GtkWidget *widget, GdkEventButton *event)
 	/* handle the context menu */
 	if (event->button == CONTEXTUAL_MENU_BUTTON) {
 		menu = nautilus_sidebar_create_context_menu (sidebar);	
-		nautilus_pop_up_context_menu (GTK_MENU(menu),
-				      NAUTILUS_DEFAULT_POPUP_MENU_DISPLACEMENT,
-				      NAUTILUS_DEFAULT_POPUP_MENU_DISPLACEMENT,
+		eel_pop_up_context_menu (GTK_MENU(menu),
+				      EEL_DEFAULT_POPUP_MENU_DISPLACEMENT,
+				      EEL_DEFAULT_POPUP_MENU_DISPLACEMENT,
 				      event);
 	}	
 	return TRUE;
@@ -1105,12 +1105,12 @@ nautilus_sidebar_release_event (GtkWidget *widget, GdkEventButton *event)
 /* Handle the background changed signal by writing out the settings to metadata.
  */
 static void
-background_settings_changed_callback (NautilusBackground *background, NautilusSidebar *sidebar)
+background_settings_changed_callback (EelBackground *background, NautilusSidebar *sidebar)
 {
 	char *image;
 	char *color;
 
-	g_assert (NAUTILUS_IS_BACKGROUND (background));
+	g_assert (EEL_IS_BACKGROUND (background));
 	g_assert (NAUTILUS_IS_SIDEBAR (sidebar));
 
 	if (sidebar->details->file == NULL) {
@@ -1123,8 +1123,8 @@ background_settings_changed_callback (NautilusBackground *background, NautilusSi
 					  background_metadata_changed_callback,
 					  sidebar);
 
-	color = nautilus_background_get_color (background);
-	image = nautilus_background_get_image_uri (background);
+	color = eel_background_get_color (background);
+	image = eel_background_get_image_uri (background);
 	
 	nautilus_file_set_metadata (sidebar->details->file,
 				    NAUTILUS_METADATA_KEY_SIDEBAR_BACKGROUND_COLOR,
@@ -1147,9 +1147,9 @@ background_settings_changed_callback (NautilusBackground *background, NautilusSi
 /* handle the background reset signal by writing out NULL to metadata and setting the backgrounds
    fields to their default values */
 static void
-background_reset_callback (NautilusBackground *background, NautilusSidebar *sidebar)
+background_reset_callback (EelBackground *background, NautilusSidebar *sidebar)
 {
-	g_assert (NAUTILUS_IS_BACKGROUND (background));
+	g_assert (EEL_IS_BACKGROUND (background));
 	g_assert (NAUTILUS_IS_SIDEBAR (sidebar));
 
 	if (sidebar->details->file == NULL) {
@@ -1299,12 +1299,12 @@ add_command_buttons (NautilusSidebar *sidebar, GList *application_list)
 			file_path = g_strdup (sidebar->details->uri);
 		} 
 
-		temp_str = nautilus_shell_quote (file_path);		
+		temp_str = eel_shell_quote (file_path);		
 		id_string = g_strdup_printf (application->id, temp_str); 		
 		g_free (file_path);
 		g_free (temp_str);
 
-		nautilus_gtk_signal_connect_free_data 
+		eel_gtk_signal_connect_free_data 
 			(GTK_OBJECT (temp_button), "clicked",
 			 GTK_SIGNAL_FUNC (command_button_callback), id_string);
 
@@ -1358,7 +1358,7 @@ add_buttons_from_metadata (NautilusSidebar *sidebar, const char *button_data)
 					command_string = g_strdup (temp_str + 1);
 					g_free (button_name);
 					
-					nautilus_gtk_signal_connect_free_data 
+					eel_gtk_signal_connect_free_data 
 						(GTK_OBJECT (temp_button), "clicked",
 						 GTK_SIGNAL_FUNC (metadata_button_callback), command_string);
 		                	gtk_object_set_user_data (GTK_OBJECT (temp_button), sidebar);
@@ -1419,7 +1419,7 @@ nautilus_sidebar_update_buttons (NautilusSidebar *sidebar)
 
 	/* here is a hack to provide an "empty trash" button when displaying the trash.  Eventually, we
 	 * need a framework to allow protocols to add commands buttons */
-	if (nautilus_istr_has_prefix (sidebar->details->uri, "trash:")) {
+	if (eel_istr_has_prefix (sidebar->details->uri, "trash:")) {
 		/* FIXME: We don't use spaces to pad labels! */
 		temp_button = gtk_button_new_with_label (_("  Empty Trash  "));		    
 		gtk_box_pack_start (GTK_BOX (sidebar->details->button_box), 
@@ -1462,7 +1462,7 @@ nautilus_sidebar_update_buttons (NautilusSidebar *sidebar)
 static void
 nautilus_sidebar_update_appearance (NautilusSidebar *sidebar)
 {
-	NautilusBackground *background;
+	EelBackground *background;
 	char *color_spec;
 	char *background_color;
 	char *background_image;
@@ -1470,7 +1470,7 @@ nautilus_sidebar_update_appearance (NautilusSidebar *sidebar)
 	g_return_if_fail (NAUTILUS_IS_SIDEBAR (sidebar));
 	
 	/* Connect the background changed signal to code that writes the color. */
-	background = nautilus_get_widget_background (GTK_WIDGET (sidebar));
+	background = eel_get_widget_background (GTK_WIDGET (sidebar));
 	if (!sidebar->details->background_connected) {
 		sidebar->details->background_connected = TRUE;
 		gtk_signal_connect (GTK_OBJECT (background),
@@ -1502,8 +1502,8 @@ nautilus_sidebar_update_appearance (NautilusSidebar *sidebar)
 					  background_settings_changed_callback,
 					  sidebar);
 
-	nautilus_background_set_image_uri (background, background_image);
-	nautilus_background_set_color (background, background_color);
+	eel_background_set_image_uri (background, background_image);
+	eel_background_set_color (background, background_color);
 
 	g_free (background_color);
 	g_free (background_image);
@@ -1559,7 +1559,7 @@ nautilus_sidebar_set_uri (NautilusSidebar *sidebar,
 	g_return_if_fail (initial_title != NULL);
 
 	/* there's nothing to do if the uri is the same as the current one */ 
-	if (nautilus_strcmp (sidebar->details->uri, new_uri) == 0) {
+	if (eel_strcmp (sidebar->details->uri, new_uri) == 0) {
 		return;
 	}
 	
@@ -1614,7 +1614,7 @@ nautilus_sidebar_size_allocate (GtkWidget *widget,
 {
 	NautilusSidebar *sidebar = NAUTILUS_SIDEBAR(widget);
 	
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
 	
 	/* remember the size if it changed */
 	
@@ -1631,7 +1631,7 @@ nautilus_sidebar_realize (GtkWidget *widget)
 	g_return_if_fail (NAUTILUS_IS_SIDEBAR (widget));
 	
 	/* Superclass does the actual realize */
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
 	
 	/* Tell X not to erase the window contents when resizing */
 	gdk_window_set_static_gravities (widget->window, TRUE);
diff --git a/src/nautilus-signaller.c b/src/nautilus-signaller.c
index c47d41053..403830f2d 100644
--- a/src/nautilus-signaller.c
+++ b/src/nautilus-signaller.c
@@ -30,7 +30,7 @@
 #include "nautilus-signaller.h"
 
 #include <gtk/gtksignal.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 
 typedef GtkObject NautilusSignaller;
 typedef GtkObjectClass NautilusSignallerClass;
@@ -50,7 +50,7 @@ static void    nautilus_signaller_initialize_class (gpointer klass);
 static void    nautilus_signaller_initialize       (gpointer object,
 						    gpointer klass);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSignaller,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusSignaller,
 				   nautilus_signaller,
 				   GTK_TYPE_OBJECT)
 
diff --git a/src/nautilus-simple-search-bar.c b/src/nautilus-simple-search-bar.c
index eef7d95fe..3b5256f5f 100644
--- a/src/nautilus-simple-search-bar.c
+++ b/src/nautilus-simple-search-bar.c
@@ -34,10 +34,10 @@
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus/nautilus-clipboard.h>
 #include <libnautilus-extensions/nautilus-entry.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-search-uri.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-undo-signal-handlers.h>
 #include <stdio.h>
 
@@ -58,7 +58,7 @@ static void  nautilus_simple_search_bar_initialize_class         (NautilusSimple
 static void  nautilus_simple_search_bar_initialize               (NautilusSimpleSearchBar      *bar);
 static void  nautilus_simple_search_bar_destroy 	 	 (GtkObject 		       *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSimpleSearchBar,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusSimpleSearchBar,
 				   nautilus_simple_search_bar,
 				   NAUTILUS_TYPE_SEARCH_BAR)
 
@@ -79,7 +79,7 @@ search_text_is_invalid (NautilusSimpleSearchBar *bar)
 	gboolean is_empty;
 
 	user_text = gtk_editable_get_chars (GTK_EDITABLE (bar->details->entry), 0, -1);
-	is_empty = nautilus_str_is_empty (user_text);
+	is_empty = eel_str_is_empty (user_text);
 	g_free (user_text);
 
 	return is_empty;
@@ -110,7 +110,7 @@ nautilus_simple_search_bar_destroy (GtkObject *object)
 
 	g_free (bar->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 GtkWidget *
@@ -137,7 +137,7 @@ nautilus_simple_search_bar_new (NautilusWindow *window)
 		 TRUE);
 	
 	gtk_signal_connect_object (GTK_OBJECT (bar->details->entry), "activate",
-				   nautilus_gtk_button_auto_click, 
+				   eel_gtk_button_auto_click, 
 				   GTK_OBJECT (bar->details->find_button));
 	gtk_signal_connect_object (GTK_OBJECT (bar->details->entry), "changed",
 				   update_simple_find_button_state, GTK_OBJECT (bar));
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index a565562dc..9fceb61de 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -60,19 +60,19 @@
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
 #include <libnautilus-extensions/nautilus-drag-window.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
 #include <libnautilus-extensions/nautilus-generous-bin.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-horizontal-splitter.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-mime-actions.h>
 #include <libnautilus-extensions/nautilus-program-choosing.h>
 #include <libnautilus-extensions/nautilus-sidebar-functions.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
 #include <libnautilus/nautilus-clipboard.h>
 #include <libnautilus/nautilus-undo.h>
@@ -127,7 +127,7 @@ static void nautilus_window_show                   (GtkWidget           *widget)
 static void cancel_view_as_callback                (NautilusWindow      *window);
 static void real_add_current_location_to_history_list (NautilusWindow   *window);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusWindow,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusWindow,
 				   nautilus_window,
 				   BONOBO_TYPE_WINDOW)
 
@@ -178,7 +178,7 @@ nautilus_window_initialize_class (NautilusWindowClass *klass)
                 if (pixbuf != NULL) {
                         gdk_pixbuf_render_pixmap_and_mask
 				(pixbuf, &mini_icon_pixmap, &mini_icon_mask,
-				 NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
+				 EEL_STANDARD_ALPHA_THRESHHOLD);
 			gdk_pixbuf_unref (pixbuf);
 			g_atexit (unref_mini_icon);
 		}
@@ -561,7 +561,7 @@ menu_bar_no_resize_hack (NautilusWindow *window)
 	
 	menu_bar = NULL;
 	
-	nautilus_gtk_container_foreach_deep (GTK_CONTAINER (window),
+	eel_gtk_container_foreach_deep (GTK_CONTAINER (window),
 					     menu_bar_no_resize_hack_menu_bar_finder,
 					     &menu_bar);
 
@@ -920,8 +920,8 @@ nautilus_window_destroy (GtkObject *object)
 	nautilus_view_identifier_free (window->content_view_id);
 	
 	g_free (window->details->location);
-	nautilus_g_list_free_deep (window->details->selection);
-	nautilus_g_list_free_deep (window->details->pending_selection);
+	eel_g_list_free_deep (window->details->selection);
+	eel_g_list_free_deep (window->details->pending_selection);
 
 	nautilus_window_clear_back_list (window);
 	nautilus_window_clear_forward_list (window);
@@ -961,7 +961,7 @@ nautilus_window_destroy (GtkObject *object)
 
 	g_free (window->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (GTK_OBJECT (window)));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (GTK_OBJECT (window)));
 }
 
 static void
@@ -1021,11 +1021,11 @@ nautilus_window_realize (GtkWidget *widget)
 	char *filename;
 
         /* Create our GdkWindow */
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
 
         /* Set the mini icon */
 	if (mini_icon_pixmap != NULL) {
-		nautilus_set_mini_icon (widget->window, mini_icon_pixmap, mini_icon_mask);
+		eel_set_mini_icon (widget->window, mini_icon_pixmap, mini_icon_mask);
 	}
 
 	/* Set the maxi icon */
@@ -1050,7 +1050,7 @@ nautilus_window_size_request (GtkWidget		*widget,
 	g_return_if_fail (NAUTILUS_IS_WINDOW (widget));
 	g_return_if_fail (requisition != NULL);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_request, (widget, requisition));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_request, (widget, requisition));
 
 	/* Limit the requisition to be within 90% of the available screen 
 	 * real state.
@@ -1157,7 +1157,7 @@ replace_special_current_view_in_view_as_menu (NautilusWindow *window)
 	gtk_widget_ref (menu);
 	gtk_option_menu_remove_menu (GTK_OPTION_MENU (window->view_as_option_menu));
 
-	first_menu_item = nautilus_gtk_container_get_first_child (GTK_CONTAINER (menu));
+	first_menu_item = eel_gtk_container_get_first_child (GTK_CONTAINER (menu));
 	g_assert (first_menu_item != NULL);
 
 	if (GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (first_menu_item), "current content view"))) {
@@ -1428,7 +1428,7 @@ nautilus_window_go_up (NautilusWindow *window)
 	nautilus_window_open_location_with_selection (window, parent_uri_string, selection);
 	
 	g_free (parent_uri_string);
-	nautilus_g_list_free_deep (selection);
+	eel_g_list_free_deep (selection);
 }
 
 void
@@ -1574,7 +1574,7 @@ nautilus_send_history_list_changed (void)
 static void
 free_history_list (void)
 {
-	nautilus_gtk_object_list_free (history_list);
+	eel_gtk_object_list_free (history_list);
 	history_list = NULL;
 }
 
@@ -1660,21 +1660,21 @@ nautilus_window_add_current_location_to_history_list (NautilusWindow *window)
 {
 	g_assert (NAUTILUS_IS_WINDOW (window));
 
-	NAUTILUS_CALL_METHOD (NAUTILUS_WINDOW_CLASS, window,
+	EEL_CALL_METHOD (NAUTILUS_WINDOW_CLASS, window,
 			      add_current_location_to_history_list, (window));
 }
 
 void
 nautilus_window_clear_forward_list (NautilusWindow *window)
 {
-	nautilus_gtk_object_list_free (window->forward_list);
+	eel_gtk_object_list_free (window->forward_list);
 	window->forward_list = NULL;
 }
 
 void
 nautilus_window_clear_back_list (NautilusWindow *window)
 {
-	nautilus_gtk_object_list_free (window->back_list);
+	eel_gtk_object_list_free (window->back_list);
 	window->back_list = NULL;
 }
 
@@ -1996,7 +1996,7 @@ nautilus_window_show (GtkWidget *widget)
 
 	window = NAUTILUS_WINDOW (widget);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, show, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, show, (widget));
 	
 	/* Initially show or hide views based on preferences; once the window is displayed
 	 * these can be controlled on a per-window basis from View menu items. 
diff --git a/src/nautilus-spatial-window.h b/src/nautilus-spatial-window.h
index 0d02f0e9e..f17348f47 100644
--- a/src/nautilus-spatial-window.h
+++ b/src/nautilus-spatial-window.h
@@ -30,7 +30,7 @@
 #define NAUTILUS_WINDOW_H
 
 #include <bonobo/bonobo-win.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-bookmark.h>
 #include <libnautilus-extensions/nautilus-view-identifier.h>
 #include "nautilus-applicable-views.h"
diff --git a/src/nautilus-switchable-navigation-bar.c b/src/nautilus-switchable-navigation-bar.c
index c72efc679..933932d4c 100644
--- a/src/nautilus-switchable-navigation-bar.c
+++ b/src/nautilus-switchable-navigation-bar.c
@@ -38,9 +38,9 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-dock.h>
 #include <libnautilus-extensions/nautilus-directory.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-search-uri.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 #include <stdio.h>
 
 struct NautilusSwitchableNavigationBarDetails {
@@ -64,7 +64,7 @@ static void  nautilus_switchable_navigation_bar_initialize_class (NautilusSwitch
 static void  nautilus_switchable_navigation_bar_initialize       (NautilusSwitchableNavigationBar      *bar);
 static void  nautilus_switchable_navigation_bar_destroy 	 (GtkObject 			       *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSwitchableNavigationBar,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusSwitchableNavigationBar,
 				   nautilus_switchable_navigation_bar,
 				   NAUTILUS_TYPE_NAVIGATION_BAR)
 
@@ -110,7 +110,7 @@ static void
 nautilus_switchable_navigation_bar_destroy (GtkObject *object)
 {
 	g_free (NAUTILUS_SWITCHABLE_NAVIGATION_BAR (object)->details);
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 GtkWidget *
diff --git a/src/nautilus-switchable-search-bar.c b/src/nautilus-switchable-search-bar.c
index f37183528..e3d6d25c9 100644
--- a/src/nautilus-switchable-search-bar.c
+++ b/src/nautilus-switchable-search-bar.c
@@ -40,7 +40,7 @@
 #include <libgnomeui/gnome-uidefs.h>
 #include <libnautilus-extensions/nautilus-directory.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 
 static void		     real_activate				     (NautilusNavigationBar	       *bar);
 static void                  nautilus_switchable_search_bar_set_location     (NautilusNavigationBar            *bar,
@@ -55,7 +55,7 @@ static NautilusSearchBarMode nautilus_search_uri_to_search_bar_mode          (co
 static gboolean              nautilus_search_uri_is_displayable_by_mode      (const char *uri,
 									      NautilusSearchBarMode mode);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSwitchableSearchBar,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusSwitchableSearchBar,
 				   nautilus_switchable_search_bar,
 				   NAUTILUS_TYPE_SEARCH_BAR)
 
@@ -107,7 +107,7 @@ nautilus_switchable_search_bar_destroy (GtkObject *object)
 					      search_bar_preference_changed_callback,
 					      bar);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 GtkWidget *
diff --git a/src/nautilus-theme-selector.c b/src/nautilus-theme-selector.c
index 0a39e7fcb..c623b6b57 100644
--- a/src/nautilus-theme-selector.c
+++ b/src/nautilus-theme-selector.c
@@ -47,25 +47,25 @@
 #include <libgnomevfs/gnome-vfs-file-info.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-directory.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-file.h>
 #include <libnautilus-extensions/nautilus-font-factory.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-font-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-font-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
-#include <libnautilus-extensions/nautilus-scalable-font.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-scalable-font.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-theme.h>
-#include <libnautilus-extensions/nautilus-xml-extensions.h>
+#include <eel/eel-xml-extensions.h>
 #include <math.h>
 
 struct NautilusThemeSelectorDetails {
@@ -126,7 +126,7 @@ static void  set_help_label				(NautilusThemeSelector *theme_selector,
 
 static NautilusThemeSelector *main_theme_selector = NULL;
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusThemeSelector, nautilus_theme_selector, GTK_TYPE_WINDOW)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusThemeSelector, nautilus_theme_selector, GTK_TYPE_WINDOW)
 
 /* initializing the class object by installing the operations we override */
 static void
@@ -169,7 +169,7 @@ nautilus_theme_selector_initialize (GtkObject *object)
 	/* set the title and standard close accelerator */
 	gtk_window_set_title (GTK_WINDOW (widget), _("Nautilus Theme Selector"));
 	gtk_window_set_wmclass(GTK_WINDOW(widget), "theme_selector", "Nautilus");
-	nautilus_gtk_window_set_up_close_accelerator (GTK_WINDOW (widget));
+	eel_gtk_window_set_up_close_accelerator (GTK_WINDOW (widget));
 	
 	/* create the container box */  
   	theme_selector->details->container =  gtk_vbox_new (FALSE, 0);
@@ -196,18 +196,18 @@ nautilus_theme_selector_initialize (GtkObject *object)
   	gtk_container_add(GTK_CONTAINER(temp_frame), temp_hbox);
  	
 	/* add the title label */
-	theme_selector->details->title_label = nautilus_label_new (_("Nautilus Theme:"));
-	nautilus_label_make_larger (NAUTILUS_LABEL (theme_selector->details->title_label), 2);
-	nautilus_label_make_bold (NAUTILUS_LABEL (theme_selector->details->title_label));
+	theme_selector->details->title_label = eel_label_new (_("Nautilus Theme:"));
+	eel_label_make_larger (EEL_LABEL (theme_selector->details->title_label), 2);
+	eel_label_make_bold (EEL_LABEL (theme_selector->details->title_label));
 
   	gtk_widget_show(theme_selector->details->title_label);
 	gtk_box_pack_start (GTK_BOX(temp_hbox), theme_selector->details->title_label, FALSE, FALSE, 8);
  
  	/* add the help label */
-	theme_selector->details->help_label = nautilus_label_new ("");
+	theme_selector->details->help_label = eel_label_new ("");
 	set_help_label (theme_selector, FALSE);
-	nautilus_label_make_smaller (NAUTILUS_LABEL (theme_selector->details->help_label), 2);
-	nautilus_label_set_justify (NAUTILUS_LABEL (theme_selector->details->help_label), GTK_JUSTIFY_RIGHT);
+	eel_label_make_smaller (EEL_LABEL (theme_selector->details->help_label), 2);
+	eel_label_set_justify (EEL_LABEL (theme_selector->details->help_label), GTK_JUSTIFY_RIGHT);
   	
 	gtk_widget_show(theme_selector->details->help_label);
 	gtk_box_pack_end (GTK_BOX(temp_hbox), theme_selector->details->help_label, FALSE, FALSE, 8);
@@ -319,7 +319,7 @@ nautilus_theme_selector_destroy (GtkObject *object)
 
 	theme_selector = NAUTILUS_THEME_SELECTOR (object);
 		
-	nautilus_nullify_cancel (&theme_selector->details->dialog);
+	eel_nullify_cancel (&theme_selector->details->dialog);
 
 	g_free (theme_selector->details);
 
@@ -330,7 +330,7 @@ nautilus_theme_selector_destroy (GtkObject *object)
 	if (object == GTK_OBJECT (main_theme_selector))
 		main_theme_selector = NULL;
 		
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 
 }
 
@@ -356,7 +356,7 @@ nautilus_theme_selector_show (void)
 	if (main_theme_selector == NULL) {
 		main_theme_selector = nautilus_theme_selector_new ();
 	} else {
-		nautilus_gtk_window_present (GTK_WINDOW (main_theme_selector));
+		eel_gtk_window_present (GTK_WINDOW (main_theme_selector));
 	}	
 	gtk_clist_moveto (GTK_CLIST(main_theme_selector->details->theme_list), main_theme_selector ->details->selected_row, 0, 0.0, 0.0);		
 }
@@ -398,7 +398,7 @@ add_theme_to_icons (GtkWidget *widget, gpointer *data)
 	
 	if (!g_file_exists (xml_path)) {
 		char *message = g_strdup_printf (_("Sorry, but \"%s\" is not a valid theme folder."), theme_path);
-		nautilus_show_error_dialog (message, _("Couldn't add theme"), GTK_WINDOW (theme_selector));
+		eel_show_error_dialog (message, _("Couldn't add theme"), GTK_WINDOW (theme_selector));
 		g_free (message);
 	} else {
 		/* copy the theme directory into ~/.nautilus/themes.  First, create the themes directory if it doesn't exist */
@@ -427,7 +427,7 @@ add_theme_to_icons (GtkWidget *widget, gpointer *data)
 		
 		if (result != GNOME_VFS_OK) {
 			char *message = g_strdup_printf (_("Sorry, but the \"%s\" theme couldn't be installed."), theme_path);
-			nautilus_show_error_dialog (message, _("Couldn't install theme"), GTK_WINDOW (theme_selector));
+			eel_show_error_dialog (message, _("Couldn't install theme"), GTK_WINDOW (theme_selector));
 			g_free (message);
 		
 		} else {	
@@ -463,7 +463,7 @@ add_new_theme_button_callback (GtkWidget *widget, NautilusThemeSelector *theme_s
 			(_("Select a theme folder to add as a new theme:"));
 		file_dialog = GTK_FILE_SELECTION (theme_selector->details->dialog);
 		
-		nautilus_nullify_when_destroyed (&theme_selector->details->dialog);
+		eel_nullify_when_destroyed (&theme_selector->details->dialog);
 		
 		gtk_signal_connect (GTK_OBJECT (file_dialog->ok_button),
 				    "clicked",
@@ -491,7 +491,7 @@ remove_button_callback (GtkWidget *widget, NautilusThemeSelector *theme_selector
 	
 	theme_selector->details->remove_mode = TRUE;
 
-	nautilus_label_set_text (NAUTILUS_LABEL (theme_selector->details->help_label),
+	eel_label_set_text (EEL_LABEL (theme_selector->details->help_label),
 				 _("Click on a theme to remove it."));
 	gtk_label_set_text (GTK_LABEL (theme_selector->details->add_button_label),
 				 _("Cancel Remove"));
@@ -511,7 +511,7 @@ nautilus_theme_selector_highlight_by_name (NautilusThemeSelector *theme_selector
 	list = GTK_CLIST (theme_selector->details->theme_list);
 	for (index = 0; index < list->rows; index++) {
 		row_theme = gtk_clist_get_row_data (list, index);	
-		if (!nautilus_strcmp (row_theme, theme_name)) {			
+		if (!eel_strcmp (row_theme, theme_name)) {			
 			gtk_clist_select_row (list, index, 0);
 			theme_selector->details->selected_row = index ;
 			return;
@@ -538,10 +538,10 @@ static void
 set_help_label (NautilusThemeSelector *theme_selector, gboolean remove_mode)
 {
 	if (remove_mode) {
-		nautilus_label_set_text (NAUTILUS_LABEL (theme_selector->details->help_label),
+		eel_label_set_text (EEL_LABEL (theme_selector->details->help_label),
 					_("Click on a theme to remove it."));	
 	} else {
-		nautilus_label_set_text (NAUTILUS_LABEL (theme_selector->details->help_label),
+		eel_label_set_text (EEL_LABEL (theme_selector->details->help_label),
 					_("Click on a theme to change the\n"
 					  "appearance of Nautilus."));	
 
@@ -579,10 +579,10 @@ theme_select_row_callback (GtkCList * clist, int row, int column, GdkEventButton
 		/* don't allow the current theme to be deleted */
 		current_theme = nautilus_theme_get_theme();	
 		
-		if (nautilus_strcmp (theme_name, current_theme) == 0) {
+		if (eel_strcmp (theme_name, current_theme) == 0) {
 			g_free (current_theme);
 			exit_remove_mode (theme_selector);
-			nautilus_show_error_dialog (_("Sorry, but you can't remove the current theme. "
+			eel_show_error_dialog (_("Sorry, but you can't remove the current theme. "
 						      "Please change to another theme before removing this one."),
 				                    _("Can't delete current theme"),
 				                    GTK_WINDOW (theme_selector));
@@ -605,7 +605,7 @@ theme_select_row_callback (GtkCList * clist, int row, int column, GdkEventButton
 		gnome_vfs_uri_list_free (uri_list);
 				   
 		if (result != GNOME_VFS_OK) {
-			nautilus_show_error_dialog (_("Sorry, but that theme could not be removed!"), 
+			eel_show_error_dialog (_("Sorry, but that theme could not be removed!"), 
 					            _("Couldn't remove theme"), GTK_WINDOW (theme_selector));
 		
 		}
@@ -694,12 +694,12 @@ get_theme_description_and_display_name (const char *theme_name, const char *them
 		
 		if (theme_document != NULL) {
 			/* fetch the description, if any */		
-			temp_str = nautilus_xml_get_property_translated (xmlDocGetRootElement (theme_document), "description");
+			temp_str = eel_xml_get_property_translated (xmlDocGetRootElement (theme_document), "description");
 			description_result = g_strdup (temp_str);
 			xmlFree (temp_str);
 			
 			if (theme_display_name) {
-				temp_str = nautilus_xml_get_property_translated (xmlDocGetRootElement (theme_document), "name");
+				temp_str = eel_xml_get_property_translated (xmlDocGetRootElement (theme_document), "name");
 				*theme_display_name = g_strdup (temp_str);
 				xmlFree (temp_str);
 			}
@@ -745,8 +745,8 @@ render_theme_name_and_description (GtkWidget *widget, const char *theme_name, co
 	/* allocate the fonts and measure the text so we know how big a pixmap to allocate */
 	gtk_widget_realize (widget);
 	style = widget->style;
-	big_font = nautilus_gdk_font_get_larger (style->font, 6);
-	small_font = nautilus_gdk_font_get_smaller (style->font, 3);
+	big_font = eel_gdk_font_get_larger (style->font, 6);
+	small_font = eel_gdk_font_get_smaller (style->font, 3);
 	big_height = gdk_text_height (big_font, theme_name, strlen (theme_name));	
 	small_height = gdk_text_height (small_font, theme_description, strlen (theme_description));	
 	description_height = big_height + small_height + 20;
@@ -755,7 +755,7 @@ render_theme_name_and_description (GtkWidget *widget, const char *theme_name, co
 	pixmap = gdk_pixmap_new (NULL, DESCRIPTION_WIDTH, description_height, visual->depth);	
 	
 	gc = gdk_gc_new (pixmap);
-	gdk_rgb_gc_set_foreground (gc, NAUTILUS_RGB_COLOR_WHITE);
+	gdk_rgb_gc_set_foreground (gc, EEL_RGB_COLOR_WHITE);
 	
 	gdk_draw_rectangle (pixmap, gc, TRUE,
 			    0, 0,
@@ -794,7 +794,7 @@ add_pixbuf_to_theme_list (GtkCList *list, int row, int column, GdkPixbuf *pixbuf
 	GdkPixmap *pixmap;
 	GdkBitmap *mask;
 	
-	gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
+	gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, EEL_STANDARD_ALPHA_THRESHHOLD);
 	gtk_clist_set_pixmap (list, row, column, pixmap ,mask);
 		
 	gdk_pixmap_unref (pixmap);
@@ -823,7 +823,7 @@ add_theme (NautilusThemeSelector *theme_selector,
 	
 	/* add a pixbuf to represent the theme graphically */
 	theme_pixbuf = nautilus_theme_make_selector (theme_name);
-	scaled_pixbuf = nautilus_gdk_pixbuf_scale_down_to_fit (theme_pixbuf, 70, 48);
+	scaled_pixbuf = eel_gdk_pixbuf_scale_down_to_fit (theme_pixbuf, 70, 48);
 	gdk_pixbuf_unref (theme_pixbuf);
 	add_pixbuf_to_theme_list (GTK_CLIST (theme_selector->details->theme_list), theme_index, 0, scaled_pixbuf);
 	gdk_pixbuf_unref (scaled_pixbuf);			
@@ -874,7 +874,7 @@ populate_list_with_themes_from_directory (NautilusThemeSelector *theme_selector,
 		current_file_info = element->data;
 		if ((current_file_info->type == GNOME_VFS_FILE_TYPE_DIRECTORY) && (current_file_info->name[0] != '.')) {
 			if (has_image_file (directory_uri, current_file_info->name, "i-directory" )) {
-				if (!nautilus_strcmp (current_theme, current_file_info->name)) {
+				if (!eel_strcmp (current_theme, current_file_info->name)) {
 					selected_index = *index;
 				}
 				theme_uri = nautilus_make_path (directory_uri, current_file_info->name);
diff --git a/src/nautilus-view-frame-corba.c b/src/nautilus-view-frame-corba.c
index d4b1208d4..323651026 100644
--- a/src/nautilus-view-frame-corba.c
+++ b/src/nautilus-view-frame-corba.c
@@ -36,7 +36,7 @@
 #include <gtk/gtksignal.h>
 #include <libnautilus/nautilus-bonobo-workarounds.h>
 #include <libnautilus/nautilus-view.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 
 typedef struct {
 	char *from_location;
@@ -122,7 +122,7 @@ impl_Nautilus_ViewFrame__destroy (BonoboObject *object,
 	
 	CORBA_exception_init (&ev);
 
-	nautilus_nullify_cancel (&servant->view);
+	eel_nullify_cancel (&servant->view);
 	object_id = PortableServer_POA_servant_to_id (bonobo_poa (), servant, &ev);
 	PortableServer_POA_deactivate_object (bonobo_poa (), object_id, &ev);
 	CORBA_free (object_id);
@@ -152,7 +152,7 @@ impl_Nautilus_ViewFrame__create (NautilusViewFrame *view, CORBA_Environment *ev)
 	gtk_signal_connect (GTK_OBJECT (bonobo_object), "destroy",
 			    GTK_SIGNAL_FUNC (impl_Nautilus_ViewFrame__destroy), servant);
 
-	nautilus_nullify_when_destroyed (&servant->view);
+	eel_nullify_when_destroyed (&servant->view);
   
 	return bonobo_object;
 }
@@ -160,7 +160,7 @@ impl_Nautilus_ViewFrame__create (NautilusViewFrame *view, CORBA_Environment *ev)
 static void
 list_free_deep_callback (gpointer callback_data)
 {
-	nautilus_g_list_free_deep (callback_data);
+	eel_g_list_free_deep (callback_data);
 }
 
 static void
@@ -171,7 +171,7 @@ free_location_plus_callback (gpointer callback_data)
 	location_plus = callback_data;
 	g_free (location_plus->from_location);
 	g_free (location_plus->location);
-	nautilus_g_list_free_deep (location_plus->selection);
+	eel_g_list_free_deep (location_plus->selection);
 	g_free (location_plus->title);
 	g_free (location_plus);
 }
diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c
index 4b67123c0..3c67e0045 100644
--- a/src/nautilus-view-frame.c
+++ b/src/nautilus-view-frame.c
@@ -40,8 +40,8 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-undo-manager.h>
 #include <libnautilus/nautilus-bonobo-workarounds.h>
 #include <libnautilus/nautilus-idle-queue.h>
@@ -112,7 +112,7 @@ static void send_history                         (NautilusViewFrame      *view);
 
 static guint signals[LAST_SIGNAL];
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusViewFrame,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusViewFrame,
 				   nautilus_view_frame,
 				   NAUTILUS_TYPE_GENEROUS_BIN)
 
@@ -183,7 +183,7 @@ nautilus_view_frame_initialize_class (NautilusViewFrameClass *klass)
 		 object_class->type,
 		 GTK_SIGNAL_OFFSET (NautilusViewFrameClass, 
 				    get_history_list),
-		 nautilus_gtk_marshal_POINTER__NONE,
+		 eel_gtk_marshal_POINTER__NONE,
 		 GTK_TYPE_POINTER, 0);
 	signals[GO_BACK] = gtk_signal_new
 		("go_back",
@@ -223,7 +223,7 @@ nautilus_view_frame_initialize_class (NautilusViewFrameClass *klass)
 		 object_class->type,
 		 GTK_SIGNAL_OFFSET (NautilusViewFrameClass, 
 				    open_location_force_new_window),
-		 nautilus_gtk_marshal_NONE__STRING_POINTER,
+		 eel_gtk_marshal_NONE__STRING_POINTER,
 		 GTK_TYPE_NONE, 2, GTK_TYPE_STRING, GTK_TYPE_POINTER);
 	signals[OPEN_LOCATION_IN_THIS_WINDOW] = gtk_signal_new
 		("open_location_in_this_window",
@@ -247,7 +247,7 @@ nautilus_view_frame_initialize_class (NautilusViewFrameClass *klass)
 		 object_class->type,
 		 GTK_SIGNAL_OFFSET (NautilusViewFrameClass, 
 				    report_location_change),
-		 nautilus_gtk_marshal_NONE__STRING_POINTER_STRING,
+		 eel_gtk_marshal_NONE__STRING_POINTER_STRING,
 		 GTK_TYPE_NONE, 3, GTK_TYPE_STRING, GTK_TYPE_POINTER, GTK_TYPE_STRING);
 	signals[REPORT_REDIRECT] = gtk_signal_new
 		("report_redirect",
@@ -255,7 +255,7 @@ nautilus_view_frame_initialize_class (NautilusViewFrameClass *klass)
 		 object_class->type,
 		 GTK_SIGNAL_OFFSET (NautilusViewFrameClass, 
 				    report_redirect),
-		 nautilus_gtk_marshal_NONE__STRING_STRING_POINTER_STRING,
+		 eel_gtk_marshal_NONE__STRING_STRING_POINTER_STRING,
 		 GTK_TYPE_NONE, 4, GTK_TYPE_STRING, GTK_TYPE_STRING, GTK_TYPE_POINTER, GTK_TYPE_STRING);
 	signals[TITLE_CHANGED] = gtk_signal_new
 		("title_changed",
@@ -373,7 +373,7 @@ nautilus_view_frame_destroy (GtkObject *object)
 	 */
 	view->details->state = VIEW_FRAME_FAILED;
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -390,7 +390,7 @@ nautilus_view_frame_finalize (GtkObject *object)
 	g_free (view->details->label);
 	g_free (view->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
 }
 
 static void
@@ -1355,7 +1355,7 @@ nautilus_view_frame_map (GtkWidget *view_as_widget)
 
 	view = NAUTILUS_VIEW_FRAME (view_as_widget);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, map, (view_as_widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, map, (view_as_widget));
 
 	if (view->details->control_frame != NULL) {
 		bonobo_control_frame_control_activate (view->details->control_frame);
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index f77c873b9..4dce98425 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -43,19 +43,19 @@
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
-#include <libnautilus-extensions/nautilus-debug.h>
+#include <eel/eel-debug.h>
 #include <libnautilus-extensions/nautilus-file.h>
 #include <libnautilus-extensions/nautilus-file-attributes.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-mime-actions.h>
 #include <libnautilus-extensions/nautilus-search-uri.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 
 /* FIXME bugzilla.eazel.com 1243: 
  * We should use inheritance instead of these special cases
@@ -116,14 +116,14 @@ change_selection (NautilusWindow *window,
         /* Sort list into canonical order and check if it's the same as
          * the selection we already have.
          */
-        sorted = nautilus_g_str_list_alphabetize (nautilus_g_str_list_copy (selection));
-        if (nautilus_g_str_list_equal (sorted, window->details->selection)) {
-                nautilus_g_list_free_deep (sorted);
+        sorted = eel_g_str_list_alphabetize (eel_g_str_list_copy (selection));
+        if (eel_g_str_list_equal (sorted, window->details->selection)) {
+                eel_g_list_free_deep (sorted);
                 return;
         }
 
         /* Store the new selection. */
-        nautilus_g_list_free_deep (window->details->selection);
+        eel_g_list_free_deep (window->details->selection);
         window->details->selection = sorted;
 
         /* Tell all the view frames about it, except the one that changed it. */
@@ -253,7 +253,7 @@ update_title (NautilusWindow *window)
         if (title[0] == '\0') {
 		window_set_title_with_time_stamp (window, _("Nautilus"));
         } else {
-                window_title = nautilus_str_middle_truncate (title, MAX_TITLE_LENGTH);
+                window_title = eel_str_middle_truncate (title, MAX_TITLE_LENGTH);
 		window_set_title_with_time_stamp (window, window_title);
                 g_free (window_title);
         }
@@ -680,7 +680,7 @@ get_topmost_nautilus_window (void)
         GList *window_list, *node;
         NautilusWindow *result;
 
-        window_list = nautilus_get_window_list_ordered_front_to_back ();
+        window_list = eel_get_window_list_ordered_front_to_back ();
 
         result = NULL;
         for (node = window_list; node != NULL; node = node->next) {
@@ -723,7 +723,7 @@ open_location (NautilusWindow *window,
                 if (target_window == window) {
                         create_new_window = TRUE;
                 } else {
-                        nautilus_gtk_window_present (GTK_WINDOW (target_window));
+                        eel_gtk_window_present (GTK_WINDOW (target_window));
                 }
         }
 
@@ -731,8 +731,8 @@ open_location (NautilusWindow *window,
                 target_window = nautilus_application_create_window (window->application);
         }
 
-	nautilus_g_list_free_deep (target_window->details->pending_selection);
-        target_window->details->pending_selection = nautilus_g_str_list_copy (new_selection);
+	eel_g_list_free_deep (target_window->details->pending_selection);
+        target_window->details->pending_selection = eel_g_str_list_copy (new_selection);
 
         begin_location_change (target_window, location,
                                NAUTILUS_LOCATION_CHANGE_STANDARD, 0);
@@ -817,7 +817,7 @@ report_content_view_failure_to_user_internal (NautilusWindow *window,
 
 	label = view_frame_get_label (view_frame);
 	message = g_strdup_printf (message, label);
-	nautilus_show_error_dialog (message, _("View Failed"), GTK_WINDOW (window));
+	eel_show_error_dialog (message, _("View Failed"), GTK_WINDOW (window));
 	g_free (label);
 }
 
@@ -908,7 +908,7 @@ set_to_pending_location_and_selection (NautilusWindow *window)
                                         window->details->pending_selection,
                                         NULL);
         
-        nautilus_g_list_free_deep (window->details->pending_selection);
+        eel_g_list_free_deep (window->details->pending_selection);
         window->details->pending_selection = NULL;
 }
 
@@ -1007,7 +1007,7 @@ report_sidebar_panel_failure_to_user (NautilusWindow *window, NautilusViewFrame
                          label);
         }
 
-	nautilus_show_error_dialog (message, _("Sidebar Panel Failed"), GTK_WINDOW (window));
+	eel_show_error_dialog (message, _("Sidebar Panel Failed"), GTK_WINDOW (window));
 
 	g_free (label);
 	g_free (message);
@@ -1135,7 +1135,7 @@ position_and_show_window_callback (NautilusFile *file,
 		geometry_string = nautilus_file_get_metadata 
 			(file, NAUTILUS_METADATA_KEY_WINDOW_GEOMETRY, NULL);
 		if (geometry_string != NULL) {
-			nautilus_gtk_window_set_initial_geometry_from_string 
+			eel_gtk_window_set_initial_geometry_from_string 
 				(GTK_WINDOW (window), 
 				 geometry_string,
 				 NAUTILUS_WINDOW_MIN_WIDTH, 
@@ -1154,7 +1154,7 @@ position_and_show_window_callback (NautilusFile *file,
 static gboolean
 just_one_window (void)
 {
-	return !nautilus_g_list_more_than_one_item
+	return !eel_g_list_more_than_one_item
                 (nautilus_application_get_window_list ());
 }
 
@@ -1212,7 +1212,7 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
 	 * though the dialog uses wrapped text, if the URI doesn't contain
 	 * white space then the text-wrapping code is too stupid to wrap it.
 	 */
-        uri_for_display = nautilus_str_middle_truncate
+        uri_for_display = eel_str_middle_truncate
                 (full_uri_for_display, MAX_URI_IN_DIALOG_LENGTH);
 	g_free (full_uri_for_display);
 
@@ -1260,7 +1260,7 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
                 /* Can't create a vfs_uri and get the method from that, because 
                  * gnome_vfs_uri_new might return NULL.
                  */
-                scheme_string = nautilus_str_get_prefix (location, ":");
+                scheme_string = eel_str_get_prefix (location, ":");
                 g_assert (scheme_string != NULL);  /* Shouldn't have gotten this error unless there's a : separator. */
                 error_message = g_strdup_printf (_("Couldn't display \"%s\", because Nautilus cannot handle %s: locations."),
                                                  uri_for_display, scheme_string);
@@ -1325,7 +1325,7 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
                  * happens when a new window cannot display its initial URI. 
                  */
 
-                dialog = nautilus_show_error_dialog (error_message, dialog_title, NULL);
+                dialog = eel_show_error_dialog (error_message, dialog_title, NULL);
                 
 		/* if this is the only window, we don't want to quit, so we redirect it to home */
 		if (just_one_window ()) {
@@ -1348,7 +1348,7 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
         } else {
                 /* Clean up state of already-showing window */
                 nautilus_window_allow_stop (window, FALSE);
-                nautilus_show_error_dialog (error_message, dialog_title, GTK_WINDOW (window));
+                eel_show_error_dialog (error_message, dialog_title, GTK_WINDOW (window));
 
                 /* Leave the location bar showing the bad location that the user
                  * typed (or maybe achieved by dragging or something). Many times
@@ -1801,7 +1801,7 @@ open_location_prefer_existing_window_callback (NautilusViewFrame *view,
                         existing_location = existing_window->details->location;
                 }
                 if (nautilus_uris_match (existing_location, location)) {
-                        nautilus_gtk_window_present (GTK_WINDOW (existing_window));
+                        eel_gtk_window_present (GTK_WINDOW (existing_window));
                         return;
                 }
         }
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 67c04e17b..5fcddf519 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -48,17 +48,17 @@
 #include <libgnomevfs/gnome-vfs-file-info.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
-#include <libnautilus-extensions/nautilus-debug.h>
+#include <eel/eel-debug.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-undo-manager.h>
-#include <libnautilus-extensions/nautilus-xml-extensions.h>
+#include <eel/eel-xml-extensions.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
 
 #ifdef ENABLE_PROFILER
@@ -358,7 +358,7 @@ forget_history_if_confirmed (NautilusWindow *window)
 				     "which locations you have visited?"));
 	}
 					   
-	dialog = nautilus_show_yes_no_dialog (prompt,
+	dialog = eel_show_yes_no_dialog (prompt,
 					      _("Forget History?"),
 					      _("Forget"),
 					      GNOME_STOCK_BUTTON_CANCEL,
@@ -366,7 +366,7 @@ forget_history_if_confirmed (NautilusWindow *window)
 	g_free (prompt);					 
 
 	gtk_signal_connect
-		(GTK_OBJECT (nautilus_gnome_dialog_get_button_by_index
+		(GTK_OBJECT (eel_gnome_dialog_get_button_by_index
 			     (dialog, GNOME_OK)),
 		 "clicked",
 		 nautilus_forget_history,
@@ -634,7 +634,7 @@ help_menu_about_nautilus_callback (BonoboUIComponent *component,
 		nautilus_about_update_authors (NAUTILUS_ABOUT (about));
 	}
 	
-	nautilus_gtk_window_present (GTK_WINDOW (about));
+	eel_gtk_window_present (GTK_WINDOW (about));
 }
 
 static void
@@ -789,14 +789,14 @@ show_bogus_bookmark_window (BookmarkHolder *holder)
 		prompt = g_strdup_printf (_("The location \"%s\" does not exist. Do you "
 					    "want to remove any bookmarks with this "
 					    "location from your list?"), uri_for_display);
-		dialog = nautilus_show_yes_no_dialog (prompt,
+		dialog = eel_show_yes_no_dialog (prompt,
 						      _("Bookmark for Nonexistent Location"),
 						      _("Remove"),
 						      GNOME_STOCK_BUTTON_CANCEL,
 						      GTK_WINDOW (holder->window));
 
-		nautilus_gtk_signal_connect_free_data
-			(GTK_OBJECT (nautilus_gnome_dialog_get_button_by_index
+		eel_gtk_signal_connect_free_data
+			(GTK_OBJECT (eel_gnome_dialog_get_button_by_index
 				     (dialog, GNOME_OK)),
 			 "clicked",
 			 remove_bookmarks_for_uri,
@@ -805,7 +805,7 @@ show_bogus_bookmark_window (BookmarkHolder *holder)
 		gnome_dialog_set_default (dialog, GNOME_CANCEL);
 	} else {
 		prompt = g_strdup_printf (_("The location \"%s\" no longer exists."), uri_for_display);
-		dialog = nautilus_show_info_dialog (prompt, _("Go to Nonexistent Location"), GTK_WINDOW (holder->window));
+		dialog = eel_show_info_dialog (prompt, _("Go to Nonexistent Location"), GTK_WINDOW (holder->window));
 	}
 
 	g_free (uri);
@@ -855,8 +855,8 @@ append_bookmark_to_menu (NautilusWindow *window,
 	 * instead of a string utility. (Like maybe escaping control characters.)
 	 */
 	raw_name = nautilus_bookmark_get_name (bookmark);
-	truncated_name = nautilus_truncate_text_for_menu_item (raw_name);
-	display_name = nautilus_str_double_underscores (truncated_name);
+	truncated_name = eel_truncate_text_for_menu_item (raw_name);
+	display_name = eel_str_double_underscores (truncated_name);
 	g_free (raw_name);
 	g_free (truncated_name);
 
@@ -984,7 +984,7 @@ create_menu_item_from_node (NautilusWindow *window,
 	} else if (strcmp (node->name, "separator") == 0) {
 		append_separator (window, menu_path);
 	} else if (strcmp (node->name, "folder") == 0) {
-		xml_folder_name = nautilus_xml_get_property_translated (node, "name");
+		xml_folder_name = eel_xml_get_property_translated (node, "name");
 		nautilus_bonobo_add_submenu (window->details->shell_ui, menu_path, xml_folder_name);
 
 		/* Construct path and make sure it is escaped properly */
@@ -992,7 +992,7 @@ create_menu_item_from_node (NautilusWindow *window,
 		sub_menu_path = g_strdup_printf ("%s/%s", menu_path, escaped_name);
 		g_free (escaped_name);
 				
-		for (node = nautilus_xml_get_children (node), sub_index = 0;
+		for (node = eel_xml_get_children (node), sub_index = 0;
 		     node != NULL;
 		     node = node->next, ++sub_index) {
 			create_menu_item_from_node (window, node, sub_menu_path, sub_index);
@@ -1024,7 +1024,7 @@ append_static_bookmarks (NautilusWindow *window, const char *menu_path)
 	doc = xmlParseFile (file_path);
 	g_free (file_path);
 
-	node = nautilus_xml_get_root_children (doc);
+	node = eel_xml_get_root_children (doc);
 	index = 0;
 
 	for (index = 0; node != NULL; node = node->next, ++index) {
@@ -1093,7 +1093,7 @@ add_bookmark_for_current_location (NautilusWindow *window)
 static void
 edit_bookmarks (NautilusWindow *window)
 {
-        nautilus_gtk_window_present
+        eel_gtk_window_present
 		(get_or_create_bookmarks_window (GTK_OBJECT (window)));
 }
 
diff --git a/src/nautilus-window-toolbars.c b/src/nautilus-window-toolbars.c
index ee054e76f..504d90d11 100644
--- a/src/nautilus-window-toolbars.c
+++ b/src/nautilus-window-toolbars.c
@@ -43,9 +43,9 @@
 #include <libnautilus-extensions/nautilus-bookmark.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-theme.h>
 
 static void
@@ -139,11 +139,11 @@ back_or_forward_button_pressed_callback (GtkWidget *widget,
 	g_assert (back || widget == get_forward_button (window));
 
 	if (event->button == 3) {
-		nautilus_pop_up_context_menu (
+		eel_pop_up_context_menu (
 			create_back_or_forward_menu (NAUTILUS_WINDOW (user_data),
 						     back),
-                        NAUTILUS_DEFAULT_POPUP_MENU_DISPLACEMENT,
-                        NAUTILUS_DEFAULT_POPUP_MENU_DISPLACEMENT,
+                        EEL_DEFAULT_POPUP_MENU_DISPLACEMENT,
+                        EEL_DEFAULT_POPUP_MENU_DISPLACEMENT,
                         event);
 
 		return TRUE;
@@ -187,7 +187,7 @@ get_file_name_from_icon_name (const char *icon_name, gboolean is_custom)
 		/* special case the "standard" theme which indicates using the stock gnome icons,
 		 * except for the custom ones, that are not present in stock
 		 */
-		if (!is_custom && nautilus_strcmp (icon_theme, "standard") == 0) {
+		if (!is_custom && eel_strcmp (icon_theme, "standard") == 0) {
 			g_free (icon_theme);
 			return NULL;
 		}
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index a565562dc..9fceb61de 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -60,19 +60,19 @@
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
 #include <libnautilus-extensions/nautilus-drag-window.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
 #include <libnautilus-extensions/nautilus-generous-bin.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-horizontal-splitter.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-mime-actions.h>
 #include <libnautilus-extensions/nautilus-program-choosing.h>
 #include <libnautilus-extensions/nautilus-sidebar-functions.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
 #include <libnautilus/nautilus-clipboard.h>
 #include <libnautilus/nautilus-undo.h>
@@ -127,7 +127,7 @@ static void nautilus_window_show                   (GtkWidget           *widget)
 static void cancel_view_as_callback                (NautilusWindow      *window);
 static void real_add_current_location_to_history_list (NautilusWindow   *window);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusWindow,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusWindow,
 				   nautilus_window,
 				   BONOBO_TYPE_WINDOW)
 
@@ -178,7 +178,7 @@ nautilus_window_initialize_class (NautilusWindowClass *klass)
                 if (pixbuf != NULL) {
                         gdk_pixbuf_render_pixmap_and_mask
 				(pixbuf, &mini_icon_pixmap, &mini_icon_mask,
-				 NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
+				 EEL_STANDARD_ALPHA_THRESHHOLD);
 			gdk_pixbuf_unref (pixbuf);
 			g_atexit (unref_mini_icon);
 		}
@@ -561,7 +561,7 @@ menu_bar_no_resize_hack (NautilusWindow *window)
 	
 	menu_bar = NULL;
 	
-	nautilus_gtk_container_foreach_deep (GTK_CONTAINER (window),
+	eel_gtk_container_foreach_deep (GTK_CONTAINER (window),
 					     menu_bar_no_resize_hack_menu_bar_finder,
 					     &menu_bar);
 
@@ -920,8 +920,8 @@ nautilus_window_destroy (GtkObject *object)
 	nautilus_view_identifier_free (window->content_view_id);
 	
 	g_free (window->details->location);
-	nautilus_g_list_free_deep (window->details->selection);
-	nautilus_g_list_free_deep (window->details->pending_selection);
+	eel_g_list_free_deep (window->details->selection);
+	eel_g_list_free_deep (window->details->pending_selection);
 
 	nautilus_window_clear_back_list (window);
 	nautilus_window_clear_forward_list (window);
@@ -961,7 +961,7 @@ nautilus_window_destroy (GtkObject *object)
 
 	g_free (window->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (GTK_OBJECT (window)));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (GTK_OBJECT (window)));
 }
 
 static void
@@ -1021,11 +1021,11 @@ nautilus_window_realize (GtkWidget *widget)
 	char *filename;
 
         /* Create our GdkWindow */
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
 
         /* Set the mini icon */
 	if (mini_icon_pixmap != NULL) {
-		nautilus_set_mini_icon (widget->window, mini_icon_pixmap, mini_icon_mask);
+		eel_set_mini_icon (widget->window, mini_icon_pixmap, mini_icon_mask);
 	}
 
 	/* Set the maxi icon */
@@ -1050,7 +1050,7 @@ nautilus_window_size_request (GtkWidget		*widget,
 	g_return_if_fail (NAUTILUS_IS_WINDOW (widget));
 	g_return_if_fail (requisition != NULL);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_request, (widget, requisition));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_request, (widget, requisition));
 
 	/* Limit the requisition to be within 90% of the available screen 
 	 * real state.
@@ -1157,7 +1157,7 @@ replace_special_current_view_in_view_as_menu (NautilusWindow *window)
 	gtk_widget_ref (menu);
 	gtk_option_menu_remove_menu (GTK_OPTION_MENU (window->view_as_option_menu));
 
-	first_menu_item = nautilus_gtk_container_get_first_child (GTK_CONTAINER (menu));
+	first_menu_item = eel_gtk_container_get_first_child (GTK_CONTAINER (menu));
 	g_assert (first_menu_item != NULL);
 
 	if (GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (first_menu_item), "current content view"))) {
@@ -1428,7 +1428,7 @@ nautilus_window_go_up (NautilusWindow *window)
 	nautilus_window_open_location_with_selection (window, parent_uri_string, selection);
 	
 	g_free (parent_uri_string);
-	nautilus_g_list_free_deep (selection);
+	eel_g_list_free_deep (selection);
 }
 
 void
@@ -1574,7 +1574,7 @@ nautilus_send_history_list_changed (void)
 static void
 free_history_list (void)
 {
-	nautilus_gtk_object_list_free (history_list);
+	eel_gtk_object_list_free (history_list);
 	history_list = NULL;
 }
 
@@ -1660,21 +1660,21 @@ nautilus_window_add_current_location_to_history_list (NautilusWindow *window)
 {
 	g_assert (NAUTILUS_IS_WINDOW (window));
 
-	NAUTILUS_CALL_METHOD (NAUTILUS_WINDOW_CLASS, window,
+	EEL_CALL_METHOD (NAUTILUS_WINDOW_CLASS, window,
 			      add_current_location_to_history_list, (window));
 }
 
 void
 nautilus_window_clear_forward_list (NautilusWindow *window)
 {
-	nautilus_gtk_object_list_free (window->forward_list);
+	eel_gtk_object_list_free (window->forward_list);
 	window->forward_list = NULL;
 }
 
 void
 nautilus_window_clear_back_list (NautilusWindow *window)
 {
-	nautilus_gtk_object_list_free (window->back_list);
+	eel_gtk_object_list_free (window->back_list);
 	window->back_list = NULL;
 }
 
@@ -1996,7 +1996,7 @@ nautilus_window_show (GtkWidget *widget)
 
 	window = NAUTILUS_WINDOW (widget);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, show, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, show, (widget));
 	
 	/* Initially show or hide views based on preferences; once the window is displayed
 	 * these can be controlled on a per-window basis from View menu items. 
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index 0d02f0e9e..f17348f47 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -30,7 +30,7 @@
 #define NAUTILUS_WINDOW_H
 
 #include <bonobo/bonobo-win.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-bookmark.h>
 #include <libnautilus-extensions/nautilus-view-identifier.h>
 #include "nautilus-applicable-views.h"
diff --git a/src/nautilus-zoom-control.c b/src/nautilus-zoom-control.c
index 6f04d9b6a..8e43a2ad3 100644
--- a/src/nautilus-zoom-control.c
+++ b/src/nautilus-zoom-control.c
@@ -39,10 +39,10 @@
 #include <gtk/gtkmenuitem.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-pixmap.h>
-#include <libnautilus-extensions/nautilus-graphic-effects.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-graphic-effects.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
@@ -115,7 +115,7 @@ void            draw_number		                 (GtkWidget *widget,
 /* button assignments */
 #define CONTEXTUAL_MENU_BUTTON 3
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusZoomControl, nautilus_zoom_control, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusZoomControl, nautilus_zoom_control, GTK_TYPE_EVENT_BOX)
 
 static void
 nautilus_zoom_control_initialize_class (NautilusZoomControlClass *zoom_control_class)
@@ -157,7 +157,7 @@ nautilus_zoom_control_initialize_class (NautilusZoomControlClass *zoom_control_c
 				object_class->type,
 				GTK_SIGNAL_OFFSET (NautilusZoomControlClass, 
 						   zoom_to_level),
-				nautilus_gtk_marshal_NONE__DOUBLE,
+				eel_gtk_marshal_NONE__DOUBLE,
 				GTK_TYPE_NONE,
 				1,
 				GTK_TYPE_DOUBLE);
@@ -177,7 +177,7 @@ nautilus_zoom_control_initialize_class (NautilusZoomControlClass *zoom_control_c
 static void 
 nautilus_zoom_control_destroy (GtkObject *object)
 {
-	nautilus_g_list_free_deep (NAUTILUS_ZOOM_CONTROL (object)->details->preferred_zoom_levels);
+	eel_g_list_free_deep (NAUTILUS_ZOOM_CONTROL (object)->details->preferred_zoom_levels);
 	NAUTILUS_ZOOM_CONTROL (object)->details->preferred_zoom_levels = NULL;
 
 	/* deallocate pixbufs */
@@ -189,7 +189,7 @@ nautilus_zoom_control_destroy (GtkObject *object)
 
 	g_free (NAUTILUS_ZOOM_CONTROL (object)->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static int
@@ -312,7 +312,7 @@ void draw_number (GtkWidget *widget, GdkRectangle *box)
 		
 		number_pixbuf = zoom_control->details->number_strip;
 		if (zoom_control->details->prelight_mode == PRELIGHT_CENTER) {
-			number_pixbuf = nautilus_create_spotlight_pixbuf (number_pixbuf);
+			number_pixbuf = eel_create_spotlight_pixbuf (number_pixbuf);
 		}
 		
 		while (*cur_char) {
@@ -358,7 +358,7 @@ draw_pixbuf_with_prelight (NautilusZoomControl *zoom_control, GdkPixbuf *pixbuf,
 	GdkPixbuf *temp_pixbuf;
 	temp_pixbuf = pixbuf;
 	if (zoom_control->details->prelight_mode == mode) {
-		temp_pixbuf = nautilus_create_spotlight_pixbuf (temp_pixbuf);
+		temp_pixbuf = eel_create_spotlight_pixbuf (temp_pixbuf);
 	}
 	draw_pixbuf (temp_pixbuf, GTK_WIDGET (zoom_control)->window, x_pos, y_pos + zoom_control->details->y_offset);
 	if (pixbuf != temp_pixbuf) {
@@ -647,9 +647,9 @@ nautilus_zoom_control_button_press_event (GtkWidget *widget, GdkEventButton *eve
 	
 	/* check for the context menu button and handle by creating and showing the menu */  
 	if (event->button == CONTEXTUAL_MENU_BUTTON) {
-		nautilus_pop_up_context_menu (create_zoom_menu (widget), 
-					      NAUTILUS_DEFAULT_POPUP_MENU_DISPLACEMENT, 
-					      NAUTILUS_DEFAULT_POPUP_MENU_DISPLACEMENT, 
+		eel_pop_up_context_menu (create_zoom_menu (widget), 
+					      EEL_DEFAULT_POPUP_MENU_DISPLACEMENT, 
+					      EEL_DEFAULT_POPUP_MENU_DISPLACEMENT, 
 					      event);
 		return TRUE;	  
  	}
@@ -721,7 +721,7 @@ nautilus_zoom_control_size_allocate (GtkWidget *widget, GtkAllocation *allocatio
 {
 	NautilusZoomControl *zoom_control = NAUTILUS_ZOOM_CONTROL (widget);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
 	
 	widget->allocation.width = get_zoom_width (zoom_control);
    	widget->allocation.height = allocation->height;
@@ -748,7 +748,7 @@ nautilus_zoom_control_set_parameters (NautilusZoomControl *zoom_control,
 	zoom_control->details->has_min_zoom_level = has_min_zoom_level;
 	zoom_control->details->has_max_zoom_level = has_max_zoom_level;
 
-	nautilus_g_list_free_deep (zoom_control->details->preferred_zoom_levels);
+	eel_g_list_free_deep (zoom_control->details->preferred_zoom_levels);
 	zoom_control->details->preferred_zoom_levels = zoom_levels;
 
 	gtk_widget_queue_draw (GTK_WIDGET (zoom_control));
diff --git a/test/.cvsignore b/test/.cvsignore
index fba47c9d1..4744f044d 100644
--- a/test/.cvsignore
+++ b/test/.cvsignore
@@ -5,38 +5,9 @@
 Makefile
 Makefile.in
 test-nautilus-async-activation
-test-nautilus-background
-test-nautilus-clickable-image
-test-nautilus-font
-test-nautilus-font-picker
-test-nautilus-font-simple
-test-nautilus-font-manager
-test-nautilus-glyph
-test-nautilus-glyph-simple
-test-nautilus-image
-test-nautilus-image-background
-test-nautilus-image-scrolled
-test-nautilus-image-simple
-test-nautilus-image-table
-test-nautilus-image-tile
-test-nautilus-label
-test-nautilus-label-background
-test-nautilus-label-flavorful
-test-nautilus-label-offset
-test-nautilus-label-scrolled
-test-nautilus-label-simple
-test-nautilus-label-wrapped
-test-nautilus-labeled-image
 test-nautilus-mime-actions
 test-nautilus-mime-actions-set
-test-nautilus-password-dialog
-test-nautilus-pixbuf-tile
-test-nautilus-preferences
 test-nautilus-preferences-change
 test-nautilus-preferences-display
 test-nautilus-smooth-graphics
-test-nautilus-smooth-text-layout
-test-nautilus-viewport-constraint
-test-nautilus-widgets
 test-nautilus-wrap-table
-test-nautilus-wrapped-label
diff --git a/test/Makefile.am b/test/Makefile.am
index fe4151519..b4e4322d8 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -5,6 +5,8 @@ INCLUDES =\
 	-I$(top_builddir) 		\
 	-I$(top_builddir)/libnautilus 	\
 	-I$(top_srcdir)/cut-n-paste-code\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(BONOBO_CFLAGS) 		\
 	$(OAF_CFLAGS) 			\
 	$(GCONF_CFLAGS) 		\
@@ -20,6 +22,8 @@ INCLUDES =\
 LDADD =\
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS) \
 	$(OAF_LIBS) \
 	$(GCONF_LIBS) \
@@ -30,73 +34,20 @@ LDADD =\
 
 noinst_PROGRAMS =\
 	test-nautilus-async-activation \
-	test-nautilus-background \
-	test-nautilus-clickable-image \
-	test-nautilus-font \
-	test-nautilus-font-picker \
-	test-nautilus-font-simple \
-	test-nautilus-font-manager \
-	test-nautilus-glyph \
-	test-nautilus-glyph-simple \
-	test-nautilus-image \
-	test-nautilus-image-background \
-	test-nautilus-image-scrolled \
-	test-nautilus-image-simple \
-	test-nautilus-image-table \
-	test-nautilus-image-tile \
-	test-nautilus-label \
-	test-nautilus-label-background \
-	test-nautilus-label-flavorful \
-	test-nautilus-label-offset \
-	test-nautilus-label-scrolled \
-	test-nautilus-label-simple \
-	test-nautilus-label-wrapped \
-	test-nautilus-labeled-image \
 	test-nautilus-mime-actions \
 	test-nautilus-mime-actions-set \
-	test-nautilus-password-dialog \
-	test-nautilus-pixbuf-tile \
 	test-nautilus-preferences-change \
 	test-nautilus-preferences-display \
 	test-nautilus-smooth-graphics \
-	test-nautilus-smooth-text-layout \
-	test-nautilus-widgets \
 	test-nautilus-wrap-table \
-	test-nautilus-viewport-constraint \
 	$(NULL)
 
-test_nautilus_async_activation_SOURCES = test-nautilus-async-activation.c
-test_nautilus_background_SOURCES = test-nautilus-background.c
-test_nautilus_clickable_image_SOURCES = test-nautilus-clickable-image.c test.c
-test_nautilus_font_SOURCES = test-nautilus-font.c test.c
-test_nautilus_font_picker_SOURCES = test-nautilus-font-picker.c test.c
-test_nautilus_font_simple_SOURCES = test-nautilus-font-simple.c test.c
-test_nautilus_font_manager_SOURCES = test-nautilus-font-manager.c test.c
-test_nautilus_glyph_SOURCES = test-nautilus-glyph.c test.c
-test_nautilus_glyph_simple_SOURCES = test-nautilus-glyph-simple.c test.c
-test_nautilus_image_SOURCES = test-nautilus-image.c
-test_nautilus_image_background_SOURCES = test-nautilus-image-background.c test.c
-test_nautilus_image_scrolled_SOURCES = test-nautilus-image-scrolled.c test.c
-test_nautilus_image_simple_SOURCES = test-nautilus-image-simple.c
-test_nautilus_image_table_SOURCES = test-nautilus-image-table.c test.c
-test_nautilus_image_tile_SOURCES = test-nautilus-image-tile.c test.c
-test_nautilus_label_SOURCES = test-nautilus-label.c
-test_nautilus_label_background_SOURCES = test-nautilus-label-background.c test.c
-test_nautilus_label_flavorful_SOURCES = test-nautilus-label-flavorful.c
-test_nautilus_label_offset_SOURCES = test-nautilus-label-offset.c test.c
-test_nautilus_label_scrolled_SOURCES = test-nautilus-label-scrolled.c test.c
-test_nautilus_label_simple_SOURCES = test-nautilus-label-simple.c test.c
-test_nautilus_label_wrapped_SOURCES = test-nautilus-label-wrapped.c
-test_nautilus_labeled_image_SOURCES = test-nautilus-labeled-image.c test.c
-test_nautilus_mime_actions_SOURCES = test-nautilus-mime-actions.c
-test_nautilus_mime_actions_set_SOURCES = test-nautilus-mime-actions-set.c
-test_nautilus_password_dialog_SOURCES = test-nautilus-password-dialog.c
-test_nautilus_pixbuf_tile_SOURCES = test-nautilus-pixbuf-tile.c test.c
+test_nautilus_async_activation_SOURCES = test-nautilus-async-activation.c test.c
+test_nautilus_mime_actions_SOURCES = test-nautilus-mime-actions.c test.c
+test_nautilus_mime_actions_set_SOURCES = test-nautilus-mime-actions-set.c test.c
 test_nautilus_preferences_change_SOURCES = test-nautilus-preferences-change.c test.c
 test_nautilus_preferences_display_SOURCES = test-nautilus-preferences-display.c test.c
-test_nautilus_smooth_graphics_SOURCES = test-nautilus-smooth-graphics.c
-test_nautilus_smooth_text_layout_SOURCES = test-nautilus-smooth-text-layout.c test.c
-test_nautilus_widgets_SOURCES = test-nautilus-widgets.c
+test_nautilus_smooth_graphics_SOURCES = test-nautilus-smooth-graphics.c test.c
 test_nautilus_wrap_table_SOURCES = test-nautilus-wrap-table.c test.c
 
 EXTRA_DIST = \
diff --git a/test/test-nautilus-background.c b/test/test-nautilus-background.c
deleted file mode 100644
index 742c50eec..000000000
--- a/test/test-nautilus-background.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libgnomevfs/gnome-vfs-init.h>
-#include <gtk/gtk.h>
-
-#define PATTERNS_DIR "/gnome-source/nautilus/data/patterns"
-
-int
-main  (int argc, char *argv[])
-{
-	GtkWidget *window, *ctree;
-	NautilusBackground *background;
-	char *image_uri;
-	char *titles[] = { "test 1", "test 2", "test 3"};
-
-	gtk_init (&argc, &argv);
-
-	gnome_vfs_init ();
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	ctree = gtk_ctree_new_with_titles (3, 2, titles);
-#if 0
-	gtk_container_add (GTK_CONTAINER (window), ctree);
-#endif
-	gtk_signal_connect (GTK_OBJECT (window), "destroy",
-			    gtk_main_quit, NULL);
-
-	background = nautilus_get_widget_background (window);
-
-	nautilus_background_set_color (background,
-				       "red-blue:h");
-
-	image_uri = g_strconcat ("file://", PATTERNS_DIR, "/50s.png", NULL);
-
-#if 1
-	nautilus_background_set_image_uri (background, image_uri);
-#endif
-	g_free (image_uri);
-
-
-	gtk_widget_show_all (window);
-	gtk_main ();
-
-	return 0;
-}
diff --git a/test/test-nautilus-clickable-image.c b/test/test-nautilus-clickable-image.c
deleted file mode 100644
index 3885a0d60..000000000
--- a/test/test-nautilus-clickable-image.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "test.h"
-
-#include <libnautilus-extensions/nautilus-clickable-image.h>
-
-static void
-clicked_callback (GtkWidget *widget,
-		  gpointer callback_data)
-{
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (widget));
-
-	g_print ("%s(%p)\n", __FUNCTION__, widget);
-}
-
-static void
-enter_callback (GtkWidget *widget,
-		gpointer callback_data)
-{
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (widget));
-
-	g_print ("%s(%p)\n", __FUNCTION__, widget);
-}
-
-
-static void
-leave_callback (GtkWidget *widget,
-		gpointer callback_data)
-{
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (widget));
-
-	g_print ("%s(%p)\n", __FUNCTION__, widget);
-}
-
-static GtkWidget *
-clickable_image_new (const char *text, GdkPixbuf *pixbuf)
-{
-	GtkWidget *clickable_image;
-
-	clickable_image = nautilus_clickable_image_new (text, pixbuf);
-
-	gtk_signal_connect (GTK_OBJECT (clickable_image), "clicked", GTK_SIGNAL_FUNC (clicked_callback), NULL);
-	gtk_signal_connect (GTK_OBJECT (clickable_image), "enter", GTK_SIGNAL_FUNC (enter_callback), NULL);
-	gtk_signal_connect (GTK_OBJECT (clickable_image), "leave", GTK_SIGNAL_FUNC (leave_callback), NULL);
-
-	return clickable_image;
-}
-
-int 
-main (int argc, char* argv[])
-{
-	GtkWidget *window;
-	GtkWidget *vbox;
-	GtkWidget *clickable_images[3];
-	GtkWidget *event_box;
-	GdkPixbuf *pixbuf;
-
-	test_init (&argc, &argv);
-	
-	window = test_window_new ("Simple Label Test", 20);
-	event_box = gtk_event_box_new ();
-	vbox = gtk_vbox_new (TRUE, 10);
-	gtk_container_add (GTK_CONTAINER (window), event_box);
-	gtk_container_add (GTK_CONTAINER (event_box), vbox);
-
-	clickable_images[0] = NULL;
-	clickable_images[1] = NULL;
-	clickable_images[2] = NULL;
-
-	pixbuf = test_pixbuf_new_named ("/usr/share/pixmaps/gnome-globe.png", 1.0);
-	if (1) clickable_images[0] = clickable_image_new ("Clickable Image", pixbuf);
-	if (1) clickable_images[1] = clickable_image_new ("Clickable Image No pixbuf", NULL);
-	if (1) clickable_images[2] = clickable_image_new (NULL, pixbuf);
-	gdk_pixbuf_unref (pixbuf);
-
-	if (clickable_images[0]) gtk_box_pack_start (GTK_BOX (vbox), clickable_images[0], FALSE, FALSE, 0);
-	if (clickable_images[1]) gtk_box_pack_start (GTK_BOX (vbox), clickable_images[1], FALSE, FALSE, 0);
-	if (clickable_images[2]) gtk_box_pack_start (GTK_BOX (vbox), clickable_images[2], FALSE, FALSE, 0);
-
-	gtk_widget_show_all (window);
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/test/test-nautilus-font-manager.c b/test/test-nautilus-font-manager.c
deleted file mode 100644
index b40bae8de..000000000
--- a/test/test-nautilus-font-manager.c
+++ /dev/null
@@ -1,133 +0,0 @@
-
-#include <config.h>
-
-#include "test.h"
-
-#include <libnautilus-extensions/nautilus-font-manager.h>
-
-static const char *
-font_type_to_string (NautilusFontType font_type)
-{
-	if (font_type == NAUTILUS_FONT_POSTSCRIPT) {
-		return "postscript";
-	}
-
-	if (font_type == NAUTILUS_FONT_TRUE_TYPE) {
-		return "truetype";
-	}
-
-	return "unknown";
-}
-
-typedef struct
-{
-	char *key;
-	char *font_file_name;
-} Style;
-
-typedef struct
-{
-	char *title;
-	char *foundry;
-	char *family;
-	char *key;
-	GList *style_list;
-} Entry;
-
-static gboolean
-font_iterator_callback (const char *font_file_name,
-			NautilusFontType font_type,
-			const char *foundry,
-			const char *family,
-			const char *weight,
-			const char *slant,
-			const char *set_width,
-			const char *char_set,
-			gpointer callback_data)
-{
-	char *key;
-	Entry *entry;
-	Style *style;
-
-	GHashTable *font_table;
-
-	g_return_val_if_fail (font_file_name != NULL, FALSE);
-	g_return_val_if_fail (foundry != NULL, FALSE);
-	g_return_val_if_fail (family != NULL, FALSE);
-	g_return_val_if_fail (weight != NULL, FALSE);
-	g_return_val_if_fail (slant != NULL, FALSE);
-	g_return_val_if_fail (set_width != NULL, FALSE);
-	g_return_val_if_fail (char_set != NULL, FALSE);
-	g_return_val_if_fail (callback_data != NULL, FALSE);
-
-	font_table = callback_data;
-
-	key = g_strdup_printf ("%s %s", foundry, family);
-
-	entry = g_hash_table_lookup (font_table, key);
-
-	if (entry == NULL) {
-		entry = g_new0 (Entry, 1);
-		entry->key = g_strdup (key);
-		entry->foundry = g_strdup (foundry);
-		entry->family = g_strdup (family);
-
-		g_hash_table_insert (font_table, entry->key, entry);
-	}
-	g_assert (entry != NULL);
-	g_assert (g_hash_table_lookup (font_table, key) == entry);
-	g_free (key);
-
-	style = g_new0 (Style, 1);
-	style->key = g_strdup_printf ("%s %s %s", weight, slant, set_width);
-	style->font_file_name = g_strdup (font_file_name);
-
-	entry->style_list = g_list_append (entry->style_list, style);
-
-	if (1) {
-		g_print ("%s %s %s-%s-%s-%s-%s-%s\n",
-			 font_type_to_string (font_type),
-			 font_file_name,
-			 foundry,
-			 family,
-			 weight,
-			 slant,
-			 set_width,
-			 char_set);
-	}
-
-	return TRUE;
-}
-
-static void
-font_table_for_each_callback (gpointer key,
-			      gpointer value,
-			      gpointer callback_data)
-{
-	char *entry_key;
-
-	g_return_if_fail (key != NULL);
-	g_return_if_fail (value != NULL);
-	//g_return_if_fail (callback_data != NULL);
-
-	entry_key = key;
-
-	if (0) g_print ("%s\n", entry_key);
-}
-
-int 
-main (int argc, char* argv[])
-{
-	GHashTable *font_table = NULL;
-	
-	test_init (&argc, &argv);
-
-	font_table = g_hash_table_new (g_str_hash, g_str_equal);
-
-	nautilus_font_manager_for_each_font (font_iterator_callback,
-					     font_table);
-
-	g_hash_table_foreach (font_table, font_table_for_each_callback, NULL);
-	
-	return test_quit (EXIT_SUCCESS);
-}
diff --git a/test/test-nautilus-font-picker.c b/test/test-nautilus-font-picker.c
deleted file mode 100644
index 70fc6c1e0..000000000
--- a/test/test-nautilus-font-picker.c
+++ /dev/null
@@ -1,247 +0,0 @@
-#include "test.h"
-
-#include <libnautilus-extensions/nautilus-font-picker.h>
-#include <libnautilus-extensions/nautilus-font-manager.h>
-#include <libnautilus-extensions/nautilus-global-preferences.h>
-
-static void
-update_font (NautilusLabel *label,
-	     const char *font_file_name)
-{
-	NautilusScalableFont *font;
-	
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (font_file_name != NULL);
-
-	font = nautilus_scalable_font_new (font_file_name);
-	nautilus_label_set_smooth_font (NAUTILUS_LABEL (label), font);
-	gtk_object_unref (GTK_OBJECT (font));
-
-	nautilus_preferences_set (NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT, font_file_name);
-}
-
-static void
-font_changed_update_label_callback (NautilusFontPicker *font_picker,
-				    gpointer callback_data)
-{
-	char *font_file_name;
-
-	g_return_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker));
-	g_return_if_fail (NAUTILUS_IS_LABEL (callback_data));
-
-	font_file_name = nautilus_font_picker_get_selected_font (font_picker);
-	update_font (NAUTILUS_LABEL (callback_data), font_file_name);
-	g_free (font_file_name);
-}
-
-static void
-font_changed_update_file_name_callback (NautilusFontPicker *font_picker,
-					gpointer callback_data)
-{
-	char *font_file_name;
-
-	g_return_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker));
-	g_return_if_fail (NAUTILUS_IS_TEXT_CAPTION (callback_data));
-
-	font_file_name = nautilus_font_picker_get_selected_font (font_picker);
-	nautilus_text_caption_set_text (NAUTILUS_TEXT_CAPTION (callback_data), font_file_name);
-	g_free (font_file_name);
-}
-
-static void
-use_defalt_font_callback (GtkWidget *button,
-			  gpointer callback_data)
-{
-	char *default_font;
-
-	g_return_if_fail (GTK_IS_BUTTON (button));
-	g_return_if_fail (NAUTILUS_IS_LABEL (callback_data));
-
-	default_font = nautilus_font_manager_get_default_font ();
-	update_font (NAUTILUS_LABEL (callback_data), default_font);
-	g_free (default_font);
-}
-
-static void
-use_defalt_bold_font_callback (GtkWidget *button,
-			       gpointer callback_data)
-{
-	char *default_bold_font;
-
-	g_return_if_fail (GTK_IS_BUTTON (button));
-	g_return_if_fail (NAUTILUS_IS_LABEL (callback_data));
-
-	default_bold_font = nautilus_font_manager_get_default_bold_font ();
-	update_font (NAUTILUS_LABEL (callback_data), default_bold_font);
-	g_free (default_bold_font);
-}
-
-static void
-use_defalt_font_update_picker_callback (GtkWidget *button,
-					gpointer callback_data)
-{
-	char *default_font;
-	
-	g_return_if_fail (GTK_IS_BUTTON (button));
-	g_return_if_fail (NAUTILUS_IS_FONT_PICKER (callback_data));
-
-	default_font = nautilus_font_manager_get_default_font ();
-	nautilus_font_picker_set_selected_font (NAUTILUS_FONT_PICKER (callback_data),
-						default_font);
-	g_free (default_font);
-}
-
-static void
-use_defalt_bold_font_update_picker_callback (GtkWidget *button,
-					     gpointer callback_data)
-{
-	char *default_bold_font;
-
-	g_return_if_fail (GTK_IS_BUTTON (button));
-	g_return_if_fail (NAUTILUS_IS_FONT_PICKER (callback_data));
-
-	default_bold_font = nautilus_font_manager_get_default_bold_font ();
-	nautilus_font_picker_set_selected_font (NAUTILUS_FONT_PICKER (callback_data),
-						default_bold_font);
-	g_free (default_bold_font);
-}
-
-static void
-print_selected_font_callback (GtkWidget *button,
-			      gpointer callback_data)
-{
-	char *selected_font;
-
-	g_return_if_fail (GTK_IS_BUTTON (button));
-	g_return_if_fail (NAUTILUS_IS_FONT_PICKER (callback_data));
-
-	selected_font = nautilus_font_picker_get_selected_font (NAUTILUS_FONT_PICKER (callback_data));
-
-	g_free (selected_font);
-}
-
-int
-main (int argc, char * argv[])
-{
-	GtkWidget *window;
-	GtkWidget *vbox;
-	GtkWidget *font_picker;
-	GtkWidget *label;
-	GtkWidget *file_name_caption;
-	GtkWidget *default_font_caption;
-	GtkWidget *default_bold_font_caption;
-	NautilusScalableFont *font;
-	GtkWidget *use_defailt_button;
-	GtkWidget *use_defailt_bold_button;
-	GtkWidget *default_hbox;
-	GtkWidget *default_bold_hbox;
-	GtkWidget *print_selected_font_button;
-	char *current_font;
-	char *default_font;
-	char *default_bold_font;
-
-	test_init (&argc, &argv);
-
-	nautilus_global_preferences_initialize ();
-
-	window = test_window_new ("Font Picker Test", 10);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (window), vbox);
-
-	default_font = nautilus_font_manager_get_default_font ();
-	default_bold_font = nautilus_font_manager_get_default_bold_font ();
-
-	font_picker = nautilus_font_picker_new ();
-
-	current_font = nautilus_preferences_get (NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT);
-	nautilus_font_picker_set_selected_font (NAUTILUS_FONT_PICKER (font_picker),
-						current_font);
-
-	label = nautilus_label_new ("Something\n¥Ï¡¼¥É¥¦¥§¥¢");
-	nautilus_label_set_is_smooth (NAUTILUS_LABEL (label), TRUE);
-	nautilus_label_make_larger (NAUTILUS_LABEL (label), 40);
-
-	font = nautilus_scalable_font_new (current_font);
-	nautilus_label_set_smooth_font (NAUTILUS_LABEL (label), font);
-	gtk_object_unref (GTK_OBJECT (font));
-	
-	gtk_signal_connect (GTK_OBJECT (font_picker),
-			    "changed",
-			    GTK_SIGNAL_FUNC (font_changed_update_label_callback),
-			    label);
-
-	file_name_caption = nautilus_text_caption_new ();
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (file_name_caption),
-					  "Current Font");
-	nautilus_text_caption_set_text (NAUTILUS_TEXT_CAPTION (file_name_caption), current_font);
-
-	gtk_signal_connect (GTK_OBJECT (font_picker),
-			    "changed",
-			    GTK_SIGNAL_FUNC (font_changed_update_file_name_callback),
-			    file_name_caption);
-	
-
-	default_hbox = gtk_hbox_new (FALSE, 0);
-	default_font_caption = nautilus_text_caption_new ();
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (default_font_caption),
-					  "Default Font");
-	nautilus_text_caption_set_text (NAUTILUS_TEXT_CAPTION (default_font_caption), default_font);
-	use_defailt_button = gtk_button_new_with_label ("Use");
-	gtk_signal_connect (GTK_OBJECT (use_defailt_button),
-			    "clicked",
-			    GTK_SIGNAL_FUNC (use_defalt_font_callback),
-			    label);
-	gtk_signal_connect (GTK_OBJECT (use_defailt_button),
-			    "clicked",
-			    GTK_SIGNAL_FUNC (use_defalt_font_update_picker_callback),
-			    font_picker);
-	gtk_box_pack_start (GTK_BOX (default_hbox), default_font_caption, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (default_hbox), use_defailt_button, FALSE, FALSE, 0);
-
-
-	default_bold_hbox = gtk_hbox_new (FALSE, 0);
-	default_bold_font_caption = nautilus_text_caption_new ();
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (default_bold_font_caption),
-					  "Default Bold Font");
-	nautilus_text_caption_set_text (NAUTILUS_TEXT_CAPTION (default_bold_font_caption), default_bold_font);
-	use_defailt_bold_button = gtk_button_new_with_label ("Use");
-	gtk_signal_connect (GTK_OBJECT (use_defailt_bold_button),
-			    "clicked",
-			    GTK_SIGNAL_FUNC (use_defalt_bold_font_callback),
-			    label);
-	gtk_signal_connect (GTK_OBJECT (use_defailt_bold_button),
-			    "clicked",
-			    GTK_SIGNAL_FUNC (use_defalt_bold_font_update_picker_callback),
-			    font_picker);
-	gtk_box_pack_start (GTK_BOX (default_bold_hbox), default_bold_font_caption, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (default_bold_hbox), use_defailt_bold_button, FALSE, FALSE, 0);
-
-	gtk_box_pack_start (GTK_BOX (vbox), font_picker, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 10);
-	gtk_box_pack_start (GTK_BOX (vbox), file_name_caption, TRUE, TRUE, 10);
-	gtk_box_pack_start (GTK_BOX (vbox), default_hbox, TRUE, TRUE, 10);
-	gtk_box_pack_start (GTK_BOX (vbox), default_bold_hbox, TRUE, TRUE, 10);
-
-	print_selected_font_button = gtk_button_new_with_label ("Print selected font");
-	gtk_signal_connect (GTK_OBJECT (print_selected_font_button),
-			    "clicked",
-			    GTK_SIGNAL_FUNC (print_selected_font_callback),
-			    font_picker);
-	gtk_box_pack_start (GTK_BOX (vbox), print_selected_font_button, FALSE, FALSE, 10);
-
-	g_free (current_font);
-	g_free (default_font);
-
-	gtk_widget_show (font_picker);
-	gtk_widget_show (label);
-	gtk_widget_show (file_name_caption);
-	gtk_widget_show (print_selected_font_button);
-	gtk_widget_show_all (default_hbox);
-	gtk_widget_show_all (default_bold_hbox);
-	gtk_widget_show (vbox);
-	gtk_widget_show (window);
-
-	gtk_main ();
-	return test_quit (EXIT_SUCCESS);
-}
diff --git a/test/test-nautilus-font-simple.c b/test/test-nautilus-font-simple.c
deleted file mode 100644
index 87b749d2b..000000000
--- a/test/test-nautilus-font-simple.c
+++ /dev/null
@@ -1,46 +0,0 @@
-
-#include <config.h>
-
-#include "test.h"
-
-#include <libnautilus-extensions/nautilus-scalable-font.h>
-
-int 
-main (int argc, char* argv[])
-{
-	GdkPixbuf *pixbuf;
-	NautilusScalableFont *font;
-
-	test_init (&argc, &argv);
-	
-	font = nautilus_scalable_font_get_default_font ();
-	g_assert (font != NULL);
-
-	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, 800, 400);
-	g_assert (pixbuf != NULL);
-	
-	nautilus_debug_pixbuf_draw_rectangle (pixbuf,
-					      TRUE,
-					      -1, -1, -1, -1,
-					      NAUTILUS_RGB_COLOR_WHITE,
-					      NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	nautilus_scalable_font_draw_text (font,
-					  pixbuf,
-					  10,
-					  100,
-					  NULL,
-					  80,
-					  "Somoet",
-					  strlen ("Somoet"),
-					  NAUTILUS_RGBA_COLOR_OPAQUE_BLUE,
-					  NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	nautilus_debug_show_pixbuf_in_eog (pixbuf);
-	
-	gdk_pixbuf_unref (pixbuf);
-	
-	gnome_vfs_shutdown ();
-
-	return 0;
-}
diff --git a/test/test-nautilus-font.c b/test/test-nautilus-font.c
deleted file mode 100644
index 553eed1ab..000000000
--- a/test/test-nautilus-font.c
+++ /dev/null
@@ -1,137 +0,0 @@
-
-#include <config.h>
-
-#include "test.h"
-
-#include <libnautilus-extensions/nautilus-scalable-font.h>
-
-int 
-main (int argc, char* argv[])
-{
-	GdkPixbuf		*pixbuf;
-	NautilusScalableFont	*font;
-	ArtIRect		clip_area;
-	ArtIRect		whole_area;
-	ArtIRect		multi_lines_area;
-
-	const guint  font_size = 48;
-	const guint  pixbuf_width = 500;
-	const guint  pixbuf_height = 700;
-	const guint  empty_line_height = font_size;
-	const int    multi_line_x = 10;
-	const int    multi_line_y = 10;
-
-	g_print ("font_size = %d, empty_line_height = %d\n", font_size, empty_line_height);
-
-	gtk_init (&argc, &argv);
-	gdk_rgb_init ();
-	gnome_vfs_init ();
-
-	font = nautilus_scalable_font_get_default_font ();
-	g_assert (font != NULL);
-
-	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, pixbuf_width, pixbuf_height);
-	g_assert (pixbuf != NULL);
-
-	nautilus_debug_pixbuf_draw_rectangle (pixbuf,
-					      TRUE,
-					      -1, -1, -1, -1,
-					      NAUTILUS_RGB_COLOR_WHITE,
-					      NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	multi_lines_area.x0 = multi_line_x;
-	multi_lines_area.y0 = multi_line_y;
-
-	clip_area.x0 = 300;
-	clip_area.y0 = 20;
-	clip_area.x1 = clip_area.x0 + 100;
-	clip_area.y1 = clip_area.y0 + 30;
-	
-	nautilus_debug_pixbuf_draw_rectangle_inset (pixbuf,
-						    FALSE,
-						    clip_area.x0,
-						    clip_area.y0,
-						    clip_area.x1,
-						    clip_area.y1,
-						    NAUTILUS_RGBA_COLOR_OPAQUE_RED,
-						    NAUTILUS_OPACITY_FULLY_OPAQUE,
-						    1);
-	
-	whole_area.x0 = 0;
-	whole_area.y0 = 0;
-	whole_area.x1 = whole_area.x0 + pixbuf_width;
-	whole_area.y1 = whole_area.y0 + pixbuf_height;
-
-	nautilus_debug_pixbuf_draw_rectangle_inset (pixbuf,
-						    FALSE,
-						    multi_lines_area.x0,
-						    multi_lines_area.y0,
-						    multi_lines_area.x1,
-						    multi_lines_area.y1,
-						    NAUTILUS_RGBA_COLOR_OPAQUE_RED,
-						    NAUTILUS_OPACITY_FULLY_OPAQUE,
-						    -1);
-
-	/*
-	 * Clipped text test.  The "Something" string should be clipped such
-	 * that horizontally you can only see "Som" and a tiny fraction of
-	 * the "e".
-	 *
-	 * Vertically, you should see about 90% of the "Som"
-	 */
-	nautilus_scalable_font_draw_text (font,
-					  pixbuf,
-					  clip_area.x0,
-					  clip_area.y0,
-					  NULL,
-					  80,
-					  "Something",
-					  strlen ("Something"),
-					  NAUTILUS_RGBA_COLOR_OPAQUE_BLUE,
-					  NAUTILUS_OPACITY_FULLY_OPAQUE);
-
-	/*
-	 * Composited text lines test.
-	 */
-	{
-		ArtIRect composited_area;
-		GdkPixbuf *tile_pixbuf;
-		
-		tile_pixbuf = test_pixbuf_new_named ("patterns/purple_marble.png", 1.0);
-		
-		composited_area.x0 = 270;
-		composited_area.y0 = 80;
-		composited_area.x1 = composited_area.x0 + 200;
-		composited_area.y1 = composited_area.y0 + 200;
-		
-		nautilus_debug_pixbuf_draw_rectangle_inset (pixbuf,
-							    FALSE,
-							    composited_area.x0,
-							    composited_area.y0,
-							    composited_area.x1,
-							    composited_area.y1,
-							    NAUTILUS_RGBA_COLOR_OPAQUE_RED,
-							    NAUTILUS_OPACITY_FULLY_OPAQUE,
-							    -1);
-		
-		nautilus_gdk_pixbuf_draw_to_pixbuf_tiled (tile_pixbuf,
-							  pixbuf,
-							  &composited_area,
-							  gdk_pixbuf_get_width (tile_pixbuf),
-							  gdk_pixbuf_get_height (tile_pixbuf),
-							  0,
-							  0,
-							  NAUTILUS_OPACITY_FULLY_OPAQUE,
-							  GDK_INTERP_BILINEAR);
-		
-		gdk_pixbuf_unref (tile_pixbuf);
-	}
-
-	nautilus_debug_show_pixbuf_in_eog (pixbuf);
-	
-	gdk_pixbuf_unref (pixbuf);
-
-	gnome_vfs_shutdown ();
-
-	return 0;
-}
diff --git a/test/test-nautilus-glyph-simple.c b/test/test-nautilus-glyph-simple.c
deleted file mode 100644
index 414450679..000000000
--- a/test/test-nautilus-glyph-simple.c
+++ /dev/null
@@ -1,142 +0,0 @@
-
-#include <config.h>
-
-#include "test.h"
-
-#include <libnautilus-extensions/nautilus-glyph.h>
-
-static NautilusGlyph *
-glyph_new (const char *text, int font_size, gboolean bold)
-{
-	NautilusScalableFont *font;
-	NautilusScalableFont *bold_font;
-	NautilusGlyph *glyph;
-	
-	g_return_val_if_fail (text != NULL, NULL);
-	g_return_val_if_fail (text[0] != '\0', NULL);
-	g_return_val_if_fail (font_size >= 5, NULL);
-	g_return_val_if_fail (font_size <= 200, NULL);
-	
-	font = nautilus_scalable_font_get_default_font ();
-	g_return_val_if_fail (font != NULL, NULL);
-	
-	if (bold) {
-		bold_font = nautilus_scalable_font_make_bold (font);
-		g_return_val_if_fail (bold_font != NULL, NULL);
-		gtk_object_unref (GTK_OBJECT (font));
-		font = bold_font;
-	}
-
-	glyph = nautilus_glyph_new (font, font_size, text, strlen (text));
-	g_return_val_if_fail (glyph != NULL, NULL);
-
-	gtk_object_unref (GTK_OBJECT (font));
-
-	return glyph;
-}
-
-int 
-main (int argc, char* argv[])
-{
-	GdkPixbuf *pixbuf;
-	NautilusScalableFont *font;
-	NautilusGlyph *glyph;
-	int x;
-	int y;
-	const guint font_size = 60;
-	const guint underlined_font_size = 100;
-	const int opacity = NAUTILUS_OPACITY_FULLY_OPAQUE;
-
-	const guint pixbuf_width = 640;
-	const guint pixbuf_height = 480;
-	const gboolean has_alpha = FALSE;
-	const guint32 background_color = NAUTILUS_RGB_COLOR_WHITE;
-	const char text[] = "Somethin";
-
-	test_init (&argc, &argv);
-
-	font = nautilus_scalable_font_get_default_font ();
-	g_assert (font != NULL);
-
-	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, has_alpha, 8, pixbuf_width, pixbuf_height);
-	g_assert (pixbuf != NULL);
-
-	nautilus_debug_pixbuf_draw_rectangle (pixbuf,
-					      TRUE,
-					      -1, -1, -1, -1,
-					      background_color,
-					      NAUTILUS_OPACITY_FULLY_OPAQUE);
-	
-	glyph = glyph_new (text, font_size, FALSE);
-
-	x = 50;
-	y = 10;
-
-	nautilus_glyph_draw_to_pixbuf (glyph,
-				       pixbuf,
-				       x,
-				       y,
-				       NULL,
-				       NAUTILUS_RGBA_COLOR_OPAQUE_BLUE,
-				       opacity);
-	y += nautilus_glyph_get_height (glyph) + 10;
-	nautilus_glyph_free (glyph);
-
-	glyph = glyph_new (text, font_size, TRUE);
-	nautilus_glyph_draw_to_pixbuf (glyph,
-				       pixbuf,
-				       x,
-				       y,
-				       NULL,
-				       NAUTILUS_RGBA_COLOR_OPAQUE_BLUE,
-				       opacity);
-	y += nautilus_glyph_get_height (glyph) + 10;
-	nautilus_glyph_free (glyph);
-
-
-	glyph = glyph_new (text, underlined_font_size, FALSE);
-	nautilus_glyph_draw_to_pixbuf (glyph,
-				       pixbuf,
-				       x,
-				       y,
-				       NULL,
-				       NAUTILUS_RGBA_COLOR_OPAQUE_BLUE,
-				       opacity);
-
-	{
-		NautilusScalableFont *font;
-		ArtIRect glyph_rect;
-		ArtIRect underline_rect;
-
-		font = nautilus_scalable_font_get_default_font ();
-		glyph_rect = nautilus_glyph_intersect (glyph, x, y, NULL);
-
-		if (0) nautilus_debug_pixbuf_draw_rectangle (pixbuf,
-							     FALSE,
-							     glyph_rect.x0,
-							     glyph_rect.y0,
-							     glyph_rect.x1,
-							     glyph_rect.y1,
-							     0xFF0000,
-							     NAUTILUS_OPACITY_FULLY_OPAQUE);
-		
-		nautilus_glyph_get_underline_rectangle (glyph, &underline_rect);
-		
-		nautilus_debug_pixbuf_draw_rectangle (pixbuf,
-						      TRUE,
-						      underline_rect.x0,
-						      underline_rect.y0,
-						      underline_rect.x1,
-						      underline_rect.y1,
-						      NAUTILUS_RGBA_COLOR_OPAQUE_BLUE,
-						      NAUTILUS_OPACITY_FULLY_OPAQUE);
-	}		
-	nautilus_glyph_free (glyph);
-
-	nautilus_debug_show_pixbuf_in_eog (pixbuf);
-	
-	gdk_pixbuf_unref (pixbuf);
-	gtk_object_unref (GTK_OBJECT (font));
-
-	return test_quit (EXIT_SUCCESS);
-}
diff --git a/test/test-nautilus-glyph.c b/test/test-nautilus-glyph.c
deleted file mode 100644
index 287fda878..000000000
--- a/test/test-nautilus-glyph.c
+++ /dev/null
@@ -1,341 +0,0 @@
-
-#include <config.h>
-
-#include "test.h"
-
-#include <libnautilus-extensions/nautilus-glyph.h>
-
-static NautilusGlyph *
-glyph_new (const char *text,
-	   int font_size)
-{
-	NautilusScalableFont *font;
-	NautilusGlyph *glyph;
-	
-	g_return_val_if_fail (text != NULL, NULL);
-	g_return_val_if_fail (text[0] != '\0', NULL);
-	g_return_val_if_fail (font_size >= 5, NULL);
-	g_return_val_if_fail (font_size <= 200, NULL);
-	
-	font = nautilus_scalable_font_get_default_font ();
-	g_return_val_if_fail (font != NULL, NULL);
-	
-	glyph = nautilus_glyph_new (font, font_size, text, strlen (text));
-	gtk_object_unref (GTK_OBJECT (font));
-
-	g_return_val_if_fail (glyph != NULL, NULL);
-
-	return glyph;
-}
-
-int 
-main (int argc, char* argv[])
-{
-	const guint pixbuf_width = 640;
-	const guint pixbuf_height = 480;
-	const gboolean has_alpha = FALSE;
-	const guint32 background_color = NAUTILUS_RGB_COLOR_WHITE;
-	const char text[] = "ù È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö Ø Ù Ú Û Ü Ý Þ";
-	const gboolean solid_background = FALSE;
-	const guint font_size = 100;
-	const int opacity = NAUTILUS_OPACITY_FULLY_OPAQUE;
-
-	GdkPixbuf *pixbuf;
-	NautilusScalableFont *font;
-	int x;
-	int y;
-	ArtIRect clip_area;
-	NautilusGlyph *glyph;
-
-	test_init (&argc, &argv);
-
-	font = nautilus_scalable_font_get_default_font ();
-	g_assert (font != NULL);
-
-	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, has_alpha, 8, pixbuf_width, pixbuf_height);
-	g_assert (pixbuf != NULL);
-
-	if (solid_background) {
-		nautilus_debug_pixbuf_draw_rectangle (pixbuf,
-						      TRUE,
-						      -1, -1, -1, -1,
-						      background_color,
-						      NAUTILUS_OPACITY_FULLY_OPAQUE);
-	} else {
-		test_pixbuf_draw_rectangle_tiled (pixbuf, 
-						  "patterns/brushed_metal.png",
-						  -1, -1, -1, -1,
-						  NAUTILUS_OPACITY_FULLY_OPAQUE);
-	}
-	
-	x = 10;
-	y = 50;
-	
-	nautilus_art_irect_assign (&clip_area,
-				   50,
-				   30,
-				   200,
-				   80);
-	
-	glyph = glyph_new (text, font_size);
-	
-	nautilus_glyph_draw_to_pixbuf (glyph,
-				       pixbuf,
-				       x,
-				       y,
-				       NULL,
-				       NAUTILUS_RGBA_COLOR_OPAQUE_BLUE,
-				       opacity);
-	
-	nautilus_glyph_draw_to_pixbuf (glyph,
-				       pixbuf,
-				       -200,
-				       y + 3 * font_size,
-				       NULL,
-				       NAUTILUS_RGBA_COLOR_OPAQUE_BLUE,
-				       opacity);
-	
-	if (solid_background) {
-		nautilus_debug_pixbuf_draw_rectangle (pixbuf,
-						      TRUE,
-						      clip_area.x0,
-						      clip_area.y0,
-						      clip_area.x1,
-						      clip_area.y1,
-						      background_color,
-						      NAUTILUS_OPACITY_FULLY_OPAQUE);
-	} else {
-		test_pixbuf_draw_rectangle_tiled (pixbuf, 
-						  "patterns/brushed_metal.png",
-						  clip_area.x0,
-						  clip_area.y0,
-						  clip_area.x1,
-						  clip_area.y1,
-						  NAUTILUS_OPACITY_FULLY_OPAQUE);
-	}
-	
-	if (1) nautilus_debug_pixbuf_draw_rectangle (pixbuf,
-						     FALSE,
-						     clip_area.x0 - 1,
-						     clip_area.y0 - 1,
-						     clip_area.x1 + 1,
-						     clip_area.y1 + 1,
-						     NAUTILUS_RGBA_COLOR_OPAQUE_GREEN,
-						     NAUTILUS_OPACITY_FULLY_OPAQUE);
-	nautilus_glyph_draw_to_pixbuf (glyph,
-				       pixbuf,
-				       x,
-				       y,
-				       &clip_area,
-				       NAUTILUS_RGBA_COLOR_OPAQUE_RED,
-				       opacity);
-	
-	nautilus_glyph_free (glyph);
-	
-	nautilus_art_irect_assign (&clip_area,
-				   50,
-				   100 + font_size + 4,
-				   200,
-				   80);
-	
-	if (1) nautilus_scalable_font_draw_text (font,
-						 pixbuf,
-						 x,
-						 y + font_size + 4,
-						 NULL,
-						 font_size,
-						 text,
-						 strlen (text),
-						 NAUTILUS_RGBA_COLOR_OPAQUE_BLUE,
-						 opacity);
-	
-	if (solid_background) {
-		nautilus_debug_pixbuf_draw_rectangle (pixbuf,
-						      TRUE,
-						      clip_area.x0,
-						      clip_area.y0,
-						      clip_area.x1,
-						      clip_area.y1,
-						      background_color,
-						      NAUTILUS_OPACITY_FULLY_OPAQUE);
-	} else {
-		test_pixbuf_draw_rectangle_tiled (pixbuf, 
-						  "patterns/brushed_metal.png",
-						  clip_area.x0,
-						  clip_area.y0,
-						  clip_area.x1,
-						  clip_area.y1,
-						  NAUTILUS_OPACITY_FULLY_OPAQUE);
-	}
-	
-	if (1) nautilus_debug_pixbuf_draw_rectangle (pixbuf,
-						     FALSE,
-						     clip_area.x0 - 1,
-						     clip_area.y0 - 1,
-						     clip_area.x1 + 1,
-						     clip_area.y1 + 1,
-						     NAUTILUS_RGBA_COLOR_OPAQUE_GREEN,
-						     NAUTILUS_OPACITY_FULLY_OPAQUE);
-	if (1) nautilus_scalable_font_draw_text (font,
-						 pixbuf,
-						 x,
-						 y + font_size + 4,
-						 &clip_area,
-						 font_size,
-						 text,
-						 strlen (text),
-						 NAUTILUS_RGBA_COLOR_OPAQUE_RED,
-						 opacity);
-
-	{
-		const int glyph_x = 400;
-		const int glyph_y = 300;
-		ArtIRect glyph_rect;
-		glyph = glyph_new ("x", 50);
-		
-		glyph_rect = nautilus_glyph_intersect (glyph, glyph_x, glyph_y, NULL);
-
-		nautilus_debug_pixbuf_draw_rectangle_inset (pixbuf,
-							    FALSE,
-							    glyph_rect.x0,
-							    glyph_rect.y0,
-							    glyph_rect.x1,
-							    glyph_rect.y1,
-							    0xeebbaa,
-							    0xff,
-							    -1);
-		nautilus_glyph_draw_to_pixbuf (glyph,
-					       pixbuf,
-					       glyph_x,
-					       glyph_y,
-					       NULL,
-					       0x0,
-					       0xff);
-
-		nautilus_glyph_free (glyph);
-	}
-
-	{
-		const int glyph_x = 400;
-		const int glyph_y = 350;
-		ArtIRect glyph_rect;
-		glyph = glyph_new ("x   y", 50);
-		
-		glyph_rect = nautilus_glyph_intersect (glyph, glyph_x, glyph_y, NULL);
-
-		nautilus_debug_pixbuf_draw_rectangle_inset (pixbuf,
-							    FALSE,
-							    glyph_rect.x0,
-							    glyph_rect.y0,
-							    glyph_rect.x1,
-							    glyph_rect.y1,
-							    0xeebbaa,
-							    0xff,
-							    -1);
-		nautilus_glyph_draw_to_pixbuf (glyph,
-					       pixbuf,
-					       glyph_x,
-					       glyph_y,
-					       NULL,
-					       0x0,
-					       0xff);
-
-		nautilus_glyph_free (glyph);
-	}
-
-	{
-		const int glyph_x = 400;
-		const int glyph_y = 400;
-		ArtIRect glyph_rect;
-		glyph = glyph_new (" ", 50);
-		
-		glyph_rect = nautilus_glyph_intersect (glyph, glyph_x, glyph_y, NULL);
-
-		nautilus_debug_pixbuf_draw_rectangle_inset (pixbuf,
-							    FALSE,
-							    glyph_rect.x0,
-							    glyph_rect.y0,
-							    glyph_rect.x1,
-							    glyph_rect.y1,
-							    0xeebbaa,
-							    0xff,
-							    -1);
-		nautilus_glyph_draw_to_pixbuf (glyph,
-					       pixbuf,
-					       glyph_x,
-					       glyph_y,
-					       NULL,
-					       0x0,
-					       0xff);
-
-		nautilus_glyph_free (glyph);
-	}
-
-	{
-		const int glyph_x = 400;
-		const int glyph_y = 420;
-		ArtIRect glyph_rect;
-		glyph = glyph_new ("  ", 50);
-		
-		glyph_rect = nautilus_glyph_intersect (glyph, glyph_x, glyph_y, NULL);
-
-		nautilus_debug_pixbuf_draw_rectangle_inset (pixbuf,
-							    FALSE,
-							    glyph_rect.x0,
-							    glyph_rect.y0,
-							    glyph_rect.x1,
-							    glyph_rect.y1,
-							    0xeebbaa,
-							    0xff,
-							    -1);
-		nautilus_glyph_draw_to_pixbuf (glyph,
-					       pixbuf,
-					       glyph_x,
-					       glyph_y,
-					       NULL,
-					       0x0,
-					       0xff);
-
-		nautilus_glyph_free (glyph);
-	}
-
-
-	/* This should not work.  A "" glyph is invalid */
-	if (0) {
-		const int glyph_x = 400;
-		const int glyph_y = 450;
-		ArtIRect glyph_rect;
-		glyph = glyph_new ("", 50);
-		
-		glyph_rect = nautilus_glyph_intersect (glyph, glyph_x, glyph_y, NULL);
-
-		nautilus_debug_pixbuf_draw_rectangle_inset (pixbuf,
-							    FALSE,
-							    glyph_rect.x0,
-							    glyph_rect.y0,
-							    glyph_rect.x1,
-							    glyph_rect.y1,
-							    0xeebbaa,
-							    0xff,
-							    -1);
-		nautilus_glyph_draw_to_pixbuf (glyph,
-					       pixbuf,
-					       glyph_x,
-					       glyph_y,
-					       NULL,
-					       0x0,
-					       0xff);
-
-		nautilus_glyph_free (glyph);
-	}
-	
-	nautilus_debug_show_pixbuf_in_eog (pixbuf);
-	
-	gdk_pixbuf_unref (pixbuf);
-
-	gtk_object_unref (GTK_OBJECT (font));
-
-	test_quit (0);
-
-	return 0;
-}
diff --git a/test/test-nautilus-image-background.c b/test/test-nautilus-image-background.c
deleted file mode 100644
index 424b55946..000000000
--- a/test/test-nautilus-image-background.c
+++ /dev/null
@@ -1,117 +0,0 @@
-#include "test.h"
-
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-image-with-background.h>
-
-static const char pixbuf_name[] = "/usr/share/pixmaps/gnome-globe.png";
-//static const char pixbuf_name[] = "/gnome/share/pixmaps/nautilus/arlo/i-directory-aa.png";
-//static const char tile_name[] = "/usr/share/pixmaps/gnome-monitor.png";
-static const char tile_name[] = "patterns/camouflage.png";
-static const float pixbuf_scale = 4.0;
-
-static GtkWidget *
-window_new_with_nautilus_background_image (void)
-{
-	GtkWidget *window;
-	GtkWidget *image;
-	
-	window = test_window_new ("Image with a NautilusBackground image", 10);
-	test_gtk_widget_set_background_image (window, "patterns/pale_coins.png");
-
-	image = test_image_new (pixbuf_name, tile_name, pixbuf_scale, TRUE);
-	gtk_container_add (GTK_CONTAINER (window), image);
-	gtk_widget_show (image);
-
-	return window;
-}
-
-static GtkWidget *
-window_new_with_nautilus_background_gradient (void)
-{
-	GtkWidget *window;
-	GtkWidget *image;
-	
-	window = test_window_new ("Image with a NautilusBackground gradient", 10);
-	test_gtk_widget_set_background_color (window, "rgb:0000/0000/ffff-rgb:ffff/ffff/ffff:h");
-
-	image = test_image_new (pixbuf_name, tile_name, pixbuf_scale, TRUE);
-	gtk_container_add (GTK_CONTAINER (window), image);
-	gtk_widget_show (image);
-
-	return window;
-}
-
-static GtkWidget *
-window_new_with_gtk_background (void)
-{
-	GtkWidget *window;
-	GtkWidget *image;
-	
-	window = test_window_new ("Image with a regular GTK+ background", 10);
-
-	image = test_image_new (pixbuf_name, tile_name, pixbuf_scale, FALSE);
-	gtk_container_add (GTK_CONTAINER (window), image);
-	gtk_widget_show (image);
-
-	return window;
-}
-
-static GtkWidget *
-window_new_with_gtk_background_hacked (void)
-{
-	GtkWidget *window;
-	GtkWidget *image;
-	
-	window = test_window_new ("Image with a hacked GTK+ background", 10);
-	test_gtk_widget_set_background_color (window, "rgb:ffff/0000/0000-rgb:0000/0000/ffff");
-
-	image = test_image_new (pixbuf_name, tile_name, pixbuf_scale, FALSE);
-	gtk_container_add (GTK_CONTAINER (window), image);
-	gtk_widget_show (image);
-
-	return window;
-}
-
-static GtkWidget *
-window_new_with_solid_background (void)
-{
-	GtkWidget *window;
-	GtkWidget *image;
-	
-	window = test_window_new ("Image with a solid background", 10);
-
-	test_gtk_widget_set_background_color (window, "white");
-
-	image = test_image_new (pixbuf_name, tile_name, pixbuf_scale, FALSE);
-	nautilus_image_set_background_mode (NAUTILUS_IMAGE (image), NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	nautilus_image_set_solid_background_color (NAUTILUS_IMAGE (image), NAUTILUS_RGB_COLOR_WHITE);
-
-	gtk_container_add (GTK_CONTAINER (window), image);
-	gtk_widget_show (image);
-
-	return window;
-}
-
-int 
-main (int argc, char* argv[])
-{
-	GtkWidget *window[4];
-	
-	test_init (&argc, &argv);
-	
-	if (1) window[0] = window_new_with_nautilus_background_image ();
-	if (1) window[1] = window_new_with_nautilus_background_gradient ();
-	if (1) window[2] = window_new_with_gtk_background ();
-	if (1) window[3] = window_new_with_gtk_background_hacked ();
-	if (1) window[4] = window_new_with_solid_background ();
-
-	if (1) gtk_widget_show (window[0]);
-	if (1) gtk_widget_show (window[1]);
-	if (1) gtk_widget_show (window[2]);
-	if (1) gtk_widget_show (window[3]);
-	if (1) gtk_widget_show (window[4]);
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/test/test-nautilus-image-scrolled.c b/test/test-nautilus-image-scrolled.c
deleted file mode 100644
index 6b0245ffe..000000000
--- a/test/test-nautilus-image-scrolled.c
+++ /dev/null
@@ -1,196 +0,0 @@
-#include "test.h"
-#include <libnautilus-extensions/nautilus-label.h>
-
-#if 0
-typedef struct
-{
-	GtkWidget *window;
-	GtkWidget *vbox;
-	GtkWidget *entry;
-	GtkWidget *hbox;
-	GtkWidget *smooth_toggle;
-	GtkWidget *frame;
-	GtkWidget *label;
-} Window;
-
-#if 0
-static void
-toggle_smooth_callback (GtkWidget *widget, gpointer callback_data)
-{
-	Window *window;
-	NautilusLabel *label;
-
-	window = (Window *) callback_data;
-
-	if (!NAUTILUS_IS_LABEL (window->label)) {
-		return;
-	}
-
-	label = NAUTILUS_LABEL (window->label);
-
-	nautilus_label_set_is_smooth (label, !nautilus_label_get_is_smooth (label));
-}
-#endif
-
-static Window *
-window_new (const char *title, guint border_width)
-{
-	Window *window;
-	GtkWidget *main_vbox;
-
-	window = g_new0 (Window, 1);
-
-	window->window = test_window_new (title, border_width);
-
-	main_vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (window->window), main_vbox);
-
-	window->vbox = gtk_vbox_new (FALSE, 0);
-	window->entry = gtk_entry_new ();
-	window->hbox = gtk_hbox_new (FALSE, 0);
-//	window->smooth_toggle = gtk_check_button_new_with_label ("Smooth");
-	
-	gtk_box_pack_start (GTK_BOX (main_vbox), window->vbox, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (main_vbox), window->hbox, FALSE, FALSE, 0);
-	gtk_box_pack_end (GTK_BOX (main_vbox), window->entry, FALSE, FALSE, 0);
-
-//	gtk_box_pack_start (GTK_BOX (window->hbox), window->smooth_toggle, FALSE, FALSE, 0);
-	
-	gtk_widget_show (main_vbox);
-	gtk_widget_show (window->vbox);
-	gtk_widget_show (window->hbox);
-	gtk_widget_show (window->entry);
-
-	return window;
-}
-
-static Window *
-label_window_new (const char *title,
-		   guint border_width,
-		   const char *file_name,
-		   const char *tile_file_name)
-{
-	Window *window;
-	
-	window = window_new (title, border_width);
-
-	window->frame = gtk_frame_new ("Foo");
-	window->label = nautilus_label_new (file_name);
-	
-	if (tile_file_name != NULL) {
-		nautilus_label_set_tile_pixbuf_from_file_name (NAUTILUS_LABEL (window->label),
-								tile_file_name);
-	}
-
-	gtk_container_add (GTK_CONTAINER (window->frame), window->label);
-	
-	gtk_box_pack_start (GTK_BOX (window->vbox), window->frame, TRUE, TRUE, 0);
-	
-	gtk_widget_show (window->label);
-	gtk_widget_show (window->frame);
-
-	return window;
-}
-#endif
-
-static const char text[] = 
-"The Nautilus shell is under development; it's not "
-"ready for daily use. Some features are not yet done, "
-"partly done, or unstable. The program doesn't look "
-"or act exactly the way it will in version 1.0."
-"\n\n"
-"If you do decide to test this version of Nautilus,  "
-"beware. The program could do something  "
-"unpredictable and may even delete or overwrite  "
-"files on your computer."
-"\n\n"
-"For more information, visit http://nautilus.eazel.com.";
-
-static GtkWidget *
-label_window_new (void)
-{
-	GtkWidget *window;
-	GtkWidget *label;
-	NautilusBackground *background;
-
-	window = test_window_new ("Scrolled Label Test", 10);
-
-	background = nautilus_get_widget_background (GTK_WIDGET (window));
-	nautilus_background_set_color (background, "white");
-
-	/* Label */
-	label = nautilus_label_new (text);
-	nautilus_label_set_wrap (NAUTILUS_LABEL (label), TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (label), GTK_JUSTIFY_LEFT);
-	nautilus_label_set_background_mode (NAUTILUS_LABEL (label), NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	nautilus_label_set_solid_background_color (NAUTILUS_LABEL (label), NAUTILUS_RGB_COLOR_WHITE);
-	nautilus_label_set_text_color (NAUTILUS_LABEL (label), NAUTILUS_RGB_COLOR_RED);
-	
-	gtk_container_add (GTK_CONTAINER (window), label);
-
-	gtk_widget_show (label);
-
-	return window;
-}
-
-static GtkWidget *
-label_window_new_scrolled (void)
-{
-	GtkWidget *window;
-	GtkWidget *scrolled;
-	GtkWidget *viewport;
-	GtkWidget *label;
-	NautilusBackground *background;
-
-	window = test_window_new ("Scrolled Label Test", 10);
-
-	/* Scrolled window */
-	scrolled = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
-					GTK_POLICY_NEVER,
-					GTK_POLICY_AUTOMATIC);
-	gtk_container_add (GTK_CONTAINER (window), scrolled);
-
-	/* Viewport */
- 	viewport = gtk_viewport_new (NULL, NULL);
-	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_OUT);
-	gtk_container_add (GTK_CONTAINER (scrolled), viewport);
-
-	background = nautilus_get_widget_background (GTK_WIDGET (viewport));
-	nautilus_background_set_color (background, "white");
-
-	/* Label */
-	label = nautilus_label_new (text);
-	nautilus_label_set_wrap (NAUTILUS_LABEL (label), TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (label), GTK_JUSTIFY_LEFT);
-	nautilus_label_set_background_mode (NAUTILUS_LABEL (label), NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	nautilus_label_set_solid_background_color (NAUTILUS_LABEL (label), NAUTILUS_RGB_COLOR_WHITE);
-	nautilus_label_set_text_color (NAUTILUS_LABEL (label), NAUTILUS_RGB_COLOR_RED);
-	
-	gtk_container_add (GTK_CONTAINER (viewport), label);
-
-	gtk_widget_show (label);
-	gtk_widget_show (viewport);
-	gtk_widget_show (scrolled);
-
-	return window;
-}
-
-int 
-main (int argc, char* argv[])
-{
-	GtkWidget *label_window;
-	GtkWidget *scrolled_label_window;
-	
-	test_init (&argc, &argv);
-
-	label_window = label_window_new ();
-	scrolled_label_window = label_window_new_scrolled ();
-
-	gtk_widget_show (scrolled_label_window);
-	gtk_widget_show (label_window);
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/test/test-nautilus-image-simple.c b/test/test-nautilus-image-simple.c
deleted file mode 100644
index 0e0c5c053..000000000
--- a/test/test-nautilus-image-simple.c
+++ /dev/null
@@ -1,145 +0,0 @@
-#include <config.h>
-
-#include <gtk/gtk.h>
-
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-
-#include <libgnomevfs/gnome-vfs-init.h>
-
-typedef struct
-{
-	GtkWidget *window;
-	GtkWidget *vbox;
-	GtkWidget *entry;
-	GtkWidget *hbox;
-	GtkWidget *smooth_toggle;
-	GtkWidget *image;
-} Window;
-
-static void
-delete_event (GtkWidget *widget, GdkEvent *event, gpointer callback_data)
-{
-	gtk_main_quit ();
-}
-
-static void
-toggle_smooth_callback (GtkWidget *widget, gpointer callback_data)
-{
-	Window *window;
-
-	window = (Window *) callback_data;
-
-	if (!NAUTILUS_IS_IMAGE (window->image)) {
-		return;
-	}
-
-	nautilus_image_set_is_smooth (NAUTILUS_IMAGE (window->image),
-				      nautilus_image_get_is_smooth (NAUTILUS_IMAGE (window->image)) ? FALSE : TRUE);
-}
-
-static Window *
-window_new (const char *title, guint border_width)
-{
-	Window *window;
-	GtkWidget *main_vbox;
-
-	window = g_new0 (Window, 1);
-
-	window->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	main_vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (window->window), main_vbox);
-
-	if (title != NULL) {
-
-		gtk_window_set_title (GTK_WINDOW (window->window), title);
-	}
-
-	gtk_signal_connect (GTK_OBJECT (window->window),
-			    "delete_event",
-			    GTK_SIGNAL_FUNC (delete_event),
-			    NULL);
-
-	gtk_window_set_policy (GTK_WINDOW (window->window), TRUE, TRUE, FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (window->window), border_width);
-
-	window->vbox = gtk_vbox_new (FALSE, 0);
-	window->entry = gtk_entry_new ();
-	window->hbox = gtk_hbox_new (FALSE, 0);
-	window->smooth_toggle = gtk_check_button_new_with_label ("Smooth");
-	
-	gtk_box_pack_start (GTK_BOX (main_vbox), window->vbox, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (main_vbox), window->hbox, FALSE, FALSE, 0);
-	gtk_box_pack_end (GTK_BOX (main_vbox), window->entry, FALSE, FALSE, 0);
-
-	gtk_box_pack_start (GTK_BOX (window->hbox), window->smooth_toggle, FALSE, FALSE, 0);
-	
-	gtk_widget_show (main_vbox);
-	gtk_widget_show (window->vbox);
-	gtk_widget_show (window->hbox);
-	gtk_widget_show (window->entry);
-	gtk_widget_show (window->smooth_toggle);
-	
-	gtk_signal_connect (GTK_OBJECT (window->smooth_toggle),
-			    "toggled",
-			    GTK_SIGNAL_FUNC (toggle_smooth_callback),
-			    window);
-	
-	return window;
-}
-
-static Window *
-image_window_new (const char *title,
-		   guint border_width,
-		   const char *file_name,
-		   const char *tile_file_name)
-{
-	Window *window;
-	
-	window = window_new (title, border_width);
-
-	window->image = nautilus_image_new (file_name);
-	
-	if (tile_file_name != NULL) {
-		nautilus_image_set_tile_pixbuf_from_file_name (NAUTILUS_IMAGE (window->image),
-								tile_file_name);
-	}
-
-	
-	gtk_box_pack_start (GTK_BOX (window->vbox), window->image, TRUE, TRUE, 0);
-	
-	gtk_widget_show (window->image);
-
-	gtk_widget_set_sensitive (window->smooth_toggle, TRUE);
-
-	if (nautilus_image_get_is_smooth (NAUTILUS_IMAGE (window->image))) {
-		gtk_toggle_button_toggled (GTK_TOGGLE_BUTTON (window->smooth_toggle));
-	}
-
-	return window;
-}
-
-int 
-main (int argc, char* argv[])
-{
-	Window *window;
-	
-	gtk_init (&argc, &argv);
-	gdk_rgb_init ();
-	gnome_vfs_init ();
-
-	window = image_window_new ("Nautilus Image",
-				    100,
-				    "/usr/share/pixmaps/gnome-globe.png",
-				    "/gnome/share/nautilus/patterns/pale_coins.png");
-	/* window = image_window_new ("Nautilus Image", 100, "foo.png"); */
-
-	/* debug_widget_set_background_image (window->window, "pale_coins.png"); */
-	/* debug_widget_set_background_image (window->image, "pale_coins.png"); */
-	
-	gtk_widget_show (window->window);
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/test/test-nautilus-image-table.c b/test/test-nautilus-image-table.c
deleted file mode 100644
index 9230f737d..000000000
--- a/test/test-nautilus-image-table.c
+++ /dev/null
@@ -1,302 +0,0 @@
-#include "test.h"
-
-#include <libnautilus-extensions/nautilus-image-table.h>
-#include <libnautilus-extensions/nautilus-viewport.h>
-
-static const char pixbuf_name[] = "/usr/share/pixmaps/gnome-globe.png";
-
-#define BG_COLOR 0xFFFFFF
-#define BG_COLOR_SPEC "white"
-
-static const char *names[] =
-{
-	"Tomaso Albinoni",
-	"Isaac Albéniz",
-	"Georges Bizet",
-	"Luigi Boccherini",
-	"Alexander Borodin",
-	"Johannes Brahms",
-	"Max Bruch",
-	"Anton Bruckner",
-	"Frédéric Chopin",
-	"Aaron Copland",
-	"John Corigliano",
-	"Claude Debussy",
-	"Léo Delibes",
-	"Antonín Dvorák",
-	"Edward Elgar",
-	"Manuel de Falla",
-	"George Gershwin",
-	"Alexander Glazunov",
-	"Mikhail Glinka",
-	"Enrique Granados",
-	"Edvard Grieg",
-	"Joseph Haydn",
-	"Scott Joplin",
-	"Franz Liszt",
-	"Gustav Mahler",
-	"Igor Markevitch",
-	"Felix Mendelssohn",
-	"Modest Mussorgsky",
-	"Sergei Prokofiev",
-	"Giacomo Puccini",
-	"Maurice Ravel",
-	"Ottorino Respighi",
-	"Joaquin Rodrigo",
-	"Gioachino Rossini",
-	"Domenico Scarlatti",
-	"Franz Schubert",
-	"Robert Schumann",
-	"Jean Sibelius",
-	"Bedrich Smetana",
-	"Johann Strauss",
-	"Igor Stravinsky",
-	"Giuseppe Verdi",
-	"Antonio Vivaldi",
-	"Richard Wagner",
-};
-
-static GtkWidget *
-labeled_image_new (const char *text,
-		   const char *icon_name)
-{
-	GtkWidget *image;
-	GdkPixbuf *pixbuf = NULL;
-	
-	if (icon_name) {
-		const float sizes[] = { 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0,
-					1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.0 };
-		pixbuf = test_pixbuf_new_named (icon_name, sizes[random () % NAUTILUS_N_ELEMENTS (sizes)]);
-	}
-
-	image = nautilus_labeled_image_new (text, pixbuf);
-
-	nautilus_labeled_image_set_background_mode (NAUTILUS_LABELED_IMAGE (image),
-						    NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	nautilus_labeled_image_set_solid_background_color (NAUTILUS_LABELED_IMAGE (image),
-							   BG_COLOR);
-
-	nautilus_gdk_pixbuf_unref_if_not_null (pixbuf);
-
-	return image;
-}
-
-
-static void
-image_table_child_enter_callback (GtkWidget *image_table,
-			       GtkWidget *item,
-			       gpointer callback_data)
-{
-	char *text;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (item));
-
-	text = nautilus_labeled_image_get_text (NAUTILUS_LABELED_IMAGE (item));
-
-//	g_print ("%s(%s)\n", __FUNCTION__, text);
-}
-
-static void
-image_table_child_leave_callback (GtkWidget *image_table,
-			       GtkWidget *item,
-			       gpointer callback_data)
-{
-	char *text;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (item));
-
-	text = nautilus_labeled_image_get_text (NAUTILUS_LABELED_IMAGE (item));
-
-//	g_print ("%s(%s)\n", __FUNCTION__, text);
-}
-
-static void
-image_table_child_pressed_callback (GtkWidget *image_table,
-			       GtkWidget *item,
-			       gpointer callback_data)
-{
-	char *text;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (item));
-
-	text = nautilus_labeled_image_get_text (NAUTILUS_LABELED_IMAGE (item));
-
-	g_print ("%s(%s)\n", __FUNCTION__, text);
-}
-
-static void
-image_table_child_released_callback (GtkWidget *image_table,
-				  GtkWidget *item,
-				  gpointer callback_data)
-{
-	char *text;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (item));
-
-	text = nautilus_labeled_image_get_text (NAUTILUS_LABELED_IMAGE (item));
-
-	g_print ("%s(%s)\n", __FUNCTION__, text);
-}
-
-static void
-image_table_child_clicked_callback (GtkWidget *image_table,
-				 GtkWidget *item,
-				 gpointer callback_data)
-{
-	char *text;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (item));
-
-	text = nautilus_labeled_image_get_text (NAUTILUS_LABELED_IMAGE (item));
-
-	g_print ("%s(%s)\n", __FUNCTION__, text);
-}
-
-static int
-foo_timeout (gpointer callback_data)
-{
-	static int recursion_count = 0;
-	g_return_val_if_fail (GTK_IS_WINDOW (callback_data), FALSE);
-
-	recursion_count++;
-
-	g_print ("%s(%d)\n", __FUNCTION__, recursion_count);
-	gtk_widget_queue_resize (GTK_WIDGET (callback_data));
-
-	recursion_count--;
-
-	return FALSE;
-}
-
-static void
-image_table_size_allocate (GtkWidget *image_table,
-			   GtkAllocation *allocation,
-			   gpointer callback_data)
-{
-	static int recursion_count = 0;
-
-	g_return_if_fail (NAUTILUS_IS_IMAGE_TABLE (image_table));
-	g_return_if_fail (allocation != NULL);
-	g_return_if_fail (GTK_IS_WINDOW (callback_data));
-
-	recursion_count++;
-
-	if (0) gtk_timeout_add (0, foo_timeout, callback_data);
-
-	//gtk_widget_queue_resize (GTK_WIDGET (callback_data));
-
-	if (0) gtk_widget_size_allocate (GTK_WIDGET (image_table),
-					 &GTK_WIDGET (image_table)->allocation);
-	
-	g_print ("%s(%d)\n", __FUNCTION__, recursion_count);
-
-	recursion_count--;
-}
-
-static GtkWidget *
-image_table_new_scrolled (void)
-{
-	GtkWidget *scrolled;
-	GtkWidget *viewport;
-	GtkWidget *window;
-	GtkWidget *image_table;
-	int i;
-
-	window = test_window_new ("Image Table Test", 10);
-
-	gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-
-	/* Scrolled window */
-	scrolled = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
-					GTK_POLICY_NEVER,
-					GTK_POLICY_AUTOMATIC);
-	gtk_container_add (GTK_CONTAINER (window), scrolled);
-
-	/* Viewport */
- 	viewport = nautilus_viewport_new (NULL, NULL);
-	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_OUT);
-	gtk_container_add (GTK_CONTAINER (scrolled), viewport);
-
-	image_table = nautilus_image_table_new (FALSE);
-
-	if (0) gtk_signal_connect (GTK_OBJECT (image_table),
-			    "size_allocate",
-			    GTK_SIGNAL_FUNC (image_table_size_allocate),
-			    window);
-
-	nautilus_wrap_table_set_x_justification (NAUTILUS_WRAP_TABLE (image_table),
-						 NAUTILUS_JUSTIFICATION_MIDDLE);
-	nautilus_wrap_table_set_y_justification (NAUTILUS_WRAP_TABLE (image_table),
-						 NAUTILUS_JUSTIFICATION_END);
-
-	gtk_container_add (GTK_CONTAINER (viewport), image_table);
-
-	gtk_signal_connect (GTK_OBJECT (image_table),
-			    "child_enter",
-			    GTK_SIGNAL_FUNC (image_table_child_enter_callback),
-			    NULL);
-
-	gtk_signal_connect (GTK_OBJECT (image_table),
-			    "child_leave",
-			    GTK_SIGNAL_FUNC (image_table_child_leave_callback),
-			    NULL);
-
-	gtk_signal_connect (GTK_OBJECT (image_table),
-			    "child_pressed",
-			    GTK_SIGNAL_FUNC (image_table_child_pressed_callback),
-			    NULL);
-
-	gtk_signal_connect (GTK_OBJECT (image_table),
-			    "child_released",
-			    GTK_SIGNAL_FUNC (image_table_child_released_callback),
-			    NULL);
-
-	gtk_signal_connect (GTK_OBJECT (image_table),
-			    "child_clicked",
-			    GTK_SIGNAL_FUNC (image_table_child_clicked_callback),
-			    NULL);
-
-	nautilus_gtk_widget_set_background_color (viewport, BG_COLOR_SPEC);
-
-	for (i = 0; i < 100; i++) {
-		char *text;
-		GtkWidget *image;
-
-		text = g_strdup_printf ("%s %d",
-					names[random () % NAUTILUS_N_ELEMENTS (names)],
-					i);
-		image = labeled_image_new (text, pixbuf_name);
-		g_free (text);
-
-		gtk_container_add (GTK_CONTAINER (image_table), image);
-		gtk_widget_show (image);
-	}
-
-	gtk_widget_show (viewport);
-	gtk_widget_show (scrolled);
-	gtk_widget_show (image_table);
-	
-	return window;
-}
-
-int 
-main (int argc, char* argv[])
-{
-	GtkWidget *window = NULL;
-
-	test_init (&argc, &argv);
-
-	window = image_table_new_scrolled ();
-	
-	gtk_widget_show (window);
-	
-	gtk_main ();
-	
-	return 0;
-}
diff --git a/test/test-nautilus-image-tile.c b/test/test-nautilus-image-tile.c
deleted file mode 100644
index f3bd664ab..000000000
--- a/test/test-nautilus-image-tile.c
+++ /dev/null
@@ -1,117 +0,0 @@
-#include "test.h"
-
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-image-with-background.h>
-
-static const char pixbuf_name[] = "/usr/share/pixmaps/gnome-globe.png";
-//static const char pixbuf_name[] = "/gnome/share/pixmaps/nautilus/arlo/i-directory-aa.png";
-//static const char tile_name[] = "/usr/share/pixmaps/gnome-monitor.png";
-static const char tile_name[] = "patterns/camouflage.png";
-static const float pixbuf_scale = 4.0;
-
-static GtkWidget *
-window_new_with_nautilus_background_image (void)
-{
-	GtkWidget *window;
-	GtkWidget *image;
-	
-	window = test_window_new ("Image with a NautilusBackground image", 10);
-	test_gtk_widget_set_background_image (window, "patterns/pale_coins.png");
-
-	image = test_image_new (pixbuf_name, tile_name, pixbuf_scale, TRUE);
-	gtk_container_add (GTK_CONTAINER (window), image);
-	gtk_widget_show (image);
-
-	return window;
-}
-
-static GtkWidget *
-window_new_with_nautilus_background_gradient (void)
-{
-	GtkWidget *window;
-	GtkWidget *image;
-	
-	window = test_window_new ("Image with a NautilusBackground gradient", 10);
-	test_gtk_widget_set_background_color (window, "rgb:bbbb/bbbb/eeee-rgb:ffff/ffff/ffff:h");
-
-	image = test_image_new (pixbuf_name, tile_name, pixbuf_scale, TRUE);
-	gtk_container_add (GTK_CONTAINER (window), image);
-	gtk_widget_show (image);
-
-	return window;
-}
-
-static GtkWidget *
-window_new_with_gtk_background (void)
-{
-	GtkWidget *window;
-	GtkWidget *image;
-	
-	window = test_window_new ("Image with a regular GTK+ background", 10);
-
-	image = test_image_new (pixbuf_name, tile_name, pixbuf_scale, FALSE);
-	gtk_container_add (GTK_CONTAINER (window), image);
-	gtk_widget_show (image);
-
-	return window;
-}
-
-static GtkWidget *
-window_new_with_gtk_background_hacked (void)
-{
-	GtkWidget *window;
-	GtkWidget *image;
-	
-	window = test_window_new ("Image with a hacked GTK+ background", 10);
-	test_gtk_widget_set_background_color (window, "rgb:ffff/0000/0000-rgb:0000/0000/ffff");
-
-	image = test_image_new (pixbuf_name, tile_name, pixbuf_scale, FALSE);
-	gtk_container_add (GTK_CONTAINER (window), image);
-	gtk_widget_show (image);
-
-	return window;
-}
-
-static GtkWidget *
-window_four_new (void)
-{
-	GtkWidget *window;
-	GtkWidget *image;
-	
-	window = test_window_new ("Image with a solid background", 10);
-
-	test_gtk_widget_set_background_color (window, "white");
-
-	image = test_image_new (pixbuf_name, tile_name, pixbuf_scale, FALSE);
-	nautilus_image_set_background_mode (NAUTILUS_IMAGE (image), NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	nautilus_image_set_solid_background_color (NAUTILUS_IMAGE (image), NAUTILUS_RGB_COLOR_WHITE);
-
-	gtk_container_add (GTK_CONTAINER (window), image);
-	gtk_widget_show (image);
-
-	return window;
-}
-
-int 
-main (int argc, char* argv[])
-{
-	GtkWidget *window[4];
-	
-	test_init (&argc, &argv);
-
-	if (1) window[0] = window_new_with_nautilus_background_image ();
-	if (1) window[1] = window_new_with_nautilus_background_gradient ();
-	if (1) window[2] = window_new_with_gtk_background ();
-	if (1) window[3] = window_new_with_gtk_background_hacked ();
-	if (1) window[4] = window_four_new ();
-
-	if (1) gtk_widget_show (window[0]);
-	if (1) gtk_widget_show (window[1]);
-	if (1) gtk_widget_show (window[2]);
-	if (1) gtk_widget_show (window[3]);
-	if (1) gtk_widget_show (window[4]);
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/test/test-nautilus-image.c b/test/test-nautilus-image.c
deleted file mode 100644
index a3136a5e4..000000000
--- a/test/test-nautilus-image.c
+++ /dev/null
@@ -1,452 +0,0 @@
-#include <config.h>
-
-#include <gtk/gtk.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-theme.h>
-
-#define BACKGROUND_COLOR_STRING		"white"
-#define BACKGROUND_COLOR_RGBA		nautilus_parse_rgb_with_white_default (BACKGROUND_COLOR_STRING)
-#define DROP_SHADOW_COLOR_RGBA		NAUTILUS_RGB_COLOR_BLACK
-#define TEXT_COLOR_RGBA			NAUTILUS_RGB_COLOR_WHITE
-
-#define LOGO_LEFT_SIDE_REPEAT_ICON	"eazel-logo-left-side-repeat.png"
-//#define LOGO_LEFT_SIDE_REPEAT_ICON	"temp-home.png"
-#define LOGO_RIGHT_SIDE_ICON		"eazel-logo-right-side-logo.png"
-
-#define NORMAL_FILL			"summary-service-normal-fill.png"
-#define NORMAL_LEFT_BUMPER		"summary-service-normal-left-bumper.png"
-#define NORMAL_RIGHT_BUMPER		"summary-service-normal-right-bumper.png"
-
-#define PRELIGHT_FILL			"summary-service-prelight-fill.png"
-#define PRELIGHT_LEFT_BUMPER		"summary-service-prelight-left-bumper.png"
-#define PRELIGHT_RIGHT_BUMPER		"summary-service-prelight-right-bumper.png"
-
-#define REMAINDER_LEFT_BUMPER		"summary-service-remainder-left-bumper.png"
-#define REMAINDER_FILL			"summary-service-remainder-fill.png"
-#define REMAINDER_RIGHT_BUMPER		"summary-service-remainder-right-bumper.png"
-
-static void
-delete_event (GtkWidget *widget, GdkEvent *event, gpointer callback_data)
-{
-	gtk_main_quit ();
-}
-
-static char *
-icon_get_path (const char *icon_name)
-{
-	char *icon_path;
-
-	g_return_val_if_fail (icon_name, NULL);
-
-	icon_path = nautilus_theme_get_image_path (icon_name);
-
-	return icon_path;
-}
-
-static GdkPixbuf *
-pixbuf_new_from_name (const char *name)
-{
-	char *path;
-	GdkPixbuf *pixbuf;
-
-	g_return_val_if_fail (name != NULL, NULL);
-
-	path = icon_get_path (name);
-	
-	g_return_val_if_fail (path != NULL, NULL);
-
-	pixbuf = gdk_pixbuf_new_from_file (path);
-	g_free (path);
-
-	return pixbuf;
-}
-
-static GtkWidget *
-label_new (const char *text,
-	   guint drop_shadow_offset,
-	   guint vertical_offset,
-	   guint horizontal_offset,
-	   gint xpadding,
-	   gint ypadding,
-	   guint32 background_color,
-	   guint32 drop_shadow_color,
-	   guint32 text_color,
-	   const char *tile_name)
-{
-	GtkWidget *label;
-
-	g_return_val_if_fail (text != NULL, NULL);
-	
- 	label = nautilus_label_new (text);
-	nautilus_label_set_smooth_drop_shadow_offset (NAUTILUS_LABEL (label), drop_shadow_offset);
-	nautilus_label_set_background_mode (NAUTILUS_LABEL (label), NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	nautilus_label_set_solid_background_color (NAUTILUS_LABEL (label), background_color);
-	nautilus_label_set_smooth_drop_shadow_color (NAUTILUS_LABEL (label), drop_shadow_color);
-	nautilus_label_set_text_color (NAUTILUS_LABEL (label), background_color);
-
-	//FIXME//nautilus_buffered_widget_set_vertical_offset (NAUTILUS_BUFFERED_WIDGET (label), vertical_offset);
-	//FIXME//nautilus_buffered_widget_set_horizontal_offset (NAUTILUS_BUFFERED_WIDGET (label), horizontal_offset);
-
-	gtk_misc_set_padding (GTK_MISC (label), xpadding, ypadding);
-
-	if (tile_name != NULL) {
-		GdkPixbuf *tile_pixbuf;
-
-		tile_pixbuf = pixbuf_new_from_name (tile_name);
-
-		if (tile_pixbuf != NULL) {
-			nautilus_label_set_tile_pixbuf (NAUTILUS_LABEL (label), tile_pixbuf);
-		}
-
-		nautilus_gdk_pixbuf_unref_if_not_null (tile_pixbuf);
-	}
-	
-	return label;
-}
-
-typedef struct
-{
-	GtkWidget *buffered_widget;
-	char *tile_name;
-	char *prelight_tile_name;
-	GdkPixbuf *tile_pixbuf;
-	GdkPixbuf *prelight_tile_pixbuf;
-} PrelightLabelData;
-
-static gint
-label_enter_event (GtkWidget *event_box,
-		   GdkEventCrossing *event,
-		   gpointer client_data)
-{
-	PrelightLabelData *data;
-
-	g_return_val_if_fail (GTK_IS_EVENT_BOX (event_box), TRUE);
-	g_return_val_if_fail (client_data != NULL, TRUE);
-
-	data = (PrelightLabelData *) client_data;
-
-	g_return_val_if_fail (data->prelight_tile_name, TRUE);
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (data->buffered_widget), TRUE);
-
-	//g_print ("%s(%p)\n", __FUNCTION__, data);
-
-	if (data->prelight_tile_pixbuf == NULL) {
-		data->prelight_tile_pixbuf = pixbuf_new_from_name (data->prelight_tile_name);
-	}
-
-	if (data->prelight_tile_pixbuf != NULL) {
-		nautilus_label_set_tile_pixbuf (NAUTILUS_LABEL (data->buffered_widget),
-						 data->prelight_tile_pixbuf);
-	}
-
-	return TRUE;
-}
-
-static gint
-label_leave_event (GtkWidget *event_box,
-		   GdkEventCrossing *event,
-		   gpointer client_data)
-{
-	PrelightLabelData *data;
-
-	g_return_val_if_fail (GTK_IS_EVENT_BOX (event_box), TRUE);
-	g_return_val_if_fail (client_data != NULL, TRUE);
-
-	data = (PrelightLabelData *) client_data;
-
-	g_return_val_if_fail (data->tile_name, TRUE);
-	g_return_val_if_fail (NAUTILUS_IS_LABEL (data->buffered_widget), TRUE);
-
-	if (data->tile_pixbuf == NULL) {
-		data->tile_pixbuf = pixbuf_new_from_name (data->tile_name);
-	}
-	
-	if (data->tile_pixbuf != NULL) {
-		nautilus_label_set_tile_pixbuf (NAUTILUS_LABEL (data->buffered_widget),
-						 data->tile_pixbuf);
-	}
-
-	return TRUE;
-}
-
-static void
-label_free_data (GtkWidget *event_box,
-		 gpointer client_data)
-{
-	PrelightLabelData *data;
-
-	g_return_if_fail (GTK_IS_EVENT_BOX (event_box));
-	g_return_if_fail (client_data != NULL);
-
-	data = (PrelightLabelData *) client_data;
-
-	g_free (data->tile_name);
-	g_free (data->prelight_tile_name);
-	nautilus_gdk_pixbuf_unref_if_not_null (data->tile_pixbuf);
-	nautilus_gdk_pixbuf_unref_if_not_null (data->prelight_tile_pixbuf);
-	g_free (data);
-}
-
-static GtkWidget *
-image_new (GdkPixbuf *pixbuf, GdkPixbuf *tile_pixbuf, guint32 background_color)
-{
-	GtkWidget *image;
-
-	g_return_val_if_fail (pixbuf || tile_pixbuf, NULL);
-
-	image = nautilus_image_new (NULL);
-
-	nautilus_image_set_background_mode (NAUTILUS_IMAGE (image), NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	nautilus_image_set_solid_background_color (NAUTILUS_IMAGE (image), background_color);
-
-	if (pixbuf != NULL) {
-		nautilus_image_set_pixbuf (NAUTILUS_IMAGE (image), pixbuf);
-	}
-	
-	if (tile_pixbuf != NULL) {
-		nautilus_image_set_tile_pixbuf (NAUTILUS_IMAGE (image), tile_pixbuf);
-	}
-
-	return image;
-}
-
-static GtkWidget *
-image_new_from_name (const char *icon_name, const char *tile_name, guint32 background_color)
-{
-	GtkWidget *image;
-	GdkPixbuf *pixbuf = NULL;
-	GdkPixbuf *tile_pixbuf = NULL;
-
-	g_return_val_if_fail (icon_name || tile_name, NULL);
-
-	if (icon_name) {
-		pixbuf = pixbuf_new_from_name (icon_name);
-	}
-
-	if (tile_name) {
-		tile_pixbuf = pixbuf_new_from_name (tile_name);
-	}
-
-	g_return_val_if_fail (pixbuf || tile_pixbuf, NULL);
-
-	image = image_new (pixbuf, tile_pixbuf, background_color);
-
-	nautilus_gdk_pixbuf_unref_if_not_null (pixbuf);
-	nautilus_gdk_pixbuf_unref_if_not_null (tile_pixbuf);
-
-	return image;
-}
-
-static void
-label_add_prelighting (GtkWidget *label,
-		       GtkWidget *event_box,
-		       const char *tile_name,
-		       const char *prelight_tile_name)
-{
-	PrelightLabelData *data;
-
-	g_return_if_fail (NAUTILUS_IS_LABEL (label));
-	g_return_if_fail (GTK_IS_EVENT_BOX (event_box));
-	g_return_if_fail (tile_name != NULL);
-	g_return_if_fail (prelight_tile_name != NULL);
-	
-	data = g_new0 (PrelightLabelData, 1);
-	
-	data->buffered_widget = label;
-	data->tile_name = g_strdup (tile_name);
-	data->prelight_tile_name = g_strdup (prelight_tile_name);
-	
-	gtk_signal_connect (GTK_OBJECT (event_box), "enter_notify_event", GTK_SIGNAL_FUNC (label_enter_event), data);
-	gtk_signal_connect (GTK_OBJECT (event_box), "leave_notify_event", GTK_SIGNAL_FUNC (label_leave_event), data);
-	gtk_signal_connect (GTK_OBJECT (event_box), "destroy", GTK_SIGNAL_FUNC (label_free_data), data);
-}
-
-static GtkWidget *
-header_new (const char *text)
-{
-	GtkWidget *hbox;
- 	GtkWidget *label;
- 	GtkWidget *middle;
- 	GtkWidget *logo;
-	
- 	label = label_new (text,
-			   1, 
-			   4,
-			   0,
-			   10,
-			   0,
-			   BACKGROUND_COLOR_RGBA,
-			   DROP_SHADOW_COLOR_RGBA,
-			   TEXT_COLOR_RGBA,
-			   LOGO_LEFT_SIDE_REPEAT_ICON);
-	nautilus_label_make_larger (NAUTILUS_LABEL (label), 6);
-	middle = image_new_from_name (NULL, LOGO_LEFT_SIDE_REPEAT_ICON, BACKGROUND_COLOR_RGBA);
-
-	logo = image_new_from_name (LOGO_RIGHT_SIDE_ICON, NULL, BACKGROUND_COLOR_RGBA);
-
-	hbox = gtk_hbox_new (FALSE, 0);
-
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), middle, TRUE, TRUE, 0);
-	gtk_box_pack_end (GTK_BOX (hbox), logo, FALSE, FALSE, 0);
-
-	return hbox;
-}
-
-static GtkWidget *
-footer_item_new (const char *text, gboolean has_left_bumper, gboolean has_right_bumper)
-{
-	GtkWidget *hbox;
-	GtkWidget *event_box;
-  	GtkWidget *label;
-
-	g_return_val_if_fail (text != NULL, NULL);
-	g_return_val_if_fail (text[0] != '\0', NULL);
-
-	event_box = gtk_event_box_new ();
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (event_box), hbox);
-
-	if (has_left_bumper) {
-		GtkWidget *left;
-		left = image_new_from_name (NORMAL_LEFT_BUMPER, NORMAL_FILL, BACKGROUND_COLOR_RGBA);
-		//FIXME//buffered_widget_add_prelighting (left, event_box, NORMAL_FILL, PRELIGHT_FILL);
-		gtk_box_pack_start (GTK_BOX (hbox), left, FALSE, FALSE, 0);
-	}
-
- 	label = label_new (text,
-			   1,
-			   2,
-			   0,
-			   8,
-			   0,
-			   BACKGROUND_COLOR_RGBA,
-			   DROP_SHADOW_COLOR_RGBA,
-			   TEXT_COLOR_RGBA,
-			   NORMAL_FILL);
-
-	label_add_prelighting (label, event_box, NORMAL_FILL, PRELIGHT_FILL);
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	if (has_right_bumper) {
-		GtkWidget *right;
-		right = image_new_from_name (NORMAL_RIGHT_BUMPER, NORMAL_FILL, BACKGROUND_COLOR_RGBA);
-		//FIXME//buffered_widget_add_prelighting (right, event_box, NORMAL_FILL, PRELIGHT_FILL);
-		gtk_box_pack_start (GTK_BOX (hbox), right, FALSE, FALSE, 0);
-	}
-
-	return event_box;
-}
-
-static GtkWidget *
-footer_remainder_new (void)
-{
-	GtkWidget *hbox;
-	GtkWidget *left;
-	GtkWidget *fill;
-	GtkWidget *right;
-
-	hbox = gtk_hbox_new (FALSE, 0);
-
-	left = image_new_from_name (REMAINDER_LEFT_BUMPER, NULL, BACKGROUND_COLOR_RGBA);
-	fill = image_new_from_name (NULL, REMAINDER_FILL, BACKGROUND_COLOR_RGBA);
-	right = image_new_from_name (REMAINDER_RIGHT_BUMPER, NULL, BACKGROUND_COLOR_RGBA);
-
-	gtk_box_pack_start (GTK_BOX (hbox), left, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), fill, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), right, FALSE, FALSE, 0);
-
-	return hbox;
-}
-
-static GtkWidget *
-footer_new (const char *items[], guint num_items)
-{
-	GtkWidget *hbox;
-	GtkWidget *remainder;
-	GtkWidget *date;
-	guint i;
-
-	g_return_val_if_fail (items != NULL, NULL);
-	g_return_val_if_fail (num_items > 0, NULL);
-
-	hbox = gtk_hbox_new (FALSE, 0);
-
-	for (i = 0; i < num_items; i++) {
-		GtkWidget *item;
-		
-		item = footer_item_new (items[i], i > 0, i < (num_items - 1));
-		
-		gtk_box_pack_start (GTK_BOX (hbox), item, FALSE, FALSE, 0);
-	}
-
-	remainder = footer_remainder_new ();
-	gtk_box_pack_start (GTK_BOX (hbox), remainder, TRUE, TRUE, 0);
-
- 	date = label_new ("Friday, October 13th",
-			  1,
-			  2,
-			  0,
-			  8,
-			  0,
-			  BACKGROUND_COLOR_RGBA,
-			  DROP_SHADOW_COLOR_RGBA,
-			  TEXT_COLOR_RGBA,
-			  NORMAL_FILL);
-
-	gtk_box_pack_start (GTK_BOX (hbox), date, FALSE, FALSE, 0);
-
-	return hbox;
-}
-
-static const char *footer_items[] = 
-{
-	"Register",
-	"Login",
-	"Terms of Use",
-	"Privacy Statement"
-};
-
-int 
-main (int argc, char* argv[])
-{
-	GtkWidget *window;
-	GtkWidget *vbox;
-	GtkWidget *header;
-	GtkWidget *footer;
-	GtkWidget *content;
-	
-	gtk_init (&argc, &argv);
-	gdk_rgb_init ();
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	nautilus_gtk_widget_set_background_color (window, BACKGROUND_COLOR_STRING);
-	gtk_signal_connect (GTK_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC (delete_event), NULL);
-	gtk_window_set_title (GTK_WINDOW (window), "Nautilus Wrapped Label Test");
-	gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-	gtk_widget_set_usize (window, 640, 480);
-	
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (window), vbox);
-
-	header = header_new ("Welcome back, Arlo!");
-	content = gtk_vbox_new (FALSE, 0);
-
-	footer = footer_new (footer_items, NAUTILUS_N_ELEMENTS (footer_items));
-	
-	gtk_box_pack_start (GTK_BOX (vbox), header, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), content, TRUE, TRUE, 0);
-	gtk_box_pack_end (GTK_BOX (vbox), footer, FALSE, FALSE, 0);
-
-	gtk_widget_show_all (window);
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/test/test-nautilus-label-background.c b/test/test-nautilus-label-background.c
deleted file mode 100644
index 4a7869ce1..000000000
--- a/test/test-nautilus-label-background.c
+++ /dev/null
@@ -1,114 +0,0 @@
-#include "test.h"
-
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-label-with-background.h>
-
-static const char tile_name[] = "patterns/camouflage.png";
-//static const char *tile_name = NULL;
-
-static GtkWidget *
-window_new_with_nautilus_background_image (void)
-{
-	GtkWidget *window;
-	GtkWidget *label;
-	
-	window = test_window_new ("Label with a NautilusBackground label", 10);
-	test_gtk_widget_set_background_image (window, "patterns/pale_coins.png");
-
-	label = test_label_new ("Something", tile_name, TRUE, 30);
-	gtk_container_add (GTK_CONTAINER (window), label);
-	gtk_widget_show (label);
-
-	return window;
-}
-
-static GtkWidget *
-window_new_with_nautilus_background_gradient (void)
-{
-	GtkWidget *window;
-	GtkWidget *label;
-	
-	window = test_window_new ("Label with a NautilusBackground gradient", 10);
-	test_gtk_widget_set_background_color (window, "rgb:0000/0000/ffff-rgb:ffff/ffff/ffff:h");
-
-	label = test_label_new ("Something", tile_name, TRUE, 30);
-	gtk_container_add (GTK_CONTAINER (window), label);
-	gtk_widget_show (label);
-
-	return window;
-}
-
-static GtkWidget *
-window_new_with_gtk_background (void)
-{
-	GtkWidget *window;
-	GtkWidget *label;
-	
-	window = test_window_new ("Label with a regular GTK+ background", 10);
-
-	label = test_label_new ("Something", tile_name, FALSE, 30);
-	gtk_container_add (GTK_CONTAINER (window), label);
-	gtk_widget_show (label);
-
-	return window;
-}
-
-static GtkWidget *
-window_new_with_gtk_background_hacked (void)
-{
-	GtkWidget *window;
-	GtkWidget *label;
-	
-	window = test_window_new ("Label with a hacked GTK+ background", 10);
-	test_gtk_widget_set_background_color (window, "rgb:ffff/0000/0000-rgb:0000/0000/ffff");
-
-	label = test_label_new ("Something", tile_name, FALSE, 30);
-	gtk_container_add (GTK_CONTAINER (window), label);
-	gtk_widget_show (label);
-
-	return window;
-}
-
-static GtkWidget *
-window_new_with_solid_background (void)
-{
-	GtkWidget *window;
-	GtkWidget *label;
-	
-	window = test_window_new ("Label with a solid background", 10);
-
-	test_gtk_widget_set_background_color (window, "white");
-
-	label = test_label_new ("Something", tile_name, FALSE, 30);
-	nautilus_label_set_background_mode (NAUTILUS_LABEL (label), NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	nautilus_label_set_solid_background_color (NAUTILUS_LABEL (label), NAUTILUS_RGB_COLOR_WHITE);
-
-	gtk_container_add (GTK_CONTAINER (window), label);
-	gtk_widget_show (label);
-
-	return window;
-}
-
-int 
-main (int argc, char* argv[])
-{
-	GtkWidget *window[4];
-	
-	test_init (&argc, &argv);
-
-	if (1) window[0] = window_new_with_nautilus_background_image ();
-	if (1) window[1] = window_new_with_nautilus_background_gradient ();
-	if (1) window[2] = window_new_with_gtk_background ();
-	if (1) window[3] = window_new_with_gtk_background_hacked ();
-	if (1) window[4] = window_new_with_solid_background ();
-
-	if (1) gtk_widget_show (window[0]);
-	if (1) gtk_widget_show (window[1]);
-	if (1) gtk_widget_show (window[2]);
-	if (1) gtk_widget_show (window[3]);
-	if (1) gtk_widget_show (window[4]);
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/test/test-nautilus-label-flavorful.c b/test/test-nautilus-label-flavorful.c
deleted file mode 100644
index 7c2f52890..000000000
--- a/test/test-nautilus-label-flavorful.c
+++ /dev/null
@@ -1,201 +0,0 @@
-
-#include <config.h>
-
-#include <gtk/gtk.h>
-
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-string.h>
-#include <libnautilus-extensions/nautilus-string-list.h>
-#include <libnautilus-extensions/nautilus-gdk-font-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-
-#include <gdk/gdkx.h>
-#include <gdk/gdkprivate.h>
-
-static void
-delete_event (GtkWidget *widget, GdkEvent *event, gpointer callback_data)
-{
-	gtk_main_quit ();
-}
-
-static char *
-font_get_name (const GdkFont *font)
-{
-	GdkFontPrivate *font_private;
-	const char *font_name;
-
-	font_private = (GdkFontPrivate *)font;
-
-	if (font_private->names == NULL) {
-		return NULL;
-	}
-
-	font_name = g_slist_nth_data (font_private->names, 0);
-
-	return font_name ? g_strdup (font_name) : NULL;
-}
-
-static void
-label_set_label_to_font_name (GtkLabel *label)
-{
-	char *font_name;
-
-	g_return_if_fail (GTK_IS_LABEL (label));
-
-	font_name = font_get_name (GTK_WIDGET (label)->style->font);
-
-	gtk_label_set_text (label, font_name);
-
-	g_free (font_name);
-}
-
-static void
-increasing_label_window_new (void)
-{
-	GtkWidget *window;
-	GtkWidget *vbox;
-	guint i;
-
-	const guint num_labels = 20;
-	
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	gtk_signal_connect (GTK_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC (delete_event), NULL);
-	gtk_window_set_title (GTK_WINDOW (window), "Labels with increasing sizes");
-	gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (window), vbox);
-
-	for (i = 0; i < num_labels; i++) {
-		char *text;
-		GtkWidget *label;
-
-		if (i > 0) {
-			text = g_strdup_printf ("A Label %d size(s) Larger", i);
-		} else {
-			text = g_strdup ("A standard Label");
-		}
-		
-		label = nautilus_label_new (text);
-		gtk_widget_ensure_style (label);
-
-		gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
-
-		if (i > 0) {
-			nautilus_label_make_larger (NAUTILUS_LABEL (label), i);
-		}
-		
-		gtk_widget_show (label);
-
-		label_set_label_to_font_name (GTK_LABEL (label));
-
-		g_free (text);
-	}
-	
-	gtk_widget_show (vbox);
-	gtk_widget_show (window);
-}
-
-static void
-decreasing_label_window_new (void)
-{
-	GtkWidget *window;
-	GtkWidget *vbox;
-	guint i;
-
-	const guint num_labels = 6;
-	
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	gtk_signal_connect (GTK_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC (delete_event), NULL);
-	gtk_window_set_title (GTK_WINDOW (window), "Labels with increasing sizes");
-	gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (window), vbox);
-
-	for (i = 0; i < num_labels; i++) {
-		char *text;
-		GtkWidget *label;
-
-// 		if (i > 0) {
-// 			text = g_strdup_printf ("A Label %d size(s) Smaller", i);
-// 		} else {
-			text = g_strdup ("A standard Label");
-// 		}
-		
-		label = nautilus_label_new (text);
-		gtk_widget_ensure_style (label);
-
-		gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
-		
-		if (i > 0) {
-			nautilus_label_make_smaller (NAUTILUS_LABEL (label), i);
-		}
-		
-		gtk_widget_show (label);
-		
-		g_free (text);
-	}
-	
-	gtk_widget_show (vbox);
-	gtk_widget_show (window);
-}
-
-int 
-main (int argc, char* argv[])
-{
-	GtkWidget *window;
-	GtkWidget *label;
-	GtkWidget *vbox;
-	GtkWidget *bold_label;
-	GtkWidget *large_label;
-	GtkWidget *small_label;
-
-	gtk_init (&argc, &argv);
-	gdk_rgb_init ();
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	gtk_signal_connect (GTK_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC (delete_event), NULL);
-	gtk_window_set_title (GTK_WINDOW (window), "Foo");
-	gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (window), vbox);
-
- 	label = nautilus_label_new ("This is a label");
- 	bold_label = nautilus_label_new ("This is a label");
- 	large_label = nautilus_label_new ("This is a label");
- 	small_label = nautilus_label_new ("This is a label");
-	
-	gtk_widget_ensure_style (label);
-	gtk_widget_ensure_style (bold_label);
-	gtk_widget_ensure_style (large_label);
-	gtk_widget_ensure_style (small_label);
-
-	nautilus_gtk_label_make_bold (GTK_LABEL (bold_label));
-
-	nautilus_gtk_label_make_larger (GTK_LABEL (large_label), 2);
-	
-	nautilus_gtk_label_make_smaller (GTK_LABEL (small_label), 4);
-
-	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), bold_label, FALSE, FALSE, 20);
-	gtk_box_pack_start (GTK_BOX (vbox), large_label, FALSE, FALSE, 20);
-	gtk_box_pack_start (GTK_BOX (vbox), small_label, FALSE, FALSE, 20);
-
-	gtk_widget_show_all (window);
-
-	if (1) increasing_label_window_new ();
-	if (1) decreasing_label_window_new ();
-	
-	gtk_main ();
-
-	return 0;
-}
-
diff --git a/test/test-nautilus-label-offset.c b/test/test-nautilus-label-offset.c
deleted file mode 100644
index 27f6add1e..000000000
--- a/test/test-nautilus-label-offset.c
+++ /dev/null
@@ -1,77 +0,0 @@
-#include <config.h>
-
-#include "test.h"
-
-int 
-main (int argc, char* argv[])
-{
-	GtkWidget *window;
-	GtkWidget *frame;
-	GtkWidget *pixmap;
-	GtkWidget *hbox;
-	GtkWidget *vbox;
-	GtkWidget *text;
-	GtkWidget *main_box;
-	char *file_name;
-
-	test_init (&argc, &argv);
-
-	window = test_window_new ("Caveat", 10);
-	main_box = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (window), main_box);
-	gtk_widget_show (main_box);
-  	gtk_container_set_border_width (GTK_CONTAINER (window), GNOME_PAD);
-  	gtk_window_set_policy (GTK_WINDOW (window), FALSE, FALSE, FALSE);
-	gtk_window_set_wmclass (GTK_WINDOW (window), "caveat", "Nautilus");
-
-  	hbox = gtk_hbox_new (FALSE, GNOME_PAD);
-  	gtk_container_set_border_width (GTK_CONTAINER (hbox), GNOME_PAD);
-  	gtk_widget_show (hbox);
-  	gtk_box_pack_start (GTK_BOX (main_box), 
-  			    hbox,
-  			    FALSE, FALSE, 0);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (vbox);
-	gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
-
-	file_name = nautilus_pixmap_file ("About_Image.png");
-	if (file_name != NULL) {
-		pixmap = nautilus_image_new (file_name);
-		g_free (file_name);
-
-		if (pixmap != NULL) {
-			frame = gtk_frame_new (NULL);
-			gtk_widget_show (frame);
-			gtk_frame_set_shadow_type (GTK_FRAME (frame),
-						   GTK_SHADOW_IN);
-			gtk_box_pack_start (GTK_BOX (vbox), frame,
-					    FALSE, FALSE, 0);
-
-			gtk_widget_show (pixmap);
-			gtk_container_add (GTK_CONTAINER (frame), pixmap);
-		}
-	}
-
-  	text = nautilus_label_new
-		(_("Thank you for your interest in Nautilus.\n "
-		   "\n"
-		   "As with any software under development, you should exercise caution when "
-		   "using Nautilus.  Eazel does not provide any guarantee that it will work "
-		   "properly, or assume any liability for your use of it.  Please use it at your "
-		   "own risk.\n"
-		   "\n"
-		   "Please visit http://www.eazel.com/feedback.html to provide feedback, "
-		   "comments, and suggestions."));
-	nautilus_label_make_larger (NAUTILUS_LABEL (text), 1);
-	nautilus_label_set_justify (NAUTILUS_LABEL (text), GTK_JUSTIFY_LEFT);
-	nautilus_label_set_wrap (NAUTILUS_LABEL (text), TRUE);
-	gtk_widget_show (text);
-  	gtk_box_pack_start (GTK_BOX (hbox), text, FALSE, FALSE, 0);
-
-	gtk_widget_show_all (GTK_WIDGET (window));
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/test/test-nautilus-label-scrolled.c b/test/test-nautilus-label-scrolled.c
deleted file mode 100644
index 2480c2853..000000000
--- a/test/test-nautilus-label-scrolled.c
+++ /dev/null
@@ -1,202 +0,0 @@
-#include "test.h"
-#include <libnautilus-extensions/nautilus-label.h>
-
-static const char text[] = 
-"The Nautilus shell is under development; it's not "
-"ready for daily use. Some features are not yet done, "
-"partly done, or unstable. The program doesn't look "
-"or act exactly the way it will in version 1.0."
-"\n\n"
-"If you do decide to test this version of Nautilus,  "
-"beware. The program could do something  "
-"unpredictable and may even delete or overwrite  "
-"files on your computer."
-"\n\n"
-"For more information, visit http://nautilus.eazel.com.";
-
-static GtkWidget *
-label_window_new (void)
-{
-	GtkWidget *window;
-	GtkWidget *label;
-	NautilusBackground *background;
-
-	window = test_window_new ("Scrolled Label Test", 10);
-
-	background = nautilus_get_widget_background (GTK_WIDGET (window));
-	nautilus_background_set_color (background, "white");
-
-	/* Label */
-	label = nautilus_label_new_solid (text,
-					  0,
-					  0,
-					  NAUTILUS_RGB_COLOR_RED,
-					  0.5,
-					  0.5,
-					  0,
-					  0,
-					  NAUTILUS_RGB_COLOR_WHITE,
-					  NULL);
-	nautilus_label_set_wrap (NAUTILUS_LABEL (label), TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (label), GTK_JUSTIFY_LEFT);
-	
-	gtk_container_add (GTK_CONTAINER (window), label);
-
-	gtk_widget_show (label);
-
-	return window;
-}
-
-static GtkWidget *
-label_window_new_scrolled (void)
-{
-	GtkWidget *window;
-	GtkWidget *scrolled;
-	GtkWidget *viewport;
-	GtkWidget *label;
-	NautilusBackground *background;
-
-	window = test_window_new ("Scrolled Label Test", 10);
-
-	/* Scrolled window */
-	scrolled = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
-					GTK_POLICY_NEVER,
-					GTK_POLICY_AUTOMATIC);
-	gtk_container_add (GTK_CONTAINER (window), scrolled);
-
-	/* Viewport */
- 	viewport = gtk_viewport_new (NULL, NULL);
-	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_OUT);
-	gtk_container_add (GTK_CONTAINER (scrolled), viewport);
-
-	background = nautilus_get_widget_background (GTK_WIDGET (viewport));
-	nautilus_background_set_color (background, "white");
-
-	/* Label */
-	label = nautilus_label_new_solid (text,
-					  0,
-					  0,
-					  NAUTILUS_RGB_COLOR_RED,
-					  0.5,
-					  0.5,
-					  0,
-					  0,
-					  NAUTILUS_RGB_COLOR_WHITE,
-					  NULL);
-	nautilus_label_set_wrap (NAUTILUS_LABEL (label), TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (label), GTK_JUSTIFY_LEFT);
-//	nautilus_label_make_larger (NAUTILUS_LABEL (label), 10);
-
-	gtk_container_add (GTK_CONTAINER (viewport), label);
-
-	gtk_widget_show (label);
-	gtk_widget_show (viewport);
-	gtk_widget_show (scrolled);
-
-	return window;
-}
-
-static GtkWidget *
-label_window_new_table (void)
-{
-	GtkWidget *window;
-	GtkWidget *scrolled;
-	GtkWidget *viewport;
-	GtkWidget *label[3];
-	GtkWidget *table;
-	NautilusBackground *background;
-
-	window = test_window_new ("Scrolled Label Test", 10);
-
-	/* Scrolled window */
-	scrolled = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
-					GTK_POLICY_NEVER,
-					GTK_POLICY_AUTOMATIC);
-	gtk_container_add (GTK_CONTAINER (window), scrolled);
-
-	/* Viewport */
- 	viewport = gtk_viewport_new (NULL, NULL);
-	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_OUT);
-	gtk_container_add (GTK_CONTAINER (scrolled), viewport);
-
-	background = nautilus_get_widget_background (GTK_WIDGET (viewport));
-	nautilus_background_set_color (background, "white");
-
-	/* Table */
-	table = gtk_table_new (20, 4, TRUE);
-	gtk_container_add (GTK_CONTAINER (viewport), table);
-
-	/* Label */
-	label[0] = nautilus_label_new_solid ("Label One",
-					     0,
-					     0,
-					     NAUTILUS_RGB_COLOR_RED,
-					     0.5,
-					     0.5,
-					     0,
-					     0,
-					     NAUTILUS_RGB_COLOR_WHITE,
-					     NULL);
-
-	label[1] = nautilus_label_new_solid ("Label Two",
-					     0,
-					     0,
-					     NAUTILUS_RGB_COLOR_GREEN,
-					     0.5,
-					     0.5,
-					     0,
-					     0,
-					     NAUTILUS_RGB_COLOR_WHITE,
-					     NULL);
-
-	label[2] = nautilus_label_new_solid ("Label Three",
-					     0,
-					     0,
-					     NAUTILUS_RGB_COLOR_BLUE,
-					     0.5,
-					     0.5,
-					     0,
-					     0,
-					     NAUTILUS_RGB_COLOR_WHITE,
-					     NULL);
-//	nautilus_label_make_larger (NAUTILUS_LABEL (label[2]), 40);
-	
-	gtk_table_attach (GTK_TABLE (table), label[0], 0, 1, 0, 1, GTK_FILL, GTK_FILL, 4, 4);
-	gtk_table_attach (GTK_TABLE (table), label[1], 1, 2, 18, 19, GTK_FILL, GTK_FILL, 4, 4);
-	gtk_table_attach (GTK_TABLE (table), label[2], 0, 1, 1, 2, GTK_FILL, GTK_FILL, 4, 4);
-
-	gtk_widget_show (label[0]);
-	gtk_widget_show (label[1]);
-	gtk_widget_show (label[2]);
-	gtk_widget_show (table);
-	gtk_widget_show (viewport);
-	gtk_widget_show (scrolled);
-
-	gtk_widget_queue_resize (GTK_WIDGET (label[2])->parent);
-
-	return window;
-}
-
-int 
-main (int argc, char* argv[])
-{
-	GtkWidget *label_window;
-	GtkWidget *scrolled_label_window;
-	GtkWidget *table_label_window;
-	
-	test_init (&argc, &argv);
-
-	label_window = label_window_new ();
-	scrolled_label_window = label_window_new_scrolled ();
-	table_label_window = label_window_new_table ();
-
-	if (1) gtk_widget_show (scrolled_label_window);
-	if (0) gtk_widget_show (label_window);
-	if (0) gtk_widget_show (table_label_window);
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/test/test-nautilus-label-simple.c b/test/test-nautilus-label-simple.c
deleted file mode 100644
index 471c0bdd9..000000000
--- a/test/test-nautilus-label-simple.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "test.h"
-
-static void
-use_system_font_callback (GtkButton *button,
-			  GtkLabel *label)
-{
-	GdkFont *system_font;
-
-	g_return_if_fail (GTK_IS_BUTTON (button));
-	g_return_if_fail (GTK_IS_LABEL (label));
-
-	system_font = nautilus_gtk_get_system_font ();
-	
-	g_return_if_fail (system_font != NULL);
-
-	nautilus_gtk_widget_set_font (GTK_WIDGET (label), system_font);
-
-	gdk_font_unref (system_font);
-}
-
-static void
-use_system_font_bold_callback (GtkButton *button,
-			       GtkLabel *label)
-{
-	g_return_if_fail (GTK_IS_BUTTON (button));
-	g_return_if_fail (GTK_IS_LABEL (label));
-
-	use_system_font_callback (button, label);
-	nautilus_label_make_bold (NAUTILUS_LABEL (label));
-}
-
-int 
-main (int argc, char* argv[])
-{
-	//const char *text = "This is a very intersting label\nThat has more\nthan one line.";
-	const char *text = "Something";
-	GtkWidget *window;
-	GtkWidget *vbox;
-	GtkWidget *label1;
-	GtkWidget *label2;
-	GtkWidget *use_system_font;
-
-	test_init (&argc, &argv);
-
-	window = test_window_new ("Simple Label Test", 20);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (window), vbox);
-
-	label1 = nautilus_label_new ("");
-	nautilus_label_make_larger (NAUTILUS_LABEL (label1), 40);
-	nautilus_label_set_wrap (NAUTILUS_LABEL (label1), TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (label1), GTK_JUSTIFY_CENTER);
-	nautilus_label_set_text (NAUTILUS_LABEL (label1), text);
-	gtk_box_pack_start (GTK_BOX (vbox), label1, TRUE, TRUE, 0);
-
-	label2 = nautilus_label_new ("");
-	nautilus_label_make_larger (NAUTILUS_LABEL (label2), 40);
-	nautilus_label_make_bold (NAUTILUS_LABEL (label2));
-	nautilus_label_set_wrap (NAUTILUS_LABEL (label2), TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (label2), GTK_JUSTIFY_CENTER);
-	nautilus_label_set_text (NAUTILUS_LABEL (label2), text);
-	gtk_box_pack_start (GTK_BOX (vbox), label2, TRUE, TRUE, 0);
-
-	use_system_font = gtk_button_new_with_label ("Use System Font");
-	gtk_box_pack_start (GTK_BOX (vbox), use_system_font, TRUE, FALSE, 0);
-
-	gtk_signal_connect (GTK_OBJECT (use_system_font),
-			    "clicked",
-			    GTK_SIGNAL_FUNC (use_system_font_callback),
-			    label1);
-
-	gtk_signal_connect (GTK_OBJECT (use_system_font),
-			    "clicked",
-			    GTK_SIGNAL_FUNC (use_system_font_bold_callback),
-			    label2);
-	
-	gtk_widget_show_all (window);
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/test/test-nautilus-label-wrapped.c b/test/test-nautilus-label-wrapped.c
deleted file mode 100644
index 1fc1f1b0b..000000000
--- a/test/test-nautilus-label-wrapped.c
+++ /dev/null
@@ -1,121 +0,0 @@
-#include <config.h>
-
-#include <gtk/gtk.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-
-static void
-delete_event (GtkWidget *widget, GdkEvent *event, gpointer callback_data)
-{
-	gtk_main_quit ();
-}
-
-
-static const char text[] = 
-"The Nautilus shell is under development; it's not "
-"ready for daily use. Some features are not yet done, "
-"partly done, or unstable. The program doesn't look "
-"or act exactly the way it will in version 1.0."
-"\n\n"
-"If you do decide to test this version of Nautilus,  "
-"beware. The program could do something  "
-"unpredictable and may even delete or overwrite  "
-"files on your computer."
-"\n\n"
-"For more information, visit http://nautilus.eazel.com.";
-
-static GtkWidget *
-create_gtk_label ()
-{
-	GtkWidget *label;
-
- 	label = gtk_label_new (text);
-	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-	
-	return label;
-}
-
-static GtkWidget *
-create_nautilus_label (gboolean adjust_wrap_on_resize)
-{
-	GtkWidget *label;
-
- 	label = nautilus_label_new (text);
-	nautilus_label_set_wrap (NAUTILUS_LABEL (label), TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (label), GTK_JUSTIFY_LEFT);
-	nautilus_label_set_smooth_drop_shadow_offset (NAUTILUS_LABEL (label), 1);
- 	nautilus_label_set_background_mode (NAUTILUS_LABEL (label), NAUTILUS_SMOOTH_BACKGROUND_SOLID_COLOR);
-	nautilus_label_set_solid_background_color (NAUTILUS_LABEL (label), NAUTILUS_RGB_COLOR_WHITE);
-	nautilus_label_set_smooth_drop_shadow_color (NAUTILUS_LABEL (label), NAUTILUS_RGB_COLOR_BLUE);
-	nautilus_label_set_text_color (NAUTILUS_LABEL (label), NAUTILUS_RGB_COLOR_RED);
-	nautilus_label_set_adjust_wrap_on_resize (NAUTILUS_LABEL (label), adjust_wrap_on_resize);
-
-	return label;
-}
-
-static GtkWidget *
-create_gtk_label_window (void)
-{
-	GtkWidget *gtk_window;
-	GtkWidget *gtk_vbox;
-	GtkWidget *gtk_label;
-
-	gtk_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	nautilus_gtk_widget_set_background_color (gtk_window, "white");
-	gtk_signal_connect (GTK_OBJECT (gtk_window), "delete_event", GTK_SIGNAL_FUNC (delete_event), NULL);
-	gtk_window_set_title (GTK_WINDOW (gtk_window), "Gtk Wrapped Label Test");
-	gtk_window_set_policy (GTK_WINDOW (gtk_window), TRUE, TRUE, FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (gtk_window), 10);
-	gtk_vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (gtk_window), gtk_vbox);
- 	gtk_label = create_gtk_label ();
-	gtk_box_pack_start (GTK_BOX (gtk_vbox), gtk_label, TRUE, TRUE, 0);
-
-	return gtk_window;
-}
-
-static GtkWidget *
-create_nautilus_label_window (gboolean adjust_wrap_on_resize)
-{
-	GtkWidget *nautilus_window;
-	GtkWidget *nautilus_vbox;
-	GtkWidget *nautilus_label;
-
-	nautilus_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	nautilus_gtk_widget_set_background_color (nautilus_window, "white");
-	gtk_signal_connect (GTK_OBJECT (nautilus_window), "delete_event", GTK_SIGNAL_FUNC (delete_event), NULL);
-	gtk_window_set_title (GTK_WINDOW (nautilus_window), "Nautilus Wrapped Label Test");
-	gtk_window_set_policy (GTK_WINDOW (nautilus_window), TRUE, TRUE, FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (nautilus_window), 10);
-	nautilus_vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (nautilus_window), nautilus_vbox);
- 	nautilus_label = create_nautilus_label (adjust_wrap_on_resize);
-	gtk_box_pack_start (GTK_BOX (nautilus_vbox), nautilus_label, TRUE, TRUE, 0);
-
-	return nautilus_window;
-}
-
-int 
-main (int argc, char* argv[])
-{
-	GtkWidget *nautilus_window = NULL;
-	GtkWidget *nautilus_window_wrapped = NULL;
-	GtkWidget *gtk_window = NULL;
-
-	gtk_init (&argc, &argv);
-	gdk_rgb_init ();
-
-	if (0) nautilus_window = create_nautilus_label_window (FALSE);
-	if (1) nautilus_window_wrapped = create_nautilus_label_window (TRUE);
-	if (0) gtk_window =  create_gtk_label_window ();
-
-	if (nautilus_window) gtk_widget_show_all (nautilus_window);
-	if (nautilus_window_wrapped) gtk_widget_show_all (nautilus_window_wrapped);
-	if (gtk_window) gtk_widget_show_all (gtk_window);
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/test/test-nautilus-label.c b/test/test-nautilus-label.c
deleted file mode 100644
index e6ad7afd6..000000000
--- a/test/test-nautilus-label.c
+++ /dev/null
@@ -1,729 +0,0 @@
-#include <config.h>
-
-#include <gtk/gtk.h>
-#include <libgnomevfs/gnome-vfs-init.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-font-picker.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-icon-factory.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-scalable-font.h>
-#include <libnautilus-extensions/nautilus-string-list.h>
-#include <libnautilus-extensions/nautilus-string-picker.h>
-#include <libnautilus-extensions/nautilus-string.h>
-#include <libnautilus-extensions/nautilus-text-caption.h>
-
-static char *widget_get_nautilus_background_color (GtkWidget  *widget);
-static void  widget_set_nautilus_background_image (GtkWidget  *widget,
-						   const char *image_name);
-static void  widget_set_nautilus_background_color (GtkWidget  *widget,
-						   const char *color);
-
-static void
-red_label_color_value_changed_callback (GtkAdjustment *adjustment, gpointer client_data)
-{
-	NautilusLabel	 *label;
-	guint32		  color;
-
-	g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-	g_return_if_fail (NAUTILUS_IS_LABEL (client_data));
-
-	label = NAUTILUS_LABEL (client_data);
-	
-	color = nautilus_label_get_text_color (label);
-
-	color = NAUTILUS_RGBA_COLOR_PACK ((guchar) adjustment->value,
-					  NAUTILUS_RGBA_COLOR_GET_G (color),
-					  NAUTILUS_RGBA_COLOR_GET_B (color),
-					  NAUTILUS_RGBA_COLOR_GET_A (color));
-	
-	nautilus_label_set_text_color (label, color);
-}
-
-static void
-green_label_color_value_changed_callback (GtkAdjustment *adjustment, gpointer client_data)
-{
-	NautilusLabel	 *label;
-	guint32		  color;
-
-	g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-	g_return_if_fail (NAUTILUS_IS_LABEL (client_data));
-
-	label = NAUTILUS_LABEL (client_data);
-	
-	color = nautilus_label_get_text_color (label);
-
-	color = NAUTILUS_RGBA_COLOR_PACK (NAUTILUS_RGBA_COLOR_GET_R (color),
-					  (guchar) adjustment->value,
-					  NAUTILUS_RGBA_COLOR_GET_B (color),
-					  NAUTILUS_RGBA_COLOR_GET_A (color));
-	
-	nautilus_label_set_text_color (label, color);
-}
-
-static void
-blue_label_color_value_changed_callback (GtkAdjustment *adjustment, gpointer client_data)
-{
-	NautilusLabel	 *label;
-	guint32		  color;
-
-	g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-	g_return_if_fail (NAUTILUS_IS_LABEL (client_data));
-
-	label = NAUTILUS_LABEL (client_data);
-	
-	color = nautilus_label_get_text_color (label);
-
-	color = NAUTILUS_RGBA_COLOR_PACK (NAUTILUS_RGBA_COLOR_GET_R (color),
-					  NAUTILUS_RGBA_COLOR_GET_G (color),
-					  (guchar) adjustment->value,
-					  NAUTILUS_RGBA_COLOR_GET_A (color));
-	
-	nautilus_label_set_text_color (label, color);
-}
-
-static void
-alpha_label_color_value_changed_callback (GtkAdjustment *adjustment, gpointer client_data)
-{
-	NautilusLabel	 *label;
-
-	g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-	g_return_if_fail (NAUTILUS_IS_LABEL (client_data));
-
-	label = NAUTILUS_LABEL (client_data);
-
-	nautilus_label_set_text_opacity (NAUTILUS_LABEL (label), (guchar) adjustment->value);
-}
-
-static void
-red_background_color_value_changed_callback (GtkAdjustment *adjustment, gpointer client_data)
-{
-	NautilusLabel	 *label;
-	guint32		  current_color;
-	char		  *current_color_spec;
-	char		  *new_color_spec;
-
-	g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-	g_return_if_fail (NAUTILUS_IS_LABEL (client_data));
-
-	label = NAUTILUS_LABEL (client_data);
-
-	current_color_spec = widget_get_nautilus_background_color (nautilus_gtk_widget_find_windowed_ancestor (GTK_WIDGET (label)));
-
-	current_color = nautilus_parse_rgb_with_white_default (current_color_spec);
-
-	g_free (current_color_spec);
-
-	new_color_spec = g_strdup_printf ("rgb:%04hx/%04hx/%04hx",
-					  (guint16) (adjustment->value / 255.0 * 65535.0),
-					  (guint16) ((double) NAUTILUS_RGBA_COLOR_GET_G (current_color) / 255.0 * 65535.0),
-					  (guint16) ((double) NAUTILUS_RGBA_COLOR_GET_B (current_color) / 255.0 * 65535.0));
-
-	widget_set_nautilus_background_color (nautilus_gtk_widget_find_windowed_ancestor (GTK_WIDGET (label)), new_color_spec);
-	
-	g_free (new_color_spec);
-}
-
-static void
-green_background_color_value_changed_callback (GtkAdjustment *adjustment, gpointer client_data)
-{
-	NautilusLabel	 *label;
-	guint32		  current_color;
-	char		  *current_color_spec;
-	char		  *new_color_spec;
-
-	g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-	g_return_if_fail (NAUTILUS_IS_LABEL (client_data));
-
-	label = NAUTILUS_LABEL (client_data);
-
-	current_color_spec = widget_get_nautilus_background_color (nautilus_gtk_widget_find_windowed_ancestor (GTK_WIDGET (label)));
-
-	current_color = nautilus_parse_rgb_with_white_default (current_color_spec);
-
-	g_free (current_color_spec);
-
-	new_color_spec = g_strdup_printf ("rgb:%04hx/%04hx/%04hx",
-					  (guint16) ((double) NAUTILUS_RGBA_COLOR_GET_R (current_color) / 255.0 * 65535.0),
-					  (guint16) (adjustment->value / 255.0 * 65535.0),
-					  (guint16) ((double) NAUTILUS_RGBA_COLOR_GET_B (current_color) / 255.0 * 65535.0));
-
-	widget_set_nautilus_background_color (nautilus_gtk_widget_find_windowed_ancestor (GTK_WIDGET (label)), new_color_spec);
-	
-	g_free (new_color_spec);
-}
-
-static void
-blue_background_color_value_changed_callback (GtkAdjustment *adjustment, gpointer client_data)
-{
-	NautilusLabel	 *label;
-	guint32		  current_color;
-	char		  *current_color_spec;
-	char		  *new_color_spec;
-
-	g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-	g_return_if_fail (NAUTILUS_IS_LABEL (client_data));
-
-	label = NAUTILUS_LABEL (client_data);
-
-	current_color_spec = widget_get_nautilus_background_color (nautilus_gtk_widget_find_windowed_ancestor (GTK_WIDGET (label)));
-
-	current_color = nautilus_parse_rgb_with_white_default (current_color_spec);
-
-	g_free (current_color_spec);
-
-	new_color_spec = g_strdup_printf ("rgb:%04hx/%04hx/%04hx",
-					  (guint16) ((double) NAUTILUS_RGBA_COLOR_GET_R (current_color) / 255.0 * 65535.0),
-					  (guint16) ((double) NAUTILUS_RGBA_COLOR_GET_G (current_color) / 255.0 * 65535.0),
-					  (guint16) (adjustment->value / 255.0 * 65535.0));
-
-	widget_set_nautilus_background_color (nautilus_gtk_widget_find_windowed_ancestor (GTK_WIDGET (label)), new_color_spec);
-	
-	g_free (new_color_spec);
-}
-
-static void
-alpha_background_color_value_changed_callback (GtkAdjustment *adjustment, gpointer client_data)
-{
-	NautilusLabel	 *label;
-
-	g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-	g_return_if_fail (NAUTILUS_IS_LABEL (client_data));
-	
-	label = NAUTILUS_LABEL (client_data);
-
-	nautilus_label_set_text_opacity (NAUTILUS_LABEL (label), (guchar) adjustment->value);
-}
-
-static void
-text_caption_changed_callback (NautilusTextCaption *text_caption, gpointer client_data)
-{
-	NautilusLabel *label;
- 	char *text;
-
-	g_return_if_fail (NAUTILUS_IS_TEXT_CAPTION (text_caption));
-	g_return_if_fail (NAUTILUS_IS_LABEL (client_data));
-
- 	text = nautilus_text_caption_get_text (text_caption);
-
-	label = NAUTILUS_LABEL (client_data);
-
-	nautilus_label_set_text (NAUTILUS_LABEL (label), text);
-
-	g_free (text);
-}
-
-static GtkWidget*
-create_value_scale (guint min,
-		    guint max,
-		    guint value,
-		    const char *color_spec,
-		    GtkSignalFunc callback,
-		    gpointer callback_data)
-{
-	GtkAdjustment	*adjustment;
-	GtkWidget	*scale;
-
-	g_assert (max > min);
-	g_assert (callback > 0);
-	
-	adjustment = (GtkAdjustment *) gtk_adjustment_new (value,
-							   min,
-							   max,
-							   1,
-							   (max - min) / 10,
-							   0);
-	
-	scale = gtk_hscale_new (adjustment);
-
-	if (color_spec != NULL) {
-		nautilus_gtk_widget_set_background_color (scale, color_spec);
-	}
-
-	gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
-
-	gtk_widget_set_usize (scale, 150, 0);
-	
-	gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", callback, callback_data);
-	
-	return scale;
-}
-
-static GtkWidget*
-create_value_scale_caption (const gchar *title,
-			    guint min,
-			    guint max,
-			    guint value,
-			    const char *color_spec,
-			    GtkSignalFunc callback,
-			    gpointer callback_data)
-{
-	GtkWidget	*hbox;
-	GtkWidget	*label;
-	GtkWidget	*scale;
-
-	scale = create_value_scale (min, max, value, color_spec, callback, callback_data);
-	hbox = gtk_hbox_new (FALSE, 0);
-	label = gtk_label_new (title);
-	
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4);
-	gtk_box_pack_end (GTK_BOX (hbox), scale, FALSE, FALSE, 4);
-
-	gtk_widget_show (label);
-	gtk_widget_show (scale);
-
-	return hbox;
-}
-
-static GtkWidget*
-create_color_picker_frame (const char		*title,
-			   GtkSignalFunc	red_callback,
-			   GtkSignalFunc	green_callback,
-			   GtkSignalFunc	blue_callback,
-			   GtkSignalFunc	alpha_callback,
-			   gpointer		callback_data,
-			   guint32		current_color)
-{
-	GtkWidget *red_scale;
-	GtkWidget *green_scale;
-	GtkWidget *blue_scale;
-	GtkWidget *alpha_scale;
-	GtkWidget *frame;
-	GtkWidget *vbox;
-
-	g_return_val_if_fail (title != NULL, NULL);
-	g_return_val_if_fail (red_callback != NULL, NULL);
-	g_return_val_if_fail (green_callback != NULL, NULL);
-	g_return_val_if_fail (blue_callback != NULL, NULL);
-	g_return_val_if_fail (alpha_callback != NULL, NULL);
-	
-	frame = gtk_frame_new (title);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
-
-	red_scale = create_value_scale_caption ("Red",
-						0,
-						255,
-						NAUTILUS_RGBA_COLOR_GET_R (current_color),
-						"red",
-						red_callback,
-						callback_data);
-
-	green_scale = create_value_scale_caption ("Green",
-						  0,
-						  255,
-						  NAUTILUS_RGBA_COLOR_GET_R (current_color),
-						  "green",
-						  green_callback,
-						  callback_data);
-	
-	blue_scale = create_value_scale_caption ("Blue",
-						 0,
-						 255,
-						 NAUTILUS_RGBA_COLOR_GET_R (current_color),
-						 "blue",
-						 blue_callback,
-						 callback_data);
-	
-	alpha_scale = create_value_scale_caption ("Alpha",
-						  0,
-						  255,
-						  NAUTILUS_RGBA_COLOR_GET_R (current_color),
-						  NULL,
-						  alpha_callback,
-						  callback_data);
-
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-
-	gtk_box_pack_start (GTK_BOX (vbox), red_scale, TRUE, TRUE, 2);
-	gtk_box_pack_start (GTK_BOX (vbox), green_scale, TRUE, TRUE, 1);
-	gtk_box_pack_start (GTK_BOX (vbox), blue_scale, TRUE, TRUE, 1);
-	gtk_box_pack_end (GTK_BOX (vbox), alpha_scale, TRUE, TRUE, 2);
-
-	gtk_widget_show_all (vbox);
-
-	return frame;
-}
-
-static GtkWidget*
-create_text_caption_frame (const char		*title,
-			   GtkSignalFunc	changed_callback,
-			   gpointer		callback_data)
-{
-	GtkWidget *frame;
-	GtkWidget *text_caption;
-
-	g_return_val_if_fail (title != NULL, NULL);
-	g_return_val_if_fail (changed_callback != NULL, NULL);
-	
-	frame = gtk_frame_new (title);
-
-	text_caption = nautilus_text_caption_new ();
-	gtk_container_set_border_width (GTK_CONTAINER (text_caption), 6);
-
- 	nautilus_caption_set_show_title (NAUTILUS_CAPTION (text_caption), FALSE);
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (text_caption), title);
-
-	gtk_signal_connect (GTK_OBJECT (text_caption), "changed", changed_callback, callback_data);
-
-	gtk_container_add (GTK_CONTAINER (frame), text_caption);
-
-	gtk_widget_show (text_caption);
-
-	return frame;
-}
-
-static void
-widget_set_nautilus_background_image (GtkWidget *widget, const char *image_name)
-{
-	NautilusBackground	*background;
-	char			*background_uri;
-
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-	g_return_if_fail (image_name != NULL);
-
-	background = nautilus_get_widget_background (widget);
-	
-	background_uri = g_strdup_printf ("file://%s/patterns/%s", NAUTILUS_DATADIR, image_name);
-
-	nautilus_background_reset (background);
-	nautilus_background_set_image_uri (background, background_uri);
-
-	g_free (background_uri);
-}
-
-static void
-widget_set_nautilus_background_color (GtkWidget *widget, const char *color)
-{
-	NautilusBackground	*background;
-
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-	g_return_if_fail (color != NULL);
-
-	background = nautilus_get_widget_background (widget);
-	
-	nautilus_background_reset (background);
-	nautilus_background_set_color (background, color);
-}
-
-static char *
-widget_get_nautilus_background_color (GtkWidget *widget)
-{
-	NautilusBackground *background;
-	
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
-	background = nautilus_get_widget_background (widget);
-
-	return nautilus_background_get_color (background);
-}
-
-static void
-widget_set_background_reset (GtkWidget *widget)
-{
-	NautilusBackground	*background;
-
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-
-	background = nautilus_get_widget_background (widget);
-
-	nautilus_background_reset (background);
-}
-
-static void
-background_changed_callback (NautilusStringPicker *string_picker, gpointer client_data)
-{
- 	char *string;
-
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
-	g_return_if_fail (NAUTILUS_IS_LABEL (client_data));
-
- 	string = nautilus_string_picker_get_selected_string (string_picker);
-
-	if (nautilus_str_has_prefix (string, "Image - ")) {
-		widget_set_nautilus_background_image (nautilus_gtk_widget_find_windowed_ancestor (GTK_WIDGET (client_data)),
-					     string + strlen ("Image - "));
-	}
-	else if (nautilus_str_has_prefix (string, "Gradient - ")) {
-		widget_set_nautilus_background_color (nautilus_gtk_widget_find_windowed_ancestor (GTK_WIDGET (client_data)),
-					     string + strlen ("Gradient - "));
-	}
-	else if (nautilus_str_has_prefix (string, "Solid - ")) {
-		widget_set_nautilus_background_color (nautilus_gtk_widget_find_windowed_ancestor (GTK_WIDGET (client_data)),
-					     string + strlen ("Solid - "));
-	}
-	else if (nautilus_str_has_prefix (string, "Reset")) {
-		widget_set_background_reset (nautilus_gtk_widget_find_windowed_ancestor (GTK_WIDGET (client_data)));
-	}
-
-	g_free (string);
-}
-
-static void
-justification_changed_callback (NautilusStringPicker *string_picker, gpointer client_data)
-{
-	GtkJustification justification;
-	char *string;
-
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
-	g_return_if_fail (NAUTILUS_IS_LABEL (client_data));
-
- 	string = nautilus_string_picker_get_selected_string (string_picker);
-
-	if (nautilus_str_is_equal (string, "Left")) {
-		justification = GTK_JUSTIFY_LEFT;
-	} else if (nautilus_str_has_prefix (string, "Center")) {
-		justification = GTK_JUSTIFY_CENTER;
-	} else if (nautilus_str_has_prefix (string, "Right")) {
-		justification = GTK_JUSTIFY_RIGHT;
-	} else {
-		g_assert_not_reached ();
-		justification = GTK_JUSTIFY_LEFT;
-	}
-
-	nautilus_label_set_justify (NAUTILUS_LABEL (client_data), justification);
-	
-	g_free (string);
-}
-
-static void
-drop_shadow_offset_changed_callback (NautilusStringPicker *string_picker, gpointer client_data)
-{
-	char *string;
-	int   drop_shadow_offset;
-
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
-	g_return_if_fail (NAUTILUS_IS_LABEL (client_data));
-
- 	string = nautilus_string_picker_get_selected_string (string_picker);
-
-	if (nautilus_eat_str_to_int (string, &drop_shadow_offset)) {
-		nautilus_label_set_smooth_drop_shadow_offset (NAUTILUS_LABEL (client_data), drop_shadow_offset);
-	}
-
-	g_free (string);
-}
-
-static GtkWidget*
-create_background_frame (const char	*title,
-			 GtkSignalFunc	background_changed_callback,
-			 gpointer	callback_data)
-{
-	GtkWidget *frame;
-	GtkWidget *vbox;
-	GtkWidget *background_picker;
-
-	g_return_val_if_fail (title != NULL, NULL);
- 	g_return_val_if_fail (background_changed_callback != NULL, NULL);
-	
-	vbox = gtk_vbox_new (FALSE, 0);
-	frame = gtk_frame_new (title);
-
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-
-	background_picker = nautilus_string_picker_new ();
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (background_picker), "Image - pale_coins.png");
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (background_picker), "Image - bubbles.png");
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (background_picker), "Image - irish_spring.png");
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (background_picker), "Image - white_ribs.png");
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (background_picker), "-----------------------");
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (background_picker), "Gradient - rgb:bbbb/bbbb/eeee-rgb:ffff/ffff/ffff:h");
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (background_picker), "Gradient - rgb:bbbb/bbbb/eeee-rgb:ffff/ffff/ffff");
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (background_picker), "-----------------------");
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (background_picker), "Solid - rgb:bbbb/bbbb/eeee");
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (background_picker), "-----------------------");
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (background_picker), "Reset");
-
- 	nautilus_caption_set_show_title (NAUTILUS_CAPTION (background_picker), FALSE);
-
-	gtk_signal_connect (GTK_OBJECT (background_picker), "changed", background_changed_callback, callback_data);
-
-	gtk_box_pack_start (GTK_BOX (vbox), background_picker, FALSE, FALSE, 0);
-
-	gtk_widget_show_all (vbox);
-
-	return frame;
-}
-
-static GtkWidget*
-create_justification_frame (const char		*title,
-			    GtkSignalFunc	justification_changed_callback,
-			    gpointer		callback_data)
-{
-	GtkWidget *frame;
-	GtkWidget *vbox;
-	GtkWidget *justification_picker;
-
-	g_return_val_if_fail (title != NULL, NULL);
- 	g_return_val_if_fail (justification_changed_callback != NULL, NULL);
-	
-	vbox = gtk_vbox_new (FALSE, 0);
-	frame = gtk_frame_new (title);
-
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-
-	justification_picker = nautilus_string_picker_new ();
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (justification_picker), "Left");
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (justification_picker), "Center");
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (justification_picker), "Right");
-
- 	nautilus_caption_set_show_title (NAUTILUS_CAPTION (justification_picker), FALSE);
-
-	gtk_signal_connect (GTK_OBJECT (justification_picker), "changed", justification_changed_callback, callback_data);
-
-	gtk_box_pack_start (GTK_BOX (vbox), justification_picker, FALSE, FALSE, 0);
-
-	gtk_widget_show_all (vbox);
-
-	return frame;
-}
-
-static GtkWidget*
-create_drop_shadow_offset_frame (const char	*title,
-				 GtkSignalFunc	drop_shadow_changed_callback,
-				 gpointer	callback_data)
-{
-	GtkWidget *frame;
-	GtkWidget *vbox;
-	GtkWidget *drop_shadow_offset_picker;
-
-	g_return_val_if_fail (title != NULL, NULL);
- 	g_return_val_if_fail (drop_shadow_changed_callback != NULL, NULL);
-	
-	vbox = gtk_vbox_new (FALSE, 0);
-	frame = gtk_frame_new (title);
-
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-
-	drop_shadow_offset_picker = nautilus_string_picker_new ();
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (drop_shadow_offset_picker), "0");
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (drop_shadow_offset_picker), "1");
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (drop_shadow_offset_picker), "2");
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (drop_shadow_offset_picker), "3");
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (drop_shadow_offset_picker), "4");
-	nautilus_string_picker_insert_string (NAUTILUS_STRING_PICKER (drop_shadow_offset_picker), "5");
-
- 	nautilus_caption_set_show_title (NAUTILUS_CAPTION (drop_shadow_offset_picker), FALSE);
-
-	gtk_signal_connect (GTK_OBJECT (drop_shadow_offset_picker), "changed", drop_shadow_changed_callback, callback_data);
-
-	gtk_box_pack_start (GTK_BOX (vbox), drop_shadow_offset_picker, FALSE, FALSE, 0);
-
-	gtk_widget_show_all (vbox);
-
-	return frame;
-}
-
-static void
-delete_event (GtkWidget *widget, GdkEvent *event, gpointer callback_data)
-{
-	gtk_main_quit ();
-}
-
-int 
-main (int argc, char* argv[])
-{
-	GtkWidget		*window;
-	GtkWidget		*main_box;
-	GtkWidget		*bottom_box;
-	GtkWidget		*tool_box1;
-	GtkWidget		*tool_box2;
-	GtkWidget		*color_tool_box;
-	GtkWidget		*label;
-	GtkWidget		*label_color_picker_frame;
-	GtkWidget		*background_color_picker_frame;
-	GtkWidget		*text_caption_frame;
-	GtkWidget		*background_frame;
-	GtkWidget		*justification_frame;
-	GtkWidget		*drop_shadow_offset_frame;
-	GtkWidget		*middle_box;
-
-	gtk_init (&argc, &argv);
-	gdk_rgb_init ();
-	gnome_vfs_init ();
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_signal_connect (GTK_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC (delete_event), NULL);
-	gtk_window_set_title (GTK_WINDOW (window), "Label Test");
-	gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
-	main_box = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (window), main_box);
-
- 	label = nautilus_label_new ("Foo");
-
-	bottom_box = gtk_vbox_new (FALSE, 4);
-
-	tool_box1 = gtk_hbox_new (FALSE, 0);
-	tool_box2 = gtk_hbox_new (FALSE, 0);
-
-	color_tool_box = gtk_hbox_new (FALSE, 0);
-
-	gtk_box_pack_start (GTK_BOX (bottom_box), tool_box1, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (bottom_box), tool_box2, TRUE, TRUE, 0);
-
-	gtk_box_pack_start (GTK_BOX (main_box), label, TRUE, TRUE, 10);
-	gtk_box_pack_end (GTK_BOX (main_box), bottom_box, TRUE, TRUE, 10);
-
-	widget_set_nautilus_background_image (nautilus_gtk_widget_find_windowed_ancestor (label), "pale_coins.png");
-	
-	label_color_picker_frame = create_color_picker_frame ("Label Color",
-							      red_label_color_value_changed_callback,
-							      green_label_color_value_changed_callback,
-							      blue_label_color_value_changed_callback,
-							      alpha_label_color_value_changed_callback,
-							      label,
-							      nautilus_label_get_text_color (NAUTILUS_LABEL (label)));
-
-	background_color_picker_frame = create_color_picker_frame ("Background Color",
-								   red_background_color_value_changed_callback,
-								   green_background_color_value_changed_callback,
-								   blue_background_color_value_changed_callback,
-								   alpha_background_color_value_changed_callback,
-								   label,
-								   nautilus_label_get_text_color (NAUTILUS_LABEL (label)));
-
-	text_caption_frame = create_text_caption_frame ("Text",
-							text_caption_changed_callback,
-							label);
-	
-	background_frame = create_background_frame ("Background",
-						    background_changed_callback,
-						    label);
-
-	justification_frame = create_justification_frame ("Justification",
-							  justification_changed_callback,
-							  label);
-
-	drop_shadow_offset_frame = create_drop_shadow_offset_frame ("Drop Shadow Offset",
-								    drop_shadow_offset_changed_callback,
-								    label);
-	
-	middle_box = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (middle_box), background_frame, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (middle_box), drop_shadow_offset_frame, FALSE, FALSE, 0);
-	gtk_box_pack_end (GTK_BOX (middle_box), justification_frame, FALSE, FALSE, 0);
-
-	gtk_box_pack_start (GTK_BOX (color_tool_box), label_color_picker_frame, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (color_tool_box), middle_box, FALSE, FALSE, 0);
-	gtk_box_pack_end (GTK_BOX (color_tool_box), background_color_picker_frame, FALSE, FALSE, 0);
-
-	gtk_box_pack_start (GTK_BOX (tool_box1), color_tool_box, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (tool_box2), text_caption_frame, TRUE, TRUE, 0);
-
-	gtk_widget_show_all (window);
-
-	gtk_main ();
-
-	gnome_vfs_shutdown ();
-	
-	return 0;
-}
diff --git a/test/test-nautilus-labeled-image.c b/test/test-nautilus-labeled-image.c
deleted file mode 100644
index c7d9565f2..000000000
--- a/test/test-nautilus-labeled-image.c
+++ /dev/null
@@ -1,119 +0,0 @@
-#include "test.h"
-
-#include <libnautilus-extensions/nautilus-labeled-image.h>
-
-
-static const char pixbuf_name[] = "/usr/share/pixmaps/gnome-globe.png";
-static const char tile_name[] = "/gnome/share/nautilus/patterns/camouflage.png";
-
-static GtkWidget *
-labeled_image_new (const char *text,
-		   GdkPixbuf *pixbuf,
-		   const char *tile_file_name)
-{
-	GtkWidget *labeled_image;
-
-	labeled_image = nautilus_labeled_image_new (text, pixbuf);
-
-	if (tile_file_name != NULL) {
-		nautilus_labeled_image_set_tile_pixbuf_from_file_name (NAUTILUS_LABELED_IMAGE (labeled_image),
-								       tile_file_name);
-	}
-
-	return labeled_image;
-}
-
-static GtkWidget *
-labeled_image_window_new (const char *title,
-			  GdkPixbuf *pixbuf,
-			  const char *tile_file_name)
-{
-	GtkWidget *window;
-	GtkWidget *vbox;
-	GtkWidget *labeled_image;
-	GtkWidget *tiled_labeled_image;
-
-	window = test_window_new (title, 20);
-	vbox = gtk_vbox_new (FALSE, 10);
-	gtk_container_add (GTK_CONTAINER (window), vbox);
-
-	labeled_image = labeled_image_new ("Labeled Image", pixbuf, NULL);
-	tiled_labeled_image = labeled_image_new ("Labeled Image", pixbuf, tile_file_name);
-	if (tile_file_name != NULL) {
-		nautilus_labeled_image_set_fill (NAUTILUS_LABELED_IMAGE (tiled_labeled_image), TRUE);
-	}	
-	if (labeled_image) gtk_box_pack_start (GTK_BOX (vbox), labeled_image, TRUE, TRUE, 0);
-	if (tiled_labeled_image) gtk_box_pack_start (GTK_BOX (vbox), tiled_labeled_image, TRUE, TRUE, 0);
-
-	gtk_widget_show_all (vbox);
-	
-	return window;
-}
-
-static void
-button_callback (GtkWidget *button,
-		 gpointer callback_data)
-{
-	const char *info = callback_data;
-	g_return_if_fail (GTK_IS_BUTTON (button));
-	
-	g_print ("%s(%p)\n", info, button);
-}
-
-static GtkWidget *
-labeled_image_button_window_new (const char *title,
-				 GdkPixbuf *pixbuf)
-{
-	GtkWidget *window;
-	GtkWidget *vbox;
-	GtkWidget *button;
-	GtkWidget *toggle_button;
-	GtkWidget *check_button;
-
-	window = test_window_new (title, 20);
-	vbox = gtk_vbox_new (FALSE, 10);
-	gtk_container_add (GTK_CONTAINER (window), vbox);
-
-	if (1) button = nautilus_labeled_image_button_new ("GtkButton with LabeledImage", pixbuf);
-	if (1) toggle_button = nautilus_labeled_image_toggle_button_new ("GtkToggleButton with LabeledImage", pixbuf);
-	if (1) check_button = nautilus_labeled_image_check_button_new ("GtkCheckButton with LabeledImage", pixbuf);
-
-	if (button) gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
-	if (toggle_button) gtk_box_pack_start (GTK_BOX (vbox), toggle_button, TRUE, TRUE, 0);
-	if (check_button) gtk_box_pack_start (GTK_BOX (vbox), check_button, TRUE, TRUE, 0);
-
-	if (button) {
-		gtk_signal_connect (GTK_OBJECT (button), "enter", GTK_SIGNAL_FUNC (button_callback), "enter");
-		gtk_signal_connect (GTK_OBJECT (button), "leave", GTK_SIGNAL_FUNC (button_callback), "leave");
-		gtk_signal_connect (GTK_OBJECT (button), "pressed", GTK_SIGNAL_FUNC (button_callback), "pressed");
-		gtk_signal_connect (GTK_OBJECT (button), "released", GTK_SIGNAL_FUNC (button_callback), "released");
-		gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (button_callback), "clicked");
-	}
-
-	gtk_widget_show_all (vbox);
-	
-	return window;
-}
-
-int 
-main (int argc, char* argv[])
-{
-	GtkWidget *labeled_image_window = NULL;
-	GtkWidget *labeled_image_button_window = NULL;
-	GdkPixbuf *pixbuf = NULL;
-
-	test_init (&argc, &argv);
-
-	if (1) pixbuf = test_pixbuf_new_named (pixbuf_name, 1.0);
-	if (1) labeled_image_window = labeled_image_window_new ("LabeledImage Test", pixbuf, tile_name);
-	if (1) labeled_image_button_window = labeled_image_button_window_new ("LabeledImage in GtkButton Test", pixbuf);
-
-	nautilus_gdk_pixbuf_unref_if_not_null (pixbuf);
-
-	if (labeled_image_window) gtk_widget_show (labeled_image_window);
-	if (labeled_image_button_window) gtk_widget_show (labeled_image_button_window);
-	
-	gtk_main ();
-
-	return test_quit (EXIT_SUCCESS);
-}
diff --git a/test/test-nautilus-password-dialog.c b/test/test-nautilus-password-dialog.c
deleted file mode 100644
index 64a16e63c..000000000
--- a/test/test-nautilus-password-dialog.c
+++ /dev/null
@@ -1,98 +0,0 @@
-
-#include <config.h>
-
-#include <libnautilus-extensions/nautilus-password-dialog.h>
-#include <gnome.h>
-
-static GtkWidget *password_dialog = NULL;
-
-static void
-authenticate_boink_callback (GtkWidget *button, gpointer user_data)
-{
-	gboolean  result;
-	char	  *username;
-	char	  *password;
-	gboolean  remember;
-
-	if (password_dialog == NULL) {
-		password_dialog = nautilus_password_dialog_new ("Authenticate Me",
-								"My secret message.",
-								"foouser",
-								"sekret",
-								TRUE);
-		
-		nautilus_password_dialog_set_remember_label_text (NAUTILUS_PASSWORD_DIALOG (password_dialog),
-								  "Remember foouser's password");
-	}
-
-	result = nautilus_password_dialog_run_and_block (NAUTILUS_PASSWORD_DIALOG (password_dialog));
-
-	username = nautilus_password_dialog_get_username (NAUTILUS_PASSWORD_DIALOG (password_dialog));
-	password = nautilus_password_dialog_get_password (NAUTILUS_PASSWORD_DIALOG (password_dialog));
-	remember = nautilus_password_dialog_get_remember (NAUTILUS_PASSWORD_DIALOG (password_dialog));
-
-	g_assert (username != NULL);
-	g_assert (password != NULL);
-
-	if (result) {
-		g_print ("authentication submitted: username='%s' , password='%s' , remember=%s\n",
-			 username,
-			 password,
-			 remember ? "TRUE" : "FALSE");
-	}
-	else {
-		g_print ("authentication cancelled:\n");
-	}
-	
-	g_free (username);
-	g_free (password);
-}
-
-static void
-exit_callback (GtkWidget *button, gpointer user_data)
-{
-	if (password_dialog != NULL) {
-		gtk_widget_destroy (password_dialog);
-	}
-
-	gtk_main_quit ();
-}
-
-int
-main (int argc, char * argv[])
-{
-	GtkWidget *window;
-	GtkWidget *vbox;
-	GtkWidget *authenticate_button;
-	GtkWidget *exit_button;
-
-	gnome_init ("foo", "bar", argc, argv);
-	
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_container_set_border_width (GTK_CONTAINER (window), 4);
-
-	vbox = gtk_vbox_new (TRUE, 0);
-	gtk_container_add (GTK_CONTAINER (window), vbox);
-
-	authenticate_button = gtk_button_new_with_label ("Boink me to authenticate");
-	exit_button = gtk_button_new_with_label ("Exit");
-
-	gtk_signal_connect (GTK_OBJECT (authenticate_button),
-			    "clicked",
-			    GTK_SIGNAL_FUNC (authenticate_boink_callback),
-			    (gpointer) NULL);
-
-	gtk_signal_connect (GTK_OBJECT (exit_button),
-			    "clicked",
-			    GTK_SIGNAL_FUNC (exit_callback),
-			    (gpointer) NULL);
-
-	gtk_box_pack_start (GTK_BOX (vbox), authenticate_button, TRUE, TRUE, 4);
-	gtk_box_pack_end (GTK_BOX (vbox), exit_button, TRUE, TRUE, 0);
-	
-	gtk_widget_show_all (window);
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/test/test-nautilus-pixbuf-tile.c b/test/test-nautilus-pixbuf-tile.c
deleted file mode 100644
index 51dc6e99a..000000000
--- a/test/test-nautilus-pixbuf-tile.c
+++ /dev/null
@@ -1,144 +0,0 @@
-#include "test.h"
-
-#include <libnautilus-extensions/nautilus-labeled-image.h>
-
-
-static const char pixbuf_name[] = "/usr/share/pixmaps/gnome-globe.png";
-static const char tile_name[] = "/gnome/share/nautilus/patterns/camouflage.png";
-
-static int
-pixbuf_drawing_area_expose_event (GtkWidget *widget,
-				  GdkEventExpose *event,
-				  gpointer callback_data)
-{
-	static GdkPixbuf *tile = NULL;
-	GdkPixbuf *buffer;
-	ArtIRect dest;
-	ArtIRect tile_area;
-
-	buffer = nautilus_gdk_pixbuf_get_global_buffer (widget->allocation.width, widget->allocation.height);
-
-	if (tile == NULL) {
-		tile = gdk_pixbuf_new_from_file (tile_name);
-		g_assert (tile != NULL);
-	}
-
-	tile_area.x0 = 0;
-	tile_area.y0 = 0;
-	tile_area.x1 = widget->allocation.width;
-	tile_area.y1 = widget->allocation.height;
-
-	nautilus_gdk_pixbuf_draw_to_pixbuf_tiled (tile,
-						  buffer,
-						  &tile_area,
-						  gdk_pixbuf_get_width (tile),
-						  gdk_pixbuf_get_height (tile),
-						  0,
-						  0,
-						  NAUTILUS_OPACITY_FULLY_OPAQUE,
-						  GDK_INTERP_NEAREST);
-
-	dest = nautilus_gtk_widget_get_bounds (widget);
-	nautilus_gdk_pixbuf_draw_to_drawable (buffer,
-					      widget->window,
-					      widget->style->white_gc,
-					      0,
-					      0,
-					      &dest,
-					      GDK_RGB_DITHER_NONE,
-					      GDK_PIXBUF_ALPHA_BILEVEL,
-					      NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
-
-	nautilus_debug_draw_rectangle_and_cross (widget->window, &dest, 0xFF0000, TRUE);
-	{
-		ArtIRect one_tile;
-		one_tile.x0 = widget->allocation.x;
-		one_tile.y0 = widget->allocation.y;
-		one_tile.x1 = gdk_pixbuf_get_width (tile);
-		one_tile.y1 = gdk_pixbuf_get_height (tile);
-		
-		nautilus_debug_draw_rectangle_and_cross (widget->window, &one_tile, 0x0000FF, TRUE);
-	}
-
-	return TRUE;
-}
-
-static int
-drawable_drawing_area_expose_event (GtkWidget *widget,
-				    GdkEventExpose *event,
-				    gpointer callback_data)
-{
-	static GdkPixbuf *tile = NULL;
-	ArtIRect dest;
-
-	if (tile == NULL) {
-		tile = gdk_pixbuf_new_from_file (tile_name);
-		g_assert (tile != NULL);
-	}
-
-	dest = nautilus_gtk_widget_get_bounds (widget);
-	nautilus_gdk_pixbuf_draw_to_drawable_tiled (tile,
-						    widget->window,
-						    widget->style->white_gc,
-						    &dest,
-						    gdk_pixbuf_get_width (tile),
-						    gdk_pixbuf_get_height (tile),
-						    0,
-						    0,
-						    GDK_RGB_DITHER_NONE,
-						    GDK_PIXBUF_ALPHA_BILEVEL,
-						    NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
-	
-	nautilus_debug_draw_rectangle_and_cross (widget->window, &dest, 0xFF0000, TRUE);
-	{
-		ArtIRect one_tile;
-		one_tile.x0 = widget->allocation.x;
-		one_tile.y0 = widget->allocation.y;
-		one_tile.x1 = gdk_pixbuf_get_width (tile);
-		one_tile.y1 = gdk_pixbuf_get_height (tile);
-		
-		nautilus_debug_draw_rectangle_and_cross (widget->window, &one_tile, 0x0000FF, TRUE);
-	}
-
-	return TRUE;
-}
-
-int 
-main (int argc, char* argv[])
-{
-	GtkWidget *pixbuf_window;
-	GtkWidget *pixbuf_drawing_area;
-	GtkWidget *pixbuf_vbox;
-	GtkWidget *drawable_window;
-	GtkWidget *drawable_drawing_area;
-	GtkWidget *drawable_vbox;
-	
-	test_init (&argc, &argv);
-
-	pixbuf_window = test_window_new ("Pixbuf To Pixbuf Tile Test", 0);
-	pixbuf_vbox = gtk_vbox_new (FALSE, 0);
-	pixbuf_drawing_area = gtk_drawing_area_new ();
-	gtk_signal_connect (GTK_OBJECT (pixbuf_drawing_area),
-			    "expose_event",
-			    GTK_SIGNAL_FUNC (pixbuf_drawing_area_expose_event),
-			    NULL);
-	gtk_box_pack_start (GTK_BOX (pixbuf_vbox), pixbuf_drawing_area, TRUE, TRUE, 0);
-	gtk_container_add (GTK_CONTAINER (pixbuf_window), pixbuf_vbox);
-	gtk_widget_show_all (pixbuf_window);
-
-
-	drawable_window = test_window_new ("Pixbuf To Drawable Tile Test", 0);
-	drawable_vbox = gtk_vbox_new (FALSE, 0);
-	drawable_drawing_area = gtk_drawing_area_new ();
-	gtk_signal_connect (GTK_OBJECT (drawable_drawing_area),
-			    "expose_event",
-			    GTK_SIGNAL_FUNC (drawable_drawing_area_expose_event),
-			    NULL);
-	gtk_box_pack_start (GTK_BOX (drawable_vbox), drawable_drawing_area, TRUE, TRUE, 0);
-	gtk_container_add (GTK_CONTAINER (drawable_window), drawable_vbox);
-	gtk_widget_show_all (drawable_window);
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/test/test-nautilus-preferences-change.c b/test/test-nautilus-preferences-change.c
index 1a76dc4af..5d2927d84 100644
--- a/test/test-nautilus-preferences-change.c
+++ b/test/test-nautilus-preferences-change.c
@@ -1,8 +1,8 @@
 #include "test.h"
 
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-image-with-background.h>
-#include <libnautilus-extensions/nautilus-string-picker.h>
+#include <eel/eel-image.h>
+#include <eel/eel-image-with-background.h>
+#include <eel/eel-string-picker.h>
 #include <libnautilus-extensions/nautilus-preferences.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
 
@@ -15,10 +15,10 @@ user_level_changed_callback (gpointer callback_data)
 	int user_level;
 	int visible_user_level;
 
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (callback_data));
+	g_return_if_fail (EEL_IS_STRING_PICKER (callback_data));
 
 
-	name = nautilus_caption_get_title_label (NAUTILUS_CAPTION (callback_data));
+	name = eel_caption_get_title_label (EEL_CAPTION (callback_data));
 
 	user_level = nautilus_preferences_get_user_level ();
 	visible_user_level = nautilus_preferences_get_visible_user_level (name);
@@ -48,18 +48,18 @@ fruits_changed_callback (gpointer callback_data)
 }
 
 static void
-int_picker_changed_callback (NautilusStringPicker *string_picker,
+int_picker_changed_callback (EelStringPicker *string_picker,
 			     gpointer callback_data)
 {
 	char *selected_string;
 	int new_value;
 
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
+	g_return_if_fail (EEL_IS_STRING_PICKER (string_picker));
 	g_return_if_fail (callback_data != NULL);
 
-	selected_string = nautilus_string_picker_get_selected_string (string_picker);
+	selected_string = eel_string_picker_get_selected_string (string_picker);
 	
-	new_value = nautilus_string_picker_get_index_for_string (string_picker, selected_string);
+	new_value = eel_string_picker_get_index_for_string (string_picker, selected_string);
 
 	nautilus_preferences_set_integer ((const char *) callback_data, new_value);
 
@@ -67,18 +67,18 @@ int_picker_changed_callback (NautilusStringPicker *string_picker,
 }
 
 static void
-user_level_picker_changed_callback (NautilusStringPicker *string_picker,
+user_level_picker_changed_callback (EelStringPicker *string_picker,
 				    gpointer callback_data)
 {
 	char *selected_string;
 	int new_user_level;
 
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
+	g_return_if_fail (EEL_IS_STRING_PICKER (string_picker));
 	g_return_if_fail (callback_data != NULL);
 
-	selected_string = nautilus_string_picker_get_selected_string (string_picker);
+	selected_string = eel_string_picker_get_selected_string (string_picker);
 	
-	new_user_level = nautilus_string_picker_get_index_for_string (string_picker, selected_string);
+	new_user_level = eel_string_picker_get_index_for_string (string_picker, selected_string);
 
 	nautilus_preferences_set_user_level (new_user_level);
 
@@ -87,20 +87,20 @@ user_level_picker_changed_callback (NautilusStringPicker *string_picker,
 
 static GtkWidget *
 picker_new (const char *name,
-	    const NautilusStringList *entries)
+	    const EelStringList *entries)
 {
 	GtkWidget *string_picker;
 	
 	g_return_val_if_fail (name != NULL, NULL);
 	g_return_val_if_fail (entries != NULL, NULL);
 	
-	string_picker = nautilus_string_picker_new ();
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (string_picker), name);
+	string_picker = eel_string_picker_new ();
+	eel_caption_set_title_label (EEL_CAPTION (string_picker), name);
 	gtk_signal_connect (GTK_OBJECT (string_picker), "changed", GTK_SIGNAL_FUNC (int_picker_changed_callback),
 			    (gpointer) name);
 	
-	nautilus_string_picker_set_string_list (NAUTILUS_STRING_PICKER (string_picker), entries);
-	nautilus_string_picker_set_selected_string_index (NAUTILUS_STRING_PICKER (string_picker), 
+	eel_string_picker_set_string_list (EEL_STRING_PICKER (string_picker), entries);
+	eel_string_picker_set_selected_string_index (EEL_STRING_PICKER (string_picker), 
 							  nautilus_preferences_get_integer (name));
 	
 	nautilus_preferences_add_callback ("user_level", user_level_changed_callback, string_picker);
@@ -111,20 +111,20 @@ picker_new (const char *name,
 
 static GtkWidget *
 user_level_picker_new (const char *name,
-		       const NautilusStringList *entries)
+		       const EelStringList *entries)
 {
 	GtkWidget *string_picker;
 	
 	g_return_val_if_fail (name != NULL, NULL);
 	g_return_val_if_fail (entries != NULL, NULL);
 	
-	string_picker = nautilus_string_picker_new ();
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (string_picker), name);
+	string_picker = eel_string_picker_new ();
+	eel_caption_set_title_label (EEL_CAPTION (string_picker), name);
 	gtk_signal_connect (GTK_OBJECT (string_picker), "changed", GTK_SIGNAL_FUNC (user_level_picker_changed_callback),
 			    (gpointer) name);
 	
-	nautilus_string_picker_set_string_list (NAUTILUS_STRING_PICKER (string_picker), entries);
-	nautilus_string_picker_set_selected_string_index (NAUTILUS_STRING_PICKER (string_picker), 
+	eel_string_picker_set_string_list (EEL_STRING_PICKER (string_picker), entries);
+	eel_string_picker_set_selected_string_index (EEL_STRING_PICKER (string_picker), 
 							  nautilus_preferences_get_user_level ());
 	
 	nautilus_preferences_add_callback ("user_level", user_level_changed_callback, string_picker);
@@ -148,17 +148,17 @@ main (int argc, char *argv[])
 
 	GtkWidget *vbox;
 
-	NautilusStringList *user_level_entries;
-	NautilusStringList *color_entries;
-	NautilusStringList *fruits_entries;
+	EelStringList *user_level_entries;
+	EelStringList *color_entries;
+	EelStringList *fruits_entries;
 
 	test_init (&argc, &argv);
 
 	nautilus_global_preferences_initialize ();
 
-	user_level_entries = nautilus_string_list_new_from_tokens ("Beginner,Intermediate,Advanced", ",", TRUE);
-	color_entries = nautilus_string_list_new_from_tokens ("0,1,2,3,4,5,6,7,8,9,10", ",", TRUE);
-	fruits_entries = nautilus_string_list_new_from_tokens ("0,1,2,3", ",", TRUE);
+	user_level_entries = eel_string_list_new_from_tokens ("Beginner,Intermediate,Advanced", ",", TRUE);
+	color_entries = eel_string_list_new_from_tokens ("0,1,2,3,4,5,6,7,8,9,10", ",", TRUE);
+	fruits_entries = eel_string_list_new_from_tokens ("0,1,2,3", ",", TRUE);
 
 	nautilus_preferences_default_set_string ("user_level",
 						 NAUTILUS_USER_LEVEL_NOVICE,
@@ -214,9 +214,9 @@ main (int argc, char *argv[])
 	gtk_box_pack_start (GTK_BOX (vbox), fruits_orange_picker, FALSE, FALSE, 20);
 	gtk_box_pack_start (GTK_BOX (vbox), fruits_pear_picker, FALSE, FALSE, 20);
 
-	nautilus_string_list_free (user_level_entries);
-	nautilus_string_list_free (color_entries);
-	nautilus_string_list_free (fruits_entries);
+	eel_string_list_free (user_level_entries);
+	eel_string_list_free (color_entries);
+	eel_string_list_free (fruits_entries);
 
 	nautilus_preferences_add_callback ("fruits", fruits_changed_callback, NULL);
 
diff --git a/test/test-nautilus-preferences-display.c b/test/test-nautilus-preferences-display.c
index bf27cf9e4..a70809263 100644
--- a/test/test-nautilus-preferences-display.c
+++ b/test/test-nautilus-preferences-display.c
@@ -1,15 +1,15 @@
 #include "test.h"
 
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-image-with-background.h>
-#include <libnautilus-extensions/nautilus-text-caption.h>
+#include <eel/eel-image.h>
+#include <eel/eel-image-with-background.h>
+#include <eel/eel-text-caption.h>
 #include <libnautilus-extensions/nautilus-preferences.h>
 
 static void
-text_caption_update (NautilusTextCaption *text_caption,
+text_caption_update (EelTextCaption *text_caption,
 		     const char *name)
 {
-	g_return_if_fail (NAUTILUS_IS_TEXT_CAPTION (text_caption));
+	g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption));
 	g_return_if_fail (name != NULL);
 	
 	g_print ("'%s' changed from '%d' to '%d'\n",
@@ -21,14 +21,14 @@ text_caption_update (NautilusTextCaption *text_caption,
 }
 
 static void
-user_level_caption_update (NautilusTextCaption *text_caption)
+user_level_caption_update (EelTextCaption *text_caption)
 {
 	char *old_text;
 	char *new_text;
 
-	g_return_if_fail (NAUTILUS_IS_TEXT_CAPTION (text_caption));
+	g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption));
 	
-	old_text = nautilus_text_caption_get_text (text_caption);
+	old_text = eel_text_caption_get_text (text_caption);
 	new_text = nautilus_preferences_get ("user_level");
 	
 	g_print ("'%s' changed from '%s' to '%s'\n",
@@ -44,43 +44,43 @@ user_level_caption_update (NautilusTextCaption *text_caption)
 static void
 user_level_changed_callback (gpointer callback_data)
 {
-	user_level_caption_update (NAUTILUS_TEXT_CAPTION (callback_data));
+	user_level_caption_update (EEL_TEXT_CAPTION (callback_data));
 }
 
 static void
 green_changed_callback (gpointer callback_data)
 {
-	text_caption_update (NAUTILUS_TEXT_CAPTION (callback_data), "green");
+	text_caption_update (EEL_TEXT_CAPTION (callback_data), "green");
 }
 
 static void
 yellow_changed_callback (gpointer callback_data)
 {
-	text_caption_update (NAUTILUS_TEXT_CAPTION (callback_data), "yellow");
+	text_caption_update (EEL_TEXT_CAPTION (callback_data), "yellow");
 }
 
 static void
 red_changed_callback (gpointer callback_data)
 {
-	text_caption_update (NAUTILUS_TEXT_CAPTION (callback_data), "red");
+	text_caption_update (EEL_TEXT_CAPTION (callback_data), "red");
 }
 
 static void
 apple_changed_callback (gpointer callback_data)
 {
-	text_caption_update (NAUTILUS_TEXT_CAPTION (callback_data), "fruits/apple");
+	text_caption_update (EEL_TEXT_CAPTION (callback_data), "fruits/apple");
 }
 
 static void
 orange_changed_callback (gpointer callback_data)
 {
-	text_caption_update (NAUTILUS_TEXT_CAPTION (callback_data), "fruits/orange");
+	text_caption_update (EEL_TEXT_CAPTION (callback_data), "fruits/orange");
 }
 
 static void
 pear_changed_callback (gpointer callback_data)
 {
-	text_caption_update (NAUTILUS_TEXT_CAPTION (callback_data), "fruits/pear");
+	text_caption_update (EEL_TEXT_CAPTION (callback_data), "fruits/pear");
 }
 
 static GtkWidget *
@@ -96,13 +96,13 @@ entry_new (const char *name,
 
 	hbox = gtk_hbox_new (TRUE, 2);
 
-	*caption_out = nautilus_text_caption_new ();
-	nautilus_text_caption_set_editable (NAUTILUS_TEXT_CAPTION (*caption_out), FALSE);
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (*caption_out), name);
+	*caption_out = eel_text_caption_new ();
+	eel_text_caption_set_editable (EEL_TEXT_CAPTION (*caption_out), FALSE);
+	eel_caption_set_title_label (EEL_CAPTION (*caption_out), name);
 
-	*default_caption_out = nautilus_text_caption_new ();
-	nautilus_text_caption_set_editable (NAUTILUS_TEXT_CAPTION (*default_caption_out), FALSE);
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (*default_caption_out), "default:");
+	*default_caption_out = eel_text_caption_new ();
+	eel_text_caption_set_editable (EEL_TEXT_CAPTION (*default_caption_out), FALSE);
+	eel_caption_set_title_label (EEL_CAPTION (*default_caption_out), "default:");
 	
 	gtk_box_pack_start (GTK_BOX (hbox), *caption_out, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (hbox), *default_caption_out, FALSE, FALSE, 0);
@@ -124,8 +124,8 @@ user_level_frame_new (void)
 	frame = gtk_frame_new ("user_level");
 	
 	user_level_hbox = entry_new ("user_level", &user_level_caption, &user_level_default_caption);
-	test_text_caption_set_text_for_string_preferences (NAUTILUS_TEXT_CAPTION (user_level_caption), "user_level");
-	test_text_caption_set_text_for_default_string_preferences (NAUTILUS_TEXT_CAPTION (user_level_default_caption), "user_level");
+	test_text_caption_set_text_for_string_preferences (EEL_TEXT_CAPTION (user_level_caption), "user_level");
+	test_text_caption_set_text_for_default_string_preferences (EEL_TEXT_CAPTION (user_level_default_caption), "user_level");
 	nautilus_preferences_add_callback ("user_level", user_level_changed_callback, user_level_caption);
 
 	gtk_container_add (GTK_CONTAINER (frame), user_level_hbox);
@@ -162,13 +162,13 @@ colors_frame_new (void)
 	yellow_hbox = entry_new ("yellow", &yellow_caption, &yellow_default_caption);
 	red_hbox = entry_new ("red", &red_caption, &red_default_caption);
 
-	test_text_caption_set_text_for_int_preferences (NAUTILUS_TEXT_CAPTION (green_caption), "green");
-	test_text_caption_set_text_for_int_preferences (NAUTILUS_TEXT_CAPTION (yellow_caption), "yellow");
-	test_text_caption_set_text_for_int_preferences (NAUTILUS_TEXT_CAPTION (red_caption), "red");
+	test_text_caption_set_text_for_int_preferences (EEL_TEXT_CAPTION (green_caption), "green");
+	test_text_caption_set_text_for_int_preferences (EEL_TEXT_CAPTION (yellow_caption), "yellow");
+	test_text_caption_set_text_for_int_preferences (EEL_TEXT_CAPTION (red_caption), "red");
 
-	test_text_caption_set_text_for_default_int_preferences (NAUTILUS_TEXT_CAPTION (green_default_caption), "green");
-	test_text_caption_set_text_for_default_int_preferences (NAUTILUS_TEXT_CAPTION (yellow_default_caption), "yellow");
-	test_text_caption_set_text_for_default_int_preferences (NAUTILUS_TEXT_CAPTION (red_default_caption), "red");
+	test_text_caption_set_text_for_default_int_preferences (EEL_TEXT_CAPTION (green_default_caption), "green");
+	test_text_caption_set_text_for_default_int_preferences (EEL_TEXT_CAPTION (yellow_default_caption), "yellow");
+	test_text_caption_set_text_for_default_int_preferences (EEL_TEXT_CAPTION (red_default_caption), "red");
 	
 	nautilus_preferences_add_callback ("green", green_changed_callback, green_caption);
 	nautilus_preferences_add_callback ("yellow", yellow_changed_callback, yellow_caption);
@@ -210,13 +210,13 @@ fruits_frame_new (void)
 	orange_hbox = entry_new ("fruits/orange", &orange_caption, &orange_default_caption);
 	pear_hbox = entry_new ("fruits/pear", &pear_caption, &pear_default_caption);
 
-	test_text_caption_set_text_for_int_preferences (NAUTILUS_TEXT_CAPTION (apple_caption), "fruits/apple");
-	test_text_caption_set_text_for_int_preferences (NAUTILUS_TEXT_CAPTION (orange_caption), "fruits/orange");
-	test_text_caption_set_text_for_int_preferences (NAUTILUS_TEXT_CAPTION (pear_caption), "fruits/pear");
+	test_text_caption_set_text_for_int_preferences (EEL_TEXT_CAPTION (apple_caption), "fruits/apple");
+	test_text_caption_set_text_for_int_preferences (EEL_TEXT_CAPTION (orange_caption), "fruits/orange");
+	test_text_caption_set_text_for_int_preferences (EEL_TEXT_CAPTION (pear_caption), "fruits/pear");
 
-	test_text_caption_set_text_for_default_int_preferences (NAUTILUS_TEXT_CAPTION (apple_default_caption), "fruits/apple");
-	test_text_caption_set_text_for_default_int_preferences (NAUTILUS_TEXT_CAPTION (orange_default_caption), "fruits/orange");
-	test_text_caption_set_text_for_default_int_preferences (NAUTILUS_TEXT_CAPTION (pear_default_caption), "fruits/pear");
+	test_text_caption_set_text_for_default_int_preferences (EEL_TEXT_CAPTION (apple_default_caption), "fruits/apple");
+	test_text_caption_set_text_for_default_int_preferences (EEL_TEXT_CAPTION (orange_default_caption), "fruits/orange");
+	test_text_caption_set_text_for_default_int_preferences (EEL_TEXT_CAPTION (pear_default_caption), "fruits/pear");
 	
 	nautilus_preferences_add_callback ("fruits/apple", apple_changed_callback, apple_caption);
 	nautilus_preferences_add_callback ("fruits/orange", orange_changed_callback, orange_caption);
diff --git a/test/test-nautilus-smooth-text-layout.c b/test/test-nautilus-smooth-text-layout.c
deleted file mode 100644
index 7fc7dc899..000000000
--- a/test/test-nautilus-smooth-text-layout.c
+++ /dev/null
@@ -1,141 +0,0 @@
-
-#include <config.h>
-
-#include "test.h"
-
-#include <libnautilus-extensions/nautilus-glyph.h>
-#include <libnautilus-extensions/nautilus-smooth-text-layout.h>
-
-int 
-main (int argc, char* argv[])
-{
-	const guint pixbuf_width = 640;
-	const guint pixbuf_height = 480;
-	const gboolean has_alpha = TRUE;
-	const char *text = NULL;
-	const int font_size = 25;
-
-	GdkPixbuf *pixbuf;
-	NautilusScalableFont *font;
-	NautilusScalableFont *bold_font;
-	NautilusSmoothTextLayout *smooth_text_layout;
-	ArtIRect dest;
-
-
-	test_init (&argc, &argv);
-
-	font = nautilus_scalable_font_get_default_font ();
-	g_assert (font != NULL);
-
-	bold_font = nautilus_scalable_font_make_bold (font);
-	g_assert (bold_font != NULL);
-
-	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, has_alpha, 8, pixbuf_width, pixbuf_height);
-	g_assert (pixbuf != NULL);
-
-	test_pixbuf_draw_rectangle_tiled (pixbuf, 
-					  "patterns/brushed_metal.png",
-					  -1, -1, -1, -1,
-					  NAUTILUS_OPACITY_FULLY_OPAQUE);
-	
-	{
-		const int border = 50;
-		dest = nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, NULL);
-		dest.x0 += border;
-		dest.y0 += border;
-		dest.x1 = 340;
-		dest.y1 -= border;
-	}
-	nautilus_debug_pixbuf_draw_rectangle_inset (pixbuf,
-						    FALSE,
-						    dest.x0,
-						    dest.y0,
-						    dest.x1,
-						    dest.y1,
-						    0x00FFFF,
-						    0xFF,
-						    -1);
-	
-	text = "This\nis\nmulti\nline\ntext";
-	smooth_text_layout = nautilus_smooth_text_layout_new (text,
-							      strlen (text),
-							      font,
-							      font_size,
-							      FALSE);
-	nautilus_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
-						    pixbuf,
-						    0,
-						    0,
-						    &dest,
-						    GTK_JUSTIFY_LEFT,
-						    FALSE,
-						    0xFF0000,
-						    0xff);
-	gtk_object_unref (GTK_OBJECT (smooth_text_layout));
-
-	{
-		const int border = 50;
-		dest = nautilus_gdk_pixbuf_intersect (pixbuf, 0, 0, NULL);
-		dest.x0 += 350;
-		dest.y0 += border;
-		dest.x1 -= border;
-		dest.y1 -= border;
-	}
-	nautilus_debug_pixbuf_draw_rectangle_inset (pixbuf,
-						    FALSE,
-						    dest.x0,
-						    dest.y0,
-						    dest.x1,
-						    dest.y1,
-						    0xFFFF00,
-						    0xFF,
-						    -1);
-
-	text = "This is text that needs t be wrapped to fit and stuff and foo and bar and more stuff.";
-	smooth_text_layout = nautilus_smooth_text_layout_new (text,
-							      strlen (text),
-							      font,
-							      font_size,
-							      TRUE);
- 	nautilus_smooth_text_layout_set_line_wrap_width (smooth_text_layout,
- 							 nautilus_art_irect_get_width (&dest));
-	nautilus_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
-						    pixbuf,
-						    0,
-						    0,
-						    &dest,
-						    GTK_JUSTIFY_CENTER,
-						    FALSE,
-						    0x00FF00,
-						    0xff);
-	dest.y0 += nautilus_smooth_text_layout_get_height (smooth_text_layout) + 10;
-	dest.y1 += nautilus_smooth_text_layout_get_height (smooth_text_layout) + 10;
-	gtk_object_unref (GTK_OBJECT (smooth_text_layout));
-
-	smooth_text_layout = nautilus_smooth_text_layout_new (text,
-							      strlen (text),
-							      bold_font,
-							      font_size * 1.5,
-							      TRUE);
- 	nautilus_smooth_text_layout_set_line_wrap_width (smooth_text_layout,
- 							 nautilus_art_irect_get_width (&dest) + 2);
-	
-	if (1) nautilus_smooth_text_layout_draw_to_pixbuf (smooth_text_layout,
-							   pixbuf,
-							   1,
-							   1,
-							   &dest,
-							   GTK_JUSTIFY_CENTER,
-							   TRUE,
-						    0x00FF00,
-						    0xff);
-	gtk_object_unref (GTK_OBJECT (smooth_text_layout));
-
-	nautilus_debug_show_pixbuf_in_eog (pixbuf);
-	
-	gdk_pixbuf_unref (pixbuf);
-	gtk_object_unref (GTK_OBJECT (font));
-	gtk_object_unref (GTK_OBJECT (bold_font));
-
-	return test_quit (EXIT_SUCCESS);
-}
diff --git a/test/test-nautilus-viewport-constraint.c b/test/test-nautilus-viewport-constraint.c
deleted file mode 100644
index 95ce78c4d..000000000
--- a/test/test-nautilus-viewport-constraint.c
+++ /dev/null
@@ -1,236 +0,0 @@
-#include <config.h>
-
-#include <gtk/gtk.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-viewport.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-
-void widget_set_nautilus_background_color (GtkWidget *widget, const char *color);
-
-static void
-delete_event (GtkWidget *widget, gpointer data)
-{
-	gtk_main_quit ();
-}
-
-void
-widget_set_nautilus_background_color (GtkWidget *widget, const char *color)
-{
-	NautilusBackground      *background;
-
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-	g_return_if_fail (color != NULL);
-
-	background = nautilus_get_widget_background (widget);
-
-	nautilus_background_reset (background);
-	nautilus_background_set_color (background, color);
-}
-
-static GtkWidget *
-summary_view_button_new (char *label_text)
-{
-	GtkWidget *button;
-	GtkWidget *label;
-
-	button = gtk_button_new ();
-	gtk_widget_set_usize (button, 80, -1);
-
-	label = gtk_label_new (label_text);
-	gtk_widget_show (label);
-	gtk_container_add (GTK_CONTAINER (button), label);
-
-	return button;
-}
-
-static GtkWidget *
-create_nautilus_label (const char *text,
-		       guint drop_shadow_offset,
-		       float xalign,
-		       float yalign,
-		       gint xpadding,
-		       gint ypadding,
-		       guint32 text_color,
-		       guint32 background_color,
-		       const char *tile_name,
-		       gint num_larger_sizes,
-		       gboolean bold)
-{
-	GtkWidget *label;
-
-	label = nautilus_label_new_solid (text,
-					  drop_shadow_offset,
-					  NAUTILUS_RGB_COLOR_WHITE,
-					  NAUTILUS_RGB_COLOR_BLACK,
-					  xalign, yalign, xpadding, ypadding,
-					  background_color, NULL);
-
-	if (num_larger_sizes < 0) {
-		nautilus_label_make_smaller (NAUTILUS_LABEL (label), ABS (num_larger_sizes));
-	}
-	if (bold) {
-		nautilus_label_make_bold (NAUTILUS_LABEL (label));
-	}
-
-	return label;
-}
-
-static GtkWidget *
-summary_view_item_label_new (char *label_text,
-			     int relative_font_size,
-			     gboolean bold)
-{
-	GtkWidget *label;
-
-	label = create_nautilus_label (label_text,
-				       0, 0.5, 0.5, 0, 0,
-				       NAUTILUS_RGB_COLOR_BLACK,
-				       NAUTILUS_RGB_COLOR_WHITE,
-				       NULL,
-				       relative_font_size,
-				       bold);
-
-	nautilus_label_set_wrap (NAUTILUS_LABEL (label), TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (label), GTK_JUSTIFY_LEFT);
-	gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
-	nautilus_label_set_adjust_wrap_on_resize (NAUTILUS_LABEL (label), TRUE);
-
-	return label;
-}
-
-static GtkWidget *
-summary_view_item_body_label_new (char *label_text)
-{
-	return summary_view_item_label_new (label_text,
-					    -2,
-					    FALSE);
-}
-
-static GtkWidget *
-summary_view_item_header_label_new (char *label_text)
-{
-	return summary_view_item_label_new (label_text,
-					    0,
-					    TRUE);
-}	
-
-static GtkWidget *
-create_row (char *header_text, char *item_text, gboolean constrain_width, gboolean constrain_height)
-{
-	GtkWidget *form_vbox;
-	GtkWidget *service_name;
-	GtkWidget *service_description;
-	GtkWidget *services_row;
-	GtkWidget *pane;
-	GtkWidget *summary_pane;
-	GtkWidget *viewport;
-
-	GtkWidget *icon_box;
-	GtkWidget *description_vbox;
-	GtkWidget *button_vbox;
-	GtkWidget *button_hbox;
-	GtkWidget *button;
-
-	form_vbox = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (form_vbox);
-
-	pane = gtk_scrolled_window_new (NULL, NULL);
-	if (constrain_width) {
-		gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pane), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-	}
-	if (constrain_height) {
-		gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pane), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
-	}
-	gtk_widget_show (pane);
-
-	viewport = nautilus_viewport_new (NULL, NULL);
-	if (constrain_width) {
-		nautilus_viewport_set_constrain_width (NAUTILUS_VIEWPORT (viewport), TRUE);
-	}
-	if (constrain_height) {
-		nautilus_viewport_set_constrain_height (NAUTILUS_VIEWPORT (viewport), TRUE);
-	}
-	widget_set_nautilus_background_color (viewport, "rgb:FFFF/FFFF/FFFF");
-	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
-	gtk_container_add (GTK_CONTAINER (pane), viewport);
-	gtk_widget_show (viewport);
-
-	summary_pane = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (viewport), summary_pane);
-	gtk_widget_show (summary_pane);
-	
-	gtk_box_pack_start (GTK_BOX (form_vbox), pane, TRUE, TRUE, 0);
-
-	services_row = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (summary_pane), services_row, FALSE, FALSE, 0);
-	gtk_widget_show (services_row);
-
-	/* Generate first box with service icon */
-	icon_box = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (services_row), icon_box, FALSE, FALSE, 2);
-	gtk_widget_show (icon_box);
-
-	/* Generate second box with service title and summary */
-	description_vbox = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (services_row), description_vbox, TRUE, TRUE, 0);
-	gtk_widget_show (description_vbox);
-
-	/* Header */
-	service_name = summary_view_item_header_label_new (header_text);
-	gtk_box_pack_start (GTK_BOX (description_vbox), service_name, FALSE, FALSE, 2);
-	gtk_widget_show (service_name);
-
-	/* Body */
-	service_description = summary_view_item_body_label_new (item_text);
-	gtk_box_pack_start (GTK_BOX (description_vbox), service_description, FALSE, FALSE, 2);
-	gtk_widget_show (service_description);
-
-	/* Add the redirect button to the third box */
-	button_vbox = gtk_vbox_new (TRUE, 0);
-	gtk_box_pack_end (GTK_BOX (services_row), button_vbox, FALSE, FALSE, 2);
-	gtk_widget_show (button_vbox);
-
-	button_hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (button_vbox), button_hbox, FALSE, FALSE, 2);
-	gtk_widget_show (button_hbox);
-
-	button = summary_view_button_new ("Go There");
-	gtk_widget_show (button);
-	gtk_box_pack_end (GTK_BOX (button_hbox), button, FALSE, FALSE, 3);
-
-	return form_vbox;
-}
-
-int
-main (int argc, char *argv[])
-{
-	GtkWidget *vbox;
-	GtkWidget *nautilus_window;
-	GtkWidget *row_one;
-	GtkWidget *row_two;
-
-	gtk_init (&argc, &argv);
-
-	nautilus_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_policy (GTK_WINDOW (nautilus_window), TRUE, TRUE, FALSE);
-
-	gtk_signal_connect (GTK_OBJECT (nautilus_window), "delete_event", delete_event, NULL);
-
-	vbox = gtk_vbox_new (0, 0);
-	gtk_container_add (GTK_CONTAINER (nautilus_window), vbox);
-	gtk_widget_show (vbox);
-
-	row_one = create_row ("Eazel Online Storage", "Store files online and access them through Nautilus or from any browser.", TRUE, FALSE);
-	row_two = create_row ("Eazel Monkey Storage", "Store your monkeys in our protective cages where they will be loved and cared for.", FALSE, TRUE);
-
-	gtk_box_pack_start (GTK_BOX (vbox), row_one, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), row_two, TRUE, TRUE, 0);
-
-	gtk_widget_show_all (nautilus_window);
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/test/test-nautilus-widgets.c b/test/test-nautilus-widgets.c
deleted file mode 100644
index 208b88f3e..000000000
--- a/test/test-nautilus-widgets.c
+++ /dev/null
@@ -1,303 +0,0 @@
-#include <config.h>
-
-#include <gtk/gtk.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnomeui/gnome-init.h>
-#include <libnautilus-extensions/nautilus-caption-table.h>
-#include <libnautilus-extensions/nautilus-radio-button-group.h>
-#include <libnautilus-extensions/nautilus-string-picker.h>
-#include <libnautilus-extensions/nautilus-text-caption.h>
-
-static GdkPixbuf*
-create_pixbuf (const char *name)
-{
-	char *path;
-	GdkPixbuf *pixbuf;
-
-	g_return_val_if_fail (name != NULL, NULL);
-
-	path = g_strdup_printf ("/gnome/share/pixmaps/nautilus/%s", name);
-	
-	pixbuf = gdk_pixbuf_new_from_file (path);
-	g_free (path);
-
-	g_assert (pixbuf != NULL);
-	
-	return pixbuf;
-}
-
-static void test_radio_group                     (void);
-static void test_radio_group_horizontal          (void);
-static void test_caption_table                   (void);
-static void test_string_picker                   (void);
-static void test_text_caption                    (void);
-
-/* Callbacks */
-static void test_radio_changed_callback          (GtkWidget *button_group,
-						  gpointer   user_data);
-static void string_picker_changed_callback       (GtkWidget *string_picker,
-						  gpointer   user_data);
-static void text_caption_changed_callback        (GtkWidget *text_caption,
-						  gpointer   user_data);
-static void test_caption_table_activate_callback (GtkWidget *button_group,
-						  gint       active_index,
-						  gpointer   user_data);
-
-int
-main (int argc, char * argv[])
-{
-	gnome_init ("foo", "bar", argc, argv);
-
-	test_radio_group ();
-	test_radio_group_horizontal ();
-	test_caption_table ();
-	test_string_picker ();
-	test_text_caption ();
-
-	gtk_main ();
-
-	return 0;
-}
-
-static void
-radio_group_load_it_up (NautilusRadioButtonGroup	*group, 
-			gboolean			use_icons,
-			gboolean			use_descriptions)
-{
-	g_return_if_fail (group != NULL);
-	g_return_if_fail (NAUTILUS_IS_RADIO_BUTTON_GROUP (group));
-
-	nautilus_radio_button_group_insert (NAUTILUS_RADIO_BUTTON_GROUP (group), "Apples");
-	nautilus_radio_button_group_insert (NAUTILUS_RADIO_BUTTON_GROUP (group), "Oranges");
-	nautilus_radio_button_group_insert (NAUTILUS_RADIO_BUTTON_GROUP (group), "Strawberries");
-	
-	if (use_descriptions)
-	{
-		nautilus_radio_button_group_set_entry_description_text (NAUTILUS_RADIO_BUTTON_GROUP (group), 0, "Apple description");
-		nautilus_radio_button_group_set_entry_description_text (NAUTILUS_RADIO_BUTTON_GROUP (group), 1, "Oranges description");
-		nautilus_radio_button_group_set_entry_description_text (NAUTILUS_RADIO_BUTTON_GROUP (group), 2, "Strawberries description");
-	}
-
-	if (use_icons)
-	{
-		GdkPixbuf *pixbufs[3];
-		
-		pixbufs[0] = create_pixbuf ("novice.png");
-		pixbufs[1] = create_pixbuf ("intermediate.png");
-		pixbufs[2] = create_pixbuf ("expert.png");
-		
-		nautilus_radio_button_group_set_entry_pixbuf (NAUTILUS_RADIO_BUTTON_GROUP (group), 0, pixbufs[0]);
-		nautilus_radio_button_group_set_entry_pixbuf (NAUTILUS_RADIO_BUTTON_GROUP (group), 1, pixbufs[1]);
-		nautilus_radio_button_group_set_entry_pixbuf (NAUTILUS_RADIO_BUTTON_GROUP (group), 2, pixbufs[2]);
-		
-		gdk_pixbuf_unref (pixbufs[0]);
-		gdk_pixbuf_unref (pixbufs[1]);
-		gdk_pixbuf_unref (pixbufs[2]);
-	}
-}
-
-static void
-test_radio_group (void)
-{
-	GtkWidget *window;
-	GtkWidget *buttons;
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	buttons = nautilus_radio_button_group_new (FALSE);
-
-	radio_group_load_it_up (NAUTILUS_RADIO_BUTTON_GROUP (buttons), TRUE, TRUE);
-
-	gtk_signal_connect (GTK_OBJECT (buttons),
-			    "changed",
-			    GTK_SIGNAL_FUNC (test_radio_changed_callback),
-			    (gpointer) NULL);
-
-	gtk_container_add (GTK_CONTAINER (window), buttons);
-
-	gtk_widget_show (buttons);
-
-	gtk_widget_show (window);
-}
-
-static void
-test_radio_group_horizontal (void)
-{
-	GtkWidget *window;
-	GtkWidget *buttons;
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	buttons = nautilus_radio_button_group_new (TRUE);
-
-	radio_group_load_it_up (NAUTILUS_RADIO_BUTTON_GROUP (buttons), FALSE, FALSE);
-
-	gtk_signal_connect (GTK_OBJECT (buttons),
-			    "changed",
-			    GTK_SIGNAL_FUNC (test_radio_changed_callback),
-			    (gpointer) NULL);
-
-	gtk_container_add (GTK_CONTAINER (window), buttons);
-
-	gtk_widget_show (buttons);
-
-	gtk_widget_show (window);
-}
-
-static void
-test_caption_table (void)
-{
-	GtkWidget * window;
-	GtkWidget * table;
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	table = nautilus_caption_table_new (4);
-
-	nautilus_caption_table_set_row_info (NAUTILUS_CAPTION_TABLE (table),
-					     0,
-					     "Something",
-					     "Text",
-					     TRUE,
-					     FALSE);
-
-	nautilus_caption_table_set_row_info (NAUTILUS_CAPTION_TABLE (table),
-					     1,
-					     "ReadOnly",
-					     "Cant Change Me",
-					     TRUE,
-					     TRUE);
-
-	nautilus_caption_table_set_row_info (NAUTILUS_CAPTION_TABLE (table),
-					     2,
-					     "Password",
-					     "sekret",
-					     FALSE,
-					     FALSE);
-
-	nautilus_caption_table_set_row_info (NAUTILUS_CAPTION_TABLE (table),
-					     3,
-					     "This is a very long label",
-					     "Text",
-					     TRUE,
-					     FALSE);
-
-	gtk_signal_connect (GTK_OBJECT (table),
-			    "activate",
-			    GTK_SIGNAL_FUNC (test_caption_table_activate_callback),
-			    (gpointer) NULL);
-
-	gtk_container_add (GTK_CONTAINER (window), table);
-
-	gtk_widget_show (table);
-
-	gtk_widget_show (window);
-}
-
-static void
-test_string_picker (void)
-{
-	GtkWidget		*window;
-	GtkWidget		*picker;
-	NautilusStringList	*font_list;
-	
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	picker = nautilus_string_picker_new ();
-	
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (picker), "Icon Font Family:");
-
-	font_list = nautilus_string_list_new (TRUE);
-
-	nautilus_string_list_insert (font_list, "Helvetica");
-	nautilus_string_list_insert (font_list, "Times");
-	nautilus_string_list_insert (font_list, "Courier");
-	nautilus_string_list_insert (font_list, "Lucida");
-	nautilus_string_list_insert (font_list, "Fixed");
-
-	nautilus_string_picker_set_string_list (NAUTILUS_STRING_PICKER (picker), font_list);
-
-	nautilus_string_list_free (font_list);
-
-	gtk_container_add (GTK_CONTAINER (window), picker);
-
-	gtk_signal_connect (GTK_OBJECT (picker),
-			    "changed",
-			    GTK_SIGNAL_FUNC (string_picker_changed_callback),
-			    (gpointer) NULL);
-
-	nautilus_string_picker_set_selected_string (NAUTILUS_STRING_PICKER (picker), "Fixed");
-
-	gtk_widget_show_all (window);
-}
-
-static void
-test_text_caption (void)
-{
-	GtkWidget		*window;
-	GtkWidget		*picker;
-	
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	picker = nautilus_text_caption_new ();
-	
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (picker), "Home Page:");
-
-	nautilus_text_caption_set_text (NAUTILUS_TEXT_CAPTION (picker), "file:///tmp");
-	
-	gtk_container_add (GTK_CONTAINER (window), picker);
-	
-	gtk_signal_connect (GTK_OBJECT (picker),
-			    "changed",
-			    GTK_SIGNAL_FUNC (text_caption_changed_callback),
-			    (gpointer) NULL);
-
-	gtk_widget_show_all (window);
-}
-
-static void
-string_picker_changed_callback (GtkWidget *string_picker, gpointer user_data)
-{
-	char	  *text;
-
-	g_assert (string_picker != NULL);
-	g_assert (NAUTILUS_IS_STRING_PICKER (string_picker));
-
-	text = nautilus_string_picker_get_selected_string (NAUTILUS_STRING_PICKER (string_picker));
-
-	g_print ("string_picker_changed_callback(%s)\n", text);
-
-	g_free (text);
-}
-
-static void
-text_caption_changed_callback (GtkWidget *text_caption, gpointer user_data)
-{
-	char	  *text;
-
-	g_assert (text_caption != NULL);
-	g_assert (NAUTILUS_IS_TEXT_CAPTION (text_caption));
-
-	text = nautilus_text_caption_get_text (NAUTILUS_TEXT_CAPTION (text_caption));
-
-	g_print ("text_caption_changed_callback(%s)\n", text);
-	
-	g_free (text);
-}
-
-static void
-test_radio_changed_callback (GtkWidget *buttons, gpointer user_data)
-{
-	gint i;
-
-	i = nautilus_radio_button_group_get_active_index (NAUTILUS_RADIO_BUTTON_GROUP (buttons));
-
-	g_print ("test_radio_changed_callback (%d)\n", i);
-}
-
-static void
-test_caption_table_activate_callback (GtkWidget  *button_group,
-				      gint        active_index,
-				      gpointer    user_data)
-{
-	g_print ("test_caption_table_activate_callback (active_index=%d)\n", active_index);
-}
diff --git a/test/test-nautilus-wrap-table.c b/test/test-nautilus-wrap-table.c
index e55c36598..86953ac45 100644
--- a/test/test-nautilus-wrap-table.c
+++ b/test/test-nautilus-wrap-table.c
@@ -1,8 +1,8 @@
 #include "test.h"
 
-#include <libnautilus-extensions/nautilus-wrap-table.h>
-#include <libnautilus-extensions/nautilus-viewport.h>
-#include <libnautilus-extensions/nautilus-labeled-image.h>
+#include <eel/eel-wrap-table.h>
+#include <eel/eel-viewport.h>
+#include <eel/eel-labeled-image.h>
 #include <libnautilus-extensions/nautilus-customization-data.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
 
@@ -23,7 +23,7 @@ main (int argc, char* argv[])
 	gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
 
 	/* The emblems wrapped table */
-	emblems_table = nautilus_wrap_table_new (TRUE);
+	emblems_table = eel_wrap_table_new (TRUE);
 
 	gtk_widget_show (emblems_table);
 	gtk_container_set_border_width (GTK_CONTAINER (emblems_table), GNOME_PAD);
@@ -74,7 +74,7 @@ main (int argc, char* argv[])
 			continue;
 		}
 		
-		button = nautilus_labeled_image_check_button_new (label, pixbuf);
+		button = eel_labeled_image_check_button_new (label, pixbuf);
 		g_free (label);
 		gdk_pixbuf_unref (pixbuf);
 
diff --git a/test/test.c b/test/test.c
index 103beec95..a62ca4d41 100644
--- a/test/test.c
+++ b/test/test.c
@@ -11,7 +11,7 @@ test_init (int *argc,
 	gdk_rgb_init ();
 	gnome_vfs_init ();
 
-	nautilus_make_warnings_and_criticals_stop_in_debugger
+	eel_make_warnings_and_criticals_stop_in_debugger
 		(G_LOG_DOMAIN, g_log_domain_glib,
 		 "Bonobo",
 		 "Gdk",
@@ -73,17 +73,17 @@ void
 test_gtk_widget_set_background_image (GtkWidget *widget,
 				      const char *image_name)
 {
-	NautilusBackground *background;
+	EelBackground *background;
 	char *uri;
 
 	g_return_if_fail (GTK_IS_WIDGET (widget));
 	g_return_if_fail (image_name != NULL);
 
-	background = nautilus_get_widget_background (widget);
+	background = eel_get_widget_background (widget);
 	
 	uri = g_strdup_printf ("file://%s/%s", NAUTILUS_DATADIR, image_name);
 
-	nautilus_background_set_image_uri (background, uri);
+	eel_background_set_image_uri (background, uri);
 
 	g_free (uri);
 }
@@ -92,14 +92,14 @@ void
 test_gtk_widget_set_background_color (GtkWidget *widget,
 				      const char *color_spec)
 {
-	NautilusBackground *background;
+	EelBackground *background;
 
 	g_return_if_fail (GTK_IS_WIDGET (widget));
 	g_return_if_fail (color_spec != NULL);
 
-	background = nautilus_get_widget_background (widget);
+	background = eel_get_widget_background (widget);
 	
-	nautilus_background_set_color (background, color_spec);
+	eel_background_set_color (background, color_spec);
 }
 
 GdkPixbuf *
@@ -149,9 +149,9 @@ test_image_new (const char *pixbuf_name,
 	GtkWidget *image;
 
 	if (with_background) {
-		image = nautilus_image_new_with_background (NULL);
+		image = eel_image_new_with_background (NULL);
 	} else {
-		image = nautilus_image_new (NULL);
+		image = eel_image_new (NULL);
 	}
 
 	if (pixbuf_name != NULL) {
@@ -160,7 +160,7 @@ test_image_new (const char *pixbuf_name,
 		pixbuf = test_pixbuf_new_named (pixbuf_name, scale);
 
 		if (pixbuf != NULL) {
-			nautilus_image_set_pixbuf (NAUTILUS_IMAGE (image), pixbuf);
+			eel_image_set_pixbuf (EEL_IMAGE (image), pixbuf);
 			gdk_pixbuf_unref (pixbuf);
 		}
 	}
@@ -171,7 +171,7 @@ test_image_new (const char *pixbuf_name,
 		tile_pixbuf = test_pixbuf_new_named (tile_name, 1.0);
 
 		if (tile_pixbuf != NULL) {
-			nautilus_image_set_tile_pixbuf (NAUTILUS_IMAGE (image), tile_pixbuf);
+			eel_image_set_tile_pixbuf (EEL_IMAGE (image), tile_pixbuf);
 			gdk_pixbuf_unref (tile_pixbuf);
 		}
 	}
@@ -192,15 +192,15 @@ test_label_new (const char *text,
 	}
 	
 	if (with_background) {
-		label = nautilus_label_new_with_background (text);
+		label = eel_label_new_with_background (text);
 	} else {
-		label = nautilus_label_new (text);
+		label = eel_label_new (text);
 	}
 
 	if (num_sizes_larger < 0) {
-		nautilus_label_make_smaller (NAUTILUS_LABEL (label), ABS (num_sizes_larger));
+		eel_label_make_smaller (EEL_LABEL (label), ABS (num_sizes_larger));
 	} else if (num_sizes_larger > 0) {
-		nautilus_label_make_larger (NAUTILUS_LABEL (label), num_sizes_larger);
+		eel_label_make_larger (EEL_LABEL (label), num_sizes_larger);
 	}
 
 	if (tile_name != NULL) {
@@ -209,7 +209,7 @@ test_label_new (const char *text,
 		tile_pixbuf = test_pixbuf_new_named (tile_name, 1.0);
 
 		if (tile_pixbuf != NULL) {
-			nautilus_label_set_tile_pixbuf (NAUTILUS_LABEL (label), tile_pixbuf);
+			eel_label_set_tile_pixbuf (EEL_LABEL (label), tile_pixbuf);
 			gdk_pixbuf_unref (tile_pixbuf);
 		}
 	}
@@ -219,86 +219,86 @@ test_label_new (const char *text,
 
 /* Preferences hacks */
 void
-test_text_caption_set_text_for_int_preferences (NautilusTextCaption *text_caption,
+test_text_caption_set_text_for_int_preferences (EelTextCaption *text_caption,
 					 const char *name)
 {
 	int int_value;
 	char *text;
 
-	g_return_if_fail (NAUTILUS_IS_TEXT_CAPTION (text_caption));
+	g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption));
 	g_return_if_fail (name != NULL);
 	
 	int_value = nautilus_preferences_get_integer (name);
 
 	text = g_strdup_printf ("%d", int_value);
 
-	nautilus_text_caption_set_text (NAUTILUS_TEXT_CAPTION (text_caption), text);
+	eel_text_caption_set_text (EEL_TEXT_CAPTION (text_caption), text);
 
 	g_free (text);
 }
 
 void
-test_text_caption_set_text_for_string_preferences (NautilusTextCaption *text_caption,
+test_text_caption_set_text_for_string_preferences (EelTextCaption *text_caption,
 						   const char *name)
 {
 	char *text;
 
-	g_return_if_fail (NAUTILUS_IS_TEXT_CAPTION (text_caption));
+	g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption));
 	g_return_if_fail (name != NULL);
 	
 	text = nautilus_preferences_get (name);
 	
-	nautilus_text_caption_set_text (NAUTILUS_TEXT_CAPTION (text_caption), text);
+	eel_text_caption_set_text (EEL_TEXT_CAPTION (text_caption), text);
 
 	g_free (text);
 }
 
 void
-test_text_caption_set_text_for_default_int_preferences (NautilusTextCaption *text_caption,
+test_text_caption_set_text_for_default_int_preferences (EelTextCaption *text_caption,
 							const char *name)
 {
 	int int_value;
 	char *text;
 	
-	g_return_if_fail (NAUTILUS_IS_TEXT_CAPTION (text_caption));
+	g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption));
 	g_return_if_fail (name != NULL);
 	
 	int_value = 0;
 
 	text = g_strdup_printf ("%d", int_value);
 
-	nautilus_text_caption_set_text (NAUTILUS_TEXT_CAPTION (text_caption), text);
+	eel_text_caption_set_text (EEL_TEXT_CAPTION (text_caption), text);
 
 	g_free (text);
 }
 
 void
-test_text_caption_set_text_for_default_string_preferences (NautilusTextCaption *text_caption,
+test_text_caption_set_text_for_default_string_preferences (EelTextCaption *text_caption,
 							   const char *name)
 {
 	char *text;
 	
-	g_return_if_fail (NAUTILUS_IS_TEXT_CAPTION (text_caption));
+	g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption));
 	g_return_if_fail (name != NULL);
 	
 	text = g_strdup ("");
 
-	nautilus_text_caption_set_text (NAUTILUS_TEXT_CAPTION (text_caption), text);
+	eel_text_caption_set_text (EEL_TEXT_CAPTION (text_caption), text);
 
 	g_free (text);
 }
 
 int
-test_text_caption_get_text_as_int (const NautilusTextCaption *text_caption)
+test_text_caption_get_text_as_int (const EelTextCaption *text_caption)
 {
 	int result = 0;
 	char *text;
 
-	g_return_val_if_fail (NAUTILUS_IS_TEXT_CAPTION (text_caption), 0);
+	g_return_val_if_fail (EEL_IS_TEXT_CAPTION (text_caption), 0);
 
-	text = nautilus_text_caption_get_text (text_caption);
+	text = eel_text_caption_get_text (text_caption);
 
-	nautilus_eat_str_to_int (text, &result);
+	eel_eat_str_to_int (text, &result);
 
 	return result;
 }
@@ -328,19 +328,19 @@ test_pixbuf_draw_rectangle_tiled (GdkPixbuf *pixbuf,
 	ArtIRect area;
 	GdkPixbuf *tile_pixbuf;
 
-	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
+	g_return_if_fail (eel_gdk_pixbuf_is_valid (pixbuf));
 	g_return_if_fail (tile_name != NULL);
- 	g_return_if_fail (opacity > NAUTILUS_OPACITY_FULLY_TRANSPARENT);
- 	g_return_if_fail (opacity <= NAUTILUS_OPACITY_FULLY_OPAQUE);
+ 	g_return_if_fail (opacity > EEL_OPACITY_FULLY_TRANSPARENT);
+ 	g_return_if_fail (opacity <= EEL_OPACITY_FULLY_OPAQUE);
 
 	tile_pixbuf = test_pixbuf_new_named (tile_name, 1.0);
 
  	g_return_if_fail (tile_pixbuf != NULL);
 
 	if (x0 == -1 && y0 == -1 && x1 == -1 && y1 == -1) {
-		NautilusDimensions dimensions;
-		dimensions = nautilus_gdk_pixbuf_get_dimensions (pixbuf);
-		area = nautilus_art_irect_assign_dimensions (0, 0, &dimensions);
+		EelDimensions dimensions;
+		dimensions = eel_gdk_pixbuf_get_dimensions (pixbuf);
+		area = eel_art_irect_assign_dimensions (0, 0, &dimensions);
 	} else {
 		g_return_if_fail (x0 >= 0);
 		g_return_if_fail (y0 >= 0);
@@ -353,7 +353,7 @@ test_pixbuf_draw_rectangle_tiled (GdkPixbuf *pixbuf,
 		area.y1 = y1;
 	}
 	
-	nautilus_gdk_pixbuf_draw_to_pixbuf_tiled (tile_pixbuf,
+	eel_gdk_pixbuf_draw_to_pixbuf_tiled (tile_pixbuf,
 						  pixbuf,
 						  &area,
 						  gdk_pixbuf_get_width (tile_pixbuf),
diff --git a/test/test.h b/test/test.h
index 0b3c5f001..66ad80d43 100644
--- a/test/test.h
+++ b/test/test.h
@@ -7,26 +7,26 @@
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs-init.h>
 
-#include <libnautilus-extensions/nautilus-art-extensions.h>
-#include <libnautilus-extensions/nautilus-art-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-debug-drawing.h>
-#include <libnautilus-extensions/nautilus-debug.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-image-with-background.h>
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-label-with-background.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-string-list.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-art-extensions.h>
+#include <eel/eel-art-gtk-extensions.h>
+#include <eel/eel-background.h>
+#include <eel/eel-debug-drawing.h>
+#include <eel/eel-debug.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-image-with-background.h>
+#include <eel/eel-image.h>
+#include <eel/eel-label-with-background.h>
+#include <eel/eel-label.h>
+#include <eel/eel-string-list.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 
-#include <libnautilus-extensions/nautilus-text-caption.h>
-#include <libnautilus-extensions/nautilus-string-picker.h>
+#include <eel/eel-text-caption.h>
+#include <eel/eel-string-picker.h>
 
 void       test_init                            (int                         *argc,
 						 char                      ***argv);
@@ -59,16 +59,16 @@ void       test_pixbuf_draw_rectangle_tiled     (GdkPixbuf                   *pi
 						 int                          opacity);
 void       test_window_set_title_with_pid       (GtkWindow                   *window,
 						 const char                  *title);
-int        test_text_caption_get_text_as_int    (const NautilusTextCaption   *text_caption);
+int        test_text_caption_get_text_as_int    (const EelTextCaption   *text_caption);
 
 /* Preferences hacks */
-void test_text_caption_set_text_for_int_preferences            (NautilusTextCaption       *text_caption,
+void test_text_caption_set_text_for_int_preferences            (EelTextCaption       *text_caption,
 								const char                *name);
-void test_text_caption_set_text_for_string_preferences         (NautilusTextCaption       *text_caption,
+void test_text_caption_set_text_for_string_preferences         (EelTextCaption       *text_caption,
 								const char                *name);
-void test_text_caption_set_text_for_default_int_preferences    (NautilusTextCaption       *text_caption,
+void test_text_caption_set_text_for_default_int_preferences    (EelTextCaption       *text_caption,
 								const char                *name);
-void test_text_caption_set_text_for_default_string_preferences (NautilusTextCaption       *text_caption,
+void test_text_caption_set_text_for_default_string_preferences (EelTextCaption       *text_caption,
 								const char                *name);
 
 #endif /* TEST_H */